From a4aae4c33d26c7e257d0e361cf2a620d0ea562cb Mon Sep 17 00:00:00 2001
From: Packit <packit>
Date: Sep 14 2020 11:17:24 +0000
Subject: libdap-3.19.1 base


---

diff --git a/AlarmHandler.h b/AlarmHandler.h
new file mode 100644
index 0000000..370c40a
--- /dev/null
+++ b/AlarmHandler.h
@@ -0,0 +1,94 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#ifndef alarm_handler_h
+#define alarm_handler_h
+
+#include <cstdio>
+
+#include <string>
+
+#include "EventHandler.h"
+
+namespace libdap
+{
+
+/** Handle the time out alarm. When an OPeNDAP server runs until the time out
+    alarm is triggered, this class provides the concrete implementation of
+    EventHandler::handle_signal().
+
+    @see EventHandler
+    @see SignalHandler
+    @author James Gallagher <jgallagher@opendap.org> */
+class AlarmHandler : public EventHandler
+{
+private:
+    FILE *d_file;  // Sink for the Error object.
+    string d_version;
+
+public:
+    // Ensure that d_stream gets initialized...
+    AlarmHandler() : d_file( 0 )// , d_stream( cout )
+    {}
+
+    AlarmHandler(FILE *s) : d_file(s)//, d_stream( cout )
+    {}
+
+    /** Store information to be used by the handler.
+        @param out Write to this stream.
+        @deprecated The stream param is ignored. Use the default constructor instead. */
+    AlarmHandler(ostream &) : d_file(0)//, d_stream( out )
+    {}
+
+    virtual ~AlarmHandler()
+    {
+        if( d_file )
+            fclose( d_file ) ;
+    }
+
+    /** Handle an alarm signal. When one of our servers gets an alarm, that
+    means it has hit its time out. We need to dump two CRLF pairs down
+    the stream and then send an Error object explaining that a timeout
+    has been reached.
+
+    Because this is a signal handler, it should call only reentrant
+    system services, functions, et cetera. This handler never returns
+    to the code that was running when the alarm signal was raised.
+
+    @param signum We know it is SIGALRM; here as a check
+    @return Never returns; calls exit after sending the Error object. */
+    virtual void handle_signal(int signum)
+    {
+        if (signum != SIGALRM)
+            throw Error("SIGALRM handler caught another signal!");
+
+        throw Error("Timeout");
+    }
+
+};
+
+} // namespace libdap
+
+#endif
diff --git a/Ancillary.cc b/Ancillary.cc
new file mode 100644
index 0000000..1e7679f
--- /dev/null
+++ b/Ancillary.cc
@@ -0,0 +1,240 @@
+// Ancillary.cc
+
+#include "config.h"
+
+//#define DODS_DEBUG
+
+#include "Ancillary.h"
+#include "debug.h"
+
+#ifndef WIN32
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#else
+#include <io.h>
+#include <fcntl.h>
+#include <process.h>
+// Win32 does not define this. 08/21/02 jhrg
+#define F_OK 0
+#endif
+
+namespace libdap {
+
+/** This function accepts a dataset path name, and searches for a
+    matching ancillary data file name with a very specific set of
+    search rules, given here:
+
+    <pre>
+    directory           filename          extension
+    same                same            `.'given
+    given               same            `.'given
+    same                given           `.'given
+    given               given           `.'given
+    </pre>
+
+    Where ``same'' refers to the input dataset pathname, and ``given''
+    refers to the function arguments.
+
+    For example, If you call this function with a
+    dataset name of <tt>/a/data</tt>, an extension of <tt>das</tt>, a
+    directory of
+    <tt>b</tt>, and a filename of <tt>ralph</tt>, the function will
+    look (in order)
+    for the following files:
+
+    <pre>
+    /a/data.das
+    /b/data.das
+    /a/ralph.das
+    /b/ralph.das
+    </pre>
+
+    The function will return a string containing the name of the first
+    file in the list that exists, if any.
+
+    @note This code now checks for <code>pathname.ext</code> 3/17/99 jhrg
+
+    @brief Find a file with ancillary data.
+    @param pathname The input pathname of a dataset.
+    @param ext The input extension the desired file is to have.
+    @param dir The input directory in which the desired file may be
+    found.
+    @param file The input filename the desired file may have.
+    @return A string containing the pathname of the file found by
+    searching with the given components.  If no file was found, the
+    null string is returned.
+*/
+string
+Ancillary::find_ancillary_file( const string &pathname,
+				const string &ext,
+				const string &dir,
+				const string &file )
+{
+    string::size_type slash = pathname.rfind('/') + 1;
+    string directory = pathname.substr(0, slash);
+    string filename = pathname.substr(slash);
+    string basename = pathname.substr(slash, pathname.rfind('.') - slash);
+
+    DBG(cerr << "find ancillary file params: " << pathname << ", " << ext
+        << ", " << dir << ", " << file << endl);
+    DBG(cerr << "find ancillary file comp: " << directory << ", " << filename
+        << ", " << basename << endl);
+
+    string dot_ext = "." + ext;
+
+    string name = directory + basename + dot_ext;
+    if (access(name.c_str(), F_OK) == 0)
+        return name;
+
+    name = pathname + dot_ext;
+    if (access(name.c_str(), F_OK) == 0)
+        return name;
+
+    name = directory + ext;
+    if (access(name.c_str(), F_OK) == 0)
+        return name;
+
+    name = dir + basename + dot_ext;
+    if (access(name.c_str(), F_OK) == 0)
+        return name;
+
+    name = directory + file + dot_ext;
+    if (access(name.c_str(), F_OK) == 0)
+        return name;
+
+    name = dir + file + dot_ext;
+    if (access(name.c_str(), F_OK) == 0)
+        return name;
+
+    name = dir + ext;
+    if (access(name.c_str(), F_OK) == 0)
+        return name;
+
+    return "";
+}
+
+// Given a pathname to a datafile, take that pathname apart and look for an
+// ancillary file that describes a group of datafiles of which this datafile
+// is a member. Assume that groups follow a simple naming convention where
+// files use either leading or trailing digits and a common basename to name
+// group members. For example, 00stuff.hdf, 01stuff.hdf, 02stuff.hdf, ..., is
+// a group and is has `stuff' as its basename.
+
+/** Assume that <tt>name</tt> refers to a file that is one of a
+    group of files which share a common `base' name and differ only by
+    some prefix or suffix digits (e.g. <tt>00base</tt>, <tt>01base</tt>,
+    ... or <tt>base00</tt>, ... have the base name <tt>base</tt>). This
+    function looks for a file <tt>base.ext</tt>.
+
+    @param name The name (full or relative) to one member of a group
+    of files.
+    @param ext The extension of the group's ancillary file. Note that
+    <tt>ext</tt> should include a period (.) if that needs to
+    separate the base name from the extension.
+    @return The pathname to the group's ancillary file if found, otherwise
+    the empty string (""). */
+string
+Ancillary::find_group_ancillary_file( const string &name, const string &ext )
+{
+    // Given /usr/local/data/stuff.01.nc
+    // pathname = /usr/local/data, filename = stuff.01.nc and
+    // rootname = stuff.01
+    string::size_type slash = name.find_last_of('/');
+    string dirname = name.substr(0, slash);
+    string filename = name.substr(slash + 1);
+    string rootname = filename.substr(0, filename.find_last_of('.'));
+
+    // Instead of using regexs, scan the filename for leading and then
+    // trailing digits.
+    string::iterator rootname_iter = rootname.begin();
+    string::iterator rootname_end_iter = rootname.end();
+    if (isdigit(*rootname_iter)) {
+        while (rootname_iter != rootname_end_iter
+               && isdigit(*++rootname_iter))
+            ;
+
+        // We want: new_name = dirname + "/" + <base> + ext but without
+        // creating a bunch of temp objects.
+        string new_name = dirname;
+        new_name.append("/");
+        new_name.append(rootname_iter, rootname_end_iter);
+        new_name.append(ext);
+        DBG(cerr << "New Name (iter): " << new_name << endl);
+        if (access(new_name.c_str(), F_OK) == 0) {
+            return new_name;
+        }
+    }
+
+    string::reverse_iterator rootname_riter = rootname.rbegin();
+    string::reverse_iterator rootname_end_riter = rootname.rend();
+    if (isdigit(*rootname_riter)) {
+        while (rootname_riter != rootname_end_riter
+               && isdigit(*++rootname_riter))
+            ;
+        string new_name = dirname;
+        new_name.append("/");
+        // I used reverse iters to scan rootname backwards. To avoid
+        // reversing the fragment between end_riter and riter, pass append
+        // regular iters obtained using reverse_iterator::base(). See Meyers
+        // p. 123. 1/22/2002 jhrg
+        new_name.append(rootname_end_riter.base(), rootname_riter.base());
+        new_name.append(ext);
+        DBG(cerr << "New Name (riter): " << new_name << endl);
+        if (access(new_name.c_str(), F_OK) == 0) {
+            return new_name;
+        }
+    }
+
+    // If we're here either the file does not begin with leading digits or a
+    // template made by removing those digits was not found.
+
+    return "";
+}
+
+void
+Ancillary::read_ancillary_das( DAS &das,
+			       const string &pathname,
+			       const string &dir,
+			       const string &file )
+{
+    string name = find_ancillary_file( pathname, "das", dir, file ) ;
+
+    DBG(cerr << "In Ancillary::read_ancillary_dds: name:" << name << endl);
+
+    FILE *in = fopen( name.c_str(), "r" ) ;
+    if( in ) {
+        das.parse( in ) ;
+        (void)fclose( in ) ;
+#if 0
+        int res = fclose( in ) ;
+        if( res )
+            DBG(cerr << "Ancillary::read_ancillary_das - Failed to close file " << (void *)in << endl) ;
+#endif
+    }
+}
+
+void
+Ancillary::read_ancillary_dds( DDS &dds,
+			       const string &pathname,
+			       const string &dir,
+			       const string &file )
+{
+    string name = find_ancillary_file( pathname, "dds", dir, file ) ;
+
+    DBG(cerr << "In Ancillary::read_ancillary_dds: name:" << name << endl);
+
+    FILE *in = fopen( name.c_str(), "r" ) ;
+    if( in ) {
+        dds.parse( in ) ;
+        (void)fclose( in ) ;
+#if 0
+        int res = fclose( in ) ;
+        if( res )
+            DBG(cerr << "Ancillary::read_ancillary_das - Failed to close file " << (void *)in << endl) ;
+#endif
+    }
+}
+
+} // namespace libdap
+
diff --git a/Ancillary.h b/Ancillary.h
new file mode 100644
index 0000000..5ed7787
--- /dev/null
+++ b/Ancillary.h
@@ -0,0 +1,73 @@
+// Ancillary.h
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//         Patrick West <pwest@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1994-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+//      pwest           Patrick West <pwest@opendap.org>
+
+#ifndef S_Ancillary_h
+#define S_Ancillary_h 1
+
+#include <string>
+
+using std::string ;
+
+#include "DAS.h"
+#include "DDS.h"
+
+namespace libdap
+{
+
+class Ancillary
+{
+public:
+    static string	find_ancillary_file( const string &pathname,
+					     const string &ext,
+					     const string &dir,
+					     const string &file ) ;
+
+    static string	find_group_ancillary_file( const string &pathname,
+						   const string &ext ) ;
+
+    static void		read_ancillary_das( DAS &das,
+					    const string &pathname,
+					    const string &dir = "",
+					    const string &file = "" ) ;
+
+    static void		read_ancillary_dds( DDS &dds,
+					    const string &pathname,
+					    const string &dir = "",
+					    const string &file = "" ) ;
+} ;
+
+} // namespace libdap
+
+#endif // S_Ancillary_h
+
diff --git a/Array.cc b/Array.cc
new file mode 100644
index 0000000..659a90e
--- /dev/null
+++ b/Array.cc
@@ -0,0 +1,1378 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1994-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// Implementation for Array.
+//
+// jhrg 9/13/94
+
+#include "config.h"
+
+// #define DODS_DEBUG
+
+#include <algorithm>
+#include <functional>
+#include <sstream>
+
+#include "Array.h"
+#include "Grid.h"
+
+#include "D4Attributes.h"
+#include "DMR.h"
+#include "D4Dimensions.h"
+#include "D4Maps.h"
+#include "D4Group.h"
+#include "D4EnumDefs.h"
+#include "D4Enum.h"
+#include "XMLWriter.h"
+
+#include "util.h"
+#include "debug.h"
+#include "InternalErr.h"
+#include "escaping.h"
+
+using namespace std;
+
+namespace libdap {
+
+Array::dimension::dimension(D4Dimension *d) : dim(d), use_sdim_for_slice(true)
+{
+    size = d->size();
+    name = d->name();
+
+    start = 0;
+    stop = size - 1;
+    stride = 1;
+    c_size = size;
+}
+
+void
+Array::_duplicate(const Array &a)
+{
+    _shape = a._shape;
+
+    // Deep copy the Maps if they are being used.
+    if (a.d_maps) {
+    	d_maps = new D4Maps(*(a.d_maps));
+    }
+    else {
+    	d_maps = 0;
+    }
+    // d_maps = a.d_maps ? new D4Maps(*(a.d_maps)) : 0;
+}
+
+// The first method of calculating length works when only one dimension is
+// constrained and you want the others to appear in total. This is important
+// when selecting from grids since users may not select from all dimensions
+// in which case that means they want the whole thing. Array projection
+// should probably work this way too, but it doesn't. 9/21/2001 jhrg
+
+/** @deprecated Calling this method should never be necessary. It is used
+    internally called whenever the size of the Array is changed, e.g., by a
+    constraint.
+
+    Changes the length property of the array.
+*/
+void
+Array::update_length(int)
+{
+    int length = 1;
+    for (Dim_citer i = _shape.begin(); i != _shape.end(); i++) {
+#if 0
+        // If the size of any dimension is zero, then the array is not
+        // capable of storing any values. jhrg 1/28/16
+        length *= (*i).c_size > 0 ? (*i).c_size : 1;
+#endif
+        length *= (*i).c_size;
+    }
+
+    set_length(length);
+}
+
+// Construct an instance of Array. The (BaseType *) is assumed to be
+// allocated using new - The dtor for Vector will delete this object.
+
+/** Build an array with a name and an element type. The name may be omitted,
+    which will create a nameless variable. The template (element type) pointer
+    may also be omitted, but if it is omitted when the Array is created, it
+    \e must be added (with \c add_var()) before \c read() or \c deserialize()
+    is called.
+
+    @todo Force the Array::add_var() method to be used to add \e v.
+    This version of add_var() calls Vector::add_var().
+
+    @param n A string containing the name of the variable to be
+    created.
+    @param v A pointer to a variable of the type to be included
+    in the Array. May be null and set later using add_var() or add_var_nocopy()
+    @brief Array constructor
+*/
+Array::Array(const string &n, BaseType *v, bool is_dap4 /* default:false */)
+	: Vector(n, 0, dods_array_c, is_dap4), d_maps(0)
+{
+    add_var(v); // Vector::add_var() stores null if v is null
+}
+
+/** Build an array on the server-side with a name, a dataset name from which
+    this Array is being created, and an element type.
+
+    @todo Force the Array::add_var() method to be used to add \e v.
+    This version of add_var() calls Vector::add_var().
+
+    @param n A string containing the name of the variable to be created.
+    @param d A string containing the name of the dataset from which this
+    variable is being created.
+    @param v A pointer to a variable of the type to be included
+    in the Array.
+    @brief Array constructor
+*/
+Array::Array(const string &n, const string &d, BaseType *v, bool is_dap4 /* default:false */)
+    : Vector(n, d, 0, dods_array_c, is_dap4), d_maps(0)
+{
+    add_var(v); // Vector::add_var() stores null if v is null
+}
+
+/** @brief The Array copy constructor. */
+Array::Array(const Array &rhs) : Vector(rhs)
+{
+    _duplicate(rhs);
+}
+
+/** @brief The Array destructor. */
+Array::~Array()
+{
+	delete d_maps;
+}
+
+BaseType *
+Array::ptr_duplicate()
+{
+    return new Array(*this);
+}
+
+Array &
+Array::operator=(const Array &rhs)
+{
+    if (this == &rhs)
+        return *this;
+
+    dynamic_cast<Vector &>(*this) = rhs;
+
+    _duplicate(rhs);
+
+    return *this;
+}
+
+void
+Array::transform_to_dap4(D4Group *root, Constructor *container)
+{
+    DBG(cerr << __func__ << "() - BEGIN (array:" << name() << ")" << endl;);
+	Array *dest = static_cast<Array*>(ptr_duplicate());
+
+	// If it's already a DAP4 object then we can just return it!
+	if(is_dap4()){
+        DBG(cerr << __func__ << "() - Already DAP4 type: Just making a copy and adding to container. " << endl;);
+	    container->add_var_nocopy(dest);
+	    DBG(cerr << __func__ << "() - END (Already DAP4 type)" << endl;);
+	}
+	// Process the Array's dimensions, making D4 shared dimensions for
+	// D2 dimensions that are named. If there is just a size, don't make
+	// a D4Dimension (In DAP4 you cannot share a dimension unless it has
+	// a name). jhrg 3/18/14
+
+	D4Dimensions *root_dims = root->dims();
+	for (Array::Dim_iter dap2_dim = dest->dim_begin(), e = dest->dim_end(); dap2_dim != e; ++dap2_dim) {
+		if (!(*dap2_dim).name.empty()) {
+	        DBG(cerr << __func__ << "() - Processing the array dimension '" << (*dap2_dim).name << "'" << endl;);
+
+			// If a D4Dimension with the name already exists, use it.
+			D4Dimension *d4_dim = root_dims->find_dim((*dap2_dim).name);
+			if (!d4_dim) {
+				d4_dim = new D4Dimension((*dap2_dim).name, (*dap2_dim).size);
+				root_dims->add_dim_nocopy(d4_dim);
+		        DBG(cerr << __func__ << "() -" <<
+		            " Added NEW D4Dimension '"<< d4_dim->name() << "' (" <<
+		            (void *)d4_dim << ") to root->dims()"<< endl;);
+			}
+	        else {
+	            DBG(cerr << __func__ << "() -" <<
+	                " Using Existing D4Dimension '"<< d4_dim->name() << "' (" <<
+	                (void *)d4_dim << ")"<< endl;);
+
+	            if (d4_dim->size() != (unsigned long) (*dap2_dim).size) {
+                // TODO Revisit this decision. jhrg 3/18/14
+                // ...in case the name/size are different, make a unique D4Dimension
+                // but don't fiddle with the name. Not sure I like this idea, so I'm
+                // making the case explicit (could be rolled in to the block above).
+                // jhrg 3/18/14
+                //
+                // This is causing problems in the FITS handler because there are cases
+                // where two arrays have dimensions with the same name but different
+                // sizes. The deserializing code is using the first size listed, which is
+                // wrong in some cases. I'm going to try making this new D4Dimension using
+                // the dim name along with the variable name. jhrg 8/15/14
+                    d4_dim = new D4Dimension((*dap2_dim).name + "_" + name(), (*dap2_dim).size);
+                    DBG(cerr << __func__ << "() -" <<
+                         " Utilizing Name/Size Conflict Naming Artifice. name'"<< d4_dim->name() << "' (" <<
+                         (void *)d4_dim << ")"<< endl;);
+                    root_dims->add_dim_nocopy(d4_dim);
+	            }
+			}
+			// At this point d4_dim's name and size == those of (*d) so just set
+			// the D4Dimension pointer so it matches the one in the D4Group.
+			(*dap2_dim).dim = d4_dim;
+		}
+
+	}
+
+	// Copy the D2 attributes to D4 Attributes
+	dest->attributes()->transform_to_dap4(get_attr_table());
+	dest->set_is_dap4(true);
+	container->add_var_nocopy(dest);
+    DBG(cerr << __func__ << "() - END (array:" << name() << ")" << endl;);
+}
+
+bool Array::is_dap2_grid(){
+    bool is_grid = false;
+    if(this->is_dap4()){
+        DBG( cerr << __func__ << "() - Array '"<< name() << "' is DAP4 object!"  << endl;)
+        D4Maps *d4_maps = this->maps();
+        is_grid = d4_maps->size(); // It can't be a grid if there are no maps...
+        if(is_grid){
+            DBG( cerr << __func__ << "() - Array '"<< name() << "' has D4Maps." << endl;)
+            // hmmm this might be a DAP2 Grid...
+            D4Maps::D4MapsIter i = d4_maps->map_begin();
+            D4Maps::D4MapsIter e = d4_maps->map_end();
+            while(i!=e){
+                DBG( cerr << __func__ << "() - Map '"<< (*i)->array()->name() << " has " << (*i)->array()->_shape.size()  << " dimension(s)."  << endl;)
+                if((*i)->array()->_shape.size() > 1){
+                    is_grid = false;
+                    i = e;
+                }
+                else {
+                    i++;
+                }
+            }
+        }
+        else {
+            DBG( cerr << __func__ << "() - Array '"<< name() << "' has no D4Maps." << endl;)
+        }
+    }
+    DBG( cerr << __func__ << "() - is_grid: "<< (is_grid?"true":"false") << endl;)
+    return is_grid;
+}
+
+/**
+ * @brief Transforms this instance of a D4Array into the corresponding DAP2 object.
+ *
+ * This transformation may return an Array or a Grid object. The DAP2 Grid construct
+ * is semantically contained in the DAP4 concept of arrays with Map arrays. If all
+ * of the Maps are one dimensional then the D4Array can be represented as a
+ * Grid object.
+ *
+ * @param  The AttrTable pointer parent_attr_table is used by Groups, which disappear
+ * from the DAP2 representation. Their children are returned in the the BAseType vector
+ * their attributes are added to parent_attr_table.
+ * @return A pointer to a vector of BaseType pointers (right?). In this D4Array case
+ * returned vector may contain a DAP2 Array or a Grid. Or, if the Array' prototype is
+ * a type that cannot be represented in DAP2 the return will be NULL.
+ */
+std::vector<BaseType *> *
+Array::transform_to_dap2(AttrTable *){
+    DBG(cerr << __func__ << "() - BEGIN Array '"<< name() << "'" << endl;);
+
+    BaseType *dest;
+    if(is_dap4()){ // Don't convert a DAP2 thing
+
+        // Can Precious be represented as a DAP2 Grid
+        if(is_dap2_grid()){
+            // Oh yay! Grids are special.
+            DBG(cerr << __func__ << "() - Array '"<< name() << "' is dap2 Grid!"  << endl;);
+            Grid *g = new Grid(name());
+            dest = g;
+            Array *grid_array = (Array *) this->ptr_duplicate();
+            g->set_array(grid_array);
+
+            // Get the metadata into the Grid
+            AttrTable *grid_attrs = attributes()->get_AttrTable(name());
+            g->set_attr_table(*grid_attrs); // Copy it into the Grid object.
+            // grid_array->set_attr_table(*grid_attrs); // Copy it into the data Array.
+            delete grid_attrs;
+
+            // Clear the Grid data Array attributes.
+            AttrTable at;
+            at.set_name(name());
+            grid_array->set_attr_table(at);
+
+            // Process the Map Arrays.
+            D4Maps *d4_maps = this->maps();
+            vector<BaseType *> dropped_maps;
+            D4Maps::D4MapsIter miter = d4_maps->map_begin();
+            D4Maps::D4MapsIter end = d4_maps->map_end();
+            for( ; miter!=end; miter++){
+                D4Map *d4_map =  (*miter);
+                Array *d4_map_array = const_cast<Array*>(d4_map->array());
+                vector<BaseType *> *d2_result = d4_map_array->transform_to_dap2(&(g->get_attr_table()));
+                if(d2_result){
+                    if(d2_result->size()>1)
+                        throw Error(internal_error,string(__func__)+"() - ERROR: D4Map Array conversion resulted in multiple DAP2 objects.");
+
+                    // TODO - This is probably slow and needs a better pattern. const_cast? static_cast?
+                    Array *d2_map_array = dynamic_cast<Array *>((*d2_result)[0]);
+                    if(d2_map_array){
+                        if(d2_map_array->dimensions()!=1)
+                            throw Error(internal_error,string(__func__)+"() - ERROR: DAP2 array from D4Map Array conversion has more than 1 dimension.");
+
+                        g->add_map(d2_map_array,false);
+                        AttrTable at = d2_map_array->get_attr_table();
+                        DBG( cerr << __func__ << "() - " <<
+                            "DAS For Grid Map '" << d2_map_array->name() << "':" << endl;
+                             at.print(cerr); );
+                    }
+                    else {
+                        throw Error(internal_error,string(__func__)+"() - Unable to interpret returned DAP2 content.");
+                    }
+                    delete d2_result;
+                }
+                else {
+                    dropped_maps.push_back(d4_map_array);
+                }
+            }
+
+            // Did we have a transform failure?
+            if(!dropped_maps.empty()){
+                // Yup... tell the story in the attributes.
+                AttrTable *dv_table = Constructor::make_dropped_vars_attr_table(&dropped_maps);
+                dest->get_attr_table().append_container(dv_table,dv_table->get_name());
+            }
+        }
+        else {
+            // It's not a Grid so we can make a simple copy of our Precious.
+            DBG( cerr << __func__ << "() - Array '"<< name() << "' is not a Grid!"  << endl);
+            BaseType *proto = this->prototype();
+            switch(proto->type()){
+            case dods_int64_c:
+            case dods_uint64_c:
+            case dods_enum_c:
+            case dods_opaque_c:
+            {
+                // For now we punt on these type as they have no easy representation in
+                // the DAP2 data model. By setting this to NULL we cause the Array to be
+                // dropped and this will be reflected in the metadata (DAS).
+                dest = NULL;
+                break;
+            }
+            default:
+            {
+                dest = this->ptr_duplicate();
+                // convert the d4 attributes to a dap2 attribute table.
+                AttrTable *attrs = this->attributes()->get_AttrTable(name());
+                dest->set_attr_table(*attrs);
+                dest->set_is_dap4(false);
+                AttrTable at = dest->get_attr_table();
+                DBG( cerr << __func__ << "() - " <<
+                    "DAS for new Array '" << dest->name() << "':" << endl;
+                    at.print(cerr); )
+
+                break;
+            }
+            }
+        }
+
+    }
+    else {
+        // If it's a DAP2 Array already then we just make a copy of our Precious.
+        dest = this->ptr_duplicate();
+    }
+    // attrs->print(cerr,"",true);
+    vector<BaseType *> *result;
+    if(dest){
+        result =  new vector<BaseType *>();
+        result->push_back(dest);
+    }
+    else {
+        result = NULL;
+    }
+    DBG( cerr << __func__ << "() - END Array '"<< name() << "'" << endl;);
+    return result;
+}
+
+/**
+ * Hackery that helps build a new D4Group from an old one. We need to re-wire the
+ * D4Dimension (note the lack of an 's' at then end) that the copied Array objects
+ * hold. This code does that. Note that these are 'weak pointers' so they should
+ * never be freed - the D4Group object will take care of that.
+ *
+ * @note The order of the D4Dimension instances matches in 'old_dims' and 'new_dims'.
+ *
+ * @param old_dims The Old D4Dimension objects (held in a D4Dimensions instance)
+ * @param new_dims The New D4Dimension objects.
+ */
+void
+Array::update_dimension_pointers(D4Dimensions *old_dims, D4Dimensions *new_dims)
+{
+	std::vector<dimension>::iterator i = _shape.begin(), e = _shape.end();
+	while (i != e) {
+		D4Dimensions::D4DimensionsIter old_i = old_dims->dim_begin(), old_e = old_dims->dim_end();
+		while (old_i != old_e) {
+			if ((*i).dim == *old_i) {
+				(*i).dim =  new_dims->find_dim((*old_i)->name());
+			}
+			++old_i;
+		}
+
+		++i;
+	}
+}
+
+/** @brief Add the BaseType pointer to this constructor type
+    instance.
+
+    Propagate the name of the BaseType instance to this instance. This
+    ensures that variables at any given level of the DDS table have
+    unique names (i.e., that Arrays do not have their default name ""). If
+    <tt>v</tt>'s name is null, then assume that the array \e is named and
+    don't overwrite it with <tt>v</tt>'s null name.
+
+    @note It is possible for the BaseType pointer to be null when this
+    method is called, a behavior that differs considerably from that of
+    the other 'add_var()' methods.
+
+    @note This version checks to see if \e v is an array. If so, it calls
+    Vector::add_var() using the template variable of \e v and then appends
+    the dimensions of \e v to this array. This somewhat obscure behavior
+    simplifies 'translating' Sequences to arrays when the actual variable
+    being translated is not a regular Sequence but an array of Sequences.
+    This is of very debatable usefulness, but it's here all the same.
+
+    @param v The template variable for the array
+    @param p The Part parameter defaults to nil and is ignored by this method.
+*/
+
+void
+Array::add_var(BaseType *v, Part)
+{
+    // If 'v' is an Array, add the template instance to this object and
+    // then copy the dimension information. Odd semantics; I wonder if this
+    //is ever used. jhrg 6/13/12
+    if (v && v->type() == dods_array_c) {
+        Array *a = static_cast<Array*>(v);
+        Vector::add_var(a->var());
+
+        Dim_iter i = a->dim_begin();
+        Dim_iter i_end = a->dim_end();
+        while (i != i_end) {
+            append_dim(a->dimension_size(i), a->dimension_name(i));
+            ++i;
+        }
+    }
+    else {
+        Vector::add_var(v);
+    }
+}
+
+void
+Array::add_var_nocopy(BaseType *v, Part)
+{
+    // If 'v' is an Array, add the template instance to this object and
+    // then copy the dimension information. Odd semantics; I wonder if this
+    //is ever used. jhrg 6/13/12
+    if (v && v->type() == dods_array_c) {
+        Array &a = dynamic_cast<Array&>(*v);
+        Vector::add_var_nocopy(a.var());
+        Dim_iter i = a.dim_begin();
+        Dim_iter i_end = a.dim_end();
+        while (i != i_end) {
+            append_dim(a.dimension_size(i), a.dimension_name(i));
+            ++i;
+        }
+    }
+    else {
+        Vector::add_var_nocopy(v);
+    }
+}
+
+/** Given a size and a name, this function adds a dimension to the
+    array.  For example, if the Array is already 10 elements long,
+    calling <tt>append_dim</tt> with a size of 5 will transform the array
+    into a 10x5 matrix.  Calling it again with a size of 2 will
+    create a 10x5x2 array, and so on.  This sets Vector's length
+    member as a side effect.
+
+    @param size The size of the desired new row.
+    @param name The name of the new dimension.  This defaults to
+    an empty string.
+    @brief Add a dimension of a given size. */
+void
+Array::append_dim(int size, const string &name)
+{
+    dimension d(size, www2id(name));
+    _shape.push_back(d);
+
+    update_length();
+}
+
+void
+Array::append_dim(D4Dimension *dim)
+{
+	dimension d(/*dim->size(), www2id(dim->name()),*/ dim);
+    _shape.push_back(d);
+
+    update_length();
+}
+
+/** Creates a new OUTER dimension (slowest varying in rowmajor)
+ * for the array by prepending rather than appending it.
+ * @param size cardinality of the new dimension
+ * @param name  optional name for the new dimension
+ */
+void
+Array::prepend_dim(int size, const string& name/* = "" */)
+{
+  dimension d(size, www2id(name));
+  // Shifts the whole array, but it's tiny in general
+  _shape.insert(_shape.begin(), d);
+
+  update_length(); // the number is ignored...
+}
+
+void
+Array::prepend_dim(D4Dimension *dim)
+{
+  dimension d(/*dim->size(), www2id(dim->name()),*/ dim);
+  // Shifts the whole array, but it's tiny in general
+  _shape.insert(_shape.begin(), d);
+
+  update_length(); // the number is ignored...
+}
+
+/** Remove all the dimensions currently set for the Array. This also
+ * removes all constraint information.
+ */
+void
+Array::clear_all_dims()
+{
+	_shape.clear();
+}
+/** Resets the dimension constraint information so that the entire
+    array is selected.
+
+    @brief Reset constraint to select entire array.
+*/
+
+void
+Array::reset_constraint()
+{
+    set_length(-1);
+
+    for (Dim_iter i = _shape.begin(); i != _shape.end(); i++) {
+        (*i).start = 0;
+        (*i).stop = (*i).size - 1;
+        (*i).stride = 1;
+        (*i).c_size = (*i).size;
+
+        update_length();
+    }
+}
+
+
+/** Tell the Array object to clear the constraint information about
+    dimensions. Do this <i>once</i> before calling <tt>add_constraint()</tt>
+    for each new constraint expression. Only the dimensions explicitly
+    selected using <tt>add_constraint()</tt> will be sent.
+
+    @deprecated This should never be used.
+    @brief Clears the projection; add each projected dimension explicitly using
+    <tt>add_constraint</tt>.
+*/
+void
+Array::clear_constraint()
+{
+    reset_constraint();
+}
+
+// Note: MS VC++ won't tolerate embedded newlines in strings, hence the \n
+// is explicit.
+static const char *array_sss = \
+"Invalid constraint parameters: At least one of the start, stride or stop \n\
+specified do not match the array variable.";
+
+/** Once a dimension has been created (see append_dim()), it can
+    be constrained.  This will make the array appear to the rest
+    of the world to be smaller than it is.  This functions sets the
+    projection for a dimension, and marks that dimension as part of the
+    current projection.
+
+    @note A stride value <= 0 or > the array size is an error and causes
+    add_constraint to throw an Error. Similarly, start or stop values >
+    size also cause an Error exception to be thrown.
+
+    @brief Adds a constraint to an Array dimension.
+
+    @param i An iterator pointing to the dimension in the list of
+    dimensions.
+    @param start The start index of the constraint.
+    @param stride The stride value of the constraint.
+    @param stop The stop index of the constraint. A value of -1 indicates
+    'to the end' of the array.
+    @exception Error Thrown if the any of values of start, stop or stride
+    cannot be applied to this array. */
+void
+Array::add_constraint(Dim_iter i, int start, int stride, int stop)
+{
+    dimension &d = *i ;
+
+    // if stop is -1, set it to the array's max element index
+    // jhrg 12/20/12
+    if (stop == -1)
+        stop = d.size - 1;
+
+    // Check for bad constraints.
+    // Jose Garcia
+    // Usually invalid data for a constraint is the user's mistake
+    // because they build a wrong URL in the client side.
+    if (start >= d.size || stop >= d.size || stride > d.size || stride <= 0)
+        throw Error(malformed_expr, array_sss);
+
+    if (((stop - start) / stride + 1) > d.size)
+        throw Error(malformed_expr, array_sss);
+
+    d.start = start;
+    d.stop = stop;
+    d.stride = stride;
+
+    d.c_size = (stop - start) / stride + 1;
+
+    DBG(cerr << "add_constraint: c_size = " << d.c_size << endl);
+
+    update_length();
+
+    d.use_sdim_for_slice = false;
+}
+
+void
+Array::add_constraint(Dim_iter i, D4Dimension *dim)
+{
+    dimension &d = *i ;
+
+    if (dim->constrained())
+    	add_constraint(i, dim->c_start(), dim->c_stride(), dim->c_stop());
+
+    dim->set_used_by_projected_var(true);
+
+	// In this case the value below overrides the value for use_sdim_for_slice
+	// set in the above call. jhrg 12/20/13
+	d.use_sdim_for_slice = true;
+}
+
+/** Returns an iterator to the first dimension of the Array. */
+Array::Dim_iter
+Array::dim_begin()
+{
+    return _shape.begin() ;
+}
+
+/** Returns an iterator past the last dimension of the Array. */
+Array::Dim_iter
+Array::dim_end()
+{
+    return _shape.end() ;
+}
+
+//TODO Many of these methods take a bool parameter that serves no use; remove.
+
+/** Return the total number of dimensions contained in the array.
+    When <i>constrained</i> is TRUE, return the number of dimensions
+    given the most recently evaluated constraint expression.
+
+    @brief Return the total number of dimensions in the array.
+    @param constrained A boolean flag to indicate whether the array is
+    constrained or not.  Ignored.
+*/
+unsigned int
+Array::dimensions(bool /*constrained*/)
+{
+    return _shape.size();
+}
+
+/** Return the size of the array dimension referred to by <i>i</i>.
+    If the dimension is constrained the constrained size is returned if
+    <i>constrained</i> is \c true.
+
+    @brief Returns the size of the dimension.
+
+    @param i The dimension.
+
+    @param constrained If this parameter is TRUE, the method returns the
+    constrained size of the array so long as a constraint has been applied to
+    this dimension. If TRUE and no constraint has been applied, this method
+    returns zero. If it is FALSE, the method ignores any constraint that
+    has been applied to this dimension and returns the full size of the
+    dimension. The default value is FALSE.
+
+    @return An integer containing the size of the specified dimension.
+*/
+int
+Array::dimension_size(Dim_iter i, bool constrained)
+{
+    int size = 0;
+
+    if (!_shape.empty()) {
+        if (constrained)
+            size = (*i).c_size;
+        else
+            size = (*i).size;
+    }
+
+    return size;
+}
+
+/** Use this function to return the start index of an array
+    dimension.  If the array is constrained (indicated with the
+    <i>constrained</i> argument), the start index of the constrained
+    array is returned (or zero if the dimension in question is not
+    selected at all).  See also <tt>dimension_stop()</tt> and
+    <tt>dimension_stride()</tt>.
+
+    @brief Return the start index of a dimension.
+
+    @param i The dimension.
+    @param constrained If this parameter is TRUE, the function
+    returns the start index only if the dimension is constrained
+    (subject to a start, stop, or stride constraint).  If
+    the dimension is not constrained, the function returns zero.  If it
+    is FALSE, the function returns the start index whether or not
+    the dimension is constrained.
+    @return The desired start index.
+*/
+int
+Array::dimension_start(Dim_iter i, bool /*constrained*/)
+{
+    return (!_shape.empty()) ? (*i).start : 0;
+}
+
+/** Use this function to return the stop index of an array
+    dimension.  If the array is constrained (indicated with the
+    <i>constrained</i> argument), the stop index of the constrained
+    array is returned (or zero if the dimension in question is not
+    selected at all).  See also <tt>dimension_start()</tt> and
+    <tt>dimension_stride()</tt>.
+
+    @brief Return the stop index of the constraint.
+
+    @param i The dimension.
+    @param constrained If this parameter is TRUE, the function
+    returns the stop index only if the dimension is  constrained
+    (subject to a start, stop, or stride constraint).  If
+    the dimension is not constrained, the function returns zero.  If it
+    is FALSE, the function returns the stop index whether or not
+    the dimension is constrained.
+    @return The desired stop index.
+*/
+int
+Array::dimension_stop(Dim_iter i, bool /*constrained*/)
+{
+    return (!_shape.empty()) ? (*i).stop : 0;
+}
+
+/** Use this function to return the stride value of an array
+    dimension.  If the array is constrained (indicated with the
+    <i>constrained</i> argument), the stride value of the constrained
+    array is returned (or zero if the dimension in question is not
+    selected at all).  See also <tt>dimension_stop()</tt> and
+    <tt>dimension_start()</tt>.
+
+    @brief Returns the stride value of the constraint.
+
+    @param i The dimension.
+    @param constrained If this parameter is TRUE, the function
+    returns the stride value only if the dimension is constrained
+    (subject to a start, stop, or stride constraint).  If
+    the dimension is not constrained, the function returns zero.  If it
+    is FALSE, the function returns the stride value whether or not
+    the dimension is constrained.
+    @return The stride value requested, or zero, if <i>constrained</i>
+    is TRUE and the dimension is not selected.
+*/
+int
+Array::dimension_stride(Dim_iter i, bool /*constrained*/)
+{
+    return (!_shape.empty()) ? (*i).stride : 0;
+}
+
+/** This function returns the name of the dimension indicated with
+    <i>p</i>.  Since this method is public, it is possible to call it
+    before the Array object has been properly initialized.  This will
+    cause an exception.  So don't do that.
+
+    @brief Returns the name of the specified dimension.
+
+    @param i The dimension.
+    @return A pointer to a string containing the dimension name.
+*/
+string
+Array::dimension_name(Dim_iter i)
+{
+    // Jose Garcia
+    // Since this method is public, it is possible for a user
+    // to call it before the Array object has been properly set
+    // this will cause an exception which is the user's fault.
+    // (User in this context is the developer of the surrogate library.)
+    if (_shape.empty())
+        throw  InternalErr(__FILE__, __LINE__,
+                           "*This* array has no dimensions.");
+    return (*i).name;
+}
+
+D4Dimension *
+Array::dimension_D4dim(Dim_iter i)
+{
+	return (!_shape.empty()) ? (*i).dim : 0;
+}
+
+D4Maps *
+Array::maps()
+{
+	if (!d_maps) d_maps = new D4Maps(this); 	// init with this as parent
+	return d_maps;
+}
+
+#if 0
+/**
+ * @brief Returns the width of the data, in bytes.
+ * @param constrained if true, return the size of the array in bytes taking into
+ * account the current constraints on various dimensions. False by default.
+ * @return The number of bytes needed to store the array values.
+ */
+unsigned int Array::width(bool constrained) const
+{
+
+	if (constrained) {
+		// This preserves the original method's semantics when we ask for the
+		// size of the constrained array but no constraint has been applied.
+		// In this case, length will be -1. Wrong, I know...
+		return length() * var()->width(constrained);
+	}
+	else {
+		int length = 1;
+		for (Dim_iter i = _shape.begin(); i != _shape.end(); i++) {
+			length *= dimension_size(i, false);
+		}
+		return length * var()->width(false);
+	}
+}
+#endif
+
+class PrintD4ArrayDimXMLWriter: public unary_function<Array::dimension&, void> {
+	XMLWriter &xml;
+	// Was this variable constrained using local/direct slicing? i.e., is d_local_constraint set?
+	// If so, don't use shared dimensions; instead emit Dim elements that are anonymous.
+	bool d_constrained;
+public:
+
+	PrintD4ArrayDimXMLWriter(XMLWriter &xml, bool c) : xml(xml), d_constrained(c) { }
+
+	void operator()(Array::dimension &d)
+	{
+		// This duplicates code in D4Dimensions (where D4Dimension::print_dap4() is defined
+		// because of the need to print the constrained size of a dimension. I think that
+		// the constraint information has to be kept here and not in the dimension (since they
+		// are shared dims). Could hack print_dap4() to take the constrained size, however.
+		if (xmlTextWriterStartElement(xml.get_writer(), (const xmlChar*) "Dim") < 0)
+			throw InternalErr(__FILE__, __LINE__, "Could not write Dim element");
+
+		string name = (d.dim) ? d.dim->fully_qualified_name() : d.name;
+		// If there is a name, there must be a Dimension (named dimension) in scope
+		// so write its name but not its size.
+		if (!d_constrained && !name.empty()) {
+			if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "name", (const xmlChar*) name.c_str())
+					< 0) throw InternalErr(__FILE__, __LINE__, "Could not write attribute for name");
+		}
+		else if (d.use_sdim_for_slice) {
+			assert(!name.empty());
+			if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "name", (const xmlChar*) name.c_str())
+					< 0) throw InternalErr(__FILE__, __LINE__, "Could not write attribute for name");
+		}
+		else {
+			ostringstream size;
+			size << (d_constrained ? d.c_size : d.size);
+			if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "size",
+					(const xmlChar*) size.str().c_str()) < 0)
+				throw InternalErr(__FILE__, __LINE__, "Could not write attribute for name");
+		}
+
+		if (xmlTextWriterEndElement(xml.get_writer()) < 0)
+			throw InternalErr(__FILE__, __LINE__, "Could not end Dim element");
+	}
+};
+
+class PrintD4ConstructorVarXMLWriter: public unary_function<BaseType*, void> {
+	XMLWriter &xml;
+	bool d_constrained;
+public:
+	PrintD4ConstructorVarXMLWriter(XMLWriter &xml, bool c) : xml(xml), d_constrained(c) { }
+
+	void operator()(BaseType *btp)
+	{
+		btp->print_dap4(xml, d_constrained);
+	}
+};
+
+class PrintD4MapXMLWriter: public unary_function<D4Map*, void> {
+	XMLWriter &xml;
+
+public:
+	PrintD4MapXMLWriter(XMLWriter &xml) : xml(xml) { }
+
+	void operator()(D4Map *m)
+	{
+		m->print_dap4(xml);
+	}
+};
+
+/**
+ * @brief Print the DAP4 representation of an array.
+ * @param xml
+ * @param constrained
+ */
+void
+Array::print_dap4(XMLWriter &xml, bool constrained /* default: false*/)
+{
+	if (constrained && !send_p()) return;
+
+	if (xmlTextWriterStartElement(xml.get_writer(), (const xmlChar*) var()->type_name().c_str()) < 0)
+		throw InternalErr(__FILE__, __LINE__, "Could not write " + type_name() + " element");
+
+	if (!name().empty())
+		if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "name", (const xmlChar*)name().c_str()) < 0)
+			throw InternalErr(__FILE__, __LINE__, "Could not write attribute for name");
+
+	// Hack job... Copied from D4Enum::print_xml_writer. jhrg 11/12/13
+	if (var()->type() == dods_enum_c) {
+		D4Enum *e = static_cast<D4Enum*>(var());
+		string path = e->enumeration()->name();
+		if (e->enumeration()->parent()) {
+			// print the FQN for the enum def; D4Group::FQN() includes the trailing '/'
+			path = static_cast<D4Group*>(e->enumeration()->parent()->parent())->FQN() + path;
+		}
+		if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "enum", (const xmlChar*)path.c_str()) < 0)
+			throw InternalErr(__FILE__, __LINE__, "Could not write attribute for enum");
+	}
+
+	if (prototype()->is_constructor_type()) {
+		Constructor &c = static_cast<Constructor&>(*prototype());
+		for_each(c.var_begin(), c.var_end(), PrintD4ConstructorVarXMLWriter(xml, constrained));
+		// bind2nd(mem_fun_ref(&BaseType::print_dap4), xml));
+	}
+
+	// Drop the local_constraint which is per-array and use a per-dimension on instead
+    for_each(dim_begin(), dim_end(), PrintD4ArrayDimXMLWriter(xml, constrained));
+
+	attributes()->print_dap4(xml);
+
+	for_each(maps()->map_begin(), maps()->map_end(), PrintD4MapXMLWriter(xml));
+
+	if (xmlTextWriterEndElement(xml.get_writer()) < 0)
+		throw InternalErr(__FILE__, __LINE__, "Could not end " + type_name() + " element");
+}
+
+/** Prints a declaration for the Array.  This is what appears in a
+    DDS.  If the Array is constrained, the declaration will reflect
+    the size of the Array once the constraint is applied.
+
+    @brief Prints a DDS entry for the Array.
+
+    @param out Write the output to this FILE *.
+    @param space A string containing spaces to precede the
+    declaration.
+    @param print_semi A boolean indicating whether to print a
+    semi-colon after the declaration.  (TRUE means ``print a
+    semi-colon.'')
+    @param constraint_info A boolean value.  See
+    <tt>BaseType::print_decl()</tt>.
+    @param constrained This argument should be TRUE if the Array is
+    constrained, and FALSE otherwise.
+*/
+void
+Array::print_decl(FILE *out, string space, bool print_semi,
+                  bool constraint_info, bool constrained)
+{
+    ostringstream oss;
+    print_decl(oss, space, print_semi, constraint_info, constrained);
+    fwrite(oss.str().data(), sizeof(char), oss.str().length(), out);
+}
+
+/** Prints a declaration for the Array.  This is what appears in a
+    DDS.  If the Array is constrained, the declaration will reflect
+    the size of the Array once the constraint is applied.
+
+    @brief Prints a DDS entry for the Array.
+
+    @param out Write the output to this ostream.
+    @param space A string containing spaces to precede the
+    declaration.
+    @param print_semi A boolean indicating whether to print a
+    semi-colon after the declaration.  (TRUE means ``print a
+    semi-colon.'')
+    @param constraint_info A boolean value.  See
+    <tt>BaseType::print_decl()</tt>.
+    @param constrained This argument should be TRUE if the Array is
+    constrained, and FALSE otherwise.
+*/
+void Array::print_decl(ostream &out, string space, bool print_semi, bool constraint_info, bool constrained)
+{
+    if (constrained && !send_p()) return;
+
+    // print it, but w/o semicolon
+    var()->print_decl(out, space, false, constraint_info, constrained);
+
+    for (Dim_citer i = _shape.begin(); i != _shape.end(); i++) {
+        out << "[";
+        if ((*i).name != "") {
+            out << id2www((*i).name) << " = ";
+        }
+        if (constrained) {
+            out << (*i).c_size << "]";
+        }
+        else {
+            out << (*i).size << "]";
+        }
+    }
+
+    if (print_semi) {
+        out << ";\n";
+    }
+}
+
+/**
+ * @deprecated
+ */
+void
+Array::print_xml(FILE *out, string space, bool constrained)
+{
+    XMLWriter xml(space);
+    print_xml_writer_core(xml, constrained, "Array");
+    fwrite(xml.get_doc(), sizeof(char), xml.get_doc_size(), out);
+}
+
+/**
+ * @deprecated
+ */
+void
+Array::print_xml(ostream &out, string space, bool constrained)
+{
+    XMLWriter xml(space);
+    print_xml_writer_core(xml, constrained, "Array");
+    out << xml.get_doc();
+}
+
+/**
+ * @deprecated
+ */
+void
+Array::print_as_map_xml(FILE *out, string space, bool constrained)
+{
+    XMLWriter xml(space);
+    print_xml_writer_core(xml, constrained, "Map");
+    fwrite(xml.get_doc(), sizeof(char), xml.get_doc_size(), out);
+}
+
+/**
+ * @deprecated
+ */
+void
+Array::print_as_map_xml(ostream &out, string space, bool constrained)
+{
+    XMLWriter xml(space);
+    print_xml_writer_core(xml, constrained, "Map");
+    out << xml.get_doc();
+}
+
+/**
+ * @deprecated
+ */
+void
+Array::print_xml_core(FILE *out, string space, bool constrained, string tag)
+{
+    XMLWriter xml(space);
+    print_xml_writer_core(xml, constrained, tag);
+    fwrite(xml.get_doc(), sizeof(char), xml.get_doc_size(), out);
+}
+
+/**
+ * @deprecated
+ */
+void
+Array::print_xml_core(ostream &out, string space, bool constrained, string tag)
+{
+    XMLWriter xml(space);
+    print_xml_writer_core(xml, constrained, tag);
+    out << xml.get_doc();
+}
+
+void
+Array::print_xml_writer(XMLWriter &xml, bool constrained)
+{
+    print_xml_writer_core(xml, constrained, "Array");
+}
+
+void
+Array::print_as_map_xml_writer(XMLWriter &xml, bool constrained)
+{
+    print_xml_writer_core(xml, constrained, "Map");
+}
+
+class PrintArrayDimXMLWriter : public unary_function<Array::dimension&, void>
+{
+    XMLWriter &xml;
+    bool d_constrained;
+public:
+    PrintArrayDimXMLWriter(XMLWriter &xml, bool c) : xml(xml), d_constrained(c) {}
+
+    void operator()(Array::dimension &d)
+    {
+        if (xmlTextWriterStartElement(xml.get_writer(), (const xmlChar*)"dimension") < 0)
+            throw InternalErr(__FILE__, __LINE__, "Could not write dimension element");
+
+        if (!d.name.empty())
+            if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "name", (const xmlChar*)d.name.c_str()) < 0)
+                throw InternalErr(__FILE__, __LINE__, "Could not write attribute for name");
+
+        ostringstream size;
+        size << (d_constrained ? d.c_size : d.size);
+        if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "size", (const xmlChar*)size.str().c_str()) < 0)
+            throw InternalErr(__FILE__, __LINE__, "Could not write attribute for name");
+
+        if (xmlTextWriterEndElement(xml.get_writer()) < 0)
+            throw InternalErr(__FILE__, __LINE__, "Could not end dimension element");
+    }
+};
+
+void
+Array::print_xml_writer_core(XMLWriter &xml, bool constrained, string tag)
+{
+    if (constrained && !send_p())
+        return;
+
+    if (xmlTextWriterStartElement(xml.get_writer(), (const xmlChar*)tag.c_str()) < 0)
+        throw InternalErr(__FILE__, __LINE__, "Could not write " + tag + " element");
+
+    if (!name().empty())
+        if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "name", (const xmlChar*)name().c_str()) < 0)
+            throw InternalErr(__FILE__, __LINE__, "Could not write attribute for name");
+
+    get_attr_table().print_xml_writer(xml);
+
+    BaseType *btp = var();
+    string tmp_name = btp->name();
+    btp->set_name("");
+    btp->print_xml_writer(xml, constrained);
+    btp->set_name(tmp_name);
+
+    for_each(dim_begin(), dim_end(), PrintArrayDimXMLWriter(xml, constrained));
+
+    if (xmlTextWriterEndElement(xml.get_writer()) < 0)
+        throw InternalErr(__FILE__, __LINE__, "Could not end " + tag + " element");
+}
+
+/** Prints the values in ASCII of the entire (constrained) array. This method
+    Attempts to make an aesthetically pleasing display. However, it is
+    primarily intended for debugging purposes.
+
+    @param out Write the output to this FILE *.
+    @param index
+    @param dims
+    @param shape
+
+    @brief Print the value given the current constraint.
+*/
+unsigned int
+Array::print_array(FILE *out, unsigned int index, unsigned int dims,
+                   unsigned int shape[])
+{
+    ostringstream oss;
+    unsigned int i = print_array(oss, index, dims, shape);
+    fwrite(oss.str().data(), sizeof(char), oss.str().length(), out);
+
+    return i;
+}
+
+/** Prints the values in ASCII of the entire (constrained) array. This method
+    Attempts to make an anesthetically pleasing display. However, it is
+    primarily intended for debugging purposes.
+
+    @param out Write the output to this ostream
+    @param index
+    @param dims
+    @param shape
+
+    @brief Print the value given the current constraint.
+*/
+unsigned int Array::print_array(ostream &out, unsigned int index, unsigned int dims, unsigned int shape[])
+{
+	if (dims == 1) {
+		out << "{";
+
+		// Added test in case this method is passed an array with no elements. jhrg 1/27/16
+		if (shape[0] >= 1) {
+            for (unsigned i = 0; i < shape[0] - 1; ++i) {
+                var(index++)->print_val(out, "", false);
+                out << ", ";
+            }
+            var(index++)->print_val(out, "", false);
+        }
+
+		out << "}";
+
+		return index;
+	}
+	else {
+		out << "{";
+		// Fixed an off-by-one error in the following loop. Since the array
+		// length is shape[dims-1]-1 *and* since we want one less dimension
+		// than that, the correct limit on this loop is shape[dims-2]-1. From
+		// Todd Karakasian.
+		//
+		// The saga continues; the loop test should be `i < shape[0]-1'. jhrg
+		// 9/12/96.
+		//
+		// For arrays that hold zero values but have rank > 1, the print out
+		// may look a little odd (e.g., x[4][0] will print as { {}, {}, {}, {} })
+		// but it's not wrong and this is really for debugging mostly. jhrg 1/28/16
+        if (shape[0] > 0) {
+            for (unsigned i = 0; i < shape[0] - 1; ++i) {
+                index = print_array(out, index, dims - 1, shape + 1);
+                out << ",";
+            }
+
+            index = print_array(out, index, dims - 1, shape + 1);
+        }
+
+		out << "}";
+
+		return index;
+	}
+}
+
+void
+Array::print_val(FILE *out, string space, bool print_decl_p)
+{
+    ostringstream oss;
+    print_val(oss, space, print_decl_p);
+    fwrite(oss.str().data(), sizeof(char), oss.str().length(), out);
+}
+
+void
+Array::print_val(ostream &out, string space, bool print_decl_p)
+{
+    // print the declaration if print decl is true.
+    // for each dimension,
+    //   for each element,
+    //     print the array given its shape, number of dimensions.
+    // Add the `;'
+
+    if (print_decl_p) {
+        print_decl(out, space, false, false, false);
+	    out << " = " ;
+    }
+
+    unsigned int *shape = new unsigned int[dimensions(true)];
+    unsigned int index = 0;
+    for (Dim_iter i = _shape.begin(); i != _shape.end() && index < dimensions(true); ++i)
+        shape[index++] = dimension_size(i, true);
+
+    print_array(out, 0, dimensions(true), shape);
+
+    delete [] shape; shape = 0;
+
+    if (print_decl_p) {
+	    out << ";\n" ;
+    }
+}
+
+/** This function checks semantic features of the Array.  Currently,
+    the only check specific to the Array is that there must be
+    dimensions.  The rest is inherited from
+    <tt>BaseType::check_semantics()</tt>.
+
+    @brief Check semantic features of the Array.
+    @return A boolean value.  FALSE means there was a problem.
+*/
+
+bool
+Array::check_semantics(string &msg, bool)
+{
+    bool sem = BaseType::check_semantics(msg) && !_shape.empty();
+
+    if (!sem)
+        msg = "An array variable must have dimensions";
+
+    return sem;
+}
+
+/** @brief dumps information about this object
+ *
+ * Displays the pointer value of this instance and information about this
+ * instance.
+ *
+ * @param strm C++ i/o stream to dump the information to
+ * @return void
+ */
+void
+Array::dump(ostream &strm) const
+{
+    strm << DapIndent::LMarg << "Array::dump - ("
+    << (void *)this << ")" << endl ;
+    DapIndent::Indent() ;
+    Vector::dump(strm) ;
+    strm << DapIndent::LMarg << "shape:" << endl ;
+    DapIndent::Indent() ;
+    Dim_citer i = _shape.begin() ;
+    Dim_citer ie = _shape.end() ;
+    unsigned int dim_num = 0 ;
+    for (; i != ie; i++) {
+        strm << DapIndent::LMarg << "dimension " << dim_num++ << ":"
+	     << endl ;
+        DapIndent::Indent() ;
+        strm << DapIndent::LMarg << "name: " << (*i).name << endl ;
+        strm << DapIndent::LMarg << "size: " << (*i).size << endl ;
+        strm << DapIndent::LMarg << "start: " << (*i).start << endl ;
+        strm << DapIndent::LMarg << "stop: " << (*i).stop << endl ;
+        strm << DapIndent::LMarg << "stride: " << (*i).stride << endl ;
+        strm << DapIndent::LMarg << "constrained size: " << (*i).c_size
+             << endl ;
+        DapIndent::UnIndent() ;
+    }
+    DapIndent::UnIndent() ;
+    DapIndent::UnIndent() ;
+}
+
+} // namespace libdap
+
diff --git a/Array.h b/Array.h
new file mode 100644
index 0000000..3d676b3
--- /dev/null
+++ b/Array.h
@@ -0,0 +1,295 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1994-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// Class for array variables. The dimensions of the array are stored in the
+// list SHAPE.
+//
+// jhrg 9/6/94
+
+#ifndef _array_h
+#define _array_h 1
+
+#include <string>
+#include <vector>
+
+#ifndef _dods_limits_h
+#include "dods-limits.h"
+#endif
+
+#ifndef _vector_h
+#include "Vector.h"
+#endif
+
+//#include "D4Dimensions.h"
+
+namespace libdap
+{
+class D4Group;
+class D4Maps;
+class XMLWriter;
+class D4Dimension;
+class D4Dimensions;
+
+const int DODS_MAX_ARRAY = DODS_INT_MAX;
+
+/** This class is used to hold arrays of data. The elements of the array can
+    be simple or compound data types. There is no limit on the number of
+    dimensions an array can have, or on the size of each dimension.
+
+    If desired, the user can give each dimension of an array a name. You can,
+    for example, have a 360x180 array of temperatures, covering the whole
+    globe with one-degree squares. In this case, you could name the first
+    dimension \e Longitude and the second dimension \e Latitude. This can
+    help prevent a great deal of confusion.
+
+    The Array is used as part of the Grid class, where the dimension names
+    are crucial to its structure. The dimension names correspond to \e Map
+    vectors, holding the actual values for that column of the array.
+
+    In DAP4, the Array may be a Coverage or a simple Array. In the former case
+    the Array will have both named dimensions and maps, where the maps (instances
+    of D4Map) are what make the Array a Coverage. Coverages are a generalization
+    of DAP2 Grids.
+
+    Each array dimension carries with it its own projection information. The
+    projection information takes the form of three integers: the start, stop,
+    and stride values. This is clearest with an example. Consider a
+    one-dimensional array 10 elements long. If the start value of the
+    dimension constraint is 3, then the constrained array appears to be seven
+    elements long. If the stop value is changed to 7, then the array appears
+    to be five elements long. If the stride is changed to two, the array will
+    appear to be 3 elements long. Array constraints are written as:
+    <b>[start:stride:stop]</b>.
+
+    \verbatim
+    A = [1 2 3 4 5 6 7 8 9 10]
+
+    A[3::] = [4 5 6 7 8 9 10]
+
+    A[3::7] = [4 5 6 7 8]
+
+    A[3:2:7] = [4 6 8]
+
+    A[0:3:9] = [1 4 7 10]
+    \endverbatim
+
+    @note Arrays use zero-based indexing.
+    @note This class is used for both DAP2 and DAP4.
+
+    @brief A multidimensional array of identical data types.
+    @see Grid
+    @see Vector
+    @see dimension */
+
+class Array: public Vector
+{
+public:
+    /** Information about a dimension. Each Array has one or more dimensions.
+        For each of an Array's dimensions, a corresponding instance of this
+        struct holds the natural size, name, constraint information and
+        constrained size.
+
+        @note Instead of using this struct's fields directly, use Array's
+        dimension accessor methods.
+
+        @note This struct is public because its type is used in public
+        typedefs. */
+    struct dimension
+    {
+    	// In DAP2, the name and size of a dimension is stored here, along
+    	// with information about any constraint. In DAP4, either the name
+    	// and size are stored in the two fields below _or_ the name and
+    	// size information comes from a dimension object defined in a
+    	// group that is referenced by the 'dim' pointer. Do not free this
+    	// pointer; it is shared between the array and the Group where the
+    	// Dimension is defined. To keep Array manageable to implement, size
+    	// will be set here using the value from 'dim' if it is not null.
+        int size;  ///< The unconstrained dimension size.
+        string name;    ///< The name of this dimension.
+
+        D4Dimension *dim; ///< If not null, a weak pointer to the D4Dimension
+
+        // when a DMR is printed for a data response, if an array uses shared
+        // dimensions and those sdims have been sliced, make sure to use those
+        // and get the syntax correct. That's what this field does - in every
+        // case the array records the sizes of its dimensions and their slices
+        // regardless of whether they were provided explicitly in a CE or inherited
+        // from a sliced sdim.
+        bool use_sdim_for_slice; ///< Used to control printing the DMR in data responses
+
+        int start;  ///< The constraint start index
+        int stop;  ///< The constraint end index
+        int stride;  ///< The constraint stride
+        int c_size;  ///< Size of dimension once constrained
+
+        dimension() : size(0), name(""), dim(0), use_sdim_for_slice(false) {
+            // this information changes with each constraint expression
+            start = 0;
+            stop = 0;
+            stride = 1;
+            c_size = size;
+        }
+
+        dimension(unsigned long s, string n) : size(s), name(n), dim(0), use_sdim_for_slice(false) {
+            start = 0;
+            stop = size - 1;
+            stride = 1;
+            c_size = size;
+        }
+
+        dimension(D4Dimension *d);
+    };
+
+    D4Maps *d_maps;
+
+private:
+    std::vector<dimension> _shape; // list of dimensions (i.e., the shape)
+
+    void update_dimension_pointers(D4Dimensions *old_dims, D4Dimensions *new_dims);
+
+    friend class ArrayTest;
+    friend class D4Group;
+
+    bool is_dap2_grid();
+
+protected:
+    void _duplicate(const Array &a);
+
+    unsigned int print_array(FILE *out, unsigned int index,
+                             unsigned int dims, unsigned int shape[]);
+
+    unsigned int print_array(ostream &out, unsigned int index,
+                             unsigned int dims, unsigned int shape[]);
+
+public:
+    /** A constant iterator used to access the various dimensions of an
+        Array.
+
+        @see dim_begin()
+        @see dim_end() */
+    typedef std::vector<dimension>::const_iterator Dim_citer;
+
+    /** An iterator used to access the various dimensions of an
+        Array. Most of the methods that access various properties of a
+        dimension use an instance of Dim_iter.
+
+        @see dim_begin()
+        @see dim_end() */
+    typedef std::vector<dimension>::iterator Dim_iter;
+
+    Array(const string &n, BaseType *v, bool is_dap4 = false);
+    Array(const string &n, const string &d, BaseType *v, bool is_dap4 = false);
+    Array(const Array &rhs);
+    virtual ~Array();
+
+    Array &operator=(const Array &rhs);
+    virtual BaseType *ptr_duplicate();
+
+    virtual void transform_to_dap4(D4Group *root, Constructor *container);
+    virtual std::vector<BaseType *> *transform_to_dap2(AttrTable *parent_attr_table);
+
+    void add_var(BaseType *v, Part p = nil);
+    void add_var_nocopy(BaseType *v, Part p = nil);
+
+    void append_dim(int size, const string &name = "");
+    void append_dim(D4Dimension *dim);
+    void prepend_dim(int size, const string& name = "");
+    void prepend_dim(D4Dimension *dim);
+    void clear_all_dims();
+
+    virtual void add_constraint(Dim_iter i, int start, int stride, int stop);
+    virtual void add_constraint(Dim_iter i, D4Dimension *dim);
+    virtual void reset_constraint();
+
+    virtual void clear_constraint(); // deprecated
+
+    virtual void update_length(int size = 0); // should be used internally only
+
+    Dim_iter dim_begin() ;
+    Dim_iter dim_end() ;
+
+    virtual int dimension_size(Dim_iter i, bool constrained = false);
+    virtual int dimension_start(Dim_iter i, bool constrained = false);
+    virtual int dimension_stop(Dim_iter i, bool constrained = false);
+    virtual int dimension_stride(Dim_iter i, bool constrained = false);
+    virtual string dimension_name(Dim_iter i);
+    virtual D4Dimension *dimension_D4dim(Dim_iter i);
+
+    virtual unsigned int dimensions(bool constrained = false);
+
+    virtual D4Maps *maps();
+
+    virtual void print_dap4(XMLWriter &xml, bool constrained = false);
+
+    // These are all DAP2 output methods
+
+    virtual void print_decl(ostream &out, string space = "    ",
+                            bool print_semi = true,
+                            bool constraint_info = false,
+                            bool constrained = false);
+
+    virtual void print_xml(ostream &out, string space = "    ",
+                           bool constrained = false);
+
+    virtual void print_xml_writer(XMLWriter &xml, bool constrained = false);
+    virtual void print_xml_writer_core(XMLWriter &out, bool constrained, string tag);
+    virtual void print_as_map_xml_writer(XMLWriter &xml, bool constrained);
+
+    virtual void print_xml_core(FILE *out, string space, bool constrained, string tag);
+    virtual void print_xml_core(ostream &out, string space, bool constrained, string tag);
+
+    // not used (?)
+    virtual void print_as_map_xml(ostream &out, string space = "    ",
+                                  bool constrained = false);
+
+    virtual void print_val(ostream &out, string space = "",
+                           bool print_decl_p = true);
+
+    virtual void print_xml(FILE *out, string space = "    ",
+                           bool constrained = false);
+    virtual void print_as_map_xml(FILE *out, string space = "    ",
+                                  bool constrained = false);
+    virtual void print_val(FILE *out, string space = "",
+                           bool print_decl_p = true);
+    virtual void print_decl(FILE *out, string space = "    ",
+                            bool print_semi = true,
+                            bool constraint_info = false,
+                            bool constrained = false);
+
+    virtual bool check_semantics(string &msg, bool all = false);
+
+
+    virtual void dump(ostream &strm) const ;
+};
+
+} // namespace libdap
+
+#endif // _array_h
diff --git a/AttrTable.cc b/AttrTable.cc
new file mode 100644
index 0000000..31fd2c8
--- /dev/null
+++ b/AttrTable.cc
@@ -0,0 +1,1559 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1994-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// jhrg 7/29/94
+
+#include "config.h"
+
+#include <cassert>
+#include <sstream>
+
+#include "AttrTable.h"
+
+#include "util.h"
+#include "escaping.h"
+
+#include "debug.h"
+
+// Should the www2id and id2www functions be used to encode attribute names?
+// Probably not... jhrg 11/16/11
+#define WWW_ENCODING 0
+// See the note for del_attr_table(). That method now deletes the contained
+// AttrTable.
+#define NEW_DEL_ATTR_TABLE_BEHAVIOR 0
+
+using std::cerr;
+using std::string;
+using std::endl;
+using std::vector;
+
+namespace libdap {
+
+/** Remove %20 space encoding */
+string remove_space_encoding(const string &s)
+{
+    string::size_type pos = s.find("%20");
+    if (pos != string::npos) {
+        string n = s;
+        do {
+            n.replace(pos, 3, " ");
+            pos = n.find("%20");
+        } while (pos != string::npos);
+        return n;
+    }
+    else {
+        return s;
+    }
+}
+
+/** Add %20 space encoding. */
+string add_space_encoding(const string &s)
+{
+    string::size_type pos = s.find(" ");
+    if (pos != string::npos) {
+        string n = s;
+        do {
+            n.replace(pos, 1, "%20");
+            pos = n.find(" ");
+        } while (pos != string::npos);
+        return n;
+    }
+    else {
+        return s;
+    }
+}
+
+/** Convert an AttrType to it's string representation.
+ @param at The Attribute Type.
+ @return The type's string representation */
+string AttrType_to_String(const AttrType at)
+{
+    switch (at) {
+    case Attr_container:
+        return "Container";
+    case Attr_byte:
+        return "Byte";
+    case Attr_int16:
+        return "Int16";
+    case Attr_uint16:
+        return "UInt16";
+    case Attr_int32:
+        return "Int32";
+    case Attr_uint32:
+        return "UInt32";
+    case Attr_float32:
+        return "Float32";
+    case Attr_float64:
+        return "Float64";
+    case Attr_string:
+        return "String";
+    case Attr_url:
+        return "Url";
+    case Attr_other_xml:
+        return "OtherXML";
+    default:
+        return "";
+    }
+}
+
+AttrType String_to_AttrType(const string &s)
+{
+    string s2 = s;
+    downcase(s2);
+
+    if (s2 == "container")
+        return Attr_container;
+    else if (s2 == "byte")
+        return Attr_byte;
+    else if (s2 == "int16")
+        return Attr_int16;
+    else if (s2 == "uint16")
+        return Attr_uint16;
+    else if (s2 == "int32")
+        return Attr_int32;
+    else if (s2 == "uint32")
+        return Attr_uint32;
+    else if (s2 == "float32")
+        return Attr_float32;
+    else if (s2 == "float64")
+        return Attr_float64;
+    else if (s2 == "string")
+        return Attr_string;
+    else if (s2 == "url")
+        return Attr_url;
+    else if (s2 == "otherxml")
+        return Attr_other_xml;
+    else
+        return Attr_unknown;
+}
+
+/** Clone the given attribute table in <tt>this</tt>.
+ Protected. */
+void AttrTable::clone(const AttrTable &at)
+{
+    d_name = at.d_name;
+    d_is_global_attribute = at.d_is_global_attribute;
+
+    // Set the parent to null (no parent, not in container)
+    // since using at.d_parent is semantically incorrect
+    // and potentially dangerous.
+    d_parent = 0;
+
+    Attr_citer i = at.attr_map.begin();
+    Attr_citer ie = at.attr_map.end();
+    for (; i != ie; ++i) {
+        // this deep-copies containers recursively
+        entry *e = new entry(*(*i));
+        attr_map.push_back(e);
+
+        // If the entry being added was a container,
+        // set its parent to this to maintain invariant.
+        if (e->type == Attr_container) {
+            assert(e->attributes);
+            e->attributes->d_parent = this;
+        }
+    }
+}
+
+/** @name Instance management functions */
+
+//@{
+AttrTable::AttrTable() :
+    DapObj(), d_name(""), d_parent(0), attr_map(), d_is_global_attribute(true)
+{
+}
+
+AttrTable::AttrTable(const AttrTable &rhs) :
+    DapObj()
+{
+    clone(rhs);
+}
+
+// Private
+void AttrTable::delete_attr_table()
+{
+    for (Attr_iter i = attr_map.begin(); i != attr_map.end(); ++i) {
+        delete *i;
+    }
+    attr_map.clear();
+}
+
+AttrTable::~AttrTable()
+{
+    delete_attr_table();
+}
+
+AttrTable &
+AttrTable::operator=(const AttrTable &rhs)
+{
+    if (this != &rhs) {
+        delete_attr_table();
+        clone(rhs);
+    }
+
+    return *this;
+}
+//@}
+
+/** Attributes that are containers count one attribute, as do
+ attributes with both scalar and vector values.
+ @return The number of entries.
+ @brief Get the number of entries in this attribute table.
+ */
+unsigned int AttrTable::get_size() const
+{
+    return attr_map.size();
+}
+
+/** @brief Get the name of this attribute table.
+ @return A string containing the name. */
+string AttrTable::get_name() const
+{
+    return d_name;
+}
+
+/** @brief Set the name of this attribute table.
+ @param n The new name of the attribute table. */
+void AttrTable::set_name(const string &n)
+{
+#if WWW_ENCODING
+    d_name = www2id(n);
+#else
+    d_name = remove_space_encoding(n);
+#endif
+}
+
+#if 0
+// This was taken from das.y and could be used here to make the 'dods_errors'
+// attribute container like the parser used to. Then again, maybe this feature
+// was just BS. jhrg (ticket 1469)
+static void add_bad_attribute(AttrTable *attr, const string &type, const string &name, const string &value,
+        const string &msg) {
+    // First, if this bad value is already in a *_dods_errors container,
+    // then just add it. This can happen when the server side processes a DAS
+    // and then hands it off to a client which does the same.
+    // Make a new container. Call it <attr's name>_errors. If that container
+    // already exists, use it.
+    // Add the attribute.
+    // Add the error string to an attribute in the container called
+    // `<name_explanation.'.
+
+    if (attr->get_name().find("_dods_errors") != string::npos) {
+        attr->append_attr(name, type, value);
+    }
+    else {
+        // I think _dods_errors should be _dap_error. jhrg 11/16/11
+        string error_cont_name = attr->get_name() + "_dods_errors";
+        AttrTable *error_cont = attr->get_attr_table(error_cont_name);
+        if (!error_cont)
+        error_cont = attr->append_container(error_cont_name);
+
+        error_cont->append_attr(name, type, value);
+
+#ifndef ATTR_STRING_QUOTE_FIX
+        error_cont->append_attr(name + "_dap_explanation", "String", "\"" + msg + "\"");
+#else
+        error_cont->append_attr(name + "_dap_explanation", "String", msg);
+#endif
+    }
+}
+#endif
+
+/** If the given name already refers to an attribute, and the attribute has a
+ value, the given value is appended to the attribute vector. Calling this
+ function repeatedly is the way to append to an attribute vector.
+
+ The function throws an Error if the attribute is a container,
+ or if the type of the input value does not match the existing attribute's
+ type. Use <tt>append_container()</tt> to add container attributes.
+
+ This method performs a simple search for <tt>name</tt> in this attribute
+ table only; sub-tables are not searched and the dot notation is not
+ recognized.
+
+ @brief Add an attribute to the table.
+ @return Returns the length of the added attribute value.
+ @param name The name of the attribute to add or modify.
+ @param type The type of the attribute to add or modify.
+ @param value The value to add to the attribute table. */
+unsigned int AttrTable::append_attr(const string &name, const string &type, const string &value)
+{
+    DBG(cerr << "Entering AttrTable::append_attr" << endl);
+#if WWW_ENCODING
+    string lname = www2id(name);
+#else
+    string lname = remove_space_encoding(name);
+#endif
+
+    Attr_iter iter = simple_find(lname);
+
+    // If the types don't match OR this attribute is a container, calling
+    // this mfunc is an error!
+    if (iter != attr_map.end() && ((*iter)->type != String_to_AttrType(type)))
+        throw Error(string("An attribute called `") + name + string("' already exists but is of a different type"));
+    if (iter != attr_map.end() && (get_type(iter) == "Container"))
+        throw Error(string("An attribute called `") + name + string("' already exists but is a container."));
+
+    if (iter != attr_map.end()) { // Must be a new attribute value; add it.
+        (*iter)->attr->push_back(value);
+        return (*iter)->attr->size();
+    }
+    else { // Must be a completely new attribute; add it
+        entry *e = new entry;
+
+        e->name = lname;
+        e->is_alias = false;
+        e->type = String_to_AttrType(type); // Record type using standard names.
+        e->attr = new vector<string> ;
+        e->attr->push_back(value);
+
+        attr_map.push_back(e);
+
+        return e->attr->size(); // return the length of the attr vector
+    }
+}
+
+/** This version of append_attr() takes a vector<string> of values.
+ If the given name already refers to an attribute, and the attribute has
+ values, append the new values to the existing ones.
+
+ The function throws an Error if the attribute is a container,
+ or if the type of the input value does not match the existing attribute's
+ type. Use <tt>append_container()</tt> to add container attributes.
+
+ This method performs a simple search for <tt>name</tt> in this attribute
+ table only; sub-tables are not searched and the dot notation is not
+ recognized.
+
+ @brief Add an attribute to the table.
+ @return Returns the length of the added attribute value.
+ @param name The name of the attribute to add or modify.
+ @param type The type of the attribute to add or modify.
+ @param values A vector of values. Note: The vector is COPIED, not stored. */
+
+unsigned int AttrTable::append_attr(const string &name, const string &type, vector<string> *values)
+{
+    DBG(cerr << "Entering AttrTable::append_attr(..., vector)" << endl);
+#if WWW_ENCODING
+    string lname = www2id(name);
+#else
+    string lname = remove_space_encoding(name);
+#endif
+    Attr_iter iter = simple_find(lname);
+
+    // If the types don't match OR this attribute is a container, calling
+    // this mfunc is an error!
+    if (iter != attr_map.end() && ((*iter)->type != String_to_AttrType(type)))
+        throw Error(string("An attribute called `") + name + string("' already exists but is of a different type"));
+    if (iter != attr_map.end() && (get_type(iter) == "Container"))
+        throw Error(string("An attribute called `") + name + string("' already exists but is a container."));
+
+    if (iter != attr_map.end()) { // Must be new attribute values; add.
+        vector<string>::iterator i = values->begin();
+        while (i != values->end())
+            (*iter)->attr->push_back(*i++);
+
+        return (*iter)->attr->size();
+    }
+    else { // Must be a completely new attribute; add it
+        entry *e = new entry;
+
+        e->name = lname;
+        e->is_alias = false;
+        e->type = String_to_AttrType(type); // Record type using standard names.
+        e->attr = new vector<string> (*values);
+
+        attr_map.push_back(e);
+
+        return e->attr->size(); // return the length of the attr vector
+    }
+}
+
+/** Create and append an attribute container to this AttrTable. If this
+ attribute table already contains an attribute container called
+ <tt>name</tt> an exception is thrown. Return a pointer to the new container.
+
+ @brief Add a container to the attribute table.
+ @param name The name of the container to create.
+ @return A pointer to the new AttrTable object.
+ */
+
+AttrTable *
+AttrTable::append_container(const string &name)
+{
+    AttrTable *new_at = new AttrTable;
+    AttrTable *ret = NULL;
+    try {
+        ret = append_container(new_at, name);
+    } catch (Error &e) {
+        // an error occurred, attribute with that name already exists
+        delete new_at;
+        new_at = 0;
+        throw;
+    }
+    return ret;
+}
+
+/** Append a new attribute container to this attribute table. The new
+ container is <tt>at</tt> and its name is set to
+ <tt>name</tt>. If this attribute
+ table already contains an attribute container called
+ <tt>name</tt> an exception is thrown.
+
+ @note The value of \e name will override the name of \e at set using the
+ set_name() method.
+
+ @brief Add a container to the attribute table.
+ @param at A pointer to the new attribute table to append.
+ @param name The name of the new attribute table.
+ @return A pointer to the new AttrTable object.
+ */
+AttrTable *
+AttrTable::append_container(AttrTable *at, const string &name)
+{
+#if WWW_ENCODING
+    string lname = www2id(name);
+#else
+    string lname = remove_space_encoding(name);
+#endif
+
+    if (simple_find(name) != attr_end())
+        throw Error("There already exists a container called '" + name + "' in this attribute table (" + at->get_name() + "). (1)");
+
+    DBG(cerr << "Setting appended attribute container name to: " << lname << endl);
+    at->set_name(lname);
+
+    entry *e = new entry;
+    e->name = lname;
+    e->is_alias = false;
+    e->type = Attr_container;
+    e->attributes = at;
+
+    attr_map.push_back(e);
+
+    at->d_parent = this;
+
+    return e->attributes;
+}
+
+/** Look for an attribute or an attribute container. If used to search
+ for an attribute container, this method returns the container's \e
+ parent using the value-result parameter \c at and a reference to the
+ container using the iterator value-result parameter \c iter. If used
+ to search for an attribute, the attribute's container is returned using
+ \c at; the attribute itself can be accessed using the iterator \c iter.
+
+ @param target The name (using dot notation) of the attribute or
+ container to find.
+ @param at A value-result used to return the attribute container in
+ which \c target was found. Null if \c target was not found.
+ @param iter The iterator which will reference the attribute found.
+ Can be used to access \c target from within \c at. References
+ dim_end() within \c at if the attribute or container does not exist. */
+void AttrTable::find(const string &target, AttrTable **at, Attr_iter *iter)
+{
+    string::size_type dotpos = target.rfind('.');
+    if (dotpos != string::npos) {
+        string container = target.substr(0, dotpos);
+        string field = target.substr(dotpos + 1);
+
+        *at = find_container(container);
+        if (*at) {
+            *iter = (*at)->simple_find(field);
+        }
+        else {
+            *iter = attr_map.end();
+        }
+    }
+    else {
+        *at = recurrsive_find(target, iter);
+    }
+}
+
+/** This method scans for attributes using recursion to look inside containers
+ even when the name of the attribute is not fully qualified. It starts
+ looking in itself and descends into its children depth first. It will find
+ attributes and attribute containers.
+
+ @param target Look for the attribute with this name.
+ @param location A value-result parameter. This returns an iterator to the
+ attribute within the returned AttrTable object
+ @return Returns a pointer to the AttrTable which holds \e target, or null
+ if \e target is not found. In the latter case, the value of \e location is
+ attr_end() for this AttrTable. */
+AttrTable *
+AttrTable::recurrsive_find(const string &target, Attr_iter *location)
+{
+    Attr_iter i = attr_begin();
+    while (i != attr_end()) {
+        if (target == (*i)->name) {
+            *location = i;
+            return this;
+        }
+        else if ((*i)->type == Attr_container) {
+            AttrTable *at = (*i)->attributes->recurrsive_find(target, location);
+            if (at)
+                return at;
+        }
+
+        ++i;
+    }
+
+    *location = i;
+    return 0;
+}
+
+// Made public for callers that want non-recursive find.  [mjohnson 6 oct 09]
+/** Look in this AttrTable for the attribute called \c name. If found return
+ an Attr_iter which references it, otherwise return the end iterator for
+ this AttrTable.
+
+ @param target The name of the attribute.
+ @return An Attr_iter which references \c target. */
+AttrTable::Attr_iter AttrTable::simple_find(const string &target)
+{
+    Attr_iter i;
+    for (i = attr_map.begin(); i != attr_map.end(); ++i) {
+        if (target == (*i)->name) {
+            break;
+        }
+    }
+    return i;
+}
+
+/** Look in this attribute table for an attribute container named
+ <tt>target</tt>. The search starts at this attribute table;
+ <tt>target</tt> should
+ use the dot notation to name containers held within children of this
+ attribute table.
+
+ To search the entire DAS object, make sure to invoke this method from
+ that object.
+
+ @brief Find an attribute with a given name.
+ @param target The attribute container to find.
+ @return A pointer to the attribute table or null if the container
+ cannot be found. */
+AttrTable *
+AttrTable::find_container(const string &target)
+{
+    string::size_type dotpos = target.find('.');
+    if (dotpos != string::npos) {
+        string container = target.substr(0, dotpos);
+        string field = target.substr(dotpos + 1);
+
+        AttrTable *at = simple_find_container(container);
+        return (at) ? at->find_container(field) : 0;
+    }
+    else {
+        return simple_find_container(target);
+    }
+}
+
+// Made public for callers that want non-recursive find.  [mjohnson 6 oct 09]
+AttrTable *
+AttrTable::simple_find_container(const string &target)
+{
+    if (get_name() == target)
+        return this;
+
+    for (Attr_iter i = attr_map.begin(); i != attr_map.end(); ++i) {
+        if (is_container(i) && target == (*i)->name) {
+            return (*i)->attributes;
+        }
+    }
+
+    return 0;
+}
+
+/** Each of the following accessors get information using the name of an
+ attribute. They perform a simple search for the name in this
+ attribute table only; sub-tables are not searched and the dot
+ notation is not recognized.
+
+ @name Accessors using an attribute name */
+//@{
+
+/** @brief Get an attribute container. */
+AttrTable *
+AttrTable::get_attr_table(const string &name)
+{
+    return find_container(name);
+}
+
+/** @brief Get the type name of an attribute within this attribute table. */
+string AttrTable::get_type(const string &name)
+{
+    Attr_iter p = simple_find(name);
+    return (p != attr_map.end()) ? get_type(p) : (string) "";
+}
+
+/** @brief Get the type of an attribute.
+ @return The <tt>AttrType</tt> value describing the attribute. */
+AttrType AttrTable::get_attr_type(const string &name)
+{
+    Attr_iter p = simple_find(name);
+    return (p != attr_map.end()) ? get_attr_type(p) : Attr_unknown;
+}
+
+/** If the indicated attribute is a container attribute, this function
+ returns the number of attributes in <i>its</i> attribute table. If the
+ indicated attribute is not a container, the method returns the number
+ of values for the attribute (1 for a scalar attribute, N for a vector
+ attribute value).
+ @brief Get the number of attributes in this container.
+ */
+unsigned int AttrTable::get_attr_num(const string &name)
+{
+    Attr_iter iter = simple_find(name);
+    return (iter != attr_map.end()) ? get_attr_num(iter) : 0;
+}
+
+/** Get a pointer to the vector of values associated with the attribute
+ referenced by Pix <tt>p</tt> or named <tt>name</tt>.
+
+ Note that all values in an attribute table are stored as string data.
+ They may be converted to a more appropriate internal format by the
+ calling program.
+
+ @return If the indicated attribute is a container, this function
+ returns the null pointer.  Otherwise returns a pointer to the
+ the attribute vector value.
+ @brief Get a vector-valued attribute.
+ */
+vector<string> *
+AttrTable::get_attr_vector(const string &name)
+{
+    Attr_iter p = simple_find(name);
+    return (p != attr_map.end()) ? get_attr_vector(p) : 0;
+}
+
+/** Delete the attribute named <tt>name</tt>. If <tt>i</tt> is given, and
+ the attribute has a vector value, delete the <tt>i</tt>$^th$
+ element of the vector.
+
+ You can use this function to delete container attributes, although
+ the <tt>i</tt> parameter has no meaning for that operation.
+
+ @brief Deletes an attribute.
+ @param name The name of the attribute to delete.  This can be an
+ attribute of any type, including containers. However, this method
+ looks only in this attribute table and does not recognize the dot
+ notation.
+ @param i If the named attribute is a vector, and <tt>i</tt> is
+ non-negative, the i-th entry in the vector is deleted, and the
+ array is repacked.  If <tt>i</tt> equals -1 (the default), the
+ entire attribute is deleted. */
+void AttrTable::del_attr(const string &name, int i)
+{
+#if WWW_ENCODING
+    string lname = www2id(name);
+#else
+    string lname = remove_space_encoding(name);
+#endif
+
+    Attr_iter iter = simple_find(lname);
+    if (iter != attr_map.end()) {
+        if (i == -1) { // Delete the whole attribute
+            entry *e = *iter;
+            attr_map.erase(iter);
+            delete e;
+            e = 0;
+        }
+        else { // Delete one element from attribute array
+            // Don't try to delete elements from the vector of values if the
+            // map is a container!
+            if ((*iter)->type == Attr_container)
+                return;
+
+            vector<string> *sxp = (*iter)->attr;
+
+            assert(i >= 0 && i < (int) sxp->size());
+            sxp->erase(sxp->begin() + i); // rm the element
+        }
+    }
+}
+
+//@} Accessors using an attribute name
+
+/** @name get information using an iterator */
+//@{
+/** Get an iterator to the first entry in this attribute table.
+ @return Attr_iter; references the end of the array if empty list. */
+AttrTable::Attr_iter AttrTable::attr_begin()
+{
+    return attr_map.begin();
+}
+
+/** Get an iterator to the end attribute table. Does not point to
+ the last attribute in the table
+ @return Attr_iter */
+AttrTable::Attr_iter AttrTable::attr_end()
+{
+    return attr_map.end();
+}
+
+/** Given an index \c i, return the \c Attr_iter to the corresponding
+ element. This method provides a way to use all the methods that take an
+ \c Attr_iter using a simple integer index. Use the get_attr_num() or
+ get_size() methods to determine how many items the AttrTable contains.
+
+ @param i The index
+ @return The corresponding Attr_iter
+ @see get_attr_num, get_size */
+AttrTable::Attr_iter AttrTable::get_attr_iter(int i)
+{
+    return attr_map.begin() + i;
+}
+
+/** Returns the name of the attribute referenced by \e iter. */
+string AttrTable::get_name(Attr_iter iter)
+{
+    assert(iter != attr_map.end());
+
+    return (*iter)->name;
+}
+
+/** Returns true if the attribute referenced by \e i is a container. */
+bool AttrTable::is_container(Attr_iter i)
+{
+    return (*i)->type == Attr_container;
+}
+
+/** Get the attribute container referenced by \e iter. If no
+ such container exists, then return a reference to the end of the
+ table.
+ @param iter Reference to a table contained by this object.
+ @return The child attribute table. */
+AttrTable *
+AttrTable::get_attr_table(Attr_iter iter)
+{
+    assert(iter != attr_map.end());
+    return (*iter)->type == Attr_container ? (*iter)->attributes : 0;
+}
+
+/** Delete the iterator.  Since AttrTable stores pointers to AttrTable
+ objects, the caller should be sure to delete the AttrTable itself.
+ The caller will gain control of the AttrTable* located at
+ get_attr_table(iter) prior to this call.
+
+ @note The original semantics of this methods were odd. The caller was
+ responsible for deleting the AttrTable, but if they did that before calling
+ this, then memory corruption would happen (because this code accesses a
+ field of the table). If the caller did not delete the table, memory leaked.
+ The only correct way to call the method was to grab the pointer, call this
+ and then delete the pointer. I added a call to delete the contained
+ AttrTable pointer, which changes the behavior of this, but probably in a
+ way that will fix leaks in existing code. This change can be reverted by
+ setting NEW_DEL_ATTR_TABLE_BEHAVIOR to false. jhrg 4/26/13
+
+ @note calling this method <b>invalidates</b> the iterator \e iter.
+ @param iter points to the entry to be deleted.
+ @return The Attr_iter for the element following \e iter */
+AttrTable::Attr_iter AttrTable::del_attr_table(Attr_iter iter)
+{
+    if ((*iter)->type != Attr_container)
+        return ++iter;
+
+    // the caller intends to delete/reuse the contained AttrTable,
+    // so zero it out so it doesn't get deleted before we delete the entry
+    // [mjohnson]
+    struct entry *e = *iter;
+    // container no longer has a parent.
+    if (e->attributes) {
+        e->attributes->d_parent = 0;
+
+#if NEW_DEL_ATTR_TABLE_BEHAVIOR
+        delete e->attributes;
+#endif
+        e->attributes = 0;
+    }
+
+    delete e;
+
+    return attr_map.erase(iter);
+}
+
+/** Get the type name of an attribute referenced by \e iter.
+ @param iter Reference to the Attribute.
+ @return A string with the name of this attribute datatype. */
+string AttrTable::get_type(Attr_iter iter)
+{
+    assert(iter != attr_map.end());
+    return AttrType_to_String((*iter)->type);
+}
+
+/** Get the type of the attribute referenced by \e iter.
+ @param iter
+ @return The datatype of this attribute in an instance of AttrType. */
+AttrType AttrTable::get_attr_type(Attr_iter iter)
+{
+    return (*iter)->type;
+}
+
+/** If the attribute referenced by \e iter is a container attribute, this
+ method returns the number of attributes in its attribute table.
+ If the indicated attribute is not a container, the method returns the
+ number of values for the attribute (1 for a scalar attribute, N for a
+ vector attribute value).
+ @param iter Reference to an attribute
+ @return The number of elements in the attribute. */
+unsigned int AttrTable::get_attr_num(Attr_iter iter)
+{
+    assert(iter != attr_map.end());
+    return ((*iter)->type == Attr_container) ? (*iter)->attributes->get_size() : (*iter)->attr->size();
+}
+
+/** Returns the value of an attribute. If the attribute has a vector
+ value, you can indicate which is the desired value with the index
+ argument, \e i. If the argument is omitted, the first value is
+ returned. If the attribute has only a single value, the index
+ argument is ignored. If \e i is greater than the number of
+ elements in the attribute, an error is produced.
+
+ All values in an attribute table are stored as string data. They may
+ be converted to a more appropriate internal format by the calling
+ program.
+
+ @param iter Reference to an attribute
+ @param i The attribute value index, zero-based. Default value: 0
+ @return If the indicated attribute is a container, this function
+ returns the string ``None''. If using a name to refer to the attribute
+ and the named attribute does not exist, return the empty string. */
+string AttrTable::get_attr(Attr_iter iter, unsigned int i)
+{
+    assert(iter != attr_map.end());
+
+    return (*iter)->type == Attr_container ? (string) "None" : (*(*iter)->attr)[i];
+}
+
+string AttrTable::get_attr(const string &name, unsigned int i)
+{
+    Attr_iter p = simple_find(name);
+    return (p != attr_map.end()) ? get_attr(p, i) : (string) "";
+}
+
+/** Returns a pointer to the vector of values associated with the
+ attribute referenced by iterator \e iter.
+
+ Note that all values in an attribute table are stored as string data.
+ They may be converted to a more appropriate internal format by the
+ calling program.
+
+ @param iter Reference to the Attribute.
+ @return If the indicated attribute is a container, this function
+ returns the null pointer.  Otherwise returns a pointer to the
+ the attribute vector value. */
+vector<string> *
+AttrTable::get_attr_vector(Attr_iter iter)
+{
+    assert(iter != attr_map.end());
+    return (*iter)->type != Attr_container ? (*iter)->attr : 0;
+}
+
+bool AttrTable::is_global_attribute(Attr_iter iter)
+{
+    assert(iter != attr_map.end());
+    if ((*iter)->type == Attr_container)
+        return (*iter)->attributes->is_global_attribute();
+    else
+        return (*iter)->is_global;
+}
+
+void AttrTable::set_is_global_attribute(Attr_iter iter, bool ga)
+{
+    assert(iter != attr_map.end());
+    if ((*iter)->type == Attr_container)
+        (*iter)->attributes->set_is_global_attribute(ga);
+    else
+        (*iter)->is_global = ga;
+}
+
+//@} Accessors that use an iterator
+
+// Alias an attribute table. The alias should be added to this object.
+/** @brief Add an alias to a container held by this attribute table.
+ @param name The name of the alias. May <i>not</i> use dot notation.
+ @param src The existing attribute container to alias.
+ @exception Error if an attribute, container or alias called
+ <tt>name</tt> already exists in this attribute table. */
+void AttrTable::add_container_alias(const string &name, AttrTable *src)
+{
+#if WWW_ENCODING
+    string lname = www2id(name);
+#else
+    string lname = remove_space_encoding(name);
+#endif
+
+    if (simple_find(lname) != attr_end())
+        throw Error(string("There already exists a container called `") + name + string("in this attribute table. (2)"));
+
+    entry *e = new entry;
+    e->name = lname;
+    e->is_alias = true;
+    e->aliased_to = src->get_name();
+    e->type = Attr_container;
+
+    e->attributes = src;
+
+    attr_map.push_back(e);
+}
+
+/** Assume \e source names an attribute value in some container. Add an alias
+ \e name for that value in this object.
+
+ @brief Add an alias for an attribute.
+
+ @param das
+ @param name The name of the alias. May <i>not</i> use dot notation.
+ @param source The name of the attribute to alias. May use dot
+ notation.
+ @exception Error if the attribute table already contains an
+ attribute, container or alias called <tt>name</tt> or if an
+ attribute called <tt>source</tt> does not exist. */
+void AttrTable::add_value_alias(AttrTable *das, const string &name, const string &source)
+{
+#if WWW_ENCODING
+    string lname = www2id(name);
+#else
+    string lname = remove_space_encoding(name);
+#endif
+
+#if WWW_ENCODING
+    string lsource = www2id(source);
+#else
+    string lsource = remove_space_encoding(source);
+#endif
+
+    // find the container that holds source and its (sources's) iterator
+    // within that container. Search at the uppermost level of the attribute
+    // object to find values defined `above' the current container.
+    AttrTable *at;
+    Attr_iter iter;
+    das->find(lsource, &at, &iter);
+
+    // If source is not found by looking at the topmost level, look in the
+    // current table (i.e., alias z x where x is in the current container
+    // won't be found by looking for `x' at the top level). See test case 26
+    // in das-testsuite.
+    if (!at || (iter == at->attr_end()) || !*iter) {
+        find(lsource, &at, &iter);
+        if (!at || (iter == at->attr_end()) || !*iter)
+            throw Error(string("Could not find the attribute `") + source + string("' in the attribute object."));
+    }
+
+    // If we've got a value to alias and it's being added at the top level of
+    // the DAS, that's an error.
+    if (at && !at->is_container(iter) && this == das)
+        throw Error(
+                string(
+                        "A value cannot be aliased to the top level of the DAS;\nOnly containers may be present at that level of the DAS."));
+
+    if (simple_find(lname) != attr_end())
+        throw Error(string("There already exists a container called `") + name + string("in this attribute table. (3)"));
+
+    entry *e = new entry;
+    e->name = lname;
+    e->is_alias = true;
+    e->aliased_to = lsource;
+    e->type = get_attr_type(iter);
+    if (at && e->type == Attr_container)
+        e->attributes = at->get_attr_table(iter);
+    else
+        e->attr = (*iter)->attr;
+
+    attr_map.push_back(e);
+}
+
+// Deprecated
+/** Once an alias is
+ inserted into an attribute table, reading the attributes for
+ <i>alias</i> will return those stored for <i>name</i>.
+
+ Two forms for this function exist: one searches for <i>name</i>
+ in the AttrTable referenced by <i>at</i> while the other uses
+ <tt>this</tt>. You can use <tt>DAS::get_attr_table()</tt> to
+ get the attribute table for an arbitrary name.
+
+ @brief Adds an alias to the set of attributes.
+ @see get_attr_table
+ @deprecated The current alias design is flawed. It is impossible to map
+ this onto the XML implementation where the DAS and DDS information are
+ combined in one object.
+ @param alias The alias to insert into the attribute table.
+ @param name The name of the already-existing attribute to which
+ the alias will refer.
+ @param at An attribute table in which to insert the alias. */
+bool AttrTable::attr_alias(const string &alias, AttrTable *at, const string &name)
+{
+    add_value_alias(at, alias, name);
+    return true;
+}
+
+/** @deprecated The current alias design is flawed. It is impossible to map
+ this onto the XML implementation where the DAS and DDS information are
+ combined in one object.
+
+ @param alias The alias to insert into the attribute table.
+ @param name The name of the already-existing attribute to which
+ the alias will refer. */
+bool AttrTable::attr_alias(const string &alias, const string &name)
+{
+    return attr_alias(alias, this, name);
+}
+
+/** Erase the entire attribute table. This returns an AttrTable to the empty
+ state that's the same as the object generated by the null constructor.
+ @brief Erase the attribute table. */
+void AttrTable::erase()
+{
+    for (Attr_iter i = attr_map.begin(); i != attr_map.end(); ++i) {
+        delete *i;
+        *i = 0;
+    }
+
+    attr_map.erase(attr_map.begin(), attr_map.end());
+
+    d_name = "";
+}
+
+const string double_quote = "\"";
+
+// This is here as a result of the problem described in ticket #1163 where
+// the data handlers are adding quotes to string attributes so the DAS will
+// be printed correctly. But that has the affect of adding the quotes to the
+// attribute's _value_ not just it's print representation. As part of the fix
+// I made the code here add the quotes if the handlers are fixed (but not if
+// handlers are still adding them). The other part of 1163 is to fix all of
+// the handlers... What this fix means is that attributes whose values really
+// do contain bracketing quotes might be misunderstood, since we're assuming
+// those quotes were added by the handlers as a hack to get the output
+// formatting correct for the DAS. jhrg 7/30/08
+
+static void write_string_attribute_for_das(ostream &out, const string &value, const string &term)
+{
+    if (is_quoted(value))
+        out << value << term;
+    else
+        out << double_quote << value << double_quote << term;
+}
+
+#if 0
+static void
+write_string_attribute_for_das(FILE *out, const string &value, const string &term)
+{
+    if (is_quoted(value))
+    fprintf(out, "%s%s", value.c_str(), term.c_str());
+    else
+    fprintf(out, "\"%s\"%s", value.c_str(), term.c_str());
+}
+#endif
+
+// Special treatment for XML: Make sure to escape double quotes when XML is
+// printed in a DAS.
+static void write_xml_attribute_for_das(ostream &out, const string &value, const string &term)
+{
+    if (is_quoted(value))
+        out << escape_double_quotes(value) << term;
+    else
+        out << double_quote << escape_double_quotes(value) << double_quote << term;
+}
+
+#if 0
+static void
+write_xml_attribute_for_das(FILE *out, const string &value, const string &term)
+{
+    if (is_quoted(value))
+    fprintf(out, "%s%s", escape_double_quotes(value).c_str(), term.c_str());
+    else
+    fprintf(out, "\"%s\"%s", escape_double_quotes(value).c_str(), term.c_str());
+}
+#endif
+
+/** A simple printer that does nothing fancy with aliases.
+ Protected. */
+void AttrTable::simple_print(FILE *out, string pad, Attr_iter i, bool dereference)
+{
+    ostringstream oss;
+    simple_print(oss, pad, i, dereference);
+    fwrite(oss.str().data(), 1, oss.str().length(), out);
+
+#if 0
+    switch ((*i)->type) {
+        case Attr_container:
+#if WWW_ENCODING
+        fprintf(out, "%s%s {\n", pad.c_str(), id2www(get_name(i)).c_str());
+#else
+        fprintf(out, "%s%s {\n", pad.c_str(), get_name(i).c_str());
+#endif
+        (*i)->attributes->print(out, pad + "    ", dereference);
+
+        fprintf(out, "%s}\n", pad.c_str());
+        break;
+
+        case Attr_string: {
+#if WWW_ENCODING
+            fprintf(out, "%s%s %s ", pad.c_str(), get_type(i).c_str(), id2www(get_name(i)).c_str());
+#else
+            fprintf(out, "%s%s %s ", pad.c_str(), get_type(i).c_str(), get_name(i).c_str());
+#endif
+            vector<string> *sxp = (*i)->attr;
+            vector<string>::iterator last = sxp->end() - 1;
+            for (vector<string>::iterator i = sxp->begin(); i != last; ++i) {
+                write_string_attribute_for_das(out, *i, ", ");
+            }
+            write_string_attribute_for_das(out, *last, ";\n");
+        }
+        break;
+
+        case Attr_other_xml: {
+#if WWW_ENCODING
+            fprintf(out, "%s%s %s ", pad.c_str(), get_type(i).c_str(), id2www(get_name(i)).c_str());
+#else
+            fprintf(out, "%s%s %s ", pad.c_str(), get_type(i).c_str(), get_name(i).c_str());
+#endif
+            vector<string> *sxp = (*i)->attr;
+            vector<string>::iterator last = sxp->end() - 1;
+            for (vector<string>::iterator i = sxp->begin(); i != last; ++i) {
+                write_xml_attribute_for_das(out, *i, ", ");
+            }
+            write_xml_attribute_for_das(out, *last, ";\n");
+        }
+        break;
+
+        default: {
+#if WWW_ENCODING
+            fprintf(out, "%s%s %s ", pad.c_str(), get_type(i).c_str(), id2www(get_name(i)).c_str());
+#else
+            fprintf(out, "%s%s %s ", pad.c_str(), get_type(i).c_str(), get_name(i).c_str());
+#endif
+
+            vector<string> *sxp = (*i)->attr;
+            vector<string>::iterator last = sxp->end() - 1;
+            for (vector<string>::iterator i = sxp->begin(); i != last; ++i) {
+                fprintf(out, "%s%s", (*i).c_str(), ", ");
+            }
+            fprintf(out, "%s%s", (*last).c_str(), ";\n");
+        }
+        break;
+    }
+#endif
+}
+
+/** A simple printer that does nothing fancy with aliases.
+ Protected. */
+void AttrTable::simple_print(ostream &out, string pad, Attr_iter i, bool dereference)
+{
+    switch ((*i)->type) {
+    case Attr_container:
+#if WWW_ENCODING
+        out << pad << id2www(get_name(i)) << " {\n";
+#else
+        out << pad << add_space_encoding(get_name(i)) << " {\n";
+#endif
+        (*i)->attributes->print(out, pad + "    ", dereference);
+        out << pad << "}\n";
+        break;
+
+    case Attr_string: {
+#if WWW_ENCODING
+        out << pad << get_type(i) << " " << id2www(get_name(i)) << " ";
+#else
+        out << pad << get_type(i) << " " << add_space_encoding(get_name(i)) << " ";
+#endif
+        vector<string> *sxp = (*i)->attr;
+        vector<string>::iterator last = sxp->end() - 1;
+        for (vector<string>::iterator i = sxp->begin(); i != last; ++i) {
+            write_string_attribute_for_das(out, *i, ", ");
+        }
+        write_string_attribute_for_das(out, *last, ";\n");
+    }
+        break;
+
+    case Attr_other_xml: {
+#if WWW_ENCODING
+        out << pad << get_type(i) << " " << id2www(get_name(i)) << " ";
+#else
+        out << pad << get_type(i) << " " << add_space_encoding(get_name(i)) << " ";
+#endif
+        vector<string> *sxp = (*i)->attr;
+        vector<string>::iterator last = sxp->end() - 1;
+        for (vector<string>::iterator i = sxp->begin(); i != last; ++i) {
+            write_xml_attribute_for_das(out, *i, ", ");
+        }
+        write_xml_attribute_for_das(out, *last, ";\n");
+    }
+        break;
+
+    default: {
+#if WWW_ENCODING
+        out << pad << get_type(i) << " " << id2www(get_name(i)) << " ";
+#else
+        out << pad << get_type(i) << " " << add_space_encoding(get_name(i)) << " ";
+#endif
+        vector<string> *sxp = (*i)->attr;
+        vector<string>::iterator last = sxp->end() - 1;
+        for (vector<string>::iterator i = sxp->begin(); i != last; ++i) {
+            out << *i << ", ";
+        }
+        out << *last << ";\n";
+    }
+        break;
+    }
+}
+
+/** Prints an ASCII representation of the attribute table to the
+ indicated FILE pointer. The \c pad argument is prefixed to each
+ line of the output to provide control of indentation.
+
+ @brief Prints the attribute table.
+ @param out Print to the given output FILE.
+ @param pad Indent elements of a table using this string of spaces. By
+ default this is a string of four spaces
+ @param dereference If true, follow aliases. Default is false. */
+
+void AttrTable::print(FILE *out, string pad, bool dereference)
+{
+    ostringstream oss;
+    print(oss, pad, dereference);
+    fwrite(oss.str().data(), 1, oss.str().length(), out);
+
+#if 0
+    for (Attr_iter i = attr_map.begin(); i != attr_map.end(); ++i) {
+        if ((*i)->is_alias) {
+            if (dereference) {
+                simple_print(out, pad, i, dereference);
+            }
+            else {
+#if WWW_ENCODING
+                fprintf(out, "%sAlias %s %s;\n",
+                        pad.c_str(),
+                        id2www(get_name(i)).c_str(),
+                        id2www((*i)->aliased_to).c_str());
+#else
+                fprintf(out, "%sAlias %s %s;\n",
+                        pad.c_str(), add_space_encoding(get_name(i)).c_str(), add_space_encoding((*i)->aliased_to).c_str());
+
+#endif
+            }
+        }
+        else {
+            simple_print(out, pad, i, dereference);
+        }
+    }
+#endif
+}
+
+/** Prints an ASCII representation of the attribute table to the
+ indicated output stream. The \c pad argument is prefixed to each
+ line of the output to provide control of indentation.
+
+ @brief Prints the attribute table.
+ @param out Print to the given output stream.
+ @param pad Indent elements of a table using this string of spaces. By
+ default this is a string of four spaces
+ @param dereference If true, follow aliases. Default is false. */
+
+void AttrTable::print(ostream &out, string pad, bool dereference)
+{
+    for (Attr_iter i = attr_map.begin(); i != attr_map.end(); ++i) {
+        if ((*i)->is_alias) {
+            if (dereference) {
+                simple_print(out, pad, i, dereference);
+            }
+            else {
+#if WWW_ENCODING
+                out << pad << "Alias " << id2www(get_name(i))
+                << " " << id2www((*i)->aliased_to) << ";\n";
+#else
+                out << pad << "Alias " << add_space_encoding(get_name(i)) << " "
+                        << add_space_encoding((*i)->aliased_to) << ";\n";
+#endif
+            }
+        }
+        else {
+            simple_print(out, pad, i, dereference);
+        }
+    }
+}
+
+/** Print the attribute table in XML.
+ @param out Destination
+ @param pad Indent lines of text/xml this much. Default is four spaces.
+ @param constrained Not used
+ @deprecated */
+void AttrTable::print_xml(FILE *out, string pad, bool /*constrained*/)
+{
+    XMLWriter xml(pad);
+    print_xml_writer(xml);
+    fwrite(xml.get_doc(), sizeof(char), xml.get_doc_size(), out);
+
+#if OLD_XML_MOETHODS
+    ostringstream oss;
+    print_xml(oss, pad);
+    fwrite(oss.str().data(), 1, oss.str().length(), out);
+#endif
+
+#if 0
+    // Why this works: AttrTable is really a hacked class that used to
+    // implement a single-level set of attributes. Containers
+    // were added several years later by dropping in the 'entry' structure.
+    // It's not a class in its own right; instead accessors from AttrTable
+    // are used to access information from entry. So... the loop below
+    // actually iterates over the entries of *this* (which is an instance of
+    // AttrTable). A container is an entry whose sole value is an AttrTable
+    // instance. 05/19/03 jhrg
+    for (Attr_iter i = attr_begin(); i != attr_end(); ++i) {
+        if ((*i)->is_alias) {
+            fprintf(out, "%s<Alias name=\"%s\" Attribute=\"%s\"/>\n",
+                    pad.c_str(), id2xml(get_name(i)).c_str(),
+                    (*i)->aliased_to.c_str());
+
+        }
+        else if (is_container(i)) {
+            fprintf(out, "%s<Attribute name=\"%s\" type=\"%s\">\n",
+                    pad.c_str(), id2xml(get_name(i)).c_str(),
+                    get_type(i).c_str());
+
+            get_attr_table(i)->print_xml(out, pad + "    "/*, constrained*/);
+
+            fprintf(out, "%s</Attribute>\n", pad.c_str());
+        }
+        else {
+            fprintf(out, "%s<Attribute name=\"%s\" type=\"%s\">\n",
+                    pad.c_str(), id2xml(get_name(i)).c_str(), get_type(i).c_str());
+
+            string value_pad = pad + "    ";
+            // Special handling for the OtherXML attribute type - don't escape
+            // the XML and don't include the <value> element. Note that there
+            // cannot be an vector of XML things as can be with the other types.
+            if (get_attr_type(i) == Attr_other_xml) {
+                if (get_attr_num(i) != 1)
+                throw Error("OtherXML attributes cannot be vector-valued.");
+                fprintf(out, "%s%s\n", value_pad.c_str(), get_attr(i, 0).c_str());
+            }
+            else {
+                for (unsigned j = 0; j < get_attr_num(i); ++j) {
+                    fprintf(out, "%s<value>%s</value>\n", value_pad.c_str(),
+                            id2xml(get_attr(i, j)).c_str());
+                }
+            }
+            fprintf(out, "%s</Attribute>\n", pad.c_str());
+        }
+    }
+#endif
+}
+
+/**
+ * @deprecated
+ */
+void AttrTable::print_xml(ostream &out, string pad, bool /*constrained*/)
+{
+    XMLWriter xml(pad);
+    print_xml_writer(xml);
+    out << xml.get_doc();
+
+#if 0
+    for (Attr_iter i = attr_begin(); i != attr_end(); ++i) {
+        if ((*i)->is_alias) {
+            out << pad << "<Alias name=\"" << id2xml(get_name(i))
+            << "\" Attribute=\"" << (*i)->aliased_to << "\"/>\n";
+
+        }
+        else if (is_container(i)) {
+            out << pad << "<Attribute name=\"" << id2xml(get_name(i))
+            << "\" type=\"" << get_type(i) << "\">\n";
+
+            get_attr_table(i)->print_xml(out, pad + "    "/*, constrained*/);
+
+            out << pad << "</Attribute>\n";
+        }
+        else {
+            out << pad << "<Attribute name=\"" << id2xml(get_name(i))
+            << "\" type=\"" << get_type(i) << "\">\n";
+
+            string value_pad = pad + "    ";
+            if (get_attr_type(i) == Attr_other_xml) {
+                if (get_attr_num(i) != 1)
+                throw Error("OtherXML attributes cannot be vector-valued.");
+                out << value_pad << get_attr(i, 0) << "\n";
+            }
+            else {
+                string value_pad = pad + "    ";
+                for (unsigned j = 0; j < get_attr_num(i); ++j) {
+                    out << value_pad << "<value>" << id2xml(get_attr(i, j)) << "</value>\n";
+                }
+            }
+            out << pad << "</Attribute>\n";
+        }
+    }
+#endif
+}
+
+/** Print the attribute table in XML.
+ @param out Destination stream
+ @param pad Indent lines of text/xml this much. Default is four spaces.
+ @param constrained Not used */
+void AttrTable::print_xml_writer(XMLWriter &xml)
+{
+    for (Attr_iter i = attr_begin(); i != attr_end(); ++i) {
+        if ((*i)->is_alias) {
+            if (xmlTextWriterStartElement(xml.get_writer(), (const xmlChar*) "Alias") < 0)
+                throw InternalErr(__FILE__, __LINE__, "Could not write Alias element");
+            if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "name",
+                    (const xmlChar*) get_name(i).c_str()) < 0)
+                throw InternalErr(__FILE__, __LINE__, "Could not write attribute for name");
+            if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "Attribute",
+                    (const xmlChar*) (*i)->aliased_to.c_str()) < 0)
+                throw InternalErr(__FILE__, __LINE__, "Could not write attribute for name");
+            if (xmlTextWriterEndElement(xml.get_writer()) < 0)
+                throw InternalErr(__FILE__, __LINE__, "Could not end Alias element");
+        }
+        else if (is_container(i)) {
+            if (xmlTextWriterStartElement(xml.get_writer(), (const xmlChar*) "Attribute") < 0)
+                throw InternalErr(__FILE__, __LINE__, "Could not write Attribute element");
+            if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "name",
+                    (const xmlChar*) get_name(i).c_str()) < 0)
+                throw InternalErr(__FILE__, __LINE__, "Could not write attribute for name");
+            if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "type",
+                    (const xmlChar*) get_type(i).c_str()) < 0)
+                throw InternalErr(__FILE__, __LINE__, "Could not write attribute for name");
+
+            get_attr_table(i)->print_xml_writer(xml);
+
+            if (xmlTextWriterEndElement(xml.get_writer()) < 0)
+                throw InternalErr(__FILE__, __LINE__, "Could not end Attribute element");
+        }
+        else {
+            if (xmlTextWriterStartElement(xml.get_writer(), (const xmlChar*) "Attribute") < 0)
+                throw InternalErr(__FILE__, __LINE__, "Could not write Attribute element");
+            if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "name",
+                    (const xmlChar*) get_name(i).c_str()) < 0)
+                throw InternalErr(__FILE__, __LINE__, "Could not write attribute for name");
+            if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "type",
+                    (const xmlChar*) get_type(i).c_str()) < 0)
+                throw InternalErr(__FILE__, __LINE__, "Could not write attribute for name");
+
+            if (get_attr_type(i) == Attr_other_xml) {
+                if (get_attr_num(i) != 1)
+                    throw Error("OtherXML attributes cannot be vector-valued.");
+                // Replaced xmltextWriterWriteString with xmlTextWriterWriteRaw to keep the
+                // libxml2 code from escaping the xml (which was breaking all of the inferencing
+                // code. jhrg
+                if (xmlTextWriterWriteRaw(xml.get_writer(), (const xmlChar*) get_attr(i, 0).c_str()) < 0)
+                    throw InternalErr(__FILE__, __LINE__, "Could not write OtherXML value");
+            }
+            else {
+                for (unsigned j = 0; j < get_attr_num(i); ++j) {
+                    if (xmlTextWriterStartElement(xml.get_writer(), (const xmlChar*) "value") < 0)
+                        throw InternalErr(__FILE__, __LINE__, "Could not write value element");
+
+                    if (xmlTextWriterWriteString(xml.get_writer(), (const xmlChar*) get_attr(i, j).c_str()) < 0)
+                        throw InternalErr(__FILE__, __LINE__, "Could not write attribute value");
+
+                    if (xmlTextWriterEndElement(xml.get_writer()) < 0)
+                        throw InternalErr(__FILE__, __LINE__, "Could not end value element");
+                }
+            }
+            if (xmlTextWriterEndElement(xml.get_writer()) < 0)
+                throw InternalErr(__FILE__, __LINE__, "Could not end Attribute element");
+        }
+    }
+}
+
+/** Write the DAP4 XML representation for this attribute table. This
+ * method is used to build the DAP4 DMR response object.
+ *
+ * @param xml An XMLWriter that will do the serialization
+ */
+void
+AttrTable::print_dap4(XMLWriter &xml)
+{
+    print_xml_writer(xml);
+}
+
+/** @brief dumps information about this object
+ *
+ * Displays the pointer value of this instance and all attributes stored
+ *
+ * @param strm C++ i/o stream to dump the information to
+ * @return void
+ */
+void AttrTable::dump(ostream &strm) const
+{
+    strm << DapIndent::LMarg << "AttrTable::dump - (" << (void *) this << ")" << endl;
+    DapIndent::Indent();
+    strm << DapIndent::LMarg << "table name: " << d_name << endl;
+    if (attr_map.size()) {
+        strm << DapIndent::LMarg << "attributes: " << endl;
+        DapIndent::Indent();
+        Attr_citer i = attr_map.begin();
+        Attr_citer ie = attr_map.end();
+        for (; i != ie; ++i) {
+            entry *e = (*i);
+            string type = AttrType_to_String(e->type);
+            if (e->is_alias) {
+                strm << DapIndent::LMarg << "alias: " << e->name << " aliased to: " << e->aliased_to << endl;
+            }
+            else if (e->type == Attr_container) {
+                strm << DapIndent::LMarg << "attr: " << e->name << " of type " << type << endl;
+                DapIndent::Indent();
+                e->attributes->dump(strm);
+                DapIndent::UnIndent();
+            }
+            else {
+                strm << DapIndent::LMarg << "attr: " << e->name << " of type " << type << endl;
+                DapIndent::Indent();
+                strm << DapIndent::LMarg;
+                vector<string>::const_iterator iter = e->attr->begin();
+                vector<string>::const_iterator last = e->attr->end() - 1;
+                for (; iter != last; ++iter) {
+                    strm << (*iter) << ", ";
+                }
+                strm << (*(e->attr->end() - 1)) << endl;
+                DapIndent::UnIndent();
+            }
+        }
+        DapIndent::UnIndent();
+    }
+    else {
+        strm << DapIndent::LMarg << "attributes: empty" << endl;
+    }
+    if (d_parent) {
+        strm << DapIndent::LMarg << "parent table:" << d_name << ":" << (void *) d_parent << endl;
+    }
+    else {
+        strm << DapIndent::LMarg << "parent table: none" << d_name << endl;
+    }
+    DapIndent::UnIndent();
+}
+
+} // namespace libdap
+
diff --git a/AttrTable.h b/AttrTable.h
new file mode 100644
index 0000000..d1456cf
--- /dev/null
+++ b/AttrTable.h
@@ -0,0 +1,353 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1994-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// An AttrTable is a table of attributes (type-name-value tuples).
+
+#ifndef _attrtable_h
+#define _attrtable_h 1
+
+
+#include <string>
+#include <vector>
+
+#ifndef _error_h
+#include "Error.h"
+#endif
+
+using std::vector;
+using std::string;
+using std::vector;
+
+#ifndef A_DapObj_h
+#include "DapObj.h"
+#endif
+
+#ifndef XMLWRITER_H_
+#include "XMLWriter.h"
+#endif
+
+namespace libdap
+{
+
+/** <b>AttrType</b> identifies the data types which may appear in an
+    attribute table object.
+
+    \code
+    enum AttrType {
+ Attr_unknown,
+ Attr_container,
+ Attr_byte,
+ Attr_int16,
+ Attr_uint16,
+ Attr_int32,
+ Attr_uint32,
+ Attr_float32,
+ Attr_float64,
+ Attr_string,
+ Attr_url,
+ Attr_other_xml
+    };
+    \endcode
+
+    @see AttrTable */
+enum AttrType {
+    Attr_unknown,
+    Attr_container,
+    Attr_byte,
+    Attr_int16,
+    Attr_uint16,
+    Attr_int32,
+    Attr_uint32,
+    Attr_float32,
+    Attr_float64,
+    Attr_string,
+    Attr_url,
+    Attr_other_xml
+};
+
+string AttrType_to_String(const AttrType at);
+AttrType String_to_AttrType(const string &s);
+
+/** An AttrTable (``Attribute Table'') stores a set of names and, for
+    each name, either a type and a value, or another attribute table.
+    The attribute value can be a vector containing many values of the
+    same type.  The attributes can have any of the types listed in the
+    <tt>AttrType</tt> list.  However, all attribute types are stored as
+    string data, except for the container type, which is stored as a
+    pointer to another attribute table.
+
+    Each element in the attribute table can itself be an attribute
+    table.  The table can also contain ``alias'' attributes whose
+    value is given by the value of another attribute to which it is
+    linked.
+
+    The attribute tables have a standard printed representation.
+    There is a member function <tt>print()</tt> for writing this form.  Use
+    the <tt>DAS::parse()</tt> function to read the printed form.
+
+    An attribute table might look something like this:
+
+    \verbatim
+    string long_name "Weekly Means of Sea Surface Temperature";
+    actual_range {
+        Float64 min -1.8;
+        Float64 max 35.09;
+    }
+    string units "degC";
+    conversion_data {
+        Float64 add_offset 0.;
+        Float64 scale_factor 0.0099999998;
+    }
+    Int32 missing_value 32767;
+    \endverbatim
+
+    Here, <tt>long_name</tt>, <tt>units</tt>, and
+    <tt>missing_value</tt> are simple
+    attributes, and <tt>actual_range</tt> and <tt>conversion_data</tt>
+    are container attributes containing other attribute tables.
+
+	@note This class is used only for DAP2.
+
+    @brief Contains the attributes for a dataset.
+    @see DAS
+    @see AttrType */
+class AttrTable : public DapObj
+{
+    // entry needs to be made public to make up for issues with this class'
+    // design. It should probably be moved to it's own class. 05/22/03 jhrg
+public:
+    /** Each AttrTable has zero or more entries. Instead of accessing this
+    struct's members directly, use AttrTable methods.
+
+    This struct is public because its type is used in public typedefs. */
+    struct entry
+    {
+        string name;
+        AttrType type;
+
+        bool is_alias;
+        string aliased_to;
+
+        bool is_global; // use this to mark non-container attributes. see below.
+
+        // If type == Attr_container, use attributes to read the contained
+        // table, otherwise use attr to read the vector of values.
+        AttrTable *attributes;
+        std::vector<string> *attr; // a vector of values. jhrg 12/5/94
+
+        entry(): name(""), type(Attr_unknown), is_alias(false),
+                aliased_to(""), is_global(true), attributes(0), attr(0) {}
+
+        entry(const entry &rhs): name(rhs.name), type(rhs.type), is_alias(rhs.is_alias),
+                aliased_to(rhs.aliased_to), is_global(rhs.is_global),attributes(0), attr(0)
+        {
+            clone(rhs);
+        }
+
+        void delete_entry()
+        {
+            if (is_alias) // alias copies the pointers.
+                return;
+            if (type == Attr_container) {
+                delete attributes; attributes = 0;
+            }
+            else {
+                delete attr; attr = 0;
+            }
+        }
+
+        virtual ~entry()
+        {
+            delete_entry();
+        }
+
+        void clone(const entry &rhs)
+        {
+#if 0
+            name = rhs.name;
+            type = rhs.type;
+            is_alias = rhs.is_alias;
+            aliased_to = rhs.aliased_to;
+            is_global = rhs.is_global;
+#endif
+            switch (rhs.type) {
+            case Attr_unknown:
+                break;
+            case Attr_container: {
+                if (rhs.is_alias)
+                    attributes = rhs.attributes;
+                else
+                    attributes = new AttrTable(*rhs.attributes);
+                break;
+            }
+            default: {
+                if (rhs.is_alias)
+                    attr = rhs.attr;
+                else
+                    attr = new std::vector<string>(*rhs.attr);
+                break;
+            }
+            }
+        }
+
+        entry &operator=(const entry &rhs)
+        {
+            if (this != &rhs) {
+                delete_entry();
+                clone(rhs);
+            }
+            return *this;
+        }
+    };
+
+    typedef std::vector<entry *>::const_iterator Attr_citer ;
+    typedef std::vector<entry *>::iterator Attr_iter ;
+
+private:
+    string d_name;
+    AttrTable *d_parent;
+    std::vector<entry *> attr_map;
+
+    // Use this to mark container attributes. Look at the methods
+    // is_global_attribute() and set_is_...., esp. at the versions that take
+    // an iterator. This code is tricky because it has to track both whole
+    // containers that are global and individual attributes that are 'global'
+    // relative to a constructor. That is, there are some attributes that are
+    // bound to a container and not any of the container's children.
+    bool d_is_global_attribute;
+
+    void delete_attr_table();
+
+    friend class AttrTableTest;
+
+protected:
+    void clone(const AttrTable &at);
+
+    void simple_print(FILE *out, string pad, Attr_iter i,
+                      bool dereference);
+    void simple_print(ostream &out, string pad, Attr_iter i,
+                      bool dereference);
+
+public:
+    AttrTable();
+    AttrTable(const AttrTable &rhs);
+    virtual ~AttrTable();
+    AttrTable & operator=(const AttrTable &rhs);
+
+    virtual void erase();
+
+    virtual unsigned int get_size() const;
+    virtual string get_name() const;
+    virtual void set_name(const string &n);
+
+    /** Return a pointer to the AttrTable which holds this table (aka, its
+        parent. If this AttrTable has no parent, this returns null.
+        @return A pointer to the parent AttrTable. */
+    virtual AttrTable *get_parent() const
+    {
+        return d_parent;
+    }
+
+    virtual bool is_global_attribute() const { return d_is_global_attribute; }
+    virtual void set_is_global_attribute(bool ga) { d_is_global_attribute = ga; }
+
+    virtual unsigned int append_attr(const string &name, const string &type,
+				     const string &value);
+    virtual unsigned int append_attr(const string &name, const string &type,
+				     vector<string> *values);
+
+    virtual AttrTable *append_container(const string &name);
+    virtual AttrTable *append_container(AttrTable *at, const string &name);
+
+    virtual void find(const string &target, AttrTable **at, Attr_iter *iter);
+    virtual AttrTable *find_container(const string &target);
+    virtual AttrTable *recurrsive_find(const string &target,
+				       Attr_iter *location);
+
+    Attr_iter simple_find(const string &target);
+    AttrTable *simple_find_container(const string &target);
+
+
+    virtual AttrTable *get_attr_table(const string &name);
+    virtual string get_type(const string &name);
+    virtual AttrType get_attr_type(const string &name);
+    virtual unsigned int get_attr_num(const string &name);
+    virtual string get_attr(const string &name, unsigned int i = 0);
+    virtual vector<string> *get_attr_vector(const string &name);
+    virtual void del_attr(const string &name, int i = -1);
+
+    virtual Attr_iter attr_begin();
+    virtual Attr_iter attr_end();
+    virtual Attr_iter get_attr_iter(int i);
+    virtual string get_name(Attr_iter iter);
+    virtual bool is_container(Attr_iter iter);
+    virtual AttrTable *get_attr_table(Attr_iter iter);
+    virtual Attr_iter del_attr_table(Attr_iter iter);
+    virtual string get_type(Attr_iter iter);
+    virtual AttrType get_attr_type(Attr_iter iter);
+    virtual unsigned int get_attr_num(Attr_iter iter);
+    virtual string get_attr(Attr_iter iter, unsigned int i = 0);
+    virtual std::vector<string> *get_attr_vector(Attr_iter iter);
+    virtual bool is_global_attribute(Attr_iter iter);
+    virtual void set_is_global_attribute(Attr_iter iter, bool ga);
+
+    virtual void add_container_alias(const string &name, AttrTable *src);
+    virtual void add_value_alias(AttrTable *at, const string &name,
+                         const string &source);
+    virtual bool attr_alias(const string &alias,
+			    AttrTable *at,
+			    const string &name);
+    virtual bool attr_alias(const string &alias, const string &name);
+
+    virtual void print(FILE *out, string pad = "    ",
+		       bool dereference = false);
+    virtual void print(ostream &out, string pad = "    ",
+		       bool dereference = false);
+
+    virtual void print_xml(FILE *out, string pad = "    ",
+			   bool constrained = false);
+    virtual void print_xml(ostream &out, string pad = "    ",
+			   bool constrained = false);
+
+    void print_xml_writer(XMLWriter &xml);
+
+    void print_dap4(XMLWriter &xml);
+
+    virtual void dump(ostream &strm) const ;
+};
+
+
+string remove_space_encoding(const string &s);
+string add_space_encoding(const string &s);
+
+} // namespace libdap
+
+#endif // _attrtable_h
diff --git a/BaseType.cc b/BaseType.cc
new file mode 100644
index 0000000..2a74d6c
--- /dev/null
+++ b/BaseType.cc
@@ -0,0 +1,1300 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1994-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// Implementation for BaseType.
+//
+// jhrg 9/6/94
+
+#include "config.h"
+
+#include <cstdio>  // for stdin and stdout
+
+#include <sstream>
+#include <string>
+
+//#define DODS_DEBUG
+
+#include "BaseType.h"
+#include "Byte.h"
+#include "Int16.h"
+#include "UInt16.h"
+#include "Int32.h"
+#include "UInt32.h"
+#include "Float32.h"
+#include "Float64.h"
+#include "Str.h"
+#include "Url.h"
+#include "Array.h"
+#include "Structure.h"
+#include "Sequence.h"
+#include "Grid.h"
+
+#include "D4Attributes.h"
+#include "DMR.h"
+#include "XMLWriter.h"
+#include "D4BaseTypeFactory.h"
+
+#include "InternalErr.h"
+
+#include "util.h"
+#include "escaping.h"
+
+#include "debug.h"
+
+using namespace std;
+
+namespace libdap {
+
+// Protected copy mfunc
+
+/** Perform a deep copy. Copies the values of \e bt into \c *this. Pointers
+    are dereferenced and their values are copied into a newly allocated
+    instance.
+
+    @brief Perform a deep copy.
+    @param bt The source object. */
+void
+BaseType::m_duplicate(const BaseType &bt)
+{
+    DBG(cerr << "In BaseType::m_duplicate for " << bt.name() << endl);
+
+    d_name = bt.d_name;
+    d_type = bt.d_type;
+    d_dataset = bt.d_dataset;
+    d_is_read = bt.d_is_read; // added, reza
+    d_is_send = bt.d_is_send; // added, reza
+    d_in_selection = bt.d_in_selection;
+    d_is_synthesized = bt.d_is_synthesized; // 5/11/2001 jhrg
+
+    d_parent = bt.d_parent; // copy pointers 6/4/2001 jhrg
+
+    d_attr = bt.d_attr;  // Deep copy.
+
+    if (bt.d_attributes)
+        d_attributes = new D4Attributes(*bt.d_attributes); // deep copy
+    else
+        d_attributes = 0; // init to null if not used.
+
+    d_is_dap4 = bt.d_is_dap4;
+
+    DBG(cerr << "Exiting BaseType::m_duplicate for " << bt.name() << endl);
+}
+
+// Public mfuncs
+
+/** The BaseType constructor needs a name  and a type.
+    The BaseType class exists to provide data to
+    type classes that inherit from it.  The constructors of those
+    classes call the BaseType constructor; it is never called
+    directly.
+
+    @brief The BaseType constructor.
+
+    @param n A string containing the name of the new variable.
+    @param t The type of the variable.
+    @param is_dap4 True if this is a DAP4 variable. Default is False
+    @see Type */
+BaseType::BaseType(const string &n, const Type &t, bool is_dap4)
+: d_name(n), d_type(t), d_dataset(""), d_is_read(false), d_is_send(false),
+  d_parent(0), d_attributes(0), d_is_dap4(is_dap4),
+  d_in_selection(false), d_is_synthesized(false)
+{}
+
+/** The BaseType constructor needs a name, a dataset, and a type.
+    The BaseType class exists to provide data to
+    type classes that inherit from it.  The constructors of those
+    classes call the BaseType constructor; it is never called
+    directly.
+
+    @brief The BaseType constructor.
+    @param n A string containing the name of the new variable.
+    @param d A string containing the dataset name.
+    @param t The type of the variable. Default is False
+    @param is_dap4 True if this is a DAP4 variable.
+    @see Type */
+BaseType::BaseType(const string &n, const string &d, const Type &t, bool is_dap4)
+: d_name(n), d_type(t), d_dataset(d), d_is_read(false), d_is_send(false),
+  d_parent(0), d_attributes(0), d_is_dap4(is_dap4),
+  d_in_selection(false), d_is_synthesized(false)
+{}
+
+/** @brief The BaseType copy constructor. */
+BaseType::BaseType(const BaseType &copy_from) : DapObj()
+{
+    DBG(cerr << "In BaseTpe::copy_ctor for " << copy_from.name() << endl);
+    m_duplicate(copy_from);
+}
+
+BaseType::~BaseType()
+{
+    DBG2(cerr << "Entering ~BaseType (" << this << ")" << endl);
+
+    if (d_attributes)
+        delete d_attributes;
+
+    DBG2(cerr << "Exiting ~BaseType" << endl);
+}
+
+BaseType &
+BaseType::operator=(const BaseType &rhs)
+{
+    DBG(cerr << "Entering BaseType::operator=" << endl);
+    if (this == &rhs)
+        return *this;
+
+    m_duplicate(rhs);
+
+    DBG(cerr << "Exiting BaseType::operator=" << endl);
+    return *this;
+}
+
+/** Write out the object's internal fields in a string. To be used for
+    debugging when regular inspection w/ddd or gdb isn't enough.
+
+    @return A string which shows the object's internal stuff. */
+string BaseType::toString()
+{
+    ostringstream oss;
+    oss << "BaseType (" << this << "):" << endl
+        << "          _name: " << name() << endl
+        << "          _type: " << type_name() << endl
+        << "          _dataset: " << d_dataset << endl
+        << "          _read_p: " << d_is_read << endl
+        << "          _send_p: " << d_is_send << endl
+        << "          _synthesized_p: " << d_is_synthesized << endl
+        << "          d_parent: " << d_parent << endl
+        << "          d_attr: " << hex << &d_attr << dec << endl;
+
+    return oss.str();
+}
+
+/** @brief DAP2 to DAP4 transform
+ *
+ * For the current BaseType, return a DAP4 'copy' of the variable.
+ *
+ * @note For most DAP2 types, in this implementation of DAP4 the corresponding
+ * DAP4 type is the same. The different types are Sequences (which are D4Sequences
+ * in the DAP4 implementation), Grids (which are coverages) and Arrays (which use
+ * shared dimensions).
+ *
+ * @param root The root group that should hold this new variable. Add Group-level
+ * stuff here (e.g., D4Dimensions).
+ * @param container Add the new variable to this container.
+ *
+ * @return A pointer to the transformed variable
+ */
+void
+BaseType::transform_to_dap4(D4Group */*root*/, Constructor *container)
+{
+    BaseType *dest = ptr_duplicate();
+    // If it's already a DAP4 object then we can just return it!
+    if(!is_dap4()){
+        dest->attributes()->transform_to_dap4(get_attr_table());
+        dest->set_is_dap4(true);
+    }
+    container->add_var_nocopy(dest);
+}
+
+
+/** @brief DAP4 to DAP2 transform
+ *
+ * For the current BaseType, return a DAP2 'copy' of the variable.
+ *
+ * @note For most DAP4 types, in this implementation of DAP2 the corresponding
+ * DAP4 type is the same.
+ * These types have a different representations in DAP2 and DAP4:
+ *  Sequences (which are D4Sequences in the DAP4 implementation),
+ *  - Grids (which are semantically subsumed by coverages in DAP4)
+ *  - Arrays (which use shared dimensions in DAP4)
+ *
+ *  Additionally DAP4 adds the following types:
+ *  - UInt8, Int8, and Char which map to Byte in DAP2.
+ *  - Int64, Unit64 which have no natural representation in DAP2.
+ *  - Opaque Possible Byte stuff[] plus metadata?
+ *  - Enum's can be represented as Int32.
+ *
+ *  - Groups, with the exception of the root group "disappear" into the
+ *    names of their member variables. Specifically the Group name is add as a prefix
+ *    followed by a "/" separator to the names of all of the Group's member groups
+ *    variables.
+ *
+ * @param  The AttrTable pointer parent_attr_table is used by Groups, which disappear
+ * from the DAP2 representation. Their children are returned in the the BAseType vector
+ * their attributes are added to parent_attr_table;
+ * @return A pointer to a vector of BaseType pointers (right?). In most cases this vector
+ * will contain a single pointer but DAP4 types 'disappear' such as Group will return all
+ * of their member variables in the vector. DAP4 types with no representation in DAP2
+ * (ex: UInt64) the will return a NULL pointer and so this must be tested!
+ */
+std::vector<BaseType *> *
+BaseType::transform_to_dap2(AttrTable *)
+{
+    BaseType *dest = this->ptr_duplicate();
+    // convert the d4 attributes to a dap2 attribute table.
+    AttrTable *attrs = this->attributes()->get_AttrTable(name());
+    dest->set_attr_table(*attrs);
+    dest->set_is_dap4(false);
+    // attrs->print(cerr,"",true);
+
+    vector<BaseType *> *result =  new vector<BaseType *>();
+    result->push_back(dest);
+    return result;
+}
+
+
+/** @brief dumps information about this object
+ *
+ * Displays the pointer value of this instance and then displays information
+ * about this base type.
+ *
+ * @param strm C++ i/o stream to dump the information to
+ * @return void
+ */
+void
+BaseType::dump(ostream &strm) const
+{
+    strm << DapIndent::LMarg << "BaseType::dump - ("
+        << (void *)this << ")" << endl ;
+    DapIndent::Indent() ;
+
+    strm << DapIndent::LMarg << "name: " << name() << endl ;
+    strm << DapIndent::LMarg << "type: " << type_name() << endl ;
+    strm << DapIndent::LMarg << "dataset: " << d_dataset << endl ;
+    strm << DapIndent::LMarg << "read_p: " << d_is_read << endl ;
+    strm << DapIndent::LMarg << "send_p: " << d_is_send << endl ;
+    strm << DapIndent::LMarg << "synthesized_p: " << d_is_synthesized << endl ;
+    strm << DapIndent::LMarg << "parent: " << (void *)d_parent << endl ;
+    strm << DapIndent::LMarg << "attributes: " << endl ;
+    DapIndent::Indent() ;
+
+    if (d_attributes)
+        d_attributes->dump(strm);
+    else
+        d_attr.dump(strm) ;
+
+    DapIndent::UnIndent() ;
+
+    DapIndent::UnIndent() ;
+}
+
+/** @brief Returns the name of the class instance.
+ */
+string
+BaseType::name() const
+{
+    return d_name;
+}
+
+/**
+ * Return the FQN for this variable. This will include the D4 Group
+ * component of the name.
+ *
+ * @return The FQN in a string
+ */
+string
+BaseType::FQN() const
+{
+    if (get_parent() == 0)
+        return name();
+    else if (get_parent()->type() == dods_group_c)
+        return get_parent()->FQN() + name();
+    else
+        return get_parent()->FQN() + "." + name();
+}
+
+/** @brief Sets the name of the class instance. */
+void
+BaseType::set_name(const string &n)
+{
+    string name = n;
+    d_name = www2id(name); // www2id writes into its param.
+}
+
+/** @brief Returns the name of the dataset used to create this instance
+
+    A dataset from which the data is to be read. The meaning of this string
+    will vary among different types of data sources. It \e may be the name
+    of a data file or an identifier used to read data from a relational
+    database.
+ */
+string
+BaseType::dataset() const
+{
+    return d_dataset;
+}
+
+/** @brief Returns the type of the class instance. */
+Type
+BaseType::type() const
+{
+    return d_type;
+}
+
+/** @brief Sets the type of the class instance. */
+void
+BaseType::set_type(const Type &t)
+{
+    d_type = t;
+}
+
+/** @brief Returns the type of the class instance as a string. */
+string
+BaseType::type_name() const
+{
+    if (is_dap4())
+        return libdap::D4type_name(d_type);
+    else
+        return libdap::D2type_name(d_type);
+}
+
+/** @brief Returns true if the instance is a numeric, string or URL
+    type variable.
+    @return True if the instance is a scalar numeric, String or URL variable,
+    False otherwise. Arrays (even of simple types) return False.
+    @see is_vector_type() */
+bool
+BaseType::is_simple_type() const
+{
+    return libdap::is_simple_type(type());
+}
+
+/** @brief Returns true if the instance is a vector (i.e., array) type
+    variable.
+    @return True if the instance is an Array, False otherwise. */
+bool
+BaseType::is_vector_type() const
+{
+    return libdap::is_vector_type(type());
+}
+
+/** @brief Returns true if the instance is a constructor (i.e., Structure,
+    Sequence or Grid) type variable.
+    @return True if the instance is a Structure, Sequence or Grid, False
+    otherwise. */
+bool
+BaseType::is_constructor_type() const
+{
+    return libdap::is_constructor_type(type());
+}
+
+/** Return a count of the total number of variables in this variable.
+    This is used to count the number of variables held by a constructor
+    variable - for simple type and vector variables it always
+    returns 1.
+
+    For compound data types, there are two ways to count members.
+    You can count the members, or you can count the simple members
+    and add that to the count of the compound members.  For
+    example, if a Structure contains an Int32 and another
+    Structure that itself contains two Int32 members, the element
+    count of the top-level structure could be two (one Int32 and
+    one Structure) or three (one Int32 by itself and two Int32's
+    in the subsidiary Structure).  Use the <i>leaves</i> parameter
+    to control which kind of counting you desire.
+
+    @brief Count the members of constructor types.
+    @return Returns 1 for simple
+    types.  For compound members, the count depends on the
+    <i>leaves</i> argument.
+    @param leaves This parameter is only relevant if the object
+    contains other compound data types.  If FALSE, the function
+    counts only the data variables mentioned in the object's
+    declaration.  If TRUE, it counts the simple members, and adds
+    that to the sum of the counts for the compound members.
+    This parameter has no effect for simple type variables. */
+int
+BaseType::element_count(bool)
+{
+    return 1;
+}
+
+/** Returns true if the variable is a synthesized variable. A synthesized
+    variable is one that is added to the dataset by the server (usually
+    with a `projection function'. */
+bool
+BaseType::synthesized_p()
+{
+    return d_is_synthesized;
+}
+
+/** Set the synthesized flag. Before setting this flag be sure to set the
+    <tt>read_p()</tt> state. Once this flag is set you cannot
+    alter the state of the <tt>read_p</tt> flag!
+
+    @see synthesized_p() */
+void
+BaseType::set_synthesized_p(bool state)
+{
+    d_is_synthesized = state;
+}
+
+// Return the state of d_is_read (true if the value of the variable has been
+// read (and is in memory) false otherwise).
+
+/** Returns true if the value(s) for this variable have been read from the
+    data source, otherwise returns false. This method is used to determine
+    when values need to be read using the read() method. When read_p()
+    returns true, this library assumes that buf2val() (and other methods
+    such as get_vec()) can be used to access the value(s) of a variable.
+
+    @brief Has this variable been read?
+    @return True if the variable's value(s) have been read, false otherwise. */
+bool
+BaseType::read_p()
+{
+    return d_is_read;
+}
+
+/** Sets the value of the <tt>read_p</tt> property. This indicates that the
+    value(s) of this variable has/have been read. An implementation of the
+    read() method should use this to set the \c read_p property to true.
+
+    @note If the is_synthesized property is true, this method will _not_
+    alter the is_read property. If you need that behavior, specialize the
+    method in your subclasses if the various types.
+
+    @note For most of the types the default implementation of this method is
+    fine. However, if you're building a server which must handle data
+    represented using nested sequences, then you may need to provide a
+    specialization of Sequence::set_read_p(). By default Sequence::set_read_p()
+    recursively sets the \e read_p property for all child variables to
+    \e state. For servers where one Sequence reads an outer set of values
+    and another reads an inner set, this is cumbersome. In such a case, it is
+    easier to specialize Sequence::set_read_p() so that it does \e not
+    recursively set the \e read_p property for the inner Sequence. Be sure
+    to see the documentation for the read() method!
+
+    @todo Look at making synthesized variables easier to implement and at
+    making them more integrated into the overall CE evaluation process.
+    Maybe the code that computes the synthesized var's value should be in the
+    that variable's read() method? This might provide a way to get rid of the
+    awkward 'projection functions' by replacing them with real children of
+    BaseType. It would also provide a way to clean up the way the
+    \e synthesized_p prop intrudes on the \e read_p prop.
+
+    @see BaseType::read()
+    @brief Sets the value of the \e read_p property.
+    @param state Set the \e read_p property to this state. */
+void
+BaseType::set_read_p(bool state)
+{
+    // The this comment is/was wrong!
+    // The is_synthesized property was not being used and the more I thought
+    // about how this was coded, the more this code below seemed like a bad idea.
+    // Once the property was set, the read_p property could not be changed.
+    // That seems a little silly. Also, I think I need to use this is_synthesized
+    // property for some of the server function code I'm working on for Raytheon,
+    // and I'd like to be able to control the read_p property! jhrg 3/9/15
+
+    // What's true: The is_synthesized property is used by
+    // 'projection functions' in the freeform handler. It might be better
+    // to modify the FFtypes to support this behavior, but for now I'm returning
+    // the library to its old behavior. That this change (setting is_read
+    // of the value of is_syn...) broke the FF handler was not detected
+    // because the FF tests were not being run due to an error in the FF
+    // bes-testsuite Makefile.am). jhrg 9/9/15
+
+#if 1
+    if (!d_is_synthesized) {
+        d_is_read = state;
+    }
+#else
+    d_is_read = state;
+#endif
+}
+
+/** Returns the state of the \c send_p property. If true, this variable
+    should be sent to the client, if false, it should not. If no constraint
+    expression (CE) has been evaluated, this property is true for all
+    variables in a data source (i.e., for all the variables listed in a DDS).
+    If a CE has been evaluated, this property is true only for those
+    variables listed in the <em>projection part</em> of the CE.
+
+    @brief Should this variable be sent?
+    @return True if the variable should be sent to the client, false
+    otherwise. */
+bool
+BaseType::send_p()
+{
+    return d_is_send;
+}
+
+/** Sets the value of the <tt>send_p</tt> flag.  This
+    function is meant to be called from within the constraint evaluator of
+    other code which determines that this variable should be returned to the
+    client.  Data are ready to be sent when <i>both</i> the <tt>d_is_send</tt>
+    and <tt>d_is_read</tt> flags are set to TRUE.
+
+    @param state The logical state to set the <tt>send_p</tt> flag.
+ */
+void
+BaseType::set_send_p(bool state)
+{
+    DBG2(cerr << "Calling BaseType::set_send_p() for: " << this->name()
+        << endl);
+    d_is_send = state;
+}
+
+
+/** Get this variable's AttrTable. It's generally a bad idea to return a
+    reference to a contained object, but in this case it seems that building
+    an interface inside BaseType is overkill.
+
+    Use the AttrTable methods to manipulate the table. */
+AttrTable &
+BaseType::get_attr_table()
+{
+    return d_attr;
+}
+
+/** Set this variable's attribute table.
+    @param at Source of the attributes. */
+void
+BaseType::set_attr_table(const AttrTable &at)
+{
+    d_attr = at;
+}
+
+/** DAP4 Attribute methods
+ * @{
+ */
+D4Attributes *
+BaseType::attributes()
+{
+    if (!d_attributes) d_attributes = new D4Attributes();
+    return d_attributes;
+}
+
+void
+BaseType::set_attributes(D4Attributes *attrs)
+{
+    d_attributes = new D4Attributes(*attrs);
+}
+
+void
+BaseType::set_attributes_nocopy(D4Attributes *attrs)
+{
+    d_attributes = attrs;
+}
+///@}
+
+/**
+ * Transfer attributes from a DAS object into this variable. Because of the
+ * rough history of the DAS object and the way that various server code built
+ * the DAS, this is necessarily a heuristic process. The intent is that this
+ * method will be overridden by handlers that need to look for certain patterns
+ * in the DAS (e.g., hdf4's odd variable_dim_n; where n = 0, 1, 2, ...)
+ * attribute containers.
+ *
+ * There should be a one-to-one
+ * mapping between variables and attribute containers. However, in some cases
+ * one variable has attributes spread across several top level containers and
+ * in some cases one container is used by several variables
+ *
+ * @note This method is technically \e unnecessary because a server (or
+ * client) can easily add attributes directly using the DDS::get_attr_table
+ * or BaseType::get_attr_table methods and then poke values in using any
+ * of the methods AttrTable provides. This method exists to ease the
+ * transition to DDS objects which contain attribute information for the
+ * existing servers (Since they all make DAS objects separately from the
+ * DDS). They could be modified to use the same AttrTable methods but
+ * operate on the AttrTable instances in a DDS/BaseType instead of those in
+ * a DAS.
+ *
+ * @param at_container Transfer attributes from this container.
+ * @return void
+ */
+void BaseType::transfer_attributes(AttrTable *at_container) {
+
+    DBG(cerr << __func__ << "() -  BEGIN name:'" << name() << "'" << endl);
+
+    AttrTable *at = at_container->get_attr_table(name());
+    DBG(cerr << __func__ << "() - at: "<< (void *) at << endl);
+
+
+    if (at) {
+        at->set_is_global_attribute(false);
+        DBG(cerr << __func__ << "() - Processing AttrTable: " << at->get_name() << endl);
+
+        AttrTable::Attr_iter at_p = at->attr_begin();
+        while (at_p != at->attr_end()) {
+            DBG(cerr << __func__ << "() -  Attribute '" << at->get_name(at_p) << "' is type: " << at->get_type(at_p) << endl);
+            if (at->get_attr_type(at_p) == Attr_container){
+                // An attribute container may actually represent a child member variable. When
+                // that's the case we don't want to add the container to the parent type, but
+                // rather let any child of BaseType deal with those containers in the child's
+                // overridden transfer_attributes() method.
+                // We capitalize on the magic of the BaseType API and utilize the var() method
+                // to check for a child variable of the same name and, if one exists, we'll skip
+                // this AttrTable and let a child constructor class like Grid or Constructor
+                // deal with it.
+                BaseType *bt = var(at->get_name(at_p),true);
+                if(bt==0){
+                    DBG(cerr << __func__ << "() - Adding container '" << at->get_name(at_p) << endl);
+                    get_attr_table().append_container(new AttrTable(*at->get_attr_table(at_p)), at->get_name(at_p));
+                }
+                else {
+                    DBG(cerr << __func__ << "() - Found child var: '"<< bt->type_name()<< " " << bt->name() << " (address:" << (void *) bt << ")" << endl);
+                    DBG(cerr << __func__ << "() -  Skipping container '" << at->get_name(at_p) << endl);
+                }
+            }
+            else {
+                DBG(cerr << __func__ << "() - Adding Attribute '" << at->get_name(at_p) << endl);
+                get_attr_table().append_attr(at->get_name(at_p), at->get_type(at_p), at->get_attr_vector(at_p));
+            }
+            at_p++;
+        }
+    }
+    else {
+        DBG(cerr << __func__ << "() - Unable to locate AttrTable '" << name() << "'  SKIPPING" << endl);
+
+    }
+}
+
+/** Does this variable appear in either the selection part or as a function
+    argument in the current constrain expression. If this property is set
+    (true) then implementations of the read() method should read this
+    variable.
+
+    @note This method does not check, nor does it know about the semantics of,
+    string arguments passed to functions. Those functions might include
+    variable names in strings; they are responsible for reading those variables.
+    See the grid (func_grid_select()) for an example.
+    @see BaseType::read()
+    @brief Is this variable part of the current selection? */
+bool
+BaseType::is_in_selection()
+{
+    return d_in_selection;
+}
+
+/** Set the \e in_selection property to \e state. This property indicates
+    that the variable is used as a parameter to a constraint expression
+    function or that it appears as an argument in a selection sub-expression.
+    If set (true), implementations of the BaseType::read() method should read
+    this variable.
+
+    @param state Set the \e in_selection property to this state.
+    @see BaseType::read()
+    @see BaseType::is_in_selection() for more information. */
+void
+BaseType::set_in_selection(bool state)
+{
+    d_in_selection = state;
+}
+
+// Protected method.
+/** Set the <tt>parent</tt> property for this variable.
+
+    @note Added ability to set parent to null. 10/19/12 jhrg
+
+    @param parent Pointer to the Constructor of Vector parent variable or null
+    if the variable has no parent (if it is at the top-level of a DAP2/3 DDS).
+    @exception InternalErr thrown if called with anything other than a
+    Constructor, Vector or Null. */
+void
+BaseType::set_parent(BaseType *parent)
+{
+    if (!dynamic_cast<Constructor *>(parent)
+        && !dynamic_cast<Vector *>(parent)
+        && parent != 0)
+        throw InternalErr("Call to set_parent with incorrect variable type.");
+
+    d_parent = parent;
+}
+
+// Public method.
+
+/** Return a pointer to the Constructor or Vector which holds (contains)
+    this variable. If this variable is at the top level, this method
+    returns null.
+
+    @return A BaseType pointer to the variable's parent. */
+BaseType *
+BaseType::get_parent() const
+{
+    return d_parent;
+}
+
+// Documented in the header file.
+BaseType *
+BaseType::var(const string &/*name*/, bool /*exact_match*/, btp_stack */*s*/)
+{
+    return static_cast<BaseType *>(0);
+}
+
+/** This version of var(...) searches for <i>name</i> and returns a
+    pointer to the BaseType object if found. It uses the same search
+    algorithm as BaseType::var(const string &, bool, btp_stack *) when
+    <i>exact_match</i> is false. In addition to returning a pointer to
+    the variable, it pushes onto <i>s</i> a BaseType pointer to each
+    constructor type that ultimately contains <i>name</i>.
+
+    @note The BaseType implementation always returns null. There are no default
+    values for the parameters. If var() is called w/o any params, the three
+    parameter version will be used.
+
+    @deprecated This method is deprecated because it tries first to use
+    exact_match and, if that fails, then tries leaf_match. It's better to use
+    the alternate form of var(...) and specify exactly what you'd like to do.
+
+    @return A pointer to the named variable. */
+BaseType *
+BaseType::var(const string &, btp_stack &)
+{
+    return static_cast<BaseType *>(0);
+}
+
+/** Adds a variable to an instance of a constructor class, such as Array,
+    Structure <em>et cetera</em>. This function is only used by those
+    classes. For constructors with more than one variable, the variables
+    appear in the same order in which they were added (i.e., the order in
+    which add_var() was called). Since this method is only for use by Vectors
+    and Constructors, the BaseType implementation throws InternalErr.
+
+    @note For the implementation of this method in Structure, Sequence, et c.,
+    first copy \e bt and then insert the copy. If \e bt is itself a constructor
+    type you must either use the var() method to get a pointer to the actual
+    instance added to \c *this or you must first add all of <em>bt</em>'s
+    children to it before adding it to \c *this. The implementations should use
+    m_duplicate() to perform a deep copy of \e bt.
+
+    @brief Add a variable.
+
+    @todo We should get rid of the Part parameter and adopt the convention
+    that the first variable is the Array and all subsequent ones are Maps
+    (when dealing with a Grid, the only time Part matters). This would enable
+    several methods to migrate from Structure, Sequence and Grid to
+    Constructor.
+
+    @param bt The variable to be added to this instance. The caller of this
+    method <i>must</i> free memory it allocates for <tt>v</tt>. This method
+    will make a deep copy of the object pointed to by <tt>v</tt>.
+    @param part The part of the constructor data to be modified. Only
+    meaningful for Grid variables.
+
+    @see Part */
+void
+BaseType::add_var(BaseType *, Part)
+{
+    throw InternalErr(__FILE__, __LINE__, "BaseType::add_var unimplemented");
+}
+
+void
+BaseType::add_var_nocopy(BaseType *, Part)
+{
+    throw InternalErr(__FILE__, __LINE__, "BaseType::add_var_nocopy unimplemented");
+}
+
+/** This method should be implemented for each of the data type classes (Byte,
+    ..., Grid) when using the DAP class library to build a server. This
+    method is only for DAP servers. The library provides a default
+    definition here which throws an InternalErr exception \e unless the read_p
+    property has been set. In that case it returns false, indicating that all
+    the data have been read. The latter case can happen when building a
+    constant value that needs to be passed to a function. The variable/constant
+    is loaded with a value when it is created.
+
+    When implementing a new DAP server, the Byte, ..., Grid data type classes
+    are usually specialized. In each of those specializations read() should
+    be defined to read values from the data source and store them in the
+    object's local buffer. The read() method is called by other methods in
+    this library. When writing read(), follow these rules:
+
+    <ul>
+    <li> read() should throw Error if it encounters an error. The message
+   should be verbose enough to be understood by someone running a
+   client on a different machine.</li>
+    <li> The value(s) should be read if and only if either send_p() or
+          is_in_selection() return true. If neither of these return true, the
+   value(s) should not be read. This is important when writing read()
+   for a Constructor type such as Grid where a client may ask for only
+   the map vectors (and thus reading the much larger Array part is not
+   needed).</li>
+    <li> For each specialization of read(), the method should first test
+          the value of the \c read_p property (using the read_p() method)
+          and read values only if the value of read_p() is false. Once the
+          read() method reads data and stores it in the instance, it must
+          set the value of the \c read_p property to true using set_read_p().
+          If your read() methods fail to do this data may not serialize
+          correctly.</li>
+    <li> The Array::read() and Grid::read() methods should take into account
+   any restrictions on Array sizes.</li>
+    <li> If you are writing Sequence::read(), be sure to check the
+          documentation for Sequence::read_row() and Sequence::serialize()
+          so you understand how Sequence::read() is being called.</li>
+    <li> For Sequence::read(), your specialization must correctly manage the
+          \c unsent_data property and row count in addition to the \c read_p
+          property (handle the \c read_p property as describe above). For a
+          Sequence to serialize correctly, once all data from the Sequence
+          has been read, \c unsent_data property must be set to false (use
+          Sequence::set_unsent_data()). Also, at that time the row number
+          counter must be reset (use Sequence::reset_row_counter()). Typically
+          the correct time to set \c unsent_data to false and reset the row
+          counter is the time when Sequence::read() return false indicating
+          that all the data for the Sequence have been read. Failure to
+          handle these tasks will break serialization of nested Sequences. Note
+          that when Sequence::read() returns with a result of true (indicating
+          there is more data to send, the value of the \c unsent_data property
+          should be true.
+
+          Also, if you server must handle nested sequences, be sure to read
+          about subclassing set_read_p().</li>
+    </ul>
+
+    @brief Read data into a local buffer.
+
+	@todo Modify the D4 serialize code so that it supports the true/false
+	behavior of read() for arrays.
+
+	@todo Modify all of the stock handlers so they conform to this!
+
+    @return False means more data remains to be read, True indicates that no
+    more data need to be read. For Sequence and D4Sequence, this method will
+    generally read one instance of the Sequence; for other types it will generally
+    read the entire variable modulo any limitations due to a constraint. However,
+    the library should be written so that read can return less than all of the data
+    for a variable - serialize() would then call the function until it returns
+    True.
+
+    @see BaseType */
+bool
+BaseType::read()
+{
+    if (d_is_read)
+        return true;
+
+    throw InternalErr("Unimplemented BaseType::read() method called for the variable named: " + name());
+}
+
+void
+BaseType::intern_data(ConstraintEvaluator &, DDS &/*dds*/)
+{
+#if USE_LOCAL_TIMEOUT_SCHEME
+    dds.timeout_on();
+#endif
+    DBG2(cerr << "BaseType::intern_data: " << name() << endl);
+    if (!read_p())
+        read();          // read() throws Error and InternalErr
+#if USE_LOCAL_TIMEOUT_SCHEME
+    dds.timeout_off();
+#endif
+}
+
+/**
+ * @brief Read data into this variable
+ * @param eval Evaluator for a constraint expression
+ * @param dmr DMR for the whole dataset
+ */
+void
+BaseType::intern_data(/*Crc32 &checksum, DMR &, ConstraintEvaluator &*/)
+{
+    if (!read_p())
+        read();          // read() throws Error and InternalErr
+#if 0
+    compute_checksum(checksum);
+#endif
+}
+
+bool
+BaseType::serialize(ConstraintEvaluator &, DDS &,  Marshaller &, bool)
+{
+    throw InternalErr(__FILE__, __LINE__, "The DAP2 serialize() method has not been implemented for " + type_name());
+}
+
+bool
+BaseType::deserialize(UnMarshaller &, DDS *, bool)
+{
+    throw InternalErr(__FILE__, __LINE__, "The DAP2 deserialize() method has not been implemented for " + type_name());
+}
+
+void
+BaseType::serialize(D4StreamMarshaller &, DMR &, /*ConstraintEvaluator &,*/ bool)
+{
+    throw InternalErr(__FILE__, __LINE__, "The DAP4 serialize() method has not been implemented for " + type_name());
+}
+
+void
+BaseType::deserialize(D4StreamUnMarshaller &, DMR &)
+{
+    throw InternalErr(__FILE__, __LINE__, "The DAP4 deserialize() method has not been implemented for " + type_name());
+}
+
+/** Write the variable's declaration in a C-style syntax. This
+    function is used to create textual representation of the Data
+    Descriptor Structure (DDS).  See <i>The DODS User Manual</i> for
+    information about this structure.
+
+    A simple array declaration might look like this:
+    \verbatim
+    Float64 lat[lat = 180];
+    \endverbatim
+    While a more complex declaration (for a Grid, in this case),
+    would look like this:
+    \verbatim
+    Grid {
+    ARRAY:
+    Int32 sst[time = 404][lat = 180][lon = 360];
+    MAPS:
+    Float64 time[time = 404];
+    Float64 lat[lat = 180];
+    Float64 lon[lon = 360];
+    } sst;
+    \endverbatim
+
+    @brief Print an ASCII representation of the variable structure.
+    @param out The output stream on which to print the
+    declaration.
+    @param space Each line of the declaration will begin with the
+    characters in this string.  Usually used for leading spaces.
+    @param print_semi A boolean value indicating whether to print a
+    semicolon at the end of the declaration.
+    @param constraint_info A boolean value indicating whether
+    constraint information is to be printed with the declaration.
+    If the value of this parameter is TRUE, <tt>print_decl()</tt> prints
+    the value of the variable's <tt>send_p()</tt> flag after the
+    declaration.
+    @param constrained If this boolean value is TRUE, the variable's
+    declaration is only printed if is the <tt>send_p()</tt> flag is TRUE.
+    If a constraint expression is in place, and this variable is not
+    requested, the <tt>send_p()</tt> flag is FALSE.
+
+    @see DDS
+    @see DDS::CE
+ */
+void
+BaseType::print_decl(FILE *out, string space, bool print_semi,
+    bool constraint_info, bool constrained)
+{
+    ostringstream oss;
+    print_decl(oss, space, print_semi, constraint_info, constrained);
+    fwrite(oss.str().data(), sizeof(char), oss.str().length(), out);
+}
+
+/** Write the variable's declaration in a C-style syntax. This
+    function is used to create textual representation of the Data
+    Descriptor Structure (DDS).  See <i>The DODS User Manual</i> for
+    information about this structure.
+
+    A simple array declaration might look like this:
+    \verbatim
+    Float64 lat[lat = 180];
+    \endverbatim
+    While a more complex declaration (for a Grid, in this case),
+    would look like this:
+    \verbatim
+    Grid {
+    ARRAY:
+    Int32 sst[time = 404][lat = 180][lon = 360];
+    MAPS:
+    Float64 time[time = 404];
+    Float64 lat[lat = 180];
+    Float64 lon[lon = 360];
+    } sst;
+    \endverbatim
+
+    @brief Print an ASCII representation of the variable structure.
+    @param out The output stream on which to print the
+    declaration.
+    @param space Each line of the declaration will begin with the
+    characters in this string.  Usually used for leading spaces.
+    @param print_semi A boolean value indicating whether to print a
+    semicolon at the end of the declaration.
+    @param constraint_info A boolean value indicating whether
+    constraint information is to be printed with the declaration.
+    If the value of this parameter is TRUE, <tt>print_decl()</tt> prints
+    the value of the variable's <tt>send_p()</tt> flag after the
+    declaration.
+    @param constrained If this boolean value is TRUE, the variable's
+    declaration is only printed if is the <tt>send_p()</tt> flag is TRUE.
+    If a constraint expression is in place, and this variable is not
+    requested, the <tt>send_p()</tt> flag is FALSE.
+
+    @see DDS
+    @see DDS::CE
+ */
+void
+BaseType::print_decl(ostream &out, string space, bool print_semi,
+    bool constraint_info, bool constrained)
+{
+    // if printing the constrained declaration, exit if this variable was not
+    // selected.
+    if (constrained && !send_p())
+        return;
+
+    out << space << type_name() << " " << id2www(name()) ;
+
+    if (constraint_info) {
+        if (send_p())
+            out << ": Send True" ;
+        else
+            out << ": Send False" ;
+    }
+
+    if (print_semi)
+        out << ";\n" ;
+}
+
+/** Prints the value of the variable, with its declaration. This
+function is primarily intended for debugging DODS
+applications. However, it can be overloaded and used to do
+some useful things. Take a look at the asciival and writeval
+clients, both of which overload this to output the values of
+variables in different ways.
+
+@brief Prints the value of the variable.
+
+@param out The output stream on which to print the value.
+@param space This value is passed to the print_decl()
+function, and controls the leading spaces of the output.
+@param print_decl_p A boolean value controlling whether the
+variable declaration is printed as well as the value. */
+void
+BaseType::print_val(FILE *out, string space, bool print_decl_p)
+{
+    ostringstream oss;
+    print_val(oss, space, print_decl_p);
+    fwrite(oss.str().data(), sizeof(char), oss.str().length(), out);
+}
+
+/** Write the XML representation of this variable. This method is used to
+    build the DDX XML response.
+    @param out Destination.
+    @param space Use this to indent child declarations. Default is "".
+    @param constrained If true, only print this if it's part part of the
+    current projection. Default is False.
+    @deprecated */
+void
+BaseType::print_xml(FILE *out, string space, bool constrained)
+{
+    XMLWriter xml(space);
+    print_xml_writer(xml, constrained);
+    fwrite(xml.get_doc(), sizeof(char), xml.get_doc_size(), out);
+}
+
+/** Write the XML representation of this variable. This method is used to
+    build the DDX XML response.
+    @param out Destination output stream
+    @param space Use this to indent child declarations. Default is "".
+    @param constrained If true, only print this if it's part part of the
+    current projection. Default is False.
+    @deprecated */
+void
+BaseType::print_xml(ostream &out, string space, bool constrained)
+{
+    XMLWriter xml(space);
+    print_xml_writer(xml, constrained);
+    out << xml.get_doc();
+}
+
+/** Write the XML representation of this variable. This method is used to
+    build the DDX XML response.
+    @param out Destination output stream
+    @param space Use this to indent child declarations. Default is "".
+    @param constrained If true, only print this if it's part part of the
+    current projection. Default is False. */
+void
+BaseType::print_xml_writer(XMLWriter &xml, bool constrained)
+{
+    if (constrained && !send_p())
+        return;
+
+    if (xmlTextWriterStartElement(xml.get_writer(), (const xmlChar*)type_name().c_str()) < 0)
+        throw InternalErr(__FILE__, __LINE__, "Could not write " + type_name() + " element");
+
+    if (!name().empty())
+        if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "name", (const xmlChar*)name().c_str()) < 0)
+            throw InternalErr(__FILE__, __LINE__, "Could not write attribute for name");
+
+    if (is_dap4())
+        attributes()->print_dap4(xml);
+
+    if (!is_dap4() && get_attr_table().get_size() > 0)
+        get_attr_table().print_xml_writer(xml);
+
+    if (xmlTextWriterEndElement(xml.get_writer()) < 0)
+        throw InternalErr(__FILE__, __LINE__, "Could not end " + type_name() + " element");
+}
+
+/** Write the DAP4 XML representation for this variable. This method is used
+ * to build the DAP4 DMR response object.
+ *
+ * @param xml An XMLWriter that will do the serialization
+ * @param constrained True if the response should show the variables subject
+ * to the current constraint expression.
+ */
+void
+BaseType::print_dap4(XMLWriter &xml, bool constrained)
+{
+    print_xml_writer(xml, constrained);
+}
+
+// Compares the object's current state with the semantics of a particular
+// type. This will typically be defined in ctor classes (which have
+// complicated semantics). For BaseType, an object is semantically correct if
+// it has both a non-null name and type.
+//
+// NB: This is not the same as an invariant -- during the parse objects exist
+// but have no name. Also, the bool ALL defaults to false for BaseType. It is
+// used by children of CtorType.
+//
+// Returns: true if the object is semantically correct, false otherwise.
+
+/** This function checks the class instance for internal
+    consistency.  This is important to check for complex constructor
+    classes.  For BaseType, an object is semantically correct if it
+    has both a non-null name and type.
+
+    For example, an Int32 instance would return FALSE if it had no
+    name or no type defined.  A Grid instance might return FALSE for
+    more complex reasons, such as having Map arrays of the wrong
+    size or shape.
+
+    This function is used by the DDS class, and will rarely, if
+    ever, be explicitly called by a DODS application program.  A
+    variable must pass this test before it is sent, but there may be
+    many other stages in a retrieve operation where it would fail.
+
+    @brief Compare an object's current state with the semantics of its
+    type.
+    @return Returns FALSE when the current state violates some
+    aspect of the type semantics, TRUE otherwise.
+
+    @param msg A returned string, containing a message indicating
+    the source of any problem.
+    @param all For complex constructor types (Grid,
+    Sequence, Structure), this flag indicates whether to check the
+    semantics of the member variables, too.
+
+    @see DDS::check_semantics
+ */
+bool
+BaseType::check_semantics(string &msg, bool)
+{
+    bool sem = (d_type != dods_null_c && name().length());
+
+    if (!sem)
+        msg = "Every variable must have both a name and a type\n";
+
+    return sem;
+}
+
+/** This method contains the relational operators used by the constraint
+    expression evaluator in the DDS class. Each class that wants to be able
+    to evaluate relational expressions must overload this function. The
+    implementation in BaseType throws an InternalErr exception. The DAP
+    library classes Byte, ..., Url provide specializations of this method. It
+    is not meaningful for classes such as Array because relational
+    expressions using Array are not supported.
+
+    The <i>op</i> argument refers to a table generated by bison from
+    the constraint expression parser.  Use statements like the
+    following to correctly interpret its value:
+
+    \verbatim
+    switch (op) {
+        case EQUAL: return i1 == i2;
+        case NOT_EQUAL: return i1 != i2;
+        case GREATER: return i1 > i2;
+        case GREATER_EQL: return i1 >= i2;
+        case LESS: return i1 < i2;
+        case LESS_EQL: return i1 <= i2;
+        case REGEXP: throw Error("Regular expressions are not supported for integer values");
+        default: throw Error("Unknown operator");
+    }
+    \endverbatim
+
+    This function is used by the constraint expression evaluator.
+
+    @brief Evaluate relational operators.
+    @param b Compare the value of this instance with \e b.
+    @param op An integer index indicating which relational operator
+    is implied. Choose one from the following: <tt>EQUAL</tt>,
+    <tt>NOT_EQUAL</tt>, <tt>GREATER</tt>, <tt>GREATER_EQL</tt>,
+    <tt>LESS</tt>, <tt>LESS_EQL</tt>, and <tt>REGEXP</tt>.
+    @return The boolean value of the comparison.
+    @see BaseType::d4_ops(BaseType *, int)
+ */
+bool
+BaseType::ops(BaseType *, int)
+{
+    // Even though ops is a public method, it can never be called because
+    // they will never have a BaseType object since this class is abstract,
+    // however any of the child classes could by mistake call BaseType::ops
+    // so this is an internal error. Jose Garcia
+    throw InternalErr(__FILE__, __LINE__, "Unimplemented operator.");
+}
+
+/**
+ * @brief Evaluator a relop for DAP4
+ *
+ * This method is used by the filter expression evaluation code in DAP4.
+ * Each of the 'data type' classes that support relops must overload this
+ * method. In an expression of the form arg1 op arg2, this object is arg1,
+ * the parameter 'b' is arg2 and op is the relational operator.
+ *
+ * @note I used the same relop codes for DAP4 as in the DAP2 parser/scanner
+ * which makes for some coupling between them, but cuts way down on the
+ * duplication of the evaluator logic, which is somewhat involved.
+ *
+ * @param b The second argument in the relational expression
+ * @param op The infix relational operator
+ * @return True if the expression is true, False otherwise.
+ */
+bool
+BaseType::d4_ops(BaseType *, int)
+{
+    throw InternalErr(__FILE__, __LINE__, "Unimplemented operator.");
+}
+
+/**
+ * @brief How many bytes does this use
+ * Return the number of bytes of storage this variable uses. For scalar types,
+ * this is pretty simple (an int32 uses 4 bytes, etc.). For arrays and Constructors,
+ * it is a bit more complex. Note that a scalar String variable uses sizeof(String*)
+ * bytes, not the length of the string. In other words, the value returned is
+ * independent of the type. Also note width() of a String array returns the number of
+ * elements in the array times sizeof(String*). That is, each different array size
+ * is a different data type.
+ *
+ * @param constrained Should the current constraint be taken into account?
+ * @return Bytes of storage
+ */
+unsigned int
+BaseType::width(bool /* constrained */) const
+{
+    throw InternalErr(__FILE__, __LINE__, "not implemented");
+#if 0
+    return width(constrained);
+#endif
+}
+
+} // namespace libdap
diff --git a/BaseType.h b/BaseType.h
new file mode 100644
index 0000000..7338eac
--- /dev/null
+++ b/BaseType.h
@@ -0,0 +1,594 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//         Dan Holloway <dan@hollywood.gso.uri.edu>
+//         Reza Nekovei <reza@intcomm.net>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1994-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+//      dan             Dan Holloway <dan@hollywood.gso.uri.edu>
+//      reza            Reza Nekovei <reza@intcomm.net>
+
+// Abstract base class for the variables in a dataset. This is used to store
+// the type-invariant information that describes a variable as given in the
+// DODS API.
+//
+// jhrg 9/6/94
+
+#ifndef _basetype_h
+#define _basetype_h 1
+
+#include <vector>
+#include <stack>
+#include <iostream>
+#include <string>
+
+#include "AttrTable.h"
+
+#include "InternalErr.h"
+
+#include "dods-datatypes.h"
+#include "Type.h"
+
+#include "DapObj.h"
+
+using namespace std;
+
+class Crc32;
+
+namespace libdap
+{
+
+class ConstraintEvaluator;
+
+class DDS;
+class Marshaller;
+class UnMarshaller;
+
+class Constructor;
+class XMLWrter;
+
+class DMR;
+class D4Group;
+class XMLWriter;
+class D4StreamMarshaller;
+class D4StreamUnMarshaller;
+
+class D4Attributes;
+
+/** This defines the basic data type features for the DODS data access
+    protocol (DAP) data types. All the DAP type classes (Float64, Array,
+    etc.) subclass it. This class is an abstract one; no variables will ever
+    be stored as BaseType instances, only as instances of its child classes.
+
+    These classes and their methods give a user the capacity to set up
+    sophisticated data types. They do <i>not</i> provide sophisticated ways to
+    access and use this data. On the server side, in many cases, the class
+    instances will have no data in them at all until the
+    <tt>serialize</tt> function
+    is called to send data to the client. On the client side, most DAP
+    application programs will unpack the data promptly into whatever local
+    data structure the programmer deems the most useful.
+
+    In order to use these classes on the server side of a DAP
+    client/server connection, you must write a <tt>read</tt> method
+    for each of the data types you expect to encounter in the
+    application. This function, whose purpose is to read data from a
+    local source into the class instance data buffer, is called in
+    <tt>serialize</tt>, when the data is about to be sent to the
+    client.  The <tt>read</tt> function may be called earlier, in the
+    case of data subset requests (constraint expressions) whose
+    evaluation requires it. (For example, the constraint expression
+    ``<tt>a,b&b>c</tt>'' requires that <tt>c</tt> be read even though
+    it will not be sent.)
+
+    For some data types, the <tt>read</tt> function must be aware of
+    the constraints
+    to be returned. These cautions are outlined where they occur.
+
+	@note This class is ued by both DAP2 and DAP4.
+
+    @brief The basic data type for the DODS DAP types.  */
+
+class BaseType : public DapObj
+{
+private:
+    string d_name;  // name of the instance
+    Type d_type;   // instance's type
+    string d_dataset; // name of the dataset used to create this BaseType
+
+    bool d_is_read;  // true if the value has been read
+    bool d_is_send;  // Is the variable in the projection?
+
+    // d_parent points to the Constructor or Vector which holds a particular
+    // variable. It is null for simple variables. The Vector and Constructor
+    // classes must maintain this variable.
+    BaseType *d_parent;
+
+    // Attributes for this variable. Added 05/20/03 jhrg
+    AttrTable d_attr;
+
+    D4Attributes *d_attributes;
+
+    bool d_is_dap4;         // True if this is a DAP4 variable, false ... DAP2
+
+    // These are non-empty only for DAP4 variables. Added 9/27/12 jhrg
+
+protected:
+    // These were/are used for DAP2 CEs, but not for DAP4 ones
+    bool d_in_selection; // Is the variable in the selection?
+    bool d_is_synthesized; // true if the variable is synthesized
+
+    void m_duplicate(const BaseType &bt);
+
+public:
+    typedef stack<BaseType *> btp_stack;
+
+    // These ctors assume is_dap4 is false
+    BaseType(const string &n, const Type &t, bool is_dap4 = false);
+    BaseType(const string &n, const string &d, const Type &t, bool is_dap4 = false);
+
+    BaseType(const BaseType &copy_from);
+    virtual ~BaseType();
+
+    virtual string toString();
+
+    virtual void transform_to_dap4(D4Group *root, Constructor *container);
+    virtual std::vector<BaseType *> *transform_to_dap2(AttrTable *parent_attr_table);
+
+    virtual void dump(ostream &strm) const ;
+
+    BaseType &operator=(const BaseType &rhs);
+
+    /**
+     * Remove any read or set data in the private data of the variable,
+     * setting read_p() to false. Used to clear any dynamically allocated
+     * storage that holds (potentially large) data. For the simple types,
+     * this no-op version is all that's needed. Vector and some other classes
+     * define a special version and have serialize() implementations that
+     * call it to free data as soon as possible after sending it.
+     *
+     * @note Added 7/5/15 jhrg
+     * @note Any specialization of this should make sure to reset the read_p
+     * property.
+     */
+    virtual void clear_local_data() { set_read_p(false); }
+
+    virtual bool is_dap4() const { return d_is_dap4; }
+    virtual void set_is_dap4(const bool v) { d_is_dap4 = v;}
+
+    /** Clone this instance. Allocate a new instance and copy \c *this into
+	it. This method must perform a deep copy.
+
+        @note This method should \e not copy data values, but must copy all
+        other fields in the object.
+	@return A newly allocated copy of \c this. */
+    virtual BaseType *ptr_duplicate() = 0;
+
+    virtual string name() const;
+    virtual void set_name(const string &n);
+    virtual std::string FQN() const;
+
+    virtual Type type() const;
+    virtual void set_type(const Type &t);
+    virtual string type_name() const;
+
+    virtual string dataset() const ;
+
+    /**
+     * @brief How many elements are in this variable.
+     * @todo change the return type to int64_t
+     * @return The number of elements; 1 for scalars
+     */
+    virtual int length() const { return 1; }
+
+    /**
+     * @brief Set the number of elements for this variable
+     * @todo change param type to int64_t
+     * @param l The number of elements
+     */
+    virtual void set_length(int) { }
+
+    virtual bool is_simple_type() const;
+    virtual bool is_vector_type() const;
+    virtual bool is_constructor_type() const;
+
+    virtual bool synthesized_p();
+    virtual void set_synthesized_p(bool state);
+
+    virtual int element_count(bool leaves = false);
+
+    virtual bool read_p();
+    virtual void set_read_p(bool state);
+
+    virtual bool send_p();
+    virtual void set_send_p(bool state);
+
+    virtual AttrTable &get_attr_table();
+    virtual void set_attr_table(const AttrTable &at);
+
+    // DAP4 attributes
+    virtual D4Attributes *attributes();
+    virtual void set_attributes(D4Attributes *);
+    virtual void set_attributes_nocopy(D4Attributes *);
+
+    virtual bool is_in_selection();
+    virtual void set_in_selection(bool state);
+
+    virtual void set_parent(BaseType *parent);
+    virtual BaseType *get_parent() const;
+
+    virtual void transfer_attributes(AttrTable *at);
+
+    // I put this comment here because the version in BaseType.cc does not
+    // include the exact_match or s variables since they are not used. Doxygen
+    // was gaging on the comment.
+
+    /** Returns a pointer to the contained variable in a composite class. The
+        composite classes are those made up of aggregated simple data types.
+        Array, Grid, and Structure are composite types, while Int and Float are
+        simple types. This function is only used by composite classes. The
+        BaseType implementation always returns null.
+
+        Several of the subclasses provide alternate access methods
+        that make sense for that particular data type. For example,
+        the Array class defines a <tt>*var(int i)</tt> method that
+        returns the ith entry in the Array data, and the Structure
+        provides a <tt>*var(Vars_iter)</tt> function using a
+        pseudo-index to access the different members of the structure.
+
+        @brief Returns a pointer to a member of a constructor class.
+        @param name The name of the class member.  Defaults to ""
+        @param exact_match True if only interested in variables whose
+        full names match \e n exactly. If false, returns the first
+        variable whose name matches \e name. For example, if \e name
+        is \c x and \c point.x is a variable, then var("x", false)
+        would return a BaseType pointer to \c point.x. If \e
+        exact_match was <tt>true</tt> then \e name would need to be \c
+        "point.x" for var to return that pointer. This feature
+        simplifies constraint expressions for datasets which have
+        complex, nested, constructor variables. Defaults to true.
+        @param s Record the path to \e name. Defaults to null, in
+        which case it is not used.
+        @return A pointer to the member named in the \e n argument. If
+        no name is given, the function returns the first (only)
+        variable. For example, an Array has only one variable, while a
+        Structure can have many. */
+    virtual BaseType *var(const string &name = "", bool exact_match = true, btp_stack *s = 0);
+    virtual BaseType *var(const string &name, btp_stack &s);
+
+    virtual void add_var(BaseType *bt, Part part = nil);
+    virtual void add_var_nocopy(BaseType *bt, Part part = nil);
+
+    virtual bool read();
+
+    virtual bool check_semantics(string &msg, bool all = false);
+
+    virtual bool ops(BaseType *b, int op);
+    virtual bool d4_ops(BaseType *b, int op);
+
+    virtual unsigned int width(bool constrained = false) const;
+
+    virtual void print_decl(FILE *out, string space = "    ",
+                            bool print_semi = true,
+                            bool constraint_info = false,
+                            bool constrained = false);
+
+    virtual void print_xml(FILE *out, string space = "    ",
+                           bool constrained = false);
+
+    virtual void print_decl(ostream &out, string space = "    ",
+                            bool print_semi = true,
+                            bool constraint_info = false,
+                            bool constrained = false);
+
+    virtual void print_xml(ostream &out, string space = "    ",
+                           bool constrained = false);
+
+    virtual void print_xml_writer(XMLWriter &xml, bool constrained = false);
+
+    virtual void print_dap4(XMLWriter &xml, bool constrained = false);
+
+    /** @name Abstract Methods */
+    //@{
+#if 0
+    /** Return the number of bytes that are required to hold the
+	instance's value. In the case of simple types such as Int32,
+	this is the size of one Int32 (four bytes). For a String or
+	Url type, <tt>width(bool constrained = false)</tt> returns the number of bytes needed
+	for a <tt>String *</tt> variable, not the bytes needed for all
+	the characters, since that value cannot be determined from
+	type information alone. For Structure, and other constructor
+	types size() returns the number of bytes needed to store
+	pointers to the C++ objects.
+
+	@brief Returns the size of the class instance data. */
+    virtual unsigned int width(bool constrained = false) = 0;
+#endif
+    /** Reads the class data into the memory referenced by <i>val</i>.
+	The caller should either allocate enough storage to <i>val</i>
+	to hold the class data or set \c *val to null. If <i>*val</i>
+	is NULL, memory will be allocated by this function with
+	<tt>new()</tt>. If the memory is allocated this way, the
+	caller is responsible for deallocating that memory. Array and
+	values for simple types are stored as C would store an array.
+
+    @deprecated Use value() in the leaf classes.
+
+	@brief Reads the class data.
+
+	@param val A pointer to a pointer to the memory into which the
+	class data will be copied. If the value pointed to is NULL,
+	memory will be allocated to hold the data, and the pointer
+	value modified accordingly. The calling program is responsible
+	for deallocating the memory references by this pointer.
+
+	@return The size (in bytes) of the information copied to <i>val</i>.
+    */
+    virtual unsigned int buf2val(void **val) = 0;
+
+    /** Store the value pointed to by <i>val</i> in the object's
+	internal buffer. This function does not perform any checks, so
+	users must be sure that the thing pointed to can actually be
+	stored in the object's buffer.
+
+	Only simple objects (Int, Float, Byte, and so on) and arrays
+	of these simple objects may be stored using this function. To
+	put data into more complex constructor types, use the
+	functions provided by that class.
+
+    @deprecated Use set_value() in the leaf classes.
+
+	@brief Loads class data.
+
+	@param val A pointer to the data to be inserted into the class
+	data buffer.
+
+	@param reuse A boolean value, indicating whether the class
+	internal data storage can be reused or not. If this argument
+	is TRUE, the class buffer is assumed to be large enough to
+	hold the incoming data, and it is <i>not</i> reallocated. If
+	FALSE, new storage is allocated. If the internal buffer has
+	not been allocated at all, this argument has no effect. This
+	is currently used only in the Vector class.
+
+	@return The size (in bytes) of the information copied from
+	<i>val</i>.
+	@see Grid
+	@see Vector::val2buf */
+    virtual unsigned int val2buf(void *val, bool reuse = false) = 0;
+
+    /** Similar to using serialize() and deserialize() together in one object.
+        Data are read as for serialize and those values are stored in the
+        objects as deserialize() does but does not write and then read data
+        to/from a stream.
+
+        This method is defined by the various data type classes. It calls the
+        read() abstract method. Unlike serialize(), this method does not
+        clear the memory use to hold the data values, so the caller should
+        make sure to delete the DDS or the variable as soon as possible.
+
+        @param eval Use this as the constraint expression evaluator.
+        @param dds The Data Descriptor Structure object corresponding
+        to this dataset. See <i>The DODS User Manual</i> for
+        information about this structure. */
+    virtual void intern_data(ConstraintEvaluator &eval, DDS &dds);
+
+    /** Sends the data from the indicated (local) dataset through the
+	connection identified by the Marshaller parameter. If the
+	data is not already incorporated into the DDS object, read the
+	data from the dataset. Once the data are sent (written to the
+	Marshaller), they are deleted from the object and the object
+	state is reset so that they will be read again if the read()
+	method is called.
+
+	This function is only used on the server side of the
+	client/server connection, and is generally only called from
+	the ResponseBuilder functions. It has no BaseType
+	implementation; each datatype child class supplies its own
+	implementation.
+
+	@brief Move data to the net, then remove them from the object.
+
+        @param eval Use this as the constraint expression evaluator.
+	@param dds The Data Descriptor Structure object corresponding
+	to this dataset. See <i>The DODS User Manual</i> for
+	information about this structure.
+	@param m A marshaller used to serialize data types
+	@param ce_eval A boolean value indicating whether to evaluate
+	the DODS constraint expression that may accompany this
+	dataset. The constraint expression is stored in the <i>dds</i>.
+	@return This method always returns true. Older versions used
+	the return value to signal success or failure.
+
+	@note We changed the default behavior of this method so that it
+	calls BaseType::clear_local_data() once the values are sent. This,
+	combined with the behavior that read() is called by this method
+	just before data are sent, means that data for any given variable
+	remain in memory for the shortest time possible. Furthermore, since
+	variables are serialized one at a time, no more than one variable's
+	data will be in memory at any given time when using the default
+	behavior. Some code - code that uses intern_data() or server functions -
+	might alter this default behavior. Only Array (i.e. Vector), Sequence,
+	D4Sequence and D4Opaque types actually hold data in dynamically allocated
+	memory, so sonly those types have the new/changed behavior.
+	This change was made on 7/5/15.
+
+	@exception InternalErr.
+	@exception Error.
+	@see DDS */
+    virtual bool serialize(ConstraintEvaluator &eval, DDS &dds, Marshaller &m, bool ce_eval = true);
+
+#if 0
+    /**
+     * Provide a way to get the old behavior of serialize() - calling this
+     * method will serialize the BaseType object's data but _not_ delete its
+     * data storage.
+     *
+     * @note This method's behavior differs only for Array (i.e. Vector), Sequence,
+     * D4Sequence and D4Opaque types; the other types do not use dynamic memory to
+     * hold data values.
+     *
+     * @param eval Use this as the constraint expression evaluator.
+     * @param dds The Data Descriptor Structure object corresponding
+     * to this dataset. See <i>The DODS User Manual</i> for
+     * information about this structure.
+     * @param m A marshaller used to serialize data types
+     * @param ce_eval A boolean value indicating whether to evaluate
+     * the DODS constraint expression that may accompany this
+     * @return This method always returns true. Older versions used
+     * the return value to signal success or failure.
+     * @param
+     */
+    virtual bool serialize_no_release(ConstraintEvaluator &eval, DDS &dds, Marshaller &m, bool ce_eval = true) {
+        return serialize(eval, dds, m, ce_eval);
+    }
+#endif
+
+    /**
+     * @brief include the data for this variable in the checksum
+     * DAP4 includes a checksum with every data response. This method adds the
+     * variable's data to that checksum.
+     * @param checksum A Crc32 instance that holds the current checksum.
+     */
+    virtual void compute_checksum(Crc32 &checksum) = 0;
+
+    virtual void intern_data(/*Crc32 &checksum, DMR &dmr, ConstraintEvaluator &eval*/);
+
+    /**
+     * @brief The DAP4 serialization method.
+     * Serialize a variable's values for DAP4. This does not write the DMR
+     * persistent representation but does write that part of the binary
+     * data blob that holds a variable's data. Once a variable's data are
+     * serialized, that memory is reclaimed (by calling BaseType::clear_local_data())
+     *
+     * @param m
+     * @param dmr
+     * @param eval
+     * @param filter True if there is one variable that should be 'filtered'
+     * @exception Error or InternalErr
+     */
+    virtual void serialize(D4StreamMarshaller &m, DMR &dmr, bool filter = false);
+
+#if 0
+    /**
+     * @brief Variation on the DAP4 serialization method - retain data after serialization
+     * Serialize a variable's values for DAP4. This does not write the DMR
+     * persistent representation but does write that part of the binary
+     * data blob that holds a variable's data. Once a variable's data are
+     * serialized, that memory is reclaimed (by calling BaseType::clear_local_data())
+     *
+     * @note This version does not delete the storage of Array, D4Sequence or
+     * D4Opaque variables, as it the case with serialize(). For other types,
+     * this method and serialize have the same beavior (since those types do
+     * not us dynamic memory to hold data values).
+     *
+     * @param m
+     * @param dmr
+     * @param eval
+     * @param filter True if there is one variable that should be 'filtered'
+     * @exception Error or InternalErr
+     */
+    virtual void serialize_no_release(D4StreamMarshaller &m, DMR &dmr, bool filter = false) {
+        serialize(m, dmr, filter);
+    }
+#endif
+
+    /** Receives data from the network connection identified by the
+	<tt>source</tt> parameter. The data is put into the class data
+	buffer according to the input <tt>dds</tt>.
+
+	This function is only used on the client side of the DODS
+	client/server connection.
+
+	@brief Receive data from the net.
+
+	@param um An UnMarshaller that knows how to deserialize data types
+	@param dds The Data Descriptor Structure object corresponding
+	to this dataset. See <i>The DODS User Manual</i> for
+	information about this structure. This would have been
+	received from the server in an earlier transmission.
+	@param reuse A boolean value, indicating whether the class
+	internal data storage can be reused or not. If this argument
+	is TRUE, the class buffer is assumed to be large enough to
+	hold the incoming data, and it is <i>not</i> reallocated. If
+	FALSE, new storage is allocated. If the internal buffer has
+	not been allocated at all, this argument has no effect.
+	@return Always returns TRUE.
+	@exception Error when a problem reading from the UnMarshaller is
+	found.
+	@see DDS */
+    virtual bool deserialize(UnMarshaller &um, DDS *dds, bool reuse = false);
+
+    /**
+     * The DAP4 deserialization method.
+     * @param um
+     * @param dmr
+     * @exception Error or InternalErr
+     */
+    virtual void deserialize(D4StreamUnMarshaller &um, DMR &dmr);
+
+    /** Prints the value of the variable, with its declaration. This
+	function is primarily intended for debugging DODS
+	applications. However, it can be overloaded and used to do
+	some useful things. Take a look at the asciival and writeval
+	clients, both of which overload this to output the values of
+	variables in different ways.
+
+	@brief Prints the value of the variable.
+
+	@param out The output stream on which to print the value.
+	@param space This value is passed to the print_decl()
+	function, and controls the leading spaces of the output.
+	@param print_decl_p A boolean value controlling whether the
+	variable declaration is printed as well as the value. */
+
+    virtual void print_val(FILE *out, string space = "",
+                           bool print_decl_p = true);
+
+    /** Prints the value of the variable, with its declaration. This
+	function is primarily intended for debugging DODS
+	applications. However, it can be overloaded and used to do
+	some useful things. Take a look at the asciival and writeval
+	clients, both of which overload this to output the values of
+	variables in different ways.
+
+	@brief Prints the value of the variable.
+
+	@param out The output ostream on which to print the value.
+	@param space This value is passed to the print_decl()
+	function, and controls the leading spaces of the output.
+	@param print_decl_p A boolean value controlling whether the
+	variable declaration is printed as well as the value. */
+    virtual void print_val(ostream &out, string space = "",
+                           bool print_decl_p = true) = 0;
+    //@}
+};
+
+} // namespace libdap
+
+#endif // _basetype_h
diff --git a/BaseTypeFactory.cc b/BaseTypeFactory.cc
new file mode 100644
index 0000000..fa9c4fd
--- /dev/null
+++ b/BaseTypeFactory.cc
@@ -0,0 +1,166 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2005 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#include "config.h"
+
+#include <string>
+
+#include "Byte.h"
+#include "Int16.h"
+#include "UInt16.h"
+#include "Int32.h"
+#include "UInt32.h"
+#include "Float32.h"
+#include "Float64.h"
+#include "Str.h"
+#include "Url.h"
+#include "Array.h"
+#include "Structure.h"
+#include "Sequence.h"
+#include "Grid.h"
+
+#include "BaseTypeFactory.h"
+#include "debug.h"
+
+namespace libdap {
+
+BaseType *
+BaseTypeFactory::NewVariable(Type type, const string &name) const
+{
+	switch (type) {
+	case dods_byte_c:
+		return NewByte(name);
+	case dods_int16_c:
+		return NewInt16(name);
+	case dods_uint16_c:
+		return NewUInt16(name);
+	case dods_int32_c:
+		return NewInt32(name);
+	case dods_uint32_c:
+		return NewUInt32(name);
+	case dods_float32_c:
+		return NewFloat32(name);
+	case dods_float64_c:
+		return NewFloat64(name);
+
+	case dods_str_c:
+		return NewStr(name);
+	case dods_url_c:
+		return NewUrl(name);
+
+	case dods_array_c:
+		return NewArray(name);
+	case dods_structure_c:
+		return NewStructure(name);
+	case dods_sequence_c:
+		return NewSequence(name);
+	case dods_grid_c:
+		return NewGrid(name);
+	default:
+		throw InternalErr(__FILE__, __LINE__, "Unknown type");
+	}
+}
+
+Byte *
+BaseTypeFactory::NewByte(const string &n) const
+{
+    return new Byte(n);
+}
+
+Int16 *
+BaseTypeFactory::NewInt16(const string &n) const
+{
+    return new Int16(n);
+}
+
+UInt16 *
+BaseTypeFactory::NewUInt16(const string &n) const
+{
+    return new UInt16(n);
+}
+
+Int32 *
+BaseTypeFactory::NewInt32(const string &n) const
+{
+    DBG(cerr << "Inside BaseTypeFactory::NewInt32" << endl);
+    return new Int32(n);
+}
+
+UInt32 *
+BaseTypeFactory::NewUInt32(const string &n) const
+{
+    return new UInt32(n);
+}
+
+Float32 *
+BaseTypeFactory::NewFloat32(const string &n) const
+{
+    return new Float32(n);
+}
+
+Float64 *
+BaseTypeFactory::NewFloat64(const string &n) const
+{
+    return new Float64(n);
+}
+
+Str *
+BaseTypeFactory::NewStr(const string &n) const
+{
+    return new Str(n);
+}
+
+Url *
+BaseTypeFactory::NewUrl(const string &n) const
+{
+    return new Url(n);
+}
+
+Array *
+BaseTypeFactory::NewArray(const string &n , BaseType *v) const
+{
+    return new Array(n, v);
+}
+
+Structure *
+BaseTypeFactory::NewStructure(const string &n) const
+{
+    return new Structure(n);
+}
+
+Sequence *
+BaseTypeFactory::NewSequence(const string &n) const
+{
+    DBG(cerr << "Inside BaseTypeFactory::NewSequence" << endl);
+    return new Sequence(n);
+}
+
+Grid *
+BaseTypeFactory::NewGrid(const string &n) const
+{
+    return new Grid(n);
+}
+
+} // namespace libdap
diff --git a/BaseTypeFactory.h b/BaseTypeFactory.h
new file mode 100644
index 0000000..85a02b7
--- /dev/null
+++ b/BaseTypeFactory.h
@@ -0,0 +1,127 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2005 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#ifndef base_type_factory_h
+#define base_type_factory_h
+
+#include <string>
+
+#include "Type.h"
+#include "InternalErr.h"
+
+// Class declarations; Make sure to include the corresponding headers in the
+// implementation file.
+
+namespace libdap
+{
+
+class Byte;
+class Int16;
+class UInt16;
+class Int32;
+class UInt32;
+class Float32;
+class Float64;
+class Str;
+class Url;
+class Array;
+class Structure;
+class Sequence;
+class Grid;
+class BaseType;
+
+/** A factory to create instances of the leaf nodes of BaseType (Byte, ...
+    Grid). Clients of libdap++ which require special behavior for the types
+    should subclass this factory and provide an implementation which creates
+    instances of those specializations. Make sure to pass a reference to the
+    new factory to DDS's constructor since by default it uses this factory.
+
+    To define and use your own factory, first make sure that you are not
+    using the compile time constant 'DEFAULT_BASETYPE_FACTORY.' Then pass a
+    pointer to an instance of your factory to the DDS/DataDDS constructors.
+    When the parser is used to build a DDS from a DAP response, the factory
+    will be used to instantiate the different variable-type classes.
+
+    @note The easiest way to subclass this is to follow the pattern of using
+    a separate class declaration and implementation. It's possible to use one
+    file to hold
+    both, but that is complicated somewhat because DDS.h, which includes this
+    class, also includes many of the type classes (Array.h, ..., Grid.h) and
+    the order of their inclusion can create compilation problems where the
+    Vector and/or Constructor base classes are not defined. It's easiest to
+    split the declaration and implementation and include forward declarations
+    of the type classes in the declaration (\c .h) file and then include the
+    type class' headers in the implementation (\c .cc) file.
+
+    @author James Gallagher
+    @see DDS */
+class BaseTypeFactory
+{
+public:
+    BaseTypeFactory()
+    {}
+    virtual ~BaseTypeFactory()
+    {}
+
+    /**
+     * Build a new variable and return it using a BaseType pointer. The
+     * type of the variable is given using  Type enumeration.
+     *
+     * @note Added for DAP4
+     *
+     * @param t The type of the variable to create
+     * @parma name The (optional) name of the variable.
+     */
+    virtual BaseType *NewVariable(Type t, const string &name = "") const;
+
+    /**
+     * Clone this object and return a pointer to the clone.
+     *
+     * @note added for DAP4
+     */
+    virtual BaseTypeFactory *ptr_duplicate() const {
+        throw InternalErr(__FILE__, __LINE__, "Not Implemented.");
+    }
+
+    virtual Byte *NewByte(const string &n = "") const;
+    virtual Int16 *NewInt16(const string &n = "") const;
+    virtual UInt16 *NewUInt16(const string &n = "") const;
+    virtual Int32 *NewInt32(const string &n = "") const;
+    virtual UInt32 *NewUInt32(const string &n = "") const;
+    virtual Float32 *NewFloat32(const string &n = "") const;
+    virtual Float64 *NewFloat64(const string &n = "") const;
+
+    virtual Str *NewStr(const string &n = "") const;
+    virtual Url *NewUrl(const string &n = "") const;
+
+    virtual Array *NewArray(const string &n = "", BaseType *v = 0) const;
+    virtual Structure *NewStructure(const string &n = "") const;
+    virtual Sequence *NewSequence(const string &n = "") const;
+    virtual Grid *NewGrid(const string &n = "") const;
+};
+
+} // namespace libdap
+
+#endif // base_type_factory_h
diff --git a/Byte.cc b/Byte.cc
new file mode 100644
index 0000000..7644d56
--- /dev/null
+++ b/Byte.cc
@@ -0,0 +1,390 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1994-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// Implementation for Byte.
+//
+// jhrg 9/7/94
+
+//#define DODS_DEBUG
+
+#include "config.h"
+
+#include <sstream>
+
+#include "Byte.h"           // synonymous with UInt8 and Char
+#include "Int8.h"
+#include "Int16.h"
+#include "UInt16.h"
+#include "Int32.h"
+#include "UInt32.h"
+#include "Int64.h"
+#include "UInt64.h"
+#include "Float32.h"
+#include "Float64.h"
+#include "Str.h"
+#include "Url.h"
+
+#include "DDS.h"
+#include "Operators.h"
+#include "Marshaller.h"
+#include "UnMarshaller.h"
+
+#include "DMR.h"
+#include "D4Attributes.h"
+#include "D4StreamMarshaller.h"
+#include "D4StreamUnMarshaller.h"
+
+#include "debug.h"
+#include "util.h"
+#include "parser.h"
+#include "dods-limits.h"
+#include "InternalErr.h"
+
+using std::cerr;
+using std::endl;
+
+namespace libdap {
+
+/** The Byte constructor requires only the name of the variable
+    to be created.  The name may be omitted, which will create a
+    nameless variable.  This may be adequate for some applications.
+
+    @brief The Byte constructor.
+    @param n A string containing the name of the variable to be
+    created.
+
+*/
+Byte::Byte(const string & n): BaseType(n, dods_byte_c), d_buf(0)
+{}
+
+/** This Byte constructor requires the name of the variable to be created
+    and the name of the dataset from which this variable is being created.
+    This constructor is used in server-side processing, loading structure in
+    from a dataset.
+
+    @brief The Byte server-side constructor.
+    @param n A string containing the name of the variable to be created.
+    @param d A string containing the name of the dataset from which the
+    variable is being created.
+*/
+Byte::Byte(const string &n, const string &d): BaseType(n, d, dods_byte_c), d_buf(0)
+{}
+
+Byte::Byte(const Byte & copy_from): BaseType(copy_from)
+{
+    d_buf = copy_from.d_buf;
+}
+
+BaseType *Byte::ptr_duplicate()
+{
+    return new Byte(*this);
+}
+
+Byte & Byte::operator=(const Byte & rhs)
+{
+    if (this == &rhs)
+        return *this;
+
+    dynamic_cast < BaseType & >(*this) = rhs;
+
+    d_buf = rhs.d_buf;
+
+    return *this;
+}
+
+unsigned int Byte::width(bool) const
+{
+    return sizeof(dods_byte);
+}
+
+/** Serialize the contents of member _BUF (the object's internal
+    buffer, used to hold data) and write the result to stdout. If
+    FLUSH is true, write the contents of the output buffer to the
+    kernel. FLUSH is false by default. If CE_EVAL is true, evaluate
+    the current constraint expression; only send data if the CE
+    evaluates to true.
+
+    @return False if a failure to read, send or flush is detected, true
+    otherwise.
+*/
+bool Byte::serialize(ConstraintEvaluator & eval, DDS & dds, Marshaller &m, bool ce_eval)
+{
+#if USE_LOCAL_TIMEOUT_SCHEME
+    dds.timeout_on();
+#endif
+    if (!read_p())
+        read();          // read() throws Error and InternalErr
+
+    if (ce_eval && !eval.eval_selection(dds, dataset()))
+        return true;
+#if USE_LOCAL_TIMEOUT_SCHEME
+    dds.timeout_off();
+#endif
+    m.put_byte( d_buf ) ;
+
+    return true;
+}
+
+/** @brief Deserialize the char on stdin and put the result in
+    <tt>_BUF</tt>.
+*/
+bool Byte::deserialize(UnMarshaller &um, DDS *, bool)
+{
+    um.get_byte( d_buf ) ;
+
+    return false;
+}
+
+void
+Byte::compute_checksum(Crc32 &checksum)
+{
+	checksum.AddData(reinterpret_cast<uint8_t*>(&d_buf), sizeof(d_buf));
+}
+
+/**
+ * @brief Serialize a Byte
+ * @param m
+ * @param dmr Unused
+ * @param eval Unused
+ * @param filter Unused
+ * @exception Error is thrown if the value needs to be read and that operation fails.
+ */
+void
+Byte::serialize(D4StreamMarshaller &m, DMR &, /*ConstraintEvaluator &,*/ bool)
+{
+    if (!read_p())
+        read();          // read() throws Error
+
+    m.put_byte( d_buf ) ;
+}
+
+void
+Byte::deserialize(D4StreamUnMarshaller &um, DMR &)
+{
+    um.get_byte( d_buf ) ;
+}
+
+/** Store the value referenced by <i>val</i> in the object's internal
+    buffer. <i>reuse</i> has no effect because this class does not
+    dynamically allocate storage for the internal buffer.
+
+    @return The size (in bytes) of the value's representation.  */
+unsigned int Byte::val2buf(void *val, bool)
+{
+    // Jose Garcia
+    // This method is public therefore and I believe it has being designed
+    // to be use by read which must be implemented on the surrogate library,
+    // thus if the pointer val is NULL, is an Internal Error.
+    if (!val)
+        throw InternalErr("the incoming pointer does not contain any data.");
+
+    d_buf = *(dods_byte *) val;
+
+    return width();
+}
+
+unsigned int Byte::buf2val(void **val)
+{
+    // Jose Garcia
+    // The same comment justifying throwing an Error in val2buf applies here.
+    if (!val)
+        throw InternalErr("NULL pointer");
+
+    if (!*val)
+        *val = new dods_byte;
+
+    *(dods_byte *) * val = d_buf;
+
+    return width();
+}
+
+/** Set the value of this instance.
+    @param value The value
+    @return Always returns true; the return type of bool is for compatibility
+    with the Passive* subclasses written by HAO. */
+bool Byte::set_value(dods_byte value)
+{
+    d_buf = value;
+    set_read_p(true);
+
+    return true;
+}
+
+/** Get the value of this instance.
+    @return The value. */
+dods_byte Byte::value() const
+{
+    return d_buf;
+}
+
+void Byte::print_val(FILE * out, string space, bool print_decl_p)
+{
+    ostringstream oss;
+    print_val(oss, space, print_decl_p);
+    fwrite(oss.str().data(), sizeof(char), oss.str().length(), out);
+}
+
+void Byte::print_val(ostream &out, string space, bool print_decl_p)
+{
+    if (print_decl_p) {
+        print_decl(out, space, false);
+        out << " = " << (int) d_buf << ";\n";
+    }
+    else
+        out << (int) d_buf;
+}
+
+bool Byte::ops(BaseType * b, int op)
+{
+
+    // Extract the Byte arg's value.
+    if (!read_p() && !read()) {
+        // Jose Garcia
+        // Since the read method is virtual and implemented outside
+        // libdap++ if we cannot read the data that is the problem
+        // of the user or of whoever wrote the surrogate library
+        // implementing read therefore it is an internal error.
+        throw InternalErr("This value not read!");
+    }
+    // Extract the second arg's value.
+    if (!b || !(b->read_p() || b->read())) {
+        // Jose Garcia
+        // Since the read method is virtual and implemented outside
+        // libdap++ if we cannot read the data that is the problem
+        // of the user or of whoever wrote the surrogate library
+        // implementing read therefore it is an internal error.
+        throw InternalErr("This value not read!");
+    }
+
+    // By using the same operator code numbers for both the DAP2 and DAP4
+    // parser/evaluator we can use the same evaluation code.
+    return d4_ops(b, op);
+}
+
+/**
+ * @see BaseType::d4_ops(BaseType *, int)
+ */
+bool Byte::d4_ops(BaseType *b, int op)
+{
+    switch (b->type()) {
+        case dods_int8_c:
+            return USCmp<dods_byte, dods_int8>(op, d_buf, static_cast<Int8*>(b)->value());
+        case dods_byte_c:
+            return Cmp<dods_byte, dods_byte>(op, d_buf, static_cast<Byte*>(b)->value());
+        case dods_int16_c:
+            return USCmp<dods_byte, dods_int16>(op, d_buf, static_cast<Int16*>(b)->value());
+        case dods_uint16_c:
+            return Cmp<dods_byte, dods_uint16>(op, d_buf, static_cast<UInt16*>(b)->value());
+        case dods_int32_c:
+            return USCmp<dods_byte, dods_int32>(op, d_buf, static_cast<Int32*>(b)->value());
+        case dods_uint32_c:
+            return Cmp<dods_byte, dods_uint32>(op, d_buf, static_cast<UInt32*>(b)->value());
+        case dods_int64_c:
+            return USCmp<dods_byte, dods_int64>(op, d_buf, static_cast<Int64*>(b)->value());
+        case dods_uint64_c:
+            return Cmp<dods_byte, dods_uint64>(op, d_buf, static_cast<UInt64*>(b)->value());
+        case dods_float32_c:
+            return USCmp<dods_byte, dods_float32>(op, d_buf, static_cast<Float32*>(b)->value());
+        case dods_float64_c:
+            return USCmp<dods_byte, dods_float64>(op, d_buf, static_cast<Float64*>(b)->value());
+        case dods_str_c:
+        case dods_url_c:
+            throw Error(malformed_expr, "Relational operators can only compare compatible types (number, string).");
+        default:
+            throw Error(malformed_expr, "Relational operators only work with scalar types.");
+    }
+}
+
+
+
+
+/** @brief DAP4 to DAP2 transform
+ *
+ * Return a DAP2 'copy' of the variable.
+ *
+ * NOTE: This little bit of magic ensures that the DAP4 shenanigans
+ * in which UInt8, Char , and Byte are synonymous is reduced
+ * to the DAP2 simplicity of Byte.
+ *
+ *
+ * @param root The root group that should hold this new variable. Add Group-level
+ * stuff here (e.g., D4Dimensions).
+ * @param container Add the new variable to this container.
+ *
+ * @return A pointer to the transformed variable
+ */
+std::vector<BaseType *> *
+Byte::transform_to_dap2(AttrTable *parent_attr_table)
+{
+    DBG(cerr << __func__ << "() - BEGIN" << endl;);
+    vector<BaseType *> *vec = BaseType::transform_to_dap2(parent_attr_table);
+    if(vec->size()!=1){
+        ostringstream oss;
+        oss << __func__ << "() -  Something Bad Happened. This transform should produce only ";
+        oss << " a single BaseType yet it produced " << vec->size();
+        throw new Error(internal_error,oss.str());
+    }
+
+    BaseType *dest = (*vec)[0];
+    DBG(cerr << __func__ << "() - type():       " << type() << endl;);
+    DBG(cerr << __func__ << "() - dest->type(): " << dest->type() << endl;);
+
+    // This little bit of magic ensures that the DAP4 shenanigans
+    // in which UInt8, Char , and Byte are synonymous is reduced
+    // to the DAP2 simplicity of Byte.
+    if(type()!=dods_byte_c){
+        dest->set_type(dods_byte_c);
+    }
+    DBG (dest->get_attr_table().print(cerr););
+
+    DBG(cerr << __func__ << "() - END" << endl;);
+    return vec;
+}
+
+/** @brief dumps information about this object
+ *
+ * Displays the pointer value of this instance and information about this
+ * instance.
+ *
+ * @param strm C++ i/o stream to dump the information to
+ * @return void
+ */
+void Byte::dump(ostream & strm) const
+{
+    strm << DapIndent::LMarg << "Byte::dump - ("
+    << (void *) this << ")" << endl;
+    DapIndent::Indent();
+    BaseType::dump(strm);
+    strm << DapIndent::LMarg << "value: " << d_buf << endl;
+    DapIndent::UnIndent();
+}
+
+} // namespace libdap
diff --git a/Byte.h b/Byte.h
new file mode 100644
index 0000000..a2ef04d
--- /dev/null
+++ b/Byte.h
@@ -0,0 +1,108 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1994-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// Interface for Byte type.
+//
+// jhrg 9/7/94
+
+#ifndef _byte_h
+#define _byte_h 1
+
+#ifndef _dods_datatypes_h
+#include "dods-datatypes.h"
+#endif
+
+#ifndef _basetype_h
+#include "BaseType.h"
+#endif
+
+#ifndef constraint_evaluator_h
+#include "ConstraintEvaluator.h"
+#endif
+
+namespace libdap
+{
+
+/** This class is used to hold eight bits of information.  No sign
+    information is implied in its value.
+
+    @brief Holds a single byte.
+    @see BaseType
+    */
+class Byte: public BaseType
+{
+protected:
+    dods_byte d_buf;
+
+public:
+    Byte(const string &n);
+    Byte(const string &n, const string &d);
+
+    virtual ~Byte()
+    {}
+
+    Byte(const Byte &copy_from);
+
+    Byte &operator=(const Byte &rhs);
+
+    virtual unsigned int width(bool constrained = false) const;
+
+    virtual BaseType *ptr_duplicate();
+
+    // DAP2
+    virtual bool serialize(ConstraintEvaluator &eval, DDS &dds, Marshaller &m, bool ce_eval);
+    virtual bool deserialize(UnMarshaller &um, DDS *, bool);
+
+    // DAP4
+    virtual void compute_checksum(Crc32 &checksum);
+    virtual void serialize(D4StreamMarshaller &m, DMR &dmr, bool filter = false);
+    virtual void deserialize(D4StreamUnMarshaller &um, DMR &dmr);
+
+    virtual unsigned int val2buf(void *val, bool reuse = false);
+    virtual unsigned int buf2val(void **val);
+
+    virtual bool set_value(const dods_byte value);
+    virtual dods_byte value() const;
+
+    virtual void print_val(FILE *out, string space = "", bool print_decl_p = true);
+    virtual void print_val(ostream &out, string space = "", bool print_decl_p = true);
+
+    virtual bool ops(BaseType *b, int op);
+    virtual bool d4_ops(BaseType *b, int op);
+    virtual std::vector<BaseType *> *transform_to_dap2(AttrTable *parent_attr_table);
+
+    virtual void dump(ostream &strm) const ;
+};
+
+} // namespace libdap
+
+#endif // _byte_h
+
diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..060b0e8
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,508 @@
+		  GNU LESSER GENERAL PUBLIC LICENSE
+		       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+     Free Software Foundation
+     51 Franklin Street, Suite 500
+     Boston, MA 02110-1335
+     USA
+     
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+		  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
+
+
diff --git a/COPYRIGHT_URI b/COPYRIGHT_URI
new file mode 100644
index 0000000..a368e51
--- /dev/null
+++ b/COPYRIGHT_URI
@@ -0,0 +1,32 @@
+
+  $Id$
+
+  (c) Copyright 1994-2000 by
+  The University of Rhode Island and The Massachusetts Institute of Technology
+
+  Portions of this software were developed by the Graduate School of
+  Oceanography (GSO) at the University of Rhode Island (URI) in collaboration
+  with The Massachusetts Institute of Technology (MIT).
+
+  Access and use of this software shall impose the following obligations and
+  understandings on the user. The user is granted the right, without any fee
+  or cost, to use, copy, modify, alter, enhance and distribute this software,
+  and any derivative works thereof, and its supporting documentation for any
+  purpose whatsoever, provided that this entire notice appears in all copies
+  of the software, derivative works and supporting documentation. The names
+  URI, MIT and/or GSO, may not be used in any advertising or publicity to
+  endorse or promote any products or commercial entity unless specific
+  written permission is obtained from URI/MIT. The user also understands that
+  URI/MIT is not obligated to provide the user with any support, consulting,
+  training or assistance of any kind with regard to the use, operation and
+  performance of this software nor to provide the user with any updates,
+  revisions, new versions or "bug fixes".
+
+  THIS SOFTWARE IS PROVIDED BY URI/MIT "AS IS" AND ANY EXPRESS OR IMPLIED
+  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+  EVENT SHALL URI/MIT BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+  DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+  PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTUOUS
+  ACTION, ARISING OUT OF OR IN CONNECTION WITH THE ACCESS, USE OR PERFORMANCE
+  OF THIS SOFTWARE.
diff --git a/COPYRIGHT_W3C b/COPYRIGHT_W3C
new file mode 100644
index 0000000..1975516
--- /dev/null
+++ b/COPYRIGHT_W3C
@@ -0,0 +1,50 @@
+
+                     W3C� SOFTWARE NOTICE AND LICENSE
+
+Copyright � 1994-2002 World Wide Web Consortium, (Massachusetts Institute of
+Technology, Institut National de Recherche en Informatique et en Automatique,
+Keio University). All Rights Reserved. http://www.w3.org/Consortium/Legal/
+
+This W3C work (including software, documents, or other related items) is
+being provided by the copyright holders under the following license. By
+obtaining, using and/or copying this work, you (the licensee) agree that you
+have read, understood, and will comply with the following terms and
+conditions:
+
+Permission to use, copy, modify, and distribute this software and its
+documentation, with or without modification, for any purpose and without fee
+or royalty is hereby granted, provided that you include the following on ALL
+copies of the software and documentation or portions thereof, including
+modifications, that you make:
+
+   1. The full text of this NOTICE in a location viewable to users of the
+      redistributed or derivative work.
+
+   2. Any pre-existing intellectual property disclaimers, notices, or terms
+      and conditions. If none exist, a short notice of the following form
+      (hypertext is preferred, text is permitted) should be used within the
+      body of any redistributed or derivative code: "Copyright �
+      [$date-of-software] World Wide Web Consortium, (Massachusetts Institute
+      of Technology, Institut National de Recherche en Informatique et en
+      Automatique, Keio University). All Rights Reserved.
+      http://www.w3.org/Consortium/Legal/"
+
+   3. Notice of any changes or modifications to the W3C files, including the
+      date changes were made. (We recommend you provide URIs to the location
+      from which the code is derived.)
+
+THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS
+MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
+LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR
+PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE
+ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR
+DOCUMENTATION.
+
+The name and trademarks of copyright holders may NOT be used in advertising
+or publicity pertaining to the software without specific, written prior
+permission. Title to copyright in this software and any associated
+documentation will at all times remain with copyright holders.
+
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..9260193
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,12005 @@
+2017-08-25  James Gallagher  <jgallagher@opendap.org>
+
+	Added a comment to my HTTPCacheTest change...
+	[skip ci]
+
+	Removed a test for block_size in HTTPCacheTest that failed on
+	Fedora ppc64le system with XFS system
+
+	Merge pull request #32 from OPENDAP/hyrax390
+	Hyrax390
+
+	Marked two of the Dmr Round Trip Tests as failing.
+	This matched the results of the master branch. Thus we can merge
+	the hyrax390 branch and move on to either fix those issues or
+	accept the behavior as 'good enough.'
+
+	Merge branch 'master' into hyrax390
+
+	Merge pull request #36 from OPENDAP/gnulib-update
+	Updated gnulib and added mkstemps() to avoid portability issues.
+
+	Added malloca.valgrind
+
+	Added more in gl
+
+	Added more ...
+
+	Added more still more
+
+	Added more files in gl
+
+	Added gl/gettimeofday.c
+
+	Added more gnulib m4 files
+
+2017-08-24  James Gallagher  <jgallagher@opendap.org>
+
+	Updated gnulib and added mkstemps() to avoid portability issues.
+
+	Added comments to DMR.h
+
+2017-07-18  James Gallagher  <jgallagher@opendap.org>
+
+	Fixed a warning in D4EnumTest and CppUnit usage in DmrRoundTripTest
+
+	Merge branch 'master' of https://github.com/opendap/libdap4.git
+
+	Added --disable-dependency-tracking to configure in travis.yml
+	Will it build faster? Also, fixed a comment in D4Maps.h
+
+2017-05-31  Slav Korolev  <slav.korolev@nasa.gov>
+
+	Ticket #390. Cleaned 4 files.
+
+	Ticket #390. Cleaned 4 files.
+
+2017-05-22  Nathan Potter  <ndp@opendap.org>
+
+	Merge pull request #29 from OPENDAP/hyrax390
+	Task #390. The CppUnit unit tests in libdap4 should all support runni…
+
+	Merge pull request #31 from OPENDAP/hyrax-400
+	Hyrax 400
+
+2017-05-19  James Gallagher  <jgallagher@opendap.org>
+
+	Fixed vec_resize() in Vector.
+	I was mixing cpacity() and resize() and that leads to some odd
+	behavior - I'm not sure I really understand it, but comments in
+	Vector::vec_resize() are a stab at an explanation. The bottom line
+	is that the fix is to use size() with resize() and not capacity().
+	I also modified TestArray so that its read() method allocates
+	enough space for a vector of Structures before it starts writing
+	to it, just to demonstrate good behavior.
+
+2017-05-19  Slav Korolev  <slav.korolev@nasa.gov>
+
+	#390. More changes
+
+2017-05-18  James Gallagher  <jgallagher@opendap.org>
+
+	Checkpoint
+
+	Checkpoint - run using valgrind on centos
+
+2017-05-18  Slav Korolev  <slav.korolev@nasa.gov>
+
+	Merge branch 'master' into hyrax390
+
+2017-05-17  James Gallagher  <jgallagher@opendap.org>
+
+	I edited the ByteTest.cc file so it compiles and works.
+
+2017-05-17  Nathan Potter  <ndp@opendap.org>
+
+	Merge pull request #30 from OPENDAP/attr_bug
+	Attr bug
+
+2017-05-17  ndp-opendap  <ndp@opendap.org>
+
+	Dropped references to missing files.
+
+2017-05-17  Slav Korolev  <slav.korolev@nasa.gov>
+
+	"Task #390."
+
+2017-05-16  ndp-opendap  <ndp@opendap.org>
+
+	instrumentaiton
+
+2017-05-12  ndp-opendap  <ndp@opendap.org>
+
+	Fixed possible null pointer deref
+
+	Dropped unused file
+
+2017-05-11  Nathan Potter  <ndp@opendap.org>
+
+	Merge pull request #26 from OPENDAP/dmr2dds
+	Dmr2dds
+
+2017-05-11  ndp-opendap  <ndp@opendap.org>
+
+	Changed return value of transform_to_dap4() to void.
+
+2017-05-10  Nathan Potter  <ndp@opendap.org>
+
+	Merge branch 'master' into dmr2dds
+
+2017-05-09  ndp-opendap  <ndp@opendap.org>
+
+	Fixed bad implmentations of transform_to_dap4 in Test classes. Instrumenttion
+
+	Fixed bad implmentations of transform_to_dap4 in Test classes. Instrumenttion
+
+2017-05-08  ndp-opendap  <ndp@opendap.org>
+
+	Reworked transform_to_dap4() implmentation so that they all (in
+	libdap4) return NULL and populate the container passed in. Next
+	will be to change the return from BAseType* to void
+
+	Reworked transform_to_dap4() implmentation so that they all (in
+	libdap4) return NULL and populate the container passed in. Next
+	will be to change the return from BAseType* to void
+
+	First pass at fixing the duplicate variables bug in
+	DMR::build_using_dds() and Grid::transform_to_dap4()
+
+2017-05-06  ndp-opendap  <ndp@opendap.org>
+
+	Patched DMR tests to use the new CppUnit test pattern.
+
+2017-05-05  ndp-opendap  <ndp@opendap.org>
+
+	Repairing baselines
+
+	Fixed Grid::transform_to_dap4() so maps have correct names (FQN names)
+
+	Fixed Grid::transform_to_dap4() so maps have correct names (FQN names)
+
+	Fixed namespace issue in tests that prevented individual tests
+	from being run byt command line parameters.
+
+2017-05-04  ndp-opendap  <ndp@opendap.org>
+
+	Alternate Array assignment in Grid::transform_to_dap4()
+
+	sync
+
+	Stuff
+
+2017-05-04  James Gallagher  <jgallagher@opendap.org>
+
+	Merge pull request #27 from OPENDAP/new_docs_target
+	New docs target
+
+2017-05-04  ndp-opendap  <ndp@opendap.org>
+
+	A stab at correcting the FQN issue described in Hyrax-389
+
+2017-05-04  James Gallagher  <jgallagher@opendap.org>
+
+	Removed unused tests.
+	Grid::transform_to_dap4() had used dynamic_cast<>() but now uses
+	static_cast<>(), so it no longer needs to test for null returns from
+	the cast operator.
+
+2017-05-04  ndp-opendap  <ndp@opendap.org>
+
+	Supressing warnings
+
+	Merge branch 'master' into dmr2dds
+
+2017-05-04  James Gallagher  <jgallagher@opendap.org>
+
+	Merge pull request #28 from OPENDAP/dmr_parser_fix
+	Fixed fixed length line limit in the DMR Sax parser
+
+2017-05-04  ndp-opendap  <ndp@opendap.org>
+
+	Added some DAP4 related TODO items.
+
+	Added some DAP4 related TODO items.
+
+	Merge branch 'master' into dmr2dds
+
+	unwinding small change
+
+2017-05-03  James Gallagher  <jgallagher@opendap.org>
+
+	Changed class field names so they start with 'd_'
+	modified:   D4ParserSax2.cc
+	modified:   D4ParserSax2.h
+
+	Fixed fixed length line limit in the DMR Sax parser
+	modified:   D4ParserSax2.cc
+
+2017-05-03  ndp-opendap  <ndp@opendap.org>
+
+	Updated .gitignore for new test executables
+
+	Adding two more working DMR to Grid tests. Failing test still fails.
+
+	Checking in new dmr2Grid test which fails because the supplied DMR
+	fails to parse, despite the fact that it was generated by Hyrax
+	1.13.3
+
+	Added new dmr2dds with Grid test.
+
+	Added new dmr2dds with Grid test.
+
+	Updating comments etc.
+
+	Updating comments etc.
+
+2017-05-02  ndp-opendap  <ndp@opendap.org>
+
+	Ooops. Forgot test baseline
+
+	Silencing more debug chatter.
+
+	Silencing more debug chatter.
+
+	First cut at extracting dap2 Grid objects from dap4 Arrays with maps.
+
+	First cut at extracting dap2 Grid objects from dap4 Arrays with maps.
+
+	Turned off compiled in debug.
+
+	Refactored the transform_to_dap2() aip. woot.
+
+2017-05-02  James Gallagher  <jgallagher@opendap.org>
+
+	Modified Makefile.am to use the new build-gh-docs.sh script.
+	This seems to work, although I think it might be fragile.
+
+	A better way to build the docs and push them to gh-pages new file:   build-gh-docs.sh
+
+	Working on using a script instead of makefile targets modified:   Makefile.am
+
+	modified:   .gitignore
+
+	Fixed spaces/tabs in Makefile.am
+
+	deleted:    doxy_private.conf
+
+	Modified doxy.conf.in so it writes output to 'html'
+	It used to write output to docs/html.
+
+	I added the new docs targets to the Makefile.am
+	These will build and commit/push doxygen docs to github.io via gh-pages.
+	The gh-pages branch has to be made first and should be empty.
+
+2017-04-28  ndp-opendap  <ndp@opendap.org>
+
+	Weekend update baby... More tests working. Need to sort out Groups next.
+
+	Refactored DMR test suite, add round-trip and dmr_to_dap2 test suites.
+
+2017-04-26  James Gallagher  <jgallagher@opendap.org>
+
+	Added -g3 to the coverage flags
+
+	Removed generated docs
+
+	Deploy to GitHub Pages
+
+2017-04-26  ndp-opendap  <ndp@opendap.org>
+
+	Still dorting tests
+
+2017-04-25  ndp-opendap  <ndp@opendap.org>
+
+	Merged master to dmr2dds branch
+
+	Structures now transfer attributes correctly
+
+	Space indented BAseType (why was it not before?)
+
+	Structures now transfer attributes correctly
+
+2017-04-24  ndp-opendap  <ndp@opendap.org>
+
+	Structures now transfer attributes correctly
+
+	Structures now transfer attributes correctly
+
+	sync
+
+	Provisional patch to DMR.print_das()
+
+2017-04-23  ndp-opendap  <ndp@opendap.org>
+
+	Provisional patch to DMR.print_das()
+
+2017-04-21  ndp-opendap  <ndp@opendap.org>
+
+	Created DMR specific testsuite. Migrated exisiting DMR tests from dds-testsuite.
+
+	TEst draft (broken)
+
+2017-04-20  ndp-opendap  <ndp@opendap.org>
+
+	sync
+
+2017-04-18  James Gallagher  <jgallagher@opendap.org>
+
+	Added comments to Connect and mime_util regarding tainted data
+
+	Fixed minor issue in D4ParserSax2.
+	The namespace prefix could be null and was passed directly to
+	std::string's ctor
+
+	Fixed for potential issue in D4ConstraintEvaluator.
+	The pointer 'dim' could be dereferenced when it was null.
+
+2017-02-17  James Gallagher  <jgallagher@opendap.org>
+
+	Travis should work now...
+	We need a better way to test changes to this process
+
+2017-02-16  James Gallagher  <jgallagher@opendap.org>
+
+	Removed codecov.io from the build.
+	Debug on CentOS and stop hacking at Travis...
+
+	Added libgcov a an attempt to fix the travis build.
+
+	Turn on coverage in travis.yml
+
+	more travis hacks
+
+	travis hacks for code cov io
+
+	more travis hacks
+
+	another tack for travis and codecov...
+
+	tedious... (still travis debugging)
+
+	travis test...
+
+	travis.yml fix for codecov.io
+
+	Mods for codecov.io (https://codecov.io/gh/OPENDAP/libdap4)
+
+	Added code coverage to travis.yml
+
+	Merge branch 'master' of http://github.com/opendap/libdap4
+
+	Added code coverage script (get_code_cov.sh)
+
+2017-02-08  James Gallagher  <jgallagher@opendap.org>
+
+	Hacked up gitignore for various build stuff [ci skip]
+
+2017-01-06  James Gallagher  <jgallagher@opendap.org>
+
+	Version 3.18.3
+
+	Modified etags for the files at the new test.o.o site.
+2016-12-08  James Gallagher  <jgallagher@opendap.org>
+
+	Merge pull request #25 from OPENDAP/chunked_istream_bug
+	Fixed a memory issue in chunked_istream.h
+
+	Fixed a memory issue in chunked_istream.h (new[] mis-matched with delete)
+
+2016-11-18  James Gallagher  <jgallagher@opendap.org>
+
+	Merge pull request #24 from OPENDAP/dmr++
+	Dmr++
+
+	Merge pull request #23 from OPENDAP/D4Group_ptr_duplicate_fix
+	Fix fir D4Group::ptr_duplicate(). It was not returning BaseType*
+
+2016-11-17  James Gallagher  <jgallagher@opendap.org>
+
+	Fix fir D4Group::ptr_duplicate(). It was not returning BaseType*
+	Instead, it returned D4Group. There may have been a good reason,
+	But I think consistency is better. ...maybe
+
+2016-11-16  ndp-opendap  <ndp@opendap.org>
+
+	DMR parser will now ignore and XML not in the DAP4 namespace. woot.
+
+2016-11-15  ndp-opendap  <ndp@opendap.org>
+
+	XML namespace thing sorted. DMR parser will now ignore all
+	elements that are not in DAP4 namespace. woot.
+
+	Still working the namespace thing
+
+2016-11-15  James Gallagher  <jgallagher@opendap.org>
+
+	Merge branch 'master' of https://github.com/opendap/libdap4.git
+
+2016-11-15  ndp-opendap  <ndp@opendap.org>
+
+	Trying to get name space centralization class working. ugh. Static methods
+
+2016-11-15  James Gallagher  <jgallagher@opendap.org>
+
+	Added comment for dmr_start_element()
+
+2016-11-04  James Gallagher  <jgallagher@opendap.org>
+
+	Corrected the file: URL in HTTPConnectTest - I think ...
+
+	Merge branch 'master' of http://github.com/opendap/libdap4
+
+	Another try at fixing the travis build
+
+	Trial fix of test_config.h error on Travis.
+
+	Stopped running the tests using multiple jobs on Travis.
+	This might have been the cause of failures there.
+
+2016-11-03  James Gallagher  <jgallagher@opendap.org>
+
+	Merge branch 'master' of http://github.com/opendap/libdap4
+
+2016-11-02  James Gallagher  <jgallagher@opendap.org>
+
+	Updated the library version info for version 3.18.2
+
+	Version 3.18.2
+
+2016-11-01  James Gallagher  <jgallagher@opendap.org>
+
+	Formatting Grid.cc
+
+2016-10-20  James Gallagher  <jgallagher@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@opendap.org>
+
+	Corrected a comment in Vector.h
+
+2016-08-30  James Gallagher  <jgallagher@opendap.org>
+
+	Merge pull request #22 from sharkcz/getopt
+	type fix for getopt
+
+2016-08-30  Dan Horák  <dan@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@opendap.org>
+
+	Merge pull request #21 from sharkcz/dmr-bigendian-2
+	add missing big endian baselines
+
+2016-08-26  Dan Horák  <dan@danny.cz>
+
+	add missing big endian baselines
+
+2016-08-22  James Gallagher  <jgallagher@opendap.org>
+
+	Added main_page.doxygen to gitignore
+
+2016-07-14  James Gallagher  <jgallagher@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@opendap.org>
+
+	Fixed a compiler warning when USE_POSIX_THREADS is not def'd in XDRStreamMarshaller
+
+2016-06-08  James Gallagher  <jgallagher@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@opendap.org>
+
+	Version 3.18.0
+2016-05-25  James Gallagher  <jgallagher@opendap.org>
+
+	Fixed ugly DBG2() macro calls
+
+2016-05-18  James Gallagher  <jgallagher@opendap.org>
+
+	Merge remote-tracking branch 'origin/Hyrax-98'
+	Conflicts:
+		D4Connect.cc
+		d4_ce/D4ConstraintEvaluator.cc
+		d4_ce/d4_ce_parser.yy
+
+2016-05-17  James Gallagher  <jgallagher@opendap.org>
+
+	Merge pull request #19 from OPENDAP/response_cache
+	Response cache
+
+2016-05-16  James Gallagher  <jgallagher@opendap.org>
+
+	Added recursive Sequence::reset_row_number() and comments
+
+2016-05-15  James Gallagher  <jgallagher@opendap.org>
+
+	Minor edits after testing specializing read_row() for the ResponseCache
+	See bes/dap CachedSequence and CacheTypeFactory for more info.
+
+2016-05-13  James Gallagher  <jgallagher@opendap.org>
+
+	Checkpoint - Nathan's hack for Sequence plus debugging
+
+	Added comments for the hacked set_send_p() and set_read_p() methods
+
+2016-05-12  James Gallagher  <jgallagher@opendap.org>
+
+	Added a (potential) fix for Vector::set_send_p()
+
+	Hacks for the bes branch 'response_cache'
+
+2016-05-10  James Gallagher  <jgallagher@opendap.org>
+
+	Changes for Coverity
+	[ci skip]
+
+	Comments
+
+2016-05-09  James Gallagher  <jgallagher@opendap.org>
+
+	Coverity edits - both minor
+	[ci skip]
+
+	Removed extraneous include
+
+2016-05-06  James Gallagher  <jgallagher@opendap.org>
+
+	Added parser-util.cc back in after deleting it by mistake.
+
+2016-05-05  James Gallagher  <jgallagher@opendap.org>
+
+	Minor patches for issues found by Coverity Changes to be
+	committed: modified: Connect.cc deleted: parser-util.cc
+
+	Improved error checking for the DDX parser.
+	When text is feed into the parser and its not valid xml, the parser
+	was just ignoring that. No more...
+
+	Arrg. baselines were not in the last commit...
+
+	Moved the newest tests' baselines to the 'universal' directory
+	It's time to switch the new DMR tests to ones that don't have to
+	have a separate set of baselines for bin- and little-endian
+	machines. It takes too long to build up the big-endian test
+	baselines (get a b-e VM, etc.) and we have a good set of baselines
+	for each arch so if issues pop up on one or the otehr arch,
+	it should be easy to catch them.
+
+	Merge pull request #18 from OPENDAP/jg_filters
+	Jg filters
+
+	Merge branch 'master' into jg_filters
+	Conflicts: D4Sequence.h
+
+	Added 'universal' tests for DMRTest
+	The DMR includes a checksum when it's built from received data and
+	that checksum is a function of word order of the sender. This made
+	building baselines for the DMR tests a pain. We've built a number of
+	tests for both big- and little-endian machines - from now on new
+	tests should use 'universal' baselines (built by removing the checksum
+	using sed).
+
+2016-05-03  James Gallagher  <jgallagher@opendap.org>
+
+	Merge pull request #17 from OPENDAP/D4Sequence_value_ref
+	Added a new method to D4Sequence
+
+	Cosmetic editing
+
+	Optimized the read_sequence_values() code.
+	Child sequences do not have copies of the filter clauses. These are not
+	needed by them since they have already been filtered.
+
+	Added tests for complex CEs involving nested seqeunces
+
+	Inner sequence filter issue resolved
+	The code still needs tests and there is a potential optimization and
+	the syntax needs to be documented because the way fields in a
+	sequence can be referenced is less general than other places in the CE.
+
+	Fixed the issue with child sequences in DAP4
+
+2016-05-02  James Gallagher  <jgallagher@opendap.org>
+
+	Partial fix for Hyrax-182
+	https://opendap.atlassian.net/browse/HYRAX-182
+
+2016-04-29  James Gallagher  <jgallagher@opendap.org>
+
+	More test baselines
+
+	Scanner fix
+
+	Fixed the numeric constant error with the filter code
+	Numeric constants were showing up as the value '1.' The checking_*()
+	functions were the culprit. In the process I added missing methods in
+	the FilterClause code and debugging in a number of places.
+
+	Added tests for the new filter code. Not all of the tests pass...
+	There is some work to be done with parsing the != and ~= operators
+	and also mixing int and float arguments. There may be issues with
+	filed references as well, but we'll have to check the spec for that.
+
+2016-04-25  James Gallagher  <jgallagher@opendap.org>
+
+	Fixed the issue with <constant> <op> <var> not working.
+
+2016-04-24  James Gallagher  <jgallagher@opendap.org>
+
+	Fixed three operand filter clauses in the CE evaluator, but...
+	they still don't work correctly. There seems to be a problem with the
+	parsing of constants.
+
+	Removed debugging statements; Using the 'ND' operator is an error.
+
+	The parser now builds filter clauses and binds them to a D4Sequence.
+	Some by-hand tests show not everything works, but mostly it's a problem
+	with relops and String variables or constants.
+
+2016-04-23  James Gallagher  <jgallagher@opendap.org>
+
+	Parser tweaks - relops now are returned as strings
+
+	Fixed a problem with the TestByte, ..., classes when used for 'series values'
+	Some of the classes had the odd behavior that the series of values
+	was per-process and not per object instance. So, TestStr's value
+	would not repeat until a new process was started, it instead kept
+	increasing "... 1", "... 2", etc., across different instances of
+	the class. Fixing this made it easy to fix the TestD4Sequence code.
+
+2016-04-22  James Gallagher  <jgallagher@opendap.org>
+
+	Added tests for D4Sequences, including filter clause evaluation
+
+	Added D4SequenceTest
+
+	D4Sequence now supports evaluating a FilterClauseList.
+	Added tests too. I have only tested D4Sequence::intern_data(),
+	not serialize().
+
+	D4FilterClauseList now used by D4Sequence::serialize()
+
+	Eh, I rewrote the relops operator code.
+	It now uses the same approach that I used for DAP2 - a method
+	for each type (Byte, ...).
+
+	Added D4FilterClauseTest
+
+2016-04-21  James Gallagher  <jgallagher@opendap.org>
+
+	Fixed a bug in the was D4Function was used
+	In the ServerFunctionList and d4_function_parser.yy, I should
+	have been using a poiter to D4Function and not the object itself.
+	Now the DMRTests for functions pass
+
+	Hacks to the D4FilterClause code
+	This also includes fixes to D4RValue and tests for the filter clause
+	code. Two minor changes to the parsers.
+
+2016-04-20  James Gallagher  <jgallagher@opendap.org>
+
+	Merge branch 'master' into jg_filters
+
+	Added a new method to D4Sequence
+	D4SeqValues &D4Sequence::value_ref(): Returns a reference to the
+	internal data held by a D4Sequence instance.
+
+2016-04-20  Nathan Potter  <ndp@opendap.org>
+
+	Updated doxygen version number
+
+	Merge branch 'master' of https://github.com/opendap/libdap4
+
+	Added debugging statements to various Sequence items.
+
+2016-04-18  James Gallagher  <jgallagher@opendap.org>
+
+	Merge branch 'master' of https://github.com/opendap/libdap4
+
+	Version 3.17.3
+
+	Version 3.17.2; Fixed a soname error
+	Adding a const constructor seems to have *removed* the old constructor
+	as far as some code is concerned (it's still there, but with a
+	different mangled name).
+2016-04-15  James Gallagher  <jgallagher@opendap.org>
+
+	Merge pull request #15 from sharkcz/cppunit
+	fallback to pkg-config if cppunit-config is not available
+
+	Fixed an error in the script related to Coverity support
+	The env var COVERITY_SCAN_BRANCH should have been quoted.
+
+	Merge pull request #13 from sharkcz/dmr-bigendian
+	add missing big endian baselines
+
+2016-04-15  Dan Horák  <dan@danny.cz>
+
+	fallback to pkg-config if cppunit-config is not available
+	Recent version of cppunit packages do not distribute the cppunit-config script
+	and expect the usage of pkgconfig file.
+
+2016-04-14  Dan Horák  <dan@danny.cz>
+
+	remove the condition because we added the missing baselines
+
+	add big endian baseline files for new tests
+
+2016-04-08  James Gallagher  <jgallagher@opendap.org>
+
+	Added comments to D4 parser code.
+
+2016-04-06  James Gallagher  <jgallagher@opendap.org>
+
+	Added dump() methods for D4Attribute and D4Attributes.
+	
+2016-04-01  James Gallagher  <jgallagher@opendap.org>
+
+	Added #include <string> to D4RValue.h to fix an issue over in the BES
+
+2016-03-22  James Gallagher  <jgallagher@opendap.org>
+
+	Merge pull request #11 from OPENDAP/d4-threads
+	D4StreamMarshaller now uses the double buffering code for transmission
+
+2016-03-18  James Gallagher  <jgallagher@opendap.org>
+
+	Added #include <cstring> for linux
+
+	D4StreamMarshaller now uses the double buffering code for
+	transmission of vector and opaque data.
+
+	Merge branch 'master' of https://github.com/opendap/libdap4
+
+	Possible fix for the memory issue in Hyrax-152.
+	Push this to github and test on linux.
+
+2016-03-01  Nathan Potter  <ndp@opendap.org>
+
+	Updated getdap4 usage statement to better reflect the new behavior of the application.
+
+2016-02-29  Nathan Potter  <ndp@opendap.org>
+
+	Fixed BES-102 in which getdap4 was bumbling the DAP4 CE.
+
+2016-02-26  Nathan Potter  <ndp@opendap.org>
+
+	Merge branch 'master' of https://github.com/opendap/libdap4
+
+	Removed timing code fro MarshllerThread using our friend #if 0
+
+2016-02-24  James Gallagher  <jgallagher@opendap.org>
+
+	Merge pull request #9 from sharkcz/endian
+	fix big endian detection
+
+2016-02-22  James Gallagher  <jgallagher@opendap.org>
+
+	Edit Int8::print_val() so that Int8 values always print as numbers.
+
+2016-02-20  Dan Horák  <dan@danny.cz>
+
+	fix big endian detection
+	Currently there is a endian detection during configure, but the code relies
+	on non-portable __BIG_ENDIAN__ define. The default actions in AC_C_BIGENDIAN
+	break setting the correct value for WORD_BIGENDIAN.
+	See also https://bugzilla.redhat.com/show_bug.cgi?id=962091#c48
+
+2016-02-18  James Gallagher  <jgallagher@opendap.org>
+
+	Added long-needed const constructor and operator=()
+	This was done to support some experiments with memory caching,
+	but it's a long-overdue fix in general.
+
+	Zero-length array support: Vector::serialize() traps calls when length() == 0
+	This is part of a series of changes to support netCDF files
+	that use zero-length arrays as arbitrary attribute containers.
+
+	Removed old code that was commented out.
+
+	Replaced fgets() > 0 with fgets() != 0 in the parser's main loop
+	A suggestions from David Binderman.
+
+2016-02-12  James Gallagher  <jgallagher@opendap.org>
+
+	Patch for gcc 6 from Orion Poplawski
+
+2016-02-02  James Gallagher  <jgallagher@opendap.org>
+
+	Merge pull request #8 from OPENDAP/BES-97
+	Bes 97
+
+2016-01-29  James Gallagher  <jgallagher@opendap.org>
+
+	Modified Vector::val2buf() in support of zero-length arrays
+	val2buf() was throwing an InternalErr when called with a null data
+	pointer. I modified it so that if the pointer is null and the length()
+	of the vector/array is zero, it returns zero. The exception is still
+	thrown if the pointer is null and the length() is not zero.
+
+	Removed #define DODS_DEBUG
+
+	Tests for empty DAP2 Structures
+
+	Tests for empty structures added.
+
+2016-01-28  James Gallagher  <jgallagher@opendap.org>
+
+	Zero-length arrays now work with libdap, with caveats
+	I have implemented and tested zero-length arrays of the
+	cardinal types for DAP2 and 4. There's more to be done and
+	no testing outside of libdap has been done.
+
+	Added documentation comments in crc.h
+
+	Spelling fixes in the ChangeLog, ...
+
+2016-01-26  James Gallagher  <jgallagher@opendap.org>
+
+	ChangeLog, et al., updated Version 3.17.0
+	
+2016-01-20  James Gallagher  <jgallagher@opendap.org>
+
+	Removed #if 0 in the D4Function/ConstraintEvaluator::error() methods
+
+2016-01-19  James Gallagher  <jgallagher@opendap.org>
+
+	Found one more place in the DAP4 CE and Function parser where
+	errors did not result in an exception.
+
+2016-01-13  James Gallagher  <jgallagher@opendap.org>
+
+	Merge pull request #6 from OPENDAP/BES-87
+	BES 87
+
+2016-01-12  James Gallagher  <jgallagher@opendap.org>
+
+	Added comments re how the Error object codes map to HTTP codes
+
+	Added mapping between libdap and HTTP codes (suggestions)
+
+	Added a code to Error; made sure Error was used consistently
+	Changes to mesh with those in the OLFS. Error(unknown_error, ...)
+	maps to an HTTP 400, internal_error --> 500, not_implemented -->501,
+	etc.
+
+	DAP2 and 4 scanners now throw Error(malformed_expr, <msg>)
+	They were writing to stderr...
+
+	DAP2 CE parser uses no_such_identifier where apropos
+
+2016-01-11  James Gallagher  <jgallagher@opendap.org>
+
+	Added codes Error response in the DAP2 parser
+
+	There were only a handful since most of the Error throws were well
+	behaved.
+
+	Modified the DAP4 ce and function parsers to include code w/Errors
+	See https://opendap.atlassian.net/browse/BES-87.
+
+2016-01-05  James Gallagher  <jgallagher@opendap.org>
+
+	Merge branch 'master' into bes-40
+
+2016-01-04  James Gallagher  <jgallagher@opendap.org>
+
+	Modified the CRC32 byte-order change so that it's not included by default
+
+	Popped old changes for Connect; fix for Makefile.am; etc.
+
+2015-12-31  James Gallagher  <jgallagher@opendap.org>
+
+	Hacks for doxygen.
+	The Makefile works now (rebuilds doxy.conf when needed) and the docs
+	are better. I stopped including docs for methods w/o doc comments
+	and those are now listed in the doxygen_warnings.txt file.
+	[ci skip]
+
+2015-12-30  James Gallagher  <jgallagher@opendap.org>
+
+	Tried CLion; added CMakeLists.txt to gitignore
+
+	Removed the calls to DDS:timeout_{on,off}
+	This code is no longer used. The timeout feature of the BES is far
+	better.
+
+2015-12-08  James Gallagher  <jgallagher@opendap.org>
+
+	Removed commented-out code
+
+	Merge branch 'master' of https://github.com/opendap/libdap4
+
+	Float32 attributes mis-coded as Byte in the DMR
+
+2015-12-03  Nathan Potter  <ndp@opendap.org>
+
+	Travis install check
+
+	Travis install check
+
+2015-11-30  Patrick West  <pwest@vsto.tw.rpi.edu>
+
+	Missing xml2 libraries in unit-tests build
+	Added $(XML2_LIBS) to the Makefile.am in unit-tests so that tests would
+	build. On Ubuntu 14.04.
+
+2015-11-12  James Gallagher  <jgallagher@opendap.org>
+
+	I removed the deploy lines from the travis.yml file
+	These seem broken - I have to investigate how to handle
+	deployment of RPMs out of travis
+
+2015-10-22  James Gallagher  <jgallagher@opendap.org>
+
+	Fixed error in printing of child groups.
+	The child group values were printed twice.
+
+2015-10-21  James Gallagher  <jgallagher@opendap.org>
+
+	Source release version, ChangeLog, News, ... for 3.16.0
+
+2015-10-19  James Gallagher  <jgallagher@opendap.org>
+
+	Fixes #1
+
+	Added changes to exit when 'report_errors' (-r) is true
+
+	Fix for the missing 'child groups' in getdap4's output
+	And some minor mods to XMLWriter - clean up the includes a bit.
+
+2015-10-15  James Gallagher  <jgallagher@opendap.org>
+
+	Merge pull request #5 from OPENDAP/intern_no_crc32
+	Intern no crc32
+
+	Merge pull request #4 from OPENDAP/endian_fixes
+	Endian fixes
+
+2015-10-14  James Gallagher  <jgallagher@opendap.org>
+
+	Some of the DAP4-only types were not setting is_dap4
+	This caused the DMR output code to throw an error (Unknown Type) in
+	cases where those types were used.
+	See https://opendap.atlassian.net/browse/HR-63
+
+2015-10-13  James Gallagher  <jgallagher@opendap.org>
+
+	fixed a warning in dmr-test - /* in a comment
+
+2015-10-13  jgallagher59701  <jgallagher@opendap.org>
+
+	Added test baselines for intern_data with no checksum
+	I dropped computing the checksum in the intern_data() method,
+	so the baselines for the tests had to be updated.
+
+2015-10-13  James Gallagher  <jgallagher@opendap.org>
+
+	Now the intern_data() method used with DAP4 does not compute the
+	checksum It is only computed by the code that serializes the
+	response - sends it to a remote client. I added baselines
+	specifically for the intern tests on little endian machines. Will
+	add ones for big endian next...
+
+	Merge branch 'intern_no_crc32' of
+	https://github.com/opendap/libdap4.git into intern_no_crc32
+
+2015-10-12  James Gallagher  <jgallagher@opendap.org>
+
+	Removed crc32 generation from intern_data()
+	This seems better - I think computing the CRC code
+	when interning values is not necessary. Those should
+	only be computed when the server is going to send values.
+
+	Completed changes to D4UnMarshallerTest.cc
+	This copy of the tests should work on both little- and big-endian
+	hosts.
+
+	More changes to D4UnMarshallerTest.cc
+
+2015-10-12  jgallagher59701  <jgallagher@opendap.org>
+
+	Partial fix for D4UnMarshallerTest.cc
+
+2015-10-12  James Gallagher  <jgallagher@opendap.org>
+
+	Changed WORDS_BIGENDIAN to __BIG_ENDIAN__
+
+2015-10-07  jgallagher59701  <jgallagher@opendap.org>
+
+	One step closer to the tests working on big endian machines
+	D4MarshallerTest now works
+
+	Update to D4Marshaller/UnMarshaller tests - added baselines for
+	big-endian ...There's still an issue, however.
+
+2015-10-07  James Gallagher  <jgallagher@opendap.org>
+
+	D4UnMarshallerTest also needs two sets of baselines. Added
+	little-endian ones.
+
+	D4MarshallerTest need two sets of baselines...
+	One for big- and one for litte-endian machines. I made the little
+	endian set.
+
+2015-10-07  jgallagher59701  <jgallagher@opendap.org>
+
+	Changed to D4EnumTest to support changes for big-endian machines.
+
+2015-10-07  James Gallagher  <jgallagher@opendap.org>
+
+	The change to D4Enum::compute_checksum() was correct. This fixes
+	the last of the issues with Enum on big-endian machines. The
+	problems we caused by the assumption that 64-, 32-, 16- and 8-bit
+	integers would align on the LSB, which is the case for
+	little-endian machines (but not big...). In several places where
+	reinterpret_cast<>() was used I first assigned the Enum _value_ to
+	a temp variable of the correct size and then passed the address of
+	that to the checksum calculation function. High cost in one sense,
+	but really, scalar Enum variables will be rare and Arrays of Enums
+	are handled differently. I also have dropped the overly-complex
+	design that used a union. It eliminated some casts, but was based
+	on the erroneous assumption regarding alignment.
+
+	Test change in computing checksum for big-endian machines.
+
+	Debugging big-endian issues still..
+
+2015-10-07  James Gallagher  <jimg@idoru.local>
+
+	Merge branch 'endian_fixes' of https://github.com/opendap/libdap4
+	into endian_fixes
+
+	Cleanup of a version of this that should work on big and
+	little-endian machines.
+
+2015-10-06  jgallagher59701  <jgallagher@opendap.org>
+
+	Baselines for Enum tests on big endian machines
+	Now only the tests 54 and 55 fail on the big endian machines...
+
+2015-10-06  James Gallagher  <jimg@idoru.local>
+
+	Removed union in the D4Enum implementation
+	This is an attempt to fix the issues found on big endian machines.
+
+2015-10-01  James Gallagher  <jgallagher@opendap.org>
+
+	The DMR tests now work on little endian machines, mostly
+	There is an issue with D4Enum that causes some tests to fail.
+
+2015-10-01  jgallagher59701  <jgallagher@opendap.org>
+
+	Fixes for function/ce tests modified:   tests/DMRTest.at
+
+2015-09-30  jgallagher59701  <jgallagher@opendap.org>
+
+	Baselines for a big endian machine.
+
+2015-09-30  James Gallagher  <jgallagher@opendap.org>
+
+	Fail: fixed a syntax error that got pushed.
+
+	Added capability to build baselines that's sane
+
+	Continue with fixes for data + ce tests
+
+	DMRTest is dependent on word order - this is a trial fix.
+
+2015-09-29  James Gallagher  <jgallagher@opendap.org>
+
+	Fixed an issue in HTTPCacheTest; version number bump.
+	In HTTPCacheTest, a quirk of RCReader meant that when the tests
+	were run as part of distcheck they would fail if the user has set
+	USE_CACHE to 1 in their ~/.dodsrc. Version numbers bumped to 3.15.1.
+
+2015-09-23  James Gallagher  <jgallagher@opendap.org>
+
+	Merge branch 'master' of https://github.com/opendap/libdap4
+
+	Fixed a syntax error in cgi_util.h
+	... and added commentary to MarshallerThread.cc
+
+2015-09-20  James Gallagher  <jgallagher@opendap.org>
+
+	Version 3.15.1
+
+2015-09-18  James Gallagher  <jgallagher@opendap.org>
+
+	Added empty Coverity model file
+
+	Fixed a bug in the DAP4 CE evaluator
+	The DAP4 CE evaluator was using just the stop index value
+	as the size of a dimension when testing if the stride value
+	was valid. When a dimension of length 1 (i.e., [0:0]) was
+	found, it's length was '0' and a stride of '1' was invalid.
+	I fixed this and the test now uses stop-start +1 for the
+	dimension length.
+
+2015-09-17  James Gallagher  <jgallagher@opendap.org>
+
+	HTTPCacheTable uses verbose errors
+	... instead of obscure error codes
+
+	Modified configure.ac to fail if uuid.h is not found.
+
+2015-09-16  James Gallagher  <jgallagher@opendap.org>
+
+	Added #error if uuid.h is not found modified:   DODSFilter.cc modified:   tests/ResponseBuilder.cc
+
+	Fixed a syntax error modified:   tests/ResponseBuilder.cc
+
+	An attempt to fix the uuid.h header issues.
+	I added a test to test for uuid.h in addition to uuid/uuid.h
+	in the hope that it'll find something and compile. I may have to
+	work on this a bit more since it's caused such a hassle on the
+	different build systems.
+
+2015-09-15  James Gallagher  <jgallagher@opendap.org>
+
+	Minor issue in D4EnumDefs.cc with range checking
+
+	Added #include <cerrno> where needed
+
+2015-09-14  James Gallagher  <jgallagher@opendap.org>
+
+	Minor fix for precision in Float64, other fixes.
+
+	CID 81430, CID 81412, CID 81409, CID 81405, CID 81402, CID 81401,
+	CID 81397, formatting, CID 81389, CID 81382, CID 81377, CID 81375,
+	CID 81373, CID 81370, CID 81363, CID 81362, CID 81361, CID 81360,
+	CID 81359
+
+015-09-10  James Gallagher  <jgallagher@opendap.org>
+
+	Updated files for the release of 3.15
+
+2015-09-09  James Gallagher  <jgallagher@opendap.org>
+
+	Merge branch 'master' into parallel_io
+
+	An error introduced in March has been fixed; Freeform tests now
+	pass. Commit 6b005387 introduced a change where set_read_p() no
+	longer tested the state of the is_synthesized property. Before, if
+	the property was set the method would not change the state of
+	is_read. The change made it so the is_read property was changed
+	regardless of the state of is_synthesized. This broke the
+	'projection functions' in the FreeForm handler. I have reverted to
+	the old libdap behavior, and the tests now pass.
+
+2015-09-04  James Gallagher  <jgallagher@opendap.org>
+
+	Removed the old serialize_no_release() method
+
+2015-09-02  James Gallagher  <jgallagher@opendap.org>
+
+	Now has a special class for RAII on the lock in the child thread.
+
+2015-08-31  James Gallagher  <jgallagher@opendap.org>
+
+	Cleaned out more dead code from Vector.cc
+
+2015-08-28  James Gallagher  <jgallagher@opendap.org>
+
+	Updated the version number to 3.15
+	This because of the parallel IO code and pipelining support.
+
+2015-08-28  James Gallagher  <jgallagher@opendap.org>
+
+	Removed old code from MarshallerThread refactor.
+
+	Moved the pthread code from XDRStreamMarshaller
+	It's now in MarshallerThread and used by XDRStreamMarshaller via the
+	'pointer to an implementation' pattern. This means that the pthread.h,
+	which configure looks for but may not find, is not included in XDR-
+	StreamMarshaller's header anymore.
+
+	I did not mention this in the git log, but I've removed the
+	serialize_no_release() method I added after refactoring the code
+	so that it wasn't needed (I moved the 'release' calls to the BES
+	dap module, so libdap's behavior is not changed).
+
+2015-08-27  James Gallagher  <jgallagher@opendap.org>
+
+	Added support for put_vector_part() to D4StreamMarshaller
+
+	Refactor: CLEAR_LOCAL_DATA and USE_POSIX_THREADS
+	We found that we could call clear_local_data() right after variables
+	were serialized and get a much flatter memory profile. However, putting
+	those calls in serialize() changed its behavior. I've moved them to
+	bes/dap/ResponseBuilder - but that is controllable using a compile-time
+	directive. Similarly, the compile-time switch USE_POSIX_THREADS
+	can be used to turn off that feature (#undef). See XDRStreamMarshaller.
+
+	Refactor: Parallel I/O methods
+	I refactored the three new parallel I/O methods back into the matching
+	put_vector() methods of the same/similar names. This cuts down on the
+	naming mess and means that other classes like XDFFileStream don't have
+	to include hacked methods that throw exceptions. This commit also
+	includes changes that wrap the clear_local_data() calls in #ifdef
+	CLEAR_LOCAL_DATA. Lastly, this refactor will also require a matching
+	edit to ncml_module.
+
+2015-08-24  James Gallagher  <jgallagher@opendap.org>
+
+	Patch/fix/hack for XDRStreamMarshaller
+	This class' header requires pthread.h but that makes for issues since
+	we cannot put an include of config.h in a .h file that is installed.
+	To get on with testing, I'm checking in this version that just includes
+	it; later on I may modify the class to encapsulate the pthreads stuff.
+
+	Fix for clear_local_data() race condition
+	Took advantage of the current XDRStreamMarshaller impl that copies
+	data before writing it out. This means our code can delete the original
+	data held by the object right after the thread used to send that data
+	has been called (actually, it could delete it _before_ starting the
+	thread, but doing so afterward keeps that feature out of the marshaller
+	class, which may come in handy later on...). Later on we may switch
+	to reference counted pointers and then this issue will go away.
+
+	Removed call to clear_local_data() in Vector::Serialize()
+	This was colliding with the call to clear_local_data() in the thread
+	when put_vector_thread() was called. This showed up as a 'sometimes'
+	failure of expr test #21. The bug happens only when serializing an
+	array of structure that contains arrays.
+
+2015-08-22  James Gallagher  <jgallagher@opendap.org>
+
+	Corrected a spelling mistake with 'serialize_no_release'
+
+	I've added synchronization code to the XDRStreamMarshaller dtor
+	This causes the XDRStreamMarshaller dtor to block on the d_out_mutex
+	until the child thread (possibly) writing to the output stream
+	completes.
+
+2015-08-21  James Gallagher  <jgallagher@opendap.org>
+
+	Added parallel_io to the set of branches Travis will build.
+
+	Now threads in XDRStreamMarshaller are created detached state
+
+	Added the new put_vector_thread methods to Marshaller
+	I made them have a default implementation so that child classes
+	won't break. I'm not sure if that's the best way to go...
+	Also dropped the new *_thread() methods into Vector::serialize(),
+	but they don't work so those are turned off by using #undef
+	USE_POSIX_THREADS
+
+	Parallel I/O for vector data maybe working
+	I have coded put_vector_thread() and put_vector_part_thread() and
+	they are passing unit tests.
+
+2015-08-18  James Gallagher  <jgallagher@opendap.org>
+
+	Removed some of the TODOs in libdap
+	[ci skip]
+
+2015-08-17  James Gallagher  <jgallagher@opendap.org>
+
+	Merge branch 'master' of https://github.com/opendap/libdap4
+
+	Modified Vector::get_buf() so it can be used in the ncml handler
+
+2015-08-17  Nathan Potter  <ndp@opendap.org>
+
+	Merged the new (template-less) version of Vector into master branch
+
+2015-08-17  James Gallagher  <jgallagher@opendap.org>
+
+	Completed DAP2 put_vector_part() and associated methods.
+
+2015-08-14  Nathan Potter  <ndp@opendap.org>
+
+	Typo
+
+2015-08-14  James Gallagher  <jgallagher@opendap.org>
+
+	Partial Vector/Array serialization partly working!
+	Must still implement the parts for Arrays of int16, ..., types;
+	only byte arrays work now.
+
+	Checkpoint: Adding methods to allow serialization of Vectors in parts.
+	Missing methods in D4StreamMarshaller, XDRFileMarsahller and parts of
+	methods in XDRStreamMarshaller.
+
+	Added three protected accessors to Vector
+	These provide access to the underlying data held in a Vector/Array
+	and are accessible to descendant classes only.
+
+2015-08-14  Nathan Potter  <ndp@opendap.org>
+
+	Replaced template methods in Vector.cc with more pedantic
+	implementations. Made the templed methods private and used them in
+	the implementations of the new pedantic methods.
+
+2015-08-10  James Gallagher  <jgallagher@opendap.org>
+
+	Bumped up the version number to 3.14.2
+
+	Bumped up the version (and SO numbers). This is 3.14.2
+
+	Merge branch 'serialize_n_release'
+
+	Added a serialize_no_release() method
+	This rounds out the serialize_n_release branch. The new behavior of
+	freeing the dynamic memory is very desirable, so it's the default,
+	but if some code wants to serialize, do something else and then delete
+	the storage, the new serialize_no_release provides that option. All
+	of our libdap and bes/module tests pass. This will be merged to the
+	master branch once the latter has been tagged.
+
+2015-08-07  James Gallagher  <jgallagher@opendap.org>
+
+	Fixed overwriting commit for Vector::serialize()
+	We decided to make the serialize and release code real, but in the
+	process that collided with changes to BaseType::name() (making it
+	a virtual method). One line was broken, but since it was the call to
+	clear_local_data() in Vector::serialize(), it was an important line!
+
+2015-08-06  James Gallagher  <jgallagher@opendap.org>
+
+	distcheck works locally
+
+	Fix for distcheck and getdapTest
+
+2015-08-05  James Gallagher  <jgallagher@opendap.org>
+
+	make check now supports parallel execution
+	Modified test/Makefile.am so that autotest parallel tests work. Run
+	make check with TESTSUITEFLAGS=-jN
+
+2015-08-05  Nathan Potter  <ndp@opendap.org>
+
+	pulled from github and merged conflicts
+
+	Refactored use of the name() method in BaseType so that it is now override-able
+
+2015-08-05  James Gallagher  <jgallagher@opendap.org>
+
+	Added BaseType::clear_local_data()
+	The clear_local_data() method is used to free just the parts of a
+	BaseType (child of, really) that hold large amounts of data. It applies
+	to only a handful of the variable types (Vector, Sequence, D4Opaque and
+	D4Sequence). It is used to free memory right after data values are
+	sent to the client using serialize(). This means that data are no longer
+	held by the variable objects once serialize() returns - at least for
+	Array, Sequence, ... Other types like Byte, Int16, ..., will retain
+	their values because those values are not held in dynamically allocated
+	storage.
+
+2015-08-04  James Gallagher  <jgallagher@opendap.org>
+
+	Hacked the marshT unit-test
+	I modified this so that it no longer relies on data being present after
+	serialize() has been called. It seems that none of the handlers use
+	this 'feature' and we can change the code so that memory is freed right
+	after the bits are sent fir each variable. This means that only one
+	variate's data are in memory at any given time.
+
+2015-08-03  Nathan Potter  <ndp@opendap.org>
+
+	Checking in change to _always_ release array memory after serialization. This causes the Marshaller test for Structure to seg fault.
+
+2015-07-14  James Gallagher  <jgallagher@opendap.org>
+
+	Removed the bison version print out
+	...I think this is working fine now
+	[ci skip]
+
+2015-07-13  James Gallagher  <jgallagher@opendap.org>
+
+	Added distcheck to travis
+
+	travis caching
+	Modified travis.yml and install_libdap4_source_deps.sh so that
+	the bison source build is cached.
+
+	Another fix: added '/bin' to $HOME/bison in $PATH
+
+	Removed odd ^S from install_libdap4_source_deps.sh
+
+	More travis hacks - added sudo: false back in; remove tabs
+
+2015-07-12  James Gallagher  <jgallagher@opendap.org>
+
+	travis: The build was not triggered with the last push...
+	... so try removing 'sudo: false'
+
+	Switched travis to use docker/containers
+
+2015-07-09  James Gallagher  <jgallagher@opendap.org>
+
+	Added .NOTPARALLEL: back to the C++ parser Makefile.am files
+	We need this because stack.hh, ..., are built in one shot by
+	bison.
+
+	Updated the library version
+
+	Grammar fixes - for flex and its C++ scanner code.
+	There is a conflict between the defined return type of
+	FlexLexer::LexerInput. Some versions of flex define that
+	method as returning an int and some a returning a size_t.
+	Including generated code using one will break when a build
+	machine uses the other. I used dist-hook to just 'rm' those
+	generated lex.*.cc files  from d4_ce and d4_function - the
+	other generated scanners are OK. This is really a work-around
+	since we should be able to include the generated scanners
+	and then drop the build requirement for both bison and flex.
+
+2015-07-07  James Gallagher  <jgallagher@opendap.org>
+
+	Added absolute-header-m4 and removed .gitignore
+	I think the .gitignore is from the gnulib source
+	and is fine for their git repo, but not for clients
+	of the library.
+
+	Changed the tag for non-master travis builds to _travis
+	... from -travis. Minor, but it bugged me.
+
+	Modified travis.yml so that branches ending in -travis will be built.
+
+	Updated gnulib code - this may affect the coverity results
+
+2015-07-02  James Gallagher  <jgallagher@opendap.org>
+
+	Coverity fix in dds.yy
+	Fixed a potential leak where storage allocated is overwritten.
+	An unlikely bug, but not a big deal to fix.
+
+	Issues found using coverity fixed
+
+2015-06-29  James Gallagher  <jgallagher@opendap.org>
+
+	Fixed cppunit package for travis.yml
+
+	Fixed a memory leak in dds.y
+
+2015-06-26  James Gallagher  <jgallagher@opendap.org>
+
+	Minor syntax error in TestArray; Travis now includes cppunit tests
+
+	Memory leak in TestArray.cc plugged
+
+	More changes WRT coverity and travis
+	...in the travis.yml. Removed the before_build_command
+	stuff from the coverity scan addon section since it seems
+	to be redundant.
+
+	Added coverity scan to travis CI
+
+2015-06-25  James Gallagher  <jgallagher@opendap.org>
+
+	Merge branch 'master' of https://github.com/opendap/libdap4.git
+
+	Issues found in D4ParserSax2, DAS and DDS using Coverity.
+
+2015-06-20  James Gallagher  <jgallagher@opendap.org>
+
+	Finally fixed...?
+	Using autoconf 2.69 make dist is building a tar-gz that includes the
+	BUILT_SOURCES, which would be great for builders without bison 3. I'm
+	not sure if that will work with autoconf 2.63.
+
+2015-06-19  James Gallagher  <jgallagher@opendap.org>
+
+	Move the D4 Function parser to its own directory.
+	This is an attempt to really fix the stack, position and location.hh
+	problem for once and for all. The Travis build is working, but maybe
+	we're just lucky because a build from the tar.gz made using make dist
+	was still failing.
+
+2015-06-18  James Gallagher  <jgallagher@opendap.org>
+
+	Merge branch 'master' of https://github.com/opendap/libdap4.git
+
+2015-06-18  Ubuntu  <ubuntu@ip-172-31-34-168.ec2.internal>
+
+	Modified build-deb-pkg.sh so that dap-config matches the installed
+	files.
+
+2015-06-18  James Gallagher  <jgallagher@opendap.org>
+
+	Merge branch 'master' of https://github.com/opendap/libdap4.git
+
+	Try using NOTPARALLEL with the libdap build - another travis hack.
+
+2015-06-18  Ubuntu  <ubuntu@ip-172-31-34-168.ec2.internal>
+
+	Modified DEBIAN/control to use libcurl4-openssl-dev as a dependency.
+	Not sure why this was not working before.
+	[ci skip]
+
+	Merge branch 'master' of https://github.com/opendap/libdap4
+
+	Added hackery script to DEBIAN directory.
+	This will help with my simple deb file used for the bes build.
+
+2015-06-18  James Gallagher  <jgallagher@opendap.org>
+
+	Modified Makefile.am and d4_ce/... so bison is called only once
+	This should stop the semi-random build fails for libdap4 on Travis
+	and for other people.
+
+2015-06-17  James Gallagher  <jgallagher@opendap.org>
+
+	Added .NOTPARALLEL to d4_ce/Makefile.am for the grammar files
+	I hope this fixes the odd issue with the generated grammar files
+	breaking hte build in a random fashion. The error may be do to parallel
+	builds running bison several times for each of the generated files, all
+	at the same time.
+
+	Cleaned up the d4_ce code
+	The Makefile.am had leftover parts from the attempt to make the build
+	work when bison 3 was not present. That may have been the cause of the
+	seemingly random build errors I see on Travis CI
+
+	Added dpkg -l to travis.yml
+	This is part of debugging the bes travis build - I cannot seem to sort
+	out the libcurl dependency since my Ubuntu AMI is a 14.x but the build
+	is using 12.x
+
+	travis bison hack...
+
+2015-06-17  Ubuntu  <ubuntu@ip-172-31-34-168.ec2.internal>
+
+	Merge branch 'master' of https://github.com/opendap/libdap4
+
+	Changed DEBIAN/control arch to amd64
+
+2015-06-17  James Gallagher  <jgallagher@opendap.org>
+
+	travis.yml edits
+	Now uses deploy section only for tagged pushes; removed unneeded
+	--force-yes with apt-get; and will build tags in addition to the
+	master branch.
+
+	Fixed build-deb-pkg.sh and added 'deploy' section to travis.
+	Not sure about the deploy bit...
+
+2015-06-16  James Gallagher  <jgallagher@opendap.org>
+
+	Use newly built bison 3
+	Added /usr/local/bin to PATH...
+
+	Build bison from source (circling back)
+	Travis-CI is currently using ubuntu 12 which using bison 2; Ubuntu 14
+	has bison 3 in its package system.
+
+	More tweaks to the simple deb package build
+	This is a deb package for use with travis-ci when we get a bes CI
+	build working
+
+	Added debian package build to travis.yml
+	...also tried using --force-yes to get bison to load with apt-get
+	[ci skip]
+
+2015-06-16  Ubuntu  <ubuntu@ip-172-31-34-168.ec2.internal>
+
+	Added the build-deb-pkg.sh script.
+
+	Added DEBIAN/control
+	Use this along with dpkg-deb --build libdap_<version> to make a
+	debian package.
+
+2015-06-16  James Gallagher  <jgallagher@opendap.org>
+
+	Another change to the travis.yml file
+	It now uses bison installed using apt-get
+
+2015-06-08  James Gallagher  <jgallagher@opendap.org>
+
+	travis-ci error fixed
+	I left --prefix=... on the configure of bison but $prefix's definition
+	was moved to a later step.
+
+	Reorganization of the travis.yml script.
+
+2015-06-07  James Gallagher  <jgallagher@opendap.org>
+
+	clang...
+
+	...another try at clang support
+
+	...another try at clang
+
+2015-06-06  James Gallagher  <jgallagher@opendap.org>
+
+	minor tweak to 'make install' with sudo -i
+
+	fix for clang
+
+	more travis ci changes - learning what this can do...
+
+	Added some package installs to travis ci
+
+	travis ci fix
+
+	travis ci: added install of libdap
+
+	travis ci change: install bison 3 using sudo
+
+2015-06-05  James Gallagher  <jgallagher@opendap.org>
+
+	Travis CI updates
+
+	Added an initial .travis.yml file
+
+2015-06-01  James Gallagher  <jgallagher@opendap.org>
+
+	Added DBG2N - no line number version of DBG2
+
+2015-05-24  James Gallagher  <jgallagher@opendap.org>
+
+	Fixed comment
+
+2015-05-14  James Gallagher  <jgallagher@opendap.org>
+
+	Added a new function to make a temp file using mkstemps()
+	This new function returns the temp file's name and a C++ fstream
+	object that is opened to the temp file. This change adds to the
+	libdap API.
+
+2015-05-12  James Gallagher  <jgallagher@opendap.org>
+
+	Fixed missing <string> include. Patch from O. Poplawski.
+
+	Fix getopt() use. Patch from O. Poplawski
+
+	Broke --enable-developer; now fixed.
+
+	Fixed issues in configure and Makefiles reported by O. Poplawski.
+	--enable-coverage and --enable-valgrind were broken.
+	Setting CXXFLAGS to nothing broke builds on fedroa 21
+
+	Added coverage file to gitignore
+
+2015-05-01  James Gallagher  <jgallagher@opendap.org>
+
+	Formatting, old code removeal, doxygen updates
+
+2015-04-05  James Gallagher  <jgallagher@opendap.org>
+
+	Bison 3 is required for the build.
+	This might change, but for the next release (April 2015) it is a
+	requirement for building the code. It will be possible to get the
+	devel rpm and, however, and develop code that uses libdap w/o
+	needing bison 3.
+
+2015-04-03  James Gallagher  <jgallagher@opendap.org>
+
+	Bumped up the library versions
+	Each of libdap, libdapclient and libdapsever likely have new interfaces
+	but the old interfaces are intact, so CURRENT and AGE are increased,
+	and REVISION is reset to 0.
+
+	Various changes as needed for the release.
+
+2015-03-31  James Gallagher  <jgallagher@opendap.org>
+
+	Added to gitignore
+
+	Hacked more for the FlexLexer.h kludge...
+
+	Resurrected the D4*Scanner.h files
+
+	Modified the FlexLexer.h scheme
+	Now it fits more with the way I'm handling the other generated
+	files. The header is in the generated files dir and is only
+	copied out when bison 3 is not found. It's still a kludge...
+
+	Added FlexLexer.h
+	This might be a mistake - remove if this fails on linux, etc.
+
+2015-03-30  James Gallagher  <jgallagher@opendap.org>
+
+	Rest of changes for template grammar files
+	Now if bison 3.0+ is not found, the build will use
+	template versions of the generated grammar files. This
+	removes the dependence on bison 3.0 for most source
+	builds. Of course, if you want to modify the D4 grammar
+	you need bison 3.
+
+	Added generated grammar sources
+	When a machine does not have bison 3, it's a pain to install it, esp.
+	at a site that doesn't let the builder do that! The work-around is to
+	provide a backup set of sources that can be copied by the Makefile in
+	lieu of the real thing.
+
+2015-03-25  James Gallagher  <jgallagher@opendap.org>
+
+	Merge branch 'master' of https://github.com/opendap/libdap4
+
+	Dropped the autoconf required version to 2.63
+	This accommodates RH/CentOS 6. I also had to change the AT_ARG_OPTION_ARG
+	calls so that multi-word options used underscores and not dashes.
+
+	Change to libdap.spec
+	I've added the dist info to the RPM and fixed up some of the
+	description, too.
+
+2015-03-17  James Gallagher  <jgallagher@opendap.org>
+
+	Edited comments and reformatted.
+	Also added a new method to Sequence that I subsequently removed
+	from the code using the preprocessor. ...it might come in handy
+	some day.
+
+	Refactored TestCommon
+	Now TestCommon.cc is not used; the constructors, etc. are now
+	in TestCommon.h. In the future this class could be modified so
+	that the 'series_values' property was accessible from TestCommon
+	and not just the individual type classes.
+
+	Change a comment emmited by configure less convoluted.
+
+2015-03-16  James Gallagher  <jgallagher@opendap.org>
+
+	Merge branch 'master' of https://github.com/opendap/libdap4
+
+	Changes to build and to the Test* classes.
+	Now configure tests for the uuid/uuid.h header (before it tested only
+	for the library which meant that installing the libuuid package and
+	not the needed libuuid-devel package would pass configure but fail
+	during the build). I also removed some unused code from the Test* classes.
+	The TestCommon.cc file was not needed.
+
+	rpm target fixes
+	Added getdap4 to the files list for RPM and fixed distclean/distcheck
+	where some DMR tests are marked xfail (expected fail). With autotest,
+	xfail leaves some cruft behind in the DMRTest.dir directory that
+	./DMRTest --clean should remove (see the clean-local makefile target).
+	However, because a space was added to the names in the Makefile.am,
+	those --clean calls were not being made. Fixed. Somewhat exasperating...
+
+2015-02-26  James Gallagher  <jgallagher@opendap.org>
+
+	Merge branch 'master' of https://github.com/opendap/libdap4
+
+	Added convenience function to util
+	The new function extracts doubles from numeric arrays using a vector
+	to cu down on memory management complexity (at the cost of an addition
+	to the interface).
+
+2015-02-21  James Gallagher  <jgallagher@opendap.org>
+
+	Fixed GetOpt.cc includes
+	This code used old includes (string.h, etc.) and was missing
+	stdio. I added <cstdio> and changed stdlib.h and string.h to
+	cstdlib and cstring. Removed a duplicate header. Build now works
+	on AWS Centos 6.
+
+2015-02-19  James Gallagher  <jgallagher@opendap.org>
+
+	More Cleanup
+	I re-indented TestSequence and removed some old code
+	as part of my work on the aggregation server (which
+	may not make it into the BES, another story...)
+
+	Cleanup
+	I removed unused code from Sequence, DDS.cc and AttrTable.cc
+
+2015-02-09  James Gallagher  <jgallagher@opendap.org>
+
+	Tweaked D4Sequence for BES function's tabular()
+	The d_length field is now set when set_values()
+	is called.
+
+2015-02-02  James Gallagher  <jgallagher@opendap.org>
+
+	Removed incorrect comment in Vector.h
+
+2015-01-14  James Gallagher  <jgallagher@opendap.org>
+
+	Added a type_name() function to util.cc/h
+	In the merge with DAP4, type_name() split into D2type_name() and
+	D4type_name(). That removes the symbol 'type_name()' from the library.
+	I added a function with that name that first tries to apply D4... and
+	then D2. If both fail, an exception is thrown. This provides forward
+	looking backward compatibility.
+
+	Fixed an issue with String constant arguments to DAP4 functions.
+	The function parser for DAP4 was including the double quotes that
+	delimit string constants in the value itself. I modified the parser
+	to eliminate those.
+
+2015-01-07  James Gallagher  <jgallagher@opendap.org>
+
+	HTTPCacheTest was failing; fixed.
+	The test assumed that the number of headers for a cached response
+	would equal the headers in a response. This might not be the case.
+	For example, the received response might include a Keep-Alive header.
+
+	Error in D4Maps copy ctor fixed.
+	This addresses an error in the DMRTest.cc unit test for the DMR
+	class. DMR's copy ctor was failing to copy the maps from Arrays
+	in the src object to the dest object because of an error in the
+	D4Maps m_duplicate method.
+
+	Corrected some comment text in DMR.cc
+
+2015-01-05  James Gallagher  <jgallagher@opendap.org>
+
+	Minor changes to the Makefile.am files
+
+2014-12-31  James Gallagher  <jgallagher@opendap.org>
+
+	Merge remote-tracking branch 'origin/dap4'
+	Conflicts:
+		unit-tests/HTTPConnectTest.cc
+
+2014-12-12  James Gallagher  <jgallagher@opendap.org>
+
+	Added eclipse meta files to gitignore.
+
+	Merge branch 'master' of https://github.com/opendap/libdap
+
+	comment change in main_page.doxygen
+
+2014-12-03  James Gallagher  <jgallagher@opendap.org>
+
+	Added files  left over from a full build to gitignore
+
+2014-11-19  James Gallagher  <jgallagher@opendap.org>
+
+	Added .gitignore and hacked up Makefile.am so that it uses subdir-objects.
+
+2014-10-21  James Gallagher  <jgallagher@opendap.org>
+
+	Added a valgrind 'suppressions' file for OSX 10.9. Not sure where
+	this is going, but valgrind for unit tests and regression tests is
+	probably a good thing.
+
+	Fixed to the Makefile.am in d4_ce so that the grammar for DAP4 builds correctly.
+
+2014-10-20  James Gallagher  <jgallagher@opendap.org>
+
+	Changed HTTPConnect.cc on the release branch and then copied here. Minor fix in the test baseline to accommadate a change in the test host (etag changed with a change in the Apache server version).
+	M    unit-tests/HTTPConnectTest.cc
+
+2014-10-16  James Gallagher  <jgallagher@opendap.org>
+
+	Fixed ticket 2260 - The issue where the DMR copy ctor built a DMR that would subsequently cause a segfault has been fixed. The problem was in Array::update_dimension_pointers(). The D4Dimension objects were not copied correctly between the old and new set of D4Dimensions in the Groups in the source and dest DMRs
+
+2014-10-14  James Gallagher  <jgallagher@opendap.org>
+
+	Leak fix in the D4CE code - both the CE and Functions parser leaked memory - fixed. Tests HTTPCacheTest and HTTPConnectTest fixed - there were two issue with the new test.o2 server. Array.h - removed the D4Dimensions.h include.
+
+	Bug fix in ServerFunction: The setFunction setters in ServerFunction were setting other function pointers to null so that the ServerFunction object could hold only one kind of function for any given name. If we want linear_scale, e.g., to work for both DAP2 and DAP4, the class has to be able to support a btp_func and D4Function. I fixed the ctors and setters so that works.
+
+2014-09-17  James Gallagher  <jgallagher@opendap.org>
+
+	Renamed the bison 'Driver' classes to be D4ConstraintEvaluator and D4FunctionEvaluator. Added an eval() method to the latter so that the BES can evaluation DAP4 Functions in a some sort of a sane way. I also moved the old and crufty D4ResponseBuilder code out of the libdap dir; there's a class with the same name in tests, but it does different (and more sane) things.
+
+	Comments and changed template type from 't' to 'T'.
+
+	Comments...
+
+2014-09-12  James Gallagher  <jgallagher@opendap.org>
+
+	Fixed FQN() for Constructors that hold arrays.
+
+2014-09-11  James Gallagher  <jgallagher@opendap.org>
+
+	I removed the DMR& parameter to BaseType::intern_data(). This seems to be a relic from DAP2 (where it may not have actually been used either) and it makes employing delegation somewhat harder in the 'transmitter' handlers I'm working on porting over to DAP4.
+
+	Modified to use the new 'DMR-free' version of intern_data(). Also fixed the help message.
+
+	Added a DMR that holds a nested sequence so this can be tested - currently does not work and is not part of the tests.
+
+2014-09-08  James Gallagher  <jgallagher@opendap.org>
+
+	Marked four tests a xfail. See ticket #2244
+	M    tests/DMRTest.at
+
+	I added specializations for transform_to_dap4() to TestStructure and TestSequence so that, among other things, the dapreader code can build DAP4 data responses using DAP2 response files.
+
+2014-09-05  James Gallagher  <jgallagher@opendap.org>
+
+	Fixed hiccup in Makefile.am that prevented the D4Connect.h header from being installed - it was not listed in pkginclude_HEADERS. Added subdir-objects to the options list in the Makefile.am too. Fixed an error message in getdap4 - text change only.
+
+2014-09-04  James Gallagher  <jgallagher@opendap.org>
+
+	Added a FQN() method that will return the FQN for any variable, including the group part. Also added a decent comment on the D4Group::find_var() method. Unit tests added to the D4GroupTest unit test.
+
+2014-09-03  James Gallagher  <jgallagher@opendap.org>
+
+	Removed duplicate code in Sequence and Structure for the transform_to_dap4() method; moved the common code to Constructor.
+
+2014-08-27  James Gallagher  <jgallagher@opendap.org>
+
+	Added an update of the weak pointers held by Array so that the DMR::m_duplicate() method can use D4Group::ptr_duplicate(). This was useful when porting the gdal_handler code to DAP4.
+
+2014-08-21  James Gallagher  <jgallagher@opendap.org>
+
+	Change to Constructor::serialize(). It now calls read(). This was removed because it broke the behavior of D4Sequence - at least in the test code (it still does). More work needs to be done on this, but the FreeForm handler, which builds sequences is working with D4Sequence (DMR/DAP4 Data via the DDS --> DMR hack). I will need to revisit this...
+
+2014-08-19  James Gallagher  <jgallagher@opendap.org>
+
+	Now has a separate method to 'blend in' variables from a DDS into the DMR. This is used by the DDS-ctor for DMR but it can also be called on an existing DMR like the ones built by the BES. This was done so that information set when the BES builds the DMR won't be lost.
+
+	Changes to the transform_to_dap4() method - both Sequence and Structure have implementations that work for tests and clients, but not most servers. Array should be pretty general and may work for most handlers.
+
+2014-08-18  James Gallagher  <jgallagher@opendap.org>
+
+	Removed unused code - part of an aborted attempt to add a factory class as a param to BaseType::transform_to_dap4(...). Instead, it's likely better to subclass that method in the types like FFSequence (in the handlers). In the process I found a fair amount of old code that was commented out and removed it.
+
+2014-08-15  James Gallagher  <jgallagher@opendap.org>
+
+	Fixed an issue in Array where D4Dimensions made using the 'transform dap2 to dap4 code' with the same name but different sizes could be made. This was bad; I changed the code so that when a name conflict is found, the D4Dimension  will have a different name (made using the orig dimension name and the variable name). In this case, the fist D4Dimension gets to use the name exactly as it appears in the Array while the second D4Dimension gets a more cumbersome, but unique, name.
+
+	Fixed the order of printing of attributes and variables for constructor types when working with DAP2 responses (i.e., the DDX). The order (attr; vars) is reversed in DAP4.
+
+2014-08-14  James Gallagher  <jgallagher@opendap.org>
+
+	Patch for getopt applied
+	_M   .
+	M    unit-tests/DDSTest.cc
+	M    unit-tests/DDXParserTest.cc
+	MM   unit-tests/SequenceTest.cc
+	M    unit-tests/ServerFunctionsListUnitTest.cc
+
+	Patch from Orion Poplawski to fix some of the getopt calls in the unit-tests
+	M    unit-tests/DDSTest.cc
+	M    unit-tests/DDXParserTest.cc
+	M    unit-tests/SequenceTest.cc
+	M    unit-tests/ServerFunctionsListUnitTest.cc
+
+2014-08-11  James Gallagher  <jgallagher@opendap.org>
+
+	Changes from H 1.9.9 on the trunk
+
+2014-08-09  James Gallagher  <jgallagher@opendap.org>
+
+	Merge from the trunk to include changes for Hyrax 1.9.9
+	_M   .
+	M    RValue.cc
+	M    XMLWriter.h
+	M    configure.ac
+	M    ChangeLog
+	M    main_page.doxygen
+	M    INSTALL
+	M    libdap.spec
+	M    README
+	M    Makefile.am
+	M    NEWS
+	M    ce_expr.yy
+	M    unit-tests/HTTPConnectTest.cc
+	M    doxy.conf
+
+2014-08-08  James Gallagher  <jgallagher@opendap.org>
+
+	Version 3.13.3
+	M    ChangeLog
+	M    INSTALL
+	M    NEWS
+	M    README
+	M    configure.ac
+	M    doxy.conf
+	M    libdap.spec
+	M    main_page.doxygen
+
+	Fixed a leak in RValue.cc using a patch from Aron (ADB)
+
+2014-08-08  James Gallagher <jgallagher@opendap.org>
+
+	Fixed a leak in RValue.cc using a patch from Aron (ADB)
+
+2014-08-01  James Gallagher <jgallagher@opendap.org>
+
+	Release checklist steps for 3.13.2
+
+	M    ChangeLog
+	M    INSTALL
+	M    NEWS
+	M    README
+	M    configure.ac
+	M    doxy.conf
+	M    libdap.spec
+	M    main_page.doxygen
+
+2014-08-01  James Gallagher <jgallagher@opendap.org>
+
+	Release checklist steps for 3.13.2
+
+	M    ChangeLog
+	M    INSTALL
+	M    NEWS
+	M    README
+	M    configure.ac
+	M    doxy.conf
+	M    libdap.spec
+	M    main_page.doxygen
+
+2014-07-30  James Gallagher <jgallagher@opendap.org>
+
+	Second fix for ticket 2240 - SCAN_STR from the CE scanner
+	was leaking because the parser did not delete the reutrned
+	string. I also modified the first fix so that a local tmp
+	string was used instead of new dynamic storage.
+
+	M    ce_expr.yy
+
+2014-07-30  James Gallagher <jgallagher@opendap.org>
+
+	Fixed a memory leak reported by Aron.Bartle@mechdyne.com. See ticket
+	2240.
+
+	M    ce_expr.yy
+
+2014-07-30  James Gallagher <jgallagher@opendap.org>
+
+	I added a comment about a potential memory leak to ce_expr.yy
+
+;; Local Variables:
+;; coding: utf-8
+;; End:
+2014-07-30  James Gallagher <jgallagher@opendap.org>
+
+	Second fix for ticket 2240 - SCAN_STR from the CE scanner
+	was leaking because the parser did not delete the reutrned
+	string. I also modified the first fix so that a local tmp
+	string was used instead of new dynamic storage.
+
+	M    ce_expr.yy
+
+2014-07-30  James Gallagher <jgallagher@opendap.org>
+
+	Fixed a memory leak reported by Aron.Bartle@mechdyne.com. See ticket
+	2240.
+
+	M    ce_expr.yy
+
+2014-07-30  James Gallagher <jgallagher@opendap.org>
+
+	I added a comment about a potential memory leak to ce_expr.yy
+
+2014-05-07  James Gallagher <jgallagher@opendap.org>
+
+	spelling
+
+2014-05-07  James Gallagher <jgallagher@opendap.org>
+
+	Fixed a test baseline in HTTPConnectTest so that it will work with
+	the new headers returned by H 1.9.3 (which include so things from
+	DAP4).
+
+2014-05-05  James Gallagher <jgallagher@opendap.org>
+
+	namespace libdap addex
+
+	M    XMLWriter.h
+
+2014-05-02  James Gallagher <jgallagher@opendap.org>
+
+	Minor edit to Makefile.am for builds on centos 5 - there libgl
+	builds a copy of unistd.h that doesn't work with flex generated cc
+	files. So I pulled -I./gl from CPP flags for the parsers library.
+
+2014-04-22  James Gallagher <jgallagher@opendap.org>
+
+	Updated for 3.13
+
+	M    INSTALL
+	M    README
+	M    configure.ac
+
+2014-04-15  James Gallagher <jgallagher@opendap.org>
+
+	Updates to NEWS, ChangeLog to match the bump in the vesion number.
+
+2014-04-11  James Gallagher <jgallagher@opendap.org>
+
+	Added comment info to abi_checker.xml.in so we'll remember how to use the abi checker.
+
+2014-04-11  James Gallagher <jgallagher@opendap.org>
+
+	path fix/typo
+
+2014-04-11  James Gallagher <jgallagher@opendap.org>
+
+	Added abi_checker.xml.in file for the perl-based abi checker. Seems to work only with gcc.
+
+;; Local Variables:
+;; coding: utf-8
+;; End:
+2014-04-11  James Gallagher <jgallagher@opendap.org>
+
+	Added comment info to abi_checker.xml.in so we'll remember how to use the abi checker.
+
+2014-04-11  James Gallagher <jgallagher@opendap.org>
+
+	path fix/typo
+
+2014-04-11  James Gallagher <jgallagher@opendap.org>
+
+	Added abi_checker.xml.in file for the perl-based abi checker. Seems to work only with gcc.
+
+2014-03-26  James Gallagher <jgallagher@opendap.org>
+
+2014-02-05  James Gallagher <jgallagher@opendap.org>
+
+	Fixed the SequenceTest 'baseline' regex.
+
+	M    unit-tests/SequenceTest.cc
+
+2014-02-04  James Gallagher <jgallagher@opendap.org>
+
+	Unit test updates after the OS upgrade from OSX 10.8 to 10.9.
+	There seems to be an issue with the sizeof(std::string) and also
+	with libxml2 and/or my code to read from a C++ stream and have
+	libxml2 parse text/xml. For now I'm removing these tests... but
+	will return to the libxml2 issue later (the sizeof(std::string)
+	maybe a bad idea since that could be pretty variable between
+	libstdc++ versions - I might just drop that test).
+
+2013-11-05  James Gallagher <jgallagher@opendap.org>
+
+	Minor formatting changes
+
+2013-10-24  James Gallagher <jgallagher@opendap.org>
+
+	All tests now pass for array projections for server function
+	arguments.
+
+2013-10-24  James Gallagher <jgallagher@opendap.org>
+
+	tests pass for array projections in function arg lists
+
+2013-10-24  James Gallagher <jgallagher@opendap.org>
+
+	Fixed an obscure bug in the test function - for the scalar case it
+	was not reading the arg's value.
+
+2013-10-23  James Gallagher <jgallagher@opendap.org>
+
+	missed one baseline for the function stuff...
+
+2013-10-23  James Gallagher <jgallagher@opendap.org>
+
+	Added support for array subsetting (projection) in the argument
+	list of a function. Tests need work and there's an issue when the
+	function arg is a scalar not an array. Also, the intern_data()
+	methods don't work, but this may be a larger issue with the hack
+	to the function evaluation scheme added for 'grads syntax'
+	support.
+
+2013-10-21  hyoklee
+
+	fixed the bug #2016.
+
+2013-10-21  Hyo-Kyung Lee  <hyoklee@hdfgroup.org>
+
+	* escaping.cc (escattr): fixed the double escaping problem by changing
+	the order of the first two while() loops.
+
+2013-10-18  James Gallagher <jgallagher@opendap.org>
+
+	svn:ignore
+
+2013-10-17  James Gallagher <jgallagher@opendap.org>
+
+	Manually patched changes to Sequence::read_row and
+	TestSequence::read() from the DAP4 development branch so they work
+	with the newly modified handlers (the DAP4 branch uses _trunk_ copies
+	of the handlers). We will have to document this change before
+	releasing the code!
+
+	M    tests/TestSequence.cc
+	M    Sequence.cc
+
+2013-10-17  James Gallagher <jgallagher@opendap.org>
+
+	Added to svn:ignore
+
+2013-10-15  James Gallagher <jgallagher@opendap.org>
+
+	Added
+
+	A    gl/glthread
+	A    gl/glthread/threadlib.c
+	A    gl/glthread/lock.c
+	A    gl/glthread/lock.h
+
+2013-10-15  James Gallagher <jgallagher@opendap.org>
+
+	Added
+
+	AM   config.rpath
+
+2013-10-15  James Gallagher <jgallagher@opendap.org>
+
+	Added to gl
+
+	A    gl/m4/lib-link.m4
+	A    gl/m4/lock.m4
+	A    gl/m4/lib-prefix.m4
+	A    gl/m4/lib-ld.m4
+	A    gl/m4/eealloc.m4
+	A    gl/m4/extern-inline.m4
+	A    gl/m4/threadlib.m4
+	A    gl/wctype-h.c
+	A    gl/unistd.c
+
+2013-10-15  James Gallagher <jgallagher@opendap.org>
+
+	Updated gnulib.
+
+	M    XMLWriter.cc
+	M    conf/snippet/c++defs.h
+	M    conf/snippet/warn-on-use.h
+	M    conf/snippet/arg-nonnull.h
+	M    Byte.h
+	M    XDRUtils.cc
+	M    ServerFunction.cc
+	M    Url.cc
+	M    XDRFileUnMarshaller.cc
+	M    gl/m4/fcntl-o.m4
+	M    gl/m4/configmake.m4
+	M    gl/m4/localcharset.m4
+	M    gl/m4/locale_h.m4
+	M    gl/m4/sys_types_h.m4
+	M    gl/m4/mbrtowc.m4
+	M    gl/m4/btowc.m4
+	M    gl/m4/longlong.m4
+	M    gl/m4/00gnulib.m4
+	M    gl/m4/ssize_t.m4
+	M    gl/m4/glibc21.m4
+	M    gl/m4/localeconv.m4
+	M    gl/m4/codeset.m4
+	M    gl/m4/alloca.m4
+	M    gl/m4/off_t.m4
+	M    gl/m4/locale-fr.m4
+	M    gl/m4/langinfo_h.m4
+	M    gl/m4/wint_t.m4
+	M    gl/m4/mbsinit.m4
+	M    gl/m4/stdint.m4
+	M    gl/m4/gnulib-common.m4
+	M    gl/m4/stdbool.m4
+	M    gl/m4/malloc.m4
+	M    gl/m4/regex.m4
+	M    gl/m4/warn-on-use.m4
+	M    gl/m4/wchar_h.m4
+	M    gl/m4/gnulib-comp.m4
+	M    gl/m4/unistd_h.m4
+	M    gl/m4/wcrtomb.m4
+	M    gl/m4/locale-zh.m4
+	M    gl/m4/stddef_h.m4
+	M    gl/m4/gnulib-cache.m4
+	M    gl/m4/include_next.m4
+	M    gl/m4/mbstate_t.m4
+	M    gl/m4/wctype_h.m4
+	M    gl/m4/nl_langinfo.m4
+	M    gl/m4/locale-ja.m4
+	M    gl/m4/wchar_t.m4
+	M    gl/m4/multiarch.m4
+	M    gl/m4/stdlib_h.m4
+	M    gl/m4/mbtowc.m4
+	M    gl/m4/gnulib-tool.m4
+	M    gl/m4/byteswap.m4
+	M    gl/m4/extensions.m4
+	M    gl/localcharset.c
+	M    gl/mbsinit.c
+	M    gl/regex_internal.c
+	M    gl/malloc.c
+	M    gl/byteswap.in.h
+	M    gl/localcharset.h
+	M    gl/locale.in.h
+	M    gl/regex_internal.h
+	M    gl/sys_types.in.h
+	M    gl/wcrtomb.c
+	M    gl/btowc.c
+	M    gl/regexec.c
+	M    gl/ref-del.sin
+	M    gl/mbtowc.c
+	M    gl/regcomp.c
+	M    gl/mbtowc-impl.h
+	M    gl/streq.h
+	M    gl/alloca.in.h
+	M    gl/langinfo.in.h
+	M    gl/ref-add.sin
+	M    gl/verify.h
+	M    gl/regex.c
+	M    gl/config.charset
+	M    gl/mbrtowc.c
+	M    gl/wchar.in.h
+	M    gl/regex.h
+	M    gl/stdint.in.h
+	M    gl/stdbool.in.h
+	M    gl/unistd.in.h
+	M    gl/stddef.in.h
+	M    gl/localeconv.c
+	M    gl/wctype.in.h
+	M    gl/nl_langinfo.c
+	M    gl/Makefile.am
+	M    gl/gettext.h
+	M    gl/stdlib.in.h
+	M    BaseTypeFactory.cc
+	M    XDRStreamMarshaller.cc
+	M    escaping.cc
+	M    DapIndent.cc
+	M    XDRFileMarshaller.cc
+
+2013-10-01  James Gallagher <jgallagher@opendap.org>
+
+	Updated the FSF address in the copyright headers
+
+2013-09-30  James Gallagher <jgallagher@opendap.org>
+
+	This checkin contains a fix for the conflicting definitions of
+	width() in BaseType, Vector and Array, where Array provided a
+	version/definition that clashes with the one in BaseType. BaseType
+	defined width() and Array defined width(bool constrained = true),
+	which shadowed the former. I changed BaseType width so that its
+	signature is width(bool constrained = false) and made that the
+	only version of the method. There are some changes to uses of
+	width() in libdap and the BES, but not in the handlers.
+
+2013-09-27  James Gallagher <jgallagher@opendap.org>
+
+	misc changes; a minor fix for Array; a fix for the DDX parser; A
+	minor change in the scanners for the Error, DAS, DDS and CE
+	parsers (added %option noinput to suppress a warning); removed
+	-fno-defer-pop from the Makefile.ams.
+
+2013-09-17  James Gallagher <jgallagher@opendap.org>
+
+	I changed the character used for the Type special form (from # to
+	$, because # is a URL delim. and tomcat was filtering it).
+
+2013-08-28  James Gallagher <jgallagher@opendap.org>
+
+	Build/Audit fixes.
+
+	M    libdap/XDRFileUnMarshaller.cc
+	M    libdap/XDRFileUnMarshaller.h
+	M    bes/dispatch/unit-tests/keysT.cc
+	M    bes/functions/Makefile.am
+
+2013-08-27  James Gallagher <jgallagher@opendap.org>
+
+	Backed out an errant call to fclose()
+
+;; Local Variables:
+;; coding: utf-8
+;; End:
+2013-08-28  James Gallagher <jgallagher@opendap.org>
+
+	Build/Audit fixes.
+
+	M    libdap/XDRFileUnMarshaller.cc
+	M    libdap/XDRFileUnMarshaller.h
+	M    bes/dispatch/unit-tests/keysT.cc
+	M    bes/functions/Makefile.am
+
+2013-08-27  James Gallagher <jgallagher@opendap.org>
+
+	Backed out an errant call to fclose()
+
+2013-08-27  James Gallagher <jgallagher@opendap.org>
+
+	Removed errant call to fclose() in XDRFileUnMarshaller. This
+	caused a segfault on Linux.
+
+2013-08-27  James Gallagher <jgallagher@opendap.org>
+
+	audit fixes
+
+	M    libdap/Makefile.am
+	M    bes/dispatch/unit-tests/BESCache3Test.cc
+	M    bes/functions/tests/functionsTest.at
+	M    bes/functions/tests/bescmd/bind_name_4.dods.bescmd.baseline
+	M    bes/functions/tests/bescmd/bind_name_2.dods.bescmd.baseline
+
+2013-08-27  James Gallagher <jgallagher@opendap.org>
+
+	Source release info
+
+	M    configure.ac
+	M    ChangeLog
+	M    INSTALL
+	M    README
+	M    NEWS
+
+2013-08-27  James Gallagher <jgallagher@opendap.org>
+
+	Audit fixes.
+
+	M    RValue.cc
+	M    HTTPCacheTable.cc
+	M    Array.cc
+	M    DDXParserSAX2.cc
+	M    Makefile.am
+	M    HTTPCache.cc
+	M    XDRStreamUnMarshaller.cc
+	M    Structure.cc
+	M    Sequence.cc
+	M    XDRFileUnMarshaller.cc
+	M    XDRFileUnMarshaller.h
+	M    mime_util.cc
+	M    util.cc
+	M    util_mit.cc
+
+2013-08-27  James Gallagher <jgallagher@opendap.org>
+
+	Changed the required bison version number to 2.4 and removed a bogus include
+	from das.yy that breaks bison 2.4.
+
+	M    das.yy
+	M    Error.yy
+	M    dds.yy
+	M    ce_expr.yy
+
+2013-08-27  James Gallagher <jgallagher@opendap.org>
+
+	Removed bad character from the Makefile.am
+
+	M    Makefile.am
+
+2013-08-27  James Gallagher <jgallagher@opendap.org>
+
+	Added the newly hacked grammar files - these along with updated versions
+	of DAS.cc, DDS.cc, ConstraintEvaluator.cc and Error.cc and Makefile.am
+	were copied over from the dap4 branch. A kind of cheap merge operation...
+
+	A    das.yy
+	A    Error.yy
+	A    dds.yy
+	A    ce_expr.yy
+
+;; Local Variables:
+;; coding: utf-8
+;; End:
+2013-08-27  James Gallagher <jgallagher@opendap.org>
+
+	Audit fixes.
+
+	M    RValue.cc
+	M    HTTPCacheTable.cc
+	M    Array.cc
+	M    DDXParserSAX2.cc
+	M    Makefile.am
+	M    HTTPCache.cc
+	M    XDRStreamUnMarshaller.cc
+	M    Structure.cc
+	M    Sequence.cc
+	M    XDRFileUnMarshaller.cc
+	M    XDRFileUnMarshaller.h
+	M    mime_util.cc
+	M    util.cc
+	M    util_mit.cc
+
+2013-08-27  James Gallagher <jgallagher@opendap.org>
+
+	Changed the required bison version number to 2.4 and removed a
+	bogus include from das.yy that breaks bison 2.4.
+
+	M    das.yy
+	M    Error.yy
+	M    dds.yy
+	M    ce_expr.yy
+
+2013-08-27  James Gallagher <jgallagher@opendap.org>
+
+	Removed bad character from the Makefile.am
+
+	M    Makefile.am
+
+2013-08-27  James Gallagher <jgallagher@opendap.org>
+
+	Added the newly hacked grammar files - these along with updated
+	versions of DAS.cc, DDS.cc, ConstraintEvaluator.cc and Error.cc
+	and Makefile.am were copied over from the dap4 branch. A kind of
+	cheap merge operation...
+
+	A    das.yy
+	A    Error.yy
+	A    dds.yy
+	A    ce_expr.yy
+
+2013-08-26  James Gallagher <jgallagher@opendap.org>
+
+	Chnages so that a newer bison can be used.
+
+	M    Error.lex
+	M    Error.cc
+	M    ce_parser.h
+	M    ConstraintEvaluator.cc
+	M    DDS.cc
+	M    Makefile.am
+	M    dds.lex
+	M    Vector.cc
+	M    das.lex
+	M    Vector.h
+	M    DAS.cc
+	M    ce_expr.lex
+
+2013-07-23  James Gallagher <jgallagher@opendap.org>
+
+	Removed the openssl/evp.h header because it winds up including
+	des_old.h on OSX 10.5 and that has a conflict with set_key() in
+	BESKeys.h. Also, the code no longer uses the evp.h header...
+
+	M    XDRStreamMarshaller.h
+
+2013-07-23  James Gallagher <jgallagher@opendap.org>
+
+	Memory leaks fixed in the DAP4 Stream Marshaller classes - but
+	these are in code in the trunk. will check in all the same and
+	make corresponding changes to the code on the dap4 branch (which
+	uses the filename prefix 'D4' instead of 'DAP4').
+
+2013-07-23  James Gallagher <jgallagher@opendap.org>
+
+	Modified ConstraintEvaluator so that it always frees the
+	scanner/parser string buffer when an exception is thrown. I made
+	this change while working on a problem that turned out to be in
+	the scanner (state was not reset when an error was found) but even
+	though this change is not the fix for that - see ce_expr.lex - it
+	seems like a good idea.
+
+2013-07-23  James Gallagher <jgallagher@opendap.org>
+
+	Fixed the rpm build - libtest-types.a was missiing from the spec file.
+
+2013-07-10  James Gallagher <jgallagher@opendap.org>
+
+	Fixed a bug where a CE with mismatched quotes left the CE parser
+	in the <quote> state, making subsequent requests fail. The fix was
+	in the scanner to reset the parser (technically the scanner's)
+	state to INITIAL when an error was detected. I also added code to
+	catch the Error object thrown by the scanner and delete the parse
+	buffer, although that might be overkill.
+
+2013-07-10  James Gallagher <jgallagher@opendap.org>
+
+	Merged changes from the miic_6.2013 branch. These changes support the
+	new #<type>() special forms that enable big arrays to be use in CEs.
+
+	_M   .
+	M    Error.lex
+	M    ConstraintEvaluator.cc
+	M    Array.cc
+	M    tests/expr-test.cc
+	A  + tests/ResponseBuilder.cc
+	A  + tests/ResponseBuilder.h
+	M    tests/Makefile.am
+	M    DDXParserSAX2.cc
+	M    Makefile.am
+	M    ce_expr.y
+	M    Error.y
+	M    dds.lex
+	MM   mime_util.h
+	M    XDRStreamUnMarshaller.cc
+	M    RValue.h
+	M    BaseTypeFactory.h
+	M    das.lex
+	MM   mime_util.cc
+	M    das.y
+	M    BaseTypeFactory.cc
+	M    util.cc
+	D    unit-tests/server-testsuite/geturl.0
+	D    unit-tests/server-testsuite/config
+	_M   unit-tests/ancT.cc
+	M    unit-tests/DDXParserTest.cc
+	D    unit-tests/response_cache
+	M    unit-tests/Makefile.am
+	M    dds.y
+	M    Array.h
+	M    ce_expr.lex
+
+2013-07-09  James Gallagher <jgallagher@opendap.org>
+
+	Trunk fixes for the functions module in the libdap andbes spec
+	files. Also a repair to XDRStreamMarshaller.cc
+
+2013-06-06  Nathan Potter <ndp@coas.oregonstate.edu>
+
+	libdap: new value() methods so that the correct thinmgs are
+	accessed and returned.
+
+2013-06-06  Nathan Potter <ndp@coas.oregonstate.edu>
+
+	libdap: Added new 'value' function to Vector that allows you use
+	an subset_index array to retrieve non contiguous values in a
+	single operation
+
+2013-06-05  James Gallagher <jgallagher@opendap.org>
+
+	Added libdap-* to svn-ignore
+
+2013-05-21  James Gallagher <jgallagher@opendap.org>
+
+	Fixes for linux
+
+	M    unit-tests/ResponseBuilderTest.cc
+	M    unit-tests/ResponseCacheTest.cc
+
+2013-05-21  James Gallagher <jgallagher@opendap.org>
+
+	added valgrind suppressions for stuff in libxml2
+
+2013-05-20  James Gallagher <jgallagher@opendap.org>
+
+	Moved four set_mime_*() methods from ResponseBuilder to mime_util.
+
+2013-05-20  James Gallagher <jgallagher@opendap.org>
+
+	Modified DDXParser so that it includes an intern_stream() method
+	that takes a cpp istream. Added tests. Also modified
+	ResponseBuilder so that it frees the AlarmHandler allocated when
+	establish_timeout() is called.
+
+2013-05-20  James Gallagher <jgallagher@opendap.org>
+
+	Fixed memory leaks in the DDXParserSax2 code. Other minor edits.
+
+2013-05-20  James Gallagher <jgallagher@opendap.org>
+
+	Test fixes
+
+2013-05-20  James Gallagher <jgallagher@opendap.org>
+
+	added
+
+2013-05-17  James Gallagher <jgallagher@opendap.org>
+
+	Added these baseline files for ResponseBuilderTest
+
+2013-05-17  James Gallagher <jgallagher@opendap.org>
+
+	Fixes for ResponseCache - I added tests and have tested most
+	modes. Not tested: how it works with server functions. There are
+	also fixes/modifications for ResponseBuilder that ResponseCache
+	uses. Added a note to ServerFunctionsList that it stores weak
+	pointers. I worked on the ResponseBuilderTests but never got the
+	test for server functions to work completely; the test examines
+	the response document and checks that the metadata part is correct
+	but not the (trivial) data part.
+
+2013-05-17  James Gallagher <jgallagher@opendap.org>
+
+	Added get_next_mime_header() for an istream (the existing version
+	took a FILE*) and moved some of the MIME header methods from
+	ResponseBuilder here.
+
+2013-05-15  Nathan Potter <ndp@coas.oregonstate.edu>
+
+	libdap: Moving trunk/libdap/unit-tests/ce-functions-testsuite to
+	trunk/bes/functions/unit-tests because that's where the functions
+	are that need the contents of that directory.
+
+2013-05-14  James Gallagher <jgallagher@opendap.org>
+
+	ResponseCache mostly working...
+
+2013-05-14  James Gallagher <jgallagher@opendap.org>
+
+	We now install the library and *Test headers.
+
+2013-05-14  Nathan Potter <ndp@coas.oregonstate.edu>
+
+	libdap: Repaired problems with conditional build in ServerFcuntionsList
+
+2013-05-14  James Gallagher <jgallagher@opendap.org>
+
+	Added HAVE_STDLIB_H and HAVE_ATEXIT to DAPCache3.cc.
+
+2013-05-10  Nathan Potter <ndp@coas.oregonstate.edu>
+
+	libdap: Instrumentation in Regex. Fixed baseline for
+	ResponseBuilderTest::invoke_server_side_function_test
+
+2013-05-10  Nathan Potter <ndp@coas.oregonstate.edu>
+
+2013-05-10  Nathan Potter <ndp@coas.oregonstate.edu>
+
+2013-05-10  Nathan Potter <ndp@coas.oregonstate.edu>
+
+2013-05-10  Nathan Potter <ndp@coas.oregonstate.edu>
+
+2013-05-10  Nathan Potter <ndp@coas.oregonstate.edu>
+
+	libdap: Added life cycle control to DAPCache3 singleton.
+
+2013-05-10  Nathan Potter <ndp@coas.oregonstate.edu>
+
+	libdap: Added life cycle control to DAPCache3 singleton.
+
+2013-05-10  James Gallagher <jgallagher@opendap.org>
+
+	(potential) fix for the ResponseBuilder cache bug
+
+2013-05-10  Nathan Potter <ndp@coas.oregonstate.edu>
+
+	libdap: Updated ResponseBuilderTest to run a server side function.
+
+2013-05-10  James Gallagher <jgallagher@opendap.org>
+
+	Removed (commented) #define DODS_DEBUG from ServerFunctionsList.
+
+2013-05-10  Nathan Potter <ndp@coas.oregonstate.edu>
+
+	libdap: Added instrumentation (enabled in this check in) to
+	ServerFunctionsList in an effort to understand the seg fault
+	problem that seems to be associated with server side function
+	calls.
+
+2013-05-10  Nathan Potter <ndp@coas.oregonstate.edu>
+
+	libdap: Added instrumentation (enabled in this check in) to
+	ServerFunctionsList in an effort to understand the seg fault
+	problem that seems to be associated with server side function
+	calls.
+
+2013-05-10  Nathan Potter <ndp@coas.oregonstate.edu>
+
+	libdap: Added instrumentation (enabled in this check in) to
+	ServerFunctionsList in an effort to understand the seg fault
+	problem that seems to be associated with server side function
+	calls.
+
+2013-05-09  Nathan Potter <ndp@coas.oregonstate.edu>
+
+	libdap: Checking in repaired ServerFunctionsList
+
+2013-05-06  James Gallagher <jgallagher@opendap.org>
+
+	Removed old code
+
+2013-05-06  James Gallagher <jgallagher@opendap.org>
+
+	DAPCache3 is now in the libdap namespace. The cache-specific
+	methods of ResponseBuilder have been factored out to
+	ResponseCache; RB still makes explicit calls to the cache code,
+	however. The ResponseCache class was added.
+
+2013-05-03  James Gallagher <jgallagher@opendap.org>
+
+	Added correct copyright headers for the ServerFunctions classes.
+
+2013-05-03  Nathan Potter <ndp@coas.oregonstate.edu>
+
+	libdap: Attempting to fix memory leaks in ServerFucntionsList - adding unit tests for same.
+
+2013-05-02  James Gallagher <jgallagher@opendap.org>
+
+	Removed old code in util
+
+2013-05-02  James Gallagher <jgallagher@opendap.org>
+
+	Removed old code from ResponseBuilder
+
+2013-05-01  Nathan Potter <ndp@coas.oregonstate.edu>
+
+	libdap: Change type signature for setter methods in ServerFunction
+	so that they accept const parameters
+
+2013-05-01  Nathan Potter <ndp@coas.oregonstate.edu>
+
+	libdap: Change type signature for setter methods in ServerFunction
+	so that they accept const parameters
+
+2013-04-27  James Gallagher <jgallagher@opendap.org>
+
+	Wrapped the two DAP4-only includes in #if DAP4. Those headers are not
+	installed in a regular build and the includes break clients that
+	included the file.
+
+	M    BaseType.h
+
+2013-04-03  James Gallagher <jgallagher@opendap.org>
+
+	distcheck works on linux now...
+
+	A  + D4ParserSax2.cc
+	M    Makefile.am
+	D    D4ParserSAX2.cc
+
+2013-04-03  James Gallagher <jgallagher@opendap.org>
+
+2013-04-02  James Gallagher <jgallagher@opendap.org>
+
+	Added climit include to fix 'UINT/INT_MAX missing' on Linux.
+
+	M    util.cc
+
+2013-04-01  James Gallagher <jgallagher@opendap.org>
+
+	Added unit tests for D4Dimensions and D4EnumDefs. Removed old code from the AttrTable tests.
+
+2013-04-01  James Gallagher <jgallagher@opendap.org>
+
+	Added D4EnumDefs
+
+2013-03-26  Nathan Potter <ndp@coas.oregonstate.edu>
+
+2013-03-25  Nathan Potter <ndp@coas.oregonstate.edu>
+
+	libdap: Disabling cruft code from earlier ugrid work.
+
+2013-02-25  Nathan Potter <ndp@coas.oregonstate.edu>
+
+	libdap: Comments
+
+2013-02-12  Nathan Potter <ndp@coas.oregonstate.edu>
+
+	libdap: comments
+
+2013-02-08  Nathan Potter <ndp@coas.oregonstate.edu>
+
+	libdap: Updated ServerFunction API
+
+2013-02-07  Nathan Potter <ndp@coas.oregonstate.edu>
+
+	libdap: Added methods to ServerFunctionsList to allow inspection of the list contents.
+
+2013-02-06  Nathan Potter <ndp@coas.oregonstate.edu>
+
+	libdap: Moved AbstractFunction class to ServerFunction class
+
+2013-02-06  Nathan Potter <ndp@coas.oregonstate.edu>
+
+	libdap: Added the use of AbstractFunction class.
+
+2013-02-05  Nathan Potter <ndp@coas.oregonstate.edu>
+
+	team sync
+
+2013-02-05  Nathan Potter <ndp@coas.oregonstate.edu>
+
+	team sync
+
+2013-02-04  Nathan Potter <ndp@coas.oregonstate.edu>
+
+2013-02-04  Nathan Potter <ndp@coas.oregonstate.edu>
+
+2013-02-04  Nathan Potter <ndp@coas.oregonstate.edu>
+
+	libdap: Adding AbstractServerSideFunction
+
+2013-01-31  James Gallagher <jgallagher@opendap.org>
+
+	Fixes for bes distcheck
+
+	M    ServerFunctionsList.cc
+	M    ServerFunctionsList.h
+	M    ConstraintEvaluator.h
+
+2013-01-30  James Gallagher <jgallagher@opendap.org>
+
+	Distcheck now works; removed more old server function code.
+
+	_M   .
+	M    configure.ac
+	M    main_page.doxygen
+	M    ConstraintEvaluator.cc
+	_M   tests
+	M    Makefile.am
+	D    swath2grid
+	D    ugridFunctions
+	M    NEWS
+	M    ConstraintEvaluator.h
+	M    unit-tests/HTTPCacheTest.cc
+	M    doxy.conf
+
+2013-01-30  James Gallagher <jgallagher@opendap.org>
+
+	Added stuff to svn:ignore
+
+2013-01-30  Nathan Potter <ndp@coas.oregonstate.edu>
+
+	libdap: Updating configre.ac for automake-1.13
+
+2013-01-29  James Gallagher <jgallagher@opendap.org>
+
+	Changed the way functions are registered so that CE does not have to copy all the functions into every instance of the CE class. Now CE uses functions directly from a list in libdap.
+
+2013-01-29  James Gallagher <jgallagher@opendap.org>
+
+	Changed the way functions are registered so that CE does not have to copy all the functions into every instance of the CE class. Now CE uses functions directly from a list in libdap.
+
+2013-01-29  James Gallagher <jgallagher@opendap.org>
+
+	Fixed checkin - I checked in some code with debugging on
+
+2013-01-29  James Gallagher <jgallagher@opendap.org>
+
+	Removing 'basic' server functions.
+
+	_M   .
+	M    Keywords2.cc
+	M    ConstraintEvaluator.cc
+	M    tests/TestArray.cc
+	M    tests/EXPRTest.at
+	M    Makefile.am
+	M    swath2grid/reproj_functions.cc
+	M    HTTPCache.cc
+	M    util.h
+	M    expr.h
+	M    util.cc
+	M    unit-tests/HTTPCacheTest.cc
+	D    unit-tests/ArrayGeoConstraintTest.cc
+	RM + unit-tests/ancT.cc
+	M    unit-tests/ddsT.cc
+	M    unit-tests/ResponseBuilderTest.cc
+	D    unit-tests/CEFunctionsTest.cc
+	D    unit-tests/GridGeoConstraintTest.cc
+	M    unit-tests/Makefile.am
+	M    unit-tests/Keywords2Test.cc
+
+2013-01-29  James Gallagher <jgallagher@opendap.org>
+
+	Added stuff to svn:ignore
+
+2013-01-29  James Gallagher <jgallagher@opendap.org>
+
+	Added stuff to svn:ignore
+
+2013-01-29  James Gallagher <jgallagher@opendap.org>
+
+	Added stuff to svn:ignore
+
+2013-01-25  Patrick West <pwest@ucar.edu>
+
+	Removing dependency on DAP4 code for DAP3 responses
+	M    ResponseBuilder.h
+	M    ResponseBuilder.cc
+	M    Int64.h
+
+2013-01-25  Patrick West <pwest@ucar.edu>
+
+	Need autoconf 2.61, not 2.62
+	M    configure.ac
+
+2013-01-18  James Gallagher <jgallagher@opendap.org>
+
+	Merge of the code from hyrax 1.8 release (version 3.11.7)
+
+	_M   .
+	A  + gridfields_functions.h
+	M    configure.ac
+	M    Connect.h
+	M    ChangeLog
+	A  + gridfields_functions.cc
+	M    ResponseBuilder.h
+	M    main_page.doxygen
+	A  + DAPCache3.cc
+	A  + DAPCache3.h
+	_M   OSX_Resources
+	M    ConstraintEvaluator.cc
+	M    DDS.cc
+	M    HTTPCacheTable.cc
+	M    Array.cc
+	_M   tests
+	M    tests/TestGrid.cc
+	M    tests/expr-test.cc
+	M    tests/TestStructure.cc
+	M    INSTALL
+	M    DDXParserSAX2.cc
+	M    libdap.spec
+	M    ResponseBuilder.cc
+	M    README
+	M    BaseType.cc
+	M    DDS.h
+	_M   win32/gl
+	M    Makefile.am
+	AM + swath2grid
+	M    DataDDS.cc
+	M    ce_expr.y
+	M    util.h
+	AM + ugridFunctions
+	M    XDRStreamUnMarshaller.cc
+	M    NEWS
+	A  + doxy.conf.in
+	M    Vector.cc
+	A  + main_page.doxygen.in
+	_M   gl
+	M    ce_functions.cc
+	M    expr.h
+	MM   mime_util.cc
+	M    GridGeoConstraint.cc
+	M    Vector.h
+	M    util.cc
+	M    Grid.cc
+	M    Connect.cc
+	_M   unit-tests
+	MM   unit-tests/MIMEUtilTest.cc
+	M    unit-tests/ResponseBuilderTest.cc
+	M    Clause.cc
+	M    Array.h
+	M    doxy.conf
+	M    ce_expr.lex
+
+2012-11-07  James Gallagher <jgallagher@opendap.org>
+
+	Changed svn ignore properties
+
+2012-11-07  James Gallagher <jgallagher@opendap.org>
+
+	Changed svn ignore properties
+
+2012-11-07  James Gallagher <jgallagher@opendap.org>
+
+	Changes for libdap 3.11.7 so that when the CE Function cache
+	directory is not present, caching is off. Before the code was just
+	crashing when a function was used. I also refactored
+	ResponseBuilder (where the fix is) so that it's got less
+	redundancy.
+
+2012-11-02  James Gallagher <jgallagher@opendap.org>
+
+	Release 3.11.6
+
+	M    configure.ac
+	M    ChangeLog
+	M    main_page.doxygen
+	M    tests/package.m4
+	M    INSTALL
+	M    libdap.spec
+	M    README
+	M    NEWS
+	M    doxy.conf
+
+2012-11-02  James Gallagher <jgallagher@opendap.org>
+
+	Fixes for a resource leak in the server function cache code.
+
+	M    ResponseBuilder.cc
+
+2012-10-31  James Gallagher <jgallagher@opendap.org>
+
+	fixed an error in the include of DDXParserSAX2.h - OSX file system
+	case issues
+
+2012-10-24  James Gallagher <jgallagher@opendap.org>
+
+	Changed svn ignore properties
+
+2012-10-24  James Gallagher <jgallagher@opendap.org>
+
+	Changes so that users - handlers primarily - of libdap don't have to
+	change their link libraries even though ResponseBuilder has the new
+	caching code. The first version used Connect, this version uses hacked
+	copies of (tiny) parts of Connect. This keeps the handlers from needing
+	libdapclient, libcurl and libuuid to link.
+
+	M    ResponseBuilder.h
+	M    ResponseBuilder.cc
+	M    Makefile.am
+	M    mime_util.cc
+
+2012-10-24  James Gallagher <jgallagher@opendap.org>
+
+	Fixes both from a code review and to move Connect into libdap proper
+	so that clients will link correctly (now that Connect is used both by
+	clients and servers.
+
+	M    HTTPCacheTable.cc
+	M    ResponseBuilder.cc
+	M    Makefile.am
+	M    util.cc
+	M    Connect.cc
+
+2012-10-24  James Gallagher <jgallagher@opendap.org>
+
+	Changed svn ignore properties
+
+2012-10-24  James Gallagher <jgallagher@opendap.org>
+
+	Added DAPCache3.
+
+2012-10-24  James Gallagher <jgallagher@opendap.org>
+
+2012-10-24  James Gallagher <jgallagher@opendap.org>
+
+	Changed svn ignore properties
+
+2012-10-23  James Gallagher <jgallagher@opendap.org>
+
+	These changes support server functions in DAP2 using the F-TDS/GDS 'in
+	path' syntax. They aslo add support for retrieving the DDS and DAS from
+	URLs with functions (both the F-TDS/GDS syntax and ours) and cache the
+	results of function calls.
+
+	M    Connect.h
+	M    ResponseBuilder.h
+	M    ConstraintEvaluator.cc
+	M    DDS.cc
+	M    tests/TestGrid.cc
+	M    tests/expr-test.cc
+	M    tests/TestStructure.cc
+	M    DDXParserSAX2.cc
+	M    ResponseBuilder.cc
+	M    BaseType.cc
+	M    DDS.h
+	M    Makefile.am
+	M    ce_expr.y
+	M    XDRStreamUnMarshaller.cc
+	M    Vector.cc
+	M    ce_functions.cc
+	M    mime_util.cc
+	M    GridGeoConstraint.cc
+	M    Connect.cc
+	M    unit-tests/ResponseBuilderTest.cc
+	M    Clause.cc
+
+2012-09-28  James Gallagher <jgallagher@opendap.org>
+
+	Changed to using named branches for the server release.
+
+	A    https://scm.opendap.org/svn/branch/libdap/hyrax-1.8-release
+
+2012-07-26  James Gallagher <jgallagher@opendap.org>
+
+	Memory leak in XDRStreamMarshaller fixed.
+
+2012-07-26  James Gallagher <jgallagher@opendap.org>
+
+	Found and fixed an error in the add_var_nocopy() method for DDS. I
+	also added add_var_nocopy() methods to Vector and Array and noted
+	that when a BaseType is passed to Array's ctor the add_var()
+	method is used, thus making a copy. If the 'nocopy' behavior is
+	desired, then pass null to the ctor and call add_var_nocopy() 'by
+	hand.' I also changed two instances of dynamic_cast so that
+	static_cast is used instead. These changes are backward compatible
+	to the previous version of the library. Bumped the version up to
+	3.12.0
+
+2012-07-26  James Gallagher <jgallagher@opendap.org>
+
+	Memory leak in XDRStreamMarshaller fixed.
+
+2012-07-26  James Gallagher <jgallagher@opendap.org>
+
+	Found and fixed an error in the add_var_nocopy() method for DDS. I
+	also added add_var_nocopy() methods to Vector and Array and noted
+	that when a BaseType is passed to Array's ctor the add_var()
+	method is used, thus making a copy. If the 'nocopy' behavior is
+	desired, then pass null to the ctor and call add_var_nocopy() 'by
+	hand.' I also changed two instances of dynamic_cast so that
+	static_cast is used instead. These changes are backward compatible
+	to the previous version of the library. Bumped the version up to
+	3.12.0
+
+2012-06-27  James Gallagher <jgallagher@opendap.org>
+
+	Removed errant instrumentation in serialize()
+
+2012-06-22  James Gallagher <jgallagher@opendap.org>
+
+	Added some debugging output for/because of work on the GDAL handler.
+
+2012-06-05  James Gallagher <jgallagher@opendap.org>
+
+	Fixed an error in the MIMEUtilTest code. The test failed when the
+	time zone was to the east of the prime meridian. See ticket 1907.
+
+2012-05-31  James Gallagher <jgallagher@opendap.org>
+
+	doxygen updates plus added an example function for the MIIC folks to
+	ce_functions.cc.
+
+	M    configure.ac
+	M    main_page.doxygen
+	M    ConstraintEvaluator.cc
+	A    doxy.conf.in
+	A    main_page.doxygen.in
+	M    ce_functions.cc
+	M    doxy.conf
+
+2012-05-11  Nathan Potter <ndp@coas.oregonstate.edu>
+
+	libdap: updating version number
+
+2012-04-24  James Gallagher <jgallagher@opendap.org>
+
+	Fixed lack of loop index init in setup().
+
+2012-04-17  James Gallagher <jgallagher@opendap.org>
+
+	Updated NEWS
+
+	M    NEWS
+
+2012-04-12  James Gallagher <jgallagher@opendap.org>
+
+	Result of merging changes from the trunk. This code was then merged to
+	the trunk and tagged.
+
+	_M   .
+	M    configure.ac
+	M    ChangeLog
+	_M   OSX_Resources/Info.plist.proto
+	M    HTTPCacheTable.cc
+	_M   tests/old_tests/grid-func-testsuite
+	_M   tests/old_tests/server-testsuite
+	M    tests/TestArray.cc
+	M    tests/package.m4
+	M    ResponseBuilder.cc
+	M    Makefile.am
+	_M   mime_util.h
+	M    Structure.cc
+	M    Vector.cc
+	_M   mime_util.cc
+	M    XDRStreamMarshaller.h
+	M    XDRStreamMarshaller.cc
+	M    Grid.cc
+	_M   unit-tests/MIMEUtilTest.cc
+	_M   unit-tests/fdiostreamTest.cc
+	M    unit-tests/Makefile.am
+	M    unit-tests/MarshallerTest.cc
+	M    HTTPConnect.h
+	_M   fdiostream.h
+
+2012-04-11  James Gallagher <jgallagher@opendap.org>
+
+	Removed the 'override' file feature - it was never used and its implementaion
+	was a problem.
+
+	M    HTTPCacheTable.cc
+	M    mime_util.h
+	M    mime_util.cc
+	M    XDRStreamMarshaller.cc
+
+2012-02-16  James Gallagher <jgallagher@opendap.org>
+
+	Added unistd .h to ResponseBuilder.cc
+
+2012-02-07  James Gallagher <jgallagher@opendap.org>
+
+	Version 3.11.3
+
+2012-02-07  James Gallagher <jgallagher@opendap.org>
+
+	Removed the static curl libs from dap-config.
+
+;; Local Variables:
+;; coding: utf-8
+;; End:
+
+2012-02-07  James Gallagher <jgallagher@opendap.org>
+
+	Removed the static curl libs from dap-config.
+
+2012-01-17  James Gallagher <jgallagher@opendap.org>
+
+	News was updated.
+
+	M    NEWS
+
+2012-01-10  James Gallagher <jgallagher@opendap.org>
+
+	Update for Hyrax 1.8 release.
+
+	M    ChangeLog
+	M    tests/package.m4
+	M    INSTALL
+	M    README
+	M    NEWS
+
+2012-01-04  James Gallagher <jgallagher@opendap.org>
+
+	version number bump in NEWS
+
+2011-12-30  James Gallagher <jgallagher@opendap.org>
+
+	Bumped up the versions in libdap to 3.11.2. Not sure if this will
+	be the version number we use for the release.
+
+2011-12-30  James Gallagher <jgallagher@opendap.org>
+
+	Fixed the rpm build; included the man page stuff.
+
+	M    libdap.spec
+
+2011-12-30  James Gallagher <jgallagher@opendap.org>
+
+	Added HTTPCacheMacros.h
+
+2011-12-29  James Gallagher <jgallagher@opendap.org>
+
+	Fixes for distcheck given the new man pages
+
+	M    Makefile.am
+
+2011-12-29  James Gallagher <jgallagher@opendap.org>
+
+	Added man pages for getdap and dap-config
+
+	M    Makefile.am
+	A    getdap.man1
+	A    dap-config.man1
+
+2011-12-29  James Gallagher <jgallagher@opendap.org>
+
+	Removed calls to exit(). Fixed the FSF address. Half of ticket 1868.
+
+2011-12-19  James Gallagher <jgallagher@opendap.org>
+
+	comment fixes
+
+2011-11-30  James Gallagher <jgallagher@opendap.org>
+
+	Formatting, Spelling and an error message's text fixed.
+
+2011-11-30  James Gallagher <jgallagher@opendap.org>
+
+	Fix for Fedora builds; the extra newlines in these baseline files are
+	likely breaking the tests
+
+	M    tests/expr-testsuite/test.6b.base
+	M    tests/expr-testsuite/test.5e.base
+
+2011-11-23  Patrick West <pwest@ucar.edu>
+
+	With HTTPConnect including CURL headers, added CURL_CFLAGS to the
+	--cflags option M dap-config.in
+
+2011-11-23  Patrick West <pwest@ucar.edu>
+
+	CURL_CFLAGS was not being used when compiling tests. Added.
+	M    unit-tests/Makefile.am
+
+2011-11-23  Patrick West <pwest@ucar.edu>
+
+	curl includes were not being included properly. Works if in common
+	place, but not if in custom location. M tests/Makefile.am
+
+2011-11-23  Patrick West <pwest@ucar.edu>
+
+	curl/types.h is deprecated and no longer needed
+	M    HTTPConnect.h
+
+2011-11-16  James Gallagher <jgallagher@opendap.org>
+
+	AttrTable was using id2www() to escape spaces and other characters
+	in attribute names. This was done probably because of the
+	spaces (spaces in the attribute names break the DAP2 DAS object
+	parser), but no matter. It was breaking DAS and DDX objects
+	because names with '%' characters in them were mangled. I replaced
+	id2www and www2id with new functions that encode/decode only
+	spaces. I have not fiddled with the find functions; it's fine to
+	use names with spaces in them with the API, but the printed
+	representation of the DAS will show those spaces as %20.
+	Similarly, when the printed representation is parsed, those %20
+	escape codes are replaced with real spaces. This means that the
+	names in the binary objects and XML representation are correct.
+
+2011-11-15  James Gallagher <jgallagher@opendap.org>
+
+	Fix for ticket 1841 - the xml attribute 'base' in the Dataset root
+	element should have been preceeded by the namespace 'xml'. It is now.
+
+2011-11-13  James Gallagher <jgallagher@opendap.org>
+
+	Fixed, I hope, the problem with the xmlTextWriter code in version
+	2.6 of libxml. I think what was happening was really tripping over
+	an odd feature of the xmlTextWriter API where the TextWriter
+	object has to be freed before the pointer it has been writing to
+	can be used. Actually, I suspect that freeing the object calls the
+	buffer flush function, so calling that would probably work, too. I
+	opted for the call sequence in the only example I can dig up...
+
+2011-11-13  James Gallagher <jgallagher@opendap.org>
+
+	Fix for ticket 1837. The code libxml2 was escaping attributes with
+	with OtherXML, turning them into useless goo. I switched from the
+	...WriteString to ...WriteRaw function for this type of attribute
+	and order was restored.
+
+2011-10-31  Patrick West <pwest@ucar.edu>
+
+	The code was printing a blank line when certain conditions existed.
+	Removed that code.
+	M    DDS.cc
+
+2011-10-26  James Gallagher <jgallagher@opendap.org>
+
+	Updates for the new DDX tests... nearly done
+
+2011-10-24  Patrick West <pwest@ucar.edu>
+
+	Forgot a quote
+	M    dap-config.in
+
+2011-10-24  Patrick West <pwest@ucar.edu>
+
+	Added xml2 includes to cflags
+	M    dap-config.in
+
+2011-10-24  James Gallagher <jgallagher@opendap.org>
+
+	some poking around regarding the DDX/XML bug (1829). Doesn't look
+	like it's in libdap. Some cleanup, though.
+
+2011-10-24  James Gallagher <jgallagher@opendap.org>
+
+	Fixed the distcheck target.
+
+	M    unit-tests/dasT.cc
+	M    unit-tests/AISMergeTest.cc
+	M    unit-tests/MIMEUtilTest.cc
+	M    unit-tests/ddsT.cc
+	M    unit-tests/ByteTest.cc
+	M    unit-tests/Makefile.am
+
+2011-10-24  Nathan Potter <ndp@coas.oregonstate.edu>
+
+	libdap: Fixed problems with libxml dependencies.
+
+2011-10-21  James Gallagher <jgallagher@opendap.org>
+
+	Added testFle.h in unit-tests
+
+2011-10-21  James Gallagher <jgallagher@opendap.org>
+
+	Added libparsers_la_CPPFLAGS so that -I for libxml2 will be used
+	when building the grammar files (really only needed for the DAS
+	stuff?). Also fixed minor warning in HTTPCache where a File* could
+	be used uninitialized.
+
+	M    Makefile.am
+	M    HTTPCache.cc
+
+2011-10-21  James Gallagher <jgallagher@opendap.org>
+
+	I added a new method to DDS that can insert a variable anywhere in
+	the DDS. I also added 'nocopy' versions of the new insert_var()
+	method and the older ad_var() method. Once the ncml handler
+	stabilizes, we can start using those methods to boost performance.
+	Lastly, I forgot to add the new XMLWriter class on the last
+	commit,
+
+2011-10-12  James Gallagher <jgallagher@opendap.org>
+
+	I added a new method to BaseType, DDS and DAS: print_xml_writer()
+	that takes a XMLWriter object and uses libxml2's xml writer API to
+	build the DDX response. This should fix all of our woes WRT xml
+	encoding. The new method is called by the DDS::print_xml method
+	although it could be used in place of that method since it has the
+	same parameters. I added tests and, in the course of that,
+	modified the way some of the tests are done (using files instead
+	of string variables for the regexs). I also tried adding some
+	globbing functions to the util.cc file but those proved less than
+	totally useful - I've left them there all the same.
+
+2011-09-23  James Gallagher <jgallagher@opendap.org>
+
+	Fix for the unit test of get_request_size(). For this function,
+	different compilers return different values for sizeof(string) so
+	I made the unit test an OR of two values. Fixed here on the branch
+	and on the trunk.
+
+	M    unit-tests/DDSTest.cc
+
+2011-09-21  James Gallagher <jgallagher@opendap.org>
+
+	Hyrax 1.8
+
+	A    http://scm.opendap.org/svn/branch/libdap/3.11.2
+
+2011-09-13  James Gallagher <jgallagher@opendap.org>
+
+	Refactor - no change to the ABI.
+
+2011-08-24  James Gallagher <jgallagher@opendap.org>
+
+	Merge of Hyrax 1.7.1
+
+	_M   .
+	_M   OSX_Resources/Info.plist.proto
+	M    DAS.h
+	M    DDS.cc
+	_M   tests/old_tests/grid-func-testsuite
+	_M   tests/old_tests/server-testsuite
+	M    tests/expr-testsuite/test.6b.base
+	M    DDS.h
+	M    BaseType.cc
+	M    Constructor.h
+	M    AttrTable.cc
+	_M   mime_util.h
+	_M   mime_util.cc
+	M    Constructor.cc
+	M    unit-tests/cache-testsuite/Makefile.am
+	_M   unit-tests/MIMEUtilTest.cc
+	_M   unit-tests/fdiostreamTest.cc
+	_M   fdiostream.h
+
+2011-07-15  James Gallagher <jgallagher@opendap.org>
+
+	Fixed an issues with the response too big error message - the sizes were returned in Bytes, but the units were listed as KB. Now the values are in KB (truncated, but good enough).
+
+2011-06-30  Patrick West <pwest@ucar.edu>
+
+	Merge hyrax 1.7 branch to trunk
+
+2011-06-09  James Gallagher <jgallagher@opendap.org>
+
+	Added support for the first version of response size limits - does not do much for Sequences.
+
+2011-05-30  James Gallagher <jgallagher@opendap.org>
+
+	Added get/set_response_limit() and get_request_size() (first version) to libdap:DDS.
+
+2011-05-10  James Gallagher <jgallagher@opendap.org>
+
+	Added --with-curl and --with-xml2 to configure.
+
+2011-04-25  James Gallagher <jgallagher@opendap.org>
+
+	Removed doc rpm - this breaks when the build hosts lacks dot or
+	dot does not make inamges.
+
+	M    libdap.spec
+
+2011-04-20  James Gallagher <jgallagher@opendap.org>
+
+	Hyrax 1.7 releaseHyrax 1.7 release
+
+	A    http://scm.opendap.org/svn/branch/libdap/3.11.1
+
+2011-04-08  James Gallagher <jgallagher@opendap.org>
+
+	Build fixes for h 1.7 osx meta package
+
+	M    Makefile.am
+
+2011-03-28  James Gallagher <jgallagher@opendap.org>
+
+	Loop/Race-condition in HTTPCacheTable.h fixed
+
+2011-03-28  James Gallagher <jgallagher@opendap.org>
+
+	1.7RC1
+
+2011-03-17  Nathan Potter <ndp@coas.oregonstate.edu>
+
+	libdap: Automated change of version number for OSX package builds.
+
+2011-03-08  James Gallagher <jgallagher@opendap.org>
+
+	Merge for hyrax 1.7 from the hyrax_1.6.2_release branch of shrew
+	to the trunk
+
+	_M   .
+	M    RValue.cc
+	M    DODSFilter.cc
+	M    OSX_Resources/InstallationCheck
+	M    OSX_Resources/update_mac_package_contents.pl
+	R  + OSX_Resources/Info.plist
+	A  + OSX_Resources/Info.plist.proto
+	M    DDS.cc
+	M    Array.cc
+	_M   tests/old_tests/grid-func-testsuite
+	_M   tests/old_tests/server-testsuite
+	M    DDXParserSAX2.cc
+	M    AlarmHandler.h
+	M    libdap.spec
+	M    BaseType.cc
+	M    Makefile.am
+	_M   mime_util.h
+	M    Vector.cc
+	M    ce_functions.cc
+	MM   mime_util.cc
+	M    GridGeoConstraint.cc
+	M    Constructor.cc
+	M    DAS.cc
+	M    Grid.cc
+	M    escaping.cc
+	_M   unit-tests/MIMEUtilTest.cc
+	_M   unit-tests/fdiostreamTest.cc
+	_M   fdiostream.h
+	M    Clause.cc
+
+2011-03-03  Patrick West <pwest@ucar.edu>
+
+	These files are generated
+	D    gl/alloca.h
+	D    gl/arg-nonnull.h
+	D    gl/langinfo.h
+	D    gl/stdint.h
+	D    gl/c++defs.h
+	D    gl/wctype.h
+	D    gl/warn-on-use.h
+	D    gl/wchar.h
+	D    gl/unistd.h
+
+2011-03-03  James Gallagher <jgallagher@opendap.org>
+
+	All tests back in.
+
+	M    unit-tests/HTTPConnectTest.cc
+
+2011-03-03  James Gallagher <jgallagher@opendap.org>
+
+	Fixed HTTPCache hack that provides access to the cached response
+	body. Also fixed an error in Keywords that broke a gazillion
+	tests.
+
+2011-03-03  James Gallagher <jgallagher@opendap.org>
+
+	Eh - ctor fix for Keywords
+
+2011-03-03  James Gallagher <jgallagher@opendap.org>
+
+	Keywords2 was modified so it'll build on older (4.1) gcc
+	compilers (with an older stl implementation).
+
+2011-03-02  James Gallagher <jgallagher@opendap.org>
+
+	Modified HTTPConnect to store the filename of the cached body when
+	returning cached responses. Use the HTTPResponse::get_file()
+	method to use this. Once the HTTPResponse is deleted, the name is
+	no loner valid.
+
+2011-03-01  James Gallagher <jgallagher@opendap.org>
+
+	Added Keywords to DDS and modified the behavior of set_dap_version
+	so that '2' parses as '2.0' (really 'x' --> 'x.0').
+
+2011-03-01  Patrick West <pwest@ucar.edu>
+
+	Created from .in file.
+	D    gl/stdlib.h
+
+2011-02-28  Patrick West <pwest@ucar.edu>
+
+	added include of cstring for strlen and strncpy
+	M    ResponseBuilder.cc
+
+2011-02-25  James Gallagher <jgallagher@opendap.org>
+
+	Removed old Keywords impl.
+
+2011-02-25  James Gallagher <jgallagher@opendap.org>
+
+	Keywords2 now tests for legal values.
+
+2011-02-25  James Gallagher <jgallagher@opendap.org>
+
+	Keywords2 works - this syntax looks like functions but is to be parsed before the CE is formally processed.
+
+2011-02-25  James Gallagher <jgallagher@opendap.org>
+
+	Keywrods2Test.cc...
+
+2011-02-25  James Gallagher <jgallagher@opendap.org>
+
+	Keywords2...
+
+2011-02-24  James Gallagher <jgallagher@opendap.org>
+
+	new Keywords implementations started.
+
+2011-02-24  James Gallagher <jgallagher@opendap.org>
+
+	Next version of Keywords - This implements the version where keywords are bound to a pair made up of a kind and a value. Probably won't use this because of potential problems with ambiguity - it's not possible to guarantee that 'dap3.2' won't be an identifier in a data set.
+
+2011-02-24  James Gallagher <jgallagher@opendap.org>
+
+	g++ 4.? warnings about char* conversion in HTTPConnectTest
+
+2011-02-24  James Gallagher <jgallagher@opendap.org>
+
+	New Keywords class first version working/tested
+
+2011-02-23  James Gallagher <jgallagher@opendap.org>
+
+	Factored keywords out of ResponseBuilder and into their own class (Keywords).
+
+2011-02-15  Patrick West <pwest@ucar.edu>
+
+	This file is automatically generated
+	D    gl/configmake.h
+
+2011-02-08  James Gallagher <jgallagher@opendap.org>
+
+	Initial cut at support for Version information in the CE.
+
+2011-02-08  James Gallagher <jgallagher@opendap.org>
+
+	I modified the documentation for mime_util and ResponseBuilder so that they describe a truer version of the world - most of the MIME header code is no longer used by libdap or the BES/handlers (instead the headers are added by the OLFS). Some of the mime_util code is used by the client side, however, and a tiny bit is used by the parts of ResponseBuilder I added so that the BES can use ResponseBuilder in those cases where there is no OLFS.
+
+2011-02-08  James Gallagher <jgallagher@opendap.org>
+
+	Reverted to pre-DAP4 hack versions of these... The new features are
+	implemented in ResponseBuilder.
+
+	M    DODSFilter.cc
+	M    DODSFilter.h
+
+2011-02-07  James Gallagher <jgallagher@opendap.org>
+
+	ResponseBuilder now assumes that the default protocol for a response is the DAP_PROTOCOL_VERSION read from config.h. This can be overridden using a parameter to the various set_mime_*() methods it defines (which are different from those in mime_util.cc). NB: These are not used by Hyrax, but the BES might use these sometimes and I've got mods pending in the BES to use this code.
+
+2011-02-07  James Gallagher <jgallagher@opendap.org>
+
+	Comments about ResponseBuilder
+
+2011-02-07  James Gallagher <jgallagher@opendap.org>
+
+	Comments about ResponseBuilder
+
+2011-02-07  James Gallagher <jgallagher@opendap.org>
+
+	Comments about ResponseBuilder
+
+2011-02-07  James Gallagher <jgallagher@opendap.org>
+
+	Added comment about ResponseBuilder
+
+2011-02-07  James Gallagher <jgallagher@opendap.org>
+
+	Added comment about ResponseBuilder
+
+2011-02-03  James Gallagher <jgallagher@opendap.org>
+
+	These are templates needed by the code in 'gl.' I think ...
+
+	A    conf/c++defs.h
+	A    conf/warn-on-use.h
+	A    conf/arg-nonnull.h
+
+2011-02-02  James Gallagher <jgallagher@opendap.org>
+
+	Removed these files as a result of the massive commit
+
+	D    gl/m4/wchar.m4
+	D    gl/m4/ulonglong.m4
+	D    gl/m4/absolute-header.m4
+	D    gl/m4/wctype.m4
+	D    gl/alloca_.h
+	D    gl/wchar_.h
+	D    gl/stdint_.h
+	D    gl/stdbool_.h
+	D    gl/unistd_.h
+	D    gl/wctype_.h
+	D    gl/stdlib_.h
+	D    gl/alloca.c
+
+2011-02-02  James Gallagher <jgallagher@opendap.org>
+
+	Added as part of the massive update.
+
+	A    gl/m4/fcntl-o.m4
+	A    gl/m4/configmake.m4
+	A    gl/m4/btowc.m4
+	A    gl/m4/00gnulib.m4
+	A    gl/m4/locale-fr.m4
+	A    gl/m4/langinfo_h.m4
+	A    gl/m4/mbsinit.m4
+	A    gl/m4/warn-on-use.m4
+	A    gl/m4/wchar_h.m4
+	A    gl/m4/wcrtomb.m4
+	A    gl/m4/locale-zh.m4
+	A    gl/m4/stddef_h.m4
+	A    gl/m4/mbstate_t.m4
+	A    gl/m4/wctype_h.m4
+	A    gl/m4/nl_langinfo.m4
+	A    gl/m4/locale-ja.m4
+	A    gl/m4/wchar_t.m4
+	A    gl/m4/multiarch.m4
+	A    gl/alloca.h
+	A    gl/arg-nonnull.h
+	A    gl/langinfo.h
+	A    gl/mbsinit.c
+	A    gl/stdint.h
+	A    gl/wcrtomb.c
+	A    gl/btowc.c
+	A    gl/c++defs.h
+	A    gl/warn-on-use.h
+	A    gl/wctype.h
+	A    gl/streq.h
+	A    gl/alloca.in.h
+	A    gl/langinfo.in.h
+	A    gl/configmake.h
+	A    gl/verify.h
+	A    gl/wchar.h
+	A    gl/iswblank.c
+	A    gl/mbrtowc.c
+	A    gl/wchar.in.h
+	A    gl/stdint.in.h
+	A    gl/stdbool.in.h
+	A    gl/unistd.in.h
+	A    gl/stddef.in.h
+	A    gl/wctype.in.h
+	A    gl/nl_langinfo.c
+	A    gl/stdlib.in.h
+
+2011-02-02  James Gallagher <jgallagher@opendap.org>
+
+	Massive (and massively overdue) updates - this may be the fix for ticket #1702
+	But regardless, it's certainly needed.
+
+	M    gl/m4/wint_t.m4
+	M    gl/m4/localcharset.m4
+	M    gl/m4/stdint.m4
+	M    gl/m4/stdbool.m4
+	M    gl/m4/gnulib-common.m4
+	M    gl/m4/malloc.m4
+	M    gl/m4/regex.m4
+	M    gl/m4/gnulib-comp.m4
+	M    gl/m4/mbrtowc.m4
+	M    gl/m4/unistd_h.m4
+	M    gl/m4/longlong.m4
+	M    gl/m4/ssize_t.m4
+	M    gl/m4/include_next.m4
+	M    gl/m4/gnulib-cache.m4
+	M    gl/m4/glibc21.m4
+	M    gl/m4/codeset.m4
+	M    gl/m4/stdlib_h.m4
+	M    gl/m4/gnulib-tool.m4
+	M    gl/m4/alloca.m4
+	M    gl/m4/extensions.m4
+	M    gl/localcharset.c
+	M    gl/regex_internal.c
+	M    gl/malloc.c
+	M    gl/localcharset.h
+	M    gl/regex_internal.h
+	M    gl/regexec.c
+	M    gl/ref-del.sin
+	M    gl/stdlib.h
+	M    gl/regcomp.c
+	M    gl/ref-add.sin
+	M    gl/regex.c
+	M    gl/unistd.h
+	M    gl/config.charset
+	M    gl/regex.h
+	M    gl/Makefile.am
+	M    gl/gettext.h
+
+2011-02-02  James Gallagher <jgallagher@opendap.org>
+
+	Corrected
+
+2011-01-31  James Gallagher <jgallagher@opendap.org>
+
+	Expanded DDS so that it's easier to get the protocol version string; moved the relevant MIME header code into ResponseBuilder on the assumption that someone might be using this still (like CEDAR). Updated the unit tests.
+
+2011-01-29  James Gallagher <jgallagher@opendap.org>
+
+	Leaner version of ResponseBuilder - the new replacement for DODSFilter.
+
+2011-01-28  James Gallagher <jgallagher@opendap.org>
+
+	Commented out test code that got in SVN by mistake (in expr-test.cc)
+
+2011-01-28  James Gallagher <jgallagher@opendap.org>
+
+	Changes/Additions for Version via Projection Functions and/or Keywords.
+
+2010-10-28  mjohnson
+
+	Merge from Hyrax 1.6.2 Shrew Release Branch.
+
+	Not clear what the property modifications are, the ones I checked seem the same.  I'm just letting them go since they seem harmless.
+
+2010-09-14  James Gallagher <jgallagher@opendap.org>
+
+	Fixed a bug in the www2id() function of escaping.cc that was causing symbols that start with a percent sign to be mangled. It's not clear why the server was/is using this, but this fixes the function and we'll have to sort out whether using the function is correct later. It may be that the BES is routing the DAS through an unnecessary cycle of print/parse/print operations.
+
+2010-09-14  James Gallagher <jgallagher@opendap.org>
+
+	Added tests for www2id() and the case where an attribute starts with a percent sign.
+
+2010-09-14  James Gallagher <jgallagher@opendap.org>
+
+	Spelling errors in GeoConstraint.cc
+
+2010-09-14  James Gallagher <jgallagher@opendap.org>
+
+	Fixed an error in calling long_to_string with doubles in exception handling code - found during testing.
+
+2010-09-14  James Gallagher <jgallagher@opendap.org>
+
+	Updated for fixes to a problem foud in initial testing of the server for the 1.6.2 release.
+
+2010-09-14  James Gallagher <jgallagher@opendap.org>
+
+	Added a second version of eval_function_clauses() that takes and returns a DataDDS instead of a DDS. This enables easier use of the method in handlers that are using subclasses of the types and building responses from DataDDS objects passed around in the BES. I also updated some of the library version information in configure.ac to match more closely the addition to ConstraintEvaluator's interface.
+
+;; Local Variables:
+;; coding: utf-8
+;; End:
+2010-09-14  James Gallagher <jgallagher@opendap.org>
+
+	Added a second version of eval_function_clauses() that takes and
+	returns a DataDDS instead of a DDS. This enables easier use of the
+	method in handlers that are using subclasses of the types and
+	building responses from DataDDS objects passed around in the BES.
+	I also updated some of the library version information in
+	configure.ac to match more closely the addition to
+	ConstraintEvaluator's interface.
+
+2010-09-13  James Gallagher <jgallagher@opendap.org>
+
+	Changes for 3.11.0 release
+
+	M    configure.ac
+	M    ChangeLog
+	M    INSTALL
+	M    libdap.spec
+	M    README
+	M    NEWS
+	M    ce_functions.cc
+
+2010-09-07  James Gallagher <jgallagher@opendap.org>
+
+	Added to doc comments
+
+2010-09-03  James Gallagher <jgallagher@opendap.org>
+
+	Updated the version number for geogrid.
+
+2010-09-02  James Gallagher <jgallagher@opendap.org>
+
+	Constraint expressions can now include multiple function calls.
+	Two tests included. Some fixes were added to expr-test.cc which
+	was looking a little long in the tooth... 
+
+2010-09-01  James Gallagher <jgallagher@opendap.org>
+
+	Added new functions to ConstraintEvaluator. Untested.
+
+2010-09-01  mjohnson
+
+	o Fix for memory bug in ticket #1637.
+
+2010-08-27  James Gallagher <jgallagher@opendap.org>
+
+	Grid now prints the XML declaration correctly when a constrained
+	Grid variable's type decays to a Structure. The expr-test program
+	now has an XML option (-x) for use with constrained DDS/DDX
+	output.
+
+2010-08-27  James Gallagher <jgallagher@opendap.org>
+
+	Fixed the Grid projection bug - should clean up the code a bit.
+	The error was in projection yields grid which was not correctly
+	testing that each Grid dimension had a matching Map vector that
+	was in the current projection.
+
+2010-08-27  James Gallagher <jgallagher@opendap.org>
+
+	Added regression tests for the new version of geogrid().
+	Removed some old stuff from the dejagnu days.
+
+2010-08-27  James Gallagher <jgallagher@opendap.org>
+
+	Added more tests (unit tests) for GridGeoConstraint for the Grid,
+	Array, Array, ..., version of the constructor.
+
+2010-08-27  James Gallagher <jgallagher@opendap.org>
+
+	geogrid() now takes both (grid, <box points>) and (grid, lat
+	array, lon array <box points>). This includes some minimal testing
+	of the new code.
+
+2010-08-26  James Gallagher <jgallagher@opendap.org>
+
+	Changes to the geogrid function so that it can take lat/lon maps
+	as explicit arguments.
+
+2010-07-16  James Gallagher <jgallagher@opendap.org>
+
+	I removed the AIS functions in libdap 3.8 but failed to correctly
+	set the Age of the library in libdap 3.10. Fixed.
+
+2010-06-17  mjohnson
+
+	Removed debug AM_CXXFLAGS entries.
+
+2010-05-24  James Gallagher <jgallagher@opendap.org>
+
+	Updated tests given that the nph-dods alias is no longer supported by
+	test.opendap.org
+
+	M    unit-tests/HTTPCacheTest.cc
+	M    unit-tests/generalUtilTest.cc
+
+2010-05-19  Patrick West <pwest@ucar.edu>
+
+	Seems to fix bug #1563. When adding an attribute table to the DAS when a
+	container is currently set, set that new attribute table to not be
+	global using set_is_global_attribute(false)
+	
+	M    DAS.cc
+
+2010-05-12  James Gallagher <jgallagher@opendap.org>
+
+	Fixed etag for 304 response test - the etag changed when the server was
+	updated.
+
+	M    unit-tests/HTTPConnectTest.cc
+
+2010-05-11  James Gallagher <jgallagher@opendap.org>
+
+	Merge from the shrew-1.6 branch (which was tagged 3.10.2)
+
+	_M   .
+	M    SignalHandler.cc
+	M    configure.ac
+	M    ChangeLog
+	M    conf/libdap.m4
+	M    DDS.cc
+	M    BaseType.h
+	_M   tests/old_tests/grid-func-testsuite
+	_M   tests/old_tests/server-testsuite
+	M    tests/das-test.cc
+	M    tests/package.m4
+	M    tests/DASTest.at
+	M    tests/DDSTest.at
+	M    tests/expr-test.cc
+	M    tests/EXPRTest.at
+	M    tests/Makefile.am
+	M    tests/dds-test.cc
+	M    INSTALL
+	M    DDXParserSAX2.cc
+	M    libdap.spec
+	M    README
+	M    DDS.h
+	M    BaseType.cc
+	M    Makefile.am
+	M    Constructor.h
+	M    RCReader.cc
+	M    parser-util.cc
+	M    AttrTable.cc
+	_M   mime_util.h
+	M    Grid.h
+	M    NEWS
+	M    ce_functions.cc
+	M    AttrTable.h
+	_M   mime_util.cc
+	M    Constructor.cc
+	M    Grid.cc
+	M    Connect.cc
+	M    escaping.cc
+	M    unit-tests/DODSFilterTest.cc
+	M    unit-tests/DDSTest.cc
+	_M   unit-tests/MIMEUtilTest.cc
+	MM   unit-tests/fdiostreamTest.cc
+	M    unit-tests/generalUtilTest.cc
+	M    unit-tests/dds-testsuite/test.19b.das
+	M    unit-tests/dds-testsuite/test.19e.das
+	M    unit-tests/dds-testsuite/test.19g.das
+	A  + unit-tests/dds-testsuite/coads_climatology.nc.dds
+	A  + unit-tests/dds-testsuite/coads_climatology.nc.das
+	M    unit-tests/Makefile.am
+	M    unit-tests/RCReaderTest.cc
+	M    unit-tests/MarshallerTest.cc
+	_M   fdiostream.h
+
+2010-05-11  James Gallagher <jgallagher@opendap.org>
+
+	ci prior to merge
+
+	M    tests/DASTest.at
+	M    tests/DDSTest.at
+	M    tests/EXPRTest.at
+
+2010-04-30  James Gallagher <jgallagher@opendap.org>
+
+	Fixed an error in AttrTable::is_global_attribute() where the function did not
+	always return a value.
+
+	M    AttrTable.cc
+
+2010-04-30  James Gallagher <jgallagher@opendap.org>
+
+	Commented the fdiostreamTest stuff - automake was complaining. Removed a
+	bunch of AIS-related things that are no longer needed.
+
+2010-04-30  mjohnson
+
+	AttrTable.cc, AttrTable.h: Changes for #1544. clone() wasn't
+	preserving parent/child ptrs properly leading to dangling
+	pointers.
+
+2010-04-26  Patrick West <pwest@ucar.edu>
+
+	Fixed version check when a (alpha) or b (beta) at the end of the version
+
+	M    conf/libdap.m4
+
+2010-04-22  James Gallagher <jgallagher@opendap.org>
+
+	Modified the transfer_attributes code so that it checks the
+	is_global property for individual attributes and
+	containers (before it was just containers). This entailed a change
+	to AttrTable in both the way it tracks and sets that property.
+	Fixed the unit tests. Several tests became invalid because they
+	tested handler-specific features that are now dealt with in the
+	handlers themselves.
+
+2010-04-22  mjohnson
+
+	Added version update to INSTALL as well for #1540
+
+2010-04-22  Patrick West <pwest@ucar.edu>
+
+	Requires libxml2 2.6.16
+	M    libdap.spec
+
+2010-04-21  James Gallagher <jgallagher@opendap.org>
+
+	Initial check in of the new methods to handle the transfer (copy)
+	of attributes from the DAS to the DDS object. The new approach
+	includes a new set of methods that are defined in BaseType and
+	Constructor that are designed to be subclassed by handlers that
+	build odd DAS objects. The default methods handle merging a DAS
+	the follows the DAP 2.0 and later specs. The method in DDS calls
+	these 'type-based' methods. The old approach is commented out
+	using #if 0 ... #endif.
+
+2010-04-21  mjohnson
+
+	Added #include <cstdarg> for va_start and va_end Some systems
+	don't find it by default.
+
+2010-04-16  mjohnson
+
+	Fixed invalid memory and broken invariant problem with using
+	deleted copy in Grid::add_var(). Ticket #1530 revealed this.
+
+2010-04-15  James Gallagher <jgallagher@opendap.org>
+
+	Added dist-hook target to remove the .svn subdirs that were being included in
+	the dist files.
+
+	M    libdap/Makefile.am
+	M    bes/Makefile.am
+
+2010-04-15  James Gallagher <jgallagher@opendap.org>
+
+	Added Requires: lines to the .spec files for libdap and bes.
+
+2010-03-23  James Gallagher <jgallagher@opendap.org>
+
+	Fixes for distcheck build on 64-bit linux (FC 11)
+
+	M    SignalHandler.cc
+	M    RCReader.cc
+	M    parser-util.cc
+	M    unit-tests/MarshallerTest.cc
+
+2010-03-23  James Gallagher <jgallagher@opendap.org>
+
+	Fixes from the 64-bit linux build. Includes fix for the DAS value issue where
+	values larger than 32-bits were being allowed in int32 attributes.
+
+	M    tests/das-test.cc
+	M    tests/dds-test.cc
+	M    libdap.spec
+	M    Makefile.am
+	M    parser-util.cc
+	M    unit-tests/RCReaderTest.cc
+
+2010-03-23  James Gallagher <jgallagher@opendap.org>
+
+	Removed fdiostream from libdap and from the tests. Changed
+	generalUtilTest to match the new version of id2xml()
+
+2010-03-19  James Gallagher <jgallagher@opendap.org>
+
+	More changes for ticket 1521. Modified the id2xml() function so
+	that it no longer encodes the stuff in an octal escape sequence.
+	However, the value of the <value> element in the DDX _is_ encoded
+	so that things like '<' will be escaped for the XML parser. Also,
+	bumped the version in configure.ac to 3.10.1b. One unit test fails
+	- this is a stop-gap fix so we can come back to that test and this
+	fix later.
+
+2010-03-19  James Gallagher <jgallagher@opendap.org>
+
+	Modified Connect.cc so that the FILE_METHODS are used, which
+	effectively removed the fdiostream.h header from the compilation.
+	Also, the DAP version has been bumped to 3.3 - a fix since libdap
+	included in the hyrax 1.6 beta release said 3.2 by mistake.
+
+2010-03-19  James Gallagher <jgallagher@opendap.org>
+
+	Fixes for ticket 1512. The function id2xml() was being used to
+	encode String (DAP) Attribute values and this was causing problems
+	when those values were not valid UTF-8 characters (e.g., when they
+	were less than 0x20). As a fix we dropped the encoding altogether
+	and fell back to the same encoding used by the DAS for the
+	values (that encoding represents all non ASCII values using octal
+	escape codes). I also fixed one of the unit tests that was
+	explicitly testing for the XDAP header to be 3.2 and made it
+	accept any value.
+
+2010-02-10  Patrick West <pwest@ucar.edu>
+
+	fdiostreamtest.txt file added to EXTRA_DIST
+	M    unit-tests/Makefile.am
+
+2010-02-07  Patrick West <pwest@ucar.edu>
+
+	EXPRTest.at wasn't included in EXTRA_DIST
+	M    tests/Makefile.am
+
+2010-02-05  Patrick West <pwest@ucar.edu>
+
+	Added DISTCLEANFILES to both of these to clean up unit-tests and tests
+	files left around.
+	M    tests/Makefile.am
+	M    unit-tests/Makefile.am
+
+2010-02-05  Patrick West <pwest@ucar.edu>
+
+	Including test_config.h, which has the local definition of abs_srcdir
+	and can be used to find files to load.
+	M    fdiostreamTest.cc
+
+2010-02-05  Patrick West <pwest@ucar.edu>
+
+	Using abs_srcdir instead of just srcdir. This fixes this part of the
+	distcheck problem.
+	M    tests/DASTest.at
+	M    tests/DDSTest.at
+	M    tests/EXPRTest.at
+
+2010-02-05  Patrick West <pwest@ucar.edu>
+
+	README.AIS has been removed
+	M    libdap.spec
+
+2010-02-03  James Gallagher <jgallagher@opendap.org>
+
+	Fixes for autotest that I forgot to check in to the branch.
+	$srcdir/<tool> --> $abs_builddir/<tool>
+
+2010-02-01  James Gallagher <jgallagher@opendap.org>
+
+	Branch for Hyrax 1.6
+
+	A    http://scm.opendap.org/svn/branch/libdap/3.10.0
+
+2010-02-01  James Gallagher <jgallagher@opendap.org>
+
+	Changes for version 3.10.0
+
+	M    configure.ac
+	M    ChangeLog
+	M    INSTALL
+	M    libdap.spec
+	M    README
+	M    NEWS
+
+2010-02-01  James Gallagher <jgallagher@opendap.org>
+
+	Modified the way errors in attribute values are tested for. Now we
+	test errno first, then for values of 0.0 with ptr values non-null.
+	This matches the man page more closely then the old tests.
+
+2010-01-12  James Gallagher <jgallagher@opendap.org>
+
+	Fixed potential read beyond bounds in
+	XDRStreamUnMarshaller::get_vector.
+
+2010-01-12  James Gallagher <jgallagher@opendap.org>
+
+	Fixed return type in
+	Vector::set_value_slice_from_row_major_vector (changed to unsigned
+	int).
+
+2010-01-12  James Gallagher <jgallagher@opendap.org>
+
+	Fixed a comment
+
+2010-01-08  Patrick West <pwest@ucar.edu>
+
+	--clean to clean build and src files for rpmbuild
+	M    Makefile.am
+
+2010-01-07  James Gallagher <jgallagher@opendap.org>
+
+	Changed the documentation for server-side functions so that the
+	bulk of the documentation is now on the web.
+
+2010-01-07  James Gallagher <jgallagher@opendap.org>
+
+	Fixes to geogrid() so that the longitude wrapping feature works
+	and so that if latitude is upside down in the data, it's returned
+	as 'north up' data.
+
+2009-12-29  James Gallagher <jgallagher@opendap.org>
+
+	Shrew build changes that will hopefully lead to a version that we
+	can build using NMI's B&T system. Also, I added 'cccc' targets so
+	that we can take a 'metrics snapshot' without undue pain.
+
+2009-12-23  rduncan
+
+	changes for win32 build
+
+2009-12-03  James Gallagher <jgallagher@opendap.org>
+
+	Added chmod of InstallationCheck script which seems to be needed
+	when buidling on osx 10.5.8.
+
+	M    update_mac_package_contents.pl
+
+2009-12-01  mjohnson
+
+	o Needed to add explicit #include <cstring> in order to find
+	memcpy for Red Hat Enterprise 5 using gcc-4.3.2. Seems they
+	cleaned up headers and you need to be explicit about the include
+	now.
+
+2009-11-30  mjohnson
+
+	Fix for link bug on some platforms: initializing variables in a
+	switch without declaring a local scope block is an error.
+
+2009-11-30  mjohnson
+
+	Fix for link bug on some platforms: initializing variables in a
+	switch without declaring a local scope block is an error.
+
+2009-11-24  mjohnson
+
+	DDS.cc: fixed minor memory leak
+
+	Array.cc, Array.h: added prepend_dim function for adding outer
+	dimensions.
+
+	Grid.h, Grid.cc: added function to set the array part explicitly
+	without copying it. fixed potential memory leaks. added a few
+	extra checks on proper types being set. added function to add maps
+	to (to beginning or end of map vector to support new outer
+	dimensions). made _duplicate protected for subclasses to be able
+	to call it.
+
+2009-11-19  James Gallagher <jgallagher@opendap.org>
+
+	ticket 1399 - Grids that have only one member after projection
+	still must be wrapped in a Structure (because there might be two
+	Grids so projected and they might have members with the same names
+	- this is a real case). The Structures provide for unique FQN as
+	the DAP requires.
+
+2009-11-10  James Gallagher <jgallagher@opendap.org>
+
+	Removed libdapserver from the getdap link.
+
+2009-11-05  James Gallagher <jgallagher@opendap.org>
+
+	I changed how the FILE_METHODS compile-time switch was defined,
+	Now it's defined in the headers and not, directly in the config.h
+	or *.cc files. That was a bug. All tests pass now. I'm going to
+	check this in and then run tests on the entire shrew project.
+
+2009-11-04  James Gallagher <jgallagher@opendap.org>
+
+	Removed lots of accumulated 'old code' and reinstated the
+	FILE_METHODS compilation flag.
+
+2009-11-04  James Gallagher <jgallagher@opendap.org>
+
+	Likely fixes for the win32 build. Test these on a vm.
+
+2009-11-04  James Gallagher <jgallagher@opendap.org>
+
+	tweaks to get the ddx and dataddx responses working with the trunk
+	BES. See getdap's -x (ddx) and -X (DataDDX) responses. These work
+	using the -p x.y switch to set the DAP Accept version to x.y. Also
+	added the -t option to turn on HTTP protocol tracing. The new
+	parser DDXParserSXA2 reads the dapVersion XML attribute and sets
+	the value in the DDS instance. I also modified the Connect class
+	to recognize the dods_ddx and dods-ddx values for
+	Content-Description.
+
+2009-10-22  mjohnson
+
+	Ticket #1442:
+
+	o Fixed several potential memory leaks.
+
+	o set_value now sets length.
+
+	o Refactored cut & pasted sections to use helper funcs.
+
+2009-10-07  mjohnson
+
+	Made simple_find() and simple_find_container() public for callers
+	that require non-recursing lookups.
+
+2009-10-06  James Gallagher <jgallagher@opendap.org>
+
+	I fixed problems with two sets of tests. First, the "Array of
+	structures with child arrays" test was failing because the
+	TestCommon and TestArray classes were not generating valid output
+	in the case where intern_data() was used. Second, the test for
+	String regexes where nothing matched was botched because when a
+	selection is applied to anything other than a Sequence and nothing
+	is selected the response from the server is broken. This will be
+	an issue for DAP4. In place of the test that used a Structure and
+	selected nothing, I added two tests of Sequences with strings and
+	tried both selections that return and don't return values. Both
+	cases work.
+
+2009-10-05  mjohnson
+
+	Vector.h, Vector.cc: Cleaned up and moved doxygen comments to impl
+	file.
+
+2009-10-02  Patrick West <pwest@ucar.edu>
+
+	This function is no longer used in libdap and is specific to usage in
+	dap-server. Moved the function.
+	M    mime_util.h
+
+2009-10-02  James Gallagher <jgallagher@opendap.org>
+
+	Regarding the previous commit: On the IOOS branch I removed a 'bad
+	fix' added at some point where includes within util.h supplied the
+	class definitions for Byte, ..., Grid. So it looked like the .cc
+	files were not including must at all, but in fact not only were
+	they (and they need those includes) but _everything_ that used
+	util.cc/h was too. So here are the includes, back in the .cc files
+	where they belong.
+
+2009-10-02  James Gallagher <jgallagher@opendap.org>
+
+	Merged code from ioos/src/libdap rev 20393 that contained the
+	'OtherXML' attribute implementation. This was apparently lost when
+	that branch was updated between the commit of that revision and
+	now. In addition to changes in AttrTable and the DAS and DDX
+	parsers, there are changes in tests/ and unit-tests/. There's also
+	a new function for converting octal escapes codes that is in
+	escaping.cc/h. I updated the DDX parser to use the SAX2 interface
+	and it now correctly processes namespaces and as a result, it's in
+	a new file 'DDXParserSAX2.cc/h'. Oddly, when I performed the
+	merge, an old 'feature' of the Type (Byte, ...) classes reemerged,
+	the 'include the world' feature. In testing I could not get a good
+	compile without these includes after the merge (but before the
+	merge it was fine). I'm going to leave those changes out of this
+	commit and see if the resulting code is OK. If not, I'l commit
+	those changes, too.
+
+2009-10-02  mjohnson
+
+	Vector.cc, Vector.h: Added support for reserving data buffer
+	storage in advance, clearing out data buffers, and for copying a
+	Vector into a subset of the value buffer of another Vector. In
+	support of aggregation to allow Vector's to be combined into a
+	larger Vector. Ticket #1427 has more information. This was a
+	monotonic interface addition and code change only --- no
+	interfaces removed or changed.
+
+2009-09-25  James Gallagher <jgallagher@opendap.org>
+
+	Removed XDRFileMarshaller.h from DODSFilter.cc
+
+2009-09-25  James Gallagher <jgallagher@opendap.org>
+
+	It just seem right to save things at this point. Most of the
+	configure.ac files have been updated. The libdap software has had
+	a number of the FILE* methods/functions commented out using #if
+	FILE_METHODS and then #undef FILE_METHODS. We'll see how much of
+	the redundant code can be removed before the next Hyrax 1.6
+	release.
+
+2009-09-25  James Gallagher <jgallagher@opendap.org>
+
+	Added fdiostream to the library because it seems we might be using
+	it someday soon. Modified expr-test to use temp. files and the
+	methods in DODSFilter and Connect - this is a better test of the
+	library. I modified XDRStreamUnMarshaller a fair amount but it's
+	still not work 100% and needs more error checking. This code still
+	uses XDRFileUnMarshaller.
+
+	M    DODSFilter.cc
+	A    fdiostream.cc
+	M    tests/expr-test.cc
+	M    tests/TestByte.cc
+	M    tests/Makefile.am
+	M    Marshaller.h
+	D    GNU/fdiostream_test.cc
+	D    GNU/fdiostream.h
+	M    Makefile.am
+	M    DODSFilter.h
+	M    XDRStreamUnMarshaller.cc
+	M    HTTPConnect.cc
+	M    XDRStreamMarshaller.cc
+	M    Connect.cc
+	A  + unit-tests/fdiostreamTest.cc
+	M    unit-tests/Makefile.am
+	M    unit-tests/MarshallerTest.cc
+	AM + fdiostream.h
+
+2009-09-22  James Gallagher <jgallagher@opendap.org>
+
+	Removed the xstream code - if we need this it's available on the web.
+
+2009-09-22  James Gallagher <jgallagher@opendap.org>
+
+	Fixed a bug in fdiostream and added support for a istream that
+	reads from a FILE* (ugh).
+
+2009-09-18  James Gallagher <jgallagher@opendap.org>
+
+	Uses the new file descriptor stream classes - that is, it tests
+	both input and output.
+
+2009-09-18  James Gallagher <jgallagher@opendap.org>
+
+	Added XDRStreamUnMarshaller to the Makefile.am
+
+2009-09-18  James Gallagher <jgallagher@opendap.org>
+
+	Added XDRStreamUnMarshaller
+
+2009-09-18  James Gallagher <jgallagher@opendap.org>
+
+	Minor fixes to the XDRStreamMarshaller class
+
+2009-09-17  James Gallagher <jgallagher@opendap.org>
+
+	Now includes the newly revamped stream buffer classes (fdiostream.h)
+
+2009-09-17  James Gallagher <jgallagher@opendap.org>
+
+	Added input stream buf for file descriptors and renamed the files.
+	Updated the README.
+
+2009-09-11  mjohnson
+
+	Grid.cc: Made Grid add it's array and map vectors to the
+	Constructor _vars list so they get iterated by the superclass
+	Vars_Iter calls. For ticket #1406
+
+2009-09-02  Nathan Potter <ndp@coas.oregonstate.edu>
+
+2009-09-02  Nathan Potter <ndp@coas.oregonstate.edu>
+
+	libdap: tweaked configure.ac to fix uuid lib problem
+
+2009-09-02  James Gallagher <jgallagher@opendap.org>
+
+	Updated the pkg-config and dap-config scripts so they contain the UUID
+	library when needed.
+
+	M    libdap.pc.in
+	M    libdapserver.pc.in
+	M    dap-config.in
+
+2009-09-02  James Gallagher <jgallagher@opendap.org>
+
+	Build fixes for linux. Linux uses libuuid for the uuid functions
+	while OSX does not - I added a test for that library to
+	configure.ac and the corrsponding changes to the Makefile.am. I
+	also found and fixed two other errors that were not showing up on
+	the OSX platform.
+
+	M    DODSFilter.cc
+	M    configure.ac
+	M    tests/Makefile.am
+	M    Makefile.am
+
+2009-09-02  mjohnson
+
+	o Fixed typo causing build error.
+
+2009-08-31  James Gallagher <jgallagher@opendap.org>
+
+	Replace fgetln with fgets in DDXParser.cc.  oddly package.m4 in
+	tests has the version number for the library. I changed that to 3.10.0
+	(we should have something for the trunk better than a version number
+	that looks like a release number) since I didn't think 3.9.2 was a
+	good value...
+
+2009-08-31  James Gallagher <jgallagher@opendap.org>
+
+	Configure fixes.
+
+	M    configure.ac
+
+2009-08-31  James Gallagher <jgallagher@opendap.org>
+
+	Updates for make dist.
+
+	M    tests/Makefile.am
+	M    INSTALL
+	M    Makefile.am
+
+2009-08-31  James Gallagher <jgallagher@opendap.org>
+
+	Added
+
+2009-08-31  James Gallagher <jgallagher@opendap.org>
+
+	Added.
+
+2009-08-28  James Gallagher <jgallagher@opendap.org>
+
+	Refactor of libdap: AIS removed from build. In addition,
+	bug tickets addressed for Array, DDS, Vector and parser-util.cc
+
+2009-08-27  James Gallagher <jgallagher@opendap.org>
+
+	Moved mime_util to libdap from libdapserver.
+
+2009-08-27  James Gallagher <jgallagher@opendap.org>
+
+	Removed unnecessary libdapserver use for the unit-tests after moving cgi_util to mime_util
+	and putting the latter in libdap.
+
+2009-08-27  James Gallagher <jgallagher@opendap.org>
+
+	Added code to build and read the DataDDX response for DAP4.
+	Connect has request_data_ddx() and request_data_ddx_url()
+	methods that will ask a server for the DataDDX and parse
+	the returned response. Connect::read_data() can read a DataDDX
+	response from a file; getdap -M - can read the DataDDX returned
+	by besstandalone when it's asked to return a DataDDX. DODSFilter
+	now has a send_data_ddx() method and appropriate functions are
+	now in mime_util.cc/h to build and parse the multipart MIME
+	response. I also refactored the code somewhat renaming cgi_util to
+	mime_util and removing redundant MIME parsing code in Connect and
+	HTTPConnect - now all the MIME header parsing is done by functions
+	in mime_util. Since these are used by both client and server
+	operations, that should be moved to libdap (from libdapserver).
+
+2009-08-21  James Gallagher <jgallagher@opendap.org>
+
+	Changed ID to Id to match the RFCs in the set_mime...() functions..
+	Also removed the set_client_dap_version() method and the matching get
+	methods - These were causing more confusion than anything else. Use
+	set_dap_version() and the matching get methods.
+
+	M    cgi_util.cc
+	M    DDS.cc
+	M    DDS.h
+
+2009-08-21  James Gallagher <jgallagher@opendap.org>
+
+	Changed ID to Id in the set_mime...() code to match the RFCs; fixed here in
+	tests.
+
+	M    unit-tests/DODSFilterTest.cc
+
+2009-08-21  James Gallagher <jgallagher@opendap.org>
+
+	Fixed an error where getdomainname() can return nothing
+	and not indicate and error. Now the default domain name
+	is opendap.org in that case.
+
+2009-08-20  James Gallagher <jgallagher@opendap.org>
+
+	Updates for the DataDDX response. New values were added
+	to the ObjectType and and EncodingType enums. DODSFilter
+	now has a send_data_ddx method that can either supply just
+	the body (as needed by the OLFS) or the complete message.
+	Unit tests added in unit-tests.DODSFilterTest. In HTTPConnect,
+	get_description_type() and get_object() were also updated.
+	Lastly, I change the values of Content-Description slightly
+	so they were a little less clunky and made the dap4 prefixed
+	values use dashes instead of underscores.
+
+2009-08-19  James Gallagher <jgallagher@opendap.org>
+
+	Interim version of autogen.sh for our projects - fix the --force option.
+
+	M    autogen.sh
+
+2009-08-19  James Gallagher <jgallagher@opendap.org>
+
+	Removed generated files.
+
+	D    conf/mkinstalldirs
+	D    conf/depcomp
+	D    conf/compile
+	D    conf/missing
+	D    conf/config.guess
+	D    conf/config.sub
+	D    conf/ltmain.sh
+	D    conf/install-sh
+
+2009-08-18  Nathan Potter <ndp@coas.oregonstate.edu>
+
+	libdap: Repaired bad string syntax and formatting.
+
+2009-08-18  mjohnson
+
+	Added set_name() override to set the name of the template var() as
+	well since this is what is output in a DDS and they didn't match.
+	Ticket #1346.
+
+2009-08-18  tomss
+
+	Changes to documentation only. Formatted ce function documentation
+	to be easier to read and removed a bad paragraph from the main
+	doxygen docs.
+
+2009-08-04  James Gallagher <jgallagher@opendap.org>
+
+	Added autogen.sh which is probably better than always running
+	autoreconf.
+
+	AM   autogen.sh
+
+2009-08-04  James Gallagher <jgallagher@opendap.org>
+
+	Changes for gcc 4.4: Removed warnings about misplaced or missing const
+	qualifiers and logic issues. Also fixed a missing header under FC 11
+	(util_mit.cc needs <cstdio> for sprintf).
+
+	M    Int16.cc
+	M    conf/mkinstalldirs
+	M    conf/depcomp
+	M    conf/missing
+	M    conf/config.guess
+	M    conf/config.sub
+	M    conf/ltmain.sh
+	M    conf/install-sh
+	M    INSTALL
+	M    UInt16.cc
+	M    Byte.cc
+	M    parser-util.cc
+	M    Float32.cc
+	M    HTTPConnect.cc
+	M    Str.cc
+	M    ce_functions.cc
+	M    das.y
+	M    UInt32.cc
+	M    util_mit.cc
+	M    dds.y
+	M    RCReader.h
+
+2009-07-28  James Gallagher <jgallagher@opendap.org>
+
+	Modified AISDataBaseParser.cc so that the library will build
+	with the --enable-debug=2 configure option. ticket 1318
+
+2009-07-21  mjohnson
+
+	del_attr_table needed to 0 out parent as well to preserve invariant.
+
+2009-07-21  mjohnson
+
+	Fixed memory leak in del_attr_table for Ticket #1326 and #1327.
+
+2009-07-21  mjohnson
+
+	Fixed several issues with the DAP type checking routines (which I re-used in NcML handler) failing to reject out of range Int32 and accepting a negative number as valid UInt32.
+
+2009-05-08  James Gallagher <jgallagher@opendap.org>
+
+	Merged changes for ticket 1301 from the tags/libdap/3.9.2 code.
+
+	M    Makefile.am
+	M    das.y
+	M    unit-tests/AISMergeTest.cc
+	M    unit-tests/DASTest.cc
+	M    unit-tests/DDSTest.cc
+
+2009-04-09  James Gallagher <jgallagher@opendap.org>
+
+	Changes for autoconf 2.63 (should work with 2.62 also).
+
+	M EXPRTest.at
+
+2009-04-08  James Gallagher <jgallagher@opendap.org>
+
+	Merged the 3.9.2 tagged code back into the trunk.
+
+	_M   .
+	M    RValue.cc
+	M    Int16.cc
+	M    configure.ac
+	M    DDXParser.cc
+	M    cgi_util.cc
+	M    ChangeLog
+	A  + conf/link-warning.h
+	M    DDS.cc
+	M    Array.cc
+	_M   tests/das-testsuite/test.1.das
+	_M   tests/expr-testsuite/test.2
+	_M   tests/expr-testsuite/test.3
+	_M   tests/expr-testsuite/test.c0
+	_M   tests/expr-testsuite/test.4
+	_M   tests/expr-testsuite/test.c1
+	_M   tests/expr-testsuite/test.c2
+	_M   tests/expr-testsuite/test.5
+	_M   tests/expr-testsuite/test.c3
+	_M   tests/expr-testsuite/test.6
+	_M   tests/expr-testsuite/test.c4
+	_M   tests/expr-testsuite/test.7
+	_M   tests/expr-testsuite/test.8
+	_M   tests/expr-testsuite/test.9
+	_M   tests/expr-testsuite/test.a
+	_M   tests/expr-testsuite/test.b
+	_M   tests/expr-testsuite/test.d
+	_M   tests/expr-testsuite/test.61
+	_M   tests/expr-testsuite/test.2a
+	_M   tests/expr-testsuite/test.cc0
+	_M   tests/expr-testsuite/test.cc1
+	_M   tests/expr-testsuite/test.1
+	M    tests/package.m4
+	M    INSTALL
+	M    UInt16.cc
+	M    libdap.spec
+	M    Byte.cc
+	M    GNU/GNURegex.cc
+	M    README
+	M    Makefile.am
+	M    HTTPCache.cc
+	M    ce_expr.y
+	M    Float32.cc
+	M    dds.lex
+	M    util.h
+	M    grammarfiles/ce_expr.tab.cc
+	M    NEWS
+	M    Str.cc
+	M    Sequence.cc
+	A  + gl/m4/absolute-header.m4
+	M    gl/m4/wchar.m4
+	M    gl/m4/stdint.m4
+	A  + gl/m4/malloc.m4
+	M    gl/m4/regex.m4
+	M    gl/m4/gnulib-comp.m4
+	A  + gl/m4/unistd_h.m4
+	M    gl/m4/include_next.m4
+	M    gl/m4/gnulib-cache.m4
+	D    gl/m4/onceonly_2_57.m4
+	A  + gl/m4/stdlib_h.m4
+	M    gl/m4/extensions.m4
+	M    gl/localcharset.c
+	M    gl/regex_internal.c
+	M    gl/malloc.c
+	M    gl/localcharset.h
+	M    gl/regex_internal.h
+	M    gl/regexec.c
+	A  + gl/stdlib.h
+	M    gl/regcomp.c
+	M    gl/alloca_.h
+	M    gl/wchar_.h
+	M    gl/stdint_.h
+	A  + gl/unistd_.h
+	M    gl/stdbool_.h
+	M    gl/regex.c
+	A  + gl/unistd.h
+	M    gl/regex.h
+	M    gl/wctype_.h
+	A  + gl/stdlib_.h
+	M    gl/Makefile.am
+	M    gl/gettext.h
+	M    gl/alloca.c
+	M    ce_functions.cc
+	M    expr.h
+	M    AttrTable.h
+	M    GridGeoConstraint.cc
+	M    util.cc
+	M    UInt32.cc
+	M    XDRStreamMarshaller.cc
+	M    Grid.cc
+	M    escaping.cc
+	M    unit-tests/HTTPCacheTest.cc
+	M    unit-tests/AttrTableTest.cc
+	M    unit-tests/generalUtilTest.cc
+	M    dds.y
+	M    Clause.cc
+	M    Array.h
+	M    ce_expr.lex
+
+2009-04-08  James Gallagher <jgallagher@opendap.org>
+
+	Bumped up the autoconf version to 2.61 which we need for the top_srcdir
+	variable. Other minor fixes like spelling errors in comments.
+
+	M    configure.ac
+	M    INSTALL
+	M    GNU/outbuf.h
+	M    ce_expr.y
+	M    Clause.cc
+	M    AISDatabaseParser.cc
+
+;; Local Variables:
+;; coding: utf-8
+;; End:
+2009-04-06  James Gallagher <jgallagher@opendap.org>
+
+	Bug fix: entry::clone() was performing a deep copy in aliases when
+	the dtor expected aliases to use a shallow copy operation. This
+	resulted in a memory leak. See #1293.
+
+2009-03-16  James Gallagher <jgallagher@opendap.org>
+
+	Version 3.9.1
+
+	M    configure.ac
+	M    ChangeLog
+	M    INSTALL
+	M    libdap.spec
+	M    NEWS
+
+2009-03-10  James Gallagher <jgallagher@opendap.org>
+
+	Removed!
+
+	D    gl/alloca.h
+
+2009-03-10  James Gallagher <jgallagher@opendap.org>
+
+	Added.
+
+	AM   gl/alloca.h
+
+2009-03-05  James Gallagher <jgallagher@opendap.org>
+
+	Repaired a problem in the CE parser where the new test for
+	multiply projected arrays was failing because the test
+	was applied after the array was marked and so the projected
+	sizes differed, which looked like to different projections
+	but was actually two steps of the projection process.
+
+2009-03-05  James Gallagher <jgallagher@opendap.org>
+
+2009-03-05  James Gallagher <jgallagher@opendap.org>
+
+	Fixes from code review.
+
+	M    RValue.cc
+	M    Int16.cc
+	M    DDXParser.cc
+	M    cgi_util.cc
+	M    UInt16.cc
+	M    Byte.cc
+	M    GNU/GNURegex.cc
+	M    Makefile.am
+	M    Float32.cc
+	M    dds.lex
+	M    util.h
+	M    Str.cc
+	M    Sequence.cc
+	M    gl/localcharset.c
+	M    ce_functions.cc
+	M    GridGeoConstraint.cc
+	M    util.cc
+	M    UInt32.cc
+	M    XDRStreamMarshaller.cc
+	M    Grid.cc
+
+2009-02-26  James Gallagher <jgallagher@opendap.org>
+
+	I fixed a lingering problem with HTTPCache where its per-process
+	lock on the cache could not be obtained because the cache created
+	by a previous process was not writable. I used umask(0) to solve
+	that. I also made sure that sending a CE that constrains an array
+	of structures in two different ways returns an error. Lastly, I
+	removed old code from the Array class
+
+2009-02-20  James Gallagher <jgallagher@opendap.org>
+
+	Modified the ce_expr.y parser so that variable names can be
+	quoted (double quotes).
+
+2009-02-18  James Gallagher <jgallagher@opendap.org>
+
+	New version of www2id(). Now the third parameter can accept more than
+	one escape code to leave untouched.
+
+2009-01-30  James Gallagher <jgallagher@opendap.org>
+
+	Moved here to coalesce branches
+
+2009-01-30  James Gallagher <jgallagher@opendap.org>
+
+	Updated the 'CURRENT' revision for libdap and libdapserver.
+	Bummer, but we changed interfaces.
+
+2009-01-29  James Gallagher <jgallagher@opendap.org>
+
+	Move the code to a branch while we're in the beta period.
+
+	A    http://scm.opendap.org/svn/branch/libdap/3.9.0
+	D    http://scm.opendap.org/svn/tags/libdap/3.9.0
+
+2009-01-28  James Gallagher <jgallagher@opendap.org>
+
+	Changes for the distcheck target.
+
+	M    configure.ac
+	M    INSTALL
+	M    GNU/outbuf.h
+	M    ce_expr.y
+	M    dds.y
+	M    Clause.cc
+	M    AISDatabaseParser.cc
+
+2009-01-28  James Gallagher <jgallagher@opendap.org>
+
+	Release 3.9.0
+
+	A    http://scm.opendap.org/svn/tags/libdap/3.9.0
+
+2009-01-28  James Gallagher <jgallagher@opendap.org>
+
+	Updates for release 3.9.0
+
+	M    configure.ac
+	M    ChangeLog
+	M    libdap.spec
+	M    GNU/outbuf.h
+	M    README
+	M    Makefile.am
+	M    NEWS
+	M    unit-tests/Makefile.am
+
+2009-01-28  James Gallagher <jgallagher@opendap.org>
+
+	removed xstream references - we're not using this code although
+	I'd like to keep the source in the library since we might use it
+	at some point.
+
+	M Makefile.am
+
+2009-01-14  James Gallagher <jgallagher@opendap.org>
+
+	Patch from Patrice for missing string.h header.
+	Spelling errors in Makefile.am.
+
+	M    Makefile.amcon	
+	M    ce_expr.y
+
+2009-01-12  James Gallagher <jgallagher@opendap.org>
+
+	I changed the etag value used in the HTTPConnetTest so the test
+	will pass. The file changed and thus the etag changed when we
+	moved the test server.
+
+2008-12-04  Patrick West <pwest@ucar.edu>
+
+	curl.h is included in HTTPConnect.h, which is included in
+	AISMerge.h, which is included in getdap.cc. So need CURL_CFLAGS.
+	Not sure why this doesn't show up in other builds, however.
+
+	M    Makefile.am
+
+2008-12-03  James Gallagher <jgallagher@opendap.org>
+
+	Commented-out the #if FILE_METHODS ... #endif preprocessor lines.
+	For some reason these are breaking the library when FILE_METHODS
+	is one (but not when it's zero). Anyway, the FILE* methods are
+	needed for loaddap. I'm leaving the directives in as comments
+	since maybe someday I'll figure out _why_ these broke the library.
+
+	M    DODSFilter.cc
+	M    Int32.h
+	M    Int16.cc
+	M    Structure.h
+	M    Str.h
+	M    Sequence.h
+	M    Int16.h
+	M    DDS.cc
+	M    BaseType.h
+	M    Array.cc
+	M    Float64.h
+	M    UInt16.cc
+	M    AlarmHandler.h
+	M    Byte.cc
+	M    Byte.h
+	M    DDS.h
+	M    BaseType.cc
+	M    Constructor.h
+	M    Int32.cc
+	M    DODSFilter.h
+	M    Float32.cc
+	M    Grid.h
+	M    Structure.cc
+	M    Str.cc
+	M    Sequence.cc
+	M    Float32.h
+	M    Constructor.cc
+	M    UInt32.h
+	M    Float64.cc
+	M    UInt32.cc
+	M    Grid.cc
+	M    unit-tests/SequenceTest.cc
+	M    unit-tests/Makefile.am
+	AM   unit-tests/MarshallerTest.cc
+	M    Array.h
+	M    UInt16.h
+
+2008-11-25  James Gallagher <jgallagher@opendap.org>
+
+	Always build with the FILE_METHODS compile-time directive true. This
+	may cause problems...
+
+2008-11-25  James Gallagher <jgallagher@opendap.org>
+
+	Found more 'dataset' arguments, previously commented out, and
+	removed them. Makefile.am fixes that may address some build issues
+	seen by other people.
+
+2008-11-25  James Gallagher <jgallagher@opendap.org>
+
+	I had previously commented out all of the places where the data
+	set name was passed around to the various methods that evaluate a
+	CE. Patrick has moved information about the data set name into the
+	BaseType class so that a single DDS/DataDDS/DDX/... can be built
+	from multiple files/data sets. Passing the parameter was
+	redundant, so I commented it out. I completed the removal by
+	deleting those comments.
+
+	M    RValue.cc
+	M    DDXParser.h
+	M    DDXParser.cc
+	M    ce_functions.h
+	M    ConstraintEvaluator.cc
+	M    ArrayGeoConstraint.h
+	M    GeoConstraint.h
+	M    GridGeoConstraint.h
+	M    ce_expr.y
+	M    RValue.h
+	M    ce_functions.cc
+	M    expr.h
+	M    GridGeoConstraint.cc
+	M    ConstraintEvaluator.h
+	M    Clause.h
+	M    ArrayGeoConstraint.cc
+	M    unit-tests/ArrayGeoConstraintTest.cc
+	M    unit-tests/GridGeoConstraintTest.cc
+	M    Clause.cc
+	M    GeoConstraint.cc
+
+2008-11-17  James Gallagher <jgallagher@opendap.org>
+
+	Added check of C:\opendap when looking for .dodsrc on WIN32
+
+2008-11-14  James Gallagher <jgallagher@opendap.org>
+
+	Merged the xmlrequest branch to the trunk.
+
+	_M   .
+	M    RValue.cc
+	M    DDXParser.h
+	M    DODSFilter.cc
+	A  + xstream
+	A  + xstream/fd.h
+	A  + xstream/except_posix.h
+	A  + xstream/posix.cpp
+	A  + xstream/posix.h
+	A  + xstream/common.cpp
+	A  + xstream/fd.cpp
+	A  + xstream/common.h
+	A  + xstream/except.h
+	M    Int32.h
+	M    Int16.cc
+	M    Structure.h
+	M    Str.h
+	M    Sequence.h
+	M    configure.ac
+	M    Connect.h
+	M    DDXParser.cc
+	M    Ancillary.cc
+	M    ce_functions.h
+	M    Int16.h
+	D    docs/html.tar.gz
+	M    ConstraintEvaluator.cc
+	M    DDS.cc
+	M    BaseType.h
+	M    Array.cc
+	M    tests/das-testsuite/config/unix.exp
+	M    tests/expr-testsuite/expr-test.0/test.g.exp
+	M    tests/expr-testsuite/expr-test.0/test.6.exp
+	M    tests/expr-testsuite/config/unix.exp
+	M    tests/expr-test.cc
+	A  + tests/io_test.cc
+	M    tests/grid-func-testsuite/config/unix.exp
+	M    tests/Makefile.am
+	M    tests/dds-test.cc
+	M    Float64.h
+	M    UInt16.cc
+	M    AlarmHandler.h
+	M    Byte.cc
+	M    Byte.h
+	D    GNU/Pix.h.never
+	D    GNU/GNUerror.cc.never
+	A  + GNU/outbuf.cc
+	D    GNU/builtin.h.never
+	A  + GNU/outbuf.h
+	M    GNU/README
+	M    BaseType.cc
+	M    DDS.h
+	M    GeoConstraint.h
+	M    Makefile.am
+	M    GridGeoConstraint.h
+	M    Constructor.h
+	M    Int32.cc
+	M    DODSFilter.h
+	M    ce_expr.y
+	M    Float32.cc
+	M    Grid.h
+	M    HTTPConnect.cc
+	M    Structure.cc
+	M    RValue.h
+	M    getdap.cc
+	M    Str.cc
+	M    Sequence.cc
+	M    Float32.h
+	M    ce_functions.cc
+	M    expr.h
+	M    GridGeoConstraint.cc
+	M    Constructor.cc
+	M    UInt32.h
+	M    AISMerge.cc
+	M    ConstraintEvaluator.h
+	M    Clause.h
+	M    ArrayGeoConstraint.cc
+	M    Float64.cc
+	M    UInt32.cc
+	M    Grid.cc
+	M    Connect.cc
+	M    HTTPConnect.h
+	D    unit-tests/ais_testsuite/ais_database.xml
+	M    unit-tests/ais_testsuite/ais_database.xml.in
+	M    unit-tests/AISResourcesTest.cc
+	M    unit-tests/DDSTest.cc
+	M    unit-tests/test_config.h.in
+	M    unit-tests/HTTPConnectTest.cc
+	M    unit-tests/DDXParserTest.cc
+	M    unit-tests/ddsT.cc
+	M    unit-tests/ByteTest.cc
+	M    unit-tests/CEFunctionsTest.cc
+	A  + unit-tests/ddx-testsuite/error.06.ddx
+	A  + unit-tests/ddx-testsuite/test.0c.ddx
+	A  + unit-tests/ddx-testsuite/test.0d.ddx
+	A  + unit-tests/ddx-testsuite/test.00.ddx
+	M    unit-tests/Makefile.am
+	M    Clause.cc
+	M    GeoConstraint.cc
+	M    Array.h
+	M    UInt16.h
+
+2008-11-12  James Gallagher <jgallagher@opendap.org>
+
+	Fixed the libcurl and libxml2 tests in confgure.ac - they now
+	test the values of the two programs correctly.
+
+2008-11-06  James Gallagher <jgallagher@opendap.org>
+
+	Minor changes that are part of a fix for ticket 975. The complete
+	changes are not done yet since the tests are not all passing for
+	the intern_data() methods (but do pass for the
+	serialize()/deserialize() methods and it might be that the problem
+	lies in the TestArray class and not in the libdap code outside the
+	tests. See svn/tags/libdap/partial_975_fix and the ticket itself
+	for more information.
+
+	M    Array.cc
+	M    tests/expr-test.cc
+	M    tests/TestStructure.cc
+	M    BaseType.cc
+	M    ce_expr.y
+	M    Structure.cc
+	M    Vector.cc
+	M    Array.h
+
+2008-10-30  James Gallagher <jgallagher@opendap.org>
+
+	Tests d1 and d3 will fail until I sort out just what is happening with
+	the array of structures and CEs in the Test* classes.
+
+2008-10-10  James Gallagher <jgallagher@opendap.org>
+
+	Added data file for Structure Array tests.
+
+2008-10-10  James Gallagher <jgallagher@opendap.org>
+
+	Modified ce_expr.y so that arrays of structure parse using the new
+	syntax. Example: s2[0:4].m[2:7]. See ticket 975.
+
+	M DDS.cc
+	M Vector.cc
+	M ce_expr.y
+
+2008-10-10  James Gallagher <jgallagher@opendap.org>
+
+	Added tests for Array of Structures fix - see ticket #975
+
+2008-10-08  James Gallagher <jgallagher@opendap.org>
+
+	Ticket 1188: can not --> cannot. This was for the a handful
+	of error messages, but I wound up changing it everywhere since
+	that was easier.
+
+2008-10-08  James Gallagher <jgallagher@opendap.org>
+
+	Fix for ticket 1121 - DDX not well formed for some HDF4 datasets
+	because the element Alias was not closed.
+
+	M AttrTable.cc
+
+2008-09-25  James Gallagher <jgallagher@opendap.org>
+
+	Added support for cookies to libdap. Cookies will be saved in a
+	'cookie jar' if that option/parameter is set int he .dodsrc file.
+
+	_M   tests
+	M    RCReader.cc
+	M    HTTPConnect.cc
+	M    HTTPConnect.h
+	_M   unit-tests/cache-testsuite
+	M    RCReader.h
+
+2008-09-25  James Gallagher <jgallagher@opendap.org>
+
+	Removed a test case fro AISResourceTest.cc since it was causing false
+	negatives when run as root on FC8.
+
+2008-09-19  James Gallagher <jgallagher@opendap.org>
+
+	Corrections for comments
+
+2008-09-18  James Gallagher <jgallagher@opendap.org>
+
+	Fixes for tests after moving test.opendap.org - some of the
+	test files appear to be different (not sure I understand
+	that, but it's true, they are). Also, minor fixes for the
+	new DDX31 symbol and xml header info to fix build errors.
+
+2008-09-17  James Gallagher <jgallagher@opendap.org>
+
+	Merged multifile branch
+
+2008-09-17  James Gallagher <jgallagher@opendap.org>
+
+	Updated docs.
+
+	AM   docs/html.tar.gz
+
+2008-09-16  James Gallagher <jgallagher@opendap.org>
+
+	Check in simple changes before branching to start the bulk
+	of the DAP 3.2 changes.
+
+2008-08-26  James Gallagher <jgallagher@opendap.org>
+
+	Added a one option to getdap (-M) that enables it to
+	read from files that don't have MIME headers.
+
+2008-08-06  Patrick West <pwest@ucar.edu>
+
+	File accidentally added by eclipse
+
+	D    ais_database.xml
+
+2008-08-06  Patrick West <pwest@ucar.edu>
+
+	Deleting fines accidentally added by eclipse
+
+	D    ce_expr.tab.hh
+	D    3.8.1.diffs
+	D    libdap-3.8.1.tar.gz
+	D    tmp16780
+	D    deflate
+	D    ce_expr.output
+	D    .cproject
+	D    libdap-3.8.2.fpr
+	D    libdap.pc
+	D    tests/das-test.sum
+	D    tests/dds-test.sum
+	D    tests/expr-test
+	D    tests/das-test
+	D    tests/dds-test
+	D    tests/expr-test.sum
+	D    tmp16480
+	D    das.tab.hh
+	D    dds.tab.hh
+	D    ChangeLog.tmp
+	D    Error.tab.hh
+	D    gse.tab.hh
+	D    libdapclient.pc
+	D    das.output
+	D    dds.output
+	D    libdapserver.pc
+	D    Error.output
+	D    gse.output
+	D    unit-tests/CEFunctionsTest
+	D    unit-tests/cache-testsuite/cleanup.sh
+	D    unit-tests/parserUtilTest
+	D    unit-tests/sequenceT
+	D    unit-tests/marshT
+	D    unit-tests/DDSTest
+	D    unit-tests/generalUtilTest
+	D    unit-tests/ArrayTest
+	D    unit-tests/ArrayGeoConstraintTest
+	D    unit-tests/DDXParserTest
+	D    unit-tests/.dodsrc
+	D    unit-tests/cgiUtilTest
+	D    unit-tests/arrayT
+	D    unit-tests/DASTest
+	D    unit-tests/SequenceTest
+	D    unit-tests/AISDatabaseParserTest
+	D    unit-tests/ancT
+	D    unit-tests/HTTPConnectTest
+	D    unit-tests/test_config.h
+	D    unit-tests/AISMergeTest
+	D    unit-tests/ByteTest
+	D    unit-tests/structT
+	D    unit-tests/AttrTableTest
+	D    unit-tests/GridGeoConstraintTest
+	D    unit-tests/RCReaderTest
+	D    unit-tests/ddsT
+	D    unit-tests/DODSFilterTest
+	D    unit-tests/HTTPCacheTest
+	D    unit-tests/attrTableT
+	D    unit-tests/AISResourcesTest
+	D    unit-tests/RegexTest
+	D    unit-tests/SignalHandlerTest
+	D    svn-commit.tmp
+	D    getdap
+
+2008-08-04  James Gallagher <jgallagher@opendap.org>
+
+	Moved get_type() out of ObjectType.h and into HTTPConnect.cc and
+	changed its name to get_description_type() which is not only
+	more accurate but also less likely to conflict with other functions
+	(there are two other 'get_type()'s in libdap already). There are
+	other related changes.
+
+2008-08-01  James Gallagher <jgallagher@opendap.org>
+
+	Minor fix in dds.lex - test for an error from fgets(). Closes
+	ticket 1068.
+
+2008-08-01  James Gallagher <jgallagher@opendap.org>
+
+	Fixed the expr-test tests - they were only running the
+	intern_data() code and not the serialize/deserialize code. Also,
+	removed use of move_dds() from expr-test as it is no longer
+	needed.
+
+2008-07-31  James Gallagher <jgallagher@opendap.org>
+
+	String attribute values are always quoted when the DAS is written
+	out (now). This is part of the fix for ticket 1163 (the other part
+	being changes to the handlers). See README for more information.
+
+	M    tests/das-testsuite/das-test.0/test.8.exp
+	M    tests/das-testsuite/das-test.0/test.9.exp
+	M    tests/das-testsuite/das-test.0/test.11.exp
+	M    tests/das-testsuite/das-test.0/test.1.exp
+	M    tests/das-testsuite/das-test.0/test.2.exp
+	M    tests/das-testsuite/das-test.0/test.3.exp
+	M    tests/das-testsuite/das-test.0/test.4.exp
+	M    README
+	M    util.h
+	M    AttrTable.cc
+	M    Vector.cc
+	M    das.y
+	M    util.cc
+	M    unit-tests/AttrTableTest.cc
+
+2008-07-28  hyoklee
+
+	Added dods_url_c type for Vector::value() function.
+
+2008-07-23  James Gallagher <jgallagher@opendap.org>
+
+	Merged changes from tags/libdap/3.8.2 (-r18931:19106
+	$svn/tags/libdap/3.8.2 .)
+
+	M    Ancillary.cc
+	M    VCPP/BeforeInstall.txt
+	M    VCPP/libdap.iss
+	M    VCPP/config.h
+	M    VCPP/Makefile
+
+2008-07-15  James Gallagher <jgallagher@opendap.org>
+
+	Patch from Patrice Dumas for gnulib/autoconf 2.62 compatibility.
+
+	M    gl/m4/extensions.m4
+
+2008-07-15  Patrick West <pwest@ucar.edu>
+
+	Problem where nested sequences not having any values selected
+	because of constraint evaluation, so nested sequences aren't being
+	pushed to the value stack. When coming out of parent_part_two to
+	the end of parent_part_one, the stack is popped to get that
+	sequences values. Since nothing was being pushed, the values for
+	that sequence were being popped leaving an empty stack. So when
+	top is called on an empty stack, caused bus error.
+
+	Also, in Sequence.cc, a dynamic cast was being made to a Sequence
+	variable called tmp. dynamic casts were called three more times in
+	the method. These can get expensive, so removed the other dynamic
+	casts and using first variable called tmp.
+
+	Added and modified DBG statements.
+	M    tests/TestInt32.cc
+	M    tests/TestFloat32.cc
+	M    tests/TestByte.cc
+	M    tests/TestSequence.cc
+	M    BaseType.cc
+	M    Sequence.cc
+	M    AISDatabaseParser.cc
+
+2008-06-25  James Gallagher <jgallagher@opendap.org>
+
+	Fixed one more problem with the xdr-datatype header. Assuming
+	that XDR uses the C99 types if the inttypes.h header is present
+	works on new FC machines but not OS/X, et cetera. I removed that
+	from the Makefile.am.
+
+	M    OSX_Resources/InstallationCheck
+	M    OSX_Resources/Info.plist
+	M    conf/acinclude.m4
+	M    Makefile.am
+
+2008-06-25  James Gallagher <jgallagher@opendap.org>
+
+	Fixes - I hope - to the *-datatypes headers. Other updates for
+	comments and documentation.
+
+	M    AISResources.cc
+	M    configure.ac
+	M    xdr-datatypes-static.h
+	M    xdr-datatypes-config.h.in
+	M    main_page.doxygen
+	M    Error.cc
+	M    conf/acinclude.m4
+	M    HTTPCacheTable.cc
+	M    doxy.conf
+
+2008-06-23  James Gallagher <jgallagher@opendap.org>
+
+	Removed apue_db. Updates to the documentation for 3.8.2
+
+	M    ChangeLog
+	D    apue_db
+	M    INSTALL
+	M    README
+	M    NEWS
+
+2008-06-23  James Gallagher <jgallagher@opendap.org>
+
+	Minor changes - comments & docs.
+
+	M    HTTPCacheTable.cc
+	M    HTTPCacheTable.h
+
+2008-06-23  James Gallagher <jgallagher@opendap.org>
+
+	Minor changes from the 3.8.1 code except that the HTTP Caching
+	changes developed here on the trunk of libdap are now
+	included (libdap 3.8.1 excluded those fixes).
+
+	M    configure.ac
+	M    ChangeLog
+	M    NEWS
+	M    ce_functions.cc
+	M    unit-tests/AISMergeTest.cc
+	M    unit-tests/HTTPCacheTest.cc
+
+2008-06-16  James Gallagher <jgallagher@opendap.org>
+
+	Merged changes from the 3.8.1 tag.
+
+	M    VCPP/BeforeInstall.txt
+	M    VCPP/libdap.iss
+	A    VCPP/unistd.h
+	M    libdap.spec
+	M    README
+
+2008-06-16  James Gallagher <jgallagher@opendap.org>
+
+	AISMergeTest updated to work with the newer test.opendap.org
+	fnoc1 test data set (which has slightly different attributes).
+
+2008-06-16  James Gallagher <jgallagher@opendap.org>
+
+	Removed HTTPCacheTable::CacheEntry's lock since it was redundant
+	and was causing a dead lock. Also removed RCReader's debug output.
+
+2008-06-16  Patrick West <pwest@ucar.edu>
+
+	Added access to response file.
+	M    HTTPResponse.h
+	M    Response.h
+
+2008-06-10  James Gallagher <jgallagher@opendap.org>
+
+	The lock used to protect the CacheEntry object was redundant and I
+	removed it. Also, I backed out other changes but retained some of
+	the added encapsulation added to the CacheEntry struct. I checked
+	this code in because I fairly certain it works, but the test
+	server is down and so I cannot run the unit tests for HTTPCache.
+
+	M    HTTPCacheTable.cc
+	M    HTTPCacheTable.h
+	M    unit-tests/HTTPCacheTest.cc
+
+2008-06-09  Dan Holloway <dholloway@opendap.org>
+
+	Added ifdef HAVE_UNISTD_H, include <unistd.h>, required on RedHat 3.+
+
+2008-05-30  Patrick West <pwest@ucar.edu>
+
+	Moved ancillary functions from DODSFilter and cgi_util to
+	Ancillary class as static methods. Moved the ancillary tests from
+	cgiUtilTest to ancT. Had to update configure.ac and Makefile.am to
+	get libdap to compile, removing apue directory.
+	
+	M    DODSFilter.cc
+	M    configure.ac
+	M    cgi_util.cc
+	A    Ancillary.cc
+	M    Makefile.am
+	M    cgi_util.h
+	A    Ancillary.h
+	A    unit-tests/ancT.cc
+	M    unit-tests/cgiUtilTest.cc
+	M    unit-tests/Makefile.am
+
+2008-05-30  James Gallagher <jgallagher@opendap.org>
+
+	Test svn switch (I added a space to the to the top of the file).
+
+	M    util.cc
+
+2008-05-22  James Gallagher <jgallagher@opendap.org>
+
+	Fixed comments in the ce functions - they said to use "version"
+	when it's actually a blank arg list that returns the response.
+
+2008-05-21  James Gallagher <jgallagher@opendap.org>
+
+	Made the directory name nicer
+
+	M    configure.ac
+	A    apue_db
+	D    apue_db/apue.h
+	D    apue_db/include
+	D    apue_db/db
+	A    apue_db/db.c
+	D    apue_db/lib
+	A    apue_db/lockreg.c
+	D    apue_db/Make.defines.linux
+	A    apue_db/t4.c
+	A    apue_db/error.c
+	M    Makefile.am
+	D    apue_db_lib
+	M    das.lex
+
+2008-05-21  James Gallagher <jgallagher@opendap.org>
+
+	Removed include subdir
+
+	D    apue_db_lib/include
+
+2008-05-21  James Gallagher <jgallagher@opendap.org>
+
+	Removed apue.h header.
+
+	D    apue_db_lib/apue.h
+	M    apue_db_lib/db.c
+	M    apue_db_lib/lockreg.c
+	M    apue_db_lib/t4.c
+	M    apue_db_lib/error.c
+
+2008-05-21  James Gallagher <jgallagher@opendap.org>
+
+	Removed
+
+	D    apue_db_lib/Make.defines.linux
+
+2008-05-21  James Gallagher <jgallagher@opendap.org>
+
+	Get rid of some temporary directories...
+
+	D    apue_db_lib/db
+	D    apue_db_lib/lib
+
+2008-05-21  James Gallagher <jgallagher@opendap.org>
+
+	Added Advanced Programming in the Unix Environment DB.
+
+	A    apue_db_lib/apue.h
+	A    apue_db_lib/apue_db.h
+	M    apue_db_lib/lib/libapue.a
+	A    apue_db_lib/db.c
+	A    apue_db_lib/lockreg.c
+	A    apue_db_lib/t4.c
+	AM   apue_db_lib/Makefile.am
+	A    apue_db_lib/error.c
+
+2008-05-21  James Gallagher <jgallagher@opendap.org>
+
+	Copied
+
+2008-05-20  James Gallagher <jgallagher@opendap.org>
+
+	Removed cruft from the Steven's db checkin.
+
+2008-05-20  James Gallagher <jgallagher@opendap.org>
+
+	Added the Steven's db code in apue_db_lib (which I might rename later).
+
+2008-05-20  James Gallagher <jgallagher@opendap.org>
+
+	Removed #if 0 .. #endif lines.
+
+2008-05-20  James Gallagher <jgallagher@opendap.org>
+
+	Read/Write locking in place. Ready to start changing over from a
+	single index file to a distributed way of storing the entries.
+
+2008-05-15  James Gallagher <jgallagher@opendap.org>
+
+	Moved the locking of entries into the cache table class. This sets
+	the stage for changes to the table implementation so that it can be
+	stored on disk and not in memory.
+
+2008-05-14  James Gallagher <jgallagher@opendap.org>
+
+	removed #if 0 after refactoring HTTPCache, HTTPCacheTable
+	and CacheEntry. Tests now run.
+
+2008-05-14  James Gallagher <jgallagher@opendap.org>
+
+	CacheEntry has not been encapsulated, but only to the extent
+	that fields are manipulated with accessor/mutator methods.
+	The basic logic is still exposed to HTTPCache.
+
+2008-05-14  Patrick West <pwest@ucar.edu>
+
+	Requires using unistd.h if HAVE_UNISTD_H is defined, which requires
+	including config.h.
+	M    unit-tests/marshT.cc
+	M    unit-tests/RCReaderTest.cc
+
+2008-05-14  Patrick West <pwest@ucar.edu>
+
+	unlink requires unistd.h on linux machines.
+	M    unit-tests/marshT.cc
+
+2008-05-13  James Gallagher <jgallagher@opendap.org>
+
+	Added HTTPCacheTable to the VCPP Makefile
+
+2008-05-13  James Gallagher <jgallagher@opendap.org>
+
+	I Have refactored HTTPCache so that most of the operations
+	on the index file and in-memory 'database' of the cache
+	contents is now in the HTTPCacheTable class.
+
+2008-05-09  James Gallagher <jgallagher@opendap.org>
+
+	Added HTTPCacheTable class. HTTPCache will now be refactored
+	so that it makes all cache table accesses through this class'
+	interface. See ticket #1114 and #1118.
+
+2008-04-25  James Gallagher <jgallagher@opendap.org>
+
+	Wrapped CURL_PROXYAUTH in #ifdef #endif to accommodate older versions of
+	libcurl.
+
+	M HTTPConnect.cc
+
+2008-04-25  James Gallagher <jgallagher@opendap.org>
+
+	Spelling errors fixed.
+
+	M    VCPP/BeforeInstall.txt
+	M    README.dodsrc
+	M    RCReader.cc
+
+2008-04-25  James Gallagher <jgallagher@opendap.org>
+
+	Build tools no longer installed
+
+2008-04-24  James Gallagher <jgallagher@opendap.org>
+
+	Added installer setup file and License for the installer
+
+2008-04-23  James Gallagher <jgallagher@opendap.org>
+
+	Comments and strings modified as part of the win32 build of 3.8.1
+	from svn
+
+2008-04-23  James Gallagher <jgallagher@opendap.org>
+
+	Removed Win32 definition of vsnprintf() for VC 2008 compat - edit
+	for use with VC 2005
+
+2008-04-23  James Gallagher <jgallagher@opendap.org>
+
+	Fixes for libdap 3.8.0
+
+2008-04-21  James Gallagher <jgallagher@opendap.org>
+
+	Ticket 1095: The proxy support in HTTPConnect baroque and caused
+	many people problems. I expanded on the syntax allowed (the old
+	syntax is still supported) so that it mirrors the syntax most
+	users expect. I updated the docs including the comments in the
+	.dodsrc file.
+
+	M    Makefile.am
+	M    RCReader.cc
+	M    NEWS
+	M    HTTPConnect.cc
+	M    unit-tests/RCReaderTest.cc
+	A    unit-tests/rcreader-testsuite/test4.rc
+	A    unit-tests/rcreader-testsuite/test5.rc
+
+2008-04-15  James Gallagher <jgallagher@opendap.org>
+
+	Added code to follow redirects in HTTPConnect.cc
+
+2008-04-07  Patrick West <pwest@ucar.edu>
+
+	Delete being called on array without [], as is being called below the
+	exception condition.
+	M    HTTPCache.cc
+
+2008-03-19  James Gallagher <jgallagher@opendap.org>
+
+	Added info about win32 locations for .dodsrc
+
+	M    README.dodsrc
+
+2008-03-19  James Gallagher <jgallagher@opendap.org>
+
+	Added Patrice Dumas' patch for <cstring>
+
+	M    SignalHandler.cc
+	M    gse.lex
+	M    dds.lex
+	M    HTTPConnect.cc
+	M    das.lex
+	M    ce_expr.lex
+
+2008-03-04  Patrick West <pwest@ucar.edu>
+
+	Now checks for which architecture the build is being run on and
+	updates the InstallationCheck script M
+	update_mac_package_contents.pl
+
+2008-03-04  Patrick West <pwest@ucar.edu>
+
+	3.8.0 release of libdap.
+	
+	M    configure.ac
+	M    ChangeLog
+	M    OSX_Resources/Info.plist
+	M    OSX_Resources/ReadMe.txt
+	M    libdap.spec
+	M    README
+	M    NEWS
+
+2008-03-03  James Gallagher <jgallagher@opendap.org>
+
+	Added conditional include of unistd.h for RHEL3 build.
+
+	M    SignalHandler.cc
+	M    tests/TestArray.cc
+	M    HTTPConnect.cc
+	M    DAS.cc
+
+2008-03-03  James Gallagher <jgallagher@opendap.org>
+
+	Header patch from Patrice Dumas.
+
+	Many files modified.
+
+2008-03-03  James Gallagher <jgallagher@opendap.org>
+
+	Directory regex --> pathname_ok() call. A minor change.
+
+	M Util.cc
+
+2008-03-02  James Gallagher <jgallagher@opendap.org>
+
+	Added shell commands so build works with bison 1.28. That
+	version treats the -o option differently than the 2.x version.
+
+	M Makefile.am
+
+;; Local Variables:
+;; coding: utf-8
+;; End:
+2008-03-03  James Gallagher <jgallagher@opendap.org>
+
+	Added conditional include of unistd.h for RHEL3 build.
+	M    SignalHandler.cc
+	M    tests/TestArray.cc
+	M    HTTPConnect.cc
+	M    DAS.cc
+
+2008-03-03  James Gallagher <jgallagher@opendap.org>
+
+	Header patch from Patrice Dumas.
+	Many files modified.
+
+2008-03-03  James Gallagher <jgallagher@opendap.org>
+
+	Directory regex --> pathname_ok() call. A minor change.
+	M Util.cc
+
+2008-03-02  James Gallagher <jgallagher@opendap.org>
+
+	Added shell commands so build works with bison 1.28. That
+	version treats the -o option differently than the 2.x version.
+	M Makefile.am
+
+2008-03-01  James Gallagher <jgallagher@opendap.org>
+
+	Tweaked the comments about the YY_INPUT macro.
+	M dds.lex
+
+2008-02-29  James Gallagher <jgallagher@opendap.org>
+
+	Switch back to the old YY_INPUT macro for now...
+	M    dds.lex
+
+2008-02-29  James Gallagher <jgallagher@opendap.org>
+
+	I found that a number of the places where a *.tab.h was included did
+	not get changed when I went to the .hh file names (which is how
+	bison does things when you tell it to make the output a *.tab.cc
+	file). Here are the fixes. the distcheck and rpm targets now work.
+	M    Error.lex
+	M    Int16.cc
+	M    error-test.cc
+	M    tests/expr-test.cc
+	M    tests/dds-test.cc
+	M    UInt16.cc
+	M    Int32.cc
+	M    gse-test.cc
+	M    Str.cc
+	M    Float64.cc
+	M    Operators.h
+	M    UInt32.cc
+
+2008-02-29  James Gallagher <jgallagher@opendap.org>
+
+	There are three changes in these files: 1. formatting;
+	2. Grammar builds; 3. Security fixes. For the formatting
+	changes some files just got messed up and I was sick of
+	looking at it. Grammar changes amount to simplifying the
+	builds of the lex and y files. Now the sed calls in the
+	Makefile have been removed - commented out to be completely
+	removed later. 3. Nothing major on the security front
+	but I made some changes all the same.
+
+2008-02-29  Patrick West <pwest@ucar.edu>
+
+	Updates for release of 3.7.11.
+	M    configure.ac
+	M    ChangeLog
+	M    INSTALL
+	M    libdap.spec
+	M    README
+	M    NEWS
+
+;; Local Variables:
+;; coding: utf-8
+;; End:
+2008-02-28  Patrick West <pwest@ucar.edu>
+
+	If cleanup.sh does not exist, then a make clean will error out.
+	clean-local depends on cleanup.sh.
+	M    cache-testsuite/Makefile.am
+
+2008-02-28  Patrick West <pwest@ucar.edu>
+
+	Added comment regarding ais_testsuite directory and how those files
+	are being distributed.
+	M    unit-tests/Makefile.am
+
+2008-02-28  Patrick West <pwest@ucar.edu>
+
+	Removing generated files from Makefile.am. Removing temporary files
+	in marshT created for writing marshalled data. cleanup script
+	cleaned up.  cache-testsuite makefile running local cleanup.sh since
+	cleanup.sh is generated, also added distclean-local to remove the
+	dods_cache directory.  unit-tests makefile adds individual
+	ais_testsuite files because there is the generated file there so
+	just adding the directory wasn't working.
+	M    Makefile.am
+	M    unit-tests/marshT.cc
+	M    unit-tests/cache-testsuite/cleanup.sh.in
+	M    unit-tests/cache-testsuite/Makefile.am
+	M    unit-tests/Makefile.am
+
+2008-02-28  Patrick West <pwest@ucar.edu>
+
+	Modified tests and configuration to get unit-tests to run during
+	distcheck.
+	M    unit-tests/AISMergeTest.cc
+	M    unit-tests/DODSFilterTest.cc
+	D    unit-tests/ais_testsuite/ais_database.xml
+	A    unit-tests/ais_testsuite/ais_database.xml.in
+	D    unit-tests/cache-testsuite/cleanup.sh
+	A    unit-tests/cache-testsuite/cleanup.sh.in
+	M    unit-tests/cache-testsuite/Makefile.am
+	M    unit-tests/DASTest.cc
+	M    unit-tests/AISResourcesTest.cc
+	M    unit-tests/DDSTest.cc
+	A    unit-tests/test_config.h.in
+	M    unit-tests/HTTPConnectTest.cc
+	M    unit-tests/DDXParserTest.cc
+	M    unit-tests/cgiUtilTest.cc
+	M    unit-tests/AISDatabaseParserTest.cc
+	M    unit-tests/CEFunctionsTest.cc
+	M    unit-tests/GridGeoConstraintTest.cc
+	M    unit-tests/Makefile.am
+	M    unit-tests/RCReaderTest.cc
+
+2008-02-27  Patrick West <pwest@ucar.edu>
+
+	Added check for cppunit in configure. If present, then the tests
+	will be built and run. if not then a message will appear saying that
+	can't run the tests without the library, but it's not an error.
+	M    configure.ac
+	A    conf/cppunit.m4
+	M    Makefile.am
+	M    unit-tests/Makefile.am
+
+2008-02-27  James Gallagher <jgallagher@opendap.org>
+
+	Updated indentation using "indent -kr"
+	M    gl/alloca_.h
+	M    gl/mbchar.h
+	M    gl/localcharset.c
+	M    gl/strcasecmp.c
+	M    gl/regex_internal.c
+	M    gl/strnlen1.c
+	M    gl/malloc.c
+	M    gl/wchar_.h
+	M    gl/localcharset.h
+	M    gl/stdint_.h
+	M    gl/strcase.h
+	M    gl/regex.c
+	M    gl/stdbool_.h
+	M    gl/memchr.c
+	M    gl/regex_internal.h
+	M    gl/strnlen1.h
+	M    gl/mbuiter.h
+	M    gl/regex.h
+	M    gl/wctype_.h
+	M    gl/regexec.c
+	M    gl/strncasecmp.c
+	M    gl/gettext.h
+	M    gl/alloca.c
+	M    gl/mbchar.c
+	M    gl/regcomp.c
+
+2008-02-26  Patrick West <pwest@ucar.edu>
+
+	No longer need the MacOSX specific readme and install files.
+	M    OSX_Resources/Info.plist
+	D    INSTALL_MacOSX.rtf
+	D    README_MacOSX.rtf
+
+2008-02-23  James Gallagher <jgallagher@opendap.org>
+
+	Auto reset of Subversion properties
+
+2008-02-22  James Gallagher <jgallagher@opendap.org>
+
+	Updated
+
+2008-02-22  James Gallagher <jgallagher@opendap.org>
+
+	Fixed an error that crept into xdr-datatypes-static from the xp
+	port. I made the change in a new copy of the xdr-datatypes.h header
+	added to the VCPP directory.  Also, I removed some old code from the
+	XDRUtils.cc file.
+	M    xdr-datatypes-static.h
+	AM   VCPP/xdr-datatypes.h
+	M    XDRUtils.cc
+
+2008-02-21  Patrick West <pwest@ucar.edu>
+
+	Added remove of temporary directories when pkg build is done.
+	M    Makefile.am
+
+2008-02-21  James Gallagher <jgallagher@opendap.org>
+
+	Modified Makefile to install xdr-datatypes.h from VCPP
+
+2008-02-21  James Gallagher <jgallagher@opendap.org>
+
+	Removed a patch
+	M XDRStreamMarshaller.cc
+
+2008-02-21  James Gallagher <jgallagher@opendap.org>
+
+	Removed a patch
+	M XDRFileMarshaller.cc
+
+2008-02-21  James Gallagher <jgallagher@opendap.org>
+
+	Backed out some changes for my version of XP.
+	M XDRFileUnMarshaller.cc
+
+2008-02-21  James Gallagher <jgallagher@opendap.org>
+
+	Fixes for the win32 build from Anna Nokolov - I turned her files
+	into a patch but there were some rejects.
+	M    xdr-datatypes-static.h
+	M    XDRFileUnMarshaller.cc
+	M    gl/stdint_.h
+	M    XDRStreamMarshaller.cc
+
+2008-02-21  James Gallagher <jgallagher@opendap.org>
+
+	Added patch from Anna Nokolov.
+	M XDRFileMarshaller.cc
+
+2008-02-21  James Gallagher <jgallagher@opendap.org>
+
+	Applied Win32 patches from Anna Nokolov.
+	M    cgi_util.cc
+	M    VCPP/Makefile
+	M    GNU/GNURegex.cc
+	M    parser-util.cc
+	M    util.h
+	M    das.lex
+	M    gl/localcharset.c
+	M    gl/stdint_.h
+	M    gl/regex_internal.h
+	M    util.cc
+	M    XDRFileMarshaller.cc
+
+2008-02-18  Patrick West <pwest@ucar.edu>
+
+	functional expressions were not being evaluated when building the
+	ddx.  Updated this and removed newline from error message if problem
+	with functional expressions.
+	M    DODSFilter.cc
+
+2008-02-14  Patrick West <pwest@ucar.edu>
+
+	Fixed sed issue with discovering version inormation in libdap.m4.
+	This one should be used by anyone who wants to use libdap.
+	M    conf/libdap.m4
+
+2008-02-13  James Gallagher <jgallagher@opendap.org>
+
+	Added unistd.h include.
+	M    unit-tests/AISResourcesTest.cc
+	M    unit-tests/ByteTest.cc
+	M    unit-tests/testFile.cc
+
+2008-02-13  James Gallagher <jgallagher@opendap.org>
+
+	Added config.h header include to AttrTableTest.cc
+
+2008-02-13  James Gallagher <jgallagher@opendap.org>
+
+	Added include of unistd.h to AttrTableTest.cc for RHEL3
+
+2008-02-05  James Gallagher <jgallagher@opendap.org>
+
+	Removed two tests that fail on machines where the tests are run as
+	root.
+	M HTTPCacheTest.cc
+
+2008-02-05  James Gallagher <jgallagher@opendap.org>
+
+	Auto reset of Subversion properties
+
+2008-02-04  Patrick West <pwest@ucar.edu>
+
+	Added method to not only return the FILE pointer but also the cached
+	file name when getting the cached response. Also, when parsing
+	headers, taking into account a blank line and a malformed header.
+	M    HTTPCache.cc
+	M    HTTPCache.h
+	M    HTTPConnect.cc
+
+2008-02-04  Patrick West <pwest@ucar.edu>
+
+	Includes added for unlink function call
+	M    unit-tests/ddsT.cc
+
+2008-02-02  Patrick West <pwest@ucar.edu>
+
+	Added namespace libdap
+	M    Error.lex
+	M    RValue.cc
+	M    DDXParser.h
+	M    DODSFilter.cc
+	M    HTTPResponse.h
+	M    Int16.cc
+	M    Int32.h
+	M    Structure.h
+	M    AISResources.cc
+	M    Sequence.h
+	M    Str.h
+	M    ResponseTooBigErr.cc
+	M    SignalHandler.cc
+	M    ResponseTooBigErr.h
+	M    SignalHandler.h
+	M    XDRUtils.h
+	M    escaping.h
+	M    Connect.h
+	M    DDXParser.cc
+	M    cgi_util.cc
+	M    dods-datatypes-static.h
+	M    ce_functions.h
+	M    gse.lex
+	M    DDXExceptions.h
+	M    Resource.h
+	M    Error.cc
+	M    HTTPCacheDisconnectedMode.h
+	M    UnMarshaller.h
+	M    Response.h
+	M    Int16.h
+	M    SignalHandlerRegisteredErr.h
+	M    ce_parser.h
+	M    ConstraintEvaluator.cc
+	M    DAS.h
+	M    DDS.cc
+	M    XDRFileMarshaller.h
+	M    tests/TestInt32.h
+	M    tests/TestStructure.h
+	M    tests/TestInt16.h
+	M    tests/TestUrl.h
+	M    tests/TestSequence.h
+	M    tests/TestStr.h
+	M    tests/TestFloat64.h
+	M    tests/das-test.cc
+	M    tests/TestGrid.h
+	M    tests/TestByte.h
+	M    tests/TestTypeFactory.h
+	M    tests/TestFloat32.h
+	M    tests/TestArray.h
+	M    tests/TestUInt32.h
+	M    tests/dds-test.cc
+	M    tests/TestUInt16.h
+	M    tests/TestCommon.cc
+	M    Array.cc
+	M    BaseType.h
+	M    HTTPCacheInterruptHandler.h
+	M    EventHandler.h
+	M    Float64.h
+	M    AISConnect.cc
+	M    UInt16.cc
+	M    InternalErr.h
+	M    EncodingType.h
+	M    gse_parser.h
+	M    Marshaller.h
+	M    AlarmHandler.h
+	M    Byte.cc
+	M    GNU/GNURegex.cc
+	M    GNU/GNURegex.h
+	M    Byte.h
+	M    DataDDS.h
+	M    BaseType.cc
+	M    DDS.h
+	M    XDRUtils.cc
+	M    ArrayGeoConstraint.h
+	M    GeoConstraint.h
+	M    HTTPCacheResponse.h
+	M    RCReader.cc
+	M    GridGeoConstraint.h
+	M    Constructor.h
+	M    util_mit.h
+	M    Error.h
+	M    Int32.cc
+	M    DODSFilter.h
+	M    DapObj.h
+	M    gse.y
+	M    HTTPCache.cc
+	M    DataDDS.cc
+	M    HTTPCache.h
+	M    parser-util.cc
+	M    DapIndent.h
+	M    ce_expr.y
+	M    AISResources.h
+	M    ObjectType.h
+	M    Float32.cc
+	M    Error.y
+	M    dds.lex
+	M    PipeResponse.h
+	M    util.h
+	M    AISExceptions.h
+	M    AISDatabaseParser.h
+	M    AttrTable.cc
+	M    InternalErr.cc
+	M    Grid.h
+	M    HTTPConnect.cc
+	M    AISMerge.h
+	M    RValue.h
+	M    Structure.cc
+	M    cgi_util.h
+	M    Url.cc
+	M    Vector.cc
+	M    getdap.cc
+	M    BaseTypeFactory.h
+	M    Str.cc
+	M    Sequence.cc
+	M    das.lex
+	M    XDRFileUnMarshaller.cc
+	M    Float32.h
+	M    XDRFileUnMarshaller.h
+	M    ce_functions.cc
+	M    expr.h
+	M    AttrTable.h
+	M    GridGeoConstraint.cc
+	M    Constructor.cc
+	M    UInt32.h
+	M    XDRStreamMarshaller.h
+	M    das.y
+	M    AISMerge.cc
+	M    parser.h
+	M    BaseTypeFactory.cc
+	M    Url.h
+	M    Vector.h
+	M    DAS.cc
+	M    ConstraintEvaluator.h
+	M    GSEClause.cc
+	M    GSEClause.h
+	M    util.cc
+	M    Clause.h
+	M    ArrayGeoConstraint.cc
+	M    Float64.cc
+	M    Operators.h
+	M    UInt32.cc
+	M    XDRStreamMarshaller.cc
+	M    Grid.cc
+	M    util_mit.cc
+	M    Connect.cc
+	M    escaping.cc
+	M    unit-tests/AISMergeTest.cc
+	M    unit-tests/sequenceT.cc
+	M    unit-tests/DODSFilterTest.cc
+	M    unit-tests/HTTPCacheTest.cc
+	M    unit-tests/DASTest.cc
+	M    unit-tests/AISResourcesTest.cc
+	M    unit-tests/DDSTest.cc
+	M    unit-tests/SignalHandlerTest.cc
+	M    unit-tests/ArrayGeoConstraintTest.cc
+	M    unit-tests/ArrayTest.cc
+	M    unit-tests/AttrTableTest.cc
+	M    unit-tests/HTTPConnectTest.cc
+	M    unit-tests/DDXParserTest.cc
+	M    unit-tests/ddsT.cc
+	M    unit-tests/cgiUtilTest.cc
+	M    unit-tests/ByteTest.cc
+	M    unit-tests/attrTableT.cc
+	M    unit-tests/SequenceTest.cc
+	M    unit-tests/RegexTest.cc
+	M    unit-tests/generalUtilTest.cc
+	M    unit-tests/AISDatabaseParserTest.cc
+	M    unit-tests/GridGeoConstraintTest.cc
+	M    unit-tests/RCReaderTest.cc
+	M    unit-tests/parserUtilTest.cc
+	M    HTTPConnect.h
+	M    dds.y
+	M    StdinResponse.h
+	M    DapIndent.cc
+	M    XDRFileMarshaller.cc
+	M    Clause.cc
+	M    AISDatabaseParser.cc
+	M    GeoConstraint.cc
+	M    Array.h
+	M    AISConnect.h
+	M    UInt16.h
+	M    ce_expr.lex
+	M    RCReader.h
+
+2008-02-01  James Gallagher <jgallagher@opendap.org>
+
+	Added some file to svn:ignore
+
+	M gl
+
+2008-02-01  James Gallagher <jgallagher@opendap.org>
+
+	Added conditional set of the gcc -Wall, et c., flags.
+	M Makefile.am
+
+2008-01-31  Nathan Potter <ndp@coas.oregonstate.edu>
+
+	libdap: Changed Error handling in ce_functions.cc so that the errors
+	thrown appropriatley referenced an error code other than unknown
+
+2008-01-31  James Gallagher <jgallagher@opendap.org>
+
+	Added conditional set of the gcc -Wall, et c., flags.
+
+2008-01-30  James Gallagher <jgallagher@opendap.org>
+
+	Include <algorithm> for all builds, not just win32. This is a fix
+	for AIX and its native compiler.
+
+2008-01-29  James Gallagher <jgallagher@opendap.org>
+
+	Update to the package target for OSX.
+	M    OSX_Resources/InstallationCheck
+	M    OSX_Resources/update_mac_package_contents.pl
+	M    OSX_Resources/InstallationCheck.strings
+	M    Makefile.am
+
+2008-01-28  James Gallagher <jgallagher@opendap.org>
+
+	It seems that universal binaries are not yet working - I commented
+	out that part of the Makefile.
+	M    Makefile.am
+
+2008-01-28  James Gallagher <jgallagher@opendap.org>
+
+	Hacked the Makefile.am so that the 'pkg' target makes a universal
+	binary - maybe. Fixed up the OSX resources' text.
+	M    OSX_Resources/Info.plist
+	M    OSX_Resources/Description.plist
+	M    Makefile.am
+
+2008-01-22  James Gallagher <jgallagher@opendap.org>
+
+	Added support to filter out ^M that's introduced by DOS editors.
+	M update_mac_package_contents.pl
+
+2008-01-16  James Gallagher <jgallagher@opendap.org>
+
+	Updated comments
+	M Makefile.am
+
+2008-01-16  James Gallagher <jgallagher@opendap.org>
+
+	Removed major and minor version.
+	M    OSX_Resources/Info.plist
+
+2008-01-14  James Gallagher <jgallagher@opendap.org>
+
+	Applied pkgconfig patch from Patrice.
+	M    libdap.spec
+	M    Makefile.am
+	M    libdapclient.pc.in
+	M    libdap.pc.in
+	M    unit-tests/testFile.cc
+	M    unit-tests/Makefile.am
+	M    libdapserver.pc.in
+	A    dap-config-pkgconfig
+
+2008-01-12  James Gallagher <jgallagher@opendap.org>
+
+	Auto reset of Subversion properties
+
+2008-01-11  James Gallagher <jgallagher@opendap.org>
+
+	Added. These help automate the build process.
+	AM   OSX_Resources/macify_license_file.pl
+	AM   OSX_Resources/update_mac_package_contents.pl
+
+2008-01-11  James Gallagher <jgallagher@opendap.org>
+
+	Updates to the OS/X build so that it is more automatic. No more
+	pmproj file, either. I added <code> tags in the README so that the
+	perl script that updates the Mac version of that file will look
+	decent.
+	M    OSX_Resources/InstallationCheck
+	M    OSX_Resources/License.txt
+	M    OSX_Resources/Info.plist
+	M    OSX_Resources/InstallationCheck.strings
+	M    OSX_Resources/ReadMe.txt
+	M    OSX_Resources/Welcome.html
+	M    README
+	M    Makefile.am
+	D    mac_osx
+	D    libdap.pmproj
+
+2008-01-10  Patrick West <pwest@ucar.edu>
+
+	Certain size vector of bytes was failing when writing to the xdr
+	stream.  Changed the size of the buffer to add enough to cover the
+	word boundary.  Updated unit test to test for this.
+	M    Vector.cc
+	M    XDRStreamMarshaller.cc
+	M    unit-tests/marshT.cc
+	M    unit-tests/arrayT.cc
+
+2008-01-08  James Gallagher <jgallagher@opendap.org>
+
+	Removed leading spaces of the lines so that the file can be used
+	easily on the Mac where lines will wrap in the Installer.
+
+2008-01-08  James Gallagher <jgallagher@opendap.org>
+
+	Fixed up these two tests to match the changes in the ais database
+	they used.
+	M    unit-tests/AISMergeTest.cc
+	M    unit-tests/AISResourcesTest.cc
+
+2008-01-07  James Gallagher <jgallagher@opendap.org>
+
+	make check now runs the unit tests (ticket 1012)
+	M    Makefile.am
+
+2008-01-07  James Gallagher <jgallagher@opendap.org>
+
+	Fixed the AIS database parser tests so they now use Hyrax and not
+	some kludge.
+	M    unit-tests/ais_testsuite/ais_database.xml
+	M    unit-tests/AISDatabaseParserTest.cc
+
+2007-12-01  James Gallagher <jgallagher@opendap.org>
+
+	Auto reset of Subversion properties
+
+2007-11-30  Patrick West <pwest@ucar.edu>
+
+	MacOSX resources updated. Added a README and INSTALL file to be put
+	alongside the .pkg in the .dmg.
+	M    OSX_Resources/Info.plist
+	D    README_MaxOSX.rtf
+	M    Makefile.am
+	A    README_MacOSX.rtf
+
+2007-11-30  James Gallagher <jgallagher@opendap.org>
+
+	Auto reset of Subversion properties
+
+2007-11-29  Patrick West <pwest@ucar.edu>
+
+	the .pc files needed to be dealt with during the pkg build so that
+	the prefix was set correctly.
+	M    Makefile.am
+
+2007-11-29  Patrick West <pwest@ucar.edu>
+
+	README and INSTALL files for a MacOSX installation. To be put into
+	the .dmg along with the .pkg.
+	A    README_MaxOSX.rtf
+	A    INSTALL_MacOSX.rtf
+
+2007-11-28  James Gallagher <jgallagher@opendap.org>
+
+	Updated for release 3.7.10
+
+	M    configure.ac
+	M    ChangeLog
+	M    INSTALL
+	M    libdap.spec
+	M    README
+	M    NEWS
+
+;; Local Variables:
+;; coding: utf-8
+;; End:
+2007-11-28  James Gallagher <jgallagher@opendap.org>
+
+	Fixed warnings about potentially uninitialized uses of ENTRY in
+	HTTPCache.cc
+
+2007-11-28  Patrick West <pwest@ucar.edu>
+
+	Added private default constructor, copy constructor, and operator=
+	to the classes, all through InternalErr. Added copyright
+	information as well.
+	
+	M    XDRUtils.h
+	M    UnMarshaller.h
+	M    XDRFileMarshaller.h
+	M    Marshaller.h
+	M    XDRUtils.cc
+	M    XDRFileUnMarshaller.cc
+	M    XDRFileUnMarshaller.h
+	M    XDRStreamMarshaller.h
+	M    XDRStreamMarshaller.cc
+	M    XDRFileMarshaller.cc
+
+2007-11-26  Patrick West <pwest@ucar.edu>
+
+	In Vector.cc, checking if _var is null before attempting delete.
+	Didn't appear to be an issue, but seemed to be a needed test.
+
+	In XDRStreamMarshaller, not allocating such a large buffer.
+	Allocating only what is needed in put_str and both put_vector
+	calls. The other methods are using the static buffer so we don't
+	have to allocate each time. Prettied up the code, added more
+	comments, and corrected some exception messages.
+	
+	M    Vector.cc
+	M    XDRStreamMarshaller.cc
+
+2007-11-21  James Gallagher <jgallagher@opendap.org>
+
+	libdapclient and libdapserver library versions bumped up.
+
+	M    configure.ac
+	M    depend.sh
+	M    libdap.spec
+	M    NEWS
+
+2007-11-14  James Gallagher <jgallagher@opendap.org>
+
+	Fixed the LIBDAP CHECK macro
+
+	M    conf/libdap.m4
+
+2007-11-13  James Gallagher <jgallagher@opendap.org>
+
+	Updated for version 3.7.9
+
+	M    configure.ac
+	M    ChangeLog
+	M    INSTALL
+	M    libdap.spec
+	M    README
+	M    NEWS
+
+2007-11-13  James Gallagher <jgallagher@opendap.org>
+
+	Fixeed ticket #995. The problem was in intern_data_for_leaf.
+	This problem was fixed by changing the way intern_data_for_leaf()
+	worked, slightly. It was always popping the stack of `d_values`
+	object pointers regardless of the return value of read_row().
+	However, if no values are read then the call to
+	intern_data_for_parent_part_two() would never be called and the
+	d_values field of the child sequence wouldn't be pushed onto the stack.
+	Hence the pop should not happen - because there's no child there to
+	pop. I fixed this with a slight change in the code. The method now
+	skips the while loop and subsequent pop operation if the first call
+	to read_row() returns false. The while loop won't be run anyway,
+	so the actual change is minor and eliminates an unnecessary test
+	in the case where read_row does return false initially.
+
+	All of the tests that are expected to pass now do.
+
+2007-11-12  James Gallagher <jgallagher@opendap.org>
+
+	Grid.cc: Changed the way the declarataion is printed by print_val()
+	so that intern_data can use this too and work with the expr-test
+	test driver.
+	Sequence.cc: transfer_data_part_two() now uses intern_data() when
+	it should in place of read(). Also, print_one_row() is now more
+	flexible in the way it prints rows. Before it expected that the
+	first row would alway be printed (because it assume that the row
+	had been read by deserialize()). Now it checks to see if the row
+	should be printed because it knows that intern_data() might be
+	run and that method is working with local data - the first row
+	might not satisfy the CE.
+	Sequence.h: Formatting
+	Structure.cc: Switched from transfer_data to intern_data.
+
+2007-11-12  James Gallagher <jgallagher@opendap.org>
+
+	Fixed this test. The error message changed and the test failed
+	for that reason, not that error went undetected.
+
+	M dds-testsuite/dds-test.0/test.17.exp
+
+2007-11-12  James Gallagher <jgallagher@opendap.org>
+
+	Copied and munged these so that they call the expr-test_start
+	procedure and test intern_data() in libdap.
+
+	M    test.9.exp
+	M    test.ya.exp
+	M    test.yb.exp
+	M    test.yc.exp
+	M    test.yd.exp
+	M    test.ye.exp
+	M    test.yf.exp
+	M    test.yg.exp
+	M    test.a.exp
+	M    test.b.exp
+	M    test.c.exp
+	M    test.d.exp
+	M    test.zz0.exp
+	M    test.e.exp
+	M    test.zz1.exp
+	M    test.zz2.exp
+	M    test.f.exp
+	M    test.zz3.exp
+	M    test.g.exp
+	M    test.zz4.exp
+	M    test.61a.exp
+	M    test.h.exp
+	M    test.zz5.exp
+	M    test.61b.exp
+	M    test.i.exp
+	M    test.61c.exp
+	M    test.j.exp
+	M    test.61d.exp
+	M    test.k.exp
+	M    test.l.exp
+	M    test.m.exp
+	M    test.n.exp
+	M    test.o.exp
+	M    test.p.exp
+	M    test.q.exp
+	M    test.r.exp
+	M    test.s.exp
+	M    test.t.exp
+	M    test.u.exp
+	M    test.v.exp
+	M    test.w.exp
+	M    test.wa.exp
+	M    test.x.exp
+	M    test.wb.exp
+	M    test.y.exp
+	M    test.wc.exp
+	M    test.xa.exp
+	M    test.xb.exp
+	M    test.xc.exp
+	M    test.xd.exp
+	M    test.xe.exp
+	M    test.z0.exp
+	M    test.z1.exp
+	M    test.z2.exp
+	M    test.z3.exp
+	M    test.z4.exp
+	M    test.z5.exp
+	M    test.z6.exp
+	M    test.1.exp
+	M    test.z7.exp
+	M    test.2.exp
+	M    test.5.exp
+	M    test.6.exp
+
+2007-11-12  James Gallagher <jgallagher@opendap.org>
+
+	Updated test code so that the new intern_data() method is tested.
+
+	M    tests/TestInt32.cc
+	M    tests/TestInt32.h
+	M    tests/TestInt16.cc
+	M    tests/TestStructure.h
+	M    tests/TestInt16.h
+	M    tests/TestUrl.h
+	M    tests/TestStr.h
+	M    tests/TestSequence.h
+	M    tests/TestFloat32.cc
+	M    tests/TestArray.cc
+	M    tests/TestFloat64.cc
+	M    tests/expr-testsuite/config/unix.exp
+	M    tests/TestFloat64.h
+	M    tests/TestUInt32.cc
+	M    tests/TestGrid.cc
+	M    tests/TestUInt16.cc
+	M    tests/TestGrid.h
+	M    tests/TestCommon.h
+	M    tests/expr-test.cc
+	M    tests/TestStructure.cc
+	M    tests/TestUrl.cc
+	M    tests/TestByte.cc
+	M    tests/TestByte.h
+	M    tests/TestSequence.cc
+	M    tests/TestStr.cc
+	M    tests/README
+	M    tests/TestFloat32.h
+	M    tests/TestArray.h
+	M    tests/TestUInt32.h
+	M    tests/TestUInt16.h
+	M    tests/TestCommon.cc
+
+2007-11-08  James Gallagher <jgallagher@opendap.org>
+
+	Added the intern_data() method as a replacement and fix for/to
+	transfer_data(). This method should correctly handle the types
+	presented by HDF5 like Array of Structure
+
+	M    Structure.h
+	M    Sequence.h
+	M    BaseType.h
+	M    BaseType.cc
+	M    Grid.h
+	M    Structure.cc
+	M    Vector.cc
+	M    Sequence.cc
+	M    Vector.h
+	M    Grid.cc
+	M    unit-tests/HTTPCacheTest.cc
+	M    unit-tests/SequenceTest.cc
+
+2007-11-08  Patrick West <pwest@ucar.edu>
+
+	All characters in the pathname need to match the regular
+	expression. So need to compare the result of the match call in
+	pathname_ok to the length of the path being matched. If not all
+	characters match, then return false. 
+
+	M util.cc
+
+2007-10-31  James Gallagher <jgallagher@opendap.org>
+
+	Added pathname_ok() prototype to util.h and added malloc
+	check to XDRStreamMarshaller.cc
+
+2007-10-30  James Gallagher <jgallagher@opendap.org>
+
+	Fixed a parse error in the pathname sanitizer function.
+
+	M util.cc
+
+2007-10-24  James Gallagher <jgallagher@opendap.org>
+
+	Formatting
+
+2007-09-27  James Gallagher <jgallagher@opendap.org>
+
+	Auto reset of Subversion properties
+
+2007-09-26  Patrick West <pwest@ucar.edu>
+
+	marshaller test
+	
+	A    unit-tests/marshT.cc
+
+2007-09-24  James Gallagher <jgallagher@opendap.org>
+
+	Applied patch from Patrice to package/ship generated
+	files with source dists.
+
+	M Makefile.am
+
+2007-09-21  James Gallagher <jgallagher@opendap.org>
+
+	Fixed various issues.
+
+2007-08-28  James Gallagher <jgallagher@opendap.org>
+
+	Modified because issues show up in the nightly builds.
+
+	M    XDRUtils.cc
+	M    Vector.cc
+
+2007-08-28  James Gallagher <jgallagher@opendap.org>
+
+	unit-test/Makefile.am: Removed comments that shadowed various
+	unit tests since I think that was checked in by mistake.
+
+2007-08-28  James Gallagher <jgallagher@opendap.org>
+
+	Auto reset of Subversion properties
+
+2007-08-27  Patrick West <pwest@ucar.edu>
+
+	Added methods to be able to send dap objects to iostream in
+	addition to the methods to send to FILE pointers. Created
+	Marshaller and UnMarshaller classes to pass to serialize and
+	deserialize methods (respectively) to separate out that code from
+	BaseType classes. Created XDRFileMarshaller to serialize into XDR
+	using FILE pointer. Created XDRStreamMarshaller to serialize into
+	XDR using ostream (XDR memory buffer). Created XDRFileUnMarshaller
+	to read from XDR using FILE pointer. Did NOT create
+	XDRStreamUnmarshaller as it didn't seem to be needed. Separated
+	out anything to do with XDR into separate header files and utility
+	class XDRUtils.
+	
+	M    DODSFilter.cc
+	M    Int16.cc
+	M    Int32.h
+	M    Structure.h
+	M    Sequence.h
+	M    Str.h
+	M    configure.ac
+	A    XDRUtils.h
+	A    xdr-datatypes-static.h
+	M    cgi_util.cc
+	A    xdr-datatypes-config.h.in
+	M    dods-datatypes-static.h
+	M    Error.cc
+	A    UnMarshaller.h
+	M    Int16.h
+	M    DAS.h
+	M    DDS.cc
+	A    XDRFileMarshaller.h
+	M    tests/expr-test.cc
+	M    Array.cc
+	M    BaseType.h
+	M    Float64.h
+	M    UInt16.cc
+	M    AlarmHandler.h
+	A    Marshaller.h
+	M    Byte.cc
+	M    Byte.h
+	M    DDS.h
+	M    BaseType.cc
+	A    XDRUtils.cc
+	M    Makefile.am
+	M    Constructor.h
+	M    Error.h
+	M    Int32.cc
+	M    DODSFilter.h
+	M    DataDDS.cc
+	M    Float32.cc
+	M    util.h
+	M    AttrTable.cc
+	M    Grid.h
+	M    Structure.cc
+	M    cgi_util.h
+	M    Vector.cc
+	M    Str.cc
+	M    Sequence.cc
+	A    XDRFileUnMarshaller.cc
+	M    Float32.h
+	A    XDRFileUnMarshaller.h
+	M    AttrTable.h
+	M    Constructor.cc
+	M    UInt32.h
+	A    XDRStreamMarshaller.h
+	M    dods-datatypes-config.h.in
+	M    Vector.h
+	M    DAS.cc
+	M    util.cc
+	M    Float64.cc
+	M    UInt32.cc
+	A    XDRStreamMarshaller.cc
+	M    Grid.cc
+	M    Connect.cc
+	M    unit-tests/Makefile.am
+	A    XDRFileMarshaller.cc
+	M    Array.h
+	M    UInt16.h
+
+2007-08-24  James Gallagher <jgallagher@opendap.org>
+
+	Makefile.am: Updated fortify targets
+
+2007-08-22  Patrick West <pwest@ucar.edu>
+
+	Functionality of Passive classes was passed to their parent
+	classes. Added set_value(vector<type>) methods to Vector. Added
+	default read method to Structure that iterates through vars and
+	calls read, just as PassiveStructure did. Removed Passive classes
+	from Makefile.
+	
+	D    PassiveUrl.cc
+	D    PassiveInt16.h
+	M    Structure.h
+	D    PassiveStr.cc
+	D    PassiveStr.h
+	D    PassiveUInt16.h
+	D    PassiveInt16.cc
+	D    PassiveByte.cc
+	D    PassiveFloat32.h
+	D    PassiveStructure.cc
+	D    PassiveStructure.h
+	D    PassiveUInt32.cc
+	D    PassiveFloat32.cc
+	D    PassiveArray.cc
+	M    Makefile.am
+	D    PassiveInt32.cc
+	M    Structure.cc
+	M    Vector.cc
+	D    PassiveFloat64.cc
+	D    PassiveArray.h
+	D    PassiveInt32.h
+	D    PassiveUrl.h
+	D    PassiveByte.h
+	M    Vector.h
+	D    PassiveFloat64.h
+	D    PassiveUInt32.h
+	D    PassiveUInt16.cc
+
+2007-08-22  James Gallagher <jgallagher@opendap.org>
+
+	Str.h: Changed the size of max_str_len from 32767 to 65535
+	(DODS_USHORT_INT-1) because 32k was not big enough for the
+	AURA HDF5 data files. See ticket 962 and 956.
+
+2007-08-21  James Gallagher <jgallagher@opendap.org>
+
+	Response.h: Made the new 'status' parameter have a default
+	value of '0' so that specializations do not need modification
+	if they know nothing about the new param. This change was
+	made for PipeResponse.h - arguably something that should be
+	removed, but it's there as long as we support the CGI server.
+	StdinResponse.h: Removed the second param to teh ctor since
+	it is no longer needed.
+
+2007-08-21  James Gallagher <jgallagher@opendap.org>
+
+	Makefile.am: Removed -Werror since on OS/X and RHEL3
+	the grammar files generate warnings about unused
+	variables.
+
+2007-08-20  James Gallagher <jgallagher@opendap.org>
+
+	Removed warnings about strict aliasing rules by adding
+	Vector::void *value() and replacing calls to buf2_val()
+	with it. See ticket #941.
+
+2007-08-20  James Gallagher <jgallagher@opendap.org>
+
+	Updates to a number of the doxygen comments.
+
+2007-08-20  James Gallagher <jgallagher@opendap.org>
+
+	Fixed a problem in util.cc where the sense of size_ok()
+	was backwards! Also rewrote parts of ce_functions.cc so
+	that value() was used in place of buf2val() which is far
+	better from a type-safety standpoint and removes a number
+	of warnings about strict aliasing of types. Also fixed
+	error in Error.cc where 'undefined_error' was used where
+	zero (0) should have been used. Modified RValue"build_btp_args()
+	so that the size of the arg list is added to the malformed
+	args message.
+
+2007-08-18  James Gallagher <jgallagher@opendap.org>
+
+	Patch from Patrice Dumas that fixes the distclean target and
+	repairs the spec file now that the generated grammar files are no
+	longer included checked into subversion.
+
+	M    libdap.spec
+	M    Makefile.am
+
+2007-08-17  James Gallagher <jgallagher@opendap.org>
+
+	Added a target so that the generated grammar files are copied to a
+	directory so that they don't _have_ to be built using bison/flex.
+
+	M    INSTALL
+	M    Makefile.am
+
+2007-08-17  James Gallagher <jgallagher@opendap.org>
+
+	I removed the generated grammar files from svn (but put copies in
+	the new 'grammarfile' subdirectory). Now, svn checkouts need bison
+	and flex to build.
+
+	D    lex.gse_.cc
+	D    lex.dds.cc
+	D    expr.tab.h
+	D    dds.tab.h
+	D    ce_expr.tab.cc
+	M    GNU/GNURegex.cc
+	D    lex.Error.cc
+	M    Makefile.am
+	D    ce_expr.tab.h
+	D    Error.tab.h
+	A    grammarfiles
+	A    grammarfiles/ce_expr.tab.h
+	A    grammarfiles/lex.das.cc
+	A    grammarfiles/Error.tab.cc
+	A    grammarfiles/Error.tab.h
+	A    grammarfiles/lex.dds.cc
+	A    grammarfiles/lex.gse_.cc
+	A    grammarfiles/lex.ce_expr.cc
+	A    grammarfiles/das.tab.cc
+	A    grammarfiles/das.tab.h
+	A    grammarfiles/dds.tab.cc
+	A    grammarfiles/lex.Error.cc
+	A    grammarfiles/dds.tab.h
+	A    grammarfiles/gse.tab.cc
+	A    grammarfiles/gse.tab.h
+	A    grammarfiles/expr.tab.h
+	A    grammarfiles/ce_expr.tab.cc
+	D    lex.das.cc
+	D    lex.ce_expr.cc
+	D    das.tab.h
+	D    das.tab.cc
+	D    dds.tab.cc
+	D    Error.tab.cc
+	D    gse.tab.cc
+	D    gse.tab.h
+
+2007-08-15  James Gallagher <jgallagher@opendap.org>
+
+	Fixes
+
+2007-08-15  James Gallagher <jgallagher@opendap.org>
+
+	Fixes
+
+	M    lex.gse_.cc
+	M    lex.dds.cc
+	M    dds.tab.h
+	M    lex.Error.cc
+	M    Makefile.am
+	M    util.h
+	M    lex.das.cc
+	M    lex.ce_expr.cc
+	M    util.cc
+	M    dds.tab.cc
+	M    GeoConstraint.cc
+
+2007-08-15  James Gallagher <jgallagher@opendap.org>
+
+	Patch to add HTTP response status to the Response object and to fix the
+	spelling of getdap (it was geturl in places). From Darren Hardy.
+
+	M    HTTPResponse.h
+	M    lex.gse_.cc
+	M    lex.dds.cc
+	M    Response.h
+	M    dds.tab.h
+	M    lex.Error.cc
+	M    HTTPCacheResponse.h
+	M    HTTPConnect.cc
+	M    lex.das.cc
+	M    getdap.cc
+	M    lex.ce_expr.cc
+	M    AISMerge.cc
+	M    dds.tab.cc
+	M    StdinResponse.h
+
+2007-08-13  James Gallagher <jgallagher@opendap.org>
+
+	Modified as part of refactoring.
+
+	M    RValue.cc
+	M    cgi_util.cc
+	M    Error.cc
+	M    ConstraintEvaluator.cc
+	M    DDS.cc
+	M    Array.cc
+	M    Makefile.am
+	M    Error.h
+	M    HTTPCache.cc
+	M    DataDDS.cc
+	M    dds.lex
+	M    DAS.cc
+	M    util.cc
+	M    Connect.cc
+	M    dods-limits.h
+	M    dds.y
+	M    Array.h
+	M    ce_expr.lex
+
+2007-08-09  James Gallagher <jgallagher@opendap.org>
+
+	Applied the hyrex_redirect patch from NASA. This code now detects and
+	records the value of a Location: HTTP header.
+
+	M    HTTPConnect.cc
+
+2007-08-07  Patrick West <pwest@ucar.edu>
+
+	OPeNDAPDir and OPeNDAPFile not needed in libdap, specific to cedar
+	project. M Makefile.am
+
+2007-08-07  Patrick West <pwest@ucar.edu>
+
+	Not needed in libdap, specific to cedar project.
+	
+	A    http://scm.opendap.org:8090/svn/trunk/cedar-handler/OPeNDAPFile.h
+	D    http://scm.opendap.org:8090/svn/trunk/libdap/OPeNDAPFile.h
+
+2007-08-07  Patrick West <pwest@ucar.edu>
+
+	Not needed in libdap, specific to cedar project.
+	
+	A    http://scm.opendap.org:8090/svn/trunk/cedar-handler/OPeNDAPFile.cc
+	D    http://scm.opendap.org:8090/svn/trunk/libdap/OPeNDAPFile.cc
+
+2007-08-07  Patrick West <pwest@ucar.edu>
+
+	Not needed in libdap, specific to cedar project.
+	
+	A    http://scm.opendap.org:8090/svn/trunk/cedar-handler/OPeNDAPDir.cc
+	D    http://scm.opendap.org:8090/svn/trunk/libdap/OPeNDAPDir.cc
+
+2007-08-07  Patrick West <pwest@ucar.edu>
+
+	Not needed in libdap, specific to cedar project.
+	A    http://scm.opendap.org:8090/svn/trunk/cedar-handler/OPeNDAPDir.h
+	D    http://scm.opendap.org:8090/svn/trunk/libdap/OPeNDAPDir.h
+
+2007-06-27  James Gallagher <jgallagher@opendap.org>
+
+	unit-tests/Makefile.am: Added -I$(topsrcdir) to the CPPFLAGS for
+	distcheck.
+
+2007-06-27  James Gallagher <jgallagher@opendap.org>
+
+	tests/Makefile.am: Added -I$(topsrcdir) to the CPPFLAGS for
+	distcheck.
+
+2007-06-27  James Gallagher <jgallagher@opendap.org>
+
+	Updated for version 3.7.8
+
+	M    INSTALL
+	M    README
+	M    NEWS
+
+2007-06-26  James Gallagher <jgallagher@opendap.org>
+
+	Updates for version 3.7.8 - still need to do README and INSTALL.
+
+	M    DODSFilter.cc
+	M    configure.ac
+	M    ChangeLog
+	M    libdap.spec
+	M    NEWS
+
+2007-06-26  James Gallagher <jgallagher@opendap.org>
+
+	Replaced unidata support email with the opendap-tech list address.
+
+2007-06-26  James Gallagher <jgallagher@opendap.org>
+
+	Auto reset of Subversion properties
+
+2007-06-25  James Gallagher <jgallagher@opendap.org>
+
+	Added.
+
+	AM   gl/config.charset
+
+2007-06-25  James Gallagher <jgallagher@opendap.org>
+
+	Added files from the gnulib update.
+
+	A    gl/m4/wint_t.m4
+	A    gl/m4/wchar.m4
+	A    gl/m4/localcharset.m4
+	A    gl/m4/ulonglong.m4
+	A    gl/m4/stdint.m4
+	A    gl/m4/gnulib-common.m4
+	A    gl/m4/wctype.m4
+	A    gl/m4/longlong.m4
+	A    gl/m4/include_next.m4
+	A    gl/m4/glibc21.m4
+	AM   gl/localcharset.c
+	A    gl/ref-del.sed
+	AM   gl/localcharset.h
+	A    gl/ref-del.sin
+	A    gl/ref-add.sed
+	AM   gl/wchar_.h
+	A    gl/ref-add.sin
+	AM   gl/stdint_.h
+	AM   gl/wctype_.h
+
+2007-06-22  James Gallagher <jgallagher@opendap.org>
+
+	Updated gnulib and fixed a memory problem in the GNURegex class
+	(which should really be renamed to DAPRegex, but that would break
+	other code). The problem was that to use the gnulib regex code the
+	config.h header has to be included and the gl subdir must be
+	searched. I moved the declaration of the regex_t field of Regex
+	into the implementation file to avoid having config.h in a header
+	that is installed in <prefix>/include. This fixes ticket #953
+	which first showed up in libnc-dap.
+
+	M    tests/Makefile.am
+	M    GNU/GNURegex.cc
+	M    GNU/GNURegex.h
+	M    Makefile.am
+	M    regex_test.cc
+	M    gl/alloca_.h
+	M    gl/m4/regex.m4
+	M    gl/m4/gnulib-comp.m4
+	M    gl/m4/ssize_t.m4
+	M    gl/m4/gnulib-cache.m4
+	M    gl/m4/onceonly_2_57.m4
+	M    gl/m4/codeset.m4
+	M    gl/m4/alloca.m4
+	M    gl/m4/extensions.m4
+	M    gl/regex_internal.c
+	M    gl/malloc.c
+	M    gl/stdbool_.h
+	M    gl/regex.c
+	M    gl/regex_internal.h
+	M    gl/regex.h
+	M    gl/regexec.c
+	M    gl/Makefile.am
+	M    gl/gettext.h
+	M    gl/alloca.c
+	M    gl/regcomp.c
+	M    util.cc
+	M    Operators.h
+	M    unit-tests/RegexTest.cc
+	M    unit-tests/Makefile.am
+
+2007-06-21  James Gallagher <jgallagher@opendap.org>
+
+	Reverted to the old version of get_attr() for release.
+
+	M    AttrTable.cc
+
+2007-06-21  James Gallagher <jgallagher@opendap.org>
+
+	escaping.cc: one last call to size replaced.
+
+2007-06-21  James Gallagher <jgallagher@opendap.org>
+
+	escaping.cc: Replaced calls to string::size() with ones to
+	string::length(). They return the same information, but it's
+	cleaner to use the same method everywhere
+
+2007-06-19  James Gallagher <jgallagher@opendap.org>
+
+	Fixed a problem in save_raw_http_header() where a header from an
+	old server (terminated by a newline but no return) caused a read
+	violation when the header was empty.
+
+	M    HTTPConnect.cc
+
+2007-06-08  James Gallagher <jgallagher@opendap.org>
+
+	Spelling in comments and strings
+
+	M    AlarmHandler.h
+	M    GeoConstraint.h
+	M    expr.h
+	M    RCReader.h
+
+2007-06-04  James Gallagher <jgallagher@opendap.org>
+
+	Updated comments.
+
+	M    lex.gse_.cc
+	M    AISResources.cc
+	M    configure.ac
+	M    cgi_util.cc
+	M    lex.dds.cc
+	M    ChangeLog
+	M    ConstraintEvaluator.cc
+	M    Array.cc
+	M    ce_expr.tab.cc
+	M    Byte.cc
+	M    lex.Error.cc
+	M    ce_expr.tab.h
+	M    Error.tab.h
+	M    AttrTable.cc
+	M    lex.das.cc
+	M    lex.ce_expr.cc
+	M    das.tab.h
+	M    ce_functions.cc
+	M    Constructor.cc
+	M    das.tab.cc
+	M    ArrayGeoConstraint.cc
+	M    Connect.cc
+	M    Error.tab.cc
+	M    Clause.cc
+	M    doxy.conf
+	M    gse.tab.cc
+	M    gse.tab.h
+
+2007-05-25  James Gallagher <jgallagher@opendap.org>
+
+	Auto reset of Subversion properties
+
+2007-05-24  Patrick West <pwest@ucar.edu>
+
+	Standard location of PackageMaker command line app.
+	
+	M    Makefile.am
+
+2007-05-24  Patrick West <pwest@ucar.edu>
+
+	Ability to build .pkg file from the Makefile instead of running
+	PackageMaker GUI.
+	
+	A    OSX_Resources/Info.plist
+	A    OSX_Resources/Description.plist
+	M    Makefile.am
+
+2007-05-18  James Gallagher <jgallagher@opendap.org>
+
+	Updated pkg.m4 macros
+
+	M    pkg.m4
+
+2007-05-17  James Gallagher <jgallagher@opendap.org>
+
+	Fixed typos in grammar files.
+
+	M    Error.lex
+	M    gse.lex
+	M    gse.y
+	M    ce_expr.y
+	M    Error.y
+	M    dds.lex
+	M    das.lex
+	M    das.y
+	M    ce_expr.lex
+
+2007-05-17  James Gallagher <jgallagher@opendap.org>
+
+	Fixed typos in libdap headers.
+
+	M    DDXParser.h
+	M    Sequence.h
+	M    SignalHandler.h
+	M    debug.h
+	M    escaping.h
+	M    Connect.h
+	M    ce_functions.h
+	M    SignalHandlerRegisteredErr.h
+	M    gse_parser.h
+	M    DDS.h
+	M    ArrayGeoConstraint.h
+	M    GeoConstraint.h
+	M    HTTPCacheResponse.h
+	M    Error.h
+	M    AISResources.h
+	M    PipeResponse.h
+	M    util.h
+	M    Grid.h
+	M    AttrTable.h
+	M    PassiveUrl.h
+	M    Url.h
+	M    Clause.h
+	M    Operators.h
+	M    HTTPConnect.h
+	M    StdinResponse.h
+	M    Array.h
+	M    UInt16.h
+
+2007-05-17  James Gallagher <jgallagher@opendap.org>
+
+	Auto reset of Subversion properties
+
+2007-05-16  James Gallagher <jgallagher@opendap.org>
+
+	Added pkg.m4 to conf so build from svn will work on machines w/o
+	pkg-config. Updated comments.
+
+	A    conf/pkg.m4
+	M    Makefile.am
+	M    Constructor.h
+	M    unit-tests/Makefile.am
+
+2007-05-14  James Gallagher <jgallagher@opendap.org>
+
+	Removed the html docs from svn; RPM now builds a 'doc' package.
+
+	D    docs/html.tar.gz
+	M    libdap.spec
+
+2007-05-14  James Gallagher <jgallagher@opendap.org>
+
+	Resolved conflicted state of AISDatabaseParser.h
+
+2007-05-14  James Gallagher <jgallagher@opendap.org>
+
+	Auto reset of Subversion properties
+
+2007-05-13  James Gallagher <jgallagher@opendap.org>
+
+	Patrice Dumas' changes to dods-datatypes.h - Now the header uses
+	the C99 types unless the stdint.h header is not present.
+
+	D    dods-datatypes.h.in
+	M    configure.ac
+	A    dods-datatypes-static.h
+	M    conf/acinclude.m4
+	M    Makefile.am
+	A    dods-datatypes-config.h.in
+
+2007-05-13  James Gallagher <jgallagher@opendap.org>
+
+	Auto reset of Subversion properties
+
+2007-05-12  James Gallagher <jgallagher@opendap.org>
+
+	Added Patrice Dumas' pkgconf patches
+
+	M    dods-datatypes.h.in
+	M    configure.ac
+	AM   conf/compile
+	M    conf/libdap.m4
+	A    conf/check_zlib.m4
+	M    libdap.spec
+	M    BaseType.cc
+	M    Makefile.am
+	M    Structure.cc
+	A    libdapclient.pc.in
+	A    libdap.pc.in
+	A    libdapserver.pc.in
+	M    dap-config.in
+
+2007-05-10  James Gallagher <jgallagher@opendap.org>
+
+	Comments & Strings
+
+	M    BaseType.h
+	M    BaseType.cc
+	M    Float32.cc
+	M    AISDatabaseParser.h
+	M    Float32.h
+	M    AISDatabaseParser.cc
+	M    AISConnect.h
+
+2007-05-02  James Gallagher <jgallagher@opendap.org>
+
+	Updates for 3.7.7
+
+	M    configure.ac
+	M    ChangeLog
+	M    libdap.spec
+	M    README
+	M    NEWS
+
+2007-03-29  James Gallagher <jgallagher@opendap.org>
+
+	Added definition of trunc() for Solaris < 10.
+
+2007-03-29  James Gallagher <jgallagher@opendap.org>
+
+	Added definition of trunc() for Solaris < 10.
+
+2007-03-28  James Gallagher <jgallagher@opendap.org>
+
+	All files (.cc and .h) formatted using astyle. I found one
+	introduced error and one issue with the strings passed to the
+	Error exceptions.
+
+2007-03-27  James Gallagher <jgallagher@opendap.org>
+
+	Minor formatting changes.
+
+	M    Byte.cc
+	M    unit-tests/HTTPConnectTest.cc
+
+2007-03-27  James Gallagher <jgallagher@opendap.org>
+
+	Wrapped the calls to ConstraitEvaluator::eval() in a compile-time
+	constant (EVAL) which defaults to zero (so the calls are not made
+	for non-sequence types). Also wrapped the server-side compression
+	code in a compile-time constant COMPRESSION_FOR_SERVER3 which
+	is also zero by default. Lastly, added DapObj constructor init
+	for BAS, DDS and BaseTyep constructors.
+
+2007-03-26  James Gallagher <jgallagher@opendap.org>
+
+	DDS.cc, unit-tests/DDSTest.cc: Fixed ticket # 708. The dataBLOB
+	element now gets an empty href attribute.
+
+2007-03-26  James Gallagher <jgallagher@opendap.org>
+
+	README: Added a note about thread-saftey.
+
+2007-03-26  James Gallagher <jgallagher@opendap.org>
+
+	Patch from Patrice Dumas: Fix the order of library builds! This
+	closes #880.
+
+2007-03-23  James Gallagher <jgallagher@opendap.org>
+
+	Fixed the help/version/args messages for the server-side functions
+	so that they are somewhat rational. There is a ticket to develop a
+	'capabilities' response for Hyrax and that should replace these
+	messages.
+
+	M    ce_functions.cc
+	M    GeoConstraint.cc
+
+2007-03-23  James Gallagher <jgallagher@opendap.org>
+
+	Updated test for changes to the 'wrong number of args" messages
+	from the first set of server-side functions.
+
+	M    tests/expr-testsuite/data.zz0
+	M    tests/expr-testsuite/data.z0
+
+2007-03-12  James Gallagher <jgallagher@opendap.org>
+
+	Resolved signed/unsigned compares
+
+	M    Vector.cc
+
+2007-03-12  James Gallagher <jgallagher@opendap.org>
+
+	Removed some int/unsigned compares
+
+	M    tests/TestArray.cc
+
+2007-03-12  James Gallagher <jgallagher@opendap.org>
+
+	Updated notes and version information for 3.7.6.
+
+	M    configure.ac
+	M    README.AIS
+	M    ChangeLog
+	M    INSTALL
+	M    README.dodsrc
+	M    libdap.spec
+	M    README
+	M    NEWS
+
+2007-03-12  James Gallagher <jgallagher@opendap.org>
+
+	Fixed some errors in the unit tests, one bug in the RCReader when
+	reading the VALIDATE_SSL keyword. Updated the parser stuff.
+
+	M    lex.dds.cc
+	M    RCReader.cc
+	M    lex.das.cc
+	M    das.tab.h
+	M    das.y
+	M    das.tab.cc
+	M    unit-tests/RegexTest.cc
+	M    unit-tests/RCReaderTest.cc
+
+2007-03-11  James Gallagher <jgallagher@opendap.org>
+
+	Removed DODS_DEBUG
+
+	M    ce_functions.cc
+
+2007-03-09  James Gallagher <jgallagher@opendap.org>
+
+	Fixed ticket #857: The linear_scale function was crashing because
+	of a failure to test that a parent variable existed before getting
+	its type. I also fixed an unrelated problem where double quotes
+	around an attribute value broke the string --> double code and
+	added a new feature where files which omit the y intercept because
+	it's zero do not return an error but instead use 0.0 as a default.
+	Finally, the error message text was improved.
+
+	M ce_functions.cc
+
+2007-02-16  James Gallagher <jgallagher@opendap.org>
+
+	Makefile.am: removed some errant tabs.
+
+2007-02-16  James Gallagher <jgallagher@opendap.org>
+
+	dap-config.in: fixed #816; --help was wrong.
+
+2007-02-16  James Gallagher <jgallagher@opendap.org>
+
+	I removed throw(Error) from the method declarations in the header
+	and impl. files. I removed the include of Error.h from the header.
+	I added the include using "" in the impl. This should fix the
+	ml-structs build error that started on 1/7/07 when Rob made some
+	changes for the win32 build.
+
+	M    GNU/GNURegex.cc
+	M    GNU/GNURegex.h
+
+2007-02-09  James Gallagher <jgallagher@opendap.org>
+
+	Updated for version 3.7.5
+
+	M    docs/html.tar.gz
+	M    libdap.spec
+
+2007-02-07  James Gallagher <jgallagher@opendap.org>
+
+	main_page.doxygen: Updated the version number to 3.7.5.
+
+2007-02-07  James Gallagher <jgallagher@opendap.org>
+
+	ce_functions.cc, GeoConstraint.cc, HTTPConnect.cc: Formatting
+	lex.dds,cc, les.gse_.cc: Regenerated.
+
+2007-02-05  James Gallagher <jgallagher@opendap.org>
+
+	data.z2-7: updated the data values for two and three
+	dimensional arrays given the new code in GeoConstraint.
+
+2007-02-05  James Gallagher <jgallagher@opendap.org>
+
+	expr-test.cc, TestArray.cc: formatting changes
+
+2007-02-05  James Gallagher <jgallagher@opendap.org>
+
+	AISMergeTest.cc, HTTPConnectTest.cc: Fixed errors that have
+	cropped upover time, esp. as Server4 has become the default.
+
+2007-02-02  Patrick West <pwest@ucar.edu>
+
+	Added information about PATH and LD_LIBRARY_PATH.
+	M    INSTALL
+
+2007-01-30  James Gallagher <jgallagher@opendap.org>
+
+	ce_functions.cc: Added support for missing values to linear_scale.
+	Now, if missing_value is present (in the attributes or given as a
+	parameter) values which match will not be scaled.
+
+2007-01-29  James Gallagher <jgallagher@opendap.org>
+
+	ce_functions.cc: Added a new version of get
+	get_attribute_double_value() that takes a vector of strings
+	and returns the value of the first attribute found in that
+	vector. Also cleaned up the memory use in the linear_scale
+	function so that function no longer leaks the new template
+	variable. This was part of the fix for #660 (See also the
+	checkin for Clause.cc from today).
+
+2007-01-29  James Gallagher <jgallagher@opendap.org>
+
+	Clause.cc: Added a call to set_read_p(true) in Clause::value
+	so that handlers' read() methods will not try to 'read over'
+	the values inserted to the variables by a CE function.
+
+2007-01-29  James Gallagher <jgallagher@opendap.org>
+
+	GeoConstraint.cc: Minor formatting fix.
+
+2007-01-26  James Gallagher <jgallagher@opendap.org>
+
+	Updates to comments.
+
+2007-01-26  James Gallagher <jgallagher@opendap.org>
+
+	ce_functions.cc: Fixed ticket 659 where array data was not
+	read when a relational constraint was not used. The bug
+	crept in while making another fix (for the HDF4 handler).
+	The problem was that Grid::read() was used to read the maps
+	(bit not the Array) and as a side effect read_p was set for
+	the entire Grid, not just the maps. I reset the Array read_p
+	value; see ce_functions.cc
+
+2007-01-21  Rob Morris <Robert.O.Morris@jpl.nasa.gov>
+
+	Synch win32 Makefile wrt recent libdap code changes
+
+2007-01-12  James Gallagher <jgallagher@opendap.org>
+
+	Auto reset of Subversion properties
+
+2007-01-11  Patrick West <pwest@ucar.edu>
+
+	comment headers updated with correct information and Copyright.
+	M    DapObj.h
+	M    DapIndent.h
+	M    DapIndent.cc
+
+2007-01-11  Patrick West <pwest@ucar.edu>
+
+	Added dump method to the BaseType classes, DAS, DDS, DataDDS. To
+	do this, created a DapObj base class for all of these to inherit
+	from (directly or indirectly) and in the DapObj class is the
+	operator<< method. This will aid in debugging. Created an
+	indentation classes to help with dumping objects.
+
+	M    Int16.cc
+	M    Int32.h
+	M    Structure.h
+	M    Sequence.h
+	M    Str.h
+	M    Int16.h
+	M    DAS.h
+	M    DDS.cc
+	M    BaseType.h
+	M    Array.cc
+	M    Float64.h
+	M    UInt16.cc
+	M    Byte.cc
+	M    Byte.h
+	M    DataDDS.h
+	M    BaseType.cc
+	M    DDS.h
+	M    Makefile.am
+	M    Constructor.h
+	M    Int32.cc
+	A    DapObj.h
+	M    DataDDS.cc
+	A    DapIndent.h
+	M    Float32.cc
+	M    AttrTable.cc
+	M    Grid.h
+	M    Structure.cc
+	M    Vector.cc
+	M    Str.cc
+	M    Sequence.cc
+	M    Float32.h
+	M    AttrTable.h
+	M    Constructor.cc
+	M    UInt32.h
+	M    Vector.h
+	M    DAS.cc
+	M    Float64.cc
+	M    UInt32.cc
+	M    Grid.cc
+	A    DapIndent.cc
+	M    Array.h
+	M    UInt16.h
+
+2007-01-08  James Gallagher <jgallagher@opendap.org>
+
+	Auto reset of Subversion properties
+
+2007-01-07  Rob Morris <Robert.O.Morris@jpl.nasa.gov>
+
+	Last Makefile tweeks to automate pkging for win32
+
+2007-01-07  Rob Morris <Robert.O.Morris@jpl.nasa.gov>
+
+	Add doc's that accompany win32 libdap releases to the repository
+
+2007-01-07  James Gallagher <jgallagher@opendap.org>
+
+	Auto reset of Subversion properties
+
+2007-01-06  Rob Morris <Robert.O.Morris@jpl.nasa.gov>
+
+	Prevent "error.h" from getting picked up during ml-structs build
+	under win32 (that's error.h with a little "e").
+
+2007-01-06  Rob Morris <Robert.O.Morris@jpl.nasa.gov>
+
+	Removed VC++-6.x-specific ifdefs.  6.x not supported any longer anyway
+	as some old template-related hacks are no longer in the code.
+
+2007-01-06  Rob Morris <Robert.O.Morris@jpl.nasa.gov>
+
+	Add sample code for compiling/linking with libdap under win32
+
+2007-01-03  James Gallagher <jgallagher@opendap.org>
+
+	Vector.h: Removed 'Vector::' prefix in a bunch on accessors; these
+	caused g++ 4.1.1 to gag. Fix from Rob Cermak.
+
+2007-01-02  Patrick West <pwest@ucar.edu>
+
+	3.7.4 release
+	M    configure.ac
+	M    ChangeLog
+	M    libdap.spec
+	M    NEWS
+
+2006-12-31  Rob Morris <Robert.O.Morris@jpl.nasa.gov>
+
+	Synchronize select win32 Makefiles to build/pkg the same way
+
+2006-12-20  James Gallagher <jgallagher@opendap.org>
+
+	Added Structure::transfer_data() so that a handler can simulate the
+	actions of serialize() without actually sending the data.
+	M    Structure.h
+	M    Structure.cc
+	M    Sequence.cc
+
+2006-12-20  James Gallagher <jgallagher@opendap.org>
+
+	DDXParser.cc: Fixed an error introduced by the Eclipse
+	code formatter.
+
+2006-12-19  James Gallagher <jgallagher@opendap.org>
+
+	DDXParser.cc, DODSFilter.cc: Formatting changes
+
+2006-12-13  James Gallagher <jgallagher@opendap.org>
+
+	Updated libdap.pmproj to/for version 3.7.3
+
+2006-12-10  Rob Morris <Robert.O.Morris@jpl.nasa.gov>
+
+	Change of pkging location simplifies user builds
+
+2006-12-06  Rob Morris <Robert.O.Morris@jpl.nasa.gov>
+
+	Set LIBDAP_ROOT appropriately in the MS Windows case
+
+2006-12-06  Rob Morris <Robert.O.Morris@jpl.nasa.gov>
+
+	Remove external .manifest as an issue by internalizing into binaries
+
+2006-12-05  James Gallagher <jgallagher@opendap.org>
+
+	getdap.cc: Fixed a bug where the constraint expression passed
+	in using -c was not used when getting either a DDS or a DDX
+	(but it was used when getting data).
+
+2006-12-05  James Gallagher <jgallagher@opendap.org>
+
+	Added comments to DDS and DataDDS about when it's OK
+	to delete their type factories (only when you're done
+	using the DDS or if you're about to switch to a new
+	factory).
+
+2006-12-05  Rob Morris <Robert.O.Morris@jpl.nasa.gov>
+
+	Require *.exe.manifest to accompany .exe's if they are to run.  I
+	guess I don't yet know why these are generated
+
+2006-12-05  Rob Morris <Robert.O.Morris@jpl.nasa.gov>
+
+	Improve win32 exe linking
+
+2006-12-03  Rob Morris <Robert.O.Morris@jpl.nasa.gov>
+
+	Just libdap for win32 makefile tweeks
+
+2006-12-02  Rob Morris <Robert.O.Morris@jpl.nasa.gov>
+
+	New Makefile code to gen exports for dll's automatically
+
+2006-12-02  Rob Morris <Robert.O.Morris@jpl.nasa.gov>
+
+	Module export def's no longer required.  Constructed at build time.
+
+2006-11-25  Rob Morris <Robert.O.Morris@jpl.nasa.gov>
+
+	Automate module export definition regeneration for dll's (hard)
+
+2006-11-24  James Gallagher <jgallagher@opendap.org>
+
+	Updated OSX ReadME.txt for 3.7.3
+
+2006-11-24  James Gallagher <jgallagher@opendap.org>
+
+	Documentation and build file update for the 3.7.3 release.
+
+2006-11-24  James Gallagher <jgallagher@opendap.org>
+
+	AISMergeTest.cc: UPdated baseline to account for new fnoc1.das
+	file in data/nc.
+
+2006-11-22  James Gallagher <jgallagher@opendap.org>
+
+	Updated ChangeLog
+
+2006-11-21  James Gallagher <jgallagher@opendap.org>
+
+	Fixed unescattr() in escaping.cc. Now the code works when there
+	are several escaped characters or when the escapes are escaped.
+	That is, this version can be used by the libnc-dap library and the
+	result is code that passes all the nc_test tests for char and text
+	attributes.
+
+2006-11-12  Rob Morris <Robert.O.Morris@jpl.nasa.gov>
+
+	Make win32 pkging dir locaton slightly more flexible
+
+2006-11-12  Rob Morris <Robert.O.Morris@jpl.nasa.gov>
+
+	Update module export definitions for dll versions of the Core
+
+2006-11-11  James Gallagher <jgallagher@opendap.org>
+
+	Removed errant 3.7.3 sub directory.
+
+2006-11-07  James Gallagher <jgallagher@opendap.org>
+
+	HTTPConnectTest.cc: Turned off debugging
+
+2006-11-07  James Gallagher <jgallagher@opendap.org>
+
+	HTTPConnectTest.cc: Fixed up the tests for headers once again...
+
+2006-11-07  James Gallagher <jgallagher@opendap.org>
+
+	Auto reset of Subversion properties
+
+2006-11-06  James Gallagher <jgallagher@opendap.org>
+
+	configure.ac: I moved the DAP Protocol setting up where
+	it's likely to be updated and not glossed over.
+
+2006-11-06  James Gallagher <jgallagher@opendap.org>
+
+	getdap.cc: getdap now reports the protocol version in addition
+	to the server version.
+
+2006-11-06  James Gallagher <jgallagher@opendap.org>
+
+	Added tests for the new parameter VALIDATE_SSL
+
+2006-11-06  James Gallagher <jgallagher@opendap.org>
+
+	HTTPConnect.cc, RCReader: The .dodsrc file now supports a
+	VALIDATE_SSL option which controls libcurl's validation of SSL
+	hosts and certificates. If this is set (the default), certificates
+	must be signed by a recognized Certificate Authority and hosts
+	must be properly named. Clear (set to zero) to get the old
+	behavior from libcurl which does not perform this validation.
+
+2006-11-03  James Gallagher <jgallagher@opendap.org>
+
+	HTTPConnect.cc: Modified so that gzip and compress are also
+	accepted encodings.
+
+2006-11-02  Patrick West <pwest@ucar.edu>
+
+	Removed DODSResponseObject from the Makefile after removing the
+	file from libdap. DAS and DDS no longer inherit from
+	DODSResponseObject. New classes representing DAS, DDS and DataDDS
+	were created in BES. M Makefile.am
+
+2006-11-02  Patrick West <pwest@ucar.edu>
+
+	Moved DODSResponseObject.h to the BES, naming it
+	BESResponseObject. Created in BES three classes to represent DAS,
+	DDS, and DataDDS. D DODSResponseObject.h M DAS.h M DDS.h M DDS.cc
+
+2006-10-30  James Gallagher <jgallagher@opendap.org>
+
+	expr-tests for geogrid() and geoarray(): Fixed the tests so they
+	work using the new notation which passed geo points using lat,lon
+	as opposed to lon,lat.
+
+2006-10-30  James Gallagher <jgallagher@opendap.org>
+
+	Makefile.am: Removed the debug flags from AM_CXXFLAGS. -Werror
+	really breaks the builds because of issues in the bison/flex
+	code.
+
+2006-10-28  James Gallagher <jgallagher@opendap.org>
+
+	Auto reset of Subversion properties
+
+2006-10-27  James Gallagher <jgallagher@opendap.org>
+
+	Constructor.cc, ArrayGeoConstructor.cc: Removed DODS_DEBUG
+
+2006-10-27  James Gallagher <jgallagher@opendap.org>
+
+	DDSTest.cc: Removed compiler warnings.
+
+2006-10-27  James Gallagher <jgallagher@opendap.org>
+
+	HTTPConnect.cc: Fixed a bug in save_raw_http_headers() where the
+	test for the \r\n line terminator was broken (tested nmemb-1 instead
+	of nmemb-2.
+	Makefile.am: added a target for test coverage and added the debugging
+	options to CXXFLAGS by default. Make sure to back this out before
+	release
+	Unit Tests: Fixed up warnings in the unit tests
+
+2006-10-27  James Gallagher <jgallagher@opendap.org>
+
+	DDS.h: Added declarations for the new transfer_attributes()
+	methods
+
+2006-10-27  James Gallagher <jgallagher@opendap.org>
+
+	Constructor.h: Added declarations for the new transfer_attributes()
+	methods.
+
+2006-10-27  James Gallagher <jgallagher@opendap.org>
+
+	BaseType.h: Added a little text to the ptr_duplicate() documentation.
+
+2006-10-27  James Gallagher <jgallagher@opendap.org>
+
+	HTTPCache.cc: Changed the way the mutex which is used to protect
+	the various methods is initialized.
+
+2006-10-27  James Gallagher <jgallagher@opendap.org>
+
+	GeoConstraint.cc: Fixed two warnings, one about using a prefix
+	operator with modulus and assignment back to the same variable and
+	the other about field initialization order.
+
+2006-10-27  James Gallagher <jgallagher@opendap.org>
+
+	DODSFilter.cc: Fixed the broken definition of send_blob(),
+	not that it matters...
+
+2006-10-27  James Gallagher <jgallagher@opendap.org>
+
+	DDS.cc: I removed the second attempt at transfer_attributes and
+	started on a third. This one seems to work much better; see the
+	tests in DDSTest.cc. This version takes the _dim attributes from
+	the hdf4 server and bundles them with a Grid Map or puts them in
+	a sub-container for an Array. This should not break libnc-dap while
+	still preserving all the attribute data.
+
+2006-10-27  James Gallagher <jgallagher@opendap.org>
+
+	Constructor: Added code to merge attributes into a constructor.
+	This method is called from DDS.
+
+2006-10-27  James Gallagher <jgallagher@opendap.org>
+
+	ce_functions.cc: Removed unused parameters.
+
+2006-10-27  James Gallagher <jgallagher@opendap.org>
+
+	ArrayGeoConstraint: Fixed a warning where one version of the
+	constructor was not using all of its parameters.
+
+2006-10-27  James Gallagher <jgallagher@opendap.org>
+
+	ArrayGeoConstraintTest: added
+
+2006-10-27  James Gallagher <jgallagher@opendap.org>
+
+	DDSTest.cc, Makefile.am: Updated with tests for
+	DDS::transfer_attributes.
+
+2006-10-27  James Gallagher <jgallagher@opendap.org>
+
+	Added test data for DDS::transfer_attributes new new version.
+
+2006-10-24  James Gallagher <jgallagher@opendap.org>
+
+	HTTPConnect.cc: Removed debugging.
+
+2006-10-24  James Gallagher <jgallagher@opendap.org>
+
+	DDS.cc: Removed the 'sub table' code from transfer_attributes().
+	getdap.cc: Added -X option to build the DDX on the client to simplify
+	debugging (e.g., ticket 480)
+
+2006-10-24  James Gallagher <jgallagher@opendap.org>
+
+	Massive removal of exception qualifiers/declarations. I've left
+	only the exception declarations in RCReader (which declare that
+	no exceptions are thrown) and those for constructors. In
+	HTTPConnect.cc:save_raw_http_headers() fixed a bug where headers
+	were assumed to have \r\n terminators. That is true only for new
+	servers. See ticket #631 for more information.
+
+2006-10-24  James Gallagher <jgallagher@opendap.org>
+
+	cgi_util, DODSFilter: Made many params & methods const
+
+2006-10-23  James Gallagher <jgallagher@opendap.org>
+
+	Fixed AISDatabaseParser.cc
+
+2006-10-23  James Gallagher <jgallagher@opendap.org>
+
+	AISDatabaseParser.cc: Replaced calls to getLineNumber and
+	xmlSAX2GetLineNumber with calls to one or the other depending on
+	the library version. In some places the SAX2 API was used
+	exclusively, in others the old API was used. The changes mean the
+	new API will always be used OR the old API will always be used,
+	depending on library version.
+
+2006-10-23  James Gallagher <jgallagher@opendap.org>
+
+	DDXParser.cc: I put the call to xml2's getLinNumber() Back in the
+	code since older distros don't have the newer library.
+
+2006-10-20  James Gallagher <jgallagher@opendap.org>
+
+	Closed some tickets for the server-side functions and added
+	the version function.
+
+2006-10-20  James Gallagher <jgallagher@opendap.org>
+
+	Fixes for ticket 616: I added code to GeoConstraint that checks
+	the bounding box to make sure it includes data and returns an
+	Error if it does not. Also, the order of the bounding box lat and
+	lon were switched to fit more with practice. The GeoConstraint
+	method arguments were no changes, only the order of lat and lon
+	passed to the geogrid() and geoarray() functions.
+
+2006-10-20  James Gallagher <jgallagher@opendap.org>
+
+	Auto reset of Subversion properties
+
+2006-10-19  James Gallagher <jgallagher@opendap.org>
+
+	Data for geoarray tests added.
+
+2006-10-19  James Gallagher <jgallagher@opendap.org>
+
+	Baseline data for geoarray tests added.
+
+2006-10-19  James Gallagher <jgallagher@opendap.org>
+
+	Tests for geoarray: Added
+
+2006-10-19  James Gallagher <jgallagher@opendap.org>
+
+	Added geoarray() which required changes to GeoConstraint and
+	GridGeoConstraint (I created GridGeoConstraint and made
+	GeoConstraint abstract). ce_functions.cc was also modified.
+
+2006-10-19  James Gallagher <jgallagher@opendap.org>
+
+	ArrayGeoConstraint.cc: Added
+
+2006-10-19  James Gallagher <jgallagher@opendap.org>
+
+	ArrayGeoConstraint.h: Added
+
+2006-10-19  James Gallagher <jgallagher@opendap.org>
+
+	Auto reset of Subversion properties
+
+2006-10-18  James Gallagher <jgallagher@opendap.org>
+
+	Updated baseline for text.z3.exp (data.z3) after fixing
+	GeoConstraint::find_latitude_indeces().
+
+2006-10-18  James Gallagher <jgallagher@opendap.org>
+
+	Added data.61a-d
+
+2006-10-18  James Gallagher <jgallagher@opendap.org>
+
+	GridGeoConstraintTest: Updated with a new test for
+	find_latitude_indeces.
+
+2006-10-18  James Gallagher <jgallagher@opendap.org>
+
+	Updated the data.z? files given that the range selection behavior in
+	GeoConstraint has been changed.
+
+2006-10-16  Rob Morris <Robert.O.Morris@jpl.nasa.gov>
+
+	Update win32 module export definitions for latest libdap*.
+
+2006-10-16  Rob Morris <Robert.O.Morris@jpl.nasa.gov>
+
+	Provide header for find_if under win32
+
+2006-10-16  Rob Morris <Robert.O.Morris@jpl.nasa.gov>
+
+	Change funcs that return nothing to be declared so
+
+2006-10-14  James Gallagher <jgallagher@opendap.org>
+
+	Auto reset of Subversion properties
+
+2006-10-13  James Gallagher <jgallagher@opendap.org>
+
+	GridGeoConstraint: Fixed the calls so that they no longer use the
+	dds argument
+
+2006-10-13  James Gallagher <jgallagher@opendap.org>
+
+	GridGeoConstraint: Added
+
+2006-10-13  James Gallagher <jgallagher@opendap.org>
+
+	Removed DDS from GeoConstraint.
+
+2006-10-13  James Gallagher <jgallagher@opendap.org>
+
+	HTTPCache.cc: Minor change to a comment.
+
+2006-10-13  James Gallagher <jgallagher@opendap.org>
+
+	Refactored GeoConstraint so that all the Grid-specific code is now
+	in GridGeoConstraint (created/added GridGeoConstraint). Modified
+	ce_functions so that geogrid uses the new object. Updated the unit
+	tests. Added the new class to the Makefile.am
+
+2006-10-13  James Gallagher <jgallagher@opendap.org>
+
+	Auto reset of Subversion properties
+
+2006-10-12  James Gallagher <jgallagher@opendap.org>
+
+	Added tests.
+
+2006-10-12  James Gallagher <jgallagher@opendap.org>
+
+	Test baseline data for the geogrid() function
+
+2006-10-12  James Gallagher <jgallagher@opendap.org>
+
+	Changes test.10 to test.a
+
+2006-10-12  James Gallagher <jgallagher@opendap.org>
+
+	Auto reset of Subversion properties
+
+2006-10-11  James Gallagher <jgallagher@opendap.org>
+
+	Added
+
+2006-10-11  James Gallagher <jgallagher@opendap.org>
+
+	Added tests to expr-testsuite for geogrid. Somewhat dubious
+	at the moment.
+
+2006-10-10  James Gallagher <jgallagher@opendap.org>
+
+	expr-test.cc: reformatted
+
+2006-10-09  James Gallagher <jgallagher@opendap.org>
+
+	BaseType, RValue, et c.: Closed ticket regarding optimization
+	of build_btp_args. Args are always BaseTypes and before they
+	were always read. This could cause huge Grid/Array variables to
+	be read when those were arguments to functions, even if the
+	running the function would result in only a small part of the
+	Grid/Array being returned. Now arguments are not read. If functions
+	need values for the arguments, they must read them themselves.
+
+2006-10-09  James Gallagher <jgallagher@opendap.org>
+
+	cgi_util.cc: Fixed a bug in set_mime_text where the wrong 'type'
+	was returned. The type was always set to dap4_ddx.
+
+2006-10-09  James Gallagher <jgallagher@opendap.org>
+
+	CEFunctionsTest: Paths easy to set for debugger.
+
+2006-10-09  James Gallagher <jgallagher@opendap.org>
+
+	DDXParserTest: Turned off debug
+
+2006-10-09  James Gallagher <jgallagher@opendap.org>
+
+	AISDatabaseParser: Replaced old xml getLineNumber with the newer
+	SAX2 api call.
+
+2006-10-06  James Gallagher <jgallagher@opendap.org>
+
+	Vector: Added set_value() and value() methods.
+	Updated docs
+
+2006-10-06  James Gallagher <jgallagher@opendap.org>
+
+	ce_functions.cc: Now the linear_scale function will work for
+	Grid Maps in the hdf4 handler.
+
+2006-10-06  James Gallagher <jgallagher@opendap.org>
+
+	Check point: I've modified Connect, getdap and ObjectType so they
+	support a Connect::request_ddx() method. I've added a stream
+	reader to DDXParser and am in the process of figuring out where
+	the attributes are going!
+
+2006-10-05  James Gallagher <jgallagher@opendap.org>
+
+	DDXParser.h: Added an intern_stream() method to read from a stream and
+	updated the code (one function) to use the new SAX2 API from libxml2.
+
+2006-10-05  James Gallagher <jgallagher@opendap.org>
+
+	DDXParser.cc: Added an intern_stream() method to read from a stream and
+	updated the code (one function) to use the new SAX2 API from libxml2.
+
+2006-10-05  James Gallagher <jgallagher@opendap.org>
+
+	Vector.cc: Ran indent
+
+2006-10-04  James Gallagher <jgallagher@opendap.org>
+
+	ConstraintEvaluator: Now uses a list to store the list of functions
+	and the add_function() methods now overwrite functions with the
+	same names so it's possible to provide specializations of the
+	standard functions in ce_functions.
+
+2006-10-04  James Gallagher <jgallagher@opendap.org>
+
+	Added value()/set_value() methods to Float32/64, Int16/32,
+	UInt16/32 and Str.
+
+2006-10-04  James Gallagher <jgallagher@opendap.org>
+
+	ce_functions.cc: Both grid and geogrid now use a little hack to
+	read the map vectors of a Grid. The HDF handler cannot read the
+	Grid Maps directly (maps on HDF are not really variables but are
+	attributes instead). This hack involves setting send_p for the
+	just the maps and then calling the Grid's read() method.
+
+2006-10-04  James Gallagher <jgallagher@opendap.org>
+
+	ConstraintEvaluator: Now uses a list to store the list of functions
+	and the add_function() methods now overwrite functions with the
+	same names so it's possible to provide specializations of the
+	standard functions in ce_functions.
+
+2006-10-04  James Gallagher <jgallagher@opendap.org>
+
+	Vector.cc: Simplified the code in val2buf()
+
+2006-10-03  James Gallagher <jgallagher@opendap.org>
+
+	Auto reset of Subversion properties
+
+2006-10-02  James Gallagher <jgallagher@opendap.org>
+
+	Float64, Int32: Added value/set_value() methods
+	Grid: Added an reverse iterator typedef and rbegin/rend
+	methods. This provides an easy way to access the 'rightmost'
+	map vectors (used by geogrid()).
+
+2006-10-02  James Gallagher <jgallagher@opendap.org>
+
+	Vector.cc: Ran through astyle indent utility.
+
+2006-10-02  James Gallagher <jgallagher@opendap.org>
+
+	parser-util.cc: Ran through astyle indent utility.
+
+2006-10-02  James Gallagher <jgallagher@opendap.org>
+
+	CEFunctionsTest: Added tests for linear_scale().
+
+2006-10-02  James Gallagher <jgallagher@opendap.org>
+
+	ce_functions: Added linear_scale function.
+	CEFunctionsTest: Added tests for linear_scale().
+
+2006-09-30  James Gallagher <jgallagher@opendap.org>
+
+	Auto reset of Subversion properties
+
+2006-09-29  James Gallagher <jgallagher@opendap.org>
+
+	Makefile.am: Added GEOConstraintTest
+
+2006-09-29  James Gallagher <jgallagher@opendap.org>
+
+	GeoConstraintTest: Extracted from CEFunctionsTest and added to
+	svn.
+
+2006-09-28  James Gallagher <jgallagher@opendap.org>
+
+	Clause.cc: Fixed up some comments.
+
+2006-09-28  James Gallagher <jgallagher@opendap.org>
+
+	GeoConstraint.cc: Turned off instrumentation; removed throw()
+	from declarations, fixed a problem with bad latitude constraint
+	information that caused a fatal error (now it sends a message
+	indicating how to fix the problem).
+
+2006-09-28  James Gallagher <jgallagher@opendap.org>
+
+	DODSFilter.cc: Modified send_data() so that errors thrown by
+	BaseType functions will be returned to clients correctly.
+
+2006-09-28  James Gallagher <jgallagher@opendap.org>
+
+	ce_functions.cc, GeoConstraint.h: Removed 'throw(Error)' from
+	declarations since C++ calls abort() when/if another type of
+	excpetion is thrown, even if there's a catch() clause for it.
+
+2006-09-28  James Gallagher <jgallagher@opendap.org>
+
+	ce_functions.h: Removed 'throw(Error)' from declarations since C++
+	calls abort() when/if another type of excpetion is thrown, even if
+	there's a catch() clause for it.
+
+2006-09-27  James Gallagher <jgallagher@opendap.org>
+
+	Vector.cc: I made the instrumentation in the ctor and dtor
+	'level two' statements so that the output would be less cluttered.
+
+2006-09-27  James Gallagher <jgallagher@opendap.org>
+
+	GeoConstraint.cc: reorder_data_longitude_axis() now works.
+	CEFunctionsTest.cc: Turned off debugging.
+
+2006-09-26  James Gallagher <jgallagher@opendap.org>
+
+	GeoConstraint: Checkpoint; passes unit tests but still fails with
+	a real dataset (COADS_CLIMATOLOGY). Problem with circular
+	longitude axis.
+
+2006-09-25  James Gallagher <jgallagher@opendap.org>
+
+	ce_functions.cc: The grid() function is now implemented so that
+	geogrid() can use it to evaluate GSEs (ticket 569)
+
+2006-09-25  James Gallagher <jgallagher@opendap.org>
+
+	ce_functions.cc/h: The grid() function is now a BaseType* function.
+	CEFunctionsTests: Work with the new grid() implementation changes.
+
+2006-09-24  James Gallagher <jgallagher@opendap.org>
+
+	ce_functions.cc: Removed old code that was getting in the way.
+
+	GeoConstraint.cc: Fixed a buf in reorder_data_longitude_axis():
+	off-by-one error when applying the first constraint (used
+	d_lon_length instead of d_lon_length-1 for the end point).
+
+	CEFunctionsTest: Added code to use TestTypes from the 'test'
+	directory and generally fixed up the tests so they work with the
+	new BaseType function version of geogrid().
+
+2006-09-23  James Gallagher <jgallagher@opendap.org>
+
+	Auto reset of Subversion properties
+
+2006-09-22  James Gallagher <jgallagher@opendap.org>
+
+	Modified TestArray so that it's possible to see that arrays really
+	are subsampled. That is, if a constraint is set on an array,
+	TestArray::read() will first allocate the whole array and then
+	sample it, simulating a read() method that's interacting with an
+	API that knows how to sample an array. Works only for two dims.
+
+2006-09-22  James Gallagher <jgallagher@opendap.org>
+
+	test.c{0,1}: Added
+
+2006-09-22  James Gallagher <jgallagher@opendap.org>
+
+	Grid: Added get_array() which returns an Array* so the cast that
+	was needed when using array_var() can be removed. I changed all
+	the calls to array_var() to get_array() (DDS, ce_expr, ce_functions).
+
+	RValue.cc: I removed the read() call when build_btp_args() builds
+	an argument list. This change may break client software, but it means
+	that variables are not complete read when they are passed to CE
+	functions, which should be a big boost in efficiency when working
+	with EOS Grids in geogrid().
+
+	Added code in TestArray to make arrays with constrained values.
+	GeoConstraint: Updates; almost complete.
+
+2006-09-22  James Gallagher <jgallagher@opendap.org>
+
+	GeoConstraint: Added a new method and an enum to record the 'sense' of
+	the latitude map (normal or inverted).
+	Added tests for the find_latitude_indeces() method to the unit tests
+
+2006-09-21  James Gallagher <jgallagher@opendap.org>
+
+	GeoConstraint/geogrid checkpoint.
+	Byte,Str: Added value() and set_value() methods
+	TestArray: Improved the read() method so it uses the series_values
+	property and so it returns reasonable values for lat/lon vectors
+	expr-test.cc: Now can be used to test BaseType functions
+
+2006-09-20  James Gallagher <jgallagher@opendap.org>
+
+	Another GeoConstraint checkpoint
+
+2006-09-20  James Gallagher <jgallagher@opendap.org>
+
+	GeoConstraint checkpoint
+
+2006-09-19  James Gallagher <jgallagher@opendap.org>
+
+	Makefile.am: Patch from Patrice Dumas regarding the libdapserver
+	and libdapclient libraries.
+
+2006-09-19  James Gallagher <jgallagher@opendap.org>
+
+	libdap.spec: Patch from Patrice Dumas regarding the libdapserver
+	and libdapclient libraries.
+
+2006-09-19  James Gallagher <jgallagher@opendap.org>
+
+	dap-config.in: Changed the semantics of --libs so that it matches
+	the old behavior.
+
+2006-09-15  James Gallagher <jgallagher@opendap.org>
+
+	Updated the version to 3.7.2 and the associated ChangeLog,
+	configure.ac, et c., files. The docs have also been updated
+	(docs/html.tar.gz).
+
+2006-09-15  James Gallagher <jgallagher@opendap.org>
+
+	HTTPConnect.cc: Changed the way headers are parsed. Now the code
+	assumes that each header is terminated by a \r\n pair (previously
+	the code assumed the line terminator was a \n character only).
+
+2006-09-15  James Gallagher <jgallagher@opendap.org>
+
+	HTTPConnectTest: Fixed most, but not all, of the failures. See
+	ticket 552 for more info.
+
+2006-09-15  James Gallagher <jgallagher@opendap.org>
+
+	test.f.exp: The change to TestStr so that the number included in the
+	string increments broke this test. Fixed.
+
+2006-09-15  James Gallagher <jgallagher@opendap.org>
+
+	Sequence: Doxygen was complaining about the types used in the
+	new transfer_data_*() methods because they were not exactly the
+	same string (vector<Sequence*> versus sequence_values_stack_t).
+	I made them the same.
+
+2006-09-15  James Gallagher <jgallagher@opendap.org>
+
+	doxy.conf: Now the method listings are in alphabetical order.
+
+2006-09-14  James Gallagher <jgallagher@opendap.org>
+
+	SequenceTest.cc: Now tests the new transfer_data() method.
+
+2006-09-14  James Gallagher <jgallagher@opendap.org>
+
+	Added the transfer_data() method to Sequence. This method reads
+	data using the read() method and loads values into the local object's
+	d_values field. Values can then be used by methods like print_val()
+	which expect to see information stored in the Sequence objects
+	as if the object was part of a client and had read the data off of
+	the wire. I also modified the print_vals_by_row so that nested
+	Sequences values are indented by four spaces.
+
+2006-09-14  James Gallagher <jgallagher@opendap.org>
+
+	TestStr.cc: Modified the string so that the value of count
+	increments by one for each instance.
+
+2006-09-14  James Gallagher <jgallagher@opendap.org>
+
+	TestInt32.cc: Modified so that on 64-bit machines the overflow of the
+	'* 32' operation does not reset the value of _buf to zero, but instead
+	_buf cycles back to 32.
+
+2006-09-13  James Gallagher <jgallagher@opendap.org>
+
+	Sequence: Added transfer_data and related methods. These are used
+	to move data on the server-side from a data source into the
+	d_values field, loading the variables in the sequence with data in
+	a way that is very similar to the operation of all the other
+	variables. This provides a way to pass a DDS to other code which
+	is loaded with data. SequenceTest.cc and Makefile.am in
+	unit-tests: Test the transfer_data method. Int32: I added a
+	value() method similar to those added to Float32/64 a while back.
+	This simplifies testing so much... configure.ac: Bumped up the
+	revision number of the library.
+
+2006-09-08  James Gallagher <jgallagher@opendap.org>
+
+	GNURegex: I change the regex_t field from a regular variable to a
+	pointer. Seems to fix the problem, although I don't know why. Not
+	the most reassuring feeling...
+
+2006-09-05  James Gallagher <jgallagher@opendap.org>
+
+	BaseType.cc: Modified add_var() so that it now throws an InternalErr
+	and fixed up the documentation so it reads correctly.
+
+2006-09-02  James Gallagher <jgallagher@opendap.org>
+
+	Auto reset of Subversion properties
+
+2006-09-01  James Gallagher <jgallagher@opendap.org>
+
+	ce_functions.cc: geogrid() no longer uses the projection/selection
+	function model. Now it's a pure projection function.
+
+2006-09-01  James Gallagher <jgallagher@opendap.org>
+
+	GeoConstraint: removed old code and modified find_lon_lat_maps()
+	so that I can test with the COADS dataset. Tests not working...
+
+2006-09-01  James Gallagher <jgallagher@opendap.org>
+
+	GeoConstraint: removed old code and modified find_lon_lat_maps()
+	so that I can test with the COADS dataset. Tests not working...
+
+2006-09-01  James Gallagher <jgallagher@opendap.org>
+
+	checkpoint: GeoConstraint/geogrid() nearly working Changes in
+	DDS, ConstraintEvaluator, ce_functions (now uses the new libdap
+	namespace), RValue, various tests.
+
+2006-09-01  James Gallagher <jgallagher@opendap.org>
+
+	Updates/Changes to the grid() testsuite that uses remote servers.
+	I changed the tests so they now run using servers on test.opendap.org
+	and use getdap (the tests were originally written to use geturl).
+
+2006-08-29  James Gallagher <jgallagher@opendap.org>
+
+	GeoConstraint: Changed code to do the data translation for split
+	constraints so that it uses memcpy(). Untested.
+
+2006-08-28  James Gallagher <jgallagher@opendap.org>
+
+	GeoConstraint: Added some of the code needed to swap parts of a 'split'
+	longitude constraint.
+
+2006-08-28  James Gallagher <jgallagher@opendap.org>
+
+	CEFunctionsTest.cc: Added unit tests for vector swapping coode.
+
+2006-08-28  James Gallagher <jgallagher@opendap.org>
+
+	Added separate lon/lat bounding box marking code to GeoConstraint.
+
+2006-08-25  James Gallagher <jgallagher@opendap.org>
+
+	More work on geogrid().
+	M    ce_functions.h
+	M    GeoConstraint.h
+	M    Grid.h
+	M    Vector.cc
+	M    ce_functions.cc
+	M    Grid.cc
+	M    unit-tests/CEFunctionsTest.cc
+	M    GeoConstraint.cc
+
+2006-08-25  James Gallagher <jgallagher@opendap.org>
+
+	Auto reset of Subversion properties
+
+2006-08-24  James Gallagher <jgallagher@opendap.org>
+
+	Progress on the geogrid() server-side function. Changed/Added files:
+	M    RValue.cc
+	M    ce_functions.h
+	M    GeoConstraint.h
+	M    Makefile.am
+	M    gse-test.cc
+	M    ce_functions.cc
+	A    unit-tests/ce-functions-testsuite
+	A    unit-tests/ce-functions-testsuite/two_grid.dds
+	A    unit-tests/ce-functions-testsuite/geo_grid.dds
+	M    unit-tests/CEFunctionsTest.cc
+	M    Clause.cc
+	M    GeoConstraint.cc
+
+2006-08-22  James Gallagher <jgallagher@opendap.org>
+
+	Auto reset of Subversion properties
+
+2006-08-21  James Gallagher <jgallagher@opendap.org>
+
+	Updated release files for the 3.7.1 source release.
+
+2006-08-21  James Gallagher <jgallagher@opendap.org>
+
+	ce_functions.cc, DDS.cc, CEFunctionsTest.cc, docs/html.tar.gz:
+	Updates for documentation. For CEFunctionsTest.cc: Added tests
+	for the new grid() and nascent geogrid() code.
+
+2006-08-21  James Gallagher <jgallagher@opendap.org>
+
+	GeoConstraint.cc: Added
+
+2006-08-21  James Gallagher <jgallagher@opendap.org>
+
+	DDS.cc: Fixed tcket 480. The transfer_attributes() method
+	was not handling the HDF4 *_dim_? attribute containers
+	correctly, at least as far as the libnc-dap was concerned.
+	Now those attribute containers are made subtables of the
+	associated variable. That is, if there's a variable <var>
+	and a container <var>_dim_0, then the attribute table
+	<var> will have a subtable 'dim_0'.
+
+2006-08-21  James Gallagher <jgallagher@opendap.org>
+
+	ce_functions.cc: Added stuff for gwogrid() (which still doesn't
+	work).
+
+2006-08-21  James Gallagher <jgallagher@opendap.org>
+
+	BaseType.cc: Updates to comments.
+
+2006-08-21  James Gallagher <jgallagher@opendap.org>
+
+	Grid.h: Comment fixes, moved some doxygen comments into
+	Grid.cc.
+
+2006-08-21  James Gallagher <jgallagher@opendap.org>
+
+	GeoConstraint.h: Added. Currently does nothing.
+
+2006-08-21  James Gallagher <jgallagher@opendap.org>
+
+	ce_functions.h: changed the name of func_grid_select() to
+	projection_function_grid(). Added projection _function_geogrid().
+
+2006-08-21  James Gallagher <jgallagher@opendap.org>
+
+	AttrTableTest.cc: Added a test for the new append_attr() method.
+
+2006-08-21  James Gallagher <jgallagher@opendap.org>
+
+	DDSTest.cc: Added a test for ticket 480 (transfer_attributes()).
+
+2006-08-21  James Gallagher <jgallagher@opendap.org>
+
+	S2000415.HDF.test1.das: Added for more DDS::transfer_attributes()
+	tests.
+
+2006-08-21  James Gallagher <jgallagher@opendap.org>
+
+	Mkaefile.am: GetConstraint.cc Added.
+
+2006-08-21  James Gallagher <jgallagher@opendap.org>
+
+	RValue.cc: Fixes for some comments.
+
+2006-08-21  James Gallagher <jgallagher@opendap.org>
+
+	Grid.cc: Fixes for some comments.
+
+2006-08-21  James Gallagher <jgallagher@opendap.org>
+
+	DAS.cc: Removed the 'char*' versions of the methods. These have not
+	been needed since we stopped using the GNU String class.
+
+2006-08-17  James Gallagher <jgallagher@opendap.org>
+
+	BaseType.h: Reformatted a doc comment for var().
+
+2006-08-17  James Gallagher <jgallagher@opendap.org>
+
+	AttrTable: Added append_attr() method that takes a vector of values
+	so that client code does not have to call the single value version
+	in a loop.
+
+2006-08-17  James Gallagher <jgallagher@opendap.org>
+
+	AttrTable: Added append_attr() method that takes a vector of values
+	so that client code does not have to call the single value version
+	in a loop.
+
+2006-08-15  James Gallagher <jgallagher@opendap.org>
+
+	Auto reset of Subversion properties
+
+2006-08-14  James Gallagher <jgallagher@opendap.org>
+
+	das.tab.cc: Updated (edits to das.y).
+
+2006-08-14  James Gallagher <jgallagher@opendap.org>
+
+	das.y: config_dap.h --> config.h
+
+2006-08-14  James Gallagher <jgallagher@opendap.org>
+
+	Makefile.am, CEFunctionsTest.cc: Added unit tests for the the
+	grid() ce function.
+
+2006-08-14  James Gallagher <jgallagher@opendap.org>
+
+	Str.cc: No longer includes an extern declaration for escattr() since
+	that function is not called by this code.
+
+2006-08-14  James Gallagher <jgallagher@opendap.org>
+
+	GSEClause.cc: Added the word 'map' to the error messages about
+	missing map variables.
+
+2006-08-11  James Gallagher <jgallagher@opendap.org>
+
+	ce_functions.cc: Modified so that the errors returned match those
+	in the design.
+
+2006-08-01  James Gallagher <jgallagher@opendap.org>
+
+	DDS.cc, DDXParser.cc/h, tests/ddx-testsuite/*.ddx: Changed the name
+	of the dodsBLOB element to dataBLOB and the attribute from URL to href.
+	See ticket #454.
+
+2006-08-01  James Gallagher <jgallagher@opendap.org>
+
+	DDSTest.cc: Changed expected name to dataBLOB from dodsBLOB and
+	attribute of that element to href from URL.
+
+2006-08-01  James Gallagher <jgallagher@opendap.org>
+
+	html.tar.gz: Updated build of reference docs.
+
+2006-08-01  James Gallagher <jgallagher@opendap.org>
+
+	generalUtilTest.cc: Fixed test for the new id2www/www2id behavior
+	which escapes the percent sign.
+
+2006-08-01  James Gallagher <jgallagher@opendap.org>
+
+	BaseType.h, ConstraintEvaluator.cc, DODSFilter.cc, escaping.cc/.h,
+	Sequence.cc: Updated comments.
+
+2006-08-01  James Gallagher <jgallagher@opendap.org>
+
+	libdap.m4: Applied Patrice Dumas' patch which checks for the newer
+	dap-config and uses it's options for the three library setup.
+
+2006-07-31  James Gallagher <jgallagher@opendap.org>
+
+	Auto reset of Subversion properties
+
+2006-07-30  Rob Morris <Robert.O.Morris@jpl.nasa.gov>
+
+	w32 Makefile rewrite & export def's for 3-lib split-up of libdap
+
+2006-07-09  Rob Morris <Robert.O.Morris@jpl.nasa.gov>
+
+	Tweeks for win32 porting effort
+
+2006-07-09  Rob Morris <Robert.O.Morris@jpl.nasa.gov>
+
+	New makefile for win32 libdap version to accomodate 3-library split
+
+2006-07-07  James Gallagher <jgallagher@opendap.org>
+
+	docs/html.tar.gz, escaping.cc: Updated/corrected documentation.
+
+2006-07-07  James Gallagher <jgallagher@opendap.org>
+
+	cgi_util.cc, configure.ac: Fixed bug 437. When a handler is not passed
+	a version number, it will now use the library's version number set at
+	compile time.
+
+2006-07-03  Rob Morris <Robert.O.Morris@jpl.nasa.gov>
+
+	Patch core to use libcurl as a dll without crashing
+
+2006-06-14  James Gallagher <jgallagher@opendap.org>
+
+	Removed GNU error and builtin from Makefile.am (they were already
+	removed from the directry GNU.
+
+2006-06-14  James Gallagher <jgallagher@opendap.org>
+
+	Updates to ChangeLog, README, INSTALL, NEWS, libdap.spec,
+	Makefile.am and html.tar.gz for the beta releae 3.7.0.
+
+2006-06-13  James Gallagher <jgallagher@opendap.org>
+
+	lex.gse_.cc: Comments
+
+2006-06-13  James Gallagher <jgallagher@opendap.org>
+
+	ce_functions.cc, gse.lex: fixed comments
+
+2006-06-09  James Gallagher <jgallagher@opendap.org>
+
+	INSTALL.AIX: Added newer comments from Dan S.
+
+2006-06-09  James Gallagher <jgallagher@opendap.org>
+
+	INSTALL: Updated by adding a reference to the INSTALL.AIX file.
+
+2006-06-06  James Gallagher <jgallagher@opendap.org>
+
+	Auto reset of Subversion properties
+
+2006-06-05  James Gallagher <jgallagher@opendap.org>
+
+	GNURegex: Added Error thows back into the code
+
+2006-06-05  James Gallagher <jgallagher@opendap.org>
+
+	In GNU: Removed some now-unused files and fixed a bug in
+	GNURegex.cc where config.h was not included when it must be. This
+	caused a failure on OS/X because the rpl_regexec(), ..., symbols
+	were not defined.
+
+2006-06-02  James Gallagher <jgallagher@opendap.org>
+
+	regex_test.cc: Added
+
+2006-06-01  James Gallagher <jgallagher@opendap.org>
+
+	Auto reset of Subversion properties
+
+2006-05-31  Nathan Potter <ndp@coas.oregonstate.edu>
+
+	GNURegex.cc: kludge! Added a workaround patch to
+	GNURegex.cc:match() to avoid a illegal memory access segmentation
+	fault under OS-X 10.4.6. Inline comments provide greater detail.
+	(ndp)
+
+2006-05-31  James Gallagher <jgallagher@opendap.org>
+
+	ssize_t.m4: Added during most recent update.
+
+2006-05-30  James Gallagher <jgallagher@opendap.org>
+
+	In gl/: Update to the gnulib code. This may fix a problem on OS/X
+	where the gnulib regexec function appears to corrupt the stack.
+
+2006-05-19  James Gallagher <jgallagher@opendap.org>
+
+	Various types (Int16, et c.): Removed include of ce_expr.tab.h since
+	that header is included by Operators.h
+
+2006-05-19  James Gallagher <jgallagher@opendap.org>
+
+	Makefile.am: Removed include of libgnu from libdapclient and
+	libdapserver. This should fix the multiple define error at link time.
+
+2006-05-19  James Gallagher <jgallagher@opendap.org>
+
+	ce_expr.y: fixed multiple use of the variable name 'table' in
+	declarations.
+
+2006-05-18  James Gallagher <jgallagher@opendap.org>
+
+	Makefile.am: reordered libraries and added ce_parser.h to DAP_HDR
+
+2006-05-10  James Gallagher <jgallagher@opendap.org>
+
+	AISDatabaseParser.h, AISResources.cc, AISResources.h, Resource.cc:
+	Updates to doxygen comments.
+
+2006-05-08  James Gallagher <jgallagher@opendap.org>
+
+	Operators.h: Made dods_max() inline. This should improve performance
+	and also fix a problem introduced by the recently applied AIX patch
+	where dods_max() was multiply defined.
+
+2006-05-04  James Gallagher <jgallagher@opendap.org>
+
+	INSTALL.AIX: Updated the information from Dan Stromberg and Martin
+	Peschke.
+
+2006-05-04  James Gallagher <jgallagher@opendap.org>
+
+	Operators.h, RValue.cc, deflate.c: Applied patches from Dan Stromberg
+	which fix problems found during a port to the native AIX compiler.
+
+2006-05-01  James Gallagher <jgallagher@opendap.org>
+
+	libdap.m4: Added DAP_CLIENT_LIBS and DAP_SERVER_LIBS to symbols
+	that are written out.
+
+2006-04-20  James Gallagher <jgallagher@opendap.org>
+
+	Auto reset of Subversion properties
+
+2006-04-19  James Gallagher <jgallagher@opendap.org>
+
+	ce_expr.y: The expression parser now passes the ConstraintEvaluator
+	object to projection functions.
+
+2006-04-19  James Gallagher <jgallagher@opendap.org>
+
+	ConstraintEvaluator: Removed some code that was commented out.
+
+2006-04-19  James Gallagher <jgallagher@opendap.org>
+
+	expr.h: The projection function typedef now includes a fourth
+	argument so that the ConstraintEvaluator can be passed to the
+	projection function. This provides a way for the proj_function to
+	register the matching selection function.
+
+2006-04-19  James Gallagher <jgallagher@opendap.org>
+
+	ce_parser.h: Added. Used to pass both the DDS and ConstraintEvaluator
+	to the CE Parser.
+
+2006-04-19  James Gallagher <jgallagher@opendap.org>
+
+	Auto reset of Subversion properties
+
+2006-04-18  James Gallagher <jgallagher@opendap.org>
+
+	configure.ac, dap-config.in, conf/libdap.m4: bumped up the revision
+	number to 3.7.0 (which will be the next revision), added options to
+	dap-config --server-libs and --client-libs and updated the libdap.m4
+	macro to match the new three-library organization of libdap.
+
+2006-04-18  James Gallagher <jgallagher@opendap.org>
+
+	expr.lex, expr.y, lex.expr.cc, expr.tab.cc: Removed/Replaced with
+	ce_expr...
+
+2006-04-18  James Gallagher <jgallagher@opendap.org>
+
+	Removed_functions.txt: Updated for the latest changes.
+
+2006-04-18  James Gallagher <jgallagher@opendap.org>
+
+	lex.ce_expr.cc: Added
+
+2006-04-18  James Gallagher <jgallagher@opendap.org>
+
+	expr-test.cc, tests/Makefile.am: Tests updated for changes in DDS,
+	DODSFilter, et cetera.
+
+2006-04-18  James Gallagher <jgallagher@opendap.org>
+
+	DODSFilter: Modified so that this class now takes a ConstraintEvaluator
+	object in the places where needed.
+
+2006-04-18  James Gallagher <jgallagher@opendap.org>
+
+	DDS: Removed the constraint evaluator and the send() method.
+
+2006-04-18  James Gallagher <jgallagher@opendap.org>
+
+	BaseType.h and it's child classes: Now the serialize() method
+	takes not only a DDS but also a ConstraintEvaluator object.
+
+2006-04-18  James Gallagher <jgallagher@opendap.org>
+
+	ce_expr.lex, ce_expr.y, ce_expr.tab.{cc,h}: Added files that
+	contains a modified ce parser. This parser takes two objects as
+	input: ConstraintEvaluator and DDS. The old parser took only the
+	DDS.
+
+2006-04-18  James Gallagher <jgallagher@opendap.org>
+
+	ConstraintEvaluator: Added this class. Now the ce evaluator is separate
+	from the DDS object.
+
+2006-04-18  James Gallagher <jgallagher@opendap.org>
+
+	Clause.h: Added private methods for the const ctor and operator=
+	so that default versions would not get called by accident.
+
+2006-04-18  James Gallagher <jgallagher@opendap.org>
+
+	cgi_util.cc: Removed the do_data_transfer() function. Use DODSFilter.
+
+2006-04-18  James Gallagher <jgallagher@opendap.org>
+
+	ce_functions.cc: Minor change to the func_length code. It no
+	longer uses the 'constants' vector in DDS to store the BaseType
+	used for the return value. The caller can easily free the storage.
+	Also, this function is never used!
+
+2006-04-18  James Gallagher <jgallagher@opendap.org>
+
+	INSTALL.AIX: Fixed spelling and added a note about not bugging
+	Martin or assuming he's going to guarantee the steps will work.
+
+2006-04-18  James Gallagher <jgallagher@opendap.org>
+
+	Makefile.am: Now builds the ce_expr parser in place of the expr
+	parser. There's no real difference in the grammar accepted by the
+	new parser, but ce_expr takes both the ConstraintEvaluator and
+	DDS objects, where the old one took only the DDS.
+
+2006-04-18  James Gallagher <jgallagher@opendap.org>
+
+	Operators.h: Now uses the ce_expr parser header.
+
+2006-04-18  James Gallagher <jgallagher@opendap.org>
+
+	parser.h: Removed the GSEClause include that I'd commented out earlier.
+
+2006-04-16  Rob Morris <Robert.O.Morris@jpl.nasa.gov>
+
+	Rename, add dirs and prune as appropriate for VC++ port
+
+2006-04-04  James Gallagher <jgallagher@opendap.org>
+
+	Auto reset of Subversion properties
+
+2006-04-03  James Gallagher <jgallagher@opendap.org>
+
+	gse_parser.h: Added. This holds parser info used by the grid() ce
+	function. The contents of this file were originally in parser.h, which
+	holds definitions for the DAP parsers. Moving the info about grid()
+	here maens that the grid() code can be part of the dapserver library.
+
+2006-04-03  Rob Morris <Robert.O.Morris@jpl.nasa.gov>
+
+	Edit 'scalar deleting destructors' out of win32 module def's
+
+2006-03-31  James Gallagher <jgallagher@opendap.org>
+
+	For ticket 307 I modified the build so that three libraries are
+	made instead of just one. The libdap library now contains only
+	classes used for the DAP2 implementation. The client and server
+	support code is now in libdapclient and libdapserver. Many files
+	were modified since I trimmed the includes so that classes in
+	libdapclient don't include headers in libdapserver and vice versa.
+
+2006-03-31  James Gallagher <jgallagher@opendap.org>
+
+	Auto reset of Subversion properties
+
+2006-03-30  James Gallagher <jgallagher@opendap.org>
+
+	Added INSTALL.AIX
+
+2006-03-27  James Gallagher <jgallagher@opendap.org>
+
+	Massive propset on libdap to get svn to ignore many things so
+	eclipse will work more smoothly
+
+2006-03-24  James Gallagher <jgallagher@opendap.org>
+
+	Updated svn:ignore for some files.
+
+2006-03-21  James Gallagher <jgallagher@opendap.org>
+
+	Build of docs/html.tar.gz for 3.6.2 on 3/21/06
+
+2006-03-21  James Gallagher <jgallagher@opendap.org>
+
+	Auto reset of Subversion properties
+
+2006-03-20  James Gallagher <jgallagher@opendap.org>
+
+	Moved tests/expr-testsuite/test.a to tests/expr-testsuite/test.10.
+
+2006-03-20  James Gallagher <jgallagher@opendap.org>
+
+	test.c.exp: Removed log
+
+2006-03-19  Rob Morris <Robert.O.Morris@jpl.nasa.gov>
+
+	Win32 libnc-dods requires core's regex.h installed.  None stock on
+	windows. 
+
+2006-03-19  Rob Morris <Robert.O.Morris@jpl.nasa.gov>
+
+	Update export module definitions per recent core changes
+
+2006-03-16  James Gallagher <jgallagher@opendap.org>
+
+	NEWS: Spelling... one more time
+
+2006-03-16  James Gallagher <jgallagher@opendap.org>
+
+	NEWS: Spelling...
+
+2006-03-14  James Gallagher <jgallagher@opendap.org>
+
+	Updated ChangeLog, configure.ac, libdap.spec and NEWS for version
+	3.6.2
+
+2006-03-14  James Gallagher <jgallagher@opendap.org>
+
+	I changed the way DODSFilter handles the compression sub-process.
+	The class was caling waitpid on the child process which was blocking
+	even after the child had exited. I found that calling fflush on
+	the FILE* where teh server is writing the response is sufficient
+	to guarantee that all the data from the compressor is written w/o
+	using waitpod. This is a fix for ticket #335
+
+2006-03-10  James Gallagher <jgallagher@opendap.org>
+
+	Added a new public method to Connect read_data_no_mime() which can
+	be used to read from a file. This method read a DAP2 data object
+	from a file but does not try to parse MIME headers before reading
+	the data. I modified getdap.cc so that it uses this when reading
+	from a file that's not stdin.
+
+2006-03-10  James Gallagher <jgallagher@opendap.org>
+
+	Auto reset of Subversion properties
+
+2006-03-09  James Gallagher <jgallagher@opendap.org>
+
+	Updated for 3.6.1
+
+2006-03-09  James Gallagher <jgallagher@opendap.org>
+
+	Bumped up the version to 3.6.1. Files affected: configure.ac libdap.spec,
+	INSTALL, README, NEWS.
+
+2006-03-09  James Gallagher <jgallagher@opendap.org>
+
+	Updated tests/expr-testsuite/expr-test.0/test.c by changing its name to
+	test.d so that Eclipse's indexer won't gag on it.
+
+2006-03-09  James Gallagher <jgallagher@opendap.org>
+
+	removed unused test directories expr-testsuite and grid-func-testsuite
+
+2006-03-09  James Gallagher <jgallagher@opendap.org>
+
+	Added -t option to DODSFilter.cc. This was left out by mistake.
+
+2006-03-09  James Gallagher <jgallagher@opendap.org>
+
+2006-03-09  James Gallagher <jgallagher@opendap.org>
+
+	Changed tests from dodsdev to test.opendap.org
+
+;; Local Variables:
+;; coding: utf-8
+;; End:
+2006-03-09  James Gallagher <jgallagher@opendap.org>
+
+	Bumped up the version to 3.6.1. Files affected: configure.ac libdap.spec,
+	INSTALL, README, NEWS.
+
+2006-03-09  James Gallagher <jgallagher@opendap.org>
+
+	Updated tests/expr-testsuite/expr-test.0/test.c by changing its name to
+	test.d so that Eclipse's indexer won't gag on it.
+
+2006-03-09  James Gallagher <jgallagher@opendap.org>
+
+	removed unused test directories expr-testsuite and grid-func-testsuite
+
+2006-03-09  James Gallagher <jgallagher@opendap.org>
+
+	Added -t option to DODSFilter.cc. This was left out by mistake.
+
+2006-03-09  James Gallagher <jgallagher@opendap.org>
+
+	Changed tests from dodsdev to test.opendap.org
+
+2006-03-08  James Gallagher <jgallagher@opendap.org>
+
+	Fixed the C++-style comment in deflate.c from a bug reprot
+	from Jim Davis at Nasa.
+
+2006-03-06  James Gallagher <jgallagher@opendap.org>
+
+	Updated for 3.6.0-2
+
+2006-03-06  James Gallagher <jgallagher@opendap.org>
+
+	Increased the release number to two.
+
+;; Local Variables:
+;; coding: utf-8
+;; End:
+2006-03-06  James Gallagher <jgallagher@opendap.org>
+
+	Increased the release number to two.
+
+2006-03-05  Rob Morris <Robert.O.Morris@jpl.nasa.gov>
+
+	Trivial change in comment in win32 libdap makefile
+
+2006-03-05  Rob Morris <Robert.O.Morris@jpl.nasa.gov>
+
+	Redo recently clobbered changes from gl/ refresh
+
+2006-03-01  James Gallagher <jgallagher@opendap.org>
+
+	Updated the OSX_Resources/Readme.txt file for 3.6.0.
+
+2006-02-28  James Gallagher <jgallagher@opendap.org>
+
+	Updated grammar files and added rpm and OS/X package targets to Makefile.am
+
+2006-02-28  James Gallagher <jgallagher@opendap.org>
+
+	Auto reset of Subversion properties
+
+2006-02-27  James Gallagher <jgallagher@opendap.org>
+
+	Updated NEWS.
+
+2006-02-27  James Gallagher <jgallagher@opendap.org>
+
+	Updated the Mac/OSX project file for 3.6.0
+
+2006-02-27  James Gallagher <jgallagher@opendap.org>
+
+	Added unit-tests/testFile.cc: This provides a way to link the FILE*
+	output code with C++ strings so that unit tests can work their magic.
+
+2006-02-27  James Gallagher <jgallagher@opendap.org>
+
+	Updated documentation files (README, NEWS, ChangeLog), version information
+	(configure.ac, libdap.spec) and removed two unused unit test files.
+
+2006-02-27  James Gallagher <jgallagher@opendap.org>
+
+	Imported the latest gnulib code (see the Makefile.am in gl for the
+	gnulib-tool arguments).
+
+2006-02-25  James Gallagher <jgallagher@opendap.org>
+
+	Auto reset of Subversion properties
+
+2006-02-24  James Gallagher <jgallagher@opendap.org>
+
+	Removed lines in Makefile.am that were commented out.
+
+2006-02-24  James Gallagher <jgallagher@opendap.org>
+
+	Removed html.tar.z and added html.tar.gz
+
+2006-02-24  James Gallagher <jgallagher@opendap.org>
+
+	Removed docs.tar.gz
+
+2006-02-24  James Gallagher <jgallagher@opendap.org>
+
+	Added docs and docs/html.tar.gz
+
+2006-02-24  James Gallagher <jgallagher@opendap.org>
+
+	Fixed up the regression tests so that they don't use deprecated
+	Error methods.
+
+2006-02-24  James Gallagher <jgallagher@opendap.org>
+
+	Removed LongIterAdapter.cc from tests
+
+2006-02-24  James Gallagher <jgallagher@opendap.org>
+
+	Removed files no longer needed. Removed depreacted methods. Updated
+	documentation.
+
+2006-02-23  James Gallagher <jgallagher@opendap.org>
+
+	Removed most $Log$ entries since they are not supported by
+	Subversion. Will do the rest tomorrow...
+
+2006-02-23  James Gallagher <jgallagher@opendap.org>
+
+	Removed all the method overloads that used const char *
+	parameters. Those methods were added so that the Pix objects,
+	which were passed as void*, would not get called with character
+	strings by mistake. Since the Pix methods are gone, these are no
+	longer needed.
+
+2006-02-21  James Gallagher <jgallagher@opendap.org>
+
+	I fixed the constructors for both PipeResource and StdinResource
+	so that the parent class and fields were initialized in the
+	correct order. I also fixed up the documentation for
+	DODSResponseObject.
+
+2006-02-20  Rob Morris <Robert.O.Morris@jpl.nasa.gov>
+
+	Tweek linker settings for libdap dll
+
+2006-02-20  Rob Morris <Robert.O.Morris@jpl.nasa.gov>
+
+	Sync win32 makefile with unix version, rewrite
+
+2006-02-20  Rob Morris <Robert.O.Morris@jpl.nasa.gov>
+
+	Update module definitions for dll version of libdap
+
+2006-02-20  Rob Morris <Robert.O.Morris@jpl.nasa.gov>
+
+	Tweek for win32 port
+
+2006-02-15  Patrick West <pwest@ucar.edu>
+
+	fixed indentation
+
+2006-02-15  Patrick West <pwest@ucar.edu>
+
+	commented out DataDDS constructor that doesn't take BaseTypeFactory
+
+2006-02-15  James Gallagher <jgallagher@opendap.org>
+
+	DataDDS.cc: Added a call to protocol_string_to_numbers in the
+	constructor. This sets the internal protocol version numbers so
+	that calls to Sequence:: deserialize() work (they now use the
+	protcol version number to select the correct algorithm for reading
+	from the stream instead of the server version).
+
+2006-02-15  James Gallagher <jgallagher@opendap.org>
+
+	AttrTable.cc: Corrected a problem in add_value_alias where looking
+	for attributes could cause a segmentation fault. The problem was
+	that AttrTable::find() was setting the return iterator to
+	attr_end() for the AttrTable object it returned as a value-result
+	parameter (so the test to see if the iterator was pointing to the
+	end needed to be done using that table and not the calling object.
+
+2006-02-14  James Gallagher <jgallagher@opendap.org>
+
+	NEWS and ChangeLog both updated.
+
+2006-02-14  James Gallagher <jgallagher@opendap.org>
+
+	Auto reset of Subversion properties
+
+2006-02-13  James Gallagher <jgallagher@opendap.org>
+
+	Modified the print_xml method in Constructor and grid. It no
+	longer prints anything for variables that are not part of the
+	current projection when printing the constrained ddx. This works
+	because the DDS::mark method marks the parents of projected
+	variables.
+
+2006-02-13  James Gallagher <jgallagher@opendap.org>
+
+	Added PipeResponse.h and StdinResponse.h; changed getdap and
+	Connect to use them.
+
+2006-02-13  Rob Morris <Robert.O.Morris@jpl.nasa.gov>
+
+	Flush weekend win32 porting work back to trunk
+
+2006-02-10  Rob Morris <Robert.O.Morris@jpl.nasa.gov>
+
+	Removed xdr routines from win32 subdir under libdap. Code now in
+	base tools used to build under win32.
+
+2006-02-09  James Gallagher <jgallagher@opendap.org>
+
+	empty comment
+
+2006-02-09  James Gallagher <jgallagher@opendap.org>
+
+	Removed all deprecated methods as per ticket 248. This includes
+	Pix methods, ostream I/O methods used by servers and various junk
+	in Connect.
+
+2006-01-25  James Gallagher <jgallagher@opendap.org>
+
+	Auto reset of Subversion properties
+
+2006-01-24  James Gallagher <jgallagher@opendap.org>
+
+	Added Removed_functions.txt: This file contains the type
+	signitures of methods/functions recently (version 3.6 and later)
+	removed.
+
+2006-01-24  James Gallagher <jgallagher@opendap.org>
+
+	The ostream I/O was removed and many files were modified. The code
+	is still present inside #if 0 ... #endif preprocessor lines.
+
+2006-01-23  James Gallagher <jgallagher@opendap.org>
+
+	All unit tests updated to work after removing the iostream
+	functions/methods.
+
+2006-01-19  James Gallagher <jgallagher@opendap.org>
+
+	Added protocol version to the library. The version number is set
+	in the configure.ac file. I've modified the unit tests so that
+	they work. I've also removed (#if 0 ... #endif) all of the MIME
+	header functions which used the C++ iostream stuff (which is part
+	of the task to remove deprecated code).
+
+2006-01-12  James Gallagher <jgallagher@opendap.org>
+
+	Updated ChangLog
+
+2006-01-12  James Gallagher <jgallagher@opendap.org>
+
+	DDS.cc: transfer_attributes used odd logic and an unneeded
+	variable. Fixed.
+
+2006-01-12  James Gallagher <jgallagher@opendap.org>
+
+	expr-test.cc: changed new exception code to use fprintf() (it was
+	using cerr).
+
+2006-01-12  James Gallagher <jgallagher@opendap.org>
+
+	GSEClause: Removed the old, unimplemented, methods that were
+	supposed to take the grid() function subexpressions. Fixed up some
+	comments in the class as well.
+
+2006-01-12  James Gallagher <jgallagher@opendap.org>
+
+	cgi_util.cc: In remove_mime_header() \n was used as the MIME
+	header separator when CRLF should have been used. Since the rest
+	of the code was fixed for 3.5.3, remove_mime_header() didn't find
+	the separator. This broke the HTML form response.
+
+2006-01-12  James Gallagher <jgallagher@opendap.org>
+
+	DDS.cc: transfer_attributes used odd logic and an unneeded
+	variable. Fixed.
+
+2006-01-12  James Gallagher <jgallagher@opendap.org>
+
+	expr-test.cc: changed new exception code to use fprintf() (it was
+	using cerr).
+
+2006-01-12  James Gallagher <jgallagher@opendap.org>
+
+	GSEClause: Removed the old, unimplemented, methods that were
+	supposed to take the grid() function subexpressions. Fixed up some
+	comments in the class as well.
+
+2006-01-12  James Gallagher <jgallagher@opendap.org>
+
+	cgi_util.cc: In remove_mime_header() \n was used as the MIME
+	header separator when CRLF should have been used. Since the rest
+	of the code was fixed for 3.5.3, remove_mime_header() didn't find
+	the separator. This broke the HTML form response.
+
+2005-12-30  Rob Morris <Robert.O.Morris@jpl.nasa.gov>
+
+	Work toward accomodating gcc under mingw
+
+2005-12-27  James Gallagher <jgallagher@opendap.org>
+
+	Installed GNU indent code formatter to eclipse and used it on
+	expr-test.cc
+
+2005-12-27  James Gallagher <jgallagher@opendap.org>
+
+	In expr-test, the function parse_mime() did not test for the new
+	CRLF line terminator. This caused an infinite loop. Fixed. I also
+	added a comment to cgi-util.cc noting that if the CRLF constant is
+	changed, then the one in expr-test.cc should be changed too. Since
+	the test code is, well, test code, it doesn't seem like the
+	constant should be moved out into one of the header files. The
+	CRLF constant is really used only by the cgi-util code.
+
+2005-12-27  James Gallagher <jgallagher@opendap.org>
+
+	Removed regex.loT
+
+2005-12-23  James Gallagher <jgallagher@opendap.org>
+
+	Removed extra qualtification on the private method Regex::init in
+	GNURegex.h.
+
+2005-12-23  James Gallagher <jgallagher@opendap.org>
+
+	Removed the send version method body and replaced it with a call
+	to do_version() in cgi_util.cc. This consolodates the code that
+	writes HTTP headers to one file.
+
+2005-12-23  James Gallagher <jgallagher@opendap.org>
+
+	Changed all calls to fprintf that write parts of the HTTP resonse
+	header so that they terminate lines using CRLF pairs and not just
+	LF (\n or 0x0a). I also fixed the spelling of Content-Type (the
+	'T' in 'Type' was not capitalized).
+
+2005-12-12  Rob Morris <Robert.O.Morris@jpl.nasa.gov>
+
+	Missing colon in switch from recent porting tweeks.
+
+2005-12-11  Rob Morris <Robert.O.Morris@jpl.nasa.gov>
+
+	ifdef profoundly-non-portable signal handling code. Windows has
+	few signals.
+
+2005-12-11  Rob Morris <Robert.O.Morris@jpl.nasa.gov>
+
+	Hardcode blocksize on win32
+
+2005-12-11  Rob Morris <Robert.O.Morris@jpl.nasa.gov>
+
+	Reverse ancient VC++ 6.0 template hacks. Microsoft has come toward
+	the standard.
+
+2005-12-05  James Gallagher <jgallagher@opendap.org>
+
+	Updated
+
+2005-11-22  James Gallagher <jgallagher@opendap.org>
+
+	Made docs a PHONY target
+
+2005-11-22  James Gallagher <jgallagher@opendap.org>
+
+	Fixed source0 using Patrice's patch
+
+2005-11-16  James Gallagher <jgallagher@opendap.org>
+
+	Auto reset of Subversion properties
+
+2005-11-15  James Gallagher <jgallagher@opendap.org>
+
+	Added commentary
+
+2005-11-15  James Gallagher <jgallagher@opendap.org>
+
+	Added/Hacked
+
+2005-11-11  James Gallagher <jgallagher@opendap.org>
+
+	Auto reset of Subversion properties
+
+2005-11-10  James Gallagher <jgallagher@opendap.org>
+
+	Added note about dejagnu not working on some systems unless
+	config.guess is linked here or at the top.
+
+2005-11-09  James Gallagher <jgallagher@opendap.org>
+
+	The XML schema site has chamged to xml.opendap.org. I stopped
+	testing these values because that's not really what the DDS class
+	unit tests should be looking at.
+
+2005-11-09  James Gallagher <jgallagher@opendap.org>
+
+	The set of chars allowed in an identifier was enlarged to include
+	%. The secind test was altered to fit that.
+
+2005-10-31  James Gallagher <jgallagher@opendap.org>
+
+	Hacked up the pkg target so that the dap-config script has the
+	correct values for the places where the osx package will be
+	installed, not where the build dumps it prior to packaging.
+
+2005-10-25  Patrick West <pwest@ucar.edu>
+
+	added function to access the libdap name from PACKAGE_NAME
+
+2005-10-25  James Gallagher <jgallagher@opendap.org>
+
+	Auto reset of Subversion properties
+
+2005-10-24  James Gallagher <jgallagher@opendap.org>
+
+	Added
+
+2005-10-18  James Gallagher <jgallagher@opendap.org>
+
+	Update from build after failed attempt to remove Pix.h
+
+2005-10-18  James Gallagher <jgallagher@opendap.org>
+
+	Fixed som grammatical problems with the DDX response.
+
+2005-10-12  James Gallagher <jgallagher@opendap.org>
+
+	Updates to the documentation files.
+
+2005-10-07  James Gallagher <jgallagher@opendap.org>
+
+	escattr() no longer uses Regex.
+
+2005-10-07  James Gallagher <jgallagher@opendap.org>
+
+	Updated to match the new libdap behavior for escaping.
+
+2005-10-05  James Gallagher <jgallagher@opendap.org>
+
+	I made the standard print representation of a Grid use Array and
+	Maps instead of ARRAY and MAPS. So I fixed the tests too.
+
+2005-10-05  James Gallagher <jgallagher@opendap.org>
+
+	Don't have these in svn.
+
+2005-10-05  James Gallagher <jgallagher@opendap.org>
+
+	Don't have these in svn.
+
+2005-10-05  James Gallagher <jgallagher@opendap.org>
+
+	Fix for ticket #44 (which was filed under the hdf4 handler). I
+	made the set of characters not escaped by id2www and id2www_ce the
+	same as those that dds.les and expr.lex expect in an id. Actually
+	the asterisk is escaped even though dds.lex will parse it,
+
+2005-10-05  James Gallagher <jgallagher@opendap.org>
+
+	Auto reset of Subversion properties
+
+2005-10-04  James Gallagher <jgallagher@opendap.org>
+
+	Fixed the background one last time
+
+2005-10-04  James Gallagher <jgallagher@opendap.org>
+
+	Added a background image to the osx installer
+
+2005-10-04  James Gallagher <jgallagher@opendap.org>
+
+	Added
+
+2005-10-04  James Gallagher <jgallagher@opendap.org>
+
+	Updates for the OS/X packages stuff.
+
+2005-10-03  James Gallagher <jgallagher@opendap.org>
+
+	Nodified cleanup to not copy the svn parts of dods_cahce_init when
+	it makes dods_cache. This will help keep Eclipse's svn module from
+	being confused.
+
+2005-10-03  James Gallagher <jgallagher@opendap.org>
+
+	Build improvements from Patrice Dumas.
+
+2005-10-03  Patrick West <pwest@ucar.edu>
+
+	calling fflush rather that fclose in send_data
+
+2005-10-01  James Gallagher <jgallagher@opendap.org>
+
+	Auto reset of Subversion properties
+
+2005-09-30  James Gallagher <jgallagher@opendap.org>
+
+	Updated NEWS with info about regex.
+
+2005-09-30  James Gallagher <jgallagher@opendap.org>
+
+	Updated for the changes to Regex.
+
+2005-09-30  James Gallagher <jgallagher@opendap.org>
+
+	Added
+
+2005-09-29  James Gallagher <jgallagher@opendap.org>
+
+	Removed regex from esc2undescore.
+
+2005-09-29  James Gallagher <jgallagher@opendap.org>
+
+	Fixed an error in char2ASCII.
+
+2005-09-29  James Gallagher <jgallagher@opendap.org>
+
+	Grammar update
+
+2005-09-29  James Gallagher <jgallagher@opendap.org>
+
+	Fixes for gnulib regex code.
+
+2005-09-28  Yuan Ho <yuanho@ucar.edu>
+
+	adding install include dir
+
+2005-09-28  James Gallagher <jgallagher@opendap.org>
+
+	Auto reset of Subversion properties
+
+2005-09-27  Yuan Ho <yuanho@ucar.edu>
+
+	adding install script
+
+2005-09-27  James Gallagher <jgallagher@opendap.org>
+
+	New libtool
+
+2005-09-27  James Gallagher <jgallagher@opendap.org>
+
+	Comment about the hack...
+
+2005-09-27  James Gallagher <jgallagher@opendap.org>
+
+	New grammar generated files and some temporary fixes in gl/m4/regex.m4
+
+2005-09-27  James Gallagher <jgallagher@opendap.org>
+
+	Fixed an error where a signed and unsigned were compared.
+
+2005-09-27  James Gallagher <jgallagher@opendap.org>
+
+	Added new copy.
+
+2005-09-27  James Gallagher <jgallagher@opendap.org>
+
+	New gnulib changes; first half, removing the old gl code. I don't
+	think this was necessary, but it's hard to tell.
+
+2005-09-23  James Gallagher <jgallagher@opendap.org>
+
+	Auto reset of Subversion properties
+
+2005-09-22  James Gallagher <jgallagher@opendap.org>
+
+	Fixed install-sh; it was left out of the earlier mv
+
+2005-09-22  James Gallagher <jgallagher@opendap.org>
+
+	Moved the configuration files into 'conf.'
+
+2005-09-22  James Gallagher <jgallagher@opendap.org>
+
+	Changed the das lexer error message to include a character code.
+
+2005-09-19  Patrick West <pwest@ucar.edu>
+
+	missing declaration of BaseType
+
+2005-09-16  James Gallagher <jgallagher@opendap.org>
+
+	Added code to DODSFilter so support its use in something other
+	than a Unix command line filter program. In the process I found a
+	bug in escaping.cc:escattr() (ticket 210) which I fixed.
+
+2005-09-08  James Gallagher <jgallagher@opendap.org>
+
+	Fixed a bug where _REENTRANT is defined and HAVE_STRFTIME is not.
+	This shows up on FC3/4 but not RHEL3 or OS/X.
+
+2005-09-08  James Gallagher <jgallagher@opendap.org>
+
+	Removed
+
+2005-09-08  James Gallagher <jgallagher@opendap.org>
+
+	Auto reset of Subversion properties
+
+2005-09-07  James Gallagher <jgallagher@opendap.org>
+
+	Build update
+
+2005-09-07  James Gallagher <jgallagher@opendap.org>
+
+	Added
+
+2005-09-06  James Gallagher <jgallagher@opendap.org>
+
+	Added alloc to gl_MODULES; for the os/x build.
+
+2005-09-06  James Gallagher <jgallagher@opendap.org>
+
+	Added the new gl directory.
+
+2005-09-06  James Gallagher <jgallagher@opendap.org>
+
+	Clean up.
+
+2005-09-06  James Gallagher <jgallagher@opendap.org>
+
+	Midway through resetting gl to only use the regex code.
+
+2005-09-03  James Gallagher <jgallagher@opendap.org>
+
+	Auto reset of Subversion properties
+
+2005-08-19  James Gallagher <jgallagher@opendap.org>
+
+	Updated libdap.spec so that it now requires libcurl 7.10.6 (a
+	downgrade from 7.12.0 so that we can build RPMs on RHEL3). This
+	seems to work just fine. Also fixed up the HTPPCacheTest unit test
+	so that it works the first time with a new check out.
+
+2005-08-19  James Gallagher <jgallagher@opendap.org>
+
+	downgrade to libcurl-7.10.6. This seems to work but needs more testing
+
+2005-08-17  James Gallagher <jgallagher@opendap.org>
+
+	Another shot at getting the build to work...
+
+2005-08-17  James Gallagher <jgallagher@opendap.org>
+
+	Build fixes; rpms now split into plain and -devel; fix for
+	libdap.m4 macro
+
+2005-08-16  James Gallagher <jgallagher@opendap.org>
+
+	Patched libdap.m4 (from Patrice) and added text the README
+	describing the macro.
+
+2005-08-16  James Gallagher <jgallagher@opendap.org>
+
+	Commented out the set of CFLAGS/CXXFLAGS (which was a left-over
+	from the non-automake build).
+
+2005-08-15  James Gallagher <jgallagher@opendap.org>
+
+	Updated for the release of 3.5.2.
+
+2005-08-12  James Gallagher <jgallagher@opendap.org>
+
+	Added back.
+
+2005-08-12  James Gallagher <jgallagher@opendap.org>
+
+	Test delete
+
+2005-08-11  James Gallagher <jgallagher@opendap.org>
+
+	config_dap.h --> config.h; also removed TRACE_NEW, #pragma
+	interface/impl. in test and unit-tests.
+
+2005-08-11  James Gallagher <jgallagher@opendap.org>
+
+	Removed trace_new.h; use valgrind instead.
+
+2005-08-11  James Gallagher <jgallagher@opendap.org>
+
+	Removed #pragma interface/implementation
+
+2005-08-11  James Gallagher <jgallagher@opendap.org>
+
+	So, I added IteratorAdapter.cc back in again.
+
+2005-08-11  James Gallagher <jgallagher@opendap.org>
+
+	Hmmm... Eclipse still doesn't seem to get the deletes quite right.
+
+2005-08-11  James Gallagher <jgallagher@opendap.org>
+
+	Tests updated for new float32 and 64 value computation.
+
+2005-08-11  James Gallagher <jgallagher@opendap.org>
+
+	Changed how sequential values are generated. The values should be
+	the same on 32 and 64-bit machines.
+
+2005-08-11  James Gallagher <jgallagher@opendap.org>
+
+	Updated...
+
+2005-08-11  James Gallagher <jgallagher@opendap.org>
+
+	I removed the DODS_GTAR and DODS_PERL calls; Added AC_DEFINE for
+	two version sof libxml2 and stripped away some code that was
+	commented out months ago.
+
+2005-08-11  James Gallagher <jgallagher@opendap.org>
+
+	Resolved conflicts & added some comments about the state of the
+	test driver.
+
+2005-08-11  James Gallagher <jgallagher@opendap.org>
+
+	Clarified commentary.
+
+2005-08-11  James Gallagher <jgallagher@opendap.org>
+
+	Added conditional compilation of the XML SAX callback struct. The
+	code now uses the library version number to determine which fields
+	should be included since later version have additional fields.
+
+2005-08-11  James Gallagher <jgallagher@opendap.org>
+
+	Removed unused params in methods as reported by gcc 3.4. This may
+	break gcc 3.2, we will see...
+
+2005-08-11  James Gallagher <jgallagher@opendap.org>
+
+	Removed unused params in methods as reported by gcc 3.4. This may
+	break gcc 3.2, we will see...
+
+2005-08-10  James Gallagher <jgallagher@opendap.org>
+
+	Changed comparison in set_max_size() so that it uses ULONG_MAX
+	(since the method uses a long) and does not test for negative
+	sizes (since size is unsigned).
+
+2005-08-10  James Gallagher <jgallagher@opendap.org>
+
+	Moved debug options from AM_CXXFLAGS. Set the CXXFLAGS environment
+	variable (sample values are assigned to CXXFLAGS_DEBUG).
+
+2005-08-10  James Gallagher <jgallagher@opendap.org>
+
+	commented out #define DODS_DEBUG 1
+
+2005-08-10  James Gallagher <jgallagher@opendap.org>
+
+	Reverted to previous version (which uses long instead of int). The
+	change breaks the unit tests (which otherwise work on both 32- and
+	64-bit machines.
+
+2005-08-10  James Gallagher <jgallagher@opendap.org>
+
+	Added
+
+2005-08-10  James Gallagher <jgallagher@opendap.org>
+
+	Latest and greatest eclipse/cdt settings...
+
+2005-08-10  James Gallagher <jgallagher@opendap.org>
+
+	Addressed various warnings from gcc (compiled using -Wall -W
+	-Wcast-align) as part of making the code 64-bit clean.
+
+2005-08-10  James Gallagher <jgallagher@opendap.org>
+
+	Added default init of TestCommon in the copy ctors for the
+	TestByte, ... classes.
+
+2005-08-10  James Gallagher <jgallagher@opendap.org>
+
+	Added proper error return to all unit tests.
+
+2005-08-10  James Gallagher <jgallagher@opendap.org>
+
+	Now GNURegex uses exceptions (std::invalid_argument and domain_error)
+	to signal problems. Controlled using USE_EXCEPTIONS. If this passes
+	on the nightly builds, then remove GNUerror.cc and builtin.h.
+
+2005-08-10  James Gallagher <jgallagher@opendap.org>
+
+	Fixed read() method: It did not include the 16-bit int types int
+	he switch statement.
+
+2005-08-08  James Gallagher <jgallagher@opendap.org>
+
+	Fixed a leak where a specialization of BaseTypeFactory was used
+	but not deleted.
+
+2005-08-08  root
+
+	Auto reset of Subversion properties
+
+2005-07-28  James Gallagher <jgallagher@opendap.org>
+
+	Changes for the OS/X build. Particularly for the regex code in gl.
+
+2005-07-25  James Gallagher <jgallagher@opendap.org>
+
+	Fixed; the macro was using ifelse and m4_syscmd/m4_sysval but
+	these didn't seem to be working. Also replaced obsolete AC_TRY_TUN
+	with AC_RUN_IFELSE().
+
+2005-07-23  James Gallagher <jgallagher@opendap.org>
+
+	Added libdap.m4: A macro that other packages can use to check for
+	the library. From Patrice Dumas.
+
+2005-07-22  James Gallagher <jgallagher@opendap.org>
+
+	Updated requirements for automake, et cetera.
+
+2005-07-22  James Gallagher <jgallagher@opendap.org>
+
+	Updated for automake 1.9.6.
+
+2005-07-21  James Gallagher <jgallagher@opendap.org>
+
+	Removed calls to OK() in the set_error_code() and
+	set_error_message() methods since these are called by the parser
+	on partially built objects.
+
+2005-07-20  James Gallagher <jgallagher@opendap.org>
+
+	Improved the documentation of BaseTypeFactory; removed
+	DEFAULT_BASETYPE_FACTORY from Makefile.am; added a note to
+	util.cc:prune_spaces questioning if that function is still needed;
+	added a test of prune_spaces to generalUtilTest.
+
+2005-07-20  James Gallagher <jgallagher@opendap.org>
+
+	Removed DEFAULT_BASETYPE_FACTORY switch. Updated build files using
+	autoreconf --install --force (using automake 1.9.2 from FC3).
+
+2005-07-19  James Gallagher <jgallagher@opendap.org>
+
+	Updated cdtproject file. Should this be in SVN?
+
+2005-07-19  James Gallagher <jgallagher@opendap.org>
+
+	Added gl/m4 to EXTRA_DIST; needed to get the distcheck target workig
+	with automake 1.6.3. Newer versions of automake set this correctly
+	given that ACLOCAL_AMFLAGS is used.
+
+2005-07-18  James Gallagher <jgallagher@opendap.org>
+
+	Removed $(top_srcdir) from ACLOCAL_AMFLAGS since this breaks
+	autoreconf.
+
+2005-07-18  James Gallagher <jgallagher@opendap.org>
+
+	Changed ACLOCAL_AMFLAGS from '-I gl/m4' to '-I $(top_srcdir)/gl/m4' to
+	fix one last problem with distcheck.
+
+2005-07-18  James Gallagher <jgallagher@opendap.org>
+
+	Applied Patrice's patch for unit-tests; make distcheck should now work.
+
+2005-07-18  James Gallagher <jgallagher@opendap.org>
+
+	Changed the cache dirs with initial values to <cache>_init and use
+	the cleanup.sh script to cp -r <*>_init <*> to restore them. This
+	way the tests work w/o svn.
+
+2005-07-18  James Gallagher <jgallagher@opendap.org>
+
+	Added blurb about using autoreconf to (re)build the autotools stuff.
+
+2005-07-15  James Gallagher <jgallagher@opendap.org>
+
+	Updated Makefile.am and the README/INSTALL/NEWS files. The 'dist'
+	target now works for make (although 'distcheck' fails for an odd
+	reason).
+
+2005-07-15  James Gallagher <jgallagher@opendap.org>
+
+	Copied/added
+
+2005-07-15  James Gallagher <jgallagher@opendap.org>
+
+	Removed
+
+2005-07-15  James Gallagher <jgallagher@opendap.org>
+
+	Moved/Added
+
+2005-07-15  James Gallagher <jgallagher@opendap.org>
+
+	Moved the unit tests from 'tests' to 'unit-tests.' The unit tests
+	are now only run when you cd into unit-tests and use make check.
+	This change was made because those tests use network services
+	which might not be present on some hosts used to build the
+	package.
+
+2005-07-15  James Gallagher <jgallagher@opendap.org>
+
+	More fixes for the tests
+
+2005-07-14  James Gallagher <jgallagher@opendap.org>
+
+	Fixed again...
+
+2005-07-14  James Gallagher <jgallagher@opendap.org>
+
+	Removed extra line. This hosed the test since it causes the
+	HTTPCache class to think there's a second zero-size entry.
+
+2005-07-14  James Gallagher <jgallagher@opendap.org>
+
+	Updated
+
+2005-07-14  James Gallagher <jgallagher@opendap.org>
+
+	Updated
+
+2005-07-14  James Gallagher <jgallagher@opendap.org>
+
+	Updated
+
+2005-07-14  James Gallagher <jgallagher@opendap.org>
+
+	Changed URL; chages cache directory number
+
+2005-07-14  James Gallagher <jgallagher@opendap.org>
+
+	AISMergeTest now works (required files are now installed on
+	test.opendap.org). Also, applied Patrice Dumas' patch for the
+	Makefile.am.
+
+2005-07-13  James Gallagher <jgallagher@opendap.org>
+
+	Fixed HTTPConnectTest
+
+2005-07-13  James Gallagher <jgallagher@opendap.org>
+
+	Spec file now includes support for a separate devel package
+	(commented out). From Patrice Dumas.
+
+2005-07-13  James Gallagher <jgallagher@opendap.org>
+
+	expr-test tests x, xa, xc, y, ya, and yc now expect to fail (and
+	do on 64bit hosts).
+
+2005-07-13  James Gallagher <jgallagher@opendap.org>
+
+	The last fix for this file? I hope so...
+
+2005-07-12  James Gallagher <jgallagher@opendap.org>
+
+	Added data files for tests in DDSTest. Bug 112.
+
+2005-07-12  James Gallagher <jgallagher@opendap.org>
+
+	mistakenly removed alloca_.h from svn. Fixed tests/cache_testsuite.
+
+2005-07-12  James Gallagher <jgallagher@opendap.org>
+
+	Test updates: expr-test now works except that 6 tests fail on
+	64bit machines. Also, I updated the gnulib replacement functions
+	so that gnulib-tool can be used in the future to update. I moved
+	the gnulib functions into the 'gl' subdir and put the m4 macros in
+	there inside the subdir 'gl/m4.' There's a note about the
+	procedure to use to update the functions in INSTALL.
+
+2005-07-12  James Gallagher <jgallagher@opendap.org>
+
+	Added again...
+
+2005-07-12  James Gallagher <jgallagher@opendap.org>
+
+	removed
+
+2005-07-12  James Gallagher <jgallagher@opendap.org>
+
+	Added
+
+2005-07-12  James Gallagher <jgallagher@opendap.org>
+
+	Removed
+
+2005-07-12  James Gallagher <jgallagher@opendap.org>
+
+	Removed.
+
+2005-07-11  James Gallagher <jgallagher@opendap.org>
+
+	My previous fix for the gnulib mktime bug was bogus since it left
+	a replacement copy of mktime in the library using that name (which
+	is reserved). I've stopped using the gnulib mktime for now since
+	it doesn't seems absolutely necessary.
+
+2005-07-11  James Gallagher <jgallagher@opendap.org>
+
+	Modification from Patrice, et al. These were part of an attempt to work
+	around a bug with using mktime but they did not work.
+
+2005-07-08  James Gallagher <jgallagher@opendap.org>
+
+	Moved all tests to the 'tests' subdirectory. There are some tests
+	that are broken; only expr-test seems broken now but was not
+	before. Most of the broken tests require a localhost web daemon
+	and specific test files for it to serve; configure
+	test.opendap.org for these instead.
+
+2005-07-08  James Gallagher <jgallagher@opendap.org>
+
+	Removed use of the GPL regex-0.12 code and switched to gnulib
+	(which provides regex and other functions which are covered by
+	LGPL). These turned out to be fairly massive changes. The work was
+	done by Patrice Dumas (Thanks!). I removed a AC_DEFINE macro in
+	m4/mktime.m4 to work around a compilation problem when using
+	gnulib's mktime.c replacement function.
+
+2005-07-06  Patrick West <pwest@ucar.edu>
+
+	Added methods to Connect class to connect with the given URL
+	instead of building the URL to connect with, such as adding .das,
+	.dds, etc...
+
+2005-07-05  Rob Morris <Robert.O.Morris@jpl.nasa.gov>
+
+	Set eol-style to native on all text file in the trunk
+
+2005-07-05  James Gallagher <jgallagher@opendap.org>
+
+	Fixed the library version numbers. The order was backwards for the
+	last two digits.
+
+2005-07-04  James Gallagher <jgallagher@opendap.org>
+
+	Added Patrice Dumas' patches for libtool, et cetera.
+
+2005-07-01  James Gallagher <jgallagher@opendap.org>
+
+	Moved the unit tests into the tests subdirectory.
+
+2005-07-01  James Gallagher <jgallagher@opendap.org>
+
+	After adding libtool support, I ran autoreconf --force --install
+	which in turn ran libtoolize. this updated a number of the support
+	code for the build. Added ltmain.sh.
+
+2005-07-01  James Gallagher <jgallagher@opendap.org>
+
+	Added. These generated files should be in svn.
+
+2005-07-01  James Gallagher <jgallagher@opendap.org>
+
+	Added support for libtool using a patch from Patrice Dumas.
+
+2005-07-01  James Gallagher <jgallagher@opendap.org>
+
+	Set exec
+
+2005-07-01  James Gallagher <jgallagher@opendap.org>
+
+	ModifiedMakefile.am so that the dejagnu_driver.sh script now works.
+
+2005-06-30  James Gallagher <jgallagher@opendap.org>
+
+	Automake changes; these work and build the tests. the DejaGNU test
+	support has not been tested yet but the unit tests all run and the
+	dejagnu drivers all build.
+
+2005-06-30  James Gallagher <jgallagher@opendap.org>
+
+	Switched to automake. Not complete but functional.
+
+2005-06-30  James Gallagher <jgallagher@opendap.org>
+
+	Applied patch from Patrice Dumas for the automake build.
+
+2005-06-22  James Gallagher <jgallagher@opendap.org>
+
+	Added for automake build
+
+2005-06-22  James Gallagher <jgallagher@opendap.org>
+
+	Started work on an automake file for this code; only partly done.
+	The library builds but nothing else is in place. The grammars are
+	in progress. They build but the way gse is handled is the the way
+	they all should be unless I can get automake's lex/yacc rules to
+	work. See Makefile.am.in_progress and configure.ac.for_am. Also
+	included in this check in is a patch to libdap.spec from Patrice
+	Dumas.
+
+2005-06-22  James Gallagher <jgallagher@opendap.org>
+
+	Remove the attempts to utilize automake's support for bison/flex
+	introduced in the past 9 revisions.
+
+2005-06-21  James Gallagher <jgallagher@opendap.org>
+
+	moved...
+
+2005-06-21  James Gallagher <jgallagher@opendap.org>
+
+	checkpoint
+
+2005-06-21  James Gallagher <jgallagher@opendap.org>
+
+	moved from *.lex files for automake
+
+2005-06-21  James Gallagher <jgallagher@opendap.org>
+
+	Moved from gse.lex for automake
+
+2005-06-20  James Gallagher <jgallagher@opendap.org>
+
+	Fixed the source path.
+
+2005-06-20  James Gallagher <jgallagher@opendap.org>
+
+	Commented out the Patch: and %patch lines since the patched code is
+	now in svn.
+
+2005-06-20  James Gallagher <jgallagher@opendap.org>
+
+	Accepted patches from Patrice Dumas <pertusus@free.fr> which
+	improve the build by using the system's regex library if found.
+	Also included in the patches were improvements to the rpm spec
+	file; the file now uses the fedora template and includes a fix for
+	Mandrake ('Tue' --> 'Tues' in the change log.
+
+2005-06-15  James Gallagher <jgallagher@opendap.org>
+
+	Fixed configure so that it does not include -gstabs on OS/X.
+
+2005-06-15  James Gallagher <jgallagher@opendap.org>
+
+	Changed eol-style, mime-type, other properties. Removed generated
+	files from svn. Modified configure.ac so that it tests for bison
+	and does not use bison -y.
+
+2005-06-15  James Gallagher <jgallagher@opendap.org>
+
+	Generated... Should these even be in SCM?
+
+2005-05-23  James Gallagher <jgallagher@opendap.org>
+
+	Removed cast to int at tokenlength = ... to avoid a warning about
+	differring pointer and int sizes on x86 64-bit CPUs.
+
+2005-05-23  James Gallagher <jgallagher@opendap.org>
+
+	Now uses local common-tests.exp and test.opendap.org.
+
+2005-05-23  James Gallagher <jgallagher@opendap.org>
+
+	Tests now use the local copy of common-tests.exp.
+
+2005-05-23  James Gallagher <jgallagher@opendap.org>
+
+	Reformat using indent and indent-eclipse plugin.
+
+2005-05-17  Patrick West <pwest@ucar.edu>
+
+	updated dap_version using libdap_version
+
+2005-05-13  James Gallagher <jgallagher@opendap.org>
+
+	3.5.1
+
+2005-05-13  James Gallagher <jgallagher@opendap.org>
+
+	3.5.1
+
+2005-05-13  James Gallagher <jgallagher@opendap.org>
+
+	checkpoint
+
+2005-05-12  James Gallagher <jgallagher@opendap.org>
+
+	moved
+
+2005-05-12  James Gallagher <jgallagher@opendap.org>
+
+	Renamed libdap-config to dap-config to fall in line more with what
+	other projects are doing.
+
+2005-05-12  James Gallagher <jgallagher@opendap.org>
+
+	05/12/05 jhrg
+
+2005-05-12  James Gallagher <jgallagher@opendap.org>
+
+	Modified install so that it no longer appends a version number to the
+	static library or includes. When we build a dynamic lib, look into the
+	version number thing then.
+
+2005-05-11  James Gallagher <jgallagher@opendap.org>
+
+	5/11/05
+
+2005-05-10  James Gallagher <jgallagher@opendap.org>
+
+	Changed to work with rpm. Don't alter the values of variables like
+	$includedir because values for these are passed into make by
+	rpmbuild, overriding the values set by the here. This was
+	happening with $includedir which had the string '/libdap' appended
+	early on in the Makefile and then @PACKAGE_VERSION@ appended in
+	the install-header target. When 'make' was run from the command
+	line, this worked OK, but not when rpmbuild passed in a new value
+	for $includedir.
+
+2005-05-10  James Gallagher <jgallagher@opendap.org>
+
+	Added
+
+2005-05-10  James Gallagher <jgallagher@opendap.org>
+
+	5/10/2005
+
+2005-05-10  James Gallagher  <jimg@zoey.opendap.org>
+
+	* libdap.spec (Prefix): Built spec file; tested. Some problems
+	remain, mostly that the curl and xml2 packages are not part of
+	the RHEL3 dist! I'll have to sort that out before this dist
+	mechanism becomes a reality.
+
+2005-04-15  James Gallagher  <jimg@comet.opendap.org>
+
+	* Removed include of config_dap.h from HTTPCache.h. This is the
+	only header file in the library that includes the config header.
+	Removing the include means that users of the library never see the
+	library's internal configuration. There's a potential problem with
+	this, however, in that users of the library must now use
+	opendap-config --cflags when building _or_ define HAVE_PTHREADS_H
+	themselves. I can make this last requirement go away if pthreads
+	becomes required for libdap++ (then the code won't need the
+	compile time symbol).
+
+2005-02-08  James Gallagher  <jimg@comet.dods.org>
+
+	* Merged with release-3-4-10
+
+2005-02-08  James Gallagher  <jimg@comet.dods.org>
+
+	* bumped the version up to 3.4.10; tagged.
+
+	* System upgrade to FC3/gcc-3.4; minor fixes for the build.
+
+2005-01-28  James Gallagher  <jimg@comet.dods.org>
+
+	* Merged with release-3-4-9.
+
+2005-01-27  James Gallagher  <jimg@comet.dods.org>
+
+	* Added code to Test* classes so that Sequences are easier to
+	test. These classes now return values similar to Nathan's DTS code
+	on the Java module (although not exactly the same).
+
+	* Fixed the way Sequence CEs are handled when Sequences are
+	nested. Tested to three levels deep. The serialization code in
+	Sequence is nw quite complex.
+
+	* Incremented version to 3.4.9; I've made some changes since the
+	last version and I need these in the trunk to test.
+
+2004-07-07  James Gallagher  <jimg@comet.dods.org>
+
+	* Merged with release-3-4-8FCS.
+
+2004-07-06  James Gallagher  <jimg@comet.dods.org>
+
+	* Bumped the version to 3.4.8.
+
+2004-07-02  James Gallagher  <jimg@comet.dods.org>
+
+	* I removed (commented) the pragma interface/implementation lines.
+	This increases the size of the library by ~1MB, which seems pretty
+	insignificant at this point. The change means that the code will
+	compile on HP/UX with gcc 3.2. It _may_ be that gcc 3.4 fixes this
+	problem, but it seems that the pragmas cause more headaches than
+	they are worth. It should be easy to 'add them back in' if we
+	decide to do that, since they are just commented out. 
+
+2004-03-11  James Gallagher  <jimg@comet.dods.org>
+
+	* Bumped the version to 3.4.7.
+
+	* I fixed a problem in SignalHandler and RCReader. Both od=f these
+	class had code that re-initialized a pthread_once_t mutex in their
+	delete_instance() method. This was used by some unit tests to make
+	a delete instances of these two singleton classes. The problem is
+	that while this runs (sort of, we had some reports of
+	crash-on-exit behavior) on Linux, it fails outright on Solaris. As
+	Rob M points out, it's a non-standard use of pthreads. I removed
+	the re-init and changed the unit tests. 
+
+2004-02-18  James Gallagher  <jimg@comet.dods.org>
+
+	* Merge release-3-4-2FCS.
+
+2004-02-16  James Gallagher  <jimg@comet.dods.org>
+
+	* Other fixes:
+	The DBG() macros now include namespace std declarations.
+	Used valgrind to isolate some memory leaks; others remain and this
+	will be an on-going process.
+	Made sure all calls to delete also set the pointer to null; this
+	fixes some dual-delete bugs.
+	Some of the doxygen comments have been improved.
+	Fixed places were the switch from strstream to stringstream was
+	botched. 
+
+	* Fixed the following bugs since version 3.4.5:
+	696: Infinite loop in the HDF4 server (w/character variables).
+	698: libdap++ now returns better error messages when the httpd
+	reports an error.
+	692: The info response now works.
+	695: The client-side cache is more robust. It does not leave cruft
+	around when a user interrupts a program.
+	691: Error responses were not parsed/processed correctly when
+	received by clients in some circumstances. Now they are.
+
+2004-01-30  James Gallagher  <jimg@comet.dods.org>
+
+	* usage.cc: Fixed bug 692. Only one global attribute and one
+	variable were output. The cause: ends operators left over from the
+	strstream code...
+
+2004-01-22  James Gallagher  <jimg@dcz.dods.org>
+
+	* Added namespace std declarations to some files. The DBG() macro
+	uses cerr and thus the std namespace or std::cerr must be declared
+	for newer compilers.
+
+2003-12-08  Yuan Ho  <yuanho@ucar.edu>
+
+        * Merge release-3-4 into trunk.
+
+2003-11-10  James Gallagher  <jimg@dcz.dods.org>
+
+	* Added the methods Float32::value() and Float64::value(). I think
+	the DAP should have a suite of methods which return values w/o
+	using the awkward void pointer scheme. These methods (will) require
+	a downcast unlike the void pointer methods. But they wind up being
+	much easier to use in situations where you know the type of the
+	BaseType object (which seems to be most of the time, in practice).
+
+2003-10-03  James Gallagher  <jimg@dcz.dods.org>
+
+	* I changed Connect's request_das, ..., methods so that they now
+	treat a response that lacks a Content-Description header
+	identifying the response as one of ours as a fatal error.
+
+	* I Fixed what seems like, in hindsight, a bug. The scanners were
+	treating illegal characters as non-fatal errors and writing
+	messages on stderr. In reality the scanners should have been
+	flagging those responses as bogus. Also, the scanners were using
+	exit(1) when they found a fatal error; I changed that so they now
+	throw an Error object.
+
+2003-09-19  James Gallagher  <jimg@dcz.dods.org>
+
+	* Fixed bug #655. Here's how the DAP library looks for the RC
+	file: First it checks the env variable DODS_CONF, then HOME. If
+	neither is set it uses default values and disables the cache.
+	Here's how DODS_CONF is used: If it is the name of a file that
+	exists, use that as the RC file. If DODS_CONF names a directory,
+	look in that directory for a file called '.dodsrc'. If that file
+	exists, it uses it, otherwise try to create it using default
+	values *except* that the value of CACHE_ROOT is the directory part
+	of DODS_CONF with '.dods_cache/' appended. If DODS_CONF is not set
+	to any value, the code looks at HOME and applies the same rules as
+	for DODS_CONF (except that HOME should never be the name of a file
+	so some of the rules don't really apply). We may need to tune this
+	code for WIN32.
+
+	Note that caching is off by default and a .dodsrc created by the
+	library will have USE_CACHE set to zero. Users must actively turn
+	caching on by editing the RC file.
+
+2003-09-08  James Gallagher  <jimg@dcz.dods.org>
+
+	* HTTPConnect.cc (fetch_url): Fixed bug #661.
+
+2003-08-29  James Gallagher  <jimg@dcz.dods.org>
+
+	* Added a new property to BaseType which can be used to
+	differentiate between variables that must be read by a server
+	because they are in the projection and those which must be read
+	because they are used in a selection clause or as a function
+	argument. Previously we were using the send_p property for both
+	these and it was causing problems when CEs contained both
+	projected variables and functions (see bug #657). The new property
+	is called 'in_selection' and is true if the variable is part of
+	the current CE's selection or is used in any type of CE function.
+	Servers should ensure that if their read() method implementation
+	test send_p before reading data they also test in_selection. Data
+	values should be read it *either* property is true. This fixes bug
+	#657.
+
+2003-07-28  James Gallagher  <jimg@dcz.dods.org>
+
+	* Added support for Digest authentication. There's also potential
+	support for NTLM and GSS-Negotiate authentication, but I don't
+	have any way to test those. 
+
+2003-07-24  James Gallagher  <jimg@dcz.dods.org>
+
+	* Added a new test driver called server_handler. It's much more
+	like a server's handler executable; combine it with geturl reading
+	from stdin to make tests. See also sh-testsuite. Nascent but still
+	useful. 
+
+	* DDS:send() has been incorporated into DODSFilter::send_data() as
+	part of a refactoring of DDS.
+
+	* Timeouts are now smart.
+
+2003-07-23  James Gallagher  <jimg@dcz.dods.org>
+
+	* Added a timeout mechanism to the server and modified the Test*
+	classes so this is easier to test. Right now it's a pretty
+	rudimentary thing. However, the timeout can be set in the newly
+	expanded dods.rc configuration file. In the future when we have
+	reliable Error delivery this code will send an Error object that
+	explains that there was a time out, et cetera. Check out the
+	ChangeLog in DODS/etc for information about the expanded dods.rc file.
+
+2003-05-15  James Gallagher  <jimg@dcz.dods.org>
+
+	* Removed the List class/datatype. We've talked about this for
+	months (years). Done.
+
+2003-05-13  James Gallagher  <jimg@dcz.dods.org>
+
+	* Modified DODSFilter so that it takes a new switch, -o, which can
+	be used to tell a handler which object is to be returned. Handlers
+	can now be built which return all of the responses; the
+	DODS_Dispatch CGI module tells the hander which response to
+	generate. 
+
+2003-04-21  James Gallagher  <jimg@dcz.dods.org>
+
+	* Merged release-3-3-1.
+
+	* The RCReader class now supports using the environment variable
+	DODS_CONF to point toward a dodsrc file. The value of the envar
+	supersedes the default ~/.odsrc.
+
+	* In HTTPCache: changed catch(...) clauses so that they explicitly
+	name exceptions. The code was catching and re-throwing exceptions
+	and in methods where the types of exceptions were caught this
+	caused abort to be called, even when the re-thrown exception was
+	one of the declared types.
+
+	* Several bugs in the grid() function were fixed. First, the
+	function was not checking to make sure that map vectors using in
+	the selection sub-expressions passed to grid() actually existed.
+	Also, the mechanism used to read values of variables used as
+	arguments to CE functions was broken; constructor types were not
+	completely read but *were* marked as though they were. Look in
+	RValue for the latter fix.
+
+	* Some of the unit tests included code that wouldn't compile with
+	gcc 3.2.x; fixed. I'm now using gcc 3.2.2 for development (but
+	nightly builds also continue with 2.95.3 and VC++ as well).
+
+	* Added methods to DAS, AttrTable and DDS so that an integer index
+	can be used to access variables and attributes. This was done so
+	that the idl command-line client could iterate over instances
+	without actually having to work with C++ iterator objects.
+
+	* IteratorAdapter is no longer templated. This change was made to
+	accommodate the MS VC++ compiler. Also, doxygen comments have been
+	added to the code.
+
+2003-01-23    <jimg@dcz.dods.org>
+
+	* Made release 3.3.0. Not merged since there were very, very few
+	changes. 
+
+2003-01-22    <jimg@dcz.dods.org>
+
+	* I changed the source files so that they are clearly covered by
+	the GNU Lesser GPL.
+
+2003-01-10    <jimg@dcz.dods.org>
+
+	* NEWS: Added.
+
+	* Merged with changes tagged release-3-2-10 (from the release-3-2
+	branch). 
+
+2002-08-08    <jimg@dcz.dods.org>
+
+	* I Replaced the single VirtualCtors.cc file, which had a virtual
+	constructor for each of the data type classes in it (see Meyers
+	for a discussion of virtual ctors), with a set of files with one
+	virtual ctor per file. The old VirtualCtors.o file was *not*
+	included in the libdap++ library because of link-time problems it
+	would introduce. The new files *are* included. For any of the
+	data type classes you specialize, you must provide a virtual ctor
+	that returns an instance of your specialization. For any of the
+	data types you do *not* specialize, the library will use the
+	default virtual ctor.
+
+	* The library libdap++.a is now `apartment thread safe.' The
+	phrase comes from Microsoft's documentation; it means that the
+	library can be used in a limited sense with MT software. The limit
+	is that objects created using the library cannot be shared by
+	threads. A MT program can create several instances of Connect, for
+	example, but each instance can only be used by a single thread.
+
+2002-06-21    <jimg@dcz.dods.org>
+
+	* Connect.cc: Fairly extensive additions to Connect's interface.
+	The old interface is still supported, but its use is deprecated.
+
+	* VirtualCtors.cc: Added this file. It can be linked with clients
+	so that they don't have to provide definitions for the NewByte(),
+	..., NewGrid() 'virutal constructor' functions. This will work
+	only for those clients that don't need to subclass the various
+	types. There maybe a better way to do this; either use a real
+	factory class passed to DDS or by putting each of the New*()
+	virtual ctors in its own file and adding those to the library.
+	That way the linker will only extract them if they are needed. 
+
+2002-06-11    <jimg@dcz.dods.org>
+
+	* expr.y (process_array_indices): Arrays and Grids can no longer
+	be partially constrained (those constraints didn't work).
+
+2002-06-10    <jimg@dcz.dods.org>
+
+	* das.lex: Added '*' to the set of chars allowed in a WORD. Same
+	for dds.lex.
+
+2002-06-05    <jimg@dcz.dods.org>
+
+	* usage.cc: Modified so that option inforamtion passed in by
+	DODS_Dispatch.pm gets passed onto the filter programs (see bug 453).
+
+
+
+2002-06-03    <jimg@dcz.dods.org>
+
+	* Sequence.cc (print_all_vals): Removed Sequence::level and
+	set_level() methods and the private _level field.
+
+	* dods-limits.h (DODS_ULONG_MAX): Added U suffix to unsigned
+	numerical constants.
+
+2002-05-31    <jimg@dcz.dods.org>
+
+	* das.y: Bug 450; The reserved word attributes can now be used as
+	an attribute name.
+
+2002-05-28    <jimg@dcz.dods.org>
+
+	* Makefile.in: Geturl is no linked without the Test* classes. This
+	demonstrates that libdap++ can be used without subclassing. Look
+	at geturl.cc for an example. Of course, there are limitations on
+	what you can do without subclassing the data types...
+
+	* geturl.cc: Geturl no longer links with the Test* classes. It was
+	modified so that it can use the versions of the classes that are
+	part of libdap++.a (which is a recent change to the library). The
+	geturl.cc file now contains the `virtual ctors' used by the
+	library to instantiate the instances of the various variables.
+
+2002-05-26    <jimg@dcz.dods.org>
+
+	* Connect.h: Removed code specific to the GUI-based progress
+	indicator. 
+
+	* Error.h: Removed code specific to the GUI-based progress indicator.
+
+2002-05-22    <jimg@dcz.dods.org>
+
+	* Byte.h, Byte.cc, ..., Grid.h, Grid.cc: It is no longer necessary
+	to subclass the data type classes when building a client.
+
+2002-05-10    <jimg@dcz.dods.org>
+
+	* Connect.cc (www_lib_init): Joe Sirott found and fixed a bug when
+	making (many) multiple requests.
+
+2002-05-09    <jimg@dcz.dods.org>
+
+	* BaseType.cc (read): This method is not longer abstract.
+
+	* usage.cc (main): Fixed a bug triggered when PATH lacks `.'
+	
+2002-04-30    <jimg@dcz.dods.org>
+
+	* Merged with release-3-2-9
+
+2002-04-03    <jimg@dcz.dods.org>
+
+	* Makefile.in (binary-tar): Fixed binary-tar target.
+
+	* BaseType.cc: Added using std::endl and ::ends
+
+2002-04-02    <jimg@dcz.dods.org>
+
+	* DDS.cc: Fixed broken use of using std::strstream.
+
+	* Connect.cc (server_handler): Fixed bug 416.
+
+2002-03-27    <jimg@dcz.dods.org>
+
+	* usage.cc (write_global_attributes): Fixed usage's output of
+	nested attributes.
+
+2002-03-12    <jimg@dcz.dods.org>
+
+	* Bug 400 fixed.
+
+	* Servers now should recognize that a file called `das' in a
+	directory with data files is an ancillary DAS for any of those
+	files. If an ancillary DAS exists that has a more speciific name,
+	that file will be used instead of the directory-wide DAS.
+
+2001-10-13  James Gallagher  <jimg@dcz.dods.org>
+
+	* Merged with release-3-2-8.
+
+	* Various bug fixes.
+
+	* Connect now uses exceptions to signal errors for all network I/O.
+
+2001-10-01  James Gallagher  <jimg@dcz.dods.org>
+
+	* Changed serialize and deserialize so that they use exceptions to
+	signal errors. The return values can be ignored. For backward
+	compatibility serialize always returns true and deserialize always
+	returns false (even though that's counter intuitive, that's the
+	old behavior for `no more data to read').
+
+2001-09-28  James Gallagher  <jimg@dcz.dods.org>
+
+	* Merged with release 3.2.7. The next merge should use
+	release-3-2-7 -j release-3-2.
+
+2001-09-26  James Gallagher  <jimg@dcz.dods.org>
+
+	* Fixed a bug in the progress indicator's cancel button that
+	caused a crash.
+
+	* Fixed the grid() server-side function. This function can be used
+	in constraint expressions to *select* parts of Grid variables
+	based on the values of their map vectors. Here's an example using
+	the COADS dataset: The dataset can be found at:
+	http://dcz.dods.org/dods-3.2/nph-dods/data/nc/coads_climatology.nc.
+	Look at the DDS and at the Grid SST:
+	    Dataset {
+		Float64 COADSX[COADSX = 180];
+		Float64 COADSY[COADSY = 90];
+		Float64 TIME[TIME = 12];
+		Grid {
+		 ARRAY:
+		    Float32 SST[TIME = 12][COADSY = 90][COADSX = 180];
+		 MAPS:
+		    Float64 TIME[TIME = 12];
+		    Float64 COADSY[COADSY = 90];
+		    Float64 COADSX[COADSX = 180];
+		} SST;
+		...
+	    } coads_climatology;
+	From the attribute object you can find out about the map vector's
+	ranges: 
+            Attributes {
+		COADSX {
+		    String units "degrees_east";
+		    String modulo " ";
+		    String point_spacing "even";
+		}
+		COADSY {
+		    String units "degrees_north";
+		    String point_spacing "even";
+		}
+	    ...
+	Using the grid function you can ask for the part of SST that falls
+	between 30 and 50 degrees east and greater than 20 degrees north
+	using: grid(SST,"30<COADSX<50","20<=COADSY") as the constraint
+	expression. Note that two different styles of mini-expressions are
+	supported by the function. Requests outside the range of the map
+	vectors returns a message indicating their extent.
+
+2001-09-06  James Gallagher  <jimg@dcz.dods.org>
+
+	* Sequence::deserialize(...) now reads all the sequence values at
+	once. Its call semantics are the same as the other classes'
+	versions. Values are stored in the Sequence object using a
+	vector<BaseType *> for each row (those are themselves held in a
+	vector). Three new accessor methods have been added to Sequence
+	(row_value() and two versions of var_value()).
+	BaseType::deserialize(...) now always returns true. This matches
+	with the expectations of most client code (the seqeunce version
+	returned false when it was done reading, but all the calls for
+	sequences must be changed anyway). If an XDR error is found,
+	deserialize throws InternalErr. This fixes bug 258.
+
+
+2001-08-21  James Gallagher  <jimg@dcz.dods.org>
+
+	* After running tests for asciival, I decided to allow some more
+	characters in the CE part of a URL. I created id2www_ce which
+	allows all the characters in id2www plus [], {}, :, &, <>, = and
+	, (comma).
+
+2001-07-27  James Gallagher  <jimg@dcz.dods.org>
+
+	* New escaping semantics. The DAP library now supports escaping
+	names. Servers (and clients) no longer need to escape characters
+	themselves. The functions used to escape characters have been
+	changed, too. The old functions escaped chars that could not be
+	included in a DAP URL. The new functions only escape chars that
+	cannot be present in a URI as defined by RFC 2396 (``Uniform
+	Resource Identifiers (URI): Generic Syntax''). The DAP's scanners
+	and parsers have been expanded so that many more characters are
+	now allowed. The regular expressions used to define IDs and NAMEs
+	are: 
+	    ID	 [a-zA-Z_/%.][-a-zA-Z0-9_/%.#:+\\]*
+	    NAME [a-zA-Z_/%.0-9][-a-zA-Z0-9_/%.#:+\\]*
+	These changes mean that datasets which contain IDs with spaces
+	will work. Note that a space is not allowed in a URI so it will be
+	escaped. If you're typing in a URL to a browser, you must supply
+	the %20 escape. However, Connect is smart enough to escape the
+	space if it's present in a CE. On the server-side, DODSFilter and
+	the type classes remove the escape.
+
+2001-07-10  James Gallagher  <jimg@dcz.dods.org>
+
+	* If the `read from a file or stdin' feature of geturl is used and
+	the input source cannot be opened, an error message is printed.
+	This fixes a bug where a null input data source pointer caused a
+	segmentation violation. I also added a throw to
+	Connect::read_data() so that other clients that don't test the
+	data source pointer (which is a FILE *) will get an exception (as
+	opposed to a core file).
+
+2001-06-22  James Gallagher  <jimg@dcz.dods.org>
+
+	* I added `#' to the set of characters allowed in IDs. See bug 179.
+
+	* I normalized the definitions of ID, FLOAT and NEVER in the four
+	main scanners in the DAP library. They now all share the same set
+	of characters except for a few odd outliers.
+
+2001-06-18  James Gallagher  <jimg@dcz.dods.org>
+
+	* Fixed a bug that crept into the processing of the server's
+	version number information in the (client) class DataDDS. This
+	made it impossible for clients to process Sequences sent from
+	new servers because they we using the old (default)
+	deserialization scheme.
+
+2001-06-15  James Gallagher  <jimg@dcz.dods.org>
+
+	* Merged with release-3-2-4. The next merge should use -j
+	release-3-2-4 -j release-3-2.
+
+2001-06-05  James Gallagher  <jimg@dcz.dods.org>
+
+	* das.y: Changed the way errors are handled. Many errors still
+	cause exceptions to be thrown. However, if an attribtue's value is
+	wrong (e.g., a floating point value that is out of range), rather
+	than throw an exception a note in the form of a container and
+	explanation are added to the attribute table where the error
+	occurred. This is particularly important for attributes like
+	numerical values since they are often machine-dependent. Here's an
+	example of a DAS which contains an error:
+	
+	Attributes {
+	    a {
+	        Byte size 7, 700;
+		Float64 type 6.02e400, 3.4;
+		Float64 type 6.02e400, 2.7, 10e-400;
+	    }
+        }
+
+	And here is how the DAS looks once it is processed by the
+	client-side software:
+
+	Attributes {
+	    a {
+		Byte size 7;
+		a_errors {
+		    Byte size 700;
+		    String size_explanation `700' is not a Byte value.;
+		    Float64 type 6.02e400, 6.02e400, 10e-400;
+		    String type_explanation `6.02e400' is not a Float64 value., `6.02e400' is not a Float64 value., `10e-400' is not a Float64 value.;
+		}
+		Float64 type 3.4, 2.7;
+	    }
+	}
+
+	* Makefile.in: Added a short script to the Makefile.in so that
+	when CppUnit stuff is not defined a message is printed. This is
+	only triggered for the unit_tests targets, so it's really a
+	reminder for the folks that are doing development.
+
+	* configure.in: Changed so that if CFLGAS/CXXFLAGS are defined
+	those values are used instead of the defaults. This simplifies
+	development and debugging because it is easier to get builds
+	without optimization and with optimal debugging without hand
+	editing the Makefile every time configure is run.
+
+2001-05-03  James Gallagher  <jimg@dcz.dods.org>
+
+	* Added Cache-Control: no-cache header for error responses. This
+	will prevent internal server error responses (which look like
+	valid responses to the cache) from getting cached.
+
+	* Added support for conditional requests to the DODSFilter class,
+	the cgi_util functions and the DODS_Dispatch.pm Perl module.
+	Servers can now see conditional requests as such and respond
+	sensibly. If a server cannot use the modification time of a file,
+	then it should subclass DODSFilter and supply different versions
+	of the last modified time methods.
+
+2001-04-23  James Gallagher  <jimg@dcz.dods.org>
+
+	* Fixed the unit test targets and variables. These are now
+	included in the Makefile.in but are commented out. You must
+	remove the comments to use the target. Also needed is the CppUnit
+	software which is in CVS in the CppUnit module.
+
+	* Added support for the Last-Modified MIME header. All DODS
+	servers which use the functions in cgi_util.cc and/or the class
+	DODSFilter can now easily include the Last-Modified header in
+	their responses. The only change that servers should make is to
+	pass the ancillary files location directory to
+	DODSFilter::send_data(). Use of the send_das() and send_dds()
+	methods should require no change. In addition, calling the
+	send_data() method without giving the ancillary files location
+	will work OK with the exception that ancillary files won't
+	contribute to the LM computation (as they will for the DAS and DDS
+	responses).
+
+	Currently the LM computation works only for file-based datasets.
+	Servers that provide access to other types of data should subclass
+	DODSFilter and provide alternate implementations of the relevant
+	methods. 
+	
+	* Fixed some warnings in Error.cc from g++.
+
+2001-02-13  James Gallagher  <jimg@dcz.dods.org>
+
+	* Merged authentication changes from the trunk (where that feature
+	was added) here so that it can be included in 3.2 without too much
+	confusion. 
+
+2001-02-09  James Gallagher  <jimg@dcz.dods.org>
+
+	* Substantial changes to Connect to support HTTP authentication.
+	libdap++ now support three ways of supplying credentials: via
+	Connect's ctor, in a URL (using Netscape's convention and via a
+	popup. 
+
+2001-01-26  James Gallagher  <jimg@dcz.dods.org>
+
+	* Merged with release-3-2-3. The next merge should use -j
+	release-3-2-3 -j release-3-2.
+
+	* Tagged release-3-2-3
+
+2000-12-06  James Gallagher  <jimg@dcz.dods.org>
+
+	* There was an old problem with libwww which I patched in June or
+	July which fixed its caching of compressed responses. This patch
+	has not made it into the regular distribution, so when I upgraded
+	the patch was lost. I've re-applied the patch to the code in
+	src/packages/libwww. This, together with the .dodsrc bug fixed
+	below, fixes reported problems with the caching system (on unix at
+	least, I don't have any information about the problems on win32).
+
+	* Fixed .dodsrc file reading. Comments at the top of the file
+	caused the reader to stop processing the file and thus none of the
+	parameter values were being read.
+
+2000-12-04  James Gallagher  <jimg@dcz.dods.org>
+
+	* Note that the attribute table tests added are both unit tests
+	(look at the unit_tests target in the Makefile) and dejaGNU-type
+	tests. Take a look at AttrTableTest.cc to see how unit tests are
+	written for a class.
+
+2000-11-29  James Gallagher  <jimg@dcz.dods.org>
+
+	* Fixed problems with attribute aliases. Added unit tests for
+	AttrTable. DAS is now a child of AttrTable, so the AttrTable
+	methods can be used at any level of the DAS object. The DAS
+	methods still work, but they are now implemented using AttrTable
+	methods. 
+
+2000-09-21  James Gallagher  <jimg@dcz.dods.org>
+
+	* Merged Jose Garcia's exception handling code. 
+
+	* Merging the exception software means that all definitions of the
+	read() method must change. See BaseType.h for details.
+
+	* Improved error messages returned by the parsers. The DAS and DDS
+	parsers now include a line number and, in many cases, context, for
+	each message. 
+
+	* Normalized all the #ifndef #endif guards in the header files so
+	they use the same naming scheme. Added guards around #include
+	lines for headers to speed compile times (see Lakos).
+
+	* Reorganized the source files so that the CVS logs appear at the
+	end rather than the start of each file. 
+
+2000-09-11  James Gallagher  <jimg@dcz.dods.org>
+
+	* Added methods to Sequence to provide access to row number
+	constraint information. These methods (get_starting_row_number,
+	...) provide access to the indices given in a CE. Also added is a
+	method to set these values (until explicitly set the stating
+	and ending row numbers and the stride are -1). In addition there
+	is a method to get the current row number (useful when reading
+	row-by-row with read()) and a method to read the ith row into the
+	sequence. 
+
+	* Added Sequence row number selection. It is now possible to
+	request the first 10 rows of a sequence, or row 7 through 11 and
+	to do so using a stride. The notation is the same as for Arrays
+	and Grids; it uses the square brackets and colon separated
+	integers for start, stride and stop. 
+
+2000-08-31  James Gallagher  <jimg@dcz.dods.org>
+
+	* Merged with 3.1.10. The next merge should use update -d -j
+	release-3-1-10 -j release-3-1.
+
+	* Fixed a bug in all the scanners (except the GSE scanner) where
+	\r characters in text sent from win32-hosted servers caused the
+	problems. The \r characters are either ignored or treated like
+	newlines when paired with \n (depending on the circumstances).
+
+2000-08-29  James Gallagher  <jimg@dcz.dods.org>
+
+	* Merged with 3.1.9. The next merge should use update -d -j
+	release-3-1-9 -j release-3-1.
+
+2000-08-25  James Gallagher  <jimg@dcz.dods.org>
+
+	* Fixed a bug in esc2underscore(). The function used a static
+	instance of Regex; whatever regular expression was passed in on
+	the first call would be used for all subsequent calls. The same
+	problem existed for other functions in the file.
+
+2000-08-02  James Gallagher  <jimg@dcz.dods.org>
+
+	* Merged with 3.1.8. The next merge should use cvs update -j
+	release-3-1-8 -j release-3-1.
+
+2000-08-02  James Gallagher  <jimg@dcz.dods.org>
+
+	* Fixed a config_dap.h goof. That header was included by some of
+	the DAP headers which might, in turn, be included by other
+	software. The HAVE_CONFIG_H symbol in config_dap.h was confusing
+	other code (e.g., the Cgicc library). I changed config_dap.h and
+	its use; the header is now only included by DAP .cc or .c files.
+	DAP header files which needed config_dap.h for the dods_int32,
+	etc., typedefs now get those from dods-datatypes.h. Headers which
+	used config_dap.h for the DVR symbol (which holds the dap version
+	information) have been rewritten.
+
+	This change means that code which now included config_dap.h should
+	be rewritten to use the dods-datatypes.h header or otherwise
+	changed so that config_dap.h is not used.
+
+2000-06-16  James Gallagher  <jimg@dcz.dods.org>
+
+	* Note: This release was made to patch a bug which shows up in the
+	version of loaddods that supports loading the DAS into a
+	structure (version 3.1.5 of loaddods). You need this code to build
+	that version of loaddods.
+
+	* Fixed the tests so they work on my machine (where I don't have
+	`.' in my PATH). I also added some `/'s in places where is *seems*
+	DejaGnu was supplying them before. If extras creep in that should
+	not e a problem.
+
+	* Fixed (by Ethan) the tar and binary-tar targets.
+
+	* Added a fair amount of instrumentation to the dtors of various
+	methods. 
+
+	* Fixed a bug in DDS. The del_var method must delete the BaseType
+	before deleting the list element. I also changes from a SLList to
+	a DLList to get a cleaner delete method.
+
+2000-06-07  James Gallagher  <jimg@dcz.dods.org>
+
+	* Merged with version 3.1.6. Used cvs update -d -j release-3-1-5
+	-j release-3-1. The next merge should use -j release-3-1-6 -j
+	release-3-1. 
+
+	* Added code to Vector so that each element of vector<BaseType *>
+	_vec is explicitly copied and deleted.
+
+	* Fixed bugs in Grid, Structure and Sequence. The methods used to
+	get the Pix pointing to the first variable would segfault if there
+	were no variables. Now they return 0.
+
+	* DODSFilter now has a set_ce() method. This means that a server
+	can easily rewrite the CE it gets without loosing the other
+	features of DODSFilter.
+
+	* Connect.cc: Fixed bugs with local connections and the libwww and
+	Gui initializations. 
+
+	* Fixed a bug in AttrTable. Container attributes below the top
+	level were broken in the last release. Changed the get_attr_num()
+	method so that it returns a sensible value for both containers and
+	`plain' attributes. Added to struct entry so that it is more a
+	complete class. Added methods so that operator= and the copy-ctor
+	really work. The IFREMER server needs these fixes.
+
+	* Added to InternalErr a new ctor which makes it simpler to report
+	the file name and line number when an error is thrown.
+
+2000-06-06  James Gallagher  <jimg@dcz.dods.org>
+
+	* Merged changes from Rob's PC port. Used cvs update -j
+	pc-port-branch. I have done minimal testing on Linux (dejagnu is
+	not yet installed) and the code seems fine. 
+
+2000-04-17  James Gallagher  <jimg@dcz.dods.org>
+
+	* Fixed two bugs in Connect.cc that caused client sessions which
+	mixed remote and local connections to fail.
+
+2000-04-06  James Gallagher  <jimg@dcz.dods.org>
+
+	* Merged with Brent's gui2 code. This version of the progress
+	popup adds a cancel button. The software was checked in on the
+	gui2 branch and the point at which it was merged was tagged, on
+	that branch, as gui2-0. Future merges should use update -j gui2-0
+	-j gui2. 
+
+2000-03-31  James Gallagher  <jimg@dcz.dods.org>
+
+	* Merged with release-3-1-5. The next merge should use -j
+	release-3-1-5 -j release.
+
+2000-03-28  James Gallagher  <jimg@dcz.dods.org>
+
+	* Look in the Makefile for this software to see the new support
+	library configure macros in action. These simplify getting the
+	right libraries on the link line without duplicates (which
+	lengthen link times). 
+
+	* Added libdap++-gui.a to the build/install/tar/binary-tar stuff.
+	This library is built with `GUI-enabled' versions of Connect and
+	Error. This is to support our progress indicator and cancel button.
+
+	* Added a new feature to the .dodsrc file and caching. Users can
+	set the default expiration time for a response using a parameter
+	in the RC file. By default the expiration time is 24 hours
+	(written in seconds).
+
+	* Fixed bugs in the caching software. Compressed responses now are
+	cached correctly and responses with several variables are also
+	correctly handled. 
+
+2000-03-31  James Gallagher  <jimg@dcz.dods.org>
+
+	* escaping.cc: Fixed a bug where an int was used to index into a
+	string object.
+
+	* parser-util.cc (check_float32): Float32, Float64 attributes no
+	longer check ranges.
+
+2000-03-20  James Gallagher  <jimg@dcz.dods.org>
+
+	* parser-util.cc (check_byte): Byte attributes can now be either
+	signed or not (i.e., their range is -128 to 255). This is to
+	support clients that assume bytes to be signed as well as those
+	that assume bytes to be unsigned.
+
+2000-01-26  James Gallagher  <jimg@dcz.dods.org>
+
+	* Merged with release3-1-4. The next merge should use: update -j
+	release-3-1-4 -j release-3-1.
+
+2000-01-26  James Gallagher  <jimg@dcz.dods.org>
+
+	* Fixes for Red hat 6.x (from Ethan).
+
+	* Fixed the use of the stdc++ library's string::find() method. Its
+	return type was assigned to an unsigned int in many places. On 64
+	bit machines this caused problems. The type now used is
+	string::size_type (although size_t also works).
+
+2000-01-24  James Gallagher  <jimg@dcz.dods.org>
+
+	* Fixed a bug in the DAS and DDS parsers (das.y, dds.y). These
+	parsers used static global C++ objects which require that their
+	constructors run before main(). However, when the dap library is
+	linked by a linker that is not aware of this (e.g., Sun's ld, when
+	using GNU C++) those constructors are never called and accessing
+	those objects causes a segmentation fault. Fixing this problem
+	might fix undiscovered bugs in netCDF clients and definitely fixes
+	problems with the nascent loaddods rewrite (where loaddods gets
+	rewritten in C++).
+
+1999-12-31  James Gallagher  <jimg@dcz.dods.org>
+
+	* Added Gui (progress indicator) code back into the core. The
+	interpreter is now embedded in DODS. 
+
+1999-12-14  James Gallagher  <jimg@dcz.dods.org>
+
+	* Fixed a bug in Connect where once the Cache was closed it would
+	never be opened again. 
+
+	* Fixes/improvements for the caching code. The code now correctly
+	handles the case where many URLs are opened using Connect objects
+	created both sequentially and in an interleaved fashion. The Cache
+	index is now updated after each URL request. The Cache is now
+	closed only after all connect objects are destroyed.
+
+	* Connect.h: Added static members to track use of Connect objects
+	in conjunction with the new caching code.
+
+1999-11-04  James Gallagher  <jimg@dcz.dods.org>
+
+	* Merged: cvs update -j release-3-1-2 -j release-3-1, the next
+	merge command should use -j release-3-1-3 -j release-3-1.
+
+1999-11-03  James Gallagher  <jimg@dcz.dods.org>
+
+	* Fixed the usage filter (nothing to do with the comment about a
+	function of the same name in cgi_utils.cc). The filter was slurping
+	entire datasets because it failed to append the .html suffix when
+	looking for user-defined documentation about a dataset.
+
+	* DDS::send now catches exceptions thrown by the expression
+	evaluator. This means more reliable handling of errors from within
+	server-side function. However, this is only a stop-gap solution to
+	the general problem of poor error processing within the library.
+	Look for a *real* solution to this problem in about 2 months.
+
+	* Fixed a range-check bug for unsigned 16-bit integers. The values
+	were being tested as if they were signed.
+
+	* Removed usage() from cgi_utils.cc since it was not used and was
+	causing conflicts with servers which defined a function with the
+	same name.
+
+	* Documentation updates.
+
+	* Substantial changes to the Makefile.in. See the top level ChangeLog.
+
+1999-08-27  James Gallagher  <jimg@dcz.dods.org>
+
+	* Fixed the value of DODS_SHRT_MIN in dods-limits.h
+
+	* Now compiles with gcc 2.95
+
+1999-05-27  James Gallagher  <jimg@dcz.dods.org>
+
+	* Misc bug fixes.
+
+	* Error and InternalErr objects now are better behaved and DDS
+	throws them more predictably (although there's still a lot of work
+	to do there).
+
+	* Fixes merged from the alpha-3-0-0 branch.
+
+1999-05-24  James Gallagher  <jimg@dcz.dods.org>
+
+	* The DODS support address is now correct in all the places in the
+	dap. 
+
+	* Fixed some bugs that arose because C and C++ I/O streams may no
+	longer be synchronized.
+
+	* Dan removed the old GUI code. See the comments in Connect.cc.
+
+1999-05-19  James Gallagher  <jimg@dcz.dods.org>
+
+	* The dap++ library now builds using -fPIC (position independent
+	code) so sharable libraries should be easier to make.
+
+	* In DODS_Dispatch.pm, variables are checked for odd characters
+	that might be used to embed shell commands.
+
+	* Fixed security holes in the DODS_Dispatch.pm code. It now
+	returns the command as elements of an array which can be passed to
+	the exec() thus by passing the shell.
+
+	* Fixed all occurrences of the support email address to be the new
+	address. 
+
+1999-05-04  James Gallagher  <jimg@dcz.dods.org>
+
+	* Added to DODSFilter and DODS_Dispatch.pm so that server version
+	number information can be passed from the CGI script to the core
+	software. Now when you ask for the version of a server, you will
+	get the server's version information in addition to the core's. In
+	addition, the XDODS-Server header that is returned with every
+	response will now contain the server's version number. This
+	assumes that the server's dispatch script initializes
+	DODS_Dispatch correctly.
+
+	* Added InternalErr class. This class should be thrown by any code
+	that finds an internal error (i.e., the sort of thing that might
+	otherwise be trapped by an assert).
+
+	* Committed changes that form the base of version 3. This combines
+	the new simple types with a reduced dependence on the old libg++
+	code and misc. fixes. 
+
+1999-04-21  James Gallagher  <jimg@dcz.dods.org>
+
+	* Small fix in prune_spaces(). This fixed a problem in the mexcdf
+	client (and presumably other netcdf or matlab programs to).
+
+1999-04-14  James Gallagher  <jimg@dcz.dods.org>
+
+	* Fixed a bug in Connection::del_connect() where an assert tested
+	false for a valid condition. It is OK for the conns[i] element to
+	be NULL when this method is run.
+
+	* Fixed a bug in Connect where the member _tv would be deleted
+	without being first allocated when local files are accessed. This
+	member is no longer needed (it was used by libwww 5.0).
+
+1999-04-09  James Gallagher  <jimg@dcz.dods.org>
+
+	* This release is a special ferret-only release. It is a stable
+	alpha version of what will be DODS 3.0 once some more features are
+	added. 
+
+1999-03-24  James Gallagher  <jimg@dcz.dods.org>
+
+	* Added support for the new Int16, UInt16 and Float32 types.
+
+1999-03-22  James Gallagher  <jimg@dcz.dods.org>
+
+	* Added the Int16, UInt16 and Float32 datatypes to attributes. See
+	the tests numbered test.18--20.
+
+1999-03-19  James Gallagher  <jimg@dcz.dods.org>
+
+	* Added a call to setprecision(15) in geturl. This makes it so
+	that floating point numbers will print with the full range or
+	precision. It might be that I have to move this when 32 bit floats
+	are added because they have lower precision (8). However, setting
+	the precision at this level (once, before the calls to print_val()
+	start) is probably more efficient.
+
+1999-03-17  James Gallagher  <jimg@dcz.dods.org>
+
+	* Changed cgi_util.cc:find_ancillary_file() so that it looks for
+	<pathname>.ext in addition to <basename>.ext and the other
+	variations. This means that the current convention of naming
+	ancillary DAS files <filename>.das will work for both the
+	DODS_Date(), etc., functions (whose Factory classes were using
+	this convention) and the regular DAS filter program. 
+
+1999-02-24  James Gallagher  <jimg@dcz.dods.org>
+
+	* An interim revision changed the way incoming data documents were
+	processed so that the DDS contained in the data document did not
+	have to copied to a separate file before being processed. However,
+	this broken programs that read data docs with a pipe. This problem
+	has been fixed. The document's DDS still is not copied, but
+	programs like asciival that read from stdin via a pipe now work.
+
+1999-01-21  James Gallagher  <jimg@dcz.cvo.oneworld.com>
+
+	* Added the Grid Selection function. Grid variable may now be
+	`selected' based on the values of the Map vectors (since this a
+	constraint that returns data based on those data's values, I'm
+	calling it a selection operation). The syntax looks like:
+	grid(<grid var name>, <expression 0>, <expr 1>, ..., <expr n>). An
+	example: grid(dsp_band_1, "29.7 < lat <= 34.8", "lon > -70.9", "
+	-60 < lon"). This deliberately shows different forms the
+	`expressions' can take. Note that these expressions can only name
+	the grid's map vectors; they are not general expressions. Also
+	note that the function appears in the projection part of a CE.
+
+1999-01-15  James Gallagher  <jimg@dcz.cvo.oneworld.com>
+
+	* Changed the way the expression and DDS parsers work. Now the
+	expression scanner/parser can process strings directly. This means
+	that expression parsing is cleaner, somewhat faster and more
+	reliable since a temporary file is no longer created as part of
+	the parse process. Similarly, the DDS parser no longer requires
+	that a temporary file be created to parse the DDS bound to a data
+	document. 
+
+1998-11-23  James Gallagher  <jimg@dcz.cvo.oneworld.com>
+
+	* Fixed a bug in DAS where the destructor would free memory that
+	was just garbage. I replaced the old genclass-based DASVHMap code
+	with an SLList of structs.
+
+1998-11-11  James Gallagher  <jimg@dcz.cvo.oneworld.com>
+
+	* Fixes for various memory leaks found while working on the FF
+	server.
+
+1998-11-05  James Gallagher  <jimg@dcz.cvo.oneworld.com>
+
+	* Fixed error messages for CEs involving arrays. When an array
+	name was misspelled in a CE you got no error message, now you do.
+
+1998-10-21  James Gallagher  <jimg@dcz.cvo.oneworld.com>
+
+	* Added projection functions to the CE syntax. These functions are
+	executed *during* the parse of the projection clause. They can be
+	used to add new (synthetic) variables to the DDS.
+
+1998-10-14  James Gallagher  <jimg@dcz.cvo.oneworld.com>
+
+	* expr.y: Added parse of single array indeces to the projection
+	list in a CE. i[3] asks for the fourth element of the array i. The
+	old syntax i[3:3] still works.
+
+1998-09-17  James Gallagher  <jimg@dcz.cvo.oneworld.com>
+
+	* The release (version 2.18) is the last that will use String.h.
+	  WRONG! 11/11/98 jhrg
+	
+1998-09-03  James Gallagher  <jimg@dcz.cvo.oneworld.com>
+
+	* Feature: CEs no longer require fully-qualified names for fileds
+	of ctor types.
+
+	* Makefile.in (clean): Added GNU to the list of directories
+	cleaned. This prevents sending out .o files with the source code.
+
+1998-04-07  James Gallagher  <jimg@dcz.cvo.oneworld.com>
+
+	* Fixed Connect: leading spaces in a URL and/or CE caused either a
+	crash or other problem.
+
+1998-04-03  James Gallagher  <jimg@dcz.cvo.oneworld.com>
+
+	* Added patches from Jake Hamby which fix various problems with
+	Sequences. 
+
+1998-03-27  James Gallagher  <jimg@dcz.cvo.oneworld.com>
+
+	* Added targets for test coverage analysis.
+
+	* Added fix from Jake Hamby.
+
+	* Makefile.in (GNUHDRS): Added String.h & String.cc to the
+	distributions. 
+
+1998-03-19  James Gallagher  <jimg@dcz.cvo.oneworld.com>
+
+	* Added error messages when array indices are out of range.
+
+	* Fixed yesterday's fix... Error objects are no longer compressed.
+	I moved compression into DDS::send (from DODSFilter::send_data)
+	and structured send() so that the mime header generators no longer
+	use a hack to write themselves without compression. Previously
+	set_mime_*() used to `write past' the compressor process and this
+	caused synchronization problems - which I tried to fix yesterday.
+	Now the headers are written and then the compressor is opened. 
+
+1998-03-18  James Gallagher  <jimg@dcz.cvo.oneworld.com>
+
+	* Fixed an ugly bug where Error objects were compressed (sometimes
+	they still are) but the return MIME document header didn't say so.
+	Now the return document header says if the Error object is
+	compressed. Note that compressing Error objects is not going to
+	save any (real) space but once the compressing data sink is set up
+	*whatever* gets written to it will be compressed...
+
+1998-03-17  James Gallagher  <jimg@dcz.cvo.oneworld.com>
+
+	* Added the ASCII filter to the set of things that comprise a DODS
+	server. Use .ascii or .asc as a URL suffix to get comma-separated
+	ASCII data back from a DODS server.
+
+	* Added boolean member functions is_simple_type(),
+	is_vector_type() and is_constructor_type(). This reduce the size
+	of various parts of the code (but I have not gone through and
+	replaced all the old code yet).
+
+	* Added some new mfuncs to the core. element_count() returns the
+	number of elements in a constructor type (one for a simple type).
+
+1998-03-09  James Gallagher  <jimg@dcz.cvo.oneworld.com>
+
+	* Removed the -fno-rtti flag from the DAP library build. The
+	library needs RTTI so that software written using exceptions can
+	catch derived exception classes.
+
+1998-02-11  James Gallagher  <jimg@dcz.cvo.oneworld.com>
+
+	* Added the DODS_Cache.pm class (which was in the hdf-dods server
+	code only). This Perl module is not installed as part of the
+	default stuff in DODS_ROOT/etc.
+
+	* Added support for compression. Servers recognize the
+	Accept-Encoding header in a request document. when the value of
+	that header is `deflate' the zlib LZW algorithm is used to
+	compress data. Clients automatically respond to document that
+	contain the header Content-Encoding: deflate by un compressing the
+	data (a new feature of libwww 5.1). The new servers are compatible
+	with old clients and the new clients are compatible with old
+	servers (although neither combination can use compression).
+
+	* Added a help option to the servers (via an addition in
+	DODS_Dispatch.pm). Use this with the `file name' /help or the
+	extension .help.
+
+Tue Dec 16 00:32:31 1997  James Gallagher  <jimg@localhost>
+
+	* Added DODS_Dispatch.pm perl class. This class centralizes a lot
+	of the code that used to be replicated in each of the perl scripts
+	used to dispatch the various `methods' of a DODS server.
+
+Mon Dec 15 17:26:37 1997  James Gallagher  <jimg@localhost>
+
+	* Many small bug fixes that were fixed before being added to the
+	TODO list.
+
+	* Added DataDDS class which makes the version number read by
+	Connect available to any member function that can access a DDS
+	pointer (since DDS *s can reference DataDDS objects).
+
+	* Added the DODSFilter class to simplify writing servers that
+	conform to a set of standards Re: the placement and naming of
+	ancillary files, version numbers, etc.
+
+	* Added new Sequence processing code along with backward
+	compatibility. Nested sequences are sent more efficiently. In
+	addition, sequences may be followed by other variables in a Data
+	object (an old bug).
+
+	* Added new characters to those allowed in DDS NAME lexeme. This
+	means that a file with _ and . in the name will parse.
+
+Wed Aug 20 14:12:54 1997  James Gallagher  <jimg@localhost>
+
+	* Added newline after data in process_data() in geturl.cc.
+
+Thu Jun  5 16:08:10 1997  James Gallagher  <jimg@dcz.cvo.oneworld.com>
+
+	* See TODO for a list of reported bugs fixed and outstanding.
+
+	* Changed the way request_data works so that Connect can now be
+	used to create clients that read not only from the network but
+	also from standard input.
+
+	* Wrote DODS_Dispatch.pm Perl `class' that can be used to write
+	the nph-* dispatch scripts. This should simplify maintenance of
+	those scripts since they was a lot of replication of code from one
+	script to another. Now must of the real functionality is
+	concentrated in the one file.
+
+	* When projections on Grids result in an object that is no longer
+	a `true' Grid (no longer satisfies Grid::check_semantics()) then
+	send the resulting variables as a Structure of Arrays or a simple
+	array (the latter if only one array remains after applying the
+	projection to the Grid.
+
+	* Changed the way servers report the version number of the core
+	software. The message is now generated by the *_dods data filter
+	program using its -v option (all the data filter programs
+	support this option). This gets rid of the dods-core-version perl
+	script. 
+
+	* Changed geturl so that it can read from stdin (similar to
+	writeval). 
+
+	* Fixed bugs in util.cc.
+
+Wed May 21 22:25:41 1997  James Gallagher  <jimg@dcz.cvo.oneworld.com>
+
+	* See the TODO list for information on bugs found and fixed.
+
+	* Added DAS aliases and hierarchies.
+
+Sun Mar 23 17:01:12 1997  James Gallagher  <jimg@dcz.cvo.oneworld.com>
+
+	* Fixed the nasty decompression bug where child process exit
+	status was never caught. This caused process tables to fill, etc.
+
+Thu Mar  6 21:14:38 1997  James Gallagher  <jimg@dcz.cvo.oneworld.com>
+
+	* See TODO list for bugs fixed.
+
+Sun Feb  9 18:40:25 1997  James Gallagher  <jimg@dcz.cvo.oneworld.com>
+
+	* See TODO for a list of bugs fixed.
+
+Thu Feb  6 16:17:06 1997  James Gallagher  <jimg@dcz.cvo.oneworld.com>
+
+	* Changed the return type of request_data() from DDS & to DDS *.
+	Also changed the return types of append_constraint() and
+	constraint_dds() from DDS & to DDS *. When request_data()
+	encounters an error it no longer exits; now it returns NULL.
+
+Wed Dec 18 11:18:05 1996  James Gallagher  <jimg@dcz.cvo.oneworld.com>
+
+	* Version 2.10 prepared
+
+Wed Dec 11 20:15:10 1996  James Gallagher  <jimg@dcz.cvo.oneworld.com>
+
+	* Created the Usage server.
+
+	* Fixed bugs in cgi_util.cc - error Content-Description items were
+	not processed.
+
+Tue Dec  3 09:43:02 1996  James Gallagher  <jimg@dcz.cvo.oneworld.com>
+
+	* Added to DDS::parse_constraint() two new variables: ostream os
+	and bool server. These are used to control processing of error
+	messages that are returned from the CE parser. Rather than have
+	the CE parser write all its error messages to stderr, the parser
+	now returns an error object. The new code in parse_constraint()
+	ensures that an `error' header is written to OS and that the error
+	object is serialized if the member function is run from within a
+	server. Since parse_constraint() is called from within
+	DDS::send(), users of the library don't need to do anything
+	different unless they have coded their own versions of send().
+
+	* Added code to ensure that variables can be used in the selection
+	part of a constraint expression without having to be also in the
+	projection part. This means that a CE can be used to request a
+	single variable (e.g., the sequence `s') but select by comparing
+	to other variables in the data set.
+
+Mon Dec  2 11:50:29 1996  James Gallagher  <jimg@dcz.cvo.oneworld.com>
+
+	* Added three new versions of int_ops to process all the possible
+	permutations of signed and unsigned integer operands. Ignore the
+	warnings in util.cc about comparisons between signed and unsigned.
+
+	* Added cases for unsigned integer variables in the Vector, Byte,
+	Int and Float classes. Also added cases in BaseType and some of
+	the Test* classes. This fixes problems with the processing of
+	this type.
+
+Wed Nov 27 11:02:44 1996  James Gallagher  <jimg@dcz.cvo.oneworld.com>
+
+	* Added DDS as a third argument to the user-defined functions in
+	the CE evaluator. This means that a function (which may be server
+	specific) may look at the value of any variable in the dataset,
+	not just those values passed as parameters. This will facilitate
+	creation of functions which use implicit relations between
+	variables when computing values or performing selections (e.g.,
+	when geo-location information depends on the implicit relation
+	between two or more arrays).
+
+	* Changed the way Makefile dependencies are processed so that
+	Makefile (re)generation is faster (since dependencies rarely
+	change). 
+
+Sun Nov 24 19:45:22 1996  James Gallagher  <jimg@dcz.cvo.oneworld.com>
+
+	* Tested the library code in a number of situations and fixed many
+	little bugs.
+
+	* The asynchronous mode for data transfers is broken and is never
+	used. 
+
+	* Significantly improved processing of errors - web errors are now
+	handled correctly for the DAS and DDS - alas the data will still
+	exit when an error is encountered. Note that to fix this problem
+	I'll need to use exceptions *or* change the return type of the
+	request_data() member function to DDS * (from DDS &). Either one
+	will break everyone's code...
+
+	* Fixed the lame-looking progress indicator.
+
+	* dods_root is no longer a global variable that depends on run
+	time initialization from g++; now it is a function. This ensures
+	that the core software can be linked to program core using linkers
+	other than g++.
+
+	* Added better compressor function - look at jg_dods.cc to see how
+	it is used.
+
+	* Fixed broken decompression.
+
+Wed Nov 13 10:43:56 1996  James Gallagher  <jimg@dcz.cvo.oneworld.com>
+
+	* Added error MIME headers to the set that can be generated by
+	helper functions in cgi_util.cc. The error headers are necessary
+	since DODS now must generate all its own MIME headers (see the
+	section on NPH CGIs in the CGI spec). MIME error headers should be
+	used when an http or www error has been detected - don't use the
+	DODS error objects in those cases.
+
+	* Made changes in the Int data types so that expressions with
+	UInt32s should work. 
+
+	* Fixed some problems with the GUI. It should work more reliably
+	but I doubt that all the problems have been fixed. Needs testing.
+
+	* Now reports most www/http errors, although some clients still
+	can't seem to get the GUI to work (e.g., writeval) even though
+	geturl can.
+
+	* Now requires version 5.0a of the WWW Library.
+
+	* Many changes based on feedback from the initial version 2.09
+	distribution. 
+
+Tue Oct 29 08:23:30 1996  James Gallagher  <jimg@dcz.cvo.oneworld.com>
+
+	* Added UInt32 (32 bit unsigned integers) to the DAP. This
+	includes both using them in the DDS and the DAS. When an UInt32 is
+	used as an operand in a CE, the other operand is cast to unsigned
+	for the comparison operation.
+
+Fri Oct 18 09:35:07 1996  James Gallagher  <jimg@dcz.cvo.oneworld.com>
+
+	* Fixed various errors in the new Unsigned int classes.
+
+	* Changed the operation of Connect::request_das() and
+	request_dds(). They now pass any initial constraint along to the
+	respective servers. An initial constraint is one which is supplied
+	along with the URL at the time the Connect object is made.
+
+	* The functions set_mine_{text,binary} now produce complete
+	HTTP/MIME headers. Thus DODS servers can now be invoked using the
+	`nph' feature of CGI 1.1 (done by naming the DODS server dispatch
+	script `nph-*'). This solve two problems which appeared with large
+	data transfers: Transfers were cut-off before completion when a
+	server-determined timeout period elapsed and 2) Some large
+	transmissions had an extra byte added into the data stream.
+
+Tue Oct  8 09:23:57 1996  James Gallagher  <jimg@dcz.cvo.oneworld.com>
+
+	* Modified geturl so that CEs can be passed in using ? in the URL
+	in addition to the program's -c option.
+
+	* Added `%' to the set of characters allowable in identifiers.
+
+	* Added code so that a constraint expression appended to a URL is
+ 	properly handled. The CE is stored in in the Connect object. When
+	a CE is passed to the request_data member function, Connect
+	correctly combines the projection and selection parts of that CE
+	with the matching parts of any initial CE. 
+
+	* Fixed up the grammar files for Bison 1.25
+
+Thu Sep 12 14:05:49 1996  James Gallagher  <jimg@dcz.cvo.oneworld.com>
+
+	* Added a new option to geturl; -D which can be used to get data. 
+
+	* Fixed Array::print_array; used indirectly by the new option to
+	geturl. 
+
+Mon Aug 26 13:18:21 1996  James Gallagher  <jimg@dcz.cvo.oneworld.com>
+
+	* Fixed various configure.in files so that the different size ints
+	are defined properly.
+
+	* Fixed up the config_dap.h problem in the jg-dods directory.
+
+	* Added classes for 32 bit floats, 32 bit unsigned ints and 16 bit
+	signed and unsigned ints. These are *not* built by default - I'll
+	let the various users have a chance to include these new classes in
+	their software before they are added to the build (and thus must
+	be sub-classed by users of the DAP).
+
+Fri Aug 16 09:34:00 1996  James Gallagher  <jimg@dcz.cvo.oneworld.com>
+
+	* Fixed configure tests for sem.h prototypes and the semctl union.
+	A new test which scans the sem.h header is in aclocal.m4 (in etc)
+	and the configure script uses that test.
+
+Tue Aug 13 10:54:02 1996  James Gallagher  <jimg@dcz.cvo.oneworld.com>
+
+	* Fixed bugs in Grid: bad constraint expressions would cause core
+	dumps and a bug on the SGI (maybe others) where valid Grids would
+	not parse.
+
+	* Added to the Error class so that its methods are more useful
+	for correcting errors and displaying messages (see Error.cc).
+
+	* Switched to parser_arg object on all the parsers. parser_arg is
+	a simple object used to pass values to and from the bison gnerated
+	parsers. You need bison 1.24 or newer.
+
+	* Added _unused_ to config_dap.h; this macro expands to gcc's
+	__attribute__((__unused__)) thing. I then tacked `__unused__' on the
+	char rcsid[] arrays to suppress warnings from gcc -Wall (and
+	highlite the warnings that should be fixed!)
+
+	* Fixed a bug in Clause where non-existent functions were
+	evaluated - this caused a core dump.
+
+Fri Aug  9 10:21:06 1996  James Gallagher  <jimg@dcz.cvo.oneworld.com>
+
+	* Fixed bug in Connect where local accesses were not correctly
+	detected. Also modified geturl to print a diagnostic when supplied
+	with a local file name (or, more to the point, a name without
+	`http'). 
+
+Wed Jul 17 15:04:01 1996  James Gallagher  <jimg@dcz.cvo.oneworld.com>
+
+	* Added expr-check target in Makefile.
+
+	* Added new tests for das, dds objects. Added tests for expr-test
+	driver. 
+
+Mon Jul  8 16:25:11 1996  James Gallagher  <jimg@dcz.cvo.oneworld.com>
+
+	* Gui.cc: Added compile-time switch HAVE_EXPECT which is used to
+	control use/requirement of expect and tcl. When defined as 1 Expect
+	and Tcl are used to communicate with a GUI subprocess. When 0,
+	Expect and Tcl are not used (thus the libraries are not required).
+	Note that without Expect the GUI used for the transmission
+	progress indicator and error reporting is not available.
+
+$Id$
+
diff --git a/Clause.cc b/Clause.cc
new file mode 100644
index 0000000..77a6b45
--- /dev/null
+++ b/Clause.cc
@@ -0,0 +1,249 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1996,1998,1999
+// Please first read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+// jhrg,jimg James Gallagher <jgallagher@gso.uri.edu>
+
+// Implementation for the CE Clause class.
+
+
+#include "config.h"
+
+#include <cassert>
+#include <algorithm>
+
+#include "expr.h"
+#include "Byte.h"
+#include "Int16.h"
+#include "UInt16.h"
+#include "Int32.h"
+#include "UInt32.h"
+#include "DDS.h"
+#include "Clause.h"
+
+using std::cerr;
+using std::endl;
+
+namespace libdap {
+
+Clause::Clause(const int oper, rvalue *a1, rvalue_list *rv)
+        : _op(oper), _b_func(0), _bt_func(0), _argc(0), _arg1(a1), _args(rv)
+{
+    assert(OK());
+}
+#if 1
+Clause::Clause(bool_func func, rvalue_list *rv)
+        : _op(0), _b_func(func), _bt_func(0), _argc(0), _arg1(0), _args(rv)
+{
+    assert(OK());
+
+    if (_args)   // account for null arg list
+        _argc = _args->size();
+    else
+        _argc = 0;
+}
+#endif
+Clause::Clause(btp_func func, rvalue_list *rv)
+        : _op(0), _b_func(0), _bt_func(func), _argc(0), _arg1(0), _args(rv)
+{
+    assert(OK());
+
+    if (_args)
+        _argc = _args->size();
+    else
+        _argc = 0;
+}
+
+Clause::Clause() : _op(0), _b_func(0), _bt_func(0), _argc(0), _arg1(0), _args(0)
+{}
+
+static inline void
+delete_rvalue(rvalue *rv)
+{
+    delete rv; rv = 0;
+}
+
+Clause::~Clause()
+{
+    if (_arg1) {
+        delete _arg1; _arg1 = 0;
+    }
+
+    if (_args) {
+        // _args is a pointer to a vector<rvalue*> and we must must delete
+        // each rvalue pointer here explicitly. 02/03/04 jhrg
+        for_each(_args->begin(), _args->end(), delete_rvalue);
+        delete _args; _args = 0;
+    }
+}
+
+/** @brief Checks the "representation invariant" of a clause. */
+bool
+Clause::OK()
+{
+    // Each clause object can contain one of: a relational clause, a boolean
+    // function clause or a BaseType pointer function clause. It must have a
+    // valid argument list.
+    //
+    // But, a valid arg list might contain zero arguments! 10/16/98 jhrg
+    bool relational = (_op && !_b_func && !_bt_func);
+#if 1
+    bool boolean = (!_op && _b_func && !_bt_func);
+#endif
+    bool basetype = (!_op && !_b_func && _bt_func);
+
+    if (relational)
+        return _arg1 && _args;
+    else if (boolean || basetype)
+        return true;  // Until we check arguments...10/16/98 jhrg
+    else
+        return false;
+}
+
+/** @brief Return true if the clause returns a boolean value. */
+bool
+Clause::boolean_clause()
+{
+    assert(OK());
+
+    return _op || _b_func;
+}
+
+/** @brief Return true if the clause returns a value in a BaseType pointer. */
+bool
+Clause::value_clause()
+{
+    assert(OK());
+
+    return (_bt_func != 0);
+}
+
+/** @brief Evaluate a clause which returns a boolean value
+    This method must only be evaluated for clauses with relational
+    expressions or boolean functions.
+
+    @param dds Use variables from this DDS when evaluating the
+    expression
+
+    @return True if the clause is true, false otherwise.
+    @exception InternalErr if called for a clause that returns a
+    BaseType pointer. */
+bool
+Clause::value(DDS &dds)
+{
+    assert(OK());
+    assert(_op || _b_func);
+
+    if (_op) {   // Is it a relational clause?
+        // rvalue::bvalue(...) returns the rvalue encapsulated in a
+        // BaseType *.
+        BaseType *btp = _arg1->bvalue(dds);
+        // The list of rvalues is an implicit logical OR, so assume
+        // FALSE and return TRUE for the first TRUE subclause.
+        bool result = false;
+        for (rvalue_list_iter i = _args->begin();
+             i != _args->end() && !result;
+             i++) {
+            result = result || btp->ops((*i)->bvalue(dds), _op);
+        }
+
+        return result;
+    }
+    else if (_b_func) {  // ...A bool function?
+        BaseType **argv = build_btp_args(_args, dds);
+
+        bool result = false;
+        (*_b_func)(_argc, argv, dds, &result);
+        delete[] argv;  // Cache me!
+        argv = 0;
+
+        return result;
+    }
+    else {
+        throw InternalErr(__FILE__, __LINE__,
+                          "A selection expression must contain only boolean clauses.");
+    }
+}
+
+/** @brief Evaluate a clause that returns a value via a BaseType
+    pointer.
+    This method should be called only for those clauses that return values.
+
+    @param dds Use variables from this DDS when evaluating the
+    expression
+    @param value A value-result parameter
+
+    @return True if the the BaseType pointer is not null, false otherwise.
+    @exception InternalErr if called for a clause that returns a
+    boolean value. Not that this method itself \e does return a
+    boolean value. */
+bool
+Clause::value(DDS &dds, BaseType **value)
+{
+    assert(OK());
+    assert(_bt_func);
+
+    if (_bt_func) {
+        // build_btp_args() is a function defined in RValue.cc. It no longer
+        // reads the values as it builds the arguments, that is now left up
+        // to the functions themselves. 9/25/06 jhrg
+        BaseType **argv = build_btp_args(_args, dds);
+
+        (*_bt_func)(_argc, argv, dds, value);
+
+        delete[] argv;  // Cache me!
+        argv = 0;
+
+        if (*value) {
+            // FIXME This comment is likely wrong... 10/19/12
+            // This call to set_send_p was removed because new logic used
+            // in ResponseBuilder will handle it. See send_data(), ...
+            // When the second part of the CE is parsed, if it is null,
+            // then all the variables in the DDS that holds the function
+            // result variables will be sent. If there's a projection in
+            // that second CE, it will denote what is to be sent. Setting
+            // set_send_p(true) here had the affect of overriding that
+            // second CE. Note, however, that the code in send_data() clears
+            // all of the send_p properties for variables in the DDS, so
+            // removing the call here is just removing something that will
+            // actually have no affect. jhrg 10/19/12
+            (*value)->set_send_p(true);
+            (*value)->set_read_p(true);
+            return true;
+        }
+        else {
+            return false;
+        }
+    }
+    else {
+        throw InternalErr(__FILE__, __LINE__,
+                          "Clause::value() was called in a context expecting a BaseType pointer return, but the Clause was boolean-valued instead.");
+    }
+}
+
+} // namespace libdap
diff --git a/Clause.h b/Clause.h
new file mode 100644
index 0000000..9b4d11c
--- /dev/null
+++ b/Clause.h
@@ -0,0 +1,131 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1995-1999
+// Please first read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+// jhrg,jimg James Gallagher <jgallagher@gso.uri.edu>
+
+// Interface for the CE Clause class.
+
+#ifndef _clause_h
+#define _clause_h
+
+
+#ifndef _expr_h
+#include "expr.h"
+#endif
+
+#ifndef _rvalue_h
+#include "RValue.h"
+#endif
+
+namespace libdap
+{
+
+/** The selection part of a a DAP constraint expression may contain one or
+    more clauses, separated by ampersands (\&). This is modeled in the DDS
+    class structure as a singly-linked list of Clause objects. In addition, a
+    constraint expression may be a single function call, also represented in
+    the DDS using an instance of Clause.
+
+    Each clause object can contain a representation of one of three
+    possible forms:
+
+    <ol>
+
+    <li> A relational clause, where an operator tests the relation
+    between two operands.  This kind of clause evaluates to a boolean
+    value. For example: <tt>a > b</tt>.
+
+    <li> A boolean function, where some function operates on
+    arguments in the clause to return a boolean value.  For example,
+    consider a scalar A and a list L.  The clause <tt>find(A,L)</tt> might
+    return TRUE if A is a member of L (if the <tt>find()</tt> function is
+    defined).
+
+    <li> A clause that returns a pointer to a DAP BaseType value.
+    This is a clause that evaluates to some data value (be it scalar
+    or vector).  For example, <tt>sig0()</tt> might be included in the
+    constraint expression parser to calculate density from pressure,
+    temperature, and salinity.  In this case, <tt>sig0(p,t,s)</tt> would be a
+    clause that evaluates to a data value.
+
+    </ol>
+
+    This might be a bit confusing; in the first, and by far more common, form
+    of constraint expressions (CEs) only the first two types of clauses may
+    appear. In the second form of the CE only the last type of clause may
+    occur. The Clause class, however, can store them all.
+
+    The Clause object holds the constraint expression <i>after</i> it
+    has been parsed.  The parser renders the relational operator into
+    an integer, and the functions into pointers.
+
+    @brief Holds a fragment of a constraint expression.
+    @see DDS::parse_constraint */
+struct Clause
+{
+
+private:
+    /** The relational operator, if any. */
+    int _op;
+    /** A pointer to a valid boolean function. */
+    bool_func _b_func;
+
+    /** A pointer to a valid function that returns a pointer to a
+    BaseType. */
+    btp_func _bt_func;
+
+    int _argc;   // arg count
+    rvalue *_arg1;  // only for operator
+    rvalue_list *_args;  // vector arg
+
+    Clause(const Clause &);
+    Clause &operator=(const Clause &);
+
+public:
+    Clause(const int oper, rvalue *a1, rvalue_list *rv);
+    Clause(bool_func func, rvalue_list *rv);
+    Clause(btp_func func, rvalue_list *rv);
+    Clause();
+
+    virtual ~Clause();
+
+    bool OK();
+
+    bool boolean_clause();
+
+    bool value_clause();
+
+    bool value(DDS &dds);
+
+    bool value(DDS &dds, BaseType **value);
+};
+
+} // namespace libdap
+
+#endif // _clause_h
diff --git a/Connect.cc b/Connect.cc
new file mode 100644
index 0000000..36a6213
--- /dev/null
+++ b/Connect.cc
@@ -0,0 +1,1207 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//         Dan Holloway <dholloway@gso.uri.edu>
+//         Reza Nekovei <reza@intcomm.net>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1994-2002
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+//      dan             Dan Holloway <dholloway@gso.uri.edu>
+//      reza            Reza Nekovei <reza@intcomm.net>
+
+#include "config.h"
+
+//#define DODS_DEBUG
+#define FILE_UN_MARSHALLER 1
+
+#include <cstring>
+#include <cerrno>
+
+#include <fstream>
+#include <algorithm>
+
+#include "debug.h"
+#include "DataDDS.h"
+#include "Connect.h"
+#include "escaping.h"
+//#include "RCReader.h"
+#include "DDXParserSAX2.h"
+#if FILE_UN_MARSHALLER
+#include "XDRFileUnMarshaller.h"
+#else
+#include "fdiostream.h"
+#include "XDRStreamUnMarshaller.h"
+#endif
+#include "mime_util.h"
+
+using std::cerr;
+using std::endl;
+using std::ifstream;
+using std::ofstream;
+using std::min;
+
+namespace libdap {
+
+/** This private method process data from both local and remote sources. It
+ exists to eliminate duplication of code. */
+void Connect::process_data(DataDDS &data, Response *rs)
+{
+    DBG(cerr << "Entering Connect::process_data" << endl);
+
+    data.set_version(rs->get_version());
+    data.set_protocol(rs->get_protocol());
+
+    DBG(cerr << "Entering process_data: d_stream = " << rs << endl);
+    switch (rs->get_type()) {
+        case dods_error: {
+            Error e;
+            if (!e.parse(rs->get_stream()))
+                throw InternalErr(__FILE__, __LINE__, "Could not parse the Error object returned by the server!");
+            throw e;
+        }
+
+        case web_error:
+            // Web errors (those reported in the return document's MIME header)
+            // are processed by the WWW library.
+            throw InternalErr(__FILE__, __LINE__,
+                    "An error was reported by the remote httpd; this should have been processed by HTTPConnect..");
+
+#if 0
+            // This code triggers a security warning from Coverity; since it is not used,
+            // I have removed it. jhrg 5/5/16
+        case dods_data_ddx: {
+            // Parse the DDX; throw an exception on error.
+            DDXParser ddx_parser(data.get_factory());
+
+            // Read the MPM boundary and then read the subsequent headers
+            string boundary = read_multipart_boundary(rs->get_stream());
+            DBG(cerr << "MPM Boundary: " << boundary << endl);
+            read_multipart_headers(rs->get_stream(), "text/xml", dods_ddx);
+
+            // Parse the DDX, reading up to and including the next boundary.
+            // Return the CID for the matching data part
+            string data_cid;
+            ddx_parser.intern_stream(rs->get_stream(), &data, data_cid, boundary);
+
+            // Munge the CID into something we can work with
+            data_cid = cid_to_header_value(data_cid);
+            DBG(cerr << "Data CID: " << data_cid << endl);
+
+            // Read the data part's MPM part headers (boundary was read by
+            // DDXParse::intern)
+            read_multipart_headers(rs->get_stream(), "application/octet-stream", dap4_data, data_cid);
+
+            // Now read the data
+#if FILE_UN_MARSHALLER
+            XDRFileUnMarshaller um(rs->get_stream());
+#else
+        fpistream in ( rs->get_stream() );
+            XDRStreamUnMarshaller um( in );
+#endif
+            for (DDS::Vars_iter i = data.var_begin(); i != data.var_end(); i++) {
+                (*i)->deserialize(um, &data);
+            }
+            return;
+        }
+#endif
+
+        case dods_data:
+        default: {
+            // Parse the DDS; throw an exception on error.
+            data.parse(rs->get_stream());
+#if FILE_UN_MARSHALLER
+            XDRFileUnMarshaller um(rs->get_stream());
+#else
+            fpistream in ( rs->get_stream() );
+            XDRStreamUnMarshaller um( in );
+#endif
+            // Load the DDS with data.
+            for (DDS::Vars_iter i = data.var_begin(); i != data.var_end(); i++) {
+                (*i)->deserialize(um, &data);
+            }
+            return;
+        }
+    }
+}
+
+/** This private method process data from both local and remote sources. It
+    exists to eliminate duplication of code. */
+void Connect::process_data(DDS &data, Response *rs)
+{
+    DBG(cerr << "Entering Connect::process_data" << endl);
+
+    data.set_dap_version(rs->get_protocol());
+
+    DBG(cerr << "Entering process_data: d_stream = " << rs << endl);
+    switch (rs->get_type()) {
+    case dods_error: {
+        Error e;
+        if (!e.parse(rs->get_stream()))
+            throw InternalErr(__FILE__, __LINE__, "Could not parse the Error object returned by the server!");
+        throw e;
+    }
+
+    case web_error:
+        // Web errors (those reported in the return document's MIME header)
+        // are processed by the WWW library.
+        throw InternalErr(__FILE__, __LINE__,
+            "An error was reported by the remote web server; this should have been processed by HTTPConnect.");
+
+#if 0
+        // FIXME: The following case is never used. There is no such response. jhrg 10/20/15
+        // This code triggers a security warning from Coverity; since it is not used,
+        // I have removed it. jhrg 5/5/16
+    case dods_data_ddx: {
+        // Parse the DDX; throw an exception on error.
+        DDXParser ddx_parser(data.get_factory());
+
+        // Read the MPM boundary and then read the subsequent headers
+        string boundary = read_multipart_boundary(rs->get_stream());
+        DBG(cerr << "MPM Boundary: " << boundary << endl);
+        read_multipart_headers(rs->get_stream(), "text/xml", dods_ddx);
+
+        // Parse the DDX, reading up to and including the next boundary.
+        // Return the CID for the matching data part
+        string data_cid;
+        ddx_parser.intern_stream(rs->get_stream(), &data, data_cid, boundary);
+
+        // Munge the CID into something we can work with
+        data_cid = cid_to_header_value(data_cid);
+        DBG(cerr << "Data CID: " << data_cid << endl);
+
+        // Read the data part's MPM part headers (boundary was read by
+        // DDXParse::intern)
+        read_multipart_headers(rs->get_stream(), "application/octet-stream", dap4_data, data_cid);
+
+        // Now read the data
+        XDRFileUnMarshaller um(rs->get_stream());
+        for (DDS::Vars_iter i = data.var_begin(); i != data.var_end(); i++) {
+            (*i)->deserialize(um, &data);
+        }
+        return;
+    }
+#endif
+
+    case dods_data:
+    default: {
+        // Parse the DDS; throw an exception on error.
+        data.parse(rs->get_stream());
+
+        XDRFileUnMarshaller um(rs->get_stream());
+
+        // Load the DDS with data.
+        for (DDS::Vars_iter i = data.var_begin(); i != data.var_end(); i++) {
+            (*i)->deserialize(um, &data);
+        }
+
+        return;
+    }
+    }
+}
+
+// Barely a parser... This is used when reading from local sources of DODS
+// Data objects. It simulates the important actions of the libwww MIME header
+// parser. Those actions fill in certain fields in the Connect object. jhrg
+// 5/20/97
+//
+// Make sure that this parser reads from data_source without disturbing the
+// information in data_source that follows the MIME header. Since the DDS
+// (which follows the MIME header) is parsed by a flex/bison scanner/parser,
+// make sure to use I/O calls that will mesh with ANSI C I/O calls. In the
+// old GNU libg++, the C++ calls were synchronized with the C calls, but that
+// may no longer be the case. 5/31/99 jhrg
+
+/** Use when you cannot use libcurl.
+
+ @note This method tests for MIME headers with lines terminated by CRLF
+ (\r\n) and Newlines (\n). In either case, the line terminators are removed
+ before each header is processed.
+
+ @note FIXME The code uses tainted data via get_next_mime_header() whcih
+ should be fixed. See the note in mime_util.cc
+
+ @param data_source Read from this stream.
+ @param rs Value/Result parameter. Dump version and type information here.
+ */
+void Connect::parse_mime(Response *rs)
+{
+    rs->set_version("dods/0.0"); // initial value; for backward compatibility.
+    rs->set_protocol("2.0");
+
+    FILE *data_source = rs->get_stream();
+    string mime = get_next_mime_header(data_source);
+    while (!mime.empty()) {
+        string header, value;
+        parse_mime_header(mime, header, value);
+
+        // Note that this is an ordered list
+        if (header == "content-description:") {
+            DBG(cout << header << ": " << value << endl);
+            rs->set_type(get_description_type(value));
+        }
+        // Use the value of xdods-server only if no other value has been read
+        else if (header == "xdods-server:" && rs->get_version() == "dods/0.0") {
+            DBG(cout << header << ": " << value << endl);
+            rs->set_version(value);
+        }
+        // This trumps 'xdods-server' and 'server'
+        else if (header == "xopendap-server:") {
+            DBG(cout << header << ": " << value << endl);
+            rs->set_version(value);
+        }
+        else if (header == "xdap:") {
+            DBG(cout << header << ": " << value << endl);
+            rs->set_protocol(value);
+        }
+        // Only look for 'server' if no other header supplies this info.
+        else if (rs->get_version() == "dods/0.0" && header == "server:") {
+            DBG(cout << header << ": " << value << endl);
+            rs->set_version(value);
+        }
+
+        mime = get_next_mime_header(data_source);
+    }
+}
+
+// public mfuncs
+
+/** The Connect constructor requires a <tt>name</tt>, which is the URL to
+ which the connection is to be made.
+
+ @param n The URL for the virtual connection.
+ @param uname Use this username for authentication. Null by default.
+ @param password Password to use for authentication. Null by default.
+ @brief Create an instance of Connect. */
+Connect::Connect(const string &n, string uname, string password) :
+        d_http(0), d_version("unknown"), d_protocol("2.0")
+{
+    string name = prune_spaces(n);
+
+    // Figure out if the URL starts with 'http', if so, make sure that we
+    // talk to an instance of HTTPConnect.
+    if (name.find("http") == 0) {
+        DBG(cerr << "Connect: The identifier is an http URL" << endl);
+        d_http = new HTTPConnect(RCReader::instance());
+
+        // Find and store any CE given with the URL.
+        string::size_type dotpos = name.find('?');
+        if (dotpos != name.npos) {
+            _URL = name.substr(0, dotpos);
+            string expr = name.substr(dotpos + 1);
+
+            dotpos = expr.find('&');
+            if (dotpos != expr.npos) {
+                _proj = expr.substr(0, dotpos);
+                _sel = expr.substr(dotpos); // XXX includes '&'
+            }
+            else {
+                _proj = expr;
+                _sel = "";
+            }
+        }
+        else {
+            _URL = name;
+            _proj = "";
+            _sel = "";
+        }
+
+        _local = false;
+    }
+    else {
+        DBG(cerr << "Connect: The identifier is a local data source." << endl);
+
+        d_http = 0;
+        _URL = "";
+        _local = true; // local in this case means non-DAP
+    }
+
+    set_credentials(uname, password);
+}
+
+Connect::~Connect()
+{
+    DBG2(cerr << "Entering the Connect dtor" << endl);
+
+    if (d_http)
+        delete d_http;
+    d_http = 0;
+
+    DBG2(cerr << "Leaving the Connect dtor" << endl);
+}
+
+/** Get version information from the server. This is a new method which will
+ ease the transition to DAP 4.
+
+ @note Use request_protocol() to get the DAP protocol version.
+
+ @return The DAP version string.
+ @see request_protocol() */
+string Connect::request_version()
+{
+    string version_url = _URL + ".ver";
+    if (_proj.length() + _sel.length())
+        version_url = version_url + "?" + id2www_ce(_proj + _sel);
+
+    Response *rs = 0;
+    try {
+        rs = d_http->fetch_url(version_url);
+    }
+    catch (Error &e) {
+        delete rs;
+        rs = 0;
+        throw;
+    }
+
+    d_version = rs->get_version();
+    d_protocol = rs->get_protocol();
+
+    delete rs;
+    rs = 0;
+
+    return d_version;
+}
+
+/** Get protocol version  information from the server. This is a new method
+ which will ease the transition to DAP 4. Note that this method returns
+ the version of the DAP protocol implemented by the server. The
+ request_version() method returns the \e server's version number, not
+ the DAP protocol version.
+
+ @note This method actually asks the server for the protocol version - use
+ get_protocol() to get the protocol information from the most recent
+ response (e.g., from the last DDX response returned by the server).
+
+ @return The DAP protocol version string. */
+string Connect::request_protocol()
+{
+    string version_url = _URL + ".ver";
+    if (_proj.length() + _sel.length())
+        version_url = version_url + "?" + id2www_ce(_proj + _sel);
+
+    Response *rs = 0;
+    try {
+        rs = d_http->fetch_url(version_url);
+    }
+    catch (Error &e) {
+        delete rs;
+        rs = 0;
+        throw;
+    }
+
+    d_version = rs->get_version();
+    d_protocol = rs->get_protocol();
+
+    delete rs;
+    rs = 0;
+
+    return d_protocol;
+}
+
+/** Reads the DAS corresponding to the dataset in the Connect
+ object's URL. Although DAP does not support using CEs with DAS
+ requests, if present in the Connect object's instance, they will be
+ escaped and passed as the query string of the request.
+
+ @brief Get the DAS from a server.
+ @param das Result. */
+void Connect::request_das(DAS &das)
+{
+    string das_url = _URL + ".das";
+    if (_proj.length() + _sel.length())
+        das_url = das_url + "?" + id2www_ce(_proj + _sel);
+
+    Response *rs = 0;
+    try {
+        rs = d_http->fetch_url(das_url);
+    }
+    catch (Error &e) {
+        delete rs;
+        rs = 0;
+        throw;
+    }
+
+    d_version = rs->get_version();
+    d_protocol = rs->get_protocol();
+
+    switch (rs->get_type()) {
+        case dods_error: {
+            Error e;
+            if (!e.parse(rs->get_stream())) {
+                delete rs;
+                rs = 0;
+                throw InternalErr(__FILE__, __LINE__, "Could not parse error returned from server.");
+            }
+            delete rs;
+            rs = 0;
+            throw e;
+        }
+
+        case web_error:
+            // We should never get here; a web error should be picked up read_url
+            // (called by fetch_url) and result in a thrown Error object.
+            break;
+
+        case dods_das:
+        default:
+            // DAS::parse throws an exception on error.
+            try {
+                das.parse(rs->get_stream()); // read and parse the das from a file
+            }
+            catch (Error &e) {
+                delete rs;
+                rs = 0;
+                throw;
+            }
+
+            break;
+    }
+
+    delete rs;
+    rs = 0;
+}
+
+/** Reads the DAS corresponding to the dataset in the Connect
+ object's URL. Although DAP does not support using CEs with DAS
+ requests, if present in the Connect object's instance, they will be
+ escaped and passed as the query string of the request.
+
+ Different from request_das method in that this method uses the URL as
+ given without attaching .das or projections or selections.
+
+ @brief Get the DAS from a server.
+ @param das Result. */
+void Connect::request_das_url(DAS &das)
+{
+    string use_url = _URL + "?" + _proj + _sel;
+    Response *rs = 0;
+    try {
+        rs = d_http->fetch_url(use_url);
+    }
+    catch (Error &e) {
+        delete rs;
+        rs = 0;
+        throw;
+    }
+
+    d_version = rs->get_version();
+    d_protocol = rs->get_protocol();
+
+    switch (rs->get_type()) {
+        case dods_error: {
+            Error e;
+            if (!e.parse(rs->get_stream())) {
+                delete rs;
+                rs = 0;
+                throw InternalErr(__FILE__, __LINE__, "Could not parse error returned from server.");
+            }
+            delete rs;
+            rs = 0;
+            throw e;
+        }
+
+        case web_error:
+            // We should never get here; a web error should be picked up read_url
+            // (called by fetch_url) and result in a thrown Error object.
+            break;
+
+        case dods_das:
+        default:
+            // DAS::parse throws an exception on error.
+            try {
+                das.parse(rs->get_stream()); // read and parse the das from a file
+            }
+            catch (Error &e) {
+                delete rs;
+                rs = 0;
+                throw;
+            }
+
+            break;
+    }
+
+    delete rs;
+    rs = 0;
+}
+
+/** Reads the DDS corresponding to the dataset in the Connect object's URL.
+ If present in the Connect object's instance, a CE will be escaped,
+ combined with \c expr and passed as the query string of the request.
+
+ @note If you need the DDS to hold specializations of the type classes,
+ be sure to include the factory class which will instantiate those
+ specializations in the DDS. Either pass a pointer to the factory to
+ DDS constructor or use the DDS::set_factory() method after the
+ object is built.
+
+ @brief Get the DDS from a server.
+ @param dds Result.
+ @param expr Send this constraint expression to the server. */
+void Connect::request_dds(DDS &dds, string expr)
+{
+    string proj, sel;
+    string::size_type dotpos = expr.find('&');
+    if (dotpos != expr.npos) {
+        proj = expr.substr(0, dotpos);
+        sel = expr.substr(dotpos);
+    }
+    else {
+        proj = expr;
+        sel = "";
+    }
+
+    string dds_url = _URL + ".dds" + "?" + id2www_ce(_proj + proj + _sel + sel);
+
+    Response *rs = 0;
+    try {
+        rs = d_http->fetch_url(dds_url);
+    }
+    catch (Error &e) {
+        delete rs;
+        rs = 0;
+        throw;
+    }
+
+    d_version = rs->get_version();
+    d_protocol = rs->get_protocol();
+
+    switch (rs->get_type()) {
+        case dods_error: {
+            Error e;
+            if (!e.parse(rs->get_stream())) {
+                delete rs;
+                rs = 0;
+                throw InternalErr(__FILE__, __LINE__, "Could not parse error returned from server.");
+            }
+            delete rs;
+            rs = 0;
+            throw e;
+        }
+
+        case web_error:
+            // We should never get here; a web error should be picked up read_url
+            // (called by fetch_url) and result in a thrown Error object.
+            break;
+
+        case dods_dds:
+        default:
+            // DDS::prase throws an exception on error.
+            try {
+                dds.parse(rs->get_stream()); // read and parse the dds from a file
+            }
+            catch (Error &e) {
+                delete rs;
+                rs = 0;
+                throw;
+            }
+            break;
+    }
+
+    delete rs;
+    rs = 0;
+}
+
+/** Reads the DDS corresponding to the dataset in the Connect object's URL.
+ If present in the Connect object's instance, a CE will be escaped,
+ combined with \c expr and passed as the query string of the request.
+
+ Different from request_dds method above in that this method assumes
+ URL is complete and does not add anything to the command, such as .dds
+ or projections or selections.
+
+ @note If you need the DDS to hold specializations of the type classes,
+ be sure to include the factory class which will instantiate those
+ specializations in the DDS. Either pass a pointer to the factory to
+ DDS constructor or use the DDS::set_factory() method after the
+ object is built.
+
+ @brief Get the DDS from a server.
+ @param dds Result. */
+void Connect::request_dds_url(DDS &dds)
+{
+    string use_url = _URL + "?" + _proj + _sel;
+    Response *rs = 0;
+    try {
+        rs = d_http->fetch_url(use_url);
+    }
+    catch (Error &e) {
+        delete rs;
+        rs = 0;
+        throw;
+    }
+
+    d_version = rs->get_version();
+    d_protocol = rs->get_protocol();
+
+    switch (rs->get_type()) {
+        case dods_error: {
+            Error e;
+            if (!e.parse(rs->get_stream())) {
+                delete rs;
+                rs = 0;
+                throw InternalErr(__FILE__, __LINE__, "Could not parse error returned from server.");
+            }
+            delete rs;
+            rs = 0;
+            throw e;
+        }
+
+        case web_error:
+            // We should never get here; a web error should be picked up read_url
+            // (called by fetch_url) and result in a thrown Error object.
+            break;
+
+        case dods_dds:
+        default:
+            // DDS::prase throws an exception on error.
+            try {
+                dds.parse(rs->get_stream()); // read and parse the dds from a file
+            }
+            catch (Error &e) {
+                delete rs;
+                rs = 0;
+                throw;
+            }
+            break;
+    }
+
+    delete rs;
+    rs = 0;
+}
+
+/** Reads the DDX corresponding to the dataset in the Connect object's URL.
+ If present in the Connect object's instance, a CE will be escaped,
+ combined with \c expr and passed as the query string of the request.
+
+ @note A DDX is represented as XML on the wire but in memory libdap uses a
+ DDS object with variables that hold their own attributes (the DDS itself holds
+ the global attributes).
+
+ @brief Get the DDX from a server.
+ @param dds Result.
+ @param expr Send this constraint expression to the server. */
+void Connect::request_ddx(DDS &dds, string expr)
+{
+    string proj, sel;
+    string::size_type dotpos = expr.find('&');
+    if (dotpos != expr.npos) {
+        proj = expr.substr(0, dotpos);
+        sel = expr.substr(dotpos);
+    }
+    else {
+        proj = expr;
+        sel = "";
+    }
+
+    string ddx_url = _URL + ".ddx" + "?" + id2www_ce(_proj + proj + _sel + sel);
+
+    Response *rs = 0;
+    try {
+        rs = d_http->fetch_url(ddx_url);
+    }
+    catch (Error &e) {
+        delete rs;
+        throw;
+    }
+
+    d_version = rs->get_version();
+    d_protocol = rs->get_protocol();
+
+    switch (rs->get_type()) {
+        case dods_error: {
+            Error e;
+            if (!e.parse(rs->get_stream())) {
+                delete rs;
+                rs = 0;
+                throw InternalErr(__FILE__, __LINE__, "Could not parse error returned from server.");
+            }
+            delete rs;
+            throw e;
+        }
+
+        case web_error:
+            // We should never get here; a web error should be picked up read_url
+            // (called by fetch_url) and result in a thrown Error object.
+            break;
+
+        case dods_ddx:
+            try {
+                string blob;
+
+                DDXParser ddxp(dds.get_factory());
+                ddxp.intern_stream(rs->get_stream(), &dds, blob);
+            }
+            catch (Error &e) {
+                delete rs;
+                throw;
+            }
+            break;
+
+        default:
+            ObjectType ot = rs->get_type();
+            delete rs;
+            throw Error("Invalid response type when requesting a DDX response. Response type: " + long_to_string(ot));
+    }
+
+    delete rs;
+}
+
+/** @brief The 'url' version of request_ddx
+ @see Connect::request_ddx. */
+void Connect::request_ddx_url(DDS &dds)
+{
+    string use_url = _URL + "?" + _proj + _sel;
+
+    Response *rs = 0;
+    try {
+        rs = d_http->fetch_url(use_url);
+    }
+    catch (Error &e) {
+        delete rs;
+        throw;
+    }
+
+    d_version = rs->get_version();
+    d_protocol = rs->get_protocol();
+
+    switch (rs->get_type()) {
+        case dods_error: {
+            Error e;
+            if (!e.parse(rs->get_stream())) {
+                delete rs;
+                throw InternalErr(__FILE__, __LINE__, "Could not parse error returned from server.");
+            }
+            delete rs;
+            throw e;
+        }
+
+        case web_error:
+            // We should never get here; a web error should be picked up read_url
+            // (called by fetch_url) and result in a thrown Error object.
+            delete rs;
+            throw InternalErr(__FILE__, __LINE__, "Web error.");
+
+        case dods_ddx:
+            try {
+                string blob;
+
+                DDXParser ddxp(dds.get_factory());
+                ddxp.intern_stream(rs->get_stream(), &dds, blob);
+            }
+            catch (Error &e) {
+                delete rs;
+                throw;
+            }
+            break;
+
+        default: {
+            ObjectType ot = rs->get_type();
+            delete rs;
+
+            throw Error("Invalid response type when requesting a DDX response. Response type: " + long_to_string(ot));
+        }
+    }
+
+    delete rs;
+}
+
+/** Reads the DataDDS object corresponding to the dataset in the Connect
+ object's URL. If present in the Connect object's instance, a CE will be
+ escaped, combined with \c expr and passed as the query string of the
+ request. The result is a DataDDS which contains the data values bound to
+ variables.
+
+ @note If you need the DataDDS to hold specializations of the type classes,
+ be sure to include the factory class which will instantiate those
+ specializations in the DataDDS. Either pass a pointer to the factory to
+ DataDDS constructor or use the DDS::set_factory() method after the
+ object is built.
+
+ @brief Get the DAS from a server.
+ @param data Result.
+ @param expr Send this constraint expression to the server. */
+void Connect::request_data(DataDDS &data, string expr)
+{
+    string proj, sel;
+    string::size_type dotpos = expr.find('&');
+    if (dotpos != expr.npos) {
+        proj = expr.substr(0, dotpos);
+        sel = expr.substr(dotpos);
+    }
+    else {
+        proj = expr;
+        sel = "";
+    }
+
+    string data_url = _URL + ".dods?" + id2www_ce(_proj + proj + _sel + sel);
+
+    Response *rs = 0;
+    // We need to catch Error exceptions to ensure calling close_output.
+    try {
+        rs = d_http->fetch_url(data_url);
+
+        d_version = rs->get_version();
+        d_protocol = rs->get_protocol();
+
+        process_data(data, rs);
+        delete rs;
+        rs = 0;
+    }
+    catch (Error &e) {
+        delete rs;
+        rs = 0;
+        throw;
+    }
+}
+
+/** Reads the DataDDS object corresponding to the dataset in the Connect
+ object's URL. If present in the Connect object's instance, a CE will be
+ escaped, combined with \c expr and passed as the query string of the
+ request. The result is a DataDDS which contains the data values bound to
+ variables.
+
+ Different from request_data in that this method uses the syntax of the
+ new OPeNDAP server commands using dispatch
+
+ @note If you need the DataDDS to hold specializations of the type classes,
+ be sure to include the factory class which will instantiate those
+ specializations in the DataDDS. Either pass a pointer to the factory to
+ DataDDS constructor or use the DDS::set_factory() method after the
+ object is built.
+
+ @brief Get the DAS from a server.
+ @param data Result. */
+void Connect::request_data_url(DataDDS &data)
+{
+    string use_url = _URL + "?" + _proj + _sel;
+    Response *rs = 0;
+    // We need to catch Error exceptions to ensure calling close_output.
+    try {
+        rs = d_http->fetch_url(use_url);
+
+        d_version = rs->get_version();
+        d_protocol = rs->get_protocol();
+
+        process_data(data, rs);
+        delete rs;
+        rs = 0;
+    }
+    catch (Error &e) {
+        delete rs;
+        rs = 0;
+        throw;
+    }
+}
+
+// FIXME Unused?
+void Connect::request_data_ddx(DataDDS &data, string expr)
+{
+    string proj, sel;
+    string::size_type dotpos = expr.find('&');
+    if (dotpos != expr.npos) {
+        proj = expr.substr(0, dotpos);
+        sel = expr.substr(dotpos);
+    }
+    else {
+        proj = expr;
+        sel = "";
+    }
+
+    string data_url = _URL + ".dap?" + id2www_ce(_proj + proj + _sel + sel);
+
+    Response *rs = 0;
+    // We need to catch Error exceptions to ensure calling close_output.
+    try {
+        rs = d_http->fetch_url(data_url);
+
+        d_version = rs->get_version();
+        d_protocol = rs->get_protocol();
+
+        process_data(data, rs);
+        delete rs;
+        rs = 0;
+    }
+    catch (Error &e) {
+        delete rs;
+        rs = 0;
+        throw;
+    }
+}
+
+// FIXME Unused?
+void Connect::request_data_ddx_url(DataDDS &data)
+{
+    string use_url = _URL + "?" + _proj + _sel;
+    Response *rs = 0;
+    // We need to catch Error exceptions to ensure calling close_output.
+    try {
+        rs = d_http->fetch_url(use_url);
+
+        d_version = rs->get_version();
+        d_protocol = rs->get_protocol();
+
+        process_data(data, rs);
+        delete rs;
+        rs = 0;
+    }
+    catch (Error &e) {
+        delete rs;
+        rs = 0;
+        throw;
+    }
+}
+
+/** @brief Read data which is preceded by MIME headers.
+ This method works for both data dds and data ddx responses.
+
+ @note If you need the DataDDS to hold specializations of the type classes,
+ be sure to include the factory class which will instantiate those
+ specializations in the DataDDS. Either pass a pointer to the factory to
+ DataDDS constructor or use the DDS::set_factory() method after the
+ object is built.
+
+ @see read_data_no_mime()
+ @param data Result.
+ @param rs Read from this Response object. */
+
+void Connect::read_data(DataDDS &data, Response *rs)
+{
+    if (!rs)
+        throw InternalErr(__FILE__, __LINE__, "Response object is null.");
+
+    // Read from data_source and parse the MIME headers specific to DAP2/4.
+    parse_mime(rs);
+
+    read_data_no_mime(data, rs);
+}
+void
+Connect::read_data(DDS &data, Response *rs)
+{
+    if (!rs)
+        throw InternalErr(__FILE__, __LINE__, "Response object is null.");
+
+    // Read from data_source and parse the MIME headers specific to DAP2/4.
+    parse_mime(rs);
+
+    read_data_no_mime(data, rs);
+}
+
+// This function looks at the input stream and makes its best guess at what
+// lies in store for downstream processing code. Definitely heuristic.
+// Assumptions:
+// #1 The current file position is past any MIME headers (if they were present).
+// #2 We must reset the FILE* position to the start of the DDS or DDX headers
+static void divine_type_information(Response *rs)
+{
+    // Consume whitespace
+    int c = getc(rs->get_stream());
+    while (!feof(rs->get_stream()) && !ferror(rs->get_stream()) && isspace(c)) {
+        c = getc(rs->get_stream());
+    }
+
+
+    if (ferror(rs->get_stream()))
+        throw Error("Error reading response type information: " + string(strerror(errno)));
+    if (feof(rs->get_stream()))
+        throw Error("Error reading response type information: Found EOF");
+
+    // The heuristic here is that a DataDDX is a multipart MIME document and
+    // The first non space character found after the headers is the start of
+    // the first part which looks like '--<boundary>' while a DataDDS starts
+    // with a DDS (;Dataset {' ...). I take into account that our parsers have
+    // accepted both 'Dataset' and 'dataset' for a long time.
+    switch (c) {
+        case '-':
+            rs->set_type(dods_data_ddx);
+            break;
+        case 'D':
+        case 'd':
+            rs->set_type(dods_data);
+            break;
+        default:
+            throw InternalErr(__FILE__, __LINE__, "Could not determine type of response object in stream.");
+    }
+
+    ungetc(c, rs->get_stream());
+}
+
+/** @brief Read data from a file which does not have response MIME headers.
+ This method is a companion to read_data(). While read_data() assumes that
+ the response has MIME headers, this method does not. If you call this
+ with a Response that does contain headers, it will throw an Error (and
+ the message is likely to be inscrutable).
+
+ @note This method will use the 'type' information in the Response object
+ to choose between processing the response as a data dds or data ddx. If
+ there is no type information, it will attempt to figure it out.
+
+ @param data Result.
+ @param rs Read from this Response object. */
+void Connect::read_data_no_mime(DataDDS &data, Response *rs)
+{
+    if (rs->get_type() == unknown_type)
+        divine_type_information(rs);
+
+    switch (rs->get_type()) {
+        case dods_data:
+            d_version = rs->get_version();
+            d_protocol = rs->get_protocol();
+            process_data(data, rs);
+            break;
+        case dods_data_ddx:
+            process_data(data, rs);
+            d_version = rs->get_version();
+            d_protocol = data.get_protocol();
+            break;
+        default:
+            throw InternalErr(__FILE__, __LINE__, "Should have been a DataDDS or DataDDX.");
+    }
+}
+void Connect::read_data_no_mime(DDS &data, Response *rs)
+{
+    if (rs->get_type() == unknown_type)
+        divine_type_information(rs);
+
+    switch (rs->get_type()) {
+    case dods_data:
+        d_version = rs->get_version();
+        d_protocol = rs->get_protocol();
+        process_data(data, rs);
+        break;
+    case dods_data_ddx:
+        process_data(data, rs);
+        d_version = rs->get_version();
+        // TODO should check to see if this hack is a correct replacement
+        // for get_protocol from DataDDS
+        d_protocol = data.get_dap_version();
+        break;
+    default:
+        throw InternalErr(__FILE__, __LINE__, "Should have been a DataDDS or DataDDX.");
+    }
+}
+
+bool
+Connect::is_local()
+{
+    return _local;
+}
+
+/** Return the Connect object's URL in a string.  The URL was set by
+ the class constructor, and may not be reset.  If you want to
+ open another URL, you must create another Connect object.  There
+ is a Connections class created to handle the management of
+ multiple Connect objects.
+
+ @brief Get the object's URL.
+ @see Connections
+ @return A string containing the URL of the data to which the
+ Connect object refers.  If the object refers to local data,
+ the function returns the null string.
+ @param ce If TRUE, the returned URL will include any constraint
+ expression enclosed with the Connect object's URL (including the
+ <tt>?</tt>).  If FALSE, any constraint expression will be removed from
+ the URL.  The default is TRUE.
+ */
+string Connect::URL(bool ce)
+{
+    if (_local)
+        throw InternalErr(__FILE__, __LINE__, "URL(): This call is only valid for a DAP data source.");
+
+    if (ce)
+        return _URL + "?" + _proj + _sel;
+    else
+        return _URL;
+}
+
+/** Return the constraint expression (CE) part of the Connect URL. Note
+ that this CE is supplied as part of the URL passed to the
+ Connect's constructor.  It is not the CE passed to the
+ <tt>request_data()</tt> function.
+
+ @brief Get the Connect's constraint expression.
+ @return A string containing the constraint expression (if any)
+ submitted to the Connect object's constructor.  */
+string Connect::CE()
+{
+    if (_local)
+        throw InternalErr(__FILE__, __LINE__, "CE(): This call is only valid for a DAP data source.");
+
+    return _proj + _sel;
+}
+
+/** @brief Set the credentials for responding to challenges while dereferencing
+ URLs.
+ @param u The username.
+ @param p The password.
+ @see extract_auth_info() */
+void Connect::set_credentials(string u, string p)
+{
+    if (d_http)
+        d_http->set_credentials(u, p);
+}
+
+/** Set the \e accept deflate property.
+ @param deflate True if the client can accept compressed responses, False
+ otherwise. */
+void Connect::set_accept_deflate(bool deflate)
+{
+    if (d_http)
+        d_http->set_accept_deflate(deflate);
+}
+
+/** Set the \e XDAP-Accept property/header. This is used to send to a server
+ the (highest) DAP protocol version number that this client understands.
+
+ @param major The client dap protocol major version
+ @param minor The client dap protocol minor version */
+void Connect::set_xdap_protocol(int major, int minor)
+{
+    if (d_http)
+        d_http->set_xdap_protocol(major, minor);
+}
+
+/** Disable any further use of the client-side cache. In a future version
+ of this software, this should be handled so that the www library is
+ not initialized with the cache running by default. */
+void Connect::set_cache_enabled(bool cache)
+{
+    if (d_http)
+        d_http->set_cache_enabled(cache);
+}
+
+bool Connect::is_cache_enabled()
+{
+    bool status;
+    DBG(cerr << "Entering is_cache_enabled (" << hex << d_http << dec
+            << ")... ");
+    if (d_http)
+        status = d_http->is_cache_enabled();
+    else
+        status = false;
+    DBGN(cerr << "exiting" << endl);
+    return status;
+}
+
+} // namespace libdap
diff --git a/Connect.h b/Connect.h
new file mode 100644
index 0000000..1ffce11
--- /dev/null
+++ b/Connect.h
@@ -0,0 +1,224 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//         Dan Holloway <dan@hollywood.gso.uri.edu>
+//         Reza Nekovei <reza@intcomm.net>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1994-1999,2001,2002
+// Please first read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+// jhrg,jimg James Gallagher <jgallagher@gso.uri.edu>
+// dan  Dan Holloway <dholloway@gso.uri.edu>
+// reza  Reza Nekovei <rnekovei@ieee.org>
+
+// Connect objects are used as containers for information pertaining to a
+// connection that a user program makes to a dataset. The dataset may be
+// either local (i.e., a file on the user's own computer) or a remote
+// dataset. In the later case a DAP2 URL will be used to reference the
+// dataset.
+//
+// Connect contains methods which can be used to read the DOS DAS and DDS
+// objects from the remote dataset as well as reading reading data. The class
+// understands in a rudimentary way how DAP2 constraint expressions are
+// formed and how to manage the CEs generated by a API to request specific
+// variables with the URL initially presented to the class when the object
+// was instantiated.
+//
+// Connect also provides additional services such as error processing.
+//
+// Connect is not intended for use on the server-side.
+//
+// jhrg 9/29/94
+
+#ifndef _connect_h
+#define _connect_h
+
+
+#include <string>
+
+#ifndef _das_h
+#include "DAS.h"
+#endif
+
+#ifndef _dds_h
+#include "DDS.h"
+#endif
+
+#ifndef _error_h
+#include "Error.h"
+#endif
+
+#ifndef _util_h
+#include "util.h"
+#endif
+
+#ifndef _datadds_h
+#include "DataDDS.h"
+#endif
+
+#ifndef _httpconnect_h
+#include "HTTPConnect.h"
+#endif
+
+#ifndef response_h
+#include "Response.h"
+#endif
+
+using std::string;
+
+namespace libdap
+{
+
+/** Connect objects are used as containers for information pertaining
+    to the connection a user program makes to a dataset. The
+    dataset may be either local (for example, a file on the user's own
+    computer) or a remote dataset. In the latter case a DAP2 URL will
+    be used to reference the dataset, instead of a filename.
+
+    Connect contains methods which can be used to read the DAP2 DAS and
+    DDS objects from the remote dataset as well as reading
+    data. The class understands in a rudimentary way how DAP2
+    constraint expressions are formed and how to manage them.
+
+    Connect also provides additional services such as automatic
+    decompression of compressed data and and error processing.
+
+    @note Update: I removed the DEFAULT_BASETYPE_FACTORY switch because it
+    caused more confusion than it avoided. See Trac #130.
+
+    @note The compile-time symbol DEFAULT_BASETYPE_FACTORY controls whether
+    the old (3.4 and earlier) DDS and DataDDS constructors are supported.
+    These constructors now use a default factory class (BaseTypeFactory,
+    implemented by this library) to instantiate Byte, ..., Grid variables. To
+    use the default ctor in your code you must also define this symbol. If
+    you \e do choose to define this and fail to provide a specialization of
+    BaseTypeFactory when your software needs one, you code may not link or
+    may fail at run time. In addition to the older ctors for DDS and DataDDS,
+    defining the symbol also makes some of the older methods in Connect
+    available (because those methods require the older DDS and DataDDS ctors.
+
+    @brief Holds information about the link from a DAP2 client to a
+    dataset.
+    @see DDS
+    @see DAS
+    @see Error
+    @author jhrg */
+
+class Connect
+{
+private:
+    bool _local;  // Is this a local connection?
+
+    HTTPConnect *d_http;
+    string _URL;  // URL to remote dataset (minus CE)
+    string _proj;  // Projection part of initial CE.
+    string _sel;  // Selection of initial CE
+
+    string d_version;           // Server implementation information
+    string d_protocol;          // DAP protocol from the server
+
+    void process_data(DataDDS &data, Response *rs);
+    void process_data(DDS &data, Response *rs);
+
+    // Use when you cannot use libwww/libcurl. Reads HTTP response.
+    void parse_mime(Response *rs);
+
+protected:
+    /** @name Suppress the C++ defaults for these. */
+    //@{
+    Connect();
+    Connect(const Connect &);
+    Connect &operator=(const Connect &);
+    //@}
+
+public:
+    Connect(const string &name, string uname = "", string password = "");
+
+    virtual ~Connect();
+
+    bool is_local();
+
+    // *** Add get_* versions of accessors. 02/27/03 jhrg
+    virtual string URL(bool CE = true);
+    virtual string CE();
+
+    void set_credentials(string u, string p);
+    void set_accept_deflate(bool deflate);
+    void set_xdap_protocol(int major, int minor);
+
+    void set_cache_enabled(bool enabled);
+    bool is_cache_enabled();
+
+    void set_xdap_accept(int major, int minor);
+
+    /** Return the protocol/implementation version of the most recent
+    response. This is a poorly designed method, but it returns
+    information that is useful when used correctly. Before a response is
+    made, this contains the string "unknown." This should ultimately hold
+    the \e protocol version; it currently holds the \e implementation
+    version.
+
+        @see get_protocol()
+        @deprecated */
+    string get_version()
+    {
+        return d_version;
+    }
+
+    /** Return the DAP protocol version of the most recent
+        response. Before a response is made, this contains the string "2.0."
+        */
+    string get_protocol()
+    {
+        return d_protocol;
+    }
+
+    virtual string request_version();
+    virtual string request_protocol();
+
+    virtual void request_das(DAS &das);
+    virtual void request_das_url(DAS &das);
+
+    virtual void request_dds(DDS &dds, string expr = "");
+    virtual void request_dds_url(DDS &dds);
+
+    virtual void request_ddx(DDS &dds, string expr = "");
+    virtual void request_ddx_url(DDS &dds);
+
+    virtual void request_data(DataDDS &data, string expr = "");
+    virtual void request_data_url(DataDDS &data);
+
+    virtual void request_data_ddx(DataDDS &data, string expr = "");
+    virtual void request_data_ddx_url(DataDDS &data);
+
+    virtual void read_data(DataDDS &data, Response *rs);
+    virtual void read_data_no_mime(DataDDS &data, Response *rs);
+    virtual void read_data(DDS &data, Response *rs);
+    virtual void read_data_no_mime(DDS &data, Response *rs);
+};
+
+} // namespace libdap
+
+#endif // _connect_h
diff --git a/ConstraintEvaluator.cc b/ConstraintEvaluator.cc
new file mode 100644
index 0000000..2d460a6
--- /dev/null
+++ b/ConstraintEvaluator.cc
@@ -0,0 +1,388 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#include "config.h"
+
+//#define DODS_DEBUG
+
+#include "ServerFunctionsList.h"
+#include "ConstraintEvaluator.h"
+#include "Clause.h"
+#include "DataDDS.h"
+
+#include "ce_parser.h"
+#include "debug.h"
+#include "parser.h"
+#include "expr.h"
+
+struct yy_buffer_state;
+
+int ce_exprparse(libdap::ce_parser_arg *arg);
+
+// Glue routines declared in expr.lex
+void ce_expr_switch_to_buffer(void *new_buffer);
+void ce_expr_delete_buffer(void * buffer);
+void *ce_expr_string(const char *yy_str);
+
+extern int ce_exprdebug;
+
+namespace libdap {
+
+ConstraintEvaluator::ConstraintEvaluator()
+{
+    // Functions are now held in BES modules. jhrg 1/30/13
+
+    // modules load functions to this list; this class searches the list
+    // instead of having it's own copy. This is very similar to the BES'
+    // various List classes, but this one is part of libdap and not the
+    // BES. The List class is a singleton, so each function module can
+    // register it's functions to the list object.
+    d_functions_list = ServerFunctionsList::TheList();
+}
+
+ConstraintEvaluator::~ConstraintEvaluator()
+{
+    // delete all the constants created by the parser for CE evaluation
+    for (Constants_iter j = constants.begin(); j != constants.end(); j++) {
+        BaseType *btp = *j;
+        delete btp;
+        btp = 0;
+    }
+
+    for (Clause_iter k = expr.begin(); k != expr.end(); k++) {
+        Clause *cp = *k;
+        delete cp;
+        cp = 0;
+    }
+}
+
+/** Returns the first clause in a parsed constraint expression. */
+ConstraintEvaluator::Clause_iter ConstraintEvaluator::clause_begin()
+{
+    return expr.begin();
+}
+
+/** Returns a reference to the end of the list of clauses in a parsed
+ constraint expression. It does not reference the last clause */
+ConstraintEvaluator::Clause_iter ConstraintEvaluator::clause_end()
+{
+    return expr.end();
+}
+
+/** Returns the value of the indicated clause of a constraint
+ expression. */
+bool ConstraintEvaluator::clause_value(Clause_iter &iter, DDS &dds/*, const string &***/)
+{
+    if (expr.empty())
+        throw InternalErr(__FILE__, __LINE__, "There are no CE clauses for *this* DDS object.");
+
+    return (*iter)->value(dds);
+}
+
+/** @brief Add a clause to a constraint expression.
+
+ This function adds an operator clause to the constraint
+ expression.
+
+ @param op An integer indicating the operator in use.  These
+ values are generated by \c bison.
+ @param arg1 A pointer to the argument on the left side of the
+ operator.
+ @param arg2 A pointer to a list of the arguments on the right
+ side of the operator.
+ */
+void ConstraintEvaluator::append_clause(int op, rvalue *arg1, rvalue_list *arg2)
+{
+    Clause *clause = new Clause(op, arg1, arg2);
+
+    expr.push_back(clause);
+}
+
+/** @brief Add a clause to a constraint expression.
+
+ This function adds a boolean function clause to the constraint
+ expression.
+
+ @param func A pointer to a boolean function from the list of
+ supported functions.
+ @param args A list of arguments to that function.
+ */
+void ConstraintEvaluator::append_clause(bool_func func, rvalue_list *args)
+{
+    Clause *clause = new Clause(func, args);
+
+    expr.push_back(clause);
+}
+
+/** @brief Add a clause to a constraint expression.
+
+ This function adds a real-valued (BaseType) function clause to
+ the constraint expression.
+
+ @param func A pointer to a BaseType function from the list of
+ supported functions.
+ @param args A list of arguments to that function.
+ */
+void ConstraintEvaluator::append_clause(btp_func func, rvalue_list *args)
+{
+    Clause *clause = new Clause(func, args);
+
+    expr.push_back(clause);
+}
+
+/** The Constraint Evaluator maintains a list of BaseType pointers for all the
+ constants that the constraint expression parser generates. These objects
+ are deleted by the Constraint Evaluator destructor. Note that there are no
+ list accessors; these constants are never accessed from the list. The list
+ is simply a convenient way to make sure the constants are disposed of
+ properly.
+ */
+void ConstraintEvaluator::append_constant(BaseType *btp)
+{
+    constants.push_back(btp);
+}
+
+/** @brief Find a Boolean function with a given name in the function list. */
+bool ConstraintEvaluator::find_function(const string &name, bool_func *f) const
+{
+    return d_functions_list->find_function(name, f);
+}
+
+/** @brief Find a BaseType function with a given name in the function list. */
+bool ConstraintEvaluator::find_function(const string &name, btp_func *f) const
+{
+    return d_functions_list->find_function(name, f);
+}
+
+/** @brief Find a projection function with a given name in the function list. */
+bool ConstraintEvaluator::find_function(const string &name, proj_func *f) const
+{
+    return d_functions_list->find_function(name, f);
+}
+//@}
+
+/** @brief Does the current constraint expression return a BaseType
+ pointer?
+ This method does not evaluate the clause, it provides information to the
+ evaluator regarding _how_ to evaluate the clause.
+ @return True if the clause is a function that returns a BaseType* and
+ false otherwise
+ @deprecated
+ */
+bool ConstraintEvaluator::functional_expression()
+{
+    if (expr.empty())
+        return false;
+
+    Clause *cp = expr[0];
+    return cp->value_clause();
+}
+
+/** @brief Evaluate a function-valued constraint expression.
+ * @deprecated
+ * */
+BaseType *
+ConstraintEvaluator::eval_function(DDS &dds, const string &)
+{
+    if (expr.size() != 1)
+        throw InternalErr(__FILE__, __LINE__, "The length of the list of CE clauses is not 1.");
+
+    Clause *cp = expr[0];
+    BaseType *result;
+    if (cp->value(dds, &result))
+        return result;
+    else
+        return NULL;
+}
+
+/** @brief Does the current constraint expression contain function clauses
+
+ This method does not evaluate the clauses, it provides information to the
+ evaluator regarding _how_ to evaluate the clause.
+
+ @note Added for libdap 3.11
+
+ @return True if the current constraint contains function clauses,
+ otherwise returns False */
+bool ConstraintEvaluator::function_clauses()
+{
+    if (expr.empty())
+        return false;
+
+    for (unsigned int i = 0; i < expr.size(); ++i) {
+        Clause *cp = expr[i];
+        if (!cp->value_clause())
+            return false;
+    }
+
+    return true;
+}
+
+/** @brief Evaluate a function-valued constraint expression that contains
+ several function calls.
+
+ This method can be called for any function-valued constraint expression.
+ Unlike eval_function(), it will package the return value in a new DDS
+ object. The server should free this object once it has been serialized
+ and sent.
+
+ @note While there is another type of function that can appear in a CE (a
+ 'projection function') those are evaluated by the ce parser - they are used
+ to insert new variables into the DDS as a side effect of CE evaluation.
+ That kind of function can never appear here; these are all functions that
+ return BaseType pointers.
+
+ @note Added for libdap 3.11 */
+DDS *
+ConstraintEvaluator::eval_function_clauses(DDS &dds)
+{
+    if (expr.empty())
+        throw InternalErr(__FILE__, __LINE__, "The constraint expression is empty.");
+
+    DDS *fdds = new DDS(dds.get_factory(), "function_result_" + dds.get_dataset_name());
+    for (unsigned int i = 0; i < expr.size(); ++i) {
+        Clause *cp = expr[i];
+        BaseType *result;
+        if (cp->value(dds, &result)) {
+            // This is correct: The function must allocate the memory for the result
+            // variable. 11/30/12 jhrg
+            fdds->add_var_nocopy(result);
+        }
+        else {
+            delete fdds;
+            throw Error(internal_error, "A function was called but failed to return a value.");
+        }
+    }
+
+    return fdds;
+}
+
+/** @brief Evaluate a function-valued constraint expression that contains
+ several function calls. Takes and returns a DataDDS.
+
+ @see ConstraintEvaluator::eval_function_clauses(DataDDS &dds)
+ @note Added for libdap 3.11 */
+DataDDS *
+ConstraintEvaluator::eval_function_clauses(DataDDS &dds)
+{
+    if (expr.empty())
+        throw InternalErr(__FILE__, __LINE__, "The constraint expression is empty.");
+
+    DataDDS *fdds = new DataDDS(dds.get_factory(), "function_result_" + dds.get_dataset_name(), dds.get_version(),
+            dds.get_protocol());
+
+    for (unsigned int i = 0; i < expr.size(); ++i) {
+        Clause *cp = expr[i];
+        BaseType *result;
+        if (cp->value(dds, &result)) {
+            fdds->add_var_nocopy(result);
+        }
+        else {
+            delete fdds;
+            throw Error(internal_error, "A function was called but failed to return a value.");
+        }
+    }
+
+    return fdds;
+}
+
+/** @brief Does the current constraint expression return a boolean value? */
+bool ConstraintEvaluator::boolean_expression()
+{
+    if (expr.empty())
+        return false;
+
+    bool boolean = true;
+    for (Clause_iter i = expr.begin(); i != expr.end(); i++) {
+        boolean = boolean && (*i)->boolean_clause();
+    }
+
+    return boolean;
+}
+
+/** @brief Evaluate a boolean-valued constraint expression.
+ This is main method for the evaluator and is called by the
+ BaseType::serialize() methods.
+
+ @param dds Use these variables when evaluating the expressions.
+ @param dataset This string is passed to the read() methods.
+ @return True if the expression is true, false otherwise. */
+bool ConstraintEvaluator::eval_selection(DDS &dds, const string &)
+{
+    if (expr.empty()) {
+        DBG(cerr << "No selection recorded" << endl);
+        return true;
+    }
+
+    DBG(cerr << "Eval selection" << endl);
+
+    // A CE is made up of zero or more clauses, each of which has a boolean
+    // value. The value of the CE is the logical AND of the clause
+    // values. See ConstraintEvaluator::clause::value(...) for information on logical ORs in
+    // CEs.
+    bool result = true;
+    for (Clause_iter i = expr.begin(); i != expr.end() && result; i++) {
+        // A selection expression *must* contain only boolean clauses!
+        if (!((*i)->boolean_clause()))
+            throw InternalErr(__FILE__, __LINE__, "A selection expression must contain only boolean clauses.");
+        result = result && (*i)->value(dds);
+    }
+
+    return result;
+}
+
+/** @brief Parse the constraint expression given the current DDS.
+
+ Evaluate the constraint expression; return the value of the expression.
+ As a side effect, mark the DDS so that BaseType's mfuncs can be used to
+ correctly read the variable's value and send it to the client.
+
+ @param constraint A string containing the constraint expression.
+ @param dds The DDS that provides the environment within which the
+ constraint is evaluated.
+ @exception Throws Error if the constraint does not parse. */
+void ConstraintEvaluator::parse_constraint(const string &constraint, DDS &dds)
+{
+    void *buffer = ce_expr_string(constraint.c_str());
+
+    // Toggle this to debug the parser. A last resort...
+    ce_exprdebug = false;
+
+    ce_expr_switch_to_buffer(buffer);
+
+    ce_parser_arg arg(this, &dds);
+
+    // For all errors, exprparse will throw Error.
+    try {
+    	ce_exprparse(&arg);
+    	ce_expr_delete_buffer(buffer);
+    }
+    catch (...) {
+    	// Make sure to remove the buffer when there's an error
+    	ce_expr_delete_buffer(buffer);
+    	throw;
+    }
+}
+
+} // namespace libdap
diff --git a/ConstraintEvaluator.h b/ConstraintEvaluator.h
new file mode 100644
index 0000000..3ea8031
--- /dev/null
+++ b/ConstraintEvaluator.h
@@ -0,0 +1,100 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2006 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#ifndef constraint_evaluator_h
+#define constraint_evaluator_h
+
+#include <vector>
+
+#include "expr.h"
+#include "RValue.h"
+
+namespace libdap
+{
+
+class DDS;
+class DataDDS;
+struct Clause;
+class ServerFunctionsList;
+
+/** @brief Evaluate a constraint expression */
+class ConstraintEvaluator
+{
+private:
+    std::vector<Clause *> expr;      // List of CE Clauses
+
+    std::vector<BaseType *> constants;// List of temporary objects
+
+    ServerFunctionsList *d_functions_list;  // Known external functions from
+                                            // modules
+
+    // The default versions of these methods will break this class. Because
+    // Clause does not support deep copies, that class will need to be modified
+    // before these can be properly implemented. jhrg 4/3/06
+    ConstraintEvaluator(const ConstraintEvaluator &);
+    ConstraintEvaluator &operator=(const ConstraintEvaluator &);
+
+    friend class func_name_is;
+
+public:
+    typedef std::vector<Clause *>::const_iterator Clause_citer ;
+    typedef std::vector<Clause *>::iterator Clause_iter ;
+
+    typedef std::vector<BaseType *>::const_iterator Constants_citer ;
+    typedef std::vector<BaseType *>::iterator Constants_iter ;
+
+    ConstraintEvaluator();
+
+    virtual ~ConstraintEvaluator();
+    bool find_function(const std::string &name, bool_func *f) const;
+    bool find_function(const std::string &name, btp_func *f) const;
+    bool find_function(const std::string &name, proj_func *f) const;
+
+    void append_clause(int op, rvalue *arg1, rvalue_list *arg2);
+    void append_clause(bool_func func, rvalue_list *args);
+    void append_clause(btp_func func, rvalue_list *args);
+
+    bool functional_expression();
+    bool boolean_expression();
+    bool eval_selection(DDS &dds, const std::string &dataset);
+    BaseType *eval_function(DDS &dds, const std::string &dataset);
+
+    // New for libdap 3.11. These methods provide a way to evaluate multiple
+    // functions in one CE
+    bool function_clauses();
+    DDS *eval_function_clauses(DDS &dds);
+    DataDDS *eval_function_clauses(DataDDS &dds);
+
+    Clause_iter clause_begin();
+    Clause_iter clause_end();
+    bool clause_value(Clause_iter &i, DDS &dds);
+
+    void parse_constraint(const std::string &constraint, DDS &dds);
+    void append_constant(BaseType *btp);
+
+};
+
+} // namespace libdap
+
+#endif // constraint_evaluator_h
diff --git a/Constructor.cc b/Constructor.cc
new file mode 100644
index 0000000..ca7b2f7
--- /dev/null
+++ b/Constructor.cc
@@ -0,0 +1,931 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1995-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+
+#include "config.h"
+
+//#define DODS_DEBUG
+
+#include <string>
+#include <sstream>
+#include <algorithm>
+#include <functional>
+
+#include <stdint.h>
+
+#include "crc.h"
+
+#include "Constructor.h"
+#include "Grid.h"
+
+#include "DMR.h"
+#include "XMLWriter.h"
+#include "D4StreamMarshaller.h"
+#include "D4StreamUnMarshaller.h"
+#include "D4Group.h"
+
+#include "D4Attributes.h"
+
+#include "escaping.h"
+#include "util.h"
+#include "Error.h"
+#include "InternalErr.h"
+
+
+// #define DODS_DEBUG 1
+#include "debug.h"
+
+using namespace std;
+
+namespace libdap {
+
+// Private member functions
+
+void
+Constructor::m_duplicate(const Constructor &c)
+{
+	DBG(cerr << "In Constructor::m_duplicate for " << c.name() << endl);
+	// Clear out any spurious vars in Constructor::d_vars
+	// Moved from Grid::m_duplicate. jhrg 4/3/13
+	d_vars.clear(); // [mjohnson 10 Sep 2009]
+
+	Vars_citer i = c.d_vars.begin();
+	while (i != c.d_vars.end()) {
+		BaseType *btp = (*i++)->ptr_duplicate();
+		btp->set_parent(this);
+		d_vars.push_back(btp);
+	}
+
+	DBG(cerr << "Exiting Constructor::m_duplicate for " << c.name() << endl);
+}
+
+// Public member functions
+
+Constructor::Constructor(const string &name, const Type &type, bool is_dap4)
+        : BaseType(name, type, is_dap4)
+{}
+
+/** Server-side constructor that takes the name of the variable to be
+ * created, the dataset name from which this variable is being created, and
+ * the type of data being stored in the Constructor. This is a protected
+ * constructor, available only to derived classes of Constructor
+ *
+ * @param name string containing the name of the variable to be created
+ * @param dataset string containing the name of the dataset from which this
+ * variable is being created
+ * @param type type of data being stored
+ */
+Constructor::Constructor(const string &name, const string &dataset, const Type &type, bool is_dap4)
+        : BaseType(name, dataset, type, is_dap4)
+{}
+
+Constructor::Constructor(const Constructor &rhs) : BaseType(rhs), d_vars(0)
+{
+    DBG(cerr << "In Constructor::copy_ctor for " << rhs.name() << endl);
+    m_duplicate(rhs);
+}
+
+Constructor::~Constructor()
+{
+    Vars_iter i = d_vars.begin();
+    while (i != d_vars.end()) {
+        delete *i++;
+    }
+}
+
+Constructor &
+Constructor::operator=(const Constructor &rhs)
+{
+    DBG(cerr << "Entering Constructor::operator=" << endl);
+    if (this == &rhs)
+        return *this;
+
+    dynamic_cast<BaseType &>(*this) = rhs; // run BaseType=
+
+    m_duplicate(rhs);
+
+    DBG(cerr << "Exiting Constructor::operator=" << endl);
+    return *this;
+}
+
+// A public method, but just barely...
+void
+Constructor::transform_to_dap4(D4Group *root, Constructor *dest)
+{
+    DBG(cerr << __func__ << "() - BEGIN (name:"<< name() <<
+        ")(type:"<< type_name()<<
+        ")(root:'"<< root->name()<<"':"<<(void*)root <<
+        ")(dest:'"<< dest->name()<<"':"<< (void *) dest<< ")"
+        << endl;);
+
+    for (Constructor::Vars_citer i = var_begin(), e = var_end(); i != e; ++i) {
+        BaseType *d4_var = dest->var((*i)->name());
+        // Don't add duplicate variables. We have to make this check
+        // because some of the child variables may add arrays
+        // to the root object. For example, this happens in
+        // Grid with the Map Arrays - ndp - 05/08/17
+        if(!d4_var){
+            /*
+            BaseType *new_var = (*i)->transform_to_dap4(root, dest);
+            if (new_var) {	// Might be a Grid; see the comment in BaseType::transform_to_dap4()
+                new_var->set_parent(dest);
+                dest->add_var_nocopy(new_var);
+            }
+            */
+            DBG(cerr << __func__ << "() - Transforming variable: '" <<
+                (*i)->name() << "'" << endl; );
+            (*i)->transform_to_dap4(root /*group*/, dest /*container*/);
+        }
+        else {
+            DBG(cerr << __func__ << "() - Skipping variable: " <<
+                d4_var->type_name() << " " << d4_var->name() << " because a variable with" <<
+                " this name already exists in the root group." << endl; );
+        }
+    }
+    dest->attributes()->transform_to_dap4(get_attr_table());
+    dest->set_is_dap4(true);
+    DBG(cerr << __func__ << "() - END (name:"<< name() << ")(type:"<< type_name()<< ")" << endl;);
+}
+
+
+
+string
+Constructor::FQN() const
+{
+	if (get_parent() == 0)
+		return name();
+	else if (get_parent()->type() == dods_group_c)
+		return get_parent()->FQN() + name();
+	else if (get_parent()->type() == dods_array_c)
+		return get_parent()->FQN();
+	else
+		return get_parent()->FQN() + "." + name();
+}
+
+int
+Constructor::element_count(bool leaves)
+{
+    if (!leaves)
+        return d_vars.size();
+    else {
+        int i = 0;
+        for (Vars_iter j = d_vars.begin(); j != d_vars.end(); j++) {
+            i += (*j)->element_count(leaves);
+        }
+        return i;
+    }
+}
+
+void
+Constructor::set_send_p(bool state)
+{
+    for (Vars_iter i = d_vars.begin(); i != d_vars.end(); i++) {
+        (*i)->set_send_p(state);
+    }
+
+    BaseType::set_send_p(state);
+}
+
+void
+Constructor::set_read_p(bool state)
+{
+    for (Vars_iter i = d_vars.begin(); i != d_vars.end(); i++) {
+        (*i)->set_read_p(state);
+    }
+
+    BaseType::set_read_p(state);
+}
+
+#if 0
+// TODO Recode to use width(bool). Bur see comments in BaseType.h
+unsigned int
+Constructor::width()
+{
+    unsigned int sz = 0;
+
+    for (Vars_iter i = d_vars.begin(); i != d_vars.end(); i++) {
+        sz += (*i)->width();
+    }
+
+    return sz;
+}
+#endif
+/** This version of width simply returns the same thing as width() for simple
+    types and Arrays. For Structure it returns the total size if constrained
+    is false, or the size of the elements in the current projection if true.
+
+    @param constrained If true, return the size after applying a constraint.
+    @return  The number of bytes used by the variable.
+ */
+unsigned int
+Constructor::width(bool constrained) const
+{
+    unsigned int sz = 0;
+
+    for (Vars_citer i = d_vars.begin(); i != d_vars.end(); i++) {
+        if (constrained) {
+            if ((*i)->send_p())
+                sz += (*i)->width(constrained);
+        }
+        else {
+            sz += (*i)->width(constrained);
+        }
+    }
+
+    return sz;
+}
+
+BaseType *
+Constructor::var(const string &name, bool exact_match, btp_stack *s)
+{
+    string n = www2id(name);
+
+    if (exact_match)
+        return m_exact_match(n, s);
+    else
+        return m_leaf_match(n, s);
+}
+
+/** @deprecated See comment in BaseType */
+BaseType *
+Constructor::var(const string &n, btp_stack &s)
+{
+	// This should probably be removed. The BES code should remove web encoding
+	// with the possible exception of spaces. jhrg 11/25/13
+    string name = www2id(n);
+
+    BaseType *btp = m_exact_match(name, &s);
+    if (btp)
+        return btp;
+
+    return m_leaf_match(name, &s);
+}
+
+// Protected method
+BaseType *
+Constructor::m_leaf_match(const string &name, btp_stack *s)
+{
+    for (Vars_iter i = d_vars.begin(); i != d_vars.end(); i++) {
+        if ((*i)->name() == name) {
+            if (s) {
+                DBG(cerr << "Pushing " << this->name() << endl);
+                s->push(static_cast<BaseType *>(this));
+            }
+            return *i;
+        }
+        if ((*i)->is_constructor_type()) {
+            BaseType *btp = (*i)->var(name, false, s);
+            if (btp) {
+                if (s) {
+                    DBG(cerr << "Pushing " << this->name() << endl);
+                    s->push(static_cast<BaseType *>(this));
+                }
+                return btp;
+            }
+        }
+    }
+
+    return 0;
+}
+
+// Protected method
+BaseType *
+Constructor::m_exact_match(const string &name, btp_stack *s)
+{
+    // Look for name at the top level first.
+    for (Vars_iter i = d_vars.begin(); i != d_vars.end(); i++) {
+        if ((*i)->name() == name) {
+            if (s)
+                s->push(static_cast<BaseType *>(this));
+
+            return *i;
+        }
+    }
+
+    // If it was not found using the simple search, look for a dot and
+    // search the hierarchy.
+    string::size_type dot_pos = name.find("."); // zero-based index of `.'
+    if (dot_pos != string::npos) {
+        string aggregate = name.substr(0, dot_pos);
+        string field = name.substr(dot_pos + 1);
+
+        BaseType *agg_ptr = var(aggregate);
+        if (agg_ptr) {
+            if (s)
+                s->push(static_cast<BaseType *>(this));
+
+            return agg_ptr->var(field, true, s); // recurse
+        }
+        else
+            return 0;  // qualified names must be *fully* qualified
+    }
+
+    return 0;
+}
+
+/** Returns an iterator referencing the first structure element. */
+Constructor::Vars_iter
+Constructor::var_begin()
+{
+    return d_vars.begin() ;
+}
+
+/** Returns an iterator referencing the end of the list of structure
+    elements. Does not reference the last structure element. */
+Constructor::Vars_iter
+Constructor::var_end()
+{
+    return d_vars.end() ;
+}
+
+/** Return a reverse iterator that references the last element. */
+Constructor::Vars_riter
+Constructor::var_rbegin()
+{
+    return d_vars.rbegin();
+}
+
+/** Return a reverse iterator that references a point 'before' the first
+    element. */
+Constructor::Vars_riter
+Constructor::var_rend()
+{
+    return d_vars.rend();
+}
+
+/** Return the iterator for the \e ith variable.
+    @param i the index
+    @return The corresponding  Vars_iter */
+Constructor::Vars_iter
+Constructor::get_vars_iter(int i)
+{
+    return d_vars.begin() + i;
+}
+
+/** Return the BaseType pointer for the \e ith variable.
+    @param i This index
+    @return The corresponding BaseType*. */
+BaseType *
+Constructor::get_var_index(int i)
+{
+    return *(d_vars.begin() + i);
+}
+
+/** Adds an element to a Constructor.
+
+    @param bt A pointer to the variable to add to this Constructor.
+    @param part Not used by this class, defaults to nil */
+void
+Constructor::add_var(BaseType *bt, Part)
+{
+    // Jose Garcia
+    // Passing and invalid pointer to an object is a developer's error.
+    if (!bt)
+        throw InternalErr(__FILE__, __LINE__, "The BaseType parameter cannot be null.");
+#if 0
+    if (bt->is_dap4_only_type())
+        throw InternalErr(__FILE__, __LINE__, "Attempt to add a DAP4 type to a DAP2 Structure.");
+#endif
+    // Jose Garcia
+    // Now we add a copy of bt so the external user is able to destroy bt as
+    // he/she wishes. The policy is: "If it is allocated outside, it is
+    // deallocated outside, if it is allocated inside, it is deallocated
+    // inside"
+    BaseType *btp = bt->ptr_duplicate();
+    btp->set_parent(this);
+    d_vars.push_back(btp);
+}
+
+/** Adds an element to a Constructor.
+
+    @param bt A pointer to thee variable to add to this Constructor.
+    @param part Not used by this class, defaults to nil */
+void
+Constructor::add_var_nocopy(BaseType *bt, Part)
+{
+    if (!bt)
+        throw InternalErr(__FILE__, __LINE__, "The BaseType parameter cannot be null.");
+#if 0
+    if (bt->is_dap4_only_type())
+        throw InternalErr(__FILE__, __LINE__, "Attempt to add a DAP4 type to a DAP2 Structure.");
+#endif
+    bt->set_parent(this);
+    d_vars.push_back(bt);
+}
+
+/** Remove an element from a Constructor.
+
+    @param n name of the variable to remove */
+void
+Constructor::del_var(const string &n)
+{
+	// TODO remove_if? find_if?
+    for (Vars_iter i = d_vars.begin(); i != d_vars.end(); i++) {
+        if ((*i)->name() == n) {
+            BaseType *bt = *i ;
+            d_vars.erase(i) ;
+            delete bt ; bt = 0;
+            return;
+        }
+    }
+}
+
+void
+Constructor::del_var(Vars_iter i)
+{
+    if (*i != 0) {
+        BaseType *bt = *i;
+        d_vars.erase(i);
+        delete bt;
+    }
+}
+
+/** @brief simple implementation of read that iterates through vars
+ *  and calls read on them
+ *
+ * @return returns false to signify all has been read
+ */
+bool Constructor::read()
+{
+	DBG(cerr << "Entering  Constructor::read..." << endl);
+    if (!read_p()) {
+        for (Vars_iter i = d_vars.begin(); i != d_vars.end(); i++) {
+            (*i)->read();
+        }
+        set_read_p(true);
+    }
+
+    return false;
+}
+
+void
+Constructor::intern_data(ConstraintEvaluator & eval, DDS & dds)
+{
+    DBG(cerr << "Constructor::intern_data: " << name() << endl);
+    if (!read_p())
+        read();          // read() throws Error and InternalErr
+
+    for (Vars_iter i = d_vars.begin(); i != d_vars.end(); i++) {
+        if ((*i)->send_p()) {
+            (*i)->intern_data(eval, dds);
+        }
+    }
+}
+
+bool
+Constructor::serialize(ConstraintEvaluator &eval, DDS &dds, Marshaller &m, bool ce_eval)
+{
+#if USE_LOCAL_TIMEOUT_SCHEME
+    dds.timeout_on();
+#endif
+    if (!read_p())
+        read();  // read() throws Error and InternalErr
+
+    if (ce_eval && !eval.eval_selection(dds, dataset()))
+        return true;
+#if USE_LOCAL_TIMEOUT_SCHEME
+    dds.timeout_off();
+#endif
+    for (Vars_iter i = d_vars.begin(); i != d_vars.end(); i++) {
+        if ((*i)->send_p()) {
+#ifdef CHECKSUMS
+            XDRStreamMarshaller *sm = dynamic_cast<XDRStreamMarshaller*>(&m);
+            if (sm && sm->checksums() && (*i)->type() != dods_structure_c && (*i)->type() != dods_grid_c)
+                sm->reset_checksum();
+
+            (*i)->serialize(eval, dds, m, false);
+
+            if (sm && sm->checksums() && (*i)->type() != dods_structure_c && (*i)->type() != dods_grid_c)
+                sm->get_checksum();
+#else
+            // (*i)->serialize(eval, dds, m, false);
+            // Only Sequence and Vector run the evaluator.
+            (*i)->serialize(eval, dds, m, true);
+#endif
+        }
+    }
+
+    return true;
+}
+
+bool
+Constructor::deserialize(UnMarshaller &um, DDS *dds, bool reuse)
+{
+    for (Vars_iter i = d_vars.begin(); i != d_vars.end(); i++) {
+        (*i)->deserialize(um, dds, reuse);
+    }
+
+    return false;
+}
+
+void
+Constructor::compute_checksum(Crc32 &)
+{
+	throw InternalErr(__FILE__, __LINE__, "Computing a checksum alone is not supported for Constructor types.");
+}
+
+void
+Constructor::intern_data(/*Crc32 &checksum, DMR &dmr, ConstraintEvaluator & eval*/)
+{
+    for (Vars_iter i = d_vars.begin(); i != d_vars.end(); i++) {
+        if ((*i)->send_p()) {
+            (*i)->intern_data(/*checksum, dmr, eval*/);
+        }
+    }
+}
+
+
+/**
+ * @brief Serialize a Constructor
+ *
+ * @todo See notebook for 8/21/14
+ *
+ * @param m
+ * @param dmr Unused
+ * @param eval Unused
+ * @param filter Unused
+ * @exception Error is thrown if the value needs to be read and that operation fails.
+ */
+void
+Constructor::serialize(D4StreamMarshaller &m, DMR &dmr, /*ConstraintEvaluator &eval,*/ bool filter)
+{
+#if 1
+	// Not used for the same reason the equivalent code in D4Group::serialize()
+	// is not used. Fail for D4Sequence and general issues with memory use.
+	//
+	// Revisit this - I had to uncomment this to get the netcdf_handler code
+	// to work - it relies on having NCStructure::read() called. The D4Sequence
+	// ::serialize() method calls read_next_instance(). What seems to be happening
+	// is that this call to read gets the first set of values, but does not store
+	// them; the call to serialize then runs the D4Sequence::serialize() method that
+	// _does_ read all of the sequence data and then serialize it. However, the first
+	// sequence instance is missing...
+    if (!read_p())
+        read();  // read() throws Error
+#endif
+#if 0
+    // place holder for now. There may be no need for this; only Array and Seq?
+    // jhrg 9/6/13
+    if (filter && !eval.eval_selection(dmr, dataset()))
+        return true;
+#endif
+
+    for (Vars_iter i = d_vars.begin(); i != d_vars.end(); i++) {
+        if ((*i)->send_p()) {
+            (*i)->serialize(m, dmr, /*eval,*/ filter);
+        }
+    }
+}
+
+void
+Constructor::deserialize(D4StreamUnMarshaller &um, DMR &dmr)
+{
+    for (Vars_iter i = d_vars.begin(); i != d_vars.end(); i++) {
+        (*i)->deserialize(um, dmr);
+    }
+}
+
+void
+Constructor::print_decl(FILE *out, string space, bool print_semi,
+                        bool constraint_info, bool constrained)
+{
+    ostringstream oss;
+    print_decl(oss, space, print_semi, constraint_info, constrained);
+    fwrite(oss.str().data(), sizeof(char), oss.str().length(), out);
+}
+
+void
+Constructor::print_decl(ostream &out, string space, bool print_semi,
+                        bool constraint_info, bool constrained)
+{
+    if (constrained && !send_p())
+        return;
+
+    out << space << type_name() << " {\n" ;
+    for (Vars_citer i = d_vars.begin(); i != d_vars.end(); i++) {
+        (*i)->print_decl(out, space + "    ", true, constraint_info, constrained);
+    }
+    out << space << "} " << id2www(name()) ;
+
+    if (constraint_info) { // Used by test drivers only.
+        if (send_p())
+            out << ": Send True";
+        else
+            out << ": Send False";
+    }
+
+    if (print_semi)
+        out << ";\n" ;
+}
+
+void
+Constructor::print_val(FILE *out, string space, bool print_decl_p)
+{
+    ostringstream oss;
+    print_val(oss, space, print_decl_p);
+    fwrite(oss.str().data(), sizeof(char), oss.str().length(), out);
+}
+
+void
+Constructor::print_val(ostream &out, string space, bool print_decl_p)
+{
+    if (print_decl_p) {
+        print_decl(out, space, false);
+        out << " = " ;
+    }
+
+    out << "{ " ;
+    for (Vars_citer i = d_vars.begin(), e = d_vars.end(); i != e;
+         i++, (void)(i != e && out << ", ")) {
+
+        DBG(cerr << (*i)->name() << " isa " << (*i)->type_name() << endl);
+
+        (*i)->print_val(out, "", false);
+    }
+
+    out << " }" ;
+
+    if (print_decl_p)
+        out << ";\n" ;
+}
+
+/**
+ * @deprecated
+ */
+void
+Constructor::print_xml(FILE *out, string space, bool constrained)
+{
+    XMLWriter xml(space);
+    print_xml_writer(xml, constrained);
+    fwrite(xml.get_doc(), sizeof(char), xml.get_doc_size(), out);
+}
+
+/**
+ * @deprecated
+ */
+void
+Constructor::print_xml(ostream &out, string space, bool constrained)
+{
+    XMLWriter xml(space);
+    print_xml_writer(xml, constrained);
+    out << xml.get_doc();
+}
+
+class PrintFieldXMLWriter : public unary_function<BaseType *, void>
+{
+    XMLWriter &d_xml;
+    bool d_constrained;
+public:
+    PrintFieldXMLWriter(XMLWriter &x, bool c)
+            : d_xml(x), d_constrained(c)
+    {}
+
+    void operator()(BaseType *btp)
+    {
+        btp->print_xml_writer(d_xml, d_constrained);
+    }
+};
+
+void
+Constructor::print_xml_writer(XMLWriter &xml, bool constrained)
+{
+    if (constrained && !send_p())
+        return;
+
+    if (xmlTextWriterStartElement(xml.get_writer(), (const xmlChar*)type_name().c_str()) < 0)
+        throw InternalErr(__FILE__, __LINE__, "Could not write " + type_name() + " element");
+
+    if (!name().empty())
+        if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "name", (const xmlChar*)name().c_str()) < 0)
+            throw InternalErr(__FILE__, __LINE__, "Could not write attribute for name");
+
+    // DAP2 prints attributes first. For some reason we decided that DAP4 should
+    // print them second. No idea why... jhrg 8/15/14
+    if (!is_dap4() && get_attr_table().get_size() > 0)
+        get_attr_table().print_xml_writer(xml);
+
+    bool has_variables = (var_begin() != var_end());
+    if (has_variables)
+        for_each(var_begin(), var_end(), PrintFieldXMLWriter(xml, constrained));
+
+    if (is_dap4())
+        attributes()->print_dap4(xml);
+
+#if 0
+    // Moved up above so that the DDX tests for various handles will still work.
+    // jhrg 8/15/14
+    if (!is_dap4() && get_attr_table().get_size() > 0)
+        get_attr_table().print_xml_writer(xml);
+#endif
+
+    if (xmlTextWriterEndElement(xml.get_writer()) < 0)
+        throw InternalErr(__FILE__, __LINE__, "Could not end " + type_name() + " element");
+}
+
+class PrintDAP4FieldXMLWriter : public unary_function<BaseType *, void>
+{
+    XMLWriter &d_xml;
+    bool d_constrained;
+public:
+    PrintDAP4FieldXMLWriter(XMLWriter &x, bool c) : d_xml(x), d_constrained(c) {}
+
+    void operator()(BaseType *btp)
+    {
+        btp->print_dap4(d_xml, d_constrained);
+    }
+};
+
+
+void
+Constructor::print_dap4(XMLWriter &xml, bool constrained)
+{
+    if (constrained && !send_p())
+        return;
+
+    if (xmlTextWriterStartElement(xml.get_writer(), (const xmlChar*)type_name().c_str()) < 0)
+        throw InternalErr(__FILE__, __LINE__, "Could not write " + type_name() + " element");
+
+    if (!name().empty())
+        if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "name", (const xmlChar*)name().c_str()) < 0)
+            throw InternalErr(__FILE__, __LINE__, "Could not write attribute for name");
+
+    bool has_variables = (var_begin() != var_end());
+    if (has_variables)
+        for_each(var_begin(), var_end(), PrintDAP4FieldXMLWriter(xml, constrained));
+
+    attributes()->print_dap4(xml);
+
+    if (xmlTextWriterEndElement(xml.get_writer()) < 0)
+        throw InternalErr(__FILE__, __LINE__, "Could not end " + type_name() + " element");
+}
+
+
+bool
+Constructor::check_semantics(string &msg, bool all)
+{
+    if (!BaseType::check_semantics(msg))
+        return false;
+
+    if (!unique_names(d_vars, name(), type_name(), msg))
+        return false;
+
+    if (all)
+        for (Vars_iter i = d_vars.begin(); i != d_vars.end(); i++) {
+            if (!(*i)->check_semantics(msg, true)) {
+                return false;
+            }
+        }
+
+    return true;
+}
+
+/** True if the instance can be flattened and printed as a single table
+    of values. For Arrays and Grids this is always false. For Structures
+    and Sequences the conditions are more complex. The implementation
+    provided by this class always returns false. Other classes should
+    override this implementation.
+
+    @todo Change the name to is_flattenable or something like that. 05/16/03
+    jhrg
+
+    @brief Check to see whether this variable can be printed simply.
+    @return True if the instance can be printed as a single table of
+    values, false otherwise. */
+bool
+Constructor::is_linear()
+{
+    return false;
+}
+
+/** Set the \e in_selection property for this variable and all of its
+    children.
+
+    @brief Set the \e in_selection property.
+    @param state Set the property value to \e state. */
+void
+Constructor::set_in_selection(bool state)
+{
+    for (Vars_iter i = d_vars.begin(); i != d_vars.end(); i++) {
+        (*i)->set_in_selection(state);
+    }
+
+    BaseType::set_in_selection(state);
+}
+
+
+void Constructor::transfer_attributes(AttrTable *at_container)
+{
+    AttrTable *at = at_container->get_attr_table(name());
+    DBG(cerr << "Constructor::transfer_attributes() - processing " << name() << "'  addr: "<< (void*) at << endl);
+    if (at) {
+        BaseType::transfer_attributes(at_container);
+        for (Vars_iter i = d_vars.begin(); i != d_vars.end(); i++) {
+            BaseType *bt  = (*i);
+            bt->transfer_attributes(at);
+        }
+
+    }
+}
+
+AttrTable *
+Constructor::make_dropped_vars_attr_table(vector<BaseType *> *dropped_vars) {
+    DBG( cerr << __func__ << "() - BEGIN" << endl;);
+
+    AttrTable *dv_table = NULL;
+    if(!dropped_vars->empty()){
+        dv_table = new AttrTable;
+        dv_table->set_name("dap4:dropped_members");
+        vector<BaseType *>::iterator dvIter = dropped_vars->begin();
+        vector<BaseType *>::iterator dvEnd = dropped_vars->end();
+        unsigned int i = 0;
+        for( ; dvIter!=dvEnd ; dvIter++, i++){
+            BaseType *bt = (*dvIter);
+            AttrTable *bt_attr_table = new AttrTable(bt->get_attr_table());
+            bt_attr_table->set_name(bt->name());
+            string type_name = bt->type_name();
+            if(bt->is_vector_type()){
+                Array *array = dynamic_cast <Array *>(bt);
+                if(array){
+                    type_name = array->prototype()->type_name();
+                    DBG( cerr << __func__ << "() - The variable " << bt->name() << " is an Array of '"<< type_name << "'" << endl;);
+                    Array::Dim_iter d_iter = array->dim_begin();
+                    Array::Dim_iter end = array->dim_end();
+                    for( ; d_iter< end ; d_iter++){
+
+                        ostringstream dim_size;
+                        dim_size << (*d_iter).size;
+                        bt_attr_table->append_attr(
+                            "array_dimensions",
+                            AttrType_to_String(Attr_uint32),
+                            dim_size.str());
+                    }
+                }
+            }
+            bt_attr_table->append_attr("dap4:type","String", type_name);
+            dv_table->append_container(bt_attr_table,bt_attr_table->get_name());
+            // Clear entry now that we're done.
+            (*dvIter) = 0;
+        }
+   }
+    DBG( cerr << __func__ << "() - END " << endl;);
+    return dv_table;
+
+}
+
+
+/** @brief dumps information about this object
+ *
+ * Displays the pointer value of this instance and information about this
+ * instance.
+ *
+ * @param strm C++ i/o stream to dump the information to
+ * @return void
+ */
+void
+Constructor::dump(ostream &strm) const
+{
+    strm << DapIndent::LMarg << "Constructor::dump - ("
+    << (void *)this << ")" << endl ;
+    DapIndent::Indent() ;
+    BaseType::dump(strm) ;
+    strm << DapIndent::LMarg << "vars: " << endl ;
+    DapIndent::Indent() ;
+    Vars_citer i = d_vars.begin() ;
+    Vars_citer ie = d_vars.end() ;
+    for (; i != ie; i++) {
+        (*i)->dump(strm) ;
+    }
+    DapIndent::UnIndent() ;
+    DapIndent::UnIndent() ;
+}
+
+} // namespace libdap
+
diff --git a/Constructor.h b/Constructor.h
new file mode 100644
index 0000000..79d8f6f
--- /dev/null
+++ b/Constructor.h
@@ -0,0 +1,159 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#ifndef _constructor_h
+#define _constructor_h 1
+
+#include <vector>
+
+#include "BaseType.h"
+
+class Crc32;
+
+namespace libdap
+{
+
+class DMR;
+class XMLWriter;
+class D4StreamUnMarshaller;
+
+/** Common methods for all constructor types. */
+class Constructor: public BaseType
+{
+private:
+    Constructor();  // No default ctor.
+
+protected:
+    std::vector<BaseType *> d_vars;
+
+    void m_duplicate(const Constructor &s);
+    BaseType *m_leaf_match(const string &name, btp_stack *s = 0);
+    BaseType *m_exact_match(const string &name, btp_stack *s = 0);
+
+    Constructor(const string &name, const Type &type, bool is_dap4 = false);
+    Constructor(const string &name, const string &d, const Type &type, bool is_dap4 = false);
+
+    Constructor(const Constructor &copy_from);
+
+public:
+    typedef std::vector<BaseType *>::const_iterator Vars_citer ;
+    typedef std::vector<BaseType *>::iterator Vars_iter ;
+    typedef std::vector<BaseType *>::reverse_iterator Vars_riter ;
+
+    virtual ~Constructor();
+
+    Constructor &operator=(const Constructor &rhs);
+    virtual void transform_to_dap4(D4Group *root, Constructor *dest);
+
+    virtual std::string FQN() const;
+
+    virtual int element_count(bool leaves = false);
+
+    virtual void set_send_p(bool state);
+    virtual void set_read_p(bool state);
+
+    virtual unsigned int width(bool constrained = false) const;
+#if 0
+    virtual unsigned int width(bool constrained);
+#endif
+    // TODO Rewrite these methods to use the back pointers and keep this
+    // for older code.
+    /// btp_stack no longer needed; use back pointers (BaseType::get_parent())
+    virtual BaseType *var(const string &name, bool exact_match = true, btp_stack *s = 0);
+    /// @deprecated
+    virtual BaseType *var(const string &n, btp_stack &s);
+
+    Vars_iter var_begin();
+    Vars_iter var_end();
+    Vars_riter var_rbegin();
+    Vars_riter var_rend();
+    Vars_iter get_vars_iter(int i);
+    BaseType *get_var_index(int i);
+
+    virtual void add_var(BaseType *bt, Part part = nil);
+    virtual void add_var_nocopy(BaseType *bt, Part part = nil);
+
+    virtual void del_var(const string &name);
+    virtual void del_var(Vars_iter i);
+
+    virtual bool read();
+
+    // DAP2
+    virtual void intern_data(ConstraintEvaluator &eval, DDS &dds);
+    virtual bool serialize(ConstraintEvaluator &eval, DDS &dds, Marshaller &m, bool ce_eval = true);
+    virtual bool deserialize(UnMarshaller &um, DDS *dds, bool reuse = false);
+
+    // DAP4
+    virtual void compute_checksum(Crc32 &checksum);
+    virtual void intern_data(/*Crc32 &checksum, DMR &dmr, ConstraintEvaluator &eval*/);
+    virtual void serialize(D4StreamMarshaller &m, DMR &dmr, /*ConstraintEvaluator &eval,*/ bool filter = false);
+    virtual void deserialize(D4StreamUnMarshaller &um, DMR &dmr);
+
+    // Do not store values in memory as for C; users work with the C++ objects
+    virtual unsigned int val2buf(void *, bool) {
+        throw InternalErr(__FILE__, __LINE__, "Never use this method; see the programmer's guide documentation.");
+    }
+    virtual unsigned int buf2val(void **) {
+        throw InternalErr(__FILE__, __LINE__, "Never use this method; see the programmer's guide documentation.");
+    }
+
+    virtual bool is_linear();
+    virtual void set_in_selection(bool state);
+
+    virtual void print_decl(ostream &out, string space = "    ",
+                            bool print_semi = true,
+                            bool constraint_info = false,
+                            bool constrained = false);
+
+    virtual void print_xml(ostream &out, string space = "    ",
+                           bool constrained = false);
+
+    void print_dap4(XMLWriter &xml, bool constrained = false);
+
+    virtual void print_xml_writer(XMLWriter &xml, bool constrained = false);
+
+    virtual void print_decl(FILE *out, string space = "    ",
+                            bool print_semi = true,
+                            bool constraint_info = false,
+                            bool constrained = false);
+    virtual void print_xml(FILE *out, string space = "    ",
+                           bool constrained = false);
+
+    virtual void print_val(FILE *out, string space = "",
+                           bool print_decl_p = true);
+    virtual void print_val(ostream &out, string space = "",
+                           bool print_decl_p = true);
+
+    virtual bool check_semantics(string &msg, bool all = false);
+
+    virtual void transfer_attributes(AttrTable *at);
+    static AttrTable *make_dropped_vars_attr_table(vector<BaseType *> *dropped_vars);
+
+    virtual void dump(ostream &strm) const ;
+};
+
+} // namespace libdap
+
+#endif // _constructor_h
diff --git a/D4AsyncUtil.cc b/D4AsyncUtil.cc
new file mode 100644
index 0000000..ac4e73a
--- /dev/null
+++ b/D4AsyncUtil.cc
@@ -0,0 +1,357 @@
+/*
+ * D4AsyncUtil.cc
+ *
+ *  Created on: Feb 18, 2014
+ *      Author: ndp
+ */
+
+#include "config.h"
+
+#include <sstream>
+
+#include "XMLWriter.h"
+
+#include "Error.h"
+#include "InternalErr.h"
+#include "util.h"
+
+#include "D4AsyncUtil.h"
+#include "DapXmlNamespaces.h"
+
+namespace libdap {
+
+const string D4AsyncUtil::STYLESHEET_REFERENCE_KEY = "DAP.Async.StyleSheet.Ref";
+
+D4AsyncUtil::D4AsyncUtil()  {}
+
+D4AsyncUtil::~D4AsyncUtil() {}
+
+/**
+ * @brief Print the AsyncRequired response to the.
+ * Print the AsyncRequired in XML form.
+ * @param xml Print to this XMLWriter instance
+ */
+void D4AsyncUtil::writeD4AsyncRequired(XMLWriter &xml, long expectedDelay, long responseLifetime, string *stylesheet_ref) {
+
+	// ------ AsynchronousResponse Element and Attributes - BEGIN
+
+	/*
+	int	xmlTextWriterWriteAttributeNS	(xmlTextWriterPtr writer,
+						 const xmlChar * prefix,
+						 const xmlChar * name,
+						 const xmlChar * namespaceURI,
+						 const xmlChar * content)
+	*/
+
+	if(stylesheet_ref){
+		string href = "href='" + *stylesheet_ref +"'";
+		if(xmlTextWriterStartPI(xml.get_writer(), (const xmlChar*) "xml-stylesheet") < 0)
+			throw InternalErr(__FILE__, __LINE__, "Could not start XML Processing Instruction.");
+		if(xmlTextWriterWriteString(xml.get_writer(), (const xmlChar*) "type='text/xsl'") < 0)
+			throw InternalErr(__FILE__, __LINE__, "Could not write Processing Instruction content.");
+		if(xmlTextWriterWriteString(xml.get_writer(), (const xmlChar*) " ") < 0)
+			throw InternalErr(__FILE__, __LINE__, "Could not write Processing Instruction content.");
+		if(xmlTextWriterWriteString(xml.get_writer(), (const xmlChar*) href.c_str()) < 0)
+			throw InternalErr(__FILE__, __LINE__, "Could not write Processing Instruction content.");
+		if(xmlTextWriterEndPI(xml.get_writer()) < 0)
+			throw InternalErr(__FILE__, __LINE__, "Could not Close XML Processing Instruction.");
+	}
+
+	DapXmlNamspaces dapns;
+	if (xmlTextWriterStartElementNS(xml.get_writer(),
+			(const xmlChar*)"dap",
+			(const xmlChar*) "AsynchronousResponse",
+			(const xmlChar*) dapns.getDapNamespaceString(DAP_4_0).c_str()) < 0)
+		throw InternalErr(__FILE__, __LINE__, "Could not write AsynchronousResponse element");
+	if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "status", (const xmlChar *) "required") < 0)
+		throw InternalErr(__FILE__, __LINE__, "Could not write attribute for 'status'");
+
+
+	// ------ expectedDelay Element and Attributes
+	if (xmlTextWriterStartElement(xml.get_writer(), (const xmlChar*) "dap:expectedDelay") < 0)
+		throw InternalErr(__FILE__, __LINE__, "Could not write expectedDelay element");
+	ostringstream oss;
+	oss << expectedDelay;
+	if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "seconds", (const xmlChar*) oss.str().c_str()) < 0)
+		throw InternalErr(__FILE__, __LINE__, "Could not write attribute for 'status'");
+	if (xmlTextWriterEndElement(xml.get_writer()) < 0)
+		throw InternalErr(__FILE__, __LINE__, "Could not end expectedDelay element");
+	// ------ expectedDelay Element and Attributes - END
+
+
+	// ------ responseLifetime Element and Attributes
+	if (xmlTextWriterStartElement(xml.get_writer(), (const xmlChar*) "dap:responseLifetime") < 0)
+		throw InternalErr(__FILE__, __LINE__, "Could not write expectedDelay element");
+	ostringstream oss2;
+	oss2 << responseLifetime;
+	if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "seconds", (const xmlChar*) oss2.str().c_str()) < 0)
+		throw InternalErr(__FILE__, __LINE__, "Could not write attribute for 'seconds'");
+	if (xmlTextWriterEndElement(xml.get_writer()) < 0)
+		throw InternalErr(__FILE__, __LINE__, "Could not end responseLifetime element");
+	// ------ responseLifetime Element and Attributes - END
+
+
+	if (xmlTextWriterEndElement(xml.get_writer()) < 0)
+		throw InternalErr(__FILE__, __LINE__, "Could not end AsynchronousResponse element");
+	// ------ AsynchronousResponse Element and Attributes - END
+}
+
+
+/**
+ * @brief Print the AsyncRequired response to the.
+ * Print the AsyncRequired in XML form.
+ * @param xml Print to this XMLWriter instance
+ */
+void D4AsyncUtil::writeD4AsyncAccepted(XMLWriter &xml, long expectedDelay, long responseLifetime, string asyncResourceUrl, string *stylesheet_ref)  {
+
+	// ------ AsynchronousResponse Element and Attributes - BEGIN
+	DapXmlNamspaces dapns;
+
+	if(stylesheet_ref){
+		string href = "href='" + *stylesheet_ref +"'";
+		if(xmlTextWriterStartPI(xml.get_writer(), (const xmlChar*) "xml-stylesheet") < 0)
+			throw InternalErr(__FILE__, __LINE__, "Could not start XML Processing Instruction.");
+		if(xmlTextWriterWriteString(xml.get_writer(), (const xmlChar*) "type='text/xsl'") < 0)
+			throw InternalErr(__FILE__, __LINE__, "Could not write Processing Instruction content.");
+		if(xmlTextWriterWriteString(xml.get_writer(), (const xmlChar*) " ") < 0)
+			throw InternalErr(__FILE__, __LINE__, "Could not write Processing Instruction content.");
+		if(xmlTextWriterWriteString(xml.get_writer(), (const xmlChar*) href.c_str()) < 0)
+			throw InternalErr(__FILE__, __LINE__, "Could not write Processing Instruction content.");
+		if(xmlTextWriterEndPI(xml.get_writer()) < 0)
+			throw InternalErr(__FILE__, __LINE__, "Could not Close XML Processing Instruction.");
+	}
+
+	if (xmlTextWriterStartElementNS(xml.get_writer(),
+			(const xmlChar*)"dap",
+			(const xmlChar*) "AsynchronousResponse",
+			(const xmlChar*) dapns.getDapNamespaceString(DAP_4_0).c_str()) < 0)
+		throw InternalErr(__FILE__, __LINE__, "Could not write AsynchronousResponse element");
+	if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "status", (const xmlChar *) "accepted") < 0)
+		throw InternalErr(__FILE__, __LINE__, "Could not write attribute for 'status'");
+
+
+	// ------ expectedDelay Element and Attributes
+	if (xmlTextWriterStartElement(xml.get_writer(), (const xmlChar*) "dap:expectedDelay") < 0)
+		throw InternalErr(__FILE__, __LINE__, "Could not write expectedDelay element");
+	ostringstream oss;
+	oss << expectedDelay;
+	if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "seconds", (const xmlChar*) oss.str().c_str()) < 0)
+		throw InternalErr(__FILE__, __LINE__, "Could not write attribute for 'seconds'");
+	if (xmlTextWriterEndElement(xml.get_writer()) < 0)
+		throw InternalErr(__FILE__, __LINE__, "Could not end expectedDelay element");
+	// ------ expectedDelay Element and Attributes - END
+
+
+	// ------ responseLifetime Element and Attributes
+	if (xmlTextWriterStartElement(xml.get_writer(), (const xmlChar*) "dap:responseLifetime") < 0)
+		throw InternalErr(__FILE__, __LINE__, "Could not write expectedDelay element");
+	ostringstream oss2;
+	oss2 << responseLifetime;
+	if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "seconds", (const xmlChar*) oss2.str().c_str()) < 0)
+		throw InternalErr(__FILE__, __LINE__, "Could not write attribute for 'seconds'");
+	if (xmlTextWriterEndElement(xml.get_writer()) < 0)
+		throw InternalErr(__FILE__, __LINE__, "Could not end responseLifetime element");
+	// ------ responseLifetime Element and Attributes - END
+
+
+	// ------ link Element and Attributes
+	if (xmlTextWriterStartElement(xml.get_writer(), (const xmlChar*) "dap:link") < 0)
+		throw InternalErr(__FILE__, __LINE__, "Could not write expectedDelay element");
+
+	if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "href", (const xmlChar*) asyncResourceUrl.c_str()) < 0)
+		throw InternalErr(__FILE__, __LINE__, "Could not write attribute for 'href'");
+	if (xmlTextWriterEndElement(xml.get_writer()) < 0)
+		throw InternalErr(__FILE__, __LINE__, "Could not end link element");
+	// ------ link Element and Attributes - END
+
+
+	if (xmlTextWriterEndElement(xml.get_writer()) < 0)
+		throw InternalErr(__FILE__, __LINE__, "Could not end AsynchronousResponse element");
+	// ------ AsynchronousResponse Element and Attributes - END
+}
+
+/**
+ * @brief Print the AsyncRequired response to the.
+ * Print the AsyncRequired in XML form.
+ * @param xml Print to this XMLWriter instance
+ */
+void D4AsyncUtil::writeD4AsyncPending(XMLWriter &xml, string *stylesheet_ref)  {
+
+	// ------ AsynchronousResponse Element and Attributes - BEGIN
+	DapXmlNamspaces dapns;
+
+
+	if(stylesheet_ref){
+		string href = "href='" + *stylesheet_ref +"'";
+		if(xmlTextWriterStartPI(xml.get_writer(), (const xmlChar*) "xml-stylesheet") < 0)
+			throw InternalErr(__FILE__, __LINE__, "Could not start XML Processing Instruction.");
+		if(xmlTextWriterWriteString(xml.get_writer(), (const xmlChar*) "type='text/xsl'") < 0)
+			throw InternalErr(__FILE__, __LINE__, "Could not write Processing Instruction content.");
+		if(xmlTextWriterWriteString(xml.get_writer(), (const xmlChar*) " ") < 0)
+			throw InternalErr(__FILE__, __LINE__, "Could not write Processing Instruction content.");
+		if(xmlTextWriterWriteString(xml.get_writer(), (const xmlChar*) href.c_str()) < 0)
+			throw InternalErr(__FILE__, __LINE__, "Could not write Processing Instruction content.");
+		if(xmlTextWriterEndPI(xml.get_writer()) < 0)
+			throw InternalErr(__FILE__, __LINE__, "Could not Close XML Processing Instruction.");
+	}
+
+	if (xmlTextWriterStartElementNS(xml.get_writer(),
+			(const xmlChar*)"dap",
+			(const xmlChar*) "AsynchronousResponse",
+			(const xmlChar*) dapns.getDapNamespaceString(DAP_4_0).c_str()) < 0)
+		throw InternalErr(__FILE__, __LINE__, "Could not write AsynchronousResponse element");
+	if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "status", (const xmlChar *) "pending") < 0)
+		throw InternalErr(__FILE__, __LINE__, "Could not write attribute for 'status'");
+
+	if (xmlTextWriterEndElement(xml.get_writer()) < 0)
+		throw InternalErr(__FILE__, __LINE__, "Could not end AsynchronousResponse element");
+	// ------ AsynchronousResponse Element and Attributes - END
+}
+
+
+/**
+ * @brief Print the AsyncRequired response to the.
+ * Print the AsyncRequired in XML form.
+ * @param xml Print to this XMLWriter instance
+ */
+void D4AsyncUtil::writeD4AsyncResponseGone(XMLWriter &xml, string *stylesheet_ref)  {
+
+	// ------ AsynchronousResponse Element and Attributes - BEGIN
+	DapXmlNamspaces dapns;
+
+
+	if(stylesheet_ref){
+		string href = "href='" + *stylesheet_ref +"'";
+		if(xmlTextWriterStartPI(xml.get_writer(), (const xmlChar*) "xml-stylesheet") < 0)
+			throw InternalErr(__FILE__, __LINE__, "Could not start XML Processing Instruction.");
+		if(xmlTextWriterWriteString(xml.get_writer(), (const xmlChar*) "type='text/xsl'") < 0)
+			throw InternalErr(__FILE__, __LINE__, "Could not write Processing Instruction content.");
+		if(xmlTextWriterWriteString(xml.get_writer(), (const xmlChar*) " ") < 0)
+			throw InternalErr(__FILE__, __LINE__, "Could not write Processing Instruction content.");
+		if(xmlTextWriterWriteString(xml.get_writer(), (const xmlChar*) href.c_str()) < 0)
+			throw InternalErr(__FILE__, __LINE__, "Could not write Processing Instruction content.");
+		if(xmlTextWriterEndPI(xml.get_writer()) < 0)
+			throw InternalErr(__FILE__, __LINE__, "Could not Close XML Processing Instruction.");
+	}
+
+	if (xmlTextWriterStartElementNS(xml.get_writer(),
+			(const xmlChar*)"dap",
+			(const xmlChar*) "AsynchronousResponse",
+			(const xmlChar*) dapns.getDapNamespaceString(DAP_4_0).c_str()) < 0)
+		throw InternalErr(__FILE__, __LINE__, "Could not write AsynchronousResponse element");
+	if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "status", (const xmlChar *) "gone") < 0)
+		throw InternalErr(__FILE__, __LINE__, "Could not write attribute for 'status'");
+
+	if (xmlTextWriterEndElement(xml.get_writer()) < 0)
+		throw InternalErr(__FILE__, __LINE__, "Could not end AsynchronousResponse element");
+	// ------ AsynchronousResponse Element and Attributes - END
+}
+
+
+/**
+ * @brief Print the AsyncRequired response to the.
+ * Print the AsyncRequired in XML form.
+ * @param xml Print to this XMLWriter instance
+ */
+void D4AsyncUtil::writeD4AsyncResponseRejected(XMLWriter &xml, RejectReasonCode code, string description, string *stylesheet_ref) {
+
+	// ------ AsynchronousResponse Element and Attributes - BEGIN
+	DapXmlNamspaces dapns;
+
+
+	if(stylesheet_ref){
+		string href = "href='" + *stylesheet_ref +"'";
+		if(xmlTextWriterStartPI(xml.get_writer(), (const xmlChar*) "xml-stylesheet") < 0)
+			throw InternalErr(__FILE__, __LINE__, "Could not start XML Processing Instruction.");
+		if(xmlTextWriterWriteString(xml.get_writer(), (const xmlChar*) "type='text/xsl'") < 0)
+			throw InternalErr(__FILE__, __LINE__, "Could not write Processing Instruction content.");
+		if(xmlTextWriterWriteString(xml.get_writer(), (const xmlChar*) " ") < 0)
+			throw InternalErr(__FILE__, __LINE__, "Could not write Processing Instruction content.");
+		if(xmlTextWriterWriteString(xml.get_writer(), (const xmlChar*) href.c_str()) < 0)
+			throw InternalErr(__FILE__, __LINE__, "Could not write Processing Instruction content.");
+		if(xmlTextWriterEndPI(xml.get_writer()) < 0)
+			throw InternalErr(__FILE__, __LINE__, "Could not Close XML Processing Instruction.");
+	}
+
+	if (xmlTextWriterStartElementNS(xml.get_writer(),
+			(const xmlChar*)"dap",
+			(const xmlChar*) "AsynchronousResponse",
+			(const xmlChar*) dapns.getDapNamespaceString(DAP_4_0).c_str()) < 0)
+		throw InternalErr(__FILE__, __LINE__, "Could not write AsynchronousResponse element");
+	if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "status", (const xmlChar *) "rejected") < 0)
+		throw InternalErr(__FILE__, __LINE__, "Could not write attribute for 'status'");
+
+	// ------ reason Element and Attributes
+	if (xmlTextWriterStartElement(xml.get_writer(), (const xmlChar*) "dap:reason") < 0)
+		throw InternalErr(__FILE__, __LINE__, "Could not write reason element");
+	if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "code", (const xmlChar*) getRejectReasonCodeString(code).c_str()) < 0)
+		throw InternalErr(__FILE__, __LINE__, "Could not write attribute for 'code'");
+	if (xmlTextWriterEndElement(xml.get_writer()) < 0)
+		throw InternalErr(__FILE__, __LINE__, "Could not end reason element");
+	// ------ reason Element and Attributes - END
+
+
+	// ------ description Element and Attributes
+	if (xmlTextWriterWriteElement(xml.get_writer(), (const xmlChar*) "dap:description", (const xmlChar*) description.c_str()) < 0)
+		throw InternalErr(__FILE__, __LINE__, "Could not write description element");
+
+	// ------ description Element and Attributes - END
+
+	if (xmlTextWriterEndElement(xml.get_writer()) < 0)
+		throw InternalErr(__FILE__, __LINE__, "Could not end AsynchronousResponse element");
+	// ------ AsynchronousResponse Element and Attributes - END
+
+
+}
+
+string D4AsyncUtil::getRejectReasonCodeString(RejectReasonCode code){
+
+	string codeStr;
+	switch(code){
+	case TIME:
+		codeStr = "time";
+		break;
+
+	case UNAVAILABLE:
+		codeStr = "unavailable";
+		break;
+
+	case PRIVILEGES:
+		codeStr = "privileges";
+		break;
+
+	case OTHER:
+		codeStr = "other";
+		break;
+
+	default:
+		throw InternalErr(__FILE__, __LINE__, "D4AsyncUtil::getRejectReasonCodeString() - Unrecognized reject_reason_code.");
+		break;
+
+	}
+	return codeStr;
+}
+
+// Unused paramters generate warnings, so I removed/commented them below. jhrg 3/12/14
+void D4AsyncUtil::writeD2AsyncRequired(XMLWriter &/*xml*/, long /*expectedDelay*/, long /*responseLifetime*/)  {
+	throw InternalErr(__FILE__, __LINE__, "DAP2 Doesn't handle Async.");
+}
+
+void D4AsyncUtil::writeD2AsyncAccepted(XMLWriter &, long , long , string /*asyncResourceUrl*/)  {
+	throw InternalErr(__FILE__, __LINE__, "DAP2 Doesn't handle Async.");
+}
+
+
+void D4AsyncUtil::writeD2AsyncPending(XMLWriter &)  {
+	throw InternalErr(__FILE__, __LINE__, "DAP2 Doesn't handle Async.");
+}
+
+void D4AsyncUtil::writeD2AsyncResponseGone(XMLWriter &)  {
+	throw InternalErr(__FILE__, __LINE__, "DAP2 Doesn't handle Async.");
+}
+
+void D4AsyncUtil::writeD2AsyncResponseRejected(XMLWriter &, RejectReasonCode /*code*/, string /*description*/)  {
+	throw InternalErr(__FILE__, __LINE__, "DAP2 Doesn't handle Async.");
+}
+
+} /* namespace libdap */
diff --git a/D4AsyncUtil.h b/D4AsyncUtil.h
new file mode 100644
index 0000000..f31f0f9
--- /dev/null
+++ b/D4AsyncUtil.h
@@ -0,0 +1,86 @@
+/*
+ * D4AsyncUtil.h
+ *
+ *  Created on: Feb 18, 2014
+ *      Author: ndp
+ */
+
+#ifndef D4ASYNCUTIL_H_
+#define D4ASYNCUTIL_H_
+
+#include "XMLWriter.h"
+
+namespace libdap {
+
+
+enum RejectReasonCode { TIME, UNAVAILABLE, PRIVILEGES, OTHER };
+
+
+class D4AsyncUtil {
+private:
+#if 0
+    // Not used
+	string *d_stylesheet_ref;
+#endif
+
+public:
+	D4AsyncUtil();
+	virtual ~D4AsyncUtil();
+
+	const static string STYLESHEET_REFERENCE_KEY;
+
+
+	/**
+	 * @brief Write the DAP4 AsyncRequired response.
+	 * Print the AsyncRequired in XML form.
+	 * @param xml Print to this XMLWriter instance
+	 */
+	void writeD4AsyncRequired(XMLWriter &xml, long expectedDelay, long responseLifetime, string *stylesheet_ref=0);
+
+
+	/**
+	 * @brief Write the DAP4 AsyncAccepted response.
+	 * Write the AsyncAccepted in XML form.
+	 * @param xml Print to this XMLWriter instance
+	 */
+	void writeD4AsyncAccepted(XMLWriter &xml, long expectedDelay, long responseLifetime, string asyncResourceUrl, string *stylesheet_ref=0);
+
+	/**
+	 * @brief Write the DAP4 AsyncPending response.
+	 * Write the DAP4 AsyncPending in XML form.
+	 * @param xml Print to this XMLWriter instance
+	 */
+	void writeD4AsyncPending(XMLWriter &xml, string *stylesheet_ref=0);
+
+
+	/**
+	 * @brief Write the DAP4 AsyncResponseGone response.
+	 * Write the DAP4 AsyncRequired in XML form.
+	 * @param xml Print to this XMLWriter instance
+	 */
+	void writeD4AsyncResponseGone(XMLWriter &xml, string *stylesheet_ref=0);
+
+	/**
+	 * @brief Write the DAP4 ResponseRejected response.
+	 * Write the DAP4 AsyncRequired in XML form.
+	 * @param xml Print to this XMLWriter instance
+	 */
+	void writeD4AsyncResponseRejected(XMLWriter &xml, RejectReasonCode code, string description, string *stylesheet_ref=0);
+	string getRejectReasonCodeString(RejectReasonCode code);
+
+	/**
+	 * @brief Write the DAP2 AsyncRequired response .
+	 * Write the DAP2 AsyncRequired in XML form.
+	 * @param xml Print to this XMLWriter instance
+	 */
+	void writeD2AsyncRequired(XMLWriter &xml, long expectedDelay, long responseLifetime);
+	void writeD2AsyncAccepted(XMLWriter &xml, long expectedDelay, long responseLifetime, string asyncResourceUrl);
+	void writeD2AsyncPending(XMLWriter &xml);
+	void writeD2AsyncResponseGone(XMLWriter &xml);
+	void writeD2AsyncResponseRejected(XMLWriter &xml, RejectReasonCode code, string description);
+
+
+};
+
+} /* namespace libdap */
+#endif /* D4ASYNCUTIL_H_ */
diff --git a/D4AttributeType.h b/D4AttributeType.h
new file mode 100644
index 0000000..80960cf
--- /dev/null
+++ b/D4AttributeType.h
@@ -0,0 +1,67 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2013 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#ifndef d4attributetype_h
+#define d4attributetype_h
+
+/** D4AttributeType identifies the data type stored in a particular attribute
+
+    @see D4Attributes
+*/
+
+enum D4AttributeType {
+    attr_null_c,
+
+    attr_byte_c,
+    attr_int16_c,
+    attr_uint16_c,
+    attr_int32_c,  // Added `attr_' to fix clash with IRIX 5.3.
+    attr_uint32_c,
+    attr_float32_c,
+    attr_float64_c,
+    attr_str_c,
+    attr_url_c,
+
+    // Added for DAP4
+    attr_int8_c,
+    attr_uint8_c,
+
+    attr_int64_c,
+    attr_uint64_c,
+
+#if 0
+    // just use attr_url_c. jhrg 8/15/13
+    attr_url4_c,
+#endif
+
+    attr_enum_c,
+    attr_opaque_c,
+
+    // These are specific to attributes while the other types are
+    // also supported by the variables. jhrg 4/17/13
+    attr_container_c,
+    attr_otherxml_c
+};
+
+#endif /* d4attributetype_h */
diff --git a/D4Attributes.cc b/D4Attributes.cc
new file mode 100644
index 0000000..11c2507
--- /dev/null
+++ b/D4Attributes.cc
@@ -0,0 +1,516 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2013 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#include "config.h"
+
+//#define DODS_DEBUG
+
+#include "D4Attributes.h"
+#include "D4AttributeType.h"
+#include "InternalErr.h"
+
+#include "AttrTable.h"
+
+#include "util.h"
+#include "debug.h"
+
+namespace libdap {
+
+/** Convert an AttrType to it's string representation.
+ @param at The Attribute Type.
+ @return The type's string representation */
+string D4AttributeTypeToString(D4AttributeType at)
+{
+    switch(at) {
+    case attr_null_c:
+        return "null";
+
+    case attr_byte_c:
+        return "Byte";
+
+    case attr_int16_c:
+        return "Int16";
+
+    case attr_uint16_c:
+        return "UInt16";
+
+    case attr_int32_c:
+        return "Int32";
+
+    case attr_uint32_c:
+        return "UInt32";
+
+    case attr_float32_c:
+        return "Float32";
+
+    case attr_float64_c:
+        return "Float64";
+
+    case attr_str_c:
+        return "String";
+
+    case attr_url_c:
+        return "Url";
+
+        // Added for DAP4
+    case attr_int8_c:
+        return "Int8";
+
+    case attr_uint8_c:
+        return "UInt8";
+
+    case attr_int64_c:
+        return "Int64";
+
+    case attr_uint64_c:
+        return "UInt64";
+
+    case attr_enum_c:
+        return "Enum";
+
+    case attr_opaque_c:
+        return "Opaque";
+
+        // These are specific to attributes while the other types are
+        // also supported by the variables. jhrg 4/17/13
+    case attr_container_c:
+        return "Container";
+
+    case attr_otherxml_c:
+        return "OtherXML";
+
+    default:
+        throw InternalErr(__FILE__, __LINE__, "Unsupported attribute type");
+    }
+}
+
+D4AttributeType StringToD4AttributeType(string s)
+{
+    downcase(s);
+
+    if (s == "container")
+        return attr_container_c;
+
+    else if (s == "byte")
+        return attr_byte_c;
+    else if (s == "int8")
+        return attr_int8_c;
+    else if (s == "uint8")
+        return attr_uint8_c;
+    else if (s == "int16")
+        return attr_int16_c;
+    else if (s == "uint16")
+        return attr_uint16_c;
+    else if (s == "int32")
+        return attr_int32_c;
+    else if (s == "uint32")
+        return attr_uint32_c;
+    else if (s == "int64")
+        return attr_int64_c;
+    else if (s == "uint64")
+        return attr_uint64_c;
+
+    else if (s == "float32")
+        return attr_float32_c;
+    else if (s == "float64")
+        return attr_float64_c;
+
+    else if (s == "string")
+        return attr_str_c;
+    else if (s == "url")
+        return attr_url_c;
+    else if (s == "otherxml")
+        return attr_otherxml_c;
+    else
+        return attr_null_c;
+}
+
+void
+D4Attribute::m_duplicate(const D4Attribute &src)
+{
+    d_name = src.d_name;
+    d_type = src.d_type;
+    d_values = src.d_values;
+    if (src.d_attributes)
+        d_attributes = new D4Attributes(*src.d_attributes);
+    else
+        d_attributes = 0;
+}
+
+D4Attribute::D4Attribute(const D4Attribute &src)
+{
+    m_duplicate(src);
+}
+
+D4Attribute::~D4Attribute()
+{
+    delete d_attributes;
+}
+
+D4Attribute &
+D4Attribute::operator=(const D4Attribute &rhs)
+{
+    if (this == &rhs) return *this;
+    m_duplicate(rhs);
+    return *this;
+}
+
+D4Attributes *
+D4Attribute::attributes()
+{
+    if (!d_attributes) d_attributes = new D4Attributes();
+    return d_attributes;
+}
+
+/** @brief copy attributes from DAP2 to DAP4
+ *
+ * Given a DAP2 AttrTable, copy all of its attributes into
+ * this DAP4 D4Attributes object as D4Attribute object instances.
+ *
+ *
+ * @param at Read the DAP2 attributes from here.
+ */
+void
+D4Attributes::transform_to_dap4(AttrTable &at)
+{
+    // for every attribute in at, copy it to this.
+    for (AttrTable::Attr_iter i = at.attr_begin(), e = at.attr_end(); i != e; ++i) {
+        string name = at.get_name(i);
+        AttrType type = at.get_attr_type(i);
+
+        switch (type) {
+        case Attr_container: {
+            D4Attribute *a = new D4Attribute(name, attr_container_c);
+            D4Attributes *attributes = a->attributes(); // allocates a new object
+            attributes->transform_to_dap4(*at.get_attr_table(i));
+            add_attribute_nocopy(a);
+            break;
+        }
+        case Attr_byte: {
+            D4Attribute *a = new D4Attribute(name, attr_byte_c);
+            a->add_value_vector(*at.get_attr_vector(i));
+            add_attribute_nocopy(a);
+            break;
+        }
+        case Attr_int16: {
+            D4Attribute *a = new D4Attribute(name, attr_int16_c);
+            a->add_value_vector(*at.get_attr_vector(i));
+            add_attribute_nocopy(a);
+            break;
+        }
+        case Attr_uint16: {
+            D4Attribute *a = new D4Attribute(name, attr_uint16_c);
+            a->add_value_vector(*at.get_attr_vector(i));
+            add_attribute_nocopy(a);
+            break;
+        }
+        case Attr_int32: {
+            D4Attribute *a = new D4Attribute(name, attr_int32_c);
+            a->add_value_vector(*at.get_attr_vector(i));
+            add_attribute_nocopy(a);
+            break;
+        }
+        case Attr_uint32: {
+            D4Attribute *a = new D4Attribute(name, attr_uint32_c);
+            a->add_value_vector(*at.get_attr_vector(i));
+            add_attribute_nocopy(a);
+            break;
+        }
+        case Attr_float32: {
+            D4Attribute *a = new D4Attribute(name, attr_float32_c);
+            a->add_value_vector(*at.get_attr_vector(i));
+            add_attribute_nocopy(a);
+            break;
+        }
+        case Attr_float64: {
+            D4Attribute *a = new D4Attribute(name, attr_float64_c);
+            a->add_value_vector(*at.get_attr_vector(i));
+            add_attribute_nocopy(a);
+            break;
+        }
+        case Attr_string: {
+            D4Attribute *a = new D4Attribute(name, attr_str_c);
+            a->add_value_vector(*at.get_attr_vector(i));
+            add_attribute_nocopy(a);
+            break;
+        }
+        case Attr_url: {
+            D4Attribute *a = new D4Attribute(name, attr_url_c);
+            a->add_value_vector(*at.get_attr_vector(i));
+            add_attribute_nocopy(a);
+            break;
+        }
+        case Attr_other_xml: {
+            D4Attribute *a = new D4Attribute(name, attr_otherxml_c);
+            a->add_value_vector(*at.get_attr_vector(i));
+            add_attribute_nocopy(a);
+            break;
+        }
+        default:
+            throw InternalErr(__FILE__, __LINE__, "Unknown DAP2 attribute type in D4Attributes::copy_from_dap2()");
+        }
+    }
+}
+
+
+AttrType get_dap2_AttrType(D4AttributeType d4_type){
+    switch (d4_type) {
+    case attr_container_c: { return Attr_container; }
+    case attr_byte_c:      { return Attr_byte; }
+    case attr_int16_c:     { return Attr_int16; }
+    case attr_uint16_c:    { return Attr_uint16; }
+    case attr_int32_c:     { return Attr_int32; }
+    case attr_uint32_c:    { return Attr_uint32; }
+    case attr_float32_c:   { return Attr_float32; }
+    case attr_float64_c:   { return Attr_float64; }
+    case attr_str_c:       { return Attr_string; }
+    case attr_url_c:       { return Attr_url; }
+    case attr_otherxml_c:  { return Attr_other_xml; }
+    default:
+        throw InternalErr(__FILE__, __LINE__, "Unknown DAP4 attribute");
+    }
+}
+
+
+void
+D4Attributes::load_AttrTable(AttrTable *d2_attr_table, D4Attributes *d4_attrs)
+{
+   //  cerr << __func__ << "() - Loading attribute table: '" << d2_attr_table->get_name() << "'  addr: " << (void *)d2_attr_table << endl;
+
+    // for every attribute in at, copy it to this.
+    for ( D4Attributes::D4AttributesIter i = d4_attrs->attribute_begin(), e = d4_attrs->attribute_end(); i != e; ++i) {
+        string name = (*i)->name();
+        D4AttributeType d4_attr_type = (*i)->type();
+        AttrType d2_attr_type = get_dap2_AttrType(d4_attr_type);
+        string d2_attr_type_name = AttrType_to_String(d2_attr_type);
+
+        D4Attribute::D4AttributeIter vitr =(*i)->value_begin();
+        D4Attribute::D4AttributeIter end =(*i)->value_end();
+
+        vector<string> values;
+        for(;vitr!=end; vitr++){
+            values.push_back((*vitr));
+        }
+
+        switch (d4_attr_type) {
+        case attr_container_c: {
+            // Attr_container
+            AttrTable *child_attr_table = new AttrTable();
+            child_attr_table->set_name(name);
+            // cerr << __func__ << "() - Created child attribute table: " << name << " addr: " << (void *)child_attr_table << endl;
+            load_AttrTable(child_attr_table,(*i)->attributes());
+            d2_attr_table->append_container(child_attr_table,name);
+            break;
+        }
+        default:{
+            // cerr << __func__ << "() - "<< name << " has " << values.size() << " value(s). d2_attr_type_name: " << d2_attr_type_name << endl;
+            d2_attr_table->append_attr(name,d2_attr_type_name, &values);
+            break;
+        }
+        }
+    }
+}
+
+
+/** @brief copy attributes from DAP4 to DAP2
+ *
+ * Given a DAP4 AttrTable, copy all of its attributes into a DAP4 D4Attributes
+ * object.
+ *
+ * @param at Read the DAP2 attributes from here.
+ */
+AttrTable *D4Attributes::get_AttrTable(const string name)
+{
+    AttrTable *my_pretty_pony = new AttrTable();
+    load_AttrTable(my_pretty_pony, this);
+    my_pretty_pony->set_name(name);
+    return my_pretty_pony;
+}
+
+
+D4Attribute *
+D4Attributes::find_depth_first(const string &name, D4AttributesIter i)
+{
+    if (i == attribute_end())
+        return 0;
+    else if ((*i)->name() == name)
+        return *i;
+    else if ((*i)->type() == attr_container_c)
+        return find_depth_first(name, (*i)->attributes()->attribute_begin());
+    else
+        return find_depth_first(name, ++i);
+}
+
+D4Attribute *
+D4Attributes::find(const string &name)
+{
+    return find_depth_first(name, attribute_begin());
+}
+
+/** Return a pointer to the D4Attribute object that has the given FQN.
+ * @note A FQN for an attribute is a series of names separated by dots.
+ */
+D4Attribute *
+D4Attributes::get(const string &fqn)
+{
+    // name1.name2.name3
+    // name1
+    // name1.name2
+    size_t pos = fqn.find('.');
+    string part = fqn.substr(0, pos);
+    string rest= "";
+
+    if (pos != string::npos)
+        rest = fqn.substr(pos + 1);
+
+    DBG(cerr << "part: '" << part << "'; rest: '" << rest << "'" << endl);
+
+    if (!part.empty()) {
+        if (!rest.empty()) {
+            D4AttributesIter i = attribute_begin();
+            while (i != attribute_end()) {
+                if ((*i)->name() == part && (*i)->type() == attr_container_c)
+                    return (*i)->attributes()->get(rest);
+                ++i;
+            }
+        }
+        else {
+            D4AttributesIter i = attribute_begin();
+            while (i != attribute_end()) {
+                if ((*i)->name() == part)
+                    return (*i);
+                ++i;
+            }
+        }
+    }
+
+    return 0;
+}
+
+void
+D4Attribute::print_dap4(XMLWriter &xml) const
+{
+    if (xmlTextWriterStartElement(xml.get_writer(), (const xmlChar*) "Attribute") < 0)
+        throw InternalErr(__FILE__, __LINE__, "Could not write Attribute element");
+    if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "name", (const xmlChar*)name().c_str()) < 0)
+        throw InternalErr(__FILE__, __LINE__, "Could not write attribute for name");
+    if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "type", (const xmlChar*) D4AttributeTypeToString(type()).c_str()) < 0)
+        throw InternalErr(__FILE__, __LINE__, "Could not write attribute for type");
+
+    switch (type()) {
+    case attr_container_c:
+        if (!d_attributes)
+            throw InternalErr(__FILE__, __LINE__, "Null Attribute container");
+        d_attributes->print_dap4(xml);
+        break;
+
+    case attr_otherxml_c:
+        if (num_values() != 1)
+            throw Error("OtherXML attributes cannot be vector-valued.");
+        if (xmlTextWriterWriteRaw(xml.get_writer(), (const xmlChar*) value(0).c_str()) < 0)
+            throw InternalErr(__FILE__, __LINE__, "Could not write OtherXML value");
+        break;
+
+    default: {
+        // Assume only valid types make it into instances
+        D4AttributeCIter i = d_values.begin();//value_begin();
+        while (i != d_values.end()) {
+            if (xmlTextWriterStartElement(xml.get_writer(), (const xmlChar*) "Value") < 0)
+                throw InternalErr(__FILE__, __LINE__, "Could not write value element");
+
+            if (xmlTextWriterWriteString(xml.get_writer(), (const xmlChar*) (*i++).c_str()) < 0)
+                throw InternalErr(__FILE__, __LINE__, "Could not write attribute value");
+
+            if (xmlTextWriterEndElement(xml.get_writer()) < 0)
+                throw InternalErr(__FILE__, __LINE__, "Could not end value element");
+        }
+
+        break;
+    }
+    }
+
+    if (xmlTextWriterEndElement(xml.get_writer()) < 0)
+        throw InternalErr(__FILE__, __LINE__, "Could not end Attribute element");
+}
+
+/** @brief dumps information about this object
+ *
+ * Displays the pointer value of this instance and then displays information
+ * about this base type.
+ *
+ * @param strm C++ i/o stream to dump the information to
+ * @return void
+ */
+void
+D4Attribute::dump(ostream &strm) const
+{
+    strm << DapIndent::LMarg << "D4Attribute::dump - (" << (void *)this << ")" << endl;
+
+    DapIndent::Indent() ;
+
+    XMLWriter xml;
+    print_dap4(xml);
+    strm << DapIndent::LMarg << xml.get_doc() << flush;
+
+    DapIndent::UnIndent() ;
+}
+
+
+void
+D4Attributes::print_dap4(XMLWriter &xml) const
+{
+    if (empty())
+        return;
+
+    D4AttributesCIter i = d_attrs.begin();
+    while (i != d_attrs.end()) {
+        (*i++)->print_dap4(xml);
+    }
+}
+
+/** @brief dumps information about this object
+ *
+ * Displays the pointer value of this instance and then displays information
+ * about this base type.
+ *
+ * @param strm C++ i/o stream to dump the information to
+ * @return void
+ */
+void
+D4Attributes::dump(ostream &strm) const
+{
+    strm << DapIndent::LMarg << "D4Attributes::dump - (" << (void *)this << ")" << endl;
+
+    DapIndent::Indent() ;
+
+    XMLWriter xml;
+    print_dap4(xml);
+    strm << DapIndent::LMarg << xml.get_doc() << flush;
+
+    DapIndent::UnIndent() ;
+}
+
+
+} // namespace libdap
+
diff --git a/D4Attributes.h b/D4Attributes.h
new file mode 100644
index 0000000..a543eb6
--- /dev/null
+++ b/D4Attributes.h
@@ -0,0 +1,169 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2013 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#ifndef _d4attributes_h
+#define _d4attributes_h 1
+
+#include <string>
+#include <vector>
+
+#include "DapObj.h"
+#include "D4AttributeType.h"
+#include "XMLWriter.h"
+
+using namespace std;
+
+namespace libdap
+{
+
+class AttrTable;
+class D4Attributes;
+
+class D4Attribute : public DapObj {
+    string d_name;
+    D4AttributeType d_type;    // Attributes are limited to the simple types
+
+    // If d_type is attr_container_c is true, use d_attributes to read
+    // the contained attributes, otherwise use d_values to read the vector
+    // of values.
+    D4Attributes *d_attributes;
+
+    // IF d_type is attr_otherxml_c, the first string in d_values holds the
+    // XML, otherwise, the strings hold attributes of type d_type.
+    vector<string> d_values;
+
+    // perform a deep copy
+    void m_duplicate(const D4Attribute &src);
+
+public:
+    typedef vector<string>::iterator D4AttributeIter;
+    typedef vector<string>::const_iterator D4AttributeCIter;
+
+    D4Attribute() : d_name(""), d_type(attr_null_c), d_attributes(0) {}
+    D4Attribute(const string &name, D4AttributeType type)
+        : d_name(name), d_type(type), d_attributes(0) {}
+
+    D4Attribute(const D4Attribute &src);
+    ~D4Attribute();
+    D4Attribute &operator=(const D4Attribute &rhs);
+
+    string name() const { return d_name; }
+    void set_name(const string &name) { d_name = name; }
+
+    D4AttributeType type() const { return d_type; }
+    void set_type(D4AttributeType type) { d_type = type; }
+
+    void add_value(const string &value) { d_values.push_back(value); }
+    void add_value_vector(const vector<string> &values) { d_values = values; }
+
+    D4AttributeIter value_begin() { return d_values.begin(); }
+    D4AttributeIter value_end() { return d_values.end(); }
+
+    unsigned int num_values() const { return d_values.size(); }
+    string value(unsigned int i) const { return d_values[i]; }
+
+    D4Attributes *attributes();
+
+    void print_dap4(XMLWriter &xml) const;
+
+    virtual void dump(ostream &strm) const;
+};
+
+class D4Attributes : public DapObj {
+public:
+    typedef vector<D4Attribute*>::iterator D4AttributesIter;
+    typedef vector<D4Attribute*>::const_iterator D4AttributesCIter;
+
+private:
+    vector<D4Attribute*> d_attrs;
+
+    void m_duplicate(const D4Attributes &src) {
+        D4AttributesCIter i = src.d_attrs.begin();
+        while (i != src.d_attrs.end()) {
+            d_attrs.push_back(new D4Attribute(**i++));    // deep copy
+        }
+    }
+
+    D4Attribute *find_depth_first(const string &name, D4AttributesIter i);
+
+public:
+
+    D4Attributes() {}
+    D4Attributes(const D4Attributes &rhs) {
+        m_duplicate(rhs);
+    }
+
+    virtual ~D4Attributes() {
+        D4AttributesIter i = d_attrs.begin();
+        while(i != d_attrs.end()) {
+            delete *i++;
+        }
+    }
+
+    D4Attributes &operator=(const D4Attributes &rhs) {
+        if (this == &rhs) return *this;
+        m_duplicate(rhs);
+        return *this;
+    }
+
+    void transform_to_dap4(AttrTable &at);
+
+    AttrTable *get_AttrTable(const std::string name);
+    static void load_AttrTable(AttrTable *d2_attr_table, D4Attributes *d4_attrs);
+
+    bool empty() const { return d_attrs.empty(); }
+
+    void add_attribute(D4Attribute *attr) {
+        d_attrs.push_back(new D4Attribute(*attr));
+    }
+    void add_attribute_nocopy(D4Attribute *attr) {
+        d_attrs.push_back(attr);
+    }
+
+    /// Get an iterator to the start of the enumerations
+    D4AttributesIter attribute_begin() { return d_attrs.begin(); }
+
+    /// Get an iterator to the end of the enumerations
+    D4AttributesIter attribute_end() { return d_attrs.end(); }
+
+    D4Attribute *find(const string &name);
+    D4Attribute *get(const string &fqn);
+
+    // D4Attribute *find_container(const string &name);
+    // D4Attribute *get_container(const string &fqn);
+
+    // Might add erase()
+
+    void print_dap4(XMLWriter &xml) const;
+
+    virtual void dump(ostream &strm) const;
+};
+
+string D4AttributeTypeToString(D4AttributeType at);
+D4AttributeType StringToD4AttributeType(string s);
+
+} // namespace libdap
+
+#endif // _d4attributes_h
diff --git a/D4BaseTypeFactory.cc b/D4BaseTypeFactory.cc
new file mode 100644
index 0000000..c4f8b6b
--- /dev/null
+++ b/D4BaseTypeFactory.cc
@@ -0,0 +1,298 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2005 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#include "config.h"
+
+#include <string>
+
+#include "BaseType.h"
+#include "Type.h"
+
+#include "Byte.h"
+#include "Int8.h"
+#include "Int16.h"
+#include "UInt16.h"
+#include "Int32.h"
+#include "UInt32.h"
+
+#include "Int64.h"
+#include "UInt64.h"
+
+#include "Float32.h"
+#include "Float64.h"
+
+#include "D4Enum.h"
+
+#include "Str.h"
+#include "Url.h"
+
+#include "D4Opaque.h"
+
+#include "Array.h"
+
+#include "Structure.h"
+#include "D4Sequence.h"
+
+#include "D4Group.h"
+
+#include "D4BaseTypeFactory.h"
+#include "debug.h"
+
+namespace libdap {
+
+BaseType *D4BaseTypeFactory::NewVariable(Type t, const string &name) const
+{
+    switch (t) {
+        case dods_byte_c:
+            return NewByte(name);
+        case dods_char_c:
+        	return NewChar(name);
+        case dods_uint8_c:
+            return NewUInt8(name);
+        case dods_int8_c:
+            return NewInt8(name);
+
+        case dods_int16_c:
+            return NewInt16(name);
+        case dods_uint16_c:
+            return NewUInt16(name);
+        case dods_int32_c:
+            return NewInt32(name);
+        case dods_uint32_c:
+            return NewUInt32(name);
+
+        case dods_int64_c:
+            return NewInt64(name);
+        case dods_uint64_c:
+            return NewUInt64(name);
+
+        case dods_float32_c:
+            return NewFloat32(name);
+        case dods_float64_c:
+            return NewFloat64(name);
+
+        case dods_enum_c:
+            return NewEnum(name);
+
+        case dods_str_c:
+            return NewStr(name);
+        case dods_url_c:
+            return NewURL(name);
+
+        case dods_opaque_c:
+            return NewOpaque(name);
+
+        case dods_structure_c:
+            return NewStructure(name);
+
+        case dods_sequence_c:
+            return NewD4Sequence(name);
+
+        case dods_array_c:
+            return NewArray(name);
+
+        case dods_group_c:
+            return NewGroup(name);
+
+        default:
+            throw InternalErr(__FILE__, __LINE__, "Unimplemented type in DAP4");
+    }
+}
+
+Byte *
+D4BaseTypeFactory::NewByte(const string &n) const
+{
+    Byte *b = new Byte(n);
+    b->set_is_dap4(true);
+    return b;
+}
+
+// Use the type constants specific to Char and UInt8 so the print reps will
+// match the server's idea of the types.
+Byte *
+D4BaseTypeFactory::NewChar(const string &n) const
+{
+    Byte *b = new Byte(n);
+    b->set_type(dods_char_c);
+    b->set_is_dap4(true);
+    return b;
+}
+
+Byte *
+D4BaseTypeFactory::NewUInt8(const string &n) const
+{
+    Byte *b = new Byte(n);
+    b->set_type(dods_uint8_c);
+    b->set_is_dap4(true);
+    return b;
+}
+
+Int8 *
+D4BaseTypeFactory::NewInt8(const string &n) const
+{
+    Int8 *b = new Int8(n);
+    b->set_is_dap4(true);
+    return b;
+}
+
+Int16 *
+D4BaseTypeFactory::NewInt16(const string &n) const
+{
+    Int16 *b = new Int16(n);
+    b->set_is_dap4(true);
+    return b;
+}
+
+UInt16 *
+D4BaseTypeFactory::NewUInt16(const string &n) const
+{
+    UInt16 *b = new UInt16(n);
+    b->set_is_dap4(true);
+    return b;
+}
+
+Int32 *
+D4BaseTypeFactory::NewInt32(const string &n) const
+{
+    DBG(cerr << "Inside DAP4BaseTypeFactory::NewInt32" << endl);
+    Int32 *b = new Int32(n);
+    b->set_is_dap4(true);
+    return b;
+}
+
+UInt32 *
+D4BaseTypeFactory::NewUInt32(const string &n) const
+{
+    UInt32 *b = new UInt32(n);
+    b->set_is_dap4(true);
+    return b;
+}
+
+Int64 *
+D4BaseTypeFactory::NewInt64(const string &n) const
+{
+    DBG(cerr << "Inside DAP4BaseTypeFactory::NewInt64" << endl);
+    Int64 *b = new Int64(n);
+    b->set_is_dap4(true);
+    return b;
+}
+
+UInt64 *
+D4BaseTypeFactory::NewUInt64(const string &n) const
+{
+    UInt64 *b = new UInt64(n);
+    b->set_is_dap4(true);
+    return b;
+}
+
+Float32 *
+D4BaseTypeFactory::NewFloat32(const string &n) const
+{
+    Float32 *b = new Float32(n);
+    b->set_is_dap4(true);
+    return b;
+}
+
+Float64 *
+D4BaseTypeFactory::NewFloat64(const string &n) const
+{
+    Float64 *b = new Float64(n);
+    b->set_is_dap4(true);
+    return b;
+}
+
+/**
+ * Enums need a name and the name of an enumeration that was defined by the
+ * dataset. If the later is not known, it must be set before the enum is used.
+ * @param name
+ * @param enum_name
+ * @return
+ */
+D4Enum *
+D4BaseTypeFactory::NewEnum(const string &name, Type type) const
+{
+    return new D4Enum(name, type);
+}
+
+
+Str *
+D4BaseTypeFactory::NewStr(const string &n) const
+{
+    Str *b = new Str(n);
+    b->set_is_dap4(true);
+    return b;
+}
+
+Url *
+D4BaseTypeFactory::NewUrl(const string &n) const
+{
+    Url *b = new Url(n);
+    b->set_is_dap4(true);
+    return b;
+}
+
+D4Opaque *
+D4BaseTypeFactory::NewOpaque(const string &n) const
+{
+    return new D4Opaque(n);
+}
+
+/** Note that this method is called NewURL - URL in caps.
+ */
+Url *
+D4BaseTypeFactory::NewURL(const string &n) const
+{
+    Url *b = new Url(n);
+    b->set_is_dap4(true);
+    return b;
+}
+
+Array *
+D4BaseTypeFactory::NewArray(const string &n, BaseType *v) const
+{
+	return new Array(n, v, true /* is_dap4 */);
+}
+
+Structure *
+D4BaseTypeFactory::NewStructure(const string &n) const
+{
+    Structure *b = new Structure(n);
+    b->set_is_dap4(true);
+    return b;
+}
+
+D4Sequence *
+D4BaseTypeFactory::NewD4Sequence(const string &n) const
+{
+	return new D4Sequence(n);
+}
+
+D4Group *
+D4BaseTypeFactory::NewGroup(const string &n) const
+{
+    return new D4Group(n);
+}
+
+} // namespace libdap
diff --git a/D4BaseTypeFactory.h b/D4BaseTypeFactory.h
new file mode 100644
index 0000000..b302c16
--- /dev/null
+++ b/D4BaseTypeFactory.h
@@ -0,0 +1,123 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2012 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#ifndef dap4_base_type_factory_h
+#define dap4_base_type_factory_h
+
+#include <string>
+
+#include "BaseTypeFactory.h"
+#include "Type.h"
+
+// Class declarations; Make sure to include the corresponding headers in the
+// implementation file.
+
+namespace libdap
+{
+
+class Byte;
+class Int8;
+class Int16;
+class UInt16;
+class Int32;
+class UInt32;
+class Int64;
+class UInt64;
+
+class Float32;
+class Float64;
+
+class Str;
+class Url;
+
+class D4Enum;
+class D4Opaque;
+
+class Array;
+
+class Structure;
+class D4Sequence;
+
+class D4Group;
+
+class BaseType;
+
+/**
+ *  Return instances of objects that are to be stored in a DDS for a
+ *  DAP4 dataset.
+ *
+ */
+class D4BaseTypeFactory: public BaseTypeFactory
+{
+public:
+    D4BaseTypeFactory()
+    {}
+    virtual ~D4BaseTypeFactory()
+    {}
+
+    virtual BaseType *NewVariable(Type t, const string &name) const;
+
+    virtual BaseTypeFactory *ptr_duplicate() const {
+        return new D4BaseTypeFactory;
+    }
+
+    virtual Byte *NewByte(const string &n = "") const;
+
+    // The Int8 types are new for DAP4
+    virtual Int8 *NewInt8(const string &n = "") const;
+    virtual Byte *NewChar(const string &n = "") const;
+    virtual Byte *NewUInt8(const string &n = "") const;
+
+    virtual Int16 *NewInt16(const string &n = "") const;
+    virtual UInt16 *NewUInt16(const string &n = "") const;
+    virtual Int32 *NewInt32(const string &n = "") const;
+    virtual UInt32 *NewUInt32(const string &n = "") const;
+
+    // New for DAP4
+    virtual Int64 *NewInt64(const string &n = "") const;
+    virtual UInt64 *NewUInt64(const string &n = "") const;
+
+    virtual Float32 *NewFloat32(const string &n = "") const;
+    virtual Float64 *NewFloat64(const string &n = "") const;
+
+    virtual D4Enum *NewEnum(const string &n = "", Type type = dods_null_c) const;
+
+    virtual Str *NewStr(const string &n = "") const;
+    virtual Url *NewUrl(const string &n = "") const;
+    virtual Url *NewURL(const string &n = "") const;
+
+    virtual D4Opaque *NewOpaque(const string &n = "") const;
+
+    virtual Array *NewArray(const string &n = "", BaseType *v = 0) const;
+
+    virtual Structure *NewStructure(const string &n = "") const;
+    virtual D4Sequence *NewD4Sequence(const string &n = "") const;
+
+    virtual D4Group *NewGroup(const string &n = "") const;
+};
+
+} // namespace libdap
+
+#endif // dap4_base_type_factory_h
diff --git a/D4Connect.cc b/D4Connect.cc
new file mode 100644
index 0000000..f5725e0
--- /dev/null
+++ b/D4Connect.cc
@@ -0,0 +1,556 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//         Dan Holloway <dholloway@gso.uri.edu>
+//         Reza Nekovei <reza@intcomm.net>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1994-2002
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+//      dan             Dan Holloway <dholloway@gso.uri.edu>
+//      reza            Reza Nekovei <reza@intcomm.net>
+
+#include "config.h"
+// #define DODS_DEBUG 1
+
+
+
+#include <cassert>
+#include <cstring>
+#include <sstream>
+
+#include "D4Connect.h"
+#include "HTTPConnect.h"
+#include "Response.h"
+#include "DMR.h"
+#include "D4Group.h"
+
+#include "D4ParserSax2.h"
+#include "chunked_stream.h"
+#include "chunked_istream.h"
+#include "D4StreamUnMarshaller.h"
+
+#include "escaping.h"
+#include "mime_util.h"
+#include "debug.h"
+
+
+
+using namespace std;
+
+namespace libdap {
+
+/** This private method process data from both local and remote sources. It
+ exists to eliminate duplication of code. */
+void D4Connect::process_dmr(DMR &dmr, Response &rs)
+{
+    DBG(cerr << "Entering D4Connect::process_dmr" << endl);
+
+    dmr.set_dap_version(rs.get_protocol());
+
+    DBG(cerr << "Entering process_data. Response.getVersion() = " << rs.get_version() << endl);
+    switch (rs.get_type()) {
+    case dap4_error: {
+#if 0
+        Error e;
+        if (!e.parse(rs.get_stream()))
+        throw InternalErr(__FILE__, __LINE__, "Could not parse the Error object returned by the server!");
+        throw e;
+#endif
+        throw InternalErr(__FILE__, __LINE__, "DAP4 errors not processed yet: FIXME!");
+    }
+
+    case web_error:
+        // Web errors (those reported in the return document's MIME header)
+        // are processed by the WWW library.
+        throw InternalErr(__FILE__, __LINE__,
+            "An error was reported by the remote httpd; this should have been processed by HTTPConnect..");
+
+    case dap4_dmr: {
+        // parse the DMR
+        try {
+            D4ParserSax2 parser;
+            // When parsing a data response, we use the permissive mode of the DMR parser
+            // (which allows Map elements to reference Arrays that are not in the DMR).
+            // Do not use that mode when parsing the DMR response - assume the DMR is
+            // valid. jhrg 4/13/16
+            parser.intern(*rs.get_cpp_stream(), &dmr);
+        }
+        catch (Error &e) {
+            cerr << "Exception: " << e.get_error_message() << endl;
+            return;
+        }
+        catch (std::exception &e) {
+            cerr << "Exception: " << e.what() << endl;
+            return;
+        }
+        catch (...) {
+            cerr << "Exception: unknown error" << endl;
+            return;
+        }
+
+        return;
+    }
+
+    default:
+        throw Error("Unknown response type");
+    }
+}
+
+/** This private method process data from both local and remote sources. It
+ exists to eliminate duplication of code. */
+void D4Connect::process_data(DMR &data, Response &rs)
+{
+    DBG(cerr << "Entering D4Connect::process_data" << endl);
+
+    assert(rs.get_cpp_stream());	// DAP4 code uses cpp streams
+
+    data.set_dap_version(rs.get_protocol());
+
+    DBG(cerr << "Entering process_data. Response.getVersion() = " << rs.get_version() << endl);
+    switch (rs.get_type()) {
+    case dap4_error: {
+#if 0
+        Error e;
+        if (!e.parse(rs.get_cpp_stream()))
+        throw InternalErr(__FILE__, __LINE__, "Could not parse the Error object returned by the server!");
+        throw e;
+#endif
+        throw InternalErr(__FILE__, __LINE__, "DAP4 errors not processed yet: FIXME!");
+    }
+
+    case web_error:
+        // Web errors (those reported in the return document's MIME header)
+        // are processed by the WWW library.
+        throw InternalErr(__FILE__, __LINE__,
+            "An error was reported by the remote httpd; this should have been processed by HTTPConnect..");
+
+    case dap4_data: {
+#if BYTE_ORDER_PREFIX
+        // Read the byte-order byte; used later on
+        char byte_order;
+        *rs.get_cpp_stream() >> byte_order;
+        //if (debug) cerr << "Byte order: " << ((byte_order) ? "big endian" : "little endian") << endl;
+#endif
+        // get a chunked input stream
+#if BYTE_ORDER_PREFIX
+        chunked_istream cis(*rs.get_cpp_stream(), 1024, byte_order);
+#else
+        chunked_istream cis(*(rs.get_cpp_stream()), CHUNK_SIZE);
+#endif
+        // parse the DMR, stopping when the boundary is found.
+        try {
+            // force chunk read
+            // get chunk size
+            int chunk_size = cis.read_next_chunk();
+            if (chunk_size < 0)
+                throw Error("Found an unexpected end of input (EOF) while reading a DAP4 data response. (1)");
+
+            // get chunk
+            char chunk[chunk_size];
+            cis.read(chunk, chunk_size);
+            // parse char * with given size
+            D4ParserSax2 parser;
+            // permissive mode allows references to Maps that are not in the response.
+            // Use this mode when parsing a data response (but not the DMR). jhrg 4/13/16
+            parser.set_strict(false);
+
+            // '-2' to discard the CRLF pair
+            parser.intern(chunk, chunk_size - 2, &data);
+        }
+        catch (Error &e) {
+            cerr << "Exception: " << e.get_error_message() << endl;
+            return;
+        }
+        catch (std::exception &e) {
+            cerr << "Exception: " << e.what() << endl;
+            return;
+        }
+        catch (...) {
+            cerr << "Exception: unknown error" << endl;
+            return;
+        }
+
+#if BYTE_ORDER_PREFIX
+        D4StreamUnMarshaller um(cis, byte_order);
+#else
+        D4StreamUnMarshaller um(cis, cis.twiddle_bytes());
+#endif
+        data.root()->deserialize(um, data);
+
+        return;
+    }
+
+    default:
+        throw Error("Unknown response type");
+    }
+}
+
+/** Use when you cannot use libcurl.
+
+ @note This method tests for MIME headers with lines terminated by CRLF
+ (\r\n) and Newlines (\n). In either case, the line terminators are removed
+ before each header is processed.
+
+ @param rs Value/Result parameter. Dump version and type information here.
+ */
+void D4Connect::parse_mime(Response &rs)
+{
+    rs.set_version("dods/0.0"); // initial value; for backward compatibility.
+    rs.set_protocol("2.0");
+
+    istream &data_source = *rs.get_cpp_stream();
+    string mime = get_next_mime_header(data_source);
+    while (!mime.empty()) {
+        string header, value;
+        parse_mime_header(mime, header, value);
+
+        // Note that this is an ordered list
+        if (header == "content-description") {
+            DBG(cout << header << ": " << value << endl);
+            rs.set_type(get_description_type(value));
+        }
+        // Use the value of xdods-server only if no other value has been read
+        else if (header == "xdods-server" && rs.get_version() == "dods/0.0") {
+            DBG(cout << header << ": " << value << endl);
+            rs.set_version(value);
+        }
+        // This trumps 'xdods-server' and 'server'
+        else if (header == "xopendap-server") {
+            DBG(cout << header << ": " << value << endl);
+            rs.set_version(value);
+        }
+        else if (header == "xdap") {
+            DBG(cout << header << ": " << value << endl);
+            rs.set_protocol(value);
+        }
+        // Only look for 'server' if no other header supplies this info.
+        else if (rs.get_version() == "dods/0.0" && header == "server") {
+            DBG(cout << header << ": " << value << endl);
+            rs.set_version(value);
+        }
+
+        mime = get_next_mime_header(data_source);
+    }
+}
+
+// public mfuncs
+
+/** The D4Connect constructor requires a URL or local file.
+
+ @param n The URL for the virtual connection.
+ @param uname Use this username for authentication. Null by default.
+ @param password Password to use for authentication. Null by default.
+ @brief Create an instance of Connect. */
+D4Connect::D4Connect(const string &url, string uname, string password) :
+    d_http(0), d_local(false), d_URL(""), d_UrlQueryString(""), d_server("unknown"), d_protocol("4.0")
+{
+    string name = prune_spaces(url);
+
+    // Figure out if the URL starts with 'http', if so, make sure that we
+    // talk to an instance of HTTPConnect.
+    if (name.find("http") == 0) {
+        DBG(cerr << "Connect: The identifier is an http URL" << endl);
+        d_http = new HTTPConnect(RCReader::instance());
+        d_http->set_use_cpp_streams(true);
+
+        d_URL = name;
+
+        // Find and store any CE given with the URL.
+        string::size_type dotpos = name.find('?');
+        if (dotpos != std::string::npos) { // Found a match.
+            d_URL = name.substr(0, dotpos);
+
+            d_UrlQueryString = name.substr(dotpos + 1);
+
+            if (d_UrlQueryString.find(DAP4_CE_QUERY_KEY) != std::string::npos) {
+                std::stringstream msg;
+                msg << endl;
+                msg << "WARNING: A DAP4 constraint expression key was found in the query string!" << endl;
+                msg << "The submitted dataset URL: " << name << endl;
+                msg << "Contains the query string: " << d_UrlQueryString << endl;
+                msg << "This will cause issues when making DAP4 requests that specify additional constraints. " << endl;
+                cerr << msg.str() << endl;
+                // throw Error(malformed_expr, msg.str());
+            }
+
+        }
+    }
+    else {
+        DBG(cerr << "Connect: The identifier is a local data source." << endl);
+        d_local = true; // local in this case means non-DAP
+    }
+
+    set_credentials(uname, password);
+}
+
+D4Connect::~D4Connect()
+{
+    if (d_http) delete d_http;
+}
+
+std::string D4Connect::build_dap4_ce(const string requestSuffix, const string dap4ce)
+{
+    std::stringstream url;
+    bool needsAmpersand = false;
+
+    url << d_URL << requestSuffix << "?";
+
+    if (d_UrlQueryString.length() > 0) {
+        url << d_UrlQueryString;
+        needsAmpersand = true;
+    }
+
+    if (dap4ce.length() > 0) {
+        if (needsAmpersand) url << "&";
+
+        url << DAP4_CE_QUERY_KEY << "=" << id2www_ce(dap4ce);
+    }
+
+    DBG(cerr << "D4Connect::build_dap4_ce() - Source URL: " << d_URL << endl);
+    DBG(cerr << "D4Connect::build_dap4_ce() - Source URL Query String: " << d_UrlQueryString << endl);
+    DBG(cerr << "D4Connect::build_dap4_ce() - dap4ce: " << dap4ce << endl);
+    DBG(cerr << "D4Connect::build_dap4_ce() - request URL: " << url.str() << endl);
+
+    return url.str();
+}
+
+void D4Connect::request_dmr(DMR &dmr, const string expr)
+{
+    string url = build_dap4_ce(".dmr", expr);
+
+    Response *rs = 0;
+    try {
+        rs = d_http->fetch_url(url);
+
+        d_server = rs->get_version();
+        d_protocol = rs->get_protocol();
+
+        switch (rs->get_type()) {
+        case unknown_type:
+            DBG(cerr << "Response type unknown, assuming it's a DMR response." << endl);
+            /* no break */
+        case dap4_dmr: {
+            D4ParserSax2 parser;
+            parser.intern(*rs->get_cpp_stream(), &dmr);
+            break;
+        }
+
+        case dap4_error:
+            throw InternalErr(__FILE__, __LINE__, "DAP4 errors are not processed yet.");
+
+        case web_error:
+            // We should never get here; a web error should be picked up read_url
+            // (called by fetch_url) and result in a thrown Error object.
+            throw InternalErr(__FILE__, __LINE__, "Web error found where it should never be.");
+            break;
+
+        default:
+            throw InternalErr(__FILE__, __LINE__,
+                "Response type not handled (got " + long_to_string(rs->get_type()) + ").");
+        }
+    }
+    catch (...) {
+        delete rs;
+        throw;
+    }
+
+    delete rs;
+}
+
+void D4Connect::request_dap4_data(DMR &dmr, const string expr)
+{
+    string url = build_dap4_ce(".dap", expr);
+
+    Response *rs = 0;
+    try {
+        rs = d_http->fetch_url(url);
+
+        d_server = rs->get_version();
+        d_protocol = rs->get_protocol();
+
+        switch (rs->get_type()) {
+        case unknown_type:
+            DBG(cerr << "Response type unknown, assuming it's a DAP4 Data response." << endl);
+            /* no break */
+        case dap4_data: {
+#if BYTE_ORDER_PREFIX
+            istream &in = *rs->get_cpp_stream();
+            // Read the byte-order byte; used later on
+            char byte_order;
+            in >> byte_order;
+#endif
+
+            // get a chunked input stream
+#if BYTE_ORDER_PREFIX
+            chunked_istream cis(*(rs->get_cpp_stream()), 1024, byte_order);
+#else
+            chunked_istream cis(*(rs->get_cpp_stream()), CHUNK_SIZE);
+#endif
+
+            // parse the DMR, stopping when the boundary is found.
+
+            // force chunk read
+            // get chunk size
+            int chunk_size = cis.read_next_chunk();
+            if (chunk_size < 0)
+                throw Error("Found an unexpected end of input (EOF) while reading a DAP4 data response. (2)");
+
+            // get chunk
+            char chunk[chunk_size];
+            cis.read(chunk, chunk_size);
+            // parse char * with given size
+            D4ParserSax2 parser;
+            // permissive mode allows references to Maps that are not in the response.
+            parser.set_strict(false);
+            // '-2' to discard the CRLF pair
+            parser.intern(chunk, chunk_size - 2, &dmr, false /*debug*/);
+
+            // Read data and store in the DMR
+#if BYTE_ORDER_PREFIX
+            D4StreamUnMarshaller um(cis, byte_order);
+#else
+            D4StreamUnMarshaller um(cis, cis.twiddle_bytes());
+#endif
+            dmr.root()->deserialize(um, dmr);
+
+            break;
+        }
+
+        case dap4_error:
+            throw InternalErr(__FILE__, __LINE__, "DAP4 errors are not processed yet.");
+
+        case web_error:
+            // We should never get here; a web error should be picked up read_url
+            // (called by fetch_url) and result in a thrown Error object.
+            throw InternalErr(__FILE__, __LINE__, "Web error found where it should never be.");
+            break;
+
+        default:
+            throw InternalErr(__FILE__, __LINE__,
+                "Response type not handled (got " + long_to_string(rs->get_type()) + ").");
+        }
+    }
+    catch (...) {
+        delete rs;
+        throw;
+    }
+
+    delete rs;
+}
+
+void D4Connect::read_dmr(DMR &dmr, Response &rs)
+{
+    parse_mime(rs);
+    if (rs.get_type() == unknown_type) throw Error("Unknown response type.");
+
+    read_dmr_no_mime(dmr, rs);
+}
+
+void D4Connect::read_dmr_no_mime(DMR &dmr, Response &rs)
+{
+    // Assume callers know what they are doing
+    if (rs.get_type() == unknown_type) rs.set_type(dap4_dmr);
+
+    switch (rs.get_type()) {
+    case dap4_dmr:
+        process_dmr(dmr, rs);
+        d_server = rs.get_version();
+        d_protocol = dmr.dap_version();
+        break;
+    default:
+        throw Error("Expected a DAP4 DMR response.");
+    }
+}
+
+void D4Connect::read_data(DMR &data, Response &rs)
+{
+    parse_mime(rs);
+    if (rs.get_type() == unknown_type) throw Error("Unknown response type.");
+
+    read_data_no_mime(data, rs);
+}
+
+void D4Connect::read_data_no_mime(DMR &data, Response &rs)
+{
+    // Assume callers know what they are doing
+    if (rs.get_type() == unknown_type) rs.set_type(dap4_data);
+
+    switch (rs.get_type()) {
+    case dap4_data:
+        process_data(data, rs);
+        d_server = rs.get_version();
+        d_protocol = data.dap_version();
+        break;
+    default:
+        throw Error("Expected a DAP4 Data response.");
+    }
+}
+
+/** @brief Set the credentials for responding to challenges while dereferencing
+ URLs.
+ @param u The username.
+ @param p The password.
+ @see extract_auth_info() */
+void D4Connect::set_credentials(string u, string p)
+{
+    if (d_http) d_http->set_credentials(u, p);
+}
+
+/** Set the \e accept deflate property.
+ @param deflate True if the client can accept compressed responses, False
+ otherwise. */
+void D4Connect::set_accept_deflate(bool deflate)
+{
+    if (d_http) d_http->set_accept_deflate(deflate);
+}
+
+/** Set the \e XDAP-Accept property/header. This is used to send to a server
+ the (highest) DAP protocol version number that this client understands.
+
+ @param major The client dap protocol major version
+ @param minor The client dap protocol minor version */
+void D4Connect::set_xdap_protocol(int major, int minor)
+{
+    if (d_http) d_http->set_xdap_protocol(major, minor);
+}
+
+/** Disable any further use of the client-side cache. In a future version
+ of this software, this should be handled so that the www library is
+ not initialized with the cache running by default. */
+void D4Connect::set_cache_enabled(bool cache)
+{
+    if (d_http) d_http->set_cache_enabled(cache);
+}
+
+bool D4Connect::is_cache_enabled()
+{
+    if (d_http)
+        return d_http->is_cache_enabled();
+    else
+        return false;
+}
+
+} // namespace libdap
diff --git a/D4Connect.h b/D4Connect.h
new file mode 100644
index 0000000..40fb2e3
--- /dev/null
+++ b/D4Connect.h
@@ -0,0 +1,116 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2013 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#ifndef _d4connect_h
+#define _d4connect_h
+
+#include <string>
+
+#define DAP4_CE_QUERY_KEY "dap4.ce"
+
+namespace libdap
+{
+
+class HTTPConnect;
+class DMR;
+class Response;
+
+class D4Connect
+{
+private:
+    HTTPConnect *d_http;
+
+    bool d_local;  // Is this a local connection?
+    std::string d_URL;  // URL to remote dataset (minus CE)
+    std::string d_UrlQueryString; 	// CE
+
+    std::string d_server; // Server implementation information (the XDAP-Server header)
+    std::string d_protocol; // DAP protocol from the server (XDAP)
+
+    void process_data(DMR &data, Response &rs);
+    void process_dmr(DMR &data, Response &rs);
+
+    // Use when you cannot use but have a complete response with MIME headers
+    void parse_mime(Response &rs);
+
+    std::string build_dap4_ce(const std::string requestSuffix, const std::string expr);
+
+protected:
+    /** @name Suppress the C++ defaults for these. */
+    D4Connect();
+    D4Connect(const D4Connect &);
+    D4Connect &operator=(const D4Connect &);
+
+public:
+    D4Connect(const std::string &url, std::string uname = "", std::string password = "");
+
+    virtual ~D4Connect();
+
+    bool is_local() const { return d_local; }
+
+    virtual std::string URL() const { return d_URL; }
+    virtual std::string CE() const { return d_UrlQueryString; }
+
+    void set_credentials(std::string u, std::string p);
+    void set_accept_deflate(bool deflate);
+    void set_xdap_protocol(int major, int minor);
+
+    void set_cache_enabled(bool enabled);
+    bool is_cache_enabled();
+
+    void set_xdap_accept(int major, int minor);
+
+    /** Return the protocol/implementation version of the most recent
+    response. This is a poorly designed method, but it returns
+    information that is useful when used correctly. Before a response is
+    made, this contains the std::string "unknown." This should ultimately hold
+    the \e protocol version; it currently holds the \e implementation
+    version.
+
+        @see get_protocol()
+        @deprecated */
+    std::string get_version() { return d_server; }
+
+    /** Return the DAP protocol version of the most recent
+        response. Before a response is made, this contains the std::string "2.0."
+        */
+    std::string get_protocol() { return d_protocol; }
+
+    virtual void request_dmr(DMR &dmr, const std::string expr = "");
+    virtual void request_dap4_data(DMR &dmr, const std::string expr = "");
+#if 0
+    virtual void request_version();
+#endif
+
+    virtual void read_dmr(DMR &dmr, Response &rs);
+    virtual void read_dmr_no_mime(DMR &dmr, Response &rs);
+
+    virtual void read_data(DMR &data, Response &rs);
+    virtual void read_data_no_mime(DMR &data, Response &rs);
+};
+
+} // namespace libdap
+
+#endif // _d4connect_h
diff --git a/D4Dimensions.cc b/D4Dimensions.cc
new file mode 100644
index 0000000..86a16cc
--- /dev/null
+++ b/D4Dimensions.cc
@@ -0,0 +1,142 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2013 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#include "config.h"
+
+#include <sstream>
+
+#include "XMLWriter.h"
+#include "D4Dimensions.h"
+#include "D4Group.h"
+
+#include "Error.h"
+#include "InternalErr.h"
+
+namespace libdap {
+
+void
+D4Dimension::set_size(const string &size)
+{
+	unsigned long value = 0;
+	istringstream iss(size);
+	iss >> value;
+
+	// First test if the stream is OK, then look to see if we read all
+	// of the chars.
+	if (!iss || !iss.eof()) throw Error("Invalid value '" + size + "' passed to D4Dimension::set_size.");
+	set_size(value);
+}
+
+/**
+ * @brief Get the FQN for the dimension
+ * @return The D4Dimension as a fully qualified name.
+ */
+string
+D4Dimension::fully_qualified_name() const
+{
+	string name = d_name;
+
+	// d_parent is the D4Dimensions container and its parent is the Group where
+	// this Dimension is defined.
+	D4Group *grp = d_parent->parent();
+	while (grp) {
+		// The root group is named "/" (always); this avoids '//name'
+		name = (grp->name() == "/") ? "/" + name : grp->name() + "/" + name;
+
+		if (grp->get_parent())
+			grp = static_cast<D4Group*>(grp->get_parent());
+		else
+			grp = 0;
+	}
+
+	return name;
+}
+
+/**
+ * @brief Print the Dimension declaration.
+ * Print the Dimension in a form suitable for use in a Group definition/declaration.
+ * @see print_dap4(XMLWriter &xml, bool print_fqn)
+ * @param xml Print to this XMLWriter instance
+ */
+void
+D4Dimension::print_dap4(XMLWriter &xml) const
+{
+	if (xmlTextWriterStartElement(xml.get_writer(), (const xmlChar*) "Dimension") < 0)
+		throw InternalErr(__FILE__, __LINE__, "Could not write Dimension element");
+
+	if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "name", (const xmlChar*)d_name.c_str()) < 0)
+		throw InternalErr(__FILE__, __LINE__, "Could not write attribute for name");
+#if 0
+	// Use FQNs when things are referenced, not when they are defined
+	if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "name", (const xmlChar*)fully_qualified_name().c_str()) < 0)
+		throw InternalErr(__FILE__, __LINE__, "Could not write attribute for name");
+#endif
+	ostringstream oss;
+	if (d_constrained)
+	    oss << (d_c_stop - d_c_start) / d_c_stride + 1;
+	else
+	    oss << d_size;
+	if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "size", (const xmlChar*) oss.str().c_str()) < 0)
+		throw InternalErr(__FILE__, __LINE__, "Could not write attribute for size");
+
+	if (xmlTextWriterEndElement(xml.get_writer()) < 0)
+		throw InternalErr(__FILE__, __LINE__, "Could not end Dimension element");
+}
+
+// Note that in order for this to work the second argument must not be a reference.
+// jhrg 8/20/13
+static bool
+dim_name_eq(D4Dimension *d, const string name)
+{
+	return d->name() == name;
+}
+
+D4Dimension *
+D4Dimensions::find_dim(const string &name)
+{
+	D4DimensionsIter d = find_if(d_dims.begin(), d_dims.end(), bind2nd(ptr_fun(dim_name_eq), name));
+	return (d != d_dims.end()) ? *d: 0;
+}
+
+void
+D4Dimensions::print_dap4(XMLWriter &xml, bool constrained) const
+{
+    D4DimensionsCIter i = d_dims.begin();
+    while (i != d_dims.end()) {
+#if 0
+    	if (!constrained || parent()->find_first_var_that_uses_dimension(*i))
+            (*i)->print_dap4(xml);
+#endif
+    	if (constrained) {
+    		if ((*i)->used_by_projected_var())
+    		    (*i)->print_dap4(xml);
+    	}
+    	else {
+    		(*i)->print_dap4(xml);
+    	}
+        ++i;
+    }
+}
+
+} /* namespace libdap */
diff --git a/D4Dimensions.h b/D4Dimensions.h
new file mode 100644
index 0000000..f4eeeaf
--- /dev/null
+++ b/D4Dimensions.h
@@ -0,0 +1,194 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2013 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#ifndef D4DIMENSIONS_H_
+#define D4DIMENSIONS_H_
+
+#include <string>
+#include <vector>
+
+// #include "XMLWriter.h"
+
+using namespace std;
+
+namespace libdap {
+
+class D4Group;
+class D4Dimensions;
+class XMLWriter;
+
+class D4Dimension {
+    string d_name;
+    unsigned long d_size;
+
+    D4Dimensions *d_parent;	// This is used to get the Dimensions and then the Group object
+
+    bool d_constrained;
+    unsigned long long d_c_start, d_c_stride, d_c_stop;
+
+    bool d_used_by_projected_var;
+
+public:
+    D4Dimension() : d_name(""), d_size(0),  d_parent(0), d_constrained(false), d_c_start(0), d_c_stride(0),
+            d_c_stop(0), d_used_by_projected_var(false) {}
+    D4Dimension(const string &name, unsigned long size, D4Dimensions *d = 0) : d_name(name), d_size(size), d_parent(d),
+            d_constrained(false), d_c_start(0), d_c_stride(0), d_c_stop(0), d_used_by_projected_var(false) {}
+
+    string name() const {return d_name;}
+    void set_name(const string &name) { d_name = name; }
+    string fully_qualified_name() const;
+
+    unsigned long size() const { return d_size; }
+    void set_size(unsigned long size) { d_size = size; }
+    // Because we build these in the XML parser and it's all text...
+    void set_size(const string &size);
+
+    D4Dimensions *parent() const { return d_parent; }
+    void set_parent(D4Dimensions *d) { d_parent = d; }
+
+    bool constrained() const { return d_constrained; }
+    unsigned long long c_start() const { return d_c_start; }
+    unsigned long long c_stride() const { return d_c_stride; }
+    unsigned long long c_stop() const { return d_c_stop; }
+
+    bool used_by_projected_var() const { return d_used_by_projected_var; }
+    void set_used_by_projected_var(bool state) { d_used_by_projected_var = state; }
+
+    /**
+     * Set this Shared Diemension's constraint. While an Array Dimension object uses a
+     * stop value of -1 to indicate the end of the dimension, this method does not support
+     * that; the caller will have to sort out the correct end value for 'stop'.
+     * @param start Starting index (zero-based)
+     * @param stride The stride for the slice
+     * @param stop The stopping index (never greater than size -1)
+     */
+    void set_constraint(unsigned long long start, unsigned long long stride, unsigned long long stop) {
+        d_c_start = start;
+        d_c_stride = stride;
+        d_c_stop = stop;
+        d_constrained = true;
+    }
+
+    void print_dap4(XMLWriter &xml) const;
+};
+
+/**
+ * This class holds information about dimensions. This can be used to store
+ * actual dimension information in an instance of BaseType and it can be
+ * used to store the definition of a dimension in an instance of Group.
+ */
+class D4Dimensions {
+    vector<D4Dimension*> d_dims;
+
+    D4Group *d_parent;		// the group that holds this set of D4Dimensions; weak pointer, don't delete
+
+protected:
+    // Note Code in Array depends on the order of these 'new' dimensions
+    // matching the 'old' dimensions they are derived from. See
+    // Array::update_dimension_pointers. jhrg 8/25/14
+    void m_duplicate(const D4Dimensions &rhs) {
+        D4DimensionsCIter i = rhs.d_dims.begin();
+        while (i != rhs.d_dims.end()) {
+            d_dims.push_back(new D4Dimension(**i++));    // deep copy
+            d_dims.back()->set_parent(this);			// Set the Dimension's parent
+        }
+
+        d_parent = rhs.d_parent;
+    }
+
+public:
+    /// Iterator used for D4Dimensions
+    typedef vector<D4Dimension*>::iterator D4DimensionsIter;
+    typedef vector<D4Dimension*>::const_iterator D4DimensionsCIter;
+
+    D4Dimensions() : d_parent(0) {}
+    D4Dimensions(D4Group *g) : d_parent(g) {}
+    D4Dimensions(const D4Dimensions &rhs) : d_parent(0) { m_duplicate(rhs); }
+
+    virtual ~D4Dimensions() {
+        D4DimensionsIter i = d_dims.begin();
+        while (i != d_dims.end())
+            delete *i++;
+    }
+
+    D4Dimensions &operator=(const D4Dimensions &rhs) {
+        if (this == &rhs) return *this;
+        m_duplicate(rhs);
+        return *this;
+    }
+
+    /// Does this D4Dimensions object actually have dimensions?
+    bool empty() const { return d_dims.empty(); }
+
+    D4Group *parent() const { return d_parent;}
+    void set_parent(D4Group *g) { d_parent = g; }
+
+    /** Append a new dimension.
+     * In DAP4 dimensions are either of a known size or are varying. For
+     * fixed-size dimensions, the value of varying should be false. For varying
+     * dimensions the value of 'size' will be ignored - any value can be used
+     * when called this method.
+     *
+     * @param dim Pointer to the D4Dimension object to add; deep copy
+     */
+    void add_dim(D4Dimension *dim) { add_dim_nocopy(new D4Dimension(*dim)); }
+
+    /** Append a new dimension.
+     * @param dim Pointer to the D4Dimension object to add; copies the pointer
+     */
+    void add_dim_nocopy(D4Dimension *dim) { dim->set_parent(this); d_dims.push_back(dim); }
+
+    /// Get an iterator to the start of the dimensions
+    D4DimensionsIter dim_begin() { return d_dims.begin(); }
+
+    /// Get an iterator to the end of the dimensions
+    D4DimensionsIter dim_end() { return d_dims.end(); }
+
+    D4Dimension *find_dim(const string &name);
+
+    /** Insert a dimension.
+     * Insert a dimension before the position specified by the iterator.
+     * @note Calling this method invalidates all iterators that reference this
+     * D4Dimension object.
+     * @param dim Inserted before i; deep copy
+     * @param i iterator
+     */
+    void insert_dim(D4Dimension *dim, D4DimensionsIter i) {
+    	insert_dim_nocopy(new D4Dimension(*dim), i);
+    }
+
+    /** Insert a dimension.
+     * @param dim Inserted before i; pointer copy
+     * @param i iterator
+     */
+    void insert_dim_nocopy(D4Dimension *dim, D4DimensionsIter i) {
+    	dim->set_parent(this);
+        d_dims.insert(i, dim);
+    }
+
+    void print_dap4(XMLWriter &xml, bool constrained = false) const;
+};
+
+} /* namespace libdap */
+#endif /* D4DIMENSIONS_H_ */
diff --git a/D4Enum.cc b/D4Enum.cc
new file mode 100644
index 0000000..1a8165b
--- /dev/null
+++ b/D4Enum.cc
@@ -0,0 +1,710 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2013 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#include "config.h"
+
+// #define DODS_DEBUG
+
+#include <cassert>
+#include <sstream>
+
+#include <libxml/encoding.h>
+
+#include "Byte.h"           // synonymous with UInt8 and Char
+#include "Int8.h"
+#include "Int16.h"
+#include "UInt16.h"
+#include "Int32.h"
+#include "UInt32.h"
+#include "Int64.h"
+#include "UInt64.h"
+
+#include "D4Group.h"
+#include "D4Enum.h"
+#include "D4EnumDefs.h"
+#include "D4Attributes.h"
+
+#include "Float32.h"
+#include "Float64.h"
+
+#include "D4StreamMarshaller.h"
+#include "D4StreamUnMarshaller.h"
+
+#include "Operators.h"
+#include "InternalErr.h"
+#include "dods-datatypes.h"
+#include "dods-limits.h"
+#include "util.h"
+#include "debug.h"
+
+using std::cerr;
+using std::endl;
+
+namespace libdap {
+
+// Private
+void D4Enum::m_duplicate(const D4Enum &src)
+{
+    d_buf = src.d_buf;
+    d_element_type = src.d_element_type;
+    d_enum_def = src.d_enum_def;
+#if 0
+    // The enum_def is a weak pointer managed by D4Group. We just copy it
+    // and do not delete it. jhrg 1019/15
+    d_enum_def = src.d_enum_def == 0 ? 0 : new D4EnumDef(*(src.d_enum_def));
+#endif
+    d_is_signed = src.d_is_signed;
+}
+
+
+/**
+ *
+ *
+ *
+ *
+ *
+ *
+ */
+std::vector<BaseType *> *
+D4Enum::transform_to_dap2(AttrTable *){
+    BaseType *my_pretty_pony;
+
+    DBG(cerr << __func__ << "() - BEGIN" << endl;);
+
+
+    switch (d_element_type) {
+    case dods_byte_c:
+    case dods_int8_c:
+    case dods_uint8_c:
+    {
+        Byte *var = new Byte(name());
+        dods_byte val;
+        this->value(&val);
+        var->set_value(val);
+        my_pretty_pony = var;
+        break;
+    }
+    case dods_uint16_c:
+    {
+        UInt16 *var = new UInt16(name());
+        dods_uint16 val;
+        this->value(&val);
+        var->set_value(val);
+        my_pretty_pony = var;
+        break;
+    }
+    case dods_uint32_c:
+    {
+        UInt32 *var = new UInt32(name());
+        dods_uint32 val;
+        this->value(&val);
+        var->set_value(val);
+        my_pretty_pony = var;
+        break;
+    }
+    case dods_uint64_c:
+    {
+        UInt64 *var = new UInt64(name());
+        dods_uint64 val;
+        this->value(&val);
+        var->set_value(val);
+        my_pretty_pony = var;
+        break;
+    }
+    case dods_int16_c:
+    {
+        Int16 *var = new Int16(name());
+        dods_int16 val;
+        this->value(&val);
+        var->set_value(val);
+        my_pretty_pony = var;
+        break;
+    }
+    case dods_int32_c:
+    {
+        Int32 *var = new Int32(name());
+        dods_int32 val;
+        this->value(&val);
+        var->set_value(val);
+        my_pretty_pony = var;
+        break;
+    }
+    case dods_int64_c:
+    {
+        Int64 *var = new Int64(name());
+        dods_int64 val;
+        this->value(&val);
+        var->set_value(val);
+        my_pretty_pony = var;
+        break;
+    }
+    default:
+    {
+        ostringstream oss;
+        oss << __func__ << "() - ERROR! Unknown D4Enum type:"<< d_element_type << " name: " <<  name() << endl;
+        throw InternalErr(__FILE__,__LINE__,oss.str());
+        break;
+    }
+    }
+
+    DBG( cerr << __func__ << "() - Processing Enum  type:"<<
+        my_pretty_pony->type_name() << " name: " << my_pretty_pony->name() << endl;);
+    /**
+     * Grab the attributes!
+     */
+    AttrTable d2_attrs = *(this->attributes()->get_AttrTable(name()));
+    my_pretty_pony->set_attr_table(d2_attrs);
+
+    // cerr << "D4Enum::transform_to_dap2() - my_pretty_pony attrs: "<< endl;
+    // my_pretty_pony->get_attr_table().print(cerr);
+
+    /**
+     * Now we make the Enum label, and the enum's definition
+     * into DAP2 attributes for our returned item.
+     */
+    long long my_value;
+    this->value(&my_value);
+    DBG(cerr << __func__ << "() - value: "<< my_value << endl;);
+
+    string my_label="";
+    AttrTable *enum_def = new AttrTable();
+    enum_def->set_name("d4:enum_def");
+
+    D4EnumDef::D4EnumValueIter dIter = d_enum_def->value_begin();
+    D4EnumDef::D4EnumValueIter dEnd = d_enum_def->value_end();
+    while( dIter!=dEnd){
+        long long a_value =  (*dIter).value;
+        string a_label =  (*dIter).label;
+        ostringstream oss;
+        oss << a_value;
+        DBG(cerr << __func__ << "() - a_value: "<< a_value << endl;);
+        enum_def->append_attr(a_label,my_pretty_pony->type_name(),oss.str());
+        if(a_value == my_value){
+            my_label = (*dIter).label;
+        }
+        dIter++;
+    }
+    if(!my_label.empty())
+        my_pretty_pony->get_attr_table().append_attr("d4:enum_label","String",my_label);
+    my_pretty_pony->get_attr_table().append_container(enum_def,enum_def->get_name());
+
+    vector<BaseType *> *result = new vector<BaseType *>();
+    result->push_back(my_pretty_pony);
+    DBG(cerr << __func__ << "() - END" << endl;);
+    return result;
+}
+
+void D4Enum::m_check_value(int64_t v) const
+{
+	switch (d_element_type) {
+	case dods_byte_c:
+	case dods_uint8_c:
+		if ((uint64_t)v > DODS_UCHAR_MAX || v < 0) {
+			ostringstream oss;
+			oss << "The value " << v << " will not fit in an unsigned byte. (" << __func__ << ")";
+			throw Error(oss.str());
+		}
+		break;
+	case dods_uint16_c:
+		if ((uint64_t)v > DODS_USHRT_MAX || v < 0) {
+			ostringstream oss;
+			oss << "The value " << v << " will not fit in an unsigned 16-bit integer. (" << __func__ << ")";
+			throw Error(oss.str());
+		}
+		break;
+	case dods_uint32_c:
+		if ((uint64_t)v > DODS_UINT_MAX || v < 0) {
+			ostringstream oss;
+			oss << "The value " << v << " will not fit in an unsigned 32-bit integer. (" << __func__ << ")";
+			throw Error(oss.str());
+		}
+		break;
+	case dods_uint64_c:
+		// If 'v' can never be bigger than ULLONG_MAX
+		break;
+
+		case dods_int8_c:
+		if (v > DODS_SCHAR_MAX || v < DODS_SCHAR_MIN) {
+			ostringstream oss;
+			oss << "The value " << v << " will not fit in an unsigned byte. (" << __func__ << ")";
+			throw Error(oss.str());
+		}
+
+		break;
+	case dods_int16_c:
+		if (v > DODS_SHRT_MAX || v < DODS_SHRT_MIN) {
+			ostringstream oss;
+			oss << "The value " << v << " will not fit in an unsigned byte. (" << __func__ << ")";
+			throw Error(oss.str());
+		}
+		break;
+	case dods_int32_c:
+		if (v > DODS_INT_MAX || v < DODS_INT_MIN) {
+			ostringstream oss;
+			oss << "The value " << v << " will not fit in an unsigned byte. (" << __func__ << ")";
+			throw Error(oss.str());
+		}
+		break;
+	case dods_int64_c:
+		// There's no value 'v' can have that won't fit into a 64-bit int.
+		break;
+	default:
+		assert(!"illegal type for D4Enum");
+	}
+}
+
+D4Enum::D4Enum(const string &name, const string &enum_type) :
+    BaseType(name, dods_enum_c, true /*is_dap4*/), d_buf(0), d_element_type(dods_null_c), d_enum_def(0)
+{
+    d_element_type = get_type(enum_type.c_str());
+
+    if (!is_integer_type(d_element_type)) d_element_type = dods_uint64_c;
+    set_is_signed(d_element_type);
+}
+
+D4Enum::D4Enum(const string &name, Type type) :
+    BaseType(name, dods_enum_c, true /*is_dap4*/), d_buf(0), d_element_type(type), d_enum_def(0)
+{
+    if (!is_integer_type(d_element_type)) d_element_type = dods_uint64_c;
+    set_is_signed(d_element_type);
+}
+
+D4Enum::D4Enum(const string &name, const string &dataset, Type type) :
+    BaseType(name, dataset, dods_enum_c, true /*is_dap4*/), d_buf(0), d_element_type(type), d_enum_def(0)
+{
+    if (!is_integer_type(d_element_type)) d_element_type = dods_uint64_c;
+    set_is_signed(d_element_type);
+}
+
+// Explicit instantiation of the template member function 'value(T *)'.
+// This is required in order to have the library contain these member
+// functions when its own code does not use them. Normally, C++ instantiates
+// templates when they are used, and this forces that process so the
+// library file contains the various versions of the member function.
+template void D4Enum::value<dods_byte>(dods_byte *v) const;
+template void D4Enum::value<dods_int16>(dods_int16 *v) const;
+template void D4Enum::value<dods_uint16>(dods_uint16 *v) const;
+template void D4Enum::value<dods_int32>(dods_int32 *v) const;
+template void D4Enum::value<dods_uint32>(dods_uint32 *v) const;
+template void D4Enum::value<dods_int64>(dods_int64 *v) const;
+template void D4Enum::value<dods_uint64>(dods_uint64 *v) const;
+
+template void D4Enum::set_value<dods_byte>(dods_byte v, bool check_value);
+template void D4Enum::set_value<dods_int16>(dods_int16 v, bool check_value);
+template void D4Enum::set_value<dods_uint16>(dods_uint16 v, bool check_value);
+template void D4Enum::set_value<dods_int32>(dods_int32 v, bool check_value);
+template void D4Enum::set_value<dods_uint32>(dods_uint32 v, bool check_value);
+template void D4Enum::set_value<dods_int64>(dods_int64 v, bool check_value);
+template void D4Enum::set_value<dods_uint64>(dods_uint64 v, bool check_value);
+
+void
+D4Enum::set_enumeration(D4EnumDef *enum_def) {
+    d_enum_def = enum_def;
+    d_element_type = enum_def->type();
+}
+
+void
+D4Enum::compute_checksum(Crc32 &checksum)
+{
+	DBG(cerr << __func__ << ": element type: " << ::libdap::type_name(d_element_type) << endl);
+
+    switch (d_element_type) {
+    case dods_byte_c:
+    case dods_uint8_c:
+    case dods_int8_c: {
+    	dods_byte v = static_cast<dods_byte>(d_buf);
+        checksum.AddData(reinterpret_cast<uint8_t*>(&v), sizeof(uint8_t));
+        break;
+    }
+    case dods_uint16_c:
+    case dods_int16_c: {
+    	dods_int16 v = static_cast<dods_int16>(d_buf);
+        checksum.AddData(reinterpret_cast<uint8_t*>(&v), sizeof(uint16_t));
+        break;
+    }
+    case dods_uint32_c:
+    case dods_int32_c: {
+    	dods_int32 v = static_cast<dods_int32>(d_buf);
+        checksum.AddData(reinterpret_cast<uint8_t*>(&v), sizeof(uint32_t));
+        break;
+    }
+    case dods_uint64_c:
+    case dods_int64_c:
+        checksum.AddData(reinterpret_cast<uint8_t*>(&d_buf), sizeof(uint64_t));
+        break;
+
+    default:
+        assert(!"illegal type for D4Enum");
+    }
+}
+
+void
+D4Enum::set_is_signed(Type t)
+{
+	switch (t) {
+	case dods_byte_c:
+	case dods_uint8_c:
+	case dods_uint16_c:
+	case dods_uint32_c:
+	case dods_uint64_c:
+		d_is_signed = false;
+		break;
+
+	case dods_int8_c:
+	case dods_int16_c:
+	case dods_int32_c:
+	case dods_int64_c:
+		d_is_signed =  true;
+		break;
+
+	default:
+		assert(!"illegal type for D4Enum");
+		throw InternalErr(__FILE__, __LINE__, "Illegal type");
+	}
+}
+
+
+/**
+ * @brief Serialize a D4Enum
+ * Use the (integer) data type associated with an Enumeration definition to
+ * serialize the value of a D4Enum variable. This send just the bits that
+ * correspond to the declared type, not all 64-bits of storage used by a
+ * scalar D4Enum.
+ * @param m
+ * @param dmr Unused
+ * @param eval Unused
+ * @param filter Unused
+ * @exception Error is thrown if the value needs to be read and that operation fails.
+ */
+void
+D4Enum::serialize(D4StreamMarshaller &m, DMR &, /*ConstraintEvaluator &,*/ bool)
+{
+    if (!read_p())
+        read();          // read() throws Error
+
+	switch (d_element_type) {
+	case dods_byte_c:
+	case dods_uint8_c:
+		m.put_byte(d_buf);
+		break;
+	case dods_uint16_c:
+		m.put_uint16(d_buf);
+		break;
+	case dods_uint32_c:
+		m.put_uint32(d_buf);
+		break;
+	case dods_uint64_c:
+		m.put_uint64(d_buf);
+		break;
+
+	case dods_int8_c:
+		m.put_int8(d_buf);
+		break;
+	case dods_int16_c:
+		m.put_int16(d_buf);
+		break;
+	case dods_int32_c:
+		m.put_int32(d_buf);
+		break;
+	case dods_int64_c:
+		m.put_int64(d_buf);
+		break;
+	default:
+		assert(!"illegal type for D4Enum");
+	}
+}
+
+void
+D4Enum::deserialize(D4StreamUnMarshaller &um, DMR &)
+{
+	switch (d_element_type) {
+	case dods_byte_c:
+	case dods_uint8_c: {
+		dods_byte v;
+		um.get_byte(v);
+		d_buf = v;
+		break;
+	}
+	case dods_uint16_c: {
+		dods_uint16 v;
+		um.get_uint16(v);
+		d_buf = v;
+		break;
+	}
+	case dods_uint32_c: {
+		dods_uint32 v;
+		um.get_uint32(v);
+		d_buf = v;
+		break;
+	}
+	case dods_uint64_c: {
+		dods_uint64 v;
+		um.get_uint64(v);
+		d_buf = v;
+		break;
+	}
+
+	case dods_int8_c: {
+		dods_int8 v;
+		um.get_int8(v);
+		d_buf = v;
+		break;
+	}
+	case dods_int16_c: {
+		dods_int16 v;
+		um.get_int16(v);
+		d_buf = v;
+		break;
+	}
+	case dods_int32_c: {
+		dods_int32 v;
+		um.get_int32(v);
+		d_buf = v;
+		break;
+	}
+	case dods_int64_c: {
+		dods_int64 v;
+		um.get_int64(v);
+		d_buf = v;
+		break;
+	}
+	default:
+		assert(!"illegal type for D4Enum");
+	}
+}
+
+unsigned int D4Enum::val2buf(void *val, bool)
+{
+    if (!val)
+        throw InternalErr("The incoming pointer does not contain any data.");
+
+    switch (d_element_type) {
+     case dods_byte_c:
+     case dods_uint8_c:
+         d_buf = *(dods_byte*)val;
+         break;
+     case dods_uint16_c:
+         d_buf = *(dods_uint16*)val;
+         break;
+     case dods_uint32_c:
+         d_buf = *(dods_uint32*)val;
+         break;
+     case dods_uint64_c:
+         d_buf = *(dods_uint64*)val;
+         break;
+
+     case dods_int8_c:
+         d_buf = *(dods_int8*)val;
+         break;
+     case dods_int16_c:
+         d_buf = *(dods_int16*)val;
+         break;
+     case dods_int32_c:
+         d_buf = *(dods_int32*)val;
+         break;
+     case dods_int64_c:
+         d_buf = *(dods_int64*)val;
+         break;
+     default:
+         assert(!"illegal type for D4Enum");
+     }
+
+    return width();
+}
+
+unsigned int D4Enum::buf2val(void **val)
+{
+    if (!val)
+        throw InternalErr("NULL pointer");
+
+    switch (d_element_type) {
+     case dods_byte_c:
+     case dods_uint8_c:
+         if (!*val) *val = new dods_byte;
+         *(dods_byte *) * val = d_buf;
+         break;
+     case dods_uint16_c:
+         if (!*val) *val = new dods_uint16;
+         *(dods_uint16 *) * val = d_buf;
+         break;
+     case dods_uint32_c:
+         if (!*val) *val = new dods_uint32;
+         *(dods_uint32 *) * val = d_buf;
+         break;
+     case dods_uint64_c:
+         if (!*val) *val = new dods_uint64;
+         *(dods_uint64 *) * val = d_buf;
+         break;
+
+     case dods_int8_c:
+         if (!*val) *val = new dods_int8;
+         *(dods_int8*) * val = d_buf;
+         break;
+     case dods_int16_c:
+         if (!*val) *val = new dods_int16;
+         *(dods_int16 *) * val = d_buf;
+         break;
+     case dods_int32_c:
+         if (!*val) *val = new dods_int32;
+         *(dods_int32 *) * val = d_buf;
+         break;
+     case dods_int64_c:
+         if (!*val) *val = new dods_int64;
+         *(dods_int64 *) * val = d_buf;
+         break;
+     default:
+         assert(!"illegal type for D4Enum");
+     }
+
+    return width();
+}
+
+void D4Enum::print_val(ostream &out, string space, bool print_decl_p)
+{
+    if (print_decl_p) {
+        print_decl(out, space, false);
+        out << " = ";
+    }
+
+    DBG(cerr << "Enum union value: " << hex << d_buf << dec << endl);
+
+    if (is_signed()) {
+    	int64_t v;
+    	value(&v);
+    	out << v;
+    }
+    else {
+    	uint64_t v;
+    	value(&v);
+    	out << v;
+    }
+
+    if (print_decl_p)
+    	out << ";" << endl;
+}
+
+/** Write the XML representation of this variable. This method is used to
+    build the DDX XML response.
+    @param out Destination output stream
+    @param space Use this to indent child declarations. Default is "".
+    @param constrained If true, only print this if it's part part of the
+    current projection. Default is False. */
+void
+D4Enum::print_xml_writer(XMLWriter &xml, bool constrained)
+{
+    if (constrained && !send_p())
+        return;
+
+    if (xmlTextWriterStartElement(xml.get_writer(), (const xmlChar*)"Enum") < 0)
+        throw InternalErr(__FILE__, __LINE__, "Could not write Enum element");
+
+    if (!name().empty())
+        if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "name", (const xmlChar*)name().c_str()) < 0)
+            throw InternalErr(__FILE__, __LINE__, "Could not write attribute for name");
+
+
+    string path = d_enum_def->name();
+    // Not every D4EnumDef is a member of an instance of D4EnumDefs - the D4EnumDefs instance
+    // holds a reference to the D4Group that holds the Enum definitions.
+    // TODO Should this be changed - so the EnumDef holds a reference to its parent Group?
+    if (d_enum_def->parent()) {
+    	// print the FQN for the enum def; D4Group::FQN() includes the trailing '/'
+    	path = static_cast<D4Group*>(d_enum_def->parent()->parent())->FQN() + path;
+    }
+    if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "enum", (const xmlChar*)path.c_str()) < 0)
+        throw InternalErr(__FILE__, __LINE__, "Could not write attribute for enum");
+
+    attributes()->print_dap4(xml);
+
+    if (get_attr_table().get_size() > 0)
+        get_attr_table().print_xml_writer(xml);
+
+    if (xmlTextWriterEndElement(xml.get_writer()) < 0)
+        throw InternalErr(__FILE__, __LINE__, "Could not end Enum element");
+}
+
+
+bool
+D4Enum::ops(BaseType *b, int op)
+{
+    // Get the arg's value.
+    if (!read_p() && !read())
+        throw InternalErr(__FILE__, __LINE__, "This value not read!");
+
+    // Get the second arg's value.
+    if (!b->read_p() && !b->read())
+        throw InternalErr(__FILE__, __LINE__, "This value not read!");
+
+    switch (b->type()) {
+        case dods_int8_c:
+            return Cmp<dods_int64, dods_int8>(op, d_buf, static_cast<Int8*>(b)->value());
+        case dods_byte_c:
+            return SUCmp<dods_int64, dods_byte>(op, d_buf, static_cast<Byte*>(b)->value());
+        case dods_int16_c:
+            return Cmp<dods_int64, dods_int16>(op, d_buf, static_cast<Int16*>(b)->value());
+        case dods_uint16_c:
+            return SUCmp<dods_int64, dods_uint16>(op, d_buf, static_cast<UInt16*>(b)->value());
+        case dods_int32_c:
+            return Cmp<dods_int64, dods_int32>(op, d_buf, static_cast<Int32*>(b)->value());
+        case dods_uint32_c:
+            return SUCmp<dods_int64, dods_uint32>(op, d_buf, static_cast<UInt32*>(b)->value());
+#if 0
+            // FIXME
+        case dods_int64_c:
+            return Cmp<dods_int64, dods_int64>(op, d_buf, static_cast<D4Enum*>(b)->value());
+        case dods_uint64_c:
+            return SUCmp<dods_int64, dods_uint64>(op, d_buf, static_cast<D4Enum*>(b)->value());
+#endif
+        case dods_float32_c:
+            return Cmp<dods_int64, dods_float32>(op, d_buf, static_cast<Float32*>(b)->value());
+        case dods_float64_c:
+            return Cmp<dods_int64, dods_float64>(op, d_buf, static_cast<Float64*>(b)->value());
+        default:
+            return false;
+    }
+
+    return false;
+}
+
+/** @brief dumps information about this object
+ *
+ * Displays the pointer value of this instance and information about this
+ * instance.
+ *
+ * @param strm C++ i/o stream to dump the information to
+ * @return void
+ */
+void
+D4Enum::dump(ostream &strm) const
+{
+    strm << DapIndent::LMarg << "D4Enum::dump - (" << (void *) this << ")" << endl;
+    DapIndent::Indent();
+    BaseType::dump(strm);
+    strm << DapIndent::LMarg << "value: " << d_buf << endl;
+    DapIndent::UnIndent();
+}
+
+} // namespace libdap
+
diff --git a/D4Enum.h b/D4Enum.h
new file mode 100644
index 0000000..dd63cc3
--- /dev/null
+++ b/D4Enum.h
@@ -0,0 +1,200 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2013 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#ifndef _D4Enum_h
+#define _D4Enum_h 1
+
+#include <cassert>
+
+#include "BaseType.h"
+#include "dods-datatypes.h"
+
+#if 0
+#include "InternalErr.h"
+#include "dods-datatypes.h"
+#include "dods-limits.h"
+#include "util.h"
+#endif
+
+namespace libdap
+{
+
+class D4EnumDef;
+class ConstraintEvaluator;
+class Marshaller;
+class UnMarshaller;
+
+/**
+ * @brief Holds a DAP4 enumeration.
+ *
+ * @note When constructed a type for the Enum must be specified. If
+ * it is not an integer type, the Enum will use unsigned int 64. This
+ * is not the same as the enumeration type that is defined using the
+ * Enumeration XML element in the DMR - that information is stored
+ * in additional fields and used for checking values and printing the
+ * variable's declaration, but not for the internal storage of values.
+ *
+ * @todo Note the hack to remove the union...
+ */
+class D4Enum: public BaseType
+{
+	friend class D4EnumTest;
+
+protected:
+    // Use an unsigned 64-bit int. the value() and set_value()
+    // accessors cast to other types as needed, including signed ones.
+    uint64_t d_buf;
+
+private:
+    Type d_element_type;
+    D4EnumDef *d_enum_def;	// This is a weak pointer; don't delete
+    bool d_is_signed;
+
+    void m_duplicate(const D4Enum &src);
+    void m_check_value(int64_t v) const;
+
+    unsigned int m_type_width() const {
+        switch(d_element_type) {
+            case dods_byte_c:
+            case dods_int8_c:
+            case dods_uint8_c:
+                return 1;
+            case dods_int16_c:
+            case dods_uint16_c:
+                return 2;
+            case dods_int32_c:
+            case dods_uint32_c:
+                return 4;
+            case dods_int64_c:
+            case dods_uint64_c:
+                return 8;
+            case dods_null_c:
+            default:
+            	assert(!"illegal type for D4Enum");
+            	return 0;
+        }
+    }
+
+    D4Enum();	// No empty constructor
+
+public:
+    D4Enum(const string &name, const string &enum_type);
+
+    D4Enum(const string &name, Type type);
+
+    D4Enum(const string &name, const string &dataset, Type type);
+
+    D4Enum(const D4Enum &src) : BaseType(src) { m_duplicate(src); }
+
+    D4Enum &operator=(const D4Enum &rhs) {
+        if (this == &rhs)
+            return *this;
+        static_cast<BaseType &>(*this) = rhs;
+        m_duplicate(rhs);
+        return *this;
+    }
+
+    virtual ~D4Enum() { }
+
+    virtual D4EnumDef *enumeration() const { return d_enum_def; }
+    virtual void set_enumeration(D4EnumDef *enum_def);
+
+    virtual BaseType *ptr_duplicate() { return new D4Enum(*this); }
+
+    Type element_type() { return d_element_type; }
+    void set_element_type(Type type) { d_element_type = type; }
+
+    bool is_signed() const { return d_is_signed; }
+    void set_is_signed(Type t);
+
+	/**
+	 * @brief Get the value of an Enum
+	 * Get the value of this instance. The caller is responsible
+	 * for using a type T than can hold the value.
+	 *
+	 * @param v Value-result parameter; return the value of the Enum
+	 * in this variable.
+	 */
+	template<typename T> void value(T *v) const {
+		*v = static_cast<T>(d_buf);
+	}
+
+    /**
+     * @brief Set the value of the Enum
+     * Template member function to set the value of the Enum. The libdap library
+     * contains versions of this member function for dods_byte, ..., dods_uint64
+     * types for the parameter \c v.
+     *
+     * @param v Set the Enum to this value.
+     * @param check_value If true test the value 'v' against the type of the
+     * Enum. Defaults to true.
+     */
+    template <typename T> void set_value(T v, bool check_value = true)
+    {
+    	if (check_value) m_check_value(v);
+    	d_buf = static_cast<int64_t>(v);
+    }
+
+    /**
+     * @brief Return the number of bytes in an instance of an Enum.
+     * This returns the number of bytes an instance of Enum will use
+     * in memory or on the wire (i.e., in a serialization of
+     * the type). On the wire this type uses the minimum number of
+     * bytes for the given Enum type - an Enum with type Byte uses
+     * one byte, Int16 uses two, and so on. In memory, a single instance
+     * uses 64-bits but a vector of these will use the same number of
+     * bytes per value as the on-the-wire representation.
+     *
+     * @note The private method m_type_width() returns the byte width
+     * used for the on-the-wire representation of values.
+     *
+     * @return The number of bytes used by a value.
+     */
+    virtual unsigned int width(bool /* constrained */ = false) const { return /*sizeof(int64_t);*/ m_type_width();}
+
+    // DAP4
+    virtual void compute_checksum(Crc32 &checksum);
+    virtual void serialize(D4StreamMarshaller &m, DMR &dmr, /*ConstraintEvaluator &eval,*/ bool filter = false);
+    virtual void deserialize(D4StreamUnMarshaller &um, DMR &dmr);
+
+    virtual void print_val(ostream &out, string space = "", bool print_decl_p = true);
+
+    virtual void print_xml_writer(XMLWriter &xml, bool constrained);
+
+    virtual bool ops(BaseType *b, int op);
+
+    virtual void dump(ostream &strm) const;
+
+    unsigned int val2buf(void *, bool);
+    unsigned int buf2val(void **);
+
+    virtual std::vector<BaseType *> *transform_to_dap2(AttrTable *parent_attr_table);
+
+};
+
+} // namespace libdap
+
+#endif // _D4Enum_h
+
diff --git a/D4EnumDefs.cc b/D4EnumDefs.cc
new file mode 100644
index 0000000..61b152b
--- /dev/null
+++ b/D4EnumDefs.cc
@@ -0,0 +1,136 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2013 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#include "config.h"
+
+#include "D4Group.h"
+#include "D4EnumDefs.h"
+
+#include <sstream>
+
+#include "dods-limits.h"
+#include "util.h"
+
+namespace libdap {
+
+/** Test if a particular value is legal for a given type. In a D4EnumDef,
+ * all values are actually stored in a long long, but the different
+ * enumerations can specify different types like Byte, Int32, ..., and this
+ * method is used to test that the values match those types.
+ */
+bool
+D4EnumDef::is_valid_enum_value(long long value)
+{
+    switch (type()) {
+        case dods_int8_c:
+            return (value >= DODS_SCHAR_MIN && value <= DODS_SCHAR_MAX);
+        case dods_byte_c:
+        case dods_uint8_c:
+            return (value >= 0 && static_cast<unsigned long long>(value) <= DODS_UCHAR_MAX);
+        case dods_int16_c:
+            return (value >= DODS_SHRT_MIN && value <= DODS_SHRT_MAX);
+        case dods_uint16_c:
+            return (value >= 0 && static_cast<unsigned long long>(value) <= DODS_USHRT_MAX);
+        case dods_int32_c:
+            return (value >= DODS_INT_MIN && value <= DODS_INT_MAX);
+        case dods_uint32_c:
+            return (value >= 0 && static_cast<unsigned long long>(value) <= DODS_UINT_MAX);
+        case dods_int64_c:
+            return true; // This is always true: (value >= DODS_LLONG_MIN && value <= DODS_LLONG_MAX);
+        case dods_uint64_c:
+            return (value >= 0 /*Always true: && static_cast<unsigned long long>(value) <= DODS_ULLONG_MAX*/);
+        default:
+            return false;
+    }
+}
+
+// Note that in order for this to work the second argument must not be a reference.
+// jhrg 8/20/13
+static bool
+enum_def_name_eq(D4EnumDef *d, const string name)
+{
+    return d->name() == name;
+}
+
+D4EnumDef *
+D4EnumDefs::find_enum_def(const string &name)
+{
+    D4EnumDefIter d = find_if(d_enums.begin(), d_enums.end(), bind2nd(ptr_fun(enum_def_name_eq), name));
+    return (d != d_enums.end()) ? *d: 0;
+}
+
+void D4EnumDef::print_value(XMLWriter &xml, const D4EnumDef::tuple &tuple) const
+{
+    if (xmlTextWriterStartElement(xml.get_writer(), (const xmlChar*)"EnumConst") < 0)
+        throw InternalErr(__FILE__, __LINE__, "Could not write EnumConst element");
+
+    if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "name", (const xmlChar*)tuple.label.c_str()) < 0)
+        throw InternalErr(__FILE__, __LINE__, "Could not write attribute for name");
+
+    ostringstream oss;
+    oss << tuple.value;
+    if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "value", (const xmlChar*)oss.str().c_str()) < 0)
+        throw InternalErr(__FILE__, __LINE__, "Could not write attribute for value");
+
+    if (xmlTextWriterEndElement(xml.get_writer()) < 0)
+        throw InternalErr(__FILE__, __LINE__, "Could not end EnumConst element");
+}
+
+void D4EnumDef::print_dap4(XMLWriter &xml) const
+{
+    vector<D4EnumDef::tuple>::const_iterator i = d_tuples.begin();
+    while(i != d_tuples.end()) {
+        print_value(xml, *i++);
+    }
+}
+
+void D4EnumDefs::m_print_enum(XMLWriter &xml, D4EnumDef *e) const
+{
+    if (xmlTextWriterStartElement(xml.get_writer(), (const xmlChar*)"Enumeration") < 0)
+        throw InternalErr(__FILE__, __LINE__, "Could not write Enumeration element");
+
+    if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "name", (const xmlChar*)e->name().c_str()) < 0)
+        throw InternalErr(__FILE__, __LINE__, "Could not write attribute for name");
+
+    if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "basetype", (const xmlChar*)D4type_name(e->type()).c_str()) < 0)
+        throw InternalErr(__FILE__, __LINE__, "Could not write attribute for name");
+
+    // print each of e.values
+    e->print_dap4(xml);
+
+    if (xmlTextWriterEndElement(xml.get_writer()) < 0)
+        throw InternalErr(__FILE__, __LINE__, "Could not end Enumeration element");
+}
+
+void D4EnumDefs::print_dap4(XMLWriter &xml, bool constrained) const
+{
+    D4EnumDefCIter i = d_enums.begin();
+    while (i != d_enums.end()) {
+        if (!constrained || parent()->find_first_var_that_uses_enumeration(*i))
+            m_print_enum(xml, *i);
+        ++i;
+    }
+}
+
+} /* namespace libdap */
diff --git a/D4EnumDefs.h b/D4EnumDefs.h
new file mode 100644
index 0000000..98a340d
--- /dev/null
+++ b/D4EnumDefs.h
@@ -0,0 +1,181 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2013 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#ifndef D4ENUMDEF_H_
+#define D4ENUMDEF_H_
+
+#include <string>
+#include <vector>
+#include <algorithm>
+#include <functional>
+
+#include "BaseType.h"
+
+using namespace std;
+
+namespace libdap {
+
+class D4EnumDefs;
+class D4Group;
+
+class D4EnumDef {
+    string d_name;
+    Type d_type;
+    D4EnumDefs *d_parent;
+
+    struct tuple {
+        string label;
+        long long value;
+
+        tuple(const string &l, long long v) : label(l), value(v) {}
+    };
+
+    vector<tuple> d_tuples;
+
+    void m_duplicate(const D4EnumDef &rhs)
+    {
+        d_name = rhs.d_name;
+        d_type = rhs.d_type;
+        d_parent = rhs.d_parent;
+        d_tuples = rhs.d_tuples;
+    }
+
+    void print_value(XMLWriter &xml, const D4EnumDef::tuple &tuple) const;
+
+public:
+    typedef vector<tuple>::iterator D4EnumValueIter;
+
+    D4EnumDef() : d_name(""), d_type(dods_null_c), d_parent(0) {}
+    D4EnumDef(const string &n, const Type &t, D4EnumDefs *e = 0) : d_name(n), d_type(t), d_parent(e) {}
+    D4EnumDef(const D4EnumDef &rhs) {
+        m_duplicate(rhs);
+    }
+
+    string name() const { return d_name; }
+    void set_name(const string &n) { d_name = n; }
+
+    Type type() const { return d_type; }
+    void set_type(Type t) { d_type = t; }
+
+    D4EnumDefs *parent() const { return d_parent; }
+    void set_parent(D4EnumDefs *e) { d_parent = e; }
+
+    bool empty() const { return d_tuples.empty(); }
+
+    void add_value(const string &label, long long value) {
+        d_tuples.push_back(tuple(label, value));
+    }
+
+    D4EnumValueIter value_begin() { return d_tuples.begin(); }
+    D4EnumValueIter value_end() { return d_tuples.end(); }
+    string &label(D4EnumValueIter i) { return (*i).label; }
+    long long value(D4EnumValueIter i) { return (*i).value; }
+
+    bool is_valid_enum_value(long long value);
+    void print_dap4(XMLWriter &xml) const;
+};
+
+/** The Enumerations defined for a Group. */
+class D4EnumDefs {
+    vector<D4EnumDef*> d_enums;
+
+    D4Group *d_parent;		// the group that holds this set of D4EnumDefs; weak pointer, don't delete
+
+    void m_print_enum(XMLWriter &xml, D4EnumDef *e) const;
+
+    void m_duplicate(const D4EnumDefs &rhs) {
+        D4EnumDefCIter i = rhs.d_enums.begin();
+        while (i != rhs.d_enums.end()) {
+            d_enums.push_back(new D4EnumDef(**i++));    // deep copy
+        }
+
+        d_parent = rhs.d_parent;
+    }
+
+public:
+    typedef vector<D4EnumDef*>::iterator D4EnumDefIter;
+    typedef vector<D4EnumDef*>::const_iterator D4EnumDefCIter;
+
+    D4EnumDefs() : d_parent(0) {}
+    D4EnumDefs(const D4EnumDefs &rhs) {
+        m_duplicate(rhs);
+    }
+
+    virtual ~D4EnumDefs() {
+        D4EnumDefIter i = d_enums.begin();
+        while(i != d_enums.end()) {
+            delete *i++;
+        }
+    }
+
+    D4EnumDefs &operator=(const D4EnumDefs &rhs) {
+        if (this == &rhs) return *this;
+        m_duplicate(rhs);
+        return *this;
+    }
+
+    bool empty() const { return d_enums.empty(); }
+
+    D4Group *parent() const { return d_parent; }
+    void set_parent(D4Group *p) { d_parent = p; }
+
+    /** Append a new D4EnumDef.
+     *
+     * @param enum_def The enumeration.
+     */
+    void add_enum(D4EnumDef *enum_def) {
+    	add_enum_nocopy(new D4EnumDef(*enum_def));
+    }
+    void add_enum_nocopy(D4EnumDef *enum_def) {
+    	enum_def->set_parent(this);
+        d_enums.push_back(enum_def);
+    }
+
+    /// Get an iterator to the start of the enumerations
+    D4EnumDefIter enum_begin() { return d_enums.begin(); }
+
+    /// Get an iterator to the end of the enumerations
+    D4EnumDefIter enum_end() { return d_enums.end(); }
+
+    D4EnumDef *find_enum_def(const string &name);
+
+    /**
+     * @brief Insert a D4EnumDef.
+     * Insert a D4EnumDef before the position specified by the iterator.
+     * @note Calling this method invalidates all iterators that reference this
+     * D4EnumDef object.
+     * @param enum_def Make a deep copy and insert the enumeration definition
+     * @param i iterator
+     */
+    void insert_enum(D4EnumDef *enum_def, D4EnumDefIter i) {
+    	D4EnumDef *enum_def_copy = new D4EnumDef(*enum_def);
+    	enum_def_copy->set_parent(this);
+        d_enums.insert(i, enum_def_copy);
+    }
+
+    void print_dap4(XMLWriter &xml, bool constrained = false) const;
+};
+
+} /* namespace libdap */
+#endif /* D4ENUMDEF_H_ */
diff --git a/D4FilterClause.cc b/D4FilterClause.cc
new file mode 100644
index 0000000..8ae68e2
--- /dev/null
+++ b/D4FilterClause.cc
@@ -0,0 +1,212 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1996,1998,1999
+// Please first read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+// jhrg,jimg James Gallagher <jgallagher@gso.uri.edu>
+
+// Implementation for the CE Clause class.
+
+
+#include "config.h"
+
+#include "D4RValue.h"
+#include "D4FilterClause.h"
+
+using namespace std;
+
+namespace libdap {
+
+void
+D4FilterClauseList::m_duplicate(const D4FilterClauseList &src)
+{
+    //D4FilterClauseList &non_c_src = const_cast<D4FilterClauseList &>(src);
+
+    for (D4FilterClauseList::citer i = src.cbegin(), e = src.cend(); i != e; ++i) {
+        D4FilterClause *fc = *i;
+        d_clauses.push_back(new D4FilterClause(*fc));
+    }
+}
+
+D4FilterClauseList::~D4FilterClauseList()
+{
+    for (D4FilterClauseList::iter i = d_clauses.begin(), e = d_clauses.end(); i != e; ++i) {
+        delete *i;
+    }
+}
+
+/**
+ * @brief Evaluate the list of clauses
+ *
+ * Evaluate the list of clauses and return false when/if one is found to be false.
+ * This evaluates the clauses in the order they are stored and stops evaluation a
+ * the first false clause.
+ *
+ * @param dmr Use this DMR when evaluating clauses - for clauses that contain functions,
+ * not currently in the DAP4 specification.
+ * @return True if each of the clauses' value is true, otherwise false
+ */
+bool
+D4FilterClauseList::value(DMR &dmr)
+{
+    for (D4FilterClauseList::iter i = d_clauses.begin(), e = d_clauses.end(); i != e; ++i) {
+        if ((*i)->value(dmr) == false)
+            return false;
+    }
+
+    return true;
+}
+
+/**
+ * @brief Evaluate the list of clauses
+ *
+ * This version of value() does not need a DMR parameter (but will not work
+ * if the clauses contain a function call (which is not currently supported
+ * by the spec).
+ *
+ * @return True if each clauses' value is true, false otherwise
+ * @see D4FilterClauseList::value(DMR &dmr)
+ */
+bool
+D4FilterClauseList::value()
+{
+    for (D4FilterClauseList::iter i = d_clauses.begin(), e = d_clauses.end(); i != e; ++i) {
+        if ((*i)->value() == false)
+            return false;
+    }
+
+    return true;
+}
+
+void D4FilterClause::m_duplicate(const D4FilterClause &rhs) {
+    d_op = rhs.d_op;
+
+    d_arg1 = new D4RValue(*rhs.d_arg1);
+    d_arg2 = new D4RValue(*rhs.d_arg2);
+
+#if 0
+    // Copy the D4RValue pointer if the 'value_kind' is a basetype,
+    // but build a new D4RValue if it is a constant (because the
+    // basetype is a weak pointer.
+    switch (rhs.d_arg1->get_kind()) {
+    case D4RValue::basetype:
+        d_arg1 = rhs.d_arg1;
+        break;
+    case D4RValue::constant:
+        d_arg1 = new D4RValue(*(rhs.d_arg1));
+        break;
+    default:
+        throw Error(malformed_expr, "found a filter clause with a function call.");
+    }
+
+    switch (rhs.d_arg2->get_kind()) {
+    case D4RValue::basetype:
+        d_arg2 = rhs.d_arg2;
+        break;
+    case D4RValue::constant:
+        d_arg2 = new D4RValue(*(rhs.d_arg2));
+        break;
+    default:
+        throw Error(malformed_expr, "found a filter clause with a function call.");
+    }
+#endif
+}
+
+/**
+ * @brief Get the value of this relational expression.
+ * This version of value() works for function clauses, although that's
+ * not supported by the syntax at this time.
+ * @param dmr The DMR to use when evaluating a function
+ * @return True if the clause is true, false otherwise.
+ */
+bool D4FilterClause::value(DMR &dmr)
+{
+	switch (d_op) {
+	case null:
+		throw InternalErr(__FILE__, __LINE__, "While evaluating a constraint filter clause: Found a null operator");
+
+	case less:
+	case greater:
+	case less_equal:
+	case greater_equal:
+	case equal:
+	case not_equal:
+	case match:
+		return cmp(d_op, d_arg1->value(dmr), d_arg2->value(dmr));
+
+	case ND:
+	case map:
+		throw InternalErr(__FILE__, __LINE__, "While evaluating a constraint filter clause: Filter operator not implemented");
+
+	default:
+		throw InternalErr(__FILE__, __LINE__, "While evaluating a constraint filter clause: Unrecognized operator");
+	}
+}
+
+/**
+ * @brief Get the value of this relational expression.
+ * This version of value() will not work for clauses where one of the
+ * rvalues is a function call. This is not currently supported by the
+ * DAP4 specification, so it's probably no great loss.
+ * @return True if the clause is true, false otherwise.
+ */
+bool D4FilterClause::value()
+{
+    switch (d_op) {
+    case null:
+        throw InternalErr(__FILE__, __LINE__, "While evaluating a constraint filter clause: Found a null operator");
+
+    case less:
+    case greater:
+    case less_equal:
+    case greater_equal:
+    case equal:
+    case not_equal:
+    case match:
+        return cmp(d_op, d_arg1->value(), d_arg2->value());
+
+    case ND:
+    case map:
+        throw InternalErr(__FILE__, __LINE__, "While evaluating a constraint filter clause: Filter operator not implemented");
+
+    default:
+        throw InternalErr(__FILE__, __LINE__, "While evaluating a constraint filter clause: Unrecognized operator");
+    }
+}
+
+// It may be better to use the code in the Byte, ..., classes that was
+// impl'd for DAP2 (with extensions). For now, test this and build the
+// rest of the filter implementation. But there is certainly a more _compact_
+// way to code this!
+//
+// Optimize the extraction of constant values.
+bool D4FilterClause::cmp(ops op, BaseType *arg1, BaseType *arg2)
+{
+    return arg1->d4_ops(arg2, op);
+}
+
+} // namespace libdap
diff --git a/D4FilterClause.h b/D4FilterClause.h
new file mode 100644
index 0000000..9b64327
--- /dev/null
+++ b/D4FilterClause.h
@@ -0,0 +1,202 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2015 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#ifndef _d4_filter_clause_h
+#define _d4_filter_clause_h
+
+#include <cassert>
+#include <vector>
+
+#include "ce_expr.tab.hh"   // Use the same codes for D4 as we use in DAP2
+
+namespace libdap
+{
+
+class D4Rvalue;
+class D4FilterClause;
+
+/**
+ * @brief List of DAP4 Filter Clauses
+ *
+ */
+class D4FilterClauseList
+{
+private:
+    std::vector<D4FilterClause *> d_clauses;
+
+    void m_duplicate(const D4FilterClauseList &src);
+
+public:
+    typedef std::vector<D4FilterClause *>::iterator iter;
+    typedef std::vector<D4FilterClause *>::const_iterator citer;
+
+    D4FilterClauseList() { }
+    D4FilterClauseList(const D4FilterClauseList &src) { m_duplicate(src); }
+
+    D4FilterClauseList(D4FilterClause *c) { add_clause(c); }
+
+    virtual ~D4FilterClauseList();
+
+    D4FilterClauseList &operator=(const D4FilterClauseList &rhs) {
+        if (this == &rhs)
+            return *this;
+
+        m_duplicate(rhs);
+
+        return *this;
+    }
+
+    void add_clause(D4FilterClause *c) {
+        d_clauses.push_back(c);
+    }
+
+    D4FilterClause *get_clause(unsigned int i) {
+        return d_clauses.at(i);
+    }
+
+    citer cbegin() const { return d_clauses.begin(); }
+    citer cend() const { return d_clauses.end(); }
+
+    unsigned int size() const { return d_clauses.size(); }
+
+    // get the clause value; this version supports functional clauses
+    bool value(DMR &dmr);
+
+    bool value();
+};
+
+/**
+ * @brief DAP4 filter clauses
+ *
+ * The DAP4 constraint expression provides a way to filter the values of
+ * Sequences (and possibly arrays and coverages, although those are still
+ * more ideas than anything at this point). This class holds the operator
+ * and operands of one DAP4 constraint's filter clause. The object is built
+ * during the parse phase of the constraint evaluation but is not evaluated
+ * until the data are sent or interned (read into the DAP4 variable object
+ * so that they can be used as input to some process other than directly
+ * being sent to a remote client).
+ *
+ * For filter clauses that are to be applied to a Sequence, each D4RValue
+ * will either be a constant or a BaseType* that will reference one of the
+ * Sequences fields. The method 'value()' is effectively the evaluator for
+ * the clause and nominally reads values from the rvalue objects.
+ *
+ * @note Potential optimization: Because Sequences might have an optimized
+ * representation as a STL vector of some built in types, there could be a
+ * value() method that takes a value and compares it to the clause's constant
+ * value using the supplied op.
+ *
+ * @note The 'ND' and 'map' ops are 'still just an idea' parts.
+ */
+class D4FilterClause
+{
+public:
+	enum ops {
+		// Stock relops
+		null = 0,
+		less = SCAN_LESS,
+		greater = SCAN_GREATER,
+		less_equal = SCAN_LESS_EQL,
+		greater_equal = SCAN_GREATER_EQL,
+		equal = SCAN_EQUAL,
+		not_equal = SCAN_NOT_EQUAL,
+		// Regex match for strings
+		match = SCAN_REGEXP,
+		// The mapping operator; not sure if this will be implemented
+		map,
+		// No Data 'operator' for array filtering; may not be impl'd
+		ND
+	};
+
+private:
+    /** The operator */
+    ops d_op;
+
+    D4RValue *d_arg1, *d_arg2;
+
+    D4FilterClause() : d_op(null), d_arg1(0), d_arg2(0) { }
+
+    void m_duplicate(const D4FilterClause &rhs);
+
+    // These methods factor out first the first argument and then the
+    // second. I could write one really large cmp() for all of this...
+    //template<typename T> bool cmp(ops op, BaseType *arg1, T arg2);
+    bool cmp(ops op, BaseType *arg1, BaseType *arg2);
+
+    friend class D4FilterClauseList;
+
+public:
+    /**
+     * Build a D4FilterClause. The clause will take ownership of
+     * the two pointer arguments and delete them.
+     *
+     * @note When comparing an unsigned variable (UInt16) with a constant,
+     * at parse time (i.e., when the D4FilterClause is made) check that the
+     * constant is >= 0 and store it in an unsigned value at that time. This
+     * will avoid having to make the test repeatedly during filter evaluation.
+     *
+     * @note When parsing a constant, extract the value from the BaseType and
+     * store it in a local field, to avoid the overhead of extracting the
+     * value and looking up its type over an over.
+     *
+     * @param op The operator
+     * @param arg1 The left-hand operand
+     * @param arg2 The right-hand operand
+     */
+    D4FilterClause(const ops op, D4RValue *arg1, D4RValue *arg2) :
+    	d_op(op), d_arg1(arg1), d_arg2(arg2) {
+    	assert(op != null && "null operator");
+    	assert(arg1 && "null arg1");
+    	assert(arg2 && "null arg2");
+    }
+
+    D4FilterClause(const D4FilterClause &src) {
+        m_duplicate(src);
+    }
+
+    D4FilterClause &operator=(const D4FilterClause &rhs) {
+        if (this == &rhs)
+            return *this;
+
+        m_duplicate(rhs);
+
+        return *this;
+    }
+
+    virtual ~D4FilterClause() {
+    	delete d_arg1;
+    	delete d_arg2;
+    }
+
+    // get the clause value; this version supports functional clauses
+    bool value(DMR &dmr);
+
+    bool value();
+};
+
+} // namespace libdap
+
+#endif // _clause_h
diff --git a/D4Function.h b/D4Function.h
new file mode 100644
index 0000000..172b0fe
--- /dev/null
+++ b/D4Function.h
@@ -0,0 +1,46 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2014 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+
+#ifndef D_FUNCTION_H_
+#define D_FUNCTION_H_
+
+namespace libdap {
+
+class BaseType;
+class D4RValueList;
+class DMR;
+
+// D4Function is a pointer to a function that takes a pointer to an RValueList and
+// a reference to a DMR and returns a pointer to a BaseTYpe.
+//
+// I think this would be better as a 'function that takes...' instead of a 'pointer
+// to a function that takes...' but I used this to make the code fit more closely to
+// the pattern established by the DAP2 CE functions. jhrg 3/10/14
+
+typedef BaseType* (*D4Function)(D4RValueList *, DMR &);
+
+}// namespace libdap
+
+#endif /* D_FUNCTION_H_ */
diff --git a/D4Group.cc b/D4Group.cc
new file mode 100644
index 0000000..8013fb6
--- /dev/null
+++ b/D4Group.cc
@@ -0,0 +1,745 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2013 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#include "config.h"
+
+//#define DODS_DEBUG
+
+#include <iostream>
+#include <sstream>
+#include <iomanip>
+
+#include <stdint.h>
+
+#include "crc.h"
+
+#include "BaseType.h"
+#include "Array.h"
+
+#include "XMLWriter.h"
+#include "D4Attributes.h"
+#include "D4Dimensions.h"
+#include "D4Group.h"
+#include "D4Enum.h"
+
+#include "D4StreamMarshaller.h"
+#include "D4StreamUnMarshaller.h"
+
+#include "debug.h"
+
+/**
+ * Define this symbol iff we decide to include information about the
+ * byte order of the response (as sent from the server) so that the
+ * client can determine the correct CRC32 hash code. jhrg 1/4/16
+ */
+#undef INCLUDE_SOURCE_BYTE_ORDER
+
+namespace libdap {
+
+void D4Group::m_duplicate(const D4Group &g)
+{
+	DBG(cerr << "In D4Group::m_duplicate for " << g.name() << endl);
+
+	// dims; deep copy, this is the parent
+	if (g.d_dims) {
+		d_dims = new D4Dimensions(*(g.d_dims));
+		d_dims->set_parent(this);
+
+	    // Update all of the D4Dimension weak pointers in the Array objects.
+	    // This is a hack - we know that Constructor::m_duplicate() has been
+	    // called at this point and any Array instances have dimension pointers
+	    // that reference the 'old' dimensions (g.d_dims) and not the 'new'
+	    // dimensions made above. Scan every array and re-wire the weak pointers.
+	    // jhrg 8/15/14
+	    Vars_citer vi = d_vars.begin();
+	    while (vi != d_vars.end()) {
+	        if ((*vi)->type() == dods_array_c)
+	            static_cast<Array*>(*vi)->update_dimension_pointers(g.d_dims, d_dims);
+	        ++vi;
+	    }
+	}
+
+#if 0
+	// Moved this block up inside the if because g.d_dims might be false. jhrg 9/14/15
+	Vars_citer vi = d_vars.begin();
+	while (vi != d_vars.end()) {
+		if ((*vi)->type() == dods_array_c)
+			static_cast<Array*>(*vi)->update_dimension_pointers(g.d_dims, d_dims);
+		++vi;
+	}
+#endif
+
+	// enums; deep copy
+	if (g.d_enum_defs) d_enum_defs = new D4EnumDefs(*g.d_enum_defs);
+
+    // groups
+    groupsCIter i = g.d_groups.begin();
+    while(i != g.d_groups.end()) {
+        // Only D4Groups are in the d_groups container.
+        D4Group *g = static_cast<D4Group*>((*i++)->ptr_duplicate());
+        add_group_nocopy(g);
+    }
+
+    DBG(cerr << "Exiting D4Group::m_duplicate" << endl);
+}
+
+/** The D4Group constructor requires only the name of the variable
+    to be created. The name may be omitted, which will create a
+    nameless variable. This may be adequate for some applications.
+
+    @note This type is available in DAP4 only.
+    See http://docs.opendap.org/index.php/DAP4:_Specification_Volume_1#Groups
+
+
+    @param n A string containing the name of the variable.
+*/
+D4Group::D4Group(const string &name)
+    : Constructor(name, dods_group_c, /*is_dap4*/true), d_dims(0), d_enum_defs(0)
+{}
+
+/** The D4Group server-side constructor requires the name of the variable
+    to be created and the dataset name from which this variable is being
+    created. Used on server-side handlers.
+
+    @note This type is available in DAP4 only.
+    See http://docs.opendap.org/index.php/DAP4:_Specification_Volume_1#Groups
+
+    @param n A string containing the name of the variable.
+    @param d A string containing the name of the dataset.
+*/
+D4Group::D4Group(const string &name, const string &dataset)
+    : Constructor(name, dataset, dods_group_c, /*is_dap4*/true), d_dims(0), d_enum_defs(0)
+{}
+
+/** The D4Group copy constructor. */
+D4Group::D4Group(const D4Group &rhs) : Constructor(rhs), d_dims(0), d_enum_defs(0)
+{
+	DBG(cerr << "In D4Group::copy_ctor for " << rhs.name() << endl);
+    m_duplicate(rhs);
+}
+
+D4Group::~D4Group()
+{
+    delete d_dims;
+    delete d_enum_defs;
+
+    groupsIter i = d_groups.begin();
+    while(i != d_groups.end())
+        delete *i++;
+}
+
+#if 0
+D4Group *
+
+// I think this was a mistake. jhrg 11/17/16
+#endif
+BaseType *
+D4Group::ptr_duplicate()
+{
+    return new D4Group(*this);
+}
+
+D4Group &
+D4Group::operator=(const D4Group &rhs)
+{
+    if (this == &rhs)
+        return *this;
+
+    dynamic_cast<Constructor &>(*this) = rhs; // run Constructor=
+
+    m_duplicate(rhs);
+
+    return *this;
+}
+
+/**
+ * Get the Fully Qualified Name for this Group, including the Group. This
+ * uses the name representation described in the DAP4 specification.
+ *
+ * @return The FQN in a string
+ */
+string
+D4Group::FQN() const
+{
+	// The root group is named "/" (always)
+	return (name() == "/") ? "/" : static_cast<D4Group*>(get_parent())->FQN() + name() + "/";
+}
+
+// Note that in order for this to work the second argument must not be a reference.
+// jhrg 8/20/13
+static bool
+name_eq(D4Group *g, const string name)
+{
+	return g->name() == name;
+}
+
+D4Group *
+D4Group::find_child_grp(const string &grp_name)
+{
+	groupsIter g = find_if(grp_begin(), grp_end(), bind2nd(ptr_fun(name_eq), grp_name));
+	return (g == grp_end()) ? 0: *g;
+}
+
+// TODO Add constraint param? jhrg 11/17/13
+BaseType *
+D4Group::find_first_var_that_uses_dimension(D4Dimension *dim)
+{
+    // for each group, starting with the root group
+    //    for each variable in the group that is marked to send and is an array
+    //        return the btp if it uses the D4Dimension
+    //    if it contains child groups, search those
+    //        return the btp if it uses the D4Dimension
+    // return null
+
+    // exhaustive breadth-first search for 'dim
+
+    // root group
+    for (Vars_iter i = var_begin(), e = var_end(); i != e; ++i) {
+        if ((*i)->send_p() && (*i)->type() == dods_array_c) {
+            Array *a = static_cast<Array*>(*i);
+            for (Array::Dim_iter di = a->dim_begin(), de = a->dim_end(); di != de; ++di) {
+                if (a->dimension_D4dim(di) == dim)
+                    return a;
+            }
+        }
+    }
+
+    for (groupsIter i = grp_begin(), e = grp_end(); i != e; ++i) {
+        BaseType *btp = (*i)->find_first_var_that_uses_dimension(dim);
+        if (btp) return btp;
+    }
+
+    return 0;
+}
+
+BaseType *
+D4Group::find_first_var_that_uses_enumeration(D4EnumDef *enum_def)
+{
+    // for each group, starting with the root group
+    //    for each variable in the group that is marked to send and is an array
+    //        return the btp if it uses the D4EnumDef
+    //    if it contains child groups, search those
+    //        return the btp if it uses the D4EnumDef
+    // return null
+
+    // exhaustive breadth-first search for 'dim
+
+    // root group
+    for (Vars_iter i = var_begin(), e = var_end(); i != e; ++i) {
+        if ((*i)->send_p() && (*i)->type() == dods_enum_c) {
+            D4Enum *e = static_cast<D4Enum*>(*i);
+            if (e->enumeration() == enum_def)
+                return e;
+        }
+    }
+
+    for (groupsIter i = grp_begin(), e = grp_end(); i != e; ++i) {
+        BaseType *btp = (*i)->find_first_var_that_uses_enumeration(enum_def);
+        if (btp) return btp;
+    }
+
+    return 0;
+}
+
+/**
+ * @brief Find the dimension using a path.
+ * Using the DAP4 name syntax, lookup a dimension. The dimension must
+ * be defined before it is used. The \c path argument may be either an
+ * absolute path or a relative path. Note that the name syntax does not
+ * provide for paths to contain an 'up one level' symbol.
+ * @param path The path to the dimension
+ * @return A pointer to the D4Dimension object.
+ */
+D4Dimension *
+D4Group::find_dim(const string &path)
+{
+	string lpath = path;		// get a mutable copy
+
+	// special-case for the root group
+	if (lpath[0] == '/') {
+		if (name() != "/")
+			throw InternalErr(__FILE__, __LINE__, "Lookup of a FQN starting in non-root group.");
+		else
+			lpath = lpath.substr(1);
+	}
+
+	string::size_type pos = lpath.find('/');
+	if (pos == string::npos) {
+		// name looks like 'bar'
+		return dims()->find_dim(lpath);
+	}
+
+	// name looks like foo/bar/baz where foo and bar must be groups
+	string grp_name = lpath.substr(0, pos);
+	lpath = lpath.substr(pos + 1);
+
+	D4Group *grp = find_child_grp(grp_name);
+	return (grp == 0) ? 0: grp->find_dim(lpath);
+}
+
+Array *
+D4Group::find_map_source(const string &path)
+{
+	BaseType *map_source = m_find_map_source_helper(path);
+
+	// TODO more complete semantic checking jhrg 10/16/13
+	if (map_source && map_source->type() == dods_array_c) return static_cast<Array*>(map_source);
+
+	return 0;
+}
+
+BaseType *
+D4Group::m_find_map_source_helper(const string &path)
+{
+	string lpath = path;		// get a mutable copy
+
+	// special-case for the root group
+	if (lpath[0] == '/') {
+		if (name() != "/")
+			throw InternalErr(__FILE__, __LINE__, "Lookup of a FQN starting in non-root group.");
+		else
+			lpath = lpath.substr(1);
+	}
+
+	string::size_type pos = lpath.find('/');
+	if (pos == string::npos) {
+		// name looks like 'bar'
+		return var(lpath);
+	}
+
+	// name looks like foo/bar/baz where foo an bar must be groups
+	string grp_name = lpath.substr(0, pos);
+	lpath = lpath.substr(pos + 1);
+
+	D4Group *grp = find_child_grp(grp_name);
+	return (grp == 0) ? 0: grp->var(lpath);
+}
+
+D4EnumDef *
+D4Group::find_enum_def(const string &path)
+{
+    string lpath = path;        // get a mutable copy
+
+    // special-case for the root group
+    if (lpath[0] == '/') {
+        if (name() != "/")
+            throw InternalErr(__FILE__, __LINE__, "Lookup of a FQN starting in non-root group.");
+        else
+            lpath = lpath.substr(1);
+    }
+
+    string::size_type pos = lpath.find('/');
+    if (pos == string::npos) {
+        // name looks like 'bar'
+        return enum_defs()->find_enum_def(lpath);
+    }
+
+    // name looks like foo/bar/baz where foo and bar must be groups
+    string grp_name = lpath.substr(0, pos);
+    lpath = lpath.substr(pos + 1);
+
+    D4Group *grp = find_child_grp(grp_name);
+    return (grp == 0) ? 0: grp->enum_defs()->find_enum_def(lpath);
+}
+
+/**
+ * Find a variable using it's FUlly Qualified Name (FQN). The leading '/' is optional.
+ *
+ * @param path The FQN to the variable
+ * @return A BaseType* to the variable of null if it was not found
+ * @see BaseType::FQN()
+ */
+BaseType *
+D4Group::find_var(const string &path)
+{
+    string lpath = path;        // get a mutable copy
+
+    // special-case for the root group
+    if (lpath[0] == '/') {
+        if (name() != "/")
+            throw InternalErr(__FILE__, __LINE__, "Lookup of a FQN starting in non-root group.");
+        else
+            lpath = lpath.substr(1);
+    }
+
+    string::size_type pos = lpath.find('/');
+    if (pos == string::npos) {
+        // name looks like 'bar' or bar.baz; lookup in the Constructor that's part of the Group
+    	return var(lpath);
+    }
+
+    // name looks like foo/bar/baz where foo and bar must be groups
+    string grp_name = lpath.substr(0, pos);
+    lpath = lpath.substr(pos + 1);
+
+    D4Group *grp = find_child_grp(grp_name);
+    return (grp == 0) ? 0 : grp->find_var(lpath);
+}
+
+/** Compute the size of all of the variables in this group and it's children,
+ * in kilobytes
+ *
+ * @param constrained Should the current constraint be taken into account?
+ * @return The size in kilobytes
+ */
+long
+D4Group::request_size(bool constrained)
+{
+    long long size = 0;
+    // variables
+    Constructor::Vars_iter v = var_begin();
+    while (v != var_end()) {
+        if (constrained) {
+            if ((*v)->send_p())
+                size += (*v)->width(constrained);
+        }
+        else {
+            size += (*v)->width(constrained);
+        }
+
+        ++v;
+    }
+
+    // groups
+    groupsIter g = d_groups.begin();
+    while (g != d_groups.end())
+        size += (*g++)->request_size(constrained);
+
+    return size / 1024;
+}
+
+void
+D4Group::set_read_p(bool state)
+{
+    groupsIter g = d_groups.begin();
+    while (g != d_groups.end())
+        (*g++)->set_read_p(state);
+
+    Constructor::set_read_p(state);
+}
+
+void
+D4Group::set_send_p(bool state)
+{
+    groupsIter g = d_groups.begin();
+    while (g != d_groups.end())
+        (*g++)->set_send_p(state);
+
+    Constructor::set_send_p(state);
+}
+
+void
+D4Group::intern_data(/*Crc32 &checksum, DMR &dmr, ConstraintEvaluator &eval*/)
+{
+    groupsIter g = d_groups.begin();
+    while (g != d_groups.end())
+        (*g++)->intern_data(/*checksum, dmr, eval*/);
+
+    // Specialize how the top-level variables in any Group are sent; include
+    // a checksum for them. A subset operation might make an interior set of
+    // variables, but the parent structure will still be present and the checksum
+    // will be computed for that structure. In other words, DAP4 does not try
+    // to sort out which variables are the 'real' top-level variables and instead
+    // simply computes the CRC for whatever appears as a variable in the root
+    // group.
+	for (Vars_iter i = d_vars.begin(); i != d_vars.end(); i++) {
+		// Only send the stuff in the current subset.
+		if ((*i)->send_p()) {
+#if 0
+		    checksum.Reset();
+#endif
+			(*i)->intern_data(/*checksum, dmr, eval*/);
+#if 0
+			D4Attribute *a = new D4Attribute("DAP4_Checksum_CRC32", attr_str_c);
+
+			ostringstream oss;
+		    oss.setf(ios::hex, ios::basefield);
+		    oss << setfill('0') << setw(8) << checksum.GetCrc32();
+            a->add_value(oss.str());
+#if INCLUDE_SOURCE_BYTE_ORDER
+	        if (um.is_source_big_endian())
+	            a->add_value("source:big-endian");
+	        else
+	            a->add_value("source:little-endian");
+#endif
+	        (*i)->attributes()->add_attribute_nocopy(a);
+			DBG(cerr << "CRC32: " << oss.str() << " for " << (*i)->name() << endl);
+#endif
+		}
+	}
+}
+
+/**
+ * @brief Serialize a Group
+ * @param m The DAP4 Stream Marshaller. This object serializes the data values and
+ * writes checksums (using CRC32) for the top level variables in every Group for which
+ * one or more variables are sent. The DAP4 Marshaller object can be made so that only
+ * the checksums are written.
+ * @param dmr Unused
+ * @param eval Unused
+ * @param filter Unused
+ * @exception Error is thrown if the value needs to be read and that operation fails.
+ */
+void
+D4Group::serialize(D4StreamMarshaller &m, DMR &dmr, /*ConstraintEvaluator &eval,*/ bool filter)
+{
+#if 0
+    // This will call Constructor read which will, for everything but a Sequence,
+    // read all of the data in one shot. However, the serialize() methods for the
+    // Arrays, Structures, etc., also have read() calls in them and those can be
+    // used to control how long the data are in memory, e.g., limiting the lifetime
+    // of a large array and avoiding having overlapping arrays when they are not
+    // needed. For a sequence read() has different semantics. It is called once
+    // for every instance and the read_p flag is not used.
+    if (!read_p())
+        read();  // read() throws Error
+#endif
+
+    groupsIter g = d_groups.begin();
+    while (g != d_groups.end())
+        (*g++)->serialize(m, dmr, filter);
+
+    // Specialize how the top-level variables in any Group are sent; include
+    // a checksum for them. A subset operation might make an interior set of
+    // variables, but the parent structure will still be present and the checksum
+    // will be computed for that structure. In other words, DAP4 does not try
+    // to sort out which variables are the 'real' top-level variables and instead
+    // simply computes the CRC for whatever appears as a variable in the root
+    // group.
+	for (Vars_iter i = d_vars.begin(); i != d_vars.end(); i++) {
+		// Only send the stuff in the current subset.
+		if ((*i)->send_p()) {
+			m.reset_checksum();
+
+	        DBG(cerr << "Serializing variable " << (*i)->type_name() << " " << (*i)->name() << endl);
+			(*i)->serialize(m, dmr, filter);
+
+			DBG(cerr << "Wrote CRC32: " << m.get_checksum() << " for " << (*i)->name() << endl);
+			m.put_checksum();
+		}
+	}
+}
+
+void D4Group::deserialize(D4StreamUnMarshaller &um, DMR &dmr)
+{
+	groupsIter g = d_groups.begin();
+	while (g != d_groups.end()) {
+        DBG(cerr << "Deserializing group " << (*g)->name() << endl);
+		(*g++)->deserialize(um, dmr);
+	}
+	// Specialize how the top-level variables in any Group are received; read
+	// their checksum and store the value in a magic attribute of the variable
+	for (Vars_iter i = d_vars.begin(); i != d_vars.end(); i++) {
+        DBG(cerr << "Deserializing variable " << (*i)->type_name() << " " << (*i)->name() << endl);
+		(*i)->deserialize(um, dmr);
+
+		D4Attribute *a = new D4Attribute("DAP4_Checksum_CRC32", attr_str_c);
+		string crc = um.get_checksum_str();
+		a->add_value(crc);
+#if INCLUDE_SOURCE_BYTE_ORDER
+		if (um.is_source_big_endian())
+		    a->add_value("source:big-endian");
+		else
+		    a->add_value("source:little-endian");
+#endif
+		DBG(cerr << "Read CRC32: " << crc << " for " << (*i)->name() << endl);
+		(*i)->attributes()->add_attribute_nocopy(a);
+	}
+}
+
+void
+D4Group::print_dap4(XMLWriter &xml, bool constrained)
+{
+    if (!name().empty() && name() != "/") {
+        // For named groups, if constrained is true only print if this group
+        // has variables that are marked for transmission. For the root group
+        // this test is not made.
+        if (constrained && !send_p())
+            return;
+
+        if (xmlTextWriterStartElement(xml.get_writer(), (const xmlChar*) type_name().c_str()) < 0)
+            throw InternalErr(__FILE__, __LINE__, "Could not write " + type_name() + " element");
+
+        if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "name", (const xmlChar*) name().c_str()) < 0)
+            throw InternalErr(__FILE__, __LINE__, "Could not write attribute for name");
+    }
+
+    // dims
+    if (!dims()->empty())
+        dims()->print_dap4(xml, constrained);
+
+    // enums
+    if (!enum_defs()->empty())
+        enum_defs()->print_dap4(xml, constrained);
+
+    // variables
+    Constructor::Vars_iter v = var_begin();
+    while (v != var_end())
+        (*v++)->print_dap4(xml, constrained);
+
+    // attributes
+    attributes()->print_dap4(xml);
+
+    // groups
+    groupsIter g = d_groups.begin();
+    while (g != d_groups.end())
+        (*g++)->print_dap4(xml, constrained);
+
+    if (!name().empty() && name() != "/") {
+        if (xmlTextWriterEndElement(xml.get_writer()) < 0)
+            throw InternalErr(__FILE__, __LINE__, "Could not end " + type_name() + " element");
+    }
+}
+
+
+/** @brief DAP4 to DAP2 transform
+ *
+ * D4Group objects, with the exception of the root group, "disappear"
+ * into the names of their member variables. Specifically the Group
+ * name is add as a prefix followed by a "/" separator to the names
+ * of all of the Group's member groups variables. The Group attributes
+ * (metadata) are transfered to the parent_attr_table. The Group
+ * members are collected returned in vector.
+ *
+ *
+ * @param  The AttrTable pointer parent_attr_table is used by Groups, which disappear
+ * from the DAP2 representation. Their children are returned in the the BAseType vector
+ * their attributes are added to parent_attr_table;
+ * @return A pointer to a vector of BaseType pointers (right?). In this D4Group case the
+ * vector will contain DAP2 versions of all of the member variables of the D4Group instance.
+ * (ex: UInt64) the will return a NULL pointer and so this must be tested!
+ */
+vector<BaseType *> *
+D4Group::transform_to_dap2(AttrTable *parent_attr_table){
+    return transform_to_dap2(parent_attr_table,false);
+}
+vector<BaseType *> *
+D4Group::transform_to_dap2(AttrTable *parent_attr_table, bool is_root)
+{
+    DBG( cerr << __func__ << "() - BEGIN ("<< name() << " is_root: "<< (is_root?"true":"false") << ")" << endl;);
+    vector<BaseType *> *results = new vector<BaseType *>();
+    vector<BaseType *> dropped_vars;
+
+    AttrTable *group_attrs;
+    group_attrs = attributes()->get_AttrTable(name());
+
+    /**
+     * If this is the root group then we handle the attributes differently.
+     */
+    if(is_root){
+        DBG( cerr << __func__ << "() - Promoting group attributes to parent" << endl;);
+       // If it's a root group we copy all the stuff up into the parent attr table
+        for (AttrTable::Attr_iter i = group_attrs->attr_begin(), e = group_attrs->attr_end(); i != e; ++i) {
+            if ((*i)->type == Attr_container) {
+                // copy the source container so that the DAS passed in can be
+                // deleted after calling this method.
+                AttrTable *at = new AttrTable(*(*i)->attributes);
+                parent_attr_table->append_container(at, at->get_name());
+            }
+            else {
+                parent_attr_table->append_attr(
+                    (*i)->name,
+                    AttrType_to_String((*i)->type),
+                    (*i)->attr);
+            }
+        }
+        delete group_attrs;
+        group_attrs = parent_attr_table;
+    }
+
+    /**
+     * Now we process the child variables of this group
+     */
+    for (D4Group::Vars_citer varIter = var_begin(), e = var_end(); varIter != e; ++varIter) {
+        DBG( cerr << __func__ << "() - Processing member variable '" << (*varIter)->name() <<
+            "' root: " << (is_root?"true":"false") << endl;);
+        vector<BaseType *> *new_vars = (*varIter)->transform_to_dap2(group_attrs);
+        if (new_vars) {  // Might be un-mappable
+            // It's not so game on..
+            vector<BaseType*>::iterator vIter = new_vars->begin();
+            vector<BaseType*>::iterator end = new_vars->end();
+            for( ; vIter!=end ; vIter++ ){
+                BaseType *new_var = (*vIter);
+
+                string new_name = (is_root?"":FQN()) + new_var->name();
+                new_var->set_name(new_name);
+                results->push_back(new_var);
+                (*vIter) = NULL;
+                DBG( cerr << __func__ << "() - Added member variable '" << (*varIter)->name() << "' " <<
+                    "to results vector. root: "<< (is_root?"true":"false") << endl;);
+            }
+            delete new_vars;
+        }
+        else {
+            DBG( cerr << __func__ << "() - Dropping member variable " << (*varIter)->name() <<
+            " root: " << (is_root?"true":"false") << endl;);
+            // Got back a NULL, so we are dropping this var.
+            dropped_vars.push_back(*varIter);
+        }
+    }
+    // Process dropped DAP4 vars
+    DBG( cerr << __func__ << "() - Processing " << dropped_vars.size() << " Dropped Variable(s)" << endl;);
+    AttrTable *dv_attr_table = make_dropped_vars_attr_table(&dropped_vars);
+    if(dv_attr_table){
+        DBG( cerr << __func__ << "() - Adding Dropped Variables AttrTable" << endl;);
+        group_attrs->append_container(dv_attr_table,dv_attr_table->get_name());
+    }
+    else {
+        DBG( cerr << __func__ << "() - No Dropped Variables AttrTable returned." << endl;);
+
+    }
+
+    /**
+     *  Get all the child groups.
+     */
+    D4Group::groupsIter gIter = grp_begin();
+    D4Group::groupsIter gEnd = grp_end();
+    for( ; gIter!=gEnd ; gIter++){
+        D4Group *grp = *gIter;
+        DBG( cerr << __func__ << "() - Processing D4Group " << grp->name() << endl;);
+        vector<BaseType *> *d2_vars = grp->transform_to_dap2(group_attrs);
+        if(d2_vars){
+            DBG( cerr << __func__ << "() - Processing " << grp->name() << " Member Variables." << endl;);
+            vector<BaseType *>::iterator vIter = d2_vars->begin();
+            vector<BaseType *>::iterator vEnd = d2_vars->end();
+            for( ; vIter!=vEnd; vIter++){
+                DBG( cerr << __func__ << "() - Processing " << grp->name() << " Member Variable: " << (*vIter)->name() << endl;);
+                results->push_back(*vIter);
+            }
+        }
+
+
+
+    }
+
+    if(!is_root){
+        group_attrs->set_name(name());
+        parent_attr_table->append_container(group_attrs,group_attrs->get_name());
+    }
+    DBG( cerr << __func__ << "() - END" << endl;);
+    return results;
+}
+
+
+} /* namespace libdap */
diff --git a/D4Group.h b/D4Group.h
new file mode 100644
index 0000000..683afe3
--- /dev/null
+++ b/D4Group.h
@@ -0,0 +1,149 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#ifndef D4GROUP_H_
+#define D4GROUP_H_
+
+#include <string>
+
+#include "Constructor.h"
+#include "D4Dimensions.h"
+#include "D4EnumDefs.h"
+
+class Crc32;
+
+namespace libdap {
+
+class BaseType;
+class Array;
+
+/** A DAP4 Group object. A Group is-a Constructor, so it inherits a set of
+ * BaseType objects and an attribute table, along with methods to search for
+ * variables by name where dots (.) in a fully qualified name serve as
+ * separators.
+ */
+class D4Group :public Constructor {
+private:
+    // Note that because Constructor is a BaseType, this class inherits
+    // both a back pointer to its parent, an AttrTable and, directly from the
+    // Constructor class, a vector of BaseTypes.
+
+    // This instance of D4Dimensions holds the Group's definitions; the same
+    // class is used by Array to hold the actual dimensions for a variable.
+    D4Dimensions *d_dims;
+
+    // This holds the Group's enumeration definitions; a different class is
+    // used for the Enumeration type
+    D4EnumDefs *d_enum_defs;
+
+    // This is a pointer so that the factory class(es) that return pointers
+    // work as expected when making Groups.
+    vector<D4Group*> d_groups;
+
+    BaseType *m_find_map_source_helper(const string &name);
+
+protected:
+    void m_duplicate(const D4Group &g);
+
+public:
+    typedef vector<D4Group*>::iterator groupsIter;
+    typedef vector<D4Group*>::const_iterator groupsCIter;
+
+    D4Group(const string &name);
+    D4Group(const string &name, const string &dataset);
+
+    D4Group(const D4Group &rhs);
+    virtual ~D4Group();
+
+    D4Group &operator=(const D4Group &rhs);
+
+    // This method returned a D4Group * previously. jhrg 11/17/16
+    virtual BaseType *ptr_duplicate();
+
+    /// Get the dimensions defined for this Group
+    D4Dimensions *dims() {
+    	// If not built yet, make one and set this as parent.
+        if (!d_dims) d_dims = new D4Dimensions(this);
+        return d_dims;
+    }
+
+    virtual std::string FQN() const;
+
+    D4Dimension *find_dim(const string &path);
+
+    Array *find_map_source(const string &path);
+
+    D4EnumDef *find_enum_def(const string &path);
+
+    /// Get  the enumerations defined for this Group
+    D4EnumDefs *enum_defs() {
+        if (!d_enum_defs) {
+        	d_enum_defs = new D4EnumDefs;
+        	d_enum_defs->set_parent(this);
+        }
+        return d_enum_defs;
+    }
+
+    BaseType *find_first_var_that_uses_dimension(D4Dimension *dim);
+    BaseType *find_first_var_that_uses_enumeration(D4EnumDef *enum_def);
+
+    BaseType *find_var(const string &name);
+
+    /// Get an iterator to the start of the values
+    groupsIter grp_begin() { return d_groups.begin(); }
+
+    /// Get an iterator to the end of the values
+    groupsIter grp_end() { return d_groups.end(); }
+
+    void add_group(const D4Group *g) {
+    	add_group_nocopy(new D4Group(*g));
+    }
+
+    void add_group_nocopy(D4Group *g) {
+    	g->set_parent(this);
+        d_groups.push_back(g);
+    }
+    void insert_group_nocopy(D4Group *g, groupsIter i) {
+    	g->set_parent(this);
+        d_groups.insert(i, g);
+    }
+
+    D4Group *find_child_grp(const string &grp_name);
+
+    long request_size(bool constrained);
+
+    virtual void set_send_p(bool state);
+    virtual void set_read_p(bool state);
+
+    // DAP4
+    virtual void intern_data(/*Crc32 &checksum, DMR &dmr, ConstraintEvaluator &eval*/);
+    virtual void serialize(D4StreamMarshaller &m, DMR &dmr, /*ConstraintEvaluator &eval,*/ bool filter = false);
+    virtual void deserialize(D4StreamUnMarshaller &um, DMR &dmr);
+
+    void print_dap4(XMLWriter &xml, bool constrained = false);
+
+    virtual std::vector<BaseType *> *transform_to_dap2(AttrTable *parent_attr_table);
+    virtual std::vector<BaseType *> *transform_to_dap2(AttrTable *parent_attr_table, bool use_name_prefix);
+
+};
+
+} /* namespace libdap */
+#endif /* D4GROUP_H_ */
diff --git a/D4Maps.cc b/D4Maps.cc
new file mode 100644
index 0000000..384cf9a
--- /dev/null
+++ b/D4Maps.cc
@@ -0,0 +1,53 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2013 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#include "config.h"
+
+#include "XMLWriter.h"
+#include "InternalErr.h"
+#include "D4Maps.h"
+
+using namespace libdap;
+
+void
+D4Map::print_dap4(XMLWriter &xml)
+{
+	if (xmlTextWriterStartElement(xml.get_writer(), (const xmlChar*) "Map") < 0)
+		throw InternalErr(__FILE__, __LINE__, "Could not write Map element");
+
+	if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "name", (const xmlChar*)d_name.c_str()) < 0)
+		throw InternalErr(__FILE__, __LINE__, "Could not write attribute for name");
+
+	if (xmlTextWriterEndElement(xml.get_writer()) < 0)
+		throw InternalErr(__FILE__, __LINE__, "Could not end Map element");
+
+}
+
+D4Maps&
+D4Maps::operator=(const D4Maps &rhs)
+{
+	if (this == &rhs) return *this;
+	m_duplicate(rhs);
+	return *this;
+}
diff --git a/D4Maps.h b/D4Maps.h
new file mode 100644
index 0000000..ae5c254
--- /dev/null
+++ b/D4Maps.h
@@ -0,0 +1,151 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2013 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#ifndef D4MAPS_H_
+#define D4MAPS_H_
+
+#include <string>
+#include <vector>
+
+using namespace std;
+
+namespace libdap {
+
+class Array;
+class XMLWriter;
+
+/**
+ * A 'Map' in DAP4 is an Array in the dataset that is used to provide the
+ * domain values for a Coverage (aka a Grid). These Maps are a more
+ * general case of the DAP2 'Map vectors' because a DAP4 Map can have N
+ * dimensions.
+ *
+ * Because the Maps can be shared by any or all of the Arrays in a dataset,
+ * they also correspond to the NetCDF/CF notion of a Shared Dimension.
+ *
+ * In this implementation of the D4Map, each Map has a name and two weak
+ * pointers, one to the Array that holds the domain values and one to the
+ * Array that uses the Map. Note that while Maps can be shared by Arrays,
+ * each Array has it's own collection of these D4Map objects. This makes
+ * processing constraints possible (because it is possible to write
+ * different constraints for two arrays that share Maps).
+ */
+class D4Map {
+    std::string d_name;
+    Array *d_array;		// the actual map data; weak pointer
+    Array *d_parent;	// what array holds this map; weak pointer
+
+public:
+    D4Map() : d_name(""), d_array(0), d_parent(0) { }
+    D4Map(const string &name, Array *array, Array *parent = 0) : d_name(name), d_array(array), d_parent(parent) { }
+
+	virtual ~D4Map() { }
+
+	const string& name() const { return d_name; }
+	void set_name(const string& name) { d_name = name; }
+
+	const Array* array() const { return d_array; }
+	void set_array(Array* array) { d_array = array; }
+
+	/**
+	 * @brief The Array that holds this Map
+	 */
+	const Array* parent() const { return d_parent; }
+	void set_parent(Array* parent) { d_parent = parent; }
+
+	virtual void print_dap4(XMLWriter &xml);
+};
+
+/**
+ * The D4Maps object holds pointers to all of the Maps used by
+ * a given Array.
+ */
+class D4Maps {
+public:
+    typedef vector<D4Map*>::iterator D4MapsIter;
+    typedef vector<D4Map*>::const_iterator D4MapsCIter;
+
+private:
+	vector<D4Map*> d_maps;
+	Array *d_parent;	// Array these Maps belong to; weak pointer
+
+	void m_duplicate(const D4Maps &maps) {
+		d_parent = maps.d_parent;
+		for (D4MapsCIter ci = maps.d_maps.begin(), ce = maps.d_maps.end(); ci != ce; ++ci) {
+			d_maps.push_back(new D4Map(**ci));
+		}
+	}
+
+public:
+    D4Maps() {}
+    D4Maps(Array* parent) : d_parent(parent) { }
+    D4Maps(const D4Maps &maps) { m_duplicate(maps); }
+    virtual ~D4Maps() {
+    	for (D4MapsIter i = d_maps.begin(), e = d_maps.end(); i != e; ++i)
+    		delete *i;
+    }
+
+    D4Maps &operator=(const D4Maps &rhs);
+
+    /**
+     * Add a map. This does not test for duplicate names or Array pointers;
+     * It assumes that the caller has done that!
+     */
+    void add_map(D4Map *map) {
+    	d_maps.push_back(map);
+    	// if the Map parent is not set, do so now
+    	if (!d_maps.back()->parent())
+    		d_maps.back()->set_parent(d_parent);
+    }
+
+    void remove_map(D4Map *map) {
+        for (D4MapsIter i = d_maps.begin(), e = d_maps.end(); i != e; ++i) {
+            /* && (*i)->parent() == map->parent() */
+            // Don't test if the map->parent() matches - we only care about the name and array.
+            // This method is intended for processing CE array slices that are edge cases and
+            // is only called from code where we know map->parent() matches *i->parent().
+            // jhrg 4/12/16
+            if ((*i)->name() == map->name() && (*i)->array() == map->array()) {
+                d_maps.erase(i);
+                break;
+            }
+        }
+    }
+
+    D4Map* get_map(int i) { return d_maps.at(i); }
+
+    D4MapsIter map_begin() { return d_maps.begin(); }
+    D4MapsIter map_end() { return d_maps.end(); }
+
+    int size() const { return d_maps.size(); }
+    bool empty() const { return d_maps.empty(); }
+
+    virtual void print_dap4(XMLWriter &xml) {
+    	for (D4MapsIter i = d_maps.begin(), e = d_maps.end(); i != e; ++i)
+    		(*i)->print_dap4(xml);
+    }
+};
+
+} /* namespace libdap */
+#endif /* D4MAPS_H_ */
diff --git a/D4Opaque.cc b/D4Opaque.cc
new file mode 100644
index 0000000..dd53b5a
--- /dev/null
+++ b/D4Opaque.cc
@@ -0,0 +1,184 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2013 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin D4Opaqueeet, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+//#define DODS_DEBUG
+
+#include "config.h"
+
+#include <sstream>
+#include <iterator>
+
+#include "D4Opaque.h"
+
+#include "DMR.h"
+#include "D4StreamMarshaller.h"
+#include "D4StreamUnMarshaller.h"
+
+#include "util.h"
+#include "crc.h"
+
+#include "debug.h"
+
+#undef CLEAR_LOCAL_DATA
+
+using namespace std;
+
+namespace libdap {
+
+D4Opaque &
+D4Opaque::operator=(const D4Opaque &rhs)
+{
+    if (this == &rhs)
+        return *this;
+
+    // Call BaseType::operator=
+    dynamic_cast<BaseType &>(*this) = rhs;
+
+    d_buf = rhs.d_buf;
+
+    return *this;
+}
+
+void
+D4Opaque::clear_local_data()
+{
+    if (!d_buf.empty()) {
+        d_buf.erase(d_buf.begin(), d_buf.end());
+        d_buf.resize(0);
+    }
+
+    set_read_p(false);
+}
+
+void
+D4Opaque::compute_checksum(Crc32 &checksum)
+{
+	checksum.AddData(&d_buf[0], d_buf.size());
+}
+
+void
+D4Opaque::serialize(D4StreamMarshaller &m, DMR &, bool)
+{
+    if (!read_p())
+        read();          // read() throws Error
+
+    m.put_opaque_dap4( reinterpret_cast<char*>(&d_buf[0]), d_buf.size() ) ;
+
+#ifdef CLEAR_LOCAL_DATA
+    clear_local_data();
+#endif
+
+}
+
+void
+D4Opaque::deserialize(D4StreamUnMarshaller &um, DMR &)
+{
+    um.get_opaque_dap4( d_buf ) ;
+}
+
+unsigned int
+D4Opaque::buf2val(void **val)
+{
+	assert(val);
+
+    // If *val is null, then the caller has not allocated storage for the
+    // value; we must. If there is storage there, assume it is a vector<uint8_t>
+	// (i.e., dods_opaque) and assign d_buf's value to that storage.
+    if (!*val)
+        *val = new vector<uint8_t>;
+    else
+        *static_cast<vector<uint8_t>*>(*val) = d_buf;
+
+    return sizeof(vector<uint8_t>*);
+}
+
+unsigned int
+D4Opaque::val2buf(void *val, bool)
+{
+    assert(val);
+
+    d_buf = *static_cast<dods_opaque*>(val);
+
+    return sizeof(dods_opaque*);
+}
+
+/** Set the value of this instance.
+    @param value The value
+    @return Always returns true; the return type of bool is for compatibility
+    with the Passive* subclasses written by HAO. */
+bool
+D4Opaque::set_value(const dods_opaque &value)
+{
+    d_buf = value;
+    set_read_p(true);
+
+    return true;
+}
+
+/** Get the value of this instance.
+    @return The value. */
+D4Opaque::dods_opaque
+D4Opaque::value() const
+{
+    return d_buf;
+}
+
+std::vector<BaseType *> *
+D4Opaque::transform_to_dap2(AttrTable *){
+    DBG(cerr << __func__ << "() - Transform not implemented DAP4 Opaque type." << endl;);
+    return NULL;
+}
+
+
+void
+D4Opaque::print_val(ostream &out, string space, bool print_decl_p)
+{
+	if (print_decl_p) print_decl(out, space, false);
+
+	if (d_buf.size()) {
+		// end() - 1 is only OK if size() is > 0
+		std::ostream_iterator<unsigned int> out_it(out, ",");
+		std::copy(d_buf.begin(), d_buf.end() - 1, out_it);
+		out << (unsigned int) d_buf.back(); // can also use: *(d_buf.end()-1);
+	}
+
+	if (print_decl_p) out << ";" << endl;
+}
+
+void
+D4Opaque::dump(ostream &strm) const
+{
+    strm << DapIndent::LMarg << "D4Opaque::dump - ("
+    << (void *)this << ")" << endl ;
+    DapIndent::Indent() ;
+    BaseType::dump(strm) ;
+    //strm << DapIndent::LMarg << "value: " << d_buf << endl ;
+    ostream_iterator<uint8_t> out_it (strm," ");
+    std::copy ( d_buf.begin(), d_buf.end(), out_it );
+
+    DapIndent::UnIndent() ;
+}
+
+} // namespace libdap
+
diff --git a/D4Opaque.h b/D4Opaque.h
new file mode 100644
index 0000000..008fc3e
--- /dev/null
+++ b/D4Opaque.h
@@ -0,0 +1,110 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2013 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#ifndef _d4_opaque_h
+#define _d4_opaque_h 1
+
+#include <vector>
+
+#include "BaseType.h"
+#include "InternalErr.h"
+
+class Crc32;
+
+namespace libdap
+{
+
+class D4Opaque: public BaseType
+{
+public:
+	typedef std::vector<uint8_t> dods_opaque;
+
+protected:
+    dods_opaque d_buf;
+
+public:
+    D4Opaque(const std::string &n) : BaseType(n, dods_opaque_c, true /*is_dap4*/), d_buf(0) { }
+    D4Opaque(const std::string &n, const std::string &d)  : BaseType(n, d, dods_opaque_c, true /*is_dap4*/), d_buf(0) { }
+
+    virtual ~D4Opaque()  { }
+
+    D4Opaque(const D4Opaque &copy_from) : BaseType(copy_from) {
+        d_buf = copy_from.d_buf;
+    }
+
+    D4Opaque &operator=(const D4Opaque &rhs);
+
+    virtual BaseType *ptr_duplicate() {  return new D4Opaque(*this); }
+
+    virtual void clear_local_data();
+
+    virtual unsigned int width(bool = false) const { return sizeof(vector<uint8_t>); }
+
+    // Return the length of the stored data or zero if no string has been
+    // stored in the instance's internal buffer.
+    virtual int length() const { return d_buf.size(); }
+
+    // DAP2
+    virtual bool serialize(ConstraintEvaluator &, DDS &, Marshaller &, bool = true) {
+    	throw InternalErr(__FILE__, __LINE__, "Unimplemented method");
+    }
+    virtual bool deserialize(UnMarshaller &, DDS *, bool = false) {
+    	throw InternalErr(__FILE__, __LINE__, "Unimplemented method");
+    }
+
+    // DAP4
+    virtual void compute_checksum(Crc32 &checksum);
+    virtual void serialize(D4StreamMarshaller &m, DMR &dmr, /*ConstraintEvaluator &eval,*/ bool filter = false);
+#if 0
+    virtual void serialize_no_release(D4StreamMarshaller &m, DMR &dmr, bool filter = false);
+#endif
+    virtual void deserialize(D4StreamUnMarshaller &um, DMR &dmr);
+
+    virtual unsigned int val2buf(void *val, bool reuse = false);
+    virtual unsigned int buf2val(void **val);
+
+    virtual bool set_value(const dods_opaque &value);
+    virtual dods_opaque value() const;
+
+    virtual void print_val(FILE *, std::string = "", bool = true)  {
+    	throw InternalErr(__FILE__, __LINE__, "Unimplemented method");
+    }
+    virtual void print_val(std::ostream &out, std::string space = "", bool print_decl_p = true);
+
+    //virtual void print_dap4(XMLWriter &xml, bool constrained = false);
+
+    virtual bool ops(BaseType *, int) {
+        throw InternalErr(__FILE__, __LINE__, "Unimplemented method");
+    }
+
+    virtual std::vector<BaseType *> *transform_to_dap2(AttrTable *parent_attr_table);
+
+    virtual void dump(std::ostream &strm) const ;
+
+};
+
+} // namespace libdap
+
+#endif // _d4_opaque_h
+
diff --git a/D4ParserSax2.cc b/D4ParserSax2.cc
new file mode 100644
index 0000000..b62b2f3
--- /dev/null
+++ b/D4ParserSax2.cc
@@ -0,0 +1,1408 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2012 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#include "config.h"
+
+//#define DODS_DEBUG 1
+
+#include <iostream>
+#include <sstream>
+
+#include <cstring>
+#include <cstdarg>
+#include <cassert>
+
+#include <libxml/parserInternals.h>
+
+#include "DMR.h"
+
+#include "BaseType.h"
+#include "Array.h"
+#include "D4Group.h"
+#include "D4Attributes.h"
+#include "D4Maps.h"
+#include "D4Enum.h"
+#include "D4BaseTypeFactory.h"
+
+#include "DapXmlNamespaces.h"
+#include "D4ParserSax2.h"
+
+#include "util.h"
+#include "debug.h"
+
+namespace libdap {
+
+static const char *states[] = {
+        "parser_start",
+
+        "inside_dataset",
+
+        // inside_group is the state just after parsing the start of a Group
+        // element.
+        "inside_group",
+
+        "inside_attribute_container",
+        "inside_attribute",
+        "inside_attribute_value",
+        "inside_other_xml_attribute",
+
+        "inside_enum_def",
+        "inside_enum_const",
+
+        "inside_dim_def",
+
+        // This covers Byte, ..., Url, Opaque
+        "inside_simple_type",
+
+        // "inside_array",
+        "inside_dim",
+        "inside_map",
+
+        "inside_constructor",
+
+        "not_dap4_element",
+
+        "parser_unknown",
+        "parser_error",
+        "parser_fatal_error",
+
+        "parser_end"
+};
+
+static bool is_not(const char *name, const char *tag)
+{
+    return strcmp(name, tag) != 0;
+}
+
+/** @brief Return the current Enumeration definition
+ * Allocate the Enumeration definition if needed and return it. Once parsing the current
+ * enumeration definition is complete, the pointer allocated/returned by this method will
+ * be copied into the current Group and this internal storage will be 'reset' using
+ * clear_enum_def().
+ *
+ * @return
+ */
+D4EnumDef *
+D4ParserSax2::enum_def()
+{
+    if (!d_enum_def) d_enum_def = new D4EnumDef;
+
+    return d_enum_def;
+}
+
+/** @brief Return the current Dimension definition
+ * Allocate the Dimension definition if needed and return it.
+ * @see enum_def() for an explanation of how this is used by the parser.
+ *
+ * @return
+ */
+D4Dimension *
+D4ParserSax2::dim_def()    {
+    if (!d_dim_def) d_dim_def = new D4Dimension;
+
+    return d_dim_def;
+}
+
+/** Dump XML attributes to local store so they can be easily manipulated.
+ * XML attribute names are always folded to lower case.
+ * @param attributes The XML attribute array
+ * @param nb_attributes The number of attributes
+ */
+void D4ParserSax2::transfer_xml_attrs(const xmlChar **attributes, int nb_attributes)
+{
+    if (!xml_attrs.empty())
+        xml_attrs.clear(); // erase old attributes
+
+    // Make a value using the attribute name and the prefix, namespace URI
+    // and the value. The prefix might be null.
+    unsigned int index = 0;
+    for (int i = 0; i < nb_attributes; ++i, index += 5) {
+        xml_attrs.insert(map<string, XMLAttribute>::value_type(string((const char *)attributes[index]),
+                                                               XMLAttribute(attributes + index + 1)));
+
+        DBG(cerr << "XML Attribute '" << (const char *)attributes[index] << "': "
+                << xml_attrs[(const char *)attributes[index]].value << endl);
+    }
+}
+
+/** Transfer the XML namespaces to the local store so they can be manipulated
+ * more easily.
+ *
+ * @param namespaces Array of xmlChar*
+ * @param nb_namespaces The number of namespaces in the array.
+ */
+void D4ParserSax2::transfer_xml_ns(const xmlChar **namespaces, int nb_namespaces)
+{
+    // make a value with the prefix and namespace URI. The prefix might be null.
+    for (int i = 0; i < nb_namespaces; ++i) {
+        namespace_table.insert(map<string, string>::value_type(namespaces[i * 2] != 0 ? (const char *)namespaces[i * 2] : "",
+                                                               (const char *)namespaces[i * 2 + 1]));
+    }
+}
+
+/** Is a required XML attribute present? Attribute names are always lower case.
+ * @note To use this method, first call transfer_xml_attrs.
+ * @param attr The XML attribute
+ * @return True if the XML attribute was present in the last tag, otherwise
+ * it sets the global error state and returns false.
+ */
+bool D4ParserSax2::check_required_attribute(const string & attr)
+{
+    if (xml_attrs.find(attr) == xml_attrs.end()) {
+        dmr_error(this, "Required attribute '%s' not found.", attr.c_str());
+        return false;
+    }
+    else
+        return true;
+}
+
+/** Is a XML attribute present? Attribute names are always lower case.
+ * @note To use this method, first call transfer_xml_attrs.
+ * @param attr The XML attribute
+ * @return True if the XML attribute was present in the last/current tag,
+ * false otherwise.
+ */
+bool D4ParserSax2::check_attribute(const string & attr)
+{
+    return (xml_attrs.find(attr) != xml_attrs.end());
+}
+
+bool D4ParserSax2::process_dimension_def(const char *name, const xmlChar **attrs, int nb_attributes)
+{
+    if (is_not(name, "Dimension"))
+        return false;
+
+    transfer_xml_attrs(attrs, nb_attributes);
+
+    if (!(check_required_attribute("name") && check_required_attribute("size"))) {
+        dmr_error(this, "The required attribute 'name' or 'size' was missing from a Dimension element.");
+        return false;
+    }
+
+    // This getter (dim_def) allocates a new object if needed.
+    dim_def()->set_name(xml_attrs["name"].value);
+    try {
+        dim_def()->set_size(xml_attrs["size"].value);
+    }
+    catch (Error &e) {
+        dmr_error(this, e.get_error_message().c_str());
+        return false;
+    }
+
+    return true;
+}
+
+/**
+ * @brief Process a Dim element.
+ * If a Dim element is found, the current variable is an Array. If the BaseType
+ * on the TOS is not already an Array, make it one. Append the dimension
+ * information to the Array variable on the TOS.
+ *
+ * @note Dim elements can have two attributes: name or size. The latter defines
+ * an 'anonymous' dimension (one without a name that does not reference a
+ * shared dimension object. If the \c name attribute is used, then the shared
+ * dimension used is the one defined by the enclosing group or found using the
+ * fully qualified name. The \name and \c size attributes are mutually exclusive.
+ *
+ * @param name XML element name; must be Dim
+ * @param attrs XML Attributes
+ * @param nb_attributes The number of XML Attributes
+ * @return True if the element is a Dim, false otherwise.
+ */
+bool D4ParserSax2::process_dimension(const char *name, const xmlChar **attrs, int nb_attributes)
+{
+    if (is_not(name, "Dim"))
+        return false;
+
+    transfer_xml_attrs(attrs, nb_attributes);
+
+	if (check_attribute("size") && check_attribute("name")) {
+		dmr_error(this, "Only one of 'size' and 'name' are allowed in a Dim element, but both were used.");
+		return false;
+	}
+	if (!(check_attribute("size") || check_attribute("name"))) {
+		dmr_error(this, "Either 'size' or 'name' must be used in a Dim element.");
+		return false;
+	}
+
+	if (!top_basetype()->is_vector_type()) {
+		// Make the top BaseType* an array
+		BaseType *b = top_basetype();
+		pop_basetype();
+
+		Array *a = static_cast<Array*>(dmr()->factory()->NewVariable(dods_array_c, b->name()));
+		a->set_is_dap4(true);
+		a->add_var_nocopy(b);
+		a->set_attributes_nocopy(b->attributes());
+		// trick: instead of popping b's attributes, copying them and then pushing
+		// a's copy, just move the pointer (but make sure there's only one object that
+		// references that pointer).
+		b->set_attributes_nocopy(0);
+
+		push_basetype(a);
+	}
+
+	assert(top_basetype()->is_vector_type());
+
+	Array *a = static_cast<Array*>(top_basetype());
+    if (check_attribute("size")) {
+    	a->append_dim(atoi(xml_attrs["size"].value.c_str())); // low budget code for now. jhrg 8/20/13
+        return true;
+    }
+    else if (check_attribute("name")) {
+    	string name = xml_attrs["name"].value;
+
+    	D4Dimension *dim = 0;
+    	if (name[0] == '/')		// lookup the Dimension in the root group
+    		dim = dmr()->root()->find_dim(name);
+    	else					// get enclosing Group and lookup Dimension there
+    		dim = top_group()->find_dim(name);
+
+    	if (!dim)
+    		throw Error("The dimension '" + name + "' was not found while parsing the variable '" + a->name() + "'.");
+    	a->append_dim(dim);
+    	return true;
+    }
+
+    return false;
+}
+
+bool D4ParserSax2::process_map(const char *name, const xmlChar **attrs, int nb_attributes)
+{
+    if (is_not(name, "Map"))
+        return false;
+
+    transfer_xml_attrs(attrs, nb_attributes);
+
+	if (!check_attribute("name")) {
+		dmr_error(this, "The 'name' attribute must be used in a Map element.");
+		return false;
+	}
+
+	if (!top_basetype()->is_vector_type()) {
+		// Make the top BaseType* an array
+		BaseType *b = top_basetype();
+		pop_basetype();
+
+		Array *a = static_cast<Array*>(dmr()->factory()->NewVariable(dods_array_c, b->name()));
+		a->set_is_dap4(true);
+		a->add_var_nocopy(b);
+		a->set_attributes_nocopy(b->attributes());
+		// trick: instead of popping b's attributes, copying them and then pushing
+		// a's copy, just move the pointer (but make sure there's only one object that
+		// references that pointer).
+		b->set_attributes_nocopy(0);
+
+		push_basetype(a);
+	}
+
+	assert(top_basetype()->is_vector_type());
+
+	Array *a = static_cast<Array*>(top_basetype());
+
+	string map_name = xml_attrs["name"].value;
+	if (xml_attrs["name"].value[0] != '/')
+		map_name = top_group()->FQN() + map_name;
+
+    Array *map_source = 0;	// The array variable that holds the data for the Map
+
+	if (map_name[0] == '/')		// lookup the Map in the root group
+		map_source = dmr()->root()->find_map_source(map_name);
+	else					// get enclosing Group and lookup Map there
+		map_source = top_group()->find_map_source(map_name);
+
+	// Change: If the parser is in 'strict' mode (the default) and the Array named by
+	// the Map cannot be fond, it is an error. If 'strict' mode is false (permissive
+	// mode), then this is not an error. However, the Array referenced by the Map will
+	// be null. This is a change in the parser's behavior to accommodate requests for
+	// Arrays that include Maps that do not also include the Map(s) in the request.
+	// See https://opendap.atlassian.net/browse/HYRAX-98. jhrg 4/13/16
+	if (!map_source && d_strict)
+		throw Error("The Map '" + map_name + "' was not found while parsing the variable '" + a->name() + "'.");
+
+	a->maps()->add_map(new D4Map(map_name, map_source));
+
+	return true;
+}
+
+bool D4ParserSax2::process_group(const char *name, const xmlChar **attrs, int nb_attributes)
+{
+    if (is_not(name, "Group"))
+        return false;
+
+    transfer_xml_attrs(attrs, nb_attributes);
+
+    if (!check_required_attribute("name")) {
+        dmr_error(this, "The required attribute 'name' was missing from a Group element.");
+        return false;
+    }
+
+    BaseType *btp = dmr()->factory()->NewVariable(dods_group_c, xml_attrs["name"].value);
+    if (!btp) {
+        dmr_fatal_error(this, "Could not instantiate the Group '%s'.", xml_attrs["name"].value.c_str());
+        return false;
+    }
+
+    D4Group *grp = static_cast<D4Group*>(btp);
+
+    // Need to set this to get the D4Attribute behavior in the type classes
+    // shared between DAP2 and DAP4. jhrg 4/18/13
+    grp->set_is_dap4(true);
+
+    // link it up and change the current group
+    D4Group *parent = top_group();
+	if (!parent) {
+		dmr_fatal_error(this, "No Group on the Group stack.");
+		return false;
+	}
+
+	grp->set_parent(parent);
+	parent->add_group_nocopy(grp);
+
+    push_group(grp);
+    push_attributes(grp->attributes());
+    return true;
+}
+
+/** Check to see if the current tag is either an \c Attribute or an \c Alias
+ start tag. This method is a glorified macro...
+
+ @param name The start tag name
+ @param attrs The tag's XML attributes
+ @return True if the tag was an \c Attribute or \c Alias tag */
+inline bool D4ParserSax2::process_attribute(const char *name, const xmlChar **attrs, int nb_attributes)
+{
+    if (is_not(name, "Attribute"))
+        return false;
+
+    // These methods set the state to parser_error if a problem is found.
+    transfer_xml_attrs(attrs, nb_attributes);
+
+    // add error
+    if (!(check_required_attribute(string("name")) && check_required_attribute(string("type")))) {
+        dmr_error(this, "The required attribute 'name' or 'type' was missing from an Attribute element.");
+        return false;
+    }
+
+    if (xml_attrs["type"].value == "Container") {
+        push_state(inside_attribute_container);
+
+        DBG(cerr << "Pushing attribute container " << xml_attrs["name"].value << endl);
+        D4Attribute *child = new D4Attribute(xml_attrs["name"].value, attr_container_c);
+
+        D4Attributes *tos = top_attributes();
+        // add return
+        if (!tos) {
+            delete child;
+            dmr_fatal_error(this, "Expected an Attribute container on the top of the attribute stack.");
+            return false;
+        }
+
+        tos->add_attribute_nocopy(child);
+        push_attributes(child->attributes());
+    }
+    else if (xml_attrs["type"].value == "OtherXML") {
+        push_state(inside_other_xml_attribute);
+
+        dods_attr_name = xml_attrs["name"].value;
+        dods_attr_type = xml_attrs["type"].value;
+    }
+    else {
+        push_state(inside_attribute);
+
+        dods_attr_name = xml_attrs["name"].value;
+        dods_attr_type = xml_attrs["type"].value;
+    }
+
+    return true;
+}
+
+/** Check to see if the current tag is an \c Enumeration start tag.
+
+ @param name The start tag name
+ @param attrs The tag's XML attributes
+ @return True if the tag was an \c Enumeration */
+inline bool D4ParserSax2::process_enum_def(const char *name, const xmlChar **attrs, int nb_attributes)
+{
+    if (is_not(name, "Enumeration"))
+        return false;
+
+    transfer_xml_attrs(attrs, nb_attributes);
+
+    if (!(check_required_attribute("name") && check_required_attribute("basetype"))) {
+        dmr_error(this, "The required attribute 'name' or 'basetype' was missing from an Enumeration element.");
+        return false;
+    }
+
+    Type t = get_type(xml_attrs["basetype"].value.c_str());
+    if (!is_integer_type(t)) {
+        dmr_error(this, "The Enumeration '%s' must have an integer type, instead the type '%s' was used.",
+                xml_attrs["name"].value.c_str(), xml_attrs["basetype"].value.c_str());
+        return false;
+    }
+
+    // This getter allocates a new object if needed.
+    string enum_def_path = xml_attrs["name"].value;
+#if 0
+	// Use FQNs when things are referenced, not when they are defined
+    if (xml_attrs["name"].value[0] != '/')
+    	enum_def_path = top_group()->FQN() + enum_def_path;
+#endif
+    enum_def()->set_name(enum_def_path);
+    enum_def()->set_type(t);
+
+    return true;
+}
+
+inline bool D4ParserSax2::process_enum_const(const char *name, const xmlChar **attrs, int nb_attributes)
+{
+    if (is_not(name, "EnumConst"))
+        return false;
+
+    // These methods set the state to parser_error if a problem is found.
+    transfer_xml_attrs(attrs, nb_attributes);
+
+    if (!(check_required_attribute("name") && check_required_attribute("value"))) {
+        dmr_error(this, "The required attribute 'name' or 'value' was missing from an EnumConst element.");
+        return false;
+    }
+
+    istringstream iss(xml_attrs["value"].value);
+    long long value = 0;
+    iss >> skipws >> value;
+    if (iss.fail() || iss.bad()) {
+        dmr_error(this, "Expected an integer value for an Enumeration constant, got '%s' instead.",
+                xml_attrs["value"].value.c_str());
+    }
+    else if (!enum_def()->is_valid_enum_value(value)) {
+        dmr_error(this, "In an Enumeration constant, the value '%s' cannot fit in a variable of type '%s'.",
+                xml_attrs["value"].value.c_str(), D4type_name(d_enum_def->type()).c_str());
+    }
+    else {
+        // unfortunate choice of names... args are 'label' and 'value'
+        enum_def()->add_value(xml_attrs["name"].value, value);
+    }
+
+    return true;
+}
+
+/** Check to see if the current element is the start of a variable declaration.
+ If so, process it. A glorified macro...
+ @param name The start element name
+ @param attrs The element's XML attributes
+ @return True if the element was a variable */
+inline bool D4ParserSax2::process_variable(const char *name, const xmlChar **attrs, int nb_attributes)
+{
+    Type t = get_type(name);
+    if (is_simple_type(t)) {
+        process_variable_helper(t, inside_simple_type, attrs, nb_attributes);
+        return true;
+    }
+    else {
+    	switch(t) {
+    	case dods_structure_c:
+            process_variable_helper(t, inside_constructor, attrs, nb_attributes);
+            return true;
+
+    	case dods_sequence_c:
+            process_variable_helper(t, inside_constructor, attrs, nb_attributes);
+            return true;
+
+    	default:
+    		return false;
+    	}
+    }
+}
+
+/** Given that a tag which opens a variable declaration has just been read,
+ create the variable. Once created, push the variable onto the stack of
+ variables, push that variable's attribute table onto the attribute table
+ stack and update the state of the parser.
+ @param t The type of variable to create.
+ @param s The next state of the parser (e.g., inside_simple_type, ...)
+ @param attrs the attributes read with the tag */
+void D4ParserSax2::process_variable_helper(Type t, ParseState s, const xmlChar **attrs, int nb_attributes)
+{
+    transfer_xml_attrs(attrs, nb_attributes);
+
+    if (check_required_attribute("name")) {
+        BaseType *btp = dmr()->factory()->NewVariable(t, xml_attrs["name"].value);
+        if (!btp) {
+            dmr_fatal_error(this, "Could not instantiate the variable '%s'.", xml_attrs["name"].value.c_str());
+            return;
+        }
+
+        if ((t == dods_enum_c) && check_required_attribute("enum")) {
+            D4EnumDef *enum_def = 0;
+            string enum_path = xml_attrs["enum"].value;
+			if (enum_path[0] == '/')
+                enum_def = dmr()->root()->find_enum_def(enum_path);
+            else
+                enum_def = top_group()->find_enum_def(enum_path);
+
+            if (!enum_def)
+                dmr_fatal_error(this, "Could not find the Enumeration definition '%s'.", enum_path.c_str());
+
+            static_cast<D4Enum*>(btp)->set_enumeration(enum_def);
+        }
+
+        btp->set_is_dap4(true); // see comment above
+        push_basetype(btp);
+
+        push_attributes(btp->attributes());
+
+        push_state(s);
+    }
+}
+
+/** @name SAX Parser Callbacks
+
+ These methods are declared static in the class header. This gives them C
+ linkage which allows them to be used as callbacks by the SAX parser
+ engine. */
+//@{
+
+/** Initialize the SAX parser state object. This object is passed to each
+ callback as a void pointer. The initial state is parser_start.
+
+ @param p The SAX parser  */
+void D4ParserSax2::dmr_start_document(void * p)
+{
+    D4ParserSax2 *parser = static_cast<D4ParserSax2*>(p);
+    parser->d_error_msg = "";
+    parser->char_data = "";
+
+    // Set this in intern_helper so that the loop test for the parser_end
+    // state works for the first iteration. It seems like XMLParseChunk calls this
+    // function on it's first run. jhrg 9/16/13
+    // parser->push_state(parser_start);
+
+    parser->push_attributes(parser->dmr()->root()->attributes());
+
+    if (parser->debug()) cerr << "Parser start state: " << states[parser->get_state()] << endl;
+}
+
+/** Clean up after finishing a parse.
+ @param p The SAX parser  */
+void D4ParserSax2::dmr_end_document(void * p)
+{
+    D4ParserSax2 *parser = static_cast<D4ParserSax2*>(p);
+
+    if (parser->debug()) cerr << "Parser end state: " << states[parser->get_state()] << endl;
+
+    if (parser->get_state() != parser_end)
+        D4ParserSax2::dmr_error(parser, "The document contained unbalanced tags.");
+
+    // If we've found any sort of error, don't make the DMR; intern() will
+    // take care of the error.
+    if (parser->get_state() == parser_error || parser->get_state() == parser_fatal_error)
+        return;
+
+    if (!parser->empty_basetype() || parser->empty_group())
+    	D4ParserSax2::dmr_error(parser, "The document did not contain a valid root Group or contained unbalanced tags.");
+
+    parser->pop_group();     // leave the stack 'clean'
+    parser->pop_attributes();
+}
+
+/**
+ * Callback run when libxml2 reads the start of an element
+ *
+ * @param p Pointer to the parser object
+ * @param l Localname of the element
+ * @param prefix Namespace prefix of the element
+ * @param URI the Element namespace name if available
+ * @param nb_namespaces Number of namespace definitions on that node
+ * @param namespaces Pointer to the array of prefix/URI pairs namespace definitions
+ * @param nb_attributes The number of attributes on that node
+ * @param nb_defaulted The number of defaulted attributes. The defaulted ones are at the end of the array
+ * @param attributes Pointer to the array of (localname/prefix/URI/value/end) attribute values.
+ */
+void D4ParserSax2::dmr_start_element(void *p, const xmlChar *l, const xmlChar *prefix, const xmlChar *URI,
+        int nb_namespaces, const xmlChar **namespaces, int nb_attributes, int /*nb_defaulted*/,
+        const xmlChar **attributes)
+{
+    D4ParserSax2 *parser = static_cast<D4ParserSax2*>(p);
+    const char *localname = (const char *) l;
+
+    if (parser->debug()) cerr << "Start element " << localname << "  prefix:  "<< (prefix?(char *)prefix:"null") << "  ns: "<< (URI?(char *)URI:"null")
+    		   << " (state: " << states[parser->get_state()] << ")" << endl;
+
+    if(parser->get_state() != parser_error){
+        string dap4_ns_name = DapXmlNamspaces::getDapNamespaceString(DAP_4_0);
+        if (parser->debug()) cerr << "dap4_ns_name:         " << dap4_ns_name << endl;
+
+        string this_element_ns_name = (URI != 0) ? ((char *)URI) : "";
+        if (parser->debug()) cerr << "this_element_ns_name: " << this_element_ns_name << endl;
+
+        if(this_element_ns_name.compare(dap4_ns_name)){
+            if (parser->debug()) cerr << "Start of non DAP4 element: " << localname << " detected." << endl;
+        	parser->push_state(not_dap4_element);
+        	// return;
+        }
+    }
+
+
+    switch (parser->get_state()) {
+        case parser_start:
+            if (is_not(localname, "Dataset"))
+                D4ParserSax2::dmr_error(parser, "Expected DMR to start with a Dataset element; found '%s' instead.", localname);
+
+            parser->root_ns = URI ? (const char *) URI : "";
+            parser->transfer_xml_attrs(attributes, nb_attributes);
+
+            if (parser->check_required_attribute(string("name")))
+                parser->dmr()->set_name(parser->xml_attrs["name"].value);
+
+            if (parser->check_attribute("dapVersion"))
+                parser->dmr()->set_dap_version(parser->xml_attrs["dapVersion"].value);
+
+            if (parser->check_attribute("dmrVersion"))
+                parser->dmr()->set_dmr_version(parser->xml_attrs["dmrVersion"].value);
+
+            if (parser->check_attribute("base"))
+                parser->dmr()->set_request_xml_base(parser->xml_attrs["base"].value);
+
+            if (!parser->root_ns.empty())
+                parser->dmr()->set_namespace(parser->root_ns);
+
+            // Push the root Group on the stack
+            parser->push_group(parser->dmr()->root());
+
+            parser->push_state(inside_dataset);
+
+            break;
+
+            // Both inside dataset and inside group can have the same stuff.
+            // The difference is that the Dataset holds the root group, which
+            // must be present; other groups are optional
+        case inside_dataset:
+        case inside_group:
+            if (parser->process_enum_def(localname, attributes, nb_attributes))
+                parser->push_state(inside_enum_def);
+            else if (parser->process_dimension_def(localname, attributes, nb_attributes))
+                parser->push_state(inside_dim_def);
+            else if (parser->process_group(localname, attributes, nb_attributes))
+                parser->push_state(inside_group);
+            else if (parser->process_variable(localname, attributes, nb_attributes))
+                // This will push either inside_simple_type or inside_structure
+                // onto the parser state stack.
+               break;
+            else if (parser->process_attribute(localname, attributes, nb_attributes))
+                // This will push either inside_attribute, inside_attribute_container
+                // or inside_otherxml_attribute onto the parser state stack
+                break;
+            else
+                D4ParserSax2::dmr_error(parser, "Expected an Attribute, Enumeration, Dimension, Group or variable element; found '%s' instead.", localname);
+            break;
+
+        case inside_attribute_container:
+            if (parser->process_attribute(localname, attributes, nb_attributes))
+                break;
+            else
+                D4ParserSax2::dmr_error(parser, "Expected an Attribute element; found '%s' instead.", localname);
+            break;
+
+        case inside_attribute:
+            if (parser->process_attribute(localname, attributes, nb_attributes))
+                break;
+            else if (strcmp(localname, "Value") == 0)
+                parser->push_state(inside_attribute_value);
+            else
+                dmr_error(parser, "Expected an 'Attribute' or 'Value' element; found '%s' instead.", localname);
+            break;
+
+        case inside_attribute_value:
+            // Attribute values are processed by the end element code.
+            break;
+
+        case inside_other_xml_attribute:
+            parser->other_xml_depth++;
+
+            // Accumulate the elements here
+            parser->other_xml.append("<");
+            if (prefix) {
+                parser->other_xml.append((const char *) prefix);
+                parser->other_xml.append(":");
+            }
+            parser->other_xml.append(localname);
+
+            if (nb_namespaces != 0) {
+                parser->transfer_xml_ns(namespaces, nb_namespaces);
+
+                for (map<string, string>::iterator i = parser->namespace_table.begin();
+                        i != parser->namespace_table.end(); ++i) {
+                    parser->other_xml.append(" xmlns");
+                    if (!i->first.empty()) {
+                        parser->other_xml.append(":");
+                        parser->other_xml.append(i->first);
+                    }
+                    parser->other_xml.append("=\"");
+                    parser->other_xml.append(i->second);
+                    parser->other_xml.append("\"");
+                }
+            }
+
+            if (nb_attributes != 0) {
+                parser->transfer_xml_attrs(attributes, nb_attributes);
+                for (XMLAttrMap::iterator i = parser->xml_attr_begin(); i != parser->xml_attr_end(); ++i) {
+                    parser->other_xml.append(" ");
+                    if (!i->second.prefix.empty()) {
+                        parser->other_xml.append(i->second.prefix);
+                        parser->other_xml.append(":");
+                    }
+                    parser->other_xml.append(i->first);
+                    parser->other_xml.append("=\"");
+                    parser->other_xml.append(i->second.value);
+                    parser->other_xml.append("\"");
+                }
+            }
+
+            parser->other_xml.append(">");
+            break;
+
+        case inside_enum_def:
+            // process an EnumConst element
+            if (parser->process_enum_const(localname, attributes, nb_attributes))
+                parser->push_state(inside_enum_const);
+            else
+                dmr_error(parser, "Expected an 'EnumConst' element; found '%s' instead.", localname);
+            break;
+
+        case inside_enum_const:
+            // No content; nothing to do
+            break;
+
+        case inside_dim_def:
+            // No content; nothing to do
+            break;
+#if 0
+        case inside_dimension:
+            // No content.
+            break;
+#endif
+        case inside_dim:
+            // No content.
+            break;
+
+        case inside_map:
+            // No content.
+            break;
+
+        case inside_simple_type:
+            if (parser->process_attribute(localname, attributes, nb_attributes))
+                break;
+            else if (parser->process_dimension(localname, attributes, nb_attributes))
+            	parser->push_state(inside_dim);
+            else if (parser->process_map(localname, attributes, nb_attributes))
+            	parser->push_state(inside_map);
+            else
+                dmr_error(parser, "Expected an 'Attribute', 'Dim' or 'Map' element; found '%s' instead.", localname);
+            break;
+
+        case inside_constructor:
+            if (parser->process_variable(localname, attributes, nb_attributes))
+                // This will push either inside_simple_type or inside_structure
+                // onto the parser state stack.
+                break;
+            else if (parser->process_attribute(localname, attributes, nb_attributes))
+                break;
+            else if (parser->process_dimension(localname, attributes, nb_attributes))
+                parser->push_state(inside_dim);
+            else if (parser->process_map(localname, attributes, nb_attributes))
+            	parser->push_state(inside_map);
+            else
+                D4ParserSax2::dmr_error(parser, "Expected an Attribute, Dim, Map or variable element; found '%s' instead.", localname);
+            break;
+
+        case not_dap4_element:
+            if (parser->debug()) cerr << "Inside non DAP4 element. localname: " << localname << endl;
+        	break;
+
+        case parser_unknown:
+            // FIXME?
+            // *** Never used? If so remove/error
+            parser->push_state(parser_unknown);
+            break;
+
+        case parser_error:
+        case parser_fatal_error:
+            break;
+
+        case parser_end:
+            // FIXME Error?
+            break;
+    }
+
+    if (parser->debug()) cerr << "Start element exit state: " << states[parser->get_state()] << endl;
+}
+
+void D4ParserSax2::dmr_end_element(void *p, const xmlChar *l, const xmlChar *prefix, const xmlChar *URI)
+{
+    D4ParserSax2 *parser = static_cast<D4ParserSax2*>(p);
+    const char *localname = (const char *) l;
+
+    if (parser->debug())
+        cerr << "End element " << localname << " (state " << states[parser->get_state()] << ")" << endl;
+
+    switch (parser->get_state()) {
+    case parser_start:
+        dmr_fatal_error(parser, "Unexpected state, inside start state while processing element '%s'.", localname);
+        break;
+
+    case inside_dataset:
+        if (is_not(localname, "Dataset"))
+            D4ParserSax2::dmr_error(parser, "Expected an end Dataset tag; found '%s' instead.", localname);
+
+        parser->pop_state();
+        if (parser->get_state() != parser_start)
+            dmr_fatal_error(parser, "Unexpected state, expected start state.");
+        else {
+            parser->pop_state();
+            parser->push_state(parser_end);
+        }
+        break;
+
+    case inside_group: {
+        if (is_not(localname, "Group"))
+            D4ParserSax2::dmr_error(parser, "Expected an end tag for a Group; found '%s' instead.", localname);
+
+        if (!parser->empty_basetype() || parser->empty_group())
+            D4ParserSax2::dmr_error(parser,
+                    "The document did not contain a valid root Group or contained unbalanced tags.");
+
+        parser->pop_group();
+        parser->pop_state();
+        break;
+    }
+
+    case inside_attribute_container:
+        if (is_not(localname, "Attribute"))
+            D4ParserSax2::dmr_error(parser, "Expected an end Attribute tag; found '%s' instead.", localname);
+
+        parser->pop_state();
+        parser->pop_attributes();
+        break;
+
+    case inside_attribute:
+        if (is_not(localname, "Attribute"))
+            D4ParserSax2::dmr_error(parser, "Expected an end Attribute tag; found '%s' instead.", localname);
+
+        parser->pop_state();
+        break;
+
+    case inside_attribute_value: {
+        if (is_not(localname, "Value"))
+            D4ParserSax2::dmr_error(parser, "Expected an end value tag; found '%s' instead.", localname);
+
+        parser->pop_state();
+
+        // The old code added more values using the name and type as
+        // indexes to find the correct attribute. Use get() for that
+        // now. Or fix this code to keep a pointer to the to attribute...
+        D4Attributes *attrs = parser->top_attributes();
+        D4Attribute *attr = attrs->get(parser->dods_attr_name);
+        if (!attr) {
+            attr = new D4Attribute(parser->dods_attr_name, StringToD4AttributeType(parser->dods_attr_type));
+            attrs->add_attribute_nocopy(attr);
+        }
+        attr->add_value(parser->char_data);
+
+        parser->char_data = ""; // Null this after use.
+        break;
+    }
+
+    case inside_other_xml_attribute: {
+        if (strcmp(localname, "Attribute") == 0 && parser->root_ns == (const char *) URI) {
+            parser->pop_state();
+
+            // The old code added more values using the name and type as
+            // indexes to find the correct attribute. Use get() for that
+            // now. Or fix this code to keep a pointer to the to attribute...
+            D4Attributes *attrs = parser->top_attributes();
+            D4Attribute *attr = attrs->get(parser->dods_attr_name);
+            if (!attr) {
+                attr = new D4Attribute(parser->dods_attr_name, StringToD4AttributeType(parser->dods_attr_type));
+                attrs->add_attribute_nocopy(attr);
+            }
+            attr->add_value(parser->other_xml);
+
+            parser->other_xml = ""; // Null this after use.
+        }
+        else {
+            if (parser->other_xml_depth == 0) {
+                D4ParserSax2::dmr_error(parser, "Expected an OtherXML attribute to end! Instead I found '%s'",
+                        localname);
+                break;
+            }
+            parser->other_xml_depth--;
+
+            parser->other_xml.append("</");
+            if (prefix) {
+                parser->other_xml.append((const char *) prefix);
+                parser->other_xml.append(":");
+            }
+            parser->other_xml.append(localname);
+            parser->other_xml.append(">");
+        }
+        break;
+    }
+
+    case inside_enum_def:
+        if (is_not(localname, "Enumeration"))
+            D4ParserSax2::dmr_error(parser, "Expected an end Enumeration tag; found '%s' instead.", localname);
+        if (!parser->top_group())
+            D4ParserSax2::dmr_fatal_error(parser,
+                    "Expected a Group to be the current item, while finishing up an Enumeration.");
+        else {
+            // copy the pointer; not a deep copy
+            parser->top_group()->enum_defs()->add_enum_nocopy(parser->enum_def());
+            // Set the enum_def to null; next call to enum_def() will
+            // allocate a new object
+            parser->clear_enum_def();
+            parser->pop_state();
+        }
+        break;
+
+    case inside_enum_const:
+        if (is_not(localname, "EnumConst"))
+            D4ParserSax2::dmr_error(parser, "Expected an end EnumConst tag; found '%s' instead.", localname);
+
+        parser->pop_state();
+        break;
+
+    case inside_dim_def: {
+        if (is_not(localname, "Dimension"))
+            D4ParserSax2::dmr_error(parser, "Expected an end Dimension tag; found '%s' instead.", localname);
+
+        if (!parser->top_group())
+            D4ParserSax2::dmr_error(parser,
+                    "Expected a Group to be the current item, while finishing up an Dimension.");
+
+        // FIXME Use the Group on the top of the group stack
+        // copy the pointer; not a deep copy
+        parser->top_group()->dims()->add_dim_nocopy(parser->dim_def());
+        //parser->dmr()->root()->dims()->add_dim_nocopy(parser->dim_def());
+        // Set the dim_def to null; next call to dim_def() will
+        // allocate a new object. Calling 'clear' is important because
+        // the cleanup method will free dim_def if it's not null and
+        // we just copied the pointer in the add_dim_nocopy() call
+        // above.
+        parser->clear_dim_def();
+        parser->pop_state();
+        break;
+    }
+
+    case inside_simple_type:
+        if (is_simple_type(get_type(localname))) {
+            BaseType *btp = parser->top_basetype();
+            parser->pop_basetype();
+            parser->pop_attributes();
+
+            BaseType *parent = 0;
+            if (!parser->empty_basetype())
+                parent = parser->top_basetype();
+            else if (!parser->empty_group())
+                parent = parser->top_group();
+            else {
+                dmr_fatal_error(parser, "Both the Variable and Groups stacks are empty while closing a %s element.",
+                        localname);
+                delete btp;
+                parser->pop_state();
+                break;
+            }
+
+            if (parent->type() == dods_array_c)
+                static_cast<Array*>(parent)->prototype()->add_var_nocopy(btp);
+            else
+                parent->add_var_nocopy(btp);
+        }
+        else
+            D4ParserSax2::dmr_error(parser, "Expected an end tag for a simple type; found '%s' instead.", localname);
+
+        parser->pop_state();
+        break;
+
+    case inside_dim:
+        if (is_not(localname, "Dim"))
+            D4ParserSax2::dmr_fatal_error(parser, "Expected an end Dim tag; found '%s' instead.", localname);
+
+        parser->pop_state();
+        break;
+
+    case inside_map:
+        if (is_not(localname, "Map"))
+            D4ParserSax2::dmr_fatal_error(parser, "Expected an end Map tag; found '%s' instead.", localname);
+
+        parser->pop_state();
+        break;
+
+    case inside_constructor: {
+        if (strcmp(localname, "Structure") != 0 && strcmp(localname, "Sequence") != 0) {
+            D4ParserSax2::dmr_error(parser, "Expected an end tag for a constructor; found '%s' instead.", localname);
+            return;
+        }
+
+        BaseType *btp = parser->top_basetype();
+        parser->pop_basetype();
+        parser->pop_attributes();
+
+        BaseType *parent = 0;
+        if (!parser->empty_basetype())
+            parent = parser->top_basetype();
+        else if (!parser->empty_group())
+            parent = parser->top_group();
+        else {
+            dmr_fatal_error(parser, "Both the Variable and Groups stacks are empty while closing a %s element.",
+                    localname);
+            delete btp;
+            parser->pop_state();
+            break;
+        }
+
+        // TODO Why doesn't this code mirror the simple_var case and test
+        // for the parent being an array? jhrg 10/13/13
+        parent->add_var_nocopy(btp);
+        parser->pop_state();
+        break;
+    }
+
+    case not_dap4_element:
+        if (parser->debug()) cerr << "End of non DAP4 element: " << localname << endl;
+        parser->pop_state();
+    	break;
+
+    case parser_unknown:
+        parser->pop_state();
+        break;
+
+    case parser_error:
+    case parser_fatal_error:
+        break;
+
+    case parser_end:
+        // FIXME Error?
+        break;
+    }
+
+    if (parser->debug()) cerr << "End element exit state: " << states[parser->get_state()] << endl;
+}
+
+/** Process/accumulate character data. This may be called more than once for
+ one logical clump of data. Only save character data when processing
+ 'value' elements; throw away all other characters. */
+void D4ParserSax2::dmr_get_characters(void * p, const xmlChar * ch, int len)
+{
+    D4ParserSax2 *parser = static_cast<D4ParserSax2*>(p);
+
+    switch (parser->get_state()) {
+        case inside_attribute_value:
+            parser->char_data.append((const char *) (ch), len);
+            DBG(cerr << "Characters: '" << parser->char_data << "'" << endl);
+            break;
+
+        case inside_other_xml_attribute:
+            parser->other_xml.append((const char *) (ch), len);
+            DBG(cerr << "Other XML Characters: '" << parser->other_xml << "'" << endl);
+            break;
+
+        default:
+            break;
+    }
+}
+
+/** Read whitespace that's not really important for content. This is used
+ only for the OtherXML attribute type to preserve formating of the XML.
+ Doing so makes the attribute value far easier to read.
+ */
+void D4ParserSax2::dmr_ignoreable_whitespace(void *p, const xmlChar *ch, int len)
+{
+    D4ParserSax2 *parser = static_cast<D4ParserSax2*>(p);
+
+    switch (parser->get_state()) {
+        case inside_other_xml_attribute:
+            parser->other_xml.append((const char *) (ch), len);
+            break;
+
+        default:
+            break;
+    }
+}
+
+/** Get characters in a cdata block. DAP does not use CData, but XML in an
+ OtherXML attribute (the value of that DAP attribute) might use it. This
+ callback also allows CData when the parser is in the 'parser_unknown'
+ state since some future DAP element might use it.
+ */
+void D4ParserSax2::dmr_get_cdata(void *p, const xmlChar *value, int len)
+{
+    D4ParserSax2 *parser = static_cast<D4ParserSax2*>(p);
+
+    switch (parser->get_state()) {
+        case inside_other_xml_attribute:
+            parser->other_xml.append((const char *) (value), len);
+            break;
+
+        case parser_unknown:
+            break;
+
+        default:
+            D4ParserSax2::dmr_error(parser, "Found a CData block but none are allowed by DAP4.");
+
+            break;
+    }
+}
+
+/** Handle the standard XML entities.
+
+ @param parser The SAX parser
+ @param name The XML entity. */
+xmlEntityPtr D4ParserSax2::dmr_get_entity(void *, const xmlChar * name)
+{
+    return xmlGetPredefinedEntity(name);
+}
+
+/** Process an XML fatal error. Note that SAX provides for warnings, errors
+ and fatal errors. This code treats them all as fatal errors since there's
+ typically no way to tell a user about the error since there's often no
+ user interface for this software.
+
+ @note This static function does not throw an exception or otherwise
+ alter flow of control except for altering the parser state.
+
+ @param p The SAX parser
+ @param msg A printf-style format string. */
+void D4ParserSax2::dmr_fatal_error(void * p, const char *msg, ...)
+{
+    va_list args;
+    D4ParserSax2 *parser = static_cast<D4ParserSax2*>(p);
+
+    parser->push_state(parser_fatal_error);
+
+    va_start(args, msg);
+    char str[1024];
+    vsnprintf(str, 1024, msg, args);
+    va_end(args);
+
+    int line = xmlSAX2GetLineNumber(parser->d_context);
+
+    if (!parser->d_error_msg.empty()) parser->d_error_msg += "\n";
+    parser->d_error_msg += "At line " + long_to_string(line) + ": " + string(str);
+}
+
+void D4ParserSax2::dmr_error(void *p, const char *msg, ...)
+{
+    va_list args;
+    D4ParserSax2 *parser = static_cast<D4ParserSax2*>(p);
+
+    parser->push_state(parser_error);
+
+    va_start(args, msg);
+    char str[1024];
+    vsnprintf(str, 1024, msg, args);
+    va_end(args);
+
+    int line = xmlSAX2GetLineNumber(parser->d_context);
+
+    if (!parser->d_error_msg.empty()) parser->d_error_msg += "\n";
+    parser->d_error_msg += "At line " + long_to_string(line) + ": " + string(str);
+}
+//@}
+
+/** Clean up after a parse operation. If the parser encountered an error,
+ * throw either an Error or InternalErr object.
+ */
+void D4ParserSax2::cleanup_parse()
+{
+    bool wellFormed = d_context->wellFormed;
+    bool valid = d_context->valid;
+
+    d_context->sax = NULL;
+    xmlFreeParserCtxt(d_context);
+
+    delete d_enum_def;
+    d_enum_def = 0;
+
+    delete d_dim_def;
+    d_dim_def = 0;
+
+    // If there's an error, there may still be items on the stack at the
+    // end of the parse.
+    while (!btp_stack.empty()) {
+        delete top_basetype();
+        pop_basetype();
+    }
+
+    if (!wellFormed)
+        throw Error("The DMR was not well formed. " + d_error_msg);
+    else if (!valid)
+        throw Error("The DMR was not valid." + d_error_msg);
+    else if (get_state() == parser_error)
+        throw Error(d_error_msg);
+    else if (get_state() == parser_fatal_error)
+        throw InternalErr(d_error_msg);
+}
+
+/**
+ * Read the DMR from a stream.
+ *
+ * @param f The input stream
+ * @param dest_dmr Value-result parameter. Pass a pointer to a DMR in and
+ * the information in the DMR will be added to it.
+ * @param boundary If not empty, use this as the boundary tag in a MPM document
+ * that marks the end of the part hat holds the DMR. Stop reading when the
+ * boundary is found.
+ * @param debug If true, ouput helpful debugging messages, False by default.
+ *
+ * @exception Error Thrown if the XML document could not be read or parsed.
+ * @exception InternalErr Thrown if an internal error is found.
+ */
+void D4ParserSax2::intern(istream &f, DMR *dest_dmr, bool debug)
+{
+    d_debug = debug;
+
+    // Code example from libxml2 docs re: read from a stream.
+
+    if (!f.good())
+        throw Error("Input stream not open or read error");
+    if (!dest_dmr)
+        throw InternalErr(__FILE__, __LINE__, "DMR object is null");
+
+    d_dmr = dest_dmr; // dump values here
+
+#if 0
+    // Old, bad, code. Lines are limited to 1023 chars including the element text.
+    const int size = 1024;
+    char chars[size];
+    int line = 1;
+
+    f.getline(chars, size);
+    int res = f.gcount();
+    if (res == 0) throw Error("No input found while parsing the DMR.");
+
+    getline(f, line);
+
+    if (debug) cerr << "line: (" << line++ << "): " << chars << endl;
+
+    d_context = xmlCreatePushParserCtxt(&d_dmr_sax_parser, this, chars, res - 1, "stream");
+    d_context->validate = true;
+    push_state(parser_start);
+
+    f.getline(chars, size);
+    while ((f.gcount() > 0) && (get_state() != parser_end)) {
+        if (debug) cerr << "line: (" << line++ << "): " << chars << endl;
+        xmlParseChunk(d_context, chars, f.gcount() - 1, 0);
+        f.getline(chars, size);
+    }
+
+    // This call ends the parse.
+    xmlParseChunk(d_context, chars, 0, 1/*terminate*/);
+#else
+    int line_num = 1;
+    string line;
+
+    // Get the <xml ... ?> line
+    getline(f, line);
+    if (line.length() == 0) throw Error("No input found while parsing the DMR.");
+
+    if (debug) cerr << "line: (" << line_num << "): " << endl << line << endl << endl;
+
+    d_context = xmlCreatePushParserCtxt(&d_dmr_sax_parser, this, line.c_str(), line.length(), "stream");
+    d_context->validate = true;
+    push_state(parser_start);
+
+    // Get the first line of stuff
+    getline(f, line);
+    ++line_num;
+
+    if (debug) cerr << "line: (" << line_num << "): " << endl << line << endl << endl;
+
+    while (!f.eof() && (get_state() != parser_end)) {
+        xmlParseChunk(d_context, line.c_str(), line.length(), 0);
+
+        // Get the next line
+        getline(f, line);
+        ++line_num;
+
+        if (debug) cerr << "line: (" << line_num << "): " << endl << line << endl << endl;
+    }
+
+    // This call ends the parse.
+    xmlParseChunk(d_context, line.c_str(), 0, 1/*terminate*/);
+#endif
+
+    // This checks that the state on the parser stack is parser_end and throws
+    // an exception if it's not (i.e., the loop exited with gcount() == 0).
+    cleanup_parse();
+}
+
+/** Parse a DMR document stored in a string.
+ *
+ * @param document Read the DMR from this string.
+ * @param dest_dmr Value/result parameter; dumps the information to this DMR
+ * instance.
+ * @param debug If true, ouput helpful debugging messages, False by default
+ *
+ * @exception Error Thrown if the XML document could not be read or parsed.
+ * @exception InternalErr Thrown if an internal error is found.
+ */
+void D4ParserSax2::intern(const string &document, DMR *dest_dmr, bool debug)
+{
+    intern(document.c_str(), document.length(), dest_dmr, debug);
+}
+
+/** Parse a DMR document stored in a char *buffer.
+ *
+ * @param document Read the DMR from this string.
+ * @param dest_dmr Value/result parameter; dumps the information to this DMR
+ * instance.
+ * @param debug If true, ouput helpful debugging messages, False by default
+ *
+ * @exception Error Thrown if the XML document could not be read or parsed.
+ * @exception InternalErr Thrown if an internal error is found.
+ */
+void D4ParserSax2::intern(const char *buffer, int size, DMR *dest_dmr, bool debug)
+{
+    if (!(size > 0)) return;
+
+    d_debug = debug;
+
+    // Code example from libxml2 docs re: read from a stream.
+
+    if (!dest_dmr) throw InternalErr(__FILE__, __LINE__, "DMR object is null");
+    d_dmr = dest_dmr; // dump values in dest_dmr
+
+    push_state(parser_start);
+    d_context = xmlCreatePushParserCtxt(&d_dmr_sax_parser, this, buffer, size, "stream");
+    d_context->validate = true;
+
+    // This call ends the parse.
+    xmlParseChunk(d_context, buffer, 0, 1/*terminate*/);
+
+    // This checks that the state on the parser stack is parser_end and throws
+    // an exception if it's not (i.e., the loop exited with gcount() == 0).
+    cleanup_parse();
+}
+
+} // namespace libdap
diff --git a/D4ParserSax2.h b/D4ParserSax2.h
new file mode 100644
index 0000000..d160b11
--- /dev/null
+++ b/D4ParserSax2.h
@@ -0,0 +1,326 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2012 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#ifndef d4_parser_sax2_h
+#define d4_parser_sax2_h
+
+#define ATTR 1
+
+#include <string.h>
+
+#include <string>
+#include <iostream>
+#include <map>
+#include <stack>
+
+#include <libxml/parserInternals.h>
+
+#define CRLF "\r\n"
+
+namespace libdap
+{
+
+class DMR;
+class BaseType;
+class D4BaseTypeFactory;
+class D4Group;
+class D4Attributes;
+class D4EnumDef;
+class D4Dimension;
+
+/** Parse the XML text which encodes the network/persistent representation of
+    the DMR object. In the current implementation, the DMR is held by an
+    instance of the class DDS which in turn holds variables which include
+    attributes.
+
+    This parser for the DMR document uses the SAX interface of libxml2.
+    Static methods are used as callbacks for the SAX parser. These static
+    methods are public because making them private complicates compilation.
+    They should not be called by anything other than the intern method.
+    They do not throw exceptions because exceptions from within callbacks are
+    not reliable or portable. To signal errors, the methods record
+    information in the D4ParserSax2 object. Once the error handler is called,
+    construction of an DMR object ends even though the SAX parser still
+    calls the various callback functions. The parser treats warnings,
+    errors and fatal_errors the same way; when any are found parsing
+    stops. The intern method throws an Error of InternalErr exception if an
+    error was found.
+
+    Note that this class uses the C++-supplied default definitions for the
+    default and copy constructors as well as the destructor and assignment
+    operator.
+
+    @see DMR */
+class D4ParserSax2
+{
+private:
+    /** States used by DDXParserDAP4State. These are the states of the SAX parser
+    state-machine. */
+    enum ParseState {
+        parser_start,
+
+        inside_dataset,
+
+        // inside_group is the state just after parsing the start of a Group
+        // element.
+        inside_group,
+
+        inside_attribute_container,
+        inside_attribute,
+        inside_attribute_value,
+        inside_other_xml_attribute,
+
+        inside_enum_def,
+        inside_enum_const,
+
+        inside_dim_def,
+
+        // This covers Byte, ..., Url, Opaque
+        inside_simple_type,
+
+        // inside_array,
+        inside_dim,
+        inside_map,
+
+        inside_constructor,
+
+        // inside_sequence, Removed from merged code jhrg 5/2/14
+
+        not_dap4_element,
+
+        parser_unknown,
+        parser_error,
+        parser_fatal_error,
+
+        parser_end
+    };
+
+    xmlSAXHandler d_dmr_sax_parser;
+
+    // The results of the parse operation are stored in these fields.
+    // This is passed into the parser using the intern() methods.
+    DMR *d_dmr;   // dump DMR here
+    DMR *dmr() const { return d_dmr; }
+
+    // These stacks hold the state of the parse as it progresses.
+    stack<ParseState> s; // Current parse state
+    void push_state(D4ParserSax2::ParseState state) { s.push(state); }
+    D4ParserSax2::ParseState get_state() const { return s.top(); }
+    void pop_state() { s.pop(); }
+    bool empty_state() const { return s.empty(); }
+
+    stack<BaseType*> btp_stack; // current variable(s)
+    void push_basetype(BaseType *btp) { btp_stack.push(btp); }
+    BaseType *top_basetype() const { return btp_stack.top(); }
+    void pop_basetype() { btp_stack.pop(); }
+    bool empty_basetype() const { return btp_stack.empty(); }
+
+    stack<D4Group*> grp_stack; // current groups(s)
+    void push_group(D4Group *grp) { grp_stack.push(grp); }
+    D4Group *top_group() const { return grp_stack.top(); }
+    void pop_group() { grp_stack.pop(); }
+    bool empty_group() const { return grp_stack.empty(); }
+
+    stack<D4Attributes*> d_attrs_stack; // DAP4 Attributes
+    void push_attributes(D4Attributes *attr) { d_attrs_stack.push(attr); }
+    D4Attributes *top_attributes() const { return d_attrs_stack.top(); }
+    void pop_attributes() { d_attrs_stack.pop(); }
+    bool empty_attributes() const { return d_attrs_stack.empty(); }
+
+    D4EnumDef *d_enum_def;
+    D4EnumDef *enum_def();
+    void clear_enum_def() { d_enum_def = 0; }
+
+    D4Dimension *d_dim_def;
+    D4Dimension *dim_def();
+    void clear_dim_def() { d_dim_def = 0; }
+
+    // Accumulate stuff inside an 'OtherXML' DAP attribute here
+    string other_xml;
+
+    // When we're parsing unknown XML, how deeply is it nested? This is used
+    // for the OtherXML DAP attributes.
+    unsigned int other_xml_depth;
+    unsigned int unknown_depth;
+
+    // These are used for processing errors.
+    string d_error_msg;  // Error message(s), if any.
+    xmlParserCtxtPtr d_context; // used for error message line numbers
+
+    // These hold temporary values read during the parse.
+    string dods_attr_name; // DAP4 attributes, not XML attributes
+    string dods_attr_type; // ... not XML ...
+    string char_data;  // char data in value elements; null after use
+    string root_ns;     // What is the namespace of the root node (Group)
+
+    bool d_debug;
+    bool debug() const { return d_debug; }
+
+    bool d_strict;
+
+    class XMLAttribute {
+        public:
+        string prefix;
+        string nsURI;
+        string value;
+
+        void clone(const XMLAttribute &src) {
+            prefix = src.prefix;
+            nsURI = src.nsURI;
+            value = src.value;
+        }
+
+        XMLAttribute() : prefix(""), nsURI(""), value("") {}
+        XMLAttribute(const string &p, const string &ns, const string &v)
+            : prefix(p), nsURI(ns), value(v) {}
+        // 'attributes' as passed from libxml2 is a five element array but this
+        // ctor gets the back four elements.
+        XMLAttribute(const xmlChar **attributes/*[4]*/) {
+            prefix = attributes[0] != 0 ? (const char *)attributes[0]: "";
+            nsURI = attributes[1] != 0 ? (const char *)attributes[1]: "";
+            value = string((const char *)attributes[2], (const char *)attributes[3]);
+        }
+        XMLAttribute(const XMLAttribute &rhs) {
+            clone(rhs);
+        }
+        XMLAttribute &operator=(const XMLAttribute &rhs) {
+            if (this == &rhs)
+                return *this;
+            clone(rhs);
+            return *this;
+        }
+    };
+
+    typedef map<string, XMLAttribute> XMLAttrMap;
+    XMLAttrMap xml_attrs; // dump XML attributes here
+
+    XMLAttrMap::iterator xml_attr_begin() { return xml_attrs.begin(); }
+
+    XMLAttrMap::iterator xml_attr_end() {  return xml_attrs.end(); }
+
+    map<string, string> namespace_table;
+
+    void cleanup_parse();
+
+    /** @name Parser Actions
+
+    These methods are the 'actions' carried out by the start_element and
+    end_element callbacks. Most of what takes place in those has been
+    factored out to this set of functions. */
+    //@{
+    void transfer_xml_attrs(const xmlChar **attrs, int nb_attributes);
+    void transfer_xml_ns(const xmlChar **namespaces, int nb_namespaces);
+    bool check_required_attribute(const string &attr);
+    bool check_attribute(const string & attr);
+    void process_variable_helper(Type t, ParseState s, const xmlChar **attrs, int nb_attributes);
+
+    void process_enum_const_helper(const xmlChar **attrs, int nb_attributes);
+    void process_enum_def_helper(const xmlChar **attrs, int nb_attributes);
+
+    bool process_dimension(const char *name, const xmlChar **attrs, int nb_attrs);
+    bool process_dimension_def(const char *name, const xmlChar **attrs, int nb_attrs);
+    bool process_map(const char *name, const xmlChar **attrs, int nb_attributes);
+    bool process_attribute(const char *name, const xmlChar **attrs, int nb_attributes);
+    bool process_variable(const char *name, const xmlChar **attrs, int nb_attributes);
+    bool process_group(const char *name, const xmlChar **attrs, int nb_attributes);
+    bool process_enum_def(const char *name, const xmlChar **attrs, int nb_attributes);
+    bool process_enum_const(const char *name, const xmlChar **attrs, int nb_attributes);
+
+    void finish_variable(const char *tag, Type t, const char *expected);
+    //@}
+
+    friend class D4ParserSax2Test;
+
+public:
+    D4ParserSax2() :
+        d_dmr(0), d_enum_def(0), d_dim_def(0),
+        other_xml(""), other_xml_depth(0), unknown_depth(0),
+        d_error_msg(""), d_context(0),
+        dods_attr_name(""), dods_attr_type(""),
+        char_data(""), root_ns(""), d_debug(false), d_strict(true)
+    {
+        //xmlSAXHandler ddx_sax_parser;
+        memset(&d_dmr_sax_parser, 0, sizeof(xmlSAXHandler));
+
+        d_dmr_sax_parser.getEntity = &D4ParserSax2::dmr_get_entity;
+        d_dmr_sax_parser.startDocument = &D4ParserSax2::dmr_start_document;
+        d_dmr_sax_parser.endDocument = &D4ParserSax2::dmr_end_document;
+        d_dmr_sax_parser.characters = &D4ParserSax2::dmr_get_characters;
+        d_dmr_sax_parser.ignorableWhitespace = &D4ParserSax2::dmr_ignoreable_whitespace;
+        d_dmr_sax_parser.cdataBlock = &D4ParserSax2::dmr_get_cdata;
+        d_dmr_sax_parser.warning = &D4ParserSax2::dmr_error;
+        d_dmr_sax_parser.error = &D4ParserSax2::dmr_error;
+        d_dmr_sax_parser.fatalError = &D4ParserSax2::dmr_fatal_error;
+        d_dmr_sax_parser.initialized = XML_SAX2_MAGIC;
+        d_dmr_sax_parser.startElementNs = &D4ParserSax2::dmr_start_element;
+        d_dmr_sax_parser.endElementNs = &D4ParserSax2::dmr_end_element;
+    }
+
+    void intern(istream &f, DMR *dest_dmr, bool debug = false);
+    void intern(const string &document, DMR *dest_dmr, bool debug = false);
+    void intern(const char *buffer, int size, DMR *dest_dmr, bool debug = false);
+
+    /**
+     * @defgroup strict The 'strict' mode
+     * @{
+     * The strict mode of the parser is the default. In this mode any error
+     * will result in an exception and parsing will stop. When strict mode
+     * is set to false (forgiving mode?), some errors will be silently ignored.
+     * The list of allowed errors is:
+     *     The Array named by a Map element is not required to be in the DMR.
+     *     There are no other allowed errors at this time (4/13/16)
+     */
+
+    /** @brief Set the 'strict' mode to true or false. */
+    void set_strict(bool s) { d_strict = s; }
+    /** @brief Get the setting of the 'strict' mode.
+     * @return True or False.
+     */
+    bool get_strict() const { return d_strict; }
+    /** @} */
+
+    static void dmr_start_document(void *parser);
+    static void dmr_end_document(void *parser);
+
+    static void dmr_start_element(void *parser,
+            const xmlChar *localname, const xmlChar *prefix, const xmlChar *URI,
+            int nb_namespaces, const xmlChar **namespaces, int nb_attributes,
+            int nb_defaulted, const xmlChar **attributes);
+    static void dmr_end_element(void *parser, const xmlChar *localname,
+            const xmlChar *prefix, const xmlChar *URI);
+
+    static void dmr_get_characters(void *parser, const xmlChar *ch, int len);
+    static void dmr_ignoreable_whitespace(void *parser,
+            const xmlChar * ch, int len);
+    static void dmr_get_cdata(void *parser, const xmlChar *value, int len);
+
+    static xmlEntityPtr dmr_get_entity(void *parser, const xmlChar *name);
+    static void dmr_fatal_error(void *parser, const char *msg, ...);
+    static void dmr_error(void *parser, const char *msg, ...);
+};
+
+} // namespace libdap
+
+#endif // d4_parser_sax2_h
diff --git a/D4RValue.cc b/D4RValue.cc
new file mode 100644
index 0000000..e1ece71
--- /dev/null
+++ b/D4RValue.cc
@@ -0,0 +1,324 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2014 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#include "config.h"
+
+#include <iostream>
+
+#include "BaseType.h"
+#include "Array.h"
+#include "Byte.h"
+#include "Int8.h"
+#include "UInt16.h"
+#include "Int16.h"
+#include "UInt32.h"
+#include "Int32.h"
+#include "UInt64.h"
+#include "Int64.h"
+#include "Float32.h"
+#include "Float64.h"
+#include "Str.h"
+
+#include "D4RValue.h"
+#include "InternalErr.h"
+
+#include "dods-datatypes.h"
+#include "dods-limits.h"
+#include "parser-util.h"
+#include "util.h"
+
+using namespace std;
+
+namespace libdap {
+
+void
+D4RValueList::m_duplicate(const D4RValueList &src)
+{
+    for (std::vector<D4RValue *>::const_iterator i = src.d_rvalues.begin(), e = src.d_rvalues.end(); i != e; ++i) {
+        D4RValue *rv = *i;
+        d_rvalues.push_back(new D4RValue(*rv));
+    }
+}
+
+D4RValueList::~D4RValueList()
+{
+    for (std::vector<D4RValue *>::iterator i = d_rvalues.begin(), e = d_rvalues.end(); i != e; ++i)
+        delete *i;
+}
+
+void
+D4RValue::m_duplicate(const D4RValue &src)
+{
+    d_value_kind = src.d_value_kind;
+
+    d_variable = src.d_variable;    // weak pointers
+
+    d_func = src.d_func;
+    d_args = (src.d_args != 0) ? new D4RValueList(*src.d_args) : 0; // deep copy these
+
+    d_constant = (src.d_constant != 0) ? src.d_constant->ptr_duplicate() : 0;
+}
+
+template<typename T, class DAP_TYPE>
+static BaseType *
+build_constant_array(vector<T> &values, DAP_TYPE &dt)
+{
+    Array *array = new Array("", &dt);
+    array->append_dim(values.size());
+
+    // TODO Make set_value_nocopy() methods so that values' pointers can be copied
+    // instead of allocating memory twice. jhrg 7/5/13
+
+    array->set_value(values, values.size());
+
+    array->set_read_p(true);
+
+    static unsigned long counter = 1;
+    array->set_name(string("g") + long_to_string(counter++));
+
+    return array;
+}
+
+D4RValue::D4RValue(unsigned long long ull) : d_variable(0), d_func(0), d_args(0), d_constant(0), d_value_kind(constant)
+{
+	UInt64 *ui = new UInt64("constant");
+	ui->set_value(ull);
+	d_constant = ui;
+}
+
+D4RValue::D4RValue(long long ll) : d_variable(0), d_func(0), d_args(0),  d_constant(0), d_value_kind(constant)
+{
+	Int64 *i = new Int64("constant");
+	i->set_value(ll);
+	d_constant = i;
+}
+
+D4RValue::D4RValue(double r) : d_variable(0), d_func(0), d_args(0),  d_constant(0), d_value_kind(constant)
+{
+	Float64 *f = new Float64("constant");
+	f->set_value(r);
+	d_constant = f;
+}
+
+D4RValue::D4RValue(std::string cpps) : d_variable(0), d_func(0), d_args(0),  d_constant(0), d_value_kind(constant)
+{
+	Str *s = new Str("constant");
+	s->set_value(remove_quotes(cpps));
+	d_constant = s;
+}
+
+D4RValue::D4RValue(std::vector<dods_byte> &byte_args)
+	: d_variable(0), d_func(0), d_args(0),  d_constant(0), d_value_kind(constant)
+{
+	Byte b("");
+	d_constant = build_constant_array(byte_args, b);
+}
+
+D4RValue::D4RValue(std::vector<dods_int8> &byte_int8)
+	: d_variable(0), d_func(0), d_args(0),  d_constant(0), d_value_kind(constant)
+{
+	Int8 b("");
+	d_constant = build_constant_array(byte_int8, b);
+}
+
+D4RValue::D4RValue(std::vector<dods_uint16> &byte_uint16)
+	: d_variable(0), d_func(0), d_args(0),  d_constant(0), d_value_kind(constant)
+{
+	UInt16 b("");
+	d_constant = build_constant_array(byte_uint16, b);
+}
+
+D4RValue::D4RValue(std::vector<dods_int16> &byte_int16)
+	: d_variable(0), d_func(0), d_args(0),  d_constant(0), d_value_kind(constant)
+{
+	Int16 b("");
+	d_constant = build_constant_array(byte_int16, b);
+}
+
+D4RValue::D4RValue(std::vector<dods_uint32> &byte_uint32)
+	: d_variable(0), d_func(0), d_args(0),  d_constant(0), d_value_kind(constant)
+{
+	UInt32 b("");
+	d_constant = build_constant_array(byte_uint32, b);
+}
+
+D4RValue::D4RValue(std::vector<dods_int32> &byte_int32)
+	: d_variable(0), d_func(0), d_args(0),  d_constant(0), d_value_kind(constant)
+{
+	Int32 b("");
+	d_constant = build_constant_array(byte_int32, b);
+}
+
+D4RValue::D4RValue(std::vector<dods_uint64> &byte_uint64)
+	: d_variable(0), d_func(0), d_args(0),  d_constant(0), d_value_kind(constant)
+{
+	UInt64 b("");
+	d_constant = build_constant_array(byte_uint64, b);
+}
+
+D4RValue::D4RValue(std::vector<dods_int64> &byte_int64)
+	: d_variable(0), d_func(0), d_args(0),  d_constant(0), d_value_kind(constant)
+{
+	Int64 b("");
+	d_constant = build_constant_array(byte_int64, b);
+}
+
+D4RValue::D4RValue(std::vector<dods_float32> &byte_float32)
+	: d_variable(0), d_func(0), d_args(0),  d_constant(0), d_value_kind(constant)
+{
+	Float32 b("");
+	d_constant = build_constant_array(byte_float32, b);
+}
+
+D4RValue::D4RValue(std::vector<dods_float64> &byte_float64)
+	: d_variable(0), d_func(0), d_args(0),  d_constant(0), d_value_kind(constant)
+{
+	Float64 b("");
+	d_constant = build_constant_array(byte_float64, b);
+}
+
+D4RValue::~D4RValue() {
+	// d_variable and d_func are weak pointers; don't delete.
+	delete d_args;
+	delete d_constant;
+}
+
+/**
+ * @brief Build an appropriate RValue
+ *
+ * Look at the value in the string parameter and build an appropriate
+ * BaseType, use that as a constant and build an RValue. This can be used
+ * by the DAP4 parser directly to build the constants in filter clauses.
+ *
+ * @param cpps The string argument read by the parser.
+ * @return A D4RValue pointer.
+ */
+D4RValue *D4RValueFactory(std::string cpps)
+{
+    char *ptr;
+
+    // First check if the string is a uint64, ..., then convert it.
+    // Since the check_* function use the strtoull() functions, no
+    // need to test for errors when building the actual values.
+    if (check_uint64(cpps.c_str())) {
+        return new D4RValue(strtoull(cpps.c_str(), &ptr, 0));
+    }
+    else if (check_int64(cpps.c_str())) {
+        return new D4RValue(strtoll(cpps.c_str(), &ptr, 0));
+    }
+    else if (check_float64(cpps.c_str())) {
+#ifdef WIN32
+        return new D4RValue(w32strtod(cpps.c_str(), &ptr));
+#else
+        return new D4RValue(strtod(cpps.c_str(), &ptr));
+#endif
+    }
+    else {
+        return new D4RValue(cpps);
+    }
+}
+
+/**
+ * @brief Get the value for a RValue object
+ * Return the BaseType * for a given RValue. For a dataset variable, read the
+ * variable's value and, for a function, evaluate that function. Since read()
+ * is called for a dataset variable each time this method is called, if the
+ * variable is part of a Sequence, the next value in the sequence will be returned.
+ * However, since this code also sets the read_p property after calling read(),
+ * if the variable does not have a new value, read() will not be called (using the
+ * read_p property, the read() method is called only when the variable has a new
+ * value to be read.
+ *
+ * @note Unlike the DAP2 functions, we have an easier-to-follow memory model for
+ * function values. The values (BaseType*) returned by this method will be packaged
+ * up in a RValueList and deleted when that list is deleted. Constant values and
+ * function result values will be deleted at that time; variables will not. Thus
+ * Server Functions should always allocate storage for their return values.
+ *
+ * @todo Could move the operation that wraps a constant in a BaseType to this method
+ * while providing other ways to access the value(s) (methods to determine if the
+ * rvalue is a constant and what DAP type it is, e.g.). This would provide an optimization
+ * for the filter evaluator which may access the values many times. We might also
+ * modify the server side functions so they could access constant values more efficiently.
+ *
+ * @param dmr The DMR to pass to a function.
+ * @return A BaseType* that holds the value.
+ */
+BaseType *
+D4RValue::value(DMR &dmr)
+{
+	switch (d_value_kind) {
+	case basetype:
+		d_variable->read();
+		d_variable->set_read_p(true);
+		return d_variable;
+
+	case function:
+		return (*d_func)(d_args, dmr);
+
+	case constant:
+		return d_constant;
+
+	default:
+		throw InternalErr(__FILE__, __LINE__, "Unknown rvalue type.");
+	}
+
+	return 0; // nullptr; added return to quiet warning. jhrg 3/24/15
+}
+
+/**
+ * @brief Get the value for a RValue object
+ *
+ * This version of value() will not work for function RValues, but has the advantage that
+ * it can be used more easily for the D4RValue objects built for, and stored in, D4Filter-
+ * Clause instances.
+ *
+ * @see D4RValue::value(DMR&)
+ * @return The value wrapped in a BaseType*
+ */
+BaseType *
+D4RValue::value()
+{
+    switch (d_value_kind) {
+    case basetype:
+        d_variable->read();
+        d_variable->set_read_p(true);
+        return d_variable;
+
+    case function:
+        throw Error(malformed_expr, "An expression that included a function call was used in a place where that won't work.");
+
+    case constant:
+        return d_constant;
+
+    default:
+        throw InternalErr(__FILE__, __LINE__, "Unknown rvalue type.");
+    }
+
+    return 0; // nullptr; added return to quiet warning. jhrg 3/24/15
+}
+
+} // namespace libdap
+
diff --git a/D4RValue.h b/D4RValue.h
new file mode 100644
index 0000000..826c4b1
--- /dev/null
+++ b/D4RValue.h
@@ -0,0 +1,155 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2014 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#ifndef _D4RValue_h
+#define _D4RValue_h
+
+#include <vector>
+#include <string>
+
+#include <dods-datatypes.h>
+#include <D4Function.h>
+
+namespace libdap
+{
+
+class BaseType;
+class D4RValue;
+
+// Factory class to build RValue objects. User by the parser/ce-evaluator
+D4RValue *D4RValueFactory(std::string cpps);
+
+class D4RValueList
+{
+private:
+	std::vector<D4RValue *> d_rvalues;
+
+	void m_duplicate(const D4RValueList &src);
+
+public:
+	typedef std::vector<D4RValue *>::iterator iter;
+
+	D4RValueList() { }
+	D4RValueList(const D4RValueList &src) { m_duplicate(src); }
+	D4RValueList(D4RValue *rv) { add_rvalue(rv); }
+
+	virtual ~D4RValueList();
+
+	void add_rvalue(D4RValue *rv) {
+		d_rvalues.push_back(rv);
+	}
+
+	D4RValue *get_rvalue(unsigned int i) {
+		return d_rvalues.at(i);
+	}
+
+	iter begin() { return d_rvalues.begin(); }
+	iter end() { return d_rvalues.end(); }
+
+	unsigned int size() const { return d_rvalues.size(); }
+
+};
+
+/**
+ * Holds the RValues for the D4 function parser and for the filter
+ * expression evaluator.
+ */
+class D4RValue
+{
+public:
+    enum value_kind {
+        unknown,
+        basetype,
+        function,
+        constant
+    };
+
+private:
+    BaseType *d_variable;	// This is a weak pointer; do not delete
+
+    D4Function d_func;  	// (weak) pointer to a function returning BaseType *
+    D4RValueList *d_args;  	// pointer to arguments to the function; delete
+
+    BaseType *d_constant;	// pointer; delete.
+
+    value_kind d_value_kind;
+
+    /** @brief Clone 'src' to 'this'. */
+    void m_duplicate(const D4RValue &src);
+
+    friend class D4RValueList;
+
+public:
+    D4RValue() : d_variable(0), d_func(0), d_args(0), d_constant(0), d_value_kind(unknown) { }
+    D4RValue(const D4RValue &src) { m_duplicate(src); }
+    D4RValue(BaseType *btp)  : d_variable(btp), d_func(0), d_args(0), d_constant(0), d_value_kind(basetype) { }
+    D4RValue(D4Function f, D4RValueList *args)  : d_variable(0), d_func(f), d_args(args), d_constant(0), d_value_kind(function) { }
+
+    D4RValue(unsigned long long ui);
+    D4RValue(long long i);
+    D4RValue(double r);
+    D4RValue(std::string s);
+    D4RValue(std::vector<dods_byte> &byte_args);
+    D4RValue(std::vector<dods_int8> &byte_int8);
+    D4RValue(std::vector<dods_uint16> &byte_uint16);
+    D4RValue(std::vector<dods_int16> &byte_int16);
+    D4RValue(std::vector<dods_uint32> &byte_uint32);
+    D4RValue(std::vector<dods_int32> &byte_int32);
+    D4RValue(std::vector<dods_uint64> &byte_uint64);
+    D4RValue(std::vector<dods_int64> &byte_int64);
+    D4RValue(std::vector<dods_float32> &byte_float32);
+    D4RValue(std::vector<dods_float64> &byte_float64);
+
+    virtual ~D4RValue();
+
+    D4RValue &operator=(D4RValue &rhs) {
+        if (this == &rhs)
+            return *this;
+
+        m_duplicate(rhs);
+
+        return *this;
+    }
+
+    /**
+     * @brief What kind of thing holds the value
+     * Values in DAP4 constraints are either constants, dataset variables
+     * or function results. It might be nice to know the source of a
+     * given value in order to optimize the evaluation of certain kinds of
+     * expressions.
+     * @return The 'value_kind' of this value.
+     */
+    value_kind get_kind() const { return d_value_kind; }
+
+    // This is the call that will be used to return the value of a function.
+    // jhrg 3/10/14
+    virtual BaseType *value(DMR &dmr);
+    // And this optimizes value() for filters, where functions are not supported.
+    virtual BaseType *value();
+
+};
+
+} // namespace libdap
+#endif // _RValue_h
diff --git a/D4Sequence.cc b/D4Sequence.cc
new file mode 100644
index 0000000..7a9abd0
--- /dev/null
+++ b/D4Sequence.cc
@@ -0,0 +1,590 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2013 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#include "config.h"
+
+//#define DODS_DEBUG
+
+#include <algorithm>
+#include <string>
+#include <sstream>
+
+#include "D4Sequence.h"
+
+#include "D4StreamMarshaller.h"
+#include "D4StreamUnMarshaller.h"
+
+#include "D4RValue.h"
+#include "D4FilterClause.h"     // also contains D4FilterClauseList
+
+#include "debug.h"
+#include "Error.h"
+#include "InternalErr.h"
+#include "util.h"
+#include "escaping.h"
+
+#undef CLEAR_LOCAL_DATA
+
+using namespace std;
+
+namespace libdap {
+
+#if 0
+// Keep this stuff around in case we decide to switch back to sentinels
+
+static const unsigned char end_of_sequence = 0xA5;// binary pattern 1010 0101
+static const unsigned char start_of_instance = 0x5A;// binary pattern 0101 1010
+
+static void
+write_end_of_sequence(Marshaller &m)
+{
+    m.put_opaque( (char *)&end_of_sequence, 1 );
+}
+
+static void
+write_start_of_instance(Marshaller &m)
+{
+    m.put_opaque( (char *)&start_of_instance, 1 );
+}
+
+static unsigned char
+read_marker(UnMarshaller &um)
+{
+    unsigned char marker;
+    um.get_opaque( (char *)&marker, 1 );
+
+    return marker;
+}
+
+static bool
+is_start_of_instance(unsigned char marker)
+{
+    return (marker == start_of_instance);
+}
+
+static bool
+is_end_of_sequence(unsigned char marker)
+{
+    return (marker == end_of_sequence);
+}
+#endif
+
+// Private member functions
+
+// A reminder of these type defs
+//
+// typedef vector<BaseType *> D4SeqRow;
+// typedef vector<D4SeqRow *> D4SeqValues;
+// D4SeqValues d_values;
+
+void D4Sequence::m_duplicate(const D4Sequence &s)
+{
+    d_length = s.d_length;
+#if INDEX_SUBSETTING
+    d_starting_row_number = s.d_starting_row_number;
+    d_ending_row_number = s.d_ending_row_number;
+    d_row_stride = s.d_row_stride;
+#endif
+    // Deep copy for the values
+    for (D4SeqValues::const_iterator i = s.d_values.begin(), e = s.d_values.end(); i != e; ++i) {
+        D4SeqRow &row = **i;
+        D4SeqRow *dest = new D4SeqRow;
+        for (D4SeqRow::const_iterator j = row.begin(), e = row.end(); j != e; ++j) {
+            // *j is a BaseType*
+            dest->push_back((*j)->ptr_duplicate());
+        }
+
+        d_values.push_back(dest);
+    }
+
+    d_copy_clauses = s.d_copy_clauses;
+    d_clauses = (s.d_clauses != 0) ? new D4FilterClauseList(*s.d_clauses) : 0;    // deep copy if != 0
+}
+
+// Public member functions
+
+/** The Sequence constructor requires only the name of the variable
+ to be created.  The name may be omitted, which will create a
+ nameless variable.  This may be adequate for some applications.
+
+ @param n A string containing the name of the variable to be
+ created.
+
+ @brief The Sequence constructor. */
+D4Sequence::D4Sequence(const string &n) :
+        Constructor(n, dods_sequence_c, true /* is dap4 */), d_clauses(0), d_copy_clauses(true), d_length(0)
+{
+}
+
+/** The Sequence server-side constructor requires the name of the variable
+ to be created and the dataset name from which this variable is being
+ created.
+
+ @param n A string containing the name of the variable to be
+ created.
+ @param d A string containing the name of the dataset from which this
+ variable is being created.
+
+ @brief The Sequence server-side constructor. */
+D4Sequence::D4Sequence(const string &n, const string &d) :
+        Constructor(n, d, dods_sequence_c, true /* is dap4 */), d_clauses(0), d_copy_clauses(true), d_length(0)
+{
+}
+
+/** @brief The Sequence copy constructor. */
+D4Sequence::D4Sequence(const D4Sequence &rhs) : Constructor(rhs)
+{
+    m_duplicate(rhs);
+}
+
+BaseType *
+D4Sequence::ptr_duplicate()
+{
+    return new D4Sequence(*this);
+}
+
+static inline void delete_bt(BaseType *bt_ptr)
+{
+    delete bt_ptr;
+}
+
+static inline void delete_rows(D4SeqRow *bt_row_ptr)
+{
+    for_each(bt_row_ptr->begin(), bt_row_ptr->end(), delete_bt);
+
+    delete bt_row_ptr;
+}
+
+D4Sequence::~D4Sequence()
+{
+    clear_local_data();
+    delete d_clauses;
+}
+
+void D4Sequence::clear_local_data()
+{
+    if (!d_values.empty()) {
+        for_each(d_values.begin(), d_values.end(), delete_rows);
+        d_values.resize(0);
+    }
+
+    set_read_p(false);
+}
+
+D4Sequence &
+D4Sequence::operator=(const D4Sequence &rhs)
+{
+    if (this == &rhs) return *this;
+
+    dynamic_cast<Constructor &>(*this) = rhs; // run Constructor=
+
+    m_duplicate(rhs);
+
+    return *this;
+}
+
+/**
+ * @brief Read the next instance of the sequence
+ * While the rest of the variables' read() methods are assumed to return the entire
+ * variable in one call (modulo enhancements of the library to support streaming
+ * large variables), this class assumes that the underlying data store is returning
+ * data from a table of unknown size. Thus, D4Sequence::read() is assumed to return
+ * one instance (or element or row) of the sequence per call and return true when the
+ * EOF (end of the sequence) is reached.
+ *
+ * For each call to read, the values for each of the sequence's members
+ * are expected to have been loaded into the member's BaseType variables; this
+ * method will copy them out and store then in the D4Sequence's internal storage.
+ * This method always returns the next instance that satisfies the CE when 'filter'
+ * is true.
+ *
+ * @note This method is called by D4Sequence::serialize() and it will evaluate the
+ * CE for each set of values read.
+ *
+ * @param dmr
+ * @param eval
+ * @param filter
+ * @return False when read() indicates that the EOF was found, true otherwise.
+ */
+bool D4Sequence::read_next_instance(bool filter)
+{
+    bool eof = false;
+    bool done = false;
+
+    do {
+        eof = read();
+        if (eof) {  // bail if EOF
+            continue;
+        }
+        // if we are supposed to filter and the clauses eval to true, we're done
+        else if (filter && d_clauses && d_clauses->value()) {
+            d_length++;
+            done = true;
+        }
+        // else if we're not supposed to filter or there are no clauses, we're done
+        else if (!filter || !d_clauses) {
+            d_length++;
+            done = true;
+        }
+
+        // Set up the next call to get another row's worth of data
+        set_read_p(false);
+
+    } while (!eof && !done);
+
+    return !eof;
+}
+
+void D4Sequence::intern_data()
+{
+    read_sequence_values(true);
+
+#if 0
+    // Read the data values, then serialize.
+    while (read_next_instance(true /*filter*/)) {
+        D4SeqRow *row = new D4SeqRow;
+        for (Vars_iter i = d_vars.begin(), e = d_vars.end(); i != e; i++) {
+            if ((*i)->send_p()) {
+                // store the variable's value.
+                row->push_back((*i)->ptr_duplicate());
+                // the copy should have read_p true to prevent the serialize() call
+                // below in the nested for loops from triggering a second call to
+                // read().
+                row->back()->set_read_p(true);
+            }
+        }
+        d_values.push_back(row);
+    }
+
+    set_length(d_values.size());
+#endif
+}
+
+/**
+ * @brief Read a Sequence's value into memory
+ *
+ * This is a helper method for serialize() that enables the code
+ * to recursively read values for child sequences. This method assumes
+ * that the D4Sequence::read() method does not call itself recursively
+ * for child sequences, as is the case with DAP2 sequences. If you
+ * have a data store that requires the outer-most sequence to read
+ * values for its child sequences, you will need to specialize this
+ * method. See also the methods associated with the sequence values
+ * because unlike DAP2 sequences, in DAP4 the sequences hold all their
+ * values in memory before writing them out.
+ *
+ * @note We may revisit the idea that values must be held in memory
+ * before being written. That is a consequence of using a length prefix
+ * instead of a series of sentinel values.
+ *
+ * @param filter True if the/a file expression bound to this sequence
+ * should be evaluated.
+ * @see set_value()
+ */
+void D4Sequence::read_sequence_values(bool filter)
+{
+    DBG(cerr << __PRETTY_FUNCTION__ << " BEGIN" << endl);
+
+    if (read_p()) return;
+
+    // Read the data values, then serialize. NB: read_next_instance sets d_length
+    // evaluates the filter expression
+    while (read_next_instance(filter)) {
+        DBG(cerr << "read_sequence_values() - Adding row" << endl);
+        D4SeqRow* row = new D4SeqRow;
+        for (Vars_iter i = d_vars.begin(), e = d_vars.end(); i != e; i++) {
+            if ((*i)->send_p()) {
+                DBG(cerr << ":serialize() - reading data for " << (*i)->type_name() << " "  << (*i)->name() << endl);
+                if ((*i)->type() == dods_sequence_c) {
+                    DBG(cerr << "Reading child sequence values for " << (*i)->name() << endl);
+                    D4Sequence *d4s = static_cast<D4Sequence*>(*i);
+                    d4s->read_sequence_values(filter);
+                    d4s->d_copy_clauses = false;
+                    row->push_back(d4s->ptr_duplicate());
+                    d4s->d_copy_clauses = true;  // Must be sure to not break the object in general
+                    row->back()->set_read_p(true);
+                }
+                else {
+                    // store the variable's value.
+                    row->push_back((*i)->ptr_duplicate());
+                    // the copy should have read_p true to prevent the serialize() call
+                    // below in the nested for loops from triggering a second call to
+                    // read().
+                    row->back()->set_read_p(true);
+                }
+            }
+        }
+
+        // When specializing this, use set_value()
+        d_values.push_back(row);
+        DBG(cerr << " read_sequence_values() - Row completed" << endl);
+    }
+
+    set_length(d_values.size());
+
+    DBGN(cerr << __PRETTY_FUNCTION__ << " END added " << d_values.size() << endl);
+}
+
+/**
+ * @brief Serialize the values of a D4Sequence
+ * This method assumes that the underlying data store cannot/does not return a count
+ * of items separately from the items themselves. For a data store that does, this
+ * method should probably be specialized to take advantage of that. Because the DAP4
+ * spec requires that a sequence be prefixed by a count, this method reads the entire
+ * sequence into memory before sending it (and counts the number of elements in the
+ * the process). For a data store where the count is available a priori, this could
+ * be rewritten so that the count is sent and then each instance/element of the sequence
+ * sent in succession.
+ *
+ * If this method is specialized, once the data are loaded into the D4SeqValues instance,
+ * make sure to set d_length and make sure to set_read_p for each BaseType in D4SeqValues.
+ *
+ * @param m Stream data sink
+ * @param dmr DMR object for the evaluator
+ * @param eval CE Evaluator object
+ * @param filter True if the CE should be evaluated, false otherwise.
+ */
+void D4Sequence::serialize(D4StreamMarshaller &m, DMR &dmr, bool filter)
+{
+    DBGN(cerr << __PRETTY_FUNCTION__ << " BEGIN" << endl);
+
+    // Read the data values, then serialize. NB: read_next_instance sets d_length
+    // evaluates the filter expression
+    read_sequence_values(filter);
+
+    // write D4Sequecne::length(); don't include the length in the checksum
+    m.put_count(d_length);
+
+    // By this point the d_values object holds all and only the values to be sent;
+    // use the serialize methods to send them (but no need to test send_p).
+    for (D4SeqValues::iterator i = d_values.begin(), e = d_values.end(); i != e; ++i) {
+        for (D4SeqRow::iterator j = (*i)->begin(), f = (*i)->end(); j != f; ++j) {
+           (*j)->serialize(m, dmr, /*eval,*/false);
+        }
+    }
+
+    DBGN(cerr << __PRETTY_FUNCTION__ << " END" << endl);
+}
+
+void D4Sequence::deserialize(D4StreamUnMarshaller &um, DMR &dmr)
+{
+    int64_t um_count = um.get_count();
+
+    set_length(um_count);
+
+    for (int64_t i = 0; i < d_length; ++i) {
+        D4SeqRow *row = new D4SeqRow;
+        for (Vars_iter i = d_vars.begin(), e = d_vars.end(); i != e; ++i) {
+            (*i)->deserialize(um, dmr);
+            row->push_back((*i)->ptr_duplicate());
+        }
+        d_values.push_back(row);
+    }
+}
+
+/**
+ * @brief Access the filter clauses for this D4Sequence
+ *
+ * When a filter is supplied with a DAP4 constraint, the expression is
+ * parsed and one or more D4FilterClause objects are built and stored in
+ * a D4FilterClauseList bound to the D4Sequence to be filtered.
+ *
+ * @return A reference to this D4Sequence's filter clause list
+ * @see D4FilterClauseList
+ */
+D4FilterClauseList & D4Sequence::clauses()
+{
+    if (!d_clauses) d_clauses = new D4FilterClauseList();
+    return *d_clauses;
+}
+
+
+#if INDEX_SUBSETTING
+/** Set the start, stop and stride for a row-number type constraint.
+ This should be used only when the sequence is constrained using the
+ bracket notation (which supplies start, stride and stop information).
+ If omitted, the stride defaults to 1.
+
+ @param start The starting row number. The first row is row zero.
+ @param stop The ending row number. The 20th row is row 19.
+ @param stride The stride. A stride of two skips every other row. */
+virtual void set_row_number_constraint(int start, int stop, int stride)
+{
+    if (stop < start)
+    throw Error(malformed_expr, "Starting row number must precede the ending row number.");
+
+    d_starting_row_number = start;
+    d_row_stride = stride;
+    d_ending_row_number = stop;
+}
+#endif
+
+/** @brief Get a whole row from the sequence.
+ @param row Get row number <i>row</i> from the sequence.
+ @return A BaseTypeRow object (vector<BaseType *>). Null if there's no such
+ row number as \e row. */
+D4SeqRow *
+D4Sequence::row_value(size_t row)
+{
+    if (row >= d_values.size()) return 0;
+    return d_values[row];
+}
+
+static bool base_type_name_eq(BaseType *btp, const string name)
+{
+    return btp->name() == name;
+}
+
+/** @brief Get the BaseType pointer to the named variable of a given row.
+ @param row Read from <i>row</i> in the sequence.
+ @param name Return <i>name</i> from <i>row</i>.
+ @return A BaseType which holds the variable and its value.
+ @see number_of_rows */
+BaseType *
+D4Sequence::var_value(size_t row_num, const string &name)
+{
+    D4SeqRow *row = row_value(row_num);
+    if (!row) return 0;
+
+    D4SeqRow::iterator elem = find_if(row->begin(), row->end(), bind2nd(ptr_fun(base_type_name_eq), name));
+    return (elem != row->end()) ? *elem : 0;
+}
+
+/** @brief Get the BaseType pointer to the $i^{th}$ variable of <i>row</i>.
+ @param row Read from <i>row</i> in the sequence.
+ @param i Return the $i^{th}$ variable from <i>row</i>.
+ @return A BaseType which holds the variable and its value.
+ @see number_of_rows */
+BaseType *
+D4Sequence::var_value(size_t row_num, size_t i)
+{
+    D4SeqRow *row = row_value(row_num);
+    if (!row) return 0;
+
+    if (i >= row->size()) return 0;
+
+    return (*row)[i];
+}
+
+void D4Sequence::print_one_row(ostream &out, int row, string space, bool print_row_num)
+{
+    if (print_row_num) out << "\n" << space << row << ": ";
+
+    out << "{ ";
+
+    int elements = element_count();
+    int j = 0;
+    BaseType *bt_ptr = 0;
+
+    // This version of print_one_row() works for both data read with
+    // deserialize(), where each variable is assumed to have valid data, and
+    // intern_data(), where some/many variables do not. Because of that, it's
+    // not correct to assume that all of the elements will be printed, which
+    // is what the old code did.
+
+    // Print the first value
+    while (j < elements && !bt_ptr) {
+        bt_ptr = var_value(row, j++);
+        if (bt_ptr) {  // data
+            if (bt_ptr->type() == dods_sequence_c) static_cast<D4Sequence*>(bt_ptr)->print_val_by_rows(out,
+                    space + "    ", false, print_row_num);
+            else
+                bt_ptr->print_val(out, space, false);
+        }
+    }
+
+    // Print the remaining values
+    while (j < elements) {
+        bt_ptr = var_value(row, j++);
+        if (bt_ptr) {  // data
+            out << ", ";
+            if (bt_ptr->type() == dods_sequence_c) static_cast<D4Sequence*>(bt_ptr)->print_val_by_rows(out,
+                    space + "    ", false, print_row_num);
+            else
+                bt_ptr->print_val(out, space, false);
+        }
+    }
+
+    out << " }";
+}
+
+void D4Sequence::print_val_by_rows(ostream &out, string space, bool print_decl_p, bool print_row_numbers)
+{
+    if (print_decl_p) {
+        print_decl(out, space, false);
+        out << " = ";
+    }
+
+    out << "{ ";
+
+    if (length() != 0) {
+        int rows = length() - 1;	// -1 because the last row is treated specially
+        for (int i = 0; i < rows; ++i) {
+            print_one_row(out, i, space, print_row_numbers);
+            out << ", ";
+        }
+        print_one_row(out, rows, space, print_row_numbers);
+    }
+
+    out << " }";
+
+    if (print_decl_p) out << ";\n";
+}
+
+void D4Sequence::print_val(ostream &out, string space, bool print_decl_p)
+{
+    DBG(cerr << name() << " isa " << type_name() << endl);
+
+    print_val_by_rows(out, space, print_decl_p, false);
+}
+
+/** @brief dumps information about this object
+ *
+ * Displays the pointer value of this instance and information about this
+ * instance.
+ *
+ * @param strm C++ i/o stream to dump the information to
+ * @return void
+ */
+void D4Sequence::dump(ostream &strm) const
+{
+    strm << DapIndent::LMarg << "Sequence::dump - (" << (void *) this << ")" << endl;
+    DapIndent::Indent();
+    Constructor::dump(strm);
+    strm << DapIndent::LMarg << "# rows deserialized: " << d_length << endl;
+    strm << DapIndent::LMarg << "bracket notation information:" << endl;
+
+    DapIndent::Indent();
+#if INDEX_SUBSETTING
+    strm << DapIndent::LMarg << "starting row #: " << d_starting_row_number << endl;
+    strm << DapIndent::LMarg << "row stride: " << d_row_stride << endl;
+    strm << DapIndent::LMarg << "ending row #: " << d_ending_row_number << endl;
+#endif
+    DapIndent::UnIndent();
+
+    DapIndent::UnIndent();
+}
+
+} // namespace libdap
+
diff --git a/D4Sequence.h b/D4Sequence.h
new file mode 100644
index 0000000..4b606f5
--- /dev/null
+++ b/D4Sequence.h
@@ -0,0 +1,310 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2013 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#ifndef _d4sequence_h
+#define _d4sequence_h 1
+
+#include "Constructor.h"
+
+// DAP2 Sequence supported subsetting using the array notation. This might
+// be introduced into DAP4 later on.
+#define INDEX_SUBSETTING 0
+
+class Crc32;
+
+namespace libdap
+{
+class BaseType;
+class D4FilterClauseList;
+
+/** The type BaseTypeRow is used to store single rows of values in an
+    instance of D4Sequence. Values are stored in instances of BaseType. */
+typedef vector<BaseType *> D4SeqRow;
+
+/** This type holds all of the values of a D4Sequence. */
+typedef vector<D4SeqRow *> D4SeqValues;
+
+/** The type BaseTypeRow is used to store single rows of values in an
+ instance of Sequence. Values are stored in instances of BaseType. */
+typedef vector<BaseType *> BaseTypeRow;
+
+/** This type holds all of the values of a Sequence. */
+typedef vector<BaseTypeRow *> SequenceValues;
+
+
+/** This is the interface for the class D4Sequence. A sequence contains
+    a single set of variables, all at the same lexical level just like
+    a Structure.  Like a Structure, a D4Sequence may contain other
+    compound types, including other D4Sequences.  Unlike a Structure, a
+    D4Sequence defines a pattern that is repeated N times for a sequence
+    of N elements. It is useful to think of a D4Sequence as representing
+    a table of values (like a relational database), with each row of
+    the table corresponding to a D4Sequence ``instance.''  (This usage
+    can be confusing, since ``instance'' also refers to a particular
+    item of class D4Sequence.)  For example:
+
+    <pre>
+    D4Sequence {
+      String name;
+      Int32 age;
+    } person;
+    </pre>
+
+    This represents a Sequence of ``person'' records, each instance of
+    which contains a name and an age:
+
+    <pre>
+    Fred       34
+    Ralph      23
+    Andrea     29
+    ...
+    </pre>
+
+    A D4Sequence can be arbitrarily long, which is to say that its
+    length is not part of its declaration.  A D4Sequence can contain
+    other D4Sequences:
+
+    <pre>
+    D4Sequence {
+      String name;
+      Int32 age;
+      D4Sequence {
+        String friend;
+      } friend_list;
+    } person;
+    </pre>
+
+    <pre>
+    Fred       34     Norman
+                      Andrea
+                      Ralph
+                      Lisa
+    Ralph      23     Norman
+                      Andrea
+                      Lisa
+                      Marth
+                      Throckmorton
+                      Helga
+                      Millicent
+    Andrea     29     Ralph
+                      Natasha
+                      Norman
+    ...        ..     ...
+    </pre>
+
+    Internally, the D4Sequence is represented by a vector of vectors. The
+    members of the outer vector are the members of the D4Sequence. This
+    includes the nested D4Sequences, as in the above example.
+
+    Because the length of a D4Sequence is indeterminate, there are
+    changes to the behavior of the functions to read this class of
+    data.  The <tt>read()</tt> function for D4Sequence must be written so that
+    successive calls return values for successive rows of the D4Sequence.
+
+    Similar to a C structure, you refer to members of D4Sequence
+    elements with a ``.'' notation.  For example, if the D4Sequence has
+    a member D4Sequence called ``Tom'' and Tom has a member Float32
+    called ``shoe_size'', you can refer to Tom's shoe size as
+    ``Tom.shoe_size''.
+
+    @brief Holds a sequence. */
+
+class D4Sequence: public Constructor
+{
+private:
+    // This may be zero (nullptr) but the accessor (clauses()) allocates an
+    // instance if that is the case.
+    D4FilterClauseList *d_clauses;
+
+    // Use this to control if ptr_duplicate(), ..., copy the filter clauses.
+    // Because the values of a child sequence are held in copies of the Seq
+    // object they clauses will bound to the 'master' instance will be copied
+    // but the copies will never be used. This field can be used to control
+    // that. ...purely an optimization.
+    bool d_copy_clauses;
+
+protected:
+    // This holds the values of the sequence. Values are stored in
+    // instances of BaseTypeRow objects which hold instances of BaseType.
+    //
+    // Allow these values to be accessed by subclasses
+    D4SeqValues d_values;
+
+    int64_t d_length;	// How many elements are in the sequence; -1 if not currently known
+
+#if INDEX_SUBSETTING
+    int d_starting_row_number;
+    int d_row_stride;
+    int d_ending_row_number;
+#endif
+
+    void m_duplicate(const D4Sequence &s);
+
+    // Specialize this if you have a data source that requires read()
+    // recursively call itself for child sequences.
+    void read_sequence_values(bool filter);
+
+    friend class D4SequenceTest;
+
+public:
+
+    D4Sequence(const string &n);
+    D4Sequence(const string &n, const string &d);
+
+    D4Sequence(const D4Sequence &rhs);
+
+    virtual ~D4Sequence();
+
+    D4Sequence &operator=(const D4Sequence &rhs);
+
+    virtual BaseType *ptr_duplicate();
+
+    virtual void clear_local_data();
+
+    /**
+     * @brief The number of elements in a Sequence object.
+     * @note This is not the number of items in a row, but the number
+     * of rows in the complete sequence object.
+     *
+     * @return 0 if the number of elements is unknown, else
+     * return the number of elements.
+     */
+    virtual int length() const { return (int)d_length; }
+
+    /**
+     * Set the length of the sequence.
+     * @param count
+     */
+    virtual void set_length(int count) { d_length = (int64_t)count; }
+
+    virtual bool read_next_instance(bool filter);
+
+    virtual void intern_data(ConstraintEvaluator &, DDS &) {
+    	throw InternalErr(__FILE__, __LINE__, "Not implemented for DAP4");
+    }
+    virtual bool serialize(ConstraintEvaluator &, DDS &, Marshaller &, bool ) {
+    	throw InternalErr(__FILE__, __LINE__, "Not implemented for DAP4");
+    }
+    virtual bool deserialize(UnMarshaller &, DDS *, bool ) {
+    	throw InternalErr(__FILE__, __LINE__, "Not implemented for DAP4");
+    }
+
+    // DAP4
+    virtual void intern_data(/*Crc32 &checksum, DMR &dmr, ConstraintEvaluator &eval*/);
+    virtual void serialize(D4StreamMarshaller &m, DMR &dmr, /*ConstraintEvaluator &eval,*/ bool filter = false);
+    virtual void deserialize(D4StreamUnMarshaller &um, DMR &dmr);
+
+    D4FilterClauseList &clauses();
+
+#if INDEX_SUBSETTING
+    /** Return the starting row number if the sequence was constrained using
+        row numbers (instead of, or in addition to, a relational constraint).
+        If a relational constraint was also given, the row number corresponds
+        to the row number of the sequence <i>after</i> applying the relational
+        constraint.
+
+        If the bracket notation was not used to constrain this sequence, this
+        method returns -1.
+
+        @brief Get the starting row number.
+        @return The starting row number. */
+    virtual int get_starting_row_number() const { return d_starting_row_number; }
+
+    /** Return the row stride number if the sequence was constrained using
+        row numbers (instead of, or in addition to, a relational constraint).
+        If a relational constraint was also given, the row stride is applied
+        to the sequence <i>after</i> applying the relational constraint.
+
+        If the bracket notation was not used to constrain this sequence, this
+        method returns -1.
+
+        @brief Get the row stride.
+        @return The row stride. */
+    virtual int get_row_stride() const { return d_row_stride; }
+
+    /** Return the ending row number if the sequence was constrained using
+        row numbers (instead of, or in addition to, a relational constraint).
+        If a relational constraint was also given, the row number corresponds
+        to the row number of the sequence <i>after</i> applying the
+        relational constraint.
+
+        If the bracket notation was not used to constrain this sequence, this
+        method returns -1.
+
+        @brief Get the ending row number.
+        @return The ending row number. */
+    virtual int get_ending_row_number() const { return d_ending_row_number; }
+
+    virtual void set_row_number_constraint(int start, int stop, int stride = 1);
+#endif
+
+    /**
+     * @brief Set the internal value.
+     * The 'values' of a D4Sequence is a vector of vectors of BaseType* objects.
+     * Using this method does not perform a deep copy; the BaseType*s are
+     * copied so the caller should not free them. Note that this does set
+     * d_length but the read_p flag for the BaseTypes should all be set to
+     * keep the serializer from trying to read each of them.
+     * @param values
+     */
+    virtual void set_value(D4SeqValues &values) { d_values = values; d_length = d_values.size(); }
+
+    /**
+     * @brief Get the values for this D4Sequence
+     * This method returns a reference to the values held by the instance.
+     * You should make sure that the instance really holds values before
+     * calling it! Do not free the BaseType*s contained in the vector of
+     * vectors.
+     * @return A reference tp the vector of vector of BaseType*
+     */
+    virtual D4SeqValues value() const { return d_values; }
+
+    /**
+     * @brief Get the sequence values by reference
+     * This method returns a reference to the D4Sequence's values,
+     * eliminating the copy of all the pointers. For large sequences,
+     * that could be a substantial number of values (even though
+     * they are 'just' pointers).
+     * @return A reference to the vector of vector of BaseType*
+     */
+    virtual D4SeqValues &value_ref() { return d_values; }
+
+    virtual D4SeqRow *row_value(size_t row);
+    virtual BaseType *var_value(size_t row, const string &name);
+    virtual BaseType *var_value(size_t row, size_t i);
+
+    virtual void print_one_row(ostream &out, int row, string space,
+                               bool print_row_num = false);
+    virtual void print_val_by_rows(ostream &out, string space = "",
+                                   bool print_decl_p = true,
+                                   bool print_row_numbers = true);
+    virtual void print_val(ostream &out, string space = "",
+                           bool print_decl_p = true);
+
+    virtual void dump(ostream &strm) const ;
+};
+
+} // namespace libdap
+
+#endif //_sequence_h
diff --git a/D4StreamMarshaller.cc b/D4StreamMarshaller.cc
new file mode 100644
index 0000000..d881b28
--- /dev/null
+++ b/D4StreamMarshaller.cc
@@ -0,0 +1,826 @@
+// D4StreamMarshaller.cc
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2012 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#include "config.h"
+
+#include <byteswap.h>
+#include <cassert>
+#include <cstring>
+
+#include <iostream>
+#include <sstream>
+#include <iomanip>
+#include <limits>
+
+//#define DODS_DEBUG 1
+
+#ifdef HAVE_PTHREAD_H
+#include <pthread.h>
+#endif
+
+#include "D4StreamMarshaller.h"
+#ifdef USE_POSIX_THREADS
+#include "MarshallerThread.h"
+#endif
+
+#if USE_XDR_FOR_IEEE754_ENCODING
+#include "XDRUtils.h"
+#include "util.h"
+#endif
+
+#include "debug.h"
+
+using namespace std;
+
+namespace libdap {
+
+#if 0
+// We decided to use int64_t to represent sizes of both arrays and strings,
+// So this code is not used. jhrg 10/4/13
+
+// From the Google protobuf library
+inline uint8_t* WriteVarint64ToArrayInline(uint64_t value, uint8_t* target) {
+  // Splitting into 32-bit pieces gives better performance on 32-bit
+  // processors.
+  uint32_t part0 = static_cast<uint32_t>(value      );
+  uint32_t part1 = static_cast<uint32_t>(value >> 28);
+  uint32_t part2 = static_cast<uint32_t>(value >> 56);
+
+  int size;
+
+  // Here we can't really optimize for small numbers, since the value is
+  // split into three parts.  Checking for numbers < 128, for instance,
+  // would require three comparisons, since you'd have to make sure part1
+  // and part2 are zero.  However, if the caller is using 64-bit integers,
+  // it is likely that they expect the numbers to often be very large, so
+  // we probably don't want to optimize for small numbers anyway.  Thus,
+  // we end up with a hard coded binary search tree...
+  if (part2 == 0) {
+    if (part1 == 0) {
+      if (part0 < (1 << 14)) {
+        if (part0 < (1 << 7)) {
+          size = 1; goto size1;
+        } else {
+          size = 2; goto size2;
+        }
+      } else {
+        if (part0 < (1 << 21)) {
+          size = 3; goto size3;
+        } else {
+          size = 4; goto size4;
+        }
+      }
+    } else {
+      if (part1 < (1 << 14)) {
+        if (part1 < (1 << 7)) {
+          size = 5; goto size5;
+        } else {
+          size = 6; goto size6;
+        }
+      } else {
+        if (part1 < (1 << 21)) {
+          size = 7; goto size7;
+        } else {
+          size = 8; goto size8;
+        }
+      }
+    }
+  } else {
+    if (part2 < (1 << 7)) {
+      size = 9; goto size9;
+    } else {
+      size = 10; goto size10;
+    }
+  }
+
+  // GOOGLE_LOG(FATAL) << "Can't get here.";
+
+  size10: target[9] = static_cast<uint8_t>((part2 >>  7) | 0x80);
+  size9 : target[8] = static_cast<uint8_t>((part2      ) | 0x80);
+  size8 : target[7] = static_cast<uint8_t>((part1 >> 21) | 0x80);
+  size7 : target[6] = static_cast<uint8_t>((part1 >> 14) | 0x80);
+  size6 : target[5] = static_cast<uint8_t>((part1 >>  7) | 0x80);
+  size5 : target[4] = static_cast<uint8_t>((part1      ) | 0x80);
+  size4 : target[3] = static_cast<uint8_t>((part0 >> 21) | 0x80);
+  size3 : target[2] = static_cast<uint8_t>((part0 >> 14) | 0x80);
+  size2 : target[1] = static_cast<uint8_t>((part0 >>  7) | 0x80);
+  size1 : target[0] = static_cast<uint8_t>((part0      ) | 0x80);
+
+  target[size-1] &= 0x7F;
+  return target + size;
+}
+#endif
+
+#if USE_XDR_FOR_IEEE754_ENCODING
+void D4StreamMarshaller::m_serialize_reals(char *val, unsigned int num, int width, Type type)
+{
+    dods_uint64 size = num * width;
+
+    char *buf = new char[size];
+    XDR xdr;
+    xdrmem_create(&xdr, &buf[0], size, XDR_ENCODE);
+    try {
+        if(!xdr_array(&xdr, &val, (unsigned int *)&num, size, width, XDRUtils::xdr_coder(type)))
+            throw InternalErr(__FILE__, __LINE__, "Error serializing a Float64 array");
+
+        if (xdr_getpos(&xdr) != size)
+            throw InternalErr(__FILE__, __LINE__, "Error serializing a Float64 array");
+
+        // If this is a little-endian host, twiddle the bytes
+        static bool twiddle_bytes = !is_host_big_endian();
+        if (twiddle_bytes) {
+            if (width == 4) {
+                dods_float32 *lbuf = reinterpret_cast<dods_float32*>(&buf[0]);
+                while (num--) {
+                    dods_int32 *i = reinterpret_cast<dods_int32*>(lbuf++);
+                    *i = bswap_32(*i);
+                }
+            }
+            else { // width == 8
+                dods_float64 *lbuf = reinterpret_cast<dods_float64*>(&buf[0]);
+                while (num--) {
+                    dods_int64 *i = reinterpret_cast<dods_int64*>(lbuf++);
+                    *i = bswap_64(*i);
+                }
+            }
+        }
+#ifdef USE_POSIX_THREADS
+        Locker lock(tm->get_mutex(), tm->get_cond(), tm->get_child_thread_count());
+
+        tm->increment_child_thread_count();
+        tm->start_thread(MarshallerThread::write_thread, d_out, buf, size);
+
+        // The child thread will delete buf when it's done
+        xdr_destroy(&xdr);
+#else
+        d_out.write(&buf[0], size);
+        xdr_destroy(&xdr);
+        delete [] buf;
+#endif
+    }
+    catch (...) {
+        xdr_destroy(&xdr);
+        delete [] buf;
+
+        throw;
+    }
+}
+#endif
+
+/** Build an instance of D4StreamMarshaller. Bind the C++ stream out to this
+ * instance. If the write_data parameter is true, write the data in addition
+ * to computing and sending the checksum.
+ *
+ * @param out Write to this stream object.
+ * @param write_data If true, write data values. True by default
+ */
+D4StreamMarshaller::D4StreamMarshaller(ostream &out, bool write_data) :
+        d_out(out), d_write_data(write_data), tm(0)
+{
+	assert(sizeof(std::streamsize) >= sizeof(int64_t));
+
+#if USE_XDR_FOR_IEEE754_ENCODING
+    // XDR is used if the call std::numeric_limits<double>::is_iec559()
+    // returns false indicating that the compiler is not using IEEE 754.
+    // If it is, we just write out the bytes.
+    xdrmem_create(&d_scalar_sink, d_ieee754_buf, sizeof(dods_float64), XDR_ENCODE);
+#endif
+
+#ifdef USE_POSIX_THREADS
+    tm = new MarshallerThread;
+#endif
+
+    // This will cause exceptions to be thrown on i/o errors. The exception
+    // will be ostream::failure
+    out.exceptions(ostream::failbit | ostream::badbit);
+}
+
+D4StreamMarshaller::~D4StreamMarshaller()
+{
+#if USE_XDR_FOR_IEEE754_ENCODING
+    xdr_destroy(&d_scalar_sink);
+#endif
+
+    delete tm;
+}
+
+/** Initialize the checksum buffer. This resets the checksum calculation.
+ */
+void D4StreamMarshaller::reset_checksum()
+{
+    d_checksum.Reset();
+}
+
+/**
+ * Get the current checksum. It is not possible to continue computing the
+ * checksum once this has been called.
+ *
+ * @note This method is not intended to be called often or for inserting the
+ * checksum into an I/O stream; see put_checksum(). This is intended for
+ * instrumentation code.
+ *
+ * @return The checksum in a string object that always has eight characters.
+ */
+string D4StreamMarshaller::get_checksum()
+{
+    ostringstream oss;
+    oss.setf(ios::hex, ios::basefield);
+    oss << setfill('0') << setw(8) << d_checksum.GetCrc32();
+
+    return oss.str();
+}
+
+/**
+ * @brief Write the checksum
+ * Write the checksum for the data sent since the last call to reset_checksum()
+ * to the I/O stream associated with this marshaller. Use this to send the
+ * checksum, not get_checksum().
+ */
+void D4StreamMarshaller::put_checksum()
+{
+    Crc32::checksum chk = d_checksum.GetCrc32();
+#ifdef USE_POSIX_THREADS
+    Locker lock(tm->get_mutex(), tm->get_cond(), tm->get_child_thread_count());
+#endif
+    d_out.write(reinterpret_cast<char*>(&chk), sizeof(Crc32::checksum));
+}
+
+/**
+ * Update the current CRC 32 checksum value. Calling this with len equal to
+ * zero has no effect on the checksum value.
+ */
+void D4StreamMarshaller::checksum_update(const void *data, unsigned long len)
+{
+    d_checksum.AddData(reinterpret_cast<const uint8_t*>(data), len);
+}
+
+void D4StreamMarshaller::put_byte(dods_byte val)
+{
+    checksum_update(&val, sizeof(dods_byte));
+
+    if (d_write_data) {
+        DBG( std::cerr << "put_byte: " << val << std::endl );
+#ifdef USE_POSIX_THREADS
+        // make sure that a child thread is not writing to d_out.
+        Locker lock(tm->get_mutex(), tm->get_cond(), tm->get_child_thread_count());
+#endif
+        d_out.write(reinterpret_cast<char*>(&val), sizeof(dods_byte));
+    }
+}
+
+void D4StreamMarshaller::put_int8(dods_int8 val)
+{
+    checksum_update(&val, sizeof(dods_int8));
+
+    if (d_write_data) {
+        DBG( std::cerr << "put_int8: " << val << std::endl );
+#ifdef USE_POSIX_THREADS
+        Locker lock(tm->get_mutex(), tm->get_cond(), tm->get_child_thread_count());
+#endif
+        d_out.write(reinterpret_cast<char*>(&val), sizeof(dods_int8));
+    }
+}
+
+void D4StreamMarshaller::put_int16(dods_int16 val)
+{
+    checksum_update(&val, sizeof(dods_int16));
+
+    if (d_write_data) {
+#ifdef USE_POSIX_THREADS
+        Locker lock(tm->get_mutex(), tm->get_cond(), tm->get_child_thread_count());
+#endif
+        d_out.write(reinterpret_cast<char*>(&val), sizeof(dods_int16));
+    }
+}
+
+void D4StreamMarshaller::put_int32(dods_int32 val)
+{
+    checksum_update(&val, sizeof(dods_int32));
+
+    if (d_write_data) {
+#ifdef USE_POSIX_THREADS
+        Locker lock(tm->get_mutex(), tm->get_cond(), tm->get_child_thread_count());
+#endif
+        d_out.write(reinterpret_cast<char*>(&val), sizeof(dods_int32));
+    }
+}
+
+void D4StreamMarshaller::put_int64(dods_int64 val)
+{
+    checksum_update(&val, sizeof(dods_int64));
+
+    if (d_write_data) {
+#ifdef USE_POSIX_THREADS
+        Locker lock(tm->get_mutex(), tm->get_cond(), tm->get_child_thread_count());
+#endif
+        d_out.write(reinterpret_cast<const char*>(&val), sizeof(dods_int64));
+    }
+}
+
+void D4StreamMarshaller::put_float32(dods_float32 val)
+{
+#if !USE_XDR_FOR_IEEE754_ENCODING
+	assert(std::numeric_limits<float>::is_iec559);
+
+    checksum_update(&val, sizeof(dods_float32));
+
+    if (d_write_data) {
+#ifdef USE_POSIX_THREADS
+        Locker lock(tm->get_mutex(), tm->get_cond(), tm->get_child_thread_count());
+#endif
+    	d_out.write(reinterpret_cast<const char*>(&val), sizeof(dods_float32));
+    }
+
+#else
+    // This code uses XDR to convert from a local representation to IEEE754;
+    // The extra 'twiddle' operation makes the byte-order correct for this
+    // host should it not be big-endian. Also note the assert() at the
+    // start of the method.
+
+    if (d_write_data) {
+        if (std::numeric_limits<float>::is_iec559 ) {
+#ifdef USE_POSIX_THREADS
+            Locker lock(tm->get_mutex(), tm->get_cond(), tm->get_child_thread_count());
+#endif
+            d_out.write(reinterpret_cast<char*>(&val), sizeof(dods_float32));
+        }
+        else {
+            if (!xdr_setpos(&d_scalar_sink, 0))
+                throw InternalErr(__FILE__, __LINE__, "Error serializing a Float32 variable");
+
+            if (!xdr_float(&d_scalar_sink, &val))
+                throw InternalErr(__FILE__, __LINE__, "Error serializing a Float32 variable");
+
+            if (xdr_getpos(&d_scalar_sink) != sizeof(dods_float32))
+                throw InternalErr(__FILE__, __LINE__, "Error serializing a Float32 variable");
+
+            // If this is a little-endian host, twiddle the bytes
+            static bool twiddle_bytes = !is_host_big_endian();
+            if (twiddle_bytes) {
+                dods_int32 *i = reinterpret_cast<dods_int32*>(&d_ieee754_buf);
+                *i = bswap_32(*i);
+            }
+#ifdef USE_POSIX_THREADS
+            Locker lock(tm->get_mutex(), tm->get_cond(), tm->get_child_thread_count());
+#endif
+            d_out.write(d_ieee754_buf, sizeof(dods_float32));
+        }
+    }
+#endif
+}
+
+void D4StreamMarshaller::put_float64(dods_float64 val)
+{
+#if !USE_XDR_FOR_IEEE754_ENCODING
+	assert(std::numeric_limits<double>::is_iec559);
+
+    checksum_update(&val, sizeof(dods_float64));
+
+    if (d_write_data) {
+#ifdef USE_POSIX_THREADS
+        Locker lock(tm->get_mutex(), tm->get_cond(), tm->get_child_thread_count());
+#endif
+    	d_out.write(reinterpret_cast<const char*>(&val), sizeof(dods_float64));
+    }
+
+#else
+    // See the comment above in put_float32()
+    if (d_write_data) {
+        if (std::numeric_limits<double>::is_iec559) {
+#ifdef USE_POSIX_THREADS
+            Locker lock(tm->get_mutex(), tm->get_cond(), tm->get_child_thread_count());
+#endif
+            d_out.write(reinterpret_cast<char*>(&val), sizeof(dods_float64));}
+    }
+        else {
+            if (!xdr_setpos(&d_scalar_sink, 0))
+                throw InternalErr(__FILE__, __LINE__, "Error serializing a Float64 variable");
+
+            if (!xdr_double(&d_scalar_sink, &val))
+                throw InternalErr(__FILE__, __LINE__, "Error serializing a Float64 variable");
+
+            if (xdr_getpos(&d_scalar_sink) != sizeof(dods_float64))
+                throw InternalErr(__FILE__, __LINE__, "Error serializing a Float64 variable");
+
+            // If this is a little-endian host, twiddle the bytes
+            static bool twiddle_bytes = !is_host_big_endian();
+            if (twiddle_bytes) {
+                dods_int64 *i = reinterpret_cast<dods_int64*>(&d_ieee754_buf);
+                *i = bswap_64(*i);
+            }
+
+#ifdef USE_POSIX_THREADS
+            Locker lock(tm->get_mutex(), tm->get_cond(), tm->get_child_thread_count());
+#endif
+            d_out.write(d_ieee754_buf, sizeof(dods_float64));
+        }
+    }
+#endif
+}
+
+void D4StreamMarshaller::put_uint16(dods_uint16 val)
+{
+    checksum_update(&val, sizeof(dods_uint16));
+
+    if (d_write_data) {
+#ifdef USE_POSIX_THREADS
+        Locker lock(tm->get_mutex(), tm->get_cond(), tm->get_child_thread_count());
+#endif
+        d_out.write(reinterpret_cast<char*>(&val), sizeof(dods_uint16));
+    }
+}
+
+void D4StreamMarshaller::put_uint32(dods_uint32 val)
+{
+    checksum_update(&val, sizeof(dods_uint32));
+
+    if (d_write_data) {
+#ifdef USE_POSIX_THREADS
+        Locker lock(tm->get_mutex(), tm->get_cond(), tm->get_child_thread_count());
+#endif
+        d_out.write(reinterpret_cast<char*>(&val), sizeof(dods_uint32));
+    }
+}
+
+void D4StreamMarshaller::put_uint64(dods_uint64 val)
+{
+    checksum_update(&val, sizeof(dods_uint64));
+
+    if (d_write_data) {
+#ifdef USE_POSIX_THREADS
+        Locker lock(tm->get_mutex(), tm->get_cond(), tm->get_child_thread_count());
+#endif
+        d_out.write(reinterpret_cast<char*>(&val), sizeof(dods_uint64));
+    }
+}
+
+/**
+ * Used only for Sequences, where the count must be added to the stream
+ * and then the fields sent using separate calls to methods here. The
+ * methods put_opaque_dap4(), ..., that need counts sent as prefixes to
+ * their data handle it themselves.
+ *
+ * @param count How many elements follow.
+ */
+void D4StreamMarshaller::put_count(int64_t count)
+{
+#ifdef USE_POSIX_THREADS
+        Locker lock(tm->get_mutex(), tm->get_cond(), tm->get_child_thread_count());
+#endif
+	d_out.write(reinterpret_cast<const char*>(&count), sizeof(int64_t));
+}
+
+void D4StreamMarshaller::put_str(const string &val)
+{
+    checksum_update(val.c_str(), val.length());
+
+    if (d_write_data) {
+    	int64_t len = val.length();
+#ifdef USE_POSIX_THREADS
+        Locker lock(tm->get_mutex(), tm->get_cond(), tm->get_child_thread_count());
+#endif
+    	d_out.write(reinterpret_cast<const char*>(&len), sizeof(int64_t));
+        d_out.write(val.data(), val.length());
+    }
+}
+
+void D4StreamMarshaller::put_url(const string &val)
+{
+    put_str(val);
+}
+
+void D4StreamMarshaller::put_opaque_dap4(const char *val, int64_t len)
+{
+    assert(val);
+    assert(len >= 0);
+
+    checksum_update(val, len);
+
+    if (d_write_data) {
+#ifdef USE_POSIX_THREADS
+        Locker lock(tm->get_mutex(), tm->get_cond(), tm->get_child_thread_count());
+
+        d_out.write(reinterpret_cast<const char*>(&len), sizeof(int64_t));
+
+        char *byte_buf = new char[len];
+        memcpy(byte_buf, val, len);
+
+        tm->increment_child_thread_count();
+        tm->start_thread(MarshallerThread::write_thread, d_out, byte_buf, len);
+#else
+        d_out.write(reinterpret_cast<const char*>(&len), sizeof(int64_t));
+        d_out.write(val, len);
+#endif
+    }
+}
+
+/**
+ * @brief Write a fixed size vector
+ * @param val Pointer to the data
+ * @param num Number of bytes to write
+ */
+void D4StreamMarshaller::put_vector(char *val, int64_t num_bytes)
+{
+    assert(val);
+    assert(num_bytes >= 0);
+
+    checksum_update(val, num_bytes);
+
+    if (d_write_data) {
+#ifdef USE_POSIX_THREADS
+        Locker lock(tm->get_mutex(), tm->get_cond(), tm->get_child_thread_count());
+
+        char *buf = new char[num_bytes];
+        memcpy(buf, val, num_bytes);
+
+        tm->increment_child_thread_count();
+        tm->start_thread(MarshallerThread::write_thread, d_out, buf, num_bytes);
+#else
+        d_out.write(val, num_bytes);
+#endif
+    }
+}
+
+void D4StreamMarshaller::put_vector(char *val, int64_t num_elem, int elem_size)
+{
+	assert(val);
+	assert(num_elem >= 0);
+	assert(elem_size > 0);
+
+	int64_t bytes;
+
+	switch (elem_size) {
+	case 1:
+		assert(!"Don't call this method for bytes, use put_vector(val, bytes) instead");
+		bytes = num_elem;
+		break;
+	case 2:
+		// Don't bother testing the sign bit
+		assert(!(num_elem & 0x4000000000000000)); // 0x 40 00 --> 0100 0000
+		bytes = num_elem << 1;
+		break;
+	case 4:
+		assert(!(num_elem & 0x6000000000000000)); // 0x 60 00 --> 0110 0000
+		bytes = num_elem << 2;
+		break;
+	case 8:
+		assert(!(num_elem & 0x7000000000000000)); // 0111 0000
+		bytes = num_elem << 3;
+		break;
+	default:
+		bytes = num_elem * elem_size;
+		break;
+	}
+
+    checksum_update(val, bytes);
+
+    if (d_write_data) {
+#ifdef USE_POSIX_THREADS
+        Locker lock(tm->get_mutex(), tm->get_cond(), tm->get_child_thread_count());
+
+        char *buf = new char[bytes];
+        memcpy(buf, val, bytes);
+
+        tm->increment_child_thread_count();
+        tm->start_thread(MarshallerThread::write_thread, d_out, buf, bytes);
+#else
+        d_out.write(val, bytes);
+#endif
+    }
+}
+
+/**
+ * @brief Write a fixed size vector
+ * @note This method and its companion for float64 exists in case we need to
+ * support machine that do not use IEEE754 for their floating point representation.
+ * @param val Pointer to the data
+ * @param num Number of elements
+ * @param width Size of a single element
+ * @param type DAP variable type; used to handle float32 and float64 types correctly
+ */
+void D4StreamMarshaller::put_vector_float32(char *val, int64_t num_elem)
+{
+#if !USE_XDR_FOR_IEEE754_ENCODING
+
+	assert(std::numeric_limits<float>::is_iec559);
+	assert(val);
+	assert(num_elem >= 0);
+	// sizeof() a 32-bit float is 4, so we're going to send 4 * num_elem bytes, so
+	// make sure that doesn't overflow a 63-bit integer (the max positive value in
+	// a signed int64; use 1110 0000 0.. (0xe000 ...) to mask for non-zero bits
+	// to test that num can be multiplied by 4. A
+	assert(!(num_elem & 0xe000000000000000));
+
+	num_elem = num_elem << 2;	// num_elem is now the number of bytes
+
+    checksum_update(val, num_elem);
+
+    if (d_write_data) {
+#ifdef USE_POSIX_THREADS
+        Locker lock(tm->get_mutex(), tm->get_cond(), tm->get_child_thread_count());
+
+        char *buf = new char[num_elem];
+        memcpy(buf, val, num_elem);
+
+        tm->increment_child_thread_count();
+        tm->start_thread(MarshallerThread::write_thread, d_out, buf, num_elem);
+#else
+    	d_out.write(val, num_elem);
+#endif
+    }
+
+#else
+	assert(val);
+	assert(num_elem >= 0);
+	// sizeof() a 32-bit float is 4, so we're going to send 4 * num_elem bytes, so
+	// make sure that doesn't overflow a 63-bit integer (the max positive value in
+	// a signed int64; use 1110 0000 0.. (0xe000 ...) to mask for non-zero bits
+	// to test that num can be multiplied by 4. A
+	assert(!(num_elem & 0xe000000000000000));
+
+	int64_t bytes = num_elem << 2;	// num_elem is now the number of bytes
+
+    checksum_update(val, bytes);
+
+    if (d_write_data) {
+        if (!std::numeric_limits<float>::is_iec559) {
+            // If not using IEEE 754, use XDR to get it that way.
+            m_serialize_reals(val, num_elem, 4, type);
+        }
+        else {
+#ifdef USE_POSIX_THREADS
+        Locker lock(tm->get_mutex(), tm->get_cond(), tm->get_child_thread_count());
+
+        char *buf = new char[bytes];
+        memcpy(buf, val, bytes);
+
+        tm->increment_child_thread_count();
+        tm->start_thread(MarshallerThread::write_thread, d_out, buf, bytes);
+#else
+        d_out.write(val, bytes);
+#endif
+        }
+    }
+#endif
+}
+
+/**
+ * @brief Write a fixed size vector of float64s
+ *
+ * @param val Pointer to the data
+ * @param num Number of elements
+ * @param width Size of a single element
+ * @param type DAP variable type; used to handle float32 and float64 types correctly
+ */
+void D4StreamMarshaller::put_vector_float64(char *val, int64_t num_elem)
+{
+#if !USE_XDR_FOR_IEEE754_ENCODING
+
+	assert(std::numeric_limits<double>::is_iec559);
+	assert(val);
+	assert(num_elem >= 0);
+	// See comment above
+	assert(!(num_elem & 0xf000000000000000));
+
+	num_elem = num_elem << 3;	// num_elem is now the number of bytes
+
+    checksum_update(val, num_elem);
+
+    if (d_write_data) {
+#ifdef USE_POSIX_THREADS
+        Locker lock(tm->get_mutex(), tm->get_cond(), tm->get_child_thread_count());
+
+        char *buf = new char[num_elem];
+        memcpy(buf, val, num_elem);
+
+        tm->increment_child_thread_count();
+        tm->start_thread(MarshallerThread::write_thread, d_out, buf, num_elem);
+#else
+        d_out.write(val, num_elem);
+#endif
+    }
+#else
+	assert(val);
+	assert(num_elem >= 0);
+	// sizeof() a 32-bit float is 4, so we're going to send 4 * num_elem bytes, so
+	// make sure that doesn't overflow a 63-bit integer (the max positive value in
+	// a signed int64; use 1110 0000 0.. (0xe000 ...) to mask for non-zero bits
+	// to test that num can be multiplied by 4. A
+	assert(!(num_elem & 0xe000000000000000));
+
+	int64_t bytes = num_elem << 3;	// num_elem is now the number of bytes
+
+    checksum_update(val, bytes);
+
+    if (d_write_data) {
+        if (!std::numeric_limits<double>::is_iec559) {
+            // If not using IEEE 754, use XDR to get it that way.
+            m_serialize_reals(val, num_elem, 8, type);
+        }
+        else {
+#ifdef USE_POSIX_THREADS
+        Locker lock(tm->get_mutex(), tm->get_cond(), tm->get_child_thread_count());
+
+        char *buf = new char[bytes];
+        memcpy(buf, val, bytes);
+
+        tm->increment_child_thread_count();
+        tm->start_thread(MarshallerThread::write_thread, d_out, buf, bytes);
+#else
+        d_out.write(val, bytes);
+#endif
+        }
+    }
+#endif
+
+}
+
+void D4StreamMarshaller::put_vector_part(char *val, unsigned int num, int width, Type type)
+{
+    assert(val);
+    assert(num >= 0);
+    assert(width > 0);
+
+    switch(type) {
+    case dods_byte_c:
+    case dods_char_c:
+    case dods_int8_c:
+    case dods_uint8_c:
+        put_vector(val, num);
+        break;
+
+    case dods_int16_c:
+    case dods_uint16_c:
+    case dods_int32_c:
+    case dods_uint32_c:
+    case dods_int64_c:
+    case dods_uint64_c:
+        put_vector(val, num, width);
+        break;
+
+    case dods_enum_c:
+        if (width == 1)
+            put_vector(val, num);
+        else
+            put_vector(val, num, width);
+        break;
+
+    case dods_float32_c:
+        put_vector_float32(val, num);
+        break;
+
+    case dods_float64_c:
+        put_vector_float32(val, num);
+        break;
+
+    case dods_str_c:
+    case dods_url_c:
+        throw InternalErr(__FILE__, __LINE__, "Array of String should not be passed to put_vector.");
+
+    case dods_array_c:
+        throw InternalErr(__FILE__, __LINE__, "Array of Array not allowed.");
+
+    case dods_opaque_c:
+    case dods_structure_c:
+    case dods_sequence_c:
+        throw InternalErr(__FILE__, __LINE__, "Array of String should not be passed to put_vector.");
+
+    case dods_grid_c:
+        throw InternalErr(__FILE__, __LINE__, "Grid is not part of DAP4.");
+
+    default:
+        throw InternalErr(__FILE__, __LINE__, "Unknown datatype.");
+        break;
+    }
+}
+
+void D4StreamMarshaller::dump(ostream &strm) const
+{
+    strm << DapIndent::LMarg << "D4StreamMarshaller::dump - (" << (void *) this << ")" << endl;
+}
+
+} // namespace libdap
+
diff --git a/D4StreamMarshaller.h b/D4StreamMarshaller.h
new file mode 100644
index 0000000..3d2247c
--- /dev/null
+++ b/D4StreamMarshaller.h
@@ -0,0 +1,178 @@
+// D4StreamMarshaller.h
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003,2012 OPeNDAP, Inc.
+// Author: Patrick West <pwest@ucar.edu>,
+//         James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#ifndef I_D4StreamMarshaller_h
+#define I_D4StreamMarshaller_h 1
+
+#include <iostream>
+
+// By default, only support platforms that use IEEE754 for floating point values.
+// Hacked up code leftover from an older version of the class; largely untested.
+// jhrg 10/3/13
+#define USE_XDR_FOR_IEEE754_ENCODING 0
+
+#if USE_XDR_FOR_IEEE754_ENCODING
+#ifdef WIN32
+#include <rpc.h>
+#include <winsock2.h>
+#include <xdr.h>
+#else
+#include <rpc/types.h>
+#include <netinet/in.h>
+#include <rpc/xdr.h>
+#endif
+#endif
+
+#include <stdint.h>
+#include "crc.h"
+
+#include "Marshaller.h"
+#include "InternalErr.h"
+
+namespace libdap {
+
+class Vector;
+class MarshallerThread;
+
+/** @brief Marshaller that knows how to marshal/serialize dap data objects
+ * to a C++ iostream using DAP4's receiver-makes-right scheme. This code
+ * adds checksums to the stream and uses the xdr library to encode real
+ * values if the underlying representation is not IEEE 754. It also supports
+ * computing the checksum only.
+ *
+ * @note This class uses the Marshaller interface; it could be rewritten
+ * to use far fewer methods since all of the put_*() methods take different
+ * types.
+ */
+class D4StreamMarshaller: public Marshaller {
+
+private:
+#if USE_XDR_FOR_IEEE754_ENCODING
+    XDR d_scalar_sink;
+    char d_ieee754_buf[sizeof(dods_float64)]; // used to serialize a float or double
+#endif
+
+    ostream &d_out;
+    bool d_write_data; // jhrg 1/27/12
+
+    Crc32 d_checksum;
+
+    MarshallerThread *tm;
+
+    // These are private so they won't ever get used.
+    D4StreamMarshaller();
+    D4StreamMarshaller(const D4StreamMarshaller &);
+    D4StreamMarshaller & operator=(const D4StreamMarshaller &);
+
+#if USE_XDR_FOR_IEEE754_ENCODING
+    void m_serialize_reals(char *val, int64_t num, int width, Type type);
+#endif
+
+public:
+    D4StreamMarshaller(std::ostream &out, bool write_data = true);
+    virtual ~D4StreamMarshaller();
+
+    virtual void reset_checksum();
+    virtual string get_checksum();
+    virtual void checksum_update(const void *data, unsigned long len);
+
+    virtual void put_checksum();
+    virtual void put_count(int64_t count);
+
+    virtual void put_byte(dods_byte val);
+    virtual void put_int8(dods_int8 val);
+
+    virtual void put_int16(dods_int16 val);
+    virtual void put_int32(dods_int32 val);
+    // Added
+    virtual void put_int64(dods_int64 val);
+
+    virtual void put_float32(dods_float32 val);
+    virtual void put_float64(dods_float64 val);
+
+    virtual void put_uint16(dods_uint16 val);
+    virtual void put_uint32(dods_uint32 val);
+    // Added
+    virtual void put_uint64(dods_uint64 val);
+
+    virtual void put_str(const string &val);
+    virtual void put_url(const string &val);
+
+    virtual void put_opaque(char *, unsigned int) {
+    	throw InternalErr(__FILE__, __LINE__, "Not implemented for DAP4; use put_opaque_dap4() instead.");
+    }
+
+    virtual void put_opaque_dap4(const char *val, int64_t len);
+
+    // Never use put_int() to send length information in DAP4.
+    virtual void put_int(int) {
+        throw InternalErr(__FILE__, __LINE__, "Not Implemented; use put_length_prefix.");
+    }
+
+    virtual void put_vector(char *val, int64_t num_bytes);
+    virtual void put_vector(char *val, int64_t num_elem, int elem_size);
+    virtual void put_vector_float32(char *val, int64_t num_elem);
+    virtual void put_vector_float64(char *val, int64_t num_elem);
+
+    virtual void put_vector(char *, int , Vector &) {
+        throw InternalErr(__FILE__, __LINE__, "Not Implemented; use other put_vector() versions.");
+    }
+    virtual void put_vector(char *, int , int , Vector &) {
+        throw InternalErr(__FILE__, __LINE__, "Not Implemented; use other put_vector() versions.");
+    }
+
+    /**
+     * Prepare to send a single array/vector using a series of 'put' calls.
+     * In DAP4 this does nothing because arrays are serialized using the server's
+     * binary representation (i.e., using 'reader make right').
+     *
+     * @param num Ignored
+     * @see put_vector_part()
+     * @see put_vector_end()
+     */
+    virtual void put_vector_start(int /*num*/) {
+    }
+
+    virtual void put_vector_part(char */*val*/, unsigned int /*num*/, int /*width*/, Type /*type*/);
+
+    /**
+     * Close a vector when its values are written using put_vector_part().
+     * In DAP4 this does nothing because arrays are serialized using the server's
+     * binary representation (i.e., using 'reader make right').
+     *
+     * @see put_vector_start()
+     * @see put_vector_part()
+     */
+    virtual void put_vector_end() {
+    }
+
+    virtual void dump(std::ostream &strm) const;
+};
+
+} // namespace libdap
+
+#endif // I_D4StreamMarshaller_h
diff --git a/D4StreamUnMarshaller.cc b/D4StreamUnMarshaller.cc
new file mode 100644
index 0000000..c7ec806
--- /dev/null
+++ b/D4StreamUnMarshaller.cc
@@ -0,0 +1,475 @@
+// D4StreamUnMarshaller.cc
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2012 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#include "config.h"
+
+#include <byteswap.h>
+#include <cassert>
+
+#include <iostream>
+#include <iomanip>
+#include <limits>
+#include <string>
+#include <sstream>
+
+//#define DODS_DEBUG2 1
+//#define DODS_DEBUG 1
+
+#include "util.h"
+//#include "XDRUtils.h"
+#include "InternalErr.h"
+#include "D4StreamUnMarshaller.h"
+#include "debug.h"
+
+namespace libdap {
+
+/**
+ * @brief Build a DAP4 Stream unMarshaller.
+ *
+ * Build a DAP4 Stream UnMarshaller initialed to read from am istream object.
+ * Figure out if the words read for values need to be 'twiddled' based on the
+ * byte-order of the stream an this host (see set_twiddle_bytes()).
+ *
+ * @param in Read from this input stream
+ * @param is_stream_bigendian The byte order of the data in the stream
+ */
+D4StreamUnMarshaller::D4StreamUnMarshaller(istream &in, bool twiddle_bytes) : d_in( in ), d_twiddle_bytes(twiddle_bytes)
+{
+	assert(sizeof(std::streamsize) >= sizeof(int64_t));
+
+#if USE_XDR_FOR_IEEE754_ENCODING
+	// XDR is used to handle transforming non-ieee754 reals, nothing else.
+    xdrmem_create(&d_source, d_buf, sizeof(dods_float64), XDR_DECODE);
+#endif
+
+    // This will cause exceptions to be thrown on i/o errors. The exception
+    // will be ostream::failure
+    d_in.exceptions(istream::failbit | istream::badbit);
+
+}
+
+/**
+ * When using this constructor, set_twiddle_bytes() should be called
+ * before data are processed.
+ *
+ * @param in
+ */
+D4StreamUnMarshaller::D4StreamUnMarshaller(istream &in) : d_in( in ), d_twiddle_bytes(false)
+{
+	assert(sizeof(std::streamsize) >= sizeof(int64_t));
+
+#if USE_XDR_FOR_IEEE754_ENCODING
+    // XDR is used to handle transforming non-ieee754 reals, nothing else.
+    xdrmem_create(&d_source, d_buf, sizeof(dods_float64), XDR_DECODE);
+#endif
+
+    // This will cause exceptions to be thrown on i/o errors. The exception
+    // will be ostream::failure
+    d_in.exceptions(istream::failbit | istream::badbit);
+}
+
+D4StreamUnMarshaller::~D4StreamUnMarshaller( )
+{
+#if USE_XDR_FOR_IEEE754_ENCODING
+    xdr_destroy(&d_source);
+#endif
+}
+
+Crc32::checksum D4StreamUnMarshaller::get_checksum()
+{
+    Crc32::checksum c;
+    d_in.read(reinterpret_cast<char*>(&c), sizeof(Crc32::checksum));
+
+    return c;
+}
+
+string D4StreamUnMarshaller::get_checksum_str()
+{
+    ostringstream oss;
+    oss.setf(ios::hex, ios::basefield);
+    oss << setfill('0') << setw(8) << get_checksum();
+
+    return oss.str();
+}
+
+void
+D4StreamUnMarshaller::get_byte( dods_byte &val )
+{
+    d_in.read(reinterpret_cast<char*>(&val), sizeof(dods_byte));
+}
+
+void
+D4StreamUnMarshaller::get_int8( dods_int8 &val )
+{
+    d_in.read(reinterpret_cast<char*>(&val), sizeof(dods_int8));
+}
+
+void
+D4StreamUnMarshaller::get_int16( dods_int16 &val )
+{
+    d_in.read(reinterpret_cast<char*>(&val), sizeof(dods_int16));
+    if (d_twiddle_bytes)
+        val = bswap_16(val);
+}
+
+void
+D4StreamUnMarshaller::get_int32( dods_int32 &val )
+{
+    d_in.read(reinterpret_cast<char*>(&val), sizeof(dods_int32));
+    if (d_twiddle_bytes)
+        val = bswap_32(val);
+}
+
+void
+D4StreamUnMarshaller::get_int64( dods_int64 &val )
+{
+    d_in.read(reinterpret_cast<char*>(&val), sizeof(dods_int64));
+    if (d_twiddle_bytes)
+        val = bswap_64(val);
+}
+
+void
+D4StreamUnMarshaller::get_float32( dods_float32 &val )
+{
+#if !USE_XDR_FOR_IEEE754_ENCODING
+	assert(std::numeric_limits<float>::is_iec559);
+
+    d_in.read(reinterpret_cast<char*>(&val), sizeof(dods_float32));
+    if (d_twiddle_bytes) {
+        dods_int32 *i = reinterpret_cast<dods_int32*>(&val);
+        *i = bswap_32(*i);
+    }
+
+#else
+    if (std::numeric_limits<float>::is_iec559) {
+        d_in.read(reinterpret_cast<char*>(&val), sizeof(dods_float32));
+        if (d_twiddle_bytes) {
+            dods_int32 *i = reinterpret_cast<dods_int32*>(&val);
+            *i = bswap_32(*i);
+        }
+
+    }
+    else {
+        xdr_setpos( &d_source, 0);
+        d_in.read(d_buf, sizeof(dods_float32));
+
+        if (!xdr_float(&d_source, &val))
+            throw Error("Network I/O Error. Could not read float 64 data.");
+    }
+#endif
+}
+
+void
+D4StreamUnMarshaller::get_float64( dods_float64 &val )
+{
+#if !USE_XDR_FOR_IEEE754_ENCODING
+	assert(std::numeric_limits<double>::is_iec559);
+
+    d_in.read(reinterpret_cast<char*>(&val), sizeof(dods_float64));
+    if (d_twiddle_bytes) {
+        dods_int64 *i = reinterpret_cast<dods_int64*>(&val);
+        *i = bswap_64(*i);
+    }
+
+#else
+    if (std::numeric_limits<float>::is_iec559) {
+        d_in.read(reinterpret_cast<char*>(&val), sizeof(dods_float64));
+        if (d_twiddle_bytes) {
+            dods_int64 *i = reinterpret_cast<dods_int64*>(&val);
+            *i = bswap_64(*i);
+        }
+    }
+    else {
+        xdr_setpos( &d_source, 0);
+        d_in.read(d_buf, sizeof(dods_float64));
+
+        if (!xdr_double(&d_source, &val))
+            throw Error("Network I/O Error. Could not read float 64 data.");
+    }
+#endif
+}
+
+void
+D4StreamUnMarshaller::get_uint16( dods_uint16 &val )
+{
+    d_in.read(reinterpret_cast<char*>(&val), sizeof(dods_uint16));
+    if (d_twiddle_bytes)
+        val = bswap_16(val);
+}
+
+void
+D4StreamUnMarshaller::get_uint32( dods_uint32 &val )
+{
+    d_in.read(reinterpret_cast<char*>(&val), sizeof(dods_uint32));
+    if (d_twiddle_bytes)
+        val = bswap_32(val);
+}
+
+void
+D4StreamUnMarshaller::get_uint64( dods_uint64 &val )
+{
+    d_in.read(reinterpret_cast<char*>(&val), sizeof(dods_uint64));
+    if (d_twiddle_bytes)
+        val = bswap_64(val);
+}
+
+void
+D4StreamUnMarshaller::get_str( string &val )
+{
+    int64_t len;
+    d_in.read(reinterpret_cast<char*>(&len), sizeof(int64_t));
+
+    val.resize(len);
+    d_in.read(&val[0], len);
+}
+
+void
+D4StreamUnMarshaller::get_url( string &val )
+{
+    get_str( val ) ;
+}
+
+/**
+ * Read a count value from the stream. This is used with D4Sequence
+ * which needs to use various other 'get' methods to read its fields.
+ * Methods like get_opaque_dap4() handle reading their count values
+ * themselves.
+ *
+ * @param count The number of elements to follow.
+ */
+int64_t
+D4StreamUnMarshaller::get_count()
+{
+	int64_t count;
+	d_in.read(reinterpret_cast<char*>(&count), sizeof(count));
+	return count;
+}
+
+/**
+ * Get opaque data when the size of the data to be read is not known in
+ * advance.
+ *
+ * @param val Value-result parameter for the data; caller must delete.
+ * @param len value-result parameter for the length of the data
+ */
+void
+D4StreamUnMarshaller::get_opaque_dap4( char **val, int64_t &len )
+{
+    //len = get_length_prefix();
+	d_in.read(reinterpret_cast<char*>(&len), sizeof(len));
+
+    *val = new char[len];
+    d_in.read(*val, len);
+}
+
+void
+D4StreamUnMarshaller::get_opaque_dap4( vector<uint8_t> &val )
+{
+    //len = get_length_prefix();
+	int64_t len;
+	d_in.read(reinterpret_cast<char*>(&len), sizeof(len));
+
+    val.resize(len);
+    d_in.read(reinterpret_cast<char*>(&val[0]), len);
+}
+
+void
+D4StreamUnMarshaller::get_vector( char *val, int64_t bytes )
+{
+    d_in.read(val, bytes);
+}
+
+#if USE_XDR_FOR_IEEE754_ENCODING
+void D4StreamUnMarshaller::m_deserialize_reals(char *val, int64_t num, int width, Type type)
+{
+    int64_t size = num * width;
+    // char *buf = (char*)malloc(size); jhrg 7/23/13
+    vector<char> buf(size);
+    XDR xdr;
+    xdrmem_create(&xdr, &buf[0], size, XDR_DECODE);
+    try {
+        xdr_setpos(&d_source, 0);
+        d_in.read(&buf[0], size);
+
+        if(!xdr_array(&xdr, &val, (unsigned int *)&num, size, width, XDRUtils::xdr_coder(type)))
+            throw InternalErr(__FILE__, __LINE__, "Error deserializing a Float64 array");
+
+        if (xdr_getpos(&xdr) != size)
+            throw InternalErr(__FILE__, __LINE__, "Error deserializing a Float64 array");
+    }
+    catch (...) {
+        xdr_destroy(&xdr);
+        throw;
+    }
+    xdr_destroy(&xdr);
+}
+#endif
+
+void D4StreamUnMarshaller::m_twidle_vector_elements(char *vals, int64_t num, int width)
+{
+    switch (width) {
+        case 2: {
+            dods_int16 *local = reinterpret_cast<dods_int16*>(vals);
+            while (num--) {
+                *local = bswap_16(*local);
+                local++;
+            }
+            break;
+        }
+        case 4: {
+            dods_int32 *local = reinterpret_cast<dods_int32*>(vals);;
+            while (num--) {
+                *local = bswap_32(*local);
+                local++;
+            }
+            break;
+        }
+        case 8: {
+            dods_int64 *local = reinterpret_cast<dods_int64*>(vals);;
+            while (num--) {
+                *local = bswap_64(*local);
+                local++;
+            }
+            break;
+        }
+        default:
+            throw InternalErr(__FILE__, __LINE__, "Unrecognized word size.");
+    }
+}
+
+void
+D4StreamUnMarshaller::get_vector(char *val, int64_t num_elem, int elem_size)
+{
+	assert(std::numeric_limits<float>::is_iec559);
+	assert(std::numeric_limits<double>::is_iec559);
+	assert(val);
+	assert(num_elem >= 0);
+	assert(elem_size > 0);
+
+	int64_t bytes;
+
+	switch (elem_size) {
+	case 1:
+		assert(!"Don't call this method for bytes, use put_vector(val, bytes) instead");
+		bytes = num_elem;
+		break;
+	case 2:
+		// Don't bother testing the sign bit
+		assert(!(num_elem & 0x4000000000000000)); // 0x 40 00 --> 0100 0000
+		bytes = num_elem << 1;
+		break;
+	case 4:
+		assert(!(num_elem & 0x6000000000000000)); // 0x 60 00 --> 0110 0000
+		bytes = num_elem << 2;
+		break;
+	case 8:
+		assert(!(num_elem & 0x7000000000000000)); // 0111 0000
+		bytes = num_elem << 3;
+		break;
+	default:
+		bytes = num_elem * elem_size;
+		break;
+	}
+
+    d_in.read(val, bytes);
+
+    if (d_twiddle_bytes)
+        m_twidle_vector_elements(val, num_elem, elem_size);
+}
+
+void
+D4StreamUnMarshaller::get_vector_float32(char *val, int64_t num_elem)
+{
+#if !USE_XDR_FOR_IEEE754_ENCODING
+	assert(std::numeric_limits<float>::is_iec559);
+	assert(val);
+	assert(num_elem >= 0);
+	assert(!(num_elem & 0x6000000000000000)); // 0x 60 00 --> 0110 0000
+
+	int64_t bytes = num_elem << 2;
+
+    d_in.read(val, bytes);
+
+    if (d_twiddle_bytes)
+        m_twidle_vector_elements(val, num_elem, sizeof(dods_float32));
+
+#else
+    if (type == dods_float32_c && !std::numeric_limits<float>::is_iec559) {
+        // If not using IEEE 754, use XDR to get it that way.
+        m_deserialize_reals(val, num, 4, type);
+    }
+    else if (type == dods_float64_c && !std::numeric_limits<double>::is_iec559) {
+        m_deserialize_reals(val, num, 8, type);
+    }
+    else {
+        d_in.read(val, num * width);
+        if (d_twiddle_bytes)
+            m_twidle_vector_elements(val, num, width);
+    }
+#endif
+}
+
+void
+D4StreamUnMarshaller::get_vector_float64(char *val, int64_t num_elem)
+{
+#if !USE_XDR_FOR_IEEE754_ENCODING
+	assert(std::numeric_limits<float>::is_iec559);
+	assert(val);
+	assert(num_elem >= 0);
+	assert(!(num_elem & 0x7000000000000000)); // 0x 70 00 --> 0111 0000
+
+	int64_t bytes = num_elem << 3;
+
+    d_in.read(val, bytes);
+
+    if (d_twiddle_bytes)
+        m_twidle_vector_elements(val, num_elem, sizeof(dods_float64));
+
+#else
+    if (type == dods_float32_c && !std::numeric_limits<float>::is_iec559) {
+        // If not using IEEE 754, use XDR to get it that way.
+        m_deserialize_reals(val, num, 4, type);
+    }
+    else if (type == dods_float64_c && !std::numeric_limits<double>::is_iec559) {
+        m_deserialize_reals(val, num, 8, type);
+    }
+    else {
+        d_in.read(val, num * width);
+        if (d_twiddle_bytes)
+            m_twidle_vector_elements(val, num, width);
+    }
+#endif
+}
+
+void
+D4StreamUnMarshaller::dump(ostream &strm) const
+{
+    strm << DapIndent::LMarg << "D4StreamUnMarshaller::dump - ("
+         << (void *)this << ")" << endl ;
+}
+
+} // namespace libdap
+
diff --git a/D4StreamUnMarshaller.h b/D4StreamUnMarshaller.h
new file mode 100644
index 0000000..310158b
--- /dev/null
+++ b/D4StreamUnMarshaller.h
@@ -0,0 +1,164 @@
+// D4StreamUnMarshaller.h
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2012 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#ifndef I_D4StreamUnMarshaller_h
+#define I_D4StreamUnMarshaller_h 1
+
+#include <iostream>
+
+// See comment in D4StreamMarshaller
+#define USE_XDR_FOR_IEEE754_ENCODING 0
+
+#if USE_XDR_FOR_IEEE754_ENCODING
+#ifdef WIN32
+#include <rpc.h>
+#include <winsock2.h>
+#include <xdr.h>
+#else
+#include <rpc/types.h>
+#include <netinet/in.h>
+#include <rpc/xdr.h>
+#endif
+#endif
+
+#include <crc.h>
+
+// #include "Type.h"
+#include "dods-datatypes.h"
+#include "UnMarshaller.h"
+#include "InternalErr.h"
+
+#include "util.h"
+#include "debug.h"
+
+using std::istream;
+
+namespace libdap {
+
+class Vector;
+
+/** @brief Read data from the stream made by D4StreamMarshaller.
+ */
+class D4StreamUnMarshaller: public UnMarshaller {
+public:
+    const static unsigned int c_checksum_length = 4;
+
+private:
+    istream &d_in;
+    bool d_twiddle_bytes;
+
+#if USE_XDR_FOR_IEEE754_ENCODING
+    // These are used for reals that need to be converted from IEEE 754
+    XDR d_source;
+    char d_buf[sizeof(dods_float64)];
+#endif
+
+    D4StreamUnMarshaller();
+    D4StreamUnMarshaller(const D4StreamUnMarshaller &);
+    D4StreamUnMarshaller & operator=(const D4StreamUnMarshaller &);
+#if USE_XDR_FOR_IEEE754_ENCODING
+    void m_deserialize_reals(char *val, int64_t num, int width, Type type);
+#endif
+    void m_twidle_vector_elements(char *vals, int64_t num, int width);
+
+public:
+    D4StreamUnMarshaller(istream &in, bool twiddle_bytes);
+    D4StreamUnMarshaller(istream &in);
+    virtual ~D4StreamUnMarshaller();
+
+    void set_twiddle_bytes(bool twiddle) { d_twiddle_bytes = twiddle; }
+
+    /**
+     * @brief Is the data source we are reading from a big-endian machine?
+     * We need this because the value of the CRC32 checksum is dependent on
+     * byte order.
+     *
+     * @note This is somewhat tortured logic, but if this host is big-endian and
+     * twiddle_bytes is not true, then the remote host must be big-endian. Similarly,
+     * if this host is not big-endian and twiddle_bytes is true, then the remote
+     * host must be big-endian
+     */
+    bool is_source_big_endian() const { return (is_host_big_endian() && !d_twiddle_bytes)
+                                               || (!is_host_big_endian() && d_twiddle_bytes); }
+
+    Crc32::checksum get_checksum();
+    string get_checksum_str();
+    int64_t get_count();
+
+    virtual void get_byte(dods_byte &val);
+    virtual void get_int8(dods_int8 &val);
+
+    virtual void get_int16(dods_int16 &val);
+    virtual void get_int32(dods_int32 &val);
+
+    virtual void get_int64(dods_int64 &val);
+
+    virtual void get_float32(dods_float32 &val);
+    virtual void get_float64(dods_float64 &val);
+
+    virtual void get_uint16(dods_uint16 &val);
+    virtual void get_uint32(dods_uint32 &val);
+
+    virtual void get_uint64(dods_uint64 &val);
+
+    virtual void get_str(string &val);
+    virtual void get_url(string &val);
+
+    virtual void get_opaque(char *, unsigned int) {
+    	throw InternalErr(__FILE__, __LINE__, "Not implemented for DAP4, use get_opaque_dap4() instead.");
+    }
+
+    virtual void get_opaque_dap4(char **val, int64_t &len);
+    virtual void get_opaque_dap4( vector<uint8_t> &val );
+
+    virtual void get_int(int &) {
+        throw InternalErr(__FILE__, __LINE__, "Not implemented for DAP4");
+    }
+
+    // Note that DAP4 assumes clients know the size of arrays when they
+    // read the data; it's the 'varying' get methods that read & return the
+    // number of elements. These methods are here to appease the UnMarshaller
+    // 'interface' code
+    virtual void get_vector(char **, unsigned int &, Vector &) {
+        throw InternalErr(__FILE__, __LINE__, "Not implemented for DAP4");
+    }
+
+    virtual void get_vector(char **, unsigned int &, int, Vector & ) {
+        throw InternalErr(__FILE__, __LINE__, "Not implemented for DAP4");
+    }
+
+    virtual void get_vector(char *val, int64_t num_bytes);
+    virtual void get_vector(char *val, int64_t num_elem, int elem_size);
+    virtual void get_vector_float32(char *val, int64_t num_elem);
+    virtual void get_vector_float64(char *val, int64_t num_elem);
+
+    virtual void dump(ostream &strm) const;
+};
+
+} // namespace libdap
+
+#endif // I_D4StreamUnMarshaller_h
+
diff --git a/DAS.cc b/DAS.cc
new file mode 100644
index 0000000..3c60010
--- /dev/null
+++ b/DAS.cc
@@ -0,0 +1,383 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1994-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// Methods for the class DAS - a class used to parse the dataset attribute
+// structure.
+//
+// jhrg 7/25/94
+
+#include "config.h"
+
+#include <cstdio>
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#ifdef WIN32
+#include <io.h>
+#endif
+
+#include <iostream>
+#include <string>
+
+#include "DAS.h"
+#include "AttrTable.h"
+#include "Error.h"
+#include "InternalErr.h"
+#include "parser.h"
+#include "escaping.h"
+#include "debug.h"
+
+using std::cerr;
+using std::endl;
+
+// Glue routines declared in das.lex
+extern void das_switch_to_buffer(void *new_buffer);
+extern void das_delete_buffer(void * buffer);
+extern void *das_buffer(FILE *fp);
+
+//extern void dasrestart(FILE *yyin);
+//extern int dasparse(void *arg); // defined in das.tab.c
+extern int dasparse(libdap::parser_arg *arg); // defined in das.tab.c
+
+namespace libdap {
+
+void DAS::duplicate(const DAS &src)
+{
+    // If the container field is set, perform a deep copy
+    if (src.d_container)
+        d_container  = new AttrTable(*src.d_container);
+    else
+        d_container = 0;
+
+    d_container_name = src.d_container_name;
+    d_attrs = src.d_attrs;
+}
+
+DAS &DAS::operator=(const DAS &rhs)
+{
+    if (this == &rhs)
+        return *this;
+
+    duplicate(rhs);
+
+    return *this;
+}
+
+/** @brief Sets the name of the current attribute container when multiple
+ * files used to build this DAS.
+ *
+ * @param cn container name
+ */
+void DAS::container_name(const string &cn)
+{
+    // We want to find a top level attribute table with the given name. So
+    // set d_container to null first so that we aren't searching some
+    // previous container
+    if (cn != d_container_name) {
+        d_container = 0;
+        if (!cn.empty()) {
+            d_container = get_table(cn);
+            if (!d_container) {
+                d_container = add_table(cn, new AttrTable);
+            }
+        }
+        d_container_name = cn;
+    }
+}
+
+/** @brief Returns the number of attributes in the current attribute table
+ *
+ * If the there is a container set, then return the number of variable
+ * attribute tables for the current container. If not set then return the
+ * number of current attribute tables in the outermost attribute table.
+ */
+unsigned int DAS::get_size() const
+{
+    if (d_container) {
+        return d_container->get_size();
+    }
+    return d_attrs.get_size();
+}
+
+/** @brief erase all attributes in this DAS
+ */
+void DAS::erase()
+{
+    if (d_container) {
+        d_container->erase();
+    }
+    else {
+        d_attrs.erase();
+    }
+}
+
+/** @brief Returns a reference to the attribute table for the first variable.
+ */
+AttrTable::Attr_iter DAS::var_begin()
+{
+    if (d_container) {
+        return d_container->attr_begin();
+    }
+    return d_attrs.attr_begin();
+}
+
+/** Returns a reference to the end of the attribute table. Does not
+ *  point to an attribute table.
+ */
+AttrTable::Attr_iter DAS::var_end()
+{
+    if (d_container) {
+        return d_container->attr_end();
+    }
+    return d_attrs.attr_end();
+}
+
+/** @brief Returns the name of the referenced variable attribute table.
+ */
+string DAS::get_name(AttrTable::Attr_iter &i)
+{
+    if (d_container) {
+        return d_container->get_name(i);
+    }
+    return d_attrs.get_name(i);
+}
+
+/** @brief Returns the referenced variable attribute table.
+ */
+AttrTable *
+DAS::get_table(AttrTable::Attr_iter &i)
+{
+    if (d_container) {
+        return d_container->get_attr_table(i);
+    }
+    return d_attrs.get_attr_table(i);
+}
+
+/** @brief Returns the variable attribute table with the given name.
+ */
+AttrTable *
+DAS::get_table(const string &name)
+{
+    if (d_container) {
+        return d_container->get_attr_table(name);
+    }
+    return d_attrs.get_attr_table(name);
+}
+
+//@}
+
+/** @brief Adds an attribute table to the DAS.
+    @name add_table()
+*/
+//@{
+
+/** @brief Adds a variable attribute table to the DAS or the current
+ * dataset container attribute table.
+ */
+AttrTable *
+DAS::add_table( const string &name, AttrTable *at )
+{
+    if (d_container) {
+        at->set_is_global_attribute(false);
+        return d_container->append_container(at, name);
+    }
+    return d_attrs.append_container( at, name ) ;
+}
+
+//@}
+
+/** @brief Reads a DAS in from an external source.
+
+    @name parse()
+*/
+//@{
+
+
+/** @brief Reads a DAS from the named file.
+
+    Read attributes from a file. Returns false if unable to open
+    the file, otherwise returns the result of the mfunc parse. */
+void
+DAS::parse(string fname)
+{
+    FILE *in = fopen(fname.c_str(), "r");
+
+    if (!in) {
+        throw Error(cannot_read_file, "Could not open: " + fname);
+    }
+
+    parse(in);
+
+    int res = fclose(in);
+    if (res) {
+        DBG(cerr << "DAS::parse - Failed to close file " << (void *)in << endl ;) ;
+    }
+}
+
+/** @brief Read attributes from a file descriptor.
+
+    If the file descriptor cannot be fdopen'd, return false, otherwise
+    return the status of the mfunc parse.
+
+    \note Added call to dup() within fdopen so that once the FILE * is
+    closed the decriptor fd will not also be closed (instead the
+    duplicate descriptor will be closed). Thus further information can
+    be read from the descriptor fd.
+*/
+void
+DAS::parse(int fd)
+{
+#ifdef WIN32
+    int new_fd = _dup(fd);
+#else
+    int new_fd = dup(fd);
+#endif
+
+    if (new_fd < 0)
+        throw InternalErr(__FILE__, __LINE__, "Could not access file.");
+    FILE *in = fdopen(new_fd, "r");
+
+    if (!in) {
+        throw InternalErr(__FILE__, __LINE__, "Could not access file.");
+    }
+
+    parse(in);
+
+    int res = fclose(in);
+    if (res) {
+        DBG(cerr << "DAS::parse(fd) - Failed to close " << (void *)in << endl ;) ;
+    }
+}
+
+
+
+/** @brief Reads a DAS from an open file descriptor.
+
+    Read attributes from in (which defaults to stdin). If
+    dasrestart() fails, return false, otherwise return the status
+    of dasparse().
+*/
+void
+DAS::parse(FILE *in)
+{
+    if (!in) {
+        throw InternalErr(__FILE__, __LINE__, "Null input stream.");
+    }
+
+    void *buffer = das_buffer(in);
+    das_switch_to_buffer(buffer);
+
+    parser_arg arg(this);
+
+    //bool status = dasparse((void *) & arg) == 0;
+    bool status = dasparse(&arg) == 0;
+
+    das_delete_buffer(buffer);
+
+    //  STATUS is the result of the parser function; if a recoverable error
+    //  was found it will be true but arg.status() will be false.
+    if (!status || !arg.status()) {// Check parse result
+        if (arg.error())
+            throw *arg.error();
+    }
+}
+
+//@}
+
+/** Creates an ASCII representation of a DAS on the given output
+    stream.
+
+    When an identifier contains a character that contains
+    characters that cannot be present in a URL (e.g., a space)
+    AttrTable::print replaces those characters with WWW
+    escape codes. 7/13/2001 jhrg
+
+    @param out output FILE on which to print the DAS
+    @param dereference If true, follow aliases. Default is false.
+*/
+
+void
+DAS::print(FILE *out, bool dereference)
+{
+    fprintf(out, "Attributes {\n") ;
+
+    d_attrs.print(out, "    ", dereference);
+
+    fprintf(out, "}\n") ;
+}
+
+/** Creates an ASCII representation of a DAS on the given output
+    stream.
+
+    When an identifier contains a character that contains
+    characters that cannot be present in a URL (e.g., a space)
+    AttrTable::print replaces those characters with WWW
+    escape codes. 7/13/2001 jhrg
+
+    @param out output ostream on which to print the DAS
+    @param dereference If true, follow aliases. Default is false.
+*/
+
+void
+DAS::print(ostream &out, bool dereference)
+{
+    out << "Attributes {\n" ;
+
+    d_attrs.print(out, "    ", dereference);
+
+    out << "}\n" ;
+}
+
+/** @brief dumps information about this object
+ *
+ * Displays the pointer value of this instance and then calls parent dump
+ *
+ * @param strm C++ i/o stream to dump the information to
+ * @return void
+ */
+void DAS::dump(ostream &strm) const
+{
+    strm << DapIndent::LMarg << "DAS::dump - (" << (void *) this << ")" << endl;
+    DapIndent::Indent();
+    if (d_container) {
+        strm << DapIndent::LMarg << "current container: " << d_container_name << endl;
+    }
+    else {
+        strm << DapIndent::LMarg << "current container: NONE" << endl;
+    }
+    d_attrs.dump(strm);
+    DapIndent::UnIndent();
+}
+
+} // namespace libdap
+
diff --git a/DAS.h b/DAS.h
new file mode 100644
index 0000000..7a5c5f3
--- /dev/null
+++ b/DAS.h
@@ -0,0 +1,200 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1994-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// Using the DASVHMap class, build a parser for the DAS and add functions
+// that provide access to the variables, their attributes and values.
+//
+// jhrg 7/25/94
+
+#ifndef _das_h
+#define _das_h 1
+
+
+#include <cstdio>
+#include <string>
+#include <iostream>
+
+#ifndef _attrtable_h
+#include "AttrTable.h"
+#endif
+
+using std::cout;
+
+namespace libdap
+{
+
+/** @brief Hold attribute data for a DAP2 dataset.
+
+    The Data Attribute Structure is a set of name-value pairs used to
+    describe the data in a particular dataset. The name-value pairs are
+    called the ``attributes''. The values may be of any of the DAP2 simple
+    data types (Byte, Int16, UInt16, Int32, UInt32, Float32, Float64, String
+    and URL), and may be scalar or vector. Note that all values are actually
+    stored as String data, making the easy to read/check using a web browser.
+
+    A value may also consist of a set of other name-value pairs.  This
+    makes it possible to nest collections of attributes, giving rise
+    to a hierarchy of attributes.  DAP2 uses this structure to provide
+    information about variables in a dataset.  For example, consider
+    the dataset used in the DDS example earlier.
+
+    In the following example of a DAS, several of the attribute
+    collections have names corresponding to the names of variables in
+    the DDS example.  The attributes in that collection are said to
+    belong to that variable.  For example, the <tt>lat</tt> variable has an
+    attribute ``units'' of ``degrees_north''.
+
+    <pre>
+    Attributes {
+        GLOBAL {
+            String title "Reynolds Optimum Interpolation (OI) SST";
+        }
+        lat {
+            String units "degrees_north";
+            String long_name "Latitude";
+            Float64 actual_range 89.5, -89.5;
+        }
+        lon {
+            String units "degrees_east";
+            String long_name "Longitude";
+            Float64 actual_range 0.5, 359.5;
+        }
+        time {
+            String units "days since 1-1-1 00:00:00";
+            String long_name "Time";
+            Float64 actual_range 726468., 729289.;
+            String delta_t "0000-00-07 00:00:00";
+        }
+        sst {
+            String long_name "Weekly Means of Sea Surface Temperature";
+            Float64 actual_range -1.8, 35.09;
+            String units "degC";
+            Float64 add_offset 0.;
+            Float64 scale_factor 0.0099999998;
+            Int32 missing_value 32767;
+        }
+    }
+    </pre>
+
+    Attributes may have arbitrary names, although in most datasets it
+    is important to choose these names so a reader will know what they
+    describe.  In the above example, the ``GLOBAL'' attribute provides
+    information about the entire dataset.
+
+    Data attribute information is an important part of the the data
+    provided to a DAP2 client by a server, and the DAS is how this
+    data is packaged for sending (and how it is received).
+
+    The DAS class is simply a sequence of attribute tables and names.
+    It may be thought of as the top level of the attribute hierarchy.
+
+    @see DDS
+    @see AttrTable */
+class DAS : public DapObj
+{
+private:
+    // The DAS support the notion of a current attribute table for a given
+    // container. Containers are used by the BES to support datasets that
+    // are built using several files (but not exactly the same way as
+    // NCML builds them.
+    AttrTable *d_container ;
+    string d_container_name ;
+
+    // A DAS is a shell around an attribute table. Since tables can be nested,
+    // there is one top-level table and the attribute tables for individual
+    // variables are its children.
+    AttrTable d_attrs ;
+
+    void duplicate(const DAS &src);
+
+public:
+    DAS() : DapObj(), d_container( 0 ) { }
+    DAS(const DAS &das) { duplicate(das); }
+
+    virtual ~DAS() { }
+
+    DAS & operator=(const DAS &rhs);
+
+    /** @brief Returns the name of the current attribute container when multiple
+     * files used to build this DAS
+     */
+    virtual string container_name() const {return d_container_name; }
+
+    virtual void container_name( const string &cn ) ;
+
+    /** @brief Returns the current attribute container when multiple files
+     * used to build this DAS.
+     *
+     * @return current attribute table for current container
+     */
+    virtual AttrTable *container() { return d_container; }
+
+    /** @brief Returns the top most set of attributes
+     *
+     * This could be the top most variable attribute tables, or it could be
+     * the top most dataset container attribute tables, if we have multiple
+     * datasets being used to construct this DAS
+     */
+    virtual AttrTable *get_top_level_attributes() {
+		if (d_container)
+			return d_container;
+		return &d_attrs;
+	}
+
+    virtual void erase() ;
+
+    virtual unsigned int get_size() const ;
+
+    AttrTable::Attr_iter var_begin() ;
+    AttrTable::Attr_iter var_end() ;
+
+    string get_name(AttrTable::Attr_iter &i);
+    AttrTable *get_table(AttrTable::Attr_iter &i);
+
+    virtual AttrTable *get_table(const string &name);
+
+    virtual AttrTable *add_table(const string &name, AttrTable *at);
+
+    /** Read a DAS by parsing the specified file*/
+    virtual void parse(string fname);
+    virtual void parse(int fd);
+    virtual void parse(FILE *in = stdin);
+
+    /** Print the DAS */
+    virtual void print(FILE *out, bool dereference = false);
+    virtual void print(ostream &out, bool dereference = false);
+
+    virtual void dump(ostream &strm) const ;
+};
+
+} // namespace libdap
+
+#endif // _das_h
diff --git a/DDS.cc b/DDS.cc
new file mode 100644
index 0000000..e3607e0
--- /dev/null
+++ b/DDS.cc
@@ -0,0 +1,1566 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1994-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+//
+// jhrg 9/7/94
+
+#include "config.h"
+
+#include <cstdio>
+#include <cmath>
+#include <sys/types.h>
+
+#ifdef WIN32
+#include <io.h>
+#include <process.h>
+#include <fstream>
+#else
+#include <unistd.h>    // for alarm and dup
+#include <sys/wait.h>
+#endif
+
+#include <iostream>
+#include <sstream>
+#include <algorithm>
+#include <functional>
+
+// #define DODS_DEBUG
+//#define DODS_DEBUG2
+
+#include "GNURegex.h"
+
+#include "DAS.h"
+#include "Clause.h"
+#include "Error.h"
+#include "InternalErr.h"
+#include "Keywords2.h"
+
+#include "parser.h"
+#include "debug.h"
+#include "util.h"
+
+#include "Byte.h"
+#include "Int16.h"
+#include "UInt16.h"
+#include "Int32.h"
+#include "UInt32.h"
+#include "Float32.h"
+#include "Float64.h"
+#include "Str.h"
+#include "Url.h"
+#include "Array.h"
+#include "Structure.h"
+#include "Sequence.h"
+#include "Grid.h"
+
+#include "escaping.h"
+
+/**
+ * ############################################################################################
+ * ############################################################################################
+ * ############################################################################################
+ * DapXmlNamespaces
+ *
+ * FIXME Replace all usages of the following variable with calls to DapXmlNamespaces
+ * TODO  Replace all usages of the following variable with calls to DapXmlNamespaces
+ *
+ */
+const string c_xml_xsi = "http://www.w3.org/2001/XMLSchema-instance";
+const string c_xml_namespace = "http://www.w3.org/XML/1998/namespace";
+
+const string grddl_transformation_dap32 = "http://xml.opendap.org/transforms/ddxToRdfTriples.xsl";
+
+const string c_default_dap20_schema_location = "http://xml.opendap.org/dap/dap2.xsd";
+const string c_default_dap32_schema_location = "http://xml.opendap.org/dap/dap3.2.xsd";
+const string c_default_dap40_schema_location = "http://xml.opendap.org/dap/dap4.0.xsd";
+
+const string c_dap20_namespace = "http://xml.opendap.org/ns/DAP2";
+const string c_dap32_namespace = "http://xml.opendap.org/ns/DAP/3.2#";
+const string c_dap40_namespace = "http://xml.opendap.org/ns/DAP/4.0#";
+
+const string c_dap_20_n_sl = c_dap20_namespace + " " + c_default_dap20_schema_location;
+const string c_dap_32_n_sl = c_dap32_namespace + " " + c_default_dap32_schema_location;
+const string c_dap_40_n_sl = c_dap40_namespace + " " + c_default_dap40_schema_location;
+/**
+ *
+ * DapXmlNamespaces
+ * ############################################################################################
+ * ############################################################################################
+ * ############################################################################################
+ */
+
+
+
+using namespace std;
+
+int ddsparse(libdap::parser_arg *arg);
+
+// Glue for the DDS parser defined in dds.lex
+void dds_switch_to_buffer(void *new_buffer);
+void dds_delete_buffer(void * buffer);
+void *dds_buffer(FILE *fp);
+
+namespace libdap {
+
+void
+DDS::duplicate(const DDS &dds)
+{
+    DBG(cerr << "Entering DDS::duplicate... " <<endl);
+#if 0
+    BaseTypeFactory *d_factory;
+
+    string d_name;                // The dataset d_name
+    string d_filename;          // File d_name (or other OS identifier) for
+    string d_container_name;    // d_name of container structure
+    Structure *d_container;     // current container for container d_name
+                                // dataset or part of dataset.
+
+    int d_dap_major;            // The protocol major version number
+    int d_dap_minor;            // ... and minor version number
+    string d_dap_version;       // String version of the protocol
+    string d_request_xml_base;
+    string d_namespace;
+
+    AttrTable d_attr;           // Global attributes.
+
+    vector<BaseType *> vars;    // Variables at the top level
+
+    int d_timeout;              // alarm time in seconds. If greater than
+                                // zero, raise the alarm signal if more than
+                                // d_timeout seconds are spent reading data.
+    Keywords d_keywords;        // Holds keywords parsed from the CE
+
+    long d_max_response_size;   // In bytes
+#endif
+
+    d_factory = dds.d_factory;
+
+    d_name = dds.d_name;
+    d_filename = dds.d_filename;
+    d_container_name = dds.d_container_name;
+    d_container = dds.d_container;
+
+    d_dap_major = dds.d_dap_major;
+    d_dap_minor = dds.d_dap_minor;
+
+    d_dap_version = dds.d_dap_version;       // String version of the protocol
+    d_request_xml_base = dds.d_request_xml_base;
+    d_namespace = dds.d_namespace;
+
+    d_attr = dds.d_attr;
+
+    DDS &dds_tmp = const_cast<DDS &>(dds);
+
+    // copy the things pointed to by the list, not just the pointers
+    for (Vars_iter i = dds_tmp.var_begin(); i != dds_tmp.var_end(); i++) {
+        add_var(*i); // add_var() dups the BaseType.
+    }
+
+    d_timeout = dds.d_timeout;
+
+    d_keywords = dds.d_keywords; // value copy; Keywords contains no pointers
+
+    d_max_response_size = dds.d_max_response_size;
+}
+
+/**
+ * Make a DDS which uses the given BaseTypeFactory to create variables.
+ *
+ * @note The default DAP version is 3.2 - this is really DAP2 with a handful
+ * of enhancements that our WCS software relies on.
+ *
+ * @param factory The BaseTypeFactory to use when creating instances of
+ * DAP variables. The caller must ensure the factory's lifetime is at least
+ * that of the DDS instance.
+ * @param name The name of the DDS - usually derived from the name of the
+ * pathname or table name of the dataset.
+ */
+DDS::DDS(BaseTypeFactory *factory, const string &name)
+        : d_factory(factory), d_name(name), d_container_name(""), d_container(0),
+          d_request_xml_base(""),
+          d_timeout(0), d_keywords(), d_max_response_size(0)
+{
+    DBG(cerr << "Building a DDS for the default version (2.0)" << endl);
+
+    // This method sets a number of values, including those returned by
+    // get_protocol_major(), ..., get_namespace().
+    set_dap_version("2.0");
+}
+
+/**
+ * Make a DDS with the DAP protocol set to a specific value. This method
+ * provides an easy way to build DDS objects for use in a server or client
+ * that will process DAP4, for example. It's roughly equivalent to calling
+ * set_dap_version() after making an instance using
+ * DDS::DDS(BaseTypeFactory *, const string &).
+ *
+ * @param factory The BaseTypeFactory to use when creating instances of
+ * DAP variables. The caller must ensure the factory's lifetime is at least
+ * that of the DDS instance.
+ * @param name The name of the DDS - usually derived from the name of the
+ * pathname or table name of the dataset.
+ * @param version The DAP version to support. This sets the DAP version, as
+ * well as a number of other dependent constants.
+ */
+DDS::DDS(BaseTypeFactory *factory, const string &name, const string &version)
+        : d_factory(factory), d_name(name), d_container_name(""), d_container(0),
+          d_request_xml_base(""),
+          d_timeout(0), d_keywords(), d_max_response_size(0)
+{
+    DBG(cerr << "Building a DDS for version: " << version << endl);
+
+    // This method sets a number of values, including those returned by
+    // get_protocol_major(), ..., get_namespace().
+    set_dap_version(version);
+}
+
+/** The DDS copy constructor. */
+DDS::DDS(const DDS &rhs) : DapObj()
+{
+    DBG(cerr << "Entering DDS(const DDS &rhs) ..." << endl);
+    duplicate(rhs);
+    DBG(cerr << " bye." << endl);
+}
+
+DDS::~DDS()
+{
+    // delete all the variables in this DDS
+    for (Vars_iter i = vars.begin(); i != vars.end(); i++) {
+        BaseType *btp = *i ;
+        delete btp ; btp = 0;
+    }
+}
+
+DDS &
+DDS::operator=(const DDS &rhs)
+{
+    DBG(cerr << "Entering DDS::operator= ..." << endl);
+    if (this == &rhs)
+        return *this;
+
+    duplicate(rhs);
+
+    DBG(cerr << " bye." << endl);
+    return *this;
+}
+
+/**
+ * This is the main method used to transfer attributes from a DAS object into a
+ * DDS. This uses the BaseType::transfer_attributes() method and the various
+ * implementations found here (in the constructors classes) and in handlers.
+ *
+ * This method uses a deep copy to transfer the attributes, so it is safe to
+ * delete the source DAS object passed to this method once it is done.
+ *
+ * @note To accommodate oddly built DAS objects produced by various handlers,
+ * specialize the methods there.
+ *
+ * @param das Transfer (copy) attributes from this DAS object.
+ */
+void DDS::transfer_attributes(DAS *das)
+{
+    // If there is a container set in the DDS then check the container from
+    // the DAS. If they are not the same container, then throw an exception
+    // (should be working on the same container). If the container does not
+    // exist in the DAS, then throw an exception
+    if (d_container && das->container_name() != d_container_name)
+        throw InternalErr(__FILE__, __LINE__,
+                "Error transferring attributes: working on a container in dds, but not das");
+
+    // Give each variable a chance to claim its attributes.
+    AttrTable *top = das->get_top_level_attributes();
+
+    for (DDS::Vars_iter i = var_begin(), e = var_end(); i != e; i++) {
+        (*i)->transfer_attributes(top);
+    }
+#if 0
+    Vars_iter var = var_begin();
+    while (var != var_end()) {
+        try {
+            DBG(cerr << "Processing the attributes for: " << (*var)->d_name() << " a " << (*var)->type_name() << endl);
+            (*var)->transfer_attributes(top);
+            var++;
+        }
+        catch (Error &e) {
+            DBG(cerr << "Got this exception: " << e.get_error_message() << endl);
+            var++;
+            throw e;
+        }
+    }
+#endif
+    // Now we transfer all of the attributes still marked as global to the
+    // global container in the DDS.
+    for (AttrTable::Attr_iter i = top->attr_begin(), e = top->attr_end(); i != e; ++i) {
+        if ((*i)->type == Attr_container && (*i)->attributes->is_global_attribute()) {
+            // copy the source container so that the DAS passed in can be
+            // deleted after calling this method.
+            AttrTable *at = new AttrTable(*(*i)->attributes);
+            d_attr.append_container(at, at->get_name());
+        }
+    }
+#if 0
+    AttrTable::Attr_iter at_cont_p = top_level->attr_begin();
+    while (at_cont_p != top_level->attr_end()) {
+        // In truth, all of the top level attributes should be containers, but
+        // this test handles the abnormal case where somehow someone makes a
+        // top level attribute that is not a container by silently dropping it.
+        if ((*at_cont_p)->type == Attr_container && (*at_cont_p)->attributes->is_global_attribute()) {
+            DBG(cerr << (*at_cont_p)->d_name << " is a global attribute." << endl);
+            // copy the source container so that the DAS passed in can be
+            // deleted after calling this method.
+            AttrTable *at = new AttrTable(*(*at_cont_p)->attributes);
+            d_attr.append_container(at, at->get_name());
+        }
+
+        at_cont_p++;
+    }
+#endif
+}
+
+/** Get and set the dataset's d_name.  This is the d_name of the dataset
+    itself, and is not to be confused with the d_name of the file or
+    disk on which it is stored.
+
+    @d_name Dataset Name Accessors */
+
+//@{
+
+/** Returns the dataset's d_name. */
+string
+DDS::get_dataset_name() const
+{
+    return d_name;
+}
+
+/** Sets the dataset d_name. */
+void
+DDS::set_dataset_name(const string &n)
+{
+    d_name = n;
+}
+
+//@}
+
+/** Get the attribute table for the global attributes. */
+AttrTable &
+DDS::get_attr_table()
+{
+    return d_attr;
+}
+
+/** Get and set the dataset's filename. This is the physical
+    location on a disk where the dataset exists.  The dataset d_name
+    is simply a title.
+
+    @d_name File Name Accessor
+    @see Dataset Name Accessors */
+
+//@{
+/** Gets the dataset file d_name. */
+string
+DDS::filename() const
+{
+    return d_filename;
+}
+
+/** Set the dataset's filename. */
+void
+DDS::filename(const string &fn)
+{
+    d_filename = fn;
+}
+//@}
+
+/**
+ * @deprecated
+ */
+void
+DDS::set_dap_major(int p)
+{
+    d_dap_major = p;
+
+    // This works because regardless of the order set_dap_major and set_dap_minor
+    // are called, once they both are called, the value in the string is
+    // correct. I protect against negative numbers because that would be
+    // nonsensical.
+    if (d_dap_minor >= 0) {
+	ostringstream oss;
+	oss << d_dap_major << "." << d_dap_minor;
+	d_dap_version = oss.str();
+    }
+}
+
+/**
+ * @deprecated
+ */
+void
+DDS::set_dap_minor(int p)
+{
+    d_dap_minor = p;
+
+    if (d_dap_major >= 0) {
+	ostringstream oss;
+	oss << d_dap_major << "." << d_dap_minor;
+	d_dap_version = oss.str();
+    }
+}
+
+/**
+ * Given the DAP protocol version, parse that string and set the DDS fields.
+ *
+ * @param v The version string.
+ */
+void
+DDS::set_dap_version(const string &v /* = "2.0" */)
+{
+    istringstream iss(v);
+
+    int major = -1, minor = -1;
+    char dot;
+    if (!iss.eof() && !iss.fail())
+        iss >> major;
+    if (!iss.eof() && !iss.fail())
+        iss >> dot;
+    if (!iss.eof() && !iss.fail())
+        iss >> minor;
+
+    if (major == -1 || minor == -1 or dot != '.')
+        throw InternalErr(__FILE__, __LINE__, "Could not parse dap version. Value given: " + v);
+
+    d_dap_version = v;
+
+    d_dap_major = major;
+    d_dap_minor = minor;
+
+    // Now set the related XML constants. These might be overwritten if
+    // the DDS instance is being built from a document parse, but if it's
+    // being constructed by a server the code to generate the XML document
+    // needs these values to match the DAP version information.
+    switch (d_dap_major) {
+        case 2:
+            d_namespace = c_dap20_namespace;
+            break;
+        case 3:
+            d_namespace = c_dap32_namespace;
+            break;
+        case 4:
+            d_namespace = c_dap40_namespace;
+            break;
+        default:
+            throw InternalErr(__FILE__, __LINE__, "Unknown DAP version.");
+    }
+}
+
+/** Old way to set the DAP version.
+ *
+ * @note Don't use this - two interfaces to set the version number is overkill
+ *
+ * @param d The protocol version requested by the client, as a double.
+ * @deprecated
+ */
+void
+DDS::set_dap_version(double d)
+{
+    int major = floor(d);
+    int minor = (d-major)*10;
+
+    DBG(cerr << "Major: " << major << ", Minor: " << minor << endl);
+
+    ostringstream oss;
+    oss << major << "." << minor;
+
+    set_dap_version(oss.str());
+}
+
+/** Get and set the current container. If there are multiple files being
+    used to build this DDS, using a container will set a virtual structure
+    for the current container.
+
+    @d_name Container Name Accessor
+    @see Dataset Name Accessors */
+
+//@{
+/** Gets the dataset file d_name. */
+string
+DDS::container_name()
+{
+    return d_container_name;
+}
+
+/** Set the current container d_name and get or create a structure for that
+ * d_name. */
+void
+DDS::container_name(const string &cn)
+{
+    // we want to search the DDS for the top level structure with the given
+    // d_name. Set the container to null so that we don't search some previous
+    // container.
+    d_container = 0 ;
+    if( !cn.empty() )
+    {
+	d_container = dynamic_cast<Structure *>( var( cn ) ) ;
+	if( !d_container )
+	{
+	    // create a structure for this container. Calling add_var
+	    // while_container is null will add the new structure to DDS and
+	    // not some sub structure. Adding the new structure makes a copy
+	    // of it.  So after adding it, go get it and set d_container.
+	    Structure *s = new Structure( cn ) ;
+	    add_var( s ) ;
+	    delete s ;
+	    s = 0 ;
+	    d_container = dynamic_cast<Structure *>( var( cn ) ) ;
+	}
+    }
+    d_container_name = cn;
+
+}
+
+/** Get the current container structure. */
+Structure *
+DDS::container()
+{
+    return d_container ;
+}
+
+//@}
+
+/** Get the size of a response. This method looks at the variables in the DDS
+ *  a computes the number of bytes in the response.
+ *
+ *  @note This version of the method does a poor job with Sequences. A better
+ *  implementation would look at row-constraint-based limitations and use them
+ *  for size computations. If a row-constraint is missing, return an error.
+ *
+ *  @param constrained Should the size of the whole DDS be used or should the
+ *  current constraint be taken into account?
+ */
+int
+DDS::get_request_size(bool constrained)
+{
+	int w = 0;
+    for (Vars_iter i = vars.begin(); i != vars.end(); i++) {
+    	if (constrained) {
+    		if ((*i)->send_p())
+    			w += (*i)->width(constrained);
+    	}
+    	else {
+    		w += (*i)->width(constrained);
+    	}
+    }
+
+    return w;
+}
+
+/** @brief Adds a copy of the variable to the DDS.
+    Using the ptr_duplicate() method, perform a deep copy on the variable
+    \e bt and adds the result to this DDS.
+    @note The copy will not copy data values.
+    @param bt Source variable. */
+void DDS::add_var(BaseType *bt) {
+    if (!bt)
+        throw InternalErr(__FILE__, __LINE__, "Trying to add a BaseType object with a NULL pointer.");
+#if 0
+    if (bt->is_dap4_only_type())
+        throw InternalErr(__FILE__, __LINE__, "Attempt to add a DAP4 type to a DAP2 DDS.");
+#endif
+    DBG2(cerr << "In DDS::add_var(), bt's address is: " << bt << endl);
+
+    BaseType *btp = bt->ptr_duplicate();
+    DBG2(cerr << "In DDS::add_var(), btp's address is: " << btp << endl);
+    if (d_container) {
+        // Mem leak fix [mjohnson nov 2009]
+        // Structure::add_var() creates ANOTHER copy.
+        d_container->add_var(bt);
+        // So we need to delete btp or else it leaks
+        delete btp;
+        btp = 0;
+    }
+    else {
+        vars.push_back(btp);
+    }
+}
+
+/** @brief Adds the variable to the DDS.
+    @param bt Source variable. */
+void
+DDS::add_var_nocopy(BaseType *bt)
+{
+    if (!bt)
+        throw InternalErr(__FILE__, __LINE__, "Trying to add a BaseType object with a NULL pointer.");
+#if 0
+    //FIXME There's no longer a DAP2 and DAP4 DDS
+    if (bt->is_dap4_only_type())
+        throw InternalErr(__FILE__, __LINE__, "Attempt to add a DAP4 type to a DAP2 DDS.");
+#endif
+
+    DBG2(cerr << "In DDS::add_var(), bt's address is: " << bt << endl);
+
+    if (d_container) {
+        d_container->add_var_nocopy(bt);
+    }
+    else {
+        vars.push_back(bt);
+    }
+}
+
+
+/** Remove the named variable from the DDS. This method is not smart about
+    looking up names. The variable must exist at the top level of the DDS and
+    must match \e exactly the d_name given.
+
+    @note Invalidates any iterators that reference the contents of the DDS.
+    @param n The d_name of the variable to remove. */
+void
+DDS::del_var(const string &n)
+{
+    if( d_container )
+    {
+	d_container->del_var( n ) ;
+	return ;
+    }
+
+    for (Vars_iter i = vars.begin(); i != vars.end(); i++) {
+        if ((*i)->name() == n) {
+            BaseType *bt = *i ;
+            vars.erase(i) ;
+            delete bt ; bt = 0;
+            return;
+        }
+    }
+}
+
+/** Remove the variable referenced by the iterator and free its storage.
+
+    @note Invalidates any iterators that reference the contents of the DDS.
+    @param i The Vars_iter which refers to the variable. */
+void
+DDS::del_var(Vars_iter i)
+{
+    if (i != vars.end()) {
+        BaseType *bt = *i ;
+        vars.erase(i) ;
+        delete bt ; bt = 0;
+    }
+}
+
+/** Remove the variables referenced by the range of iterators and free their
+    storage.
+
+    @note Invalidates any iterators that reference the contents of the DDS.
+    @param i1 The start of the range.
+    @param i2 The end of the range. */
+void
+DDS::del_var(Vars_iter i1, Vars_iter i2)
+{
+    for (Vars_iter i_tmp = i1; i_tmp != i2; i_tmp++) {
+        BaseType *bt = *i_tmp ;
+        delete bt ; bt = 0;
+    }
+    vars.erase(i1, i2) ;
+}
+
+/** Search for for variable <i>n</i> as above but record all
+    compound type variables which ultimately contain <i>n</i> on
+    <i>s</i>. This stack can then be used to mark the contained
+    compound-type variables as part of the current projection.
+
+    @return A BaseType pointer to the variable <i>n</i> or 0 if <i>n</i>
+    could not be found. */
+BaseType *
+DDS::var(const string &n, BaseType::btp_stack &s)
+{
+    return var(n, &s);
+}
+/** @brief Find the variable with the given d_name.
+
+    Returns a pointer to the named variable. If the d_name contains one or
+    more field separators then the function looks for a variable whose
+    name matches exactly. If the d_name contains no field separators then
+    the function looks first in the top level and then in all subsequent
+    levels and returns the first occurrence found. In general, this
+    function searches constructor types in the order in which they appear
+    in the DDS, but there is no requirement that it do so.
+
+    @note If a dataset contains two constructor types which have field names
+    that are the same (say point.x and pair.x) you should use fully qualified
+    names to get each of those variables.
+
+    @param n The name of the variable to find.
+    @param s If given, this value-result parameter holds the path to the
+    returned BaseType. Thus, this method can return the FQN for the variable
+    \e n.
+    @return A BaseType pointer to the variable or null if not found. */
+BaseType *
+DDS::var(const string &n, BaseType::btp_stack *s)
+{
+    string name = www2id(n);
+    if( d_container )
+        return d_container->var( name, false, s ) ;
+
+    BaseType *v = exact_match(name, s);
+    if (v)
+        return v;
+
+    return leaf_match(name, s);
+}
+
+BaseType *
+DDS::leaf_match(const string &n, BaseType::btp_stack *s)
+{
+    DBG(cerr << "DDS::leaf_match: Looking for " << n << endl);
+
+    for (Vars_iter i = vars.begin(); i != vars.end(); i++) {
+        BaseType *btp = *i;
+        DBG(cerr << "DDS::leaf_match: Looking for " << n << " in: " << btp->name() << endl);
+        // Look for the d_name in the dataset's top-level
+        if (btp->name() == n) {
+            DBG(cerr << "Found " << n << " in: " << btp->name() << endl);
+            return btp;
+        }
+
+        if (btp->is_constructor_type()) {
+            BaseType *found = btp->var(n, false, s);
+            if (found) {
+                DBG(cerr << "Found " << n << " in: " << btp->name() << endl);
+                return found;
+            }
+        }
+#if STRUCTURE_ARRAY_SYNTAX_OLD
+        if (btp->is_vector_type() && btp->var()->is_constructor_type()) {
+            s->push(btp);
+            BaseType *found = btp->var()->var(n, false, s);
+            if (found) {
+                DBG(cerr << "Found " << n << " in: " << btp->var()->d_name() << endl);
+                return found;
+            }
+        }
+#endif
+    }
+
+    return 0;   // It is not here.
+}
+
+BaseType *
+DDS::exact_match(const string &name, BaseType::btp_stack *s)
+{
+    for (Vars_iter i = vars.begin(); i != vars.end(); i++) {
+        BaseType *btp = *i;
+        DBG2(cerr << "Looking for " << d_name << " in: " << btp << endl);
+        // Look for the d_name in the current ctor type or the top level
+        if (btp->name() == name) {
+            DBG2(cerr << "Found " << d_name << " in: " << btp << endl);
+            return btp;
+        }
+    }
+
+    string::size_type dot_pos = name.find(".");
+    if (dot_pos != string::npos) {
+        string aggregate = name.substr(0, dot_pos);
+        string field = name.substr(dot_pos + 1);
+
+        BaseType *agg_ptr = var(aggregate, s);
+        if (agg_ptr) {
+            DBG2(cerr << "Descending into " << agg_ptr->name() << endl);
+            return agg_ptr->var(field, true, s);
+        }
+        else
+            return 0;  // qualified names must be *fully* qualified
+    }
+
+    return 0;   // It is not here.
+}
+
+
+/** @brief Returns the first variable in the DDS. */
+
+DDS::Vars_iter
+DDS::var_begin()
+{
+    return vars.begin();
+}
+
+DDS::Vars_riter
+DDS::var_rbegin()
+{
+    return vars.rbegin();
+}
+
+DDS::Vars_iter
+DDS::var_end()
+{
+    return vars.end() ;
+}
+
+DDS::Vars_riter
+DDS::var_rend()
+{
+    return vars.rend() ;
+}
+
+/** Return the iterator for the \e ith variable.
+    @param i the index
+    @return The corresponding  Vars_iter */
+DDS::Vars_iter
+DDS::get_vars_iter(int i)
+{
+    return vars.begin() + i;
+}
+
+/** Return the \e ith variable.
+    @param i the index
+    @return The corresponding variable */
+BaseType *
+DDS::get_var_index(int i)
+{
+    return *(vars.begin() + i);
+}
+
+/** Insert a copy of the BaseType before the position given.
+ * @param i The iterator that marks the position
+ * @param ptr The BaseType object to copy and insert
+ */
+void
+DDS::insert_var(Vars_iter i, BaseType *ptr)
+{
+#if 0
+    if (ptr->is_dap4_only_type())
+        throw InternalErr(__FILE__, __LINE__, "Attempt to add a DAP4 type to a DAP2 DDS.");
+#endif
+    vars.insert(i, ptr->ptr_duplicate());
+}
+
+/** Insert the BaseType before the position given.
+ * @note Does not copy the BaseType object - that caller must not
+ * free the inserted object's pointer. This object will, however,
+ * delete the pointer when it is deleted.
+ * @param i The iterator that marks the position
+ * @param ptr The BaseType object to insert
+ */
+void
+DDS::insert_var_nocopy(Vars_iter i, BaseType *ptr)
+{
+#if 0
+    if (ptr->is_dap4_only_type())
+        throw InternalErr(__FILE__, __LINE__, "Attempt to add a DAP4 type to a DAP2 DDS.");
+#endif
+    vars.insert(i, ptr);
+}
+
+/** @brief Returns the number of variables in the DDS. */
+int
+DDS::num_var()
+{
+    return vars.size();
+}
+
+void
+DDS::timeout_on()
+{
+#if USE_LOCAL_TIMEOUT_SCHEME
+#ifndef WIN32
+    alarm(d_timeout);
+#endif
+#endif
+}
+
+void
+DDS::timeout_off()
+{
+#if USE_LOCAL_TIMEOUT_SCHEME
+#ifndef WIN32
+    // Old behavior commented out. I think it is an error to change the value
+    // of d_timeout. The way this will likely be used is to set the timeout
+    // value once and then 'turn on' or turn off' that timeout as the situation
+    // dictates. The initeded use for the DDS timeout is so that timeouts for
+    // data responses will include the CPU resources needed to build the response
+    // but not the time spent transmitting the response. This may change when
+    // more parallelism is added to the server... These methods are called from
+    // BESDapResponseBuilder in bes/dap. jhrg 12/22/15
+
+    // d_timeout = alarm(0);
+
+    alarm(0);
+#endif
+#endif
+}
+
+void
+DDS::set_timeout(int)
+{
+#if USE_LOCAL_TIMEOUT_SCHEME
+    //  Has no effect under win32
+    d_timeout = t;
+#endif
+}
+
+int
+DDS::get_timeout()
+{
+#if USE_LOCAL_TIMEOUT_SCHEME
+    //  Has to effect under win32
+    return d_timeout;
+#endif
+    return 0;
+}
+
+/** @brief Traverse DDS, set Sequence leaf nodes. */
+void
+DDS::tag_nested_sequences()
+{
+    for (Vars_iter i = vars.begin(); i != vars.end(); i++) {
+        if ((*i)->type() == dods_sequence_c)
+            dynamic_cast<Sequence&>(**i).set_leaf_sequence();
+        else if ((*i)->type() == dods_structure_c)
+            dynamic_cast<Structure&>(**i).set_leaf_sequence();
+    }
+}
+
+/** @brief Parse a DDS from a file with the given d_name. */
+void
+DDS::parse(string fname)
+{
+    FILE *in = fopen(fname.c_str(), "r");
+
+    if (!in) {
+        throw Error(cannot_read_file, "Could not open: " + fname);
+    }
+
+    try {
+        parse(in);
+        fclose(in);
+    }
+    catch (Error &e) {
+        fclose(in);
+        throw ;
+    }
+}
+
+
+/** @brief Parse a DDS from a file indicated by the input file descriptor. */
+void
+DDS::parse(int fd)
+{
+#ifdef WIN32
+    int new_fd = _dup(fd);
+#else
+    int new_fd = dup(fd);
+#endif
+
+    if (new_fd < 0)
+        throw InternalErr(__FILE__, __LINE__, "Could not access file.");
+    FILE *in = fdopen(new_fd, "r");
+
+    if (!in) {
+        throw InternalErr(__FILE__, __LINE__, "Could not access file.");
+    }
+
+    try {
+        parse(in);
+        fclose(in);
+    }
+    catch (Error &e) {
+        fclose(in);
+        throw ;
+    }
+}
+
+/** @brief Parse a DDS from a file indicated by the input file descriptor.
+    Read the persistent representation of a DDS from the FILE *in, parse it
+    and create a matching binary object.
+    @param in Read the persistent DDS from this FILE*.
+    @exception InternalErr Thrown if \c in is null
+    @exception Error Thrown if the parse fails. */
+void
+DDS::parse(FILE *in)
+{
+    if (!in) {
+        throw InternalErr(__FILE__, __LINE__, "Null input stream.");
+    }
+
+    void *buffer = dds_buffer(in);
+    dds_switch_to_buffer(buffer);
+
+    parser_arg arg(this);
+
+    bool status = ddsparse(&arg) == 0;
+
+    dds_delete_buffer(buffer);
+
+    DBG2(cout << "Status from parser: " << status << endl);
+
+    //  STATUS is the result of the parser function; if a recoverable error
+    //  was found it will be true but arg.status() will be false.
+    if (!status || !arg.status()) {// Check parse result
+        if (arg.error())
+            throw *arg.error();
+    }
+}
+
+/** @brief Print the entire DDS to the specified file. */
+void
+DDS::print(FILE *out)
+{
+    ostringstream oss;
+    print(oss);
+    fwrite(oss.str().data(), sizeof(char), oss.str().length(), out);
+}
+
+/** @brief Print the entire DDS to the specified ostream. */
+void
+DDS::print(ostream &out)
+{
+    out << "Dataset {\n" ;
+
+    for (Vars_citer i = vars.begin(); i != vars.end(); i++) {
+        (*i)->print_decl(out) ;
+    }
+
+    out << "} " << id2www(d_name) << ";\n" ;
+
+    return ;
+}
+
+/**
+ * Print the DAP2 DAS object using attribute information recorded
+ * this DDS object.
+ *
+ * @note Uses default indenting of four spaces and does not follow
+ * (now deprecated) attribute aliases.
+ *
+ * @param out Write the DAS here.
+ */
+static string four_spaces = "    ";
+void print_var_das(ostream &out, BaseType *bt, string indent=""){
+
+    AttrTable attr_table = bt->get_attr_table();
+    out << indent << add_space_encoding(bt->name()) << " {" << endl;
+    attr_table.print(out, indent+four_spaces);
+    Constructor *cnstrctr = dynamic_cast < Constructor * >(bt);
+    if(cnstrctr) {
+        Constructor::Vars_iter i = cnstrctr->var_begin();
+        Constructor::Vars_iter e = cnstrctr->var_end();
+        for (; i!=e; i++) {
+            print_var_das(out,*i,indent+four_spaces);
+        }
+
+    }
+    out << indent << "}" << endl;
+
+}
+
+void
+DDS::print_das(ostream &out)
+{
+    string indent("    ");
+    out << "Attributes {" << endl ;
+    for (Vars_citer i = vars.begin(); i != vars.end(); i++) {
+        print_var_das(out, *i, four_spaces);
+    }
+    // Print the global attributes at the end.
+    d_attr.print(out,indent);
+    out << "}" << endl ;
+}
+
+/** @brief Print a constrained DDS to the specified file.
+
+    Print those parts (variables) of the DDS structure to OS that
+    are marked to be sent after evaluating the constraint
+    expression.
+
+    @note This function only works for scalars at the top level.
+
+    @returns true.
+*/
+void
+DDS::print_constrained(FILE *out)
+{
+    ostringstream oss;
+    print_constrained(oss);
+    fwrite(oss.str().data(), sizeof(char), oss.str().length(), out);
+}
+
+/** @brief Print a constrained DDS to the specified ostream.
+
+    Print those parts (variables) of the DDS structure to OS that
+    are marked to be sent after evaluating the constraint
+    expression.
+
+    \note This function only works for scalars at the top level.
+
+    @returns true.
+*/
+void
+DDS::print_constrained(ostream &out)
+{
+    out << "Dataset {\n" ;
+
+    for (Vars_citer i = vars.begin(); i != vars.end(); i++) {
+        // for each variable, indent with four spaces, print a trailing
+        // semicolon, do not print debugging information, print only
+        // variables in the current projection.
+        (*i)->print_decl(out, "    ", true, false, true) ;
+    }
+
+    out << "} " << id2www(d_name) << ";\n" ;
+
+    return;
+}
+
+/** Print an XML representation of this DDS. This method is used to generate
+    the part of the DDX response. The \c Dataset tag is \e not written by
+    this code. The caller of this method must handle writing that and
+    including the \c dataBLOB tag.
+
+    @param out Destination.
+    @param constrained True if the output should be limited to just those
+    variables that are in the projection of the current constraint
+    expression.
+    @param blob The dataBLOB href.
+    @deprecated */
+void
+DDS::print_xml(FILE *out, bool constrained, const string &blob)
+{
+    ostringstream oss;
+    print_xml_writer(oss, constrained, blob);
+    fwrite(oss.str().data(), 1, oss.str().length(), out);
+}
+
+/** Print an XML representation of this DDS. This method is used to generate
+    the part of the DDX response. The \c Dataset tag is \e not written by
+    this code. The caller of this method must handle writing that and
+    including the \c dataBLOB tag.
+
+    @param out Destination ostream.
+    @param constrained True if the output should be limited to just those
+    variables that are in the projection of the current constraint
+    expression.
+    @param blob The dataBLOB href.
+    @deprecated */
+void
+DDS::print_xml(ostream &out, bool constrained, const string &blob)
+{
+    print_xml_writer(out, constrained, blob);
+}
+
+class VariablePrintXMLWriter : public unary_function<BaseType *, void>
+{
+    XMLWriter &d_xml;
+    bool d_constrained;
+public:
+    VariablePrintXMLWriter(XMLWriter &xml, bool constrained)
+            : d_xml(xml), d_constrained(constrained)
+    {}
+    void operator()(BaseType *bt)
+    {
+        bt->print_xml_writer(d_xml, d_constrained);
+    }
+};
+
+/**
+ * Print the DDX. This code uses the libxml2 'TextWriter' interface; something
+ * that seems to be a good compromise between doing it by hand (although more
+ * verbose it is also more reliable) and DOM.
+ *
+ * @note This code handles several different versions of DAP in a fairly
+ * crude way. I've broken it up into three different responses: DAP2, DAP3.2
+ * and DAP4.
+ *
+ * @param out Write the XML to this output sink
+ * @param constrained True if the only variables to print are those in the
+ * current projection. If true, this will also suppress printing attributes.
+ * @param blob This is an href (DAP2) or a cid (DAP3.4 and 4). The href
+ * points to the binary data; the cid is the M-MIME separator for the binary
+ * data.
+ */
+void
+DDS::print_xml_writer(ostream &out, bool constrained, const string &blob)
+{
+    XMLWriter xml("    ");
+
+    // Stamp and repeat for these sections; trying to economize is makes it
+    // even more confusing
+    if (get_dap_major() >= 4) {
+        if (xmlTextWriterStartElement(xml.get_writer(), (const xmlChar*) "Group") < 0)
+            throw InternalErr(__FILE__, __LINE__, "Could not write Group element");
+        if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "name", (const xmlChar*)d_name.c_str()) < 0)
+            throw InternalErr(__FILE__, __LINE__, "Could not write attribute for name");
+
+        if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "dapVersion", (const xmlChar*)get_dap_version().c_str()) < 0)
+            throw InternalErr(__FILE__, __LINE__, "Could not write attribute for dapVersion");
+
+        if (!get_request_xml_base().empty()) {
+            if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "xmlns:xml", (const xmlChar*)c_xml_namespace.c_str()) < 0)
+                throw InternalErr(__FILE__, __LINE__, "Could not write attribute for xmlns:xml");
+
+            if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "xml:base", (const xmlChar*)get_request_xml_base().c_str()) < 0)
+                throw InternalErr(__FILE__, __LINE__, "Could not write attribute for xml:base");
+        }
+        if (!get_namespace().empty()) {
+            if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "xmlns", (const xmlChar*)get_namespace().c_str()) < 0)
+                throw InternalErr(__FILE__, __LINE__, "Could not write attribute for xmlns");
+        }
+    }
+    else if (get_dap_major() == 3 && get_dap_minor() >= 2) {
+        if (xmlTextWriterStartElement(xml.get_writer(), (const xmlChar*) "Dataset") < 0)
+            throw InternalErr(__FILE__, __LINE__, "Could not write Dataset element");
+        if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "name", (const xmlChar*)d_name.c_str()) < 0)
+            throw InternalErr(__FILE__, __LINE__, "Could not write attribute for name");
+        if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "xmlns:xsi", (const xmlChar*)"http://www.w3.org/2001/XMLSchema-instance") < 0)
+            throw InternalErr(__FILE__, __LINE__, "Could not write attribute for xmlns:xsi");
+
+        if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "xsi:schemaLocation", (const xmlChar*)c_dap_32_n_sl.c_str()) < 0)
+            throw InternalErr(__FILE__, __LINE__, "Could not write attribute for xmlns:schemaLocation");
+
+        if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "xmlns:grddl", (const xmlChar*)"http://www.w3.org/2003/g/data-view#") < 0)
+            throw InternalErr(__FILE__, __LINE__, "Could not write attribute for xmlns:grddl");
+
+        if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "grddl:transformation", (const xmlChar*)grddl_transformation_dap32.c_str()) < 0)
+            throw InternalErr(__FILE__, __LINE__, "Could not write attribute for xmlns:transformation");
+
+        if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "xmlns", (const xmlChar*)c_dap32_namespace.c_str()) < 0)
+            throw InternalErr(__FILE__, __LINE__, "Could not write attribute for xmlns");
+        if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "xmlns:dap", (const xmlChar*)c_dap32_namespace.c_str()) < 0)
+            throw InternalErr(__FILE__, __LINE__, "Could not write attribute for xmlns:dap");
+
+        if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "dapVersion", (const xmlChar*)"3.2") < 0)
+            throw InternalErr(__FILE__, __LINE__, "Could not write attribute for dapVersion");
+
+        if (!get_request_xml_base().empty()) {
+            if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "xmlns:xml", (const xmlChar*)c_xml_namespace.c_str()) < 0)
+                throw InternalErr(__FILE__, __LINE__, "Could not write attribute for xmlns:xml");
+
+            if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "xml:base", (const xmlChar*)get_request_xml_base().c_str()) < 0)
+                throw InternalErr(__FILE__, __LINE__, "Could not write attribute for xml:base");
+        }
+    }
+    else { // dap2
+        if (xmlTextWriterStartElement(xml.get_writer(), (const xmlChar*) "Dataset") < 0)
+            throw InternalErr(__FILE__, __LINE__, "Could not write Dataset element");
+        if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "name", (const xmlChar*)d_name.c_str()) < 0)
+            throw InternalErr(__FILE__, __LINE__, "Could not write attribute for d_name");
+        if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "xmlns:xsi", (const xmlChar*)"http://www.w3.org/2001/XMLSchema-instance") < 0)
+            throw InternalErr(__FILE__, __LINE__, "Could not write attribute for xmlns:xsi");
+
+        if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "xmlns", (const xmlChar*)c_dap20_namespace.c_str()) < 0)
+            throw InternalErr(__FILE__, __LINE__, "Could not write attribute for xmlns");
+
+        if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "xsi:schemaLocation", (const xmlChar*)c_dap_20_n_sl.c_str()) < 0)
+            throw InternalErr(__FILE__, __LINE__, "Could not write attribute for xmlns:schemaLocation");
+    }
+
+    // Print the global attributes
+    d_attr.print_xml_writer(xml);
+
+    // Print each variable
+    for_each(var_begin(), var_end(), VariablePrintXMLWriter(xml, constrained));
+
+    // For DAP 3.2 and greater, use the new syntax and value. The 'blob' is
+    // the CID of the MIME part that holds the data. For DAP2 (which includes
+    // 3.0 and 3.1), the blob is an href. For DAP4, only write the CID if it's
+    // given.
+    if (get_dap_major() >= 4) {
+        if (!blob.empty()) {
+            if (xmlTextWriterStartElement(xml.get_writer(), (const xmlChar*) "blob") < 0)
+                throw InternalErr(__FILE__, __LINE__, "Could not write blob element");
+            string cid = "cid:" + blob;
+            if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "href", (const xmlChar*) cid.c_str()) < 0)
+                throw InternalErr(__FILE__, __LINE__, "Could not write attribute for d_name");
+            if (xmlTextWriterEndElement(xml.get_writer()) < 0)
+                throw InternalErr(__FILE__, __LINE__, "Could not end blob element");
+        }
+    }
+    else if (get_dap_major() == 3 && get_dap_minor() >= 2) {
+        if (xmlTextWriterStartElement(xml.get_writer(), (const xmlChar*) "blob") < 0)
+            throw InternalErr(__FILE__, __LINE__, "Could not write blob element");
+        string cid = "cid:" + blob;
+        if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "href", (const xmlChar*) cid.c_str()) < 0)
+            throw InternalErr(__FILE__, __LINE__, "Could not write attribute for d_name");
+        if (xmlTextWriterEndElement(xml.get_writer()) < 0)
+            throw InternalErr(__FILE__, __LINE__, "Could not end blob element");
+    }
+    else { // dap2
+        if (xmlTextWriterStartElement(xml.get_writer(), (const xmlChar*) "dataBLOB") < 0)
+            throw InternalErr(__FILE__, __LINE__, "Could not write dataBLOB element");
+        if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "href", (const xmlChar*) "") < 0)
+            throw InternalErr(__FILE__, __LINE__, "Could not write attribute for d_name");
+        if (xmlTextWriterEndElement(xml.get_writer()) < 0)
+            throw InternalErr(__FILE__, __LINE__, "Could not end dataBLOB element");
+    }
+
+    if (xmlTextWriterEndElement(xml.get_writer()) < 0)
+        throw InternalErr(__FILE__, __LINE__, "Could not end Dataset element");
+
+    out << xml.get_doc();// << ends;// << endl;
+}
+
+/**
+ * Print the DAP4 DMR object.
+ * This method prints the DMR. If the dap version is not >= 4.0, it's an
+ * error to call this method.
+ *
+ * @note Calling methods that print the DDS or DDX when get_dap_major()
+ * returns a value >= 4 is undefined. Use this method to get the DAP4
+ * metadata response.
+ *
+ * @param out Write the XML to this stream
+ * @param constrained Should the DMR be subject to a constraint?
+ */
+void
+DDS::print_dmr(ostream &out, bool constrained)
+{
+    if (get_dap_major() < 4)
+        throw InternalErr(__FILE__, __LINE__, "Tried to print a DMR with DAP major version less than 4");
+
+    XMLWriter xml("    ");
+
+    // DAP4 wraps a dataset in a top-level Group element.
+    if (xmlTextWriterStartElement(xml.get_writer(), (const xmlChar*) "Group") < 0)
+        throw InternalErr(__FILE__, __LINE__, "Could not write Group element");
+
+    if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "xmlns:xml",
+            (const xmlChar*) c_xml_namespace.c_str()) < 0)
+        throw InternalErr(__FILE__, __LINE__, "Could not write attribute for xmlns:xml");
+
+    if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "xmlns:xsi", (const xmlChar*) c_xml_xsi.c_str())
+            < 0)
+        throw InternalErr(__FILE__, __LINE__, "Could not write attribute for xmlns:xsi");
+
+    if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "xsi:schemaLocation",
+            (const xmlChar*) c_dap_40_n_sl.c_str()) < 0)
+        throw InternalErr(__FILE__, __LINE__, "Could not write attribute for xmlns:schemaLocation");
+
+    if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "xmlns",
+            (const xmlChar*) get_namespace().c_str()) < 0)
+        throw InternalErr(__FILE__, __LINE__, "Could not write attribute for xmlns");
+
+    if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "dapVersion",
+            (const xmlChar*) get_dap_version().c_str()) < 0)
+        throw InternalErr(__FILE__, __LINE__, "Could not write attribute for dapVersion");
+
+    if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "dmrVersion", (const xmlChar*) get_dmr_version().c_str()) < 0)
+        throw InternalErr(__FILE__, __LINE__, "Could not write attribute for dapVersion");
+
+    if (!get_request_xml_base().empty()) {
+        if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "xml:base",
+                (const xmlChar*) get_request_xml_base().c_str()) < 0)
+            throw InternalErr(__FILE__, __LINE__, "Could not write attribute for xml:base");
+    }
+
+    if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "name", (const xmlChar*) d_name.c_str()) < 0)
+        throw InternalErr(__FILE__, __LINE__, "Could not write attribute for name");
+
+    // Print the global attributes
+    d_attr.print_xml_writer(xml);
+
+    // Print each variable
+    for_each(var_begin(), var_end(), VariablePrintXMLWriter(xml, constrained));
+
+#if 0
+    // For DAP 3.2 and greater, use the new syntax and value. The 'blob' is
+    // the CID of the MIME part that holds the data. For DAP2 (which includes
+    // 3.0 and 3.1), the blob is an href. For DAP4, only write the CID if it's
+    // given.
+    if (get_dap_major() >= 4) {
+        if (!blob.empty()) {
+            if (xmlTextWriterStartElement(xml.get_writer(), (const xmlChar*) "blob") < 0)
+                throw InternalErr(__FILE__, __LINE__, "Could not write blob element");
+            string cid = "cid:" + blob;
+            if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "href", (const xmlChar*) cid.c_str()) < 0)
+                throw InternalErr(__FILE__, __LINE__, "Could not write attribute for d_name");
+            if (xmlTextWriterEndElement(xml.get_writer()) < 0)
+                throw InternalErr(__FILE__, __LINE__, "Could not end blob element");
+        }
+    }
+#endif
+
+    if (xmlTextWriterEndElement(xml.get_writer()) < 0)
+        throw InternalErr(__FILE__, __LINE__, "Could not end the top-level Group element");
+
+    out << xml.get_doc();
+}
+
+// Used by DDS::send() when returning data from a function call.
+/** @brief Check the semantics of each of the variables represented in the
+    DDS.
+
+    Check the semantics of the DDS describing a complete dataset. If ALL is
+    true, check not only the semantics of THIS->TABLE, but also recursively
+    all ctor types in the THIS->TABLE. By default, ALL is false since parsing
+    a DDS input file runs semantic checks on all variables (but not the
+    dataset itself.
+
+    @return TRUE if the conventions for the DDS are not violated, FALSE
+    otherwise.
+    @param all If true, recursively check the individual members of
+    compound variables.
+    @see BaseType::check_semantics */
+bool
+DDS::check_semantics(bool all)
+{
+    // The dataset must have a d_name
+    if (d_name == "") {
+        cerr << "A dataset must have a d_name" << endl;
+        return false;
+    }
+
+    string msg;
+    if (!unique_names(vars, d_name, "Dataset", msg))
+        return false;
+
+    if (all)
+        for (Vars_iter i = vars.begin(); i != vars.end(); i++)
+            if (!(*i)->check_semantics(msg, true))
+                return false;
+
+    return true;
+}
+
+/** @brief Mark the <tt>send_p</tt> flag of the named variable to
+    <i>state</i>.
+
+    Mark the named variable by setting its SEND_P flag to STATE (true
+    indicates that it is to be sent). Names must be fully qualified.
+
+    @note For aggregate types this sets each part to STATE when STATE is
+    True. Thus, if State is True and N is `exp1.test', then both `exp1' and
+    `test' have their SEND_P flag set to True. If STATE is False, then the
+    SEND_P flag of the `test' is set to False, but `exp1' is left
+    unchanged. This means that a single variable can be removed from the
+    current projection without removing all the other children of its
+    parent. See the mfunc set_send_p().
+
+    @return True if the named variable was found, false otherwise.
+
+    @todo This should throw an exception on error!!!
+
+    @todo These methods that use the btp_stack to keep track of the path from
+    the top of a dataset to a particular variable can be rewritten to use the
+    parent field instead.
+
+    @todo All the methods that use names to identify variables should have
+    counterparts that take BaseType pointers.
+*/
+bool
+DDS::mark(const string &n, bool state)
+{
+    // TODO use auto_ptr
+    BaseType::btp_stack *s = new BaseType::btp_stack;
+
+    DBG2(cerr << "DDS::mark: Looking for " << n << endl);
+
+    BaseType *variable = var(n, s);
+    if (!variable) {
+        DBG2(cerr << "Could not find variable " << n << endl);
+        delete s; s = 0;
+        return false;
+    }
+    variable->set_send_p(state);
+
+    DBG2(cerr << "DDS::mark: Set variable " << variable->d_name()
+            << " (a " << variable->type_name() << ")" << endl);
+
+    // Now check the btp_stack and run BaseType::set_send_p for every
+    // BaseType pointer on the stack. Using BaseType::set_send_p() will
+    // set the property for a Constructor but not its contained variables
+    // which preserves the semantics of projecting just one field.
+    while (!s->empty()) {
+        s->top()->BaseType::set_send_p(state);
+
+        DBG2(cerr << "DDS::mark: Set variable " << s->top()->d_name()
+                << " (a " << s->top()->type_name() << ")" << endl);
+        // FIXME get_parent() hosed?
+#if 1
+        string parent_name = (s->top()->get_parent()) ? s->top()->get_parent()->name(): "none";
+        string parent_type = (s->top()->get_parent()) ? s->top()->get_parent()->type_name(): "none";
+        DBG2(cerr << "DDS::mark: Parent variable " << parent_name << " (a " << parent_type << ")" << endl);
+#endif
+        s->pop();
+    }
+
+    delete s ; s = 0;
+
+    return true;
+}
+
+/** Mark the member variable <tt>send_p</tt> flags to
+    <i>state</i>.
+
+    @return Void
+*/
+void
+DDS::mark_all(bool state)
+{
+    for (Vars_iter i = vars.begin(); i != vars.end(); i++)
+        (*i)->set_send_p(state);
+}
+
+/** @brief dumps information about this object
+ *
+ * Displays the pointer value of this instance and then calls parent dump
+ *
+ * @param strm C++ i/o stream to dump the information to
+ * @return void
+ */
+void
+DDS::dump(ostream &strm) const
+{
+    strm << DapIndent::LMarg << "DDS::dump - ("
+    << (void *)this << ")" << endl ;
+    DapIndent::Indent() ;
+    strm << DapIndent::LMarg << "d_name: " << d_name << endl ;
+    strm << DapIndent::LMarg << "filename: " << d_filename << endl ;
+    strm << DapIndent::LMarg << "protocol major: " << d_dap_major << endl;
+    strm << DapIndent::LMarg << "protocol minor: " << d_dap_minor << endl;
+    strm << DapIndent::LMarg << "factory: " << (void *)d_factory << endl ;
+
+    strm << DapIndent::LMarg << "global attributes:" << endl ;
+    DapIndent::Indent() ;
+    d_attr.dump(strm) ;
+    DapIndent::UnIndent() ;
+
+    if (vars.size()) {
+        strm << DapIndent::LMarg << "vars:" << endl ;
+        DapIndent::Indent() ;
+        Vars_citer i = vars.begin() ;
+        Vars_citer ie = vars.end() ;
+        for (; i != ie; i++) {
+            (*i)->dump(strm) ;
+        }
+        DapIndent::UnIndent() ;
+    }
+    else {
+        strm << DapIndent::LMarg << "vars: none" << endl ;
+    }
+
+    DapIndent::UnIndent() ;
+}
+
+} // namespace libdap
diff --git a/DDS.h b/DDS.h
new file mode 100644
index 0000000..340f2b4
--- /dev/null
+++ b/DDS.h
@@ -0,0 +1,388 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1994-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// Provide access to the DDS. This class is used to parse DDS text files, to
+// produce a printed representation of the in-memory variable table, and to
+// update the table on a per-variable basis.
+//
+// jhrg 9/8/94
+
+#ifndef _dds_h
+#define _dds_h 1
+
+#include <cstdio>
+#include <iostream>
+#include <string>
+#include <vector>
+
+#ifndef _basetype_h
+#include "BaseType.h"
+#endif
+
+#ifndef _constructor_h
+#include "Constructor.h"
+#endif
+
+#ifndef base_type_factory_h
+#include "BaseTypeFactory.h"
+#endif
+
+#ifndef _das_h
+#include "DAS.h"
+#endif
+
+#ifndef A_DapObj_h
+#include "DapObj.h"
+#endif
+
+#ifndef KEYWORDS_H_
+#include "Keywords2.h"
+#endif
+
+#ifndef XMLWRITER_H_
+#include "XMLWriter.h"
+#endif
+
+using std::cout;
+
+namespace libdap
+{
+
+/** The DAP2 Data Descriptor Object (DDS) is a data structure used by
+    the DAP2 software to describe datasets and subsets of those
+    datasets.  The DDS may be thought of as the declarations for the
+    data structures that will hold data requested by some DAP2 client.
+    Part of the job of a DAP2 server is to build a suitable DDS for a
+    specific dataset and to send it to the client.  Depending on the
+    data access API in use, this may involve reading part of the
+    dataset and inferring the DDS.  Other APIs may require the server
+    simply to read some ancillary data file with the DDS in it.
+
+    On the server side, in addition to the data declarations, the DDS
+    holds the clauses of any constraint expression that may have
+    accompanied the data request from the DAP2 client.  The DDS object
+    includes methods for modifying the DDS according to the given
+    constraint expression.  It also has methods for directly modifying
+    a DDS, and for transmitting it from a server to a client.
+
+    For the client, the DDS object includes methods for reading the
+    persistent form of the object sent from a server. This includes parsing
+    the ASCII representation of the object and, possibly, reading data
+    received from a server into a data object.
+
+    Note that the class DDS is used to instantiate both DDS and DataDDS
+    objects. A DDS that is empty (contains no actual data) is used by servers
+    to send structural information to the client. The same DDS can becomes a
+    DataDDS when data values are bound to the variables it defines.
+
+    For a complete description of the DDS layout and protocol, please
+    refer to <i>The OPeNDAP User Guide</i>.
+
+    The DDS has an ASCII representation, which is what is transmitted
+    from a DAP2 server to a client.  Here is the DDS representation of
+    an entire dataset containing a time series of worldwide grids of
+    sea surface temperatures:
+
+    <pre>
+    Dataset {
+        Float64 lat[lat = 180];
+        Float64 lon[lon = 360];
+        Float64 time[time = 404];
+        Grid {
+         ARRAY:
+            Int32 sst[time = 404][lat = 180][lon = 360];
+         MAPS:
+            Float64 time[time = 404];
+            Float64 lat[lat = 180];
+            Float64 lon[lon = 360];
+        } sst;
+    } weekly;
+    </pre>
+
+    If the data request to this dataset includes a constraint
+    expression, the corresponding DDS might be different.  For
+    example, if the request was only for northern hemisphere data
+    at a specific time, the above DDS might be modified to appear like
+    this:
+
+    <pre>
+    Dataset {
+        Grid {
+         ARRAY:
+            Int32 sst[time = 1][lat = 90][lon = 360];
+         MAPS:
+            Float64 time[time = 1];
+            Float64 lat[lat = 90];
+            Float64 lon[lon = 360];
+        } sst;
+    } weekly;
+    </pre>
+
+    Since the constraint has narrowed the area of interest, the range
+    of latitude values has been halved, and there is only one time
+    value in the returned array.  Note that the simple arrays (<tt>lat</tt>,
+    <tt>lon</tt>, and <tt>time</tt>) described in the dataset are also
+    part of the <tt>sst</tt> Grid object.  They can be requested by
+    themselves or as part of that larger object.
+
+    See the <i>The OPeNDAP User Guide</i>, or the documentation of the
+    BaseType class for descriptions of the DAP2 data types.
+
+    @note Make sure to pass a valid pointer to the DDS constructor or use
+    the set_factory() method before actually using the DDS. Also make sure
+    that the Factory's lifetime thereafter is the same as the DDS's. Never
+    delete the factory until you're done using the DDS.
+
+    @note Update: I removed the DEFAULT_BASETYPE_FACTORY switch because it
+    caused more confusion than it avoided. See Trac #130. jhrg
+
+    @note The compile-time symbol DEFAULT_BASETYPE_FACTORY controls whether
+    the old (3.4 and earlier) DDS and DataDDS constructors are supported.
+    These constructors now use a default factory class (BaseTypeFactory,
+    implemented by this library) to instantiate Byte, ..., Grid variables. To
+    use the default ctor in your code you must also define this symbol. If
+    you \e do choose to define this and fail to provide a specialization of
+    BaseTypeFactory when your software needs one, you code may not link or
+    may fail at run time. In addition to the older ctors for DDS and DataDDS,
+    defining the symbol also makes some of the older methods in Connect
+    available (because those methods require the older DDS and DataDDS ctors.
+
+    @see BaseType
+    @see DAS */
+
+class DDS : public DapObj
+{
+private:
+    BaseTypeFactory *d_factory;
+
+    string d_name;                // The dataset d_name
+    string d_filename;		    // File d_name (or other OS identifier) for
+    string d_container_name;	// d_name of container structure
+    Structure *d_container; 	// current container for container d_name
+				                // dataset or part of dataset.
+
+    int d_dap_major;       	    // The protocol major version number
+    int d_dap_minor;       	    // ... and minor version number
+    string d_dap_version; 	    // String version of the protocol
+    string d_request_xml_base;
+    string d_namespace;
+
+    AttrTable d_attr;           // Global attributes.
+
+    vector<BaseType *> vars;    // Variables at the top level
+
+    int d_timeout;              // alarm time in seconds. If greater than
+                                // zero, raise the alarm signal if more than
+                                // d_timeout seconds are spent reading data.
+    Keywords d_keywords;	    // Holds keywords parsed from the CE
+
+    long d_max_response_size;   // In bytes...
+
+    friend class DDSTest;
+
+protected:
+    void duplicate(const DDS &dds);
+    BaseType *leaf_match(const string &name, BaseType::btp_stack *s = 0);
+    BaseType *exact_match(const string &name, BaseType::btp_stack *s = 0);
+
+public:
+    typedef std::vector<BaseType *>::const_iterator Vars_citer ;
+    typedef std::vector<BaseType *>::iterator Vars_iter ;
+    typedef std::vector<BaseType *>::reverse_iterator Vars_riter ;
+
+    DDS(BaseTypeFactory *factory, const string &name = "");
+    DDS(BaseTypeFactory *factory, const string &name, const string &version);
+    DDS(const DDS &dds);
+
+    virtual ~DDS();
+
+    DDS & operator=(const DDS &rhs);
+
+    virtual void transfer_attributes(DAS *das);
+
+    string get_dataset_name() const;
+    void set_dataset_name(const string &n);
+
+    /** Return the factory which makes instances of the Byte, ..., Grid
+        type classes. Specialize BaseTypeFactory so that a DDS will be
+        populated with your client or server's specialized types.
+        @return An instance of BaseTypeFactory. */
+    BaseTypeFactory *get_factory() const
+    {
+        return d_factory;
+    }
+
+    /** Set the factory class used to instantiate variables during the
+        parse of a DDS.
+        @param factory The factory this DDS should use. Caller must free
+        factory when done with this DDS.
+        @return The old factory.
+        @see BaseTypeFactory */
+    BaseTypeFactory *set_factory(BaseTypeFactory *factory)
+    {
+        BaseTypeFactory *t = d_factory;
+        d_factory = factory;
+        return t;
+    }
+
+    virtual AttrTable &get_attr_table();
+
+    string filename() const;
+    void filename(const string &fn);
+
+    /// Get the DAP major version as sent by the client
+    int get_dap_major() const { return d_dap_major; }
+    /// Get the DAP minor version as sent by the client
+    int get_dap_minor() const { return d_dap_minor; }
+
+    void set_dap_version(const string &version_string = "2.0");
+    string get_dap_version() const { return d_dap_version; }
+    string get_dmr_version() const { return "1.0"; }
+
+    /// @deprecated
+    void set_dap_major(int p);
+    /// @deprecated
+    void set_dap_minor(int p);
+    /// @deprecated
+    void set_dap_version(double d);
+
+    Keywords &get_keywords() { return d_keywords; }
+
+    /// Get the URL that will return this DDS/DDX/DataThing
+    string get_request_xml_base() const { return d_request_xml_base; }
+
+    /// @see get_request_xml_base
+    void set_request_xml_base(const string &xb) { d_request_xml_base = xb; }
+
+    /// Get the namespace associated with the DDS - likely set only by DDX responses
+    string get_namespace() const { return d_namespace; }
+
+    /// Set the namespace for this DDS/DDX object/response
+    void set_namespace(const string &ns) { d_namespace = ns; }
+
+    /// Get the maximum response size, in KB. Zero indicates no limit.
+    long get_response_limit() { return d_max_response_size; }
+
+    /** Set the maximum response size. Zero is the default value. The size
+        is given in kilobytes.
+        @param size The maximum size of the response in kilobytes. */
+    void set_response_limit(long size) { d_max_response_size = size * 1024; }
+
+    /// Get the estimated response size.
+    int get_request_size(bool constrained);
+
+    string container_name() ;
+    void container_name( const string &cn ) ;
+    Structure *container() ;
+
+    void add_var(BaseType *bt);
+    void add_var_nocopy(BaseType *bt);
+
+    /// Removes a variable from the DDS.
+    void del_var(const string &n);
+
+    BaseType *var(const string &n, BaseType::btp_stack &s);
+    BaseType *var(const string &n, BaseType::btp_stack *s = 0);
+    int num_var();
+
+    /// Return an iterator to the first variable
+    Vars_iter var_begin();
+#if 0
+    /// Return a const iterator.
+    Vars_citer var_cbegin() const { return vars.cbegin(); }
+#endif
+    /// Return a reverse iterator
+    Vars_riter var_rbegin();
+    /// Return an iterator
+    Vars_iter var_end();
+#if 0
+    /// Return a const iterator
+    Vars_citer var_cend() const { return vars.cend(); }
+#endif
+    /// Return a reverse iterator
+    Vars_riter var_rend();
+    /// Get an iterator
+    Vars_iter get_vars_iter(int i);
+    /// Get a variable
+    BaseType *get_var_index(int i);
+    /// Insert a variable before the referenced element
+    void insert_var(Vars_iter i, BaseType *ptr);
+    void insert_var_nocopy(Vars_iter i, BaseType *ptr);
+    /// Removes a variable from the DDS.
+    void del_var(Vars_iter i);
+    /// Removes a range of variables from the DDS.
+    void del_var(Vars_iter i1, Vars_iter i2);
+
+    /** @name DDS_timeout
+     *  Old deprecated DDS timeout code
+     *  @deprecated
+     */
+    ///@{
+    void timeout_on();
+    void timeout_off();
+    void set_timeout(int t);
+    int get_timeout();
+    //@}
+
+    // These parse the DAP2 curly-brace document and make a C++ object.
+    void parse(string fname);
+    void parse(int fd);
+    void parse(FILE *in = stdin);
+
+    // These print the Binary object in either the curly-brace or XML reps
+    void print(FILE *out);
+    void print_constrained(FILE *out);
+    void print_xml(FILE *out, bool constrained, const string &blob = "");
+
+    // Same as above, but using C++ i/o streams
+    void print(ostream &out);
+    void print_constrained(ostream &out);
+    void print_xml(ostream &out, bool constrained, const string &blob = "");
+
+    // Print the XML using libxml2; the other print_xml methods use this impl.
+    void print_xml_writer(ostream &out, bool constrained, const string &blob = "");
+
+    // Print the DAP4 DMR 'object'
+    void print_dmr(ostream &out, bool constrained);
+
+    void print_das(ostream &out);
+
+    void mark_all(bool state);
+    bool mark(const string &name, bool state);
+    bool check_semantics(bool all = false);
+
+    void tag_nested_sequences();
+
+    virtual void dump(ostream &strm) const ;
+};
+
+} // namespace libdap
+
+#endif // _dds_h
diff --git a/DDXExceptions.h b/DDXExceptions.h
new file mode 100644
index 0000000..0a63ac0
--- /dev/null
+++ b/DDXExceptions.h
@@ -0,0 +1,49 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#ifndef ddx_exceptions_h
+#define ddx_exceptions_h
+
+#ifndef _error_h
+#include "Error.h"
+#endif
+
+namespace libdap
+{
+
+/** Thrown when the DDX response cannot be parsed.. */
+class DDXParseFailed : public Error
+{
+public:
+    DDXParseFailed() : Error("The DDX response document parse failed.")
+    {}
+    DDXParseFailed(const string &msg) :
+            Error(string("The DDX response document parse failed: ") + msg)
+    {}
+};
+
+} // namespace libdap
+
+#endif // ddx_exceptions_h
diff --git a/DDXParserSAX2.cc b/DDXParserSAX2.cc
new file mode 100644
index 0000000..be364df
--- /dev/null
+++ b/DDXParserSAX2.cc
@@ -0,0 +1,1254 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#include "config.h"
+
+//#define DODS_DEBUG 1
+//#define DODS_DEBUG2 1
+
+#include <cstring>
+#include <cstdarg>
+
+#include "BaseType.h"
+#include "Byte.h"
+#include "Int16.h"
+#include "UInt16.h"
+#include "Int32.h"
+#include "UInt32.h"
+#include "Float32.h"
+#include "Float64.h"
+#include "Str.h"
+#include "Url.h"
+#include "Array.h"
+#include "Structure.h"
+#include "Sequence.h"
+#include "Grid.h"
+
+#include "DDXParserSAX2.h"
+
+#include "util.h"
+#include "mime_util.h"
+#include "debug.h"
+
+namespace libdap {
+
+#if defined(DODS_DEBUG) || defined(DODS_DEUG2)
+static const char *states[] =
+    {
+        "start",
+
+        "dataset",
+
+        "attribute_container",
+        "attribute",
+        "attribute_value",
+        "other_xml_attribute",
+
+        "alias",
+
+        "simple_type",
+
+        "array",
+        "dimension",
+
+        "grid",
+        "map",
+
+        "structure",
+        "sequence",
+
+        "blob href",
+
+        "unknown",
+        "error"
+    };
+#endif
+// Glue the BaseTypeFactory to the enum-based factory defined statically
+// here.
+
+BaseType *DDXParser::factory(Type t, const string & name)
+{
+    switch (t) {
+    case dods_byte_c:
+        return d_factory->NewByte(name);
+        break;
+
+    case dods_int16_c:
+        return d_factory->NewInt16(name);
+        break;
+
+    case dods_uint16_c:
+        return d_factory->NewUInt16(name);
+        break;
+
+    case dods_int32_c:
+        return d_factory->NewInt32(name);
+        break;
+
+    case dods_uint32_c:
+        return d_factory->NewUInt32(name);
+        break;
+
+    case dods_float32_c:
+        return d_factory->NewFloat32(name);
+        break;
+
+    case dods_float64_c:
+        return d_factory->NewFloat64(name);
+        break;
+
+    case dods_str_c:
+        return d_factory->NewStr(name);
+        break;
+
+    case dods_url_c:
+        return d_factory->NewUrl(name);
+        break;
+
+    case dods_array_c:
+        return d_factory->NewArray(name);
+        break;
+
+    case dods_structure_c:
+        return d_factory->NewStructure(name);
+        break;
+
+    case dods_sequence_c:
+        return d_factory->NewSequence(name);
+        break;
+
+    case dods_grid_c:
+        return d_factory->NewGrid(name);
+        break;
+
+    default:
+        return 0;
+    }
+}
+
+static bool is_not(const char *name, const char *tag)
+{
+    return strcmp(name, tag) != 0;
+}
+
+void DDXParser::set_state(DDXParser::ParseState state)
+{
+    s.push(state);
+}
+
+DDXParser::ParseState DDXParser::get_state() const
+{
+    return s.top();
+}
+
+void DDXParser::pop_state()
+{
+    s.pop();
+}
+
+/** Dump XML attributes to local store so they can be easily manipulated.
+    Attribute names are always folded to lower case.
+    @param attrs The XML attribute array */
+void DDXParser::transfer_xml_attrs(const xmlChar **attributes, int nb_attributes)
+{
+    if (!attribute_table.empty())
+        attribute_table.clear(); // erase old attributes
+
+    unsigned int index = 0;
+    for (int i = 0; i < nb_attributes; ++i, index += 5) {
+        // Make a value using the attribute name and the prefix, namespace URI
+        // and the value. The prefix might be null.
+        attribute_table.insert(map<string, XMLAttribute>::value_type(
+                string((const char *)attributes[index]),
+                XMLAttribute(attributes + index + 1)));
+
+        DBG(cerr << "Attribute '" << (const char *)attributes[index] << "': "
+                << attribute_table[(const char *)attributes[index]].value << endl);
+    }
+}
+
+void DDXParser::transfer_xml_ns(const xmlChar **namespaces, int nb_namespaces)
+{
+    for (int i = 0; i < nb_namespaces; ++i ) {
+        // make a value with the prefix and namespace URI. The prefix might be
+        // null.
+        namespace_table.insert(map<string,string>::value_type(
+                namespaces[i*2] != 0 ? (const char *)namespaces[i*2] : "",
+                (const char *)namespaces[i*2+1]));
+    }
+}
+
+/** Is an attribute present? Attribute names are always lower case.
+    @note To use this method, first call transfer_xml_attrs.
+    @param attr The XML attribute
+    @return True if the XML attribute was present in the last tag */
+bool DDXParser::check_required_attribute(const string & attr)
+{
+    map < string, XMLAttribute >::iterator i = attribute_table.find(attr);
+    if (i == attribute_table.end())
+        ddx_fatal_error(this, "Required attribute '%s' not found.",
+                        attr.c_str());
+    return true;
+}
+
+/** Is an attribute present? Attribute names are always lower case.
+    @note To use this method, first call transfer_xml_attrs.
+    @param attr The XML attribute
+    @return True if the XML attribute was present in the last/current tag,
+    false otherwise. */
+bool DDXParser::check_attribute(const string & attr)
+{
+    return (attribute_table.find(attr) != attribute_table.end());
+}
+
+/** Given that an \c Attribute tag has just been read, determine whether the
+    element is a container or a simple type, set the state and, for a simple
+    type record the type and name for use when \c value elements are found.
+
+    @note Modified to discriminate between OtherXML and the older DAP2.0
+    attribute types (container, Byte, ...).
+
+    @param attrs The array of XML attribute values */
+void DDXParser::process_attribute_element(const xmlChar **attrs, int nb_attributes)
+{
+    // These methods set the state to parser_error if a problem is found.
+    transfer_xml_attrs(attrs, nb_attributes);
+
+    bool error = !(check_required_attribute(string("name"))
+                   && check_required_attribute(string("type")));
+    if (error)
+        return;
+
+    if (attribute_table["type"].value == "Container") {
+        set_state(inside_attribute_container);
+
+        AttrTable *child;
+        AttrTable *parent = at_stack.top();
+
+        child = parent->append_container(attribute_table["name"].value);
+        at_stack.push(child);   // save.
+        DBG2(cerr << "Pushing at" << endl);
+    }
+    else if (attribute_table["type"].value == "OtherXML") {
+        set_state(inside_other_xml_attribute);
+
+        dods_attr_name = attribute_table["name"].value;
+        dods_attr_type = attribute_table["type"].value;
+    }
+    else {
+        set_state(inside_attribute);
+        // *** Modify parser. Add a special state for inside OtherXML since it
+        // does not use the <value> element.
+
+        dods_attr_name = attribute_table["name"].value;
+        dods_attr_type = attribute_table["type"].value;
+    }
+}
+
+/** Given that an \c Alias tag has just been read, set the state and process
+    the alias.
+    @param attrs The XML attribute array */
+void DDXParser::process_attribute_alias(const xmlChar **attrs, int nb_attributes)
+{
+    transfer_xml_attrs(attrs, nb_attributes);
+    if (check_required_attribute(string("name"))
+        && check_required_attribute(string("attribute"))) {
+        set_state(inside_alias);
+        at_stack.top()->attr_alias(attribute_table["name"].value,
+                                   attribute_table["attribute"].value);
+    }
+}
+
+/** Given that a tag which opens a variable declaration has just been read,
+    create the variable. Once created, push the variable onto the stack of
+    variables, push that variables attribute table onto the attribute table
+    stack and update the state of the parser.
+    @param t The type of variable to create.
+    @param s The next state of the parser.
+    @param attrs the attributes read with the tag */
+void DDXParser::process_variable(Type t, ParseState s, const xmlChar **attrs,
+        int nb_attributes)
+{
+    transfer_xml_attrs(attrs, nb_attributes);
+
+    set_state(s);
+
+    if (bt_stack.top()->type() == dods_array_c
+            || check_required_attribute("name")) { // throws on error/false
+        BaseType *btp = factory(t, attribute_table["name"].value);
+        if (!btp) {
+            ddx_fatal_error(this, "Internal parser error; could not instantiate the variable '%s'.",
+                attribute_table["name"].value.c_str());
+        }
+        else {
+            // Only run this code if btp is not null! jhrg 9/14/15
+            // Once we make the new variable, we not only load it on to the
+            // BaseType stack, we also load its AttrTable on the AttrTable stack.
+            // The attribute processing software always operates on the AttrTable
+            // at the top of the AttrTable stack (at_stack).
+            bt_stack.push(btp);
+            at_stack.push(&btp->get_attr_table());
+        }
+    }
+}
+
+/** Given that a \c dimension tag has just been read, add that information to
+    the array on the top of the BaseType stack.
+    @param attrs The XML attributes included in the \c dimension tag */
+void DDXParser::process_dimension(const xmlChar **attrs, int nb_attributes)
+{
+    transfer_xml_attrs(attrs, nb_attributes);
+    if (check_required_attribute(string("size"))) {
+        set_state(inside_dimension);
+        Array *ap = dynamic_cast < Array * >(bt_stack.top());
+		if (!ap) {
+			ddx_fatal_error(this, "Parse error: Expected an array variable.");
+			return;
+		}
+		
+        ap->append_dim(atoi(attribute_table["size"].value.c_str()),
+                       attribute_table["name"].value);
+    }
+}
+
+/** Given that a \c blob tag has just been read, extract and save the CID
+    included in the element. */
+void DDXParser::process_blob(const xmlChar **attrs, int nb_attributes)
+{
+    transfer_xml_attrs(attrs, nb_attributes);
+    if (check_required_attribute(string("href"))) {
+        set_state(inside_blob_href);
+        *blob_href = attribute_table["href"].value;
+    }
+}
+
+/** Check to see if the current tag is either an \c Attribute or an \c Alias
+    start tag. This method is a glorified macro...
+
+    @param name The start tag name
+    @param attrs The tag's XML attributes
+    @return True if the tag was an \c Attribute or \c Alias tag */
+inline bool
+DDXParser::is_attribute_or_alias(const char *name, const xmlChar **attrs,
+        int nb_attributes)
+{
+    if (strcmp(name, "Attribute") == 0) {
+        process_attribute_element(attrs, nb_attributes);
+        // next state: inside_attribtue or inside_attribute_container
+        return true;
+    }
+    else if (strcmp(name, "Alias") == 0) {
+        process_attribute_alias(attrs, nb_attributes);
+        // next state: inside_alias
+        return true;
+    }
+
+    return false;
+}
+
+/** Check to see if the current tag is the start of a variable declaration.
+    If so, process it. A glorified macro...
+    @param name The start tag name
+    @param attrs The tag's XML attributes
+    @return True if the tag was a variable tag */
+inline bool DDXParser::is_variable(const char *name, const xmlChar **attrs,
+        int nb_attributes)
+{
+    Type t = get_type(name);
+    //if ((t = is_simple_type(name)) != dods_null_c) {
+    if (is_simple_type(t)) {
+        process_variable(t, inside_simple_type, attrs, nb_attributes);
+        return true;
+    }
+    else if (strcmp(name, "Array") == 0) {
+        process_variable(dods_array_c, inside_array, attrs, nb_attributes);
+        return true;
+    }
+    else if (strcmp(name, "Structure") == 0) {
+        process_variable(dods_structure_c, inside_structure, attrs, nb_attributes);
+        return true;
+    }
+    else if (strcmp(name, "Sequence") == 0) {
+        process_variable(dods_sequence_c, inside_sequence, attrs, nb_attributes);
+        return true;
+    }
+    else if (strcmp(name, "Grid") == 0) {
+        process_variable(dods_grid_c, inside_grid, attrs, nb_attributes);
+        return true;
+    }
+
+    return false;
+}
+
+void DDXParser::finish_variable(const char *tag, Type t, const char *expected)
+{
+    if (strcmp(tag, expected) != 0) {
+        DDXParser::ddx_fatal_error(this,
+                                   "Expected an end tag for a %s; found '%s' instead.",
+                                   expected, tag);
+        return;
+    }
+
+    pop_state();
+
+    BaseType *btp = bt_stack.top();
+
+    bt_stack.pop();
+    at_stack.pop();
+
+    if (btp->type() != t) {
+        DDXParser::ddx_fatal_error(this,
+                                   "Internal error: Expected a %s variable.",
+                                   expected);
+        delete btp;
+        return;
+    }
+    // Once libxml2 validates, this can go away. 05/30/03 jhrg
+    if (t == dods_array_c
+        && static_cast<Array*>(btp)->dimensions() == 0) {
+        DDXParser::ddx_fatal_error(this,
+                                   "No dimension element included in the Array '%s'.",
+                                   btp->name().c_str());
+        delete btp;
+        return;
+    }
+
+    BaseType *parent = bt_stack.top();
+
+    if (!(parent->is_vector_type() || parent->is_constructor_type())) {
+        DDXParser::ddx_fatal_error(this,
+                                   "Tried to add the array variable '%s' to a non-constructor type (%s %s).",
+                                   tag,
+                                   bt_stack.top()->type_name().c_str(),
+                                   bt_stack.top()->name().c_str());
+        delete btp;
+        return;
+    }
+
+    parent->add_var_nocopy(btp);
+}
+
+/** @name SAX Parser Callbacks
+
+    These methods are declared static in the class header. This gives them C
+    linkage which allows them to be used as callbacks by the SAX parser
+    engine. */
+//@{
+
+/** Initialize the SAX parser state object. This object is passed to each
+    callback as a void pointer. The initial state is parser_start.
+
+    @param p The SAX parser  */
+void DDXParser::ddx_start_document(void * p)
+{
+    DDXParser *parser = static_cast<DDXParser*>(p);
+    parser->error_msg = "";
+    parser->char_data = "";
+
+    // init attr table stack.
+    parser->at_stack.push(&parser->dds->get_attr_table());
+
+    // Trick; DDS *should* be a child of Structure. To simplify parsing,
+    // stuff a Structure on the bt_stack and dump the top level variables
+    // there. Once we're done, transfer the variables to the DDS.
+    parser->bt_stack.push(new Structure("dummy_dds"));
+
+    parser->set_state(parser_start);
+
+    DBG2(cerr << "Parser state: " << states[parser->get_state()] << endl);
+}
+
+/** Clean up after finishing a parse.
+    @param p The SAX parser  */
+void DDXParser::ddx_end_document(void * p)
+{
+    DDXParser *parser = static_cast<DDXParser*>(p);
+    DBG2(cerr << "Ending state == " << states[parser->get_state()] <<
+         endl);
+
+    if (parser->get_state() != parser_start)
+        DDXParser::ddx_fatal_error(parser, "The document contained unbalanced tags.");
+
+    // If we've found any sort of error, don't make the DDX; intern() will
+    // take care of the error.
+    if (parser->get_state() == parser_error) {
+        return;
+    }
+
+    // Pop the temporary Structure off the stack and transfer its variables
+    // to the DDS.
+    Constructor *cp = dynamic_cast < Constructor * >(parser->bt_stack.top());
+    if (!cp) {
+        delete parser->bt_stack.top();
+        parser->bt_stack.pop();
+    	ddx_fatal_error(parser, "Parse error: Expected a Structure, Sequence or Grid variable.");
+		return;
+    }
+
+    for (Constructor::Vars_iter i = cp->var_begin(); i != cp->var_end(); ++i) {
+        (*i)->set_parent(0);        // top-level vars have no parents
+        parser->dds->add_var(*i);
+    }
+
+    delete parser->bt_stack.top();
+    parser->bt_stack.pop();
+}
+
+void DDXParser::ddx_sax2_start_element(void *p,
+        const xmlChar *l, const xmlChar *prefix, const xmlChar *URI,
+        int nb_namespaces, const xmlChar **namespaces,
+        int nb_attributes, int /*nb_defaulted*/, const xmlChar **attributes)
+{
+    DDXParser *parser = static_cast<DDXParser*>(p);
+    const char *localname = (const char *)l;
+
+    DBG2(cerr << "start element: " << localname << ", states: "
+         << states[parser->get_state()]);
+
+    switch (parser->get_state()) {
+    case parser_start:
+        if (strcmp(localname, "Dataset") == 0) {
+            parser->set_state(inside_dataset);
+            parser->root_ns = URI != 0 ? (const char *)URI: "";
+            parser->transfer_xml_attrs(attributes, nb_attributes);
+
+            if (parser->check_required_attribute(string("name")))
+                parser->dds->set_dataset_name(parser->attribute_table["name"].value);
+
+            if (parser->check_attribute("dapVersion"))
+                parser->dds->set_dap_version(parser->attribute_table["dapVersion"].value);
+        }
+        else
+            DDXParser::ddx_fatal_error(parser,
+                                       "Expected response to start with a Dataset element; found '%s' instead.",
+                                       localname);
+        break;
+
+    case inside_dataset:
+        if (parser->is_attribute_or_alias(localname, attributes, nb_attributes))
+            break;
+        else if (parser->is_variable(localname, attributes, nb_attributes))
+            break;
+        else if (strcmp(localname, "blob") == 0 || strcmp(localname, "dataBLOB") == 0) {
+            parser->process_blob(attributes, nb_attributes);
+            // next state: inside_data_blob
+        }
+        else
+            DDXParser::ddx_fatal_error(parser,
+                                       "Expected an Attribute, Alias or variable element; found '%s' instead.",
+                                       localname);
+        break;
+
+    case inside_attribute_container:
+        if (parser->is_attribute_or_alias(localname, attributes, nb_attributes))
+            break;
+        else
+            DDXParser::ddx_fatal_error(parser,
+                                       "Expected an Attribute or Alias element; found '%s' instead.",
+                                       localname);
+        break;
+
+    case inside_attribute:
+        if (parser->is_attribute_or_alias(localname, attributes, nb_attributes))
+            break;
+        else if (strcmp(localname, "value") == 0)
+            parser->set_state(inside_attribute_value);
+        else
+            ddx_fatal_error(parser,
+                            "Expected an 'Attribute', 'Alias' or 'value' element; found '%s' instead.",
+                            localname);
+        break;
+
+    case inside_attribute_value:
+        ddx_fatal_error(parser,
+                        "Internal parser error; unexpected state, inside value while processing element '%s'.",
+                        localname);
+        break;
+
+    case inside_other_xml_attribute:
+        DBGN(cerr << endl << "\t inside_other_xml_attribute: " << localname << endl);
+
+        parser->other_xml_depth++;
+
+        // Accumulate the elements here
+
+        parser->other_xml.append("<");
+        if (prefix) {
+            parser->other_xml.append((const char *)prefix);
+            parser->other_xml.append(":");
+        }
+        parser->other_xml.append(localname);
+
+        if (nb_namespaces != 0) {
+            parser->transfer_xml_ns(namespaces, nb_namespaces);
+
+            for (map<string,string>::iterator i = parser->namespace_table.begin();
+                i != parser->namespace_table.end();
+                ++i) {
+                parser->other_xml.append(" xmlns");
+                if (!i->first.empty()) {
+                    parser->other_xml.append(":");
+                    parser->other_xml.append(i->first);
+                }
+                parser->other_xml.append("=\"");
+                parser->other_xml.append(i->second);
+                parser->other_xml.append("\"");
+            }
+        }
+
+        if (nb_attributes != 0) {
+            parser->transfer_xml_attrs(attributes, nb_attributes);
+            for (XMLAttrMap::iterator i = parser->attr_table_begin();
+                i != parser->attr_table_end();
+                ++i) {
+                parser->other_xml.append(" ");
+                if (!i->second.prefix.empty()) {
+                    parser->other_xml.append(i->second.prefix);
+                    parser->other_xml.append(":");
+                }
+                parser->other_xml.append(i->first);
+                parser->other_xml.append("=\"");
+                parser->other_xml.append(i->second.value);
+                parser->other_xml.append("\"");
+            }
+        }
+
+        parser->other_xml.append(">");
+        break;
+
+    case inside_alias:
+        ddx_fatal_error(parser,
+                        "Internal parser error; unexpected state, inside alias while processing element '%s'.",
+                        localname);
+        break;
+
+    case inside_simple_type:
+        if (parser->is_attribute_or_alias(localname, attributes, nb_attributes))
+            break;
+        else
+            ddx_fatal_error(parser,
+                            "Expected an 'Attribute' or 'Alias' element; found '%s' instead.",
+                            localname);
+        break;
+
+    case inside_array:
+        if (parser->is_attribute_or_alias(localname, attributes, nb_attributes))
+            break;
+        else if (is_not(localname, "Array")
+                && parser->is_variable(localname, attributes, nb_attributes))
+            break;
+        else if (strcmp(localname, "dimension") == 0) {
+            parser->process_dimension(attributes, nb_attributes);
+            // next state: inside_dimension
+        }
+        else
+            ddx_fatal_error(parser,
+                            "Expected an 'Attribute' or 'Alias' element; found '%s' instead.",
+                            localname);
+        break;
+
+    case inside_dimension:
+        ddx_fatal_error(parser,
+                        "Internal parser error; unexpected state, inside dimension while processing element '%s'.",
+                        localname);
+        break;
+
+    case inside_structure:
+        if (parser->is_attribute_or_alias(localname, attributes, nb_attributes))
+            break;
+        else if (parser->is_variable(localname, attributes, nb_attributes))
+            break;
+        else
+            DDXParser::ddx_fatal_error(parser,
+                                       "Expected an Attribute, Alias or variable element; found '%s' instead.",
+                                       localname);
+        break;
+
+    case inside_sequence:
+        if (parser->is_attribute_or_alias(localname, attributes, nb_attributes))
+            break;
+        else if (parser->is_variable(localname, attributes, nb_attributes))
+            break;
+        else
+            DDXParser::ddx_fatal_error(parser,
+                                       "Expected an Attribute, Alias or variable element; found '%s' instead.",
+                                       localname);
+        break;
+
+    case inside_grid:
+        if (parser->is_attribute_or_alias(localname, attributes, nb_attributes))
+            break;
+        else if (strcmp(localname, "Array") == 0)
+            parser->process_variable(dods_array_c, inside_array, attributes, nb_attributes);
+        else if (strcmp(localname, "Map") == 0)
+            parser->process_variable(dods_array_c, inside_map, attributes, nb_attributes);
+        else
+            DDXParser::ddx_fatal_error(parser,
+                                       "Expected an Attribute, Alias or variable element; found '%s' instead.",
+                                       localname);
+        break;
+
+    case inside_map:
+        if (parser->is_attribute_or_alias(localname, attributes, nb_attributes))
+            break;
+        else if (is_not(localname, "Array") && is_not(localname, "Sequence")
+                 && is_not(localname, "Grid")
+                 && parser->is_variable(localname, attributes, nb_attributes))
+            break;
+        else if (strcmp(localname, "dimension") == 0) {
+            parser->process_dimension(attributes, nb_attributes);
+            // next state: inside_dimension
+        }
+        else
+            ddx_fatal_error(parser,
+                            "Expected an 'Attribute', 'Alias', variable or 'dimension' element; found '%s' instead.",
+                            localname);
+        break;
+
+    case inside_blob_href:
+        ddx_fatal_error(parser,
+                        "Internal parser error; unexpected state, inside blob href while processing element '%s'.",
+                        localname);
+        break;
+
+    case parser_unknown:
+        // *** Never used? If so remove/error
+        parser->set_state(parser_unknown);
+        break;
+
+    case parser_error:
+        break;
+    }
+
+    DBGN(cerr << " ... " << states[parser->get_state()] << endl);
+}
+
+void DDXParser::ddx_sax2_end_element(void *p, const xmlChar *l,
+        const xmlChar *prefix, const xmlChar *URI)
+{
+    DDXParser *parser = static_cast<DDXParser*>(p);
+    const char *localname = (const char *)l;
+
+    DBG2(cerr << "End element " << localname << " (state "
+         << states[parser->get_state()] << ")" << endl);
+
+    switch (parser->get_state()) {
+    case parser_start:
+        ddx_fatal_error(parser,
+                        "Internal parser error; unexpected state, inside start state while processing element '%s'.",
+                        localname);
+        break;
+
+    case inside_dataset:
+        if (strcmp(localname, "Dataset") == 0)
+            parser->pop_state();
+        else
+            DDXParser::ddx_fatal_error(parser,
+                                       "Expected an end Dataset tag; found '%s' instead.",
+                                       localname);
+        break;
+
+    case inside_attribute_container:
+        if (strcmp(localname, "Attribute") == 0) {
+            parser->pop_state();
+            parser->at_stack.pop();     // pop when leaving a container.
+        }
+        else
+            DDXParser::ddx_fatal_error(parser,
+                                       "Expected an end Attribute tag; found '%s' instead.",
+                                       localname);
+        break;
+
+    case inside_attribute:
+        if (strcmp(localname, "Attribute") == 0)
+            parser->pop_state();
+        else
+            DDXParser::ddx_fatal_error(parser,
+                                       "Expected an end Attribute tag; found '%s' instead.",
+                                       localname);
+        break;
+
+    case inside_attribute_value:
+        if (strcmp(localname, "value") == 0) {
+            parser->pop_state();
+            AttrTable *atp = parser->at_stack.top();
+            atp->append_attr(parser->dods_attr_name,
+                             parser->dods_attr_type, parser->char_data);
+            parser->char_data = "";     // Null this after use.
+        }
+        else
+            DDXParser::ddx_fatal_error(parser,
+                                       "Expected an end value tag; found '%s' instead.",
+                                       localname);
+
+        break;
+
+    case inside_other_xml_attribute: {
+            if (strcmp(localname, "Attribute") == 0
+                    && parser->root_ns == (const char *)URI) {
+
+                DBGN(cerr << endl << "\t Popping the 'inside_other_xml_attribute' state"
+                        << endl);
+
+                parser->pop_state();
+
+                AttrTable *atp = parser->at_stack.top();
+                atp->append_attr(parser->dods_attr_name,
+                        parser->dods_attr_type, parser->other_xml);
+
+                parser->other_xml = ""; // Null this after use.
+            }
+            else {
+                DBGN(cerr << endl << "\t inside_other_xml_attribute: " << localname
+                        << ", depth: " << parser->other_xml_depth << endl);
+                if (parser->other_xml_depth == 0)
+                    DDXParser::ddx_fatal_error(parser,
+                                               "Expected an OtherXML attribute to end! Instead I found '%s'",
+                                               localname);
+                parser->other_xml_depth--;
+
+                parser->other_xml.append("</");
+                if (prefix) {
+                    parser->other_xml.append((const char *)prefix);
+                    parser->other_xml.append(":");
+                }
+                parser->other_xml.append(localname);
+                parser->other_xml.append(">");
+            }
+            break;
+        }
+        // Alias is busted in libdap++ 05/29/03 jhrg
+    case inside_alias:
+        parser->pop_state();
+        break;
+
+    case inside_simple_type: {
+        Type t = get_type(localname);
+        if (is_simple_type(t)) {
+            parser->pop_state();
+            BaseType *btp = parser->bt_stack.top();
+            parser->bt_stack.pop();
+            parser->at_stack.pop();
+
+            BaseType *parent = parser->bt_stack.top();
+
+            if (parent->is_vector_type() || parent->is_constructor_type()) {
+                parent->add_var(btp);
+                delete btp;
+            }
+            else {
+                DDXParser::ddx_fatal_error(parser,
+                                           "Tried to add the simple-type variable '%s' to a non-constructor type (%s %s).",
+                                           localname,
+                                           parser->bt_stack.top()->
+                                           type_name().c_str(),
+                                           parser->bt_stack.top()->name().
+                                           c_str());
+                delete btp;
+            }
+        }
+        else {
+            DDXParser::ddx_fatal_error(parser,
+                                       "Expected an end tag for a simple type; found '%s' instead.",
+                                       localname);
+        }
+        break;
+    }
+
+    case inside_array:
+        parser->finish_variable(localname, dods_array_c, "Array");
+        break;
+
+    case inside_dimension:
+        if (strcmp(localname, "dimension") == 0)
+            parser->pop_state();
+        else
+            DDXParser::ddx_fatal_error(parser,
+                                       "Expected an end dimension tag; found '%s' instead.",
+                                       localname);
+        break;
+
+    case inside_structure:
+        parser->finish_variable(localname, dods_structure_c, "Structure");
+        break;
+
+    case inside_sequence:
+        parser->finish_variable(localname, dods_sequence_c, "Sequence");
+        break;
+
+    case inside_grid:
+        parser->finish_variable(localname, dods_grid_c, "Grid");
+        break;
+
+    case inside_map:
+        parser->finish_variable(localname, dods_array_c, "Map");
+        break;
+
+    case inside_blob_href:
+        if (strcmp(localname, "blob") == 0 || strcmp(localname, "dataBLOB") == 0)
+            parser->pop_state();
+        else
+            DDXParser::ddx_fatal_error(parser,
+                                       "Expected an end dataBLOB/blob tag; found '%s' instead.",
+                                       localname);
+        break;
+
+    case parser_unknown:
+        parser->pop_state();
+        break;
+
+    case parser_error:
+        break;
+    }
+
+
+    DBGN(cerr << " ... " << states[parser->get_state()] << endl);
+}
+
+/** Process/accumulate character data. This may be called more than once for
+    one logical clump of data. Only save character data when processing
+    'value' elements; throw away all other characters. */
+void DDXParser::ddx_get_characters(void * p, const xmlChar * ch, int len)
+{
+    DDXParser *parser = static_cast<DDXParser*>(p);
+
+    switch (parser->get_state()) {
+        case inside_attribute_value:
+            parser->char_data.append((const char *)(ch), len);
+            DBG2(cerr << "Characters: '" << parser->char_data << "'" << endl);
+            break;
+
+        case inside_other_xml_attribute:
+            parser->other_xml.append((const char *)(ch), len);
+            DBG2(cerr << "Other XML Characters: '" << parser->other_xml << "'" << endl);
+            break;
+
+        default:
+            break;
+    }
+}
+
+/** Read whitespace that's not really important for content. This is used
+    only for the OtherXML attribute type to preserve formating of the XML.
+    Doing so makes the attribute value far easier to read.
+ */
+void DDXParser::ddx_ignoreable_whitespace(void *p, const xmlChar *ch,
+        int len)
+{
+    DDXParser *parser = static_cast<DDXParser*>(p);
+
+    switch (parser->get_state()) {
+         case inside_other_xml_attribute:
+             parser->other_xml.append((const char *)(ch), len);
+             break;
+
+         default:
+             break;
+    }
+}
+
+/** Get characters in a cdata block. DAP does not use CData, but XML in an
+    OtherXML attribute (the value of that DAP attribute) might use it. This
+    callback also allows CData when the parser is in the 'parser_unknown'
+    state since some future DAP element might use it.
+ */
+void DDXParser::ddx_get_cdata(void *p, const xmlChar *value, int len)
+{
+    DDXParser *parser = static_cast<DDXParser*>(p);
+
+    switch (parser->get_state()) {
+         case inside_other_xml_attribute:
+             parser->other_xml.append((const char *)(value), len);
+             break;
+
+         case parser_unknown:
+             break;
+
+         default:
+             DDXParser::ddx_fatal_error(parser,
+                                        "Found a CData block but none are allowed by DAP.");
+
+             break;
+    }
+}
+
+/** Handle the standard XML entities.
+
+    @param parser The SAX parser
+    @param name The XML entity. */
+xmlEntityPtr DDXParser::ddx_get_entity(void *, const xmlChar * name)
+{
+    return xmlGetPredefinedEntity(name);
+}
+
+/** Process an XML fatal error. Note that SAX provides for warnings, errors
+    and fatal errors. This code treats them all as fatal errors since there's
+    typically no way to tell a user about the error since there's often no
+    user interface for this software.
+
+    @param p The SAX parser
+    @param msg A printf-style format string. */
+void DDXParser::ddx_fatal_error(void * p, const char *msg, ...)
+{
+    va_list args;
+    DDXParser *parser = static_cast<DDXParser*>(p);
+
+    parser->set_state(parser_error);
+
+    va_start(args, msg);
+    char str[1024];
+    vsnprintf(str, 1024, msg, args);
+    va_end(args);
+
+    int line = xmlSAX2GetLineNumber(parser->ctxt);
+
+    parser->error_msg += "At line " + long_to_string(line) + ": ";
+    parser->error_msg += string(str) + string("\n");
+}
+
+//@}
+
+void DDXParser::cleanup_parse(xmlParserCtxtPtr & context)
+{
+    bool wellFormed = context->wellFormed;
+    bool valid = context->valid;
+
+    context->sax = NULL;
+    xmlFreeParserCtxt(context);
+
+    // If there's an error, there may still be items on the stack at the
+    // end of the parse.
+    while (!bt_stack.empty()) {
+        delete bt_stack.top();
+        bt_stack.pop();
+    }
+
+    if (!wellFormed) {
+        throw DDXParseFailed(string("The DDX is not a well formed XML document.\n") + error_msg);
+    }
+
+    if (!valid) {
+        throw DDXParseFailed(string("The DDX is not a valid document.\n") + error_msg);
+    }
+
+    if (get_state() == parser_error) {
+        throw DDXParseFailed(string("Error parsing DDX response.\n") + error_msg);
+    }
+}
+
+/** Read a DDX from a C++ input stream and populate a DDS object.
+ *
+ * @param in
+ * @param dds
+ * @param cid
+ * @param boundary
+ */
+void DDXParser::intern_stream(istream &in, DDS *dest_dds, string &cid, const string &boundary)
+{
+    // Code example from libxml2 docs re: read from a stream.
+    if (!in || in.eof())
+        throw InternalErr(__FILE__, __LINE__, "Input stream not open or read error");
+
+    const int size = 1024;
+    char chars[size + 1];
+
+    // int res = fread(chars, 1, 4, in);
+    in.read(chars, 4);
+    int res = in.gcount();
+    if (res > 0) {
+        chars[4]='\0';
+        xmlParserCtxtPtr context = xmlCreatePushParserCtxt(NULL, NULL, chars, res, "stream");
+
+        if (!context)
+            throw DDXParseFailed("Error parsing DDX response: Input does not look like XML");
+
+        ctxt = context;         // need ctxt for error messages
+        dds = dest_dds;         // dump values here
+        blob_href = &cid; 	// cid goes here
+
+        xmlSAXHandler ddx_sax_parser;
+        memset( &ddx_sax_parser, 0, sizeof(xmlSAXHandler) );
+
+        ddx_sax_parser.getEntity = &DDXParser::ddx_get_entity;
+        ddx_sax_parser.startDocument = &DDXParser::ddx_start_document;
+        ddx_sax_parser.endDocument = &DDXParser::ddx_end_document;
+        ddx_sax_parser.characters = &DDXParser::ddx_get_characters;
+        ddx_sax_parser.ignorableWhitespace = &DDXParser::ddx_ignoreable_whitespace;
+        ddx_sax_parser.cdataBlock = &DDXParser::ddx_get_cdata;
+        ddx_sax_parser.warning = &DDXParser::ddx_fatal_error;
+        ddx_sax_parser.error = &DDXParser::ddx_fatal_error;
+        ddx_sax_parser.fatalError = &DDXParser::ddx_fatal_error;
+        ddx_sax_parser.initialized = XML_SAX2_MAGIC;
+        ddx_sax_parser.startElementNs = &DDXParser::ddx_sax2_start_element;
+        ddx_sax_parser.endElementNs = &DDXParser::ddx_sax2_end_element;
+
+        context->sax = &ddx_sax_parser;
+        context->userData = this;
+        context->validate = true;
+
+        in.getline(chars, size);	// chars has size+1 elements
+        res = in.gcount();
+        chars[res-1] = '\n';		// libxml needs the newline; w/o it the parse will fail
+        chars[res] = '\0';
+        while (res > 0 && !is_boundary(chars, boundary)) {
+        	DBG(cerr << "line (" << res << "): " << chars << endl);
+        	xmlParseChunk(ctxt, chars, res, 0);
+
+        	in.getline(chars, size);	// chars has size+1 elements
+        	res = in.gcount();
+        	if (res > 0) {
+        		chars[res-1] = '\n';
+        		chars[res] = '\0';
+        	}
+        }
+
+        // This call ends the parse: The fourth argument of xmlParseChunk is
+        // the bool 'terminate.'
+        xmlParseChunk(ctxt, chars, 0, 1);
+
+        cleanup_parse(context);
+    }
+    else {
+        throw DDXParseFailed("Error parsing DDX response: Could not read from input stream.");
+    }
+}
+
+/** @brief Read the DDX from a stream instead of a file.
+    @see DDXParser::intern(). */
+void DDXParser::intern_stream(FILE *in, DDS *dest_dds, string &cid, const string &boundary)
+{
+    // Code example from libxml2 docs re: read from a stream.
+    if (!in || feof(in) || ferror(in))
+        throw InternalErr(__FILE__, __LINE__, "Input stream not open or read error");
+
+    const int size = 1024;
+    char chars[size];
+
+    int res = fread(chars, 1, 4, in);
+    if (res > 0) {
+        chars[4]='\0';
+        xmlParserCtxtPtr context = xmlCreatePushParserCtxt(NULL, NULL, chars, res, "stream");
+
+        if (!context)
+            throw DDXParseFailed("Error parsing DDX response: Input does not look like XML");
+
+        ctxt = context;         // need ctxt for error messages
+        dds = dest_dds;         // dump values here
+        blob_href = &cid; 	// cid goes here
+
+        xmlSAXHandler ddx_sax_parser;
+        memset( &ddx_sax_parser, 0, sizeof(xmlSAXHandler) );
+
+        ddx_sax_parser.getEntity = &DDXParser::ddx_get_entity;
+        ddx_sax_parser.startDocument = &DDXParser::ddx_start_document;
+        ddx_sax_parser.endDocument = &DDXParser::ddx_end_document;
+        ddx_sax_parser.characters = &DDXParser::ddx_get_characters;
+        ddx_sax_parser.ignorableWhitespace = &DDXParser::ddx_ignoreable_whitespace;
+        ddx_sax_parser.cdataBlock = &DDXParser::ddx_get_cdata;
+        ddx_sax_parser.warning = &DDXParser::ddx_fatal_error;
+        ddx_sax_parser.error = &DDXParser::ddx_fatal_error;
+        ddx_sax_parser.fatalError = &DDXParser::ddx_fatal_error;
+        ddx_sax_parser.initialized = XML_SAX2_MAGIC;
+        ddx_sax_parser.startElementNs = &DDXParser::ddx_sax2_start_element;
+        ddx_sax_parser.endElementNs = &DDXParser::ddx_sax2_end_element;
+
+        context->sax = &ddx_sax_parser;
+        context->userData = this;
+        context->validate = true;
+
+
+        while ((fgets(chars, size, in) != 0) && !is_boundary(chars, boundary)) {
+            DBG(cerr << "line (" << strlen(chars) << "): " << chars << endl);
+            xmlParseChunk(ctxt, chars, strlen(chars), 0);
+        }
+        // This call ends the parse: The fourth argument of xmlParseChunk is
+        // the bool 'terminate.'
+        xmlParseChunk(ctxt, chars, 0, 1);
+
+        cleanup_parse(context);
+    }
+    else {
+        throw DDXParseFailed("Error parsing DDX response: Could not read from input file.");
+    }
+}
+
+
+/** Parse a DDX document stored in a file. The XML in the document is parsed
+    and a binary DDX is built. This implementation stores the result in a DDS
+    object where each instance of BaseType can hold an AttrTable object.
+
+    @param document Read the DDX from this file.
+    @param dest_dds Value/result parameter; dumps the information to this DDS
+    instance.
+    @param cid Value/result parameter; puts the href which references the \c
+    CID.
+    @exception DDXParseFailed Thrown if the XML document could not be
+    read or parsed. */
+void DDXParser::intern(const string & document, DDS * dest_dds, string &cid)
+{
+    // Create the context pointer explicitly so that we can store a pointer
+    // to it in the DDXParser instance. This provides a way to generate our
+    // own error messages *with* line numbers. The messages are pretty
+    // meaningless otherwise. This means that we use an interface from the
+    // 'parser internals' header, and not the 'parser' header. However, this
+    // interface is also used in one of the documented examples, so it's
+    // probably pretty stable. 06/02/03 jhrg
+    xmlParserCtxtPtr context = xmlCreateFileParserCtxt(document.c_str());
+    if (!context)
+        throw
+        DDXParseFailed(string
+                       ("Could not initialize the parser with the file: '")
+                       + document + string("'."));
+
+    dds = dest_dds;             // dump values here
+    blob_href = &cid;
+    ctxt = context;             // need ctxt for error messages
+
+    xmlSAXHandler ddx_sax_parser;
+    memset( &ddx_sax_parser, 0, sizeof(xmlSAXHandler) );
+
+    ddx_sax_parser.getEntity = &DDXParser::ddx_get_entity;
+    ddx_sax_parser.startDocument = &DDXParser::ddx_start_document;
+    ddx_sax_parser.endDocument = &DDXParser::ddx_end_document;
+    ddx_sax_parser.characters = &DDXParser::ddx_get_characters;
+    ddx_sax_parser.ignorableWhitespace = &DDXParser::ddx_ignoreable_whitespace;
+    ddx_sax_parser.cdataBlock = &DDXParser::ddx_get_cdata;
+    ddx_sax_parser.warning = &DDXParser::ddx_fatal_error;
+    ddx_sax_parser.error = &DDXParser::ddx_fatal_error;
+    ddx_sax_parser.fatalError = &DDXParser::ddx_fatal_error;
+    ddx_sax_parser.initialized = XML_SAX2_MAGIC;
+    ddx_sax_parser.startElementNs = &DDXParser::ddx_sax2_start_element;
+    ddx_sax_parser.endElementNs = &DDXParser::ddx_sax2_end_element;
+
+    context->sax = &ddx_sax_parser;
+    context->userData = this;
+    context->validate = false;
+
+    xmlParseDocument(context);
+
+    cleanup_parse(context);
+}
+
+} // namespace libdap
diff --git a/DDXParserSAX2.h b/DDXParserSAX2.h
new file mode 100644
index 0000000..933bebf
--- /dev/null
+++ b/DDXParserSAX2.h
@@ -0,0 +1,266 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#ifndef ddx_parser_h
+#define ddx_parser_h
+
+#include <string>
+#include <map>
+#include <stack>
+
+#include <libxml/parserInternals.h>
+
+#ifndef ddx_exceptions_h
+#include "DDXExceptions.h"
+#endif
+
+#ifndef _dds_h
+#include "DDS.h"
+#endif
+
+#ifndef _basetype_h
+#include "BaseType.h"
+#endif
+
+#ifndef base_type_factory_h
+#include "BaseTypeFactory.h"
+#endif
+
+namespace libdap
+{
+
+/** Parse the XML text which encodes the network/persistent representation of
+    the DDX object. In the current implementation, the DDX is held by an
+    instance of the class DDS which in turn holds variables which include
+    attributes. That is, the binary \e implementation of a DDX uses the old
+    DDS, BaseType and AttrTable classes, albeit arranged in a slightly new
+    way.
+
+    This parser for the DDX \e document uses the SAX interface of \c libxml2.
+    Static methods are used as callbacks for the SAX parser. These static
+    methods are public because making them private complicates compilation.
+    They should not be called by anything other than the \e intern method.
+    They do not throw exceptions because exceptions from within callbacks are
+    not reliable or portable. To signal errors, the methods record
+    information in the DDXParser object. Once the error handler is called,
+    construction of an DDX/DDS object ends even though the SAX parser still
+    calls the various callback functions. The parser treats \e warnings, \e
+    errors and \e fatal_errors the same way; when any are found parsing
+    stops. The \e intern method throws an DDXParseFailed exception if an
+    error was found.
+
+    Note that this class uses the C++-supplied default definitions for the
+    default and copy constructors as well as the destructor and assignment
+    operator.
+
+    @see DDS */
+class DDXParser
+{
+private:
+    /** States used by DDXParserState. These are the states of the SAX parser
+    state-machine. */
+    enum ParseState {
+        parser_start,
+
+        inside_dataset,
+
+        inside_attribute_container,
+        inside_attribute,
+        inside_attribute_value,
+        inside_other_xml_attribute,
+
+        inside_alias,
+
+        // This covers Byte, ..., Url.
+        inside_simple_type,
+
+        inside_array,
+        inside_dimension,
+
+        inside_grid,
+        inside_map,
+
+        inside_structure,
+        inside_sequence,
+
+        inside_blob_href,
+
+        parser_unknown,
+        parser_error
+    };
+
+    BaseTypeFactory *d_factory;
+
+    // These stacks hold the state of the parse as it progresses.
+    stack<ParseState> s; // Current parse state
+    stack<BaseType*> bt_stack; // current variable(s)
+    stack<AttrTable*> at_stack; // current attribute table
+
+    // Accumulate stuff inside an 'OtherXML' DAP attribute here
+    string other_xml;
+
+    // When we're parsing unknown XML, how deeply is it nested? This is used
+    // for the OtherXML DAP attributes.
+    unsigned int other_xml_depth;
+    unsigned int unknown_depth;
+
+    // These are used for processing errors.
+    string error_msg;  // Error message(s), if any.
+    xmlParserCtxtPtr ctxt; // used for error message line numbers
+
+    // The results of the parse operation are stored in these fields.
+    DDS *dds;   // dump DDX here
+    string *blob_href;  // put href to blob here
+
+    // These hold temporary values read during the parse.
+    string dods_attr_name; // DAP2 attributes, not XML attributes
+    string dods_attr_type; // ... not XML ...
+    string char_data;  // char data in value elements; null after use
+    string root_ns;     // What is the namespace of the root node (Dataset)
+
+    class XMLAttribute {
+        public:
+        string prefix;
+        string nsURI;
+        string value;
+
+        void clone(const XMLAttribute &src) {
+            prefix = src.prefix;
+            nsURI = src.nsURI;
+            value = src.value;
+        }
+
+        XMLAttribute() : prefix(""), nsURI(""), value("") {}
+        XMLAttribute(const string &p, const string &ns, const string &v)
+            : prefix(p), nsURI(ns), value(v) {}
+        // 'attributes' as passed from libxml2 is a five element array but this
+        // ctor gets the back four elements.
+        XMLAttribute(const xmlChar **attributes/*[4]*/) {
+            prefix = attributes[0] != 0 ? (const char *)attributes[0]: "";
+            nsURI = attributes[1] != 0 ? (const char *)attributes[1]: "";
+            value = string((const char *)attributes[2], (const char *)attributes[3]);
+        }
+        XMLAttribute(const XMLAttribute &rhs) {
+            clone(rhs);
+        }
+        XMLAttribute &operator=(const XMLAttribute &rhs) {
+            if (this == &rhs)
+                return *this;
+            clone(rhs);
+            return *this;
+        }
+    };
+
+    typedef map<string, XMLAttribute> XMLAttrMap;
+    XMLAttrMap attribute_table; // dump XML attributes here
+
+    XMLAttrMap::iterator attr_table_begin() {
+        return attribute_table.begin();
+    }
+
+    XMLAttrMap::iterator attr_table_end() {
+        return attribute_table.end();
+    }
+
+    map<string, string> namespace_table;
+
+    // These are kind of silly...
+    void set_state(DDXParser::ParseState state);
+    DDXParser::ParseState get_state() const;
+    void pop_state();
+
+    // Glue for the BaseTypeFactory class.
+    BaseType *factory(Type t, const string &name);
+
+    // Common cleanup code for intern() and intern_stream()
+    void cleanup_parse(xmlParserCtxtPtr &context);
+
+    /** @name Parser Actions
+
+    These methods are the 'actions' carried out by the start_element and
+    end_element callbacks. Most of what takes place in those has been
+    factored out to this set of functions. */
+    //@{
+    void transfer_xml_attrs(const xmlChar **attrs, int nb_attributes);
+    void transfer_xml_ns(const xmlChar **namespaces, int nb_namespaces);
+    bool check_required_attribute(const string &attr);
+    bool check_attribute(const string & attr);
+
+    void process_attribute_element(const xmlChar **attrs, int nb_attrs);
+    void process_attribute_alias(const xmlChar **attrs, int nb_attrs);
+
+    void process_variable(Type t, ParseState s, const xmlChar **attrs,
+            int nb_attributes);
+
+    void process_dimension(const xmlChar **attrs, int nb_attrs);
+    void process_blob(const xmlChar **attrs, int nb_attrs);
+
+    bool is_attribute_or_alias(const char *name, const xmlChar **attrs,
+            int nb_attributes);
+    bool is_variable(const char *name, const xmlChar **attrs, int nb_attributes);
+
+    void finish_variable(const char *tag, Type t, const char *expected);
+    //@}
+
+    /// Declare the default ctor here to prevent its use.
+    DDXParser();
+
+    friend class DDXParserTest;
+
+public:
+    DDXParser(BaseTypeFactory *factory)
+        : d_factory(factory),
+        other_xml(""), other_xml_depth(0), unknown_depth(0),
+        error_msg(""), ctxt(0), dds(0), blob_href(0),
+        dods_attr_name(""), dods_attr_type(""),
+        char_data(""), root_ns("")
+    {}
+
+    void intern(const string &document, DDS *dest_dds, string &cid);
+    void intern_stream(FILE *in, DDS *dds, string &cid, const string &boundary = "");
+    void intern_stream(istream &in, DDS *dds, string &cid, const string &boundary = "");
+
+    static void ddx_start_document(void *parser);
+    static void ddx_end_document(void *parser);
+
+    static void ddx_sax2_start_element(void *parser,
+            const xmlChar *localname, const xmlChar *prefix, const xmlChar *URI,
+            int nb_namespaces, const xmlChar **namespaces, int nb_attributes,
+            int nb_defaulted, const xmlChar **attributes);
+    static void ddx_sax2_end_element(void *parser, const xmlChar *localname,
+            const xmlChar *prefix, const xmlChar *URI);
+
+    static void ddx_get_characters(void *parser, const xmlChar *ch, int len);
+    static void ddx_ignoreable_whitespace(void *parser,
+            const xmlChar * ch, int len);
+    static void ddx_get_cdata(void *parser, const xmlChar *value, int len);
+
+    static xmlEntityPtr ddx_get_entity(void *parser, const xmlChar *name);
+    static void ddx_fatal_error(void *parser, const char *msg, ...);
+};
+
+} // namespace libdap
+
+#endif // ddx_parser_h
diff --git a/DMR.cc b/DMR.cc
new file mode 100644
index 0000000..1d4e09e
--- /dev/null
+++ b/DMR.cc
@@ -0,0 +1,498 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2013 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#include "config.h"
+
+#ifdef WIN32
+#include <io.h>
+#include <process.h>
+#include <fstream>
+#else
+#include <unistd.h>    // for alarm and dup
+#include <sys/wait.h>
+#endif
+
+#include <cassert>
+
+#include <iostream>
+#include <sstream>
+
+//#define DODS_DEBUG
+//#define DODS_DEBUG2
+
+#include "D4Group.h"
+#include "BaseType.h"
+#include "Array.h"
+#include "Grid.h"
+#include "DMR.h"
+#include "XMLWriter.h"
+#include "D4BaseTypeFactory.h"
+#include "D4Attributes.h"
+
+#include "DDS.h"	// Included so DMRs can be built using a DDS for 'legacy' handlers
+
+#include "debug.h"
+
+/**
+ * DapXmlNamespaces
+ *
+ * TODO  Replace all uses of the following variables with calls to DapXmlNamespaces
+ */
+const string c_xml_xsi = "http://www.w3.org/2001/XMLSchema-instance";
+const string c_xml_namespace = "http://www.w3.org/XML/1998/namespace";
+
+const string c_default_dap40_schema_location = "http://xml.opendap.org/dap/dap4.0.xsd";
+
+const string c_dap40_namespace = "http://xml.opendap.org/ns/DAP/4.0#";
+
+const string c_dap_40_n_sl = c_dap40_namespace + " " + c_default_dap40_schema_location;
+
+using namespace std;
+
+namespace libdap {
+
+void
+DMR::m_duplicate(const DMR &dmr)
+{
+    // This is needed because we use the factory to make a new instance of the root group
+    assert(dmr.OK());
+
+    d_factory = dmr.d_factory; // Shallow copy here
+
+    d_name = dmr.d_name;
+    d_filename = dmr.d_filename;
+
+    d_dap_major = dmr.d_dap_major;
+    d_dap_minor = dmr.d_dap_minor;
+    d_dap_version = dmr.d_dap_version;       // String version of the protocol
+
+    d_dmr_version = dmr.d_dmr_version;
+
+    d_request_xml_base = dmr.d_request_xml_base;
+
+    d_namespace = dmr.d_namespace;
+
+    d_max_response_size = dmr.d_max_response_size;
+
+    // Deep copy, using ptr_duplicate()
+    // d_root can only be a D4Group, so the thing returned by ptr_duplicate() must be a D4Group.
+    d_root = static_cast<D4Group*>(dmr.d_root->ptr_duplicate());
+    DBG(cerr << "dmr.d_root: " << dmr.d_root << endl);
+    DBG(cerr << "d_root (from ptr_dup(): " << d_root << endl);
+
+    //d_root = static_cast<D4Group*>(dmr.d_factory->NewVariable(dods_group_c, dmr.d_root->name()));
+}
+
+/**
+ * Make a DMR which uses the given BaseTypeFactory to create variables.
+ *
+ * @note The default DAP version is 4.0 - use the DDS class to make DAP2
+ * things. The default DMR version is 1.0
+ *
+ * @param factory The D4BaseTypeFactory to use when creating instances of
+ * DAP4 variables. The caller must ensure the factory's lifetime is at least
+ * that of the DMR instance.
+ * @param name The name of the DMR - usually derived from the name of the
+ * pathname or table name of the dataset.
+ */
+DMR::DMR(D4BaseTypeFactory *factory, const string &name)
+        : d_factory(factory), d_name(name), d_filename(""),
+          d_dap_major(4), d_dap_minor(0),
+          d_dmr_version("1.0"), d_request_xml_base(""),
+          d_namespace(c_dap40_namespace), d_max_response_size(0), d_root(0)
+{
+    // sets d_dap_version string and the two integer fields too
+    set_dap_version("4.0");
+}
+
+/** @brief Build a DMR using a DAP2 DDS.
+ *
+ * Given a DDS from code written for DAP2, build a DAP4 DMR object. This
+ * works because DAP4 subsumes DAP2, but there are a few quirks... For
+ * each variable in the DDS, transform it to the equivalent DAP4 variable
+ * type and then copy the variable's attributes. Most types convert easily.
+ * Types that need special treatment are:
+ * Array: DAP2 array dimensions must be morphed to DAP4
+ * Sequence: Make a D4Sequence
+ * Grid: Make a coverage; assume Grids with the same dimension names
+ * have 'shared dimensions' and that maps with the same names are shared too.
+ *
+ * @note Assume that a DDS has only a root group. This is not actually
+ * true for a DDS from the HDF5 handler, because it has Groups encoded
+ * into the variable names. jhrg 3/18/14
+ *
+ * @param factory Factory class used to make new variables
+ * @param dds Get the variables to convert from this DAP2 DDS.
+ * @see BaseType::transform_to_dap4()
+ */
+DMR::DMR(D4BaseTypeFactory *factory, DDS &dds)
+        : d_factory(factory), d_name(dds.get_dataset_name()),
+          d_filename(dds.filename()), d_dap_major(4), d_dap_minor(0),
+          d_dmr_version("1.0"), d_request_xml_base(""),
+          d_namespace(c_dap40_namespace), d_max_response_size(0), d_root(0)
+{
+    // sets d_dap_version string and the two integer fields too
+    set_dap_version("4.0");
+
+    build_using_dds(dds);
+#if 0
+    for (DDS::Vars_iter i = dds.var_begin(), e = dds.var_end(); i != e; ++i) {
+    	BaseType *new_var = (*i)->transform_to_dap4(root() /*group*/, root() /*container*/);
+    	// If the variable being transformed is a Grid,
+    	// then Grid::transform_to_dap4() will add all the arrays to the
+    	// container (root() in this case) and return null, indicating that
+    	// this code does not need to do anything to add the transformed variable.
+    	if (new_var)
+    		root()->add_var_nocopy(new_var);
+    }
+
+    // Now copy the global attributes
+    root()->attributes()->transform_to_dap4(dds.get_attr_table());
+#endif
+}
+
+/**
+ * Make a DMR which uses the given BaseTypeFactory to create variables.
+ *
+ * @note The default DAP version is 4.0 - use the DDS class to make DAP2
+ * things. The default DMR version is 1.0
+ */
+DMR::DMR()
+        : d_factory(0), d_name(""), d_filename(""), d_dap_major(4), d_dap_minor(0),
+          d_dap_version("4.0"), d_dmr_version("1.0"), d_request_xml_base(""),
+          d_namespace(c_dap40_namespace), d_max_response_size(0), d_root(0)
+{
+    // sets d_dap_version string and the two integer fields too
+    set_dap_version("4.0");
+}
+
+/** The DMR copy constructor. */
+DMR::DMR(const DMR &rhs) : DapObj()
+{
+    m_duplicate(rhs);
+}
+
+/** Delete a DMR. The BaseType factory is not freed, while the contained
+ * group is.
+ */
+DMR::~DMR()
+{
+#if 1
+    delete d_root;
+#endif
+}
+
+DMR &
+DMR::operator=(const DMR &rhs)
+{
+    if (this == &rhs)
+        return *this;
+
+    m_duplicate(rhs);
+
+    return *this;
+}
+
+/**
+ * If we have a DDS that includes Attributes, use it to build the DMR. This
+ * will copy all of the variables in the DDS into the DMR using BaseType::transform_to_dap4(),
+ * so the actual types added can be controlled by code that specializes
+ * the various type classes.
+ *
+ * @param dds Read variables and Attributes from this DDS
+ */
+void DMR::build_using_dds(DDS &dds)
+{
+    set_name(dds.get_dataset_name());
+    set_filename(dds.filename());
+
+    D4Group *root_grp = root();
+    for (DDS::Vars_iter i = dds.var_begin(), e = dds.var_end(); i != e; ++i) {
+        BaseType *d4_var = root()->var((*i)->name());
+        // Don't add duplicate variables. We have to make this check
+        // because some of the child variables may add arrays
+        // to the root object. For example, this happens in
+        // Grid with the Map Arrays - ndp - 05/08/17
+        if(!d4_var){
+            // no variable of this name is in the root group at this point. Add it.
+            DBG(cerr << __func__ << "() - Transforming top level variable: " <<
+                " (" << (*i)->type_name() << ":'" << (*i)->name() << "':"<<(void *)(*i) <<
+                ") (root:"<< root_grp << ")"<< endl; );
+            (*i)->transform_to_dap4(root_grp, root_grp);
+            DBG(cerr << __func__ << "() - top level variable: '" <<
+                (*i)->name() << "' (type:" << (*i)->type_name() << ") Transformed"<< endl; );
+        }
+        else {
+            DBG(cerr << __func__ << "() - Skipping variable: " <<
+                d4_var->type_name() << " " << d4_var->name() << " because a variable with" <<
+                " this name already exists in the root group." << endl; );
+        }
+    }
+
+    // Now copy the global attributes
+    root()->attributes()->transform_to_dap4(dds.get_attr_table());
+}
+#if 1
+/**
+ * If we have a DMR that includes Attributes, use it to build the DDS. This
+ * will copy all of the variables in the DMR into the DDS using
+ * BaseType::transform_to_dap2(), so the actual types added can be
+ * controlled by code that specializes the various type classes.
+ *
+ * @param dds Read variables and Attributes from this DDS
+ */
+DDS *DMR::getDDS(DMR &dmr)
+{
+    DBG( cerr << __func__ << "() - BEGIN" << endl;);
+    D4Group *root = dmr.root();
+
+    BaseTypeFactory *btf = new BaseTypeFactory();
+    DDS *dds = new DDS(btf,dmr.name());
+    dds->filename(dmr.filename());
+    AttrTable *dds_at = &(dds->get_attr_table());
+
+    // Now copy the global attributes
+    // D4Attributes::load_AttrTable(dds_at,root->attributes());
+
+    vector<BaseType *> *top_vars = root->transform_to_dap2(dds_at,true);
+
+    vector<BaseType *>::iterator vIter = top_vars->begin();
+    vector<BaseType *>::iterator vEnd = top_vars->end();
+    for( ; vIter!=vEnd ; vIter++){
+        dds->add_var(*vIter);
+    }
+
+#if 0
+    set<string> shared_dim_candidates;
+
+    vector<BaseType *> dropped_vars;
+    for (D4Group::Vars_iter i = root->var_begin(), e = root->var_end(); i != e; ++i)
+    {
+        DBG( cerr << __func__ << "() - Processing top level variable '"<< (*i)->type_name() << " " <<  (*i)->name() << "' to DDS." << endl; );
+        vector<BaseType *> *new_vars = (*i)->transform_to_dap2(&(dds->get_attr_table()));
+        if(new_vars!=0){
+            vector<BaseType*>::iterator vIter = new_vars->begin();
+            vector<BaseType*>::iterator end = new_vars->end();
+            for( ; vIter!=end ; vIter++ ){
+                BaseType *new_var = (*vIter);
+                DBG( cerr << __func__ << "() - Adding variable name: '"<< new_var->name() << "' " <<
+                    "type: " <<  new_var->type() << " " <<
+                    "type_name: " << new_var->type_name() << " to DDS." << endl; );
+                dds->add_var_nocopy(new_var);
+                Grid *grid = dynamic_cast <Grid *>(new_var);
+                if(grid){
+                    Grid::Map_iter m = grid->map_begin();
+                    for( ; m != grid->map_end() ; m++){
+                        shared_dim_candidates.insert((*m)->name());
+                    }
+                }
+                (*vIter) = 0;
+            }
+            delete new_vars;
+        }
+        else {
+            DBG( cerr << __func__ << "Adding variable '"<< (*i)->type_name() << " " <<  (*i)->name() << "' to drop list." << endl; );
+            dropped_vars.push_back((*i));
+        }
+    }
+    AttrTable *dv_table = Constructor::make_dropped_vars_attr_table(&dropped_vars);
+    if(dv_table){
+        DBG( cerr << __func__ << "() - Adding dropped variable AttrTable." << endl;);
+        dds_at->append_container(dv_table,dv_table->get_name());
+    }
+
+    // Get all the child groups.
+    D4Group::groupsIter gIter = root->grp_begin();
+    D4Group::groupsIter gEnd = root->grp_end();
+    for( ; gIter!=gEnd ; gIter++){
+        D4Group *grp = *gIter;
+        DBG( cerr << __func__ << "() - Processing D4Group " << grp->name() << endl;);
+        vector<BaseType *> *d2_vars = grp->transform_to_dap2(dds_at);
+        if(d2_vars){
+            DBG( cerr << __func__ << "() - Processing " << grp->name() << " Member Variables." << endl;);
+            vector<BaseType *>::iterator vIter = d2_vars->begin();
+            vector<BaseType *>::iterator vEnd = d2_vars->end();
+            for( ; vIter!=vEnd; vIter++){
+                DBG( cerr << __func__ << "() - Processing " << grp->name() << " Member Variable: " << (*vIter)->name() << endl;);
+                dds->add_var(*vIter);
+            }
+        }
+    }
+#endif
+
+
+    DBG( cerr << __func__ << "() - END" << endl;);
+    return dds;
+}
+
+
+DDS *DMR::getDDS()
+{
+    return DMR::getDDS(*this);
+}
+
+
+
+#endif
+
+D4Group *
+DMR::root()
+{
+	if (!d_root) d_root = static_cast<D4Group*>(d_factory->NewVariable(dods_group_c, "/"));
+	return d_root;
+}
+
+/**
+ * Given the DAP protocol version, parse that string and set the DMR fields.
+ *
+ * @param v The version string.
+ */
+void
+DMR::set_dap_version(const string &v)
+{
+    istringstream iss(v);
+
+    int major = -1, minor = -1;
+    char dot;
+    if (!iss.eof() && !iss.fail())
+        iss >> major;
+    if (!iss.eof() && !iss.fail())
+        iss >> dot;
+    if (!iss.eof() && !iss.fail())
+        iss >> minor;
+
+    if (major == -1 || minor == -1 or dot != '.')
+        throw InternalErr(__FILE__, __LINE__, "Could not parse dap version. Value given: " + v);
+
+    d_dap_version = v;
+
+    d_dap_major = major;
+    d_dap_minor = minor;
+
+    // Now set the related XML constants. These might be overwritten if
+    // the DMR instance is being built from a document parse, but if it's
+    // being constructed by a server the code to generate the XML document
+    // needs these values to match the DAP version information.
+    switch (d_dap_major) {
+        case 4:
+            d_namespace = c_dap40_namespace;
+            break;
+        default:
+            d_namespace = "";
+            break;
+    }
+}
+
+/** Get the size of a response, in kilobytes. This method looks at the
+ * variables in the DMR a computes the number of bytes in the response.
+ *
+ * @note This version of the method does a poor job with Arrays that
+ * have varying dimensions.
+ *
+ * @param constrained Should the size of the whole DMR be used or should the
+ * current constraint be taken into account?
+ * @return The size of the request in kilobytes
+ */
+long
+DMR::request_size(bool constrained)
+{
+    return d_root->request_size(constrained);
+}
+
+/**
+ * Print the DAP4 DMR object.
+ *
+ * @param xml use this XMLWriter to build the XML.
+ * @param constrained Should the DMR be subject to a constraint? Defaults to
+ * False
+ */
+void
+DMR::print_dap4(XMLWriter &xml, bool constrained)
+{
+    if (xmlTextWriterStartElement(xml.get_writer(), (const xmlChar*) "Dataset") < 0)
+        throw InternalErr(__FILE__, __LINE__, "Could not write Dataset element");
+
+#if 0
+    // Reintroduce these if they are really useful. jhrg 4/15/13
+    if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "xmlns:xml",
+            (const xmlChar*) c_xml_namespace.c_str()) < 0)
+        throw InternalErr(__FILE__, __LINE__, "Could not write attribute for xmlns:xml");
+
+    if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "xmlns:xsi", (const xmlChar*) c_xml_xsi.c_str())
+            < 0)
+        throw InternalErr(__FILE__, __LINE__, "Could not write attribute for xmlns:xsi");
+
+    if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "xsi:schemaLocation",
+            (const xmlChar*) c_dap_40_n_sl.c_str()) < 0)
+        throw InternalErr(__FILE__, __LINE__, "Could not write attribute for xmlns:schemaLocation");
+#endif
+
+    if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "xmlns", (const xmlChar*) get_namespace().c_str()) < 0)
+        throw InternalErr(__FILE__, __LINE__, "Could not write attribute for xmlns");
+
+    if (!request_xml_base().empty()) {
+        if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "xml:base",
+                (const xmlChar*)request_xml_base().c_str()) < 0)
+            throw InternalErr(__FILE__, __LINE__, "Could not write attribute for xml:base");
+    }
+
+    if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "dapVersion",  (const xmlChar*)dap_version().c_str()) < 0)
+        throw InternalErr(__FILE__, __LINE__, "Could not write attribute for dapVersion");
+
+    if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "dmrVersion", (const xmlChar*)dmr_version().c_str()) < 0)
+        throw InternalErr(__FILE__, __LINE__, "Could not write attribute for dapVersion");
+
+    if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "name", (const xmlChar*)name().c_str()) < 0)
+        throw InternalErr(__FILE__, __LINE__, "Could not write attribute for name");
+
+    root()->print_dap4(xml, constrained);
+
+    if (xmlTextWriterEndElement(xml.get_writer()) < 0)
+        throw InternalErr(__FILE__, __LINE__, "Could not end the top-level Group element");
+}
+
+
+/** @brief dumps information about this object
+ *
+ * Displays the pointer value of this instance and then calls parent dump
+ *
+ * @param strm C++ i/o stream to dump the information to
+ * @return void
+ */
+void
+DMR::dump(ostream &strm) const
+{
+    strm << DapIndent::LMarg << "DMR::dump - ("
+    << (void *)this << ")" << endl ;
+    DapIndent::Indent() ;
+    strm << DapIndent::LMarg << "factory: " << (void *)d_factory << endl ;
+    strm << DapIndent::LMarg << "name: " << d_name << endl ;
+    strm << DapIndent::LMarg << "filename: " << d_filename << endl ;
+    strm << DapIndent::LMarg << "protocol major: " << d_dap_major << endl;
+    strm << DapIndent::LMarg << "protocol minor: " << d_dap_minor << endl;
+
+    DapIndent::UnIndent() ;
+}
+
+} // namespace libdap
diff --git a/DMR.h b/DMR.h
new file mode 100644
index 0000000..fad1200
--- /dev/null
+++ b/DMR.h
@@ -0,0 +1,189 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2013 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#ifndef _dmr_h
+#define _dmr_h 1
+
+#include <cassert>
+
+#include <iostream>
+#include <string>
+#include <vector>
+
+//#include "D4Group.h"
+//#include "XMLWriter.h"
+#include "DapObj.h"
+
+namespace libdap
+{
+
+class D4Group;
+class D4BaseTypeFactory;
+class XMLWriter;
+
+class DDS;
+
+/** DMR is root object for a DAP4 dataset. It holds a D4Group and other
+ * information about the dataset (DAP protocol number, DMR version, etc.).
+ *
+ * @note This class holds the dataset name and filename (which might
+ * actually be a database name, but it's usually a filename). The variables
+ * of a DAP4 dataset are held by the D4Group instance (which is a child
+ * of Constructor).
+ */
+class DMR : public DapObj
+{
+private:
+    D4BaseTypeFactory *d_factory;
+
+    /// The name of the dataset. This should not be the pathname to a file
+    string d_name;
+    /// The pathname or other system identifier for the dataset
+    string d_filename;
+
+    /// DAP protocol major version number. Should be '4'
+    int d_dap_major;
+    /// DAP protocol minor version number.
+    int d_dap_minor;
+    /// String version of the DAP protocol number
+    string d_dap_version;
+
+    /// The version of the DMR document
+    string d_dmr_version;
+
+    /// The URL for the request base
+    string d_request_xml_base;
+
+    /// The namespace to use when printing the XML serialization
+    string d_namespace;
+
+    /// The maximum response size (in Kilo bytes)
+    long d_max_response_size;
+
+    /// The root group; holds dimensions, enums, variables, groups, ...
+    D4Group *d_root;
+
+    friend class DMRTest;
+
+protected:
+    void m_duplicate(const DMR &dmr);
+
+public:
+    DMR();
+    DMR(const DMR &dmr);
+    DMR(D4BaseTypeFactory *factory, const string &name = "");
+
+    DMR(D4BaseTypeFactory *factory, DDS &dds);
+
+    virtual ~DMR();
+
+    DMR &operator=(const DMR &rhs);
+
+    virtual void build_using_dds(DDS &dds);
+
+    /**
+     * Class invariant. If true, any method can be used.
+     * @return True if the instance is OK to use, false otherwise.
+     */
+    bool OK() const { return (d_factory && d_root && !d_dap_version.empty()); }
+
+    /** Get and set the DMR's name. This is effectively the 'dataset' name.
+     * It should not be used to reference the dataset's data store
+     * (e.g., it should not be a pathname to a file). This will be used in
+     * error messages.
+     */
+    //@{
+    string name() const { return d_name; }
+    void set_name(const string &n) { d_name = n; }
+    //@}
+
+    /** Get/set the factory which makes instances of the variables.
+        Specialize D4BaseTypeFactory so that a DMR will be
+        populated with your client or server's specialized types.*/
+    //@{
+    virtual D4BaseTypeFactory *factory() { return d_factory; }
+    virtual void set_factory(D4BaseTypeFactory *f) { d_factory = f; }
+    //@}
+
+    /** get/set the dataset's 'filename.' The filename is a string that can
+     * be used to access the dataset's actual data store (it's usually a
+     * pathname to a file, but it might be a database key.
+     */
+    //@{
+    string filename() const { return d_filename; }
+    void set_filename(const string &fn) { d_filename = fn;}
+    //@}
+
+    string dap_version() const { return d_dap_version; }
+    void set_dap_version(const string &version_string);
+    int dap_major() const { return d_dap_major; }
+    int dap_minor() const { return d_dap_minor; }
+
+    string dmr_version() const { return d_dmr_version; }
+    void set_dmr_version(const string &v) { d_dmr_version = v; }
+
+    /// Get the URL that will return this DMR/DDX/DataThing
+    string request_xml_base() const { return d_request_xml_base; }
+
+    /// @see get_request_xml_base
+    void set_request_xml_base(const string &xb) { d_request_xml_base = xb; }
+
+    /// Get the namespace associated with the DDS - likely set only by DDX responses
+    string get_namespace() const { return d_namespace; }
+
+    /// Set the namespace for this DDS/DDX object/response
+    void set_namespace(const string &ns) { d_namespace = ns; }
+
+    // TODO Move the response_limit methods to D4ResponseBuilder? jhrg 5/1/13
+    /// Get the maximum response size, in KB. Zero indicates no limit.
+    long response_limit() { return d_max_response_size; }
+
+    /** Set the maximum response size. Zero is the default value. The size
+        is given in kilobytes.
+        @param size The maximum size of the response in kilobytes. */
+    void set_response_limit(long size) { d_max_response_size = size; }
+
+    /// Get the estimated response size, in kilo bytes
+    long request_size(bool constrained);
+
+    /** Return the root group of this Dataset. If no root group has been
+     * set, use the D4BaseType factory to make it.
+     * @return The root group of the dataset.
+     */
+    D4Group *root();
+
+    static DDS *getDDS(DMR &dmr);
+    virtual DDS *getDDS();
+
+
+
+
+    void print_dap4(XMLWriter &xml, bool constrained = false);
+
+    virtual void dump(ostream &strm) const ;
+};
+
+} // namespace libdap
+
+#endif // _dmr_h
diff --git a/DODSFilter.cc b/DODSFilter.cc
new file mode 100644
index 0000000..3d5f5d5
--- /dev/null
+++ b/DODSFilter.cc
@@ -0,0 +1,1190 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1997-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// Implementation of the DODSFilter class. This class is used to build dods
+// filter programs which, along with a CGI program, comprise OPeNDAP servers.
+// jhrg 8/26/97
+
+
+#include "config.h"
+
+#include <signal.h>
+
+#ifndef WIN32
+#include <unistd.h>   // for getopt
+#include <sys/wait.h>
+#else
+#include <io.h>
+#include <fcntl.h>
+#include <process.h>
+#endif
+
+#include <iostream>
+#include <sstream>
+#include <string>
+#include <algorithm>
+#include <cstdlib>
+#include <cstring>
+
+#ifdef HAVE_UUID_UUID_H
+#include <uuid/uuid.h>	// used to build CID header value for data ddx
+#elif defined(HAVE_UUID_H)
+#include <uuid.h>
+#else
+#error "Could not find UUID library header"
+#endif
+
+#include <GetOpt.h>
+
+#include "DAS.h"
+#include "DDS.h"
+#include "debug.h"
+#include "mime_util.h"
+#include "Ancillary.h"
+#include "util.h"
+#include "escaping.h"
+#include "DODSFilter.h"
+#include "XDRStreamMarshaller.h"
+#include "InternalErr.h"
+
+#ifndef WIN32
+#include "SignalHandler.h"
+#include "EventHandler.h"
+#include "AlarmHandler.h"
+#endif
+
+#define CRLF "\r\n"             // Change here, expr-test.cc and DODSFilter.cc
+
+using namespace std;
+
+namespace libdap {
+
+const string usage =
+    "Usage: <handler name> -o <response> -u <url> [options ...] [data set]\n\
+    \n\
+    options: -o <response>: DAS, DDS, DataDDS, DDX, BLOB or Version (Required)\n\
+    -u <url>: The complete URL minus the CE (required for DDX)\n\
+    -c: Compress the response using the deflate algorithm.\n\
+    -e <expr>: When returning a DataDDS, use <expr> as the constraint.\n\
+    -v <version>: Use <version> as the version number\n\
+    -d <dir>: Look for ancillary file in <dir> (deprecated).\n\
+    -f <file>: Look for ancillary data in <file> (deprecated).\n\
+    -r <dir>: Use <dir> as a cache directory\n\
+    -l <time>: Conditional request; if data source is unchanged since\n\
+    <time>, return an HTTP 304 response.\n\
+    -t <seconds>: Timeout the handler after <seconds>.\n\
+    -h: This message.";
+
+/** Create an instance of DODSFilter using the command line
+arguments passed by the CGI (or other) program.  The default
+constructor is private; this and the copy constructor (which is
+just the default copy constructor) are the only way to create an
+instance of DODSFilter.
+
+These are the valid options:
+
+<dl>
+<dt><i>filename</i><dd>
+The name of the file on which the filter is to operate.  Usually
+this would be the file whose data has been requested. In fact, this class
+can be specialized and <i>any meaning</i> can be associated to this
+string. It could be the name of a database, for example.
+
+<dt><tt>-o</tt> <i>response</i><dd>
+
+Specifies the type of response desired. The \e response is a string
+and must be one of \c DAS, \c DDS, \c DataDDS or \c Version. Note
+that \c Version returns version information in the body of the response
+and is useful for debugging, et cetera. Each response returns version
+information in an HTTP header for internal use by a client.
+
+<dt><tt>-c</tt><dd>
+Send compressed data. Data are compressed using the deflate program.
+
+<dt><tt>-e</tt> <i>expression</i><dd>
+This option specifies a non-blank constraint expression used to
+subsample a dataset.
+
+<dt><tt>-v</tt> <i>cgi-version</i><dd> Set the CGI/Server version to
+<tt>cgi-version</tt>. This is a way for the caller to set version
+information passed back to the client either as the response to a
+version request of in the response headers.
+
+<dt><tt>-d</tt> <i>ancdir</i><dd>
+Specifies that ancillary data be sought in the <i>ancdir</i>
+directory. <i>ancdir</i> must end in '/'.
+
+<dt><tt>-f</tt> <i>ancfile</i><dd>
+Specifies that ancillary data may be found in a file called
+<i>ancfile</i>.
+
+<dt><tt>-r</tt> <i>cache directory</i><dd>
+Specify a directory to use if/when files are to be cached. Not all
+handlers support caching and each uses its own rules tailored to a
+specific file or data type.
+
+<dt><tt>-t</tt> <i>timeout</i><dd> Specifies a a timeout value in
+seconds. If the server runs longer than \e timeout seconds, an Error is
+returned to the client explaining that the request has timed out.
+
+<dt><tt>-l</tt> <i>time</i><dd> Indicates that the request is a
+conditional request; send a complete response if and only if the data has
+changed since <i>time</i>. If it has not changed since <i>time</i>, then
+send a 304 (Not Modified) response. The <i>time</i> parameter is the
+<tt>Last-Modified</tt> time from an If-Modified-Since condition GET
+request. It is given in seconds since the start of the Unix epoch
+(Midnight, 1 Jan 1970).
+
+</dl>
+
+@brief DODSFilter constructor. */
+
+DODSFilter::DODSFilter(int argc, char *argv[]) throw(Error)
+{
+    initialize(argc, argv);
+
+    DBG(cerr << "d_comp: " << d_comp << endl);
+    DBG(cerr << "d_dap2ce: " << d_dap2ce << endl);
+    DBG(cerr << "d_cgi_ver: " << d_cgi_ver << endl);
+    DBG(cerr << "d_response: " << d_response << endl);
+    DBG(cerr << "d_anc_dir: " << d_anc_dir << endl);
+    DBG(cerr << "d_anc_file: " << d_anc_file << endl);
+    DBG(cerr << "d_cache_dir: " << d_cache_dir << endl);
+    DBG(cerr << "d_conditional_request: " << d_conditional_request << endl);
+    DBG(cerr << "d_if_modified_since: " << d_if_modified_since << endl);
+    DBG(cerr << "d_url: " << d_url << endl);
+    DBG(cerr << "d_timeout: " << d_timeout << endl);
+}
+
+DODSFilter::~DODSFilter()
+{
+}
+
+/** Called when initializing a DODSFilter that's not going to be passed a
+command line arguments. */
+void
+DODSFilter::initialize()
+{
+    // Set default values. Don't use the C++ constructor initialization so
+    // that a subclass can have more control over this process.
+    d_comp = false;
+    d_bad_options = false;
+    d_conditional_request = false;
+    d_dataset = "";
+    d_dap2ce = "";
+    d_cgi_ver = "";
+    d_anc_dir = "";
+    d_anc_file = "";
+    d_cache_dir = "";
+    d_response = Unknown_Response;;
+    d_anc_das_lmt = 0;
+    d_anc_dds_lmt = 0;
+    d_if_modified_since = -1;
+    d_url = "";
+    d_program_name = "Unknown";
+    d_timeout = 0;
+
+#ifdef WIN32
+    //  We want serving from win32 to behave in a manner
+    //  similar to the UNIX way - no CR->NL terminated lines
+    //  in files. Hence stdout goes to binary mode.
+    _setmode(_fileno(stdout), _O_BINARY);
+#endif
+}
+
+/** Initialize. Specializations can call this once an empty DODSFilter has
+been created using the default constructor. Using a method such as this
+provides a way to specialize the process_options() method and then have
+that specialization called by the subclass' constructor.
+
+This class and any class that specializes it should call this method in
+its constructor. Note that when this method is called, the object is \e
+not fully constructed.
+
+@param argc The argument count
+@param argv The vector of char * argument strings. */
+void
+DODSFilter::initialize(int argc, char *argv[])
+{
+    initialize();
+
+    d_program_name = argv[0];
+
+    // This should be specialized by a subclass. This may throw Error.
+    int next_arg = process_options(argc, argv);
+
+    // Look at what's left after processing the command line options. Either
+    // there MUST be a dataset name OR the caller is asking for version
+    // information. If neither is true, then the options are bad.
+    if (next_arg < argc) {
+        d_dataset = argv[next_arg];
+        d_dataset = www2id(d_dataset, "%", "%20");
+    }
+    else if (get_response() != Version_Response)
+        print_usage();   // Throws Error
+}
+
+/** Processing the command line options passed to the filter is handled by
+this method so that specializations can change the options easily.
+
+@param argc The argument count
+@param argv The vector of char * argument strings.
+@return The index of the next, unprocessed, argument. This must be the
+identifier passed to the filter program that identifies the data source.
+It's often a file name. */
+int
+DODSFilter::process_options(int argc, char *argv[])
+{
+    DBG(cerr << "Entering process_options... ");
+
+    int option_char;
+    GetOpt getopt (argc, argv, "ce: v: d: f: r: l: o: u: t: ");
+
+    while ((option_char = getopt()) != -1) {
+        switch (option_char) {
+        case 'c': d_comp = true; break;
+        case 'e': set_ce(getopt.optarg); break;
+        case 'v': set_cgi_version(getopt.optarg); break;
+        case 'd': d_anc_dir = getopt.optarg; break;
+        case 'f': d_anc_file = getopt.optarg; break;
+        case 'r': d_cache_dir = getopt.optarg; break;
+        case 'o': set_response(getopt.optarg); break;
+        case 'u': set_URL(getopt.optarg); break;
+        case 't': d_timeout = atoi(getopt.optarg); break;
+        case 'l':
+            d_conditional_request = true;
+            d_if_modified_since
+            = static_cast<time_t>(strtol(getopt.optarg, NULL, 10));
+            break;
+        case 'h': print_usage();
+            break;
+                                 // exit(1);
+                                 // Removed 12/29/2011; exit should
+                                 // not be called by a library. NB:
+                                 // print_usage() throws Error.
+        default: print_usage();  // Throws Error
+            break;
+        }
+    }
+
+    DBGN(cerr << "exiting." << endl);
+
+    return getopt.optind; // return the index of the next argument
+}
+
+/** @brief Is this request conditional?
+
+@return True if the request is conditional.
+@see get_request_if_modified_since(). */
+bool
+DODSFilter::is_conditional() const
+{
+    return d_conditional_request;
+}
+
+/** Set the CGI/Server version number. Servers use this when answering
+requests for version information. The version `number' should include
+both the name of the server (e.g., <tt>ff_dods</tt>) as well
+as the version
+number. Since this information is typically divined by configure,
+it's up to the executable to poke the correct value in using this
+method.
+
+Note that the -v switch that this class understands is deprecated
+since it is usually called by Perl code. It makes more sense to have
+the actual C++ software set the version string.
+
+@param version A version string for this server. */
+void
+DODSFilter::set_cgi_version(string version)
+{
+    d_cgi_ver = version;
+}
+
+/** Return the version information passed to the instance when it was
+created. This string is passed to the DODSFilter ctor using the -v
+option.
+
+@return The version string supplied at initialization. */
+string
+DODSFilter::get_cgi_version() const
+{
+    return d_cgi_ver;
+}
+
+/** Return the entire constraint expression in a string.  This
+includes both the projection and selection clauses, but not the
+question mark.
+
+@brief Get the constraint expression.
+@return A string object that contains the constraint expression. */
+string
+DODSFilter::get_ce() const
+{
+    return d_dap2ce;
+}
+
+void
+DODSFilter::set_ce(string _ce)
+{
+    d_dap2ce = www2id(_ce, "%", "%20");
+}
+
+/** The ``dataset name'' is the filename or other string that the
+filter program will use to access the data. In some cases this
+will indicate a disk file containing the data.  In others, it
+may represent a database query or some other exotic data
+access method.
+
+@brief Get the dataset name.
+@return A string object that contains the name of the dataset. */
+string
+DODSFilter::get_dataset_name() const
+{
+    return d_dataset;
+}
+
+void
+DODSFilter::set_dataset_name(const string ds)
+{
+    d_dataset = www2id(ds, "%", "%20");
+}
+
+/** Get the URL. This returns the URL, minus the constraint originally sent
+to the server.
+@return The URL. */
+string
+DODSFilter::get_URL() const
+{
+    return d_url;
+}
+
+/** Set the URL. Set the URL sent to the server.
+@param url The URL, minus the constraint. */
+void
+DODSFilter::set_URL(const string &url)
+{
+    if (url.find('?') != url.npos)
+        print_usage();  // Throws Error
+
+    d_url = url;
+}
+
+/** To read version information that is specific to a certain
+dataset, override this method with an implementation that does
+what you want. By default, this returns an empty string.
+
+@brief Get the version information for the dataset.
+@return A string object that contains the dataset version
+information.  */
+string
+DODSFilter::get_dataset_version() const
+{
+    return "";
+}
+
+/** Set the response to be returned. Valid response names are "DAS", "DDS",
+"DataDDS, "Version".
+
+@param r The name of the object.
+@exception InternalErr Thrown if the response is not one of the valid
+names. */
+void DODSFilter::set_response(const string &r)
+{
+    if (r == "DAS" || r == "das") {
+	d_response = DAS_Response;
+	d_action = "das" ;
+    }
+    else if (r == "DDS" || r == "dds") {
+	d_response = DDS_Response;
+	d_action = "dds" ;
+    }
+    else if (r == "DataDDS" || r == "dods") {
+	d_response = DataDDS_Response;
+	d_action = "dods" ;
+    }
+    else if (r == "DDX" || r == "ddx") {
+	d_response = DDX_Response;
+	d_action = "ddx" ;
+    }
+    else if (r == "DataDDX" || r == "dataddx") {
+	d_response = DataDDX_Response;
+	d_action = "dataddx" ;
+    }
+    else if (r == "Version") {
+	d_response = Version_Response;
+	d_action = "version" ;
+    }
+    else
+	print_usage();   // Throws Error
+}
+
+/** Get the enum name of the response to be returned. */
+DODSFilter::Response
+DODSFilter::get_response() const
+{
+    return d_response;
+}
+
+/** Get the string name of the response to be returned. */
+string DODSFilter::get_action() const
+{
+    return d_action;
+}
+
+/** Get the dataset's last modified time. This returns the time at which
+    the dataset was last modified as defined by UNIX's notion of
+    modification. This does not take into account the modification of an
+    ancillary DAS or DDS. Time is given in seconds since the epoch (1 Jan
+    1970 00:00:00 GMT).
+
+    This method perform a simple check on the file named by the dataset
+    given when the DODSFilter instance was created. If the dataset is not
+    a filter, this method returns the current time. Servers which provide
+    access to non-file-based data should subclass DODSFilter and supply a
+    more suitable version of this method.
+
+    From the stat(2) man page: ``Traditionally, <tt>st_mtime</tt>
+    is changed by mknod(2), utime(2), and write(2). The
+    <tt>st_mtime</tt> is not changed for
+    changes in owner, group, hard link count, or mode.''
+
+    @return Time of the last modification in seconds since the epoch.
+    @see get_das_last_modified_time()
+    @see get_dds_last_modified_time() */
+time_t
+DODSFilter::get_dataset_last_modified_time() const
+{
+    return last_modified_time(d_dataset);
+}
+
+/** Get the last modified time for the dataset's DAS. This time, given in
+    seconds since the epoch (1 Jan 1970 00:00:00 GMT), is the greater of
+    the datasets's and any ancillary DAS' last modified time.
+
+    @param anc_location A directory to search for ancillary files (in
+    addition to the CWD).
+    @return Time of last modification of the DAS.
+    @see get_dataset_last_modified_time()
+    @see get_dds_last_modified_time() */
+time_t
+DODSFilter::get_das_last_modified_time(const string &anc_location) const
+{
+    DBG(cerr << "DODSFilter::get_das_last_modified_time(anc_location="
+        << anc_location << "call faf(das) d_dataset=" << d_dataset
+        << " d_anc_file=" << d_anc_file << endl);
+
+    string name
+    = Ancillary::find_ancillary_file(d_dataset, "das",
+                          (anc_location == "") ? d_anc_dir : anc_location,
+                          d_anc_file);
+
+    return max((name != "") ? last_modified_time(name) : 0,
+               get_dataset_last_modified_time());
+}
+
+/** Get the last modified time for the dataset's DDS. This time, given in
+    seconds since the epoch (1 Jan 1970 00:00:00 GMT), is the greater of
+    the datasets's and any ancillary DDS' last modified time.
+
+    @return Time of last modification of the DDS.
+    @see get_dataset_last_modified_time()
+    @see get_dds_last_modified_time() */
+time_t
+DODSFilter::get_dds_last_modified_time(const string &anc_location) const
+{
+    DBG(cerr << "DODSFilter::get_das_last_modified_time(anc_location="
+        << anc_location << "call faf(dds) d_dataset=" << d_dataset
+        << " d_anc_file=" << d_anc_file << endl);
+
+    string name
+    = Ancillary::find_ancillary_file(d_dataset, "dds",
+                          (anc_location == "") ? d_anc_dir : anc_location,
+                          d_anc_file);
+
+    return max((name != "") ? last_modified_time(name) : 0,
+               get_dataset_last_modified_time());
+}
+
+/** Get the last modified time to be used for a particular data request.
+    This method should look at both the constraint expression and any
+    ancillary files for this dataset. The implementation provided here
+    returns the latest time returned by the <tt>get_dataset</tt>...(),
+    <tt>get_das</tt>...() and <tt>get_dds</tt>...() methods and
+    does not currently check the CE.
+
+    @param anc_location A directory to search for ancillary files (in
+    addition to the CWD).
+    @return Time of last modification of the data.
+    @see get_dataset_last_modified_time()
+    @see get_das_last_modified_time()
+    @see get_dds_last_modified_time() */
+time_t
+DODSFilter::get_data_last_modified_time(const string &anc_location) const
+{
+    DBG(cerr << "DODSFilter::get_das_last_modified_time(anc_location="
+        << anc_location << "call faf(both) d_dataset=" << d_dataset
+        << " d_anc_file=" << d_anc_file << endl);
+
+    string dds_name
+    = Ancillary::find_ancillary_file(d_dataset, "dds",
+                          (anc_location == "") ? d_anc_dir : anc_location,
+                          d_anc_file);
+    string das_name
+    = Ancillary::find_ancillary_file(d_dataset, "das",
+                          (anc_location == "") ? d_anc_dir : anc_location,
+                          d_anc_file);
+
+    time_t m = max((das_name != "") ? last_modified_time(das_name) : (time_t)0,
+                   (dds_name != "") ? last_modified_time(dds_name) : (time_t)0);
+    // Note that this is a call to get_dataset_... not get_data_...
+    time_t n = get_dataset_last_modified_time();
+
+    return max(m, n);
+}
+
+/** Get the value of a conditional request's If-Modified-Since header.
+    This value is used to determine if the request should get a full
+    response or a Not Modified (304) response. The time is given in
+    seconds since the Unix epoch (midnight, 1 Jan 1970). If no time was
+    given with the request, this methods returns -1.
+
+    @return If-Modified-Since time from a condition GET request. */
+time_t
+DODSFilter::get_request_if_modified_since() const
+{
+    return d_if_modified_since;
+}
+
+/** The <tt>cache_dir</tt> is used to hold the cached .dds and .das files.
+    By default, this returns an empty string (store cache files in
+    current directory.
+
+    @brief Get the cache directory.
+    @return A string object that contains the cache file directory.  */
+string
+DODSFilter::get_cache_dir() const
+{
+    return d_cache_dir;
+}
+
+/** Set the server's timeout value. A value of zero (the default) means no
+    timeout.
+
+    @param t Server timeout in seconds. Default is zero (no timeout). */
+void
+DODSFilter::set_timeout(int t)
+{
+    d_timeout = t;
+}
+
+/** Get the server's timeout value. */
+int
+DODSFilter::get_timeout() const
+{
+    return d_timeout;
+}
+
+/** Use values of this instance to establish a timeout alarm for the server.
+    If the timeout value is zero, do nothing.
+
+    @todo When the alarm handler is called, two CRLF pairs are dumped to the
+    stream and then an Error object is sent. No attempt is made to write the
+    'correct' MIME headers for an Error object. Instead, a savvy client will
+    know that when an exception is thrown during a deserialize operation, it
+    should scan ahead in the input stream for an Error object. Add this, or a
+    sensible variant once libdap++ supports reliable error delivery. Dumb
+    clients will never get the Error object... */
+
+void
+DODSFilter::establish_timeout(FILE *stream) const
+{
+#ifndef WIN32
+    if (d_timeout > 0) {
+        SignalHandler *sh = SignalHandler::instance();
+        EventHandler *old_eh = sh->register_handler(SIGALRM, new AlarmHandler(stream));
+        delete old_eh;
+        alarm(d_timeout);
+    }
+#endif
+}
+
+void
+DODSFilter::establish_timeout(ostream &stream) const
+{
+#ifndef WIN32
+    if (d_timeout > 0) {
+        SignalHandler *sh = SignalHandler::instance();
+        EventHandler *old_eh = sh->register_handler(SIGALRM, new AlarmHandler(stream));
+        delete old_eh;
+        alarm(d_timeout);
+    }
+#endif
+}
+
+static const char *emessage = "DODS internal server error; usage error. Please report this to the dataset maintainer, or to the opendap-tech@opendap.org mailing list.";
+
+/** This message is printed when the filter program is incorrectly
+    invoked by the dispatch CGI.  This is an error in the server
+    installation or the CGI implementation, so the error message is
+    written to stderr instead of stdout.  A server's stderr messages
+    show up in the httpd log file. In addition, an error object is
+    sent back to the client program telling them that the server is
+    broken.
+
+    @brief Print usage information for a filter program. */
+void
+DODSFilter::print_usage() const
+{
+    // Write a message to the WWW server error log file.
+    ErrMsgT(usage.c_str());
+
+    throw Error(emessage);
+}
+
+/** This function formats and sends to stdout version
+    information from the httpd server, the server dispatch scripts,
+    the DODS core software, and (optionally) the dataset.
+
+    @brief Send version information back to the client program. */
+void
+DODSFilter::send_version_info() const
+{
+    do_version(d_cgi_ver, get_dataset_version());
+}
+
+/** This function formats and prints an ASCII representation of a
+    DAS on stdout.  This has the effect of sending the DAS object
+    back to the client program.
+
+    @brief Transmit a DAS.
+    @param out The output FILE to which the DAS is to be sent.
+    @param das The DAS object to be sent.
+    @param anc_location The directory in which the external DAS file resides.
+    @param with_mime_headers If true (the default) send MIME headers.
+    @return void
+    @see DAS */
+void
+DODSFilter::send_das(FILE *out, DAS &das, const string &anc_location,
+                     bool with_mime_headers) const
+{
+    ostringstream oss;
+    send_das(oss, das, anc_location, with_mime_headers);
+    fwrite(oss.str().data(), sizeof(char), oss.str().length(), out);
+}
+
+/** This function formats and prints an ASCII representation of a
+    DAS on stdout.  This has the effect of sending the DAS object
+    back to the client program.
+
+    @brief Transmit a DAS.
+    @param out The output stream to which the DAS is to be sent.
+    @param das The DAS object to be sent.
+    @param anc_location The directory in which the external DAS file resides.
+    @param with_mime_headers If true (the default) send MIME headers.
+    @return void
+    @see DAS */
+void
+DODSFilter::send_das(ostream &out, DAS &das, const string &anc_location,
+                     bool with_mime_headers) const
+{
+    time_t das_lmt = get_das_last_modified_time(anc_location);
+    if (is_conditional()
+        && das_lmt <= get_request_if_modified_since()
+        && with_mime_headers) {
+        set_mime_not_modified(out);
+    }
+    else {
+        if (with_mime_headers)
+            set_mime_text(out, dods_das, d_cgi_ver, x_plain, das_lmt);
+        das.print(out);
+    }
+    out << flush ;
+}
+
+void
+DODSFilter::send_das(DAS &das, const string &anc_location,
+                     bool with_mime_headers) const
+{
+    send_das(cout, das, anc_location, with_mime_headers);
+}
+
+/** This function formats and prints an ASCII representation of a
+    DDS on stdout.  When called by a CGI program, this has the
+    effect of sending a DDS object back to the client
+    program. Either an entire DDS or a constrained DDS may be sent.
+
+    @brief Transmit a DDS.
+    @param out The output FILE to which the DAS is to be sent.
+    @param dds The DDS to send back to a client.
+    @param eval A reference to the ConstraintEvaluator to use.
+    @param constrained If this argument is true, evaluate the
+    current constraint expression and send the `constrained DDS'
+    back to the client.
+    @param anc_location The directory in which the external DAS file resides.
+    @param with_mime_headers If true (the default) send MIME headers.
+    @return void
+    @see DDS */
+void
+DODSFilter::send_dds(FILE *out, DDS &dds, ConstraintEvaluator &eval,
+                     bool constrained,
+                     const string &anc_location,
+                     bool with_mime_headers) const
+{
+    ostringstream oss;
+    send_dds(oss, dds, eval, constrained, anc_location, with_mime_headers);
+    fwrite(oss.str().data(), sizeof(char), oss.str().length(), out);
+}
+
+/** This function formats and prints an ASCII representation of a
+    DDS on stdout.  When called by a CGI program, this has the
+    effect of sending a DDS object back to the client
+    program. Either an entire DDS or a constrained DDS may be sent.
+
+    @brief Transmit a DDS.
+    @param out The output stream to which the DAS is to be sent.
+    @param dds The DDS to send back to a client.
+    @param eval A reference to the ConstraintEvaluator to use.
+    @param constrained If this argument is true, evaluate the
+    current constraint expression and send the `constrained DDS'
+    back to the client.
+    @param anc_location The directory in which the external DAS file resides.
+    @param with_mime_headers If true (the default) send MIME headers.
+    @return void
+    @see DDS */
+void
+DODSFilter::send_dds(ostream &out, DDS &dds, ConstraintEvaluator &eval,
+                     bool constrained,
+                     const string &anc_location,
+                     bool with_mime_headers) const
+{
+    // If constrained, parse the constraint. Throws Error or InternalErr.
+    if (constrained)
+        eval.parse_constraint(d_dap2ce, dds);
+
+    if (eval.functional_expression())
+        throw Error("Function calls can only be used with data requests. To see the structure of the underlying data source, reissue the URL without the function.");
+
+    time_t dds_lmt = get_dds_last_modified_time(anc_location);
+    if (is_conditional()
+        && dds_lmt <= get_request_if_modified_since()
+        && with_mime_headers) {
+        set_mime_not_modified(out);
+    }
+    else {
+        if (with_mime_headers)
+            set_mime_text(out, dods_dds, d_cgi_ver, x_plain, dds_lmt);
+        if (constrained)
+            dds.print_constrained(out);
+        else
+            dds.print(out);
+    }
+
+    out << flush ;
+}
+
+void
+DODSFilter::send_dds(DDS &dds, ConstraintEvaluator &eval,
+                     bool constrained, const string &anc_location,
+                     bool with_mime_headers) const
+{
+    send_dds(cout, dds, eval, constrained, anc_location, with_mime_headers);
+}
+
+// 'lmt' unused. Should it be used to supply a LMT or removed from the
+// method? jhrg 8/9/05
+void
+DODSFilter::functional_constraint(BaseType &var, DDS &dds,
+                                  ConstraintEvaluator &eval, FILE *out) const
+{
+    ostringstream oss;
+    functional_constraint(var, dds, eval, oss);
+    fwrite(oss.str().data(), sizeof(char), oss.str().length(), out);
+}
+
+// 'lmt' unused. Should it be used to supply a LMT or removed from the
+// method? jhrg 8/9/05
+void
+DODSFilter::functional_constraint(BaseType &var, DDS &dds,
+                                  ConstraintEvaluator &eval, ostream &out) const
+{
+    out << "Dataset {\n" ;
+    var.print_decl(out, "    ", true, false, true);
+    out << "} function_value;\n" ;
+    out << "Data:\n" ;
+
+    out << flush ;
+
+    // Grab a stream that encodes using XDR.
+    XDRStreamMarshaller m( out ) ;
+
+    try {
+        // In the following call to serialize, suppress CE evaluation.
+        var.serialize(eval, dds, m, false);
+    }
+    catch (Error &e) {
+        throw;
+    }
+}
+
+void
+DODSFilter::dataset_constraint(DDS & dds, ConstraintEvaluator & eval,
+                               FILE * out, bool ce_eval) const
+{
+    ostringstream oss;
+    dataset_constraint(dds, eval, oss, ce_eval);
+    fwrite(oss.str().data(), sizeof(char), oss.str().length(), out);
+}
+
+void
+DODSFilter::dataset_constraint(DDS & dds, ConstraintEvaluator & eval,
+                               ostream &out, bool ce_eval) const
+{
+    // send constrained DDS
+    dds.print_constrained(out);
+    out << "Data:\n" ;
+    out << flush ;
+
+    // Grab a stream that encodes using XDR.
+    XDRStreamMarshaller m( out ) ;
+
+    try {
+        // Send all variables in the current projection (send_p())
+        for (DDS::Vars_iter i = dds.var_begin(); i != dds.var_end(); i++)
+            if ((*i)->send_p()) {
+                DBG(cerr << "Sending " << (*i)->name() << endl);
+                (*i)->serialize(eval, dds, m, ce_eval);
+            }
+    }
+    catch (Error & e) {
+        throw;
+    }
+}
+
+void
+DODSFilter::dataset_constraint_ddx(DDS & dds, ConstraintEvaluator & eval,
+                               ostream &out, const string &boundary,
+                               const string &start, bool ce_eval) const
+{
+    // Write the MPM headers for the DDX (text/xml) part of the response
+    set_mime_ddx_boundary(out, boundary, start, dods_ddx);
+
+    // Make cid
+    uuid_t uu;
+    uuid_generate(uu);
+    char uuid[37];
+    uuid_unparse(uu, &uuid[0]);
+    char domain[256];
+    if (getdomainname(domain, 255) != 0 || strlen(domain) == 0)
+	strncpy(domain, "opendap.org", 255);
+
+    string cid = string(&uuid[0]) + "@" + string(&domain[0]);
+
+    // Send constrained DDX with a data blob reference
+    dds.print_xml_writer(out, true, cid);
+
+    // Write the MPM headers for the data part of the response.
+    set_mime_data_boundary(out, boundary, cid, dap4_data, binary);
+
+    // Grab a stream that encodes using XDR.
+    XDRStreamMarshaller m( out ) ;
+
+    try {
+        // Send all variables in the current projection (send_p())
+        for (DDS::Vars_iter i = dds.var_begin(); i != dds.var_end(); i++)
+            if ((*i)->send_p()) {
+                DBG(cerr << "Sending " << (*i)->name() << endl);
+                (*i)->serialize(eval, dds, m, ce_eval);
+            }
+    }
+    catch (Error & e) {
+        throw;
+    }
+}
+
+/** Send the data in the DDS object back to the client program. The data is
+    encoded using a Marshaller, and enclosed in a MIME document which is all sent
+    to \c data_stream. If this is being called from a CGI, \c data_stream is
+    probably \c stdout and writing to it has the effect of sending the
+    response back to the client.
+
+    @brief Transmit data.
+    @param dds A DDS object containing the data to be sent.
+    @param eval A reference to the ConstraintEvaluator to use.
+    @param data_stream Write the response to this FILE.
+    @param anc_location A directory to search for ancillary files (in
+    addition to the CWD).  This is used in a call to
+    get_data_last_modified_time().
+    @param with_mime_headers If true, include the MIME headers in the response.
+    Defaults to true.
+    @return void */
+void
+DODSFilter::send_data(DDS & dds, ConstraintEvaluator & eval,
+                      FILE * data_stream, const string & anc_location,
+                      bool with_mime_headers) const
+{
+    ostringstream oss;
+    send_data(dds, eval, oss, anc_location, with_mime_headers);
+    fwrite(oss.str().data(), sizeof(char), oss.str().length(), data_stream);
+}
+
+/** Send the data in the DDS object back to the client program. The data is
+    encoded using a Marshaller, and enclosed in a MIME document which is all sent
+    to \c data_stream. If this is being called from a CGI, \c data_stream is
+    probably \c stdout and writing to it has the effect of sending the
+    response back to the client.
+
+    @brief Transmit data.
+    @param dds A DDS object containing the data to be sent.
+    @param eval A reference to the ConstraintEvaluator to use.
+    @param data_stream Write the response to this stream.
+    @param anc_location A directory to search for ancillary files (in
+    addition to the CWD).  This is used in a call to
+    get_data_last_modified_time().
+    @param with_mime_headers If true, include the MIME headers in the response.
+    Defaults to true.
+    @return void */
+void
+DODSFilter::send_data(DDS & dds, ConstraintEvaluator & eval,
+                      ostream & data_stream, const string & anc_location,
+                      bool with_mime_headers) const
+{
+    // If this is a conditional request and the server should send a 304
+    // response, do that and exit. Otherwise, continue on and send the full
+    // response.
+    time_t data_lmt = get_data_last_modified_time(anc_location);
+    if (is_conditional()
+        && data_lmt <= get_request_if_modified_since()
+        && with_mime_headers) {
+        set_mime_not_modified(data_stream);
+        return;
+    }
+    // Set up the alarm.
+    establish_timeout(data_stream);
+    dds.set_timeout(d_timeout);
+
+    eval.parse_constraint(d_dap2ce, dds);   // Throws Error if the ce doesn't
+					// parse.
+
+    dds.tag_nested_sequences(); // Tag Sequences as Parent or Leaf node.
+
+    // Start sending the response...
+
+    // Handle *functional* constraint expressions specially
+#if 0
+    if (eval.functional_expression()) {
+        // Get the result and then start sending the headers. This provides a
+        // way to send errors back to the client w/o colliding with the
+        // normal response headers. There's some duplication of code with this
+        // and the else-clause.
+        BaseType *var = eval.eval_function(dds, d_dataset);
+        if (!var)
+            throw Error(unknown_error, "Error calling the CE function.");
+
+       if (with_mime_headers)
+            set_mime_binary(data_stream, dods_data, d_cgi_ver, x_plain, data_lmt);
+
+	data_stream << flush ;
+
+        functional_constraint(*var, dds, eval, data_stream);
+        delete var;
+        var = 0;
+    }
+#endif
+    if (eval.function_clauses()) {
+	DDS *fdds = eval.eval_function_clauses(dds);
+        if (with_mime_headers)
+            set_mime_binary(data_stream, dods_data, d_cgi_ver, x_plain, data_lmt);
+
+        dataset_constraint(*fdds, eval, data_stream, false);
+	delete fdds;
+    }
+    else {
+        if (with_mime_headers)
+            set_mime_binary(data_stream, dods_data, d_cgi_ver, x_plain, data_lmt);
+
+        dataset_constraint(dds, eval, data_stream);
+    }
+
+    data_stream << flush ;
+}
+
+/** Send the DDX response. The DDX never contains data, instead it holds a
+    reference to a Blob response which is used to get the data values. The
+    DDS and DAS objects are built using code that already exists in the
+    servers.
+
+    @param dds The dataset's DDS \e with attributes in the variables.
+    @param eval A reference to the ConstraintEvaluator to use.
+    @param out Destination
+    @param with_mime_headers If true, include the MIME headers in the response.
+    Defaults to true. */
+void
+DODSFilter::send_ddx(DDS &dds, ConstraintEvaluator &eval, FILE *out,
+                     bool with_mime_headers) const
+{
+    ostringstream oss;
+    send_ddx(dds, eval, oss, with_mime_headers);
+    fwrite(oss.str().data(), sizeof(char), oss.str().length(), out);
+}
+
+/** Send the DDX response. The DDX never contains data, instead it holds a
+    reference to a Blob response which is used to get the data values. The
+    DDS and DAS objects are built using code that already exists in the
+    servers.
+
+    @param dds The dataset's DDS \e with attributes in the variables.
+    @param eval A reference to the ConstraintEvaluator to use.
+    @param out Destination
+    @param with_mime_headers If true, include the MIME headers in the response.
+    Defaults to true. */
+void
+DODSFilter::send_ddx(DDS &dds, ConstraintEvaluator &eval, ostream &out,
+                     bool with_mime_headers) const
+{
+    // If constrained, parse the constraint. Throws Error or InternalErr.
+    if (!d_dap2ce.empty())
+        eval.parse_constraint(d_dap2ce, dds);
+
+    if (eval.functional_expression())
+        throw Error("Function calls can only be used with data requests. To see the structure of the underlying data source, reissue the URL without the function.");
+
+    time_t dds_lmt = get_dds_last_modified_time(d_anc_dir);
+
+    // If this is a conditional request and the server should send a 304
+    // response, do that and exit. Otherwise, continue on and send the full
+    // response.
+    if (is_conditional() && dds_lmt <= get_request_if_modified_since()
+        && with_mime_headers) {
+        set_mime_not_modified(out);
+        return;
+    }
+    else {
+        if (with_mime_headers)
+            set_mime_text(out, dods_ddx, d_cgi_ver, x_plain, dds_lmt);
+        dds.print_xml_writer(out, !d_dap2ce.empty(), "");
+    }
+}
+
+/** Send the data in the DDS object back to the client program. The data is
+    encoded using a Marshaller, and enclosed in a MIME document which is all sent
+    to \c data_stream. If this is being called from a CGI, \c data_stream is
+    probably \c stdout and writing to it has the effect of sending the
+    response back to the client.
+
+    @brief Transmit data.
+
+    @param dds A DDS object containing the data to be sent.
+    @param eval A reference to the ConstraintEvaluator to use.
+    @param data_stream Write the response to this stream.
+    @param start
+    @param boundary
+    @param anc_location A directory to search for ancillary files (in
+    addition to the CWD).  This is used in a call to
+    get_data_last_modified_time().
+    @param with_mime_headers If true, include the MIME headers in the response.
+    Defaults to true.
+
+    @return void */
+void
+DODSFilter::send_data_ddx(DDS & dds, ConstraintEvaluator & eval,
+                      ostream & data_stream, const string &start,
+                      const string &boundary, const string & anc_location,
+                      bool with_mime_headers) const
+{
+    // If this is a conditional request and the server should send a 304
+    // response, do that and exit. Otherwise, continue on and send the full
+    // response.
+    time_t data_lmt = get_data_last_modified_time(anc_location);
+    if (is_conditional()
+        && data_lmt <= get_request_if_modified_since()
+        && with_mime_headers) {
+        set_mime_not_modified(data_stream);
+        return;
+    }
+    // Set up the alarm.
+    establish_timeout(data_stream);
+    dds.set_timeout(d_timeout);
+
+    eval.parse_constraint(d_dap2ce, dds);   // Throws Error if the ce doesn't
+					// parse.
+
+    dds.tag_nested_sequences(); // Tag Sequences as Parent or Leaf node.
+
+    // Start sending the response...
+
+    // Handle *functional* constraint expressions specially
+#if 0
+    if (eval.functional_expression()) {
+        BaseType *var = eval.eval_function(dds, d_dataset);
+        if (!var)
+            throw Error(unknown_error, "Error calling the CE function.");
+
+        if (with_mime_headers)
+            set_mime_multipart(data_stream, boundary, start, dods_data_ddx,
+		d_cgi_ver, x_plain, data_lmt);
+	data_stream << flush ;
+	BaseTypeFactory btf;
+	DDS var_dds(&btf, var->name());
+	var->set_send_p(true);
+	var_dds.add_var(var);
+        serialize_dap2_data_ddx(var_dds, eval, data_stream, boundary, start);
+
+        // functional_constraint_ddx(*var, dds, eval, data_stream, boundary);
+        delete var;
+        var = 0;
+    }
+#endif
+    if (eval.function_clauses()) {
+    	DDS *fdds = eval.eval_function_clauses(dds);
+        if (with_mime_headers)
+            set_mime_multipart(data_stream, boundary, start, dods_data_ddx,
+        	    d_cgi_ver, x_plain, data_lmt);
+        data_stream << flush ;
+        dataset_constraint(*fdds, eval, data_stream, false);
+    	delete fdds;
+    }
+    else {
+        if (with_mime_headers)
+            set_mime_multipart(data_stream, boundary, start, dods_data_ddx,
+        	    d_cgi_ver, x_plain, data_lmt);
+        data_stream << flush ;
+        dataset_constraint_ddx(dds, eval, data_stream, boundary, start);
+    }
+
+    data_stream << flush ;
+
+    if (with_mime_headers)
+	data_stream << CRLF << "--" << boundary << "--" << CRLF;
+}
+
+} // namespace libdap
+
diff --git a/DODSFilter.h b/DODSFilter.h
new file mode 100644
index 0000000..a9b9aae
--- /dev/null
+++ b/DODSFilter.h
@@ -0,0 +1,238 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1997-1999
+// Please first read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+// jhrg,jimg James Gallagher <jgallagher@gso.uri.edu>
+
+#ifndef _dodsfilter_h
+#define _dodsfilter_h
+
+#include <string>
+
+#ifndef _das_h
+#include "DAS.h"
+#endif
+
+#ifndef _dds_h
+#include "DDS.h"
+#endif
+
+#ifndef constraint_evaluator_h
+#include "ConstraintEvaluator.h"
+#endif
+
+namespace libdap
+{
+
+/** When a DODS server receives a request from a DODS client, the
+    server CGI script dispatches the request to one of several
+    ``filter'' programs.  Each filter is responsible for returning a
+    different aspect of the dataset information: one is for data, one
+    is for the dataset DDS, one is for the dataset DAS, and a fourth
+    is for a usage message describing the server itself.  Some
+    installations may have additional optional filters.
+
+    The filter program receives a data request from the dispatch
+    script. It receives its operating parameters from the command
+    line, like any UNIX command, and it returns its output to standard
+    output, which the httpd server packages up into a reply to the
+    client.
+
+    This class contains some common functions for the filter programs
+    used to make up the DODS data servers. The filter programs do not
+    <i>have</i> to be called by a CGI program, but that is the normal
+    mechanism by which they are invoked.
+
+    @todo Add a test to make sure that the required arguments are given.
+    @todo We need to rethink the ancillary file/directory stuff. I don't
+    think it's ever been used...
+
+    @brief Common functions for DODS server filter programs.
+    @author jhrg 8/26/97 */
+
+class DODSFilter
+{
+public:
+    /** Types of responses DODSFilter know about. */
+    enum Response {
+        Unknown_Response,
+        DAS_Response,
+        DDS_Response,
+        DataDDS_Response,
+        DDX_Response,
+        DataDDX_Response,
+        BLOB_Response,
+        Version_Response
+    };
+
+protected:
+    bool d_comp;  // True if the output should be compressed.
+    bool d_bad_options;  // True if the options (argc,argv) are bad.
+    bool d_conditional_request;
+
+    string d_program_name; // Name of the filter program
+    string d_dataset;  // Name of the dataset/database
+    string d_dap2ce;  // DAP2 Constraint expression
+    string d_cgi_ver;  // Version of CGI script (caller)
+    string d_anc_dir;  // Look here for ancillary files
+    string d_anc_file;  // Use this for ancillary file name
+    string d_cache_dir;  // Use this for cache files
+    string d_url;  // URL minus CE.
+
+    Response d_response; // enum name of the response to generate
+    string d_action;  // string name of the response to generate
+
+    int d_timeout;  // Server timeout after N seconds
+
+    time_t d_anc_das_lmt; // Last modified time of the anc. DAS.
+    time_t d_anc_dds_lmt; // Last modified time of the anc. DDS.
+    time_t d_if_modified_since; // Time from a conditional request.
+
+    void initialize();
+    void initialize(int argc, char *argv[]);
+
+    virtual int process_options(int argc, char *argv[]);
+
+public:
+    /** Make an empty instance. Use the set_*() methods to load with needed
+        values. You must call at least set_dataset_name() or be requesting
+        version information.
+
+        @todo Add methods to provide a way to set all of the parameters
+        this class contains. They can currently only be set using the
+        argc/argv command line parameters. */
+    DODSFilter()
+    {
+        initialize();
+    }
+    DODSFilter(int argc, char *argv[]) throw(Error);
+
+    virtual ~DODSFilter();
+
+    virtual bool is_conditional() const;
+
+    virtual string get_cgi_version() const;
+    virtual void set_cgi_version(string version);
+
+    virtual string get_ce() const;
+    virtual void set_ce(string _ce);
+
+    virtual string get_dataset_name() const;
+    virtual void set_dataset_name(const string _dataset);
+
+    virtual string get_URL() const;
+    virtual void set_URL(const string &url);
+
+    virtual string get_dataset_version() const;
+
+    virtual Response get_response() const;
+    virtual string get_action() const;
+    virtual void set_response(const string &r);
+
+    virtual time_t get_dataset_last_modified_time() const;
+
+    virtual time_t get_das_last_modified_time(const string &anc_location = "") const;
+
+    virtual time_t get_dds_last_modified_time(const string &anc_location = "") const;
+
+    virtual time_t get_data_last_modified_time(const string &anc_location = "") const;
+
+    virtual time_t get_request_if_modified_since() const;
+
+    virtual string get_cache_dir() const;
+
+    void set_timeout(int timeout = 0);
+
+    int get_timeout() const;
+
+    virtual void establish_timeout(ostream &stream) const;
+
+    virtual void print_usage() const;
+
+    virtual void send_version_info() const;
+
+    virtual void send_das(DAS &das, const string &anc_location = "",
+                          bool with_mime_headers = true) const;
+    virtual void send_das(ostream &out, DAS &das, const string &anc_location = "",
+                          bool with_mime_headers = true) const;
+
+    virtual void send_dds(DDS &dds, ConstraintEvaluator &eval,
+                          bool constrained = false,
+                          const string &anc_location = "",
+                          bool with_mime_headers = true) const;
+    virtual void send_dds(ostream &out, DDS &dds, ConstraintEvaluator &eval,
+                          bool constrained = false,
+                          const string &anc_location = "",
+                          bool with_mime_headers = true) const;
+    // deprecated
+    virtual void functional_constraint(BaseType &var, DDS &dds,
+                                       ConstraintEvaluator &eval, ostream &out) const;
+
+    virtual void dataset_constraint(DDS &dds, ConstraintEvaluator &eval,
+                                    ostream &out, bool ce_eval = true) const;
+    virtual void dataset_constraint_ddx(DDS & dds, ConstraintEvaluator & eval,
+                                   ostream &out, const string &boundary,
+                                   const string &start,
+                                   bool ce_eval = true) const;
+
+    virtual void send_data(DDS &dds, ConstraintEvaluator &eval,
+                           ostream &data_stream,
+                           const string &anc_location = "",
+                           bool with_mime_headers = true) const;
+    virtual void send_ddx(DDS &dds, ConstraintEvaluator &eval, ostream &out,
+                          bool with_mime_headers = true) const;
+    virtual void send_data_ddx(DDS &dds, ConstraintEvaluator &eval,
+                           ostream &data_stream, const string &start,
+                           const string &boundary,
+                           const string &anc_location = "",
+                           bool with_mime_headers = true) const;
+
+    virtual void establish_timeout(FILE *stream) const;
+    virtual void send_das(FILE *out, DAS &das, const string &anc_location = "",
+                          bool with_mime_headers = true) const;
+    virtual void send_dds(FILE *out, DDS &dds, ConstraintEvaluator &eval,
+                          bool constrained = false,
+                          const string &anc_location = "",
+                          bool with_mime_headers = true) const;
+    // deprecated
+    virtual void functional_constraint(BaseType &var, DDS &dds,
+                                       ConstraintEvaluator &eval, FILE *out) const;
+
+    virtual void dataset_constraint(DDS &dds, ConstraintEvaluator &eval,
+                                    FILE *out, bool ce_eval = true) const;
+    virtual void send_data(DDS &dds, ConstraintEvaluator &eval,
+                           FILE *data_stream,
+                           const string &anc_location = "",
+                           bool with_mime_headers = true) const;
+    virtual void send_ddx(DDS &dds, ConstraintEvaluator &eval, FILE *out,
+                          bool with_mime_headers = true) const;
+};
+
+} // namespace libdap
+
+#endif // _dodsfilter_h
diff --git a/DapIndent.cc b/DapIndent.cc
new file mode 100644
index 0000000..2369124
--- /dev/null
+++ b/DapIndent.cc
@@ -0,0 +1,87 @@
+// DapIndent.cc
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: Patrick West <pwest@ucar.edu>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1994-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      pwest       Patrick West <pwest@ucar.edu>
+
+// Methods for the class DapIndent - an indentation class to support
+// debugging and the dump methods.
+
+#include "config.h"
+
+#include "DapIndent.h"
+
+namespace libdap {
+
+string DapIndent::_indent ;
+
+void
+DapIndent::Indent()
+{
+    _indent += "    " ;
+}
+
+void
+DapIndent::UnIndent()
+{
+    if (_indent.length() == 0)
+        return ;
+    if (_indent.length() == 4)
+        _indent = "" ;
+    else
+        _indent = _indent.substr(0, _indent.length() - 4) ;
+}
+
+void
+DapIndent::Reset()
+{
+    _indent = "" ;
+}
+
+const string &
+DapIndent::GetIndent()
+{
+    return _indent ;
+}
+
+void
+DapIndent::SetIndent(const string &indent)
+{
+    _indent = indent ;
+}
+
+ostream &
+DapIndent::LMarg(ostream &strm)
+{
+    strm << _indent ;
+    return strm ;
+}
+
+} // namespace libdap
+
diff --git a/DapIndent.h b/DapIndent.h
new file mode 100644
index 0000000..001a74b
--- /dev/null
+++ b/DapIndent.h
@@ -0,0 +1,67 @@
+// DapIndent.h
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: Patrick West <pwest@ucar.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1994-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      pwest       Patrick West <pwest@ucar.edu>
+
+/** @brief indentation to help with dump methods and debugging
+ */
+
+#ifndef I_DapIndent_h
+#define I_DapIndent_h 1
+
+#include <string>
+#include <iostream>
+
+using std::string ;
+using std::ostream ;
+
+namespace libdap
+{
+
+/** @brief class with static methods to help with indentation of debug
+ * information.
+ */
+class DapIndent
+{
+private:
+    static string  _indent ;
+public:
+    static void   Indent() ;
+    static void   UnIndent() ;
+    static void   Reset() ;
+    static const string & GetIndent() ;
+    static void   SetIndent(const string &indent) ;
+    static ostream &  LMarg(ostream &strm) ;
+} ;
+
+} // namespace libdap
+
+#endif // I_DapIndent_h
+
diff --git a/DapObj.h b/DapObj.h
new file mode 100644
index 0000000..388cb94
--- /dev/null
+++ b/DapObj.h
@@ -0,0 +1,91 @@
+// DapObj.h
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: Patrick West <pwest@ucar.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1994-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      pwest       Patrick West <pwest@ucar.edu>
+
+/** @brief top level DAP object to house generic methods
+ */
+
+#ifndef A_DapObj_h
+#define A_DapObj_h 1
+
+#include <iostream>
+
+using std::ostream ;
+using std::endl ;
+
+#include "DapIndent.h"
+
+namespace libdap
+{
+
+/** @brief libdap base object for common functionality of libdap objects
+ *
+ * A base object for any libdap objects to use. Provides simple
+ * methods for dumping the contents of the object.
+ */
+
+class DapObj
+{
+public:
+    virtual  ~DapObj()
+    {}
+
+    /** @brief dump the contents of this object to the specified ostream
+     *
+     * This method is implemented by all derived classes to dump their
+     * contents, in other words, any state they might have, private variables,
+     * etc...
+     *
+     * @param strm C++ i/o stream to dump the object to
+     */
+    virtual void dump(ostream &strm) const = 0 ;
+} ;
+
+} // namespace libdap
+
+/** @brief dump the contents of the specified object to the specified ostream
+ *
+ * This inline method uses the dump method of the DapObj instance passed
+ * to it. This allows a user to dump the contents of an object instead of just
+ * getting the pointer value of the object.
+ *
+ * @param strm C++ i/o stream to dump the object to
+ * @param obj The DapObj to dump
+ */
+inline ostream &
+operator<<(ostream &strm, const libdap::DapObj &obj)
+{
+    obj.dump(strm) ;
+    return strm ;
+}
+
+#endif // A_DapObj_h
+
diff --git a/DapXmlNamespaces.cc b/DapXmlNamespaces.cc
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/DapXmlNamespaces.cc
diff --git a/DapXmlNamespaces.h b/DapXmlNamespaces.h
new file mode 100644
index 0000000..161fb94
--- /dev/null
+++ b/DapXmlNamespaces.h
@@ -0,0 +1,143 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2017 OPeNDAP, Inc.
+// Author: Nathan Potter <ndp@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#ifndef DAPXMLNAMSPACES_H_
+#define DAPXMLNAMSPACES_H_
+
+#include <string>
+
+namespace libdap {
+
+enum DAPVersion { DAP_2_0, DAP_3_2, DAP_4_0 };
+
+class DapXmlNamspaces {
+
+public:
+
+	virtual ~DapXmlNamspaces() {};
+
+	/**
+	 * Returns the XML Schema-instance namespace string.
+	 */
+	static std::string getXmlXsiNamespace(){
+		return "http://www.w3.org/2001/XMLSchema-instance";
+	}
+
+	/**
+	 * Returns the XML  namespace string.
+	 */
+	static std::string getXmlNamespace(){
+		return "http://www.w3.org/XML/1998/namespace";
+	}
+
+	/**
+	 * Returns the GRDDL transformation URL for the passed DAP version.
+	 */
+	static std::string getGrddlTransformation(DAPVersion version){
+
+		switch(version) {
+		case DAP_2_0:
+			throw InternalErr(__FILE__, __LINE__, "DapXmlNamspaces::getDapXmlNamespaceString() - GRDDL Transformation undefined for DAP 2.0");
+			break;
+
+		case DAP_3_2:
+			return "http://xml.opendap.org/transforms/ddxToRdfTriples.xsl";
+			break;
+
+		case DAP_4_0:
+			throw InternalErr(__FILE__, __LINE__, "DapXmlNamspaces::getDapXmlNamespaceString() - GRDDL Transformation undefined for DAP 4.0");
+			break;
+
+		default:
+			throw InternalErr(__FILE__, __LINE__, "DapXmlNamspaces::getDapXmlNamespaceString() - Unrecognized namespace version.");
+			break;
+		}
+	}
+
+
+
+
+	/**
+	 * Returns the DAP XML namespace string for the passed DAP version.
+	 */
+	static std::string getDapNamespaceString(DAPVersion version){
+
+		switch(version) {
+		case DAP_2_0:
+			return "http://xml.opendap.org/ns/DAP2";
+			break;
+
+		case DAP_3_2:
+			return "http://xml.opendap.org/ns/DAP/3.2#";
+			break;
+
+		case DAP_4_0:
+			return "http://xml.opendap.org/ns/DAP/4.0#";
+			break;
+
+		default:
+			throw InternalErr(__FILE__, __LINE__, "DapXmlNamspaces::getDapXmlNamespaceString() - Unrecognized namespace version.");
+			break;
+		}
+	}
+
+	/**
+	 * Returns the schema location URI string for the passed DAP version.
+	 */
+	static std::string getSchemaLocationString(DAPVersion version){
+
+		switch(version) {
+		case DAP_2_0:
+			return "http://xml.opendap.org/dap/dap2.xsd";
+			break;
+
+		case DAP_3_2:
+			return "http://xml.opendap.org/dap/dap3.2.xsd";
+			break;
+
+		case DAP_4_0:
+			return "http://xml.opendap.org/dap/dap4.0.xsd";
+			break;
+
+		default:
+			throw InternalErr(__FILE__, __LINE__, "DapXmlNamspaces::getSchemaLocationString() - Unrecognized namespace version.");
+			break;
+		}
+	}
+
+
+
+	/**
+	 * Returns the schema location declaration (the namespace string followed by a
+	 * space followed by the schema location string) for the passed DAP version.
+	 */
+	static std::string getSchemaLocationDeclarationString(DAPVersion version){
+		return getDapNamespaceString(version).append(" ").append(getSchemaLocationString(version));
+	}
+
+};
+
+
+} /* namespace libdap */
+#endif /* DAPXMLNAMSPACES_H_ */
diff --git a/DataDDS.cc b/DataDDS.cc
new file mode 100644
index 0000000..9d98bf7
--- /dev/null
+++ b/DataDDS.cc
@@ -0,0 +1,167 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1997-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+//
+// jhrg 9/19/97
+
+#include "config.h"
+
+#include <iostream>
+#include <iomanip>
+#include <sstream>
+#include <string>
+
+#include "DataDDS.h"
+#include "debug.h"
+
+using namespace std;
+
+namespace libdap {
+
+// private
+
+/** Parse the version string. A string that does not parse causes the
+    version to default to 0.0. This is better than throwing an Error since
+    this method is called from a constructor. */
+void
+DataDDS::m_version_string_to_numbers()
+{
+    string num = d_server_version.substr(d_server_version.find('/') + 1);
+
+    if (!num.empty() && num.find('.') != string::npos) {
+        istringstream iss(num);
+        char c;
+
+        iss >> d_server_version_major;
+        iss >> c;               // This reads the `.' in the version string
+        iss >> d_server_version_minor;
+
+        // Did it parse?
+        if (!(c == '.' && d_server_version_major > 0
+              && d_server_version_minor > 0)) {
+
+            d_server_version_major = 0;
+            d_server_version_minor = 0;
+        }
+    }
+    else {
+        d_server_version_major = 0;
+        d_server_version_minor = 0;
+    }
+
+    DBG(cerr << "Server version: " << d_server_version_major << "." \
+        << d_server_version_minor << endl);
+}
+
+/** Parse the protocol string. A string that does not parse causes the
+    version to default to 2.0. This is better than throwing an Error since
+    this method is called from a constructor. */
+void
+DataDDS::m_protocol_string_to_numbers()
+{
+
+    if (!d_protocol_version.empty() && d_protocol_version.find('.')
+        != string::npos) {
+        istringstream iss(d_protocol_version);
+        char c;
+
+        iss >> d_server_protocol_major;
+        iss >> c;               // This reads the `.' in the version string
+        iss >> d_server_protocol_minor;
+
+        // Did it parse?
+        if (!(c == '.' && d_server_protocol_major > 0)) {
+            d_server_protocol_major = 2;
+            d_server_protocol_minor = 0;
+        }
+    }
+    else {
+        d_server_protocol_major = 2;
+        d_server_protocol_minor = 0;
+    }
+
+    DBG(cerr << "Server version: " << d_server_version_major << "." \
+        << d_server_version_minor << endl);
+}
+
+/** @brief dumps information about this object
+ *
+ * Displays the pointer value of this instance and then calls parent dump
+ *
+ * @param strm C++ i/o stream to dump the information to
+ * @return void
+ */
+void
+DataDDS::dump(ostream &strm) const
+{
+    strm << DapIndent::LMarg << "DataDDS::dump - ("
+    << (void *)this << ")" << endl ;
+    DapIndent::Indent() ;
+    DDS::dump(strm) ;
+    strm << DapIndent::LMarg << "server version: " << d_server_version
+         << endl ;
+    strm << DapIndent::LMarg << "version major: " << d_server_version_major
+         << endl ;
+    strm << DapIndent::LMarg << "version minor: " << d_server_version_minor
+         << endl ;
+    strm << DapIndent::LMarg << "protocol version: " << d_protocol_version
+         << endl ;
+    strm << DapIndent::LMarg << "protocol major: " << d_server_protocol_major
+         << endl ;
+    strm << DapIndent::LMarg << "protocol minor: " << d_server_protocol_minor
+         << endl ;
+    DapIndent::UnIndent() ;
+}
+
+// public
+
+/** @brief Make an instance of DataDDS
+    A DataDDS instance is a DDS with additional information about the version
+    of the server from which the data came.
+    @param factory Use this BaseTypeFactory to instantiate the variables.
+    Caller must free; can also be set using the set_factory() method. Never
+    delete until just before deleting the DDS itself unless you intend to
+    replace the factory with a new instance.
+    @param n The name of the dataset. Can also be set using the
+    set_dataset_name() method.
+    @param v The server version.
+    @param p The protocol version. */
+
+DataDDS::DataDDS(BaseTypeFactory *factory, const string &n, const string &v,
+                 const string &p)
+        : DDS(factory, n), d_server_version(v), d_protocol_version(p)
+{
+    m_version_string_to_numbers();
+    m_protocol_string_to_numbers();
+}
+
+} // namespace libdap
+
diff --git a/DataDDS.h b/DataDDS.h
new file mode 100644
index 0000000..ce4d886
--- /dev/null
+++ b/DataDDS.h
@@ -0,0 +1,147 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1997-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// Specialize DDS for returned data. This currently means adding version
+// information about the source of the data. Was it from a version 1, 2 or
+// later server?
+//
+// jhrg 9/19/97
+
+#ifndef _datadds_h
+#define _datadds_h 1
+
+#include <iostream>
+#include <string>
+
+#ifndef _dds_h
+#include "DDS.h"
+#endif
+
+namespace libdap
+{
+
+/** This class adds some useful state information to the DDS
+    structure.  It is for use on the client side of the connection.
+
+    @note Make sure to pass a valid pointer to the DDS constructor or use
+    the set_factory() method before actually using the DDS. Also make sure
+    that the Factory's lifetime thereafter is the same as the DDS's. Never
+    delete the factory until you're done using the DDS.
+
+    @note Update: I removed the DEFAULT_BASETYPE_FACTORY switch because it
+    caused more confusion than it avoided. See Trac #130.
+
+    @note The compile-time symbol DEFAULT_BASETYPE_FACTORY controls whether
+    the old (3.4 and earlier) DDS and DataDDS constructors are supported.
+    These constructors now use a default factory class (BaseTypeFactory,
+    implemented by this library) to instantiate Byte, ..., Grid variables. To
+    use the default ctor in your code you must also define this symbol. If
+    you \e do choose to define this and fail to provide a specialization of
+    BaseTypeFactory when your software needs one, you code may not link or
+    may fail at run time. In addition to the older ctors for DDS and DataDDS,
+    defining the symbol also makes some of the older methods in Connect
+    available (because those methods require the older DDS and DataDDS ctors.
+
+    @brief Holds a DAP2 DDS.
+    @see Connect
+    */
+
+class DataDDS : public DDS
+{
+private:
+    string d_server_version;
+    int d_server_version_major;
+    int d_server_version_minor;
+
+    string d_protocol_version;
+    int d_server_protocol_major;
+    int d_server_protocol_minor;
+
+    void m_version_string_to_numbers();
+    void m_protocol_string_to_numbers();
+
+public:
+    DataDDS(BaseTypeFactory *factory, const string &n = "",
+            const string &v = "", const string &p = "");
+    // #ifdef DEFAULT_BASETYPE_FACTORY
+    // DataDDS(const string &n = "", const string &v = "");
+    // #endif
+    virtual ~DataDDS()
+    {}
+
+    /** Sets the version string.  This typically looks something like:
+    <tt>DODS/2.15</tt>, where ``2'' is the major version number, and ``15''
+    the minor number. */
+    void set_version(const string &v)
+    {
+        d_server_version = v;
+        m_version_string_to_numbers();
+    }
+    /** @brief Get the server version string, unparsed. */
+    string get_version() const
+    {
+        return d_server_version;
+    }
+    /** @brief Returns the major version number. */
+    int get_version_major() const
+    {
+        return d_server_version_major;
+    }
+    /** @brief Returns the minor version number. */
+    int get_version_minor() const
+    {
+        return d_server_version_minor;
+    }
+
+    void set_protocol(const string &p)
+    {
+        d_protocol_version = p;
+        m_protocol_string_to_numbers();
+    }
+    string get_protocol() const
+    {
+        return d_protocol_version;
+    }
+    int get_protocol_major() const
+    {
+        return d_server_protocol_major;
+    }
+    int get_protocol_minor() const
+    {
+        return d_server_protocol_minor;
+    }
+
+    virtual void dump(ostream &strm) const ;
+};
+
+} // namespace libdap
+
+#endif // _datadds_h
diff --git a/EncodingType.h b/EncodingType.h
new file mode 100644
index 0000000..e02f3ae
--- /dev/null
+++ b/EncodingType.h
@@ -0,0 +1,58 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#ifndef _encodingtype_h
+#define _encodingtype_h
+
+namespace libdap
+{
+
+/** libdap understands two types of encoding: x-plain and deflate, which
+    correspond to plain uncompressed data and data compressed with zlib's LZW
+    algorithm respectively.
+
+    <code>
+     enum EncodingType {
+       unknown_enc,
+       deflate,
+       x_plain,
+       gzip,
+       binary
+     };
+    </code>
+
+    @brief The type of encoding used on the current stream. */
+
+enum EncodingType {
+    unknown_enc,
+    deflate,
+    x_plain,
+    gzip,
+    binary
+};
+
+} // namespace libdap
+
+#endif
diff --git a/Error.cc b/Error.cc
new file mode 100644
index 0000000..45738db
--- /dev/null
+++ b/Error.cc
@@ -0,0 +1,290 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1994-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// Implementation for the Error class.
+
+
+#include "config.h"
+
+#include <cstdio>
+#include <cassert>
+
+#include "Error.h"
+#include "parser.h"
+#include "InternalErr.h"
+#include "debug.h"
+
+using namespace std;
+
+// Glue routines declared in Error.lex
+extern void Error_switch_to_buffer(void *new_buffer);
+extern void Error_delete_buffer(void * buffer);
+extern void *Error_buffer(FILE *fp);
+
+//extern void Errorrestart(FILE *yyin); // defined in Error.tab.c
+extern int Errorparse(libdap::parser_arg *arg);
+
+namespace libdap {
+
+// There are two entries for 'cannot read file' because of an error made 
+// when the message was first added to this class. 
+static const char *err_messages[] = {
+    "Undefined error",
+    "Unknown error",
+    "Internal error",
+    "No such file",
+    "No such variable",
+    "Malformed expression",
+    "No authorization",
+    "Cannot read file",
+    "Not Implemented",
+    ""
+};
+
+/** Specializations of Error should use this to set the error code and
+    message. */
+Error::Error() : _error_code(undefined_error), _error_message("")
+{}
+
+/** Create an instance with a specific code and message string. This ctor
+    provides a way to to use any code and string you'd like. The code can be
+    one of the standard codes or it may be specific to your server. Thus a
+    client which can tell it's dealing with a specific type of server can use
+    the code accordingly. In general, clients simply show the error message
+    to users or write it to a log file.
+
+    @param ec The error code
+    @param msg The error message string. */
+Error::Error(ErrorCode ec, string msg)
+        : _error_code(ec), _error_message(msg)
+{}
+
+/** Create an instance with a specific message. The error code is set to \c
+    unknown_error.
+
+    @param msg The error message.
+    @see ErrorCode */
+Error::Error(string msg)
+        : _error_code(unknown_error), _error_message(msg)
+{}
+
+Error::Error(const Error &copy_from)
+        : _error_code(copy_from._error_code),
+        _error_message(copy_from._error_message)
+{
+}
+
+Error::~Error()
+{
+}
+
+Error &
+Error::operator=(const Error &rhs)
+{
+    assert(OK());
+
+    if (&rhs == this)  // are they identical?
+        return *this;
+    else {
+        _error_code = rhs._error_code;
+        _error_message = rhs._error_message;
+
+        assert(this->OK());
+
+        return *this;
+    }
+}
+
+/** Use this function to determine whether an Error object is
+    valid.  To be a valid, an Error object must either be: 1)
+    empty or contain a message and a code.
+
+    @brief Is the Error object valid?
+    @return TRUE if the object is valid, FALSE otherwise. */
+bool
+Error::OK() const
+{
+    // The object is empty - users cannot make these, but this class can!
+    bool empty = ((_error_code == undefined_error)
+                  && (_error_message.empty()));
+
+    // Just a message - the program part is null.
+    bool message = ((_error_code != undefined_error)
+                    && (!_error_message.empty()));
+
+    DBG(cerr << "empty: " << empty << ", message: " << message << endl);
+    return empty || message;
+}
+
+/** Given an input stream (FILE *) <tt>fp</tt>, parse an Error object from
+    stream. Values for fields of the Error object are parsed and \c this is
+    set accordingly. This is how a client program receives an error object
+    from a server.
+
+    @brief Parse an Error object.
+    @param fp A valid file pointer to an input stream.
+    @return TRUE if no error was detected, FALSE otherwise.  */
+bool
+Error::parse(FILE *fp)
+{
+    if (!fp)
+        throw InternalErr(__FILE__, __LINE__, "Null input stream");
+
+    void *buffer = Error_buffer(fp);
+    Error_switch_to_buffer(buffer);
+
+    parser_arg arg(this);
+
+    bool status;
+    try {
+        status = Errorparse(&arg) == 0;
+        Error_delete_buffer(buffer);
+    }
+    catch (Error &e) {
+        Error_delete_buffer(buffer);
+        throw InternalErr(__FILE__, __LINE__, e.get_error_message());
+    }
+
+    // STATUS is the result of the parser function; if a recoverable error
+    // was found it will be true but arg.status() will be false.
+    // I'm throwing an InternalErr here since Error objects are generated by
+    // the core; they should always parse! 9/21/2000 jhrg
+    if (!status || !arg.status())
+        throw InternalErr(__FILE__, __LINE__, "Error parsing error object!");
+    else
+        return OK();  // Check object consistency
+}
+
+
+/** Creates a printable representation of the Error object. It is suitable
+    for framing, and also for printing and sending over a network.
+
+    The printed representation produced by this function can be parsed by the
+    parse() member function. Thus parse and print form a symmetrical pair
+    that can be used to send and receive an Error object over the network in
+    a MIME document.
+
+    @param out A pointer to the output stream on which the Error object is to
+    be rendered. */
+void
+Error::print(FILE *out) const
+{
+    assert(OK());
+
+    fprintf(out, "Error {\n") ;
+
+    fprintf(out, "    code = %d;\n", static_cast<int>(_error_code)) ;
+
+    // If the error message is wrapped in double quotes, print it, else, add
+    // wrapping double quotes.
+    if (*_error_message.begin() == '"' && *(_error_message.end() - 1) == '"')
+        fprintf(out, "    message = %s;\n", _error_message.c_str()) ;
+    else
+        fprintf(out, "    message = \"%s\";\n", _error_message.c_str()) ;
+
+    fprintf(out, "};\n") ;
+}
+
+/** Creates a printable representation of the Error object. It is suitable
+    for framing, and also for printing and sending over a network.
+
+    The printed representation produced by this function can be parsed by the
+    parse() member function. Thus parse and print form a symmetrical pair
+    that can be used to send and receive an Error object over the network in
+    a MIME document.
+
+    @param strm A reference to the output stream on which the Error object is to
+    be rendered. */
+void
+Error::print(ostream &strm) const
+{
+    assert(OK());
+
+    strm << "Error {\n" ;
+
+    strm << "    code = " << static_cast<int>(_error_code) << ";\n" ;
+
+    // If the error message is wrapped in double quotes, print it, else, add
+    // wrapping double quotes.
+    if (*_error_message.begin() == '"' && *(_error_message.end() - 1) == '"')
+        strm << "    message = " << _error_message.c_str() << ";\n" ;
+    else
+        strm << "    message = \"" << _error_message.c_str() << "\";\n"  ;
+
+    strm << "};\n" ;
+}
+
+/** Get the ErrorCode for this instance. */
+ErrorCode
+Error::get_error_code() const
+{
+    assert(OK());
+    return _error_code;
+}
+
+/** Set the ErrorCode. If the current error message has not been set, use \e
+    ec to set the error message. The resulting error message string is the
+    same as the ErrorCode name. If \e ec is not within the range of values
+    for an OPeNDAP ErrorCode, the error message is left unchanged.
+
+    @param ec The new ErrorCode value. */
+void
+Error::set_error_code(ErrorCode ec)
+{
+    _error_code = ec;
+    // Added check to make sure that err_messages is not accessed beyond its
+    // bounds. 02/02/04 jhrg
+    if (_error_message.empty()
+        && ec > undefined_error && ec <= cannot_read_file) {
+        _error_message = err_messages[ec - undefined_error];
+    }
+    else {
+        _error_message = err_messages[0];
+    }
+}
+
+/** Return the current error message. */
+string
+Error::get_error_message() const
+{
+    assert(OK());
+
+    return string(_error_message);
+}
+
+/** Set the error message. */
+void
+Error::set_error_message(string msg)
+{
+    _error_message = msg;
+}
+
+} // namespace libdap
diff --git a/Error.h b/Error.h
new file mode 100644
index 0000000..be65806
--- /dev/null
+++ b/Error.h
@@ -0,0 +1,119 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1999,2000
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// Interface for the Error class
+//
+// jhrg 4/23/96
+
+#ifndef _error_h
+#define _error_h
+
+#include <cstdio>  // For FILE *
+#include <iostream>
+#include <string>
+
+using std::cout;
+using std::string;
+using std::ostream;
+
+namespace libdap
+{
+
+/** The most common errors within DAP2 have special codes so that they
+    can be spotted easily by the client software. Any error
+    without a matching code gets the <tt>unknown_error</tt> code.
+
+    @brief An enumerated type for common errors.  */
+typedef int ErrorCode; //using standard errno+netCDF error codes from server
+
+/** @name Internal DAP errors */
+//@{
+#define    undefined_error   1000 ///< Undefined error code, an empty Error object was built
+#define    unknown_error     1001 ///< Unknown error (the default code) (HTTP 400)
+#define    internal_error    1002 ///< Internal server error (500)
+#define    no_such_file      1003 ///< (400)
+#define    no_such_variable  1004 ///< (400)
+#define    malformed_expr    1005 ///< (400)
+#define    no_authorization  1006 ///< (401)
+#define    cannot_read_file  1007 ///< (400)
+#define    not_implemented   1008 ///< Implies that it will/might be impl. (501)
+#define    dummy_message     1009 ///< @see Error.cc; end the array with ""
+//@}
+
+/** The Error class is used to transport error information from the server to
+    the client within libdap. This class is also the base class for all the
+    errors thrown by methods in the DAP, so catching Error will catch all DAP
+    throws. Errors consist of an error code and a string. The code can be
+    used to quickly distinguish between certain common errors while the
+    string is used to convey information about the error to the user. The
+    error code should never be displayed to the user.
+
+    This class is used on both clients and servers. The \e print() and \e
+    parse() methods are used to send the object back and forth.
+
+    @note A past version of this class supported the notion of an error
+    correcting program (Tcl, Java, ...) that could be sent from the server to
+    the client to help users correct the error and resubmit the request. This
+    never worked well in practice and that feature of the class is deprecated.
+
+    @brief A class for error processing.
+    @author jhrg */
+
+class Error
+{
+protected:
+    ErrorCode _error_code;
+    string _error_message;
+
+public:
+    Error(ErrorCode ec, string msg);
+    Error(string msg);
+    Error();
+
+    Error(const Error &copy_from);
+
+    virtual ~Error();
+
+    Error &operator=(const Error &rhs);
+
+    bool OK() const;
+    bool parse(FILE *fp);
+    void print(FILE *out) const;
+    void print(ostream &out) const;
+    ErrorCode get_error_code() const;
+    string get_error_message() const;
+    void set_error_code(ErrorCode ec = undefined_error);
+    void set_error_message(string msg = "");
+};
+
+} // namespace libdap
+
+#endif // _error_h
diff --git a/Error.lex b/Error.lex
new file mode 100644
index 0000000..eca439e
--- /dev/null
+++ b/Error.lex
@@ -0,0 +1,179 @@
+
+/*
+ -*- mode: c++; c-basic-offset:4 -*-
+
+ This file is part of libdap, A C++ implementation of the OPeNDAP Data
+ Access Protocol.
+
+ Copyright (c) 2002,2003 OPeNDAP, Inc.
+ Author: James Gallagher <jgallagher@opendap.org>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+ 
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+ 
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+ You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+ (c) COPYRIGHT URI/MIT 1994-1996,1998,1999
+*/ 
+
+/*
+  Scanner for the Error object. It recognizes the five keywords in the
+  persistent representation of the Error object plus some syntactic sugar
+  (`=', `{', ...). The object's persistent representation uses a keyword =
+  value notation, where the values are quoted strings or integers.
+
+  The scanner is not reentrant, but can share name spaces with other
+  scanners. It must be processed by GNU's flex scanner generator.
+*/
+
+%{
+
+#include "config_dap.h"
+
+static char rcsid[] not_used = {"$Id$"};
+
+#include <cstdlib>
+#include <cassert>
+#include <cstring>
+
+#include <string>
+
+#include "parser.h"
+#include "Error.tab.hh"
+
+using namespace libdap;
+
+#ifndef YY_PROTO
+#define YY_PROTO(proto) proto
+#endif
+
+//#define YY_NO_UNPUT
+#define YY_DECL int Errorlex YY_PROTO(( void ))
+
+#define YY_FATAL_ERROR(msg) {\
+    throw(Error(string("Error scanning the error response: ") + string(msg))); \
+    yy_fatal_error(msg); /* see das.lex */ \
+}
+
+int error_line_num = 1;
+static int start_line;		/* used in quote and comment error handlers */
+
+void store_integer();
+void store_string();
+
+%}
+    
+%option noyywrap
+%option nounput
+%option noinput
+%option 8bit
+%option prefix="Error"
+%option outfile="lex.Error.cc"
+%x quote
+%x comment
+
+SCAN_INT		[0-9]+
+
+SCAN_ERROR		error|Error|ERROR
+SCAN_CODE		code|Code|CODE
+SCAN_MSG		message|Message|MESSAGE
+SCAN_PTYPE		program_type|ProgramType|PROGRAM_TYPE|Program_Type
+SCAN_PROGRAM	program|Program|PROGRAM
+
+NEVER   [^a-zA-Z0-9_/.+\-{}:;,]
+
+%%
+
+
+{SCAN_ERROR}	store_string(); return SCAN_ERROR;
+
+{SCAN_CODE}	store_string(); return SCAN_CODE;
+{SCAN_MSG}	store_string(); return SCAN_MSG;
+
+{SCAN_INT}	store_integer(); return SCAN_INT;
+
+"{" 	    	return (int)*yytext;
+"}" 	    	return (int)*yytext;
+";" 	    	return (int)*yytext;
+"="		return (int)*yytext;
+
+[ \t]+
+\n	    	    	++error_line_num;
+<INITIAL><<EOF>>    	yy_init = 1; error_line_num = 1; yyterminate();
+
+"#"	    	    	BEGIN(comment);
+<comment>[^\n]*
+<comment>\n		++error_line_num; BEGIN(INITIAL);
+<comment><<EOF>>        yy_init = 1; error_line_num = 1; yyterminate();
+
+\"			BEGIN(quote); start_line = error_line_num; yymore();
+<quote>[^"\n\\]*	yymore();
+<quote>[^"\n\\]*\n	yymore(); ++error_line_num;
+<quote>\\.		yymore();
+<quote>\"		{ 
+    			  BEGIN(INITIAL); 
+			  store_string();
+			  return SCAN_STR;
+                        }
+<quote><<EOF>>		{
+                          char msg[256];
+			  snprintf(msg, 255,
+				  "Unterminated quote (starts on line %d)\n",
+				  start_line);
+			  YY_FATAL_ERROR(msg);
+                        }
+
+{NEVER}                 {
+                          if (yytext) {	/* suppress msgs about `' chars */
+                            fprintf(stderr, "Character `%c' is not", *yytext);
+                            fprintf(stderr, " allowed (except within");
+			    fprintf(stderr, " quotes) and has been ignored\n");
+			  }
+			}
+%%
+
+// These three glue routines enable DDS to reclaim the memory used to parse a
+// DDS off the wire. They are here because this file can see the YY_*
+// symbols; the file DDS.cc cannot.
+
+void *
+Error_buffer(FILE *fp)
+{
+    return (void *)Error_create_buffer(fp, YY_BUF_SIZE);
+}
+
+void
+Error_switch_to_buffer(void *buf)
+{
+    Error_switch_to_buffer((YY_BUFFER_STATE)buf);
+}
+
+void
+Error_delete_buffer(void *buf)
+{
+    Error_delete_buffer((YY_BUFFER_STATE)buf);
+}
+
+void
+store_integer()
+{
+    Errorlval.integer = atoi(yytext);
+}
+
+void
+store_string()
+{
+    Errorlval.string = yytext;
+}
+
diff --git a/Error.tab.cc b/Error.tab.cc
new file mode 100644
index 0000000..8c8d76d
--- /dev/null
+++ b/Error.tab.cc
@@ -0,0 +1,1552 @@
+/* A Bison parser, made by GNU Bison 3.0.4.  */
+
+/* Bison implementation for Yacc-like parsers in C
+
+   Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
+
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
+
+/* C LALR(1) parser skeleton written by Richard Stallman, by
+   simplifying the original so-called "semantic" parser.  */
+
+/* All symbols defined below should begin with yy or YY, to avoid
+   infringing on user name space.  This should be done even for local
+   variables, as they might otherwise be expanded by user macros.
+   There are some unavoidable exceptions within include files to
+   define necessary library symbols; they are noted "INFRINGES ON
+   USER NAME SPACE" below.  */
+
+/* Identify Bison output.  */
+#define YYBISON 1
+
+/* Bison version.  */
+#define YYBISON_VERSION "3.0.4"
+
+/* Skeleton name.  */
+#define YYSKELETON_NAME "yacc.c"
+
+/* Pure parsers.  */
+#define YYPURE 0
+
+/* Push parsers.  */
+#define YYPUSH 0
+
+/* Pull parsers.  */
+#define YYPULL 1
+
+
+/* Substitute the variable and function names.  */
+#define yyparse         Errorparse
+#define yylex           Errorlex
+#define yyerror         Errorerror
+#define yydebug         Errordebug
+#define yynerrs         Errornerrs
+
+#define yylval          Errorlval
+#define yychar          Errorchar
+
+/* Copy the first part of user declarations.  */
+
+#line 75 "Error.tab.cc" /* yacc.c:339  */
+
+# ifndef YY_NULLPTR
+#  if defined __cplusplus && 201103L <= __cplusplus
+#   define YY_NULLPTR nullptr
+#  else
+#   define YY_NULLPTR 0
+#  endif
+# endif
+
+/* Enabling verbose error messages.  */
+#ifdef YYERROR_VERBOSE
+# undef YYERROR_VERBOSE
+# define YYERROR_VERBOSE 1
+#else
+# define YYERROR_VERBOSE 0
+#endif
+
+/* In a future release of Bison, this section will be replaced
+   by #include "Error.tab.hh".  */
+#ifndef YY_ERROR_ERROR_TAB_HH_INCLUDED
+# define YY_ERROR_ERROR_TAB_HH_INCLUDED
+/* Debug traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 1
+#endif
+#if YYDEBUG
+extern int Errordebug;
+#endif
+/* "%code requires" blocks.  */
+#line 32 "Error.yy" /* yacc.c:355  */
+
+
+#include "config_dap.h"
+
+#include <iostream>
+
+#include "Error.h"
+
+#include "parser.h"
+#include "debug.h"
+#include "util.h"
+
+using namespace std;
+using namespace libdap;
+
+// These macros are used to access the `arguments' passed to the parser. A
+// pointer to an error object and a pointer to an integer status variable are
+// passed in to the parser within a structure (which itself is passed as a
+// pointer). Note that the ERROR macro explicitly casts OBJ to an ERROR *. 
+
+#define ERROR_OBJ(arg) ((Error *)((parser_arg *)(arg))->_object)
+#define STATUS(arg) ((parser_arg *)(arg))->_status
+
+//#define YYPARSE_PARAM arg
+
+extern int error_line_num;	// defined in Error.lex
+
+
+#line 134 "Error.tab.cc" /* yacc.c:355  */
+
+/* Token type.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+  enum yytokentype
+  {
+    SCAN_INT = 258,
+    SCAN_STR = 259,
+    SCAN_ERROR = 260,
+    SCAN_CODE = 261,
+    SCAN_MSG = 262
+  };
+#endif
+
+/* Value type.  */
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+
+union YYSTYPE
+{
+#line 75 "Error.yy" /* yacc.c:355  */
+
+#ifdef __SUNPRO_CC
+    int boolean;
+#else
+    bool boolean;
+#endif
+    int integer;
+    char *string;
+
+#line 164 "Error.tab.cc" /* yacc.c:355  */
+};
+
+typedef union YYSTYPE YYSTYPE;
+# define YYSTYPE_IS_TRIVIAL 1
+# define YYSTYPE_IS_DECLARED 1
+#endif
+
+
+extern YYSTYPE Errorlval;
+
+int Errorparse (parser_arg *arg);
+
+#endif /* !YY_ERROR_ERROR_TAB_HH_INCLUDED  */
+
+/* Copy the second part of user declarations.  */
+
+#line 181 "Error.tab.cc" /* yacc.c:358  */
+/* Unqualified %code blocks.  */
+#line 61 "Error.yy" /* yacc.c:359  */
+
+
+int Errorlex();			// the scanner
+void Errorerror(parser_arg *arg, const string &s);	// gotta love automatically generated names...
+
+
+#line 190 "Error.tab.cc" /* yacc.c:359  */
+
+#ifdef short
+# undef short
+#endif
+
+#ifdef YYTYPE_UINT8
+typedef YYTYPE_UINT8 yytype_uint8;
+#else
+typedef unsigned char yytype_uint8;
+#endif
+
+#ifdef YYTYPE_INT8
+typedef YYTYPE_INT8 yytype_int8;
+#else
+typedef signed char yytype_int8;
+#endif
+
+#ifdef YYTYPE_UINT16
+typedef YYTYPE_UINT16 yytype_uint16;
+#else
+typedef unsigned short int yytype_uint16;
+#endif
+
+#ifdef YYTYPE_INT16
+typedef YYTYPE_INT16 yytype_int16;
+#else
+typedef short int yytype_int16;
+#endif
+
+#ifndef YYSIZE_T
+# ifdef __SIZE_TYPE__
+#  define YYSIZE_T __SIZE_TYPE__
+# elif defined size_t
+#  define YYSIZE_T size_t
+# elif ! defined YYSIZE_T
+#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYSIZE_T size_t
+# else
+#  define YYSIZE_T unsigned int
+# endif
+#endif
+
+#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
+
+#ifndef YY_
+# if defined YYENABLE_NLS && YYENABLE_NLS
+#  if ENABLE_NLS
+#   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
+#   define YY_(Msgid) dgettext ("bison-runtime", Msgid)
+#  endif
+# endif
+# ifndef YY_
+#  define YY_(Msgid) Msgid
+# endif
+#endif
+
+#ifndef YY_ATTRIBUTE
+# if (defined __GNUC__                                               \
+      && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__)))  \
+     || defined __SUNPRO_C && 0x5110 <= __SUNPRO_C
+#  define YY_ATTRIBUTE(Spec) __attribute__(Spec)
+# else
+#  define YY_ATTRIBUTE(Spec) /* empty */
+# endif
+#endif
+
+#ifndef YY_ATTRIBUTE_PURE
+# define YY_ATTRIBUTE_PURE   YY_ATTRIBUTE ((__pure__))
+#endif
+
+#ifndef YY_ATTRIBUTE_UNUSED
+# define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__))
+#endif
+
+#if !defined _Noreturn \
+     && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112)
+# if defined _MSC_VER && 1200 <= _MSC_VER
+#  define _Noreturn __declspec (noreturn)
+# else
+#  define _Noreturn YY_ATTRIBUTE ((__noreturn__))
+# endif
+#endif
+
+/* Suppress unused-variable warnings by "using" E.  */
+#if ! defined lint || defined __GNUC__
+# define YYUSE(E) ((void) (E))
+#else
+# define YYUSE(E) /* empty */
+#endif
+
+#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
+/* Suppress an incorrect diagnostic about yylval being uninitialized.  */
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
+    _Pragma ("GCC diagnostic push") \
+    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\
+    _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END \
+    _Pragma ("GCC diagnostic pop")
+#else
+# define YY_INITIAL_VALUE(Value) Value
+#endif
+#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END
+#endif
+#ifndef YY_INITIAL_VALUE
+# define YY_INITIAL_VALUE(Value) /* Nothing. */
+#endif
+
+
+#if ! defined yyoverflow || YYERROR_VERBOSE
+
+/* The parser invokes alloca or malloc; define the necessary symbols.  */
+
+# ifdef YYSTACK_USE_ALLOCA
+#  if YYSTACK_USE_ALLOCA
+#   ifdef __GNUC__
+#    define YYSTACK_ALLOC __builtin_alloca
+#   elif defined __BUILTIN_VA_ARG_INCR
+#    include <alloca.h> /* INFRINGES ON USER NAME SPACE */
+#   elif defined _AIX
+#    define YYSTACK_ALLOC __alloca
+#   elif defined _MSC_VER
+#    include <malloc.h> /* INFRINGES ON USER NAME SPACE */
+#    define alloca _alloca
+#   else
+#    define YYSTACK_ALLOC alloca
+#    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS
+#     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+      /* Use EXIT_SUCCESS as a witness for stdlib.h.  */
+#     ifndef EXIT_SUCCESS
+#      define EXIT_SUCCESS 0
+#     endif
+#    endif
+#   endif
+#  endif
+# endif
+
+# ifdef YYSTACK_ALLOC
+   /* Pacify GCC's 'empty if-body' warning.  */
+#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+    /* The OS might guarantee only one guard page at the bottom of the stack,
+       and a page size can be as small as 4096 bytes.  So we cannot safely
+       invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
+       to allow for a few compiler-allocated temporary stack slots.  */
+#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
+#  endif
+# else
+#  define YYSTACK_ALLOC YYMALLOC
+#  define YYSTACK_FREE YYFREE
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+#   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
+#  endif
+#  if (defined __cplusplus && ! defined EXIT_SUCCESS \
+       && ! ((defined YYMALLOC || defined malloc) \
+             && (defined YYFREE || defined free)))
+#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#   ifndef EXIT_SUCCESS
+#    define EXIT_SUCCESS 0
+#   endif
+#  endif
+#  ifndef YYMALLOC
+#   define YYMALLOC malloc
+#   if ! defined malloc && ! defined EXIT_SUCCESS
+void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+#  ifndef YYFREE
+#   define YYFREE free
+#   if ! defined free && ! defined EXIT_SUCCESS
+void free (void *); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+# endif
+#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
+
+
+#if (! defined yyoverflow \
+     && (! defined __cplusplus \
+         || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+
+/* A type that is properly aligned for any stack member.  */
+union yyalloc
+{
+  yytype_int16 yyss_alloc;
+  YYSTYPE yyvs_alloc;
+};
+
+/* The size of the maximum gap between one aligned stack and the next.  */
+# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
+
+/* The size of an array large to enough to hold all stacks, each with
+   N elements.  */
+# define YYSTACK_BYTES(N) \
+     ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
+      + YYSTACK_GAP_MAXIMUM)
+
+# define YYCOPY_NEEDED 1
+
+/* Relocate STACK from its old location to the new one.  The
+   local variables YYSIZE and YYSTACKSIZE give the old and new number of
+   elements in the stack, and YYPTR gives the new location of the
+   stack.  Advance YYPTR to a properly aligned location for the next
+   stack.  */
+# define YYSTACK_RELOCATE(Stack_alloc, Stack)                           \
+    do                                                                  \
+      {                                                                 \
+        YYSIZE_T yynewbytes;                                            \
+        YYCOPY (&yyptr->Stack_alloc, Stack, yysize);                    \
+        Stack = &yyptr->Stack_alloc;                                    \
+        yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
+        yyptr += yynewbytes / sizeof (*yyptr);                          \
+      }                                                                 \
+    while (0)
+
+#endif
+
+#if defined YYCOPY_NEEDED && YYCOPY_NEEDED
+/* Copy COUNT objects from SRC to DST.  The source and destination do
+   not overlap.  */
+# ifndef YYCOPY
+#  if defined __GNUC__ && 1 < __GNUC__
+#   define YYCOPY(Dst, Src, Count) \
+      __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src)))
+#  else
+#   define YYCOPY(Dst, Src, Count)              \
+      do                                        \
+        {                                       \
+          YYSIZE_T yyi;                         \
+          for (yyi = 0; yyi < (Count); yyi++)   \
+            (Dst)[yyi] = (Src)[yyi];            \
+        }                                       \
+      while (0)
+#  endif
+# endif
+#endif /* !YYCOPY_NEEDED */
+
+/* YYFINAL -- State number of the termination state.  */
+#define YYFINAL  4
+/* YYLAST -- Last index in YYTABLE.  */
+#define YYLAST   16
+
+/* YYNTOKENS -- Number of terminals.  */
+#define YYNTOKENS  12
+/* YYNNTS -- Number of nonterminals.  */
+#define YYNNTS  7
+/* YYNRULES -- Number of rules.  */
+#define YYNRULES  8
+/* YYNSTATES -- Number of states.  */
+#define YYNSTATES  20
+
+/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
+   by yylex, with out-of-bounds checking.  */
+#define YYUNDEFTOK  2
+#define YYMAXUTOK   262
+
+#define YYTRANSLATE(YYX)                                                \
+  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
+
+/* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM
+   as returned by yylex, without out-of-bounds checking.  */
+static const yytype_uint8 yytranslate[] =
+{
+       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,    10,
+       2,    11,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     8,     2,     9,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
+       5,     6,     7
+};
+
+#if YYDEBUG
+  /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
+static const yytype_uint8 yyrline[] =
+{
+       0,   103,   103,   106,   109,   110,   113,   121,   120
+};
+#endif
+
+#if YYDEBUG || YYERROR_VERBOSE || 0
+/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
+   First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
+static const char *const yytname[] =
+{
+  "$end", "error", "$undefined", "SCAN_INT", "SCAN_STR", "SCAN_ERROR",
+  "SCAN_CODE", "SCAN_MSG", "'{'", "'}'", "';'", "'='", "$accept",
+  "error_object", "contents", "description", "code", "message", "$@1", YY_NULLPTR
+};
+#endif
+
+# ifdef YYPRINT
+/* YYTOKNUM[NUM] -- (External) token number corresponding to the
+   (internal) symbol number NUM (which must be that of a token).  */
+static const yytype_uint16 yytoknum[] =
+{
+       0,   256,   257,   258,   259,   260,   261,   262,   123,   125,
+      59,    61
+};
+# endif
+
+#define YYPACT_NINF -8
+
+#define yypact_value_is_default(Yystate) \
+  (!!((Yystate) == (-8)))
+
+#define YYTABLE_NINF -1
+
+#define yytable_value_is_error(Yytable_value) \
+  0
+
+  /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+     STATE-NUM.  */
+static const yytype_int8 yypact[] =
+{
+      -5,    -7,     2,    -3,    -8,    -6,    -2,    -8,    -1,     1,
+       0,     3,    -8,     5,    -8,     4,    -8,    -8,     6,    -8
+};
+
+  /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
+     Performed when YYTABLE does not specify something else to do.  Zero
+     means the default is an error.  */
+static const yytype_uint8 yydefact[] =
+{
+       0,     0,     0,     0,     1,     0,     0,     3,     5,     0,
+       0,     0,     4,     0,     2,     0,     6,     7,     0,     8
+};
+
+  /* YYPGOTO[NTERM-NUM].  */
+static const yytype_int8 yypgoto[] =
+{
+      -8,    -8,    -8,    -8,    -8,    -8,    -8
+};
+
+  /* YYDEFGOTO[NTERM-NUM].  */
+static const yytype_int8 yydefgoto[] =
+{
+      -1,     2,     6,     7,     8,    12,    18
+};
+
+  /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
+     positive, shift that token.  If negative, reduce the rule whose
+     number is the opposite.  If YYTABLE_NINF, syntax error.  */
+static const yytype_uint8 yytable[] =
+{
+       1,     3,     4,     5,    13,     9,    11,    10,    17,     0,
+      14,     0,     0,     0,    15,    16,    19
+};
+
+static const yytype_int8 yycheck[] =
+{
+       5,     8,     0,     6,     3,    11,     7,     9,     4,    -1,
+      10,    -1,    -1,    -1,    11,    10,    10
+};
+
+  /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+     symbol of state STATE-NUM.  */
+static const yytype_uint8 yystos[] =
+{
+       0,     5,    13,     8,     0,     6,    14,    15,    16,    11,
+       9,     7,    17,     3,    10,    11,    10,     4,    18,    10
+};
+
+  /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
+static const yytype_uint8 yyr1[] =
+{
+       0,    12,    13,    14,    15,    15,    16,    18,    17
+};
+
+  /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
+static const yytype_uint8 yyr2[] =
+{
+       0,     2,     5,     1,     2,     1,     4,     0,     5
+};
+
+
+#define yyerrok         (yyerrstatus = 0)
+#define yyclearin       (yychar = YYEMPTY)
+#define YYEMPTY         (-2)
+#define YYEOF           0
+
+#define YYACCEPT        goto yyacceptlab
+#define YYABORT         goto yyabortlab
+#define YYERROR         goto yyerrorlab
+
+
+#define YYRECOVERING()  (!!yyerrstatus)
+
+#define YYBACKUP(Token, Value)                                  \
+do                                                              \
+  if (yychar == YYEMPTY)                                        \
+    {                                                           \
+      yychar = (Token);                                         \
+      yylval = (Value);                                         \
+      YYPOPSTACK (yylen);                                       \
+      yystate = *yyssp;                                         \
+      goto yybackup;                                            \
+    }                                                           \
+  else                                                          \
+    {                                                           \
+      yyerror (arg, YY_("syntax error: cannot back up")); \
+      YYERROR;                                                  \
+    }                                                           \
+while (0)
+
+/* Error token number */
+#define YYTERROR        1
+#define YYERRCODE       256
+
+
+
+/* Enable debugging if requested.  */
+#if YYDEBUG
+
+# ifndef YYFPRINTF
+#  include <stdio.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYFPRINTF fprintf
+# endif
+
+# define YYDPRINTF(Args)                        \
+do {                                            \
+  if (yydebug)                                  \
+    YYFPRINTF Args;                             \
+} while (0)
+
+/* This macro is provided for backward compatibility. */
+#ifndef YY_LOCATION_PRINT
+# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+#endif
+
+
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)                    \
+do {                                                                      \
+  if (yydebug)                                                            \
+    {                                                                     \
+      YYFPRINTF (stderr, "%s ", Title);                                   \
+      yy_symbol_print (stderr,                                            \
+                  Type, Value, arg); \
+      YYFPRINTF (stderr, "\n");                                           \
+    }                                                                     \
+} while (0)
+
+
+/*----------------------------------------.
+| Print this symbol's value on YYOUTPUT.  |
+`----------------------------------------*/
+
+static void
+yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, parser_arg *arg)
+{
+  FILE *yyo = yyoutput;
+  YYUSE (yyo);
+  YYUSE (arg);
+  if (!yyvaluep)
+    return;
+# ifdef YYPRINT
+  if (yytype < YYNTOKENS)
+    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+# endif
+  YYUSE (yytype);
+}
+
+
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
+
+static void
+yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, parser_arg *arg)
+{
+  YYFPRINTF (yyoutput, "%s %s (",
+             yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]);
+
+  yy_symbol_value_print (yyoutput, yytype, yyvaluep, arg);
+  YYFPRINTF (yyoutput, ")");
+}
+
+/*------------------------------------------------------------------.
+| yy_stack_print -- Print the state stack from its BOTTOM up to its |
+| TOP (included).                                                   |
+`------------------------------------------------------------------*/
+
+static void
+yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
+{
+  YYFPRINTF (stderr, "Stack now");
+  for (; yybottom <= yytop; yybottom++)
+    {
+      int yybot = *yybottom;
+      YYFPRINTF (stderr, " %d", yybot);
+    }
+  YYFPRINTF (stderr, "\n");
+}
+
+# define YY_STACK_PRINT(Bottom, Top)                            \
+do {                                                            \
+  if (yydebug)                                                  \
+    yy_stack_print ((Bottom), (Top));                           \
+} while (0)
+
+
+/*------------------------------------------------.
+| Report that the YYRULE is going to be reduced.  |
+`------------------------------------------------*/
+
+static void
+yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule, parser_arg *arg)
+{
+  unsigned long int yylno = yyrline[yyrule];
+  int yynrhs = yyr2[yyrule];
+  int yyi;
+  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
+             yyrule - 1, yylno);
+  /* The symbols being reduced.  */
+  for (yyi = 0; yyi < yynrhs; yyi++)
+    {
+      YYFPRINTF (stderr, "   $%d = ", yyi + 1);
+      yy_symbol_print (stderr,
+                       yystos[yyssp[yyi + 1 - yynrhs]],
+                       &(yyvsp[(yyi + 1) - (yynrhs)])
+                                              , arg);
+      YYFPRINTF (stderr, "\n");
+    }
+}
+
+# define YY_REDUCE_PRINT(Rule)          \
+do {                                    \
+  if (yydebug)                          \
+    yy_reduce_print (yyssp, yyvsp, Rule, arg); \
+} while (0)
+
+/* Nonzero means print parse trace.  It is left uninitialized so that
+   multiple parsers can coexist.  */
+int yydebug;
+#else /* !YYDEBUG */
+# define YYDPRINTF(Args)
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
+# define YY_STACK_PRINT(Bottom, Top)
+# define YY_REDUCE_PRINT(Rule)
+#endif /* !YYDEBUG */
+
+
+/* YYINITDEPTH -- initial size of the parser's stacks.  */
+#ifndef YYINITDEPTH
+# define YYINITDEPTH 200
+#endif
+
+/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
+   if the built-in stack extension method is used).
+
+   Do not make this value too large; the results are undefined if
+   YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
+   evaluated with infinite-precision integer arithmetic.  */
+
+#ifndef YYMAXDEPTH
+# define YYMAXDEPTH 10000
+#endif
+
+
+#if YYERROR_VERBOSE
+
+# ifndef yystrlen
+#  if defined __GLIBC__ && defined _STRING_H
+#   define yystrlen strlen
+#  else
+/* Return the length of YYSTR.  */
+static YYSIZE_T
+yystrlen (const char *yystr)
+{
+  YYSIZE_T yylen;
+  for (yylen = 0; yystr[yylen]; yylen++)
+    continue;
+  return yylen;
+}
+#  endif
+# endif
+
+# ifndef yystpcpy
+#  if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
+#   define yystpcpy stpcpy
+#  else
+/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
+   YYDEST.  */
+static char *
+yystpcpy (char *yydest, const char *yysrc)
+{
+  char *yyd = yydest;
+  const char *yys = yysrc;
+
+  while ((*yyd++ = *yys++) != '\0')
+    continue;
+
+  return yyd - 1;
+}
+#  endif
+# endif
+
+# ifndef yytnamerr
+/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
+   quotes and backslashes, so that it's suitable for yyerror.  The
+   heuristic is that double-quoting is unnecessary unless the string
+   contains an apostrophe, a comma, or backslash (other than
+   backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
+   null, do not copy; instead, return the length of what the result
+   would have been.  */
+static YYSIZE_T
+yytnamerr (char *yyres, const char *yystr)
+{
+  if (*yystr == '"')
+    {
+      YYSIZE_T yyn = 0;
+      char const *yyp = yystr;
+
+      for (;;)
+        switch (*++yyp)
+          {
+          case '\'':
+          case ',':
+            goto do_not_strip_quotes;
+
+          case '\\':
+            if (*++yyp != '\\')
+              goto do_not_strip_quotes;
+            /* Fall through.  */
+          default:
+            if (yyres)
+              yyres[yyn] = *yyp;
+            yyn++;
+            break;
+
+          case '"':
+            if (yyres)
+              yyres[yyn] = '\0';
+            return yyn;
+          }
+    do_not_strip_quotes: ;
+    }
+
+  if (! yyres)
+    return yystrlen (yystr);
+
+  return yystpcpy (yyres, yystr) - yyres;
+}
+# endif
+
+/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
+   about the unexpected token YYTOKEN for the state stack whose top is
+   YYSSP.
+
+   Return 0 if *YYMSG was successfully written.  Return 1 if *YYMSG is
+   not large enough to hold the message.  In that case, also set
+   *YYMSG_ALLOC to the required number of bytes.  Return 2 if the
+   required number of bytes is too large to store.  */
+static int
+yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
+                yytype_int16 *yyssp, int yytoken)
+{
+  YYSIZE_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]);
+  YYSIZE_T yysize = yysize0;
+  enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+  /* Internationalized format string. */
+  const char *yyformat = YY_NULLPTR;
+  /* Arguments of yyformat. */
+  char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+  /* Number of reported tokens (one for the "unexpected", one per
+     "expected"). */
+  int yycount = 0;
+
+  /* There are many possibilities here to consider:
+     - If this state is a consistent state with a default action, then
+       the only way this function was invoked is if the default action
+       is an error action.  In that case, don't check for expected
+       tokens because there are none.
+     - The only way there can be no lookahead present (in yychar) is if
+       this state is a consistent state with a default action.  Thus,
+       detecting the absence of a lookahead is sufficient to determine
+       that there is no unexpected or expected token to report.  In that
+       case, just report a simple "syntax error".
+     - Don't assume there isn't a lookahead just because this state is a
+       consistent state with a default action.  There might have been a
+       previous inconsistent state, consistent state with a non-default
+       action, or user semantic action that manipulated yychar.
+     - Of course, the expected token list depends on states to have
+       correct lookahead information, and it depends on the parser not
+       to perform extra reductions after fetching a lookahead from the
+       scanner and before detecting a syntax error.  Thus, state merging
+       (from LALR or IELR) and default reductions corrupt the expected
+       token list.  However, the list is correct for canonical LR with
+       one exception: it will still contain any token that will not be
+       accepted due to an error action in a later state.
+  */
+  if (yytoken != YYEMPTY)
+    {
+      int yyn = yypact[*yyssp];
+      yyarg[yycount++] = yytname[yytoken];
+      if (!yypact_value_is_default (yyn))
+        {
+          /* Start YYX at -YYN if negative to avoid negative indexes in
+             YYCHECK.  In other words, skip the first -YYN actions for
+             this state because they are default actions.  */
+          int yyxbegin = yyn < 0 ? -yyn : 0;
+          /* Stay within bounds of both yycheck and yytname.  */
+          int yychecklim = YYLAST - yyn + 1;
+          int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+          int yyx;
+
+          for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+            if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
+                && !yytable_value_is_error (yytable[yyx + yyn]))
+              {
+                if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+                  {
+                    yycount = 1;
+                    yysize = yysize0;
+                    break;
+                  }
+                yyarg[yycount++] = yytname[yyx];
+                {
+                  YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]);
+                  if (! (yysize <= yysize1
+                         && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+                    return 2;
+                  yysize = yysize1;
+                }
+              }
+        }
+    }
+
+  switch (yycount)
+    {
+# define YYCASE_(N, S)                      \
+      case N:                               \
+        yyformat = S;                       \
+      break
+      YYCASE_(0, YY_("syntax error"));
+      YYCASE_(1, YY_("syntax error, unexpected %s"));
+      YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
+      YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
+      YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
+      YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
+# undef YYCASE_
+    }
+
+  {
+    YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
+    if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+      return 2;
+    yysize = yysize1;
+  }
+
+  if (*yymsg_alloc < yysize)
+    {
+      *yymsg_alloc = 2 * yysize;
+      if (! (yysize <= *yymsg_alloc
+             && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
+        *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
+      return 1;
+    }
+
+  /* Avoid sprintf, as that infringes on the user's name space.
+     Don't have undefined behavior even if the translation
+     produced a string with the wrong number of "%s"s.  */
+  {
+    char *yyp = *yymsg;
+    int yyi = 0;
+    while ((*yyp = *yyformat) != '\0')
+      if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
+        {
+          yyp += yytnamerr (yyp, yyarg[yyi++]);
+          yyformat += 2;
+        }
+      else
+        {
+          yyp++;
+          yyformat++;
+        }
+  }
+  return 0;
+}
+#endif /* YYERROR_VERBOSE */
+
+/*-----------------------------------------------.
+| Release the memory associated to this symbol.  |
+`-----------------------------------------------*/
+
+static void
+yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, parser_arg *arg)
+{
+  YYUSE (yyvaluep);
+  YYUSE (arg);
+  if (!yymsg)
+    yymsg = "Deleting";
+  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
+
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+  YYUSE (yytype);
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
+}
+
+
+
+
+/* The lookahead symbol.  */
+int yychar;
+
+/* The semantic value of the lookahead symbol.  */
+YYSTYPE yylval;
+/* Number of syntax errors so far.  */
+int yynerrs;
+
+
+/*----------.
+| yyparse.  |
+`----------*/
+
+int
+yyparse (parser_arg *arg)
+{
+    int yystate;
+    /* Number of tokens to shift before error messages enabled.  */
+    int yyerrstatus;
+
+    /* The stacks and their tools:
+       'yyss': related to states.
+       'yyvs': related to semantic values.
+
+       Refer to the stacks through separate pointers, to allow yyoverflow
+       to reallocate them elsewhere.  */
+
+    /* The state stack.  */
+    yytype_int16 yyssa[YYINITDEPTH];
+    yytype_int16 *yyss;
+    yytype_int16 *yyssp;
+
+    /* The semantic value stack.  */
+    YYSTYPE yyvsa[YYINITDEPTH];
+    YYSTYPE *yyvs;
+    YYSTYPE *yyvsp;
+
+    YYSIZE_T yystacksize;
+
+  int yyn;
+  int yyresult;
+  /* Lookahead token as an internal (translated) token number.  */
+  int yytoken = 0;
+  /* The variables used to return semantic value and location from the
+     action routines.  */
+  YYSTYPE yyval;
+
+#if YYERROR_VERBOSE
+  /* Buffer for error messages, and its allocated size.  */
+  char yymsgbuf[128];
+  char *yymsg = yymsgbuf;
+  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
+#endif
+
+#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
+
+  /* The number of symbols on the RHS of the reduced rule.
+     Keep to zero when no symbol should be popped.  */
+  int yylen = 0;
+
+  yyssp = yyss = yyssa;
+  yyvsp = yyvs = yyvsa;
+  yystacksize = YYINITDEPTH;
+
+  YYDPRINTF ((stderr, "Starting parse\n"));
+
+  yystate = 0;
+  yyerrstatus = 0;
+  yynerrs = 0;
+  yychar = YYEMPTY; /* Cause a token to be read.  */
+  goto yysetstate;
+
+/*------------------------------------------------------------.
+| yynewstate -- Push a new state, which is found in yystate.  |
+`------------------------------------------------------------*/
+ yynewstate:
+  /* In all cases, when you get here, the value and location stacks
+     have just been pushed.  So pushing a state here evens the stacks.  */
+  yyssp++;
+
+ yysetstate:
+  *yyssp = yystate;
+
+  if (yyss + yystacksize - 1 <= yyssp)
+    {
+      /* Get the current used size of the three stacks, in elements.  */
+      YYSIZE_T yysize = yyssp - yyss + 1;
+
+#ifdef yyoverflow
+      {
+        /* Give user a chance to reallocate the stack.  Use copies of
+           these so that the &'s don't force the real ones into
+           memory.  */
+        YYSTYPE *yyvs1 = yyvs;
+        yytype_int16 *yyss1 = yyss;
+
+        /* Each stack pointer address is followed by the size of the
+           data in use in that stack, in bytes.  This used to be a
+           conditional around just the two extra args, but that might
+           be undefined if yyoverflow is a macro.  */
+        yyoverflow (YY_("memory exhausted"),
+                    &yyss1, yysize * sizeof (*yyssp),
+                    &yyvs1, yysize * sizeof (*yyvsp),
+                    &yystacksize);
+
+        yyss = yyss1;
+        yyvs = yyvs1;
+      }
+#else /* no yyoverflow */
+# ifndef YYSTACK_RELOCATE
+      goto yyexhaustedlab;
+# else
+      /* Extend the stack our own way.  */
+      if (YYMAXDEPTH <= yystacksize)
+        goto yyexhaustedlab;
+      yystacksize *= 2;
+      if (YYMAXDEPTH < yystacksize)
+        yystacksize = YYMAXDEPTH;
+
+      {
+        yytype_int16 *yyss1 = yyss;
+        union yyalloc *yyptr =
+          (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
+        if (! yyptr)
+          goto yyexhaustedlab;
+        YYSTACK_RELOCATE (yyss_alloc, yyss);
+        YYSTACK_RELOCATE (yyvs_alloc, yyvs);
+#  undef YYSTACK_RELOCATE
+        if (yyss1 != yyssa)
+          YYSTACK_FREE (yyss1);
+      }
+# endif
+#endif /* no yyoverflow */
+
+      yyssp = yyss + yysize - 1;
+      yyvsp = yyvs + yysize - 1;
+
+      YYDPRINTF ((stderr, "Stack size increased to %lu\n",
+                  (unsigned long int) yystacksize));
+
+      if (yyss + yystacksize - 1 <= yyssp)
+        YYABORT;
+    }
+
+  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
+
+  if (yystate == YYFINAL)
+    YYACCEPT;
+
+  goto yybackup;
+
+/*-----------.
+| yybackup.  |
+`-----------*/
+yybackup:
+
+  /* Do appropriate processing given the current state.  Read a
+     lookahead token if we need one and don't already have one.  */
+
+  /* First try to decide what to do without reference to lookahead token.  */
+  yyn = yypact[yystate];
+  if (yypact_value_is_default (yyn))
+    goto yydefault;
+
+  /* Not known => get a lookahead token if don't already have one.  */
+
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
+  if (yychar == YYEMPTY)
+    {
+      YYDPRINTF ((stderr, "Reading a token: "));
+      yychar = yylex ();
+    }
+
+  if (yychar <= YYEOF)
+    {
+      yychar = yytoken = YYEOF;
+      YYDPRINTF ((stderr, "Now at end of input.\n"));
+    }
+  else
+    {
+      yytoken = YYTRANSLATE (yychar);
+      YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
+    }
+
+  /* If the proper action on seeing token YYTOKEN is to reduce or to
+     detect an error, take that action.  */
+  yyn += yytoken;
+  if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
+    goto yydefault;
+  yyn = yytable[yyn];
+  if (yyn <= 0)
+    {
+      if (yytable_value_is_error (yyn))
+        goto yyerrlab;
+      yyn = -yyn;
+      goto yyreduce;
+    }
+
+  /* Count tokens shifted since error; after three, turn off error
+     status.  */
+  if (yyerrstatus)
+    yyerrstatus--;
+
+  /* Shift the lookahead token.  */
+  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
+
+  /* Discard the shifted token.  */
+  yychar = YYEMPTY;
+
+  yystate = yyn;
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+  *++yyvsp = yylval;
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
+
+  goto yynewstate;
+
+
+/*-----------------------------------------------------------.
+| yydefault -- do the default action for the current state.  |
+`-----------------------------------------------------------*/
+yydefault:
+  yyn = yydefact[yystate];
+  if (yyn == 0)
+    goto yyerrlab;
+  goto yyreduce;
+
+
+/*-----------------------------.
+| yyreduce -- Do a reduction.  |
+`-----------------------------*/
+yyreduce:
+  /* yyn is the number of a rule to reduce with.  */
+  yylen = yyr2[yyn];
+
+  /* If YYLEN is nonzero, implement the default value of the action:
+     '$$ = $1'.
+
+     Otherwise, the following line sets YYVAL to garbage.
+     This behavior is undocumented and Bison
+     users should not rely upon it.  Assigning to YYVAL
+     unconditionally makes the parser a bit smaller, and it avoids a
+     GCC warning that YYVAL may be used uninitialized.  */
+  yyval = yyvsp[1-yylen];
+
+
+  YY_REDUCE_PRINT (yyn);
+  switch (yyn)
+    {
+        case 2:
+#line 103 "Error.yy" /* yacc.c:1661  */
+    { (yyval.boolean) = (yyvsp[-2].boolean); STATUS(arg) = (yyvsp[-2].boolean); }
+#line 1265 "Error.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 3:
+#line 106 "Error.yy" /* yacc.c:1661  */
+    { (yyval.boolean) = (yyvsp[0].boolean); }
+#line 1271 "Error.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 4:
+#line 109 "Error.yy" /* yacc.c:1661  */
+    { (yyval.boolean) = (yyvsp[-1].boolean) && (yyvsp[0].boolean); }
+#line 1277 "Error.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 5:
+#line 110 "Error.yy" /* yacc.c:1661  */
+    { (yyval.boolean) = (yyvsp[0].boolean); }
+#line 1283 "Error.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 6:
+#line 114 "Error.yy" /* yacc.c:1661  */
+    { 
+		    ERROR_OBJ(arg)->set_error_code((ErrorCode)(yyvsp[-1].integer));
+		    (yyval.boolean) = true; 
+		}
+#line 1292 "Error.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 7:
+#line 121 "Error.yy" /* yacc.c:1661  */
+    { 
+		    ERROR_OBJ(arg)->set_error_message((yyvsp[0].string));
+		}
+#line 1300 "Error.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 8:
+#line 125 "Error.yy" /* yacc.c:1661  */
+    {
+		    (yyval.boolean) = true;
+		}
+#line 1308 "Error.tab.cc" /* yacc.c:1661  */
+    break;
+
+
+#line 1312 "Error.tab.cc" /* yacc.c:1661  */
+      default: break;
+    }
+  /* User semantic actions sometimes alter yychar, and that requires
+     that yytoken be updated with the new translation.  We take the
+     approach of translating immediately before every use of yytoken.
+     One alternative is translating here after every semantic action,
+     but that translation would be missed if the semantic action invokes
+     YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
+     if it invokes YYBACKUP.  In the case of YYABORT or YYACCEPT, an
+     incorrect destructor might then be invoked immediately.  In the
+     case of YYERROR or YYBACKUP, subsequent parser actions might lead
+     to an incorrect destructor call or verbose syntax error message
+     before the lookahead is translated.  */
+  YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
+
+  YYPOPSTACK (yylen);
+  yylen = 0;
+  YY_STACK_PRINT (yyss, yyssp);
+
+  *++yyvsp = yyval;
+
+  /* Now 'shift' the result of the reduction.  Determine what state
+     that goes to, based on the state we popped back to and the rule
+     number reduced by.  */
+
+  yyn = yyr1[yyn];
+
+  yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
+  if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
+    yystate = yytable[yystate];
+  else
+    yystate = yydefgoto[yyn - YYNTOKENS];
+
+  goto yynewstate;
+
+
+/*--------------------------------------.
+| yyerrlab -- here on detecting error.  |
+`--------------------------------------*/
+yyerrlab:
+  /* Make sure we have latest lookahead translation.  See comments at
+     user semantic actions for why this is necessary.  */
+  yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
+
+  /* If not already recovering from an error, report this error.  */
+  if (!yyerrstatus)
+    {
+      ++yynerrs;
+#if ! YYERROR_VERBOSE
+      yyerror (arg, YY_("syntax error"));
+#else
+# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
+                                        yyssp, yytoken)
+      {
+        char const *yymsgp = YY_("syntax error");
+        int yysyntax_error_status;
+        yysyntax_error_status = YYSYNTAX_ERROR;
+        if (yysyntax_error_status == 0)
+          yymsgp = yymsg;
+        else if (yysyntax_error_status == 1)
+          {
+            if (yymsg != yymsgbuf)
+              YYSTACK_FREE (yymsg);
+            yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
+            if (!yymsg)
+              {
+                yymsg = yymsgbuf;
+                yymsg_alloc = sizeof yymsgbuf;
+                yysyntax_error_status = 2;
+              }
+            else
+              {
+                yysyntax_error_status = YYSYNTAX_ERROR;
+                yymsgp = yymsg;
+              }
+          }
+        yyerror (arg, yymsgp);
+        if (yysyntax_error_status == 2)
+          goto yyexhaustedlab;
+      }
+# undef YYSYNTAX_ERROR
+#endif
+    }
+
+
+
+  if (yyerrstatus == 3)
+    {
+      /* If just tried and failed to reuse lookahead token after an
+         error, discard it.  */
+
+      if (yychar <= YYEOF)
+        {
+          /* Return failure if at end of input.  */
+          if (yychar == YYEOF)
+            YYABORT;
+        }
+      else
+        {
+          yydestruct ("Error: discarding",
+                      yytoken, &yylval, arg);
+          yychar = YYEMPTY;
+        }
+    }
+
+  /* Else will try to reuse lookahead token after shifting the error
+     token.  */
+  goto yyerrlab1;
+
+
+/*---------------------------------------------------.
+| yyerrorlab -- error raised explicitly by YYERROR.  |
+`---------------------------------------------------*/
+yyerrorlab:
+
+  /* Pacify compilers like GCC when the user code never invokes
+     YYERROR and the label yyerrorlab therefore never appears in user
+     code.  */
+  if (/*CONSTCOND*/ 0)
+     goto yyerrorlab;
+
+  /* Do not reclaim the symbols of the rule whose action triggered
+     this YYERROR.  */
+  YYPOPSTACK (yylen);
+  yylen = 0;
+  YY_STACK_PRINT (yyss, yyssp);
+  yystate = *yyssp;
+  goto yyerrlab1;
+
+
+/*-------------------------------------------------------------.
+| yyerrlab1 -- common code for both syntax error and YYERROR.  |
+`-------------------------------------------------------------*/
+yyerrlab1:
+  yyerrstatus = 3;      /* Each real token shifted decrements this.  */
+
+  for (;;)
+    {
+      yyn = yypact[yystate];
+      if (!yypact_value_is_default (yyn))
+        {
+          yyn += YYTERROR;
+          if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
+            {
+              yyn = yytable[yyn];
+              if (0 < yyn)
+                break;
+            }
+        }
+
+      /* Pop the current state because it cannot handle the error token.  */
+      if (yyssp == yyss)
+        YYABORT;
+
+
+      yydestruct ("Error: popping",
+                  yystos[yystate], yyvsp, arg);
+      YYPOPSTACK (1);
+      yystate = *yyssp;
+      YY_STACK_PRINT (yyss, yyssp);
+    }
+
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+  *++yyvsp = yylval;
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
+
+
+  /* Shift the error token.  */
+  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
+
+  yystate = yyn;
+  goto yynewstate;
+
+
+/*-------------------------------------.
+| yyacceptlab -- YYACCEPT comes here.  |
+`-------------------------------------*/
+yyacceptlab:
+  yyresult = 0;
+  goto yyreturn;
+
+/*-----------------------------------.
+| yyabortlab -- YYABORT comes here.  |
+`-----------------------------------*/
+yyabortlab:
+  yyresult = 1;
+  goto yyreturn;
+
+#if !defined yyoverflow || YYERROR_VERBOSE
+/*-------------------------------------------------.
+| yyexhaustedlab -- memory exhaustion comes here.  |
+`-------------------------------------------------*/
+yyexhaustedlab:
+  yyerror (arg, YY_("memory exhausted"));
+  yyresult = 2;
+  /* Fall through.  */
+#endif
+
+yyreturn:
+  if (yychar != YYEMPTY)
+    {
+      /* Make sure we have latest lookahead translation.  See comments at
+         user semantic actions for why this is necessary.  */
+      yytoken = YYTRANSLATE (yychar);
+      yydestruct ("Cleanup: discarding lookahead",
+                  yytoken, &yylval, arg);
+    }
+  /* Do not reclaim the symbols of the rule whose action triggered
+     this YYABORT or YYACCEPT.  */
+  YYPOPSTACK (yylen);
+  YY_STACK_PRINT (yyss, yyssp);
+  while (yyssp != yyss)
+    {
+      yydestruct ("Cleanup: popping",
+                  yystos[*yyssp], yyvsp, arg);
+      YYPOPSTACK (1);
+    }
+#ifndef yyoverflow
+  if (yyss != yyssa)
+    YYSTACK_FREE (yyss);
+#endif
+#if YYERROR_VERBOSE
+  if (yymsg != yymsgbuf)
+    YYSTACK_FREE (yymsg);
+#endif
+  return yyresult;
+}
+#line 130 "Error.yy" /* yacc.c:1906  */
+
+
+void
+Errorerror(parser_arg *, const string &s)
+{
+  string msg = s;
+  msg += " line: ";
+  append_long_to_string(error_line_num, 10, msg);
+  msg += "\n";
+
+  throw Error(unknown_error, msg);
+}
+
diff --git a/Error.tab.hh b/Error.tab.hh
new file mode 100644
index 0000000..a0b0432
--- /dev/null
+++ b/Error.tab.hh
@@ -0,0 +1,115 @@
+/* A Bison parser, made by GNU Bison 3.0.4.  */
+
+/* Bison interface for Yacc-like parsers in C
+
+   Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
+
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
+
+#ifndef YY_ERROR_ERROR_TAB_HH_INCLUDED
+# define YY_ERROR_ERROR_TAB_HH_INCLUDED
+/* Debug traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 1
+#endif
+#if YYDEBUG
+extern int Errordebug;
+#endif
+/* "%code requires" blocks.  */
+#line 32 "Error.yy" /* yacc.c:1915  */
+
+
+#include "config_dap.h"
+
+#include <iostream>
+
+#include "Error.h"
+
+#include "parser.h"
+#include "debug.h"
+#include "util.h"
+
+using namespace std;
+using namespace libdap;
+
+// These macros are used to access the `arguments' passed to the parser. A
+// pointer to an error object and a pointer to an integer status variable are
+// passed in to the parser within a structure (which itself is passed as a
+// pointer). Note that the ERROR macro explicitly casts OBJ to an ERROR *. 
+
+#define ERROR_OBJ(arg) ((Error *)((parser_arg *)(arg))->_object)
+#define STATUS(arg) ((parser_arg *)(arg))->_status
+
+//#define YYPARSE_PARAM arg
+
+extern int error_line_num;	// defined in Error.lex
+
+
+#line 73 "Error.tab.hh" /* yacc.c:1915  */
+
+/* Token type.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+  enum yytokentype
+  {
+    SCAN_INT = 258,
+    SCAN_STR = 259,
+    SCAN_ERROR = 260,
+    SCAN_CODE = 261,
+    SCAN_MSG = 262
+  };
+#endif
+
+/* Value type.  */
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+
+union YYSTYPE
+{
+#line 75 "Error.yy" /* yacc.c:1915  */
+
+#ifdef __SUNPRO_CC
+    int boolean;
+#else
+    bool boolean;
+#endif
+    int integer;
+    char *string;
+
+#line 103 "Error.tab.hh" /* yacc.c:1915  */
+};
+
+typedef union YYSTYPE YYSTYPE;
+# define YYSTYPE_IS_TRIVIAL 1
+# define YYSTYPE_IS_DECLARED 1
+#endif
+
+
+extern YYSTYPE Errorlval;
+
+int Errorparse (parser_arg *arg);
+
+#endif /* !YY_ERROR_ERROR_TAB_HH_INCLUDED  */
diff --git a/Error.yy b/Error.yy
new file mode 100644
index 0000000..195fbf0
--- /dev/null
+++ b/Error.yy
@@ -0,0 +1,142 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+// 
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+// 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+ 
+// (c) COPYRIGHT URI/MIT 1997,1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+%code requires {
+
+#include "config_dap.h"
+
+#include <iostream>
+
+#include "Error.h"
+
+#include "parser.h"
+#include "debug.h"
+#include "util.h"
+
+using namespace std;
+using namespace libdap;
+
+// These macros are used to access the `arguments' passed to the parser. A
+// pointer to an error object and a pointer to an integer status variable are
+// passed in to the parser within a structure (which itself is passed as a
+// pointer). Note that the ERROR macro explicitly casts OBJ to an ERROR *. 
+
+#define ERROR_OBJ(arg) ((Error *)((parser_arg *)(arg))->_object)
+#define STATUS(arg) ((parser_arg *)(arg))->_status
+
+//#define YYPARSE_PARAM arg
+
+extern int error_line_num;	// defined in Error.lex
+
+}
+
+%code {
+
+int Errorlex();			// the scanner
+void Errorerror(parser_arg *arg, const string &s);	// gotta love automatically generated names...
+
+}
+
+%require "2.4"
+%parse-param {parser_arg *arg}
+%name-prefix "Error"
+%defines
+%debug
+%verbose
+
+%union {
+#ifdef __SUNPRO_CC
+    int boolean;
+#else
+    bool boolean;
+#endif
+    int integer;
+    char *string;
+}
+
+%token <integer>	SCAN_INT
+%token <string>		SCAN_STR
+
+%token <integer>	SCAN_ERROR
+%token <integer>	SCAN_CODE
+%token <string>		SCAN_MSG
+
+%type <boolean> error_object contents description code message
+
+%%
+
+// The parser is called through a function named ERRORPARSE which takes a
+// pointer to a structure and returns a boolean. The structure contains a
+// pointer to an Error object which is empty and an integer which contains
+// status information. In addition the parser_arg structure contains a
+// pointer to an error object. However, the `error' member of parser_arg is
+// not yet used here.
+
+error_object:	SCAN_ERROR '{' contents '}' ';' { $$ = $3; STATUS(arg) = $3; }
+;
+
+contents:	description { $$ = $1; }
+;
+
+description:	code message { $$ = $1 && $2; }
+                | code { $$ = $1; }
+;
+
+code:		SCAN_CODE '=' SCAN_INT ';' 
+		{ 
+		    ERROR_OBJ(arg)->set_error_code((ErrorCode)$3);
+		    $$ = true; 
+		}
+;
+
+message:	SCAN_MSG '=' SCAN_STR 
+		{ 
+		    ERROR_OBJ(arg)->set_error_message($3);
+		} 
+		';' 
+                {
+		    $$ = true;
+		}
+;
+
+%%
+
+void
+Errorerror(parser_arg *, const string &s)
+{
+  string msg = s;
+  msg += " line: ";
+  append_long_to_string(error_line_num, 10, msg);
+  msg += "\n";
+
+  throw Error(unknown_error, msg);
+}
+
diff --git a/EventHandler.h b/EventHandler.h
new file mode 100644
index 0000000..c2418ed
--- /dev/null
+++ b/EventHandler.h
@@ -0,0 +1,76 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#ifndef event_handler_h
+#define event_handler_h
+
+#include <iostream>
+
+namespace libdap
+{
+
+/** An abstract class which provides a hook method used by SignalHandler.
+
+    Based on "Applying Design Patterns to Simplify Signal Handling", Douglas
+    C. Schmidt, 1998, http://www.cs.wustl.edu/~schmidt/signal-patterns.html.
+
+    @see SignalHandler
+    @see AlarmHandler
+    @author James Gallagher <jgallagher@opendap.org> */
+class EventHandler
+{
+public:
+    /** Hook method for SignalHandler. If a concrete instance of this class
+    is registered with SignalHandler, this method will be called when \c
+    signum is received. */
+    virtual void handle_signal(int signum) = 0;
+
+    /** We don't need a destructor, but including one might stave off an
+    error later on... */
+    virtual ~EventHandler()
+    {}
+};
+
+#if 0
+// moved to SignalHandlerTest jhrg 4/26/13
+
+/** Test Handler. This is used with the SignalHandlerTest unit tests. */
+class TestHandler : public EventHandler
+{
+public:
+    int flag;
+
+    TestHandler() : flag(0)
+    {}
+
+    virtual void handle_signal(int ) {
+        flag = 1;
+    }
+};
+#endif
+
+} // namespace libdap
+
+#endif // event_handler_h
diff --git a/Float32.cc b/Float32.cc
new file mode 100644
index 0000000..31774a3
--- /dev/null
+++ b/Float32.cc
@@ -0,0 +1,336 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// Implementation for Float32.
+//
+// 3/22/99 jhrg
+
+#include "config.h"
+
+//#define DODS_DEBUG
+
+#include <sstream>
+#include <iomanip>
+
+#include "Byte.h"           // synonymous with UInt8 and Char
+#include "Int8.h"
+#include "Int16.h"
+#include "UInt16.h"
+#include "Int32.h"
+#include "UInt32.h"
+#include "Int64.h"
+#include "UInt64.h"
+#include "Float32.h"
+#include "Float64.h"
+#include "Str.h"
+#include "Url.h"
+
+#include "DDS.h"
+#include "Marshaller.h"
+#include "UnMarshaller.h"
+
+#include "DMR.h"
+#include "D4StreamMarshaller.h"
+#include "D4StreamUnMarshaller.h"
+
+#include "parser.h"
+#include "Operators.h"
+#include "dods-limits.h"
+#include "InternalErr.h"
+
+#include "util.h"
+#include "debug.h"
+
+using std::cerr;
+using std::endl;
+
+namespace libdap {
+
+/** The Float32 constructor accepts only the name of the variable. The
+    name may be omitted, which will create a nameless variable. This
+    may be adequate for some applications.
+
+    @param n A string containing the name of the variable to be
+    created.
+*/
+Float32::Float32(const string &n) : BaseType(n, dods_float32_c), d_buf(0)
+{}
+
+/** The Float32 server-side constructor accepts the name of the variable and
+    the dataset name from which this instance is created.
+
+    @param n A string containing the name of the variable to be created.
+    @param d A string containing the name of the dataset from which this
+    variable is created
+*/
+Float32::Float32(const string &n, const string &d) : BaseType(n, d, dods_float32_c), d_buf(0)
+{}
+
+Float32::Float32(const Float32 &copy_from) : BaseType(copy_from)
+{
+    d_buf = copy_from.d_buf;
+}
+
+BaseType *
+Float32::ptr_duplicate()
+{
+    return new Float32(*this);
+}
+
+Float32 &
+Float32::operator=(const Float32 &rhs)
+{
+    if (this == &rhs)
+        return *this;
+
+    dynamic_cast<BaseType &>(*this) = rhs;
+
+    d_buf = rhs.d_buf;
+
+    return *this;
+}
+
+unsigned int
+Float32::width(bool) const
+{
+    return sizeof(dods_float32);
+}
+
+bool
+Float32::serialize(ConstraintEvaluator &eval, DDS &dds, Marshaller &m, bool ce_eval)
+{
+#if USE_LOCAL_TIMEOUT_SCHEME
+    dds.timeout_on();
+#endif
+    if (!read_p())
+        read();  // read() throws Error and InternalErr
+
+    if (ce_eval && !eval.eval_selection(dds, dataset()))
+        return true;
+#if USE_LOCAL_TIMEOUT_SCHEME
+    dds.timeout_off();
+#endif
+    m.put_float32( d_buf ) ;
+
+    return true;
+}
+
+bool
+Float32::deserialize(UnMarshaller &um, DDS *, bool)
+{
+    um.get_float32( d_buf ) ;
+
+    return false;
+}
+
+void
+Float32::compute_checksum(Crc32 &checksum)
+{
+	checksum.AddData(reinterpret_cast<uint8_t*>(&d_buf), sizeof(d_buf));
+}
+
+/**
+ * @brief Serialize an Int8
+ * @param m
+ * @param dmr Unused
+ * @param eval Unused
+ * @param filter Unused
+ * @exception Error is thrown if the value needs to be read and that operation fails.
+ */
+void
+Float32::serialize(D4StreamMarshaller &m, DMR &, /*ConstraintEvaluator &,*/ bool)
+{
+    if (!read_p())
+        read();          // read() throws Error
+
+    m.put_float32( d_buf ) ;
+}
+
+void
+Float32::deserialize(D4StreamUnMarshaller &um, DMR &)
+{
+    um.get_float32( d_buf ) ;
+}
+
+unsigned int
+Float32::val2buf(void *val, bool)
+{
+    // Jose Garcia This method is public I believe it has been
+    // designed to be used by read which must be implemented in a
+    // subclass, thus if the pointer val is NULL, is an Internal
+    // Error.
+    // Changed to InternalErr. jhrg
+    if (!val)
+        throw InternalErr(__FILE__, __LINE__,
+                          "The incoming pointer does not contain any data.");
+
+    d_buf = *(dods_float32 *)val;
+
+    return width();
+}
+
+unsigned int
+Float32::buf2val(void **val)
+{
+    // Jose Garcia
+    // The same comment justifying throwing an Error in val2buf applies here.
+    if (!val)
+        throw InternalErr(__FILE__, __LINE__, "NULL pointer.");
+
+    if (!*val)
+        *val = new dods_float32;
+
+    *(dods_float32 *)*val = d_buf;
+
+    return width();
+}
+
+bool
+Float32::set_value(dods_float32 f)
+{
+    d_buf = f;
+    set_read_p(true);
+
+    return true;
+}
+
+/** Return the value of the Float32 held by this instance. This is more
+    convenient than the general interface provided by buf2val, but its use
+    requires a cast from BaseType to Float32.
+
+    @return The dods_float32 value. */
+dods_float32
+Float32::value() const
+{
+    return d_buf;
+}
+
+void
+Float32::print_val(FILE *out, string space, bool print_decl_p)
+{
+    ostringstream oss;
+    print_val(oss, space, print_decl_p);
+    fwrite(oss.str().data(), sizeof(char), oss.str().length(), out);
+}
+
+void
+Float32::print_val(ostream &out, string space, bool print_decl_p)
+{
+    // FIX: need to set precision in the printing somehow.
+    // os.precision(DODS_FLT_DIG);
+
+    if (print_decl_p) {
+        print_decl(out, space, false);
+	out << " = " << std::setprecision( 6 ) << d_buf << ";\n" ;
+    }
+    else
+	out << std::setprecision( 6 ) << d_buf ;
+}
+
+bool
+Float32::ops(BaseType *b, int op)
+{
+    // Get this instance's value
+    if (!read_p() && !read()) {
+        // Jose Garcia Since the read method is virtual and
+        // implemented outside libdap++ if we cannot read the data
+        // that is the problem of whomever wrote the implementation of
+        // read and therefore it is an internal error.
+        throw InternalErr(__FILE__, __LINE__, "This value not read!");
+    }
+
+    // Extract the second arg's value.
+    if (!b || !(b->read_p() || b->read())) {
+        throw InternalErr(__FILE__, __LINE__, "This value not read!");
+    }
+
+    return d4_ops(b, op);
+}
+
+/**
+ * @see BaseType::d4_ops(BaseType *, int)
+ */
+bool Float32::d4_ops(BaseType *b, int op)
+{
+    DBG(cerr << "b->typename(): " << b->type_name() << endl);
+
+    switch (b->type()) {
+    case dods_int8_c:
+        return Cmp<dods_float32, dods_int8>(op, d_buf, static_cast<Int8*>(b)->value());
+    case dods_byte_c:
+        return SUCmp<dods_float32, dods_byte>(op, d_buf, static_cast<Byte*>(b)->value());
+    case dods_int16_c:
+        return Cmp<dods_float32, dods_int16>(op, d_buf, static_cast<Int16*>(b)->value());
+    case dods_uint16_c:
+        return SUCmp<dods_float32, dods_uint16>(op, d_buf, static_cast<UInt16*>(b)->value());
+    case dods_int32_c:
+        return Cmp<dods_float32, dods_int32>(op, d_buf, static_cast<Int32*>(b)->value());
+    case dods_uint32_c:
+        return SUCmp<dods_float32, dods_uint32>(op, d_buf, static_cast<UInt32*>(b)->value());
+    case dods_int64_c:
+        return Cmp<dods_float32, dods_int64>(op, d_buf, static_cast<Int64*>(b)->value());
+    case dods_uint64_c:
+        return SUCmp<dods_float32, dods_uint64>(op, d_buf, static_cast<UInt64*>(b)->value());
+    case dods_float32_c:
+        return Cmp<dods_float32, dods_float32>(op, d_buf, static_cast<Float32*>(b)->value());
+    case dods_float64_c:
+        DBG(cerr << "arg1: " << d_buf << " " << op  << " arg2: " << static_cast<Float64*>(b)->value() << endl);
+        // See the code in Float64::d4_ops() for an explanation of this odd-looking cast.
+        return Cmp<dods_float32, dods_float32>(op, d_buf, (float)static_cast<Float64*>(b)->value());
+    case dods_str_c:
+    case dods_url_c:
+        throw Error(malformed_expr, "Relational operators can only compare compatible types (number, string).");
+    default:
+        throw Error(malformed_expr, "Relational operators only work with scalar types.");
+    }
+}
+
+/** @brief dumps information about this object
+
+   Displays the pointer value of this instance and information about this
+   instance.
+
+   @param strm C++ i/o stream to dump the information to
+   @return void
+ */
+void
+Float32::dump(ostream &strm) const
+{
+    strm << DapIndent::LMarg << "Float32::dump - (" << (void *)this << ")"
+	 << endl ;
+    DapIndent::Indent() ;
+    BaseType::dump(strm) ;
+    strm << DapIndent::LMarg << "value: " << d_buf << endl ;
+    DapIndent::UnIndent() ;
+}
+
+} // namespace libdap
+
diff --git a/Float32.h b/Float32.h
new file mode 100644
index 0000000..a3e109d
--- /dev/null
+++ b/Float32.h
@@ -0,0 +1,109 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// Interface for Float32 type.
+//
+// 3/22/99 jhrg
+
+#ifndef _float32_h
+#define _float32_h 1
+
+
+#ifndef _dods_datatypes_h
+#include "dods-datatypes.h"
+#endif
+
+#ifndef _basetype_h
+#include "BaseType.h"
+#endif
+
+#ifndef constraint_evaluator_h
+#include "ConstraintEvaluator.h"
+#endif
+
+namespace libdap
+{
+
+class DMR;
+
+/** @brief Holds a 32-bit floating point value.
+
+    @see BaseType
+    */
+class Float32: public BaseType
+{
+protected:
+    dods_float32 d_buf;
+
+public:
+    Float32(const string &n);
+    Float32(const string &n, const string &d);
+
+    Float32(const Float32 &copy_from);
+
+    Float32 &operator=(const Float32 &rhs);
+
+    virtual ~Float32()
+    {}
+
+    virtual BaseType *ptr_duplicate();
+    virtual unsigned int width(bool constrained = false) const;
+
+    // DAP2
+    virtual bool serialize(ConstraintEvaluator &eval, DDS &dds,  Marshaller &m, bool ce_eval = true);
+    virtual bool deserialize(UnMarshaller &um, DDS *dds, bool reuse = false);
+
+    // DAP4
+    virtual void compute_checksum(Crc32 &checksum);
+    virtual void serialize(D4StreamMarshaller &m, DMR &dmr, /*ConstraintEvaluator &eval,*/ bool filter = false);
+    virtual void deserialize(D4StreamUnMarshaller &um, DMR &dmr);
+
+    virtual unsigned int val2buf(void *val, bool reuse = false);
+    virtual unsigned int buf2val(void **val);
+
+    virtual dods_float32 value() const;
+    virtual bool set_value(dods_float32 f);
+
+    virtual void print_val(FILE *out, string space = "",
+                           bool print_decl_p = true);
+    virtual void print_val(ostream &out, string space = "",
+                           bool print_decl_p = true);
+
+    virtual bool ops(BaseType *b, int op);
+    virtual bool d4_ops(BaseType *b, int op);
+
+    virtual void dump(ostream &strm) const ;
+};
+
+} // namespace libdap
+
+#endif // _float32_h
+
diff --git a/Float64.cc b/Float64.cc
new file mode 100644
index 0000000..b0e746b
--- /dev/null
+++ b/Float64.cc
@@ -0,0 +1,345 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1994-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// Implementation for Float64.
+//
+// jhrg 9/7/94
+
+#include "config.h"
+
+//#define DODS_DEBUG
+
+#include <sstream>
+#include <iomanip>
+
+#include "Byte.h"           // synonymous with UInt8 and Char
+#include "Int8.h"
+#include "Int16.h"
+#include "UInt16.h"
+#include "Int32.h"
+#include "UInt32.h"
+#include "Int64.h"
+#include "UInt64.h"
+#include "Float32.h"
+#include "Float64.h"
+#include "Str.h"
+#include "Url.h"
+
+#include "DDS.h"
+#include "Marshaller.h"
+#include "UnMarshaller.h"
+
+#include "DMR.h"
+#include "D4StreamMarshaller.h"
+#include "D4StreamUnMarshaller.h"
+
+#include "util.h"
+#include "parser.h"
+#include "Operators.h"
+#include "dods-limits.h"
+#include "InternalErr.h"
+
+
+using std::cerr;
+using std::endl;
+
+namespace libdap {
+
+/** The Float64 constructor requires only the name of the variable
+    to be created.  The name may be omitted, which will create a
+    nameless variable.  This may be adequate for some applications.
+
+    @param n A string containing the name of the variable to be
+    created.
+
+*/
+Float64::Float64(const string &n) : BaseType(n, dods_float64_c), d_buf(0)
+{}
+
+/** The Float64 server-side constructor accepts the name of the variable and
+    the dataset name from which this instance is created.
+
+    @param n A string containing the name of the variable to be created.
+    @param d A string containing the name of the dataset from which this
+    variable is created
+*/
+Float64::Float64(const string &n, const string &d) : BaseType(n, d, dods_float64_c), d_buf(0)
+{}
+
+Float64::Float64(const Float64 &copy_from) : BaseType(copy_from)
+{
+    d_buf = copy_from.d_buf;
+}
+
+BaseType *
+Float64::ptr_duplicate()
+{
+    return new Float64(*this);
+}
+
+Float64 &
+Float64::operator=(const Float64 &rhs)
+{
+    if (this == &rhs)
+        return *this;
+
+    dynamic_cast<BaseType &>(*this) = rhs;
+
+    d_buf = rhs.d_buf;
+
+    return *this;
+}
+
+unsigned int
+Float64::width(bool) const
+{
+    return sizeof(dods_float64);
+}
+
+bool
+Float64::serialize(ConstraintEvaluator &eval, DDS &dds, Marshaller &m, bool ce_eval)
+{
+#if USE_LOCAL_TIMEOUT_SCHEME
+    dds.timeout_on();
+#endif
+    if (!read_p())
+        read();  // read() throws Error and InternalErr
+
+    if (ce_eval && !eval.eval_selection(dds, dataset()))
+        return true;
+#if USE_LOCAL_TIMEOUT_SCHEME
+    dds.timeout_off();
+#endif
+    m.put_float64( d_buf ) ;
+
+    return true;
+}
+
+bool
+Float64::deserialize(UnMarshaller &um, DDS *, bool)
+{
+    um.get_float64( d_buf ) ;
+
+    return false;
+}
+
+void
+Float64::compute_checksum(Crc32 &checksum)
+{
+	checksum.AddData(reinterpret_cast<uint8_t*>(&d_buf), sizeof(d_buf));
+}
+
+/**
+ * @brief Serialize an Int8
+ * @param m
+ * @param dmr Unused
+ * @param eval Unused
+ * @param filter Unused
+ * @exception Error is thrown if the value needs to be read and that operation fails.
+ */
+void
+Float64::serialize(D4StreamMarshaller &m, DMR &, /*ConstraintEvaluator &,*/ bool)
+{
+    if (!read_p())
+        read();          // read() throws Error
+
+    m.put_float64( d_buf ) ;
+}
+
+void
+Float64::deserialize(D4StreamUnMarshaller &um, DMR &)
+{
+    um.get_float64( d_buf ) ;
+}
+
+unsigned int
+Float64::val2buf(void *val, bool)
+{
+    // Jose Garcia
+    // This method is public therefore and I believe it has being designed
+    // to be use by read which must be implemented on the surrogated library,
+    // thus if the pointer val is NULL, is an Internal Error.
+    if (!val)
+        throw InternalErr(__FILE__, __LINE__,
+                          "The incoming pointer does not contain any data.");
+
+    d_buf = *(dods_float64 *)val;
+
+    return width();
+}
+
+unsigned int
+Float64::buf2val(void **val)
+{
+    // Jose Garcia
+    // The same comment justifying throwing an Error in val2buf applies here.
+    if (!val)
+        throw InternalErr(__FILE__, __LINE__, "NULL pointer.");
+
+    if (!*val)
+        *val = new dods_float64;
+
+    *(dods_float64 *)*val = d_buf;
+
+    return width();
+}
+
+/** Return the value of the Float64 held by this instance. This is more
+    convenient than the general interface provided by buf2val, but its use
+    requires a downcase from BaseType to Float64.
+
+    @return The dods_float32 value. */
+dods_float64
+Float64::value() const
+{
+    return d_buf;
+}
+
+bool
+Float64::set_value(dods_float64 val)
+{
+    d_buf = val;
+    set_read_p(true);
+
+    return true;
+}
+
+void
+Float64::print_val(FILE *out, string space, bool print_decl_p)
+{
+    ostringstream oss;
+    print_val(oss, space, print_decl_p);
+    fwrite(oss.str().data(), sizeof(char), oss.str().length(), out);
+}
+
+void
+Float64::print_val(ostream &out, string space, bool print_decl_p)
+{
+    // Set the precision to 15 digits
+    std::streamsize prec = out.precision(15);
+
+    if (print_decl_p) {
+        print_decl(out, space, false);
+        out << " = " << d_buf << ";\n";
+    }
+    else
+        out << d_buf;
+
+    // reset the precision
+    out.precision(prec);
+}
+
+bool
+Float64::ops(BaseType *b, int op)
+{
+    // Extract the Byte arg's value.
+    if (!read_p() && !read()) {
+        // Jose Garcia
+        // Since the read method is virtual and implemented outside
+        // libdap++ if we cannot read the data that is the problem
+        // of the user or of whoever wrote the surrogate library
+        // implemeting read therefore it is an internal error.
+        throw InternalErr(__FILE__, __LINE__, "This value not read!");
+    }
+
+    // Extract the second arg's value.
+    if (!b->read_p() && !b->read()) {
+        // Jose Garcia
+        // Since the read method is virtual and implemented outside
+        // libdap++ if we cannot read the data that is the problem
+        // of the user or of whoever wrote the surrogate library
+        // implemeting read therefore it is an internal error.
+        throw InternalErr(__FILE__, __LINE__, "This value not read!");
+    }
+
+    return d4_ops(b, op);
+}
+
+bool
+Float64::d4_ops(BaseType *b, int op)
+{
+    DBG(cerr << "b->typename(): " << b->type_name() << endl);
+
+    switch (b->type()) {
+        case dods_int8_c:
+            return Cmp<dods_float64, dods_int8>(op, d_buf, static_cast<Int8*>(b)->value());
+        case dods_byte_c:
+            return SUCmp<dods_float64, dods_byte>(op, d_buf, static_cast<Byte*>(b)->value());
+        case dods_int16_c:
+            return Cmp<dods_float64, dods_int16>(op, d_buf, static_cast<Int16*>(b)->value());
+        case dods_uint16_c:
+            return SUCmp<dods_float64, dods_uint16>(op, d_buf, static_cast<UInt16*>(b)->value());
+        case dods_int32_c:
+            return Cmp<dods_float64, dods_int32>(op, d_buf, static_cast<Int32*>(b)->value());
+        case dods_uint32_c:
+            return SUCmp<dods_float64, dods_uint32>(op, d_buf, static_cast<UInt32*>(b)->value());
+        case dods_int64_c:
+            return Cmp<dods_float64, dods_int64>(op, d_buf, static_cast<Int64*>(b)->value());
+        case dods_uint64_c:
+            return SUCmp<dods_float64, dods_uint64>(op, d_buf, static_cast<UInt64*>(b)->value());
+        case dods_float32_c:
+            // Note that this code casts the double (dods_float64) to a float because when
+            // real numbers are approximated using float or double, errors are larger in the float
+            // case, making <= and == operators fail. By casting to the smaller type, the
+            // same values have the same error and we can avoid using a range compare and a
+            // delta value.
+            return Cmp<dods_float32, dods_float32>(op, (float)d_buf, static_cast<Float32*>(b)->value());
+        case dods_float64_c:
+            return Cmp<dods_float64, dods_float64>(op, d_buf, static_cast<Float64*>(b)->value());
+        case dods_str_c:
+        case dods_url_c:
+            throw Error(malformed_expr, "Relational operators can only compare compatible types (number, string).");
+        default:
+            throw Error(malformed_expr, "Relational operators only work with scalar types.");
+    }
+
+}
+/** @brief dumps information about this object
+ *
+ * Displays the pointer value of this instance and information about this
+ * instance.
+ *
+ * @param strm C++ i/o stream to dump the information to
+ * @return void
+ */
+void
+Float64::dump(ostream &strm) const
+{
+    strm << DapIndent::LMarg << "Float64::dump - ("
+    << (void *)this << ")" << endl ;
+    DapIndent::Indent() ;
+    BaseType::dump(strm) ;
+    strm << DapIndent::LMarg << "value: " << d_buf << endl ;
+    DapIndent::UnIndent() ;
+}
+
+} // namespace libdap
+
diff --git a/Float64.h b/Float64.h
new file mode 100644
index 0000000..838d626
--- /dev/null
+++ b/Float64.h
@@ -0,0 +1,107 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1994-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// Interface for Float64 type.
+//
+// jhrg 9/7/94
+
+#ifndef _float64_h
+#define _float64_h 1
+
+
+#ifndef _dods_datatypes_h
+#include "dods-datatypes.h"
+#endif
+
+#ifndef _basetype_h
+#include "BaseType.h"
+#endif
+
+#ifndef constraint_evaluator_h
+#include "ConstraintEvaluator.h"
+#endif
+
+namespace libdap
+{
+
+/** @brief Holds a 64-bit (double precision) floating point value.
+
+@see BaseType
+*/
+
+class Float64: public BaseType
+{
+protected:
+    dods_float64 d_buf;
+
+public:
+    Float64(const string &n);
+    Float64(const string &n, const string &d);
+    virtual ~Float64()
+    {}
+
+    Float64(const Float64 &copy_from);
+
+    Float64 &operator=(const Float64 &rhs);
+
+    virtual BaseType *ptr_duplicate();
+    virtual unsigned int width(bool constrained = false) const;
+
+    // DAP2
+    virtual bool serialize(ConstraintEvaluator &eval, DDS &dds, Marshaller &m, bool ce_eval = true);
+    virtual bool deserialize(UnMarshaller &um, DDS *dds, bool reuse = false);
+
+    // DAP4
+    virtual void compute_checksum(Crc32 &checksum);
+    virtual void serialize(D4StreamMarshaller &m, DMR &dmr, /*ConstraintEvaluator &eval,*/ bool filter = false);
+    virtual void deserialize(D4StreamUnMarshaller &um, DMR &dmr);
+
+    virtual unsigned int val2buf(void *val, bool reuse = false);
+    virtual unsigned int buf2val(void **val);
+
+    virtual dods_float64 value() const;
+    virtual bool set_value(dods_float64 val);
+
+    virtual void print_val(FILE *out, string space = "",
+                           bool print_decl_p = true);
+    virtual void print_val(ostream &out, string space = "",
+                           bool print_decl_p = true);
+
+    virtual bool ops(BaseType *b, int op);
+    virtual bool d4_ops(BaseType *b, int op);
+
+    virtual void dump(ostream &strm) const ;
+};
+
+} // namespace libdap
+
+#endif // _float64_h
+
diff --git a/GNU/GNURegex.cc b/GNU/GNURegex.cc
new file mode 100644
index 0000000..4eb0ff1
--- /dev/null
+++ b/GNU/GNURegex.cc
@@ -0,0 +1,185 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2005 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+// 
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+// 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+
+//#define DODS_DEBUG
+
+#include <config.h>
+
+#ifndef WIN32
+#include <alloca.h>
+#endif
+#include <stdlib.h>
+ 
+#include <sys/types.h>
+#include <regex.h>
+
+#include <new>
+#include <string>
+#include <vector>
+#include <stdexcept>
+
+#include "GNURegex.h"
+#include "Error.h"
+#include "util.h"
+#include "debug.h"
+
+
+using namespace std;
+
+namespace libdap {
+
+void
+Regex::init(const char *t)
+{
+    DBG( cerr << "Regex::init() - BEGIN" << endl);
+
+    DBG( cerr << "Regex::init() - creating new regex..." << endl);
+    d_preg = static_cast<void*>(new regex_t);
+
+    DBG( cerr << "Regex::init() - Calling regcomp()..." << endl);
+    int result = regcomp(static_cast<regex_t*>(d_preg), t, REG_EXTENDED);
+
+    if  (result != 0) {
+        DBG( cerr << "Regex::init() - Call to regcomp FAILED" << endl);
+        DBG( cerr << "Regex::init() - Calling regerror()..." << endl);
+        size_t msg_len = regerror(result, static_cast<regex_t*>(d_preg),
+                                  static_cast<char*>(NULL),
+                                  static_cast<size_t>(0));
+
+        DBG( cerr << "Regex::init() - Creating message" << endl);
+        vector<char> msg(msg_len+1);
+        //char *msg = new char[msg_len+1];
+        DBG( cerr << "Regex::init() - Calling regerror() again..." << endl);
+        regerror(result, static_cast<regex_t*>(d_preg), &msg[0], msg_len);
+        DBG( cerr << "Regex::init() - Throwing libdap::Error" << endl);
+        throw Error(string("Regex error: ") + string(&msg[0]));
+        //delete[] msg;
+        //throw e;
+    }
+    DBG( cerr << "Regex::init() - Call to regcomp() SUCCEEDED" << endl);
+    DBG( cerr << "Regex::init() - END" << endl);
+}
+
+Regex::~Regex()
+{
+    regfree(static_cast<regex_t*>(d_preg));
+    delete static_cast<regex_t*>(d_preg); d_preg = 0;
+
+}
+
+/** Initialize a POSIX regular expression (using the 'extended' features).
+
+    @param t The regular expression pattern. */
+Regex::Regex(const char* t)
+{
+    init(t);
+}
+
+/** Compatability ctor.
+    @see Regex::Regex(const char* t) */
+Regex::Regex(const char* t, int)
+{
+    init(t);
+}
+
+/** Does the regular expression match the string? 
+
+    @param s The string
+    @param len The length of string to consider
+    @param pos Start looking at this position in the string
+    @return The number of characters that match, -1 if there's no match. */
+int 
+Regex::match(const char* s, int len, int pos)
+{
+   if (len > 32766)	// Integer overflow protection
+    	return -1;
+    	
+    regmatch_t *pmatch = new regmatch_t[len+1];
+    string ss = s;
+
+    int result = regexec(static_cast<regex_t*>(d_preg), 
+                         ss.substr(pos, len-pos).c_str(), len, pmatch, 0);
+	int matchnum;
+    if (result == REG_NOMATCH)
+        matchnum = -1;
+	else
+		matchnum = pmatch[0].rm_eo - pmatch[0].rm_so;
+		
+	delete[] pmatch; pmatch = 0;
+
+    return matchnum;
+}
+
+/** Does the regular expression match the string? 
+
+    @param s The string
+    @param len The length of string to consider
+    @param matchlen Return the length of the matched portion in this 
+    value-result parameter.
+    @param pos Start looking at this position in the string
+    @return The start position of the first match. This is different from 
+    POSIX regular expressions, whcih return the start position of the 
+    longest match. */
+int 
+Regex::search(const char* s, int len, int& matchlen, int pos)
+{
+	// sanitize allocation
+    if (!size_ok(sizeof(regmatch_t), len+1))
+    	return -1;
+    	
+    // alloc space for len matches, which is theoretical max.
+    // Problem: If somehow 'len' is very large - say the size of a 32-bit int,
+    // then len+1 is a an integer overflow and this might be exploited by
+    // an attacker. It's not likely there will be more than a handful of
+    // matches, so I am going to limit this value to 32766. jhrg 3/4/09
+    if (len > 32766)
+    	return -1;
+
+    regmatch_t *pmatch = new regmatch_t[len+1];
+    string ss = s;
+     
+    int result = regexec(static_cast<regex_t*>(d_preg),
+                         ss.substr(pos, len-pos).c_str(), len, pmatch, 0);
+    if (result == REG_NOMATCH) {
+        delete[] pmatch; pmatch = 0;
+        return -1;
+    }
+
+    // Match found, find the first one (pmatch lists the longest first)
+    int m = 0;
+    for (int i = 1; i < len; ++i)
+        if (pmatch[i].rm_so != -1 && pmatch[i].rm_so < pmatch[m].rm_so)
+            m = i;
+            
+    matchlen = pmatch[m].rm_eo - pmatch[m].rm_so;
+    int matchpos = pmatch[m].rm_so;
+    
+    delete[] pmatch; pmatch = 0;
+    return matchpos;
+}
+
+} // namespace libdap
+
diff --git a/GNU/GNURegex.h b/GNU/GNURegex.h
new file mode 100644
index 0000000..338460b
--- /dev/null
+++ b/GNU/GNURegex.h
@@ -0,0 +1,60 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2005 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+// 
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+// 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#ifndef _Regex_h
+#define _Regex_h 1
+
+namespace libdap
+{
+
+/** a C++ interface to POSIX regular expression functions.
+
+    @author James Gallagher <jgallagher@opendap.org> */
+class Regex
+{
+private:
+    // d_preg was a regex_t* but I needed to include both regex.h and config.h
+    // to make the gnulib code work. Because this header is installed (and is
+    // used by other libraries) it cannot include config.h, so I moved the 
+    // regex.h and config.h (among other) includes to the implementation. It
+    // would be cleaner to use a special class, but for one field that seems
+    // like overkill.
+    void *d_preg;
+    void init(const char *t);
+    
+public:
+    Regex(const char *t);
+    Regex(const char *t, int dummy);
+    ~Regex();
+
+    /// Does the pattern match.
+    int match(const char* s, int len, int pos = 0);
+    /// How much of the string does the pattern match.
+    int search(const char* s, int len, int& matchlen, int pos = 0);
+};
+
+} // namespace libdap
+
+#endif
diff --git a/GNU/GetOpt.cc b/GNU/GetOpt.cc
new file mode 100644
index 0000000..4a8b5a7
--- /dev/null
+++ b/GNU/GetOpt.cc
@@ -0,0 +1,277 @@
+/*
+Getopt for GNU. 
+Copyright (C) 1987, 1989 Free Software Foundation, Inc.
+
+(Modified by Douglas C. Schmidt for use with GNU G++.)
+This file is part of the GNU C++ Library.  This library is free
+software; you can redistribute it and/or modify it under the terms of
+the GNU Library General Public License as published by the Free
+Software Foundation; either version 2 of the License, or (at your
+option) any later version.  This library is distributed in the hope
+that it will be useful, but WITHOUT ANY WARRANTY; without even the
+implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+PURPOSE.  See the GNU Library General Public License for more details.
+You should have received a copy of the GNU Library General Public
+License along with this library; if not, write to the Free Software
+Foundation, 59 Temple Place - Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+#include "config.h"
+
+/* AIX requires the alloca decl to be the first thing in the file. */
+#ifdef __GNUC__
+#define alloca __builtin_alloca
+#elif defined(sparc)
+#include <alloca.h>
+#elif defined(_AIX)
+#pragma alloca
+#elif defined(WIN32)
+#include <malloc.h>
+#else
+char *alloca ();
+#endif
+
+#include <vector>
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <cstdio>
+#include <cstring>		// Added these. 10/20/98 jhrg
+#include <cstdlib>
+
+#include "GetOpt.h"
+
+//#include <string.h>
+
+char* GetOpt::nextchar = 0;
+int GetOpt::first_nonopt = 0;
+int GetOpt::last_nonopt = 0;
+
+GetOpt::GetOpt (int argc, char **argv, const char *optstring)
+ :opterr (1), nargc (argc), nargv (argv), noptstring (optstring)
+{
+  /* Initialize the internal data when the first call is made.
+     Start processing options with ARGV-element 1 (since ARGV-element 0
+     is the program name); the sequence of previously skipped
+     non-option ARGV-elements is empty.  */
+
+  first_nonopt = last_nonopt = optind = 1;
+  optarg = nextchar = 0;
+
+  /* Determine how to handle the ordering of options and nonoptions.  */
+
+  if (optstring[0] == '-')
+    ordering = RETURN_IN_ORDER;
+  else if (getenv ("_POSIX_OPTION_ORDER") != 0)
+    ordering = REQUIRE_ORDER;
+  else
+    ordering = PERMUTE;
+}
+
+void
+GetOpt::exchange (char **argv)
+{
+  int nonopts_size = (last_nonopt - first_nonopt) * sizeof(char *);
+  /* char **temp = (char **) alloca (nonopts_size); */
+  /* char **temp = (char **)malloc(nonopts_size); */
+  std::vector<char> temp(nonopts_size);
+  
+  /* Interchange the two blocks of data in argv.  */
+
+  memcpy (&temp[0], &argv[first_nonopt], nonopts_size);
+
+  /* valgrind complains about this because in some cases the memory areas
+     overlap. I switched to memmove. See the memcpy & memmove man pages.
+     02/12/04 jhrg */
+#if 0
+  memcpy (&argv[first_nonopt], &argv[last_nonopt],
+         (optind - last_nonopt) * sizeof (char *));
+#endif
+  memmove (&argv[first_nonopt], &argv[last_nonopt],
+         (optind - last_nonopt) * sizeof (char *));
+
+  memcpy (&argv[first_nonopt + optind - last_nonopt], &temp[0],
+         nonopts_size);
+
+  /* Update records for the slots the non-options now occupy.  */
+
+  first_nonopt += (optind - last_nonopt);
+  last_nonopt = optind;
+  
+  //free(temp);
+}
+
+/* Scan elements of ARGV (whose length is ARGC) for option characters
+   given in OPTSTRING.
+
+   If an element of ARGV starts with '-', and is not exactly "-" or "--",
+   then it is an option element.  The characters of this element
+   (aside from the initial '-') are option characters.  If `getopt'
+   is called repeatedly, it returns successively each of theoption characters
+   from each of the option elements.
+
+   If `getopt' finds another option character, it returns that character,
+   updating `optind' and `nextchar' so that the next call to `getopt' can
+   resume the scan with the following option character or ARGV-element.
+
+   If there are no more option characters, `getopt' returns `EOF'.
+   Then `optind' is the index in ARGV of the first ARGV-element
+   that is not an option.  (The ARGV-elements have been permuted
+   so that those that are not options now come last.)
+
+   OPTSTRING is a string containing the legitimate option characters.
+   A colon in OPTSTRING means that the previous character is an option
+   that wants an argument.  The argument is taken from the rest of the
+   current ARGV-element, or from the following ARGV-element,
+   and returned in `optarg'.
+
+   If an option character is seen that is not listed in OPTSTRING,
+   return '?' after printing an error message.  If you set `opterr' to
+   zero, the error message is suppressed but we still return '?'.
+
+   If a char in OPTSTRING is followed by a colon, that means it wants an arg,
+   so the following text in the same ARGV-element, or the text of the following
+   ARGV-element, is returned in `optarg.  Two colons mean an option that
+   wants an optional arg; if there is text in the current ARGV-element,
+   it is returned in `optarg'.
+
+   If OPTSTRING starts with `-', it requests a different method of handling the
+   non-option ARGV-elements.  See the comments about RETURN_IN_ORDER, above.  */
+
+int
+GetOpt::operator () (void)
+{
+  if (nextchar == 0 || *nextchar == 0)
+    {
+      if (ordering == PERMUTE)
+        {
+          /* If we have just processed some options following some non-options,
+             exchange them so that the options come first.  */
+
+          if (first_nonopt != last_nonopt && last_nonopt != optind)
+            exchange (nargv);
+          else if (last_nonopt != optind)
+            first_nonopt = optind;
+
+          /* Now skip any additional non-options
+             and extend the range of non-options previously skipped.  */
+
+          while (optind < nargc
+                 && (nargv[optind][0] != '-'
+                     || nargv[optind][1] == 0))
+            optind++;
+          last_nonopt = optind;
+        }
+
+      /* Special ARGV-element `--' means premature end of options.
+         Skip it like a null option,
+         then exchange with previous non-options as if it were an option,
+         then skip everything else like a non-option.  */
+
+      if (optind != nargc && !strcmp (nargv[optind], "--"))
+        {
+          optind++;
+
+          if (first_nonopt != last_nonopt && last_nonopt != optind)
+            exchange (nargv);
+          else if (first_nonopt == last_nonopt)
+            first_nonopt = optind;
+          last_nonopt = nargc;
+
+          optind = nargc;
+        }
+
+      /* If we have done all the ARGV-elements, stop the scan
+         and back over any non-options that we skipped and permuted.  */
+
+      if (optind == nargc)
+        {
+          /* Set the next-arg-index to point at the non-options
+             that we previously skipped, so the caller will digest them.  */
+          if (first_nonopt != last_nonopt)
+            optind = first_nonopt;
+          return EOF;
+        }
+	 
+      /* If we have come to a non-option and did not permute it,
+         either stop the scan or describe it to the caller and pass it by.  */
+
+      if (nargv[optind][0] != '-' || nargv[optind][1] == 0)
+        {
+          if (ordering == REQUIRE_ORDER)
+            return EOF;
+          optarg = nargv[optind++];
+          return 0;
+        }
+
+      /* We have found another option-ARGV-element.
+         Start decoding its characters.  */
+
+      nextchar = nargv[optind] + 1;
+    }
+
+  /* Look at and handle the next option-character.  */
+
+  {
+    char c = *nextchar++;
+    char *temp = (char *) strchr (noptstring, c);
+
+    /* Increment `optind' when we start to process its last character.  */
+    if (*nextchar == 0)
+      optind++;
+
+    if (temp == 0 || c == ':')
+      {
+        if (opterr != 0)
+          {
+            if (c < 040 || c >= 0177)
+              fprintf (stderr, "%s: unrecognized option, character code 0%o\n",
+                       nargv[0], c);
+            else
+              fprintf (stderr, "%s: unrecognized option `-%c'\n",
+                       nargv[0], c);
+          }
+        return '?';
+      }
+    if (temp[1] == ':')
+      {
+        if (temp[2] == ':')
+          {
+            /* This is an option that accepts an argument optionally.  */
+            if (*nextchar != 0)
+              {
+                optarg = nextchar;
+                optind++;
+              }
+            else
+              optarg = 0;
+            nextchar = 0;
+          }
+        else
+          {
+            /* This is an option that requires an argument.  */
+            if (*nextchar != 0)
+              {
+                optarg = nextchar;
+                /* If we end this ARGV-element by taking the rest as an arg,
+                   we must advance to the next element now.  */
+                optind++;
+              }
+            else if (optind == nargc)
+              {
+                if (opterr != 0)
+                  fprintf (stderr, "%s: no argument for `-%c' option\n",
+                           nargv[0], c);
+                c = '?';
+              }
+            else
+              /* We already incremented `optind' once;
+                 increment it again when taking next ARGV-elt as argument.  */
+              optarg = nargv[optind++];
+            nextchar = 0;
+          }
+      }
+    return c;
+  }
+}
diff --git a/GNU/GetOpt.h b/GNU/GetOpt.h
new file mode 100644
index 0000000..c8e618c
--- /dev/null
+++ b/GNU/GetOpt.h
@@ -0,0 +1,125 @@
+/* Getopt for GNU.
+   Copyright (C) 1987, 1989, 1992 Free Software Foundation, Inc.
+   (Modified by Douglas C. Schmidt for use with GNU G++.)
+
+This file is part of the GNU C++ Library.  This library is free
+software; you can redistribute it and/or modify it under the terms of
+the GNU Library General Public License as published by the Free
+Software Foundation; either version 2 of the License, or (at your
+option) any later version.  This library is distributed in the hope
+that it will be useful, but WITHOUT ANY WARRANTY; without even the
+implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+PURPOSE.  See the GNU Library General Public License for more details.
+You should have received a copy of the GNU Library General Public
+License along with this library; if not, write to the Free Software
+Foundation 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA.
+*/
+
+
+/* This version of `getopt' appears to the caller like standard Unix `getopt'
+   but it behaves differently for the user, since it allows the user
+   to intersperse the options with the other arguments.
+
+   As `getopt' works, it permutes the elements of `argv' so that,
+   when it is done, all the options precede everything else.  Thus
+   all application programs are extended to handle flexible argument order.
+
+   Setting the environment variable _POSIX_OPTION_ORDER disables permutation.
+   Then the behavior is completely standard.
+
+   GNU application programs can use a third alternative mode in which
+   they can distinguish the relative order of options and other arguments.  */
+
+#ifndef GetOpt_h
+#define GetOpt_h 1
+
+// #include <stdio.h>
+
+class GetOpt
+{
+private:
+  /* The next char to be scanned in the option-element
+     in which the last option character we returned was found.
+     This allows us to pick up the scan where we left off.
+
+     If this is zero, or a null string, it means resume the scan
+     by advancing to the next ARGV-element.  */
+
+  static char *nextchar;
+
+
+  /* Describe how to deal with options that follow non-option ARGV-elements.
+
+    UNSPECIFIED means the caller did not specify anything;
+    the default is then REQUIRE_ORDER if the environment variable
+    _OPTIONS_FIRST is defined, PERMUTE otherwise.
+
+    REQUIRE_ORDER means don't recognize them as options.
+    Stop option processing when the first non-option is seen.
+    This is what Unix does.
+
+    PERMUTE is the default.  We permute the contents of `argv' as we scan,
+    so that eventually all the options are at the end.  This allows options
+    to be given in any order, even with programs that were not written to
+    expect this.
+
+    RETURN_IN_ORDER is an option available to programs that were written
+    to expect options and other ARGV-elements in any order and that care about
+    the ordering of the two.  We describe each non-option ARGV-element
+    as if it were the argument of an option with character code zero.
+    Using `-' as the first character of the list of option characters
+    requests this mode of operation.
+
+    The special argument `--' forces an end of option-scanning regardless
+    of the value of `ordering'.  In the case of RETURN_IN_ORDER, only
+    `--' can cause `getopt' to return EOF with `optind' != ARGC.  */
+
+   enum OrderingEnum { REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER };
+   OrderingEnum ordering;
+
+  /* Handle permutation of arguments.  */
+
+  /* Describe the part of ARGV that contains non-options that have
+     been skipped.  `first_nonopt' is the index in ARGV of the first of them;
+     `last_nonopt' is the index after the last of them.  */
+
+  static int first_nonopt;
+  static int last_nonopt;
+
+  void exchange (char **argv);
+public:
+  /* For communication from `getopt' to the caller.
+     When `getopt' finds an option that takes an argument,
+     the argument value is returned here.
+     Also, when `ordering' is RETURN_IN_ORDER,
+     each non-option ARGV-element is returned here.  */
+
+  char *optarg;
+
+  /* Index in ARGV of the next element to be scanned.
+     This is used for communication to and from the caller
+     and for communication between successive calls to `getopt'.
+     On entry to `getopt', zero means this is the first call; initialize.
+
+     When `getopt' returns EOF, this is the index of the first of the
+     non-option elements that the caller should itself scan.
+
+     Otherwise, `optind' communicates from one call to the next
+     how much of ARGV has been scanned so far.  */
+
+  int optind;
+
+  /* Callers store zero here to inhibit the error message
+     for unrecognized options.  */
+
+  int opterr;
+
+  int    nargc;
+  char **nargv;
+  const char  *noptstring;
+
+  GetOpt (int argc, char **argv, const char *optstring);
+  int operator () (void);
+};
+
+#endif
diff --git a/GNU/README b/GNU/README
new file mode 100644
index 0000000..235c008
--- /dev/null
+++ b/GNU/README
@@ -0,0 +1,8 @@
+
+	$Id$
+
+The files GetOpt.{cc,h} are from the GNU libg++ software package. If you'd
+like the complete library it may be obtained from ftp.gnu.org.
+
+The files GNURegex.{cc,h} were originally from teh GNU libg++ package, but 
+I rewrote them to use the Unix regex library some time ago. 
diff --git a/Grid.cc b/Grid.cc
new file mode 100644
index 0000000..b0e2b3b
--- /dev/null
+++ b/Grid.cc
@@ -0,0 +1,1035 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1994-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// implementation for Grid.
+//
+// jhrg 9/15/94
+
+#include "config.h"
+
+// #define DODS_DEBUG
+
+#include <sstream>
+#include <functional>
+#include <algorithm>
+
+#include "Grid.h"
+#include "DDS.h"
+#include "Array.h"  // for downcasts
+#include "util.h"
+#include "InternalErr.h"
+#include "escaping.h"
+#include "XDRStreamMarshaller.h"
+#include "debug.h"
+
+#include "XMLWriter.h"
+#include "DMR.h"
+#include "D4Group.h"
+#include "D4Maps.h"
+#include "D4Attributes.h"
+
+using namespace std;
+
+namespace libdap {
+
+void
+Grid::m_duplicate(const Grid &s)
+{
+    // TODO revisit this code once/if the class is switched from using it's
+    // own vars to those in Constructor. jhrg 4/3/13
+
+	// copy the weak pointer - Constructor will take care of copying
+	// the 'strong' pointers.
+	//d_array_var = s.d_array_var;
+	d_is_array_set = s.d_is_array_set;
+}
+
+/** The Grid constructor requires only the name of the variable
+    to be created.  The name may be omitted, which will create a
+    nameless variable.  This may be adequate for some applications.
+
+    @param n A string containing the name of the variable to be
+    created.
+
+    @brief The Grid constructor.
+*/
+Grid::Grid(const string &n) : Constructor(n, dods_grid_c), d_is_array_set(false)
+{}
+
+/** The Grid server-side constructor requires the name of the variable
+    to be created and the dataset name from which this variable is created.
+    Used when creating variables on the server side.
+
+    @param n A string containing the name of the variable to be
+    created.
+    @param d A string containing the name of the dataset from which this
+    variable is being created.
+
+    @brief The Grid constructor.
+*/
+Grid::Grid(const string &n, const string &d)
+    : Constructor(n, d, dods_grid_c), d_is_array_set(false)
+{}
+
+/** @brief The Grid copy constructor. */
+Grid::Grid(const Grid &rhs) : Constructor(rhs)
+{
+    m_duplicate(rhs);
+}
+
+Grid::~Grid()
+{
+	//d_array_var = 0;	// Weak pointer; object will be freed by Constructor
+}
+
+BaseType *
+Grid::ptr_duplicate()
+{
+    return new Grid(*this);
+}
+
+Grid &
+Grid::operator=(const Grid &rhs)
+{
+    if (this == &rhs)
+        return *this;
+
+    // Removed this; it makes this operator= work differently than the rest
+#if 0
+    delete d_array_var; d_array_var = 0;
+
+    for (Map_iter i = d_map_vars.begin(); i != d_map_vars.end(); i++) {
+        BaseType *btp = *i ;
+        delete btp ;
+    }
+#endif
+
+    dynamic_cast<Constructor &>(*this) = rhs;
+
+    m_duplicate(rhs);
+
+    return *this;
+}
+
+/**
+ *
+ */
+void
+Grid::transform_to_dap4(D4Group *root, Constructor *container)
+{
+    DBG(cerr << __func__ << "() - BEGIN (name:"<< name() <<
+        ")(type:"<< type_name()<<
+        ")(root:'"<< root->name()<<"':"<<(void*)root <<
+        ")(container:'"<< container->name()<<"':"<< (void *) container<< ")"
+        << endl;);
+
+    vector<Array*> d4_map_arrays;
+
+    // We do the Map Arrays first because some people expect to see them
+    // delclared prior to the coverage array the utilizes them - even though that
+    // is not a requirement of DAP4 I did it here to make people happier.
+	// We add the maps arrays to the current container if needed and make a
+    // a vector of them so we can add D4Map objects to our Precious down
+    // below.
+	for (Map_iter i = map_begin(), e = map_end(); i != e; ++i) {
+	    DBG(cerr << __func__ << "() - Processing Map Array:  '"<< (*i)->name() << "' ("<< (void *)(*i)<< ")" << endl;);
+        // Only add the map/array if it's not already present in the target DAP2 container.
+	    // Given the scoping rules for DAP2 and the assumption the DDS is valid, testing for
+	    // the same name is good enough. The point here is to be sure to only use the
+	    // existing maps. This is an important issue when there are multiple Grids in the same
+	    // dataset that utilize the same Map arrays data.
+        Array *the_map_array;;
+        Array *container_map_array = static_cast<Array*>(container->var((*i)->name()));
+        if(!container_map_array){
+            DBG(cerr << __func__ << "() - No Map Array '" << (*i)->name() << "' present in the current DAP4 container ("<<container->name()<< ":"<<(void*)container<< "). Let's fix that..." << endl;);
+            // Not in the container, so we check root group
+            Array *root_map_array = static_cast<Array*>(root->var((*i)->name()));
+            if (!root_map_array) {
+                // Not in the root group so we transform a new array and add it to container.
+                DBG(cerr << __func__ << "() - No Map Array '" << (*i)->name() << "' present in the root Group ("<<root->name()<< ":"<<(void*)root<< "). Let's fix that..." << endl;);
+                // transform it and add it to the container
+                (*i)->transform_to_dap4(root, container);
+                // Recover the new dap4 version from the container.
+                the_map_array = static_cast<Array*>(container->var((*i)->name()));
+                DBG(cerr << __func__ << "() - Transformed array '"<< the_map_array->name() <<
+                    "' to DAP4 Array (" << (void *) the_map_array << ") added to container: '"<<
+                    container->name() <<"'" << endl;);
+            }
+            else {
+                the_map_array = root_map_array;
+                DBG(cerr << __func__ << "() - Located Map Array '" << the_map_array->name() << "' (" <<
+                    (void *) the_map_array << ") present in the root group ("<<root->name()<< ":"<<(void*)root <<
+                    ")"<< endl;);
+            }
+        }
+        else {
+            the_map_array = container_map_array;
+            DBG(cerr << __func__ << "() - Located Map Array '" << the_map_array->name() << "' (" <<
+                (void *) the_map_array << ") present in the current DAP4 container ("<<container->name( )<< ":"<<
+                (void*)container<< ")" << endl;);
+        }
+        // We'll use these (below) to make D4Map objects for the coverage
+        d4_map_arrays.push_back(the_map_array);
+	}
+
+	// Adds the coverage array to the container.
+    array_var()->transform_to_dap4(root, container);
+    // Get the new coverage array
+    BaseType *btp = container->var(array_var()->name());
+    Array *coverage = static_cast<Array*>(btp);
+    DBG(cerr << __func__ << "() - Transformed and added DAP4 coverage Array '"<< coverage->name() <<
+        "' to parent container: '" << container->name() << "'" << endl;);
+
+    coverage->attributes()->transform_to_dap4(get_attr_table());
+
+    DBG(cerr << __func__ << "() - " << "Coverage Array '"<< coverage->name() << "' attributes: " << endl;
+        XMLWriter xmlw;
+        coverage->get_attr_table().print_dap4(xmlw);
+        cerr << xmlw.get_doc() << endl;);
+
+    // Add the D4Maps
+    vector<Array*>::iterator d4aItr=d4_map_arrays.begin();
+    vector<Array*>::iterator end=d4_map_arrays.end();
+    for( ; d4aItr!=end ; d4aItr++){
+        Array *the_map_array = *d4aItr;
+        // Here we use the Map Array that we saved the Map
+        // name and Map Array reference for our map.
+        D4Map *d4_map = new D4Map(the_map_array->FQN(), the_map_array, coverage); // bind the 'map' to the coverage
+        coverage->maps()->add_map(d4_map);    // bind the coverage to the map
+        // Clear the vector entry to ensure that ~Array doesn't
+        // get called when the (stack declared) vector goes out of scope.
+        *d4aItr = 0;
+        DBG(cerr << __func__ << "() - Added DAP4 Map Array:  '"<< d4_map->name() <<
+            "' (" << (void *) d4_map->array() << ") to coverage: '" << coverage->name() << "'" << endl;);
+
+    }
+    DBG(cerr << __func__ << "() - END (grid:" << name() << ")" << endl;);
+}
+
+
+/**
+ * Grid can only be used for DAP2.
+ * @note This might change depending on just how complex DAP4Array becomes,
+ * for example.
+ */
+bool
+Grid::is_dap2_only_type()
+{
+    return true;
+}
+
+/** Add an array or map to the Grid.
+
+    The original version of this method required that the \c part parameter
+    be present. However, this complicates using the class from a parser
+    (e.g., the schema-based XML parser). I have modified the method so that
+    if \c part is nil (the default), then the first variable added is the
+    array and subsequent variables are maps. This matches the behavior in the
+    Java DAP implementation.
+
+    @param bt Array or Map variable
+    @param part is this an array or a map. If not present, first \c bt is the
+    array and subsequent <tt>bt</tt>s are maps. */
+void
+Grid::add_var(BaseType *bt, Part part)
+{
+    if (!bt)
+        throw InternalErr(__FILE__, __LINE__, "Passing NULL pointer as variable to be added.");
+
+    if (part == array && d_is_array_set/*get_array()*/) {
+      // Avoid leaking memory...  Function is add, not set, so it is an error to call again for the array part.
+      throw InternalErr(__FILE__, __LINE__, "Error: Grid::add_var called with part==Array, but the array was already set!");
+    }
+
+    // avoid obvious broken semantics
+    if (!dynamic_cast<Array*>(bt)) {
+      throw InternalErr(__FILE__, __LINE__, "Grid::add_var(): object is not an Array!");
+    }
+
+    // Set to the clone of bt if we get that far.
+    BaseType* bt_clone = 0;
+
+    switch (part) {
+
+    case array: {
+        // Add it as a copy to preserve old semantics.  This sets parent too.
+        bt_clone = bt->ptr_duplicate();
+        set_array(static_cast<Array*>(bt_clone));
+    }
+    break;
+
+    case maps: {
+            bt_clone = bt->ptr_duplicate();
+            bt_clone->set_parent(this);
+            d_vars.push_back(bt_clone);
+        }
+    break;
+
+    default: {
+        if (!d_is_array_set/*!d_array_var*/) {
+            // Add it as a copy to preserve old semantics.  This sets parent too.
+            bt_clone = bt->ptr_duplicate();
+            set_array(static_cast<Array*>(bt_clone));
+        }
+        else {
+            bt_clone = bt->ptr_duplicate();
+            bt_clone->set_parent(this);
+            d_vars.push_back(bt_clone);
+        }
+    }
+    break;
+  }
+}
+
+/** Add an array or map to the Grid.
+
+    @note The original version of this method required that the \c part parameter
+    be present. However, this complicates using the class from a parser
+    (e.g., the schema-based XML parser). I have modified the method so that
+    if \c part is nil (the default), then the first variable added is the
+    array and subsequent variables are maps. This matches the behavior in the
+    Java DAP implementation.
+
+    @note This version of the method does not the BaseType before adding it.
+    The caller must not free the BaseType object.
+
+    @param bt Array or Map variable
+    @param part is this an array or a map. If not present, first \c bt is the
+    array and subsequent <tt>bt</tt>s are maps. */
+void
+Grid::add_var_nocopy(BaseType *bt, Part part)
+{
+    if (!bt)
+        throw InternalErr(__FILE__, __LINE__, "Passing NULL pointer as variable to be added.");
+
+    if (part == array && d_is_array_set/*get_array()*/) {
+      // Avoid leaking memory...  Function is add, not set, so it is an error to call again for the array part.
+      throw InternalErr(__FILE__, __LINE__, "Error: Grid::add_var called with part==Array, but the array was already set!");
+    }
+
+    // avoid obvious broken semantics
+    if (!dynamic_cast<Array*>(bt)) {
+      throw InternalErr(__FILE__, __LINE__, "Grid::add_var(): object is not an Array!");
+    }
+
+    bt->set_parent(this);
+
+    switch (part) {
+
+    case array: {
+        // Refactored to use new set_array ([mjohnson 11 nov 2009])
+        set_array(static_cast<Array*>(bt));
+    }
+    break;
+
+    case maps: {
+    	// FIXME Why is this commented out?
+            //bt->set_parent(this);
+            d_vars.push_back(bt);
+        }
+    break;
+
+    default: {
+        if (!d_is_array_set/*!get_array()*/) {
+            // Refactored to use new set_array ([mjohnson 11 nov 2009])
+            // avoid obvious broken semantics
+            set_array(static_cast<Array*>(bt));
+        }
+        else {
+            d_vars.push_back(bt);
+        }
+    }
+    break;
+  }
+}
+
+/**
+ * Set the Array part of the Grid to point to the memory
+ * p_new_arr.  Grid takes control of the memory (no copy
+ * is made).
+ * If there already exists an array portion, the old
+ * one will be deleted to avoid leaks.
+ *
+ * @note This code has been modified to use a new storage for
+ * the Grid's variables (the storage defined by Constructor).
+ *
+ * @param p_new_arr  the object to store as the array
+ *                   part of the grid.
+ */
+void Grid::set_array(Array* p_new_arr)
+{
+	if (!p_new_arr) {
+		throw InternalErr(__FILE__, __LINE__, "Grid::set_array(): Cannot set to null!");
+	}
+
+	// Make sure not same memory, this would be evil.
+	if (p_new_arr == get_array()) {
+		return;
+	}
+
+	p_new_arr->set_parent(this);
+
+	// Three cases: 1. There are no variables set for this grid at all
+	// 2. There are maps but no array
+	// 3. There is already an array set (and maybe maps).
+	// NB: d_array_var is a weak pointer to the Grid's Array
+	if (d_vars.size() == 0) {
+		d_vars.push_back(p_new_arr);
+	}
+	else if (!d_is_array_set/*!d_array_var*/) {
+		d_vars.insert(d_vars.begin(), p_new_arr);
+	}
+	else {
+		// clean out old array
+		delete get_array();
+		d_vars[0] = p_new_arr;
+	}
+
+	d_is_array_set = true;
+#if 0
+	// store the array pointer locally
+	d_array_var = p_new_arr;
+
+	// Set the  parent
+	d_array_var->set_parent(this);
+#endif
+}
+
+/**
+ * Add the given array p_new_map as a new map
+ * vector for the Grid.
+ *
+ * If add_as_copy, p_new_map will be cloned
+ * and the copy added, leaving p_new_map
+ * in the control of the caller.
+ *
+ * If !add_as_copy, p_new_map will be explicitly
+ * added as the new map vector.
+ *
+ * The actual Array* in the Grid will be returned,
+ * either the address of the COPY if add_as_copy,
+ * else p_new_map itself if !add_as_copy.
+ *
+ * It is an exception for p_new_map to be null.
+ *
+ * @param p_new_map  the map we want to add
+ * @param add_as_copy whether to add p_new_map
+ *             explicitly and take onwership of memory
+ *             or to add a clone of it and leave control
+ *             to caller.
+ * @return the actual object stored in the Grid, whether
+ *         p_new_map, or the address of the copy.
+ *
+ */
+Array*
+Grid::add_map(Array* p_new_map, bool add_as_copy)
+{
+  if (!p_new_map)
+    throw InternalErr(__FILE__, __LINE__, "Grid::add_map(): cannot have p_new_map null!");
+
+  if (add_as_copy)
+    p_new_map = static_cast<Array*>(p_new_map->ptr_duplicate());
+
+  p_new_map->set_parent(this);
+
+  d_vars.push_back(p_new_map);
+
+  // return the one that got put into the Grid.
+  return p_new_map;
+}
+
+/**
+ * Add pMap (or a clone if addAsCopy) to the
+ * FRONT of the maps list.  This is needed if
+ * we are preserving Grid semantics but want to
+ * add a new OUTER dimension, whereas add_map
+ * appends to the end making a new INNER dimension.
+ * @param p_new_map the map to add or copy and add
+ * @param add_copy if true, copy pMap and add the copy.
+ * @return The actual memory stored in the Grid,
+ *      either pMap (if !add_copy) or the ptr to
+ *      the clone (if add_copy).
+ */
+Array*
+Grid::prepend_map(Array* p_new_map, bool add_copy)
+{
+  if (add_copy)
+    {
+      p_new_map = static_cast<Array*>(p_new_map->ptr_duplicate());
+    }
+
+  p_new_map->set_parent(this);
+  d_vars.insert(map_begin(), p_new_map);
+
+  return p_new_map;
+}
+
+/** @brief Returns the Grid Array.
+    @deprecated
+    @see get_array() */
+BaseType *
+Grid::array_var()
+{
+    //return d_array_var;
+	// FIXME Should really test that the array has not be set; maps might be added first. jhrg 5/9/13
+#if 0
+	if (d_array_var)
+		cerr << "In array_var(), d_array_var holds a " << d_array_var->type_name() << endl;
+	else
+		cerr << "In array_var(), d_array_var is null" << endl;
+#endif
+	return d_is_array_set /*d_vars.size() > 0*/ ? *d_vars.begin() : 0;
+}
+
+/** @brief Returns the Grid Array.
+    This method returns the array using an Array*, so no cast is required.
+    @return A pointer to the Grid's (dependent) data array */
+Array *
+Grid::get_array()
+{
+    return dynamic_cast<Array*>(array_var());
+}
+
+/** @brief Returns an iterator referencing the first Map vector. */
+Grid::Map_iter
+Grid::map_begin()
+{
+    // The maps are stored in the second and subsequent elements of the
+    // d_var vector<BaseType*> of Constructor _unless_ the Array part
+    // has yet to be set. In the latter case, there are only maps in
+    // d_vars
+    return d_is_array_set/*(d_array_var != 0)*/ ? d_vars.begin() + 1: d_vars.begin();
+}
+
+/** Returns an iterator referencing the end of the list of Map vectors.
+    It does not reference the last Map vector */
+Grid::Map_iter
+Grid::map_end()
+{
+    return d_vars.end();
+}
+
+/** @brief Returns an iterator referencing the first Map vector. */
+Grid::Map_riter
+Grid::map_rbegin()
+{
+    // see above
+    // return d_is_array_set/*(d_array_var != 0)*/ ? d_vars.rbegin() + 1: d_vars.rbegin();
+    return d_vars.rbegin();
+}
+
+/** Returns an iterator referencing the end of the list of Map vectors.
+    It does not reference the last Map vector */
+Grid::Map_riter
+Grid::map_rend()
+{
+    return d_is_array_set ? d_vars.rend() - 1: d_vars.rend();
+}
+
+/** Return the iterator for the \e ith map.
+    @param i the index
+    @return The corresponding  Vars_iter */
+Grid::Map_iter
+Grid::get_map_iter(int i)
+{
+    // return map_begin() + i;
+    return d_is_array_set ? map_begin() + 1 + i : map_begin() + i;
+}
+
+/** Returns the number of components in the Grid object.  This is
+    equal to one plus the number of Map vectors.  If there is a
+    constraint expression in effect, the number of dimensions needed
+    may be smaller than the actual number in the stored data.  (Or
+    the Array might not even be requested.) In this case, a user can
+    request the smaller number with the <i>constrained</i> flag.
+
+    @brief Returns the number of components in the Grid object.
+    @return The number of components in the Grid object.
+    @param constrained If TRUE, the function returns the number of
+    components contained in the constrained Grid.  Since a
+    constraint expression might well eliminate one or more of the
+    Grid dimensions, this number can be lower than the actual number
+    of components.  If this parameter is FALSE (the default), the
+    actual number of components will be returned.  */
+int
+Grid::components(bool constrained)
+{
+    int comp;
+
+    if (constrained) {
+        comp = get_array()->send_p() ? 1 : 0;
+
+        for (Map_iter i = map_begin(); i != map_end(); i++) {
+            if ((*i)->send_p()) {
+                comp++;
+            }
+        }
+    }
+    else {
+        comp = d_vars.size();
+    }
+
+    return comp;
+}
+
+void Grid::transfer_attributes(AttrTable *at_container)
+{
+    DBG( cerr << __func__ << "() - BEGIN "<< type_name() << " " << name() << " (at_container:"<< at_container->get_name() << ":"<<(void*)at_container<< ")" << endl;);
+
+    // At should be the attribute table for the Grid
+	AttrTable *at = at_container->get_attr_table(name());
+	if (at) {
+	    DBG( cerr << __func__ << "() - Found AttrTable ("<< at->get_name() << ":" << (void*)at<< ")" << endl;);
+		at->set_is_global_attribute(false);
+
+		// We don't monkey with the data array attributes because it usually just makes
+		// a mess. but:
+		// TODO We should come back and decide if we want to but configuration
+		// controls on this or do something smarter like check for duplicate values
+		// before merging the Array metadata into the Grid metadata
+		// SO - We don't copy the attributes like we used to:
+		//
+		//    array_var()->transfer_attributes(at);
+		//
+		// And then to seal the deal we have to
+		// Mark them as not "global" so they don't get copied.
+		AttrTable *dvat = at->get_attr_table(array_var()->name());
+		if(dvat){
+		    dvat->set_is_global_attribute(false);
+		}
+
+		Map_iter map = map_begin();
+		while (map != map_end()) {
+	        DBG( cerr << __func__ << "() - Processing Map Array ("<< (*map)->name() << ":" << (void*)(*map)<< ")" << endl;);
+			(*map)->transfer_attributes(at);
+			map++;
+		}
+
+		// Trick: If an attribute that's within the container 'at' still has its
+		// is_global_attribute property set, then it's not really a global attr
+		// but instead an attribute that belongs to this Grid.
+		AttrTable::Attr_iter at_p = at->attr_begin();
+		while (at_p != at->attr_end()) {
+			if (at->is_global_attribute(at_p)) {
+	            DBG( cerr << __func__ << "() - " <<
+	                "Adding unclaimed Attribute ("<<
+	                at->get_type(at_p)<< ":" << at->get_name(at_p) << ":" << (void*)(*map)<<
+	                ") from AttrTable (" << at->get_name() << ":" << (void*)at << ")" <<
+	                " to the variable " << type_name() << " " << name() << endl;);
+
+	            if (at->get_attr_type(at_p) == Attr_container)
+					get_attr_table().append_container(new AttrTable(*at->get_attr_table(at_p)), at->get_name(at_p));
+				else
+					get_attr_table().append_attr(at->get_name(at_p), at->get_type(at_p), at->get_attr_vector(at_p));
+			}
+
+			at_p++;
+		}
+	}
+	else {
+        DBG( cerr << __func__ << "() - No AttrTable named '"<< name() << "' was found in at_container ("<<at_container->get_name()<<":" << (void*)at<< ")" << endl;);
+	}
+    DBG( cerr << __func__ << "() - END "<< type_name() << " " << name() << " (at_container:"<< at_container->get_name() << ":"<<(void*)at_container<< ")" << endl;);
+}
+
+// When projected (using whatever the current constraint provides in the way
+// of a projection), is the object still a Grid?
+
+/** Returns TRUE if the current projection will yield a Grid that
+    will pass the <tt>check_semantics()</tt> function. A Grid that, when
+    projected, will not pass the <tt>check_semantics()</tt> function must
+    be sent as either a Structure of Arrays or a single Array
+    depending on the projection.
+
+    The function first checks to see whether the Array is present.
+    Then, for each dimension in the Array part, the function checks
+    the corresponding Map vector to make sure it is present in the
+    projected Grid. If for each projected dimension in the Array
+    component, there is a matching Map vector, then the Grid is
+    valid.
+
+    @return TRUE if the projected grid is still a Grid.  FALSE
+    otherwise.
+*/
+bool
+Grid::projection_yields_grid()
+{
+    // For each dimension in the Array part, check the corresponding Map
+    // vector to make sure it is present in the projected Grid. If for each
+    // projected dimension in the Array component, there is a matching Map
+    // vector, then the Grid is valid.
+    bool valid = true;
+    Array *a = get_array();
+
+    // Don't bother checking if the Array component is not included.
+    if (!a->send_p())
+        return false;
+
+    // If only one part is being sent, it's clearly not a grid (it must be
+    // the array part of the Grid that's being sent (given that the above
+    // test passed and the array is being sent).
+    if (components(true) == 1)
+    	return false;
+
+    Array::Dim_iter d = a->dim_begin() ;
+    Map_iter m = map_begin() ;
+
+    while (valid && d != a->dim_end() && m != map_end()) {
+	Array &map = dynamic_cast<Array&>(**m);
+        if (a->dimension_size(d, true) && map.send_p()) {
+            // Check the matching Map vector; the Map projection must equal
+            // the Array dimension projection
+            Array::Dim_iter fd = map.dim_begin(); // Maps have only one dim!
+            valid = map.dimension_start(fd, true) == a->dimension_start(d, true)
+                    && map.dimension_stop(fd, true) == a->dimension_stop(d, true)
+                    && map.dimension_stride(fd, true) == a->dimension_stride(d, true);
+        }
+        else {
+           valid = false;
+        }
+
+	d++, m++;
+    }
+
+    return valid;
+}
+
+/** For each of the Array and Maps in this Grid, call clear_constraint(). */
+void
+Grid::clear_constraint()
+{
+    get_array()->clear_constraint();
+    for (Map_iter m = map_begin(); m != map_end(); ++m)
+        dynamic_cast<Array&>(*(*m)).clear_constraint();
+}
+
+void
+Grid::print_decl(FILE *out, string space, bool print_semi,
+                 bool constraint_info, bool constrained)
+{
+    ostringstream oss;
+    print_decl(oss, space, print_semi, constraint_info, constrained);
+    fwrite(oss.str().data(), sizeof(char), oss.str().length(), out);
+}
+
+void
+Grid::print_decl(ostream &out, string space, bool print_semi,
+                 bool constraint_info, bool constrained)
+{
+    if (constrained && !send_p())
+        return;
+
+    // See comment for the FILE* version of this method.
+    if (constrained && !projection_yields_grid()) {
+	out << space << "Structure {\n" ;
+
+        get_array()->print_decl(out, space + "    ", true, constraint_info,
+                               constrained);
+
+        for (Map_citer i = map_begin(); i != map_end(); i++) {
+            (*i)->print_decl(out, space + "    ", true,
+                             constraint_info, constrained);
+        }
+
+	out << space << "} " << id2www(name()) ;
+    }
+    else {
+        // The number of elements in the (projected) Grid must be such that
+        // we have a valid Grid object; send it as such.
+	out << space << type_name() << " {\n" ;
+
+	out << space << "  Array:\n" ;
+        get_array()->print_decl(out, space + "    ", true, constraint_info,
+                               constrained);
+
+	out << space << "  Maps:\n" ;
+        for (Map_citer i = map_begin(); i != map_end(); i++) {
+            (*i)->print_decl(out, space + "    ", true,
+                             constraint_info, constrained);
+        }
+
+	out << space << "} " << id2www(name()) ;
+    }
+
+    if (constraint_info) {
+        if (send_p())
+            out << ": Send True";
+        else
+            out << ": Send False";
+    }
+
+    if (print_semi)
+	out << ";\n" ;
+
+    return;
+}
+
+/**
+ * @deprecated
+ */
+void
+Grid::print_xml(FILE *out, string space, bool constrained)
+{
+    XMLWriter xml(space);
+    print_xml_writer(xml, constrained);
+    fwrite(xml.get_doc(), sizeof(char), xml.get_doc_size(), out);
+}
+
+/**
+ * @deprecated
+ */
+void
+Grid::print_xml(ostream &out, string space, bool constrained)
+{
+    XMLWriter xml(space);
+    print_xml_writer(xml, constrained);
+    out << xml.get_doc();
+}
+
+
+class PrintGridFieldXMLWriter : public unary_function<BaseType *, void>
+{
+    XMLWriter &d_xml;
+    bool d_constrained;
+    string d_tag;
+public:
+    PrintGridFieldXMLWriter(XMLWriter &x, bool c, const string &t = "Map")
+            : d_xml(x), d_constrained(c), d_tag(t)
+    {}
+
+    void operator()(BaseType *btp)
+    {
+        Array *a = dynamic_cast<Array*>(btp);
+        if (!a)
+            throw InternalErr(__FILE__, __LINE__, "Expected an Array.");
+        a->print_xml_writer_core(d_xml, d_constrained, d_tag);
+    }
+};
+
+void
+Grid::print_xml_writer(XMLWriter &xml, bool constrained)
+{
+    if (constrained && !send_p())
+        return;
+
+    if (constrained && !projection_yields_grid()) {
+        if (xmlTextWriterStartElement(xml.get_writer(), (const xmlChar*)"Structure") < 0)
+            throw InternalErr(__FILE__, __LINE__, "Could not write Structure element");
+
+        if (!name().empty())
+            if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "name", (const xmlChar*)name().c_str()) < 0)
+                throw InternalErr(__FILE__, __LINE__, "Could not write attribute for name");
+
+        get_attr_table().print_xml_writer(xml);
+
+        get_array()->print_xml_writer(xml, constrained);
+
+        for_each(map_begin(), map_end(),
+                 PrintGridFieldXMLWriter(xml, constrained, "Array"));
+
+        if (xmlTextWriterEndElement(xml.get_writer()) < 0)
+            throw InternalErr(__FILE__, __LINE__, "Could not end Structure element");
+    }
+    else {
+        // The number of elements in the (projected) Grid must be such that
+        // we have a valid Grid object; send it as such.
+        if (xmlTextWriterStartElement(xml.get_writer(), (const xmlChar*)"Grid") < 0)
+            throw InternalErr(__FILE__, __LINE__, "Could not write Grid element");
+
+        if (!name().empty())
+            if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "name", (const xmlChar*)name().c_str()) < 0)
+                throw InternalErr(__FILE__, __LINE__, "Could not write attribute for name");
+
+        get_attr_table().print_xml_writer(xml);
+
+        get_array()->print_xml_writer(xml, constrained);
+
+        for_each(map_begin(), map_end(),
+                 PrintGridFieldXMLWriter(xml, constrained, "Map"));
+
+        if (xmlTextWriterEndElement(xml.get_writer()) < 0)
+            throw InternalErr(__FILE__, __LINE__, "Could not end Grid element");
+    }
+}
+
+void
+Grid::print_val(FILE *out, string space, bool print_decl_p)
+{
+    ostringstream oss;
+    print_val(oss, space, 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)
+{
+    if (print_decl_p) {
+        print_decl(out, space, false);
+        out << " = ";
+    }
+
+    // If we are printing a value on the client-side, projection_yields_grid
+    // should not be called since we don't *have* a projection without a
+    // Constraint. I think that if we are here and send_p() is not true, then
+    // 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: ";
+    else
+        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 << ", ")) {
+        (*i)->print_val(out, "", false);
+    }
+
+    out << " }";
+
+    if (print_decl_p) out << ";\n";
+}
+
+// Grids have ugly semantics.
+
+/** @brief Return true if this Grid is well formed.
+
+    The array dimensions and number of map vectors must match and
+    both the array and maps must be of simple-type elements. */
+bool
+Grid::check_semantics(string &msg, bool all)
+{
+    if (!BaseType::check_semantics(msg))
+        return false;
+
+    msg = "";
+
+    if (!get_array()) {
+        msg += "Null grid base array in `" + name() + "'\n";
+        return false;
+    }
+
+    // Is it an array?
+    if (get_array()->type() != dods_array_c) {
+        msg += "Grid `" + name() + "'s' member `" + get_array()->name() + "' must be an array\n";
+        return false;
+    }
+
+    Array *av = (Array *)get_array(); // past test above, must be an array
+
+    // Array must be of a simple_type.
+    if (!av->var()->is_simple_type()) {
+        msg += "The field variable `" + this->name() + "' must be an array of simple type elements (e.g., int32, String)\n";
+        return false;
+    }
+
+    // enough maps?
+    if ((unsigned)d_vars.size()-1 != av->dimensions()) {
+        msg += "The number of map variables for grid `" + this->name() + "' does not match the number of dimensions of `";
+        msg += av->name() + "'\n";
+        return false;
+    }
+
+    const string array_var_name = av->name();
+    Array::Dim_iter asi = av->dim_begin() ;
+    for (Map_iter mvi = map_begin(); mvi != map_end(); mvi++, asi++) {
+
+        BaseType *mv = *mvi;
+
+        // check names
+        if (array_var_name == mv->name()) {
+            msg += "Grid map variable `" + mv->name() + "' conflicts with the grid array name in grid `" + name() + "'\n";
+            return false;
+        }
+        // check types
+        if (mv->type() != dods_array_c) {
+            msg += "Grid map variable  `" + mv->name() + "' is not an array\n";
+            return false;
+        }
+
+        Array *mv_a = (Array *)mv; // downcast to (Array *)
+
+        // Array must be of a simple_type.
+        if (!mv_a->var()->is_simple_type()) {
+            msg += "The field variable `" + this->name() + "' must be an array of simple type elements (e.g., int32, String)\n";
+            return false;
+        }
+
+        // check shape
+        if (mv_a->dimensions() != 1) {// maps must have one dimension
+            msg += "Grid map variable  `" + mv_a->name() + "' must be only one dimension\n";
+            return false;
+        }
+        // size of map must match corresponding array dimension
+        Array::Dim_iter mv_asi = mv_a->dim_begin() ;
+        int mv_a_size = mv_a->dimension_size(mv_asi) ;
+        int av_size = av->dimension_size(asi) ;
+        if (mv_a_size != av_size) {
+            msg += "Grid map variable  `" + mv_a->name() + "'s' size does not match the size of array variable '";
+            msg += get_array()->name() + "'s' cooresponding dimension\n";
+            return false;
+        }
+    }
+
+    if (all) {
+        if (!get_array()->check_semantics(msg, true))
+            return false;
+        for (Map_iter mvi = map_begin(); mvi != map_end(); mvi++) {
+            if (!(*mvi)->check_semantics(msg, true)) {
+                return false;
+            }
+        }
+    }
+
+    return true;
+}
+
+/** @brief dumps information about this object
+ *
+ * Displays the pointer value of this instance and information about this
+ * instance.
+ *
+ * @param strm C++ i/o stream to dump the information to
+ * @return void
+ */
+void
+Grid::dump(ostream &strm) const
+{
+    strm << DapIndent::LMarg << "Grid::dump - ("
+    << (void *)this << ")" << endl ;
+    DapIndent::Indent() ;
+    Constructor::dump(strm) ;
+
+    DapIndent::UnIndent() ;
+}
+
+} // namespace libdap
+
diff --git a/Grid.h b/Grid.h
new file mode 100644
index 0000000..82f938b
--- /dev/null
+++ b/Grid.h
@@ -0,0 +1,205 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1994-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// Interface to the Grid ctor class. Grids contain a single array (the `main'
+// array) of dimension N and N single dimension arrays (map arrays). For any
+// dimension n of the main array, the size of the nth map array must match
+// the size of the main array's nth dimension. Grids are used to map
+// non-integer scales to multidimensional point data.
+//
+// jhrg 9/15/94
+
+#ifndef _grid_h
+#define _grid_h 1
+
+#include <vector>
+
+#ifndef _basetype_h
+#include "BaseType.h"
+#endif
+
+#ifndef _array_h
+#include "Array.h"
+#endif
+
+#ifndef _constructor_h
+#include "Constructor.h"
+#endif
+
+#ifndef constraint_evaluator_h
+#include "ConstraintEvaluator.h"
+#endif
+
+namespace libdap
+{
+
+class D4Grup;
+class XMLWriter;
+
+/** The Grid data type is a collection of an Array and a set of ``Map''
+    vectors.  The Map vectors are one-dimensional arrays corresponding
+    to each dimension of the central Array.  Using this scheme, a Grid
+    can represent, in a rectilinear array, data which is not in
+    reality rectilinear.  An example will help make it clear.
+
+    Assume that the following array contains measurements of some real
+    quantity, conducted at nine different points in space:
+
+    <pre>
+    A = [ 1  2  3  4 ]
+        [ 2  4  6  8 ]
+        [ 3  6  9  12]
+    </pre>
+
+    To locate this Array in the real world, we could note the location
+    of one corner of the grid, and the grid spacing.  This would allow
+    us to calculate the location of any of the other points of the
+    Array.
+
+    This approach will not work, however, unless the grid spacing is
+    precisely regular.  If the distance between Row 1 and Row 2 is not
+    the same as the distance between Row 2 and Row 3, the scheme will
+    break down.  The solution is to equip the Array with two Map
+    vectors that define the location of each row or column of the
+    array:
+
+    <pre>
+         A = [ 1  2  3  4 ] Row = [ 0 ]
+             [ 2  4  6  8 ]       [ 3 ]
+             [ 3  6  9  12]       [ 8 ]
+
+    Column = [ 0  2  8  27]
+    </pre>
+
+    The real location of the point in the first row and column of the
+    array is now exactly fixed at (0,0), and the point in the last row
+    and last column is at (8,27).
+
+    The Grid data type has two parts: an Array, and a singly-linked
+    list of Map vectors to describe the Array.  The access functions
+    for this class include a function to return the Array
+    (<tt>get_array()</tt>), and a set of functions for cycling through the
+    list of Map vectors.
+
+    @todo Move, in some sense, the d_map_vars up to Constructor. Look at using
+    Constructor's _var field for these.
+    @todo Along the same lines as the previous item, consider removing the
+    Part enum and adopting the convention that the first variable added is
+    the array and any subsequent variables are maps.
+
+    @brief Holds the Grid data type.
+    @see Array
+    */
+
+class Grid: public Constructor
+{
+private:
+    //BaseType *d_array_var;	// weak pointer to the
+    bool d_is_array_set;
+
+protected: // subclasses need access [mjohnson 11 nov 2009]
+    void m_duplicate(const Grid &s);
+
+public:
+
+    Grid(const string &n);
+    Grid(const string &n, const string &d);
+    Grid(const Grid &rhs);
+    virtual ~Grid();
+
+    typedef std::vector<BaseType *>::const_iterator Map_citer ;
+    typedef std::vector<BaseType *>::iterator Map_iter ;
+    typedef std::vector<BaseType *>::reverse_iterator Map_riter ;
+
+
+    Grid &operator=(const Grid &rhs);
+    virtual BaseType *ptr_duplicate();
+
+    virtual void transform_to_dap4(D4Group *root, Constructor *container);
+
+    virtual bool is_dap2_only_type();
+
+    virtual void add_var(BaseType *bt, Part part);
+    virtual void add_var_nocopy(BaseType *bt, Part part);
+
+    virtual void set_array(Array* p_new_arr);
+    virtual Array* add_map(Array* p_new_map, bool add_copy);
+    virtual Array* prepend_map(Array* p_new_map, bool add_copy);
+
+    BaseType *array_var();
+    Array *get_array();
+
+    // virtual unsigned int width(bool constrained = false);
+
+    virtual int components(bool constrained = false);
+
+    virtual bool projection_yields_grid();
+
+    virtual void clear_constraint();
+
+    virtual void print_decl(ostream &out, string space = "    ",
+                            bool print_semi = true,
+                            bool constraint_info = false,
+                            bool constrained = false);
+
+    virtual void print_xml(ostream &out, string space = "    ",
+                           bool constrained = false);
+    virtual void print_xml_writer(XMLWriter &xml, bool constrained = false);
+
+    virtual void print_val(ostream &out, string space = "",
+                           bool print_decl_p = true);
+
+    virtual void print_decl(FILE *out, string space = "    ",
+                            bool print_semi = true,
+                            bool constraint_info = false,
+                            bool constrained = false);
+    virtual void print_xml(FILE *out, string space = "    ",
+                           bool constrained = false);
+    virtual void print_val(FILE *out, string space = "",
+                           bool print_decl_p = true);
+
+    virtual void transfer_attributes(AttrTable *at_container);
+
+    virtual bool check_semantics(string &msg, bool all = false);
+
+    Map_iter map_begin() ;
+    Map_iter map_end() ;
+    Map_riter map_rbegin() ;
+    Map_riter map_rend() ;
+    Map_iter get_map_iter(int i);
+
+    virtual void dump(ostream &strm) const ;
+};
+
+} // namespace libdap
+
+#endif // _grid_h
+
diff --git a/HTTPCache.cc b/HTTPCache.cc
new file mode 100644
index 0000000..8754db0
--- /dev/null
+++ b/HTTPCache.cc
@@ -0,0 +1,1618 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#include "config.h"
+
+// #define DODS_DEBUG
+// #define DODS_DEBUG2
+#undef USE_GETENV
+
+#include <pthread.h>
+#include <limits.h>
+#include <unistd.h>   // for stat
+#include <sys/types.h>  // for stat and mkdir
+#include <sys/stat.h>
+
+#include <cstring>
+#include <cerrno>
+
+#include <iostream>
+#include <sstream>
+#include <algorithm>
+#include <iterator>
+#include <set>
+
+#include "Error.h"
+#include "InternalErr.h"
+#include "ResponseTooBigErr.h"
+#ifndef WIN32
+#include "SignalHandler.h"
+#endif
+#include "HTTPCacheInterruptHandler.h"
+#include "HTTPCacheTable.h"
+#include "HTTPCache.h"
+#include "HTTPCacheMacros.h"
+#include "SignalHandlerRegisteredErr.h"
+
+#include "util_mit.h"
+#include "debug.h"
+
+using namespace std;
+
+namespace libdap {
+
+HTTPCache *HTTPCache::_instance = 0;
+
+// instance_mutex is used to ensure that only one instance is created.
+// That is, it protects the body of the HTTPCache::instance() method. This
+// mutex is initialized from within the static function once_init_routine()
+// and the call to that takes place using pthread_once_init() where the mutex
+// once_block is used to protect that call. All of this ensures that no matter
+// how many threads call the instance() method, only one instance is ever
+// made.
+static pthread_mutex_t instance_mutex;
+static pthread_once_t once_block = PTHREAD_ONCE_INIT;
+
+
+#define NO_LM_EXPIRATION 24*3600 // 24 hours
+
+#define DUMP_FREQUENCY 10 // Dump index every x loads
+
+#define MEGA 0x100000L
+#define CACHE_TOTAL_SIZE 20 // Default cache size is 20M
+#define CACHE_FOLDER_PCT 10 // 10% of cache size for metainfo etc.
+#define CACHE_GC_PCT 10  // 10% of cache size free after GC
+#define MIN_CACHE_TOTAL_SIZE 5 // 5M Min cache size
+#define MAX_CACHE_ENTRY_SIZE 3 // 3M Max size of single cached entry
+
+static void
+once_init_routine()
+{
+    int status;
+    status = INIT(&instance_mutex);
+
+    if (status != 0)
+        throw InternalErr(__FILE__, __LINE__, "Could not initialize the HTTP Cache mutex. Exiting.");
+}
+
+/** Get a pointer to the HTTP 1.1 compliant cache. If not already
+    instantiated, this creates an instance of the HTTP cache object and
+    initializes it to use \c cache_root as the location of the persistent
+    store. If there's an index (\c .index) file in that directory, it is read
+    as part of the initialization. If the cache has already been initialized,
+    this method returns a pointer to that instance. Note HTTPCache uses the
+    singleton pattern; A process may have only one instance of this object.
+    Also note that HTTPCache is MT-safe. However, if the \c force parameter
+    is set to true, it may be possible for two or more processes to access
+    the persistent store at the same time resulting in undefined behavior.
+
+    Default values: is_cache_enabled(): true, is_cache_protected(): false,
+    is_expire_ignored(): false, the total size of the cache is 20M, 2M of that
+    is reserved for response headers, during GC the cache is reduced to at
+    least 18M (total size - 10% of the total size), and the max size for an
+    individual entry is 3M. It is possible to change the size of the cache,
+    but not to make it smaller than 5M. If expiration information is not sent
+    with a response, it is assumed to expire in 24 hours.
+
+    @param cache_root The fully qualified pathname of the directory which
+    will hold the cache data (i.e., the persistent store).
+    @param force Force access to the persistent store if true. By default
+    false. Use this only if you're sure no one else is using the same cache
+    root! This is included so that programs may use a cache that was
+    left in an inconsistent state.
+    @return A pointer to the HTTPCache object.
+    @exception Error thrown if the cache root cannot set. */
+
+HTTPCache *
+HTTPCache::instance(const string &cache_root, bool force)
+{
+    int status = pthread_once(&once_block, once_init_routine);
+    if (status != 0)
+        throw InternalErr(__FILE__, __LINE__, "Could not initialize the HTTP Cache mutex. Exiting.");
+
+    LOCK(&instance_mutex);
+
+    DBG(cerr << "Entering instance(); (" << hex << _instance << dec << ")" << "... ");
+
+    try {
+        if (!_instance) {
+            _instance = new HTTPCache(cache_root, force);
+
+            DBG(cerr << "New instance: " << _instance << ", cache root: "
+                << _instance->d_cache_root << endl);
+
+            atexit(delete_instance);
+
+#ifndef WIN32
+            // Register the interrupt handler. If we've already registered
+            // one, barf. If this becomes a problem, hack SignalHandler so
+            // that we can chain these handlers... 02/10/04 jhrg
+            //
+            // Technically we're leaking memory here. However, since this
+            // class is a singleton, we know that only three objects will
+            // ever be created and they will all exist until the process
+            // exits. We can let this slide... 02/12/04 jhrg
+            EventHandler *old_eh = SignalHandler::instance()->register_handler(SIGINT, new HTTPCacheInterruptHandler, true);
+            if (old_eh) {
+                SignalHandler::instance()->register_handler(SIGINT, old_eh);
+                throw SignalHandlerRegisteredErr(
+                    "Could not register event handler for SIGINT without superseding an existing one.");
+            }
+
+            old_eh = SignalHandler::instance()->register_handler(SIGPIPE, new HTTPCacheInterruptHandler, true);
+            if (old_eh) {
+                SignalHandler::instance()->register_handler(SIGPIPE, old_eh);
+                throw SignalHandlerRegisteredErr(
+                    "Could not register event handler for SIGPIPE without superseding an existing one.");
+            }
+
+            old_eh = SignalHandler::instance()->register_handler(SIGTERM, new HTTPCacheInterruptHandler, true);
+            if (old_eh) {
+                SignalHandler::instance()->register_handler(SIGTERM, old_eh);
+                throw SignalHandlerRegisteredErr(
+                    "Could not register event handler for SIGTERM without superseding an existing one.");
+            }
+#endif
+        }
+    }
+    catch (...) {
+        DBG2(cerr << "The constructor threw an Error!" << endl);
+        UNLOCK(&instance_mutex);
+        throw;
+    }
+
+    UNLOCK(&instance_mutex);
+    DBGN(cerr << "returning " << hex << _instance << dec << endl);
+
+    return _instance;
+}
+
+/** This static method is called using atexit(). It deletes the singleton;
+    see ~HTTPCache for all that implies. */
+
+void
+HTTPCache::delete_instance()
+{
+    DBG(cerr << "Entering delete_instance()..." << endl);
+
+    if (HTTPCache::_instance) {
+        DBG(cerr << "Deleting the cache: " << HTTPCache::_instance << endl);
+        delete HTTPCache::_instance;
+        HTTPCache::_instance = 0;
+
+        //Now remove the signal handlers
+        delete SignalHandler::instance()->remove_handler(SIGINT);
+        delete SignalHandler::instance()->remove_handler(SIGPIPE);
+        delete SignalHandler::instance()->remove_handler(SIGTERM);
+    }
+
+    DBG(cerr << "Exiting delete_instance()" << endl);
+}
+
+/** Create an instance of the HTTP 1.1 compliant cache. This initializes the
+    both the cache root and the path to the index file. It then reads the
+    cache index file if one is present.
+
+    A private method.
+
+    @note This assumes that the cache directory structure should be created!
+    @param cache_root The fully qualified pathname of the directory which
+    will hold the cache data.
+    @param force Force access to the persistent store!
+    @exception Error Thrown if the single user/process lock for the
+    persistent store cannot be obtained.
+    @see cache_index_read */
+
+HTTPCache::HTTPCache(string cache_root, bool force) :
+        d_locked_open_file(0),
+        d_cache_enabled(false),
+        d_cache_protected(false),
+
+        d_cache_disconnected(DISCONNECT_NONE),
+
+        d_expire_ignored(false),
+        d_always_validate(false),
+        d_total_size(CACHE_TOTAL_SIZE * MEGA),
+        d_folder_size(CACHE_TOTAL_SIZE / CACHE_FOLDER_PCT),
+        d_gc_buffer(CACHE_TOTAL_SIZE / CACHE_GC_PCT),
+        d_max_entry_size(MAX_CACHE_ENTRY_SIZE * MEGA),
+        d_default_expiration(NO_LM_EXPIRATION),
+        d_max_age(-1),
+        d_max_stale(-1),
+        d_min_fresh(-1),
+        d_http_cache_table(0)
+{
+    DBG(cerr << "Entering the constructor for " << this << "... ");
+#if 0
+	int status = pthread_once(&once_block, once_init_routine);
+	if (status != 0)
+		throw InternalErr(__FILE__, __LINE__, "Could not initialize the HTTP Cache mutex. Exiting.");
+#endif
+	INIT(&d_cache_mutex);
+
+	// This used to throw an Error object if we could not get the
+	// single user lock. However, that results in an invalid object. It's
+	// better to have an instance that has default values. If we cannot get
+	// the lock, make sure to set the cache as *disabled*. 03/12/03 jhrg
+	//
+	// I fixed this block so that the cache root is set before we try to get
+	// the single user lock. That was the fix for bug #661. To make that
+	// work, I had to move the call to create_cache_root out of
+	// set_cache_root(). 09/08/03 jhrg
+
+	set_cache_root(cache_root);
+	int block_size;
+
+	if (!get_single_user_lock(force))
+	    throw Error(internal_error, "Could not get single user lock for the cache");
+
+#ifdef WIN32
+	//  Windows is unable to provide us this information.  4096 appears
+	//  a best guess.  It is likely to be in the range [2048, 8192] on
+	//  windows, but will the level of truth of that statement vary over
+	//  time ?
+	block_size = 4096;
+#else
+	struct stat s;
+	if (stat(cache_root.c_str(), &s) == 0)
+		block_size = s.st_blksize;
+	else
+		throw Error(internal_error, "Could not set file system block size.");
+#endif
+	d_http_cache_table = new HTTPCacheTable(d_cache_root, block_size);
+	d_cache_enabled = true;
+
+	DBGN(cerr << "exiting" << endl);
+}
+
+/** Destroy an instance of HTTPCache. This writes the cache index and frees
+    the in-memory cache table structure. The persistent cache (the response
+    headers and bodies and the index file) are not removed. To remove those,
+    either erase the directory that contains the cache using a file system
+    command or use the purge_cache() method (which leaves the cache directory
+    structure in place but removes all the cached information).
+
+    This class uses the singleton pattern. Clients should \e never call this
+    method. The HTTPCache::instance() method arranges to call the
+    HTTPCache::delete_instance() using \c atexit(). If delete is called more
+    than once, the result will likely be an index file that is corrupt. */
+
+HTTPCache::~HTTPCache()
+{
+    DBG(cerr << "Entering the destructor for " << this << "... ");
+
+    try {
+        if (startGC())
+            perform_garbage_collection();
+
+        d_http_cache_table->cache_index_write();
+    }
+    catch (Error &e) {
+        // If the cache index cannot be written, we've got problems. However,
+        // unless we're debugging, still free up the cache table in memory.
+        // How should we let users know they cache index is not being
+        // written?? 10/03/02 jhrg
+        DBG(cerr << e.get_error_message() << endl);
+    }
+
+    delete d_http_cache_table;
+
+    release_single_user_lock();
+
+    DBGN(cerr << "exiting destructor." << endl);
+    DESTROY(&d_cache_mutex);
+}
+
+
+/** @name Garbage collection
+    These private methods manage the garbage collection tasks for the cache. */
+//@{
+
+/** Enough removed from cache? A private method.
+    @return True if enough has been removed from the cache. */
+
+bool
+HTTPCache::stopGC() const
+{
+    return (d_http_cache_table->get_current_size() + d_folder_size < d_total_size - d_gc_buffer);
+}
+
+/** Is there too much in the cache. A private method.
+
+    @todo Modify this method so that it does not count locked entries. See
+    the note for hits_gc().
+    @return True if garbage collection should be performed. */
+
+bool
+HTTPCache::startGC() const
+{
+    DBG(cerr << "startGC, current_size: " << d_http_cache_table->get_current_size() << endl);
+    return (d_http_cache_table->get_current_size() + d_folder_size > d_total_size);
+}
+
+/** Perform garbage collection on the cache. First, all expired responses are
+    removed. Then, if the size of the cache is still too large, the cache is
+    scanned for responses larger than the max_entry_size property. At the
+    same time, responses are removed based on the number of cache hits. This
+    process continues until the size of the cache has been reduced to 90% of
+    the max_size property value. Once the garbage collection is complete,
+    update the index file. Note that locked entries are not removed!
+
+    A private method.
+
+    @see stopGC
+    @see expired_gc
+    @see hits_gc */
+
+void
+HTTPCache::perform_garbage_collection()
+{
+    DBG(cerr << "Performing garbage collection" << endl);
+
+    // Remove all the expired responses.
+    expired_gc();
+
+    // Remove entries larger than max_entry_size.
+    too_big_gc();
+
+    // Remove entries starting with zero hits, 1, ..., until stopGC()
+    // returns true.
+    hits_gc();
+}
+
+/** Scan the current cache table and remove anything that has expired. Don't
+    remove locked entries.
+
+    A private method. */
+
+void
+HTTPCache::expired_gc()
+{
+    if (!d_expire_ignored) {
+        d_http_cache_table->delete_expired_entries();
+    }
+}
+
+/** Scan the cache for entires that are larger than max_entry_size. Also
+    start removing entires with low hit counts. Start looking for entries
+    with zero hits, then one, and so on. Stop when the method stopGC returns
+    true. Locked entries are never removed.
+
+    @note Potential infinite loop. What if more than 80% of the cache holds
+    entries that are locked? One solution is to modify startGC() so that it
+    does not count locked entries.
+
+    @todo Change this method to that it looks at the oldest entries first,
+    using the CacheEntry::date to determine entry age. Using the current
+    algorithm it's possible to remove the latest entry which is probably not
+    what we want.
+
+    A private method. */
+
+void
+HTTPCache::hits_gc()
+{
+    int hits = 0;
+
+    if (startGC()) {
+		while (!stopGC()) {
+			d_http_cache_table->delete_by_hits(hits);
+			hits++;
+		}
+	}
+}
+
+/** Scan the current cache table and remove anything that has is too big.
+ 	Don't remove locked entries.
+
+    A private method. */
+void HTTPCache::too_big_gc() {
+	if (startGC())
+		d_http_cache_table->delete_by_size(d_max_entry_size);
+}
+
+//@} End of the garbage collection methods.
+
+/** Lock the persistent store part of the cache. Return true if the cache lock
+    was acquired, false otherwise. This is a single user cache, so it
+    requires locking at the process level.
+
+    A private method.
+
+    @param force If True force access to the persistent store. False by
+    default.
+    @return True if the cache was locked for our use, False otherwise. */
+
+bool HTTPCache::get_single_user_lock(bool force) 
+{
+    if (!d_locked_open_file) {
+	FILE * fp = NULL;
+
+	try {
+	    // It's OK to call create_cache_root if the directory already
+	    // exists.
+	    create_cache_root(d_cache_root);
+	}
+	catch (Error &e) {
+	    // We need to catch and return false because this method is
+	    // called from a ctor and throwing at this point will result in a
+	    // partially constructed object. 01/22/04 jhrg
+	    DBG(cerr << "Failure to create the cache root" << endl);
+	    return false;
+	}
+
+	// Try to read the lock file. If we can open for reading, it exists.
+	string lock = d_cache_root + CACHE_LOCK;
+	if ((fp = fopen(lock.c_str(), "r")) != NULL) {
+	    int res = fclose(fp);
+	    if (res) {
+		DBG(cerr << "Failed to close " << (void *)fp << endl);
+	    }
+	    if (force)
+		REMOVE(lock.c_str());
+	    else
+		return false;
+	}
+
+	if ((fp = fopen(lock.c_str(), "w")) == NULL) {
+	    DBG(cerr << "Could not open for write access" << endl);
+	    return false;
+	}
+
+	d_locked_open_file = fp;
+	return true;
+    }
+
+    DBG(cerr << "locked_open_file is true" << endl);
+    return false;
+}
+
+/** Release the single user (process) lock. A private method. */
+
+void
+HTTPCache::release_single_user_lock()
+{
+    if (d_locked_open_file) {
+        int res = fclose(d_locked_open_file);
+        if (res) {
+            DBG(cerr << "Failed to close " << (void *)d_locked_open_file << endl) ;
+        }
+        d_locked_open_file = 0;
+    }
+
+    string lock = d_cache_root + CACHE_LOCK;
+    REMOVE(lock.c_str());
+}
+
+/** @name Accessors and Mutators for various properties. */
+//@{
+
+/** Get the current cache root directory.
+    @return A string that contains the cache root directory. */
+
+string
+HTTPCache::get_cache_root() const
+{
+    return d_cache_root;
+}
+
+
+/** Create the cache's root directory. This is the persistent store used by
+    the cache. Paths must always end in DIR_SEPARATOR_CHAR.
+
+    A private method.
+
+    @param cache_root The pathname to the desired cache root directory.
+    @exception Error Thrown if the given pathname cannot be created. */
+
+void
+HTTPCache::create_cache_root(const string &cache_root)
+{
+#ifdef WIN32
+    string::size_type cur = cache_root[1] == ':' ? 3 : 1;
+    typedef int mode_t;
+
+    while ((cur = cache_root.find(DIR_SEPARATOR_CHAR, cur)) != string::npos) {
+        string dir = cache_root.substr(0, cur);
+        struct stat stat_info;
+        if (stat(dir.c_str(), &stat_info) == -1) {
+            DBG2(cerr << "Cache....... Creating " << dir << endl);
+            mode_t mask = UMASK(0);
+            if (MKDIR(dir.c_str(), 0777) < 0) {
+                DBG2(cerr << "Error: can't create." << endl);
+                UMASK(mask);
+                throw Error(string("Could not create the directory for the cache. Failed when building path at ") + dir + string("."));
+            }
+            UMASK(mask);
+        }
+        else {
+            DBG2(cerr << "Cache....... Found " << dir << endl);
+        }
+        cur++;
+    }
+#else
+    // OSX and Linux
+
+    // Save the mask
+    mode_t mask = umask(0);
+
+    // Ignore the error if the directory exists
+    errno = 0;
+    if (mkdir(cache_root.c_str(), 0777) < 0 && errno != EEXIST) {
+        umask(mask);
+        throw Error("Could not create the directory for the cache at '" + cache_root + "' (" + strerror(errno) + ").");
+    }
+
+    // Restore themask
+    umask(mask);
+
+#endif
+}
+
+/** Set the cache's root directory to the given path. If no path is given,
+    look at the DODS_CACHE, TMP and TEMP environment variables (in that
+    order) to guess at a good location. If those are all NULL, use \c /tmp.
+    If the cache root directory cannot be created, throw an exception.
+
+    Note that in most cases callers should look for this path in the user's
+    .dodsrc file.
+
+    A private method.
+
+    @see RCReader
+    @param root Set the cache root to this pathname. Defaults to "".
+    @exception Error Thrown if the path can neither be deduced nor created. */
+
+void
+HTTPCache::set_cache_root(const string &root)
+{
+    if (root != "") {
+        d_cache_root = root;
+        // cache root should end in /.
+        if (d_cache_root[d_cache_root.size()-1] != DIR_SEPARATOR_CHAR)
+            d_cache_root += DIR_SEPARATOR_CHAR;
+    }
+    else {
+        // If no cache root has been indicated then look for a suitable
+        // location.
+#ifdef USE_GETENV
+        char * cr = (char *) getenv("DODS_CACHE");
+        if (!cr) cr = (char *) getenv("TMP");
+        if (!cr) cr = (char *) getenv("TEMP");
+        if (!cr) cr = (char*)CACHE_LOCATION;
+        d_cache_root = cr;
+#else
+        d_cache_root = CACHE_LOCATION;
+#endif
+
+        if (d_cache_root[d_cache_root.size()-1] != DIR_SEPARATOR_CHAR)
+            d_cache_root += DIR_SEPARATOR_CHAR;
+
+        d_cache_root += CACHE_ROOT;
+    }
+
+    // Test d_hhtp_cache_table because this method can be called before that
+    // instance is created and also can be called later to change the cache
+    // root. jhrg 05.14.08
+    if (d_http_cache_table)
+    	d_http_cache_table->set_cache_root(d_cache_root);
+}
+
+/** Enable or disable the cache. The cache can be temporarily suspended using
+    the enable/disable property. This does not prevent the cache from being
+    enabled/disable at a later point in time.
+
+    Default: yes
+
+    This method locks the class' interface.
+
+    @param mode True if the cache should be enabled, False if it should be
+    disabled. */
+
+void
+HTTPCache::set_cache_enabled(bool mode)
+{
+    lock_cache_interface();
+
+    d_cache_enabled = mode;
+
+    unlock_cache_interface();
+}
+
+/** Is the cache currently enabled? */
+
+bool
+HTTPCache::is_cache_enabled() const
+{
+    DBG2(cerr << "In HTTPCache::is_cache_enabled: (" << d_cache_enabled << ")"
+         << endl);
+    return d_cache_enabled;
+}
+
+/** Set the cache's disconnected property. The cache can operate either
+    disconnected from the network or using a proxy cache (but tell that proxy
+    not to use the network).
+
+    This method locks the class' interface.
+
+    @param mode One of DISCONNECT_NONE, DISCONNECT_NORMAL or
+    DISCONNECT_EXTERNAL.
+    @see CacheDIsconnectedMode */
+void
+HTTPCache::set_cache_disconnected(CacheDisconnectedMode mode)
+{
+    lock_cache_interface();
+
+    d_cache_disconnected = mode;
+
+    unlock_cache_interface();
+}
+
+/** Get the cache's disconnected mode property. */
+
+CacheDisconnectedMode
+HTTPCache::get_cache_disconnected() const
+{
+    return d_cache_disconnected;
+}
+
+/** How should the cache handle the Expires header?
+    Default: no
+
+    This method locks the class' interface.
+
+    @param mode True if a responses Expires header should be ignored, False
+    otherwise. */
+
+void
+HTTPCache::set_expire_ignored(bool mode)
+{
+    lock_cache_interface();
+
+    d_expire_ignored = mode;
+
+    unlock_cache_interface();
+}
+
+/* Is the cache ignoring Expires headers returned with responses that have
+   been cached? */
+
+bool
+HTTPCache::is_expire_ignored() const
+{
+    return d_expire_ignored;
+}
+
+/** Cache size management. The default cache size is 20M. The minimum size is
+    5M in order not to get into weird problems while writing the cache. The
+    size is indicated in Mega bytes. Note that reducing the size of the cache
+    may trigger a garbage collection operation.
+
+    @note The maximum cache size is UINT_MAX bytes (usually 4294967295 for
+    32-bit computers). If \e size is larger the value will be truncated to
+    the value of that constant. It seems pretty unlikely that will happen
+    given that the parameter is an unsigned long. This is a fix for bug 689
+    which was reported when the parameter type was signed.
+
+    This method locks the class' interface.
+
+    @param size The maximum size of the cache in megabytes. */
+
+void
+HTTPCache::set_max_size(unsigned long size)
+{
+    lock_cache_interface();
+
+    try {
+        unsigned long new_size = size < MIN_CACHE_TOTAL_SIZE ?
+                                 MIN_CACHE_TOTAL_SIZE * MEGA : size * MEGA;
+        unsigned long old_size = d_total_size;
+        d_total_size = new_size;
+        d_folder_size = d_total_size / CACHE_FOLDER_PCT;
+        d_gc_buffer = d_total_size / CACHE_GC_PCT;
+
+        if (new_size < old_size && startGC()) {
+            perform_garbage_collection();
+            d_http_cache_table->cache_index_write();
+        }
+    }
+    catch (...) {
+        unlock_cache_interface();
+        DBGN(cerr << "Unlocking interface." << endl);
+        throw;
+    }
+
+    DBG2(cerr << "Cache....... Total cache size: " << d_total_size
+         << " with " << d_folder_size
+         << " bytes for meta information and folders and at least "
+         << d_gc_buffer << " bytes free after every gc" << endl);
+
+    unlock_cache_interface();
+}
+
+/** How big is the cache? The value returned is the size in megabytes. */
+
+unsigned long
+HTTPCache::get_max_size() const
+{
+    return d_total_size / MEGA;
+}
+
+/** Set the maximum size for a single entry in the cache.
+
+    Default: 3M
+
+    This method locks the class' interface.
+
+    @param size The size in megabytes. */
+
+void
+HTTPCache::set_max_entry_size(unsigned long size)
+{
+    lock_cache_interface();
+
+    try {
+        unsigned long new_size = size * MEGA;
+        if (new_size > 0 && new_size < d_total_size - d_folder_size) {
+            unsigned long old_size = d_max_entry_size;
+            d_max_entry_size = new_size;
+            if (new_size < old_size && startGC()) {
+                perform_garbage_collection();
+                d_http_cache_table->cache_index_write();
+            }
+        }
+    }
+    catch (...) {
+        unlock_cache_interface();
+        throw;
+    }
+
+    DBG2(cerr << "Cache...... Max entry cache size is "
+         << d_max_entry_size << endl);
+
+    unlock_cache_interface();
+}
+
+/** Get the maximum size of an individual entry in the cache.
+
+    @return The maximum size in megabytes. */
+
+unsigned long
+HTTPCache::get_max_entry_size() const
+{
+    return d_max_entry_size / MEGA;
+}
+
+/** Set the default expiration time. Use the <i>default expiration</i>
+    property to determine when a cached response becomes stale if the
+    response lacks the information necessary to compute a specific value.
+
+    Default: 24 hours (86,400 seconds)
+
+    This method locks the class' interface.
+
+    @param exp_time The time in seconds. */
+
+void
+HTTPCache::set_default_expiration(const int exp_time)
+{
+    lock_cache_interface();
+
+    d_default_expiration = exp_time;
+
+    unlock_cache_interface();
+}
+
+/** Get the default expiration time used by the cache. */
+
+int
+HTTPCache::get_default_expiration() const
+{
+    return d_default_expiration;
+}
+
+/** Should every cache entry be validated?
+    @param validate True if every cache entry should be validated before
+    being used. */
+
+void
+HTTPCache::set_always_validate(bool validate)
+{
+    d_always_validate = validate;
+}
+
+/** Should every cache entry be validated before each use?
+    @return True if all cache entries require validation. */
+
+bool
+HTTPCache::get_always_validate() const
+{
+    return d_always_validate;
+}
+
+/** Set the request Cache-Control headers. If a request must be satisfied
+    using HTTP, these headers should be included in request since they might
+    be pertinent to a proxy cache.
+
+    Ignored headers: no-transform, only-if-cached. These headers are not used
+    by HTTPCache and are not recorded. However, if present in the vector
+    passed to this method, they will be present in the vector returned by
+    get_cache_control.
+
+    This method locks the class' interface.
+
+    @param cc A vector of strings, each string holds one Cache-Control
+    header.
+    @exception InternalErr Thrown if one of the strings in \c cc does not
+    start with 'Cache-Control: '. */
+
+void
+HTTPCache::set_cache_control(const vector<string> &cc)
+{
+    lock_cache_interface();
+
+    try {
+        d_cache_control = cc;
+
+        vector<string>::const_iterator i;
+        for (i = cc.begin(); i != cc.end(); ++i) {
+            string header = (*i).substr(0, (*i).find(':'));
+            string value = (*i).substr((*i).find(": ") + 2);
+            if (header != "Cache-Control") {
+                throw InternalErr(__FILE__, __LINE__, "Expected cache control header not found.");
+            }
+            else {
+                if (value == "no-cache" || value == "no-store")
+                    d_cache_enabled = false;
+                else if (value.find("max-age") != string::npos) {
+                    string max_age = value.substr(value.find("=" + 1));
+                    d_max_age = parse_time(max_age.c_str());
+                }
+                else if (value == "max-stale")
+                    d_max_stale = 0; // indicates will take anything;
+                else if (value.find("max-stale") != string::npos) {
+                    string max_stale = value.substr(value.find("=" + 1));
+                    d_max_stale = parse_time(max_stale.c_str());
+                }
+                else if (value.find("min-fresh") != string::npos) {
+                    string min_fresh = value.substr(value.find("=" + 1));
+                    d_min_fresh = parse_time(min_fresh.c_str());
+                }
+            }
+        }
+    }
+    catch (...) {
+        unlock_cache_interface();
+        throw;
+    }
+
+    unlock_cache_interface();
+}
+
+
+/** Get the Cache-Control headers.
+
+    @return A vector of strings, one string for each header. */
+
+vector<string>
+HTTPCache::get_cache_control()
+{
+    return d_cache_control;
+}
+
+//@}
+
+/** Look in the cache for the given \c url. Is it in the cache table?
+
+    This method locks the class' interface.
+
+	@todo Remove this is broken.
+    @param url The url to look for.
+    @return True if \c url is found, otherwise False. */
+
+bool
+HTTPCache::is_url_in_cache(const string &url)
+{
+    DBG(cerr << "Is this url in the cache? (" << url << ")" << endl);
+
+    HTTPCacheTable::CacheEntry *entry = d_http_cache_table->get_locked_entry_from_cache_table(url);
+    bool status = entry != 0;
+    if (entry) {
+        entry->unlock_read_response();
+    }
+    return  status;
+}
+
+/** Is the header a hop by hop header? If so, we're not supposed to store it
+    in the cache. See RFC 2616, Section 13.5.1.
+
+    @return True if the header is, otherwise False. */
+
+bool
+is_hop_by_hop_header(const string &header)
+{
+    return header.find("Connection") != string::npos
+           || header.find("Keep-Alive") != string::npos
+           || header.find("Proxy-Authenticate") != string::npos
+           || header.find("Proxy-Authorization") != string::npos
+           || header.find("Transfer-Encoding") != string::npos
+           || header.find("Upgrade") != string::npos;
+}
+
+/** Dump the headers out to the meta data file. The file is truncated if it
+    already exists.
+
+    @todo This code could be replaced with STL/iostream stuff.
+
+    A private method.
+
+    @param cachename Base name of file for meta data.
+    @param headers A vector of strings, one header per string.
+    @exception InternalErr Thrown if the file cannot be opened. */
+
+void
+HTTPCache::write_metadata(const string &cachename, const vector<string> &headers)
+{
+    string fname = cachename + CACHE_META;
+    d_open_files.push_back(fname);
+
+    FILE *dest = fopen(fname.c_str(), "w");
+    if (!dest) {
+        throw InternalErr(__FILE__, __LINE__,
+                          "Could not open named cache entry file.");
+    }
+
+    vector<string>::const_iterator i;
+    for (i = headers.begin(); i != headers.end(); ++i) {
+        if (!is_hop_by_hop_header(*i)) {
+            int s = fwrite((*i).c_str(), (*i).size(), 1, dest);
+            if (s != 1) {
+                fclose(dest);
+            	throw InternalErr(__FILE__, __LINE__, "could not write header: '" + (*i) + "' " + long_to_string(s));
+            }
+            s = fwrite("\n", 1, 1, dest);
+            if (s != 1) {
+                fclose(dest);
+            	throw InternalErr(__FILE__, __LINE__, "could not write header: " + long_to_string(s));
+            }
+        }
+    }
+
+    int res = fclose(dest);
+    if (res) {
+        DBG(cerr << "HTTPCache::write_metadata - Failed to close "
+            << dest << endl);
+    }
+
+    d_open_files.pop_back();
+}
+
+/** Read headers from a .meta.
+
+    @todo This code could be replaced with STL/iostream code.
+
+    A private method.
+
+    @param cachename The name of the file in the persistent store.
+    @param headers The headers are returned using this parameter.
+    @exception InternalErr Thrown if the file cannot be opened. */
+
+void
+HTTPCache::read_metadata(const string &cachename, vector<string> &headers)
+{
+    FILE *md = fopen(string(cachename + CACHE_META).c_str(), "r");
+    if (!md) {
+        throw InternalErr(__FILE__, __LINE__,
+                          "Could not open named cache entry meta data file.");
+    }
+
+    char line[1024];
+    while (!feof(md) && fgets(line, 1024, md)) {
+        line[min(1024, static_cast<int>(strlen(line)))-1] = '\0'; // erase newline
+        headers.push_back(string(line));
+    }
+
+    int res = fclose(md);
+    if (res) {
+        DBG(cerr << "HTTPCache::read_metadata - Failed to close "
+            << md << endl);
+    }
+}
+
+/** Write the body of the HTTP response to the cache.
+
+    This method used to throw ResponseTooBig if any response was larger than
+    max_entry_size. I've disabled that since perform_garbage_collection will
+    remove any such entry if it's causing problems. Note that if
+    parse_headers finds a Content-Length header that indicates a response is
+    too big, the response won't be cached. The idea here is that once we've
+    already written a bunch of bytes to the cache, we might as well continue.
+    If it overflows the cache, perform_garbage_collection() will remove it.
+
+    A private method.
+
+    @param cachename Write data to this file.
+    @param src Read data from this stream.
+    @return The total number of bytes written.
+    @exception InternalErr Thrown if the file cannot be opened or if an I/O
+    error was detected.
+    @exception ResponseTooBig Thrown if the response was found to be bigger
+    than the max_entry_size property. This is not longer thrown. 10/11/02
+    jhrg */
+
+int
+HTTPCache::write_body(const string &cachename, const FILE *src)
+{
+    d_open_files.push_back(cachename);
+
+    FILE *dest = fopen(cachename.c_str(), "wb");
+    if (!dest) {
+        throw InternalErr(__FILE__, __LINE__,
+                          "Could not open named cache entry file.");
+    }
+
+    // Read and write in 1k blocks; an attempt at doing this efficiently.
+    // 09/30/02 jhrg
+    char line[1024];
+    size_t n;
+    int total = 0;
+    while ((n = fread(line, 1, 1024, const_cast<FILE *>(src))) > 0) {
+        total += fwrite(line, 1, n, dest);
+        DBG2(sleep(3));
+    }
+
+    if (ferror(const_cast<FILE *>(src)) || ferror(dest)) {
+        int res = fclose(dest);
+        res = res & unlink(cachename.c_str());
+        if (res) {
+            DBG(cerr << "HTTPCache::write_body - Failed to close/unlink "
+                << dest << endl);
+        }
+        throw InternalErr(__FILE__, __LINE__,
+                          "I/O error transferring data to the cache.");
+    }
+
+    rewind(const_cast<FILE *>(src));
+
+    int res = fclose(dest);
+    if (res) {
+        DBG(cerr << "HTTPCache::write_body - Failed to close "
+            << dest << endl);
+    }
+
+    d_open_files.pop_back();
+
+    return total;
+}
+
+/** Get a pointer to file that contains the body of a cached response. The
+    returned FILE* can be used both for reading and for writing.
+
+    A private method.
+
+    @param cachename The name of the file that holds the response body.
+    @exception InternalErr Thrown if the file cannot be opened. */
+
+FILE *
+HTTPCache::open_body(const string &cachename)
+{
+    DBG(cerr << "cachename: " << cachename << endl);
+
+    FILE *src = fopen(cachename.c_str(), "rb"); // Read only
+    if (!src)
+	throw InternalErr(__FILE__, __LINE__, "Could not open cache file.");
+
+    return src;
+}
+
+/** Add a new response to the cache, or replace an existing cached response
+    with new data. This method returns True if the information for \c url was
+    added to the cache. A response might not be cache-able; in that case this
+    method returns false. (For example, the response might contain the
+    'Cache-Control: no-cache' header.)
+
+    Note that the FILE *body is rewound so that the caller can re-read it
+    without using fseek or rewind.
+
+    If a response for \c url is already present in the cache, it will be
+    replaced by the new headers and body. To update a response in the cache
+    with new meta data, use update_response().
+
+    This method locks the class' interface.
+
+    @param url A string which holds the request URL.
+    @param request_time The time when the request was made, in seconds since
+    1 Jan 1970.
+    @param headers A vector of strings which hold the response headers.
+    @param body A FILE * to a file which holds the response body.
+    @return True if the response was cached, False if the response could not
+    be cached.
+    @exception InternalErr Thrown if there was a I/O error while writing to
+    the persistent store. */
+
+bool
+HTTPCache::cache_response(const string &url, time_t request_time,
+                          const vector<string> &headers, const FILE *body)
+{
+    lock_cache_interface();
+
+    DBG(cerr << "Caching url: " << url << "." << endl);
+
+    try {
+        // If this is not an http or https URL, don't cache.
+        if (url.find("http:") == string::npos &&
+            url.find("https:") == string::npos) {
+            unlock_cache_interface();
+            return false;
+        }
+
+        // This does nothing if url is not already in the cache. It's
+        // more efficient to do this than to first check and see if the entry
+        // exists. 10/10/02 jhrg
+        d_http_cache_table->remove_entry_from_cache_table(url);
+
+        HTTPCacheTable::CacheEntry *entry = new HTTPCacheTable::CacheEntry(url);
+        entry->lock_write_response();
+
+        try {
+            d_http_cache_table->parse_headers(entry, d_max_entry_size, headers); // etag, lm, date, age, expires, max_age.
+            if (entry->is_no_cache()) {
+                DBG(cerr << "Not cache-able; deleting HTTPCacheTable::CacheEntry: " << entry
+                    << "(" << url << ")" << endl);
+                entry->unlock_write_response();
+                delete entry; entry = 0;
+                unlock_cache_interface();
+                return false;
+            }
+
+            // corrected_initial_age, freshness_lifetime, response_time.
+            d_http_cache_table->calculate_time(entry, d_default_expiration, request_time);
+
+            d_http_cache_table->create_location(entry); // cachename, cache_body_fd
+            // move these write function to cache table
+            entry->set_size(write_body(entry->get_cachename(), body));
+            write_metadata(entry->get_cachename(), headers);
+            d_http_cache_table->add_entry_to_cache_table(entry);
+            entry->unlock_write_response();
+        }
+        catch (ResponseTooBigErr &e) {
+            // Oops. Bummer. Clean up and exit.
+            DBG(cerr << e.get_error_message() << endl);
+            REMOVE(entry->get_cachename().c_str());
+            REMOVE(string(entry->get_cachename() + CACHE_META).c_str());
+            DBG(cerr << "Too big; deleting HTTPCacheTable::CacheEntry: " << entry << "(" << url
+                << ")" << endl);
+            entry->unlock_write_response();
+            delete entry; entry = 0;
+            unlock_cache_interface();
+            return false;
+        }
+
+        if (d_http_cache_table->get_new_entries() > DUMP_FREQUENCY) {
+            if (startGC())
+                perform_garbage_collection();
+
+            d_http_cache_table->cache_index_write(); // resets new_entries
+        }
+    }
+    catch (...) {
+        unlock_cache_interface();
+        throw;
+    }
+
+    unlock_cache_interface();
+
+    return true;
+}
+
+/** Build the headers to send along with a GET request to make that request
+    conditional. This method examines the headers for a given response in the
+    cache and formulates the correct headers for a valid HTTP 1.1 conditional
+    GET request. See RFC 2616, Section 13.3.4.
+
+    Rules: If an ETag is present, it must be used. Use If-None-Match. If a
+    Last-Modified header is present, use it. Use If-Modified-Since. If both
+    are present, use both (this means that HTTP 1.0 daemons are more likely
+    to work). If a Last-Modified header is not present, use the value of the
+    Cache-Control max-age or Expires header(s). Note that a 'Cache-Control:
+    max-age' header overrides an Expires header (Sec 14.9.3).
+
+    This method locks the cache interface and the cache entry.
+
+    @param url Get the HTTPCacheTable::CacheEntry for this URL.
+    @return A vector of strings, one request header per string.
+    @exception Error Thrown if the \e url is not in the cache. */
+
+vector<string>
+HTTPCache::get_conditional_request_headers(const string &url)
+{
+    lock_cache_interface();
+
+    HTTPCacheTable::CacheEntry *entry = 0;
+    vector<string> headers;
+
+    DBG(cerr << "Getting conditional request headers for " << url << endl);
+
+    try {
+        entry = d_http_cache_table->get_locked_entry_from_cache_table(url);
+        if (!entry)
+            throw Error(internal_error, "There is no cache entry for the URL: " + url);
+
+        if (entry->get_etag() != "")
+            headers.push_back(string("If-None-Match: ") + entry->get_etag());
+
+        if (entry->get_lm() > 0) {
+        	time_t lm = entry->get_lm();
+            headers.push_back(string("If-Modified-Since: ")
+                              + date_time_str(&lm));
+        }
+        else if (entry->get_max_age() > 0) {
+        	time_t max_age = entry->get_max_age();
+            headers.push_back(string("If-Modified-Since: ")
+                              + date_time_str(&max_age));
+        }
+        else if (entry->get_expires() > 0) {
+        	time_t expires = entry->get_expires();
+            headers.push_back(string("If-Modified-Since: ")
+                              + date_time_str(&expires));
+        }
+        entry->unlock_read_response();
+        unlock_cache_interface();
+    }
+    catch (...) {
+	unlock_cache_interface();
+	if (entry) {
+	    entry->unlock_read_response();
+	}
+	throw;
+    }
+
+    return headers;
+}
+
+/** Functor/Predicate which orders two MIME headers based on the header name
+    only (discounting the value). */
+
+struct HeaderLess: binary_function<const string&, const string&, bool>
+{
+    bool operator()(const string &s1, const string &s2) const {
+        return s1.substr(0, s1.find(':')) < s2.substr(0, s2.find(':'));
+    }
+};
+
+/** Update the meta data for a response already in the cache. This method
+    provides a way to merge response headers returned from a conditional GET
+    request, for the given URL, with those already present.
+
+    This method locks the class' interface and the cache entry.
+
+    @param url Update the meta data for this cache entry.
+    @param request_time The time (Unix time, seconds since 1 Jan 1970) that
+    the conditional request was made.
+    @param headers New headers, one header per string, returned in the
+    response.
+    @exception Error Thrown if the \c url is not in the cache. */
+
+void
+HTTPCache::update_response(const string &url, time_t request_time,
+                           const vector<string> &headers)
+{
+    lock_cache_interface();
+
+    HTTPCacheTable::CacheEntry *entry = 0;
+    DBG(cerr << "Updating the response headers for: " << url << endl);
+
+    try {
+        entry = d_http_cache_table->get_write_locked_entry_from_cache_table(url);
+        if (!entry)
+            throw Error(internal_error, "There is no cache entry for the URL: " + url);
+
+        // Merge the new headers with the exiting HTTPCacheTable::CacheEntry object.
+        d_http_cache_table->parse_headers(entry, d_max_entry_size, headers);
+
+        // Update corrected_initial_age, freshness_lifetime, response_time.
+        d_http_cache_table->calculate_time(entry, d_default_expiration, request_time);
+
+        // Merge the new headers with those in the persistent store. How:
+        // Load the new headers into a set, then merge the old headers. Since
+        // set<> ignores duplicates, old headers with the same name as a new
+        // header will got into the bit bucket. Define a special compare
+        // functor to make sure that headers are compared using only their
+        // name and not their value too.
+        set<string, HeaderLess> merged_headers;
+
+        // Load in the new headers
+        copy(headers.begin(), headers.end(),
+             inserter(merged_headers, merged_headers.begin()));
+
+        // Get the old headers and load them in.
+        vector<string> old_headers;
+        read_metadata(entry->get_cachename(), old_headers);
+        copy(old_headers.begin(), old_headers.end(),
+             inserter(merged_headers, merged_headers.begin()));
+
+        // Read the values back out. Use reverse iterators with back_inserter
+        // to preserve header order. NB: vector<> does not support push_front
+        // so we can't use front_inserter(). 01/09/03 jhrg
+        vector<string> result;
+        copy(merged_headers.rbegin(), merged_headers.rend(),
+             back_inserter(result));
+
+        write_metadata(entry->get_cachename(), result);
+        entry->unlock_write_response();
+        unlock_cache_interface();
+    }
+    catch (...) {
+        if (entry) {
+            entry->unlock_read_response();
+        }
+        unlock_cache_interface();
+        throw;
+    }
+}
+
+/** Look in the cache and return the status (validity) of the cached
+    response. This method should be used to determine if a cached response
+    requires validation.
+
+    This method locks the class' interface and the cache entry.
+
+    @param url Find the cached response associated with this URL.
+    @return True indicates that the response can be used, False indicates
+    that it must first be validated.
+    @exception Error Thrown if the URL's response is not in the cache. */
+
+bool
+HTTPCache::is_url_valid(const string &url)
+{
+    lock_cache_interface();
+
+    bool freshness;
+    HTTPCacheTable::CacheEntry *entry = 0;
+
+    DBG(cerr << "Is this URL valid? (" << url << ")" << endl);
+
+    try {
+        if (d_always_validate) {
+            unlock_cache_interface();
+            return false;  // force re-validation.
+        }
+
+        entry = d_http_cache_table->get_locked_entry_from_cache_table(url);
+        if (!entry)
+            throw Error(internal_error, "There is no cache entry for the URL: " + url);
+
+        // If we supported range requests, we'd need code here to check if
+        // there was only a partial response in the cache. 10/02/02 jhrg
+
+        // In case this entry is of type "must-revalidate" then we consider it
+        // invalid.
+        if (entry->get_must_revalidate()) {
+            entry->unlock_read_response();
+            unlock_cache_interface();
+            return false;
+        }
+
+        time_t resident_time = time(NULL) - entry->get_response_time();
+        time_t current_age = entry->get_corrected_initial_age() + resident_time;
+
+        // Check that the max-age, max-stale, and min-fresh directives
+        // given in the request cache control header is followed.
+        if (d_max_age >= 0 && current_age > d_max_age) {
+            DBG(cerr << "Cache....... Max-age validation" << endl);
+            entry->unlock_read_response();
+            unlock_cache_interface();
+            return false;
+        }
+        if (d_min_fresh >= 0
+            && entry->get_freshness_lifetime() < current_age + d_min_fresh) {
+            DBG(cerr << "Cache....... Min-fresh validation" << endl);
+            entry->unlock_read_response();
+            unlock_cache_interface();
+            return false;
+        }
+
+        freshness = (entry->get_freshness_lifetime()
+                     + (d_max_stale >= 0 ? d_max_stale : 0) > current_age);
+        entry->unlock_read_response();
+        unlock_cache_interface();
+    }
+    catch (...) {
+    	if (entry) {
+    	    entry->unlock_read_response();
+    	}
+    	unlock_cache_interface();
+        throw;
+    }
+
+    return freshness;
+}
+
+/** Get information from the cache. For a given URL, get the headers, cache
+    object name and body
+    stored in the cache. Note that this method increments the hit counter for
+    <code>url</code>'s entry and \e locks that entry. To release the lock,
+    the method release_cached_response() \e must be called. Methods that
+    block on a locked entry are: get_conditional_request_headers(),
+    update_response() and is_url_valid(). In addition, purge_cache() throws
+    Error if it's called and any entries are locked. The garbage collection
+    system will not reclaim locked entries (but works fine when some entries
+    are locked).
+
+    This method locks the class' interface.
+
+    This method does \e not check to see that the response is valid, just
+    that it is in the cache. To see if a cached response is valid, use
+    is_url_valid(). The FILE* returned can be used for both reading and
+    writing. The latter allows a client to update the body of a cached
+    response without having to first dump it all to a separate file and then
+    copy it into the cache (using cache_response()).
+
+    @param url Get response information for this URL.
+    @param headers Return the response headers in this parameter
+    @param cacheName A value-result parameter; the name of the cache file
+    @return A FILE * to the response body.
+    @exception Error Thrown if the URL's response is not in the cache.
+    @exception InternalErr Thrown if the persistent store cannot be opened. */
+
+FILE * HTTPCache::get_cached_response(const string &url,
+		vector<string> &headers, string &cacheName) {
+    lock_cache_interface();
+
+    FILE *body = 0;
+    HTTPCacheTable::CacheEntry *entry = 0;
+
+    DBG(cerr << "Getting the cached response for " << url << endl);
+
+    try {
+        entry = d_http_cache_table->get_locked_entry_from_cache_table(url);
+        if (!entry) {
+        	unlock_cache_interface();
+        	return 0;
+        }
+
+        cacheName = entry->get_cachename();
+        read_metadata(entry->get_cachename(), headers);
+
+        DBG(cerr << "Headers just read from cache: " << endl);
+        DBGN(copy(headers.begin(), headers.end(), ostream_iterator<string>(cerr, "\n")));
+
+        body = open_body(entry->get_cachename());
+
+        DBG(cerr << "Returning: " << url << " from the cache." << endl);
+
+        d_http_cache_table->bind_entry_to_data(entry, body);
+    }
+    catch (...) {
+    	// Why make this unlock operation conditional on entry?
+        if (entry)
+        	unlock_cache_interface();
+        if (body != 0)
+            fclose(body);
+        throw;
+    }
+
+    unlock_cache_interface();
+
+    return body;
+}
+
+/** Get information from the cache. This is a convenience method that calls
+ 	the three parameter version of get_cache_response().
+
+    This method locks the class' interface.
+
+    @param url Get response information for this URL.
+    @param headers Return the response headers in this parameter
+    @return A FILE * to the response body.
+    @exception Error Thrown if the URL's response is not in the cache.
+    @exception InternalErr Thrown if the persistent store cannot be opened. */
+
+FILE *
+HTTPCache::get_cached_response(const string &url, vector<string> &headers)
+{
+	string discard_name;
+	return get_cached_response(url, headers, discard_name);
+}
+
+/** Get a pointer to a cached response body. This is a convenience method that
+ 	calls the three parameter version of get_cache_response().
+
+    This method locks the class' interface.
+
+    @param url Find the body associated with this URL.
+    @return A FILE* that points to the response body.
+    @exception Error Thrown if the URL is not in the cache.
+    @exception InternalErr Thrown if an I/O error is detected. */
+
+FILE *
+HTTPCache::get_cached_response(const string &url)
+{
+	string discard_name;
+	vector<string> discard_headers;
+	return get_cached_response(url, discard_headers, discard_name);
+}
+
+/** Call this method to inform the cache that a particular response is no
+    longer in use. When a response is accessed using get_cached_response(), it
+    is locked so that updates and removal (e.g., by the garbage collector)
+    are not possible. Calling this method frees that lock.
+
+    This method locks the class' interface.
+
+    @param body Release the lock on the response information associated with
+    this FILE *.
+    @exception Error Thrown if \c body does not belong to an entry in the
+    cache or if the entry was already released. */
+
+void
+HTTPCache::release_cached_response(FILE *body)
+{
+    lock_cache_interface();
+
+    try {
+    	// fclose(body); This results in a seg fault on linux jhrg 8/27/13
+    	d_http_cache_table->uncouple_entry_from_data(body);
+    }
+    catch (...) {
+        unlock_cache_interface();
+        throw;
+    }
+
+    unlock_cache_interface();
+}
+
+/** Purge both the in-memory cache table and the contents of the cache on
+    disk. This method deletes every entry in the persistent store but leaves
+    the structure intact. The client of HTTPCache is responsible for making
+    sure that all threads have released any responses they pulled from the
+    cache. If this method is called when a response is still in use, it will
+    throw an Error object and not purge the cache.
+
+    This method locks the class' interface.
+
+    @exception Error Thrown if an attempt is made to purge the cache when
+    an entry is still in use. */
+
+void
+HTTPCache::purge_cache()
+{
+    lock_cache_interface();
+
+    try {
+        if (d_http_cache_table->is_locked_read_responses())
+            throw Error(internal_error, "Attempt to purge the cache with entries in use.");
+
+        d_http_cache_table->delete_all_entries();
+    }
+    catch (...) {
+        unlock_cache_interface();
+        throw;
+    }
+
+    unlock_cache_interface();
+}
+
+} // namespace libdap
diff --git a/HTTPCache.h b/HTTPCache.h
new file mode 100644
index 0000000..6c9b323
--- /dev/null
+++ b/HTTPCache.h
@@ -0,0 +1,244 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2008 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#ifndef _http_cache_h
+#define _http_cache_h
+
+#include <pthread.h>
+
+#ifdef WIN32
+#include <io.h>   // stat for win32? 09/05/02 jhrg
+#endif
+
+#include <string>
+#include <vector>
+#include <map>
+
+#include "HTTPCacheTable.h" // included for macros
+
+#include "HTTPCacheDisconnectedMode.h"
+//using namespace std;
+
+namespace libdap
+{
+
+class HTTPCacheTabe;
+
+// This function is exported so the test code can use it too.
+bool is_hop_by_hop_header(const string &header);
+
+/** Implements a multi-process MT-safe HTTP 1.1 compliant (mostly) cache.
+
+    <i>Clients that run as users lacking a writable HOME directory MUST
+    disable this cache. Use Connect::set_cache_enable(false).</i>
+
+    The original design of this class was taken from the W3C libwww software, 
+    written by Henrik Frystyk Nielsen, Copyright MIT
+    1995. See the file MIT_COPYRIGHT. This software is a complete rewrite in
+    C++ with additional features useful to the DODS and OPeNDAP projects.
+
+    This cache does not implement range checking. Partial responses should
+    not be cached (HFN's version did, but it doesn't mesh well with the DAP
+    for which this is being written).
+
+    The cache uses the local file system to store responses. If it is being
+    used in a MT application, care should be taken to ensure that the number
+    of available file descriptors is not exceeded.
+
+    In addition, when used in a MT program only one thread should use the
+    mutators to set property values. Even though the methods are robust WRT
+    MT software, having several threads change values of cache's properties
+    will lead to odd behavior on the part of the cache. Many of the public
+    methods lock access to the class' interface. This is noted in the
+    documentation for those methods.
+
+    Even though the public interface to the cache is typically locked when
+    accessed, an extra locking mechanism is in place for `entries' which are
+    accessed. If a thread accesses a entry, that response must be locked to
+    prevent it from being updated until the thread tells the cache that it's
+    no longer using it. The method get_cache_response() and
+    get_cache_response_body() both lock an entry; use
+    release_cache_response() to release the lock. Entries are locked using a
+    combination of a counter and a mutex. The following methods block when
+    called on a locked entry: is_url_valid(),
+    get_conditional_request_headers(), update_response(). (The locking scheme
+    could be modified so that a distinction is made between reading from and
+    writing to an entry. In this case is_url_valid() and
+    get_conditional_request_headers() would only lock when an entry is in use
+    for writing. But I haven't done that.)
+
+	@todo Update documentation: get_cache_response() now also serves as 
+	is_url_in_cache() and is_url_valid() should only be called after a locked
+	cached response is accessed using get_cahced_response(). These lock the
+	cache for reading. The methods cache_response() and update_response()
+	lock an entry for writing.
+	
+	@todo Check that the lock-for-write and lock-for-read work together since
+	it's possible that an entry in use might have a stream of readers and never
+	free the 'read-lock' thus blocking a writer.
+	
+    @author James Gallagher <jgallagher@opendap.org> */
+class HTTPCache
+{
+private:
+    string d_cache_root;
+    FILE *d_locked_open_file; // Lock for single process use.
+
+    bool d_cache_enabled;
+    bool d_cache_protected;
+    CacheDisconnectedMode d_cache_disconnected;
+    bool d_expire_ignored;
+    bool d_always_validate;
+
+    unsigned long d_total_size; // How much can we store?
+    unsigned long d_folder_size; // How much of that is meta data?
+    unsigned long d_gc_buffer; // How much memory needed as buffer?
+    unsigned long d_max_entry_size; // Max individual entry size.
+    int d_default_expiration;
+
+    vector<string> d_cache_control;
+    // these are values read from a request-directive Cache-Control header.
+    // Not to be confused with values read from the response or a cached
+    // response (e.g., CacheEntry has a max_age field, too). These fields are
+    // set when the set_cache_control method is called.
+    time_t d_max_age;
+    time_t d_max_stale;  // -1: not set, 0:any response, >0 max time.
+    time_t d_min_fresh;
+
+    // Lock non-const methods (also ones that use the STL).
+    pthread_mutex_t d_cache_mutex;
+    
+    HTTPCacheTable *d_http_cache_table;
+
+    // d_open_files is used by the interrupt handler to clean up
+    vector<string> d_open_files;
+
+    static HTTPCache *_instance;
+
+    friend class HTTPCacheTest; // Unit tests
+    friend class HTTPConnectTest;
+
+    friend class HTTPCacheInterruptHandler;
+
+    // Private methods
+    HTTPCache(const HTTPCache &);
+    HTTPCache();
+    HTTPCache &operator=(const HTTPCache &);
+
+    HTTPCache(string cache_root, bool force);
+
+    static void delete_instance(); // Run by atexit (hence static)
+    
+    void set_cache_root(const string &root = "");
+    void create_cache_root(const string &cache_root);
+    
+    // These will go away when the cache can be used by multiple processes.
+    bool get_single_user_lock(bool force = false);
+    void release_single_user_lock();
+    
+    bool is_url_in_cache(const string &url);
+
+    // I made these four methods so they could be tested by HTTPCacheTest.
+    // Otherwise they would be static functions. jhrg 10/01/02
+    void write_metadata(const string &cachename, const vector<string> &headers);
+    void read_metadata(const string &cachename, vector<string> &headers);
+    int write_body(const string &cachename, const FILE *src);
+    FILE *open_body(const string &cachename);
+
+    bool stopGC() const;
+    bool startGC() const;
+
+    void perform_garbage_collection();
+    void too_big_gc();
+    void expired_gc();
+    void hits_gc();
+
+public:
+    static HTTPCache *instance(const string &cache_root, bool force = false);
+    virtual ~HTTPCache();
+
+    string get_cache_root() const;
+
+    void set_cache_enabled(bool mode);
+    bool is_cache_enabled() const;
+
+    void set_cache_disconnected(CacheDisconnectedMode mode);
+    CacheDisconnectedMode get_cache_disconnected() const;
+
+    void set_expire_ignored(bool mode);
+    bool is_expire_ignored() const;
+
+    void set_max_size(unsigned long size);
+    unsigned long get_max_size() const;
+
+    void set_max_entry_size(unsigned long size);
+    unsigned long get_max_entry_size() const;
+
+    void set_default_expiration(int exp_time);
+    int get_default_expiration() const;
+
+    void set_always_validate(bool validate);
+    bool get_always_validate() const;
+
+    void set_cache_control(const vector<string> &cc);
+    vector<string> get_cache_control();
+
+    void lock_cache_interface() {
+    	DBG(cerr << "Locking interface... ");
+    	LOCK(&d_cache_mutex);
+    	DBGN(cerr << "Done" << endl);
+    }    	
+    void unlock_cache_interface() {
+    	DBG(cerr << "Unlocking interface... " );
+    	UNLOCK(&d_cache_mutex);
+    	DBGN(cerr << "Done" << endl);
+    }
+    
+    // This must lock for writing
+    bool cache_response(const string &url, time_t request_time,
+                        const vector<string> &headers, const FILE *body);
+    void update_response(const string &url, time_t request_time,
+                         const vector<string> &headers);
+
+    // This is separate from get_cached_response() because often an invalid
+    // cache entry just needs a header update. That is best left to the HTTP
+    // Connection code.
+    bool is_url_valid(const string &url);
+    
+    // Lock these for reading
+    vector<string> get_conditional_request_headers(const string &url);
+    FILE *get_cached_response(const string &url, vector<string> &headers,
+			      			  string &cacheName);
+    FILE *get_cached_response(const string &url, vector<string> &headers);
+    FILE *get_cached_response(const string &url);
+
+    void release_cached_response(FILE *response);
+
+    void purge_cache();
+};
+
+} // namespace libdap
+
+#endif // _http_cache_h
diff --git a/HTTPCacheDisconnectedMode.h b/HTTPCacheDisconnectedMode.h
new file mode 100644
index 0000000..2adf490
--- /dev/null
+++ b/HTTPCacheDisconnectedMode.h
@@ -0,0 +1,55 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#ifndef _http_cache_disconnected_mode_h
+#define _http_cache_disconnected_mode_h
+
+namespace libdap
+{
+
+/** Disconnected Operation
+
+    The cache can be set to handle disconnected operation where it does not
+    use the network to validate entries and does not attempt to load new
+    documents. All requests that cannot be fulfilled by the cache will be
+    returned with a "504 Gateway Timeout" response. There are two operational
+    disconnected modes:
+
+    No network activity at all: Here it uses its own persistent cache to
+    answer the request, if possible.
+
+    Forward all disconnected requests to a proxy cache: Here it uses the
+    HTTP/1.1 cache-control header to indicate that the proxy should operate in
+    disconnected mode. */
+
+typedef enum {
+    DISCONNECT_NONE     = 0,
+    DISCONNECT_NORMAL   = 1,
+    DISCONNECT_EXTERNAL = 2
+} CacheDisconnectedMode;
+
+} // namespace libdap
+
+#endif // _http_cache_disconnected_mode_h
diff --git a/HTTPCacheInterruptHandler.h b/HTTPCacheInterruptHandler.h
new file mode 100644
index 0000000..bd91ef8
--- /dev/null
+++ b/HTTPCacheInterruptHandler.h
@@ -0,0 +1,95 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#ifndef http_cache_interrupt_handler_h
+#define http_cache_interrupt_handler_h
+
+#include <signal.h>
+
+#include <cassert>
+#include <iostream>
+#include <algorithm>
+
+#include "HTTPCache.h"
+#include "EventHandler.h"
+#include "debug.h"
+
+namespace libdap
+{
+
+static void
+unlink_file(const string &f)
+{
+    unlink(f.c_str());
+}
+
+/** Handle SIGINT for HTTPCache. When the cache is in use and the process is
+    sent SIGINT, we must make sure that the cache is left in a consistent
+    state. This includes removing the lock file, updating the index file and
+    making sure no partially written data or meta data files exist.
+
+    @see EventHandler
+    @see SignalHandler
+    @see HTTPCache
+    @author James Gallagher <jgallagher@opendap.org> */
+class HTTPCacheInterruptHandler : public EventHandler
+{
+private:
+
+public:
+    ///
+    HTTPCacheInterruptHandler()
+    {}
+
+    ///
+    virtual ~HTTPCacheInterruptHandler()
+    {}
+
+    /** Handle SIGINT. This handler first deletes any files opened but not
+    added to the cache index files and then calls
+    HTTPCache::delete_instance().
+
+    @param signum We know it is SIGINT; included here as a check and only
+    when NDEBUG is not defined.
+    @return Never returns. */
+    virtual void handle_signal(int signum)
+    {
+        assert(signum == SIGINT);
+        DBG(cerr << "Inside the HTTPCacheInterruptHandler." << endl);
+
+        vector<string> *of = &HTTPCache::_instance->d_open_files;
+
+        DBG(copy(of->begin(), of->end(),
+                 ostream_iterator<string>(cerr, "\n")));
+
+        for_each(of->begin(), of->end(), unlink_file);
+
+        HTTPCache::delete_instance();
+    }
+};
+
+} // namespace libdap
+
+#endif // http_cache_interrupt_handler_h
diff --git a/HTTPCacheMacros.h b/HTTPCacheMacros.h
new file mode 100644
index 0000000..68bc004
--- /dev/null
+++ b/HTTPCacheMacros.h
@@ -0,0 +1,71 @@
+/*
+ * HTTPCacheMacros.h
+ *
+ *  Created on: Dec 28, 2011
+ *      Author: jimg
+ */
+
+#ifndef HTTPCACHEMACROS_H_
+#define HTTPCACHEMACROS_H_
+
+#ifdef WIN32
+#include <direct.h>
+#include <time.h>
+#include <fcntl.h>
+#define MKDIR(a,b) _mkdir((a))
+#define UMASK(a) _umask((a))
+
+#if 0
+#define REMOVE(a) do { \
+        int s = remove((a)); \
+        if (s != 0) \
+            throw InternalErr(__FILE__, __LINE__, "Cache error; could not remove file: " + long_to_string(s)); \
+    } while(0)
+#endif
+
+#define REMOVE_BOOL(a) remove((a))
+#define REMOVE(a) ((void)remove((a)))
+#define MKSTEMP(a) _open(_mktemp((a)),_O_CREAT,_S_IREAD|_S_IWRITE)
+#define DIR_SEPARATOR_CHAR '\\'
+#define DIR_SEPARATOR_STR "\\"
+
+#else
+#include <cerrno>
+#define MKDIR(a,b) mkdir((a), (b))
+#define UMASK(a) umask((a))
+
+#if 0
+// Replaced this with something that signals errors. jhrg 12/28/2011
+// A great idea, but it breaks things in ways that complicate
+// testing. Push this change forward to H 1.9. jhrg 12/28/2011
+#define REMOVE(a) do { \
+        errno = 0; \
+        int s = remove((a)); \
+        if (s != 0) \
+            throw InternalErr(__FILE__, __LINE__, "Cache error; could not remove file: " + long_to_string(errno)); \
+    } while(0)
+#endif
+
+#define REMOVE_BOOL(a) remove((a))
+#define REMOVE(a) ((void)remove((a)))
+
+#define MKSTEMP(a) mkstemp((a))
+#define DIR_SEPARATOR_CHAR '/'
+#define DIR_SEPARATOR_STR "/"
+#endif
+
+#ifdef WIN32
+#define CACHE_LOCATION "\\tmp\\"
+#define CACHE_ROOT "dods-cache\\"
+#else
+#define CACHE_LOCATION "/tmp/"
+#define CACHE_ROOT "dods-cache/"
+#endif
+
+#define CACHE_INDEX ".index"
+#define CACHE_LOCK ".lock"
+#define CACHE_META ".meta"
+#define CACHE_EMPTY_ETAG "@cache@"
+
+
+#endif /* HTTPCACHEMACROS_H_ */
diff --git a/HTTPCacheResponse.h b/HTTPCacheResponse.h
new file mode 100644
index 0000000..17bc4c6
--- /dev/null
+++ b/HTTPCacheResponse.h
@@ -0,0 +1,91 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#ifndef cache_http_response_h
+#define cache_http_response_h
+
+#include <cstdio>
+
+#ifndef response_h
+#include "Response.h"
+#endif
+
+#ifndef _debug_h
+#include "debug.h"
+#endif
+
+namespace libdap
+{
+
+/** Encapsulate a response. Instead of directly returning the FILE pointer
+    from which a response is read, return an instance of this object. */
+class HTTPCacheResponse : public HTTPResponse
+{
+private:
+    HTTPCache *d_cache;  // pointer to singleton instance
+
+protected:
+    /** @name Suppressed default methods */
+    //@{
+    HTTPCacheResponse();
+    HTTPCacheResponse(const HTTPCacheResponse &rs);
+    HTTPCacheResponse &operator=(const HTTPCacheResponse &);
+    //@}
+
+public:
+    /** Build a Response object. Instances of this class are used to
+    represent responses from a local HTTP/1.1 cache. The stream and
+    headers pointer are passed to the parent (HTTPResponse); there's no
+    temporary file for the parent to manage since the body is read from a
+    file managed by the cache subsystem. This class releases the lock on
+    the cache entry when the destructor is called. */
+    HTTPCacheResponse(FILE *s, int status_code, vector<string> *headers, HTTPCache *c)
+            : HTTPResponse(s, status_code, headers, ""), d_cache(c)
+    {}
+
+    /** Build a Response object. Instances of this class are used to
+    represent responses from a local HTTP/1.1 cache. The stream and
+    headers pointer are passed to the parent (HTTPResponse); there's no
+    temporary file for the parent to manage since the body is read from a
+    file managed by the cache subsystem. This class releases the lock on
+    the cache entry when the destructor is called. */
+    HTTPCacheResponse(FILE *s, int status_code, vector<string> *headers,
+	    const string &file_name, HTTPCache *c)
+            : HTTPResponse(s, status_code, headers, file_name), d_cache(c)
+    {}
+
+    /** Free the cache entry lock. Call the parent's destructor. */
+    virtual ~HTTPCacheResponse()
+    {
+        DBG(cerr << "Freeing HTTPCache resources... ");
+        set_file(""); // This keeps ~HTTPResponse() from removing the cache entry.
+        d_cache->release_cached_response(get_stream());
+        DBGN(cerr << endl);
+    }
+};
+
+} // namespace libdap
+
+#endif // cache_http_response_h
diff --git a/HTTPCacheTable.cc b/HTTPCacheTable.cc
new file mode 100644
index 0000000..1c08806
--- /dev/null
+++ b/HTTPCacheTable.cc
@@ -0,0 +1,887 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#include "config.h"
+
+// #define DODS_DEBUG
+
+// TODO: Remove unneeded includes.
+
+#include <pthread.h>
+#include <limits.h>
+#include <unistd.h>   // for stat
+#include <sys/types.h>  // for stat and mkdir
+#include <sys/stat.h>
+
+#include <cstring>
+#include <cerrno>
+
+#include <iostream>
+#include <sstream>
+#include <algorithm>
+#include <iterator>
+#include <set>
+
+#include "Error.h"
+#include "InternalErr.h"
+#include "ResponseTooBigErr.h"
+#ifndef WIN32
+#include "SignalHandler.h"
+#endif
+#include "HTTPCacheInterruptHandler.h"
+#include "HTTPCacheTable.h"
+#include "HTTPCacheMacros.h"
+
+#include "util_mit.h"
+#include "debug.h"
+
+#ifdef WIN32
+#include <direct.h>
+#include <time.h>
+#include <fcntl.h>
+#define MKDIR(a,b) _mkdir((a))
+#define REMOVE(a) do { \
+		int s = remove((a)); \
+		if (s != 0) \
+			throw InternalErr(__FILE__, __LINE__, "Cache error; could not remove file: " + long_to_string(s)); \
+	} while(0);
+#define MKSTEMP(a) _open(_mktemp((a)),_O_CREAT,_S_IREAD|_S_IWRITE)
+#define DIR_SEPARATOR_CHAR '\\'
+#define DIR_SEPARATOR_STR "\\"
+#else
+#define MKDIR(a,b) mkdir((a), (b))
+#define MKSTEMP(a) mkstemp((a))
+#define DIR_SEPARATOR_CHAR '/'
+#define DIR_SEPARATOR_STR "/"
+#endif
+
+#define CACHE_META ".meta"
+#define CACHE_INDEX ".index"
+#define CACHE_EMPTY_ETAG "@cache@"
+
+#define NO_LM_EXPIRATION 24*3600 // 24 hours
+#define MAX_LM_EXPIRATION 48*3600 // Max expiration from LM
+
+// If using LM to find the expiration then take 10% and no more than
+// MAX_LM_EXPIRATION.
+#ifndef LM_EXPIRATION
+#define LM_EXPIRATION(t) (min((MAX_LM_EXPIRATION), static_cast<int>((t) / 10)))
+#endif
+
+const int CACHE_TABLE_SIZE = 1499;
+
+using namespace std;
+
+namespace libdap {
+
+/** Compute the hash value for a URL.
+    @param url
+    @return An integer hash code between 0 and CACHE_TABLE_SIZE. */
+int
+get_hash(const string &url)
+{
+    int hash = 0;
+
+    for (const char *ptr = url.c_str(); *ptr; ptr++)
+        hash = (int)((hash * 3 + (*(unsigned char *)ptr)) % CACHE_TABLE_SIZE);
+
+    return hash;
+}
+
+HTTPCacheTable::HTTPCacheTable(const string &cache_root, int block_size) :
+    d_cache_root(cache_root), d_block_size(block_size), d_current_size(0), d_new_entries(0)
+{
+    d_cache_index = cache_root + CACHE_INDEX;
+
+    d_cache_table = new CacheEntries*[CACHE_TABLE_SIZE];
+
+    // Initialize the cache table.
+    for (int i = 0; i < CACHE_TABLE_SIZE; ++i)
+	d_cache_table[i] = 0;
+
+    cache_index_read();
+}
+
+/** Called by for_each inside ~HTTPCache().
+    @param e The cache entry to delete. */
+
+static inline void
+delete_cache_entry(HTTPCacheTable::CacheEntry *e)
+{
+    DBG2(cerr << "Deleting CacheEntry: " << e << endl);
+    delete e;
+}
+
+HTTPCacheTable::~HTTPCacheTable()
+{
+    for (int i = 0; i < CACHE_TABLE_SIZE; ++i) {
+        HTTPCacheTable::CacheEntries *cp = get_cache_table()[i];
+        if (cp) {
+            // delete each entry
+            for_each(cp->begin(), cp->end(), delete_cache_entry);
+
+            // now delete the vector that held the entries
+            delete get_cache_table()[i];
+            get_cache_table()[i] = 0;
+        }
+    }
+
+    delete[] d_cache_table;
+}
+
+/** Functor which deletes and nulls a single CacheEntry if it has expired.
+    This functor is called by expired_gc which then uses the
+    erase(remove(...) ...) idiom to really remove all the vector entries that
+    belonged to the deleted CacheEntry objects.
+
+    @see expired_gc. */
+
+class DeleteExpired : public unary_function<HTTPCacheTable::CacheEntry *&, void> {
+	time_t d_time;
+	HTTPCacheTable &d_table;
+
+public:
+	DeleteExpired(HTTPCacheTable &table, time_t t) :
+		d_time(t), d_table(table) {
+		if (!t)
+			d_time = time(0); // 0 == now
+	} 
+
+	void operator()(HTTPCacheTable::CacheEntry *&e) {
+		if (e && !e->readers && (e->freshness_lifetime
+				< (e->corrected_initial_age + (d_time - e->response_time)))) {
+			DBG(cerr << "Deleting expired cache entry: " << e->url << endl);
+			d_table.remove_cache_entry(e);
+			delete e; e = 0;
+		}
+	}
+};
+
+// @param time base deletes againt this time, defaults to 0 (now)
+void HTTPCacheTable::delete_expired_entries(time_t time) {
+	// Walk through and delete all the expired entries.
+	for (int cnt = 0; cnt < CACHE_TABLE_SIZE; cnt++) {
+		HTTPCacheTable::CacheEntries *slot = get_cache_table()[cnt];
+		if (slot) {
+			for_each(slot->begin(), slot->end(), DeleteExpired(*this, time));
+			slot->erase(remove(slot->begin(), slot->end(),
+					static_cast<HTTPCacheTable::CacheEntry *>(0)), slot->end());
+		}
+	}
+}
+
+/** Functor which deletes and nulls a single CacheEntry which has less than
+    or equal to \c hits hits or if it is larger than the cache's
+    max_entry_size property.
+
+    @see hits_gc. */
+
+class DeleteByHits : public unary_function<HTTPCacheTable::CacheEntry *&, void> {
+	HTTPCacheTable &d_table;
+	int d_hits;
+
+public:
+	DeleteByHits(HTTPCacheTable &table, int hits) :
+		d_table(table), d_hits(hits) {
+	}
+
+	void operator()(HTTPCacheTable::CacheEntry *&e) {
+		if (e && !e->readers && e->hits <= d_hits) {
+			DBG(cerr << "Deleting cache entry: " << e->url << endl);
+			d_table.remove_cache_entry(e);
+			delete e; e = 0;
+		}
+	}
+};
+
+void 
+HTTPCacheTable::delete_by_hits(int hits) {
+    for (int cnt = 0; cnt < CACHE_TABLE_SIZE; cnt++) {
+        if (get_cache_table()[cnt]) {
+            HTTPCacheTable::CacheEntries *slot = get_cache_table()[cnt];
+            for_each(slot->begin(), slot->end(), DeleteByHits(*this, hits));
+            slot->erase(remove(slot->begin(), slot->end(),
+                               static_cast<HTTPCacheTable::CacheEntry*>(0)),
+                        slot->end());
+
+        }
+    }
+}
+
+/** Functor which deletes and nulls a single CacheEntry which is larger than 
+    a given size.
+    @see hits_gc. */
+
+class DeleteBySize : public unary_function<HTTPCacheTable::CacheEntry *&, void> {
+	HTTPCacheTable &d_table;
+	unsigned int d_size;
+
+public:
+	DeleteBySize(HTTPCacheTable &table, unsigned int size) :
+		d_table(table), d_size(size) {
+	}
+
+	void operator()(HTTPCacheTable::CacheEntry *&e) {
+		if (e && !e->readers && e->size > d_size) {
+			DBG(cerr << "Deleting cache entry: " << e->url << endl);
+			d_table.remove_cache_entry(e);
+			delete e; e = 0;
+		}
+	}
+};
+
+void HTTPCacheTable::delete_by_size(unsigned int size) {
+    for (int cnt = 0; cnt < CACHE_TABLE_SIZE; cnt++) {
+        if (get_cache_table()[cnt]) {
+            HTTPCacheTable::CacheEntries *slot = get_cache_table()[cnt];
+            for_each(slot->begin(), slot->end(), DeleteBySize(*this, size));
+            slot->erase(remove(slot->begin(), slot->end(),
+                               static_cast<HTTPCacheTable::CacheEntry*>(0)),
+                        slot->end());
+
+        }
+    }
+}
+
+/** @name Cache Index
+
+    These methods manage the cache's index file. Each cache holds an index
+    file named \c .index which stores the cache's state information. */
+
+//@{
+
+/** Remove the cache index file.
+
+    A private method.
+
+    @return True if the file was deleted, otherwise false. */
+
+bool
+HTTPCacheTable::cache_index_delete()
+{
+	d_new_entries = 0;
+	
+    return (REMOVE_BOOL(d_cache_index.c_str()) == 0);
+}
+
+/** Read the saved set of cached entries from disk. Consistency between the
+    in-memory cache and the index is maintained by only reading the index
+    file when the HTTPCache object is created!
+
+    A private method.
+
+    @return True when a cache index was found and read, false otherwise. */
+
+bool
+HTTPCacheTable::cache_index_read()
+{
+    FILE *fp = fopen(d_cache_index.c_str(), "r");
+    // If the cache index can't be opened that's OK; start with an empty
+    // cache. 09/05/02 jhrg
+    if (!fp) {
+        return false;
+    }
+
+    char line[1024];
+    while (!feof(fp) && fgets(line, 1024, fp)) {
+    	add_entry_to_cache_table(cache_index_parse_line(line));
+        DBG2(cerr << line << endl);
+    }
+
+    int res = fclose(fp) ;
+    if (res) {
+        DBG(cerr << "HTTPCache::cache_index_read - Failed to close " << (void *)fp << endl);
+    }
+
+    d_new_entries = 0;
+    
+    return true;
+}
+
+/** Parse one line of the index file.
+
+    A private method.
+
+    @param line A single line from the \c .index file.
+    @return A CacheEntry initialized with the information from \c line. */
+
+HTTPCacheTable::CacheEntry *
+HTTPCacheTable::cache_index_parse_line(const char *line)
+{
+    // Read the line and create the cache object
+	HTTPCacheTable::CacheEntry *entry = new HTTPCacheTable::CacheEntry;
+    istringstream iss(line);
+    iss >> entry->url;
+    iss >> entry->cachename;
+
+    iss >> entry->etag;
+    if (entry->etag == CACHE_EMPTY_ETAG)
+        entry->etag = "";
+
+    iss >> entry->lm;
+    iss >> entry->expires;
+    iss >> entry->size;
+    iss >> entry->range; // range is not used. 10/02/02 jhrg
+
+    iss >> entry->hash;
+    iss >> entry->hits;
+    iss >> entry->freshness_lifetime;
+    iss >> entry->response_time;
+    iss >> entry->corrected_initial_age;
+
+    iss >> entry->must_revalidate;
+
+    return entry;
+}
+
+/** Functor which writes a single CacheEntry to the \c .index file. */
+
+class WriteOneCacheEntry :
+	public unary_function<HTTPCacheTable::CacheEntry *, void>
+{
+
+    FILE *d_fp;
+
+public:
+    WriteOneCacheEntry(FILE *fp) : d_fp(fp)
+    {}
+
+    void operator()(HTTPCacheTable::CacheEntry *e)
+    {
+        if (e && fprintf(d_fp,
+                         "%s %s %s %ld %ld %ld %c %d %d %ld %ld %ld %c\r\n",
+                         e->url.c_str(),
+                         e->cachename.c_str(),
+                         e->etag == "" ? CACHE_EMPTY_ETAG : e->etag.c_str(),
+                         (long)(e->lm),
+                         (long)(e->expires),
+                         e->size,
+                         e->range ? '1' : '0', // not used. 10/02/02 jhrg
+                         e->hash,
+                         e->hits,
+                         (long)(e->freshness_lifetime),
+                         (long)(e->response_time),
+                         (long)(e->corrected_initial_age),
+                         e->must_revalidate ? '1' : '0') < 0)
+            throw Error(internal_error, "Cache Index. Error writing cache index\n");
+    }
+};
+
+/** Walk through the list of cached objects and write the cache index file to
+    disk. If the file does not exist, it is created. If the file does exist,
+    it is overwritten. As a side effect, zero the new_entries counter.
+
+    A private method.
+
+    @exception Error Thrown if the index file cannot be opened for writing.
+    @note The HTTPCache destructor calls this method and silently ignores
+    this exception. */
+void
+HTTPCacheTable::cache_index_write()
+{
+    DBG(cerr << "Cache Index. Writing index " << d_cache_index << endl);
+
+    // Open the file for writing.
+    FILE * fp = NULL;
+    if ((fp = fopen(d_cache_index.c_str(), "wb")) == NULL) {
+        throw Error(string("Cache Index. Can't open `") + d_cache_index
+                    + string("' for writing"));
+    }
+
+    // Walk through the list and write it out. The format is really
+    // simple as we keep it all in ASCII.
+
+    for (int cnt = 0; cnt < CACHE_TABLE_SIZE; cnt++) {
+        HTTPCacheTable::CacheEntries *cp = get_cache_table()[cnt];
+        if (cp)
+            for_each(cp->begin(), cp->end(), WriteOneCacheEntry(fp));
+    }
+
+    /* Done writing */
+    int res = fclose(fp);
+    if (res) {
+        DBG(cerr << "HTTPCache::cache_index_write - Failed to close "
+            << (void *)fp << endl);
+    }
+
+    d_new_entries = 0;
+}
+
+//@} End of the cache index methods.
+/** Create the directory path for cache file. The cache uses a set of
+    directories within d_cache_root to store individual responses. The name
+    of the directory that holds a given response is the value returned by the
+    get_hash() function (i.e., it's a number). If the directory exists, this
+    method does nothing.
+
+    A private method.
+
+    @param hash The hash value (i.e., directory name). An integer between 0
+    and CACHE_TABLE_SIZE (See HTTPCache.h).
+    @return The pathname to the directory (even if it already existed).
+    @exception Error Thrown if the directory cannot be created.*/
+
+string
+HTTPCacheTable::create_hash_directory(int hash)
+{
+#if 0
+    struct stat stat_info;
+    ostringstream path;
+
+    path << d_cache_root << hash;
+    string p = path.str();
+
+    if (stat(p.c_str(), &stat_info) == -1) {
+        DBG2(cerr << "Cache....... Create dir " << p << endl);
+        if (MKDIR(p.c_str(), 0777) < 0) {
+            DBG2(cerr << "Cache....... Can't create..." << endl);
+            throw Error("Could not create cache slot to hold response! Check the write permissions on your disk cache directory. Cache root: " + d_cache_root + ".");
+        }
+    }
+    else {
+        DBG2(cerr << "Cache....... Directory " << p << " already exists"
+             << endl);
+    }
+
+    return p;
+#endif
+
+    ostringstream path;
+    path << d_cache_root << hash;
+
+    // Save the mask
+    mode_t mask = umask(0);
+
+    // Ignore the error if the directory exists
+    errno = 0;
+    if (mkdir(path.str().c_str(), 0777) < 0 && errno != EEXIST) {
+        umask(mask);
+        throw Error(internal_error, "Could not create the directory for the cache at '" + path.str() + "' (" + strerror(errno) + ").");
+    }
+
+    // Restore themask
+    umask(mask);
+
+    return path.str();
+}
+
+/** Create the directory for this url (using the hash value from get_hash())
+    and a file within that directory to hold the response's information. The
+    cache name and cache_body_fd fields of \c entry are updated.
+
+    mkstemp opens the file it creates, which is a good thing but it makes
+    tracking resources hard for the HTTPCache object (because an exception
+    might cause a file descriptor resource leak). So I close that file
+    descriptor here.
+
+    A private method.
+
+    @param entry The cache entry object to operate on.
+    @exception Error If the file for the response's body cannot be created. */
+
+void
+HTTPCacheTable::create_location(HTTPCacheTable::CacheEntry *entry)
+{
+    string hash_dir = create_hash_directory(entry->hash);
+#ifdef WIN32
+    hash_dir += "\\dodsXXXXXX";
+#else
+    hash_dir += "/dodsXXXXXX"; // mkstemp uses six characters.
+#endif
+
+    // mkstemp uses the storage passed to it; must be writable and local.
+    // char *templat = new char[hash_dir.size() + 1];
+    vector<char> templat(hash_dir.size() + 1);
+    strncpy(&templat[0], hash_dir.c_str(), hash_dir.size() + 1);
+
+    // Open truncated for update. NB: mkstemp() returns a file descriptor.
+    // man mkstemp says "... The file is opened with the O_EXCL flag,
+    // guaranteeing that when mkstemp returns successfully we are the only
+    // user." 09/19/02 jhrg
+#ifndef WIN32
+    // Make sure that temp files are accessible only by the owner.
+    umask(077);
+#endif
+    int fd = MKSTEMP(&templat[0]); // fd mode is 666 or 600 (Unix)
+    if (fd < 0) {
+        // delete[] templat; templat = 0;
+        // close(fd); Calling close() when fd is < 0 is a bad idea! jhrg 7/2/15
+        throw Error(internal_error, "The HTTP Cache could not create a file to hold the response; it will not be cached.");
+    }
+
+    entry->cachename = &templat[0];
+    // delete[] templat; templat = 0;
+    close(fd);
+}
+
+
+/** compute real disk space for an entry. */
+static inline int
+entry_disk_space(int size, unsigned int block_size)
+{
+    unsigned int num_of_blocks = (size + block_size) / block_size;
+    
+    DBG(cerr << "size: " << size << ", block_size: " << block_size
+        << ", num_of_blocks: " << num_of_blocks << endl);
+
+    return num_of_blocks * block_size;
+}
+
+/** @name Methods to manipulate instances of CacheEntry. */
+
+//@{
+
+/** Add a CacheEntry to the cache table. As each entry is read, load it into
+    the in-memory cache table and update the HTTPCache's current_size. The
+    later is used by the garbage collection method.
+
+    @param entry The CacheEntry instance to add. */
+void
+HTTPCacheTable::add_entry_to_cache_table(CacheEntry *entry)
+{
+    int hash = entry->hash;
+    if (hash > CACHE_TABLE_SIZE-1 || hash < 0)
+        throw InternalErr(__FILE__, __LINE__, "Hash value too large!");
+
+    if (!d_cache_table[hash])
+        d_cache_table[hash] = new CacheEntries;
+
+    d_cache_table[hash]->push_back(entry);
+    
+    DBG(cerr << "add_entry_to_cache_table, current_size: " << d_current_size
+        << ", entry->size: " << entry->size << ", block size: " << d_block_size 
+        << endl);
+    
+    d_current_size += entry_disk_space(entry->size, d_block_size);
+
+    DBG(cerr << "add_entry_to_cache_table, current_size: " << d_current_size << endl);
+    
+    increment_new_entries();
+}
+
+/** Get a pointer to a CacheEntry from the cache table.
+
+    @param url Look for this URL. */
+HTTPCacheTable::CacheEntry *
+HTTPCacheTable::get_locked_entry_from_cache_table(const string &url) /*const*/
+{
+    return get_locked_entry_from_cache_table(get_hash(url), url);
+}
+
+/** Get a pointer to a CacheEntry from the cache table. Providing a way to
+    pass the hash code into this method makes it easier to test for correct
+    behavior when two entries collide. 10/07/02 jhrg
+
+    @param hash The hash code for \c url.
+    @param url Look for this URL.
+    @return The matching CacheEntry instance or NULL if none was found. */
+HTTPCacheTable::CacheEntry *
+HTTPCacheTable::get_locked_entry_from_cache_table(int hash, const string &url) /*const*/
+{
+    DBG(cerr << "url: " << url << "; hash: " << hash << endl);
+    DBG(cerr << "d_cache_table: " << hex << d_cache_table << dec << endl);
+    if (d_cache_table[hash]) {
+	CacheEntries *cp = d_cache_table[hash];
+	for (CacheEntriesIter i = cp->begin(); i != cp->end(); ++i) {
+	    // Must test *i because perform_garbage_collection may have
+	    // removed this entry; the CacheEntry will then be null.
+	    if ((*i) && (*i)->url == url) {
+		(*i)->lock_read_response(); // Lock the response
+		return *i;
+	    }
+	}
+    }
+
+    return 0;
+}
+
+/** Get a pointer to a CacheEntry from the cache table. Providing a way to
+    pass the hash code into this method makes it easier to test for correct
+    behavior when two entries collide. 10/07/02 jhrg
+
+    @param url Look for this URL.
+    @return The matching CacheEntry instance or NULL if none was found. */
+HTTPCacheTable::CacheEntry *
+HTTPCacheTable::get_write_locked_entry_from_cache_table(const string &url)
+{
+	int hash = get_hash(url);
+    if (d_cache_table[hash]) {
+        CacheEntries *cp = d_cache_table[hash];
+        for (CacheEntriesIter i = cp->begin(); i != cp->end(); ++i) {
+            // Must test *i because perform_garbage_collection may have
+            // removed this entry; the CacheEntry will then be null.
+            if ((*i) && (*i)->url == url) {
+            	(*i)->lock_write_response();	// Lock the response
+            	return *i;
+            }
+        }
+    }
+
+    return 0;
+}
+
+/** Remove a CacheEntry. This means delete the entry's files on disk and free
+    the CacheEntry object. The caller should null the entry's pointer in the
+    cache_table. The total size of the cache is decremented once the entry is
+    deleted.
+
+    @param entry The CacheEntry to delete.
+    @exception InternalErr Thrown if \c entry is in use. */
+void
+HTTPCacheTable::remove_cache_entry(HTTPCacheTable::CacheEntry *entry)
+{
+    // This should never happen; all calls to this method are protected by
+    // the caller, hence the InternalErr.
+    if (entry->readers)
+        throw InternalErr(__FILE__, __LINE__, "Tried to delete a cache entry that is in use.");
+
+    REMOVE(entry->cachename.c_str());
+    REMOVE(string(entry->cachename + CACHE_META).c_str());
+
+    DBG(cerr << "remove_cache_entry, current_size: " << get_current_size() << endl);
+
+    unsigned int eds = entry_disk_space(entry->size, get_block_size());
+    set_current_size((eds > get_current_size()) ? 0 : get_current_size() - eds);
+    
+    DBG(cerr << "remove_cache_entry, current_size: " << get_current_size() << endl);
+}
+
+/** Functor which deletes and nulls a CacheEntry if the given entry matches
+    the url. */
+class DeleteCacheEntry: public unary_function<HTTPCacheTable::CacheEntry *&, void>
+{
+    string d_url;
+    HTTPCacheTable *d_cache_table;
+
+public:
+    DeleteCacheEntry(HTTPCacheTable *c, const string &url)
+            : d_url(url), d_cache_table(c)
+    {}
+
+    void operator()(HTTPCacheTable::CacheEntry *&e)
+    {
+        if (e && e->url == d_url) {
+        	e->lock_write_response();
+            d_cache_table->remove_cache_entry(e);
+        	e->unlock_write_response();
+            delete e; e = 0;
+        }
+    }
+};
+
+/** Find the CacheEntry for the given url and remove both its information in
+    the persistent store and the entry in d_cache_table. If \c url is not in
+    the cache, this method does nothing.
+
+    @param url Remove this URL's entry.
+    @exception InternalErr Thrown if the CacheEntry for \c url is locked. */
+void
+HTTPCacheTable::remove_entry_from_cache_table(const string &url)
+{
+    int hash = get_hash(url);
+    if (d_cache_table[hash]) {
+        CacheEntries *cp = d_cache_table[hash];
+        for_each(cp->begin(), cp->end(), DeleteCacheEntry(this, url));
+        cp->erase(remove(cp->begin(), cp->end(), static_cast<HTTPCacheTable::CacheEntry*>(0)),
+                  cp->end());
+    }
+}
+
+/** Functor to delete and null all unlocked HTTPCacheTable::CacheEntry objects. */
+
+class DeleteUnlockedCacheEntry: public unary_function<HTTPCacheTable::CacheEntry *&, void> {
+    HTTPCacheTable &d_table;
+
+public:
+    DeleteUnlockedCacheEntry(HTTPCacheTable &t) :
+	d_table(t)
+    {
+    }
+    void operator()(HTTPCacheTable::CacheEntry *&e)
+    {
+	if (e) {
+	    d_table.remove_cache_entry(e);
+	    delete e;
+	    e = 0;
+	}
+    }
+};
+
+void HTTPCacheTable::delete_all_entries()
+{
+    // Walk through the cache table and, for every entry in the cache, delete
+    // it on disk and in the cache table.
+    for (int cnt = 0; cnt < CACHE_TABLE_SIZE; cnt++) {
+	HTTPCacheTable::CacheEntries *slot = get_cache_table()[cnt];
+	if (slot) {
+	    for_each(slot->begin(), slot->end(), DeleteUnlockedCacheEntry(*this));
+	    slot->erase(remove(slot->begin(), slot->end(), static_cast<HTTPCacheTable::CacheEntry *> (0)), slot->end());
+	}
+    }
+
+    cache_index_delete();
+}
+
+/** Calculate the corrected_initial_age of the object. We use the time when
+    this function is called as the response_time as this is when we have
+    received the complete response. This may cause a delay if the response
+    header is very big but should not cause any incorrect behavior.
+
+    A private method.
+
+    @param entry The CacheEntry object.
+    @param default_expiration The default value of the cached object's
+    expiration time.
+    @param request_time When was the request made? I think this value must be
+    passed into the method that calls this method... */
+
+void
+HTTPCacheTable::calculate_time(HTTPCacheTable::CacheEntry *entry, int default_expiration, time_t request_time)
+{
+    entry->response_time = time(NULL);
+    time_t apparent_age = max(0, static_cast<int>(entry->response_time - entry->date));
+    time_t corrected_received_age = max(apparent_age, entry->age);
+    time_t response_delay = entry->response_time - request_time;
+    entry->corrected_initial_age = corrected_received_age + response_delay;
+
+    // Estimate an expires time using the max-age and expires time. If we
+    // don't have an explicit expires time then set it to 10% of the LM date
+    // (although max 24 h). If no LM date is available then use 24 hours.
+    time_t freshness_lifetime = entry->max_age;
+    if (freshness_lifetime < 0) {
+        if (entry->expires < 0) {
+            if (entry->lm < 0) {
+                freshness_lifetime = default_expiration;
+            }
+            else {
+                freshness_lifetime = LM_EXPIRATION(entry->date - entry->lm);
+            }
+        }
+        else
+            freshness_lifetime = entry->expires - entry->date;
+    }
+
+    entry->freshness_lifetime = max(0, static_cast<int>(freshness_lifetime));
+
+    DBG2(cerr << "Cache....... Received Age " << entry->age
+         << ", corrected " << entry->corrected_initial_age
+         << ", freshness lifetime " << entry->freshness_lifetime << endl);
+}
+
+/** Parse various headers from the vector (which can be retrieved from
+    libcurl once a response is received) and load the CacheEntry object with
+    values. This method should only be called with headers from a response
+    (it should not be used to parse request headers).
+
+    A private method.
+
+    @param entry Store values from the headers here.
+    @param max_entry_size DO not cache entries larger than this.
+    @param headers A vector of header lines. */
+
+void HTTPCacheTable::parse_headers(HTTPCacheTable::CacheEntry *entry, unsigned long max_entry_size,
+	const vector<string> &headers)
+{
+    vector<string>::const_iterator i;
+    for (i = headers.begin(); i != headers.end(); ++i) {
+	// skip a blank header.
+	if ((*i).empty())
+	    continue;
+
+	string::size_type colon = (*i).find(':');
+
+	// skip a header with no colon in it.
+	if (colon == string::npos)
+	    continue;
+
+	string header = (*i).substr(0, (*i).find(':'));
+	string value = (*i).substr((*i).find(": ") + 2);
+	DBG2(cerr << "Header: " << header << endl);DBG2(cerr << "Value: " << value << endl);
+
+	if (header == "ETag") {
+	    entry->etag = value;
+	}
+	else if (header == "Last-Modified") {
+	    entry->lm = parse_time(value.c_str());
+	}
+	else if (header == "Expires") {
+	    entry->expires = parse_time(value.c_str());
+	}
+	else if (header == "Date") {
+	    entry->date = parse_time(value.c_str());
+	}
+	else if (header == "Age") {
+	    entry->age = parse_time(value.c_str());
+	}
+	else if (header == "Content-Length") {
+	    unsigned long clength = strtoul(value.c_str(), 0, 0);
+	    if (clength > max_entry_size)
+		entry->set_no_cache(true);
+	}
+	else if (header == "Cache-Control") {
+	    // Ignored Cache-Control values: public, private, no-transform,
+	    // proxy-revalidate, s-max-age. These are used by shared caches.
+	    // See section 14.9 of RFC 2612. 10/02/02 jhrg
+	    if (value == "no-cache" || value == "no-store")
+		// Note that we *can* store a 'no-store' response in volatile
+		// memory according to RFC 2616 (section 14.9.2) but those
+		// will be rare coming from DAP servers. 10/02/02 jhrg
+		entry->set_no_cache(true);
+	    else if (value == "must-revalidate")
+		entry->must_revalidate = true;
+	    else if (value.find("max-age") != string::npos) {
+		string max_age = value.substr(value.find("=" + 1));
+		entry->max_age = parse_time(max_age.c_str());
+	    }
+	}
+    }
+}
+
+//@} End of the CacheEntry methods.
+
+// @TODO Change name to record locked response
+void HTTPCacheTable::bind_entry_to_data(HTTPCacheTable::CacheEntry *entry, FILE *body) {
+	entry->hits++;  // Mark hit
+    d_locked_entries[body] = entry; // record lock, see release_cached_r...
+}
+
+void HTTPCacheTable::uncouple_entry_from_data(FILE *body) {
+
+    HTTPCacheTable::CacheEntry *entry = d_locked_entries[body];
+    if (!entry)
+        throw InternalErr("There is no cache entry for the response given.");
+
+    d_locked_entries.erase(body);
+    entry->unlock_read_response();
+
+    if (entry->readers < 0)
+        throw InternalErr("An unlocked entry was released");
+}
+
+bool HTTPCacheTable::is_locked_read_responses() {
+	return !d_locked_entries.empty();
+}
+
+} // namespace libdap
diff --git a/HTTPCacheTable.h b/HTTPCacheTable.h
new file mode 100644
index 0000000..fddc92c
--- /dev/null
+++ b/HTTPCacheTable.h
@@ -0,0 +1,369 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2008 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#ifndef _http_cache_table_h
+#define _http_cache_table_h
+
+//#define DODS_DEBUG
+
+#include <pthread.h>
+
+#ifdef WIN32
+#include <io.h>   // stat for win32? 09/05/02 jhrg
+#endif
+
+#include <cstring>
+
+#include <string>
+#include <vector>
+#include <map>
+
+#ifndef _http_cache_h
+#include "HTTPCache.h"
+#endif
+
+#ifndef _error_h
+#include "Error.h"
+#endif
+
+#ifndef _internalerr_h
+#include "InternalErr.h"
+#endif
+
+#ifndef _util_h
+#include "util.h"
+#endif
+
+#ifndef _debug_h
+#include "debug.h"
+#endif
+
+ //long_to_string(code));
+#define LOCK(m) do { \
+	int code = pthread_mutex_lock((m)); \
+	if (code != 0) \
+		throw InternalErr(__FILE__, __LINE__, string("Mutex lock: ") + strerror(code)); \
+    } while(0);
+
+//+ long_to_string(code));
+#define UNLOCK(m) do { \
+	int code = pthread_mutex_unlock((m)); \
+	if (code != 0) \
+		throw InternalErr(__FILE__, __LINE__, string("Mutex unlock: ") + strerror(code)); \
+    } while(0);
+
+#define TRYLOCK(m) pthread_mutex_trylock((m))
+#define INIT(m) pthread_mutex_init((m), 0)
+#define DESTROY(m) pthread_mutex_destroy((m))
+
+//using namespace std;
+
+namespace libdap {
+
+int get_hash(const string &url);
+
+/** The table of entries in the client-side cache. This class maintains a table
+ of CacheEntries, where one instance of CacheEntry is made for
+ each item in the cache. When an item is accessed it is either
+ locked for reading or writing. When locked for reading the entry is
+ recorded on a list of read-locked entries. The caller must explicitly
+ free the entry for it to be removed from this list (which is the only
+ way it can be opened for writing). An entry can be accessed by multiple
+ readers but only one writer.
+
+ @note The CacheEntry class used to contain a lock that was used to ensure
+ that the entry was locked during any changes to any of its fields. That
+ has been removed - its now the responsibility of the caller. This change
+ was made because it's likely the caller will need to lock all of the methods
+ that operate on a CacheEntry anyway, so the CacheEntry-specific lock was
+ redundant. */
+class HTTPCacheTable {
+public:
+    /** A struct used to store information about responses in the
+     cache's volatile memory.
+
+     About entry locking: An entry is locked using both a mutex and a
+     counter. The counter keeps track of how many clients are accessing a
+     given entry while the mutex provides a guarantee that updates to the
+     counter are MT-safe. In addition, the HTTPCacheTable object maintains a
+     map which binds the FILE* returned to a client with a given entry.
+     This way the client can tell the HTTPCacheTable object that it is done
+     with <code>FILE *response</code> and the class can arrange to update
+     the lock counter and mutex. */
+    struct CacheEntry {
+    private:
+        string url; // Location
+        int hash;
+        int hits; // Hit counts
+        string cachename;
+
+        string etag;
+        time_t lm; // Last modified
+        time_t expires;
+        time_t date; // From the response header.
+        time_t age;
+        time_t max_age; // From Cache-Control
+
+        unsigned long size; // Size of cached entity body
+        bool range; // Range is not currently supported. 10/02/02 jhrg
+
+        time_t freshness_lifetime;
+        time_t response_time;
+        time_t corrected_initial_age;
+
+        bool must_revalidate;
+        bool no_cache; // This field is not saved in the index.
+
+        int readers;
+        pthread_mutex_t d_response_lock; // set if being read
+        pthread_mutex_t d_response_write_lock; // set if being written
+
+        // Allow HTTPCacheTable methods access and the test class, too
+        friend class HTTPCacheTable;
+        friend class HTTPCacheTest;
+
+        // Allow access by the functors used in HTTPCacheTable
+        friend class DeleteCacheEntry;
+        friend class WriteOneCacheEntry;
+        friend class DeleteExpired;
+        friend class DeleteByHits;
+        friend class DeleteBySize;
+
+    public:
+        string get_cachename()
+        {
+            return cachename;
+        }
+        string get_etag()
+        {
+            return etag;
+        }
+        time_t get_lm()
+        {
+            return lm;
+        }
+        time_t get_expires()
+        {
+            return expires;
+        }
+        time_t get_max_age()
+        {
+            return max_age;
+        }
+        void set_size(unsigned long sz)
+        {
+            size = sz;
+        }
+        time_t get_freshness_lifetime()
+        {
+            return freshness_lifetime;
+        }
+        time_t get_response_time()
+        {
+            return response_time;
+        }
+        time_t get_corrected_initial_age()
+        {
+            return corrected_initial_age;
+        }
+        bool get_must_revalidate()
+        {
+            return must_revalidate;
+        }
+        void set_no_cache(bool state)
+        {
+            no_cache = state;
+        }
+        bool is_no_cache()
+        {
+            return no_cache;
+        }
+
+        void lock_read_response()
+        {
+            DBG(cerr << "Try locking read response... (" << hex << &d_response_lock << dec << ") ");
+            int status = TRYLOCK(&d_response_lock);
+            if (status != 0 /*&& status == EBUSY*/) {
+                // If locked, wait for any writers
+                LOCK(&d_response_write_lock);
+                UNLOCK(&d_response_write_lock);
+            }
+
+            readers++; // Record number of readers
+
+            DBGN(cerr << "Done" << endl);
+
+        }
+
+        void unlock_read_response()
+        {
+            readers--;
+            if (readers == 0) {
+                DBG(cerr << "Unlocking read response... (" << hex << &d_response_lock << dec << ") ");
+                UNLOCK(&d_response_lock); DBGN(cerr << "Done" << endl);
+            }
+        }
+
+        void lock_write_response()
+        {
+            DBG(cerr << "locking write response... (" << hex << &d_response_lock << dec << ") ");
+            LOCK(&d_response_lock);
+            LOCK(&d_response_write_lock); DBGN(cerr << "Done" << endl);
+        }
+
+        void unlock_write_response()
+        {
+            DBG(cerr << "Unlocking write response... (" << hex << &d_response_lock << dec << ") ");
+            UNLOCK(&d_response_write_lock);
+            UNLOCK(&d_response_lock); DBGN(cerr << "Done" << endl);
+        }
+
+        CacheEntry() :
+            url(""), hash(-1), hits(0), cachename(""), etag(""), lm(-1), expires(-1), date(-1), age(-1), max_age(-1), size(
+                0), range(false), freshness_lifetime(0), response_time(0), corrected_initial_age(0), must_revalidate(
+                false), no_cache(false), readers(0)
+        {
+            INIT(&d_response_lock);
+            INIT(&d_response_write_lock);
+        }
+        CacheEntry(const string &u) :
+            url(u), hash(-1), hits(0), cachename(""), etag(""), lm(-1), expires(-1), date(-1), age(-1), max_age(-1), size(
+                0), range(false), freshness_lifetime(0), response_time(0), corrected_initial_age(0), must_revalidate(
+                false), no_cache(false), readers(0)
+        {
+            INIT(&d_response_lock);
+            INIT(&d_response_write_lock);
+            hash = get_hash(url);
+        }
+    };
+
+    // Typedefs for CacheTable. A CacheTable is a vector of vectors of
+    // CacheEntries. The outer vector is accessed using the hash value.
+    // Entries with matching hashes occupy successive positions in the inner
+    // vector (that's how hash collisions are resolved). Search the inner
+    // vector for a specific match.
+    typedef vector<CacheEntry *> CacheEntries;
+    typedef CacheEntries::iterator CacheEntriesIter;
+
+    typedef CacheEntries **CacheTable;    // Array of pointers to CacheEntries
+
+    friend class HTTPCacheTest;
+
+private:
+    CacheTable d_cache_table;
+
+    string d_cache_root;
+    unsigned int d_block_size; // File block size.
+    unsigned long d_current_size;
+
+    string d_cache_index;
+    int d_new_entries;
+
+    map<FILE *, HTTPCacheTable::CacheEntry *> d_locked_entries;
+
+    // Make these private to prevent use
+    HTTPCacheTable(const HTTPCacheTable &);
+    HTTPCacheTable &operator=(const HTTPCacheTable &);
+    HTTPCacheTable();
+
+    CacheTable &get_cache_table()
+    {
+        return d_cache_table;
+    }
+
+    CacheEntry *get_locked_entry_from_cache_table(int hash, const string &url); /*const*/
+
+public:
+    HTTPCacheTable(const string &cache_root, int block_size);
+    ~HTTPCacheTable();
+
+    //@{ @name Accessors/Mutators
+    unsigned long get_current_size() const
+    {
+        return d_current_size;
+    }
+    void set_current_size(unsigned long sz)
+    {
+        d_current_size = sz;
+    }
+
+    unsigned int get_block_size() const
+    {
+        return d_block_size;
+    }
+    void set_block_size(unsigned int sz)
+    {
+        d_block_size = sz;
+    }
+
+    int get_new_entries() const
+    {
+        return d_new_entries;
+    }
+    void increment_new_entries()
+    {
+        ++d_new_entries;
+    }
+
+    string get_cache_root()
+    {
+        return d_cache_root;
+    }
+    void set_cache_root(const string &cr)
+    {
+        d_cache_root = cr;
+    }
+    //@}
+
+    void delete_expired_entries(time_t time = 0);
+    void delete_by_hits(int hits);
+    void delete_by_size(unsigned int size);
+    void delete_all_entries();
+
+    bool cache_index_delete();
+    bool cache_index_read();
+    CacheEntry *cache_index_parse_line(const char *line);
+    void cache_index_write();
+
+    string create_hash_directory(int hash);
+    void create_location(CacheEntry *entry);
+
+    void add_entry_to_cache_table(CacheEntry *entry);
+    void remove_cache_entry(HTTPCacheTable::CacheEntry *entry);
+
+    void remove_entry_from_cache_table(const string &url);
+    CacheEntry *get_locked_entry_from_cache_table(const string &url);
+    CacheEntry *get_write_locked_entry_from_cache_table(const string &url);
+
+    void calculate_time(HTTPCacheTable::CacheEntry *entry, int default_expiration, time_t request_time);
+    void parse_headers(HTTPCacheTable::CacheEntry *entry, unsigned long max_entry_size, const vector<string> &headers);
+
+    // These should move back to HTTPCache
+    void bind_entry_to_data(CacheEntry *entry, FILE *body);
+    void uncouple_entry_from_data(FILE *body);
+    bool is_locked_read_responses();
+};
+
+} // namespace libdap
+#endif
diff --git a/HTTPConnect.cc b/HTTPConnect.cc
new file mode 100644
index 0000000..d14bd28
--- /dev/null
+++ b/HTTPConnect.cc
@@ -0,0 +1,1076 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+
+#include "config.h"
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include <sys/stat.h>
+
+#ifdef WIN32
+#include <io.h>
+#endif
+
+#include <string>
+#include <vector>
+#include <functional>
+#include <algorithm>
+#include <sstream>
+#include <fstream>
+#include <iterator>
+#include <cstdlib>
+#include <cstring>
+#include <cerrno>
+
+//#define DODS_DEBUG2
+//#define HTTP_TRACE
+//#define DODS_DEBUG
+
+#undef USE_GETENV
+
+
+#include "debug.h"
+#include "mime_util.h"
+#include "media_types.h"
+#include "GNURegex.h"
+#include "HTTPCache.h"
+#include "HTTPConnect.h"
+#include "RCReader.h"
+#include "HTTPResponse.h"
+#include "HTTPCacheResponse.h"
+
+using namespace std;
+
+namespace libdap {
+
+// These global variables are not MT-Safe, but I'm leaving them as is because
+// they are used only for debugging (set them in a debugger like gdb or ddd).
+// They are not static because I think that many debuggers cannot access
+// static variables. 08/07/02 jhrg
+
+// Set this to 1 to turn on libcurl's verbose mode (for debugging).
+int www_trace = 0;
+
+// Keep the temporary files; useful for debugging.
+int dods_keep_temps = 0;
+
+#define CLIENT_ERR_MIN 400
+#define CLIENT_ERR_MAX 417
+static const char *http_client_errors[CLIENT_ERR_MAX - CLIENT_ERR_MIN +1] =
+    {
+        "Bad Request:",
+        "Unauthorized: Contact the server administrator.",
+        "Payment Required.",
+        "Forbidden: Contact the server administrator.",
+        "Not Found: The data source or server could not be found.\n\
+        Often this means that the OPeNDAP server is missing or needs attention;\n\
+        Please contact the server administrator.",
+        "Method Not Allowed.",
+        "Not Acceptable.",
+        "Proxy Authentication Required.",
+        "Request Time-out.",
+        "Conflict.",
+        "Gone:.",
+        "Length Required.",
+        "Precondition Failed.",
+        "Request Entity Too Large.",
+        "Request URI Too Large.",
+        "Unsupported Media Type.",
+        "Requested Range Not Satisfiable.",
+        "Expectation Failed."
+    };
+
+#define SERVER_ERR_MIN 500
+#define SERVER_ERR_MAX 505
+static const char *http_server_errors[SERVER_ERR_MAX - SERVER_ERR_MIN + 1] =
+    {
+        "Internal Server Error.",
+        "Not Implemented.",
+        "Bad Gateway.",
+        "Service Unavailable.",
+        "Gateway Time-out.",
+        "HTTP Version Not Supported."
+    };
+
+/** This function translates the HTTP status codes into error messages. It
+    works for those code greater than or equal to 400. */
+static string
+http_status_to_string(int status)
+{
+    if (status >= CLIENT_ERR_MIN && status <= CLIENT_ERR_MAX)
+        return string(http_client_errors[status - CLIENT_ERR_MIN]);
+    else if (status >= SERVER_ERR_MIN && status <= SERVER_ERR_MAX)
+        return string(http_server_errors[status - SERVER_ERR_MIN]);
+    else
+        return string("Unknown Error: This indicates a problem with libdap++.\nPlease report this to support@opendap.org.");
+}
+
+static ObjectType
+determine_object_type(const string &header_value)
+{
+    // DAP4 Data: application/vnd.opendap.dap4.data
+    // DAP4 DMR: application/vnd.opendap.dap4.dataset-metadata+xml
+
+    string::size_type plus = header_value.find('+');
+    string base_type;
+    string type_extension = "";
+    if (plus != string::npos) {
+        base_type= header_value.substr(0, plus);
+        type_extension = header_value.substr(plus+1);
+    }
+    else
+        base_type = header_value;
+
+    if (base_type == DMR_Content_Type
+    	|| (base_type.find("application/") != string::npos
+    		&& base_type.find("dap4.dataset-metadata") != string::npos)) {
+        if (type_extension == "xml")
+            return dap4_dmr;
+        else
+            return unknown_type;
+    }
+    else if (base_type == DAP4_DATA_Content_Type
+    		|| (base_type.find("application/") != string::npos
+    			&& base_type.find("dap4.data") != string::npos)) {
+        return dap4_data;
+    }
+    else if (header_value.find("text/html") != string::npos) {
+        return web_error;
+    }
+    else
+        return unknown_type;
+}
+
+/** Functor to parse the headers in the d_headers field. After the headers
+    have been read off the wire and written into the d_headers field, scan
+    them and set special fields for certain headers special to the DAP. */
+
+class ParseHeader : public unary_function<const string &, void>
+{
+    ObjectType type;  // What type of object is in the stream?
+    string server;  // Server's version string.
+    string protocol;            // Server's protocol version.
+    string location;            // Url returned by server
+
+public:
+    ParseHeader() : type(unknown_type), server("dods/0.0"), protocol("2.0")
+    { }
+
+    void operator()(const string &line)
+    {
+        string name, value;
+        parse_mime_header(line, name, value);
+
+        DBG2(cerr << name << ": " << value << endl);
+
+        // Content-Type is used to determine the content of DAP4 responses, but allow the
+        // Content-Description header to override CT o preserve operation with DAP2 servers.
+        // jhrg 11/12/13
+        if (type == unknown_type && name == "content-type") {
+            type = determine_object_type(value); // see above
+        }
+        if (name == "content-description" && !(type == dap4_dmr || type == dap4_data || type == dap4_error)) {
+            type = get_description_type(value); // defined in mime_util.cc
+        }
+        // The second test (== "dods/0.0") tests if xopendap-server has already
+        // been seen. If so, use that header in preference to the old
+        // XDODS-Server header. jhrg 2/7/06
+        else if (name == "xdods-server" && server == "dods/0.0") {
+            server = value;
+        }
+        else if (name == "xopendap-server") {
+            server = value;
+        }
+        else if (name == "xdap") {
+            protocol = value;
+        }
+        else if (server == "dods/0.0" && name == "server") {
+            server = value;
+        }
+       	else if (name == "location") {
+       	    location = value;
+        }
+    }
+
+    ObjectType get_object_type()
+    {
+        return type;
+    }
+
+    string get_server()
+    {
+        return server;
+    }
+
+    string get_protocol()
+    {
+        return protocol;
+    }
+
+    string get_location() {
+	   return location;
+    }
+};
+
+/** A libcurl callback function used to read response headers. Read headers,
+    line by line, from ptr. The fourth param is really supposed to be a FILE
+    *, but libcurl just holds the pointer and passes it to this function
+    without using it itself. I use that to pass in a pointer to a vector
+    of strings so that there's some place to
+    dump the headers. Later on the code (see fetch_url()) parses the headers
+    special to the DAP.
+
+    @param ptr A pointer to one line of character data; one header.
+    @param size Size of each character (nominally one byte).
+    @param nmemb Number of bytes.
+    @param resp_hdrs A pointer to a vector<string>. Set in read_url.
+    @return The number of bytes processed. Must be equal to size * nmemb or
+    libcurl will report an error. */
+
+static size_t
+save_raw_http_headers(void *ptr, size_t size, size_t nmemb, void *resp_hdrs)
+{
+    DBG2(cerr << "Inside the header parser." << endl);
+    vector<string> *hdrs = static_cast<vector<string> * >(resp_hdrs);
+
+    // Grab the header, minus the trailing newline. Or \r\n pair.
+    string complete_line;
+    if (nmemb > 1 && *(static_cast<char*>(ptr) + size * (nmemb - 2)) == '\r')
+        complete_line.assign(static_cast<char *>(ptr), size * (nmemb - 2));
+    else
+        complete_line.assign(static_cast<char *>(ptr), size * (nmemb - 1));
+
+    // Store all non-empty headers that are not HTTP status codes
+    if (complete_line != "" && complete_line.find("HTTP") == string::npos) {
+        DBG(cerr << "Header line: " << complete_line << endl);
+        hdrs->push_back(complete_line);
+    }
+
+    return size * nmemb;
+}
+
+/** A libcurl callback for debugging protocol issues. */
+static int
+curl_debug(CURL *, curl_infotype info, char *msg, size_t size, void  *)
+{
+    string message(msg, size);
+
+    switch (info) {
+    case CURLINFO_TEXT:
+        cerr << "Text: " << message; break;
+    case CURLINFO_HEADER_IN:
+        cerr << "Header in: " << message; break;
+    case CURLINFO_HEADER_OUT:
+        cerr << "Header out: " << message; break;
+    case CURLINFO_DATA_IN:
+        cerr << "Data in: " << message; break;
+    case CURLINFO_DATA_OUT:
+        cerr << "Data out: " << message; break;
+    case CURLINFO_END:
+        cerr << "End: " << message; break;
+#ifdef CURLINFO_SSL_DATA_IN
+    case CURLINFO_SSL_DATA_IN:
+        cerr << "SSL Data in: " << message; break;
+#endif
+#ifdef CURLINFO_SSL_DATA_OUT
+    case CURLINFO_SSL_DATA_OUT:
+        cerr << "SSL Data out: " << message; break;
+#endif
+    default:
+        cerr << "Curl info: " << message; break;
+    }
+    return 0;
+}
+
+/** Initialize libcurl. Create a libcurl handle that can be used for all of
+    the HTTP requests made through this instance. */
+
+void
+HTTPConnect::www_lib_init()
+{
+    d_curl = curl_easy_init();
+    if (!d_curl)
+        throw InternalErr(__FILE__, __LINE__, "Could not initialize libcurl.");
+
+    // Now set options that will remain constant for the duration of this
+    // CURL object.
+
+    // Set the proxy host.
+    if (!d_rcr->get_proxy_server_host().empty()) {
+        DBG(cerr << "Setting up a proxy server." << endl);
+        DBG(cerr << "Proxy host: " << d_rcr->get_proxy_server_host()
+            << endl);
+        DBG(cerr << "Proxy port: " << d_rcr->get_proxy_server_port()
+            << endl);
+        DBG(cerr << "Proxy pwd : " << d_rcr->get_proxy_server_userpw()
+            << endl);
+        curl_easy_setopt(d_curl, CURLOPT_PROXY,
+                         d_rcr->get_proxy_server_host().c_str());
+        curl_easy_setopt(d_curl, CURLOPT_PROXYPORT,
+                         d_rcr->get_proxy_server_port());
+
+	// As of 4/21/08 only NTLM, Digest and Basic work.
+#ifdef CURLOPT_PROXYAUTH
+        curl_easy_setopt(d_curl, CURLOPT_PROXYAUTH, (long)CURLAUTH_ANY);
+#endif
+
+        // Password might not be required. 06/21/04 jhrg
+        if (!d_rcr->get_proxy_server_userpw().empty())
+            curl_easy_setopt(d_curl, CURLOPT_PROXYUSERPWD,
+                             d_rcr->get_proxy_server_userpw().c_str());
+    }
+
+    curl_easy_setopt(d_curl, CURLOPT_ERRORBUFFER, d_error_buffer);
+    // We have to set FailOnError to false for any of the non-Basic
+    // authentication schemes to work. 07/28/03 jhrg
+    curl_easy_setopt(d_curl, CURLOPT_FAILONERROR, 0);
+
+    // This means libcurl will use Basic, Digest, GSS Negotiate, or NTLM,
+    // choosing the the 'safest' one supported by the server.
+    // This requires curl 7.10.6 which is still in pre-release. 07/25/03 jhrg
+    curl_easy_setopt(d_curl, CURLOPT_HTTPAUTH, (long)CURLAUTH_ANY);
+
+    curl_easy_setopt(d_curl, CURLOPT_NOPROGRESS, 1);
+    curl_easy_setopt(d_curl, CURLOPT_NOSIGNAL, 1);
+    curl_easy_setopt(d_curl, CURLOPT_HEADERFUNCTION, save_raw_http_headers);
+    // In read_url a call to CURLOPT_WRITEHEADER is used to set the fourth
+    // param of save_raw_http_headers to a vector<string> object.
+
+    // Follow 302 (redirect) responses
+    curl_easy_setopt(d_curl, CURLOPT_FOLLOWLOCATION, 1);
+    curl_easy_setopt(d_curl, CURLOPT_MAXREDIRS, 5);
+
+    // If the user turns off SSL validation...
+    if (d_rcr->get_validate_ssl() == 0) {
+        curl_easy_setopt(d_curl, CURLOPT_SSL_VERIFYPEER, 0);
+        curl_easy_setopt(d_curl, CURLOPT_SSL_VERIFYHOST, 0);
+    }
+
+    // Look to see if cookies are turned on in the .dodsrc file. If so,
+    // activate here. We honor 'session cookies' (cookies without an
+    // expiration date) here so that session-based SSO systems will work as
+    // expected.
+    if (!d_cookie_jar.empty()) {
+	DBG(cerr << "Setting the cookie jar to: " << d_cookie_jar << endl);
+        curl_easy_setopt(d_curl, CURLOPT_COOKIEJAR, d_cookie_jar.c_str());
+        curl_easy_setopt(d_curl, CURLOPT_COOKIESESSION, 1);
+    }
+
+    if (www_trace) {
+        cerr << "Curl version: " << curl_version() << endl;
+        curl_easy_setopt(d_curl, CURLOPT_VERBOSE, 1);
+        curl_easy_setopt(d_curl, CURLOPT_DEBUGFUNCTION, curl_debug);
+    }
+}
+
+/** Functor to add a single string to a curl_slist. This is used to transfer
+    a list of headers from a vector<string> object to a curl_slist. */
+
+class BuildHeaders : public unary_function<const string &, void>
+{
+    struct curl_slist *d_cl;
+
+public:
+    BuildHeaders() : d_cl(0)
+    {}
+
+    void operator()(const string &header)
+    {
+        DBG(cerr << "Adding '" << header.c_str() << "' to the header list."
+            << endl);
+        d_cl = curl_slist_append(d_cl, header.c_str());
+    }
+
+    struct curl_slist *get_headers()
+    {
+        return d_cl;
+    }
+};
+
+/** Use libcurl to dereference a URL. Read the information referenced by \c
+    url into the file pointed to by \c stream.
+
+    @param url The URL to dereference.
+    @param stream The destination for the data; the caller can assume that
+    the body of the response can be found by reading from this pointer. A
+    value/result parameter
+    @param resp_hdrs Value/result parameter for the HTTP Response Headers.
+    @param headers A pointer to a vector of HTTP request headers. Default is
+    null. These headers will be appended to the list of default headers.
+    @return The HTTP status code.
+    @exception Error Thrown if libcurl encounters a problem; the libcurl
+    error message is stuffed into the Error object. */
+
+long
+HTTPConnect::read_url(const string &url, FILE *stream, vector<string> *resp_hdrs, const vector<string> *headers)
+{
+    curl_easy_setopt(d_curl, CURLOPT_URL, url.c_str());
+
+#ifdef WIN32
+    //  See the curl documentation for CURLOPT_FILE (aka CURLOPT_WRITEDATA)
+    //  and the CURLOPT_WRITEFUNCTION option.  Quote: "If you are using libcurl as
+    //  a win32 DLL, you MUST use the CURLOPT_WRITEFUNCTION option if you set the
+    //  CURLOPT_WRITEDATA option or you will experience crashes".  At the root of
+    //  this issue is that one should not pass a FILE * to a windows DLL.  Close
+    //  inspection of libcurl yields that their default write function when using
+    //  the CURLOPT_WRITEDATA is just "fwrite".
+    curl_easy_setopt(d_curl, CURLOPT_WRITEDATA, stream);
+    curl_easy_setopt(d_curl, CURLOPT_WRITEFUNCTION, &fwrite);
+#else
+    curl_easy_setopt(d_curl, CURLOPT_WRITEDATA, stream);
+#endif
+
+    DBG(copy(d_request_headers.begin(), d_request_headers.end(),
+             ostream_iterator<string>(cerr, "\n")));
+
+    BuildHeaders req_hdrs;
+    req_hdrs = for_each(d_request_headers.begin(), d_request_headers.end(),
+                        req_hdrs);
+    if (headers)
+        req_hdrs = for_each(headers->begin(), headers->end(), req_hdrs);
+
+    curl_easy_setopt(d_curl, CURLOPT_HTTPHEADER, req_hdrs.get_headers());
+
+    // Turn off the proxy for this URL?
+    bool temporary_proxy = false;
+    if ((temporary_proxy = url_uses_no_proxy_for(url))) {
+        DBG(cerr << "Suppress proxy for url: " << url << endl);
+        curl_easy_setopt(d_curl, CURLOPT_PROXY, 0);
+    }
+
+    string::size_type at_sign = url.find('@');
+    // Assume username:password present *and* assume it's an HTTP URL; it *is*
+    // HTTPConnect, after all. 7 is position after "http://"; the second arg
+    // to substr() is the sub string length.
+    if (at_sign != url.npos)
+        d_upstring = url.substr(7, at_sign - 7);
+
+    if (!d_upstring.empty())
+        curl_easy_setopt(d_curl, CURLOPT_USERPWD, d_upstring.c_str());
+
+    // Pass save_raw_http_headers() a pointer to the vector<string> where the
+    // response headers may be stored. Callers can use the resp_hdrs
+    // value/result parameter to get the raw response header information .
+    curl_easy_setopt(d_curl, CURLOPT_WRITEHEADER, resp_hdrs);
+
+    // This is the call that causes curl to go and get the remote resource and "write it down"
+    // utilizing the configuration state that has been previously conditioned by various perturbations
+    // of calls to curl_easy_setopt().
+    CURLcode res = curl_easy_perform(d_curl);
+
+    // Free the header list and null the value in d_curl.
+    curl_slist_free_all(req_hdrs.get_headers());
+    curl_easy_setopt(d_curl, CURLOPT_HTTPHEADER, 0);
+
+    // Reset the proxy?
+    if (temporary_proxy && !d_rcr->get_proxy_server_host().empty())
+        curl_easy_setopt(d_curl, CURLOPT_PROXY,
+                         d_rcr->get_proxy_server_host().c_str());
+
+    if (res != 0)
+        throw Error(d_error_buffer);
+
+    long status;
+    res = curl_easy_getinfo(d_curl, CURLINFO_HTTP_CODE, &status);
+    if (res != 0)
+        throw Error(d_error_buffer);
+
+    char *ct_ptr = 0;
+    res = curl_easy_getinfo(d_curl, CURLINFO_CONTENT_TYPE, &ct_ptr);
+    if (res == CURLE_OK && ct_ptr)
+        d_content_type = ct_ptr;
+    else
+        d_content_type = "";
+
+    return status;
+}
+
+/** If the .dodsrc file gives a value for PROXY_FOR, return true if the
+    current URL matches the regular expression. */
+
+bool
+HTTPConnect::url_uses_proxy_for(const string &url)
+{
+    if (d_rcr->is_proxy_for_used()) {
+        Regex host_regex(d_rcr->get_proxy_for_regexp().c_str());
+        int index = 0, matchlen;
+        return host_regex.search(url.c_str(), url.size(), matchlen, index) != -1;
+    }
+
+    return false;
+}
+
+/** If the NO_PROXY option is used in the dodsrc file, does this URL match
+    the no proxy URL regex? */
+
+bool
+HTTPConnect::url_uses_no_proxy_for(const string &url) throw()
+{
+    return d_rcr->is_no_proxy_for_used()
+           && url.find(d_rcr->get_no_proxy_for_host()) != string::npos;
+}
+
+// Public methods. Mostly...
+
+/** Build a virtual connection to a remote data source that will be
+    accessed using HTTP.
+
+    @param rcr A pointer to the RCReader object which holds configuration
+    file information to be used by this virtual connection. */
+
+HTTPConnect::HTTPConnect(RCReader *rcr, bool use_cpp) : d_username(""), d_password(""), d_cookie_jar(""),
+		d_dap_client_protocol_major(2),	d_dap_client_protocol_minor(0), d_use_cpp_streams(use_cpp)
+
+{
+    d_accept_deflate = rcr->get_deflate();
+    d_rcr = rcr;
+
+    // Load in the default headers to send with a request. The empty Pragma
+    // headers overrides libcurl's default Pragma: no-cache header (which
+    // will disable caching by Squid, et c.). The User-Agent header helps
+    // make server logs more readable. 05/05/03 jhrg
+    d_request_headers.push_back(string("Pragma:"));
+    string user_agent = string("User-Agent: ") + string(CNAME)
+                        + string("/") + string(CVER);
+    d_request_headers.push_back(user_agent);
+    if (d_accept_deflate)
+        d_request_headers.push_back(string("Accept-Encoding: deflate, gzip, compress"));
+
+    // HTTPCache::instance returns a valid ptr or 0.
+    if (d_rcr->get_use_cache())
+        d_http_cache = HTTPCache::instance(d_rcr->get_dods_cache_root(),true);
+    else
+        d_http_cache = 0;
+
+    DBG2(cerr << "Cache object created (" << hex << d_http_cache << dec
+         << ")" << endl);
+
+    if (d_http_cache) {
+        d_http_cache->set_cache_enabled(d_rcr->get_use_cache());
+        d_http_cache->set_expire_ignored(d_rcr->get_ignore_expires() != 0);
+        d_http_cache->set_max_size(d_rcr->get_max_cache_size());
+        d_http_cache->set_max_entry_size(d_rcr->get_max_cached_obj());
+        d_http_cache->set_default_expiration(d_rcr->get_default_expires());
+        d_http_cache->set_always_validate(d_rcr->get_always_validate() != 0);
+    }
+
+    d_cookie_jar = rcr->get_cookie_jar();
+
+    www_lib_init();  // This may throw either Error or InternalErr
+}
+
+HTTPConnect::~HTTPConnect()
+{
+    DBG2(cerr << "Entering the HTTPConnect dtor" << endl);
+
+    curl_easy_cleanup(d_curl);
+
+    DBG2(cerr << "Leaving the HTTPConnect dtor" << endl);
+}
+
+/** Look for a certain header */
+class HeaderMatch : public unary_function<const string &, bool> {
+    const string &d_header;
+    public:
+        HeaderMatch(const string &header) : d_header(header) {}
+        bool operator()(const string &arg) { return arg.find(d_header) == 0; }
+};
+
+/** Dereference a URL. This method dereferences a URL and stores the result
+    (i.e., it formulates an HTTP request and processes the HTTP server's
+    response). After this method is successfully called, the value of
+    is_response_present() will be true and the methods
+    get_response_headers(), type() and server_version() may be called.
+
+    @param url The URL to dereference.
+    @return A pointer to the stream.
+    @exception Error Thrown if the URL could not be dereferenced.
+    @exception InternalErr Thrown if a temporary file to hold the response
+    could not be opened. */
+
+HTTPResponse *
+HTTPConnect::fetch_url(const string &url)
+{
+#ifdef HTTP_TRACE
+    cout << "GET " << url << " HTTP/1.0" << endl;
+#endif
+
+    HTTPResponse *stream;
+
+    if (/*d_http_cache && d_http_cache->*/is_cache_enabled()) {
+        stream = caching_fetch_url(url);
+    }
+    else {
+        stream = plain_fetch_url(url);
+    }
+
+#ifdef HTTP_TRACE
+	stringstream ss;
+	ss << "HTTP/1.0 " << stream->get_status() << " -" << endl;
+	for (size_t i = 0; i < stream->get_headers()->size(); i++) {
+		ss << stream->get_headers()->at(i) << endl;
+	}
+	cout << ss.str();
+#endif
+
+    ParseHeader parser;
+
+    // An apparent quirk of libcurl is that it does not pass the Content-type
+    // header to the callback used to save them, but check and add it from the
+    // saved state variable only if it's not there (without this a test failed
+    // in HTTPCacheTest). jhrg 11/12/13
+    if (!d_content_type.empty() && find_if(stream->get_headers()->begin(), stream->get_headers()->end(),
+    									   HeaderMatch("Content-Type:")) == stream->get_headers()->end())
+        stream->get_headers()->push_back("Content-Type: " + d_content_type);
+
+    parser = for_each(stream->get_headers()->begin(), stream->get_headers()->end(), ParseHeader());
+
+#ifdef HTTP_TRACE
+    cout << endl << endl;
+#endif
+
+    // handle redirection case (2007-04-27, gaffigan@sfos.uaf.edu)
+    if (parser.get_location() != "" &&
+	    url.substr(0,url.find("?",0)).compare(parser.get_location().substr(0,url.find("?",0))) != 0) {
+    	delete stream;
+        return fetch_url(parser.get_location());
+    }
+
+    stream->set_type(parser.get_object_type()); // uses the value of content-description
+
+    stream->set_version(parser.get_server());
+    stream->set_protocol(parser.get_protocol());
+
+    if (d_use_cpp_streams) {
+    	stream->transform_to_cpp();
+    }
+
+    return stream;
+}
+
+// Look around for a reasonable place to put a temporary file. Check first
+// the value of the TMPDIR env var. If that does not yeild a path that's
+// writable (as defined by access(..., W_OK|R_OK)) then look at P_tmpdir (as
+// defined in stdio.h. If both come up empty, then use `./'.
+
+// Change this to a version that either returns a string or an open file
+// descriptor. Use information from https://buildsecurityin.us-cert.gov/
+// (see open()) to make it more secure. Ideal solution: get deserialize()
+// methods to read from a stream returned by libcurl, not from a temporary
+// file. 9/21/07 jhrg Updated to use strings, other misc changes. 3/22/11
+static string
+get_tempfile_template(const string &file_template)
+{
+    string c;
+
+    // Windows has one idea of the standard name(s) for a temporary files dir
+#ifdef WIN32
+    // white list for a WIN32 directory
+    Regex directory("[-a-zA-Z0-9_:\\]*");
+
+    // If we're OK to use getenv(), try it.
+#ifdef USE_GETENV
+    c = getenv("TEMP");
+    if (c && directory.match(c.c_str(), c.length()) && (access(c.c_str(), 6) == 0))
+	goto valid_temp_directory;
+
+    c= getenv("TMP");
+    if (c && directory.match(c.c_str(), c.length()) && (access(c.c_str(), 6) == 0))
+	goto valid_temp_directory;
+#endif // USE_GETENV
+
+    // The windows default
+    c = "c:\tmp";
+    if (c && directory.match(c.c_str(), c.length()) && (access(c.c_str(), 6) == 0))
+	goto valid_temp_directory;
+
+#else	// Unix/Linux/OSX has another...
+    // white list for a directory
+    Regex directory("[-a-zA-Z0-9_/]*");
+#ifdef USE_GETENV
+    c = getenv("TMPDIR");
+    if (directory.match(c.c_str(), c.length()) && (access(c.c_str(), W_OK | R_OK) == 0))
+	goto valid_temp_directory;
+#endif // USE_GETENV
+
+    // Unix defines this sometimes - if present, use it.
+#ifdef P_tmpdir
+    if (access(P_tmpdir, W_OK | R_OK) == 0) {
+	c = P_tmpdir;
+	goto valid_temp_directory;
+    }
+#endif
+
+    // The Unix default
+    c = "/tmp";
+    if (directory.match(c.c_str(), c.length()) && (access(c.c_str(), W_OK | R_OK) == 0))
+	goto valid_temp_directory;
+
+#endif  // WIN32
+
+    // If we found nothing useful, use the current directory
+    c = ".";
+
+valid_temp_directory:
+
+#ifdef WIN32
+    c += "\\" + file_template;
+#else
+    c += "/" + file_template;
+#endif
+
+    return c;
+}
+
+/** Open a temporary file and return its name. This method opens a temporary
+    file using get_tempfile_template(). The FILE* \c stream is opened for
+    both reads and writes; if it already exists (highly unlikely), it is
+    truncated. If used on Unix, it's the callers responsibility to unlink the
+    named file so that when all descriptors to it are closed, it will be
+    deleted. On Win32 platforms, this method pushes the name of the temporary
+    file onto a vector which is used during object destruction to delete all
+    the temporary files.
+
+    @note Delete the returned char* using delete[].
+
+    A private method.
+
+    @param stream A value-result parameter; the open file descriptor is
+    returned via this parameter.
+    @return The name of the temporary file.
+    @exception InternalErr thrown if the FILE* could not be opened. */
+
+string
+get_temp_file(FILE *&stream) throw(Error)
+{
+    string dods_temp = get_tempfile_template((string)"dodsXXXXXX");
+
+    vector<char> pathname(dods_temp.length() + 1);
+
+    strncpy(&pathname[0], dods_temp.c_str(), dods_temp.length());
+
+    DBG(cerr << "pathanme: " << &pathname[0] << " (" << dods_temp.length() + 1 << ")" << endl);
+
+    // Open truncated for update. NB: mkstemp() returns a file descriptor.
+#if defined(WIN32) || defined(TEST_WIN32_TEMPS)
+    stream = fopen(_mktemp(&pathname[0]), "w+b");
+#else
+    // Make sure that temp files are accessible only by the owner.
+    int mask = umask(077);
+    if (mask < 0)
+        throw Error("Could not set the file creation mask: " + string(strerror(errno)));
+    int fd = mkstemp(&pathname[0]);
+    if (fd < 0)
+        throw Error("Could not create a temporary file to store the response: " + string(strerror(errno)));
+
+    stream = fdopen(fd, "w+");
+    umask(mask);
+#endif
+
+    if (!stream)
+    	throw Error("Failed to open a temporary file for the data values (" + dods_temp + ")");
+
+    dods_temp = &pathname[0];
+    return dods_temp;
+}
+
+
+/**
+ * close temporary files - used here and in ~HTTPResponse
+ * @param s
+ * @param name
+ */
+void
+close_temp(FILE *s, const string &name)
+{
+    int res = fclose(s);
+    if (res)
+	throw InternalErr(__FILE__, __LINE__, "!FAIL! " + long_to_string(res));
+
+    res = unlink(name.c_str());
+    if (res != 0)
+    	throw InternalErr(__FILE__, __LINE__, "!FAIL! " + long_to_string(res));
+}
+
+/** Dereference a URL. This method looks first in the HTTP cache to see if a
+    cached response may be used. It may get the response from the cache, it
+    may validate a response in the cache and/or update the response from the
+    cache or it may get a new response from the network. In any of those
+    cases, the information returned by dereferencing the URL will be stored
+    in the cache.
+
+    Return a Response pointer to fetch_url() which, in turn, uses
+    ParseHeaders to read stuff from d_headers and fills in the Response
+    version and type fields. Thus this method and plain_fetch_url() only have
+    to get the stream pointer set, the resources to release and d_headers.
+
+    A private method.
+
+    @note This method assumes that d_http_cache is not null!
+    @param url The URL to dereference.
+    @return A pointer to the open stream.
+    @exception Error Thrown if the URL could not be dereferenced.
+    @exception InternalErr Thrown if a temporary file to hold the response
+    could not be opened. */
+
+HTTPResponse *
+HTTPConnect::caching_fetch_url(const string &url)
+{
+    DBG(cerr << "Is this URL (" << url << ") in the cache?... ");
+
+    vector<string> *headers = new vector<string>;
+    string file_name;
+    FILE *s = d_http_cache->get_cached_response(url, *headers, file_name);
+    if (!s) {
+        // url not in cache; get it and cache it
+        DBGN(cerr << "no; getting response and caching." << endl);
+        delete headers; headers = 0;
+        time_t now = time(0);
+        HTTPResponse *rs = plain_fetch_url(url);
+        d_http_cache->cache_response(url, now, *(rs->get_headers()), rs->get_stream());
+
+        return rs;
+    }
+    else { // url in cache
+        DBGN(cerr << "yes... ");
+
+        if (d_http_cache->is_url_valid(url)) { // url in cache and valid
+            DBGN(cerr << "and it's valid; using cached response." << endl);
+            HTTPCacheResponse *crs = new HTTPCacheResponse(s, 200, headers, file_name, d_http_cache);
+            return crs;
+        }
+        else { // url in cache but not valid; validate
+            DBGN(cerr << "but it's not valid; validating... ");
+
+            d_http_cache->release_cached_response(s); // This closes 's'
+            headers->clear();
+            vector<string> cond_hdrs = d_http_cache->get_conditional_request_headers(url);
+            FILE *body = 0;
+            string dods_temp = get_temp_file(body);
+            time_t now = time(0); // When was the request made (now).
+            long http_status;
+
+            try {
+                http_status = read_url(url, body, /*resp_hdrs*/headers, &cond_hdrs);
+                rewind(body);
+            }
+            catch (Error &e) {
+                close_temp(body, dods_temp);
+                delete headers;
+                throw ;
+            }
+
+            switch (http_status) {
+                case 200: { // New headers and new body
+                    DBGN(cerr << "read a new response; caching." << endl);
+
+                    d_http_cache->cache_response(url, now, /* *resp_hdrs*/*headers, body);
+                    HTTPResponse *rs = new HTTPResponse(body, http_status, /*resp_hdrs*/headers, dods_temp);
+
+                    return rs;
+                }
+
+                case 304: { // Just new headers, use cached body
+                    DBGN(cerr << "cached response valid; updating." << endl);
+
+                    close_temp(body, dods_temp);
+                    d_http_cache->update_response(url, now, /* *resp_hdrs*/ *headers);
+                    string file_name;
+                    FILE *hs = d_http_cache->get_cached_response(url, *headers, file_name);
+                    HTTPCacheResponse *crs = new HTTPCacheResponse(hs, 304, headers, file_name, d_http_cache);
+                    return crs;
+                }
+
+                default: { // Oops.
+                    close_temp(body, dods_temp);
+                    if (http_status >= 400) {
+                	delete headers; headers = 0;
+                        string msg = "Error while reading the URL: ";
+                        msg += url;
+                        msg
+                        += ".\nThe OPeNDAP server returned the following message:\n";
+                        msg += http_status_to_string(http_status);
+                        throw Error(msg);
+                    }
+                    else {
+                	delete headers; headers = 0;
+                        throw InternalErr(__FILE__, __LINE__,
+                                "Bad response from the HTTP server: " + long_to_string(http_status));
+                    }
+                }
+            }
+        }
+    }
+
+    throw InternalErr(__FILE__, __LINE__, "Should never get here");
+}
+
+/** Dereference a URL and load its body into a temporary file. This
+    method ignores the HTTP cache.
+
+    A private method.
+
+    @param url The URL to dereference.
+    @return A pointer to the open stream.
+    @exception Error Thrown if the URL could not be dereferenced.
+    @exception InternalErr Thrown if a temporary file to hold the response
+    could not be opened. */
+
+HTTPResponse *
+HTTPConnect::plain_fetch_url(const string &url)
+{
+	DBG(cerr << "Getting URL: " << url << endl);
+	FILE *stream = 0;
+	string dods_temp = get_temp_file(stream);
+	vector<string> *resp_hdrs = new vector<string>;
+
+	int status = -1;
+	try {
+		status = read_url(url, stream, resp_hdrs); // Throws Error.
+		if (status >= 400) {
+			// delete resp_hdrs; resp_hdrs = 0;
+			string msg = "Error while reading the URL: ";
+			msg += url;
+			msg += ".\nThe OPeNDAP server returned the following message:\n";
+			msg += http_status_to_string(status);
+			throw Error(msg);
+		}
+	}
+
+	catch (Error &e) {
+		delete resp_hdrs;
+		close_temp(stream, dods_temp);
+		throw;
+	}
+
+#if 0
+	if (d_use_cpp_streams) {
+		fclose(stream);
+		fstream *in = new fstream(dods_temp.c_str(), ios::in|ios::binary);
+		return new HTTPResponse(in, status, resp_hdrs, dods_temp);
+	}
+	else {
+#endif
+	rewind(stream);
+	return new HTTPResponse(stream, status, resp_hdrs, dods_temp);
+#if 0
+}
+#endif
+}
+
+/** Set the <em>accept deflate</em> property. If true, the DAP client
+    announces to a server that it can accept responses compressed using the
+    \c deflate algorithm. This property is automatically set using a value
+    from the <code>.dodsrc</code> configuration file. This method provides a
+    way to override that behavior.
+
+    @note If the configuration file is not present or does not include a
+    value for this property, it is set to \c false.
+
+    @param deflate True sets the <em>accept deflate</em> property, False clears
+    it. */
+void
+HTTPConnect::set_accept_deflate(bool deflate)
+{
+    d_accept_deflate = deflate;
+
+    if (d_accept_deflate) {
+        if (find(d_request_headers.begin(), d_request_headers.end(),
+                 "Accept-Encoding: deflate, gzip, compress") == d_request_headers.end())
+            d_request_headers.push_back(string("Accept-Encoding: deflate, gzip, compress"));
+        DBG(copy(d_request_headers.begin(), d_request_headers.end(),
+                 ostream_iterator<string>(cerr, "\n")));
+    }
+    else {
+        vector<string>::iterator i;
+        i = remove_if(d_request_headers.begin(), d_request_headers.end(),
+                      bind2nd(equal_to<string>(),
+                              string("Accept-Encoding: deflate, gzip, compress")));
+        d_request_headers.erase(i, d_request_headers.end());
+    }
+}
+
+/** Set the <em>xdap_accept</em> property/HTTP-header. This sets the value
+    of the DAP which the client advertises to servers that it understands.
+    The information (client protocol major and minor versions) are recorded
+    in the instance and the information is sent to servers using the
+    XDAP-Accept HTTP request header.
+
+    @param major The dap client major protocol version
+    @param minor The dap client minor protocol version */
+void
+HTTPConnect::set_xdap_protocol(int major, int minor)
+{
+    // Look for, and remove if one exists, an XDAP-Accept header
+    vector<string>::iterator i;
+    i = find_if(d_request_headers.begin(), d_request_headers.end(),
+                HeaderMatch("XDAP-Accept:"));
+    if (i != d_request_headers.end())
+        d_request_headers.erase(i);
+
+    // Record and add the new header value
+    d_dap_client_protocol_major = major;
+    d_dap_client_protocol_minor = minor;
+    ostringstream xdap_accept;
+    xdap_accept << "XDAP-Accept: " << major << "." << minor;
+
+    d_request_headers.push_back(xdap_accept.str());
+
+    DBG(copy(d_request_headers.begin(), d_request_headers.end(),
+             ostream_iterator<string>(cerr, "\n")));
+}
+
+/** Set the credentials for responding to challenges while dereferencing
+    URLs. Alternatively, these can be embedded in the URL. This method
+    provides a way for clients of HTTPConnect to get credentials from users
+    (say using a pop up dialog) and to not hack the URL to pass that
+    information to libcurl. Note that the 'credentials in the URL' scheme \e
+    is part of the URL standard.
+
+    This method does nothing if \c u, the username, is empty.
+
+    @param u The username.
+    @param p The password.
+    @exception InternalErr The credentials could not be registered with
+    libcurl.
+    @see extract_auth_info() */
+
+void
+HTTPConnect::set_credentials(const string &u, const string &p)
+{
+    if (u.empty())
+        return;
+
+    // Store the credentials locally.
+    d_username = u;
+    d_password = p;
+
+    d_upstring = u + ":" + p;
+}
+
+} // namespace libdap
diff --git a/HTTPConnect.h b/HTTPConnect.h
new file mode 100644
index 0000000..73b4833
--- /dev/null
+++ b/HTTPConnect.h
@@ -0,0 +1,163 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#ifndef _httpconnect_h
+#define _httpconnect_h
+
+
+#include <string>
+
+#include <curl/curl.h>
+//No longer used in CURL - pwest April 09, 2012
+//#include <curl/types.h>
+#include <curl/easy.h>
+
+#ifndef _rc_reader_h_
+#include "RCReader.h"
+#endif
+
+#ifndef _object_type_h
+#include "ObjectType.h"
+#endif
+
+#ifndef _http_cache_h
+#include "HTTPCache.h"
+#endif
+
+#ifndef http_response_h
+#include "HTTPResponse.h"
+#endif
+
+#ifndef _util_h
+#include "util.h"
+#endif
+
+using std::string;
+using std::vector;
+
+namespace libdap
+{
+
+extern int www_trace;
+extern int dods_keep_temps;
+
+/** Use the CURL library to dereference a HTTP URL. Scan the response for
+    headers used by DAP 2.0 and extract their values. The body of the
+    response is made available using a FILE pointer.
+
+    @author jhrg */
+
+class HTTPConnect
+{
+private:
+    CURL *d_curl;
+    RCReader *d_rcr;
+    HTTPCache *d_http_cache;
+
+    char d_error_buffer[CURL_ERROR_SIZE]; // A human-readable message.
+    std::string d_content_type; // apparently read by libcurl; this is valid only after curl_easy_perform()
+
+    bool d_accept_deflate;
+
+    string d_username;  // extracted from URL
+    string d_password;  // extracted from URL
+    string d_upstring;  // used to pass info into curl
+
+    string d_cookie_jar;
+
+    vector<string> d_request_headers; // Request headers
+
+    int d_dap_client_protocol_major;
+    int d_dap_client_protocol_minor;
+
+    bool d_use_cpp_streams;	// Build HTTPResponse objects using fstream and not FILE*
+
+    void www_lib_init();
+    long read_url(const string &url, FILE *stream, vector<string> *resp_hdrs,
+                  const vector<string> *headers = 0);
+
+    HTTPResponse *plain_fetch_url(const string &url);
+    HTTPResponse *caching_fetch_url(const string &url);
+
+    bool url_uses_proxy_for(const string &url);
+    bool url_uses_no_proxy_for(const string &url) throw();
+
+    void extract_auth_info(string &url);
+
+    friend size_t save_raw_http_header(void *ptr, size_t size, size_t nmemb,
+                                       void *http_connect);
+    friend class HTTPConnectTest;
+    friend class ParseHeader;
+
+protected:
+    /** @name Suppress default methods
+    These methods are not supported and are implemented here as protected
+    methods to suppress the C++-supplied default versions (which will
+    break this object). */
+    //@{
+    HTTPConnect();
+	HTTPConnect(const HTTPConnect &);
+	HTTPConnect &operator=(const HTTPConnect &);
+    //@}
+
+public:
+    HTTPConnect(RCReader *rcr, bool use_cpp = false);
+
+    virtual ~HTTPConnect();
+
+    void set_credentials(const string &u, const string &p);
+    void set_accept_deflate(bool defalte);
+    void set_xdap_protocol(int major, int minor);
+
+    bool use_cpp_streams() const { return d_use_cpp_streams; }
+    void set_use_cpp_streams(bool use_cpp_streams) { d_use_cpp_streams = use_cpp_streams; }
+
+    /** Set the cookie jar. This function sets the name of a file used to store
+    cookies returned by servers. This will help with things like single
+    sign on systems.
+
+    @param cookie_jar The pathname to the file that stores cookies. If this
+    is the empty string saving cookies is disabled. */
+    void set_cookie_jar(const string &cookie_jar) { d_cookie_jar = cookie_jar; }
+
+    /** Set the state of the HTTP cache. By default, the HTTP cache is
+    enabled or disabled using the value of the \c USE_CACHE property in
+    the \c .dodsrc file. Use this method to set the state from within a
+    program.
+    @param enabled True to use the cache, False to disable. */
+    void set_cache_enabled(bool enabled) {
+        if (d_http_cache)
+            d_http_cache->set_cache_enabled(enabled);
+    }
+
+    /** Return the current state of the HTTP cache. */
+    bool is_cache_enabled() { return (d_http_cache) ? d_http_cache->is_cache_enabled() : false; }
+
+    HTTPResponse *fetch_url(const string &url);
+};
+
+} // namespace libdap
+
+#endif // _httpconnect_h
diff --git a/HTTPResponse.h b/HTTPResponse.h
new file mode 100644
index 0000000..978b246
--- /dev/null
+++ b/HTTPResponse.h
@@ -0,0 +1,171 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#ifndef http_response_h
+#define http_response_h
+
+#include <unistd.h>
+
+#include <cstdio>
+
+#include <string>
+#include <iostream>
+#include <algorithm>
+#include <iterator>
+#include <vector>
+
+#include "Response.h"
+#include "util.h"
+#include "debug.h"
+
+namespace libdap
+{
+
+// defined in HTTPConnect.cc
+extern int dods_keep_temps;
+extern void close_temp(FILE *s, const string &name);
+
+/** Encapsulate an http response. Instead of directly returning the FILE
+    pointer from which a response is read and vector of headers, return an
+    instance of this object.
+
+    @todo Maybe refactor so that the header parsing code is here and not in
+    HTTPConnect? */
+class HTTPResponse : public Response
+{
+private:
+    std::vector<std::string> *d_headers; // Response headers
+    std::string d_file;  // Temp file that holds response body
+
+protected:
+    /** @name Suppressed default methods */
+    //@{
+    HTTPResponse();
+    HTTPResponse(const HTTPResponse &rs);
+    HTTPResponse &operator=(const HTTPResponse &);
+    //@}
+
+public:
+    /** Build an HTTPResponse object. An instance of this class is used to
+    return an HTTP response (body and headers). If the response is really
+    from a remote server, the current HTTP code stores the body in a
+    temporary file and the headers in a vector<string> object. This class
+    will delete those resources when its destructor is called. If the
+    response does not have a temporary file that needs to be deleted (say
+    it actually comes from a local cache or was read directly into
+    memory), the temp file should be set to "".
+
+    @param s FILE * to the response. Read the response body from this
+    stream.
+    @param status The HTTP response status code.
+    @param h Response headers. This class will delete the pointer when
+    the instance that contains it is destroyed.
+    @param temp_file Name a the temporary file that holds the response
+    body; this file is deleted when this instance is deleted. */
+    HTTPResponse(FILE *s, int status, std::vector<std::string> *h, const std::string &temp_file)
+            : Response(s, status), d_headers(h), d_file(temp_file)
+    {
+        DBG(cerr << "Headers: " << endl);
+        DBGN(copy(d_headers->begin(), d_headers->end(),
+                  ostream_iterator<string>(cerr, "\n")));
+        DBGN(cerr << "end of headers." << endl);
+    }
+
+    /**
+     * @brief Build a HTTPResponse using a cpp fstream
+     * When working with DAP4 responses, use C++ streams for I/0.
+     * @todo Decide on how the temp files fit into DAP4
+     * @param s
+     * @param status
+     * @param h
+     * @param temp_file
+     */
+    HTTPResponse(std::fstream *s, int status, std::vector<std::string> *h, const std::string &temp_file)
+            : Response(s, status), d_headers(h), d_file(temp_file)
+    {
+        DBG(cerr << "Headers: " << endl);
+        DBGN(copy(d_headers->begin(), d_headers->end(),
+                  ostream_iterator<string>(cerr, "\n")));
+        DBGN(cerr << "end of headers." << endl);
+    }
+
+    /** When an instance is destroyed, free the temporary resources: the
+    temp_file and headers are deleted. If the tmp file name is "", it is
+    not deleted. */
+    virtual ~HTTPResponse()
+    {
+        DBG(cerr << "Freeing HTTPConnect resources (" + d_file + ")... ");
+
+        // This can always be done - if the cpp_stream is null, delete has no effect;
+        // if non-null in this class it was allocated in HTTPConnect::plain_fetch_url
+        // (or caching_fetch_url when that's implemented)
+		delete get_cpp_stream();
+		set_cpp_stream(0);
+
+        if (!dods_keep_temps && !d_file.empty()) {
+			if (get_stream()) {
+				close_temp(get_stream(), d_file);
+				set_stream(0);
+			}
+			else {
+				long res = unlink(d_file.c_str());
+				if (res != 0) throw InternalErr(__FILE__, __LINE__, "!FAIL! " + long_to_string(res));
+			}
+        }
+
+        delete d_headers;
+
+        DBGN(cerr << endl);
+    }
+
+    /**
+     * Build a new HTTPResponse object that works with C++ streams. Assume that
+     * the FILE* references a disk file.
+     * @return
+     */
+    void transform_to_cpp() {
+    	// ~Response() will take care of closing the FILE*. A better version of this
+    	// code would not leave the FILE* open when it's not needed, but this implementation
+    	// can use the existing HTTPConnect and HTTPCache software with very minimal
+    	// (or no) modification. jhrg 11/8/13
+    	set_cpp_stream(new std::fstream(d_file.c_str(), std::ios::in|std::ios::binary));
+    }
+
+    /** @name Accessors */
+    //@{
+    virtual std::vector<std::string> *get_headers() const { return d_headers; }
+    virtual std::string get_file() const { return d_file; }
+    //@}
+
+    /** @name Mutators */
+    //@{
+    virtual void set_headers(std::vector<std::string> *h) { d_headers = h; }
+    virtual void set_file(const std::string &n) { d_file = n; }
+    //@}
+};
+
+} // namespace libdap
+
+#endif // http_response_h
diff --git a/INSTALL b/INSTALL
new file mode 100644
index 0000000..168e13c
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1,150 @@
+
+Updated for version 3.19.1 of the OPeNDAP DAP2/4 library software.
+
+Installing the DAP2/4 library
+
+---------------------------------------------------------------------------
+
+BUILDING THE SOFTWARE
+REQUIREMENTS
+NOTES
+
+---------------------------------------------------------------------------
+
+BUILDING THE SOFTWARE
+
+  To build the OPeNDAP DAP2/4 library and the getdap client program, follow
+  these steps:
+
+  0. Please skim REQUIREMENTS and NOTES sections of this file
+     before reporting problems. Thanks.
+
+  1. Type `./configure' at the system prompt. On some systems you may have
+     to type `sh configure'. For people building from git, see below.
+
+  2. Type `make' to build the library, `make check' to run the tests.
+     You must have CppUnit to run `make check.' On a Mandrake/Mandriva
+     system, you need to copy or link conf/config.guess into the
+     'tests' directory and then run the tests.
+
+  3. Type `make install' to install the library files. The libraries
+     (libdap.a. libdapclient.a and libdapserver.a, etc.), their header
+     files and the getdap and dap-config utilities install under
+     /usr/local/ in lib, include/libdap and bin by default. Use the
+     --prefix option to specify a different root directory. For
+     example, './configure --prefix=/opt/opendap' would set the build
+     so that the library was installed in /opt/opendap/lib, ...
+
+Building from Our GIT Repository
+
+  A git clone of https://github.com/opendap/libdap4 will get you the
+  newest code. You'll need the autotools toolchain. First, run
+      autoreconf --force --install --verbose
+  Then run ./configure, make and make check. Use --prefix with configure
+  to set the installation to a location other than /usr/local. Use
+  --enable-developer to turn on the library's asserts and build with
+  debugging symbols. Use --jobs=N with make and make check to run those
+  in parallel on multi core machines and add TESTSUITEFLAGS=-j9 to make
+  check to run the regression tests in parallel.
+
+AFTER INSTALLING
+
+  o Set the PATH environment variable to include the bin directory where
+    libdap was installed. For example, if using the default installation
+    directory, which is /usr/local, make sure that /usr/local/bin is on your
+    path. This is important because often libdap is built so that some other
+    software can then be built, but without setting PATH, those other
+    packages might not detect the newly installed libdap.
+
+  o Set the LD_LIBRARY_PATH environment variable to include the lib directory
+    where libdap was installed. For example, if using the default
+    installation directory, which is /usr/local, make sure that
+    /usr/local/lib is part of LD_LIBRARY_PATH. If you have set $prefix so
+    that the libraries are installed in a directory that's included in
+    ld.so.conf (on linux; other systems may use a slightly different name)
+    you don't have to use LD_LIBRARY_PATH but, but if you don't use
+    LD_LIBRARY_PATH, **make sure to re-run ldconfig**.
+
+REQUIREMENTS
+
+  o To build from a fresh git clone, you'll need automake 1.11,
+    autoconf 2.63 and libtool 2.2.6. Earlier versions may work, but
+    may cause problems, particularly with the 'distcheck' target for
+    make. Given those requirements, use 'autoreconf --force --install
+    --verbose' and then build as described above. You also need bison 3
+    and flex 2.5.35 or greater.
+
+  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, 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
+    libdap.a under /opt/opendap as well, so set prefix to that path:
+    
+	'PATH="$PATH:/opt/opendap/bin';./configure --prefix=/opt/opendap'
+
+  o We build this using gcc 4.2.1 and clang 602.0.53
+
+NOTES
+
+  o Check for other INSTALL.* files to see if there's information specific to
+    your OS (e.g., AIX).
+    
+  o If you are building on a new platform (one for which we don't supply
+    binaries), please run the tests and tell us about any failures. To do a
+    really complete job of this you'll need to get the GNU test system called
+    DejaGNU and the CppUnit unit testing package. It is very simple to
+    install these and we're very willing to help, so don't be shy!
+
+  o If you are developing code that uses the DAP, get autoconf and subversion
+    (SVN). We maintain a SVN-managed source tree that people outside the
+    group may access. See http://scm.opendap.org/trac/
+
+  o The gnulib software is used to provide replacement functions when
+    autoconf detects that is necessary. To update the gnulib, check it out
+    from CVS and run '$gnulib_home/gnulib-tool --lgpl --import' in this
+    directory. Macros in configure.ac supply gnulib-tool with all the
+    information it needs. Only developers working on libdap should ever have
+    to do this.
+
+  o To build a rpm file for a source or binary distribution use 'make rpm' or 
+    'make srpm'. These targets should run 'make dist' to build the required
+    tar.gz file first. You may need root privileges for these targets to work.
+    
+  o To build a Mac OS/X package, use the 'pkg' target. Read over the target
+    to get a feel for how it works. You will need PackageMaker, which should
+    already be installed on your system, and you will need DropDMG, which
+    can be obtained at http://c-command.com/dropdmg/. The target has been
+    automated to generate a ReadMe.txt file, update the Info.plist file, run
+    PackageMaker and DropDMG.
+
+  o DEBUGGING AIDS
+
+    - The DAP API includes the following debugging aids that may be of help
+      to you in developing new OPeNDAP applications.
+
+    - DBG: simple program instrumentation -- see the file debug.h.
+
+    - DBG2: more elaborate program instrumentation -- by convention this is
+      used for output that is half a page or more, while DEBUG is used for
+      single line output.
+
+    - In the past we used efence and dbnew to help debug dynamic memory
+      programming errors. We are now using valgrind and suggest you do the
+      same. On some Linux platforms you should export MALLOC_CHECK_=0 in the
+      shell before running valgrind. This is true for the unit tests and may
+      be true for other code. You'll also notice that the Makefile contains
+      CXX and C compile-time flags for debugging. These will greatly simplify
+      using valgrind and/or a debugger. To use these, don't hack up the
+      Makefile.am. Instead export CXXFLAGS with the values you want and then
+      run configure. For example:
+
+	  export CXXFLAGS="-g3 -O0 -Wall -fno-defer-pop"; ./configure
+
+    - To build with program instrumentation use `--enable-debug=<level>'
+      where <level> is 1 or 2.
diff --git a/Int16.cc b/Int16.cc
new file mode 100644
index 0000000..9e634d8
--- /dev/null
+++ b/Int16.cc
@@ -0,0 +1,324 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1996-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// Implementation for Int32.
+//
+// jhrg 9/7/94
+
+
+#include "config.h"
+
+#include <sstream>
+
+#include "Byte.h"           // synonymous with UInt8 and Char
+#include "Int8.h"
+#include "Int16.h"
+#include "UInt16.h"
+#include "Int32.h"
+#include "UInt32.h"
+#include "Int64.h"
+#include "UInt64.h"
+#include "Float32.h"
+#include "Float64.h"
+#include "Str.h"
+#include "Url.h"
+
+#include "DDS.h"
+#include "Marshaller.h"
+#include "UnMarshaller.h"
+
+#include "DMR.h"
+#include "D4StreamMarshaller.h"
+#include "D4StreamUnMarshaller.h"
+
+#include "util.h"
+#include "parser.h"
+#include "Operators.h"
+#include "dods-limits.h"
+#include "debug.h"
+#include "InternalErr.h"
+
+using std::cerr;
+using std::endl;
+
+namespace libdap {
+
+/** The Int16 constructor accepts the name of the variable to be created.
+
+    @param n A string containing the name of the variable to be created.
+*/
+Int16::Int16(const string &n) : BaseType(n, dods_int16_c), d_buf(0)
+{}
+
+/** The Int16 server-side constructor accepts the name of the variable and
+    the dataset name from which this instance is created.
+
+    @param n A string containing the name of the variable to be created.
+    @param d A string containing the name of the dataset from which this
+    variable is created
+*/
+Int16::Int16(const string &n, const string &d) : BaseType(n, d, dods_int16_c), d_buf(0)
+{}
+
+Int16::Int16(const Int16 &copy_from) : BaseType(copy_from)
+{
+    d_buf = copy_from.d_buf;
+}
+
+BaseType *
+Int16::ptr_duplicate()
+{
+    return new Int16(*this);
+}
+
+Int16 &
+Int16::operator=(const Int16 &rhs)
+{
+    if (this == &rhs)
+        return *this;
+
+    dynamic_cast<BaseType &>(*this) = rhs;
+
+    d_buf = rhs.d_buf;
+
+    return *this;
+}
+
+unsigned int
+Int16::width(bool) const
+{
+    return sizeof(dods_int16);
+}
+
+bool
+Int16::serialize(ConstraintEvaluator &eval, DDS &dds, Marshaller &m, bool ce_eval)
+{
+#if USE_LOCAL_TIMEOUT_SCHEME
+    dds.timeout_on();
+#endif
+    if (!read_p())
+        read();  // read() throws Error and InternalErr
+
+    if (ce_eval && !eval.eval_selection(dds, dataset()))
+        return true;
+#if USE_LOCAL_TIMEOUT_SCHEME
+    dds.timeout_off();
+#endif
+    m.put_int16( d_buf ) ;
+
+    return true;
+}
+
+bool
+Int16::deserialize(UnMarshaller &um, DDS *, bool)
+{
+    um.get_int16( d_buf ) ;
+
+    return false;
+}
+
+void
+Int16::compute_checksum(Crc32 &checksum)
+{
+	checksum.AddData(reinterpret_cast<uint8_t*>(&d_buf), sizeof(d_buf));
+}
+
+/**
+ * @brief Serialize an Int8
+ * @param m
+ * @param dmr Unused
+ * @param eval Unused
+ * @param filter Unused
+ * @exception Error is thrown if the value needs to be read and that operation fails.
+ */
+void
+Int16::serialize(D4StreamMarshaller &m, DMR &, /*ConstraintEvaluator &,*/ bool)
+{
+    if (!read_p())
+        read();          // read() throws Error
+
+    m.put_int16( d_buf ) ;
+}
+
+void
+Int16::deserialize(D4StreamUnMarshaller &um, DMR &)
+{
+    um.get_int16( d_buf ) ;
+}
+
+unsigned int
+Int16::val2buf(void *val, bool)
+{
+    // Jose Garcia
+    // This method is public therefore and I believe it has being designed
+    // to be use by read which must be implemented on the surrogated library,
+    // thus if the pointer val is NULL, is  an Internal Error.
+    if (!val)
+        throw InternalErr(__FILE__, __LINE__,
+                          "The incoming pointer does not contain any data.");
+
+    d_buf = *(dods_int16 *)val;
+
+    return width();
+}
+
+unsigned int
+Int16::buf2val(void **val)
+{
+    // Jose Garcia
+    // The same comment justifying throwing an Error in val2buf applies here.
+    if (!val)
+        throw InternalErr(__FILE__, __LINE__, "NULL pointer.");
+
+    if (!*val)
+        *val = new dods_int16;
+
+    *(dods_int16 *)*val = d_buf;
+
+    return width();
+}
+
+dods_int16
+Int16::value() const
+{
+    return d_buf;
+}
+
+bool
+Int16::set_value(dods_int16 i)
+{
+    d_buf = i;
+    set_read_p(true);
+
+    return true;
+}
+
+void
+Int16::print_val(FILE *out, string space, bool print_decl_p)
+{
+    ostringstream oss;
+    print_val(oss, space, print_decl_p);
+    fwrite(oss.str().data(), sizeof(char), oss.str().length(), out);
+}
+
+void
+Int16::print_val(ostream &out, string space, bool print_decl_p)
+{
+    if (print_decl_p) {
+        print_decl(out, space, false);
+	out << " = " << d_buf << ";\n" ;
+    }
+    else
+	out << d_buf ;
+}
+
+bool
+Int16::ops(BaseType *b, int op)
+{
+
+    // Extract the Byte arg's value.
+    if (!read_p() && !read()) {
+        // Jose Garcia
+        // Since the read method is virtual and implemented outside
+        // libdap++ if we cannot read the data that is the problem
+        // of the user or of whoever wrote the surrogate library
+        // implemeting read therefore it is an internal error.
+        throw InternalErr(__FILE__, __LINE__, "This value not read!");
+    }
+
+    // Extract the second arg's value.
+    if (!b || !(b->read_p() || b->read())) {
+        // Jose Garcia
+        // Since the read method is virtual and implemented outside
+        // libdap++ if we cannot read the data that is the problem
+        // of the user or of whoever wrote the surrogate library
+        // implemeting read therefore it is an internal error.
+        throw InternalErr(__FILE__, __LINE__, "This value not read!");
+    }
+
+    return d4_ops(b, op);
+}
+
+/**
+ * @see BaseType::d4_ops(BaseType *, int)
+ */
+bool Int16::d4_ops(BaseType *b, int op)
+{
+    switch (b->type()) {
+        case dods_int8_c:
+            return Cmp<dods_int16, dods_int8>(op, d_buf, static_cast<Int8*>(b)->value());
+        case dods_byte_c:
+            return SUCmp<dods_int16, dods_byte>(op, d_buf, static_cast<Byte*>(b)->value());
+        case dods_int16_c:
+            return Cmp<dods_int16, dods_int16>(op, d_buf, static_cast<Int16*>(b)->value());
+        case dods_uint16_c:
+            return SUCmp<dods_int16, dods_uint16>(op, d_buf, static_cast<UInt16*>(b)->value());
+        case dods_int32_c:
+            return Cmp<dods_int16, dods_int32>(op, d_buf, static_cast<Int32*>(b)->value());
+        case dods_uint32_c:
+            return SUCmp<dods_int16, dods_uint32>(op, d_buf, static_cast<UInt32*>(b)->value());
+        case dods_int64_c:
+            return Cmp<dods_int16, dods_int64>(op, d_buf, static_cast<Int64*>(b)->value());
+        case dods_uint64_c:
+            return SUCmp<dods_int16, dods_uint64>(op, d_buf, static_cast<UInt64*>(b)->value());
+        case dods_float32_c:
+            return Cmp<dods_int16, dods_float32>(op, d_buf, static_cast<Float32*>(b)->value());
+        case dods_float64_c:
+            return Cmp<dods_int16, dods_float64>(op, d_buf, static_cast<Float64*>(b)->value());
+        case dods_str_c:
+        case dods_url_c:
+            throw Error(malformed_expr, "Relational operators can only compare compatible types (number, string).");
+        default:
+            throw Error(malformed_expr, "Relational operators only work with scalar types.");
+    }
+}
+
+/** @brief dumps information about this object
+ *
+ * Displays the pointer value of this instance and information about this
+ * instance.
+ *
+ * @param strm C++ i/o stream to dump the information to
+ * @return void
+ */
+void
+Int16::dump(ostream &strm) const
+{
+    strm << DapIndent::LMarg << "Int16::dump - ("
+    << (void *)this << ")" << endl ;
+    DapIndent::Indent() ;
+    BaseType::dump(strm) ;
+    strm << DapIndent::LMarg << "value: " << d_buf << endl ;
+    DapIndent::UnIndent() ;
+}
+
+} // namespace libdap
+
diff --git a/Int16.h b/Int16.h
new file mode 100644
index 0000000..ff14f91
--- /dev/null
+++ b/Int16.h
@@ -0,0 +1,106 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1997,1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// Interface for Int16 type.
+//
+// jhrg 9/7/94
+
+#ifndef _int16_h
+#define _int16_h 1
+
+
+#ifndef _dods_datatypes_h
+#include "dods-datatypes.h"
+#endif
+
+#ifndef _basetype_h
+#include "BaseType.h"
+#endif
+
+#ifndef constraint_evaluator_h
+#include "ConstraintEvaluator.h"
+#endif
+
+namespace libdap
+{
+
+class DMR;
+
+/** @brief Holds a 16-bit signed integer value. */
+
+class Int16: public BaseType
+{
+protected:
+    dods_int16 d_buf;
+
+public:
+    Int16(const string &n);
+    Int16(const string &n, const string &d);
+    virtual ~Int16()
+    {}
+
+    Int16(const Int16 &copy_from);
+
+    Int16 &operator=(const Int16 &rhs);
+
+    virtual BaseType *ptr_duplicate();
+    virtual unsigned int width(bool constrained = false) const;
+
+    // DAP2
+    virtual bool serialize(ConstraintEvaluator &eval, DDS &dds, Marshaller &m, bool ce_eval = true);
+    virtual bool deserialize(UnMarshaller &um, DDS *dds, bool reuse = false);
+
+    // DAP4
+    virtual void compute_checksum(Crc32 &checksum);
+    virtual void serialize(D4StreamMarshaller &m, DMR &dmr, /*ConstraintEvaluator &eval,*/ bool filter = false);
+    virtual void deserialize(D4StreamUnMarshaller &um, DMR &dmr);
+
+    virtual unsigned int val2buf(void *val, bool reuse = false);
+    virtual unsigned int buf2val(void **val);
+
+    virtual dods_int16 value() const;
+    virtual bool set_value(dods_int16 val);
+
+    virtual void print_val(FILE *out, string space = "",
+                           bool print_decl_p = true);
+    virtual void print_val(ostream &out, string space = "",
+                           bool print_decl_p = true);
+
+    virtual bool ops(BaseType *b, int op);
+    virtual bool d4_ops(BaseType *b, int op);
+
+    virtual void dump(ostream &strm) const ;
+};
+
+} // namespace libdap
+
+#endif // _int16_h
+
diff --git a/Int32.cc b/Int32.cc
new file mode 100644
index 0000000..10fb57e
--- /dev/null
+++ b/Int32.cc
@@ -0,0 +1,334 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1994-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// Implementation for Int32.
+//
+// jhrg 9/7/94
+
+
+#include "config.h"
+
+//#define DODS_DEBUG
+
+#include <sstream>
+
+#include "Byte.h"           // synonymous with UInt8 and Char
+#include "Int8.h"
+#include "Int16.h"
+#include "UInt16.h"
+#include "Int32.h"
+#include "UInt32.h"
+#include "Int64.h"
+#include "UInt64.h"
+#include "Float32.h"
+#include "Float64.h"
+#include "Str.h"
+#include "Url.h"
+
+#include "DDS.h"
+#include "Marshaller.h"
+#include "UnMarshaller.h"
+
+#include "DMR.h"
+#include "D4StreamMarshaller.h"
+#include "D4StreamUnMarshaller.h"
+
+#include "util.h"
+#include "parser.h"
+#include "Operators.h"
+#include "dods-limits.h"
+#include "debug.h"
+#include "InternalErr.h"
+
+
+using std::cerr;
+using std::endl;
+
+namespace libdap {
+
+/** The Int32 constructor requires only the name of the variable
+    to be created.  The name may be omitted, which will create a
+    nameless variable.  This may be adequate for some applications.
+
+    @param n A string containing the name of the variable to be
+    created.
+*/
+Int32::Int32(const string &n) : BaseType(n, dods_int32_c), d_buf(0)
+{}
+
+/** The Int32 server-side constructor accepts the name of the variable and
+    the dataset name from which this instance is created.
+
+    @param n A string containing the name of the variable to be created.
+    @param d A string containing the name of the dataset from which this
+    variable is created
+*/
+Int32::Int32(const string &n, const string &d) : BaseType(n, d, dods_int32_c), d_buf(0)
+{}
+
+Int32::Int32(const Int32 &copy_from) : BaseType(copy_from)
+{
+    d_buf = copy_from.d_buf;
+}
+
+BaseType *
+Int32::ptr_duplicate()
+{
+    return new Int32(*this);
+}
+
+Int32::~Int32()
+{
+    DBG(cerr << "~Int32" << endl);
+}
+
+Int32 &
+Int32::operator=(const Int32 &rhs)
+{
+    if (this == &rhs)
+        return *this;
+
+    dynamic_cast<BaseType &>(*this) = rhs;
+
+    d_buf = rhs.d_buf;
+
+    return *this;
+}
+
+unsigned int
+Int32::width(bool) const
+{
+    return sizeof(dods_int32);
+}
+
+bool
+Int32::serialize(ConstraintEvaluator &eval, DDS &dds,
+                 Marshaller &m, bool ce_eval)
+{
+#if USE_LOCAL_TIMEOUT_SCHEME
+    dds.timeout_on();
+#endif
+    if (!read_p())
+        read();  // read() throws Error and InternalErr
+
+    if (ce_eval && !eval.eval_selection(dds, dataset()))
+        return true;
+#if USE_LOCAL_TIMEOUT_SCHEME
+    dds.timeout_off();
+#endif
+    m.put_int32( d_buf ) ;
+
+    return true;
+}
+
+bool
+Int32::deserialize(UnMarshaller &um, DDS *, bool)
+{
+    um.get_int32( d_buf ) ;
+
+    return false;
+}
+
+void
+Int32::compute_checksum(Crc32 &checksum)
+{
+	checksum.AddData(reinterpret_cast<uint8_t*>(&d_buf), sizeof(d_buf));
+}
+
+/**
+ * @brief Serialize an Int8
+ * @param m
+ * @param dmr Unused
+ * @param eval Unused
+ * @param filter Unused
+ * @exception Error is thrown if the value needs to be read and that operation fails.
+ */
+void
+Int32::serialize(D4StreamMarshaller &m, DMR &, /*ConstraintEvaluator &,*/ bool)
+{
+    if (!read_p())
+        read();          // read() throws Error
+
+    m.put_int32( d_buf ) ;
+}
+
+void
+Int32::deserialize(D4StreamUnMarshaller &um, DMR &)
+{
+    um.get_int32( d_buf ) ;
+}
+
+unsigned int
+Int32::val2buf(void *val, bool)
+{
+    // Jose Garcia
+    // This method is public therefore and I believe it has being designed
+    // to be use by read which must be implemented on the surrogated library,
+    // thus if the pointer val is NULL, is an Internal Error.
+    if (!val)
+        throw InternalErr(__FILE__, __LINE__,
+                          "The incoming pointer does not contain any data.");
+
+    d_buf = *(dods_int32 *)val;
+
+    return width();
+}
+
+unsigned int
+Int32::buf2val(void **val)
+{
+    // Jose Garcia
+    // The same comment justifying throwing an Error in val2buf applies here.
+    if (!val)
+        throw InternalErr(__FILE__, __LINE__, "NULL pointer.");
+
+    if (!*val)
+        *val = new dods_int32;
+
+    *(dods_int32 *)*val = d_buf;
+
+    return width();
+}
+
+dods_int32
+Int32::value() const
+{
+    return d_buf;
+}
+
+bool
+Int32::set_value(dods_int32 i)
+{
+    d_buf = i;
+    set_read_p(true);
+
+    return true;
+}
+
+void
+Int32::print_val(FILE *out, string space, bool print_decl_p)
+{
+    ostringstream oss;
+    print_val(oss, space, print_decl_p);
+    fwrite(oss.str().data(), sizeof(char), oss.str().length(), out);
+}
+
+void Int32::print_val(ostream &out, string space, bool print_decl_p)
+{
+    if (print_decl_p) {
+        print_decl(out, space, false);
+        out << " = " << (int) d_buf << ";\n";
+    }
+    else
+        out << (int) d_buf;
+}
+
+bool
+Int32::ops(BaseType *b, int op)
+{
+    if (!read_p() && !read()) {
+        // Jose Garcia
+        // Since the read method is virtual and implemented outside
+        // libdap++ if we cannot read the data that is the problem
+        // of the user or of whoever wrote the surrogate library
+        // implemeting read therefore it is an internal error.
+        throw InternalErr(__FILE__, __LINE__, "This value not read!");
+    }
+
+    // Extract the second arg's value.
+    if (!b->read_p() && !b->read()) {
+        // Jose Garcia
+        // Since the read method is virtual and implemented outside
+        // libdap++ if we cannot read the data that is the problem
+        // of the user or of whoever wrote the surrogate library
+        // implemeting read therefore it is an internal error.
+        throw InternalErr(__FILE__, __LINE__, "This value not read!");
+    }
+
+    return d4_ops(b, op);
+}
+
+/**
+ * @see BaseType::d4_ops(BaseType *, int)
+ */
+bool Int32::d4_ops(BaseType *b, int op)
+{
+	DBG(cerr << "b->typename(): " << b->type_name() << endl);
+    switch (b->type()) {
+        case dods_int8_c:
+            return Cmp<dods_int32, dods_int8>(op, d_buf, static_cast<Int8*>(b)->value());
+        case dods_byte_c:
+            return SUCmp<dods_int32, dods_byte>(op, d_buf, static_cast<Byte*>(b)->value());
+        case dods_int16_c:
+            return Cmp<dods_int32, dods_int16>(op, d_buf, static_cast<Int16*>(b)->value());
+        case dods_uint16_c:
+            return SUCmp<dods_int32, dods_uint16>(op, d_buf, static_cast<UInt16*>(b)->value());
+        case dods_int32_c:
+            return Cmp<dods_int32, dods_int32>(op, d_buf, static_cast<Int32*>(b)->value());
+        case dods_uint32_c:
+            return SUCmp<dods_int32, dods_uint32>(op, d_buf, static_cast<UInt32*>(b)->value());
+        case dods_int64_c:
+            return Cmp<dods_int32, dods_int64>(op, d_buf, static_cast<Int64*>(b)->value());
+        case dods_uint64_c:
+            return SUCmp<dods_int32, dods_uint64>(op, d_buf, static_cast<UInt64*>(b)->value());
+        case dods_float32_c:
+            return Cmp<dods_int32, dods_float32>(op, d_buf, static_cast<Float32*>(b)->value());
+        case dods_float64_c:
+            return Cmp<dods_int32, dods_float64>(op, d_buf, static_cast<Float64*>(b)->value());
+        case dods_str_c:
+        case dods_url_c:
+            throw Error(malformed_expr, "Relational operators can only compare compatible types (number, string).");
+        default:
+            throw Error(malformed_expr, "Relational operators only work with scalar types.");
+    }
+}
+
+/** @brief dumps information about this object
+ *
+ * Displays the pointer value of this instance and information about this
+ * instance.
+ *
+ * @param strm C++ i/o stream to dump the information to
+ * @return void
+ */
+void
+Int32::dump(ostream &strm) const
+{
+    strm << DapIndent::LMarg << "Int32::dump - ("
+    << (void *)this << ")" << endl ;
+    DapIndent::Indent() ;
+    BaseType::dump(strm) ;
+    strm << DapIndent::LMarg << "value: " << d_buf << endl ;
+    DapIndent::UnIndent() ;
+}
+
+} // namespace libdap
+
diff --git a/Int32.h b/Int32.h
new file mode 100644
index 0000000..e376262
--- /dev/null
+++ b/Int32.h
@@ -0,0 +1,112 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1994-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// Interface for Int32 type.
+//
+// jhrg 9/7/94
+
+#ifndef _int32_h
+#define _int32_h 1
+
+
+#ifndef _dods_datatypes_h
+#include "dods-datatypes.h"
+#endif
+
+#ifndef _basetype_h
+#include "BaseType.h"
+#endif
+
+#if 0
+#ifndef constraint_evaluator_h
+#include "ConstraintEvaluator.h"
+#endif
+#endif
+
+namespace libdap
+{
+
+class DMR;
+class ConstraintEvaluator;
+
+/** @brief Holds a 32-bit signed integer.
+
+    @see BaseType
+    */
+
+class Int32: public BaseType
+{
+protected:
+    dods_int32 d_buf;
+
+public:
+    Int32(const string &n);
+    Int32(const string &n, const string &d);
+
+    Int32(const Int32 &copy_from);
+
+    Int32 &operator=(const Int32 &rhs);
+
+    virtual ~Int32();
+
+    virtual BaseType *ptr_duplicate();
+    virtual unsigned int width(bool constrained = false) const;
+
+    //DAP2
+    virtual bool serialize(ConstraintEvaluator &eval, DDS &dds, Marshaller &m, bool ce_eval = true);
+    virtual bool deserialize(UnMarshaller &um, DDS *dds, bool reuse = false);
+
+    // DAP4
+    virtual void compute_checksum(Crc32 &checksum);
+    virtual void serialize(D4StreamMarshaller &m, DMR &dmr, /*ConstraintEvaluator &eval,*/ bool filter = false);
+    virtual void deserialize(D4StreamUnMarshaller &um, DMR &dmr);
+
+    virtual unsigned int val2buf(void *val, bool reuse = false);
+    virtual unsigned int buf2val(void **val);
+
+    virtual bool set_value(dods_int32 i);
+    virtual dods_int32 value() const;
+
+    virtual void print_val(FILE *out, string space = "",
+                           bool print_decl_p = true);
+    virtual void print_val(ostream &out, string space = "",
+                           bool print_decl_p = true);
+
+    virtual bool ops(BaseType *b, int op);
+    virtual bool d4_ops(BaseType *b, int op);
+
+    virtual void dump(ostream &strm) const ;
+};
+
+} // namespace libdap
+
+#endif // _int32_h
+
diff --git a/Int64.cc b/Int64.cc
new file mode 100644
index 0000000..41dbaf4
--- /dev/null
+++ b/Int64.cc
@@ -0,0 +1,286 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1994-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// Implementation for Int64.
+//
+// jhrg 9/7/94
+
+
+#include "config.h"
+
+#include <cassert>
+#include <sstream>
+
+#include "Byte.h"           // synonymous with UInt8 and Char
+#include "Int8.h"
+#include "Int16.h"
+#include "UInt16.h"
+#include "Int32.h"
+#include "UInt32.h"
+#include "Int64.h"
+#include "UInt64.h"
+#include "Float32.h"
+#include "Float64.h"
+#include "Str.h"
+#include "Url.h"
+
+#if 0
+#include "Array.h"
+#include "Structure.h"
+#include "Sequence.h"
+#include "Grid.h"
+#endif
+
+#include "DMR.h"
+#include "D4StreamMarshaller.h"
+#include "D4StreamUnMarshaller.h"
+
+#include "util.h"
+#include "parser.h"
+#include "Operators.h"
+#include "dods-limits.h"
+#include "debug.h"
+#include "InternalErr.h"
+
+using std::cerr;
+using std::endl;
+
+namespace libdap {
+
+/** The Int64 constructor requires only the name of the variable
+    to be created.  The name may be omitted, which will create a
+    nameless variable.  This may be adequate for some applications.
+
+    @note This type is available in DAP4 only.
+    See http://docs.opendap.org/index.php/DAP4:_Specification_Volume_1#Atomic_Types
+
+    @param n A string containing the name of the variable to be
+    created.
+*/
+Int64::Int64(const string &n) : BaseType(n, dods_int64_c, true /*is_dap4*/), d_buf(0)
+{}
+
+/** The Int64 server-side constructor accepts the name of the variable and
+    the dataset name from which this instance is created.
+
+    @note This type is available in DAP4 only.
+    See http://docs.opendap.org/index.php/DAP4:_Specification_Volume_1#Atomic_Types
+
+    @param n A string containing the name of the variable to be created.
+    @param d A string containing the name of the dataset from which this
+    variable is created
+*/
+Int64::Int64(const string &n, const string &d) : BaseType(n, d, dods_int64_c, true /*is_dap4*/), d_buf(0)
+{}
+
+Int64::Int64(const Int64 &copy_from) : BaseType(copy_from)
+{
+    d_buf = copy_from.d_buf;
+}
+
+BaseType *
+Int64::ptr_duplicate()
+{
+    return new Int64(*this);
+}
+
+Int64::~Int64()
+{
+    DBG(cerr << "~Int64" << endl);
+}
+
+Int64 &
+Int64::operator=(const Int64 &rhs)
+{
+    if (this == &rhs)
+        return *this;
+
+    dynamic_cast<BaseType &>(*this) = rhs;
+
+    d_buf = rhs.d_buf;
+
+    return *this;
+}
+
+unsigned int
+Int64::width(bool) const
+{
+    return sizeof(dods_int64);
+}
+
+void
+Int64::compute_checksum(Crc32 &checksum)
+{
+	checksum.AddData(reinterpret_cast<uint8_t*>(&d_buf), sizeof(d_buf));
+}
+
+/**
+ * @brief Serialize an Int8
+ * @param m
+ * @param dmr Unused
+ * @param eval Unused
+ * @param filter Unused
+ * @exception Error is thrown if the value needs to be read and that operation fails.
+ */
+void
+Int64::serialize(D4StreamMarshaller &m, DMR &, /*ConstraintEvaluator &,*/ bool)
+{
+    if (!read_p())
+        read();          // read() throws Error
+
+    m.put_int64( d_buf ) ;
+}
+
+void
+Int64::deserialize(D4StreamUnMarshaller &um, DMR &)
+{
+    um.get_int64( d_buf ) ;
+}
+
+dods_int64
+Int64::value() const
+{
+    return d_buf;
+}
+
+bool
+Int64::set_value(dods_int64 i)
+{
+    d_buf = i;
+    set_read_p(true);
+
+    return true;
+}
+
+void Int64::print_val(ostream &out, string space, bool print_decl_p)
+{
+    if (print_decl_p) {
+        print_decl(out, space, false);
+        out << " = " << d_buf << ";\n";
+    }
+    else
+        out << d_buf;
+}
+
+bool
+Int64::ops(BaseType *b, int op)
+{
+    // Get the arg's value.
+    if (!read_p() && !read())
+        throw InternalErr(__FILE__, __LINE__, "This value not read!");
+
+    // Get the second arg's value.
+    if (!b->read_p() && !b->read())
+        throw InternalErr(__FILE__, __LINE__, "This value not read!");
+
+    return d4_ops(b, op);
+
+    return false;
+}
+
+/**
+ * @see BaseType::d4_ops(BaseType *, int)
+ */
+bool Int64::d4_ops(BaseType *b, int op)
+{
+    switch (b->type()) {
+        case dods_int8_c:
+            return Cmp<dods_int64, dods_int8>(op, d_buf, static_cast<Int8*>(b)->value());
+        case dods_byte_c:
+            return SUCmp<dods_int64, dods_byte>(op, d_buf, static_cast<Byte*>(b)->value());
+        case dods_int16_c:
+            return Cmp<dods_int64, dods_int16>(op, d_buf, static_cast<Int16*>(b)->value());
+        case dods_uint16_c:
+            return SUCmp<dods_int64, dods_uint16>(op, d_buf, static_cast<UInt16*>(b)->value());
+        case dods_int32_c:
+            return Cmp<dods_int64, dods_int32>(op, d_buf, static_cast<Int32*>(b)->value());
+        case dods_uint32_c:
+            return SUCmp<dods_int64, dods_uint32>(op, d_buf, static_cast<UInt32*>(b)->value());
+        case dods_int64_c:
+            return Cmp<dods_int64, dods_int64>(op, d_buf, static_cast<Int64*>(b)->value());
+        case dods_uint64_c:
+            return SUCmp<dods_int64, dods_uint64>(op, d_buf, static_cast<UInt64*>(b)->value());
+        case dods_float32_c:
+            return Cmp<dods_int64, dods_float32>(op, d_buf, static_cast<Float32*>(b)->value());
+        case dods_float64_c:
+            return Cmp<dods_int64, dods_float64>(op, d_buf, static_cast<Float64*>(b)->value());
+        case dods_str_c:
+        case dods_url_c:
+            throw Error(malformed_expr, "Relational operators can only compare compatible types (number, string).");
+        default:
+            throw Error(malformed_expr, "Relational operators only work with scalar types.");
+    }
+}
+
+/** @brief DAP4 to DAP2 transform
+ *
+ * Return a DAP2 'copy' of the variable.
+ *
+ * @return A pointer to the transformed variable
+ */
+vector<BaseType *> *
+Int64::transform_to_dap2(AttrTable *)
+{
+#if 0
+    BaseType *dest = this->ptr_duplicate();
+    // convert the d4 attributes to a dap2 attribute table.
+    AttrTable *attrs = this->attributes()->get_AttrTable();
+    attrs->set_name(name());
+    dest->set_attr_table(*attrs);
+    dest->set_is_dap4(false);
+    // attrs->print(cerr,"",true);
+    return dest;
+#endif
+
+    return NULL;
+}
+
+/** @brief dumps information about this object
+ *
+ * Displays the pointer value of this instance and information about this
+ * instance.
+ *
+ * @param strm C++ i/o stream to dump the information to
+ * @return void
+ */
+void
+Int64::dump(ostream &strm) const
+{
+    strm << DapIndent::LMarg << "Int64::dump - ("
+    << (void *)this << ")" << endl ;
+    DapIndent::Indent() ;
+    BaseType::dump(strm) ;
+    strm << DapIndent::LMarg << "value: " << d_buf << endl ;
+    DapIndent::UnIndent() ;
+}
+
+} // namespace libdap
+
diff --git a/Int64.h b/Int64.h
new file mode 100644
index 0000000..ce8a1d8
--- /dev/null
+++ b/Int64.h
@@ -0,0 +1,95 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2012 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#ifndef _int64_h
+#define _int64_h 1
+
+#ifndef _dods_datatypes_h
+#include "dods-datatypes.h"
+#endif
+
+#ifndef _basetype_h
+#include "BaseType.h"
+#endif
+
+namespace libdap
+{
+
+class ConstraintEvaluator;
+class Marshaller;
+class UnMarshaller;
+
+/** @brief Holds a64-bit signed integer.
+
+    @see BaseType
+    */
+
+class Int64: public BaseType
+{
+	virtual unsigned int val2buf(void *val, bool)  {
+    	set_value(*reinterpret_cast<dods_int64*>(val));
+    	return sizeof(dods_int64);
+    }
+    virtual unsigned int buf2val(void **) { throw InternalErr(__FILE__, __LINE__, "Not implemented for Int64"); }
+    virtual void print_val(FILE *, string, bool) { throw InternalErr(__FILE__, __LINE__, "Not implemented for Int64"); }
+
+protected:
+    dods_int64 d_buf;
+
+public:
+    Int64(const string &n);
+    Int64(const string &n, const string &d);
+
+    Int64(const Int64 &copy_from);
+
+    Int64 &operator=(const Int64 &rhs);
+
+    virtual ~Int64();
+
+    virtual BaseType *ptr_duplicate();
+
+    virtual unsigned int width(bool constrained = false) const;
+
+    // DAP4
+    virtual void compute_checksum(Crc32 &checksum);
+    virtual void serialize(D4StreamMarshaller &m, DMR &dmr, /*ConstraintEvaluator &eval,*/ bool filter = false);
+    virtual void deserialize(D4StreamUnMarshaller &um, DMR &dmr);
+
+    virtual bool set_value(dods_int64 i);
+    virtual dods_int64 value() const;
+
+    virtual void print_val(ostream &out, string space = "", bool print_decl_p = true);
+
+    virtual bool ops(BaseType *b, int op);
+    virtual bool d4_ops(BaseType *b, int op);
+    virtual std::vector<BaseType *> *transform_to_dap2(AttrTable *parent_attr_table);
+
+    virtual void dump(ostream &strm) const ;
+};
+
+} // namespace libdap
+
+#endif // _int64_h
+
diff --git a/Int8.cc b/Int8.cc
new file mode 100644
index 0000000..591fcc3
--- /dev/null
+++ b/Int8.cc
@@ -0,0 +1,264 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2012 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#include "config.h"
+
+#include <cassert>
+#include <sstream>
+
+#include "Byte.h"           // synonymous with UInt8 and Char
+#include "Int8.h"
+#include "Int16.h"
+#include "UInt16.h"
+#include "Int32.h"
+#include "UInt32.h"
+#include "Int64.h"
+#include "UInt64.h"
+#include "Float32.h"
+#include "Float64.h"
+#include "Str.h"
+#include "Url.h"
+
+#include "D4StreamMarshaller.h"
+#include "D4StreamUnMarshaller.h"
+
+#include "DDS.h"
+#include "util.h"
+#include "parser.h"
+#include "Operators.h"
+#include "dods-limits.h"
+#include "debug.h"
+#include "InternalErr.h"
+
+using std::cerr;
+using std::endl;
+
+namespace libdap {
+
+/** The Int8 constructor accepts the name of the variable to be created.
+
+    @note This type is available in DAP4 only.
+    See http://docs.opendap.org/index.php/DAP4:_Specification_Volume_1#Atomic_Types
+
+    @param n A string containing the name of the variable to be created.
+*/
+Int8::Int8(const string &n) : BaseType(n, dods_int8_c, true /*is_dap4*/), d_buf(0)
+{}
+
+/** The Int8 server-side constructor accepts the name of the variable and
+    the dataset name from which this instance is created. This is a signed
+    8-bit integer and was added for DAP4; Byte and UInt8 are unsigned 8-bit
+    integers.
+
+    @note This integer type cannot be used with DAP2; it is only present in DAP4.
+    See http://docs.opendap.org/index.php/DAP4:_Specification_Volume_1#Atomic_Types.
+
+    @param n A string containing the name of the variable to be created.
+    @param d A string containing the name of the dataset from which this
+    variable is created
+*/
+Int8::Int8(const string &n, const string &d) : BaseType(n, d, dods_int8_c, true /*is_dap4*/), d_buf(0)
+{}
+
+Int8::Int8(const Int8 &copy_from) : BaseType(copy_from)
+{
+    d_buf = copy_from.d_buf;
+}
+
+BaseType *
+Int8::ptr_duplicate()
+{
+    return new Int8(*this);
+}
+
+Int8 &
+Int8::operator=(const Int8 &rhs)
+{
+    if (this == &rhs)
+        return *this;
+
+    static_cast<BaseType &>(*this) = rhs;
+
+    d_buf = rhs.d_buf;
+
+    return *this;
+}
+
+unsigned int
+Int8::width(bool) const
+{
+    return sizeof(dods_int8);
+}
+
+void
+Int8::compute_checksum(Crc32 &checksum)
+{
+	checksum.AddData(reinterpret_cast<uint8_t*>(&d_buf), sizeof(d_buf));
+}
+
+/**
+ * @brief Serialize an Int8
+ * @param m
+ * @param dmr Unused
+ * @param eval Unused
+ * @param filter Unused
+ * @exception Error is thrown if the value needs to be read and that operation fails.
+ */
+void
+Int8::serialize(D4StreamMarshaller &m, DMR &, /*ConstraintEvaluator &,*/ bool)
+{
+    if (!read_p())
+        read();          // read() throws Error
+
+    m.put_int8( d_buf ) ;
+}
+
+void
+Int8::deserialize(D4StreamUnMarshaller &um, DMR &)
+{
+    um.get_int8( d_buf ) ;
+}
+
+dods_int8
+Int8::value() const
+{
+    return d_buf;
+}
+
+bool
+Int8::set_value(dods_int8 i)
+{
+    d_buf = i;
+    set_read_p(true);
+
+    return true;
+}
+
+void Int8::print_val(ostream &out, string space, bool print_decl_p)
+{
+	if (print_decl_p) {
+		print_decl(out, space, false);
+		out << " = " << (int)d_buf << ";\n";
+	}
+	else
+		out << (int)d_buf;
+}
+
+bool
+Int8::ops(BaseType *b, int op)
+{
+    // Get the arg's value.
+    if (!read_p() && !read())
+        throw InternalErr(__FILE__, __LINE__, "This value not read!");
+
+    // Get the second arg's value.
+    if (!b->read_p() && !b->read())
+        throw InternalErr(__FILE__, __LINE__, "This value not read!");
+
+    return d4_ops(b, op);
+}
+
+/**
+ * @see BaseType::d4_ops(BaseType *, int)
+ */
+bool Int8::d4_ops(BaseType *b, int op)
+{
+    switch (b->type()) {
+        case dods_int8_c:
+            return Cmp<dods_int8, dods_int8>(op, d_buf, static_cast<Int8*>(b)->value());
+        case dods_byte_c:
+            return SUCmp<dods_int8, dods_byte>(op, d_buf, static_cast<Byte*>(b)->value());
+        case dods_int16_c:
+            return Cmp<dods_int8, dods_int16>(op, d_buf, static_cast<Int16*>(b)->value());
+        case dods_uint16_c:
+            return SUCmp<dods_int8, dods_uint16>(op, d_buf, static_cast<UInt16*>(b)->value());
+        case dods_int32_c:
+            return Cmp<dods_int8, dods_int32>(op, d_buf, static_cast<Int32*>(b)->value());
+        case dods_uint32_c:
+            return SUCmp<dods_int8, dods_uint32>(op, d_buf, static_cast<UInt32*>(b)->value());
+        case dods_int64_c:
+            return Cmp<dods_int8, dods_int64>(op, d_buf, static_cast<Int64*>(b)->value());
+        case dods_uint64_c:
+            return SUCmp<dods_int8, dods_uint64>(op, d_buf, static_cast<UInt64*>(b)->value());
+        case dods_float32_c:
+            return Cmp<dods_int8, dods_float32>(op, d_buf, static_cast<Float32*>(b)->value());
+        case dods_float64_c:
+            return Cmp<dods_int8, dods_float64>(op, d_buf, static_cast<Float64*>(b)->value());
+        case dods_str_c:
+        case dods_url_c:
+            throw Error(malformed_expr, "Relational operators can only compare compatible types (number, string).");
+        default:
+            throw Error(malformed_expr, "Relational operators only work with scalar types.");
+    }
+}
+
+/** @brief DAP4 to DAP2 transform
+ *
+ * Return a DAP2 'copy' of the variable. In this
+ * case, since Int8 doesn't have a natural representation
+ * in DAP2 we are going to just call it a Byte .
+ * Why? Because SIZE.
+ *
+ * @param root The root group that should hold this new variable. Add Group-level
+ * stuff here (e.g., D4Dimensions).
+ * @param container Add the new variable to this container.
+ *
+ * @return A pointer to the transformed variable
+ */
+std::vector<BaseType *> *
+Int8::transform_to_dap2(AttrTable *parent_attr_table)
+{
+    vector<BaseType *> *vec = BaseType::transform_to_dap2(parent_attr_table);
+    if(vec->size()!=1){
+        ostringstream oss;
+        oss << __func__ << "() -  Something Bad Happened. This transform should produce only ";
+        oss << " a single BaseType yet it produced " << vec->size();
+        throw new Error(internal_error,oss.str());
+    }
+    (*vec)[0]->set_type(dods_byte_c);
+    return vec;
+}
+/**
+ * @brief dumps information about this object
+ *
+ * Displays the pointer value of this instance and information about this
+ * instance.
+ *
+ * @param strm C++ i/o stream to dump the information to
+ * @return void
+ */
+void
+Int8::dump(ostream &strm) const
+{
+    strm << DapIndent::LMarg << "Int8::dump - ("
+    << (void *)this << ")" << endl ;
+    DapIndent::Indent() ;
+    BaseType::dump(strm) ;
+    strm << DapIndent::LMarg << "value: " << d_buf << endl ;
+    DapIndent::UnIndent() ;
+}
+
+} // namespace libdap
+
diff --git a/Int8.h b/Int8.h
new file mode 100644
index 0000000..706b2c8
--- /dev/null
+++ b/Int8.h
@@ -0,0 +1,89 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2012 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#ifndef _int8_h
+#define _int8_h 1
+
+#ifndef _dods_datatypes_h
+#include "dods-datatypes.h"
+#endif
+
+#ifndef _basetype_h
+#include "BaseType.h"
+#endif
+
+namespace libdap
+{
+
+/** @brief Holds an 8-bit signed integer value. */
+
+class Int8: public BaseType
+{
+	// This is used in BaseType *Vector::var(unsigned int i)
+	virtual unsigned int val2buf(void *val, bool)  {
+    	set_value(*reinterpret_cast<dods_int8*>(val));
+    	return sizeof(dods_int8);
+    }
+    virtual unsigned int buf2val(void **) { throw InternalErr(__FILE__, __LINE__, "buf2val: Not implemented for Int8"); }
+    virtual void print_val(FILE *, string , bool) { throw InternalErr(__FILE__, __LINE__, "print_val: Not implemented for Int8"); }
+
+protected:
+    dods_int8 d_buf;
+
+public:
+    Int8(const string &n);
+    Int8(const string &n, const string &d);
+    virtual ~Int8()
+    {}
+
+    Int8(const Int8 &copy_from);
+
+    Int8 &operator=(const Int8 &rhs);
+
+    virtual BaseType *ptr_duplicate();
+
+    virtual unsigned int width(bool constrained = false) const;
+
+    // DAP4
+    virtual void compute_checksum(Crc32 &checksum);
+    virtual void serialize(D4StreamMarshaller &m, DMR &dmr, /*ConstraintEvaluator &eval,*/ bool filter = false);
+    virtual void deserialize(D4StreamUnMarshaller &um, DMR &dmr);
+
+    virtual dods_int8 value() const;
+    virtual bool set_value(dods_int8 val);
+
+    virtual void print_val(ostream &out, string space = "", bool print_decl_p = true);
+
+    virtual bool ops(BaseType *b, int op);
+    virtual bool d4_ops(BaseType *b, int op);
+    virtual std::vector<BaseType *> *transform_to_dap2(AttrTable *parent_attr_table);
+
+    virtual void dump(ostream &strm) const ;
+};
+
+} // namespace libdap
+
+#endif // _int16_h
+
diff --git a/InternalErr.cc b/InternalErr.cc
new file mode 100644
index 0000000..ca1e2a9
--- /dev/null
+++ b/InternalErr.cc
@@ -0,0 +1,94 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// Implementation for the InternalErr class.
+
+
+#include "config.h"
+
+#include <string>
+#include <sstream>
+
+#include "InternalErr.h"
+#include "util.h"
+
+using std::endl;
+using std::ostringstream;
+
+namespace libdap {
+
+InternalErr::InternalErr() : Error()
+{
+    _error_code = internal_error;
+}
+
+InternalErr::InternalErr(const string &msg) : Error()
+{
+    _error_code = internal_error;
+    _error_message = "";
+    _error_message += "An internal error was encountered:\n";
+    _error_message += msg + "\n";
+    _error_message += "Please report this to support@opendap.org\n";
+}
+
+
+//InternalErr::InternalErr(string msg, string file, int line)
+//    : Error(unknown_error, msg)
+InternalErr::InternalErr(const string &file, const int &line, const string &msg) : Error()
+{
+    _error_code = internal_error;
+    _error_message = "";
+    _error_message += "An internal error was encountered in " + file + " at line ";
+    // Jose Garcia. Next we append line to the string _error_code.
+    // This function is defined in util.h
+    append_long_to_string(line, 10, _error_message);
+    _error_message += ":\n";
+    _error_message += msg + "\n";
+    _error_message += "Please report this to support@opendap.org\n";
+}
+
+InternalErr::InternalErr(const InternalErr &copy_from)
+        : Error(copy_from)
+{}
+
+InternalErr::~InternalErr()
+{}
+
+/**
+    @brief Is the InternalErr object valid?
+    @return TRUE if the object is valid, FALSE otherwise. */
+bool
+InternalErr::OK()
+{
+    return Error::OK();
+}
+
+} // namespace libdap
diff --git a/InternalErr.h b/InternalErr.h
new file mode 100644
index 0000000..e99d2d1
--- /dev/null
+++ b/InternalErr.h
@@ -0,0 +1,93 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// Interface for the InternalErr class
+//
+// 5/3/99 jhrg
+
+#ifndef _internalerr_h
+#define _internalerr_h 1
+
+
+#include <string>
+
+#ifndef _error_h
+#include "Error.h"
+#endif
+
+namespace libdap
+{
+
+
+/** The InternalErr class is used to signal that somewhere inside libdap a
+    software fault was found. This class wraps the message text in some
+    boiler plate that asks the error be reported to us (tech support).
+
+    NB: This class Adds some text to the message and might, in the future,
+    hold information not also held in Error. However, all Error objects
+    thrown on the server-side of libdap that cannot be resolved (and that's all
+    of them for now, 5/3/99 jhrg) will be sent to the client-side <i>using
+    Error objects</i>. That is, the information recorded in an InternalErr
+    object will be sent by calling the <tt>print(...)</tt> mfunc of Error.
+
+    @brief A class for software fault reporting.
+    @author jhrg */
+
+class InternalErr: public Error
+{
+
+public:
+    /** These constructors always set the error code to <tt>internal_error</tt>.
+
+    Note that there is no way to specify an error correction program for
+    an internal error.
+
+    @brief Constructors for the Error object
+    @name Constructors */
+    //@{
+    ///
+    InternalErr(const string &msg);
+    ///
+    InternalErr(const string &file, const int &line, const string &msg);
+    ///
+    InternalErr();
+    ///
+    InternalErr(const InternalErr &copy_from);
+    //@}
+
+    virtual ~InternalErr();
+
+    bool OK();
+};
+
+} // namespace libdap
+
+#endif // _internalerr_h
diff --git a/Keywords2.cc b/Keywords2.cc
new file mode 100644
index 0000000..73d3330
--- /dev/null
+++ b/Keywords2.cc
@@ -0,0 +1,209 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2011 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+#include "config.h"
+
+#include <iostream>
+#include <vector>
+
+//#define DODS_DEBUG
+
+#include "Keywords2.h"
+#include "Error.h"
+#include "escaping.h"
+#include "debug.h"
+
+using namespace std;
+
+namespace libdap {
+
+Keywords::Keywords()
+{
+    // Load known keywords and their allowed values
+    vector<string> v1(7);
+    v1[0] = "2"; v1[1] = "2.0"; v1[2] = "3.2"; v1[3] = "3.3"; v1[4] = "3.4";
+    v1[5] = "4"; v1[6] = "4.0";
+    value_set_t vs = value_set_t(v1.begin(), v1.end());
+    d_known_keywords["dap"] = vs;
+
+    vector<string> v2(4);
+    v2[0] = "md5"; v2[1] = "MD5"; v2[2] = "sha1"; v2[3] = "SHA1";
+    value_set_t vs2 = value_set_t(v2.begin(), v2.end());
+    d_known_keywords["checksum"] = vs2;
+}
+
+Keywords::~Keywords()
+{
+}
+
+/** Static function to parse the keyword notation.
+ * @param kw the keyword clause '<word> ( <value> )'
+ * @param word (result) the word
+ * @param value (result) the value
+ * @return True if the parse was successful (word and value contain useful
+ * results) and False otherwise.
+ */
+static bool f_parse_keyword(const string &kw, string &word, string &value)
+{
+    word = "";
+    value = "";
+    string::size_type i = kw.find('(');
+    if (i == string::npos)
+	return false;
+    word = kw.substr(0, i);
+    string::size_type j = kw.find(')');
+    if (j == string::npos)
+	return false;
+    ++i; // Move past the opening paren
+    value = kw.substr(i, j-i);
+
+    return (!word.empty() && !value.empty());
+}
+
+/**
+ * Add the keyword to the set of keywords that apply to this request.
+ * @note Should call m_is_valid_keyword first.
+ * @param word The keyword/function name
+ * @param value The keyword/function value
+ */
+void Keywords::m_add_keyword(const keyword &word, const keyword_value &value)
+{
+    d_parsed_keywords[word] = value;
+}
+
+/** Is the string a valid keyword clause? Assumption: the word and value have
+ * already been successfully parsed.
+ * @param word The keyword/function name
+ * @param value The keyword/function value
+ * @return True if the string is valid keyword and the value is one of the
+ * allowed values.
+ */
+bool Keywords::m_is_valid_keyword(const keyword &word, const keyword_value &value) const
+{
+    map<keyword, value_set_t>::const_iterator ci = d_known_keywords.find(word);
+    if (ci == d_known_keywords.end())
+	return false;
+    else {
+	value_set_t vs = ci->second;
+
+	if (vs.find(value) == vs.end())
+	    throw Error("Bad value passed to the keyword/function: " + word);
+    }
+
+    return true;
+}
+
+/**
+ * Is the word one of the known keywords for this version of libdap?
+ * @param s As a string, including the value
+ * @return true if the keyword is known
+ */
+bool Keywords::is_known_keyword(const string &word) const
+{
+	return d_known_keywords.count(word) == 1;
+}
+
+/**
+ * Get a list of the strings that make up the set of current keywords for
+ * this request.
+ * @return The list of keywords as a list of string objects.
+ */
+list<Keywords::keyword> Keywords::get_keywords() const
+{
+    list<keyword> kws;
+    map<keyword, keyword_value>::const_iterator i;
+    for (i = d_parsed_keywords.begin(); i != d_parsed_keywords.end(); ++i)
+    	kws.push_front((*i).first);
+
+    return kws;
+}
+
+
+/**
+ * Lookup a keyword_kind and return true if it has been set for this request,
+ * otherwise return false.
+ * @param kw Keyword
+ * @return true if the keyword is set.
+ */
+bool Keywords::has_keyword(const keyword &kw) const
+{
+    return d_parsed_keywords.count(kw) == 1;
+}
+
+/** Look at the parsed keywords for the value associated with a given keyword.
+ *
+ * @param k
+ * @return The value
+ */
+Keywords::keyword_value Keywords::get_keyword_value(const keyword &kw) const
+{
+    if (d_known_keywords.find(kw) == d_known_keywords.end())
+    	throw Error("Keyword not known (" + kw + ")");
+
+    return d_parsed_keywords.find(kw)->second;
+}
+
+/** Parse the constraint expression, removing all keywords. As a side effect,
+ * return the remaining CE.
+ * @param ce
+ * @return The CE stripped of all recognized keywords.
+ */
+string Keywords::parse_keywords(const string &ce)
+{
+    // Get the whole CE
+    string projection = www2id(ce, "%", "%20");
+    string selection = "";
+
+    // Separate the selection part (which follows/includes the first '&')
+    string::size_type amp = projection.find('&');
+    if (amp != string::npos) {
+	selection = projection.substr(amp);
+	projection = projection.substr(0, amp);
+    }
+
+    // Extract keywords; add to the Keywords keywords. For this, scan for
+    // a known set of keywords and assume that anything else is part of the
+    // projection and should be left alone. Keywords must come before variables
+    // The 'projection' string will look like: '' or 'dap4.0' or 'dap4.0,u,v'
+    while (!projection.empty()) {
+	string::size_type i = projection.find(',');
+	string next_word = projection.substr(0, i);
+	string word, value;
+	if (f_parse_keyword(next_word, word, value)
+	    && m_is_valid_keyword(word, value)) {
+	    m_add_keyword(word, value);
+	    if (i != string::npos)
+		projection = projection.substr(i + 1);
+	    else
+		projection = "";
+	}
+	else {
+	    break; // exit on first non-keyword
+	}
+    }
+
+    // The CE is whatever is left after removing the keywords
+    return projection + selection;
+}
+
+}
diff --git a/Keywords2.h b/Keywords2.h
new file mode 100644
index 0000000..1d6fa13
--- /dev/null
+++ b/Keywords2.h
@@ -0,0 +1,89 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2011 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#ifndef KEYWORDS_H_
+#define KEYWORDS_H_
+
+#include <string>
+#include <set>
+#include <map>
+#include <list>
+
+using namespace std;
+
+namespace libdap {
+
+/**
+ * Manage keywords for libdap. These are passed in to the library using the
+ * constraint expression - in fact they are an extension of the CE and this
+ * class implements the parsing needed to remove them from the CE so that
+ * the ConstraintExpression evaluator can parse it (because the keywords are
+ * not identifiers in the DDS, they will cause a parse error.
+ *
+ * @note If pointers are added to this code, modify DDS so copying still works!
+ *
+ * @note The keywords are used to specify the DAP version(s) that the client
+ * can understand.
+ *
+ * @note Keywords are parsed and used by the BES in Hyrax - libdap never makes
+ * calls to these methods.
+ */
+class Keywords {
+public:
+    // convenience types
+    typedef string keyword;
+    typedef string keyword_value;
+    typedef set<keyword_value> value_set_t;
+
+private:
+    /// Holds the keywords and value of the keywords passed in the CE
+    map<keyword, keyword_value> d_parsed_keywords;
+
+    /// Holds all of the keywords
+    map<keyword, value_set_t> d_known_keywords;
+
+    virtual void m_add_keyword(const keyword &word, const keyword_value &value);
+    virtual bool m_is_valid_keyword(const keyword &word, const keyword_value &value) const;
+
+public:
+    Keywords();
+    virtual ~Keywords();
+
+    virtual string parse_keywords(const string &ce);
+
+    // Is this keyword in the dictionary?
+    virtual bool is_known_keyword(const string &s) const;
+
+    // Get a list of all of the keywords parsed
+    virtual list<keyword> get_keywords() const;
+    // Has a particular keyword been parsed
+    virtual bool has_keyword(const keyword &kw) const;
+
+    // Get the parsed keyword (and it's dictionary value) of a particular kind
+    virtual keyword_value get_keyword_value(const keyword &kw) const;
+};
+
+}
+
+#endif /* KEYWORDS_H_ */
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..f5dab89
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,365 @@
+# Build libdap, libtest-types.a, getdap, getdap4
+
+AUTOMAKE_OPTIONS = foreign check-news subdir-objects
+ACLOCAL_AMFLAGS = -I conf -I gl/m4
+
+aclocaldir=$(datadir)/aclocal
+pkgconfigdir=$(libdir)/pkgconfig
+
+AM_CPPFLAGS = -I$(top_builddir)/gl -I$(top_srcdir)/gl -I$(top_srcdir)/GNU $(XML2_CFLAGS)
+AM_CXXFLAGS = 
+
+if COMPILER_IS_GCC
+AM_CXXFLAGS += -Wall -W -Wcast-align
+endif
+
+# These are not used by automake but are often useful for certain types of
+# debugging. The best way to use these is to run configure as:
+# ./configure --disable-shared CXXFLAGS=...
+# or ./configure --enable-developer --disable-shared
+# the --disable-shared is not required, but it seems to help with debuggers.
+CXXFLAGS_DEBUG = -g3 -O0  -Wall -W -Wcast-align 
+TEST_COV_FLAGS = -g3 -ftest-coverage -fprofile-arcs
+
+if BUILD_DEVELOPER
+AM_CXXFLAGS += $(CXXFLAGS_DEBUG)
+endif
+
+SUBDIRS = gl d4_ce d4_function . unit-tests tests 
+DIST_SUBDIRS = gl d4_ce d4_function unit-tests tests
+
+noinst_LTLIBRARIES = libparsers.la
+
+lib_LTLIBRARIES = libdap.la libdapclient.la libdapserver.la
+
+bin_SCRIPTS = dap-config dap-config-pkgconfig
+
+bin_PROGRAMS = getdap getdap4
+
+# Including the generated grammar sources in BUILT_SOURCES ensures
+# they are built first. jhrg 6/18/15
+BUILT_SOURCES = $(BISON_SRC) $(FLEX_SRC) dods-datatypes.h xdr-datatypes.h \
+	getdap.1 dap-config.1 getdap4.1
+
+man_MANS = getdap.1 dap-config.1 getdap4.1
+
+%.1: %.man1
+	groff -t -e -mandoc -Tascii $< | col -bx > $@
+
+libparsers_la_SOURCES = $(FLEX_SRC) $(BISON_SRC)  
+libparsers_la_CPPFLAGS = $(XML2_CFLAGS)
+libparsers_la_LIBADD = $(XML2_LIBS)
+
+libdap_la_SOURCES = $(DAP_SRC) $(GNU_SRC)
+if DAP4_DEFINED
+    libdap_la_SOURCES += $(DAP4_ONLY_SRC)
+endif
+
+libdap_la_LDFLAGS = -version-info $(LIBDAP_VERSION)
+libdap_la_CPPFLAGS = $(AM_CPPFLAGS)
+libdap_la_LIBADD = $(XML2_LIBS) $(PTHREAD_LIBS) gl/libgnu.la d4_ce/libd4_ce_parser.la \
+d4_function/libd4_function_parser.la libparsers.la
+
+if DAP4_DEFINED
+    libdap_la_LIBADD += -lcrypto 
+endif
+
+libdapclient_la_SOURCES = $(CLIENT_SRC) 
+libdapclient_la_LDFLAGS = -version-info $(CLIENTLIB_VERSION)
+libdapclient_la_CPPFLAGS = $(AM_CPPFLAGS) $(CURL_CFLAGS)
+libdapclient_la_LIBADD = $(CURL_LIBS) libdap.la $(PTHREAD_LIBS)
+if DAP4_DEFINED
+    libdapclient_la_SOURCES += $(DAP4_CLIENT_HDR) $(DAP4_CLIENT_SRC)
+endif
+
+libdapserver_la_SOURCES = $(SERVER_SRC)
+libdapserver_la_LDFLAGS = -version-info $(SERVERLIB_VERSION)
+libdapserver_la_LIBADD = libdap.la $(UUID_LIBS)
+
+pkginclude_HEADERS = $(DAP_HDR) $(GNU_HDR) $(CLIENT_HDR) $(SERVER_HDR) 
+if DAP4_DEFINED
+    pkginclude_HEADERS += $(DAP4_ONLY_HDR) $(DAP4_CLIENT_HDR)
+endif
+
+noinst_HEADERS = config_dap.h
+
+getdap_SOURCES = getdap.cc
+getdap_LDADD = libdapclient.la libdap.la
+getdap_CPPFLAGS = $(AM_CPPFLAGS) $(CURL_CFLAGS)
+
+getdap4_SOURCES = getdap4.cc
+getdap4_LDADD = libdapclient.la libdap.la
+getdap4_CPPFLAGS = $(AM_CPPFLAGS) $(CURL_CFLAGS)
+
+LEX_YACC_EXTRA = das.lex das.yy dds.lex dds.yy ce_expr.lex ce_expr.yy \
+Error.lex Error.yy
+
+EXTRA_DIST = ChangeLog COPYING README.dodsrc COPYRIGHT_URI	\
+	COPYRIGHT_W3C GNU/README doxy.conf.in libdap.spec VCPP	\
+	dods-datatypes-static.h xdr-datatypes-static.h		\
+	dap-config-pkgconfig $(LEX_YACC_EXTRA) OSX_Resources	\
+	getdap.man1 dap-config.man1 getdap4.man1
+
+dist_aclocal_DATA = conf/libdap.m4
+pkgconfig_DATA = libdap.pc libdapclient.pc libdapserver.pc
+
+CLEANFILES = *.log *.output *.gcda *.gcno $(BISON_SRC) $(FLEX_SRC) \
+	dods-datatypes.h xdr-datatypes.h getdap.1 dap-config.1 getdap4.1
+
+HTML_DOCS=html
+DOXYGEN_CONF=doxy.conf
+
+# This target only builds the documents, it does not move them to
+# github. Use the 'gh-docs' target below for that.
+.PHONY: docs
+docs: ${DOXYGEN_CONF}
+	doxygen ${DOXYGEN_CONF}
+
+# GitHub.io docs 
+.PHONY: gh-docs 
+gh-docs:
+	./build-gh-docs.sh
+
+# cccc computes metrics like Lines of code and McCabe. It's available
+# on the web...
+.PHONY: cccc
+cccc:
+	-mkdir cccc
+	cccc --outdir=cccc $(DAP_SRC) $(SERVER_SRC) $(CLIENT_SRC) \
+	$(DAP_HDR) $(SERVER_HDR) $(CLIENT_HDR)
+
+###########################################################################
+
+# Fortify targets.
+.PHONY: fortify
+fortify: $(BUILT_SOURCES)
+	(cd gl && sourceanalyzer -b @PACKAGE@-gl $(MAKE) $(MFLAGS) )
+	(cd d4_ce && sourceanalyzer -b @PACKAGE@-d4_ce $(MAKE) $(MFLAGS) )
+	sourceanalyzer -b @PACKAGE@-parsers $(MAKE) $(MFLAGS) libparsers.la
+	sourceanalyzer -b @PACKAGE@ $(MAKE) $(MFLAGS) libdap.la libdapserver.la libdapclient.la
+	sourceanalyzer -b @PACKAGE@ -scan -f @PACKAGE@-@PACKAGE_VERSION@.fpr
+
+# run fortify on only our code, not the gnulib code or the flex/bison code.
+# This does skip testing some of the functions we wrote in the *.lex/*.yy
+# files but should eliminate the false positives from flex and bison, too.
+.PHONY: fortify-lite
+fortify-lite: dods-datatypes.h xdr-datatypes.h
+	( cd gl && $(MAKE) $(MFLAGS) )
+	( cd d4_ce && $(MAKE) $(MFLAGS) )
+	$(MAKE)  $(MFLAGS) libparsers.la
+	sourceanalyzer -b @PACKAGE@ $(MAKE) $(MFLAGS) libdap.la libdapserver.la libdapclient.la
+	sourceanalyzer -b @PACKAGE@ -scan -f @PACKAGE@-@PACKAGE_VERSION@.fpr
+
+# No longer used? jhrg 1/29/13
+#grammar_objects = lex.das.o das.tab.o lex.dds.o dds.tab.o lex.ce_expr.o \
+#ce_expr.tab.o lex.gse_.o gse.tab.o lex.Error.o Error.tab.o
+
+# Use this to clean the fortify project.
+.PHONY: fortifyclean
+fortifyclean:
+	(cd gl && sourceanalyzer -b @PACKAGE@-gl -clean )
+	sourceanalyzer -b @PACKAGE@ -clean
+
+###########################################################################
+
+# Build linux RPMs. Use the environment variable 'RPM_OPTIONS' to pass in
+# extra options like --nodeps and --macros
+
+srpm: dist
+	rpmbuild -ts --clean $(RPM_OPTIONS) @PACKAGE@-@PACKAGE_VERSION@.tar.gz
+
+rpm: dist
+	rpmbuild -tb --clean $(RPM_OPTIONS) @PACKAGE@-@PACKAGE_VERSION@.tar.gz
+
+###########################################################################
+
+# Build OS/X Packages. The strange operations with configure and make
+# are there so that the values built into dap-config will match the mac
+# osx install dirs and not the temp directory used to build the packages
+
+PACKAGEMAKER=/Developer/usr/bin/packagemaker
+PKG_CONF_FLAGS=
+
+clean-pkg:
+	-rm -rf mac_osx @PACKAGE@-@PACKAGE_VERSION@.pkg
+
+pkg-build: clean-pkg
+	./configure --prefix=$(prefix) --disable-dependency-tracking $(PKG_CONF_FLAGS)
+	make clean all
+	DESTDIR=`pwd`/mac_osx make install
+
+pkg-main: pkg-build
+	./OSX_Resources/update_mac_package_contents.pl README
+	cat ./OSX_Resources/Info.plist.proto | \
+	   sed -e "s^_PREFIX_^/usr/local/servers/hyrax-1.8.8^g" \
+	       -e "s^_FULL_VERSION_^@PACKAGE_VERSION@^g" \
+	       -e "s^_MAJOR_VERSION_^@PACKAGE_MAJOR_VERSION@^g" \
+	       -e "s^_MINOR_VERSION_^@PACKAGE_MINOR_VERSION@^g" \
+	       > foo
+	mv foo ./OSX_Resources/Info.plist
+	${PACKAGEMAKER} --root mac_osx --id org.opendap.@PACKAGE@ \
+	    --title "@PACKAGE@ @PACKAGE_VERSION@" --version @PACKAGE_VERSION@ \
+	    --out @PACKAGE@-@PACKAGE_VERSION@.pkg --resources OSX_Resources
+
+# 	   sed -e "s^_PREFIX_^$(prefix)^g" 
+
+pkg-dmg: pkg-main
+	-rm -rf @PACKAGE@-@PACKAGE_VERSION@
+	-rm -rf @PACKAGE@-@PACKAGE_VERSION@.dmg
+	mkdir @PACKAGE@-@PACKAGE_VERSION@
+	cp -r @PACKAGE@-@PACKAGE_VERSION@.pkg @PACKAGE@-@PACKAGE_VERSION@
+	cp README README.* NEWS @PACKAGE@-@PACKAGE_VERSION@
+	dropdmg -i --sanitize-for-servers --format zlib @PACKAGE@-@PACKAGE_VERSION@
+	-rm -rf @PACKAGE@-@PACKAGE_VERSION@
+
+pkg: pkg-main 
+
+# Note that the gcov options -f and -b are useful but sometimes make looking
+# at the results of coverage analysis a little taxing. -b reports on all
+# branched and -f reports on all functions. The -l -o options summarize on a
+# per-file basis. 3/27/98 jhrg
+collect-coverage-data:
+	(cd test-coverage; \
+         cov_dat="coverage-data-`date +%m.%d.%y`"; \
+         touch $$cov_dat; \
+         for f in $(ALLSRCS); do \
+            echo "\n*** Coverage data for $$f ***\n" >> $$cov_dat; \
+            gcov -l -o ../ $$f >> $$cov_dat; \
+         done)
+
+#############################################################################
+# Library sources
+# 
+
+GNU_SRC = GNU/GetOpt.cc GNU/GNURegex.cc
+
+GNU_HDR = GNU/GetOpt.h GNU/GNURegex.h
+
+BISON_SRC = das.tab.cc das.tab.hh dds.tab.cc	dds.tab.hh \
+	ce_expr.tab.cc ce_expr.tab.hh Error.tab.cc Error.tab.hh 
+
+FLEX_SRC = lex.das.cc lex.dds.cc lex.ce_expr.cc lex.Error.cc
+
+DAP_SRC = AttrTable.cc DAS.cc DDS.cc DataDDS.cc DDXParserSAX2.cc	\
+	BaseType.cc Byte.cc Int32.cc Float64.cc Str.cc Url.cc		\
+	Vector.cc Array.cc Structure.cc Sequence.cc Grid.cc UInt32.cc	\
+	Int16.cc UInt16.cc Float32.cc Constructor.cc			\
+	BaseTypeFactory.cc SignalHandler.cc Error.cc InternalErr.cc	\
+	util.cc xdrutil_ppc.c parser-util.cc escaping.cc		\
+	Clause.cc RValue.cc			\
+	ConstraintEvaluator.cc DapIndent.cc	\
+	Operators.h XDRUtils.cc XDRFileMarshaller.cc			\
+	XDRStreamMarshaller.cc XDRFileUnMarshaller.cc			\
+	XDRStreamUnMarshaller.cc mime_util.cc Keywords2.cc XMLWriter.cc \
+	ServerFunctionsList.cc ServerFunction.cc DapXmlNamespaces.cc \
+	MarshallerThread.cc
+
+DAP4_ONLY_SRC = D4StreamMarshaller.cc D4StreamUnMarshaller.cc Int64.cc \
+        UInt64.cc Int8.cc D4ParserSax2.cc D4BaseTypeFactory.cc \
+        D4Dimensions.cc  D4EnumDefs.cc D4Group.cc DMR.cc \
+        D4Attributes.cc D4Enum.cc chunked_ostream.cc chunked_istream.cc \
+        D4Sequence.cc D4Maps.cc D4Opaque.cc D4AsyncUtil.cc D4RValue.cc \
+        D4FilterClause.cc
+
+Operators.h: ce_expr.tab.hh
+
+# Operators.h is included in with the source to prevent it from bing installed
+# with the other headers. It includes one of the built grammar file headers.
+
+CLIENT_SRC = RCReader.cc Connect.cc HTTPConnect.cc HTTPCache.cc	\
+	util_mit.cc ResponseTooBigErr.cc HTTPCacheTable.cc
+
+DAP4_CLIENT_SRC = D4Connect.cc
+
+SERVER_SRC = DODSFilter.cc Ancillary.cc
+# ResponseBuilder.cc ResponseCache.cc
+
+DAP_HDR = AttrTable.h DAS.h DDS.h DataDDS.h DDXParserSAX2.h		\
+	DDXExceptions.h BaseType.h Byte.h Int32.h Float64.h Str.h	\
+	Url.h Vector.h Array.h Constructor.h Structure.h Sequence.h	\
+	Grid.h UInt32.h Int16.h UInt16.h Float32.h BaseTypeFactory.h	\
+	ObjectType.h EncodingType.h SignalHandler.h Error.h		\
+	InternalErr.h util.h escaping.h parser.h debug.h dods-limits.h	\
+	dods-datatypes.h Type.h		\
+	util_mit.h expr.h Clause.h RValue.h ConstraintEvaluator.h	\
+	ce_parser.h DapIndent.h DapObj.h XDRFileMarshaller.h		\
+	Marshaller.h UnMarshaller.h XDRFileUnMarshaller.h		\
+	XDRStreamMarshaller.h XDRUtils.h xdr-datatypes.h mime_util.h	\
+	cgi_util.h XDRStreamUnMarshaller.h Keywords2.h XMLWriter.h \
+	ServerFunctionsList.h ServerFunction.h media_types.h \
+	DapXmlNamespaces.h parser-util.h MarshallerThread.h
+
+DAP4_ONLY_HDR = D4StreamMarshaller.h D4StreamUnMarshaller.h Int64.h \
+        UInt64.h Int8.h D4ParserSax2.h D4BaseTypeFactory.h \
+        D4Maps.h D4Dimensions.h D4EnumDefs.h D4Group.h DMR.h D4Attributes.h \
+        D4AttributeType.h D4Enum.h chunked_stream.h chunked_ostream.h \
+        chunked_istream.h D4Sequence.h crc.h D4Opaque.h D4AsyncUtil.h \
+        D4Function.h D4RValue.h D4FilterClause.h
+
+if USE_C99_TYPES
+dods-datatypes.h: dods-datatypes-static.h
+	cp -p $< dods-datatypes.h
+else
+dods-datatypes.h: dods-datatypes-config.h
+	cp -p $< dods-datatypes.h
+endif
+
+xdr-datatypes.h: xdr-datatypes-config.h
+	cp -p $< xdr-datatypes.h
+
+CLIENT_HDR = RCReader.h Connect.h HTTPConnect.h HTTPCache.h		\
+	HTTPCacheDisconnectedMode.h HTTPCacheInterruptHandler.h		\
+	Response.h HTTPResponse.h HTTPCacheResponse.h PipeResponse.h	\
+	StdinResponse.h SignalHandlerRegisteredErr.h			\
+	ResponseTooBigErr.h Resource.h HTTPCacheTable.h HTTPCacheMacros.h
+
+DAP4_CLIENT_HDR = D4Connect.h
+
+SERVER_HDR = DODSFilter.h AlarmHandler.h EventHandler.h Ancillary.h
+#	ResponseBuilder.h ResponseCache.h
+
+############################################################################
+# Special rules for the grammars. I tried to use the automake grammar support
+# but these grammars are so hacked that it was taking too much time. Maybe if
+# each grammar was converted one by one... jhrg 6/22/05
+# 
+# I switched to using flex options instead of sed and mv. jhrg 02/28/08
+#
+# Build the DAS scanner and parser
+
+# Using this pattern rule is a way to get gnu make to run bison only once.
+# The targets that explicitly name the two sources to be built will run it
+# twice with a parallel build. jhrg 6/18/15
+
+%.tab.cc %.tab.hh: %.yy
+	$(YACC) $(YFLAGS) $<
+
+lex.das.cc: das.lex das.tab.cc das.tab.hh
+	$(LEX) $(LFLAGS) $<
+
+#das.tab.cc das.tab.hh: das.yy DAS.h
+#	$(YACC) $(YFLAGS) $<
+
+# DDS
+
+lex.dds.cc: dds.lex dds.tab.cc dds.tab.hh
+	$(LEX) $(LFLAGS) $<
+
+#dds.tab.cc dds.tab.hh: dds.yy
+#	$(YACC) $(YFLAGS) $<
+
+# CE
+
+lex.ce_expr.cc: ce_expr.lex ce_expr.tab.cc ce_expr.tab.hh
+	$(LEX) $(LFLAGS) $<
+
+#ce_expr.tab.cc ce_expr.tab.hh: ce_expr.yy
+#	$(YACC) $(YFLAGS) $<
+
+# Errors
+
+lex.Error.cc: Error.lex Error.tab.cc Error.tab.hh
+	$(LEX) $(LFLAGS) $<
+
+#Error.tab.cc Error.tab.hh: Error.yy
+#	$(YACC) $(YFLAGS) $<
diff --git a/Makefile.in b/Makefile.in
new file mode 100644
index 0000000..68d1e2b
--- /dev/null
+++ b/Makefile.in
@@ -0,0 +1,3060 @@
+# Makefile.in generated by automake 1.14 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# Build libdap, libtest-types.a, getdap, getdap4
+
+
+
+
+
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+@COMPILER_IS_GCC_TRUE@am__append_1 = -Wall -W -Wcast-align
+@BUILD_DEVELOPER_TRUE@am__append_2 = $(CXXFLAGS_DEBUG)
+bin_PROGRAMS = getdap$(EXEEXT) getdap4$(EXEEXT)
+@DAP4_DEFINED_TRUE@am__append_3 = $(DAP4_ONLY_SRC)
+@DAP4_DEFINED_TRUE@am__append_4 = -lcrypto 
+@DAP4_DEFINED_TRUE@am__append_5 = $(DAP4_CLIENT_HDR) $(DAP4_CLIENT_SRC)
+@DAP4_DEFINED_TRUE@am__append_6 = $(DAP4_ONLY_HDR) $(DAP4_CLIENT_HDR)
+subdir = .
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/configure $(am__configure_deps) \
+	$(srcdir)/config.h.in $(srcdir)/dods-datatypes-config.h.in \
+	$(srcdir)/xdr-datatypes-config.h.in $(srcdir)/libdap.pc.in \
+	$(srcdir)/libdapclient.pc.in $(srcdir)/libdapserver.pc.in \
+	$(srcdir)/main_page.doxygen.in $(srcdir)/doxy.conf.in \
+	$(srcdir)/abi_checker.xml.in $(srcdir)/dap-config.in \
+	$(top_srcdir)/conf/depcomp $(dist_aclocal_DATA) \
+	$(noinst_HEADERS) $(am__pkginclude_HEADERS_DIST) COPYING \
+	ChangeLog INSTALL NEWS README conf/compile conf/config.guess \
+	conf/config.rpath conf/config.sub conf/depcomp conf/install-sh \
+	conf/missing conf/ltmain.sh $(top_srcdir)/conf/compile \
+	$(top_srcdir)/conf/config.guess \
+	$(top_srcdir)/conf/config.rpath $(top_srcdir)/conf/config.sub \
+	$(top_srcdir)/conf/install-sh $(top_srcdir)/conf/ltmain.sh \
+	$(top_srcdir)/conf/missing
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/gl/m4/00gnulib.m4 \
+	$(top_srcdir)/gl/m4/absolute-header.m4 \
+	$(top_srcdir)/gl/m4/alloca.m4 $(top_srcdir)/gl/m4/btowc.m4 \
+	$(top_srcdir)/gl/m4/builtin-expect.m4 \
+	$(top_srcdir)/gl/m4/byteswap.m4 $(top_srcdir)/gl/m4/codeset.m4 \
+	$(top_srcdir)/gl/m4/configmake.m4 \
+	$(top_srcdir)/gl/m4/eealloc.m4 \
+	$(top_srcdir)/gl/m4/extensions.m4 \
+	$(top_srcdir)/gl/m4/extern-inline.m4 \
+	$(top_srcdir)/gl/m4/fcntl-o.m4 $(top_srcdir)/gl/m4/fcntl_h.m4 \
+	$(top_srcdir)/gl/m4/gettimeofday.m4 \
+	$(top_srcdir)/gl/m4/glibc21.m4 \
+	$(top_srcdir)/gl/m4/gnulib-common.m4 \
+	$(top_srcdir)/gl/m4/gnulib-comp.m4 \
+	$(top_srcdir)/gl/m4/gnulib-tool.m4 \
+	$(top_srcdir)/gl/m4/hard-locale.m4 \
+	$(top_srcdir)/gl/m4/include_next.m4 \
+	$(top_srcdir)/gl/m4/langinfo_h.m4 \
+	$(top_srcdir)/gl/m4/largefile.m4 $(top_srcdir)/gl/m4/lib-ld.m4 \
+	$(top_srcdir)/gl/m4/lib-link.m4 \
+	$(top_srcdir)/gl/m4/lib-prefix.m4 \
+	$(top_srcdir)/gl/m4/limits-h.m4 \
+	$(top_srcdir)/gl/m4/localcharset.m4 \
+	$(top_srcdir)/gl/m4/locale-fr.m4 \
+	$(top_srcdir)/gl/m4/locale-ja.m4 \
+	$(top_srcdir)/gl/m4/locale-zh.m4 \
+	$(top_srcdir)/gl/m4/locale_h.m4 \
+	$(top_srcdir)/gl/m4/localeconv.m4 \
+	$(top_srcdir)/gl/m4/localtime-buffer.m4 \
+	$(top_srcdir)/gl/m4/lock.m4 $(top_srcdir)/gl/m4/longlong.m4 \
+	$(top_srcdir)/gl/m4/lstat.m4 $(top_srcdir)/gl/m4/malloca.m4 \
+	$(top_srcdir)/gl/m4/mbrtowc.m4 $(top_srcdir)/gl/m4/mbsinit.m4 \
+	$(top_srcdir)/gl/m4/mbstate_t.m4 $(top_srcdir)/gl/m4/mbtowc.m4 \
+	$(top_srcdir)/gl/m4/mkstemps.m4 \
+	$(top_srcdir)/gl/m4/multiarch.m4 \
+	$(top_srcdir)/gl/m4/nl_langinfo.m4 \
+	$(top_srcdir)/gl/m4/off_t.m4 $(top_srcdir)/gl/m4/pathmax.m4 \
+	$(top_srcdir)/gl/m4/pthread_rwlock_rdlock.m4 \
+	$(top_srcdir)/gl/m4/regex.m4 $(top_srcdir)/gl/m4/ssize_t.m4 \
+	$(top_srcdir)/gl/m4/stat.m4 $(top_srcdir)/gl/m4/stdbool.m4 \
+	$(top_srcdir)/gl/m4/stddef_h.m4 $(top_srcdir)/gl/m4/stdint.m4 \
+	$(top_srcdir)/gl/m4/stdlib_h.m4 \
+	$(top_srcdir)/gl/m4/sys_socket_h.m4 \
+	$(top_srcdir)/gl/m4/sys_stat_h.m4 \
+	$(top_srcdir)/gl/m4/sys_time_h.m4 \
+	$(top_srcdir)/gl/m4/sys_types_h.m4 \
+	$(top_srcdir)/gl/m4/tempname.m4 \
+	$(top_srcdir)/gl/m4/threadlib.m4 $(top_srcdir)/gl/m4/time_h.m4 \
+	$(top_srcdir)/gl/m4/unistd_h.m4 \
+	$(top_srcdir)/gl/m4/warn-on-use.m4 \
+	$(top_srcdir)/gl/m4/wchar_h.m4 $(top_srcdir)/gl/m4/wchar_t.m4 \
+	$(top_srcdir)/gl/m4/wcrtomb.m4 $(top_srcdir)/gl/m4/wctype_h.m4 \
+	$(top_srcdir)/gl/m4/wint_t.m4 $(top_srcdir)/conf/acinclude.m4 \
+	$(top_srcdir)/conf/cppunit.m4 \
+	$(top_srcdir)/conf/gcov_valgrind.m4 \
+	$(top_srcdir)/conf/libtool.m4 $(top_srcdir)/conf/ltoptions.m4 \
+	$(top_srcdir)/conf/ltsugar.m4 $(top_srcdir)/conf/ltversion.m4 \
+	$(top_srcdir)/conf/lt~obsolete.m4 $(top_srcdir)/conf/pkg.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno config.status.lineno
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = config.h dods-datatypes-config.h \
+	xdr-datatypes-config.h
+CONFIG_CLEAN_FILES = libdap.pc libdapclient.pc libdapserver.pc \
+	main_page.doxygen doxy.conf abi_checker.xml dap-config
+CONFIG_CLEAN_VPATH_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
+	"$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \
+	"$(DESTDIR)$(aclocaldir)" "$(DESTDIR)$(pkgconfigdir)" \
+	"$(DESTDIR)$(pkgincludedir)"
+LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)
+am__DEPENDENCIES_1 =
+libdap_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	gl/libgnu.la d4_ce/libd4_ce_parser.la \
+	d4_function/libd4_function_parser.la libparsers.la \
+	$(am__DEPENDENCIES_1)
+am__libdap_la_SOURCES_DIST = AttrTable.cc DAS.cc DDS.cc DataDDS.cc \
+	DDXParserSAX2.cc BaseType.cc Byte.cc Int32.cc Float64.cc \
+	Str.cc Url.cc Vector.cc Array.cc Structure.cc Sequence.cc \
+	Grid.cc UInt32.cc Int16.cc UInt16.cc Float32.cc Constructor.cc \
+	BaseTypeFactory.cc SignalHandler.cc Error.cc InternalErr.cc \
+	util.cc xdrutil_ppc.c parser-util.cc escaping.cc Clause.cc \
+	RValue.cc ConstraintEvaluator.cc DapIndent.cc Operators.h \
+	XDRUtils.cc XDRFileMarshaller.cc XDRStreamMarshaller.cc \
+	XDRFileUnMarshaller.cc XDRStreamUnMarshaller.cc mime_util.cc \
+	Keywords2.cc XMLWriter.cc ServerFunctionsList.cc \
+	ServerFunction.cc DapXmlNamespaces.cc MarshallerThread.cc \
+	GNU/GetOpt.cc GNU/GNURegex.cc D4StreamMarshaller.cc \
+	D4StreamUnMarshaller.cc Int64.cc UInt64.cc Int8.cc \
+	D4ParserSax2.cc D4BaseTypeFactory.cc D4Dimensions.cc \
+	D4EnumDefs.cc D4Group.cc DMR.cc D4Attributes.cc D4Enum.cc \
+	chunked_ostream.cc chunked_istream.cc D4Sequence.cc D4Maps.cc \
+	D4Opaque.cc D4AsyncUtil.cc D4RValue.cc D4FilterClause.cc
+am__objects_1 = libdap_la-AttrTable.lo libdap_la-DAS.lo \
+	libdap_la-DDS.lo libdap_la-DataDDS.lo \
+	libdap_la-DDXParserSAX2.lo libdap_la-BaseType.lo \
+	libdap_la-Byte.lo libdap_la-Int32.lo libdap_la-Float64.lo \
+	libdap_la-Str.lo libdap_la-Url.lo libdap_la-Vector.lo \
+	libdap_la-Array.lo libdap_la-Structure.lo \
+	libdap_la-Sequence.lo libdap_la-Grid.lo libdap_la-UInt32.lo \
+	libdap_la-Int16.lo libdap_la-UInt16.lo libdap_la-Float32.lo \
+	libdap_la-Constructor.lo libdap_la-BaseTypeFactory.lo \
+	libdap_la-SignalHandler.lo libdap_la-Error.lo \
+	libdap_la-InternalErr.lo libdap_la-util.lo \
+	libdap_la-xdrutil_ppc.lo libdap_la-parser-util.lo \
+	libdap_la-escaping.lo libdap_la-Clause.lo libdap_la-RValue.lo \
+	libdap_la-ConstraintEvaluator.lo libdap_la-DapIndent.lo \
+	libdap_la-XDRUtils.lo libdap_la-XDRFileMarshaller.lo \
+	libdap_la-XDRStreamMarshaller.lo \
+	libdap_la-XDRFileUnMarshaller.lo \
+	libdap_la-XDRStreamUnMarshaller.lo libdap_la-mime_util.lo \
+	libdap_la-Keywords2.lo libdap_la-XMLWriter.lo \
+	libdap_la-ServerFunctionsList.lo libdap_la-ServerFunction.lo \
+	libdap_la-DapXmlNamespaces.lo libdap_la-MarshallerThread.lo
+am__dirstamp = $(am__leading_dot)dirstamp
+am__objects_2 = GNU/libdap_la-GetOpt.lo GNU/libdap_la-GNURegex.lo
+am__objects_3 = libdap_la-D4StreamMarshaller.lo \
+	libdap_la-D4StreamUnMarshaller.lo libdap_la-Int64.lo \
+	libdap_la-UInt64.lo libdap_la-Int8.lo \
+	libdap_la-D4ParserSax2.lo libdap_la-D4BaseTypeFactory.lo \
+	libdap_la-D4Dimensions.lo libdap_la-D4EnumDefs.lo \
+	libdap_la-D4Group.lo libdap_la-DMR.lo \
+	libdap_la-D4Attributes.lo libdap_la-D4Enum.lo \
+	libdap_la-chunked_ostream.lo libdap_la-chunked_istream.lo \
+	libdap_la-D4Sequence.lo libdap_la-D4Maps.lo \
+	libdap_la-D4Opaque.lo libdap_la-D4AsyncUtil.lo \
+	libdap_la-D4RValue.lo libdap_la-D4FilterClause.lo
+@DAP4_DEFINED_TRUE@am__objects_4 = $(am__objects_3)
+am_libdap_la_OBJECTS = $(am__objects_1) $(am__objects_2) \
+	$(am__objects_4)
+libdap_la_OBJECTS = $(am_libdap_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+libdap_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(libdap_la_LDFLAGS) $(LDFLAGS) -o $@
+libdapclient_la_DEPENDENCIES = $(am__DEPENDENCIES_1) libdap.la \
+	$(am__DEPENDENCIES_1)
+am__libdapclient_la_SOURCES_DIST = RCReader.cc Connect.cc \
+	HTTPConnect.cc HTTPCache.cc util_mit.cc ResponseTooBigErr.cc \
+	HTTPCacheTable.cc D4Connect.h D4Connect.cc
+am__objects_5 = libdapclient_la-RCReader.lo libdapclient_la-Connect.lo \
+	libdapclient_la-HTTPConnect.lo libdapclient_la-HTTPCache.lo \
+	libdapclient_la-util_mit.lo \
+	libdapclient_la-ResponseTooBigErr.lo \
+	libdapclient_la-HTTPCacheTable.lo
+am__objects_6 =
+am__objects_7 = libdapclient_la-D4Connect.lo
+@DAP4_DEFINED_TRUE@am__objects_8 = $(am__objects_6) $(am__objects_7)
+am_libdapclient_la_OBJECTS = $(am__objects_5) $(am__objects_8)
+libdapclient_la_OBJECTS = $(am_libdapclient_la_OBJECTS)
+libdapclient_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
+	$(AM_CXXFLAGS) $(CXXFLAGS) $(libdapclient_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
+libdapserver_la_DEPENDENCIES = libdap.la $(am__DEPENDENCIES_1)
+am__objects_9 = DODSFilter.lo Ancillary.lo
+am_libdapserver_la_OBJECTS = $(am__objects_9)
+libdapserver_la_OBJECTS = $(am_libdapserver_la_OBJECTS)
+libdapserver_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
+	$(AM_CXXFLAGS) $(CXXFLAGS) $(libdapserver_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
+libparsers_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am__objects_10 = libparsers_la-lex.das.lo libparsers_la-lex.dds.lo \
+	libparsers_la-lex.ce_expr.lo libparsers_la-lex.Error.lo
+am__objects_11 = libparsers_la-das.tab.lo libparsers_la-dds.tab.lo \
+	libparsers_la-ce_expr.tab.lo libparsers_la-Error.tab.lo
+am_libparsers_la_OBJECTS = $(am__objects_10) $(am__objects_11)
+libparsers_la_OBJECTS = $(am_libparsers_la_OBJECTS)
+PROGRAMS = $(bin_PROGRAMS)
+am_getdap_OBJECTS = getdap-getdap.$(OBJEXT)
+getdap_OBJECTS = $(am_getdap_OBJECTS)
+getdap_DEPENDENCIES = libdapclient.la libdap.la
+am_getdap4_OBJECTS = getdap4-getdap4.$(OBJEXT)
+getdap4_OBJECTS = $(am_getdap4_OBJECTS)
+getdap4_DEPENDENCIES = libdapclient.la libdap.la
+SCRIPTS = $(bin_SCRIPTS)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/conf/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_@AM_V@)
+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
+am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_1 = 
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_1 = 
+SOURCES = $(libdap_la_SOURCES) $(libdapclient_la_SOURCES) \
+	$(libdapserver_la_SOURCES) $(libparsers_la_SOURCES) \
+	$(getdap_SOURCES) $(getdap4_SOURCES)
+DIST_SOURCES = $(am__libdap_la_SOURCES_DIST) \
+	$(am__libdapclient_la_SOURCES_DIST) $(libdapserver_la_SOURCES) \
+	$(libparsers_la_SOURCES) $(getdap_SOURCES) $(getdap4_SOURCES)
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+man1dir = $(mandir)/man1
+NROFF = nroff
+MANS = $(man_MANS)
+DATA = $(dist_aclocal_DATA) $(pkgconfig_DATA)
+am__pkginclude_HEADERS_DIST = AttrTable.h DAS.h DDS.h DataDDS.h \
+	DDXParserSAX2.h DDXExceptions.h BaseType.h Byte.h Int32.h \
+	Float64.h Str.h Url.h Vector.h Array.h Constructor.h \
+	Structure.h Sequence.h Grid.h UInt32.h Int16.h UInt16.h \
+	Float32.h BaseTypeFactory.h ObjectType.h EncodingType.h \
+	SignalHandler.h Error.h InternalErr.h util.h escaping.h \
+	parser.h debug.h dods-limits.h dods-datatypes.h Type.h \
+	util_mit.h expr.h Clause.h RValue.h ConstraintEvaluator.h \
+	ce_parser.h DapIndent.h DapObj.h XDRFileMarshaller.h \
+	Marshaller.h UnMarshaller.h XDRFileUnMarshaller.h \
+	XDRStreamMarshaller.h XDRUtils.h xdr-datatypes.h mime_util.h \
+	cgi_util.h XDRStreamUnMarshaller.h Keywords2.h XMLWriter.h \
+	ServerFunctionsList.h ServerFunction.h media_types.h \
+	DapXmlNamespaces.h parser-util.h MarshallerThread.h \
+	GNU/GetOpt.h GNU/GNURegex.h RCReader.h Connect.h HTTPConnect.h \
+	HTTPCache.h HTTPCacheDisconnectedMode.h \
+	HTTPCacheInterruptHandler.h Response.h HTTPResponse.h \
+	HTTPCacheResponse.h PipeResponse.h StdinResponse.h \
+	SignalHandlerRegisteredErr.h ResponseTooBigErr.h Resource.h \
+	HTTPCacheTable.h HTTPCacheMacros.h DODSFilter.h AlarmHandler.h \
+	EventHandler.h Ancillary.h D4StreamMarshaller.h \
+	D4StreamUnMarshaller.h Int64.h UInt64.h Int8.h D4ParserSax2.h \
+	D4BaseTypeFactory.h D4Maps.h D4Dimensions.h D4EnumDefs.h \
+	D4Group.h DMR.h D4Attributes.h D4AttributeType.h D4Enum.h \
+	chunked_stream.h chunked_ostream.h chunked_istream.h \
+	D4Sequence.h crc.h D4Opaque.h D4AsyncUtil.h D4Function.h \
+	D4RValue.h D4FilterClause.h D4Connect.h
+HEADERS = $(noinst_HEADERS) $(pkginclude_HEADERS)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+	cscope distdir dist dist-all distcheck
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
+	$(LISP)config.h.in dods-datatypes-config.h.in \
+	xdr-datatypes-config.h.in
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+CSCOPE = cscope
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+distdir = $(PACKAGE)-$(VERSION)
+top_distdir = $(distdir)
+am__remove_distdir = \
+  if test -d "$(distdir)"; then \
+    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+      && rm -rf "$(distdir)" \
+      || { sleep 5 && rm -rf "$(distdir)"; }; \
+  else :; fi
+am__post_remove_distdir = $(am__remove_distdir)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
+DIST_ARCHIVES = $(distdir).tar.gz
+GZIP_ENV = --best
+DIST_TARGETS = dist-gzip
+distuninstallcheck_listfiles = find . -type f -print
+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
+distcleancheck_listfiles = find . -type f -print
+pkglibexecdir = @pkglibexecdir@
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALLOCA_H = @ALLOCA_H@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
+AR = @AR@
+ARFLAGS = @ARFLAGS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BITSIZEOF_PTRDIFF_T = @BITSIZEOF_PTRDIFF_T@
+BITSIZEOF_SIG_ATOMIC_T = @BITSIZEOF_SIG_ATOMIC_T@
+BITSIZEOF_SIZE_T = @BITSIZEOF_SIZE_T@
+BITSIZEOF_WCHAR_T = @BITSIZEOF_WCHAR_T@
+BITSIZEOF_WINT_T = @BITSIZEOF_WINT_T@
+BYTESWAP_H = @BYTESWAP_H@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CLIENTLIB_AGE = @CLIENTLIB_AGE@
+CLIENTLIB_CURRENT = @CLIENTLIB_CURRENT@
+CLIENTLIB_REVISION = @CLIENTLIB_REVISION@
+CLIENTLIB_VERSION = @CLIENTLIB_VERSION@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@
+CPPUNIT_CONFIG = @CPPUNIT_CONFIG@
+CPPUNIT_LIBS = @CPPUNIT_LIBS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_LIBS = @CURL_LIBS@
+CURL_STATIC_LIBS = @CURL_STATIC_LIBS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DAPLIB_AGE = @DAPLIB_AGE@
+DAPLIB_CURRENT = @DAPLIB_CURRENT@
+DAPLIB_REVISION = @DAPLIB_REVISION@
+DAP_PROTOCOL_VERSION = @DAP_PROTOCOL_VERSION@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+DVR = @DVR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GLIBC21 = @GLIBC21@
+GNULIB_ATOLL = @GNULIB_ATOLL@
+GNULIB_BTOWC = @GNULIB_BTOWC@
+GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@
+GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
+GNULIB_CHDIR = @GNULIB_CHDIR@
+GNULIB_CHOWN = @GNULIB_CHOWN@
+GNULIB_CLOSE = @GNULIB_CLOSE@
+GNULIB_CTIME = @GNULIB_CTIME@
+GNULIB_DUP = @GNULIB_DUP@
+GNULIB_DUP2 = @GNULIB_DUP2@
+GNULIB_DUP3 = @GNULIB_DUP3@
+GNULIB_DUPLOCALE = @GNULIB_DUPLOCALE@
+GNULIB_ENVIRON = @GNULIB_ENVIRON@
+GNULIB_EUIDACCESS = @GNULIB_EUIDACCESS@
+GNULIB_FACCESSAT = @GNULIB_FACCESSAT@
+GNULIB_FCHDIR = @GNULIB_FCHDIR@
+GNULIB_FCHMODAT = @GNULIB_FCHMODAT@
+GNULIB_FCHOWNAT = @GNULIB_FCHOWNAT@
+GNULIB_FCNTL = @GNULIB_FCNTL@
+GNULIB_FDATASYNC = @GNULIB_FDATASYNC@
+GNULIB_FSTAT = @GNULIB_FSTAT@
+GNULIB_FSTATAT = @GNULIB_FSTATAT@
+GNULIB_FSYNC = @GNULIB_FSYNC@
+GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@
+GNULIB_FUTIMENS = @GNULIB_FUTIMENS@
+GNULIB_GETCWD = @GNULIB_GETCWD@
+GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@
+GNULIB_GETDTABLESIZE = @GNULIB_GETDTABLESIZE@
+GNULIB_GETGROUPS = @GNULIB_GETGROUPS@
+GNULIB_GETHOSTNAME = @GNULIB_GETHOSTNAME@
+GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@
+GNULIB_GETLOGIN = @GNULIB_GETLOGIN@
+GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@
+GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@
+GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@
+GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@
+GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@
+GNULIB_GRANTPT = @GNULIB_GRANTPT@
+GNULIB_GROUP_MEMBER = @GNULIB_GROUP_MEMBER@
+GNULIB_ISATTY = @GNULIB_ISATTY@
+GNULIB_ISWBLANK = @GNULIB_ISWBLANK@
+GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@
+GNULIB_LCHMOD = @GNULIB_LCHMOD@
+GNULIB_LCHOWN = @GNULIB_LCHOWN@
+GNULIB_LINK = @GNULIB_LINK@
+GNULIB_LINKAT = @GNULIB_LINKAT@
+GNULIB_LOCALECONV = @GNULIB_LOCALECONV@
+GNULIB_LOCALTIME = @GNULIB_LOCALTIME@
+GNULIB_LSEEK = @GNULIB_LSEEK@
+GNULIB_LSTAT = @GNULIB_LSTAT@
+GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@
+GNULIB_MBRLEN = @GNULIB_MBRLEN@
+GNULIB_MBRTOWC = @GNULIB_MBRTOWC@
+GNULIB_MBSINIT = @GNULIB_MBSINIT@
+GNULIB_MBSNRTOWCS = @GNULIB_MBSNRTOWCS@
+GNULIB_MBSRTOWCS = @GNULIB_MBSRTOWCS@
+GNULIB_MBTOWC = @GNULIB_MBTOWC@
+GNULIB_MKDIRAT = @GNULIB_MKDIRAT@
+GNULIB_MKDTEMP = @GNULIB_MKDTEMP@
+GNULIB_MKFIFO = @GNULIB_MKFIFO@
+GNULIB_MKFIFOAT = @GNULIB_MKFIFOAT@
+GNULIB_MKNOD = @GNULIB_MKNOD@
+GNULIB_MKNODAT = @GNULIB_MKNODAT@
+GNULIB_MKOSTEMP = @GNULIB_MKOSTEMP@
+GNULIB_MKOSTEMPS = @GNULIB_MKOSTEMPS@
+GNULIB_MKSTEMP = @GNULIB_MKSTEMP@
+GNULIB_MKSTEMPS = @GNULIB_MKSTEMPS@
+GNULIB_MKTIME = @GNULIB_MKTIME@
+GNULIB_NANOSLEEP = @GNULIB_NANOSLEEP@
+GNULIB_NL_LANGINFO = @GNULIB_NL_LANGINFO@
+GNULIB_NONBLOCKING = @GNULIB_NONBLOCKING@
+GNULIB_OPEN = @GNULIB_OPEN@
+GNULIB_OPENAT = @GNULIB_OPENAT@
+GNULIB_OVERRIDES_STRUCT_STAT = @GNULIB_OVERRIDES_STRUCT_STAT@
+GNULIB_OVERRIDES_WINT_T = @GNULIB_OVERRIDES_WINT_T@
+GNULIB_PIPE = @GNULIB_PIPE@
+GNULIB_PIPE2 = @GNULIB_PIPE2@
+GNULIB_POSIX_OPENPT = @GNULIB_POSIX_OPENPT@
+GNULIB_PREAD = @GNULIB_PREAD@
+GNULIB_PTSNAME = @GNULIB_PTSNAME@
+GNULIB_PTSNAME_R = @GNULIB_PTSNAME_R@
+GNULIB_PUTENV = @GNULIB_PUTENV@
+GNULIB_PWRITE = @GNULIB_PWRITE@
+GNULIB_QSORT_R = @GNULIB_QSORT_R@
+GNULIB_RANDOM = @GNULIB_RANDOM@
+GNULIB_RANDOM_R = @GNULIB_RANDOM_R@
+GNULIB_READ = @GNULIB_READ@
+GNULIB_READLINK = @GNULIB_READLINK@
+GNULIB_READLINKAT = @GNULIB_READLINKAT@
+GNULIB_REALLOCARRAY = @GNULIB_REALLOCARRAY@
+GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@
+GNULIB_REALPATH = @GNULIB_REALPATH@
+GNULIB_RMDIR = @GNULIB_RMDIR@
+GNULIB_RPMATCH = @GNULIB_RPMATCH@
+GNULIB_SECURE_GETENV = @GNULIB_SECURE_GETENV@
+GNULIB_SETENV = @GNULIB_SETENV@
+GNULIB_SETHOSTNAME = @GNULIB_SETHOSTNAME@
+GNULIB_SETLOCALE = @GNULIB_SETLOCALE@
+GNULIB_SLEEP = @GNULIB_SLEEP@
+GNULIB_STAT = @GNULIB_STAT@
+GNULIB_STRFTIME = @GNULIB_STRFTIME@
+GNULIB_STRPTIME = @GNULIB_STRPTIME@
+GNULIB_STRTOD = @GNULIB_STRTOD@
+GNULIB_STRTOLL = @GNULIB_STRTOLL@
+GNULIB_STRTOULL = @GNULIB_STRTOULL@
+GNULIB_SYMLINK = @GNULIB_SYMLINK@
+GNULIB_SYMLINKAT = @GNULIB_SYMLINKAT@
+GNULIB_SYSTEM_POSIX = @GNULIB_SYSTEM_POSIX@
+GNULIB_TIMEGM = @GNULIB_TIMEGM@
+GNULIB_TIME_R = @GNULIB_TIME_R@
+GNULIB_TIME_RZ = @GNULIB_TIME_RZ@
+GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@
+GNULIB_TRUNCATE = @GNULIB_TRUNCATE@
+GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@
+GNULIB_TZSET = @GNULIB_TZSET@
+GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@
+GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@
+GNULIB_UNLINK = @GNULIB_UNLINK@
+GNULIB_UNLINKAT = @GNULIB_UNLINKAT@
+GNULIB_UNLOCKPT = @GNULIB_UNLOCKPT@
+GNULIB_UNSETENV = @GNULIB_UNSETENV@
+GNULIB_USLEEP = @GNULIB_USLEEP@
+GNULIB_UTIMENSAT = @GNULIB_UTIMENSAT@
+GNULIB_WCPCPY = @GNULIB_WCPCPY@
+GNULIB_WCPNCPY = @GNULIB_WCPNCPY@
+GNULIB_WCRTOMB = @GNULIB_WCRTOMB@
+GNULIB_WCSCASECMP = @GNULIB_WCSCASECMP@
+GNULIB_WCSCAT = @GNULIB_WCSCAT@
+GNULIB_WCSCHR = @GNULIB_WCSCHR@
+GNULIB_WCSCMP = @GNULIB_WCSCMP@
+GNULIB_WCSCOLL = @GNULIB_WCSCOLL@
+GNULIB_WCSCPY = @GNULIB_WCSCPY@
+GNULIB_WCSCSPN = @GNULIB_WCSCSPN@
+GNULIB_WCSDUP = @GNULIB_WCSDUP@
+GNULIB_WCSFTIME = @GNULIB_WCSFTIME@
+GNULIB_WCSLEN = @GNULIB_WCSLEN@
+GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@
+GNULIB_WCSNCAT = @GNULIB_WCSNCAT@
+GNULIB_WCSNCMP = @GNULIB_WCSNCMP@
+GNULIB_WCSNCPY = @GNULIB_WCSNCPY@
+GNULIB_WCSNLEN = @GNULIB_WCSNLEN@
+GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@
+GNULIB_WCSPBRK = @GNULIB_WCSPBRK@
+GNULIB_WCSRCHR = @GNULIB_WCSRCHR@
+GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@
+GNULIB_WCSSPN = @GNULIB_WCSSPN@
+GNULIB_WCSSTR = @GNULIB_WCSSTR@
+GNULIB_WCSTOK = @GNULIB_WCSTOK@
+GNULIB_WCSWIDTH = @GNULIB_WCSWIDTH@
+GNULIB_WCSXFRM = @GNULIB_WCSXFRM@
+GNULIB_WCTOB = @GNULIB_WCTOB@
+GNULIB_WCTOMB = @GNULIB_WCTOMB@
+GNULIB_WCTRANS = @GNULIB_WCTRANS@
+GNULIB_WCTYPE = @GNULIB_WCTYPE@
+GNULIB_WCWIDTH = @GNULIB_WCWIDTH@
+GNULIB_WMEMCHR = @GNULIB_WMEMCHR@
+GNULIB_WMEMCMP = @GNULIB_WMEMCMP@
+GNULIB_WMEMCPY = @GNULIB_WMEMCPY@
+GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@
+GNULIB_WMEMSET = @GNULIB_WMEMSET@
+GNULIB_WRITE = @GNULIB_WRITE@
+GNULIB__EXIT = @GNULIB__EXIT@
+GREP = @GREP@
+HAVE_ATOLL = @HAVE_ATOLL@
+HAVE_BTOWC = @HAVE_BTOWC@
+HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@
+HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
+HAVE_CHOWN = @HAVE_CHOWN@
+HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@
+HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
+HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@
+HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@
+HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@
+HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@
+HAVE_DECL_GETLOGIN = @HAVE_DECL_GETLOGIN@
+HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@
+HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@
+HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@
+HAVE_DECL_INITSTATE = @HAVE_DECL_INITSTATE@
+HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@
+HAVE_DECL_SETENV = @HAVE_DECL_SETENV@
+HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@
+HAVE_DECL_SETSTATE = @HAVE_DECL_SETSTATE@
+HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@
+HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@
+HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@
+HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@
+HAVE_DUP2 = @HAVE_DUP2@
+HAVE_DUP3 = @HAVE_DUP3@
+HAVE_DUPLOCALE = @HAVE_DUPLOCALE@
+HAVE_EUIDACCESS = @HAVE_EUIDACCESS@
+HAVE_FACCESSAT = @HAVE_FACCESSAT@
+HAVE_FCHDIR = @HAVE_FCHDIR@
+HAVE_FCHMODAT = @HAVE_FCHMODAT@
+HAVE_FCHOWNAT = @HAVE_FCHOWNAT@
+HAVE_FCNTL = @HAVE_FCNTL@
+HAVE_FDATASYNC = @HAVE_FDATASYNC@
+HAVE_FEATURES_H = @HAVE_FEATURES_H@
+HAVE_FSTATAT = @HAVE_FSTATAT@
+HAVE_FSYNC = @HAVE_FSYNC@
+HAVE_FTRUNCATE = @HAVE_FTRUNCATE@
+HAVE_FUTIMENS = @HAVE_FUTIMENS@
+HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@
+HAVE_GETGROUPS = @HAVE_GETGROUPS@
+HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@
+HAVE_GETLOGIN = @HAVE_GETLOGIN@
+HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@
+HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
+HAVE_GETTIMEOFDAY = @HAVE_GETTIMEOFDAY@
+HAVE_GRANTPT = @HAVE_GRANTPT@
+HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
+HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
+HAVE_ISWBLANK = @HAVE_ISWBLANK@
+HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
+HAVE_LANGINFO_CODESET = @HAVE_LANGINFO_CODESET@
+HAVE_LANGINFO_ERA = @HAVE_LANGINFO_ERA@
+HAVE_LANGINFO_H = @HAVE_LANGINFO_H@
+HAVE_LANGINFO_T_FMT_AMPM = @HAVE_LANGINFO_T_FMT_AMPM@
+HAVE_LANGINFO_YESEXPR = @HAVE_LANGINFO_YESEXPR@
+HAVE_LCHMOD = @HAVE_LCHMOD@
+HAVE_LCHOWN = @HAVE_LCHOWN@
+HAVE_LINK = @HAVE_LINK@
+HAVE_LINKAT = @HAVE_LINKAT@
+HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@
+HAVE_LSTAT = @HAVE_LSTAT@
+HAVE_MAX_ALIGN_T = @HAVE_MAX_ALIGN_T@
+HAVE_MBRLEN = @HAVE_MBRLEN@
+HAVE_MBRTOWC = @HAVE_MBRTOWC@
+HAVE_MBSINIT = @HAVE_MBSINIT@
+HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@
+HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@
+HAVE_MKDIRAT = @HAVE_MKDIRAT@
+HAVE_MKDTEMP = @HAVE_MKDTEMP@
+HAVE_MKFIFO = @HAVE_MKFIFO@
+HAVE_MKFIFOAT = @HAVE_MKFIFOAT@
+HAVE_MKNOD = @HAVE_MKNOD@
+HAVE_MKNODAT = @HAVE_MKNODAT@
+HAVE_MKOSTEMP = @HAVE_MKOSTEMP@
+HAVE_MKOSTEMPS = @HAVE_MKOSTEMPS@
+HAVE_MKSTEMP = @HAVE_MKSTEMP@
+HAVE_MKSTEMPS = @HAVE_MKSTEMPS@
+HAVE_NANOSLEEP = @HAVE_NANOSLEEP@
+HAVE_NL_LANGINFO = @HAVE_NL_LANGINFO@
+HAVE_OPENAT = @HAVE_OPENAT@
+HAVE_OS_H = @HAVE_OS_H@
+HAVE_PIPE = @HAVE_PIPE@
+HAVE_PIPE2 = @HAVE_PIPE2@
+HAVE_POSIX_OPENPT = @HAVE_POSIX_OPENPT@
+HAVE_PREAD = @HAVE_PREAD@
+HAVE_PTSNAME = @HAVE_PTSNAME@
+HAVE_PTSNAME_R = @HAVE_PTSNAME_R@
+HAVE_PWRITE = @HAVE_PWRITE@
+HAVE_QSORT_R = @HAVE_QSORT_R@
+HAVE_RANDOM = @HAVE_RANDOM@
+HAVE_RANDOM_H = @HAVE_RANDOM_H@
+HAVE_RANDOM_R = @HAVE_RANDOM_R@
+HAVE_READLINK = @HAVE_READLINK@
+HAVE_READLINKAT = @HAVE_READLINKAT@
+HAVE_REALLOCARRAY = @HAVE_REALLOCARRAY@
+HAVE_REALPATH = @HAVE_REALPATH@
+HAVE_RPMATCH = @HAVE_RPMATCH@
+HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@
+HAVE_SETENV = @HAVE_SETENV@
+HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@
+HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
+HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
+HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@
+HAVE_SLEEP = @HAVE_SLEEP@
+HAVE_STDINT_H = @HAVE_STDINT_H@
+HAVE_STRPTIME = @HAVE_STRPTIME@
+HAVE_STRTOD = @HAVE_STRTOD@
+HAVE_STRTOLL = @HAVE_STRTOLL@
+HAVE_STRTOULL = @HAVE_STRTOULL@
+HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@
+HAVE_STRUCT_TIMEVAL = @HAVE_STRUCT_TIMEVAL@
+HAVE_SYMLINK = @HAVE_SYMLINK@
+HAVE_SYMLINKAT = @HAVE_SYMLINKAT@
+HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@
+HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@
+HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@
+HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@
+HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@
+HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
+HAVE_TIMEGM = @HAVE_TIMEGM@
+HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@
+HAVE_TRUNCATE = @HAVE_TRUNCATE@
+HAVE_TZSET = @HAVE_TZSET@
+HAVE_UNISTD_H = @HAVE_UNISTD_H@
+HAVE_UNLINKAT = @HAVE_UNLINKAT@
+HAVE_UNLOCKPT = @HAVE_UNLOCKPT@
+HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@
+HAVE_USLEEP = @HAVE_USLEEP@
+HAVE_UTIMENSAT = @HAVE_UTIMENSAT@
+HAVE_VALGRIND = @HAVE_VALGRIND@
+HAVE_WCHAR_H = @HAVE_WCHAR_H@
+HAVE_WCHAR_T = @HAVE_WCHAR_T@
+HAVE_WCPCPY = @HAVE_WCPCPY@
+HAVE_WCPNCPY = @HAVE_WCPNCPY@
+HAVE_WCRTOMB = @HAVE_WCRTOMB@
+HAVE_WCSCASECMP = @HAVE_WCSCASECMP@
+HAVE_WCSCAT = @HAVE_WCSCAT@
+HAVE_WCSCHR = @HAVE_WCSCHR@
+HAVE_WCSCMP = @HAVE_WCSCMP@
+HAVE_WCSCOLL = @HAVE_WCSCOLL@
+HAVE_WCSCPY = @HAVE_WCSCPY@
+HAVE_WCSCSPN = @HAVE_WCSCSPN@
+HAVE_WCSDUP = @HAVE_WCSDUP@
+HAVE_WCSFTIME = @HAVE_WCSFTIME@
+HAVE_WCSLEN = @HAVE_WCSLEN@
+HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@
+HAVE_WCSNCAT = @HAVE_WCSNCAT@
+HAVE_WCSNCMP = @HAVE_WCSNCMP@
+HAVE_WCSNCPY = @HAVE_WCSNCPY@
+HAVE_WCSNLEN = @HAVE_WCSNLEN@
+HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@
+HAVE_WCSPBRK = @HAVE_WCSPBRK@
+HAVE_WCSRCHR = @HAVE_WCSRCHR@
+HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@
+HAVE_WCSSPN = @HAVE_WCSSPN@
+HAVE_WCSSTR = @HAVE_WCSSTR@
+HAVE_WCSTOK = @HAVE_WCSTOK@
+HAVE_WCSWIDTH = @HAVE_WCSWIDTH@
+HAVE_WCSXFRM = @HAVE_WCSXFRM@
+HAVE_WCTRANS_T = @HAVE_WCTRANS_T@
+HAVE_WCTYPE_H = @HAVE_WCTYPE_H@
+HAVE_WCTYPE_T = @HAVE_WCTYPE_T@
+HAVE_WINSOCK2_H = @HAVE_WINSOCK2_H@
+HAVE_WINT_T = @HAVE_WINT_T@
+HAVE_WMEMCHR = @HAVE_WMEMCHR@
+HAVE_WMEMCMP = @HAVE_WMEMCMP@
+HAVE_WMEMCPY = @HAVE_WMEMCPY@
+HAVE_WMEMMOVE = @HAVE_WMEMMOVE@
+HAVE_WMEMSET = @HAVE_WMEMSET@
+HAVE_XLOCALE_H = @HAVE_XLOCALE_H@
+HAVE__BOOL = @HAVE__BOOL@
+HAVE__EXIT = @HAVE__EXIT@
+INCLUDE_NEXT = @INCLUDE_NEXT@
+INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBDAP_VERSION = @LIBDAP_VERSION@
+LIBINTL = @LIBINTL@
+LIBMULTITHREAD = @LIBMULTITHREAD@
+LIBOBJS = @LIBOBJS@
+LIBPTH = @LIBPTH@
+LIBPTH_PREFIX = @LIBPTH_PREFIX@
+LIBS = @LIBS@
+LIBTHREAD = @LIBTHREAD@
+LIBTOOL = @LIBTOOL@
+LIMITS_H = @LIMITS_H@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@
+LOCALE_FR = @LOCALE_FR@
+LOCALE_FR_UTF8 = @LOCALE_FR_UTF8@
+LOCALE_JA = @LOCALE_JA@
+LOCALE_ZH_CN = @LOCALE_ZH_CN@
+LTLIBINTL = @LTLIBINTL@
+LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
+LTLIBOBJS = @LTLIBOBJS@
+LTLIBPTH = @LTLIBPTH@
+LTLIBTHREAD = @LTLIBTHREAD@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@
+NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H = @NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H@
+NEXT_AS_FIRST_DIRECTIVE_LIMITS_H = @NEXT_AS_FIRST_DIRECTIVE_LIMITS_H@
+NEXT_AS_FIRST_DIRECTIVE_LOCALE_H = @NEXT_AS_FIRST_DIRECTIVE_LOCALE_H@
+NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@
+NEXT_AS_FIRST_DIRECTIVE_STDINT_H = @NEXT_AS_FIRST_DIRECTIVE_STDINT_H@
+NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@
+NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@
+NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@
+NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@
+NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@
+NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@
+NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@
+NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@
+NEXT_FCNTL_H = @NEXT_FCNTL_H@
+NEXT_LANGINFO_H = @NEXT_LANGINFO_H@
+NEXT_LIMITS_H = @NEXT_LIMITS_H@
+NEXT_LOCALE_H = @NEXT_LOCALE_H@
+NEXT_STDDEF_H = @NEXT_STDDEF_H@
+NEXT_STDINT_H = @NEXT_STDINT_H@
+NEXT_STDLIB_H = @NEXT_STDLIB_H@
+NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@
+NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@
+NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@
+NEXT_TIME_H = @NEXT_TIME_H@
+NEXT_UNISTD_H = @NEXT_UNISTD_H@
+NEXT_WCHAR_H = @NEXT_WCHAR_H@
+NEXT_WCTYPE_H = @NEXT_WCTYPE_H@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_MAJOR_VERSION = @PACKAGE_MAJOR_VERSION@
+PACKAGE_MINOR_VERSION = @PACKAGE_MINOR_VERSION@
+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@
+PRAGMA_COLUMNS = @PRAGMA_COLUMNS@
+PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
+PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@
+PTHREAD_LIBS = @PTHREAD_LIBS@
+PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
+RANLIB = @RANLIB@
+REPLACE_BTOWC = @REPLACE_BTOWC@
+REPLACE_CALLOC = @REPLACE_CALLOC@
+REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@
+REPLACE_CHOWN = @REPLACE_CHOWN@
+REPLACE_CLOSE = @REPLACE_CLOSE@
+REPLACE_CTIME = @REPLACE_CTIME@
+REPLACE_DUP = @REPLACE_DUP@
+REPLACE_DUP2 = @REPLACE_DUP2@
+REPLACE_DUPLOCALE = @REPLACE_DUPLOCALE@
+REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@
+REPLACE_FCNTL = @REPLACE_FCNTL@
+REPLACE_FSTAT = @REPLACE_FSTAT@
+REPLACE_FSTATAT = @REPLACE_FSTATAT@
+REPLACE_FTRUNCATE = @REPLACE_FTRUNCATE@
+REPLACE_FUTIMENS = @REPLACE_FUTIMENS@
+REPLACE_GETCWD = @REPLACE_GETCWD@
+REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@
+REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@
+REPLACE_GETGROUPS = @REPLACE_GETGROUPS@
+REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
+REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
+REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@
+REPLACE_GMTIME = @REPLACE_GMTIME@
+REPLACE_ISATTY = @REPLACE_ISATTY@
+REPLACE_ISWBLANK = @REPLACE_ISWBLANK@
+REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@
+REPLACE_LCHOWN = @REPLACE_LCHOWN@
+REPLACE_LINK = @REPLACE_LINK@
+REPLACE_LINKAT = @REPLACE_LINKAT@
+REPLACE_LOCALECONV = @REPLACE_LOCALECONV@
+REPLACE_LOCALTIME = @REPLACE_LOCALTIME@
+REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@
+REPLACE_LSEEK = @REPLACE_LSEEK@
+REPLACE_LSTAT = @REPLACE_LSTAT@
+REPLACE_MALLOC = @REPLACE_MALLOC@
+REPLACE_MBRLEN = @REPLACE_MBRLEN@
+REPLACE_MBRTOWC = @REPLACE_MBRTOWC@
+REPLACE_MBSINIT = @REPLACE_MBSINIT@
+REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@
+REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@
+REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@
+REPLACE_MBTOWC = @REPLACE_MBTOWC@
+REPLACE_MKDIR = @REPLACE_MKDIR@
+REPLACE_MKFIFO = @REPLACE_MKFIFO@
+REPLACE_MKNOD = @REPLACE_MKNOD@
+REPLACE_MKSTEMP = @REPLACE_MKSTEMP@
+REPLACE_MKTIME = @REPLACE_MKTIME@
+REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@
+REPLACE_NL_LANGINFO = @REPLACE_NL_LANGINFO@
+REPLACE_NULL = @REPLACE_NULL@
+REPLACE_OPEN = @REPLACE_OPEN@
+REPLACE_OPENAT = @REPLACE_OPENAT@
+REPLACE_PREAD = @REPLACE_PREAD@
+REPLACE_PTSNAME = @REPLACE_PTSNAME@
+REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@
+REPLACE_PUTENV = @REPLACE_PUTENV@
+REPLACE_PWRITE = @REPLACE_PWRITE@
+REPLACE_QSORT_R = @REPLACE_QSORT_R@
+REPLACE_RANDOM_R = @REPLACE_RANDOM_R@
+REPLACE_READ = @REPLACE_READ@
+REPLACE_READLINK = @REPLACE_READLINK@
+REPLACE_READLINKAT = @REPLACE_READLINKAT@
+REPLACE_REALLOC = @REPLACE_REALLOC@
+REPLACE_REALPATH = @REPLACE_REALPATH@
+REPLACE_RMDIR = @REPLACE_RMDIR@
+REPLACE_SETENV = @REPLACE_SETENV@
+REPLACE_SETLOCALE = @REPLACE_SETLOCALE@
+REPLACE_SLEEP = @REPLACE_SLEEP@
+REPLACE_STAT = @REPLACE_STAT@
+REPLACE_STRFTIME = @REPLACE_STRFTIME@
+REPLACE_STRTOD = @REPLACE_STRTOD@
+REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@
+REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@
+REPLACE_SYMLINK = @REPLACE_SYMLINK@
+REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@
+REPLACE_TIMEGM = @REPLACE_TIMEGM@
+REPLACE_TOWLOWER = @REPLACE_TOWLOWER@
+REPLACE_TRUNCATE = @REPLACE_TRUNCATE@
+REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@
+REPLACE_TZSET = @REPLACE_TZSET@
+REPLACE_UNLINK = @REPLACE_UNLINK@
+REPLACE_UNLINKAT = @REPLACE_UNLINKAT@
+REPLACE_UNSETENV = @REPLACE_UNSETENV@
+REPLACE_USLEEP = @REPLACE_USLEEP@
+REPLACE_UTIMENSAT = @REPLACE_UTIMENSAT@
+REPLACE_WCRTOMB = @REPLACE_WCRTOMB@
+REPLACE_WCSFTIME = @REPLACE_WCSFTIME@
+REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@
+REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@
+REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@
+REPLACE_WCTOB = @REPLACE_WCTOB@
+REPLACE_WCTOMB = @REPLACE_WCTOMB@
+REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
+REPLACE_WRITE = @REPLACE_WRITE@
+SED = @SED@
+SERVERLIB_AGE = @SERVERLIB_AGE@
+SERVERLIB_CURRENT = @SERVERLIB_CURRENT@
+SERVERLIB_REVISION = @SERVERLIB_REVISION@
+SERVERLIB_VERSION = @SERVERLIB_VERSION@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@
+SIZE_T_SUFFIX = @SIZE_T_SUFFIX@
+STDBOOL_H = @STDBOOL_H@
+STDDEF_H = @STDDEF_H@
+STDINT_H = @STDINT_H@
+STRIP = @STRIP@
+SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@
+TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@
+UNISTD_H_DEFINES_STRUCT_TIMESPEC = @UNISTD_H_DEFINES_STRUCT_TIMESPEC@
+UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@
+UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@
+UUID_LIBS = @UUID_LIBS@
+VERSION = @VERSION@
+WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
+WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@
+WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@
+WINDOWS_STAT_INODES = @WINDOWS_STAT_INODES@
+WINDOWS_STAT_TIMESPEC = @WINDOWS_STAT_TIMESPEC@
+WINT_T_SUFFIX = @WINT_T_SUFFIX@
+XML2_CFLAGS = @XML2_CFLAGS@
+XML2_LIBS = @XML2_LIBS@
+YACC = @YACC@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_word_order = @ac_word_order@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+curlprivatelibs = @curlprivatelibs@
+curlprivatereq = @curlprivatereq@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gl_LIBOBJS = @gl_LIBOBJS@
+gl_LTLIBOBJS = @gl_LTLIBOBJS@
+gltests_LIBOBJS = @gltests_LIBOBJS@
+gltests_LTLIBOBJS = @gltests_LTLIBOBJS@
+gltests_WITNESS = @gltests_WITNESS@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+lispdir = @lispdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+runstatedir = @runstatedir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+xmlprivatelibs = @xmlprivatelibs@
+xmlprivatereq = @xmlprivatereq@
+AUTOMAKE_OPTIONS = foreign check-news subdir-objects
+ACLOCAL_AMFLAGS = -I conf -I gl/m4
+aclocaldir = $(datadir)/aclocal
+pkgconfigdir = $(libdir)/pkgconfig
+AM_CPPFLAGS = -I$(top_builddir)/gl -I$(top_srcdir)/gl -I$(top_srcdir)/GNU $(XML2_CFLAGS)
+AM_CXXFLAGS = $(am__append_1) $(am__append_2)
+
+# These are not used by automake but are often useful for certain types of
+# debugging. The best way to use these is to run configure as:
+# ./configure --disable-shared CXXFLAGS=...
+# or ./configure --enable-developer --disable-shared
+# the --disable-shared is not required, but it seems to help with debuggers.
+CXXFLAGS_DEBUG = -g3 -O0  -Wall -W -Wcast-align 
+TEST_COV_FLAGS = -g3 -ftest-coverage -fprofile-arcs
+SUBDIRS = gl d4_ce d4_function . unit-tests tests 
+DIST_SUBDIRS = gl d4_ce d4_function unit-tests tests
+noinst_LTLIBRARIES = libparsers.la
+lib_LTLIBRARIES = libdap.la libdapclient.la libdapserver.la
+bin_SCRIPTS = dap-config dap-config-pkgconfig
+
+# Including the generated grammar sources in BUILT_SOURCES ensures
+# they are built first. jhrg 6/18/15
+BUILT_SOURCES = $(BISON_SRC) $(FLEX_SRC) dods-datatypes.h xdr-datatypes.h \
+	getdap.1 dap-config.1 getdap4.1
+
+man_MANS = getdap.1 dap-config.1 getdap4.1
+libparsers_la_SOURCES = $(FLEX_SRC) $(BISON_SRC)  
+libparsers_la_CPPFLAGS = $(XML2_CFLAGS)
+libparsers_la_LIBADD = $(XML2_LIBS)
+libdap_la_SOURCES = $(DAP_SRC) $(GNU_SRC) $(am__append_3)
+libdap_la_LDFLAGS = -version-info $(LIBDAP_VERSION)
+libdap_la_CPPFLAGS = $(AM_CPPFLAGS)
+libdap_la_LIBADD = $(XML2_LIBS) $(PTHREAD_LIBS) gl/libgnu.la \
+	d4_ce/libd4_ce_parser.la d4_function/libd4_function_parser.la \
+	libparsers.la $(am__append_4)
+libdapclient_la_SOURCES = $(CLIENT_SRC) $(am__append_5)
+libdapclient_la_LDFLAGS = -version-info $(CLIENTLIB_VERSION)
+libdapclient_la_CPPFLAGS = $(AM_CPPFLAGS) $(CURL_CFLAGS)
+libdapclient_la_LIBADD = $(CURL_LIBS) libdap.la $(PTHREAD_LIBS)
+libdapserver_la_SOURCES = $(SERVER_SRC)
+libdapserver_la_LDFLAGS = -version-info $(SERVERLIB_VERSION)
+libdapserver_la_LIBADD = libdap.la $(UUID_LIBS)
+pkginclude_HEADERS = $(DAP_HDR) $(GNU_HDR) $(CLIENT_HDR) $(SERVER_HDR) \
+	$(am__append_6)
+noinst_HEADERS = config_dap.h
+getdap_SOURCES = getdap.cc
+getdap_LDADD = libdapclient.la libdap.la
+getdap_CPPFLAGS = $(AM_CPPFLAGS) $(CURL_CFLAGS)
+getdap4_SOURCES = getdap4.cc
+getdap4_LDADD = libdapclient.la libdap.la
+getdap4_CPPFLAGS = $(AM_CPPFLAGS) $(CURL_CFLAGS)
+LEX_YACC_EXTRA = das.lex das.yy dds.lex dds.yy ce_expr.lex ce_expr.yy \
+Error.lex Error.yy
+
+EXTRA_DIST = ChangeLog COPYING README.dodsrc COPYRIGHT_URI	\
+	COPYRIGHT_W3C GNU/README doxy.conf.in libdap.spec VCPP	\
+	dods-datatypes-static.h xdr-datatypes-static.h		\
+	dap-config-pkgconfig $(LEX_YACC_EXTRA) OSX_Resources	\
+	getdap.man1 dap-config.man1 getdap4.man1
+
+dist_aclocal_DATA = conf/libdap.m4
+pkgconfig_DATA = libdap.pc libdapclient.pc libdapserver.pc
+CLEANFILES = *.log *.output *.gcda *.gcno $(BISON_SRC) $(FLEX_SRC) \
+	dods-datatypes.h xdr-datatypes.h getdap.1 dap-config.1 getdap4.1
+
+HTML_DOCS = html
+DOXYGEN_CONF = doxy.conf
+
+###########################################################################
+
+# Build OS/X Packages. The strange operations with configure and make
+# are there so that the values built into dap-config will match the mac
+# osx install dirs and not the temp directory used to build the packages
+PACKAGEMAKER = /Developer/usr/bin/packagemaker
+PKG_CONF_FLAGS = 
+
+#############################################################################
+# Library sources
+# 
+GNU_SRC = GNU/GetOpt.cc GNU/GNURegex.cc
+GNU_HDR = GNU/GetOpt.h GNU/GNURegex.h
+BISON_SRC = das.tab.cc das.tab.hh dds.tab.cc	dds.tab.hh \
+	ce_expr.tab.cc ce_expr.tab.hh Error.tab.cc Error.tab.hh 
+
+FLEX_SRC = lex.das.cc lex.dds.cc lex.ce_expr.cc lex.Error.cc
+DAP_SRC = AttrTable.cc DAS.cc DDS.cc DataDDS.cc DDXParserSAX2.cc	\
+	BaseType.cc Byte.cc Int32.cc Float64.cc Str.cc Url.cc		\
+	Vector.cc Array.cc Structure.cc Sequence.cc Grid.cc UInt32.cc	\
+	Int16.cc UInt16.cc Float32.cc Constructor.cc			\
+	BaseTypeFactory.cc SignalHandler.cc Error.cc InternalErr.cc	\
+	util.cc xdrutil_ppc.c parser-util.cc escaping.cc		\
+	Clause.cc RValue.cc			\
+	ConstraintEvaluator.cc DapIndent.cc	\
+	Operators.h XDRUtils.cc XDRFileMarshaller.cc			\
+	XDRStreamMarshaller.cc XDRFileUnMarshaller.cc			\
+	XDRStreamUnMarshaller.cc mime_util.cc Keywords2.cc XMLWriter.cc \
+	ServerFunctionsList.cc ServerFunction.cc DapXmlNamespaces.cc \
+	MarshallerThread.cc
+
+DAP4_ONLY_SRC = D4StreamMarshaller.cc D4StreamUnMarshaller.cc Int64.cc \
+        UInt64.cc Int8.cc D4ParserSax2.cc D4BaseTypeFactory.cc \
+        D4Dimensions.cc  D4EnumDefs.cc D4Group.cc DMR.cc \
+        D4Attributes.cc D4Enum.cc chunked_ostream.cc chunked_istream.cc \
+        D4Sequence.cc D4Maps.cc D4Opaque.cc D4AsyncUtil.cc D4RValue.cc \
+        D4FilterClause.cc
+
+
+# Operators.h is included in with the source to prevent it from bing installed
+# with the other headers. It includes one of the built grammar file headers.
+CLIENT_SRC = RCReader.cc Connect.cc HTTPConnect.cc HTTPCache.cc	\
+	util_mit.cc ResponseTooBigErr.cc HTTPCacheTable.cc
+
+DAP4_CLIENT_SRC = D4Connect.cc
+SERVER_SRC = DODSFilter.cc Ancillary.cc
+# ResponseBuilder.cc ResponseCache.cc
+DAP_HDR = AttrTable.h DAS.h DDS.h DataDDS.h DDXParserSAX2.h		\
+	DDXExceptions.h BaseType.h Byte.h Int32.h Float64.h Str.h	\
+	Url.h Vector.h Array.h Constructor.h Structure.h Sequence.h	\
+	Grid.h UInt32.h Int16.h UInt16.h Float32.h BaseTypeFactory.h	\
+	ObjectType.h EncodingType.h SignalHandler.h Error.h		\
+	InternalErr.h util.h escaping.h parser.h debug.h dods-limits.h	\
+	dods-datatypes.h Type.h		\
+	util_mit.h expr.h Clause.h RValue.h ConstraintEvaluator.h	\
+	ce_parser.h DapIndent.h DapObj.h XDRFileMarshaller.h		\
+	Marshaller.h UnMarshaller.h XDRFileUnMarshaller.h		\
+	XDRStreamMarshaller.h XDRUtils.h xdr-datatypes.h mime_util.h	\
+	cgi_util.h XDRStreamUnMarshaller.h Keywords2.h XMLWriter.h \
+	ServerFunctionsList.h ServerFunction.h media_types.h \
+	DapXmlNamespaces.h parser-util.h MarshallerThread.h
+
+DAP4_ONLY_HDR = D4StreamMarshaller.h D4StreamUnMarshaller.h Int64.h \
+        UInt64.h Int8.h D4ParserSax2.h D4BaseTypeFactory.h \
+        D4Maps.h D4Dimensions.h D4EnumDefs.h D4Group.h DMR.h D4Attributes.h \
+        D4AttributeType.h D4Enum.h chunked_stream.h chunked_ostream.h \
+        chunked_istream.h D4Sequence.h crc.h D4Opaque.h D4AsyncUtil.h \
+        D4Function.h D4RValue.h D4FilterClause.h
+
+CLIENT_HDR = RCReader.h Connect.h HTTPConnect.h HTTPCache.h		\
+	HTTPCacheDisconnectedMode.h HTTPCacheInterruptHandler.h		\
+	Response.h HTTPResponse.h HTTPCacheResponse.h PipeResponse.h	\
+	StdinResponse.h SignalHandlerRegisteredErr.h			\
+	ResponseTooBigErr.h Resource.h HTTPCacheTable.h HTTPCacheMacros.h
+
+DAP4_CLIENT_HDR = D4Connect.h
+SERVER_HDR = DODSFilter.h AlarmHandler.h EventHandler.h Ancillary.h
+all: $(BUILT_SOURCES) config.h dods-datatypes-config.h xdr-datatypes-config.h
+	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+
+.SUFFIXES:
+.SUFFIXES: .c .cc .lo .o .obj
+am--refresh: Makefile
+	@:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
+	      $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    echo ' $(SHELL) ./config.status'; \
+	    $(SHELL) ./config.status;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	$(SHELL) ./config.status --recheck
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	$(am__cd) $(srcdir) && $(AUTOCONF)
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+$(am__aclocal_m4_deps):
+
+config.h: stamp-h1
+	@test -f $@ || rm -f stamp-h1
+	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
+
+stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+	@rm -f stamp-h1
+	cd $(top_builddir) && $(SHELL) ./config.status config.h
+$(srcdir)/config.h.in:  $(am__configure_deps) 
+	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
+	rm -f stamp-h1
+	touch $@
+
+dods-datatypes-config.h: stamp-h2
+	@test -f $@ || rm -f stamp-h2
+	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h2
+
+stamp-h2: $(srcdir)/dods-datatypes-config.h.in $(top_builddir)/config.status
+	@rm -f stamp-h2
+	cd $(top_builddir) && $(SHELL) ./config.status dods-datatypes-config.h
+
+xdr-datatypes-config.h: stamp-h3
+	@test -f $@ || rm -f stamp-h3
+	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h3
+
+stamp-h3: $(srcdir)/xdr-datatypes-config.h.in $(top_builddir)/config.status
+	@rm -f stamp-h3
+	cd $(top_builddir) && $(SHELL) ./config.status xdr-datatypes-config.h
+
+distclean-hdr:
+	-rm -f config.h stamp-h1 dods-datatypes-config.h stamp-h2 xdr-datatypes-config.h stamp-h3
+libdap.pc: $(top_builddir)/config.status $(srcdir)/libdap.pc.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
+libdapclient.pc: $(top_builddir)/config.status $(srcdir)/libdapclient.pc.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
+libdapserver.pc: $(top_builddir)/config.status $(srcdir)/libdapserver.pc.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
+main_page.doxygen: $(top_builddir)/config.status $(srcdir)/main_page.doxygen.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
+doxy.conf: $(top_builddir)/config.status $(srcdir)/doxy.conf.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
+abi_checker.xml: $(top_builddir)/config.status $(srcdir)/abi_checker.xml.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
+dap-config: $(top_builddir)/config.status $(srcdir)/dap-config.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
+
+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	list2=; for p in $$list; do \
+	  if test -f $$p; then \
+	    list2="$$list2 $$p"; \
+	  else :; fi; \
+	done; \
+	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
+	}
+
+uninstall-libLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	for p in $$list; do \
+	  $(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
+	done
+
+clean-libLTLIBRARIES:
+	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+	@list='$(lib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+GNU/$(am__dirstamp):
+	@$(MKDIR_P) GNU
+	@: > GNU/$(am__dirstamp)
+GNU/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) GNU/$(DEPDIR)
+	@: > GNU/$(DEPDIR)/$(am__dirstamp)
+GNU/libdap_la-GetOpt.lo: GNU/$(am__dirstamp) \
+	GNU/$(DEPDIR)/$(am__dirstamp)
+GNU/libdap_la-GNURegex.lo: GNU/$(am__dirstamp) \
+	GNU/$(DEPDIR)/$(am__dirstamp)
+
+libdap.la: $(libdap_la_OBJECTS) $(libdap_la_DEPENDENCIES) $(EXTRA_libdap_la_DEPENDENCIES) 
+	$(AM_V_CXXLD)$(libdap_la_LINK) -rpath $(libdir) $(libdap_la_OBJECTS) $(libdap_la_LIBADD) $(LIBS)
+
+libdapclient.la: $(libdapclient_la_OBJECTS) $(libdapclient_la_DEPENDENCIES) $(EXTRA_libdapclient_la_DEPENDENCIES) 
+	$(AM_V_CXXLD)$(libdapclient_la_LINK) -rpath $(libdir) $(libdapclient_la_OBJECTS) $(libdapclient_la_LIBADD) $(LIBS)
+
+libdapserver.la: $(libdapserver_la_OBJECTS) $(libdapserver_la_DEPENDENCIES) $(EXTRA_libdapserver_la_DEPENDENCIES) 
+	$(AM_V_CXXLD)$(libdapserver_la_LINK) -rpath $(libdir) $(libdapserver_la_OBJECTS) $(libdapserver_la_LIBADD) $(LIBS)
+
+libparsers.la: $(libparsers_la_OBJECTS) $(libparsers_la_DEPENDENCIES) $(EXTRA_libparsers_la_DEPENDENCIES) 
+	$(AM_V_CXXLD)$(CXXLINK)  $(libparsers_la_OBJECTS) $(libparsers_la_LIBADD) $(LIBS)
+install-binPROGRAMS: $(bin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+	fi; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p \
+	 || test -f $$p1 \
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' \
+	    -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+	    } \
+	; done
+
+uninstall-binPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' \
+	`; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(bindir)" && rm -f $$files
+
+clean-binPROGRAMS:
+	@list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
+
+getdap$(EXEEXT): $(getdap_OBJECTS) $(getdap_DEPENDENCIES) $(EXTRA_getdap_DEPENDENCIES) 
+	@rm -f getdap$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(getdap_OBJECTS) $(getdap_LDADD) $(LIBS)
+
+getdap4$(EXEEXT): $(getdap4_OBJECTS) $(getdap4_DEPENDENCIES) $(EXTRA_getdap4_DEPENDENCIES) 
+	@rm -f getdap4$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(getdap4_OBJECTS) $(getdap4_LDADD) $(LIBS)
+install-binSCRIPTS: $(bin_SCRIPTS)
+	@$(NORMAL_INSTALL)
+	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n' \
+	    -e 'h;s|.*|.|' \
+	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) { files[d] = files[d] " " $$1; \
+	      if (++n[d] == $(am__install_max)) { \
+		print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
+	    else { print "f", d "/" $$4, $$1 } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	     test -z "$$files" || { \
+	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+	     } \
+	; done
+
+uninstall-binSCRIPTS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	       sed -e 's,.*/,,;$(transform)'`; \
+	dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+	-rm -f GNU/*.$(OBJEXT)
+	-rm -f GNU/*.lo
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Ancillary.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DODSFilter.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getdap-getdap.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getdap4-getdap4.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdap_la-Array.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdap_la-AttrTable.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdap_la-BaseType.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdap_la-BaseTypeFactory.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdap_la-Byte.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdap_la-Clause.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdap_la-ConstraintEvaluator.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdap_la-Constructor.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdap_la-D4AsyncUtil.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdap_la-D4Attributes.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdap_la-D4BaseTypeFactory.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdap_la-D4Dimensions.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdap_la-D4Enum.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdap_la-D4EnumDefs.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdap_la-D4FilterClause.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdap_la-D4Group.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdap_la-D4Maps.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdap_la-D4Opaque.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdap_la-D4ParserSax2.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdap_la-D4RValue.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdap_la-D4Sequence.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdap_la-D4StreamMarshaller.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdap_la-D4StreamUnMarshaller.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdap_la-DAS.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdap_la-DDS.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdap_la-DDXParserSAX2.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdap_la-DMR.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdap_la-DapIndent.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdap_la-DapXmlNamespaces.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdap_la-DataDDS.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdap_la-Error.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdap_la-Float32.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdap_la-Float64.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdap_la-Grid.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdap_la-Int16.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdap_la-Int32.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdap_la-Int64.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdap_la-Int8.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdap_la-InternalErr.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdap_la-Keywords2.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdap_la-MarshallerThread.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdap_la-RValue.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdap_la-Sequence.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdap_la-ServerFunction.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdap_la-ServerFunctionsList.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdap_la-SignalHandler.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdap_la-Str.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdap_la-Structure.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdap_la-UInt16.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdap_la-UInt32.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdap_la-UInt64.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdap_la-Url.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdap_la-Vector.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdap_la-XDRFileMarshaller.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdap_la-XDRFileUnMarshaller.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdap_la-XDRStreamMarshaller.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdap_la-XDRStreamUnMarshaller.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdap_la-XDRUtils.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdap_la-XMLWriter.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdap_la-chunked_istream.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdap_la-chunked_ostream.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdap_la-escaping.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdap_la-mime_util.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdap_la-parser-util.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdap_la-util.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdap_la-xdrutil_ppc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdapclient_la-Connect.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdapclient_la-D4Connect.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdapclient_la-HTTPCache.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdapclient_la-HTTPCacheTable.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdapclient_la-HTTPConnect.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdapclient_la-RCReader.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdapclient_la-ResponseTooBigErr.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdapclient_la-util_mit.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libparsers_la-Error.tab.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libparsers_la-ce_expr.tab.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libparsers_la-das.tab.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libparsers_la-dds.tab.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libparsers_la-lex.Error.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libparsers_la-lex.ce_expr.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libparsers_la-lex.das.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libparsers_la-lex.dds.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@GNU/$(DEPDIR)/libdap_la-GNURegex.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@GNU/$(DEPDIR)/libdap_la-GetOpt.Plo@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+libdap_la-xdrutil_ppc.lo: xdrutil_ppc.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdap_la-xdrutil_ppc.lo -MD -MP -MF $(DEPDIR)/libdap_la-xdrutil_ppc.Tpo -c -o libdap_la-xdrutil_ppc.lo `test -f 'xdrutil_ppc.c' || echo '$(srcdir)/'`xdrutil_ppc.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-xdrutil_ppc.Tpo $(DEPDIR)/libdap_la-xdrutil_ppc.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='xdrutil_ppc.c' object='libdap_la-xdrutil_ppc.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdap_la-xdrutil_ppc.lo `test -f 'xdrutil_ppc.c' || echo '$(srcdir)/'`xdrutil_ppc.c
+
+.cc.o:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
+
+.cc.obj:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cc.lo:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
+
+libdap_la-AttrTable.lo: AttrTable.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-AttrTable.lo -MD -MP -MF $(DEPDIR)/libdap_la-AttrTable.Tpo -c -o libdap_la-AttrTable.lo `test -f 'AttrTable.cc' || echo '$(srcdir)/'`AttrTable.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-AttrTable.Tpo $(DEPDIR)/libdap_la-AttrTable.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='AttrTable.cc' object='libdap_la-AttrTable.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-AttrTable.lo `test -f 'AttrTable.cc' || echo '$(srcdir)/'`AttrTable.cc
+
+libdap_la-DAS.lo: DAS.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-DAS.lo -MD -MP -MF $(DEPDIR)/libdap_la-DAS.Tpo -c -o libdap_la-DAS.lo `test -f 'DAS.cc' || echo '$(srcdir)/'`DAS.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-DAS.Tpo $(DEPDIR)/libdap_la-DAS.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='DAS.cc' object='libdap_la-DAS.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-DAS.lo `test -f 'DAS.cc' || echo '$(srcdir)/'`DAS.cc
+
+libdap_la-DDS.lo: DDS.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-DDS.lo -MD -MP -MF $(DEPDIR)/libdap_la-DDS.Tpo -c -o libdap_la-DDS.lo `test -f 'DDS.cc' || echo '$(srcdir)/'`DDS.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-DDS.Tpo $(DEPDIR)/libdap_la-DDS.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='DDS.cc' object='libdap_la-DDS.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-DDS.lo `test -f 'DDS.cc' || echo '$(srcdir)/'`DDS.cc
+
+libdap_la-DataDDS.lo: DataDDS.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-DataDDS.lo -MD -MP -MF $(DEPDIR)/libdap_la-DataDDS.Tpo -c -o libdap_la-DataDDS.lo `test -f 'DataDDS.cc' || echo '$(srcdir)/'`DataDDS.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-DataDDS.Tpo $(DEPDIR)/libdap_la-DataDDS.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='DataDDS.cc' object='libdap_la-DataDDS.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-DataDDS.lo `test -f 'DataDDS.cc' || echo '$(srcdir)/'`DataDDS.cc
+
+libdap_la-DDXParserSAX2.lo: DDXParserSAX2.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-DDXParserSAX2.lo -MD -MP -MF $(DEPDIR)/libdap_la-DDXParserSAX2.Tpo -c -o libdap_la-DDXParserSAX2.lo `test -f 'DDXParserSAX2.cc' || echo '$(srcdir)/'`DDXParserSAX2.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-DDXParserSAX2.Tpo $(DEPDIR)/libdap_la-DDXParserSAX2.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='DDXParserSAX2.cc' object='libdap_la-DDXParserSAX2.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-DDXParserSAX2.lo `test -f 'DDXParserSAX2.cc' || echo '$(srcdir)/'`DDXParserSAX2.cc
+
+libdap_la-BaseType.lo: BaseType.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-BaseType.lo -MD -MP -MF $(DEPDIR)/libdap_la-BaseType.Tpo -c -o libdap_la-BaseType.lo `test -f 'BaseType.cc' || echo '$(srcdir)/'`BaseType.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-BaseType.Tpo $(DEPDIR)/libdap_la-BaseType.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='BaseType.cc' object='libdap_la-BaseType.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-BaseType.lo `test -f 'BaseType.cc' || echo '$(srcdir)/'`BaseType.cc
+
+libdap_la-Byte.lo: Byte.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-Byte.lo -MD -MP -MF $(DEPDIR)/libdap_la-Byte.Tpo -c -o libdap_la-Byte.lo `test -f 'Byte.cc' || echo '$(srcdir)/'`Byte.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-Byte.Tpo $(DEPDIR)/libdap_la-Byte.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='Byte.cc' object='libdap_la-Byte.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-Byte.lo `test -f 'Byte.cc' || echo '$(srcdir)/'`Byte.cc
+
+libdap_la-Int32.lo: Int32.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-Int32.lo -MD -MP -MF $(DEPDIR)/libdap_la-Int32.Tpo -c -o libdap_la-Int32.lo `test -f 'Int32.cc' || echo '$(srcdir)/'`Int32.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-Int32.Tpo $(DEPDIR)/libdap_la-Int32.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='Int32.cc' object='libdap_la-Int32.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-Int32.lo `test -f 'Int32.cc' || echo '$(srcdir)/'`Int32.cc
+
+libdap_la-Float64.lo: Float64.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-Float64.lo -MD -MP -MF $(DEPDIR)/libdap_la-Float64.Tpo -c -o libdap_la-Float64.lo `test -f 'Float64.cc' || echo '$(srcdir)/'`Float64.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-Float64.Tpo $(DEPDIR)/libdap_la-Float64.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='Float64.cc' object='libdap_la-Float64.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-Float64.lo `test -f 'Float64.cc' || echo '$(srcdir)/'`Float64.cc
+
+libdap_la-Str.lo: Str.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-Str.lo -MD -MP -MF $(DEPDIR)/libdap_la-Str.Tpo -c -o libdap_la-Str.lo `test -f 'Str.cc' || echo '$(srcdir)/'`Str.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-Str.Tpo $(DEPDIR)/libdap_la-Str.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='Str.cc' object='libdap_la-Str.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-Str.lo `test -f 'Str.cc' || echo '$(srcdir)/'`Str.cc
+
+libdap_la-Url.lo: Url.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-Url.lo -MD -MP -MF $(DEPDIR)/libdap_la-Url.Tpo -c -o libdap_la-Url.lo `test -f 'Url.cc' || echo '$(srcdir)/'`Url.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-Url.Tpo $(DEPDIR)/libdap_la-Url.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='Url.cc' object='libdap_la-Url.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-Url.lo `test -f 'Url.cc' || echo '$(srcdir)/'`Url.cc
+
+libdap_la-Vector.lo: Vector.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-Vector.lo -MD -MP -MF $(DEPDIR)/libdap_la-Vector.Tpo -c -o libdap_la-Vector.lo `test -f 'Vector.cc' || echo '$(srcdir)/'`Vector.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-Vector.Tpo $(DEPDIR)/libdap_la-Vector.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='Vector.cc' object='libdap_la-Vector.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-Vector.lo `test -f 'Vector.cc' || echo '$(srcdir)/'`Vector.cc
+
+libdap_la-Array.lo: Array.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-Array.lo -MD -MP -MF $(DEPDIR)/libdap_la-Array.Tpo -c -o libdap_la-Array.lo `test -f 'Array.cc' || echo '$(srcdir)/'`Array.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-Array.Tpo $(DEPDIR)/libdap_la-Array.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='Array.cc' object='libdap_la-Array.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-Array.lo `test -f 'Array.cc' || echo '$(srcdir)/'`Array.cc
+
+libdap_la-Structure.lo: Structure.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-Structure.lo -MD -MP -MF $(DEPDIR)/libdap_la-Structure.Tpo -c -o libdap_la-Structure.lo `test -f 'Structure.cc' || echo '$(srcdir)/'`Structure.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-Structure.Tpo $(DEPDIR)/libdap_la-Structure.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='Structure.cc' object='libdap_la-Structure.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-Structure.lo `test -f 'Structure.cc' || echo '$(srcdir)/'`Structure.cc
+
+libdap_la-Sequence.lo: Sequence.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-Sequence.lo -MD -MP -MF $(DEPDIR)/libdap_la-Sequence.Tpo -c -o libdap_la-Sequence.lo `test -f 'Sequence.cc' || echo '$(srcdir)/'`Sequence.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-Sequence.Tpo $(DEPDIR)/libdap_la-Sequence.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='Sequence.cc' object='libdap_la-Sequence.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-Sequence.lo `test -f 'Sequence.cc' || echo '$(srcdir)/'`Sequence.cc
+
+libdap_la-Grid.lo: Grid.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-Grid.lo -MD -MP -MF $(DEPDIR)/libdap_la-Grid.Tpo -c -o libdap_la-Grid.lo `test -f 'Grid.cc' || echo '$(srcdir)/'`Grid.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-Grid.Tpo $(DEPDIR)/libdap_la-Grid.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='Grid.cc' object='libdap_la-Grid.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-Grid.lo `test -f 'Grid.cc' || echo '$(srcdir)/'`Grid.cc
+
+libdap_la-UInt32.lo: UInt32.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-UInt32.lo -MD -MP -MF $(DEPDIR)/libdap_la-UInt32.Tpo -c -o libdap_la-UInt32.lo `test -f 'UInt32.cc' || echo '$(srcdir)/'`UInt32.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-UInt32.Tpo $(DEPDIR)/libdap_la-UInt32.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='UInt32.cc' object='libdap_la-UInt32.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-UInt32.lo `test -f 'UInt32.cc' || echo '$(srcdir)/'`UInt32.cc
+
+libdap_la-Int16.lo: Int16.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-Int16.lo -MD -MP -MF $(DEPDIR)/libdap_la-Int16.Tpo -c -o libdap_la-Int16.lo `test -f 'Int16.cc' || echo '$(srcdir)/'`Int16.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-Int16.Tpo $(DEPDIR)/libdap_la-Int16.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='Int16.cc' object='libdap_la-Int16.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-Int16.lo `test -f 'Int16.cc' || echo '$(srcdir)/'`Int16.cc
+
+libdap_la-UInt16.lo: UInt16.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-UInt16.lo -MD -MP -MF $(DEPDIR)/libdap_la-UInt16.Tpo -c -o libdap_la-UInt16.lo `test -f 'UInt16.cc' || echo '$(srcdir)/'`UInt16.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-UInt16.Tpo $(DEPDIR)/libdap_la-UInt16.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='UInt16.cc' object='libdap_la-UInt16.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-UInt16.lo `test -f 'UInt16.cc' || echo '$(srcdir)/'`UInt16.cc
+
+libdap_la-Float32.lo: Float32.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-Float32.lo -MD -MP -MF $(DEPDIR)/libdap_la-Float32.Tpo -c -o libdap_la-Float32.lo `test -f 'Float32.cc' || echo '$(srcdir)/'`Float32.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-Float32.Tpo $(DEPDIR)/libdap_la-Float32.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='Float32.cc' object='libdap_la-Float32.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-Float32.lo `test -f 'Float32.cc' || echo '$(srcdir)/'`Float32.cc
+
+libdap_la-Constructor.lo: Constructor.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-Constructor.lo -MD -MP -MF $(DEPDIR)/libdap_la-Constructor.Tpo -c -o libdap_la-Constructor.lo `test -f 'Constructor.cc' || echo '$(srcdir)/'`Constructor.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-Constructor.Tpo $(DEPDIR)/libdap_la-Constructor.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='Constructor.cc' object='libdap_la-Constructor.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-Constructor.lo `test -f 'Constructor.cc' || echo '$(srcdir)/'`Constructor.cc
+
+libdap_la-BaseTypeFactory.lo: BaseTypeFactory.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-BaseTypeFactory.lo -MD -MP -MF $(DEPDIR)/libdap_la-BaseTypeFactory.Tpo -c -o libdap_la-BaseTypeFactory.lo `test -f 'BaseTypeFactory.cc' || echo '$(srcdir)/'`BaseTypeFactory.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-BaseTypeFactory.Tpo $(DEPDIR)/libdap_la-BaseTypeFactory.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='BaseTypeFactory.cc' object='libdap_la-BaseTypeFactory.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-BaseTypeFactory.lo `test -f 'BaseTypeFactory.cc' || echo '$(srcdir)/'`BaseTypeFactory.cc
+
+libdap_la-SignalHandler.lo: SignalHandler.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-SignalHandler.lo -MD -MP -MF $(DEPDIR)/libdap_la-SignalHandler.Tpo -c -o libdap_la-SignalHandler.lo `test -f 'SignalHandler.cc' || echo '$(srcdir)/'`SignalHandler.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-SignalHandler.Tpo $(DEPDIR)/libdap_la-SignalHandler.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='SignalHandler.cc' object='libdap_la-SignalHandler.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-SignalHandler.lo `test -f 'SignalHandler.cc' || echo '$(srcdir)/'`SignalHandler.cc
+
+libdap_la-Error.lo: Error.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-Error.lo -MD -MP -MF $(DEPDIR)/libdap_la-Error.Tpo -c -o libdap_la-Error.lo `test -f 'Error.cc' || echo '$(srcdir)/'`Error.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-Error.Tpo $(DEPDIR)/libdap_la-Error.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='Error.cc' object='libdap_la-Error.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-Error.lo `test -f 'Error.cc' || echo '$(srcdir)/'`Error.cc
+
+libdap_la-InternalErr.lo: InternalErr.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-InternalErr.lo -MD -MP -MF $(DEPDIR)/libdap_la-InternalErr.Tpo -c -o libdap_la-InternalErr.lo `test -f 'InternalErr.cc' || echo '$(srcdir)/'`InternalErr.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-InternalErr.Tpo $(DEPDIR)/libdap_la-InternalErr.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='InternalErr.cc' object='libdap_la-InternalErr.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-InternalErr.lo `test -f 'InternalErr.cc' || echo '$(srcdir)/'`InternalErr.cc
+
+libdap_la-util.lo: util.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-util.lo -MD -MP -MF $(DEPDIR)/libdap_la-util.Tpo -c -o libdap_la-util.lo `test -f 'util.cc' || echo '$(srcdir)/'`util.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-util.Tpo $(DEPDIR)/libdap_la-util.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='util.cc' object='libdap_la-util.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-util.lo `test -f 'util.cc' || echo '$(srcdir)/'`util.cc
+
+libdap_la-parser-util.lo: parser-util.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-parser-util.lo -MD -MP -MF $(DEPDIR)/libdap_la-parser-util.Tpo -c -o libdap_la-parser-util.lo `test -f 'parser-util.cc' || echo '$(srcdir)/'`parser-util.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-parser-util.Tpo $(DEPDIR)/libdap_la-parser-util.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='parser-util.cc' object='libdap_la-parser-util.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-parser-util.lo `test -f 'parser-util.cc' || echo '$(srcdir)/'`parser-util.cc
+
+libdap_la-escaping.lo: escaping.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-escaping.lo -MD -MP -MF $(DEPDIR)/libdap_la-escaping.Tpo -c -o libdap_la-escaping.lo `test -f 'escaping.cc' || echo '$(srcdir)/'`escaping.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-escaping.Tpo $(DEPDIR)/libdap_la-escaping.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='escaping.cc' object='libdap_la-escaping.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-escaping.lo `test -f 'escaping.cc' || echo '$(srcdir)/'`escaping.cc
+
+libdap_la-Clause.lo: Clause.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-Clause.lo -MD -MP -MF $(DEPDIR)/libdap_la-Clause.Tpo -c -o libdap_la-Clause.lo `test -f 'Clause.cc' || echo '$(srcdir)/'`Clause.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-Clause.Tpo $(DEPDIR)/libdap_la-Clause.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='Clause.cc' object='libdap_la-Clause.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-Clause.lo `test -f 'Clause.cc' || echo '$(srcdir)/'`Clause.cc
+
+libdap_la-RValue.lo: RValue.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-RValue.lo -MD -MP -MF $(DEPDIR)/libdap_la-RValue.Tpo -c -o libdap_la-RValue.lo `test -f 'RValue.cc' || echo '$(srcdir)/'`RValue.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-RValue.Tpo $(DEPDIR)/libdap_la-RValue.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='RValue.cc' object='libdap_la-RValue.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-RValue.lo `test -f 'RValue.cc' || echo '$(srcdir)/'`RValue.cc
+
+libdap_la-ConstraintEvaluator.lo: ConstraintEvaluator.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-ConstraintEvaluator.lo -MD -MP -MF $(DEPDIR)/libdap_la-ConstraintEvaluator.Tpo -c -o libdap_la-ConstraintEvaluator.lo `test -f 'ConstraintEvaluator.cc' || echo '$(srcdir)/'`ConstraintEvaluator.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-ConstraintEvaluator.Tpo $(DEPDIR)/libdap_la-ConstraintEvaluator.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='ConstraintEvaluator.cc' object='libdap_la-ConstraintEvaluator.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-ConstraintEvaluator.lo `test -f 'ConstraintEvaluator.cc' || echo '$(srcdir)/'`ConstraintEvaluator.cc
+
+libdap_la-DapIndent.lo: DapIndent.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-DapIndent.lo -MD -MP -MF $(DEPDIR)/libdap_la-DapIndent.Tpo -c -o libdap_la-DapIndent.lo `test -f 'DapIndent.cc' || echo '$(srcdir)/'`DapIndent.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-DapIndent.Tpo $(DEPDIR)/libdap_la-DapIndent.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='DapIndent.cc' object='libdap_la-DapIndent.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-DapIndent.lo `test -f 'DapIndent.cc' || echo '$(srcdir)/'`DapIndent.cc
+
+libdap_la-XDRUtils.lo: XDRUtils.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-XDRUtils.lo -MD -MP -MF $(DEPDIR)/libdap_la-XDRUtils.Tpo -c -o libdap_la-XDRUtils.lo `test -f 'XDRUtils.cc' || echo '$(srcdir)/'`XDRUtils.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-XDRUtils.Tpo $(DEPDIR)/libdap_la-XDRUtils.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='XDRUtils.cc' object='libdap_la-XDRUtils.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-XDRUtils.lo `test -f 'XDRUtils.cc' || echo '$(srcdir)/'`XDRUtils.cc
+
+libdap_la-XDRFileMarshaller.lo: XDRFileMarshaller.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-XDRFileMarshaller.lo -MD -MP -MF $(DEPDIR)/libdap_la-XDRFileMarshaller.Tpo -c -o libdap_la-XDRFileMarshaller.lo `test -f 'XDRFileMarshaller.cc' || echo '$(srcdir)/'`XDRFileMarshaller.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-XDRFileMarshaller.Tpo $(DEPDIR)/libdap_la-XDRFileMarshaller.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='XDRFileMarshaller.cc' object='libdap_la-XDRFileMarshaller.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-XDRFileMarshaller.lo `test -f 'XDRFileMarshaller.cc' || echo '$(srcdir)/'`XDRFileMarshaller.cc
+
+libdap_la-XDRStreamMarshaller.lo: XDRStreamMarshaller.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-XDRStreamMarshaller.lo -MD -MP -MF $(DEPDIR)/libdap_la-XDRStreamMarshaller.Tpo -c -o libdap_la-XDRStreamMarshaller.lo `test -f 'XDRStreamMarshaller.cc' || echo '$(srcdir)/'`XDRStreamMarshaller.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-XDRStreamMarshaller.Tpo $(DEPDIR)/libdap_la-XDRStreamMarshaller.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='XDRStreamMarshaller.cc' object='libdap_la-XDRStreamMarshaller.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-XDRStreamMarshaller.lo `test -f 'XDRStreamMarshaller.cc' || echo '$(srcdir)/'`XDRStreamMarshaller.cc
+
+libdap_la-XDRFileUnMarshaller.lo: XDRFileUnMarshaller.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-XDRFileUnMarshaller.lo -MD -MP -MF $(DEPDIR)/libdap_la-XDRFileUnMarshaller.Tpo -c -o libdap_la-XDRFileUnMarshaller.lo `test -f 'XDRFileUnMarshaller.cc' || echo '$(srcdir)/'`XDRFileUnMarshaller.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-XDRFileUnMarshaller.Tpo $(DEPDIR)/libdap_la-XDRFileUnMarshaller.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='XDRFileUnMarshaller.cc' object='libdap_la-XDRFileUnMarshaller.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-XDRFileUnMarshaller.lo `test -f 'XDRFileUnMarshaller.cc' || echo '$(srcdir)/'`XDRFileUnMarshaller.cc
+
+libdap_la-XDRStreamUnMarshaller.lo: XDRStreamUnMarshaller.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-XDRStreamUnMarshaller.lo -MD -MP -MF $(DEPDIR)/libdap_la-XDRStreamUnMarshaller.Tpo -c -o libdap_la-XDRStreamUnMarshaller.lo `test -f 'XDRStreamUnMarshaller.cc' || echo '$(srcdir)/'`XDRStreamUnMarshaller.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-XDRStreamUnMarshaller.Tpo $(DEPDIR)/libdap_la-XDRStreamUnMarshaller.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='XDRStreamUnMarshaller.cc' object='libdap_la-XDRStreamUnMarshaller.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-XDRStreamUnMarshaller.lo `test -f 'XDRStreamUnMarshaller.cc' || echo '$(srcdir)/'`XDRStreamUnMarshaller.cc
+
+libdap_la-mime_util.lo: mime_util.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-mime_util.lo -MD -MP -MF $(DEPDIR)/libdap_la-mime_util.Tpo -c -o libdap_la-mime_util.lo `test -f 'mime_util.cc' || echo '$(srcdir)/'`mime_util.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-mime_util.Tpo $(DEPDIR)/libdap_la-mime_util.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='mime_util.cc' object='libdap_la-mime_util.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-mime_util.lo `test -f 'mime_util.cc' || echo '$(srcdir)/'`mime_util.cc
+
+libdap_la-Keywords2.lo: Keywords2.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-Keywords2.lo -MD -MP -MF $(DEPDIR)/libdap_la-Keywords2.Tpo -c -o libdap_la-Keywords2.lo `test -f 'Keywords2.cc' || echo '$(srcdir)/'`Keywords2.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-Keywords2.Tpo $(DEPDIR)/libdap_la-Keywords2.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='Keywords2.cc' object='libdap_la-Keywords2.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-Keywords2.lo `test -f 'Keywords2.cc' || echo '$(srcdir)/'`Keywords2.cc
+
+libdap_la-XMLWriter.lo: XMLWriter.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-XMLWriter.lo -MD -MP -MF $(DEPDIR)/libdap_la-XMLWriter.Tpo -c -o libdap_la-XMLWriter.lo `test -f 'XMLWriter.cc' || echo '$(srcdir)/'`XMLWriter.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-XMLWriter.Tpo $(DEPDIR)/libdap_la-XMLWriter.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='XMLWriter.cc' object='libdap_la-XMLWriter.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-XMLWriter.lo `test -f 'XMLWriter.cc' || echo '$(srcdir)/'`XMLWriter.cc
+
+libdap_la-ServerFunctionsList.lo: ServerFunctionsList.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-ServerFunctionsList.lo -MD -MP -MF $(DEPDIR)/libdap_la-ServerFunctionsList.Tpo -c -o libdap_la-ServerFunctionsList.lo `test -f 'ServerFunctionsList.cc' || echo '$(srcdir)/'`ServerFunctionsList.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-ServerFunctionsList.Tpo $(DEPDIR)/libdap_la-ServerFunctionsList.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='ServerFunctionsList.cc' object='libdap_la-ServerFunctionsList.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-ServerFunctionsList.lo `test -f 'ServerFunctionsList.cc' || echo '$(srcdir)/'`ServerFunctionsList.cc
+
+libdap_la-ServerFunction.lo: ServerFunction.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-ServerFunction.lo -MD -MP -MF $(DEPDIR)/libdap_la-ServerFunction.Tpo -c -o libdap_la-ServerFunction.lo `test -f 'ServerFunction.cc' || echo '$(srcdir)/'`ServerFunction.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-ServerFunction.Tpo $(DEPDIR)/libdap_la-ServerFunction.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='ServerFunction.cc' object='libdap_la-ServerFunction.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-ServerFunction.lo `test -f 'ServerFunction.cc' || echo '$(srcdir)/'`ServerFunction.cc
+
+libdap_la-DapXmlNamespaces.lo: DapXmlNamespaces.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-DapXmlNamespaces.lo -MD -MP -MF $(DEPDIR)/libdap_la-DapXmlNamespaces.Tpo -c -o libdap_la-DapXmlNamespaces.lo `test -f 'DapXmlNamespaces.cc' || echo '$(srcdir)/'`DapXmlNamespaces.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-DapXmlNamespaces.Tpo $(DEPDIR)/libdap_la-DapXmlNamespaces.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='DapXmlNamespaces.cc' object='libdap_la-DapXmlNamespaces.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-DapXmlNamespaces.lo `test -f 'DapXmlNamespaces.cc' || echo '$(srcdir)/'`DapXmlNamespaces.cc
+
+libdap_la-MarshallerThread.lo: MarshallerThread.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-MarshallerThread.lo -MD -MP -MF $(DEPDIR)/libdap_la-MarshallerThread.Tpo -c -o libdap_la-MarshallerThread.lo `test -f 'MarshallerThread.cc' || echo '$(srcdir)/'`MarshallerThread.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-MarshallerThread.Tpo $(DEPDIR)/libdap_la-MarshallerThread.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='MarshallerThread.cc' object='libdap_la-MarshallerThread.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-MarshallerThread.lo `test -f 'MarshallerThread.cc' || echo '$(srcdir)/'`MarshallerThread.cc
+
+GNU/libdap_la-GetOpt.lo: GNU/GetOpt.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT GNU/libdap_la-GetOpt.lo -MD -MP -MF GNU/$(DEPDIR)/libdap_la-GetOpt.Tpo -c -o GNU/libdap_la-GetOpt.lo `test -f 'GNU/GetOpt.cc' || echo '$(srcdir)/'`GNU/GetOpt.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) GNU/$(DEPDIR)/libdap_la-GetOpt.Tpo GNU/$(DEPDIR)/libdap_la-GetOpt.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='GNU/GetOpt.cc' object='GNU/libdap_la-GetOpt.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o GNU/libdap_la-GetOpt.lo `test -f 'GNU/GetOpt.cc' || echo '$(srcdir)/'`GNU/GetOpt.cc
+
+GNU/libdap_la-GNURegex.lo: GNU/GNURegex.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT GNU/libdap_la-GNURegex.lo -MD -MP -MF GNU/$(DEPDIR)/libdap_la-GNURegex.Tpo -c -o GNU/libdap_la-GNURegex.lo `test -f 'GNU/GNURegex.cc' || echo '$(srcdir)/'`GNU/GNURegex.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) GNU/$(DEPDIR)/libdap_la-GNURegex.Tpo GNU/$(DEPDIR)/libdap_la-GNURegex.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='GNU/GNURegex.cc' object='GNU/libdap_la-GNURegex.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o GNU/libdap_la-GNURegex.lo `test -f 'GNU/GNURegex.cc' || echo '$(srcdir)/'`GNU/GNURegex.cc
+
+libdap_la-D4StreamMarshaller.lo: D4StreamMarshaller.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-D4StreamMarshaller.lo -MD -MP -MF $(DEPDIR)/libdap_la-D4StreamMarshaller.Tpo -c -o libdap_la-D4StreamMarshaller.lo `test -f 'D4StreamMarshaller.cc' || echo '$(srcdir)/'`D4StreamMarshaller.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-D4StreamMarshaller.Tpo $(DEPDIR)/libdap_la-D4StreamMarshaller.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='D4StreamMarshaller.cc' object='libdap_la-D4StreamMarshaller.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-D4StreamMarshaller.lo `test -f 'D4StreamMarshaller.cc' || echo '$(srcdir)/'`D4StreamMarshaller.cc
+
+libdap_la-D4StreamUnMarshaller.lo: D4StreamUnMarshaller.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-D4StreamUnMarshaller.lo -MD -MP -MF $(DEPDIR)/libdap_la-D4StreamUnMarshaller.Tpo -c -o libdap_la-D4StreamUnMarshaller.lo `test -f 'D4StreamUnMarshaller.cc' || echo '$(srcdir)/'`D4StreamUnMarshaller.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-D4StreamUnMarshaller.Tpo $(DEPDIR)/libdap_la-D4StreamUnMarshaller.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='D4StreamUnMarshaller.cc' object='libdap_la-D4StreamUnMarshaller.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-D4StreamUnMarshaller.lo `test -f 'D4StreamUnMarshaller.cc' || echo '$(srcdir)/'`D4StreamUnMarshaller.cc
+
+libdap_la-Int64.lo: Int64.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-Int64.lo -MD -MP -MF $(DEPDIR)/libdap_la-Int64.Tpo -c -o libdap_la-Int64.lo `test -f 'Int64.cc' || echo '$(srcdir)/'`Int64.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-Int64.Tpo $(DEPDIR)/libdap_la-Int64.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='Int64.cc' object='libdap_la-Int64.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-Int64.lo `test -f 'Int64.cc' || echo '$(srcdir)/'`Int64.cc
+
+libdap_la-UInt64.lo: UInt64.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-UInt64.lo -MD -MP -MF $(DEPDIR)/libdap_la-UInt64.Tpo -c -o libdap_la-UInt64.lo `test -f 'UInt64.cc' || echo '$(srcdir)/'`UInt64.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-UInt64.Tpo $(DEPDIR)/libdap_la-UInt64.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='UInt64.cc' object='libdap_la-UInt64.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-UInt64.lo `test -f 'UInt64.cc' || echo '$(srcdir)/'`UInt64.cc
+
+libdap_la-Int8.lo: Int8.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-Int8.lo -MD -MP -MF $(DEPDIR)/libdap_la-Int8.Tpo -c -o libdap_la-Int8.lo `test -f 'Int8.cc' || echo '$(srcdir)/'`Int8.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-Int8.Tpo $(DEPDIR)/libdap_la-Int8.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='Int8.cc' object='libdap_la-Int8.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-Int8.lo `test -f 'Int8.cc' || echo '$(srcdir)/'`Int8.cc
+
+libdap_la-D4ParserSax2.lo: D4ParserSax2.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-D4ParserSax2.lo -MD -MP -MF $(DEPDIR)/libdap_la-D4ParserSax2.Tpo -c -o libdap_la-D4ParserSax2.lo `test -f 'D4ParserSax2.cc' || echo '$(srcdir)/'`D4ParserSax2.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-D4ParserSax2.Tpo $(DEPDIR)/libdap_la-D4ParserSax2.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='D4ParserSax2.cc' object='libdap_la-D4ParserSax2.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-D4ParserSax2.lo `test -f 'D4ParserSax2.cc' || echo '$(srcdir)/'`D4ParserSax2.cc
+
+libdap_la-D4BaseTypeFactory.lo: D4BaseTypeFactory.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-D4BaseTypeFactory.lo -MD -MP -MF $(DEPDIR)/libdap_la-D4BaseTypeFactory.Tpo -c -o libdap_la-D4BaseTypeFactory.lo `test -f 'D4BaseTypeFactory.cc' || echo '$(srcdir)/'`D4BaseTypeFactory.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-D4BaseTypeFactory.Tpo $(DEPDIR)/libdap_la-D4BaseTypeFactory.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='D4BaseTypeFactory.cc' object='libdap_la-D4BaseTypeFactory.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-D4BaseTypeFactory.lo `test -f 'D4BaseTypeFactory.cc' || echo '$(srcdir)/'`D4BaseTypeFactory.cc
+
+libdap_la-D4Dimensions.lo: D4Dimensions.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-D4Dimensions.lo -MD -MP -MF $(DEPDIR)/libdap_la-D4Dimensions.Tpo -c -o libdap_la-D4Dimensions.lo `test -f 'D4Dimensions.cc' || echo '$(srcdir)/'`D4Dimensions.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-D4Dimensions.Tpo $(DEPDIR)/libdap_la-D4Dimensions.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='D4Dimensions.cc' object='libdap_la-D4Dimensions.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-D4Dimensions.lo `test -f 'D4Dimensions.cc' || echo '$(srcdir)/'`D4Dimensions.cc
+
+libdap_la-D4EnumDefs.lo: D4EnumDefs.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-D4EnumDefs.lo -MD -MP -MF $(DEPDIR)/libdap_la-D4EnumDefs.Tpo -c -o libdap_la-D4EnumDefs.lo `test -f 'D4EnumDefs.cc' || echo '$(srcdir)/'`D4EnumDefs.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-D4EnumDefs.Tpo $(DEPDIR)/libdap_la-D4EnumDefs.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='D4EnumDefs.cc' object='libdap_la-D4EnumDefs.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-D4EnumDefs.lo `test -f 'D4EnumDefs.cc' || echo '$(srcdir)/'`D4EnumDefs.cc
+
+libdap_la-D4Group.lo: D4Group.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-D4Group.lo -MD -MP -MF $(DEPDIR)/libdap_la-D4Group.Tpo -c -o libdap_la-D4Group.lo `test -f 'D4Group.cc' || echo '$(srcdir)/'`D4Group.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-D4Group.Tpo $(DEPDIR)/libdap_la-D4Group.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='D4Group.cc' object='libdap_la-D4Group.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-D4Group.lo `test -f 'D4Group.cc' || echo '$(srcdir)/'`D4Group.cc
+
+libdap_la-DMR.lo: DMR.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-DMR.lo -MD -MP -MF $(DEPDIR)/libdap_la-DMR.Tpo -c -o libdap_la-DMR.lo `test -f 'DMR.cc' || echo '$(srcdir)/'`DMR.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-DMR.Tpo $(DEPDIR)/libdap_la-DMR.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='DMR.cc' object='libdap_la-DMR.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-DMR.lo `test -f 'DMR.cc' || echo '$(srcdir)/'`DMR.cc
+
+libdap_la-D4Attributes.lo: D4Attributes.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-D4Attributes.lo -MD -MP -MF $(DEPDIR)/libdap_la-D4Attributes.Tpo -c -o libdap_la-D4Attributes.lo `test -f 'D4Attributes.cc' || echo '$(srcdir)/'`D4Attributes.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-D4Attributes.Tpo $(DEPDIR)/libdap_la-D4Attributes.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='D4Attributes.cc' object='libdap_la-D4Attributes.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-D4Attributes.lo `test -f 'D4Attributes.cc' || echo '$(srcdir)/'`D4Attributes.cc
+
+libdap_la-D4Enum.lo: D4Enum.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-D4Enum.lo -MD -MP -MF $(DEPDIR)/libdap_la-D4Enum.Tpo -c -o libdap_la-D4Enum.lo `test -f 'D4Enum.cc' || echo '$(srcdir)/'`D4Enum.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-D4Enum.Tpo $(DEPDIR)/libdap_la-D4Enum.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='D4Enum.cc' object='libdap_la-D4Enum.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-D4Enum.lo `test -f 'D4Enum.cc' || echo '$(srcdir)/'`D4Enum.cc
+
+libdap_la-chunked_ostream.lo: chunked_ostream.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-chunked_ostream.lo -MD -MP -MF $(DEPDIR)/libdap_la-chunked_ostream.Tpo -c -o libdap_la-chunked_ostream.lo `test -f 'chunked_ostream.cc' || echo '$(srcdir)/'`chunked_ostream.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-chunked_ostream.Tpo $(DEPDIR)/libdap_la-chunked_ostream.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='chunked_ostream.cc' object='libdap_la-chunked_ostream.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-chunked_ostream.lo `test -f 'chunked_ostream.cc' || echo '$(srcdir)/'`chunked_ostream.cc
+
+libdap_la-chunked_istream.lo: chunked_istream.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-chunked_istream.lo -MD -MP -MF $(DEPDIR)/libdap_la-chunked_istream.Tpo -c -o libdap_la-chunked_istream.lo `test -f 'chunked_istream.cc' || echo '$(srcdir)/'`chunked_istream.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-chunked_istream.Tpo $(DEPDIR)/libdap_la-chunked_istream.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='chunked_istream.cc' object='libdap_la-chunked_istream.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-chunked_istream.lo `test -f 'chunked_istream.cc' || echo '$(srcdir)/'`chunked_istream.cc
+
+libdap_la-D4Sequence.lo: D4Sequence.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-D4Sequence.lo -MD -MP -MF $(DEPDIR)/libdap_la-D4Sequence.Tpo -c -o libdap_la-D4Sequence.lo `test -f 'D4Sequence.cc' || echo '$(srcdir)/'`D4Sequence.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-D4Sequence.Tpo $(DEPDIR)/libdap_la-D4Sequence.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='D4Sequence.cc' object='libdap_la-D4Sequence.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-D4Sequence.lo `test -f 'D4Sequence.cc' || echo '$(srcdir)/'`D4Sequence.cc
+
+libdap_la-D4Maps.lo: D4Maps.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-D4Maps.lo -MD -MP -MF $(DEPDIR)/libdap_la-D4Maps.Tpo -c -o libdap_la-D4Maps.lo `test -f 'D4Maps.cc' || echo '$(srcdir)/'`D4Maps.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-D4Maps.Tpo $(DEPDIR)/libdap_la-D4Maps.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='D4Maps.cc' object='libdap_la-D4Maps.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-D4Maps.lo `test -f 'D4Maps.cc' || echo '$(srcdir)/'`D4Maps.cc
+
+libdap_la-D4Opaque.lo: D4Opaque.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-D4Opaque.lo -MD -MP -MF $(DEPDIR)/libdap_la-D4Opaque.Tpo -c -o libdap_la-D4Opaque.lo `test -f 'D4Opaque.cc' || echo '$(srcdir)/'`D4Opaque.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-D4Opaque.Tpo $(DEPDIR)/libdap_la-D4Opaque.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='D4Opaque.cc' object='libdap_la-D4Opaque.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-D4Opaque.lo `test -f 'D4Opaque.cc' || echo '$(srcdir)/'`D4Opaque.cc
+
+libdap_la-D4AsyncUtil.lo: D4AsyncUtil.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-D4AsyncUtil.lo -MD -MP -MF $(DEPDIR)/libdap_la-D4AsyncUtil.Tpo -c -o libdap_la-D4AsyncUtil.lo `test -f 'D4AsyncUtil.cc' || echo '$(srcdir)/'`D4AsyncUtil.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-D4AsyncUtil.Tpo $(DEPDIR)/libdap_la-D4AsyncUtil.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='D4AsyncUtil.cc' object='libdap_la-D4AsyncUtil.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-D4AsyncUtil.lo `test -f 'D4AsyncUtil.cc' || echo '$(srcdir)/'`D4AsyncUtil.cc
+
+libdap_la-D4RValue.lo: D4RValue.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-D4RValue.lo -MD -MP -MF $(DEPDIR)/libdap_la-D4RValue.Tpo -c -o libdap_la-D4RValue.lo `test -f 'D4RValue.cc' || echo '$(srcdir)/'`D4RValue.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-D4RValue.Tpo $(DEPDIR)/libdap_la-D4RValue.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='D4RValue.cc' object='libdap_la-D4RValue.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-D4RValue.lo `test -f 'D4RValue.cc' || echo '$(srcdir)/'`D4RValue.cc
+
+libdap_la-D4FilterClause.lo: D4FilterClause.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-D4FilterClause.lo -MD -MP -MF $(DEPDIR)/libdap_la-D4FilterClause.Tpo -c -o libdap_la-D4FilterClause.lo `test -f 'D4FilterClause.cc' || echo '$(srcdir)/'`D4FilterClause.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-D4FilterClause.Tpo $(DEPDIR)/libdap_la-D4FilterClause.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='D4FilterClause.cc' object='libdap_la-D4FilterClause.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-D4FilterClause.lo `test -f 'D4FilterClause.cc' || echo '$(srcdir)/'`D4FilterClause.cc
+
+libdapclient_la-RCReader.lo: RCReader.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdapclient_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdapclient_la-RCReader.lo -MD -MP -MF $(DEPDIR)/libdapclient_la-RCReader.Tpo -c -o libdapclient_la-RCReader.lo `test -f 'RCReader.cc' || echo '$(srcdir)/'`RCReader.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdapclient_la-RCReader.Tpo $(DEPDIR)/libdapclient_la-RCReader.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='RCReader.cc' object='libdapclient_la-RCReader.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdapclient_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdapclient_la-RCReader.lo `test -f 'RCReader.cc' || echo '$(srcdir)/'`RCReader.cc
+
+libdapclient_la-Connect.lo: Connect.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdapclient_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdapclient_la-Connect.lo -MD -MP -MF $(DEPDIR)/libdapclient_la-Connect.Tpo -c -o libdapclient_la-Connect.lo `test -f 'Connect.cc' || echo '$(srcdir)/'`Connect.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdapclient_la-Connect.Tpo $(DEPDIR)/libdapclient_la-Connect.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='Connect.cc' object='libdapclient_la-Connect.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdapclient_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdapclient_la-Connect.lo `test -f 'Connect.cc' || echo '$(srcdir)/'`Connect.cc
+
+libdapclient_la-HTTPConnect.lo: HTTPConnect.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdapclient_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdapclient_la-HTTPConnect.lo -MD -MP -MF $(DEPDIR)/libdapclient_la-HTTPConnect.Tpo -c -o libdapclient_la-HTTPConnect.lo `test -f 'HTTPConnect.cc' || echo '$(srcdir)/'`HTTPConnect.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdapclient_la-HTTPConnect.Tpo $(DEPDIR)/libdapclient_la-HTTPConnect.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='HTTPConnect.cc' object='libdapclient_la-HTTPConnect.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdapclient_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdapclient_la-HTTPConnect.lo `test -f 'HTTPConnect.cc' || echo '$(srcdir)/'`HTTPConnect.cc
+
+libdapclient_la-HTTPCache.lo: HTTPCache.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdapclient_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdapclient_la-HTTPCache.lo -MD -MP -MF $(DEPDIR)/libdapclient_la-HTTPCache.Tpo -c -o libdapclient_la-HTTPCache.lo `test -f 'HTTPCache.cc' || echo '$(srcdir)/'`HTTPCache.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdapclient_la-HTTPCache.Tpo $(DEPDIR)/libdapclient_la-HTTPCache.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='HTTPCache.cc' object='libdapclient_la-HTTPCache.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdapclient_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdapclient_la-HTTPCache.lo `test -f 'HTTPCache.cc' || echo '$(srcdir)/'`HTTPCache.cc
+
+libdapclient_la-util_mit.lo: util_mit.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdapclient_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdapclient_la-util_mit.lo -MD -MP -MF $(DEPDIR)/libdapclient_la-util_mit.Tpo -c -o libdapclient_la-util_mit.lo `test -f 'util_mit.cc' || echo '$(srcdir)/'`util_mit.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdapclient_la-util_mit.Tpo $(DEPDIR)/libdapclient_la-util_mit.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='util_mit.cc' object='libdapclient_la-util_mit.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdapclient_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdapclient_la-util_mit.lo `test -f 'util_mit.cc' || echo '$(srcdir)/'`util_mit.cc
+
+libdapclient_la-ResponseTooBigErr.lo: ResponseTooBigErr.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdapclient_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdapclient_la-ResponseTooBigErr.lo -MD -MP -MF $(DEPDIR)/libdapclient_la-ResponseTooBigErr.Tpo -c -o libdapclient_la-ResponseTooBigErr.lo `test -f 'ResponseTooBigErr.cc' || echo '$(srcdir)/'`ResponseTooBigErr.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdapclient_la-ResponseTooBigErr.Tpo $(DEPDIR)/libdapclient_la-ResponseTooBigErr.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='ResponseTooBigErr.cc' object='libdapclient_la-ResponseTooBigErr.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdapclient_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdapclient_la-ResponseTooBigErr.lo `test -f 'ResponseTooBigErr.cc' || echo '$(srcdir)/'`ResponseTooBigErr.cc
+
+libdapclient_la-HTTPCacheTable.lo: HTTPCacheTable.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdapclient_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdapclient_la-HTTPCacheTable.lo -MD -MP -MF $(DEPDIR)/libdapclient_la-HTTPCacheTable.Tpo -c -o libdapclient_la-HTTPCacheTable.lo `test -f 'HTTPCacheTable.cc' || echo '$(srcdir)/'`HTTPCacheTable.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdapclient_la-HTTPCacheTable.Tpo $(DEPDIR)/libdapclient_la-HTTPCacheTable.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='HTTPCacheTable.cc' object='libdapclient_la-HTTPCacheTable.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdapclient_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdapclient_la-HTTPCacheTable.lo `test -f 'HTTPCacheTable.cc' || echo '$(srcdir)/'`HTTPCacheTable.cc
+
+libdapclient_la-D4Connect.lo: D4Connect.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdapclient_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdapclient_la-D4Connect.lo -MD -MP -MF $(DEPDIR)/libdapclient_la-D4Connect.Tpo -c -o libdapclient_la-D4Connect.lo `test -f 'D4Connect.cc' || echo '$(srcdir)/'`D4Connect.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdapclient_la-D4Connect.Tpo $(DEPDIR)/libdapclient_la-D4Connect.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='D4Connect.cc' object='libdapclient_la-D4Connect.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdapclient_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdapclient_la-D4Connect.lo `test -f 'D4Connect.cc' || echo '$(srcdir)/'`D4Connect.cc
+
+libparsers_la-lex.das.lo: lex.das.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libparsers_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libparsers_la-lex.das.lo -MD -MP -MF $(DEPDIR)/libparsers_la-lex.das.Tpo -c -o libparsers_la-lex.das.lo `test -f 'lex.das.cc' || echo '$(srcdir)/'`lex.das.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libparsers_la-lex.das.Tpo $(DEPDIR)/libparsers_la-lex.das.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='lex.das.cc' object='libparsers_la-lex.das.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libparsers_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libparsers_la-lex.das.lo `test -f 'lex.das.cc' || echo '$(srcdir)/'`lex.das.cc
+
+libparsers_la-lex.dds.lo: lex.dds.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libparsers_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libparsers_la-lex.dds.lo -MD -MP -MF $(DEPDIR)/libparsers_la-lex.dds.Tpo -c -o libparsers_la-lex.dds.lo `test -f 'lex.dds.cc' || echo '$(srcdir)/'`lex.dds.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libparsers_la-lex.dds.Tpo $(DEPDIR)/libparsers_la-lex.dds.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='lex.dds.cc' object='libparsers_la-lex.dds.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libparsers_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libparsers_la-lex.dds.lo `test -f 'lex.dds.cc' || echo '$(srcdir)/'`lex.dds.cc
+
+libparsers_la-lex.ce_expr.lo: lex.ce_expr.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libparsers_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libparsers_la-lex.ce_expr.lo -MD -MP -MF $(DEPDIR)/libparsers_la-lex.ce_expr.Tpo -c -o libparsers_la-lex.ce_expr.lo `test -f 'lex.ce_expr.cc' || echo '$(srcdir)/'`lex.ce_expr.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libparsers_la-lex.ce_expr.Tpo $(DEPDIR)/libparsers_la-lex.ce_expr.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='lex.ce_expr.cc' object='libparsers_la-lex.ce_expr.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libparsers_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libparsers_la-lex.ce_expr.lo `test -f 'lex.ce_expr.cc' || echo '$(srcdir)/'`lex.ce_expr.cc
+
+libparsers_la-lex.Error.lo: lex.Error.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libparsers_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libparsers_la-lex.Error.lo -MD -MP -MF $(DEPDIR)/libparsers_la-lex.Error.Tpo -c -o libparsers_la-lex.Error.lo `test -f 'lex.Error.cc' || echo '$(srcdir)/'`lex.Error.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libparsers_la-lex.Error.Tpo $(DEPDIR)/libparsers_la-lex.Error.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='lex.Error.cc' object='libparsers_la-lex.Error.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libparsers_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libparsers_la-lex.Error.lo `test -f 'lex.Error.cc' || echo '$(srcdir)/'`lex.Error.cc
+
+libparsers_la-das.tab.lo: das.tab.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libparsers_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libparsers_la-das.tab.lo -MD -MP -MF $(DEPDIR)/libparsers_la-das.tab.Tpo -c -o libparsers_la-das.tab.lo `test -f 'das.tab.cc' || echo '$(srcdir)/'`das.tab.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libparsers_la-das.tab.Tpo $(DEPDIR)/libparsers_la-das.tab.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='das.tab.cc' object='libparsers_la-das.tab.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libparsers_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libparsers_la-das.tab.lo `test -f 'das.tab.cc' || echo '$(srcdir)/'`das.tab.cc
+
+libparsers_la-dds.tab.lo: dds.tab.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libparsers_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libparsers_la-dds.tab.lo -MD -MP -MF $(DEPDIR)/libparsers_la-dds.tab.Tpo -c -o libparsers_la-dds.tab.lo `test -f 'dds.tab.cc' || echo '$(srcdir)/'`dds.tab.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libparsers_la-dds.tab.Tpo $(DEPDIR)/libparsers_la-dds.tab.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='dds.tab.cc' object='libparsers_la-dds.tab.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libparsers_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libparsers_la-dds.tab.lo `test -f 'dds.tab.cc' || echo '$(srcdir)/'`dds.tab.cc
+
+libparsers_la-ce_expr.tab.lo: ce_expr.tab.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libparsers_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libparsers_la-ce_expr.tab.lo -MD -MP -MF $(DEPDIR)/libparsers_la-ce_expr.tab.Tpo -c -o libparsers_la-ce_expr.tab.lo `test -f 'ce_expr.tab.cc' || echo '$(srcdir)/'`ce_expr.tab.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libparsers_la-ce_expr.tab.Tpo $(DEPDIR)/libparsers_la-ce_expr.tab.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='ce_expr.tab.cc' object='libparsers_la-ce_expr.tab.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libparsers_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libparsers_la-ce_expr.tab.lo `test -f 'ce_expr.tab.cc' || echo '$(srcdir)/'`ce_expr.tab.cc
+
+libparsers_la-Error.tab.lo: Error.tab.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libparsers_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libparsers_la-Error.tab.lo -MD -MP -MF $(DEPDIR)/libparsers_la-Error.tab.Tpo -c -o libparsers_la-Error.tab.lo `test -f 'Error.tab.cc' || echo '$(srcdir)/'`Error.tab.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libparsers_la-Error.tab.Tpo $(DEPDIR)/libparsers_la-Error.tab.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='Error.tab.cc' object='libparsers_la-Error.tab.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libparsers_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libparsers_la-Error.tab.lo `test -f 'Error.tab.cc' || echo '$(srcdir)/'`Error.tab.cc
+
+getdap-getdap.o: getdap.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(getdap_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT getdap-getdap.o -MD -MP -MF $(DEPDIR)/getdap-getdap.Tpo -c -o getdap-getdap.o `test -f 'getdap.cc' || echo '$(srcdir)/'`getdap.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/getdap-getdap.Tpo $(DEPDIR)/getdap-getdap.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='getdap.cc' object='getdap-getdap.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(getdap_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o getdap-getdap.o `test -f 'getdap.cc' || echo '$(srcdir)/'`getdap.cc
+
+getdap-getdap.obj: getdap.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(getdap_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT getdap-getdap.obj -MD -MP -MF $(DEPDIR)/getdap-getdap.Tpo -c -o getdap-getdap.obj `if test -f 'getdap.cc'; then $(CYGPATH_W) 'getdap.cc'; else $(CYGPATH_W) '$(srcdir)/getdap.cc'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/getdap-getdap.Tpo $(DEPDIR)/getdap-getdap.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='getdap.cc' object='getdap-getdap.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(getdap_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o getdap-getdap.obj `if test -f 'getdap.cc'; then $(CYGPATH_W) 'getdap.cc'; else $(CYGPATH_W) '$(srcdir)/getdap.cc'; fi`
+
+getdap4-getdap4.o: getdap4.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(getdap4_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT getdap4-getdap4.o -MD -MP -MF $(DEPDIR)/getdap4-getdap4.Tpo -c -o getdap4-getdap4.o `test -f 'getdap4.cc' || echo '$(srcdir)/'`getdap4.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/getdap4-getdap4.Tpo $(DEPDIR)/getdap4-getdap4.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='getdap4.cc' object='getdap4-getdap4.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(getdap4_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o getdap4-getdap4.o `test -f 'getdap4.cc' || echo '$(srcdir)/'`getdap4.cc
+
+getdap4-getdap4.obj: getdap4.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(getdap4_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT getdap4-getdap4.obj -MD -MP -MF $(DEPDIR)/getdap4-getdap4.Tpo -c -o getdap4-getdap4.obj `if test -f 'getdap4.cc'; then $(CYGPATH_W) 'getdap4.cc'; else $(CYGPATH_W) '$(srcdir)/getdap4.cc'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/getdap4-getdap4.Tpo $(DEPDIR)/getdap4-getdap4.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='getdap4.cc' object='getdap4-getdap4.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(getdap4_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o getdap4-getdap4.obj `if test -f 'getdap4.cc'; then $(CYGPATH_W) 'getdap4.cc'; else $(CYGPATH_W) '$(srcdir)/getdap4.cc'; fi`
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+	-rm -rf GNU/.libs GNU/_libs
+
+distclean-libtool:
+	-rm -f libtool config.lt
+install-man1: $(man_MANS)
+	@$(NORMAL_INSTALL)
+	@list1=''; \
+	list2='$(man_MANS)'; \
+	test -n "$(man1dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.1[a-z]*$$/p'; \
+	fi; \
+	} | while read p; do \
+	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; echo "$$p"; \
+	done | \
+	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
+	sed 'N;N;s,\n, ,g' | { \
+	list=; while read file base inst; do \
+	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
+	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \
+	  fi; \
+	done; \
+	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
+	while read files; do \
+	  test -z "$$files" || { \
+	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \
+	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \
+	done; }
+
+uninstall-man1:
+	@$(NORMAL_UNINSTALL)
+	@list=''; test -n "$(man1dir)" || exit 0; \
+	files=`{ for i in $$list; do echo "$$i"; done; \
+	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+	  sed -n '/\.1[a-z]*$$/p'; \
+	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
+install-dist_aclocalDATA: $(dist_aclocal_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(dist_aclocal_DATA)'; test -n "$(aclocaldir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(aclocaldir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(aclocaldir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(aclocaldir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(aclocaldir)" || exit $$?; \
+	done
+
+uninstall-dist_aclocalDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_aclocal_DATA)'; test -n "$(aclocaldir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(aclocaldir)'; $(am__uninstall_files_from_dir)
+install-pkgconfigDATA: $(pkgconfig_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \
+	done
+
+uninstall-pkgconfigDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir)
+install-pkgincludeHEADERS: $(pkginclude_HEADERS)
+	@$(NORMAL_INSTALL)
+	@list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgincludedir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(pkgincludedir)'"; \
+	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(pkgincludedir)" || exit $$?; \
+	done
+
+uninstall-pkgincludeHEADERS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(pkgincludedir)'; $(am__uninstall_files_from_dir)
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscope: cscope.files
+	test ! -s cscope.files \
+	  || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
+clean-cscope:
+	-rm -f cscope.files
+cscope.files: clean-cscope cscopelist
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
+
+distdir: $(DISTFILES)
+	@case `sed 15q $(srcdir)/NEWS` in \
+	*"$(VERSION)"*) : ;; \
+	*) \
+	  echo "NEWS not updated; not releasing" 1>&2; \
+	  exit 1;; \
+	esac
+	$(am__remove_distdir)
+	test -d "$(distdir)" || mkdir "$(distdir)"
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+	-test -n "$(am__skip_mode_fix)" \
+	|| find "$(distdir)" -type d ! -perm -755 \
+		-exec chmod u+rwx,go+rx {} \; -o \
+	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
+	|| chmod -R a+r "$(distdir)"
+dist-gzip: distdir
+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	$(am__post_remove_distdir)
+
+dist-bzip2: distdir
+	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
+	$(am__post_remove_distdir)
+
+dist-lzip: distdir
+	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
+	$(am__post_remove_distdir)
+
+dist-xz: distdir
+	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
+	$(am__post_remove_distdir)
+
+dist-tarZ: distdir
+	@echo WARNING: "Support for shar distribution archives is" \
+	               "deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
+	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
+	$(am__post_remove_distdir)
+
+dist-shar: distdir
+	@echo WARNING: "Support for distribution archives compressed with" \
+		       "legacy program 'compress' is deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
+	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+	$(am__post_remove_distdir)
+
+dist-zip: distdir
+	-rm -f $(distdir).zip
+	zip -rq $(distdir).zip $(distdir)
+	$(am__post_remove_distdir)
+
+dist dist-all:
+	$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
+	$(am__post_remove_distdir)
+
+# This target untars the dist file and tries a VPATH configuration.  Then
+# it guarantees that the distribution is self-contained by making another
+# tarfile.
+distcheck: dist
+	case '$(DIST_ARCHIVES)' in \
+	*.tar.gz*) \
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+	*.tar.bz2*) \
+	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
+	*.tar.lz*) \
+	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
+	*.tar.xz*) \
+	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
+	*.tar.Z*) \
+	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+	*.shar.gz*) \
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+	*.zip*) \
+	  unzip $(distdir).zip ;;\
+	esac
+	chmod -R a-w $(distdir)
+	chmod u+w $(distdir)
+	mkdir $(distdir)/_build $(distdir)/_inst
+	chmod a-w $(distdir)
+	test -d $(distdir)/_build || exit 0; \
+	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
+	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
+	  && am__cwd=`pwd` \
+	  && $(am__cd) $(distdir)/_build \
+	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
+	    $(DISTCHECK_CONFIGURE_FLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
+	  && $(MAKE) $(AM_MAKEFLAGS) check \
+	  && $(MAKE) $(AM_MAKEFLAGS) install \
+	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
+	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
+	        distuninstallcheck \
+	  && chmod -R a-w "$$dc_install_base" \
+	  && ({ \
+	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
+	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
+	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
+	  && rm -rf "$$dc_destdir" \
+	  && $(MAKE) $(AM_MAKEFLAGS) dist \
+	  && rm -rf $(DIST_ARCHIVES) \
+	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
+	  && cd "$$am__cwd" \
+	  || exit 1
+	$(am__post_remove_distdir)
+	@(echo "$(distdir) archives ready for distribution: "; \
+	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
+	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
+distuninstallcheck:
+	@test -n '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: trying to run $@ with an empty' \
+	       '$$(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	$(am__cd) '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
+	   || { echo "ERROR: files left after uninstall:" ; \
+	        if test -n "$(DESTDIR)"; then \
+	          echo "  (check DESTDIR support)"; \
+	        fi ; \
+	        $(distuninstallcheck_listfiles) ; \
+	        exit 1; } >&2
+distcleancheck: distclean
+	@if test '$(srcdir)' = . ; then \
+	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
+	  exit 1 ; \
+	fi
+	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
+	  || { echo "ERROR: files left in build directory after distclean:" ; \
+	       $(distcleancheck_listfiles) ; \
+	       exit 1; } >&2
+check-am: all-am
+check: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) check-recursive
+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) \
+		$(HEADERS) config.h dods-datatypes-config.h \
+		xdr-datatypes-config.h
+install-binPROGRAMS: install-libLTLIBRARIES
+
+installdirs: installdirs-recursive
+installdirs-am:
+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(aclocaldir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(pkgincludedir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+	-rm -f GNU/$(DEPDIR)/$(am__dirstamp)
+	-rm -f GNU/$(am__dirstamp)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+clean: clean-recursive
+
+clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
+	clean-libtool clean-noinstLTLIBRARIES mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -rf ./$(DEPDIR) GNU/$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-hdr distclean-libtool distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am: install-dist_aclocalDATA install-man \
+	install-pkgconfigDATA install-pkgincludeHEADERS
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am: install-binPROGRAMS install-binSCRIPTS \
+	install-libLTLIBRARIES
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man: install-man1
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -rf $(top_srcdir)/autom4te.cache
+	-rm -rf ./$(DEPDIR) GNU/$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
+	uninstall-dist_aclocalDATA uninstall-libLTLIBRARIES \
+	uninstall-man uninstall-pkgconfigDATA \
+	uninstall-pkgincludeHEADERS
+
+uninstall-man: uninstall-man1
+
+.MAKE: $(am__recursive_targets) all check install install-am \
+	install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
+	am--refresh check check-am clean clean-binPROGRAMS \
+	clean-cscope clean-generic clean-libLTLIBRARIES clean-libtool \
+	clean-noinstLTLIBRARIES cscope cscopelist-am ctags ctags-am \
+	dist dist-all dist-bzip2 dist-gzip dist-lzip dist-shar \
+	dist-tarZ dist-xz dist-zip distcheck distclean \
+	distclean-compile distclean-generic distclean-hdr \
+	distclean-libtool distclean-tags distcleancheck distdir \
+	distuninstallcheck dvi dvi-am html html-am info info-am \
+	install install-am install-binPROGRAMS install-binSCRIPTS \
+	install-data install-data-am install-dist_aclocalDATA \
+	install-dvi install-dvi-am install-exec install-exec-am \
+	install-html install-html-am install-info install-info-am \
+	install-libLTLIBRARIES install-man install-man1 install-pdf \
+	install-pdf-am install-pkgconfigDATA install-pkgincludeHEADERS \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am uninstall-binPROGRAMS \
+	uninstall-binSCRIPTS uninstall-dist_aclocalDATA \
+	uninstall-libLTLIBRARIES uninstall-man uninstall-man1 \
+	uninstall-pkgconfigDATA uninstall-pkgincludeHEADERS
+
+
+%.1: %.man1
+	groff -t -e -mandoc -Tascii $< | col -bx > $@
+
+# This target only builds the documents, it does not move them to
+# github. Use the 'gh-docs' target below for that.
+.PHONY: docs
+docs: ${DOXYGEN_CONF}
+	doxygen ${DOXYGEN_CONF}
+
+# GitHub.io docs 
+.PHONY: gh-docs 
+gh-docs:
+	./build-gh-docs.sh
+
+# cccc computes metrics like Lines of code and McCabe. It's available
+# on the web...
+.PHONY: cccc
+cccc:
+	-mkdir cccc
+	cccc --outdir=cccc $(DAP_SRC) $(SERVER_SRC) $(CLIENT_SRC) \
+	$(DAP_HDR) $(SERVER_HDR) $(CLIENT_HDR)
+
+###########################################################################
+
+# Fortify targets.
+.PHONY: fortify
+fortify: $(BUILT_SOURCES)
+	(cd gl && sourceanalyzer -b @PACKAGE@-gl $(MAKE) $(MFLAGS) )
+	(cd d4_ce && sourceanalyzer -b @PACKAGE@-d4_ce $(MAKE) $(MFLAGS) )
+	sourceanalyzer -b @PACKAGE@-parsers $(MAKE) $(MFLAGS) libparsers.la
+	sourceanalyzer -b @PACKAGE@ $(MAKE) $(MFLAGS) libdap.la libdapserver.la libdapclient.la
+	sourceanalyzer -b @PACKAGE@ -scan -f @PACKAGE@-@PACKAGE_VERSION@.fpr
+
+# run fortify on only our code, not the gnulib code or the flex/bison code.
+# This does skip testing some of the functions we wrote in the *.lex/*.yy
+# files but should eliminate the false positives from flex and bison, too.
+.PHONY: fortify-lite
+fortify-lite: dods-datatypes.h xdr-datatypes.h
+	( cd gl && $(MAKE) $(MFLAGS) )
+	( cd d4_ce && $(MAKE) $(MFLAGS) )
+	$(MAKE)  $(MFLAGS) libparsers.la
+	sourceanalyzer -b @PACKAGE@ $(MAKE) $(MFLAGS) libdap.la libdapserver.la libdapclient.la
+	sourceanalyzer -b @PACKAGE@ -scan -f @PACKAGE@-@PACKAGE_VERSION@.fpr
+
+# No longer used? jhrg 1/29/13
+#grammar_objects = lex.das.o das.tab.o lex.dds.o dds.tab.o lex.ce_expr.o \
+#ce_expr.tab.o lex.gse_.o gse.tab.o lex.Error.o Error.tab.o
+
+# Use this to clean the fortify project.
+.PHONY: fortifyclean
+fortifyclean:
+	(cd gl && sourceanalyzer -b @PACKAGE@-gl -clean )
+	sourceanalyzer -b @PACKAGE@ -clean
+
+###########################################################################
+
+# Build linux RPMs. Use the environment variable 'RPM_OPTIONS' to pass in
+# extra options like --nodeps and --macros
+
+srpm: dist
+	rpmbuild -ts --clean $(RPM_OPTIONS) @PACKAGE@-@PACKAGE_VERSION@.tar.gz
+
+rpm: dist
+	rpmbuild -tb --clean $(RPM_OPTIONS) @PACKAGE@-@PACKAGE_VERSION@.tar.gz
+
+clean-pkg:
+	-rm -rf mac_osx @PACKAGE@-@PACKAGE_VERSION@.pkg
+
+pkg-build: clean-pkg
+	./configure --prefix=$(prefix) --disable-dependency-tracking $(PKG_CONF_FLAGS)
+	make clean all
+	DESTDIR=`pwd`/mac_osx make install
+
+pkg-main: pkg-build
+	./OSX_Resources/update_mac_package_contents.pl README
+	cat ./OSX_Resources/Info.plist.proto | \
+	   sed -e "s^_PREFIX_^/usr/local/servers/hyrax-1.8.8^g" \
+	       -e "s^_FULL_VERSION_^@PACKAGE_VERSION@^g" \
+	       -e "s^_MAJOR_VERSION_^@PACKAGE_MAJOR_VERSION@^g" \
+	       -e "s^_MINOR_VERSION_^@PACKAGE_MINOR_VERSION@^g" \
+	       > foo
+	mv foo ./OSX_Resources/Info.plist
+	${PACKAGEMAKER} --root mac_osx --id org.opendap.@PACKAGE@ \
+	    --title "@PACKAGE@ @PACKAGE_VERSION@" --version @PACKAGE_VERSION@ \
+	    --out @PACKAGE@-@PACKAGE_VERSION@.pkg --resources OSX_Resources
+
+# 	   sed -e "s^_PREFIX_^$(prefix)^g" 
+
+pkg-dmg: pkg-main
+	-rm -rf @PACKAGE@-@PACKAGE_VERSION@
+	-rm -rf @PACKAGE@-@PACKAGE_VERSION@.dmg
+	mkdir @PACKAGE@-@PACKAGE_VERSION@
+	cp -r @PACKAGE@-@PACKAGE_VERSION@.pkg @PACKAGE@-@PACKAGE_VERSION@
+	cp README README.* NEWS @PACKAGE@-@PACKAGE_VERSION@
+	dropdmg -i --sanitize-for-servers --format zlib @PACKAGE@-@PACKAGE_VERSION@
+	-rm -rf @PACKAGE@-@PACKAGE_VERSION@
+
+pkg: pkg-main 
+
+# Note that the gcov options -f and -b are useful but sometimes make looking
+# at the results of coverage analysis a little taxing. -b reports on all
+# branched and -f reports on all functions. The -l -o options summarize on a
+# per-file basis. 3/27/98 jhrg
+collect-coverage-data:
+	(cd test-coverage; \
+         cov_dat="coverage-data-`date +%m.%d.%y`"; \
+         touch $$cov_dat; \
+         for f in $(ALLSRCS); do \
+            echo "\n*** Coverage data for $$f ***\n" >> $$cov_dat; \
+            gcov -l -o ../ $$f >> $$cov_dat; \
+         done)
+
+Operators.h: ce_expr.tab.hh
+
+@USE_C99_TYPES_TRUE@dods-datatypes.h: dods-datatypes-static.h
+@USE_C99_TYPES_TRUE@	cp -p $< dods-datatypes.h
+@USE_C99_TYPES_FALSE@dods-datatypes.h: dods-datatypes-config.h
+@USE_C99_TYPES_FALSE@	cp -p $< dods-datatypes.h
+
+xdr-datatypes.h: xdr-datatypes-config.h
+	cp -p $< xdr-datatypes.h
+#	ResponseBuilder.h ResponseCache.h
+
+############################################################################
+# Special rules for the grammars. I tried to use the automake grammar support
+# but these grammars are so hacked that it was taking too much time. Maybe if
+# each grammar was converted one by one... jhrg 6/22/05
+# 
+# I switched to using flex options instead of sed and mv. jhrg 02/28/08
+#
+# Build the DAS scanner and parser
+
+# Using this pattern rule is a way to get gnu make to run bison only once.
+# The targets that explicitly name the two sources to be built will run it
+# twice with a parallel build. jhrg 6/18/15
+
+%.tab.cc %.tab.hh: %.yy
+	$(YACC) $(YFLAGS) $<
+
+lex.das.cc: das.lex das.tab.cc das.tab.hh
+	$(LEX) $(LFLAGS) $<
+
+#das.tab.cc das.tab.hh: das.yy DAS.h
+#	$(YACC) $(YFLAGS) $<
+
+# DDS
+
+lex.dds.cc: dds.lex dds.tab.cc dds.tab.hh
+	$(LEX) $(LFLAGS) $<
+
+#dds.tab.cc dds.tab.hh: dds.yy
+#	$(YACC) $(YFLAGS) $<
+
+# CE
+
+lex.ce_expr.cc: ce_expr.lex ce_expr.tab.cc ce_expr.tab.hh
+	$(LEX) $(LFLAGS) $<
+
+#ce_expr.tab.cc ce_expr.tab.hh: ce_expr.yy
+#	$(YACC) $(YFLAGS) $<
+
+# Errors
+
+lex.Error.cc: Error.lex Error.tab.cc Error.tab.hh
+	$(LEX) $(LFLAGS) $<
+
+#Error.tab.cc Error.tab.hh: Error.yy
+#	$(YACC) $(YFLAGS) $<
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/Marshaller.h b/Marshaller.h
new file mode 100644
index 0000000..20d1d09
--- /dev/null
+++ b/Marshaller.h
@@ -0,0 +1,108 @@
+// Marshaller.h
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: Patrick West <pwest@ucar.edu>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1994-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      pwest       Patrick West <pwest@ucar.edu>
+
+#ifndef A_Marshaller_h
+#define A_Marshaller_h 1
+
+#include <string>
+#include <vector>
+
+#include "DapObj.h"
+#include "Type.h"
+#include "dods-datatypes.h"
+#include "InternalErr.h"
+
+namespace libdap {
+
+class Vector;
+
+/** @brief abstract base class used to marshal/serialize dap data objects
+ */
+class Marshaller: public DapObj {
+public:
+    virtual void put_byte(dods_byte val) = 0;
+
+    virtual void put_int16(dods_int16 val) = 0;
+    virtual void put_int32(dods_int32 val) = 0;
+
+    virtual void put_float32(dods_float32 val) = 0;
+    virtual void put_float64(dods_float64 val) = 0;
+
+    virtual void put_uint16(dods_uint16 val) = 0;
+    virtual void put_uint32(dods_uint32 val) = 0;
+
+    virtual void put_str(const std::string &val) = 0;
+    virtual void put_url(const std::string &val) = 0;
+
+    virtual void put_opaque(char *val, unsigned int len) = 0;
+    virtual void put_int(int val) = 0;
+
+    virtual void put_vector(char *val, int num, Vector &vec) = 0;
+    virtual void put_vector(char *val, int num, int width, Vector &vec) = 0;
+
+    /**
+     * Write the prefix bytes for a vector and reset the state/counter for
+     * a vector/array that will be written using put_vector_part() and
+     * put_vector_end().
+     *
+     * @param num The number of elements to write
+     */
+    virtual void put_vector_start(int /*num*/) {
+        throw InternalErr(__FILE__, __LINE__, "Not Implemented yet");
+    }// = 0;
+
+    /**
+     * Write one part of a vector's contents.
+     *
+     * @param val Pointer to the part's values
+     * @param num The number of values in this part
+     * @param width The number of bytes per value
+     * @param type The DAP2 data type for each value
+     */
+    virtual void put_vector_part(char */*val*/, unsigned int /*num*/, int /*width*/, Type /*type*/) {
+        throw InternalErr(__FILE__, __LINE__, "Not Implemented yet");
+    }// = 0;
+
+    /**
+     * Close a vector written using put_vector_part()
+     */
+    virtual void put_vector_end() {
+        throw InternalErr(__FILE__, __LINE__, "Not Implemented yet");
+    }// = 0;
+
+    virtual void dump(std::ostream &strm) const = 0;
+};
+
+} // namespace libdap
+
+#endif // A_Marshaller_h
+
diff --git a/MarshallerThread.cc b/MarshallerThread.cc
new file mode 100644
index 0000000..c5e5826
--- /dev/null
+++ b/MarshallerThread.cc
@@ -0,0 +1,304 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2015 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+/*
+ * MarshallerThread.cc
+ *
+ *  Created on: Aug 27, 2015
+ *      Author: jimg
+ */
+
+#include "config.h"
+
+#include <pthread.h>
+#include <sys/time.h>
+#include <fcntl.h>
+#include <unistd.h>
+
+#include <ostream>
+#include <sstream>
+
+#include "MarshallerThread.h"
+#include "Error.h"
+#include "InternalErr.h"
+#include "debug.h"
+
+using namespace libdap;
+using namespace std;
+
+#if 0
+bool MarshallerThread::print_time = false;
+
+/**
+ * Use this with timeval structures returned by gettimeofday() to compute
+ * real time (instead of user time that is returned by std::clock() or
+ * get_rusage()).
+ */
+static double time_diff_to_hundredths(struct timeval *stop, struct timeval *start)
+{
+    /* Perform the carry for the later subtraction by updating y. */
+    if (stop->tv_usec < start->tv_usec) {
+        int nsec = (start->tv_usec - stop->tv_usec) / 1000000 + 1;
+        start->tv_usec -= 1000000 * nsec;
+        start->tv_sec += nsec;
+    }
+    if (stop->tv_usec - start->tv_usec > 1000000) {
+        int nsec = (start->tv_usec - stop->tv_usec) / 1000000;
+        start->tv_usec += 1000000 * nsec;
+        start->tv_sec -= nsec;
+    }
+
+    double result = stop->tv_sec - start->tv_sec;
+    result += double(stop->tv_usec - start->tv_usec) / 1000000;
+    return result;
+}
+#endif
+
+
+/**
+ * Lock the mutex then wait for the child thread to signal using the
+ * condition variable 'cond'. Once the signal is received, re-test count
+ * to make sure it's zero (there are no child threads).
+ *
+ * This is used to lock the main thread and ensure that a second child
+ * (writer) thread is not started until any current child thread completes,
+ * which keeps the write operations in the correct order.
+ */
+Locker::Locker(pthread_mutex_t &lock, pthread_cond_t &cond, int &count) :
+    m_mutex(lock)
+{
+    int status = pthread_mutex_lock(&m_mutex);
+
+    DBG(cerr << "Locking the mutex! (waiting; " << pthread_self() << ")" << endl);
+
+    if (status != 0) throw InternalErr(__FILE__, __LINE__, "Could not lock m_mutex");
+    while (count != 0) {
+        status = pthread_cond_wait(&cond, &m_mutex);
+        if (status != 0) throw InternalErr(__FILE__, __LINE__, "Could not wait on m_cond");
+    }
+    if (count != 0) throw InternalErr(__FILE__, __LINE__, "FAIL: left m_cond wait with non-zero child thread count");
+
+    DBG(cerr << "Locked! (" << pthread_self() << ")" << endl);
+}
+
+/**
+ * Unlock the mutex
+ */
+Locker::~Locker()
+{
+    DBG(cerr << "Unlocking the mutex! (" << pthread_self() << ")" << endl);
+
+    int status = pthread_mutex_unlock(&m_mutex);
+    if (status != 0) throw InternalErr(__FILE__, __LINE__, "Could not unlock m_mutex");
+}
+
+
+/**
+ * Lock the mutex, but do not wait on the condition variable.
+ * This is used by the child thread; it helps ensure that the
+ * mutex is unlocked and the predicate is reset no matter how the
+ * child thread is exited.
+ *
+ * Note we how a reference to the shared 'count' predicate that
+ * tells how many (0 or 1) child threads exist so that when this
+ * version of the Locker object is destroyed, we can zero that.
+ * This enables us to use RAII in the child thread and ensure
+ * the invariant if there is an error and the code exits with a
+ * summary return.
+ */
+ChildLocker::ChildLocker(pthread_mutex_t &lock, pthread_cond_t &cond, int &count) :
+    m_mutex(lock), m_cond(cond), m_count(count)
+{
+    int status = pthread_mutex_lock(&m_mutex);
+
+    DBG(cerr << "Locking the mutex! (simple; " << pthread_self() << ")" << endl);
+
+    if (status != 0) throw InternalErr(__FILE__, __LINE__, "Could not lock m_mutex");
+
+    DBG(cerr << "Locked! (" << pthread_self() << ")" << endl);
+}
+
+ChildLocker::~ChildLocker()
+{
+    DBG(cerr << "Unlocking the mutex! (" << pthread_self() << ")" << endl);
+
+    m_count = 0;
+    int status = pthread_cond_signal(&m_cond);
+    if (status != 0)
+        throw InternalErr(__FILE__, __LINE__, "Could not signal main thread from ChildLocker!");
+
+    status = pthread_mutex_unlock(&m_mutex);
+    if (status != 0) throw InternalErr(__FILE__, __LINE__, "Could not unlock m_mutex");
+}
+
+MarshallerThread::MarshallerThread() :
+    d_thread(0), d_child_thread_count(0)
+{
+    if (pthread_attr_init(&d_thread_attr) != 0) throw Error(internal_error, "Failed to initialize pthread attributes.");
+    if (pthread_attr_setdetachstate(&d_thread_attr, PTHREAD_CREATE_DETACHED /*PTHREAD_CREATE_JOINABLE*/) != 0)
+        throw Error(internal_error, "Failed to complete pthread attribute initialization.");
+
+    if (pthread_mutex_init(&d_out_mutex, 0) != 0) throw Error(internal_error, "Failed to initialize mutex.");
+    if (pthread_cond_init(&d_out_cond, 0) != 0) throw Error(internal_error, "Failed to initialize cond.");
+}
+
+MarshallerThread::~MarshallerThread()
+{
+    int status = pthread_mutex_lock(&d_out_mutex);
+    if (status != 0) throw InternalErr(__FILE__, __LINE__, "Could not lock m_mutex");
+    while (d_child_thread_count != 0) {
+        status = pthread_cond_wait(&d_out_cond, &d_out_mutex);
+        if (status != 0) throw InternalErr(__FILE__, __LINE__, "Could not wait on m_cond");
+    }
+    if (d_child_thread_count != 0)
+        throw InternalErr(__FILE__, __LINE__, "FAIL: left m_cond wait with non-zero child thread count");
+
+    status = pthread_mutex_unlock(&d_out_mutex);
+    if (status != 0) throw InternalErr(__FILE__, __LINE__, "Could not unlock m_mutex");
+
+    pthread_mutex_destroy(&d_out_mutex);
+    pthread_cond_destroy(&d_out_cond);
+
+    pthread_attr_destroy(&d_thread_attr);
+}
+
+// not a static method
+/**
+ * Start the child thread, using the arguments given. This will write 'bytes'
+ * bytes from 'byte_buf' to the output stream 'out'
+ *
+ */
+void MarshallerThread::start_thread(void* (*thread)(void *arg), ostream &out, char *byte_buf,
+    unsigned int bytes)
+{
+    write_args *args = new write_args(d_out_mutex, d_out_cond, d_child_thread_count, d_thread_error, out, byte_buf,
+        bytes);
+    int status = pthread_create(&d_thread, &d_thread_attr, thread, args);
+    if (status != 0) throw InternalErr(__FILE__, __LINE__, "Could not start child thread");
+}
+
+/**
+ * Write 'bytes' bytes from 'byte_buf' to the file descriptor 'fd'.
+ */
+void MarshallerThread::start_thread(void* (*thread)(void *arg), int fd, char *byte_buf, unsigned int bytes)
+{
+    write_args *args = new write_args(d_out_mutex, d_out_cond, d_child_thread_count, d_thread_error, fd, byte_buf,
+        bytes);
+    int status = pthread_create(&d_thread, &d_thread_attr, thread, args);
+    if (status != 0) throw InternalErr(__FILE__, __LINE__, "Could not start child thread");
+}
+
+/**
+ * This static method is used to write data to the ostream referenced
+ * by the ostream element of write_args. This is used by start_thread()
+ * and passed to pthread_create()
+ *
+ * @note The write_args argument may contain either a file descriptor
+ * (d_out_file) or an ostream& (d_out). If the file descriptor is not
+ * -1, then use that, else use the ostream reference.
+ */
+void *
+MarshallerThread::write_thread(void *arg)
+{
+    write_args *args = reinterpret_cast<write_args *>(arg);
+
+    ChildLocker lock(args->d_mutex, args->d_cond, args->d_count); // RAII; will unlock on exit
+
+#if 0
+    struct timeval tp_s;
+    if (print_time && gettimeofday(&tp_s, 0) != 0) cerr << "could not read time" << endl;
+#endif
+
+    // force an error
+    // return (void*)-1;
+
+    if (args->d_out_file != -1) {
+        int bytes_written = write(args->d_out_file, args->d_buf, args->d_num);
+        if (bytes_written != args->d_num)
+            return (void*) -1;
+    }
+    else {
+        args->d_out.write(args->d_buf, args->d_num);
+        if (args->d_out.fail()) {
+            ostringstream oss;
+            oss << "Could not write data: " << __FILE__ << ":" << __LINE__;
+            args->d_error = oss.str();
+            return (void*) -1;
+        }
+    }
+
+    delete [] args->d_buf;
+    delete args;
+
+#if 0
+    struct timeval tp_e;
+    if (print_time) {
+        if (gettimeofday(&tp_e, 0) != 0) cerr << "could not read time" << endl;
+
+        cerr << "time for child thread write: " << time_diff_to_hundredths(&tp_e, &tp_s) << endl;
+    }
+#endif
+
+    return 0;
+}
+
+/**
+ * This static method is used to write data to the ostream referenced
+ * by the ostream element of write_args. This is used by start_thread()
+ * and passed to pthread_create()
+ *
+ * @note This differers from MarshallerThread::write_thread() in that it
+ * writes data starting _after_ the four-byte length prefix that XDR
+ * adds to the data. It is used for the put_vector_part() calls in
+ * XDRStreamMarshaller.
+ *
+ * @return 0 if successful, -1 otherwise.
+ */
+void *
+MarshallerThread::write_thread_part(void *arg)
+{
+    write_args *args = reinterpret_cast<write_args *>(arg);
+
+    ChildLocker lock(args->d_mutex, args->d_cond, args->d_count); // RAII; will unlock on exit
+
+    if (args->d_out_file != -1) {
+        int bytes_written = write(args->d_out_file, args->d_buf, args->d_num);
+        if (bytes_written != args->d_num) return (void*) -1;
+    }
+    else {
+        args->d_out.write(args->d_buf + 4, args->d_num);
+        if (args->d_out.fail()) {
+            ostringstream oss;
+            oss << "Could not write data: " << __FILE__ << ":" << __LINE__;
+            args->d_error = oss.str();
+            return (void*) -1;
+        }
+    }
+
+    delete [] args->d_buf;
+    delete args;
+
+    return 0;
+}
+
diff --git a/MarshallerThread.h b/MarshallerThread.h
new file mode 100644
index 0000000..6d344ef
--- /dev/null
+++ b/MarshallerThread.h
@@ -0,0 +1,172 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2015 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+/*
+ * MarshallerThread.h
+ *
+ *  Created on: Aug 27, 2015
+ *      Author: jimg
+ */
+
+#ifndef MARSHALLERTHREAD_H_
+#define MARSHALLERTHREAD_H_
+
+#include <pthread.h>
+
+#include <iostream>
+#include <ostream>
+#include <string>
+
+namespace libdap {
+
+/**
+ * RAII for the MarshallerThread mutex and condition variable. Used by the
+ * Main thread. The constructor locks the mutex and then, if the count of
+ * child threads is not zero, blocks on the associated condition variable.
+ * When signaled by the child thread using the condition variable (the child
+ * thread count should then be zero), the mutex is (re)locked and the ctor
+ * returns. The destructor unlocks the mutex.
+ */
+class Locker {
+public:
+    Locker(pthread_mutex_t &lock, pthread_cond_t &cond, int &count);
+    virtual ~Locker();
+
+private:
+    pthread_mutex_t& m_mutex;
+
+    Locker();
+    Locker(const Locker &rhs);
+};
+
+/**
+ * Synchronization for the child thread in the multi-threaded version of
+ * the DAP2 and DAP4 (when it gets implement) 'Marshaller' class used to
+ * send data. The class declared below (MarshallerThread) manages the
+ * child thread.
+ *
+ * The ctor of this class simply
+ * locks the mutex; the dtor clears the child thread count, signals that
+ * count has changed and unlocks the mutex.
+ */
+class ChildLocker {
+public:
+    ChildLocker(pthread_mutex_t &lock, pthread_cond_t &cond, int &count);
+    virtual ~ChildLocker();
+
+private:
+    pthread_mutex_t& m_mutex;
+    pthread_cond_t& m_cond;
+    int& m_count;
+
+    ChildLocker();
+    ChildLocker(const Locker &rhs);
+};
+
+/**
+ * Implement a multi-threaded data transmission sub-system for libdap.
+ * This class makes it fairly painless to send data using a child thread
+ * so that the main thread can be used to read the next chunk of data
+ * while whatever has been read to this point is sent over the wire.
+ *
+ * This code is used by XDRStreamMarshaller and (soon) D4StreamMarshaller.
+ */
+class MarshallerThread {
+private:
+    pthread_t d_thread;
+    pthread_attr_t d_thread_attr;
+
+    pthread_mutex_t d_out_mutex;
+    pthread_cond_t d_out_cond;
+
+    int d_child_thread_count;   // 0 or 1
+    std::string d_thread_error; // non-null indicates an error
+
+#if 0
+    static bool print_time; // false by default
+#endif
+
+    /**
+     * Used to pass information into the static methods that run the
+     * simple stream writer threads. This can pass both an ostream or
+     * a file descriptor. If a fd is passed, the ostream reference is
+     * set to stderr (i.e., std::cerr).
+     */
+    struct write_args {
+        pthread_mutex_t &d_mutex;
+        pthread_cond_t &d_cond;
+        int &d_count;
+        std::string &d_error;
+        std::ostream &d_out;     // The output stream protected by the mutex, ...
+        int d_out_file;       // file descriptor; if not -1, use this.
+        char *d_buf;        // The data to write to the stream
+        int d_num;          // The size of d_buf
+
+        /**
+         * Build args for an ostream. The file descriptor is set to -1
+         */
+        write_args(pthread_mutex_t &m, pthread_cond_t &c, int &count, std::string &e, std::ostream &s, char *vals, int num) :
+            d_mutex(m), d_cond(c), d_count(count), d_error(e), d_out(s), d_out_file(-1), d_buf(vals), d_num(num)
+        {
+        }
+
+        /**
+         * Build args for a file descriptr. The ostream is set to cerr (because it is
+         * a reference and has to be initialized to something).
+         */
+        write_args(pthread_mutex_t &m, pthread_cond_t &c, int &count, std::string &e, int fd, char *vals, int num) :
+            d_mutex(m), d_cond(c), d_count(count), d_error(e), d_out(std::cerr), d_out_file(fd), d_buf(vals), d_num(num)
+        {
+        }
+   };
+
+public:
+    MarshallerThread();
+    virtual ~MarshallerThread();
+
+    pthread_mutex_t &get_mutex() { return d_out_mutex; }
+    pthread_cond_t &get_cond() { return d_out_cond; }
+
+    int &get_child_thread_count() { return d_child_thread_count; }
+    void increment_child_thread_count() { ++d_child_thread_count; }
+
+    void start_thread(void* (*thread)(void *arg), std::ostream &out, char *byte_buf, unsigned int bytes_written);
+    void start_thread(void* (*thread)(void *arg), int fd, char *byte_buf, unsigned int bytes_written);
+
+    // These are static so they will have c-linkage - required because they
+    // are passed to pthread_create()
+    static void *write_thread(void *arg);
+    static void *write_thread_part(void *arg);
+
+#if 0
+    static void set_print_time(bool state) { print_time = state; }
+    static bool get_print_time() { return print_time; }
+#endif
+
+};
+
+}
+
+#endif /* MARSHALLERTHREAD_H_ */
diff --git a/NEWS b/NEWS
new file mode 100644
index 0000000..7e57b2d
--- /dev/null
+++ b/NEWS
@@ -0,0 +1,903 @@
+News for version 3.19.1
+
+Portability issues: Updated gnulib and mkstemps fixed as per user
+reports. Removed a test for block_size in HTTPCacheTest that failed on
+Fedora ppc64le system with XFS system
+
+Branches/tickets merged: hyrax390 (CppUnit test improvements)
+
+News for version 3.19.0
+
+Bug fixes in memory usage for Vector types.
+
+Refactored transform_to_dap4() methods and associated API
+
+Implmented transform_to_dap2() method.
+
+Refactored test harnesses so that running individual 
+tests is now a viable option.
+
+News for version 3.18.3
+
+Bug fix for DAP4 data transmissions.
+
+XML Parser fixes for DAP4: We are now tolerant of elements that
+are not in the DAP4 namespace, so the DMR document can be extended
+with additional information without breaking our parser.
+
+D4Group's clone (aka ptr_duplicate) method returned a D4Group and not
+a BaseType; fixed.
+
+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.
+
+Fixed a long-standing bug in BaseType::set_send_p() and set_read_p().
+
+Added a way to build 'universal' baselines for tests that include
+data. Tests that included data had different checksums on different
+architectures and this meant two sets of baselines for them. No more.
+I'm keeping the old tests with their dual baselines (they test the
+checksum code) but all newer tests should use the 'universal' test
+macros.
+
+Added DAP4 filter support!
+
+News for version 3.17.3
+
+Fixed a soname error - Adding a const constructor seems to have
+*removed* the old constructor as far as some code is cncerned (it's
+still there, but with a different mangled name).
+
+News for version 3.17.2
+
+Added tests for big-endian machines from Dan Horák  <dan@danny.cz>
+
+News for version 3.17.1
+
+A bug fix release. 
+
+Fix for endian detection issues and unqualified use of 'array' (it
+should have been libdap::array). The latter affects builds with 
+recent versions of gcc.
+
+See the ChangeLog for other issues that this version addresses.
+
+News for version 3.17.0
+
+Better error reporting. Error objects are now always thrown with a
+code that 'make sense' and use the default code only when really
+necessary. This means that the BES will not report most Error throws
+as an internal error (only a few are) unless that's really the case.
+This is used, in turn, by the front end to make better error responses
+for users.
+
+The old timeout code is still present but not used. This matches 
+changes made in the BES to correctly process timeouts.
+
+Improved support for doxygen.
+
+Support for DAP4: Attributes were sometimes mis-coded as Byte when
+they should have been Float32. Fixed.
+
+Child Groups were sometimes printed twice. No more.
+
+News for version 3.16.0
+
+I've bumped up the version because of an API change in libdap - the 
+library no longer computes the DAP4 CRC32 checksum as part of the 
+BaseType::intern_data() method. This API change affects DAP4 only. 
+Otherwise, this is a bug-fix release for 3.15.1
+
+Bugs fixed:
+
+getdap4 correctly produces output for dataset with child groups.
+
+Tests now work correctly for big-endian machines - before the DMR tests
+were failing because the CRC32 codes are different for the same, e.g.,
+int32 value, with different byte order. Not addressed are the issues 
+of how best to encode the byte order used when CRC32 computations are
+done. Thanks to the folks at RedHat for help (a VM) to work on this.
+
+News for version 3.15.1
+
+Bug fixes
+
+News for version 3.15.0
+
+The library now writes to the network using a child thread, allowing 
+parallel processing of data reads and writes when one or more variables
+are returned (or when returning the result of an aggregation).
+
+The library now supports writing 'vector' data (i.e., Array variables)
+in parts so that large arrays that are being built up over time can be
+serialized in pieces as the data becomes available. This is combined
+with the parallel I/O feature when serializing aggregations - other
+handlers could also take advantage of it
+
+We fixed an issue in Vector where template methods were used in a way
+that broke inheritance, introducing a hard-to-diagnose bug in the NCML 
+code. The problem was that variables that describe the 'aggregation 
+dimension' could not be subset. That's now fixed.
+
+News for version 3.14.2
+
+This version of the library _changes the behavior of BaseType::serialize()_
+so that memory allocated on the heap used to hold data (e.g., for an 
+Array) will be deleted as soon as the data are serialized. This was added
+to reduce memory consumption when returning responses with many large 
+variables. The change did not affect any of the code we normally test
+against; I think it was a largely undocumented 'feature' that the data
+were still present after serialized returned. However, if a module needs
+the data after serialize() is called, it can use a new method called
+serialize_no_release() to get the old behavior.
+
+News for version 3.14.1
+
+We started using Travis-CI and Coverity for/with/on this code; there was
+a learning curve... ;-) Also some issues with the parsers have been 
+addressed, hopefully resulting in more straightforward builds.
+
+News for version 3.14.0
+
+This version of libdap contains the current DAP4 implementation for 
+C++. The implementation is nearly complete, lacking only the CE filters
+for Sequences.
+
+News for version 3.13.3
+
+Memory leak fix in RValue.cc - affects server function evaluation only.
+
+News for version 3.13.2
+
+Fixed a memory leak in the CE parser when evaluating server functions.
+
+News for version 3.13.1
+
+Fix for a unit-test that uses the default server at test.opendap.org. 
+This affects neither the API nor ABI of libdap; only the test baseline
+was changed.
+
+News for version 3.13.0
+
+Added a xml file to serve as input for the perl-based abi compatibility 
+checker. Seems to be pretty slick; see abi-checker.xml.in for more info.
+
+Some updates - mostly addition of #include <unistd.h> - for OSX 10.9's
+clang compiler.
+
+News for version 3.12.1
+
+Fixed the behavior of Sequence::read_row() so that the documented
+semantics of read() are used. This will require changes in some of the
+handlers but does not change the libray's ABI. Handler's that don't
+need the new/corrected behavior can use version 3.12.0.
+
+News for version 3.12.0
+
+Moved server functions out of libdap; they are now stored in a BES module.
+
+Added support for building large (constant) arrays to be used in
+server functions. The arrays are defined using a new special form that
+the ConstraintEvaluator class supports. The server side functions are
+now in their own BES module (built as part of the BES for now) and
+it's possible to name the constant arrays. Arrays of 1 million
+elements can be made in a fraction of a second (although it will take
+longer to send the constraint to the server). See the README file for
+more details.
+
+News for version 3.11.7
+
+Bug fix for the server function caching code. Now if the function
+cache directory /tmp/dap_functions_cache exists, it will be used to 
+cache the results of applying server functions. If the directory does
+not exist, then the function results won't be cached - a minor 
+performance penalty in most cases. 
+
+The size of the cache is set to 20GB. The size and location of the 
+cache are fixed for this version of libdap but they will move into
+the bes.conf file as parameters in a future version of the server.
+
+News for version 3.11.6
+
+Changes to the way constraints are evaluated when they contain server
+functions. Now DAS and DDS objects can be returned from requests that
+include those constraints. The server function call results are
+cached, so that sending the same function calls several times will not
+evaluate those functions more than once.
+
+News for version 3.11.5
+
+Fixed a memory leak in XDRStreamMarshaller and a bug in
+DDS::add_var_nocopy().
+
+News for version 3.11.4
+
+Merged to trunk; tagged.
+
+News for version 3.11.3
+
+Changed the return value for dap-config --libs so that it does not contain 
+the curl static libs. This causes problems when linking on CentOS 6 in some
+cases.
+
+News for version 3.11.2
+
+The new DAP3.3 Keywords are supported by the library. These are sort
+of a hidden feature of DAP4 that might not be used.
+
+There are many bug fixes in this update; check the ChangeLog or Trac.
+Two notable fixes:
+
+* The way attributes are encoded has changed subtly so that now only
+  spaces are escaped. This fixes a problem with our XML and RDF
+  responses.
+
+* The XML output (i.e., the DDX) is now built using an XML library, so
+  any encoding issues are its fault ;-) But, in a pragmatic sense,
+  this has greatly simplified the library and sets the stage for
+  further simplification of the methods that build responses. The
+  behavior of those methods has not changed.
+
+News for version 3.11.1
+
+Merge of the Hyrax 3.6.2 fixes.
+
+A race condition in the HTTP cache was fixed.
+
+Fixes for the OS/X package.
+
+News for version 3.11.0
+
+Constraint expressions can now include multiple function calls.
+Previously, when a function was used in the projection part of the CE
+and it was not a 'projection function,' but a function that returns
+data, only function could be called in the CE. Now the evaluator
+supports calling a series of functions. The results are returned in a
+Dataset object as before. Because this is a new behavior for the
+library I have bumped up the minor revision. This version is backward
+compatible with the previous version of the library.
+
+Grid now prints the XML declaration correctly when a constrained Grid
+variable's type decays to a Structure. The expr-test program now has
+an XML option (-x) for use with constrained DDS/DDX output. This bug
+affected the usefulness of the DDX response.
+
+the geogrid() function now takes both (grid, <box points>) and (grid,
+lat array, lon array <box points>). This includes some minimal testing
+of the new code.
+
+Bug fixes.
+
+News for version 3.10.2
+
+Changed the way the DAS object's attributes are merged into a DDS
+object, which did two things. First, the process of merging the
+attributes has a default behavior that will work if the DAS and DDS
+are built according to the DAP 2.0 specification, and second, the
+handlers can specialize the process to suite their own needs. This
+means that new handlers that build odd DAS objects will need to
+specialize the transfer_attributes() method defined by BaseType,
+Constructor and Grid. I've already done this for the current handlers
+we're distributing as part of Hyrax. This means that attributes from
+the netCDF handler appear correctly in Grid maps.
+
+Speaking of the netCDF handler, it now builds with netcdf 4.1.
+
+Build fixes galore, including new Requires: lines in the rpm spec
+files which should make it easier to short circuit installation
+problems with the handlers.
+
+The DDX no longer contains attributes with &0xdd; escape codes. When
+an XML document declares that it is UTF-8 codes < 0x20 are not
+allowed. We're using octal escapes again.
+
+The preceding fix, along with the corrected processing of the DAS
+object mean that two major issues with the DDX that hindered the use
+of that response in semantic web applications are gone.
+
+News for version 3.10.1b
+
+We have removed the Server 3 (CGI) software from the dap-server
+package and, with that change, we have removed the deflate program
+from this library/package.
+
+The geogrid() function has been much improved. It will now answer
+requests where the latitude is upside down in the dataset and flip the
+result so that the north pole is 'up'. It will also handle requests
+that 'wrap around' the date line. Error messages are also improved.
+
+This library now implements DAP 3.3 including the OtherXML DAP
+attribute type (which will become AnyXML in DAP 4). The library now
+implements simple version negotiation and a DDX response that is DAP
+version sensitive. See the online DAP4 design documentation for more
+information (docs.opendap.org).
+
+Many, many fixes and extensions for DAP4 and NcML support. (NB: the
+NcML handler is a separate project).
+
+News for version 3.9.2
+
+Memory leak fixed when using DDS::transfer_attributes on a DAS that uses the
+Alias keyword.
+
+News for version 3.9.1
+
+The CE parser now returns an error if an array of structures that contains
+arrays is improperly constrained (the enclosing structure array _may_ be
+subsampled, but that subsampling must be the same for each of its fields. The
+fields can be independently subsampled.
+
+A problem with the client-side cache has been fixed.
+
+Variable names can now be quoted! That is, in a CE you can say:
+
+  "my odd name"."% H2O"[10:13] 
+
+and it will parse. Must clients and all web browsers will encode all of this
+using the web's URL escape syntax, which his hard to read, but this means that
+any character can now appear in a variable name (double quotes can be escaped
+using a backslash and backslashes can be includes using '\\'). The quotes are
+optional, of course, so all CEs that work now will continue to work.
+
+News for version 3.9.0
+
+libdap now supports DAP 3.2. The evolving DAP 3.x protocol is described at
+http://docs.opendap.org/index.php/DAP3/4. The most important change from DAP
+3.1 to 3.2 is:
+
+  DAP 3.2 introduces the notion of protocol negotiation, similar to HTTP's
+  response type or encoding negotiation. The client MAY send an XDAP-Accept
+  header to tell the server the highest version of the protocol that the
+  client can understand. The server MUST then respond using only responses at
+  or below that version number of the protocol. Note that an Error response
+  (e.g., "The response you requested cannot be returned using the protocol
+  version you understand") can be understood by any client. If a client does
+  not send the XDAP-Accept header, then the server MUST assume a DAP 2.0/3.1
+  client. The only functional difference between DAP 2.0, 3.0 and 3.1 is
+  form/content of the version information returned in the HTTP response
+  header.
+
+  By allowing the server to respond with a lower version the protocol can
+  support old servers (since that's how they will respond) and enable newer
+  clients to treat the lower version responses as errors (because the newer
+  servers can be expected to discriminate between different server versions).
+
+  New servers SHOULD always return a response that conforms to the version
+  sent from the client in the XDAP-Accept header.
+
+  In addition to returning the DAP protocol version using the XDAP header
+  (which is a mechanism specific to HTTP), the protocol version will also be
+  returned in the DDX Dataset element using the XML attribute dap-version.
+  See DDX.
+
+With this version of libdap the DDX is slightly different for DAP 3.2 - it
+now includes DAP protocol version information and an xmlbase element.
+
+There was ambiguity regarding how an array of structures would be constrained.
+The web page of DAP 2 Errata has been updated with a clarification of this and
+the constraint expression parser has been updated to reflect that fix. See
+the DAP3/4 page and ticket 975 for the complete info. Short version: Suppose
+'s' is an array of structures and 'm' is an array that is a member of 's'.
+You can constraint 'm' like this: s2[0:4].m[2:7]
+
+Now the notion that a dataset identifier (e.g., a file name) is bound to the
+DDS has been  dropped and that identifier is bound to a variable. This lets
+the library be used in contexts where a DDS holds variables from several
+different places (e.g., files).
+
+String attribute values were always quoted (quotes were added if not present
+in the data set) and while this was OK for the DAS response, it broke the
+DDX. Now quotes are added to DAS response but not the values themselves. See
+ticket 1163.
+
+Nested Sequences were failing when the constraint forced one or more rows of
+the inner Sequence to be empty. Fixed.
+
+A number of build issues have been fixed in this version, see the ChangeLog
+file.
+
+News for version 3.8.2
+
+Significant improvements to the HTTP cache. The cache software could return
+erroneous responses in some rare cases when using multi-threaded code. Fixed.
+Also the entire caching system is now much more robust since the 'table' that
+contains information about individual entries is encapsulated in it's own
+class. The HTTP cache is still both thread-safe and _not_ multi-process safe.
+However, it should be possible to modify the HTTPCacheTable class to use a
+database system like MySQL or SQLite to make it MP-safe.
+
+The 'ancillary information' functions have been moved to their own class
+(from DODSFilter and the file cgi_util.cc).
+
+I fixed the libdap win32 installer so that it does not install stuff in the
+win32 system directories anymore.
+
+News for version 3.8.1
+
+The syntax for PROXY_SERVER and NO_PROXY_FOR have been fixed so that they are
+easier to use. PROXY_SERVER now takes a value like
+'http://user:pw@squid.proxy.edu:3128' and uses it correctly. In that value,
+all parts but the host name (squid.proxy.edu) are optional and the old syntax,
+as well as several common variants, are accepted. For the NO_PROXY_FOR entry,
+the '<protocol>,' is now optional. Only the HTTP protocol is supported or the
+proxy server.
+
+News for version 3.8.0, 29 February 2008
+
+The libdap classes and code are now inside of the libdap namespace. In order
+to access any of the classes, for example, you will need to do one of the
+following. After including the libdap headers you can:
+
+1. add a using statement for the entire libdap namespace:
+
+using namespace libdap ;
+
+2. add a using statement for the classes that you will be using:
+
+using libdap::DAS ;
+
+3. inside your code scope the use of libdap classes.
+
+libdap::DAS *das = code_to_get_das() ;
+
+HTTPCache updated to cache an entry, returning not only the FILE pointer but
+also the name of the file in the cache. This way, the cached item could be
+passed to a data handler, such as the netcdf_handler, and read.
+
+The pkg build for Mac OSX was updated to automate the creation of the
+ReadMe.txt file, add a README and NEWS file to the dmg and automatically
+create the dmg using DropDMG.
+
+News for version 3.7.10, 28 November 2007
+
+Fixed XDRStreamMarshaller so that it no longer allocates a huge buffer. This
+fixes a bug where the BES fails to start on smaller machines.
+
+News for version 3.7.9, 21 November 2007
+
+Bumped up the soname version numbers for libdapclient and libdapserver due
+to changes in the HTTPResponse and AlarmHandler interfaces.
+
+The transfer_data() method defined for Sequence and Structure has been
+generalized and implemented for all classes. In the process, so issues with
+the way nested sequences were handled have been fixed. I renamed the method
+to intern_data() since it is now a part of libdap (and not just two classes).
+The method uses the read() methods defined for the type classes (Byte, ...,
+Grid) to read data into variables in a DDS as if they were read in using
+deserialize(). This is used by the ASCII response generator and might be used
+by other 'formatted output' generators.
+
+Generated files (like the grammar files) are now shipped with the source
+distributions. (From Patrice Dumas)
+
+Methods which write output using the C++ iostream system have been added back
+into the library and are going to replace the FILE* versions of those
+methods. We have also added an 'Un/Marshaller' set of classes so that we can
+release a version of Hyrax (slated to be 1.4) that will improve BES/OLFS
+communication efficiency.
+
+The functionality of the Passive* type classes was subsumed by their parent
+classes and they were removed from the library to cut down on 'hierarchy
+clutter.' Some other unneeded files were also removed.
+
+The maximum size of a Str object was changes to 65535 (DODS_USHORT_INT-1) to
+accommodate HDF5 strings. 
+
+Checkouts from subversion now have no (?) generated files. We are keeping a
+copy of the grammars in subdirectory named 'grammarfiles.'
+
+HTTP response codes are now available in libdap HTTPResponse objects. From
+Darren Hardy.
+
+News for version 3.7.8, 26 June 2007
+
+Updated the email address for support to support at opendap.org and changed
+the tech email list address to opendap-tech at opendap.org. This is part of
+the plan to shift support services to OPeNDAP and to use the tech email list
+as part of that plan.
+
+Updated to the latest gnulib software.
+
+Memory errors fixed: 
+
+    In the HTTP processing code for clients which was triggered when a client
+    read from an older server (older servers had malformed HTTP headers).
+
+    An error in the regular expression class (Regex) where the build
+    generated flawed code on a 64-bit machine.
+
+OSX Build improvements.
+
+Patrice Dumas' changes to dods-datatypes.h - Now the header uses the C99
+types unless the stdint.h header is not present.
+
+pkg-config support. From a patch by Patrice Dumas.
+
+General improvements to comments, strings and error messages throughout the
+libraries. 
+
+News for version 3.7.7, 2 May 2007
+
+Fixed a bug where the build was not installing the dapserver and dapclient
+libraries. 
+
+Fixed a handful of platform-specific build issues.
+
+There are some minor performance improvements to the constraint evaluator.
+
+Repaired some problems with the server-side functions.
+
+News for version 3.7.6, 12 March 2007
+
+Fixed a bug in the linear_scale() Constraint Expression function when that
+function was used with plain arrays.
+
+I fixed a build issue on linux for ml-structs caused by a bad/missing
+#include in GnuRegex.h.
+
+News for version 3.7.5, 7 Feb 2007
+
+Many bug fixes for the Server-Side functions linear_scale(), grid(),
+geogrid() and geoarray().
+
+Added dump method to the BaseType classes, DAS, DDS, DataDDS. To do
+this, created a DapObj base class for all of these to inherit from
+(directly or indirectly) and in the DapObj class is the operator<<
+method. This will aid in debugging. Created an indentation classes to
+help with dumping objects.
+
+Win32 port fixes. The Win32 build is closer to the Unix build. Our
+hope is to get the two to be almost identical so that we can all build
+on Win32 and thus get away from having the win32 releases lag behind the
+Unix releases.
+
+Fix in Vector for gcc 4.1
+
+News for version 3.7.4, 02 Jan 2007
+
+Build enhancements and bug fixes. See ChangeLog for specifics.
+
+News for version 3.7.3, 24 Nov 2006
+
+Fixed unescattr() so that it works!
+
+Rob added improvements to the win32 build.
+
+Fixed a number of bugs including: Problems with the DDS::transfer_attributes()
+method which broke libnc-dap; Added a new configuration parameter to .dodsrc
+so that SSL validation can be suppressed; Fixed problems with the change from
+\n to \r\n line terminators for MIME headers which slipped through the cracks
+the first time; and add gzip and compress to the set of accepted compression
+types supported by the client side.
+
+Added Connect::request_ddx() which asks a server for the DDX response. 
+Previously, it was possible to use getdap to print the DDX, but that object
+was actually built using the DAS and DDS from a server. Now the server is asked
+for the DDX. Servers should support this response to be compliant with DAP 3.1.
+
+In the ConstraintEvaluator class, the add_function() method now allows a server
+to override a function from libdap with a new definition of the same name.
+
+I added a new interface for the scalar types: value() and set_value() can be
+used to get and set values. These are much simple to use than the older
+val2buf() and buf2val() methods. This idea was copied from copied from the 
+PassiveByte, ..., classes.
+
+New server-side functions for geographical constraints have been added. These
+functions provide a way to select parts of Grid or Array variables using
+Latitude and Longitude. Also added is a version() function which can be used
+by clients to figure out which version of functions is present. The version
+function has two forms, one which returns the information as plain text and
+one which returns the information in a small XML document. libdap 3.7.3 is a
+beta release of these functions. Note that these are _server-side_ functions
+so before they can be used, servers need to be built using this library and
+installed.
+
+The dap-config script has been fixed so that it behaves more like other 
+such scripts.
+
+News for version 3.7.2
+
+Fixed a persistent bug in the GNURegex code. (ticket 389)
+
+Fixed a problem in HTTPConnect where the change from newline to cr/nl line
+terminators was not accommodated (no ticket, but part of the issues behind
+ticket 552).
+
+Added Sequence::transfer_data(). This method uses the read() method to read
+data and follows the same logic used by serialize to determine which data is
+'sent' but instead records the data in the d_values field. Thus a Sequence
+can transfer data to itself. The locally stored data apes the ability of the
+other classes to store a complete response and is the basis for the new ASCII
+response code (in dap-server/asciival) which Server4 uses.
+
+There's a fair amount of the geogrid() code now in place, although the
+function does not work, I have added a GeoConstraint class which is close to
+complete. The CEFunctionsTest unit tests fail.
+
+News for version 3.7.1
+
+Fixed bug #480. Attributes from the HDF4 server were not being handled in a
+way that made sense to netCDF clients.
+
+Added a new method to AttrTable so that a vector of strings can be used to
+set a vector of attribute values in one call. No more need to build a loop
+every time you want to set values.
+
+The grid() CE function now conforms to the design submitted to URI as part of
+the REASoN award.
+
+Fixed a bug when % signs were not handled correctly by the code in
+escaping.cc. 
+
+News for version 3.7.0
+
+The big change: The first of the DAP3/4 features was added to the libdap
+library; the library now includes the DAP protocol version number in all
+responses. A savvy client can test for this and process accordingly. 
+
+A second feature, representation of the data source metadata in XML, is
+supported in alpha form. Expect the 'DDX' response to change slightly in the
+next release. The DDX returned now contains an obsolete element named 'Blob'
+which we won't be using. Other than the Blob element, the current DDX
+probably will not change much except for the addition of new datatypes,
+something that will take place only after other changes are made to the
+protocol. Many of the handlers now support returning the DDX, so developers
+can begin to play with it's capabilities. 
+
+What's really nice about the DDX: It's cool that the DDX now encode the
+metadata in XML, but the really nice feature is that it combines information
+from the DDS and DAS, making the association of attributes to variables much
+easier. 
+
+Updated the reference guide (HTML pages in docs).
+
+Fixed a pernicious bug in GNURegex.cc
+
+Added the class ConstraintEvaluator. The DDS class now takes the constraint
+evaluator as a parameter, so it's possible to replace ours with your own.
+
+The single library libdap has been split into three libraries: libdap for the 
+DAP functionality, libdapclient for the client-side classes and libdapserver
+for the server-side classes.
+
+Added INSTALL.AIX which contains information about building libdap on AIX
+using the _native compiler_. 
+
+News for version 3.6.2
+
+This version includes two bug fixes. 
+
+1. The library can now correctly reads binary data objects saved using the web
+interface. Before, this was very hard to do. The utility getdap has been
+modified so that it can decode these saved '.dods' files.
+
+2. The DODSFilter class used to build all of our data handlers no longer 
+blocks when returning a data object to a web browser. This fixes a problem
+where the 'Get Binary' button on the data server's web interface would hang
+seemingly forever. In fact it did return the data blob, but only after the 
+blocked handler had timed out.
+
+News for version 3.6.1
+
+Fixed a bug in deflate.c: Some comments used the C++ style comments and gcc
+rejected that.
+
+Data server filters built with the 3.6.0 library were not compatible with the
+dap-server 3.6.0 software because the DODSFilter class did not recognize the
+-t option (which is used to pass the handler a timeout value).
+
+News for version 3.6.0
+
+Added patches for RPM spec files from Patrice Dumas.
+
+Fixed a problem where Grids with two or more dimensions with the same name 
+were flagged as broken (by Grid::check_semantics). Now they are allowed as per
+the specification.
+
+Added a new method get_parent() to AttrTable. This returns the parent 
+container for this AttrTable.
+
+I removed the old iostream methods from the library. These methods should not
+be used because in many cases since other parts of the library use the C/stdio 
+functions for I/O. In older versions of gcc, it was possible to mix the
+two types of I/O systems, but not now (and not in other compilers). To change
+your code, look in the file Removed_functions.txt to see the functions/methods
+that have been removed. In all cases there is a version that takes a FILE *
+in place of the ostream &. Use the FILE* version. If you're performing I/O
+that relies on operator<<() to do type conversions, use an ostringstream 
+in your code and then write the string to stdout (or wherever) using fprintf
+like: fprintf(stdout, "%s", oss.str().c_str()). Ugly, but easier in some
+cases than replacing lots of tested C++ I/O with fprintf calls.
+
+I removed old methods in Connect that have been deprecated for more than
+a year. See Removed_functions.txt
+
+I removed the old Pix methods. See removed_functions.txt.
+
+I removed the const char * overloads added to prevent collisions between
+the Pix and String (not string, but GNU's old libg String class) methods.
+
+Added protocol version number header to responses which use the set_mime...()
+functions. The new header is called "XDAP-Protocol" and its value is the 
+two digit DAP protocol version number. This is now used by the client-side
+deserialize() methods; I assume that a server that does not announce its
+protocol version is a 2.0 server.
+
+Removed the set_mime...() functions which take an iostream; use the ones 
+which take the FILE* instead. We replaced the iostream versions with FILE*
+versions a long time ago because the parsers all use FILE* I/O functions
+and mixing the C++ and C I/O is not predictable. The old functions were
+deprecated. To fix your code, just change the iostream variable to a FILE*.
+In most cases this will mean changing 'cout' to 'stdout.' 
+
+News for Release 3.5.3
+
+Changes to the Regex software. I've reimplemented the GNURegex code to 
+use the only the POSIX functions. Because of this there are some subtle
+changes in the way the class Regex works. These changes address bugs that
+show up on Mac OS/X 10.4 (Tiger).
+
+1) Meta characters like '{' now have to be escaped like '\\{'
+2) See the docs for the Regex::match and Regex::serach methods. Regex:match 
+   returns the number of characters that match or -1 if there's no match.
+   Regex::serach returns the position of the _first_ match (not the longest
+   as with POSIX) and the length of that first match in the value-result
+   parameter 'matchlen'.
+3) The Regex constructor now takes only one argument, the regular expression
+   to compile. There's a second ctor that takes a second parameter (an int)
+   but it is a dummy.
+   
+As a result of these changes, a small portion of the interface for libdap
+has changed.
+   
+Build improvements from Patrice Dumas.
+
+Added a Mac OS/X package and RedHat rpm/srpm targets. There's also a pmsp
+file for use with Mac's PackageMaker.
+
+News for Release 3.5.2
+
+Fixed a bug where malformed Error objects from servers caused an exception.
+This caused the original error message to be lost, not very helpful.
+
+The library used a compile-time switch to control use of the factory class for
+creation of objects at run-time. This was causing more trouble than it was
+preventing, so I removed it. Code should switch from the 'virtual
+constructors' to the factory class now.
+
+The Test classes in the subdir 'test' should now produce the same values on
+64- and 32-bit machines.
+
+Unit tests should all work (although one of the tests for util.cc is known to
+fail on FC4).
+
+Revamped the build to use automake. 
+
+Regression tests and the test classes are now in the subdir 'tests.'
+
+The unit tests are now in the subdir 'unit-tests' and are not built or run by
+default. Some of these tests require access to the Internet to work and I
+decided to make then not run using the make check target from the top level
+(the regression tests in 'tests' do run using the top-level check target) so
+that the build would work w/o access to the net.
+
+The rpm spec file has been updated. See INSTALL for information about
+building rpm distributions.
+
+Thanks to Patrice Dumas for help on the autoconf/make, with gnulib and the
+rpm spec file.
+
+News for Release 3.5.1 beta 2005/05/13
+
+I changed some of the build parameters; the utility script is now named
+dap-config, the headers now install into $prefix/include/dap and the static
+library no longer has a version number appended. I've also written a rpm spec
+file which can be used to build a rpm file of/for a binary distribution. At
+this stage you'll need to be pretty savvy with RPM to get it to work; I'll
+write up instructions soon.
+
+News for Release 3.5.0 beta 2005/05/05
+
+Changes in the way the software is organized:
+
+* First, the old 'DODS' CVS module is being broken up to facilitate more
+  frequent releases of software. libdap++ has a new CVS module named
+  'libdap.' To access the software using CVS, use 'cvs co libdap' (where in
+  the past you used 'cvs co DODS/src/dap' or 'cvs co DODS' and then changed
+  into the DODS/src/dap directory).
+
+* The autoconf scripts have been updated; still no libtool or Makefile.am,
+  but the scripts are much more robust.
+
+* The third-party packages are no longer bundled with the library. In a sense
+  they never were, but they _were_ a part of the DODS CVS module. Now it's up
+  to you to get and install the required packages. Look on the web site (or
+  Google) for libxml2 and curl. We build using curl version 7.12.3 and libxml
+  version 2.6.16; curl 7.12.0 and libxml2 2.5.7 should work.
+
+* The libdap software now installs in $prefix/{lib,include,bin} instead of
+  inside the 'DODS tree.' By default $prefix is /usr/local; use the --prefix
+  option of configure to specify a different directory than /usr/local. The
+  library itself installs in $prefix/lib as libdap++.a.3.5; libdap++.a is
+  symbolically linked to that file. The header files now install in
+  $prefix/include/libdap-3.5; $prefix/include/libdap is symbolically linked
+  to that directory. The utilities geturl and opendap-config have been
+  renamed getdap and dap-config, respectively (the name geturl corresponds to
+  another utility). The getdap utility is, except for the name change,
+  exactly the same as geturl. The dap-config script provides a way to
+  determine which libraries should be included when linking with a particular
+  build of libdap++. It also provides information about the version of the
+  library linked to $prefix/lib/libdap++.a and some other stuff. Use
+  dap-config --help for a listing of all the options. Finally, the deflate
+  program, which is used by some servers to provide compressed responses and
+  is called by the library is not stored in $prefix/sbin (except on win32
+  where it's stored in $prefix/bin).
+
+  The usage program is not currently installed; once we complete the
+  reorganization process it will find a good home.
+
+Other changes to libdap++:
+
+* The library now uses a factory class to determine how to instantiate
+  specializations of Byte, Int32, et cetera. The class BaseTypeFactory
+  defines the interface for the factory and provides a default implementation
+  of the class. This implementation instantiates Byte, ..., Grid. Also
+  supplied with the library is TestTypeFactory which instantiates the Test
+  type classes (TestByte, ..., TestGrid). If your use of the library requires
+  that the type classes be specialized, then you must modify your software so
+  that it includes a factory class that specializes BaseTypeFactory. Then,
+  when you create a DDS (or DataDDS) pass a pointer to an instance of your
+  factory to the DDS constructor (or use the new DDS::set_factory() method).
+  Look at BaseTypeFactory and the example specialization TestTypeFactory.
+  It's very straightforward to make the change.
+
+  For applications which don't specialize the type classes, the default
+  factory should be fine. To avoid using the new DDS constructor (which
+  requires that a pointer to an instance of BaseTypeFactory be supplied), your
+  code must #define the symbol DEFAULT_BASETYPE_FACTORY. If this symbol is
+  not defined (at compile time) then various compile-time errors will occur
+  (the idea being this will prevent software from building and silently
+  ignoring specializations of the type classes). If defined, this use the
+  default factory class.
+
+  The documentation for the DDS constructor has some more information.
+
+* The library contains support for the DDX object. The DDX will become the
+  foundation of the DAP3 protocol. It uses XML to describe the information
+  currently represented using our 'curly-brace' notation and also bundles
+  the attributes along with the variables they describe. This will simplify
+  many processing tasks for clients. The software provided simplifies
+  generating the DDX by building it from existing DAS and DDS objects.
+
+* There has also been some significant re-factoring in DDS and DAS: The
+  DDS:send() method has been copied over to DODSFilter and the version in DDS
+  has been deprecated and will be removed in a future version of the library.
+  The library uses STL iterators almost exclusively and the next version will
+  eliminate the ancient Pix class.
+
+* The function dods_root() is now called libdap_root() and tests the
+  environment variable LIBDAP_ROOT. If that variable is not set,
+  libdap_root() returns the value passed to the --prefix option of configure
+  or /usr/local if the option was not used. Added to libdap++ is a function
+  libdap_version() which returns the version number of the library. Note that
+  libdap_version() is declared as extern "C" so that it can be used in
+  configure tests to check for the library.
+
+* The servers no longer provide three programs to handle the das, dds and
+  data requests. Instead one *_handler is provided. This reduces the size of
+  the servers by a factor of three and paves the way toward integration of
+  the HTML and ASCII code into the server binary, which will improve the
+  performance and security of those features.
diff --git a/OSX_Resources/Description.plist b/OSX_Resources/Description.plist
new file mode 100644
index 0000000..435aa4e
--- /dev/null
+++ b/OSX_Resources/Description.plist
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IFPkgDescriptionDescription</key>
+	<string></string>
+	<key>IFPkgDescriptionTitle</key>
+	<string>OPeNDAP DAP versions 2 and 3 C++ Implementation</string>
+</dict>
+</plist>
diff --git a/OSX_Resources/Info.plist.proto b/OSX_Resources/Info.plist.proto
new file mode 100644
index 0000000..da051c6
--- /dev/null
+++ b/OSX_Resources/Info.plist.proto
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleGetInfoString</key>
+	<string>_FULL_VERSION_, OPeNDAP libdap</string>
+	<key>CFBundleIdentifier</key>
+	<string>org.opendap.libdap</string>
+	<key>CFBundleShortVersionString</key>
+	<string>_FULL_VERSION_</string>
+	<key>IFMajorVersion</key>
+	<integer>_MAJOR_VERSION_</integer>
+	<key>IFMinorVersion</key>
+	<integer>_MINOR_VERSION_</integer>
+	<key>IFPkgFlagAllowBackRev</key>
+	<false/>
+	<key>IFPkgFlagAuthorizationAction</key>
+	<string>RootAuthorization</string>
+	<key>IFPkgFlagBackgroundAlignment</key>
+	<string>topleft</string>
+	<key>IFPkgFlagBackgroundScaling</key>
+	<string>none</string>
+	<key>IFPkgFlagDefaultLocation</key>
+	<string>_PREFIX_</string>
+	<key>IFPkgFlagFollowLinks</key>
+	<true/>
+	<key>IFPkgFlagInstallFat</key>
+	<false/>
+	<key>IFPkgFlagInstalledSize</key>
+	<integer>10000</integer>
+	<key>IFPkgFlagIsRequired</key>
+	<true/>
+	<key>IFPkgFlagOverwritePermissions</key>
+	<false/>
+	<key>IFPkgFlagRelocatable</key>
+	<false/>
+	<key>IFPkgFlagRestartAction</key>
+	<string>NoRestart</string>
+	<key>IFPkgFlagRootVolumeOnly</key>
+	<false/>
+	<key>IFPkgFlagUpdateInstalledLanguages</key>
+	<false/>
+	<key>IFPkgFormatVersion</key>
+	<real>0.10000000149011612</real>
+</dict>
+</plist>
diff --git a/OSX_Resources/InstallationCheck b/OSX_Resources/InstallationCheck
new file mode 100755
index 0000000..9d9b387
--- /dev/null
+++ b/OSX_Resources/InstallationCheck
@@ -0,0 +1,45 @@
+#!/bin/sh
+#
+# Check the architecture
+
+# Check to make sure the computer is running 10.5 or later.
+
+version=`uname -a | sed 's/.*Darwin Kernel Version \([0-9.]*\):.*/\1/'`
+major=`echo $version | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\1/'`
+minor=`echo $version | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\2/'`
+
+if test $major -lt 9 -o $major -eq 9 -a $minor -lt 8
+then
+    # Warn and display message 16 (the string displayed will be read from 
+    # InstallationCheck.strings using the exit code minus 32 to select the
+    # specific string).
+    exit 48
+fi
+
+# we need libcurl 7.10.6 according to configure.ac
+version=`curl-config --version | sed 's/libcurl \([0-9.]*\).*/\1/'`
+major=`echo $version | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\1/'`
+minor=`echo $version | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\2/'`
+
+if test $major -lt 7 -o $major -eq 7 -a $minor -lt 10
+then
+    # Fail and display message 17 (exit code - 96) (the string displayed 
+    # will be read from InstallationCheck.strings using the exit code 
+    # minus 96 to select the specific string.)
+    exit 113
+fi
+
+# we need libxml2 2.6.16 according to configure.ac
+version=`xml2-config --version | sed 's/\([0-9.]*\).*/\1/'`
+major=`echo $version | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\1/'`
+minor=`echo $version | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\2/'`
+
+if test $major -lt 2 -o $major -eq 2 -a $minor -lt 6
+then
+    # Fail and display message 18 (exit code - 96) (the string displayed 
+    # will be read from InstallationCheck.strings using the exit code 
+    # minus 96 to select the specific string.)
+    exit 114
+fi
+
+exit 0
diff --git a/OSX_Resources/InstallationCheck.strings b/OSX_Resources/InstallationCheck.strings
new file mode 100644
index 0000000..cbe0522
--- /dev/null
+++ b/OSX_Resources/InstallationCheck.strings
@@ -0,0 +1,6 @@
+"16" = "This software has not been tested with Mac OS/X versions prior to Panther. Even though the installer says you cannot install the software, you can go ahead and give it a try...";
+"17" = "This software requires the Curl library, vesion 7.10.x or greater";
+"18" = "This software requires the XML2 library, version 2.2.x or greater";
+"19" = "This distribution is for the PowerPC CPU but it appears you have an Intel Mac.";
+"20" = "This distribution is for the Intel CPU but it appears you have a PowerPC Mac.";
+
diff --git a/OSX_Resources/License.txt b/OSX_Resources/License.txt
new file mode 100644
index 0000000..b713790
--- /dev/null
+++ b/OSX_Resources/License.txt
@@ -0,0 +1,177 @@
+		  GNU LESSER GENERAL PUBLIC LICENSE		       
+                     Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.     
+ 59 Temple Place, Suite 330, 
+ Boston, MA  02111-1307  USA
+
+Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts as the successor of the GNU Library Public License, version 2, hence the version number 2.1.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away yourfreedom to share and change it.  By contrast, the GNU General PublicLicenses are intended to guarantee your freedom to share and changefree software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to somespecially designated software packages--typically libraries--of theFree Software Foundation and other authors who decide to use it.  Youcan use it too, but we suggest you first think carefully about whetherthis license or the ordinary General Public License is the betterstrategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,not price.  Our General Public Licenses are designed to make sure thatyou have the freedom to distribute copies of free software (and chargefor this service if you wish); that you receive source code or can getit if you want it; that you can change the software and use pieces ofit in new free programs; and that you are informed that you can dothese things.
+
+  To protect your rights, we need to make restrictions that forbiddistributors to deny you these rights or to ask you to surrender theserights.  These restrictions translate to certain responsibilities foryou if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratisor for a fee, you must give the recipients all the rights that we gaveyou.  You must make sure that they, too, receive or can get the sourcecode.  If you link other code with the library, you must providecomplete object files to the recipients, so that they can relink themwith the library after making changes to the library and recompilingit.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright thelibrary, and (2) we offer you this license, which gives you legalpermission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear thatthere is no warranty for the free library.  Also, if the library ismodified by someone else and passed on, the recipients should knowthat what they have is not the original version, so that the originalauthor's reputation will not be affected by problems that might beintroduced by others.
+
+  Finally, software patents pose a constant threat to the existence ofany free program.  We wish to make sure that a company cannoteffectively restrict the users of a free program by obtaining arestrictive license from a patent holder.  Therefore, we insist thatany patent license obtained for a version of the library must beconsistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by theordinary GNU General Public License.  This license, the GNU LesserGeneral Public License, applies to certain designated libraries, andis quite different from the ordinary General Public License.  We usethis license for certain libraries in order to permit linking thoselibraries into non-free programs.
+
+  When a program is linked with a library, whether statically or usinga shared library, the combination of the two is legally speaking acombined work, a derivative of the original library.  The ordinaryGeneral Public License therefore permits such linking only if theentire combination fits its criteria of freedom.  The Lesser GeneralPublic License permits more lax criteria for linking other code withthe library.
+
+  We call this license the "Lesser" General Public License because itdoes Less to protect the user's freedom than the ordinary GeneralPublic License.  It also provides other free software developers Lessof an advantage over competing non-free programs.  These disadvantagesare the reason we use the ordinary General Public License for manylibraries.  However, the Lesser license provides advantages in certainspecial circumstances.
+
+  For example, on rare occasions, there may be a special need toencourage the widest possible use of a certain library, so that it becomesa de-facto standard.  To achieve this, non-free programs must beallowed to use the library.  A more frequent case is that a freelibrary does the same job as widely used non-free libraries.  In thiscase, there is little to gain by limiting the free library to freesoftware only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-freeprograms enables a greater number of people to use a large body offree software.  For example, permission to use the GNU C Library innon-free programs enables many more people to use the whole GNUoperating system, as well as its variant, the GNU/Linux operatingsystem.
+
+  Although the Lesser General Public License is Less protective of theusers' freedom, it does ensure that the user of a program that islinked with the Library has the freedom and the wherewithal to runthat program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution andmodification follow.  Pay close attention to the difference between a"work based on the library" and a "work that uses the library".  Theformer contains code derived from the library, whereas the latter mustbe combined with the library in order to run.
+
+		  GNU LESSER GENERAL PUBLIC LICENSE   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or otherprogram which contains a notice placed by the copyright holder orother authorized party saying it may be distributed under the terms ofthis Lesser General Public License (also called "this License").Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or dataprepared so as to be conveniently linked with application programs(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or workwhich has been distributed under these terms.  A "work based on theLibrary" means either the Library or any derivative work undercopyright law: that is to say, a work containing the Library or aportion of it, either verbatim or with modifications and/or translatedstraightforwardly into another language.  (Hereinafter, translation isincluded without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work formaking modifications to it.  For a library, complete source code meansall the source code for all modules it contains, plus any associatedinterface definition files, plus the scripts used to control compilationand installation of the library.
+
+  Activities other than copying, distribution and modification are notcovered by this License; they are outside its scope.  The act ofrunning a program using the Library is not restricted, and output fromsuch a program is covered only if its contents constitute a work basedon the Library (independent of the use of the Library in a tool forwriting it).  Whether that is true depends on what the Library doesand what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library'scomplete source code as you receive it, in any medium, provided thatyou conspicuously and appropriately publish on each copy anappropriate copyright notice and disclaimer of warranty; keep intactall the notices that refer to this License and to the absence of anywarranty; and distribute a copy of this License along with theLibrary.
+
+  You may charge a fee for the physical act of transferring a copy,and you may at your option offer warranty protection in exchange for afee.
+
+  2. You may modify your copy or copies of the Library or any portionof it, thus forming a work based on the Library, and copy anddistribute such modifications or work under the terms of Section 1above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a    table of data to be supplied by an application program that uses    the facility, other than as an argument passed when the facility    is invoked, then you must make a good faith effort to ensure that,    in the event an application does not supply such function or    table, the facility still operates, and performs whatever part of    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has    a purpose that is entirely well-defined independent of the    application.  Therefore, Subsection 2d requires that any    application-supplied function or table used by this function must    be optional: if the application does not supply it, the square    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  Ifidentifiable sections of that work are not derived from the Library,and can be reasonably considered independent and separate works inthemselves, then this License, and its terms, do not apply to thosesections when you distribute them as separate works.  But when youdistribute the same sections as part of a whole which is a work basedon the Library, the distribution of the whole must be on the terms ofthis License, whose permissions for other licensees extend to theentire whole, and thus to each and every part regardless of who wroteit.
+
+Thus, it is not the intent of this section to claim rights or contestyour rights to work written entirely by you; rather, the intent is toexercise the right to control the distribution of derivative orcollective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Librarywith the Library (or with a work based on the Library) on a volume ofa storage or distribution medium does not bring the other work underthe scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General PublicLicense instead of this License to a given copy of the Library.  To dothis, you must alter all the notices that refer to this License, sothat they refer to the ordinary GNU General Public License, version 2,instead of to this License.  (If a newer version than version 2 of theordinary GNU General Public License has appeared, then you can specifythat version instead if you wish.)  Do not make any other change inthese notices.
+
+  Once this change is made in a given copy, it is irreversible forthat copy, so the ordinary GNU General Public License applies to allsubsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code ofthe Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion orderivative of it, under Section 2) in object code or executable formunder the terms of Sections 1 and 2 above provided that you accompanyit with the complete corresponding machine-readable source code, whichmust be distributed under the terms of Sections 1 and 2 above on amedium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copyfrom a designated place, then offering equivalent access to copy thesource code from the same place satisfies the requirement todistribute the source code, even though third parties are notcompelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of theLibrary, but is designed to work with the Library by being compiled orlinked with it, is called a "work that uses the Library".  Such awork, in isolation, is not a derivative work of the Library, andtherefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Librarycreates an executable that is a derivative of the Library (because itcontains portions of the Library), rather than a "work that uses thelibrary".  The executable is therefore covered by this License.Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header filethat is part of the Library, the object code for the work may be aderivative work of the Library even though the source code is not.Whether this is true is especially significant if the work can belinked without the Library, or if the work is itself a library.  Thethreshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, datastructure layouts and accessors, and small macros and small inlinefunctions (ten lines or less in length), then the use of the objectfile is unrestricted, regardless of whether it is legally a derivativework.  (Executables containing this object code plus portions of theLibrary will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you maydistribute the object code for the work under the terms of Section 6.Any executables containing that work also fall under Section 6,whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine orlink a "work that uses the Library" with the Library to produce awork containing portions of the Library, and distribute that workunder terms of your choice, provided that the terms permitmodification of the work for the customer's own use and reverseengineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that theLibrary is used in it and that the Library and its use are covered bythis License.  You must supply a copy of this License.  If the workduring execution displays copyright notices, you must include thecopyright notice for the Library among them, as well as a referencedirecting the user to the copy of this License.  Also, you must do oneof these things:
+
+    a) Accompany the work with the complete corresponding    machine-readable source code for the Library including whatever    changes were used in the work (which must be distributed under    Sections 1 and 2 above); and, if the work is an executable linked    with the Library, with the complete machine-readable "work that    uses the Library", as object code and/or source code, so that the    user can modify the Library and then relink to produce a modified    executable containing the modified Library.  (It is understood    that the user who changes the contents of definitions files in the    Library will not necessarily be able to recompile the application    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the    Library.  A suitable mechanism is one that (1) uses at run time a    copy of the library already present on the user's computer system,    rather than copying library functions into the executable, and (2)    will operate properly with a modified version of the library, if    the user installs one, as long as the modified version is    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at    least three years, to give the same user the materials    specified in Subsection 6a, above, for a charge no more    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy    from a designated place, offer equivalent access to copy the above    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses theLibrary" must include any data and utility programs needed forreproducing the executable from it.  However, as a special exception,the materials to be distributed need not include anything that isnormally distributed (in either source or binary form) with the majorcomponents (compiler, kernel, and so on) of the operating system onwhich the executable runs, unless that component itself accompaniesthe executable.
+
+  It may happen that this requirement contradicts the licenserestrictions of other proprietary libraries that do not normallyaccompany the operating system.  Such a contradiction means you cannotuse both them and the Library together in an executable that youdistribute.
+
+  7. You may place library facilities that are a work based on theLibrary side-by-side in a single library together with other libraryfacilities not covered by this License, and distribute such a combinedlibrary, provided that the separate distribution of the work based onthe Library and of the other library facilities is otherwisepermitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work    based on the Library, uncombined with any other library    facilities.  This must be distributed under the terms of the    Sections above.
+
+    b) Give prominent notice with the combined library of the fact    that part of it is a work based on the Library, and explaining    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distributethe Library except as expressly provided under this License.  Anyattempt otherwise to copy, modify, sublicense, link with, ordistribute the Library is void, and will automatically terminate yourrights under this License.  However, parties who have received copies,or rights, from you under this License will not have their licensesterminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have notsigned it.  However, nothing else grants you permission to modify ordistribute the Library or its derivative works.  These actions areprohibited by law if you do not accept this License.  Therefore, bymodifying or distributing the Library (or any work based on theLibrary), you indicate your acceptance of this License to do so, andall its terms and conditions for copying, distributing or modifyingthe Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on theLibrary), the recipient automatically receives a license from theoriginal licensor to copy, distribute, link with or modify the Librarysubject to these terms and conditions.  You may not impose any furtherrestrictions on the recipients' exercise of the rights granted herein.You are not responsible for enforcing compliance by third parties withthis License.
+
+  11. If, as a consequence of a court judgment or allegation of patentinfringement or for any other reason (not limited to patent issues),conditions are imposed on you (whether by court order, agreement orotherwise) that contradict the conditions of this License, they do notexcuse you from the conditions of this License.  If you cannotdistribute so as to satisfy simultaneously your obligations under thisLicense and any other pertinent obligations, then as a consequence youmay not distribute the Library at all.  For example, if a patentlicense would not permit royalty-free redistribution of the Library byall those who receive copies directly or indirectly through you, thenthe only way you could satisfy both it and this License would be torefrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under anyparticular circumstance, the balance of the section is intended to apply,and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe anypatents or other property right claims or to contest validity of anysuch claims; this section has the sole purpose of protecting theintegrity of the free software distribution system which isimplemented by public license practices.  Many people have madegenerous contributions to the wide range of software distributedthrough that system in reliance on consistent application of thatsystem; it is up to the author/donor to decide if he or she is willingto distribute software through any other system and a licensee cannotimpose that choice.
+
+This section is intended to make thoroughly clear what is believed tobe a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted incertain countries either by patents or by copyrighted interfaces, theoriginal copyright holder who places the Library under this License may addan explicit geographical distribution limitation excluding those countries,so that distribution is permitted only in or among countries not thusexcluded.  In such case, this License incorporates the limitation as ifwritten in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or newversions of the Lesser General Public License from time to time.Such new versions will be similar in spirit to the present version,but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Libraryspecifies a version number of this License which applies to it and"any later version", you have the option of following the terms andconditions either of that version or of any later version published bythe Free Software Foundation.  If the Library does not specify alicense version number, you may choose any version ever published bythe Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other freeprograms whose distribution conditions are incompatible with these,write to the author to ask for permission.  For software which iscopyrighted by the Free Software Foundation, write to the FreeSoftware Foundation; we sometimes make exceptions for this.  Ourdecision will be guided by the two goals of preserving the free statusof all derivatives of our free software and of promoting the sharingand reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NOWARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OROTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANYKIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THEIMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULARPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THELIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUMETHE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO INWRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFYAND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOUFOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL ORCONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THELIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEINGRENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR AFAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IFSUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCHDAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatestpossible use to the public, we recommend making it free software thateveryone can redistribute and change.  You can do so by permittingredistribution under these terms (or, alternatively, under the terms of theordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It issafest to attach them to the start of each source file to most effectivelyconvey the exclusion of warranty; and each file should have at least the"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or    modify it under the terms of the GNU Lesser General Public    License as published by the Free Software Foundation; either    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,    but WITHOUT ANY WARRANTY; without even the implied warranty of    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public    License along with this library; if not, write to the Free Software    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or yourschool, if any, to sign a "copyright disclaimer" for the library, ifnecessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990  Ty Coon, President of Vice
+
+That's all there is to it!
+
+
+
diff --git a/OSX_Resources/Welcome.html b/OSX_Resources/Welcome.html
new file mode 100644
index 0000000..1383d92
--- /dev/null
+++ b/OSX_Resources/Welcome.html
@@ -0,0 +1,23 @@
+<h2>About the OPeNDAP DAP2 C++ Library Package</h2>
+
+<p>This package contains the OPeNDAP C++ implementation of the Data
+Access Protocol version 2 (DAP2) with some extensions that will be
+part of DAP3. Documentation for this software can be found on the
+OPeNDAP home page at <tt>http://www.opendap.org/</tt>. The NASA/ESE
+RFC which describes DAP2, implemented by the library, can be found at
+<tt>http://www.esdswg.org/spg/rfc/ese-rfc-004</tt>.</p>
+
+<p>The DAP2 is used to provide a uniform way of accessing a variety of
+different types of data across the Internet. It was originally part of
+the DODS and then NVODS projects. The focus of those projects was
+access to Earth-Science data, so much of the software developed using
+the DAP2 to date has centered on that discipline. However, the DAP2
+data model is very general (and similar to a modern structured
+programming language) so it can be applied to a wide variety of
+fields.</p>
+
+<p>This package is required for many of the other Mac OS/X packages
+  OPeNDAP has written. By default it will use <tt>/usr</tt> as the
+  base directory for installation. If you change the default
+  installation prefix, be sure to modify the PATH environment variable
+  accordingly.</p>
diff --git a/OSX_Resources/background.jpg b/OSX_Resources/background.jpg
new file mode 100644
index 0000000..ef5e26b
Binary files /dev/null and b/OSX_Resources/background.jpg differ
diff --git a/OSX_Resources/macify_license_file.pl b/OSX_Resources/macify_license_file.pl
new file mode 100755
index 0000000..36e24d2
--- /dev/null
+++ b/OSX_Resources/macify_license_file.pl
@@ -0,0 +1,36 @@
+#!/usr/bin/perl
+#
+
+use strict 'vars';
+
+unix2mac("COPYING", "OSX_Resources/License.txt");
+
+# Read a textfile where each line is terminated by a newline and
+# paragraphs are terminated by an otherwise blank line. Write the text
+# out without those pesky line-terminating newlines.
+sub unix2mac {
+  my ($infile_name, $outfile_name) = @_;
+
+  open IN, $infile_name or die("Could not open $infile_name!\n");
+  open OUT, ">$outfile_name" 
+    or die("Could not open output for $outfile_name!\n");
+
+  my $code = 0;
+
+  while (<IN>) {
+    if ( /^<code>\s*$/ ) {
+      $code = 1;
+    } elsif ( /^<\/code>\s*$/ ) {
+      $code = 0;
+    } elsif ( $code eq 1 ) {
+      print OUT $_ ;
+    } elsif ( /^\s*$/ ) {
+      print OUT "\n\n" ;	# Blank line
+    } else {
+      chomp $_ ; print OUT $_ ; # Character line
+    }
+  }
+
+  close IN;
+  close OUT;
+}
diff --git a/OSX_Resources/update_mac_package_contents.pl b/OSX_Resources/update_mac_package_contents.pl
new file mode 100755
index 0000000..254dcbf
--- /dev/null
+++ b/OSX_Resources/update_mac_package_contents.pl
@@ -0,0 +1,43 @@
+#!/usr/bin/perl
+#
+
+use strict 'vars';
+my $debug = 0;
+
+my $readme = $ARGV[0];
+my $version_file = $ARGV[1];
+my $package_dir = $ARGV[2];
+
+unix2mac($readme, "OSX_Resources/ReadMe.txt");
+
+##################################################################
+# Read a textfile where each line is terminated by a newline and
+# paragraphs are terminated by an otherwise blank line. Write the text
+# out without those pesky line-terminating newlines.
+sub unix2mac {
+  my ($infile_name, $outfile_name) = @_;
+
+  open IN, $infile_name or die("Could not open $infile_name!\n");
+  open OUT, ">$outfile_name" 
+    or die("Could not open output for $outfile_name!\n");
+
+  my $code = 0;
+
+  while (<IN>) {
+    if ( /^<code>\s*$/ ) {
+      $code = 1;
+    } elsif ( /^<\/code>\s*$/ ) {
+      $code = 0;
+    } elsif ( $code eq 1 ) {
+      print OUT $_ ;
+    } elsif ( /^\s*$/ ) {
+      print OUT "\n\n" ;	# Blank line
+    } else {
+      # the [\015] is the DOS ^M character.
+      chomp $_ ; tr/[\015]/ / ; print OUT $_ ; # Character line
+    }
+  }
+
+  close IN;
+  close OUT;
+}
diff --git a/ObjectType.h b/ObjectType.h
new file mode 100644
index 0000000..0cef35a
--- /dev/null
+++ b/ObjectType.h
@@ -0,0 +1,75 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003,2013 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#ifndef _object_type_h
+#define _object_type_h
+
+namespace libdap
+{
+
+/** When a version 2.x or greater DAP data server sends an object, it may use
+    the Content-Description header of the response to indicate the type of
+    object contained in the response.
+
+    <pre>
+     enum ObjectType {
+       unknown_type,
+       dods_das,
+       dods_dds,
+       dods_data,
+       dods_ddx,
+       dods_data_ddx,
+       dods_error,
+       web_error,
+
+       dap4_dmr,
+       dap4_data,
+       dap4_error,
+     };
+     </pre>
+
+    @note If this is cjanged, update the char* array 'descrip' in mime_util.h.
+
+    @brief The type of object in the stream coming from the data
+    server.  */
+
+enum ObjectType {
+    unknown_type,
+    dods_das,
+    dods_dds,
+    dods_data,
+    dods_ddx,	   	// This is the old XML DDS/DAS used prior to dap4
+    dods_data_ddx,	// This is used for caching data responses
+    dods_error,
+    web_error,
+
+    dap4_dmr,		// DAP4 metadata
+    dap4_data,		// The DMR with a data blob
+    dap4_error		// The error response for DAP4
+};
+
+} // namespace libdap
+
+#endif
diff --git a/Operators.h b/Operators.h
new file mode 100644
index 0000000..1209dfa
--- /dev/null
+++ b/Operators.h
@@ -0,0 +1,183 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// Templates for relational operations.
+//
+// jhrg 3/24/99
+
+#ifndef _operators_h
+#define _operators_h
+
+#include "GNURegex.h"  // GNU Regex class used for string =~ op.
+#include "ce_expr.tab.hh"
+
+namespace libdap {
+
+/** Compare two numerical types, both of which are either signed or unsigned.
+ This class is one implementation of the comparison policy used by
+ rops.
+
+ @see rops
+ @see USCmp
+ @see SUCmp */
+template<class T1, class T2>
+bool Cmp(int op, T1 v1, T2 v2)
+{
+	DBGN(cerr << __PRETTY_FUNCTION__ << v1 << " " << op << " " << v2 << endl);
+
+    switch (op) {
+        case SCAN_EQUAL:
+            return v1 == v2;
+        case SCAN_NOT_EQUAL:
+            return v1 != v2;
+        case SCAN_GREATER:
+            return v1 > v2;
+        case SCAN_GREATER_EQL:
+            return v1 >= v2;
+        case SCAN_LESS:
+            return v1 < v2;
+        case SCAN_LESS_EQL:
+            return v1 <= v2;
+        case SCAN_REGEXP:
+            throw Error(malformed_expr, "Regular expressions are supported for strings only.");
+        default:
+            throw Error(malformed_expr, "Unrecognized operator.");
+    }
+}
+
+template<class T>
+static inline unsigned long long dap_floor_zero(T i)
+{
+    return (unsigned long long) ((i < 0) ? 0 : i);
+}
+
+/** Compare two numerical types, the first one unsigned and the second
+ signed. If the signed argument is negative, zero is used in the
+ comparison. This class is one implementation of the comparison policy
+ used by rops.
+
+ @see rops
+ @see SUCmp
+ @see Cmp */
+template<class UT1, class T2>
+bool USCmp(int op, UT1 v1, T2 v2)
+{
+	DBGN(cerr << __PRETTY_FUNCTION__ << v1 << " " << op << " " << v2 << endl);
+
+    switch (op) {
+        case SCAN_EQUAL:
+            return v1 == dap_floor_zero<T2>(v2);
+        case SCAN_NOT_EQUAL:
+            return v1 != dap_floor_zero<T2>(v2);
+        case SCAN_GREATER:
+            return v1 > dap_floor_zero<T2>(v2);
+        case SCAN_GREATER_EQL:
+            return v1 >= dap_floor_zero<T2>(v2);
+        case SCAN_LESS:
+            return v1 < dap_floor_zero<T2>(v2);
+        case SCAN_LESS_EQL:
+            return v1 <= dap_floor_zero<T2>(v2);
+        case SCAN_REGEXP:
+            throw Error(malformed_expr, "Regular expressions are supported for strings only.");
+        default:
+            throw Error(malformed_expr, "Unrecognized operator.");
+    }
+}
+
+/** Compare two numerical types, the first one signed and the second
+ unsigned. If the signed argument is negative, zero is used in the
+ comparison. This class is one implementation of the comparison policy
+ used by rops. This class is here to make writing the Byte::ops, ...
+ member functions simpler. It is not necessary since the functions could
+ twidle the order of arguments to rops and use <tt>USCmp</tt>. Having
+ this class make Byte:ops, ... simpler to read and write.
+
+ @see Byte::ops
+ @see USCmp
+ @see Cmp
+ @see ops */
+template<class T1, class UT2>
+bool SUCmp(int op, T1 v1, UT2 v2)
+{
+	DBGN(cerr << __PRETTY_FUNCTION__ << v1 << " " << op << " " << v2 << endl);
+
+    switch (op) {
+        case SCAN_EQUAL:
+            return dap_floor_zero<T1>(v1) == v2;
+        case SCAN_NOT_EQUAL:
+            return dap_floor_zero<T1>(v1) != v2;
+        case SCAN_GREATER:
+            return dap_floor_zero<T1>(v1) > v2;
+        case SCAN_GREATER_EQL:
+            return dap_floor_zero<T1>(v1) >= v2;
+        case SCAN_LESS:
+            return dap_floor_zero<T1>(v1) < v2;
+        case SCAN_LESS_EQL:
+            return dap_floor_zero<T1>(v1) <= v2;
+        case SCAN_REGEXP:
+            throw Error(malformed_expr, "Regular expressions are supported for strings only.");
+        default:
+            throw Error(malformed_expr, "Unrecognized operator.");
+    }
+}
+
+/** Compare two string types.
+ This class is one implementation of the comparison policy used by
+ rops.
+
+ @see rops */
+template<class T1, class T2>
+bool StrCmp(int op, T1 v1, T2 v2)
+{
+    switch (op) {
+        case SCAN_EQUAL:
+            return v1 == v2;
+        case SCAN_NOT_EQUAL:
+            return v1 != v2;
+        case SCAN_GREATER:
+            return v1 > v2;
+        case SCAN_GREATER_EQL:
+            return v1 >= v2;
+        case SCAN_LESS:
+            return v1 < v2;
+        case SCAN_LESS_EQL:
+            return v1 <= v2;
+        case SCAN_REGEXP: {
+            Regex r(v2.c_str());
+            return r.match(v1.c_str(), v1.length()) > 0;
+        }
+        default:
+            throw Error(malformed_expr, "Unrecognized operator.");
+    }
+}
+
+} // namespace libdap
+
+#endif // _operators_h
diff --git a/PipeResponse.h b/PipeResponse.h
new file mode 100644
index 0000000..2e148d7
--- /dev/null
+++ b/PipeResponse.h
@@ -0,0 +1,92 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#ifndef pipe_response_h
+#define pipe_response_h
+
+#include <cstdio>
+
+#ifndef response_h
+#include "Response.h"
+#endif
+
+#ifndef _debug_h
+#include "debug.h"
+#endif
+
+using namespace std;
+
+namespace libdap
+{
+
+/** @brief Encapsulate a response.
+    This class provides special treatment for 'stream pipes.' It arranges
+    to close them using pclose() instead of fclose(). */
+class PipeResponse: public Response
+{
+private:
+    FILE *d_pstream;
+
+protected:
+
+public:
+    /** @brief Initialize with a stream returned by popen().
+      
+        Create an instance initialized to a stream returned by
+	popen(). By default get_type() and get_version() return
+	default values of unknown_type and "dods/0.0", respectively.
+	Note that this class closes the stream.
+        
+        @note Since Unix provides no easy way to differentiate between a 
+        FILE* returned by fopen() or popen(), you're on your own here. Make
+        sure you use the correct type of FILE Pointer. 
+        
+        @see Response
+        
+        @param s Pointer to a pipe stream returned by popen().
+        */
+    PipeResponse(FILE *s) : Response(0), d_pstream(s)
+    {}
+
+    /** Close the stream. */
+    virtual ~PipeResponse()
+    {
+        if (d_pstream)
+            pclose(d_pstream);
+    }
+
+    virtual FILE *get_stream() const
+    {
+        return d_pstream;
+    }
+    virtual void set_stream(FILE *s)
+    {
+        d_pstream = s;
+    }
+};
+
+} // namespace libdap
+
+#endif // pipe_response_h
diff --git a/RCReader.cc b/RCReader.cc
new file mode 100644
index 0000000..237385e
--- /dev/null
+++ b/RCReader.cc
@@ -0,0 +1,474 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: Jose Garcia <jgarcia@ucar.edu>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 2001,2002
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+// jose Jose Garcia <jgarcia@ucar.edu>
+
+/** A singleton which reads and parses the .dodsrc file. This code was
+ extracted from Connect (which has since changed considerably).
+
+ @author: jose */
+
+// #define DODS_DEBUG
+#include "config.h"
+
+#include <cstring>
+#include <cstdlib>
+
+#include <unistd.h>  // for stat
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#ifdef WIN32
+#define FALSE 0
+// Win32 does not define F_OK. 08/21/02 jhrg
+#define F_OK 0
+#define DIR_SEP_STRING "\\"
+#define DIR_SEP_CHAR   '\\'
+#include <direct.h>
+#else
+#define DIR_SEP_STRING "/"
+#define DIR_SEP_CHAR   '/'
+#endif
+
+#include <pthread.h>
+
+#include <fstream>
+
+#include "debug.h"
+#include "RCReader.h"
+#include "Error.h"
+
+using namespace std;
+
+namespace libdap {
+
+RCReader* RCReader::_instance = 0;
+
+// This variable (instance_control) is used to ensure that in a MT
+// environment _instance is correctly initialized. See the get_instance
+// method. 08/07/02 jhrg
+static pthread_once_t instance_control = PTHREAD_ONCE_INIT;
+
+/** Using values from this instance of RCReader, write out values for a
+ default .dodsrc file. Nominally this will use the defaults for each thing
+ that might be read from the configuration file. */
+
+bool RCReader::write_rc_file(const string &pathname)
+{
+    DBG(cerr << "Writing the RC file to " << pathname << endl);
+    ofstream fpo(pathname.c_str());
+
+    // If the file couldn't be created.  Nothing needs to be done here,
+    // the program will simply use the defaults.
+
+    if (fpo) {
+        // This means we just created the file.  We will now save
+        // the defaults in it for future use.
+        fpo << "# OPeNDAP client configuration file. See the OPeNDAP" << endl;
+        fpo << "# users guide for information." << endl;
+        fpo << "USE_CACHE=" << _dods_use_cache << endl;
+        fpo << "# Cache and object size are given in megabytes (20 ==> 20Mb)." << endl;
+        fpo << "MAX_CACHE_SIZE=" << _dods_cache_max << endl;
+        fpo << "MAX_CACHED_OBJ=" << _dods_cached_obj << endl;
+        fpo << "IGNORE_EXPIRES=" << _dods_ign_expires << endl;
+        fpo << "CACHE_ROOT=" << d_cache_root << endl;
+        fpo << "DEFAULT_EXPIRES=" << _dods_default_expires << endl;
+        fpo << "ALWAYS_VALIDATE=" << _dods_always_validate << endl;
+        fpo << "# Request servers compress responses if possible?" << endl;
+        fpo << "# 1 (yes) or 0 (false)." << endl;
+        fpo << "DEFLATE=" << _dods_deflate << endl;
+
+        fpo << "# Should SSL certificates and hosts be validated? SSL" << endl;
+        fpo << "# will only work with signed certificates." << endl;
+        fpo << "VALIDATE_SSL=" << d_validate_ssl << endl;
+
+        fpo << "# Proxy configuration (optional parts in []s)." << endl;
+        fpo << "# You may also use the 'http_proxy' environment variable" << endl;
+        fpo << "# but a value in this file will override that env variable." << endl;
+        fpo << "# PROXY_SERVER=[http://][username:password@]host[:port]" << endl;
+        if (!d_dods_proxy_server_host.empty()) {
+            fpo << "PROXY_SERVER=" << d_dods_proxy_server_protocol << "://"
+                    << (d_dods_proxy_server_userpw.empty() ? "" : d_dods_proxy_server_userpw + "@")
+                            + d_dods_proxy_server_host + ":" + long_to_string(d_dods_proxy_server_port) << endl;
+        }
+
+        fpo << "# NO_PROXY_FOR=<host|domain>" << endl;
+        if (!d_dods_no_proxy_for_host.empty()) {
+            fpo << "NO_PROXY_FOR=" << d_dods_no_proxy_for_host << endl;
+        }
+
+        fpo << "# AIS_DATABASE=<file or url>" << endl;
+
+        fpo << "# COOKIE_JAR=.dods_cookies" << endl;
+        fpo << "# The cookie jar is a file that holds cookies sent from" << endl;
+        fpo << "# servers such as single signon systems. Uncomment this" << endl;
+        fpo << "# option and provide a file name to activate this feature." << endl;
+        fpo << "# If the value is a filename, it will be created in this" << endl;
+        fpo << "# directory; a full pathname can be used to force a specific" << endl;
+        fpo << "# location." << endl;
+
+        fpo.close();
+        return true;
+    }
+
+    return false;
+}
+
+bool RCReader::read_rc_file(const string &pathname)
+{
+    DBG(cerr << "Reading the RC file from " << pathname << endl);
+
+    ifstream fpi(pathname.c_str());
+    if (fpi) {
+        // The file exists and we may now begin to parse it.
+        // Defaults are already stored in the variables, if the correct
+        // tokens are found in the file then those defaults will be
+        // overwritten.
+        char *value;
+        // TODO Replace with a vector<char>
+        //char *tempstr = new char[1024];
+        vector<char> tempstr(1024);
+        int tokenlength;
+        while (true) {
+            fpi.getline(&tempstr[0], 1023);
+            if (!fpi.good()) break;
+
+            value = strchr(&tempstr[0], '=');
+            if (!value) continue;
+            tokenlength = value - &tempstr[0];
+            value++;
+
+            if ((strncmp(&tempstr[0], "USE_CACHE", 9) == 0) && tokenlength == 9) {
+                _dods_use_cache = atoi(value) ? true : false;
+            }
+            else if ((strncmp(&tempstr[0], "MAX_CACHE_SIZE", 14) == 0) && tokenlength == 14) {
+                _dods_cache_max = atoi(value);
+            }
+            else if ((strncmp(&tempstr[0], "MAX_CACHED_OBJ", 14) == 0) && tokenlength == 14) {
+                _dods_cached_obj = atoi(value);
+            }
+            else if ((strncmp(&tempstr[0], "IGNORE_EXPIRES", 14) == 0) && tokenlength == 14) {
+                _dods_ign_expires = atoi(value);
+            }
+            else if ((strncmp(&tempstr[0], "DEFLATE", 7) == 0) && tokenlength == 7) {
+                _dods_deflate = atoi(value) ? true : false;
+            }
+            else if ((strncmp(&tempstr[0], "CACHE_ROOT", 10) == 0) && tokenlength == 10) {
+                d_cache_root = value;
+                if (d_cache_root[d_cache_root.length() - 1] != DIR_SEP_CHAR) d_cache_root += string(DIR_SEP_STRING);
+            }
+            else if ((strncmp(&tempstr[0], "DEFAULT_EXPIRES", 15) == 0) && tokenlength == 15) {
+                _dods_default_expires = atoi(value);
+            }
+            else if ((strncmp(&tempstr[0], "ALWAYS_VALIDATE", 15) == 0) && tokenlength == 15) {
+                _dods_always_validate = atoi(value);
+            }
+            else if ((strncmp(&tempstr[0], "VALIDATE_SSL", 12) == 0) && tokenlength == 12) {
+                d_validate_ssl = atoi(value);
+            }
+            else if (strncmp(&tempstr[0], "AIS_DATABASE", 12) == 0 && tokenlength == 12) {
+                d_ais_database = value;
+            }
+            else if (strncmp(&tempstr[0], "COOKIE_JAR", 10) == 0 && tokenlength == 10) {
+                // if the value of COOKIE_JAR starts with a slash, use it as
+                // is. However, if it does not start with a slash, prefix it
+                // with the directory that contains the .dodsrc file.
+                if (value[0] == '/') {
+                    d_cookie_jar = value;
+                }
+                else {
+                    d_cookie_jar = d_rc_file_path.substr(0, d_rc_file_path.find(".dodsrc")) + string(value);
+                } DBG(cerr << "set cookie jar to: " << d_cookie_jar << endl);
+            }
+            else if ((strncmp(&tempstr[0], "PROXY_SERVER", 12) == 0) && tokenlength == 12) {
+                // Setup a proxy server for all requests.
+                // The original syntax was <protocol>,<machine> where the
+                // machine could also contain the user/pass and port info.
+                // Support that but also support machine prefixed by
+                // 'http://' with and without the '<protocol>,' prefix. jhrg
+                // 4/21/08 (see bug 1095).
+                string proxy = value;
+                string::size_type comma = proxy.find(',');
+
+                // Since the <protocol> is now optional, the comma might be
+                // here. If it is, check that the protocol given is http.
+                if (comma != string::npos) {
+                    d_dods_proxy_server_protocol = proxy.substr(0, comma);
+                    downcase(d_dods_proxy_server_protocol);
+                    if (d_dods_proxy_server_protocol != "http")
+                        throw Error("The only supported protocol for a proxy server is \"HTTP\". Correct your \".dodsrc\" file.");
+                    proxy = proxy.substr(comma + 1);
+                }
+                else {
+                    d_dods_proxy_server_protocol = "http";
+                }
+
+                // Look for a 'protocol://' prefix; skip if found
+                string::size_type protocol = proxy.find("://");
+                if (protocol != string::npos) {
+                    proxy = proxy.substr(protocol + 3);
+                }
+
+                // Break apart into userpw, host and port.
+                string::size_type at_sign = proxy.find('@');
+                if (at_sign != string::npos) { // has userpw
+                    d_dods_proxy_server_userpw = proxy.substr(0, at_sign);
+                    proxy = proxy.substr(at_sign + 1);
+                }
+                else
+                    d_dods_proxy_server_userpw = "";
+
+                // Get host and look for a port number
+                string::size_type colon = proxy.find(':');
+                if (colon != string::npos) {
+                    d_dods_proxy_server_host = proxy.substr(0, colon);
+                    d_dods_proxy_server_port = strtol(proxy.substr(colon + 1).c_str(), 0, 0);
+                }
+                else {
+                    d_dods_proxy_server_host = proxy;
+                    d_dods_proxy_server_port = 80;
+                }
+            }
+            else if ((strncmp(&tempstr[0], "NO_PROXY_FOR", 12) == 0) && tokenlength == 12) {
+                // Setup a proxy server for all requests.
+                string no_proxy = value;
+                string::size_type comma = no_proxy.find(',');
+
+                // Since the protocol is required, the comma *must* be
+                // present. We could throw an Error on the malformed line...
+                if (comma == string::npos) {
+                    d_dods_no_proxy_for_protocol = "http";
+                    d_dods_no_proxy_for_host = no_proxy;
+                    d_dods_no_proxy_for = true;
+                }
+                else {
+                    d_dods_no_proxy_for_protocol = no_proxy.substr(0, comma);
+                    d_dods_no_proxy_for_host = no_proxy.substr(comma + 1);
+                    d_dods_no_proxy_for = true;
+                }
+            }
+        }
+
+        //delete [] tempstr; tempstr = 0;
+
+        fpi.close(); // Close the .dodsrc file. 12/14/99 jhrg
+
+        return true;
+    }  // End of cache file parsing.
+
+    return false;
+}
+
+// Helper for check_env_var(). This is its main logic, separated out for the
+// cases under WIN32 where we don't use an environment variable.  09/19/03
+// jhrg
+string RCReader::check_string(string env_var)
+{
+    DBG(cerr << "Entering check_string... (" << env_var << ")" << endl);
+    struct stat stat_info;
+
+    if (stat(env_var.c_str(), &stat_info) != 0) {
+        DBG(cerr << "stat returned non-zero" << endl);
+        return "";  // ENV VAR not a file or dir, bail
+    }
+
+    if (S_ISREG(stat_info.st_mode)) {
+        DBG(cerr << "S_ISREG: " << S_ISREG(stat_info.st_mode) << endl);
+        return env_var;  // ENV VAR is a file, use it
+    }
+
+    // ENV VAR is a directory, does it contain .dodsrc? Can we create
+    // .dodsrc if it's not there?
+    if (S_ISDIR(stat_info.st_mode)) {
+        DBG(cerr << "S_ISDIR: " << S_ISDIR(stat_info.st_mode) << endl);
+        if (*env_var.rbegin() != DIR_SEP_CHAR) // Add trailing / if missing
+            env_var += DIR_SEP_STRING;
+        // Trick: set d_cache_root here in case we're going to create the
+        // .dodsrc later on. If the .dodsrc file exists, its value will
+        // overwrite this value, if not write_rc_file() will use the correct
+        // value. 09/19/03 jhrg
+        d_cache_root = env_var + string(".dods_cache") + DIR_SEP_STRING;
+        env_var += ".dodsrc";
+        if (stat(env_var.c_str(), &stat_info) == 0 && S_ISREG(stat_info.st_mode)) {
+            DBG(cerr << "Found .dodsrc in \"" << env_var << "\"" << endl);
+            return env_var; // Found .dodsrc in ENV VAR
+        }
+
+        // Didn't find .dodsrc in ENV VAR and ENV VAR is a directory; try to
+        // create it. Note write_rc_file uses d_cache_root (set above) when
+        // it creates the RC file's contents.
+        if (write_rc_file(env_var)) {
+            DBG(cerr << "Wrote .dodsrc in \"" << env_var << "\"" << endl);
+            return env_var;
+        }
+    }
+
+    // If we're here, then we've neither found nor created the RC file.
+    DBG(cerr << "could neither find nor create a .dodsrc file" << endl);
+    return "";
+}
+
+/** Examine an environment variable. If the env variable is set, then if
+ this is the name of a file, use that as the name of the RC file. If this
+ is the name of a directory, look in that directory for a file called
+ .dodsrc. If there's no such file, create it using default values for its
+ parameters. In the last case, write the .dodsrc so that the .dods_cache
+ directory is located in the directory named by DODS_CONF.
+
+ @return The pathname to the RC file or "" if another variable/method
+ should be used to find/create the RC file. */
+string RCReader::check_env_var(const string &variable_name)
+{
+    char *ev = getenv(variable_name.c_str());
+    if (!ev || strlen(ev) == 0) return "";
+
+    return check_string(ev);
+}
+
+RCReader::RCReader() // throw (Error) jhrg 7/2/15
+{
+    d_rc_file_path = "";
+    d_cache_root = "";
+
+    // ** Set default values **
+    // Users must explicitly turn caching on.
+    _dods_use_cache = false;
+    _dods_cache_max = 20;
+    _dods_cached_obj = 5;
+    _dods_ign_expires = 0;
+    _dods_default_expires = 86400;
+    _dods_always_validate = 0;
+
+    _dods_deflate = 0;
+    d_validate_ssl = 1;
+
+    //flags for PROXY_SERVER=<protocol>,<host url>
+    // New syntax PROXY_SERVER=[http://][user:pw@]host[:port]
+    d_dods_proxy_server_protocol = "";
+    d_dods_proxy_server_host = "";
+    d_dods_proxy_server_port = 0;
+    d_dods_proxy_server_userpw = "";
+
+    _dods_proxy_server_host_url = ""; // deprecated
+
+    // PROXY_FOR is deprecated.
+    // flags for PROXY_FOR=<regex>,<proxy host url>,<flags>
+    _dods_proxy_for = false; // true if proxy_for is used.
+    _dods_proxy_for_regexp = "";
+    _dods_proxy_for_proxy_host_url = "";
+    _dods_proxy_for_regexp_flags = 0;
+
+    //flags for NO_PROXY_FOR=<protocol>,<host>,<port>
+    // New syntax NO_PROXY_FOR=<host|domain>
+    d_dods_no_proxy_for = false;
+    d_dods_no_proxy_for_protocol = ""; // deprecated
+    d_dods_no_proxy_for_host = "";
+    // default to port 0 if not specified. This means all ports. Using 80
+    // will fail when the URL does not contain the port number. That's
+    // probably a bug in libwww. 10/23/2000 jhrg
+    _dods_no_proxy_for_port = 0; // deprecated
+
+    d_cookie_jar = "";
+
+#ifdef WIN32
+    string homedir = string("C:") + string(DIR_SEP_STRING) + string("Dods");
+    d_rc_file_path = check_string(homedir);
+    if (d_rc_file_path.empty()) {
+        homedir = string("C:") + string(DIR_SEP_STRING) + string("opendap");
+        d_rc_file_path = check_string(homedir);
+    }
+    //  Normally, I'd prefer this for WinNT-based systems.
+    if (d_rc_file_path.empty())
+    d_rc_file_path = check_env_var("APPDATA");
+    if (d_rc_file_path.empty())
+    d_rc_file_path = check_env_var("TEMP");
+    if (d_rc_file_path.empty())
+    d_rc_file_path = check_env_var("TMP");
+#else
+    d_rc_file_path = check_env_var("DODS_CONF");
+    if (d_rc_file_path.empty()) d_rc_file_path = check_env_var("HOME");
+#endif
+    DBG(cerr << "Looking for .dodsrc in: " << d_rc_file_path << endl);
+
+    if (!d_rc_file_path.empty()) read_rc_file(d_rc_file_path);
+}
+
+RCReader::~RCReader()
+{
+}
+
+/** Static void private method. */
+void RCReader::delete_instance()
+{
+    if (RCReader::_instance) {
+        delete RCReader::_instance;
+        RCReader::_instance = 0;
+    }
+}
+
+/** Static void private method. */
+void RCReader::initialize_instance()
+{
+    DBGN(cerr << "RCReader::initialize_instance() ... ");
+
+    RCReader::_instance = new RCReader;
+    atexit(RCReader::delete_instance);
+
+    DBG(cerr << "exiting." << endl);
+}
+
+RCReader*
+RCReader::instance()
+{
+    DBG(cerr << "Entring RCReader::instance" << endl);
+    // The instance_control variable is defined at the top of this file.
+    // 08/07/02 jhrg
+    pthread_once(&instance_control, initialize_instance);
+
+    DBG(cerr << "Instance value: " << hex << _instance << dec << endl);
+
+    return _instance;
+}
+
+#if 0
+RCReader*
+RCReader::instance(const string &rc_file_path)
+{
+    DBG(cerr << "Entring RCReader::instance" << endl);
+
+    d_rc_file_path = rc_file_path;
+    // The instance_control variable is defined at the top of this file.
+    // 08/07/02 jhrg
+    pthread_once(&instance_control, initialize_instance);
+
+    DBG(cerr << "Instance value: " << hex << _instance << dec << endl);
+
+    return _instance;
+}
+#endif
+} // namespace libdap
diff --git a/RCReader.h b/RCReader.h
new file mode 100644
index 0000000..e6afe48
--- /dev/null
+++ b/RCReader.h
@@ -0,0 +1,362 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: Jose Garcia <jgarcia@ucar.edu>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 2001-2002
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//         jose  Jose Garcia <jgarcia@ucar.edu>
+
+#ifndef _rc_reader_h_
+#define _rc_reader_h_
+
+#include <iostream>
+#include <string>
+
+#include "Error.h"
+#include "util.h"
+
+using namespace std;
+
+namespace libdap
+{
+
+/** Read the .dodsrc file. By default the file ~/.dodsrc is read. If the
+    environment variable DODS_CONF is set, use that value as the pathname to
+    the configuration file. Else, if the environment variable DODS_CACHE_INIT
+    is set, use that value.
+
+    NB: DODS_CACHE_INIT is deprecated and may be removed in the future.
+
+    @author Jose Garcia <jgarcia@ucar.edu> */
+class RCReader
+{
+private:
+    string d_rc_file_path;
+    string d_cache_root;
+
+    bool _dods_use_cache; // 0- Disabled 1- Enabled
+    unsigned int _dods_cache_max; // Max cache size in Mbytes
+    unsigned int _dods_cached_obj; // Max cache entry size in Mbytes
+    int _dods_ign_expires; // 0- Honor expires 1- Ignore them
+
+    // NB: NEVER_DEFLATE: I added this (12/1/99 jhrg) because libwww 5.2.9
+    // cannot process compressed (i.e., deflated) documents in the cache.
+    // Users must be able to choose whether they want compressed data that
+    // will always be refreshed or uncompressed data that will be cached.
+    // When set this flag overrides the value passed into the Connect
+    // object's constructor. This gives users control over the value.
+    // Previously, this could only be set by the program that called
+    // Connect(...). Note that I've now (4/6/2000 jhrg) fixed libwww so this
+    // parameter is no longer needed.111
+    //
+    // Added back in, but with a better name (removed double negative).
+    // 6/27/2002 jhrg
+    bool _dods_deflate;  // 1- request comp responses, 0- don't
+
+    int _dods_default_expires; // 24 hours in seconds
+    int _dods_always_validate; // Let libwww decide by default so set to 0
+
+    // flags for PROXY_SERVER=<protocol>,<host url>
+    string d_dods_proxy_server_protocol;
+    string d_dods_proxy_server_host;
+    int d_dods_proxy_server_port;
+    string d_dods_proxy_server_userpw;
+
+    // Should libcurl validate SSL hosts/certificates"
+    int d_validate_ssl;
+
+    string _dods_proxy_server_host_url; // deprecated
+
+    // The proxy-for stuff is all deprecated. 06/17/04 jhrg
+    // flags for PROXY_FOR=<regex>,<proxy host url>,<flags>
+    bool _dods_proxy_for; // true if proxy_for is used.
+    string _dods_proxy_for_regexp;
+    string _dods_proxy_for_proxy_host_url;
+    int _dods_proxy_for_regexp_flags; // not used w/libcurl. 6/27/2002 jhrg
+
+    //flags for NO_PROXY_FOR=<protocol>,<host>,<port>
+    bool d_dods_no_proxy_for; // true if no_proxy_for is used.
+    string d_dods_no_proxy_for_protocol;
+    string d_dods_no_proxy_for_host;
+    int _dods_no_proxy_for_port; // not used w/libcurl. 6/27/2002 jhrg
+
+    // Make this a vector of strings or support a PATH-style list. 02/26/03
+    // jhrg
+    string d_ais_database;
+
+    string d_cookie_jar;
+
+    static RCReader* _instance;
+
+    RCReader();
+    ~RCReader();
+
+    // File I/O methods
+    bool write_rc_file(const string &pathname);
+    bool read_rc_file(const string &pathname);
+
+    // Look for the RC file
+    string check_env_var(const string &variable_name);
+    string check_string(string env_var);
+
+    static void initialize_instance();
+    static void delete_instance();
+
+    friend class RCReaderTest;
+    friend class HTTPConnectTest;
+
+public:
+    static RCReader* instance();
+#if 0
+    static RCReader* instance(const string &rc_file_path);
+#endif
+    // GET METHODS
+    string get_dods_cache_root() const throw()
+    {
+        return d_cache_root;
+    }
+    bool get_use_cache() const throw()
+    {
+        return _dods_use_cache;
+    }
+    int get_max_cache_size()  const throw()
+    {
+        return _dods_cache_max;
+    }
+    unsigned int get_max_cached_obj() const throw()
+    {
+        return _dods_cached_obj;
+    }
+    int get_ignore_expires() const throw()
+    {
+        return _dods_ign_expires;
+    }
+    int get_default_expires() const throw()
+    {
+        return _dods_default_expires;
+    }
+    int get_always_validate() const throw()
+    {
+        return _dods_always_validate;
+    }
+    int get_validate_ssl() const throw()
+    {
+        return d_validate_ssl;
+    }
+
+    bool get_deflate() const throw()
+    {
+        return _dods_deflate;
+    }
+
+    /// Get the proxy server protocol
+    string get_proxy_server_protocol() const throw()
+    {
+        return d_dods_proxy_server_protocol;
+    }
+    /// Get the proxy host
+    string get_proxy_server_host() const throw()
+    {
+        return d_dods_proxy_server_host;
+    }
+    /// Get the proxy port
+    int get_proxy_server_port() const throw()
+    {
+        return d_dods_proxy_server_port;
+    }
+    /// Get the proxy username and password
+    string get_proxy_server_userpw() const throw()
+    {
+        return d_dods_proxy_server_userpw;
+    }
+    /// @deprecated
+    string get_proxy_server_host_url() const throw()
+    {
+        return (d_dods_proxy_server_userpw.empty() ? "" : d_dods_proxy_server_userpw + "@")
+               + d_dods_proxy_server_host
+               + ":" + long_to_string(d_dods_proxy_server_port);
+    }
+
+    // The whole regex/proxy-for implementation needs reworking. We really
+    // need a vector of structs which hold the information on a set of regexes
+    // and matching proxies. Then in the code that derefs a URL, we should
+    // check to see if the URL matches any of the regexs, et cetera. I'm
+    // going to disable the entire feature and see if anyone complains. If
+    // they do, we can fix it. If not, one less thing to do... 06/17/04 jhrg
+    /// @deprecated
+    bool is_proxy_for_used() throw()
+    {
+        return _dods_proxy_for;
+    }
+    /// @deprecated
+    string get_proxy_for_regexp() const throw()
+    {
+        return _dods_proxy_for_regexp;
+    }
+    /// @deprecated
+    string get_proxy_for_proxy_host_url() const throw()
+    {
+        return _dods_proxy_for_proxy_host_url;
+    }
+
+    /// @deprecated
+    int get_proxy_for_regexp_flags() const throw()
+    {
+        return _dods_proxy_for_regexp_flags;
+    }
+
+    // The whole no_proxy implementation also needs a rewrite. However, it is
+    // useful as it is since the user can give a domain and there's often a
+    // real need for suppressing proxy access for the local domain. The
+    // ..._port() method is bogus, however, so it is deprecated. There's no
+    // code that uses it. 06/17/04 jhrg
+    bool is_no_proxy_for_used() throw()
+    {
+        return d_dods_no_proxy_for;
+    }
+    string get_no_proxy_for_protocol() const throw()
+    {
+        return d_dods_no_proxy_for_protocol;
+    }
+    string get_no_proxy_for_host() const throw()
+    {
+        return d_dods_no_proxy_for_host;
+    }
+
+    /// @deprecated
+    int    get_no_proxy_for_port() const throw()
+    {
+        return _dods_no_proxy_for_port;
+    }
+
+    string get_ais_database() const throw()
+    {
+        return d_ais_database;
+    }
+
+    string get_cookie_jar() const throw()
+    {
+	return d_cookie_jar;
+    }
+
+    // SET METHODS
+    void set_use_cache(bool b) throw()
+    {
+        _dods_use_cache = b;
+    }
+    void set_max_cache_size(int i) throw()
+    {
+        _dods_cache_max = i;
+    }
+    void set_max_cached_obj(int i) throw()
+    {
+        _dods_cached_obj = i;
+    }
+    void set_ignore_expires(int i) throw()
+    {
+        _dods_ign_expires = i;
+    }
+    void set_default_expires(int i) throw()
+    {
+        _dods_default_expires = i;
+    }
+    void set_always_validate(int i) throw()
+    {
+        _dods_always_validate = i;
+    }
+    void set_validate_ssl(int i) throw()
+    {
+        d_validate_ssl = i;
+    }
+
+    void set_deflate(bool b) throw()
+    {
+        _dods_deflate = b;
+    }
+
+    void set_proxy_server_protocol(const string &s) throw()
+    {
+        d_dods_proxy_server_protocol = s;
+    }
+    void set_proxy_server_host(const string &s) throw()
+    {
+        d_dods_proxy_server_host = s;
+    }
+    void set_proxy_server_port(int l) throw()
+    {
+        d_dods_proxy_server_port = l;
+    }
+    void set_proxy_server_userpw(const string &s) throw()
+    {
+        d_dods_proxy_server_userpw = s;
+    }
+
+    /// @deprecated
+    void set_proxy_server_host_url(const string &s) throw()
+    {
+        _dods_proxy_server_host_url = s;
+    }
+
+    /// @deprecated
+    void set_proxy_for_regexp(const string &s) throw()
+    {
+        _dods_proxy_for_regexp = s;
+    }
+    /// @deprecated
+    void set_proxy_for_proxy_host_url(const string &s) throw()
+    {
+        _dods_proxy_for_proxy_host_url = s;
+    }
+    /// @deprecated
+    void set_proxy_for_regexp_flags(int i) throw()
+    {
+        _dods_proxy_for_regexp_flags = i;
+    }
+
+    void set_no_proxy_for_protocol(const string &s) throw()
+    {
+        d_dods_no_proxy_for_protocol = s;
+    }
+    void set_no_proxy_for_host(const string &s) throw()
+    {
+        d_dods_no_proxy_for_host = s;
+    }
+
+    /// @deprecated
+    void set_no_proxy_for_port(int i) throw()
+    {
+        _dods_no_proxy_for_port = i;
+    }
+
+    void set_ais_database(const string &db) throw()
+    {
+        d_ais_database = db;
+    }
+};
+
+} // namespace libdap
+
+#endif // _RCReader_h_
diff --git a/README b/README
new file mode 100644
index 0000000..d2bc6b6
--- /dev/null
+++ b/README
@@ -0,0 +1,514 @@
+Updated for version 3.19.1
+
+Bug fixes; See the ChangeLog and NEWS files.
+
+Updated for version 3.18.3
+
+Bug fixes; See the ChangeLog and NEWS files.
+
+Updated for version 3.18.2
+
+Added support for DAP4 filter operations.
+
+For other information, see NEWS and ChangeLog
+
+Updated for 3.16.0
+
+libdap now supports parallel I/O for certain data write operations,
+mostly those involving larger amounts of data - Marshaller::put_vector
+and put_vector_part. The behavior can be 'turned off' by #undef the
+symbol USE_POSIX_THREADS in the XDSStreamMarshaller classes.
+
+Added to libdap is the ability to send DAP2 responses in parts, so that
+code that builds large responses from multiple reads can write a part
+that is complete and then return to work on the next part. This is
+especially beneficial for aggregations that cross many granules. The new
+method is Marshaller::put_vector_part().
+
+Added to libdap is a virtual void BaseType::clear_local_data() method
+that can be used to free the memory used by a BaseType to hold data values.
+This provides a way for the object to persist in memory without holding
+onto all of its data (which can be a substantial part of the object's
+total size).
+
+Updated for 3.14.0
+
+Bison 3 is required to build this code.
+
+Updated for 3.13.3
+
+Bug fix release
+
+Updated for 3.13.2
+
+Bug fix release
+
+Updated for 3.13.1
+
+A test baseline was updated to use both the DAP2 and DAP4 version of
+the XDAP/X-DAP header. This change was likely over doing things on our
+part, but it's important to have the source releases pass all their
+tests.
+ 
+Updated 3.13.0
+
+Support for clang: Apple LLVM version 5.1 (clang-503.0.40) (based on
+LLVM 3.4svn) added.
+
+Updated for version 3.12.1
+
+Note that the documented behavior of BaseType::read() is now correctly
+implemented.
+
+Updated for version 3.12.0
+
+The server functions have been moved out of libdap and into their own 
+BES module. Currently this modules is part of the BES, but that will change
+in the future. This version of libdap supports building very large arrays
+made up of constant value (e.g., to be used as masks in server functions
+you write). 
+
+For information on the way to make these functions, see:
+http://docs.opendap.org/index.php/Expanded_arguments_for_Constraint_Expressions 
+Note that this version of libdap requires bison 2.4. This is a change so
+the parsers can use C++ I/O streams and we can eventually drop the FILE*
+interfaces.
+
+Updated for version 3.11.7
+
+Minor tweak for the server function caching code: turn on or off the 
+cache by adding or removing the directory /tmp/dap_functions_cache. 
+If the directory is not present no caching of server function calls
+is done. All the other behaviors are otherwise identical.
+
+Updated for version 3.11.6
+
+There is a new cache for some kinds of response objects. It's size and
+location are currently fixed to 20GB bytes and 
+"/tmp/dap_functions_cache/" but these will be made BES parameters in a
+future release.
+
+Updated for version 3.11.5
+
+A memory leak in XDRStreamMarshaller was fixed.
+
+A bug in DDS::add_var_nocopy() was fixed.
+
+Updated for version 3.11.2
+
+Bug fixes and improvements in the implementations of some methods.
+
+Updated for version 3.11.1
+
+Bug fixes only.
+
+Updated for version 3.11.0
+
+Now constraint expressions can have multiple function calls that return data.
+
+I've bumped up the DAP version from 3.3 to 3.4 to reflect this change.
+
+Updated for Version 3.10.2
+
+BaseType::transfer_attributes() and related methods provide a way for
+handlers to customize how attributes from a DAS object are merged into
+a DDS.
+
+In the past we supported a kind of client-side system that could augment
+the attributes call the 'AIS' (Ancillary Information System). This has
+been removed - our server now supports the NcML language to do much the same
+thing but in a way that can be set on the server once for all users. It's also
+an emerging convention that's gaining wide support within the community.
+
+Updated for Version 3.10.0
+
+DAP 3.3 is now supported; see http://docs.opendap.org/index.php/DAP3/4.
+
+This version of libdap contains many changes that are needed for both
+DAP 4 and the NcML handler. This version of the library is required
+for the Hyrax 1.6 handlers.
+
+The 'deflate' program is no longer part of this library package since
+we are no longer supporting the old data server system (based on WWW's
+CGI specification).
+
+Updated for version 3.9.2
+
+Now libdap supports DAP 3.2. You can read about the evolving DAP 3.x protocol
+at http://docs.opendap.org/index.php/DAP3/4. If your client sends the
+XDAP-Accept header with a value of 3.2 the DDX is different (it includes
+protocol information and also an xmlbase element).
+
+Behavior change for the DAS: In the past the format handlers added double
+quotes to the values of string attributes when they added those values to the
+AttrTable object. This meant that the value of the attribute in the C++
+object was actually not correct since it contained quotes not found in the
+original attribute value. I modified libdap so that if an attribute value in
+the C++ AttrTable object does not have quotes then those quotes are added
+when the value is output in a DAS response (but not a DDX since there's no
+need to quote the value in that response). This ensures that the text in the
+DAS wire representation will parse whether a handler has added quotes or not
+(paving the way for fixed handlers). At the same time I fixed all of our
+handlers so that they no longer add the erroneous quotes. This fixes a
+problem with the DDX where the quotes were showing up as part of the
+attribute value. The change to libdap is such that a broken handler will not
+be any more broken but a fixed handler will work for both DAS and DDX
+generation.
+
+If you have a handler and it's not adding quotes to the String attribute 
+values - good, don't change that! If your handler does add quotes, please
+modify it so the DDX will be correct.  
+
+Our handler's old, broken, behavior can be resurrected by removing the 
+ATTR_STRING_QUOTE FIX define in the appropriate files.
+
+Updated for version 3.8.2 (23 June 2008)
+
+HTTP Cache and win32 installer fixes (the latter are actually in the 3.8.1
+installer for winXP). API change: The functions used to merge ancillary data
+have been moved to their own class (Ancillary).
+
+Updated for version 3.8.1 (10 June 2008)
+
+The syntax for PROXY_SERVER in the .dodsrc file was relaxed. See the .dodsrc
+file for more information.
+
+Updated for Version 3.8.0 (29 February 2008)
+
+The libdap classes and code are now inside of the libdap namespace. In order
+to access any of the classes, for example, you will need to do one of the
+following. After including the libdap headers you can:
+
+1. add a using statement for the entire libdap namespace:
+
+using namespace libdap ;
+
+2. add a using statement for the classes that you will be using:
+
+using libdap::DAS ;
+
+3. inside your code scope the use of libdap classes.
+
+libdap::DAS *das = code_to_get_das() ;
+
+Added method to HTTPCache to return not only the FILE pointer of a cached
+response but also the name of the file in the cache, to allow for this file
+name to be passed to data handlers in the BES to be read.
+
+See NEWS for more information about changes for this version and ChangeLog
+for the gory details.
+
+Updated for Version 3.7.10 (28 November 2007)
+
+A bug fix release. See NEWS.
+
+Updated for Version 3.7.9 (13 November 2007)
+
+This release is a bug fix and refactoring release. Old classes which were no
+longer used have been removed, the FILE* output methods are slated to be
+replaced with ones which will use iostream and will support a chucked
+transfer 'Marshaller,' and the transfer_data() methods have been made a
+formal part of the library, implemented for all classes, fixed and renamed to
+intern_data(). Many bugs in the library were also fixed.
+
+Updated for version 3.7.8 (26 June 2007)
+
+The major fixes in this version are memory errors found and fixed in the
+Regex class and HTTP header processing software. This version also supports
+pkg-config on hosts that have that installed.
+
+See NEWS for more information about changes for this version and ChangeLog
+for the gory details.
+
+Notes for version 3.7.7 (2 May 2007)
+
+The major fix here is to the source build. We've fixed the issue where source
+builds failed to make the dapserver and dapclient libraries.
+
+Notes for version 3.7.6 (12 March 2007)
+
+Two bug fixes, both minor. Problems in the linear_scale() constraint
+expression function and a bad/missing #include in GNURegex.h were fixed.
+
+There was an error in the INSTALL file sent out in the previous release. It
+said this library implemented DAP version 3.2, but in fact it implements
+version 3.1. The version 3.2 release will be along soon (RSN).
+
+Notes for version 3.7.5 (7 Feb 2007)
+
+This version includes many fixes from the first Server4 beta release
+plus fixes for the server-side functions. It also includes a smoother
+Win32 build.
+
+Notes for version 3.7.4 (2 Jan 2007)
+
+Release for the Server4 beta release.
+
+Notes for version 3.7.3 (24 Nov 2006)
+
+This version of libdap contains a beta release of the server-side functions
+geogrid(), geoarray(), linear_scale() and version(). These can be used to
+select parts of Grids and Arrays using latitude and longitude values instead
+of array position indexes. The linear_scale() function can be used to scale
+variables (including those return by other function) using 'y = mx + b'. The
+version() function can be used to find out which versions of the functions are
+installed.
+
+EXAMPLES
+
+To get version information use the 'version()' function. Currently, version()
+can only be called when asking for data, and you must give the name of a data
+source, although in the default version of version() the data source is not
+used. The version function takes one optional argument which may be the strings
+'help' or 'xml'. Use 'help' to get help on using the function; use 'xml' to get
+version information encoded using XML instead of plain text:
+
+<code>
+[jimg@zoe libdap]$ url=http://test.opendap.org/dap/data/nc/coads_climatology.nc
+[jimg@zoe libdap]$ ./getdap -D "$url?version()"
+The data:
+String version = "Function set: version 1.0, grid 1.0, geogrid 1.0b2, 
+		          geoarray 0.9b1, linear_scale 1.0b1";
+
+[jimg@zoe libdap]$ ./getdap -D "$url?version(help)"
+The data:
+String version = "Usage: version() returns plain text information about ...
+
+[jimg@zoe libdap]$ ./getdap -D "$url?version(xml)"
+The data:
+String version = "<?xml version=\"1.0\"?>
+    <functions>
+        <function name=\"version\" version=\"1.0\"/>
+        <function name=\"grid\" version=\"1.0\"/>
+        <function name=\"geogrid\" version=\"1.0\"/>
+        <function name=\"geoarray\" version=\"1.0\"/>
+        <function name=\"linear_scale\" version=\"1.0\"/>
+    </functions>";
+
+The geogrid function can only be used with variables that are Grids:
+
+[jimg@zoe libdap]$ getdap -d "$url"
+Dataset {
+    Float64 COADSX[COADSX = 180];
+    Float64 COADSY[COADSY = 90];
+    Float64 TIME[TIME = 12];
+    Grid {
+      Array:
+        Float32 SST[TIME = 12][COADSY = 90][COADSX = 180];
+      Maps:
+        Float64 TIME[TIME = 12];
+        Float64 COADSY[COADSY = 90];
+        Float64 COADSX[COADSX = 180];
+    } SST;
+    Grid {
+    .
+    .
+    .
+</code>
+    
+Pass the name of the Grid variable and the upper-left and lower-right corners 
+of the lat/lon rectangle to geogrid. Optionally, pass one or more relational
+expressions to select parts of dimensions that are not lat/lon. 
+
+Note: in libdap 3.7.3 calling geogrid with a constraint on each dimension
+may return incorrect values that indicate missing data even though data should
+have been returned.
+
+<code>
+[jimg@zoe libdap]$ getdap -D "$url?geogrid(SST,30,-60,20,-60,\"TIME=366\")"
+The data:
+Grid {
+  Array:
+    Float32 SST[TIME = 1][COADSY = 7][COADSX = 2];
+  Maps:
+    Float64 TIME[TIME = 1];
+    Float64 COADSY[COADSY = 7];
+    Float64 COADSX[COADSX = 2];
+} SST = {  Array: {{{24.4364, 25.0923},{23.7465, 24.4146},{19.843, 23.6033},
+{16.8464, 17.7756},{16.65, 16.818},{-1e+34, 15.3656},{18.7214, 13.1286}}}  
+Maps: {366}, {19, 21, 23, 25, 27, 29, 31}, {-61, -59} };
+</code>
+
+The geoarray() function works like geogrid() except that it's used to select
+from an Array variable and not a Grid. In addition to the four lat/lon values
+for selection rectangle, the caller must supply the data's corner points. A 
+subsequent release of libdap will include a version that reads the data extent
+from the data source when possible so caller's won't normally have to know the
+data's extent ahead of time.
+
+The linear_scale() function take either one or three arguments. The first
+(only) argument is the name of a variable or the return from another
+function. This variable will be scaled using the 'y = mx + b' equation where
+'x' is the value(s) of the input variable and 'm' and 'b' are read from the
+data source using the values of attributes name 'scale_factor' and
+'add_offset.' If these are not present, or to over ride their values, m and b
+can be supplied using the second and third arguments.
+
+Note that there are still some problems with linear_scale() in this release.
+
+See NEWS and ChangeLog for information about other changes
+
+Notes for version 3.7.2
+
+This version of libdap is required for the 9/15/06 alpha release of Server4.
+The library now contains software which enables Server4 to build the ASCII
+data response for all types of variables, including Sequence and nested
+Sequence variables. These features are additions to the API, so older code
+will work just fine with the new library. See NEWS for more specific info
+about bug fixes.
+
+Notes for version 3.7.1
+
+This is a bug fix release (mostly) made for users of the netcdf client
+library who need a fix for a problem dealing with attributes from the HDF4
+server. 
+
+NOTES for version 3.7.0
+
+This version includes new features and an implementation change.
+
+This version of libdap now returns the DAP protocol version number, 3.1, in
+an HTTP response header. Use this to determine which protocol version the
+library implements. The inclusion of a protocol version number is the sole
+official new feature of DAP 3.1. Use Connect::get_protocol() to get the
+version number. Clients can use this to determine the features supported by a
+server. The Connect::get_version() method can still be used to get our
+server's implementation version. The distinction is that as more groups
+provide their own implementations of the DAP, the protocol version will
+provide a way for clients to determine capabilities independently of
+implementation.
+
+The libdap library now contains an implementation of the DDX object/response,
+although this is an alpha implementation and it's actually been part of the
+library for some time now. The implementation contained in this version of
+the library is close enough to the version we intend for DAP4 that developers
+can start to use it. Most of the server handlers will return DDXs when asked.
+
+The DDX combines the information previously held by the DDS and DAS objects,
+making it much easier to associate attributes to variables. As the name
+suggests, the DDX uses XML rather than curly-braces. You can drop the DDX
+into your favorite XML parser and get a DOM tree; no need to use our parsers.
+However, libdap contains a nice SAX parser that will build the libdap objects
+directly from the XML DDX object/response. Also included in libdap are
+methods to build a DDX using a DDS and DAS, so there's an easy migration path
+for both servers and clients.
+
+Finally, the library contains two structural changes. First, the library
+named 'libdap' now holds the DAP implementation while two new libraries,
+'libdapclient' and 'libdapserver', now hold the client and server helper
+classes which are not strictly part of the DAP. Secondly, the DDS/DDX object
+now takes the constraint evaluator as a parameter. The class
+ConstraintEvaluator holds our default evaluator, but it's now possible to use
+your own evaluator .
+
+NOTES for version 3.6.1
+
+Version 3.6.1 is bug fix release.
+
+NOTES for version 3.6.0
+
+This version of the library may not work older source code. Many of the 
+deprecated methods have been removed. 
+
+Added are headers which send information about the version of the DAP protocol
+that the library implements (in contrast to the implementation of the library
+itself). A new header named XOPeNDAP-Server is used to send information about
+the implementation of servers.
+
+The libtool interface version has been incremented from 3 to 4 (these versions
+do no track the software's release version since several releases might 
+present compatible binary interfaces). 
+
+NOTES for version 3.5.3
+
+This version of libdap++ cannot be used to build the 3.4.x and previous
+clients and/or servers. However, client and servers built using this code
+_will_ work with the older clients and servers.
+
+WHAT'S IN THIS DIRECTORY?
+
+This directory contains the OPeNDAP C++ implementation of the Data
+Access Protocol version 2 (DAP2) with some extensions that will be
+part of DAP3.  Documentation for this software can be found on the
+OPeNDAP home page at http://www.opendap.org/. The NASA/ESE RFC which
+describes DAP2, implemented by the library, can be found at
+http://spg.gsfc.nasa.gov/rfc/004/.
+
+The DAP2 is used to provide a uniform way of accessing a variety of
+different types of data across the Internet. It was originally part of
+the DODS and then NVODS projects. The focus of those projects was
+access to Earth-Science data, so much of the software developed using
+the DAP2 to date has centered on that discipline. However, the DAP2
+data model is very general (and similar to a modern structured
+programming language) so it can be applied to a wide variety of
+fields.
+
+The DAP2 is implemented as a set of C++ classes that can be used to
+build data servers and clients. The classes may be specialized to
+mimic the behavior of other data access APIs, such as netCDF. In this
+way, programs originally meant to work with local data in those
+formats can be re-linked and equipped to work with data stored
+remotely in many different formats.  The classes can also by
+specialized to build standalone client programs.
+
+The DAP2 is contained in a single library: libdap++.a. Also included
+in the library are classes and utility functions which simplify
+building clients and servers.
+
+WHAT ELSE IS THERE?
+
+The file README.dodsrc describes the client-side behavior which can be
+controlled using the .dodsrc file. This includes client-side caching,
+proxy servers, et c., and is described in a separate file so it's easy
+to include in your clients.
+
+The file README.AIS describes the prototype Ancillary Information
+Service (AIS) included in this version of the library. The AIS is
+(currently) a client-side capability which provides a way to augment
+DAP attributes. This is a very useful feature because it can be used
+to add missing metadata to a data source. The AIS is accessed by using
+the AISConnect class in place of Connect in your client.
+
+This directory also contains test programs for the DAP2, a sample
+specialization of the classes, getdap (a useful command-line web
+client created with DAP2) and dap-config (a utility script to simplify
+linking with libdap.a). Also included as of version 3.5.2 is
+libdap.m4, an autoconf macro which developers can use along with
+autoconf to test for libdap. This macro will be installed in
+${prefix}/share/aclocal and can be by any package which uses autoconf
+for its builds. See the file for more information.
+
+We also have Java and C versions of the DAP2 library which
+inter-operate with software which uses this library. In other words,
+client programs built with the Java DAP2 implementation can
+communicate with servers built with this (C++) implementation of the
+DAP2. The C DAP2 library, called the Ocapi, only implements the
+client-side part of the protocol. Clients written using the Ocapi are
+interoperable with both the Java and C++ DAP2 libraries. Note that the
+Ocapi is in early beta and available only from CVS at this time (5 May
+2005).
+  
+THREAD SAFETY
+
+We don't need to do this since the STL is also not thread safe. Users
+of libdap have to be sure that multiple threads never make
+simultaneous and/or overlapping calls to a single copy of libdap. If
+several threads are part of a program and each will make calls to
+libdap, either those threads must synchronize their calls or arrange
+to each use their own copy of libdap.  Some aspects of the library
+are thread-safe: the singleton classes are all protected as is the
+HTTP cache (which uses the local file system).
+
+INSTALLATION INSTRUCTIONS
+
+See the file INSTALL in this directory for information on building the
+library and the geturl client.
+
+COPYRIGHT INFORMATION
+
+The OPeNDAP DAP library is copyrighted using the GNU Lesser GPL. See
+the file COPYING or contact the Free Software Foundation, Inc., at 59
+Temple Place, Suite 330, Boston, MA 02111-1307 USA. Older versions of
+the DAP were copyrighted by the University of Rhode Island and
+Massachusetts Institute of Technology; see the file COPYRIGHT_URI. The
+file deflate.c is also covered by COPYRIGHT_W3C.
diff --git a/README.dodsrc b/README.dodsrc
new file mode 100644
index 0000000..011c7e2
--- /dev/null
+++ b/README.dodsrc
@@ -0,0 +1,150 @@
+$Id$
+
+Current for version 3.7.6 (12 March 2007)
+
+The libdap client-side configuration file (.dodsrc) is used to configure how
+clients cache responses and how they interact with proxy servers. By default
+the configuration file resides in a users home directory and is called
+`.dodsrc'. This can be changed by creating the environment variable
+DODS_CONF and setting it to the full pathname of the configuration file.
+
+About the Win32 builds:
+
+For Win32 (Windows XP and Vista) a client linked with libdapclient will look
+for the .dodsrc file in the following locations: C:\Dods; %APPDATA%; %TEMP%;
+and %TMP%. If no .dodsrc file is found, the library will create one in
+%APPDATA%. Note that on some Windows XP machines a user's 'Application Data'
+directory is hidden. To see and edit the .dodsrc file, open a file browser
+window from the Start menu, go to your home directory and then type in 
+'Application Data'. The .dodsrc file will be created by the first OPeNDAP
+client to run if there's not a copy already there.
+
+Another note about the Win32 builds and the .dodsrc file: It appears that
+client-side caching does not work in recent versions of the library, so until
+further notice, leave USE_CACHE set to zero.
+
+New feature added with libdap version 3.7.3 (7 Nov 2006)
+
+The configuration file can now be used to control client-side behavior when
+accessing servers using SSL. By default, certificates must be signed by a
+certificate authority. The libcurl package recognizes a large set of 
+CAs; you can sign your own certificates as well (but see the OpenSSL
+documentation for more information). In addition, server hosts must identify
+themselves using the same name as is used in the certificate.
+
+To disable these features, set the configuration parameter VALIDATE_SSL to
+zero. By default, these features are now enabled following the defaults for
+libcurl.
+
+If a DODS client starts and cannot find the configuration file, then one with
+default parameters will be created in the user's home directory. By default
+caching will be enabled with a maximum cache size of 20M and a default
+expiration time of 24 hours. By default no proxy server is configured and SSL
+hosts and certificates are validated. Also by default, compression is not
+activated.
+
+A sample configuration file looks like (the line numbers are not part of the
+file; they've been added to make the description clearer):
+
+0   # Comments start with a `#' in the first column.
+1	USE_CACHE=1
+2	MAX_CACHE_SIZE=20
+3	MAX_CACHED_OBJ=5
+4	IGNORE_EXPIRES=0
+5	CACHE_ROOT=/home/jimg/.dods_cache/
+6	DEFAULT_EXPIRES=86400
+7	DEFLATE=0
+8	VALIDATE_SSL=1
+9	PROXY_SERVER=http,http://jimg:password@dcz.dods.org/
+10	NO_PROXY_FOR=http,dcz.dods.org
+11	AIS_DATABASE=.ais_sst_database
+    
+COMMENTS 
+Starting a line with a `#' makes that line a comment. 
+
+CACHING 
+
+The parameters on lines 1 through 6 determine how the DAP++ library will use
+its HTTP 1.1 cache. If the value of USE_CACHE is 1, the cache is active. A
+value of 0 turns off the cache. Make sure you use zero (0) and not the letter
+`O'.
+
+The value of MAX_CACHE_SIZE sets the maximum size of the cache in megabytes.
+Once the cache reaches this size, caching more objects will cause cache
+garbage collection. The algorithm used is to first purge the cache of any
+stale entries and then remove remaining entries starting with those that have
+the lowest hit count. Garbage collection stops when 90% of the cache has been
+purged.
+
+The value of MAX_CACHED_OBJ sets the maximum size of any individual object in
+the cache in megabytes. Objects received from a server larger than this value
+will not be cached even if there's room for them without purging other
+objects.
+
+The parameter CACHE_ROOT contains the pathname to the cache's top directory.
+If two or more users want to share a cache, then they must both have read and
+write permissions to the cache root.
+
+If the value of IGNORE_EXPIRES is 1, then Expires: headers in response
+documents will be ignored. The value of DEFAULT_EXPIRES sets the expiration
+time for any response that does not include either an Expires or
+Last-Modified header. The value is given in seconds; 86,400 is 24 hours. In
+general you should *not* ignore the Expires header; the server probably had a
+good reason to send it along with the response. This parameter is here for
+unusual situations.
+
+Note: If a Last-Modified header is returned with the response, and there's
+*no* Expires header, the expiration time is is 10% of the difference between
+the current time and the LM time or 48 hours, whichever is smaller. Note that
+libdap ignores the DEFAULT_EXPIRES time in this case. Any request made before
+the expiration time will use the cached response without validation. Any
+request made after the expiration time will use a conditional GET. Servers
+that have been upgraded to 3.2 or greater will return a 304 response if the
+cached response is still valid or a new response if it is not valid.
+
+If the value of ALWAYS_VALIDATE is 1, then all accesses will be validated with
+the origin server. A value of 0 causes libwww to use the more complex
+expiration and validate algorithm.
+
+CONTROLLING DATA COMPRESSION
+
+If the DEFLATE parameter is set to one (DEFLATE=1) then clients will request 
+that servers compress data transmissions. Servers may or may not honor this
+request depending on their abilities.
+
+SSL VALIDATION
+
+Set VALIDATE_SSL to zero to turn off SSL server host and certificate
+validation. By default, SSL hosts and certificates are now validated. If
+you're using your own certificates and don't want to pay to have them signed
+by a CA or to run your own authorization site, use this to defeat SSL
+validation. The old libdap default behavior was to _not_ perform validation
+(because that was the old libcurl default) and we've included this option so
+that you can get that old behavior.
+
+PROXY SERVERS
+
+Note that the parameters PROXY_SERVER and NO_PROXY_FOR may be repeated
+to add multiple proxy servers, suppress proxy access for several hosts, etc.
+
+Lines 9 and 10 contain the parameters used to configure a proxy server.
+The parameter PROXY_SERVER configures a default proxy server. The format is
+
+    PROXY_SERVER=<protocol>,<proxy host url>
+
+The only supported protocols are http, https, and ftp.
+<proxy host url> must be a full URL to the host running the proxy server. If a
+password is used to access the proxy server, include it in the URL using the
+<user:password@host> syntax as shown in the example.
+
+The NO_PROXY parameter provides a simple way to say that access to a certain
+host should never go through a proxy. The syntax of NO_PROXY is:
+
+    NO_PROXY=<protocol>,<hostname>
+
+where <protocol> is as for PROXY_SERVER
+<hostname> is the name of the host, not a url.
+
+The Ancillary Information Service
+
+See README.AIS for more information about the AIS.
diff --git a/RValue.cc b/RValue.cc
new file mode 100644
index 0000000..b753c1f
--- /dev/null
+++ b/RValue.cc
@@ -0,0 +1,183 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1996-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// This file contains mfuncs defined for struct rvalue (see expr.h) that
+// *cannot* be included in that struct's declaration because their
+// definitions must follow *both* rvalue's and func_rvalue's declarations.
+// jhrg 3/4/96
+
+#include "config.h"
+
+#include <cassert>
+#include <iostream>
+
+#include "BaseType.h"
+#include "expr.h"
+#include "RValue.h"
+#include "DDS.h"
+#include "dods-limits.h"
+#include "util.h"
+
+using namespace std;
+
+namespace libdap {
+
+rvalue_list *
+make_rvalue_list(rvalue *rv)
+{
+    assert(rv);
+
+    rvalue_list *rvals = new rvalue_list;
+
+    return append_rvalue_list(rvals, rv);
+}
+
+// Given a rvalue_list pointer RVALS and a value pointer VAL, make a variable
+// to hold VAL and append that variable to the list RVALS.
+//
+// Returns: A pointer to the updated rvalue_list.
+
+rvalue_list *
+append_rvalue_list(rvalue_list *rvals, rvalue *rv)
+{
+    rvals->push_back(rv);
+
+    return rvals;
+}
+
+
+/** Build an argument list suitable for calling a \c btp_func,
+    \c bool_func, and so on. Since this takes an rvalue_list and
+    not an rvalue, it is a function rather than a class
+    member.
+
+    This function performs a common task but does not fit within the RValue
+    class well. It is used by Clause and ce_expr.y.
+
+    @param args A list of RValue objects
+    @param dds Use this DDS when evaluating functions */
+BaseType **
+build_btp_args(rvalue_list *args, DDS &dds)
+{
+    int argc = 0;
+
+    if (args)
+        argc = args->size();
+
+    // Sanitize allocation size
+    if (!size_ok(sizeof(BaseType*), argc + 1))
+        throw Error(malformed_expr, string("Malformed argument list (")
+                + long_to_string(argc) + string(")."));
+
+    // Add space for a null terminator
+    BaseType **argv = new BaseType*[argc + 1];
+
+    int index = 0;
+    if (argv && argc) {
+        for (rvalue::Args_iter i = args->begin(); i != args->end() && index
+                < argc + 1; ++i)
+            argv[index++] = (*i)->bvalue(dds);
+
+        argv[index] = 0; // Add the null terminator.
+    }
+
+    if (index != argc) {
+        delete[] argv;
+        throw InternalErr(__FILE__, __LINE__, "index out of range.");
+    }
+#if 0
+    argv[index] = 0; // Add the null terminator.
+#endif
+    return argv;
+}
+
+rvalue::rvalue(BaseType *bt): d_value(bt), d_func(0), d_args(0)
+{}
+
+rvalue::rvalue(btp_func f, vector<rvalue *> *a) : d_value(0), d_func(f), d_args(a)
+{}
+
+rvalue::rvalue(): d_value(0), d_func(0), d_args(0)
+{}
+
+rvalue::~rvalue()
+{
+    // Deleting the BaseType pointers in value and args is a bad idea since
+    // those might be variables in the dataset. The DDS dtor will take care
+    // of deleting them. The constants wrapped in BaseType objects should be
+    // pushed on the list of CE-allocated temp objects which the CE frees.
+
+	// ADB: the d_args vector still needs to be deleted
+	if (d_args != 0) {
+		for (std::vector<rvalue *>::iterator iter = d_args->begin(); iter != d_args->end(); ++iter) {
+			delete *iter;
+		}
+		delete d_args;
+	}
+}
+
+string
+rvalue::value_name()
+{
+    assert(d_value);
+
+    return d_value->name();
+}
+
+/** Return the BaseType * for a given rvalue. If
+    the rvalue is a func_rvalue, evaluates the func_rvalue and returns the
+    result. The functions referenced by func_rvalues must encapsulate their
+    return values in BaseType *s.
+
+    @param dds The dds to pass to a function.
+*/
+BaseType *
+rvalue::bvalue(DDS &dds)
+{
+    if (d_value) {        // i.e., if this RValue is a BaseType
+        return d_value;
+    }
+    else if (d_func) {
+        // If func is true, then args must be set. See the constructor.
+        // 12/23/04 jhrg
+        BaseType **argv = build_btp_args(d_args, dds);
+        BaseType *ret_val;
+        (*d_func)(d_args->size(), argv, dds, &ret_val);
+        delete[] argv;
+        return ret_val;
+    }
+    else {
+        return 0;
+    }
+}
+
+} // namespace libdap
+
diff --git a/RValue.h b/RValue.h
new file mode 100644
index 0000000..2a408ba
--- /dev/null
+++ b/RValue.h
@@ -0,0 +1,87 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1998-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+#ifndef _rvalue_h
+#define _rvalue_h
+
+#include <dods-datatypes.h>
+
+namespace libdap
+{
+
+/** Holds the rvalues for the parser, Clause objects and evaluator.
+
+    @see Clause.h
+    @see DDS.h
+    @see expr.y */
+
+class rvalue
+{
+private:
+    BaseType *d_value;
+    btp_func d_func;  // pointer to a function returning BaseType *
+    std::vector<rvalue *> *d_args;  // arguments to the function
+
+public:
+    typedef std::vector<rvalue *>::iterator Args_iter ;
+    typedef std::vector<rvalue *>::const_iterator Args_citer ;
+
+    rvalue(BaseType *bt);
+    rvalue(btp_func f, std::vector<rvalue *> *a);
+    rvalue();
+
+    virtual ~rvalue();
+    std::string value_name();
+
+    BaseType *bvalue(DDS &dds);
+};
+
+// This type def must come after the class definition above. It is used in
+// the Clause and DDS classes.
+typedef std::vector<rvalue *> rvalue_list;
+typedef std::vector<rvalue *>::const_iterator rvalue_list_citer ;
+typedef std::vector<rvalue *>::iterator rvalue_list_iter ;
+
+typedef std::vector<dods_byte> *byte_arg_list;
+typedef std::vector<dods_int16> *int16_arg_list;
+typedef std::vector<dods_uint16> *uint16_arg_list;
+typedef std::vector<dods_int32> *int32_arg_list;
+typedef std::vector<dods_uint32> *uint32_arg_list;
+typedef std::vector<dods_float32> *float32_arg_list;
+typedef std::vector<dods_float64> *float64_arg_list;
+
+rvalue_list *make_rvalue_list(rvalue *rv);
+rvalue_list *append_rvalue_list(rvalue_list *rvals, rvalue *rv);
+
+BaseType **build_btp_args(rvalue_list *args, DDS &dds);
+
+} // namespace libdap
+#endif // _rvalue_h
diff --git a/Resource.h b/Resource.h
new file mode 100644
index 0000000..77478db
--- /dev/null
+++ b/Resource.h
@@ -0,0 +1,156 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#ifndef resource_h
+#define resource_h
+
+#include <string>
+#include <iostream>
+
+#ifndef _error_h
+#include "Error.h"
+#endif
+
+using namespace std;
+
+namespace libdap
+{
+
+/** Bind an ancillary resource with the rule that should be used when
+    combining it with a primary resource. Ancillary resources are always
+    specified using URLs. If an ancillary resource is a local file, use
+    <code>file://</code> URLs.
+
+    Note that operator<< is defined for Resource as a function.
+
+    @brief Associate a rule with an ancillary resource.
+    @author James Gallagher <jgallagher@opendap.org> */
+class Resource
+{
+public:
+
+    /** The AIS uses this enumeration to describe how a given ancillary should
+    be merged into a primary data source.
+
+    <ul>
+    <li>overwrite: Attributes in the ancillary source overwrite those in
+    the primary source. New values are added.</li>
+    <li>replace: The ancillary source replaces the primary. All of the
+    Attributes in the primary are removed.</li>
+    <li>fallback: The ancillary resource provides a set of fallback values
+    if the primary data source lacks any attributes. Note that this does
+    not apply to individual attributes, but to an entire set. The fallback
+    attributes are used only if the original data source lacks attributes
+    altogether. 
+    </ul>
+
+    @brief How are ancillary resources used.
+    @author James Gallagher <jgallagher@opendap.org> */
+    enum rule { overwrite, replace, fallback };
+
+    /** Build a Resource with a null URL and set the combination rule to the
+    default. */
+    Resource() : d_url(""), d_rule(overwrite)
+    {}
+
+    /** Build a resource. Set the combination rule to the default value,
+    which is overwrite. 
+    @param u The ancillary resource URL. */
+    Resource(const string &u) : d_url(u), d_rule(overwrite)
+    {}
+
+    /** Build a Resource.
+    @param u The ancillary resource URL.
+    @param r The combination rule. */
+    Resource(const string &u, const rule &r) : d_url(u), d_rule(r)
+    {}
+
+    /** Build a Resource.
+
+        Note: If this is used in a callback, make sure to check the value of
+    <code>r</code> before calling this constructor. Exceptions thrown
+    within callbacks are not portable. Valid values are "overwrite",
+    "replace" and "fallback". The constructor accepts "default" as a
+    synonym for "overwrite".
+
+    @param u The ancillary resource URL.
+    @param r The name of the combination rule. */
+    Resource(const string &u, const string &r) throw(Error) : d_url(u)
+    {
+        if (r == "replace")
+            d_rule = replace;
+        else if (r == "fallback")
+            d_rule = fallback;
+        else if (r == "overwrite" || r == "default")
+            d_rule = overwrite;
+        else
+            throw Error(string("An AIS Resource object was created with an unknown rule type '") + r);
+    }
+
+    virtual ~Resource()
+{}
+
+    /** Return the resource URL. */
+    virtual string get_url() const
+    {
+        return d_url;
+    }
+
+    /** Set the resource URL.
+    @param u The resource's URL. */
+    virtual void set_url(const string &u)
+    {
+        d_url = u;
+    }
+
+    /** Return combination rule for this resource. */
+    virtual Resource::rule get_rule() const
+    {
+        return d_rule;
+    }
+
+    /** Set the resource's combination rule.
+    @param r The combination rule. */
+    virtual void set_rule(const Resource::rule &r)
+    {
+        d_rule = r;
+    }
+
+    /** Write the XML for this resource. This function is defined in
+    AISResoruces. 
+    @param os Write to this ostream.
+    @paran r The Resource to write. */
+    friend ostream &operator<<(ostream &os, const Resource &r);
+
+
+private:
+
+    string d_url;
+    Resource::rule d_rule;
+};
+
+} // namespace libdap
+
+#endif // resource_h
diff --git a/Response.h b/Response.h
new file mode 100644
index 0000000..4a90757
--- /dev/null
+++ b/Response.h
@@ -0,0 +1,129 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#ifndef response_h
+#define response_h
+
+#include <cstdio>
+#include <string>
+//#include <iostream>
+#include <fstream>
+
+#include "ObjectType.h"
+#include "debug.h"
+
+namespace libdap
+{
+
+/** Encapsulate a response. Instead of directly returning the FILE pointer
+    from which a response is read, return an instance of this object. For a
+    simple system where all that needs to be done to free the stream and its
+    associated resources, this is overkill. However, some streams may require
+    complex operations to free their resources once the client is done with
+    the stream. Those classes should return a subclass of Response
+    which has those operations built into the destructor.
+
+    @todo If the code that parses the MIME headers was moved from Connect and
+    HTTPConnect to this class and its children, it would be easier to build
+    a FileConnect class (or maybe the specifics of the connection type could
+    be held in the Response object and HTTPConnect and the to-be-written
+    FileConnect would not be needed). */
+class Response
+{
+private:
+    /// The data stream
+    FILE *d_stream;
+    std::fstream *d_cpp_stream;
+
+    /// Response object type
+    ObjectType d_type;
+    /// Server version
+    std::string d_version;
+    /// The DAP server's protocol
+    std::string d_protocol;
+    /// The HTTP response code
+    int d_status;
+
+protected:
+    /** @name Suppressed default methods */
+    //@{
+    Response(const Response &);
+    Response &operator=(const Response &);
+    //@}
+
+public:
+    Response() : d_stream(0), d_cpp_stream(0), d_type(unknown_type),  d_version("dods/0.0"), d_protocol("2.0"),
+		d_status(0)
+	{ }
+
+    /** Initialize with a stream. Create an instance initialized to a stream.
+	by default get_type() and get_version() return default values of
+	unknown_type and "dods/0.0", respectively. Specializations (see
+	HTTPResponse and HTTPConnect) may fill these fields in with other
+	values.
+        @param s Read data from this stream.
+        @param status The HTTP response status code.*/
+    Response(FILE *s, int status = 0) : d_stream(s), d_cpp_stream(0), d_type(unknown_type),
+            d_version("dods/0.0"), d_protocol("2.0"), d_status(status) { }
+
+    Response(std::fstream *s, int status = 0) : d_stream(0), d_cpp_stream(s), d_type(unknown_type),
+            d_version("dods/0.0"), d_protocol("2.0"), d_status(status) { }
+
+    /** Close the stream. */
+    virtual ~Response()
+    {
+        if (d_stream)
+            fclose(d_stream);
+        if (d_cpp_stream)
+        	d_cpp_stream->close();
+    }
+
+    /** @name getters */
+    //@{
+    virtual int get_status() const {  return d_status; }
+    virtual FILE *get_stream() const { return d_stream; }
+    virtual std::istream *get_cpp_stream() const { return d_cpp_stream; }
+
+    virtual ObjectType get_type() const { return d_type; }
+    virtual std::string get_version() const { return d_version; }
+    virtual std::string get_protocol() const { return d_protocol; }
+    //@}
+
+    /** @name setters */
+    //@{
+    virtual void set_status(int s) { d_status = s; }
+
+    virtual void set_stream(FILE *s) { d_stream = s; }
+    virtual void set_cpp_stream(std::istream *s) { d_cpp_stream = dynamic_cast<std::fstream*>(s); }
+
+    virtual void set_type(ObjectType o) { d_type = o; }
+    virtual void set_version(const std::string &v) { d_version = v; }
+    virtual void set_protocol(const std::string &p) { d_protocol = p; }
+    //@}
+};
+
+} // namespace libdap
+
+#endif // response_h
diff --git a/ResponseTooBigErr.cc b/ResponseTooBigErr.cc
new file mode 100644
index 0000000..e636a1f
--- /dev/null
+++ b/ResponseTooBigErr.cc
@@ -0,0 +1,48 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+
+#include "config.h"
+
+#include <string>
+
+#include "ResponseTooBigErr.h"
+
+namespace libdap {
+
+ResponseTooBigErr::ResponseTooBigErr() : Error()
+{
+    _error_code = unknown_error;
+}
+
+ResponseTooBigErr::ResponseTooBigErr(const string &msg) : Error()
+{
+    _error_code = unknown_error;
+    _error_message = "";
+    _error_message += "A caching error was encounterd:\n";
+    _error_message += msg + "\n";
+}
+
+} // namespace libdap
diff --git a/ResponseTooBigErr.h b/ResponseTooBigErr.h
new file mode 100644
index 0000000..6fec914
--- /dev/null
+++ b/ResponseTooBigErr.h
@@ -0,0 +1,55 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#ifndef _response_too_big_err_h
+#define _response_too_big_err_h 1
+
+
+#include <string>
+
+#ifndef _error_h
+#include "Error.h"
+#endif
+
+namespace libdap
+{
+
+/** ResponseTooBigErr is thrown by HTTPCache::parse_header and write_body if
+    the response that's being cached is too big. The HTTPCache methods
+    determine just what 'too big' means.
+
+    @author jhrg */
+
+class ResponseTooBigErr: public Error
+{
+
+public:
+    ResponseTooBigErr(const string &msg);
+    ResponseTooBigErr();
+};
+
+} // namespace libdap
+
+#endif // _response_too_big_err_h
diff --git a/Sequence.cc b/Sequence.cc
new file mode 100644
index 0000000..53ef873
--- /dev/null
+++ b/Sequence.cc
@@ -0,0 +1,1298 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1994-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// Implementation for the class Structure
+//
+// jhrg 9/14/94
+
+#include "config.h"
+
+//#define DODS_DEBUG
+//#define DODS_DEBUG2
+
+#include <algorithm>
+#include <string>
+#include <sstream>
+
+#include "Byte.h"
+#include "Int16.h"
+#include "UInt16.h"
+#include "Int32.h"
+#include "UInt32.h"
+#include "Float32.h"
+#include "Float64.h"
+#include "Str.h"
+#include "Url.h"
+#include "Array.h"
+#include "Structure.h"
+#include "Sequence.h"
+#include "Grid.h"
+
+#include "Marshaller.h"
+#include "UnMarshaller.h"
+
+#include "debug.h"
+#include "Error.h"
+#include "InternalErr.h"
+#include "Sequence.h"
+#include "DDS.h"
+#include "DataDDS.h"
+#include "util.h"
+#include "InternalErr.h"
+#include "escaping.h"
+
+#include "D4Attributes.h"
+#include "D4Sequence.h"
+#include "D4Group.h"
+#include "Constructor.h"
+#include "DMR.h"
+
+#undef CLEAR_LOCAL_DATA
+
+using namespace std;
+
+namespace libdap {
+
+static const unsigned char end_of_sequence = 0xA5; // binary pattern 1010 0101
+static const unsigned char start_of_instance = 0x5A; // binary pattern 0101 1010
+
+// Private member functions
+
+void Sequence::m_duplicate(const Sequence &s)
+{
+    DBG(cerr << "In Sequence::m_duplicate" << endl);
+
+    d_row_number = s.d_row_number;
+    d_starting_row_number = s.d_starting_row_number;
+    d_ending_row_number = s.d_ending_row_number;
+    d_row_stride = s.d_row_stride;
+    d_leaf_sequence = s.d_leaf_sequence;
+    d_unsent_data = s.d_unsent_data;
+    d_wrote_soi = s.d_wrote_soi;
+    d_top_most = s.d_top_most;
+
+    Sequence &cs = const_cast<Sequence &>(s);
+
+    // Copy the BaseType objects used to hold values.
+    for (vector<BaseTypeRow *>::iterator rows_iter = cs.d_values.begin(); rows_iter != cs.d_values.end(); rows_iter++) {
+        // Get the current BaseType Row
+        BaseTypeRow *src_bt_row_ptr = *rows_iter;
+        // Create a new row.
+        BaseTypeRow *dest_bt_row_ptr = new BaseTypeRow;
+        // Copy the BaseType objects from a row to new BaseType objects.
+        // Push new BaseType objects onto new row.
+        for (BaseTypeRow::iterator bt_row_iter = src_bt_row_ptr->begin(); bt_row_iter != src_bt_row_ptr->end();
+                bt_row_iter++) {
+            BaseType *src_bt_ptr = *bt_row_iter;
+            BaseType *dest_bt_ptr = src_bt_ptr->ptr_duplicate();
+            dest_bt_row_ptr->push_back(dest_bt_ptr);
+        }
+        // Push new row onto d_values.
+        d_values.push_back(dest_bt_row_ptr);
+    }
+}
+
+static void write_end_of_sequence(Marshaller &m)
+{
+    m.put_opaque((char *) &end_of_sequence, 1);
+}
+
+static void write_start_of_instance(Marshaller &m)
+{
+    m.put_opaque((char *) &start_of_instance, 1);
+}
+
+static unsigned char read_marker(UnMarshaller &um)
+{
+    unsigned char marker;
+    um.get_opaque((char *) &marker, 1);
+
+    return marker;
+}
+
+static bool is_start_of_instance(unsigned char marker)
+{
+    return (marker == start_of_instance);
+}
+
+static bool is_end_of_sequence(unsigned char marker)
+{
+    return (marker == end_of_sequence);
+}
+
+// Public member functions
+
+/** The Sequence constructor requires only the name of the variable
+ to be created.  The name may be omitted, which will create a
+ nameless variable.  This may be adequate for some applications.
+
+ @param n A string containing the name of the variable to be
+ created.
+
+ @brief The Sequence constructor. */
+Sequence::Sequence(const string &n) :
+        Constructor(n, dods_sequence_c), d_row_number(-1), d_starting_row_number(-1), d_row_stride(1), d_ending_row_number(
+                -1), d_unsent_data(false), d_wrote_soi(false), d_leaf_sequence(false), d_top_most(false)
+{
+}
+
+/** The Sequence server-side constructor requires the name of the variable
+ to be created and the dataset name from which this variable is being
+ created.
+
+ @param n A string containing the name of the variable to be
+ created.
+ @param d A string containing the name of the dataset from which this
+ variable is being created.
+
+ @brief The Sequence server-side constructor. */
+Sequence::Sequence(const string &n, const string &d) :
+		Constructor(n, d, dods_sequence_c), d_row_number(-1), d_starting_row_number(-1),
+		d_row_stride(1), d_ending_row_number(-1), d_unsent_data(false),
+		d_wrote_soi(false), d_leaf_sequence(false), d_top_most(false)
+{
+}
+
+/** @brief The Sequence copy constructor. */
+Sequence::Sequence(const Sequence &rhs) :
+        Constructor(rhs)
+{
+    m_duplicate(rhs);
+}
+
+BaseType *
+Sequence::ptr_duplicate()
+{
+    return new Sequence(*this);
+}
+
+/**
+ * Build a D4Sequence from a DAP2 Sequence.
+ *
+ * Because DAP4 uses a different type for sequences, this code must
+ * be subclassed by anything other than trivial test code or client
+ * side-only uses of the library.
+ *
+ * @note This version of transformto_dap4() builds a new type of object,
+ * so it must be subclassed.
+ *
+ * @param root Use this as the environment for D4Dimensions
+ * @param container Load the result into this container
+ * @return The new D4Sequence
+ */
+void
+Sequence::transform_to_dap4(D4Group *root, Constructor *container)
+{
+    D4Sequence *dest;
+    // If it's already a DAP4 object then we can just return it!
+    if(is_dap4()){
+        dest = static_cast<D4Sequence*>(ptr_duplicate());
+        dest->set_length(-1);
+        container->add_var_nocopy(dest);
+        return;
+    }
+    dest = new D4Sequence(name());
+    Constructor::transform_to_dap4(root, dest);
+    dest->set_length(-1);
+    container->add_var_nocopy(dest);
+}
+
+static inline void delete_bt(BaseType *bt_ptr)
+{
+    delete bt_ptr;
+    bt_ptr = 0;
+}
+
+static inline void delete_rows(BaseTypeRow *bt_row_ptr)
+{
+    for_each(bt_row_ptr->begin(), bt_row_ptr->end(), delete_bt);
+
+    delete bt_row_ptr;
+    bt_row_ptr = 0;
+}
+
+Sequence::~Sequence()
+{
+    clear_local_data();
+}
+
+void Sequence::clear_local_data()
+{
+    if (!d_values.empty()) {
+        for_each(d_values.begin(), d_values.end(), delete_rows);
+        d_values.resize(0);
+    }
+
+    set_read_p(false);
+}
+
+Sequence &
+Sequence::operator=(const Sequence &rhs)
+{
+    if (this == &rhs) return *this;
+
+    dynamic_cast<Constructor &>(*this) = rhs; // run Constructor=
+
+    m_duplicate(rhs);
+
+    return *this;
+}
+
+/**
+ * The Sequence class will be streamlined for DAP4.
+ */
+bool Sequence::is_dap2_only_type()
+{
+    return true;
+}
+
+string Sequence::toString()
+{
+    ostringstream oss;
+
+    oss << BaseType::toString();
+
+    for (Vars_iter i = d_vars.begin(); i != d_vars.end(); i++) {
+        oss << (*i)->toString();
+    }
+
+    oss << endl;
+
+    return oss.str();
+}
+
+bool Sequence::is_linear()
+{
+    bool linear = true;
+    bool seq_found = false;
+    for (Vars_iter iter = d_vars.begin(); linear && iter != d_vars.end(); iter++) {
+        if ((*iter)->type() == dods_sequence_c) {
+            // A linear sequence cannot have more than one child seq. at any
+            // one level. If we've already found a seq at this level, return
+            // false.
+            if (seq_found) {
+                linear = false;
+                break;
+            }
+            seq_found = true;
+            linear = static_cast<Sequence *>((*iter))->is_linear();
+        }
+        else if ((*iter)->type() == dods_structure_c) {
+            linear = static_cast<Structure*>((*iter))->is_linear();
+        }
+        else {
+            // A linear sequence cannot have Arrays, Lists or Grids.
+            linear = (*iter)->is_simple_type();
+        }
+    }
+
+    return linear;
+}
+
+/** @brief Get a whole row from the sequence.
+ @param row Get row number <i>row</i> from the sequence.
+ @return A BaseTypeRow object (vector<BaseType *>). Null if there's no such
+ row number as \e row. */
+BaseTypeRow *
+Sequence::row_value(size_t row)
+{
+    if (row >= d_values.size()) return 0;   //nullptr
+    return d_values[row];
+}
+
+/** Set value of this Sequence. This does not perform a deep copy, so data
+ should be allocated on the heap and freed only when the Sequence dtor is
+ called.
+ @see SequenceValues
+ @see BaseTypeRow
+ @param values Set the value of this Sequence. */
+void Sequence::set_value(SequenceValues &values)
+{
+    d_values = values;
+}
+
+/** Get the value for this sequence.
+ @return The SequenceValues object for this Sequence. */
+SequenceValues Sequence::value()
+{
+    return d_values;
+}
+
+/** Get the value for this sequence.
+ @return The SequenceValues object for this Sequence. */
+SequenceValues &
+Sequence::value_ref()
+{
+    return d_values;
+}
+
+/** @brief Get the BaseType pointer to the named variable of a given row.
+ @param row Read from <i>row</i> in the sequence.
+ @param name Return <i>name</i> from <i>row</i>.
+ @return A BaseType which holds the variable and its value.
+ @see number_of_rows */
+BaseType *
+Sequence::var_value(size_t row, const string &name)
+{
+    BaseTypeRow *bt_row_ptr = row_value(row);
+    if (!bt_row_ptr) return 0;
+
+    BaseTypeRow::iterator bt_row_iter = bt_row_ptr->begin();
+    BaseTypeRow::iterator bt_row_end = bt_row_ptr->end();
+    while (bt_row_iter != bt_row_end && (*bt_row_iter)->name() != name)
+        ++bt_row_iter;
+
+    if (bt_row_iter == bt_row_end)
+        return 0;
+    else
+        return *bt_row_iter;
+}
+
+/** @brief Get the BaseType pointer to the $i^{th}$ variable of <i>row</i>.
+ @param row Read from <i>row</i> in the sequence.
+ @param i Return the $i^{th}$ variable from <i>row</i>.
+ @return A BaseType which holds the variable and its value.
+ @see number_of_rows */
+BaseType *
+Sequence::var_value(size_t row, size_t i)
+{
+    BaseTypeRow *bt_row_ptr = row_value(row);
+    if (!bt_row_ptr) return 0;
+
+    if (i >= bt_row_ptr->size()) return 0;
+
+    return (*bt_row_ptr)[i];
+}
+
+// This version returns -1. Each API-specific subclass should define a more
+// reasonable version. jhrg 5/24/96
+
+/** Returns the number of elements in a Sequence object. Note that
+ this is <i>not</i> the number of items in a row, but the number
+ of rows in the complete sequence object. To be meaningful, this
+ must be computed after constraint expression (CE) evaluation.
+ The purpose of this function is to facilitate translations
+ between Sequence objects and Array objects, particularly when
+ the Sequence is too large to be transferred from the server to
+ the client in its entirety.
+
+ This function, to be useful, must be specialized for the API and
+ data format in use.
+
+ @return The base implementation returns -1, indicating that the
+ length is not known.  Sub-classes specific to a particular API
+ will have a more complete implementation. */
+int Sequence::length() const
+{
+    return -1;
+}
+
+// Hmmm. how is this different from length()?
+int Sequence::number_of_rows() const
+{
+    return d_values.size();
+}
+
+/** When reading a nested sequence, use this method to reset the internal
+ row number counter. This is necessary so that the second, ... instances
+ of the inner/nested sequence will start off reading row zero. */
+void Sequence::reset_row_number()
+{
+    d_row_number = -1;
+}
+
+/**
+ * @brief A recursive version of reset_row_number()
+ *
+ * @param recur If true, reset the row number of child sequences as well
+ */
+void Sequence::reset_row_number(bool recur)
+{
+    reset_row_number();
+
+    if (recur)
+        for (Vars_iter i = var_begin(), e = var_end(); i != e; ++i)
+            if ((*i)->type() == dods_sequence_c)
+                reset_row_number(true);
+}
+
+// Notes:
+// Assume that read() is implemented so that, when reading data for a nested
+// sequence, only the outer most level is *actually* read.
+// This is a consequence of our current (12/7/99) implementation of
+// the JGOFS server (which is the only server to actually use nested
+// sequences). 12/7/99 jhrg
+//
+// Stop assuming this. This logic is being moved into the JGOFS server
+// itself. 6/1/2001 jhrg
+
+// The read() function returns a boolean value, with TRUE
+// indicating that read() should be called again because there's
+// more data to read, and FALSE indicating there's no more data
+// to read. Note that this behavior is necessary to properly
+// handle variables that contain Sequences. Jose Garcia If an
+// error exists while reading, the implementers of the surrogate
+// library SHOULD throw an Error object which will propagate
+// beyond this point to to the original caller.
+// Jose Garcia
+
+/** Read row number <i>row</i> of the Sequence. The values of the row
+ are obtained by calling the read() method of the sequence. The
+ current \e row just read is stored in the Sequence instance
+ along with its row number. If a selection expression has been
+ supplied, rows are counted only if they satisfy that expression.
+
+ Note that we can only advance in a Sequence. It is not possible to back up
+ and read a row numbered lower than the current row. If you need that
+ you will need to replace the serialize() method with one of your own.
+
+ Used on the server side.
+
+ @note The first row is row number zero. A Sequence with 100 rows will
+ have row numbers 0 to 99.
+
+ @todo This code ignores the main reason for nesting the sequences, that
+ if the outer Sequence's current instance fails the CE, there's no need to
+ look at the values of the inner Sequence. But in the code that calls this
+ method (serialize() and intern_data()) the CE is not evaluated until the
+ inner-most Sequence (i.e., the leaf Sequence) is read. That means that
+ each instance of the inner Sequence is read and the CE evaluated for each
+ of those reads. To fix this, and the overall problem of complexity here,
+ we need to re-think Sequences and how they behave. 11/13/2007 jhrg
+
+ @return A boolean value, with TRUE indicating that read_row
+ should be called again because there's more data to be read.
+ FALSE indicates the end of the Sequence.
+ @param row The row number to read.
+ @param dds A reference to the DDS for this dataset.
+ @param eval Use this as the constraint expression evaluator.
+ @param ce_eval If True, evaluate any CE, otherwise do not.
+ */
+bool Sequence::read_row(int row, DDS &dds, ConstraintEvaluator &eval, bool ce_eval)
+{
+    DBG2(cerr << "Entering Sequence::read_row for " << name() << ", row number " << row << ", current row " << d_row_number << endl);
+    if (row < d_row_number) throw InternalErr("Trying to back up inside a sequence!");
+
+    if (row == d_row_number) {
+        DBG2(cerr << "Leaving Sequence::read_row for " << name() << endl);
+        return false;
+    }
+
+    bool eof = false;  // Start out assuming EOF is false.
+    while (!eof && d_row_number < row) {
+        if (!read_p()) {
+            // jhrg original version from 10/9/13 : eof = (read() == false);
+            eof = read();
+        }
+
+        // Advance the row number if ce_eval is false (we're not supposed to
+        // evaluate the selection) or both ce_eval and the selection are
+        // true.
+        if (!eof && (!ce_eval || eval.eval_selection(dds, dataset()))) d_row_number++;
+
+        set_read_p(false); // ...so that the next instance will be read
+    }
+
+    // Once we finish the above loop, set read_p to true so that the caller
+    // knows that data *has* been read. This is how the read() methods of the
+    // elements of the sequence know to not call read() but instead look for
+    // data values inside themselves.
+    set_read_p(true);
+
+    // Return true if we have valid data, false if we've read to the EOF.
+    DBG2(cerr << "Leaving Sequence::read_row for " << name() << " with eof: " << eof << endl);
+    return !eof; // jhrg 10/10/13 was: eof == 0;
+}
+
+// Private. This is used to process constraints on the rows of a sequence.
+// Starting with 3.2 we support constraints like Sequence[10:2:20]. This
+// odd-looking logic first checks if d_ending_row_number is the sentinel
+// value of -1. If so, the sequence was not constrained by row number and
+// this method should never return true (which indicates that we're at the
+// end of a row-number constraint). If d_ending_row_number is not -1, then is
+// \e i at the end point? 6/1/2001 jhrg
+inline bool Sequence::is_end_of_rows(int i)
+{
+    return ((d_ending_row_number == -1) ? false : (i > d_ending_row_number));
+}
+
+/** Serialize a Sequence.
+
+ Leaf Sequences must be marked as such (see DDS::tag_nested_sequence()),
+ as must the top most Sequence.
+
+ How the code works. Methods called for various functions are named in
+ brackets:
+ <ol>
+ <li>Sending a one-level sequence:
+ <pre>
+ Dataset {
+     Sequence {
+         Int x;
+         Int y;
+     } flat;
+ } case_1;
+ </pre>
+
+ Serialize case_1 by reading successive rows and sending all of those that
+ satisfy the CE. Before each row, send a start of instance (SOI) marker.
+ Once all rows have been sent, send an End of Sequence (EOS)
+ marker.[serialize_leaf].</li>
+
+ <li>Sending a nested sequence:
+ <pre>
+ Dataset {
+     Sequence {
+         Int t;
+         Sequence {
+             Int z;
+         } inner;
+     } outer;
+ } case_2;
+ </pre>
+
+ Serialize case_2 by reading the first row of outer and storing the values. Do
+ not evaluate the CE [serialize_parent_part_one]. Call serialize() for inner
+ and read each row for it, evaluating the CE for each row that is read.
+ After the first row of inner is read and satisfies the CE, write out the
+ SOI marker and values for outer [serialize_parent_part_two], then write
+ the SOI and values for the first row of inner. Continue to read and send
+ rows of inner until the last row has been read. Send EOS for inner
+ [serialize_leaf]. Now read the next row of outer and repeat. Once outer
+ is completely read, send its EOS marker.</li>
+ </ol>
+
+ Notes:
+ <ol>
+ <li>For a nested Sequence, the child sequence must follow all other types
+ in the parent sequence (like the example). There may be only one nested
+ Sequence per level.</li>
+
+ <li>CE evaluation happens only in a leaf sequence.</li>
+
+ <li>When no data satisfies a CE, the empty Sequence is signaled by a
+ single EOS marker, regardless of the level of nesting of Sequences. That
+ is, the EOS marker is sent for only the outer Sequence in the case of a
+ completely empty response.</li>
+ </ol>
+ */
+bool Sequence::serialize(ConstraintEvaluator &eval, DDS &dds, Marshaller &m, bool ce_eval)
+{
+    // Special case leaf sequences!
+    bool status = false;
+
+    if (is_leaf_sequence())
+        status = serialize_leaf(dds, eval, m, ce_eval);
+    else
+        status = serialize_parent_part_one(dds, eval, m);
+
+    return status;
+}
+
+// We know this is not a leaf Sequence. That means that this Sequence holds
+// another Sequence as one of its fields _and_ that child Sequence triggers
+// the actual transmission of values.
+
+bool Sequence::serialize_parent_part_one(DDS &dds, ConstraintEvaluator &eval, Marshaller &m)
+{
+    DBG2(cerr << "Entering serialize_parent_part_one for " << name() << endl);
+
+    int i = (d_starting_row_number != -1) ? d_starting_row_number : 0;
+
+    // read_row returns true if valid data was read, false if the EOF was
+    // found. 6/1/2001 jhrg
+    // Since this is a parent sequence, read the row ignoring the CE (all of
+    // the CE clauses will be evaluated by the leaf sequence).
+    bool status = read_row(i, dds, eval, false);
+    DBG2(cerr << "Sequence::serialize_parent_part_one::read_row() status: " << status << endl);
+
+    while (status && !is_end_of_rows(i)) {
+        i += d_row_stride;
+
+        // DBG(cerr << "Writing Start of Instance marker" << endl);
+        // write_start_of_instance(sink);
+
+        // In this loop serialize will signal an error with an exception.
+        for (Vars_iter iter = d_vars.begin(); iter != d_vars.end(); iter++) {
+            // Only call serialize for child Sequences; the leaf sequence
+            // will trigger the transmission of values for its parents (this
+            // sequence and maybe others) once it gets some valid data to
+            // send.
+            // Note that if the leaf sequence has no variables in the current
+            // projection, its serialize() method will never be called and that's
+            // the method that triggers actually sending values. Thus the leaf
+            // sequence must be the lowest level sequence with values whose send_p
+            // property is true.
+            if ((*iter)->send_p() && (*iter)->type() == dods_sequence_c) (*iter)->serialize(eval, dds, m);
+        }
+
+        set_read_p(false); // ...so this will read the next instance
+
+        status = read_row(i, dds, eval, false);
+        DBG(cerr << "Sequence::serialize_parent_part_one::read_row() status: " << status << endl);
+    }
+    // Reset current row number for next nested sequence element.
+    d_row_number = -1;
+
+    // Always write the EOS marker? 12/23/04 jhrg
+    // Yes. According to DAP2, a completely empty response is signaled by
+    // a return value of only the EOS marker for the outermost sequence.
+    if (d_top_most || d_wrote_soi) {
+        DBG(cerr << "Writing End of Sequence marker" << endl);
+        write_end_of_sequence(m);
+        d_wrote_soi = false;
+    }
+
+    return true;  // Signal errors with exceptions.
+}
+
+// If we are here then we know that this is 'parent sequence' and that the
+// leaf sequence has found valid data to send. We also know that
+// serialize_parent_part_one has been called so data are in the instance's
+// fields. This is where we send data. Whereas ..._part_one() contains a
+// loop to iterate over all of rows in a parent sequence, this does not. This
+// method assumes that the serialize_leaf() will call it each time it needs
+// to be called.
+//
+// NB: This code only works if the child sequences appear after all other
+// variables.
+void Sequence::serialize_parent_part_two(DDS &dds, ConstraintEvaluator &eval, Marshaller &m)
+{
+    DBG(cerr << "Entering serialize_parent_part_two for " << name() << endl);
+
+    BaseType *btp = get_parent();
+    if (btp && btp->type() == dods_sequence_c) static_cast<Sequence&>(*btp).serialize_parent_part_two(dds, eval, m);
+
+    if (d_unsent_data) {
+        DBG(cerr << "Writing Start of Instance marker" << endl);
+        d_wrote_soi = true;
+        write_start_of_instance(m);
+
+        // In this loop serialize will signal an error with an exception.
+        for (Vars_iter iter = d_vars.begin(); iter != d_vars.end(); iter++) {
+            // Send all the non-sequence variables
+            DBG(cerr << "Sequence::serialize_parent_part_two(), serializing "
+                    << (*iter)->name() << endl);
+            if ((*iter)->send_p() && (*iter)->type() != dods_sequence_c) {
+                DBG(cerr << "Send P is true, sending " << (*iter)->name() << endl);
+                (*iter)->serialize(eval, dds, m, false);
+            }
+        }
+
+        d_unsent_data = false;              // read should set this.
+    }
+}
+
+// This code is only run by a leaf sequence. Note that a one level sequence
+// is also a leaf sequence.
+bool Sequence::serialize_leaf(DDS &dds, ConstraintEvaluator &eval, Marshaller &m, bool ce_eval)
+{
+    DBG(cerr << "Entering Sequence::serialize_leaf for " << name() << endl);
+    int i = (d_starting_row_number != -1) ? d_starting_row_number : 0;
+
+    // read_row returns true if valid data was read, false if the EOF was
+    // found. 6/1/2001 jhrg
+    bool status = read_row(i, dds, eval, ce_eval);
+    DBG(cerr << "Sequence::serialize_leaf::read_row() status: " << status << endl);
+
+    // Once the first valid (satisfies the CE) row of the leaf sequence has
+    // been read, we know we're going to send data. Send the current instance
+    // of the parent/ancestor sequences now, if there are any. We only need
+    // to do this once, hence it's not inside the while loop, but we only
+    // send the parent seq data _if_ there's data in the leaf to send, that's
+    // why we wait until after the first call to read_row() here in the leaf
+    // sequence.
+    //
+    // NB: It's important to only call serialize_parent_part_two() for a
+    // Sequence that really is the parent of a leaf sequence.
+    if (status && !is_end_of_rows(i)) {
+        BaseType *btp = get_parent();
+        if (btp && btp->type() == dods_sequence_c) static_cast<Sequence&>(*btp).serialize_parent_part_two(dds, eval, m);
+    }
+
+    d_wrote_soi = false;
+    while (status && !is_end_of_rows(i)) {
+        i += d_row_stride;
+
+        DBG(cerr << "Writing Start of Instance marker" << endl);
+        d_wrote_soi = true;
+        write_start_of_instance(m);
+
+        // In this loop serialize will signal an error with an exception.
+        for (Vars_iter iter = d_vars.begin(); iter != d_vars.end(); iter++) {
+            DBG(cerr << "Sequence::serialize_leaf(), serializing "
+                    << (*iter)->name() << endl);
+            if ((*iter)->send_p()) {
+                DBG(cerr << "Send P is true, sending " << (*iter)->name() << endl);
+                (*iter)->serialize(eval, dds, m, false);
+            }
+        }
+
+        set_read_p(false); // ...so this will read the next instance
+
+        status = read_row(i, dds, eval, ce_eval);
+        DBG(cerr << "Sequence::serialize_leaf::read_row() status: " << status << endl);
+    }
+
+    // Only write the EOS marker if there's a matching Start Of Instance
+    // Marker in the stream.
+    if (d_wrote_soi || d_top_most) {
+        DBG(cerr << "Writing End of Sequence marker" << endl);
+        write_end_of_sequence(m);
+    }
+
+    return true;  // Signal errors with exceptions.
+}
+
+/** This method is used to evaluate a constraint and based on those results
+ load the Sequence variable with data. This simulates having a server call
+ the serialize() method and a client call the deserialize() method without
+ the overhead of any IPC. Use this method on the server-side to 'load the
+ d_values field with data' so that other code and work with those data.
+
+ The somewhat odd algorithm used by serialize() is largely copied here, so
+ comments about logic in serialize() and the related methods apply here
+ as well.
+
+ @note Even though each Sequence variable has a \e values field, only the
+ top-most Sequence in a hierarchy of Sequences holds values. The field
+ accessed by the var_value() method is a completely linked object; access
+ the values of nested Sequences using the BaseType objects returned by
+ var_value().
+
+ @note Only call this method for top-most Sequences. Never call it for
+ Sequences which have a parent (directly or indirectly) variable that is
+ a Sequence.
+
+ @param eval Use this constraint evaluator
+ @param dds This DDS holds the variables for the data source */
+void Sequence::intern_data(ConstraintEvaluator &eval, DDS &dds)
+{
+    DBG(cerr << "Sequence::intern_data - for " << name() << endl); DBG2(cerr << "    intern_data, values: " << &d_values << endl);
+
+    // Why use a stack instead of return values? We need the stack because
+    // Sequences nested three of more levels deep will loose the middle
+    // instances when the intern_data_parent_part_two() code is run.
+    sequence_values_stack_t sequence_values_stack;
+
+    sequence_values_stack.push(&d_values);
+
+    intern_data_private(eval, dds, sequence_values_stack);
+}
+
+void Sequence::intern_data_private(ConstraintEvaluator &eval, DDS &dds, sequence_values_stack_t &sequence_values_stack)
+{
+    DBG(cerr << "Entering intern_data_private for " << name() << endl);
+
+    if (is_leaf_sequence())
+        intern_data_for_leaf(dds, eval, sequence_values_stack);
+    else
+        intern_data_parent_part_one(dds, eval, sequence_values_stack);
+}
+
+void Sequence::intern_data_parent_part_one(DDS & dds, ConstraintEvaluator & eval,
+        sequence_values_stack_t & sequence_values_stack)
+{
+    DBG(cerr << "Entering intern_data_parent_part_one for " << name() << endl);
+
+    int i = (get_starting_row_number() != -1) ? get_starting_row_number() : 0;
+
+    // read_row returns true if valid data was read, false if the EOF was
+    // found. 6/1/2001 jhrg
+    // Since this is a parent sequence, read the row ignoring the CE (all of
+    // the CE clauses will be evaluated by the leaf sequence).
+    bool status = read_row(i, dds, eval, false);
+
+    // Grab the current size of the value stack. We do this because it is
+    // possible that no nested sequences for this row happened to be
+    // selected because of a constraint evaluation or the last row is not
+    // selected because of a constraint evaluation. In either case, no
+    // nested sequence d_values are pushed onto the stack, so there is
+    // nothing to pop at the end of this function. pcw 07/14/08
+    SequenceValues::size_type orig_stack_size = sequence_values_stack.size();
+
+    while (status && (get_ending_row_number() == -1 || i <= get_ending_row_number())) {
+        i += get_row_stride();
+        for (Vars_iter iter = var_begin(); iter != var_end(); iter++) {
+            if ((*iter)->send_p()) {
+                switch ((*iter)->type()) {
+                case dods_sequence_c:
+                    static_cast<Sequence&>(**iter).intern_data_private(eval, dds, sequence_values_stack);
+                    break;
+
+                default:
+                    (*iter)->intern_data(eval, dds);
+                    break;
+                }
+            }
+        }
+
+        set_read_p(false);      // ...so this will read the next instance
+
+        status = read_row(i, dds, eval, false);
+    }
+
+    // Reset current row number for next nested sequence element.
+    reset_row_number();
+
+    // if the size of the stack is larger than the original size (retrieved
+    // above) then pop the top set of d_values from the stack. If it's the
+    // same, then no nested sequences, or possibly the last nested sequence,
+    // were pushed onto the stack, so there is nothing to pop.
+    if (sequence_values_stack.size() > orig_stack_size) {
+        DBG2(cerr << "    popping d_values (" << sequence_values_stack.top()
+                << ") off stack; size: " << sequence_values_stack.size() << endl);
+        sequence_values_stack.pop();
+    }
+
+    DBG(cerr << "Leaving intern_data_parent_part_one for " << name() << endl);
+}
+
+void Sequence::intern_data_parent_part_two(DDS &dds, ConstraintEvaluator &eval,
+        sequence_values_stack_t &sequence_values_stack)
+{
+    DBG(cerr << "Entering intern_data_parent_part_two for " << name() << endl);
+
+    BaseType *btp = get_parent();
+    if (btp && btp->type() == dods_sequence_c) {
+        static_cast<Sequence&>(*btp).intern_data_parent_part_two(dds, eval, sequence_values_stack);
+    }
+
+    DBG2(cerr << "    stack size: " << sequence_values_stack.size() << endl);
+    SequenceValues *values = sequence_values_stack.top();
+    DBG2(cerr << "    using values = " << (void *)values << endl);
+
+    if (get_unsent_data()) {
+        BaseTypeRow *row_data = new BaseTypeRow;
+
+        // In this loop transfer_data will signal an error with an exception.
+        for (Vars_iter iter = var_begin(); iter != var_end(); iter++) {
+
+            if ((*iter)->send_p() && (*iter)->type() != dods_sequence_c) {
+                row_data->push_back((*iter)->ptr_duplicate());
+            }
+            else if ((*iter)->send_p()) { //Sequence; must be the last variable
+                Sequence *tmp = dynamic_cast<Sequence*>((*iter)->ptr_duplicate());
+                if (!tmp) {
+                    delete row_data;
+                    throw InternalErr(__FILE__, __LINE__, "Expected a Sequence.");
+                }
+                row_data->push_back(tmp);
+                DBG2(cerr << "    pushing d_values of " << tmp->name()
+                        << " (" << &(tmp->d_values)
+                        << ") on stack; size: " << sequence_values_stack.size()
+                        << endl);
+                // This pushes the d_values field of the newly created leaf
+                // Sequence onto the stack. The code then returns to intern
+                // _data_for_leaf() where this value will be used.
+                sequence_values_stack.push(&(tmp->d_values));
+            }
+        }
+
+        DBG2(cerr << "    pushing values for " << name()
+                << " to " << values << endl);
+        values->push_back(row_data);
+        set_unsent_data(false);
+    }
+
+    DBG(cerr << "Leaving intern_data_parent_part_two for " << name() << endl);
+}
+
+void Sequence::intern_data_for_leaf(DDS &dds, ConstraintEvaluator &eval, sequence_values_stack_t &sequence_values_stack)
+{
+    DBG(cerr << "Entering intern_data_for_leaf for " << name() << endl);
+
+    int i = (get_starting_row_number() != -1) ? get_starting_row_number() : 0;
+
+    DBG2(cerr << "    reading row " << i << endl);
+    bool status = read_row(i, dds, eval, true);
+    DBG2(cerr << "    status: " << status << endl); DBG2(cerr << "    ending row number: " << get_ending_row_number() << endl);
+
+    if (status && (get_ending_row_number() == -1 || i <= get_ending_row_number())) {
+        BaseType *btp = get_parent();
+        if (btp && btp->type() == dods_sequence_c) {
+            // This call will read the values for the parent sequences and
+            // then allocate a new instance for the leaf and push that onto
+            // the stack.
+            static_cast<Sequence&>(*btp).intern_data_parent_part_two(dds, eval, sequence_values_stack);
+        }
+
+        // intern_data_parent_part_two pushes the d_values field of the leaf
+        // onto the stack, so this operation grabs that value and then loads
+        // data into it.
+        SequenceValues *values = sequence_values_stack.top();
+        DBG2(cerr << "    using values = " << values << endl);
+
+        while (status && (get_ending_row_number() == -1 || i <= get_ending_row_number())) {
+            i += get_row_stride();
+
+            // Copy data from the object's fields to this new BaeTypeRow instance
+            BaseTypeRow *row_data = new BaseTypeRow;
+            for (Vars_iter iter = var_begin(); iter != var_end(); iter++) {
+                if ((*iter)->send_p()) {
+                    row_data->push_back((*iter)->ptr_duplicate());
+                }
+            }
+
+            DBG2(cerr << "    pushing values for " << name()
+                    << " to " << values << endl);
+            // Save the row_data to values().
+            values->push_back(row_data);
+
+            set_read_p(false);      // ...so this will read the next instance
+            // Read the ith row into this object's fields
+            status = read_row(i, dds, eval, true);
+        }
+
+        DBG2(cerr << "    popping d_values (" << sequence_values_stack.top()
+                << ") off stack; size: " << sequence_values_stack.size() << endl);
+        sequence_values_stack.pop();
+    }
+
+    DBG(cerr << "Leaving intern_data_for_leaf for " << name() << endl);
+}
+
+/** @brief Deserialize (read from the network) the entire Sequence.
+
+ This method used to read a single row at a time. Now the entire
+ sequence is read at once. The method used to return True to indicate
+ that more data needed to be deserialized and False when the sequence
+ was completely read. Now it simply returns false. This might seem odd,
+ but making this method return false breaks existing software the least.
+
+ @param um An UnMarshaller that knows how to deserialize data
+ @param dds A DataDDS from which to read.
+ @param reuse Passed to child objects when they are deserialized. Some
+ implementations of deserialize() use this to determine if new storage should
+ be allocated or existing storage reused.
+ @exception Error if a sequence stream marker cannot be read.
+ @exception InternalErr if the <tt>dds</tt> param is not a DataDDS.
+ @return A return value of false indicates that an EOS ("end of
+ Sequence") marker was found, while a value of true indicates
+ that there are more rows to be read. This version always reads the
+ entire sequence, so it always returns false.
+ */
+bool Sequence::deserialize(UnMarshaller &um, DDS *dds, bool reuse)
+{
+#if 0
+    // Nathan's tip - this is something that should never happen
+    DataDDS *dd = dynamic_cast<DataDDS *>(dds);
+    if (!dd) throw InternalErr("Expected argument 'dds' to be a DataDDS!");
+
+    DBG2(cerr << "Reading from server/protocol version: "
+            << dd->get_protocol_major() << "." << dd->get_protocol_minor()
+            << endl);
+
+    // Check for old servers.
+    if (dd->get_protocol_major() < 2) {
+        throw Error(
+                string("The protocl version (") + dd->get_protocol()
+                        + ") indicates that this\nis an old server which may not correctly transmit Sequence variables.\nContact the server administrator.");
+    }
+#endif
+    while (true) {
+        // Grab the sequence stream's marker.
+        unsigned char marker = read_marker(um);
+        if (is_end_of_sequence(marker))
+            break;  // EXIT the while loop here!!!
+        else if (is_start_of_instance(marker)) {
+            d_row_number++;
+            DBG2(cerr << "Reading row " << d_row_number << " of "
+                    << name() << endl);
+            BaseTypeRow *bt_row_ptr = new BaseTypeRow;
+            // Read the instance's values, building up the row
+            for (Vars_iter iter = d_vars.begin(); iter != d_vars.end(); iter++) {
+                BaseType *bt_ptr = (*iter)->ptr_duplicate();
+                bt_ptr->deserialize(um, dds, reuse);
+                DBG2(cerr << "Deserialized " << bt_ptr->name() << " ("
+                        << bt_ptr << ") = "); DBG2(bt_ptr->print_val(stderr, ""));
+                bt_row_ptr->push_back(bt_ptr);
+            }
+            // Append this row to those accumulated.
+            d_values.push_back(bt_row_ptr);
+        }
+        else
+            throw Error("I could not read the expected Sequence data stream marker!");
+    };
+
+    return false;
+}
+
+// Return the current row number.
+
+/** Return the starting row number if the sequence was constrained using
+ row numbers (instead of, or in addition to, a relational constraint).
+ If a relational constraint was also given, the row number corresponds
+ to the row number of the sequence <i>after</i> applying the relational
+ constraint.
+
+ If the bracket notation was not used to constrain this sequence, this
+ method returns -1.
+
+ @brief Get the starting row number.
+ @return The starting row number. */
+int Sequence::get_starting_row_number()
+{
+    return d_starting_row_number;
+}
+
+/** Return the row stride number if the sequence was constrained using
+ row numbers (instead of, or in addition to, a relational constraint).
+ If a relational constraint was also given, the row stride is applied
+ to the sequence <i>after</i> applying the relational constraint.
+
+ If the bracket notation was not used to constrain this sequence, this
+ method returns -1.
+
+ @brief Get the row stride.
+ @return The row stride. */
+int Sequence::get_row_stride()
+{
+    return d_row_stride;
+}
+
+/** Return the ending row number if the sequence was constrained using
+ row numbers (instead of, or in addition to, a relational constraint).
+ If a relational constraint was also given, the row number corresponds
+ to the row number of the sequence <i>after</i> applying the
+ relational constraint.
+
+ If the bracket notation was not used to constrain this sequence, this
+ method returns -1.
+
+ @brief Get the ending row number.
+ @return The ending row number. */
+int Sequence::get_ending_row_number()
+{
+    return d_ending_row_number;
+}
+
+/** Set the start, stop and stride for a row-number type constraint.
+ This should be used only when the sequence is constrained using the
+ bracket notation (which supplies start, stride and stop information).
+ If omitted, the stride defaults to 1.
+
+ @param start The starting row number. The first row is row zero.
+ @param stop The ending row number. The 20th row is row 19.
+ @param stride The stride. A stride of two skips every other row. */
+void Sequence::set_row_number_constraint(int start, int stop, int stride)
+{
+    if (stop < start) throw Error(malformed_expr, "Starting row number must precede the ending row number.");
+
+    d_starting_row_number = start;
+    d_row_stride = stride;
+    d_ending_row_number = stop;
+}
+
+void Sequence::print_one_row(FILE *out, int row, string space, bool print_row_num)
+{
+    ostringstream oss;
+    print_one_row(oss, row, space, print_row_num);
+    fwrite(oss.str().data(), sizeof(char), oss.str().length(), out);
+}
+
+void Sequence::print_one_row(ostream &out, int row, string space, bool print_row_num)
+{
+    if (print_row_num) out << "\n" << space << row << ": ";
+
+    out << "{ ";
+
+    int elements = element_count();
+    int j = 0;
+    BaseType *bt_ptr = 0;
+
+    // This version of print_one_row() works for both data read with
+    // deserialize(), where each variable is assumed to have valid data, and
+    // intern_data(), where some/many variables do not. Because of that, it's
+    // not correct to assume that all of the elements will be printed, which
+    // is what the old code did.
+    // Print the first value
+    while (j < elements && !bt_ptr) {
+        bt_ptr = var_value(row, j++);
+        if (bt_ptr) {  // data
+            if (bt_ptr->type() == dods_sequence_c)
+                static_cast<Sequence*>(bt_ptr)->print_val_by_rows(out, space + "    ", false, print_row_num);
+            else
+                bt_ptr->print_val(out, space, false);
+        }
+    }
+
+    // Print the remaining values
+    while (j < elements) {
+        bt_ptr = var_value(row, j++);
+        if (bt_ptr) {  // data
+            out << ", ";
+            if (bt_ptr->type() == dods_sequence_c)
+                static_cast<Sequence*>(bt_ptr)->print_val_by_rows(out, space + "    ", false, print_row_num);
+            else
+                bt_ptr->print_val(out, space, false);
+        }
+    }
+
+    out << " }";
+}
+
+void Sequence::print_val_by_rows(FILE *out, string space, bool print_decl_p, bool print_row_numbers)
+{
+    ostringstream oss;
+    print_val_by_rows(oss, space, print_decl_p, print_row_numbers);
+    fwrite(oss.str().data(), sizeof(char), oss.str().length(), out);
+}
+
+void Sequence::print_val_by_rows(ostream &out, string space, bool print_decl_p, bool print_row_numbers)
+{
+    if (print_decl_p) {
+        print_decl(out, space, false);
+        out << " = ";
+    }
+
+    out << "{ ";
+
+    int rows = number_of_rows() - 1;
+    int i;
+    for (i = 0; i < rows; ++i) {
+        print_one_row(out, i, space, print_row_numbers);
+        out << ", ";
+    }
+    print_one_row(out, i, space, print_row_numbers);
+
+    out << " }";
+
+    if (print_decl_p) out << ";\n";
+}
+
+void Sequence::print_val(FILE *out, string space, bool print_decl_p)
+{
+    print_val_by_rows(out, space, print_decl_p, false);
+}
+
+void Sequence::print_val(ostream &out, string space, bool print_decl_p)
+{
+    print_val_by_rows(out, space, print_decl_p, false);
+}
+
+void Sequence::set_leaf_p(bool state)
+{
+    d_leaf_sequence = state;
+}
+
+bool Sequence::is_leaf_sequence()
+{
+    return d_leaf_sequence;
+}
+
+/** @brief Mark the Sequence which holds the leaf elements.
+
+ In a nested Sequence, the Sequence which holds the leaf elements is special
+ because it during the serialization of this Sequence's data that constraint
+ Expressions must be evaluated. If CEs are evaluated at the upper levels,
+ then valid data may not be sent because it was effectively hidden from the
+ serialization and evaluation code (see the documentation for the serialize_leaf()
+ method).
+
+ The notion of the leaf Sequence needs to be modified to mean the lowest level
+ of a Sequence where data are to be sent. Suppose there's a two level Sequence,
+ but that only fields from the top level are to be sent. Then that top level
+ is also the leaf Sequence and should be marked as such. If the lower level is
+ marked as a leaf Sequence, then no values will ever be sent since the send_p
+ property will always be false for each field and it's the call to
+ serialize_leaf() that actually triggers transmission of values (because it's
+ not until the code makes it into serialize_leaf() that it knows there are
+ values to be sent.
+
+ @note This method \e must not be called before the CE is parsed.
+
+ @param lvl The current level of the Sequence. a \e lvl of 1 indicates the
+ topmost Sequence. The default value is 1.
+ @see Sequence::serialize_leaf() */
+void Sequence::set_leaf_sequence(int lvl)
+{
+    bool has_child_sequence = false;
+
+    if (lvl == 1) d_top_most = true;
+
+    DBG2(cerr << "Processing sequence " << name() << endl);
+
+    for (Vars_iter iter = d_vars.begin(); iter != d_vars.end(); iter++) {
+        // About the test for send_p(): Only descend into a sequence if it has
+        // fields that might be sent. Thus if, in a two-level sequence, nothing
+        // in the lower level is to be sent, the upper level is marked as the
+        // leaf sequence. This ensures that values _will_ be sent (see the comment
+        // in serialize_leaf() and serialize_parent_part_one()).
+        if ((*iter)->type() == dods_sequence_c && (*iter)->send_p()) {
+            if (has_child_sequence)
+                throw Error("This implementation does not support more than one nested sequence at a level. Contact the server administrator.");
+
+            has_child_sequence = true;
+            static_cast<Sequence&>(**iter).set_leaf_sequence(++lvl);
+        }
+        else if ((*iter)->type() == dods_structure_c) {
+            static_cast<Structure&>(**iter).set_leaf_sequence(lvl);
+        }
+    }
+
+    if (!has_child_sequence)
+        set_leaf_p(true);
+    else
+        set_leaf_p(false);
+
+    DBG2(cerr << "is_leaf_sequence(): " << is_leaf_sequence() << " (" << name() << ")" << endl);
+}
+
+/** @brief dumps information about this object
+ *
+ * Displays the pointer value of this instance and information about this
+ * instance.
+ *
+ * @param strm C++ i/o stream to dump the information to
+ * @return void
+ */
+void Sequence::dump(ostream &strm) const
+{
+    strm << DapIndent::LMarg << "Sequence::dump - (" << (void *) this << ")" << endl;
+    DapIndent::Indent();
+    Constructor::dump(strm);
+    strm << DapIndent::LMarg << "# rows deserialized: " << d_row_number << endl;
+    strm << DapIndent::LMarg << "bracket notation information:" << endl;
+    DapIndent::Indent();
+    strm << DapIndent::LMarg << "starting row #: " << d_starting_row_number << endl;
+    strm << DapIndent::LMarg << "row stride: " << d_row_stride << endl;
+    strm << DapIndent::LMarg << "ending row #: " << d_ending_row_number << endl;
+    DapIndent::UnIndent();
+
+    strm << DapIndent::LMarg << "data been sent? " << d_unsent_data << endl;
+    strm << DapIndent::LMarg << "start of instance? " << d_wrote_soi << endl;
+    strm << DapIndent::LMarg << "is leaf sequence? " << d_leaf_sequence << endl;
+    strm << DapIndent::LMarg << "top most in hierarchy? " << d_top_most << endl;
+    DapIndent::UnIndent();
+}
+
+} // namespace libdap
+
diff --git a/Sequence.h b/Sequence.h
new file mode 100644
index 0000000..49aafee
--- /dev/null
+++ b/Sequence.h
@@ -0,0 +1,312 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1994-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// Interface for the class Sequence. A sequence contains a single set
+// of variables, all at the same lexical level just like a structure
+// (and like a structure, it may contain other ctor types...). Unlike
+// a structure, a sequence defines a pattern that is repeated N times
+// for a sequence of N elements. Thus, Sequence { String name; Int32
+// age; } person; means a sequence of N persons where each contain a
+// name and age. The sequence can be arbitrarily long (i.e., you don't
+// know N by looking at the sequence declaration.
+//
+// jhrg 9/14/94
+
+#ifndef _sequence_h
+#define _sequence_h 1
+
+#include <stack>
+
+#include "Constructor.h"
+
+#ifndef S_XDRUtils_h
+#include "XDRUtils.h"
+#endif
+
+namespace libdap {
+
+class BaseType;
+class ConstraintEvaluator;
+class D4Group;
+
+/** The type BaseTypeRow is used to store single rows of values in an
+ instance of Sequence. Values are stored in instances of BaseType. */
+typedef vector<BaseType *> BaseTypeRow;
+
+/** This type holds all of the values of a Sequence. */
+typedef vector<BaseTypeRow *> SequenceValues;
+
+/** This is the interface for the class Sequence. A sequence contains
+ a single set of variables, all at the same lexical level just like
+ a Structure.  Like a Structure, a Sequence may contain other
+ compound types, including other Sequences.  Unlike a Structure, a
+ Sequence defines a pattern that is repeated N times for a sequence
+ of N elements. It is useful to think of a Sequence as representing
+ a table of values (like a relational database), with each row of
+ the table corresponding to a Sequence ``instance.''  (This usage
+ can be confusing, since ``instance'' also refers to a particular
+ item of class Sequence.)  For example:
+
+ <pre>
+ Sequence {
+ String name;
+ Int32 age;
+ } person;
+ </pre>
+
+ This represents a Sequence of ``person'' records, each instance of
+ which contains a name and an age:
+
+ <pre>
+ Fred       34
+ Ralph      23
+ Andrea     29
+ ...
+ </pre>
+
+ A Sequence can be arbitrarily long, which is to say that its
+ length is not part of its declaration.  A Sequence can contain
+ other Sequences:
+
+ <pre>
+ Sequence {
+ String name;
+ Int32 age;
+ Sequence {
+ String friend;
+ } friend_list;
+ } person;
+ </pre>
+
+ This is still represented as a single table, but each row contains
+ the elements of both the main Sequence and the nested one:
+
+ <pre>
+ Fred       34     Norman
+ Fred       34     Andrea
+ Fred       34     Ralph
+ Fred       34     Lisa
+ Ralph      23     Norman
+ Ralph      23     Andrea
+ Ralph      23     Lisa
+ Ralph      23     Marth
+ Ralph      23     Throckmorton
+ Ralph      23     Helga
+ Ralph      23     Millicent
+ Andrea     29     Ralph
+ Andrea     29     Natasha
+ Andrea     29     Norman
+ ...        ..     ...
+ </pre>
+
+ Internally, the Sequence is represented by a vector of vectors. The
+ members of the outer vector are the members of the Sequence. This
+ includes the nested Sequences, as in the above example.
+
+ NB: Note that in the past this class had a different behavior. It held
+ only one row at a time and the deserialize(...) method had to be called
+ from within a loop. This is <i>no longer true</i>. Now the
+ deserailize(...) method should be called once and will read the entire
+ sequence's values from the server. All the values are now stored in an
+ instance of Sequence, not just a single row's.
+
+ Because the length of a Sequence is indeterminate, there are
+ changes to the behavior of the functions to read this class of
+ data.  The <tt>read()</tt> function for Sequence must be written so that
+ successive calls return values for successive rows of the Sequence.
+
+ Similar to a C structure, you refer to members of Sequence
+ elements with a ``.'' notation.  For example, if the Sequence has
+ a member Sequence called ``Tom'' and Tom has a member Float32
+ called ``shoe_size'', you can refer to Tom's shoe size as
+ ``Tom.shoe_size''.
+
+ @note This class contains the 'logic' for both the server- and client-side
+ behavior. The field \e d_values is used by the client-side methods to store
+ the entire Sequence. On the server-side, the read() method uses an underlying
+ data system to read one row of data values which are then serialized using the
+ serialize() methods of each variable.
+
+ @todo Add an isEmpty() method which returns true if the Sequence is
+ empty. This should work before and after calling deserialize().
+
+ @brief Holds a sequence. */
+
+class Sequence: public Constructor
+{
+private:
+    // This holds the values read off the wire. Values are stored in
+    // instances of BaseTypeRow objects which hold instances of BaseType.
+    SequenceValues d_values;
+
+    // The number of the row that has just been deserialized. Before
+    // deserialized has been called, this field is -1.
+    int d_row_number;
+
+    // If a client asks for certain rows of a sequence using the bracket
+    // notation (<tt>[<start>:<stride>:<stop>]</tt>) primarily intended for
+    // arrays
+    // and grids, record that information in the next three fields. This
+    // information can be used by the translation software. s.a. the accessor
+    // and mutator methods for these members. Values of -1 indicate that
+    // these have not yet been set.
+    int d_starting_row_number;
+    int d_row_stride;
+    int d_ending_row_number;
+
+    // Used to track if data has not already been sent.
+    bool d_unsent_data;
+
+    // Track if the Start Of Instance marker has been written. Needed to
+    // properly send EOS for only the outer Sequence when a selection
+    // returns an empty Sequence.
+    bool d_wrote_soi;
+
+    // This signals whether the sequence is a leaf or parent.
+    bool d_leaf_sequence;
+
+    // In a hierarchy of sequences, is this the top most?
+    bool d_top_most;
+
+    bool is_end_of_rows(int i);
+
+    friend class SequenceTest;
+
+protected:
+    void m_duplicate(const Sequence &s);
+    typedef stack<SequenceValues*> sequence_values_stack_t;
+
+    virtual bool serialize_parent_part_one(DDS &dds, ConstraintEvaluator &eval, Marshaller &m);
+    virtual void serialize_parent_part_two(DDS &dds, ConstraintEvaluator &eval, Marshaller &m);
+    virtual bool serialize_leaf(DDS &dds, ConstraintEvaluator &eval, Marshaller &m, bool ce_eval);
+
+    virtual void intern_data_private(ConstraintEvaluator &eval, DDS &dds,
+            sequence_values_stack_t &sequence_values_stack);
+    virtual void intern_data_for_leaf(DDS &dds, ConstraintEvaluator &eval,
+            sequence_values_stack_t &sequence_values_stack);
+
+    virtual void intern_data_parent_part_one(DDS &dds, ConstraintEvaluator &eval,
+            sequence_values_stack_t &sequence_values_stack);
+
+    virtual void intern_data_parent_part_two(DDS &dds, ConstraintEvaluator &eval,
+            sequence_values_stack_t &sequence_values_stack);
+
+public:
+
+    Sequence(const string &n);
+    Sequence(const string &n, const string &d);
+
+    Sequence(const Sequence &rhs);
+
+    virtual ~Sequence();
+
+    Sequence &operator=(const Sequence &rhs);
+
+    virtual BaseType *ptr_duplicate();
+
+    virtual void clear_local_data();
+
+    virtual void transform_to_dap4(D4Group *root, Constructor *container);
+
+    virtual bool is_dap2_only_type();
+
+    virtual string toString();
+
+    virtual bool is_linear();
+
+    virtual int length() const;
+
+    virtual int number_of_rows() const;
+
+    virtual bool read_row(int row, DDS &dds, ConstraintEvaluator &eval, bool ce_eval = true);
+
+    virtual void intern_data(ConstraintEvaluator &eval, DDS &dds);
+    virtual bool serialize(ConstraintEvaluator &eval, DDS &dds, Marshaller &m, bool ce_eval = true);
+    virtual bool deserialize(UnMarshaller &um, DDS *dds, bool reuse = false);
+
+    /// Rest the row number counter
+    void reset_row_number();
+    // I added a second method instead of a param with a default value because I think
+    // this will result only in an addition to the ABI/API, not a change. 5/16/15 jhrg
+    void reset_row_number(bool recur);
+    void increment_row_number(unsigned int i) { d_row_number += i; }
+    int get_row_number() const { return d_row_number; }
+
+    int get_starting_row_number();
+
+    virtual int get_row_stride();
+
+    virtual int get_ending_row_number();
+
+    virtual void set_row_number_constraint(int start, int stop, int stride = 1);
+
+    /// Get the unsent data property
+    bool get_unsent_data() const
+    {
+        return d_unsent_data;
+    }
+
+    /// Set the unsent data property
+    void set_unsent_data(bool usd)
+    {
+        d_unsent_data = usd;
+    }
+
+    virtual void set_value(SequenceValues &values);
+    virtual SequenceValues value();
+    virtual SequenceValues &value_ref();
+
+    virtual BaseType *var_value(size_t row, const string &name);
+
+    virtual BaseType *var_value(size_t row, size_t i);
+
+    virtual BaseTypeRow *row_value(size_t row);
+    virtual void print_one_row(ostream &out, int row, string space, bool print_row_num = false);
+    virtual void print_val_by_rows(ostream &out, string space = "", bool print_decl_p = true, bool print_row_numbers =
+            true);
+    virtual void print_val(ostream &out, string space = "", bool print_decl_p = true);
+
+    virtual void print_one_row(FILE *out, int row, string space, bool print_row_num = false);
+    virtual void print_val_by_rows(FILE *out, string space = "", bool print_decl_p = true,
+            bool print_row_numbers = true);
+    virtual void print_val(FILE *out, string space = "", bool print_decl_p = true);
+
+    virtual void set_leaf_p(bool state);
+
+    virtual bool is_leaf_sequence();
+
+    virtual void set_leaf_sequence(int lvl = 1);
+
+    virtual void dump(ostream &strm) const;
+};
+
+} // namespace libdap
+
+#endif //_sequence_h
diff --git a/ServerFunction.cc b/ServerFunction.cc
new file mode 100644
index 0000000..2558804
--- /dev/null
+++ b/ServerFunction.cc
@@ -0,0 +1,98 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2013 OPeNDAP, Inc.
+// Author: Nathan Potter <npotter@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+/*
+ * AbstractFunction.cc
+ *
+ *  Created on: Feb 2, 2013
+ *      Author: ndp
+ */
+
+#include "config.h"
+
+#include "ServerFunction.h"
+
+using namespace std;
+
+namespace libdap {
+
+ServerFunction::ServerFunction() : d_bool_func(0), d_btp_func(0), d_proj_func(0), d_d4_function(0)
+{
+	setName("abstract_function");
+	setDescriptionString("This function does nothing.");
+	setUsageString("You can't use this function");
+	setRole("http://services.opendap.org/dap4/server-side-function/null");
+	setDocUrl("http://docs.opendap.org/index.php/Server_Side_Processing_Functions");
+}
+
+ServerFunction::ServerFunction(string name, string version, string description, string usage, string doc_url,
+		string role, bool_func f) : d_bool_func(0), d_btp_func(0), d_proj_func(0), d_d4_function(0)
+{
+	setName(name);
+	setVersion(version);
+	setDescriptionString(description);
+	setUsageString(usage);
+	setRole(role);
+	setDocUrl(doc_url);
+	setFunction(f);
+}
+
+ServerFunction::ServerFunction(string name, string version, string description, string usage, string doc_url,
+		string role, btp_func f) : d_bool_func(0), d_btp_func(0), d_proj_func(0), d_d4_function(0)
+{
+	setName(name);
+	setVersion(version);
+	setDescriptionString(description);
+	setUsageString(usage);
+	setRole(role);
+	setDocUrl(doc_url);
+	setFunction(f);
+
+}
+
+ServerFunction::ServerFunction(string name, string version, string description, string usage, string doc_url,
+		string role, proj_func f) : d_bool_func(0), d_btp_func(0), d_proj_func(0), d_d4_function(0)
+{
+	setName(name);
+	setVersion(version);
+	setDescriptionString(description);
+	setUsageString(usage);
+	setRole(role);
+	setDocUrl(doc_url);
+	setFunction(f);
+}
+
+ServerFunction::ServerFunction(string name, string version, string description, string usage, string doc_url,
+		string role, D4Function f) : d_bool_func(0), d_btp_func(0), d_proj_func(0), d_d4_function(0)
+{
+	setName(name);
+	setVersion(version);
+	setDescriptionString(description);
+	setUsageString(usage);
+	setRole(role);
+	setDocUrl(doc_url);
+	setFunction(f);
+}
+
+} /* namespace libdap */
diff --git a/ServerFunction.h b/ServerFunction.h
new file mode 100644
index 0000000..8898b2a
--- /dev/null
+++ b/ServerFunction.h
@@ -0,0 +1,151 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2013 OPeNDAP, Inc.
+// Author: Nathan Potter <npotter@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+/*
+ * ServerFunction.h
+ *
+ *  Created on: Feb 2, 2013
+ *      Author: ndp
+ */
+
+#ifndef SERVER_FUNCTION_H_
+#define SERVER_FUNCTION_H_
+
+#include <iostream>
+
+#include <expr.h>
+#include <D4Function.h>
+
+namespace libdap {
+
+class ServerFunction {
+
+private:
+    std::string name;
+    std::string description;
+    std::string usage;
+    std::string doc_url;
+    std::string role;
+    std::string version;
+
+    // These are typedefs from DAP2 that are used with its CE parser
+    // and are found in expr.h. jhrg 3/10/14
+    bool_func d_bool_func;
+    btp_func  d_btp_func;
+    proj_func d_proj_func;
+
+    D4Function d_d4_function;
+
+public:
+    ServerFunction();
+    ServerFunction(std::string name, std::string version, std::string description, std::string usage,
+    		std::string doc_url, std::string role, bool_func f);
+    ServerFunction(std::string name, std::string version, std::string description, std::string usage,
+    		std::string doc_url, std::string role, btp_func f);
+    ServerFunction(std::string name, std::string version, std::string description, std::string usage,
+    		std::string doc_url, std::string role, proj_func f);
+    ServerFunction(std::string name, std::string version, std::string description, std::string usage,
+    		std::string doc_url, std::string role, D4Function f);
+
+    virtual ~ServerFunction() {	}
+
+	std::string getName() { return name; }
+	void setName(const std::string &n){ name = n; }
+
+	std::string getUsageString() { return usage; }
+	void setUsageString(const std::string &u){ usage = u; }
+
+	std::string getDocUrl() { return doc_url; }
+	void setDocUrl(const std::string &url){ doc_url = url; }
+
+	std::string getRole() { return role; }
+	void setRole(const std::string &r){ role = r; }
+
+	std::string getDescriptionString(){ return description; }
+	void setDescriptionString(const std::string &desc){ description = desc; }
+
+	std::string getVersion(){ return version; }
+	void setVersion(const std::string &ver){ version = ver; }
+
+	/**
+	 * If you are writing a function that can only operate on a particular kind of data, or one that relies on the presence
+	 * of particular metadata, then you might override this method in order to stop the server from
+	 * advertising the function in conjunction with datasets to which it cannot be applied.
+	 *
+	 * @param dds A DDS object for the dataset about which we will ask the question:
+	 * Can this function operate on all or some portion of the contents of this dataset?
+	 * CAUTION: Any implementation of this should be careful not to read data (or read as little as possible) from the
+	 * passed DDS. Reading data in this method may have negative effect on overall performance. Examining metadata and
+	 * dataset structure should be the basis for determining the applicability of a function to the dataset.
+	 * @return true If this function operate on all or some portion of the contents of this dataset, false otherwise.
+	 */
+	virtual bool canOperateOn(DDS &) { return true; }
+
+	/**
+	 * @see canOperateOn(DDS &)
+	 * @param The Dataset's DMR.
+	 * @return True if the function can work with the dataset, false otherwise.
+	 */
+	virtual bool canOperateOn(DMR &) { return true; }
+
+	/**
+	 * Set the C function pointer for this function object.
+	 * @note This does not alter any of the other function pointers,
+	 * so the same name can be used for all four different kinds of
+	 * functions without conflict.
+	 *
+	 * @param bf
+	 */
+	void setFunction(bool_func bf) {
+		d_bool_func = bf;
+	}
+
+	void setFunction(btp_func btp) {
+		d_btp_func  = btp;
+	}
+
+	void setFunction(proj_func pf) {
+		d_proj_func = pf;
+	}
+
+	void setFunction(D4Function pf) {
+		d_d4_function = pf;
+	}
+
+	std::string getTypeString() {
+		if (d_bool_func) return "boolean";
+		if (d_btp_func) return "basetype";
+		if (d_proj_func) return "projection";
+		if (d_d4_function) return "D4Function";
+		return "null";
+	}
+
+	bool_func get_bool_func(){ return d_bool_func; }
+	btp_func  get_btp_func() { return d_btp_func;  }
+	proj_func get_proj_func(){ return d_proj_func; }
+	D4Function get_d4_function() { return d_d4_function; }
+};
+
+} /* namespace libdap */
+#endif /* SERVER_FUNCTION_H_ */
diff --git a/ServerFunctionsList.cc b/ServerFunctionsList.cc
new file mode 100644
index 0000000..e92716f
--- /dev/null
+++ b/ServerFunctionsList.cc
@@ -0,0 +1,275 @@
+// ServerFunctionsList.cc
+
+// This file is part of bes, A C++ back-end server implementation framework
+// for the OPeNDAP Data Access Protocol.
+
+// Copyright (c) 2013 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#include "config.h"
+
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+
+#include <pthread.h>
+
+#include <iostream>
+#include <algorithm>
+
+//#define DODS_DEBUG
+
+#include <expr.h>
+#include "debug.h"
+
+#include "ServerFunctionsList.h"
+
+using namespace std;
+using namespace libdap;
+
+namespace libdap {
+
+static pthread_once_t ServerFunctionsList_instance_control = PTHREAD_ONCE_INIT;
+
+ServerFunctionsList *ServerFunctionsList::d_instance = 0 ;
+
+/**
+ * private static that only gets called once in the life cycle of the process.
+ */
+void ServerFunctionsList::initialize_instance() {
+    if (d_instance == 0) {
+        DBG(cerr << "ServerFunctionsList::initialize_instance() - Creating singleton ServerFunctionList instance." << endl);
+        d_instance = new ServerFunctionsList;
+        #if HAVE_ATEXIT
+            atexit(delete_instance);
+        #endif
+    }
+}
+
+/**
+ * Private static function can only be called by friends andf pThreads code.
+ */
+void ServerFunctionsList::delete_instance() {
+    DBG(cerr << "ServerFunctionsList::delete_instance() - Deleting singleton ServerFunctionList instance." << endl);
+    delete d_instance;
+    d_instance = 0;
+}
+
+/**
+ * Private method insures that nobody can try to delete the singleton class.
+ */
+
+ServerFunctionsList::~ServerFunctionsList() {
+    SFLIter fit;
+    for(fit=d_func_list.begin(); fit!=d_func_list.end() ; fit++){
+        ServerFunction *func = fit->second;
+        DBG(cerr << "ServerFunctionsList::~ServerFunctionsList() - Deleting ServerFunction " << func->getName() << " from ServerFunctionsList." << endl);
+        delete func;
+    }
+    d_func_list.clear();
+}
+
+ServerFunctionsList * ServerFunctionsList::TheList() {
+    pthread_once(&ServerFunctionsList_instance_control, initialize_instance);
+    DBG(cerr << "ServerFunctionsList::TheList() - Returning singleton ServerFunctionList instance." << endl);
+    return d_instance;
+}
+
+/**
+ * Adds the passed ServerFunction pointer to the list of ServerFunctions using
+ * the value of ServerFunction.getName() as the key in the list.
+ *
+ * @brief Adds the passed ServerFunction pointer to the list of ServerFunctions.
+ * @param *func A pointer to the ServerFunction object to add to the ServerFunctionList.
+ * The pointer is copied, not the object referenced; this class does not
+ * delete the pointer.
+ */
+void ServerFunctionsList::add_function(ServerFunction *func )
+{
+    DBG(cerr << "ServerFunctionsList::add_function() - Adding ServerFunction " << func->getName() << endl);
+    d_func_list.insert(std::make_pair(func->getName(),func));
+}
+
+/**
+ * Returns the first boolean function in the list whose key value matches the passed string name.
+ * When a match is found the function returns true and sets returned value parameter *f to
+ * the boolean function held by the ServerFunction object extracted from the list.
+ *
+ * Method:
+ * Looks through the list of ServerFunctions and compares each function's key value (which
+ * would be the value of SurverFunction.getName()) with the value of the string parameter
+ * 'name'. When they match then the returned value parameter is set to the value returned
+ * by ServerFunction.get_btp_func(). If the ServerFunction _is not_  a instance of a boolean
+ * function then the return value will be 0 (null) and the search for matching function will continue.
+ * If the ServerFunction _is_ a boolean function then the returned value will be non-zero and
+ * the search will return true (it found the thing) and the returned value parameter *f will have
+ * it's value set to the boolean function.
+ *
+ *  @brief Find a boolean function with a given name in the function list.
+ *  @param name A string containing the name of the function to find.
+ *  @param *f   A returned value parameter through which a point to the desired function is returned.
+ *
+ */
+bool ServerFunctionsList::find_function(const std::string &name, bool_func *f) const
+{
+    if (d_func_list.empty())
+        return false;
+
+    std::pair <SFLCIter, SFLCIter> ret;
+    ret = d_func_list.equal_range(name);
+    for (SFLCIter it = ret.first; it != ret.second; ++it) {
+        if (name == it->first && (*f = it->second->get_bool_func())){
+            DBG(cerr << "ServerFunctionsList::find_function() - Found boolean function " << it->second->getName() << endl);
+            return true;
+        }
+    }
+
+    return false;
+}
+
+/**
+ * Returns the first BaseType function in the list whose key value matches the passed string name.
+ * When a match is found the function returns true and sets returned value parameter *f to
+ * the BaseType function held by the ServerFunction object extracted from the list.
+ *
+ * Method:
+ * Looks through the list of ServerFunctions and compares each function's key value (which
+ * would be the value of SurverFunction.getName()) with the value of the string parameter
+ * 'name'. When they match then the returned value parameter is set to the value returned
+ * by ServerFunction.get_btp_func(). If the ServerFunction _is not_  a instance of a BaseType
+ * function then the return value will be 0 (null) and the search for matching function will continue.
+ * If the ServerFunction _is_ a BaseType function then the returned value will be non-zero and
+ * the search will return true (it found the thing) and the returned value parameter *f will have
+ * it's value set to the BaseType function.
+ *
+ *  @brief Find a BaseType function with a given name in the function list.
+ *  @param name A string containing the name of the function to find.
+ *  @param *f   A returned value parameter through which a point to the desired function is returned.
+ *
+ */
+bool ServerFunctionsList::find_function(const string &name, btp_func *f) const
+{
+    if (d_func_list.empty())
+        return false;
+    DBG(cerr << "ServerFunctionsList::find_function() - Looking for ServerFunction '" << name << "'" << endl);
+
+    std::pair <SFLCIter, SFLCIter> ret;
+    ret = d_func_list.equal_range(name);
+    for (SFLCIter it = ret.first; it != ret.second; ++it) {
+        if (name == it->first && (*f = it->second->get_btp_func())){
+            DBG(cerr << "ServerFunctionsList::find_function() - Found basetype function " << it->second->getName() << endl);
+            return true;
+        }
+    }
+
+    return false;
+}
+
+/**
+ * Returns the first projection function in the list whose key value matches the passed string name.
+ * When a match is found the function returns true and sets returned value parameter *f to
+ * the projection function held by the ServerFunction object extracted from the list.
+ *
+ * Method:
+ * Looks through the list of ServerFunctions and looks at each function's key value (which
+ * would be the value of SurverFunction.getName() for each function). When a function has the same
+ * key name as the value of the string parameter 'name', then the returned value parameter is set
+ * the value returned by ServerFunction.get_proj_func(). If the ServerFunction _is not_  a projection
+ * function then the return value will be 0 (null) and the search for matching function will continue.
+ * If the ServerFunction _is_ a projection then the returned value will be non-zero and the search will
+ * return true (it found the thing) and the returned value parameter *f will have it's value set
+ * to the projection function.
+ *
+ *  @brief Find a projection function with a given name in the function list.
+ *  @param name A string containing the name of the function to find.
+ *  @param *f   A returned value parameter through which a point to the desired function is returned.
+ *
+ */
+bool ServerFunctionsList::find_function(const string &name, proj_func *f) const
+{
+    if (d_func_list.empty())
+        return false;
+
+    std::pair <SFLCIter, SFLCIter> ret;
+    ret = d_func_list.equal_range(name);
+    for (SFLCIter it = ret.first; it != ret.second; ++it) {
+        if (name == it->first && (*f = it->second->get_proj_func())){
+            DBG(cerr << "ServerFunctionsList::find_function() - Found projection function " << it->second->getName() << endl);
+           return true;
+        }
+    }
+
+    return false;
+}
+
+/**
+ * Find a DAP4 function in the Server Functions List.
+ *
+ * @param name Look for this function name
+ * @param f Value-result parameter. NULL if the function is not found
+ * @return True if the function was found, otherwise false.
+ */
+bool ServerFunctionsList::find_function(const string &name, D4Function *f) const
+{
+    if (d_func_list.empty())
+        return false;
+
+    std::pair <SFLCIter, SFLCIter> ret;
+    ret = d_func_list.equal_range(name);
+    for (SFLCIter it = ret.first; it != ret.second; ++it) {
+        if (name == it->first && (*f = it->second->get_d4_function())) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+/** @brief Returns an iterator pointing to the first key pair in the ServerFunctionList. */
+ServerFunctionsList::SFLIter ServerFunctionsList::begin()
+{
+    return d_func_list.begin();
+}
+
+/** @brief Returns an iterator pointing to the last key pair in the ServerFunctionList. */
+ServerFunctionsList::SFLIter ServerFunctionsList::end()
+{
+    return d_func_list.end();
+}
+
+/**
+ *
+ *
+ * @brief Returns the ServerFunction pointed to by the passed iterator.
+ *
+ */
+ServerFunction *ServerFunctionsList::getFunction(SFLIter it)
+{
+    return (*it).second;
+}
+
+void ServerFunctionsList::getFunctionNames(vector<string> *names){
+	SFLIter fit;
+    for(fit = d_func_list.begin(); fit != d_func_list.end(); fit++) {
+        ServerFunction *func = fit->second;
+        names->push_back(func->getName());
+    }
+}
+
+} // namespace libdap
diff --git a/ServerFunctionsList.h b/ServerFunctionsList.h
new file mode 100644
index 0000000..b935d0a
--- /dev/null
+++ b/ServerFunctionsList.h
@@ -0,0 +1,84 @@
+// ServerFunctionsList.h
+
+// This file is part of bes, A C++ back-end server implementation framework
+// for the OPeNDAP Data Access Protocol.
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2013 OPeNDAP, Inc.
+// Author: Nathan Potter <npotter@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#ifndef I_ServerFunctionsList_h
+#define I_ServerFunctionsList_h 1
+
+#include <map>
+#include <string>
+
+#include <expr.h>
+#include <D4Function.h>
+
+#include <ServerFunction.h>
+
+namespace libdap {
+
+class ServerFunctionsListUnitTest;
+class ConstraintEvaluator;
+
+class ServerFunctionsList {
+private:
+    static ServerFunctionsList * d_instance;
+    std::multimap<std::string, ServerFunction *> d_func_list;
+
+    static void initialize_instance();
+    static void delete_instance();
+
+    virtual ~ServerFunctionsList();
+
+    friend class ServerFunctionsListUnitTest;
+
+protected:
+    ServerFunctionsList() {}
+
+public:
+    // Added typedefs to reduce clutter jhrg 3/12/14
+    typedef std::multimap<std::string, ServerFunction *>::iterator SFLIter;
+    typedef std::multimap<std::string, ServerFunction *>::const_iterator SFLCIter;
+
+    static ServerFunctionsList * TheList();
+
+    virtual void add_function(ServerFunction *func);
+
+    virtual bool find_function(const std::string &name, bool_func *f) const;
+    virtual bool find_function(const std::string &name, btp_func  *f) const;
+    virtual bool find_function(const std::string &name, proj_func *f) const;
+    virtual bool find_function(const std::string &name, D4Function *f) const;
+
+    SFLIter begin();
+    SFLIter end();
+    ServerFunction *getFunction(SFLIter it);
+
+    virtual void getFunctionNames(std::vector<std::string> *names);
+};
+
+}
+
+#endif // I_ServerFunctionsList_h
diff --git a/SignalHandler.cc b/SignalHandler.cc
new file mode 100644
index 0000000..4af52fd
--- /dev/null
+++ b/SignalHandler.cc
@@ -0,0 +1,229 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1994-2002
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+#include "config.h"
+
+#include <cstdlib>
+
+#include <signal.h>
+#include <pthread.h>
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h> //for _exit
+#endif
+
+#include "SignalHandler.h"
+#include "util.h"
+
+namespace libdap {
+
+EventHandler *SignalHandler::d_signal_handlers[NSIG];
+Sigfunc *SignalHandler::d_old_handlers[NSIG];
+SignalHandler *SignalHandler::d_instance = 0;
+
+// instance_control is used to ensure that in a MT environment d_instance is
+// correctly initialized.
+static pthread_once_t instance_control = PTHREAD_ONCE_INIT;
+
+/// Private static void method.
+void
+SignalHandler::initialize_instance()
+{
+    // MT-Safe if called via pthread_once or similar
+    SignalHandler::d_instance = new SignalHandler;
+    atexit(SignalHandler::delete_instance);
+}
+
+/// Private static void method.
+void
+SignalHandler::delete_instance()
+{
+    if (SignalHandler::d_instance) {
+        for (int i = 0; i < NSIG; ++i) {
+        	// Fortify warns about a leak because the EventHandler objects
+        	// are not deleted, but that's OK - this is a singleton and
+        	// so the 'leak' is really just a constant amount of memory that
+        	// gets used.
+        	d_signal_handlers[i] = 0;
+            d_old_handlers[i] = 0;
+        }
+
+        delete SignalHandler::d_instance;
+        SignalHandler::d_instance = 0;
+    }
+}
+
+/** This private method is the adapter between the C-style interface of the
+    signal subsystem and C++'s method interface. This uses the lookup table
+    to find an instance of EventHandler and calls that instance's
+    handle_signal method.
+
+    @param signum The number of the signal. */
+void
+SignalHandler::dispatcher(int signum)
+{
+    // Perform a sanity check...
+    if (SignalHandler::d_signal_handlers[signum] != 0)
+        // Dispatch the handler's hook method.
+        SignalHandler::d_signal_handlers[signum]->handle_signal(signum);
+
+    Sigfunc *old_handler = SignalHandler::d_old_handlers[signum];
+    if (old_handler == SIG_IGN || old_handler == SIG_ERR)
+        return;
+    else if (old_handler == SIG_DFL) {
+        switch (signum) {
+#if 0
+#ifndef WIN32
+        case SIGHUP:
+        case SIGKILL:
+        case SIGUSR1:
+        case SIGUSR2:
+        case SIGPIPE:
+        case SIGALRM:
+#endif
+        case SIGINT:
+        case SIGTERM: _exit(EXIT_FAILURE);
+
+            // register_handler() should never allow any fiddling with
+            // signals other than those listed above.
+        default: abort();
+#endif
+        // Calling _exit() or abort() is not a good thing for a library to be
+        // doing. This results in a warning from rpmlint
+        default:
+            throw Error(internal_error, "Signal handler operation on an unsupported signal.");
+        }
+    }
+    else
+        old_handler(signum);
+}
+
+/** Get a pointer to the single instance of SignalHandler. */
+SignalHandler*
+SignalHandler::instance()
+{
+    pthread_once(&instance_control, initialize_instance);
+
+    return d_instance;
+}
+
+/** Register an event handler. By default run any previously registered
+    action/handler such as those installed using \c sigaction(). For signals
+    such as SIGALRM (the alarm signal) this may not be what you want; see the
+    \e override parameter. See also the class description.
+
+    @param signum Bind the event handler to this signal number. Limited to
+    those signals that, according to POSIX.1, cause process termination.
+    @param eh A pointer to the EventHandler for \c signum.
+    @param override If \c true, do not run the default handler/action.
+    Instead run \e eh and then treat the signal as if the original action was
+    SIG_IGN. Default is false.
+    @return A pointer to the old EventHandler or null. */
+EventHandler *
+SignalHandler::register_handler(int signum, EventHandler *eh, bool override)
+{
+    // Check first for improper use.
+    switch (signum) {
+#ifndef WIN32
+        case SIGHUP:
+        case SIGKILL:
+        case SIGUSR1:
+        case SIGUSR2:
+        case SIGPIPE:
+        case SIGALRM:
+#endif
+        case SIGINT:
+        case SIGTERM: break;
+
+        default: throw InternalErr(__FILE__, __LINE__,
+                string("Call to register_handler with unsupported signal (")
+                + long_to_string(signum) + string(")."));
+    }
+
+    // Save the old EventHandler
+    EventHandler *old_eh = SignalHandler::d_signal_handlers[signum];
+
+    SignalHandler::d_signal_handlers[signum] = eh;
+
+    // Register the dispatcher to handle this signal. See Stevens, Advanced
+    // Programming in the UNIX Environment, p.298.
+#ifndef WIN32
+    struct sigaction sa;
+    sa.sa_handler = dispatcher;
+    sigemptyset(&sa.sa_mask);
+    sa.sa_flags = 0;
+
+    // Try to suppress restarting system calls if we're handling an alarm.
+    // This lets alarms block I/O calls that would normally restart. 07/18/03
+    // jhrg
+    if (signum == SIGALRM) {
+#ifdef SA_INTERUPT
+        sa.sa_flags |= SA_INTERUPT;
+#endif
+    }
+    else {
+#ifdef SA_RESTART
+        sa.sa_flags |= SA_RESTART;
+#endif
+    }
+
+    struct sigaction osa; // extract the old handler/action
+
+    if (sigaction(signum, &sa, &osa) < 0)
+        throw InternalErr(__FILE__, __LINE__, "Could not register a signal handler.");
+
+    // Take care of the case where this interface is used to register a
+    // handler more than once. We want to make sure that the dispatcher is
+    // not installed as the 'old handler' because that results in an infinite
+    // loop. 02/10/04 jhrg
+    if (override)
+        SignalHandler::d_old_handlers[signum] = SIG_IGN;
+    else if (osa.sa_handler != dispatcher)
+        SignalHandler::d_old_handlers[signum] = osa.sa_handler;
+#endif
+
+    return old_eh;
+}
+
+/** Remove the event hander.
+    @param signum The signal number of the handler to remove.
+    @return The old event handler */
+EventHandler *
+SignalHandler::remove_handler(int signum)
+{
+    EventHandler *old_eh = SignalHandler::d_signal_handlers[signum];
+
+    SignalHandler::d_signal_handlers[signum] = 0;
+
+    return old_eh;
+}
+
+} // namespace libdap
diff --git a/SignalHandler.h b/SignalHandler.h
new file mode 100644
index 0000000..b3053b2
--- /dev/null
+++ b/SignalHandler.h
@@ -0,0 +1,117 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#ifndef signal_handler_h
+#define signal_handler_h
+
+#include <signal.h>
+
+#include "EventHandler.h"
+#include "InternalErr.h"
+
+namespace libdap
+{
+
+typedef void Sigfunc(int); // Plauger, 1992
+
+/** Singleton to handle signals. This class adapts the C-style function call
+    interface to one suited for C++. This class records a signal's old
+    action/handler when it installs new handler. When a signal is caught, the
+    new handler (registered with this class) is run and then the old
+    action/handler is performed. This ensures that when libdap++ is embedded
+    in code which has a handler for a signal such as SIGINT which does
+    something other than the default, that thing, whatever it may be, gets
+    done.
+
+    This class treats signals it registers (using the EventHandler abstract
+    class) differently than ones registered using the \c signal() or \c
+    sigaction() system interfaces. If the register_handler() method is called
+    and an instance of EventHandler is already bound to \e signum, then the
+    old EventHandler is returned. However, if there's an existing handler
+    that was set up with \c sigaction(), ..., it won't be returned. Instead
+    it will either be run after the newly registered EventHandler or ignored,
+    depending on register_handler()'s \e override parameter. This feature may
+    be used only for POSIX.1 signals which cause process termination. They
+    are: SIGHUP, SIGINT, SIGKILL, SIGPIPE, SIGALRM, SIGTERM, SIGUSR1, and
+    SIGUSR2.
+
+    @note Based on "Applying Design Patterns to Simplify Signal Handling",
+    Douglas C. Schmidt, 1998,
+    http://www.cs.wustl.edu/~schmidt/signal-patterns.html.
+
+    @see EventHandler
+    @author James Gallagher <jgallagher@opendap.org> */
+class SignalHandler
+{
+private:
+    // Ensure we're a Singleton.
+    SignalHandler() {}
+    SignalHandler(const SignalHandler &) {}
+
+    // Singleton pointer.
+    static SignalHandler *d_instance;
+
+    // Table of pointers to instances of EventHandlers. Since EventHandler is
+    // abstract, the pointers will actually reference instances that are
+    // children of EventHandler. NSIG is defined in signal.h but this may be
+    // a portability issue.
+    static EventHandler *d_signal_handlers[NSIG];
+
+    // This array holds the old signal handlers. Once the handler in
+    // d_signal_handler[signum] is run, look here to see what the original
+    // action was. This is important since libdap++ is often embedded in code
+    // that already has a non-default signal handler for things like SIGINT.
+    static Sigfunc *d_old_handlers[NSIG];
+
+    // Entry point adapter installed into sigaction(). This must be a static
+    // method (or a regular C-function) to conform to sigaction's interface.
+    // this is the part of SignalHandler that uses the Adapter pattern.
+    static void dispatcher(int signum);
+
+    // Delete the global instance. Call this with atexit().
+    static void delete_instance();
+
+    // Call this using pthread_once() to ensure there's only one instance
+    // when running in a MT world.
+    static void initialize_instance();
+
+    friend class SignalHandlerTest;
+    friend class HTTPCacheTest;
+
+public:
+    static SignalHandler *instance();
+
+    ///
+    virtual ~SignalHandler() {}
+
+    EventHandler *register_handler(int signum, EventHandler *eh,
+                                   bool override = false);
+
+    EventHandler *remove_handler(int signum);
+};
+
+} // namespace libdap
+
+#endif // signal_handler_h
diff --git a/SignalHandlerRegisteredErr.h b/SignalHandlerRegisteredErr.h
new file mode 100644
index 0000000..3bf112d
--- /dev/null
+++ b/SignalHandlerRegisteredErr.h
@@ -0,0 +1,63 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2004 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#ifndef _signal_handler_registered_err_h
+#define _signal_handler_registered_err_h 1
+
+#include <string>
+
+#ifndef _error_h
+#include "Error.h"
+#endif
+
+namespace libdap
+{
+
+/** SignalHandlerRegisteredErr is thrown by HTTPCache::instance() if a signal
+    handler is already registered.
+
+    @author jhrg */
+
+class SignalHandlerRegisteredErr: public Error
+{
+
+public:
+    SignalHandlerRegisteredErr(const string &msg) : Error()
+    {
+        _error_code = unknown_error;
+        _error_message = "";
+        _error_message += "A caching error was encountered:\n";
+        _error_message += msg + "\n";
+    }
+
+    SignalHandlerRegisteredErr() : Error()
+    {
+        _error_code = unknown_error;
+    }
+};
+
+} // namespace libdap
+
+#endif // _signal_handler_registered_err_h
diff --git a/StdinResponse.h b/StdinResponse.h
new file mode 100644
index 0000000..ec95c1a
--- /dev/null
+++ b/StdinResponse.h
@@ -0,0 +1,82 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#ifndef stdin_response_h
+#define stdin_response_h
+
+#include <cstdio>
+
+#include "Response.h"
+
+namespace libdap
+{
+
+/** @brief Encapsulate a response read from stdin.
+
+    This class holds stdin and provides an interface from which
+    Connect can read DAP2 information from standard input. Unlike the
+    other Response classes, StdinResponse does \e not close the input
+    stream when it's done reading.
+
+    @note Modified 10/25/13 to accommodate C++ istreams. */
+class StdinResponse: public Response
+{
+private:
+    FILE *d_stdin;
+    std::istream *d_cin;
+
+protected:
+
+public:
+    /** @brief Initialize with standard input.
+      
+        Create an instance initialized to standard input. When done, does
+        not close stdin.
+        
+        @see Response
+        
+        @param s Pointer to standard input.
+        */
+    StdinResponse(FILE *s) : Response(), d_stdin(s), d_cin(0) {}
+
+    /**
+     * @brief Build a instance using a C++ istream
+     * @param in A pointer to the input stream
+     */
+    StdinResponse(std::istream &in) : Response(), d_stdin(0), d_cin(&in) {}
+
+    /** Destructor. Does not close standard input. */
+    virtual ~StdinResponse() {}
+
+    virtual FILE *get_stream() const { return d_stdin; }
+    virtual void set_stream(FILE *s) { d_stdin = s; }
+
+    virtual std::istream *get_cpp_stream() const { return d_cin; }
+    virtual void set_cpp_stream(std::istream *in) { d_cin = in; }
+};
+
+} // namespace libdap
+
+#endif // pipe_response_h
diff --git a/Str.cc b/Str.cc
new file mode 100644
index 0000000..3918adf
--- /dev/null
+++ b/Str.cc
@@ -0,0 +1,360 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1994-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// Implementation for Str.
+//
+// jhrg 9/7/94
+
+
+#include "config.h"
+
+#include <sstream>
+
+#include "Byte.h"
+#include "Int16.h"
+#include "UInt16.h"
+#include "Int32.h"
+#include "UInt32.h"
+#include "Float32.h"
+#include "Float64.h"
+#include "Str.h"
+#include "Url.h"
+#include "Array.h"
+#include "Structure.h"
+#include "Sequence.h"
+#include "Grid.h"
+
+#include "DDS.h"
+#include "Marshaller.h"
+#include "UnMarshaller.h"
+
+#include "DMR.h"
+#include "D4StreamMarshaller.h"
+#include "D4StreamUnMarshaller.h"
+
+#include "util.h"
+#include "parser.h"
+#include "Operators.h"
+#include "InternalErr.h"
+#include "escaping.h"
+#include "debug.h"
+
+
+using std::cerr;
+using std::endl;
+
+namespace libdap {
+
+/** The Str constructor requires only the name of the variable
+    to be created.  The name may be omitted, which will create a
+    nameless variable.  This may be adequate for some applications.
+
+    @param n A string containing the name of the variable to be
+    created.
+
+*/
+Str::Str(const string &n) : BaseType(n, dods_str_c), d_buf("")
+{}
+
+/** The Str server-side constructor accepts the name of the variable and the
+    dataset name from which this instance is created.
+
+    @param n A string containing the name of the variable to be created.
+    @param d A string containing the name of the dataset from which this
+    variable is created
+*/
+Str::Str(const string &n, const string &d) : BaseType(n, d, dods_str_c), d_buf("")
+{}
+
+Str::Str(const Str &copy_from) : BaseType(copy_from)
+{
+    d_buf = copy_from.d_buf;
+}
+
+BaseType *
+Str::ptr_duplicate()
+{
+    return new Str(*this);
+}
+
+Str &
+Str::operator=(const Str &rhs)
+{
+    if (this == &rhs)
+        return *this;
+
+    // Call BaseType::operator=.
+    dynamic_cast<BaseType &>(*this) = rhs;
+
+    d_buf = rhs.d_buf;
+
+    return *this;
+}
+
+int
+Str::length() const
+{
+    return d_buf.length();
+}
+
+unsigned int
+Str::width(bool) const
+{
+    return sizeof(string);
+}
+
+bool
+Str::serialize(ConstraintEvaluator &eval, DDS &dds, Marshaller &m, bool ce_eval)
+{
+
+    DBG(cerr << "Entering (" << this->name() << " [" << this << "])" << endl);
+#if USE_LOCAL_TIMEOUT_SCHEME
+    dds.timeout_on();
+#endif
+    if (!read_p())
+        read();
+
+    if (ce_eval && !eval.eval_selection(dds, dataset()))
+        return true;
+#if USE_LOCAL_TIMEOUT_SCHEME
+    dds.timeout_off();
+#endif
+    m.put_str( d_buf ) ;
+
+    DBG(cerr << "Exiting: buf = " << d_buf << endl);
+
+    return true;
+}
+
+// deserialize the string on stdin and put the result in BUF.
+
+bool
+Str::deserialize(UnMarshaller &um, DDS *, bool)
+{
+    um.get_str( d_buf ) ;
+
+    return false;
+}
+
+void
+Str::compute_checksum(Crc32 &checksum)
+{
+	checksum.AddData(reinterpret_cast<const uint8_t*>(d_buf.data()), d_buf.length());
+}
+
+/**
+ * @brief Serialize an Int8
+ * @param m
+ * @param dmr Unused
+ * @param eval Unused
+ * @param filter Unused
+ * @exception Error is thrown if the value needs to be read and that operation fails.
+ */
+void
+Str::serialize(D4StreamMarshaller &m, DMR &, /*ConstraintEvaluator &,*/ bool)
+{
+    if (!read_p())
+        read();          // read() throws Error
+
+    m.put_str( d_buf ) ;
+}
+
+void
+Str::deserialize(D4StreamUnMarshaller &um, DMR &)
+{
+    um.get_str( d_buf ) ;
+}
+
+/** Read the object's value and put a copy in the C++ string object
+    referenced by \e **val. If \e *val is null, this method will allocate
+    a string object using new and store the result there. If \e *val
+    is not null, it will assume that \e *val references a string object
+    and put the value there.
+
+    @param val A pointer to null or to a string object.
+    @return The sizeof(string*)
+    @exception InternalErr Thrown if \e val is null. */
+unsigned int
+Str::buf2val(void **val)
+{
+    // Jose Garcia
+    // The same comment justifying throwing an Error in val2buf applies here.
+    if (!val)
+        throw InternalErr(__FILE__, __LINE__,
+                          "No place to store a reference to the data.");
+    // If *val is null, then the caller has not allocated storage for the
+    // value; we must. If there is storage there, assume it is a string and
+    // assign d_buf's value to that storage.
+    if (!*val)
+        *val = new string(d_buf);
+    else
+        *static_cast<string*>(*val) = d_buf;
+
+    return sizeof(string*);
+}
+
+/** Store the value referenced by \e val in this object. Even though the
+    type of \e val is \c void*, this method assumes the type is \c string*.
+    Note that the value is copied so the caller if free to throw away/reuse
+    the actual parameter once this call has returned.
+
+    @param val A pointer to a C++ string object.
+    @param reuse Not used by this version of the method.
+    @exception IntenalErr if \e val is null.
+    @return The width of the pointer. */
+unsigned int
+Str::val2buf(void *val, bool)
+{
+    // Jose Garcia
+    // This method is public therefore and I believe it has being designed
+    // to be use by read which must be implemented on the surrogated library,
+    // thus if the pointer val is NULL, is an Internal Error.
+    if (!val)
+        throw InternalErr(__FILE__, __LINE__, "NULL pointer.");
+
+    d_buf = *static_cast<string*>(val);
+
+    return sizeof(string*);
+}
+
+/** Set the value of this instance.
+    @param value The value
+    @return Always returns true; the return type of bool is for compatibility
+    with the Passive* subclasses written by HAO. */
+bool
+Str::set_value(const string &value)
+{
+    d_buf = value;
+    set_read_p(true);
+
+    return true;
+}
+
+/** Get the value of this instance.
+    @return The value. */
+string
+Str::value() const
+{
+    return d_buf;
+}
+
+void
+Str::print_val(FILE *out, string space, bool print_decl_p)
+{
+    ostringstream oss;
+    print_val(oss, space, print_decl_p);
+    fwrite(oss.str().data(), sizeof(char), oss.str().length(), out);
+}
+
+void
+Str::print_val(ostream &out, string space, bool print_decl_p)
+{
+    if (print_decl_p) {
+        print_decl(out, space, false);
+	out << " = \"" << escattr(d_buf) << "\";\n" ;
+    }
+    else
+	out << "\"" << escattr(d_buf) << "\"" ;
+}
+
+bool
+Str::ops(BaseType *b, int op)
+{
+    // Extract the Byte arg's value.
+    if (!read_p() && !read()) {
+        // Jose Garcia
+        // Since the read method is virtual and implemented outside
+        // libdap++ if we cannot read the data that is the problem
+        // of the user or of whoever wrote the surrogate library
+        // implemeting read therefore it is an internal error.
+        throw InternalErr(__FILE__, __LINE__, "This value was not read!");
+    }
+
+    // Extract the second arg's value.
+    if (!b || !(b->read_p() || b->read())) {
+        // Jose Garcia
+        // Since the read method is virtual and implemented outside
+        // libdap++ if we cannot read the data that is the problem
+        // of the user or of whoever wrote the surrogate library
+        // implemeting read therefore it is an internal error.
+        throw InternalErr(__FILE__, __LINE__, "Argument value was not read!");
+    }
+
+    return d4_ops(b, op);
+}
+
+/**
+ * @see BaseType::d4_ops(BaseType *, int)
+ */
+bool Str::d4_ops(BaseType *b, int op)
+{
+    switch (b->type()) {
+    case dods_byte_c:
+    case dods_int8_c:
+    case dods_int16_c:
+    case dods_uint16_c:
+    case dods_int32_c:
+    case dods_uint32_c:
+    case dods_int64_c:
+    case dods_uint64_c:
+    case dods_float32_c:
+    case dods_float64_c:
+        throw Error(malformed_expr, "Relational operators can only compare compatible types (string, number).");
+    case dods_str_c:
+        return StrCmp<string, string>(op, d_buf, static_cast<Str*>(b)->value());
+    case dods_url_c:
+        return StrCmp<string, string>(op, d_buf, static_cast<Url*>(b)->value());
+    default:
+        throw Error(malformed_expr, "Relational operators only work with scalar types.");
+    }
+}
+
+/** @brief dumps information about this object
+ *
+ * Displays the pointer value of this instance and information about this
+ * instance.
+ *
+ * @param strm C++ i/o stream to dump the information to
+ * @return void
+ */
+void
+Str::dump(ostream &strm) const
+{
+    strm << DapIndent::LMarg << "Str::dump - ("
+    << (void *)this << ")" << endl ;
+    DapIndent::Indent() ;
+    BaseType::dump(strm) ;
+    strm << DapIndent::LMarg << "value: " << d_buf << endl ;
+    DapIndent::UnIndent() ;
+}
+
+} // namespace libdap
+
diff --git a/Str.h b/Str.h
new file mode 100644
index 0000000..02b2761
--- /dev/null
+++ b/Str.h
@@ -0,0 +1,115 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1995-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// Interface for Str type.
+//
+// jhrg 9/7/94
+
+#ifndef _str_h
+#define _str_h 1
+
+#include <string>
+
+#include "dods-limits.h"
+#include "BaseType.h"
+
+namespace libdap
+{
+
+// max_str_len should be large since we always send strings with length bytes
+// as a prefix (so xdr_string will always know how much memory to malloc) but
+// if deserialize gets confused and thinks a ctor (in particular) is a string
+// xdr_string in turn will max_str_len if it cannot get a length byte. A long
+// term solution is to fix libdap, but strings should not routinely be > 32k
+// for the time being... jhrg 4/30/97
+
+const unsigned int max_str_len = DODS_USHRT_MAX - 1;
+
+/** @brief Holds character string data.
+
+    @see BaseType
+    @see Url
+    */
+
+class Str: public BaseType
+{
+protected:
+    string d_buf;
+
+public:
+    Str(const string &n);
+    Str(const string &n, const string &d);
+
+    virtual ~Str()
+    {}
+
+    Str(const Str &copy_from);
+
+    Str &operator=(const Str &rhs);
+
+    virtual BaseType *ptr_duplicate();
+
+    virtual unsigned int width(bool constrained = false) const;
+
+    // Return the length of the stored string or zero if no string has been
+    // stored in the instance's internal buffer.
+    virtual int length() const;
+
+    // DAP2
+    virtual bool serialize(ConstraintEvaluator &eval, DDS &dds, Marshaller &m, bool ce_eval = true);
+    virtual bool deserialize(UnMarshaller &um, DDS *dds, bool reuse = false);
+
+    // DAP4
+    virtual void compute_checksum(Crc32 &checksum);
+    virtual void serialize(D4StreamMarshaller &m, DMR &dmr, /*ConstraintEvaluator &eval,*/ bool filter = false);
+    virtual void deserialize(D4StreamUnMarshaller &um, DMR &dmr);
+
+    virtual unsigned int val2buf(void *val, bool reuse = false);
+    virtual unsigned int buf2val(void **val);
+
+    virtual bool set_value(const string &value);
+    virtual string value() const;
+
+    virtual void print_val(FILE *out, string space = "",
+                           bool print_decl_p = true);
+    virtual void print_val(ostream &out, string space = "",
+                           bool print_decl_p = true);
+
+    virtual bool ops(BaseType *b, int op);
+    virtual bool d4_ops(BaseType *b, int op);
+
+    virtual void dump(ostream &strm) const ;
+};
+
+} // namespace libdap
+
+#endif // _str_h
+
diff --git a/Structure.cc b/Structure.cc
new file mode 100644
index 0000000..fbce0d6
--- /dev/null
+++ b/Structure.cc
@@ -0,0 +1,697 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1994-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// Implementation for the class Structure
+//
+// jhrg 9/14/94
+
+//#define DODS_DEBUG
+
+#include "config.h"
+
+#include <sstream>
+
+#include "Byte.h"
+#include "Int16.h"
+#include "UInt16.h"
+#include "Int32.h"
+#include "UInt32.h"
+#include "Float32.h"
+#include "Float64.h"
+#include "Str.h"
+#include "Url.h"
+#include "Array.h"
+#include "Structure.h"
+#include "Sequence.h"
+#include "Grid.h"
+
+#include "DDS.h"
+#include "ConstraintEvaluator.h"
+
+#include "D4Attributes.h"
+#include "D4Group.h"
+
+#include "XDRStreamMarshaller.h"
+#include "util.h"
+#include "debug.h"
+#include "InternalErr.h"
+#include "escaping.h"
+
+using std::cerr;
+using std::endl;
+
+namespace libdap {
+
+#if 0
+/** This method is protected so it's hidden from the whole world, but
+ * available to direct child classes. Because of that, we need a glue-routine
+ * here so children of Structure can specialize it.
+ */
+void
+Structure::m_duplicate(const Structure &s)
+{
+    Constructor::m_duplicate(s);
+#if 0
+    Structure &cs = const_cast<Structure &>(s);
+
+    DBG(cerr << "Copying structure: " << name() << endl);
+
+    for (Vars_iter i = cs.d_vars.begin(); i != cs.d_vars.end(); i++) {
+        DBG(cerr << "Copying field: " << (*i)->name() << endl);
+        // Jose Garcia
+        // I think this assert here is part of a debugging
+        // process since it is going along with a DBG call
+        // I leave it here since it can be remove by defining NDEBUG.
+        // assert(*i);
+        BaseType *btp = (*i)->ptr_duplicate();
+        btp->set_parent(this);
+        d_vars.push_back(btp);
+    }
+#endif
+}
+#endif
+
+/** The Structure constructor requires only the name of the variable
+    to be created. The name may be omitted, which will create a
+    nameless variable. This may be adequate for some applications.
+
+    @param n A string containing the name of the variable to be
+    created.
+*/
+Structure::Structure(const string &n) : Constructor(n, dods_structure_c)
+{}
+
+/** The Structure server-side constructor requires the name of the variable
+    to be created and the dataset name from which this variable is being
+    created. Used on server-side handlers.
+
+    @param n A string containing the name of the variable to be
+    created.
+    @param d A string containing the name of the dataset from which this
+    variable is being created.
+*/
+Structure::Structure(const string &n, const string &d)
+    : Constructor(n, d, dods_structure_c)
+{}
+
+/** The Structure copy constructor. */
+Structure::Structure(const Structure &rhs) : Constructor(rhs)
+{
+    DBG(cerr << "In Structure::copy_ctor for " << name() << endl);
+    //m_duplicate(rhs);
+}
+
+Structure::~Structure()
+{
+}
+
+BaseType *
+Structure::ptr_duplicate()
+{
+    return new Structure(*this);
+}
+
+/**
+ * Build a DAP4 Structure.
+ *
+ * This code must be subclassed for all but the most trivial cases.
+ *
+ * @param root
+ * @param container
+ * @return The new variable
+ */
+void
+Structure::transform_to_dap4(D4Group *root, Constructor *container)
+{
+    DBG(cerr << __func__ <<"() -  BEGIN" << endl;);
+	// Here we create a new Structure and then use it
+    // as the target container for the transformed versions of
+    // all the member variables by calling Constructor::transform_to_dap4() and
+    // passing our new target Structure in as the target container.
+	Structure *dest = new Structure(name());
+    DBG(cerr << __func__ <<"() -  Calling Constructor::transform_to_dap4("<<
+        "'" << root->name() << "':" << (void*)root << ","
+        "'" << dest->name() << "':" << (void*)dest << ")"
+        << endl; );
+	Constructor::transform_to_dap4(root, dest);
+	container->add_var_nocopy(dest);
+	DBG(cerr << __func__ <<"() -  Added new Structure '" << dest->name() << "' (" << (void*)dest <<
+	    ") to the container '" << container->name() <<"'" << endl;);
+    DBG(cerr << __func__ <<"() -  END"<< endl;);
+}
+
+
+/** @brief DAP4 to DAP2 transform
+ *
+ * Return a DAP2 'copy' of the variable.
+ *
+ * @return A pointer to the transformed variable
+ */
+vector<BaseType *> *
+Structure::transform_to_dap2(AttrTable *)
+{
+    DBG(cerr << " " << __func__ << " BEGIN" << endl);
+    Structure *dest = new Structure(name());
+
+    // convert the Structure's d4 attributes to a dap2 attribute table.
+    AttrTable *attrs = this->attributes()->get_AttrTable(name());
+    dest->set_is_dap4(false);
+
+    vector<BaseType *> dropped_vars;
+    for (Structure::Vars_citer i = var_begin(), e = var_end(); i != e; ++i) {
+        vector<BaseType *> *new_vars = (*i)->transform_to_dap2(attrs);
+        if (new_vars) {  // Might be un-mappable
+            // It's not so game on..
+            vector<BaseType*>::iterator vIter = new_vars->begin();
+            vector<BaseType*>::iterator end = new_vars->end();
+            for( ; vIter!=end ; vIter++ ){
+                BaseType *new_var = (*vIter);
+                new_var->set_parent(dest);
+                dest->add_var_nocopy(new_var);
+                (*vIter) = NULL;
+            }
+            delete new_vars;
+
+        }
+        else {
+            // Got a NULL, so we are dropping this var.
+            dropped_vars.push_back(*i);
+        }
+    }
+
+    AttrTable *dv_attr_table = make_dropped_vars_attr_table(&dropped_vars);
+    if(dv_attr_table){
+        DBG(cerr << " " << __func__ << "() - Adding "<< dv_attr_table->get_name() << " AttrTable" << endl);
+        attrs->append_container(dv_attr_table,dv_attr_table->get_name());
+    }
+    DBG(attrs->print(cerr,"",true););
+    // Since this does a copy we gotta delete the attrs when done
+    dest->set_attr_table(*attrs);
+    delete attrs;
+
+    vector<BaseType *> *result =  new vector<BaseType *>();
+    result->push_back(dest);
+    DBG(cerr << " " << __func__ << " END" << endl);
+    return result;
+}
+
+
+
+
+
+Structure &
+Structure::operator=(const Structure &rhs)
+{
+    DBG(cerr << "Entering Structure::operator=" << endl);
+    if (this == &rhs)
+        return *this;
+
+    dynamic_cast<Constructor &>(*this) = rhs; // run Constructor=
+
+    //m_duplicate(rhs);
+
+    DBG(cerr << "Exiting Structure::operator=" << endl);
+    return *this;
+}
+
+#if 0
+int
+Structure::element_count(bool leaves)
+{
+    if (!leaves)
+        return d_vars.size();
+    else {
+        int i = 0;
+        for (Vars_iter j = d_vars.begin(); j != d_vars.end(); j++) {
+            i += (*j)->element_count(leaves);
+        }
+        return i;
+    }
+}
+#endif
+
+bool
+Structure::is_linear()
+{
+    bool linear = true;
+    for (Vars_iter i = d_vars.begin(); linear && i != d_vars.end(); i++) {
+        if ((*i)->type() == dods_structure_c)
+            linear = linear && static_cast<Structure*>((*i))->is_linear();
+        else
+            linear = linear && (*i)->is_simple_type();
+    }
+
+    return linear;
+}
+
+#if 0
+void
+Structure::set_send_p(bool state)
+{
+    for (Vars_iter i = d_vars.begin(); i != d_vars.end(); i++) {
+        (*i)->set_send_p(state);
+    }
+
+    BaseType::set_send_p(state);
+}
+
+void
+Structure::set_read_p(bool state)
+{
+    for (Vars_iter i = d_vars.begin(); i != d_vars.end(); i++) {
+        (*i)->set_read_p(state);
+    }
+
+    BaseType::set_read_p(state);
+}
+#endif
+#if 0
+/** Set the \e in_selection property for this variable and all of its
+    children.
+
+    @brief Set the \e in_selection property.
+    @param state Set the property value to \e state. */
+void
+Structure::set_in_selection(bool state)
+{
+    for (Vars_iter i = d_vars.begin(); i != d_vars.end(); i++) {
+        (*i)->set_in_selection(state);
+    }
+
+    BaseType::set_in_selection(state);
+}
+#endif
+/** @brief Traverse Structure, set Sequence leaf nodes. */
+void
+Structure::set_leaf_sequence(int level)
+{
+    for (Vars_iter i = var_begin(); i != var_end(); i++) {
+        if ((*i)->type() == dods_sequence_c)
+        	static_cast<Sequence&>(**i).set_leaf_sequence(++level);
+        else if ((*i)->type() == dods_structure_c)
+        	static_cast<Structure&>(**i).set_leaf_sequence(level);
+    }
+}
+
+#if 0
+/** Adds an element to a Structure.
+
+    @param bt A pointer to the DAP2 type variable to add to this Structure.
+    @param part Not used by this class, defaults to nil */
+void
+Structure::add_var(BaseType *bt, Part)
+{
+    // Jose Garcia
+    // Passing and invalid pointer to an object is a developer's error.
+    if (!bt)
+        throw InternalErr(__FILE__, __LINE__, "The BaseType parameter cannot be null.");
+
+    if (bt->is_dap4_only_type())
+        throw InternalErr(__FILE__, __LINE__, "Attempt to add a DAP4 type to a DAP2 Structure.");
+
+    // Jose Garcia
+    // Now we add a copy of bt so the external user is able to destroy bt as
+    // he/she wishes. The policy is: "If it is allocated outside, it is
+    // deallocated outside, if it is allocated inside, it is deallocated
+    // inside"
+    BaseType *btp = bt->ptr_duplicate();
+    btp->set_parent(this);
+    d_vars.push_back(btp);
+}
+
+/** Adds an element to a Structure.
+
+    @param bt A pointer to the DAP2 type variable to add to this Structure.
+    @param part Not used by this class, defaults to nil */
+void
+Structure::add_var_nocopy(BaseType *bt, Part)
+{
+    if (!bt)
+        throw InternalErr(__FILE__, __LINE__, "The BaseType parameter cannot be null.");
+
+    if (bt->is_dap4_only_type())
+        throw InternalErr(__FILE__, __LINE__, "Attempt to add a DAP4 type to a DAP2 Structure.");
+
+    bt->set_parent(this);
+    d_vars.push_back(bt);
+}
+
+
+/** Removed an element from a Structure.
+
+    @param n name of the variable to remove */
+void
+Structure::del_var(const string &n)
+{
+    for (Vars_iter i = d_vars.begin(); i != d_vars.end(); i++) {
+        if ((*i)->name() == n) {
+            BaseType *bt = *i ;
+            d_vars.erase(i) ;
+            delete bt ; bt = 0;
+            return;
+        }
+    }
+}
+#endif
+#if 0
+/** @brief simple implementation of read that iterates through vars
+ *  and calls read on them
+ *
+ * @return returns false to signify all has been read
+ */
+bool Structure::read()
+{
+    if (!read_p()) {
+        for (Vars_iter i = d_vars.begin(); i != d_vars.end(); i++) {
+            (*i)->read();
+        }
+        set_read_p(true);
+    }
+
+    return false;
+}
+#endif
+#if 0
+// TODO Recode to use width(bool)
+unsigned int
+Structure::width()
+{
+    unsigned int sz = 0;
+
+    for (Vars_iter i = d_vars.begin(); i != d_vars.end(); i++) {
+        sz += (*i)->width();
+    }
+
+    return sz;
+}
+
+/** This version of width simply returns the same thing as width() for simple
+    types and Arrays. For Structure it returns the total size if constrained
+    is false, or the size of the elements in the current projection if true.
+
+    @param constrained If true, return the size after applying a constraint.
+    @return  The number of bytes used by the variable.
+ */
+unsigned int
+Structure::width(bool constrained)
+{
+    unsigned int sz = 0;
+
+    for (Vars_iter i = d_vars.begin(); i != d_vars.end(); i++) {
+    	if (constrained) {
+    		if ((*i)->send_p())
+    			sz += (*i)->width(constrained);
+    	}
+    	else {
+    		sz += (*i)->width(constrained);
+    	}
+    }
+
+    return sz;
+}
+#endif
+
+#if 0
+void
+Structure::intern_data(ConstraintEvaluator & eval, DDS & dds)
+{
+    DBG(cerr << "Structure::intern_data: " << name() << endl);
+    if (!read_p())
+        read();          // read() throws Error and InternalErr
+
+    for (Vars_iter i = d_vars.begin(); i != d_vars.end(); i++) {
+        if ((*i)->send_p()) {
+            (*i)->intern_data(eval, dds);
+        }
+    }
+}
+
+bool
+Structure::serialize(ConstraintEvaluator &eval, DDS &dds,
+                     Marshaller &m, bool ce_eval)
+{
+#if USE_LOCAL_TIMEOUT_SCHEME
+    dds.timeout_on();
+#endif
+    if (!read_p())
+        read();  // read() throws Error and InternalErr
+
+#if EVAL
+    if (ce_eval && !eval.eval_selection(dds, dataset()))
+        return true;
+#endif
+#if USE_LOCAL_TIMEOUT_SCHEME
+    dds.timeout_off();
+#endif
+    for (Vars_iter i = d_vars.begin(); i != d_vars.end(); i++) {
+        if ((*i)->send_p()) {
+#ifdef CHECKSUMS
+            XDRStreamMarshaller *sm = dynamic_cast<XDRStreamMarshaller*>(&m);
+            if (sm && sm->checksums() && (*i)->type() != dods_structure_c && (*i)->type() != dods_grid_c)
+                sm->reset_checksum();
+
+            (*i)->serialize(eval, dds, m, false);
+
+            if (sm && sm->checksums() && (*i)->type() != dods_structure_c && (*i)->type() != dods_grid_c)
+                sm->get_checksum();
+#else
+            (*i)->serialize(eval, dds, m, false);
+#endif
+        }
+    }
+
+    return true;
+}
+
+bool
+Structure::deserialize(UnMarshaller &um, DDS *dds, bool reuse)
+{
+    for (Vars_iter i = d_vars.begin(); i != d_vars.end(); i++) {
+        (*i)->deserialize(um, dds, reuse);
+    }
+
+    return false;
+}
+#endif
+#if 0
+/**  @brief Never call this
+
+     This method cannot be used to change values of a Structure since
+     the values of a Constructor type must be set using methods in
+     Constructor. See the Constructor::var_begin() and related
+     methods.
+
+     @todo Make this throw an exception
+     @return Returns the size of the structure. */
+unsigned int
+Structure::val2buf(void *, bool)
+{
+    return sizeof(Structure);
+}
+
+/** @brief Never call this
+    @see val2buf()
+    @return Returns the size of the structure. */
+unsigned int
+Structure::buf2val(void **)
+{
+    return sizeof(Structure);
+}
+#endif
+
+#if 0
+BaseType *
+Structure::var(const string &name, bool exact_match, btp_stack *s)
+{
+    string n = www2id(name);
+
+    if (exact_match)
+        return m_exact_match(n, s);
+    else
+        return m_leaf_match(n, s);
+}
+
+/** @deprecated See comment in BaseType */
+BaseType *
+Structure::var(const string &n, btp_stack &s)
+{
+    string name = www2id(n);
+
+    BaseType *btp = m_exact_match(name, &s);
+    if (btp)
+        return btp;
+
+    return m_leaf_match(name, &s);
+}
+#endif
+#if 0
+// Private method to find a variable using the shorthand name. This
+// should be moved to Constructor.
+BaseType *
+Structure::m_leaf_match(const string &name, btp_stack *s)
+{
+    for (Vars_iter i = d_vars.begin(); i != d_vars.end(); i++) {
+        if ((*i)->name() == name) {
+            if (s) {
+                DBG(cerr << "Pushing " << this->name() << endl);
+                s->push(static_cast<BaseType *>(this));
+            }
+            return *i;
+        }
+        if ((*i)->is_constructor_type()) {
+            BaseType *btp = (*i)->var(name, false, s);
+            if (btp) {
+                if (s) {
+                    DBG(cerr << "Pushing " << this->name() << endl);
+                    s->push(static_cast<BaseType *>(this));
+                }
+                return btp;
+            }
+        }
+    }
+
+    return 0;
+}
+
+// Breadth-first search for NAME. If NAME contains one or more dots (.)
+// TODO The btp_stack is not needed since there are 'back pointers' in
+// BaseType.
+BaseType *
+Structure::m_exact_match(const string &name, btp_stack *s)
+{
+    // Look for name at the top level first.
+    for (Vars_iter i = d_vars.begin(); i != d_vars.end(); i++) {
+        if ((*i)->name() == name) {
+            if (s)
+                s->push(static_cast<BaseType *>(this));
+
+            return *i;
+        }
+    }
+
+    // If it was not found using the simple search, look for a dot and
+    // search the hierarchy.
+    string::size_type dot_pos = name.find("."); // zero-based index of `.'
+    if (dot_pos != string::npos) {
+        string aggregate = name.substr(0, dot_pos);
+        string field = name.substr(dot_pos + 1);
+
+        BaseType *agg_ptr = var(aggregate);
+        if (agg_ptr) {
+            if (s)
+                s->push(static_cast<BaseType *>(this));
+
+            return agg_ptr->var(field, true, s); // recurse
+        }
+        else
+            return 0;  // qualified names must be *fully* qualified
+    }
+
+    return 0;
+}
+#endif
+#if 0
+void
+Structure::print_val(FILE *out, string space, bool print_decl_p)
+{
+    ostringstream oss;
+    print_val(oss, space, print_decl_p);
+    fwrite(oss.str().data(), sizeof(char), oss.str().length(), out);
+}
+
+void
+Structure::print_val(ostream &out, string space, bool print_decl_p)
+{
+    if (print_decl_p) {
+        print_decl(out, space, false);
+	out << " = " ;
+    }
+
+    out << "{ " ;
+    for (Vars_citer i = d_vars.begin(); i != d_vars.end();
+         i++, (void)(i != d_vars.end() && out << ", ")) {
+        (*i)->print_val(out, "", false);
+    }
+
+    out << " }" ;
+
+    if (print_decl_p)
+	out << ";\n" ;
+}
+#endif
+
+#if 0
+bool
+Structure::check_semantics(string &msg, bool all)
+{
+    if (!BaseType::check_semantics(msg))
+        return false;
+
+    bool status = true;
+
+    if (!unique_names(d_vars, name(), type_name(), msg))
+        return false;
+
+    if (all) {
+        for (Vars_iter i = d_vars.begin(); i != d_vars.end(); i++) {
+            //assert(*i);
+            if (!(*i)->check_semantics(msg, true)) {
+                status = false;
+                goto exit;
+            }
+        }
+    }
+
+exit:
+    return status;
+}
+#endif
+
+/** @brief dumps information about this object
+ *
+ * Displays the pointer value of this instance and information about this
+ * instance.
+ *
+ * @param strm C++ i/o stream to dump the information to
+ * @return void
+ */
+void
+Structure::dump(ostream &strm) const
+{
+    strm << DapIndent::LMarg << "Structure::dump - ("
+    << (void *)this << ")" << endl ;
+    DapIndent::Indent() ;
+    Constructor::dump(strm) ;
+    DapIndent::UnIndent() ;
+}
+
+} // namespace libdap
+
diff --git a/Structure.h b/Structure.h
new file mode 100644
index 0000000..d7b8f5c
--- /dev/null
+++ b/Structure.h
@@ -0,0 +1,110 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1995-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// Interface for the class Structure. A structure contains a single set of
+// variables, all at the same lexical level. Of course, a structure may
+// contain other structures... The variables contained in a structure are
+// stored by instances of this class in a SLList of BaseType pointers.
+//
+// jhrg 9/14/94
+
+#ifndef _structure_h
+#define _structure_h 1
+
+#include <vector>
+
+#include "Constructor.h"
+
+namespace libdap
+{
+
+class DDS;
+class ConstraintEvaluator;
+class D4Group;
+
+/** This data type is used to hold a collection of related data types,
+    in a manner roughly corresponding to a C structure.  The member
+    types can be simple or compound types, and can include other
+    Structures.
+
+    The DAP2 structure is defined as a singly-linked list.  This means
+    that Structure elements can be accessed either by name, with the
+    <tt>var()</tt> function, or by their position in the list, either with
+    the overloaded version of <tt>var()</tt>, or the combination of the
+    <tt>first_var()</tt> and <tt>next_var()</tt> functions.
+
+    The <tt>val2buf()</tt> and <tt>buf2val()</tt> functions only
+    return the size of
+    the structure.  To read parts of a DAP2 Structure into an
+    application program, use the <tt>buf2val()</tt> function of the element
+    of the Structure in question.
+
+    Note that the predicate-setting functions <tt>set_send_p()</tt> and
+    <tt>set_read_p()</tt> set their flags for the Structure as well as for
+    each of the Structure's member elements.
+
+    Similar to C, you can refer to members of Structure elements
+    with a ``.'' notation.  For example, if the Structure has a member
+    Structure called ``Tom'' and Tom has a member Float32 called
+    ``shoe_size'', then you can refer to Tom's shoe size as
+    ``Tom.shoe_size''.
+
+    @brief Holds a structure (aggregate) type.
+*/
+
+class Structure: public Constructor
+{
+private:
+protected:
+
+public:
+    Structure(const string &n);
+    Structure(const string &n, const string &d);
+
+    Structure(const Structure &rhs);
+    virtual ~Structure();
+
+    Structure &operator=(const Structure &rhs);
+    virtual BaseType *ptr_duplicate();
+
+    virtual void transform_to_dap4(D4Group *root, Constructor *container);
+    virtual vector<BaseType *> *transform_to_dap2(AttrTable *parent_attr_table);
+
+    virtual bool is_linear();
+
+    virtual void set_leaf_sequence(int level = 1);
+
+    virtual void dump(ostream &strm) const ;
+};
+
+} // namespace libdap
+
+#endif // _structure_h
diff --git a/Type.h b/Type.h
new file mode 100644
index 0000000..5e71ad0
--- /dev/null
+++ b/Type.h
@@ -0,0 +1,127 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2013 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#ifndef TYPE_H_
+#define TYPE_H_
+
+namespace libdap {
+
+/** <b>Part</b> names the parts of multi-section constructor types.
+    For example, the <b>Grid</b> class has an <i>array</i> and
+    the array <i>maps</i>. Use the <tt>nil</tt> value for data types that
+    don't have separate parts.
+
+    \code
+    enum Part {
+    nil,
+    array,
+    maps
+    };
+    \endcode
+
+    @brief Names the parts of multi-section constructor data types.
+    @see Grid
+    @see BaseType
+*/
+
+enum Part {
+    nil,   // nil is for types that don't have parts...
+    array,
+    maps
+};
+
+/** <b>Type</b> identifies the data type stored in a particular type
+    class. All the DODS Data Access Protocol (DAP) types inherit from
+    the BaseType class.
+
+    \code
+    enum Type {
+    dods_null_c,
+    dods_byte_c,
+    dods_int16_c,
+    dods_uint16_c,
+    dods_int32_c,
+    dods_uint32_c,
+    dods_float32_c,
+    dods_float64_c,
+    dods_str_c,
+    dods_url_c,
+
+    dods_structure_c,
+    dods_array_c,
+    dods_sequence_c,
+
+    dods_grid_c,
+
+    dods_char_c,
+    dods_int8_c,
+    dods_uint8_c,
+
+    dods_int64_c,
+    dods_uint64_c,
+    dods_enum_c,
+    dods_opaque_c,
+    dods_group_c
+
+    };
+    \endcode
+
+    @brief Identifies the data type.
+    @see BaseType
+*/
+
+enum Type {
+    dods_null_c,
+    dods_byte_c,
+    dods_int16_c,
+    dods_uint16_c,
+    dods_int32_c,  // Added `dods_' to fix clash with IRIX 5.3.
+    dods_uint32_c,
+    dods_float32_c,
+    dods_float64_c,
+    dods_str_c,
+    dods_url_c,
+
+    dods_structure_c,
+    dods_array_c,
+    dods_sequence_c,
+
+    // Not used for DAP4
+    dods_grid_c,
+
+    // Added for DAP4
+    dods_char_c,	// a synonym for UInt8 (and Byte)
+    dods_int8_c,
+    dods_uint8_c,
+
+    dods_int64_c,
+    dods_uint64_c,
+    dods_enum_c,
+    dods_opaque_c,
+    dods_group_c
+};
+
+} // namespace libdap
+
+#endif /* TYPE_H_ */
diff --git a/UInt16.cc b/UInt16.cc
new file mode 100644
index 0000000..4a16b79
--- /dev/null
+++ b/UInt16.cc
@@ -0,0 +1,312 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// Implementation for Int32.
+//
+// jhrg 9/7/94
+
+
+#include "config.h"
+
+#include <sstream>
+
+#include "Byte.h"           // synonymous with UInt8 and Char
+#include "Int8.h"
+#include "Int16.h"
+#include "UInt16.h"
+#include "Int32.h"
+#include "UInt32.h"
+#include "Int64.h"
+#include "UInt64.h"
+#include "Float32.h"
+#include "Float64.h"
+#include "Str.h"
+#include "Url.h"
+
+#include "DDS.h"
+#include "Marshaller.h"
+#include "UnMarshaller.h"
+
+#include "DMR.h"
+#include "D4StreamMarshaller.h"
+#include "D4StreamUnMarshaller.h"
+
+#include "util.h"
+#include "parser.h"
+#include "Operators.h"
+#include "dods-limits.h"
+#include "debug.h"
+#include "InternalErr.h"
+
+using std::cerr;
+using std::endl;
+
+namespace libdap {
+
+/** The UInt16 constructor accepts the name of the variable to be created.
+
+    @param n A string containing the name of the variable to be created.
+*/
+UInt16::UInt16(const string &n) : BaseType(n, dods_uint16_c), d_buf(0)
+{}
+
+/** The UInt16 server-side constructor accepts the name of the variable to
+    be created and the dataset name from which this instance is created.
+
+    @param n A string containing the name of the variable to be created.
+    @param d A string containing the name of the dataset from which this
+    variable is created
+*/
+UInt16::UInt16(const string &n, const string &d) : BaseType(n, d, dods_uint16_c), d_buf(0)
+{}
+
+UInt16::UInt16(const UInt16 &copy_from) : BaseType(copy_from)
+{
+    d_buf = copy_from.d_buf;
+}
+
+BaseType *
+UInt16::ptr_duplicate()
+{
+    return new UInt16(*this);
+}
+
+UInt16 &
+UInt16::operator=(const UInt16 &rhs)
+{
+    if (this == &rhs)
+        return *this;
+
+    dynamic_cast<BaseType &>(*this) = rhs;
+
+    d_buf = rhs.d_buf;
+
+    return *this;
+}
+
+unsigned int
+UInt16::width(bool) const
+{
+    return sizeof(dods_uint16);
+}
+
+bool
+UInt16::serialize(ConstraintEvaluator &eval, DDS &dds, Marshaller &m, bool ce_eval)
+{
+#if USE_LOCAL_TIMEOUT_SCHEME
+    dds.timeout_on();
+#endif
+    if (!read_p())
+        read();  // read() throws Error and InternalErr
+
+    if (ce_eval && !eval.eval_selection(dds, dataset()))
+        return true;
+#if USE_LOCAL_TIMEOUT_SCHEME
+    dds.timeout_off();
+#endif
+    m.put_uint16( d_buf ) ;
+
+    return true;
+}
+
+bool
+UInt16::deserialize(UnMarshaller &um, DDS *, bool)
+{
+    um.get_uint16( d_buf ) ;
+
+    return false;
+}
+
+void
+UInt16::compute_checksum(Crc32 &checksum)
+{
+	checksum.AddData(reinterpret_cast<uint8_t*>(&d_buf), sizeof(d_buf));
+}
+
+/**
+ * @brief Serialize an Int8
+ * @param m
+ * @param dmr Unused
+ * @param eval Unused
+ * @param filter Unused
+ * @exception Error is thrown if the value needs to be read and that operation fails.
+ */
+void
+UInt16::serialize(D4StreamMarshaller &m, DMR &, /*ConstraintEvaluator &,*/ bool)
+{
+    if (!read_p())
+        read();          // read() throws Error
+
+    m.put_uint16( d_buf ) ;
+}
+
+void
+UInt16::deserialize(D4StreamUnMarshaller &um, DMR &)
+{
+    um.get_uint16( d_buf ) ;
+}
+
+unsigned int
+UInt16::val2buf(void *val, bool)
+{
+    // Jose Garcia
+    // This method is public therefore and I believe it has being designed
+    // to be use by read which must be implemented on the surrogated library,
+    // thus if the pointer val is NULL, is an Internal Error.
+    if (!val)
+        throw InternalErr(__FILE__, __LINE__,
+                          "The incoming pointer does not contain any data.");
+
+    d_buf = *(dods_uint16 *)val;
+
+    return width();
+}
+
+unsigned int
+UInt16::buf2val(void **val)
+{
+    // Jose Garcia
+    // The same comment justifying throwing an Error in val2buf applies here.
+    if (!val)
+        throw InternalErr(__FILE__, __LINE__, "NULL pointer.");
+
+    if (!*val)
+        *val = new dods_uint16;
+
+    *(dods_uint16 *)*val = d_buf;
+
+    return width();
+}
+
+dods_uint16
+UInt16::value() const
+{
+    return d_buf;
+}
+
+bool
+UInt16::set_value(dods_uint16 i)
+{
+    d_buf = i;
+    set_read_p(true);
+
+    return true;
+}
+
+void
+UInt16::print_val(FILE *out, string space, bool print_decl_p)
+{
+    ostringstream oss;
+    print_val(oss, space, print_decl_p);
+    fwrite(oss.str().data(), sizeof(char), oss.str().length(), out);
+}
+
+void
+UInt16::print_val(ostream &out, string space, bool print_decl_p)
+{
+    if (print_decl_p) {
+        print_decl(out, space, false);
+	out << " = " << (unsigned int)d_buf << ";\n" ;
+    }
+    else
+	out << (unsigned int)d_buf ;
+}
+
+bool
+UInt16::ops(BaseType *b, int op)
+{
+    // Extract the Byte arg's value.
+    if (!read_p() && !read()) {
+        // Jose Garcia
+        // Since the read method is virtual and implemented outside
+        // libdap++ if we cannot read the data that is the problem
+        // of the user or of whoever wrote the surrogate library
+        // implemeting read therefore it is an internal error.
+        throw InternalErr(__FILE__, __LINE__, "This value was not read!");
+    }
+
+    // Extract the second arg's value.
+    if (!b || !(b->read_p() || b->read())) {
+        // Jose Garcia
+        // Since the read method is virtual and implemented outside
+        // libdap++ if we cannot read the data that is the problem
+        // of the user or of whoever wrote the surrogate library
+        // implemeting read therefore it is an internal error.
+        throw InternalErr(__FILE__, __LINE__, "This value was not read!");
+    }
+
+    switch (b->type()) {
+        case dods_int8_c:
+            return USCmp<dods_uint16, dods_int8>(op, d_buf, static_cast<Int8*>(b)->value());
+        case dods_byte_c:
+            return Cmp<dods_uint16, dods_byte>(op, d_buf, static_cast<Byte*>(b)->value());
+        case dods_int16_c:
+            return USCmp<dods_uint16, dods_int16>(op, d_buf, static_cast<Int16*>(b)->value());
+        case dods_uint16_c:
+            return Cmp<dods_uint16, dods_uint16>(op, d_buf, static_cast<UInt16*>(b)->value());
+        case dods_int32_c:
+            return USCmp<dods_uint16, dods_int32>(op, d_buf, static_cast<Int32*>(b)->value());
+        case dods_uint32_c:
+            return Cmp<dods_uint16, dods_uint32>(op, d_buf, static_cast<UInt32*>(b)->value());
+        case dods_int64_c:
+            return USCmp<dods_uint16, dods_int64>(op, d_buf, static_cast<Int64*>(b)->value());
+        case dods_uint64_c:
+            return Cmp<dods_uint16, dods_uint64>(op, d_buf, static_cast<UInt64*>(b)->value());
+        case dods_float32_c:
+            return USCmp<dods_uint16, dods_float32>(op, d_buf, static_cast<Float32*>(b)->value());
+        case dods_float64_c:
+            return USCmp<dods_uint16, dods_float64>(op, d_buf, static_cast<Float64*>(b)->value());
+        default:
+            return false;
+    }
+}
+
+/** @brief dumps information about this object
+ *
+ * Displays the pointer value of this instance and information about this
+ * instance.
+ *
+ * @param strm C++ i/o stream to dump the information to
+ * @return void
+ */
+void
+UInt16::dump(ostream &strm) const
+{
+    strm << DapIndent::LMarg << "UInt16::dump - ("
+    << (void *)this << ")" << endl ;
+    DapIndent::Indent() ;
+    BaseType::dump(strm) ;
+    strm << DapIndent::LMarg << "value: " << d_buf << endl ;
+    DapIndent::UnIndent() ;
+}
+
+} // namespace libdap
+
diff --git a/UInt16.h b/UInt16.h
new file mode 100644
index 0000000..72c1a44
--- /dev/null
+++ b/UInt16.h
@@ -0,0 +1,104 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1996,1997,1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// Interface for Int16 type.
+//
+// jhrg 9/7/94
+
+#ifndef _uint16_h
+#define _uint16_h 1
+
+
+#ifndef _dods_datatypes_h
+#include "dods-datatypes.h"
+#endif
+
+#ifndef _basetype_h
+#include "BaseType.h"
+#endif
+
+#ifndef constraint_evaluator_h
+#include "ConstraintEvaluator.h"
+#endif
+
+namespace libdap
+{
+
+/** @brief Holds an unsigned 16-bit integer. */
+
+class UInt16: public BaseType
+{
+protected:
+    dods_uint16 d_buf;
+
+public:
+    UInt16(const string &n);
+    UInt16(const string &n, const string &d);
+    virtual ~UInt16()
+    {}
+
+    UInt16(const UInt16 &copy_from);
+
+    UInt16 &operator=(const UInt16 &rhs);
+
+    virtual BaseType *ptr_duplicate();
+
+    virtual unsigned int width(bool constrained = false) const;
+
+    // DAP2
+    virtual bool serialize(ConstraintEvaluator &eval, DDS &dds,  Marshaller &m, bool ce_eval = true);
+    virtual bool deserialize(UnMarshaller &um, DDS *dds, bool reuse = false);
+
+    // DAP4
+    virtual void compute_checksum(Crc32 &checksum);
+    virtual void serialize(D4StreamMarshaller &m, DMR &dmr, /*ConstraintEvaluator &eval,*/ bool filter = false);
+    virtual void deserialize(D4StreamUnMarshaller &um, DMR &dmr);
+
+    virtual unsigned int val2buf(void *val, bool reuse = false);
+    virtual unsigned int buf2val(void **val);
+
+    virtual dods_uint16 value() const;
+    virtual bool set_value(dods_uint16 val);
+
+    virtual void print_val(FILE *out, string space = "",
+                           bool print_decl_p = true);
+    virtual void print_val(ostream &out, string space = "",
+                           bool print_decl_p = true);
+
+    virtual bool ops(BaseType *b, int op);
+
+    virtual void dump(ostream &strm) const ;
+};
+
+} // namespace libdap
+
+#endif // _uint16_h
+
diff --git a/UInt32.cc b/UInt32.cc
new file mode 100644
index 0000000..4eaec2c
--- /dev/null
+++ b/UInt32.cc
@@ -0,0 +1,314 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// Implementation for Int32.
+//
+// jhrg 9/7/94
+
+
+#include "config.h"
+
+#include <sstream>
+
+#include "Byte.h"           // synonymous with UInt8 and Char
+#include "Int8.h"
+#include "Int16.h"
+#include "UInt16.h"
+#include "Int32.h"
+#include "UInt32.h"
+#include "Int64.h"
+#include "UInt64.h"
+#include "Float32.h"
+#include "Float64.h"
+#include "Str.h"
+#include "Url.h"
+
+#include "DDS.h"
+#include "Marshaller.h"
+#include "UnMarshaller.h"
+
+#include "DMR.h"
+#include "D4StreamMarshaller.h"
+#include "D4StreamUnMarshaller.h"
+
+#include "util.h"
+#include "parser.h"
+#include "Operators.h"
+#include "dods-limits.h"
+#include "debug.h"
+#include "InternalErr.h"
+
+using std::cerr;
+using std::endl;
+
+namespace libdap {
+
+/** The UInt32 constructor accepts the name of the variable to be created.
+
+    @param n A string containing the name of the variable to be created.
+    variable is created
+*/
+UInt32::UInt32(const string &n) : BaseType(n, dods_uint32_c), d_buf(0)
+{}
+
+/** The UInt32 server-side constructor accepts the name of the variable and
+    the dataset name from which this instance is created.
+
+    @param n A string containing the name of the variable to be created.
+    @param d A string containing the name of the dataset from which this
+    variable is created
+*/
+UInt32::UInt32(const string &n, const string &d) : BaseType(n, d, dods_uint32_c), d_buf(0)
+{}
+
+UInt32::UInt32(const UInt32 &copy_from) : BaseType(copy_from)
+{
+    d_buf = copy_from.d_buf;
+}
+
+BaseType *
+UInt32::ptr_duplicate()
+{
+    return new UInt32(*this);
+}
+
+UInt32 &
+UInt32::operator=(const UInt32 &rhs)
+{
+    if (this == &rhs)
+        return *this;
+
+    dynamic_cast<BaseType &>(*this) = rhs;
+
+    d_buf = rhs.d_buf;
+
+    return *this;
+}
+
+unsigned int
+UInt32::width(bool) const
+{
+    return sizeof(dods_uint32);
+}
+
+bool
+UInt32::serialize(ConstraintEvaluator &eval, DDS &dds, Marshaller &m, bool ce_eval)
+{
+#if USE_LOCAL_TIMEOUT_SCHEME
+    dds.timeout_on();
+#endif
+    if (!read_p())
+        read();  // read() throws Error and InternalErr
+
+    if (ce_eval && !eval.eval_selection(dds, dataset()))
+        return true;
+#if USE_LOCAL_TIMEOUT_SCHEME
+    dds.timeout_off();
+#endif
+    m.put_uint32( d_buf ) ;
+
+    return true;
+}
+
+bool
+UInt32::deserialize(UnMarshaller &um, DDS *, bool)
+{
+    um.get_uint32( d_buf ) ;
+
+    return false;
+}
+
+void
+UInt32::compute_checksum(Crc32 &checksum)
+{
+	checksum.AddData(reinterpret_cast<uint8_t*>(&d_buf), sizeof(d_buf));
+}
+
+/**
+ * @brief Serialize an Int8
+ * @param m
+ * @param dmr Unused
+ * @param eval Unused
+ * @param filter Unused
+ * @exception Error is thrown if the value needs to be read and that operation fails.
+ */
+void
+UInt32::serialize(D4StreamMarshaller &m, DMR &, /*ConstraintEvaluator &,*/ bool)
+{
+    if (!read_p())
+        read();          // read() throws Error
+
+    m.put_uint32( d_buf ) ;
+}
+
+void
+UInt32::deserialize(D4StreamUnMarshaller &um, DMR &)
+{
+    um.get_uint32( d_buf ) ;
+}
+
+unsigned int
+UInt32::val2buf(void *val, bool)
+{
+
+    // Jose Garcia
+    // This method is public therefore and I believe it has being designed
+    // to be use by read which must be implemented on the surrogated library,
+    // thus if the pointer val is NULL, is an Internal Error.
+    if (!val)
+        throw InternalErr(__FILE__, __LINE__,
+                          "The incoming pointer does not contain any data.");
+
+    d_buf = *(dods_uint32 *)val;
+
+    return width();
+}
+
+unsigned int
+UInt32::buf2val(void **val)
+{
+    // Jose Garcia
+    // The same comment justifying throwing an Error in val2buf applies here.
+    if (!val)
+        throw InternalErr(__FILE__, __LINE__, "NULL pointer.");
+
+    if (!*val)
+        *val = new dods_uint32;
+
+    *(dods_uint32 *)*val = d_buf;
+
+    return width();
+}
+
+dods_uint32
+UInt32::value() const
+{
+    return d_buf;
+}
+
+bool
+UInt32::set_value(dods_uint32 i)
+{
+    d_buf = i;
+    set_read_p(true);
+
+    return true;
+}
+
+void
+UInt32::print_val(FILE *out, string space, bool print_decl_p)
+{
+    ostringstream oss;
+    print_val(oss, space, print_decl_p);
+    fwrite(oss.str().data(), sizeof(char), oss.str().length(), out);
+}
+
+void
+UInt32::print_val(ostream &out, string space, bool print_decl_p)
+{
+    if (print_decl_p) {
+        print_decl(out, space, false);
+	out << " = " << (unsigned int)d_buf << ";\n" ;
+    }
+    else
+	out << (unsigned int)d_buf ;
+}
+
+bool
+UInt32::ops(BaseType *b, int op)
+{
+    // Extract the Byte arg's value.
+    if (!read_p() && !read()) {
+        // Jose Garcia
+        // Since the read method is virtual and implemented outside
+        // libdap++ if we cannot read the data that is the problem
+        // of the user or of whoever wrote the surrogate library
+        // implemeting read therefore it is an internal error.
+        throw InternalErr(__FILE__, __LINE__, "This value was not read!");
+    }
+
+    // Extract the second arg's value.
+    if (!b || !(b->read_p() || b->read())) {
+        // Jose Garcia
+        // Since the read method is virtual and implemented outside
+        // libdap++ if we cannot read the data that is the problem
+        // of the user or of whoever wrote the surrogate library
+        // implemeting read therefore it is an internal error.
+        throw InternalErr(__FILE__, __LINE__, "This value was not read!");
+    }
+
+    switch (b->type()) {
+        case dods_int8_c:
+            return USCmp<dods_uint32, dods_int8>(op, d_buf, static_cast<Int8*>(b)->value());
+        case dods_byte_c:
+            return Cmp<dods_uint32, dods_byte>(op, d_buf, static_cast<Byte*>(b)->value());
+        case dods_int16_c:
+            return USCmp<dods_uint32, dods_int16>(op, d_buf, static_cast<Int16*>(b)->value());
+        case dods_uint16_c:
+            return Cmp<dods_uint32, dods_uint16>(op, d_buf, static_cast<UInt16*>(b)->value());
+        case dods_int32_c:
+            return USCmp<dods_uint32, dods_int32>(op, d_buf, static_cast<Int32*>(b)->value());
+        case dods_uint32_c:
+            return Cmp<dods_uint32, dods_uint32>(op, d_buf, static_cast<UInt32*>(b)->value());
+        case dods_int64_c:
+            return USCmp<dods_uint32, dods_int64>(op, d_buf, static_cast<Int64*>(b)->value());
+        case dods_uint64_c:
+            return Cmp<dods_uint32, dods_uint64>(op, d_buf, static_cast<UInt64*>(b)->value());
+        case dods_float32_c:
+            return USCmp<dods_uint32, dods_float32>(op, d_buf, static_cast<Float32*>(b)->value());
+        case dods_float64_c:
+            return USCmp<dods_uint32, dods_float64>(op, d_buf, static_cast<Float64*>(b)->value());
+        default:
+            return false;
+    }
+}
+
+/** @brief dumps information about this object
+ *
+ * Displays the pointer value of this instance and information about this
+ * instance.
+ *
+ * @param strm C++ i/o stream to dump the information to
+ * @return void
+ */
+void
+UInt32::dump(ostream &strm) const
+{
+    strm << DapIndent::LMarg << "UInt32::dump - ("
+    << (void *)this << ")" << endl ;
+    DapIndent::Indent() ;
+    BaseType::dump(strm) ;
+    strm << DapIndent::LMarg << "value: " << d_buf << endl ;
+    DapIndent::UnIndent() ;
+}
+
+} // namespace libdap
+
diff --git a/UInt32.h b/UInt32.h
new file mode 100644
index 0000000..2815f18
--- /dev/null
+++ b/UInt32.h
@@ -0,0 +1,106 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// Interface for the UInt32 (unsigned int 32) type.
+//
+// jhrg 9/7/94
+
+#ifndef _uint32_h
+#define _uint32_h 1
+
+
+#ifndef _dods_datatypes_h
+#include "dods-datatypes.h"
+#endif
+
+#ifndef _basetype_h
+#include "BaseType.h"
+#endif
+
+#ifndef constraint_evaluator_h
+#include "ConstraintEvaluator.h"
+#endif
+
+namespace libdap
+{
+
+/** @brief Holds a 32-bit unsigned integer.
+
+    @see BaseType */
+
+class UInt32: public BaseType
+{
+protected:
+    dods_uint32 d_buf;
+
+public:
+    UInt32(const string &n);
+    UInt32(const string &n, const string &d);
+    virtual ~UInt32()
+    {}
+
+    UInt32(const UInt32 &copy_from);
+
+    UInt32 &operator=(const UInt32 &rhs);
+
+    virtual BaseType *ptr_duplicate() ;
+
+    virtual unsigned int width(bool constrained = false) const;
+
+    // DAP2
+    virtual bool serialize(ConstraintEvaluator &eval, DDS &dds,  Marshaller &m, bool ce_eval = true);
+    virtual bool deserialize(UnMarshaller &um, DDS *dds, bool reuse = false);
+
+    // DAP4
+    virtual void compute_checksum(Crc32 &checksum);
+    virtual void serialize(D4StreamMarshaller &m, DMR &dmr, /*ConstraintEvaluator &eval,*/ bool filter = false);
+    virtual void deserialize(D4StreamUnMarshaller &um, DMR &dmr);
+
+    virtual unsigned int val2buf(void *val, bool reuse = false);
+    virtual unsigned int buf2val(void **val);
+
+    virtual dods_uint32 value() const;
+    virtual bool set_value(dods_uint32 val);
+
+    virtual void print_val(FILE *out, string space = "",
+                           bool print_decl_p = true);
+    virtual void print_val(ostream &out, string space = "",
+                           bool print_decl_p = true);
+
+    virtual bool ops(BaseType *b, int op);
+
+    virtual void dump(ostream &strm) const ;
+};
+
+} // namespace libdap
+
+#endif // _uint32_h
+
diff --git a/UInt64.cc b/UInt64.cc
new file mode 100644
index 0000000..5858c21
--- /dev/null
+++ b/UInt64.cc
@@ -0,0 +1,288 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2012 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#include "config.h"
+
+#include <sstream>
+
+#include "Byte.h"           // synonymous with UInt8 and Char
+#include "Int8.h"
+#include "Int16.h"
+#include "UInt16.h"
+#include "Int32.h"
+#include "UInt32.h"
+#include "Int64.h"
+#include "UInt64.h"
+#include "Float32.h"
+#include "Float64.h"
+#include "Str.h"
+#include "Url.h"
+
+#include "DMR.h"
+#include "D4StreamMarshaller.h"
+#include "D4StreamUnMarshaller.h"
+
+#include "util.h"
+#include "parser.h"
+#include "Operators.h"
+#include "dods-limits.h"
+#include "debug.h"
+#include "InternalErr.h"
+
+using std::cerr;
+using std::endl;
+
+namespace libdap {
+
+/** The UInt64 constructor accepts the name of the variable to be created.
+
+    @note This type is available in DAP4 only.
+    See http://docs.opendap.org/index.php/DAP4:_Specification_Volume_1#Atomic_Types
+
+    @param n A string containing the name of the variable to be created.
+    variable is created
+*/
+UInt64::UInt64(const string &n) : BaseType(n, dods_uint64_c, true /*is_dap4*/), d_buf(0)
+{}
+
+/** The UInt64 server-side constructor accepts the name of the variable and
+    the dataset name from which this instance is created.
+
+    @note This type is available in DAP4 only.
+    See http://docs.opendap.org/index.php/DAP4:_Specification_Volume_1#Atomic_Types
+
+    @param n A string containing the name of the variable to be created.
+    @param d A string containing the name of the dataset from which this
+    variable is created
+*/
+UInt64::UInt64(const string &n, const string &d)  : BaseType(n, d, dods_uint64_c, true /*is_dap4*/), d_buf(0)
+{}
+
+UInt64::UInt64(const UInt64 &copy_from) : BaseType(copy_from)
+{
+    d_buf = copy_from.d_buf;
+}
+
+BaseType *
+UInt64::ptr_duplicate()
+{
+    return new UInt64(*this);
+}
+
+UInt64 &
+UInt64::operator=(const UInt64 &rhs)
+{
+    if (this == &rhs)
+        return *this;
+
+    dynamic_cast<BaseType &>(*this) = rhs;
+
+    d_buf = rhs.d_buf;
+
+    return *this;
+}
+
+unsigned int
+UInt64::width(bool) const
+{
+    return sizeof(dods_uint64);
+}
+
+void
+UInt64::compute_checksum(Crc32 &checksum)
+{
+	checksum.AddData(reinterpret_cast<uint8_t*>(&d_buf), sizeof(d_buf));
+}
+
+/**
+ * @brief Serialize an Int8
+ * @param m
+ * @param dmr Unused
+ * @param eval Unused
+ * @param filter Unused
+ * @exception Error is thrown if the value needs to be read and that operation fails.
+ */
+void
+UInt64::serialize(D4StreamMarshaller &m, DMR &, /*ConstraintEvaluator &,*/ bool)
+{
+    if (!read_p())
+        read();          // read() throws Error
+
+    m.put_uint64( d_buf ) ;
+}
+
+void
+UInt64::deserialize(D4StreamUnMarshaller &um, DMR &)
+{
+    um.get_uint64( d_buf ) ;
+}
+
+dods_uint64
+UInt64::value() const
+{
+    return d_buf;
+}
+
+bool
+UInt64::set_value(dods_uint64 i)
+{
+    d_buf = i;
+    set_read_p(true);
+
+    return true;
+}
+
+void
+UInt64::print_val(ostream &out, string space, bool print_decl_p)
+{
+    if (print_decl_p) {
+        print_decl(out, space, false);
+	out << " = " << d_buf << ";\n" ;
+    }
+    else
+	out << d_buf ;
+}
+
+bool
+UInt64::ops(BaseType *b, int op)
+{
+    // Extract the Byte arg's value.
+    if (!read_p() && !read())
+        throw InternalErr(__FILE__, __LINE__, "This value was not read!");
+
+    // Extract the second arg's value.
+    if (!b || !(b->read_p() || b->read()))
+        throw InternalErr(__FILE__, __LINE__, "This value was not read!");
+
+    switch (b->type()) {
+        case dods_int8_c:
+            return USCmp<dods_uint64, dods_int8>(op, d_buf, static_cast<Int8*>(b)->value());
+        case dods_byte_c:
+            return Cmp<dods_uint64, dods_byte>(op, d_buf, static_cast<Byte*>(b)->value());
+        case dods_int16_c:
+            return USCmp<dods_uint64, dods_int16>(op, d_buf, static_cast<Int16*>(b)->value());
+        case dods_uint16_c:
+            return Cmp<dods_uint64, dods_uint16>(op, d_buf, static_cast<UInt16*>(b)->value());
+        case dods_int32_c:
+            return USCmp<dods_uint64, dods_int32>(op, d_buf, static_cast<Int32*>(b)->value());
+        case dods_uint32_c:
+            return Cmp<dods_uint64, dods_uint32>(op, d_buf, static_cast<UInt32*>(b)->value());
+        case dods_int64_c:
+            return USCmp<dods_uint64, dods_int64>(op, d_buf, static_cast<Int64*>(b)->value());
+        case dods_uint64_c:
+            return Cmp<dods_uint64, dods_uint64>(op, d_buf, static_cast<UInt64*>(b)->value());
+        case dods_float32_c:
+            return USCmp<dods_uint64, dods_float32>(op, d_buf, static_cast<Float32*>(b)->value());
+        case dods_float64_c:
+            return USCmp<dods_uint64, dods_float64>(op, d_buf, static_cast<Float64*>(b)->value());
+        default:
+            return false;
+    }
+}
+
+bool
+UInt64::d4_ops(BaseType *b, int op)
+{
+    switch (b->type()) {
+        case dods_int8_c:
+            return USCmp<dods_uint64, dods_int8>(op, d_buf, static_cast<Int8*>(b)->value());
+        case dods_byte_c:
+            return Cmp<dods_uint64, dods_byte>(op, d_buf, static_cast<Byte*>(b)->value());
+        case dods_int16_c:
+            return USCmp<dods_uint64, dods_int16>(op, d_buf, static_cast<Int16*>(b)->value());
+        case dods_uint16_c:
+            return Cmp<dods_uint64, dods_uint16>(op, d_buf, static_cast<UInt16*>(b)->value());
+        case dods_int32_c:
+            return USCmp<dods_uint64, dods_int32>(op, d_buf, static_cast<Int32*>(b)->value());
+        case dods_uint32_c:
+            return Cmp<dods_uint64, dods_uint32>(op, d_buf, static_cast<UInt32*>(b)->value());
+        case dods_int64_c:
+            return USCmp<dods_uint64, dods_int64>(op, d_buf, static_cast<Int64*>(b)->value());
+        case dods_uint64_c:
+            return Cmp<dods_uint64, dods_uint64>(op, d_buf, static_cast<UInt64*>(b)->value());
+        case dods_float32_c:
+            return USCmp<dods_uint64, dods_float32>(op, d_buf, static_cast<Float32*>(b)->value());
+        case dods_float64_c:
+            return USCmp<dods_uint64, dods_float64>(op, d_buf, static_cast<Float64*>(b)->value());
+        default:
+            return false;
+    }
+}
+
+
+
+/** @brief DAP4 to DAP2 transform
+ *
+ * For the current BaseType, return a DAP2 'copy' of the variable.
+ *
+ * @note For most DAP4 types, in this implementation of DAP2 the corresponding
+ * DAP4 type is the same. The different types are Sequences (which are D4Sequences
+ * in the DAP4 implementation), Grids (which are coverages) and Arrays (which use
+ * shared dimensions).
+ *
+ * @param root The root group that should hold this new variable. Add Group-level
+ * stuff here (e.g., D4Dimensions).
+ * @param container Add the new variable to this container.
+ *
+ * @return A pointer to the transformed variable
+ */
+std::vector<BaseType *> *
+UInt64::transform_to_dap2(AttrTable *)
+{
+#if 0
+    BaseType *dest = this->ptr_duplicate();
+    // convert the d4 attributes to a dap2 attribute table.
+    AttrTable *attrs = this->attributes()->get_AttrTable();
+    attrs->set_name(name());
+    dest->set_attr_table(*attrs);
+    dest->set_is_dap4(false);
+    // attrs->print(cerr,"",true);
+    return dest;
+#endif
+
+    return NULL;
+}
+
+/** @brief dumps information about this object
+ *
+ * Displays the pointer value of this instance and information about this
+ * instance.
+ *
+ * @param strm C++ i/o stream to dump the information to
+ * @return void
+ */
+void
+UInt64::dump(ostream &strm) const
+{
+    strm << DapIndent::LMarg << "UInt32::dump - ("
+    << (void *)this << ")" << endl ;
+    DapIndent::Indent() ;
+    BaseType::dump(strm) ;
+    strm << DapIndent::LMarg << "value: " << d_buf << endl ;
+    DapIndent::UnIndent() ;
+}
+
+} // namespace libdap
+
diff --git a/UInt64.h b/UInt64.h
new file mode 100644
index 0000000..ef4bbe5
--- /dev/null
+++ b/UInt64.h
@@ -0,0 +1,95 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2012 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#ifndef _uint64_h
+#define _uint64_h 1
+
+
+#ifndef _dods_datatypes_h
+#include "dods-datatypes.h"
+#endif
+
+#ifndef _basetype_h
+#include "BaseType.h"
+#endif
+
+#ifndef constraint_evaluator_h
+#include "ConstraintEvaluator.h"
+#endif
+
+namespace libdap
+{
+
+/** @brief Holds a 64-bit unsigned integer.
+
+    @see BaseType */
+
+class UInt64: public BaseType
+{
+	virtual unsigned int val2buf(void *val, bool)  {
+    	set_value(*reinterpret_cast<dods_uint64*>(val));
+    	return sizeof(dods_uint64);
+    }
+    virtual unsigned int buf2val(void **)  { throw InternalErr(__FILE__, __LINE__, "Not implemented for UInt64"); }
+    virtual void print_val(FILE *, string, bool) { throw InternalErr(__FILE__, __LINE__, "Not implemented for UInt64"); }
+
+protected:
+    dods_uint64 d_buf;
+
+public:
+    UInt64(const string &n);
+    UInt64(const string &n, const string &d);
+    virtual ~UInt64()
+    {}
+
+    UInt64(const UInt64 &copy_from);
+
+    UInt64 &operator=(const UInt64 &rhs);
+
+    virtual BaseType *ptr_duplicate() ;
+
+    virtual unsigned int width(bool constrained = false) const;
+
+    // DAP4
+    virtual void compute_checksum(Crc32 &checksum);
+    virtual void serialize(D4StreamMarshaller &m, DMR &dmr, /*ConstraintEvaluator &eval,*/ bool filter = false);
+    virtual void deserialize(D4StreamUnMarshaller &um, DMR &dmr);
+
+    virtual dods_uint64 value() const;
+    virtual bool set_value(dods_uint64 val);
+
+    virtual void print_val(ostream &out, string space = "",  bool print_decl_p = true);
+
+    virtual bool ops(BaseType *b, int op);
+    virtual bool d4_ops(BaseType *b, int op);
+    virtual std::vector<BaseType *> *transform_to_dap2(AttrTable *parent_attr_table);
+
+    virtual void dump(ostream &strm) const ;
+};
+
+} // namespace libdap
+
+#endif // _uint64_h
+
diff --git a/UnMarshaller.h b/UnMarshaller.h
new file mode 100644
index 0000000..bde5817
--- /dev/null
+++ b/UnMarshaller.h
@@ -0,0 +1,85 @@
+// UnMarshaller.h
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: Patrick West <pwest@ucar.edu>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1994-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      pwest       Patrick West <pwest@ucar.edu>
+
+#ifndef A_UnMarshaller_h
+#define A_UnMarshaller_h 1
+
+#include <string>
+#include <vector>
+
+using std::string ;
+using std::vector ;
+
+#include "DapObj.h"
+
+#include "dods-datatypes.h"
+
+namespace libdap
+{
+
+class Vector ;
+
+/** @brief abstract base class used to unmarshall/deserialize dap data
+ * objects
+ */
+class UnMarshaller : public DapObj
+{
+public:
+    virtual void		get_byte( dods_byte &val ) = 0 ;
+
+    virtual void		get_int16( dods_int16 &val ) = 0 ;
+    virtual void		get_int32( dods_int32 &val ) = 0 ;
+
+    virtual void		get_float32( dods_float32 &val ) = 0 ;
+    virtual void		get_float64( dods_float64 &val ) = 0 ;
+
+    virtual void		get_uint16( dods_uint16 &val ) = 0 ;
+    virtual void		get_uint32( dods_uint32 &val ) = 0 ;
+
+    virtual void		get_str( string &val ) = 0 ;
+    virtual void		get_url( string &val ) = 0 ;
+
+    virtual void		get_opaque( char *val, unsigned int len ) = 0 ;
+    virtual void		get_int( int &val ) = 0 ;
+
+    virtual void		get_vector( char **val, unsigned int &num,
+                                            Vector &vec ) = 0 ;
+    virtual void		get_vector( char **val, unsigned int &num,
+					    int width, Vector &vec ) = 0 ;
+
+    virtual void		dump(ostream &strm) const = 0 ;
+} ;
+
+} // namespace libdap
+
+#endif // A_UnMarshaller_h
+
diff --git a/Url.cc b/Url.cc
new file mode 100644
index 0000000..d7337c2
--- /dev/null
+++ b/Url.cc
@@ -0,0 +1,74 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1994-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// Implementation for Url.
+//
+// jhrg 9/7/94
+
+#include "config.h"
+
+#include "Url.h"
+
+namespace libdap {
+
+/** The URL constructor requires only the name of the variable
+    to be created.  The name may be omitted, which will create a
+    nameless variable.  This may be adequate for some applications.
+
+    @param n A string containing the name of the variable to be
+    created.
+
+*/
+Url::Url(const string &n) : Str(n)
+{
+    set_type(dods_url_c);  // override the type set by Str
+}
+
+/** The URL server-side constructor requires the name of the variable
+    to be created and the name of the dataset from which this variable is
+    being created.
+
+    @param n A string containing the name of the variable to be created.
+    @param d A string containing the name of the dataset from which this
+    variable is being created.
+*/
+Url::Url(const string &n, const string &d) : Str(n, d)
+{
+    set_type(dods_url_c);  // override the type set by Str
+}
+
+BaseType *
+Url::ptr_duplicate()
+{
+    return new Url(*this);
+}
+
+} // namespace libdap
diff --git a/Url.h b/Url.h
new file mode 100644
index 0000000..f1bbe9e
--- /dev/null
+++ b/Url.h
@@ -0,0 +1,86 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1995-1999
+// Please read the full copyright statement in the file COPYRIGHT.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher (jgallagher@gso.uri.edu)
+
+// Interface for Url type.
+//
+// jhrg 9/7/94
+
+#ifndef _url_h
+#define _url_h 1
+
+
+#include <string>
+
+#ifndef _dods_limits_h
+#include "dods-limits.h"
+#endif
+
+#ifndef _basetype_h
+#include "BaseType.h"
+#endif
+
+#ifndef _str_h
+#include "Str.h"
+#endif
+
+namespace libdap
+{
+
+const unsigned int max_url_len = 255;
+
+/** @brief Holds an Internet address (URL).
+
+    @see BaseType
+    @see Str */
+class Url: public Str
+{
+
+private:
+    string _buf;
+
+    // This enables methods of Str to access _buf in this class.
+    friend class Str;
+
+public:
+    Url(const string &n);
+    Url(const string &n, const string &d);
+    Url(const string &n, Type t);
+    Url(const string &n, const string &d, Type t);
+    virtual ~Url()
+    {}
+
+    virtual BaseType *ptr_duplicate();
+};
+
+} // namespace libdap
+
+#endif // _url_h
+
diff --git a/VCPP/BeforeInstall.txt b/VCPP/BeforeInstall.txt
new file mode 100644
index 0000000..18ccd45
--- /dev/null
+++ b/VCPP/BeforeInstall.txt
@@ -0,0 +1 @@
+In addition to installing libdap 3.8.2, this will also install other run-time libraries libdap uses. However, this will not install the software need to compile our source code on the Windows XP platform. For more information about building our software from source, see http://scm.opendap.org/trac/wiki/XP or contact us at support at opendap.org.
diff --git a/VCPP/License.txt b/VCPP/License.txt
new file mode 100644
index 0000000..b713790
--- /dev/null
+++ b/VCPP/License.txt
@@ -0,0 +1,177 @@
+		  GNU LESSER GENERAL PUBLIC LICENSE		       
+                     Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.     
+ 59 Temple Place, Suite 330, 
+ Boston, MA  02111-1307  USA
+
+Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts as the successor of the GNU Library Public License, version 2, hence the version number 2.1.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away yourfreedom to share and change it.  By contrast, the GNU General PublicLicenses are intended to guarantee your freedom to share and changefree software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to somespecially designated software packages--typically libraries--of theFree Software Foundation and other authors who decide to use it.  Youcan use it too, but we suggest you first think carefully about whetherthis license or the ordinary General Public License is the betterstrategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,not price.  Our General Public Licenses are designed to make sure thatyou have the freedom to distribute copies of free software (and chargefor this service if you wish); that you receive source code or can getit if you want it; that you can change the software and use pieces ofit in new free programs; and that you are informed that you can dothese things.
+
+  To protect your rights, we need to make restrictions that forbiddistributors to deny you these rights or to ask you to surrender theserights.  These restrictions translate to certain responsibilities foryou if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratisor for a fee, you must give the recipients all the rights that we gaveyou.  You must make sure that they, too, receive or can get the sourcecode.  If you link other code with the library, you must providecomplete object files to the recipients, so that they can relink themwith the library after making changes to the library and recompilingit.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright thelibrary, and (2) we offer you this license, which gives you legalpermission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear thatthere is no warranty for the free library.  Also, if the library ismodified by someone else and passed on, the recipients should knowthat what they have is not the original version, so that the originalauthor's reputation will not be affected by problems that might beintroduced by others.
+
+  Finally, software patents pose a constant threat to the existence ofany free program.  We wish to make sure that a company cannoteffectively restrict the users of a free program by obtaining arestrictive license from a patent holder.  Therefore, we insist thatany patent license obtained for a version of the library must beconsistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by theordinary GNU General Public License.  This license, the GNU LesserGeneral Public License, applies to certain designated libraries, andis quite different from the ordinary General Public License.  We usethis license for certain libraries in order to permit linking thoselibraries into non-free programs.
+
+  When a program is linked with a library, whether statically or usinga shared library, the combination of the two is legally speaking acombined work, a derivative of the original library.  The ordinaryGeneral Public License therefore permits such linking only if theentire combination fits its criteria of freedom.  The Lesser GeneralPublic License permits more lax criteria for linking other code withthe library.
+
+  We call this license the "Lesser" General Public License because itdoes Less to protect the user's freedom than the ordinary GeneralPublic License.  It also provides other free software developers Lessof an advantage over competing non-free programs.  These disadvantagesare the reason we use the ordinary General Public License for manylibraries.  However, the Lesser license provides advantages in certainspecial circumstances.
+
+  For example, on rare occasions, there may be a special need toencourage the widest possible use of a certain library, so that it becomesa de-facto standard.  To achieve this, non-free programs must beallowed to use the library.  A more frequent case is that a freelibrary does the same job as widely used non-free libraries.  In thiscase, there is little to gain by limiting the free library to freesoftware only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-freeprograms enables a greater number of people to use a large body offree software.  For example, permission to use the GNU C Library innon-free programs enables many more people to use the whole GNUoperating system, as well as its variant, the GNU/Linux operatingsystem.
+
+  Although the Lesser General Public License is Less protective of theusers' freedom, it does ensure that the user of a program that islinked with the Library has the freedom and the wherewithal to runthat program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution andmodification follow.  Pay close attention to the difference between a"work based on the library" and a "work that uses the library".  Theformer contains code derived from the library, whereas the latter mustbe combined with the library in order to run.
+
+		  GNU LESSER GENERAL PUBLIC LICENSE   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or otherprogram which contains a notice placed by the copyright holder orother authorized party saying it may be distributed under the terms ofthis Lesser General Public License (also called "this License").Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or dataprepared so as to be conveniently linked with application programs(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or workwhich has been distributed under these terms.  A "work based on theLibrary" means either the Library or any derivative work undercopyright law: that is to say, a work containing the Library or aportion of it, either verbatim or with modifications and/or translatedstraightforwardly into another language.  (Hereinafter, translation isincluded without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work formaking modifications to it.  For a library, complete source code meansall the source code for all modules it contains, plus any associatedinterface definition files, plus the scripts used to control compilationand installation of the library.
+
+  Activities other than copying, distribution and modification are notcovered by this License; they are outside its scope.  The act ofrunning a program using the Library is not restricted, and output fromsuch a program is covered only if its contents constitute a work basedon the Library (independent of the use of the Library in a tool forwriting it).  Whether that is true depends on what the Library doesand what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library'scomplete source code as you receive it, in any medium, provided thatyou conspicuously and appropriately publish on each copy anappropriate copyright notice and disclaimer of warranty; keep intactall the notices that refer to this License and to the absence of anywarranty; and distribute a copy of this License along with theLibrary.
+
+  You may charge a fee for the physical act of transferring a copy,and you may at your option offer warranty protection in exchange for afee.
+
+  2. You may modify your copy or copies of the Library or any portionof it, thus forming a work based on the Library, and copy anddistribute such modifications or work under the terms of Section 1above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a    table of data to be supplied by an application program that uses    the facility, other than as an argument passed when the facility    is invoked, then you must make a good faith effort to ensure that,    in the event an application does not supply such function or    table, the facility still operates, and performs whatever part of    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has    a purpose that is entirely well-defined independent of the    application.  Therefore, Subsection 2d requires that any    application-supplied function or table used by this function must    be optional: if the application does not supply it, the square    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  Ifidentifiable sections of that work are not derived from the Library,and can be reasonably considered independent and separate works inthemselves, then this License, and its terms, do not apply to thosesections when you distribute them as separate works.  But when youdistribute the same sections as part of a whole which is a work basedon the Library, the distribution of the whole must be on the terms ofthis License, whose permissions for other licensees extend to theentire whole, and thus to each and every part regardless of who wroteit.
+
+Thus, it is not the intent of this section to claim rights or contestyour rights to work written entirely by you; rather, the intent is toexercise the right to control the distribution of derivative orcollective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Librarywith the Library (or with a work based on the Library) on a volume ofa storage or distribution medium does not bring the other work underthe scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General PublicLicense instead of this License to a given copy of the Library.  To dothis, you must alter all the notices that refer to this License, sothat they refer to the ordinary GNU General Public License, version 2,instead of to this License.  (If a newer version than version 2 of theordinary GNU General Public License has appeared, then you can specifythat version instead if you wish.)  Do not make any other change inthese notices.
+
+  Once this change is made in a given copy, it is irreversible forthat copy, so the ordinary GNU General Public License applies to allsubsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code ofthe Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion orderivative of it, under Section 2) in object code or executable formunder the terms of Sections 1 and 2 above provided that you accompanyit with the complete corresponding machine-readable source code, whichmust be distributed under the terms of Sections 1 and 2 above on amedium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copyfrom a designated place, then offering equivalent access to copy thesource code from the same place satisfies the requirement todistribute the source code, even though third parties are notcompelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of theLibrary, but is designed to work with the Library by being compiled orlinked with it, is called a "work that uses the Library".  Such awork, in isolation, is not a derivative work of the Library, andtherefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Librarycreates an executable that is a derivative of the Library (because itcontains portions of the Library), rather than a "work that uses thelibrary".  The executable is therefore covered by this License.Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header filethat is part of the Library, the object code for the work may be aderivative work of the Library even though the source code is not.Whether this is true is especially significant if the work can belinked without the Library, or if the work is itself a library.  Thethreshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, datastructure layouts and accessors, and small macros and small inlinefunctions (ten lines or less in length), then the use of the objectfile is unrestricted, regardless of whether it is legally a derivativework.  (Executables containing this object code plus portions of theLibrary will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you maydistribute the object code for the work under the terms of Section 6.Any executables containing that work also fall under Section 6,whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine orlink a "work that uses the Library" with the Library to produce awork containing portions of the Library, and distribute that workunder terms of your choice, provided that the terms permitmodification of the work for the customer's own use and reverseengineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that theLibrary is used in it and that the Library and its use are covered bythis License.  You must supply a copy of this License.  If the workduring execution displays copyright notices, you must include thecopyright notice for the Library among them, as well as a referencedirecting the user to the copy of this License.  Also, you must do oneof these things:
+
+    a) Accompany the work with the complete corresponding    machine-readable source code for the Library including whatever    changes were used in the work (which must be distributed under    Sections 1 and 2 above); and, if the work is an executable linked    with the Library, with the complete machine-readable "work that    uses the Library", as object code and/or source code, so that the    user can modify the Library and then relink to produce a modified    executable containing the modified Library.  (It is understood    that the user who changes the contents of definitions files in the    Library will not necessarily be able to recompile the application    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the    Library.  A suitable mechanism is one that (1) uses at run time a    copy of the library already present on the user's computer system,    rather than copying library functions into the executable, and (2)    will operate properly with a modified version of the library, if    the user installs one, as long as the modified version is    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at    least three years, to give the same user the materials    specified in Subsection 6a, above, for a charge no more    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy    from a designated place, offer equivalent access to copy the above    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses theLibrary" must include any data and utility programs needed forreproducing the executable from it.  However, as a special exception,the materials to be distributed need not include anything that isnormally distributed (in either source or binary form) with the majorcomponents (compiler, kernel, and so on) of the operating system onwhich the executable runs, unless that component itself accompaniesthe executable.
+
+  It may happen that this requirement contradicts the licenserestrictions of other proprietary libraries that do not normallyaccompany the operating system.  Such a contradiction means you cannotuse both them and the Library together in an executable that youdistribute.
+
+  7. You may place library facilities that are a work based on theLibrary side-by-side in a single library together with other libraryfacilities not covered by this License, and distribute such a combinedlibrary, provided that the separate distribution of the work based onthe Library and of the other library facilities is otherwisepermitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work    based on the Library, uncombined with any other library    facilities.  This must be distributed under the terms of the    Sections above.
+
+    b) Give prominent notice with the combined library of the fact    that part of it is a work based on the Library, and explaining    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distributethe Library except as expressly provided under this License.  Anyattempt otherwise to copy, modify, sublicense, link with, ordistribute the Library is void, and will automatically terminate yourrights under this License.  However, parties who have received copies,or rights, from you under this License will not have their licensesterminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have notsigned it.  However, nothing else grants you permission to modify ordistribute the Library or its derivative works.  These actions areprohibited by law if you do not accept this License.  Therefore, bymodifying or distributing the Library (or any work based on theLibrary), you indicate your acceptance of this License to do so, andall its terms and conditions for copying, distributing or modifyingthe Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on theLibrary), the recipient automatically receives a license from theoriginal licensor to copy, distribute, link with or modify the Librarysubject to these terms and conditions.  You may not impose any furtherrestrictions on the recipients' exercise of the rights granted herein.You are not responsible for enforcing compliance by third parties withthis License.
+
+  11. If, as a consequence of a court judgment or allegation of patentinfringement or for any other reason (not limited to patent issues),conditions are imposed on you (whether by court order, agreement orotherwise) that contradict the conditions of this License, they do notexcuse you from the conditions of this License.  If you cannotdistribute so as to satisfy simultaneously your obligations under thisLicense and any other pertinent obligations, then as a consequence youmay not distribute the Library at all.  For example, if a patentlicense would not permit royalty-free redistribution of the Library byall those who receive copies directly or indirectly through you, thenthe only way you could satisfy both it and this License would be torefrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under anyparticular circumstance, the balance of the section is intended to apply,and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe anypatents or other property right claims or to contest validity of anysuch claims; this section has the sole purpose of protecting theintegrity of the free software distribution system which isimplemented by public license practices.  Many people have madegenerous contributions to the wide range of software distributedthrough that system in reliance on consistent application of thatsystem; it is up to the author/donor to decide if he or she is willingto distribute software through any other system and a licensee cannotimpose that choice.
+
+This section is intended to make thoroughly clear what is believed tobe a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted incertain countries either by patents or by copyrighted interfaces, theoriginal copyright holder who places the Library under this License may addan explicit geographical distribution limitation excluding those countries,so that distribution is permitted only in or among countries not thusexcluded.  In such case, this License incorporates the limitation as ifwritten in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or newversions of the Lesser General Public License from time to time.Such new versions will be similar in spirit to the present version,but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Libraryspecifies a version number of this License which applies to it and"any later version", you have the option of following the terms andconditions either of that version or of any later version published bythe Free Software Foundation.  If the Library does not specify alicense version number, you may choose any version ever published bythe Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other freeprograms whose distribution conditions are incompatible with these,write to the author to ask for permission.  For software which iscopyrighted by the Free Software Foundation, write to the FreeSoftware Foundation; we sometimes make exceptions for this.  Ourdecision will be guided by the two goals of preserving the free statusof all derivatives of our free software and of promoting the sharingand reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NOWARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OROTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANYKIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THEIMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULARPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THELIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUMETHE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO INWRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFYAND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOUFOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL ORCONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THELIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEINGRENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR AFAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IFSUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCHDAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatestpossible use to the public, we recommend making it free software thateveryone can redistribute and change.  You can do so by permittingredistribution under these terms (or, alternatively, under the terms of theordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It issafest to attach them to the start of each source file to most effectivelyconvey the exclusion of warranty; and each file should have at least the"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or    modify it under the terms of the GNU Lesser General Public    License as published by the Free Software Foundation; either    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,    but WITHOUT ANY WARRANTY; without even the implied warranty of    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public    License along with this library; if not, write to the Free Software    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or yourschool, if any, to sign a "copyright disclaimer" for the library, ifnecessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990  Ty Coon, President of Vice
+
+That's all there is to it!
+
+
+
diff --git a/VCPP/Makefile b/VCPP/Makefile
new file mode 100644
index 0000000..304c890
--- /dev/null
+++ b/VCPP/Makefile
@@ -0,0 +1,543 @@
+# Makefile for libdap (under VC++ on win32)
+
+# Source code, samples, docs and target build areas
+OBJDIR			= .\objects
+SRCDIR			= ..
+DOCDIR			= .\doc
+SAMPLEDIR		= .\sample
+
+# This is the prepackaging area.  Contents should never be on the build path.
+# Fill in the VERSION (e.g., "= 3.7.3") to generate a final, version stamped
+# release of the product.
+PRODUCT			= libdap
+VERSION			=
+PKGDIR			= ..\..\prepkg\opendap\$(PRODUCT)$(VERSION)
+PKGLIBDIR		= $(PKGDIR)\lib
+PKGDLLDIR		= $(PKGDIR)\dll
+PKGBINDIR		= $(PKGDIR)\bin
+PKGETCDIR		= $(PKGDIR)\etc
+PKGINCDIR		= $(PKGDIR)\include
+PKGSAMPLEDIR	= $(PKGDIR)\sample
+
+# This is the installation area.  It should never be on the build path either
+# (except when building other, non-core components).
+INSTALLDIR		= ..\..
+INSTALLLIBDIR	= $(INSTALLDIR)\lib
+INSTALLDLLDIR	= $(INSTALLDIR)\dll
+INSTALLBINDIR	= $(INSTALLDIR)\bin
+INSTALLETCDIR	= $(INSTALLDIR)\etc
+INSTALLINCDIR	= $(INSTALLDIR)\include
+
+# Headers only come from the source distribution itself.  Neither the
+# Prepackaging or installation areas should be on any path for building
+# the OPeNDAP Core.
+INCLUDEDIR		= $(SRCDIR)
+
+# Compiler, Linker
+CC		= cl
+LINK	= link
+
+# Compiler tools
+LEX	= flex
+YACC	= bison
+
+# We suppress #line directives under win32 to prevent warnings resulting
+# when a "\" followed by some char is interpreted as an escape sequence.
+YACCFLAGS	= --no-lines -d -v
+
+# MT = Static Link Multi-Threaded Model
+# MD = Dynamic Link Multi-Threaded DLL Model
+
+# Setup compiler flags
+MTCFLAGS	= /MT /D HAVE_PTHREAD_H
+MDCFLAGS	= /MD /D HAVE_PTHREAD_H
+CFLAGS		= /nologo /W0 /GR /EHsc /c
+
+# Setup linker flags for libdap
+DAP_MTLFLAGS	= -lib /nologo -libpath:$(OBJDIR)\MT
+DAP_MDLFLAGS	= /nologo -libpath:$(OBJDIR)\MD /dll /def:libdap.def /map /fixed:NO /base:0x06000000 /NODEFAULTLIB:LIBCMT.lib
+
+# Setup linker flags for libdapclient
+CLIENT_MTLFLAGS	= -lib /nologo -libpath:$(OBJDIR)\MT
+CLIENT_MDLFLAGS	= /nologo -libpath:$(OBJDIR)\MD /dll /def:libdapclient.def /map /fixed:NO /base:0x07000000 /NODEFAULTLIB:LIBCMT.lib
+
+# Setup linker flags for libdapserver
+SERVER_MTLFLAGS	= -lib /nologo -libpath:$(OBJDIR)\MT
+SERVER_MDLFLAGS	= /nologo -libpath:$(OBJDIR)\MD /dll /def:libdapserver.def /map /fixed:NO /base:0x08000000 /NODEFAULTLIB:LIBCMT.lib
+
+# Setup link libraries for libdap
+DAP_MTLIBS		=
+DAP_MDLIBS		= libdirent.lib libxml2.lib libcurl.lib zlib.lib libxdr.lib pthreadVC.lib
+
+# Setup link libraries for libdapclient
+CLIENT_MTLIBS	=
+CLIENT_MDLIBS	= libdapMD.lib libdirent.lib libxml2.lib libcurl.lib zlib.lib libxdr.lib pthreadVC.lib
+
+# Setup link libraries for libdapserver
+SERVER_MTLIBS	=
+SERVER_MDLIBS	= libdapMD.lib libdirent.lib libxml2.lib libcurl.lib zlib.lib libxdr.lib pthreadVC.lib
+
+# Setup linker flags for executables
+EMTLFLAGS		= /nologo /libpath:$(OBJDIR)\MT /NODEFAULTLIB:MSVCRT.lib
+EMDLFLAGS		= /nologo /libpath:$(OBJDIR)\MD /NODEFAULTLIB:LIBCMT.lib
+
+# Setup link libraries for executables
+EMTLLIBS		= libdapclientMT.lib libdapserverMT.lib libdapMT.lib libxml2.lib libcurl.lib zlib.lib libxdr.lib pthreadVC.lib
+EMDLLIBS		= libdapclientMD.lib libdapserverMD.lib libdapMD.lib libxml2.lib libcurl.lib zlib.lib libxdr.lib pthreadVC.lib
+
+# Setup compiler includes and defines
+INCS		= /I . /I .. /I ..\GNU /I ..\win32\gl /I $(INCLUDEDIR)
+DEFS		= /D WIN32 /D WIN32_LEAN_AND_MEAN /D HAVE_CONFIG_H
+CPPFLAGS	= $(DEFS) $(INCS)
+
+default:
+	@echo "usage: nmake all; nmake install; nmake package"
+
+all:	setup modelMT modelMD
+
+modelMT:
+	@-md $(OBJDIR)\MT
+	@echo "Building MT model libraries for the Core"
+	@nmake /NOLOGO CFLAGS="$(CFLAGS) $(MTCFLAGS)" LFLAGS="$(DAP_MTLFLAGS)" LIBS="$(DAP_MTLIBS)" OBJDIR=$(OBJDIR)\MT libdapMT.lib
+	@nmake /NOLOGO CFLAGS="$(CFLAGS) $(MTCFLAGS)" LFLAGS="$(CLIENT_MTLFLAGS)" LIBS="$(CLIENT_MTLIBS)" OBJDIR=$(OBJDIR)\MT libdapclientMT.lib
+	@nmake /NOLOGO CFLAGS="$(CFLAGS) $(MTCFLAGS)" LFLAGS="$(SERVER_MTLFLAGS)" LIBS="$(SERVER_MTLIBS)" OBJDIR=$(OBJDIR)\MT libdapserverMT.lib
+
+	@nmake /NOLOGO CFLAGS="$(CFLAGS) $(MTCFLAGS)" LFLAGS="$(EMTLFLAGS)" LIBS="$(EMTLLIBS)" OBJDIR=$(OBJDIR)\MT getdap
+	@nmake /NOLOGO CFLAGS="$(CFLAGS) $(MTCFLAGS)" LFLAGS="$(EMTLFLAGS)" LIBS="$(EMTLLIBS)" OBJDIR=$(OBJDIR)\MT deflate
+	@echo "MT model libraries for the Core are complete"
+
+modelMD:
+	@-md $(OBJDIR)\MD
+	@echo "Building MD model libraries for the Core"
+	@nmake /NOLOGO CFLAGS="$(CFLAGS) $(MDCFLAGS)" LFLAGS="$(DAP_MDLFLAGS)" LIBS="$(DAP_MDLIBS)" OBJDIR=$(OBJDIR)\MD libdapMD.dll	
+	@nmake /NOLOGO CFLAGS="$(CFLAGS) $(MDCFLAGS)" LFLAGS="$(CLIENT_MDLFLAGS)" LIBS="$(CLIENT_MDLIBS)" OBJDIR=$(OBJDIR)\MD libdapclientMD.dll
+	@nmake /NOLOGO CFLAGS="$(CFLAGS) $(MDCFLAGS)" LFLAGS="$(SERVER_MDLFLAGS)" LIBS="$(SERVER_MDLIBS)" OBJDIR=$(OBJDIR)\MD libdapserverMD.dll
+
+	@nmake /NOLOGO CFLAGS="$(CFLAGS) $(MDCFLAGS)" LFLAGS="$(EMDLFLAGS)" LIBS="$(EMDLLIBS)" OBJDIR=$(OBJDIR)\MD getdap
+	@nmake /NOLOGO CFLAGS="$(CFLAGS) $(MDCFLAGS)" LFLAGS="$(EMDLFLAGS)" LIBS="$(EMDLLIBS)" OBJDIR=$(OBJDIR)\MD deflate
+	@echo "MD model libraries for the Core are complete"
+
+# Clear built-in rules and set new ones
+.SUFFIXES :
+.SUFFIXES :	.obj .c .cc .exe
+
+# Rules for library objects, both the .c and .cc's are C++
+{$(SRCDIR)}.c{$(OBJDIR)}.obj:
+	$(CC) $(CFLAGS) $(CPPFLAGS) /Fo$@ /Tp $<
+
+{$(SRCDIR)}.cc{$(OBJDIR)}.obj:
+	$(CC) $(CFLAGS) $(CPPFLAGS) /Fo$@ /Tp $<
+
+# Rule for linking executables
+{$(OBJDIR)}.obj{$(OBJDIR)}.exe:
+	$(LINK) $(LFLAGS) /out:$@ $< $(LIBS)
+
+GNU_OBJS = $(OBJDIR)\GetOpt.obj \
+		$(OBJDIR)\GNURegex.obj \
+		$(OBJDIR)\regex.obj \
+		$(OBJDIR)\strcasecmp.obj \
+		$(OBJDIR)\strncasecmp.obj \
+		$(OBJDIR)\strnlen1.obj \
+		$(OBJDIR)\localcharset.obj
+
+GRAM_OBJS = $(OBJDIR)\lex.das.obj \
+		$(OBJDIR)\das.tab.obj \
+		$(OBJDIR)\lex.dds.obj \
+		$(OBJDIR)\dds.tab.obj \
+		$(OBJDIR)\lex.ce_expr.obj \
+		$(OBJDIR)\ce_expr.tab.obj \
+		$(OBJDIR)\lex.Error.obj \
+		$(OBJDIR)\Error.tab.obj
+
+DAP_OBJS = $(GRAM_OBJS) \
+		$(OBJDIR)\AttrTable.obj \
+		$(OBJDIR)\ConstraintEvaluator.obj \
+		$(OBJDIR)\DAS.obj \
+		$(OBJDIR)\DDS.obj \
+		$(OBJDIR)\DataDDS.obj \
+		$(OBJDIR)\DDXParser.obj \
+		$(OBJDIR)\BaseType.obj \
+		$(OBJDIR)\Byte.obj \
+		$(OBJDIR)\Error.obj \
+		$(OBJDIR)\Int32.obj \
+		$(OBJDIR)\Float64.obj \
+		$(OBJDIR)\Str.obj \
+		$(OBJDIR)\Url.obj \
+		$(OBJDIR)\Vector.obj \
+		$(OBJDIR)\Array.obj \
+		$(OBJDIR)\Structure.obj \
+		$(OBJDIR)\Sequence.obj \
+		$(OBJDIR)\Grid.obj \
+		$(OBJDIR)\UInt32.obj \
+		$(OBJDIR)\Int16.obj \
+		$(OBJDIR)\UInt16.obj \
+		$(OBJDIR)\Float32.obj \
+		$(OBJDIR)\GeoConstraint.obj \
+		$(OBJDIR)\GridGeoConstraint.obj \
+		$(OBJDIR)\Constructor.obj \
+		$(OBJDIR)\BaseTypeFactory.obj \
+		$(OBJDIR)\SignalHandler.obj \
+		$(OBJDIR)\InternalErr.obj \
+		$(OBJDIR)\util.obj \
+		$(OBJDIR)\xdrutil_ppc.obj \
+		$(OBJDIR)\XDRUtils.obj	 \
+		$(OBJDIR)\XDRFileMarshaller.obj	\
+		$(OBJDIR)\XDRFileUnMarshaller.obj	\
+		$(OBJDIR)\XDRStreamMarshaller.obj	 \
+		$(OBJDIR)\parser-util.obj \
+		$(OBJDIR)\escaping.obj \
+		$(OBJDIR)\Clause.obj \
+		$(OBJDIR)\RValue.obj \
+		$(OBJDIR)\gse.tab.obj \
+		$(OBJDIR)\ce_functions.obj \
+		$(OBJDIR)\GSEClause.obj \
+		$(OBJDIR)\lex.gse_.obj \
+		$(OBJDIR)\ArrayGeoConstraint.obj \
+		$(OBJDIR)\DapIndent.obj
+
+CLIENT_OBJS = $(OBJDIR)\RCReader.obj \
+		$(OBJDIR)\Connect.obj \
+		$(OBJDIR)\HTTPConnect.obj \
+		$(OBJDIR)\HTTPCache.obj \
+		$(OBJDIR)\HTTPCacheTable.obj \
+		$(OBJDIR)\AISResources.obj \
+		$(OBJDIR)\AISDatabaseParser.obj \
+		$(OBJDIR)\AISMerge.obj \
+		$(OBJDIR)\AISConnect.obj \
+		$(OBJDIR)\util_mit.obj \
+		$(OBJDIR)\ResponseTooBigErr.obj
+
+SERVER_OBJS = $(OBJDIR)\DODSFilter.obj \
+		$(OBJDIR)\Ancillary.obj \
+		$(OBJDIR)\cgi_util.obj
+
+# Convenience dependancies
+libdapMT.lib:		$(OBJDIR)\libdapMT.lib
+libdapclientMT.lib:	$(OBJDIR)\libdapclientMT.lib
+libdapserverMT.lib:	$(OBJDIR)\libdapserverMT.lib
+libdapMD.dll:		$(OBJDIR)\libdapMD.dll
+libdapclientMD.dll:	$(OBJDIR)\libdapclientMD.dll
+libdapserverMD.dll:	$(OBJDIR)\libdapserverMD.dll
+
+getdap:		$(OBJDIR)\getdap.exe
+deflate:	$(OBJDIR)\deflate.exe
+
+# Build the static-link core libraries
+$(OBJDIR)\libdapMT.lib: $(DAP_OBJS) $(GNU_OBJS)
+	$(LINK) $(LFLAGS) /out:$@ $** $(LIBS)
+	
+$(OBJDIR)\libdapserverMT.lib: $(SERVER_OBJS)
+	$(LINK) $(LFLAGS) /out:$@ $** $(LIBS)
+
+$(OBJDIR)\libdapclientMT.lib: $(CLIENT_OBJS)
+	$(LINK) $(LFLAGS) /out:$@ $** $(LIBS)
+	
+############################################################################
+# The song and dances before the link lines below are to get a legitimate
+# module export definition (.def) for the dll's.  We use lib, dumpbin and
+# a 3rd-party awk to do this automatically in a rather round-about way.
+#
+# The $$ reduces to just $ as make evaluates that.  The \? to awk tells it
+# to be looking for a literal "?".  A textual description of the awk command
+# is as follows: "Find all second fields (2nd whitespace delimited groups of
+# characters) in the text lines that begin with ? and do not begin with ??_
+# (i.e., all C++ code originating methods minus the destructors which should
+# not be exposed do to how dll's work) and output those in the module export
+# definition file."  These are the methods that will be exposed to programs
+# that use the dll in question.  C code references begins with just "_" and
+# we need not expose those.
+############################################################################
+	
+# Build the dynamic-link core libraries
+$(OBJDIR)\libdapMD.dll: $(DAP_OBJS) $(GNU_OBJS)
+	@lib /NOLOGO /out:$(OBJDIR)\tmp.lib $** > $(OBJDIR)\devnull
+	@dumpbin /OUT:$(OBJDIR)\tmp.def /linkermember:2 $(OBJDIR)\tmp.lib > $(OBJDIR)\devnull
+	@echo EXPORTS > libdap.def
+	@gawk "{ if ($$2 ~ /^[\?].*/ && $$2 !~ /^\?\?_.*/) print $$2 }" < $(OBJDIR)\tmp.def >> libdap.def
+	$(LINK) $(LFLAGS) /out:$@ $** $(LIBS)
+	@del libdap.def $(OBJDIR)\tmp.lib $(OBJDIR)\tmp.def $(OBJDIR)\devnull
+
+$(OBJDIR)\libdapclientMD.dll: $(CLIENT_OBJS)
+	@lib /NOLOGO /out:$(OBJDIR)\tmp.lib $** > $(OBJDIR)\devnull
+	@dumpbin /OUT:$(OBJDIR)\tmp.def /linkermember:2 $(OBJDIR)\tmp.lib > $(OBJDIR)\devnull
+	@echo EXPORTS > libdapclient.def
+	@gawk "{ if ($$2 ~ /^[\?].*/ && $$2 !~ /^\?\?_.*/) print $$2 }" < $(OBJDIR)\tmp.def >> libdapclient.def
+	$(LINK) $(LFLAGS) /out:$@ $** $(LIBS)
+	@del libdapclient.def $(OBJDIR)\tmp.lib $(OBJDIR)\tmp.def $(OBJDIR)\devnull
+
+$(OBJDIR)\libdapserverMD.dll: $(SERVER_OBJS)
+	@lib /NOLOGO /out:$(OBJDIR)\tmp.lib $** > $(OBJDIR)\devnull
+	@dumpbin /OUT:$(OBJDIR)\tmp.def /linkermember:2 $(OBJDIR)\tmp.lib > $(OBJDIR)\devnull
+	@echo EXPORTS > libdapserver.def
+	@gawk "{ if ($$2 ~ /^[\?].*/ && $$2 !~ /^\?\?_.*/) print $$2 }" < $(OBJDIR)\tmp.def >> libdapserver.def
+	$(LINK) $(LFLAGS) /out:$@ $** $(LIBS)
+	@del libdapserver.def $(OBJDIR)\tmp.lib $(OBJDIR)\tmp.def $(OBJDIR)\devnull
+
+# Libdap with the gram objs
+$(OBJDIR)\lex.das.obj					: $(SRCDIR)\lex.das.cc
+$(OBJDIR)\das.tab.obj					: $(SRCDIR)\das.tab.cc
+$(OBJDIR)\lex.dds.obj					: $(SRCDIR)\lex.dds.cc
+$(OBJDIR)\dds.tab.obj					: $(SRCDIR)\dds.tab.cc
+$(OBJDIR)\lex.ce_expr.obj				: $(SRCDIR)\lex.ce_expr.cc
+$(OBJDIR)\ce_expr.tab.obj				: $(SRCDIR)\ce_expr.tab.cc
+$(OBJDIR)\lex.Error.obj					: $(SRCDIR)\lex.Error.cc
+$(OBJDIR)\Error.obj						: $(SRCDIR)\Error.cc
+$(OBJDIR)\Error.tab.obj					: $(SRCDIR)\Error.tab.cc
+$(OBJDIR)\AttrTable.obj					: $(SRCDIR)\AttrTable.cc
+$(OBJDIR)\ConstraintEvaluator.obj 		: $(SRCDIR)\ConstraintEvaluator.cc
+$(OBJDIR)\DapIndent.obj					: $(SRCDIR)\DapIndent.cc
+$(OBJDIR)\DAS.obj						: $(SRCDIR)\DAS.cc
+$(OBJDIR)\DDS.obj						: $(SRCDIR)\DDS.cc
+$(OBJDIR)\DataDDS.obj					: $(SRCDIR)\DataDDS.cc
+$(OBJDIR)\DDXParser.obj					: $(SRCDIR)\DDXParser.cc
+$(OBJDIR)\BaseType.obj					: $(SRCDIR)\BaseType.cc
+$(OBJDIR)\Byte.obj						: $(SRCDIR)\Byte.cc
+$(OBJDIR)\Int32.obj						: $(SRCDIR)\Int32.cc
+$(OBJDIR)\Float64.obj					: $(SRCDIR)\Float64.cc
+$(OBJDIR)\GeoConstraint.obj				: $(SRCDIR)\GeoConstraint.cc
+$(OBJDIR)\GridGeoConstraint.obj			: $(SRCDIR)\GridGeoConstraint.cc
+$(OBJDIR)\Str.obj						: $(SRCDIR)\Str.cc
+$(OBJDIR)\Url.obj						: $(SRCDIR)\Url.cc
+$(OBJDIR)\Vector.obj					: $(SRCDIR)\Vector.cc
+$(OBJDIR)\Array.obj						: $(SRCDIR)\Array.cc
+$(OBJDIR)\Structure.obj					: $(SRCDIR)\Structure.cc
+$(OBJDIR)\Sequence.obj					: $(SRCDIR)\Sequence.cc
+$(OBJDIR)\Grid.obj						: $(SRCDIR)\Grid.cc
+$(OBJDIR)\UInt32.obj					: $(SRCDIR)\UInt32.cc
+$(OBJDIR)\Int16.obj						: $(SRCDIR)\Int16.cc
+$(OBJDIR)\UInt16.obj					: $(SRCDIR)\UInt16.cc
+$(OBJDIR)\Float32.obj					: $(SRCDIR)\Float32.cc
+$(OBJDIR)\Constructor.obj				: $(SRCDIR)\Constructor.cc
+$(OBJDIR)\PassiveInt32.obj				: $(SRCDIR)\PassiveInt32.cc
+$(OBJDIR)\PassiveFloat64.obj			: $(SRCDIR)\PassiveFloat64.cc
+$(OBJDIR)\PassiveStr.obj				: $(SRCDIR)\PassiveStr.cc
+$(OBJDIR)\PassiveUrl.obj				: $(SRCDIR)\PassiveUrl.cc
+$(OBJDIR)\PassiveUInt32.obj				: $(SRCDIR)\PassiveUInt32.cc
+$(OBJDIR)\PassiveInt16.obj				: $(SRCDIR)\PassiveInt16.cc
+$(OBJDIR)\PassiveUInt16.obj				: $(SRCDIR)\PassiveUInt16.cc
+$(OBJDIR)\PassiveFloat32.obj			: $(SRCDIR)\PassiveFloat32.cc
+$(OBJDIR)\PassiveArray.obj				: $(SRCDIR)\PassiveArray.cc
+$(OBJDIR)\PassiveStructure.obj			: $(SRCDIR)\PassiveStructure.cc
+$(OBJDIR)\BaseTypeFactory.obj			: $(SRCDIR)\BaseTypeFactory.cc
+$(OBJDIR)\SignalHandler.obj				: $(SRCDIR)\SignalHandler.cc
+$(OBJDIR)\InternalErr.obj				: $(SRCDIR)\InternalErr.cc
+$(OBJDIR)\util.obj						: $(SRCDIR)\util.cc
+$(OBJDIR)\xdrutil_ppc.obj				: $(SRCDIR)\Xdrutil_ppc.c
+$(OBJDIR)\XDRUtils.obj					: $(SRCDIR)\XDRUtils.cc
+$(OBJDIR)\XDRFileMarshaller.obj			: $(SRCDIR)\XDRFileMarshaller.cc
+$(OBJDIR)\XDRFileUnMarshaller.obj		: $(SRCDIR)\XDRFileUnMarshaller.cc	
+$(OBJDIR)\XDRStreamMarshaller.obj		: $(SRCDIR)\XDRStreamMarshaller.cc
+$(OBJDIR)\parser-util.obj				: $(SRCDIR)\parser-util.cc
+$(OBJDIR)\escaping.obj					: $(SRCDIR)\escaping.cc
+$(OBJDIR)\Clause.obj					: $(SRCDIR)\Clause.cc
+$(OBJDIR)\RValue.obj					: $(SRCDIR)\RValue.cc
+$(OBJDIR)\gse.tab.obj					: $(SRCDIR)\gse.tab.cc
+$(OBJDIR)\ce_functions.obj				: $(SRCDIR)\ce_functions.cc
+$(OBJDIR)\GSEClause.obj					: $(SRCDIR)\GSEClause.cc
+$(OBJDIR)\lex.gse_.obj					: $(SRCDIR)\lex.gse_.cc
+$(OBJDIR)\ArrayGeoConstraint.obj		: $(SRCDIR)\ArrayGeoConstraint.cc
+
+# Libdap client
+$(OBJDIR)\RCReader.obj					: $(SRCDIR)\RCReader.cc
+$(OBJDIR)\Connect.obj					: $(SRCDIR)\Connect.cc
+$(OBJDIR)\HTTPConnect.obj				: $(SRCDIR)\HTTPConnect.cc
+$(OBJDIR)\HTTPCache.obj					: $(SRCDIR)\HTTPCache.cc
+$(OBJDIR)\HTTPCacheTable.obj			: $(SRCDIR)\HTTPCacheTable.cc
+$(OBJDIR)\AISResources.obj				: $(SRCDIR)\AISResources.cc
+$(OBJDIR)\AISDatabaseParser.obj			: $(SRCDIR)\AISDatabaseParser.cc
+$(OBJDIR)\AISMerge.obj					: $(SRCDIR)\AISMerge.cc
+$(OBJDIR)\AISConnect.obj				: $(SRCDIR)\AISConnect.cc
+$(OBJDIR)\util_mit.obj					: $(SRCDIR)\util_mit.cc
+$(OBJDIR)\ResponseTooBigErr.obj			: $(SRCDIR)\ResponseTooBigErr.cc
+
+# libdap server
+$(OBJDIR)\DODSFilter.obj				: $(SRCDIR)\DODSFilter.cc
+$(OBJDIR)\Ancillary.obj					: $(SRCDIR)\Ancillary.cc
+$(OBJDIR)\cgi_util.obj					: $(SRCDIR)\cgi_util.cc
+
+# Regular expression code
+$(OBJDIR)\GetOpt.obj		: $(SRCDIR)\GNU\GetOpt.cc
+	@$(CC) $(CFLAGS) $(CPPFLAGS) /Fo$@ /Tp $(SRCDIR)\GNU\GetOpt.cc
+$(OBJDIR)\GNURegex.obj		: $(SRCDIR)\GNU\GNURegex.cc
+	@$(CC) $(CFLAGS) $(CPPFLAGS) /Fo$@ /Tp $(SRCDIR)\GNU\GNURegex.cc
+$(OBJDIR)\regex.obj		: $(SRCDIR)\win32\gl\regex.c
+	@$(CC) $(CFLAGS) $(CPPFLAGS) /Fo$@ /Tc $(SRCDIR)\win32\gl\regex.c
+$(OBJDIR)\strcasecmp.obj	: $(SRCDIR)\win32\gl\strcasecmp.c
+	@$(CC) $(CFLAGS) $(CPPFLAGS) /Fo$@ /Tc $(SRCDIR)\win32\gl\strcasecmp.c
+$(OBJDIR)\strncasecmp.obj	: $(SRCDIR)\win32\gl\strncasecmp.c
+	@$(CC) $(CFLAGS) $(CPPFLAGS) /Fo$@ /Tc $(SRCDIR)\win32\gl\strncasecmp.c
+$(OBJDIR)\strnlen1.obj	: $(SRCDIR)\win32\gl\strnlen1.c
+	@$(CC) $(CFLAGS) $(CPPFLAGS) /Fo$@ /Tc $(SRCDIR)\win32\gl\strnlen1.c
+$(OBJDIR)\localcharset.obj	: $(SRCDIR)\win32\gl\localcharset.c
+	@$(CC) $(CFLAGS) $(CPPFLAGS) /Fo$@ /Tc $(SRCDIR)\win32\gl\localcharset.c
+
+# Source generated by compiler tools
+$(SRCDIR)\lex.das.cc:	$(SRCDIR)\das.lex $(SRCDIR)\das.tab.cc $(SRCDIR)\das.tab.hh
+	$(LEX) -8 $(SRCDIR)\das.lex
+	@move lex.das.cc $(SRCDIR)\lex.das.cc
+#	@del lex.das.c
+
+$(SRCDIR)\das.tab.cc $(SRCDIR)\das.tab.hh: $(SRCDIR)\das.y $(SRCDIR)\DAS.h
+	$(YACC) $(YACCFLAGS) -p das -o $(SRCDIR)\das.tab.cc $(SRCDIR)\das.y
+#	@move $(SRCDIR)\das.tab.cc.h $(SRCDIR)\das.tab.hh
+#	@del $(SRCDIR)\das.tab.cc.h
+
+$(SRCDIR)\lex.dds.cc:	$(SRCDIR)\dds.lex $(SRCDIR)\dds.tab.cc $(SRCDIR)\dds.tab.hh
+	$(LEX) -8 $(SRCDIR)\dds.lex
+	@move lex.dds.cc $(SRCDIR)\lex.dds.cc
+#	@del lex.dds.c
+
+$(SRCDIR)\dds.tab.cc $(SRCDIR)\dds.tab.hh: $(SRCDIR)\dds.y
+	$(YACC) $(YACCFLAGS) -p dds -o $(SRCDIR)\dds.tab.cc $(SRCDIR)\dds.y
+	@move $(SRCDIR)\dds.tab.cc.h $(SRCDIR)\dds.tab.hh
+#	@del $(SRCDIR)\dds.tab.c
+
+$(SRCDIR)\lex.ce_expr.cc: $(SRCDIR)\ce_expr.lex $(SRCDIR)\ce_expr.tab.cc $(SRCDIR)\ce_expr.tab.hh
+	$(LEX) -8 $(SRCDIR)\ce_expr.lex
+	@move lex.ce_expr.cc $(SRCDIR)\lex.ce_expr.cc
+#	@del lex.ce_expr.c
+
+$(SRCDIR)\ce_expr.tab.cc $(SRCDIR)\ce_expr.tab.hh: $(SRCDIR)\ce_expr.y
+	$(YACC) $(YACCFLAGS) -p ce_expr -o $(SRCDIR)\ce_expr.tab.cc $(SRCDIR)\ce_expr.y
+	@move $(SRCDIR)\ce_expr.tab.cc.h $(SRCDIR)\ce_expr.tab.hh
+#	@del $(SRCDIR)\ce_expr.tab.c
+
+$(SRCDIR)\lex.Error.cc:	$(SRCDIR)\Error.lex $(SRCDIR)\Error.tab.cc $(SRCDIR)\Error.tab.hh
+	$(LEX) -8 $(SRCDIR)\Error.lex
+	@move lex.Error.cc $(SRCDIR)\lex.Error.cc
+#	@del lex.Error.c
+
+$(SRCDIR)\Error.tab.cc $(SRCDIR)\Error.tab.hh: $(SRCDIR)\Error.y
+	$(YACC) $(YACCFLAGS) -p Error -o $(SRCDIR)\Error.tab.cc $(SRCDIR)\Error.y
+	@move $(SRCDIR)\Error.tab.cc.h $(SRCDIR)\Error.tab.hh
+#	@del $(SRCDIR)\Error.tab.c
+
+$(SRCDIR)\lex.gse_.cc:	$(SRCDIR)\gse.lex $(SRCDIR)\gse.tab.cc $(SRCDIR)\gse.tab.hh
+	$(LEX) -8 $(SRCDIR)\gse.lex
+	@move lex.gse_.cc $(SRCDIR)\lex.gse_.cc
+#	@del lex.gse_.c
+
+$(SRCDIR)\gse.tab.cc $(SRCDIR)\gse.tab.hh: $(SRCDIR)\gse.y
+	$(YACC) $(YACCFLAGS) -p gse_ -o $(SRCDIR)\gse.tab.cc $(SRCDIR)\gse.y
+	@move $(SRCDIR)\gse.tab.cc.h $(SRCDIR)\gse.tab.hh
+#	@del $(SRCDIR)\gse.tab.c
+
+$(OBJDIR)\getdap.exe: $(OBJDIR)\getdap.obj
+
+$(OBJDIR)\deflate.exe: $(OBJDIR)\deflate.obj 
+
+# Command-Line Client and select utils in console mode
+$(OBJDIR)\getdap.obj    : $(SRCDIR)\getdap.cc
+	@$(CC) $(CFLAGS) $(CPPFLAGS) /Fo$@ /Tp $(SRCDIR)\getdap.cc
+
+$(OBJDIR)\deflate.obj    : $(SRCDIR)\deflate.c
+	@$(CC) $(CFLAGS) $(CPPFLAGS) /Fo$@ /Tc $(SRCDIR)\deflate.c
+
+# We have to create a temporary unistd.h because bison
+# and/or flex create source that includes that - even though
+# there is no such header under win32 and it is unnecessary there
+# (that is, even though these utils can run under win32 - by definition
+# they generate output for the UNIX world).  This stupid pet trick
+# also properly defines isatty() for the generated source under win32.
+setup:
+	@-echo /*  Dummy patch header to get win32 flex/bison generated  */ > unistd.h
+	@-echo /*  source code to compile under win32.  If you see this  */ >> unistd.h
+	@-echo /*  temp file, feel free to scratch it.                   */ >> unistd.h
+	@-echo #include "io.h" >> unistd.h
+
+# Win32 libnc-dap requires the win32\gl\regex.h.  Under unix builds, it is simply
+# assumed to be on the machine already.
+install: all mkinstdirs
+	copy $(OBJDIR)\MT\libdapMT.lib $(INSTALLLIBDIR)
+	copy $(OBJDIR)\MT\libdapclientMT.lib $(INSTALLLIBDIR)
+	copy $(OBJDIR)\MT\libdapserverMT.lib $(INSTALLLIBDIR)
+
+	copy $(OBJDIR)\MD\libdapMD.dll* $(INSTALLDLLDIR)
+	mt -nologo -manifest $(INSTALLDLLDIR)\libdapMD.dll.manifest -outputresource:$(INSTALLDLLDIR)\libdapMD.dll;2
+	del $(INSTALLDLLDIR)\libdapMD.dll.manifest
+	copy $(OBJDIR)\MD\libdapMD.lib $(INSTALLLIBDIR)
+	copy $(OBJDIR)\MD\libdapclientMD.dll* $(INSTALLDLLDIR)
+	mt -nologo -manifest $(INSTALLDLLDIR)\libdapclientMD.dll.manifest -outputresource:$(INSTALLDLLDIR)\libdapclientMD.dll;2
+	del $(INSTALLDLLDIR)\libdapclientMD.dll.manifest
+	copy $(OBJDIR)\MD\libdapclientMD.lib $(INSTALLLIBDIR)
+	copy $(OBJDIR)\MD\libdapserverMD.dll* $(INSTALLDLLDIR)
+	mt -nologo -manifest $(INSTALLDLLDIR)\libdapserverMD.dll.manifest -outputresource:$(INSTALLDLLDIR)\libdapserverMD.dll;2
+	del $(INSTALLDLLDIR)\libdapserverMD.dll.manifest
+	copy $(OBJDIR)\MD\libdapserverMD.lib $(INSTALLLIBDIR)
+
+	copy $(OBJDIR)\MD\getdap.exe* $(INSTALLBINDIR)
+	mt -nologo -manifest $(INSTALLBINDIR)\getdap.exe.manifest -outputresource:$(INSTALLBINDIR)\getdap.exe;1
+	del $(INSTALLBINDIR)\getdap.exe.manifest
+	copy $(OBJDIR)\MD\deflate.exe* $(INSTALLETCDIR)
+	mt -nologo -manifest $(INSTALLETCDIR)\deflate.exe.manifest -outputresource:$(INSTALLETCDIR)\deflate.exe;1
+	del $(INSTALLETCDIR)\deflate.exe.manifest
+	copy dods-datatypes.h $(INSTALLINCDIR)
+	copy xdr-datatypes.h $(INSTALLINCDIR)
+	copy $(SRCDIR)\*.h $(INSTALLINCDIR)
+	copy $(SRCDIR)\GNU\*.h $(INSTALLINCDIR)\GNU
+	copy $(SRCDIR)\win32\gl\regex.h $(INSTALLINCDIR)
+	
+package: all mkpkgdirs document
+	copy $(OBJDIR)\MT\libdapMT.lib $(PKGLIBDIR)
+	copy $(OBJDIR)\MT\libdapclientMT.lib $(PKGLIBDIR)
+	copy $(OBJDIR)\MT\libdapserverMT.lib $(PKGLIBDIR)
+
+	copy $(OBJDIR)\MD\libdapMD.dll* $(PKGDLLDIR)
+	mt -nologo -manifest $(PKGDLLDIR)\libdapMD.dll.manifest -outputresource:$(PKGDLLDIR)\libdapMD.dll;2
+	del $(PKGDLLDIR)\libdapMD.dll.manifest
+	copy $(OBJDIR)\MD\libdapMD.lib $(PKGLIBDIR)
+	copy $(OBJDIR)\MD\libdapclientMD.dll* $(PKGDLLDIR)
+	mt -nologo -manifest $(PKGDLLDIR)\libdapclientMD.dll.manifest -outputresource:$(PKGDLLDIR)\libdapclientMD.dll;2
+	del $(PKGDLLDIR)\libdapclientMD.dll.manifest
+	copy $(OBJDIR)\MD\libdapclientMD.lib $(PKGLIBDIR)
+	copy $(OBJDIR)\MD\libdapserverMD.dll* $(PKGDLLDIR)
+	mt -nologo -manifest $(PKGDLLDIR)\libdapserverMD.dll.manifest -outputresource:$(PKGDLLDIR)\libdapserverMD.dll;2
+	del $(PKGDLLDIR)\libdapserverMD.dll.manifest
+	copy $(OBJDIR)\MD\libdapserverMD.lib $(PKGLIBDIR)
+
+	copy $(OBJDIR)\MD\getdap.exe* $(PKGBINDIR)
+	mt -nologo -manifest $(PKGBINDIR)\getdap.exe.manifest -outputresource:$(PKGBINDIR)\getdap.exe;1
+	del $(PKGBINDIR)\getdap.exe.manifest
+	copy $(OBJDIR)\MD\deflate.exe* $(PKGETCDIR)
+	mt -nologo -manifest $(PKGETCDIR)\deflate.exe.manifest -outputresource:$(PKGETCDIR)\deflate.exe;1
+	del $(PKGETCDIR)\deflate.exe.manifest
+	copy dods-datatypes.h $(PKGINCDIR)
+	copy xdr-datatypes.h $(PKGINCDIR)
+	copy $(SRCDIR)\*.h $(PKGINCDIR)
+	copy $(SRCDIR)\GNU\*.h $(PKGINCDIR)\GNU
+	copy $(SRCDIR)\win32\gl\regex.h $(PKGINCDIR)
+	
+mkinstdirs:	
+	@-md $(INSTALLLIBDIR)
+	@-md $(INSTALLBINDIR)
+	@-md $(INSTALLETCDIR)
+	@-md $(INSTALLDLLDIR)
+	@-md $(INSTALLINCDIR)
+	@-md $(INSTALLINCDIR)\GNU
+	
+mkpkgdirs:	
+	@-md $(PKGLIBDIR)
+	@-md $(PKGBINDIR)
+	@-md $(PKGETCDIR)
+	@-md $(PKGDLLDIR)
+	@-md $(PKGINCDIR)
+	@-md $(PKGINCDIR)\GNU
+	
+document:
+	@-md $(PKGSAMPLEDIR)
+	copy $(SAMPLEDIR)\* $(PKGSAMPLEDIR)
+	copy $(DOCDIR)\readme.txt $(PKGDIR)
+
+clean:
+	@-rd /Q /S $(OBJDIR) $(PKGDIR)
+	@-del unistd.h
+
+grammarclean: clean
+	@-del $(SRCDIR)\*.tab.cc
+	@-del $(SRCDIR)\*.tab.hh
+	@-del $(SRCDIR)\lex.*.cc
+
+!INCLUDE "dependancies"
+
+
+
diff --git a/VCPP/config.h b/VCPP/config.h
new file mode 100644
index 0000000..728287c
--- /dev/null
+++ b/VCPP/config.h
@@ -0,0 +1,53 @@
+/*  config.h.  Generated by hand for MS VC++ 7.x.  ROM - 11/2006  */
+#ifndef _config_h
+#define _config_h
+
+#define CNAME "libdap"
+#define CVER "3.8.2"
+#define DAP_PROTOCOL_VERSION "3.1"
+#define DVR "libdap/3.8.2"
+#define PACKAGE "libdap"
+#define PACKAGE_NAME "libdap"
+#define PACKAGE_STRING "libdap 3.8.2"
+#define PACKAGE_VERSION "3.8.2"
+
+#define HAVE_ALLOCA 1
+#define HAVE_MKTIME 1
+#define STDC_HEADERS 1
+#define CNAME "DODS"
+#define CVER "$VERSION"
+
+#define SIZEOF_CHAR 1
+#define SIZEOF_DOUBLE 8
+#define SIZEOF_FLOAT 4
+#define SIZEOF_INT 4
+#define SIZEOF_LONG 4
+
+#define HAVE_STRDUP 1
+
+#define HAVE_FCNTL_H 1
+#define HAVE_LIMITS_H 1
+
+/*  Replaces dods-deployed stat.h defines only found on unixes  */
+/*  Need of this reconfirmed 11/2006 - ROM.                     */
+#define S_ISREG(m) (((m) & _S_IFMT) == _S_IFREG)
+#define S_ISDIR(m) (((m) & _S_IFMT) == _S_IFDIR)
+
+#define XDR_FLOAT32 xdr_float
+#define XDR_FLOAT64 xdr_double
+#define XDR_INT16 xdr_short
+#define XDR_INT32 xdr_long
+#define XDR_UINT16 xdr_u_short
+#define XDR_UINT32 xdr_u_long
+
+#ifndef LIBDAP_ROOT
+#define LIBDAP_ROOT "C:/opendap"
+#endif
+
+#undef LIBXML_ICONV_ENABLED
+
+#define not_used
+
+#endif
+
+
diff --git a/VCPP/dependancies b/VCPP/dependancies
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/VCPP/dependancies
diff --git a/VCPP/doc/readme.txt b/VCPP/doc/readme.txt
new file mode 100644
index 0000000..ec7c334
--- /dev/null
+++ b/VCPP/doc/readme.txt
@@ -0,0 +1,131 @@
+
+Note: This code was built on WIndows XP using libdap 3.7.10 in Feb 2008 with
+only minor modifications to the VCPP/Makefile. 
+
+James Gallagher
+22 Feb 2008
+--------------------------
+
+These are the instructions that accompany each Windows release of the OPeNDAP
+Core Library known as "libdap".
+
+Introduction
+------------
+
+This is the 3.7.3 release of libdap for MS Windows XP (or later) on 32-bit
+machines.  It was built using Visual C++ 8.x.  Both static and dynamic
+versions of the Core libraries are provided.
+
+You must have the prerequisites for this distribution installed before
+installing this distribution.  The prerequisites are contained in the
+libdap-prerequisites3.7.3.zip file available from http://opendap.org.
+
+
+Purposes of this Distribution
+-----------------------------
+
+This distribution serves three purposes:
+
+1)  The Dynamic-link libraries necessary for running executables based
+    upon this version of libdap are provided.
+
+2)  The export libraries and the associated headers that are required
+    to OPeNDAP enable 3rd-party applications that are to be based upon this
+    specific version of libdap are provided.  Dynamic-link libraries necessary
+    to run such applications are also provided.  These are the tools that
+    experienced developers require to OPeNDAP-enable their applications.
+
+    The documentation that specifies the interface to the OPeNDAP Core Library
+    is not provided with this release.  With this distriubution, an experienced
+    developer should be able to link their software with libdap to OPeNDAP-enable
+    it.
+
+    See the 'sample' subdirectory for a makefile that details how to compile and
+    link.  Sample code is also provided.
+
+3)  Provides instructions for rebuilding this version of libdap from source
+    code.
+
+Contents
+--------
+
+  bin/       - Contains a basic OPeNDAP client "getdap"
+  dll/       - Provides the run-time dynamic link libraries
+  etc/       - Contains the 'deflate' program
+  include/   - Contains the headers necessary to compile
+  lib/       - Contains the libraries needed to link.  Both a static and
+               dynamic version of the OPeNDAP Core library (libdapMT.lib
+               and libdapMD.lib respectively) are provided.
+  sample/    - Contains sample code and a sample makefile
+  readme.txt - This readme file
+
+
+
+Installation Instruction
+------------------------
+
+   1)  Install the prerequisites outlined above
+
+   2)  Drag-n-drop the 'bin', 'dll', 'include', 'lib', 'etc' and 'sample' directories
+       found in this distriubution to C:\opendap.  If prompted to over write the
+       existing directory structure, choose 'Yes to all'.
+
+   3)  Place C:\opendap\bin and C:\opendap\dll on your execution path.
+
+   Test the Install:
+
+   1)  Open a DOS window
+
+   2)  Issue the following command
+
+       C:\> getdap --help
+
+       If the install is successful, you should see the usage message for the getdap
+       utility.
+
+
+
+Rebuilding from source code
+---------------------------
+
+
+  To Rebuild libdap 3.7.3 from source code using MS Visual C++ 8.x,
+  the subversion command-line utility and the installed prerequisite package
+  outlined above:
+  
+  1)  Add BISON_HAIRY environment var and set to C:\opendap\include\bison.hairy
+  2)  Add BISON_SIMPLE and set to C:\opendap\include\bison.simple
+  3)  Add INCLUDE environment variable if necessary and add following to it:
+
+         C:\opendap\include
+         C:\opendap\include\pthreads
+         C:\opendap\include\libxml
+         C:\opendap\include\curl
+
+  4)  Add LIB environment variable if necessary and add the following to it:
+
+         C:\opendap\lib
+
+  
+  Note: Microsoft provides a means of opening a command prompt where compiler
+  command-line tools can be conveniently executed.  Under Visual Studio,
+  this is available via the "Visual Studio 2005 Command Prompt" located
+  underneath the start->programs menu.  In Visual C++ 8.x an identical
+  mechanism is provided.  When we refer to a "command-line" window in the below
+  instructions, we are referring to this Microsoft-provided compiler command
+  prompt.  We are not referring to a simple DOS Command Prompt.
+
+  Open a command-line window and:
+
+  C:\> cd C:\opendap
+  C:\> svn co http://scm.opendap.org:8090/svn/tags/libdap/3.7.3 libdap3.7.3
+  C:\> cd libdap3.7.3\VCPP
+  C:\> nmake grammarclean
+  C:\> nmake all
+
+
+December 10, 2006
+Robert O. Morris
+
+
+
diff --git a/VCPP/dods-datatypes.h b/VCPP/dods-datatypes.h
new file mode 100644
index 0000000..333bdd9
--- /dev/null
+++ b/VCPP/dods-datatypes.h
@@ -0,0 +1,42 @@
+/*  This file is typically generated during configuation      */
+/*  time, but that is not the case under win32.  This file    */
+/*  was generated under linux on an x86 and then stripped     */
+/*  down to the bare essentials and modified where necessary  */
+/*  to form something appropriate for win32.                  */
+
+#ifndef __DODS_DATATYPES__
+#define __DODS_DATATYPES__
+
+#include <xdr.h>
+
+#define DINT32 long
+typedef DINT32 dods_int32;
+
+#define DUINT32 unsigned long
+typedef DUINT32 dods_uint32;
+
+#define XDR_INT32 xdr_long
+#define XDR_UINT32 xdr_u_long
+
+#define DINT16 short
+typedef DINT16 dods_int16;
+
+#define DUINT16 unsigned short
+typedef DUINT16 dods_uint16;
+
+#define XDR_INT16 xdr_short
+#define XDR_UINT16 xdr_u_short
+
+#define DBYTE unsigned char
+typedef DBYTE dods_byte;
+
+#define DFLOAT64 double
+typedef DFLOAT64 dods_float64;
+
+#define DFLOAT32 float
+typedef DFLOAT32 dods_float32;
+
+#define XDR_FLOAT64 xdr_double
+#define XDR_FLOAT32 xdr_float
+
+#endif /* __DODS_DATATYPES__ */
diff --git a/VCPP/libdap.iss b/VCPP/libdap.iss
new file mode 100644
index 0000000..dfe819a
--- /dev/null
+++ b/VCPP/libdap.iss
@@ -0,0 +1,53 @@
+;; This builds an installer for libdap - it assumes that you have the
+;; OPeNDAP Tools 1.0 (or later) package installed in the default location,
+;; that you have just built libdap from source and that the users of this
+;; installer are interested in a binary distribution of libdap and will
+;; build libdap itself.
+;;
+;; jhrg 24 April 2008
+
+[Setup]
+AppName=OPeNDAP libdap
+AppVerName=OPeNDAP libdap 3.8.2
+AppPublisher=OPeNDAP
+DefaultDirName={sd}\opendap
+DefaultGroupName=OPeNDAP libdap
+AllowNoIcons=yes
+InfoBeforeFile=BeforeInstall.txt
+OutputBaseFilename=libdap_3.8.2
+Compression=lzma/ultra
+SolidCompression=yes
+LicenseFile=License.txt
+AlwaysRestart=yes
+
+[Languages]
+Name: "english"; MessagesFile: "compiler:Default.isl"
+
+[Files]
+;; This grabs the newly built libdap code _assuming_ that the libdap.iss file is run from within libdap/VCPP and
+;; that the 'nmake package' target has just been run.
+Source: "..\..\prepkg\opendap\libdap\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+
+;; Put all of the DLLs in the opendap\bin directory - I have no idea why putting the DLLs in a \dll directory
+;; doesn't work, but on a non-development machine I set up it definitely does not work while putting them in
+;; the \bin directory does.
+Source: "..\..\prepkg\opendap\libdap\dll\*"; DestDir: "{app}\bin"; Flags: ignoreversion
+
+;; DLLs needed to run our code that are usually not part of win32. Developers should get the OPeNDAP-Tools dist
+;; too. I spilt this up because I figure developers can handle two installs and so that we can update the tools
+;; (bison, et c.) and libdap separately.
+Source: "C:\opendap-tools\dll\*"; DestDir: "{app}\bin"; Flags: ignoreversion
+
+;; These are the VC++ DLLs needed to actually run the code
+Source: "C:\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\*"; DestDir: "{app}\bin"; Flags: ignoreversion recursesubdirs createallsubdirs
+
+;; This somewhat inscrutable code sets the 'Path' environment variable so users can run getdap, et c.,
+;; in a shell (cmd.exe).
+[Registry]
+Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"; ValueType: string; ValueName: "Path"; ValueData: "{olddata};{app}\bin"
+
+[Icons]
+Name: "{group}\{cm:UninstallProgram,libdap 3.8.2}"; Filename: "{uninstallexe}"
+
+
+
diff --git a/VCPP/sample/Makefile b/VCPP/sample/Makefile
new file mode 100644
index 0000000..b12837e
--- /dev/null
+++ b/VCPP/sample/Makefile
@@ -0,0 +1,74 @@
+# Sample Makefile to illustrate how to compile and link with
+# libdap (under VC++ 8.x)
+
+OBJDIR		= .\objects
+SRCDIR		= .
+
+# Compiler, Linker
+CC		= cl
+LINK		= link
+
+# Setup compiler flags
+MTCFLAGS	= /MT
+MDCFLAGS	= /MD
+CFLAGS		= /nologo /W0 /GR /EHsc /c
+
+# Setup linker flags
+EMTLFLAGS	= /nologo /libpath:..\..\lib /NODEFAULTLIB:MSVCRT.lib
+EMDLFLAGS	= /nologo /libpath:..\..\lib
+
+# Setup link libraries
+EMTLLIBS	= libdapMT.lib libdapclientMT.lib libxml2.lib libcurl.lib zlib.lib libxdr.lib pthreadVC.lib
+EMDLLIBS	= libdapMD.lib libdapclientMD.lib libxml2.lib libcurl.lib zlib.lib libxdr.lib pthreadVC.lib
+
+# Setup compiler includes and defines
+INCS		= /I . /I ..\..\include /I ..\..\include\GNU /I ..\..\include\gl /I ..\..\include\xdr /I ..\..\include\curl /I ..\..\include\pthreads
+CPPUNITINCS	= $(INCS) /I $(INCLUDEDIR)/cppunit
+DEFS		= /D WIN32 /D WIN32_LEAN_AND_MEAN
+CPPFLAGS	= $(DEFS) $(INCS)
+
+default:
+	@echo "usage: nmake model<MT|MD>; nmake all"
+
+all:
+	nmake modelMT
+	nmake modelMD
+
+modelMT: setup
+	-md $(OBJDIR)\MT
+	nmake CFLAGS="$(CFLAGS) $(MTCFLAGS)" LFLAGS="$(EMTLFLAGS)" LIBS="$(EMTLLIBS)" OBJDIR=$(OBJDIR)\MT getdap
+
+modelMD: setup
+	-md $(OBJDIR)\MD
+	nmake CFLAGS="$(CFLAGS) $(MDCFLAGS)" LFLAGS="$(EMDLFLAGS)" LIBS="$(EMDLLIBS)" OBJDIR=$(OBJDIR)\MD getdap
+
+# Clear built-in rules and set new ones
+.SUFFIXES :
+.SUFFIXES :	.obj .cc .exe
+
+{$(SRCDIR)}.cc{$(OBJDIR)}.obj:
+	$(CC) $(CFLAGS) $(CPPFLAGS) /Fo$@ /Tp $<
+
+# Rule for linking executables.  See Microsoft's "mt" command for
+# embedding external .manifests as necessary.
+{$(OBJDIR)}.obj{$(OBJDIR)}.exe:
+	$(LINK) $(LFLAGS) /out:$@ $< $(LIBS)
+
+getdap:		$(OBJDIR)\getdap.exe
+
+$(OBJDIR)\getdap.exe: $(OBJDIR)\getdap.obj
+
+# Command-Line Client and select utils in console mode
+$(OBJDIR)\getdap.obj    : $(SRCDIR)\getdap.cc
+	$(CC) $(CFLAGS) $(CPPFLAGS) /Fo$@ /Tp $(SRCDIR)\getdap.cc
+
+setup:
+	-mkdir $(OBJDIR)
+
+clean:
+	-rmdir /Q /S $(OBJDIR)
+
+
+
+
+
diff --git a/VCPP/sample/getdap.cc b/VCPP/sample/getdap.cc
new file mode 100644
index 0000000..dd4da57
--- /dev/null
+++ b/VCPP/sample/getdap.cc
@@ -0,0 +1,430 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+// 
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+// 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1997-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// This is the source to `geturl'; a simple tool to exercise the Connect
+// class. It can be used to get naked URLs as well as the DAP2 DAS and DDS
+// objects.  jhrg.
+
+#define not_used
+
+static char rcsid[] not_used =
+    { "$Id$" };
+
+#include <stdio.h>
+#ifdef WIN32
+#include <io.h>
+#include <fcntl.h>
+#endif
+
+#include <GetOpt.h>
+#include <string>
+
+#include "AISConnect.h"
+#include "Response.h"
+#include "StdinResponse.h"
+
+using std::cerr;
+using std::endl;
+
+const char *version = "$Revision$";
+
+extern int dods_keep_temps;     // defined in HTTPResponse.h
+
+void usage(string name)
+{
+    cerr << "Usage: " << name << endl;
+    cerr <<
+        " [idDaxAVvks] [-B <db>][-c <expr>][-m <num>] <url> [<url> ...]" <<
+        endl;
+    cerr << " [Vvks] <file> [<file> ...]" << endl;
+    cerr << endl;
+    cerr << "In the first form of the command, dereference the URL and"
+        << endl;
+    cerr << "perform the requested operations. This includes routing" <<
+        endl;
+    cerr << "the returned information through the DAP processing" << endl;
+    cerr << "library (parsing the returned objects, et c.). If none" <<
+        endl;
+    cerr << "of a, d, or D are used with a URL, then the DAP library" <<
+        endl;
+    cerr << "routines are NOT used and the URLs contents are dumped" <<
+        endl;
+    cerr << "to standard output." << endl;
+    cerr << endl;
+    cerr << "In the second form of the command, assume the files are" <<
+        endl;
+    cerr << "DataDDS objects (stored in files or read from pipes)" << endl;
+    cerr << "and process them as if -D were given. In this case the" <<
+        endl;
+    cerr << "information *must* contain valid MIME header in order" <<
+        endl;
+    cerr << "to be processed." << endl;
+    cerr << endl;
+    cerr << "Options:" << endl;
+    cerr << "        i: For each URL, get the server version." << endl;
+    cerr << "        d: For each URL, get the the DDS." << endl;
+    cerr << "        a: For each URL, get the the DAS." << endl;
+    cerr << "        A: Use the AIS for DAS objects." << endl;
+    cerr << "        D: For each URL, get the the DataDDS." << endl;
+    cerr <<
+        "        x: For each URL, get the DDX object. Does not get data."
+        << endl;
+    cerr << "        B: <AIS xml dataBase>. Overrides .dodsrc." << endl;
+    cerr << "        v: Verbose." << endl;
+    cerr << "        V: Version." << endl;
+    cerr << "        c: <expr> is a contraint expression. Used with -D." <<
+        endl;
+    cerr << "           NB: You can use a `?' for the CE also." << endl;
+    cerr << "        k: Keep temporary files created by libdap core\n" <<
+        endl;
+    cerr << "        m: Request the same URL <num> times." << endl;
+    cerr << "        z: Ask the server to compress data." << endl;
+    cerr << "        s: Print Sequences using numbered rows." << endl;
+}
+
+bool read_data(FILE * fp)
+{
+    if (!fp) {
+        fprintf(stderr, "geturl: Whoa!!! Null stream pointer.\n");
+        return false;
+    }
+    // Changed from a loop that used getc() to one that uses fread(). getc()
+    // worked fine for transfers of text information, but *not* for binary
+    // transfers. fread() will handle both.
+    char c;
+    while (fp && !feof(fp) && fread(&c, 1, 1, fp))
+        printf("%c", c);        // stick with stdio 
+
+    return true;
+}
+
+static void print_data(DDS & dds, bool print_rows = false)
+{
+    fprintf(stdout, "The data:\n");
+
+    for (DDS::Vars_iter i = dds.var_begin(); i != dds.var_end(); i++) {
+        BaseType *v = *i;
+        if (print_rows && (*i)->type() == dods_sequence_c)
+            dynamic_cast < Sequence * >(*i)->print_val_by_rows(stdout);
+        else
+            v->print_val(stdout);
+    }
+
+    fprintf(stdout, "\n");
+    fflush(stdout);
+}
+
+int main(int argc, char *argv[])
+{
+    GetOpt getopt(argc, argv, "idaDxAVvkB:c:m:zsh?");
+    int option_char;
+
+    bool get_das = false;
+    bool get_dds = false;
+    bool get_data = false;
+    bool get_ddx = false;
+    bool get_version = false;
+    bool cexpr = false;
+    bool verbose = false;
+    bool multi = false;
+    bool accept_deflate = false;
+    bool print_rows = false;
+    bool use_ais = false;
+    int times = 1;
+    string expr = "";
+    string ais_db = "";
+
+#ifdef WIN32
+    _setmode(_fileno(stdout), _O_BINARY);
+#endif
+
+    while ((option_char = getopt()) != -1)
+        switch (option_char) {
+        case 'd':
+            get_dds = true;
+            break;
+        case 'a':
+            get_das = true;
+            break;
+        case 'D':
+            get_data = true;
+            break;
+        case 'x':
+            get_ddx = true;
+            break;
+        case 'A':
+            use_ais = true;
+            break;
+        case 'V':
+            fprintf(stderr, "geturl version: %s\n", version);
+            exit(0);
+        case 'i':
+            get_version = true;
+            break;
+        case 'v':
+            verbose = true;
+            break;
+        case 'k':
+            dods_keep_temps = 1;
+            break;              // keep_temp is in Connect.cc
+        case 'c':
+            cexpr = true;
+            expr = getopt.optarg;
+            break;
+        case 'm':
+            multi = true;
+            times = atoi(getopt.optarg);
+            break;
+        case 'B':
+            use_ais = true;
+            ais_db = getopt.optarg;
+            break;
+        case 'z':
+            accept_deflate = true;
+            break;
+        case 's':
+            print_rows = true;
+            break;
+        case 'h':
+        case '?':
+        default:
+            usage(argv[0]);
+            exit(1);
+            break;
+        }
+
+    try {
+        // If after processing all the command line options there is nothing
+        // left (no URL or file) assume that we should read from stdin.
+        for (int i = getopt.optind; i < argc; ++i) {
+            if (verbose)
+                fprintf(stderr, "Fetching: %s\n", argv[i]);
+
+            string name = argv[i];
+            Connect *url = 0;;
+            if (use_ais) {
+                if (!ais_db.empty())
+                    url = new AISConnect(name, ais_db);
+                else
+                    url = new AISConnect(name);
+            } else {
+                url = new Connect(name);
+            }
+
+            // This overrides the value set in the .dodsrc file.
+            if (accept_deflate)
+                url->set_accept_deflate(accept_deflate);
+
+            if (url->is_local()) {
+                if (verbose) {
+                    fprintf(stderr,
+"Assuming that the argument %s is a file that contains a DAP2 data object; decoding.\n", argv[i]);
+                }
+
+                Response *r = 0;
+                BaseTypeFactory factory;
+                DataDDS dds(&factory);
+
+                try {
+                    if (strcmp(argv[i], "-") == 0) {
+                        r = new StdinResponse(stdin);
+
+                        if (!r->get_stream())
+                            throw Error("Could not open standard input.");
+
+                        url->read_data(dds, r);
+                    } else {
+                        r = new Response(fopen(argv[i], "r"));
+
+                        if (!r->get_stream())
+                            throw Error(string("The input source: ")
+                                        + string(argv[i])
+                                        + string(" could not be opened"));
+
+                        url->read_data_no_mime(dds, r);
+                    }
+                }
+                catch(Error & e) {
+                    cerr << e.get_error_message() << endl;
+                    delete r;
+                    r = 0;
+                    delete url;
+                    url = 0;
+                    break;
+                }
+
+                if (verbose)
+                    fprintf(stderr, "Server version: %s\n",
+                            url->get_version().c_str());
+
+                print_data(dds, print_rows);
+
+            }
+
+            else if (get_version) {
+                fprintf(stderr, "Server version: %s\n",
+                        url->request_version().c_str());
+            }
+
+            else if (get_das) {
+                for (int j = 0; j < times; ++j) {
+                    DAS das;
+                    try {
+                        url->request_das(das);
+                    }
+                    catch(Error & e) {
+                        cerr << e.get_error_message() << endl;
+                        delete url;
+                        url = 0;
+                        continue;
+                    }
+
+                    if (verbose) {
+                        fprintf(stderr, "Server version: %s\n",
+                                url->get_version().c_str());
+                        fprintf(stderr, "DAS:\n");
+                    }
+
+                    das.print(stdout);
+                }
+            }
+
+            else if (get_dds) {
+                for (int j = 0; j < times; ++j) {
+                    BaseTypeFactory factory;
+                    DDS dds(&factory);
+                    try {
+                        url->request_dds(dds);
+                    }
+                    catch(Error & e) {
+                        cerr << e.get_error_message() << endl;
+                        delete url;
+                        url = 0;
+                        continue;       // Goto the next URL or exit the loop.
+                    }
+
+                    if (verbose) {
+                        fprintf(stderr, "Server version: %s\n",
+                                url->get_version().c_str());
+                        fprintf(stderr, "DDS:\n");
+                    }
+
+                    dds.print(stdout);
+                }
+            }
+
+            else if (get_ddx) {
+                for (int j = 0; j < times; ++j) {
+                    BaseTypeFactory factory;
+                    DDS dds(&factory);
+                    try {
+                        url->request_dds(dds);
+                    }
+                    catch(Error & e) {
+                        cerr << e.get_error_message() << endl;
+                        continue;       // Goto the next URL or exit the loop.
+                    }
+
+                    if (verbose) {
+                        fprintf(stderr, "Server version: %s\n",
+                                url->get_version().c_str());
+                        fprintf(stderr, "DDS:\n");
+                    }
+
+                    dds.print_xml(stdout, false, "geturl; no blob yet");
+                }
+            }
+
+            else if (get_data) {
+                if (expr.empty() && name.find('?') == string::npos)
+                    expr = "";
+
+                for (int j = 0; j < times; ++j) {
+                    BaseTypeFactory factory;
+                    DataDDS dds(&factory);
+                    try {
+                        DBG(cerr << "URL: " << url->URL(false) << endl);
+                        DBG(cerr << "CE: " << expr << endl);
+                        url->request_data(dds, expr);
+
+                        if (verbose)
+                            fprintf(stderr, "Server version: %s\n",
+                                    url->get_version().c_str());
+
+                        print_data(dds, print_rows);
+                    }
+                    catch(Error & e) {
+                        cerr << e.get_error_message() << endl;
+                        delete url;
+                        url = 0;
+                        continue;
+                    }
+                }
+            }
+
+            else {              // if (!get_das && !get_dds && !get_data)
+                // This code uses HTTPConnect::fetch_url which cannot be
+                // accessed using an instance of Connect. So some of the
+                // options supported by other URLs won't work here (e.g., the
+                // verbose option doesn't show the server version number).
+                HTTPConnect http(RCReader::instance());
+
+                // This overrides the value set in the .dodsrc file.
+                if (accept_deflate)
+                    http.set_accept_deflate(accept_deflate);
+
+                string url_string = argv[i];
+                for (int j = 0; j < times; ++j) {
+                    try {
+                        Response *r = http.fetch_url(url_string);
+                        if (!read_data(r->get_stream())) {
+                            continue;
+                        }
+                        delete r;
+                        r = 0;
+                    }
+                    catch(Error & e) {
+                        cerr << e.get_error_message() << endl;
+                        continue;
+                    }
+                }
+            }
+
+            delete url;
+            url = 0;
+        }
+    }
+    catch(Error & e) {
+        cerr << e.get_error_message() << endl;
+    }
+
+    return 0;
+}
diff --git a/VCPP/unistd.h b/VCPP/unistd.h
new file mode 100644
index 0000000..4bc7657
--- /dev/null
+++ b/VCPP/unistd.h
@@ -0,0 +1,4 @@
+/* Dummy patch header to get win32 flex/bison generated */ 
+/* source code to compile under win32. If you see this */ 
+/* temp file, feel free to scratch it. */ 
+#include "io.h" 
diff --git a/VCPP/xdr-datatypes.h b/VCPP/xdr-datatypes.h
new file mode 100644
index 0000000..80a16e8
--- /dev/null
+++ b/VCPP/xdr-datatypes.h
@@ -0,0 +1,48 @@
+/* dods-datatypes.h.  Generated from dods-datatypes.h.in by configure.  */
+
+/*
+  Determine at compile-time the sizes of various datatypes. This uses symbols
+  defined by configure (See configure.in).
+  jhrg 10/24/94
+
+  This header is included by all of the DODS DAP library header files which
+  make use of the dods_* typedefs. C or C++ files can either include
+  config_dap.h, use their own configure script which defines SIZEOF_LONG,
+  _INT, _CHAR and _DOUBLE or set these preprocessor symbols themselves in a
+  Makefile, etc.
+
+  This used to be part of the config_dap.h header, but including that in the
+  DAP library headers introduced problems when the DAP was used in conjunction
+  with other libraries. 8/1/2000 jhrg
+*/
+
+#ifndef __XDR_DATATYPES__
+#define __XDR_DATATYPES__
+
+#ifdef WIN32
+#include <rpc.h>
+#include <winsock2.h>
+#include <xdr.h>
+#else
+#include <rpc/types.h>
+#include <netinet/in.h>
+#include <rpc/xdr.h>
+#endif
+
+/* The typedefs are done using a preprocessor symbol so that autoconf's
+   `CONFIG_HEADER' can be used. The configure script will then only modify
+   the dods-datatypes.h header when its contents change. This saves on
+   compilation since the header is used by many files in the dap++ library.
+   The downside is that the typedefs are so ugly... 2/14/2001 jhrg */
+
+#define XDR_INT32 xdr_long
+#define XDR_UINT32 xdr_u_long
+
+#define XDR_INT16 xdr_short
+#define XDR_UINT16 xdr_u_short
+
+#define XDR_FLOAT64 xdr_double
+#define XDR_FLOAT32 xdr_float
+
+#endif /* __XDR_DATATYPES__ */
+
diff --git a/Vector.cc b/Vector.cc
new file mode 100644
index 0000000..e43b10a
--- /dev/null
+++ b/Vector.cc
@@ -0,0 +1,2111 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1995-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// Implementation for class Vector. This class is the basis for all the
+// vector-type classes in libdap's <Array, List>.
+//
+// 11/21/95 jhrg
+
+#include "config.h"
+
+#include <cstring>
+#include <cassert>
+
+//#define DODS_DEBUG 1
+
+#include <sstream>
+#include <vector>
+#include <algorithm>
+#include <typeinfo>
+
+#include <stdint.h>
+
+#include "crc.h"
+
+#include "Vector.h"
+#include "Marshaller.h"
+#include "UnMarshaller.h"
+
+#include "D4StreamMarshaller.h"
+#include "D4StreamUnMarshaller.h"
+
+#include "D4Enum.h"
+
+#include "Type.h"
+#include "dods-datatypes.h"
+#include "escaping.h"
+#include "util.h"
+#include "debug.h"
+#include "InternalErr.h"
+
+#undef CLEAR_LOCAL_DATA
+
+using std::cerr;
+using std::endl;
+
+namespace libdap {
+
+void Vector::m_duplicate(const Vector & v)
+{
+    d_length = v.d_length;
+
+    // _var holds the type of the elements. That is, it holds a BaseType
+    // which acts as a template for the type of each element.
+    if (v.d_proto) {
+        d_proto = v.d_proto->ptr_duplicate(); // use ptr_duplicate()
+        d_proto->set_parent(this); // ptr_duplicate does not set d_parent.
+    }
+    else {
+        d_proto = 0;
+    }
+
+    // d_compound_buf and d_buf (further down) hold the values of the Vector. The field
+    // d_compound_buf is used when the Vector holds non-numeric data (including strings
+    // although it used to be that was not the case jhrg 2/10/05) while d_buf
+    // holds numeric values.
+    if (v.d_compound_buf.empty()) {
+        d_compound_buf = v.d_compound_buf;
+    }
+    else {
+        // Failure to set the size will make the [] operator barf on the LHS
+        // of the assignment inside the loop.
+        d_compound_buf.resize(d_length);
+        for (int i = 0; i < d_length; ++i) {
+            // There's no need to call set_parent() for each element; we
+            // maintain the back pointer using the d_proto member. These
+            // instances are used to hold _values_ only while the d_proto
+            // field holds the type information for the elements.
+            d_compound_buf[i] = v.d_compound_buf[i]->ptr_duplicate();
+        }
+    }
+
+    // copy the strings. This copies the values.
+    d_str = v.d_str;
+
+    // copy numeric values if there are any.
+    d_buf = 0; // init to null
+    if (v.d_buf) // only copy if data present
+        val2buf(v.d_buf); // store v's value in this's _BUF.
+
+    d_capacity = v.d_capacity;
+}
+
+/**
+ * @return whether the type of this Vector is a cardinal type
+ * (i.e., stored in d_buf)
+ */
+bool Vector::m_is_cardinal_type() const
+{
+    // Not cardinal if no d_proto at all!
+    if (!d_proto) {
+        return false;
+    }
+
+    switch (d_proto->type()) {
+        case dods_byte_c:
+        case dods_char_c:
+        case dods_int16_c:
+        case dods_uint16_c:
+        case dods_int32_c:
+        case dods_uint32_c:
+        case dods_float32_c:
+        case dods_float64_c:
+        	// New cardinal types for DAP4
+        case dods_int8_c:
+        case dods_uint8_c:
+        case dods_int64_c:
+        case dods_uint64_c:
+
+        case dods_enum_c:
+            return true;
+            break;
+
+            // These must be handled differently.
+        case dods_str_c:
+        case dods_url_c:
+        case dods_opaque_c:
+
+        case dods_array_c:
+
+        case dods_structure_c:
+        case dods_sequence_c:
+        case dods_grid_c:
+            return false;
+            break;
+
+        default:
+            assert("Vector::var: Unrecognized type");
+            return false;
+    }
+}
+
+/**
+ * Create _buf so that it can store numElts of the
+ * (assumed) cardinal type.  This create storage for
+ * width() * numElts bytes.
+ * If _buf already exists, this DELETES IT and creates a new one.
+ * So don't use this if you want to keep the original _buf data around.
+ * This also sets the valueCapacity().
+ * @param numEltsOfType the number of elements of the cardinal type in var()
+ that we want storage for.
+ * @return the size of the buffer created.
+ * @exception if the Vector's type is not cardinal type.
+ */
+unsigned int Vector::m_create_cardinal_data_buffer_for_type(unsigned int numEltsOfType)
+{
+    // Make sure we HAVE a _var, or we cannot continue.
+    if (!d_proto) {
+        throw InternalErr(__FILE__, __LINE__, "create_cardinal_data_buffer_for_type: Logic error: _var is null!");
+    }
+
+    // Make sure we only do this for the correct data types.
+    if (!m_is_cardinal_type()) {
+        throw InternalErr(__FILE__, __LINE__, "create_cardinal_data_buffer_for_type: incorrectly used on Vector whose type was not a cardinal (simple data types).");
+    }
+
+    m_delete_cardinal_data_buffer();
+
+    // Handle this special case where this is an array that holds no values
+    if (numEltsOfType == 0)
+        return 0;
+
+    // Actually new up the array with enough bytes to hold numEltsOfType of the actual type.
+    unsigned int bytesPerElt = d_proto->width();
+    unsigned int bytesNeeded = bytesPerElt * numEltsOfType;
+    d_buf = new char[bytesNeeded];
+
+    d_capacity = numEltsOfType;
+    return bytesNeeded;
+}
+
+/** Delete d_buf and zero it and d_capacity out */
+void Vector::m_delete_cardinal_data_buffer()
+{
+	delete[] d_buf;
+	d_buf = 0;
+	d_capacity = 0;
+}
+
+/** Helper to reduce cut and paste in the virtual's.
+ *
+ */
+template<class CardType>
+void Vector::m_set_cardinal_values_internal(const CardType* fromArray, int numElts)
+{
+    if (numElts < 0) {
+        throw InternalErr(__FILE__, __LINE__, "Logic error: Vector::set_cardinal_values_internal() called with negative numElts!");
+    }
+    if (!fromArray) {
+        throw InternalErr(__FILE__, __LINE__, "Logic error: Vector::set_cardinal_values_internal() called with null fromArray!");
+    }
+    set_length(numElts);
+    m_create_cardinal_data_buffer_for_type(numElts);
+    memcpy(d_buf, fromArray, numElts * sizeof(CardType));
+    set_read_p(true);
+}
+
+/** The Vector constructor requires the name of the variable to be
+ created, and a pointer to an object of the type the Vector is to
+ hold.  The name may be omitted, which will create a nameless
+ variable.  The template object may not be omitted.
+
+ @param n A string containing the name of the variable to be
+ created.
+ @param v A pointer to a prototype for elements.
+ @param t The type of the resulting Vector object, from the Type
+ enum list.  There is no DAP2 Vector object, so all uses of this
+ method will be from the Array class.  This defaults to
+ <tt>dods_null_c</tt>.
+
+ @see Type
+ @brief The Vector constructor.  */
+Vector::Vector(const string & n, BaseType * v, const Type & t, bool is_dap4 /* default:false */) :
+    BaseType(n, t, is_dap4), d_length(-1), d_proto(0), d_buf(0), d_compound_buf(0), d_capacity(0)
+{
+    if (v)
+        add_var(v);
+
+    DBG2(cerr << "Entering Vector ctor for object: " << this << endl);
+    if (d_proto)
+        d_proto->set_parent(this);
+}
+
+/** The Vector server-side constructor requires the name of the variable
+ to be created, the dataset name from which this Vector is created, and
+ a pointer to an object of the type the Vector is to hold.  The
+ name may be omitted, which will create a nameless variable.
+ The template object may not be omitted.
+
+ @param n A string containing the name of the variable to be
+ created.
+ @param d A string containing the dataset name from which the variable is
+ being created.
+ @param v A pointer to a prototype for elements.
+ @param t The type of the resulting Vector object, from the Type
+ enum list.  There is no DAP2 Vector object, so all uses of this
+ method will be from the Array class.  This defaults to
+ <tt>dods_null_c</tt>.
+
+ @see Type
+ @brief The Vector constructor.  */
+Vector::Vector(const string & n, const string &d, BaseType * v, const Type & t, bool is_dap4 /* default:false */) :
+    BaseType(n, d, t, is_dap4), d_length(-1), d_proto(0), d_buf(0), d_compound_buf(0), d_capacity(0)
+{
+    if (v)
+        add_var(v);
+
+    DBG2(cerr << "Entering Vector ctor for object: " << this << endl);
+    if (d_proto)
+        d_proto->set_parent(this);
+}
+
+/** The Vector copy constructor. */
+Vector::Vector(const Vector & rhs) :
+    BaseType(rhs)
+{
+    DBG2(cerr << "Entering Vector const ctor for object: " << this <<
+            endl); DBG2(cerr << "RHS: " << &rhs << endl);
+
+    m_duplicate(rhs);
+}
+
+Vector::~Vector()
+{
+    DBG2(cerr << "Entering ~Vector (" << this << ")" << endl);
+
+    delete d_proto;
+    d_proto = 0;
+
+    // Clears all buffers
+    clear_local_data();
+
+    DBG2(cerr << "Exiting ~Vector" << endl);
+}
+
+Vector & Vector::operator=(const Vector & rhs)
+{
+    if (this == &rhs)
+        return *this;
+
+    dynamic_cast<BaseType &> (*this) = rhs;
+
+    m_duplicate(rhs);
+
+    return *this;
+}
+
+void Vector::set_name(const std::string& name)
+{
+    BaseType::set_name(name);
+    // We need to set the prototype name as well since
+    // this is what gets output in the dds!  Otherwise, there's a mismatch.
+    if (d_proto) {
+        d_proto->set_name(name);
+    }
+}
+
+int Vector::element_count(bool leaves)
+{
+    if (!leaves)
+        return 1;
+    else
+    	return d_proto->element_count(leaves);
+        // var() only works for simple types!
+        // jhrg 8/19/13 return var(0)->element_count(leaves);
+}
+
+// These mfuncs set the _send_p and _read_p fields of BaseType. They differ
+// from BaseType's version in that they set both the Vector object's copy of
+// _send_p (_read_p) but also _VAR's copy. This does not matter much when _VAR
+// is a scalar, but does matter when it is an aggregate.
+
+/** This function sets the <tt>send_p</tt> flag for both the Vector itself
+ and its element template.  This does not matter much when the
+ Vector contains simple data types, but does become significant
+ when the Vector contains compound types.
+
+ @brief Indicates that the data is ready to send. */
+void Vector::set_send_p(bool state)
+{
+    if (d_proto) {
+        d_proto->set_send_p(state);
+
+        // because some code may depend on the BaseType*s held in d_compound_buf
+        // behaving as if they are 'ordinary' DAP variables, make sure their send_p
+        // flag is set if they exist. Because space in the vector is allocated
+        // before values (BaseType*s) are added, check for nulls and limit the
+        // iteration to only those elements actually in the object including any
+        // constraints that may have been applied - these are values not declarations.
+        // jhrg 5/13/16
+        switch (d_proto->type()) {
+        case dods_structure_c:
+        case dods_sequence_c:
+        case dods_grid_c:
+            if (d_compound_buf.size() > 0) {
+                for (unsigned long long i = 0; i < (unsigned) d_length; ++i) {
+                    if (d_compound_buf[i]) d_compound_buf[i]->set_send_p(state);
+                }
+            }
+            break;
+
+        default:
+            break;
+        }
+    }
+
+    BaseType::set_send_p(state);
+}
+
+/** This function sets the <tt>read_p</tt> flag for both the Vector itself
+ and its element template.  This does not matter much when the
+ Vector contains simple data types, but does become significant
+ when the Vector contains compound types.
+
+ @brief Indicates that the data is ready to send.  */
+void Vector::set_read_p(bool state)
+{
+    if (d_proto) {
+        d_proto->set_read_p(state);
+
+        // See comment above.
+        switch (d_proto->type()) {
+        case dods_structure_c:
+        case dods_sequence_c:
+        case dods_grid_c:
+            if (d_compound_buf.size() > 0) {
+                for (unsigned long long i = 0; i < (unsigned)d_length; ++i) {
+                    if (d_compound_buf[i]) d_compound_buf[i]->set_read_p(state);
+                }
+            }
+            break;
+
+        default:
+            break;
+        }
+    }
+
+    BaseType::set_read_p(state);
+}
+
+/** Returns a copy of the template array element. If the Vector contains
+ simple data types, the template will contain the value of the last
+ vector element accessed with the <code>Vector::var(int i)</code> function,
+ if any. If no such access has been made, or if the Vector contains
+ compound data types, the value held by the template instance is
+ undefined.
+
+ Note that the parameter <i>exact_match</i> is not used by this mfunc.
+
+ @param n The name of the variable to find.
+ @param exact Unused.
+ @param s Pointer to a BaseType Pointer Stack. Use this stack to record
+ the path to the variable. By default this pointer is null, in which case
+ it is not used.
+
+ @return A pointer to the BaseType if found, otherwise null.
+ @see Vector::var */
+BaseType *Vector::var(const string &n, bool exact, btp_stack *s)
+{
+    string name = www2id(n);
+    DBG2(cerr << "Vector::var: Looking for " << name << endl);
+
+    if (name == "" || d_proto->name() == name) {
+        if (s)
+            s->push(this);
+        return d_proto;
+    }
+
+    // If this is a Vector of constructor types, look for 'name' recursively.
+    // Make sure to check for the case where name is the default (the empty
+    // string). 9/1/98 jhrg
+    if (d_proto->is_constructor_type()) {
+        BaseType *result = d_proto->var(name, exact, s);
+        if (result && s)
+            s->push(this);
+        return result;
+    }
+
+    return NULL;
+}
+
+/** This version of var(...) searches for <i>name</i> and returns a
+ pointer to the BaseType object if found. It uses the same search
+ algorithm as above when <i>exact_match</i> is false. In addition to
+ returning a pointer to the variable, it pushes onto <i>s</i> a
+ BaseType pointer to each constructor type that ultimately contains
+ <i>name</i>.
+
+ @param n Find the variable whose name is <i>name</i>.
+ @param s Record the path to <i>name</i>.
+ @return A pointer to the named variable. */
+BaseType *Vector::var(const string & n, btp_stack & s)
+{
+    string name = www2id(n);
+
+    if (d_proto->is_constructor_type())
+        return d_proto->var(name, s);
+    else {
+        s.push((BaseType *) this);
+        return d_proto;
+    }
+}
+
+/** Returns a pointer to the specified Vector element.  The return
+ pointer will reference the element itself, so multiple calls to this
+ method should save each value before making the next call.
+
+ @param i The index of the desired Vector element.  Zero
+ indicates the first element of the Vector.
+ @return A pointer to a BaseType class instance containing
+ the value of the indicated element. The BaseType pointer is locally
+ maintained and should not be deleted or referenced. Extract the value
+ right after the method returns.
+ @see BaseType::var */
+BaseType *Vector::var(unsigned int i)
+{
+
+    switch (d_proto->type()) {
+        case dods_byte_c:
+        case dods_char_c:
+        case dods_int8_c:
+        case dods_uint8_c:
+        case dods_int16_c:
+        case dods_uint16_c:
+        case dods_int32_c:
+        case dods_uint32_c:
+        case dods_int64_c:
+        case dods_uint64_c:
+
+        case dods_enum_c:
+
+        case dods_float32_c:
+        case dods_float64_c:
+            // Transfer the ith value to the BaseType *d_proto
+            d_proto->val2buf(d_buf + (i * d_proto->width()));
+            return d_proto;
+            break;
+
+        case dods_str_c:
+        case dods_url_c:
+            d_proto->val2buf(&d_str[i]);
+            return d_proto;
+            break;
+
+        case dods_opaque_c:
+        case dods_array_c:
+        case dods_structure_c:
+        case dods_sequence_c:
+        case dods_grid_c:
+            return d_compound_buf[i];
+            break;
+
+        default:
+            throw Error ("Vector::var: Unrecognized type");
+            break;
+    }
+
+    return 0;
+}
+
+/** Returns the number of bytes needed to hold the entire
+ array.  This is equal to \c length() (the number of elements in
+ in the array) times the width of each
+ element.
+
+ @brief Returns the width of the data, in bytes. */
+unsigned int Vector::width(bool constrained) const
+{
+    // Jose Garcia
+	assert(d_proto);
+
+    return length() * d_proto->width(constrained);
+}
+
+/** Returns the number of elements in the vector. Note that some
+ child classes of Vector use the length of -1 as a flag value.
+
+ @see Vector::append_dim */
+int Vector::length() const
+{
+    return d_length;
+}
+
+/** Sets the length of the vector.  This function does not allocate
+ any new space. */
+void Vector::set_length(int l)
+{
+    d_length = l;
+}
+
+/** Resizes a Vector.  If the input length is greater than the
+ current length of the Vector, new memory is allocated (the
+ Vector moved if necessary), and the new entries are appended to
+ the end of the array and padded with Null values.  If the input
+ length is shorter, the tail values are discarded.
+
+ @note This method is applicable to the compound types only.
+ */
+void Vector::vec_resize(int l)
+{
+    // I added this check, which alters the behavior of the method. jhrg 8/14/13
+    if (m_is_cardinal_type())
+        throw InternalErr(__FILE__, __LINE__, "Vector::vec_resize() is applicable to compound types only");
+
+    // Use resize() since other parts of the code use operator[]. Note that size() should
+    // be used when resize() is used. Using capacity() creates problems as noted in the
+    // comment in set_vec_nocopy(). jhrg 5/19/17
+    d_compound_buf.resize(l, 0); // Fill with NULLs
+    d_capacity = d_compound_buf.size(); // size in terms of number of elements.
+}
+
+/** @brief read data into a variable for later use
+
+ Most uses of a variable are to either serialize its data to a stream of
+ some sort or to read values from some stream and intern those in the
+ variable for later use. These operations are perform by serialize()
+ and deserialize() which follow. This function performs essentially both
+ of these operations without actually using a stream device. The data are
+ read using the read() method(s) and loaded into the variables directly.
+
+ This method is intended to be used by objects which transform DAP objects
+ like the DataDDS into an ASCII CSV representation.
+
+ @note A DAP2-only method
+
+ @param eval A reference to a constraint evaluator
+ @param dds The complete DDS to which this variable belongs */
+void Vector::intern_data(ConstraintEvaluator &eval, DDS &dds)
+{
+    DBG(cerr << "Vector::intern_data: " << name() << endl);
+    if (!read_p())
+        read(); // read() throws Error and InternalErr
+
+    // length() is not capacity; it must be set explicitly in read().
+    int num = length();
+
+    switch (d_proto->type()) {
+        case dods_byte_c:
+        case dods_int16_c:
+        case dods_uint16_c:
+        case dods_int32_c:
+        case dods_uint32_c:
+        case dods_float32_c:
+        case dods_float64_c:
+            // For these cases, read() puts the data into d_buf,
+        	// which is what we need.
+            break;
+
+        case dods_str_c:
+        case dods_url_c:
+            // For these cases, read() will put the data into d_str[],
+        	// which is also what we need.
+            break;
+
+        case dods_array_c:
+            // This is an error since there can never be an Array of Array.
+            throw InternalErr(__FILE__, __LINE__, "Array of Array not supported.");
+            break;
+
+        case dods_structure_c:
+        case dods_sequence_c:
+        case dods_grid_c:
+            DBG(cerr << "Vector::intern_data: found ctor" << endl);
+            // For these cases, we need to call read() for each of the 'num'
+            // elements in the 'd_compound_buf[]' array of BaseType object pointers.
+            //
+            // I changed the test here from '... = 0' to '... < num' to accommodate
+            // the case where the array is zero-length.
+            if (d_compound_buf.capacity() < (unsigned)num)
+                throw InternalErr(__FILE__, __LINE__, "The capacity of this Vector is less than the number of elements.");
+
+            for (int i = 0; i < num; ++i)
+                d_compound_buf[i]->intern_data(eval, dds);
+
+            break;
+
+        default:
+            throw InternalErr(__FILE__, __LINE__, "Unknown datatype.");
+            break;
+    }
+}
+
+/** @brief Serialize a Vector.
+
+ This uses the Marshaler class to encode each element of a cardinal
+ array. For Arrays of Str and Url types, send the element count over
+ as a prefix to the data so that deserialize will know how many elements
+ to read.
+
+ NB: Arrays of cardinal types must already be in BUF (in the local machine's
+ representation) <i>before</i> this call is made.
+ */
+
+bool Vector::serialize(ConstraintEvaluator & eval, DDS & dds, Marshaller &m, bool ce_eval)
+{
+#if 0
+    dds.timeout_on();
+#endif
+    // Added to streamline zero-length arrays. Not needed for correct function,
+    // but explicitly handling this case here makes the code easier to follow.
+    // In libdap::Vector::val2buf() there is a test that will catch the zero-length
+    // case as well. We still need to call serialize since it will write size
+    // information that the client depends on. jhrg 2/17/16
+    if (length() == 0)
+        set_read_p(true);
+    else if (!read_p())
+        read(); // read() throws Error and InternalErr
+
+    if (ce_eval && !eval.eval_selection(dds, dataset()))
+        return true;
+#if 0
+    dds.timeout_off();
+#endif
+    // length() is not capacity; it must be set explicitly in read().
+    int num = length();
+
+    bool status = false;
+
+    switch (d_proto->type()) {
+        case dods_byte_c:
+            m.put_vector(d_buf, num, *this);
+            status = true;
+            break;
+
+        case dods_int16_c:
+        case dods_uint16_c:
+        case dods_int32_c:
+        case dods_uint32_c:
+        case dods_float32_c:
+        case dods_float64_c:
+            m.put_vector(d_buf, num, d_proto->width(), *this);
+            status = true;
+
+            break;
+
+        case dods_str_c:
+        case dods_url_c:
+            if (d_str.capacity() == 0)
+                throw InternalErr(__FILE__, __LINE__, "The capacity of the string vector is 0");
+
+            m.put_int(num);
+
+            for (int i = 0; i < num; ++i)
+                m.put_str(d_str[i]);
+
+            status = true;
+            break;
+
+        case dods_array_c:
+        case dods_structure_c:
+        case dods_sequence_c:
+        case dods_grid_c:
+            //Jose Garcia
+            // Not setting the capacity of d_compound_buf is an internal error.
+            if (d_compound_buf.capacity() == 0)
+                throw InternalErr(__FILE__, __LINE__, "The capacity of *this* vector is 0.");
+
+            m.put_int(num);
+            status = true;
+            for (int i = 0; i < num && status; ++i)
+                status = status && d_compound_buf[i]->serialize(eval, dds, m, false);
+
+            break;
+
+        default:
+            throw InternalErr(__FILE__, __LINE__, "Unknown datatype.");
+            break;
+    }
+
+#ifdef CLEAR_LOCAL_DATA
+    clear_local_data();
+#endif
+
+    return status;
+}
+
+// Read an object from the network and internalize it. For a Vector this is
+// handled differently for a `cardinal' type. Vectors of Cardinals are
+// stored using the `C' representations because these objects often are used
+// to build huge arrays (e.g., an array of 1024 by 1024 bytes). However,
+// arrays of non-cardinal types are stored as Vectors of the C++ objects or
+// DAP2 objects (Str and Url are vectors of the string class, Structure, ...,
+// Grid are vectors of the libdap Structure, ... classes).
+//
+// The boolean parameter REUSE determines whether internal storage is reused
+// or not. If true, the _buf member is assumed to be large enough to hold the
+// incoming cardinal data and is *not* reallocated. If false, new storage is
+// allocated. If the internal buffer has not yet been allocated, then this
+// parameter has no effect (i.e., storage is allocated). This parameter
+// effects storage for cardinal data only.
+//
+// Returns: True is successful, false otherwise.
+
+bool Vector::deserialize(UnMarshaller &um, DDS * dds, bool reuse)
+{
+    unsigned int num;
+    unsigned i = 0;
+
+    switch (d_proto->type()) {
+        case dods_byte_c:
+        case dods_int16_c:
+        case dods_uint16_c:
+        case dods_int32_c:
+        case dods_uint32_c:
+        case dods_float32_c:
+        case dods_float64_c:
+            um.get_int((int &) num);
+
+            DBG(cerr << "Vector::deserialize: num = " << num << endl);
+            DBG(cerr << "Vector::deserialize: length = " << length() << endl);
+
+            if (length() == -1)
+                set_length(num);
+
+            if (num != (unsigned int) length())
+                throw InternalErr(__FILE__, __LINE__, "The server sent declarations and data with mismatched sizes for the variable '" + name() + "'.");
+
+            if (!d_buf || !reuse) {
+                // Make d_buf be large enough for length() elements of _var->type()
+            	// m_create...() deletes the old buffer.
+                m_create_cardinal_data_buffer_for_type(length());
+                DBG(cerr << "Vector::deserialize: allocating "
+                        << width() << " bytes for an array of "
+                        << length() << " " << d_proto->type_name() << endl);
+            }
+
+            // Added to accommodate zero-length arrays.
+            // Note that the rest of the cases will just send the size without data
+            // but that these calls trigger error testing in the UnMarshaller code.
+            // jhrg 1/28/16
+            if (num == 0)
+                return true;
+
+            if (d_proto->type() == dods_byte_c)
+                um.get_vector((char **) &d_buf, num, *this);
+            else
+                um.get_vector((char **) &d_buf, num, d_proto->width(), *this);
+
+            DBG(cerr << "Vector::deserialize: read " << num << " elements\n");
+
+            break;
+
+        case dods_str_c:
+        case dods_url_c:
+            um.get_int((int &) num);
+
+            if (length() == -1)
+                set_length(num);
+
+            if (num != (unsigned int) length())
+                throw InternalErr(__FILE__, __LINE__, "The client sent declarations and data with mismatched sizes.");
+
+            d_str.resize((num > 0) ? num : 0); // Fill with NULLs
+            d_capacity = num; // capacity is number of strings we can fit.
+
+            for (i = 0; i < num; ++i) {
+                string str;
+                um.get_str(str);
+                d_str[i] = str;
+
+            }
+
+            break;
+
+        case dods_array_c:
+            // Added jhrg 5/18/17
+            // This replaces a comment that was simply 'TO DO'
+            throw InternalErr(__FILE__, __LINE__, "Array of array!");
+            break;
+
+        case dods_structure_c:
+        case dods_sequence_c:
+        case dods_grid_c:
+            um.get_int((int &) num);
+
+            if (length() == -1)
+                set_length(num);
+
+            if (num != (unsigned int) length())
+                throw InternalErr(__FILE__, __LINE__, "The client sent declarations and data with mismatched sizes.");
+
+            vec_resize(num);
+
+            for (i = 0; i < num; ++i) {
+                d_compound_buf[i] = d_proto->ptr_duplicate();
+                d_compound_buf[i]->deserialize(um, dds);
+            }
+
+            break;
+
+        default:
+            throw InternalErr(__FILE__, __LINE__, "Unknown type!");
+            break;
+    }
+
+    return false;
+}
+
+void Vector::compute_checksum(Crc32 &checksum)
+{
+    switch (d_proto->type()) {
+        case dods_byte_c:
+        case dods_char_c:
+        case dods_int8_c:
+        case dods_uint8_c:
+
+        case dods_int16_c:
+        case dods_uint16_c:
+
+        case dods_int32_c:
+        case dods_uint32_c:
+        case dods_float32_c:
+
+        case dods_int64_c:
+        case dods_uint64_c:
+        case dods_float64_c:
+
+        case dods_enum_c:
+        	checksum.AddData(reinterpret_cast<uint8_t*>(d_buf), length() * d_proto->width());
+        	break;
+
+        case dods_str_c:
+        case dods_url_c:
+        	for (int64_t i = 0, e = length(); i < e; ++i)
+        		checksum.AddData(reinterpret_cast<const uint8_t*>(d_str[i].data()), d_str[i].length());
+            break;
+
+        case dods_opaque_c:
+        case dods_structure_c:
+        case dods_sequence_c:
+        	d_proto->compute_checksum(checksum);
+        	break;
+
+        case dods_array_c:	// No array of array
+        case dods_grid_c:	// No grids in DAP4
+        default:
+            throw InternalErr(__FILE__, __LINE__, "Unknown or unsupported datatype (" + d_proto->type_name() + ").");
+            break;
+    }
+}
+
+void Vector::intern_data(/*Crc32 &checksum, DMR &dmr, ConstraintEvaluator &eval*/)
+{
+    if (!read_p())
+        read(); // read() throws Error and InternalErr
+
+    switch (d_proto->type()) {
+        case dods_byte_c:
+        case dods_char_c:
+        case dods_int8_c:
+        case dods_uint8_c:
+        case dods_int16_c:
+        case dods_uint16_c:
+        case dods_int32_c:
+        case dods_uint32_c:
+        case dods_int64_c:
+        case dods_uint64_c:
+
+        case dods_enum_c:
+
+        case dods_float32_c:
+        case dods_float64_c:
+
+        case dods_str_c:
+        case dods_url_c:
+#if 0
+        	compute_checksum(checksum);
+#endif
+            break;
+
+        case dods_opaque_c:
+        case dods_structure_c:
+        case dods_sequence_c:
+            // Modified the assert here from '... != 0' to '... >= length())
+            // to accommodate the case of a zero-length array. jhrg 1/28/16
+            assert(d_compound_buf.capacity() >= (unsigned)length());
+
+            for (int i = 0, e = length(); i < e; ++i)
+                d_compound_buf[i]->intern_data(/*checksum, dmr, eval*/);
+            break;
+
+        case dods_array_c:      // No Array of Array in DAP4 either...
+        case dods_grid_c:
+        default:
+        	throw InternalErr(__FILE__, __LINE__, "Unknown or unsupported datatype (" + d_proto->type_name() + ").");
+            break;
+    }
+}
+
+void
+Vector::serialize(D4StreamMarshaller &m, DMR &dmr, bool filter /*= false*/)
+{
+    if (!read_p())
+        read(); // read() throws Error and InternalErr
+#if 0
+    if (filter && !eval.eval_selection(dmr, dataset()))
+        return true;
+#endif
+    int64_t num = length();	// The constrained length in elements
+
+    DBG(cerr << __func__ << ", num: " << num << endl);
+
+    // Added in case we're trying to serialize a zero-length array. jhrg 1/27/16
+    if (num == 0)
+        return;
+
+    switch (d_proto->type()) {
+        case dods_byte_c:
+        case dods_char_c:
+        case dods_int8_c:
+        case dods_uint8_c:
+            m.put_vector(d_buf, num);
+            break;
+
+        case dods_int16_c:
+        case dods_uint16_c:
+        case dods_int32_c:
+        case dods_uint32_c:
+        case dods_int64_c:
+        case dods_uint64_c:
+        	m.put_vector(d_buf, num, d_proto->width());
+        	break;
+
+        case dods_enum_c:
+        	if (d_proto->width() == 1)
+        		m.put_vector(d_buf, num);
+        	else
+        		m.put_vector(d_buf, num, d_proto->width());
+        	break;
+
+        case dods_float32_c:
+            m.put_vector_float32(d_buf, num);
+            break;
+
+        case dods_float64_c:
+            m.put_vector_float64(d_buf, num);
+            break;
+
+        case dods_str_c:
+        case dods_url_c:
+            assert((int64_t)d_str.capacity() >= num);
+
+            for (int64_t i = 0; i < num; ++i)
+                m.put_str(d_str[i]);
+
+            break;
+
+        case dods_array_c:
+        	throw InternalErr(__FILE__, __LINE__, "Array of Array not allowed.");
+
+        case dods_opaque_c:
+        case dods_structure_c:
+        case dods_sequence_c:
+            assert(d_compound_buf.capacity() >= 0);
+
+            for (int64_t i = 0; i < num; ++i) {
+                DBG(cerr << __func__ << "d_compound_buf[" << i << "] " << d_compound_buf[i] << endl);
+                d_compound_buf[i]->serialize(m, dmr, filter);
+            }
+
+            break;
+
+        case dods_grid_c:
+        	throw InternalErr(__FILE__, __LINE__, "Grid is not part of DAP4.");
+
+        default:
+            throw InternalErr(__FILE__, __LINE__, "Unknown datatype.");
+            break;
+    }
+
+#ifdef CLEAR_LOCAL_DATA
+    clear_local_data();
+#endif
+}
+
+void
+Vector::deserialize(D4StreamUnMarshaller &um, DMR &dmr)
+{
+    if (m_is_cardinal_type()) {
+        if (d_buf)
+            m_delete_cardinal_data_buffer();
+        if (!d_buf)
+            m_create_cardinal_data_buffer_for_type(length());
+    }
+
+    DBG(cerr << __FUNCTION__ << name() << ", length(): " << length() << endl);
+
+    // Added in case we're trying to deserialize a zero-length array. jhrg 1/27/16
+    if (length() == 0)
+        return;
+
+    switch (d_proto->type()) {
+        case dods_byte_c:
+        case dods_char_c:
+        case dods_int8_c:
+        case dods_uint8_c:
+        	um.get_vector((char *)d_buf, length());
+        	break;
+
+        case dods_int16_c:
+        case dods_uint16_c:
+        case dods_int32_c:
+        case dods_uint32_c:
+        case dods_int64_c:
+        case dods_uint64_c:
+        	um.get_vector((char *)d_buf, length(), d_proto->width());
+        	break;
+
+        case dods_enum_c:
+        	if (d_proto->width() == 1)
+        		um.get_vector((char *)d_buf, length());
+        	else
+        		um.get_vector((char *)d_buf, length(), d_proto->width());
+        	break;
+
+        case dods_float32_c:
+            um.get_vector_float32((char *)d_buf, length());
+            break;
+
+        case dods_float64_c:
+        	um.get_vector_float64((char *)d_buf, length());
+            break;
+
+        case dods_str_c:
+        case dods_url_c: {
+        	int64_t len = length();
+            d_str.resize((len > 0) ? len : 0); // Fill with NULLs
+            d_capacity = len; // capacity is number of strings we can fit.
+
+            for (int64_t i = 0; i < len; ++i) {
+                um.get_str(d_str[i]);
+            }
+
+            break;
+        }
+
+        case dods_array_c:
+        	throw InternalErr(__FILE__, __LINE__, "Array of Array not allowed.");
+
+        case dods_opaque_c:
+        case dods_structure_c:
+        case dods_sequence_c: {
+            vec_resize(length());
+
+            for (int64_t i = 0, end = length(); i < end; ++i) {
+                d_compound_buf[i] = d_proto->ptr_duplicate();
+                d_compound_buf[i]->deserialize(um, dmr);
+            }
+
+            break;
+        }
+
+        case dods_grid_c:
+        	throw InternalErr(__FILE__, __LINE__, "Grid is not part of DAP4.");
+
+        default:
+            throw InternalErr(__FILE__, __LINE__, "Unknown type.");
+            break;
+    }
+}
+
+/** Copies data into the class instance buffer.  This function
+ assumes that the input \e val points to memory which
+ contains, in row major order, enough elements of the correct
+ type to fill the array. For an array of a cardinal type the
+ memory is simply copied in whole into the Vector buffer.
+
+ If the variable has already been constrained, this method will load only
+ number of values/bytes specified by that constraint and will load them
+ into the 'front' of the object's internal buffer. This is where serialize()
+ expects to find the data.
+
+ For a Vector of Str (OPeNDAP Strings), this assumes \e val points to an
+ array of C++ strings.
+
+ This method should not be used for Structure, Sequence or Grid.
+
+ @brief Reads data into the Vector buffer.
+ @exception InternalErr Thrown if called for Structure, Sequence or
+ Grid.
+ @return The number of bytes used by the array.
+ @param val A pointer to the input data.
+ @param reuse A boolean value, indicating whether the class
+ internal data storage can be reused or not.  If this argument is
+ TRUE, the class buffer is assumed to be large enough to hold the
+ incoming data, and it is <i>not</i> reallocated.  If FALSE, new
+ storage is allocated.  If the internal buffer has not been
+ allocated at all, this argument has no effect. */
+unsigned int Vector::val2buf(void *val, bool reuse)
+{
+    // Jose Garcia
+
+    // Added for zero-length arrays - support in the handlers. jhrg 1/29/16
+    if (!val && length() == 0)
+        return 0;
+
+    // I *think* this method has been mainly designed to be use by read which
+    // is implemented in the surrogate library. Passing NULL as a pointer to
+    // this method will be an error of the creator of the surrogate library.
+    // Even though I recognize the fact that some methods inside libdap++ can
+    // call val2buf, I think by now no coding bugs such as misusing val2buf
+    // will be in libdap++, so it will be an internal error from the
+    // surrogate library.
+    if (!val)
+        throw InternalErr(__FILE__, __LINE__, "The incoming pointer does not contain any data.");
+
+    switch (d_proto->type()) {
+        case dods_byte_c:
+        case dods_char_c:
+        case dods_int8_c:
+        case dods_uint8_c:
+        case dods_int16_c:
+        case dods_uint16_c:
+        case dods_int32_c:
+        case dods_uint32_c:
+        case dods_int64_c:
+        case dods_uint64_c:
+
+        case dods_enum_c:
+
+        case dods_float32_c:
+        case dods_float64_c:
+#if 0
+        	if (d_buf && !reuse)
+                m_delete_cardinal_data_buffer();
+#endif
+            // First time or no reuse (free'd above)
+            if (!d_buf || !reuse)
+                m_create_cardinal_data_buffer_for_type(length());
+
+            // width(true) returns the size in bytes given the constraint
+            memcpy(d_buf, val, width(true));
+            break;
+
+        case dods_str_c:
+        case dods_url_c:
+            // Assume val points to an array of C++ string objects. Copy
+            // them into the vector<string> field of this object.
+            // Note: d_length is the number of elements in the Vector
+            d_str.resize(d_length);
+            d_capacity = d_length;
+            for (int i = 0; i < d_length; ++i)
+                d_str[i] = *(static_cast<string *> (val) + i);
+
+            break;
+
+        default:
+            throw InternalErr(__FILE__, __LINE__, "Vector::val2buf: bad type");
+
+    }
+
+    return width(true);
+}
+
+/** Copies data from the Vector buffer.  This function assumes that
+ <i>val</i> points to an array large enough to hold N instances of
+ the `C' representation of the \e numeric element type or C++ string
+ objects. Never call this method for constructor types Structure,
+ Sequence or Grid.
+
+ When reading data out of a variable that has been constrained, this method
+ assumes the N values/bytes of constrained data start at the beginning
+ of the object's internal buffer. For example, do not load an entire
+ Vector's data using val2buf(), constrain and then use this method to
+ get the data. Unless your constraint starts with the [0]th element, the
+ result will not be the correct values.
+
+ In the case of a Vector of Str objects, this method will return an array
+ of C++ std::string objects.
+
+ @note It's best to define the pointer to reference the data as
+ 'char *data' and then call this method using '..->buf2val((void**)&data)'.
+ Then free the storage once you're done using 'delete[] data'. It's not
+ correct C++ to use 'delete[]' on a void pointer and the allocated memory
+ \e is an array of char, so 'delete[]' is needed.
+
+ @return The number of bytes used to store the array.
+ @param val A pointer to a pointer to the memory into which the
+ class data will be copied.  If the value pointed to is NULL,
+ memory will be allocated to hold the data, and the pointer value
+ modified accordingly.  The calling program is responsible for
+ deallocating the memory indicated by this pointer.
+ @exception InternalErr Thrown if \e val is null.
+ @see Vector::set_vec */
+unsigned int Vector::buf2val(void **val)
+{
+    // Jose Garcia
+    // The same comment in Vector::val2buf applies here!
+    if (!val)
+        throw InternalErr(__FILE__, __LINE__, "NULL pointer.");
+
+    unsigned int wid = static_cast<unsigned int> (width(true /* constrained */));
+
+    // This is the width computed using length(). The
+    // length() property is changed when a projection
+    // constraint is applied. Thus this is the number of
+    // bytes in the buffer given the current constraint.
+
+    switch (d_proto->type()) {
+        case dods_byte_c:
+        case dods_char_c:
+        case dods_int8_c:
+        case dods_uint8_c:
+        case dods_int16_c:
+        case dods_uint16_c:
+        case dods_int32_c:
+        case dods_uint32_c:
+        case dods_int64_c:
+        case dods_uint64_c:
+
+        case dods_enum_c:
+
+        case dods_float32_c:
+        case dods_float64_c:
+            if (!d_buf)
+                throw InternalErr(__FILE__, __LINE__, "Vector::buf2val: Logic error: called when cardinal type data buffer was empty!");
+            if (!*val)
+                *val = new char[wid];
+
+            memcpy(*val, d_buf, wid);
+            return wid;
+            break;
+
+        case dods_str_c:
+        case dods_url_c: {
+        	if (d_str.empty())
+        		throw InternalErr(__FILE__, __LINE__, "Vector::buf2val: Logic error: called when string data buffer was empty!");
+            if (!*val)
+                *val = new string[d_length];
+
+            for (int i = 0; i < d_length; ++i)
+                *(static_cast<string *> (*val) + i) = d_str[i];
+
+            return width();
+            break;
+        }
+
+        default:
+            throw InternalErr(__FILE__, __LINE__, "Vector::buf2val: bad type");
+    }
+
+    //return wid;
+}
+
+/** Sets an element of the vector to a given value.  If the type of
+ the input and the type of the Vector do not match, an error
+ condition is returned.
+
+ Use this function only with Vectors containing compound
+ types.  See \c buf2val() or the \c set_value() methods to access
+ members of Vector containing simple types.
+
+ @note This method copies \e val; the caller is responsible for deleting
+ instance passed as the actual parameter.
+
+ @brief Sets element <i>i</i> to value <i>val</i>.
+ @return void
+ @exception InternalErr Thrown if \e i is out of range, \e val is null or
+ there was a type mismatch between the BaseType referenced by \e val and
+ the \e ith element of this Vector.
+ @param i The index of the element to be changed.
+ @param val A pointer to the value to be inserted into the
+ array.
+ @see Vector::buf2val */
+void Vector::set_vec(unsigned int i, BaseType * val)
+{
+	Vector::set_vec_nocopy(i, val->ptr_duplicate());
+}
+
+/**
+ * @brief Sets element <i>i</i> to value <i>val</i>.
+ * Set the ith element to val. Extend the vector if needed.
+ *
+ * @note It is best to call vec_resize() first and allocate enough elements
+ * before calling this method.
+ *
+ * @note This method does not copy \e val; this class will free the instance
+ * when the variable is deleted or when clear_local_data() is called.
+ * @see Vector::set_vec()
+ * */
+void Vector::set_vec_nocopy(unsigned int i, BaseType * val)
+{
+    // Jose Garcia
+    // This is a public method which allows users to set the elements
+    // of *this* vector. Passing an invalid index, a NULL pointer or
+    // mismatching the vector type are internal errors.
+    if (i >= static_cast<unsigned int> (d_length))
+        throw InternalErr(__FILE__, __LINE__, "Invalid data: index too large.");
+    if (!val)
+        throw InternalErr(__FILE__, __LINE__, "Invalid data: null pointer to BaseType object.");
+    if (val->type() != d_proto->type())
+        throw InternalErr(__FILE__, __LINE__, "invalid data: type of incoming object does not match *this* vector type.");
+
+    // This code originally used capacity() instead of size(), but that was an error.
+    // Use capacity() when using reserve() and size() when using resize(). Mixing
+    // capacity() with resize() leaves holes in the data, where (pointer) values are
+    // filled with nulls during successive calls to resize(). The resize() heuristic
+    // remembers previous calls on a given vector<> and allocates larger than requested
+    // blocks of memory on successive calls, which has the strange affect of erasing
+    // values already in the vector in the parts just added.
+    // jhrg 5/18/17
+    if (i >= d_compound_buf.size()) {
+        vec_resize(d_compound_buf.size() + 100);
+    }
+
+    d_compound_buf[i] = val;
+}
+
+/**
+ * Remove any read or set data in the private data of this Vector,
+ * setting read_p() to false.
+ * Essentially clears the _buf, d_str, and d_compound_buf of any data.
+ * Useful for tightening up memory when the data is no longer needed,
+ * but the object cannot yet be destroyed.
+ *
+ * On exit: get_value_capacity() == 0 && !read_p()
+ */
+void Vector::clear_local_data()
+{
+    if (d_buf) {
+        delete[] d_buf;
+        d_buf = 0;
+    }
+
+    for (unsigned int i = 0; i < d_compound_buf.size(); ++i) {
+        delete d_compound_buf[i];
+        d_compound_buf[i] = 0;
+    }
+
+    // Force memory to be reclaimed.
+    d_compound_buf.resize(0);
+    d_str.resize(0);
+
+    d_capacity = 0;
+    set_read_p(false);
+}
+
+/**
+ * Return the capacity of the Vector in terms of number of
+ * elements of its data type that it can currently hold (i.e. not bytes).
+ * For example, this could be
+ * the size of the _buf array in bytes / sizeof(T) for the cardinal
+ * types T, or the capacity of the d_str vector if T is string or url type.
+ */
+unsigned int Vector::get_value_capacity() const
+{
+    return d_capacity;
+}
+
+/**
+ * Allocate enough memory for the Vector to contain
+ * numElements data elements of the Vector's type.
+ * Must be used before set_value_slice_from_row_major_vector
+ * to ensure memory exists.
+ * @param numElements  the number of elements of the Vector's type
+ *                     to preallocate storage for.
+ * @exception if the memory cannot be allocated
+ */
+void Vector::reserve_value_capacity(unsigned int numElements)
+{
+    if (!d_proto) {
+        throw InternalErr(__FILE__, __LINE__, "reserve_value_capacity: Logic error: _var is null!");
+    }
+    switch (d_proto->type()) {
+        case dods_byte_c:
+        case dods_char_c:
+        case dods_int8_c:
+        case dods_uint8_c:
+        case dods_int16_c:
+        case dods_uint16_c:
+        case dods_int32_c:
+        case dods_uint32_c:
+        case dods_int64_c:
+        case dods_uint64_c:
+
+        case dods_enum_c:
+
+        case dods_float32_c:
+        case dods_float64_c:
+            // Make _buf be the right size and set _capacity
+            m_create_cardinal_data_buffer_for_type(numElements);
+            break;
+
+        case dods_str_c:
+        case dods_url_c:
+            // Make sure the d_str has enough room for all the strings.
+            // Technically not needed, but it will speed things up for large arrays.
+            d_str.reserve(numElements);
+            d_capacity = numElements;
+            break;
+
+        case dods_array_c:
+            throw InternalErr(__FILE__, __LINE__, "reserve_value_capacity: Arrays not supported!");
+            break;
+
+        case dods_opaque_c:
+        case dods_structure_c:
+        case dods_sequence_c:
+        case dods_grid_c:
+            // not clear anyone will go this path, but best to be complete.
+            d_compound_buf.reserve(numElements);
+            d_capacity = numElements;
+            break;
+
+        default:
+            throw InternalErr(__FILE__, __LINE__, "reserve_value_capacity: Unknown type!");
+            break;
+
+    } // switch
+
+}
+
+/**
+ * Make sure there's storage allocated for the current length()
+ * of the Vector.
+ * Same as reserveValueCapacity(length())
+ */
+void Vector::reserve_value_capacity()
+{
+    // Use the current length of the vector as the reserve amount.
+    reserve_value_capacity(length());
+}
+
+/**
+ * Copy rowMajorData.length() elements currently in a rowMajorData buffer
+ * into this value buffer starting at element index startElement and
+ * continuing up to startElement+rowMajorData.length()-1
+ *
+ * This is used for aggregating together smaller rowMajor vectors
+ * into a larger one.
+ *
+ * Note: unlike the other set_value calls, this does NOT set read_p()
+ *       since it is assumed to be used as a partial read and the caller
+ *       is expected to set_read_p() when the data is complete.
+ *
+ * ASSUMES: rowMajorData.read_p() so that the data is valid!
+ * ASSUMES: this Vector has enough value_capacity() to contain
+ *          all the elements such that:
+ *          startElement + rowMajorData.length()
+ *          <= this->value_capacity().
+ * ASSUMES: the data type of this->var() and rowMajorData.var()
+ *          MUST be non-NULL and be the same!
+ *
+ * @param rowMajorDataC the vector from which to copy data,
+ *                     assumed already read in or set.
+ * @param startElement the element index
+ *                     (NOT byte, but rather data type element)
+ *                     to place the first data value.
+ * @return the number of elements added, such that:
+ *         startElement + the return value is the next "free" element.
+ */
+unsigned int
+Vector::set_value_slice_from_row_major_vector(const Vector& rowMajorDataC, unsigned int startElement)
+{
+	static const string funcName = "set_value_slice_from_row_major_vector:";
+
+	// semantically const from the caller's viewpoint, but some calls are not syntactic const.
+	Vector& rowMajorData = const_cast<Vector&>(rowMajorDataC);
+
+	bool typesMatch = rowMajorData.var() && d_proto && (rowMajorData.var()->type() == d_proto->type());
+	if (!typesMatch) {
+		throw InternalErr(__FILE__, __LINE__, funcName + "Logic error: types do not match so cannot be copied!");
+	}
+
+	// Make sure the data exists
+	if (!rowMajorData.read_p()) {
+		throw InternalErr(__FILE__, __LINE__,
+				funcName + "Logic error: the Vector to copy data from has !read_p() and should have been read in!");
+	}
+
+	// Check this otherwise the static_cast<unsigned int> below will do the wrong thing.
+	if (rowMajorData.length() < 0) {
+		throw InternalErr(__FILE__, __LINE__,
+				funcName
+						+ "Logic error: the Vector to copy data from has length() < 0 and was probably not initialized!");
+	}
+
+	// The read-in capacity had better be at least the length (the amount we will copy) or we'll memcpy into bad memory
+	// I imagine we could copy just the capacity rather than throw, but I really think this implies a problem to be addressed.
+	if (rowMajorData.get_value_capacity() < static_cast<unsigned int>(rowMajorData.length())) {
+		throw InternalErr(__FILE__, __LINE__,
+				funcName
+						+ "Logic error: the Vector to copy from has a data capacity less than its length, can't copy!");
+	}
+
+	// Make sure there's enough room in this Vector to store all the elements requested.  Again,
+	// better to throw than just copy what we can since it implies a logic error that needs to be solved.
+	if (d_capacity < (startElement + rowMajorData.length())) {
+		throw InternalErr(__FILE__, __LINE__,
+				funcName + "Logic error: the capacity of this Vector cannot hold all the data in the from Vector!");
+	}
+
+	// OK, at this point we're pretty sure we can copy the data, but we have to do it differently depending on type.
+	switch (d_proto->type()) {
+		case dods_int8_c:
+		case dods_uint8_c:
+		case dods_byte_c:
+        case dods_char_c:
+		case dods_int16_c:
+		case dods_uint16_c:
+		case dods_int32_c:
+		case dods_uint32_c:
+		case dods_int64_c:
+		case dods_uint64_c:
+
+		case dods_enum_c:
+
+		case dods_float32_c:
+		case dods_float64_c: {
+			if (!d_buf) {
+				throw InternalErr(__FILE__, __LINE__, funcName + "Logic error: this->_buf was unexpectedly null!");
+			}
+			if (!rowMajorData.d_buf) {
+				throw InternalErr(__FILE__, __LINE__, funcName + "Logic error: rowMajorData._buf was unexpectedly null!");
+			}
+			// memcpy the data into this, taking care to do ptr arithmetic on bytes and not sizeof(element)
+			int varWidth = d_proto->width();
+			char* pFromBuf = rowMajorData.d_buf;
+			int numBytesToCopy = rowMajorData.width(true);
+			char* pIntoBuf = d_buf + (startElement * varWidth);
+			memcpy(pIntoBuf, pFromBuf, numBytesToCopy);
+			break;
+		}
+
+		case dods_str_c:
+		case dods_url_c:
+			// Strings need to be copied directly
+			for (unsigned int i = 0; i < static_cast<unsigned int>(rowMajorData.length()); ++i) {
+				d_str[startElement + i] = rowMajorData.d_str[i];
+			}
+			break;
+
+		case dods_array_c:
+        case dods_opaque_c:
+		case dods_structure_c:
+		case dods_sequence_c:
+		case dods_grid_c:
+			// Not sure that this function will be used for these type of nested objects, so I will throw here.
+			throw InternalErr(__FILE__, __LINE__,
+					funcName + "Unimplemented method for Vectors of type: array, opaque, structure, sequence or grid.");
+			break;
+
+		default:
+			throw InternalErr(__FILE__, __LINE__, funcName + ": Unknown type!");
+			break;
+
+	} // switch (_var->type())
+
+	// This is how many elements we copied.
+	return (unsigned int) rowMajorData.length();
+}
+
+/**
+ * Does the C++ type correspond to the DAP Type enum value? This works only for
+ * numeric cardinal types. For Enums, pass the value of element_type(); for all
+ * others use type().
+ * @param t
+ * @param dt
+ * @return True if the types match, false otherwise
+ */
+template <typename T>
+static bool types_match(Type t, T *cpp_var)
+{
+    switch (t) {
+    case dods_byte_c:
+    case dods_char_c:
+    case dods_uint8_c:
+        return typeid(cpp_var) == typeid(dods_byte*);
+
+    case dods_int8_c:
+        return typeid(cpp_var) == typeid(dods_int8*);
+    case dods_int16_c:
+        return typeid(cpp_var) == typeid(dods_int16*);
+    case dods_uint16_c:
+        return typeid(cpp_var) == typeid(dods_uint16*);
+    case dods_int32_c:
+        return typeid(cpp_var) == typeid(dods_int32*);
+    case dods_uint32_c:
+        return typeid(cpp_var) == typeid(dods_uint32*);
+    case dods_int64_c:
+        return typeid(cpp_var) == typeid(dods_int64*);
+    case dods_uint64_c:
+        return typeid(cpp_var) == typeid(dods_uint64*);
+
+    case dods_float32_c:
+        return typeid(cpp_var) == typeid(dods_float32*);
+    case dods_float64_c:
+        return typeid(cpp_var) == typeid(dods_float64*);
+
+    case dods_null_c:
+    case dods_enum_c:
+    case dods_str_c:
+    case dods_url_c:
+    case dods_opaque_c:
+    case dods_array_c:
+    case dods_structure_c:
+    case dods_sequence_c:
+    case dods_group_c:
+    default:
+        return false;
+    }
+}
+
+//@{
+/** @brief set the value of a byte array */
+
+template <typename T>
+bool Vector::set_value_worker(T *v, int sz)
+{
+    if (!v || !types_match(d_proto->type() == dods_enum_c ? static_cast<D4Enum*>(d_proto)->element_type() : d_proto->type(), v))
+        return false;
+
+    m_set_cardinal_values_internal(v, sz);
+    return true;
+}
+
+bool Vector::set_value(dods_byte *val, int sz)
+{
+    return set_value_worker(val, sz);
+}
+bool Vector::set_value(dods_int8 *val, int sz)
+{
+    return set_value_worker(val, sz);
+}
+bool Vector::set_value(dods_int16 *val, int sz)
+{
+    return set_value_worker(val, sz);
+}
+bool Vector::set_value(dods_uint16 *val, int sz)
+{
+    return set_value_worker(val, sz);
+}
+bool Vector::set_value(dods_int32 *val, int sz)
+{
+    return set_value_worker(val, sz);
+}
+bool Vector::set_value(dods_uint32 *val, int sz)
+{
+    return set_value_worker(val, sz);
+}
+bool Vector::set_value(dods_int64 *val, int sz)
+{
+    return set_value_worker(val, sz);
+}
+bool Vector::set_value(dods_uint64 *val, int sz)
+{
+    return set_value_worker(val, sz);
+}
+bool Vector::set_value(dods_float32 *val, int sz)
+{
+    return set_value_worker(val, sz);
+}
+bool Vector::set_value(dods_float64 *val, int sz)
+{
+    return set_value_worker(val, sz);
+}
+
+/** @brief set the value of a string or url array */
+bool Vector::set_value(string *val, int sz)
+{
+    if ((var()->type() == dods_str_c || var()->type() == dods_url_c) && val) {
+        d_str.resize(sz);
+        d_capacity = sz;
+        for (register int t = 0; t < sz; t++) {
+            d_str[t] = val[t];
+        }
+        set_length(sz);
+        set_read_p(true);
+        return true;
+    }
+    else {
+        return false;
+    }
+}
+
+template<typename T>
+bool Vector::set_value_worker(vector<T> &v, int sz)
+{
+    return set_value(&v[0], sz);
+}
+
+bool Vector::set_value(vector<dods_byte> &val, int sz)
+{
+    return set_value_worker(val, sz);
+}
+bool Vector::set_value(vector<dods_int8> &val, int sz)
+{
+    return set_value_worker(val, sz);
+}
+bool Vector::set_value(vector<dods_int16> &val, int sz)
+{
+    return set_value_worker(val, sz);
+}
+bool Vector::set_value(vector<dods_uint16> &val, int sz)
+{
+    return set_value_worker(val, sz);
+}
+bool Vector::set_value(vector<dods_int32> &val, int sz)
+{
+    return set_value_worker(val, sz);
+}
+bool Vector::set_value(vector<dods_uint32> &val, int sz)
+{
+    return set_value_worker(val, sz);
+}
+bool Vector::set_value(vector<dods_int64> &val, int sz)
+{
+    return set_value_worker(val, sz);
+}
+bool Vector::set_value(vector<dods_uint64> &val, int sz)
+{
+    return set_value_worker(val, sz);
+}
+bool Vector::set_value(vector<dods_float32> &val, int sz)
+{
+    return set_value_worker(val, sz);
+}
+bool Vector::set_value(vector<dods_float64> &val, int sz)
+{
+    return set_value_worker(val, sz);
+}
+
+
+/** @brief set the value of a string or url array */
+bool Vector::set_value(vector<string> &val, int sz)
+{
+    if (var()->type() == dods_str_c || var()->type() == dods_url_c) {
+        d_str.resize(sz);
+        d_capacity = sz;
+        for (register int t = 0; t < sz; t++) {
+            d_str[t] = val[t];
+        }
+        set_length(sz);
+        set_read_p(true);
+        return true;
+    }
+    else {
+        return false;
+    }
+}
+//@}
+
+//@{
+
+/** @brief Get a copy of the data held by this variable using the passed subsetIndex
+ * vector to identify which values to return.
+ *
+ * Read data from this variable's internal storage using the passed std::vector
+ * as an sub-setting index to the values to be returned. For example, if \c subsetIndex
+ * contains 1,3,5,7 and 9, then 'b' will contain the five values found at indexes
+ * 1,3, ..., 9.
+ *
+ * @note The memory referenced by \c b must point to enough memory to hold index.size()
+ * bytes; no test for this is performed.
+ * @note This can only be called for cardinal types.
+ *
+ * @param index A std::vector<long> where each value in the vector is the
+ * location in the Vector's internal storage from which to read the returned value.
+ * @param b A pointer to the memory to hold the data; must be at least
+ * length() * sizeof(dods_byte) in size.*/
+template <typename T>
+void Vector::value_worker(vector<unsigned int> *indices, T *b) const
+{
+   // unsigned long currentIndex;
+#if 0
+    // Iterator version. Not tested, jhrg 8/14/13
+    for (vector<unsigned int>::iterator i = indices->begin(), e = indices->end(); i != e; ++i) {
+        unsigned long currentIndex = *i;
+        if(currentIndex > (unsigned int)length()){
+            stringstream s;
+            s << "Vector::value() - Subset index[" << i - subsetIndex->begin() <<  "] = " << currentIndex << " references a value that is " <<
+                    "outside the bounds of the internal storage [ length()= " << length() << " ] name: '" << name() << "'. ";
+            throw Error(s.str());
+        }
+        b[i - indices->begin()] = reinterpret_cast<T*>(d_buf )[currentIndex];
+    }
+#endif
+    for (unsigned long i = 0, e = indices->size(); i < e; ++i) {
+        unsigned long currentIndex = (*indices)[i];
+        if (currentIndex > (unsigned int)length()) {
+            stringstream s;
+            s << "Vector::value() - Subset index[" << i <<  "] = " << currentIndex << " references a value that is " <<
+                    "outside the bounds of the internal storage [ length()= " << length() << " ] name: '" << name() << "'. ";
+            throw Error(s.str());
+        }
+        b[i] = reinterpret_cast<T*>(d_buf )[currentIndex]; // I like this version - and it works!
+    }
+}
+void Vector::value(vector<unsigned int> *indices, dods_byte *b) const    { value_worker(indices, b); }
+void Vector::value(vector<unsigned int> *indices, dods_int8 *b) const    { value_worker(indices, b); }
+void Vector::value(vector<unsigned int> *indices, dods_int16 *b) const   { value_worker(indices, b); }
+void Vector::value(vector<unsigned int> *indices, dods_uint16 *b) const  { value_worker(indices, b); }
+void Vector::value(vector<unsigned int> *indices, dods_int32 *b) const   { value_worker(indices, b); }
+void Vector::value(vector<unsigned int> *indices, dods_uint32 *b) const  { value_worker(indices, b); }
+void Vector::value(vector<unsigned int> *indices, dods_int64 *b) const   { value_worker(indices, b); }
+void Vector::value(vector<unsigned int> *indices, dods_uint64 *b) const  { value_worker(indices, b); }
+void Vector::value(vector<unsigned int> *indices, dods_float32 *b) const { value_worker(indices, b); }
+void Vector::value(vector<unsigned int> *indices, dods_float64 *b) const { value_worker(indices, b); }
+
+#if 0
+template void Vector::value(vector<unsigned int> *indices, dods_byte *b) const;
+template void Vector::value(vector<unsigned int> *indices, dods_int8 *b) const;
+template void Vector::value(vector<unsigned int> *indices, dods_int16 *b) const;
+template void Vector::value(vector<unsigned int> *indices, dods_uint16 *b) const;
+template void Vector::value(vector<unsigned int> *indices, dods_int32 *b) const;
+template void Vector::value(vector<unsigned int> *indices, dods_uint32 *b) const;
+template void Vector::value(vector<unsigned int> *indices, dods_int64 *b) const;
+template void Vector::value(vector<unsigned int> *indices, dods_uint64 *b) const;
+template void Vector::value(vector<unsigned int> *indices, dods_float32 *b) const;
+template void Vector::value(vector<unsigned int> *indices, dods_float64 *b) const;
+#endif
+
+/** @brief Get a copy of the data held by this variable using the passed subsetIndex vector to identify which values to return. **/
+void Vector::value(vector<unsigned int> *subsetIndex, vector<string> &b) const
+{
+    unsigned long currentIndex;
+
+    if (d_proto->type() == dods_str_c || d_proto->type() == dods_url_c){
+        for(unsigned long i=0; i<subsetIndex->size() ;++i){
+            currentIndex = (*subsetIndex)[i] ;
+            if(currentIndex > (unsigned int)length()){
+                stringstream s;
+                s << "Vector::value() - Subset index[" << i <<  "] = " << currentIndex << " references a value that is " <<
+                        "outside the bounds of the internal storage [ length()= " << length() << " ] name: '" << name() << "'. ";
+                throw Error(s.str());
+            }
+            b[i] = d_str[currentIndex];
+        }
+    }
+}
+
+template <typename T>
+void Vector::value_worker(T *v) const
+{
+    // Only copy if v is not null and the proto's  type matches.
+    // For Enums, use the element type since type == dods_enum_c.
+    if (v && types_match(d_proto->type() == dods_enum_c ? static_cast<D4Enum*>(d_proto)->element_type() : d_proto->type(), v))
+        memcpy(v, d_buf, length() * sizeof(T));
+}
+void Vector::value(dods_byte *b) const    { value_worker(b); }
+void Vector::value(dods_int8 *b) const    { value_worker(b); }
+void Vector::value(dods_int16 *b) const   { value_worker(b); }
+void Vector::value(dods_uint16 *b) const  { value_worker(b); }
+void Vector::value(dods_int32 *b) const   { value_worker(b); }
+void Vector::value(dods_uint32 *b) const  { value_worker(b); }
+void Vector::value(dods_int64 *b) const   { value_worker(b); }
+void Vector::value(dods_uint64 *b) const  { value_worker(b); }
+void Vector::value(dods_float32 *b) const { value_worker(b); }
+void Vector::value(dods_float64 *b) const { value_worker(b); }
+
+#if 0
+template void Vector::value(dods_byte *v) const;
+template void Vector::value(dods_int8 *v) const;
+template void Vector::value(dods_int16 *v) const;
+template void Vector::value(dods_uint16 *v) const;
+template void Vector::value(dods_int32 *v) const;
+template void Vector::value(dods_uint32 *v) const;
+template void Vector::value(dods_int64 *v) const;
+template void Vector::value(dods_uint64 *v) const;
+template void Vector::value(dods_float32 *v) const;
+template void Vector::value(dods_float64 *v) const;
+#endif
+
+
+/** @brief Get a copy of the data held by this variable. */
+void Vector::value(vector<string> &b) const
+{
+    if (d_proto->type() == dods_str_c || d_proto->type() == dods_url_c)
+        b = d_str;
+}
+
+/** Allocate memory and copy data into the new buffer. Return the new
+ buffer's pointer. The caller must delete the storage. */
+void *Vector::value()
+{
+    void *buffer = new char[width(true)];
+
+    memcpy(buffer, d_buf, width(true));
+
+    return buffer;
+}
+//@}
+
+/** @brief Add the BaseType pointer to this constructor type
+ instance.
+
+ Propagate the name of the BaseType instance to this instance. This
+ ensures that variables at any given level of the DDS table have
+ unique names (i.e., that Arrays do not have their default name ""). If
+ <tt>v</tt>'s name is null, then assume that the array \e is named and
+ don't overwrite it with <tt>v</tt>'s null name.
+
+ @note As is the case with Array, this method can be called with a null
+ BaseType pointer.
+
+ @param v The template variable for the array
+ @param p The Part parameter defaults to nil and is ignored by this method.
+ */
+void Vector::add_var(BaseType * v, Part /*p*/)
+{
+#if 0
+	// Why doesn't this work?  tried all 3 variants. jhrg 8/14/13
+	Vector::add_var_nocopy(v->ptr_duplicate(), p);
+	add_var_nocopy(v->ptr_duplicate(), p);
+	add_var_nocopy(v->ptr_duplicate());
+#else
+	// Delete the current template variable
+    if (d_proto) {
+        delete d_proto;
+        d_proto = 0;
+    }
+
+    // if 'v' is null, just set _var to null and exit.
+    if (!v) {
+        d_proto = 0;
+    }
+    else {
+        // Jose Garcia
+        // By getting a copy of this object to be assigned to _var
+        // we let the owner of 'v' to deallocate it as necessary.
+        d_proto = v->ptr_duplicate();
+
+        // If 'v' has a name, use it as the name of the array. If v doesn't have
+        // a name, then make sure to copy the array's name to it
+        // so that software which uses the template's name will still work.
+        if (!v->name().empty())
+            set_name(v->name());
+        else
+            d_proto->set_name(name());
+
+        d_proto->set_parent(this); // Vector --> child
+
+        DBG(cerr << "Vector::add_var: Added variable " << v << " ("
+                << v->name() << " " << v->type_name() << ")" << endl);
+    }
+#endif
+}
+
+void Vector::add_var_nocopy(BaseType * v, Part)
+{
+	// Delete the current template variable
+    if (d_proto) {
+        delete d_proto;
+        d_proto = 0;
+    }
+
+    // if 'v' is null, just set _var to null and exit.
+    if (!v) {
+        d_proto = 0;
+    }
+    else {
+        d_proto = v;
+
+        // If 'v' has a name, use it as the name of the array. If it *is*
+        // empty, then make sure to copy the array's name to the template
+        // so that software which uses the template's name will still work.
+        if (!v->name().empty())
+            set_name(v->name());
+        else
+            d_proto->set_name(name());
+
+        d_proto->set_parent(this); // Vector is the parent; proto is the child
+
+        DBG(cerr << "Vector::add_var_no_copy: Added variable " << v << " ("
+                << v->name() << " " << v->type_name() << ")" << endl);
+    }
+}
+
+bool Vector::check_semantics(string & msg, bool)
+{
+    return BaseType::check_semantics(msg);
+}
+
+/** @brief dumps information about this object
+ *
+ * Displays the pointer value of this instance and information about this
+ * instance.
+ *
+ * @param strm C++ i/o stream to dump the information to
+ * @return void
+ */
+void Vector::dump(ostream &strm) const
+{
+    strm << DapIndent::LMarg << "Vector::dump - (" << (void *) this << ")" << endl;
+    DapIndent::Indent();
+    BaseType::dump(strm);
+    strm << DapIndent::LMarg << "# elements in vector: " << d_length << endl;
+    if (d_proto) {
+        strm << DapIndent::LMarg << "base type:" << endl;
+        DapIndent::Indent();
+        d_proto->dump(strm);
+        DapIndent::UnIndent();
+    }
+    else {
+        strm << DapIndent::LMarg << "base type: not set" << endl;
+    }
+    strm << DapIndent::LMarg << "vector contents:" << endl;
+    DapIndent::Indent();
+    for (unsigned i = 0; i < d_compound_buf.size(); ++i) {
+        if (d_compound_buf[i])
+            d_compound_buf[i]->dump(strm);
+        else
+            strm << DapIndent::LMarg << "vec[" << i << "] is null" << endl;
+    }
+    DapIndent::UnIndent();
+    strm << DapIndent::LMarg << "strings:" << endl;
+    DapIndent::Indent();
+    for (unsigned i = 0; i < d_str.size(); i++) {
+        strm << DapIndent::LMarg << d_str[i] << endl;
+    }
+    DapIndent::UnIndent();
+    if (d_buf) {
+        switch (d_proto != 0 ? d_proto->type() : 0) {
+            case dods_byte_c:
+            case dods_char_c:
+                strm << DapIndent::LMarg << "_buf: ";
+                strm.write(d_buf, d_length);
+                strm << endl;
+                break;
+
+            case 0:
+            default:
+                strm << DapIndent::LMarg << "_buf: " << (void *) d_buf << endl;
+                break;
+        }
+    }
+    else {
+        strm << DapIndent::LMarg << "_buf: EMPTY" << endl;
+    }
+
+    DapIndent::UnIndent();
+}
+
+} // namespace libdap
+
diff --git a/Vector.h b/Vector.h
new file mode 100644
index 0000000..74ace0b
--- /dev/null
+++ b/Vector.h
@@ -0,0 +1,282 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1995-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// This is the interface definition file for the abstract class
+// Vector. Vector is the parent class for List and Array.
+
+#ifndef _vector_h
+#define _vector_h 1
+
+#ifndef _basetype_h
+#include "BaseType.h"
+#endif
+
+#ifndef _dds_h
+#include "DDS.h"
+#endif
+
+#ifndef constraint_evaluator_h
+#include "ConstraintEvaluator.h"
+#endif
+
+class Crc32;
+
+namespace libdap
+{
+
+/** Holds a one-dimensional array of DAP2 data types.  This class
+    takes two forms, depending on whether the elements of the vector
+    are themselves simple or compound objects. This class contains
+    common functionality for the List and Array classes, and should
+    rarely be used directly.
+
+    When each element of the class is a simple data type, the Vector
+    is implemented as a simple array of C types, rather than as an
+    array of BaseType data types.  A single private ``template''
+    BaseType instance (<tt>_var</tt>) is used to hold information in common
+    to all the members of the array.  The template is also used as a
+    container to pass values back and forth to an application
+    program, as in <tt>var()</tt>.
+
+    If the elements of the vector are themselves compound data
+    types, the array is stored as a vector of BaseType pointers (see
+    the libdap class <b>BaseTypePtrVec</b>). The template is still used to
+    hold information in common to all the members of the array, but
+    is not used to pass information to and from the application
+    program.
+
+    @brief Holds a one-dimensional collection of DAP2 data types.
+    @see BaseType
+    @see Array
+*/
+class Vector: public BaseType
+{
+private:
+    int d_length;  		// number of elements in the vector
+    BaseType *d_proto;  // element prototype for the Vector
+
+    // _buf was a pointer to void; delete[] complained. 6/4/2001 jhrg
+    char *d_buf;   		// storage for cardinal data
+    vector<string> d_str;		// special storage for strings. jhrg 2/11/05
+    vector<BaseType *> d_compound_buf; 	// storage for data in compound types (e.g., Structure)
+
+    // the number of elements we have allocated memory to store.
+    // This should be either the sizeof(buf)/width(bool constrained = false) for cardinal data
+    // or the capacity of d_str for strings or capacity of _vec.
+    unsigned int d_capacity;
+
+    friend class MarshallerTest;
+
+    /*
+     * Made these template methods private because they can't be
+     * overridden anyways (because c++...) - ndp 08/14/2015
+     *
+     */
+
+    template <typename T> void value_worker(T *v) const;
+    template <typename T> void value_worker(vector<unsigned int> *indices, T *b) const;
+
+    template <typename T> bool set_value_worker(T *v, int sz);
+    template <typename T> bool set_value_worker(vector<T> &v, int sz);
+
+protected:
+    // This function copies the private members of Vector.
+    void m_duplicate(const Vector &v);
+
+    bool m_is_cardinal_type() const;
+    unsigned int m_create_cardinal_data_buffer_for_type(unsigned int numEltsOfType);
+    void m_delete_cardinal_data_buffer();
+
+    template <class CardType> void m_set_cardinal_values_internal(const CardType* fromArray, int numElts);
+
+public:
+    Vector(const string &n, BaseType *v, const Type &t, bool is_dap4 = false);
+    Vector(const string &n, const string &d, BaseType *v, const Type &t, bool is_dap4 = false);
+    Vector(const Vector &rhs);
+
+    virtual ~Vector();
+
+    Vector &operator=(const Vector &rhs);
+    virtual BaseType *ptr_duplicate() = 0;
+
+    /**
+     * Provide access to internal data by reference. Callers cannot delete this
+     * but can pass them to other methods.
+     *
+     * @note Added so that the NCML handler can code some optimizations in its
+     * specialized versions of Array. jhrg 8/14/15
+     * @return A pointer to the data buffer for Vectors/Arrays of the cardinal types.
+     */
+    char *get_buf() {
+        return d_buf;
+    }
+
+    /**
+     * Provide access to internal string data by reference. Callers cannot delete this
+     * but can pass them to other methods.
+     *
+     * @return A reference to a vector of strings
+     */
+    vector<string> &get_str() {
+        return d_str;
+    }
+
+    /**
+     * Provide access to internal data by reference. Callers cannot delete this
+     * but can pass them to other methods.
+     *
+     * @return A reference to a vector of BaseType pointers. Treat with care; never
+     * delete these!
+     */
+    vector<BaseType*> &get_compound_buf() {
+        return d_compound_buf;
+    }
+
+#if 0
+    virtual bool is_dap2_only_type();
+#endif
+
+    virtual BaseType *prototype() const { return d_proto; }
+
+    virtual void set_name(const std::string& name);
+
+    virtual int element_count(bool leaves);
+
+    virtual void set_send_p(bool state);
+
+    virtual void set_read_p(bool state);
+
+    virtual unsigned int width(bool constrained = false) const;
+
+    virtual int length() const;
+
+    virtual void set_length(int l);
+
+    // DAP2
+    virtual void intern_data(ConstraintEvaluator &eval, DDS &dds);
+    virtual bool serialize(ConstraintEvaluator &eval, DDS &dds, Marshaller &m, bool ce_eval = true);
+#if 0
+    virtual bool serialize_no_release(ConstraintEvaluator &eval, DDS &dds, Marshaller &m, bool ce_eval = true);
+#endif
+    virtual bool deserialize(UnMarshaller &um, DDS *dds, bool reuse = false);
+
+    // DAP4
+    virtual void compute_checksum(Crc32 &checksum);
+    virtual void intern_data(/*Crc32 &checksum*/);
+    virtual void serialize(D4StreamMarshaller &m, DMR &dmr, bool filter = false);
+#if 0
+    virtual void serialize_no_release(D4StreamMarshaller &m, DMR &dmr, bool filter = false);
+#endif
+    virtual void deserialize(D4StreamUnMarshaller &um, DMR &dmr);
+
+    virtual unsigned int val2buf(void *val, bool reuse = false);
+    virtual unsigned int buf2val(void **val);
+
+    void set_vec(unsigned int i, BaseType *val);
+    void set_vec_nocopy(unsigned int i, BaseType * val);
+
+    void vec_resize(int l);
+
+    virtual void clear_local_data();
+
+    virtual unsigned int get_value_capacity() const;
+    virtual void reserve_value_capacity(unsigned int numElements);
+    virtual void reserve_value_capacity();
+
+    virtual unsigned int set_value_slice_from_row_major_vector(const Vector& rowMajorData, unsigned int startElement);
+
+
+    virtual bool set_value(dods_byte *val, int sz);
+    virtual bool set_value(dods_int8 *val, int sz);
+    virtual bool set_value(dods_int16 *val, int sz);
+    virtual bool set_value(dods_uint16 *val, int sz);
+    virtual bool set_value(dods_int32 *val, int sz);
+    virtual bool set_value(dods_uint32 *val, int sz);
+    virtual bool set_value(dods_int64 *val, int sz);
+    virtual bool set_value(dods_uint64 *val, int sz);
+    virtual bool set_value(dods_float32 *val, int sz);
+    virtual bool set_value(dods_float64 *val, int sz);
+    virtual bool set_value(string *val, int sz);
+
+
+    virtual bool set_value(vector<dods_byte> &val, int sz);
+    virtual bool set_value(vector<dods_int8> &val, int sz);
+    virtual bool set_value(vector<dods_int16> &val, int sz);
+    virtual bool set_value(vector<dods_uint16> &val, int sz);
+    virtual bool set_value(vector<dods_int32> &val, int sz);
+    virtual bool set_value(vector<dods_uint32> &val, int sz);
+    virtual bool set_value(vector<dods_int64> &val, int sz);
+    virtual bool set_value(vector<dods_uint64> &val, int sz);
+    virtual bool set_value(vector<dods_float32> &val, int sz);
+    virtual bool set_value(vector<dods_float64> &val, int sz);
+    virtual bool set_value(vector<string> &val, int sz);
+
+    virtual void value(dods_byte *b) const;
+    virtual void value(dods_int8 *b) const;
+    virtual void value(dods_int16 *b) const;
+    virtual void value(dods_uint16 *b) const;
+    virtual void value(dods_int32 *b) const;
+    virtual void value(dods_uint32 *b) const;
+    virtual void value(dods_int64 *b) const;
+    virtual void value(dods_uint64 *b) const;
+    virtual void value(dods_float32 *b) const;
+    virtual void value(dods_float64 *b) const;
+    virtual void value(vector<string> &b) const;
+
+    virtual void value(vector<unsigned int> *indices, dods_byte *b) const;
+    virtual void value(vector<unsigned int> *indices, dods_int8 *b) const;
+    virtual void value(vector<unsigned int> *indices, dods_int16 *b) const;
+    virtual void value(vector<unsigned int> *indices, dods_uint16 *b) const;
+    virtual void value(vector<unsigned int> *indices, dods_int32 *b) const;
+    virtual void value(vector<unsigned int> *indices, dods_uint32 *b) const;
+    virtual void value(vector<unsigned int> *indices, dods_int64 *b) const;
+    virtual void value(vector<unsigned int> *indices, dods_uint64 *b) const;
+    virtual void value(vector<unsigned int> *indices, dods_float32 *b) const;
+    virtual void value(vector<unsigned int> *indices, dods_float64 *b) const;
+    virtual void value(vector<unsigned int> *index, vector<string> &b) const;
+
+    virtual void *value();
+
+    virtual BaseType *var(const string &name = "", bool exact_match = true, btp_stack *s = 0);
+    virtual BaseType *var(const string &name, btp_stack &s);
+    virtual BaseType *var(unsigned int i);
+
+    virtual void add_var(BaseType *v, Part p = nil);
+    virtual void add_var_nocopy(BaseType *v, Part p = nil);
+
+    virtual bool check_semantics(string &msg, bool all = false);
+
+    virtual void dump(ostream &strm) const ;
+};
+
+} // namespace libdap
+
+#endif /* _vector_h */
diff --git a/XDRFileMarshaller.cc b/XDRFileMarshaller.cc
new file mode 100644
index 0000000..336b3cf
--- /dev/null
+++ b/XDRFileMarshaller.cc
@@ -0,0 +1,189 @@
+// XDRFileMarshaller.cc
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: Patrick West <pwest@ucar.edu>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1994-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      pwest       Patrick West <pwest@ucar.edu>
+
+#include "config.h"
+
+#include "XDRFileMarshaller.h"
+
+#include "Byte.h"
+#include "Int16.h"
+#include "UInt16.h"
+#include "Int32.h"
+#include "UInt32.h"
+#include "Float32.h"
+#include "Float64.h"
+#include "Str.h"
+#include "Url.h"
+#include "Array.h"
+#include "Structure.h"
+#include "Sequence.h"
+#include "Grid.h"
+
+#include "util.h"
+#include "InternalErr.h"
+
+namespace libdap {
+
+XDRFileMarshaller::XDRFileMarshaller(FILE *out) :
+    _sink(0)//, d_out(out)
+{
+    _sink = new_xdrstdio(out, XDR_ENCODE);
+}
+
+XDRFileMarshaller::XDRFileMarshaller() :
+    Marshaller(), _sink(0)//, d_out(0)
+{
+    throw InternalErr( __FILE__, __LINE__, "Default constructor not implemented.");
+}
+
+XDRFileMarshaller::XDRFileMarshaller(const XDRFileMarshaller &m) :
+    Marshaller(m), _sink(0)//, d_out(0)
+{
+    throw InternalErr( __FILE__, __LINE__, "Copy constructor not implemented.");
+}
+
+XDRFileMarshaller &
+XDRFileMarshaller::operator=(const XDRFileMarshaller &)
+{
+    throw InternalErr( __FILE__, __LINE__, "Copy operator not implemented.");
+
+    return *this;
+}
+
+XDRFileMarshaller::~XDRFileMarshaller()
+{
+    delete_xdrstdio(_sink);
+}
+
+void XDRFileMarshaller::put_byte(dods_byte val)
+{
+    if (!xdr_char(_sink, (char *) &val))
+        throw Error(
+            "Network I/O Error. Could not send byte data.\nThis may be due to a bug in DODS, on the server or a\nproblem with the network connection.");
+}
+
+void XDRFileMarshaller::put_int16(dods_int16 val)
+{
+    if (!XDR_INT16(_sink, &val))
+        throw Error(
+            "Network I/O Error. Could not send int 16 data.\nThis may be due to a bug in libdap, on the server or a\nproblem with the network connection.");
+}
+
+void XDRFileMarshaller::put_int32(dods_int32 val)
+{
+    if (!XDR_INT32(_sink, &val))
+        throw Error(
+            "Network I/O Error. Could not read int 32 data.\nThis may be due to a bug in libdap, on the server or a\nproblem with the network connection.");
+}
+
+void XDRFileMarshaller::put_float32(dods_float32 val)
+{
+    if (!xdr_float(_sink, &val))
+        throw Error(
+            "Network I/O Error. Could not send float 32 data.\nThis may be due to a bug in libdap, on the server or a\nproblem with the network connection.");
+}
+
+void XDRFileMarshaller::put_float64(dods_float64 val)
+{
+    if (!xdr_double(_sink, &val))
+        throw Error(
+            "Network I/O Error. Could not send float 64 data.\nThis may be due to a bug in libdap, on the server or a\nproblem with the network connection.");
+}
+
+void XDRFileMarshaller::put_uint16(dods_uint16 val)
+{
+    if (!XDR_UINT16(_sink, &val))
+        throw Error("Network I/O Error. Could not send uint 16 data.");
+}
+
+void XDRFileMarshaller::put_uint32(dods_uint32 val)
+{
+    if (!XDR_UINT32(_sink, &val))
+        throw Error("Network I/O Error. Could not send uint 32 data.");
+}
+
+void XDRFileMarshaller::put_str(const string &val)
+{
+    const char *out_tmp = val.c_str();
+
+    if (!xdr_string(_sink, (char **) &out_tmp, max_str_len))
+        throw Error("Network I/O Error. Could not send string data.");
+}
+
+void XDRFileMarshaller::put_url(const string &val)
+{
+    put_str(val);
+}
+
+void XDRFileMarshaller::put_opaque(char *val, unsigned int len)
+{
+    if (!xdr_opaque(_sink, val, len))
+        throw Error("Network I/O Error. Could not send opaque data.");
+}
+
+void XDRFileMarshaller::put_int(int val)
+{
+    if (!xdr_int(_sink, &val))
+        throw Error("Network I/O Error(1).");
+}
+
+void XDRFileMarshaller::put_vector(char *val, int num, Vector &)
+{
+    if (!val) throw InternalErr(__FILE__, __LINE__, "Buffer pointer is not set.");
+
+    put_int(num);
+
+    if (!xdr_bytes(_sink, (char **) &val, (unsigned int *) &num, DODS_MAX_ARRAY)) {
+        throw Error("Network I/O Error(2).");
+    }
+}
+
+void XDRFileMarshaller::put_vector(char *val, int num, int width, Vector &vec)
+{
+    if (!val) throw InternalErr(__FILE__, __LINE__, "Buffer pointer is not set.");
+
+    put_int(num);
+
+    BaseType *var = vec.var();
+    if (!xdr_array(_sink, (char **) &val, (unsigned int *) &num, DODS_MAX_ARRAY, width,
+        XDRUtils::xdr_coder(var->type()))) {
+        throw Error("Network I/O Error(2).");
+    }
+}
+
+void XDRFileMarshaller::dump(ostream &strm) const
+{
+    strm << DapIndent::LMarg << "XDRFileMarshaller::dump - (" << (void *) this << ")" << endl;
+}
+
+} // namespace libdap
+
diff --git a/XDRFileMarshaller.h b/XDRFileMarshaller.h
new file mode 100644
index 0000000..779add0
--- /dev/null
+++ b/XDRFileMarshaller.h
@@ -0,0 +1,85 @@
+// XDRFileMarshaller.h
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: Patrick West <pwest@ucar.edu>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1994-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      pwest       Patrick West <pwest@ucar.edu>
+
+#ifndef I_XDRFileMarshaller_h
+#define I_XDRFileMarshaller_h 1
+
+#include "Marshaller.h"
+#include "XDRUtils.h"
+#if 0
+#include "Array.h"
+#include "Vector.h"
+#endif
+
+namespace libdap {
+
+/** @brief marshaller that knows how to marshall/serialize dap data objects
+ * to a file using XDR
+ */
+class XDRFileMarshaller: public Marshaller {
+private:
+    XDR * _sink;
+
+    XDRFileMarshaller();
+    XDRFileMarshaller(const XDRFileMarshaller &m);
+    XDRFileMarshaller & operator=(const XDRFileMarshaller &);
+public:
+    XDRFileMarshaller(FILE *out);
+    virtual ~XDRFileMarshaller();
+
+    virtual void put_byte(dods_byte val);
+
+    virtual void put_int16(dods_int16 val);
+    virtual void put_int32(dods_int32 val);
+
+    virtual void put_float32(dods_float32 val);
+    virtual void put_float64(dods_float64 val);
+
+    virtual void put_uint16(dods_uint16 val);
+    virtual void put_uint32(dods_uint32 val);
+
+    virtual void put_str(const string &val);
+    virtual void put_url(const string &val);
+
+    virtual void put_opaque(char *val, unsigned int len);
+    virtual void put_int(int val);
+
+    virtual void put_vector(char *val, int num, Vector &vec);
+    virtual void put_vector(char *val, int num, int width, Vector &vec);
+
+    virtual void dump(ostream &strm) const;
+};
+
+} // namespace libdap
+
+#endif // I_XDRFileMarshaller_h
+
diff --git a/XDRFileUnMarshaller.cc b/XDRFileUnMarshaller.cc
new file mode 100644
index 0000000..1bf1bfd
--- /dev/null
+++ b/XDRFileUnMarshaller.cc
@@ -0,0 +1,201 @@
+// XDRFileUnMarshaller.cc
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: Patrick West <pwest@ucar.edu>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1994-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      pwest       Patrick West <pwest@ucar.edu>
+
+#include "config.h"
+
+#include "XDRFileUnMarshaller.h"
+
+#include "Byte.h"
+#include "Int16.h"
+#include "UInt16.h"
+#include "Int32.h"
+#include "UInt32.h"
+#include "Float32.h"
+#include "Float64.h"
+#include "Str.h"
+#include "Url.h"
+#include "Array.h"
+#include "Structure.h"
+#include "Sequence.h"
+#include "Grid.h"
+#if  0
+#include "Vector.h"
+#endif
+#include "util.h"
+#include "InternalErr.h"
+
+namespace libdap {
+
+XDRFileUnMarshaller::XDRFileUnMarshaller( FILE *out )
+    : _source( 0 )
+{
+    _source = new_xdrstdio( out, XDR_DECODE ) ;
+}
+
+XDRFileUnMarshaller::XDRFileUnMarshaller()
+    : UnMarshaller(), _source( 0 )
+{
+    throw InternalErr( __FILE__, __LINE__, "Default constructor not implemented." ) ;
+}
+
+XDRFileUnMarshaller::XDRFileUnMarshaller( const XDRFileUnMarshaller &um )
+    : UnMarshaller( um ), _source( 0 )
+{
+    throw InternalErr( __FILE__, __LINE__, "Copy constructor not implemented." ) ;
+}
+
+XDRFileUnMarshaller &
+XDRFileUnMarshaller::operator=( const XDRFileUnMarshaller & )
+{
+    throw InternalErr( __FILE__, __LINE__, "Copy operator not implemented." ) ;
+
+    return *this ;
+}
+
+XDRFileUnMarshaller::~XDRFileUnMarshaller( )
+{
+    // Some static code analysis tools complain that delete_xdrstdio
+    // does not close the FILE* it holds, but that's not true with
+    // modern XDR libraries. Don't try to close that FILE*. jhrg 8/27/13
+
+    delete_xdrstdio( _source ) ;
+}
+
+void
+XDRFileUnMarshaller::get_byte( dods_byte &val )
+{
+    if( !xdr_char( _source, (char *)&val ) )
+        throw Error("Network I/O Error. Could not read byte data.");
+}
+
+void
+XDRFileUnMarshaller::get_int16( dods_int16 &val )
+{
+    if( !XDR_INT16( _source, &val ) )
+        throw Error("Network I/O Error. Could not read int 16 data.");
+}
+
+void
+XDRFileUnMarshaller::get_int32( dods_int32 &val )
+{
+    if( !XDR_INT32( _source, &val ) )
+        throw Error("Network I/O Error. Could not read int 32 data.");
+}
+
+void
+XDRFileUnMarshaller::get_float32( dods_float32 &val )
+{
+    if( !xdr_float( _source, &val ) )
+        throw Error("Network I/O Error. Could not read float 32 data.");
+}
+
+void
+XDRFileUnMarshaller::get_float64( dods_float64 &val )
+{
+    if( !xdr_double( _source, &val ) )
+        throw Error("Network I/O Error.Could not read float 64 data.");
+}
+
+void
+XDRFileUnMarshaller::get_uint16( dods_uint16 &val )
+{
+    if( !XDR_UINT16( _source, &val ) )
+        throw Error("Network I/O Error. Could not read uint 16 data.");
+}
+
+void
+XDRFileUnMarshaller::get_uint32( dods_uint32 &val )
+{
+    if( !XDR_UINT32( _source, &val ) )
+        throw Error("Network I/O Error. Could not read uint 32 data.");
+}
+
+void
+XDRFileUnMarshaller::get_str( string &val )
+{
+    char *in_tmp = NULL ;
+
+    if( !xdr_string( _source, &in_tmp, max_str_len ) )
+        throw Error("Network I/O Error. Could not read string data.");
+
+    val = in_tmp ;
+
+    free( in_tmp ) ;
+}
+
+void
+XDRFileUnMarshaller::get_url( string &val )
+{
+    get_str( val ) ;
+}
+
+void
+XDRFileUnMarshaller::get_opaque( char *val, unsigned int len )
+{
+    xdr_opaque( _source, val, len ) ;
+}
+
+void
+XDRFileUnMarshaller::get_int( int &val )
+{
+    if( !xdr_int( _source, &val ) )
+	throw Error("Network I/O Error(1). This may be due to a bug in libdap or a\nproblem with the network connection.");
+}
+
+void
+XDRFileUnMarshaller::get_vector( char **val, unsigned int &num, Vector & )
+{
+    if( !xdr_bytes( _source, val, &num, DODS_MAX_ARRAY) )
+	throw Error("Network I/O error (1).");
+}
+
+void
+XDRFileUnMarshaller::get_vector( char **val, unsigned int &num, int width, Vector &vec )
+{
+    BaseType *var = vec.var() ;
+
+    if( !xdr_array( _source, val, &num, DODS_MAX_ARRAY, width,
+		    XDRUtils::xdr_coder( var->type() ) ) )
+    {
+	throw Error("Network I/O error (2).");
+    }
+}
+
+void
+XDRFileUnMarshaller::dump(ostream &strm) const
+{
+    strm << DapIndent::LMarg << "XDRFileUnMarshaller::dump - ("
+         << (void *)this << ")" << endl ;
+}
+
+} // namespace libdap
+
diff --git a/XDRFileUnMarshaller.h b/XDRFileUnMarshaller.h
new file mode 100644
index 0000000..1ffd749
--- /dev/null
+++ b/XDRFileUnMarshaller.h
@@ -0,0 +1,85 @@
+// XDRFileUnMarshaller.h
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: Patrick West <pwest@ucar.edu>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1994-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      pwest       Patrick West <pwest@ucar.edu>
+
+#ifndef I_XDRFileUnMarshaller_h
+#define I_XDRFileUnMarshaller_h 1
+
+#include "UnMarshaller.h"
+#include "XDRUtils.h"
+
+namespace libdap
+{
+
+/** @brief unmarshaller that knows how to unmarshall/deserialize dap objects
+ * using XDR from a file
+ */
+class XDRFileUnMarshaller : public UnMarshaller
+{
+private:
+    XDR *			_source ;
+
+    				XDRFileUnMarshaller() ;
+    				XDRFileUnMarshaller( const XDRFileUnMarshaller &um ) ;
+    XDRFileUnMarshaller &	operator=( const XDRFileUnMarshaller & ) ;
+public:
+    				XDRFileUnMarshaller( FILE *out ) ;
+    virtual			~XDRFileUnMarshaller() ;
+
+    virtual void		get_byte( dods_byte &val ) ;
+
+    virtual void		get_int16( dods_int16 &val ) ;
+    virtual void		get_int32( dods_int32 &val ) ;
+
+    virtual void		get_float32( dods_float32 &val ) ;
+    virtual void		get_float64( dods_float64 &val ) ;
+
+    virtual void		get_uint16( dods_uint16 &val ) ;
+    virtual void		get_uint32( dods_uint32 &val ) ;
+
+    virtual void		get_str( string &val ) ;
+    virtual void		get_url( string &val ) ;
+
+    virtual void		get_opaque( char *val, unsigned int len ) ;
+    virtual void		get_int( int &val ) ;
+
+    virtual void		get_vector( char **val, unsigned int &num,
+					    Vector &vec ) ;
+    virtual void		get_vector( char **val, unsigned int &num,
+					    int width, Vector &vec ) ;
+
+    virtual void		dump(ostream &strm) const ;
+} ;
+
+} // namespace libdap
+
+#endif // I_XDRFileUnMarshaller_h
+
diff --git a/XDRStreamMarshaller.cc b/XDRStreamMarshaller.cc
new file mode 100644
index 0000000..3da6503
--- /dev/null
+++ b/XDRStreamMarshaller.cc
@@ -0,0 +1,624 @@
+// XDRStreamMarshaller.cc
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003,2016 OPeNDAP, Inc.
+// Author: Patrick West <pwest@ucar.edu>
+//         James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1994-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      pwest       Patrick West <pwest@ucar.edu>
+
+
+#include "config.h"
+
+#ifdef HAVE_PTHREAD_H
+#include <pthread.h>
+#endif
+
+#include <cassert>
+
+#include <iostream>
+#include <sstream>
+#include <iomanip>
+
+// #define DODS_DEBUG
+
+#include "XDRStreamMarshaller.h"
+#ifdef USE_POSIX_THREADS
+#include "MarshallerThread.h"
+#endif
+#include "Vector.h"
+#include "XDRUtils.h"
+#include "util.h"
+
+#include "debug.h"
+
+using namespace std;
+
+// Build this code so it does not use pthreads to write some kinds of
+// data (see the put_vector() and put_vector_part() methods) in a child thread.
+// #undef USE_POSIX_THREADS
+
+namespace libdap {
+
+char *XDRStreamMarshaller::d_buf = 0;
+static const int XDR_DAP_BUFF_SIZE=256;
+
+
+/** Build an instance of XDRStreamMarshaller. Bind the C++ stream out to this
+ * instance. If the checksum parameter is true, initialize a checksum buffer
+ * and enable the use of the reset_checksum() and get_checksum() methods.
+ *
+ * @param out Write to this stream object.
+ * @param checksum If true, compute checksums. False by default
+ * @param write_data If true, write data values. True by default
+ */
+XDRStreamMarshaller::XDRStreamMarshaller(ostream &out) :
+    d_out(out), d_partial_put_byte_count(0), tm(0)
+{
+    if (!d_buf) d_buf = (char *) malloc(XDR_DAP_BUFF_SIZE);
+    if (!d_buf) throw Error(internal_error, "Failed to allocate memory for data serialization.");
+
+    xdrmem_create(&d_sink, d_buf, XDR_DAP_BUFF_SIZE, XDR_ENCODE);
+
+#ifdef USE_POSIX_THREADS
+    tm = new MarshallerThread;
+#endif
+}
+
+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);
+}
+
+void XDRStreamMarshaller::put_byte(dods_byte val)
+{
+     if (!xdr_setpos(&d_sink, 0))
+        throw Error("Network I/O Error. Could not send byte data - unable to set stream position.");
+
+    if (!xdr_char(&d_sink, (char *) &val))
+        throw Error(
+            "Network I/O Error. Could not send byte data.");
+
+    unsigned int bytes_written = xdr_getpos(&d_sink);
+    if (!bytes_written)
+        throw Error(
+            "Network I/O Error. Could not send byte data - unable to get stream position.");
+
+#ifdef USE_POSIX_THREADS
+    Locker lock(tm->get_mutex(), tm->get_cond(), tm->get_child_thread_count());
+#endif
+
+    d_out.write(d_buf, bytes_written);
+}
+
+void XDRStreamMarshaller::put_int16(dods_int16 val)
+{
+    if (!xdr_setpos(&d_sink, 0))
+        throw Error(
+            "Network I/O Error. Could not send int 16 data - unable to set stream position.");
+
+    if (!XDR_INT16(&d_sink, &val))
+        throw Error(
+            "Network I/O Error. Could not send int 16 data.");
+
+    unsigned int bytes_written = xdr_getpos(&d_sink);
+    if (!bytes_written)
+        throw Error(
+            "Network I/O Error. Could not send int 16 data - unable to get stream position.");
+
+#ifdef USE_POSIX_THREADS
+    Locker lock(tm->get_mutex(), tm->get_cond(), tm->get_child_thread_count());
+#endif
+
+    d_out.write(d_buf, bytes_written);
+}
+
+void XDRStreamMarshaller::put_int32(dods_int32 val)
+{
+    if (!xdr_setpos(&d_sink, 0))
+        throw Error(
+            "Network I/O Error. Could not send int 32 data - unable to set stream position.");
+
+    if (!XDR_INT32(&d_sink, &val))
+        throw Error(
+            "Network I/O Error. Culd not read int 32 data.");
+
+    unsigned int bytes_written = xdr_getpos(&d_sink);
+    if (!bytes_written)
+        throw Error(
+            "Network I/O Error. Could not send int 32 data - unable to get stream position.");
+
+#ifdef USE_POSIX_THREADS
+    Locker lock(tm->get_mutex(), tm->get_cond(), tm->get_child_thread_count());
+#endif
+
+    d_out.write(d_buf, bytes_written);
+}
+
+void XDRStreamMarshaller::put_float32(dods_float32 val)
+{
+    if (!xdr_setpos(&d_sink, 0))
+        throw Error(
+            "Network I/O Error. Could not send float 32 data - unable to set stream position.");
+
+    if (!xdr_float(&d_sink, &val))
+        throw Error(
+            "Network I/O Error. Could not send float 32 data.");
+
+    unsigned int bytes_written = xdr_getpos(&d_sink);
+    if (!bytes_written)
+        throw Error(
+            "Network I/O Error. Could not send float 32 data - unable to get stream position.");
+
+#ifdef USE_POSIX_THREADS
+    Locker lock(tm->get_mutex(), tm->get_cond(), tm->get_child_thread_count());
+#endif
+
+    d_out.write(d_buf, bytes_written);
+}
+
+void XDRStreamMarshaller::put_float64(dods_float64 val)
+{
+    if (!xdr_setpos(&d_sink, 0))
+        throw Error(
+            "Network I/O Error. Could not send float 64 data - unable to set stream position.");
+
+    if (!xdr_double(&d_sink, &val))
+        throw Error(
+            "Network I/O Error. Could not send float 64 data.");
+
+    unsigned int bytes_written = xdr_getpos(&d_sink);
+    if (!bytes_written)
+        throw Error(
+            "Network I/O Error. Could not send float 64 data - unable to get stream position.");
+
+#ifdef USE_POSIX_THREADS
+    Locker lock(tm->get_mutex(), tm->get_cond(), tm->get_child_thread_count());
+#endif
+
+    d_out.write(d_buf, bytes_written);
+}
+
+void XDRStreamMarshaller::put_uint16(dods_uint16 val)
+{
+    if (!xdr_setpos(&d_sink, 0))
+        throw Error(
+            "Network I/O Error. Could not send uint 16 data - unable to set stream position.");
+
+    if (!XDR_UINT16(&d_sink, &val))
+        throw Error(
+            "Network I/O Error. Could not send uint 16 data.");
+
+    unsigned int bytes_written = xdr_getpos(&d_sink);
+    if (!bytes_written)
+        throw Error(
+            "Network I/O Error. Could not send uint 16 data - unable to get stream position.");
+
+#ifdef USE_POSIX_THREADS
+    Locker lock(tm->get_mutex(), tm->get_cond(), tm->get_child_thread_count());
+#endif
+
+    d_out.write(d_buf, bytes_written);
+}
+
+void XDRStreamMarshaller::put_uint32(dods_uint32 val)
+{
+    if (!xdr_setpos(&d_sink, 0))
+        throw Error(
+            "Network I/O Error. Could not send uint 32 data - unable to set stream position.");
+
+    if (!XDR_UINT32(&d_sink, &val))
+        throw Error(
+            "Network I/O Error. Could not send uint 32 data.");
+
+    unsigned int bytes_written = xdr_getpos(&d_sink);
+    if (!bytes_written)
+        throw Error(
+            "Network I/O Error. Could not send uint 32 data - unable to get stream position.");
+
+#ifdef USE_POSIX_THREADS
+    Locker lock(tm->get_mutex(), tm->get_cond(), tm->get_child_thread_count());
+#endif
+
+    d_out.write(d_buf, bytes_written);
+}
+
+void XDRStreamMarshaller::put_str(const string &val)
+{
+    int size = val.length() + 8;
+
+    XDR str_sink;
+    vector<char> str_buf(size);
+
+    try {
+        xdrmem_create(&str_sink, &str_buf[0], size, XDR_ENCODE);
+
+        if (!xdr_setpos(&str_sink, 0))
+            throw Error(
+                "Network I/O Error. Could not send string data - unable to set stream position.");
+
+        const char *out_tmp = val.c_str();
+        if (!xdr_string(&str_sink, (char **) &out_tmp, size))
+            throw Error(
+                "Network I/O Error. Could not send string data.");
+
+        unsigned int bytes_written = xdr_getpos(&str_sink);
+        if (!bytes_written)
+            throw Error(
+                "Network I/O Error. Could not send string data - unable to get stream position.");
+
+#ifdef USE_POSIX_THREADS
+        Locker lock(tm->get_mutex(), tm->get_cond(), tm->get_child_thread_count());
+#endif
+
+        d_out.write(&str_buf[0], bytes_written);
+
+        xdr_destroy(&str_sink);
+    }
+    catch (...) {
+        xdr_destroy(&str_sink);
+        throw;
+    }
+}
+
+void XDRStreamMarshaller::put_url(const string &val)
+{
+    put_str(val);
+}
+
+void XDRStreamMarshaller::put_opaque(char *val, unsigned int len)
+{
+    if (len > XDR_DAP_BUFF_SIZE)
+        throw Error("Network I/O Error. Could not send opaque data - length of opaque data larger than allowed");
+
+    if (!xdr_setpos(&d_sink, 0))
+        throw Error(
+            "Network I/O Error. Could not send opaque data - unable to set stream position.");
+
+    if (!xdr_opaque(&d_sink, val, len))
+        throw Error(
+            "Network I/O Error. Could not send opaque data.");
+
+    unsigned int bytes_written = xdr_getpos(&d_sink);
+    if (!bytes_written)
+        throw Error(
+            "Network I/O Error. Could not send opaque data - unable to get stream position.");
+
+#ifdef USE_POSIX_THREADS
+    Locker lock(tm->get_mutex(), tm->get_cond(), tm->get_child_thread_count());
+#endif
+
+    d_out.write(d_buf, bytes_written);
+}
+
+void XDRStreamMarshaller::put_int(int val)
+{
+    if (!xdr_setpos(&d_sink, 0))
+        throw Error(
+            "Network I/O Error. Could not send int data - unable to set stream position.");
+
+    if (!xdr_int(&d_sink, &val))
+        throw Error(
+            "Network I/O Error(1). Could not send int data.");
+
+    unsigned int bytes_written = xdr_getpos(&d_sink);
+    if (!bytes_written)
+        throw Error(
+            "Network I/O Error. Could not send int data - unable to get stream position.");
+
+#ifdef USE_POSIX_THREADS
+    Locker lock(tm->get_mutex(), tm->get_cond(), tm->get_child_thread_count());
+#endif
+
+    d_out.write(d_buf, bytes_written);
+}
+
+void XDRStreamMarshaller::put_vector(char *val, int num, int width, Vector &vec)
+{
+    put_vector(val, num, width, vec.var()->type());
+}
+
+
+/**
+ * Prepare to send a single array/vector using a series of 'put' calls.
+ *
+ * @param num The number of elements in the Array/Vector
+ * @see put_vector_part()
+ * @see put_vector_end()
+ */
+void XDRStreamMarshaller::put_vector_start(int num)
+{
+    put_int(num);
+    put_int(num);
+
+    d_partial_put_byte_count = 0;
+}
+
+/**
+ * Close a vector when its values are written using put_vector_part().
+ *
+ * @see put_vector_start()
+ * @see put_vector_part()
+ */
+void XDRStreamMarshaller::put_vector_end()
+{
+#ifdef USE_POSIX_THREADS
+    Locker lock(tm->get_mutex(), tm->get_cond(), tm->get_child_thread_count());
+#endif
+
+    // Compute the trailing (padding) bytes
+
+    // Note that the XDR standard pads values to 4 byte boundaries.
+    //unsigned int pad = (d_partial_put_byte_count % 4) == 0 ? 0: 4 - (d_partial_put_byte_count % 4);
+    unsigned int mod_4 = d_partial_put_byte_count & 0x03;
+    unsigned int pad = (mod_4 == 0) ? 0: 4 - mod_4;
+
+    if (pad) {
+        vector<char> padding(4, 0); // 4 zeros
+
+        d_out.write(&padding[0], pad);
+        if (d_out.fail()) throw Error("Network I/O Error. Could not send vector data padding");
+    }
+}
+
+// Start of parallel I/O support. jhrg 8/19/15
+void XDRStreamMarshaller::put_vector(char *val, int num, Vector &)
+{
+    if (!val) throw InternalErr(__FILE__, __LINE__, "Could not send byte vector data. Buffer pointer is not set.");
+
+    // write the number of members of the array being written and then set the position to 0
+    put_int(num);
+
+    // this is the word boundary for writing xdr bytes in a vector.
+    const unsigned int add_to = 8;
+    // switch to memory on the heap since the thread will need to access it
+    // after this code returns.
+    char *byte_buf = new char[num + add_to];
+    XDR byte_sink;
+    try {
+        xdrmem_create(&byte_sink, byte_buf, num + add_to, XDR_ENCODE);
+        if (!xdr_setpos(&byte_sink, 0))
+            throw Error("Network I/O Error. Could not send byte vector data - unable to set stream position.");
+
+        if (!xdr_bytes(&byte_sink, (char **) &val, (unsigned int *) &num, num + add_to))
+            throw Error("Network I/O Error(2). Could not send byte vector data - unable to encode data.");
+
+        unsigned int bytes_written = xdr_getpos(&byte_sink);
+        if (!bytes_written)
+            throw Error("Network I/O Error. Could not send byte vector data - unable to get stream position.");
+
+#ifdef USE_POSIX_THREADS
+        Locker lock(tm->get_mutex(), tm->get_cond(), tm->get_child_thread_count());
+        tm->increment_child_thread_count();
+        tm->start_thread(MarshallerThread::write_thread, d_out, byte_buf, bytes_written);
+        xdr_destroy(&byte_sink);
+#else
+        d_out.write(byte_buf, bytes_written);
+        xdr_destroy(&byte_sink);
+        delete [] byte_buf;
+#endif
+
+    }
+    catch (...) {
+        DBG(cerr << "Caught an exception in put_vector_thread" << endl);
+        xdr_destroy(&byte_sink);
+        delete [] byte_buf;
+        throw;
+    }
+}
+
+// private
+/**
+ * Write elements of a Vector (i.e. an Array) to the stream using XDR encoding.
+ * Encoding is performed on 'num' values that use 'width' bytes. The parameter
+ * 'type' is used to choose the XDR encoding function.
+ *
+ * @param val Pointer to the values to write
+ * @param num The number of elements in the memory referenced by 'val'
+ * @param width The number of bytes in each element
+ * @param type The DAP type of the elements
+ */
+void XDRStreamMarshaller::put_vector(char *val, unsigned int num, int width, Type type)
+{
+    assert(val || num == 0);
+
+    // write the number of array members being written, then set the position back to 0
+    put_int(num);
+
+    if (num == 0)
+        return;
+
+    int use_width = width;
+    if (use_width < 4) use_width = 4;
+
+    // the size is the number of elements num times the width of each
+    // element, then add 4 bytes for the number of elements
+    int size = (num * use_width) + 4;
+
+    // allocate enough memory for the elements
+    //vector<char> vec_buf(size);
+    char *vec_buf = new char[size];
+    XDR vec_sink;
+    try {
+        xdrmem_create(&vec_sink, vec_buf, size, XDR_ENCODE);
+
+        // set the position of the sink to 0, we're starting at the beginning
+        if (!xdr_setpos(&vec_sink, 0))
+            throw Error("Network I/O Error. Could not send vector data - unable to set stream position.");
+
+        // write the array to the buffer
+        if (!xdr_array(&vec_sink, (char **) &val, (unsigned int *) &num, size, width, XDRUtils::xdr_coder(type)))
+            throw Error("Network I/O Error(2). Could not send vector data - unable to encode.");
+
+        // how much was written to the buffer
+        unsigned int bytes_written = xdr_getpos(&vec_sink);
+        if (!bytes_written)
+            throw Error("Network I/O Error. Could not send vector data - unable to get stream position.");
+
+#ifdef USE_POSIX_THREADS
+        Locker lock(tm->get_mutex(), tm->get_cond(), tm->get_child_thread_count());
+        tm->increment_child_thread_count();
+        tm->start_thread(MarshallerThread::write_thread, d_out, vec_buf, bytes_written);
+        xdr_destroy(&vec_sink);
+#else
+        d_out.write(vec_buf, bytes_written);
+        xdr_destroy(&vec_sink);
+        delete [] vec_buf;
+#endif
+    }
+    catch (...) {
+        xdr_destroy(&vec_sink);
+        delete [] vec_buf;
+        throw;
+    }
+}
+
+/**
+ * Write num values for an Array/Vector.
+ *
+ * @param val The values to write
+ * @param num the number of values to write
+ * @param width The width of the values
+ * @param type The DAP2 type of the values.
+ *
+ * @see put_vector_start()
+ * @see put_vector_end()
+ */
+void XDRStreamMarshaller::put_vector_part(char *val, unsigned int num, int width, Type type)
+{
+    if (width == 1) {
+        // Add space for the 4 bytes of length info and 4 bytes for padding, even though
+        // we will not send either of those.
+        const unsigned int add_to = 8;
+        unsigned int bufsiz = num + add_to;
+        //vector<char> byte_buf(bufsiz);
+        char *byte_buf = new char[bufsiz];
+        XDR byte_sink;
+        try {
+            xdrmem_create(&byte_sink, byte_buf, bufsiz, XDR_ENCODE);
+            if (!xdr_setpos(&byte_sink, 0))
+                throw Error("Network I/O Error. Could not send byte vector data - unable to set stream position.");
+
+            if (!xdr_bytes(&byte_sink, (char **) &val, (unsigned int *) &num, bufsiz))
+                throw Error("Network I/O Error(2). Could not send byte vector data - unable to encode data.");
+
+#ifdef USE_POSIX_THREADS
+            Locker lock(tm->get_mutex(), tm->get_cond(), tm->get_child_thread_count());
+            tm->increment_child_thread_count();
+
+            // Increment the element count so we can figure out about the padding in put_vector_last()
+            d_partial_put_byte_count += num;
+
+            tm->start_thread(MarshallerThread::write_thread_part, d_out, byte_buf, num);
+            xdr_destroy(&byte_sink);
+#else
+            // Only send the num bytes that follow the 4 bytes of length info - we skip the
+            // length info because it's already been sent and we don't send any trailing padding
+            // bytes in this method (see put_vector_last() for that).
+            d_out.write(byte_buf + 4, num);
+
+            if (d_out.fail())
+            throw Error ("Network I/O Error. Could not send initial part of byte vector data");
+
+            // Now increment the element count so we can figure out about the padding in put_vector_last()
+            d_partial_put_byte_count += num;
+
+            xdr_destroy(&byte_sink);
+            delete [] byte_buf;
+#endif
+        }
+        catch (...) {
+            xdr_destroy(&byte_sink);
+            delete [] byte_buf;
+            throw;
+        }
+    }
+    else {
+        int use_width = (width < 4) ? 4 : width;
+
+        // the size is the number of elements num times the width of each
+        // element, then add 4 bytes for the (int) number of elements
+        int size = (num * use_width) + 4;
+
+        // allocate enough memory for the elements
+        //vector<char> vec_buf(size);
+        char *vec_buf = new char[size];
+        XDR vec_sink;
+        try {
+            xdrmem_create(&vec_sink, vec_buf, size, XDR_ENCODE);
+
+            // set the position of the sink to 0, we're starting at the beginning
+            if (!xdr_setpos(&vec_sink, 0))
+                throw Error("Network I/O Error. Could not send vector data - unable to set stream position.");
+
+            // write the array to the buffer
+            if (!xdr_array(&vec_sink, (char **) &val, (unsigned int *) &num, size, width, XDRUtils::xdr_coder(type)))
+                throw Error("Network I/O Error(2). Could not send vector data -unable to encode data.");
+
+#ifdef USE_POSIX_THREADS
+            Locker lock(tm->get_mutex(), tm->get_cond(), tm->get_child_thread_count());
+            tm->increment_child_thread_count();
+
+            // Increment the element count so we can figure out about the padding in put_vector_last()
+            d_partial_put_byte_count += (size - 4);
+            tm->start_thread(MarshallerThread::write_thread_part, d_out, vec_buf, size - 4);
+            xdr_destroy(&vec_sink);
+#else
+            // write that much out to the output stream, skipping the length data that
+            // XDR writes since we have already written the length info using put_vector_start()
+            d_out.write(vec_buf + 4, size - 4);
+
+            if (d_out.fail())
+                throw Error ("Network I/O Error. Could not send part of vector data");
+
+            // Now increment the element count so we can figure out about the padding in put_vector_last()
+            d_partial_put_byte_count += (size - 4);
+
+            xdr_destroy(&vec_sink);
+            delete [] vec_buf;
+#endif
+        }
+        catch (...) {
+            xdr_destroy(&vec_sink);
+            delete [] vec_buf;
+            throw;
+        }
+    }
+}
+
+void XDRStreamMarshaller::dump(ostream &strm) const
+{
+    strm << DapIndent::LMarg << "XDRStreamMarshaller::dump - (" << (void *) this << ")" << endl;
+}
+
+} // namespace libdap
+
diff --git a/XDRStreamMarshaller.h b/XDRStreamMarshaller.h
new file mode 100644
index 0000000..b3a8cd4
--- /dev/null
+++ b/XDRStreamMarshaller.h
@@ -0,0 +1,106 @@
+// XDRStreamMarshaller.h
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: Patrick West <pwest@ucar.edu>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1994-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      pwest       Patrick West <pwest@ucar.edu>
+
+// Hacked massively to add all kinds of things, including pthred support.
+// jhrg 8/21/15
+
+#ifndef I_XDRStreamMarshaller_h
+#define I_XDRStreamMarshaller_h 1
+
+#include <iostream>
+
+#include "Marshaller.h"
+#include "XDRUtils.h"
+
+
+namespace libdap {
+
+class BaseType;
+class MarshallerThread;
+
+/**
+ * @brief Marshaller that knows how serialize dap data objects to a C++ iostream using XDR
+ *
+ */
+class XDRStreamMarshaller: public Marshaller {
+private:
+    static char * d_buf;
+    XDR d_sink;
+    ostream & d_out;
+
+    int d_partial_put_byte_count;
+
+    MarshallerThread *tm;
+
+    XDRStreamMarshaller();
+    XDRStreamMarshaller(const XDRStreamMarshaller &m);
+    XDRStreamMarshaller &operator=(const XDRStreamMarshaller &);
+
+    void put_vector(char *val, unsigned int num, int width, Type type);
+
+    friend class MarshallerTest;
+
+public:
+    XDRStreamMarshaller(ostream &out); //, bool checksum = false, bool write_data = true) ;
+    virtual ~XDRStreamMarshaller();
+
+    virtual void put_byte(dods_byte val);
+
+    virtual void put_int16(dods_int16 val);
+    virtual void put_int32(dods_int32 val);
+
+    virtual void put_float32(dods_float32 val);
+    virtual void put_float64(dods_float64 val);
+
+    virtual void put_uint16(dods_uint16 val);
+    virtual void put_uint32(dods_uint32 val);
+
+    virtual void put_str(const string &val);
+    virtual void put_url(const string &val);
+
+    virtual void put_opaque(char *val, unsigned int len);
+    virtual void put_int(int val);
+
+    virtual void put_vector(char *val, int num, Vector &vec);
+    virtual void put_vector(char *val, int num, int width, Vector &vec);
+
+    virtual void put_vector_start(int num);
+    virtual void put_vector_part(char *val, unsigned int num, int width, Type type);
+    virtual void put_vector_end();
+
+    virtual void dump(ostream &strm) const;
+};
+
+} // namespace libdap
+
+#endif // I_XDRStreamMarshaller_h
+
diff --git a/XDRStreamUnMarshaller.cc b/XDRStreamUnMarshaller.cc
new file mode 100644
index 0000000..027ccc0
--- /dev/null
+++ b/XDRStreamUnMarshaller.cc
@@ -0,0 +1,342 @@
+// XDRStreamUnMarshaller.cc
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: Patrick West <pwest@ucar.edu>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1994-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      pwest       Patrick West <pwest@ucar.edu>
+#include "config.h"
+#include "XDRStreamUnMarshaller.h"
+
+#include <cstring> // for memcpy
+#include <string>
+#include <sstream>
+
+//#define DODS_DEBUG2 1
+//#define DODS_DEBUG 1
+
+#include "Str.h"
+// #include "Vector.h"
+#include "Array.h"
+#include "util.h"
+#include "InternalErr.h"
+#include "debug.h"
+
+namespace libdap {
+
+char *XDRStreamUnMarshaller::d_buf = 0;
+
+XDRStreamUnMarshaller::XDRStreamUnMarshaller(istream &in) : /*&d_source( 0 ),*/
+        d_in(in)
+{
+    if (!d_buf)
+        d_buf = (char *) malloc(XDR_DAP_BUFF_SIZE);
+    if (!d_buf)
+        throw Error(internal_error, "Failed to allocate memory for data serialization.");
+
+    //&d_source = new XDR;
+    xdrmem_create(&d_source, d_buf, XDR_DAP_BUFF_SIZE, XDR_DECODE);
+}
+
+XDRStreamUnMarshaller::XDRStreamUnMarshaller() :
+        UnMarshaller(), /*&d_source( 0 ),*/d_in(cin)
+{
+    throw InternalErr(__FILE__, __LINE__, "Default constructor not implemented.");
+}
+
+XDRStreamUnMarshaller::XDRStreamUnMarshaller(const XDRStreamUnMarshaller &um) :
+        UnMarshaller(um), /*&d_source( 0 ),*/d_in(cin)
+{
+    throw InternalErr(__FILE__, __LINE__, "Copy constructor not implemented.");
+}
+
+XDRStreamUnMarshaller &
+XDRStreamUnMarshaller::operator=(const XDRStreamUnMarshaller &)
+{
+    throw InternalErr(__FILE__, __LINE__, "Copy operator not implemented.");
+
+    return *this;
+}
+
+XDRStreamUnMarshaller::~XDRStreamUnMarshaller()
+{
+    xdr_destroy( &d_source );
+    //&d_source = 0;
+}
+
+void XDRStreamUnMarshaller::get_byte(dods_byte &val)
+{
+    if (xdr_setpos( &d_source, 0 ) < 0)
+        throw Error("Failed to reposition input stream");
+    if (!(d_in.read(d_buf, 4))) {
+        if (d_in.eof())
+            throw Error("Premature EOF in input stream");
+        else {
+            ostringstream ss("Error reading from input stream: ");
+            ss << d_in.rdstate();
+            throw Error(ss.str());
+        }
+    }
+
+    DBG2( std::cerr << "_in.gcount(): " << d_in.gcount() << std::endl );
+    DBG2( std::cerr << "_in.tellg(): " << d_in.tellg() << std::endl );
+    DBG2( std::cerr << "_buf[0]: " << hex << d_buf[0] << "; _buf[1]: " << d_buf[1]
+            << "; _buf[2]: " << d_buf[2] << "; _buf[3]: " << d_buf[3]
+            << dec << std::endl );
+
+    if (!xdr_char(&d_source, (char *) &val))
+        throw Error("Network I/O Error. Could not read byte data.");
+
+    DBG2(std::cerr << "get_byte: " << val << std::endl );
+}
+
+void XDRStreamUnMarshaller::get_int16(dods_int16 &val)
+{
+    xdr_setpos( &d_source, 0);
+    d_in.read(d_buf, 4);
+
+    if (!XDR_INT16(&d_source, &val))
+        throw Error("Network I/O Error. Could not read int 16 data.");
+}
+
+void XDRStreamUnMarshaller::get_int32(dods_int32 &val)
+{
+    xdr_setpos( &d_source, 0);
+    d_in.read(d_buf, 4);
+
+    if (!XDR_INT32(&d_source, &val))
+        throw Error("Network I/O Error. Could not read int 32 data.");
+}
+
+void XDRStreamUnMarshaller::get_float32(dods_float32 &val)
+{
+    xdr_setpos( &d_source, 0);
+    d_in.read(d_buf, 4);
+
+    if (!xdr_float(&d_source, &val))
+        throw Error("Network I/O Error. Could not read float 32 data.");
+}
+
+void XDRStreamUnMarshaller::get_float64(dods_float64 &val)
+{
+    xdr_setpos( &d_source, 0);
+    d_in.read(d_buf, 8);
+
+    if (!xdr_double(&d_source, &val))
+        throw Error("Network I/O Error. Could not read float 64 data.");
+}
+
+void XDRStreamUnMarshaller::get_uint16(dods_uint16 &val)
+{
+    xdr_setpos( &d_source, 0);
+    d_in.read(d_buf, 4);
+
+    if (!XDR_UINT16(&d_source, &val))
+        throw Error("Network I/O Error. Could not read uint 16 data.");
+}
+
+void XDRStreamUnMarshaller::get_uint32(dods_uint32 &val)
+{
+    xdr_setpos( &d_source, 0);
+    d_in.read(d_buf, 4);
+
+    if (!XDR_UINT32(&d_source, &val))
+        throw Error("Network I/O Error. Could not read uint 32 data.");
+}
+
+void XDRStreamUnMarshaller::get_str(string &val)
+{
+    int i;
+    get_int(i);
+    DBG(std::cerr << "i: " << i << std::endl);
+
+    // Must round up string size to next 4
+    i = ((i + 3) / 4) * 4;
+    DBG(std::cerr << "i: " << i << std::endl);
+
+    char *in_tmp = 0;
+    //char *buf = 0;
+    //XDR *source = 0;
+    // Must address the case where the string is larger than the buffer
+    if (i + 4 > XDR_DAP_BUFF_SIZE) {
+#if 0
+        char *buf = (char *) malloc(i + 4);
+        if (!buf)
+            throw InternalErr(__FILE__, __LINE__, "Error allocating memory");
+#endif
+        vector<char> buf(i+4);
+
+        XDR source;// = new XDR;
+        xdrmem_create(&source, &buf[0], i + 4, XDR_DECODE);
+        memcpy(&buf[0], d_buf, 4);
+
+        d_in.read(&buf[0] + 4, i);
+
+        xdr_setpos( &source, 0);
+        if (!xdr_string( &source, &in_tmp, max_str_len)) {
+            xdr_destroy( &source );
+            throw Error("Network I/O Error. Could not read string data.");
+        }
+
+        xdr_destroy( &source );
+    }
+    else {
+        d_in.read(d_buf + 4, i);
+
+        xdr_setpos( &d_source, 0);
+        if (!xdr_string(&d_source, &in_tmp, max_str_len))
+            throw Error("Network I/O Error. Could not read string data.");
+    }
+
+    val = in_tmp;
+
+    free(in_tmp);
+}
+
+void XDRStreamUnMarshaller::get_url(string &val)
+{
+    get_str(val);
+}
+
+void XDRStreamUnMarshaller::get_opaque(char *val, unsigned int len)
+{
+    xdr_setpos( &d_source, 0);
+
+    // Round len up to the next multiple of 4. There is also the RNDUP()
+    // macro in xdr.h, at least on OS/X.
+    len += len & 3;
+    if (static_cast<int>(len) > XDR_DAP_BUFF_SIZE)
+        throw Error("Network I/O Error. Length of opaque data larger than allowed");
+
+    d_in.read(d_buf, len);
+
+    xdr_opaque(&d_source, val, len);
+}
+
+void XDRStreamUnMarshaller::get_int(int &val)
+{
+    xdr_setpos( &d_source, 0);
+    d_in.read(d_buf, 4);
+
+    if (!xdr_int(&d_source, &val))
+        throw Error("Network I/O Error(1).");
+
+    DBG(std::cerr << "get_int: " << val << std::endl);
+}
+
+void XDRStreamUnMarshaller::get_vector(char **val, unsigned int &num, Vector &)
+{
+    int i;
+    get_int(i); // This leaves the XDR encoded value in d_buf; used later
+    DBG(std::cerr << "i: " << i << std::endl);
+
+    // Must round up string size to next 4
+    i += i & 3;
+    DBG(std::cerr << "i: " << i << std::endl);
+
+    //char *buf = 0;
+    //XDR *source = 0;
+    // Must address the case where the string is larger than the buffer
+    if (i + 4 > XDR_DAP_BUFF_SIZE) {
+    	vector<char> buf(i+4);
+        XDR source;
+        xdrmem_create(&source, &buf[0], i + 4, XDR_DECODE);
+        memcpy(&buf[0], d_buf, 4);
+
+        d_in.read(&buf[0] + 4, i);
+        DBG2(cerr << "bytes read: " << d_in.gcount() << endl);
+
+        xdr_setpos(&source, 0);
+        if (!xdr_bytes(&d_source, val, &num, DODS_MAX_ARRAY)) {
+            xdr_destroy(&source);
+            throw Error("Network I/O Error. Could not read byte array data.");
+        }
+
+        xdr_destroy( &source );
+    }
+    else {
+        d_in.read(d_buf + 4, i);
+        DBG2(cerr << "bytes read: " << d_in.gcount() << endl);
+
+        xdr_setpos(&d_source, 0);
+        if (!xdr_bytes(&d_source, val, &num, DODS_MAX_ARRAY))
+            throw Error("Network I/O Error. Could not read byte array data.");
+    }
+}
+
+void XDRStreamUnMarshaller::get_vector(char **val, unsigned int &num, int width, Vector &vec)
+{
+    get_vector(val, num, width, vec.var()->type());
+}
+
+void XDRStreamUnMarshaller::get_vector(char **val, unsigned int &num, int width, Type type)
+{
+    int i;
+    get_int(i); // This leaves the XDR encoded value in d_buf; used later
+    DBG(std::cerr << "i: " << i << std::endl);
+
+    width += width & 3;
+    DBG(std::cerr << "width: " << width << std::endl);
+
+    int size = i * width; // + 4; // '+ 4' to hold the int already read
+
+    // Must address the case where the string is larger than the buffer
+    if (size > XDR_DAP_BUFF_SIZE) {
+    	vector<char> buf(size+4);
+        XDR source;
+        xdrmem_create(&source, &buf[0], size + 4, XDR_DECODE);
+        DBG(cerr << "size: " << size << endl);
+        memcpy(&buf[0], d_buf, 4);
+
+        d_in.read(&buf[0] + 4, size); // +4 for the int already read
+        DBG(cerr << "bytes read: " << d_in.gcount() << endl);
+
+        xdr_setpos(&source, 0);
+        if (!xdr_array(&source, val, &num, DODS_MAX_ARRAY, width, XDRUtils::xdr_coder(type))) {
+            xdr_destroy( &source );
+            throw Error("Network I/O Error. Could not read array data.");
+        }
+
+        xdr_destroy( &source );
+    }
+    else {
+        d_in.read(d_buf + 4, size);
+        DBG(cerr << "bytes read (2): " << d_in.gcount() << endl);
+
+        xdr_setpos( &d_source, 0);
+        if (!xdr_array(&d_source, val, &num, DODS_MAX_ARRAY, width, XDRUtils::xdr_coder(type)))
+            throw Error("Network I/O Error. Could not read array data.");
+    }
+}
+
+void XDRStreamUnMarshaller::dump(ostream &strm) const
+{
+    strm << DapIndent::LMarg << "XDRStreamUnMarshaller::dump - (" << (void *) this << ")" << endl;
+}
+
+} // namespace libdap
+
diff --git a/XDRStreamUnMarshaller.h b/XDRStreamUnMarshaller.h
new file mode 100644
index 0000000..575a445
--- /dev/null
+++ b/XDRStreamUnMarshaller.h
@@ -0,0 +1,95 @@
+// XDRStreamUnMarshaller.h
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: Patrick West <pwest@ucar.edu>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1994-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      pwest       Patrick West <pwest@ucar.edu>
+
+#ifndef I_XDRStreamUnMarshaller_h
+#define I_XDRStreamUnMarshaller_h 1
+
+#include <iostream>
+
+using std::istream ;
+using std::cin ;
+
+#include "UnMarshaller.h"
+#include "XDRUtils.h"
+
+namespace libdap
+{
+
+const int XDR_DAP_BUFF_SIZE = 4096; // This will be compared to a signed int
+
+/** @brief unmarshaller that knows how to unmarshall/deserialize dap objects
+ * using XDR from a file
+ */
+class XDRStreamUnMarshaller : public UnMarshaller
+{
+private:
+    XDR 			d_source ;
+    istream &		d_in;
+    static char *	d_buf;
+
+    				XDRStreamUnMarshaller() ;
+    				XDRStreamUnMarshaller( const XDRStreamUnMarshaller &um ) ;
+    XDRStreamUnMarshaller &	operator=( const XDRStreamUnMarshaller & ) ;
+
+public:
+    				XDRStreamUnMarshaller( istream &in ) ;
+    virtual			~XDRStreamUnMarshaller() ;
+
+    virtual void	get_byte( dods_byte &val ) ;
+
+    virtual void	get_int16( dods_int16 &val ) ;
+    virtual void	get_int32( dods_int32 &val ) ;
+
+    virtual void	get_float32( dods_float32 &val ) ;
+    virtual void	get_float64( dods_float64 &val ) ;
+
+    virtual void	get_uint16( dods_uint16 &val ) ;
+    virtual void	get_uint32( dods_uint32 &val ) ;
+
+    virtual void	get_str( string &val ) ;
+    virtual void	get_url( string &val ) ;
+
+    virtual void	get_opaque( char *val, unsigned int len ) ;
+    virtual void	get_int( int &val ) ;
+
+    virtual void	get_vector( char **val, unsigned int &num, Vector &vec ) ;
+    virtual void	get_vector( char **val, unsigned int &num, int width, Vector &vec ) ;
+
+    virtual void get_vector(char **val, unsigned int &num, int width, Type type);
+
+    virtual void	dump(ostream &strm) const ;
+} ;
+
+} // namespace libdap
+
+#endif // I_XDRStreamUnMarshaller_h
+
diff --git a/XDRUtils.cc b/XDRUtils.cc
new file mode 100644
index 0000000..dfd84f6
--- /dev/null
+++ b/XDRUtils.cc
@@ -0,0 +1,182 @@
+// XDRUtils.cc
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: Patrick West <pwest@ucar.edu>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1994-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      pwest       Patrick West <pwest@ucar.edu>
+
+#include "config.h"
+
+#include "XDRUtils.h"
+#include "debug.h"
+#include "Str.h"
+
+using namespace libdap ;
+
+// This function is used to allocate memory for, and initialize, a new XDR
+// pointer. It sets the stream associated with the (XDR *) to STREAM.
+//
+// NB: STREAM is not one of the C++/libg++ iostream classes; it is a (FILE
+// *).
+
+//  These func's moved to xdrutil_ppc.* under the PPC as explained there
+#ifndef __POWERPC__
+XDR *
+new_xdrstdio(FILE *stream, enum xdr_op xop)
+{
+    XDR *xdr = new XDR;
+
+    xdrstdio_create(xdr, stream, xop);
+
+    return xdr;
+}
+
+XDR *
+set_xdrstdio(XDR *xdr, FILE *stream, enum xdr_op xop)
+{
+    xdrstdio_create(xdr, stream, xop);
+
+    return xdr;
+}
+
+// Delete an XDR pointer allocated using the above function. Do not close the
+// associated FILE pointer.
+
+void
+delete_xdrstdio(XDR *xdr)
+{
+    xdr_destroy(xdr);
+
+    delete xdr; xdr = 0;
+}
+#endif
+
+// This function is used to en/decode Str and Url type variables. It is
+// defined as extern C since it is passed via function pointers to routines
+// in the xdr library where it is executed. This function is defined so
+// that Str and Url have an en/decoder which takes exactly two arguments: an
+// XDR * and a string reference.
+//
+// NB: this function is *not* used for arrays (i.e., it is not the function
+// referenced by BaseType's _xdr_coder field when the object is a Str or Url.
+// Also note that \e max_str_len is an obese number but that really does not
+// matter; xdr_string() would never actually allocate that much memory unless
+// a string that size was sent from the server.
+// Returns: XDR's bool_t; TRUE if no errors are detected, FALSE
+// otherwise. The formal parameter BUF is modified as a side effect.
+
+extern "C" bool_t
+xdr_str(XDR *xdrs, string &buf)
+{
+    DBG(cerr << "In xdr_str, xdrs: " << xdrs << endl);
+
+    switch (xdrs->x_op) {
+    case XDR_ENCODE: { // BUF is a pointer to a (string *)
+            const char *out_tmp = buf.c_str();
+
+            return xdr_string(xdrs, (char **)&out_tmp, max_str_len);
+        }
+
+    case XDR_DECODE: {
+            char *in_tmp = NULL;
+
+            bool_t stat = xdr_string(xdrs, &in_tmp, max_str_len);
+            if (!stat)
+                return stat;
+
+            buf = in_tmp;
+
+            free(in_tmp);
+
+            return stat;
+        }
+
+    default:
+        return 0;
+    }
+}
+
+namespace libdap {
+
+/** The <tt>xdr_coder</tt> function (also "filter primitive") is used to
+    encode and decode each element in a multiple element data
+    structure.  These functions are used to convert data to and from
+    its local representation to the XDR representation, which is
+    used to transmit and receive the data.  See <tt>man xdr</tt> for more
+    information about the available XDR filter primitives.
+
+    \note This class data is only used for multiple element data
+    types.  The simple data types (Int, Float, and so on), are
+    translated directly.
+
+    \note Even though Byte is a cardinal type, xdr_char is <i>not</i>
+    used to transport Byte arrays over the network. Instead, Byte is
+    a special case handled in Array.
+
+    @brief Returns a function used to encode elements of an array.
+    @return A C function used to encode data in the XDR format.
+*/
+xdrproc_t
+XDRUtils::xdr_coder( const Type &t )
+{
+    switch( t )
+    {
+	case dods_int16_c:
+	    return (xdrproc_t)XDR_INT16 ;
+	    break ;
+	case dods_uint16_c:
+	    return (xdrproc_t)XDR_UINT16 ;
+	    break ;
+	case dods_int32_c:
+	    return (xdrproc_t)XDR_INT32 ;
+	    break ;
+	case dods_uint32_c:
+	    return (xdrproc_t)XDR_UINT32 ;
+	    break ;
+	case dods_float32_c:
+	    return (xdrproc_t)XDR_FLOAT32 ;
+	    break ;
+	case dods_float64_c:
+	    return (xdrproc_t)XDR_FLOAT64 ;
+	    break ;
+	case dods_byte_c:
+	case dods_str_c:
+	case dods_url_c:
+	case dods_array_c:
+	case dods_structure_c:
+	case dods_sequence_c:
+	case dods_grid_c:
+	default:
+	    break ;
+    }
+
+    return NULL;
+}
+
+} // namespace libdap
+
diff --git a/XDRUtils.h b/XDRUtils.h
new file mode 100644
index 0000000..cc57c21
--- /dev/null
+++ b/XDRUtils.h
@@ -0,0 +1,71 @@
+// XDRUtils.h
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: Patrick West <pwest@ucar.edu>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1994-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      pwest       Patrick West <pwest@ucar.edu>
+
+#ifndef S_XDRUtils_h
+#define S_XDRUtils_h 1
+
+#include <cstdio>
+#include "xdr-datatypes.h"
+#include "BaseType.h"
+
+#define xdr_proc_t int *
+
+//  These func's moved to xdrutil_ppc.* under the PPC as explained there
+#ifdef __POWERPC__
+extern "C" XDR *new_xdrstdio(FILE *stream, enum xdr_op xop);
+extern "C" XDR *set_xdrstdio(XDR *xdr, FILE *stream, enum xdr_op xop);
+extern "C" void delete_xdrstdio(XDR *xdr);
+#else
+XDR *new_xdrstdio(FILE *stream, enum xdr_op xop);
+XDR *set_xdrstdio(XDR *xdr, FILE *stream, enum xdr_op xop);
+void delete_xdrstdio(XDR *xdr);
+#endif
+
+extern "C" bool_t xdr_str(XDR *xdrs, string &buf);
+
+namespace libdap
+{
+
+class XDRUtils
+{
+private:			XDRUtils() {}
+public:
+    // xdr_coder is used as an argument to xdr procedures that encode groups
+    // of things (e.g., xdr_array()). Each leaf class's constructor must set
+    // this.
+    static xdrproc_t		xdr_coder( const Type &t ) ;
+} ;
+
+} // namespace libdap
+
+#endif // S_XDRUtils_h
+
diff --git a/XMLWriter.cc b/XMLWriter.cc
new file mode 100644
index 0000000..1a95355
--- /dev/null
+++ b/XMLWriter.cc
@@ -0,0 +1,142 @@
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2010 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+/*
+ * XMLWriter.cpp
+ *
+ *  Created on: Jul 28, 2010
+ *      Author: jimg
+ */
+
+#include "config.h"
+
+#include <libxml/encoding.h>
+#include <libxml/xmlwriter.h>
+
+#include "XMLWriter.h"
+#include "InternalErr.h"
+
+// TODO - Bite the bullet and make the encoding UTF-8 as required by dap4. This will break a lot of tests but the baselines could be amended using  a bash script and sed.
+const char *ENCODING = "ISO-8859-1";
+const int XML_BUF_SIZE = 2000000;
+
+using namespace libdap;
+
+XMLWriter::XMLWriter(const string &pad) {
+    LIBXML_TEST_VERSION;
+
+    /* Create a new XML buffer, to which the XML document will be
+     * written */
+    try {
+        if (!(d_doc_buf = xmlBufferCreateSize(XML_BUF_SIZE)))
+            throw InternalErr(__FILE__, __LINE__, "Error allocating the xml buffer");
+
+        xmlBufferSetAllocationScheme(d_doc_buf, XML_BUFFER_ALLOC_DOUBLEIT);
+
+        /* Create a new XmlWriter for memory, with no compression.
+         * Remark: there is no compression for this kind of xmlTextWriter */
+        if (!(d_writer = xmlNewTextWriterMemory(d_doc_buf, 0)))
+            throw InternalErr(__FILE__, __LINE__, "Error allocating memory for xml writer");
+
+        if (xmlTextWriterSetIndent(d_writer, pad.length()) < 0)
+            throw InternalErr(__FILE__, __LINE__, "Error starting indentation for response document ");
+
+        if (xmlTextWriterSetIndentString(d_writer, (const xmlChar*)pad.c_str()) < 0)
+            throw InternalErr(__FILE__, __LINE__, "Error setting indentation for response document ");
+
+        d_started = true;
+        d_ended = false;
+
+        /* Start the document with the xml default for the version,
+         * encoding ISO 8859-1 and the default for the standalone
+         * declaration. MY_ENCODING defined at top of this file*/
+        if (xmlTextWriterStartDocument(d_writer, NULL, ENCODING, NULL) < 0)
+            throw InternalErr(__FILE__, __LINE__, "Error starting xml response document");
+    }
+    catch (InternalErr &e) {
+        m_cleanup();
+        throw;
+    }
+
+}
+
+XMLWriter::~XMLWriter() {
+    m_cleanup();
+}
+
+void XMLWriter::m_cleanup() {
+    // make sure the buffer and writer are all cleaned up
+    if (d_writer) {
+        xmlFreeTextWriter(d_writer); // This frees both d_writer and d_doc_buf
+        d_writer = 0;
+        // d_doc_buf = 0;
+    }
+
+    // We could be here because of an exception and d_writer might be zero
+    if (d_doc_buf) {
+        xmlBufferFree(d_doc_buf);
+        d_doc_buf = 0;
+    }
+
+    d_started = false;
+    d_ended = false;
+}
+
+const char *XMLWriter::get_doc() {
+    if (d_writer && d_started) {
+        if (xmlTextWriterEndDocument(d_writer) < 0)
+            throw InternalErr(__FILE__, __LINE__, "Error ending the document");
+
+        d_ended = true;
+
+        // must call this before getting the buffer content. Odd, but appears to be true.
+        // jhrg
+        xmlFreeTextWriter(d_writer);
+        d_writer = 0;
+    }
+
+    if (!d_doc_buf->content)
+        throw InternalErr(__FILE__, __LINE__, "Error retrieving response document as string");
+
+    return (const char *)d_doc_buf->content;
+}
+
+unsigned int XMLWriter::get_doc_size() {
+    if (d_writer && d_started) {
+        if (xmlTextWriterEndDocument(d_writer) < 0)
+            throw InternalErr(__FILE__, __LINE__, "Error ending the document");
+
+        d_ended = true;
+
+        // must call this before getting the buffer content. Odd, but appears to be true.
+        // jhrg
+        xmlFreeTextWriter(d_writer);
+        d_writer = 0;
+    }
+
+    if (!d_doc_buf->content)
+        throw InternalErr(__FILE__, __LINE__, "Error retrieving response document as string");
+
+    // how much of the buffer is in use?
+    return d_doc_buf->use;
+}
diff --git a/XMLWriter.h b/XMLWriter.h
new file mode 100644
index 0000000..8fde264
--- /dev/null
+++ b/XMLWriter.h
@@ -0,0 +1,62 @@
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2010 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+/*
+ * XMLWriter.h
+ *
+ *  Created on: Jul 28, 2010
+ *      Author: jimg
+ */
+
+#ifndef XMLWRITER_H_
+#define XMLWRITER_H_
+
+#include <libxml/xmlwriter.h>
+
+#include <string>
+
+namespace libdap {
+
+class XMLWriter {
+private:
+    // Various xml writer stuff
+    xmlTextWriterPtr d_writer;
+    xmlBufferPtr d_doc_buf;
+    bool d_started;
+    bool d_ended;
+
+    std::string d_doc;
+
+    void m_cleanup() ;
+
+public:
+    XMLWriter(const std::string &pad = "    ");
+    virtual ~XMLWriter();
+
+    xmlTextWriterPtr get_writer() const { return d_writer; }
+    const char *get_doc();
+    unsigned int get_doc_size();
+};
+
+} // namespace libdap
+
+#endif /* XMLWRITER_H_ */
diff --git a/abi_checker.xml.in b/abi_checker.xml.in
new file mode 100644
index 0000000..da711fb
--- /dev/null
+++ b/abi_checker.xml.in
@@ -0,0 +1,17 @@
+<!-- How to use the abi checker:
+     Build the old and new code on a machine that uses gcc
+     Run the command 'abi-compliance-checker -lib NAME -old OLD.xml -new NEW.xml'
+     where OLD.xml, ..., is this file and lib NAME is libdap, ...
+     To get the abi checker, use git clone https://github.com/lvc/abi-compliance-checker -->
+     
+<version>
+    @PACKAGE_VERSION@
+</version>
+
+<headers>
+    @abs_top_srcdir@
+</headers>
+
+<libs>
+    @abs_top_builddir@/.libs
+</libs>
diff --git a/aclocal.m4 b/aclocal.m4
new file mode 100644
index 0000000..dabb8be
--- /dev/null
+++ b/aclocal.m4
@@ -0,0 +1,1244 @@
+# generated automatically by aclocal 1.14 -*- Autoconf -*-
+
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
+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.
+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'.])])
+
+# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_AUTOMAKE_VERSION(VERSION)
+# ----------------------------
+# Automake X.Y traces this macro to ensure aclocal.m4 has been
+# generated from the m4 files accompanying Automake X.Y.
+# (This private macro should not be called outside this file.)
+AC_DEFUN([AM_AUTOMAKE_VERSION],
+[am__api_version='1.14'
+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+dnl require some minimum version.  Point them to the right macro.
+m4_if([$1], [1.14], [],
+      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+])
+
+# _AM_AUTOCONF_VERSION(VERSION)
+# -----------------------------
+# aclocal traces this macro to find the Autoconf version.
+# This is a private macro too.  Using m4_define simplifies
+# the logic in aclocal, which can simply ignore this definition.
+m4_define([_AM_AUTOCONF_VERSION], [])
+
+# AM_SET_CURRENT_AUTOMAKE_VERSION
+# -------------------------------
+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+[AM_AUTOMAKE_VERSION([1.14])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
+
+# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
+
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
+# $ac_aux_dir to '$srcdir/foo'.  In other projects, it is set to
+# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
+#
+# Of course, Automake must honor this variable whenever it calls a
+# tool from the auxiliary directory.  The problem is that $srcdir (and
+# therefore $ac_aux_dir as well) can be either absolute or relative,
+# depending on how configure is run.  This is pretty annoying, since
+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
+# source directory, any form will work fine, but in subdirectories a
+# relative path needs to be adjusted first.
+#
+# $ac_aux_dir/missing
+#    fails when called from a subdirectory if $ac_aux_dir is relative
+# $top_srcdir/$ac_aux_dir/missing
+#    fails if $ac_aux_dir is absolute,
+#    fails when called from a subdirectory in a VPATH build with
+#          a relative $ac_aux_dir
+#
+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
+# are both prefixed by $srcdir.  In an in-source build this is usually
+# harmless because $srcdir is '.', but things will broke when you
+# start a VPATH build or use an absolute $srcdir.
+#
+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
+# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
+#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
+# and then we would define $MISSING as
+#   MISSING="\${SHELL} $am_aux_dir/missing"
+# This will work as long as MISSING is not called from configure, because
+# unfortunately $(top_srcdir) has no meaning in configure.
+# However there are other variables, like CC, which are often used in
+# configure, and could therefore not use this "fixed" $ac_aux_dir.
+#
+# Another solution, used here, is to always expand $ac_aux_dir to an
+# absolute PATH.  The drawback is that using absolute paths prevent a
+# configured tree to be moved without reconfiguration.
+
+AC_DEFUN([AM_AUX_DIR_EXPAND],
+[dnl Rely on autoconf to set up CDPATH properly.
+AC_PREREQ([2.50])dnl
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
+])
+
+# AM_CONDITIONAL                                            -*- Autoconf -*-
+
+# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
+# -------------------------------------
+# Define a conditional.
+AC_DEFUN([AM_CONDITIONAL],
+[AC_PREREQ([2.52])dnl
+ m4_if([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
+       [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+AC_SUBST([$1_TRUE])dnl
+AC_SUBST([$1_FALSE])dnl
+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
+m4_define([_AM_COND_VALUE_$1], [$2])dnl
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi
+AC_CONFIG_COMMANDS_PRE(
+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
+  AC_MSG_ERROR([[conditional "$1" was never defined.
+Usually this means the macro was only invoked conditionally.]])
+fi])])
+
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+
+# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
+# written in clear, in which case automake, when reading aclocal.m4,
+# will think it sees a *use*, and therefore will trigger all it's
+# C support machinery.  Also note that it means that autoscan, seeing
+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+
+
+# _AM_DEPENDENCIES(NAME)
+# ----------------------
+# See how the compiler implements dependency checking.
+# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
+# We try a few techniques and use that to set a single cache variable.
+#
+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
+# dependency, and given that the user is not expected to run this macro,
+# just rely on AC_PROG_CC.
+AC_DEFUN([_AM_DEPENDENCIES],
+[AC_REQUIRE([AM_SET_DEPDIR])dnl
+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
+AC_REQUIRE([AM_DEP_TRACK])dnl
+
+m4_if([$1], [CC],   [depcc="$CC"   am_compiler_list=],
+      [$1], [CXX],  [depcc="$CXX"  am_compiler_list=],
+      [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+      [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
+      [$1], [UPC],  [depcc="$UPC"  am_compiler_list=],
+      [$1], [GCJ],  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
+                    [depcc="$$1"   am_compiler_list=])
+
+AC_CACHE_CHECK([dependency style of $depcc],
+               [am_cv_$1_dependencies_compiler_type],
+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
+  rm -rf conftest.dir
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
+
+  am_cv_$1_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
+  fi
+  am__universal=false
+  m4_case([$1], [CC],
+    [case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac],
+    [CXX],
+    [case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac])
+
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
+    case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
+    nosideeffect)
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+      # This compiler won't grok '-c -o', but also, the minuso test has
+      # not run yet.  These depmodes are late enough in the game, and
+      # so weak that their functioning should not be impacted.
+      am__obj=conftest.${OBJEXT-o}
+      am__minus_obj=
+      ;;
+    none) break ;;
+    esac
+    if depmode=$depmode \
+       source=sub/conftest.c object=$am__obj \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_$1_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_$1_dependencies_compiler_type=none
+fi
+])
+AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
+AM_CONDITIONAL([am__fastdep$1], [
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
+])
+
+
+# AM_SET_DEPDIR
+# -------------
+# Choose a directory name for dependency files.
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
+AC_DEFUN([AM_SET_DEPDIR],
+[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
+])
+
+
+# AM_DEP_TRACK
+# ------------
+AC_DEFUN([AM_DEP_TRACK],
+[AC_ARG_ENABLE([dependency-tracking], [dnl
+AS_HELP_STRING(
+  [--enable-dependency-tracking],
+  [do not reject slow dependency extractors])
+AS_HELP_STRING(
+  [--disable-dependency-tracking],
+  [speeds up one-time build])])
+if test "x$enable_dependency_tracking" != xno; then
+  am_depcomp="$ac_aux_dir/depcomp"
+  AMDEPBACKSLASH='\'
+  am__nodep='_no'
+fi
+AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+AC_SUBST([AMDEPBACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+AC_SUBST([am__nodep])dnl
+_AM_SUBST_NOTMAKE([am__nodep])dnl
+])
+
+# Generate code to set up dependency tracking.              -*- Autoconf -*-
+
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+
+# _AM_OUTPUT_DEPENDENCY_COMMANDS
+# ------------------------------
+AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
+[{
+  # Older Autoconf quotes --file arguments for eval, but not when files
+  # are listed without --file.  Let's play safe and only enable the eval
+  # if we detect the quoting.
+  case $CONFIG_FILES in
+  *\'*) eval set x "$CONFIG_FILES" ;;
+  *)   set x $CONFIG_FILES ;;
+  esac
+  shift
+  for mf
+  do
+    # Strip MF so we end up with the name of the file.
+    mf=`echo "$mf" | sed -e 's/:.*$//'`
+    # Check whether this is an Automake generated Makefile or not.
+    # We used to match only the files named 'Makefile.in', but
+    # some people rename them; so instead we look at the file content.
+    # Grep'ing the first line is not enough: some people post-process
+    # each Makefile.in and add a new line on top of each file to say so.
+    # Grep'ing the whole file is not good either: AIX grep has a line
+    # limit of 2048, but all sed's we know have understand at least 4000.
+    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+      dirpart=`AS_DIRNAME("$mf")`
+    else
+      continue
+    fi
+    # Extract the definition of DEPDIR, am__include, and am__quote
+    # from the Makefile without running 'make'.
+    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+    test -z "$DEPDIR" && continue
+    am__include=`sed -n 's/^am__include = //p' < "$mf"`
+    test -z "$am__include" && continue
+    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+    # Find all dependency output files, they are included files with
+    # $(DEPDIR) in their names.  We invoke sed twice because it is the
+    # simplest approach to changing $(DEPDIR) to its actual value in the
+    # expansion.
+    for file in `sed -n "
+      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
+      # Make sure the directory exists.
+      test -f "$dirpart/$file" && continue
+      fdir=`AS_DIRNAME(["$file"])`
+      AS_MKDIR_P([$dirpart/$fdir])
+      # echo "creating $dirpart/$file"
+      echo '# dummy' > "$dirpart/$file"
+    done
+  done
+}
+])# _AM_OUTPUT_DEPENDENCY_COMMANDS
+
+
+# AM_OUTPUT_DEPENDENCY_COMMANDS
+# -----------------------------
+# This macro should only be invoked once -- use via AC_REQUIRE.
+#
+# This code is only required when automatic dependency tracking
+# is enabled.  FIXME.  This creates each '.P' file that we will
+# need in order to bootstrap the dependency handling code.
+AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
+[AC_CONFIG_COMMANDS([depfiles],
+     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
+     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
+])
+
+# Do all the work for Automake.                             -*- Autoconf -*-
+
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This macro actually does too much.  Some checks are only needed if
+# your package does certain things.  But this isn't really a big deal.
+
+dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
+m4_define([AC_PROG_CC],
+m4_defn([AC_PROG_CC])
+[_AM_PROG_CC_C_O
+])
+
+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
+# AM_INIT_AUTOMAKE([OPTIONS])
+# -----------------------------------------------
+# The call with PACKAGE and VERSION arguments is the old style
+# call (pre autoconf-2.50), which is being phased out.  PACKAGE
+# and VERSION should now be passed to AC_INIT and removed from
+# the call to AM_INIT_AUTOMAKE.
+# We support both call styles for the transition.  After
+# the next Automake release, Autoconf can make the AC_INIT
+# arguments mandatory, and then we can depend on a new Autoconf
+# release and drop the old call support.
+AC_DEFUN([AM_INIT_AUTOMAKE],
+[AC_PREREQ([2.65])dnl
+dnl Autoconf wants to disallow AM_ names.  We explicitly allow
+dnl the ones we care about.
+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
+AC_REQUIRE([AC_PROG_INSTALL])dnl
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+  fi
+fi
+
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+  if (cygpath --version) >/dev/null 2>/dev/null; then
+    CYGPATH_W='cygpath -w'
+  else
+    CYGPATH_W=echo
+  fi
+fi
+AC_SUBST([CYGPATH_W])
+
+# Define the identity of the package.
+dnl Distinguish between old-style and new-style calls.
+m4_ifval([$2],
+[AC_DIAGNOSE([obsolete],
+             [$0: two- and three-arguments forms are deprecated.])
+m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+ AC_SUBST([PACKAGE], [$1])dnl
+ AC_SUBST([VERSION], [$2])],
+[_AM_SET_OPTIONS([$1])dnl
+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
+m4_if(
+  m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
+  [ok:ok],,
+  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
+
+_AM_IF_OPTION([no-define],,
+[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
+ AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
+
+# Some tools Automake needs.
+AC_REQUIRE([AM_SANITY_CHECK])dnl
+AC_REQUIRE([AC_ARG_PROGRAM])dnl
+AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
+AM_MISSING_PROG([AUTOCONF], [autoconf])
+AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
+AM_MISSING_PROG([AUTOHEADER], [autoheader])
+AM_MISSING_PROG([MAKEINFO], [makeinfo])
+AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+# For better backward compatibility.  To be removed once Automake 1.9.x
+# dies out for good.  For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
+# We need awk for the "check" target.  The system "awk" is bad on
+# some platforms.
+AC_REQUIRE([AC_PROG_AWK])dnl
+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
+	      [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+			     [_AM_PROG_TAR([v7])])])
+_AM_IF_OPTION([no-dependencies],,
+[AC_PROVIDE_IFELSE([AC_PROG_CC],
+		  [_AM_DEPENDENCIES([CC])],
+		  [m4_define([AC_PROG_CC],
+			     m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_CXX],
+		  [_AM_DEPENDENCIES([CXX])],
+		  [m4_define([AC_PROG_CXX],
+			     m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+		  [_AM_DEPENDENCIES([OBJC])],
+		  [m4_define([AC_PROG_OBJC],
+			     m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
+		  [_AM_DEPENDENCIES([OBJCXX])],
+		  [m4_define([AC_PROG_OBJCXX],
+			     m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
+])
+AC_REQUIRE([AM_SILENT_RULES])dnl
+dnl The testsuite driver may need to know about EXEEXT, so add the
+dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This
+dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
+AC_CONFIG_COMMANDS_PRE(dnl
+[m4_provide_if([_AM_COMPILER_EXEEXT],
+  [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
+
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
+
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+    AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
+  fi
+fi])
+
+dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
+dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
+dnl mangled by Autoconf and run in a shell conditional statement.
+m4_define([_AC_COMPILER_EXEEXT],
+m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
+
+# When config.status generates a header, we must update the stamp-h file.
+# This file resides in the same directory as the config header
+# that is generated.  The stamp files are numbered to have different names.
+
+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
+# loop where config.status creates the headers, so we can generate
+# our stamp files there.
+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
+[# Compute $1's index in $config_headers.
+_am_arg=$1
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+  case $_am_header in
+    $_am_arg | $_am_arg:* )
+      break ;;
+    * )
+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+  esac
+done
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_PROG_INSTALL_SH
+# ------------------
+# Define $install_sh.
+AC_DEFUN([AM_PROG_INSTALL_SH],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+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
+AC_SUBST([install_sh])])
+
+# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# Check whether the underlying file-system supports filenames
+# with a leading dot.  For instance MS-DOS doesn't.
+AC_DEFUN([AM_SET_LEADING_DOT],
+[rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+  am__leading_dot=.
+else
+  am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+AC_SUBST([am__leading_dot])])
+
+# Copyright (C) 1998-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_PROG_LEX
+# -----------
+# Autoconf leaves LEX=: if lex or flex can't be found.  Change that to a
+# "missing" invocation, for better error output.
+AC_DEFUN([AM_PROG_LEX],
+[AC_PREREQ([2.50])dnl
+AC_REQUIRE([AM_MISSING_HAS_RUN])dnl
+AC_REQUIRE([AC_PROG_LEX])dnl
+if test "$LEX" = :; then
+  LEX=${am_missing_run}flex
+fi])
+
+# Check to see how 'make' treats includes.	            -*- Autoconf -*-
+
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_MAKE_INCLUDE()
+# -----------------
+# Check to see how make treats includes.
+AC_DEFUN([AM_MAKE_INCLUDE],
+[am_make=${MAKE-make}
+cat > confinc << 'END'
+am__doit:
+	@echo this is the am__doit target
+.PHONY: am__doit
+END
+# If we don't find an include directive, just comment out the code.
+AC_MSG_CHECKING([for style of include used by $am_make])
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# Ignore all kinds of additional output from 'make'.
+case `$am_make -s -f confmf 2> /dev/null` in #(
+*the\ am__doit\ target*)
+  am__include=include
+  am__quote=
+  _am_result=GNU
+  ;;
+esac
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+   echo '.include "confinc"' > confmf
+   case `$am_make -s -f confmf 2> /dev/null` in #(
+   *the\ am__doit\ target*)
+     am__include=.include
+     am__quote="\""
+     _am_result=BSD
+     ;;
+   esac
+fi
+AC_SUBST([am__include])
+AC_SUBST([am__quote])
+AC_MSG_RESULT([$_am_result])
+rm -f confinc confmf
+])
+
+# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
+
+# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_MISSING_PROG(NAME, PROGRAM)
+# ------------------------------
+AC_DEFUN([AM_MISSING_PROG],
+[AC_REQUIRE([AM_MISSING_HAS_RUN])
+$1=${$1-"${am_missing_run}$2"}
+AC_SUBST($1)])
+
+# AM_MISSING_HAS_RUN
+# ------------------
+# Define MISSING if not defined so far and test if it is modern enough.
+# If it is, set am_missing_run to use it, otherwise, to nothing.
+AC_DEFUN([AM_MISSING_HAS_RUN],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([missing])dnl
+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 --is-lightweight"; then
+  am_missing_run="$MISSING "
+else
+  am_missing_run=
+  AC_MSG_WARN(['missing' script is too old or missing])
+fi
+])
+
+# Helper functions for option handling.                     -*- Autoconf -*-
+
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_MANGLE_OPTION(NAME)
+# -----------------------
+AC_DEFUN([_AM_MANGLE_OPTION],
+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
+
+# _AM_SET_OPTION(NAME)
+# --------------------
+# Set option NAME.  Presently that only means defining a flag for this option.
+AC_DEFUN([_AM_SET_OPTION],
+[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
+
+# _AM_SET_OPTIONS(OPTIONS)
+# ------------------------
+# OPTIONS is a space-separated list of Automake options.
+AC_DEFUN([_AM_SET_OPTIONS],
+[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+
+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
+# -------------------------------------------
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+AC_DEFUN([_AM_IF_OPTION],
+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_PROG_CC_C_O
+# ---------------
+# Like AC_PROG_CC_C_O, but changed for automake.  We rewrite AC_PROG_CC
+# to automatically call this.
+AC_DEFUN([_AM_PROG_CC_C_O],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([compile])dnl
+AC_LANG_PUSH([C])dnl
+AC_CACHE_CHECK(
+  [whether $CC understands -c and -o together],
+  [am_cv_prog_cc_c_o],
+  [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i])
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+AC_LANG_POP([C])])
+
+# For backward compatibility.
+AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
+
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_RUN_LOG(COMMAND)
+# -------------------
+# Run COMMAND, save the exit status in ac_status, and log it.
+# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
+AC_DEFUN([AM_RUN_LOG],
+[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
+   ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   (exit $ac_status); }])
+
+# Check to make sure that the build environment is sane.    -*- Autoconf -*-
+
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_SANITY_CHECK
+# ---------------
+AC_DEFUN([AM_SANITY_CHECK],
+[AC_MSG_CHECKING([whether build environment is sane])
+# 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]]*)
+    AC_MSG_ERROR([unsafe absolute working directory name]);;
+esac
+case $srcdir in
+  *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
+    AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
+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 (
+   am_has_slept=no
+   for am_try in 1 2; do
+     echo "timestamp, slept: $am_has_slept" > conftest.file
+     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
+     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".
+	AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
+  alias in your environment])
+     fi
+     if test "$[2]" = conftest.file || test $am_try -eq 2; then
+       break
+     fi
+     # Just in case.
+     sleep 1
+     am_has_slept=yes
+   done
+   test "$[2]" = conftest.file
+   )
+then
+   # Ok.
+   :
+else
+   AC_MSG_ERROR([newly created file is older than distributed files!
+Check your system clock])
+fi
+AC_MSG_RESULT([yes])
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+  ( sleep 1 ) &
+  am_sleep_pid=$!
+fi
+AC_CONFIG_COMMANDS_PRE(
+  [AC_MSG_CHECKING([that generated files are newer than configure])
+   if test -n "$am_sleep_pid"; then
+     # Hide warnings about reused PIDs.
+     wait $am_sleep_pid 2>/dev/null
+   fi
+   AC_MSG_RESULT([done])])
+rm -f conftest.file
+])
+
+# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_SILENT_RULES([DEFAULT])
+# --------------------------
+# Enable less verbose build rules; with the default set to DEFAULT
+# ("yes" being less verbose, "no" or empty being verbose).
+AC_DEFUN([AM_SILENT_RULES],
+[AC_ARG_ENABLE([silent-rules], [dnl
+AS_HELP_STRING(
+  [--enable-silent-rules],
+  [less verbose build output (undo: "make V=1")])
+AS_HELP_STRING(
+  [--disable-silent-rules],
+  [verbose build output (undo: "make V=0")])dnl
+])
+case $enable_silent_rules in @%:@ (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
+esac
+dnl
+dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
+dnl do not support nested variable expansions.
+dnl See automake bug#9928 and bug#10237.
+am_make=${MAKE-make}
+AC_CACHE_CHECK([whether $am_make supports nested variables],
+   [am_cv_make_support_nested_variables],
+   [if AS_ECHO([['TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi])
+if test $am_cv_make_support_nested_variables = yes; then
+  dnl Using '$V' instead of '$(V)' breaks IRIX make.
+  AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AC_SUBST([AM_V])dnl
+AM_SUBST_NOTMAKE([AM_V])dnl
+AC_SUBST([AM_DEFAULT_V])dnl
+AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
+AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
+AM_BACKSLASH='\'
+AC_SUBST([AM_BACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
+])
+
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_PROG_INSTALL_STRIP
+# ---------------------
+# One issue with vendor 'install' (even GNU) is that you can't
+# specify the program used to strip binaries.  This is especially
+# annoying in cross-compiling environments, where the build's strip
+# is unlikely to handle the host's binaries.
+# Fortunately install-sh will honor a STRIPPROG variable, so we
+# always use install-sh in "make install-strip", and initialize
+# STRIPPROG with the value of the STRIP variable (set by the user).
+AC_DEFUN([AM_PROG_INSTALL_STRIP],
+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+# 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.
+dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
+if test "$cross_compiling" != no; then
+  AC_CHECK_TOOL([STRIP], [strip], :)
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+AC_SUBST([INSTALL_STRIP_PROGRAM])])
+
+# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
+# This macro is traced by Automake.
+AC_DEFUN([_AM_SUBST_NOTMAKE])
+
+# AM_SUBST_NOTMAKE(VARIABLE)
+# --------------------------
+# Public sister of _AM_SUBST_NOTMAKE.
+AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
+
+# Check how to create a tarball.                            -*- Autoconf -*-
+
+# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_PROG_TAR(FORMAT)
+# --------------------
+# Check how to create a tarball in format FORMAT.
+# FORMAT should be one of 'v7', 'ustar', or 'pax'.
+#
+# Substitute a variable $(am__tar) that is a command
+# writing to stdout a FORMAT-tarball containing the directory
+# $tardir.
+#     tardir=directory && $(am__tar) > result.tar
+#
+# Substitute a variable $(am__untar) that extract such
+# a tarball read from stdin.
+#     $(am__untar) < result.tar
+#
+AC_DEFUN([_AM_PROG_TAR],
+[# Always define AMTAR for backward compatibility.  Yes, it's still used
+# in the wild :-(  We should find a proper way to deprecate it ...
+AC_SUBST([AMTAR], ['$${TAR-tar}'])
+
+# We'll loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
+
+m4_if([$1], [v7],
+  [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
+
+  [m4_case([$1],
+    [ustar],
+     [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
+      # There is notably a 21 bits limit for the UID and the GID.  In fact,
+      # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
+      # and bug#13588).
+      am_max_uid=2097151 # 2^21 - 1
+      am_max_gid=$am_max_uid
+      # The $UID and $GID variables are not portable, so we need to resort
+      # to the POSIX-mandated id(1) utility.  Errors in the 'id' calls
+      # below are definitely unexpected, so allow the users to see them
+      # (that is, avoid stderr redirection).
+      am_uid=`id -u || echo unknown`
+      am_gid=`id -g || echo unknown`
+      AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
+      if test $am_uid -le $am_max_uid; then
+         AC_MSG_RESULT([yes])
+      else
+         AC_MSG_RESULT([no])
+         _am_tools=none
+      fi
+      AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
+      if test $am_gid -le $am_max_gid; then
+         AC_MSG_RESULT([yes])
+      else
+        AC_MSG_RESULT([no])
+        _am_tools=none
+      fi],
+
+  [pax],
+    [],
+
+  [m4_fatal([Unknown tar format])])
+
+  AC_MSG_CHECKING([how to create a $1 tar archive])
+
+  # Go ahead even if we have the value already cached.  We do so because we
+  # need to set the values for the 'am__tar' and 'am__untar' variables.
+  _am_tools=${am_cv_prog_tar_$1-$_am_tools}
+
+  for _am_tool in $_am_tools; do
+    case $_am_tool in
+    gnutar)
+      for _am_tar in tar gnutar gtar; do
+        AM_RUN_LOG([$_am_tar --version]) && break
+      done
+      am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+      am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+      am__untar="$_am_tar -xf -"
+      ;;
+    plaintar)
+      # Must skip GNU tar: if it does not support --format= it doesn't create
+      # ustar tarball either.
+      (tar --version) >/dev/null 2>&1 && continue
+      am__tar='tar chf - "$$tardir"'
+      am__tar_='tar chf - "$tardir"'
+      am__untar='tar xf -'
+      ;;
+    pax)
+      am__tar='pax -L -x $1 -w "$$tardir"'
+      am__tar_='pax -L -x $1 -w "$tardir"'
+      am__untar='pax -r'
+      ;;
+    cpio)
+      am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+      am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+      am__untar='cpio -i -H $1 -d'
+      ;;
+    none)
+      am__tar=false
+      am__tar_=false
+      am__untar=false
+      ;;
+    esac
+
+    # If the value was cached, stop now.  We just wanted to have am__tar
+    # and am__untar set.
+    test -n "${am_cv_prog_tar_$1}" && break
+
+    # tar/untar a dummy directory, and stop if the command works.
+    rm -rf conftest.dir
+    mkdir conftest.dir
+    echo GrepMe > conftest.dir/file
+    AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+    rm -rf conftest.dir
+    if test -s conftest.tar; then
+      AM_RUN_LOG([$am__untar <conftest.tar])
+      AM_RUN_LOG([cat conftest.dir/file])
+      grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+    fi
+  done
+  rm -rf conftest.dir
+
+  AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+  AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+
+AC_SUBST([am__tar])
+AC_SUBST([am__untar])
+]) # _AM_PROG_TAR
+
+m4_include([gl/m4/00gnulib.m4])
+m4_include([gl/m4/absolute-header.m4])
+m4_include([gl/m4/alloca.m4])
+m4_include([gl/m4/btowc.m4])
+m4_include([gl/m4/builtin-expect.m4])
+m4_include([gl/m4/byteswap.m4])
+m4_include([gl/m4/codeset.m4])
+m4_include([gl/m4/configmake.m4])
+m4_include([gl/m4/eealloc.m4])
+m4_include([gl/m4/extensions.m4])
+m4_include([gl/m4/extern-inline.m4])
+m4_include([gl/m4/fcntl-o.m4])
+m4_include([gl/m4/fcntl_h.m4])
+m4_include([gl/m4/gettimeofday.m4])
+m4_include([gl/m4/glibc21.m4])
+m4_include([gl/m4/gnulib-common.m4])
+m4_include([gl/m4/gnulib-comp.m4])
+m4_include([gl/m4/gnulib-tool.m4])
+m4_include([gl/m4/hard-locale.m4])
+m4_include([gl/m4/include_next.m4])
+m4_include([gl/m4/langinfo_h.m4])
+m4_include([gl/m4/largefile.m4])
+m4_include([gl/m4/lib-ld.m4])
+m4_include([gl/m4/lib-link.m4])
+m4_include([gl/m4/lib-prefix.m4])
+m4_include([gl/m4/limits-h.m4])
+m4_include([gl/m4/localcharset.m4])
+m4_include([gl/m4/locale-fr.m4])
+m4_include([gl/m4/locale-ja.m4])
+m4_include([gl/m4/locale-zh.m4])
+m4_include([gl/m4/locale_h.m4])
+m4_include([gl/m4/localeconv.m4])
+m4_include([gl/m4/localtime-buffer.m4])
+m4_include([gl/m4/lock.m4])
+m4_include([gl/m4/longlong.m4])
+m4_include([gl/m4/lstat.m4])
+m4_include([gl/m4/malloca.m4])
+m4_include([gl/m4/mbrtowc.m4])
+m4_include([gl/m4/mbsinit.m4])
+m4_include([gl/m4/mbstate_t.m4])
+m4_include([gl/m4/mbtowc.m4])
+m4_include([gl/m4/mkstemps.m4])
+m4_include([gl/m4/multiarch.m4])
+m4_include([gl/m4/nl_langinfo.m4])
+m4_include([gl/m4/off_t.m4])
+m4_include([gl/m4/pathmax.m4])
+m4_include([gl/m4/pthread_rwlock_rdlock.m4])
+m4_include([gl/m4/regex.m4])
+m4_include([gl/m4/ssize_t.m4])
+m4_include([gl/m4/stat.m4])
+m4_include([gl/m4/stdbool.m4])
+m4_include([gl/m4/stddef_h.m4])
+m4_include([gl/m4/stdint.m4])
+m4_include([gl/m4/stdlib_h.m4])
+m4_include([gl/m4/sys_socket_h.m4])
+m4_include([gl/m4/sys_stat_h.m4])
+m4_include([gl/m4/sys_time_h.m4])
+m4_include([gl/m4/sys_types_h.m4])
+m4_include([gl/m4/tempname.m4])
+m4_include([gl/m4/threadlib.m4])
+m4_include([gl/m4/time_h.m4])
+m4_include([gl/m4/unistd_h.m4])
+m4_include([gl/m4/warn-on-use.m4])
+m4_include([gl/m4/wchar_h.m4])
+m4_include([gl/m4/wchar_t.m4])
+m4_include([gl/m4/wcrtomb.m4])
+m4_include([gl/m4/wctype_h.m4])
+m4_include([gl/m4/wint_t.m4])
+m4_include([conf/acinclude.m4])
+m4_include([conf/cppunit.m4])
+m4_include([conf/gcov_valgrind.m4])
+m4_include([conf/libtool.m4])
+m4_include([conf/ltoptions.m4])
+m4_include([conf/ltsugar.m4])
+m4_include([conf/ltversion.m4])
+m4_include([conf/lt~obsolete.m4])
+m4_include([conf/pkg.m4])
diff --git a/ce_expr.lex b/ce_expr.lex
new file mode 100644
index 0000000..0a6a219
--- /dev/null
+++ b/ce_expr.lex
@@ -0,0 +1,245 @@
+
+/*
+ -*- mode: c++; c-basic-offset:4 -*-
+
+ This file is part of libdap, A C++ implementation of the OPeNDAP Data
+ Access Protocol.
+
+ Copyright (c) 2002,2003 OPeNDAP, Inc.
+ Author: James Gallagher <jgallagher@opendap.org>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+ 
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+ 
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+ You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+ (c) COPYRIGHT URI/MIT 1994-1999
+*/ 
+
+/*
+  Scanner for constraint expressions. The scanner returns tokens for each of
+  the relational and selection operators. It requires GNU flex version 2.5.2
+  or newer.
+
+  The scanner is not reentrant, but can share a name space with other
+  scanners. 
+
+   Note:
+   1) The `defines' file expr.tab.h is built using `bison -d'.
+   2) Define YY_DECL such that the scanner is called `exprlex'.
+   3) When bison builds the expr.tab.h file, it uses `expr' instead of `yy'
+   for variable name prefixes (e.g., yylval --> exprlval).
+
+  jhrg 9/5/95
+*/
+
+%{
+
+#include "config.h"
+
+#include <cstdio>
+#include <string>
+#include <cstring>
+
+#ifndef YY_PROTO
+#define YY_PROTO(proto) proto
+#endif
+
+#define YY_DECL int ce_exprlex YY_PROTO(( void ))
+#define YY_FATAL_ERROR(msg) {\
+    throw(libdap::Error(malformed_expr, std::string("Error scanning constraint expression text: ") + std::string(msg))); \
+    yy_fatal_error(msg); /* see das.lex */ \
+}
+
+#include "Error.h"
+#include "parser.h"
+#include "expr.h"
+#include "RValue.h"
+#include "ce_expr.tab.hh"
+#include "escaping.h"
+
+using namespace libdap ;
+
+static void store_id();
+static void store_str();
+static void store_op(int op);
+
+%}
+
+%option noyywrap
+%option nounput
+%option noinput
+%option 8bit
+%option prefix="ce_expr"
+%option outfile="lex.ce_expr.cc"
+
+%x quote
+    
+/* In the DAS and DDS parsers I removed the INT and FLOAT lexemes. However,
+   not having them here complicates parsing since you must check to see if a
+   word is a number (like 2.3) or a variable called `2.3.' I'm assuming that
+   people will always put some characters in variable names (e.g., they'll
+   use `2300.7%20MHz' and not just `2300.7'). If that turns out to be a bad
+   assumption, the we'll have to put more code in the parser to figure out
+   what exactly each word is; is it a constant or a variable name. Time will
+   tell. 10/31/2001 jhrg */
+
+NAN		[Nn][Aa][Nn]
+INF		[Ii][Nn][Ff]
+/* See das.lex for comments about the characters allowed in a WORD.
+   10/31/2001 jhrg 
+
+   I've added '*' to the set of characters in a WORD for both the DDS and DAS
+   scanners, but not here because it'll conflict with the url dereference
+   operator. 6/10/2002 jhrg
+*/
+
+SCAN_WORD       [-+a-zA-Z0-9_/%.\\][-+a-zA-Z0-9_/%.\\#]*
+
+SCAN_EQUAL	    =
+SCAN_NOT_EQUAL	!=
+SCAN_GREATER	>
+SCAN_GREATER_EQL >=
+SCAN_LESS	    <
+SCAN_LESS_EQL	<=
+SCAN_REGEXP	    =~
+
+SCAN_HASH_BYTE    $Byte
+SCAN_HASH_INT16   $Int16
+SCAN_HASH_UINT16  $UInt16
+SCAN_HASH_INT32   $Int32
+SCAN_HASH_UINT32  $UInt32
+SCAN_HASH_FLOAT32 $Float32
+SCAN_HASH_FLOAT64 $Float64
+
+SCAN_STAR       \*
+
+NEVER		[^\-+a-zA-Z0-9_/%.\\:,(){}[\]&<>=~]
+
+%%
+
+"["    	return (int)*yytext;
+"]"    	return (int)*yytext;
+":"    	return (int)*yytext;
+","		return (int)*yytext;
+"&"		return (int)*yytext;
+"("		return (int)*yytext;
+")"		return (int)*yytext;
+"{"		return (int)*yytext;
+"}"		return (int)*yytext;
+
+{SCAN_WORD}	        store_id(); return SCAN_WORD;
+
+{SCAN_EQUAL}	    store_op(SCAN_EQUAL); return SCAN_EQUAL;
+{SCAN_NOT_EQUAL}    store_op(SCAN_NOT_EQUAL); return SCAN_NOT_EQUAL;
+{SCAN_GREATER}	    store_op(SCAN_GREATER); return SCAN_GREATER;
+{SCAN_GREATER_EQL}  store_op(SCAN_GREATER_EQL); return SCAN_GREATER_EQL;
+{SCAN_LESS}	        store_op(SCAN_LESS); return SCAN_LESS;
+{SCAN_LESS_EQL}	    store_op(SCAN_LESS_EQL); return SCAN_LESS_EQL;
+{SCAN_REGEXP}	    store_op(SCAN_REGEXP); return SCAN_REGEXP;
+
+{SCAN_STAR}         store_op(SCAN_STAR); return SCAN_STAR;
+
+{SCAN_HASH_BYTE}      return SCAN_HASH_BYTE;
+{SCAN_HASH_INT16}     return SCAN_HASH_INT16;
+{SCAN_HASH_UINT16}    return SCAN_HASH_UINT16;
+{SCAN_HASH_INT32}     return SCAN_HASH_INT32;
+{SCAN_HASH_UINT32}    return SCAN_HASH_UINT32;
+{SCAN_HASH_FLOAT32}   return SCAN_HASH_FLOAT32;
+{SCAN_HASH_FLOAT64}   return SCAN_HASH_FLOAT64;
+
+[ \t\r\n]+
+<INITIAL><<EOF>> yy_init = 1; yyterminate();
+
+\"		BEGIN(quote); yymore();
+
+<quote>[^"\\]*  yymore(); /*"*/
+
+<quote>\\.	yymore();
+
+<quote>\"	{ 
+    		  BEGIN(INITIAL); 
+              store_str();
+              return SCAN_STR;
+            }
+
+<quote><<EOF>>	{
+                  BEGIN(INITIAL);   /* resetting the state is needed for reentrant parsers */
+                  char msg[256];
+                  sprintf(msg, "Unterminated quote\n");
+                  YY_FATAL_ERROR(msg);
+                }
+
+{NEVER}         {
+                  if (yytext) {	/* suppress msgs about `' chars */
+                    fprintf(stderr, "Character `%c' is not", *yytext);
+                    fprintf(stderr, " allowed and has been ignored\n");
+                  }
+		        }
+%%
+
+// Three glue routines for string scanning. These are not declared in the
+// header expr.tab.h nor is YY_BUFFER_STATE. Including these here allows them
+// to see the type definitions in lex.expr.c (where YY_BUFFER_STATE is
+// defined) and allows callers to declare them (since callers outside of this
+// file cannot declare the YY_BUFFER_STATE variable). Note that I changed the
+// name of the expr_scan_string function to expr_string because C++ cannot
+// distinguish by return type. 1/12/99 jhrg
+
+void *
+ce_expr_string(const char *str)
+{
+    return (void *)ce_expr_scan_string(str);
+}
+
+void
+ce_expr_switch_to_buffer(void *buf)
+{
+    ce_expr_switch_to_buffer((YY_BUFFER_STATE)buf);
+}
+
+void
+ce_expr_delete_buffer(void *buf)
+{
+    ce_expr_delete_buffer((YY_BUFFER_STATE)buf);
+}
+
+static void
+store_id()
+{
+    strncpy(ce_exprlval.id, yytext, ID_MAX-1);
+    ce_exprlval.id[ID_MAX-1] = '\0';
+}
+
+static void
+store_str()
+{
+    // transform %20 to a space. 7/11/2001 jhrg
+    string *s = new string(yytext); // move all calls of www2id into the parser. jhrg 7/5/13 www2id(string(yytext)));
+
+    if (*s->begin() == '\"' && *(s->end()-1) == '\"') {
+	s->erase(s->begin());
+	s->erase(s->end()-1);
+    }
+
+    ce_exprlval.val.type = dods_str_c;
+    ce_exprlval.val.v.s = s;
+}
+
+static void
+store_op(int op)
+{
+    ce_exprlval.op = op;
+}
+
diff --git a/ce_expr.tab.cc b/ce_expr.tab.cc
new file mode 100644
index 0000000..fa0b19f
--- /dev/null
+++ b/ce_expr.tab.cc
@@ -0,0 +1,2998 @@
+/* A Bison parser, made by GNU Bison 3.0.4.  */
+
+/* Bison implementation for Yacc-like parsers in C
+
+   Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
+
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
+
+/* C LALR(1) parser skeleton written by Richard Stallman, by
+   simplifying the original so-called "semantic" parser.  */
+
+/* All symbols defined below should begin with yy or YY, to avoid
+   infringing on user name space.  This should be done even for local
+   variables, as they might otherwise be expanded by user macros.
+   There are some unavoidable exceptions within include files to
+   define necessary library symbols; they are noted "INFRINGES ON
+   USER NAME SPACE" below.  */
+
+/* Identify Bison output.  */
+#define YYBISON 1
+
+/* Bison version.  */
+#define YYBISON_VERSION "3.0.4"
+
+/* Skeleton name.  */
+#define YYSKELETON_NAME "yacc.c"
+
+/* Pure parsers.  */
+#define YYPURE 0
+
+/* Push parsers.  */
+#define YYPUSH 0
+
+/* Pull parsers.  */
+#define YYPULL 1
+
+
+/* Substitute the variable and function names.  */
+#define yyparse         ce_exprparse
+#define yylex           ce_exprlex
+#define yyerror         ce_exprerror
+#define yydebug         ce_exprdebug
+#define yynerrs         ce_exprnerrs
+
+#define yylval          ce_exprlval
+#define yychar          ce_exprchar
+
+/* Copy the first part of user declarations.  */
+
+#line 75 "ce_expr.tab.cc" /* yacc.c:339  */
+
+# ifndef YY_NULLPTR
+#  if defined __cplusplus && 201103L <= __cplusplus
+#   define YY_NULLPTR nullptr
+#  else
+#   define YY_NULLPTR 0
+#  endif
+# endif
+
+/* Enabling verbose error messages.  */
+#ifdef YYERROR_VERBOSE
+# undef YYERROR_VERBOSE
+# define YYERROR_VERBOSE 1
+#else
+# define YYERROR_VERBOSE 0
+#endif
+
+/* In a future release of Bison, this section will be replaced
+   by #include "ce_expr.tab.hh".  */
+#ifndef YY_CE_EXPR_CE_EXPR_TAB_HH_INCLUDED
+# define YY_CE_EXPR_CE_EXPR_TAB_HH_INCLUDED
+/* Debug traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 1
+#endif
+#if YYDEBUG
+extern int ce_exprdebug;
+#endif
+/* "%code requires" blocks.  */
+#line 41 "ce_expr.yy" /* yacc.c:355  */
+
+
+#include "config.h"
+
+#include <cassert>
+#include <cstdlib>
+#include <cstring>
+
+#include <iostream>
+#include <sstream>
+#include <iterator>
+#include <string>
+#include <stack>
+
+//#define DODS_DEBUG
+
+#include "debug.h"
+#include "escaping.h"
+
+#include "DDS.h"
+#include "ConstraintEvaluator.h"
+
+#include "BaseType.h"
+
+#include "Byte.h"
+#include "Int16.h"
+#include "UInt16.h"
+#include "Int32.h"
+#include "UInt32.h"
+#include "Float32.h"
+#include "Float64.h"
+#include "Str.h"
+#include "Url.h"
+#include "Array.h"
+#include "Structure.h"
+#include "Sequence.h"
+#include "Grid.h"
+
+#include "Error.h"
+
+#include "util.h"
+#include "parser.h"
+#include "ce_parser.h"
+#include "expr.h"
+#include "RValue.h"
+
+using std::cerr;
+using std::endl;
+using namespace libdap ;
+
+#define EVALUATOR(arg) (static_cast<ce_parser_arg*>(arg)->get_eval())
+#define DDS(arg) (static_cast<ce_parser_arg*>(arg)->get_dds())
+
+// #define YYPARSE_PARAM arg
+
+int ce_exprlex(void);		/* the scanner; see expr.lex */
+
+void ce_exprerror(ce_parser_arg *arg, const string &s); 
+void ce_exprerror(ce_parser_arg *arg, const string &s, const string &s2);
+void no_such_func(ce_parser_arg *arg, const string &name);
+void no_such_ident(ce_parser_arg *arg, const string &name, const string &word);
+
+int_list *make_array_index(value &i1, value &i2, value &i3);
+int_list *make_array_index(value &i1, value &i2);
+int_list *make_array_index(value &i1);
+int_list_list *make_array_indices(int_list *index);
+int_list_list *append_array_index(int_list_list *indices, int_list *index);
+
+void delete_array_indices(int_list_list *indices);
+bool bracket_projection(DDS &table, const char *name, int_list_list *indices);
+
+void process_array_indices(BaseType *variable, int_list_list *indices); 
+void process_grid_indices(BaseType *variable, int_list_list *indices); 
+void process_sequence_indices(BaseType *variable, int_list_list *indices);
+
+/* Replace these with method calls. jhrg 8/31/06 */
+bool is_array_t(BaseType *variable);
+bool is_grid_t(BaseType *variable);
+bool is_sequence_t(BaseType *variable);
+
+BaseType *make_variable(ConstraintEvaluator &eval, const value &val);
+bool_func get_function(const ConstraintEvaluator &eval, const char *name);
+btp_func get_btp_function(const ConstraintEvaluator &eval, const char *name);
+proj_func get_proj_function(const ConstraintEvaluator &eval, const char *name);
+
+template<class arg_list, class arg_type>
+arg_list make_fast_arg_list(unsigned long vector_size_hint, arg_type arg_value);
+
+template<class arg_list, class arg_type>
+arg_list make_fast_arg_list(arg_list int_values, arg_type arg_value);
+
+template<class t, class T>
+rvalue *build_constant_array(vector<t> *values, DDS *dds);
+
+
+#line 201 "ce_expr.tab.cc" /* yacc.c:355  */
+
+/* Token type.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+  enum yytokentype
+  {
+    SCAN_STR = 258,
+    SCAN_WORD = 259,
+    SCAN_EQUAL = 260,
+    SCAN_NOT_EQUAL = 261,
+    SCAN_GREATER = 262,
+    SCAN_GREATER_EQL = 263,
+    SCAN_LESS = 264,
+    SCAN_LESS_EQL = 265,
+    SCAN_REGEXP = 266,
+    SCAN_STAR = 267,
+    SCAN_HASH_BYTE = 268,
+    SCAN_HASH_INT16 = 269,
+    SCAN_HASH_UINT16 = 270,
+    SCAN_HASH_INT32 = 271,
+    SCAN_HASH_UINT32 = 272,
+    SCAN_HASH_FLOAT32 = 273,
+    SCAN_HASH_FLOAT64 = 274
+  };
+#endif
+
+/* Value type.  */
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+
+union YYSTYPE
+{
+#line 145 "ce_expr.yy" /* yacc.c:355  */
+
+    bool boolean;
+    int op;
+    char id[ID_MAX];
+    
+    libdap::dods_byte byte_value;
+    libdap::dods_int16 int16_value;
+    libdap::dods_uint16 uint16_value;
+    libdap::dods_int32 int32_value;
+    libdap::dods_uint32 uint32_value;
+    libdap::dods_float32 float32_value;
+    libdap::dods_float64 float64_value;
+    
+    libdap::byte_arg_list byte_values;
+    libdap::int16_arg_list int16_values;
+    libdap::uint16_arg_list uint16_values;
+    libdap::int32_arg_list int32_values;
+    libdap::uint32_arg_list uint32_values;
+    libdap::float32_arg_list float32_values;
+    libdap::float64_arg_list float64_values;
+    
+    libdap::value val;               // value is defined in expr.h
+
+    libdap::bool_func b_func;
+    libdap::btp_func bt_func;
+
+    libdap::int_list *int_l_ptr;
+    libdap::int_list_list *int_ll_ptr;
+    
+    libdap::rvalue *rval_ptr;
+    libdap::rvalue_list *r_val_l_ptr;
+
+#line 266 "ce_expr.tab.cc" /* yacc.c:355  */
+};
+
+typedef union YYSTYPE YYSTYPE;
+# define YYSTYPE_IS_TRIVIAL 1
+# define YYSTYPE_IS_DECLARED 1
+#endif
+
+
+extern YYSTYPE ce_exprlval;
+
+int ce_exprparse (ce_parser_arg *arg);
+
+#endif /* !YY_CE_EXPR_CE_EXPR_TAB_HH_INCLUDED  */
+
+/* Copy the second part of user declarations.  */
+
+#line 283 "ce_expr.tab.cc" /* yacc.c:358  */
+/* Unqualified %code blocks.  */
+#line 232 "ce_expr.yy" /* yacc.c:359  */
+
+/* This global is used by the rule 'arg_length_hint' so that the hint can 
+   be used during the paraent rule's parse. See fast_int32_arg_list. */
+unsigned long arg_length_hint_value = 0;
+
+#line 291 "ce_expr.tab.cc" /* yacc.c:359  */
+
+#ifdef short
+# undef short
+#endif
+
+#ifdef YYTYPE_UINT8
+typedef YYTYPE_UINT8 yytype_uint8;
+#else
+typedef unsigned char yytype_uint8;
+#endif
+
+#ifdef YYTYPE_INT8
+typedef YYTYPE_INT8 yytype_int8;
+#else
+typedef signed char yytype_int8;
+#endif
+
+#ifdef YYTYPE_UINT16
+typedef YYTYPE_UINT16 yytype_uint16;
+#else
+typedef unsigned short int yytype_uint16;
+#endif
+
+#ifdef YYTYPE_INT16
+typedef YYTYPE_INT16 yytype_int16;
+#else
+typedef short int yytype_int16;
+#endif
+
+#ifndef YYSIZE_T
+# ifdef __SIZE_TYPE__
+#  define YYSIZE_T __SIZE_TYPE__
+# elif defined size_t
+#  define YYSIZE_T size_t
+# elif ! defined YYSIZE_T
+#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYSIZE_T size_t
+# else
+#  define YYSIZE_T unsigned int
+# endif
+#endif
+
+#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
+
+#ifndef YY_
+# if defined YYENABLE_NLS && YYENABLE_NLS
+#  if ENABLE_NLS
+#   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
+#   define YY_(Msgid) dgettext ("bison-runtime", Msgid)
+#  endif
+# endif
+# ifndef YY_
+#  define YY_(Msgid) Msgid
+# endif
+#endif
+
+#ifndef YY_ATTRIBUTE
+# if (defined __GNUC__                                               \
+      && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__)))  \
+     || defined __SUNPRO_C && 0x5110 <= __SUNPRO_C
+#  define YY_ATTRIBUTE(Spec) __attribute__(Spec)
+# else
+#  define YY_ATTRIBUTE(Spec) /* empty */
+# endif
+#endif
+
+#ifndef YY_ATTRIBUTE_PURE
+# define YY_ATTRIBUTE_PURE   YY_ATTRIBUTE ((__pure__))
+#endif
+
+#ifndef YY_ATTRIBUTE_UNUSED
+# define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__))
+#endif
+
+#if !defined _Noreturn \
+     && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112)
+# if defined _MSC_VER && 1200 <= _MSC_VER
+#  define _Noreturn __declspec (noreturn)
+# else
+#  define _Noreturn YY_ATTRIBUTE ((__noreturn__))
+# endif
+#endif
+
+/* Suppress unused-variable warnings by "using" E.  */
+#if ! defined lint || defined __GNUC__
+# define YYUSE(E) ((void) (E))
+#else
+# define YYUSE(E) /* empty */
+#endif
+
+#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
+/* Suppress an incorrect diagnostic about yylval being uninitialized.  */
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
+    _Pragma ("GCC diagnostic push") \
+    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\
+    _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END \
+    _Pragma ("GCC diagnostic pop")
+#else
+# define YY_INITIAL_VALUE(Value) Value
+#endif
+#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END
+#endif
+#ifndef YY_INITIAL_VALUE
+# define YY_INITIAL_VALUE(Value) /* Nothing. */
+#endif
+
+
+#if ! defined yyoverflow || YYERROR_VERBOSE
+
+/* The parser invokes alloca or malloc; define the necessary symbols.  */
+
+# ifdef YYSTACK_USE_ALLOCA
+#  if YYSTACK_USE_ALLOCA
+#   ifdef __GNUC__
+#    define YYSTACK_ALLOC __builtin_alloca
+#   elif defined __BUILTIN_VA_ARG_INCR
+#    include <alloca.h> /* INFRINGES ON USER NAME SPACE */
+#   elif defined _AIX
+#    define YYSTACK_ALLOC __alloca
+#   elif defined _MSC_VER
+#    include <malloc.h> /* INFRINGES ON USER NAME SPACE */
+#    define alloca _alloca
+#   else
+#    define YYSTACK_ALLOC alloca
+#    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS
+#     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+      /* Use EXIT_SUCCESS as a witness for stdlib.h.  */
+#     ifndef EXIT_SUCCESS
+#      define EXIT_SUCCESS 0
+#     endif
+#    endif
+#   endif
+#  endif
+# endif
+
+# ifdef YYSTACK_ALLOC
+   /* Pacify GCC's 'empty if-body' warning.  */
+#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+    /* The OS might guarantee only one guard page at the bottom of the stack,
+       and a page size can be as small as 4096 bytes.  So we cannot safely
+       invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
+       to allow for a few compiler-allocated temporary stack slots.  */
+#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
+#  endif
+# else
+#  define YYSTACK_ALLOC YYMALLOC
+#  define YYSTACK_FREE YYFREE
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+#   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
+#  endif
+#  if (defined __cplusplus && ! defined EXIT_SUCCESS \
+       && ! ((defined YYMALLOC || defined malloc) \
+             && (defined YYFREE || defined free)))
+#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#   ifndef EXIT_SUCCESS
+#    define EXIT_SUCCESS 0
+#   endif
+#  endif
+#  ifndef YYMALLOC
+#   define YYMALLOC malloc
+#   if ! defined malloc && ! defined EXIT_SUCCESS
+void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+#  ifndef YYFREE
+#   define YYFREE free
+#   if ! defined free && ! defined EXIT_SUCCESS
+void free (void *); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+# endif
+#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
+
+
+#if (! defined yyoverflow \
+     && (! defined __cplusplus \
+         || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+
+/* A type that is properly aligned for any stack member.  */
+union yyalloc
+{
+  yytype_int16 yyss_alloc;
+  YYSTYPE yyvs_alloc;
+};
+
+/* The size of the maximum gap between one aligned stack and the next.  */
+# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
+
+/* The size of an array large to enough to hold all stacks, each with
+   N elements.  */
+# define YYSTACK_BYTES(N) \
+     ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
+      + YYSTACK_GAP_MAXIMUM)
+
+# define YYCOPY_NEEDED 1
+
+/* Relocate STACK from its old location to the new one.  The
+   local variables YYSIZE and YYSTACKSIZE give the old and new number of
+   elements in the stack, and YYPTR gives the new location of the
+   stack.  Advance YYPTR to a properly aligned location for the next
+   stack.  */
+# define YYSTACK_RELOCATE(Stack_alloc, Stack)                           \
+    do                                                                  \
+      {                                                                 \
+        YYSIZE_T yynewbytes;                                            \
+        YYCOPY (&yyptr->Stack_alloc, Stack, yysize);                    \
+        Stack = &yyptr->Stack_alloc;                                    \
+        yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
+        yyptr += yynewbytes / sizeof (*yyptr);                          \
+      }                                                                 \
+    while (0)
+
+#endif
+
+#if defined YYCOPY_NEEDED && YYCOPY_NEEDED
+/* Copy COUNT objects from SRC to DST.  The source and destination do
+   not overlap.  */
+# ifndef YYCOPY
+#  if defined __GNUC__ && 1 < __GNUC__
+#   define YYCOPY(Dst, Src, Count) \
+      __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src)))
+#  else
+#   define YYCOPY(Dst, Src, Count)              \
+      do                                        \
+        {                                       \
+          YYSIZE_T yyi;                         \
+          for (yyi = 0; yyi < (Count); yyi++)   \
+            (Dst)[yyi] = (Src)[yyi];            \
+        }                                       \
+      while (0)
+#  endif
+# endif
+#endif /* !YYCOPY_NEEDED */
+
+/* YYFINAL -- State number of the termination state.  */
+#define YYFINAL  28
+/* YYLAST -- Last index in YYTABLE.  */
+#define YYLAST   167
+
+/* YYNTOKENS -- Number of terminals.  */
+#define YYNTOKENS  29
+/* YYNNTS -- Number of nonterminals.  */
+#define YYNNTS  36
+/* YYNRULES -- Number of rules.  */
+#define YYNRULES  80
+/* YYNSTATES -- Number of states.  */
+#define YYNSTATES  149
+
+/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
+   by yylex, with out-of-bounds checking.  */
+#define YYUNDEFTOK  2
+#define YYMAXUTOK   274
+
+#define YYTRANSLATE(YYX)                                                \
+  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
+
+/* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM
+   as returned by yylex, without out-of-bounds checking.  */
+static const yytype_uint8 yytranslate[] =
+{
+       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,    20,     2,
+      22,    24,     2,     2,    21,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,    23,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,    27,     2,    28,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,    25,     2,    26,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19
+};
+
+#if YYDEBUG
+  /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
+static const yytype_uint16 yyrline[] =
+{
+       0,   241,   241,   247,   249,   249,   253,   259,   260,   266,
+     278,   282,   286,   310,   316,   322,   328,   334,   340,   346,
+     355,   366,   370,   377,   384,   388,   395,   402,   406,   413,
+     420,   424,   431,   438,   442,   449,   456,   460,   467,   474,
+     478,   485,   492,   514,   515,   521,   530,   541,   548,   562,
+     563,   573,   577,   583,   590,   599,   604,   609,   647,   671,
+     684,   690,   699,   705,   716,   721,   735,   739,   753,   762,
+     769,   781,   792,   807,   823,   824,   825,   826,   827,   828,
+     829
+};
+#endif
+
+#if YYDEBUG || YYERROR_VERBOSE || 0
+/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
+   First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
+static const char *const yytname[] =
+{
+  "$end", "error", "$undefined", "SCAN_STR", "SCAN_WORD", "SCAN_EQUAL",
+  "SCAN_NOT_EQUAL", "SCAN_GREATER", "SCAN_GREATER_EQL", "SCAN_LESS",
+  "SCAN_LESS_EQL", "SCAN_REGEXP", "SCAN_STAR", "SCAN_HASH_BYTE",
+  "SCAN_HASH_INT16", "SCAN_HASH_UINT16", "SCAN_HASH_INT32",
+  "SCAN_HASH_UINT32", "SCAN_HASH_FLOAT32", "SCAN_HASH_FLOAT64", "'&'",
+  "','", "'('", "':'", "')'", "'{'", "'}'", "'['", "']'", "$accept",
+  "constraint_expr", "$@1", "projection", "proj_clause",
+  "array_const_special_form", "arg_length_hint", "fast_byte_arg_list",
+  "fast_byte_arg", "fast_int16_arg_list", "fast_int16_arg",
+  "fast_uint16_arg_list", "fast_uint16_arg", "fast_int32_arg_list",
+  "fast_int32_arg", "fast_uint32_arg_list", "fast_uint32_arg",
+  "fast_float32_arg_list", "fast_float32_arg", "fast_float64_arg_list",
+  "fast_float64_arg", "proj_function", "selection", "clause",
+  "bool_function", "r_value", "r_value_list", "arg_list", "id_or_const",
+  "array_projection_rvalue", "array_projection", "array_proj_clause",
+  "name", "array_indices", "array_index", "rel_op", YY_NULLPTR
+};
+#endif
+
+# ifdef YYPRINT
+/* YYTOKNUM[NUM] -- (External) token number corresponding to the
+   (internal) symbol number NUM (which must be that of a token).  */
+static const yytype_uint16 yytoknum[] =
+{
+       0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
+     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
+      38,    44,    40,    58,    41,   123,   125,    91,    93
+};
+# endif
+
+#define YYPACT_NINF -57
+
+#define yypact_value_is_default(Yystate) \
+  (!!((Yystate) == (-57)))
+
+#define YYTABLE_NINF -66
+
+#define yytable_value_is_error(Yytable_value) \
+  0
+
+  /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+     STATE-NUM.  */
+static const yytype_int16 yypact[] =
+{
+      49,   -57,    -5,    15,    24,    25,    34,    36,    64,   103,
+     -57,    28,    12,    60,   -57,   -57,   -57,     6,    -2,    57,
+      22,    22,    22,    22,    22,    22,    22,    74,   -57,    74,
+      81,   -57,    -2,     9,    -2,   -57,    21,   -15,   -57,   -57,
+     101,   102,   -57,   -57,    -2,   -57,   104,   105,   106,   107,
+     108,   109,   110,   -11,   114,   -57,   -57,    96,   114,   -57,
+      -2,     8,   111,   -57,    57,    57,   -57,    -2,   131,   132,
+     133,   134,   136,   137,   138,    57,    74,   -57,   -57,   -57,
+     -57,   -57,   -57,   -57,    26,    10,   -57,   -57,   119,   -57,
+     -57,    58,   -57,   -57,    59,   -57,   -57,    93,   -57,   -57,
+      94,   -57,   -57,    95,   -57,   -57,    99,   -57,   -57,   100,
+     -57,   120,   -57,    57,   -57,    27,   117,   -57,   131,   -57,
+     132,   -57,   133,   -57,   134,   -57,   136,   -57,   137,   -57,
+     138,   -57,     4,    33,    11,   -57,   -57,   -57,   -57,   -57,
+     -57,   -57,   -57,   -57,   -57,   118,   121,   -57,   -57
+};
+
+  /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
+     Performed when YYTABLE does not specify something else to do.  Zero
+     means the default is an error.  */
+static const yytype_uint8 yydefact[] =
+{
+       2,    65,    64,     0,     0,     0,     0,     0,     0,     0,
+       4,     0,     3,     7,    12,    10,    11,    60,     9,    56,
+       0,     0,     0,     0,     0,     0,     0,     0,     1,     0,
+       0,    64,    62,     0,    61,    66,    58,    57,    51,    53,
+      55,     0,    49,    52,     0,    20,     0,     0,     0,     0,
+       0,     0,     0,    57,     5,    43,    47,     0,     6,     8,
+      63,     0,     0,    67,    56,     0,    42,    59,     0,     0,
+       0,     0,     0,     0,     0,    56,     0,    74,    75,    76,
+      77,    78,    79,    80,     0,     0,    68,    69,     0,    54,
+      23,     0,    21,    26,     0,    24,    29,     0,    27,    32,
+       0,    30,    35,     0,    33,    38,     0,    36,    41,     0,
+      39,     0,    44,     0,    46,     0,     0,    50,     0,    13,
+       0,    14,     0,    15,     0,    16,     0,    17,     0,    18,
+       0,    19,    50,     0,     0,    70,    71,    22,    25,    28,
+      31,    34,    37,    40,    45,     0,     0,    72,    73
+};
+
+  /* YYPGOTO[NTERM-NUM].  */
+static const yytype_int8 yypgoto[] =
+{
+     -57,   -57,   -57,   122,   -57,     5,    87,   -57,    29,   -57,
+      30,   -57,    31,   -57,    32,   -57,    35,   -57,    20,   -57,
+      37,   -57,   125,    75,   -57,   -27,    42,   -56,   -57,   -57,
+     -57,   -57,     3,   -26,   -33,   -57
+};
+
+  /* YYDEFGOTO[NTERM-NUM].  */
+static const yytype_int8 yydefgoto[] =
+{
+      -1,    11,    27,    12,    13,    38,    46,    91,    92,    94,
+      95,    97,    98,   100,   101,   103,   104,   106,   107,   109,
+     110,    15,    54,    55,    56,    39,    40,    41,    42,    43,
+      16,    17,    44,    34,    35,    84
+};
+
+  /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
+     positive, shift that token.  If negative, reduce the rule whose
+     number is the opposite.  If YYTABLE_NINF, syntax error.  */
+static const yytype_int16 yytable[] =
+{
+      57,    63,    57,    18,   -48,    14,    60,    64,    88,     1,
+      31,    75,   -64,    61,   115,   145,   -64,    19,    67,   111,
+      32,    62,   116,   146,   -48,    33,    45,    63,    28,    36,
+      37,    85,    29,    18,    63,    14,    86,    20,    89,     3,
+       4,     5,     6,     7,     8,     9,    21,    22,   -65,    57,
+     134,   113,     1,     2,    65,   135,    23,   114,    24,   144,
+      36,    37,     3,     4,     5,     6,     7,     8,     9,    10,
+       3,     4,     5,     6,     7,     8,     9,    36,    53,   118,
+     120,    30,   119,   121,     1,     2,    25,     3,     4,     5,
+       6,     7,     8,     9,     3,     4,     5,     6,     7,     8,
+       9,    77,    78,    79,    80,    81,    82,    83,    47,    48,
+      49,    50,    51,    52,   122,   124,   126,   123,   125,   127,
+     128,   130,    65,   129,   131,    26,    66,    68,    69,    70,
+      71,    72,    73,    74,    76,    90,    93,    96,    99,    87,
+     102,   105,   108,   117,   132,   136,   147,   137,   142,   148,
+     138,   112,    59,   139,    58,   133,   140,     0,     0,     0,
+       0,   141,     0,     0,     0,     0,     0,   143
+};
+
+static const yytype_int16 yycheck[] =
+{
+      27,    34,    29,     0,     0,     0,    32,    22,    64,     3,
+       4,    22,    27,     4,     4,     4,    27,    22,    44,    75,
+      17,    12,    12,    12,    20,    27,     4,    60,     0,     3,
+       4,    23,    20,    30,    67,    30,    28,    22,    65,    13,
+      14,    15,    16,    17,    18,    19,    22,    22,    27,    76,
+      23,    25,     3,     4,    21,    28,    22,    84,    22,    26,
+       3,     4,    13,    14,    15,    16,    17,    18,    19,    20,
+      13,    14,    15,    16,    17,    18,    19,     3,     4,    21,
+      21,    21,    24,    24,     3,     4,    22,    13,    14,    15,
+      16,    17,    18,    19,    13,    14,    15,    16,    17,    18,
+      19,     5,     6,     7,     8,     9,    10,    11,    21,    22,
+      23,    24,    25,    26,    21,    21,    21,    24,    24,    24,
+      21,    21,    21,    24,    24,    22,    24,    23,    23,    23,
+      23,    23,    23,    23,    20,     4,     4,     4,     4,    28,
+       4,     4,     4,    24,    24,    28,    28,   118,   128,    28,
+     120,    76,    30,   122,    29,   113,   124,    -1,    -1,    -1,
+      -1,   126,    -1,    -1,    -1,    -1,    -1,   130
+};
+
+  /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+     symbol of state STATE-NUM.  */
+static const yytype_uint8 yystos[] =
+{
+       0,     3,     4,    13,    14,    15,    16,    17,    18,    19,
+      20,    30,    32,    33,    34,    50,    59,    60,    61,    22,
+      22,    22,    22,    22,    22,    22,    22,    31,     0,    20,
+      21,     4,    61,    27,    62,    63,     3,     4,    34,    54,
+      55,    56,    57,    58,    61,     4,    35,    35,    35,    35,
+      35,    35,    35,     4,    51,    52,    53,    54,    51,    32,
+      62,     4,    12,    63,    22,    21,    24,    62,    23,    23,
+      23,    23,    23,    23,    23,    22,    20,     5,     6,     7,
+       8,     9,    10,    11,    64,    23,    28,    28,    56,    54,
+       4,    36,    37,     4,    38,    39,     4,    40,    41,     4,
+      42,    43,     4,    44,    45,     4,    46,    47,     4,    48,
+      49,    56,    52,    25,    54,     4,    12,    24,    21,    24,
+      21,    24,    21,    24,    21,    24,    21,    24,    21,    24,
+      21,    24,    24,    55,    23,    28,    28,    37,    39,    41,
+      43,    45,    47,    49,    26,     4,    12,    28,    28
+};
+
+  /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
+static const yytype_uint8 yyr1[] =
+{
+       0,    29,    30,    30,    31,    30,    30,    32,    32,    33,
+      33,    33,    33,    34,    34,    34,    34,    34,    34,    34,
+      35,    36,    36,    37,    38,    38,    39,    40,    40,    41,
+      42,    42,    43,    44,    44,    45,    46,    46,    47,    48,
+      48,    49,    50,    51,    51,    52,    52,    52,    53,    54,
+      54,    54,    54,    55,    55,    56,    56,    57,    57,    58,
+      59,    60,    60,    60,    61,    61,    62,    62,    63,    63,
+      63,    63,    63,    63,    64,    64,    64,    64,    64,    64,
+      64
+};
+
+  /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
+static const yytype_uint8 yyr2[] =
+{
+       0,     2,     0,     1,     0,     3,     3,     1,     3,     1,
+       1,     1,     1,     6,     6,     6,     6,     6,     6,     6,
+       1,     1,     3,     1,     1,     3,     1,     1,     3,     1,
+       1,     3,     1,     1,     3,     1,     1,     3,     1,     1,
+       3,     1,     4,     1,     3,     5,     3,     1,     4,     1,
+       4,     1,     1,     1,     3,     1,     0,     1,     1,     2,
+       1,     2,     2,     3,     1,     1,     1,     2,     3,     3,
+       5,     5,     7,     7,     1,     1,     1,     1,     1,     1,
+       1
+};
+
+
+#define yyerrok         (yyerrstatus = 0)
+#define yyclearin       (yychar = YYEMPTY)
+#define YYEMPTY         (-2)
+#define YYEOF           0
+
+#define YYACCEPT        goto yyacceptlab
+#define YYABORT         goto yyabortlab
+#define YYERROR         goto yyerrorlab
+
+
+#define YYRECOVERING()  (!!yyerrstatus)
+
+#define YYBACKUP(Token, Value)                                  \
+do                                                              \
+  if (yychar == YYEMPTY)                                        \
+    {                                                           \
+      yychar = (Token);                                         \
+      yylval = (Value);                                         \
+      YYPOPSTACK (yylen);                                       \
+      yystate = *yyssp;                                         \
+      goto yybackup;                                            \
+    }                                                           \
+  else                                                          \
+    {                                                           \
+      yyerror (arg, YY_("syntax error: cannot back up")); \
+      YYERROR;                                                  \
+    }                                                           \
+while (0)
+
+/* Error token number */
+#define YYTERROR        1
+#define YYERRCODE       256
+
+
+
+/* Enable debugging if requested.  */
+#if YYDEBUG
+
+# ifndef YYFPRINTF
+#  include <stdio.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYFPRINTF fprintf
+# endif
+
+# define YYDPRINTF(Args)                        \
+do {                                            \
+  if (yydebug)                                  \
+    YYFPRINTF Args;                             \
+} while (0)
+
+/* This macro is provided for backward compatibility. */
+#ifndef YY_LOCATION_PRINT
+# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+#endif
+
+
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)                    \
+do {                                                                      \
+  if (yydebug)                                                            \
+    {                                                                     \
+      YYFPRINTF (stderr, "%s ", Title);                                   \
+      yy_symbol_print (stderr,                                            \
+                  Type, Value, arg); \
+      YYFPRINTF (stderr, "\n");                                           \
+    }                                                                     \
+} while (0)
+
+
+/*----------------------------------------.
+| Print this symbol's value on YYOUTPUT.  |
+`----------------------------------------*/
+
+static void
+yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, ce_parser_arg *arg)
+{
+  FILE *yyo = yyoutput;
+  YYUSE (yyo);
+  YYUSE (arg);
+  if (!yyvaluep)
+    return;
+# ifdef YYPRINT
+  if (yytype < YYNTOKENS)
+    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+# endif
+  YYUSE (yytype);
+}
+
+
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
+
+static void
+yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, ce_parser_arg *arg)
+{
+  YYFPRINTF (yyoutput, "%s %s (",
+             yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]);
+
+  yy_symbol_value_print (yyoutput, yytype, yyvaluep, arg);
+  YYFPRINTF (yyoutput, ")");
+}
+
+/*------------------------------------------------------------------.
+| yy_stack_print -- Print the state stack from its BOTTOM up to its |
+| TOP (included).                                                   |
+`------------------------------------------------------------------*/
+
+static void
+yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
+{
+  YYFPRINTF (stderr, "Stack now");
+  for (; yybottom <= yytop; yybottom++)
+    {
+      int yybot = *yybottom;
+      YYFPRINTF (stderr, " %d", yybot);
+    }
+  YYFPRINTF (stderr, "\n");
+}
+
+# define YY_STACK_PRINT(Bottom, Top)                            \
+do {                                                            \
+  if (yydebug)                                                  \
+    yy_stack_print ((Bottom), (Top));                           \
+} while (0)
+
+
+/*------------------------------------------------.
+| Report that the YYRULE is going to be reduced.  |
+`------------------------------------------------*/
+
+static void
+yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule, ce_parser_arg *arg)
+{
+  unsigned long int yylno = yyrline[yyrule];
+  int yynrhs = yyr2[yyrule];
+  int yyi;
+  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
+             yyrule - 1, yylno);
+  /* The symbols being reduced.  */
+  for (yyi = 0; yyi < yynrhs; yyi++)
+    {
+      YYFPRINTF (stderr, "   $%d = ", yyi + 1);
+      yy_symbol_print (stderr,
+                       yystos[yyssp[yyi + 1 - yynrhs]],
+                       &(yyvsp[(yyi + 1) - (yynrhs)])
+                                              , arg);
+      YYFPRINTF (stderr, "\n");
+    }
+}
+
+# define YY_REDUCE_PRINT(Rule)          \
+do {                                    \
+  if (yydebug)                          \
+    yy_reduce_print (yyssp, yyvsp, Rule, arg); \
+} while (0)
+
+/* Nonzero means print parse trace.  It is left uninitialized so that
+   multiple parsers can coexist.  */
+int yydebug;
+#else /* !YYDEBUG */
+# define YYDPRINTF(Args)
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
+# define YY_STACK_PRINT(Bottom, Top)
+# define YY_REDUCE_PRINT(Rule)
+#endif /* !YYDEBUG */
+
+
+/* YYINITDEPTH -- initial size of the parser's stacks.  */
+#ifndef YYINITDEPTH
+# define YYINITDEPTH 200
+#endif
+
+/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
+   if the built-in stack extension method is used).
+
+   Do not make this value too large; the results are undefined if
+   YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
+   evaluated with infinite-precision integer arithmetic.  */
+
+#ifndef YYMAXDEPTH
+# define YYMAXDEPTH 10000
+#endif
+
+
+#if YYERROR_VERBOSE
+
+# ifndef yystrlen
+#  if defined __GLIBC__ && defined _STRING_H
+#   define yystrlen strlen
+#  else
+/* Return the length of YYSTR.  */
+static YYSIZE_T
+yystrlen (const char *yystr)
+{
+  YYSIZE_T yylen;
+  for (yylen = 0; yystr[yylen]; yylen++)
+    continue;
+  return yylen;
+}
+#  endif
+# endif
+
+# ifndef yystpcpy
+#  if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
+#   define yystpcpy stpcpy
+#  else
+/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
+   YYDEST.  */
+static char *
+yystpcpy (char *yydest, const char *yysrc)
+{
+  char *yyd = yydest;
+  const char *yys = yysrc;
+
+  while ((*yyd++ = *yys++) != '\0')
+    continue;
+
+  return yyd - 1;
+}
+#  endif
+# endif
+
+# ifndef yytnamerr
+/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
+   quotes and backslashes, so that it's suitable for yyerror.  The
+   heuristic is that double-quoting is unnecessary unless the string
+   contains an apostrophe, a comma, or backslash (other than
+   backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
+   null, do not copy; instead, return the length of what the result
+   would have been.  */
+static YYSIZE_T
+yytnamerr (char *yyres, const char *yystr)
+{
+  if (*yystr == '"')
+    {
+      YYSIZE_T yyn = 0;
+      char const *yyp = yystr;
+
+      for (;;)
+        switch (*++yyp)
+          {
+          case '\'':
+          case ',':
+            goto do_not_strip_quotes;
+
+          case '\\':
+            if (*++yyp != '\\')
+              goto do_not_strip_quotes;
+            /* Fall through.  */
+          default:
+            if (yyres)
+              yyres[yyn] = *yyp;
+            yyn++;
+            break;
+
+          case '"':
+            if (yyres)
+              yyres[yyn] = '\0';
+            return yyn;
+          }
+    do_not_strip_quotes: ;
+    }
+
+  if (! yyres)
+    return yystrlen (yystr);
+
+  return yystpcpy (yyres, yystr) - yyres;
+}
+# endif
+
+/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
+   about the unexpected token YYTOKEN for the state stack whose top is
+   YYSSP.
+
+   Return 0 if *YYMSG was successfully written.  Return 1 if *YYMSG is
+   not large enough to hold the message.  In that case, also set
+   *YYMSG_ALLOC to the required number of bytes.  Return 2 if the
+   required number of bytes is too large to store.  */
+static int
+yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
+                yytype_int16 *yyssp, int yytoken)
+{
+  YYSIZE_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]);
+  YYSIZE_T yysize = yysize0;
+  enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+  /* Internationalized format string. */
+  const char *yyformat = YY_NULLPTR;
+  /* Arguments of yyformat. */
+  char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+  /* Number of reported tokens (one for the "unexpected", one per
+     "expected"). */
+  int yycount = 0;
+
+  /* There are many possibilities here to consider:
+     - If this state is a consistent state with a default action, then
+       the only way this function was invoked is if the default action
+       is an error action.  In that case, don't check for expected
+       tokens because there are none.
+     - The only way there can be no lookahead present (in yychar) is if
+       this state is a consistent state with a default action.  Thus,
+       detecting the absence of a lookahead is sufficient to determine
+       that there is no unexpected or expected token to report.  In that
+       case, just report a simple "syntax error".
+     - Don't assume there isn't a lookahead just because this state is a
+       consistent state with a default action.  There might have been a
+       previous inconsistent state, consistent state with a non-default
+       action, or user semantic action that manipulated yychar.
+     - Of course, the expected token list depends on states to have
+       correct lookahead information, and it depends on the parser not
+       to perform extra reductions after fetching a lookahead from the
+       scanner and before detecting a syntax error.  Thus, state merging
+       (from LALR or IELR) and default reductions corrupt the expected
+       token list.  However, the list is correct for canonical LR with
+       one exception: it will still contain any token that will not be
+       accepted due to an error action in a later state.
+  */
+  if (yytoken != YYEMPTY)
+    {
+      int yyn = yypact[*yyssp];
+      yyarg[yycount++] = yytname[yytoken];
+      if (!yypact_value_is_default (yyn))
+        {
+          /* Start YYX at -YYN if negative to avoid negative indexes in
+             YYCHECK.  In other words, skip the first -YYN actions for
+             this state because they are default actions.  */
+          int yyxbegin = yyn < 0 ? -yyn : 0;
+          /* Stay within bounds of both yycheck and yytname.  */
+          int yychecklim = YYLAST - yyn + 1;
+          int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+          int yyx;
+
+          for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+            if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
+                && !yytable_value_is_error (yytable[yyx + yyn]))
+              {
+                if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+                  {
+                    yycount = 1;
+                    yysize = yysize0;
+                    break;
+                  }
+                yyarg[yycount++] = yytname[yyx];
+                {
+                  YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]);
+                  if (! (yysize <= yysize1
+                         && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+                    return 2;
+                  yysize = yysize1;
+                }
+              }
+        }
+    }
+
+  switch (yycount)
+    {
+# define YYCASE_(N, S)                      \
+      case N:                               \
+        yyformat = S;                       \
+      break
+      YYCASE_(0, YY_("syntax error"));
+      YYCASE_(1, YY_("syntax error, unexpected %s"));
+      YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
+      YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
+      YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
+      YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
+# undef YYCASE_
+    }
+
+  {
+    YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
+    if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+      return 2;
+    yysize = yysize1;
+  }
+
+  if (*yymsg_alloc < yysize)
+    {
+      *yymsg_alloc = 2 * yysize;
+      if (! (yysize <= *yymsg_alloc
+             && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
+        *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
+      return 1;
+    }
+
+  /* Avoid sprintf, as that infringes on the user's name space.
+     Don't have undefined behavior even if the translation
+     produced a string with the wrong number of "%s"s.  */
+  {
+    char *yyp = *yymsg;
+    int yyi = 0;
+    while ((*yyp = *yyformat) != '\0')
+      if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
+        {
+          yyp += yytnamerr (yyp, yyarg[yyi++]);
+          yyformat += 2;
+        }
+      else
+        {
+          yyp++;
+          yyformat++;
+        }
+  }
+  return 0;
+}
+#endif /* YYERROR_VERBOSE */
+
+/*-----------------------------------------------.
+| Release the memory associated to this symbol.  |
+`-----------------------------------------------*/
+
+static void
+yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, ce_parser_arg *arg)
+{
+  YYUSE (yyvaluep);
+  YYUSE (arg);
+  if (!yymsg)
+    yymsg = "Deleting";
+  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
+
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+  YYUSE (yytype);
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
+}
+
+
+
+
+/* The lookahead symbol.  */
+int yychar;
+
+/* The semantic value of the lookahead symbol.  */
+YYSTYPE yylval;
+/* Number of syntax errors so far.  */
+int yynerrs;
+
+
+/*----------.
+| yyparse.  |
+`----------*/
+
+int
+yyparse (ce_parser_arg *arg)
+{
+    int yystate;
+    /* Number of tokens to shift before error messages enabled.  */
+    int yyerrstatus;
+
+    /* The stacks and their tools:
+       'yyss': related to states.
+       'yyvs': related to semantic values.
+
+       Refer to the stacks through separate pointers, to allow yyoverflow
+       to reallocate them elsewhere.  */
+
+    /* The state stack.  */
+    yytype_int16 yyssa[YYINITDEPTH];
+    yytype_int16 *yyss;
+    yytype_int16 *yyssp;
+
+    /* The semantic value stack.  */
+    YYSTYPE yyvsa[YYINITDEPTH];
+    YYSTYPE *yyvs;
+    YYSTYPE *yyvsp;
+
+    YYSIZE_T yystacksize;
+
+  int yyn;
+  int yyresult;
+  /* Lookahead token as an internal (translated) token number.  */
+  int yytoken = 0;
+  /* The variables used to return semantic value and location from the
+     action routines.  */
+  YYSTYPE yyval;
+
+#if YYERROR_VERBOSE
+  /* Buffer for error messages, and its allocated size.  */
+  char yymsgbuf[128];
+  char *yymsg = yymsgbuf;
+  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
+#endif
+
+#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
+
+  /* The number of symbols on the RHS of the reduced rule.
+     Keep to zero when no symbol should be popped.  */
+  int yylen = 0;
+
+  yyssp = yyss = yyssa;
+  yyvsp = yyvs = yyvsa;
+  yystacksize = YYINITDEPTH;
+
+  YYDPRINTF ((stderr, "Starting parse\n"));
+
+  yystate = 0;
+  yyerrstatus = 0;
+  yynerrs = 0;
+  yychar = YYEMPTY; /* Cause a token to be read.  */
+  goto yysetstate;
+
+/*------------------------------------------------------------.
+| yynewstate -- Push a new state, which is found in yystate.  |
+`------------------------------------------------------------*/
+ yynewstate:
+  /* In all cases, when you get here, the value and location stacks
+     have just been pushed.  So pushing a state here evens the stacks.  */
+  yyssp++;
+
+ yysetstate:
+  *yyssp = yystate;
+
+  if (yyss + yystacksize - 1 <= yyssp)
+    {
+      /* Get the current used size of the three stacks, in elements.  */
+      YYSIZE_T yysize = yyssp - yyss + 1;
+
+#ifdef yyoverflow
+      {
+        /* Give user a chance to reallocate the stack.  Use copies of
+           these so that the &'s don't force the real ones into
+           memory.  */
+        YYSTYPE *yyvs1 = yyvs;
+        yytype_int16 *yyss1 = yyss;
+
+        /* Each stack pointer address is followed by the size of the
+           data in use in that stack, in bytes.  This used to be a
+           conditional around just the two extra args, but that might
+           be undefined if yyoverflow is a macro.  */
+        yyoverflow (YY_("memory exhausted"),
+                    &yyss1, yysize * sizeof (*yyssp),
+                    &yyvs1, yysize * sizeof (*yyvsp),
+                    &yystacksize);
+
+        yyss = yyss1;
+        yyvs = yyvs1;
+      }
+#else /* no yyoverflow */
+# ifndef YYSTACK_RELOCATE
+      goto yyexhaustedlab;
+# else
+      /* Extend the stack our own way.  */
+      if (YYMAXDEPTH <= yystacksize)
+        goto yyexhaustedlab;
+      yystacksize *= 2;
+      if (YYMAXDEPTH < yystacksize)
+        yystacksize = YYMAXDEPTH;
+
+      {
+        yytype_int16 *yyss1 = yyss;
+        union yyalloc *yyptr =
+          (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
+        if (! yyptr)
+          goto yyexhaustedlab;
+        YYSTACK_RELOCATE (yyss_alloc, yyss);
+        YYSTACK_RELOCATE (yyvs_alloc, yyvs);
+#  undef YYSTACK_RELOCATE
+        if (yyss1 != yyssa)
+          YYSTACK_FREE (yyss1);
+      }
+# endif
+#endif /* no yyoverflow */
+
+      yyssp = yyss + yysize - 1;
+      yyvsp = yyvs + yysize - 1;
+
+      YYDPRINTF ((stderr, "Stack size increased to %lu\n",
+                  (unsigned long int) yystacksize));
+
+      if (yyss + yystacksize - 1 <= yyssp)
+        YYABORT;
+    }
+
+  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
+
+  if (yystate == YYFINAL)
+    YYACCEPT;
+
+  goto yybackup;
+
+/*-----------.
+| yybackup.  |
+`-----------*/
+yybackup:
+
+  /* Do appropriate processing given the current state.  Read a
+     lookahead token if we need one and don't already have one.  */
+
+  /* First try to decide what to do without reference to lookahead token.  */
+  yyn = yypact[yystate];
+  if (yypact_value_is_default (yyn))
+    goto yydefault;
+
+  /* Not known => get a lookahead token if don't already have one.  */
+
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
+  if (yychar == YYEMPTY)
+    {
+      YYDPRINTF ((stderr, "Reading a token: "));
+      yychar = yylex ();
+    }
+
+  if (yychar <= YYEOF)
+    {
+      yychar = yytoken = YYEOF;
+      YYDPRINTF ((stderr, "Now at end of input.\n"));
+    }
+  else
+    {
+      yytoken = YYTRANSLATE (yychar);
+      YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
+    }
+
+  /* If the proper action on seeing token YYTOKEN is to reduce or to
+     detect an error, take that action.  */
+  yyn += yytoken;
+  if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
+    goto yydefault;
+  yyn = yytable[yyn];
+  if (yyn <= 0)
+    {
+      if (yytable_value_is_error (yyn))
+        goto yyerrlab;
+      yyn = -yyn;
+      goto yyreduce;
+    }
+
+  /* Count tokens shifted since error; after three, turn off error
+     status.  */
+  if (yyerrstatus)
+    yyerrstatus--;
+
+  /* Shift the lookahead token.  */
+  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
+
+  /* Discard the shifted token.  */
+  yychar = YYEMPTY;
+
+  yystate = yyn;
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+  *++yyvsp = yylval;
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
+
+  goto yynewstate;
+
+
+/*-----------------------------------------------------------.
+| yydefault -- do the default action for the current state.  |
+`-----------------------------------------------------------*/
+yydefault:
+  yyn = yydefact[yystate];
+  if (yyn == 0)
+    goto yyerrlab;
+  goto yyreduce;
+
+
+/*-----------------------------.
+| yyreduce -- Do a reduction.  |
+`-----------------------------*/
+yyreduce:
+  /* yyn is the number of a rule to reduce with.  */
+  yylen = yyr2[yyn];
+
+  /* If YYLEN is nonzero, implement the default value of the action:
+     '$$ = $1'.
+
+     Otherwise, the following line sets YYVAL to garbage.
+     This behavior is undocumented and Bison
+     users should not rely upon it.  Assigning to YYVAL
+     unconditionally makes the parser a bit smaller, and it avoids a
+     GCC warning that YYVAL may be used uninitialized.  */
+  yyval = yyvsp[1-yylen];
+
+
+  YY_REDUCE_PRINT (yyn);
+  switch (yyn)
+    {
+        case 2:
+#line 241 "ce_expr.yy" /* yacc.c:1661  */
+    {
+             DBG(cerr << "Mark all variables" << endl);
+		     DDS(arg)->mark_all(true);
+		     (yyval.boolean) = true;
+		 }
+#line 1484 "ce_expr.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 4:
+#line 249 "ce_expr.yy" /* yacc.c:1661  */
+    { DDS(arg)->mark_all(true); }
+#line 1490 "ce_expr.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 5:
+#line 250 "ce_expr.yy" /* yacc.c:1661  */
+    { 
+		     (yyval.boolean) = (yyvsp[0].boolean);
+		 }
+#line 1498 "ce_expr.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 6:
+#line 254 "ce_expr.yy" /* yacc.c:1661  */
+    {
+		     (yyval.boolean) = (yyvsp[-2].boolean) && (yyvsp[0].boolean);
+		 }
+#line 1506 "ce_expr.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 8:
+#line 261 "ce_expr.yy" /* yacc.c:1661  */
+    {
+		     (yyval.boolean) = (yyvsp[-2].boolean) && (yyvsp[0].boolean);
+		 }
+#line 1514 "ce_expr.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 9:
+#line 267 "ce_expr.yy" /* yacc.c:1661  */
+    {
+		     BaseType *var = DDS(arg)->var((yyvsp[0].id));
+		     if (var) {
+			     DBG(cerr << "Marking " << (yyvsp[0].id) << endl);
+			     (yyval.boolean) = DDS(arg)->mark((yyvsp[0].id), true);
+			     DBG(cerr << "result: " << (yyval.boolean) << endl);
+		     }
+		     else {
+			     no_such_ident(arg, (yyvsp[0].id), "identifier");
+		     }
+		}
+#line 1530 "ce_expr.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 10:
+#line 279 "ce_expr.yy" /* yacc.c:1661  */
+    {
+		    (yyval.boolean) = (yyvsp[0].boolean);
+		}
+#line 1538 "ce_expr.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 11:
+#line 283 "ce_expr.yy" /* yacc.c:1661  */
+    {
+		    (yyval.boolean) = (yyvsp[0].boolean);
+		}
+#line 1546 "ce_expr.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 12:
+#line 287 "ce_expr.yy" /* yacc.c:1661  */
+    {
+            Array *array = dynamic_cast<Array*>((yyvsp[0].rval_ptr)->bvalue(*DDS(arg)));
+            if (array) { 
+                /* When the special form appears here (not as a function argument)
+                set send_p so the data will be sent and add it to the DDS. This 
+                streamlines testing (and is likely what is intended). */
+                
+                array->set_send_p(true);
+                DDS(arg)->add_var_nocopy(array);
+                
+                return true;
+            }
+            else {
+                ce_exprerror(arg, "Could not create the anonymous vector using the # special form");
+                return false;
+            }
+        }
+#line 1568 "ce_expr.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 13:
+#line 311 "ce_expr.yy" /* yacc.c:1661  */
+    {
+            (yyval.rval_ptr) = build_constant_array<dods_byte, Byte>((yyvsp[-1].byte_values), DDS(arg));
+        }
+#line 1576 "ce_expr.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 14:
+#line 317 "ce_expr.yy" /* yacc.c:1661  */
+    {
+            (yyval.rval_ptr) = build_constant_array<dods_int16, Int16>((yyvsp[-1].int16_values), DDS(arg));
+        }
+#line 1584 "ce_expr.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 15:
+#line 323 "ce_expr.yy" /* yacc.c:1661  */
+    {
+            (yyval.rval_ptr) = build_constant_array<dods_uint16, UInt16>((yyvsp[-1].uint16_values), DDS(arg));
+        }
+#line 1592 "ce_expr.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 16:
+#line 329 "ce_expr.yy" /* yacc.c:1661  */
+    {
+            (yyval.rval_ptr) = build_constant_array<dods_int32, Int32>((yyvsp[-1].int32_values), DDS(arg));
+        }
+#line 1600 "ce_expr.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 17:
+#line 335 "ce_expr.yy" /* yacc.c:1661  */
+    {
+            (yyval.rval_ptr) = build_constant_array<dods_uint32, UInt32>((yyvsp[-1].uint32_values), DDS(arg));
+        }
+#line 1608 "ce_expr.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 18:
+#line 341 "ce_expr.yy" /* yacc.c:1661  */
+    {
+            (yyval.rval_ptr) = build_constant_array<dods_float32, Float32>((yyvsp[-1].float32_values), DDS(arg));
+        }
+#line 1616 "ce_expr.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 19:
+#line 347 "ce_expr.yy" /* yacc.c:1661  */
+    {
+            (yyval.rval_ptr) = build_constant_array<dods_float64, Float64>((yyvsp[-1].float64_values), DDS(arg));
+        }
+#line 1624 "ce_expr.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 20:
+#line 356 "ce_expr.yy" /* yacc.c:1661  */
+    {
+              if (!check_int32((yyvsp[0].id)))
+                  throw Error(malformed_expr, "$<type>(hint, value, ...) special form expected hint to be an integer");
+                   
+              arg_length_hint_value = atoi((yyvsp[0].id));
+              (yyval.boolean) = true;
+          }
+#line 1636 "ce_expr.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 21:
+#line 367 "ce_expr.yy" /* yacc.c:1661  */
+    {
+              (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  */
+    break;
+
+  case 22:
+#line 371 "ce_expr.yy" /* yacc.c:1661  */
+    {
+              (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  */
+    break;
+
+  case 23:
+#line 378 "ce_expr.yy" /* yacc.c:1661  */
+    {
+              (yyval.byte_value) = strtol((yyvsp[0].id), 0, 0);
+          }
+#line 1660 "ce_expr.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 24:
+#line 385 "ce_expr.yy" /* yacc.c:1661  */
+    {
+              (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  */
+    break;
+
+  case 25:
+#line 389 "ce_expr.yy" /* yacc.c:1661  */
+    {
+              (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  */
+    break;
+
+  case 26:
+#line 396 "ce_expr.yy" /* yacc.c:1661  */
+    {
+              (yyval.int16_value) = strtol((yyvsp[0].id), 0, 0);
+          }
+#line 1684 "ce_expr.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 27:
+#line 403 "ce_expr.yy" /* yacc.c:1661  */
+    {
+              (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  */
+    break;
+
+  case 28:
+#line 407 "ce_expr.yy" /* yacc.c:1661  */
+    {
+              (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  */
+    break;
+
+  case 29:
+#line 414 "ce_expr.yy" /* yacc.c:1661  */
+    {
+              (yyval.uint16_value) = strtoul((yyvsp[0].id), 0, 0);
+          }
+#line 1708 "ce_expr.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 30:
+#line 421 "ce_expr.yy" /* yacc.c:1661  */
+    {
+              (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  */
+    break;
+
+  case 31:
+#line 425 "ce_expr.yy" /* yacc.c:1661  */
+    {
+              (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  */
+    break;
+
+  case 32:
+#line 432 "ce_expr.yy" /* yacc.c:1661  */
+    {
+              (yyval.int32_value) = strtol((yyvsp[0].id), 0, 0);
+          }
+#line 1732 "ce_expr.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 33:
+#line 439 "ce_expr.yy" /* yacc.c:1661  */
+    {
+              (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  */
+    break;
+
+  case 34:
+#line 443 "ce_expr.yy" /* yacc.c:1661  */
+    {
+              (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  */
+    break;
+
+  case 35:
+#line 450 "ce_expr.yy" /* yacc.c:1661  */
+    {
+              (yyval.uint32_value) = strtoul((yyvsp[0].id), 0, 0);
+          }
+#line 1756 "ce_expr.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 36:
+#line 457 "ce_expr.yy" /* yacc.c:1661  */
+    {
+              (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  */
+    break;
+
+  case 37:
+#line 461 "ce_expr.yy" /* yacc.c:1661  */
+    {
+              (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  */
+    break;
+
+  case 38:
+#line 468 "ce_expr.yy" /* yacc.c:1661  */
+    {
+              (yyval.float32_value) = strtof((yyvsp[0].id), 0);
+          }
+#line 1780 "ce_expr.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 39:
+#line 475 "ce_expr.yy" /* yacc.c:1661  */
+    {
+              (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  */
+    break;
+
+  case 40:
+#line 479 "ce_expr.yy" /* yacc.c:1661  */
+    {
+              (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  */
+    break;
+
+  case 41:
+#line 486 "ce_expr.yy" /* yacc.c:1661  */
+    {
+              (yyval.float64_value) = strtod((yyvsp[0].id), 0);
+          }
+#line 1804 "ce_expr.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 42:
+#line 493 "ce_expr.yy" /* yacc.c:1661  */
+    {
+		    proj_func p_f = 0;
+		    btp_func f = 0;
+
+		    if ((f = get_btp_function(*(EVALUATOR(arg)), (yyvsp[-3].id)))) {
+			    EVALUATOR(arg)->append_clause(f, (yyvsp[-1].r_val_l_ptr));
+			    (yyval.boolean) = true;
+		    }
+		    else if ((p_f = get_proj_function(*(EVALUATOR(arg)), (yyvsp[-3].id)))) { 
+		        DDS &dds = dynamic_cast<DDS&>(*(DDS(arg)));
+			    BaseType **args = build_btp_args( (yyvsp[-1].r_val_l_ptr), dds );
+			    (*p_f)(((yyvsp[-1].r_val_l_ptr)) ? (yyvsp[-1].r_val_l_ptr)->size():0, args, dds, *(EVALUATOR(arg)));
+			    delete[] args;
+			    (yyval.boolean) = true;
+		    }
+		    else {
+			    no_such_func(arg, (yyvsp[-3].id));
+		    }
+		}
+#line 1828 "ce_expr.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 44:
+#line 516 "ce_expr.yy" /* yacc.c:1661  */
+    {
+		    (yyval.boolean) = (yyvsp[-2].boolean) && (yyvsp[0].boolean);
+		}
+#line 1836 "ce_expr.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 45:
+#line 522 "ce_expr.yy" /* yacc.c:1661  */
+    {
+		    if ((yyvsp[-4].rval_ptr)) {
+			EVALUATOR(arg)->append_clause((yyvsp[-3].op), (yyvsp[-4].rval_ptr), (yyvsp[-1].r_val_l_ptr));
+			(yyval.boolean) = true;
+		    }
+		    else
+			(yyval.boolean) = false;
+		}
+#line 1849 "ce_expr.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 46:
+#line 531 "ce_expr.yy" /* yacc.c:1661  */
+    {
+		    if ((yyvsp[-2].rval_ptr)) {
+			rvalue_list *rv = new rvalue_list;
+			rv->push_back((yyvsp[0].rval_ptr));
+			EVALUATOR(arg)->append_clause((yyvsp[-1].op), (yyvsp[-2].rval_ptr), rv);
+			(yyval.boolean) = true;
+		    }
+		    else
+			(yyval.boolean) = false;
+		}
+#line 1864 "ce_expr.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 47:
+#line 542 "ce_expr.yy" /* yacc.c:1661  */
+    {
+		    (yyval.boolean) = (yyvsp[0].boolean);
+		}
+#line 1872 "ce_expr.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 48:
+#line 549 "ce_expr.yy" /* yacc.c:1661  */
+    {
+		   bool_func b_func = get_function((*EVALUATOR(arg)), (yyvsp[-3].id));
+		   if (!b_func) {
+		       no_such_func(arg, (yyvsp[-3].id));
+		   }
+		   else {
+		       EVALUATOR(arg)->append_clause(b_func, (yyvsp[-1].r_val_l_ptr));
+		       (yyval.boolean) = true;
+		   }
+	       }
+#line 1887 "ce_expr.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 50:
+#line 564 "ce_expr.yy" /* yacc.c:1661  */
+    {
+		    btp_func func = get_btp_function((*EVALUATOR(arg)), (yyvsp[-3].id));
+		    if (func) {
+			    (yyval.rval_ptr) = new rvalue(func, (yyvsp[-1].r_val_l_ptr));
+		    } 
+		    else { 
+			    no_such_func(arg, (yyvsp[-3].id));
+		    }
+		}
+#line 1901 "ce_expr.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 51:
+#line 574 "ce_expr.yy" /* yacc.c:1661  */
+    {
+            (yyval.rval_ptr) = (yyvsp[0].rval_ptr);
+        }
+#line 1909 "ce_expr.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 52:
+#line 578 "ce_expr.yy" /* yacc.c:1661  */
+    {
+            (yyval.rval_ptr) = (yyvsp[0].rval_ptr);
+        }
+#line 1917 "ce_expr.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 53:
+#line 584 "ce_expr.yy" /* yacc.c:1661  */
+    {
+		    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  */
+    break;
+
+  case 54:
+#line 591 "ce_expr.yy" /* yacc.c:1661  */
+    {
+		    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  */
+    break;
+
+  case 55:
+#line 600 "ce_expr.yy" /* yacc.c:1661  */
+    {  
+		      (yyval.r_val_l_ptr) = (yyvsp[0].r_val_l_ptr);
+	      }
+#line 1947 "ce_expr.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 56:
+#line 604 "ce_expr.yy" /* yacc.c:1661  */
+    { 
+		      (yyval.r_val_l_ptr) = 0; 
+	      }
+#line 1955 "ce_expr.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 57:
+#line 610 "ce_expr.yy" /* yacc.c:1661  */
+    { 
+		    BaseType *btp = DDS(arg)->var(www2id((yyvsp[0].id)));
+		    if (btp) {
+                btp->set_in_selection(true);
+                (yyval.rval_ptr) = new rvalue(btp);
+		    }
+		    else {
+			    value new_val;
+			    string name_tmp;
+			    if (check_int32((yyvsp[0].id))) {
+			        new_val.type = dods_int32_c;
+			        new_val.v.i = atoi((yyvsp[0].id));
+			    }
+			    else if (check_uint32((yyvsp[0].id))) {
+			        new_val.type = dods_uint32_c;
+			        new_val.v.ui = atoi((yyvsp[0].id));
+			    }
+			    else if (check_float64((yyvsp[0].id))) {
+			        new_val.type = dods_float64_c;
+			        new_val.v.f = atof((yyvsp[0].id));
+			    }
+			    else {
+			        new_val.type = dods_str_c;
+				// The 'new' here was used because www2id() modifies the
+				// std::string arg in place but 'value' holds a string*.
+			        // new_val.v.s = new string(www2id($1));
+				// I replcaed this with a local tmp to avoid the dynamic
+				// allocation and the need to call delete. This was part of
+				// the fix for ticket 2240. jhrg 7/30/14
+				name_tmp = (yyvsp[0].id);
+				name_tmp = www2id(name_tmp);
+				new_val.v.s = &name_tmp;
+			    }
+			    BaseType *btp = make_variable((*EVALUATOR(arg)), new_val);
+			    (yyval.rval_ptr) = new rvalue(btp);
+		    }
+		}
+#line 1997 "ce_expr.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 58:
+#line 648 "ce_expr.yy" /* yacc.c:1661  */
+    {
+                    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", "");
+                        
+                    BaseType *var = DDS(arg)->var(www2id(*((yyvsp[0].val).v.s)));
+                    if (var) {
+                        (yyval.rval_ptr) = new rvalue(var);
+                    }
+                    else {
+                        var = make_variable((*EVALUATOR(arg)), (yyvsp[0].val)); 
+                        (yyval.rval_ptr) = new rvalue(var);
+                    }
+		    // When the scanner (ce_expr.lex) returns the SCAN_STR token type
+		    // it makes a local copy of the string in a new std::string object
+		    // that we must delete. Fix for a bug report by Aron.Bartle@mechdyne.com
+		    // See ticket 2240. jhrg 7/30/14
+		    delete (yyvsp[0].val).v.s;
+                }
+#line 2020 "ce_expr.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 59:
+#line 672 "ce_expr.yy" /* yacc.c:1661  */
+    {
+                    if (!bracket_projection((*DDS(arg)), (yyvsp[-1].id), (yyvsp[0].int_ll_ptr)))
+                      no_such_ident(arg, (yyvsp[-1].id), "array, grid or sequence");
+                    
+                    // strncpy($$, $1, ID_MAX-1);
+                    // $$[ID_MAX-1] = '\0';
+
+                    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  */
+    break;
+
+  case 60:
+#line 685 "ce_expr.yy" /* yacc.c:1661  */
+    {
+                    (yyval.boolean) = (*DDS(arg)).mark((yyvsp[0].id), true);
+                }
+#line 2043 "ce_expr.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 61:
+#line 691 "ce_expr.yy" /* yacc.c:1661  */
+    {
+                    //string name = www2id($1);
+                    if (!bracket_projection((*DDS(arg)), (yyvsp[-1].id), (yyvsp[0].int_ll_ptr)))
+                      no_such_ident(arg, (yyvsp[-1].id), "array, grid or sequence");
+                    
+                    strncpy((yyval.id), (yyvsp[-1].id), ID_MAX-1);
+                    (yyval.id)[ID_MAX-1] = '\0';
+                }
+#line 2056 "ce_expr.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 62:
+#line 700 "ce_expr.yy" /* yacc.c:1661  */
+    {
+                    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  */
+    break;
+
+  case 63:
+#line 706 "ce_expr.yy" /* yacc.c:1661  */
+    {
+                    string name = string((yyvsp[-2].id)) + string((yyvsp[-1].id));
+                    if (!bracket_projection((*DDS(arg)), name.c_str(), (yyvsp[0].int_ll_ptr)))
+                      no_such_ident(arg, name.c_str(), "array, grid or sequence");
+
+                    strncpy((yyval.id), name.c_str(), ID_MAX-1);
+                    (yyval.id)[ID_MAX-1] = '\0';
+                }
+#line 2079 "ce_expr.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 64:
+#line 717 "ce_expr.yy" /* yacc.c:1661  */
+    { 
+                    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  */
+    break;
+
+  case 65:
+#line 722 "ce_expr.yy" /* yacc.c:1661  */
+    {
+                    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", "");
+                        
+                    strncpy((yyval.id), www2id(*((yyvsp[0].val).v.s)).c_str(), ID_MAX-1);
+		    // See comment about regarding the scanner's behavior WRT SCAN_STR.
+		    // jhrg 7/30/14
+                    delete (yyvsp[0].val).v.s;
+
+                    (yyval.id)[ID_MAX-1] = '\0';
+                }
+#line 2104 "ce_expr.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 66:
+#line 736 "ce_expr.yy" /* yacc.c:1661  */
+    {
+		    (yyval.int_ll_ptr) = make_array_indices((yyvsp[0].int_l_ptr));
+		}
+#line 2112 "ce_expr.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 67:
+#line 740 "ce_expr.yy" /* yacc.c:1661  */
+    {
+		    (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  */
+    break;
+
+  case 68:
+#line 754 "ce_expr.yy" /* yacc.c:1661  */
+    {
+    if (!check_uint32((yyvsp[-1].id)))
+        throw Error(malformed_expr, "The word `" + string((yyvsp[-1].id)) + "' is not a valid array index.");
+    value i;
+    i.type = dods_uint32_c;
+    i.v.i = atoi((yyvsp[-1].id));
+    (yyval.int_l_ptr) = make_array_index(i);
+}
+#line 2133 "ce_expr.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 69:
+#line 763 "ce_expr.yy" /* yacc.c:1661  */
+    {
+    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  */
+    break;
+
+  case 70:
+#line 770 "ce_expr.yy" /* yacc.c:1661  */
+    {
+    if (!check_uint32((yyvsp[-3].id)))
+        throw Error(malformed_expr, "The word `" + string((yyvsp[-3].id)) + "' is not a valid array index.");
+    if (!check_uint32((yyvsp[-1].id)))
+        throw Error(malformed_expr, "The word `" + string((yyvsp[-1].id)) + "' is not a valid array index.");
+    value i,j;
+    i.type = j.type = dods_uint32_c;
+    i.v.i = atoi((yyvsp[-3].id));
+    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  */
+    break;
+
+  case 71:
+#line 782 "ce_expr.yy" /* yacc.c:1661  */
+    {
+    if (!check_uint32((yyvsp[-3].id)))
+        throw Error(malformed_expr, "The word `" + string((yyvsp[-3].id)) + "' is not a valid array index.");
+    value i,j;
+    i.type = dods_uint32_c;
+    j.type = dods_int32_c;  /* signed */
+    i.v.i = atoi((yyvsp[-3].id));
+    j.v.i = -1;
+    (yyval.int_l_ptr) = make_array_index(i, j);
+}
+#line 2175 "ce_expr.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 72:
+#line 793 "ce_expr.yy" /* yacc.c:1661  */
+    {
+    if (!check_uint32((yyvsp[-5].id)))
+        throw Error(malformed_expr, "The word `" + string((yyvsp[-5].id)) + "' is not a valid array index.");
+    if (!check_uint32((yyvsp[-3].id)))
+        throw Error(malformed_expr, "The word `" + string((yyvsp[-3].id)) + "' is not a valid array index.");
+    if (!check_uint32((yyvsp[-1].id)))
+        throw Error(malformed_expr, "The word `" + string((yyvsp[-1].id)) + "' is not a valid array index.");
+    value i, j, k;
+    i.type = j.type = k.type = dods_uint32_c;
+    i.v.i = atoi((yyvsp[-5].id));
+    j.v.i = atoi((yyvsp[-3].id));
+    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  */
+    break;
+
+  case 73:
+#line 808 "ce_expr.yy" /* yacc.c:1661  */
+    {
+    if (!check_uint32((yyvsp[-5].id)))
+        throw Error(malformed_expr, "The word `" + string((yyvsp[-5].id)) + "' is not a valid array index.");
+    if (!check_uint32((yyvsp[-3].id)))
+        throw Error(malformed_expr, "The word `" + string((yyvsp[-3].id)) + "' is not a valid array index.");
+    value i, j, k;
+    i.type = j.type = dods_uint32_c;
+    k.type = dods_int32_c;
+    i.v.i = atoi((yyvsp[-5].id));
+    j.v.i = atoi((yyvsp[-3].id));
+    k.v.i = -1;
+    (yyval.int_l_ptr) = make_array_index(i, j, k);
+}
+#line 2212 "ce_expr.tab.cc" /* yacc.c:1661  */
+    break;
+
+
+#line 2216 "ce_expr.tab.cc" /* yacc.c:1661  */
+      default: break;
+    }
+  /* User semantic actions sometimes alter yychar, and that requires
+     that yytoken be updated with the new translation.  We take the
+     approach of translating immediately before every use of yytoken.
+     One alternative is translating here after every semantic action,
+     but that translation would be missed if the semantic action invokes
+     YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
+     if it invokes YYBACKUP.  In the case of YYABORT or YYACCEPT, an
+     incorrect destructor might then be invoked immediately.  In the
+     case of YYERROR or YYBACKUP, subsequent parser actions might lead
+     to an incorrect destructor call or verbose syntax error message
+     before the lookahead is translated.  */
+  YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
+
+  YYPOPSTACK (yylen);
+  yylen = 0;
+  YY_STACK_PRINT (yyss, yyssp);
+
+  *++yyvsp = yyval;
+
+  /* Now 'shift' the result of the reduction.  Determine what state
+     that goes to, based on the state we popped back to and the rule
+     number reduced by.  */
+
+  yyn = yyr1[yyn];
+
+  yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
+  if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
+    yystate = yytable[yystate];
+  else
+    yystate = yydefgoto[yyn - YYNTOKENS];
+
+  goto yynewstate;
+
+
+/*--------------------------------------.
+| yyerrlab -- here on detecting error.  |
+`--------------------------------------*/
+yyerrlab:
+  /* Make sure we have latest lookahead translation.  See comments at
+     user semantic actions for why this is necessary.  */
+  yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
+
+  /* If not already recovering from an error, report this error.  */
+  if (!yyerrstatus)
+    {
+      ++yynerrs;
+#if ! YYERROR_VERBOSE
+      yyerror (arg, YY_("syntax error"));
+#else
+# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
+                                        yyssp, yytoken)
+      {
+        char const *yymsgp = YY_("syntax error");
+        int yysyntax_error_status;
+        yysyntax_error_status = YYSYNTAX_ERROR;
+        if (yysyntax_error_status == 0)
+          yymsgp = yymsg;
+        else if (yysyntax_error_status == 1)
+          {
+            if (yymsg != yymsgbuf)
+              YYSTACK_FREE (yymsg);
+            yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
+            if (!yymsg)
+              {
+                yymsg = yymsgbuf;
+                yymsg_alloc = sizeof yymsgbuf;
+                yysyntax_error_status = 2;
+              }
+            else
+              {
+                yysyntax_error_status = YYSYNTAX_ERROR;
+                yymsgp = yymsg;
+              }
+          }
+        yyerror (arg, yymsgp);
+        if (yysyntax_error_status == 2)
+          goto yyexhaustedlab;
+      }
+# undef YYSYNTAX_ERROR
+#endif
+    }
+
+
+
+  if (yyerrstatus == 3)
+    {
+      /* If just tried and failed to reuse lookahead token after an
+         error, discard it.  */
+
+      if (yychar <= YYEOF)
+        {
+          /* Return failure if at end of input.  */
+          if (yychar == YYEOF)
+            YYABORT;
+        }
+      else
+        {
+          yydestruct ("Error: discarding",
+                      yytoken, &yylval, arg);
+          yychar = YYEMPTY;
+        }
+    }
+
+  /* Else will try to reuse lookahead token after shifting the error
+     token.  */
+  goto yyerrlab1;
+
+
+/*---------------------------------------------------.
+| yyerrorlab -- error raised explicitly by YYERROR.  |
+`---------------------------------------------------*/
+yyerrorlab:
+
+  /* Pacify compilers like GCC when the user code never invokes
+     YYERROR and the label yyerrorlab therefore never appears in user
+     code.  */
+  if (/*CONSTCOND*/ 0)
+     goto yyerrorlab;
+
+  /* Do not reclaim the symbols of the rule whose action triggered
+     this YYERROR.  */
+  YYPOPSTACK (yylen);
+  yylen = 0;
+  YY_STACK_PRINT (yyss, yyssp);
+  yystate = *yyssp;
+  goto yyerrlab1;
+
+
+/*-------------------------------------------------------------.
+| yyerrlab1 -- common code for both syntax error and YYERROR.  |
+`-------------------------------------------------------------*/
+yyerrlab1:
+  yyerrstatus = 3;      /* Each real token shifted decrements this.  */
+
+  for (;;)
+    {
+      yyn = yypact[yystate];
+      if (!yypact_value_is_default (yyn))
+        {
+          yyn += YYTERROR;
+          if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
+            {
+              yyn = yytable[yyn];
+              if (0 < yyn)
+                break;
+            }
+        }
+
+      /* Pop the current state because it cannot handle the error token.  */
+      if (yyssp == yyss)
+        YYABORT;
+
+
+      yydestruct ("Error: popping",
+                  yystos[yystate], yyvsp, arg);
+      YYPOPSTACK (1);
+      yystate = *yyssp;
+      YY_STACK_PRINT (yyss, yyssp);
+    }
+
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+  *++yyvsp = yylval;
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
+
+
+  /* Shift the error token.  */
+  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
+
+  yystate = yyn;
+  goto yynewstate;
+
+
+/*-------------------------------------.
+| yyacceptlab -- YYACCEPT comes here.  |
+`-------------------------------------*/
+yyacceptlab:
+  yyresult = 0;
+  goto yyreturn;
+
+/*-----------------------------------.
+| yyabortlab -- YYABORT comes here.  |
+`-----------------------------------*/
+yyabortlab:
+  yyresult = 1;
+  goto yyreturn;
+
+#if !defined yyoverflow || YYERROR_VERBOSE
+/*-------------------------------------------------.
+| yyexhaustedlab -- memory exhaustion comes here.  |
+`-------------------------------------------------*/
+yyexhaustedlab:
+  yyerror (arg, YY_("memory exhausted"));
+  yyresult = 2;
+  /* Fall through.  */
+#endif
+
+yyreturn:
+  if (yychar != YYEMPTY)
+    {
+      /* Make sure we have latest lookahead translation.  See comments at
+         user semantic actions for why this is necessary.  */
+      yytoken = YYTRANSLATE (yychar);
+      yydestruct ("Cleanup: discarding lookahead",
+                  yytoken, &yylval, arg);
+    }
+  /* Do not reclaim the symbols of the rule whose action triggered
+     this YYABORT or YYACCEPT.  */
+  YYPOPSTACK (yylen);
+  YY_STACK_PRINT (yyss, yyssp);
+  while (yyssp != yyss)
+    {
+      yydestruct ("Cleanup: popping",
+                  yystos[*yyssp], yyvsp, arg);
+      YYPOPSTACK (1);
+    }
+#ifndef yyoverflow
+  if (yyss != yyssa)
+    YYSTACK_FREE (yyss);
+#endif
+#if YYERROR_VERBOSE
+  if (yymsg != yymsgbuf)
+    YYSTACK_FREE (yymsg);
+#endif
+  return yyresult;
+}
+#line 832 "ce_expr.yy" /* yacc.c:1906  */
+
+
+// All these error reporting function now throw instances of Error. The expr
+// parser no longer returns an error code to indicate and error. 2/16/2000
+// jhrg.
+
+void
+ce_exprerror(ce_parser_arg *, const string &s)
+{
+    string msg = "Constraint expression parse error: " +s;
+    throw Error(malformed_expr, msg);
+}
+
+void ce_exprerror(ce_parser_arg *, const string &s, const string &s2)
+{
+    string msg = "Constraint expression parse error: " + s + ": " + s2;
+    throw Error(malformed_expr, msg);    
+}
+
+void no_such_ident(ce_parser_arg *arg, const string &name, const string &word)
+{
+#if 0
+    string msg = "No such " + word + " in dataset";
+    ce_exprerror(arg, msg , name);
+#endif
+    string msg = "Constraint expression parse error: No such " + word + " in dataset: " + name;
+    throw Error(no_such_variable, msg);    
+    
+}
+
+void no_such_func(ce_parser_arg *arg, const string &name)
+{
+    ce_exprerror(arg, "Not a registered function", name);
+}
+
+/* If we're calling this, assume var is not a Sequence. But assume that the
+ name contains a dot and it's a separator. Look for the rightmost dot and
+ then look to see if the name to the left is a sequence. Return a pointer
+ to the sequence if it is otherwise return null. Uses tail-recursion to
+ 'walk' back from right to left looking at each dot. This way the sequence
+ will be found even if there are structures between the field and the
+ Sequence. */
+static Sequence *
+parent_is_sequence(DDS &table, const string &n)
+{
+    string::size_type dotpos = n.find_last_of('.');
+    if (dotpos == string::npos)
+        return 0;
+
+    string s = n.substr(0, dotpos);
+
+    // If the thing returned by table.var is not a Sequence, this cast
+    // will yield null.
+    Sequence *seq = dynamic_cast<Sequence*> (table.var(s));
+    if (seq)
+        return seq;
+    else
+        return parent_is_sequence(table, s);
+}
+
+bool bracket_projection(DDS &table, const char *name, int_list_list *indices)
+{
+    BaseType *var = table.var(name);
+    Sequence *seq; // used in last else-if clause
+
+    if (!var)
+        return false;
+
+    if (is_array_t(var)) {
+        /* calls to set_send_p should be replaced with
+         calls to DDS::mark so that arrays of Structures,
+         etc. will be processed correctly when individual
+         elements are projected using short names.
+         9/1/98 jhrg */
+        /* var->set_send_p(true); */
+        //table.mark(name, true);
+        // We don't call mark() here for an array. Instead it is called from
+        // within the parser. jhrg 10/10/08
+        process_array_indices(var, indices); // throws on error
+        delete_array_indices(indices);
+    }
+    else if (is_grid_t(var)) {
+        process_grid_indices(var, indices);
+        table.mark(name, true);
+        delete_array_indices(indices);
+    }
+    else if (is_sequence_t(var)) {
+        table.mark(name, true);
+        process_sequence_indices(var, indices);
+        delete_array_indices(indices);
+    }
+    else if ((seq = parent_is_sequence(table, name))) {
+        process_sequence_indices(seq, indices);
+        table.mark(name, true);
+        delete_array_indices(indices);
+    }
+    else {
+        return false;
+    }
+
+    return true;
+}
+
+// Given three values (I1, I2, I3), all of which must be integers, build an
+// int_list which contains those values.
+// 
+// Note that we added support for * in the rightmost position of an index
+// (i.e., [*], [n:*], [n:m:*]) and indicate that star using -1 as an index value.
+// Bescause of this change, the test for the type of the rightmost value in
+// the index subexpr was changed to include signed int.
+// jhrg 12/20/12
+//
+// Returns: A pointer to an int_list of three integers or NULL if any of the
+// values are not integers.
+
+int_list *
+make_array_index(value &i1, value &i2, value &i3)
+{
+    if (i1.type != dods_uint32_c || i2.type != dods_uint32_c || (i3.type != dods_uint32_c && i3.type != dods_int32_c))
+        return (int_list *) 0;
+
+    int_list *index = new int_list;
+
+    index->push_back((int) i1.v.i);
+    index->push_back((int) i2.v.i);
+    index->push_back((int) i3.v.i);
+
+    DBG(cout << "index: ");
+    DBG(copy(index->begin(), index->end(), ostream_iterator<int>(cerr, " ")));
+    DBG(cerr << endl);
+
+    return index;
+}
+
+int_list *
+make_array_index(value &i1, value &i2)
+{
+    if (i1.type != dods_uint32_c || (i2.type != dods_uint32_c && i2.type != dods_int32_c))
+	return (int_list *) 0;
+
+    int_list *index = new int_list;
+
+    index->push_back((int) i1.v.i);
+    index->push_back(1);
+    index->push_back((int) i2.v.i);
+
+    DBG(cout << "index: ");
+    DBG(copy(index->begin(), index->end(), ostream_iterator<int>(cerr, " ")));
+    DBG(cerr << endl);
+
+    return index;
+}
+
+int_list *
+make_array_index(value &i1)
+{
+    if (i1.type != dods_uint32_c && i1.type != dods_int32_c)
+	return (int_list *) 0;
+
+    int_list *index = new int_list;
+
+    // When the CE is Array[*] that means all of the elements, but the value
+    // of i1 will be -1. Make the projection triple be 0:1:-1 which is a 
+    // pattern that libdap::Array will recognize.
+    if (i1.v.i == -1)
+        index->push_back(0);
+    else
+        index->push_back((int) i1.v.i);
+    index->push_back(1);
+    index->push_back((int) i1.v.i);
+
+    DBG(cout << "index: ");
+    DBG(copy(index->begin(), index->end(), ostream_iterator<int>(cerr, " ")));
+    DBG(cerr << endl);
+
+    return index;
+}
+
+int_list_list *
+make_array_indices(int_list *index)
+{
+    int_list_list *indices = new int_list_list;
+
+    DBG(cout << "index: ");
+    DBG(copy(index->begin(), index->end(), ostream_iterator<int>(cerr, " ")));
+    DBG(cerr << endl);
+
+    assert(index);
+    indices->push_back(index);
+
+    return indices;
+}
+
+int_list_list *
+append_array_index(int_list_list *indices, int_list *index)
+{
+    assert(indices);
+    assert(index);
+
+    indices->push_back(index);
+
+    return indices;
+}
+
+// Delete an array indices list. 
+
+void delete_array_indices(int_list_list *indices)
+{
+    assert(indices);
+
+    for (int_list_citer i = indices->begin(); i != indices->end(); i++) {
+	int_list *il = *i;
+	assert(il);
+	delete il;
+    }
+
+    delete indices;
+}
+
+bool is_array_t(BaseType *variable)
+{
+    assert(variable);
+
+    if (variable->type() != dods_array_c)
+	return false;
+    else
+	return true;
+}
+
+bool is_grid_t(BaseType *variable)
+{
+    assert(variable);
+
+    if (variable->type() != dods_grid_c)
+	return false;
+    else
+	return true;
+}
+
+bool is_sequence_t(BaseType *variable)
+{
+    assert(variable);
+
+    if (variable->type() != dods_sequence_c)
+	return false;
+    else
+	return true;
+}
+
+void process_array_indices(BaseType *variable, int_list_list *indices)
+{
+    assert(variable);
+
+    Array *a = dynamic_cast<Array *>(variable); // replace with dynamic cast
+    if (!a)
+        throw Error(malformed_expr,
+		    string("The constraint expression evaluator expected an array; ") + variable->name() + " is not an array.");
+
+    if (a->dimensions(true) != (unsigned) indices->size())
+        throw Error(malformed_expr,
+		    string("Error: The number of dimensions in the constraint for ") + variable->name()
+                    + " must match the number in the array.");
+
+    DBG(cerr << "Before applying projection to array:" << endl);
+    DBG(a->print_decl(cerr, "", true, false, true));
+
+    assert(indices);
+    
+    int_list_citer p = indices->begin();
+    Array::Dim_iter r = a->dim_begin();
+    for (; p != indices->end() && r != a->dim_end(); p++, r++) {
+        int_list *index = *p;
+        assert(index);
+
+        int_citer q = index->begin();
+        assert(q != index->end());
+        int start = *q;
+
+        q++;
+        int stride = *q;
+
+        q++;
+        int stop = *q;
+
+        q++;
+        if (q != index->end())
+            throw Error(malformed_expr, string("Too many values in index list for ") + a->name() + ".");
+
+        DBG(cerr << "process_array_indices: Setting constraint on " 
+            << a->name() << "[" << start << ":" << stop << "]"
+            << endl);
+
+        // It's possible that an array will appear more than once in a CE
+        // (for example, if an array of structures is constrained so that
+        // only two fields are projected and there's an associated hyperslab).
+        // However, in this case the two hyperslabs must be equal; test for
+        // that here.
+        //
+        // We added '*' to mean 'the last element' in the array and use an index of -1
+        // to indicate that. If 'stop' is -1, don't test it here because dimension_stop()
+        // won't be -1 but the actual ending index of the array. jhrg 12/20/12
+
+        if (a->send_p() && (a->dimension_start(r, true) != start || (a->dimension_stop(r, true) != stop && stop != -1)
+                            || a->dimension_stride(r, true) != stride))
+            throw Error(malformed_expr,
+                    string("The Array was already projected differently in the constraint expression: ") + a->name() + ".");
+
+        a->add_constraint(r, start, stride, stop);
+
+        DBG(cerr << "Set Constraint: " << a->dimension_size(r, true) << endl);
+    }
+
+    DBG(cerr << "After applying projection to array:" << endl);
+    DBG(a->print_decl(cerr, "", true, false, true));
+
+
+    if (p != indices->end() && r == a->dim_end())
+        throw Error(malformed_expr, string("Too many indices in constraint for ") + a->name() + ".");
+}
+
+void process_grid_indices(BaseType *variable, int_list_list *indices)
+{
+    assert(variable);
+    assert(variable->type() == dods_grid_c);
+    Grid *g = dynamic_cast<Grid *>(variable);
+    if (!g)
+        throw Error(unknown_error, "Expected a Grid variable");
+
+    Array *a = g->get_array();
+
+    if (a->dimensions(true) != (unsigned) indices->size())
+        throw Error(malformed_expr,
+		    string("Error: The number of dimensions in the constraint for ") + variable->name()
+		    + " must match the number in the grid.");
+
+    // First do the constraints on the ARRAY in the grid.
+    process_array_indices(g->array_var(), indices);
+
+    // Now process the maps.
+    Grid::Map_iter r = g->map_begin();
+
+    // Suppress all maps by default.
+    for (; r != g->map_end(); r++) {
+        (*r)->set_send_p(false);
+    }
+
+    // Add specified maps to the current projection.
+    assert(indices);
+    int_list_citer p = indices->begin();
+    r = g->map_begin();
+    for (; p != indices->end() && r != g->map_end(); p++, r++) {
+        int_list *index = *p;
+        assert(index);
+
+        int_citer q = index->begin();
+        assert(q != index->end());
+        int start = *q;
+
+        q++;
+        int stride = *q;
+
+        q++;
+        int stop = *q;
+
+        BaseType *btp = *r;
+        assert(btp);
+        assert(btp->type() == dods_array_c);
+        Array *a = (Array *) btp;
+        a->set_send_p(true);
+        a->reset_constraint();
+
+        q++;
+        if (q != index->end()) {
+            throw Error(malformed_expr, string("Too many values in index list for ") + a->name() + ".");
+        }
+
+        DBG(cerr << "process_grid_indices: Setting constraint on "
+            << a->name() << "[" << start << ":"
+            << stop << "]" << endl);
+    
+        Array::Dim_iter si = a->dim_begin();
+        a->add_constraint(si, start, stride, stop);
+
+    }
+
+    DBG(cout << "Grid Constraint: ";
+	for (Array::Dim_iter dp = ((Array *) g->array_var())->dim_begin();
+	     dp != ((Array *) g->array_var())->dim_end(); dp++)
+	    cout << ((Array *) g->array_var())->dimension_size(dp, true) << " ";
+	    cout << endl
+	);
+
+    if (p != indices->end() && r == g->map_end()) {
+        throw Error(malformed_expr,
+		    string("Too many indices in constraint for ") + (*r)->name() + ".");
+    }
+}
+
+void process_sequence_indices(BaseType *variable, int_list_list *indices)
+{
+    assert(variable);
+    assert(variable->type() == dods_sequence_c);
+    Sequence *s = dynamic_cast<Sequence *> (variable);
+    if (!s)
+        throw Error(malformed_expr, "Expected a Sequence variable");
+
+    // Add specified maps to the current projection.
+    assert(indices);
+    for (int_list_citer p = indices->begin(); p != indices->end(); p++) {
+        int_list *index = *p;
+        assert(index);
+
+        int_citer q = index->begin();
+        assert(q != index->end());
+        int start = *q;
+
+        q++;
+        int stride = *q;
+
+        q++;
+        int stop = *q;
+
+        q++;
+        if (q != index->end()) {
+            throw Error(malformed_expr, string("Too many values in index list for ") + s->name() + ".");
+        }
+
+        s->set_row_number_constraint(start, stop, stride);
+    }
+}
+
+// Given a value, wrap it up in a BaseType and return a pointer to the same.
+
+BaseType *
+make_variable(ConstraintEvaluator &eval, const value &val)
+{
+    BaseType *var;
+    switch (val.type) {
+    case dods_int32_c: {
+        var = new Int32("dummy");
+        var->val2buf((void *) &val.v.i);
+        break;
+    }
+
+    case dods_uint32_c: {
+        var = new UInt32("dummy");
+        var->val2buf((void *) &val.v.i);
+        break;
+    }
+
+    case dods_float64_c: {
+        var = new Float64("dummy");
+        var->val2buf((void *) &val.v.f);
+        break;
+    }
+
+    case dods_str_c: {
+        var = new Str("dummy");
+        var->val2buf((void *) val.v.s);
+        break;
+    }
+
+    default:
+        var = (BaseType *) 0;
+        return var;
+    }
+
+    var->set_read_p(true); // ...so the evaluator will know it has data
+    eval.append_constant(var);
+
+    return var;
+}
+
+// Given a string (passed in VAL), consult the DDS CE function lookup table
+// to see if a function by that name exists. 
+// NB: function arguments are type-checked at run-time.
+//
+// Returns: A pointer to the function or NULL if not such function exists.
+
+bool_func get_function(const ConstraintEvaluator &eval, const char *name)
+{
+    bool_func f;
+
+    if (eval.find_function(name, &f))
+        return f;
+    else
+        return 0;
+}
+
+btp_func get_btp_function(const ConstraintEvaluator &eval, const char *name)
+{
+    btp_func f;
+
+    if (eval.find_function(name, &f))
+        return f;
+    else
+        return 0;
+}
+
+proj_func get_proj_function(const ConstraintEvaluator &eval, const char *name)
+{
+    proj_func f;
+
+    if (eval.find_function(name, &f))
+        return f;
+    else
+        return 0;
+}
+
+template<class arg_type_list, class arg_type>
+arg_type_list
+make_fast_arg_list(unsigned long vector_size_hint, arg_type value)
+{
+    arg_type_list args = new std::vector<arg_type>;
+    
+    if (vector_size_hint > 0) args->reserve(vector_size_hint);
+    
+    args->push_back(value);
+    return args;
+}
+
+template<class arg_type_list, class arg_type>
+arg_type_list
+make_fast_arg_list(arg_type_list values, arg_type value)
+{
+    values->push_back(value);
+    return values;
+}
+
+template<class t, class T>
+rvalue *build_constant_array(vector<t> *values, DDS *dds)
+{
+    //vector<t> *values = $5;
+            
+    T i("");
+    Array *array = new Array("", &i);
+    array->append_dim(values->size());
+    
+    // TODO Make set_value_nocopy() methods so that values' pointers can be copied
+    // instead of allocating memory twice. jhrg 7/5/13
+            
+    array->set_value(*values, values->size());
+    delete values;
+    array->set_read_p(true);
+            
+    static unsigned long counter = 1;
+    string name;
+    do {
+        name = "g" + long_to_string(counter++);
+    } while (dds->var(name));
+    array->set_name(name);
+            
+    return new rvalue(array);
+}
+
diff --git a/ce_expr.tab.hh b/ce_expr.tab.hh
new file mode 100644
index 0000000..78a4d18
--- /dev/null
+++ b/ce_expr.tab.hh
@@ -0,0 +1,217 @@
+/* A Bison parser, made by GNU Bison 3.0.4.  */
+
+/* Bison interface for Yacc-like parsers in C
+
+   Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
+
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
+
+#ifndef YY_CE_EXPR_CE_EXPR_TAB_HH_INCLUDED
+# define YY_CE_EXPR_CE_EXPR_TAB_HH_INCLUDED
+/* Debug traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 1
+#endif
+#if YYDEBUG
+extern int ce_exprdebug;
+#endif
+/* "%code requires" blocks.  */
+#line 41 "ce_expr.yy" /* yacc.c:1915  */
+
+
+#include "config.h"
+
+#include <cassert>
+#include <cstdlib>
+#include <cstring>
+
+#include <iostream>
+#include <sstream>
+#include <iterator>
+#include <string>
+#include <stack>
+
+//#define DODS_DEBUG
+
+#include "debug.h"
+#include "escaping.h"
+
+#include "DDS.h"
+#include "ConstraintEvaluator.h"
+
+#include "BaseType.h"
+
+#include "Byte.h"
+#include "Int16.h"
+#include "UInt16.h"
+#include "Int32.h"
+#include "UInt32.h"
+#include "Float32.h"
+#include "Float64.h"
+#include "Str.h"
+#include "Url.h"
+#include "Array.h"
+#include "Structure.h"
+#include "Sequence.h"
+#include "Grid.h"
+
+#include "Error.h"
+
+#include "util.h"
+#include "parser.h"
+#include "ce_parser.h"
+#include "expr.h"
+#include "RValue.h"
+
+using std::cerr;
+using std::endl;
+using namespace libdap ;
+
+#define EVALUATOR(arg) (static_cast<ce_parser_arg*>(arg)->get_eval())
+#define DDS(arg) (static_cast<ce_parser_arg*>(arg)->get_dds())
+
+// #define YYPARSE_PARAM arg
+
+int ce_exprlex(void);		/* the scanner; see expr.lex */
+
+void ce_exprerror(ce_parser_arg *arg, const string &s); 
+void ce_exprerror(ce_parser_arg *arg, const string &s, const string &s2);
+void no_such_func(ce_parser_arg *arg, const string &name);
+void no_such_ident(ce_parser_arg *arg, const string &name, const string &word);
+
+int_list *make_array_index(value &i1, value &i2, value &i3);
+int_list *make_array_index(value &i1, value &i2);
+int_list *make_array_index(value &i1);
+int_list_list *make_array_indices(int_list *index);
+int_list_list *append_array_index(int_list_list *indices, int_list *index);
+
+void delete_array_indices(int_list_list *indices);
+bool bracket_projection(DDS &table, const char *name, int_list_list *indices);
+
+void process_array_indices(BaseType *variable, int_list_list *indices); 
+void process_grid_indices(BaseType *variable, int_list_list *indices); 
+void process_sequence_indices(BaseType *variable, int_list_list *indices);
+
+/* Replace these with method calls. jhrg 8/31/06 */
+bool is_array_t(BaseType *variable);
+bool is_grid_t(BaseType *variable);
+bool is_sequence_t(BaseType *variable);
+
+BaseType *make_variable(ConstraintEvaluator &eval, const value &val);
+bool_func get_function(const ConstraintEvaluator &eval, const char *name);
+btp_func get_btp_function(const ConstraintEvaluator &eval, const char *name);
+proj_func get_proj_function(const ConstraintEvaluator &eval, const char *name);
+
+template<class arg_list, class arg_type>
+arg_list make_fast_arg_list(unsigned long vector_size_hint, arg_type arg_value);
+
+template<class arg_list, class arg_type>
+arg_list make_fast_arg_list(arg_list int_values, arg_type arg_value);
+
+template<class t, class T>
+rvalue *build_constant_array(vector<t> *values, DDS *dds);
+
+
+#line 140 "ce_expr.tab.hh" /* yacc.c:1915  */
+
+/* Token type.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+  enum yytokentype
+  {
+    SCAN_STR = 258,
+    SCAN_WORD = 259,
+    SCAN_EQUAL = 260,
+    SCAN_NOT_EQUAL = 261,
+    SCAN_GREATER = 262,
+    SCAN_GREATER_EQL = 263,
+    SCAN_LESS = 264,
+    SCAN_LESS_EQL = 265,
+    SCAN_REGEXP = 266,
+    SCAN_STAR = 267,
+    SCAN_HASH_BYTE = 268,
+    SCAN_HASH_INT16 = 269,
+    SCAN_HASH_UINT16 = 270,
+    SCAN_HASH_INT32 = 271,
+    SCAN_HASH_UINT32 = 272,
+    SCAN_HASH_FLOAT32 = 273,
+    SCAN_HASH_FLOAT64 = 274
+  };
+#endif
+
+/* Value type.  */
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+
+union YYSTYPE
+{
+#line 145 "ce_expr.yy" /* yacc.c:1915  */
+
+    bool boolean;
+    int op;
+    char id[ID_MAX];
+    
+    libdap::dods_byte byte_value;
+    libdap::dods_int16 int16_value;
+    libdap::dods_uint16 uint16_value;
+    libdap::dods_int32 int32_value;
+    libdap::dods_uint32 uint32_value;
+    libdap::dods_float32 float32_value;
+    libdap::dods_float64 float64_value;
+    
+    libdap::byte_arg_list byte_values;
+    libdap::int16_arg_list int16_values;
+    libdap::uint16_arg_list uint16_values;
+    libdap::int32_arg_list int32_values;
+    libdap::uint32_arg_list uint32_values;
+    libdap::float32_arg_list float32_values;
+    libdap::float64_arg_list float64_values;
+    
+    libdap::value val;               // value is defined in expr.h
+
+    libdap::bool_func b_func;
+    libdap::btp_func bt_func;
+
+    libdap::int_list *int_l_ptr;
+    libdap::int_list_list *int_ll_ptr;
+    
+    libdap::rvalue *rval_ptr;
+    libdap::rvalue_list *r_val_l_ptr;
+
+#line 205 "ce_expr.tab.hh" /* yacc.c:1915  */
+};
+
+typedef union YYSTYPE YYSTYPE;
+# define YYSTYPE_IS_TRIVIAL 1
+# define YYSTYPE_IS_DECLARED 1
+#endif
+
+
+extern YYSTYPE ce_exprlval;
+
+int ce_exprparse (ce_parser_arg *arg);
+
+#endif /* !YY_CE_EXPR_CE_EXPR_TAB_HH_INCLUDED  */
diff --git a/ce_expr.yy b/ce_expr.yy
new file mode 100644
index 0000000..aa08612
--- /dev/null
+++ b/ce_expr.yy
@@ -0,0 +1,1386 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+// 
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+// 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+ 
+// (c) COPYRIGHT URI/MIT 1995-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+/*
+  This is the parser for the DODS constraint expression grammar. The parser
+  calls various `helper' functions defined by the DAP classes which either
+  implement the operations (in the case of relational ops) or store
+  information (in the case of selection operations). 
+
+  jhrg 9/5/95
+*/
+
+%code requires {
+
+#include "config.h"
+
+#include <cassert>
+#include <cstdlib>
+#include <cstring>
+
+#include <iostream>
+#include <sstream>
+#include <iterator>
+#include <string>
+#include <stack>
+
+//#define DODS_DEBUG
+
+#include "debug.h"
+#include "escaping.h"
+
+#include "DDS.h"
+#include "ConstraintEvaluator.h"
+
+#include "BaseType.h"
+
+#include "Byte.h"
+#include "Int16.h"
+#include "UInt16.h"
+#include "Int32.h"
+#include "UInt32.h"
+#include "Float32.h"
+#include "Float64.h"
+#include "Str.h"
+#include "Url.h"
+#include "Array.h"
+#include "Structure.h"
+#include "Sequence.h"
+#include "Grid.h"
+
+#include "Error.h"
+
+#include "util.h"
+#include "parser.h"
+#include "ce_parser.h"
+#include "expr.h"
+#include "RValue.h"
+
+using std::cerr;
+using std::endl;
+using namespace libdap ;
+
+#define EVALUATOR(arg) (static_cast<ce_parser_arg*>(arg)->get_eval())
+#define DDS(arg) (static_cast<ce_parser_arg*>(arg)->get_dds())
+
+// #define YYPARSE_PARAM arg
+
+int ce_exprlex(void);		/* the scanner; see expr.lex */
+
+void ce_exprerror(ce_parser_arg *arg, const string &s); 
+void ce_exprerror(ce_parser_arg *arg, const string &s, const string &s2);
+void no_such_func(ce_parser_arg *arg, const string &name);
+void no_such_ident(ce_parser_arg *arg, const string &name, const string &word);
+
+int_list *make_array_index(value &i1, value &i2, value &i3);
+int_list *make_array_index(value &i1, value &i2);
+int_list *make_array_index(value &i1);
+int_list_list *make_array_indices(int_list *index);
+int_list_list *append_array_index(int_list_list *indices, int_list *index);
+
+void delete_array_indices(int_list_list *indices);
+bool bracket_projection(DDS &table, const char *name, int_list_list *indices);
+
+void process_array_indices(BaseType *variable, int_list_list *indices); 
+void process_grid_indices(BaseType *variable, int_list_list *indices); 
+void process_sequence_indices(BaseType *variable, int_list_list *indices);
+
+/* Replace these with method calls. jhrg 8/31/06 */
+bool is_array_t(BaseType *variable);
+bool is_grid_t(BaseType *variable);
+bool is_sequence_t(BaseType *variable);
+
+BaseType *make_variable(ConstraintEvaluator &eval, const value &val);
+bool_func get_function(const ConstraintEvaluator &eval, const char *name);
+btp_func get_btp_function(const ConstraintEvaluator &eval, const char *name);
+proj_func get_proj_function(const ConstraintEvaluator &eval, const char *name);
+
+template<class arg_list, class arg_type>
+arg_list make_fast_arg_list(unsigned long vector_size_hint, arg_type arg_value);
+
+template<class arg_list, class arg_type>
+arg_list make_fast_arg_list(arg_list int_values, arg_type arg_value);
+
+template<class t, class T>
+rvalue *build_constant_array(vector<t> *values, DDS *dds);
+
+}
+
+%require "2.4"
+
+%parse-param {ce_parser_arg *arg}
+%name-prefix "ce_expr"
+%defines
+%debug
+%verbose
+
+%union {
+    bool boolean;
+    int op;
+    char id[ID_MAX];
+    
+    libdap::dods_byte byte_value;
+    libdap::dods_int16 int16_value;
+    libdap::dods_uint16 uint16_value;
+    libdap::dods_int32 int32_value;
+    libdap::dods_uint32 uint32_value;
+    libdap::dods_float32 float32_value;
+    libdap::dods_float64 float64_value;
+    
+    libdap::byte_arg_list byte_values;
+    libdap::int16_arg_list int16_values;
+    libdap::uint16_arg_list uint16_values;
+    libdap::int32_arg_list int32_values;
+    libdap::uint32_arg_list uint32_values;
+    libdap::float32_arg_list float32_values;
+    libdap::float64_arg_list float64_values;
+    
+    libdap::value val;               // value is defined in expr.h
+
+    libdap::bool_func b_func;
+    libdap::btp_func bt_func;
+
+    libdap::int_list *int_l_ptr;
+    libdap::int_list_list *int_ll_ptr;
+    
+    libdap::rvalue *rval_ptr;
+    libdap::rvalue_list *r_val_l_ptr;
+}
+
+%token <val> SCAN_STR
+
+%token <id> SCAN_WORD
+
+%token <op> SCAN_EQUAL
+%token <op> SCAN_NOT_EQUAL
+%token <op> SCAN_GREATER
+%token <op> SCAN_GREATER_EQL
+%token <op> SCAN_LESS
+%token <op> SCAN_LESS_EQL
+%token <op> SCAN_REGEXP
+
+%token <op> SCAN_STAR
+
+%token <op> SCAN_HASH_BYTE
+%token <op> SCAN_HASH_INT16
+%token <op> SCAN_HASH_UINT16
+%token <op> SCAN_HASH_INT32
+%token <op> SCAN_HASH_UINT32
+%token <op> SCAN_HASH_FLOAT32
+%token <op> SCAN_HASH_FLOAT64
+
+%type <boolean> constraint_expr projection proj_clause proj_function
+%type <boolean> array_projection selection clause bool_function arg_length_hint
+%type <id> array_proj_clause name
+%type <op> rel_op
+
+%type <int_l_ptr> array_index
+%type <int_ll_ptr> array_indices
+
+%type <rval_ptr> r_value id_or_const array_const_special_form array_projection_rvalue
+%type <r_val_l_ptr> r_value_list arg_list
+
+%type <byte_value> fast_byte_arg
+%type <byte_values> fast_byte_arg_list
+
+%type <int16_value> fast_int16_arg 
+%type <int16_values> fast_int16_arg_list
+
+%type <uint16_value> fast_uint16_arg 
+%type <uint16_values> fast_uint16_arg_list
+
+%type <int32_value> fast_int32_arg 
+%type <int32_values> fast_int32_arg_list
+
+%type <uint32_value> fast_uint32_arg 
+%type <uint32_values> fast_uint32_arg_list
+
+%type <float32_value> fast_float32_arg 
+%type <float32_values> fast_float32_arg_list
+
+%type <float64_value> fast_float64_arg 
+%type <float64_values> fast_float64_arg_list
+
+%code {
+/* This global is used by the rule 'arg_length_hint' so that the hint can 
+   be used during the paraent rule's parse. See fast_int32_arg_list. */
+unsigned long arg_length_hint_value = 0;
+}
+
+%%
+
+constraint_expr: /* empty constraint --> send all */
+         {
+             DBG(cerr << "Mark all variables" << endl);
+		     DDS(arg)->mark_all(true);
+		     $$ = true;
+		 }
+         /* projection only */
+         | projection
+		 /* selection only --> project everything */
+         | '&' { DDS(arg)->mark_all(true); } selection
+         { 
+		     $$ = $3;
+		 }
+         | projection '&' selection
+         {
+		     $$ = $1 && $3;
+		 }
+;
+
+projection: proj_clause
+         | proj_clause ',' projection
+         {
+		     $$ = $1 && $3;
+		 }
+;
+
+proj_clause: name 
+         {
+		     BaseType *var = DDS(arg)->var($1);
+		     if (var) {
+			     DBG(cerr << "Marking " << $1 << endl);
+			     $$ = DDS(arg)->mark($1, true);
+			     DBG(cerr << "result: " << $$ << endl);
+		     }
+		     else {
+			     no_such_ident(arg, $1, "identifier");
+		     }
+		}
+        | proj_function
+        {
+		    $$ = $1;
+		}
+		| array_projection
+        {
+		    $$ = $1;
+		}
+        | array_const_special_form
+        {
+            Array *array = dynamic_cast<Array*>($1->bvalue(*DDS(arg)));
+            if (array) { 
+                /* When the special form appears here (not as a function argument)
+                set send_p so the data will be sent and add it to the DDS. This 
+                streamlines testing (and is likely what is intended). */
+                
+                array->set_send_p(true);
+                DDS(arg)->add_var_nocopy(array);
+                
+                return true;
+            }
+            else {
+                ce_exprerror(arg, "Could not create the anonymous vector using the # special form");
+                return false;
+            }
+        }
+;
+
+/* The value parsed by arg_length_hint is stored in a global variable by that rule
+   so that it can be used during the parse of fast_byte_arg_list. */
+
+/* return a rvalue */
+array_const_special_form: SCAN_HASH_BYTE '(' arg_length_hint ':' fast_byte_arg_list ')'
+        {
+            $$ = build_constant_array<dods_byte, Byte>($5, DDS(arg));
+        }
+;
+
+array_const_special_form: SCAN_HASH_INT16 '(' arg_length_hint ':' fast_int16_arg_list ')'
+        {
+            $$ = build_constant_array<dods_int16, Int16>($5, DDS(arg));
+        }
+;
+
+array_const_special_form: SCAN_HASH_UINT16 '(' arg_length_hint ':' fast_uint16_arg_list ')'
+        {
+            $$ = build_constant_array<dods_uint16, UInt16>($5, DDS(arg));
+        }
+;
+
+array_const_special_form: SCAN_HASH_INT32 '(' arg_length_hint ':' fast_int32_arg_list ')'
+        {
+            $$ = build_constant_array<dods_int32, Int32>($5, DDS(arg));
+        }
+;
+
+array_const_special_form: SCAN_HASH_UINT32 '(' arg_length_hint ':' fast_uint32_arg_list ')'
+        {
+            $$ = build_constant_array<dods_uint32, UInt32>($5, DDS(arg));
+        }
+;
+
+array_const_special_form: SCAN_HASH_FLOAT32 '(' arg_length_hint ':' fast_float32_arg_list ')'
+        {
+            $$ = build_constant_array<dods_float32, Float32>($5, DDS(arg));
+        }
+;
+
+array_const_special_form: SCAN_HASH_FLOAT64 '(' arg_length_hint ':' fast_float64_arg_list ')'
+        {
+            $$ = build_constant_array<dods_float64, Float64>($5, DDS(arg));
+        }
+;
+
+/* Here the arg length hint is stored in a global so it can be used by the 
+   function that allocates the vector. The value is passed to vector::reserve(). */
+   
+arg_length_hint: SCAN_WORD
+          {
+              if (!check_int32($1))
+                  throw Error(malformed_expr, "$<type>(hint, value, ...) special form expected hint to be an integer");
+                   
+              arg_length_hint_value = atoi($1);
+              $$ = true;
+          }
+;
+
+/* return an int_arg_list (a std::vector<int>*) */
+fast_byte_arg_list: fast_byte_arg
+          {
+              $$ = make_fast_arg_list<byte_arg_list, dods_byte>(arg_length_hint_value, $1);
+          }
+          | fast_byte_arg_list ',' fast_byte_arg
+          {
+              $$ = make_fast_arg_list<byte_arg_list, dods_byte>($1, $3);
+          }
+;
+
+/* This rule does not check SCAN_WORD nor does it perform www escaping */
+fast_byte_arg: SCAN_WORD
+          {
+              $$ = strtol($1, 0, 0);
+          }
+;
+
+/* return an int_arg_list (a std::vector<int>*) */
+fast_int16_arg_list: fast_int16_arg
+          {
+              $$ = make_fast_arg_list<int16_arg_list, dods_int16>(arg_length_hint_value, $1);
+          }
+          | fast_int16_arg_list ',' fast_int16_arg
+          {
+              $$ = make_fast_arg_list<int16_arg_list, dods_int16>($1, $3);
+          }
+;
+
+/* This rule does not check SCAN_WORD nor does it perform www escaping */
+fast_int16_arg: SCAN_WORD
+          {
+              $$ = strtol($1, 0, 0);
+          }
+;
+
+/* return an int_arg_list (a std::vector<int>*) */
+fast_uint16_arg_list: fast_uint16_arg
+          {
+              $$ = make_fast_arg_list<uint16_arg_list, dods_uint16>(arg_length_hint_value, $1);
+          }
+          | fast_uint16_arg_list ',' fast_uint16_arg
+          {
+              $$ = make_fast_arg_list<uint16_arg_list, dods_uint16>($1, $3);
+          }
+;
+
+/* This rule does not check SCAN_WORD nor does it perform www escaping */
+fast_uint16_arg: SCAN_WORD
+          {
+              $$ = strtoul($1, 0, 0);
+          }
+;
+
+/* return an int_arg_list (a std::vector<int>*) */
+fast_int32_arg_list: fast_int32_arg
+          {
+              $$ = make_fast_arg_list<int32_arg_list, dods_int32>(arg_length_hint_value, $1);
+          }
+          | fast_int32_arg_list ',' fast_int32_arg
+          {
+              $$ = make_fast_arg_list<int32_arg_list, dods_int32>($1, $3);
+          }
+;
+
+/* This rule does not check SCAN_WORD nor does it perform www escaping */
+fast_int32_arg: SCAN_WORD
+          {
+              $$ = strtol($1, 0, 0);
+          }
+;
+
+/* return an int_arg_list (a std::vector<int>*) */
+fast_uint32_arg_list: fast_uint32_arg
+          {
+              $$ = make_fast_arg_list<uint32_arg_list, dods_uint32>(arg_length_hint_value, $1);
+          }
+          | fast_uint32_arg_list ',' fast_uint32_arg
+          {
+              $$ = make_fast_arg_list<uint32_arg_list, dods_uint32>($1, $3);
+          }
+;
+
+/* This rule does not check SCAN_WORD nor does it perform www escaping */
+fast_uint32_arg: SCAN_WORD
+          {
+              $$ = strtoul($1, 0, 0);
+          }
+;
+
+/* return an int_arg_list (a std::vector<int>*) */
+fast_float32_arg_list: fast_float32_arg
+          {
+              $$ = make_fast_arg_list<float32_arg_list, dods_float32>(arg_length_hint_value, $1);
+          }
+          | fast_float32_arg_list ',' fast_float32_arg
+          {
+              $$ = make_fast_arg_list<float32_arg_list, dods_float32>($1, $3);
+          }
+;
+
+/* This rule does not check SCAN_WORD nor does it perform www escaping */
+fast_float32_arg: SCAN_WORD
+          {
+              $$ = strtof($1, 0);
+          }
+;
+
+/* return an int_arg_list (a std::vector<int>*) */
+fast_float64_arg_list: fast_float64_arg
+          {
+              $$ = make_fast_arg_list<float64_arg_list, dods_float64>(arg_length_hint_value, $1);
+          }
+          | fast_float64_arg_list ',' fast_float64_arg
+          {
+              $$ = make_fast_arg_list<float64_arg_list, dods_float64>($1, $3);
+          }
+;
+
+/* This rule does not check SCAN_WORD nor does it perform www escaping */
+fast_float64_arg: SCAN_WORD
+          {
+              $$ = strtod($1, 0);
+          }
+;
+
+/* This rule does not check SCAN_WORD nor does it perform www escaping */
+proj_function:  SCAN_WORD '(' arg_list ')'
+	    {
+		    proj_func p_f = 0;
+		    btp_func f = 0;
+
+		    if ((f = get_btp_function(*(EVALUATOR(arg)), $1))) {
+			    EVALUATOR(arg)->append_clause(f, $3);
+			    $$ = true;
+		    }
+		    else if ((p_f = get_proj_function(*(EVALUATOR(arg)), $1))) { 
+		        DDS &dds = dynamic_cast<DDS&>(*(DDS(arg)));
+			    BaseType **args = build_btp_args( $3, dds );
+			    (*p_f)(($3) ? $3->size():0, args, dds, *(EVALUATOR(arg)));
+			    delete[] args;
+			    $$ = true;
+		    }
+		    else {
+			    no_such_func(arg, $1);
+		    }
+		}
+;
+
+selection:	clause
+		| selection '&' clause
+                {
+		    $$ = $1 && $3;
+		}
+;
+
+clause:		r_value rel_op '{' r_value_list '}'
+                {
+		    if ($1) {
+			EVALUATOR(arg)->append_clause($2, $1, $4);
+			$$ = true;
+		    }
+		    else
+			$$ = false;
+		}
+		| r_value rel_op r_value
+                {
+		    if ($1) {
+			rvalue_list *rv = new rvalue_list;
+			rv->push_back($3);
+			EVALUATOR(arg)->append_clause($2, $1, rv);
+			$$ = true;
+		    }
+		    else
+			$$ = false;
+		}
+		| bool_function
+                {
+		    $$ = $1;
+		}
+;
+
+/* This rule does not check SCAN_WORD nor does it perform www escaping */
+bool_function: SCAN_WORD '(' arg_list ')'
+	       {
+		   bool_func b_func = get_function((*EVALUATOR(arg)), $1);
+		   if (!b_func) {
+		       no_such_func(arg, $1);
+		   }
+		   else {
+		       EVALUATOR(arg)->append_clause(b_func, $3);
+		       $$ = true;
+		   }
+	       }
+;
+
+/* This rule does not check SCAN_WORD nor does it perform www escaping */
+r_value: id_or_const
+		| SCAN_WORD '(' arg_list ')'
+		{
+		    btp_func func = get_btp_function((*EVALUATOR(arg)), $1);
+		    if (func) {
+			    $$ = new rvalue(func, $3);
+		    } 
+		    else { 
+			    no_such_func(arg, $1);
+		    }
+		}
+        | array_const_special_form
+        {
+            $$ = $1;
+        }
+        | array_projection_rvalue
+        {
+            $$ = $1;
+        }
+;
+
+r_value_list:	r_value
+		{
+		    if ($1)
+			    $$ = make_rvalue_list($1);
+		    else
+			    $$ = 0;
+		}
+		| r_value_list ',' r_value
+        {
+		    if ($1 && $3)
+			    $$ = append_rvalue_list($1, $3);
+		    else
+			    $$ = 0;
+		}
+;
+
+arg_list: r_value_list
+          {  
+		      $$ = $1;
+	      }
+          | /* Null, argument lists may be empty */
+          { 
+		      $$ = 0; 
+	      }
+;
+
+id_or_const: SCAN_WORD
+		{ 
+		    BaseType *btp = DDS(arg)->var(www2id($1));
+		    if (btp) {
+                btp->set_in_selection(true);
+                $$ = new rvalue(btp);
+		    }
+		    else {
+			    value new_val;
+			    string name_tmp;
+			    if (check_int32($1)) {
+			        new_val.type = dods_int32_c;
+			        new_val.v.i = atoi($1);
+			    }
+			    else if (check_uint32($1)) {
+			        new_val.type = dods_uint32_c;
+			        new_val.v.ui = atoi($1);
+			    }
+			    else if (check_float64($1)) {
+			        new_val.type = dods_float64_c;
+			        new_val.v.f = atof($1);
+			    }
+			    else {
+			        new_val.type = dods_str_c;
+				// The 'new' here was used because www2id() modifies the
+				// std::string arg in place but 'value' holds a string*.
+			        // new_val.v.s = new string(www2id($1));
+				// I replcaed this with a local tmp to avoid the dynamic
+				// allocation and the need to call delete. This was part of
+				// the fix for ticket 2240. jhrg 7/30/14
+				name_tmp = $1;
+				name_tmp = www2id(name_tmp);
+				new_val.v.s = &name_tmp;
+			    }
+			    BaseType *btp = make_variable((*EVALUATOR(arg)), new_val);
+			    $$ = new rvalue(btp);
+		    }
+		}
+        | SCAN_STR
+                {
+                    if ($1.type != dods_str_c || $1.v.s == 0 || $1.v.s->empty())
+                        ce_exprerror(arg, "Malformed string", "");
+                        
+                    BaseType *var = DDS(arg)->var(www2id(*($1.v.s)));
+                    if (var) {
+                        $$ = new rvalue(var);
+                    }
+                    else {
+                        var = make_variable((*EVALUATOR(arg)), $1); 
+                        $$ = new rvalue(var);
+                    }
+		    // When the scanner (ce_expr.lex) returns the SCAN_STR token type
+		    // it makes a local copy of the string in a new std::string object
+		    // that we must delete. Fix for a bug report by Aron.Bartle@mechdyne.com
+		    // See ticket 2240. jhrg 7/30/14
+		    delete $1.v.s;
+                }
+;
+
+/* this must return an rvalue. It should run bracket_projection() 
+   and then return the BaseType of the Array wrapped in a RValue
+   object. */
+array_projection_rvalue : name array_indices
+                {
+                    if (!bracket_projection((*DDS(arg)), $1, $2))
+                      no_such_ident(arg, $1, "array, grid or sequence");
+                    
+                    // strncpy($$, $1, ID_MAX-1);
+                    // $$[ID_MAX-1] = '\0';
+
+                    DDS(arg)->mark($1, true);
+                    $$ = new rvalue(DDS(arg)->var($1));
+                }
+;
+
+array_projection : array_proj_clause
+                {
+                    $$ = (*DDS(arg)).mark($1, true);
+                }
+;
+                
+array_proj_clause: name array_indices
+                {
+                    //string name = www2id($1);
+                    if (!bracket_projection((*DDS(arg)), $1, $2))
+                      no_such_ident(arg, $1, "array, grid or sequence");
+                    
+                    strncpy($$, $1, ID_MAX-1);
+                    $$[ID_MAX-1] = '\0';
+                }
+                | array_proj_clause name
+                {
+                    string name = string($1) + string($2);
+                    strncpy($$, name.c_str(), ID_MAX-1);
+                    $$[ID_MAX-1] = '\0';
+                }
+                | array_proj_clause name array_indices
+                {
+                    string name = string($1) + string($2);
+                    if (!bracket_projection((*DDS(arg)), name.c_str(), $3))
+                      no_such_ident(arg, name.c_str(), "array, grid or sequence");
+
+                    strncpy($$, name.c_str(), ID_MAX-1);
+                    $$[ID_MAX-1] = '\0';
+                }
+;
+
+name:           SCAN_WORD
+                { 
+                    strncpy($$, www2id($1).c_str(), ID_MAX-1);
+                    $$[ID_MAX-1] = '\0';
+                }
+                | SCAN_STR
+                {
+                    if ($1.type != dods_str_c || $1.v.s == 0 || $1.v.s->empty())
+                        ce_exprerror(arg, "Malformed string", "");
+                        
+                    strncpy($$, www2id(*($1.v.s)).c_str(), ID_MAX-1);
+		    // See comment about regarding the scanner's behavior WRT SCAN_STR.
+		    // jhrg 7/30/14
+                    delete $1.v.s;
+
+                    $$[ID_MAX-1] = '\0';
+                }
+;
+
+array_indices:  array_index
+                {
+		    $$ = make_array_indices($1);
+		}
+                | array_indices array_index
+                {
+		    $$ = append_array_index($1, $2);
+		}
+;
+
+/*
+ * We added [*], [n:*] and [n:m:*] to the syntax for array projections.
+ * These mean, resp., all the elements, elements from n to the end, and
+ * from n to the end with a stride of m. To encode this with as little 
+ * disruption as possible, we represent the star with -1. jhrg 12/20/12
+ */ 
+array_index:
+
+'[' SCAN_WORD ']'
+{
+    if (!check_uint32($2))
+        throw Error(malformed_expr, "The word `" + string($2) + "' is not a valid array index.");
+    value i;
+    i.type = dods_uint32_c;
+    i.v.i = atoi($2);
+    $$ = make_array_index(i);
+}
+|   '[' SCAN_STAR ']'
+{
+    value i;
+    i.type = dods_int32_c;
+    i.v.i =-1;
+    $$ = make_array_index(i);
+}
+|'[' SCAN_WORD ':' SCAN_WORD ']'
+{
+    if (!check_uint32($2))
+        throw Error(malformed_expr, "The word `" + string($2) + "' is not a valid array index.");
+    if (!check_uint32($4))
+        throw Error(malformed_expr, "The word `" + string($4) + "' is not a valid array index.");
+    value i,j;
+    i.type = j.type = dods_uint32_c;
+    i.v.i = atoi($2);
+    j.v.i = atoi($4);
+    $$ = make_array_index(i, j);
+}
+|'[' SCAN_WORD ':' SCAN_STAR ']'
+{
+    if (!check_uint32($2))
+        throw Error(malformed_expr, "The word `" + string($2) + "' is not a valid array index.");
+    value i,j;
+    i.type = dods_uint32_c;
+    j.type = dods_int32_c;  /* signed */
+    i.v.i = atoi($2);
+    j.v.i = -1;
+    $$ = make_array_index(i, j);
+}
+| '[' SCAN_WORD ':' SCAN_WORD ':' SCAN_WORD ']'
+{
+    if (!check_uint32($2))
+        throw Error(malformed_expr, "The word `" + string($2) + "' is not a valid array index.");
+    if (!check_uint32($4))
+        throw Error(malformed_expr, "The word `" + string($4) + "' is not a valid array index.");
+    if (!check_uint32($6))
+        throw Error(malformed_expr, "The word `" + string($6) + "' is not a valid array index.");
+    value i, j, k;
+    i.type = j.type = k.type = dods_uint32_c;
+    i.v.i = atoi($2);
+    j.v.i = atoi($4);
+    k.v.i = atoi($6);
+    $$ = make_array_index(i, j, k);
+}
+| '[' SCAN_WORD ':' SCAN_WORD ':' SCAN_STAR ']'
+{
+    if (!check_uint32($2))
+        throw Error(malformed_expr, "The word `" + string($2) + "' is not a valid array index.");
+    if (!check_uint32($4))
+        throw Error(malformed_expr, "The word `" + string($4) + "' is not a valid array index.");
+    value i, j, k;
+    i.type = j.type = dods_uint32_c;
+    k.type = dods_int32_c;
+    i.v.i = atoi($2);
+    j.v.i = atoi($4);
+    k.v.i = -1;
+    $$ = make_array_index(i, j, k);
+}
+;
+
+rel_op:		SCAN_EQUAL
+		| SCAN_NOT_EQUAL
+		| SCAN_GREATER
+		| SCAN_GREATER_EQL
+		| SCAN_LESS
+		| SCAN_LESS_EQL
+		| SCAN_REGEXP
+;
+
+%%
+
+// All these error reporting function now throw instances of Error. The expr
+// parser no longer returns an error code to indicate and error. 2/16/2000
+// jhrg.
+
+void
+ce_exprerror(ce_parser_arg *, const string &s)
+{
+    string msg = "Constraint expression parse error: " +s;
+    throw Error(malformed_expr, msg);
+}
+
+void ce_exprerror(ce_parser_arg *, const string &s, const string &s2)
+{
+    string msg = "Constraint expression parse error: " + s + ": " + s2;
+    throw Error(malformed_expr, msg);    
+}
+
+void no_such_ident(ce_parser_arg *arg, const string &name, const string &word)
+{
+#if 0
+    string msg = "No such " + word + " in dataset";
+    ce_exprerror(arg, msg , name);
+#endif
+    string msg = "Constraint expression parse error: No such " + word + " in dataset: " + name;
+    throw Error(no_such_variable, msg);    
+    
+}
+
+void no_such_func(ce_parser_arg *arg, const string &name)
+{
+    ce_exprerror(arg, "Not a registered function", name);
+}
+
+/* If we're calling this, assume var is not a Sequence. But assume that the
+ name contains a dot and it's a separator. Look for the rightmost dot and
+ then look to see if the name to the left is a sequence. Return a pointer
+ to the sequence if it is otherwise return null. Uses tail-recursion to
+ 'walk' back from right to left looking at each dot. This way the sequence
+ will be found even if there are structures between the field and the
+ Sequence. */
+static Sequence *
+parent_is_sequence(DDS &table, const string &n)
+{
+    string::size_type dotpos = n.find_last_of('.');
+    if (dotpos == string::npos)
+        return 0;
+
+    string s = n.substr(0, dotpos);
+
+    // If the thing returned by table.var is not a Sequence, this cast
+    // will yield null.
+    Sequence *seq = dynamic_cast<Sequence*> (table.var(s));
+    if (seq)
+        return seq;
+    else
+        return parent_is_sequence(table, s);
+}
+
+bool bracket_projection(DDS &table, const char *name, int_list_list *indices)
+{
+    BaseType *var = table.var(name);
+    Sequence *seq; // used in last else-if clause
+
+    if (!var)
+        return false;
+
+    if (is_array_t(var)) {
+        /* calls to set_send_p should be replaced with
+         calls to DDS::mark so that arrays of Structures,
+         etc. will be processed correctly when individual
+         elements are projected using short names.
+         9/1/98 jhrg */
+        /* var->set_send_p(true); */
+        //table.mark(name, true);
+        // We don't call mark() here for an array. Instead it is called from
+        // within the parser. jhrg 10/10/08
+        process_array_indices(var, indices); // throws on error
+        delete_array_indices(indices);
+    }
+    else if (is_grid_t(var)) {
+        process_grid_indices(var, indices);
+        table.mark(name, true);
+        delete_array_indices(indices);
+    }
+    else if (is_sequence_t(var)) {
+        table.mark(name, true);
+        process_sequence_indices(var, indices);
+        delete_array_indices(indices);
+    }
+    else if ((seq = parent_is_sequence(table, name))) {
+        process_sequence_indices(seq, indices);
+        table.mark(name, true);
+        delete_array_indices(indices);
+    }
+    else {
+        return false;
+    }
+
+    return true;
+}
+
+// Given three values (I1, I2, I3), all of which must be integers, build an
+// int_list which contains those values.
+// 
+// Note that we added support for * in the rightmost position of an index
+// (i.e., [*], [n:*], [n:m:*]) and indicate that star using -1 as an index value.
+// Bescause of this change, the test for the type of the rightmost value in
+// the index subexpr was changed to include signed int.
+// jhrg 12/20/12
+//
+// Returns: A pointer to an int_list of three integers or NULL if any of the
+// values are not integers.
+
+int_list *
+make_array_index(value &i1, value &i2, value &i3)
+{
+    if (i1.type != dods_uint32_c || i2.type != dods_uint32_c || (i3.type != dods_uint32_c && i3.type != dods_int32_c))
+        return (int_list *) 0;
+
+    int_list *index = new int_list;
+
+    index->push_back((int) i1.v.i);
+    index->push_back((int) i2.v.i);
+    index->push_back((int) i3.v.i);
+
+    DBG(cout << "index: ");
+    DBG(copy(index->begin(), index->end(), ostream_iterator<int>(cerr, " ")));
+    DBG(cerr << endl);
+
+    return index;
+}
+
+int_list *
+make_array_index(value &i1, value &i2)
+{
+    if (i1.type != dods_uint32_c || (i2.type != dods_uint32_c && i2.type != dods_int32_c))
+	return (int_list *) 0;
+
+    int_list *index = new int_list;
+
+    index->push_back((int) i1.v.i);
+    index->push_back(1);
+    index->push_back((int) i2.v.i);
+
+    DBG(cout << "index: ");
+    DBG(copy(index->begin(), index->end(), ostream_iterator<int>(cerr, " ")));
+    DBG(cerr << endl);
+
+    return index;
+}
+
+int_list *
+make_array_index(value &i1)
+{
+    if (i1.type != dods_uint32_c && i1.type != dods_int32_c)
+	return (int_list *) 0;
+
+    int_list *index = new int_list;
+
+    // When the CE is Array[*] that means all of the elements, but the value
+    // of i1 will be -1. Make the projection triple be 0:1:-1 which is a 
+    // pattern that libdap::Array will recognize.
+    if (i1.v.i == -1)
+        index->push_back(0);
+    else
+        index->push_back((int) i1.v.i);
+    index->push_back(1);
+    index->push_back((int) i1.v.i);
+
+    DBG(cout << "index: ");
+    DBG(copy(index->begin(), index->end(), ostream_iterator<int>(cerr, " ")));
+    DBG(cerr << endl);
+
+    return index;
+}
+
+int_list_list *
+make_array_indices(int_list *index)
+{
+    int_list_list *indices = new int_list_list;
+
+    DBG(cout << "index: ");
+    DBG(copy(index->begin(), index->end(), ostream_iterator<int>(cerr, " ")));
+    DBG(cerr << endl);
+
+    assert(index);
+    indices->push_back(index);
+
+    return indices;
+}
+
+int_list_list *
+append_array_index(int_list_list *indices, int_list *index)
+{
+    assert(indices);
+    assert(index);
+
+    indices->push_back(index);
+
+    return indices;
+}
+
+// Delete an array indices list. 
+
+void delete_array_indices(int_list_list *indices)
+{
+    assert(indices);
+
+    for (int_list_citer i = indices->begin(); i != indices->end(); i++) {
+	int_list *il = *i;
+	assert(il);
+	delete il;
+    }
+
+    delete indices;
+}
+
+bool is_array_t(BaseType *variable)
+{
+    assert(variable);
+
+    if (variable->type() != dods_array_c)
+	return false;
+    else
+	return true;
+}
+
+bool is_grid_t(BaseType *variable)
+{
+    assert(variable);
+
+    if (variable->type() != dods_grid_c)
+	return false;
+    else
+	return true;
+}
+
+bool is_sequence_t(BaseType *variable)
+{
+    assert(variable);
+
+    if (variable->type() != dods_sequence_c)
+	return false;
+    else
+	return true;
+}
+
+void process_array_indices(BaseType *variable, int_list_list *indices)
+{
+    assert(variable);
+
+    Array *a = dynamic_cast<Array *>(variable); // replace with dynamic cast
+    if (!a)
+        throw Error(malformed_expr,
+		    string("The constraint expression evaluator expected an array; ") + variable->name() + " is not an array.");
+
+    if (a->dimensions(true) != (unsigned) indices->size())
+        throw Error(malformed_expr,
+		    string("Error: The number of dimensions in the constraint for ") + variable->name()
+                    + " must match the number in the array.");
+
+    DBG(cerr << "Before applying projection to array:" << endl);
+    DBG(a->print_decl(cerr, "", true, false, true));
+
+    assert(indices);
+    
+    int_list_citer p = indices->begin();
+    Array::Dim_iter r = a->dim_begin();
+    for (; p != indices->end() && r != a->dim_end(); p++, r++) {
+        int_list *index = *p;
+        assert(index);
+
+        int_citer q = index->begin();
+        assert(q != index->end());
+        int start = *q;
+
+        q++;
+        int stride = *q;
+
+        q++;
+        int stop = *q;
+
+        q++;
+        if (q != index->end())
+            throw Error(malformed_expr, string("Too many values in index list for ") + a->name() + ".");
+
+        DBG(cerr << "process_array_indices: Setting constraint on " 
+            << a->name() << "[" << start << ":" << stop << "]"
+            << endl);
+
+        // It's possible that an array will appear more than once in a CE
+        // (for example, if an array of structures is constrained so that
+        // only two fields are projected and there's an associated hyperslab).
+        // However, in this case the two hyperslabs must be equal; test for
+        // that here.
+        //
+        // We added '*' to mean 'the last element' in the array and use an index of -1
+        // to indicate that. If 'stop' is -1, don't test it here because dimension_stop()
+        // won't be -1 but the actual ending index of the array. jhrg 12/20/12
+
+        if (a->send_p() && (a->dimension_start(r, true) != start || (a->dimension_stop(r, true) != stop && stop != -1)
+                            || a->dimension_stride(r, true) != stride))
+            throw Error(malformed_expr,
+                    string("The Array was already projected differently in the constraint expression: ") + a->name() + ".");
+
+        a->add_constraint(r, start, stride, stop);
+
+        DBG(cerr << "Set Constraint: " << a->dimension_size(r, true) << endl);
+    }
+
+    DBG(cerr << "After applying projection to array:" << endl);
+    DBG(a->print_decl(cerr, "", true, false, true));
+
+
+    if (p != indices->end() && r == a->dim_end())
+        throw Error(malformed_expr, string("Too many indices in constraint for ") + a->name() + ".");
+}
+
+void process_grid_indices(BaseType *variable, int_list_list *indices)
+{
+    assert(variable);
+    assert(variable->type() == dods_grid_c);
+    Grid *g = dynamic_cast<Grid *>(variable);
+    if (!g)
+        throw Error(unknown_error, "Expected a Grid variable");
+
+    Array *a = g->get_array();
+
+    if (a->dimensions(true) != (unsigned) indices->size())
+        throw Error(malformed_expr,
+		    string("Error: The number of dimensions in the constraint for ") + variable->name()
+		    + " must match the number in the grid.");
+
+    // First do the constraints on the ARRAY in the grid.
+    process_array_indices(g->array_var(), indices);
+
+    // Now process the maps.
+    Grid::Map_iter r = g->map_begin();
+
+    // Suppress all maps by default.
+    for (; r != g->map_end(); r++) {
+        (*r)->set_send_p(false);
+    }
+
+    // Add specified maps to the current projection.
+    assert(indices);
+    int_list_citer p = indices->begin();
+    r = g->map_begin();
+    for (; p != indices->end() && r != g->map_end(); p++, r++) {
+        int_list *index = *p;
+        assert(index);
+
+        int_citer q = index->begin();
+        assert(q != index->end());
+        int start = *q;
+
+        q++;
+        int stride = *q;
+
+        q++;
+        int stop = *q;
+
+        BaseType *btp = *r;
+        assert(btp);
+        assert(btp->type() == dods_array_c);
+        Array *a = (Array *) btp;
+        a->set_send_p(true);
+        a->reset_constraint();
+
+        q++;
+        if (q != index->end()) {
+            throw Error(malformed_expr, string("Too many values in index list for ") + a->name() + ".");
+        }
+
+        DBG(cerr << "process_grid_indices: Setting constraint on "
+            << a->name() << "[" << start << ":"
+            << stop << "]" << endl);
+    
+        Array::Dim_iter si = a->dim_begin();
+        a->add_constraint(si, start, stride, stop);
+
+    }
+
+    DBG(cout << "Grid Constraint: ";
+	for (Array::Dim_iter dp = ((Array *) g->array_var())->dim_begin();
+	     dp != ((Array *) g->array_var())->dim_end(); dp++)
+	    cout << ((Array *) g->array_var())->dimension_size(dp, true) << " ";
+	    cout << endl
+	);
+
+    if (p != indices->end() && r == g->map_end()) {
+        throw Error(malformed_expr,
+		    string("Too many indices in constraint for ") + (*r)->name() + ".");
+    }
+}
+
+void process_sequence_indices(BaseType *variable, int_list_list *indices)
+{
+    assert(variable);
+    assert(variable->type() == dods_sequence_c);
+    Sequence *s = dynamic_cast<Sequence *> (variable);
+    if (!s)
+        throw Error(malformed_expr, "Expected a Sequence variable");
+
+    // Add specified maps to the current projection.
+    assert(indices);
+    for (int_list_citer p = indices->begin(); p != indices->end(); p++) {
+        int_list *index = *p;
+        assert(index);
+
+        int_citer q = index->begin();
+        assert(q != index->end());
+        int start = *q;
+
+        q++;
+        int stride = *q;
+
+        q++;
+        int stop = *q;
+
+        q++;
+        if (q != index->end()) {
+            throw Error(malformed_expr, string("Too many values in index list for ") + s->name() + ".");
+        }
+
+        s->set_row_number_constraint(start, stop, stride);
+    }
+}
+
+// Given a value, wrap it up in a BaseType and return a pointer to the same.
+
+BaseType *
+make_variable(ConstraintEvaluator &eval, const value &val)
+{
+    BaseType *var;
+    switch (val.type) {
+    case dods_int32_c: {
+        var = new Int32("dummy");
+        var->val2buf((void *) &val.v.i);
+        break;
+    }
+
+    case dods_uint32_c: {
+        var = new UInt32("dummy");
+        var->val2buf((void *) &val.v.i);
+        break;
+    }
+
+    case dods_float64_c: {
+        var = new Float64("dummy");
+        var->val2buf((void *) &val.v.f);
+        break;
+    }
+
+    case dods_str_c: {
+        var = new Str("dummy");
+        var->val2buf((void *) val.v.s);
+        break;
+    }
+
+    default:
+        var = (BaseType *) 0;
+        return var;
+    }
+
+    var->set_read_p(true); // ...so the evaluator will know it has data
+    eval.append_constant(var);
+
+    return var;
+}
+
+// Given a string (passed in VAL), consult the DDS CE function lookup table
+// to see if a function by that name exists. 
+// NB: function arguments are type-checked at run-time.
+//
+// Returns: A pointer to the function or NULL if not such function exists.
+
+bool_func get_function(const ConstraintEvaluator &eval, const char *name)
+{
+    bool_func f;
+
+    if (eval.find_function(name, &f))
+        return f;
+    else
+        return 0;
+}
+
+btp_func get_btp_function(const ConstraintEvaluator &eval, const char *name)
+{
+    btp_func f;
+
+    if (eval.find_function(name, &f))
+        return f;
+    else
+        return 0;
+}
+
+proj_func get_proj_function(const ConstraintEvaluator &eval, const char *name)
+{
+    proj_func f;
+
+    if (eval.find_function(name, &f))
+        return f;
+    else
+        return 0;
+}
+
+template<class arg_type_list, class arg_type>
+arg_type_list
+make_fast_arg_list(unsigned long vector_size_hint, arg_type value)
+{
+    arg_type_list args = new std::vector<arg_type>;
+    
+    if (vector_size_hint > 0) args->reserve(vector_size_hint);
+    
+    args->push_back(value);
+    return args;
+}
+
+template<class arg_type_list, class arg_type>
+arg_type_list
+make_fast_arg_list(arg_type_list values, arg_type value)
+{
+    values->push_back(value);
+    return values;
+}
+
+template<class t, class T>
+rvalue *build_constant_array(vector<t> *values, DDS *dds)
+{
+    //vector<t> *values = $5;
+            
+    T i("");
+    Array *array = new Array("", &i);
+    array->append_dim(values->size());
+    
+    // TODO Make set_value_nocopy() methods so that values' pointers can be copied
+    // instead of allocating memory twice. jhrg 7/5/13
+            
+    array->set_value(*values, values->size());
+    delete values;
+    array->set_read_p(true);
+            
+    static unsigned long counter = 1;
+    string name;
+    do {
+        name = "g" + long_to_string(counter++);
+    } while (dds->var(name));
+    array->set_name(name);
+            
+    return new rvalue(array);
+}
+
diff --git a/ce_parser.h b/ce_parser.h
new file mode 100644
index 0000000..592c223
--- /dev/null
+++ b/ce_parser.h
@@ -0,0 +1,41 @@
+
+#ifndef CE_PARSER_H_
+#define CE_PARSER_H_
+
+namespace libdap
+{
+
+struct ce_parser_arg
+{
+    ConstraintEvaluator *eval;
+    DDS *dds;
+
+    ce_parser_arg() : eval(0), dds(0)
+    {}
+    ce_parser_arg(ConstraintEvaluator *e, DDS *d) : eval(e), dds(d)
+    {}
+    virtual ~ce_parser_arg()
+    {}
+
+    ConstraintEvaluator *get_eval()
+    {
+        return eval;
+    }
+    void set_eval(ConstraintEvaluator *obj)
+    {
+        eval = obj;
+    }
+
+    DDS *get_dds()
+    {
+        return dds;
+    }
+    void set_dds(DDS *obj)
+    {
+        dds = obj;
+    }
+};
+
+} // namespace libdap
+
+#endif // CE_PARSER_H_
diff --git a/cgi_util.h b/cgi_util.h
new file mode 100644
index 0000000..1d406d6
--- /dev/null
+++ b/cgi_util.h
@@ -0,0 +1,15 @@
+/*
+ * cgi_util.h
+ *
+ * Compatibility header file. Use <mime_util.h> instead.
+ *
+ *  Created on: Aug 27, 2009
+ *      Author: jimg
+ */
+
+#ifndef CGI_UTIL_H_
+#define CGI_UTIL_H_
+
+#include <mime_util.h>
+
+#endif /* CGI_UTIL_H_ */
diff --git a/chunked_istream.cc b/chunked_istream.cc
new file mode 100644
index 0000000..b559fe6
--- /dev/null
+++ b/chunked_istream.cc
@@ -0,0 +1,414 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2009 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+//
+// Portions of this code were taken verbatim from  Josuttis,
+// "The C++ Standard Library," p.672
+
+#include "config.h"
+
+#include <stdint.h>
+#include <byteswap.h>
+#include <arpa/inet.h>
+
+#include <cstring>
+#include <vector>
+
+#include "chunked_stream.h"
+#include "chunked_istream.h"
+
+#include "Error.h"
+
+//#define DODS_DEBUG
+//#define DODS_DEBUG2
+#ifdef DODS_DEBUG
+#include <iostream>
+#endif
+
+#include "util.h"
+#include "debug.h"
+
+namespace libdap {
+
+/*
+  This code does not use a 'put back' buffer, but here's a picture of the
+  d_buffer pointer, eback(), gptr() and egptr() that can be used to see how
+  the I/O Stream library's streambuf class works. For the case with no
+  putback, just imagine it as zero and eliminate the leftmost extension. This
+  might also come in useful if the code was extended to support put back. I
+  removed that feature because I don't see it being used with our chunked
+  transmission protocol and it requires an extra call to memcopy() when data
+  are added to the internal buffer.
+
+  d_buffer  d_buffer + putBack
+  |         |
+  v         v
+  |---------|--------------------------------------------|....
+  |         |                                            |   .
+  |---------|--------------------------------------------|....
+            ^                         ^                   ^
+            |                         |                   |
+            eback()                   gptr()              egptr()
+
+ */
+
+/**
+ * @brief Insert new characters into the buffer
+ * This specialization of underflow is called when the gptr() is advanced to
+ * the end of the input buffer. At that point it calls the underlying I/O stream
+ * to read the next chunk of data and transfers the data read to the internal
+ * buffer. If an error is found, EOF is returned. If an END chunk with zero
+ * bytes is found, an EOF is returned.
+ * @return The character at the gptr() or EOF
+ */
+std::streambuf::int_type
+chunked_inbuf::underflow()
+{
+    DBG(cerr << "underflow..." << endl);
+    DBG2(cerr << "eback(): " << (void*)eback() << ", gptr(): " << (void*)(gptr()-eback()) << ", egptr(): " << (void*)(egptr()-eback()) << endl);
+
+	// return the next character; uflow() increments the puffer pointer.
+	if (gptr() < egptr())
+		return traits_type::to_int_type(*gptr());
+
+	// gptr() == egptr() so read more data from the underlying input source.
+
+	// To read data from the chunked stream, first read the header
+	uint32_t header;
+	d_is.read((char *) &header, 4);
+#if !BYTE_ORDER_PREFIX
+	// When the endian nature of the server is encoded in the chunk header, the header is
+	// sent using network byte order
+	ntohl(header);
+#endif
+
+	// There are two 'EOF' cases: One where the END chunk is zero bytes and one where
+	// it holds data. In the latter case, bytes those will be read and moved into the
+	// buffer. Once those data are consumed, we'll be back here again and this read()
+	// will return EOF. See below for the other case...
+	if (d_is.eof()) return traits_type::eof();
+#if BYTE_ORDER_PREFIX
+	if (d_twiddle_bytes) header = bswap_32(header);
+#else
+	// (header & CHUNK_LITTLE_ENDIAN) --> is the sender little endian
+	if (!d_set_twiddle) {
+	    d_twiddle_bytes = (is_host_big_endian() == (header & CHUNK_LITTLE_ENDIAN));
+	    d_set_twiddle = true;
+	}
+#endif
+	uint32_t chunk_size = header & CHUNK_SIZE_MASK;
+
+	DBG(cerr << "underflow: chunk size from header: " << chunk_size << endl);
+	DBG(cerr << "underflow: chunk type from header: " << hex << (header & CHUNK_TYPE_MASK) << endl);
+	DBG(cerr << "underflow: chunk byte order from header: " << hex << (header & CHUNK_BIG_ENDIAN) << endl);
+
+	// Handle the case where the buffer is not big enough to hold the incoming chunk
+	if (chunk_size > d_buf_size) {
+		d_buf_size = chunk_size;
+		m_buffer_alloc();
+	}
+
+	// If the END chunk has zero bytes, return EOF. See above for more information
+	if (chunk_size == 0 && (header & CHUNK_TYPE_MASK) == CHUNK_END) return traits_type::eof();
+
+	// Read the chunk's data
+	d_is.read(d_buffer, chunk_size);
+	DBG2(cerr << "underflow: size read: " << d_is.gcount() << ", eof: " << d_is.eof() << ", bad: " << d_is.bad() << endl);
+	if (d_is.bad()) return traits_type::eof();
+
+	DBG2(cerr << "eback(): " << (void*)eback() << ", gptr(): " << (void*)(gptr()-eback()) << ", egptr(): " << (void*)(egptr()-eback()) << endl);
+	setg(d_buffer, 						// beginning of put back area
+			d_buffer,                	// read position (gptr() == eback())
+			d_buffer + chunk_size);  	// end of buffer (egptr()) chunk_size == d_is.gcount() unless there's an error
+
+	DBG2(cerr << "eback(): " << (void*)eback() << ", gptr(): " << (void*)(gptr()-eback()) << ", egptr(): " << (void*)(egptr()-eback()) << endl);
+
+	switch (header & CHUNK_TYPE_MASK) {
+	case CHUNK_END:
+		DBG2(cerr << "Found end chunk" << endl);
+		return traits_type::to_int_type(*gptr());
+	case CHUNK_DATA:
+		return traits_type::to_int_type(*gptr());
+
+	case CHUNK_ERR:
+		// this is pretty much the end of the show... Assume the buffer/chunk holds
+		// the error message text.
+		d_error = true;
+		d_error_message = string(d_buffer, chunk_size);
+		return traits_type::eof();
+	default:
+		d_error = true;
+		d_error_message = "Failed to read known chunk header type.";
+		return traits_type::eof();
+	}
+
+	return traits_type::eof();	// Can never get here; this quiets g++
+}
+
+/**
+ * @brief Read a block of data
+ * This specialization of xsgetn() reads \c num bytes and puts them in \c s
+ * first reading from the internal beffer and then from the stream. Any
+ * characters read from the last chunk that won't fit in to \c s are put
+ * in the buffer, otherwise all data are read directly into \c s, bypassing
+ * the internal buffer (and the extra copy operation that would imply). If
+ * the END chunk is found EOF is not returned and the final read of the
+ * underlying stream is not made; the next call to read(), get(), ..., will
+ * return EOF.
+ * @param s Address of a buffer to hold the data
+ * @param num Number of bytes to read
+ * @return NUmber of bytes actually transferred into \c s. Note that this
+ * number does not include the bytes read from the last chunk that won't
+ * fit into \c s so this will never return a number greater than num.
+ */
+std::streamsize
+chunked_inbuf::xsgetn(char* s, std::streamsize num)
+{
+	DBG(cerr << "xsgetn... num: " << num << endl);
+
+	// if num is <= the chars currently in the buffer
+	if (num <= (egptr() - gptr())) {
+		memcpy(s, gptr(), num);
+		gbump(num);
+
+		return traits_type::not_eof(num);
+	}
+
+	// else they asked for more
+	uint32_t bytes_left_to_read = num;
+
+	// are there any bytes in the buffer? if so grab them first
+	if (gptr() < egptr()) {
+		int bytes_to_transfer = egptr() - gptr();
+		memcpy(s, gptr(), bytes_to_transfer);
+		gbump(bytes_to_transfer);
+		s += bytes_to_transfer;
+		bytes_left_to_read -= bytes_to_transfer;
+	}
+
+	// We need to get more bytes from the underlying stream; at this
+	// point the internal buffer is empty.
+
+	// read the remaining bytes to transfer, a chunk at a time,
+	// and put any leftover stuff in the buffer.
+
+	// note that when the code is here, gptr() == egptr(), so the
+	// next call to read() will fall through the previous tests and
+	// read at least one chunk here.
+	bool done = false;
+    while (!done) {
+        // Get a chunk header
+        uint32_t header;
+        d_is.read((char *) &header, 4);
+#if !BYTE_ORDER_PREFIX
+        ntohl(header);
+#endif
+
+        // There are two EOF cases: One where the END chunk is zero bytes and one where
+        // it holds data. In the latter case, those will be read and moved into the
+        // buffer. Once those data are consumed, we'll be back here again and this read()
+        // will return EOF. See below for the other case...
+        if (d_is.eof()) return traits_type::eof();
+#if BYTE_ORDER_PREFIX
+        if (d_twiddle_bytes) header = bswap_32(header);
+#else
+        // (header & CHUNK_LITTLE_ENDIAN) --> is the sender little endian
+        if (!d_set_twiddle) {
+            d_twiddle_bytes = (is_host_big_endian() == (header & CHUNK_LITTLE_ENDIAN));
+            d_set_twiddle = true;
+        }
+#endif
+
+	    uint32_t chunk_size = header & CHUNK_SIZE_MASK;
+		DBG(cerr << "xsgetn: chunk size from header: " << chunk_size << endl);
+		DBG(cerr << "xsgetn: chunk type from header: " << hex << (header & CHUNK_TYPE_MASK) << endl);
+		DBG(cerr << "xsgetn: chunk byte order from header: " << hex << (header & CHUNK_BIG_ENDIAN) << endl);
+
+		// handle error chunks here
+	    if ((header & CHUNK_TYPE_MASK) == CHUNK_ERR) {
+			d_error = true;
+			// Note that d_buffer is not used to avoid calling resize if it is too
+			// small to hold the error message. At this point, there's not much reason
+			// to optimize transport efficiency, however.
+			std::vector<char> message(chunk_size);
+			d_is.read(&message[0], chunk_size);
+			d_error_message = string(&message[0], chunk_size);
+			// leave the buffer and gptr(), ..., in a consistent state (empty)
+			setg(d_buffer, d_buffer, d_buffer);
+	    }
+	    // And zero-length END chunks here.
+	    else if (chunk_size == 0 && (header & CHUNK_TYPE_MASK) == CHUNK_END) {
+	    	return traits_type::not_eof(num-bytes_left_to_read);
+	    }
+	    // The next case is complicated because we read some data from the current
+	    // chunk into 's' an some into the internal buffer.
+	    else if (chunk_size > bytes_left_to_read) {
+			d_is.read(s, bytes_left_to_read);
+			if (d_is.bad()) return traits_type::eof();
+
+			// Now slurp up the remain part of the chunk and store it in the buffer
+			uint32_t bytes_leftover = chunk_size - bytes_left_to_read;
+			// expand the internal buffer if needed
+		    if (bytes_leftover > d_buf_size) {
+		        d_buf_size = chunk_size;
+		        m_buffer_alloc();
+		    }
+		    // read the remain stuff in to d_buffer
+			d_is.read(d_buffer, bytes_leftover);
+			if (d_is.bad()) return traits_type::eof();
+
+			setg(d_buffer, 										// beginning of put back area
+				 d_buffer,                						// read position (gptr() == eback())
+				 d_buffer + bytes_leftover /*d_is.gcount()*/); 	// end of buffer (egptr())
+
+			bytes_left_to_read = 0 /* -= d_is.gcount()*/;
+		}
+		else {
+			// expand the internal buffer if needed
+		    if (chunk_size > d_buf_size) {
+		        d_buf_size = chunk_size;
+		        m_buffer_alloc();
+		    }
+		    // If we get a chunk that's zero bytes, Don't call read()
+		    // to save the kernel context switch overhead.
+			if (chunk_size > 0) {
+				d_is.read(s, chunk_size);
+				if (d_is.bad()) return traits_type::eof();
+				bytes_left_to_read -= chunk_size /*d_is.gcount()*/;
+				s += chunk_size;
+			}
+		}
+
+	    switch (header & CHUNK_TYPE_MASK) {
+	    case CHUNK_END:
+			DBG(cerr << "Found end chunk" << endl);
+	    	// in this case bytes_left_to_read can be > 0 because we ran out of data
+	    	// before reading all the requested bytes. The next read() call will return
+	    	// eof; this call returns the number of bytes read and transferred to 's'.
+	    	done = true;
+	    	break;
+	    case CHUNK_DATA:
+	    	done = bytes_left_to_read == 0;
+	        break;
+	    case CHUNK_ERR:
+			// this is pretty much the end of the show... The error message has
+	    	// already been read above
+			return traits_type::eof();
+	        break;
+		default:
+			d_error = true;
+			d_error_message = "Failed to read known chunk header type.";
+			return traits_type::eof();
+	    }
+	}
+
+	return traits_type::not_eof(num-bytes_left_to_read);
+}
+
+/**
+ * @brief Read a chunk
+ * Normally the chunked nature of a chunked_istream/chunked_inbuf is
+ * hidden from the caller. This method provides a way to get one chunk
+ * from the stream by forcing its read and returning the size. A subsequent
+ * call to read() for that number of bytes will return all of the data in
+ * the chunk. If there is any data in the chunk_inbuf object's buffer, it is
+ * lost.
+ *
+ * @return The number of bytes read, which is exactly the size of the
+ * next chunk in the stream. Returns EOF on error.
+ */
+std::streambuf::int_type
+chunked_inbuf::read_next_chunk()
+{
+	// To read data from the chunked stream, first read the header
+	uint32_t header;
+	d_is.read((char *) &header, 4);
+#if !BYTE_ORDER_PREFIX
+    ntohl(header);
+#endif
+
+	// There are two 'EOF' cases: One where the END chunk is zero bytes and one where
+	// it holds data. In the latter case, bytes those will be read and moved into the
+	// buffer. Once those data are consumed, we'll be back here again and this read()
+	// will return EOF. See below for the other case...
+	if (d_is.eof()) return traits_type::eof();
+#if BYTE_ORDER_PREFIX
+    if (d_twiddle_bytes) header = bswap_32(header);
+#else
+    // (header & CHUNK_LITTLE_ENDIAN) --> is the sender little endian
+    if (!d_set_twiddle) {
+        d_twiddle_bytes = (is_host_big_endian() == (header & CHUNK_LITTLE_ENDIAN));
+        d_set_twiddle = true;
+    }
+#endif
+
+	uint32_t chunk_size = header & CHUNK_SIZE_MASK;
+
+	DBG(cerr << "read_next_chunk: chunk size from header: " << chunk_size << endl);
+	DBG(cerr << "read_next_chunk: chunk type from header: " << hex << (header & CHUNK_TYPE_MASK) << endl);
+	DBG(cerr << "read_next_chunk: chunk byte order from header: " << hex << (header & CHUNK_BIG_ENDIAN) << endl);
+
+	// Handle the case where the buffer is not big enough to hold the incoming chunk
+	if (chunk_size > d_buf_size) {
+		d_buf_size = chunk_size;
+		m_buffer_alloc();
+	}
+
+	// If the END chunk has zero bytes, return EOF. See above for more information
+	if (chunk_size == 0 && (header & CHUNK_TYPE_MASK) == CHUNK_END) return traits_type::eof();
+
+	// Read the chunk's data
+	d_is.read(d_buffer, chunk_size);
+	DBG2(cerr << "read_next_chunk: size read: " << d_is.gcount() << ", eof: " << d_is.eof() << ", bad: " << d_is.bad() << endl);
+	if (d_is.bad()) return traits_type::eof();
+
+	DBG2(cerr << "eback(): " << (void*)eback() << ", gptr(): " << (void*)(gptr()-eback()) << ", egptr(): " << (void*)(egptr()-eback()) << endl);
+	setg(d_buffer, 						// beginning of put back area
+			d_buffer,                	// read position (gptr() == eback())
+			d_buffer + chunk_size);  	// end of buffer (egptr()) chunk_size == d_is.gcount() unless there's an error
+
+	DBG2(cerr << "eback(): " << (void*)eback() << ", gptr(): " << (void*)(gptr()-eback()) << ", egptr(): " << (void*)(egptr()-eback()) << endl);
+
+	switch (header & CHUNK_TYPE_MASK) {
+	case CHUNK_END:
+		DBG(cerr << "Found end chunk" << endl);
+		return traits_type::not_eof(chunk_size);
+	case CHUNK_DATA:
+		return traits_type::not_eof(chunk_size);
+
+	case CHUNK_ERR:
+		// this is pretty much the end of the show... Assume the buffer/chunk holds
+		// the error message text.
+		d_error = true;
+		d_error_message = string(d_buffer, chunk_size);
+		return traits_type::eof();
+	default:
+		d_error = true;
+		d_error_message = "Failed to read known chunk header type.";
+		return traits_type::eof();
+	}
+
+	return traits_type::eof();	// Can never get here; this quiets g++
+}
+
+}
diff --git a/chunked_istream.h b/chunked_istream.h
new file mode 100644
index 0000000..6896cf6
--- /dev/null
+++ b/chunked_istream.h
@@ -0,0 +1,172 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2013 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+//
+// Portions of this code were taken verbatim from Josuttis,
+// "The C++ Standard Library," p.672
+
+#ifndef _chunked_istream_h
+#define _chunked_istream_h
+
+#include "chunked_stream.h"
+
+#include <stdint.h>
+
+#include <streambuf>
+#include <istream>
+#include <stdexcept>
+#include <string>
+
+namespace libdap {
+
+class chunked_inbuf: public std::streambuf {
+private:
+	std::istream &d_is;
+
+	uint32_t d_buf_size;	// Size of the data buffer
+	char *d_buffer;			// data buffer
+
+	// In the original implementation of this class, the byte order of the data stream
+	// was passed in via constructors. When BYTE_ORDER_PREFIX is defined that is the
+	// case. However, when it is not defined, the byte order is read from the chunk
+	// header's high order byte (in bit position 2 - see chunked_stream.h). jhrg 11/24/13
+
+	bool d_twiddle_bytes; 	// receiver-makes-right encoding (byte order)...
+	bool d_set_twiddle;
+
+	// If an error chunk is read, save the message here
+	std::string d_error_message;
+	bool d_error;
+
+	/**
+	 * @brief allocate the internal buffer.
+	 * Allocate d_buf_size + putBack characters for the read buffer.
+	 * @param size How much can the buffer hold? Does not include the putBack
+	 * chars.
+	 */
+	void m_buffer_alloc() {
+		delete d_buffer;
+		d_buffer = new char[d_buf_size];
+		setg(d_buffer, 	// beginning of put back area
+			 d_buffer, 	// read position
+		     d_buffer); // end position
+	}
+
+public:
+	/**
+	 * @brief Build a chunked input buffer.
+	 *
+	 * This reads from a chunked stream, extracting an entire chunk and storing it in a
+	 * buffer in one operation. If the chunked_inbuf reads a chunk header that indicates
+	 * the next chunk is going  be bigger than its current buffer size, the object will
+	 * make the buffer larger. This object support 128 characters of 'put back' space. Since
+	 * DAP4 uses receiver makes right, the buffer must be told if it should 'twiddle' the
+	 * header size information. In DAP4 the byte order is sent using a one-byte code _before_
+	 * the chunked transmission starts.
+	 *
+	 * @note In the current implementation, the byte order of the sender is read from the
+	 * first chunk header. The method twiddle_bytes() returns false until the first chunk is
+	 * read, then it returns the correct value. Only the first chunk_header is tested for the
+	 * byte order flag; all subsequent chunks are assumed to use the same byte order.
+	 *
+	 * @param is Use this as a data source
+	 * @param size The size of the input buffer. This should match the likely chunk size.
+	 * If it is smaller than a chunk, it will be resized.
+	 * @param twiddle_bytes Should the header bytes be twiddled? True if this host and the
+	 * send use a different byte-order. The sender's byte order must be sent out-of-band.
+	 */
+#if BYTE_ORDER_PREFIX
+	chunked_inbuf(std::istream &is, int size, bool twiddle_bytes = false)
+        : d_is(is), d_buf_size(size), d_buffer(0), d_twiddle_bytes(twiddle_bytes), d_error(false) {
+		if (d_buf_size & CHUNK_TYPE_MASK)
+			throw std::out_of_range("A chunked_outbuf (or chunked_ostream) was built using a buffer larger than 0x00ffffff");
+
+		m_buffer_alloc();
+	}
+#else
+    chunked_inbuf(std::istream &is, int size)
+        : d_is(is), d_buf_size(size), d_buffer(0), d_twiddle_bytes(false), d_set_twiddle(false), d_error(false) {
+        if (d_buf_size & CHUNK_TYPE_MASK)
+            throw std::out_of_range("A chunked_outbuf (or chunked_ostream) was built using a buffer larger than 0x00ffffff");
+
+        m_buffer_alloc();
+    }
+#endif
+
+	virtual ~chunked_inbuf() {
+		delete[] d_buffer;
+	}
+
+	int_type read_next_chunk();
+
+	int bytes_in_buffer() const { return (egptr() - gptr()); }
+
+	// d_twiddle_bytes is false initially and is set to the correct value
+	// once the first chunk is read.
+	bool twiddle_bytes() const { return d_twiddle_bytes; }
+
+	bool error() const { return d_error; }
+	std::string error_message() const { return d_error_message; }
+
+protected:
+	virtual int_type underflow();
+
+	virtual std::streamsize xsgetn(char* s, std::streamsize num);
+};
+
+class chunked_istream: public std::istream {
+protected:
+	chunked_inbuf d_cbuf;
+public:
+#if BYTE_ORDER_PREFIX
+	chunked_istream(std::istream &is, int size, bool twiddle_bytes = false) : std::istream(&d_cbuf), d_cbuf(is, size, twiddle_bytes) { }
+#else
+    chunked_istream(std::istream &is, int size) : std::istream(&d_cbuf), d_cbuf(is, size) { }
+#endif
+
+	int read_next_chunk() { return d_cbuf.read_next_chunk(); }
+
+	/**
+	 * How many bytes have been read from the stream and are now in the internal buffer?
+	 * @return Number of buffered bytes.
+	 */
+	int bytes_in_buffer() const { return d_cbuf.bytes_in_buffer(); }
+
+	/**
+	 * Should the receiver twiddle the bytes to match the local machine's byte order?
+	 * Since DAP4 uses 'receiver makes right' encoding, the onus is on the client to
+	 * reorder the bytes if it is, e.g., a big endian machine reading data from a little
+	 * endian server.
+	 *
+	 * @return True if the client (caller) should swap bytes in multi-byte integers, etc.,
+	 * and false if not. This does not directly tell the endian nature of the remote server,
+	 * although that can be inferred.
+	 */
+	bool twiddle_bytes() const { return d_cbuf.twiddle_bytes(); }
+	bool error() const { return d_cbuf.error(); }
+	std::string error_message() const { return d_cbuf.error_message(); }
+};
+
+}
+
+#endif	// _chunked_istream_h
diff --git a/chunked_ostream.cc b/chunked_ostream.cc
new file mode 100644
index 0000000..2cf4211
--- /dev/null
+++ b/chunked_ostream.cc
@@ -0,0 +1,339 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2009 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+//
+// Portions of this code were taken verbatim from  Josuttis,
+// "The C++ Standard Library," p.672
+
+#include "config.h"
+
+#include <arpa/inet.h>
+
+#include <stdint.h>
+
+#include <string>
+#include <streambuf>
+
+#include <cstring>
+
+//#define DODS_DEBUG
+
+#include "chunked_stream.h"
+#include "chunked_ostream.h"
+#include "debug.h"
+
+namespace libdap {
+
+// flush the characters in the buffer
+/**
+ * @brief Write out the contents of the buffer as a chunk.
+ *
+ * @return EOF on error, otherwise the number of bytes in the chunk body.
+ */
+std::streambuf::int_type
+chunked_outbuf::data_chunk()
+{
+	DBG(cerr << "In chunked_outbuf::data_chunk" << endl);
+
+	int32_t num = pptr() - pbase();	// num needs to be signed for the call to pbump
+
+	// Since this is called by sync() (e.g., flush()), return 0 and do nothing
+	// when there's no data to send.
+	if (num == 0)
+		return 0;
+
+	// here, write out the chunk headers: CHUNKTYPE and CHUNKSIZE
+	// as a 32-bit unsigned int. Here I assume that num is never
+	// more than 2^24 because that was tested in the constructor
+
+	// Trick: This method always writes CHUNK_DATA type chunks so
+	// the chunk type is always 0x00, and given that num never has
+	// anything bigger than 24-bits, the high order byte is always
+	// 0x00. Of course bit-wise OR with 0x00 isn't going to do
+	// much anyway... Here's the general idea all the same:
+	//
+	// unsigned int chunk_header = (unsigned int)num | CHUNK_type;
+	uint32_t header = num;
+#if !BYTE_ORDER_PREFIX
+	// Add encoding of host's byte order. jhrg 11/24/13
+	if (!d_big_endian) header |= CHUNK_LITTLE_ENDIAN;
+	// network byte order for the header
+	htonl(header);
+#endif
+
+	d_os.write((const char *)&header, sizeof(int32_t));
+
+	// Should bad() throw an error?
+	// Are these functions fast or would the bits be faster?
+	d_os.write(d_buffer, num);
+	if (d_os.eof() || d_os.bad())
+		return traits_type::eof();
+
+	pbump(-num);
+	return num;
+}
+
+/**
+ * @brief Send an end chunk.
+ *
+ * This is like calling flush_chunk(), but it sends a chunk header with a type of
+ * CHUNK_END (instead of CHUNK_DATA). Whatever is in the buffer is written out, but
+ * the stream is can be used to send more chunks.
+ * @note This is called by the chunked_outbuf destructor, so closing a stream using
+ * chunked_outbuf always sends a CHUNK_END type chunk, even if it will have zero
+ * bytes
+ * @return EOF on error, otherwise the number of bytes sent in the chunk.
+ */
+std::streambuf::int_type
+chunked_outbuf::end_chunk()
+{
+	DBG(cerr << "In chunked_outbuf::end_chunk" << endl);
+
+	int32_t num = pptr() - pbase();	// num needs to be signed for the call to pbump
+
+	// write out the chunk headers: CHUNKTYPE and CHUNKSIZE
+	// as a 32-bit unsigned int. Here I assume that num is never
+	// more than 2^24 because that was tested in the constructor
+
+	uint32_t header = (uint32_t)num | CHUNK_END;
+
+#if !BYTE_ORDER_PREFIX
+    // Add encoding of host's byte order. jhrg 11/24/13
+    if (!d_big_endian) header |= CHUNK_LITTLE_ENDIAN;
+    // network byte order for the header
+    htonl(header);
+#endif
+
+    // Write out the CHUNK_END header with the byte count.
+	// This should be called infrequently, so it's probably not worth
+	// optimizing away chunk_header
+	d_os.write((const char *)&header, sizeof(uint32_t));
+
+	// Should bad() throw an error?
+	// Are these functions fast or would the bits be faster?
+	d_os.write(d_buffer, num);
+	if (d_os.eof() || d_os.bad())
+		return traits_type::eof();
+
+	pbump(-num);
+	return num;
+}
+
+/**
+ * @brief Send an error chunk
+ * While building up the next chunk, send an error chunk, ignoring the data currently
+ * write buffer. The buffer is left in a consistent state.
+ * @param msg The error message to include in the error chunk
+ * @return The number of characters ignored.
+ */
+std::streambuf::int_type
+chunked_outbuf::err_chunk(const std::string &m)
+{
+	DBG(cerr << "In chunked_outbuf::err_chunk" << endl);
+	std::string msg = m;
+
+	// Figure out how many chars are in the buffer - these will be
+	// ignored.
+	int32_t num = pptr() - pbase();	// num needs to be signed for the call to pbump
+
+	// write out the chunk headers: CHUNKTYPE and CHUNKSIZE
+	// as a 32-bit unsigned int. Here I assume that num is never
+	// more than 2^24 because that was tested in the constructor
+	if (msg.length() > 0x00FFFFFF)
+		msg = "Error message too long";
+
+	uint32_t header = (uint32_t)msg.length() | CHUNK_ERR;
+
+#if !BYTE_ORDER_PREFIX
+    // Add encoding of host's byte order. jhrg 11/24/13
+    if (!d_big_endian) header |= CHUNK_LITTLE_ENDIAN;
+    // network byte order for the header
+    htonl(header);
+#endif
+
+    // Write out the CHUNK_END header with the byte count.
+	// This should be called infrequently, so it's probably not worth
+	// optimizing away chunk_header
+	d_os.write((const char *)&header, sizeof(uint32_t));
+
+	// Should bad() throw an error?
+	// Are these functions fast or would the bits be faster?
+	d_os.write(msg.data(), msg.length());
+	if (d_os.eof() || d_os.bad())
+		return traits_type::eof();
+
+	// Reset the buffer pointer, effectively ignoring what's in there now
+	pbump(-num);
+
+	// return the number of characters ignored
+	return num;
+}
+
+/**
+ * @brief Virtual method called when the internal buffer would overflow.
+ * When the internal buffer fills, this method is called by the byte that
+ * would cause that overflow. The buffer pointers have been set so that
+ * there is actually space for one more character, so \c c can really be
+ * sent. Put \c c into the buffer and send it, prefixing the buffer
+ * contents with a chunk header.
+ * @note This method is called by the std::ostream code.
+ * @param c The last character to add to the buffer before sending the
+ * next chunk.
+ * @return EOF on error, otherwise the value of \c c.
+ */
+std::streambuf::int_type
+chunked_outbuf::overflow(int c)
+{
+	DBG(cerr << "In chunked_outbuf::overflow" << endl);
+
+	// Note that the buffer and eptr() were set so that when pptr() is
+	// at the end of the buffer, there is actually one more character
+	// available in the buffer.
+	if (!traits_type::eq_int_type(c, traits_type::eof())) {
+		*pptr() = traits_type::not_eof(c);
+		pbump(1);
+	}
+	// flush the buffer
+	if (data_chunk() == traits_type::eof()) {
+		//Error
+		return traits_type::eof();
+	}
+
+	return traits_type::not_eof(c);
+}
+
+/*
+
+  d_buffer
+  |
+  v
+  |--------------------------------------------|....
+  |                                            |   .
+  |--------------------------------------------|....
+  ^                         ^                   ^
+  |                         |                   |
+  pbase()                   pptr()              epptr()
+
+ */
+
+/**
+ * @brief Write bytes to the chunked stream
+ * Write the bytes in \c s to the chunked stream
+ * @param s
+ * @param num
+ * @return The number of bytes written
+ */
+std::streamsize
+chunked_outbuf::xsputn(const char *s, std::streamsize num)
+{
+	DBG(cerr << "In chunked_outbuf::xsputn: num: " << num << endl);
+
+	// if the current block of data will fit in the buffer, put it there.
+	// else, there is at least a complete chunk between what's in the buffer
+	// and what's in 's'; send a chunk header, the stuff in the buffer and
+	// bytes from 's' to make a complete chunk. Then iterate over 's' sending
+	// more chunks until there's less than a complete chunk left in 's'. Put
+	// the bytes remaining 's' in the buffer. Return the number of bytes sent
+	// or 0 if an error is encountered.
+
+	int32_t bytes_in_buffer = pptr() - pbase();	// num needs to be signed for the call to pbump
+
+	// Will num bytes fit in the buffer? The location of epptr() is one back from
+	// the actual end of the buffer, so the next char written will trigger a write
+	// of the buffer as a new data chunk.
+	if (bytes_in_buffer + num < d_buf_size) {
+		DBG2(cerr << ":xsputn: buffering num: " << num << endl);
+		memcpy(pptr(), s, num);
+		pbump(num);
+		return traits_type::not_eof(num);
+	}
+
+	// If here, write a chunk header and a chunk's worth of data by combining the
+	// data in the buffer and some data from 's'.
+	uint32_t header = d_buf_size;
+#if !BYTE_ORDER_PREFIX
+    // Add encoding of host's byte order. jhrg 11/24/13
+    if (!d_big_endian) header |= CHUNK_LITTLE_ENDIAN;
+    // network byte order for the header
+    htonl(header);
+#endif
+	d_os.write((const char *)&header, sizeof(int32_t));	// Data chunk's CHUNK_TYPE is 0x00000000
+
+	// Reset the pptr() and epptr() now in case of an error exit. See the 'if'
+	// at teh end of this for the only code from here down that will modify the
+	// pptr() value.
+	setp(d_buffer, d_buffer + (d_buf_size - 1));
+
+	d_os.write(d_buffer, bytes_in_buffer);
+	if (d_os.eof() || d_os.bad())
+		return traits_type::not_eof(0);
+
+	int bytes_to_fill_out_buffer =  d_buf_size - bytes_in_buffer;
+	d_os.write(s, bytes_to_fill_out_buffer);
+	if (d_os.eof() || d_os.bad())
+		return traits_type::not_eof(0);
+	s += bytes_to_fill_out_buffer;
+	uint32_t bytes_still_to_send = num - bytes_to_fill_out_buffer;
+
+	// Now send all the remaining data in s until the amount remaining doesn't
+	// fill a complete chunk and buffer those data.
+	while (bytes_still_to_send >= d_buf_size) {
+		// This is header for  a chunk of d_buf_size bytes; the size was set above
+		d_os.write((const char *) &header, sizeof(int32_t));
+		d_os.write(s, d_buf_size);
+		if (d_os.eof() || d_os.bad()) return traits_type::not_eof(0);
+		s += d_buf_size;
+		bytes_still_to_send -= d_buf_size;
+	}
+
+	if (bytes_still_to_send > 0) {
+		// if the code is here, one or more chunks have been sent, the
+		// buffer is empty and there are < d_buf_size bytes to send. Buffer
+		// them.
+		memcpy(d_buffer, s, bytes_still_to_send);
+		pbump(bytes_still_to_send);
+	}
+
+	// Unless an error was detected while writing to the stream, the code must
+	// have sent num bytes.
+	return traits_type::not_eof(num);
+}
+
+/**
+ * @brief Synchronize the stream with its data sink.
+ * @note This method is called by flush() among others
+ * @return -1 on error, 0 otherwise.
+ */
+std::streambuf::int_type
+chunked_outbuf::sync()
+{
+	DBG(cerr << "In chunked_outbuf::sync" << endl);
+
+	if (data_chunk() == traits_type::eof()) {
+		// Error
+		return traits_type::not_eof(-1);
+	}
+	return traits_type::not_eof(0);
+}
+
+} // namespace libdap
diff --git a/chunked_ostream.h b/chunked_ostream.h
new file mode 100644
index 0000000..c250fb1
--- /dev/null
+++ b/chunked_ostream.h
@@ -0,0 +1,164 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2013 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+//
+// Portions of this code were taken verbatim from  Josuttis,
+// "The C++ Standard Library," p.672
+
+#ifndef _chunkedostream_h
+#define _chunkedostream_h
+
+#include "chunked_stream.h"
+
+#include <streambuf>
+#include <ostream>
+#include <stdexcept>      // std::out_of_range
+
+#include "util.h"
+
+namespace libdap {
+
+class chunked_ostream;
+
+/**
+ * @brief output buffer for a chunked stream
+ * This performs buffered output encoding the data in the stream using
+ * the simple chunking protocol defined for DAP4's binary data transmission.
+ * Each block of data is prefixed by four bytes: A CHUNK TYPE byte followed
+ * by three bytes that are the CHUNK SIZE. There are three CHUNK TYPES:
+ * data, end and error, indicated by the code values 0x00, 0x01 and 0x02.
+ * The size of a chunk is limited to 2^24 data bytes + 4 bytes for the
+ * chunk header.
+ */
+class chunked_outbuf: public std::streambuf {
+	friend class chunked_ostream;
+protected:
+	std::ostream &d_os;			// Write stuff here
+	unsigned int d_buf_size; 	// Size of the data buffer
+	char *d_buffer;				// Data buffer
+	bool d_big_endian;
+
+public:
+	chunked_outbuf(std::ostream &os, unsigned int buf_size) : d_os(os), d_buf_size(buf_size), d_buffer(0) {
+		if (d_buf_size & CHUNK_TYPE_MASK)
+			throw std::out_of_range("A chunked_outbuf (or chunked_ostream) was built using a buffer larger than 0x00ffffff");
+
+		d_big_endian = is_host_big_endian();
+		d_buffer = new char[buf_size];
+		// Trick: making the pointers think the buffer is one char smaller than it
+		// really is ensures that overflow() will be called when there's space for
+		// one more character.
+		setp(d_buffer, d_buffer + (buf_size - 1));
+	}
+
+	virtual ~chunked_outbuf() {
+		// call end_chunk() and not sync()
+		end_chunk();
+
+		delete[] d_buffer;
+	}
+
+protected:
+	// data_chunk and end_chunk might not be needed because they
+	// are called via flush() and ~chunked_outbuf(), resp. jhrg 9/13/13
+	int_type data_chunk();	// sync() and overflow() call this
+	int_type end_chunk();
+
+	int_type err_chunk(const std::string &msg);
+
+	virtual std::streamsize xsputn(const char *s, std::streamsize num);
+	// Manipulate the buffer pointers using pbump() after filling the buffer
+	// and then call data_chunk(). Leave remainder in buffer. Or copy logic
+	// for data_chunk() into loop in this code.
+
+	virtual int_type overflow(int c);
+	virtual int_type sync();
+};
+
+/**
+ * @brief A C++ stream class for chunked data.
+ * This class uses the chunked_outbuf class to provide for chunked
+ * binary serialization of data as specified by DAP4. Information
+ * to be serialized is broken into 'chunks' that are no more than
+ * 2^24 bytes in length. Each chunk is prefixed by a 4 byte header
+ * that indicates the type of chunk and size (number of bytes in the
+ * chunk body). There are three types of chunk: Data; End; and Error.
+ * In normal operation, a DAP4 data document/response is serialized as
+ * a sequence of DATA chunks followed by one END chunk (which may be
+ * zero bytes in length). If, during serialization, an error is detected,
+ * the currently buffered (but not sent) data are discarded and an
+ * ERROR chunk is sent with an error message.
+ *
+ * This class sends the END chunk when its destructor is called.
+ *
+ * Calling flush() on the ostream object will force a DATA chunk to be
+ * sent with the currently buffered data. Normal operation is to wait
+ * for the buffer to fill before sending a DATA chunk.
+ *
+ * @see chunked_outbuf
+ */
+class chunked_ostream: public std::ostream {
+protected:
+	chunked_outbuf d_cbuf;
+public:
+	/**
+	 * Get a chunked_ostream with a buffer.
+	 * @note The buffer size must not be more than 2^24 bytes (0x00ffffff)
+	 * @param buf_size The size of the buffer in bytes.
+	 */
+	chunked_ostream(std::ostream &os, unsigned int buf_size) : std::ostream(&d_cbuf), d_cbuf(os, buf_size) { }
+
+	/**
+	 * @brief Send an end chunk.
+	 * Normally, an end chunk is sent by closing the chunked_ostream, but this
+	 * method can be used to force sending it without closing the stream. Subsequent
+	 * calls to send data will send data chunks.
+	 * @note An end chunk is sent when the stream is closed.
+	 * @return EOF on error or the number of bytes sent in the chunk body.
+	 */
+	int_type write_end_chunk() { return d_cbuf.end_chunk(); }
+
+	/**
+	 * @brief Send the current contents of the buffer as a data chunk.
+	 * Normally, the chunked_ostream object waits until the buffer is full before sending
+	 * the next data chunk. This will force a send with whatever is in the buffer (e.g.,
+	 * the DMR text). Data added after this call will be sent in subsequent chunks.
+	 * @note Calling flush() on the stream forces a data chunk to be sent.
+	 * @return EOF on error, otherwise the number of bytes sent in the chunk body.
+	 */
+	int_type write_data_chunk() { return d_cbuf.data_chunk(); }
+
+	/**
+	 * @brief Send an error message down the stream.
+	 * When called, this method dumps all the data currently in the buffer and
+	 * sends the error message text instead, using a chunk type of CHUNK_ERR. The
+	 * write buffer is maintained, however, so the stream ibject can still be used.
+	 * @param msg The error message text
+	 * @return The number of bytes 'dumped' from the write buffer.
+	 */
+	int_type write_err_chunk(const std::string &msg) { return d_cbuf.err_chunk(msg); }
+};
+
+}
+
+#endif		// _chunkedostream_h
diff --git a/chunked_stream.h b/chunked_stream.h
new file mode 100644
index 0000000..f60e579
--- /dev/null
+++ b/chunked_stream.h
@@ -0,0 +1,29 @@
+/*
+ * chunked_stream.h
+ *
+ *  Created on: Sep 15, 2013
+ *      Author: jimg
+ */
+
+#ifndef CHUNK_STREAM_H_
+#define CHUNK_STREAM_H_
+
+#define CHUNK_DATA 0x00000000
+#define CHUNK_END  0x01000000
+#define CHUNK_ERR  0x02000000
+
+#if !BYTE_ORDER_PREFIX
+// LITTLE or BIG endian if set? jhrg 11/26/13
+// #define CHUNK_BIG_ENDIAN  0x04000000
+
+#define CHUNK_LITTLE_ENDIAN  0x04000000
+#endif
+
+// Chunk type mask masks off the low bytes and the little endian bit.
+// The three chunk types (DATA, END and ERR) are mutually exclusive.
+#define CHUNK_TYPE_MASK 0x03000000
+#define CHUNK_SIZE_MASK 0x00FFFFFF
+
+#define CHUNK_SIZE 4096
+
+#endif /* CHUNK_STREAM_H_ */
diff --git a/conf/._libtool.m4 b/conf/._libtool.m4
new file mode 100644
index 0000000..2b6c109
Binary files /dev/null and b/conf/._libtool.m4 differ
diff --git a/conf/._ltmain.sh b/conf/._ltmain.sh
new file mode 100644
index 0000000..d52b0fe
Binary files /dev/null and b/conf/._ltmain.sh differ
diff --git a/conf/._ltoptions.m4 b/conf/._ltoptions.m4
new file mode 100644
index 0000000..9df5602
Binary files /dev/null and b/conf/._ltoptions.m4 differ
diff --git a/conf/._ltsugar.m4 b/conf/._ltsugar.m4
new file mode 100644
index 0000000..b8df1ea
Binary files /dev/null and b/conf/._ltsugar.m4 differ
diff --git a/conf/._ltversion.m4 b/conf/._ltversion.m4
new file mode 100644
index 0000000..d52b0fe
Binary files /dev/null and b/conf/._ltversion.m4 differ
diff --git a/conf/._lt~obsolete.m4 b/conf/._lt~obsolete.m4
new file mode 100644
index 0000000..c234b57
Binary files /dev/null and b/conf/._lt~obsolete.m4 differ
diff --git a/conf/acinclude.m4 b/conf/acinclude.m4
new file mode 100644
index 0000000..63a17e7
--- /dev/null
+++ b/conf/acinclude.m4
@@ -0,0 +1,619 @@
+
+# m4 macros from the Unidata netcdf 2.3.2 pl4 distribution. Modified for use
+# with GNU Autoconf 2.1. I renamed these from UC_* to DODS_* so that there
+# will not be confusion when porting future versions of netcdf into the DODS
+# source distribution. Unidata, Inc. wrote the text of these macros and holds
+# a copyright on them.
+#
+# jhrg 3/27/95
+#
+# Added some of my own macros (don't blame Unidata for them!) starting with
+# DODS_PROG_LEX and down in the file. jhrg 2/11/96
+#
+# I've added a table of contents for this file. jhrg 2/2/98
+# 
+# 1. Unidata-derived macros. 
+# 2. Macros for finding libraries used by the core software.
+# 3. Macros used to test things about the compiler
+# 4. Macros for locating various systems (Matlab, etc.)
+# 5. Macros used to test things about the computer/OS/hardware
+#
+# $Id$
+
+# 1. Unidata's macros
+#-------------------------------------------------------------------------
+
+# 2. Finding libraries 
+#
+# To use these in DODS software, in the Makefile.in use LIBS XTRALIBS for 
+# non-gui and LIBS GUILIBS XTRALIBS for the clients that link with the 
+# gui DAP++ library. These should be set by a line like LIBS=@LIBS@, etc.
+# Then the group should be used on the link line. 10/16/2000 jhrg
+#--------------------------------------------------------------------------
+
+# Electric fence and dbnew are used to debug malloc/new and free/delete.
+# I assume that if you use these switches you know enough to build the 
+# libraries. 2/3/98 jhrg
+
+AC_DEFUN([DODS_EFENCE], [dnl
+    AC_ARG_ENABLE(efence,
+		  [  --enable-efence         Runtime memory checks (malloc)],
+		  EFENCE=$enableval, EFENCE=no)
+
+    case "$EFENCE" in
+    yes)
+      AC_MSG_RESULT(Configuring dynamic memory checks on malloc/free calls)
+      LIBS="$LIBS -lefence"
+      ;;
+    *)
+      ;;
+    esac])
+
+AC_DEFUN([DODS_DBNEW], [dnl
+    AC_ARG_ENABLE(dbnew,
+	          [  --enable-dbnew          Runtime memory checks (new)],
+		  DBNEW=$enableval, DBNEW=no)
+
+    case "$DBNEW" in
+    yes)
+      AC_MSG_RESULT(Configuring dynamic memory checks on new/delete calls)
+      AC_DEFINE(TRACE_NEW, , [Use the dbnew library to trace bew/delete calls])
+      LIBS="$LIBS -ldbnew"
+      ;;
+    *)
+      ;;
+    esac])
+
+# check for hdf libraries
+# cross-compile problem with test option -d
+AC_DEFUN([DODS_HDF_LIBRARY], [dnl
+    AC_ARG_WITH(hdf,
+        [  --with-hdf=ARG          Where is the HDF library (directory)],
+        HDF_PATH=${withval}, HDF_PATH="$HDF_PATH")
+    if test ! -d "$HDF_PATH"
+    then
+        HDF_PATH="/usr/local/hdf"
+    fi
+    if test "$HDF_PATH"
+    then
+            LDFLAGS="$LDFLAGS -L${HDF_PATH}/lib"
+            INCS="$INCS -I${HDF_PATH}/include"
+            AC_SUBST(INCS)
+    fi
+
+dnl None of this works with HDF 4.1 r1. jhrg 8/2/97
+
+    AC_CHECK_LIB(z, deflate, LIBS="-lz $LIBS", nohdf=1)
+    AC_CHECK_LIB(jpeg, jpeg_start_compress, LIBS="-ljpeg $LIBS", nohdf=1)
+    AC_CHECK_LIB(df, Hopen, LIBS="-ldf $LIBS" , nohdf=1)
+    AC_CHECK_LIB(mfhdf, SDstart, LIBS="-lmfhdf $LIBS" , nohdf=1)])
+
+# 3. Compiler test macros
+#--------------------------------------------------------------------------
+
+AC_DEFUN([DODS_GCC_VERSION], [dnl
+    AC_MSG_CHECKING(for gcc/g++ 2.8 or greater)
+
+    GCC_VER=`gcc -v 2>&1 | awk '/version/ {print}'`
+
+    dnl We need the gcc version number as a number, without `.'s and limited
+    dnl to three digits. The old version below was replaced by Andy Jacobson's 
+    dnl patch which works with gcc 3, including the pre-release versions.
+
+    dnl GCC_VER=`echo $GCC_VER | sed 's@[[a-z ]]*\([[0-9.]]\)@\1@'`
+    GCC_VER=`echo $GCC_VER | sed 's@.*gcc version \([[0-9\.]]*\).*@\1@'`
+
+    case $GCC_VER in
+        *egcs*) AC_MSG_RESULT(Found egcs version ${GCC_VER}.) ;;
+	2.[[7-9]]*)   AC_MSG_RESULT(Found gcc/g++ version ${GCC_VER}) ;;
+	3.[[0-9]]*)   AC_MSG_RESULT(Found gcc/g++ version ${GCC_VER}) ;;
+        *)      AC_MSG_ERROR(must be at least version 2.7.x) ;;
+    esac])
+
+# 4. Macros to locate various programs/systems used by parts of DODS
+#---------------------------------------------------------------------------
+
+# Added by Ethan, 1999/06/21
+# Look for perl.
+# 
+# I modified the regexp below to remove any text that follows the version
+# number. This extra text was hosing the test. 7/15/99 jhrg
+
+AC_DEFUN([DODS_PROG_PERL], [dnl
+    AC_CHECK_PROG(PERL, perl, `which perl`)
+    case "$PERL" in
+	*perl*)
+	    perl_ver=`$PERL -v 2>&1 | awk '/This is perl/ {print}'`
+	    perl_ver=`echo $perl_ver | sed 's/This is perl,[[^0-9]]*\([[0-9._]]*\).*/\1/'`
+            perl_ver_main=`echo $perl_ver | sed 's/\([[0-9]]*\).*/\1/'`
+	    if test -n "$perl_ver" && test $perl_ver_main -ge 5
+	    then
+		AC_MSG_RESULT(Found perl version ${perl_ver}.)
+	    else
+		AC_MSG_ERROR(perl version: found ${perl_ver} should be at least 5.000.)
+	    fi
+	    ;;
+	*)
+	    AC_MSG_WARN(perl is required.)
+	    ;;
+    esac
+
+    AC_SUBST(PERL)])
+
+# Added by Ethan, 1999/06/21
+# Look for GNU tar.
+# 
+# I modified the regexp below but it still does not work exactly correctly; 
+# the variable tar_ver should have only the version number in it. However,
+# my version (1.12) spits out a multi-line thing. The regexp below gets the
+# version number from the first line but does not remove the subsequent lines
+# of garbage. 7/15/99 jhrg
+# Added awk line to handle multiline output. 1999/07/22 erd
+
+AC_DEFUN([DODS_PROG_GTAR], [dnl
+    AC_CHECK_PROGS(TAR,gtar tar,tar)
+    case "$TAR" in
+	*tar)
+	    tar_ver=`$TAR --version 2>&1 | awk '/G[[Nn]][[Uu]] tar/ {print}'`
+	    tar_ver=`echo $tar_ver | sed 's/.*GNU tar[[^0-9.]]*\([[0-9._]]*\)/\1/'`
+	    if test -n "$tar_ver"
+	    then
+		AC_MSG_RESULT(Found Gnu tar version ${tar_ver}.)
+	    else
+		AC_MSG_WARN(GNU tar is required for some Makefile targets.)
+	    fi
+	    ;;
+	*)
+	    AC_MSG_WARN(GNU tar is required for some Makefile targets.)
+	    ;;
+    esac
+
+    AC_SUBST(TAR)])
+
+# Find the matlab root directory
+# cross-compile problem with test option -d
+
+AC_DEFUN([DODS_MATLAB], [dnl
+    AC_ARG_WITH(matlab,
+        [  --with-matlab=ARG       Where is the Matlab root directory],
+        MATLAB_ROOT=${withval}, MATLAB_ROOT="$MATLAB_ROOT")
+    if test "$MATLAB_ROOT" = no; then
+        MATLAB_ROOT="$MATLAB_ROOT"
+    elif test ! -d "$MATLAB_ROOT"
+    then
+        MATLAB_ROOT=""
+    fi
+    if test -z "$MATLAB_ROOT"
+    then
+        AC_MSG_CHECKING(for matlab root)
+
+	MATLAB_ROOT=`mex -v 2>&1 | awk '/MATLAB *= / {print}'`
+	MATLAB_ROOT=`echo $MATLAB_ROOT | sed 's@[[^/]]*\(/.*\)@\1@'`
+
+	if test -z "$MATLAB_ROOT"
+	then
+	    AC_MSG_ERROR(Matlab not found! Run configure --help)
+        else
+	    AC_SUBST(MATLAB_ROOT)
+	    AC_MSG_RESULT($MATLAB_ROOT)
+        fi
+    else
+        AC_SUBST(MATLAB_ROOT)
+        AC_MSG_RESULT("Set Matlab root to $MATLAB_ROOT")
+    fi
+
+    dnl Find the lib directory (which is named according to machine type).
+    dnl The test was using -z; I changed it to -n to fix a problem withthe 
+    dnl matlab server build. The build did not find the libraries with the
+    dnl env var MATLAB_LIB was not set. 04/12/04 jhrg
+    AC_MSG_CHECKING(for matlab library dir)
+    if test -n "$MATLAB_LIB"
+    then
+        matlab_lib_dir=${MATLAB_LIB}
+    else
+        matlab_lib_dir=`find ${MATLAB_ROOT}/extern/lib -name 'libmat*' -print | sed '1q'`
+        matlab_lib_dir=`echo $matlab_lib_dir | sed 's@\(.*\)/libmat.*@\1@'`
+    fi
+    AC_MSG_RESULT($matlab_lib_dir)
+
+    if test "$matlab_lib_dir"
+    then
+	LDFLAGS="$LDFLAGS -L$matlab_lib_dir"
+	dnl This is used by the nph script to set LD_LIBRARY_PATH
+	AC_SUBST(matlab_lib_dir)
+    fi
+    
+    dnl sleazy test for version 5; look for the version 4 compat flag
+
+    if grep V4_COMPAT ${MATLAB_ROOT}/extern/include/mat.h > /dev/null 2>&1
+    then
+	dnl if we're here, we're linking under ML 5 or 6. 02/10/03 jhrg
+	MAT_VERSION_FLAG="-V4"
+	dnl ML 6 lacks libmi.a/.so. 02/10/03 jhrg
+	if access -r ${matlab_lib_dir}/libmi.*
+	then
+	    MATLIBS="-lmat -lmi -lmx -lut"
+	else
+	    MATLIBS="-lmat -lmx -lut"
+	fi
+    else
+       MAT_VERSION_FLAG=""
+       MATLIBS="-lmat"
+    fi
+
+    AC_CHECK_LIB(ots, _OtsDivide64Unsigned, MATLIBS="$MATLIBS -lots", )
+    AC_SUBST(MATLIBS)
+    AC_SUBST(MAT_VERSION_FLAG)])
+
+# cross-compile problem with test option -d
+AC_DEFUN([DODS_DSP_ROOT], [dnl
+
+    AC_ARG_WITH(dsp,
+		[  --with-dsp=DIR          Directory containing DSP software from U of Miami],
+		DSP_ROOT=${withval}, DSP_ROOT="$DSP_ROOT")
+
+    if test ! -d "$DSP_ROOT"
+    then
+        DSP_ROOT=""
+    fi
+    if test -z "$DSP_ROOT"
+    then
+	AC_MSG_CHECKING(for the DSP library root directory)
+
+	for p in /usr/local/src/DSP /usr/local/DSP \
+		 /usr/local/src/dsp /usr/local/dsp \
+		 /usr/contrib/src/dsp /usr/contrib/dsp \
+		 $DODS_ROOT/third-party/dsp /usr/dsp /data1/dsp
+	do
+	    if test -z "$DSP_ROOT"
+	    then
+	    	for d in `ls -dr ${p}* 2>/dev/null`
+		do
+		    if test -f ${d}/inc/dsplib.h
+		    then
+		        DSP_ROOT=${d}
+		        break
+		    fi
+	        done
+	    fi
+	done
+    fi
+
+    if test "$DSP_ROOT"
+    then
+	AC_SUBST(DSP_ROOT)
+	dnl Only add this path to gcc's options... jhrg 11/15/96
+	INCS="$INCS -I\$(DSP_ROOT)/inc"
+	AC_SUBST(INCS) 		# 09/20/02 jhrg
+	LDFLAGS="$LDFLAGS -L\$(DSP_ROOT)/lib -L\$(DSP_ROOT)/shlib"
+	AC_MSG_RESULT(Set DSP root directory to $DSP_ROOT) 
+    else
+        AC_MSG_ERROR(not found! see configure --help)
+    fi])
+
+# Find IDL. 9/23/99 jhrg
+
+AC_DEFUN([DODS_IDL], [dnl
+    AC_ARG_WITH(idl,
+        [  --with-idl=ARG       Where is the IDL root directory],
+        IDL_ROOT=${withval}, IDL_ROOT="$IDL_ROOT")
+    AC_REQUIRE([AC_CANONICAL_HOST])
+
+    AC_MSG_CHECKING(for the IDL root directory)
+    if test -z "$IDL_ROOT"
+    then
+        # Find IDL's root directory by looking at the exectuable and then 
+        # finding where that symbolic link points.
+        # !!! Doesn't work if idl isn't a symbolic link - erd !!!
+	# I think that the following 'if' fixes the symbolic link problem. 
+	# 05/02/03 jhrg 
+        idl_loc=`which idl`
+	if echo `ls -l $idl_loc` | grep '.*->.*' > /dev/null 2>&1
+	then
+            idl_loc=`ls -l $idl_loc | sed 's/.*->[ ]*\(.*\)$/\1/'`
+	fi
+        IDL_ROOT=`echo $idl_loc | sed 's/\(.*\)\/bin.*/\1/'`
+    fi
+
+    AC_MSG_RESULT($IDL_ROOT)
+    AC_SUBST(IDL_ROOT)
+
+    # Now find where the IDL 5.2 or later sharable libraries live.
+    # NB: This won't work if libraries for several architecutures are 
+    # installed for several machines.
+    AC_MSG_CHECKING(for the IDL sharable library directory)
+    # cd to the IDL root because it is likely a symbolic link and find 
+    # won't normally follow symbolic links.
+    IDL_LIBS=`(cd $IDL_ROOT; find . -name 'libidl.so' -print)`
+    # Strip off the leading `.' (it's there because we ran find in the CWD) 
+    # and the name of the library used to find the directory.
+    IDL_LIBS=`echo $IDL_LIBS | sed 's/\.\(.*\)\/libidl.so/\1/' | sed '1q'`
+    IDL_LIBS=${IDL_ROOT}${IDL_LIBS}
+    AC_MSG_RESULT($IDL_LIBS)
+    AC_SUBST(IDL_LIBS)])
+
+
+# 5. Misc stuff
+#---------------------------------------------------------------------------
+
+AC_DEFUN([DODS_DEBUG_OPTION], [dnl
+    AC_ARG_ENABLE(debug, 
+		  [  --enable-debug=ARG      Program instrumentation (1,2)],
+		  DEBUG=$enableval, DEBUG=no)
+
+    case "$DEBUG" in
+    no) 
+      ;;
+    1)
+      AC_MSG_RESULT(Setting debugging to level 1)
+      AC_DEFINE(DODS_DEBUG)
+      ;;
+    2) 
+      AC_MSG_RESULT(Setting debugging to level 2)
+      AC_DEFINE(DODS_DEBUG, , [Set instrumentation to level 1 (see debug.h)])
+      AC_DEFINE(DODS_DEBUG2, , [Set instrumentation to level 2])
+      ;;
+    *)
+      AC_MSG_ERROR(Bad debug value)
+      ;;
+    esac])
+
+AC_DEFUN([DODS_OS], [dnl
+    AC_MSG_CHECKING(type of operating system)
+    # I have removed the following test because some systems (e.g., SGI)
+    # define OS in a way that breaks this code but that is close enough
+    # to also be hard to detect. jhrg 3/23/97
+    #  if test -z "$OS"; then
+    #  fi 
+    OS=`uname -s | tr '[[A-Z]]' '[[a-z]]' | sed 's;/;;g'`
+    if test -z "$OS"; then
+        AC_MSG_WARN(OS unknown!)
+    fi
+    case $OS in
+        aix)
+            ;;
+        hp-ux)
+            OS=hpux`uname -r | sed 's/[[A-Z.0]]*\([[0-9]]*\).*/\1/'`
+            ;;
+        irix)
+            OS=${OS}`uname -r | sed 's/\..*//'`
+            ;;
+        # I added the following case because the `tr' command above *seems* 
+	# to fail on Irix 5. I can get it to run just fine from the shell, 
+	# but not in the configure script built using this macro. jhrg 8/27/97
+        IRIX)
+            OS=irix`uname -r | sed 's/\..*//'`
+	    ;;
+        osf*)
+            ;;
+        sn*)
+            OS=unicos
+            ;;
+        sunos)
+            OS_MAJOR=`uname -r | sed 's/\..*//'`
+            OS=$OS$OS_MAJOR
+            ;;
+        ultrix)
+            case `uname -m` in
+            VAX)
+                OS=vax-ultrix
+                ;;
+            esac
+            ;;
+        *)
+            # On at least one UNICOS system, 'uname -s' returned the
+            # hostname (sigh).
+            if uname -a | grep CRAY >/dev/null; then
+                OS=unicos
+            fi
+            ;;
+    esac
+
+    # Adjust OS for CRAY MPP environment.
+    #
+    case "$OS" in
+    unicos)
+
+        case "$CC$TARGET$CFLAGS" in
+        *cray-t3*)
+            OS=unicos-mpp
+            ;;
+        esac
+        ;;
+    esac
+
+    AC_SUBST(OS)
+
+    AC_MSG_RESULT($OS)])
+
+
+AC_DEFUN([DODS_MACHINE], [dnl
+    AC_MSG_CHECKING(type of machine)
+
+    if test -z "$MACHINE"; then
+    MACHINE=`uname -m | tr '[[A-Z]]' '[[a-z]]'`
+    case $OS in
+        aix*)
+            MACHINE=rs6000
+            ;;
+        hp*)
+            MACHINE=hp`echo $MACHINE | sed 's%/.*%%'`
+            ;;
+        sunos*)
+            case $MACHINE in
+                sun4*)
+                    MACHINE=sun4
+                    ;;
+            esac
+            ;;
+        irix*)
+            case $MACHINE in
+                ip2?)
+                    MACHINE=sgi
+                    ;;
+            esac
+            ;;
+	ultrix*)
+	    case $MACHINE in
+		vax*)
+		     case "$CC" in
+        		/bin/cc*|cc*)
+echo "changing C compiler to \`vcc' because \`cc' floating-point is broken"
+            		CC=vcc
+            		;;
+		     esac
+		     ;;
+	    esac
+	    ;;
+
+    esac
+    fi
+
+    AC_SUBST(MACHINE)
+    AC_MSG_RESULT($MACHINE)])
+
+AC_DEFUN([DODS_CHECK_SIZES], [dnl
+    # Ignore the errors about AC_TRY_RUN missing an argument. jhrg 5/2/95
+
+    AC_REQUIRE([AC_PROG_CC])
+
+    AC_CHECK_SIZEOF(int)
+    AC_CHECK_SIZEOF(long)
+    AC_CHECK_SIZEOF(char)
+    AC_CHECK_SIZEOF(double)
+    AC_CHECK_SIZEOF(float)
+
+    # check for C99 types, headers and functions
+    AC_CHECK_HEADER([inttypes.h],[dap_inttypes_header=yes],,)
+    # DINT32 4
+    AC_CHECK_SIZEOF([int32_t])
+    # DUINT32
+    AC_CHECK_SIZEOF([uint32_t])
+    # DINT16 short
+    AC_CHECK_SIZEOF([int16_t])
+    # DUINT16 unsigned short
+    AC_CHECK_SIZEOF([uint16_t])
+    # DBYTE 1
+    AC_CHECK_SIZEOF([uint8_t])
+    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
+    AM_CONDITIONAL([USE_C99_TYPES],[test x"$dap_use_c99_types" = 'xyes'])
+
+    # 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
+    AC_DEFINE_UNQUOTED(DINT64, $DODS_INT64, [64-bit integer type])
+    AC_DEFINE_UNQUOTED(DUINT64, $DODS_UINT64, [64-bit unsigned integer type])
+    AC_DEFINE_UNQUOTED(DINT32, $DODS_INT32, [32-bit integer type])
+    AC_DEFINE_UNQUOTED(DUINT32, $DODS_UINT32, [32-bit unsigned integer type])
+    AC_DEFINE_UNQUOTED(DINT16, $DODS_INT16, [16-bit integer type])
+    AC_DEFINE_UNQUOTED(DUINT16, $DODS_UINT16, [16-bit unsigned integer type])
+    AC_DEFINE_UNQUOTED(DFLOAT64, $DODS_FLOAT64, [64-bit real type])
+    AC_DEFINE_UNQUOTED(DFLOAT32, $DODS_FLOAT32, [32-bit real type])
+    AC_DEFINE_UNQUOTED(DINT8, $DODS_INT8, [8-bit integer type])
+    AC_DEFINE_UNQUOTED(DBYTE, $DODS_BYTE, [unsigned bytes/chars])
+
+    # 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=
+    AC_SEARCH_LIBS([xdr_void],[c rpc nsl rpcsvc],[
+      dap_xdrlib=`echo $ac_res|sed -e 's/^-l//'`],[
+      AC_MSG_WARN(Cannot locate library containing xdr functions.)])
+    # 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
+       AC_CHECK_LIB($dap_xdrlib,xdr_void)
+    fi
+    # Now figure out what integer functions to use
+    dap_xdrint=0
+    AC_CHECK_LIB($dap_xdrlib,[xdr_uint32_t],[dap_xdrint=1],[
+      AC_CHECK_LIB($dap_xdrlib,[xdr_u_int32_t],[dap_xdrint=2],[
+        AC_CHECK_LIB($dap_xdrlib,[xdr_uint],[dap_xdrint=3],[
+          AC_CHECK_LIB($dap_xdrlib,[xdr_u_int],[dap_xdrint=4],[])])])])
+    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
+        ;;
+    *)
+	AC_MSG_ERROR(Cannot determine DODS XDR integer sizes)
+        ;;
+    esac
+    XDR_FLOAT64=xdr_double
+    XDR_FLOAT32=xdr_float
+
+    AC_DEFINE_UNQUOTED([XDR_INT16], [$XDR_INT16], [xdr int16])
+    AC_DEFINE_UNQUOTED([XDR_UINT16], [$XDR_UINT16], [xdr uint16])
+    AC_DEFINE_UNQUOTED([XDR_INT32], [$XDR_INT32], [xdr int32])
+    AC_DEFINE_UNQUOTED([XDR_UINT32], [$XDR_UINT32], [xdr uint32])
+    AC_DEFINE_UNQUOTED([XDR_FLOAT64], [$XDR_FLOAT64], [xdr float64])
+    AC_DEFINE_UNQUOTED([XDR_FLOAT32], [$XDR_FLOAT32], [xdr float32])])
diff --git a/conf/compile b/conf/compile
new file mode 100755
index 0000000..531136b
--- /dev/null
+++ b/conf/compile
@@ -0,0 +1,347 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand '-c -o'.
+
+scriptversion=2012-10-14.11; # UTC
+
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Written by Tom Tromey <tromey@cygnus.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+nl='
+'
+
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent tools from complaining about whitespace usage.
+IFS=" ""	$nl"
+
+file_conv=
+
+# func_file_conv build_file lazy
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts. If the determined conversion
+# type is listed in (the comma separated) LAZY, no conversion will
+# take place.
+func_file_conv ()
+{
+  file=$1
+  case $file in
+    / | /[!/]*) # absolute file, and not a UNC file
+      if test -z "$file_conv"; then
+	# lazily determine how to convert abs files
+	case `uname -s` in
+	  MINGW*)
+	    file_conv=mingw
+	    ;;
+	  CYGWIN*)
+	    file_conv=cygwin
+	    ;;
+	  *)
+	    file_conv=wine
+	    ;;
+	esac
+      fi
+      case $file_conv/,$2, in
+	*,$file_conv,*)
+	  ;;
+	mingw/*)
+	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
+	  ;;
+	cygwin/*)
+	  file=`cygpath -m "$file" || echo "$file"`
+	  ;;
+	wine/*)
+	  file=`winepath -w "$file" || echo "$file"`
+	  ;;
+      esac
+      ;;
+  esac
+}
+
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+  func_file_conv "$1"
+  if test -z "$lib_path"; then
+    lib_path=$file
+  else
+    lib_path="$lib_path;$file"
+  fi
+  linker_opts="$linker_opts -LIBPATH:$file"
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+  lib=$1
+  found=no
+  save_IFS=$IFS
+  IFS=';'
+  for dir in $lib_path $LIB
+  do
+    IFS=$save_IFS
+    if $shared && test -f "$dir/$lib.dll.lib"; then
+      found=yes
+      lib=$dir/$lib.dll.lib
+      break
+    fi
+    if test -f "$dir/$lib.lib"; then
+      found=yes
+      lib=$dir/$lib.lib
+      break
+    fi
+    if test -f "$dir/lib$lib.a"; then
+      found=yes
+      lib=$dir/lib$lib.a
+      break
+    fi
+  done
+  IFS=$save_IFS
+
+  if test "$found" != yes; then
+    lib=$lib.lib
+  fi
+}
+
+# func_cl_wrapper cl arg...
+# Adjust compile command to suit cl
+func_cl_wrapper ()
+{
+  # Assume a capable shell
+  lib_path=
+  shared=:
+  linker_opts=
+  for arg
+  do
+    if test -n "$eat"; then
+      eat=
+    else
+      case $1 in
+	-o)
+	  # configure might choose to run compile as 'compile cc -o foo foo.c'.
+	  eat=1
+	  case $2 in
+	    *.o | *.[oO][bB][jJ])
+	      func_file_conv "$2"
+	      set x "$@" -Fo"$file"
+	      shift
+	      ;;
+	    *)
+	      func_file_conv "$2"
+	      set x "$@" -Fe"$file"
+	      shift
+	      ;;
+	  esac
+	  ;;
+	-I)
+	  eat=1
+	  func_file_conv "$2" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-I*)
+	  func_file_conv "${1#-I}" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-l)
+	  eat=1
+	  func_cl_dashl "$2"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-l*)
+	  func_cl_dashl "${1#-l}"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-L)
+	  eat=1
+	  func_cl_dashL "$2"
+	  ;;
+	-L*)
+	  func_cl_dashL "${1#-L}"
+	  ;;
+	-static)
+	  shared=false
+	  ;;
+	-Wl,*)
+	  arg=${1#-Wl,}
+	  save_ifs="$IFS"; IFS=','
+	  for flag in $arg; do
+	    IFS="$save_ifs"
+	    linker_opts="$linker_opts $flag"
+	  done
+	  IFS="$save_ifs"
+	  ;;
+	-Xlinker)
+	  eat=1
+	  linker_opts="$linker_opts $2"
+	  ;;
+	-*)
+	  set x "$@" "$1"
+	  shift
+	  ;;
+	*.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
+	  func_file_conv "$1"
+	  set x "$@" -Tp"$file"
+	  shift
+	  ;;
+	*.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
+	  func_file_conv "$1" mingw
+	  set x "$@" "$file"
+	  shift
+	  ;;
+	*)
+	  set x "$@" "$1"
+	  shift
+	  ;;
+      esac
+    fi
+    shift
+  done
+  if test -n "$linker_opts"; then
+    linker_opts="-link$linker_opts"
+  fi
+  exec "$@" $linker_opts
+  exit 1
+}
+
+eat=
+
+case $1 in
+  '')
+     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
+     exit 1;
+     ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: compile [--help] [--version] PROGRAM [ARGS]
+
+Wrapper for compilers which do not understand '-c -o'.
+Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
+arguments, and rename the output as expected.
+
+If you are trying to build a whole package this is not the
+right script to run: please start by reading the file 'INSTALL'.
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "compile $scriptversion"
+    exit $?
+    ;;
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+    func_cl_wrapper "$@"      # Doesn't return...
+    ;;
+esac
+
+ofile=
+cfile=
+
+for arg
+do
+  if test -n "$eat"; then
+    eat=
+  else
+    case $1 in
+      -o)
+	# configure might choose to run compile as 'compile cc -o foo foo.c'.
+	# So we strip '-o arg' only if arg is an object.
+	eat=1
+	case $2 in
+	  *.o | *.obj)
+	    ofile=$2
+	    ;;
+	  *)
+	    set x "$@" -o "$2"
+	    shift
+	    ;;
+	esac
+	;;
+      *.c)
+	cfile=$1
+	set x "$@" "$1"
+	shift
+	;;
+      *)
+	set x "$@" "$1"
+	shift
+	;;
+    esac
+  fi
+  shift
+done
+
+if test -z "$ofile" || test -z "$cfile"; then
+  # If no '-o' option was seen then we might have been invoked from a
+  # pattern rule where we don't need one.  That is ok -- this is a
+  # normal compilation that the losing compiler can handle.  If no
+  # '.c' file was seen then we are probably linking.  That is also
+  # ok.
+  exec "$@"
+fi
+
+# Name of file we expect compiler to create.
+cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
+
+# Create the lock directory.
+# Note: use '[/\\:.-]' here to ensure that we don't use the same name
+# that we are using for the .o file.  Also, base the name on the expected
+# object file name, since that is what matters with a parallel build.
+lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
+while true; do
+  if mkdir "$lockdir" >/dev/null 2>&1; then
+    break
+  fi
+  sleep 1
+done
+# FIXME: race condition here if user kills between mkdir and trap.
+trap "rmdir '$lockdir'; exit 1" 1 2 15
+
+# Run the compile.
+"$@"
+ret=$?
+
+if test -f "$cofile"; then
+  test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+  test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
+fi
+
+rmdir "$lockdir"
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/conf/config.guess b/conf/config.guess
new file mode 100755
index 0000000..b79252d
--- /dev/null
+++ b/conf/config.guess
@@ -0,0 +1,1558 @@
+#! /bin/sh
+# Attempt to guess a canonical system name.
+#   Copyright 1992-2013 Free Software Foundation, Inc.
+
+timestamp='2013-06-10'
+
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
+#
+# Originally written by Per Bothner.
+#
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+#
+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION]
+
+Output the configuration name of the system \`$me' is run on.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.guess ($timestamp)
+
+Originally written by Per Bothner.
+Copyright 1992-2013 Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit ;;
+    --version | -v )
+       echo "$version" ; exit ;;
+    --help | --h* | -h )
+       echo "$usage"; exit ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help" >&2
+       exit 1 ;;
+    * )
+       break ;;
+  esac
+done
+
+if test $# != 0; then
+  echo "$me: too many arguments$help" >&2
+  exit 1
+fi
+
+trap 'exit 1' 1 2 15
+
+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
+# compiler to aid in system detection is discouraged as it requires
+# temporary files to be created and, as you can see below, it is a
+# headache to deal with in a portable fashion.
+
+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
+# use `HOST_CC' if defined, but it is deprecated.
+
+# Portable tmp directory creation inspired by the Autoconf team.
+
+set_cc_for_build='
+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+: ${TMPDIR=/tmp} ;
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
+dummy=$tmp/dummy ;
+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
+case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,)    echo "int x;" > $dummy.c ;
+	for c in cc gcc c89 c99 ; do
+	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
+	     CC_FOR_BUILD="$c"; break ;
+	  fi ;
+	done ;
+	if test x"$CC_FOR_BUILD" = x ; then
+	  CC_FOR_BUILD=no_compiler_found ;
+	fi
+	;;
+ ,,*)   CC_FOR_BUILD=$CC ;;
+ ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
+esac ; set_cc_for_build= ;'
+
+# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+# (ghazi@noc.rutgers.edu 1994-08-24)
+if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+	PATH=$PATH:/.attbin ; export PATH
+fi
+
+UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+
+case "${UNAME_SYSTEM}" in
+Linux|GNU|GNU/*)
+	# If the system lacks a compiler, then just pick glibc.
+	# We could probably try harder.
+	LIBC=gnu
+
+	eval $set_cc_for_build
+	cat <<-EOF > $dummy.c
+	#include <features.h>
+	#if defined(__UCLIBC__)
+	LIBC=uclibc
+	#elif defined(__dietlibc__)
+	LIBC=dietlibc
+	#else
+	LIBC=gnu
+	#endif
+	EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+	;;
+esac
+
+# Note: order is significant - the case branches are not exclusive.
+
+case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+    *:NetBSD:*:*)
+	# NetBSD (nbsd) targets should (where applicable) match one or
+	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
+	# switched to ELF, *-*-netbsd* would select the old
+	# object file format.  This provides both forward
+	# compatibility and a consistent mechanism for selecting the
+	# object file format.
+	#
+	# Note: NetBSD doesn't particularly care about the vendor
+	# portion of the name.  We always set it to "unknown".
+	sysctl="sysctl -n hw.machine_arch"
+	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
+	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+	case "${UNAME_MACHINE_ARCH}" in
+	    armeb) machine=armeb-unknown ;;
+	    arm*) machine=arm-unknown ;;
+	    sh3el) machine=shl-unknown ;;
+	    sh3eb) machine=sh-unknown ;;
+	    sh5el) machine=sh5le-unknown ;;
+	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+	esac
+	# The Operating System including object format, if it has switched
+	# to ELF recently, or will in the future.
+	case "${UNAME_MACHINE_ARCH}" in
+	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+		eval $set_cc_for_build
+		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+			| grep -q __ELF__
+		then
+		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+		    # Return netbsd for either.  FIX?
+		    os=netbsd
+		else
+		    os=netbsdelf
+		fi
+		;;
+	    *)
+		os=netbsd
+		;;
+	esac
+	# The OS release
+	# Debian GNU/NetBSD machines have a different userland, and
+	# thus, need a distinct triplet. However, they do not need
+	# kernel version information, so it can be replaced with a
+	# suitable tag, in the style of linux-gnu.
+	case "${UNAME_VERSION}" in
+	    Debian*)
+		release='-gnu'
+		;;
+	    *)
+		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+		;;
+	esac
+	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
+	# contains redundant information, the shorter form:
+	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+	echo "${machine}-${os}${release}"
+	exit ;;
+    *:Bitrig:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
+	exit ;;
+    *:OpenBSD:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+	exit ;;
+    *:ekkoBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+	exit ;;
+    *:SolidBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+	exit ;;
+    macppc:MirBSD:*:*)
+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+	exit ;;
+    *:MirBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+	exit ;;
+    alpha:OSF1:*:*)
+	case $UNAME_RELEASE in
+	*4.0)
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+		;;
+	*5.*)
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		;;
+	esac
+	# According to Compaq, /usr/sbin/psrinfo has been available on
+	# OSF/1 and Tru64 systems produced since 1995.  I hope that
+	# covers most systems running today.  This code pipes the CPU
+	# types through head -n 1, so we only detect the type of CPU 0.
+	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
+	case "$ALPHA_CPU_TYPE" in
+	    "EV4 (21064)")
+		UNAME_MACHINE="alpha" ;;
+	    "EV4.5 (21064)")
+		UNAME_MACHINE="alpha" ;;
+	    "LCA4 (21066/21068)")
+		UNAME_MACHINE="alpha" ;;
+	    "EV5 (21164)")
+		UNAME_MACHINE="alphaev5" ;;
+	    "EV5.6 (21164A)")
+		UNAME_MACHINE="alphaev56" ;;
+	    "EV5.6 (21164PC)")
+		UNAME_MACHINE="alphapca56" ;;
+	    "EV5.7 (21164PC)")
+		UNAME_MACHINE="alphapca57" ;;
+	    "EV6 (21264)")
+		UNAME_MACHINE="alphaev6" ;;
+	    "EV6.7 (21264A)")
+		UNAME_MACHINE="alphaev67" ;;
+	    "EV6.8CB (21264C)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.8AL (21264B)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.8CX (21264D)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.9A (21264/EV69A)")
+		UNAME_MACHINE="alphaev69" ;;
+	    "EV7 (21364)")
+		UNAME_MACHINE="alphaev7" ;;
+	    "EV7.9 (21364A)")
+		UNAME_MACHINE="alphaev79" ;;
+	esac
+	# A Pn.n version is a patched version.
+	# A Vn.n version is a released version.
+	# A Tn.n version is a released field test version.
+	# A Xn.n version is an unreleased experimental baselevel.
+	# 1.2 uses "1.2" for uname -r.
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+	exitcode=$?
+	trap '' 0
+	exit $exitcode ;;
+    Alpha\ *:Windows_NT*:*)
+	# How do we know it's Interix rather than the generic POSIX subsystem?
+	# Should we change UNAME_MACHINE based on the output of uname instead
+	# of the specific Alpha model?
+	echo alpha-pc-interix
+	exit ;;
+    21064:Windows_NT:50:3)
+	echo alpha-dec-winnt3.5
+	exit ;;
+    Amiga*:UNIX_System_V:4.0:*)
+	echo m68k-unknown-sysv4
+	exit ;;
+    *:[Aa]miga[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-amigaos
+	exit ;;
+    *:[Mm]orph[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-morphos
+	exit ;;
+    *:OS/390:*:*)
+	echo i370-ibm-openedition
+	exit ;;
+    *:z/VM:*:*)
+	echo s390-ibm-zvmoe
+	exit ;;
+    *:OS400:*:*)
+	echo powerpc-ibm-os400
+	exit ;;
+    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+	echo arm-acorn-riscix${UNAME_RELEASE}
+	exit ;;
+    arm*:riscos:*:*|arm*:RISCOS:*:*)
+	echo arm-unknown-riscos
+	exit ;;
+    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+	echo hppa1.1-hitachi-hiuxmpp
+	exit ;;
+    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
+	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
+	if test "`(/bin/universe) 2>/dev/null`" = att ; then
+		echo pyramid-pyramid-sysv3
+	else
+		echo pyramid-pyramid-bsd
+	fi
+	exit ;;
+    NILE*:*:*:dcosx)
+	echo pyramid-pyramid-svr4
+	exit ;;
+    DRS?6000:unix:4.0:6*)
+	echo sparc-icl-nx6
+	exit ;;
+    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
+	case `/usr/bin/uname -p` in
+	    sparc) echo sparc-icl-nx7; exit ;;
+	esac ;;
+    s390x:SunOS:*:*)
+	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4H:SunOS:5.*:*)
+	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+	echo i386-pc-auroraux${UNAME_RELEASE}
+	exit ;;
+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+	eval $set_cc_for_build
+	SUN_ARCH="i386"
+	# If there is a compiler, see if it is configured for 64-bit objects.
+	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+	# This test works for both compilers.
+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		grep IS_64BIT_ARCH >/dev/null
+	    then
+		SUN_ARCH="x86_64"
+	    fi
+	fi
+	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:6*:*)
+	# According to config.sub, this is the proper way to canonicalize
+	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
+	# it's likely to be more like Solaris than SunOS4.
+	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:*:*)
+	case "`/usr/bin/arch -k`" in
+	    Series*|S4*)
+		UNAME_RELEASE=`uname -v`
+		;;
+	esac
+	# Japanese Language versions have a version number like `4.1.3-JL'.
+	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
+	exit ;;
+    sun3*:SunOS:*:*)
+	echo m68k-sun-sunos${UNAME_RELEASE}
+	exit ;;
+    sun*:*:4.2BSD:*)
+	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+	case "`/bin/arch`" in
+	    sun3)
+		echo m68k-sun-sunos${UNAME_RELEASE}
+		;;
+	    sun4)
+		echo sparc-sun-sunos${UNAME_RELEASE}
+		;;
+	esac
+	exit ;;
+    aushp:SunOS:*:*)
+	echo sparc-auspex-sunos${UNAME_RELEASE}
+	exit ;;
+    # The situation for MiNT is a little confusing.  The machine name
+    # can be virtually everything (everything which is not
+    # "atarist" or "atariste" at least should have a processor
+    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
+    # to the lowercase version "mint" (or "freemint").  Finally
+    # the system name "TOS" denotes a system which is actually not
+    # MiNT.  But MiNT is downward compatible to TOS, so this should
+    # be no problem.
+    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+	exit ;;
+    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+	exit ;;
+    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+	exit ;;
+    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+	echo m68k-milan-mint${UNAME_RELEASE}
+	exit ;;
+    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+	echo m68k-hades-mint${UNAME_RELEASE}
+	exit ;;
+    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+	echo m68k-unknown-mint${UNAME_RELEASE}
+	exit ;;
+    m68k:machten:*:*)
+	echo m68k-apple-machten${UNAME_RELEASE}
+	exit ;;
+    powerpc:machten:*:*)
+	echo powerpc-apple-machten${UNAME_RELEASE}
+	exit ;;
+    RISC*:Mach:*:*)
+	echo mips-dec-mach_bsd4.3
+	exit ;;
+    RISC*:ULTRIX:*:*)
+	echo mips-dec-ultrix${UNAME_RELEASE}
+	exit ;;
+    VAX*:ULTRIX*:*:*)
+	echo vax-dec-ultrix${UNAME_RELEASE}
+	exit ;;
+    2020:CLIX:*:* | 2430:CLIX:*:*)
+	echo clipper-intergraph-clix${UNAME_RELEASE}
+	exit ;;
+    mips:*:*:UMIPS | mips:*:*:RISCos)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+#ifdef __cplusplus
+#include <stdio.h>  /* for printf() prototype */
+	int main (int argc, char *argv[]) {
+#else
+	int main (argc, argv) int argc; char *argv[]; {
+#endif
+	#if defined (host_mips) && defined (MIPSEB)
+	#if defined (SYSTYPE_SYSV)
+	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_SVR4)
+	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
+	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
+	#endif
+	#endif
+	  exit (-1);
+	}
+EOF
+	$CC_FOR_BUILD -o $dummy $dummy.c &&
+	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+	  SYSTEM_NAME=`$dummy $dummyarg` &&
+	    { echo "$SYSTEM_NAME"; exit; }
+	echo mips-mips-riscos${UNAME_RELEASE}
+	exit ;;
+    Motorola:PowerMAX_OS:*:*)
+	echo powerpc-motorola-powermax
+	exit ;;
+    Motorola:*:4.3:PL8-*)
+	echo powerpc-harris-powermax
+	exit ;;
+    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
+	echo powerpc-harris-powermax
+	exit ;;
+    Night_Hawk:Power_UNIX:*:*)
+	echo powerpc-harris-powerunix
+	exit ;;
+    m88k:CX/UX:7*:*)
+	echo m88k-harris-cxux7
+	exit ;;
+    m88k:*:4*:R4*)
+	echo m88k-motorola-sysv4
+	exit ;;
+    m88k:*:3*:R3*)
+	echo m88k-motorola-sysv3
+	exit ;;
+    AViiON:dgux:*:*)
+	# DG/UX returns AViiON for all architectures
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+	then
+	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+	       [ ${TARGET_BINARY_INTERFACE}x = x ]
+	    then
+		echo m88k-dg-dgux${UNAME_RELEASE}
+	    else
+		echo m88k-dg-dguxbcs${UNAME_RELEASE}
+	    fi
+	else
+	    echo i586-dg-dgux${UNAME_RELEASE}
+	fi
+	exit ;;
+    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
+	echo m88k-dolphin-sysv3
+	exit ;;
+    M88*:*:R3*:*)
+	# Delta 88k system running SVR3
+	echo m88k-motorola-sysv3
+	exit ;;
+    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
+	echo m88k-tektronix-sysv3
+	exit ;;
+    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
+	echo m68k-tektronix-bsd
+	exit ;;
+    *:IRIX*:*:*)
+	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
+	exit ;;
+    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
+	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
+    i*86:AIX:*:*)
+	echo i386-ibm-aix
+	exit ;;
+    ia64:AIX:*:*)
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+	fi
+	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
+	exit ;;
+    *:AIX:2:3)
+	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+		eval $set_cc_for_build
+		sed 's/^		//' << EOF >$dummy.c
+		#include <sys/systemcfg.h>
+
+		main()
+			{
+			if (!__power_pc())
+				exit(1);
+			puts("powerpc-ibm-aix3.2.5");
+			exit(0);
+			}
+EOF
+		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
+		then
+			echo "$SYSTEM_NAME"
+		else
+			echo rs6000-ibm-aix3.2.5
+		fi
+	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
+		echo rs6000-ibm-aix3.2.4
+	else
+		echo rs6000-ibm-aix3.2
+	fi
+	exit ;;
+    *:AIX:*:[4567])
+	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+		IBM_ARCH=rs6000
+	else
+		IBM_ARCH=powerpc
+	fi
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+	fi
+	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+	exit ;;
+    *:AIX:*:*)
+	echo rs6000-ibm-aix
+	exit ;;
+    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+	echo romp-ibm-bsd4.4
+	exit ;;
+    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
+	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
+	exit ;;                             # report: romp-ibm BSD 4.3
+    *:BOSX:*:*)
+	echo rs6000-bull-bosx
+	exit ;;
+    DPX/2?00:B.O.S.:*:*)
+	echo m68k-bull-sysv3
+	exit ;;
+    9000/[34]??:4.3bsd:1.*:*)
+	echo m68k-hp-bsd
+	exit ;;
+    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
+	echo m68k-hp-bsd4.4
+	exit ;;
+    9000/[34678]??:HP-UX:*:*)
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	case "${UNAME_MACHINE}" in
+	    9000/31? )            HP_ARCH=m68000 ;;
+	    9000/[34]?? )         HP_ARCH=m68k ;;
+	    9000/[678][0-9][0-9])
+		if [ -x /usr/bin/getconf ]; then
+		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+		    case "${sc_cpu_version}" in
+		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+		      532)                      # CPU_PA_RISC2_0
+			case "${sc_kernel_bits}" in
+			  32) HP_ARCH="hppa2.0n" ;;
+			  64) HP_ARCH="hppa2.0w" ;;
+			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
+			esac ;;
+		    esac
+		fi
+		if [ "${HP_ARCH}" = "" ]; then
+		    eval $set_cc_for_build
+		    sed 's/^		//' << EOF >$dummy.c
+
+		#define _HPUX_SOURCE
+		#include <stdlib.h>
+		#include <unistd.h>
+
+		int main ()
+		{
+		#if defined(_SC_KERNEL_BITS)
+		    long bits = sysconf(_SC_KERNEL_BITS);
+		#endif
+		    long cpu  = sysconf (_SC_CPU_VERSION);
+
+		    switch (cpu)
+			{
+			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+			case CPU_PA_RISC2_0:
+		#if defined(_SC_KERNEL_BITS)
+			    switch (bits)
+				{
+				case 64: puts ("hppa2.0w"); break;
+				case 32: puts ("hppa2.0n"); break;
+				default: puts ("hppa2.0"); break;
+				} break;
+		#else  /* !defined(_SC_KERNEL_BITS) */
+			    puts ("hppa2.0"); break;
+		#endif
+			default: puts ("hppa1.0"); break;
+			}
+		    exit (0);
+		}
+EOF
+		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+		    test -z "$HP_ARCH" && HP_ARCH=hppa
+		fi ;;
+	esac
+	if [ ${HP_ARCH} = "hppa2.0w" ]
+	then
+	    eval $set_cc_for_build
+
+	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
+	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
+	    # generating 64-bit code.  GNU and HP use different nomenclature:
+	    #
+	    # $ CC_FOR_BUILD=cc ./config.guess
+	    # => hppa2.0w-hp-hpux11.23
+	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
+	    # => hppa64-hp-hpux11.23
+
+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+		grep -q __LP64__
+	    then
+		HP_ARCH="hppa2.0w"
+	    else
+		HP_ARCH="hppa64"
+	    fi
+	fi
+	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+	exit ;;
+    ia64:HP-UX:*:*)
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	echo ia64-hp-hpux${HPUX_REV}
+	exit ;;
+    3050*:HI-UX:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#include <unistd.h>
+	int
+	main ()
+	{
+	  long cpu = sysconf (_SC_CPU_VERSION);
+	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
+	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
+	     results, however.  */
+	  if (CPU_IS_PA_RISC (cpu))
+	    {
+	      switch (cpu)
+		{
+		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
+		  default: puts ("hppa-hitachi-hiuxwe2"); break;
+		}
+	    }
+	  else if (CPU_IS_HP_MC68K (cpu))
+	    puts ("m68k-hitachi-hiuxwe2");
+	  else puts ("unknown-hitachi-hiuxwe2");
+	  exit (0);
+	}
+EOF
+	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
+		{ echo "$SYSTEM_NAME"; exit; }
+	echo unknown-hitachi-hiuxwe2
+	exit ;;
+    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
+	echo hppa1.1-hp-bsd
+	exit ;;
+    9000/8??:4.3bsd:*:*)
+	echo hppa1.0-hp-bsd
+	exit ;;
+    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
+	echo hppa1.0-hp-mpeix
+	exit ;;
+    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+	echo hppa1.1-hp-osf
+	exit ;;
+    hp8??:OSF1:*:*)
+	echo hppa1.0-hp-osf
+	exit ;;
+    i*86:OSF1:*:*)
+	if [ -x /usr/sbin/sysversion ] ; then
+	    echo ${UNAME_MACHINE}-unknown-osf1mk
+	else
+	    echo ${UNAME_MACHINE}-unknown-osf1
+	fi
+	exit ;;
+    parisc*:Lites*:*:*)
+	echo hppa1.1-hp-lites
+	exit ;;
+    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+	echo c1-convex-bsd
+	exit ;;
+    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+	exit ;;
+    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+	echo c34-convex-bsd
+	exit ;;
+    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+	echo c38-convex-bsd
+	exit ;;
+    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+	echo c4-convex-bsd
+	exit ;;
+    CRAY*Y-MP:*:*:*)
+	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*[A-Z]90:*:*:*)
+	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+	      -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*TS:*:*:*)
+	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*T3E:*:*:*)
+	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*SV1:*:*:*)
+	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    *:UNICOS/mp:*:*)
+	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
+    5000:UNIX_System_V:4.*:*)
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
+    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+	exit ;;
+    sparc*:BSD/OS:*:*)
+	echo sparc-unknown-bsdi${UNAME_RELEASE}
+	exit ;;
+    *:BSD/OS:*:*)
+	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+	exit ;;
+    *:FreeBSD:*:*)
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	case ${UNAME_PROCESSOR} in
+	    amd64)
+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    *)
+		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	esac
+	exit ;;
+    i*:CYGWIN*:*)
+	echo ${UNAME_MACHINE}-pc-cygwin
+	exit ;;
+    *:MINGW64*:*)
+	echo ${UNAME_MACHINE}-pc-mingw64
+	exit ;;
+    *:MINGW*:*)
+	echo ${UNAME_MACHINE}-pc-mingw32
+	exit ;;
+    i*:MSYS*:*)
+	echo ${UNAME_MACHINE}-pc-msys
+	exit ;;
+    i*:windows32*:*)
+	# uname -m includes "-pc" on this system.
+	echo ${UNAME_MACHINE}-mingw32
+	exit ;;
+    i*:PW*:*)
+	echo ${UNAME_MACHINE}-pc-pw32
+	exit ;;
+    *:Interix*:*)
+	case ${UNAME_MACHINE} in
+	    x86)
+		echo i586-pc-interix${UNAME_RELEASE}
+		exit ;;
+	    authenticamd | genuineintel | EM64T)
+		echo x86_64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	    IA64)
+		echo ia64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	esac ;;
+    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+	echo i${UNAME_MACHINE}-pc-mks
+	exit ;;
+    8664:Windows_NT:*)
+	echo x86_64-pc-mks
+	exit ;;
+    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
+	# How do we know it's Interix rather than the generic POSIX subsystem?
+	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+	# UNAME_MACHINE based on the output of uname instead of i386?
+	echo i586-pc-interix
+	exit ;;
+    i*:UWIN*:*)
+	echo ${UNAME_MACHINE}-pc-uwin
+	exit ;;
+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+	echo x86_64-unknown-cygwin
+	exit ;;
+    p*:CYGWIN*:*)
+	echo powerpcle-unknown-cygwin
+	exit ;;
+    prep*:SunOS:5.*:*)
+	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    *:GNU:*:*)
+	# the GNU system
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	exit ;;
+    *:GNU/*:*:*)
+	# other systems with GNU libc and userland
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
+	exit ;;
+    i*86:Minix:*:*)
+	echo ${UNAME_MACHINE}-pc-minix
+	exit ;;
+    aarch64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    aarch64_be:Linux:*:*)
+	UNAME_MACHINE=aarch64_be
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    alpha:Linux:*:*)
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
+	esac
+	objdump --private-headers /bin/sh | grep -q ld.so.1
+	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    arc:Linux:*:* | arceb:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    arm*:Linux:*:*)
+	eval $set_cc_for_build
+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+	    | grep -q __ARM_EABI__
+	then
+	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	else
+	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+		| grep -q __ARM_PCS_VFP
+	    then
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
+	    else
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
+	    fi
+	fi
+	exit ;;
+    avr32*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    cris:Linux:*:*)
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+	exit ;;
+    crisv32:Linux:*:*)
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+	exit ;;
+    frv:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    hexagon:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    i*86:Linux:*:*)
+	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
+	exit ;;
+    ia64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    m32r*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    m68*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    mips:Linux:*:* | mips64:Linux:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#undef CPU
+	#undef ${UNAME_MACHINE}
+	#undef ${UNAME_MACHINE}el
+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+	CPU=${UNAME_MACHINE}el
+	#else
+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+	CPU=${UNAME_MACHINE}
+	#else
+	CPU=
+	#endif
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
+	;;
+    or1k:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    or32:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    padre:Linux:*:*)
+	echo sparc-unknown-linux-${LIBC}
+	exit ;;
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+	echo hppa64-unknown-linux-${LIBC}
+	exit ;;
+    parisc:Linux:*:* | hppa:Linux:*:*)
+	# Look for CPU level
+	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
+	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
+	  *)    echo hppa-unknown-linux-${LIBC} ;;
+	esac
+	exit ;;
+    ppc64:Linux:*:*)
+	echo powerpc64-unknown-linux-${LIBC}
+	exit ;;
+    ppc:Linux:*:*)
+	echo powerpc-unknown-linux-${LIBC}
+	exit ;;
+    ppc64le:Linux:*:*)
+	echo powerpc64le-unknown-linux-${LIBC}
+	exit ;;
+    ppcle:Linux:*:*)
+	echo powerpcle-unknown-linux-${LIBC}
+	exit ;;
+    s390:Linux:*:* | s390x:Linux:*:*)
+	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
+	exit ;;
+    sh64*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    sh*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    sparc:Linux:*:* | sparc64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    tile*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    vax:Linux:*:*)
+	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
+	exit ;;
+    x86_64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    xtensa*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    i*86:DYNIX/ptx:4*:*)
+	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+	# earlier versions are messed up and put the nodename in both
+	# sysname and nodename.
+	echo i386-sequent-sysv4
+	exit ;;
+    i*86:UNIX_SV:4.2MP:2.*)
+	# Unixware is an offshoot of SVR4, but it has its own version
+	# number series starting with 2...
+	# I am not positive that other SVR4 systems won't match this,
+	# I just have to hope.  -- rms.
+	# Use sysv4.2uw... so that sysv4* matches it.
+	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+	exit ;;
+    i*86:OS/2:*:*)
+	# If we were able to find `uname', then EMX Unix compatibility
+	# is probably installed.
+	echo ${UNAME_MACHINE}-pc-os2-emx
+	exit ;;
+    i*86:XTS-300:*:STOP)
+	echo ${UNAME_MACHINE}-unknown-stop
+	exit ;;
+    i*86:atheos:*:*)
+	echo ${UNAME_MACHINE}-unknown-atheos
+	exit ;;
+    i*86:syllable:*:*)
+	echo ${UNAME_MACHINE}-pc-syllable
+	exit ;;
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
+	echo i386-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    i*86:*DOS:*:*)
+	echo ${UNAME_MACHINE}-pc-msdosdjgpp
+	exit ;;
+    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
+	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
+	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
+	else
+		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+	fi
+	exit ;;
+    i*86:*:5:[678]*)
+	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+	case `/bin/uname -X | grep "^Machine"` in
+	    *486*)	     UNAME_MACHINE=i486 ;;
+	    *Pentium)	     UNAME_MACHINE=i586 ;;
+	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+	esac
+	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+	exit ;;
+    i*86:*:3.2:*)
+	if test -f /usr/options/cb.name; then
+		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
+	elif /bin/uname -X 2>/dev/null >/dev/null ; then
+		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
+		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
+		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
+			&& UNAME_MACHINE=i586
+		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
+	else
+		echo ${UNAME_MACHINE}-pc-sysv32
+	fi
+	exit ;;
+    pc:*:*:*)
+	# Left here for compatibility:
+	# uname -m prints for DJGPP always 'pc', but it prints nothing about
+	# the processor, so we play safe by assuming i586.
+	# Note: whatever this is, it MUST be the same as what config.sub
+	# prints for the "djgpp" host, or else GDB configury will decide that
+	# this is a cross-build.
+	echo i586-pc-msdosdjgpp
+	exit ;;
+    Intel:Mach:3*:*)
+	echo i386-pc-mach3
+	exit ;;
+    paragon:*:*:*)
+	echo i860-intel-osf1
+	exit ;;
+    i860:*:4.*:*) # i860-SVR4
+	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
+	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+	else # Add other i860-SVR4 vendors below as they are discovered.
+	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
+	fi
+	exit ;;
+    mini*:CTIX:SYS*5:*)
+	# "miniframe"
+	echo m68010-convergent-sysv
+	exit ;;
+    mc68k:UNIX:SYSTEM5:3.51m)
+	echo m68k-convergent-sysv
+	exit ;;
+    M680?0:D-NIX:5.3:*)
+	echo m68k-diab-dnix
+	exit ;;
+    M68*:*:R3V[5678]*:*)
+	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
+	OS_REL=''
+	test -r /etc/.relid \
+	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4; exit; } ;;
+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
+	OS_REL='.3'
+	test -r /etc/.relid \
+	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+	echo m68k-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    mc68030:UNIX_System_V:4.*:*)
+	echo m68k-atari-sysv4
+	exit ;;
+    TSUNAMI:LynxOS:2.*:*)
+	echo sparc-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    rs6000:LynxOS:2.*:*)
+	echo rs6000-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
+	echo powerpc-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    SM[BE]S:UNIX_SV:*:*)
+	echo mips-dde-sysv${UNAME_RELEASE}
+	exit ;;
+    RM*:ReliantUNIX-*:*:*)
+	echo mips-sni-sysv4
+	exit ;;
+    RM*:SINIX-*:*:*)
+	echo mips-sni-sysv4
+	exit ;;
+    *:SINIX-*:*:*)
+	if uname -p 2>/dev/null >/dev/null ; then
+		UNAME_MACHINE=`(uname -p) 2>/dev/null`
+		echo ${UNAME_MACHINE}-sni-sysv4
+	else
+		echo ns32k-sni-sysv
+	fi
+	exit ;;
+    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+			# says <Richard.M.Bartel@ccMail.Census.GOV>
+	echo i586-unisys-sysv4
+	exit ;;
+    *:UNIX_System_V:4*:FTX*)
+	# From Gerald Hewes <hewes@openmarket.com>.
+	# How about differentiating between stratus architectures? -djm
+	echo hppa1.1-stratus-sysv4
+	exit ;;
+    *:*:*:FTX*)
+	# From seanf@swdc.stratus.com.
+	echo i860-stratus-sysv4
+	exit ;;
+    i*86:VOS:*:*)
+	# From Paul.Green@stratus.com.
+	echo ${UNAME_MACHINE}-stratus-vos
+	exit ;;
+    *:VOS:*:*)
+	# From Paul.Green@stratus.com.
+	echo hppa1.1-stratus-vos
+	exit ;;
+    mc68*:A/UX:*:*)
+	echo m68k-apple-aux${UNAME_RELEASE}
+	exit ;;
+    news*:NEWS-OS:6*:*)
+	echo mips-sony-newsos6
+	exit ;;
+    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+	if [ -d /usr/nec ]; then
+		echo mips-nec-sysv${UNAME_RELEASE}
+	else
+		echo mips-unknown-sysv${UNAME_RELEASE}
+	fi
+	exit ;;
+    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
+	echo powerpc-be-beos
+	exit ;;
+    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
+	echo powerpc-apple-beos
+	exit ;;
+    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
+	echo i586-pc-beos
+	exit ;;
+    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
+	echo i586-pc-haiku
+	exit ;;
+    x86_64:Haiku:*:*)
+	echo x86_64-unknown-haiku
+	exit ;;
+    SX-4:SUPER-UX:*:*)
+	echo sx4-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-5:SUPER-UX:*:*)
+	echo sx5-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-6:SUPER-UX:*:*)
+	echo sx6-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-7:SUPER-UX:*:*)
+	echo sx7-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8:SUPER-UX:*:*)
+	echo sx8-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8R:SUPER-UX:*:*)
+	echo sx8r-nec-superux${UNAME_RELEASE}
+	exit ;;
+    Power*:Rhapsody:*:*)
+	echo powerpc-apple-rhapsody${UNAME_RELEASE}
+	exit ;;
+    *:Rhapsody:*:*)
+	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+	exit ;;
+    *:Darwin:*:*)
+	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+	eval $set_cc_for_build
+	if test "$UNAME_PROCESSOR" = unknown ; then
+	    UNAME_PROCESSOR=powerpc
+	fi
+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	    if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		grep IS_64BIT_ARCH >/dev/null
+	    then
+		case $UNAME_PROCESSOR in
+		    i386) UNAME_PROCESSOR=x86_64 ;;
+		    powerpc) UNAME_PROCESSOR=powerpc64 ;;
+		esac
+	    fi
+	fi
+	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+	exit ;;
+    *:procnto*:*:* | *:QNX:[0123456789]*:*)
+	UNAME_PROCESSOR=`uname -p`
+	if test "$UNAME_PROCESSOR" = "x86"; then
+		UNAME_PROCESSOR=i386
+		UNAME_MACHINE=pc
+	fi
+	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
+	exit ;;
+    *:QNX:*:4*)
+	echo i386-pc-qnx
+	exit ;;
+    NEO-?:NONSTOP_KERNEL:*:*)
+	echo neo-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    NSE-*:NONSTOP_KERNEL:*:*)
+	echo nse-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    NSR-?:NONSTOP_KERNEL:*:*)
+	echo nsr-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    *:NonStop-UX:*:*)
+	echo mips-compaq-nonstopux
+	exit ;;
+    BS2000:POSIX*:*:*)
+	echo bs2000-siemens-sysv
+	exit ;;
+    DS/*:UNIX_System_V:*:*)
+	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
+	exit ;;
+    *:Plan9:*:*)
+	# "uname -m" is not consistent, so use $cputype instead. 386
+	# is converted to i386 for consistency with other x86
+	# operating systems.
+	if test "$cputype" = "386"; then
+	    UNAME_MACHINE=i386
+	else
+	    UNAME_MACHINE="$cputype"
+	fi
+	echo ${UNAME_MACHINE}-unknown-plan9
+	exit ;;
+    *:TOPS-10:*:*)
+	echo pdp10-unknown-tops10
+	exit ;;
+    *:TENEX:*:*)
+	echo pdp10-unknown-tenex
+	exit ;;
+    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
+	echo pdp10-dec-tops20
+	exit ;;
+    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
+	echo pdp10-xkl-tops20
+	exit ;;
+    *:TOPS-20:*:*)
+	echo pdp10-unknown-tops20
+	exit ;;
+    *:ITS:*:*)
+	echo pdp10-unknown-its
+	exit ;;
+    SEI:*:*:SEIUX)
+	echo mips-sei-seiux${UNAME_RELEASE}
+	exit ;;
+    *:DragonFly:*:*)
+	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	exit ;;
+    *:*VMS:*:*)
+	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+	case "${UNAME_MACHINE}" in
+	    A*) echo alpha-dec-vms ; exit ;;
+	    I*) echo ia64-dec-vms ; exit ;;
+	    V*) echo vax-dec-vms ; exit ;;
+	esac ;;
+    *:XENIX:*:SysV)
+	echo i386-pc-xenix
+	exit ;;
+    i*86:skyos:*:*)
+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+	exit ;;
+    i*86:rdos:*:*)
+	echo ${UNAME_MACHINE}-pc-rdos
+	exit ;;
+    i*86:AROS:*:*)
+	echo ${UNAME_MACHINE}-pc-aros
+	exit ;;
+    x86_64:VMkernel:*:*)
+	echo ${UNAME_MACHINE}-unknown-esx
+	exit ;;
+esac
+
+eval $set_cc_for_build
+cat >$dummy.c <<EOF
+#ifdef _SEQUENT_
+# include <sys/types.h>
+# include <sys/utsname.h>
+#endif
+main ()
+{
+#if defined (sony)
+#if defined (MIPSEB)
+  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
+     I don't know....  */
+  printf ("mips-sony-bsd\n"); exit (0);
+#else
+#include <sys/param.h>
+  printf ("m68k-sony-newsos%s\n",
+#ifdef NEWSOS4
+	"4"
+#else
+	""
+#endif
+	); exit (0);
+#endif
+#endif
+
+#if defined (__arm) && defined (__acorn) && defined (__unix)
+  printf ("arm-acorn-riscix\n"); exit (0);
+#endif
+
+#if defined (hp300) && !defined (hpux)
+  printf ("m68k-hp-bsd\n"); exit (0);
+#endif
+
+#if defined (NeXT)
+#if !defined (__ARCHITECTURE__)
+#define __ARCHITECTURE__ "m68k"
+#endif
+  int version;
+  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
+  if (version < 4)
+    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+  else
+    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
+  exit (0);
+#endif
+
+#if defined (MULTIMAX) || defined (n16)
+#if defined (UMAXV)
+  printf ("ns32k-encore-sysv\n"); exit (0);
+#else
+#if defined (CMU)
+  printf ("ns32k-encore-mach\n"); exit (0);
+#else
+  printf ("ns32k-encore-bsd\n"); exit (0);
+#endif
+#endif
+#endif
+
+#if defined (__386BSD__)
+  printf ("i386-pc-bsd\n"); exit (0);
+#endif
+
+#if defined (sequent)
+#if defined (i386)
+  printf ("i386-sequent-dynix\n"); exit (0);
+#endif
+#if defined (ns32000)
+  printf ("ns32k-sequent-dynix\n"); exit (0);
+#endif
+#endif
+
+#if defined (_SEQUENT_)
+    struct utsname un;
+
+    uname(&un);
+
+    if (strncmp(un.version, "V2", 2) == 0) {
+	printf ("i386-sequent-ptx2\n"); exit (0);
+    }
+    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
+	printf ("i386-sequent-ptx1\n"); exit (0);
+    }
+    printf ("i386-sequent-ptx\n"); exit (0);
+
+#endif
+
+#if defined (vax)
+# if !defined (ultrix)
+#  include <sys/param.h>
+#  if defined (BSD)
+#   if BSD == 43
+      printf ("vax-dec-bsd4.3\n"); exit (0);
+#   else
+#    if BSD == 199006
+      printf ("vax-dec-bsd4.3reno\n"); exit (0);
+#    else
+      printf ("vax-dec-bsd\n"); exit (0);
+#    endif
+#   endif
+#  else
+    printf ("vax-dec-bsd\n"); exit (0);
+#  endif
+# else
+    printf ("vax-dec-ultrix\n"); exit (0);
+# endif
+#endif
+
+#if defined (alliant) && defined (i860)
+  printf ("i860-alliant-bsd\n"); exit (0);
+#endif
+
+  exit (1);
+}
+EOF
+
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
+	{ echo "$SYSTEM_NAME"; exit; }
+
+# Apollos put the system type in the environment.
+
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
+
+# Convex versions that predate uname can use getsysinfo(1)
+
+if [ -x /usr/convex/getsysinfo ]
+then
+    case `getsysinfo -f cpu_type` in
+    c1*)
+	echo c1-convex-bsd
+	exit ;;
+    c2*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+	exit ;;
+    c34*)
+	echo c34-convex-bsd
+	exit ;;
+    c38*)
+	echo c38-convex-bsd
+	exit ;;
+    c4*)
+	echo c4-convex-bsd
+	exit ;;
+    esac
+fi
+
+cat >&2 <<EOF
+$0: unable to guess system type
+
+This script, last modified $timestamp, has failed to recognize
+the operating system you are using. It is advised that you
+download the most up to date version of the config scripts from
+
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+and
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
+If the version you run ($0) is already up to date, please
+send the following data and any information you think might be
+pertinent to <config-patches@gnu.org> in order to provide the needed
+information to handle your system.
+
+config.guess timestamp = $timestamp
+
+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`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
+
+hostinfo               = `(hostinfo) 2>/dev/null`
+/bin/universe          = `(/bin/universe) 2>/dev/null`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
+/bin/arch              = `(/bin/arch) 2>/dev/null`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
+
+UNAME_MACHINE = ${UNAME_MACHINE}
+UNAME_RELEASE = ${UNAME_RELEASE}
+UNAME_SYSTEM  = ${UNAME_SYSTEM}
+UNAME_VERSION = ${UNAME_VERSION}
+EOF
+
+exit 1
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
diff --git a/conf/config.rpath b/conf/config.rpath
new file mode 100755
index 0000000..af3c415
--- /dev/null
+++ b/conf/config.rpath
@@ -0,0 +1,684 @@
+#! /bin/sh
+# Output a system dependent set of variables, describing how to set the
+# run time search path of shared libraries in an executable.
+#
+#   Copyright 1996-2017 Free Software Foundation, Inc.
+#   Taken from GNU libtool, 2001
+#   Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+#
+#   This file is free software; the Free Software Foundation gives
+#   unlimited permission to copy and/or distribute it, with or without
+#   modifications, as long as this notice is preserved.
+#
+# The first argument passed to this file is the canonical host specification,
+#    CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or
+#    CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# The environment variables CC, GCC, LDFLAGS, LD, with_gnu_ld
+# should be set by the caller.
+#
+# The set of defined variables is at the end of this script.
+
+# Known limitations:
+# - On IRIX 6.5 with CC="cc", the run time search patch must not be longer
+#   than 256 bytes, otherwise the compiler driver will dump core. The only
+#   known workaround is to choose shorter directory names for the build
+#   directory and/or the installation directory.
+
+# All known linkers require a '.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+shrext=.so
+
+host="$1"
+host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+
+# Code taken from libtool.m4's _LT_CC_BASENAME.
+
+for cc_temp in $CC""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'`
+
+# Code taken from libtool.m4's _LT_COMPILER_PIC.
+
+wl=
+if test "$GCC" = yes; then
+  wl='-Wl,'
+else
+  case "$host_os" in
+    aix*)
+      wl='-Wl,'
+      ;;
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      ;;
+    hpux9* | hpux10* | hpux11*)
+      wl='-Wl,'
+      ;;
+    irix5* | irix6* | nonstopux*)
+      wl='-Wl,'
+      ;;
+    linux* | k*bsd*-gnu | kopensolaris*-gnu)
+      case $cc_basename in
+        ecc*)
+          wl='-Wl,'
+          ;;
+        icc* | ifort*)
+          wl='-Wl,'
+          ;;
+        lf95*)
+          wl='-Wl,'
+          ;;
+        nagfor*)
+          wl='-Wl,-Wl,,'
+          ;;
+        pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+          wl='-Wl,'
+          ;;
+        ccc*)
+          wl='-Wl,'
+          ;;
+        xl* | bgxl* | bgf* | mpixl*)
+          wl='-Wl,'
+          ;;
+        como)
+          wl='-lopt='
+          ;;
+        *)
+          case `$CC -V 2>&1 | sed 5q` in
+            *Sun\ F* | *Sun*Fortran*)
+              wl=
+              ;;
+            *Sun\ C*)
+              wl='-Wl,'
+              ;;
+          esac
+          ;;
+      esac
+      ;;
+    newsos6)
+      ;;
+    *nto* | *qnx*)
+      ;;
+    osf3* | osf4* | osf5*)
+      wl='-Wl,'
+      ;;
+    rdos*)
+      ;;
+    solaris*)
+      case $cc_basename in
+        f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
+          wl='-Qoption ld '
+          ;;
+        *)
+          wl='-Wl,'
+          ;;
+      esac
+      ;;
+    sunos4*)
+      wl='-Qoption ld '
+      ;;
+    sysv4 | sysv4.2uw2* | sysv4.3*)
+      wl='-Wl,'
+      ;;
+    sysv4*MP*)
+      ;;
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      wl='-Wl,'
+      ;;
+    unicos*)
+      wl='-Wl,'
+      ;;
+    uts4*)
+      ;;
+  esac
+fi
+
+# Code taken from libtool.m4's _LT_LINKER_SHLIBS.
+
+hardcode_libdir_flag_spec=
+hardcode_libdir_separator=
+hardcode_direct=no
+hardcode_minus_L=no
+
+case "$host_os" in
+  cygwin* | mingw* | pw32* | cegcc*)
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test "$GCC" != yes; then
+      with_gnu_ld=no
+    fi
+    ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
+  openbsd*)
+    with_gnu_ld=no
+    ;;
+esac
+
+ld_shlibs=yes
+if test "$with_gnu_ld" = yes; then
+  # Set some defaults for GNU ld with shared library support. These
+  # are reset later if shared libraries are not supported. Putting them
+  # here allows them to be overridden if necessary.
+  # Unlike libtool, we use -rpath here, not --rpath, since the documented
+  # option of GNU ld is called -rpath, not --rpath.
+  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+  case "$host_os" in
+    aix[3-9]*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test "$host_cpu" != ia64; then
+        ld_shlibs=no
+      fi
+      ;;
+    amigaos*)
+      case "$host_cpu" in
+        powerpc)
+          ;;
+        m68k)
+          hardcode_libdir_flag_spec='-L$libdir'
+          hardcode_minus_L=yes
+          ;;
+      esac
+      ;;
+    beos*)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    cygwin* | mingw* | pw32* | cegcc*)
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      hardcode_libdir_flag_spec='-L$libdir'
+      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    haiku*)
+      ;;
+    interix[3-9]*)
+      hardcode_direct=no
+      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+      ;;
+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    netbsd*)
+      ;;
+    solaris*)
+      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+        ld_shlibs=no
+      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
+          ld_shlibs=no
+          ;;
+        *)
+          if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+            hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
+          else
+            ld_shlibs=no
+          fi
+          ;;
+      esac
+      ;;
+    sunos4*)
+      hardcode_direct=yes
+      ;;
+    *)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+  esac
+  if test "$ld_shlibs" = no; then
+    hardcode_libdir_flag_spec=
+  fi
+else
+  case "$host_os" in
+    aix3*)
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      hardcode_minus_L=yes
+      if test "$GCC" = yes; then
+        # Neither direct hardcoding nor static linking is supported with a
+        # broken collect2.
+        hardcode_direct=unsupported
+      fi
+      ;;
+    aix[4-9]*)
+      if test "$host_cpu" = ia64; then
+        # On IA64, the linker does run time linking by default, so we don't
+        # have to do anything special.
+        aix_use_runtimelinking=no
+      else
+        aix_use_runtimelinking=no
+        # Test if we are trying to use run time linking or normal
+        # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+        # need to do runtime linking.
+        case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+          for ld_flag in $LDFLAGS; do
+            if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+              aix_use_runtimelinking=yes
+              break
+            fi
+          done
+          ;;
+        esac
+      fi
+      hardcode_direct=yes
+      hardcode_libdir_separator=':'
+      if test "$GCC" = yes; then
+        case $host_os in aix4.[012]|aix4.[012].*)
+          collect2name=`${CC} -print-prog-name=collect2`
+          if test -f "$collect2name" && \
+            strings "$collect2name" | grep resolve_lib_name >/dev/null
+          then
+            # We have reworked collect2
+            :
+          else
+            # We have old collect2
+            hardcode_direct=unsupported
+            hardcode_minus_L=yes
+            hardcode_libdir_flag_spec='-L$libdir'
+            hardcode_libdir_separator=
+          fi
+          ;;
+        esac
+      fi
+      # Begin _LT_AC_SYS_LIBPATH_AIX.
+      echo 'int main () { return 0; }' > conftest.c
+      ${CC} ${LDFLAGS} conftest.c -o conftest
+      aix_libpath=`dump -H conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`
+      if test -z "$aix_libpath"; then
+        aix_libpath=`dump -HX64 conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`
+      fi
+      if test -z "$aix_libpath"; then
+        aix_libpath="/usr/lib:/lib"
+      fi
+      rm -f conftest.c conftest
+      # End _LT_AC_SYS_LIBPATH_AIX.
+      if test "$aix_use_runtimelinking" = yes; then
+        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+      else
+        if test "$host_cpu" = ia64; then
+          hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+        else
+          hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+        fi
+      fi
+      ;;
+    amigaos*)
+      case "$host_cpu" in
+        powerpc)
+          ;;
+        m68k)
+          hardcode_libdir_flag_spec='-L$libdir'
+          hardcode_minus_L=yes
+          ;;
+      esac
+      ;;
+    bsdi[45]*)
+      ;;
+    cygwin* | mingw* | pw32* | cegcc*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      hardcode_libdir_flag_spec=' '
+      libext=lib
+      ;;
+    darwin* | rhapsody*)
+      hardcode_direct=no
+      if { case $cc_basename in ifort*) true;; *) test "$GCC" = yes;; esac; }; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    dgux*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      ;;
+    freebsd2.[01]*)
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      ;;
+    freebsd* | dragonfly*)
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      ;;
+    hpux9*)
+      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+      hardcode_libdir_separator=:
+      hardcode_direct=yes
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      hardcode_minus_L=yes
+      ;;
+    hpux10*)
+      if test "$with_gnu_ld" = no; then
+        hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+        hardcode_libdir_separator=:
+        hardcode_direct=yes
+        # hardcode_minus_L: Not really in the search PATH,
+        # but as the default location of the library.
+        hardcode_minus_L=yes
+      fi
+      ;;
+    hpux11*)
+      if test "$with_gnu_ld" = no; then
+        hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+        hardcode_libdir_separator=:
+        case $host_cpu in
+          hppa*64*|ia64*)
+            hardcode_direct=no
+            ;;
+          *)
+            hardcode_direct=yes
+            # hardcode_minus_L: Not really in the search PATH,
+            # but as the default location of the library.
+            hardcode_minus_L=yes
+            ;;
+        esac
+      fi
+      ;;
+    irix5* | irix6* | nonstopux*)
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      ;;
+    netbsd*)
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      ;;
+    newsos6)
+      hardcode_direct=yes
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      ;;
+    *nto* | *qnx*)
+      ;;
+    openbsd*)
+      if test -f /usr/libexec/ld.so; then
+        hardcode_direct=yes
+        if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+          hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+        else
+          case "$host_os" in
+            openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+              hardcode_libdir_flag_spec='-R$libdir'
+              ;;
+            *)
+              hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+              ;;
+          esac
+        fi
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    os2*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      ;;
+    osf3*)
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      ;;
+    osf4* | osf5*)
+      if test "$GCC" = yes; then
+        hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      else
+        # Both cc and cxx compiler support -rpath directly
+        hardcode_libdir_flag_spec='-rpath $libdir'
+      fi
+      hardcode_libdir_separator=:
+      ;;
+    solaris*)
+      hardcode_libdir_flag_spec='-R$libdir'
+      ;;
+    sunos4*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      ;;
+    sysv4)
+      case $host_vendor in
+        sni)
+          hardcode_direct=yes # is this really true???
+          ;;
+        siemens)
+          hardcode_direct=no
+          ;;
+        motorola)
+          hardcode_direct=no #Motorola manual says yes, but my tests say they lie
+          ;;
+      esac
+      ;;
+    sysv4.3*)
+      ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+        ld_shlibs=yes
+      fi
+      ;;
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+      ;;
+    sysv5* | sco3.2v5* | sco5v6*)
+      hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+      hardcode_libdir_separator=':'
+      ;;
+    uts4*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      ;;
+    *)
+      ld_shlibs=no
+      ;;
+  esac
+fi
+
+# Check dynamic linker characteristics
+# Code taken from libtool.m4's _LT_SYS_DYNAMIC_LINKER.
+# Unlike libtool.m4, here we don't care about _all_ names of the library, but
+# only about the one the linker finds when passed -lNAME. This is the last
+# element of library_names_spec in libtool.m4, or possibly two of them if the
+# linker has special search rules.
+library_names_spec=      # the last element of library_names_spec in libtool.m4
+libname_spec='lib$name'
+case "$host_os" in
+  aix3*)
+    library_names_spec='$libname.a'
+    ;;
+  aix[4-9]*)
+    library_names_spec='$libname$shrext'
+    ;;
+  amigaos*)
+    case "$host_cpu" in
+      powerpc*)
+        library_names_spec='$libname$shrext' ;;
+      m68k)
+        library_names_spec='$libname.a' ;;
+    esac
+    ;;
+  beos*)
+    library_names_spec='$libname$shrext'
+    ;;
+  bsdi[45]*)
+    library_names_spec='$libname$shrext'
+    ;;
+  cygwin* | mingw* | pw32* | cegcc*)
+    shrext=.dll
+    library_names_spec='$libname.dll.a $libname.lib'
+    ;;
+  darwin* | rhapsody*)
+    shrext=.dylib
+    library_names_spec='$libname$shrext'
+    ;;
+  dgux*)
+    library_names_spec='$libname$shrext'
+    ;;
+  freebsd[23].*)
+    library_names_spec='$libname$shrext$versuffix'
+    ;;
+  freebsd* | dragonfly*)
+    library_names_spec='$libname$shrext'
+    ;;
+  gnu*)
+    library_names_spec='$libname$shrext'
+    ;;
+  haiku*)
+    library_names_spec='$libname$shrext'
+    ;;
+  hpux9* | hpux10* | hpux11*)
+    case $host_cpu in
+      ia64*)
+        shrext=.so
+        ;;
+      hppa*64*)
+        shrext=.sl
+        ;;
+      *)
+        shrext=.sl
+        ;;
+    esac
+    library_names_spec='$libname$shrext'
+    ;;
+  interix[3-9]*)
+    library_names_spec='$libname$shrext'
+    ;;
+  irix5* | irix6* | nonstopux*)
+    library_names_spec='$libname$shrext'
+    case "$host_os" in
+      irix5* | nonstopux*)
+        libsuff= shlibsuff=
+        ;;
+      *)
+        case $LD in
+          *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") libsuff= shlibsuff= ;;
+          *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") libsuff=32 shlibsuff=N32 ;;
+          *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") libsuff=64 shlibsuff=64 ;;
+          *) libsuff= shlibsuff= ;;
+        esac
+        ;;
+    esac
+    ;;
+  linux*oldld* | linux*aout* | linux*coff*)
+    ;;
+  linux* | k*bsd*-gnu | kopensolaris*-gnu)
+    library_names_spec='$libname$shrext'
+    ;;
+  knetbsd*-gnu)
+    library_names_spec='$libname$shrext'
+    ;;
+  netbsd*)
+    library_names_spec='$libname$shrext'
+    ;;
+  newsos6)
+    library_names_spec='$libname$shrext'
+    ;;
+  *nto* | *qnx*)
+    library_names_spec='$libname$shrext'
+    ;;
+  openbsd*)
+    library_names_spec='$libname$shrext$versuffix'
+    ;;
+  os2*)
+    libname_spec='$name'
+    shrext=.dll
+    library_names_spec='$libname.a'
+    ;;
+  osf3* | osf4* | osf5*)
+    library_names_spec='$libname$shrext'
+    ;;
+  rdos*)
+    ;;
+  solaris*)
+    library_names_spec='$libname$shrext'
+    ;;
+  sunos4*)
+    library_names_spec='$libname$shrext$versuffix'
+    ;;
+  sysv4 | sysv4.3*)
+    library_names_spec='$libname$shrext'
+    ;;
+  sysv4*MP*)
+    library_names_spec='$libname$shrext'
+    ;;
+  sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+    library_names_spec='$libname$shrext'
+    ;;
+  tpf*)
+    library_names_spec='$libname$shrext'
+    ;;
+  uts4*)
+    library_names_spec='$libname$shrext'
+    ;;
+esac
+
+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
+escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"`
+shlibext=`echo "$shrext" | sed -e 's,^\.,,'`
+escaped_libname_spec=`echo "X$libname_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
+escaped_library_names_spec=`echo "X$library_names_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
+escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
+
+LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF
+
+# How to pass a linker flag through the compiler.
+wl="$escaped_wl"
+
+# Static library suffix (normally "a").
+libext="$libext"
+
+# Shared library suffix (normally "so").
+shlibext="$shlibext"
+
+# Format of library name prefix.
+libname_spec="$escaped_libname_spec"
+
+# Library names that the linker finds when passed -lNAME.
+library_names_spec="$escaped_library_names_spec"
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec="$escaped_hardcode_libdir_flag_spec"
+
+# Whether we need a single -rpath flag with a separated argument.
+hardcode_libdir_separator="$hardcode_libdir_separator"
+
+# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
+# resulting binary.
+hardcode_direct="$hardcode_direct"
+
+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+# resulting binary.
+hardcode_minus_L="$hardcode_minus_L"
+
+EOF
diff --git a/conf/config.sub b/conf/config.sub
new file mode 100755
index 0000000..8b612ab
--- /dev/null
+++ b/conf/config.sub
@@ -0,0 +1,1788 @@
+#! /bin/sh
+# Configuration validation subroutine script.
+#   Copyright 1992-2013 Free Software Foundation, Inc.
+
+timestamp='2013-04-24'
+
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
+
+
+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+#
+# Configuration subroutine to validate and canonicalize a configuration type.
+# Supply the specified configuration type as an argument.
+# If it is invalid, we print an error message on stderr and exit with code 1.
+# Otherwise, we print the canonical config type on stdout and succeed.
+
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
+# This file is supposed to be the same for all GNU packages
+# and recognize all the CPU types, system types and aliases
+# that are meaningful with *any* GNU software.
+# Each package is responsible for reporting which valid configurations
+# it does not support.  The user should be able to distinguish
+# a failure to support a valid configuration from a meaningless
+# configuration.
+
+# The goal of this file is to map all the various variations of a given
+# machine specification into a single specification in the form:
+#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or in some cases, the newer four-part form:
+#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# It is wrong to echo any other type of specification.
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION] CPU-MFR-OPSYS
+       $0 [OPTION] ALIAS
+
+Canonicalize a configuration name.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.sub ($timestamp)
+
+Copyright 1992-2013 Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit ;;
+    --version | -v )
+       echo "$version" ; exit ;;
+    --help | --h* | -h )
+       echo "$usage"; exit ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help"
+       exit 1 ;;
+
+    *local*)
+       # First pass through any local machine types.
+       echo $1
+       exit ;;
+
+    * )
+       break ;;
+  esac
+done
+
+case $# in
+ 0) echo "$me: missing argument$help" >&2
+    exit 1;;
+ 1) ;;
+ *) echo "$me: too many arguments$help" >&2
+    exit 1;;
+esac
+
+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+# Here we must recognize all the valid KERNEL-OS combinations.
+maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+case $maybe_os in
+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | \
+  kopensolaris*-gnu* | \
+  storm-chaos* | os2-emx* | rtmk-nova*)
+    os=-$maybe_os
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+    ;;
+  android-linux)
+    os=-linux-android
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+    ;;
+  *)
+    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+    if [ $basic_machine != $1 ]
+    then os=`echo $1 | sed 's/.*-/-/'`
+    else os=; fi
+    ;;
+esac
+
+### Let's recognize common machines as not being operating systems so
+### that things like config.sub decstation-3100 work.  We also
+### recognize some manufacturers as not being operating systems, so we
+### can provide default operating systems below.
+case $os in
+	-sun*os*)
+		# Prevent following clause from handling this invalid input.
+		;;
+	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
+	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
+	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
+	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+	-apple | -axis | -knuth | -cray | -microblaze*)
+		os=
+		basic_machine=$1
+		;;
+	-bluegene*)
+		os=-cnk
+		;;
+	-sim | -cisco | -oki | -wec | -winbond)
+		os=
+		basic_machine=$1
+		;;
+	-scout)
+		;;
+	-wrs)
+		os=-vxworks
+		basic_machine=$1
+		;;
+	-chorusos*)
+		os=-chorusos
+		basic_machine=$1
+		;;
+	-chorusrdb)
+		os=-chorusrdb
+		basic_machine=$1
+		;;
+	-hiux*)
+		os=-hiuxwe2
+		;;
+	-sco6)
+		os=-sco5v6
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco5)
+		os=-sco3.2v5
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco4)
+		os=-sco3.2v4
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2.[4-9]*)
+		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2v[4-9]*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco5v6*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco*)
+		os=-sco3.2v2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-udk*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-isc)
+		os=-isc2.2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-clix*)
+		basic_machine=clipper-intergraph
+		;;
+	-isc*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-lynx*178)
+		os=-lynxos178
+		;;
+	-lynx*5)
+		os=-lynxos5
+		;;
+	-lynx*)
+		os=-lynxos
+		;;
+	-ptx*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
+		;;
+	-windowsnt*)
+		os=`echo $os | sed -e 's/windowsnt/winnt/'`
+		;;
+	-psos*)
+		os=-psos
+		;;
+	-mint | -mint[0-9]*)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
+esac
+
+# Decode aliases for certain CPU-COMPANY combinations.
+case $basic_machine in
+	# Recognize the basic CPU types without company name.
+	# Some are omitted here because they have special meanings below.
+	1750a | 580 \
+	| a29k \
+	| aarch64 | aarch64_be \
+	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+	| am33_2.0 \
+	| arc | arceb \
+	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
+	| avr | avr32 \
+	| be32 | be64 \
+	| bfin \
+	| c4x | clipper \
+	| d10v | d30v | dlx | dsp16xx \
+	| epiphany \
+	| fido | fr30 | frv \
+	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+	| hexagon \
+	| i370 | i860 | i960 | ia64 \
+	| ip2k | iq2000 \
+	| le32 | le64 \
+	| lm32 \
+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
+	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
+	| mips | mipsbe | mipseb | mipsel | mipsle \
+	| mips16 \
+	| mips64 | mips64el \
+	| mips64octeon | mips64octeonel \
+	| mips64orion | mips64orionel \
+	| mips64r5900 | mips64r5900el \
+	| mips64vr | mips64vrel \
+	| mips64vr4100 | mips64vr4100el \
+	| mips64vr4300 | mips64vr4300el \
+	| mips64vr5000 | mips64vr5000el \
+	| mips64vr5900 | mips64vr5900el \
+	| mipsisa32 | mipsisa32el \
+	| mipsisa32r2 | mipsisa32r2el \
+	| mipsisa64 | mipsisa64el \
+	| mipsisa64r2 | mipsisa64r2el \
+	| mipsisa64sb1 | mipsisa64sb1el \
+	| mipsisa64sr71k | mipsisa64sr71kel \
+	| mipsr5900 | mipsr5900el \
+	| mipstx39 | mipstx39el \
+	| mn10200 | mn10300 \
+	| moxie \
+	| mt \
+	| msp430 \
+	| nds32 | nds32le | nds32be \
+	| nios | nios2 | nios2eb | nios2el \
+	| ns16k | ns32k \
+	| open8 \
+	| or1k | or32 \
+	| pdp10 | pdp11 | pj | pjl \
+	| powerpc | powerpc64 | powerpc64le | powerpcle \
+	| pyramid \
+	| rl78 | rx \
+	| score \
+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+	| sh64 | sh64le \
+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+	| spu \
+	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
+	| ubicom32 \
+	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
+	| we32k \
+	| x86 | xc16x | xstormy16 | xtensa \
+	| z8k | z80)
+		basic_machine=$basic_machine-unknown
+		;;
+	c54x)
+		basic_machine=tic54x-unknown
+		;;
+	c55x)
+		basic_machine=tic55x-unknown
+		;;
+	c6x)
+		basic_machine=tic6x-unknown
+		;;
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+		;;
+	ms1)
+		basic_machine=mt-unknown
+		;;
+
+	strongarm | thumb | xscale)
+		basic_machine=arm-unknown
+		;;
+	xgate)
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
+	xscaleeb)
+		basic_machine=armeb-unknown
+		;;
+
+	xscaleel)
+		basic_machine=armel-unknown
+		;;
+
+	# We use `pc' rather than `unknown'
+	# because (1) that's what they normally are, and
+	# (2) the word "unknown" tends to confuse beginning users.
+	i*86 | x86_64)
+	  basic_machine=$basic_machine-pc
+	  ;;
+	# Object if more than one company name word.
+	*-*-*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+	# Recognize the basic CPU types with company name.
+	580-* \
+	| a29k-* \
+	| aarch64-* | aarch64_be-* \
+	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+	| avr-* | avr32-* \
+	| be32-* | be64-* \
+	| bfin-* | bs2000-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* \
+	| clipper-* | craynv-* | cydra-* \
+	| d10v-* | d30v-* | dlx-* \
+	| elxsi-* \
+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+	| h8300-* | h8500-* \
+	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+	| hexagon-* \
+	| i*86-* | i860-* | i960-* | ia64-* \
+	| ip2k-* | iq2000-* \
+	| le32-* | le64-* \
+	| lm32-* \
+	| m32c-* | m32r-* | m32rle-* \
+	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+	| microblaze-* | microblazeel-* \
+	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+	| mips16-* \
+	| mips64-* | mips64el-* \
+	| mips64octeon-* | mips64octeonel-* \
+	| mips64orion-* | mips64orionel-* \
+	| mips64r5900-* | mips64r5900el-* \
+	| mips64vr-* | mips64vrel-* \
+	| mips64vr4100-* | mips64vr4100el-* \
+	| mips64vr4300-* | mips64vr4300el-* \
+	| mips64vr5000-* | mips64vr5000el-* \
+	| mips64vr5900-* | mips64vr5900el-* \
+	| mipsisa32-* | mipsisa32el-* \
+	| mipsisa32r2-* | mipsisa32r2el-* \
+	| mipsisa64-* | mipsisa64el-* \
+	| mipsisa64r2-* | mipsisa64r2el-* \
+	| mipsisa64sb1-* | mipsisa64sb1el-* \
+	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+	| mipsr5900-* | mipsr5900el-* \
+	| mipstx39-* | mipstx39el-* \
+	| mmix-* \
+	| mt-* \
+	| msp430-* \
+	| nds32-* | nds32le-* | nds32be-* \
+	| nios-* | nios2-* | nios2eb-* | nios2el-* \
+	| none-* | np1-* | ns16k-* | ns32k-* \
+	| open8-* \
+	| orion-* \
+	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+	| pyramid-* \
+	| rl78-* | romp-* | rs6000-* | rx-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+	| sparclite-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+	| tahoe-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tile*-* \
+	| tron-* \
+	| ubicom32-* \
+	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+	| vax-* \
+	| we32k-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* \
+	| xstormy16-* | xtensa*-* \
+	| ymp-* \
+	| z8k-* | z80-*)
+		;;
+	# Recognize the basic CPU types without company name, with glob match.
+	xtensa*)
+		basic_machine=$basic_machine-unknown
+		;;
+	# Recognize the various machine names and aliases which stand
+	# for a CPU type and a company and sometimes even an OS.
+	386bsd)
+		basic_machine=i386-unknown
+		os=-bsd
+		;;
+	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+		basic_machine=m68000-att
+		;;
+	3b*)
+		basic_machine=we32k-att
+		;;
+	a29khif)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	abacus)
+		basic_machine=abacus-unknown
+		;;
+	adobe68k)
+		basic_machine=m68010-adobe
+		os=-scout
+		;;
+	alliant | fx80)
+		basic_machine=fx80-alliant
+		;;
+	altos | altos3068)
+		basic_machine=m68k-altos
+		;;
+	am29k)
+		basic_machine=a29k-none
+		os=-bsd
+		;;
+	amd64)
+		basic_machine=x86_64-pc
+		;;
+	amd64-*)
+		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	amdahl)
+		basic_machine=580-amdahl
+		os=-sysv
+		;;
+	amiga | amiga-*)
+		basic_machine=m68k-unknown
+		;;
+	amigaos | amigados)
+		basic_machine=m68k-unknown
+		os=-amigaos
+		;;
+	amigaunix | amix)
+		basic_machine=m68k-unknown
+		os=-sysv4
+		;;
+	apollo68)
+		basic_machine=m68k-apollo
+		os=-sysv
+		;;
+	apollo68bsd)
+		basic_machine=m68k-apollo
+		os=-bsd
+		;;
+	aros)
+		basic_machine=i386-pc
+		os=-aros
+		;;
+	aux)
+		basic_machine=m68k-apple
+		os=-aux
+		;;
+	balance)
+		basic_machine=ns32k-sequent
+		os=-dynix
+		;;
+	blackfin)
+		basic_machine=bfin-unknown
+		os=-linux
+		;;
+	blackfin-*)
+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	bluegene*)
+		basic_machine=powerpc-ibm
+		os=-cnk
+		;;
+	c54x-*)
+		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c55x-*)
+		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c6x-*)
+		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c90)
+		basic_machine=c90-cray
+		os=-unicos
+		;;
+	cegcc)
+		basic_machine=arm-unknown
+		os=-cegcc
+		;;
+	convex-c1)
+		basic_machine=c1-convex
+		os=-bsd
+		;;
+	convex-c2)
+		basic_machine=c2-convex
+		os=-bsd
+		;;
+	convex-c32)
+		basic_machine=c32-convex
+		os=-bsd
+		;;
+	convex-c34)
+		basic_machine=c34-convex
+		os=-bsd
+		;;
+	convex-c38)
+		basic_machine=c38-convex
+		os=-bsd
+		;;
+	cray | j90)
+		basic_machine=j90-cray
+		os=-unicos
+		;;
+	craynv)
+		basic_machine=craynv-cray
+		os=-unicosmp
+		;;
+	cr16 | cr16-*)
+		basic_machine=cr16-unknown
+		os=-elf
+		;;
+	crds | unos)
+		basic_machine=m68k-crds
+		;;
+	crisv32 | crisv32-* | etraxfs*)
+		basic_machine=crisv32-axis
+		;;
+	cris | cris-* | etrax*)
+		basic_machine=cris-axis
+		;;
+	crx)
+		basic_machine=crx-unknown
+		os=-elf
+		;;
+	da30 | da30-*)
+		basic_machine=m68k-da30
+		;;
+	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
+		basic_machine=mips-dec
+		;;
+	decsystem10* | dec10*)
+		basic_machine=pdp10-dec
+		os=-tops10
+		;;
+	decsystem20* | dec20*)
+		basic_machine=pdp10-dec
+		os=-tops20
+		;;
+	delta | 3300 | motorola-3300 | motorola-delta \
+	      | 3300-motorola | delta-motorola)
+		basic_machine=m68k-motorola
+		;;
+	delta88)
+		basic_machine=m88k-motorola
+		os=-sysv3
+		;;
+	dicos)
+		basic_machine=i686-pc
+		os=-dicos
+		;;
+	djgpp)
+		basic_machine=i586-pc
+		os=-msdosdjgpp
+		;;
+	dpx20 | dpx20-*)
+		basic_machine=rs6000-bull
+		os=-bosx
+		;;
+	dpx2* | dpx2*-bull)
+		basic_machine=m68k-bull
+		os=-sysv3
+		;;
+	ebmon29k)
+		basic_machine=a29k-amd
+		os=-ebmon
+		;;
+	elxsi)
+		basic_machine=elxsi-elxsi
+		os=-bsd
+		;;
+	encore | umax | mmax)
+		basic_machine=ns32k-encore
+		;;
+	es1800 | OSE68k | ose68k | ose | OSE)
+		basic_machine=m68k-ericsson
+		os=-ose
+		;;
+	fx2800)
+		basic_machine=i860-alliant
+		;;
+	genix)
+		basic_machine=ns32k-ns
+		;;
+	gmicro)
+		basic_machine=tron-gmicro
+		os=-sysv
+		;;
+	go32)
+		basic_machine=i386-pc
+		os=-go32
+		;;
+	h3050r* | hiux*)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	h8300hms)
+		basic_machine=h8300-hitachi
+		os=-hms
+		;;
+	h8300xray)
+		basic_machine=h8300-hitachi
+		os=-xray
+		;;
+	h8500hms)
+		basic_machine=h8500-hitachi
+		os=-hms
+		;;
+	harris)
+		basic_machine=m88k-harris
+		os=-sysv3
+		;;
+	hp300-*)
+		basic_machine=m68k-hp
+		;;
+	hp300bsd)
+		basic_machine=m68k-hp
+		os=-bsd
+		;;
+	hp300hpux)
+		basic_machine=m68k-hp
+		os=-hpux
+		;;
+	hp3k9[0-9][0-9] | hp9[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hp9k2[0-9][0-9] | hp9k31[0-9])
+		basic_machine=m68000-hp
+		;;
+	hp9k3[2-9][0-9])
+		basic_machine=m68k-hp
+		;;
+	hp9k6[0-9][0-9] | hp6[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hp9k7[0-79][0-9] | hp7[0-79][0-9])
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k78[0-9] | hp78[0-9])
+		# FIXME: really hppa2.0-hp
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
+		# FIXME: really hppa2.0-hp
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][13679] | hp8[0-9][13679])
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][0-9] | hp8[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hppa-next)
+		os=-nextstep3
+		;;
+	hppaosf)
+		basic_machine=hppa1.1-hp
+		os=-osf
+		;;
+	hppro)
+		basic_machine=hppa1.1-hp
+		os=-proelf
+		;;
+	i370-ibm* | ibm*)
+		basic_machine=i370-ibm
+		;;
+	i*86v32)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv32
+		;;
+	i*86v4*)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv4
+		;;
+	i*86v)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv
+		;;
+	i*86sol2)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-solaris2
+		;;
+	i386mach)
+		basic_machine=i386-mach
+		os=-mach
+		;;
+	i386-vsta | vsta)
+		basic_machine=i386-unknown
+		os=-vsta
+		;;
+	iris | iris4d)
+		basic_machine=mips-sgi
+		case $os in
+		    -irix*)
+			;;
+		    *)
+			os=-irix4
+			;;
+		esac
+		;;
+	isi68 | isi)
+		basic_machine=m68k-isi
+		os=-sysv
+		;;
+	m68knommu)
+		basic_machine=m68k-unknown
+		os=-linux
+		;;
+	m68knommu-*)
+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	m88k-omron*)
+		basic_machine=m88k-omron
+		;;
+	magnum | m3230)
+		basic_machine=mips-mips
+		os=-sysv
+		;;
+	merlin)
+		basic_machine=ns32k-utek
+		os=-sysv
+		;;
+	microblaze*)
+		basic_machine=microblaze-xilinx
+		;;
+	mingw64)
+		basic_machine=x86_64-pc
+		os=-mingw64
+		;;
+	mingw32)
+		basic_machine=i386-pc
+		os=-mingw32
+		;;
+	mingw32ce)
+		basic_machine=arm-unknown
+		os=-mingw32ce
+		;;
+	miniframe)
+		basic_machine=m68000-convergent
+		;;
+	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
+	mips3*-*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+		;;
+	mips3*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+		;;
+	monitor)
+		basic_machine=m68k-rom68k
+		os=-coff
+		;;
+	morphos)
+		basic_machine=powerpc-unknown
+		os=-morphos
+		;;
+	msdos)
+		basic_machine=i386-pc
+		os=-msdos
+		;;
+	ms1-*)
+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+		;;
+	msys)
+		basic_machine=i386-pc
+		os=-msys
+		;;
+	mvs)
+		basic_machine=i370-ibm
+		os=-mvs
+		;;
+	nacl)
+		basic_machine=le32-unknown
+		os=-nacl
+		;;
+	ncr3000)
+		basic_machine=i486-ncr
+		os=-sysv4
+		;;
+	netbsd386)
+		basic_machine=i386-unknown
+		os=-netbsd
+		;;
+	netwinder)
+		basic_machine=armv4l-rebel
+		os=-linux
+		;;
+	news | news700 | news800 | news900)
+		basic_machine=m68k-sony
+		os=-newsos
+		;;
+	news1000)
+		basic_machine=m68030-sony
+		os=-newsos
+		;;
+	news-3600 | risc-news)
+		basic_machine=mips-sony
+		os=-newsos
+		;;
+	necv70)
+		basic_machine=v70-nec
+		os=-sysv
+		;;
+	next | m*-next )
+		basic_machine=m68k-next
+		case $os in
+		    -nextstep* )
+			;;
+		    -ns2*)
+		      os=-nextstep2
+			;;
+		    *)
+		      os=-nextstep3
+			;;
+		esac
+		;;
+	nh3000)
+		basic_machine=m68k-harris
+		os=-cxux
+		;;
+	nh[45]000)
+		basic_machine=m88k-harris
+		os=-cxux
+		;;
+	nindy960)
+		basic_machine=i960-intel
+		os=-nindy
+		;;
+	mon960)
+		basic_machine=i960-intel
+		os=-mon960
+		;;
+	nonstopux)
+		basic_machine=mips-compaq
+		os=-nonstopux
+		;;
+	np1)
+		basic_machine=np1-gould
+		;;
+	neo-tandem)
+		basic_machine=neo-tandem
+		;;
+	nse-tandem)
+		basic_machine=nse-tandem
+		;;
+	nsr-tandem)
+		basic_machine=nsr-tandem
+		;;
+	op50n-* | op60c-*)
+		basic_machine=hppa1.1-oki
+		os=-proelf
+		;;
+	openrisc | openrisc-*)
+		basic_machine=or32-unknown
+		;;
+	os400)
+		basic_machine=powerpc-ibm
+		os=-os400
+		;;
+	OSE68000 | ose68000)
+		basic_machine=m68000-ericsson
+		os=-ose
+		;;
+	os68k)
+		basic_machine=m68k-none
+		os=-os68k
+		;;
+	pa-hitachi)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	paragon)
+		basic_machine=i860-intel
+		os=-osf
+		;;
+	parisc)
+		basic_machine=hppa-unknown
+		os=-linux
+		;;
+	parisc-*)
+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	pbd)
+		basic_machine=sparc-tti
+		;;
+	pbb)
+		basic_machine=m68k-tti
+		;;
+	pc532 | pc532-*)
+		basic_machine=ns32k-pc532
+		;;
+	pc98)
+		basic_machine=i386-pc
+		;;
+	pc98-*)
+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentium | p5 | k5 | k6 | nexgen | viac3)
+		basic_machine=i586-pc
+		;;
+	pentiumpro | p6 | 6x86 | athlon | athlon_*)
+		basic_machine=i686-pc
+		;;
+	pentiumii | pentium2 | pentiumiii | pentium3)
+		basic_machine=i686-pc
+		;;
+	pentium4)
+		basic_machine=i786-pc
+		;;
+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumpro-* | p6-* | 6x86-* | athlon-*)
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentium4-*)
+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pn)
+		basic_machine=pn-gould
+		;;
+	power)	basic_machine=power-ibm
+		;;
+	ppc | ppcbe)	basic_machine=powerpc-unknown
+		;;
+	ppc-* | ppcbe-*)
+		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppcle | powerpclittle | ppc-le | powerpc-little)
+		basic_machine=powerpcle-unknown
+		;;
+	ppcle-* | powerpclittle-*)
+		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppc64)	basic_machine=powerpc64-unknown
+		;;
+	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+		basic_machine=powerpc64le-unknown
+		;;
+	ppc64le-* | powerpc64little-*)
+		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ps2)
+		basic_machine=i386-ibm
+		;;
+	pw32)
+		basic_machine=i586-unknown
+		os=-pw32
+		;;
+	rdos | rdos64)
+		basic_machine=x86_64-pc
+		os=-rdos
+		;;
+	rdos32)
+		basic_machine=i386-pc
+		os=-rdos
+		;;
+	rom68k)
+		basic_machine=m68k-rom68k
+		os=-coff
+		;;
+	rm[46]00)
+		basic_machine=mips-siemens
+		;;
+	rtpc | rtpc-*)
+		basic_machine=romp-ibm
+		;;
+	s390 | s390-*)
+		basic_machine=s390-ibm
+		;;
+	s390x | s390x-*)
+		basic_machine=s390x-ibm
+		;;
+	sa29200)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	sb1)
+		basic_machine=mipsisa64sb1-unknown
+		;;
+	sb1el)
+		basic_machine=mipsisa64sb1el-unknown
+		;;
+	sde)
+		basic_machine=mipsisa32-sde
+		os=-elf
+		;;
+	sei)
+		basic_machine=mips-sei
+		os=-seiux
+		;;
+	sequent)
+		basic_machine=i386-sequent
+		;;
+	sh)
+		basic_machine=sh-hitachi
+		os=-hms
+		;;
+	sh5el)
+		basic_machine=sh5le-unknown
+		;;
+	sh64)
+		basic_machine=sh64-unknown
+		;;
+	sparclite-wrs | simso-wrs)
+		basic_machine=sparclite-wrs
+		os=-vxworks
+		;;
+	sps7)
+		basic_machine=m68k-bull
+		os=-sysv2
+		;;
+	spur)
+		basic_machine=spur-unknown
+		;;
+	st2000)
+		basic_machine=m68k-tandem
+		;;
+	stratus)
+		basic_machine=i860-stratus
+		os=-sysv4
+		;;
+	strongarm-* | thumb-*)
+		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	sun2)
+		basic_machine=m68000-sun
+		;;
+	sun2os3)
+		basic_machine=m68000-sun
+		os=-sunos3
+		;;
+	sun2os4)
+		basic_machine=m68000-sun
+		os=-sunos4
+		;;
+	sun3os3)
+		basic_machine=m68k-sun
+		os=-sunos3
+		;;
+	sun3os4)
+		basic_machine=m68k-sun
+		os=-sunos4
+		;;
+	sun4os3)
+		basic_machine=sparc-sun
+		os=-sunos3
+		;;
+	sun4os4)
+		basic_machine=sparc-sun
+		os=-sunos4
+		;;
+	sun4sol2)
+		basic_machine=sparc-sun
+		os=-solaris2
+		;;
+	sun3 | sun3-*)
+		basic_machine=m68k-sun
+		;;
+	sun4)
+		basic_machine=sparc-sun
+		;;
+	sun386 | sun386i | roadrunner)
+		basic_machine=i386-sun
+		;;
+	sv1)
+		basic_machine=sv1-cray
+		os=-unicos
+		;;
+	symmetry)
+		basic_machine=i386-sequent
+		os=-dynix
+		;;
+	t3e)
+		basic_machine=alphaev5-cray
+		os=-unicos
+		;;
+	t90)
+		basic_machine=t90-cray
+		os=-unicos
+		;;
+	tile*)
+		basic_machine=$basic_machine-unknown
+		os=-linux-gnu
+		;;
+	tx39)
+		basic_machine=mipstx39-unknown
+		;;
+	tx39el)
+		basic_machine=mipstx39el-unknown
+		;;
+	toad1)
+		basic_machine=pdp10-xkl
+		os=-tops20
+		;;
+	tower | tower-32)
+		basic_machine=m68k-ncr
+		;;
+	tpf)
+		basic_machine=s390x-ibm
+		os=-tpf
+		;;
+	udi29k)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	ultra3)
+		basic_machine=a29k-nyu
+		os=-sym1
+		;;
+	v810 | necv810)
+		basic_machine=v810-nec
+		os=-none
+		;;
+	vaxv)
+		basic_machine=vax-dec
+		os=-sysv
+		;;
+	vms)
+		basic_machine=vax-dec
+		os=-vms
+		;;
+	vpp*|vx|vx-*)
+		basic_machine=f301-fujitsu
+		;;
+	vxworks960)
+		basic_machine=i960-wrs
+		os=-vxworks
+		;;
+	vxworks68)
+		basic_machine=m68k-wrs
+		os=-vxworks
+		;;
+	vxworks29k)
+		basic_machine=a29k-wrs
+		os=-vxworks
+		;;
+	w65*)
+		basic_machine=w65-wdc
+		os=-none
+		;;
+	w89k-*)
+		basic_machine=hppa1.1-winbond
+		os=-proelf
+		;;
+	xbox)
+		basic_machine=i686-pc
+		os=-mingw32
+		;;
+	xps | xps100)
+		basic_machine=xps100-honeywell
+		;;
+	xscale-* | xscalee[bl]-*)
+		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+		;;
+	ymp)
+		basic_machine=ymp-cray
+		os=-unicos
+		;;
+	z8k-*-coff)
+		basic_machine=z8k-unknown
+		os=-sim
+		;;
+	z80-*-coff)
+		basic_machine=z80-unknown
+		os=-sim
+		;;
+	none)
+		basic_machine=none-none
+		os=-none
+		;;
+
+# Here we handle the default manufacturer of certain CPU types.  It is in
+# some cases the only manufacturer, in others, it is the most popular.
+	w89k)
+		basic_machine=hppa1.1-winbond
+		;;
+	op50n)
+		basic_machine=hppa1.1-oki
+		;;
+	op60c)
+		basic_machine=hppa1.1-oki
+		;;
+	romp)
+		basic_machine=romp-ibm
+		;;
+	mmix)
+		basic_machine=mmix-knuth
+		;;
+	rs6000)
+		basic_machine=rs6000-ibm
+		;;
+	vax)
+		basic_machine=vax-dec
+		;;
+	pdp10)
+		# there are many clones, so DEC is not a safe bet
+		basic_machine=pdp10-unknown
+		;;
+	pdp11)
+		basic_machine=pdp11-dec
+		;;
+	we32k)
+		basic_machine=we32k-att
+		;;
+	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
+		basic_machine=sh-unknown
+		;;
+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
+		basic_machine=sparc-sun
+		;;
+	cydra)
+		basic_machine=cydra-cydrome
+		;;
+	orion)
+		basic_machine=orion-highlevel
+		;;
+	orion105)
+		basic_machine=clipper-highlevel
+		;;
+	mac | mpw | mac-mpw)
+		basic_machine=m68k-apple
+		;;
+	pmac | pmac-mpw)
+		basic_machine=powerpc-apple
+		;;
+	*-unknown)
+		# Make sure to match an already-canonicalized machine name.
+		;;
+	*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+esac
+
+# Here we canonicalize certain aliases for manufacturers.
+case $basic_machine in
+	*-digital*)
+		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
+		;;
+	*-commodore*)
+		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
+		;;
+	*)
+		;;
+esac
+
+# Decode manufacturer-specific aliases for certain operating systems.
+
+if [ x"$os" != x"" ]
+then
+case $os in
+	# First match some system type aliases
+	# that might get confused with valid system types.
+	# -solaris* is a basic system type, with this one exception.
+	-auroraux)
+		os=-auroraux
+		;;
+	-solaris1 | -solaris1.*)
+		os=`echo $os | sed -e 's|solaris1|sunos4|'`
+		;;
+	-solaris)
+		os=-solaris2
+		;;
+	-svr4*)
+		os=-sysv4
+		;;
+	-unixware*)
+		os=-sysv4.2uw
+		;;
+	-gnu/linux*)
+		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
+		;;
+	# First accept the basic system types.
+	# The portable systems comes first.
+	# Each alternative MUST END IN A *, to match a version number.
+	# -sysv* is not here because it comes later, after sysvr4.
+	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+	      | -sym* | -kopensolaris* | -plan9* \
+	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+	      | -aos* | -aros* \
+	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+	      | -bitrig* | -openbsd* | -solidbsd* \
+	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+	      | -chorusos* | -chorusrdb* | -cegcc* \
+	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
+	      | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+	# Remember, each alternative MUST END IN *, to match a version number.
+		;;
+	-qnx*)
+		case $basic_machine in
+		    x86-* | i*86-*)
+			;;
+		    *)
+			os=-nto$os
+			;;
+		esac
+		;;
+	-nto-qnx*)
+		;;
+	-nto*)
+		os=`echo $os | sed -e 's|nto|nto-qnx|'`
+		;;
+	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
+	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+		;;
+	-mac*)
+		os=`echo $os | sed -e 's|mac|macos|'`
+		;;
+	-linux-dietlibc)
+		os=-linux-dietlibc
+		;;
+	-linux*)
+		os=`echo $os | sed -e 's|linux|linux-gnu|'`
+		;;
+	-sunos5*)
+		os=`echo $os | sed -e 's|sunos5|solaris2|'`
+		;;
+	-sunos6*)
+		os=`echo $os | sed -e 's|sunos6|solaris3|'`
+		;;
+	-opened*)
+		os=-openedition
+		;;
+	-os400*)
+		os=-os400
+		;;
+	-wince*)
+		os=-wince
+		;;
+	-osfrose*)
+		os=-osfrose
+		;;
+	-osf*)
+		os=-osf
+		;;
+	-utek*)
+		os=-bsd
+		;;
+	-dynix*)
+		os=-bsd
+		;;
+	-acis*)
+		os=-aos
+		;;
+	-atheos*)
+		os=-atheos
+		;;
+	-syllable*)
+		os=-syllable
+		;;
+	-386bsd)
+		os=-bsd
+		;;
+	-ctix* | -uts*)
+		os=-sysv
+		;;
+	-nova*)
+		os=-rtmk-nova
+		;;
+	-ns2 )
+		os=-nextstep2
+		;;
+	-nsk*)
+		os=-nsk
+		;;
+	# Preserve the version number of sinix5.
+	-sinix5.*)
+		os=`echo $os | sed -e 's|sinix|sysv|'`
+		;;
+	-sinix*)
+		os=-sysv4
+		;;
+	-tpf*)
+		os=-tpf
+		;;
+	-triton*)
+		os=-sysv3
+		;;
+	-oss*)
+		os=-sysv3
+		;;
+	-svr4)
+		os=-sysv4
+		;;
+	-svr3)
+		os=-sysv3
+		;;
+	-sysvr4)
+		os=-sysv4
+		;;
+	# This must come after -sysvr4.
+	-sysv*)
+		;;
+	-ose*)
+		os=-ose
+		;;
+	-es1800*)
+		os=-ose
+		;;
+	-xenix)
+		os=-xenix
+		;;
+	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+		os=-mint
+		;;
+	-aros*)
+		os=-aros
+		;;
+	-zvmoe)
+		os=-zvmoe
+		;;
+	-dicos*)
+		os=-dicos
+		;;
+	-nacl*)
+		;;
+	-none)
+		;;
+	*)
+		# Get rid of the `-' at the beginning of $os.
+		os=`echo $os | sed 's/[^-]*-//'`
+		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
+		exit 1
+		;;
+esac
+else
+
+# Here we handle the default operating systems that come with various machines.
+# The value should be what the vendor currently ships out the door with their
+# machine or put another way, the most popular os provided with the machine.
+
+# Note that if you're going to try to match "-MANUFACTURER" here (say,
+# "-sun"), then you have to tell the case statement up towards the top
+# that MANUFACTURER isn't an operating system.  Otherwise, code above
+# will signal an error saying that MANUFACTURER isn't an operating
+# system, and we'll never get to this point.
+
+case $basic_machine in
+	score-*)
+		os=-elf
+		;;
+	spu-*)
+		os=-elf
+		;;
+	*-acorn)
+		os=-riscix1.2
+		;;
+	arm*-rebel)
+		os=-linux
+		;;
+	arm*-semi)
+		os=-aout
+		;;
+	c4x-* | tic4x-*)
+		os=-coff
+		;;
+	hexagon-*)
+		os=-elf
+		;;
+	tic54x-*)
+		os=-coff
+		;;
+	tic55x-*)
+		os=-coff
+		;;
+	tic6x-*)
+		os=-coff
+		;;
+	# This must come before the *-dec entry.
+	pdp10-*)
+		os=-tops20
+		;;
+	pdp11-*)
+		os=-none
+		;;
+	*-dec | vax-*)
+		os=-ultrix4.2
+		;;
+	m68*-apollo)
+		os=-domain
+		;;
+	i386-sun)
+		os=-sunos4.0.2
+		;;
+	m68000-sun)
+		os=-sunos3
+		;;
+	m68*-cisco)
+		os=-aout
+		;;
+	mep-*)
+		os=-elf
+		;;
+	mips*-cisco)
+		os=-elf
+		;;
+	mips*-*)
+		os=-elf
+		;;
+	or1k-*)
+		os=-elf
+		;;
+	or32-*)
+		os=-coff
+		;;
+	*-tti)	# must be before sparc entry or we get the wrong os.
+		os=-sysv3
+		;;
+	sparc-* | *-sun)
+		os=-sunos4.1.1
+		;;
+	*-be)
+		os=-beos
+		;;
+	*-haiku)
+		os=-haiku
+		;;
+	*-ibm)
+		os=-aix
+		;;
+	*-knuth)
+		os=-mmixware
+		;;
+	*-wec)
+		os=-proelf
+		;;
+	*-winbond)
+		os=-proelf
+		;;
+	*-oki)
+		os=-proelf
+		;;
+	*-hp)
+		os=-hpux
+		;;
+	*-hitachi)
+		os=-hiux
+		;;
+	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
+		os=-sysv
+		;;
+	*-cbm)
+		os=-amigaos
+		;;
+	*-dg)
+		os=-dgux
+		;;
+	*-dolphin)
+		os=-sysv3
+		;;
+	m68k-ccur)
+		os=-rtu
+		;;
+	m88k-omron*)
+		os=-luna
+		;;
+	*-next )
+		os=-nextstep
+		;;
+	*-sequent)
+		os=-ptx
+		;;
+	*-crds)
+		os=-unos
+		;;
+	*-ns)
+		os=-genix
+		;;
+	i370-*)
+		os=-mvs
+		;;
+	*-next)
+		os=-nextstep3
+		;;
+	*-gould)
+		os=-sysv
+		;;
+	*-highlevel)
+		os=-bsd
+		;;
+	*-encore)
+		os=-bsd
+		;;
+	*-sgi)
+		os=-irix
+		;;
+	*-siemens)
+		os=-sysv4
+		;;
+	*-masscomp)
+		os=-rtu
+		;;
+	f30[01]-fujitsu | f700-fujitsu)
+		os=-uxpv
+		;;
+	*-rom68k)
+		os=-coff
+		;;
+	*-*bug)
+		os=-coff
+		;;
+	*-apple)
+		os=-macos
+		;;
+	*-atari*)
+		os=-mint
+		;;
+	*)
+		os=-none
+		;;
+esac
+fi
+
+# Here we handle the case where we know the os, and the CPU type, but not the
+# manufacturer.  We pick the logical manufacturer.
+vendor=unknown
+case $basic_machine in
+	*-unknown)
+		case $os in
+			-riscix*)
+				vendor=acorn
+				;;
+			-sunos*)
+				vendor=sun
+				;;
+			-cnk*|-aix*)
+				vendor=ibm
+				;;
+			-beos*)
+				vendor=be
+				;;
+			-hpux*)
+				vendor=hp
+				;;
+			-mpeix*)
+				vendor=hp
+				;;
+			-hiux*)
+				vendor=hitachi
+				;;
+			-unos*)
+				vendor=crds
+				;;
+			-dgux*)
+				vendor=dg
+				;;
+			-luna*)
+				vendor=omron
+				;;
+			-genix*)
+				vendor=ns
+				;;
+			-mvs* | -opened*)
+				vendor=ibm
+				;;
+			-os400*)
+				vendor=ibm
+				;;
+			-ptx*)
+				vendor=sequent
+				;;
+			-tpf*)
+				vendor=ibm
+				;;
+			-vxsim* | -vxworks* | -windiss*)
+				vendor=wrs
+				;;
+			-aux*)
+				vendor=apple
+				;;
+			-hms*)
+				vendor=hitachi
+				;;
+			-mpw* | -macos*)
+				vendor=apple
+				;;
+			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+				vendor=atari
+				;;
+			-vos*)
+				vendor=stratus
+				;;
+		esac
+		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+		;;
+esac
+
+echo $basic_machine$os
+exit
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
diff --git a/conf/cppunit.m4 b/conf/cppunit.m4
new file mode 100644
index 0000000..41f067b
--- /dev/null
+++ b/conf/cppunit.m4
@@ -0,0 +1,92 @@
+dnl
+dnl AM_PATH_CPPUNIT(MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
+dnl
+AC_DEFUN([AM_PATH_CPPUNIT],
+[
+
+AC_ARG_WITH(cppunit-prefix,[  --with-cppunit-prefix=PFX   Prefix where CppUnit is installed (optional)],
+            cppunit_config_prefix="$withval", cppunit_config_prefix="")
+AC_ARG_WITH(cppunit-exec-prefix,[  --with-cppunit-exec-prefix=PFX  Exec prefix where CppUnit is installed (optional)],
+            cppunit_config_exec_prefix="$withval", cppunit_config_exec_prefix="")
+
+  if test x$cppunit_config_exec_prefix != x ; then
+     cppunit_config_args="$cppunit_config_args --exec-prefix=$cppunit_config_exec_prefix"
+     if test x${CPPUNIT_CONFIG+set} != xset ; then
+        CPPUNIT_CONFIG=$cppunit_config_exec_prefix/bin/cppunit-config
+     fi
+  fi
+  if test x$cppunit_config_prefix != x ; then
+     cppunit_config_args="$cppunit_config_args --prefix=$cppunit_config_prefix"
+     if test x${CPPUNIT_CONFIG+set} != xset ; then
+        CPPUNIT_CONFIG=$cppunit_config_prefix/bin/cppunit-config
+     fi
+  fi
+
+  AC_PATH_PROG(CPPUNIT_CONFIG, cppunit-config, no)
+  cppunit_version_min=$1
+
+  AC_MSG_CHECKING(for Cppunit - version >= $cppunit_version_min)
+  no_cppunit=""
+  if test "$CPPUNIT_CONFIG" = "no" ; then
+    AC_MSG_RESULT(no)
+    no_cppunit=yes
+  else
+    CPPUNIT_CFLAGS=`$CPPUNIT_CONFIG --cflags`
+    CPPUNIT_LIBS=`$CPPUNIT_CONFIG --libs`
+    cppunit_version=`$CPPUNIT_CONFIG --version`
+
+    cppunit_major_version=`echo $cppunit_version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+    cppunit_minor_version=`echo $cppunit_version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+    cppunit_micro_version=`echo $cppunit_version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+
+    cppunit_major_min=`echo $cppunit_version_min | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+    if test "x${cppunit_major_min}" = "x" ; then
+       cppunit_major_min=0
+    fi
+    
+    cppunit_minor_min=`echo $cppunit_version_min | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+    if test "x${cppunit_minor_min}" = "x" ; then
+       cppunit_minor_min=0
+    fi
+    
+    cppunit_micro_min=`echo $cppunit_version_min | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+    if test "x${cppunit_micro_min}" = "x" ; then
+       cppunit_micro_min=0
+    fi
+
+    cppunit_version_proper=`expr \
+        $cppunit_major_version \> $cppunit_major_min \| \
+        $cppunit_major_version \= $cppunit_major_min \& \
+        $cppunit_minor_version \> $cppunit_minor_min \| \
+        $cppunit_major_version \= $cppunit_major_min \& \
+        $cppunit_minor_version \= $cppunit_minor_min \& \
+        $cppunit_micro_version \>= $cppunit_micro_min `
+
+    if test "$cppunit_version_proper" = "1" ; then
+      AC_MSG_RESULT([$cppunit_major_version.$cppunit_minor_version.$cppunit_micro_version])
+    else
+      AC_MSG_RESULT(no)
+      no_cppunit=yes
+    fi
+  fi
+
+  if test "x$no_cppunit" = x ; then
+     ifelse([$2], , :, [$2])     
+  else
+     CPPUNIT_CFLAGS=""
+     CPPUNIT_LIBS=""
+     ifelse([$3], , :, [$3])
+  fi
+
+  AC_SUBST(CPPUNIT_CFLAGS)
+  AC_SUBST(CPPUNIT_LIBS)
+])
+
+
+
diff --git a/conf/depcomp b/conf/depcomp
new file mode 100755
index 0000000..4ebd5b3
--- /dev/null
+++ b/conf/depcomp
@@ -0,0 +1,791 @@
+#! /bin/sh
+# depcomp - compile a program generating dependencies as side-effects
+
+scriptversion=2013-05-30.07; # UTC
+
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
+
+case $1 in
+  '')
+    echo "$0: No command.  Try '$0 --help' for more information." 1>&2
+    exit 1;
+    ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: depcomp [--help] [--version] PROGRAM [ARGS]
+
+Run PROGRAMS ARGS to compile a file, generating dependencies
+as side-effects.
+
+Environment variables:
+  depmode     Dependency tracking mode.
+  source      Source file read by 'PROGRAMS ARGS'.
+  object      Object file output by 'PROGRAMS ARGS'.
+  DEPDIR      directory where to store dependencies.
+  depfile     Dependency file to output.
+  tmpdepfile  Temporary file to use when outputting dependencies.
+  libtool     Whether libtool is used (yes/no).
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "depcomp $scriptversion"
+    exit $?
+    ;;
+esac
+
+# Get the directory component of the given path, and save it in the
+# global variables '$dir'.  Note that this directory component will
+# be either empty or ending with a '/' character.  This is deliberate.
+set_dir_from ()
+{
+  case $1 in
+    */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;;
+      *) dir=;;
+  esac
+}
+
+# Get the suffix-stripped basename of the given path, and save it the
+# global variable '$base'.
+set_base_from ()
+{
+  base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'`
+}
+
+# If no dependency file was actually created by the compiler invocation,
+# we still have to create a dummy depfile, to avoid errors with the
+# Makefile "include basename.Plo" scheme.
+make_dummy_depfile ()
+{
+  echo "#dummy" > "$depfile"
+}
+
+# Factor out some common post-processing of the generated depfile.
+# Requires the auxiliary global variable '$tmpdepfile' to be set.
+aix_post_process_depfile ()
+{
+  # If the compiler actually managed to produce a dependency file,
+  # post-process it.
+  if test -f "$tmpdepfile"; then
+    # Each line is of the form 'foo.o: dependency.h'.
+    # Do two passes, one to just change these to
+    #   $object: dependency.h
+    # and one to simply output
+    #   dependency.h:
+    # which is needed to avoid the deleted-header problem.
+    { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile"
+      sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile"
+    } > "$depfile"
+    rm -f "$tmpdepfile"
+  else
+    make_dummy_depfile
+  fi
+}
+
+# A tabulation character.
+tab='	'
+# A newline character.
+nl='
+'
+# Character ranges might be problematic outside the C locale.
+# These definitions help.
+upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
+lower=abcdefghijklmnopqrstuvwxyz
+digits=0123456789
+alpha=${upper}${lower}
+
+if test -z "$depmode" || test -z "$source" || test -z "$object"; then
+  echo "depcomp: Variables source, object and depmode must be set" 1>&2
+  exit 1
+fi
+
+# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
+depfile=${depfile-`echo "$object" |
+  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
+tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
+
+rm -f "$tmpdepfile"
+
+# Avoid interferences from the environment.
+gccflag= dashmflag=
+
+# Some modes work just like other modes, but use different flags.  We
+# parameterize here, but still list the modes in the big case below,
+# to make depend.m4 easier to write.  Note that we *cannot* use a case
+# here, because this file can only contain one case statement.
+if test "$depmode" = hp; then
+  # HP compiler uses -M and no extra arg.
+  gccflag=-M
+  depmode=gcc
+fi
+
+if test "$depmode" = dashXmstdout; then
+  # This is just like dashmstdout with a different argument.
+  dashmflag=-xM
+  depmode=dashmstdout
+fi
+
+cygpath_u="cygpath -u -f -"
+if test "$depmode" = msvcmsys; then
+  # This is just like msvisualcpp but w/o cygpath translation.
+  # Just convert the backslash-escaped backslashes to single forward
+  # slashes to satisfy depend.m4
+  cygpath_u='sed s,\\\\,/,g'
+  depmode=msvisualcpp
+fi
+
+if test "$depmode" = msvc7msys; then
+  # This is just like msvc7 but w/o cygpath translation.
+  # Just convert the backslash-escaped backslashes to single forward
+  # slashes to satisfy depend.m4
+  cygpath_u='sed s,\\\\,/,g'
+  depmode=msvc7
+fi
+
+if test "$depmode" = xlc; then
+  # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
+  gccflag=-qmakedep=gcc,-MF
+  depmode=gcc
+fi
+
+case "$depmode" in
+gcc3)
+## gcc 3 implements dependency tracking that does exactly what
+## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
+## it if -MD -MP comes after the -MF stuff.  Hmm.
+## Unfortunately, FreeBSD c89 acceptance of flags depends upon
+## the command line argument order; so add the flags where they
+## appear in depend2.am.  Note that the slowdown incurred here
+## affects only configure: in makefiles, %FASTDEP% shortcuts this.
+  for arg
+  do
+    case $arg in
+    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
+    *)  set fnord "$@" "$arg" ;;
+    esac
+    shift # fnord
+    shift # $arg
+  done
+  "$@"
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  mv "$tmpdepfile" "$depfile"
+  ;;
+
+gcc)
+## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
+## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
+## (see the conditional assignment to $gccflag above).
+## There are various ways to get dependency output from gcc.  Here's
+## why we pick this rather obscure method:
+## - Don't want to use -MD because we'd like the dependencies to end
+##   up in a subdir.  Having to rename by hand is ugly.
+##   (We might end up doing this anyway to support other compilers.)
+## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
+##   -MM, not -M (despite what the docs say).  Also, it might not be
+##   supported by the other compilers which use the 'gcc' depmode.
+## - Using -M directly means running the compiler twice (even worse
+##   than renaming).
+  if test -z "$gccflag"; then
+    gccflag=-MD,
+  fi
+  "$@" -Wp,"$gccflag$tmpdepfile"
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  # The second -e expression handles DOS-style file names with drive
+  # letters.
+  sed -e 's/^[^:]*: / /' \
+      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
+## This next piece of magic avoids the "deleted header file" problem.
+## The problem is that when a header file which appears in a .P file
+## is deleted, the dependency causes make to die (because there is
+## typically no way to rebuild the header).  We avoid this by adding
+## dummy dependencies for each header file.  Too bad gcc doesn't do
+## this for us directly.
+## Some versions of gcc put a space before the ':'.  On the theory
+## that the space means something, we add a space to the output as
+## well.  hp depmode also adds that space, but also prefixes the VPATH
+## to the object.  Take care to not repeat it in the output.
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+  tr ' ' "$nl" < "$tmpdepfile" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+hp)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+sgi)
+  if test "$libtool" = yes; then
+    "$@" "-Wp,-MDupdate,$tmpdepfile"
+  else
+    "$@" -MDupdate "$tmpdepfile"
+  fi
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+
+  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
+    echo "$object : \\" > "$depfile"
+    # Clip off the initial element (the dependent).  Don't try to be
+    # clever and replace this with sed code, as IRIX sed won't handle
+    # lines with more than a fixed number of characters (4096 in
+    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
+    # the IRIX cc adds comments like '#:fec' to the end of the
+    # dependency line.
+    tr ' ' "$nl" < "$tmpdepfile" \
+      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \
+      | tr "$nl" ' ' >> "$depfile"
+    echo >> "$depfile"
+    # The second pass generates a dummy entry for each header file.
+    tr ' ' "$nl" < "$tmpdepfile" \
+      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+      >> "$depfile"
+  else
+    make_dummy_depfile
+  fi
+  rm -f "$tmpdepfile"
+  ;;
+
+xlc)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+aix)
+  # The C for AIX Compiler uses -M and outputs the dependencies
+  # in a .u file.  In older versions, this file always lives in the
+  # current directory.  Also, the AIX compiler puts '$object:' at the
+  # start of each line; $object doesn't have directory information.
+  # Version 6 uses the directory in both cases.
+  set_dir_from "$object"
+  set_base_from "$object"
+  if test "$libtool" = yes; then
+    tmpdepfile1=$dir$base.u
+    tmpdepfile2=$base.u
+    tmpdepfile3=$dir.libs/$base.u
+    "$@" -Wc,-M
+  else
+    tmpdepfile1=$dir$base.u
+    tmpdepfile2=$dir$base.u
+    tmpdepfile3=$dir$base.u
+    "$@" -M
+  fi
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+    exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  aix_post_process_depfile
+  ;;
+
+tcc)
+  # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26
+  # FIXME: That version still under development at the moment of writing.
+  #        Make that this statement remains true also for stable, released
+  #        versions.
+  # It will wrap lines (doesn't matter whether long or short) with a
+  # trailing '\', as in:
+  #
+  #   foo.o : \
+  #    foo.c \
+  #    foo.h \
+  #
+  # It will put a trailing '\' even on the last line, and will use leading
+  # spaces rather than leading tabs (at least since its commit 0394caf7
+  # "Emit spaces for -MD").
+  "$@" -MD -MF "$tmpdepfile"
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'.
+  # We have to change lines of the first kind to '$object: \'.
+  sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile"
+  # And for each line of the second kind, we have to emit a 'dep.h:'
+  # dummy dependency, to avoid the deleted-header problem.
+  sed -n -e 's|^  *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+## The order of this option in the case statement is important, since the
+## shell code in configure will try each of these formats in the order
+## listed in this file.  A plain '-MD' option would be understood by many
+## compilers, so we must ensure this comes after the gcc and icc options.
+pgcc)
+  # Portland's C compiler understands '-MD'.
+  # Will always output deps to 'file.d' where file is the root name of the
+  # source file under compilation, even if file resides in a subdirectory.
+  # The object file name does not affect the name of the '.d' file.
+  # pgcc 10.2 will output
+  #    foo.o: sub/foo.c sub/foo.h
+  # and will wrap long lines using '\' :
+  #    foo.o: sub/foo.c ... \
+  #     sub/foo.h ... \
+  #     ...
+  set_dir_from "$object"
+  # Use the source, not the object, to determine the base name, since
+  # that's sadly what pgcc will do too.
+  set_base_from "$source"
+  tmpdepfile=$base.d
+
+  # For projects that build the same source file twice into different object
+  # files, the pgcc approach of using the *source* file root name can cause
+  # problems in parallel builds.  Use a locking strategy to avoid stomping on
+  # the same $tmpdepfile.
+  lockdir=$base.d-lock
+  trap "
+    echo '$0: caught signal, cleaning up...' >&2
+    rmdir '$lockdir'
+    exit 1
+  " 1 2 13 15
+  numtries=100
+  i=$numtries
+  while test $i -gt 0; do
+    # mkdir is a portable test-and-set.
+    if mkdir "$lockdir" 2>/dev/null; then
+      # This process acquired the lock.
+      "$@" -MD
+      stat=$?
+      # Release the lock.
+      rmdir "$lockdir"
+      break
+    else
+      # If the lock is being held by a different process, wait
+      # until the winning process is done or we timeout.
+      while test -d "$lockdir" && test $i -gt 0; do
+        sleep 1
+        i=`expr $i - 1`
+      done
+    fi
+    i=`expr $i - 1`
+  done
+  trap - 1 2 13 15
+  if test $i -le 0; then
+    echo "$0: failed to acquire lock after $numtries attempts" >&2
+    echo "$0: check lockdir '$lockdir'" >&2
+    exit 1
+  fi
+
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  # Each line is of the form `foo.o: dependent.h',
+  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
+  # Do two passes, one to just change these to
+  # `$object: dependent.h' and one to simply `dependent.h:'.
+  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process this invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \
+    | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+hp2)
+  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
+  # compilers, which have integrated preprocessors.  The correct option
+  # to use with these is +Maked; it writes dependencies to a file named
+  # 'foo.d', which lands next to the object file, wherever that
+  # happens to be.
+  # Much of this is similar to the tru64 case; see comments there.
+  set_dir_from  "$object"
+  set_base_from "$object"
+  if test "$libtool" = yes; then
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir.libs/$base.d
+    "$@" -Wc,+Maked
+  else
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir$base.d
+    "$@" +Maked
+  fi
+  stat=$?
+  if test $stat -ne 0; then
+     rm -f "$tmpdepfile1" "$tmpdepfile2"
+     exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  if test -f "$tmpdepfile"; then
+    sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile"
+    # Add 'dependent.h:' lines.
+    sed -ne '2,${
+               s/^ *//
+               s/ \\*$//
+               s/$/:/
+               p
+             }' "$tmpdepfile" >> "$depfile"
+  else
+    make_dummy_depfile
+  fi
+  rm -f "$tmpdepfile" "$tmpdepfile2"
+  ;;
+
+tru64)
+  # The Tru64 compiler uses -MD to generate dependencies as a side
+  # effect.  'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
+  # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
+  # dependencies in 'foo.d' instead, so we check for that too.
+  # Subdirectories are respected.
+  set_dir_from  "$object"
+  set_base_from "$object"
+
+  if test "$libtool" = yes; then
+    # Libtool generates 2 separate objects for the 2 libraries.  These
+    # two compilations output dependencies in $dir.libs/$base.o.d and
+    # in $dir$base.o.d.  We have to check for both files, because
+    # one of the two compilations can be disabled.  We should prefer
+    # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+    # automatically cleaned when .libs/ is deleted, while ignoring
+    # the former would cause a distcleancheck panic.
+    tmpdepfile1=$dir$base.o.d          # libtool 1.5
+    tmpdepfile2=$dir.libs/$base.o.d    # Likewise.
+    tmpdepfile3=$dir.libs/$base.d      # Compaq CCC V6.2-504
+    "$@" -Wc,-MD
+  else
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir$base.d
+    tmpdepfile3=$dir$base.d
+    "$@" -MD
+  fi
+
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+    exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  # Same post-processing that is required for AIX mode.
+  aix_post_process_depfile
+  ;;
+
+msvc7)
+  if test "$libtool" = yes; then
+    showIncludes=-Wc,-showIncludes
+  else
+    showIncludes=-showIncludes
+  fi
+  "$@" $showIncludes > "$tmpdepfile"
+  stat=$?
+  grep -v '^Note: including file: ' "$tmpdepfile"
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  # The first sed program below extracts the file names and escapes
+  # backslashes for cygpath.  The second sed program outputs the file
+  # name when reading, but also accumulates all include files in the
+  # hold buffer in order to output them again at the end.  This only
+  # works with sed implementations that can handle large buffers.
+  sed < "$tmpdepfile" -n '
+/^Note: including file:  *\(.*\)/ {
+  s//\1/
+  s/\\/\\\\/g
+  p
+}' | $cygpath_u | sort -u | sed -n '
+s/ /\\ /g
+s/\(.*\)/'"$tab"'\1 \\/p
+s/.\(.*\) \\/\1:/
+H
+$ {
+  s/.*/'"$tab"'/
+  G
+  p
+}' >> "$depfile"
+  echo >> "$depfile" # make sure the fragment doesn't end with a backslash
+  rm -f "$tmpdepfile"
+  ;;
+
+msvc7msys)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+#nosideeffect)
+  # This comment above is used by automake to tell side-effect
+  # dependency tracking mechanisms from slower ones.
+
+dashmstdout)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout, regardless of -o.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  # Remove '-o $object'.
+  IFS=" "
+  for arg
+  do
+    case $arg in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    *)
+      set fnord "$@" "$arg"
+      shift # fnord
+      shift # $arg
+      ;;
+    esac
+  done
+
+  test -z "$dashmflag" && dashmflag=-M
+  # Require at least two characters before searching for ':'
+  # in the target name.  This is to cope with DOS-style filenames:
+  # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
+  "$@" $dashmflag |
+    sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile"
+  rm -f "$depfile"
+  cat < "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process this sed invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  tr ' ' "$nl" < "$tmpdepfile" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+dashXmstdout)
+  # This case only exists to satisfy depend.m4.  It is never actually
+  # run, as this mode is specially recognized in the preamble.
+  exit 1
+  ;;
+
+makedepend)
+  "$@" || exit $?
+  # Remove any Libtool call
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+  # X makedepend
+  shift
+  cleared=no eat=no
+  for arg
+  do
+    case $cleared in
+    no)
+      set ""; shift
+      cleared=yes ;;
+    esac
+    if test $eat = yes; then
+      eat=no
+      continue
+    fi
+    case "$arg" in
+    -D*|-I*)
+      set fnord "$@" "$arg"; shift ;;
+    # Strip any option that makedepend may not understand.  Remove
+    # the object too, otherwise makedepend will parse it as a source file.
+    -arch)
+      eat=yes ;;
+    -*|$object)
+      ;;
+    *)
+      set fnord "$@" "$arg"; shift ;;
+    esac
+  done
+  obj_suffix=`echo "$object" | sed 's/^.*\././'`
+  touch "$tmpdepfile"
+  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
+  rm -f "$depfile"
+  # makedepend may prepend the VPATH from the source file name to the object.
+  # No need to regex-escape $object, excess matching of '.' is harmless.
+  sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process the last invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed '1,2d' "$tmpdepfile" \
+    | tr ' ' "$nl" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile" "$tmpdepfile".bak
+  ;;
+
+cpp)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  # Remove '-o $object'.
+  IFS=" "
+  for arg
+  do
+    case $arg in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    *)
+      set fnord "$@" "$arg"
+      shift # fnord
+      shift # $arg
+      ;;
+    esac
+  done
+
+  "$@" -E \
+    | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+             -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+    | sed '$ s: \\$::' > "$tmpdepfile"
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  cat < "$tmpdepfile" >> "$depfile"
+  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+msvisualcpp)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  IFS=" "
+  for arg
+  do
+    case "$arg" in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
+        set fnord "$@"
+        shift
+        shift
+        ;;
+    *)
+        set fnord "$@" "$arg"
+        shift
+        shift
+        ;;
+    esac
+  done
+  "$@" -E 2>/dev/null |
+  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile"
+  echo "$tab" >> "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+msvcmsys)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+none)
+  exec "$@"
+  ;;
+
+*)
+  echo "Unknown depmode $depmode" 1>&2
+  exit 1
+  ;;
+esac
+
+exit 0
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/conf/gcov_valgrind.m4 b/conf/gcov_valgrind.m4
new file mode 100644
index 0000000..c9649c2
--- /dev/null
+++ b/conf/gcov_valgrind.m4
@@ -0,0 +1,39 @@
+# Support for coverage analysis via gcov:
+# from http://fragglet.livejournal.com/14291.html
+ 
+AC_DEFUN([DODS_GCOV_VALGRIND],
+[
+               
+AC_ARG_ENABLE(coverage,
+    [AS_HELP_STRING([--enable-coverage],
+                    [Collect coverage data (default is no)]) ],
+    [coverage=$enableval],
+    [coverage=no])
+ 
+AS_IF([test x$coverage = xyes], 
+    [ AS_IF([test x$GCC = xyes],
+            [ CFLAGS="-fprofile-arcs -ftest-coverage -pg $CFLAGS"
+              CXXFLAGS="-fprofile-arcs -ftest-coverage -pg $CXXFLAGS"
+              LDFLAGS="-pg $LDFLAGS"
+              AC_CHECK_LIB([gcov], [gcov_open],[LIBS="$LIBS -lgcov"],[],[])
+	          AC_MSG_NOTICE([Building coverage reporting.]) ],
+            [ AC_MSG_ERROR([Can only enable coverage when using gcc.]) ]) ])
+               
+# Support for running test cases using valgrind:
+               
+use_valgrind=no
+AC_ARG_ENABLE(valgrind,
+    [AS_HELP_STRING([--enable-valgrind], 
+    	            [Use valgrind when running unit tests. (default is no)])],
+    [use_valgrind=$enableval],
+    [use_valgrind=no])
+               
+AS_IF([test x$use_valgrind = xyes ],
+      [ AC_CHECK_PROG(HAVE_VALGRIND, valgrind, yes, no)
+        AS_IF([test x$HAVE_VALGRIND = xyes ],
+	          [AC_MSG_NOTICE([Using valgrind with unit tests.])],
+	          [AC_MSG_ERROR([Valgrind not found in PATH.])])])
+
+AM_CONDITIONAL(USE_VALGRIND, [test x$use_valgrind = xyes])
+
+])
\ No newline at end of file
diff --git a/conf/install-sh b/conf/install-sh
new file mode 100755
index 0000000..377bb86
--- /dev/null
+++ b/conf/install-sh
@@ -0,0 +1,527 @@
+#!/bin/sh
+# install - install a program, script, or datafile
+
+scriptversion=2011-11-20.07; # UTC
+
+# This originates from X11R5 (mit/util/scripts/install.sh), which was
+# later released in X11R6 (xc/config/util/install.sh) with the
+# following copyright and license.
+#
+# Copyright (C) 1994 X Consortium
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name of the X Consortium shall not
+# be used in advertising or otherwise to promote the sale, use or other deal-
+# ings in this Software without prior written authorization from the X Consor-
+# tium.
+#
+#
+# FSF changes to this file are in the public domain.
+#
+# Calling this script install-sh is preferred over install.sh, to prevent
+# 'make' implicit rules from creating a file called install from it
+# when there is no Makefile.
+#
+# This script is compatible with the BSD install script, but was written
+# from scratch.
+
+nl='
+'
+IFS=" ""	$nl"
+
+# set DOITPROG to echo to test this script
+
+# Don't use :- since 4.3BSD and earlier shells don't like it.
+doit=${DOITPROG-}
+if test -z "$doit"; then
+  doit_exec=exec
+else
+  doit_exec=$doit
+fi
+
+# Put in absolute file names if you don't have them in your path;
+# or use environment vars.
+
+chgrpprog=${CHGRPPROG-chgrp}
+chmodprog=${CHMODPROG-chmod}
+chownprog=${CHOWNPROG-chown}
+cmpprog=${CMPPROG-cmp}
+cpprog=${CPPROG-cp}
+mkdirprog=${MKDIRPROG-mkdir}
+mvprog=${MVPROG-mv}
+rmprog=${RMPROG-rm}
+stripprog=${STRIPPROG-strip}
+
+posix_glob='?'
+initialize_posix_glob='
+  test "$posix_glob" != "?" || {
+    if (set -f) 2>/dev/null; then
+      posix_glob=
+    else
+      posix_glob=:
+    fi
+  }
+'
+
+posix_mkdir=
+
+# Desired mode of installed file.
+mode=0755
+
+chgrpcmd=
+chmodcmd=$chmodprog
+chowncmd=
+mvcmd=$mvprog
+rmcmd="$rmprog -f"
+stripcmd=
+
+src=
+dst=
+dir_arg=
+dst_arg=
+
+copy_on_change=false
+no_target_directory=
+
+usage="\
+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+   or: $0 [OPTION]... SRCFILES... DIRECTORY
+   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
+   or: $0 [OPTION]... -d DIRECTORIES...
+
+In the 1st form, copy SRCFILE to DSTFILE.
+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
+In the 4th, create DIRECTORIES.
+
+Options:
+     --help     display this help and exit.
+     --version  display version info and exit.
+
+  -c            (ignored)
+  -C            install only if different (preserve the last data modification time)
+  -d            create directories instead of installing files.
+  -g GROUP      $chgrpprog installed files to GROUP.
+  -m MODE       $chmodprog installed files to MODE.
+  -o USER       $chownprog installed files to USER.
+  -s            $stripprog installed files.
+  -t DIRECTORY  install into DIRECTORY.
+  -T            report an error if DSTFILE is a directory.
+
+Environment variables override the default commands:
+  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
+  RMPROG STRIPPROG
+"
+
+while test $# -ne 0; do
+  case $1 in
+    -c) ;;
+
+    -C) copy_on_change=true;;
+
+    -d) dir_arg=true;;
+
+    -g) chgrpcmd="$chgrpprog $2"
+	shift;;
+
+    --help) echo "$usage"; exit $?;;
+
+    -m) mode=$2
+	case $mode in
+	  *' '* | *'	'* | *'
+'*	  | *'*'* | *'?'* | *'['*)
+	    echo "$0: invalid mode: $mode" >&2
+	    exit 1;;
+	esac
+	shift;;
+
+    -o) chowncmd="$chownprog $2"
+	shift;;
+
+    -s) stripcmd=$stripprog;;
+
+    -t) dst_arg=$2
+	# Protect names problematic for 'test' and other utilities.
+	case $dst_arg in
+	  -* | [=\(\)!]) dst_arg=./$dst_arg;;
+	esac
+	shift;;
+
+    -T) no_target_directory=true;;
+
+    --version) echo "$0 $scriptversion"; exit $?;;
+
+    --)	shift
+	break;;
+
+    -*)	echo "$0: invalid option: $1" >&2
+	exit 1;;
+
+    *)  break;;
+  esac
+  shift
+done
+
+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
+  # When -d is used, all remaining arguments are directories to create.
+  # When -t is used, the destination is already specified.
+  # Otherwise, the last argument is the destination.  Remove it from $@.
+  for arg
+  do
+    if test -n "$dst_arg"; then
+      # $@ is not empty: it contains at least $arg.
+      set fnord "$@" "$dst_arg"
+      shift # fnord
+    fi
+    shift # arg
+    dst_arg=$arg
+    # Protect names problematic for 'test' and other utilities.
+    case $dst_arg in
+      -* | [=\(\)!]) dst_arg=./$dst_arg;;
+    esac
+  done
+fi
+
+if test $# -eq 0; then
+  if test -z "$dir_arg"; then
+    echo "$0: no input file specified." >&2
+    exit 1
+  fi
+  # It's OK to call 'install-sh -d' without argument.
+  # This can happen when creating conditional directories.
+  exit 0
+fi
+
+if test -z "$dir_arg"; then
+  do_exit='(exit $ret); exit $ret'
+  trap "ret=129; $do_exit" 1
+  trap "ret=130; $do_exit" 2
+  trap "ret=141; $do_exit" 13
+  trap "ret=143; $do_exit" 15
+
+  # Set umask so as not to create temps with too-generous modes.
+  # However, 'strip' requires both read and write access to temps.
+  case $mode in
+    # Optimize common cases.
+    *644) cp_umask=133;;
+    *755) cp_umask=22;;
+
+    *[0-7])
+      if test -z "$stripcmd"; then
+	u_plus_rw=
+      else
+	u_plus_rw='% 200'
+      fi
+      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
+    *)
+      if test -z "$stripcmd"; then
+	u_plus_rw=
+      else
+	u_plus_rw=,u+rw
+      fi
+      cp_umask=$mode$u_plus_rw;;
+  esac
+fi
+
+for src
+do
+  # Protect names problematic for 'test' and other utilities.
+  case $src in
+    -* | [=\(\)!]) src=./$src;;
+  esac
+
+  if test -n "$dir_arg"; then
+    dst=$src
+    dstdir=$dst
+    test -d "$dstdir"
+    dstdir_status=$?
+  else
+
+    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
+    # might cause directories to be created, which would be especially bad
+    # if $src (and thus $dsttmp) contains '*'.
+    if test ! -f "$src" && test ! -d "$src"; then
+      echo "$0: $src does not exist." >&2
+      exit 1
+    fi
+
+    if test -z "$dst_arg"; then
+      echo "$0: no destination specified." >&2
+      exit 1
+    fi
+    dst=$dst_arg
+
+    # If destination is a directory, append the input filename; won't work
+    # if double slashes aren't ignored.
+    if test -d "$dst"; then
+      if test -n "$no_target_directory"; then
+	echo "$0: $dst_arg: Is a directory" >&2
+	exit 1
+      fi
+      dstdir=$dst
+      dst=$dstdir/`basename "$src"`
+      dstdir_status=0
+    else
+      # Prefer dirname, but fall back on a substitute if dirname fails.
+      dstdir=`
+	(dirname "$dst") 2>/dev/null ||
+	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	     X"$dst" : 'X\(//\)[^/]' \| \
+	     X"$dst" : 'X\(//\)$' \| \
+	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
+	echo X"$dst" |
+	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\/\)[^/].*/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\/\)$/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\).*/{
+		   s//\1/
+		   q
+		 }
+		 s/.*/./; q'
+      `
+
+      test -d "$dstdir"
+      dstdir_status=$?
+    fi
+  fi
+
+  obsolete_mkdir_used=false
+
+  if test $dstdir_status != 0; then
+    case $posix_mkdir in
+      '')
+	# Create intermediate dirs using mode 755 as modified by the umask.
+	# This is like FreeBSD 'install' as of 1997-10-28.
+	umask=`umask`
+	case $stripcmd.$umask in
+	  # Optimize common cases.
+	  *[2367][2367]) mkdir_umask=$umask;;
+	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
+
+	  *[0-7])
+	    mkdir_umask=`expr $umask + 22 \
+	      - $umask % 100 % 40 + $umask % 20 \
+	      - $umask % 10 % 4 + $umask % 2
+	    `;;
+	  *) mkdir_umask=$umask,go-w;;
+	esac
+
+	# With -d, create the new directory with the user-specified mode.
+	# Otherwise, rely on $mkdir_umask.
+	if test -n "$dir_arg"; then
+	  mkdir_mode=-m$mode
+	else
+	  mkdir_mode=
+	fi
+
+	posix_mkdir=false
+	case $umask in
+	  *[123567][0-7][0-7])
+	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
+	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+	    ;;
+	  *)
+	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
+
+	    if (umask $mkdir_umask &&
+		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+	    then
+	      if test -z "$dir_arg" || {
+		   # Check for POSIX incompatibilities with -m.
+		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+		   # other-writable bit of parent directory when it shouldn't.
+		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
+		   case $ls_ld_tmpdir in
+		     d????-?r-*) different_mode=700;;
+		     d????-?--*) different_mode=755;;
+		     *) false;;
+		   esac &&
+		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
+		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+		   }
+		 }
+	      then posix_mkdir=:
+	      fi
+	      rmdir "$tmpdir/d" "$tmpdir"
+	    else
+	      # Remove any dirs left behind by ancient mkdir implementations.
+	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+	    fi
+	    trap '' 0;;
+	esac;;
+    esac
+
+    if
+      $posix_mkdir && (
+	umask $mkdir_umask &&
+	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+      )
+    then :
+    else
+
+      # The umask is ridiculous, or mkdir does not conform to POSIX,
+      # or it failed possibly due to a race condition.  Create the
+      # directory the slow way, step by step, checking for races as we go.
+
+      case $dstdir in
+	/*) prefix='/';;
+	[-=\(\)!]*) prefix='./';;
+	*)  prefix='';;
+      esac
+
+      eval "$initialize_posix_glob"
+
+      oIFS=$IFS
+      IFS=/
+      $posix_glob set -f
+      set fnord $dstdir
+      shift
+      $posix_glob set +f
+      IFS=$oIFS
+
+      prefixes=
+
+      for d
+      do
+	test X"$d" = X && continue
+
+	prefix=$prefix$d
+	if test -d "$prefix"; then
+	  prefixes=
+	else
+	  if $posix_mkdir; then
+	    (umask=$mkdir_umask &&
+	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+	    # Don't fail if two instances are running concurrently.
+	    test -d "$prefix" || exit 1
+	  else
+	    case $prefix in
+	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+	      *) qprefix=$prefix;;
+	    esac
+	    prefixes="$prefixes '$qprefix'"
+	  fi
+	fi
+	prefix=$prefix/
+      done
+
+      if test -n "$prefixes"; then
+	# Don't fail if two instances are running concurrently.
+	(umask $mkdir_umask &&
+	 eval "\$doit_exec \$mkdirprog $prefixes") ||
+	  test -d "$dstdir" || exit 1
+	obsolete_mkdir_used=true
+      fi
+    fi
+  fi
+
+  if test -n "$dir_arg"; then
+    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
+    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
+      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
+  else
+
+    # Make a couple of temp file names in the proper directory.
+    dsttmp=$dstdir/_inst.$$_
+    rmtmp=$dstdir/_rm.$$_
+
+    # Trap to clean up those temp files at exit.
+    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
+
+    # Copy the file name to the temp name.
+    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
+
+    # and set any options; do chmod last to preserve setuid bits.
+    #
+    # If any of these fail, we abort the whole thing.  If we want to
+    # ignore errors from any of these, just make sure not to ignore
+    # errors from the above "$doit $cpprog $src $dsttmp" command.
+    #
+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
+    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
+    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
+
+    # If -C, don't bother to copy if it wouldn't change the file.
+    if $copy_on_change &&
+       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
+       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
+
+       eval "$initialize_posix_glob" &&
+       $posix_glob set -f &&
+       set X $old && old=:$2:$4:$5:$6 &&
+       set X $new && new=:$2:$4:$5:$6 &&
+       $posix_glob set +f &&
+
+       test "$old" = "$new" &&
+       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
+    then
+      rm -f "$dsttmp"
+    else
+      # Rename the file to the real destination.
+      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
+
+      # The rename failed, perhaps because mv can't rename something else
+      # to itself, or perhaps because mv is so ancient that it does not
+      # support -f.
+      {
+	# Now remove or move aside any old file at destination location.
+	# We try this two ways since rm can't unlink itself on some
+	# systems and the destination file might be busy for other
+	# reasons.  In this case, the final cleanup might fail but the new
+	# file should still install successfully.
+	{
+	  test ! -f "$dst" ||
+	  $doit $rmcmd -f "$dst" 2>/dev/null ||
+	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+	  } ||
+	  { echo "$0: cannot unlink or rename $dst" >&2
+	    (exit 1); exit 1
+	  }
+	} &&
+
+	# Now rename the file to the real destination.
+	$doit $mvcmd "$dsttmp" "$dst"
+      }
+    fi || exit 1
+
+    trap '' 0
+  fi
+done
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/conf/libdap.m4 b/conf/libdap.m4
new file mode 100644
index 0000000..54d1aed
--- /dev/null
+++ b/conf/libdap.m4
@@ -0,0 +1,314 @@
+# -*- mode: autoconf -*-
+# Configure macros for Libdap
+#
+# Code for version detection and comparison comes from freetype2.m4
+# Marcelo Magallon 2001-10-26, based on gtk.m4 by Owen Taylor
+#
+# Copyright 2001, 2003 by
+# David Turner, Robert Wilhelm, and Werner Lemberg.
+#
+# This file is part of the FreeType project, and may only be used, modified,
+# and distributed under the terms of the FreeType project license,
+# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
+# indicate that you have read the license and understand and accept it
+# fully.
+#
+# As a special exception to the FreeType project license, this file may be
+# distributed as part of a program that contains a configuration script
+# generated by Autoconf, under the same distribution terms as the rest of
+# that program.
+#
+# modified by Patrice Dumas 2005 for libdap
+#
+# AC_CHECK_DODS is based on code from gdal configure.in
+
+# AC_CHECK_LIBDAP([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+# Test for Libdap and define DAP_CFLAGS and DAP_LIBS.
+# Check that the version is above MINIMUM-VERSION 
+# use when linking with a c++ aware linker, with a c linker you may also
+# need -lstdc++
+
+AC_DEFUN([AC_CHECK_LIBDAP],
+[
+  dap_min_version=m4_if([$1], [], [3.5.0], [$1])
+  dap_no=
+  dap_pkgconfig_libdap=yes 
+  PKG_CHECK_MODULES([DAP],[libdap >= $dap_min_version],,
+    [dap_pkgconfig_libdap=no])
+  PKG_CHECK_MODULES([DAP_CLIENT],[libdapclient >= $dap_min_version],,
+    [dap_pkgconfig_libdap=no])
+  PKG_CHECK_MODULES([DAP_SERVER],[libdapserver >= $dap_min_version],,
+    [dap_pkgconfig_libdap=no])
+  
+  if test $dap_pkgconfig_libdap = no; then
+    AC_PATH_PROG([DAP_CONFIG], [dap-config], [no])
+    if test "$DAP_CONFIG" = "no" ; then
+      dap_no=yes
+    else
+      dap_config_major_version=`$DAP_CONFIG --version | sed 's/^libdap \([[0-9]][[0-9]]*\)\.\([[0-9]][[0-9]]*\)\.\([[0-9]][[0-9]]*\)[[ab]]*$/\1/'`
+      dap_config_minor_version=`$DAP_CONFIG --version | sed 's/^libdap \([[0-9]][[0-9]]*\)\.\([[0-9]][[0-9]]*\)\.\([[0-9]][[0-9]]*\)[[ab]]*$/\2/'`
+      dap_config_micro_version=`$DAP_CONFIG --version | sed 's/^libdap \([[0-9]][[0-9]]*\)\.\([[0-9]][[0-9]]*\)\.\([[0-9]][[0-9]]*\)[[ab]]*$/\3/'`
+      dap_min_major_version=`echo $dap_min_version | sed 's/\([[0-9]][[0-9]]*\).\([[0-9]][[0-9]]*\).\([[0-9]][[0-9]]*\)$/\1/'`
+      dap_min_minor_version=`echo $dap_min_version | sed 's/\([[0-9]][[0-9]]*\).\([[0-9]][[0-9]]*\).\([[0-9]][[0-9]]*\)$/\2/'`
+      dap_min_micro_version=`echo $dap_min_version | sed 's/\([[0-9]][[0-9]]*\).\([[0-9]][[0-9]]*\).\([[0-9]][[0-9]]*\)$/\3/'`
+
+      dap_config_is_lt=""
+      if test $dap_config_major_version -lt $dap_min_major_version ; then
+        dap_config_is_lt=yes
+      else
+        if test $dap_config_major_version -eq $dap_min_major_version ; then
+          if test $dap_config_minor_version -lt $dap_min_minor_version ; then
+            dap_config_is_lt=yes
+          else
+            if test $dap_config_minor_version -eq $dap_min_minor_version ; then
+              if test $dap_config_micro_version -lt $dap_min_micro_version ; then
+                dap_config_is_lt=yes
+              fi
+            fi
+          fi
+        fi
+      fi
+      if test x$dap_config_is_lt = xyes ; then
+        dap_no=yes
+      else
+        DAP_LIBS="`$DAP_CONFIG --libs`"
+        if ($DAP_CONFIG --client-libs 2>&1 | grep unknown) >/dev/null 2>&1; then
+          DAP_CLIENT_LIBS=$DAP_LIBS
+          DAP_SERVER_LIBS=$DAP_LIBS
+        else
+          DAP_CLIENT_LIBS="`$DAP_CONFIG --client-libs`"
+          DAP_SERVER_LIBS="`$DAP_CONFIG --server-libs`"
+        fi
+        DAP_CFLAGS="`$DAP_CONFIG --cflags`"
+      fi
+    fi
+  else
+     DAP_STATIC_LIBS="`$PKG_CONFIG --static --libs libdap`"
+     DAP_CLIENT_STATIC_LIBS="`$PKG_CONFIG --static --libs libdapclient`"
+     DAP_SERVER_STATIC_LIBS="`$PKG_CONFIG --static --libs libdapserver`"
+  fi
+  AC_MSG_CHECKING([for libdap version >= $dap_min_version])
+  if test x$dap_no = x ; then
+    AC_MSG_RESULT([yes])
+    m4_if([$2], [], [:], [$2])
+  else
+    AC_MSG_RESULT([no])
+    if test "$DAP_CONFIG" = "no" ; then
+    AC_MSG_NOTICE([The dap-config script could not be found.])
+    else
+      if test x$dap_config_is_lt = xyes ; then
+        AC_MSG_NOTICE([the installed libdap library is too old.])
+      fi
+    fi
+    DAP_LIBS=""
+    DAP_CFLAGS=""
+    m4_if([$3], [], [:], [$3])
+  fi
+  if test x"$DAP_CFLAGS" != x -a x"$DAP_CLIENT_CFLAGS" = x ; then
+    DAP_CLIENT_CFLAGS=$DAP_CFLAGS
+  fi
+  if test x"$DAP_CFLAGS" != x -a x"$DAP_SERVER_CFLAGS" = x ; then
+    DAP_SERVER_CFLAGS=$DAP_CFLAGS
+  fi
+  if test x"$DAP_STATIC_LIBS" = x ; then
+    DAP_STATIC_LIBS=$DAP_LIBS
+    DAP_CLIENT_STATIC_LIBS=$DAP_CLIENT_LIBS
+    DAP_SERVER_STATIC_LIBS=$DAP_SERVER_LIBS
+  fi
+  AC_SUBST([DAP_CFLAGS])
+  AC_SUBST([DAP_CLIENT_CFLAGS])
+  AC_SUBST([DAP_SERVER_CFLAGS])
+  AC_SUBST([DAP_LIBS])
+  AC_SUBST([DAP_CLIENT_LIBS])
+  AC_SUBST([DAP_SERVER_LIBS])
+  AC_SUBST([DAP_STATIC_LIBS])
+  AC_SUBST([DAP_CLIENT_STATIC_LIBS])
+  AC_SUBST([DAP_SERVER_STATIC_LIBS])
+]) 
+
+# AC_CHECK_DODS([ ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+# Test for Libdap or older versions. Define DAP_CFLAGS and DAP_LIBS and
+# optionnaly DAP_ROOT
+
+AC_DEFUN([AC_CHECK_DODS],
+[
+  AC_ARG_WITH([dods_root],
+    [AS_HELP_STRING([--with-dods-root=ARG],[DODS root fallback])],
+    ,,)
+
+  ac_dods_ok='no'
+  DAP_ROOT=
+  AC_MSG_CHECKING([DODS specific root])
+  if test -z "$with_dods_root" -o "$with_dods_root" = "no"; then
+    AC_MSG_RESULT([disabled])
+  else
+    AC_MSG_RESULT([$with_dods_root])
+    DODS_ROOT=$with_dods_root
+    DODS_LIB=$with_dods_root/lib
+    DODS_INC=$with_dods_root/include
+    DODS_BIN=$with_dods_root/bin
+
+    dnl Add the DODS libraries to LIBS
+    if test -x "$DODS_BIN/opendap-config" ; then 
+      dnl OPeNDAP 3.4 and earlier lack opendap-config, but use it if avail.
+      DAP_LIBS="`$DODS_BIN/opendap-config --libs`"
+      DAP_CFLAGS="`$DODS_BIN/opendap-config --cflags`"
+      ac_dods_ok='yes'
+    elif test -x "$DODS_BIN/dap-config" ; then
+      dnl for OPeNDAP 3.5
+      DAP_LIBS="`$DODS_BIN/dap-config --libs`"
+      DAP_CFLAGS="`$DODS_BIN/dap-config --cflags`"
+      ac_dods_ok='yes'
+    else
+      dnl Otherwise try to put things together in a more primitive way.
+      DAP_LIBS="-L$DODS_LIB -ldap++ -lpthread"
+      DAP_CFLAGS="-I$DODS_INC"
+    
+      ac_dods_curl='yes'
+      dnl Add curl to LIBS; it might be local to DODS or generally installed
+      AC_MSG_CHECKING([For curl])
+      if test -x "$DODS_BIN/curl-config"; then
+         DAP_LIBS="$DAP_LIBS  `$DODS_BIN/curl-config --libs`"
+      elif which curl-config > /dev/null 2>&1; then
+         DAP_LIBS="$DAP_LIBS  `curl-config --libs`"
+      else
+         ac_dods_curl='no'
+      fi
+      if test $ac_dods_curl = 'no' ; then
+         AC_MSG_RESULT([no]) 
+         dnl AC_MSG_WARN([You gave a dods root, but I can't find curl!])
+      else
+         AC_MSG_RESULT([yes])
+      fi 
+         
+      
+      AC_MSG_CHECKING([For libxml2])
+      ac_dods_xml2='yes'
+      if test -x "$DODS_BIN/xml2-config"; then
+         DAP_LIBS="$DAP_LIBS `$DODS_BIN/xml2-config --libs`"
+      elif which xml2-config > /dev/null 2>&1; then
+         DAP_LIBS="$DAP_LIBS  `xml2-config --libs`"
+      else
+         ac_dods_xml2='no'
+      fi
+      if test $ac_dods_xml2 = 'no' ; then
+         AC_MSG_RESULT([no]) 
+         dnl AC_MSG_WARN([You gave a dods root, but I can't find xml2!])
+      else
+         AC_MSG_RESULT([yes])
+      fi 
+         
+      AC_LANG_PUSH([C++])
+      if test $ac_dods_xml2 = 'yes' -a $ac_dods_curl = 'yes'; then
+         dnl We check that linking is succesfull
+         ac_save_LIBS=$LIBS
+         ac_save_CFLAGS=$CFLAGS
+         LIBS="$LIBS $DAP_LIBS"
+         CFLAGS="$CFLAGS $DAP_CFLAGS"
+         dnl AC_CHECK_LIB is not used because it caches results
+         dnl AC_CHECK_LIB([dap++],[main],[ac_dods_ok='yes'],[ac_dods_ok='no'])
+         AC_MSG_CHECKING([for DODS with curl and libxml2])
+         AC_LINK_IFELSE([AC_LANG_CALL([],[main])],[
+           ac_dods_ok='yes'
+           AC_MSG_RESULT([yes])
+         ],[
+           ac_dods_ok='no'
+           AC_MSG_RESULT([no])
+         ])
+         LIBS=$ac_save_LIBS
+         CFLAGS=$ac_save_CFLAGS
+         if test "z$ac_dods_ok" = "zno"; then
+           ac_save_LIBS=$LIBS
+           ac_save_CFLAGS=$CFLAGS
+           LIBS="$LIBS $DAP_LIBS -lrx"
+           CFLAGS="$CFLAGS $DAP_CFLAGS"
+           AC_MSG_CHECKING([for DODS with curl, libxml2 and librx])
+           AC_LINK_IFELSE([AC_LANG_CALL([],[main])],[
+               AC_MSG_RESULT([yes])
+               ac_dods_ok='yes'
+               DAP_LIBS="$DAP_LIBS -lrx"
+           ],[
+               ac_dods_ok='no'
+               AC_MSG_RESULT([no])
+           ])
+           LIBS=$ac_save_LIBS
+           CFLAGS=$ac_save_CFLAGS
+         fi
+      fi
+      if test $ac_dods_ok = 'no'; then
+         dnl assume it is an old version of DODS
+         AC_MSG_NOTICE([Checking for DODS with libwww and librx])
+         DAP_LIBS="-L$DODS_LIB -ldap++ -lwww -lpthread -lrx"
+         DAP_CFLAGS="-I$DODS_INC"
+         ac_save_LIBS=$LIBS
+         ac_save_CFLAGS=$CFLAGS
+         LIBS="$LIBS $DAP_LIBS"
+         CFLAGS="$CFLAGS $DAP_CFLAGS"
+         AC_CHECK_LIB([dap++],[main],[ac_dods_ok='yes'],[ac_dods_ok='no'])
+         LIBS=$ac_save_LIBS
+         CFLAGS=$ac_save_CFLAGS
+      fi
+      AC_LANG_POP
+    fi
+      
+    AC_MSG_CHECKING([for DODS in a specific root])
+    if test "z$ac_dods_ok" = "zyes"; then
+       AC_MSG_RESULT([yes])
+       AC_MSG_NOTICE([setting DAP_ROOT directory to $DODS_ROOT])
+       DAP_ROOT=$DODS_ROOT
+    else
+       AC_MSG_RESULT([no])
+    fi
+  fi
+  if test "z$ac_dods_ok" = "zno" ; then
+     AC_CHECK_LIBDAP([],[ac_dods_ok='yes'],[ac_dods_ok='no'])
+     if test "z$ac_dods_ok" = "zno" ; then
+       AC_PATH_PROG([OPENDAP_CONFIG], [opendap-config], [no])
+       AC_MSG_CHECKING([for libdap with opendap-config])
+       if test "$OPENDAP_CONFIG" = "no" ; then
+         ac_dods_ok='no'
+         AC_MSG_RESULT([no])
+       else
+         DAP_LIBS="`$OPENDAP_CONFIG --libs`"
+         DAP_CFLAGS="`$OPENDAP_CONFIG --cflags`"
+         ac_dods_ok='yes'
+         AC_MSG_RESULT([yes])
+       fi
+     fi
+  fi 
+  if test "x$ac_dods_ok" = "xyes" ; then
+     if test "z$DAP_CLIENT_LIBS" = 'z' ; then
+       DAP_CLIENT_LIBS=$DAP_LIBS
+       DAP_SERVER_LIBS=$DAP_LIBS
+     fi
+     if test x"$DAP_CFLAGS" != x -a x"$DAP_CLIENT_CFLAGS" = x ; then
+        DAP_CLIENT_CFLAGS=$DAP_CFLAGS
+     fi
+     if test x"$DAP_CFLAGS" != x -a x"$DAP_SERVER_CFLAGS" = x ; then
+       DAP_SERVER_CFLAGS=$DAP_CFLAGS
+     fi
+     if test x"$DAP_STATIC_LIBS" = x ; then
+       DAP_STATIC_LIBS=$DAP_LIBS
+       DAP_CLIENT_STATIC_LIBS=$DAP_CLIENT_LIBS
+       DAP_SERVER_STATIC_LIBS=$DAP_SERVER_LIBS
+     fi
+     m4_if([$1], [], [:], [$1])
+  else
+     DAP_LIBS=""
+     DAP_CFLAGS=""
+     DAP_CLIENT_LIBS=""
+     DAP_SERVER_LIBS=""
+     m4_if([$2], [], [:], [$2])
+  fi
+dnl done above
+dnl  AC_SUBST([DAP_CFLAGS])
+dnl  AC_SUBST([DAP_CLIENT_CFLAGS])
+dnl  AC_SUBST([DAP_SERVER_CFLAGS])
+dnl  AC_SUBST([DAP_LIBS])
+dnl  AC_SUBST([DAP_CLIENT_LIBS])
+dnl  AC_SUBST([DAP_SERVER_LIBS])
+dnl  AC_SUBST([DAP_STATIC_LIBS])
+dnl  AC_SUBST([DAP_CLIENT_STATIC_LIBS])
+dnl  AC_SUBST([DAP_SERVER_STATIC_LIBS])
+dnl  AC_SUBST([DAP_ROOT])
+])
diff --git a/conf/libtool.m4 b/conf/libtool.m4
new file mode 100644
index 0000000..a3bc337
--- /dev/null
+++ b/conf/libtool.m4
@@ -0,0 +1,8369 @@
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+#
+#   Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc.
+#   Written by Gordon Matzigkeit, 1996
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+m4_define([_LT_COPYING], [dnl
+# Copyright (C) 2014 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions.  There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# GNU Libtool is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of of the License, or
+# (at your option) any later version.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program or library that is built
+# using GNU Libtool, you may include this file under the  same
+# distribution terms that you use for the rest of that program.
+#
+# GNU Libtool is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+])
+
+# serial 58 LT_INIT
+
+
+# LT_PREREQ(VERSION)
+# ------------------
+# Complain and exit if this libtool version is less that VERSION.
+m4_defun([LT_PREREQ],
+[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
+       [m4_default([$3],
+		   [m4_fatal([Libtool version $1 or higher is required],
+		             63)])],
+       [$2])])
+
+
+# _LT_CHECK_BUILDDIR
+# ------------------
+# Complain if the absolute build directory name contains unusual characters
+m4_defun([_LT_CHECK_BUILDDIR],
+[case `pwd` in
+  *\ * | *\	*)
+    AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
+esac
+])
+
+
+# LT_INIT([OPTIONS])
+# ------------------
+AC_DEFUN([LT_INIT],
+[AC_PREREQ([2.62])dnl We use AC_PATH_PROGS_FEATURE_CHECK
+AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+AC_BEFORE([$0], [LT_LANG])dnl
+AC_BEFORE([$0], [LT_OUTPUT])dnl
+AC_BEFORE([$0], [LTDL_INIT])dnl
+m4_require([_LT_CHECK_BUILDDIR])dnl
+
+dnl Autoconf doesn't catch unexpanded LT_ macros by default:
+m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
+m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
+dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
+dnl unless we require an AC_DEFUNed macro:
+AC_REQUIRE([LTOPTIONS_VERSION])dnl
+AC_REQUIRE([LTSUGAR_VERSION])dnl
+AC_REQUIRE([LTVERSION_VERSION])dnl
+AC_REQUIRE([LTOBSOLETE_VERSION])dnl
+m4_require([_LT_PROG_LTMAIN])dnl
+
+_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
+
+dnl Parse OPTIONS
+_LT_SET_OPTIONS([$0], [$1])
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS=$ltmain
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+AC_SUBST(LIBTOOL)dnl
+
+_LT_SETUP
+
+# Only expand once:
+m4_define([LT_INIT])
+])# LT_INIT
+
+# Old names:
+AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
+AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
+dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
+
+
+# _LT_PREPARE_CC_BASENAME
+# -----------------------
+m4_defun([_LT_PREPARE_CC_BASENAME], [
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+func_cc_basename ()
+{
+    for cc_temp in @S|@*""; do
+      case $cc_temp in
+        compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
+        distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
+        \-*) ;;
+        *) break;;
+      esac
+    done
+    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+}
+])# _LT_PREPARE_CC_BASENAME
+
+
+# _LT_CC_BASENAME(CC)
+# -------------------
+# It would be clearer to call AC_REQUIREs from _LT_PREPARE_CC_BASENAME,
+# but that macro is also expanded into generated libtool script, which
+# arranges for $SED and $ECHO to be set by different means.
+m4_defun([_LT_CC_BASENAME],
+[m4_require([_LT_PREPARE_CC_BASENAME])dnl
+AC_REQUIRE([_LT_DECL_SED])dnl
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
+func_cc_basename $1
+cc_basename=$func_cc_basename_result
+])
+
+
+# _LT_FILEUTILS_DEFAULTS
+# ----------------------
+# It is okay to use these file commands and assume they have been set
+# sensibly after 'm4_require([_LT_FILEUTILS_DEFAULTS])'.
+m4_defun([_LT_FILEUTILS_DEFAULTS],
+[: ${CP="cp -f"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+])# _LT_FILEUTILS_DEFAULTS
+
+
+# _LT_SETUP
+# ---------
+m4_defun([_LT_SETUP],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
+
+_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
+dnl
+_LT_DECL([], [host_alias], [0], [The host system])dnl
+_LT_DECL([], [host], [0])dnl
+_LT_DECL([], [host_os], [0])dnl
+dnl
+_LT_DECL([], [build_alias], [0], [The build system])dnl
+_LT_DECL([], [build], [0])dnl
+_LT_DECL([], [build_os], [0])dnl
+dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([LT_PATH_LD])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+dnl
+AC_REQUIRE([AC_PROG_LN_S])dnl
+test -z "$LN_S" && LN_S="ln -s"
+_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
+dnl
+AC_REQUIRE([LT_CMD_MAX_LEN])dnl
+_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
+_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
+dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
+m4_require([_LT_CMD_RELOAD])dnl
+m4_require([_LT_CHECK_MAGIC_METHOD])dnl
+m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
+m4_require([_LT_CMD_OLD_ARCHIVE])dnl
+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+m4_require([_LT_WITH_SYSROOT])dnl
+m4_require([_LT_CMD_TRUNCATE])dnl
+
+_LT_CONFIG_LIBTOOL_INIT([
+# See if we are running on zsh, and set the options that allow our
+# commands through without removal of \ escapes INIT.
+if test -n "\${ZSH_VERSION+set}"; then
+   setopt NO_GLOB_SUBST
+fi
+])
+if test -n "${ZSH_VERSION+set}"; then
+   setopt NO_GLOB_SUBST
+fi
+
+_LT_CHECK_OBJDIR
+
+m4_require([_LT_TAG_COMPILER])dnl
+
+case $host_os in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems
+  # vanish in a puff of smoke.
+  if test set != "${COLLECT_NAMES+set}"; then
+    COLLECT_NAMES=
+    export COLLECT_NAMES
+  fi
+  ;;
+esac
+
+# Global variables:
+ofile=libtool
+can_build_shared=yes
+
+# All known linkers require a '.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+
+with_gnu_ld=$lt_cv_prog_gnu_ld
+
+old_CC=$CC
+old_CFLAGS=$CFLAGS
+
+# Set sane defaults for various variables
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+test -z "$LD" && LD=ld
+test -z "$ac_objext" && ac_objext=o
+
+_LT_CC_BASENAME([$compiler])
+
+# Only perform the check for file, if the check method requires it
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+case $deplibs_check_method in
+file_magic*)
+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+    _LT_PATH_MAGIC
+  fi
+  ;;
+esac
+
+# Use C for the default configuration in the libtool script
+LT_SUPPORTED_TAG([CC])
+_LT_LANG_C_CONFIG
+_LT_LANG_DEFAULT_CONFIG
+_LT_CONFIG_COMMANDS
+])# _LT_SETUP
+
+
+# _LT_PREPARE_SED_QUOTE_VARS
+# --------------------------
+# Define a few sed substitution that help us do robust quoting.
+m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
+[# Backslashify metacharacters that are still active within
+# double-quoted strings.
+sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\([["`\\]]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+])
+
+# _LT_PROG_LTMAIN
+# ---------------
+# Note that this code is called both from 'configure', and 'config.status'
+# now that we use AC_CONFIG_COMMANDS to generate libtool.  Notably,
+# 'config.status' has no value for ac_aux_dir unless we are using Automake,
+# so we pass a copy along to make sure it has a sensible value anyway.
+m4_defun([_LT_PROG_LTMAIN],
+[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
+_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
+ltmain=$ac_aux_dir/ltmain.sh
+])# _LT_PROG_LTMAIN
+
+
+## ------------------------------------- ##
+## Accumulate code for creating libtool. ##
+## ------------------------------------- ##
+
+# So that we can recreate a full libtool script including additional
+# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
+# in macros and then make a single call at the end using the 'libtool'
+# label.
+
+
+# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
+# ----------------------------------------
+# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
+m4_define([_LT_CONFIG_LIBTOOL_INIT],
+[m4_ifval([$1],
+          [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
+                     [$1
+])])])
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_INIT])
+
+
+# _LT_CONFIG_LIBTOOL([COMMANDS])
+# ------------------------------
+# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
+m4_define([_LT_CONFIG_LIBTOOL],
+[m4_ifval([$1],
+          [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
+                     [$1
+])])])
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
+
+
+# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
+# -----------------------------------------------------
+m4_defun([_LT_CONFIG_SAVE_COMMANDS],
+[_LT_CONFIG_LIBTOOL([$1])
+_LT_CONFIG_LIBTOOL_INIT([$2])
+])
+
+
+# _LT_FORMAT_COMMENT([COMMENT])
+# -----------------------------
+# Add leading comment marks to the start of each line, and a trailing
+# full-stop to the whole comment if one is not present already.
+m4_define([_LT_FORMAT_COMMENT],
+[m4_ifval([$1], [
+m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
+              [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
+)])
+
+
+
+## ------------------------ ##
+## FIXME: Eliminate VARNAME ##
+## ------------------------ ##
+
+
+# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
+# -------------------------------------------------------------------
+# CONFIGNAME is the name given to the value in the libtool script.
+# VARNAME is the (base) name used in the configure script.
+# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
+# VARNAME.  Any other value will be used directly.
+m4_define([_LT_DECL],
+[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
+    [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
+	[m4_ifval([$1], [$1], [$2])])
+    lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
+    m4_ifval([$4],
+	[lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
+    lt_dict_add_subkey([lt_decl_dict], [$2],
+	[tagged?], [m4_ifval([$5], [yes], [no])])])
+])
+
+
+# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
+# --------------------------------------------------------
+m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
+
+
+# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
+# ------------------------------------------------
+m4_define([lt_decl_tag_varnames],
+[_lt_decl_filter([tagged?], [yes], $@)])
+
+
+# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
+# ---------------------------------------------------------
+m4_define([_lt_decl_filter],
+[m4_case([$#],
+  [0], [m4_fatal([$0: too few arguments: $#])],
+  [1], [m4_fatal([$0: too few arguments: $#: $1])],
+  [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],
+  [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],
+  [lt_dict_filter([lt_decl_dict], $@)])[]dnl
+])
+
+
+# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
+# --------------------------------------------------
+m4_define([lt_decl_quote_varnames],
+[_lt_decl_filter([value], [1], $@)])
+
+
+# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
+# ---------------------------------------------------
+m4_define([lt_decl_dquote_varnames],
+[_lt_decl_filter([value], [2], $@)])
+
+
+# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
+# ---------------------------------------------------
+m4_define([lt_decl_varnames_tagged],
+[m4_assert([$# <= 2])dnl
+_$0(m4_quote(m4_default([$1], [[, ]])),
+    m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
+    m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
+m4_define([_lt_decl_varnames_tagged],
+[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
+
+
+# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
+# ------------------------------------------------
+m4_define([lt_decl_all_varnames],
+[_$0(m4_quote(m4_default([$1], [[, ]])),
+     m4_if([$2], [],
+	   m4_quote(lt_decl_varnames),
+	m4_quote(m4_shift($@))))[]dnl
+])
+m4_define([_lt_decl_all_varnames],
+[lt_join($@, lt_decl_varnames_tagged([$1],
+			lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
+])
+
+
+# _LT_CONFIG_STATUS_DECLARE([VARNAME])
+# ------------------------------------
+# Quote a variable value, and forward it to 'config.status' so that its
+# declaration there will have the same value as in 'configure'.  VARNAME
+# must have a single quote delimited value for this to work.
+m4_define([_LT_CONFIG_STATUS_DECLARE],
+[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
+
+
+# _LT_CONFIG_STATUS_DECLARATIONS
+# ------------------------------
+# We delimit libtool config variables with single quotes, so when
+# we write them to config.status, we have to be sure to quote all
+# embedded single quotes properly.  In configure, this macro expands
+# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
+#
+#    <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
+m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
+[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
+    [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
+
+
+# _LT_LIBTOOL_TAGS
+# ----------------
+# Output comment and list of tags supported by the script
+m4_defun([_LT_LIBTOOL_TAGS],
+[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
+available_tags='_LT_TAGS'dnl
+])
+
+
+# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
+# -----------------------------------
+# Extract the dictionary values for VARNAME (optionally with TAG) and
+# expand to a commented shell variable setting:
+#
+#    # Some comment about what VAR is for.
+#    visible_name=$lt_internal_name
+m4_define([_LT_LIBTOOL_DECLARE],
+[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1],
+					   [description])))[]dnl
+m4_pushdef([_libtool_name],
+    m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl
+m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])),
+    [0], [_libtool_name=[$]$1],
+    [1], [_libtool_name=$lt_[]$1],
+    [2], [_libtool_name=$lt_[]$1],
+    [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl
+m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
+])
+
+
+# _LT_LIBTOOL_CONFIG_VARS
+# -----------------------
+# Produce commented declarations of non-tagged libtool config variables
+# suitable for insertion in the LIBTOOL CONFIG section of the 'libtool'
+# script.  Tagged libtool config variables (even for the LIBTOOL CONFIG
+# section) are produced by _LT_LIBTOOL_TAG_VARS.
+m4_defun([_LT_LIBTOOL_CONFIG_VARS],
+[m4_foreach([_lt_var],
+    m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),
+    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])
+
+
+# _LT_LIBTOOL_TAG_VARS(TAG)
+# -------------------------
+m4_define([_LT_LIBTOOL_TAG_VARS],
+[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),
+    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])
+
+
+# _LT_TAGVAR(VARNAME, [TAGNAME])
+# ------------------------------
+m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
+
+
+# _LT_CONFIG_COMMANDS
+# -------------------
+# Send accumulated output to $CONFIG_STATUS.  Thanks to the lists of
+# variables for single and double quote escaping we saved from calls
+# to _LT_DECL, we can put quote escaped variables declarations
+# into 'config.status', and then the shell code to quote escape them in
+# for loops in 'config.status'.  Finally, any additional code accumulated
+# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
+m4_defun([_LT_CONFIG_COMMANDS],
+[AC_PROVIDE_IFELSE([LT_OUTPUT],
+	dnl If the libtool generation code has been placed in $CONFIG_LT,
+	dnl instead of duplicating it all over again into config.status,
+	dnl then we will have config.status run $CONFIG_LT later, so it
+	dnl needs to know what name is stored there:
+        [AC_CONFIG_COMMANDS([libtool],
+            [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])],
+    dnl If the libtool generation code is destined for config.status,
+    dnl expand the accumulated commands and init code now:
+    [AC_CONFIG_COMMANDS([libtool],
+        [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])])
+])#_LT_CONFIG_COMMANDS
+
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],
+[
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+sed_quote_subst='$sed_quote_subst'
+double_quote_subst='$double_quote_subst'
+delay_variable_subst='$delay_variable_subst'
+_LT_CONFIG_STATUS_DECLARATIONS
+LTCC='$LTCC'
+LTCFLAGS='$LTCFLAGS'
+compiler='$compiler_DEFAULT'
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$[]1
+_LTECHO_EOF'
+}
+
+# Quote evaled strings.
+for var in lt_decl_all_varnames([[ \
+]], lt_decl_quote_varnames); do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[[\\\\\\\`\\"\\\$]]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+# Double-quote double-evaled strings.
+for var in lt_decl_all_varnames([[ \
+]], lt_decl_dquote_varnames); do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[[\\\\\\\`\\"\\\$]]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+_LT_OUTPUT_LIBTOOL_INIT
+])
+
+# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
+# ------------------------------------
+# Generate a child script FILE with all initialization necessary to
+# reuse the environment learned by the parent script, and make the
+# file executable.  If COMMENT is supplied, it is inserted after the
+# '#!' sequence but before initialization text begins.  After this
+# macro, additional text can be appended to FILE to form the body of
+# the child script.  The macro ends with non-zero status if the
+# file could not be fully written (such as if the disk is full).
+m4_ifdef([AS_INIT_GENERATED],
+[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
+[m4_defun([_LT_GENERATED_FILE_INIT],
+[m4_require([AS_PREPARE])]dnl
+[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
+[lt_write_fail=0
+cat >$1 <<_ASEOF || lt_write_fail=1
+#! $SHELL
+# Generated by $as_me.
+$2
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$1 <<\_ASEOF || lt_write_fail=1
+AS_SHELL_SANITIZE
+_AS_PREPARE
+exec AS_MESSAGE_FD>&1
+_ASEOF
+test 0 = "$lt_write_fail" && chmod +x $1[]dnl
+m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
+
+# LT_OUTPUT
+# ---------
+# This macro allows early generation of the libtool script (before
+# AC_OUTPUT is called), incase it is used in configure for compilation
+# tests.
+AC_DEFUN([LT_OUTPUT],
+[: ${CONFIG_LT=./config.lt}
+AC_MSG_NOTICE([creating $CONFIG_LT])
+_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
+[# Run this file to recreate a libtool stub with the current configuration.])
+
+cat >>"$CONFIG_LT" <<\_LTEOF
+lt_cl_silent=false
+exec AS_MESSAGE_LOG_FD>>config.log
+{
+  echo
+  AS_BOX([Running $as_me.])
+} >&AS_MESSAGE_LOG_FD
+
+lt_cl_help="\
+'$as_me' creates a local libtool stub from the current configuration,
+for use in further configure time tests before the real libtool is
+generated.
+
+Usage: $[0] [[OPTIONS]]
+
+  -h, --help      print this help, then exit
+  -V, --version   print version number, then exit
+  -q, --quiet     do not print progress messages
+  -d, --debug     don't remove temporary files
+
+Report bugs to <bug-libtool@gnu.org>."
+
+lt_cl_version="\
+m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
+m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
+configured by $[0], generated by m4_PACKAGE_STRING.
+
+Copyright (C) 2011 Free Software Foundation, Inc.
+This config.lt script is free software; the Free Software Foundation
+gives unlimited permision to copy, distribute and modify it."
+
+while test 0 != $[#]
+do
+  case $[1] in
+    --version | --v* | -V )
+      echo "$lt_cl_version"; exit 0 ;;
+    --help | --h* | -h )
+      echo "$lt_cl_help"; exit 0 ;;
+    --debug | --d* | -d )
+      debug=: ;;
+    --quiet | --q* | --silent | --s* | -q )
+      lt_cl_silent=: ;;
+
+    -*) AC_MSG_ERROR([unrecognized option: $[1]
+Try '$[0] --help' for more information.]) ;;
+
+    *) AC_MSG_ERROR([unrecognized argument: $[1]
+Try '$[0] --help' for more information.]) ;;
+  esac
+  shift
+done
+
+if $lt_cl_silent; then
+  exec AS_MESSAGE_FD>/dev/null
+fi
+_LTEOF
+
+cat >>"$CONFIG_LT" <<_LTEOF
+_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
+_LTEOF
+
+cat >>"$CONFIG_LT" <<\_LTEOF
+AC_MSG_NOTICE([creating $ofile])
+_LT_OUTPUT_LIBTOOL_COMMANDS
+AS_EXIT(0)
+_LTEOF
+chmod +x "$CONFIG_LT"
+
+# configure is writing to config.log, but config.lt does its own redirection,
+# appending to config.log, which fails on DOS, as config.log is still kept
+# open by configure.  Here we exec the FD to /dev/null, effectively closing
+# config.log, so it can be properly (re)opened and appended to by config.lt.
+lt_cl_success=:
+test yes = "$silent" &&
+  lt_config_lt_args="$lt_config_lt_args --quiet"
+exec AS_MESSAGE_LOG_FD>/dev/null
+$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
+exec AS_MESSAGE_LOG_FD>>config.log
+$lt_cl_success || AS_EXIT(1)
+])# LT_OUTPUT
+
+
+# _LT_CONFIG(TAG)
+# ---------------
+# If TAG is the built-in tag, create an initial libtool script with a
+# default configuration from the untagged config vars.  Otherwise add code
+# to config.status for appending the configuration named by TAG from the
+# matching tagged config vars.
+m4_defun([_LT_CONFIG],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+_LT_CONFIG_SAVE_COMMANDS([
+  m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
+  m4_if(_LT_TAG, [C], [
+    # See if we are running on zsh, and set the options that allow our
+    # commands through without removal of \ escapes.
+    if test -n "${ZSH_VERSION+set}"; then
+      setopt NO_GLOB_SUBST
+    fi
+
+    cfgfile=${ofile}T
+    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
+    $RM "$cfgfile"
+
+    cat <<_LT_EOF >> "$cfgfile"
+#! $SHELL
+# Generated automatically by $as_me ($PACKAGE) $VERSION
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+
+# Provide generalized library-building support services.
+# Written by Gordon Matzigkeit, 1996
+
+_LT_COPYING
+_LT_LIBTOOL_TAGS
+
+# Configured defaults for sys_lib_dlsearch_path munging.
+: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
+
+# ### BEGIN LIBTOOL CONFIG
+_LT_LIBTOOL_CONFIG_VARS
+_LT_LIBTOOL_TAG_VARS
+# ### END LIBTOOL CONFIG
+
+_LT_EOF
+
+    cat <<'_LT_EOF' >> "$cfgfile"
+
+# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
+
+_LT_PREPARE_MUNGE_PATH_LIST
+_LT_PREPARE_CC_BASENAME
+
+# ### END FUNCTIONS SHARED WITH CONFIGURE
+
+_LT_EOF
+
+  case $host_os in
+  aix3*)
+    cat <<\_LT_EOF >> "$cfgfile"
+# AIX sometimes has problems with the GCC collect2 program.  For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test set != "${COLLECT_NAMES+set}"; then
+  COLLECT_NAMES=
+  export COLLECT_NAMES
+fi
+_LT_EOF
+    ;;
+  esac
+
+  _LT_PROG_LTMAIN
+
+  # We use sed instead of cat because bash on DJGPP gets confused if
+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+  # text mode, it properly converts lines to CR/LF.  This bash problem
+  # is reportedly fixed, but why not run on old versions too?
+  sed '$q' "$ltmain" >> "$cfgfile" \
+     || (rm -f "$cfgfile"; exit 1)
+
+   mv -f "$cfgfile" "$ofile" ||
+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+  chmod +x "$ofile"
+],
+[cat <<_LT_EOF >> "$ofile"
+
+dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
+dnl in a comment (ie after a #).
+# ### BEGIN LIBTOOL TAG CONFIG: $1
+_LT_LIBTOOL_TAG_VARS(_LT_TAG)
+# ### END LIBTOOL TAG CONFIG: $1
+_LT_EOF
+])dnl /m4_if
+],
+[m4_if([$1], [], [
+    PACKAGE='$PACKAGE'
+    VERSION='$VERSION'
+    RM='$RM'
+    ofile='$ofile'], [])
+])dnl /_LT_CONFIG_SAVE_COMMANDS
+])# _LT_CONFIG
+
+
+# LT_SUPPORTED_TAG(TAG)
+# ---------------------
+# Trace this macro to discover what tags are supported by the libtool
+# --tag option, using:
+#    autoconf --trace 'LT_SUPPORTED_TAG:$1'
+AC_DEFUN([LT_SUPPORTED_TAG], [])
+
+
+# C support is built-in for now
+m4_define([_LT_LANG_C_enabled], [])
+m4_define([_LT_TAGS], [])
+
+
+# LT_LANG(LANG)
+# -------------
+# Enable libtool support for the given language if not already enabled.
+AC_DEFUN([LT_LANG],
+[AC_BEFORE([$0], [LT_OUTPUT])dnl
+m4_case([$1],
+  [C],			[_LT_LANG(C)],
+  [C++],		[_LT_LANG(CXX)],
+  [Go],			[_LT_LANG(GO)],
+  [Java],		[_LT_LANG(GCJ)],
+  [Fortran 77],		[_LT_LANG(F77)],
+  [Fortran],		[_LT_LANG(FC)],
+  [Windows Resource],	[_LT_LANG(RC)],
+  [m4_ifdef([_LT_LANG_]$1[_CONFIG],
+    [_LT_LANG($1)],
+    [m4_fatal([$0: unsupported language: "$1"])])])dnl
+])# LT_LANG
+
+
+# _LT_LANG(LANGNAME)
+# ------------------
+m4_defun([_LT_LANG],
+[m4_ifdef([_LT_LANG_]$1[_enabled], [],
+  [LT_SUPPORTED_TAG([$1])dnl
+  m4_append([_LT_TAGS], [$1 ])dnl
+  m4_define([_LT_LANG_]$1[_enabled], [])dnl
+  _LT_LANG_$1_CONFIG($1)])dnl
+])# _LT_LANG
+
+
+m4_ifndef([AC_PROG_GO], [
+############################################################
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_GO.  When it is available in    #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+############################################################
+m4_defun([AC_PROG_GO],
+[AC_LANG_PUSH(Go)dnl
+AC_ARG_VAR([GOC],     [Go compiler command])dnl
+AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
+_AC_ARG_VAR_LDFLAGS()dnl
+AC_CHECK_TOOL(GOC, gccgo)
+if test -z "$GOC"; then
+  if test -n "$ac_tool_prefix"; then
+    AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
+  fi
+fi
+if test -z "$GOC"; then
+  AC_CHECK_PROG(GOC, gccgo, gccgo, false)
+fi
+])#m4_defun
+])#m4_ifndef
+
+
+# _LT_LANG_DEFAULT_CONFIG
+# -----------------------
+m4_defun([_LT_LANG_DEFAULT_CONFIG],
+[AC_PROVIDE_IFELSE([AC_PROG_CXX],
+  [LT_LANG(CXX)],
+  [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])])
+
+AC_PROVIDE_IFELSE([AC_PROG_F77],
+  [LT_LANG(F77)],
+  [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])])
+
+AC_PROVIDE_IFELSE([AC_PROG_FC],
+  [LT_LANG(FC)],
+  [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])])
+
+dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal
+dnl pulling things in needlessly.
+AC_PROVIDE_IFELSE([AC_PROG_GCJ],
+  [LT_LANG(GCJ)],
+  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
+    [LT_LANG(GCJ)],
+    [AC_PROVIDE_IFELSE([LT_PROG_GCJ],
+      [LT_LANG(GCJ)],
+      [m4_ifdef([AC_PROG_GCJ],
+	[m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])])
+       m4_ifdef([A][M_PROG_GCJ],
+	[m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])])
+       m4_ifdef([LT_PROG_GCJ],
+	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
+
+AC_PROVIDE_IFELSE([AC_PROG_GO],
+  [LT_LANG(GO)],
+  [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
+
+AC_PROVIDE_IFELSE([LT_PROG_RC],
+  [LT_LANG(RC)],
+  [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
+])# _LT_LANG_DEFAULT_CONFIG
+
+# Obsolete macros:
+AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
+AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
+AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
+AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
+AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
+dnl AC_DEFUN([AC_LIBTOOL_F77], [])
+dnl AC_DEFUN([AC_LIBTOOL_FC], [])
+dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
+dnl AC_DEFUN([AC_LIBTOOL_RC], [])
+
+
+# _LT_TAG_COMPILER
+# ----------------
+m4_defun([_LT_TAG_COMPILER],
+[AC_REQUIRE([AC_PROG_CC])dnl
+
+_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
+_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
+_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
+_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+])# _LT_TAG_COMPILER
+
+
+# _LT_COMPILER_BOILERPLATE
+# ------------------------
+# Check for compiler boilerplate output or warnings with
+# the simple compiler test code.
+m4_defun([_LT_COMPILER_BOILERPLATE],
+[m4_require([_LT_DECL_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$RM conftest*
+])# _LT_COMPILER_BOILERPLATE
+
+
+# _LT_LINKER_BOILERPLATE
+# ----------------------
+# Check for linker boilerplate output or warnings with
+# the simple link test code.
+m4_defun([_LT_LINKER_BOILERPLATE],
+[m4_require([_LT_DECL_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$RM -r conftest*
+])# _LT_LINKER_BOILERPLATE
+
+# _LT_REQUIRED_DARWIN_CHECKS
+# -------------------------
+m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
+  case $host_os in
+    rhapsody* | darwin*)
+    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
+    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
+    AC_CHECK_TOOL([LIPO], [lipo], [:])
+    AC_CHECK_TOOL([OTOOL], [otool], [:])
+    AC_CHECK_TOOL([OTOOL64], [otool64], [:])
+    _LT_DECL([], [DSYMUTIL], [1],
+      [Tool to manipulate archived DWARF debug symbol files on Mac OS X])
+    _LT_DECL([], [NMEDIT], [1],
+      [Tool to change global to local symbols on Mac OS X])
+    _LT_DECL([], [LIPO], [1],
+      [Tool to manipulate fat objects and archives on Mac OS X])
+    _LT_DECL([], [OTOOL], [1],
+      [ldd/readelf like tool for Mach-O binaries on Mac OS X])
+    _LT_DECL([], [OTOOL64], [1],
+      [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4])
+
+    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
+      [lt_cv_apple_cc_single_mod=no
+      if test -z "$LT_MULTI_MODULE"; then
+	# By default we will add the -single_module flag. You can override
+	# by either setting the environment variable LT_MULTI_MODULE
+	# non-empty at configure time, or by adding -multi_module to the
+	# link flags.
+	rm -rf libconftest.dylib*
+	echo "int foo(void){return 1;}" > conftest.c
+	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+-dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD
+	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
+        _lt_result=$?
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&AS_MESSAGE_LOG_FD
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test 0 = "$_lt_result"; then
+	  lt_cv_apple_cc_single_mod=yes
+	else
+	  cat conftest.err >&AS_MESSAGE_LOG_FD
+	fi
+	rm -rf libconftest.dylib*
+	rm -f conftest.*
+      fi])
+
+    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
+      [lt_cv_ld_exported_symbols_list],
+      [lt_cv_ld_exported_symbols_list=no
+      save_LDFLAGS=$LDFLAGS
+      echo "_main" > conftest.sym
+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+	[lt_cv_ld_exported_symbols_list=yes],
+	[lt_cv_ld_exported_symbols_list=no])
+	LDFLAGS=$save_LDFLAGS
+    ])
+
+    AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
+      [lt_cv_ld_force_load=no
+      cat > conftest.c << _LT_EOF
+int forced_loaded() { return 2;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
+      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
+      echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
+      $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
+      echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
+      $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
+      cat > conftest.c << _LT_EOF
+int main() { return 0;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
+      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+      _lt_result=$?
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&AS_MESSAGE_LOG_FD
+      elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then
+	lt_cv_ld_force_load=yes
+      else
+	cat conftest.err >&AS_MESSAGE_LOG_FD
+      fi
+        rm -f conftest.err libconftest.a conftest conftest.c
+        rm -rf conftest.dSYM
+    ])
+    case $host_os in
+    rhapsody* | darwin1.[[012]])
+      _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
+    darwin1.*)
+      _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
+    darwin*) # darwin 5.x on
+      # if running on 10.5 or later, the deployment target defaults
+      # to the OS version, if on x86, and 10.4, the deployment
+      # target defaults to 10.4. Don't you love it?
+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+	10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
+	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+	10.[[012]][[,.]]*)
+	  _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
+	10.*)
+	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+      esac
+    ;;
+  esac
+    if test yes = "$lt_cv_apple_cc_single_mod"; then
+      _lt_dar_single_mod='$single_module'
+    fi
+    if test yes = "$lt_cv_ld_exported_symbols_list"; then
+      _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym'
+    else
+      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib'
+    fi
+    if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then
+      _lt_dsymutil='~$DSYMUTIL $lib || :'
+    else
+      _lt_dsymutil=
+    fi
+    ;;
+  esac
+])
+
+
+# _LT_DARWIN_LINKER_FEATURES([TAG])
+# ---------------------------------
+# Checks for linker and compiler features on darwin
+m4_defun([_LT_DARWIN_LINKER_FEATURES],
+[
+  m4_require([_LT_REQUIRED_DARWIN_CHECKS])
+  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+  _LT_TAGVAR(hardcode_direct, $1)=no
+  _LT_TAGVAR(hardcode_automatic, $1)=yes
+  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+  if test yes = "$lt_cv_ld_force_load"; then
+    _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+    m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
+                  [FC],  [_LT_TAGVAR(compiler_needs_object, $1)=yes])
+  else
+    _LT_TAGVAR(whole_archive_flag_spec, $1)=''
+  fi
+  _LT_TAGVAR(link_all_deplibs, $1)=yes
+  _LT_TAGVAR(allow_undefined_flag, $1)=$_lt_dar_allow_undefined
+  case $cc_basename in
+     ifort*|nagfor*) _lt_dar_can_shared=yes ;;
+     *) _lt_dar_can_shared=$GCC ;;
+  esac
+  if test yes = "$_lt_dar_can_shared"; then
+    output_verbose_link_cmd=func_echo_all
+    _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
+    _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
+    _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
+    _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
+    m4_if([$1], [CXX],
+[   if test yes != "$lt_cv_apple_cc_single_mod"; then
+      _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil"
+      _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil"
+    fi
+],[])
+  else
+  _LT_TAGVAR(ld_shlibs, $1)=no
+  fi
+])
+
+# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
+# ----------------------------------
+# Links a minimal program and checks the executable
+# for the system default hardcoded library path. In most cases,
+# this is /usr/lib:/lib, but when the MPI compilers are used
+# the location of the communication and MPI libs are included too.
+# If we don't find anything, use the default library path according
+# to the aix ld manual.
+# Store the results from the different compilers for each TAGNAME.
+# Allow to override them for all tags through lt_cv_aix_libpath.
+m4_defun([_LT_SYS_MODULE_PATH_AIX],
+[m4_require([_LT_DECL_SED])dnl
+if test set = "${lt_cv_aix_libpath+set}"; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
+  [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
+  lt_aix_libpath_sed='[
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }]'
+  _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
+    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi],[])
+  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
+    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=/usr/lib:/lib
+  fi
+  ])
+  aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
+fi
+])# _LT_SYS_MODULE_PATH_AIX
+
+
+# _LT_SHELL_INIT(ARG)
+# -------------------
+m4_define([_LT_SHELL_INIT],
+[m4_divert_text([M4SH-INIT], [$1
+])])# _LT_SHELL_INIT
+
+
+
+# _LT_PROG_ECHO_BACKSLASH
+# -----------------------
+# Find how we can fake an echo command that does not interpret backslash.
+# In particular, with Autoconf 2.60 or later we add some code to the start
+# of the generated configure script that will find a shell with a builtin
+# printf (that we can use as an echo command).
+m4_defun([_LT_PROG_ECHO_BACKSLASH],
+[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+
+AC_MSG_CHECKING([how to print strings])
+# Test print first, because it will be a builtin if present.
+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
+   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='print -r --'
+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='printf %s\n'
+else
+  # Use this function as a fallback that always works.
+  func_fallback_echo ()
+  {
+    eval 'cat <<_LTECHO_EOF
+$[]1
+_LTECHO_EOF'
+  }
+  ECHO='func_fallback_echo'
+fi
+
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO "$*"
+}
+
+case $ECHO in
+  printf*) AC_MSG_RESULT([printf]) ;;
+  print*) AC_MSG_RESULT([print -r]) ;;
+  *) AC_MSG_RESULT([cat]) ;;
+esac
+
+m4_ifdef([_AS_DETECT_SUGGESTED],
+[_AS_DETECT_SUGGESTED([
+  test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
+    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+    PATH=/empty FPATH=/empty; export PATH FPATH
+    test "X`printf %s $ECHO`" = "X$ECHO" \
+      || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
+
+_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
+_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
+])# _LT_PROG_ECHO_BACKSLASH
+
+
+# _LT_WITH_SYSROOT
+# ----------------
+AC_DEFUN([_LT_WITH_SYSROOT],
+[AC_MSG_CHECKING([for sysroot])
+AC_ARG_WITH([sysroot],
+[AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@],
+  [Search for dependent libraries within DIR (or the compiler's sysroot
+   if not specified).])],
+[], [with_sysroot=no])
+
+dnl lt_sysroot will always be passed unquoted.  We quote it here
+dnl in case the user passed a directory name.
+lt_sysroot=
+case $with_sysroot in #(
+ yes)
+   if test yes = "$GCC"; then
+     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
+   fi
+   ;; #(
+ /*)
+   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
+   ;; #(
+ no|'')
+   ;; #(
+ *)
+   AC_MSG_RESULT([$with_sysroot])
+   AC_MSG_ERROR([The sysroot must be an absolute path.])
+   ;;
+esac
+
+ AC_MSG_RESULT([${lt_sysroot:-no}])
+_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
+[dependent libraries, and where our libraries should be installed.])])
+
+# _LT_ENABLE_LOCK
+# ---------------
+m4_defun([_LT_ENABLE_LOCK],
+[AC_ARG_ENABLE([libtool-lock],
+  [AS_HELP_STRING([--disable-libtool-lock],
+    [avoid locking (might break parallel builds)])])
+test no = "$enable_libtool_lock" || enable_libtool_lock=yes
+
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case $host in
+ia64-*-hpux*)
+  # Find out what ABI is being produced by ac_compile, and set mode
+  # options accordingly.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.$ac_objext` in
+      *ELF-32*)
+	HPUX_IA64_MODE=32
+	;;
+      *ELF-64*)
+	HPUX_IA64_MODE=64
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+*-*-irix6*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
+  echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    if test yes = "$lt_cv_prog_gnu_ld"; then
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -melf32bsmip"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -melf32bmipn32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -melf64bmip"
+	;;
+      esac
+    else
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -32"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -n32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -64"
+	  ;;
+      esac
+    fi
+  fi
+  rm -rf conftest*
+  ;;
+
+mips64*-*linux*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
+  echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    emul=elf
+    case `/usr/bin/file conftest.$ac_objext` in
+      *32-bit*)
+	emul="${emul}32"
+	;;
+      *64-bit*)
+	emul="${emul}64"
+	;;
+    esac
+    case `/usr/bin/file conftest.$ac_objext` in
+      *MSB*)
+	emul="${emul}btsmip"
+	;;
+      *LSB*)
+	emul="${emul}ltsmip"
+	;;
+    esac
+    case `/usr/bin/file conftest.$ac_objext` in
+      *N32*)
+	emul="${emul}n32"
+	;;
+    esac
+    LD="${LD-ld} -m $emul"
+  fi
+  rm -rf conftest*
+  ;;
+
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
+s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.  Note that the listed cases only cover the
+  # situations where additional linker options are needed (such as when
+  # doing 32-bit compilation for a host where ld defaults to 64-bit, or
+  # vice versa); the common cases where no linker options are needed do
+  # not appear in the list.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.o` in
+      *32-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_i386_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    case `/usr/bin/file conftest.o` in
+	      *x86-64*)
+		LD="${LD-ld} -m elf32_x86_64"
+		;;
+	      *)
+		LD="${LD-ld} -m elf_i386"
+		;;
+	    esac
+	    ;;
+	  powerpc64le-*linux*)
+	    LD="${LD-ld} -m elf32lppclinux"
+	    ;;
+	  powerpc64-*linux*)
+	    LD="${LD-ld} -m elf32ppclinux"
+	    ;;
+	  s390x-*linux*)
+	    LD="${LD-ld} -m elf_s390"
+	    ;;
+	  sparc64-*linux*)
+	    LD="${LD-ld} -m elf32_sparc"
+	    ;;
+	esac
+	;;
+      *64-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_x86_64_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    LD="${LD-ld} -m elf_x86_64"
+	    ;;
+	  powerpcle-*linux*)
+	    LD="${LD-ld} -m elf64lppc"
+	    ;;
+	  powerpc-*linux*)
+	    LD="${LD-ld} -m elf64ppc"
+	    ;;
+	  s390*-*linux*|s390*-*tpf*)
+	    LD="${LD-ld} -m elf64_s390"
+	    ;;
+	  sparc*-*linux*)
+	    LD="${LD-ld} -m elf64_sparc"
+	    ;;
+	esac
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
+*-*-sco3.2v5*)
+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+  SAVE_CFLAGS=$CFLAGS
+  CFLAGS="$CFLAGS -belf"
+  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
+    [AC_LANG_PUSH(C)
+     AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
+     AC_LANG_POP])
+  if test yes != "$lt_cv_cc_needs_belf"; then
+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+    CFLAGS=$SAVE_CFLAGS
+  fi
+  ;;
+*-*solaris*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.o` in
+    *64-bit*)
+      case $lt_cv_prog_gnu_ld in
+      yes*)
+        case $host in
+        i?86-*-solaris*|x86_64-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD=${LD-ld}_sol2
+        fi
+        ;;
+      *)
+	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+	  LD="${LD-ld} -64"
+	fi
+	;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+esac
+
+need_locks=$enable_libtool_lock
+])# _LT_ENABLE_LOCK
+
+
+# _LT_PROG_AR
+# -----------
+m4_defun([_LT_PROG_AR],
+[AC_CHECK_TOOLS(AR, [ar], false)
+: ${AR=ar}
+: ${AR_FLAGS=cru}
+_LT_DECL([], [AR], [1], [The archiver])
+_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
+
+AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
+  [lt_cv_ar_at_file=no
+   AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
+     [echo conftest.$ac_objext > conftest.lst
+      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
+      AC_TRY_EVAL([lt_ar_try])
+      if test 0 -eq "$ac_status"; then
+	# Ensure the archiver fails upon bogus file names.
+	rm -f conftest.$ac_objext libconftest.a
+	AC_TRY_EVAL([lt_ar_try])
+	if test 0 -ne "$ac_status"; then
+          lt_cv_ar_at_file=@
+        fi
+      fi
+      rm -f conftest.* libconftest.a
+     ])
+  ])
+
+if test no = "$lt_cv_ar_at_file"; then
+  archiver_list_spec=
+else
+  archiver_list_spec=$lt_cv_ar_at_file
+fi
+_LT_DECL([], [archiver_list_spec], [1],
+  [How to feed a file listing to the archiver])
+])# _LT_PROG_AR
+
+
+# _LT_CMD_OLD_ARCHIVE
+# -------------------
+m4_defun([_LT_CMD_OLD_ARCHIVE],
+[_LT_PROG_AR
+
+AC_CHECK_TOOL(STRIP, strip, :)
+test -z "$STRIP" && STRIP=:
+_LT_DECL([], [STRIP], [1], [A symbol stripping program])
+
+AC_CHECK_TOOL(RANLIB, ranlib, :)
+test -z "$RANLIB" && RANLIB=:
+_LT_DECL([], [RANLIB], [1],
+    [Commands used to install an old-style archive])
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+  case $host_os in
+  bitrig* | openbsd*)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
+    ;;
+  *)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
+    ;;
+  esac
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
+fi
+
+case $host_os in
+  darwin*)
+    lock_old_archive_extraction=yes ;;
+  *)
+    lock_old_archive_extraction=no ;;
+esac
+_LT_DECL([], [old_postinstall_cmds], [2])
+_LT_DECL([], [old_postuninstall_cmds], [2])
+_LT_TAGDECL([], [old_archive_cmds], [2],
+    [Commands used to build an old-style archive])
+_LT_DECL([], [lock_old_archive_extraction], [0],
+    [Whether to use a lock for old archive extraction])
+])# _LT_CMD_OLD_ARCHIVE
+
+
+# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
+# ----------------------------------------------------------------
+# Check whether the given compiler option works
+AC_DEFUN([_LT_COMPILER_OPTION],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
+  [$2=no
+   m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$3"  ## exclude from sc_useless_quotes_in_assignment
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -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:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&AS_MESSAGE_LOG_FD
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   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.
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       $2=yes
+     fi
+   fi
+   $RM conftest*
+])
+
+if test yes = "[$]$2"; then
+    m4_if([$5], , :, [$5])
+else
+    m4_if([$6], , :, [$6])
+fi
+])# _LT_COMPILER_OPTION
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [])
+
+
+# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+#                  [ACTION-SUCCESS], [ACTION-FAILURE])
+# ----------------------------------------------------
+# Check whether the given linker option works
+AC_DEFUN([_LT_LINKER_OPTION],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
+  [$2=no
+   save_LDFLAGS=$LDFLAGS
+   LDFLAGS="$LDFLAGS $3"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&AS_MESSAGE_LOG_FD
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         $2=yes
+       fi
+     else
+       $2=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS=$save_LDFLAGS
+])
+
+if test yes = "[$]$2"; then
+    m4_if([$4], , :, [$4])
+else
+    m4_if([$5], , :, [$5])
+fi
+])# _LT_LINKER_OPTION
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [])
+
+
+# LT_CMD_MAX_LEN
+#---------------
+AC_DEFUN([LT_CMD_MAX_LEN],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+# find the maximum length of command line arguments
+AC_MSG_CHECKING([the maximum length of command line arguments])
+AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+  i=0
+  teststring=ABCD
+
+  case $build_os in
+  msdosdjgpp*)
+    # On DJGPP, this test can blow up pretty badly due to problems in libc
+    # (any single argument exceeding 2000 bytes causes a buffer overrun
+    # during glob expansion).  Even if it were fixed, the result of this
+    # check would be larger than it should be.
+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
+    ;;
+
+  gnu*)
+    # Under GNU Hurd, this test is not required because there is
+    # no limit to the length of command line arguments.
+    # Libtool will interpret -1 as no limit whatsoever
+    lt_cv_sys_max_cmd_len=-1;
+    ;;
+
+  cygwin* | mingw* | cegcc*)
+    # On Win9x/ME, this test blows up -- it succeeds, but takes
+    # about 5 minutes as the teststring grows exponentially.
+    # Worse, since 9x/ME are not pre-emptively multitasking,
+    # you end up with a "frozen" computer, even though with patience
+    # the test eventually succeeds (with a max line length of 256k).
+    # Instead, let's just punt: use the minimum linelength reported by
+    # all of the supported platforms: 8192 (on NT/2K/XP).
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  mint*)
+    # On MiNT this can take a long time and run out of memory.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  amigaos*)
+    # On AmigaOS with pdksh, this test takes hours, literally.
+    # So we just punt and use a minimum line length of 8192.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
+    # This has been around since 386BSD, at least.  Likely further.
+    if test -x /sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+    elif test -x /usr/sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+    else
+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
+    fi
+    # And add a safety zone
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    ;;
+
+  interix*)
+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
+    lt_cv_sys_max_cmd_len=196608
+    ;;
+
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
+  osf*)
+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+    # nice to cause kernel panics so lets avoid the loop below.
+    # First set a reasonable default.
+    lt_cv_sys_max_cmd_len=16384
+    #
+    if test -x /sbin/sysconfig; then
+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
+      esac
+    fi
+    ;;
+  sco3.2v5*)
+    lt_cv_sys_max_cmd_len=102400
+    ;;
+  sysv5* | sco5v6* | sysv4.2uw2*)
+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+    if test -n "$kargmax"; then
+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[	 ]]//'`
+    else
+      lt_cv_sys_max_cmd_len=32768
+    fi
+    ;;
+  *)
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len" && \
+       test undefined != "$lt_cv_sys_max_cmd_len"; then
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    else
+      # Make teststring a little bigger before we do anything with it.
+      # a 1K string should be a reasonable start.
+      for i in 1 2 3 4 5 6 7 8; do
+        teststring=$teststring$teststring
+      done
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      # If test is not a shell built-in, we'll probably end up computing a
+      # maximum length that is only half of the actual maximum length, but
+      # we can't tell.
+      while { test X`env echo "$teststring$teststring" 2>/dev/null` \
+	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
+	      test 17 != "$i" # 1/2 MB should be enough
+      do
+        i=`expr $i + 1`
+        teststring=$teststring$teststring
+      done
+      # Only check the string length outside the loop.
+      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
+      teststring=
+      # Add a significant safety factor because C++ compilers can tack on
+      # massive amounts of additional arguments before passing them to the
+      # linker.  It appears as though 1/2 is a usable value.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
+    ;;
+  esac
+])
+if test -n "$lt_cv_sys_max_cmd_len"; then
+  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
+else
+  AC_MSG_RESULT(none)
+fi
+max_cmd_len=$lt_cv_sys_max_cmd_len
+_LT_DECL([], [max_cmd_len], [0],
+    [What is the maximum length of a command?])
+])# LT_CMD_MAX_LEN
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [])
+
+
+# _LT_HEADER_DLFCN
+# ----------------
+m4_defun([_LT_HEADER_DLFCN],
+[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl
+])# _LT_HEADER_DLFCN
+
+
+# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
+#                      ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
+# ----------------------------------------------------------------
+m4_defun([_LT_TRY_DLOPEN_SELF],
+[m4_require([_LT_HEADER_DLFCN])dnl
+if test yes = "$cross_compiling"; then :
+  [$4]
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<_LT_EOF
+[#line $LINENO "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+/* When -fvisibility=hidden is used, assume the code has been annotated
+   correspondingly for the symbols needed.  */
+#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+
+int fnord () { return 42; }
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else
+        {
+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+	}
+      /* dlclose (self); */
+    }
+  else
+    puts (dlerror ());
+
+  return status;
+}]
+_LT_EOF
+  if AC_TRY_EVAL(ac_link) && test -s "conftest$ac_exeext" 2>/dev/null; then
+    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) $1 ;;
+      x$lt_dlneed_uscore) $2 ;;
+      x$lt_dlunknown|x*) $3 ;;
+    esac
+  else :
+    # compilation failed
+    $3
+  fi
+fi
+rm -fr conftest*
+])# _LT_TRY_DLOPEN_SELF
+
+
+# LT_SYS_DLOPEN_SELF
+# ------------------
+AC_DEFUN([LT_SYS_DLOPEN_SELF],
+[m4_require([_LT_HEADER_DLFCN])dnl
+if test yes != "$enable_dlopen"; then
+  enable_dlopen=unknown
+  enable_dlopen_self=unknown
+  enable_dlopen_self_static=unknown
+else
+  lt_cv_dlopen=no
+  lt_cv_dlopen_libs=
+
+  case $host_os in
+  beos*)
+    lt_cv_dlopen=load_add_on
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ;;
+
+  mingw* | pw32* | cegcc*)
+    lt_cv_dlopen=LoadLibrary
+    lt_cv_dlopen_libs=
+    ;;
+
+  cygwin*)
+    lt_cv_dlopen=dlopen
+    lt_cv_dlopen_libs=
+    ;;
+
+  darwin*)
+    # if libdl is installed we need to link against it
+    AC_CHECK_LIB([dl], [dlopen],
+		[lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],[
+    lt_cv_dlopen=dyld
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ])
+    ;;
+
+  tpf*)
+    # Don't try to run any link tests for TPF.  We know it's impossible
+    # because TPF is a cross-compiler, and we know how we open DSOs.
+    lt_cv_dlopen=dlopen
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=no
+    ;;
+
+  *)
+    AC_CHECK_FUNC([shl_load],
+	  [lt_cv_dlopen=shl_load],
+      [AC_CHECK_LIB([dld], [shl_load],
+	    [lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld],
+	[AC_CHECK_FUNC([dlopen],
+	      [lt_cv_dlopen=dlopen],
+	  [AC_CHECK_LIB([dl], [dlopen],
+		[lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],
+	    [AC_CHECK_LIB([svld], [dlopen],
+		  [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld],
+	      [AC_CHECK_LIB([dld], [dld_link],
+		    [lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld])
+	      ])
+	    ])
+	  ])
+	])
+      ])
+    ;;
+  esac
+
+  if test no = "$lt_cv_dlopen"; then
+    enable_dlopen=no
+  else
+    enable_dlopen=yes
+  fi
+
+  case $lt_cv_dlopen in
+  dlopen)
+    save_CPPFLAGS=$CPPFLAGS
+    test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+    save_LDFLAGS=$LDFLAGS
+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+    save_LIBS=$LIBS
+    LIBS="$lt_cv_dlopen_libs $LIBS"
+
+    AC_CACHE_CHECK([whether a program can dlopen itself],
+	  lt_cv_dlopen_self, [dnl
+	  _LT_TRY_DLOPEN_SELF(
+	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
+	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
+    ])
+
+    if test yes = "$lt_cv_dlopen_self"; then
+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
+	  lt_cv_dlopen_self_static, [dnl
+	  _LT_TRY_DLOPEN_SELF(
+	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
+	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
+      ])
+    fi
+
+    CPPFLAGS=$save_CPPFLAGS
+    LDFLAGS=$save_LDFLAGS
+    LIBS=$save_LIBS
+    ;;
+  esac
+
+  case $lt_cv_dlopen_self in
+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+  *) enable_dlopen_self=unknown ;;
+  esac
+
+  case $lt_cv_dlopen_self_static in
+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+  *) enable_dlopen_self_static=unknown ;;
+  esac
+fi
+_LT_DECL([dlopen_support], [enable_dlopen], [0],
+	 [Whether dlopen is supported])
+_LT_DECL([dlopen_self], [enable_dlopen_self], [0],
+	 [Whether dlopen of programs is supported])
+_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0],
+	 [Whether dlopen of statically linked programs is supported])
+])# LT_SYS_DLOPEN_SELF
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [])
+
+
+# _LT_COMPILER_C_O([TAGNAME])
+# ---------------------------
+# Check to see if options -c and -o are simultaneously supported by compiler.
+# This macro does not hard code the compiler like AC_PROG_CC_C_O.
+m4_defun([_LT_COMPILER_C_O],
+[m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
+  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
+  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -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:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&AS_MESSAGE_LOG_FD
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+     fi
+   fi
+   chmod u+w . 2>&AS_MESSAGE_LOG_FD
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+])
+_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1],
+	[Does compiler simultaneously support -c and -o options?])
+])# _LT_COMPILER_C_O
+
+
+# _LT_COMPILER_FILE_LOCKS([TAGNAME])
+# ----------------------------------
+# Check to see if we can do hard links to lock some files if needed
+m4_defun([_LT_COMPILER_FILE_LOCKS],
+[m4_require([_LT_ENABLE_LOCK])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+_LT_COMPILER_C_O([$1])
+
+hard_links=nottested
+if test no = "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" && test no != "$need_locks"; then
+  # do not overwrite the value of need_locks provided by the user
+  AC_MSG_CHECKING([if we can lock with hard links])
+  hard_links=yes
+  $RM conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  AC_MSG_RESULT([$hard_links])
+  if test no = "$hard_links"; then
+    AC_MSG_WARN(['$CC' does not support '-c -o', so 'make -j' may be unsafe])
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?])
+])# _LT_COMPILER_FILE_LOCKS
+
+
+# _LT_CHECK_OBJDIR
+# ----------------
+m4_defun([_LT_CHECK_OBJDIR],
+[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
+[rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+  lt_cv_objdir=.libs
+else
+  # MS-DOS does not allow filenames that begin with a dot.
+  lt_cv_objdir=_libs
+fi
+rmdir .libs 2>/dev/null])
+objdir=$lt_cv_objdir
+_LT_DECL([], [objdir], [0],
+         [The name of the directory that contains temporary libtool files])dnl
+m4_pattern_allow([LT_OBJDIR])dnl
+AC_DEFINE_UNQUOTED([LT_OBJDIR], "$lt_cv_objdir/",
+  [Define to the sub-directory where libtool stores uninstalled libraries.])
+])# _LT_CHECK_OBJDIR
+
+
+# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME])
+# --------------------------------------
+# Check hardcoding attributes.
+m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
+[AC_MSG_CHECKING([how to hardcode library paths into programs])
+_LT_TAGVAR(hardcode_action, $1)=
+if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
+   test -n "$_LT_TAGVAR(runpath_var, $1)" ||
+   test yes = "$_LT_TAGVAR(hardcode_automatic, $1)"; then
+
+  # We can hardcode non-existent directories.
+  if test no != "$_LT_TAGVAR(hardcode_direct, $1)" &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" &&
+     test no != "$_LT_TAGVAR(hardcode_minus_L, $1)"; then
+    # Linking always hardcodes the temporary library directory.
+    _LT_TAGVAR(hardcode_action, $1)=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    _LT_TAGVAR(hardcode_action, $1)=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  _LT_TAGVAR(hardcode_action, $1)=unsupported
+fi
+AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
+
+if test relink = "$_LT_TAGVAR(hardcode_action, $1)" ||
+   test yes = "$_LT_TAGVAR(inherit_rpath, $1)"; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test yes = "$shlibpath_overrides_runpath" ||
+     test no = "$enable_shared"; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+_LT_TAGDECL([], [hardcode_action], [0],
+    [How to hardcode a shared library path into an executable])
+])# _LT_LINKER_HARDCODE_LIBPATH
+
+
+# _LT_CMD_STRIPLIB
+# ----------------
+m4_defun([_LT_CMD_STRIPLIB],
+[m4_require([_LT_DECL_EGREP])
+striplib=
+old_striplib=
+AC_MSG_CHECKING([whether stripping libraries is possible])
+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"
+  AC_MSG_RESULT([yes])
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+  case $host_os in
+  darwin*)
+    if test -n "$STRIP"; then
+      striplib="$STRIP -x"
+      old_striplib="$STRIP -S"
+      AC_MSG_RESULT([yes])
+    else
+      AC_MSG_RESULT([no])
+    fi
+    ;;
+  *)
+    AC_MSG_RESULT([no])
+    ;;
+  esac
+fi
+_LT_DECL([], [old_striplib], [1], [Commands to strip libraries])
+_LT_DECL([], [striplib], [1])
+])# _LT_CMD_STRIPLIB
+
+
+# _LT_PREPARE_MUNGE_PATH_LIST
+# ---------------------------
+# Make sure func_munge_path_list() is defined correctly.
+m4_defun([_LT_PREPARE_MUNGE_PATH_LIST],
+[[# func_munge_path_list VARIABLE PATH
+# -----------------------------------
+# VARIABLE is name of variable containing _space_ separated list of
+# directories to be munged by the contents of PATH, which is string
+# having a format:
+# "DIR[:DIR]:"
+#       string "DIR[ DIR]" will be prepended to VARIABLE
+# ":DIR[:DIR]"
+#       string "DIR[ DIR]" will be appended to VARIABLE
+# "DIRP[:DIRP]::[DIRA:]DIRA"
+#       string "DIRP[ DIRP]" will be prepended to VARIABLE and string
+#       "DIRA[ DIRA]" will be appended to VARIABLE
+# "DIR[:DIR]"
+#       VARIABLE will be replaced by "DIR[ DIR]"
+func_munge_path_list ()
+{
+    case x@S|@2 in
+    x)
+        ;;
+    *:)
+        eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'` \@S|@@S|@1\"
+        ;;
+    x:*)
+        eval @S|@1=\"\@S|@@S|@1 `$ECHO @S|@2 | $SED 's/:/ /g'`\"
+        ;;
+    *::*)
+        eval @S|@1=\"\@S|@@S|@1\ `$ECHO @S|@2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+        eval @S|@1=\"`$ECHO @S|@2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \@S|@@S|@1\"
+        ;;
+    *)
+        eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'`\"
+        ;;
+    esac
+}
+]])# _LT_PREPARE_PATH_LIST
+
+
+# _LT_SYS_DYNAMIC_LINKER([TAG])
+# -----------------------------
+# PORTME Fill in your ld.so characteristics
+m4_defun([_LT_SYS_DYNAMIC_LINKER],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_OBJDUMP])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+m4_require([_LT_PREPARE_MUNGE_PATH_LIST])dnl
+AC_MSG_CHECKING([dynamic linker characteristics])
+m4_if([$1],
+	[], [
+if test yes = "$GCC"; then
+  case $host_os in
+    darwin*) lt_awk_arg='/^libraries:/,/LR/' ;;
+    *) lt_awk_arg='/^libraries:/' ;;
+  esac
+  case $host_os in
+    mingw* | cegcc*) lt_sed_strip_eq='s|=\([[A-Za-z]]:\)|\1|g' ;;
+    *) lt_sed_strip_eq='s|=/|/|g' ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
+  case $lt_search_path_spec in
+  *\;*)
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
+    ;;
+  *)
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
+    ;;
+  esac
+  # Ok, now we have the path, separated by spaces, we can step through it
+  # and add multilib dir if necessary...
+  lt_tmp_lt_search_path_spec=
+  lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  # ...but if some path component already ends with the multilib dir we assume
+  # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer).
+  case "$lt_multi_os_dir; $lt_search_path_spec " in
+  "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*)
+    lt_multi_os_dir=
+    ;;
+  esac
+  for lt_sys_path in $lt_search_path_spec; do
+    if test -d "$lt_sys_path$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir"
+    elif test -n "$lt_multi_os_dir"; then
+      test -d "$lt_sys_path" && \
+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+    fi
+  done
+  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
+BEGIN {RS = " "; FS = "/|\n";} {
+  lt_foo = "";
+  lt_count = 0;
+  for (lt_i = NF; lt_i > 0; lt_i--) {
+    if ($lt_i != "" && $lt_i != ".") {
+      if ($lt_i == "..") {
+        lt_count++;
+      } else {
+        if (lt_count == 0) {
+          lt_foo = "/" $lt_i lt_foo;
+        } else {
+          lt_count--;
+        }
+      }
+    }
+  }
+  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
+  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
+}'`
+  # AWK program above erroneously prepends '/' to C:/dos/paths
+  # for these hosts.
+  case $host_os in
+    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
+      $SED 's|/\([[A-Za-z]]:\)|\1|g'` ;;
+  esac
+  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi])
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=.so
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+
+AC_ARG_VAR([LT_SYS_LIBRARY_PATH],
+[User-defined run-time library search path.])
+
+case $host_os in
+aix3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
+  shlibpath_var=LIBPATH
+
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='$libname$release$shared_ext$major'
+  ;;
+
+aix[[4-9]]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  hardcode_into_libs=yes
+  if test ia64 = "$host_cpu"; then
+    # AIX 5 supports IA64
+    library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line '#! .'.  This would cause the generated library to
+    # depend on '.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      aix4 | aix4.[[01]] | aix4.[[01]].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+	   echo ' yes '
+	   echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
+	:
+      else
+	can_build_shared=no
+      fi
+      ;;
+    esac
+    # Using Import Files as archive members, it is possible to support
+    # filename-based versioning of shared library archives on AIX. While
+    # this would work for both with and without runtime linking, it will
+    # prevent static linking of such archives. So we do filename-based
+    # shared library versioning with .so extension only, which is used
+    # when both runtime linking and shared linking is enabled.
+    # Unfortunately, runtime linking may impact performance, so we do
+    # not want this to be the default eventually. Also, we use the
+    # versioned .so libs for executables only if there is the -brtl
+    # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+    # To allow for filename-based versioning support, we need to create
+    # libNAME.so.V as an archive file, containing:
+    # *) an Import File, referring to the versioned filename of the
+    #    archive as well as the shared archive member, telling the
+    #    bitwidth (32 or 64) of that shared object, and providing the
+    #    list of exported symbols of that shared object, eventually
+    #    decorated with the 'weak' keyword
+    # *) the shared object with the F_LOADONLY flag set, to really avoid
+    #    it being seen by the linker.
+    # At run time we better use the real file rather than another symlink,
+    # but for link time we create the symlink libNAME.so -> libNAME.so.V
+
+    case $with_aix_soname,$aix_use_runtimelinking in
+    # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    aix,yes) # traditional libtool
+      dynamic_linker='AIX unversionable lib.so'
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      ;;
+    aix,no) # traditional AIX only
+      dynamic_linker='AIX lib.a[(]lib.so.V[)]'
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='$libname$release.a $libname.a'
+      soname_spec='$libname$release$shared_ext$major'
+      ;;
+    svr4,*) # full svr4 only
+      dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)]"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,yes) # both, prefer svr4
+      dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)], lib.a[(]lib.so.V[)]"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # unpreferred sharedlib libNAME.a needs extra handling
+      postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+      postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,no) # both, prefer aix
+      dynamic_linker="AIX lib.a[(]lib.so.V[)], lib.so.V[(]$shared_archive_member_spec.o[)]"
+      library_names_spec='$libname$release.a $libname.a'
+      soname_spec='$libname$release$shared_ext$major'
+      # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+      postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+      postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+      ;;
+    esac
+    shlibpath_var=LIBPATH
+  fi
+  ;;
+
+amigaos*)
+  case $host_cpu in
+  powerpc)
+    # Since July 2007 AmigaOS4 officially supports .so libraries.
+    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    ;;
+  m68k)
+    library_names_spec='$libname.ixlibrary $libname.a'
+    # Create ${libname}_ixlibrary.a entries in /sys/libs.
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    ;;
+  esac
+  ;;
+
+beos*)
+  library_names_spec='$libname$shared_ext'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
+
+bsdi[[45]]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
+
+cygwin* | mingw* | pw32* | cegcc*)
+  version_type=windows
+  shrext_cmds=.dll
+  need_version=no
+  need_lib_prefix=no
+
+  case $GCC,$cc_basename in
+  yes,*)
+    # gcc
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \$file`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname~
+      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+      fi'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
+m4_if([$1], [],[
+      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
+      ;;
+    mingw* | cegcc*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
+      ;;
+    esac
+    dynamic_linker='Win32 ld.exe'
+    ;;
+
+  *,cl*)
+    # Native MSVC
+    libname_spec='$name'
+    soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
+    library_names_spec='$libname.dll.lib'
+
+    case $build_os in
+    mingw*)
+      sys_lib_search_path_spec=
+      lt_save_ifs=$IFS
+      IFS=';'
+      for lt_path in $LIB
+      do
+        IFS=$lt_save_ifs
+        # Let DOS variable expansion print the short 8.3 style file name.
+        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+      done
+      IFS=$lt_save_ifs
+      # Convert to MSYS style.
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
+      ;;
+    cygwin*)
+      # Convert to unix form, then to dos form, then back to unix form
+      # but this time dos style (no spaces!) so that the unix form looks
+      # like /cygdrive/c/PROGRA~1:/cygdr...
+      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      ;;
+    *)
+      sys_lib_search_path_spec=$LIB
+      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
+        # It is most probably a Windows format PATH.
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      # FIXME: find the short name or the path components, as spaces are
+      # common. (e.g. "Program Files" -> "PROGRA~1")
+      ;;
+    esac
+
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \$file`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+    dynamic_linker='Win32 link.exe'
+    ;;
+
+  *)
+    # Assume MSVC wrapper
+    library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib'
+    dynamic_linker='Win32 ld.exe'
+    ;;
+  esac
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
+
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
+  soname_spec='$libname$release$major$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+m4_if([$1], [],[
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
+
+dgux*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[[23]].*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
+  version_type=freebsd-$objformat
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      soname_spec='$libname$release$shared_ext$major'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+      need_version=yes
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_os in
+  freebsd2.*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
+  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  *) # from 4.6 on, and DragonFly
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
+
+haiku*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  dynamic_linker="$host_os runtime_loader"
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+  hardcode_into_libs=yes
+  ;;
+
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  case $host_cpu in
+  ia64*)
+    shrext_cmds='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    if test 32 = "$HPUX_IA64_MODE"; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux32
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux64
+    fi
+    ;;
+  hppa*64*)
+    shrext_cmds='.sl'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  *)
+    shrext_cmds='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
+  postinstall_cmds='chmod 555 $lib'
+  # or fails outright, so override atomically:
+  install_override_mode=555
+  ;;
+
+interix[[3-9]]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)
+	if test yes = "$lt_cv_prog_gnu_ld"; then
+		version_type=linux # correct to gnu/linux during the next big refactor
+	else
+		version_type=irix
+	fi ;;
+  esac
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='$libname$release$shared_ext$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
+  case $host_os in
+  irix5* | nonstopux*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
+  sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
+  hardcode_into_libs=yes
+  ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
+
+linux*android*)
+  version_type=none # Android doesn't support versioned libraries.
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext'
+  soname_spec='$libname$release$shared_ext'
+  finish_cmds=
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  dynamic_linker='Android linker'
+  # Don't embed -rpath directories since the linker doesn't support them.
+  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+
+  # Some binutils ld are patched to set DT_RUNPATH
+  AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],
+    [lt_cv_shlibpath_overrides_runpath=no
+    save_LDFLAGS=$LDFLAGS
+    save_libdir=$libdir
+    eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
+	 LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+      [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
+	 [lt_cv_shlibpath_overrides_runpath=yes])])
+    LDFLAGS=$save_LDFLAGS
+    libdir=$save_libdir
+    ])
+  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  # Ideally, we could use ldconfig to report *all* directores which are
+  # searched for libraries, however this is still not possible.  Aside from not
+  # being certain /sbin/ldconfig is available, command
+  # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
+  # even though it is searched at run-time.  Try to do the best guess by
+  # appending ld.so.conf contents (and includes) 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;s/"//g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+  fi
+
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
+
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+newsos6)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+*nto* | *qnx*)
+  version_type=qnx
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='ldqnx.so'
+  ;;
+
+openbsd* | bitrig*)
+  version_type=sunos
+  sys_lib_dlsearch_path_spec=/usr/lib
+  need_lib_prefix=no
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+    need_version=no
+  else
+    need_version=yes
+  fi
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+os2*)
+  libname_spec='$name'
+  version_type=windows
+  shrext_cmds=.dll
+  need_version=no
+  need_lib_prefix=no
+  # OS/2 can only load a DLL with a base name of 8 characters or less.
+  soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+    v=$($ECHO $release$versuffix | tr -d .-);
+    n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+    $ECHO $n$v`$shared_ext'
+  library_names_spec='${libname}_dll.$libext'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=BEGINLIBPATH
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+  postinstall_cmds='base_file=`basename \$file`~
+    dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
+    dldir=$destdir/`dirname \$dlpath`~
+    test -d \$dldir || mkdir -p \$dldir~
+    $install_prog $dir/$dlname \$dldir/$dlname~
+    chmod a+x \$dldir/$dlname~
+    if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+      eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+    fi'
+  postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
+    dlpath=$dir/\$dldll~
+    $RM \$dlpath'
+  ;;
+
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='$libname$release$shared_ext$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+  ;;
+
+rdos*)
+  dynamic_linker=no
+  ;;
+
+solaris*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
+
+sunos4*)
+  version_type=sunos
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test yes = "$with_gnu_ld"; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
+
+sysv4 | sysv4.3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+
+sysv4*MP*)
+  if test -d /usr/nec; then
+    version_type=linux # correct to gnu/linux during the next big refactor
+    library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext'
+    soname_spec='$libname$shared_ext.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=sco
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  if test yes = "$with_gnu_ld"; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+
+tpf*)
+  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+uts4*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+*)
+  dynamic_linker=no
+  ;;
+esac
+AC_MSG_RESULT([$dynamic_linker])
+test no = "$dynamic_linker" && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test yes = "$GCC"; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
+if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
+  sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
+fi
+
+if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
+  sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
+fi
+
+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
+
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
+func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+
+_LT_DECL([], [variables_saved_for_relink], [1],
+    [Variables whose values should be saved in libtool wrapper scripts and
+    restored at link time])
+_LT_DECL([], [need_lib_prefix], [0],
+    [Do we need the "lib" prefix for modules?])
+_LT_DECL([], [need_version], [0], [Do we need a version for libraries?])
+_LT_DECL([], [version_type], [0], [Library versioning type])
+_LT_DECL([], [runpath_var], [0],  [Shared library runtime path variable])
+_LT_DECL([], [shlibpath_var], [0],[Shared library path variable])
+_LT_DECL([], [shlibpath_overrides_runpath], [0],
+    [Is shlibpath searched before the hard-coded library search path?])
+_LT_DECL([], [libname_spec], [1], [Format of library name prefix])
+_LT_DECL([], [library_names_spec], [1],
+    [[List of archive names.  First name is the real one, the rest are links.
+    The last name is the one that the linker finds with -lNAME]])
+_LT_DECL([], [soname_spec], [1],
+    [[The coded name of the library, if different from the real name]])
+_LT_DECL([], [install_override_mode], [1],
+    [Permission mode override for installation of shared libraries])
+_LT_DECL([], [postinstall_cmds], [2],
+    [Command to use after installation of a shared archive])
+_LT_DECL([], [postuninstall_cmds], [2],
+    [Command to use after uninstallation of a shared archive])
+_LT_DECL([], [finish_cmds], [2],
+    [Commands used to finish a libtool library installation in a directory])
+_LT_DECL([], [finish_eval], [1],
+    [[As "finish_cmds", except a single script fragment to be evaled but
+    not shown]])
+_LT_DECL([], [hardcode_into_libs], [0],
+    [Whether we should hardcode library paths into libraries])
+_LT_DECL([], [sys_lib_search_path_spec], [2],
+    [Compile-time system search path for libraries])
+_LT_DECL([sys_lib_dlsearch_path_spec], [configure_time_dlsearch_path], [2],
+    [Detected run-time system search path for libraries])
+_LT_DECL([], [configure_time_lt_sys_library_path], [2],
+    [Explicit LT_SYS_LIBRARY_PATH set during ./configure time])
+])# _LT_SYS_DYNAMIC_LINKER
+
+
+# _LT_PATH_TOOL_PREFIX(TOOL)
+# --------------------------
+# find a file program that can recognize shared library
+AC_DEFUN([_LT_PATH_TOOL_PREFIX],
+[m4_require([_LT_DECL_EGREP])dnl
+AC_MSG_CHECKING([for $1])
+AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
+[case $MAGIC_CMD in
+[[\\/*] |  ?:[\\/]*])
+  lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD=$MAGIC_CMD
+  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+dnl $ac_dummy forces splitting on constant user-supplied paths.
+dnl POSIX.2 word splitting is done only on the output of word expansions,
+dnl not every word.  This closes a longstanding sh security hole.
+  ac_dummy="m4_if([$2], , $PATH, [$2])"
+  for ac_dir in $ac_dummy; do
+    IFS=$lt_save_ifs
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$1"; then
+      lt_cv_path_MAGIC_CMD=$ac_dir/"$1"
+      if test -n "$file_magic_test_file"; then
+	case $deplibs_check_method in
+	"file_magic "*)
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+	  MAGIC_CMD=$lt_cv_path_MAGIC_CMD
+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+	    $EGREP "$file_magic_regex" > /dev/null; then
+	    :
+	  else
+	    cat <<_LT_EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
+
+_LT_EOF
+	  fi ;;
+	esac
+      fi
+      break
+    fi
+  done
+  IFS=$lt_save_ifs
+  MAGIC_CMD=$lt_save_MAGIC_CMD
+  ;;
+esac])
+MAGIC_CMD=$lt_cv_path_MAGIC_CMD
+if test -n "$MAGIC_CMD"; then
+  AC_MSG_RESULT($MAGIC_CMD)
+else
+  AC_MSG_RESULT(no)
+fi
+_LT_DECL([], [MAGIC_CMD], [0],
+	 [Used to examine libraries when file_magic_cmd begins with "file"])dnl
+])# _LT_PATH_TOOL_PREFIX
+
+# Old name:
+AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])
+
+
+# _LT_PATH_MAGIC
+# --------------
+# find a file program that can recognize a shared library
+m4_defun([_LT_PATH_MAGIC],
+[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
+if test -z "$lt_cv_path_MAGIC_CMD"; then
+  if test -n "$ac_tool_prefix"; then
+    _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
+  else
+    MAGIC_CMD=:
+  fi
+fi
+])# _LT_PATH_MAGIC
+
+
+# LT_PATH_LD
+# ----------
+# find the pathname to the GNU or non-GNU linker
+AC_DEFUN([LT_PATH_LD],
+[AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
+
+AC_ARG_WITH([gnu-ld],
+    [AS_HELP_STRING([--with-gnu-ld],
+	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
+    [test no = "$withval" || with_gnu_ld=yes],
+    [with_gnu_ld=no])dnl
+
+ac_prog=ld
+if test yes = "$GCC"; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  AC_MSG_CHECKING([for ld used by $CC])
+  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 yes = "$with_gnu_ld"; then
+  AC_MSG_CHECKING([for GNU ld])
+else
+  AC_MSG_CHECKING([for non-GNU ld])
+fi
+AC_CACHE_VAL(lt_cv_path_LD,
+[if test -z "$LD"; then
+  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS=$lt_save_ifs
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      lt_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 `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
+	test no != "$with_gnu_ld" && break
+	;;
+      *)
+	test yes != "$with_gnu_ld" && break
+	;;
+      esac
+    fi
+  done
+  IFS=$lt_save_ifs
+else
+  lt_cv_path_LD=$LD # Let the user override the test with a path.
+fi])
+LD=$lt_cv_path_LD
+if test -n "$LD"; then
+  AC_MSG_RESULT($LD)
+else
+  AC_MSG_RESULT(no)
+fi
+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+_LT_PATH_LD_GNU
+AC_SUBST([LD])
+
+_LT_TAGDECL([], [LD], [1], [The linker used to build libraries])
+])# LT_PATH_LD
+
+# Old names:
+AU_ALIAS([AM_PROG_LD], [LT_PATH_LD])
+AU_ALIAS([AC_PROG_LD], [LT_PATH_LD])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_PROG_LD], [])
+dnl AC_DEFUN([AC_PROG_LD], [])
+
+
+# _LT_PATH_LD_GNU
+#- --------------
+m4_defun([_LT_PATH_LD_GNU],
+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
+[# 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'*)
+  lt_cv_prog_gnu_ld=yes
+  ;;
+*)
+  lt_cv_prog_gnu_ld=no
+  ;;
+esac])
+with_gnu_ld=$lt_cv_prog_gnu_ld
+])# _LT_PATH_LD_GNU
+
+
+# _LT_CMD_RELOAD
+# --------------
+# find reload flag for linker
+#   -- PORTME Some linkers may need a different reload flag.
+m4_defun([_LT_CMD_RELOAD],
+[AC_CACHE_CHECK([for $LD option to reload object files],
+  lt_cv_ld_reload_flag,
+  [lt_cv_ld_reload_flag='-r'])
+reload_flag=$lt_cv_ld_reload_flag
+case $reload_flag in
+"" | " "*) ;;
+*) reload_flag=" $reload_flag" ;;
+esac
+reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    if test yes != "$GCC"; then
+      reload_cmds=false
+    fi
+    ;;
+  darwin*)
+    if test yes = "$GCC"; then
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
+    else
+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
+    fi
+    ;;
+esac
+_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl
+_LT_TAGDECL([], [reload_cmds], [2])dnl
+])# _LT_CMD_RELOAD
+
+
+# _LT_PATH_DD
+# -----------
+# find a working dd
+m4_defun([_LT_PATH_DD],
+[AC_CACHE_CHECK([for a working dd], [ac_cv_path_lt_DD],
+[printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+: ${lt_DD:=$DD}
+AC_PATH_PROGS_FEATURE_CHECK([lt_DD], [dd],
+[if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+  cmp -s conftest.i conftest.out \
+  && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=:
+fi])
+rm -f conftest.i conftest2.i conftest.out])
+])# _LT_PATH_DD
+
+
+# _LT_CMD_TRUNCATE
+# ----------------
+# find command to truncate a binary pipe
+m4_defun([_LT_CMD_TRUNCATE],
+[m4_require([_LT_PATH_DD])
+AC_CACHE_CHECK([how to truncate binary pipes], [lt_cv_truncate_bin],
+[printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+lt_cv_truncate_bin=
+if "$ac_cv_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+  cmp -s conftest.i conftest.out \
+  && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1"
+fi
+rm -f conftest.i conftest2.i conftest.out
+test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"])
+_LT_DECL([lt_truncate_bin], [lt_cv_truncate_bin], [1],
+  [Command to truncate a binary pipe])
+])# _LT_CMD_TRUNCATE
+
+
+# _LT_CHECK_MAGIC_METHOD
+# ----------------------
+# how to check for library dependencies
+#  -- PORTME fill in with the dynamic library characteristics
+m4_defun([_LT_CHECK_MAGIC_METHOD],
+[m4_require([_LT_DECL_EGREP])
+m4_require([_LT_DECL_OBJDUMP])
+AC_CACHE_CHECK([how to recognize dependent libraries],
+lt_cv_deplibs_check_method,
+[lt_cv_file_magic_cmd='$MAGIC_CMD'
+lt_cv_file_magic_test_file=
+lt_cv_deplibs_check_method='unknown'
+# Need to set the preceding variable on all platforms that support
+# interlibrary dependencies.
+# 'none' -- dependencies not supported.
+# 'unknown' -- same as none, but documents that we really don't know.
+# 'pass_all' -- all dependencies passed with no checks.
+# 'test_compile' -- check by making test program.
+# 'file_magic [[regex]]' -- check by looking for files in library path
+# that responds to the $file_magic_cmd with a given extended regex.
+# If you have 'file' or equivalent on your system and you're not sure
+# whether 'pass_all' will *always* work, you probably want this one.
+
+case $host_os in
+aix[[4-9]]*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+beos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+bsdi[[45]]*)
+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
+  lt_cv_file_magic_cmd='/usr/bin/file -L'
+  lt_cv_file_magic_test_file=/shlib/libc.so
+  ;;
+
+cygwin*)
+  # func_win32_libid is a shell function defined in ltmain.sh
+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+  lt_cv_file_magic_cmd='func_win32_libid'
+  ;;
+
+mingw* | pw32*)
+  # Base MSYS/MinGW do not provide the 'file' command needed by
+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
+  # unless we find 'file', for example because we are cross-compiling.
+  if ( file / ) >/dev/null 2>&1; then
+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+    lt_cv_file_magic_cmd='func_win32_libid'
+  else
+    # Keep this pattern in sync with the one in func_win32_libid.
+    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
+    lt_cv_file_magic_cmd='$OBJDUMP -f'
+  fi
+  ;;
+
+cegcc*)
+  # use the weaker test based on 'objdump'. See mingw*.
+  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
+  lt_cv_file_magic_cmd='$OBJDUMP -f'
+  ;;
+
+darwin* | rhapsody*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+freebsd* | dragonfly*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    case $host_cpu in
+    i*86 )
+      # Not sure whether the presence of OpenBSD here was a mistake.
+      # Let's accept both of them until this is cleared up.
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
+      lt_cv_file_magic_cmd=/usr/bin/file
+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+      ;;
+    esac
+  else
+    lt_cv_deplibs_check_method=pass_all
+  fi
+  ;;
+
+haiku*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+hpux10.20* | hpux11*)
+  lt_cv_file_magic_cmd=/usr/bin/file
+  case $host_cpu in
+  ia64*)
+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
+    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+    ;;
+  hppa*64*)
+    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]']
+    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+    ;;
+  *)
+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library'
+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
+    ;;
+  esac
+  ;;
+
+interix[[3-9]]*)
+  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $LD in
+  *-32|*"-32 ") libmagic=32-bit;;
+  *-n32|*"-n32 ") libmagic=N32;;
+  *-64|*"-64 ") libmagic=64-bit;;
+  *) libmagic=never-match;;
+  esac
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+netbsd*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
+  fi
+  ;;
+
+newos6*)
+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
+  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
+  ;;
+
+*nto* | *qnx*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+openbsd* | bitrig*)
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+  fi
+  ;;
+
+osf3* | osf4* | osf5*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+rdos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+solaris*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv4 | sysv4.3*)
+  case $host_vendor in
+  motorola)
+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+    ;;
+  ncr)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  sequent)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
+    ;;
+  sni)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
+    lt_cv_file_magic_test_file=/lib/libc.so
+    ;;
+  siemens)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  pc)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  esac
+  ;;
+
+tpf*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+os2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+esac
+])
+
+file_magic_glob=
+want_nocaseglob=no
+if test "$build" = "$host"; then
+  case $host_os in
+  mingw* | pw32*)
+    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
+      want_nocaseglob=yes
+    else
+      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
+    fi
+    ;;
+  esac
+fi
+
+file_magic_cmd=$lt_cv_file_magic_cmd
+deplibs_check_method=$lt_cv_deplibs_check_method
+test -z "$deplibs_check_method" && deplibs_check_method=unknown
+
+_LT_DECL([], [deplibs_check_method], [1],
+    [Method to check whether dependent libraries are shared objects])
+_LT_DECL([], [file_magic_cmd], [1],
+    [Command to use when deplibs_check_method = "file_magic"])
+_LT_DECL([], [file_magic_glob], [1],
+    [How to find potential files when deplibs_check_method = "file_magic"])
+_LT_DECL([], [want_nocaseglob], [1],
+    [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
+])# _LT_CHECK_MAGIC_METHOD
+
+
+# LT_PATH_NM
+# ----------
+# find the pathname to a BSD- or MS-compatible name lister
+AC_DEFUN([LT_PATH_NM],
+[AC_REQUIRE([AC_PROG_CC])dnl
+AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
+[if test -n "$NM"; then
+  # Let the user override the test.
+  lt_cv_path_NM=$NM
+else
+  lt_nm_to_check=${ac_tool_prefix}nm
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+    lt_nm_to_check="$lt_nm_to_check nm"
+  fi
+  for lt_tmp_nm in $lt_nm_to_check; do
+    lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+      IFS=$lt_save_ifs
+      test -z "$ac_dir" && ac_dir=.
+      tmp_nm=$ac_dir/$lt_tmp_nm
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then
+	# Check to see if the nm accepts a BSD-compat flag.
+	# Adding the 'sed 1q' prevents false positives on HP-UX, which says:
+	#   nm: unknown option "B" ignored
+	# Tru64's nm complains that /dev/null is an invalid object file
+	# MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
+	case $build_os in
+	mingw*) lt_bad_file=conftest.nm/nofile ;;
+	*) lt_bad_file=/dev/null ;;
+	esac
+	case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
+	*$lt_bad_file* | *'Invalid file or object type'*)
+	  lt_cv_path_NM="$tmp_nm -B"
+	  break 2
+	  ;;
+	*)
+	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	  */dev/null*)
+	    lt_cv_path_NM="$tmp_nm -p"
+	    break 2
+	    ;;
+	  *)
+	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	    continue # so that we can try to find one that supports BSD flags
+	    ;;
+	  esac
+	  ;;
+	esac
+      fi
+    done
+    IFS=$lt_save_ifs
+  done
+  : ${lt_cv_path_NM=no}
+fi])
+if test no != "$lt_cv_path_NM"; then
+  NM=$lt_cv_path_NM
+else
+  # Didn't find any BSD compatible name lister, look for dumpbin.
+  if test -n "$DUMPBIN"; then :
+    # Let the user override the test.
+  else
+    AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
+    case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in
+    *COFF*)
+      DUMPBIN="$DUMPBIN -symbols -headers"
+      ;;
+    *)
+      DUMPBIN=:
+      ;;
+    esac
+  fi
+  AC_SUBST([DUMPBIN])
+  if test : != "$DUMPBIN"; then
+    NM=$DUMPBIN
+  fi
+fi
+test -z "$NM" && NM=nm
+AC_SUBST([NM])
+_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
+
+AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
+  [lt_cv_nm_interface="BSD nm"
+  echo "int some_variable = 0;" > conftest.$ac_ext
+  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
+  (eval "$ac_compile" 2>conftest.err)
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
+  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
+  cat conftest.out >&AS_MESSAGE_LOG_FD
+  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+    lt_cv_nm_interface="MS dumpbin"
+  fi
+  rm -f conftest*])
+])# LT_PATH_NM
+
+# Old names:
+AU_ALIAS([AM_PROG_NM], [LT_PATH_NM])
+AU_ALIAS([AC_PROG_NM], [LT_PATH_NM])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_PROG_NM], [])
+dnl AC_DEFUN([AC_PROG_NM], [])
+
+# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
+# --------------------------------
+# how to determine the name of the shared library
+# associated with a specific link library.
+#  -- PORTME fill in with the dynamic library characteristics
+m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
+[m4_require([_LT_DECL_EGREP])
+m4_require([_LT_DECL_OBJDUMP])
+m4_require([_LT_DECL_DLLTOOL])
+AC_CACHE_CHECK([how to associate runtime and link libraries],
+lt_cv_sharedlib_from_linklib_cmd,
+[lt_cv_sharedlib_from_linklib_cmd='unknown'
+
+case $host_os in
+cygwin* | mingw* | pw32* | cegcc*)
+  # two different shell functions defined in ltmain.sh;
+  # decide which one to use based on capabilities of $DLLTOOL
+  case `$DLLTOOL --help 2>&1` in
+  *--identify-strict*)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
+    ;;
+  *)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
+    ;;
+  esac
+  ;;
+*)
+  # fallback: assume linklib IS sharedlib
+  lt_cv_sharedlib_from_linklib_cmd=$ECHO
+  ;;
+esac
+])
+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
+
+_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
+    [Command to associate shared and link libraries])
+])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
+
+
+# _LT_PATH_MANIFEST_TOOL
+# ----------------------
+# locate the manifest tool
+m4_defun([_LT_PATH_MANIFEST_TOOL],
+[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
+AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
+  [lt_cv_path_mainfest_tool=no
+  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
+  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
+    lt_cv_path_mainfest_tool=yes
+  fi
+  rm -f conftest*])
+if test yes != "$lt_cv_path_mainfest_tool"; then
+  MANIFEST_TOOL=:
+fi
+_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
+])# _LT_PATH_MANIFEST_TOOL
+
+
+# _LT_DLL_DEF_P([FILE])
+# ---------------------
+# True iff FILE is a Windows DLL '.def' file.
+# Keep in sync with func_dll_def_p in the libtool script
+AC_DEFUN([_LT_DLL_DEF_P],
+[dnl
+  test DEF = "`$SED -n dnl
+    -e '\''s/^[[	 ]]*//'\'' dnl Strip leading whitespace
+    -e '\''/^\(;.*\)*$/d'\'' dnl      Delete empty lines and comments
+    -e '\''s/^\(EXPORTS\|LIBRARY\)\([[	 ]].*\)*$/DEF/p'\'' dnl
+    -e q dnl                          Only consider the first "real" line
+    $1`" dnl
+])# _LT_DLL_DEF_P
+
+
+# LT_LIB_M
+# --------
+# check for math library
+AC_DEFUN([LT_LIB_M],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+LIBM=
+case $host in
+*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
+  # These system don't have libm, or don't need it
+  ;;
+*-ncr-sysv4.3*)
+  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM=-lmw)
+  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
+  ;;
+*)
+  AC_CHECK_LIB(m, cos, LIBM=-lm)
+  ;;
+esac
+AC_SUBST([LIBM])
+])# LT_LIB_M
+
+# Old name:
+AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_CHECK_LIBM], [])
+
+
+# _LT_COMPILER_NO_RTTI([TAGNAME])
+# -------------------------------
+m4_defun([_LT_COMPILER_NO_RTTI],
+[m4_require([_LT_TAG_COMPILER])dnl
+
+_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+
+if test yes = "$GCC"; then
+  case $cc_basename in
+  nvcc*)
+    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
+  *)
+    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
+  esac
+
+  _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
+    lt_cv_prog_compiler_rtti_exceptions,
+    [-fno-rtti -fno-exceptions], [],
+    [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
+fi
+_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
+	[Compiler flag to turn off builtin functions])
+])# _LT_COMPILER_NO_RTTI
+
+
+# _LT_CMD_GLOBAL_SYMBOLS
+# ----------------------
+m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_PROG_AWK])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+AC_REQUIRE([LT_PATH_LD])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+AC_MSG_CHECKING([command to parse $NM output from $compiler object])
+AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
+[
+# These are sane defaults that work on at least a few old systems.
+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+
+# Character class describing NM global symbol codes.
+symcode='[[BCDEGRST]]'
+
+# Regexp to match symbols that can be accessed directly from C.
+sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
+
+# Define system-specific variables.
+case $host_os in
+aix*)
+  symcode='[[BCDT]]'
+  ;;
+cygwin* | mingw* | pw32* | cegcc*)
+  symcode='[[ABCDGISTW]]'
+  ;;
+hpux*)
+  if test ia64 = "$host_cpu"; then
+    symcode='[[ABCDEGRST]]'
+  fi
+  ;;
+irix* | nonstopux*)
+  symcode='[[BCDEGRST]]'
+  ;;
+osf*)
+  symcode='[[BCDEGQRST]]'
+  ;;
+solaris*)
+  symcode='[[BDRT]]'
+  ;;
+sco3.2v5*)
+  symcode='[[DT]]'
+  ;;
+sysv4.2uw2*)
+  symcode='[[DT]]'
+  ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+  symcode='[[ABDT]]'
+  ;;
+sysv4)
+  symcode='[[DFNSTU]]'
+  ;;
+esac
+
+# If we're using GNU nm, then use its standard symbol codes.
+case `$NM -V 2>&1` in
+*GNU* | *'with BFD'*)
+  symcode='[[ABCDGIRSTW]]' ;;
+esac
+
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  # Gets list of data symbols to import.
+  lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'"
+  # Adjust the below global symbol transforms to fixup imported variables.
+  lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"
+  lt_c_name_hook=" -e 's/^I .* \(.*\)$/  {\"\1\", (void *) 0},/p'"
+  lt_c_name_lib_hook="\
+  -e 's/^I .* \(lib.*\)$/  {\"\1\", (void *) 0},/p'\
+  -e 's/^I .* \(.*\)$/  {\"lib\1\", (void *) 0},/p'"
+else
+  # Disable hooks by default.
+  lt_cv_sys_global_symbol_to_import=
+  lt_cdecl_hook=
+  lt_c_name_hook=
+  lt_c_name_lib_hook=
+fi
+
+# Transform an extracted symbol line into a proper C declaration.
+# Some systems (esp. on ia64) link data and code symbols differently,
+# so use this general approach.
+lt_cv_sys_global_symbol_to_cdecl="sed -n"\
+$lt_cdecl_hook\
+" -e 's/^T .* \(.*\)$/extern int \1();/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'"
+
+# Transform an extracted symbol line into symbol name and symbol address
+lt_cv_sys_global_symbol_to_c_name_address="sed -n"\
+$lt_c_name_hook\
+" -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/p'"
+
+# Transform an extracted symbol line into symbol name with lib prefix and
+# symbol address.
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\
+$lt_c_name_lib_hook\
+" -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(lib.*\)$/  {\"\1\", (void *) \&\1},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"lib\1\", (void *) \&\1},/p'"
+
+# Handle CRLF in mingw tool chain
+opt_cr=
+case $build_os in
+mingw*)
+  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+  ;;
+esac
+
+# Try without a prefix underscore, then with it.
+for ac_symprfx in "" "_"; do
+
+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+  symxfrm="\\1 $ac_symprfx\\2 \\2"
+
+  # Write the raw and C identifiers.
+  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+    # Fake it for dumpbin and say T for any non-static function,
+    # D for any global variable and I for any imported variable.
+    # Also find C++ and __fastcall symbols from MSVC++,
+    # which start with @ or ?.
+    lt_cv_sys_global_symbol_pipe="$AWK ['"\
+"     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
+"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+"     /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\
+"     /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\
+"     /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\
+"     \$ 0!~/External *\|/{next};"\
+"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
+"     {if(hide[section]) next};"\
+"     {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\
+"     {split(\$ 0,a,/\||\r/); split(a[2],s)};"\
+"     s[1]~/^[@?]/{print f,s[1],s[1]; next};"\
+"     s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\
+"     ' prfx=^$ac_symprfx]"
+  else
+    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[	 ]]\($symcode$symcode*\)[[	 ]][[	 ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+  fi
+  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
+
+  # Check to see that the pipe works correctly.
+  pipe_works=no
+
+  rm -f conftest*
+  cat > conftest.$ac_ext <<_LT_EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(void);
+void nm_test_func(void){}
+#ifdef __cplusplus
+}
+#endif
+int main(){nm_test_var='a';nm_test_func();return(0);}
+_LT_EOF
+
+  if AC_TRY_EVAL(ac_compile); then
+    # Now try to grab the symbols.
+    nlist=conftest.nm
+    if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
+      # Try sorting and uniquifying the output.
+      if sort "$nlist" | uniq > "$nlist"T; then
+	mv -f "$nlist"T "$nlist"
+      else
+	rm -f "$nlist"T
+      fi
+
+      # Make sure that we snagged all the symbols we need.
+      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
+	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
+	  cat <<_LT_EOF > conftest.$ac_ext
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
+#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
+/* DATA imports from DLLs on WIN32 can't be const, because runtime
+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
+# define LT@&t@_DLSYM_CONST
+#elif defined __osf__
+/* This system does not cope well with relocations in const data.  */
+# define LT@&t@_DLSYM_CONST
+#else
+# define LT@&t@_DLSYM_CONST const
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+_LT_EOF
+	  # Now generate the symbol file.
+	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
+
+	  cat <<_LT_EOF >> conftest.$ac_ext
+
+/* The mapping between symbol names and symbols.  */
+LT@&t@_DLSYM_CONST struct {
+  const char *name;
+  void       *address;
+}
+lt__PROGRAM__LTX_preloaded_symbols[[]] =
+{
+  { "@PROGRAM@", (void *) 0 },
+_LT_EOF
+	  $SED "s/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+	  cat <<\_LT_EOF >> conftest.$ac_ext
+  {0, (void *) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt__PROGRAM__LTX_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+_LT_EOF
+	  # Now try linking the two files.
+	  mv conftest.$ac_objext conftstm.$ac_objext
+	  lt_globsym_save_LIBS=$LIBS
+	  lt_globsym_save_CFLAGS=$CFLAGS
+	  LIBS=conftstm.$ac_objext
+	  CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
+	  if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then
+	    pipe_works=yes
+	  fi
+	  LIBS=$lt_globsym_save_LIBS
+	  CFLAGS=$lt_globsym_save_CFLAGS
+	else
+	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
+	fi
+      else
+	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
+      fi
+    else
+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
+    fi
+  else
+    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
+    cat conftest.$ac_ext >&5
+  fi
+  rm -rf conftest* conftst*
+
+  # Do not use the global_symbol_pipe unless it works.
+  if test yes = "$pipe_works"; then
+    break
+  else
+    lt_cv_sys_global_symbol_pipe=
+  fi
+done
+])
+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
+  AC_MSG_RESULT(failed)
+else
+  AC_MSG_RESULT(ok)
+fi
+
+# Response file support.
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  nm_file_list_spec='@'
+elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
+  nm_file_list_spec='@'
+fi
+
+_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
+    [Take the output of nm and produce a listing of raw symbols and C names])
+_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
+    [Transform the output of nm in a proper C declaration])
+_LT_DECL([global_symbol_to_import], [lt_cv_sys_global_symbol_to_import], [1],
+    [Transform the output of nm into a list of symbols to manually relocate])
+_LT_DECL([global_symbol_to_c_name_address],
+    [lt_cv_sys_global_symbol_to_c_name_address], [1],
+    [Transform the output of nm in a C name address pair])
+_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
+    [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
+    [Transform the output of nm in a C name address pair when lib prefix is needed])
+_LT_DECL([nm_interface], [lt_cv_nm_interface], [1],
+    [The name lister interface])
+_LT_DECL([], [nm_file_list_spec], [1],
+    [Specify filename containing input files for $NM])
+]) # _LT_CMD_GLOBAL_SYMBOLS
+
+
+# _LT_COMPILER_PIC([TAGNAME])
+# ---------------------------
+m4_defun([_LT_COMPILER_PIC],
+[m4_require([_LT_TAG_COMPILER])dnl
+_LT_TAGVAR(lt_prog_compiler_wl, $1)=
+_LT_TAGVAR(lt_prog_compiler_pic, $1)=
+_LT_TAGVAR(lt_prog_compiler_static, $1)=
+
+m4_if([$1], [CXX], [
+  # C++ specific cases for pic, static, wl, etc.
+  if test yes = "$GXX"; then
+    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+    case $host_os in
+    aix*)
+      # All AIX code is PIC.
+      if test ia64 = "$host_cpu"; then
+	# AIX 5 now supports IA64 processor
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the '-m68020' flag to GCC prevents building anything better,
+            # like '-m68040'.
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+    mingw* | cygwin* | os2* | pw32* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      m4_if([$1], [GCJ], [],
+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      case $host_os in
+      os2*)
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+	;;
+      esac
+      ;;
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      ;;
+    *djgpp*)
+      # DJGPP does not support shared libraries at all
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+      ;;
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)=
+      ;;
+    interix[[3-9]]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+      fi
+      ;;
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	;;
+      esac
+      ;;
+    *qnx* | *nto*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+    *)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+    esac
+  else
+    case $host_os in
+      aix[[4-9]]*)
+	# All AIX code is PIC.
+	if test ia64 = "$host_cpu"; then
+	  # AIX 5 now supports IA64 processor
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	else
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+	fi
+	;;
+      chorus*)
+	case $cc_basename in
+	cxch68*)
+	  # Green Hills C++ Compiler
+	  # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+	  ;;
+	esac
+	;;
+      mingw* | cygwin* | os2* | pw32* | cegcc*)
+	# This hack is so that the source file can tell whether it is being
+	# built for inclusion in a dll (and should export symbols for example).
+	m4_if([$1], [GCJ], [],
+	  [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+	;;
+      dgux*)
+	case $cc_basename in
+	  ec++*)
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    ;;
+	  ghcx*)
+	    # Green Hills C++ Compiler
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      freebsd* | dragonfly*)
+	# FreeBSD uses GNU C++
+	;;
+      hpux9* | hpux10* | hpux11*)
+	case $cc_basename in
+	  CC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
+	    if test ia64 != "$host_cpu"; then
+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	    fi
+	    ;;
+	  aCC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
+	    case $host_cpu in
+	    hppa*64*|ia64*)
+	      # +Z the default
+	      ;;
+	    *)
+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	      ;;
+	    esac
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      interix*)
+	# This is c89, which is MS Visual C++ (no shared libs)
+	# Anyone wants to do a port?
+	;;
+      irix5* | irix6* | nonstopux*)
+	case $cc_basename in
+	  CC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    # CC pic flag -KPIC is the default.
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+	case $cc_basename in
+	  KCC*)
+	    # KAI C++ Compiler
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	    ;;
+	  ecpc* )
+	    # old Intel C++ for x86_64, which still supported -KPIC.
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	    ;;
+	  icpc* )
+	    # Intel C++, used to be incompatible with GCC.
+	    # ICC 10 doesn't accept -KPIC any more.
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	    ;;
+	  pgCC* | pgcpp*)
+	    # Portland Group C++ compiler
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	  cxx*)
+	    # Compaq C++
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    ;;
+	  xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)
+	    # IBM XL 8.0, 9.0 on PPC and BlueGene
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
+	    ;;
+	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	      ;;
+	    esac
+	    ;;
+	esac
+	;;
+      lynxos*)
+	;;
+      m88k*)
+	;;
+      mvs*)
+	case $cc_basename in
+	  cxx*)
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      netbsd*)
+	;;
+      *qnx* | *nto*)
+        # QNX uses GNU C++, but need to define -shared option too, otherwise
+        # it will coredump.
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+        ;;
+      osf3* | osf4* | osf5*)
+	case $cc_basename in
+	  KCC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+	    ;;
+	  RCC*)
+	    # Rational C++ 2.4.1
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  cxx*)
+	    # Digital/Compaq C++
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      psos*)
+	;;
+      solaris*)
+	case $cc_basename in
+	  CC* | sunCC*)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	    ;;
+	  gcx*)
+	    # Green Hills C++ Compiler
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sunos4*)
+	case $cc_basename in
+	  CC*)
+	    # Sun C++ 4.x
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	  lcc*)
+	    # Lucid
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+	case $cc_basename in
+	  CC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	esac
+	;;
+      tandem*)
+	case $cc_basename in
+	  NCC*)
+	    # NonStop-UX NCC 3.20
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      vxworks*)
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+	;;
+    esac
+  fi
+],
+[
+  if test yes = "$GCC"; then
+    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+    case $host_os in
+      aix*)
+      # All AIX code is PIC.
+      if test ia64 = "$host_cpu"; then
+	# AIX 5 now supports IA64 processor
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the '-m68020' flag to GCC prevents building anything better,
+            # like '-m68040'.
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      m4_if([$1], [GCJ], [],
+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      case $host_os in
+      os2*)
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+	;;
+      esac
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      ;;
+
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)=
+      ;;
+
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	# +Z the default
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	;;
+      esac
+      ;;
+
+    interix[[3-9]]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+
+    msdosdjgpp*)
+      # Just because we use GCC doesn't mean we suddenly get shared libraries
+      # on systems that don't support them.
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      enable_shared=no
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+      fi
+      ;;
+
+    *)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+    esac
+
+    case $cc_basename in
+    nvcc*) # Cuda Compiler Driver 2.2
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
+      if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
+      fi
+      ;;
+    esac
+  else
+    # PORTME Check for flag to pass linker flags through the system compiler.
+    case $host_os in
+    aix*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      if test ia64 = "$host_cpu"; then
+	# AIX 5 now supports IA64 processor
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      else
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+      fi
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      case $cc_basename in
+      nagfor*)
+        # NAG Fortran compiler
+        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+        _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+        ;;
+      esac
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      m4_if([$1], [GCJ], [],
+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      case $host_os in
+      os2*)
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+	;;
+      esac
+      ;;
+
+    hpux9* | hpux10* | hpux11*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	;;
+      esac
+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # PIC (with -KPIC) is the default.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+      case $cc_basename in
+      # old Intel for x86_64, which still supported -KPIC.
+      ecc*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+        ;;
+      # icc used to be incompatible with GCC.
+      # ICC 10 doesn't accept -KPIC any more.
+      icc* | ifort*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+        ;;
+      # Lahey Fortran 8.1.
+      lf95*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
+	;;
+      nagfor*)
+	# NAG Fortran compiler
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	;;
+      tcc*)
+	# Fabrice Bellard et al's Tiny C Compiler
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	;;
+      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+	# which looks to be a dead project)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+        ;;
+      ccc*)
+        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+        # All Alpha code is PIC.
+        _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+        ;;
+      xl* | bgxl* | bgf* | mpixl*)
+	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
+	;;
+      *)
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
+	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	  ;;
+	*Sun\ C*)
+	  # Sun C 5.9
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  ;;
+        *Intel*\ [[CF]]*Compiler*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	  ;;
+	*Portland\ Group*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  ;;
+	esac
+	;;
+      esac
+      ;;
+
+    newsos6)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+
+    osf3* | osf4* | osf5*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # All OSF/1 code is PIC.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    rdos*)
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    solaris*)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
+      esac
+      ;;
+
+    sunos4*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    sysv4 | sysv4.2uw2* | sysv4.3*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    unicos*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      ;;
+
+    uts4*)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    *)
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      ;;
+    esac
+  fi
+])
+case $host_os in
+  # For platforms that do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+    ;;
+  *)
+    _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
+    ;;
+esac
+
+AC_CACHE_CHECK([for $compiler option to produce PIC],
+  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
+  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
+_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
+
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+  _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works],
+    [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)],
+    [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [],
+    [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in
+     "" | " "*) ;;
+     *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;;
+     esac],
+    [_LT_TAGVAR(lt_prog_compiler_pic, $1)=
+     _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
+fi
+_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
+	[Additional compiler flags for building library objects])
+
+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
+	[How to pass a linker flag through the compiler])
+#
+# Check to make sure the static flag actually works.
+#
+wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\"
+_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
+  _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1),
+  $lt_tmp_static_flag,
+  [],
+  [_LT_TAGVAR(lt_prog_compiler_static, $1)=])
+_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
+	[Compiler flag to prevent dynamic linking])
+])# _LT_COMPILER_PIC
+
+
+# _LT_LINKER_SHLIBS([TAGNAME])
+# ----------------------------
+# See if the linker supports building shared libraries.
+m4_defun([_LT_LINKER_SHLIBS],
+[AC_REQUIRE([LT_PATH_LD])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+m4_if([$1], [CXX], [
+  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+  case $host_os in
+  aix[[4-9]]*)
+    # If we're using GNU nm, then we don't want the "-C" option.
+    # -C means demangle to GNU nm, but means don't demangle to AIX nm.
+    # Without the "-l" option, or with the "-B" option, AIX nm treats
+    # weak defined symbols like other global defined symbols, whereas
+    # GNU nm marks them as "W".
+    # While the 'weak' keyword is ignored in the Export File, we need
+    # it in the Import File for the 'aix-soname' feature, so we have
+    # to replace the "-B" option with "-P" for AIX nm.
+    if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
+    else
+      _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
+    fi
+    ;;
+  pw32*)
+    _LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds
+    ;;
+  cygwin* | mingw* | cegcc*)
+    case $cc_basename in
+    cl*)
+      _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+      ;;
+    *)
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
+      ;;
+    esac
+    ;;
+  *)
+    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+    ;;
+  esac
+], [
+  runpath_var=
+  _LT_TAGVAR(allow_undefined_flag, $1)=
+  _LT_TAGVAR(always_export_symbols, $1)=no
+  _LT_TAGVAR(archive_cmds, $1)=
+  _LT_TAGVAR(archive_expsym_cmds, $1)=
+  _LT_TAGVAR(compiler_needs_object, $1)=no
+  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+  _LT_TAGVAR(export_dynamic_flag_spec, $1)=
+  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  _LT_TAGVAR(hardcode_automatic, $1)=no
+  _LT_TAGVAR(hardcode_direct, $1)=no
+  _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+  _LT_TAGVAR(hardcode_libdir_separator, $1)=
+  _LT_TAGVAR(hardcode_minus_L, $1)=no
+  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+  _LT_TAGVAR(inherit_rpath, $1)=no
+  _LT_TAGVAR(link_all_deplibs, $1)=unknown
+  _LT_TAGVAR(module_cmds, $1)=
+  _LT_TAGVAR(module_expsym_cmds, $1)=
+  _LT_TAGVAR(old_archive_from_new_cmds, $1)=
+  _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)=
+  _LT_TAGVAR(thread_safe_flag_spec, $1)=
+  _LT_TAGVAR(whole_archive_flag_spec, $1)=
+  # include_expsyms should be a list of space-separated symbols to be *always*
+  # included in the symbol list
+  _LT_TAGVAR(include_expsyms, $1)=
+  # exclude_expsyms can be an extended regexp of symbols to exclude
+  # it will be wrapped by ' (' and ')$', so one must not match beginning or
+  # end of line.  Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc',
+  # as well as any symbol that contains 'd'.
+  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+  # platforms (ab)use it in PIC code, but their linkers get confused if
+  # the symbol is explicitly referenced.  Since portable code cannot
+  # rely on this symbol name, it's probably fine to never include it in
+  # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
+dnl Note also adjust exclude_expsyms for C++ above.
+  extract_expsyms_cmds=
+
+  case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test yes != "$GCC"; then
+      with_gnu_ld=no
+    fi
+    ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
+  openbsd* | bitrig*)
+    with_gnu_ld=no
+    ;;
+  esac
+
+  _LT_TAGVAR(ld_shlibs, $1)=yes
+
+  # On some targets, GNU ld is compatible enough with the native linker
+  # that we're better off using the native interface for both.
+  lt_use_gnu_ld_interface=no
+  if test yes = "$with_gnu_ld"; then
+    case $host_os in
+      aix*)
+	# The AIX port of GNU ld has always aspired to compatibility
+	# with the native linker.  However, as the warning in the GNU ld
+	# block says, versions before 2.19.5* couldn't really create working
+	# shared libraries, regardless of the interface used.
+	case `$LD -v 2>&1` in
+	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
+	  *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;;
+	  *\ \(GNU\ Binutils\)\ [[3-9]]*) ;;
+	  *)
+	    lt_use_gnu_ld_interface=yes
+	    ;;
+	esac
+	;;
+      *)
+	lt_use_gnu_ld_interface=yes
+	;;
+    esac
+  fi
+
+  if test yes = "$lt_use_gnu_ld_interface"; then
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    wlarc='$wl'
+
+    # Set some defaults for GNU ld with shared library support. These
+    # are reset later if shared libraries are not supported. Putting them
+    # here allows them to be overridden if necessary.
+    runpath_var=LD_RUN_PATH
+    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
+      _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
+    else
+      _LT_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
+    supports_anon_versioning=no
+    case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in
+      *GNU\ gold*) supports_anon_versioning=yes ;;
+      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+      *\ 2.11.*) ;; # other 2.11 versions
+      *) supports_anon_versioning=yes ;;
+    esac
+
+    # See if GNU ld supports shared libraries.
+    case $host_os in
+    aix[[3-9]]*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test ia64 != "$host_cpu"; then
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: the GNU linker, at least up to release 2.19, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support.  If you
+*** really care for shared libraries, you may want to install binutils
+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
+*** You will then need to restart the configuration process.
+
+_LT_EOF
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+            _LT_TAGVAR(archive_expsym_cmds, $1)=''
+        ;;
+      m68k)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes
+        ;;
+      esac
+      ;;
+
+    beos*)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	# support --undefined.  This deserves some investigation.  FIXME
+	_LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+      # as there is no search path for DLLs.
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols'
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_TAGVAR(always_export_symbols, $1)=no
+      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
+
+      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	# If the export-symbols file already is a .def file, use it as
+	# is; otherwise, prepend EXPORTS...
+	_LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
+          cp $export_symbols $output_objdir/$soname.def;
+        else
+          echo EXPORTS > $output_objdir/$soname.def;
+          cat $export_symbols >> $output_objdir/$soname.def;
+        fi~
+        $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    haiku*)
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    os2*)
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      shrext_cmds=.dll
+      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	prefix_cmds="$SED"~
+	if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	  prefix_cmds="$prefix_cmds -e 1d";
+	fi~
+	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      ;;
+
+    interix[[3-9]]*)
+      _LT_TAGVAR(hardcode_direct, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+      # Instead, shared libraries are loaded at an image base (0x10000000 by
+      # default) and relocated if they conflict, which is a slow very memory
+      # consuming and fragmenting process.  To avoid this, we pick a random,
+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      ;;
+
+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+      tmp_diet=no
+      if test linux-dietlibc = "$host_os"; then
+	case $cc_basename in
+	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
+	esac
+      fi
+      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
+	 && test no = "$tmp_diet"
+      then
+	tmp_addflag=' $pic_flag'
+	tmp_sharedflag='-shared'
+	case $cc_basename,$host_cpu in
+        pgcc*)				# Portland Group C compiler
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	  tmp_addflag=' $pic_flag'
+	  ;;
+	pgf77* | pgf90* | pgf95* | pgfortran*)
+					# Portland Group f77 and f90 compilers
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	  tmp_addflag=' $pic_flag -Mnomain' ;;
+	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
+	  tmp_addflag=' -i_dynamic' ;;
+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+	ifc* | ifort*)			# Intel Fortran compiler
+	  tmp_addflag=' -nofor_main' ;;
+	lf95*)				# Lahey Fortran 8.1
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)=
+	  tmp_sharedflag='--shared' ;;
+        nagfor*)                        # NAGFOR 5.3
+          tmp_sharedflag='-Wl,-shared' ;;
+	xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+	  tmp_sharedflag='-qmkshrobj'
+	  tmp_addflag= ;;
+	nvcc*)	# Cuda Compiler Driver 2.2
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	  _LT_TAGVAR(compiler_needs_object, $1)=yes
+	  ;;
+	esac
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	  _LT_TAGVAR(compiler_needs_object, $1)=yes
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	esac
+	_LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+
+        if test yes = "$supports_anon_versioning"; then
+          _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+            cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+            echo "local: *; };" >> $output_objdir/$libname.ver~
+            $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
+        fi
+
+	case $cc_basename in
+	tcc*)
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='-rdynamic'
+	  ;;
+	xlf* | bgf* | bgxlf* | mpixlf*)
+	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
+	  if test yes = "$supports_anon_versioning"; then
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+              cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+              echo "local: *; };" >> $output_objdir/$libname.ver~
+              $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+	  fi
+	  ;;
+	esac
+      else
+        _LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+	wlarc=
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+      fi
+      ;;
+
+    solaris*)
+      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot
+*** reliably create shared libraries on SCO systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+	;;
+	*)
+	  # For security reasons, it is highly recommended that you always
+	  # use absolute paths for naming shared libraries, and exclude the
+	  # DT_RUNPATH tag from executables and libraries.  But doing so
+	  # requires that you compile everything twice, which is a pain.
+	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+	  else
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	  fi
+	;;
+      esac
+      ;;
+
+    sunos4*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      wlarc=
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+    esac
+
+    if test no = "$_LT_TAGVAR(ld_shlibs, $1)"; then
+      runpath_var=
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)=
+      _LT_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
+  else
+    # PORTME fill in a description of your system's linker (not GNU ld)
+    case $host_os in
+    aix3*)
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_TAGVAR(always_export_symbols, $1)=yes
+      _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then
+	# Neither direct hardcoding nor static linking is supported with a
+	# broken collect2.
+	_LT_TAGVAR(hardcode_direct, $1)=unsupported
+      fi
+      ;;
+
+    aix[[4-9]]*)
+      if test ia64 = "$host_cpu"; then
+	# On IA64, the linker does run time linking by default, so we don't
+	# have to do anything special.
+	aix_use_runtimelinking=no
+	exp_sym_flag='-Bexport'
+	no_entry_flag=
+      else
+	# If we're using GNU nm, then we don't want the "-C" option.
+	# -C means demangle to GNU nm, but means don't demangle to AIX nm.
+	# Without the "-l" option, or with the "-B" option, AIX nm treats
+	# weak defined symbols like other global defined symbols, whereas
+	# GNU nm marks them as "W".
+	# While the 'weak' keyword is ignored in the Export File, we need
+	# it in the Import File for the 'aix-soname' feature, so we have
+	# to replace the "-B" option with "-P" for AIX nm.
+	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
+	else
+	  _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
+	fi
+	aix_use_runtimelinking=no
+
+	# Test if we are trying to use run time linking or normal
+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+	# have runtime linking enabled, and use it for executables.
+	# For shared libraries, we enable/disable runtime linking
+	# depending on the kind of the shared library created -
+	# when "with_aix_soname,aix_use_runtimelinking" is:
+	# "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
+	# "aix,yes"  lib.so          shared, rtl:yes, for executables
+	#            lib.a           static archive
+	# "both,no"  lib.so.V(shr.o) shared, rtl:yes
+	#            lib.a(lib.so.V) shared, rtl:no,  for executables
+	# "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+	#            lib.a(lib.so.V) shared, rtl:no
+	# "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
+	#            lib.a           static archive
+	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+	  for ld_flag in $LDFLAGS; do
+	  if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
+	    aix_use_runtimelinking=yes
+	    break
+	  fi
+	  done
+	  if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+	    # With aix-soname=svr4, we create the lib.so.V shared archives only,
+	    # so we don't have lib.a shared libs to link our executables.
+	    # We have to force runtime linking in this case.
+	    aix_use_runtimelinking=yes
+	    LDFLAGS="$LDFLAGS -Wl,-brtl"
+	  fi
+	  ;;
+	esac
+
+	exp_sym_flag='-bexport'
+	no_entry_flag='-bnoentry'
+      fi
+
+      # When large executables or shared objects are built, AIX ld can
+      # have problems creating the table of contents.  If linking a library
+      # or program results in "error TOC overflow" add -mminimal-toc to
+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+      _LT_TAGVAR(archive_cmds, $1)=''
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      _LT_TAGVAR(file_list_spec, $1)='$wl-f,'
+      case $with_aix_soname,$aix_use_runtimelinking in
+      aix,*) ;; # traditional, no import file
+      svr4,* | *,yes) # use import file
+	# The Import File defines what to hardcode.
+	_LT_TAGVAR(hardcode_direct, $1)=no
+	_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+	;;
+      esac
+
+      if test yes = "$GCC"; then
+	case $host_os in aix4.[[012]]|aix4.[[012]].*)
+	# We only want to do this on AIX 4.2 and lower, the check
+	# below for broken collect2 doesn't work under 4.3+
+	  collect2name=`$CC -print-prog-name=collect2`
+	  if test -f "$collect2name" &&
+	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	  then
+	  # We have reworked collect2
+	  :
+	  else
+	  # We have old collect2
+	  _LT_TAGVAR(hardcode_direct, $1)=unsupported
+	  # It fails to find uninstalled libraries when the uninstalled
+	  # path is not listed in the libpath.  Setting hardcode_minus_L
+	  # to unsupported forces relinking
+	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	  _LT_TAGVAR(hardcode_libdir_separator, $1)=
+	  fi
+	  ;;
+	esac
+	shared_flag='-shared'
+	if test yes = "$aix_use_runtimelinking"; then
+	  shared_flag="$shared_flag "'$wl-G'
+	fi
+	# Need to ensure runtime linking is disabled for the traditional
+	# shared library, or the linker may eventually find shared libraries
+	# /with/ Import File - we do not want to mix them.
+	shared_flag_aix='-shared'
+	shared_flag_svr4='-shared $wl-G'
+      else
+	# not using gcc
+	if test ia64 = "$host_cpu"; then
+	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	# chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+	else
+	  if test yes = "$aix_use_runtimelinking"; then
+	    shared_flag='$wl-G'
+	  else
+	    shared_flag='$wl-bM:SRE'
+	  fi
+	  shared_flag_aix='$wl-bM:SRE'
+	  shared_flag_svr4='$wl-G'
+	fi
+      fi
+
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall'
+      # It seems that -bexpall does not export symbols beginning with
+      # underscore (_), so it is better to generate a list of symbols to export.
+      _LT_TAGVAR(always_export_symbols, $1)=yes
+      if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
+	# Warning - without using the other runtime loading flags (-brtl),
+	# -berok will link without error, but may produce a broken library.
+	_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
+        # Determine the default libpath from the value encoded in an
+        # empty executable.
+        _LT_SYS_MODULE_PATH_AIX([$1])
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
+      else
+	if test ia64 = "$host_cpu"; then
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib'
+	  _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
+	else
+	 # Determine the default libpath from the value encoded in an
+	 # empty executable.
+	 _LT_SYS_MODULE_PATH_AIX([$1])
+	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
+	  # Warning - without using the other run time loading flags,
+	  # -berok will link without error, but may produce a broken library.
+	  _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok'
+	  _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok'
+	  if test yes = "$with_gnu_ld"; then
+	    # We only use this code for GNU lds that support --whole-archive.
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
+	  else
+	    # Exported symbols can be pulled into shared objects from archives
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	  fi
+	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+	  # -brtl affects multiple linker settings, -berok does not and is overridden later
+	  compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`'
+	  if test svr4 != "$with_aix_soname"; then
+	    # This is similar to how AIX traditionally builds its shared libraries.
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+	  fi
+	  if test aix != "$with_aix_soname"; then
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+	  else
+	    # used by -dlpreopen to get the symbols
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
+	  fi
+	  _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d'
+	fi
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+            _LT_TAGVAR(archive_expsym_cmds, $1)=''
+        ;;
+      m68k)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes
+        ;;
+      esac
+      ;;
+
+    bsdi[[45]]*)
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      case $cc_basename in
+      cl*)
+	# Native MSVC
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	_LT_TAGVAR(always_export_symbols, $1)=yes
+	_LT_TAGVAR(file_list_spec, $1)='@'
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=.dll
+	# FIXME: Setting linknames here is a bad hack.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+	_LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
+            cp "$export_symbols" "$output_objdir/$soname.def";
+            echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+          else
+            $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+          fi~
+          $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+          linknames='
+	# The linker will not automatically build a static lib if we build a DLL.
+	# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+	_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+	# Don't use ranlib
+	_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
+	_LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
+          lt_tool_outputfile="@TOOL_OUTPUT@"~
+          case $lt_outputfile in
+            *.exe|*.EXE) ;;
+            *)
+              lt_outputfile=$lt_outputfile.exe
+              lt_tool_outputfile=$lt_tool_outputfile.exe
+              ;;
+          esac~
+          if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
+            $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+            $RM "$lt_outputfile.manifest";
+          fi'
+	;;
+      *)
+	# Assume MSVC wrapper
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=.dll
+	# FIXME: Setting linknames here is a bad hack.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+	# The linker will automatically build a .lib file if we build a DLL.
+	_LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	# FIXME: Should let the user specify the lib program.
+	_LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
+	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	;;
+      esac
+      ;;
+
+    darwin* | rhapsody*)
+      _LT_DARWIN_LINKER_FEATURES($1)
+      ;;
+
+    dgux*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+    # support.  Future versions do this automatically, but an explicit c++rt0.o
+    # does not break anything, and helps significantly (at the cost of a little
+    # extra space).
+    freebsd2.2*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+    freebsd2.*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+    freebsd* | dragonfly*)
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    hpux9*)
+      if test yes = "$GCC"; then
+	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+      ;;
+
+    hpux10*)
+      if test yes,no = "$GCC,$with_gnu_ld"; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      if test no = "$with_gnu_ld"; then
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
+	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
+	_LT_TAGVAR(hardcode_direct, $1)=yes
+	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+	# hardcode_minus_L: Not really in the search PATH,
+	# but as the default location of the library.
+	_LT_TAGVAR(hardcode_minus_L, $1)=yes
+      fi
+      ;;
+
+    hpux11*)
+      if test yes,no = "$GCC,$with_gnu_ld"; then
+	case $host_cpu in
+	hppa*64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      else
+	case $host_cpu in
+	hppa*64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	m4_if($1, [], [
+	  # Older versions of the 11.00 compiler do not understand -b yet
+	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
+	  _LT_LINKER_OPTION([if $CC understands -b],
+	    _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
+	    [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
+	    [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
+	  [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
+	  ;;
+	esac
+      fi
+      if test no = "$with_gnu_ld"; then
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
+	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	case $host_cpu in
+	hppa*64*|ia64*)
+	  _LT_TAGVAR(hardcode_direct, $1)=no
+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	  ;;
+	*)
+	  _LT_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+
+	  # hardcode_minus_L: Not really in the search PATH,
+	  # but as the default location of the library.
+	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
+	  ;;
+	esac
+      fi
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      if test yes = "$GCC"; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+	# Try to use the -exported_symbol ld option, if it does not
+	# work, assume that -exports_file does not work either and
+	# implicitly export all symbols.
+	# This should be the same for all languages, so no per-tag cache variable.
+	AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
+	  [lt_cv_irix_exported_symbol],
+	  [save_LDFLAGS=$LDFLAGS
+	   LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null"
+	   AC_LINK_IFELSE(
+	     [AC_LANG_SOURCE(
+	        [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
+			      [C++], [[int foo (void) { return 0; }]],
+			      [Fortran 77], [[
+      subroutine foo
+      end]],
+			      [Fortran], [[
+      subroutine foo
+      end]])])],
+	      [lt_cv_irix_exported_symbol=yes],
+	      [lt_cv_irix_exported_symbol=no])
+           LDFLAGS=$save_LDFLAGS])
+	if test yes = "$lt_cv_irix_exported_symbol"; then
+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
+	fi
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(inherit_rpath, $1)=yes
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    linux*)
+      case $cc_basename in
+      tcc*)
+	# Fabrice Bellard et al's Tiny C Compiler
+	_LT_TAGVAR(ld_shlibs, $1)=yes
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+      esac
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    newsos6)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *nto* | *qnx*)
+      ;;
+
+    openbsd* | bitrig*)
+      if test -f /usr/libexec/ld.so; then
+	_LT_TAGVAR(hardcode_direct, $1)=yes
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+	else
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	fi
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    os2*)
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      shrext_cmds=.dll
+      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	prefix_cmds="$SED"~
+	if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	  prefix_cmds="$prefix_cmds -e 1d";
+	fi~
+	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      ;;
+
+    osf3*)
+      if test yes = "$GCC"; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+      else
+	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      ;;
+
+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
+      if test yes = "$GCC"; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+      else
+	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
+          $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp'
+
+	# Both c and cxx compiler support -rpath directly
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      ;;
+
+    solaris*)
+      _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
+      if test yes = "$GCC"; then
+	wlarc='$wl'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+          $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+      else
+	case `$CC -V 2>&1` in
+	*"Compilers 5.0"*)
+	  wlarc=''
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+            $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+	  ;;
+	*)
+	  wlarc='$wl'
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+            $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	  ;;
+	esac
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      case $host_os in
+      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+      *)
+	# The compiler driver will combine and reorder linker options,
+	# but understands '-z linker_flag'.  GCC discards it without '$wl',
+	# but is careful enough not to reorder.
+	# Supported since Solaris 2.6 (maybe 2.5.1?)
+	if test yes = "$GCC"; then
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
+	else
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+	fi
+	;;
+      esac
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    sunos4*)
+      if test sequent = "$host_vendor"; then
+	# Use $CC to link under sequent, because it throws in some extra .o
+	# files that make .init and .fini sections work.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    sysv4)
+      case $host_vendor in
+	sni)
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true???
+	;;
+	siemens)
+	  ## LD is ld it makes a PLAMLIB
+	  ## CC just makes a GrossModule.
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
+	  _LT_TAGVAR(hardcode_direct, $1)=no
+        ;;
+	motorola)
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
+	;;
+      esac
+      runpath_var='LD_RUN_PATH'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    sysv4.3*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	runpath_var=LD_RUN_PATH
+	hardcode_runpath_var=yes
+	_LT_TAGVAR(ld_shlibs, $1)=yes
+      fi
+      ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+      _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      runpath_var='LD_RUN_PATH'
+
+      if test yes = "$GCC"; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6*)
+      # Note: We CANNOT use -z defs as we might desire, because we do not
+      # link with -lc, and that would cause any symbols used from libc to
+      # always be unresolved, which means just about no library would
+      # ever link correctly.  If we're not using GNU ld we use -z text
+      # though, which does catch some bad symbols but isn't as heavy-handed
+      # as -z defs.
+      _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
+      _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport'
+      runpath_var='LD_RUN_PATH'
+
+      if test yes = "$GCC"; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    uts4*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *)
+      _LT_TAGVAR(ld_shlibs, $1)=no
+      ;;
+    esac
+
+    if test sni = "$host_vendor"; then
+      case $host in
+      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Blargedynsym'
+	;;
+      esac
+    fi
+  fi
+])
+AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
+test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no
+
+_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
+
+_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl
+_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl
+_LT_DECL([], [extract_expsyms_cmds], [2],
+    [The commands to extract the exported symbol list from a shared archive])
+
+#
+# Do we need to explicitly link libc?
+#
+case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in
+x|xyes)
+  # Assume -lc should be added
+  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+
+  if test yes,yes = "$GCC,$enable_shared"; then
+    case $_LT_TAGVAR(archive_cmds, $1) in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # 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.
+      AC_CACHE_CHECK([whether -lc should be explicitly linked in],
+	[lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1),
+	[$RM conftest*
+	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+	if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+	  soname=conftest
+	  lib=conftest
+	  libobjs=conftest.$ac_objext
+	  deplibs=
+	  wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
+	  pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
+	  compiler_flags=-v
+	  linker_flags=-v
+	  verstring=
+	  output_objdir=.
+	  libname=conftest
+	  lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
+	  _LT_TAGVAR(allow_undefined_flag, $1)=
+	  if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
+	  then
+	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	  else
+	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+	  fi
+	  _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
+	else
+	  cat conftest.err 1>&5
+	fi
+	$RM conftest*
+	])
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)
+      ;;
+    esac
+  fi
+  ;;
+esac
+
+_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0],
+    [Whether or not to add -lc for building shared libraries])
+_LT_TAGDECL([allow_libtool_libs_with_static_runtimes],
+    [enable_shared_with_static_runtimes], [0],
+    [Whether or not to disallow shared libs when runtime libs are static])
+_LT_TAGDECL([], [export_dynamic_flag_spec], [1],
+    [Compiler flag to allow reflexive dlopens])
+_LT_TAGDECL([], [whole_archive_flag_spec], [1],
+    [Compiler flag to generate shared objects directly from archives])
+_LT_TAGDECL([], [compiler_needs_object], [1],
+    [Whether the compiler copes with passing no objects directly])
+_LT_TAGDECL([], [old_archive_from_new_cmds], [2],
+    [Create an old-style archive from a shared archive])
+_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2],
+    [Create a temporary old-style archive to link instead of a shared archive])
+_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive])
+_LT_TAGDECL([], [archive_expsym_cmds], [2])
+_LT_TAGDECL([], [module_cmds], [2],
+    [Commands used to build a loadable module if different from building
+    a shared archive.])
+_LT_TAGDECL([], [module_expsym_cmds], [2])
+_LT_TAGDECL([], [with_gnu_ld], [1],
+    [Whether we are building with GNU ld or not])
+_LT_TAGDECL([], [allow_undefined_flag], [1],
+    [Flag that allows shared libraries with undefined symbols to be built])
+_LT_TAGDECL([], [no_undefined_flag], [1],
+    [Flag that enforces no undefined symbols])
+_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
+    [Flag to hardcode $libdir into a binary during linking.
+    This must work even if $libdir does not exist])
+_LT_TAGDECL([], [hardcode_libdir_separator], [1],
+    [Whether we need a single "-rpath" flag with a separated argument])
+_LT_TAGDECL([], [hardcode_direct], [0],
+    [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes
+    DIR into the resulting binary])
+_LT_TAGDECL([], [hardcode_direct_absolute], [0],
+    [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes
+    DIR into the resulting binary and the resulting library dependency is
+    "absolute", i.e impossible to change by setting $shlibpath_var if the
+    library is relocated])
+_LT_TAGDECL([], [hardcode_minus_L], [0],
+    [Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+    into the resulting binary])
+_LT_TAGDECL([], [hardcode_shlibpath_var], [0],
+    [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
+    into the resulting binary])
+_LT_TAGDECL([], [hardcode_automatic], [0],
+    [Set to "yes" if building a shared library automatically hardcodes DIR
+    into the library and all subsequent libraries and executables linked
+    against it])
+_LT_TAGDECL([], [inherit_rpath], [0],
+    [Set to yes if linker adds runtime paths of dependent libraries
+    to runtime path list])
+_LT_TAGDECL([], [link_all_deplibs], [0],
+    [Whether libtool must link a program against all its dependency libraries])
+_LT_TAGDECL([], [always_export_symbols], [0],
+    [Set to "yes" if exported symbols are required])
+_LT_TAGDECL([], [export_symbols_cmds], [2],
+    [The commands to list exported symbols])
+_LT_TAGDECL([], [exclude_expsyms], [1],
+    [Symbols that should not be listed in the preloaded symbols])
+_LT_TAGDECL([], [include_expsyms], [1],
+    [Symbols that must always be exported])
+_LT_TAGDECL([], [prelink_cmds], [2],
+    [Commands necessary for linking programs (against libraries) with templates])
+_LT_TAGDECL([], [postlink_cmds], [2],
+    [Commands necessary for finishing linking programs])
+_LT_TAGDECL([], [file_list_spec], [1],
+    [Specify filename containing input files])
+dnl FIXME: Not yet implemented
+dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1],
+dnl    [Compiler flag to generate thread safe objects])
+])# _LT_LINKER_SHLIBS
+
+
+# _LT_LANG_C_CONFIG([TAG])
+# ------------------------
+# Ensure that the configuration variables for a C compiler are suitably
+# defined.  These variables are subsequently used by _LT_CONFIG to write
+# the compiler configuration to 'libtool'.
+m4_defun([_LT_LANG_C_CONFIG],
+[m4_require([_LT_DECL_EGREP])dnl
+lt_save_CC=$CC
+AC_LANG_PUSH(C)
+
+# Source file extension for C test sources.
+ac_ext=c
+
+# Object file extension for compiled C test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(){return(0);}'
+
+_LT_TAG_COMPILER
+# Save the default compiler, since it gets overwritten when the other
+# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
+compiler_DEFAULT=$CC
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_SYS_DYNAMIC_LINKER($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+  LT_SYS_DLOPEN_SELF
+  _LT_CMD_STRIPLIB
+
+  # Report what library types will actually be built
+  AC_MSG_CHECKING([if libtool supports shared libraries])
+  AC_MSG_RESULT([$can_build_shared])
+
+  AC_MSG_CHECKING([whether to build shared libraries])
+  test no = "$can_build_shared" && enable_shared=no
+
+  # On AIX, shared libraries and static libraries use the same namespace, and
+  # are all built from PIC.
+  case $host_os in
+  aix3*)
+    test yes = "$enable_shared" && enable_static=no
+    if test -n "$RANLIB"; then
+      archive_cmds="$archive_cmds~\$RANLIB \$lib"
+      postinstall_cmds='$RANLIB $lib'
+    fi
+    ;;
+
+  aix[[4-9]]*)
+    if test ia64 != "$host_cpu"; then
+      case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+      yes,aix,yes) ;;			# shared object as lib.so file only
+      yes,svr4,*) ;;			# shared object as lib.so archive member only
+      yes,*) enable_static=no ;;	# shared object in lib.a archive as well
+      esac
+    fi
+    ;;
+  esac
+  AC_MSG_RESULT([$enable_shared])
+
+  AC_MSG_CHECKING([whether to build static libraries])
+  # Make sure either enable_shared or enable_static is yes.
+  test yes = "$enable_shared" || enable_static=yes
+  AC_MSG_RESULT([$enable_static])
+
+  _LT_CONFIG($1)
+fi
+AC_LANG_POP
+CC=$lt_save_CC
+])# _LT_LANG_C_CONFIG
+
+
+# _LT_LANG_CXX_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for a C++ compiler are suitably
+# defined.  These variables are subsequently used by _LT_CONFIG to write
+# the compiler configuration to 'libtool'.
+m4_defun([_LT_LANG_CXX_CONFIG],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
+if test -n "$CXX" && ( test no != "$CXX" &&
+    ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) ||
+    (test g++ != "$CXX"))); then
+  AC_PROG_CXXCPP
+else
+  _lt_caught_CXX_error=yes
+fi
+
+AC_LANG_PUSH(C++)
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(compiler_needs_object, $1)=no
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for C++ test sources.
+ac_ext=cpp
+
+# Object file extension for compiled C++ test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the CXX compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test yes != "$_lt_caught_CXX_error"; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="int some_variable = 0;"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC=$CC
+  lt_save_CFLAGS=$CFLAGS
+  lt_save_LD=$LD
+  lt_save_GCC=$GCC
+  GCC=$GXX
+  lt_save_with_gnu_ld=$with_gnu_ld
+  lt_save_path_LD=$lt_cv_path_LD
+  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+  else
+    $as_unset lt_cv_prog_gnu_ld
+  fi
+  if test -n "${lt_cv_path_LDCXX+set}"; then
+    lt_cv_path_LD=$lt_cv_path_LDCXX
+  else
+    $as_unset lt_cv_path_LD
+  fi
+  test -z "${LDCXX+set}" || LD=$LDCXX
+  CC=${CXX-"c++"}
+  CFLAGS=$CXXFLAGS
+  compiler=$CC
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+
+  if test -n "$compiler"; then
+    # We don't want -fno-exception when compiling C++ code, so set the
+    # no_builtin_flag separately
+    if test yes = "$GXX"; then
+      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+    else
+      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+    fi
+
+    if test yes = "$GXX"; then
+      # Set up default GNU C++ configuration
+
+      LT_PATH_LD
+
+      # Check if GNU C++ uses GNU ld as the underlying linker, since the
+      # archiving commands below assume that GNU ld is being used.
+      if test yes = "$with_gnu_ld"; then
+        _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+
+        # If archive_cmds runs LD, not CC, wlarc should be empty
+        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+        #     investigate it a little bit more. (MM)
+        wlarc='$wl'
+
+        # ancient GNU ld didn't support --whole-archive et. al.
+        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
+	  $GREP 'no-whole-archive' > /dev/null; then
+          _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
+        else
+          _LT_TAGVAR(whole_archive_flag_spec, $1)=
+        fi
+      else
+        with_gnu_ld=no
+        wlarc=
+
+        # A generic and very simple default shared library creation
+        # command for GNU C++ for the case where it uses the native
+        # linker, instead of GNU ld.  If possible, this setting should
+        # overridden to take advantage of the native linker features on
+        # the platform it is being used on.
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+      fi
+
+      # Commands to make compiler produce verbose output that lists
+      # what "hidden" libraries, object files and flags are used when
+      # linking a shared library.
+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+
+    else
+      GXX=no
+      with_gnu_ld=no
+      wlarc=
+    fi
+
+    # PORTME: fill in a description of your system's C++ link characteristics
+    AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+    _LT_TAGVAR(ld_shlibs, $1)=yes
+    case $host_os in
+      aix3*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+      aix[[4-9]]*)
+        if test ia64 = "$host_cpu"; then
+          # On IA64, the linker does run time linking by default, so we don't
+          # have to do anything special.
+          aix_use_runtimelinking=no
+          exp_sym_flag='-Bexport'
+          no_entry_flag=
+        else
+          aix_use_runtimelinking=no
+
+          # Test if we are trying to use run time linking or normal
+          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+          # have runtime linking enabled, and use it for executables.
+          # For shared libraries, we enable/disable runtime linking
+          # depending on the kind of the shared library created -
+          # when "with_aix_soname,aix_use_runtimelinking" is:
+          # "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
+          # "aix,yes"  lib.so          shared, rtl:yes, for executables
+          #            lib.a           static archive
+          # "both,no"  lib.so.V(shr.o) shared, rtl:yes
+          #            lib.a(lib.so.V) shared, rtl:no,  for executables
+          # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+          #            lib.a(lib.so.V) shared, rtl:no
+          # "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
+          #            lib.a           static archive
+          case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+	    for ld_flag in $LDFLAGS; do
+	      case $ld_flag in
+	      *-brtl*)
+	        aix_use_runtimelinking=yes
+	        break
+	        ;;
+	      esac
+	    done
+	    if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+	      # With aix-soname=svr4, we create the lib.so.V shared archives only,
+	      # so we don't have lib.a shared libs to link our executables.
+	      # We have to force runtime linking in this case.
+	      aix_use_runtimelinking=yes
+	      LDFLAGS="$LDFLAGS -Wl,-brtl"
+	    fi
+	    ;;
+          esac
+
+          exp_sym_flag='-bexport'
+          no_entry_flag='-bnoentry'
+        fi
+
+        # When large executables or shared objects are built, AIX ld can
+        # have problems creating the table of contents.  If linking a library
+        # or program results in "error TOC overflow" add -mminimal-toc to
+        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+        _LT_TAGVAR(archive_cmds, $1)=''
+        _LT_TAGVAR(hardcode_direct, $1)=yes
+        _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+        _LT_TAGVAR(link_all_deplibs, $1)=yes
+        _LT_TAGVAR(file_list_spec, $1)='$wl-f,'
+        case $with_aix_soname,$aix_use_runtimelinking in
+        aix,*) ;;	# no import file
+        svr4,* | *,yes) # use import file
+          # The Import File defines what to hardcode.
+          _LT_TAGVAR(hardcode_direct, $1)=no
+          _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+          ;;
+        esac
+
+        if test yes = "$GXX"; then
+          case $host_os in aix4.[[012]]|aix4.[[012]].*)
+          # We only want to do this on AIX 4.2 and lower, the check
+          # below for broken collect2 doesn't work under 4.3+
+	  collect2name=`$CC -print-prog-name=collect2`
+	  if test -f "$collect2name" &&
+	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	  then
+	    # We have reworked collect2
+	    :
+	  else
+	    # We have old collect2
+	    _LT_TAGVAR(hardcode_direct, $1)=unsupported
+	    # It fails to find uninstalled libraries when the uninstalled
+	    # path is not listed in the libpath.  Setting hardcode_minus_L
+	    # to unsupported forces relinking
+	    _LT_TAGVAR(hardcode_minus_L, $1)=yes
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=
+	  fi
+          esac
+          shared_flag='-shared'
+	  if test yes = "$aix_use_runtimelinking"; then
+	    shared_flag=$shared_flag' $wl-G'
+	  fi
+	  # Need to ensure runtime linking is disabled for the traditional
+	  # shared library, or the linker may eventually find shared libraries
+	  # /with/ Import File - we do not want to mix them.
+	  shared_flag_aix='-shared'
+	  shared_flag_svr4='-shared $wl-G'
+        else
+          # not using gcc
+          if test ia64 = "$host_cpu"; then
+	  # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	  # chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+          else
+	    if test yes = "$aix_use_runtimelinking"; then
+	      shared_flag='$wl-G'
+	    else
+	      shared_flag='$wl-bM:SRE'
+	    fi
+	    shared_flag_aix='$wl-bM:SRE'
+	    shared_flag_svr4='$wl-G'
+          fi
+        fi
+
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall'
+        # It seems that -bexpall does not export symbols beginning with
+        # underscore (_), so it is better to generate a list of symbols to
+	# export.
+        _LT_TAGVAR(always_export_symbols, $1)=yes
+	if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
+          # Warning - without using the other runtime loading flags (-brtl),
+          # -berok will link without error, but may produce a broken library.
+          # The "-G" linker flag allows undefined symbols.
+          _LT_TAGVAR(no_undefined_flag, $1)='-bernotok'
+          # Determine the default libpath from the value encoded in an empty
+          # executable.
+          _LT_SYS_MODULE_PATH_AIX([$1])
+          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
+
+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
+        else
+          if test ia64 = "$host_cpu"; then
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib'
+	    _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
+          else
+	    # Determine the default libpath from the value encoded in an
+	    # empty executable.
+	    _LT_SYS_MODULE_PATH_AIX([$1])
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
+	    # Warning - without using the other run time loading flags,
+	    # -berok will link without error, but may produce a broken library.
+	    _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok'
+	    _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok'
+	    if test yes = "$with_gnu_ld"; then
+	      # We only use this code for GNU lds that support --whole-archive.
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
+	    else
+	      # Exported symbols can be pulled into shared objects from archives
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	    fi
+	    _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+	    # -brtl affects multiple linker settings, -berok does not and is overridden later
+	    compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`'
+	    if test svr4 != "$with_aix_soname"; then
+	      # This is similar to how AIX traditionally builds its shared
+	      # libraries. Need -bnortl late, we may have -brtl in LDFLAGS.
+	      _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+	    fi
+	    if test aix != "$with_aix_soname"; then
+	      _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+	    else
+	      # used by -dlpreopen to get the symbols
+	      _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
+	    fi
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d'
+          fi
+        fi
+        ;;
+
+      beos*)
+	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	  # support --undefined.  This deserves some investigation.  FIXME
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	else
+	  _LT_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+
+      chorus*)
+        case $cc_basename in
+          *)
+	  # FIXME: insert proper C++ library support
+	  _LT_TAGVAR(ld_shlibs, $1)=no
+	  ;;
+        esac
+        ;;
+
+      cygwin* | mingw* | pw32* | cegcc*)
+	case $GXX,$cc_basename in
+	,cl* | no,cl*)
+	  # Native MSVC
+	  # hardcode_libdir_flag_spec is actually meaningless, as there is
+	  # no search path for DLLs.
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  _LT_TAGVAR(always_export_symbols, $1)=yes
+	  _LT_TAGVAR(file_list_spec, $1)='@'
+	  # Tell ltmain to make .lib files, not .a files.
+	  libext=lib
+	  # Tell ltmain to make .dll files, not .so files.
+	  shrext_cmds=.dll
+	  # FIXME: Setting linknames here is a bad hack.
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
+              cp "$export_symbols" "$output_objdir/$soname.def";
+              echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+            else
+              $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+            fi~
+            $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+            linknames='
+	  # The linker will not automatically build a static lib if we build a DLL.
+	  # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	  # Don't use ranlib
+	  _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
+	  _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
+            lt_tool_outputfile="@TOOL_OUTPUT@"~
+            case $lt_outputfile in
+              *.exe|*.EXE) ;;
+              *)
+                lt_outputfile=$lt_outputfile.exe
+                lt_tool_outputfile=$lt_tool_outputfile.exe
+                ;;
+            esac~
+            func_to_tool_file "$lt_outputfile"~
+            if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
+              $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+              $RM "$lt_outputfile.manifest";
+            fi'
+	  ;;
+	*)
+	  # g++
+	  # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+	  # as there is no search path for DLLs.
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols'
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  _LT_TAGVAR(always_export_symbols, $1)=no
+	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+
+	  if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	    # If the export-symbols file already is a .def file, use it as
+	    # is; otherwise, prepend EXPORTS...
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
+              cp $export_symbols $output_objdir/$soname.def;
+            else
+              echo EXPORTS > $output_objdir/$soname.def;
+              cat $export_symbols >> $output_objdir/$soname.def;
+            fi~
+            $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	  else
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	  fi
+	  ;;
+	esac
+	;;
+      darwin* | rhapsody*)
+        _LT_DARWIN_LINKER_FEATURES($1)
+	;;
+
+      os2*)
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	_LT_TAGVAR(hardcode_minus_L, $1)=yes
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	shrext_cmds=.dll
+	_LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	  $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	  $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	  $ECHO EXPORTS >> $output_objdir/$libname.def~
+	  emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	  emximp -o $lib $output_objdir/$libname.def'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	  $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	  $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	  $ECHO EXPORTS >> $output_objdir/$libname.def~
+	  prefix_cmds="$SED"~
+	  if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	    prefix_cmds="$prefix_cmds -e 1d";
+	  fi~
+	  prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+	  cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	  emximp -o $lib $output_objdir/$libname.def'
+	_LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	;;
+
+      dgux*)
+        case $cc_basename in
+          ec++*)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          ghcx*)
+	    # Green Hills C++ Compiler
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+        esac
+        ;;
+
+      freebsd2.*)
+        # C++ shared libraries reported to be fairly broken before
+	# switch to ELF
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      freebsd-elf*)
+        _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+        ;;
+
+      freebsd* | dragonfly*)
+        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+        # conventions
+        _LT_TAGVAR(ld_shlibs, $1)=yes
+        ;;
+
+      haiku*)
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+        _LT_TAGVAR(link_all_deplibs, $1)=yes
+        ;;
+
+      hpux9*)
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+        _LT_TAGVAR(hardcode_direct, $1)=yes
+        _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+				             # but as the default
+				             # location of the library.
+
+        case $cc_basename in
+          CC*)
+            # FIXME: insert proper C++ library support
+            _LT_TAGVAR(ld_shlibs, $1)=no
+            ;;
+          aCC*)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
+            # Commands to make compiler produce verbose output that lists
+            # what "hidden" libraries, object files and flags are used when
+            # linking a shared library.
+            #
+            # There doesn't appear to be a way to prevent this compiler from
+            # explicitly linking system object files so we need to strip them
+            # from the output so that they don't get included in the library
+            # dependencies.
+            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+            ;;
+          *)
+            if test yes = "$GXX"; then
+              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
+            else
+              # FIXME: insert proper C++ library support
+              _LT_TAGVAR(ld_shlibs, $1)=no
+            fi
+            ;;
+        esac
+        ;;
+
+      hpux10*|hpux11*)
+        if test no = "$with_gnu_ld"; then
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
+	  _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+          case $host_cpu in
+            hppa*64*|ia64*)
+              ;;
+            *)
+	      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+              ;;
+          esac
+        fi
+        case $host_cpu in
+          hppa*64*|ia64*)
+            _LT_TAGVAR(hardcode_direct, $1)=no
+            _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+            ;;
+          *)
+            _LT_TAGVAR(hardcode_direct, $1)=yes
+            _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+					         # but as the default
+					         # location of the library.
+            ;;
+        esac
+
+        case $cc_basename in
+          CC*)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          aCC*)
+	    case $host_cpu in
+	      hppa*64*)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	      ia64*)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	      *)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	    esac
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    ;;
+          *)
+	    if test yes = "$GXX"; then
+	      if test no = "$with_gnu_ld"; then
+	        case $host_cpu in
+	          hppa*64*)
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	          ia64*)
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	          *)
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	        esac
+	      fi
+	    else
+	      # FIXME: insert proper C++ library support
+	      _LT_TAGVAR(ld_shlibs, $1)=no
+	    fi
+	    ;;
+        esac
+        ;;
+
+      interix[[3-9]]*)
+	_LT_TAGVAR(hardcode_direct, $1)=no
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+	# Instead, shared libraries are loaded at an image base (0x10000000 by
+	# default) and relocated if they conflict, which is a slow very memory
+	# consuming and fragmenting process.  To avoid this, we pick a random,
+	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	;;
+      irix5* | irix6*)
+        case $cc_basename in
+          CC*)
+	    # SGI C++
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
+	    # necessary to make sure instantiated templates are included
+	    # in the archive.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
+	    ;;
+          *)
+	    if test yes = "$GXX"; then
+	      if test no = "$with_gnu_ld"; then
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+	      else
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib'
+	      fi
+	    fi
+	    _LT_TAGVAR(link_all_deplibs, $1)=yes
+	    ;;
+        esac
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+        _LT_TAGVAR(inherit_rpath, $1)=yes
+        ;;
+
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+        case $cc_basename in
+          KCC*)
+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	    # KCC will only create a shared library if the output file
+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
+	    # to its proper name (with version) after linking.
+	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib $wl-retain-symbols-file,$export_symbols; mv \$templib $lib'
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+	    ;;
+	  icpc* | ecpc* )
+	    # Intel C++
+	    with_gnu_ld=yes
+	    # version 8.0 and above of icpc choke on multiply defined symbols
+	    # if we add $predep_objects and $postdep_objects, however 7.1 and
+	    # earlier do not add the objects themselves.
+	    case `$CC -V 2>&1` in
+	      *"Version 7."*)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+		;;
+	      *)  # Version 8.0 or newer
+	        tmp_idyn=
+	        case $host_cpu in
+		  ia64*) tmp_idyn=' -i_dynamic';;
+		esac
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+		;;
+	    esac
+	    _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
+	    ;;
+          pgCC* | pgcpp*)
+            # Portland Group C++ compiler
+	    case `$CC -V` in
+	    *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
+	      _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
+               rm -rf $tpldir~
+               $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
+               compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
+	      _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
+                rm -rf $tpldir~
+                $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
+                $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
+                $RANLIB $oldlib'
+	      _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
+                rm -rf $tpldir~
+                $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+                $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
+                rm -rf $tpldir~
+                $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+                $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+	      ;;
+	    *) # Version 6 and above use weak symbols
+	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+	      ;;
+	    esac
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl--rpath $wl$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+            ;;
+	  cxx*)
+	    # Compaq C++
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname  -o $lib $wl-retain-symbols-file $wl$export_symbols'
+
+	    runpath_var=LD_RUN_PATH
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
+	    ;;
+	  xl* | mpixl* | bgxl*)
+	    # IBM XL 8.0 on PPC, with GNU ld
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	    if test yes = "$supports_anon_versioning"; then
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+                cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+                echo "local: *; };" >> $output_objdir/$libname.ver~
+                $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
+	    fi
+	    ;;
+	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+	      _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols'
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	      _LT_TAGVAR(compiler_needs_object, $1)=yes
+
+	      # Not sure whether something based on
+	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+	      # would be better.
+	      output_verbose_link_cmd='func_echo_all'
+
+	      # Archives containing C++ object files must be created using
+	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	      # necessary to make sure instantiated templates are included
+	      # in the archive.
+	      _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+	      ;;
+	    esac
+	    ;;
+	esac
+	;;
+
+      lynxos*)
+        # FIXME: insert proper C++ library support
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	;;
+
+      m88k*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+	;;
+
+      mvs*)
+        case $cc_basename in
+          cxx*)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+	  *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+	esac
+	;;
+
+      netbsd*)
+        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+	  wlarc=
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	  _LT_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	fi
+	# Workaround some broken pre-1.5 toolchains
+	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+	;;
+
+      *nto* | *qnx*)
+        _LT_TAGVAR(ld_shlibs, $1)=yes
+	;;
+
+      openbsd* | bitrig*)
+	if test -f /usr/libexec/ld.so; then
+	  _LT_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
+	  fi
+	  output_verbose_link_cmd=func_echo_all
+	else
+	  _LT_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+
+      osf3* | osf4* | osf5*)
+        case $cc_basename in
+          KCC*)
+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	    # KCC will only create a shared library if the output file
+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
+	    # to its proper name (with version) after linking.
+	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	    # Archives containing C++ object files must be created using
+	    # the KAI C++ compiler.
+	    case $host in
+	      osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;;
+	      *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;;
+	    esac
+	    ;;
+          RCC*)
+	    # Rational C++ 2.4.1
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          cxx*)
+	    case $host in
+	      osf3*)
+	        _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $soname `test -n "$verstring" && func_echo_all "$wl-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+		;;
+	      *)
+	        _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+                  echo "-hidden">> $lib.exp~
+                  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~
+                  $RM $lib.exp'
+	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+		;;
+	    esac
+
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    ;;
+	  *)
+	    if test yes,no = "$GXX,$with_gnu_ld"; then
+	      _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
+	      case $host in
+	        osf3*)
+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+		  ;;
+	        *)
+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+		  ;;
+	      esac
+
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+	      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	      # Commands to make compiler produce verbose output that lists
+	      # what "hidden" libraries, object files and flags are used when
+	      # linking a shared library.
+	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+
+	    else
+	      # FIXME: insert proper C++ library support
+	      _LT_TAGVAR(ld_shlibs, $1)=no
+	    fi
+	    ;;
+        esac
+        ;;
+
+      psos*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      sunos4*)
+        case $cc_basename in
+          CC*)
+	    # Sun C++ 4.x
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          lcc*)
+	    # Lucid
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+        esac
+        ;;
+
+      solaris*)
+        case $cc_basename in
+          CC* | sunCC*)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+            _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
+	    _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+              $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	    _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	    case $host_os in
+	      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+	      *)
+		# The compiler driver will combine and reorder linker options,
+		# but understands '-z linker_flag'.
+	        # Supported since Solaris 2.6 (maybe 2.5.1?)
+		_LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+	        ;;
+	    esac
+	    _LT_TAGVAR(link_all_deplibs, $1)=yes
+
+	    output_verbose_link_cmd='func_echo_all'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	    # necessary to make sure instantiated templates are included
+	    # in the archive.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+	    ;;
+          gcx*)
+	    # Green Hills C++ Compiler
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
+
+	    # The C++ compiler must be used to create the archive.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+	    ;;
+          *)
+	    # GNU C++ compiler with Solaris linker
+	    if test yes,no = "$GXX,$with_gnu_ld"; then
+	      _LT_TAGVAR(no_undefined_flag, $1)=' $wl-z ${wl}defs'
+	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+                  $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	        # Commands to make compiler produce verbose output that lists
+	        # what "hidden" libraries, object files and flags are used when
+	        # linking a shared library.
+	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	      else
+	        # g++ 2.7 appears to require '-G' NOT '-shared' on this
+	        # platform.
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+                  $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	        # Commands to make compiler produce verbose output that lists
+	        # what "hidden" libraries, object files and flags are used when
+	        # linking a shared library.
+	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	      fi
+
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir'
+	      case $host_os in
+		solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+		*)
+		  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
+		  ;;
+	      esac
+	    fi
+	    ;;
+        esac
+        ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+      _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      runpath_var='LD_RUN_PATH'
+
+      case $cc_basename in
+        CC*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+      esac
+      ;;
+
+      sysv5* | sco3.2v5* | sco5v6*)
+	# Note: We CANNOT use -z defs as we might desire, because we do not
+	# link with -lc, and that would cause any symbols used from libc to
+	# always be unresolved, which means just about no library would
+	# ever link correctly.  If we're not using GNU ld we use -z text
+	# though, which does catch some bad symbols but isn't as heavy-handed
+	# as -z defs.
+	_LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
+	_LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs'
+	_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir'
+	_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+	_LT_TAGVAR(link_all_deplibs, $1)=yes
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport'
+	runpath_var='LD_RUN_PATH'
+
+	case $cc_basename in
+          CC*)
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
+              '"$_LT_TAGVAR(old_archive_cmds, $1)"
+	    _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
+              '"$_LT_TAGVAR(reload_cmds, $1)"
+	    ;;
+	  *)
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    ;;
+	esac
+      ;;
+
+      tandem*)
+        case $cc_basename in
+          NCC*)
+	    # NonStop-UX NCC 3.20
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+        esac
+        ;;
+
+      vxworks*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      *)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+    esac
+
+    AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
+    test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no
+
+    _LT_TAGVAR(GCC, $1)=$GXX
+    _LT_TAGVAR(LD, $1)=$LD
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_SYS_HIDDEN_LIBDEPS($1)
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
+  LDCXX=$LD
+  LD=$lt_save_LD
+  GCC=$lt_save_GCC
+  with_gnu_ld=$lt_save_with_gnu_ld
+  lt_cv_path_LDCXX=$lt_cv_path_LD
+  lt_cv_path_LD=$lt_save_path_LD
+  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
+  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
+fi # test yes != "$_lt_caught_CXX_error"
+
+AC_LANG_POP
+])# _LT_LANG_CXX_CONFIG
+
+
+# _LT_FUNC_STRIPNAME_CNF
+# ----------------------
+# func_stripname_cnf prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+#
+# This function is identical to the (non-XSI) version of func_stripname,
+# except this one can be used by m4 code that may be executed by configure,
+# rather than the libtool script.
+m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
+AC_REQUIRE([_LT_DECL_SED])
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
+func_stripname_cnf ()
+{
+  case @S|@2 in
+  .*) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%\\\\@S|@2\$%%"`;;
+  *)  func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%@S|@2\$%%"`;;
+  esac
+} # func_stripname_cnf
+])# _LT_FUNC_STRIPNAME_CNF
+
+
+# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
+# ---------------------------------
+# Figure out "hidden" library dependencies from verbose
+# compiler output when linking a shared library.
+# Parse the compiler output and extract the necessary
+# objects, libraries and library flags.
+m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
+# Dependencies to place before and after the object being linked:
+_LT_TAGVAR(predep_objects, $1)=
+_LT_TAGVAR(postdep_objects, $1)=
+_LT_TAGVAR(predeps, $1)=
+_LT_TAGVAR(postdeps, $1)=
+_LT_TAGVAR(compiler_lib_search_path, $1)=
+
+dnl we can't use the lt_simple_compile_test_code here,
+dnl because it contains code intended for an executable,
+dnl not a library.  It's possible we should let each
+dnl tag define a new lt_????_link_test_code variable,
+dnl but it's only used here...
+m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF
+int a;
+void foo (void) { a = 0; }
+_LT_EOF
+], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF
+class Foo
+{
+public:
+  Foo (void) { a = 0; }
+private:
+  int a;
+};
+_LT_EOF
+], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF
+      subroutine foo
+      implicit none
+      integer*4 a
+      a=0
+      return
+      end
+_LT_EOF
+], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF
+      subroutine foo
+      implicit none
+      integer a
+      a=0
+      return
+      end
+_LT_EOF
+], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF
+public class foo {
+  private int a;
+  public void bar (void) {
+    a = 0;
+  }
+};
+_LT_EOF
+], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
+package foo
+func foo() {
+}
+_LT_EOF
+])
+
+_lt_libdeps_save_CFLAGS=$CFLAGS
+case "$CC $CFLAGS " in #(
+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
+esac
+
+dnl Parse the compiler output and extract the necessary
+dnl objects, libraries and library flags.
+if AC_TRY_EVAL(ac_compile); then
+  # Parse the compiler output and extract the necessary
+  # objects, libraries and library flags.
+
+  # Sentinel used to keep track of whether or not we are before
+  # the conftest object file.
+  pre_test_object_deps_done=no
+
+  for p in `eval "$output_verbose_link_cmd"`; do
+    case $prev$p in
+
+    -L* | -R* | -l*)
+       # Some compilers place space between "-{L,R}" and the path.
+       # Remove the space.
+       if test x-L = "$p" ||
+          test x-R = "$p"; then
+	 prev=$p
+	 continue
+       fi
+
+       # Expand the sysroot to ease extracting the directories later.
+       if test -z "$prev"; then
+         case $p in
+         -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
+         -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
+         -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
+         esac
+       fi
+       case $p in
+       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
+       esac
+       if test no = "$pre_test_object_deps_done"; then
+	 case $prev in
+	 -L | -R)
+	   # Internal compiler library paths should come after those
+	   # provided the user.  The postdeps already come after the
+	   # user supplied libs so there is no need to process them.
+	   if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
+	     _LT_TAGVAR(compiler_lib_search_path, $1)=$prev$p
+	   else
+	     _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} $prev$p"
+	   fi
+	   ;;
+	 # The "-l" case would never come before the object being
+	 # linked, so don't bother handling this case.
+	 esac
+       else
+	 if test -z "$_LT_TAGVAR(postdeps, $1)"; then
+	   _LT_TAGVAR(postdeps, $1)=$prev$p
+	 else
+	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} $prev$p"
+	 fi
+       fi
+       prev=
+       ;;
+
+    *.lto.$objext) ;; # Ignore GCC LTO objects
+    *.$objext)
+       # This assumes that the test object file only shows up
+       # once in the compiler output.
+       if test "$p" = "conftest.$objext"; then
+	 pre_test_object_deps_done=yes
+	 continue
+       fi
+
+       if test no = "$pre_test_object_deps_done"; then
+	 if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
+	   _LT_TAGVAR(predep_objects, $1)=$p
+	 else
+	   _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
+	 fi
+       else
+	 if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
+	   _LT_TAGVAR(postdep_objects, $1)=$p
+	 else
+	   _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
+	 fi
+       fi
+       ;;
+
+    *) ;; # Ignore the rest.
+
+    esac
+  done
+
+  # Clean up.
+  rm -f a.out a.exe
+else
+  echo "libtool.m4: error: problem compiling $1 test program"
+fi
+
+$RM -f confest.$objext
+CFLAGS=$_lt_libdeps_save_CFLAGS
+
+# PORTME: override above test on systems where it is broken
+m4_if([$1], [CXX],
+[case $host_os in
+interix[[3-9]]*)
+  # Interix 3.5 installs completely hosed .la files for C++, so rather than
+  # hack all around it, let's just trust "g++" to DTRT.
+  _LT_TAGVAR(predep_objects,$1)=
+  _LT_TAGVAR(postdep_objects,$1)=
+  _LT_TAGVAR(postdeps,$1)=
+  ;;
+esac
+])
+
+case " $_LT_TAGVAR(postdeps, $1) " in
+*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+esac
+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=
+if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | $SED -e 's! -L! !g' -e 's!^ !!'`
+fi
+_LT_TAGDECL([], [compiler_lib_search_dirs], [1],
+    [The directories searched by this compiler when creating a shared library])
+_LT_TAGDECL([], [predep_objects], [1],
+    [Dependencies to place before and after the objects being linked to
+    create a shared library])
+_LT_TAGDECL([], [postdep_objects], [1])
+_LT_TAGDECL([], [predeps], [1])
+_LT_TAGDECL([], [postdeps], [1])
+_LT_TAGDECL([], [compiler_lib_search_path], [1],
+    [The library search path used internally by the compiler when linking
+    a shared library])
+])# _LT_SYS_HIDDEN_LIBDEPS
+
+
+# _LT_LANG_F77_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for a Fortran 77 compiler are
+# suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to 'libtool'.
+m4_defun([_LT_LANG_F77_CONFIG],
+[AC_LANG_PUSH(Fortran 77)
+if test -z "$F77" || test no = "$F77"; then
+  _lt_disable_F77=yes
+fi
+
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for f77 test sources.
+ac_ext=f
+
+# Object file extension for compiled f77 test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the F77 compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test yes != "$_lt_disable_F77"; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code="\
+      program t
+      end
+"
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC=$CC
+  lt_save_GCC=$GCC
+  lt_save_CFLAGS=$CFLAGS
+  CC=${F77-"f77"}
+  CFLAGS=$FFLAGS
+  compiler=$CC
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+  GCC=$G77
+  if test -n "$compiler"; then
+    AC_MSG_CHECKING([if libtool supports shared libraries])
+    AC_MSG_RESULT([$can_build_shared])
+
+    AC_MSG_CHECKING([whether to build shared libraries])
+    test no = "$can_build_shared" && enable_shared=no
+
+    # On AIX, shared libraries and static libraries use the same namespace, and
+    # are all built from PIC.
+    case $host_os in
+      aix3*)
+        test yes = "$enable_shared" && enable_static=no
+        if test -n "$RANLIB"; then
+          archive_cmds="$archive_cmds~\$RANLIB \$lib"
+          postinstall_cmds='$RANLIB $lib'
+        fi
+        ;;
+      aix[[4-9]]*)
+	if test ia64 != "$host_cpu"; then
+	  case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+	  yes,aix,yes) ;;		# shared object as lib.so file only
+	  yes,svr4,*) ;;		# shared object as lib.so archive member only
+	  yes,*) enable_static=no ;;	# shared object in lib.a archive as well
+	  esac
+	fi
+        ;;
+    esac
+    AC_MSG_RESULT([$enable_shared])
+
+    AC_MSG_CHECKING([whether to build static libraries])
+    # Make sure either enable_shared or enable_static is yes.
+    test yes = "$enable_shared" || enable_static=yes
+    AC_MSG_RESULT([$enable_static])
+
+    _LT_TAGVAR(GCC, $1)=$G77
+    _LT_TAGVAR(LD, $1)=$LD
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  GCC=$lt_save_GCC
+  CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
+fi # test yes != "$_lt_disable_F77"
+
+AC_LANG_POP
+])# _LT_LANG_F77_CONFIG
+
+
+# _LT_LANG_FC_CONFIG([TAG])
+# -------------------------
+# Ensure that the configuration variables for a Fortran compiler are
+# suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to 'libtool'.
+m4_defun([_LT_LANG_FC_CONFIG],
+[AC_LANG_PUSH(Fortran)
+
+if test -z "$FC" || test no = "$FC"; then
+  _lt_disable_FC=yes
+fi
+
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for fc test sources.
+ac_ext=${ac_fc_srcext-f}
+
+# Object file extension for compiled fc test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the FC compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test yes != "$_lt_disable_FC"; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code="\
+      program t
+      end
+"
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC=$CC
+  lt_save_GCC=$GCC
+  lt_save_CFLAGS=$CFLAGS
+  CC=${FC-"f95"}
+  CFLAGS=$FCFLAGS
+  compiler=$CC
+  GCC=$ac_cv_fc_compiler_gnu
+
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+
+  if test -n "$compiler"; then
+    AC_MSG_CHECKING([if libtool supports shared libraries])
+    AC_MSG_RESULT([$can_build_shared])
+
+    AC_MSG_CHECKING([whether to build shared libraries])
+    test no = "$can_build_shared" && enable_shared=no
+
+    # On AIX, shared libraries and static libraries use the same namespace, and
+    # are all built from PIC.
+    case $host_os in
+      aix3*)
+        test yes = "$enable_shared" && enable_static=no
+        if test -n "$RANLIB"; then
+          archive_cmds="$archive_cmds~\$RANLIB \$lib"
+          postinstall_cmds='$RANLIB $lib'
+        fi
+        ;;
+      aix[[4-9]]*)
+	if test ia64 != "$host_cpu"; then
+	  case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+	  yes,aix,yes) ;;		# shared object as lib.so file only
+	  yes,svr4,*) ;;		# shared object as lib.so archive member only
+	  yes,*) enable_static=no ;;	# shared object in lib.a archive as well
+	  esac
+	fi
+        ;;
+    esac
+    AC_MSG_RESULT([$enable_shared])
+
+    AC_MSG_CHECKING([whether to build static libraries])
+    # Make sure either enable_shared or enable_static is yes.
+    test yes = "$enable_shared" || enable_static=yes
+    AC_MSG_RESULT([$enable_static])
+
+    _LT_TAGVAR(GCC, $1)=$ac_cv_fc_compiler_gnu
+    _LT_TAGVAR(LD, $1)=$LD
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_SYS_HIDDEN_LIBDEPS($1)
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  GCC=$lt_save_GCC
+  CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
+fi # test yes != "$_lt_disable_FC"
+
+AC_LANG_POP
+])# _LT_LANG_FC_CONFIG
+
+
+# _LT_LANG_GCJ_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Java Compiler compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to 'libtool'.
+m4_defun([_LT_LANG_GCJ_CONFIG],
+[AC_REQUIRE([LT_PROG_GCJ])dnl
+AC_LANG_SAVE
+
+# Source file extension for Java test sources.
+ac_ext=java
+
+# Object file extension for compiled Java test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="class foo {}"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=yes
+CC=${GCJ-"gcj"}
+CFLAGS=$GCJFLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)=$LD
+_LT_CC_BASENAME([$compiler])
+
+# GCJ did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_GCJ_CONFIG
+
+
+# _LT_LANG_GO_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Go compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to 'libtool'.
+m4_defun([_LT_LANG_GO_CONFIG],
+[AC_REQUIRE([LT_PROG_GO])dnl
+AC_LANG_SAVE
+
+# Source file extension for Go test sources.
+ac_ext=go
+
+# Object file extension for compiled Go test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="package main; func main() { }"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='package main; func main() { }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=yes
+CC=${GOC-"gccgo"}
+CFLAGS=$GOFLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)=$LD
+_LT_CC_BASENAME([$compiler])
+
+# Go did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_GO_CONFIG
+
+
+# _LT_LANG_RC_CONFIG([TAG])
+# -------------------------
+# Ensure that the configuration variables for the Windows resource compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to 'libtool'.
+m4_defun([_LT_LANG_RC_CONFIG],
+[AC_REQUIRE([LT_PROG_RC])dnl
+AC_LANG_SAVE
+
+# Source file extension for RC test sources.
+ac_ext=rc
+
+# Object file extension for compiled RC test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
+
+# Code to be used in simple link tests
+lt_simple_link_test_code=$lt_simple_compile_test_code
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=
+CC=${RC-"windres"}
+CFLAGS=
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_CC_BASENAME([$compiler])
+_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+
+if test -n "$compiler"; then
+  :
+  _LT_CONFIG($1)
+fi
+
+GCC=$lt_save_GCC
+AC_LANG_RESTORE
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_RC_CONFIG
+
+
+# LT_PROG_GCJ
+# -----------
+AC_DEFUN([LT_PROG_GCJ],
+[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
+  [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
+    [AC_CHECK_TOOL(GCJ, gcj,)
+      test set = "${GCJFLAGS+set}" || GCJFLAGS="-g -O2"
+      AC_SUBST(GCJFLAGS)])])[]dnl
+])
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
+
+
+# LT_PROG_GO
+# ----------
+AC_DEFUN([LT_PROG_GO],
+[AC_CHECK_TOOL(GOC, gccgo,)
+])
+
+
+# LT_PROG_RC
+# ----------
+AC_DEFUN([LT_PROG_RC],
+[AC_CHECK_TOOL(RC, windres,)
+])
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_RC], [])
+
+
+# _LT_DECL_EGREP
+# --------------
+# If we don't have a new enough Autoconf to choose the best grep
+# available, choose the one first in the user's PATH.
+m4_defun([_LT_DECL_EGREP],
+[AC_REQUIRE([AC_PROG_EGREP])dnl
+AC_REQUIRE([AC_PROG_FGREP])dnl
+test -z "$GREP" && GREP=grep
+_LT_DECL([], [GREP], [1], [A grep program that handles long lines])
+_LT_DECL([], [EGREP], [1], [An ERE matcher])
+_LT_DECL([], [FGREP], [1], [A literal string matcher])
+dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
+AC_SUBST([GREP])
+])
+
+
+# _LT_DECL_OBJDUMP
+# --------------
+# If we don't have a new enough Autoconf to choose the best objdump
+# available, choose the one first in the user's PATH.
+m4_defun([_LT_DECL_OBJDUMP],
+[AC_CHECK_TOOL(OBJDUMP, objdump, false)
+test -z "$OBJDUMP" && OBJDUMP=objdump
+_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
+AC_SUBST([OBJDUMP])
+])
+
+# _LT_DECL_DLLTOOL
+# ----------------
+# Ensure DLLTOOL variable is set.
+m4_defun([_LT_DECL_DLLTOOL],
+[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
+AC_SUBST([DLLTOOL])
+])
+
+# _LT_DECL_SED
+# ------------
+# Check for a fully-functional sed program, that truncates
+# as few characters as possible.  Prefer GNU sed if found.
+m4_defun([_LT_DECL_SED],
+[AC_PROG_SED
+test -z "$SED" && SED=sed
+Xsed="$SED -e 1s/^X//"
+_LT_DECL([], [SED], [1], [A sed program that does not truncate output])
+_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
+    [Sed that helps us avoid accidentally triggering echo(1) options like -n])
+])# _LT_DECL_SED
+
+m4_ifndef([AC_PROG_SED], [
+############################################################
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+############################################################
+
+m4_defun([AC_PROG_SED],
+[AC_MSG_CHECKING([for a sed that does not truncate output])
+AC_CACHE_VAL(lt_cv_path_SED,
+[# Loop through the user's path and test for sed and gsed.
+# Then use that list of sed's as ones to test for truncation.
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for lt_ac_prog in sed gsed; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
+        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
+      fi
+    done
+  done
+done
+IFS=$as_save_IFS
+lt_ac_max=0
+lt_ac_count=0
+# Add /usr/xpg4/bin/sed as it is typically found on Solaris
+# along with /bin/sed that truncates output.
+for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
+  test ! -f "$lt_ac_sed" && continue
+  cat /dev/null > conftest.in
+  lt_ac_count=0
+  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+  # Check for GNU sed and select it if it is found.
+  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
+    lt_cv_path_SED=$lt_ac_sed
+    break
+  fi
+  while true; do
+    cat conftest.in conftest.in >conftest.tmp
+    mv conftest.tmp conftest.in
+    cp conftest.in conftest.nl
+    echo >>conftest.nl
+    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
+    cmp -s conftest.out conftest.nl || break
+    # 10000 chars as input seems more than enough
+    test 10 -lt "$lt_ac_count" && break
+    lt_ac_count=`expr $lt_ac_count + 1`
+    if test "$lt_ac_count" -gt "$lt_ac_max"; then
+      lt_ac_max=$lt_ac_count
+      lt_cv_path_SED=$lt_ac_sed
+    fi
+  done
+done
+])
+SED=$lt_cv_path_SED
+AC_SUBST([SED])
+AC_MSG_RESULT([$SED])
+])#AC_PROG_SED
+])#m4_ifndef
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_SED], [])
+
+
+# _LT_CHECK_SHELL_FEATURES
+# ------------------------
+# Find out whether the shell is Bourne or XSI compatible,
+# or has some other useful features.
+m4_defun([_LT_CHECK_SHELL_FEATURES],
+[if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  lt_unset=unset
+else
+  lt_unset=false
+fi
+_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl
+
+# test EBCDIC or ASCII
+case `echo X|tr X '\101'` in
+ A) # ASCII based system
+    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
+  lt_SP2NL='tr \040 \012'
+  lt_NL2SP='tr \015\012 \040\040'
+  ;;
+ *) # EBCDIC based system
+  lt_SP2NL='tr \100 \n'
+  lt_NL2SP='tr \r\n \100\100'
+  ;;
+esac
+_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl
+_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
+])# _LT_CHECK_SHELL_FEATURES
+
+
+# _LT_PATH_CONVERSION_FUNCTIONS
+# -----------------------------
+# Determine what file name conversion functions should be used by
+# func_to_host_file (and, implicitly, by func_to_host_path).  These are needed
+# for certain cross-compile configurations and native mingw.
+m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_MSG_CHECKING([how to convert $build file names to $host format])
+AC_CACHE_VAL(lt_cv_to_host_file_cmd,
+[case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
+        ;;
+    esac
+    ;;
+  *-*-cygwin* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_noop
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
+        ;;
+    esac
+    ;;
+  * ) # unhandled hosts (and "normal" native builds)
+    lt_cv_to_host_file_cmd=func_convert_file_noop
+    ;;
+esac
+])
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
+_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
+         [0], [convert $build file names to $host format])dnl
+
+AC_MSG_CHECKING([how to convert $build file names to toolchain format])
+AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
+[#assume ordinary cross tools, or native build.
+lt_cv_to_tool_file_cmd=func_convert_file_noop
+case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
+        ;;
+    esac
+    ;;
+esac
+])
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
+_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
+         [0], [convert $build files to toolchain format])dnl
+])# _LT_PATH_CONVERSION_FUNCTIONS
diff --git a/conf/ltmain.sh b/conf/ltmain.sh
new file mode 100644
index 0000000..0f0a2da
--- /dev/null
+++ b/conf/ltmain.sh
@@ -0,0 +1,11147 @@
+#! /bin/sh
+## DO NOT EDIT - This file generated from ./build-aux/ltmain.in
+##               by inline-source v2014-01-03.01
+
+# libtool (GNU libtool) 2.4.6
+# Provide generalized library-building support services.
+# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+
+# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions.  There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# GNU Libtool is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# As a special exception to the GNU General Public License,
+# if you distribute this file as part of a program or library that
+# is built using GNU Libtool, you may include this file under the
+# same distribution terms that you use for the rest of that program.
+#
+# GNU Libtool is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+PROGRAM=libtool
+PACKAGE=libtool
+VERSION=2.4.6
+package_revision=2.4.6
+
+
+## ------ ##
+## Usage. ##
+## ------ ##
+
+# Run './libtool --help' for help with using this script from the
+# command line.
+
+
+## ------------------------------- ##
+## User overridable command paths. ##
+## ------------------------------- ##
+
+# After configure completes, it has a better idea of some of the
+# shell tools we need than the defaults used by the functions shared
+# with bootstrap, so set those here where they can still be over-
+# ridden by the user, but otherwise take precedence.
+
+: ${AUTOCONF="autoconf"}
+: ${AUTOMAKE="automake"}
+
+
+## -------------------------- ##
+## Source external libraries. ##
+## -------------------------- ##
+
+# Much of our low-level functionality needs to be sourced from external
+# libraries, which are installed to $pkgauxdir.
+
+# Set a version string for this script.
+scriptversion=2015-01-20.17; # UTC
+
+# General shell script boiler plate, and helper functions.
+# Written by Gary V. Vaughan, 2004
+
+# Copyright (C) 2004-2015 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions.  There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+
+# As a special exception to the GNU General Public License, if you distribute
+# this file as part of a program or library that is built using GNU Libtool,
+# you may include this file under the same distribution terms that you use
+# for the rest of that program.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNES FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Please report bugs or propose patches to gary@gnu.org.
+
+
+## ------ ##
+## Usage. ##
+## ------ ##
+
+# Evaluate this file near the top of your script to gain access to
+# the functions and variables defined here:
+#
+#   . `echo "$0" | ${SED-sed} 's|[^/]*$||'`/build-aux/funclib.sh
+#
+# If you need to override any of the default environment variable
+# settings, do that before evaluating this file.
+
+
+## -------------------- ##
+## Shell normalisation. ##
+## -------------------- ##
+
+# Some shells need a little help to be as Bourne compatible as possible.
+# Before doing anything else, make sure all that help has been provided!
+
+DUALCASE=1; export DUALCASE # for MKS sh
+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
+
+# NLS nuisances: We save the old values in case they are required later.
+_G_user_locale=
+_G_safe_locale=
+for _G_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+do
+  eval "if test set = \"\${$_G_var+set}\"; then
+          save_$_G_var=\$$_G_var
+          $_G_var=C
+	  export $_G_var
+	  _G_user_locale=\"$_G_var=\\\$save_\$_G_var; \$_G_user_locale\"
+	  _G_safe_locale=\"$_G_var=C; \$_G_safe_locale\"
+	fi"
+done
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+# Make sure IFS has a sensible default
+sp=' '
+nl='
+'
+IFS="$sp	$nl"
+
+# There are apparently some retarded systems that use ';' as a PATH separator!
+if test "${PATH_SEPARATOR+set}" != set; then
+  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
+
+
+
+## ------------------------- ##
+## Locate command utilities. ##
+## ------------------------- ##
+
+
+# func_executable_p FILE
+# ----------------------
+# Check that FILE is an executable regular file.
+func_executable_p ()
+{
+    test -f "$1" && test -x "$1"
+}
+
+
+# func_path_progs PROGS_LIST CHECK_FUNC [PATH]
+# --------------------------------------------
+# Search for either a program that responds to --version with output
+# containing "GNU", or else returned by CHECK_FUNC otherwise, by
+# trying all the directories in PATH with each of the elements of
+# PROGS_LIST.
+#
+# CHECK_FUNC should accept the path to a candidate program, and
+# set $func_check_prog_result if it truncates its output less than
+# $_G_path_prog_max characters.
+func_path_progs ()
+{
+    _G_progs_list=$1
+    _G_check_func=$2
+    _G_PATH=${3-"$PATH"}
+
+    _G_path_prog_max=0
+    _G_path_prog_found=false
+    _G_save_IFS=$IFS; IFS=${PATH_SEPARATOR-:}
+    for _G_dir in $_G_PATH; do
+      IFS=$_G_save_IFS
+      test -z "$_G_dir" && _G_dir=.
+      for _G_prog_name in $_G_progs_list; do
+        for _exeext in '' .EXE; do
+          _G_path_prog=$_G_dir/$_G_prog_name$_exeext
+          func_executable_p "$_G_path_prog" || continue
+          case `"$_G_path_prog" --version 2>&1` in
+            *GNU*) func_path_progs_result=$_G_path_prog _G_path_prog_found=: ;;
+            *)     $_G_check_func $_G_path_prog
+		   func_path_progs_result=$func_check_prog_result
+		   ;;
+          esac
+          $_G_path_prog_found && break 3
+        done
+      done
+    done
+    IFS=$_G_save_IFS
+    test -z "$func_path_progs_result" && {
+      echo "no acceptable sed could be found in \$PATH" >&2
+      exit 1
+    }
+}
+
+
+# We want to be able to use the functions in this file before configure
+# has figured out where the best binaries are kept, which means we have
+# to search for them ourselves - except when the results are already set
+# where we skip the searches.
+
+# Unless the user overrides by setting SED, search the path for either GNU
+# sed, or the sed that truncates its output the least.
+test -z "$SED" && {
+  _G_sed_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+  for _G_i in 1 2 3 4 5 6 7; do
+    _G_sed_script=$_G_sed_script$nl$_G_sed_script
+  done
+  echo "$_G_sed_script" 2>/dev/null | sed 99q >conftest.sed
+  _G_sed_script=
+
+  func_check_prog_sed ()
+  {
+    _G_path_prog=$1
+
+    _G_count=0
+    printf 0123456789 >conftest.in
+    while :
+    do
+      cat conftest.in conftest.in >conftest.tmp
+      mv conftest.tmp conftest.in
+      cp conftest.in conftest.nl
+      echo '' >> conftest.nl
+      "$_G_path_prog" -f conftest.sed <conftest.nl >conftest.out 2>/dev/null || break
+      diff conftest.out conftest.nl >/dev/null 2>&1 || break
+      _G_count=`expr $_G_count + 1`
+      if test "$_G_count" -gt "$_G_path_prog_max"; then
+        # Best one so far, save it but keep looking for a better one
+        func_check_prog_result=$_G_path_prog
+        _G_path_prog_max=$_G_count
+      fi
+      # 10*(2^10) chars as input seems more than enough
+      test 10 -lt "$_G_count" && break
+    done
+    rm -f conftest.in conftest.tmp conftest.nl conftest.out
+  }
+
+  func_path_progs "sed gsed" func_check_prog_sed $PATH:/usr/xpg4/bin
+  rm -f conftest.sed
+  SED=$func_path_progs_result
+}
+
+
+# Unless the user overrides by setting GREP, search the path for either GNU
+# grep, or the grep that truncates its output the least.
+test -z "$GREP" && {
+  func_check_prog_grep ()
+  {
+    _G_path_prog=$1
+
+    _G_count=0
+    _G_path_prog_max=0
+    printf 0123456789 >conftest.in
+    while :
+    do
+      cat conftest.in conftest.in >conftest.tmp
+      mv conftest.tmp conftest.in
+      cp conftest.in conftest.nl
+      echo 'GREP' >> conftest.nl
+      "$_G_path_prog" -e 'GREP$' -e '-(cannot match)-' <conftest.nl >conftest.out 2>/dev/null || break
+      diff conftest.out conftest.nl >/dev/null 2>&1 || break
+      _G_count=`expr $_G_count + 1`
+      if test "$_G_count" -gt "$_G_path_prog_max"; then
+        # Best one so far, save it but keep looking for a better one
+        func_check_prog_result=$_G_path_prog
+        _G_path_prog_max=$_G_count
+      fi
+      # 10*(2^10) chars as input seems more than enough
+      test 10 -lt "$_G_count" && break
+    done
+    rm -f conftest.in conftest.tmp conftest.nl conftest.out
+  }
+
+  func_path_progs "grep ggrep" func_check_prog_grep $PATH:/usr/xpg4/bin
+  GREP=$func_path_progs_result
+}
+
+
+## ------------------------------- ##
+## User overridable command paths. ##
+## ------------------------------- ##
+
+# All uppercase variable names are used for environment variables.  These
+# variables can be overridden by the user before calling a script that
+# uses them if a suitable command of that name is not already available
+# in the command search PATH.
+
+: ${CP="cp -f"}
+: ${ECHO="printf %s\n"}
+: ${EGREP="$GREP -E"}
+: ${FGREP="$GREP -F"}
+: ${LN_S="ln -s"}
+: ${MAKE="make"}
+: ${MKDIR="mkdir"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
+
+
+## -------------------- ##
+## Useful sed snippets. ##
+## -------------------- ##
+
+sed_dirname='s|/[^/]*$||'
+sed_basename='s|^.*/||'
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+sed_quote_subst='s|\([`"$\\]\)|\\\1|g'
+
+# Same as above, but do not quote variable references.
+sed_double_quote_subst='s/\(["`\\]\)/\\\1/g'
+
+# Sed substitution that turns a string into a regex matching for the
+# string literally.
+sed_make_literal_regex='s|[].[^$\\*\/]|\\&|g'
+
+# Sed substitution that converts a w32 file name or path
+# that contains forward slashes, into one that contains
+# (escaped) backslashes.  A very naive implementation.
+sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
+
+# Re-'\' parameter expansions in output of sed_double_quote_subst that
+# were '\'-ed in input to the same.  If an odd number of '\' preceded a
+# '$' in input to sed_double_quote_subst, that '$' was protected from
+# expansion.  Since each input '\' is now two '\'s, look for any number
+# of runs of four '\'s followed by two '\'s and then a '$'.  '\' that '$'.
+_G_bs='\\'
+_G_bs2='\\\\'
+_G_bs4='\\\\\\\\'
+_G_dollar='\$'
+sed_double_backslash="\
+  s/$_G_bs4/&\\
+/g
+  s/^$_G_bs2$_G_dollar/$_G_bs&/
+  s/\\([^$_G_bs]\\)$_G_bs2$_G_dollar/\\1$_G_bs2$_G_bs$_G_dollar/g
+  s/\n//g"
+
+
+## ----------------- ##
+## Global variables. ##
+## ----------------- ##
+
+# Except for the global variables explicitly listed below, the following
+# functions in the '^func_' namespace, and the '^require_' namespace
+# variables initialised in the 'Resource management' section, sourcing
+# this file will not pollute your global namespace with anything
+# else. There's no portable way to scope variables in Bourne shell
+# though, so actually running these functions will sometimes place
+# results into a variable named after the function, and often use
+# temporary variables in the '^_G_' namespace. If you are careful to
+# avoid using those namespaces casually in your sourcing script, things
+# should continue to work as you expect. And, of course, you can freely
+# overwrite any of the functions or variables defined here before
+# calling anything to customize them.
+
+EXIT_SUCCESS=0
+EXIT_FAILURE=1
+EXIT_MISMATCH=63  # $? = 63 is used to indicate version mismatch to missing.
+EXIT_SKIP=77	  # $? = 77 is used to indicate a skipped test to automake.
+
+# Allow overriding, eg assuming that you follow the convention of
+# putting '$debug_cmd' at the start of all your functions, you can get
+# bash to show function call trace with:
+#
+#    debug_cmd='eval echo "${FUNCNAME[0]} $*" >&2' bash your-script-name
+debug_cmd=${debug_cmd-":"}
+exit_cmd=:
+
+# By convention, finish your script with:
+#
+#    exit $exit_status
+#
+# so that you can set exit_status to non-zero if you want to indicate
+# something went wrong during execution without actually bailing out at
+# the point of failure.
+exit_status=$EXIT_SUCCESS
+
+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
+# is ksh but when the shell is invoked as "sh" and the current value of
+# the _XPG environment variable is not equal to 1 (one), the special
+# positional parameter $0, within a function call, is the name of the
+# function.
+progpath=$0
+
+# The name of this program.
+progname=`$ECHO "$progpath" |$SED "$sed_basename"`
+
+# Make sure we have an absolute progpath for reexecution:
+case $progpath in
+  [\\/]*|[A-Za-z]:\\*) ;;
+  *[\\/]*)
+     progdir=`$ECHO "$progpath" |$SED "$sed_dirname"`
+     progdir=`cd "$progdir" && pwd`
+     progpath=$progdir/$progname
+     ;;
+  *)
+     _G_IFS=$IFS
+     IFS=${PATH_SEPARATOR-:}
+     for progdir in $PATH; do
+       IFS=$_G_IFS
+       test -x "$progdir/$progname" && break
+     done
+     IFS=$_G_IFS
+     test -n "$progdir" || progdir=`pwd`
+     progpath=$progdir/$progname
+     ;;
+esac
+
+
+## ----------------- ##
+## Standard options. ##
+## ----------------- ##
+
+# The following options affect the operation of the functions defined
+# below, and should be set appropriately depending on run-time para-
+# meters passed on the command line.
+
+opt_dry_run=false
+opt_quiet=false
+opt_verbose=false
+
+# Categories 'all' and 'none' are always available.  Append any others
+# you will pass as the first argument to func_warning from your own
+# code.
+warning_categories=
+
+# By default, display warnings according to 'opt_warning_types'.  Set
+# 'warning_func'  to ':' to elide all warnings, or func_fatal_error to
+# treat the next displayed warning as a fatal error.
+warning_func=func_warn_and_continue
+
+# Set to 'all' to display all warnings, 'none' to suppress all
+# warnings, or a space delimited list of some subset of
+# 'warning_categories' to display only the listed warnings.
+opt_warning_types=all
+
+
+## -------------------- ##
+## Resource management. ##
+## -------------------- ##
+
+# This section contains definitions for functions that each ensure a
+# particular resource (a file, or a non-empty configuration variable for
+# example) is available, and if appropriate to extract default values
+# from pertinent package files. Call them using their associated
+# 'require_*' variable to ensure that they are executed, at most, once.
+#
+# It's entirely deliberate that calling these functions can set
+# variables that don't obey the namespace limitations obeyed by the rest
+# of this file, in order that that they be as useful as possible to
+# callers.
+
+
+# require_term_colors
+# -------------------
+# Allow display of bold text on terminals that support it.
+require_term_colors=func_require_term_colors
+func_require_term_colors ()
+{
+    $debug_cmd
+
+    test -t 1 && {
+      # COLORTERM and USE_ANSI_COLORS environment variables take
+      # precedence, because most terminfo databases neglect to describe
+      # whether color sequences are supported.
+      test -n "${COLORTERM+set}" && : ${USE_ANSI_COLORS="1"}
+
+      if test 1 = "$USE_ANSI_COLORS"; then
+        # Standard ANSI escape sequences
+        tc_reset=''
+        tc_bold='';   tc_standout=''
+        tc_red='';   tc_green=''
+        tc_blue='';  tc_cyan=''
+      else
+        # Otherwise trust the terminfo database after all.
+        test -n "`tput sgr0 2>/dev/null`" && {
+          tc_reset=`tput sgr0`
+          test -n "`tput bold 2>/dev/null`" && tc_bold=`tput bold`
+          tc_standout=$tc_bold
+          test -n "`tput smso 2>/dev/null`" && tc_standout=`tput smso`
+          test -n "`tput setaf 1 2>/dev/null`" && tc_red=`tput setaf 1`
+          test -n "`tput setaf 2 2>/dev/null`" && tc_green=`tput setaf 2`
+          test -n "`tput setaf 4 2>/dev/null`" && tc_blue=`tput setaf 4`
+          test -n "`tput setaf 5 2>/dev/null`" && tc_cyan=`tput setaf 5`
+        }
+      fi
+    }
+
+    require_term_colors=:
+}
+
+
+## ----------------- ##
+## Function library. ##
+## ----------------- ##
+
+# This section contains a variety of useful functions to call in your
+# scripts. Take note of the portable wrappers for features provided by
+# some modern shells, which will fall back to slower equivalents on
+# less featureful shells.
+
+
+# func_append VAR VALUE
+# ---------------------
+# Append VALUE onto the existing contents of VAR.
+
+  # We should try to minimise forks, especially on Windows where they are
+  # unreasonably slow, so skip the feature probes when bash or zsh are
+  # being used:
+  if test set = "${BASH_VERSION+set}${ZSH_VERSION+set}"; then
+    : ${_G_HAVE_ARITH_OP="yes"}
+    : ${_G_HAVE_XSI_OPS="yes"}
+    # The += operator was introduced in bash 3.1
+    case $BASH_VERSION in
+      [12].* | 3.0 | 3.0*) ;;
+      *)
+        : ${_G_HAVE_PLUSEQ_OP="yes"}
+        ;;
+    esac
+  fi
+
+  # _G_HAVE_PLUSEQ_OP
+  # Can be empty, in which case the shell is probed, "yes" if += is
+  # useable or anything else if it does not work.
+  test -z "$_G_HAVE_PLUSEQ_OP" \
+    && (eval 'x=a; x+=" b"; test "a b" = "$x"') 2>/dev/null \
+    && _G_HAVE_PLUSEQ_OP=yes
+
+if test yes = "$_G_HAVE_PLUSEQ_OP"
+then
+  # This is an XSI compatible shell, allowing a faster implementation...
+  eval 'func_append ()
+  {
+    $debug_cmd
+
+    eval "$1+=\$2"
+  }'
+else
+  # ...otherwise fall back to using expr, which is often a shell builtin.
+  func_append ()
+  {
+    $debug_cmd
+
+    eval "$1=\$$1\$2"
+  }
+fi
+
+
+# func_append_quoted VAR VALUE
+# ----------------------------
+# Quote VALUE and append to the end of shell variable VAR, separated
+# by a space.
+if test yes = "$_G_HAVE_PLUSEQ_OP"; then
+  eval 'func_append_quoted ()
+  {
+    $debug_cmd
+
+    func_quote_for_eval "$2"
+    eval "$1+=\\ \$func_quote_for_eval_result"
+  }'
+else
+  func_append_quoted ()
+  {
+    $debug_cmd
+
+    func_quote_for_eval "$2"
+    eval "$1=\$$1\\ \$func_quote_for_eval_result"
+  }
+fi
+
+
+# func_append_uniq VAR VALUE
+# --------------------------
+# Append unique VALUE onto the existing contents of VAR, assuming
+# entries are delimited by the first character of VALUE.  For example:
+#
+#   func_append_uniq options " --another-option option-argument"
+#
+# will only append to $options if " --another-option option-argument "
+# is not already present somewhere in $options already (note spaces at
+# each end implied by leading space in second argument).
+func_append_uniq ()
+{
+    $debug_cmd
+
+    eval _G_current_value='`$ECHO $'$1'`'
+    _G_delim=`expr "$2" : '\(.\)'`
+
+    case $_G_delim$_G_current_value$_G_delim in
+      *"$2$_G_delim"*) ;;
+      *) func_append "$@" ;;
+    esac
+}
+
+
+# func_arith TERM...
+# ------------------
+# Set func_arith_result to the result of evaluating TERMs.
+  test -z "$_G_HAVE_ARITH_OP" \
+    && (eval 'test 2 = $(( 1 + 1 ))') 2>/dev/null \
+    && _G_HAVE_ARITH_OP=yes
+
+if test yes = "$_G_HAVE_ARITH_OP"; then
+  eval 'func_arith ()
+  {
+    $debug_cmd
+
+    func_arith_result=$(( $* ))
+  }'
+else
+  func_arith ()
+  {
+    $debug_cmd
+
+    func_arith_result=`expr "$@"`
+  }
+fi
+
+
+# func_basename FILE
+# ------------------
+# Set func_basename_result to FILE with everything up to and including
+# the last / stripped.
+if test yes = "$_G_HAVE_XSI_OPS"; then
+  # If this shell supports suffix pattern removal, then use it to avoid
+  # forking. Hide the definitions single quotes in case the shell chokes
+  # on unsupported syntax...
+  _b='func_basename_result=${1##*/}'
+  _d='case $1 in
+        */*) func_dirname_result=${1%/*}$2 ;;
+        *  ) func_dirname_result=$3        ;;
+      esac'
+
+else
+  # ...otherwise fall back to using sed.
+  _b='func_basename_result=`$ECHO "$1" |$SED "$sed_basename"`'
+  _d='func_dirname_result=`$ECHO "$1"  |$SED "$sed_dirname"`
+      if test "X$func_dirname_result" = "X$1"; then
+        func_dirname_result=$3
+      else
+        func_append func_dirname_result "$2"
+      fi'
+fi
+
+eval 'func_basename ()
+{
+    $debug_cmd
+
+    '"$_b"'
+}'
+
+
+# func_dirname FILE APPEND NONDIR_REPLACEMENT
+# -------------------------------------------
+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+eval 'func_dirname ()
+{
+    $debug_cmd
+
+    '"$_d"'
+}'
+
+
+# func_dirname_and_basename FILE APPEND NONDIR_REPLACEMENT
+# --------------------------------------------------------
+# Perform func_basename and func_dirname in a single function
+# call:
+#   dirname:  Compute the dirname of FILE.  If nonempty,
+#             add APPEND to the result, otherwise set result
+#             to NONDIR_REPLACEMENT.
+#             value returned in "$func_dirname_result"
+#   basename: Compute filename of FILE.
+#             value retuned in "$func_basename_result"
+# For efficiency, we do not delegate to the functions above but instead
+# duplicate the functionality here.
+eval 'func_dirname_and_basename ()
+{
+    $debug_cmd
+
+    '"$_b"'
+    '"$_d"'
+}'
+
+
+# func_echo ARG...
+# ----------------
+# Echo program name prefixed message.
+func_echo ()
+{
+    $debug_cmd
+
+    _G_message=$*
+
+    func_echo_IFS=$IFS
+    IFS=$nl
+    for _G_line in $_G_message; do
+      IFS=$func_echo_IFS
+      $ECHO "$progname: $_G_line"
+    done
+    IFS=$func_echo_IFS
+}
+
+
+# func_echo_all ARG...
+# --------------------
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO "$*"
+}
+
+
+# func_echo_infix_1 INFIX ARG...
+# ------------------------------
+# Echo program name, followed by INFIX on the first line, with any
+# additional lines not showing INFIX.
+func_echo_infix_1 ()
+{
+    $debug_cmd
+
+    $require_term_colors
+
+    _G_infix=$1; shift
+    _G_indent=$_G_infix
+    _G_prefix="$progname: $_G_infix: "
+    _G_message=$*
+
+    # Strip color escape sequences before counting printable length
+    for _G_tc in "$tc_reset" "$tc_bold" "$tc_standout" "$tc_red" "$tc_green" "$tc_blue" "$tc_cyan"
+    do
+      test -n "$_G_tc" && {
+        _G_esc_tc=`$ECHO "$_G_tc" | $SED "$sed_make_literal_regex"`
+        _G_indent=`$ECHO "$_G_indent" | $SED "s|$_G_esc_tc||g"`
+      }
+    done
+    _G_indent="$progname: "`echo "$_G_indent" | $SED 's|.| |g'`"  " ## exclude from sc_prohibit_nested_quotes
+
+    func_echo_infix_1_IFS=$IFS
+    IFS=$nl
+    for _G_line in $_G_message; do
+      IFS=$func_echo_infix_1_IFS
+      $ECHO "$_G_prefix$tc_bold$_G_line$tc_reset" >&2
+      _G_prefix=$_G_indent
+    done
+    IFS=$func_echo_infix_1_IFS
+}
+
+
+# func_error ARG...
+# -----------------
+# Echo program name prefixed message to standard error.
+func_error ()
+{
+    $debug_cmd
+
+    $require_term_colors
+
+    func_echo_infix_1 "  $tc_standout${tc_red}error$tc_reset" "$*" >&2
+}
+
+
+# func_fatal_error ARG...
+# -----------------------
+# Echo program name prefixed message to standard error, and exit.
+func_fatal_error ()
+{
+    $debug_cmd
+
+    func_error "$*"
+    exit $EXIT_FAILURE
+}
+
+
+# func_grep EXPRESSION FILENAME
+# -----------------------------
+# Check whether EXPRESSION matches any line of FILENAME, without output.
+func_grep ()
+{
+    $debug_cmd
+
+    $GREP "$1" "$2" >/dev/null 2>&1
+}
+
+
+# func_len STRING
+# ---------------
+# Set func_len_result to the length of STRING. STRING may not
+# start with a hyphen.
+  test -z "$_G_HAVE_XSI_OPS" \
+    && (eval 'x=a/b/c;
+      test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \
+    && _G_HAVE_XSI_OPS=yes
+
+if test yes = "$_G_HAVE_XSI_OPS"; then
+  eval 'func_len ()
+  {
+    $debug_cmd
+
+    func_len_result=${#1}
+  }'
+else
+  func_len ()
+  {
+    $debug_cmd
+
+    func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
+  }
+fi
+
+
+# func_mkdir_p DIRECTORY-PATH
+# ---------------------------
+# Make sure the entire path to DIRECTORY-PATH is available.
+func_mkdir_p ()
+{
+    $debug_cmd
+
+    _G_directory_path=$1
+    _G_dir_list=
+
+    if test -n "$_G_directory_path" && test : != "$opt_dry_run"; then
+
+      # Protect directory names starting with '-'
+      case $_G_directory_path in
+        -*) _G_directory_path=./$_G_directory_path ;;
+      esac
+
+      # While some portion of DIR does not yet exist...
+      while test ! -d "$_G_directory_path"; do
+        # ...make a list in topmost first order.  Use a colon delimited
+	# list incase some portion of path contains whitespace.
+        _G_dir_list=$_G_directory_path:$_G_dir_list
+
+        # If the last portion added has no slash in it, the list is done
+        case $_G_directory_path in */*) ;; *) break ;; esac
+
+        # ...otherwise throw away the child directory and loop
+        _G_directory_path=`$ECHO "$_G_directory_path" | $SED -e "$sed_dirname"`
+      done
+      _G_dir_list=`$ECHO "$_G_dir_list" | $SED 's|:*$||'`
+
+      func_mkdir_p_IFS=$IFS; IFS=:
+      for _G_dir in $_G_dir_list; do
+	IFS=$func_mkdir_p_IFS
+        # mkdir can fail with a 'File exist' error if two processes
+        # try to create one of the directories concurrently.  Don't
+        # stop in that case!
+        $MKDIR "$_G_dir" 2>/dev/null || :
+      done
+      IFS=$func_mkdir_p_IFS
+
+      # Bail out if we (or some other process) failed to create a directory.
+      test -d "$_G_directory_path" || \
+        func_fatal_error "Failed to create '$1'"
+    fi
+}
+
+
+# func_mktempdir [BASENAME]
+# -------------------------
+# Make a temporary directory that won't clash with other running
+# libtool processes, and avoids race conditions if possible.  If
+# given, BASENAME is the basename for that directory.
+func_mktempdir ()
+{
+    $debug_cmd
+
+    _G_template=${TMPDIR-/tmp}/${1-$progname}
+
+    if test : = "$opt_dry_run"; then
+      # Return a directory name, but don't create it in dry-run mode
+      _G_tmpdir=$_G_template-$$
+    else
+
+      # If mktemp works, use that first and foremost
+      _G_tmpdir=`mktemp -d "$_G_template-XXXXXXXX" 2>/dev/null`
+
+      if test ! -d "$_G_tmpdir"; then
+        # Failing that, at least try and use $RANDOM to avoid a race
+        _G_tmpdir=$_G_template-${RANDOM-0}$$
+
+        func_mktempdir_umask=`umask`
+        umask 0077
+        $MKDIR "$_G_tmpdir"
+        umask $func_mktempdir_umask
+      fi
+
+      # If we're not in dry-run mode, bomb out on failure
+      test -d "$_G_tmpdir" || \
+        func_fatal_error "cannot create temporary directory '$_G_tmpdir'"
+    fi
+
+    $ECHO "$_G_tmpdir"
+}
+
+
+# func_normal_abspath PATH
+# ------------------------
+# Remove doubled-up and trailing slashes, "." path components,
+# and cancel out any ".." path components in PATH after making
+# it an absolute path.
+func_normal_abspath ()
+{
+    $debug_cmd
+
+    # These SED scripts presuppose an absolute path with a trailing slash.
+    _G_pathcar='s|^/\([^/]*\).*$|\1|'
+    _G_pathcdr='s|^/[^/]*||'
+    _G_removedotparts=':dotsl
+		s|/\./|/|g
+		t dotsl
+		s|/\.$|/|'
+    _G_collapseslashes='s|/\{1,\}|/|g'
+    _G_finalslash='s|/*$|/|'
+
+    # Start from root dir and reassemble the path.
+    func_normal_abspath_result=
+    func_normal_abspath_tpath=$1
+    func_normal_abspath_altnamespace=
+    case $func_normal_abspath_tpath in
+      "")
+        # Empty path, that just means $cwd.
+        func_stripname '' '/' "`pwd`"
+        func_normal_abspath_result=$func_stripname_result
+        return
+        ;;
+      # The next three entries are used to spot a run of precisely
+      # two leading slashes without using negated character classes;
+      # we take advantage of case's first-match behaviour.
+      ///*)
+        # Unusual form of absolute path, do nothing.
+        ;;
+      //*)
+        # Not necessarily an ordinary path; POSIX reserves leading '//'
+        # and for example Cygwin uses it to access remote file shares
+        # over CIFS/SMB, so we conserve a leading double slash if found.
+        func_normal_abspath_altnamespace=/
+        ;;
+      /*)
+        # Absolute path, do nothing.
+        ;;
+      *)
+        # Relative path, prepend $cwd.
+        func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
+        ;;
+    esac
+
+    # Cancel out all the simple stuff to save iterations.  We also want
+    # the path to end with a slash for ease of parsing, so make sure
+    # there is one (and only one) here.
+    func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+          -e "$_G_removedotparts" -e "$_G_collapseslashes" -e "$_G_finalslash"`
+    while :; do
+      # Processed it all yet?
+      if test / = "$func_normal_abspath_tpath"; then
+        # If we ascended to the root using ".." the result may be empty now.
+        if test -z "$func_normal_abspath_result"; then
+          func_normal_abspath_result=/
+        fi
+        break
+      fi
+      func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
+          -e "$_G_pathcar"`
+      func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+          -e "$_G_pathcdr"`
+      # Figure out what to do with it
+      case $func_normal_abspath_tcomponent in
+        "")
+          # Trailing empty path component, ignore it.
+          ;;
+        ..)
+          # Parent dir; strip last assembled component from result.
+          func_dirname "$func_normal_abspath_result"
+          func_normal_abspath_result=$func_dirname_result
+          ;;
+        *)
+          # Actual path component, append it.
+          func_append func_normal_abspath_result "/$func_normal_abspath_tcomponent"
+          ;;
+      esac
+    done
+    # Restore leading double-slash if one was found on entry.
+    func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
+}
+
+
+# func_notquiet ARG...
+# --------------------
+# Echo program name prefixed message only when not in quiet mode.
+func_notquiet ()
+{
+    $debug_cmd
+
+    $opt_quiet || func_echo ${1+"$@"}
+
+    # A bug in bash halts the script if the last line of a function
+    # fails when set -e is in force, so we need another command to
+    # work around that:
+    :
+}
+
+
+# func_relative_path SRCDIR DSTDIR
+# --------------------------------
+# Set func_relative_path_result to the relative path from SRCDIR to DSTDIR.
+func_relative_path ()
+{
+    $debug_cmd
+
+    func_relative_path_result=
+    func_normal_abspath "$1"
+    func_relative_path_tlibdir=$func_normal_abspath_result
+    func_normal_abspath "$2"
+    func_relative_path_tbindir=$func_normal_abspath_result
+
+    # Ascend the tree starting from libdir
+    while :; do
+      # check if we have found a prefix of bindir
+      case $func_relative_path_tbindir in
+        $func_relative_path_tlibdir)
+          # found an exact match
+          func_relative_path_tcancelled=
+          break
+          ;;
+        $func_relative_path_tlibdir*)
+          # found a matching prefix
+          func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
+          func_relative_path_tcancelled=$func_stripname_result
+          if test -z "$func_relative_path_result"; then
+            func_relative_path_result=.
+          fi
+          break
+          ;;
+        *)
+          func_dirname $func_relative_path_tlibdir
+          func_relative_path_tlibdir=$func_dirname_result
+          if test -z "$func_relative_path_tlibdir"; then
+            # Have to descend all the way to the root!
+            func_relative_path_result=../$func_relative_path_result
+            func_relative_path_tcancelled=$func_relative_path_tbindir
+            break
+          fi
+          func_relative_path_result=../$func_relative_path_result
+          ;;
+      esac
+    done
+
+    # Now calculate path; take care to avoid doubling-up slashes.
+    func_stripname '' '/' "$func_relative_path_result"
+    func_relative_path_result=$func_stripname_result
+    func_stripname '/' '/' "$func_relative_path_tcancelled"
+    if test -n "$func_stripname_result"; then
+      func_append func_relative_path_result "/$func_stripname_result"
+    fi
+
+    # Normalisation. If bindir is libdir, return '.' else relative path.
+    if test -n "$func_relative_path_result"; then
+      func_stripname './' '' "$func_relative_path_result"
+      func_relative_path_result=$func_stripname_result
+    fi
+
+    test -n "$func_relative_path_result" || func_relative_path_result=.
+
+    :
+}
+
+
+# func_quote_for_eval ARG...
+# --------------------------
+# Aesthetically quote ARGs to be evaled later.
+# This function returns two values:
+#   i) func_quote_for_eval_result
+#      double-quoted, suitable for a subsequent eval
+#  ii) func_quote_for_eval_unquoted_result
+#      has all characters that are still active within double
+#      quotes backslashified.
+func_quote_for_eval ()
+{
+    $debug_cmd
+
+    func_quote_for_eval_unquoted_result=
+    func_quote_for_eval_result=
+    while test 0 -lt $#; do
+      case $1 in
+        *[\\\`\"\$]*)
+	  _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;;
+        *)
+          _G_unquoted_arg=$1 ;;
+      esac
+      if test -n "$func_quote_for_eval_unquoted_result"; then
+	func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg"
+      else
+        func_append func_quote_for_eval_unquoted_result "$_G_unquoted_arg"
+      fi
+
+      case $_G_unquoted_arg in
+        # Double-quote args containing shell metacharacters to delay
+        # word splitting, command substitution and variable expansion
+        # for a subsequent eval.
+        # Many Bourne shells cannot handle close brackets correctly
+        # in scan sets, so we specify it separately.
+        *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+          _G_quoted_arg=\"$_G_unquoted_arg\"
+          ;;
+        *)
+          _G_quoted_arg=$_G_unquoted_arg
+	  ;;
+      esac
+
+      if test -n "$func_quote_for_eval_result"; then
+	func_append func_quote_for_eval_result " $_G_quoted_arg"
+      else
+        func_append func_quote_for_eval_result "$_G_quoted_arg"
+      fi
+      shift
+    done
+}
+
+
+# func_quote_for_expand ARG
+# -------------------------
+# Aesthetically quote ARG to be evaled later; same as above,
+# but do not quote variable references.
+func_quote_for_expand ()
+{
+    $debug_cmd
+
+    case $1 in
+      *[\\\`\"]*)
+	_G_arg=`$ECHO "$1" | $SED \
+	    -e "$sed_double_quote_subst" -e "$sed_double_backslash"` ;;
+      *)
+        _G_arg=$1 ;;
+    esac
+
+    case $_G_arg in
+      # Double-quote args containing shell metacharacters to delay
+      # word splitting and command substitution for a subsequent eval.
+      # Many Bourne shells cannot handle close brackets correctly
+      # in scan sets, so we specify it separately.
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+        _G_arg=\"$_G_arg\"
+        ;;
+    esac
+
+    func_quote_for_expand_result=$_G_arg
+}
+
+
+# func_stripname PREFIX SUFFIX NAME
+# ---------------------------------
+# strip PREFIX and SUFFIX from NAME, and store in func_stripname_result.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+if test yes = "$_G_HAVE_XSI_OPS"; then
+  eval 'func_stripname ()
+  {
+    $debug_cmd
+
+    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+    # positional parameters, so assign one to ordinary variable first.
+    func_stripname_result=$3
+    func_stripname_result=${func_stripname_result#"$1"}
+    func_stripname_result=${func_stripname_result%"$2"}
+  }'
+else
+  func_stripname ()
+  {
+    $debug_cmd
+
+    case $2 in
+      .*) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%\\\\$2\$%%"`;;
+      *)  func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%$2\$%%"`;;
+    esac
+  }
+fi
+
+
+# func_show_eval CMD [FAIL_EXP]
+# -----------------------------
+# Unless opt_quiet is true, then output CMD.  Then, if opt_dryrun is
+# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
+# is given, then evaluate it.
+func_show_eval ()
+{
+    $debug_cmd
+
+    _G_cmd=$1
+    _G_fail_exp=${2-':'}
+
+    func_quote_for_expand "$_G_cmd"
+    eval "func_notquiet $func_quote_for_expand_result"
+
+    $opt_dry_run || {
+      eval "$_G_cmd"
+      _G_status=$?
+      if test 0 -ne "$_G_status"; then
+	eval "(exit $_G_status); $_G_fail_exp"
+      fi
+    }
+}
+
+
+# func_show_eval_locale CMD [FAIL_EXP]
+# ------------------------------------
+# Unless opt_quiet is true, then output CMD.  Then, if opt_dryrun is
+# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
+# is given, then evaluate it.  Use the saved locale for evaluation.
+func_show_eval_locale ()
+{
+    $debug_cmd
+
+    _G_cmd=$1
+    _G_fail_exp=${2-':'}
+
+    $opt_quiet || {
+      func_quote_for_expand "$_G_cmd"
+      eval "func_echo $func_quote_for_expand_result"
+    }
+
+    $opt_dry_run || {
+      eval "$_G_user_locale
+	    $_G_cmd"
+      _G_status=$?
+      eval "$_G_safe_locale"
+      if test 0 -ne "$_G_status"; then
+	eval "(exit $_G_status); $_G_fail_exp"
+      fi
+    }
+}
+
+
+# func_tr_sh
+# ----------
+# Turn $1 into a string suitable for a shell variable name.
+# Result is stored in $func_tr_sh_result.  All characters
+# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
+# if $1 begins with a digit, a '_' is prepended as well.
+func_tr_sh ()
+{
+    $debug_cmd
+
+    case $1 in
+    [0-9]* | *[!a-zA-Z0-9_]*)
+      func_tr_sh_result=`$ECHO "$1" | $SED -e 's/^\([0-9]\)/_\1/' -e 's/[^a-zA-Z0-9_]/_/g'`
+      ;;
+    * )
+      func_tr_sh_result=$1
+      ;;
+    esac
+}
+
+
+# func_verbose ARG...
+# -------------------
+# Echo program name prefixed message in verbose mode only.
+func_verbose ()
+{
+    $debug_cmd
+
+    $opt_verbose && func_echo "$*"
+
+    :
+}
+
+
+# func_warn_and_continue ARG...
+# -----------------------------
+# Echo program name prefixed warning message to standard error.
+func_warn_and_continue ()
+{
+    $debug_cmd
+
+    $require_term_colors
+
+    func_echo_infix_1 "${tc_red}warning$tc_reset" "$*" >&2
+}
+
+
+# func_warning CATEGORY ARG...
+# ----------------------------
+# Echo program name prefixed warning message to standard error. Warning
+# messages can be filtered according to CATEGORY, where this function
+# elides messages where CATEGORY is not listed in the global variable
+# 'opt_warning_types'.
+func_warning ()
+{
+    $debug_cmd
+
+    # CATEGORY must be in the warning_categories list!
+    case " $warning_categories " in
+      *" $1 "*) ;;
+      *) func_internal_error "invalid warning category '$1'" ;;
+    esac
+
+    _G_category=$1
+    shift
+
+    case " $opt_warning_types " in
+      *" $_G_category "*) $warning_func ${1+"$@"} ;;
+    esac
+}
+
+
+# func_sort_ver VER1 VER2
+# -----------------------
+# 'sort -V' is not generally available.
+# Note this deviates from the version comparison in automake
+# in that it treats 1.5 < 1.5.0, and treats 1.4.4a < 1.4-p3a
+# but this should suffice as we won't be specifying old
+# version formats or redundant trailing .0 in bootstrap.conf.
+# If we did want full compatibility then we should probably
+# use m4_version_compare from autoconf.
+func_sort_ver ()
+{
+    $debug_cmd
+
+    printf '%s\n%s\n' "$1" "$2" \
+      | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n -k 5,5n -k 6,6n -k 7,7n -k 8,8n -k 9,9n
+}
+
+# func_lt_ver PREV CURR
+# ---------------------
+# Return true if PREV and CURR are in the correct order according to
+# func_sort_ver, otherwise false.  Use it like this:
+#
+#  func_lt_ver "$prev_ver" "$proposed_ver" || func_fatal_error "..."
+func_lt_ver ()
+{
+    $debug_cmd
+
+    test "x$1" = x`func_sort_ver "$1" "$2" | $SED 1q`
+}
+
+
+# Local variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
+# time-stamp-time-zone: "UTC"
+# End:
+#! /bin/sh
+
+# Set a version string for this script.
+scriptversion=2014-01-07.03; # UTC
+
+# A portable, pluggable option parser for Bourne shell.
+# Written by Gary V. Vaughan, 2010
+
+# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions.  There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Please report bugs or propose patches to gary@gnu.org.
+
+
+## ------ ##
+## Usage. ##
+## ------ ##
+
+# This file is a library for parsing options in your shell scripts along
+# with assorted other useful supporting features that you can make use
+# of too.
+#
+# For the simplest scripts you might need only:
+#
+#   #!/bin/sh
+#   . relative/path/to/funclib.sh
+#   . relative/path/to/options-parser
+#   scriptversion=1.0
+#   func_options ${1+"$@"}
+#   eval set dummy "$func_options_result"; shift
+#   ...rest of your script...
+#
+# In order for the '--version' option to work, you will need to have a
+# suitably formatted comment like the one at the top of this file
+# starting with '# Written by ' and ending with '# warranty; '.
+#
+# For '-h' and '--help' to work, you will also need a one line
+# description of your script's purpose in a comment directly above the
+# '# Written by ' line, like the one at the top of this file.
+#
+# The default options also support '--debug', which will turn on shell
+# execution tracing (see the comment above debug_cmd below for another
+# use), and '--verbose' and the func_verbose function to allow your script
+# to display verbose messages only when your user has specified
+# '--verbose'.
+#
+# After sourcing this file, you can plug processing for additional
+# options by amending the variables from the 'Configuration' section
+# below, and following the instructions in the 'Option parsing'
+# section further down.
+
+## -------------- ##
+## Configuration. ##
+## -------------- ##
+
+# You should override these variables in your script after sourcing this
+# file so that they reflect the customisations you have added to the
+# option parser.
+
+# The usage line for option parsing errors and the start of '-h' and
+# '--help' output messages. You can embed shell variables for delayed
+# expansion at the time the message is displayed, but you will need to
+# quote other shell meta-characters carefully to prevent them being
+# expanded when the contents are evaled.
+usage='$progpath [OPTION]...'
+
+# Short help message in response to '-h' and '--help'.  Add to this or
+# override it after sourcing this library to reflect the full set of
+# options your script accepts.
+usage_message="\
+       --debug        enable verbose shell tracing
+   -W, --warnings=CATEGORY
+                      report the warnings falling in CATEGORY [all]
+   -v, --verbose      verbosely report processing
+       --version      print version information and exit
+   -h, --help         print short or long help message and exit
+"
+
+# Additional text appended to 'usage_message' in response to '--help'.
+long_help_message="
+Warning categories include:
+       'all'          show all warnings
+       'none'         turn off all the warnings
+       'error'        warnings are treated as fatal errors"
+
+# Help message printed before fatal option parsing errors.
+fatal_help="Try '\$progname --help' for more information."
+
+
+
+## ------------------------- ##
+## Hook function management. ##
+## ------------------------- ##
+
+# This section contains functions for adding, removing, and running hooks
+# to the main code.  A hook is just a named list of of function, that can
+# be run in order later on.
+
+# func_hookable FUNC_NAME
+# -----------------------
+# Declare that FUNC_NAME will run hooks added with
+# 'func_add_hook FUNC_NAME ...'.
+func_hookable ()
+{
+    $debug_cmd
+
+    func_append hookable_fns " $1"
+}
+
+
+# func_add_hook FUNC_NAME HOOK_FUNC
+# ---------------------------------
+# Request that FUNC_NAME call HOOK_FUNC before it returns.  FUNC_NAME must
+# first have been declared "hookable" by a call to 'func_hookable'.
+func_add_hook ()
+{
+    $debug_cmd
+
+    case " $hookable_fns " in
+      *" $1 "*) ;;
+      *) func_fatal_error "'$1' does not accept hook functions." ;;
+    esac
+
+    eval func_append ${1}_hooks '" $2"'
+}
+
+
+# func_remove_hook FUNC_NAME HOOK_FUNC
+# ------------------------------------
+# Remove HOOK_FUNC from the list of functions called by FUNC_NAME.
+func_remove_hook ()
+{
+    $debug_cmd
+
+    eval ${1}_hooks='`$ECHO "\$'$1'_hooks" |$SED "s| '$2'||"`'
+}
+
+
+# func_run_hooks FUNC_NAME [ARG]...
+# ---------------------------------
+# Run all hook functions registered to FUNC_NAME.
+# It is assumed that the list of hook functions contains nothing more
+# than a whitespace-delimited list of legal shell function names, and
+# no effort is wasted trying to catch shell meta-characters or preserve
+# whitespace.
+func_run_hooks ()
+{
+    $debug_cmd
+
+    case " $hookable_fns " in
+      *" $1 "*) ;;
+      *) func_fatal_error "'$1' does not support hook funcions.n" ;;
+    esac
+
+    eval _G_hook_fns=\$$1_hooks; shift
+
+    for _G_hook in $_G_hook_fns; do
+      eval $_G_hook '"$@"'
+
+      # store returned options list back into positional
+      # parameters for next 'cmd' execution.
+      eval _G_hook_result=\$${_G_hook}_result
+      eval set dummy "$_G_hook_result"; shift
+    done
+
+    func_quote_for_eval ${1+"$@"}
+    func_run_hooks_result=$func_quote_for_eval_result
+}
+
+
+
+## --------------- ##
+## Option parsing. ##
+## --------------- ##
+
+# In order to add your own option parsing hooks, you must accept the
+# full positional parameter list in your hook function, remove any
+# options that you action, and then pass back the remaining unprocessed
+# options in '<hooked_function_name>_result', escaped suitably for
+# 'eval'.  Like this:
+#
+#    my_options_prep ()
+#    {
+#        $debug_cmd
+#
+#        # Extend the existing usage message.
+#        usage_message=$usage_message'
+#      -s, --silent       don'\''t print informational messages
+#    '
+#
+#        func_quote_for_eval ${1+"$@"}
+#        my_options_prep_result=$func_quote_for_eval_result
+#    }
+#    func_add_hook func_options_prep my_options_prep
+#
+#
+#    my_silent_option ()
+#    {
+#        $debug_cmd
+#
+#        # Note that for efficiency, we parse as many options as we can
+#        # recognise in a loop before passing the remainder back to the
+#        # caller on the first unrecognised argument we encounter.
+#        while test $# -gt 0; do
+#          opt=$1; shift
+#          case $opt in
+#            --silent|-s) opt_silent=: ;;
+#            # Separate non-argument short options:
+#            -s*)         func_split_short_opt "$_G_opt"
+#                         set dummy "$func_split_short_opt_name" \
+#                             "-$func_split_short_opt_arg" ${1+"$@"}
+#                         shift
+#                         ;;
+#            *)            set dummy "$_G_opt" "$*"; shift; break ;;
+#          esac
+#        done
+#
+#        func_quote_for_eval ${1+"$@"}
+#        my_silent_option_result=$func_quote_for_eval_result
+#    }
+#    func_add_hook func_parse_options my_silent_option
+#
+#
+#    my_option_validation ()
+#    {
+#        $debug_cmd
+#
+#        $opt_silent && $opt_verbose && func_fatal_help "\
+#    '--silent' and '--verbose' options are mutually exclusive."
+#
+#        func_quote_for_eval ${1+"$@"}
+#        my_option_validation_result=$func_quote_for_eval_result
+#    }
+#    func_add_hook func_validate_options my_option_validation
+#
+# You'll alse need to manually amend $usage_message to reflect the extra
+# options you parse.  It's preferable to append if you can, so that
+# multiple option parsing hooks can be added safely.
+
+
+# func_options [ARG]...
+# ---------------------
+# All the functions called inside func_options are hookable. See the
+# individual implementations for details.
+func_hookable func_options
+func_options ()
+{
+    $debug_cmd
+
+    func_options_prep ${1+"$@"}
+    eval func_parse_options \
+        ${func_options_prep_result+"$func_options_prep_result"}
+    eval func_validate_options \
+        ${func_parse_options_result+"$func_parse_options_result"}
+
+    eval func_run_hooks func_options \
+        ${func_validate_options_result+"$func_validate_options_result"}
+
+    # save modified positional parameters for caller
+    func_options_result=$func_run_hooks_result
+}
+
+
+# func_options_prep [ARG]...
+# --------------------------
+# All initialisations required before starting the option parse loop.
+# Note that when calling hook functions, we pass through the list of
+# positional parameters.  If a hook function modifies that list, and
+# needs to propogate that back to rest of this script, then the complete
+# modified list must be put in 'func_run_hooks_result' before
+# returning.
+func_hookable func_options_prep
+func_options_prep ()
+{
+    $debug_cmd
+
+    # Option defaults:
+    opt_verbose=false
+    opt_warning_types=
+
+    func_run_hooks func_options_prep ${1+"$@"}
+
+    # save modified positional parameters for caller
+    func_options_prep_result=$func_run_hooks_result
+}
+
+
+# func_parse_options [ARG]...
+# ---------------------------
+# The main option parsing loop.
+func_hookable func_parse_options
+func_parse_options ()
+{
+    $debug_cmd
+
+    func_parse_options_result=
+
+    # this just eases exit handling
+    while test $# -gt 0; do
+      # Defer to hook functions for initial option parsing, so they
+      # get priority in the event of reusing an option name.
+      func_run_hooks func_parse_options ${1+"$@"}
+
+      # Adjust func_parse_options positional parameters to match
+      eval set dummy "$func_run_hooks_result"; shift
+
+      # Break out of the loop if we already parsed every option.
+      test $# -gt 0 || break
+
+      _G_opt=$1
+      shift
+      case $_G_opt in
+        --debug|-x)   debug_cmd='set -x'
+                      func_echo "enabling shell trace mode"
+                      $debug_cmd
+                      ;;
+
+        --no-warnings|--no-warning|--no-warn)
+                      set dummy --warnings none ${1+"$@"}
+                      shift
+		      ;;
+
+        --warnings|--warning|-W)
+                      test $# = 0 && func_missing_arg $_G_opt && break
+                      case " $warning_categories $1" in
+                        *" $1 "*)
+                          # trailing space prevents matching last $1 above
+                          func_append_uniq opt_warning_types " $1"
+                          ;;
+                        *all)
+                          opt_warning_types=$warning_categories
+                          ;;
+                        *none)
+                          opt_warning_types=none
+                          warning_func=:
+                          ;;
+                        *error)
+                          opt_warning_types=$warning_categories
+                          warning_func=func_fatal_error
+                          ;;
+                        *)
+                          func_fatal_error \
+                             "unsupported warning category: '$1'"
+                          ;;
+                      esac
+                      shift
+                      ;;
+
+        --verbose|-v) opt_verbose=: ;;
+        --version)    func_version ;;
+        -\?|-h)       func_usage ;;
+        --help)       func_help ;;
+
+	# Separate optargs to long options (plugins may need this):
+	--*=*)        func_split_equals "$_G_opt"
+	              set dummy "$func_split_equals_lhs" \
+                          "$func_split_equals_rhs" ${1+"$@"}
+                      shift
+                      ;;
+
+       # Separate optargs to short options:
+        -W*)
+                      func_split_short_opt "$_G_opt"
+                      set dummy "$func_split_short_opt_name" \
+                          "$func_split_short_opt_arg" ${1+"$@"}
+                      shift
+                      ;;
+
+        # Separate non-argument short options:
+        -\?*|-h*|-v*|-x*)
+                      func_split_short_opt "$_G_opt"
+                      set dummy "$func_split_short_opt_name" \
+                          "-$func_split_short_opt_arg" ${1+"$@"}
+                      shift
+                      ;;
+
+        --)           break ;;
+        -*)           func_fatal_help "unrecognised option: '$_G_opt'" ;;
+        *)            set dummy "$_G_opt" ${1+"$@"}; shift; break ;;
+      esac
+    done
+
+    # save modified positional parameters for caller
+    func_quote_for_eval ${1+"$@"}
+    func_parse_options_result=$func_quote_for_eval_result
+}
+
+
+# func_validate_options [ARG]...
+# ------------------------------
+# Perform any sanity checks on option settings and/or unconsumed
+# arguments.
+func_hookable func_validate_options
+func_validate_options ()
+{
+    $debug_cmd
+
+    # Display all warnings if -W was not given.
+    test -n "$opt_warning_types" || opt_warning_types=" $warning_categories"
+
+    func_run_hooks func_validate_options ${1+"$@"}
+
+    # Bail if the options were screwed!
+    $exit_cmd $EXIT_FAILURE
+
+    # save modified positional parameters for caller
+    func_validate_options_result=$func_run_hooks_result
+}
+
+
+
+## ----------------- ##
+## Helper functions. ##
+## ----------------- ##
+
+# This section contains the helper functions used by the rest of the
+# hookable option parser framework in ascii-betical order.
+
+
+# func_fatal_help ARG...
+# ----------------------
+# Echo program name prefixed message to standard error, followed by
+# a help hint, and exit.
+func_fatal_help ()
+{
+    $debug_cmd
+
+    eval \$ECHO \""Usage: $usage"\"
+    eval \$ECHO \""$fatal_help"\"
+    func_error ${1+"$@"}
+    exit $EXIT_FAILURE
+}
+
+
+# func_help
+# ---------
+# Echo long help message to standard output and exit.
+func_help ()
+{
+    $debug_cmd
+
+    func_usage_message
+    $ECHO "$long_help_message"
+    exit 0
+}
+
+
+# func_missing_arg ARGNAME
+# ------------------------
+# Echo program name prefixed message to standard error and set global
+# exit_cmd.
+func_missing_arg ()
+{
+    $debug_cmd
+
+    func_error "Missing argument for '$1'."
+    exit_cmd=exit
+}
+
+
+# func_split_equals STRING
+# ------------------------
+# Set func_split_equals_lhs and func_split_equals_rhs shell variables after
+# splitting STRING at the '=' sign.
+test -z "$_G_HAVE_XSI_OPS" \
+    && (eval 'x=a/b/c;
+      test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \
+    && _G_HAVE_XSI_OPS=yes
+
+if test yes = "$_G_HAVE_XSI_OPS"
+then
+  # This is an XSI compatible shell, allowing a faster implementation...
+  eval 'func_split_equals ()
+  {
+      $debug_cmd
+
+      func_split_equals_lhs=${1%%=*}
+      func_split_equals_rhs=${1#*=}
+      test "x$func_split_equals_lhs" = "x$1" \
+        && func_split_equals_rhs=
+  }'
+else
+  # ...otherwise fall back to using expr, which is often a shell builtin.
+  func_split_equals ()
+  {
+      $debug_cmd
+
+      func_split_equals_lhs=`expr "x$1" : 'x\([^=]*\)'`
+      func_split_equals_rhs=
+      test "x$func_split_equals_lhs" = "x$1" \
+        || func_split_equals_rhs=`expr "x$1" : 'x[^=]*=\(.*\)$'`
+  }
+fi #func_split_equals
+
+
+# func_split_short_opt SHORTOPT
+# -----------------------------
+# Set func_split_short_opt_name and func_split_short_opt_arg shell
+# variables after splitting SHORTOPT after the 2nd character.
+if test yes = "$_G_HAVE_XSI_OPS"
+then
+  # This is an XSI compatible shell, allowing a faster implementation...
+  eval 'func_split_short_opt ()
+  {
+      $debug_cmd
+
+      func_split_short_opt_arg=${1#??}
+      func_split_short_opt_name=${1%"$func_split_short_opt_arg"}
+  }'
+else
+  # ...otherwise fall back to using expr, which is often a shell builtin.
+  func_split_short_opt ()
+  {
+      $debug_cmd
+
+      func_split_short_opt_name=`expr "x$1" : 'x-\(.\)'`
+      func_split_short_opt_arg=`expr "x$1" : 'x-.\(.*\)$'`
+  }
+fi #func_split_short_opt
+
+
+# func_usage
+# ----------
+# Echo short help message to standard output and exit.
+func_usage ()
+{
+    $debug_cmd
+
+    func_usage_message
+    $ECHO "Run '$progname --help |${PAGER-more}' for full usage"
+    exit 0
+}
+
+
+# func_usage_message
+# ------------------
+# Echo short help message to standard output.
+func_usage_message ()
+{
+    $debug_cmd
+
+    eval \$ECHO \""Usage: $usage"\"
+    echo
+    $SED -n 's|^# ||
+        /^Written by/{
+          x;p;x
+        }
+	h
+	/^Written by/q' < "$progpath"
+    echo
+    eval \$ECHO \""$usage_message"\"
+}
+
+
+# func_version
+# ------------
+# Echo version message to standard output and exit.
+func_version ()
+{
+    $debug_cmd
+
+    printf '%s\n' "$progname $scriptversion"
+    $SED -n '
+        /(C)/!b go
+        :more
+        /\./!{
+          N
+          s|\n# | |
+          b more
+        }
+        :go
+        /^# Written by /,/# warranty; / {
+          s|^# ||
+          s|^# *$||
+          s|\((C)\)[ 0-9,-]*[ ,-]\([1-9][0-9]* \)|\1 \2|
+          p
+        }
+        /^# Written by / {
+          s|^# ||
+          p
+        }
+        /^warranty; /q' < "$progpath"
+
+    exit $?
+}
+
+
+# Local variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
+# time-stamp-time-zone: "UTC"
+# End:
+
+# Set a version string.
+scriptversion='(GNU libtool) 2.4.6'
+
+
+# func_echo ARG...
+# ----------------
+# Libtool also displays the current mode in messages, so override
+# funclib.sh func_echo with this custom definition.
+func_echo ()
+{
+    $debug_cmd
+
+    _G_message=$*
+
+    func_echo_IFS=$IFS
+    IFS=$nl
+    for _G_line in $_G_message; do
+      IFS=$func_echo_IFS
+      $ECHO "$progname${opt_mode+: $opt_mode}: $_G_line"
+    done
+    IFS=$func_echo_IFS
+}
+
+
+# func_warning ARG...
+# -------------------
+# Libtool warnings are not categorized, so override funclib.sh
+# func_warning with this simpler definition.
+func_warning ()
+{
+    $debug_cmd
+
+    $warning_func ${1+"$@"}
+}
+
+
+## ---------------- ##
+## Options parsing. ##
+## ---------------- ##
+
+# Hook in the functions to make sure our own options are parsed during
+# the option parsing loop.
+
+usage='$progpath [OPTION]... [MODE-ARG]...'
+
+# Short help message in response to '-h'.
+usage_message="Options:
+       --config             show all configuration variables
+       --debug              enable verbose shell tracing
+   -n, --dry-run            display commands without modifying any files
+       --features           display basic configuration information and exit
+       --mode=MODE          use operation mode MODE
+       --no-warnings        equivalent to '-Wnone'
+       --preserve-dup-deps  don't remove duplicate dependency libraries
+       --quiet, --silent    don't print informational messages
+       --tag=TAG            use configuration variables from tag TAG
+   -v, --verbose            print more informational messages than default
+       --version            print version information
+   -W, --warnings=CATEGORY  report the warnings falling in CATEGORY [all]
+   -h, --help, --help-all   print short, long, or detailed help message
+"
+
+# Additional text appended to 'usage_message' in response to '--help'.
+func_help ()
+{
+    $debug_cmd
+
+    func_usage_message
+    $ECHO "$long_help_message
+
+MODE must be one of the following:
+
+       clean           remove files from the build directory
+       compile         compile a source file into a libtool object
+       execute         automatically set library path, then run a program
+       finish          complete the installation of libtool libraries
+       install         install libraries or executables
+       link            create a library or an executable
+       uninstall       remove libraries from an installed directory
+
+MODE-ARGS vary depending on the MODE.  When passed as first option,
+'--mode=MODE' may be abbreviated as 'MODE' or a unique abbreviation of that.
+Try '$progname --help --mode=MODE' for a more detailed description of MODE.
+
+When reporting a bug, please describe a test case to reproduce it and
+include the following information:
+
+       host-triplet:   $host
+       shell:          $SHELL
+       compiler:       $LTCC
+       compiler flags: $LTCFLAGS
+       linker:         $LD (gnu? $with_gnu_ld)
+       version:        $progname (GNU libtool) 2.4.6
+       automake:       `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
+       autoconf:       `($AUTOCONF --version) 2>/dev/null |$SED 1q`
+
+Report bugs to <bug-libtool@gnu.org>.
+GNU libtool home page: <http://www.gnu.org/software/libtool/>.
+General help using GNU software: <http://www.gnu.org/gethelp/>."
+    exit 0
+}
+
+
+# func_lo2o OBJECT-NAME
+# ---------------------
+# Transform OBJECT-NAME from a '.lo' suffix to the platform specific
+# object suffix.
+
+lo2o=s/\\.lo\$/.$objext/
+o2lo=s/\\.$objext\$/.lo/
+
+if test yes = "$_G_HAVE_XSI_OPS"; then
+  eval 'func_lo2o ()
+  {
+    case $1 in
+      *.lo) func_lo2o_result=${1%.lo}.$objext ;;
+      *   ) func_lo2o_result=$1               ;;
+    esac
+  }'
+
+  # func_xform LIBOBJ-OR-SOURCE
+  # ---------------------------
+  # Transform LIBOBJ-OR-SOURCE from a '.o' or '.c' (or otherwise)
+  # suffix to a '.lo' libtool-object suffix.
+  eval 'func_xform ()
+  {
+    func_xform_result=${1%.*}.lo
+  }'
+else
+  # ...otherwise fall back to using sed.
+  func_lo2o ()
+  {
+    func_lo2o_result=`$ECHO "$1" | $SED "$lo2o"`
+  }
+
+  func_xform ()
+  {
+    func_xform_result=`$ECHO "$1" | $SED 's|\.[^.]*$|.lo|'`
+  }
+fi
+
+
+# func_fatal_configuration ARG...
+# -------------------------------
+# Echo program name prefixed message to standard error, followed by
+# a configuration failure hint, and exit.
+func_fatal_configuration ()
+{
+    func__fatal_error ${1+"$@"} \
+      "See the $PACKAGE documentation for more information." \
+      "Fatal configuration error."
+}
+
+
+# func_config
+# -----------
+# Display the configuration for all the tags in this script.
+func_config ()
+{
+    re_begincf='^# ### BEGIN LIBTOOL'
+    re_endcf='^# ### END LIBTOOL'
+
+    # Default configuration.
+    $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath"
+
+    # Now print the configurations for the tags.
+    for tagname in $taglist; do
+      $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath"
+    done
+
+    exit $?
+}
+
+
+# func_features
+# -------------
+# Display the features supported by this script.
+func_features ()
+{
+    echo "host: $host"
+    if test yes = "$build_libtool_libs"; then
+      echo "enable shared libraries"
+    else
+      echo "disable shared libraries"
+    fi
+    if test yes = "$build_old_libs"; then
+      echo "enable static libraries"
+    else
+      echo "disable static libraries"
+    fi
+
+    exit $?
+}
+
+
+# func_enable_tag TAGNAME
+# -----------------------
+# Verify that TAGNAME is valid, and either flag an error and exit, or
+# enable the TAGNAME tag.  We also add TAGNAME to the global $taglist
+# variable here.
+func_enable_tag ()
+{
+    # Global variable:
+    tagname=$1
+
+    re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
+    re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
+    sed_extractcf=/$re_begincf/,/$re_endcf/p
+
+    # Validate tagname.
+    case $tagname in
+      *[!-_A-Za-z0-9,/]*)
+        func_fatal_error "invalid tag name: $tagname"
+        ;;
+    esac
+
+    # Don't test for the "default" C tag, as we know it's
+    # there but not specially marked.
+    case $tagname in
+        CC) ;;
+    *)
+        if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
+	  taglist="$taglist $tagname"
+
+	  # Evaluate the configuration.  Be careful to quote the path
+	  # and the sed script, to avoid splitting on whitespace, but
+	  # also don't use non-portable quotes within backquotes within
+	  # quotes we have to do it in 2 steps:
+	  extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
+	  eval "$extractedcf"
+        else
+	  func_error "ignoring unknown tag $tagname"
+        fi
+        ;;
+    esac
+}
+
+
+# func_check_version_match
+# ------------------------
+# Ensure that we are using m4 macros, and libtool script from the same
+# release of libtool.
+func_check_version_match ()
+{
+    if test "$package_revision" != "$macro_revision"; then
+      if test "$VERSION" != "$macro_version"; then
+        if test -z "$macro_version"; then
+          cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
+$progname: definition of this LT_INIT comes from an older release.
+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+$progname: and run autoconf again.
+_LT_EOF
+        else
+          cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
+$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+$progname: and run autoconf again.
+_LT_EOF
+        fi
+      else
+        cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, revision $package_revision,
+$progname: but the definition of this LT_INIT comes from revision $macro_revision.
+$progname: You should recreate aclocal.m4 with macros from revision $package_revision
+$progname: of $PACKAGE $VERSION and run autoconf again.
+_LT_EOF
+      fi
+
+      exit $EXIT_MISMATCH
+    fi
+}
+
+
+# libtool_options_prep [ARG]...
+# -----------------------------
+# Preparation for options parsed by libtool.
+libtool_options_prep ()
+{
+    $debug_mode
+
+    # Option defaults:
+    opt_config=false
+    opt_dlopen=
+    opt_dry_run=false
+    opt_help=false
+    opt_mode=
+    opt_preserve_dup_deps=false
+    opt_quiet=false
+
+    nonopt=
+    preserve_args=
+
+    # Shorthand for --mode=foo, only valid as the first argument
+    case $1 in
+    clean|clea|cle|cl)
+      shift; set dummy --mode clean ${1+"$@"}; shift
+      ;;
+    compile|compil|compi|comp|com|co|c)
+      shift; set dummy --mode compile ${1+"$@"}; shift
+      ;;
+    execute|execut|execu|exec|exe|ex|e)
+      shift; set dummy --mode execute ${1+"$@"}; shift
+      ;;
+    finish|finis|fini|fin|fi|f)
+      shift; set dummy --mode finish ${1+"$@"}; shift
+      ;;
+    install|instal|insta|inst|ins|in|i)
+      shift; set dummy --mode install ${1+"$@"}; shift
+      ;;
+    link|lin|li|l)
+      shift; set dummy --mode link ${1+"$@"}; shift
+      ;;
+    uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
+      shift; set dummy --mode uninstall ${1+"$@"}; shift
+      ;;
+    esac
+
+    # Pass back the list of options.
+    func_quote_for_eval ${1+"$@"}
+    libtool_options_prep_result=$func_quote_for_eval_result
+}
+func_add_hook func_options_prep libtool_options_prep
+
+
+# libtool_parse_options [ARG]...
+# ---------------------------------
+# Provide handling for libtool specific options.
+libtool_parse_options ()
+{
+    $debug_cmd
+
+    # Perform our own loop to consume as many options as possible in
+    # each iteration.
+    while test $# -gt 0; do
+      _G_opt=$1
+      shift
+      case $_G_opt in
+        --dry-run|--dryrun|-n)
+                        opt_dry_run=:
+                        ;;
+
+        --config)       func_config ;;
+
+        --dlopen|-dlopen)
+                        opt_dlopen="${opt_dlopen+$opt_dlopen
+}$1"
+                        shift
+                        ;;
+
+        --preserve-dup-deps)
+                        opt_preserve_dup_deps=: ;;
+
+        --features)     func_features ;;
+
+        --finish)       set dummy --mode finish ${1+"$@"}; shift ;;
+
+        --help)         opt_help=: ;;
+
+        --help-all)     opt_help=': help-all' ;;
+
+        --mode)         test $# = 0 && func_missing_arg $_G_opt && break
+                        opt_mode=$1
+                        case $1 in
+                          # Valid mode arguments:
+                          clean|compile|execute|finish|install|link|relink|uninstall) ;;
+
+                          # Catch anything else as an error
+                          *) func_error "invalid argument for $_G_opt"
+                             exit_cmd=exit
+                             break
+                             ;;
+                        esac
+                        shift
+                        ;;
+
+        --no-silent|--no-quiet)
+                        opt_quiet=false
+                        func_append preserve_args " $_G_opt"
+                        ;;
+
+        --no-warnings|--no-warning|--no-warn)
+                        opt_warning=false
+                        func_append preserve_args " $_G_opt"
+                        ;;
+
+        --no-verbose)
+                        opt_verbose=false
+                        func_append preserve_args " $_G_opt"
+                        ;;
+
+        --silent|--quiet)
+                        opt_quiet=:
+                        opt_verbose=false
+                        func_append preserve_args " $_G_opt"
+                        ;;
+
+        --tag)          test $# = 0 && func_missing_arg $_G_opt && break
+                        opt_tag=$1
+                        func_append preserve_args " $_G_opt $1"
+                        func_enable_tag "$1"
+                        shift
+                        ;;
+
+        --verbose|-v)   opt_quiet=false
+                        opt_verbose=:
+                        func_append preserve_args " $_G_opt"
+                        ;;
+
+	# An option not handled by this hook function:
+        *)		set dummy "$_G_opt" ${1+"$@"};	shift; break  ;;
+      esac
+    done
+
+
+    # save modified positional parameters for caller
+    func_quote_for_eval ${1+"$@"}
+    libtool_parse_options_result=$func_quote_for_eval_result
+}
+func_add_hook func_parse_options libtool_parse_options
+
+
+
+# libtool_validate_options [ARG]...
+# ---------------------------------
+# Perform any sanity checks on option settings and/or unconsumed
+# arguments.
+libtool_validate_options ()
+{
+    # save first non-option argument
+    if test 0 -lt $#; then
+      nonopt=$1
+      shift
+    fi
+
+    # preserve --debug
+    test : = "$debug_cmd" || func_append preserve_args " --debug"
+
+    case $host in
+      # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452
+      # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788
+      *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*)
+        # don't eliminate duplications in $postdeps and $predeps
+        opt_duplicate_compiler_generated_deps=:
+        ;;
+      *)
+        opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
+        ;;
+    esac
+
+    $opt_help || {
+      # Sanity checks first:
+      func_check_version_match
+
+      test yes != "$build_libtool_libs" \
+        && test yes != "$build_old_libs" \
+        && func_fatal_configuration "not configured to build any kind of library"
+
+      # Darwin sucks
+      eval std_shrext=\"$shrext_cmds\"
+
+      # Only execute mode is allowed to have -dlopen flags.
+      if test -n "$opt_dlopen" && test execute != "$opt_mode"; then
+        func_error "unrecognized option '-dlopen'"
+        $ECHO "$help" 1>&2
+        exit $EXIT_FAILURE
+      fi
+
+      # Change the help message to a mode-specific one.
+      generic_help=$help
+      help="Try '$progname --help --mode=$opt_mode' for more information."
+    }
+
+    # Pass back the unparsed argument list
+    func_quote_for_eval ${1+"$@"}
+    libtool_validate_options_result=$func_quote_for_eval_result
+}
+func_add_hook func_validate_options libtool_validate_options
+
+
+# Process options as early as possible so that --help and --version
+# can return quickly.
+func_options ${1+"$@"}
+eval set dummy "$func_options_result"; shift
+
+
+
+## ----------- ##
+##    Main.    ##
+## ----------- ##
+
+magic='%%%MAGIC variable%%%'
+magic_exe='%%%MAGIC EXE variable%%%'
+
+# Global variables.
+extracted_archives=
+extracted_serial=0
+
+# If this variable is set in any of the actions, the command in it
+# will be execed at the end.  This prevents here-documents from being
+# left over by shells.
+exec_cmd=
+
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+}
+
+# func_generated_by_libtool
+# True iff stdin has been generated by Libtool. This function is only
+# a basic sanity check; it will hardly flush out determined imposters.
+func_generated_by_libtool_p ()
+{
+  $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
+}
+
+# func_lalib_p file
+# True iff FILE is a libtool '.la' library or '.lo' object file.
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_lalib_p ()
+{
+    test -f "$1" &&
+      $SED -e 4q "$1" 2>/dev/null | func_generated_by_libtool_p
+}
+
+# func_lalib_unsafe_p file
+# True iff FILE is a libtool '.la' library or '.lo' object file.
+# This function implements the same check as func_lalib_p without
+# resorting to external programs.  To this end, it redirects stdin and
+# closes it afterwards, without saving the original file descriptor.
+# As a safety measure, use it only where a negative result would be
+# fatal anyway.  Works if 'file' does not exist.
+func_lalib_unsafe_p ()
+{
+    lalib_p=no
+    if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then
+	for lalib_p_l in 1 2 3 4
+	do
+	    read lalib_p_line
+	    case $lalib_p_line in
+		\#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;;
+	    esac
+	done
+	exec 0<&5 5<&-
+    fi
+    test yes = "$lalib_p"
+}
+
+# func_ltwrapper_script_p file
+# True iff FILE is a libtool wrapper script
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_script_p ()
+{
+    test -f "$1" &&
+      $lt_truncate_bin < "$1" 2>/dev/null | func_generated_by_libtool_p
+}
+
+# func_ltwrapper_executable_p file
+# True iff FILE is a libtool wrapper executable
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_executable_p ()
+{
+    func_ltwrapper_exec_suffix=
+    case $1 in
+    *.exe) ;;
+    *) func_ltwrapper_exec_suffix=.exe ;;
+    esac
+    $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1
+}
+
+# func_ltwrapper_scriptname file
+# Assumes file is an ltwrapper_executable
+# uses $file to determine the appropriate filename for a
+# temporary ltwrapper_script.
+func_ltwrapper_scriptname ()
+{
+    func_dirname_and_basename "$1" "" "."
+    func_stripname '' '.exe' "$func_basename_result"
+    func_ltwrapper_scriptname_result=$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper
+}
+
+# func_ltwrapper_p file
+# True iff FILE is a libtool wrapper script or wrapper executable
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_p ()
+{
+    func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1"
+}
+
+
+# func_execute_cmds commands fail_cmd
+# Execute tilde-delimited COMMANDS.
+# If FAIL_CMD is given, eval that upon failure.
+# FAIL_CMD may read-access the current command in variable CMD!
+func_execute_cmds ()
+{
+    $debug_cmd
+
+    save_ifs=$IFS; IFS='~'
+    for cmd in $1; do
+      IFS=$sp$nl
+      eval cmd=\"$cmd\"
+      IFS=$save_ifs
+      func_show_eval "$cmd" "${2-:}"
+    done
+    IFS=$save_ifs
+}
+
+
+# func_source file
+# Source FILE, adding directory component if necessary.
+# Note that it is not necessary on cygwin/mingw to append a dot to
+# FILE even if both FILE and FILE.exe exist: automatic-append-.exe
+# behavior happens only for exec(3), not for open(2)!  Also, sourcing
+# 'FILE.' does not work on cygwin managed mounts.
+func_source ()
+{
+    $debug_cmd
+
+    case $1 in
+    */* | *\\*)	. "$1" ;;
+    *)		. "./$1" ;;
+    esac
+}
+
+
+# func_resolve_sysroot PATH
+# Replace a leading = in PATH with a sysroot.  Store the result into
+# func_resolve_sysroot_result
+func_resolve_sysroot ()
+{
+  func_resolve_sysroot_result=$1
+  case $func_resolve_sysroot_result in
+  =*)
+    func_stripname '=' '' "$func_resolve_sysroot_result"
+    func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
+    ;;
+  esac
+}
+
+# func_replace_sysroot PATH
+# If PATH begins with the sysroot, replace it with = and
+# store the result into func_replace_sysroot_result.
+func_replace_sysroot ()
+{
+  case $lt_sysroot:$1 in
+  ?*:"$lt_sysroot"*)
+    func_stripname "$lt_sysroot" '' "$1"
+    func_replace_sysroot_result='='$func_stripname_result
+    ;;
+  *)
+    # Including no sysroot.
+    func_replace_sysroot_result=$1
+    ;;
+  esac
+}
+
+# func_infer_tag arg
+# Infer tagged configuration to use if any are available and
+# if one wasn't chosen via the "--tag" command line option.
+# Only attempt this if the compiler in the base compile
+# command doesn't match the default compiler.
+# arg is usually of the form 'gcc ...'
+func_infer_tag ()
+{
+    $debug_cmd
+
+    if test -n "$available_tags" && test -z "$tagname"; then
+      CC_quoted=
+      for arg in $CC; do
+	func_append_quoted CC_quoted "$arg"
+      done
+      CC_expanded=`func_echo_all $CC`
+      CC_quoted_expanded=`func_echo_all $CC_quoted`
+      case $@ in
+      # Blanks in the command may have been stripped by the calling shell,
+      # but not from the CC environment variable when configure was run.
+      " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
+      " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;;
+      # Blanks at the start of $base_compile will cause this to fail
+      # if we don't check for them as well.
+      *)
+	for z in $available_tags; do
+	  if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
+	    # Evaluate the configuration.
+	    eval "`$SED -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
+	    CC_quoted=
+	    for arg in $CC; do
+	      # Double-quote args containing other shell metacharacters.
+	      func_append_quoted CC_quoted "$arg"
+	    done
+	    CC_expanded=`func_echo_all $CC`
+	    CC_quoted_expanded=`func_echo_all $CC_quoted`
+	    case "$@ " in
+	    " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
+	    " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*)
+	      # The compiler in the base compile command matches
+	      # the one in the tagged configuration.
+	      # Assume this is the tagged configuration we want.
+	      tagname=$z
+	      break
+	      ;;
+	    esac
+	  fi
+	done
+	# If $tagname still isn't set, then no tagged configuration
+	# was found and let the user know that the "--tag" command
+	# line option must be used.
+	if test -z "$tagname"; then
+	  func_echo "unable to infer tagged configuration"
+	  func_fatal_error "specify a tag with '--tag'"
+#	else
+#	  func_verbose "using $tagname tagged configuration"
+	fi
+	;;
+      esac
+    fi
+}
+
+
+
+# func_write_libtool_object output_name pic_name nonpic_name
+# Create a libtool object file (analogous to a ".la" file),
+# but don't create it if we're doing a dry run.
+func_write_libtool_object ()
+{
+    write_libobj=$1
+    if test yes = "$build_libtool_libs"; then
+      write_lobj=\'$2\'
+    else
+      write_lobj=none
+    fi
+
+    if test yes = "$build_old_libs"; then
+      write_oldobj=\'$3\'
+    else
+      write_oldobj=none
+    fi
+
+    $opt_dry_run || {
+      cat >${write_libobj}T <<EOF
+# $write_libobj - a libtool object file
+# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# Name of the PIC object.
+pic_object=$write_lobj
+
+# Name of the non-PIC object
+non_pic_object=$write_oldobj
+
+EOF
+      $MV "${write_libobj}T" "$write_libobj"
+    }
+}
+
+
+##################################################
+# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #
+##################################################
+
+# func_convert_core_file_wine_to_w32 ARG
+# Helper function used by file name conversion functions when $build is *nix,
+# and $host is mingw, cygwin, or some other w32 environment. Relies on a
+# correctly configured wine environment available, with the winepath program
+# in $build's $PATH.
+#
+# ARG is the $build file name to be converted to w32 format.
+# Result is available in $func_convert_core_file_wine_to_w32_result, and will
+# be empty on error (or when ARG is empty)
+func_convert_core_file_wine_to_w32 ()
+{
+  $debug_cmd
+
+  func_convert_core_file_wine_to_w32_result=$1
+  if test -n "$1"; then
+    # Unfortunately, winepath does not exit with a non-zero error code, so we
+    # are forced to check the contents of stdout. On the other hand, if the
+    # command is not found, the shell will set an exit code of 127 and print
+    # *an error message* to stdout. So we must check for both error code of
+    # zero AND non-empty stdout, which explains the odd construction:
+    func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
+    if test "$?" -eq 0 && test -n "$func_convert_core_file_wine_to_w32_tmp"; then
+      func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
+        $SED -e "$sed_naive_backslashify"`
+    else
+      func_convert_core_file_wine_to_w32_result=
+    fi
+  fi
+}
+# end: func_convert_core_file_wine_to_w32
+
+
+# func_convert_core_path_wine_to_w32 ARG
+# Helper function used by path conversion functions when $build is *nix, and
+# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
+# configured wine environment available, with the winepath program in $build's
+# $PATH. Assumes ARG has no leading or trailing path separator characters.
+#
+# ARG is path to be converted from $build format to win32.
+# Result is available in $func_convert_core_path_wine_to_w32_result.
+# Unconvertible file (directory) names in ARG are skipped; if no directory names
+# are convertible, then the result may be empty.
+func_convert_core_path_wine_to_w32 ()
+{
+  $debug_cmd
+
+  # unfortunately, winepath doesn't convert paths, only file names
+  func_convert_core_path_wine_to_w32_result=
+  if test -n "$1"; then
+    oldIFS=$IFS
+    IFS=:
+    for func_convert_core_path_wine_to_w32_f in $1; do
+      IFS=$oldIFS
+      func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
+      if test -n "$func_convert_core_file_wine_to_w32_result"; then
+        if test -z "$func_convert_core_path_wine_to_w32_result"; then
+          func_convert_core_path_wine_to_w32_result=$func_convert_core_file_wine_to_w32_result
+        else
+          func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
+        fi
+      fi
+    done
+    IFS=$oldIFS
+  fi
+}
+# end: func_convert_core_path_wine_to_w32
+
+
+# func_cygpath ARGS...
+# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
+# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
+# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
+# (2), returns the Cygwin file name or path in func_cygpath_result (input
+# file name or path is assumed to be in w32 format, as previously converted
+# from $build's *nix or MSYS format). In case (3), returns the w32 file name
+# or path in func_cygpath_result (input file name or path is assumed to be in
+# Cygwin format). Returns an empty string on error.
+#
+# ARGS are passed to cygpath, with the last one being the file name or path to
+# be converted.
+#
+# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
+# environment variable; do not put it in $PATH.
+func_cygpath ()
+{
+  $debug_cmd
+
+  if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
+    func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
+    if test "$?" -ne 0; then
+      # on failure, ensure result is empty
+      func_cygpath_result=
+    fi
+  else
+    func_cygpath_result=
+    func_error "LT_CYGPATH is empty or specifies non-existent file: '$LT_CYGPATH'"
+  fi
+}
+#end: func_cygpath
+
+
+# func_convert_core_msys_to_w32 ARG
+# Convert file name or path ARG from MSYS format to w32 format.  Return
+# result in func_convert_core_msys_to_w32_result.
+func_convert_core_msys_to_w32 ()
+{
+  $debug_cmd
+
+  # awkward: cmd appends spaces to result
+  func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
+    $SED -e 's/[ ]*$//' -e "$sed_naive_backslashify"`
+}
+#end: func_convert_core_msys_to_w32
+
+
+# func_convert_file_check ARG1 ARG2
+# Verify that ARG1 (a file name in $build format) was converted to $host
+# format in ARG2. Otherwise, emit an error message, but continue (resetting
+# func_to_host_file_result to ARG1).
+func_convert_file_check ()
+{
+  $debug_cmd
+
+  if test -z "$2" && test -n "$1"; then
+    func_error "Could not determine host file name corresponding to"
+    func_error "  '$1'"
+    func_error "Continuing, but uninstalled executables may not work."
+    # Fallback:
+    func_to_host_file_result=$1
+  fi
+}
+# end func_convert_file_check
+
+
+# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
+# Verify that FROM_PATH (a path in $build format) was converted to $host
+# format in TO_PATH. Otherwise, emit an error message, but continue, resetting
+# func_to_host_file_result to a simplistic fallback value (see below).
+func_convert_path_check ()
+{
+  $debug_cmd
+
+  if test -z "$4" && test -n "$3"; then
+    func_error "Could not determine the host path corresponding to"
+    func_error "  '$3'"
+    func_error "Continuing, but uninstalled executables may not work."
+    # Fallback.  This is a deliberately simplistic "conversion" and
+    # should not be "improved".  See libtool.info.
+    if test "x$1" != "x$2"; then
+      lt_replace_pathsep_chars="s|$1|$2|g"
+      func_to_host_path_result=`echo "$3" |
+        $SED -e "$lt_replace_pathsep_chars"`
+    else
+      func_to_host_path_result=$3
+    fi
+  fi
+}
+# end func_convert_path_check
+
+
+# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
+# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
+# and appending REPL if ORIG matches BACKPAT.
+func_convert_path_front_back_pathsep ()
+{
+  $debug_cmd
+
+  case $4 in
+  $1 ) func_to_host_path_result=$3$func_to_host_path_result
+    ;;
+  esac
+  case $4 in
+  $2 ) func_append func_to_host_path_result "$3"
+    ;;
+  esac
+}
+# end func_convert_path_front_back_pathsep
+
+
+##################################################
+# $build to $host FILE NAME CONVERSION FUNCTIONS #
+##################################################
+# invoked via '$to_host_file_cmd ARG'
+#
+# In each case, ARG is the path to be converted from $build to $host format.
+# Result will be available in $func_to_host_file_result.
+
+
+# func_to_host_file ARG
+# Converts the file name ARG from $build format to $host format. Return result
+# in func_to_host_file_result.
+func_to_host_file ()
+{
+  $debug_cmd
+
+  $to_host_file_cmd "$1"
+}
+# end func_to_host_file
+
+
+# func_to_tool_file ARG LAZY
+# converts the file name ARG from $build format to toolchain format. Return
+# result in func_to_tool_file_result.  If the conversion in use is listed
+# in (the comma separated) LAZY, no conversion takes place.
+func_to_tool_file ()
+{
+  $debug_cmd
+
+  case ,$2, in
+    *,"$to_tool_file_cmd",*)
+      func_to_tool_file_result=$1
+      ;;
+    *)
+      $to_tool_file_cmd "$1"
+      func_to_tool_file_result=$func_to_host_file_result
+      ;;
+  esac
+}
+# end func_to_tool_file
+
+
+# func_convert_file_noop ARG
+# Copy ARG to func_to_host_file_result.
+func_convert_file_noop ()
+{
+  func_to_host_file_result=$1
+}
+# end func_convert_file_noop
+
+
+# func_convert_file_msys_to_w32 ARG
+# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
+# conversion to w32 is not available inside the cwrapper.  Returns result in
+# func_to_host_file_result.
+func_convert_file_msys_to_w32 ()
+{
+  $debug_cmd
+
+  func_to_host_file_result=$1
+  if test -n "$1"; then
+    func_convert_core_msys_to_w32 "$1"
+    func_to_host_file_result=$func_convert_core_msys_to_w32_result
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_msys_to_w32
+
+
+# func_convert_file_cygwin_to_w32 ARG
+# Convert file name ARG from Cygwin to w32 format.  Returns result in
+# func_to_host_file_result.
+func_convert_file_cygwin_to_w32 ()
+{
+  $debug_cmd
+
+  func_to_host_file_result=$1
+  if test -n "$1"; then
+    # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
+    # LT_CYGPATH in this case.
+    func_to_host_file_result=`cygpath -m "$1"`
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_cygwin_to_w32
+
+
+# func_convert_file_nix_to_w32 ARG
+# Convert file name ARG from *nix to w32 format.  Requires a wine environment
+# and a working winepath. Returns result in func_to_host_file_result.
+func_convert_file_nix_to_w32 ()
+{
+  $debug_cmd
+
+  func_to_host_file_result=$1
+  if test -n "$1"; then
+    func_convert_core_file_wine_to_w32 "$1"
+    func_to_host_file_result=$func_convert_core_file_wine_to_w32_result
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_nix_to_w32
+
+
+# func_convert_file_msys_to_cygwin ARG
+# Convert file name ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
+# Returns result in func_to_host_file_result.
+func_convert_file_msys_to_cygwin ()
+{
+  $debug_cmd
+
+  func_to_host_file_result=$1
+  if test -n "$1"; then
+    func_convert_core_msys_to_w32 "$1"
+    func_cygpath -u "$func_convert_core_msys_to_w32_result"
+    func_to_host_file_result=$func_cygpath_result
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_msys_to_cygwin
+
+
+# func_convert_file_nix_to_cygwin ARG
+# Convert file name ARG from *nix to Cygwin format.  Requires Cygwin installed
+# in a wine environment, working winepath, and LT_CYGPATH set.  Returns result
+# in func_to_host_file_result.
+func_convert_file_nix_to_cygwin ()
+{
+  $debug_cmd
+
+  func_to_host_file_result=$1
+  if test -n "$1"; then
+    # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
+    func_convert_core_file_wine_to_w32 "$1"
+    func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
+    func_to_host_file_result=$func_cygpath_result
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_nix_to_cygwin
+
+
+#############################################
+# $build to $host PATH CONVERSION FUNCTIONS #
+#############################################
+# invoked via '$to_host_path_cmd ARG'
+#
+# In each case, ARG is the path to be converted from $build to $host format.
+# The result will be available in $func_to_host_path_result.
+#
+# Path separators are also converted from $build format to $host format.  If
+# ARG begins or ends with a path separator character, it is preserved (but
+# converted to $host format) on output.
+#
+# All path conversion functions are named using the following convention:
+#   file name conversion function    : func_convert_file_X_to_Y ()
+#   path conversion function         : func_convert_path_X_to_Y ()
+# where, for any given $build/$host combination the 'X_to_Y' value is the
+# same.  If conversion functions are added for new $build/$host combinations,
+# the two new functions must follow this pattern, or func_init_to_host_path_cmd
+# will break.
+
+
+# func_init_to_host_path_cmd
+# Ensures that function "pointer" variable $to_host_path_cmd is set to the
+# appropriate value, based on the value of $to_host_file_cmd.
+to_host_path_cmd=
+func_init_to_host_path_cmd ()
+{
+  $debug_cmd
+
+  if test -z "$to_host_path_cmd"; then
+    func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
+    to_host_path_cmd=func_convert_path_$func_stripname_result
+  fi
+}
+
+
+# func_to_host_path ARG
+# Converts the path ARG from $build format to $host format. Return result
+# in func_to_host_path_result.
+func_to_host_path ()
+{
+  $debug_cmd
+
+  func_init_to_host_path_cmd
+  $to_host_path_cmd "$1"
+}
+# end func_to_host_path
+
+
+# func_convert_path_noop ARG
+# Copy ARG to func_to_host_path_result.
+func_convert_path_noop ()
+{
+  func_to_host_path_result=$1
+}
+# end func_convert_path_noop
+
+
+# func_convert_path_msys_to_w32 ARG
+# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
+# conversion to w32 is not available inside the cwrapper.  Returns result in
+# func_to_host_path_result.
+func_convert_path_msys_to_w32 ()
+{
+  $debug_cmd
+
+  func_to_host_path_result=$1
+  if test -n "$1"; then
+    # Remove leading and trailing path separator characters from ARG.  MSYS
+    # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
+    # and winepath ignores them completely.
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
+    func_to_host_path_result=$func_convert_core_msys_to_w32_result
+    func_convert_path_check : ";" \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+  fi
+}
+# end func_convert_path_msys_to_w32
+
+
+# func_convert_path_cygwin_to_w32 ARG
+# Convert path ARG from Cygwin to w32 format.  Returns result in
+# func_to_host_file_result.
+func_convert_path_cygwin_to_w32 ()
+{
+  $debug_cmd
+
+  func_to_host_path_result=$1
+  if test -n "$1"; then
+    # See func_convert_path_msys_to_w32:
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
+    func_convert_path_check : ";" \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+  fi
+}
+# end func_convert_path_cygwin_to_w32
+
+
+# func_convert_path_nix_to_w32 ARG
+# Convert path ARG from *nix to w32 format.  Requires a wine environment and
+# a working winepath.  Returns result in func_to_host_file_result.
+func_convert_path_nix_to_w32 ()
+{
+  $debug_cmd
+
+  func_to_host_path_result=$1
+  if test -n "$1"; then
+    # See func_convert_path_msys_to_w32:
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
+    func_to_host_path_result=$func_convert_core_path_wine_to_w32_result
+    func_convert_path_check : ";" \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+  fi
+}
+# end func_convert_path_nix_to_w32
+
+
+# func_convert_path_msys_to_cygwin ARG
+# Convert path ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
+# Returns result in func_to_host_file_result.
+func_convert_path_msys_to_cygwin ()
+{
+  $debug_cmd
+
+  func_to_host_path_result=$1
+  if test -n "$1"; then
+    # See func_convert_path_msys_to_w32:
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
+    func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
+    func_to_host_path_result=$func_cygpath_result
+    func_convert_path_check : : \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
+  fi
+}
+# end func_convert_path_msys_to_cygwin
+
+
+# func_convert_path_nix_to_cygwin ARG
+# Convert path ARG from *nix to Cygwin format.  Requires Cygwin installed in a
+# a wine environment, working winepath, and LT_CYGPATH set.  Returns result in
+# func_to_host_file_result.
+func_convert_path_nix_to_cygwin ()
+{
+  $debug_cmd
+
+  func_to_host_path_result=$1
+  if test -n "$1"; then
+    # Remove leading and trailing path separator characters from
+    # ARG. msys behavior is inconsistent here, cygpath turns them
+    # into '.;' and ';.', and winepath ignores them completely.
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
+    func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
+    func_to_host_path_result=$func_cygpath_result
+    func_convert_path_check : : \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
+  fi
+}
+# end func_convert_path_nix_to_cygwin
+
+
+# func_dll_def_p FILE
+# True iff FILE is a Windows DLL '.def' file.
+# Keep in sync with _LT_DLL_DEF_P in libtool.m4
+func_dll_def_p ()
+{
+  $debug_cmd
+
+  func_dll_def_p_tmp=`$SED -n \
+    -e 's/^[	 ]*//' \
+    -e '/^\(;.*\)*$/d' \
+    -e 's/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p' \
+    -e q \
+    "$1"`
+  test DEF = "$func_dll_def_p_tmp"
+}
+
+
+# func_mode_compile arg...
+func_mode_compile ()
+{
+    $debug_cmd
+
+    # Get the compilation command and the source file.
+    base_compile=
+    srcfile=$nonopt  #  always keep a non-empty value in "srcfile"
+    suppress_opt=yes
+    suppress_output=
+    arg_mode=normal
+    libobj=
+    later=
+    pie_flag=
+
+    for arg
+    do
+      case $arg_mode in
+      arg  )
+	# do not "continue".  Instead, add this to base_compile
+	lastarg=$arg
+	arg_mode=normal
+	;;
+
+      target )
+	libobj=$arg
+	arg_mode=normal
+	continue
+	;;
+
+      normal )
+	# Accept any command-line options.
+	case $arg in
+	-o)
+	  test -n "$libobj" && \
+	    func_fatal_error "you cannot specify '-o' more than once"
+	  arg_mode=target
+	  continue
+	  ;;
+
+	-pie | -fpie | -fPIE)
+          func_append pie_flag " $arg"
+	  continue
+	  ;;
+
+	-shared | -static | -prefer-pic | -prefer-non-pic)
+	  func_append later " $arg"
+	  continue
+	  ;;
+
+	-no-suppress)
+	  suppress_opt=no
+	  continue
+	  ;;
+
+	-Xcompiler)
+	  arg_mode=arg  #  the next one goes into the "base_compile" arg list
+	  continue      #  The current "srcfile" will either be retained or
+	  ;;            #  replaced later.  I would guess that would be a bug.
+
+	-Wc,*)
+	  func_stripname '-Wc,' '' "$arg"
+	  args=$func_stripname_result
+	  lastarg=
+	  save_ifs=$IFS; IFS=,
+	  for arg in $args; do
+	    IFS=$save_ifs
+	    func_append_quoted lastarg "$arg"
+	  done
+	  IFS=$save_ifs
+	  func_stripname ' ' '' "$lastarg"
+	  lastarg=$func_stripname_result
+
+	  # Add the arguments to base_compile.
+	  func_append base_compile " $lastarg"
+	  continue
+	  ;;
+
+	*)
+	  # Accept the current argument as the source file.
+	  # The previous "srcfile" becomes the current argument.
+	  #
+	  lastarg=$srcfile
+	  srcfile=$arg
+	  ;;
+	esac  #  case $arg
+	;;
+      esac    #  case $arg_mode
+
+      # Aesthetically quote the previous argument.
+      func_append_quoted base_compile "$lastarg"
+    done # for arg
+
+    case $arg_mode in
+    arg)
+      func_fatal_error "you must specify an argument for -Xcompile"
+      ;;
+    target)
+      func_fatal_error "you must specify a target with '-o'"
+      ;;
+    *)
+      # Get the name of the library object.
+      test -z "$libobj" && {
+	func_basename "$srcfile"
+	libobj=$func_basename_result
+      }
+      ;;
+    esac
+
+    # Recognize several different file suffixes.
+    # If the user specifies -o file.o, it is replaced with file.lo
+    case $libobj in
+    *.[cCFSifmso] | \
+    *.ada | *.adb | *.ads | *.asm | \
+    *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
+    *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
+      func_xform "$libobj"
+      libobj=$func_xform_result
+      ;;
+    esac
+
+    case $libobj in
+    *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;;
+    *)
+      func_fatal_error "cannot determine name of library object from '$libobj'"
+      ;;
+    esac
+
+    func_infer_tag $base_compile
+
+    for arg in $later; do
+      case $arg in
+      -shared)
+	test yes = "$build_libtool_libs" \
+	  || func_fatal_configuration "cannot build a shared library"
+	build_old_libs=no
+	continue
+	;;
+
+      -static)
+	build_libtool_libs=no
+	build_old_libs=yes
+	continue
+	;;
+
+      -prefer-pic)
+	pic_mode=yes
+	continue
+	;;
+
+      -prefer-non-pic)
+	pic_mode=no
+	continue
+	;;
+      esac
+    done
+
+    func_quote_for_eval "$libobj"
+    test "X$libobj" != "X$func_quote_for_eval_result" \
+      && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"'	 &()|`$[]' \
+      && func_warning "libobj name '$libobj' may not contain shell special characters."
+    func_dirname_and_basename "$obj" "/" ""
+    objname=$func_basename_result
+    xdir=$func_dirname_result
+    lobj=$xdir$objdir/$objname
+
+    test -z "$base_compile" && \
+      func_fatal_help "you must specify a compilation command"
+
+    # Delete any leftover library objects.
+    if test yes = "$build_old_libs"; then
+      removelist="$obj $lobj $libobj ${libobj}T"
+    else
+      removelist="$lobj $libobj ${libobj}T"
+    fi
+
+    # On Cygwin there's no "real" PIC flag so we must build both object types
+    case $host_os in
+    cygwin* | mingw* | pw32* | os2* | cegcc*)
+      pic_mode=default
+      ;;
+    esac
+    if test no = "$pic_mode" && test pass_all != "$deplibs_check_method"; then
+      # non-PIC code in shared libraries is not supported
+      pic_mode=default
+    fi
+
+    # Calculate the filename of the output object if compiler does
+    # not support -o with -c
+    if test no = "$compiler_c_o"; then
+      output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.$objext
+      lockfile=$output_obj.lock
+    else
+      output_obj=
+      need_locks=no
+      lockfile=
+    fi
+
+    # Lock this critical section if it is needed
+    # We use this script file to make the link, it avoids creating a new file
+    if test yes = "$need_locks"; then
+      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
+	func_echo "Waiting for $lockfile to be removed"
+	sleep 2
+      done
+    elif test warn = "$need_locks"; then
+      if test -f "$lockfile"; then
+	$ECHO "\
+*** ERROR, $lockfile exists and contains:
+`cat $lockfile 2>/dev/null`
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support '-c' and '-o' together.  If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+	$opt_dry_run || $RM $removelist
+	exit $EXIT_FAILURE
+      fi
+      func_append removelist " $output_obj"
+      $ECHO "$srcfile" > "$lockfile"
+    fi
+
+    $opt_dry_run || $RM $removelist
+    func_append removelist " $lockfile"
+    trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
+
+    func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
+    srcfile=$func_to_tool_file_result
+    func_quote_for_eval "$srcfile"
+    qsrcfile=$func_quote_for_eval_result
+
+    # Only build a PIC object if we are building libtool libraries.
+    if test yes = "$build_libtool_libs"; then
+      # Without this assignment, base_compile gets emptied.
+      fbsd_hideous_sh_bug=$base_compile
+
+      if test no != "$pic_mode"; then
+	command="$base_compile $qsrcfile $pic_flag"
+      else
+	# Don't build PIC code
+	command="$base_compile $qsrcfile"
+      fi
+
+      func_mkdir_p "$xdir$objdir"
+
+      if test -z "$output_obj"; then
+	# Place PIC objects in $objdir
+	func_append command " -o $lobj"
+      fi
+
+      func_show_eval_locale "$command"	\
+          'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE'
+
+      if test warn = "$need_locks" &&
+	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
+	$ECHO "\
+*** ERROR, $lockfile contains:
+`cat $lockfile 2>/dev/null`
+
+but it should contain:
+$srcfile
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support '-c' and '-o' together.  If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+	$opt_dry_run || $RM $removelist
+	exit $EXIT_FAILURE
+      fi
+
+      # Just move the object if needed, then go on to compile the next one
+      if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
+	func_show_eval '$MV "$output_obj" "$lobj"' \
+	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
+      fi
+
+      # Allow error messages only from the first compilation.
+      if test yes = "$suppress_opt"; then
+	suppress_output=' >/dev/null 2>&1'
+      fi
+    fi
+
+    # Only build a position-dependent object if we build old libraries.
+    if test yes = "$build_old_libs"; then
+      if test yes != "$pic_mode"; then
+	# Don't build PIC code
+	command="$base_compile $qsrcfile$pie_flag"
+      else
+	command="$base_compile $qsrcfile $pic_flag"
+      fi
+      if test yes = "$compiler_c_o"; then
+	func_append command " -o $obj"
+      fi
+
+      # Suppress compiler output if we already did a PIC compilation.
+      func_append command "$suppress_output"
+      func_show_eval_locale "$command" \
+        '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
+
+      if test warn = "$need_locks" &&
+	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
+	$ECHO "\
+*** ERROR, $lockfile contains:
+`cat $lockfile 2>/dev/null`
+
+but it should contain:
+$srcfile
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support '-c' and '-o' together.  If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+	$opt_dry_run || $RM $removelist
+	exit $EXIT_FAILURE
+      fi
+
+      # Just move the object if needed
+      if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
+	func_show_eval '$MV "$output_obj" "$obj"' \
+	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
+      fi
+    fi
+
+    $opt_dry_run || {
+      func_write_libtool_object "$libobj" "$objdir/$objname" "$objname"
+
+      # Unlock the critical section if it was locked
+      if test no != "$need_locks"; then
+	removelist=$lockfile
+        $RM "$lockfile"
+      fi
+    }
+
+    exit $EXIT_SUCCESS
+}
+
+$opt_help || {
+  test compile = "$opt_mode" && func_mode_compile ${1+"$@"}
+}
+
+func_mode_help ()
+{
+    # We need to display help for each of the modes.
+    case $opt_mode in
+      "")
+        # Generic help is extracted from the usage comments
+        # at the start of this file.
+        func_help
+        ;;
+
+      clean)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
+
+Remove files from the build directory.
+
+RM is the name of the program to use to delete files associated with each FILE
+(typically '/bin/rm').  RM-OPTIONS are options (such as '-f') to be passed
+to RM.
+
+If FILE is a libtool library, object or program, all the files associated
+with it are deleted. Otherwise, only FILE itself is deleted using RM."
+        ;;
+
+      compile)
+      $ECHO \
+"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
+
+Compile a source file into a libtool library object.
+
+This mode accepts the following additional options:
+
+  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
+  -no-suppress      do not suppress compiler output for multiple passes
+  -prefer-pic       try to build PIC objects only
+  -prefer-non-pic   try to build non-PIC objects only
+  -shared           do not build a '.o' file suitable for static linking
+  -static           only build a '.o' file suitable for static linking
+  -Wc,FLAG          pass FLAG directly to the compiler
+
+COMPILE-COMMAND is a command to be used in creating a 'standard' object file
+from the given SOURCEFILE.
+
+The output file name is determined by removing the directory component from
+SOURCEFILE, then substituting the C source code suffix '.c' with the
+library object suffix, '.lo'."
+        ;;
+
+      execute)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]...
+
+Automatically set library path, then run a program.
+
+This mode accepts the following additional options:
+
+  -dlopen FILE      add the directory containing FILE to the library path
+
+This mode sets the library path environment variable according to '-dlopen'
+flags.
+
+If any of the ARGS are libtool executable wrappers, then they are translated
+into their corresponding uninstalled binary, and any of their required library
+directories are added to the library path.
+
+Then, COMMAND is executed, with ARGS as arguments."
+        ;;
+
+      finish)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=finish [LIBDIR]...
+
+Complete the installation of libtool libraries.
+
+Each LIBDIR is a directory that contains libtool libraries.
+
+The commands that this mode executes may require superuser privileges.  Use
+the '--dry-run' option if you just want to see what would be executed."
+        ;;
+
+      install)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND...
+
+Install executables or libraries.
+
+INSTALL-COMMAND is the installation command.  The first component should be
+either the 'install' or 'cp' program.
+
+The following components of INSTALL-COMMAND are treated specially:
+
+  -inst-prefix-dir PREFIX-DIR  Use PREFIX-DIR as a staging area for installation
+
+The rest of the components are interpreted as arguments to that command (only
+BSD-compatible install options are recognized)."
+        ;;
+
+      link)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=link LINK-COMMAND...
+
+Link object files or libraries together to form another library, or to
+create an executable program.
+
+LINK-COMMAND is a command using the C compiler that you would use to create
+a program from several object files.
+
+The following components of LINK-COMMAND are treated specially:
+
+  -all-static       do not do any dynamic linking at all
+  -avoid-version    do not add a version suffix if possible
+  -bindir BINDIR    specify path to binaries directory (for systems where
+                    libraries must be found in the PATH setting at runtime)
+  -dlopen FILE      '-dlpreopen' FILE if it cannot be dlopened at runtime
+  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
+  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
+  -export-symbols SYMFILE
+                    try to export only the symbols listed in SYMFILE
+  -export-symbols-regex REGEX
+                    try to export only the symbols matching REGEX
+  -LLIBDIR          search LIBDIR for required installed libraries
+  -lNAME            OUTPUT-FILE requires the installed library libNAME
+  -module           build a library that can dlopened
+  -no-fast-install  disable the fast-install mode
+  -no-install       link a not-installable executable
+  -no-undefined     declare that a library does not refer to external symbols
+  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
+  -objectlist FILE  use a list of object files found in FILE to specify objects
+  -os2dllname NAME  force a short DLL name on OS/2 (no effect on other OSes)
+  -precious-files-regex REGEX
+                    don't remove output files matching REGEX
+  -release RELEASE  specify package release information
+  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
+  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
+  -shared           only do dynamic linking of libtool libraries
+  -shrext SUFFIX    override the standard shared library file extension
+  -static           do not do any dynamic linking of uninstalled libtool libraries
+  -static-libtool-libs
+                    do not do any dynamic linking of libtool libraries
+  -version-info CURRENT[:REVISION[:AGE]]
+                    specify library version info [each variable defaults to 0]
+  -weak LIBNAME     declare that the target provides the LIBNAME interface
+  -Wc,FLAG
+  -Xcompiler FLAG   pass linker-specific FLAG directly to the compiler
+  -Wl,FLAG
+  -Xlinker FLAG     pass linker-specific FLAG directly to the linker
+  -XCClinker FLAG   pass link-specific FLAG to the compiler driver (CC)
+
+All other options (arguments beginning with '-') are ignored.
+
+Every other argument is treated as a filename.  Files ending in '.la' are
+treated as uninstalled libtool libraries, other files are standard or library
+object files.
+
+If the OUTPUT-FILE ends in '.la', then a libtool library is created,
+only library objects ('.lo' files) may be specified, and '-rpath' is
+required, except when creating a convenience library.
+
+If OUTPUT-FILE ends in '.a' or '.lib', then a standard library is created
+using 'ar' and 'ranlib', or on Windows using 'lib'.
+
+If OUTPUT-FILE ends in '.lo' or '.$objext', then a reloadable object file
+is created, otherwise an executable program is created."
+        ;;
+
+      uninstall)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
+
+Remove libraries from an installation directory.
+
+RM is the name of the program to use to delete files associated with each FILE
+(typically '/bin/rm').  RM-OPTIONS are options (such as '-f') to be passed
+to RM.
+
+If FILE is a libtool library, all the files associated with it are deleted.
+Otherwise, only FILE itself is deleted using RM."
+        ;;
+
+      *)
+        func_fatal_help "invalid operation mode '$opt_mode'"
+        ;;
+    esac
+
+    echo
+    $ECHO "Try '$progname --help' for more information about other modes."
+}
+
+# Now that we've collected a possible --mode arg, show help if necessary
+if $opt_help; then
+  if test : = "$opt_help"; then
+    func_mode_help
+  else
+    {
+      func_help noexit
+      for opt_mode in compile link execute install finish uninstall clean; do
+	func_mode_help
+      done
+    } | $SED -n '1p; 2,$s/^Usage:/  or: /p'
+    {
+      func_help noexit
+      for opt_mode in compile link execute install finish uninstall clean; do
+	echo
+	func_mode_help
+      done
+    } |
+    $SED '1d
+      /^When reporting/,/^Report/{
+	H
+	d
+      }
+      $x
+      /information about other modes/d
+      /more detailed .*MODE/d
+      s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/'
+  fi
+  exit $?
+fi
+
+
+# func_mode_execute arg...
+func_mode_execute ()
+{
+    $debug_cmd
+
+    # The first argument is the command name.
+    cmd=$nonopt
+    test -z "$cmd" && \
+      func_fatal_help "you must specify a COMMAND"
+
+    # Handle -dlopen flags immediately.
+    for file in $opt_dlopen; do
+      test -f "$file" \
+	|| func_fatal_help "'$file' is not a file"
+
+      dir=
+      case $file in
+      *.la)
+	func_resolve_sysroot "$file"
+	file=$func_resolve_sysroot_result
+
+	# Check to see that this really is a libtool archive.
+	func_lalib_unsafe_p "$file" \
+	  || func_fatal_help "'$lib' is not a valid libtool archive"
+
+	# Read the libtool library.
+	dlname=
+	library_names=
+	func_source "$file"
+
+	# Skip this library if it cannot be dlopened.
+	if test -z "$dlname"; then
+	  # Warn if it was a shared library.
+	  test -n "$library_names" && \
+	    func_warning "'$file' was not linked with '-export-dynamic'"
+	  continue
+	fi
+
+	func_dirname "$file" "" "."
+	dir=$func_dirname_result
+
+	if test -f "$dir/$objdir/$dlname"; then
+	  func_append dir "/$objdir"
+	else
+	  if test ! -f "$dir/$dlname"; then
+	    func_fatal_error "cannot find '$dlname' in '$dir' or '$dir/$objdir'"
+	  fi
+	fi
+	;;
+
+      *.lo)
+	# Just add the directory containing the .lo file.
+	func_dirname "$file" "" "."
+	dir=$func_dirname_result
+	;;
+
+      *)
+	func_warning "'-dlopen' is ignored for non-libtool libraries and objects"
+	continue
+	;;
+      esac
+
+      # Get the absolute pathname.
+      absdir=`cd "$dir" && pwd`
+      test -n "$absdir" && dir=$absdir
+
+      # Now add the directory to shlibpath_var.
+      if eval "test -z \"\$$shlibpath_var\""; then
+	eval "$shlibpath_var=\"\$dir\""
+      else
+	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
+      fi
+    done
+
+    # This variable tells wrapper scripts just to set shlibpath_var
+    # rather than running their programs.
+    libtool_execute_magic=$magic
+
+    # Check if any of the arguments is a wrapper script.
+    args=
+    for file
+    do
+      case $file in
+      -* | *.la | *.lo ) ;;
+      *)
+	# Do a test to see if this is really a libtool program.
+	if func_ltwrapper_script_p "$file"; then
+	  func_source "$file"
+	  # Transform arg to wrapped name.
+	  file=$progdir/$program
+	elif func_ltwrapper_executable_p "$file"; then
+	  func_ltwrapper_scriptname "$file"
+	  func_source "$func_ltwrapper_scriptname_result"
+	  # Transform arg to wrapped name.
+	  file=$progdir/$program
+	fi
+	;;
+      esac
+      # Quote arguments (to preserve shell metacharacters).
+      func_append_quoted args "$file"
+    done
+
+    if $opt_dry_run; then
+      # Display what would be done.
+      if test -n "$shlibpath_var"; then
+	eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
+	echo "export $shlibpath_var"
+      fi
+      $ECHO "$cmd$args"
+      exit $EXIT_SUCCESS
+    else
+      if test -n "$shlibpath_var"; then
+	# Export the shlibpath_var.
+	eval "export $shlibpath_var"
+      fi
+
+      # Restore saved environment variables
+      for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+      do
+	eval "if test \"\${save_$lt_var+set}\" = set; then
+                $lt_var=\$save_$lt_var; export $lt_var
+	      else
+		$lt_unset $lt_var
+	      fi"
+      done
+
+      # Now prepare to actually exec the command.
+      exec_cmd=\$cmd$args
+    fi
+}
+
+test execute = "$opt_mode" && func_mode_execute ${1+"$@"}
+
+
+# func_mode_finish arg...
+func_mode_finish ()
+{
+    $debug_cmd
+
+    libs=
+    libdirs=
+    admincmds=
+
+    for opt in "$nonopt" ${1+"$@"}
+    do
+      if test -d "$opt"; then
+	func_append libdirs " $opt"
+
+      elif test -f "$opt"; then
+	if func_lalib_unsafe_p "$opt"; then
+	  func_append libs " $opt"
+	else
+	  func_warning "'$opt' is not a valid libtool archive"
+	fi
+
+      else
+	func_fatal_error "invalid argument '$opt'"
+      fi
+    done
+
+    if test -n "$libs"; then
+      if test -n "$lt_sysroot"; then
+        sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
+        sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;"
+      else
+        sysroot_cmd=
+      fi
+
+      # Remove sysroot references
+      if $opt_dry_run; then
+        for lib in $libs; do
+          echo "removing references to $lt_sysroot and '=' prefixes from $lib"
+        done
+      else
+        tmpdir=`func_mktempdir`
+        for lib in $libs; do
+	  $SED -e "$sysroot_cmd s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
+	    > $tmpdir/tmp-la
+	  mv -f $tmpdir/tmp-la $lib
+	done
+        ${RM}r "$tmpdir"
+      fi
+    fi
+
+    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+      for libdir in $libdirs; do
+	if test -n "$finish_cmds"; then
+	  # Do each command in the finish commands.
+	  func_execute_cmds "$finish_cmds" 'admincmds="$admincmds
+'"$cmd"'"'
+	fi
+	if test -n "$finish_eval"; then
+	  # Do the single finish_eval.
+	  eval cmds=\"$finish_eval\"
+	  $opt_dry_run || eval "$cmds" || func_append admincmds "
+       $cmds"
+	fi
+      done
+    fi
+
+    # Exit here if they wanted silent mode.
+    $opt_quiet && exit $EXIT_SUCCESS
+
+    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+      echo "----------------------------------------------------------------------"
+      echo "Libraries have been installed in:"
+      for libdir in $libdirs; do
+	$ECHO "   $libdir"
+      done
+      echo
+      echo "If you ever happen to want to link against installed libraries"
+      echo "in a given directory, LIBDIR, you must either use libtool, and"
+      echo "specify the full pathname of the library, or use the '-LLIBDIR'"
+      echo "flag during linking and do at least one of the following:"
+      if test -n "$shlibpath_var"; then
+	echo "   - add LIBDIR to the '$shlibpath_var' environment variable"
+	echo "     during execution"
+      fi
+      if test -n "$runpath_var"; then
+	echo "   - add LIBDIR to the '$runpath_var' environment variable"
+	echo "     during linking"
+      fi
+      if test -n "$hardcode_libdir_flag_spec"; then
+	libdir=LIBDIR
+	eval flag=\"$hardcode_libdir_flag_spec\"
+
+	$ECHO "   - use the '$flag' linker flag"
+      fi
+      if test -n "$admincmds"; then
+	$ECHO "   - have your system administrator run these commands:$admincmds"
+      fi
+      if test -f /etc/ld.so.conf; then
+	echo "   - have your system administrator add LIBDIR to '/etc/ld.so.conf'"
+      fi
+      echo
+
+      echo "See any operating system documentation about shared libraries for"
+      case $host in
+	solaris2.[6789]|solaris2.1[0-9])
+	  echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
+	  echo "pages."
+	  ;;
+	*)
+	  echo "more information, such as the ld(1) and ld.so(8) manual pages."
+	  ;;
+      esac
+      echo "----------------------------------------------------------------------"
+    fi
+    exit $EXIT_SUCCESS
+}
+
+test finish = "$opt_mode" && func_mode_finish ${1+"$@"}
+
+
+# func_mode_install arg...
+func_mode_install ()
+{
+    $debug_cmd
+
+    # There may be an optional sh(1) argument at the beginning of
+    # install_prog (especially on Windows NT).
+    if test "$SHELL" = "$nonopt" || test /bin/sh = "$nonopt" ||
+       # Allow the use of GNU shtool's install command.
+       case $nonopt in *shtool*) :;; *) false;; esac
+    then
+      # Aesthetically quote it.
+      func_quote_for_eval "$nonopt"
+      install_prog="$func_quote_for_eval_result "
+      arg=$1
+      shift
+    else
+      install_prog=
+      arg=$nonopt
+    fi
+
+    # The real first argument should be the name of the installation program.
+    # Aesthetically quote it.
+    func_quote_for_eval "$arg"
+    func_append install_prog "$func_quote_for_eval_result"
+    install_shared_prog=$install_prog
+    case " $install_prog " in
+      *[\\\ /]cp\ *) install_cp=: ;;
+      *) install_cp=false ;;
+    esac
+
+    # We need to accept at least all the BSD install flags.
+    dest=
+    files=
+    opts=
+    prev=
+    install_type=
+    isdir=false
+    stripme=
+    no_mode=:
+    for arg
+    do
+      arg2=
+      if test -n "$dest"; then
+	func_append files " $dest"
+	dest=$arg
+	continue
+      fi
+
+      case $arg in
+      -d) isdir=: ;;
+      -f)
+	if $install_cp; then :; else
+	  prev=$arg
+	fi
+	;;
+      -g | -m | -o)
+	prev=$arg
+	;;
+      -s)
+	stripme=" -s"
+	continue
+	;;
+      -*)
+	;;
+      *)
+	# If the previous option needed an argument, then skip it.
+	if test -n "$prev"; then
+	  if test X-m = "X$prev" && test -n "$install_override_mode"; then
+	    arg2=$install_override_mode
+	    no_mode=false
+	  fi
+	  prev=
+	else
+	  dest=$arg
+	  continue
+	fi
+	;;
+      esac
+
+      # Aesthetically quote the argument.
+      func_quote_for_eval "$arg"
+      func_append install_prog " $func_quote_for_eval_result"
+      if test -n "$arg2"; then
+	func_quote_for_eval "$arg2"
+      fi
+      func_append install_shared_prog " $func_quote_for_eval_result"
+    done
+
+    test -z "$install_prog" && \
+      func_fatal_help "you must specify an install program"
+
+    test -n "$prev" && \
+      func_fatal_help "the '$prev' option requires an argument"
+
+    if test -n "$install_override_mode" && $no_mode; then
+      if $install_cp; then :; else
+	func_quote_for_eval "$install_override_mode"
+	func_append install_shared_prog " -m $func_quote_for_eval_result"
+      fi
+    fi
+
+    if test -z "$files"; then
+      if test -z "$dest"; then
+	func_fatal_help "no file or destination specified"
+      else
+	func_fatal_help "you must specify a destination"
+      fi
+    fi
+
+    # Strip any trailing slash from the destination.
+    func_stripname '' '/' "$dest"
+    dest=$func_stripname_result
+
+    # Check to see that the destination is a directory.
+    test -d "$dest" && isdir=:
+    if $isdir; then
+      destdir=$dest
+      destname=
+    else
+      func_dirname_and_basename "$dest" "" "."
+      destdir=$func_dirname_result
+      destname=$func_basename_result
+
+      # Not a directory, so check to see that there is only one file specified.
+      set dummy $files; shift
+      test "$#" -gt 1 && \
+	func_fatal_help "'$dest' is not a directory"
+    fi
+    case $destdir in
+    [\\/]* | [A-Za-z]:[\\/]*) ;;
+    *)
+      for file in $files; do
+	case $file in
+	*.lo) ;;
+	*)
+	  func_fatal_help "'$destdir' must be an absolute directory name"
+	  ;;
+	esac
+      done
+      ;;
+    esac
+
+    # This variable tells wrapper scripts just to set variables rather
+    # than running their programs.
+    libtool_install_magic=$magic
+
+    staticlibs=
+    future_libdirs=
+    current_libdirs=
+    for file in $files; do
+
+      # Do each installation.
+      case $file in
+      *.$libext)
+	# Do the static libraries later.
+	func_append staticlibs " $file"
+	;;
+
+      *.la)
+	func_resolve_sysroot "$file"
+	file=$func_resolve_sysroot_result
+
+	# Check to see that this really is a libtool archive.
+	func_lalib_unsafe_p "$file" \
+	  || func_fatal_help "'$file' is not a valid libtool archive"
+
+	library_names=
+	old_library=
+	relink_command=
+	func_source "$file"
+
+	# Add the libdir to current_libdirs if it is the destination.
+	if test "X$destdir" = "X$libdir"; then
+	  case "$current_libdirs " in
+	  *" $libdir "*) ;;
+	  *) func_append current_libdirs " $libdir" ;;
+	  esac
+	else
+	  # Note the libdir as a future libdir.
+	  case "$future_libdirs " in
+	  *" $libdir "*) ;;
+	  *) func_append future_libdirs " $libdir" ;;
+	  esac
+	fi
+
+	func_dirname "$file" "/" ""
+	dir=$func_dirname_result
+	func_append dir "$objdir"
+
+	if test -n "$relink_command"; then
+	  # Determine the prefix the user has applied to our future dir.
+	  inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
+
+	  # Don't allow the user to place us outside of our expected
+	  # location b/c this prevents finding dependent libraries that
+	  # are installed to the same prefix.
+	  # At present, this check doesn't affect windows .dll's that
+	  # are installed into $libdir/../bin (currently, that works fine)
+	  # but it's something to keep an eye on.
+	  test "$inst_prefix_dir" = "$destdir" && \
+	    func_fatal_error "error: cannot install '$file' to a directory not ending in $libdir"
+
+	  if test -n "$inst_prefix_dir"; then
+	    # Stick the inst_prefix_dir data into the link command.
+	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+	  else
+	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
+	  fi
+
+	  func_warning "relinking '$file'"
+	  func_show_eval "$relink_command" \
+	    'func_fatal_error "error: relink '\''$file'\'' with the above command before installing it"'
+	fi
+
+	# See the names of the shared library.
+	set dummy $library_names; shift
+	if test -n "$1"; then
+	  realname=$1
+	  shift
+
+	  srcname=$realname
+	  test -n "$relink_command" && srcname=${realname}T
+
+	  # Install the shared library and build the symlinks.
+	  func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
+	      'exit $?'
+	  tstripme=$stripme
+	  case $host_os in
+	  cygwin* | mingw* | pw32* | cegcc*)
+	    case $realname in
+	    *.dll.a)
+	      tstripme=
+	      ;;
+	    esac
+	    ;;
+	  os2*)
+	    case $realname in
+	    *_dll.a)
+	      tstripme=
+	      ;;
+	    esac
+	    ;;
+	  esac
+	  if test -n "$tstripme" && test -n "$striplib"; then
+	    func_show_eval "$striplib $destdir/$realname" 'exit $?'
+	  fi
+
+	  if test "$#" -gt 0; then
+	    # Delete the old symlinks, and create new ones.
+	    # Try 'ln -sf' first, because the 'ln' binary might depend on
+	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
+	    # so we also need to try rm && ln -s.
+	    for linkname
+	    do
+	      test "$linkname" != "$realname" \
+		&& func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })"
+	    done
+	  fi
+
+	  # Do each command in the postinstall commands.
+	  lib=$destdir/$realname
+	  func_execute_cmds "$postinstall_cmds" 'exit $?'
+	fi
+
+	# Install the pseudo-library for information purposes.
+	func_basename "$file"
+	name=$func_basename_result
+	instname=$dir/${name}i
+	func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
+
+	# Maybe install the static library, too.
+	test -n "$old_library" && func_append staticlibs " $dir/$old_library"
+	;;
+
+      *.lo)
+	# Install (i.e. copy) a libtool object.
+
+	# Figure out destination file name, if it wasn't already specified.
+	if test -n "$destname"; then
+	  destfile=$destdir/$destname
+	else
+	  func_basename "$file"
+	  destfile=$func_basename_result
+	  destfile=$destdir/$destfile
+	fi
+
+	# Deduce the name of the destination old-style object file.
+	case $destfile in
+	*.lo)
+	  func_lo2o "$destfile"
+	  staticdest=$func_lo2o_result
+	  ;;
+	*.$objext)
+	  staticdest=$destfile
+	  destfile=
+	  ;;
+	*)
+	  func_fatal_help "cannot copy a libtool object to '$destfile'"
+	  ;;
+	esac
+
+	# Install the libtool object if requested.
+	test -n "$destfile" && \
+	  func_show_eval "$install_prog $file $destfile" 'exit $?'
+
+	# Install the old object if enabled.
+	if test yes = "$build_old_libs"; then
+	  # Deduce the name of the old-style object file.
+	  func_lo2o "$file"
+	  staticobj=$func_lo2o_result
+	  func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?'
+	fi
+	exit $EXIT_SUCCESS
+	;;
+
+      *)
+	# Figure out destination file name, if it wasn't already specified.
+	if test -n "$destname"; then
+	  destfile=$destdir/$destname
+	else
+	  func_basename "$file"
+	  destfile=$func_basename_result
+	  destfile=$destdir/$destfile
+	fi
+
+	# If the file is missing, and there is a .exe on the end, strip it
+	# because it is most likely a libtool script we actually want to
+	# install
+	stripped_ext=
+	case $file in
+	  *.exe)
+	    if test ! -f "$file"; then
+	      func_stripname '' '.exe' "$file"
+	      file=$func_stripname_result
+	      stripped_ext=.exe
+	    fi
+	    ;;
+	esac
+
+	# Do a test to see if this is really a libtool program.
+	case $host in
+	*cygwin* | *mingw*)
+	    if func_ltwrapper_executable_p "$file"; then
+	      func_ltwrapper_scriptname "$file"
+	      wrapper=$func_ltwrapper_scriptname_result
+	    else
+	      func_stripname '' '.exe' "$file"
+	      wrapper=$func_stripname_result
+	    fi
+	    ;;
+	*)
+	    wrapper=$file
+	    ;;
+	esac
+	if func_ltwrapper_script_p "$wrapper"; then
+	  notinst_deplibs=
+	  relink_command=
+
+	  func_source "$wrapper"
+
+	  # Check the variables that should have been set.
+	  test -z "$generated_by_libtool_version" && \
+	    func_fatal_error "invalid libtool wrapper script '$wrapper'"
+
+	  finalize=:
+	  for lib in $notinst_deplibs; do
+	    # Check to see that each library is installed.
+	    libdir=
+	    if test -f "$lib"; then
+	      func_source "$lib"
+	    fi
+	    libfile=$libdir/`$ECHO "$lib" | $SED 's%^.*/%%g'`
+	    if test -n "$libdir" && test ! -f "$libfile"; then
+	      func_warning "'$lib' has not been installed in '$libdir'"
+	      finalize=false
+	    fi
+	  done
+
+	  relink_command=
+	  func_source "$wrapper"
+
+	  outputname=
+	  if test no = "$fast_install" && test -n "$relink_command"; then
+	    $opt_dry_run || {
+	      if $finalize; then
+	        tmpdir=`func_mktempdir`
+		func_basename "$file$stripped_ext"
+		file=$func_basename_result
+	        outputname=$tmpdir/$file
+	        # Replace the output file specification.
+	        relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
+
+	        $opt_quiet || {
+	          func_quote_for_expand "$relink_command"
+		  eval "func_echo $func_quote_for_expand_result"
+	        }
+	        if eval "$relink_command"; then :
+	          else
+		  func_error "error: relink '$file' with the above command before installing it"
+		  $opt_dry_run || ${RM}r "$tmpdir"
+		  continue
+	        fi
+	        file=$outputname
+	      else
+	        func_warning "cannot relink '$file'"
+	      fi
+	    }
+	  else
+	    # Install the binary that we compiled earlier.
+	    file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"`
+	  fi
+	fi
+
+	# remove .exe since cygwin /usr/bin/install will append another
+	# one anyway
+	case $install_prog,$host in
+	*/usr/bin/install*,*cygwin*)
+	  case $file:$destfile in
+	  *.exe:*.exe)
+	    # this is ok
+	    ;;
+	  *.exe:*)
+	    destfile=$destfile.exe
+	    ;;
+	  *:*.exe)
+	    func_stripname '' '.exe' "$destfile"
+	    destfile=$func_stripname_result
+	    ;;
+	  esac
+	  ;;
+	esac
+	func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?'
+	$opt_dry_run || if test -n "$outputname"; then
+	  ${RM}r "$tmpdir"
+	fi
+	;;
+      esac
+    done
+
+    for file in $staticlibs; do
+      func_basename "$file"
+      name=$func_basename_result
+
+      # Set up the ranlib parameters.
+      oldlib=$destdir/$name
+      func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+      tool_oldlib=$func_to_tool_file_result
+
+      func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
+
+      if test -n "$stripme" && test -n "$old_striplib"; then
+	func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
+      fi
+
+      # Do each command in the postinstall commands.
+      func_execute_cmds "$old_postinstall_cmds" 'exit $?'
+    done
+
+    test -n "$future_libdirs" && \
+      func_warning "remember to run '$progname --finish$future_libdirs'"
+
+    if test -n "$current_libdirs"; then
+      # Maybe just do a dry run.
+      $opt_dry_run && current_libdirs=" -n$current_libdirs"
+      exec_cmd='$SHELL "$progpath" $preserve_args --finish$current_libdirs'
+    else
+      exit $EXIT_SUCCESS
+    fi
+}
+
+test install = "$opt_mode" && func_mode_install ${1+"$@"}
+
+
+# func_generate_dlsyms outputname originator pic_p
+# Extract symbols from dlprefiles and create ${outputname}S.o with
+# a dlpreopen symbol table.
+func_generate_dlsyms ()
+{
+    $debug_cmd
+
+    my_outputname=$1
+    my_originator=$2
+    my_pic_p=${3-false}
+    my_prefix=`$ECHO "$my_originator" | $SED 's%[^a-zA-Z0-9]%_%g'`
+    my_dlsyms=
+
+    if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
+      if test -n "$NM" && test -n "$global_symbol_pipe"; then
+	my_dlsyms=${my_outputname}S.c
+      else
+	func_error "not configured to extract global symbols from dlpreopened files"
+      fi
+    fi
+
+    if test -n "$my_dlsyms"; then
+      case $my_dlsyms in
+      "") ;;
+      *.c)
+	# Discover the nlist of each of the dlfiles.
+	nlist=$output_objdir/$my_outputname.nm
+
+	func_show_eval "$RM $nlist ${nlist}S ${nlist}T"
+
+	# Parse the name list into a source file.
+	func_verbose "creating $output_objdir/$my_dlsyms"
+
+	$opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\
+/* $my_dlsyms - symbol resolution table for '$my_outputname' dlsym emulation. */
+/* Generated by $PROGRAM (GNU $PACKAGE) $VERSION */
+
+#ifdef __cplusplus
+extern \"C\" {
+#endif
+
+#if defined __GNUC__ && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
+#pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
+#endif
+
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
+#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
+/* DATA imports from DLLs on WIN32 can't be const, because runtime
+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
+# define LT_DLSYM_CONST
+#elif defined __osf__
+/* This system does not cope well with relocations in const data.  */
+# define LT_DLSYM_CONST
+#else
+# define LT_DLSYM_CONST const
+#endif
+
+#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0)
+
+/* External symbol declarations for the compiler. */\
+"
+
+	if test yes = "$dlself"; then
+	  func_verbose "generating symbol list for '$output'"
+
+	  $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
+
+	  # Add our own program objects to the symbol list.
+	  progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
+	  for progfile in $progfiles; do
+	    func_to_tool_file "$progfile" func_convert_file_msys_to_w32
+	    func_verbose "extracting global C symbols from '$func_to_tool_file_result'"
+	    $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
+	  done
+
+	  if test -n "$exclude_expsyms"; then
+	    $opt_dry_run || {
+	      eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
+	      eval '$MV "$nlist"T "$nlist"'
+	    }
+	  fi
+
+	  if test -n "$export_symbols_regex"; then
+	    $opt_dry_run || {
+	      eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
+	      eval '$MV "$nlist"T "$nlist"'
+	    }
+	  fi
+
+	  # Prepare the list of exported symbols
+	  if test -z "$export_symbols"; then
+	    export_symbols=$output_objdir/$outputname.exp
+	    $opt_dry_run || {
+	      $RM $export_symbols
+	      eval "$SED -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+	      case $host in
+	      *cygwin* | *mingw* | *cegcc* )
+                eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+                eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
+	        ;;
+	      esac
+	    }
+	  else
+	    $opt_dry_run || {
+	      eval "$SED -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
+	      eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
+	      eval '$MV "$nlist"T "$nlist"'
+	      case $host in
+	        *cygwin* | *mingw* | *cegcc* )
+	          eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+	          eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
+	          ;;
+	      esac
+	    }
+	  fi
+	fi
+
+	for dlprefile in $dlprefiles; do
+	  func_verbose "extracting global C symbols from '$dlprefile'"
+	  func_basename "$dlprefile"
+	  name=$func_basename_result
+          case $host in
+	    *cygwin* | *mingw* | *cegcc* )
+	      # if an import library, we need to obtain dlname
+	      if func_win32_import_lib_p "$dlprefile"; then
+	        func_tr_sh "$dlprefile"
+	        eval "curr_lafile=\$libfile_$func_tr_sh_result"
+	        dlprefile_dlbasename=
+	        if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
+	          # Use subshell, to avoid clobbering current variable values
+	          dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
+	          if test -n "$dlprefile_dlname"; then
+	            func_basename "$dlprefile_dlname"
+	            dlprefile_dlbasename=$func_basename_result
+	          else
+	            # no lafile. user explicitly requested -dlpreopen <import library>.
+	            $sharedlib_from_linklib_cmd "$dlprefile"
+	            dlprefile_dlbasename=$sharedlib_from_linklib_result
+	          fi
+	        fi
+	        $opt_dry_run || {
+	          if test -n "$dlprefile_dlbasename"; then
+	            eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
+	          else
+	            func_warning "Could not compute DLL name from $name"
+	            eval '$ECHO ": $name " >> "$nlist"'
+	          fi
+	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
+	            $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
+	        }
+	      else # not an import lib
+	        $opt_dry_run || {
+	          eval '$ECHO ": $name " >> "$nlist"'
+	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
+	        }
+	      fi
+	    ;;
+	    *)
+	      $opt_dry_run || {
+	        eval '$ECHO ": $name " >> "$nlist"'
+	        func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+	        eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
+	      }
+	    ;;
+          esac
+	done
+
+	$opt_dry_run || {
+	  # Make sure we have at least an empty file.
+	  test -f "$nlist" || : > "$nlist"
+
+	  if test -n "$exclude_expsyms"; then
+	    $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
+	    $MV "$nlist"T "$nlist"
+	  fi
+
+	  # Try sorting and uniquifying the output.
+	  if $GREP -v "^: " < "$nlist" |
+	      if sort -k 3 </dev/null >/dev/null 2>&1; then
+		sort -k 3
+	      else
+		sort +2
+	      fi |
+	      uniq > "$nlist"S; then
+	    :
+	  else
+	    $GREP -v "^: " < "$nlist" > "$nlist"S
+	  fi
+
+	  if test -f "$nlist"S; then
+	    eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
+	  else
+	    echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
+	  fi
+
+	  func_show_eval '$RM "${nlist}I"'
+	  if test -n "$global_symbol_to_import"; then
+	    eval "$global_symbol_to_import"' < "$nlist"S > "$nlist"I'
+	  fi
+
+	  echo >> "$output_objdir/$my_dlsyms" "\
+
+/* The mapping between symbol names and symbols.  */
+typedef struct {
+  const char *name;
+  void *address;
+} lt_dlsymlist;
+extern LT_DLSYM_CONST lt_dlsymlist
+lt_${my_prefix}_LTX_preloaded_symbols[];\
+"
+
+	  if test -s "$nlist"I; then
+	    echo >> "$output_objdir/$my_dlsyms" "\
+static void lt_syminit(void)
+{
+  LT_DLSYM_CONST lt_dlsymlist *symbol = lt_${my_prefix}_LTX_preloaded_symbols;
+  for (; symbol->name; ++symbol)
+    {"
+	    $SED 's/.*/      if (STREQ (symbol->name, \"&\")) symbol->address = (void *) \&&;/' < "$nlist"I >> "$output_objdir/$my_dlsyms"
+	    echo >> "$output_objdir/$my_dlsyms" "\
+    }
+}"
+	  fi
+	  echo >> "$output_objdir/$my_dlsyms" "\
+LT_DLSYM_CONST lt_dlsymlist
+lt_${my_prefix}_LTX_preloaded_symbols[] =
+{ {\"$my_originator\", (void *) 0},"
+
+	  if test -s "$nlist"I; then
+	    echo >> "$output_objdir/$my_dlsyms" "\
+  {\"@INIT@\", (void *) &lt_syminit},"
+	  fi
+
+	  case $need_lib_prefix in
+	  no)
+	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms"
+	    ;;
+	  *)
+	    eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
+	    ;;
+	  esac
+	  echo >> "$output_objdir/$my_dlsyms" "\
+  {0, (void *) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt_${my_prefix}_LTX_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif\
+"
+	} # !$opt_dry_run
+
+	pic_flag_for_symtable=
+	case "$compile_command " in
+	*" -static "*) ;;
+	*)
+	  case $host in
+	  # compiling the symbol table file with pic_flag works around
+	  # a FreeBSD bug that causes programs to crash when -lm is
+	  # linked before any other PIC object.  But we must not use
+	  # pic_flag when linking with -static.  The problem exists in
+	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
+	  *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+	    pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
+	  *-*-hpux*)
+	    pic_flag_for_symtable=" $pic_flag"  ;;
+	  *)
+	    $my_pic_p && pic_flag_for_symtable=" $pic_flag"
+	    ;;
+	  esac
+	  ;;
+	esac
+	symtab_cflags=
+	for arg in $LTCFLAGS; do
+	  case $arg in
+	  -pie | -fpie | -fPIE) ;;
+	  *) func_append symtab_cflags " $arg" ;;
+	  esac
+	done
+
+	# Now compile the dynamic symbol file.
+	func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?'
+
+	# Clean up the generated files.
+	func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T" "${nlist}I"'
+
+	# Transform the symbol file into the correct name.
+	symfileobj=$output_objdir/${my_outputname}S.$objext
+	case $host in
+	*cygwin* | *mingw* | *cegcc* )
+	  if test -f "$output_objdir/$my_outputname.def"; then
+	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+	  else
+	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+	  fi
+	  ;;
+	*)
+	  compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+	  finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+	  ;;
+	esac
+	;;
+      *)
+	func_fatal_error "unknown suffix for '$my_dlsyms'"
+	;;
+      esac
+    else
+      # We keep going just in case the user didn't refer to
+      # lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
+      # really was required.
+
+      # Nullify the symbol file.
+      compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"`
+      finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"`
+    fi
+}
+
+# func_cygming_gnu_implib_p ARG
+# This predicate returns with zero status (TRUE) if
+# ARG is a GNU/binutils-style import library. Returns
+# with nonzero status (FALSE) otherwise.
+func_cygming_gnu_implib_p ()
+{
+  $debug_cmd
+
+  func_to_tool_file "$1" func_convert_file_msys_to_w32
+  func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
+  test -n "$func_cygming_gnu_implib_tmp"
+}
+
+# func_cygming_ms_implib_p ARG
+# This predicate returns with zero status (TRUE) if
+# ARG is an MS-style import library. Returns
+# with nonzero status (FALSE) otherwise.
+func_cygming_ms_implib_p ()
+{
+  $debug_cmd
+
+  func_to_tool_file "$1" func_convert_file_msys_to_w32
+  func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
+  test -n "$func_cygming_ms_implib_tmp"
+}
+
+# func_win32_libid arg
+# return the library type of file 'arg'
+#
+# Need a lot of goo to handle *both* DLLs and import libs
+# Has to be a shell function in order to 'eat' the argument
+# that is supplied when $file_magic_command is called.
+# Despite the name, also deal with 64 bit binaries.
+func_win32_libid ()
+{
+  $debug_cmd
+
+  win32_libid_type=unknown
+  win32_fileres=`file -L $1 2>/dev/null`
+  case $win32_fileres in
+  *ar\ archive\ import\ library*) # definitely import
+    win32_libid_type="x86 archive import"
+    ;;
+  *ar\ archive*) # could be an import, or static
+    # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
+    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
+       $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
+      case $nm_interface in
+      "MS dumpbin")
+	if func_cygming_ms_implib_p "$1" ||
+	   func_cygming_gnu_implib_p "$1"
+	then
+	  win32_nmres=import
+	else
+	  win32_nmres=
+	fi
+	;;
+      *)
+	func_to_tool_file "$1" func_convert_file_msys_to_w32
+	win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
+	  $SED -n -e '
+	    1,100{
+		/ I /{
+		    s|.*|import|
+		    p
+		    q
+		}
+	    }'`
+	;;
+      esac
+      case $win32_nmres in
+      import*)  win32_libid_type="x86 archive import";;
+      *)        win32_libid_type="x86 archive static";;
+      esac
+    fi
+    ;;
+  *DLL*)
+    win32_libid_type="x86 DLL"
+    ;;
+  *executable*) # but shell scripts are "executable" too...
+    case $win32_fileres in
+    *MS\ Windows\ PE\ Intel*)
+      win32_libid_type="x86 DLL"
+      ;;
+    esac
+    ;;
+  esac
+  $ECHO "$win32_libid_type"
+}
+
+# func_cygming_dll_for_implib ARG
+#
+# Platform-specific function to extract the
+# name of the DLL associated with the specified
+# import library ARG.
+# Invoked by eval'ing the libtool variable
+#    $sharedlib_from_linklib_cmd
+# Result is available in the variable
+#    $sharedlib_from_linklib_result
+func_cygming_dll_for_implib ()
+{
+  $debug_cmd
+
+  sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
+}
+
+# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs
+#
+# The is the core of a fallback implementation of a
+# platform-specific function to extract the name of the
+# DLL associated with the specified import library LIBNAME.
+#
+# SECTION_NAME is either .idata$6 or .idata$7, depending
+# on the platform and compiler that created the implib.
+#
+# Echos the name of the DLL associated with the
+# specified import library.
+func_cygming_dll_for_implib_fallback_core ()
+{
+  $debug_cmd
+
+  match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
+  $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
+    $SED '/^Contents of section '"$match_literal"':/{
+      # Place marker at beginning of archive member dllname section
+      s/.*/====MARK====/
+      p
+      d
+    }
+    # These lines can sometimes be longer than 43 characters, but
+    # are always uninteresting
+    /:[	 ]*file format pe[i]\{,1\}-/d
+    /^In archive [^:]*:/d
+    # Ensure marker is printed
+    /^====MARK====/p
+    # Remove all lines with less than 43 characters
+    /^.\{43\}/!d
+    # From remaining lines, remove first 43 characters
+    s/^.\{43\}//' |
+    $SED -n '
+      # Join marker and all lines until next marker into a single line
+      /^====MARK====/ b para
+      H
+      $ b para
+      b
+      :para
+      x
+      s/\n//g
+      # Remove the marker
+      s/^====MARK====//
+      # Remove trailing dots and whitespace
+      s/[\. \t]*$//
+      # Print
+      /./p' |
+    # we now have a list, one entry per line, of the stringified
+    # contents of the appropriate section of all members of the
+    # archive that possess that section. Heuristic: eliminate
+    # all those that have a first or second character that is
+    # a '.' (that is, objdump's representation of an unprintable
+    # character.) This should work for all archives with less than
+    # 0x302f exports -- but will fail for DLLs whose name actually
+    # begins with a literal '.' or a single character followed by
+    # a '.'.
+    #
+    # Of those that remain, print the first one.
+    $SED -e '/^\./d;/^.\./d;q'
+}
+
+# func_cygming_dll_for_implib_fallback ARG
+# Platform-specific function to extract the
+# name of the DLL associated with the specified
+# import library ARG.
+#
+# This fallback implementation is for use when $DLLTOOL
+# does not support the --identify-strict option.
+# Invoked by eval'ing the libtool variable
+#    $sharedlib_from_linklib_cmd
+# Result is available in the variable
+#    $sharedlib_from_linklib_result
+func_cygming_dll_for_implib_fallback ()
+{
+  $debug_cmd
+
+  if func_cygming_gnu_implib_p "$1"; then
+    # binutils import library
+    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
+  elif func_cygming_ms_implib_p "$1"; then
+    # ms-generated import library
+    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
+  else
+    # unknown
+    sharedlib_from_linklib_result=
+  fi
+}
+
+
+# func_extract_an_archive dir oldlib
+func_extract_an_archive ()
+{
+    $debug_cmd
+
+    f_ex_an_ar_dir=$1; shift
+    f_ex_an_ar_oldlib=$1
+    if test yes = "$lock_old_archive_extraction"; then
+      lockfile=$f_ex_an_ar_oldlib.lock
+      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
+	func_echo "Waiting for $lockfile to be removed"
+	sleep 2
+      done
+    fi
+    func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \
+		   'stat=$?; rm -f "$lockfile"; exit $stat'
+    if test yes = "$lock_old_archive_extraction"; then
+      $opt_dry_run || rm -f "$lockfile"
+    fi
+    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
+     :
+    else
+      func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib"
+    fi
+}
+
+
+# func_extract_archives gentop oldlib ...
+func_extract_archives ()
+{
+    $debug_cmd
+
+    my_gentop=$1; shift
+    my_oldlibs=${1+"$@"}
+    my_oldobjs=
+    my_xlib=
+    my_xabs=
+    my_xdir=
+
+    for my_xlib in $my_oldlibs; do
+      # Extract the objects.
+      case $my_xlib in
+	[\\/]* | [A-Za-z]:[\\/]*) my_xabs=$my_xlib ;;
+	*) my_xabs=`pwd`"/$my_xlib" ;;
+      esac
+      func_basename "$my_xlib"
+      my_xlib=$func_basename_result
+      my_xlib_u=$my_xlib
+      while :; do
+        case " $extracted_archives " in
+	*" $my_xlib_u "*)
+	  func_arith $extracted_serial + 1
+	  extracted_serial=$func_arith_result
+	  my_xlib_u=lt$extracted_serial-$my_xlib ;;
+	*) break ;;
+	esac
+      done
+      extracted_archives="$extracted_archives $my_xlib_u"
+      my_xdir=$my_gentop/$my_xlib_u
+
+      func_mkdir_p "$my_xdir"
+
+      case $host in
+      *-darwin*)
+	func_verbose "Extracting $my_xabs"
+	# Do not bother doing anything if just a dry run
+	$opt_dry_run || {
+	  darwin_orig_dir=`pwd`
+	  cd $my_xdir || exit $?
+	  darwin_archive=$my_xabs
+	  darwin_curdir=`pwd`
+	  func_basename "$darwin_archive"
+	  darwin_base_archive=$func_basename_result
+	  darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true`
+	  if test -n "$darwin_arches"; then
+	    darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'`
+	    darwin_arch=
+	    func_verbose "$darwin_base_archive has multiple architectures $darwin_arches"
+	    for darwin_arch in  $darwin_arches; do
+	      func_mkdir_p "unfat-$$/$darwin_base_archive-$darwin_arch"
+	      $LIPO -thin $darwin_arch -output "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive" "$darwin_archive"
+	      cd "unfat-$$/$darwin_base_archive-$darwin_arch"
+	      func_extract_an_archive "`pwd`" "$darwin_base_archive"
+	      cd "$darwin_curdir"
+	      $RM "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive"
+	    done # $darwin_arches
+            ## Okay now we've a bunch of thin objects, gotta fatten them up :)
+	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$sed_basename" | sort -u`
+	    darwin_file=
+	    darwin_files=
+	    for darwin_file in $darwin_filelist; do
+	      darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
+	      $LIPO -create -output "$darwin_file" $darwin_files
+	    done # $darwin_filelist
+	    $RM -rf unfat-$$
+	    cd "$darwin_orig_dir"
+	  else
+	    cd $darwin_orig_dir
+	    func_extract_an_archive "$my_xdir" "$my_xabs"
+	  fi # $darwin_arches
+	} # !$opt_dry_run
+	;;
+      *)
+        func_extract_an_archive "$my_xdir" "$my_xabs"
+	;;
+      esac
+      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
+    done
+
+    func_extract_archives_result=$my_oldobjs
+}
+
+
+# func_emit_wrapper [arg=no]
+#
+# Emit a libtool wrapper script on stdout.
+# Don't directly open a file because we may want to
+# incorporate the script contents within a cygwin/mingw
+# wrapper executable.  Must ONLY be called from within
+# func_mode_link because it depends on a number of variables
+# set therein.
+#
+# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
+# variable will take.  If 'yes', then the emitted script
+# will assume that the directory where it is stored is
+# the $objdir directory.  This is a cygwin/mingw-specific
+# behavior.
+func_emit_wrapper ()
+{
+	func_emit_wrapper_arg1=${1-no}
+
+	$ECHO "\
+#! $SHELL
+
+# $output - temporary wrapper script for $objdir/$outputname
+# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
+#
+# The $output program cannot be directly executed until all the libtool
+# libraries that it depends on are installed.
+#
+# This wrapper script should never be moved out of the build directory.
+# If it is, it will not operate correctly.
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+sed_quote_subst='$sed_quote_subst'
+
+# Be Bourne compatible
+if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs 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
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+relink_command=\"$relink_command\"
+
+# This environment variable determines our operation mode.
+if test \"\$libtool_install_magic\" = \"$magic\"; then
+  # install mode needs the following variables:
+  generated_by_libtool_version='$macro_version'
+  notinst_deplibs='$notinst_deplibs'
+else
+  # When we are sourced in execute mode, \$file and \$ECHO are already set.
+  if test \"\$libtool_execute_magic\" != \"$magic\"; then
+    file=\"\$0\""
+
+    qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"`
+    $ECHO "\
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$1
+_LTECHO_EOF'
+}
+    ECHO=\"$qECHO\"
+  fi
+
+# Very basic option parsing. These options are (a) specific to
+# the libtool wrapper, (b) are identical between the wrapper
+# /script/ and the wrapper /executable/ that is used only on
+# windows platforms, and (c) all begin with the string "--lt-"
+# (application programs are unlikely to have options that match
+# this pattern).
+#
+# There are only two supported options: --lt-debug and
+# --lt-dump-script. There is, deliberately, no --lt-help.
+#
+# The first argument to this parsing function should be the
+# script's $0 value, followed by "$@".
+lt_option_debug=
+func_parse_lt_options ()
+{
+  lt_script_arg0=\$0
+  shift
+  for lt_opt
+  do
+    case \"\$lt_opt\" in
+    --lt-debug) lt_option_debug=1 ;;
+    --lt-dump-script)
+        lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\`
+        test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.
+        lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`
+        cat \"\$lt_dump_D/\$lt_dump_F\"
+        exit 0
+      ;;
+    --lt-*)
+        \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
+        exit 1
+      ;;
+    esac
+  done
+
+  # Print the debug banner immediately:
+  if test -n \"\$lt_option_debug\"; then
+    echo \"$outputname:$output:\$LINENO: libtool wrapper (GNU $PACKAGE) $VERSION\" 1>&2
+  fi
+}
+
+# Used when --lt-debug. Prints its arguments to stdout
+# (redirection is the responsibility of the caller)
+func_lt_dump_args ()
+{
+  lt_dump_args_N=1;
+  for lt_arg
+  do
+    \$ECHO \"$outputname:$output:\$LINENO: newargv[\$lt_dump_args_N]: \$lt_arg\"
+    lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
+  done
+}
+
+# Core function for launching the target application
+func_exec_program_core ()
+{
+"
+  case $host in
+  # Backslashes separate directories on plain windows
+  *-*-mingw | *-*-os2* | *-cegcc*)
+    $ECHO "\
+      if test -n \"\$lt_option_debug\"; then
+        \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir\\\\\$program\" 1>&2
+        func_lt_dump_args \${1+\"\$@\"} 1>&2
+      fi
+      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
+"
+    ;;
+
+  *)
+    $ECHO "\
+      if test -n \"\$lt_option_debug\"; then
+        \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir/\$program\" 1>&2
+        func_lt_dump_args \${1+\"\$@\"} 1>&2
+      fi
+      exec \"\$progdir/\$program\" \${1+\"\$@\"}
+"
+    ;;
+  esac
+  $ECHO "\
+      \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
+      exit 1
+}
+
+# A function to encapsulate launching the target application
+# Strips options in the --lt-* namespace from \$@ and
+# launches target application with the remaining arguments.
+func_exec_program ()
+{
+  case \" \$* \" in
+  *\\ --lt-*)
+    for lt_wr_arg
+    do
+      case \$lt_wr_arg in
+      --lt-*) ;;
+      *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
+      esac
+      shift
+    done ;;
+  esac
+  func_exec_program_core \${1+\"\$@\"}
+}
+
+  # Parse options
+  func_parse_lt_options \"\$0\" \${1+\"\$@\"}
+
+  # Find the directory that this script lives in.
+  thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
+  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
+
+  # Follow symbolic links until we get to the real thisdir.
+  file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\`
+  while test -n \"\$file\"; do
+    destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\`
+
+    # If there was a directory component, then change thisdir.
+    if test \"x\$destdir\" != \"x\$file\"; then
+      case \"\$destdir\" in
+      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
+      *) thisdir=\"\$thisdir/\$destdir\" ;;
+      esac
+    fi
+
+    file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\`
+    file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\`
+  done
+
+  # Usually 'no', except on cygwin/mingw when embedded into
+  # the cwrapper.
+  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1
+  if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
+    # special case for '.'
+    if test \"\$thisdir\" = \".\"; then
+      thisdir=\`pwd\`
+    fi
+    # remove .libs from thisdir
+    case \"\$thisdir\" in
+    *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;;
+    $objdir )   thisdir=. ;;
+    esac
+  fi
+
+  # Try to get the absolute directory name.
+  absdir=\`cd \"\$thisdir\" && pwd\`
+  test -n \"\$absdir\" && thisdir=\"\$absdir\"
+"
+
+	if test yes = "$fast_install"; then
+	  $ECHO "\
+  program=lt-'$outputname'$exeext
+  progdir=\"\$thisdir/$objdir\"
+
+  if test ! -f \"\$progdir/\$program\" ||
+     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | $SED 1q\`; \\
+       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
+
+    file=\"\$\$-\$program\"
+
+    if test ! -d \"\$progdir\"; then
+      $MKDIR \"\$progdir\"
+    else
+      $RM \"\$progdir/\$file\"
+    fi"
+
+	  $ECHO "\
+
+    # relink executable if necessary
+    if test -n \"\$relink_command\"; then
+      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
+      else
+	\$ECHO \"\$relink_command_output\" >&2
+	$RM \"\$progdir/\$file\"
+	exit 1
+      fi
+    fi
+
+    $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
+    { $RM \"\$progdir/\$program\";
+      $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; }
+    $RM \"\$progdir/\$file\"
+  fi"
+	else
+	  $ECHO "\
+  program='$outputname'
+  progdir=\"\$thisdir/$objdir\"
+"
+	fi
+
+	$ECHO "\
+
+  if test -f \"\$progdir/\$program\"; then"
+
+	# fixup the dll searchpath if we need to.
+	#
+	# Fix the DLL searchpath if we need to.  Do this before prepending
+	# to shlibpath, because on Windows, both are PATH and uninstalled
+	# libraries must come first.
+	if test -n "$dllsearchpath"; then
+	  $ECHO "\
+    # Add the dll search path components to the executable PATH
+    PATH=$dllsearchpath:\$PATH
+"
+	fi
+
+	# Export our shlibpath_var if we have one.
+	if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+	  $ECHO "\
+    # Add our own library path to $shlibpath_var
+    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
+
+    # Some systems cannot cope with colon-terminated $shlibpath_var
+    # The second colon is a workaround for a bug in BeOS R4 sed
+    $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\`
+
+    export $shlibpath_var
+"
+	fi
+
+	$ECHO "\
+    if test \"\$libtool_execute_magic\" != \"$magic\"; then
+      # Run the actual program with our arguments.
+      func_exec_program \${1+\"\$@\"}
+    fi
+  else
+    # The program doesn't exist.
+    \$ECHO \"\$0: error: '\$progdir/\$program' does not exist\" 1>&2
+    \$ECHO \"This script is just a wrapper for \$program.\" 1>&2
+    \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
+    exit 1
+  fi
+fi\
+"
+}
+
+
+# func_emit_cwrapperexe_src
+# emit the source code for a wrapper executable on stdout
+# Must ONLY be called from within func_mode_link because
+# it depends on a number of variable set therein.
+func_emit_cwrapperexe_src ()
+{
+	cat <<EOF
+
+/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
+   Generated by $PROGRAM (GNU $PACKAGE) $VERSION
+
+   The $output program cannot be directly executed until all the libtool
+   libraries that it depends on are installed.
+
+   This wrapper executable should never be moved out of the build directory.
+   If it is, it will not operate correctly.
+*/
+EOF
+	    cat <<"EOF"
+#ifdef _MSC_VER
+# define _CRT_SECURE_NO_DEPRECATE 1
+#endif
+#include <stdio.h>
+#include <stdlib.h>
+#ifdef _MSC_VER
+# include <direct.h>
+# include <process.h>
+# include <io.h>
+#else
+# include <unistd.h>
+# include <stdint.h>
+# ifdef __CYGWIN__
+#  include <io.h>
+# endif
+#endif
+#include <malloc.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <string.h>
+#include <ctype.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+
+#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0)
+
+/* declarations of non-ANSI functions */
+#if defined __MINGW32__
+# ifdef __STRICT_ANSI__
+int _putenv (const char *);
+# endif
+#elif defined __CYGWIN__
+# ifdef __STRICT_ANSI__
+char *realpath (const char *, char *);
+int putenv (char *);
+int setenv (const char *, const char *, int);
+# endif
+/* #elif defined other_platform || defined ... */
+#endif
+
+/* portability defines, excluding path handling macros */
+#if defined _MSC_VER
+# define setmode _setmode
+# define stat    _stat
+# define chmod   _chmod
+# define getcwd  _getcwd
+# define putenv  _putenv
+# define S_IXUSR _S_IEXEC
+#elif defined __MINGW32__
+# define setmode _setmode
+# define stat    _stat
+# define chmod   _chmod
+# define getcwd  _getcwd
+# define putenv  _putenv
+#elif defined __CYGWIN__
+# define HAVE_SETENV
+# define FOPEN_WB "wb"
+/* #elif defined other platforms ... */
+#endif
+
+#if defined PATH_MAX
+# define LT_PATHMAX PATH_MAX
+#elif defined MAXPATHLEN
+# define LT_PATHMAX MAXPATHLEN
+#else
+# define LT_PATHMAX 1024
+#endif
+
+#ifndef S_IXOTH
+# define S_IXOTH 0
+#endif
+#ifndef S_IXGRP
+# define S_IXGRP 0
+#endif
+
+/* path handling portability macros */
+#ifndef DIR_SEPARATOR
+# define DIR_SEPARATOR '/'
+# define PATH_SEPARATOR ':'
+#endif
+
+#if defined _WIN32 || defined __MSDOS__ || defined __DJGPP__ || \
+  defined __OS2__
+# define HAVE_DOS_BASED_FILE_SYSTEM
+# define FOPEN_WB "wb"
+# ifndef DIR_SEPARATOR_2
+#  define DIR_SEPARATOR_2 '\\'
+# endif
+# ifndef PATH_SEPARATOR_2
+#  define PATH_SEPARATOR_2 ';'
+# endif
+#endif
+
+#ifndef DIR_SEPARATOR_2
+# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
+#else /* DIR_SEPARATOR_2 */
+# define IS_DIR_SEPARATOR(ch) \
+	(((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
+#endif /* DIR_SEPARATOR_2 */
+
+#ifndef PATH_SEPARATOR_2
+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
+#else /* PATH_SEPARATOR_2 */
+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
+#endif /* PATH_SEPARATOR_2 */
+
+#ifndef FOPEN_WB
+# define FOPEN_WB "w"
+#endif
+#ifndef _O_BINARY
+# define _O_BINARY 0
+#endif
+
+#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
+#define XFREE(stale) do { \
+  if (stale) { free (stale); stale = 0; } \
+} while (0)
+
+#if defined LT_DEBUGWRAPPER
+static int lt_debug = 1;
+#else
+static int lt_debug = 0;
+#endif
+
+const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
+
+void *xmalloc (size_t num);
+char *xstrdup (const char *string);
+const char *base_name (const char *name);
+char *find_executable (const char *wrapper);
+char *chase_symlinks (const char *pathspec);
+int make_executable (const char *path);
+int check_executable (const char *path);
+char *strendzap (char *str, const char *pat);
+void lt_debugprintf (const char *file, int line, const char *fmt, ...);
+void lt_fatal (const char *file, int line, const char *message, ...);
+static const char *nonnull (const char *s);
+static const char *nonempty (const char *s);
+void lt_setenv (const char *name, const char *value);
+char *lt_extend_str (const char *orig_value, const char *add, int to_end);
+void lt_update_exe_path (const char *name, const char *value);
+void lt_update_lib_path (const char *name, const char *value);
+char **prepare_spawn (char **argv);
+void lt_dump_script (FILE *f);
+EOF
+
+	    cat <<EOF
+#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 5)
+# define externally_visible volatile
+#else
+# define externally_visible __attribute__((externally_visible)) volatile
+#endif
+externally_visible const char * MAGIC_EXE = "$magic_exe";
+const char * LIB_PATH_VARNAME = "$shlibpath_var";
+EOF
+
+	    if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+              func_to_host_path "$temp_rpath"
+	      cat <<EOF
+const char * LIB_PATH_VALUE   = "$func_to_host_path_result";
+EOF
+	    else
+	      cat <<"EOF"
+const char * LIB_PATH_VALUE   = "";
+EOF
+	    fi
+
+	    if test -n "$dllsearchpath"; then
+              func_to_host_path "$dllsearchpath:"
+	      cat <<EOF
+const char * EXE_PATH_VARNAME = "PATH";
+const char * EXE_PATH_VALUE   = "$func_to_host_path_result";
+EOF
+	    else
+	      cat <<"EOF"
+const char * EXE_PATH_VARNAME = "";
+const char * EXE_PATH_VALUE   = "";
+EOF
+	    fi
+
+	    if test yes = "$fast_install"; then
+	      cat <<EOF
+const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */
+EOF
+	    else
+	      cat <<EOF
+const char * TARGET_PROGRAM_NAME = "$outputname"; /* hopefully, no .exe */
+EOF
+	    fi
+
+
+	    cat <<"EOF"
+
+#define LTWRAPPER_OPTION_PREFIX         "--lt-"
+
+static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
+static const char *dumpscript_opt       = LTWRAPPER_OPTION_PREFIX "dump-script";
+static const char *debug_opt            = LTWRAPPER_OPTION_PREFIX "debug";
+
+int
+main (int argc, char *argv[])
+{
+  char **newargz;
+  int  newargc;
+  char *tmp_pathspec;
+  char *actual_cwrapper_path;
+  char *actual_cwrapper_name;
+  char *target_name;
+  char *lt_argv_zero;
+  int rval = 127;
+
+  int i;
+
+  program_name = (char *) xstrdup (base_name (argv[0]));
+  newargz = XMALLOC (char *, (size_t) argc + 1);
+
+  /* very simple arg parsing; don't want to rely on getopt
+   * also, copy all non cwrapper options to newargz, except
+   * argz[0], which is handled differently
+   */
+  newargc=0;
+  for (i = 1; i < argc; i++)
+    {
+      if (STREQ (argv[i], dumpscript_opt))
+	{
+EOF
+	    case $host in
+	      *mingw* | *cygwin* )
+		# make stdout use "unix" line endings
+		echo "          setmode(1,_O_BINARY);"
+		;;
+	      esac
+
+	    cat <<"EOF"
+	  lt_dump_script (stdout);
+	  return 0;
+	}
+      if (STREQ (argv[i], debug_opt))
+	{
+          lt_debug = 1;
+          continue;
+	}
+      if (STREQ (argv[i], ltwrapper_option_prefix))
+        {
+          /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
+             namespace, but it is not one of the ones we know about and
+             have already dealt with, above (inluding dump-script), then
+             report an error. Otherwise, targets might begin to believe
+             they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
+             namespace. The first time any user complains about this, we'll
+             need to make LTWRAPPER_OPTION_PREFIX a configure-time option
+             or a configure.ac-settable value.
+           */
+          lt_fatal (__FILE__, __LINE__,
+		    "unrecognized %s option: '%s'",
+                    ltwrapper_option_prefix, argv[i]);
+        }
+      /* otherwise ... */
+      newargz[++newargc] = xstrdup (argv[i]);
+    }
+  newargz[++newargc] = NULL;
+
+EOF
+	    cat <<EOF
+  /* The GNU banner must be the first non-error debug message */
+  lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE) $VERSION\n");
+EOF
+	    cat <<"EOF"
+  lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
+  lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);
+
+  tmp_pathspec = find_executable (argv[0]);
+  if (tmp_pathspec == NULL)
+    lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]);
+  lt_debugprintf (__FILE__, __LINE__,
+                  "(main) found exe (before symlink chase) at: %s\n",
+		  tmp_pathspec);
+
+  actual_cwrapper_path = chase_symlinks (tmp_pathspec);
+  lt_debugprintf (__FILE__, __LINE__,
+                  "(main) found exe (after symlink chase) at: %s\n",
+		  actual_cwrapper_path);
+  XFREE (tmp_pathspec);
+
+  actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));
+  strendzap (actual_cwrapper_path, actual_cwrapper_name);
+
+  /* wrapper name transforms */
+  strendzap (actual_cwrapper_name, ".exe");
+  tmp_pathspec = lt_extend_str (actual_cwrapper_name, ".exe", 1);
+  XFREE (actual_cwrapper_name);
+  actual_cwrapper_name = tmp_pathspec;
+  tmp_pathspec = 0;
+
+  /* target_name transforms -- use actual target program name; might have lt- prefix */
+  target_name = xstrdup (base_name (TARGET_PROGRAM_NAME));
+  strendzap (target_name, ".exe");
+  tmp_pathspec = lt_extend_str (target_name, ".exe", 1);
+  XFREE (target_name);
+  target_name = tmp_pathspec;
+  tmp_pathspec = 0;
+
+  lt_debugprintf (__FILE__, __LINE__,
+		  "(main) libtool target name: %s\n",
+		  target_name);
+EOF
+
+	    cat <<EOF
+  newargz[0] =
+    XMALLOC (char, (strlen (actual_cwrapper_path) +
+		    strlen ("$objdir") + 1 + strlen (actual_cwrapper_name) + 1));
+  strcpy (newargz[0], actual_cwrapper_path);
+  strcat (newargz[0], "$objdir");
+  strcat (newargz[0], "/");
+EOF
+
+	    cat <<"EOF"
+  /* stop here, and copy so we don't have to do this twice */
+  tmp_pathspec = xstrdup (newargz[0]);
+
+  /* do NOT want the lt- prefix here, so use actual_cwrapper_name */
+  strcat (newargz[0], actual_cwrapper_name);
+
+  /* DO want the lt- prefix here if it exists, so use target_name */
+  lt_argv_zero = lt_extend_str (tmp_pathspec, target_name, 1);
+  XFREE (tmp_pathspec);
+  tmp_pathspec = NULL;
+EOF
+
+	    case $host_os in
+	      mingw*)
+	    cat <<"EOF"
+  {
+    char* p;
+    while ((p = strchr (newargz[0], '\\')) != NULL)
+      {
+	*p = '/';
+      }
+    while ((p = strchr (lt_argv_zero, '\\')) != NULL)
+      {
+	*p = '/';
+      }
+  }
+EOF
+	    ;;
+	    esac
+
+	    cat <<"EOF"
+  XFREE (target_name);
+  XFREE (actual_cwrapper_path);
+  XFREE (actual_cwrapper_name);
+
+  lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
+  lt_setenv ("DUALCASE", "1");  /* for MSK sh */
+  /* Update the DLL searchpath.  EXE_PATH_VALUE ($dllsearchpath) must
+     be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath)
+     because on Windows, both *_VARNAMEs are PATH but uninstalled
+     libraries must come first. */
+  lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
+  lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
+
+  lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
+		  nonnull (lt_argv_zero));
+  for (i = 0; i < newargc; i++)
+    {
+      lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",
+		      i, nonnull (newargz[i]));
+    }
+
+EOF
+
+	    case $host_os in
+	      mingw*)
+		cat <<"EOF"
+  /* execv doesn't actually work on mingw as expected on unix */
+  newargz = prepare_spawn (newargz);
+  rval = (int) _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
+  if (rval == -1)
+    {
+      /* failed to start process */
+      lt_debugprintf (__FILE__, __LINE__,
+		      "(main) failed to launch target \"%s\": %s\n",
+		      lt_argv_zero, nonnull (strerror (errno)));
+      return 127;
+    }
+  return rval;
+EOF
+		;;
+	      *)
+		cat <<"EOF"
+  execv (lt_argv_zero, newargz);
+  return rval; /* =127, but avoids unused variable warning */
+EOF
+		;;
+	    esac
+
+	    cat <<"EOF"
+}
+
+void *
+xmalloc (size_t num)
+{
+  void *p = (void *) malloc (num);
+  if (!p)
+    lt_fatal (__FILE__, __LINE__, "memory exhausted");
+
+  return p;
+}
+
+char *
+xstrdup (const char *string)
+{
+  return string ? strcpy ((char *) xmalloc (strlen (string) + 1),
+			  string) : NULL;
+}
+
+const char *
+base_name (const char *name)
+{
+  const char *base;
+
+#if defined HAVE_DOS_BASED_FILE_SYSTEM
+  /* Skip over the disk name in MSDOS pathnames. */
+  if (isalpha ((unsigned char) name[0]) && name[1] == ':')
+    name += 2;
+#endif
+
+  for (base = name; *name; name++)
+    if (IS_DIR_SEPARATOR (*name))
+      base = name + 1;
+  return base;
+}
+
+int
+check_executable (const char *path)
+{
+  struct stat st;
+
+  lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
+                  nonempty (path));
+  if ((!path) || (!*path))
+    return 0;
+
+  if ((stat (path, &st) >= 0)
+      && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)))
+    return 1;
+  else
+    return 0;
+}
+
+int
+make_executable (const char *path)
+{
+  int rval = 0;
+  struct stat st;
+
+  lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
+                  nonempty (path));
+  if ((!path) || (!*path))
+    return 0;
+
+  if (stat (path, &st) >= 0)
+    {
+      rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR);
+    }
+  return rval;
+}
+
+/* Searches for the full path of the wrapper.  Returns
+   newly allocated full path name if found, NULL otherwise
+   Does not chase symlinks, even on platforms that support them.
+*/
+char *
+find_executable (const char *wrapper)
+{
+  int has_slash = 0;
+  const char *p;
+  const char *p_next;
+  /* static buffer for getcwd */
+  char tmp[LT_PATHMAX + 1];
+  size_t tmp_len;
+  char *concat_name;
+
+  lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
+                  nonempty (wrapper));
+
+  if ((wrapper == NULL) || (*wrapper == '\0'))
+    return NULL;
+
+  /* Absolute path? */
+#if defined HAVE_DOS_BASED_FILE_SYSTEM
+  if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':')
+    {
+      concat_name = xstrdup (wrapper);
+      if (check_executable (concat_name))
+	return concat_name;
+      XFREE (concat_name);
+    }
+  else
+    {
+#endif
+      if (IS_DIR_SEPARATOR (wrapper[0]))
+	{
+	  concat_name = xstrdup (wrapper);
+	  if (check_executable (concat_name))
+	    return concat_name;
+	  XFREE (concat_name);
+	}
+#if defined HAVE_DOS_BASED_FILE_SYSTEM
+    }
+#endif
+
+  for (p = wrapper; *p; p++)
+    if (*p == '/')
+      {
+	has_slash = 1;
+	break;
+      }
+  if (!has_slash)
+    {
+      /* no slashes; search PATH */
+      const char *path = getenv ("PATH");
+      if (path != NULL)
+	{
+	  for (p = path; *p; p = p_next)
+	    {
+	      const char *q;
+	      size_t p_len;
+	      for (q = p; *q; q++)
+		if (IS_PATH_SEPARATOR (*q))
+		  break;
+	      p_len = (size_t) (q - p);
+	      p_next = (*q == '\0' ? q : q + 1);
+	      if (p_len == 0)
+		{
+		  /* empty path: current directory */
+		  if (getcwd (tmp, LT_PATHMAX) == NULL)
+		    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
+                              nonnull (strerror (errno)));
+		  tmp_len = strlen (tmp);
+		  concat_name =
+		    XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
+		  memcpy (concat_name, tmp, tmp_len);
+		  concat_name[tmp_len] = '/';
+		  strcpy (concat_name + tmp_len + 1, wrapper);
+		}
+	      else
+		{
+		  concat_name =
+		    XMALLOC (char, p_len + 1 + strlen (wrapper) + 1);
+		  memcpy (concat_name, p, p_len);
+		  concat_name[p_len] = '/';
+		  strcpy (concat_name + p_len + 1, wrapper);
+		}
+	      if (check_executable (concat_name))
+		return concat_name;
+	      XFREE (concat_name);
+	    }
+	}
+      /* not found in PATH; assume curdir */
+    }
+  /* Relative path | not found in path: prepend cwd */
+  if (getcwd (tmp, LT_PATHMAX) == NULL)
+    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
+              nonnull (strerror (errno)));
+  tmp_len = strlen (tmp);
+  concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
+  memcpy (concat_name, tmp, tmp_len);
+  concat_name[tmp_len] = '/';
+  strcpy (concat_name + tmp_len + 1, wrapper);
+
+  if (check_executable (concat_name))
+    return concat_name;
+  XFREE (concat_name);
+  return NULL;
+}
+
+char *
+chase_symlinks (const char *pathspec)
+{
+#ifndef S_ISLNK
+  return xstrdup (pathspec);
+#else
+  char buf[LT_PATHMAX];
+  struct stat s;
+  char *tmp_pathspec = xstrdup (pathspec);
+  char *p;
+  int has_symlinks = 0;
+  while (strlen (tmp_pathspec) && !has_symlinks)
+    {
+      lt_debugprintf (__FILE__, __LINE__,
+		      "checking path component for symlinks: %s\n",
+		      tmp_pathspec);
+      if (lstat (tmp_pathspec, &s) == 0)
+	{
+	  if (S_ISLNK (s.st_mode) != 0)
+	    {
+	      has_symlinks = 1;
+	      break;
+	    }
+
+	  /* search backwards for last DIR_SEPARATOR */
+	  p = tmp_pathspec + strlen (tmp_pathspec) - 1;
+	  while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
+	    p--;
+	  if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
+	    {
+	      /* no more DIR_SEPARATORS left */
+	      break;
+	    }
+	  *p = '\0';
+	}
+      else
+	{
+	  lt_fatal (__FILE__, __LINE__,
+		    "error accessing file \"%s\": %s",
+		    tmp_pathspec, nonnull (strerror (errno)));
+	}
+    }
+  XFREE (tmp_pathspec);
+
+  if (!has_symlinks)
+    {
+      return xstrdup (pathspec);
+    }
+
+  tmp_pathspec = realpath (pathspec, buf);
+  if (tmp_pathspec == 0)
+    {
+      lt_fatal (__FILE__, __LINE__,
+		"could not follow symlinks for %s", pathspec);
+    }
+  return xstrdup (tmp_pathspec);
+#endif
+}
+
+char *
+strendzap (char *str, const char *pat)
+{
+  size_t len, patlen;
+
+  assert (str != NULL);
+  assert (pat != NULL);
+
+  len = strlen (str);
+  patlen = strlen (pat);
+
+  if (patlen <= len)
+    {
+      str += len - patlen;
+      if (STREQ (str, pat))
+	*str = '\0';
+    }
+  return str;
+}
+
+void
+lt_debugprintf (const char *file, int line, const char *fmt, ...)
+{
+  va_list args;
+  if (lt_debug)
+    {
+      (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
+      va_start (args, fmt);
+      (void) vfprintf (stderr, fmt, args);
+      va_end (args);
+    }
+}
+
+static void
+lt_error_core (int exit_status, const char *file,
+	       int line, const char *mode,
+	       const char *message, va_list ap)
+{
+  fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
+  vfprintf (stderr, message, ap);
+  fprintf (stderr, ".\n");
+
+  if (exit_status >= 0)
+    exit (exit_status);
+}
+
+void
+lt_fatal (const char *file, int line, const char *message, ...)
+{
+  va_list ap;
+  va_start (ap, message);
+  lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
+  va_end (ap);
+}
+
+static const char *
+nonnull (const char *s)
+{
+  return s ? s : "(null)";
+}
+
+static const char *
+nonempty (const char *s)
+{
+  return (s && !*s) ? "(empty)" : nonnull (s);
+}
+
+void
+lt_setenv (const char *name, const char *value)
+{
+  lt_debugprintf (__FILE__, __LINE__,
+		  "(lt_setenv) setting '%s' to '%s'\n",
+                  nonnull (name), nonnull (value));
+  {
+#ifdef HAVE_SETENV
+    /* always make a copy, for consistency with !HAVE_SETENV */
+    char *str = xstrdup (value);
+    setenv (name, str, 1);
+#else
+    size_t len = strlen (name) + 1 + strlen (value) + 1;
+    char *str = XMALLOC (char, len);
+    sprintf (str, "%s=%s", name, value);
+    if (putenv (str) != EXIT_SUCCESS)
+      {
+        XFREE (str);
+      }
+#endif
+  }
+}
+
+char *
+lt_extend_str (const char *orig_value, const char *add, int to_end)
+{
+  char *new_value;
+  if (orig_value && *orig_value)
+    {
+      size_t orig_value_len = strlen (orig_value);
+      size_t add_len = strlen (add);
+      new_value = XMALLOC (char, add_len + orig_value_len + 1);
+      if (to_end)
+        {
+          strcpy (new_value, orig_value);
+          strcpy (new_value + orig_value_len, add);
+        }
+      else
+        {
+          strcpy (new_value, add);
+          strcpy (new_value + add_len, orig_value);
+        }
+    }
+  else
+    {
+      new_value = xstrdup (add);
+    }
+  return new_value;
+}
+
+void
+lt_update_exe_path (const char *name, const char *value)
+{
+  lt_debugprintf (__FILE__, __LINE__,
+		  "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
+                  nonnull (name), nonnull (value));
+
+  if (name && *name && value && *value)
+    {
+      char *new_value = lt_extend_str (getenv (name), value, 0);
+      /* some systems can't cope with a ':'-terminated path #' */
+      size_t len = strlen (new_value);
+      while ((len > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
+        {
+          new_value[--len] = '\0';
+        }
+      lt_setenv (name, new_value);
+      XFREE (new_value);
+    }
+}
+
+void
+lt_update_lib_path (const char *name, const char *value)
+{
+  lt_debugprintf (__FILE__, __LINE__,
+		  "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
+                  nonnull (name), nonnull (value));
+
+  if (name && *name && value && *value)
+    {
+      char *new_value = lt_extend_str (getenv (name), value, 0);
+      lt_setenv (name, new_value);
+      XFREE (new_value);
+    }
+}
+
+EOF
+	    case $host_os in
+	      mingw*)
+		cat <<"EOF"
+
+/* Prepares an argument vector before calling spawn().
+   Note that spawn() does not by itself call the command interpreter
+     (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") :
+      ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+         GetVersionEx(&v);
+         v.dwPlatformId == VER_PLATFORM_WIN32_NT;
+      }) ? "cmd.exe" : "command.com").
+   Instead it simply concatenates the arguments, separated by ' ', and calls
+   CreateProcess().  We must quote the arguments since Win32 CreateProcess()
+   interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a
+   special way:
+   - Space and tab are interpreted as delimiters. They are not treated as
+     delimiters if they are surrounded by double quotes: "...".
+   - Unescaped double quotes are removed from the input. Their only effect is
+     that within double quotes, space and tab are treated like normal
+     characters.
+   - Backslashes not followed by double quotes are not special.
+   - But 2*n+1 backslashes followed by a double quote become
+     n backslashes followed by a double quote (n >= 0):
+       \" -> "
+       \\\" -> \"
+       \\\\\" -> \\"
+ */
+#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
+#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
+char **
+prepare_spawn (char **argv)
+{
+  size_t argc;
+  char **new_argv;
+  size_t i;
+
+  /* Count number of arguments.  */
+  for (argc = 0; argv[argc] != NULL; argc++)
+    ;
+
+  /* Allocate new argument vector.  */
+  new_argv = XMALLOC (char *, argc + 1);
+
+  /* Put quoted arguments into the new argument vector.  */
+  for (i = 0; i < argc; i++)
+    {
+      const char *string = argv[i];
+
+      if (string[0] == '\0')
+	new_argv[i] = xstrdup ("\"\"");
+      else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL)
+	{
+	  int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL);
+	  size_t length;
+	  unsigned int backslashes;
+	  const char *s;
+	  char *quoted_string;
+	  char *p;
+
+	  length = 0;
+	  backslashes = 0;
+	  if (quote_around)
+	    length++;
+	  for (s = string; *s != '\0'; s++)
+	    {
+	      char c = *s;
+	      if (c == '"')
+		length += backslashes + 1;
+	      length++;
+	      if (c == '\\')
+		backslashes++;
+	      else
+		backslashes = 0;
+	    }
+	  if (quote_around)
+	    length += backslashes + 1;
+
+	  quoted_string = XMALLOC (char, length + 1);
+
+	  p = quoted_string;
+	  backslashes = 0;
+	  if (quote_around)
+	    *p++ = '"';
+	  for (s = string; *s != '\0'; s++)
+	    {
+	      char c = *s;
+	      if (c == '"')
+		{
+		  unsigned int j;
+		  for (j = backslashes + 1; j > 0; j--)
+		    *p++ = '\\';
+		}
+	      *p++ = c;
+	      if (c == '\\')
+		backslashes++;
+	      else
+		backslashes = 0;
+	    }
+	  if (quote_around)
+	    {
+	      unsigned int j;
+	      for (j = backslashes; j > 0; j--)
+		*p++ = '\\';
+	      *p++ = '"';
+	    }
+	  *p = '\0';
+
+	  new_argv[i] = quoted_string;
+	}
+      else
+	new_argv[i] = (char *) string;
+    }
+  new_argv[argc] = NULL;
+
+  return new_argv;
+}
+EOF
+		;;
+	    esac
+
+            cat <<"EOF"
+void lt_dump_script (FILE* f)
+{
+EOF
+	    func_emit_wrapper yes |
+	      $SED -n -e '
+s/^\(.\{79\}\)\(..*\)/\1\
+\2/
+h
+s/\([\\"]\)/\\\1/g
+s/$/\\n/
+s/\([^\n]*\).*/  fputs ("\1", f);/p
+g
+D'
+            cat <<"EOF"
+}
+EOF
+}
+# end: func_emit_cwrapperexe_src
+
+# func_win32_import_lib_p ARG
+# True if ARG is an import lib, as indicated by $file_magic_cmd
+func_win32_import_lib_p ()
+{
+    $debug_cmd
+
+    case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
+    *import*) : ;;
+    *) false ;;
+    esac
+}
+
+# func_suncc_cstd_abi
+# !!ONLY CALL THIS FOR SUN CC AFTER $compile_command IS FULLY EXPANDED!!
+# Several compiler flags select an ABI that is incompatible with the
+# Cstd library. Avoid specifying it if any are in CXXFLAGS.
+func_suncc_cstd_abi ()
+{
+    $debug_cmd
+
+    case " $compile_command " in
+    *" -compat=g "*|*\ -std=c++[0-9][0-9]\ *|*" -library=stdcxx4 "*|*" -library=stlport4 "*)
+      suncc_use_cstd_abi=no
+      ;;
+    *)
+      suncc_use_cstd_abi=yes
+      ;;
+    esac
+}
+
+# func_mode_link arg...
+func_mode_link ()
+{
+    $debug_cmd
+
+    case $host in
+    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+      # It is impossible to link a dll without this setting, and
+      # we shouldn't force the makefile maintainer to figure out
+      # what system we are compiling for in order to pass an extra
+      # flag for every libtool invocation.
+      # allow_undefined=no
+
+      # FIXME: Unfortunately, there are problems with the above when trying
+      # to make a dll that has undefined symbols, in which case not
+      # even a static library is built.  For now, we need to specify
+      # -no-undefined on the libtool link line when we can be certain
+      # that all symbols are satisfied, otherwise we get a static library.
+      allow_undefined=yes
+      ;;
+    *)
+      allow_undefined=yes
+      ;;
+    esac
+    libtool_args=$nonopt
+    base_compile="$nonopt $@"
+    compile_command=$nonopt
+    finalize_command=$nonopt
+
+    compile_rpath=
+    finalize_rpath=
+    compile_shlibpath=
+    finalize_shlibpath=
+    convenience=
+    old_convenience=
+    deplibs=
+    old_deplibs=
+    compiler_flags=
+    linker_flags=
+    dllsearchpath=
+    lib_search_path=`pwd`
+    inst_prefix_dir=
+    new_inherited_linker_flags=
+
+    avoid_version=no
+    bindir=
+    dlfiles=
+    dlprefiles=
+    dlself=no
+    export_dynamic=no
+    export_symbols=
+    export_symbols_regex=
+    generated=
+    libobjs=
+    ltlibs=
+    module=no
+    no_install=no
+    objs=
+    os2dllname=
+    non_pic_objects=
+    precious_files_regex=
+    prefer_static_libs=no
+    preload=false
+    prev=
+    prevarg=
+    release=
+    rpath=
+    xrpath=
+    perm_rpath=
+    temp_rpath=
+    thread_safe=no
+    vinfo=
+    vinfo_number=no
+    weak_libs=
+    single_module=$wl-single_module
+    func_infer_tag $base_compile
+
+    # We need to know -static, to get the right output filenames.
+    for arg
+    do
+      case $arg in
+      -shared)
+	test yes != "$build_libtool_libs" \
+	  && func_fatal_configuration "cannot build a shared library"
+	build_old_libs=no
+	break
+	;;
+      -all-static | -static | -static-libtool-libs)
+	case $arg in
+	-all-static)
+	  if test yes = "$build_libtool_libs" && test -z "$link_static_flag"; then
+	    func_warning "complete static linking is impossible in this configuration"
+	  fi
+	  if test -n "$link_static_flag"; then
+	    dlopen_self=$dlopen_self_static
+	  fi
+	  prefer_static_libs=yes
+	  ;;
+	-static)
+	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
+	    dlopen_self=$dlopen_self_static
+	  fi
+	  prefer_static_libs=built
+	  ;;
+	-static-libtool-libs)
+	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
+	    dlopen_self=$dlopen_self_static
+	  fi
+	  prefer_static_libs=yes
+	  ;;
+	esac
+	build_libtool_libs=no
+	build_old_libs=yes
+	break
+	;;
+      esac
+    done
+
+    # See if our shared archives depend on static archives.
+    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
+
+    # Go through the arguments, transforming them on the way.
+    while test "$#" -gt 0; do
+      arg=$1
+      shift
+      func_quote_for_eval "$arg"
+      qarg=$func_quote_for_eval_unquoted_result
+      func_append libtool_args " $func_quote_for_eval_result"
+
+      # If the previous option needs an argument, assign it.
+      if test -n "$prev"; then
+	case $prev in
+	output)
+	  func_append compile_command " @OUTPUT@"
+	  func_append finalize_command " @OUTPUT@"
+	  ;;
+	esac
+
+	case $prev in
+	bindir)
+	  bindir=$arg
+	  prev=
+	  continue
+	  ;;
+	dlfiles|dlprefiles)
+	  $preload || {
+	    # Add the symbol object into the linking commands.
+	    func_append compile_command " @SYMFILE@"
+	    func_append finalize_command " @SYMFILE@"
+	    preload=:
+	  }
+	  case $arg in
+	  *.la | *.lo) ;;  # We handle these cases below.
+	  force)
+	    if test no = "$dlself"; then
+	      dlself=needless
+	      export_dynamic=yes
+	    fi
+	    prev=
+	    continue
+	    ;;
+	  self)
+	    if test dlprefiles = "$prev"; then
+	      dlself=yes
+	    elif test dlfiles = "$prev" && test yes != "$dlopen_self"; then
+	      dlself=yes
+	    else
+	      dlself=needless
+	      export_dynamic=yes
+	    fi
+	    prev=
+	    continue
+	    ;;
+	  *)
+	    if test dlfiles = "$prev"; then
+	      func_append dlfiles " $arg"
+	    else
+	      func_append dlprefiles " $arg"
+	    fi
+	    prev=
+	    continue
+	    ;;
+	  esac
+	  ;;
+	expsyms)
+	  export_symbols=$arg
+	  test -f "$arg" \
+	    || func_fatal_error "symbol file '$arg' does not exist"
+	  prev=
+	  continue
+	  ;;
+	expsyms_regex)
+	  export_symbols_regex=$arg
+	  prev=
+	  continue
+	  ;;
+	framework)
+	  case $host in
+	    *-*-darwin*)
+	      case "$deplibs " in
+		*" $qarg.ltframework "*) ;;
+		*) func_append deplibs " $qarg.ltframework" # this is fixed later
+		   ;;
+	      esac
+	      ;;
+	  esac
+	  prev=
+	  continue
+	  ;;
+	inst_prefix)
+	  inst_prefix_dir=$arg
+	  prev=
+	  continue
+	  ;;
+	mllvm)
+	  # Clang does not use LLVM to link, so we can simply discard any
+	  # '-mllvm $arg' options when doing the link step.
+	  prev=
+	  continue
+	  ;;
+	objectlist)
+	  if test -f "$arg"; then
+	    save_arg=$arg
+	    moreargs=
+	    for fil in `cat "$save_arg"`
+	    do
+#	      func_append moreargs " $fil"
+	      arg=$fil
+	      # A libtool-controlled object.
+
+	      # Check to see that this really is a libtool object.
+	      if func_lalib_unsafe_p "$arg"; then
+		pic_object=
+		non_pic_object=
+
+		# Read the .lo file
+		func_source "$arg"
+
+		if test -z "$pic_object" ||
+		   test -z "$non_pic_object" ||
+		   test none = "$pic_object" &&
+		   test none = "$non_pic_object"; then
+		  func_fatal_error "cannot find name of object for '$arg'"
+		fi
+
+		# Extract subdirectory from the argument.
+		func_dirname "$arg" "/" ""
+		xdir=$func_dirname_result
+
+		if test none != "$pic_object"; then
+		  # Prepend the subdirectory the object is found in.
+		  pic_object=$xdir$pic_object
+
+		  if test dlfiles = "$prev"; then
+		    if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then
+		      func_append dlfiles " $pic_object"
+		      prev=
+		      continue
+		    else
+		      # If libtool objects are unsupported, then we need to preload.
+		      prev=dlprefiles
+		    fi
+		  fi
+
+		  # CHECK ME:  I think I busted this.  -Ossama
+		  if test dlprefiles = "$prev"; then
+		    # Preload the old-style object.
+		    func_append dlprefiles " $pic_object"
+		    prev=
+		  fi
+
+		  # A PIC object.
+		  func_append libobjs " $pic_object"
+		  arg=$pic_object
+		fi
+
+		# Non-PIC object.
+		if test none != "$non_pic_object"; then
+		  # Prepend the subdirectory the object is found in.
+		  non_pic_object=$xdir$non_pic_object
+
+		  # A standard non-PIC object
+		  func_append non_pic_objects " $non_pic_object"
+		  if test -z "$pic_object" || test none = "$pic_object"; then
+		    arg=$non_pic_object
+		  fi
+		else
+		  # If the PIC object exists, use it instead.
+		  # $xdir was prepended to $pic_object above.
+		  non_pic_object=$pic_object
+		  func_append non_pic_objects " $non_pic_object"
+		fi
+	      else
+		# Only an error if not doing a dry-run.
+		if $opt_dry_run; then
+		  # Extract subdirectory from the argument.
+		  func_dirname "$arg" "/" ""
+		  xdir=$func_dirname_result
+
+		  func_lo2o "$arg"
+		  pic_object=$xdir$objdir/$func_lo2o_result
+		  non_pic_object=$xdir$func_lo2o_result
+		  func_append libobjs " $pic_object"
+		  func_append non_pic_objects " $non_pic_object"
+	        else
+		  func_fatal_error "'$arg' is not a valid libtool object"
+		fi
+	      fi
+	    done
+	  else
+	    func_fatal_error "link input file '$arg' does not exist"
+	  fi
+	  arg=$save_arg
+	  prev=
+	  continue
+	  ;;
+	os2dllname)
+	  os2dllname=$arg
+	  prev=
+	  continue
+	  ;;
+	precious_regex)
+	  precious_files_regex=$arg
+	  prev=
+	  continue
+	  ;;
+	release)
+	  release=-$arg
+	  prev=
+	  continue
+	  ;;
+	rpath | xrpath)
+	  # We need an absolute path.
+	  case $arg in
+	  [\\/]* | [A-Za-z]:[\\/]*) ;;
+	  *)
+	    func_fatal_error "only absolute run-paths are allowed"
+	    ;;
+	  esac
+	  if test rpath = "$prev"; then
+	    case "$rpath " in
+	    *" $arg "*) ;;
+	    *) func_append rpath " $arg" ;;
+	    esac
+	  else
+	    case "$xrpath " in
+	    *" $arg "*) ;;
+	    *) func_append xrpath " $arg" ;;
+	    esac
+	  fi
+	  prev=
+	  continue
+	  ;;
+	shrext)
+	  shrext_cmds=$arg
+	  prev=
+	  continue
+	  ;;
+	weak)
+	  func_append weak_libs " $arg"
+	  prev=
+	  continue
+	  ;;
+	xcclinker)
+	  func_append linker_flags " $qarg"
+	  func_append compiler_flags " $qarg"
+	  prev=
+	  func_append compile_command " $qarg"
+	  func_append finalize_command " $qarg"
+	  continue
+	  ;;
+	xcompiler)
+	  func_append compiler_flags " $qarg"
+	  prev=
+	  func_append compile_command " $qarg"
+	  func_append finalize_command " $qarg"
+	  continue
+	  ;;
+	xlinker)
+	  func_append linker_flags " $qarg"
+	  func_append compiler_flags " $wl$qarg"
+	  prev=
+	  func_append compile_command " $wl$qarg"
+	  func_append finalize_command " $wl$qarg"
+	  continue
+	  ;;
+	*)
+	  eval "$prev=\"\$arg\""
+	  prev=
+	  continue
+	  ;;
+	esac
+      fi # test -n "$prev"
+
+      prevarg=$arg
+
+      case $arg in
+      -all-static)
+	if test -n "$link_static_flag"; then
+	  # See comment for -static flag below, for more details.
+	  func_append compile_command " $link_static_flag"
+	  func_append finalize_command " $link_static_flag"
+	fi
+	continue
+	;;
+
+      -allow-undefined)
+	# FIXME: remove this flag sometime in the future.
+	func_fatal_error "'-allow-undefined' must not be used because it is the default"
+	;;
+
+      -avoid-version)
+	avoid_version=yes
+	continue
+	;;
+
+      -bindir)
+	prev=bindir
+	continue
+	;;
+
+      -dlopen)
+	prev=dlfiles
+	continue
+	;;
+
+      -dlpreopen)
+	prev=dlprefiles
+	continue
+	;;
+
+      -export-dynamic)
+	export_dynamic=yes
+	continue
+	;;
+
+      -export-symbols | -export-symbols-regex)
+	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
+	  func_fatal_error "more than one -exported-symbols argument is not allowed"
+	fi
+	if test X-export-symbols = "X$arg"; then
+	  prev=expsyms
+	else
+	  prev=expsyms_regex
+	fi
+	continue
+	;;
+
+      -framework)
+	prev=framework
+	continue
+	;;
+
+      -inst-prefix-dir)
+	prev=inst_prefix
+	continue
+	;;
+
+      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
+      # so, if we see these flags be careful not to treat them like -L
+      -L[A-Z][A-Z]*:*)
+	case $with_gcc/$host in
+	no/*-*-irix* | /*-*-irix*)
+	  func_append compile_command " $arg"
+	  func_append finalize_command " $arg"
+	  ;;
+	esac
+	continue
+	;;
+
+      -L*)
+	func_stripname "-L" '' "$arg"
+	if test -z "$func_stripname_result"; then
+	  if test "$#" -gt 0; then
+	    func_fatal_error "require no space between '-L' and '$1'"
+	  else
+	    func_fatal_error "need path for '-L' option"
+	  fi
+	fi
+	func_resolve_sysroot "$func_stripname_result"
+	dir=$func_resolve_sysroot_result
+	# We need an absolute path.
+	case $dir in
+	[\\/]* | [A-Za-z]:[\\/]*) ;;
+	*)
+	  absdir=`cd "$dir" && pwd`
+	  test -z "$absdir" && \
+	    func_fatal_error "cannot determine absolute directory name of '$dir'"
+	  dir=$absdir
+	  ;;
+	esac
+	case "$deplibs " in
+	*" -L$dir "* | *" $arg "*)
+	  # Will only happen for absolute or sysroot arguments
+	  ;;
+	*)
+	  # Preserve sysroot, but never include relative directories
+	  case $dir in
+	    [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;;
+	    *) func_append deplibs " -L$dir" ;;
+	  esac
+	  func_append lib_search_path " $dir"
+	  ;;
+	esac
+	case $host in
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+	  testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
+	  case :$dllsearchpath: in
+	  *":$dir:"*) ;;
+	  ::) dllsearchpath=$dir;;
+	  *) func_append dllsearchpath ":$dir";;
+	  esac
+	  case :$dllsearchpath: in
+	  *":$testbindir:"*) ;;
+	  ::) dllsearchpath=$testbindir;;
+	  *) func_append dllsearchpath ":$testbindir";;
+	  esac
+	  ;;
+	esac
+	continue
+	;;
+
+      -l*)
+	if test X-lc = "X$arg" || test X-lm = "X$arg"; then
+	  case $host in
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
+	    # These systems don't actually have a C or math library (as such)
+	    continue
+	    ;;
+	  *-*-os2*)
+	    # These systems don't actually have a C library (as such)
+	    test X-lc = "X$arg" && continue
+	    ;;
+	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
+	    # Do not include libc due to us having libc/libc_r.
+	    test X-lc = "X$arg" && continue
+	    ;;
+	  *-*-rhapsody* | *-*-darwin1.[012])
+	    # Rhapsody C and math libraries are in the System framework
+	    func_append deplibs " System.ltframework"
+	    continue
+	    ;;
+	  *-*-sco3.2v5* | *-*-sco5v6*)
+	    # Causes problems with __ctype
+	    test X-lc = "X$arg" && continue
+	    ;;
+	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
+	    # Compiler inserts libc in the correct place for threads to work
+	    test X-lc = "X$arg" && continue
+	    ;;
+	  esac
+	elif test X-lc_r = "X$arg"; then
+	 case $host in
+	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
+	   # Do not include libc_r directly, use -pthread flag.
+	   continue
+	   ;;
+	 esac
+	fi
+	func_append deplibs " $arg"
+	continue
+	;;
+
+      -mllvm)
+	prev=mllvm
+	continue
+	;;
+
+      -module)
+	module=yes
+	continue
+	;;
+
+      # Tru64 UNIX uses -model [arg] to determine the layout of C++
+      # classes, name mangling, and exception handling.
+      # Darwin uses the -arch flag to determine output architecture.
+      -model|-arch|-isysroot|--sysroot)
+	func_append compiler_flags " $arg"
+	func_append compile_command " $arg"
+	func_append finalize_command " $arg"
+	prev=xcompiler
+	continue
+	;;
+
+      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+      |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
+	func_append compiler_flags " $arg"
+	func_append compile_command " $arg"
+	func_append finalize_command " $arg"
+	case "$new_inherited_linker_flags " in
+	    *" $arg "*) ;;
+	    * ) func_append new_inherited_linker_flags " $arg" ;;
+	esac
+	continue
+	;;
+
+      -multi_module)
+	single_module=$wl-multi_module
+	continue
+	;;
+
+      -no-fast-install)
+	fast_install=no
+	continue
+	;;
+
+      -no-install)
+	case $host in
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
+	  # The PATH hackery in wrapper scripts is required on Windows
+	  # and Darwin in order for the loader to find any dlls it needs.
+	  func_warning "'-no-install' is ignored for $host"
+	  func_warning "assuming '-no-fast-install' instead"
+	  fast_install=no
+	  ;;
+	*) no_install=yes ;;
+	esac
+	continue
+	;;
+
+      -no-undefined)
+	allow_undefined=no
+	continue
+	;;
+
+      -objectlist)
+	prev=objectlist
+	continue
+	;;
+
+      -os2dllname)
+	prev=os2dllname
+	continue
+	;;
+
+      -o) prev=output ;;
+
+      -precious-files-regex)
+	prev=precious_regex
+	continue
+	;;
+
+      -release)
+	prev=release
+	continue
+	;;
+
+      -rpath)
+	prev=rpath
+	continue
+	;;
+
+      -R)
+	prev=xrpath
+	continue
+	;;
+
+      -R*)
+	func_stripname '-R' '' "$arg"
+	dir=$func_stripname_result
+	# We need an absolute path.
+	case $dir in
+	[\\/]* | [A-Za-z]:[\\/]*) ;;
+	=*)
+	  func_stripname '=' '' "$dir"
+	  dir=$lt_sysroot$func_stripname_result
+	  ;;
+	*)
+	  func_fatal_error "only absolute run-paths are allowed"
+	  ;;
+	esac
+	case "$xrpath " in
+	*" $dir "*) ;;
+	*) func_append xrpath " $dir" ;;
+	esac
+	continue
+	;;
+
+      -shared)
+	# The effects of -shared are defined in a previous loop.
+	continue
+	;;
+
+      -shrext)
+	prev=shrext
+	continue
+	;;
+
+      -static | -static-libtool-libs)
+	# The effects of -static are defined in a previous loop.
+	# We used to do the same as -all-static on platforms that
+	# didn't have a PIC flag, but the assumption that the effects
+	# would be equivalent was wrong.  It would break on at least
+	# Digital Unix and AIX.
+	continue
+	;;
+
+      -thread-safe)
+	thread_safe=yes
+	continue
+	;;
+
+      -version-info)
+	prev=vinfo
+	continue
+	;;
+
+      -version-number)
+	prev=vinfo
+	vinfo_number=yes
+	continue
+	;;
+
+      -weak)
+        prev=weak
+	continue
+	;;
+
+      -Wc,*)
+	func_stripname '-Wc,' '' "$arg"
+	args=$func_stripname_result
+	arg=
+	save_ifs=$IFS; IFS=,
+	for flag in $args; do
+	  IFS=$save_ifs
+          func_quote_for_eval "$flag"
+	  func_append arg " $func_quote_for_eval_result"
+	  func_append compiler_flags " $func_quote_for_eval_result"
+	done
+	IFS=$save_ifs
+	func_stripname ' ' '' "$arg"
+	arg=$func_stripname_result
+	;;
+
+      -Wl,*)
+	func_stripname '-Wl,' '' "$arg"
+	args=$func_stripname_result
+	arg=
+	save_ifs=$IFS; IFS=,
+	for flag in $args; do
+	  IFS=$save_ifs
+          func_quote_for_eval "$flag"
+	  func_append arg " $wl$func_quote_for_eval_result"
+	  func_append compiler_flags " $wl$func_quote_for_eval_result"
+	  func_append linker_flags " $func_quote_for_eval_result"
+	done
+	IFS=$save_ifs
+	func_stripname ' ' '' "$arg"
+	arg=$func_stripname_result
+	;;
+
+      -Xcompiler)
+	prev=xcompiler
+	continue
+	;;
+
+      -Xlinker)
+	prev=xlinker
+	continue
+	;;
+
+      -XCClinker)
+	prev=xcclinker
+	continue
+	;;
+
+      # -msg_* for osf cc
+      -msg_*)
+	func_quote_for_eval "$arg"
+	arg=$func_quote_for_eval_result
+	;;
+
+      # Flags to be passed through unchanged, with rationale:
+      # -64, -mips[0-9]      enable 64-bit mode for the SGI compiler
+      # -r[0-9][0-9]*        specify processor for the SGI compiler
+      # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
+      # +DA*, +DD*           enable 64-bit mode for the HP compiler
+      # -q*                  compiler args for the IBM compiler
+      # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
+      # -F/path              path to uninstalled frameworks, gcc on darwin
+      # -p, -pg, --coverage, -fprofile-*  profiling flags for GCC
+      # -fstack-protector*   stack protector flags for GCC
+      # @file                GCC response files
+      # -tp=*                Portland pgcc target processor selection
+      # --sysroot=*          for sysroot support
+      # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
+      # -stdlib=*            select c++ std lib with clang
+      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
+      -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*)
+        func_quote_for_eval "$arg"
+	arg=$func_quote_for_eval_result
+        func_append compile_command " $arg"
+        func_append finalize_command " $arg"
+        func_append compiler_flags " $arg"
+        continue
+        ;;
+
+      -Z*)
+        if test os2 = "`expr $host : '.*\(os2\)'`"; then
+          # OS/2 uses -Zxxx to specify OS/2-specific options
+	  compiler_flags="$compiler_flags $arg"
+	  func_append compile_command " $arg"
+	  func_append finalize_command " $arg"
+	  case $arg in
+	  -Zlinker | -Zstack)
+	    prev=xcompiler
+	    ;;
+	  esac
+	  continue
+        else
+	  # Otherwise treat like 'Some other compiler flag' below
+	  func_quote_for_eval "$arg"
+	  arg=$func_quote_for_eval_result
+        fi
+	;;
+
+      # Some other compiler flag.
+      -* | +*)
+        func_quote_for_eval "$arg"
+	arg=$func_quote_for_eval_result
+	;;
+
+      *.$objext)
+	# A standard object.
+	func_append objs " $arg"
+	;;
+
+      *.lo)
+	# A libtool-controlled object.
+
+	# Check to see that this really is a libtool object.
+	if func_lalib_unsafe_p "$arg"; then
+	  pic_object=
+	  non_pic_object=
+
+	  # Read the .lo file
+	  func_source "$arg"
+
+	  if test -z "$pic_object" ||
+	     test -z "$non_pic_object" ||
+	     test none = "$pic_object" &&
+	     test none = "$non_pic_object"; then
+	    func_fatal_error "cannot find name of object for '$arg'"
+	  fi
+
+	  # Extract subdirectory from the argument.
+	  func_dirname "$arg" "/" ""
+	  xdir=$func_dirname_result
+
+	  test none = "$pic_object" || {
+	    # Prepend the subdirectory the object is found in.
+	    pic_object=$xdir$pic_object
+
+	    if test dlfiles = "$prev"; then
+	      if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then
+		func_append dlfiles " $pic_object"
+		prev=
+		continue
+	      else
+		# If libtool objects are unsupported, then we need to preload.
+		prev=dlprefiles
+	      fi
+	    fi
+
+	    # CHECK ME:  I think I busted this.  -Ossama
+	    if test dlprefiles = "$prev"; then
+	      # Preload the old-style object.
+	      func_append dlprefiles " $pic_object"
+	      prev=
+	    fi
+
+	    # A PIC object.
+	    func_append libobjs " $pic_object"
+	    arg=$pic_object
+	  }
+
+	  # Non-PIC object.
+	  if test none != "$non_pic_object"; then
+	    # Prepend the subdirectory the object is found in.
+	    non_pic_object=$xdir$non_pic_object
+
+	    # A standard non-PIC object
+	    func_append non_pic_objects " $non_pic_object"
+	    if test -z "$pic_object" || test none = "$pic_object"; then
+	      arg=$non_pic_object
+	    fi
+	  else
+	    # If the PIC object exists, use it instead.
+	    # $xdir was prepended to $pic_object above.
+	    non_pic_object=$pic_object
+	    func_append non_pic_objects " $non_pic_object"
+	  fi
+	else
+	  # Only an error if not doing a dry-run.
+	  if $opt_dry_run; then
+	    # Extract subdirectory from the argument.
+	    func_dirname "$arg" "/" ""
+	    xdir=$func_dirname_result
+
+	    func_lo2o "$arg"
+	    pic_object=$xdir$objdir/$func_lo2o_result
+	    non_pic_object=$xdir$func_lo2o_result
+	    func_append libobjs " $pic_object"
+	    func_append non_pic_objects " $non_pic_object"
+	  else
+	    func_fatal_error "'$arg' is not a valid libtool object"
+	  fi
+	fi
+	;;
+
+      *.$libext)
+	# An archive.
+	func_append deplibs " $arg"
+	func_append old_deplibs " $arg"
+	continue
+	;;
+
+      *.la)
+	# A libtool-controlled library.
+
+	func_resolve_sysroot "$arg"
+	if test dlfiles = "$prev"; then
+	  # This library was specified with -dlopen.
+	  func_append dlfiles " $func_resolve_sysroot_result"
+	  prev=
+	elif test dlprefiles = "$prev"; then
+	  # The library was specified with -dlpreopen.
+	  func_append dlprefiles " $func_resolve_sysroot_result"
+	  prev=
+	else
+	  func_append deplibs " $func_resolve_sysroot_result"
+	fi
+	continue
+	;;
+
+      # Some other compiler argument.
+      *)
+	# Unknown arguments in both finalize_command and compile_command need
+	# to be aesthetically quoted because they are evaled later.
+	func_quote_for_eval "$arg"
+	arg=$func_quote_for_eval_result
+	;;
+      esac # arg
+
+      # Now actually substitute the argument into the commands.
+      if test -n "$arg"; then
+	func_append compile_command " $arg"
+	func_append finalize_command " $arg"
+      fi
+    done # argument parsing loop
+
+    test -n "$prev" && \
+      func_fatal_help "the '$prevarg' option requires an argument"
+
+    if test yes = "$export_dynamic" && test -n "$export_dynamic_flag_spec"; then
+      eval arg=\"$export_dynamic_flag_spec\"
+      func_append compile_command " $arg"
+      func_append finalize_command " $arg"
+    fi
+
+    oldlibs=
+    # calculate the name of the file, without its directory
+    func_basename "$output"
+    outputname=$func_basename_result
+    libobjs_save=$libobjs
+
+    if test -n "$shlibpath_var"; then
+      # get the directories listed in $shlibpath_var
+      eval shlib_search_path=\`\$ECHO \"\$$shlibpath_var\" \| \$SED \'s/:/ /g\'\`
+    else
+      shlib_search_path=
+    fi
+    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
+    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
+
+    # Definition is injected by LT_CONFIG during libtool generation.
+    func_munge_path_list sys_lib_dlsearch_path "$LT_SYS_LIBRARY_PATH"
+
+    func_dirname "$output" "/" ""
+    output_objdir=$func_dirname_result$objdir
+    func_to_tool_file "$output_objdir/"
+    tool_output_objdir=$func_to_tool_file_result
+    # Create the object directory.
+    func_mkdir_p "$output_objdir"
+
+    # Determine the type of output
+    case $output in
+    "")
+      func_fatal_help "you must specify an output file"
+      ;;
+    *.$libext) linkmode=oldlib ;;
+    *.lo | *.$objext) linkmode=obj ;;
+    *.la) linkmode=lib ;;
+    *) linkmode=prog ;; # Anything else should be a program.
+    esac
+
+    specialdeplibs=
+
+    libs=
+    # Find all interdependent deplibs by searching for libraries
+    # that are linked more than once (e.g. -la -lb -la)
+    for deplib in $deplibs; do
+      if $opt_preserve_dup_deps; then
+	case "$libs " in
+	*" $deplib "*) func_append specialdeplibs " $deplib" ;;
+	esac
+      fi
+      func_append libs " $deplib"
+    done
+
+    if test lib = "$linkmode"; then
+      libs="$predeps $libs $compiler_lib_search_path $postdeps"
+
+      # Compute libraries that are listed more than once in $predeps
+      # $postdeps and mark them as special (i.e., whose duplicates are
+      # not to be eliminated).
+      pre_post_deps=
+      if $opt_duplicate_compiler_generated_deps; then
+	for pre_post_dep in $predeps $postdeps; do
+	  case "$pre_post_deps " in
+	  *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;
+	  esac
+	  func_append pre_post_deps " $pre_post_dep"
+	done
+      fi
+      pre_post_deps=
+    fi
+
+    deplibs=
+    newdependency_libs=
+    newlib_search_path=
+    need_relink=no # whether we're linking any uninstalled libtool libraries
+    notinst_deplibs= # not-installed libtool libraries
+    notinst_path= # paths that contain not-installed libtool libraries
+
+    case $linkmode in
+    lib)
+	passes="conv dlpreopen link"
+	for file in $dlfiles $dlprefiles; do
+	  case $file in
+	  *.la) ;;
+	  *)
+	    func_fatal_help "libraries can '-dlopen' only libtool libraries: $file"
+	    ;;
+	  esac
+	done
+	;;
+    prog)
+	compile_deplibs=
+	finalize_deplibs=
+	alldeplibs=false
+	newdlfiles=
+	newdlprefiles=
+	passes="conv scan dlopen dlpreopen link"
+	;;
+    *)  passes="conv"
+	;;
+    esac
+
+    for pass in $passes; do
+      # The preopen pass in lib mode reverses $deplibs; put it back here
+      # so that -L comes before libs that need it for instance...
+      if test lib,link = "$linkmode,$pass"; then
+	## FIXME: Find the place where the list is rebuilt in the wrong
+	##        order, and fix it there properly
+        tmp_deplibs=
+	for deplib in $deplibs; do
+	  tmp_deplibs="$deplib $tmp_deplibs"
+	done
+	deplibs=$tmp_deplibs
+      fi
+
+      if test lib,link = "$linkmode,$pass" ||
+	 test prog,scan = "$linkmode,$pass"; then
+	libs=$deplibs
+	deplibs=
+      fi
+      if test prog = "$linkmode"; then
+	case $pass in
+	dlopen) libs=$dlfiles ;;
+	dlpreopen) libs=$dlprefiles ;;
+	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
+	esac
+      fi
+      if test lib,dlpreopen = "$linkmode,$pass"; then
+	# Collect and forward deplibs of preopened libtool libs
+	for lib in $dlprefiles; do
+	  # Ignore non-libtool-libs
+	  dependency_libs=
+	  func_resolve_sysroot "$lib"
+	  case $lib in
+	  *.la)	func_source "$func_resolve_sysroot_result" ;;
+	  esac
+
+	  # Collect preopened libtool deplibs, except any this library
+	  # has declared as weak libs
+	  for deplib in $dependency_libs; do
+	    func_basename "$deplib"
+            deplib_base=$func_basename_result
+	    case " $weak_libs " in
+	    *" $deplib_base "*) ;;
+	    *) func_append deplibs " $deplib" ;;
+	    esac
+	  done
+	done
+	libs=$dlprefiles
+      fi
+      if test dlopen = "$pass"; then
+	# Collect dlpreopened libraries
+	save_deplibs=$deplibs
+	deplibs=
+      fi
+
+      for deplib in $libs; do
+	lib=
+	found=false
+	case $deplib in
+	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+        |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
+	  if test prog,link = "$linkmode,$pass"; then
+	    compile_deplibs="$deplib $compile_deplibs"
+	    finalize_deplibs="$deplib $finalize_deplibs"
+	  else
+	    func_append compiler_flags " $deplib"
+	    if test lib = "$linkmode"; then
+		case "$new_inherited_linker_flags " in
+		    *" $deplib "*) ;;
+		    * ) func_append new_inherited_linker_flags " $deplib" ;;
+		esac
+	    fi
+	  fi
+	  continue
+	  ;;
+	-l*)
+	  if test lib != "$linkmode" && test prog != "$linkmode"; then
+	    func_warning "'-l' is ignored for archives/objects"
+	    continue
+	  fi
+	  func_stripname '-l' '' "$deplib"
+	  name=$func_stripname_result
+	  if test lib = "$linkmode"; then
+	    searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
+	  else
+	    searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
+	  fi
+	  for searchdir in $searchdirs; do
+	    for search_ext in .la $std_shrext .so .a; do
+	      # Search the libtool library
+	      lib=$searchdir/lib$name$search_ext
+	      if test -f "$lib"; then
+		if test .la = "$search_ext"; then
+		  found=:
+		else
+		  found=false
+		fi
+		break 2
+	      fi
+	    done
+	  done
+	  if $found; then
+	    # deplib is a libtool library
+	    # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
+	    # We need to do some special things here, and not later.
+	    if test yes = "$allow_libtool_libs_with_static_runtimes"; then
+	      case " $predeps $postdeps " in
+	      *" $deplib "*)
+		if func_lalib_p "$lib"; then
+		  library_names=
+		  old_library=
+		  func_source "$lib"
+		  for l in $old_library $library_names; do
+		    ll=$l
+		  done
+		  if test "X$ll" = "X$old_library"; then # only static version available
+		    found=false
+		    func_dirname "$lib" "" "."
+		    ladir=$func_dirname_result
+		    lib=$ladir/$old_library
+		    if test prog,link = "$linkmode,$pass"; then
+		      compile_deplibs="$deplib $compile_deplibs"
+		      finalize_deplibs="$deplib $finalize_deplibs"
+		    else
+		      deplibs="$deplib $deplibs"
+		      test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs"
+		    fi
+		    continue
+		  fi
+		fi
+		;;
+	      *) ;;
+	      esac
+	    fi
+	  else
+	    # deplib doesn't seem to be a libtool library
+	    if test prog,link = "$linkmode,$pass"; then
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    else
+	      deplibs="$deplib $deplibs"
+	      test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs"
+	    fi
+	    continue
+	  fi
+	  ;; # -l
+	*.ltframework)
+	  if test prog,link = "$linkmode,$pass"; then
+	    compile_deplibs="$deplib $compile_deplibs"
+	    finalize_deplibs="$deplib $finalize_deplibs"
+	  else
+	    deplibs="$deplib $deplibs"
+	    if test lib = "$linkmode"; then
+		case "$new_inherited_linker_flags " in
+		    *" $deplib "*) ;;
+		    * ) func_append new_inherited_linker_flags " $deplib" ;;
+		esac
+	    fi
+	  fi
+	  continue
+	  ;;
+	-L*)
+	  case $linkmode in
+	  lib)
+	    deplibs="$deplib $deplibs"
+	    test conv = "$pass" && continue
+	    newdependency_libs="$deplib $newdependency_libs"
+	    func_stripname '-L' '' "$deplib"
+	    func_resolve_sysroot "$func_stripname_result"
+	    func_append newlib_search_path " $func_resolve_sysroot_result"
+	    ;;
+	  prog)
+	    if test conv = "$pass"; then
+	      deplibs="$deplib $deplibs"
+	      continue
+	    fi
+	    if test scan = "$pass"; then
+	      deplibs="$deplib $deplibs"
+	    else
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    fi
+	    func_stripname '-L' '' "$deplib"
+	    func_resolve_sysroot "$func_stripname_result"
+	    func_append newlib_search_path " $func_resolve_sysroot_result"
+	    ;;
+	  *)
+	    func_warning "'-L' is ignored for archives/objects"
+	    ;;
+	  esac # linkmode
+	  continue
+	  ;; # -L
+	-R*)
+	  if test link = "$pass"; then
+	    func_stripname '-R' '' "$deplib"
+	    func_resolve_sysroot "$func_stripname_result"
+	    dir=$func_resolve_sysroot_result
+	    # Make sure the xrpath contains only unique directories.
+	    case "$xrpath " in
+	    *" $dir "*) ;;
+	    *) func_append xrpath " $dir" ;;
+	    esac
+	  fi
+	  deplibs="$deplib $deplibs"
+	  continue
+	  ;;
+	*.la)
+	  func_resolve_sysroot "$deplib"
+	  lib=$func_resolve_sysroot_result
+	  ;;
+	*.$libext)
+	  if test conv = "$pass"; then
+	    deplibs="$deplib $deplibs"
+	    continue
+	  fi
+	  case $linkmode in
+	  lib)
+	    # Linking convenience modules into shared libraries is allowed,
+	    # but linking other static libraries is non-portable.
+	    case " $dlpreconveniencelibs " in
+	    *" $deplib "*) ;;
+	    *)
+	      valid_a_lib=false
+	      case $deplibs_check_method in
+		match_pattern*)
+		  set dummy $deplibs_check_method; shift
+		  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
+		  if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \
+		    | $EGREP "$match_pattern_regex" > /dev/null; then
+		    valid_a_lib=:
+		  fi
+		;;
+		pass_all)
+		  valid_a_lib=:
+		;;
+	      esac
+	      if $valid_a_lib; then
+		echo
+		$ECHO "*** Warning: Linking the shared library $output against the"
+		$ECHO "*** static library $deplib is not portable!"
+		deplibs="$deplib $deplibs"
+	      else
+		echo
+		$ECHO "*** Warning: Trying to link with static lib archive $deplib."
+		echo "*** I have the capability to make that library automatically link in when"
+		echo "*** you link to this library.  But I can only do this if you have a"
+		echo "*** shared version of the library, which you do not appear to have"
+		echo "*** because the file extensions .$libext of this argument makes me believe"
+		echo "*** that it is just a static archive that I should not use here."
+	      fi
+	      ;;
+	    esac
+	    continue
+	    ;;
+	  prog)
+	    if test link != "$pass"; then
+	      deplibs="$deplib $deplibs"
+	    else
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    fi
+	    continue
+	    ;;
+	  esac # linkmode
+	  ;; # *.$libext
+	*.lo | *.$objext)
+	  if test conv = "$pass"; then
+	    deplibs="$deplib $deplibs"
+	  elif test prog = "$linkmode"; then
+	    if test dlpreopen = "$pass" || test yes != "$dlopen_support" || test no = "$build_libtool_libs"; then
+	      # If there is no dlopen support or we're linking statically,
+	      # we need to preload.
+	      func_append newdlprefiles " $deplib"
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    else
+	      func_append newdlfiles " $deplib"
+	    fi
+	  fi
+	  continue
+	  ;;
+	%DEPLIBS%)
+	  alldeplibs=:
+	  continue
+	  ;;
+	esac # case $deplib
+
+	$found || test -f "$lib" \
+	  || func_fatal_error "cannot find the library '$lib' or unhandled argument '$deplib'"
+
+	# Check to see that this really is a libtool archive.
+	func_lalib_unsafe_p "$lib" \
+	  || func_fatal_error "'$lib' is not a valid libtool archive"
+
+	func_dirname "$lib" "" "."
+	ladir=$func_dirname_result
+
+	dlname=
+	dlopen=
+	dlpreopen=
+	libdir=
+	library_names=
+	old_library=
+	inherited_linker_flags=
+	# If the library was installed with an old release of libtool,
+	# it will not redefine variables installed, or shouldnotlink
+	installed=yes
+	shouldnotlink=no
+	avoidtemprpath=
+
+
+	# Read the .la file
+	func_source "$lib"
+
+	# Convert "-framework foo" to "foo.ltframework"
+	if test -n "$inherited_linker_flags"; then
+	  tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'`
+	  for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
+	    case " $new_inherited_linker_flags " in
+	      *" $tmp_inherited_linker_flag "*) ;;
+	      *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;
+	    esac
+	  done
+	fi
+	dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	if test lib,link = "$linkmode,$pass" ||
+	   test prog,scan = "$linkmode,$pass" ||
+	   { test prog != "$linkmode" && test lib != "$linkmode"; }; then
+	  test -n "$dlopen" && func_append dlfiles " $dlopen"
+	  test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
+	fi
+
+	if test conv = "$pass"; then
+	  # Only check for convenience libraries
+	  deplibs="$lib $deplibs"
+	  if test -z "$libdir"; then
+	    if test -z "$old_library"; then
+	      func_fatal_error "cannot find name of link library for '$lib'"
+	    fi
+	    # It is a libtool convenience library, so add in its objects.
+	    func_append convenience " $ladir/$objdir/$old_library"
+	    func_append old_convenience " $ladir/$objdir/$old_library"
+	  elif test prog != "$linkmode" && test lib != "$linkmode"; then
+	    func_fatal_error "'$lib' is not a convenience library"
+	  fi
+	  tmp_libs=
+	  for deplib in $dependency_libs; do
+	    deplibs="$deplib $deplibs"
+	    if $opt_preserve_dup_deps; then
+	      case "$tmp_libs " in
+	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
+	      esac
+	    fi
+	    func_append tmp_libs " $deplib"
+	  done
+	  continue
+	fi # $pass = conv
+
+
+	# Get the name of the library we link against.
+	linklib=
+	if test -n "$old_library" &&
+	   { test yes = "$prefer_static_libs" ||
+	     test built,no = "$prefer_static_libs,$installed"; }; then
+	  linklib=$old_library
+	else
+	  for l in $old_library $library_names; do
+	    linklib=$l
+	  done
+	fi
+	if test -z "$linklib"; then
+	  func_fatal_error "cannot find name of link library for '$lib'"
+	fi
+
+	# This library was specified with -dlopen.
+	if test dlopen = "$pass"; then
+	  test -z "$libdir" \
+	    && func_fatal_error "cannot -dlopen a convenience library: '$lib'"
+	  if test -z "$dlname" ||
+	     test yes != "$dlopen_support" ||
+	     test no = "$build_libtool_libs"
+	  then
+	    # If there is no dlname, no dlopen support or we're linking
+	    # statically, we need to preload.  We also need to preload any
+	    # dependent libraries so libltdl's deplib preloader doesn't
+	    # bomb out in the load deplibs phase.
+	    func_append dlprefiles " $lib $dependency_libs"
+	  else
+	    func_append newdlfiles " $lib"
+	  fi
+	  continue
+	fi # $pass = dlopen
+
+	# We need an absolute path.
+	case $ladir in
+	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir=$ladir ;;
+	*)
+	  abs_ladir=`cd "$ladir" && pwd`
+	  if test -z "$abs_ladir"; then
+	    func_warning "cannot determine absolute directory name of '$ladir'"
+	    func_warning "passing it literally to the linker, although it might fail"
+	    abs_ladir=$ladir
+	  fi
+	  ;;
+	esac
+	func_basename "$lib"
+	laname=$func_basename_result
+
+	# Find the relevant object directory and library name.
+	if test yes = "$installed"; then
+	  if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+	    func_warning "library '$lib' was moved."
+	    dir=$ladir
+	    absdir=$abs_ladir
+	    libdir=$abs_ladir
+	  else
+	    dir=$lt_sysroot$libdir
+	    absdir=$lt_sysroot$libdir
+	  fi
+	  test yes = "$hardcode_automatic" && avoidtemprpath=yes
+	else
+	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+	    dir=$ladir
+	    absdir=$abs_ladir
+	    # Remove this search path later
+	    func_append notinst_path " $abs_ladir"
+	  else
+	    dir=$ladir/$objdir
+	    absdir=$abs_ladir/$objdir
+	    # Remove this search path later
+	    func_append notinst_path " $abs_ladir"
+	  fi
+	fi # $installed = yes
+	func_stripname 'lib' '.la' "$laname"
+	name=$func_stripname_result
+
+	# This library was specified with -dlpreopen.
+	if test dlpreopen = "$pass"; then
+	  if test -z "$libdir" && test prog = "$linkmode"; then
+	    func_fatal_error "only libraries may -dlpreopen a convenience library: '$lib'"
+	  fi
+	  case $host in
+	    # special handling for platforms with PE-DLLs.
+	    *cygwin* | *mingw* | *cegcc* )
+	      # Linker will automatically link against shared library if both
+	      # static and shared are present.  Therefore, ensure we extract
+	      # symbols from the import library if a shared library is present
+	      # (otherwise, the dlopen module name will be incorrect).  We do
+	      # this by putting the import library name into $newdlprefiles.
+	      # We recover the dlopen module name by 'saving' the la file
+	      # name in a special purpose variable, and (later) extracting the
+	      # dlname from the la file.
+	      if test -n "$dlname"; then
+	        func_tr_sh "$dir/$linklib"
+	        eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname"
+	        func_append newdlprefiles " $dir/$linklib"
+	      else
+	        func_append newdlprefiles " $dir/$old_library"
+	        # Keep a list of preopened convenience libraries to check
+	        # that they are being used correctly in the link pass.
+	        test -z "$libdir" && \
+	          func_append dlpreconveniencelibs " $dir/$old_library"
+	      fi
+	    ;;
+	    * )
+	      # Prefer using a static library (so that no silly _DYNAMIC symbols
+	      # are required to link).
+	      if test -n "$old_library"; then
+	        func_append newdlprefiles " $dir/$old_library"
+	        # Keep a list of preopened convenience libraries to check
+	        # that they are being used correctly in the link pass.
+	        test -z "$libdir" && \
+	          func_append dlpreconveniencelibs " $dir/$old_library"
+	      # Otherwise, use the dlname, so that lt_dlopen finds it.
+	      elif test -n "$dlname"; then
+	        func_append newdlprefiles " $dir/$dlname"
+	      else
+	        func_append newdlprefiles " $dir/$linklib"
+	      fi
+	    ;;
+	  esac
+	fi # $pass = dlpreopen
+
+	if test -z "$libdir"; then
+	  # Link the convenience library
+	  if test lib = "$linkmode"; then
+	    deplibs="$dir/$old_library $deplibs"
+	  elif test prog,link = "$linkmode,$pass"; then
+	    compile_deplibs="$dir/$old_library $compile_deplibs"
+	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
+	  else
+	    deplibs="$lib $deplibs" # used for prog,scan pass
+	  fi
+	  continue
+	fi
+
+
+	if test prog = "$linkmode" && test link != "$pass"; then
+	  func_append newlib_search_path " $ladir"
+	  deplibs="$lib $deplibs"
+
+	  linkalldeplibs=false
+	  if test no != "$link_all_deplibs" || test -z "$library_names" ||
+	     test no = "$build_libtool_libs"; then
+	    linkalldeplibs=:
+	  fi
+
+	  tmp_libs=
+	  for deplib in $dependency_libs; do
+	    case $deplib in
+	    -L*) func_stripname '-L' '' "$deplib"
+	         func_resolve_sysroot "$func_stripname_result"
+	         func_append newlib_search_path " $func_resolve_sysroot_result"
+		 ;;
+	    esac
+	    # Need to link against all dependency_libs?
+	    if $linkalldeplibs; then
+	      deplibs="$deplib $deplibs"
+	    else
+	      # Need to hardcode shared library paths
+	      # or/and link against static libraries
+	      newdependency_libs="$deplib $newdependency_libs"
+	    fi
+	    if $opt_preserve_dup_deps; then
+	      case "$tmp_libs " in
+	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
+	      esac
+	    fi
+	    func_append tmp_libs " $deplib"
+	  done # for deplib
+	  continue
+	fi # $linkmode = prog...
+
+	if test prog,link = "$linkmode,$pass"; then
+	  if test -n "$library_names" &&
+	     { { test no = "$prefer_static_libs" ||
+	         test built,yes = "$prefer_static_libs,$installed"; } ||
+	       test -z "$old_library"; }; then
+	    # We need to hardcode the library path
+	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath"; then
+	      # Make sure the rpath contains only unique directories.
+	      case $temp_rpath: in
+	      *"$absdir:"*) ;;
+	      *) func_append temp_rpath "$absdir:" ;;
+	      esac
+	    fi
+
+	    # Hardcode the library path.
+	    # Skip directories that are in the system default run-time
+	    # search path.
+	    case " $sys_lib_dlsearch_path " in
+	    *" $absdir "*) ;;
+	    *)
+	      case "$compile_rpath " in
+	      *" $absdir "*) ;;
+	      *) func_append compile_rpath " $absdir" ;;
+	      esac
+	      ;;
+	    esac
+	    case " $sys_lib_dlsearch_path " in
+	    *" $libdir "*) ;;
+	    *)
+	      case "$finalize_rpath " in
+	      *" $libdir "*) ;;
+	      *) func_append finalize_rpath " $libdir" ;;
+	      esac
+	      ;;
+	    esac
+	  fi # $linkmode,$pass = prog,link...
+
+	  if $alldeplibs &&
+	     { test pass_all = "$deplibs_check_method" ||
+	       { test yes = "$build_libtool_libs" &&
+		 test -n "$library_names"; }; }; then
+	    # We only need to search for static libraries
+	    continue
+	  fi
+	fi
+
+	link_static=no # Whether the deplib will be linked statically
+	use_static_libs=$prefer_static_libs
+	if test built = "$use_static_libs" && test yes = "$installed"; then
+	  use_static_libs=no
+	fi
+	if test -n "$library_names" &&
+	   { test no = "$use_static_libs" || test -z "$old_library"; }; then
+	  case $host in
+	  *cygwin* | *mingw* | *cegcc* | *os2*)
+	      # No point in relinking DLLs because paths are not encoded
+	      func_append notinst_deplibs " $lib"
+	      need_relink=no
+	    ;;
+	  *)
+	    if test no = "$installed"; then
+	      func_append notinst_deplibs " $lib"
+	      need_relink=yes
+	    fi
+	    ;;
+	  esac
+	  # This is a shared library
+
+	  # Warn about portability, can't link against -module's on some
+	  # systems (darwin).  Don't bleat about dlopened modules though!
+	  dlopenmodule=
+	  for dlpremoduletest in $dlprefiles; do
+	    if test "X$dlpremoduletest" = "X$lib"; then
+	      dlopenmodule=$dlpremoduletest
+	      break
+	    fi
+	  done
+	  if test -z "$dlopenmodule" && test yes = "$shouldnotlink" && test link = "$pass"; then
+	    echo
+	    if test prog = "$linkmode"; then
+	      $ECHO "*** Warning: Linking the executable $output against the loadable module"
+	    else
+	      $ECHO "*** Warning: Linking the shared library $output against the loadable module"
+	    fi
+	    $ECHO "*** $linklib is not portable!"
+	  fi
+	  if test lib = "$linkmode" &&
+	     test yes = "$hardcode_into_libs"; then
+	    # Hardcode the library path.
+	    # Skip directories that are in the system default run-time
+	    # search path.
+	    case " $sys_lib_dlsearch_path " in
+	    *" $absdir "*) ;;
+	    *)
+	      case "$compile_rpath " in
+	      *" $absdir "*) ;;
+	      *) func_append compile_rpath " $absdir" ;;
+	      esac
+	      ;;
+	    esac
+	    case " $sys_lib_dlsearch_path " in
+	    *" $libdir "*) ;;
+	    *)
+	      case "$finalize_rpath " in
+	      *" $libdir "*) ;;
+	      *) func_append finalize_rpath " $libdir" ;;
+	      esac
+	      ;;
+	    esac
+	  fi
+
+	  if test -n "$old_archive_from_expsyms_cmds"; then
+	    # figure out the soname
+	    set dummy $library_names
+	    shift
+	    realname=$1
+	    shift
+	    libname=`eval "\\$ECHO \"$libname_spec\""`
+	    # use dlname if we got it. it's perfectly good, no?
+	    if test -n "$dlname"; then
+	      soname=$dlname
+	    elif test -n "$soname_spec"; then
+	      # bleh windows
+	      case $host in
+	      *cygwin* | mingw* | *cegcc* | *os2*)
+	        func_arith $current - $age
+		major=$func_arith_result
+		versuffix=-$major
+		;;
+	      esac
+	      eval soname=\"$soname_spec\"
+	    else
+	      soname=$realname
+	    fi
+
+	    # Make a new name for the extract_expsyms_cmds to use
+	    soroot=$soname
+	    func_basename "$soroot"
+	    soname=$func_basename_result
+	    func_stripname 'lib' '.dll' "$soname"
+	    newlib=libimp-$func_stripname_result.a
+
+	    # If the library has no export list, then create one now
+	    if test -f "$output_objdir/$soname-def"; then :
+	    else
+	      func_verbose "extracting exported symbol list from '$soname'"
+	      func_execute_cmds "$extract_expsyms_cmds" 'exit $?'
+	    fi
+
+	    # Create $newlib
+	    if test -f "$output_objdir/$newlib"; then :; else
+	      func_verbose "generating import library for '$soname'"
+	      func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?'
+	    fi
+	    # make sure the library variables are pointing to the new library
+	    dir=$output_objdir
+	    linklib=$newlib
+	  fi # test -n "$old_archive_from_expsyms_cmds"
+
+	  if test prog = "$linkmode" || test relink != "$opt_mode"; then
+	    add_shlibpath=
+	    add_dir=
+	    add=
+	    lib_linked=yes
+	    case $hardcode_action in
+	    immediate | unsupported)
+	      if test no = "$hardcode_direct"; then
+		add=$dir/$linklib
+		case $host in
+		  *-*-sco3.2v5.0.[024]*) add_dir=-L$dir ;;
+		  *-*-sysv4*uw2*) add_dir=-L$dir ;;
+		  *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
+		    *-*-unixware7*) add_dir=-L$dir ;;
+		  *-*-darwin* )
+		    # if the lib is a (non-dlopened) module then we cannot
+		    # link against it, someone is ignoring the earlier warnings
+		    if /usr/bin/file -L $add 2> /dev/null |
+			 $GREP ": [^:]* bundle" >/dev/null; then
+		      if test "X$dlopenmodule" != "X$lib"; then
+			$ECHO "*** Warning: lib $linklib is a module, not a shared library"
+			if test -z "$old_library"; then
+			  echo
+			  echo "*** And there doesn't seem to be a static archive available"
+			  echo "*** The link will probably fail, sorry"
+			else
+			  add=$dir/$old_library
+			fi
+		      elif test -n "$old_library"; then
+			add=$dir/$old_library
+		      fi
+		    fi
+		esac
+	      elif test no = "$hardcode_minus_L"; then
+		case $host in
+		*-*-sunos*) add_shlibpath=$dir ;;
+		esac
+		add_dir=-L$dir
+		add=-l$name
+	      elif test no = "$hardcode_shlibpath_var"; then
+		add_shlibpath=$dir
+		add=-l$name
+	      else
+		lib_linked=no
+	      fi
+	      ;;
+	    relink)
+	      if test yes = "$hardcode_direct" &&
+	         test no = "$hardcode_direct_absolute"; then
+		add=$dir/$linklib
+	      elif test yes = "$hardcode_minus_L"; then
+		add_dir=-L$absdir
+		# Try looking first in the location we're being installed to.
+		if test -n "$inst_prefix_dir"; then
+		  case $libdir in
+		    [\\/]*)
+		      func_append add_dir " -L$inst_prefix_dir$libdir"
+		      ;;
+		  esac
+		fi
+		add=-l$name
+	      elif test yes = "$hardcode_shlibpath_var"; then
+		add_shlibpath=$dir
+		add=-l$name
+	      else
+		lib_linked=no
+	      fi
+	      ;;
+	    *) lib_linked=no ;;
+	    esac
+
+	    if test yes != "$lib_linked"; then
+	      func_fatal_configuration "unsupported hardcode properties"
+	    fi
+
+	    if test -n "$add_shlibpath"; then
+	      case :$compile_shlibpath: in
+	      *":$add_shlibpath:"*) ;;
+	      *) func_append compile_shlibpath "$add_shlibpath:" ;;
+	      esac
+	    fi
+	    if test prog = "$linkmode"; then
+	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
+	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
+	    else
+	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
+	      test -n "$add" && deplibs="$add $deplibs"
+	      if test yes != "$hardcode_direct" &&
+		 test yes != "$hardcode_minus_L" &&
+		 test yes = "$hardcode_shlibpath_var"; then
+		case :$finalize_shlibpath: in
+		*":$libdir:"*) ;;
+		*) func_append finalize_shlibpath "$libdir:" ;;
+		esac
+	      fi
+	    fi
+	  fi
+
+	  if test prog = "$linkmode" || test relink = "$opt_mode"; then
+	    add_shlibpath=
+	    add_dir=
+	    add=
+	    # Finalize command for both is simple: just hardcode it.
+	    if test yes = "$hardcode_direct" &&
+	       test no = "$hardcode_direct_absolute"; then
+	      add=$libdir/$linklib
+	    elif test yes = "$hardcode_minus_L"; then
+	      add_dir=-L$libdir
+	      add=-l$name
+	    elif test yes = "$hardcode_shlibpath_var"; then
+	      case :$finalize_shlibpath: in
+	      *":$libdir:"*) ;;
+	      *) func_append finalize_shlibpath "$libdir:" ;;
+	      esac
+	      add=-l$name
+	    elif test yes = "$hardcode_automatic"; then
+	      if test -n "$inst_prefix_dir" &&
+		 test -f "$inst_prefix_dir$libdir/$linklib"; then
+		add=$inst_prefix_dir$libdir/$linklib
+	      else
+		add=$libdir/$linklib
+	      fi
+	    else
+	      # We cannot seem to hardcode it, guess we'll fake it.
+	      add_dir=-L$libdir
+	      # Try looking first in the location we're being installed to.
+	      if test -n "$inst_prefix_dir"; then
+		case $libdir in
+		  [\\/]*)
+		    func_append add_dir " -L$inst_prefix_dir$libdir"
+		    ;;
+		esac
+	      fi
+	      add=-l$name
+	    fi
+
+	    if test prog = "$linkmode"; then
+	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
+	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
+	    else
+	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
+	      test -n "$add" && deplibs="$add $deplibs"
+	    fi
+	  fi
+	elif test prog = "$linkmode"; then
+	  # Here we assume that one of hardcode_direct or hardcode_minus_L
+	  # is not unsupported.  This is valid on all known static and
+	  # shared platforms.
+	  if test unsupported != "$hardcode_direct"; then
+	    test -n "$old_library" && linklib=$old_library
+	    compile_deplibs="$dir/$linklib $compile_deplibs"
+	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
+	  else
+	    compile_deplibs="-l$name -L$dir $compile_deplibs"
+	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
+	  fi
+	elif test yes = "$build_libtool_libs"; then
+	  # Not a shared library
+	  if test pass_all != "$deplibs_check_method"; then
+	    # We're trying link a shared library against a static one
+	    # but the system doesn't support it.
+
+	    # Just print a warning and add the library to dependency_libs so
+	    # that the program can be linked against the static library.
+	    echo
+	    $ECHO "*** Warning: This system cannot link to static lib archive $lib."
+	    echo "*** I have the capability to make that library automatically link in when"
+	    echo "*** you link to this library.  But I can only do this if you have a"
+	    echo "*** shared version of the library, which you do not appear to have."
+	    if test yes = "$module"; then
+	      echo "*** But as you try to build a module library, libtool will still create "
+	      echo "*** a static module, that should work as long as the dlopening application"
+	      echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
+	      if test -z "$global_symbol_pipe"; then
+		echo
+		echo "*** However, this would only work if libtool was able to extract symbol"
+		echo "*** lists from a program, using 'nm' or equivalent, but libtool could"
+		echo "*** not find such a program.  So, this module is probably useless."
+		echo "*** 'nm' from GNU binutils and a full rebuild may help."
+	      fi
+	      if test no = "$build_old_libs"; then
+		build_libtool_libs=module
+		build_old_libs=yes
+	      else
+		build_libtool_libs=no
+	      fi
+	    fi
+	  else
+	    deplibs="$dir/$old_library $deplibs"
+	    link_static=yes
+	  fi
+	fi # link shared/static library?
+
+	if test lib = "$linkmode"; then
+	  if test -n "$dependency_libs" &&
+	     { test yes != "$hardcode_into_libs" ||
+	       test yes = "$build_old_libs" ||
+	       test yes = "$link_static"; }; then
+	    # Extract -R from dependency_libs
+	    temp_deplibs=
+	    for libdir in $dependency_libs; do
+	      case $libdir in
+	      -R*) func_stripname '-R' '' "$libdir"
+	           temp_xrpath=$func_stripname_result
+		   case " $xrpath " in
+		   *" $temp_xrpath "*) ;;
+		   *) func_append xrpath " $temp_xrpath";;
+		   esac;;
+	      *) func_append temp_deplibs " $libdir";;
+	      esac
+	    done
+	    dependency_libs=$temp_deplibs
+	  fi
+
+	  func_append newlib_search_path " $absdir"
+	  # Link against this library
+	  test no = "$link_static" && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
+	  # ... and its dependency_libs
+	  tmp_libs=
+	  for deplib in $dependency_libs; do
+	    newdependency_libs="$deplib $newdependency_libs"
+	    case $deplib in
+              -L*) func_stripname '-L' '' "$deplib"
+                   func_resolve_sysroot "$func_stripname_result";;
+              *) func_resolve_sysroot "$deplib" ;;
+            esac
+	    if $opt_preserve_dup_deps; then
+	      case "$tmp_libs " in
+	      *" $func_resolve_sysroot_result "*)
+                func_append specialdeplibs " $func_resolve_sysroot_result" ;;
+	      esac
+	    fi
+	    func_append tmp_libs " $func_resolve_sysroot_result"
+	  done
+
+	  if test no != "$link_all_deplibs"; then
+	    # Add the search paths of all dependency libraries
+	    for deplib in $dependency_libs; do
+	      path=
+	      case $deplib in
+	      -L*) path=$deplib ;;
+	      *.la)
+	        func_resolve_sysroot "$deplib"
+	        deplib=$func_resolve_sysroot_result
+	        func_dirname "$deplib" "" "."
+		dir=$func_dirname_result
+		# We need an absolute path.
+		case $dir in
+		[\\/]* | [A-Za-z]:[\\/]*) absdir=$dir ;;
+		*)
+		  absdir=`cd "$dir" && pwd`
+		  if test -z "$absdir"; then
+		    func_warning "cannot determine absolute directory name of '$dir'"
+		    absdir=$dir
+		  fi
+		  ;;
+		esac
+		if $GREP "^installed=no" $deplib > /dev/null; then
+		case $host in
+		*-*-darwin*)
+		  depdepl=
+		  eval deplibrary_names=`$SED -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
+		  if test -n "$deplibrary_names"; then
+		    for tmp in $deplibrary_names; do
+		      depdepl=$tmp
+		    done
+		    if test -f "$absdir/$objdir/$depdepl"; then
+		      depdepl=$absdir/$objdir/$depdepl
+		      darwin_install_name=`$OTOOL -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
+                      if test -z "$darwin_install_name"; then
+                          darwin_install_name=`$OTOOL64 -L $depdepl  | awk '{if (NR == 2) {print $1;exit}}'`
+                      fi
+		      func_append compiler_flags " $wl-dylib_file $wl$darwin_install_name:$depdepl"
+		      func_append linker_flags " -dylib_file $darwin_install_name:$depdepl"
+		      path=
+		    fi
+		  fi
+		  ;;
+		*)
+		  path=-L$absdir/$objdir
+		  ;;
+		esac
+		else
+		  eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+		  test -z "$libdir" && \
+		    func_fatal_error "'$deplib' is not a valid libtool archive"
+		  test "$absdir" != "$libdir" && \
+		    func_warning "'$deplib' seems to be moved"
+
+		  path=-L$absdir
+		fi
+		;;
+	      esac
+	      case " $deplibs " in
+	      *" $path "*) ;;
+	      *) deplibs="$path $deplibs" ;;
+	      esac
+	    done
+	  fi # link_all_deplibs != no
+	fi # linkmode = lib
+      done # for deplib in $libs
+      if test link = "$pass"; then
+	if test prog = "$linkmode"; then
+	  compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
+	  finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
+	else
+	  compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	fi
+      fi
+      dependency_libs=$newdependency_libs
+      if test dlpreopen = "$pass"; then
+	# Link the dlpreopened libraries before other libraries
+	for deplib in $save_deplibs; do
+	  deplibs="$deplib $deplibs"
+	done
+      fi
+      if test dlopen != "$pass"; then
+	test conv = "$pass" || {
+	  # Make sure lib_search_path contains only unique directories.
+	  lib_search_path=
+	  for dir in $newlib_search_path; do
+	    case "$lib_search_path " in
+	    *" $dir "*) ;;
+	    *) func_append lib_search_path " $dir" ;;
+	    esac
+	  done
+	  newlib_search_path=
+	}
+
+	if test prog,link = "$linkmode,$pass"; then
+	  vars="compile_deplibs finalize_deplibs"
+	else
+	  vars=deplibs
+	fi
+	for var in $vars dependency_libs; do
+	  # Add libraries to $var in reverse order
+	  eval tmp_libs=\"\$$var\"
+	  new_libs=
+	  for deplib in $tmp_libs; do
+	    # FIXME: Pedantically, this is the right thing to do, so
+	    #        that some nasty dependency loop isn't accidentally
+	    #        broken:
+	    #new_libs="$deplib $new_libs"
+	    # Pragmatically, this seems to cause very few problems in
+	    # practice:
+	    case $deplib in
+	    -L*) new_libs="$deplib $new_libs" ;;
+	    -R*) ;;
+	    *)
+	      # And here is the reason: when a library appears more
+	      # than once as an explicit dependence of a library, or
+	      # is implicitly linked in more than once by the
+	      # compiler, it is considered special, and multiple
+	      # occurrences thereof are not removed.  Compare this
+	      # with having the same library being listed as a
+	      # dependency of multiple other libraries: in this case,
+	      # we know (pedantically, we assume) the library does not
+	      # need to be listed more than once, so we keep only the
+	      # last copy.  This is not always right, but it is rare
+	      # enough that we require users that really mean to play
+	      # such unportable linking tricks to link the library
+	      # using -Wl,-lname, so that libtool does not consider it
+	      # for duplicate removal.
+	      case " $specialdeplibs " in
+	      *" $deplib "*) new_libs="$deplib $new_libs" ;;
+	      *)
+		case " $new_libs " in
+		*" $deplib "*) ;;
+		*) new_libs="$deplib $new_libs" ;;
+		esac
+		;;
+	      esac
+	      ;;
+	    esac
+	  done
+	  tmp_libs=
+	  for deplib in $new_libs; do
+	    case $deplib in
+	    -L*)
+	      case " $tmp_libs " in
+	      *" $deplib "*) ;;
+	      *) func_append tmp_libs " $deplib" ;;
+	      esac
+	      ;;
+	    *) func_append tmp_libs " $deplib" ;;
+	    esac
+	  done
+	  eval $var=\"$tmp_libs\"
+	done # for var
+      fi
+
+      # Add Sun CC postdeps if required:
+      test CXX = "$tagname" && {
+        case $host_os in
+        linux*)
+          case `$CC -V 2>&1 | sed 5q` in
+          *Sun\ C*) # Sun C++ 5.9
+            func_suncc_cstd_abi
+
+            if test no != "$suncc_use_cstd_abi"; then
+              func_append postdeps ' -library=Cstd -library=Crun'
+            fi
+            ;;
+          esac
+          ;;
+
+        solaris*)
+          func_cc_basename "$CC"
+          case $func_cc_basename_result in
+          CC* | sunCC*)
+            func_suncc_cstd_abi
+
+            if test no != "$suncc_use_cstd_abi"; then
+              func_append postdeps ' -library=Cstd -library=Crun'
+            fi
+            ;;
+          esac
+          ;;
+        esac
+      }
+
+      # Last step: remove runtime libs from dependency_libs
+      # (they stay in deplibs)
+      tmp_libs=
+      for i in $dependency_libs; do
+	case " $predeps $postdeps $compiler_lib_search_path " in
+	*" $i "*)
+	  i=
+	  ;;
+	esac
+	if test -n "$i"; then
+	  func_append tmp_libs " $i"
+	fi
+      done
+      dependency_libs=$tmp_libs
+    done # for pass
+    if test prog = "$linkmode"; then
+      dlfiles=$newdlfiles
+    fi
+    if test prog = "$linkmode" || test lib = "$linkmode"; then
+      dlprefiles=$newdlprefiles
+    fi
+
+    case $linkmode in
+    oldlib)
+      if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
+	func_warning "'-dlopen' is ignored for archives"
+      fi
+
+      case " $deplibs" in
+      *\ -l* | *\ -L*)
+	func_warning "'-l' and '-L' are ignored for archives" ;;
+      esac
+
+      test -n "$rpath" && \
+	func_warning "'-rpath' is ignored for archives"
+
+      test -n "$xrpath" && \
+	func_warning "'-R' is ignored for archives"
+
+      test -n "$vinfo" && \
+	func_warning "'-version-info/-version-number' is ignored for archives"
+
+      test -n "$release" && \
+	func_warning "'-release' is ignored for archives"
+
+      test -n "$export_symbols$export_symbols_regex" && \
+	func_warning "'-export-symbols' is ignored for archives"
+
+      # Now set the variables for building old libraries.
+      build_libtool_libs=no
+      oldlibs=$output
+      func_append objs "$old_deplibs"
+      ;;
+
+    lib)
+      # Make sure we only generate libraries of the form 'libNAME.la'.
+      case $outputname in
+      lib*)
+	func_stripname 'lib' '.la' "$outputname"
+	name=$func_stripname_result
+	eval shared_ext=\"$shrext_cmds\"
+	eval libname=\"$libname_spec\"
+	;;
+      *)
+	test no = "$module" \
+	  && func_fatal_help "libtool library '$output' must begin with 'lib'"
+
+	if test no != "$need_lib_prefix"; then
+	  # Add the "lib" prefix for modules if required
+	  func_stripname '' '.la' "$outputname"
+	  name=$func_stripname_result
+	  eval shared_ext=\"$shrext_cmds\"
+	  eval libname=\"$libname_spec\"
+	else
+	  func_stripname '' '.la' "$outputname"
+	  libname=$func_stripname_result
+	fi
+	;;
+      esac
+
+      if test -n "$objs"; then
+	if test pass_all != "$deplibs_check_method"; then
+	  func_fatal_error "cannot build libtool library '$output' from non-libtool objects on this host:$objs"
+	else
+	  echo
+	  $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
+	  $ECHO "*** objects $objs is not portable!"
+	  func_append libobjs " $objs"
+	fi
+      fi
+
+      test no = "$dlself" \
+	|| func_warning "'-dlopen self' is ignored for libtool libraries"
+
+      set dummy $rpath
+      shift
+      test 1 -lt "$#" \
+	&& func_warning "ignoring multiple '-rpath's for a libtool library"
+
+      install_libdir=$1
+
+      oldlibs=
+      if test -z "$rpath"; then
+	if test yes = "$build_libtool_libs"; then
+	  # Building a libtool convenience library.
+	  # Some compilers have problems with a '.al' extension so
+	  # convenience libraries should have the same extension an
+	  # archive normally would.
+	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
+	  build_libtool_libs=convenience
+	  build_old_libs=yes
+	fi
+
+	test -n "$vinfo" && \
+	  func_warning "'-version-info/-version-number' is ignored for convenience libraries"
+
+	test -n "$release" && \
+	  func_warning "'-release' is ignored for convenience libraries"
+      else
+
+	# Parse the version information argument.
+	save_ifs=$IFS; IFS=:
+	set dummy $vinfo 0 0 0
+	shift
+	IFS=$save_ifs
+
+	test -n "$7" && \
+	  func_fatal_help "too many parameters to '-version-info'"
+
+	# convert absolute version numbers to libtool ages
+	# this retains compatibility with .la files and attempts
+	# to make the code below a bit more comprehensible
+
+	case $vinfo_number in
+	yes)
+	  number_major=$1
+	  number_minor=$2
+	  number_revision=$3
+	  #
+	  # There are really only two kinds -- those that
+	  # use the current revision as the major version
+	  # and those that subtract age and use age as
+	  # a minor version.  But, then there is irix
+	  # that has an extra 1 added just for fun
+	  #
+	  case $version_type in
+	  # correct linux to gnu/linux during the next big refactor
+	  darwin|freebsd-elf|linux|osf|windows|none)
+	    func_arith $number_major + $number_minor
+	    current=$func_arith_result
+	    age=$number_minor
+	    revision=$number_revision
+	    ;;
+	  freebsd-aout|qnx|sunos)
+	    current=$number_major
+	    revision=$number_minor
+	    age=0
+	    ;;
+	  irix|nonstopux)
+	    func_arith $number_major + $number_minor
+	    current=$func_arith_result
+	    age=$number_minor
+	    revision=$number_minor
+	    lt_irix_increment=no
+	    ;;
+	  esac
+	  ;;
+	no)
+	  current=$1
+	  revision=$2
+	  age=$3
+	  ;;
+	esac
+
+	# Check that each of the things are valid numbers.
+	case $current in
+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+	*)
+	  func_error "CURRENT '$current' must be a nonnegative integer"
+	  func_fatal_error "'$vinfo' is not valid version information"
+	  ;;
+	esac
+
+	case $revision in
+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+	*)
+	  func_error "REVISION '$revision' must be a nonnegative integer"
+	  func_fatal_error "'$vinfo' is not valid version information"
+	  ;;
+	esac
+
+	case $age in
+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+	*)
+	  func_error "AGE '$age' must be a nonnegative integer"
+	  func_fatal_error "'$vinfo' is not valid version information"
+	  ;;
+	esac
+
+	if test "$age" -gt "$current"; then
+	  func_error "AGE '$age' is greater than the current interface number '$current'"
+	  func_fatal_error "'$vinfo' is not valid version information"
+	fi
+
+	# Calculate the version variables.
+	major=
+	versuffix=
+	verstring=
+	case $version_type in
+	none) ;;
+
+	darwin)
+	  # Like Linux, but with the current version available in
+	  # verstring for coding it into the library header
+	  func_arith $current - $age
+	  major=.$func_arith_result
+	  versuffix=$major.$age.$revision
+	  # Darwin ld doesn't like 0 for these options...
+	  func_arith $current + 1
+	  minor_current=$func_arith_result
+	  xlcverstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision"
+	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+          # On Darwin other compilers
+          case $CC in
+              nagfor*)
+                  verstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision"
+                  ;;
+              *)
+                  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+                  ;;
+          esac
+	  ;;
+
+	freebsd-aout)
+	  major=.$current
+	  versuffix=.$current.$revision
+	  ;;
+
+	freebsd-elf)
+	  func_arith $current - $age
+	  major=.$func_arith_result
+	  versuffix=$major.$age.$revision
+	  ;;
+
+	irix | nonstopux)
+	  if test no = "$lt_irix_increment"; then
+	    func_arith $current - $age
+	  else
+	    func_arith $current - $age + 1
+	  fi
+	  major=$func_arith_result
+
+	  case $version_type in
+	    nonstopux) verstring_prefix=nonstopux ;;
+	    *)         verstring_prefix=sgi ;;
+	  esac
+	  verstring=$verstring_prefix$major.$revision
+
+	  # Add in all the interfaces that we are compatible with.
+	  loop=$revision
+	  while test 0 -ne "$loop"; do
+	    func_arith $revision - $loop
+	    iface=$func_arith_result
+	    func_arith $loop - 1
+	    loop=$func_arith_result
+	    verstring=$verstring_prefix$major.$iface:$verstring
+	  done
+
+	  # Before this point, $major must not contain '.'.
+	  major=.$major
+	  versuffix=$major.$revision
+	  ;;
+
+	linux) # correct to gnu/linux during the next big refactor
+	  func_arith $current - $age
+	  major=.$func_arith_result
+	  versuffix=$major.$age.$revision
+	  ;;
+
+	osf)
+	  func_arith $current - $age
+	  major=.$func_arith_result
+	  versuffix=.$current.$age.$revision
+	  verstring=$current.$age.$revision
+
+	  # Add in all the interfaces that we are compatible with.
+	  loop=$age
+	  while test 0 -ne "$loop"; do
+	    func_arith $current - $loop
+	    iface=$func_arith_result
+	    func_arith $loop - 1
+	    loop=$func_arith_result
+	    verstring=$verstring:$iface.0
+	  done
+
+	  # Make executables depend on our current version.
+	  func_append verstring ":$current.0"
+	  ;;
+
+	qnx)
+	  major=.$current
+	  versuffix=.$current
+	  ;;
+
+	sco)
+	  major=.$current
+	  versuffix=.$current
+	  ;;
+
+	sunos)
+	  major=.$current
+	  versuffix=.$current.$revision
+	  ;;
+
+	windows)
+	  # Use '-' rather than '.', since we only want one
+	  # extension on DOS 8.3 file systems.
+	  func_arith $current - $age
+	  major=$func_arith_result
+	  versuffix=-$major
+	  ;;
+
+	*)
+	  func_fatal_configuration "unknown library version type '$version_type'"
+	  ;;
+	esac
+
+	# Clear the version info if we defaulted, and they specified a release.
+	if test -z "$vinfo" && test -n "$release"; then
+	  major=
+	  case $version_type in
+	  darwin)
+	    # we can't check for "0.0" in archive_cmds due to quoting
+	    # problems, so we reset it completely
+	    verstring=
+	    ;;
+	  *)
+	    verstring=0.0
+	    ;;
+	  esac
+	  if test no = "$need_version"; then
+	    versuffix=
+	  else
+	    versuffix=.0.0
+	  fi
+	fi
+
+	# Remove version info from name if versioning should be avoided
+	if test yes,no = "$avoid_version,$need_version"; then
+	  major=
+	  versuffix=
+	  verstring=
+	fi
+
+	# Check to see if the archive will have undefined symbols.
+	if test yes = "$allow_undefined"; then
+	  if test unsupported = "$allow_undefined_flag"; then
+	    if test yes = "$build_old_libs"; then
+	      func_warning "undefined symbols not allowed in $host shared libraries; building static only"
+	      build_libtool_libs=no
+	    else
+	      func_fatal_error "can't build $host shared library unless -no-undefined is specified"
+	    fi
+	  fi
+	else
+	  # Don't allow undefined symbols.
+	  allow_undefined_flag=$no_undefined_flag
+	fi
+
+      fi
+
+      func_generate_dlsyms "$libname" "$libname" :
+      func_append libobjs " $symfileobj"
+      test " " = "$libobjs" && libobjs=
+
+      if test relink != "$opt_mode"; then
+	# Remove our outputs, but don't remove object files since they
+	# may have been created when compiling PIC objects.
+	removelist=
+	tempremovelist=`$ECHO "$output_objdir/*"`
+	for p in $tempremovelist; do
+	  case $p in
+	    *.$objext | *.gcno)
+	       ;;
+	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/$libname$release.*)
+	       if test -n "$precious_files_regex"; then
+		 if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
+		 then
+		   continue
+		 fi
+	       fi
+	       func_append removelist " $p"
+	       ;;
+	    *) ;;
+	  esac
+	done
+	test -n "$removelist" && \
+	  func_show_eval "${RM}r \$removelist"
+      fi
+
+      # Now set the variables for building old libraries.
+      if test yes = "$build_old_libs" && test convenience != "$build_libtool_libs"; then
+	func_append oldlibs " $output_objdir/$libname.$libext"
+
+	# Transform .lo files to .o files.
+	oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; $lo2o" | $NL2SP`
+      fi
+
+      # Eliminate all temporary directories.
+      #for path in $notinst_path; do
+      #	lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"`
+      #	deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"`
+      #	dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"`
+      #done
+
+      if test -n "$xrpath"; then
+	# If the user specified any rpath flags, then add them.
+	temp_xrpath=
+	for libdir in $xrpath; do
+	  func_replace_sysroot "$libdir"
+	  func_append temp_xrpath " -R$func_replace_sysroot_result"
+	  case "$finalize_rpath " in
+	  *" $libdir "*) ;;
+	  *) func_append finalize_rpath " $libdir" ;;
+	  esac
+	done
+	if test yes != "$hardcode_into_libs" || test yes = "$build_old_libs"; then
+	  dependency_libs="$temp_xrpath $dependency_libs"
+	fi
+      fi
+
+      # Make sure dlfiles contains only unique files that won't be dlpreopened
+      old_dlfiles=$dlfiles
+      dlfiles=
+      for lib in $old_dlfiles; do
+	case " $dlprefiles $dlfiles " in
+	*" $lib "*) ;;
+	*) func_append dlfiles " $lib" ;;
+	esac
+      done
+
+      # Make sure dlprefiles contains only unique files
+      old_dlprefiles=$dlprefiles
+      dlprefiles=
+      for lib in $old_dlprefiles; do
+	case "$dlprefiles " in
+	*" $lib "*) ;;
+	*) func_append dlprefiles " $lib" ;;
+	esac
+      done
+
+      if test yes = "$build_libtool_libs"; then
+	if test -n "$rpath"; then
+	  case $host in
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
+	    # these systems don't actually have a c library (as such)!
+	    ;;
+	  *-*-rhapsody* | *-*-darwin1.[012])
+	    # Rhapsody C library is in the System framework
+	    func_append deplibs " System.ltframework"
+	    ;;
+	  *-*-netbsd*)
+	    # Don't link with libc until the a.out ld.so is fixed.
+	    ;;
+	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+	    # Do not include libc due to us having libc/libc_r.
+	    ;;
+	  *-*-sco3.2v5* | *-*-sco5v6*)
+	    # Causes problems with __ctype
+	    ;;
+	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
+	    # Compiler inserts libc in the correct place for threads to work
+	    ;;
+	  *)
+	    # Add libc to deplibs on all other systems if necessary.
+	    if test yes = "$build_libtool_need_lc"; then
+	      func_append deplibs " -lc"
+	    fi
+	    ;;
+	  esac
+	fi
+
+	# Transform deplibs into only deplibs that can be linked in shared.
+	name_save=$name
+	libname_save=$libname
+	release_save=$release
+	versuffix_save=$versuffix
+	major_save=$major
+	# I'm not sure if I'm treating the release correctly.  I think
+	# release should show up in the -l (ie -lgmp5) so we don't want to
+	# add it in twice.  Is that correct?
+	release=
+	versuffix=
+	major=
+	newdeplibs=
+	droppeddeps=no
+	case $deplibs_check_method in
+	pass_all)
+	  # Don't check for shared/static.  Everything works.
+	  # This might be a little naive.  We might want to check
+	  # whether the library exists or not.  But this is on
+	  # osf3 & osf4 and I'm not really sure... Just
+	  # implementing what was already the behavior.
+	  newdeplibs=$deplibs
+	  ;;
+	test_compile)
+	  # This code stresses the "libraries are programs" paradigm to its
+	  # limits. Maybe even breaks it.  We compile a program, linking it
+	  # against the deplibs as a proxy for the library.  Then we can check
+	  # whether they linked in statically or dynamically with ldd.
+	  $opt_dry_run || $RM conftest.c
+	  cat > conftest.c <<EOF
+	  int main() { return 0; }
+EOF
+	  $opt_dry_run || $RM conftest
+	  if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
+	    ldd_output=`ldd conftest`
+	    for i in $deplibs; do
+	      case $i in
+	      -l*)
+		func_stripname -l '' "$i"
+		name=$func_stripname_result
+		if test yes = "$allow_libtool_libs_with_static_runtimes"; then
+		  case " $predeps $postdeps " in
+		  *" $i "*)
+		    func_append newdeplibs " $i"
+		    i=
+		    ;;
+		  esac
+		fi
+		if test -n "$i"; then
+		  libname=`eval "\\$ECHO \"$libname_spec\""`
+		  deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
+		  set dummy $deplib_matches; shift
+		  deplib_match=$1
+		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then
+		    func_append newdeplibs " $i"
+		  else
+		    droppeddeps=yes
+		    echo
+		    $ECHO "*** Warning: dynamic linker does not accept needed library $i."
+		    echo "*** I have the capability to make that library automatically link in when"
+		    echo "*** you link to this library.  But I can only do this if you have a"
+		    echo "*** shared version of the library, which I believe you do not have"
+		    echo "*** because a test_compile did reveal that the linker did not use it for"
+		    echo "*** its dynamic dependency list that programs get resolved with at runtime."
+		  fi
+		fi
+		;;
+	      *)
+		func_append newdeplibs " $i"
+		;;
+	      esac
+	    done
+	  else
+	    # Error occurred in the first compile.  Let's try to salvage
+	    # the situation: Compile a separate program for each library.
+	    for i in $deplibs; do
+	      case $i in
+	      -l*)
+		func_stripname -l '' "$i"
+		name=$func_stripname_result
+		$opt_dry_run || $RM conftest
+		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
+		  ldd_output=`ldd conftest`
+		  if test yes = "$allow_libtool_libs_with_static_runtimes"; then
+		    case " $predeps $postdeps " in
+		    *" $i "*)
+		      func_append newdeplibs " $i"
+		      i=
+		      ;;
+		    esac
+		  fi
+		  if test -n "$i"; then
+		    libname=`eval "\\$ECHO \"$libname_spec\""`
+		    deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
+		    set dummy $deplib_matches; shift
+		    deplib_match=$1
+		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then
+		      func_append newdeplibs " $i"
+		    else
+		      droppeddeps=yes
+		      echo
+		      $ECHO "*** Warning: dynamic linker does not accept needed library $i."
+		      echo "*** I have the capability to make that library automatically link in when"
+		      echo "*** you link to this library.  But I can only do this if you have a"
+		      echo "*** shared version of the library, which you do not appear to have"
+		      echo "*** because a test_compile did reveal that the linker did not use this one"
+		      echo "*** as a dynamic dependency that programs can get resolved with at runtime."
+		    fi
+		  fi
+		else
+		  droppeddeps=yes
+		  echo
+		  $ECHO "*** Warning!  Library $i is needed by this library but I was not able to"
+		  echo "*** make it link in!  You will probably need to install it or some"
+		  echo "*** library that it depends on before this library will be fully"
+		  echo "*** functional.  Installing it before continuing would be even better."
+		fi
+		;;
+	      *)
+		func_append newdeplibs " $i"
+		;;
+	      esac
+	    done
+	  fi
+	  ;;
+	file_magic*)
+	  set dummy $deplibs_check_method; shift
+	  file_magic_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
+	  for a_deplib in $deplibs; do
+	    case $a_deplib in
+	    -l*)
+	      func_stripname -l '' "$a_deplib"
+	      name=$func_stripname_result
+	      if test yes = "$allow_libtool_libs_with_static_runtimes"; then
+		case " $predeps $postdeps " in
+		*" $a_deplib "*)
+		  func_append newdeplibs " $a_deplib"
+		  a_deplib=
+		  ;;
+		esac
+	      fi
+	      if test -n "$a_deplib"; then
+		libname=`eval "\\$ECHO \"$libname_spec\""`
+		if test -n "$file_magic_glob"; then
+		  libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
+		else
+		  libnameglob=$libname
+		fi
+		test yes = "$want_nocaseglob" && nocaseglob=`shopt -p nocaseglob`
+		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+		  if test yes = "$want_nocaseglob"; then
+		    shopt -s nocaseglob
+		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
+		    $nocaseglob
+		  else
+		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
+		  fi
+		  for potent_lib in $potential_libs; do
+		      # Follow soft links.
+		      if ls -lLd "$potent_lib" 2>/dev/null |
+			 $GREP " -> " >/dev/null; then
+			continue
+		      fi
+		      # The statement above tries to avoid entering an
+		      # endless loop below, in case of cyclic links.
+		      # We might still enter an endless loop, since a link
+		      # loop can be closed while we follow links,
+		      # but so what?
+		      potlib=$potent_lib
+		      while test -h "$potlib" 2>/dev/null; do
+			potliblink=`ls -ld $potlib | $SED 's/.* -> //'`
+			case $potliblink in
+			[\\/]* | [A-Za-z]:[\\/]*) potlib=$potliblink;;
+			*) potlib=`$ECHO "$potlib" | $SED 's|[^/]*$||'`"$potliblink";;
+			esac
+		      done
+		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
+			 $SED -e 10q |
+			 $EGREP "$file_magic_regex" > /dev/null; then
+			func_append newdeplibs " $a_deplib"
+			a_deplib=
+			break 2
+		      fi
+		  done
+		done
+	      fi
+	      if test -n "$a_deplib"; then
+		droppeddeps=yes
+		echo
+		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
+		echo "*** I have the capability to make that library automatically link in when"
+		echo "*** you link to this library.  But I can only do this if you have a"
+		echo "*** shared version of the library, which you do not appear to have"
+		echo "*** because I did check the linker path looking for a file starting"
+		if test -z "$potlib"; then
+		  $ECHO "*** with $libname but no candidates were found. (...for file magic test)"
+		else
+		  $ECHO "*** with $libname and none of the candidates passed a file format test"
+		  $ECHO "*** using a file magic. Last file checked: $potlib"
+		fi
+	      fi
+	      ;;
+	    *)
+	      # Add a -L argument.
+	      func_append newdeplibs " $a_deplib"
+	      ;;
+	    esac
+	  done # Gone through all deplibs.
+	  ;;
+	match_pattern*)
+	  set dummy $deplibs_check_method; shift
+	  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
+	  for a_deplib in $deplibs; do
+	    case $a_deplib in
+	    -l*)
+	      func_stripname -l '' "$a_deplib"
+	      name=$func_stripname_result
+	      if test yes = "$allow_libtool_libs_with_static_runtimes"; then
+		case " $predeps $postdeps " in
+		*" $a_deplib "*)
+		  func_append newdeplibs " $a_deplib"
+		  a_deplib=
+		  ;;
+		esac
+	      fi
+	      if test -n "$a_deplib"; then
+		libname=`eval "\\$ECHO \"$libname_spec\""`
+		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+		  for potent_lib in $potential_libs; do
+		    potlib=$potent_lib # see symlink-check above in file_magic test
+		    if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
+		       $EGREP "$match_pattern_regex" > /dev/null; then
+		      func_append newdeplibs " $a_deplib"
+		      a_deplib=
+		      break 2
+		    fi
+		  done
+		done
+	      fi
+	      if test -n "$a_deplib"; then
+		droppeddeps=yes
+		echo
+		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
+		echo "*** I have the capability to make that library automatically link in when"
+		echo "*** you link to this library.  But I can only do this if you have a"
+		echo "*** shared version of the library, which you do not appear to have"
+		echo "*** because I did check the linker path looking for a file starting"
+		if test -z "$potlib"; then
+		  $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
+		else
+		  $ECHO "*** with $libname and none of the candidates passed a file format test"
+		  $ECHO "*** using a regex pattern. Last file checked: $potlib"
+		fi
+	      fi
+	      ;;
+	    *)
+	      # Add a -L argument.
+	      func_append newdeplibs " $a_deplib"
+	      ;;
+	    esac
+	  done # Gone through all deplibs.
+	  ;;
+	none | unknown | *)
+	  newdeplibs=
+	  tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'`
+	  if test yes = "$allow_libtool_libs_with_static_runtimes"; then
+	    for i in $predeps $postdeps; do
+	      # can't use Xsed below, because $i might contain '/'
+	      tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s|$i||"`
+	    done
+	  fi
+	  case $tmp_deplibs in
+	  *[!\	\ ]*)
+	    echo
+	    if test none = "$deplibs_check_method"; then
+	      echo "*** Warning: inter-library dependencies are not supported in this platform."
+	    else
+	      echo "*** Warning: inter-library dependencies are not known to be supported."
+	    fi
+	    echo "*** All declared inter-library dependencies are being dropped."
+	    droppeddeps=yes
+	    ;;
+	  esac
+	  ;;
+	esac
+	versuffix=$versuffix_save
+	major=$major_save
+	release=$release_save
+	libname=$libname_save
+	name=$name_save
+
+	case $host in
+	*-*-rhapsody* | *-*-darwin1.[012])
+	  # On Rhapsody replace the C library with the System framework
+	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'`
+	  ;;
+	esac
+
+	if test yes = "$droppeddeps"; then
+	  if test yes = "$module"; then
+	    echo
+	    echo "*** Warning: libtool could not satisfy all declared inter-library"
+	    $ECHO "*** dependencies of module $libname.  Therefore, libtool will create"
+	    echo "*** a static module, that should work as long as the dlopening"
+	    echo "*** application is linked with the -dlopen flag."
+	    if test -z "$global_symbol_pipe"; then
+	      echo
+	      echo "*** However, this would only work if libtool was able to extract symbol"
+	      echo "*** lists from a program, using 'nm' or equivalent, but libtool could"
+	      echo "*** not find such a program.  So, this module is probably useless."
+	      echo "*** 'nm' from GNU binutils and a full rebuild may help."
+	    fi
+	    if test no = "$build_old_libs"; then
+	      oldlibs=$output_objdir/$libname.$libext
+	      build_libtool_libs=module
+	      build_old_libs=yes
+	    else
+	      build_libtool_libs=no
+	    fi
+	  else
+	    echo "*** The inter-library dependencies that have been dropped here will be"
+	    echo "*** automatically added whenever a program is linked with this library"
+	    echo "*** or is declared to -dlopen it."
+
+	    if test no = "$allow_undefined"; then
+	      echo
+	      echo "*** Since this library must not contain undefined symbols,"
+	      echo "*** because either the platform does not support them or"
+	      echo "*** it was explicitly requested with -no-undefined,"
+	      echo "*** libtool will only create a static version of it."
+	      if test no = "$build_old_libs"; then
+		oldlibs=$output_objdir/$libname.$libext
+		build_libtool_libs=module
+		build_old_libs=yes
+	      else
+		build_libtool_libs=no
+	      fi
+	    fi
+	  fi
+	fi
+	# Done checking deplibs!
+	deplibs=$newdeplibs
+      fi
+      # Time to change all our "foo.ltframework" stuff back to "-framework foo"
+      case $host in
+	*-*-darwin*)
+	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	  new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	  deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	  ;;
+      esac
+
+      # move library search paths that coincide with paths to not yet
+      # installed libraries to the beginning of the library search list
+      new_libs=
+      for path in $notinst_path; do
+	case " $new_libs " in
+	*" -L$path/$objdir "*) ;;
+	*)
+	  case " $deplibs " in
+	  *" -L$path/$objdir "*)
+	    func_append new_libs " -L$path/$objdir" ;;
+	  esac
+	  ;;
+	esac
+      done
+      for deplib in $deplibs; do
+	case $deplib in
+	-L*)
+	  case " $new_libs " in
+	  *" $deplib "*) ;;
+	  *) func_append new_libs " $deplib" ;;
+	  esac
+	  ;;
+	*) func_append new_libs " $deplib" ;;
+	esac
+      done
+      deplibs=$new_libs
+
+      # All the library-specific variables (install_libdir is set above).
+      library_names=
+      old_library=
+      dlname=
+
+      # Test again, we may have decided not to build it any more
+      if test yes = "$build_libtool_libs"; then
+	# Remove $wl instances when linking with ld.
+	# FIXME: should test the right _cmds variable.
+	case $archive_cmds in
+	  *\$LD\ *) wl= ;;
+        esac
+	if test yes = "$hardcode_into_libs"; then
+	  # Hardcode the library paths
+	  hardcode_libdirs=
+	  dep_rpath=
+	  rpath=$finalize_rpath
+	  test relink = "$opt_mode" || rpath=$compile_rpath$rpath
+	  for libdir in $rpath; do
+	    if test -n "$hardcode_libdir_flag_spec"; then
+	      if test -n "$hardcode_libdir_separator"; then
+		func_replace_sysroot "$libdir"
+		libdir=$func_replace_sysroot_result
+		if test -z "$hardcode_libdirs"; then
+		  hardcode_libdirs=$libdir
+		else
+		  # Just accumulate the unique libdirs.
+		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+		    ;;
+		  *)
+		    func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
+		    ;;
+		  esac
+		fi
+	      else
+		eval flag=\"$hardcode_libdir_flag_spec\"
+		func_append dep_rpath " $flag"
+	      fi
+	    elif test -n "$runpath_var"; then
+	      case "$perm_rpath " in
+	      *" $libdir "*) ;;
+	      *) func_append perm_rpath " $libdir" ;;
+	      esac
+	    fi
+	  done
+	  # Substitute the hardcoded libdirs into the rpath.
+	  if test -n "$hardcode_libdir_separator" &&
+	     test -n "$hardcode_libdirs"; then
+	    libdir=$hardcode_libdirs
+	    eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
+	  fi
+	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
+	    # We should set the runpath_var.
+	    rpath=
+	    for dir in $perm_rpath; do
+	      func_append rpath "$dir:"
+	    done
+	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
+	  fi
+	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
+	fi
+
+	shlibpath=$finalize_shlibpath
+	test relink = "$opt_mode" || shlibpath=$compile_shlibpath$shlibpath
+	if test -n "$shlibpath"; then
+	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
+	fi
+
+	# Get the real and link names of the library.
+	eval shared_ext=\"$shrext_cmds\"
+	eval library_names=\"$library_names_spec\"
+	set dummy $library_names
+	shift
+	realname=$1
+	shift
+
+	if test -n "$soname_spec"; then
+	  eval soname=\"$soname_spec\"
+	else
+	  soname=$realname
+	fi
+	if test -z "$dlname"; then
+	  dlname=$soname
+	fi
+
+	lib=$output_objdir/$realname
+	linknames=
+	for link
+	do
+	  func_append linknames " $link"
+	done
+
+	# Use standard objects if they are pic
+	test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP`
+	test "X$libobjs" = "X " && libobjs=
+
+	delfiles=
+	if test -n "$export_symbols" && test -n "$include_expsyms"; then
+	  $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
+	  export_symbols=$output_objdir/$libname.uexp
+	  func_append delfiles " $export_symbols"
+	fi
+
+	orig_export_symbols=
+	case $host_os in
+	cygwin* | mingw* | cegcc*)
+	  if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
+	    # exporting using user supplied symfile
+	    func_dll_def_p "$export_symbols" || {
+	      # and it's NOT already a .def file. Must figure out
+	      # which of the given symbols are data symbols and tag
+	      # them as such. So, trigger use of export_symbols_cmds.
+	      # export_symbols gets reassigned inside the "prepare
+	      # the list of exported symbols" if statement, so the
+	      # include_expsyms logic still works.
+	      orig_export_symbols=$export_symbols
+	      export_symbols=
+	      always_export_symbols=yes
+	    }
+	  fi
+	  ;;
+	esac
+
+	# Prepare the list of exported symbols
+	if test -z "$export_symbols"; then
+	  if test yes = "$always_export_symbols" || test -n "$export_symbols_regex"; then
+	    func_verbose "generating symbol list for '$libname.la'"
+	    export_symbols=$output_objdir/$libname.exp
+	    $opt_dry_run || $RM $export_symbols
+	    cmds=$export_symbols_cmds
+	    save_ifs=$IFS; IFS='~'
+	    for cmd1 in $cmds; do
+	      IFS=$save_ifs
+	      # Take the normal branch if the nm_file_list_spec branch
+	      # doesn't work or if tool conversion is not needed.
+	      case $nm_file_list_spec~$to_tool_file_cmd in
+		*~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)
+		  try_normal_branch=yes
+		  eval cmd=\"$cmd1\"
+		  func_len " $cmd"
+		  len=$func_len_result
+		  ;;
+		*)
+		  try_normal_branch=no
+		  ;;
+	      esac
+	      if test yes = "$try_normal_branch" \
+		 && { test "$len" -lt "$max_cmd_len" \
+		      || test "$max_cmd_len" -le -1; }
+	      then
+		func_show_eval "$cmd" 'exit $?'
+		skipped_export=false
+	      elif test -n "$nm_file_list_spec"; then
+		func_basename "$output"
+		output_la=$func_basename_result
+		save_libobjs=$libobjs
+		save_output=$output
+		output=$output_objdir/$output_la.nm
+		func_to_tool_file "$output"
+		libobjs=$nm_file_list_spec$func_to_tool_file_result
+		func_append delfiles " $output"
+		func_verbose "creating $NM input file list: $output"
+		for obj in $save_libobjs; do
+		  func_to_tool_file "$obj"
+		  $ECHO "$func_to_tool_file_result"
+		done > "$output"
+		eval cmd=\"$cmd1\"
+		func_show_eval "$cmd" 'exit $?'
+		output=$save_output
+		libobjs=$save_libobjs
+		skipped_export=false
+	      else
+		# The command line is too long to execute in one step.
+		func_verbose "using reloadable object file for export list..."
+		skipped_export=:
+		# Break out early, otherwise skipped_export may be
+		# set to false by a later but shorter cmd.
+		break
+	      fi
+	    done
+	    IFS=$save_ifs
+	    if test -n "$export_symbols_regex" && test : != "$skipped_export"; then
+	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
+	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
+	    fi
+	  fi
+	fi
+
+	if test -n "$export_symbols" && test -n "$include_expsyms"; then
+	  tmp_export_symbols=$export_symbols
+	  test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols
+	  $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
+	fi
+
+	if test : != "$skipped_export" && test -n "$orig_export_symbols"; then
+	  # The given exports_symbols file has to be filtered, so filter it.
+	  func_verbose "filter symbol list for '$libname.la' to tag DATA exports"
+	  # FIXME: $output_objdir/$libname.filter potentially contains lots of
+	  # 's' commands, which not all seds can handle. GNU sed should be fine
+	  # though. Also, the filter scales superlinearly with the number of
+	  # global variables. join(1) would be nice here, but unfortunately
+	  # isn't a blessed tool.
+	  $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
+	  func_append delfiles " $export_symbols $output_objdir/$libname.filter"
+	  export_symbols=$output_objdir/$libname.def
+	  $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
+	fi
+
+	tmp_deplibs=
+	for test_deplib in $deplibs; do
+	  case " $convenience " in
+	  *" $test_deplib "*) ;;
+	  *)
+	    func_append tmp_deplibs " $test_deplib"
+	    ;;
+	  esac
+	done
+	deplibs=$tmp_deplibs
+
+	if test -n "$convenience"; then
+	  if test -n "$whole_archive_flag_spec" &&
+	    test yes = "$compiler_needs_object" &&
+	    test -z "$libobjs"; then
+	    # extract the archives, so we have objects to list.
+	    # TODO: could optimize this to just extract one archive.
+	    whole_archive_flag_spec=
+	  fi
+	  if test -n "$whole_archive_flag_spec"; then
+	    save_libobjs=$libobjs
+	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+	    test "X$libobjs" = "X " && libobjs=
+	  else
+	    gentop=$output_objdir/${outputname}x
+	    func_append generated " $gentop"
+
+	    func_extract_archives $gentop $convenience
+	    func_append libobjs " $func_extract_archives_result"
+	    test "X$libobjs" = "X " && libobjs=
+	  fi
+	fi
+
+	if test yes = "$thread_safe" && test -n "$thread_safe_flag_spec"; then
+	  eval flag=\"$thread_safe_flag_spec\"
+	  func_append linker_flags " $flag"
+	fi
+
+	# Make a backup of the uninstalled library when relinking
+	if test relink = "$opt_mode"; then
+	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
+	fi
+
+	# Do each of the archive commands.
+	if test yes = "$module" && test -n "$module_cmds"; then
+	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+	    eval test_cmds=\"$module_expsym_cmds\"
+	    cmds=$module_expsym_cmds
+	  else
+	    eval test_cmds=\"$module_cmds\"
+	    cmds=$module_cmds
+	  fi
+	else
+	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+	    eval test_cmds=\"$archive_expsym_cmds\"
+	    cmds=$archive_expsym_cmds
+	  else
+	    eval test_cmds=\"$archive_cmds\"
+	    cmds=$archive_cmds
+	  fi
+	fi
+
+	if test : != "$skipped_export" &&
+	   func_len " $test_cmds" &&
+	   len=$func_len_result &&
+	   test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+	  :
+	else
+	  # The command line is too long to link in one step, link piecewise
+	  # or, if using GNU ld and skipped_export is not :, use a linker
+	  # script.
+
+	  # Save the value of $output and $libobjs because we want to
+	  # use them later.  If we have whole_archive_flag_spec, we
+	  # want to use save_libobjs as it was before
+	  # whole_archive_flag_spec was expanded, because we can't
+	  # assume the linker understands whole_archive_flag_spec.
+	  # This may have to be revisited, in case too many
+	  # convenience libraries get linked in and end up exceeding
+	  # the spec.
+	  if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
+	    save_libobjs=$libobjs
+	  fi
+	  save_output=$output
+	  func_basename "$output"
+	  output_la=$func_basename_result
+
+	  # Clear the reloadable object creation command queue and
+	  # initialize k to one.
+	  test_cmds=
+	  concat_cmds=
+	  objlist=
+	  last_robj=
+	  k=1
+
+	  if test -n "$save_libobjs" && test : != "$skipped_export" && test yes = "$with_gnu_ld"; then
+	    output=$output_objdir/$output_la.lnkscript
+	    func_verbose "creating GNU ld script: $output"
+	    echo 'INPUT (' > $output
+	    for obj in $save_libobjs
+	    do
+	      func_to_tool_file "$obj"
+	      $ECHO "$func_to_tool_file_result" >> $output
+	    done
+	    echo ')' >> $output
+	    func_append delfiles " $output"
+	    func_to_tool_file "$output"
+	    output=$func_to_tool_file_result
+	  elif test -n "$save_libobjs" && test : != "$skipped_export" && test -n "$file_list_spec"; then
+	    output=$output_objdir/$output_la.lnk
+	    func_verbose "creating linker input file list: $output"
+	    : > $output
+	    set x $save_libobjs
+	    shift
+	    firstobj=
+	    if test yes = "$compiler_needs_object"; then
+	      firstobj="$1 "
+	      shift
+	    fi
+	    for obj
+	    do
+	      func_to_tool_file "$obj"
+	      $ECHO "$func_to_tool_file_result" >> $output
+	    done
+	    func_append delfiles " $output"
+	    func_to_tool_file "$output"
+	    output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
+	  else
+	    if test -n "$save_libobjs"; then
+	      func_verbose "creating reloadable object files..."
+	      output=$output_objdir/$output_la-$k.$objext
+	      eval test_cmds=\"$reload_cmds\"
+	      func_len " $test_cmds"
+	      len0=$func_len_result
+	      len=$len0
+
+	      # Loop over the list of objects to be linked.
+	      for obj in $save_libobjs
+	      do
+		func_len " $obj"
+		func_arith $len + $func_len_result
+		len=$func_arith_result
+		if test -z "$objlist" ||
+		   test "$len" -lt "$max_cmd_len"; then
+		  func_append objlist " $obj"
+		else
+		  # The command $test_cmds is almost too long, add a
+		  # command to the queue.
+		  if test 1 -eq "$k"; then
+		    # The first file doesn't have a previous command to add.
+		    reload_objs=$objlist
+		    eval concat_cmds=\"$reload_cmds\"
+		  else
+		    # All subsequent reloadable object files will link in
+		    # the last one created.
+		    reload_objs="$objlist $last_robj"
+		    eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
+		  fi
+		  last_robj=$output_objdir/$output_la-$k.$objext
+		  func_arith $k + 1
+		  k=$func_arith_result
+		  output=$output_objdir/$output_la-$k.$objext
+		  objlist=" $obj"
+		  func_len " $last_robj"
+		  func_arith $len0 + $func_len_result
+		  len=$func_arith_result
+		fi
+	      done
+	      # Handle the remaining objects by creating one last
+	      # reloadable object file.  All subsequent reloadable object
+	      # files will link in the last one created.
+	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+	      reload_objs="$objlist $last_robj"
+	      eval concat_cmds=\"\$concat_cmds$reload_cmds\"
+	      if test -n "$last_robj"; then
+	        eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
+	      fi
+	      func_append delfiles " $output"
+
+	    else
+	      output=
+	    fi
+
+	    ${skipped_export-false} && {
+	      func_verbose "generating symbol list for '$libname.la'"
+	      export_symbols=$output_objdir/$libname.exp
+	      $opt_dry_run || $RM $export_symbols
+	      libobjs=$output
+	      # Append the command to create the export file.
+	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+	      eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\"
+	      if test -n "$last_robj"; then
+		eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
+	      fi
+	    }
+
+	    test -n "$save_libobjs" &&
+	      func_verbose "creating a temporary reloadable object file: $output"
+
+	    # Loop through the commands generated above and execute them.
+	    save_ifs=$IFS; IFS='~'
+	    for cmd in $concat_cmds; do
+	      IFS=$save_ifs
+	      $opt_quiet || {
+		  func_quote_for_expand "$cmd"
+		  eval "func_echo $func_quote_for_expand_result"
+	      }
+	      $opt_dry_run || eval "$cmd" || {
+		lt_exit=$?
+
+		# Restore the uninstalled library and exit
+		if test relink = "$opt_mode"; then
+		  ( cd "$output_objdir" && \
+		    $RM "${realname}T" && \
+		    $MV "${realname}U" "$realname" )
+		fi
+
+		exit $lt_exit
+	      }
+	    done
+	    IFS=$save_ifs
+
+	    if test -n "$export_symbols_regex" && ${skipped_export-false}; then
+	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
+	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
+	    fi
+	  fi
+
+          ${skipped_export-false} && {
+	    if test -n "$export_symbols" && test -n "$include_expsyms"; then
+	      tmp_export_symbols=$export_symbols
+	      test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols
+	      $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
+	    fi
+
+	    if test -n "$orig_export_symbols"; then
+	      # The given exports_symbols file has to be filtered, so filter it.
+	      func_verbose "filter symbol list for '$libname.la' to tag DATA exports"
+	      # FIXME: $output_objdir/$libname.filter potentially contains lots of
+	      # 's' commands, which not all seds can handle. GNU sed should be fine
+	      # though. Also, the filter scales superlinearly with the number of
+	      # global variables. join(1) would be nice here, but unfortunately
+	      # isn't a blessed tool.
+	      $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
+	      func_append delfiles " $export_symbols $output_objdir/$libname.filter"
+	      export_symbols=$output_objdir/$libname.def
+	      $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
+	    fi
+	  }
+
+	  libobjs=$output
+	  # Restore the value of output.
+	  output=$save_output
+
+	  if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
+	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+	    test "X$libobjs" = "X " && libobjs=
+	  fi
+	  # Expand the library linking commands again to reset the
+	  # value of $libobjs for piecewise linking.
+
+	  # Do each of the archive commands.
+	  if test yes = "$module" && test -n "$module_cmds"; then
+	    if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+	      cmds=$module_expsym_cmds
+	    else
+	      cmds=$module_cmds
+	    fi
+	  else
+	    if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+	      cmds=$archive_expsym_cmds
+	    else
+	      cmds=$archive_cmds
+	    fi
+	  fi
+	fi
+
+	if test -n "$delfiles"; then
+	  # Append the command to remove temporary files to $cmds.
+	  eval cmds=\"\$cmds~\$RM $delfiles\"
+	fi
+
+	# Add any objects from preloaded convenience libraries
+	if test -n "$dlprefiles"; then
+	  gentop=$output_objdir/${outputname}x
+	  func_append generated " $gentop"
+
+	  func_extract_archives $gentop $dlprefiles
+	  func_append libobjs " $func_extract_archives_result"
+	  test "X$libobjs" = "X " && libobjs=
+	fi
+
+	save_ifs=$IFS; IFS='~'
+	for cmd in $cmds; do
+	  IFS=$sp$nl
+	  eval cmd=\"$cmd\"
+	  IFS=$save_ifs
+	  $opt_quiet || {
+	    func_quote_for_expand "$cmd"
+	    eval "func_echo $func_quote_for_expand_result"
+	  }
+	  $opt_dry_run || eval "$cmd" || {
+	    lt_exit=$?
+
+	    # Restore the uninstalled library and exit
+	    if test relink = "$opt_mode"; then
+	      ( cd "$output_objdir" && \
+	        $RM "${realname}T" && \
+		$MV "${realname}U" "$realname" )
+	    fi
+
+	    exit $lt_exit
+	  }
+	done
+	IFS=$save_ifs
+
+	# Restore the uninstalled library and exit
+	if test relink = "$opt_mode"; then
+	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
+
+	  if test -n "$convenience"; then
+	    if test -z "$whole_archive_flag_spec"; then
+	      func_show_eval '${RM}r "$gentop"'
+	    fi
+	  fi
+
+	  exit $EXIT_SUCCESS
+	fi
+
+	# Create links to the real library.
+	for linkname in $linknames; do
+	  if test "$realname" != "$linkname"; then
+	    func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?'
+	  fi
+	done
+
+	# If -module or -export-dynamic was specified, set the dlname.
+	if test yes = "$module" || test yes = "$export_dynamic"; then
+	  # On all known operating systems, these are identical.
+	  dlname=$soname
+	fi
+      fi
+      ;;
+
+    obj)
+      if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
+	func_warning "'-dlopen' is ignored for objects"
+      fi
+
+      case " $deplibs" in
+      *\ -l* | *\ -L*)
+	func_warning "'-l' and '-L' are ignored for objects" ;;
+      esac
+
+      test -n "$rpath" && \
+	func_warning "'-rpath' is ignored for objects"
+
+      test -n "$xrpath" && \
+	func_warning "'-R' is ignored for objects"
+
+      test -n "$vinfo" && \
+	func_warning "'-version-info' is ignored for objects"
+
+      test -n "$release" && \
+	func_warning "'-release' is ignored for objects"
+
+      case $output in
+      *.lo)
+	test -n "$objs$old_deplibs" && \
+	  func_fatal_error "cannot build library object '$output' from non-libtool objects"
+
+	libobj=$output
+	func_lo2o "$libobj"
+	obj=$func_lo2o_result
+	;;
+      *)
+	libobj=
+	obj=$output
+	;;
+      esac
+
+      # Delete the old objects.
+      $opt_dry_run || $RM $obj $libobj
+
+      # Objects from convenience libraries.  This assumes
+      # single-version convenience libraries.  Whenever we create
+      # different ones for PIC/non-PIC, this we'll have to duplicate
+      # the extraction.
+      reload_conv_objs=
+      gentop=
+      # if reload_cmds runs $LD directly, get rid of -Wl from
+      # whole_archive_flag_spec and hope we can get by with turning comma
+      # into space.
+      case $reload_cmds in
+        *\$LD[\ \$]*) wl= ;;
+      esac
+      if test -n "$convenience"; then
+	if test -n "$whole_archive_flag_spec"; then
+	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
+	  test -n "$wl" || tmp_whole_archive_flags=`$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
+	  reload_conv_objs=$reload_objs\ $tmp_whole_archive_flags
+	else
+	  gentop=$output_objdir/${obj}x
+	  func_append generated " $gentop"
+
+	  func_extract_archives $gentop $convenience
+	  reload_conv_objs="$reload_objs $func_extract_archives_result"
+	fi
+      fi
+
+      # If we're not building shared, we need to use non_pic_objs
+      test yes = "$build_libtool_libs" || libobjs=$non_pic_objects
+
+      # Create the old-style object.
+      reload_objs=$objs$old_deplibs' '`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; /\.lib$/d; $lo2o" | $NL2SP`' '$reload_conv_objs
+
+      output=$obj
+      func_execute_cmds "$reload_cmds" 'exit $?'
+
+      # Exit if we aren't doing a library object file.
+      if test -z "$libobj"; then
+	if test -n "$gentop"; then
+	  func_show_eval '${RM}r "$gentop"'
+	fi
+
+	exit $EXIT_SUCCESS
+      fi
+
+      test yes = "$build_libtool_libs" || {
+	if test -n "$gentop"; then
+	  func_show_eval '${RM}r "$gentop"'
+	fi
+
+	# Create an invalid libtool object if no PIC, so that we don't
+	# accidentally link it into a program.
+	# $show "echo timestamp > $libobj"
+	# $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
+	exit $EXIT_SUCCESS
+      }
+
+      if test -n "$pic_flag" || test default != "$pic_mode"; then
+	# Only do commands if we really have different PIC objects.
+	reload_objs="$libobjs $reload_conv_objs"
+	output=$libobj
+	func_execute_cmds "$reload_cmds" 'exit $?'
+      fi
+
+      if test -n "$gentop"; then
+	func_show_eval '${RM}r "$gentop"'
+      fi
+
+      exit $EXIT_SUCCESS
+      ;;
+
+    prog)
+      case $host in
+	*cygwin*) func_stripname '' '.exe' "$output"
+	          output=$func_stripname_result.exe;;
+      esac
+      test -n "$vinfo" && \
+	func_warning "'-version-info' is ignored for programs"
+
+      test -n "$release" && \
+	func_warning "'-release' is ignored for programs"
+
+      $preload \
+	&& test unknown,unknown,unknown = "$dlopen_support,$dlopen_self,$dlopen_self_static" \
+	&& func_warning "'LT_INIT([dlopen])' not used. Assuming no dlopen support."
+
+      case $host in
+      *-*-rhapsody* | *-*-darwin1.[012])
+	# On Rhapsody replace the C library is the System framework
+	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'`
+	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'`
+	;;
+      esac
+
+      case $host in
+      *-*-darwin*)
+	# Don't allow lazy linking, it breaks C++ global constructors
+	# But is supposedly fixed on 10.4 or later (yay!).
+	if test CXX = "$tagname"; then
+	  case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
+	    10.[0123])
+	      func_append compile_command " $wl-bind_at_load"
+	      func_append finalize_command " $wl-bind_at_load"
+	    ;;
+	  esac
+	fi
+	# Time to change all our "foo.ltframework" stuff back to "-framework foo"
+	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	;;
+      esac
+
+
+      # move library search paths that coincide with paths to not yet
+      # installed libraries to the beginning of the library search list
+      new_libs=
+      for path in $notinst_path; do
+	case " $new_libs " in
+	*" -L$path/$objdir "*) ;;
+	*)
+	  case " $compile_deplibs " in
+	  *" -L$path/$objdir "*)
+	    func_append new_libs " -L$path/$objdir" ;;
+	  esac
+	  ;;
+	esac
+      done
+      for deplib in $compile_deplibs; do
+	case $deplib in
+	-L*)
+	  case " $new_libs " in
+	  *" $deplib "*) ;;
+	  *) func_append new_libs " $deplib" ;;
+	  esac
+	  ;;
+	*) func_append new_libs " $deplib" ;;
+	esac
+      done
+      compile_deplibs=$new_libs
+
+
+      func_append compile_command " $compile_deplibs"
+      func_append finalize_command " $finalize_deplibs"
+
+      if test -n "$rpath$xrpath"; then
+	# If the user specified any rpath flags, then add them.
+	for libdir in $rpath $xrpath; do
+	  # This is the magic to use -rpath.
+	  case "$finalize_rpath " in
+	  *" $libdir "*) ;;
+	  *) func_append finalize_rpath " $libdir" ;;
+	  esac
+	done
+      fi
+
+      # Now hardcode the library paths
+      rpath=
+      hardcode_libdirs=
+      for libdir in $compile_rpath $finalize_rpath; do
+	if test -n "$hardcode_libdir_flag_spec"; then
+	  if test -n "$hardcode_libdir_separator"; then
+	    if test -z "$hardcode_libdirs"; then
+	      hardcode_libdirs=$libdir
+	    else
+	      # Just accumulate the unique libdirs.
+	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+		;;
+	      *)
+		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
+		;;
+	      esac
+	    fi
+	  else
+	    eval flag=\"$hardcode_libdir_flag_spec\"
+	    func_append rpath " $flag"
+	  fi
+	elif test -n "$runpath_var"; then
+	  case "$perm_rpath " in
+	  *" $libdir "*) ;;
+	  *) func_append perm_rpath " $libdir" ;;
+	  esac
+	fi
+	case $host in
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+	  testbindir=`$ECHO "$libdir" | $SED -e 's*/lib$*/bin*'`
+	  case :$dllsearchpath: in
+	  *":$libdir:"*) ;;
+	  ::) dllsearchpath=$libdir;;
+	  *) func_append dllsearchpath ":$libdir";;
+	  esac
+	  case :$dllsearchpath: in
+	  *":$testbindir:"*) ;;
+	  ::) dllsearchpath=$testbindir;;
+	  *) func_append dllsearchpath ":$testbindir";;
+	  esac
+	  ;;
+	esac
+      done
+      # Substitute the hardcoded libdirs into the rpath.
+      if test -n "$hardcode_libdir_separator" &&
+	 test -n "$hardcode_libdirs"; then
+	libdir=$hardcode_libdirs
+	eval rpath=\" $hardcode_libdir_flag_spec\"
+      fi
+      compile_rpath=$rpath
+
+      rpath=
+      hardcode_libdirs=
+      for libdir in $finalize_rpath; do
+	if test -n "$hardcode_libdir_flag_spec"; then
+	  if test -n "$hardcode_libdir_separator"; then
+	    if test -z "$hardcode_libdirs"; then
+	      hardcode_libdirs=$libdir
+	    else
+	      # Just accumulate the unique libdirs.
+	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+		;;
+	      *)
+		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
+		;;
+	      esac
+	    fi
+	  else
+	    eval flag=\"$hardcode_libdir_flag_spec\"
+	    func_append rpath " $flag"
+	  fi
+	elif test -n "$runpath_var"; then
+	  case "$finalize_perm_rpath " in
+	  *" $libdir "*) ;;
+	  *) func_append finalize_perm_rpath " $libdir" ;;
+	  esac
+	fi
+      done
+      # Substitute the hardcoded libdirs into the rpath.
+      if test -n "$hardcode_libdir_separator" &&
+	 test -n "$hardcode_libdirs"; then
+	libdir=$hardcode_libdirs
+	eval rpath=\" $hardcode_libdir_flag_spec\"
+      fi
+      finalize_rpath=$rpath
+
+      if test -n "$libobjs" && test yes = "$build_old_libs"; then
+	# Transform all the library objects into standard objects.
+	compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
+	finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
+      fi
+
+      func_generate_dlsyms "$outputname" "@PROGRAM@" false
+
+      # template prelinking step
+      if test -n "$prelink_cmds"; then
+	func_execute_cmds "$prelink_cmds" 'exit $?'
+      fi
+
+      wrappers_required=:
+      case $host in
+      *cegcc* | *mingw32ce*)
+        # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
+        wrappers_required=false
+        ;;
+      *cygwin* | *mingw* )
+        test yes = "$build_libtool_libs" || wrappers_required=false
+        ;;
+      *)
+        if test no = "$need_relink" || test yes != "$build_libtool_libs"; then
+          wrappers_required=false
+        fi
+        ;;
+      esac
+      $wrappers_required || {
+	# Replace the output file specification.
+	compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
+	link_command=$compile_command$compile_rpath
+
+	# We have no uninstalled library dependencies, so finalize right now.
+	exit_status=0
+	func_show_eval "$link_command" 'exit_status=$?'
+
+	if test -n "$postlink_cmds"; then
+	  func_to_tool_file "$output"
+	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+	  func_execute_cmds "$postlink_cmds" 'exit $?'
+	fi
+
+	# Delete the generated files.
+	if test -f "$output_objdir/${outputname}S.$objext"; then
+	  func_show_eval '$RM "$output_objdir/${outputname}S.$objext"'
+	fi
+
+	exit $exit_status
+      }
+
+      if test -n "$compile_shlibpath$finalize_shlibpath"; then
+	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
+      fi
+      if test -n "$finalize_shlibpath"; then
+	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
+      fi
+
+      compile_var=
+      finalize_var=
+      if test -n "$runpath_var"; then
+	if test -n "$perm_rpath"; then
+	  # We should set the runpath_var.
+	  rpath=
+	  for dir in $perm_rpath; do
+	    func_append rpath "$dir:"
+	  done
+	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
+	fi
+	if test -n "$finalize_perm_rpath"; then
+	  # We should set the runpath_var.
+	  rpath=
+	  for dir in $finalize_perm_rpath; do
+	    func_append rpath "$dir:"
+	  done
+	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
+	fi
+      fi
+
+      if test yes = "$no_install"; then
+	# We don't need to create a wrapper script.
+	link_command=$compile_var$compile_command$compile_rpath
+	# Replace the output file specification.
+	link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
+	# Delete the old output file.
+	$opt_dry_run || $RM $output
+	# Link the executable and exit
+	func_show_eval "$link_command" 'exit $?'
+
+	if test -n "$postlink_cmds"; then
+	  func_to_tool_file "$output"
+	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+	  func_execute_cmds "$postlink_cmds" 'exit $?'
+	fi
+
+	exit $EXIT_SUCCESS
+      fi
+
+      case $hardcode_action,$fast_install in
+        relink,*)
+	  # Fast installation is not supported
+	  link_command=$compile_var$compile_command$compile_rpath
+	  relink_command=$finalize_var$finalize_command$finalize_rpath
+
+	  func_warning "this platform does not like uninstalled shared libraries"
+	  func_warning "'$output' will be relinked during installation"
+	  ;;
+        *,yes)
+	  link_command=$finalize_var$compile_command$finalize_rpath
+	  relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
+          ;;
+	*,no)
+	  link_command=$compile_var$compile_command$compile_rpath
+	  relink_command=$finalize_var$finalize_command$finalize_rpath
+          ;;
+	*,needless)
+	  link_command=$finalize_var$compile_command$finalize_rpath
+	  relink_command=
+          ;;
+      esac
+
+      # Replace the output file specification.
+      link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
+
+      # Delete the old output files.
+      $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
+
+      func_show_eval "$link_command" 'exit $?'
+
+      if test -n "$postlink_cmds"; then
+	func_to_tool_file "$output_objdir/$outputname"
+	postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+	func_execute_cmds "$postlink_cmds" 'exit $?'
+      fi
+
+      # Now create the wrapper script.
+      func_verbose "creating $output"
+
+      # Quote the relink command for shipping.
+      if test -n "$relink_command"; then
+	# Preserve any variables that may affect compiler behavior
+	for var in $variables_saved_for_relink; do
+	  if eval test -z \"\${$var+set}\"; then
+	    relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
+	  elif eval var_value=\$$var; test -z "$var_value"; then
+	    relink_command="$var=; export $var; $relink_command"
+	  else
+	    func_quote_for_eval "$var_value"
+	    relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
+	  fi
+	done
+	relink_command="(cd `pwd`; $relink_command)"
+	relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
+      fi
+
+      # Only actually do things if not in dry run mode.
+      $opt_dry_run || {
+	# win32 will think the script is a binary if it has
+	# a .exe suffix, so we strip it off here.
+	case $output in
+	  *.exe) func_stripname '' '.exe' "$output"
+	         output=$func_stripname_result ;;
+	esac
+	# test for cygwin because mv fails w/o .exe extensions
+	case $host in
+	  *cygwin*)
+	    exeext=.exe
+	    func_stripname '' '.exe' "$outputname"
+	    outputname=$func_stripname_result ;;
+	  *) exeext= ;;
+	esac
+	case $host in
+	  *cygwin* | *mingw* )
+	    func_dirname_and_basename "$output" "" "."
+	    output_name=$func_basename_result
+	    output_path=$func_dirname_result
+	    cwrappersource=$output_path/$objdir/lt-$output_name.c
+	    cwrapper=$output_path/$output_name.exe
+	    $RM $cwrappersource $cwrapper
+	    trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
+
+	    func_emit_cwrapperexe_src > $cwrappersource
+
+	    # The wrapper executable is built using the $host compiler,
+	    # because it contains $host paths and files. If cross-
+	    # compiling, it, like the target executable, must be
+	    # executed on the $host or under an emulation environment.
+	    $opt_dry_run || {
+	      $LTCC $LTCFLAGS -o $cwrapper $cwrappersource
+	      $STRIP $cwrapper
+	    }
+
+	    # Now, create the wrapper script for func_source use:
+	    func_ltwrapper_scriptname $cwrapper
+	    $RM $func_ltwrapper_scriptname_result
+	    trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15
+	    $opt_dry_run || {
+	      # note: this script will not be executed, so do not chmod.
+	      if test "x$build" = "x$host"; then
+		$cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result
+	      else
+		func_emit_wrapper no > $func_ltwrapper_scriptname_result
+	      fi
+	    }
+	  ;;
+	  * )
+	    $RM $output
+	    trap "$RM $output; exit $EXIT_FAILURE" 1 2 15
+
+	    func_emit_wrapper no > $output
+	    chmod +x $output
+	  ;;
+	esac
+      }
+      exit $EXIT_SUCCESS
+      ;;
+    esac
+
+    # See if we need to build an old-fashioned archive.
+    for oldlib in $oldlibs; do
+
+      case $build_libtool_libs in
+        convenience)
+	  oldobjs="$libobjs_save $symfileobj"
+	  addlibs=$convenience
+	  build_libtool_libs=no
+	  ;;
+	module)
+	  oldobjs=$libobjs_save
+	  addlibs=$old_convenience
+	  build_libtool_libs=no
+          ;;
+	*)
+	  oldobjs="$old_deplibs $non_pic_objects"
+	  $preload && test -f "$symfileobj" \
+	    && func_append oldobjs " $symfileobj"
+	  addlibs=$old_convenience
+	  ;;
+      esac
+
+      if test -n "$addlibs"; then
+	gentop=$output_objdir/${outputname}x
+	func_append generated " $gentop"
+
+	func_extract_archives $gentop $addlibs
+	func_append oldobjs " $func_extract_archives_result"
+      fi
+
+      # Do each command in the archive commands.
+      if test -n "$old_archive_from_new_cmds" && test yes = "$build_libtool_libs"; then
+	cmds=$old_archive_from_new_cmds
+      else
+
+	# Add any objects from preloaded convenience libraries
+	if test -n "$dlprefiles"; then
+	  gentop=$output_objdir/${outputname}x
+	  func_append generated " $gentop"
+
+	  func_extract_archives $gentop $dlprefiles
+	  func_append oldobjs " $func_extract_archives_result"
+	fi
+
+	# POSIX demands no paths to be encoded in archives.  We have
+	# to avoid creating archives with duplicate basenames if we
+	# might have to extract them afterwards, e.g., when creating a
+	# static archive out of a convenience library, or when linking
+	# the entirety of a libtool archive into another (currently
+	# not supported by libtool).
+	if (for obj in $oldobjs
+	    do
+	      func_basename "$obj"
+	      $ECHO "$func_basename_result"
+	    done | sort | sort -uc >/dev/null 2>&1); then
+	  :
+	else
+	  echo "copying selected object files to avoid basename conflicts..."
+	  gentop=$output_objdir/${outputname}x
+	  func_append generated " $gentop"
+	  func_mkdir_p "$gentop"
+	  save_oldobjs=$oldobjs
+	  oldobjs=
+	  counter=1
+	  for obj in $save_oldobjs
+	  do
+	    func_basename "$obj"
+	    objbase=$func_basename_result
+	    case " $oldobjs " in
+	    " ") oldobjs=$obj ;;
+	    *[\ /]"$objbase "*)
+	      while :; do
+		# Make sure we don't pick an alternate name that also
+		# overlaps.
+		newobj=lt$counter-$objbase
+		func_arith $counter + 1
+		counter=$func_arith_result
+		case " $oldobjs " in
+		*[\ /]"$newobj "*) ;;
+		*) if test ! -f "$gentop/$newobj"; then break; fi ;;
+		esac
+	      done
+	      func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
+	      func_append oldobjs " $gentop/$newobj"
+	      ;;
+	    *) func_append oldobjs " $obj" ;;
+	    esac
+	  done
+	fi
+	func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+	tool_oldlib=$func_to_tool_file_result
+	eval cmds=\"$old_archive_cmds\"
+
+	func_len " $cmds"
+	len=$func_len_result
+	if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+	  cmds=$old_archive_cmds
+	elif test -n "$archiver_list_spec"; then
+	  func_verbose "using command file archive linking..."
+	  for obj in $oldobjs
+	  do
+	    func_to_tool_file "$obj"
+	    $ECHO "$func_to_tool_file_result"
+	  done > $output_objdir/$libname.libcmd
+	  func_to_tool_file "$output_objdir/$libname.libcmd"
+	  oldobjs=" $archiver_list_spec$func_to_tool_file_result"
+	  cmds=$old_archive_cmds
+	else
+	  # the command line is too long to link in one step, link in parts
+	  func_verbose "using piecewise archive linking..."
+	  save_RANLIB=$RANLIB
+	  RANLIB=:
+	  objlist=
+	  concat_cmds=
+	  save_oldobjs=$oldobjs
+	  oldobjs=
+	  # Is there a better way of finding the last object in the list?
+	  for obj in $save_oldobjs
+	  do
+	    last_oldobj=$obj
+	  done
+	  eval test_cmds=\"$old_archive_cmds\"
+	  func_len " $test_cmds"
+	  len0=$func_len_result
+	  len=$len0
+	  for obj in $save_oldobjs
+	  do
+	    func_len " $obj"
+	    func_arith $len + $func_len_result
+	    len=$func_arith_result
+	    func_append objlist " $obj"
+	    if test "$len" -lt "$max_cmd_len"; then
+	      :
+	    else
+	      # the above command should be used before it gets too long
+	      oldobjs=$objlist
+	      if test "$obj" = "$last_oldobj"; then
+		RANLIB=$save_RANLIB
+	      fi
+	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+	      eval concat_cmds=\"\$concat_cmds$old_archive_cmds\"
+	      objlist=
+	      len=$len0
+	    fi
+	  done
+	  RANLIB=$save_RANLIB
+	  oldobjs=$objlist
+	  if test -z "$oldobjs"; then
+	    eval cmds=\"\$concat_cmds\"
+	  else
+	    eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
+	  fi
+	fi
+      fi
+      func_execute_cmds "$cmds" 'exit $?'
+    done
+
+    test -n "$generated" && \
+      func_show_eval "${RM}r$generated"
+
+    # Now create the libtool archive.
+    case $output in
+    *.la)
+      old_library=
+      test yes = "$build_old_libs" && old_library=$libname.$libext
+      func_verbose "creating $output"
+
+      # Preserve any variables that may affect compiler behavior
+      for var in $variables_saved_for_relink; do
+	if eval test -z \"\${$var+set}\"; then
+	  relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
+	elif eval var_value=\$$var; test -z "$var_value"; then
+	  relink_command="$var=; export $var; $relink_command"
+	else
+	  func_quote_for_eval "$var_value"
+	  relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
+	fi
+      done
+      # Quote the link command for shipping.
+      relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
+      relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
+      if test yes = "$hardcode_automatic"; then
+	relink_command=
+      fi
+
+      # Only create the output if not a dry run.
+      $opt_dry_run || {
+	for installed in no yes; do
+	  if test yes = "$installed"; then
+	    if test -z "$install_libdir"; then
+	      break
+	    fi
+	    output=$output_objdir/${outputname}i
+	    # Replace all uninstalled libtool libraries with the installed ones
+	    newdependency_libs=
+	    for deplib in $dependency_libs; do
+	      case $deplib in
+	      *.la)
+		func_basename "$deplib"
+		name=$func_basename_result
+		func_resolve_sysroot "$deplib"
+		eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
+		test -z "$libdir" && \
+		  func_fatal_error "'$deplib' is not a valid libtool archive"
+		func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
+		;;
+	      -L*)
+		func_stripname -L '' "$deplib"
+		func_replace_sysroot "$func_stripname_result"
+		func_append newdependency_libs " -L$func_replace_sysroot_result"
+		;;
+	      -R*)
+		func_stripname -R '' "$deplib"
+		func_replace_sysroot "$func_stripname_result"
+		func_append newdependency_libs " -R$func_replace_sysroot_result"
+		;;
+	      *) func_append newdependency_libs " $deplib" ;;
+	      esac
+	    done
+	    dependency_libs=$newdependency_libs
+	    newdlfiles=
+
+	    for lib in $dlfiles; do
+	      case $lib in
+	      *.la)
+	        func_basename "$lib"
+		name=$func_basename_result
+		eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+		test -z "$libdir" && \
+		  func_fatal_error "'$lib' is not a valid libtool archive"
+		func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
+		;;
+	      *) func_append newdlfiles " $lib" ;;
+	      esac
+	    done
+	    dlfiles=$newdlfiles
+	    newdlprefiles=
+	    for lib in $dlprefiles; do
+	      case $lib in
+	      *.la)
+		# Only pass preopened files to the pseudo-archive (for
+		# eventual linking with the app. that links it) if we
+		# didn't already link the preopened objects directly into
+		# the library:
+		func_basename "$lib"
+		name=$func_basename_result
+		eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+		test -z "$libdir" && \
+		  func_fatal_error "'$lib' is not a valid libtool archive"
+		func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
+		;;
+	      esac
+	    done
+	    dlprefiles=$newdlprefiles
+	  else
+	    newdlfiles=
+	    for lib in $dlfiles; do
+	      case $lib in
+		[\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;;
+		*) abs=`pwd`"/$lib" ;;
+	      esac
+	      func_append newdlfiles " $abs"
+	    done
+	    dlfiles=$newdlfiles
+	    newdlprefiles=
+	    for lib in $dlprefiles; do
+	      case $lib in
+		[\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;;
+		*) abs=`pwd`"/$lib" ;;
+	      esac
+	      func_append newdlprefiles " $abs"
+	    done
+	    dlprefiles=$newdlprefiles
+	  fi
+	  $RM $output
+	  # place dlname in correct position for cygwin
+	  # In fact, it would be nice if we could use this code for all target
+	  # systems that can't hard-code library paths into their executables
+	  # and that have no shared library path variable independent of PATH,
+	  # but it turns out we can't easily determine that from inspecting
+	  # libtool variables, so we have to hard-code the OSs to which it
+	  # applies here; at the moment, that means platforms that use the PE
+	  # object format with DLL files.  See the long comment at the top of
+	  # tests/bindir.at for full details.
+	  tdlname=$dlname
+	  case $host,$output,$installed,$module,$dlname in
+	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
+	      # If a -bindir argument was supplied, place the dll there.
+	      if test -n "$bindir"; then
+		func_relative_path "$install_libdir" "$bindir"
+		tdlname=$func_relative_path_result/$dlname
+	      else
+		# Otherwise fall back on heuristic.
+		tdlname=../bin/$dlname
+	      fi
+	      ;;
+	  esac
+	  $ECHO > $output "\
+# $outputname - a libtool library file
+# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# The name that we can dlopen(3).
+dlname='$tdlname'
+
+# Names of this library.
+library_names='$library_names'
+
+# The name of the static archive.
+old_library='$old_library'
+
+# Linker flags that cannot go in dependency_libs.
+inherited_linker_flags='$new_inherited_linker_flags'
+
+# Libraries that this one depends upon.
+dependency_libs='$dependency_libs'
+
+# Names of additional weak libraries provided by this library
+weak_library_names='$weak_libs'
+
+# Version information for $libname.
+current=$current
+age=$age
+revision=$revision
+
+# Is this an already installed library?
+installed=$installed
+
+# Should we warn about portability when linking against -modules?
+shouldnotlink=$module
+
+# Files to dlopen/dlpreopen
+dlopen='$dlfiles'
+dlpreopen='$dlprefiles'
+
+# Directory that this library needs to be installed in:
+libdir='$install_libdir'"
+	  if test no,yes = "$installed,$need_relink"; then
+	    $ECHO >> $output "\
+relink_command=\"$relink_command\""
+	  fi
+	done
+      }
+
+      # Do a symbolic link so that the libtool archive can be found in
+      # LD_LIBRARY_PATH before the program is installed.
+      func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?'
+      ;;
+    esac
+    exit $EXIT_SUCCESS
+}
+
+if test link = "$opt_mode" || test relink = "$opt_mode"; then
+  func_mode_link ${1+"$@"}
+fi
+
+
+# func_mode_uninstall arg...
+func_mode_uninstall ()
+{
+    $debug_cmd
+
+    RM=$nonopt
+    files=
+    rmforce=false
+    exit_status=0
+
+    # This variable tells wrapper scripts just to set variables rather
+    # than running their programs.
+    libtool_install_magic=$magic
+
+    for arg
+    do
+      case $arg in
+      -f) func_append RM " $arg"; rmforce=: ;;
+      -*) func_append RM " $arg" ;;
+      *) func_append files " $arg" ;;
+      esac
+    done
+
+    test -z "$RM" && \
+      func_fatal_help "you must specify an RM program"
+
+    rmdirs=
+
+    for file in $files; do
+      func_dirname "$file" "" "."
+      dir=$func_dirname_result
+      if test . = "$dir"; then
+	odir=$objdir
+      else
+	odir=$dir/$objdir
+      fi
+      func_basename "$file"
+      name=$func_basename_result
+      test uninstall = "$opt_mode" && odir=$dir
+
+      # Remember odir for removal later, being careful to avoid duplicates
+      if test clean = "$opt_mode"; then
+	case " $rmdirs " in
+	  *" $odir "*) ;;
+	  *) func_append rmdirs " $odir" ;;
+	esac
+      fi
+
+      # Don't error if the file doesn't exist and rm -f was used.
+      if { test -L "$file"; } >/dev/null 2>&1 ||
+	 { test -h "$file"; } >/dev/null 2>&1 ||
+	 test -f "$file"; then
+	:
+      elif test -d "$file"; then
+	exit_status=1
+	continue
+      elif $rmforce; then
+	continue
+      fi
+
+      rmfiles=$file
+
+      case $name in
+      *.la)
+	# Possibly a libtool archive, so verify it.
+	if func_lalib_p "$file"; then
+	  func_source $dir/$name
+
+	  # Delete the libtool libraries and symlinks.
+	  for n in $library_names; do
+	    func_append rmfiles " $odir/$n"
+	  done
+	  test -n "$old_library" && func_append rmfiles " $odir/$old_library"
+
+	  case $opt_mode in
+	  clean)
+	    case " $library_names " in
+	    *" $dlname "*) ;;
+	    *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
+	    esac
+	    test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"
+	    ;;
+	  uninstall)
+	    if test -n "$library_names"; then
+	      # Do each command in the postuninstall commands.
+	      func_execute_cmds "$postuninstall_cmds" '$rmforce || exit_status=1'
+	    fi
+
+	    if test -n "$old_library"; then
+	      # Do each command in the old_postuninstall commands.
+	      func_execute_cmds "$old_postuninstall_cmds" '$rmforce || exit_status=1'
+	    fi
+	    # FIXME: should reinstall the best remaining shared library.
+	    ;;
+	  esac
+	fi
+	;;
+
+      *.lo)
+	# Possibly a libtool object, so verify it.
+	if func_lalib_p "$file"; then
+
+	  # Read the .lo file
+	  func_source $dir/$name
+
+	  # Add PIC object to the list of files to remove.
+	  if test -n "$pic_object" && test none != "$pic_object"; then
+	    func_append rmfiles " $dir/$pic_object"
+	  fi
+
+	  # Add non-PIC object to the list of files to remove.
+	  if test -n "$non_pic_object" && test none != "$non_pic_object"; then
+	    func_append rmfiles " $dir/$non_pic_object"
+	  fi
+	fi
+	;;
+
+      *)
+	if test clean = "$opt_mode"; then
+	  noexename=$name
+	  case $file in
+	  *.exe)
+	    func_stripname '' '.exe' "$file"
+	    file=$func_stripname_result
+	    func_stripname '' '.exe' "$name"
+	    noexename=$func_stripname_result
+	    # $file with .exe has already been added to rmfiles,
+	    # add $file without .exe
+	    func_append rmfiles " $file"
+	    ;;
+	  esac
+	  # Do a test to see if this is a libtool program.
+	  if func_ltwrapper_p "$file"; then
+	    if func_ltwrapper_executable_p "$file"; then
+	      func_ltwrapper_scriptname "$file"
+	      relink_command=
+	      func_source $func_ltwrapper_scriptname_result
+	      func_append rmfiles " $func_ltwrapper_scriptname_result"
+	    else
+	      relink_command=
+	      func_source $dir/$noexename
+	    fi
+
+	    # note $name still contains .exe if it was in $file originally
+	    # as does the version of $file that was added into $rmfiles
+	    func_append rmfiles " $odir/$name $odir/${name}S.$objext"
+	    if test yes = "$fast_install" && test -n "$relink_command"; then
+	      func_append rmfiles " $odir/lt-$name"
+	    fi
+	    if test "X$noexename" != "X$name"; then
+	      func_append rmfiles " $odir/lt-$noexename.c"
+	    fi
+	  fi
+	fi
+	;;
+      esac
+      func_show_eval "$RM $rmfiles" 'exit_status=1'
+    done
+
+    # Try to remove the $objdir's in the directories where we deleted files
+    for dir in $rmdirs; do
+      if test -d "$dir"; then
+	func_show_eval "rmdir $dir >/dev/null 2>&1"
+      fi
+    done
+
+    exit $exit_status
+}
+
+if test uninstall = "$opt_mode" || test clean = "$opt_mode"; then
+  func_mode_uninstall ${1+"$@"}
+fi
+
+test -z "$opt_mode" && {
+  help=$generic_help
+  func_fatal_help "you must specify a MODE"
+}
+
+test -z "$exec_cmd" && \
+  func_fatal_help "invalid operation mode '$opt_mode'"
+
+if test -n "$exec_cmd"; then
+  eval exec "$exec_cmd"
+  exit $EXIT_FAILURE
+fi
+
+exit $exit_status
+
+
+# The TAGs below are defined such that we never get into a situation
+# where we disable both kinds of libraries.  Given conflicting
+# choices, we go for a static library, that is the most portable,
+# since we can't tell whether shared libraries were disabled because
+# the user asked for that or because the platform doesn't support
+# them.  This is particularly important on AIX, because we don't
+# support having both static and shared libraries enabled at the same
+# time on that platform, so we default to a shared-only configuration.
+# If a disable-shared tag is given, we'll fallback to a static-only
+# configuration.  But we'll never go from static-only to shared-only.
+
+# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
+build_libtool_libs=no
+build_old_libs=yes
+# ### END LIBTOOL TAG CONFIG: disable-shared
+
+# ### BEGIN LIBTOOL TAG CONFIG: disable-static
+build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
+# ### END LIBTOOL TAG CONFIG: disable-static
+
+# Local Variables:
+# mode:shell-script
+# sh-indentation:2
+# End:
diff --git a/conf/ltoptions.m4 b/conf/ltoptions.m4
new file mode 100644
index 0000000..94b0829
--- /dev/null
+++ b/conf/ltoptions.m4
@@ -0,0 +1,437 @@
+# Helper functions for option handling.                    -*- Autoconf -*-
+#
+#   Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software
+#   Foundation, Inc.
+#   Written by Gary V. Vaughan, 2004
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# serial 8 ltoptions.m4
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
+
+
+# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
+# ------------------------------------------
+m4_define([_LT_MANGLE_OPTION],
+[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
+
+
+# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
+# ---------------------------------------
+# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
+# matching handler defined, dispatch to it.  Other OPTION-NAMEs are
+# saved as a flag.
+m4_define([_LT_SET_OPTION],
+[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
+m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
+        _LT_MANGLE_DEFUN([$1], [$2]),
+    [m4_warning([Unknown $1 option '$2'])])[]dnl
+])
+
+
+# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
+# ------------------------------------------------------------
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+m4_define([_LT_IF_OPTION],
+[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
+
+
+# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
+# -------------------------------------------------------
+# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
+# are set.
+m4_define([_LT_UNLESS_OPTIONS],
+[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
+	    [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
+		      [m4_define([$0_found])])])[]dnl
+m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
+])[]dnl
+])
+
+
+# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
+# ----------------------------------------
+# OPTION-LIST is a space-separated list of Libtool options associated
+# with MACRO-NAME.  If any OPTION has a matching handler declared with
+# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
+# the unknown option and exit.
+m4_defun([_LT_SET_OPTIONS],
+[# Set options
+m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
+    [_LT_SET_OPTION([$1], _LT_Option)])
+
+m4_if([$1],[LT_INIT],[
+  dnl
+  dnl Simply set some default values (i.e off) if boolean options were not
+  dnl specified:
+  _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no
+  ])
+  _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no
+  ])
+  dnl
+  dnl If no reference was made to various pairs of opposing options, then
+  dnl we run the default mode handler for the pair.  For example, if neither
+  dnl 'shared' nor 'disable-shared' was passed, we enable building of shared
+  dnl archives by default:
+  _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
+  _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
+  _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
+  _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
+		   [_LT_ENABLE_FAST_INSTALL])
+  _LT_UNLESS_OPTIONS([LT_INIT], [aix-soname=aix aix-soname=both aix-soname=svr4],
+		   [_LT_WITH_AIX_SONAME([aix])])
+  ])
+])# _LT_SET_OPTIONS
+
+
+## --------------------------------- ##
+## Macros to handle LT_INIT options. ##
+## --------------------------------- ##
+
+# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
+# -----------------------------------------
+m4_define([_LT_MANGLE_DEFUN],
+[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
+
+
+# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
+# -----------------------------------------------
+m4_define([LT_OPTION_DEFINE],
+[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
+])# LT_OPTION_DEFINE
+
+
+# dlopen
+# ------
+LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
+])
+
+AU_DEFUN([AC_LIBTOOL_DLOPEN],
+[_LT_SET_OPTION([LT_INIT], [dlopen])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the 'dlopen' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
+
+
+# win32-dll
+# ---------
+# Declare package support for building win32 dll's.
+LT_OPTION_DEFINE([LT_INIT], [win32-dll],
+[enable_win32_dll=yes
+
+case $host in
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
+  AC_CHECK_TOOL(AS, as, false)
+  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+  AC_CHECK_TOOL(OBJDUMP, objdump, false)
+  ;;
+esac
+
+test -z "$AS" && AS=as
+_LT_DECL([], [AS],      [1], [Assembler program])dnl
+
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
+
+test -z "$OBJDUMP" && OBJDUMP=objdump
+_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
+])# win32-dll
+
+AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+_LT_SET_OPTION([LT_INIT], [win32-dll])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the 'win32-dll' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
+
+
+# _LT_ENABLE_SHARED([DEFAULT])
+# ----------------------------
+# implement the --enable-shared flag, and supports the 'shared' and
+# 'disable-shared' LT_INIT options.
+# DEFAULT is either 'yes' or 'no'.  If omitted, it defaults to 'yes'.
+m4_define([_LT_ENABLE_SHARED],
+[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([shared],
+    [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
+	[build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_shared=yes ;;
+    no) enable_shared=no ;;
+    *)
+      enable_shared=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for pkg in $enableval; do
+	IFS=$lt_save_ifs
+	if test "X$pkg" = "X$p"; then
+	  enable_shared=yes
+	fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac],
+    [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
+
+    _LT_DECL([build_libtool_libs], [enable_shared], [0],
+	[Whether or not to build shared libraries])
+])# _LT_ENABLE_SHARED
+
+LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
+
+# Old names:
+AC_DEFUN([AC_ENABLE_SHARED],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
+])
+
+AC_DEFUN([AC_DISABLE_SHARED],
+[_LT_SET_OPTION([LT_INIT], [disable-shared])
+])
+
+AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
+AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_ENABLE_SHARED], [])
+dnl AC_DEFUN([AM_DISABLE_SHARED], [])
+
+
+
+# _LT_ENABLE_STATIC([DEFAULT])
+# ----------------------------
+# implement the --enable-static flag, and support the 'static' and
+# 'disable-static' LT_INIT options.
+# DEFAULT is either 'yes' or 'no'.  If omitted, it defaults to 'yes'.
+m4_define([_LT_ENABLE_STATIC],
+[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([static],
+    [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
+	[build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_static=yes ;;
+    no) enable_static=no ;;
+    *)
+     enable_static=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for pkg in $enableval; do
+	IFS=$lt_save_ifs
+	if test "X$pkg" = "X$p"; then
+	  enable_static=yes
+	fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac],
+    [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
+
+    _LT_DECL([build_old_libs], [enable_static], [0],
+	[Whether or not to build static libraries])
+])# _LT_ENABLE_STATIC
+
+LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
+
+# Old names:
+AC_DEFUN([AC_ENABLE_STATIC],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
+])
+
+AC_DEFUN([AC_DISABLE_STATIC],
+[_LT_SET_OPTION([LT_INIT], [disable-static])
+])
+
+AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
+AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_ENABLE_STATIC], [])
+dnl AC_DEFUN([AM_DISABLE_STATIC], [])
+
+
+
+# _LT_ENABLE_FAST_INSTALL([DEFAULT])
+# ----------------------------------
+# implement the --enable-fast-install flag, and support the 'fast-install'
+# and 'disable-fast-install' LT_INIT options.
+# DEFAULT is either 'yes' or 'no'.  If omitted, it defaults to 'yes'.
+m4_define([_LT_ENABLE_FAST_INSTALL],
+[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([fast-install],
+    [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
+    [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_fast_install=yes ;;
+    no) enable_fast_install=no ;;
+    *)
+      enable_fast_install=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for pkg in $enableval; do
+	IFS=$lt_save_ifs
+	if test "X$pkg" = "X$p"; then
+	  enable_fast_install=yes
+	fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac],
+    [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
+
+_LT_DECL([fast_install], [enable_fast_install], [0],
+	 [Whether or not to optimize for fast installation])dnl
+])# _LT_ENABLE_FAST_INSTALL
+
+LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
+
+# Old names:
+AU_DEFUN([AC_ENABLE_FAST_INSTALL],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
+the 'fast-install' option into LT_INIT's first parameter.])
+])
+
+AU_DEFUN([AC_DISABLE_FAST_INSTALL],
+[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
+the 'disable-fast-install' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
+dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
+
+
+# _LT_WITH_AIX_SONAME([DEFAULT])
+# ----------------------------------
+# implement the --with-aix-soname flag, and support the `aix-soname=aix'
+# and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT
+# is either `aix', `both' or `svr4'.  If omitted, it defaults to `aix'.
+m4_define([_LT_WITH_AIX_SONAME],
+[m4_define([_LT_WITH_AIX_SONAME_DEFAULT], [m4_if($1, svr4, svr4, m4_if($1, both, both, aix))])dnl
+shared_archive_member_spec=
+case $host,$enable_shared in
+power*-*-aix[[5-9]]*,yes)
+  AC_MSG_CHECKING([which variant of shared library versioning to provide])
+  AC_ARG_WITH([aix-soname],
+    [AS_HELP_STRING([--with-aix-soname=aix|svr4|both],
+      [shared library versioning (aka "SONAME") variant to provide on AIX, @<:@default=]_LT_WITH_AIX_SONAME_DEFAULT[@:>@.])],
+    [case $withval in
+    aix|svr4|both)
+      ;;
+    *)
+      AC_MSG_ERROR([Unknown argument to --with-aix-soname])
+      ;;
+    esac
+    lt_cv_with_aix_soname=$with_aix_soname],
+    [AC_CACHE_VAL([lt_cv_with_aix_soname],
+      [lt_cv_with_aix_soname=]_LT_WITH_AIX_SONAME_DEFAULT)
+    with_aix_soname=$lt_cv_with_aix_soname])
+  AC_MSG_RESULT([$with_aix_soname])
+  if test aix != "$with_aix_soname"; then
+    # For the AIX way of multilib, we name the shared archive member
+    # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
+    # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
+    # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
+    # the AIX toolchain works better with OBJECT_MODE set (default 32).
+    if test 64 = "${OBJECT_MODE-32}"; then
+      shared_archive_member_spec=shr_64
+    else
+      shared_archive_member_spec=shr
+    fi
+  fi
+  ;;
+*)
+  with_aix_soname=aix
+  ;;
+esac
+
+_LT_DECL([], [shared_archive_member_spec], [0],
+    [Shared archive member basename, for filename based shared library versioning on AIX])dnl
+])# _LT_WITH_AIX_SONAME
+
+LT_OPTION_DEFINE([LT_INIT], [aix-soname=aix], [_LT_WITH_AIX_SONAME([aix])])
+LT_OPTION_DEFINE([LT_INIT], [aix-soname=both], [_LT_WITH_AIX_SONAME([both])])
+LT_OPTION_DEFINE([LT_INIT], [aix-soname=svr4], [_LT_WITH_AIX_SONAME([svr4])])
+
+
+# _LT_WITH_PIC([MODE])
+# --------------------
+# implement the --with-pic flag, and support the 'pic-only' and 'no-pic'
+# LT_INIT options.
+# MODE is either 'yes' or 'no'.  If omitted, it defaults to 'both'.
+m4_define([_LT_WITH_PIC],
+[AC_ARG_WITH([pic],
+    [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
+	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
+    [lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for lt_pkg in $withval; do
+	IFS=$lt_save_ifs
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac],
+    [pic_mode=m4_default([$1], [default])])
+
+_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
+])# _LT_WITH_PIC
+
+LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
+LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
+
+# Old name:
+AU_DEFUN([AC_LIBTOOL_PICMODE],
+[_LT_SET_OPTION([LT_INIT], [pic-only])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the 'pic-only' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
+
+## ----------------- ##
+## LTDL_INIT Options ##
+## ----------------- ##
+
+m4_define([_LTDL_MODE], [])
+LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
+		 [m4_define([_LTDL_MODE], [nonrecursive])])
+LT_OPTION_DEFINE([LTDL_INIT], [recursive],
+		 [m4_define([_LTDL_MODE], [recursive])])
+LT_OPTION_DEFINE([LTDL_INIT], [subproject],
+		 [m4_define([_LTDL_MODE], [subproject])])
+
+m4_define([_LTDL_TYPE], [])
+LT_OPTION_DEFINE([LTDL_INIT], [installable],
+		 [m4_define([_LTDL_TYPE], [installable])])
+LT_OPTION_DEFINE([LTDL_INIT], [convenience],
+		 [m4_define([_LTDL_TYPE], [convenience])])
diff --git a/conf/ltsugar.m4 b/conf/ltsugar.m4
new file mode 100644
index 0000000..48bc934
--- /dev/null
+++ b/conf/ltsugar.m4
@@ -0,0 +1,124 @@
+# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
+#
+# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software
+# Foundation, Inc.
+# Written by Gary V. Vaughan, 2004
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# serial 6 ltsugar.m4
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
+
+
+# lt_join(SEP, ARG1, [ARG2...])
+# -----------------------------
+# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
+# associated separator.
+# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
+# versions in m4sugar had bugs.
+m4_define([lt_join],
+[m4_if([$#], [1], [],
+       [$#], [2], [[$2]],
+       [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
+m4_define([_lt_join],
+[m4_if([$#$2], [2], [],
+       [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
+
+
+# lt_car(LIST)
+# lt_cdr(LIST)
+# ------------
+# Manipulate m4 lists.
+# These macros are necessary as long as will still need to support
+# Autoconf-2.59, which quotes differently.
+m4_define([lt_car], [[$1]])
+m4_define([lt_cdr],
+[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
+       [$#], 1, [],
+       [m4_dquote(m4_shift($@))])])
+m4_define([lt_unquote], $1)
+
+
+# lt_append(MACRO-NAME, STRING, [SEPARATOR])
+# ------------------------------------------
+# Redefine MACRO-NAME to hold its former content plus 'SEPARATOR''STRING'.
+# Note that neither SEPARATOR nor STRING are expanded; they are appended
+# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
+# No SEPARATOR is output if MACRO-NAME was previously undefined (different
+# than defined and empty).
+#
+# This macro is needed until we can rely on Autoconf 2.62, since earlier
+# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
+m4_define([lt_append],
+[m4_define([$1],
+	   m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
+
+
+
+# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
+# ----------------------------------------------------------
+# Produce a SEP delimited list of all paired combinations of elements of
+# PREFIX-LIST with SUFFIX1 through SUFFIXn.  Each element of the list
+# has the form PREFIXmINFIXSUFFIXn.
+# Needed until we can rely on m4_combine added in Autoconf 2.62.
+m4_define([lt_combine],
+[m4_if(m4_eval([$# > 3]), [1],
+       [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
+[[m4_foreach([_Lt_prefix], [$2],
+	     [m4_foreach([_Lt_suffix],
+		]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
+	[_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
+
+
+# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
+# -----------------------------------------------------------------------
+# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
+# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
+m4_define([lt_if_append_uniq],
+[m4_ifdef([$1],
+	  [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
+		 [lt_append([$1], [$2], [$3])$4],
+		 [$5])],
+	  [lt_append([$1], [$2], [$3])$4])])
+
+
+# lt_dict_add(DICT, KEY, VALUE)
+# -----------------------------
+m4_define([lt_dict_add],
+[m4_define([$1($2)], [$3])])
+
+
+# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
+# --------------------------------------------
+m4_define([lt_dict_add_subkey],
+[m4_define([$1($2:$3)], [$4])])
+
+
+# lt_dict_fetch(DICT, KEY, [SUBKEY])
+# ----------------------------------
+m4_define([lt_dict_fetch],
+[m4_ifval([$3],
+	m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),
+    m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])
+
+
+# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])
+# -----------------------------------------------------------------
+m4_define([lt_if_dict_fetch],
+[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4],
+	[$5],
+    [$6])])
+
+
+# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
+# --------------------------------------------------------------
+m4_define([lt_dict_filter],
+[m4_if([$5], [], [],
+  [lt_join(m4_quote(m4_default([$4], [[, ]])),
+           lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
+		      [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
+])
diff --git a/conf/ltversion.m4 b/conf/ltversion.m4
new file mode 100644
index 0000000..fa04b52
--- /dev/null
+++ b/conf/ltversion.m4
@@ -0,0 +1,23 @@
+# ltversion.m4 -- version numbers			-*- Autoconf -*-
+#
+#   Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc.
+#   Written by Scott James Remnant, 2004
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# @configure_input@
+
+# serial 4179 ltversion.m4
+# This file is part of GNU Libtool
+
+m4_define([LT_PACKAGE_VERSION], [2.4.6])
+m4_define([LT_PACKAGE_REVISION], [2.4.6])
+
+AC_DEFUN([LTVERSION_VERSION],
+[macro_version='2.4.6'
+macro_revision='2.4.6'
+_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
+_LT_DECL(, macro_revision, 0)
+])
diff --git a/conf/lt~obsolete.m4 b/conf/lt~obsolete.m4
new file mode 100644
index 0000000..c6b26f8
--- /dev/null
+++ b/conf/lt~obsolete.m4
@@ -0,0 +1,99 @@
+# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
+#
+#   Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software
+#   Foundation, Inc.
+#   Written by Scott James Remnant, 2004.
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# serial 5 lt~obsolete.m4
+
+# These exist entirely to fool aclocal when bootstrapping libtool.
+#
+# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN),
+# which have later been changed to m4_define as they aren't part of the
+# exported API, or moved to Autoconf or Automake where they belong.
+#
+# The trouble is, aclocal is a bit thick.  It'll see the old AC_DEFUN
+# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
+# using a macro with the same name in our local m4/libtool.m4 it'll
+# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
+# and doesn't know about Autoconf macros at all.)
+#
+# So we provide this file, which has a silly filename so it's always
+# included after everything else.  This provides aclocal with the
+# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
+# because those macros already exist, or will be overwritten later.
+# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6.
+#
+# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
+# Yes, that means every name once taken will need to remain here until
+# we give up compatibility with versions before 1.7, at which point
+# we need to keep only those names which we still refer to.
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
+
+m4_ifndef([AC_LIBTOOL_LINKER_OPTION],	[AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
+m4_ifndef([AC_PROG_EGREP],		[AC_DEFUN([AC_PROG_EGREP])])
+m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
+m4_ifndef([_LT_AC_SHELL_INIT],		[AC_DEFUN([_LT_AC_SHELL_INIT])])
+m4_ifndef([_LT_AC_SYS_LIBPATH_AIX],	[AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])
+m4_ifndef([_LT_PROG_LTMAIN],		[AC_DEFUN([_LT_PROG_LTMAIN])])
+m4_ifndef([_LT_AC_TAGVAR],		[AC_DEFUN([_LT_AC_TAGVAR])])
+m4_ifndef([AC_LTDL_ENABLE_INSTALL],	[AC_DEFUN([AC_LTDL_ENABLE_INSTALL])])
+m4_ifndef([AC_LTDL_PREOPEN],		[AC_DEFUN([AC_LTDL_PREOPEN])])
+m4_ifndef([_LT_AC_SYS_COMPILER],	[AC_DEFUN([_LT_AC_SYS_COMPILER])])
+m4_ifndef([_LT_AC_LOCK],		[AC_DEFUN([_LT_AC_LOCK])])
+m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE],	[AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])])
+m4_ifndef([_LT_AC_TRY_DLOPEN_SELF],	[AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])])
+m4_ifndef([AC_LIBTOOL_PROG_CC_C_O],	[AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])])
+m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])])
+m4_ifndef([AC_LIBTOOL_OBJDIR],		[AC_DEFUN([AC_LIBTOOL_OBJDIR])])
+m4_ifndef([AC_LTDL_OBJDIR],		[AC_DEFUN([AC_LTDL_OBJDIR])])
+m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])])
+m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP],	[AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])])
+m4_ifndef([AC_PATH_MAGIC],		[AC_DEFUN([AC_PATH_MAGIC])])
+m4_ifndef([AC_PROG_LD_GNU],		[AC_DEFUN([AC_PROG_LD_GNU])])
+m4_ifndef([AC_PROG_LD_RELOAD_FLAG],	[AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])])
+m4_ifndef([AC_DEPLIBS_CHECK_METHOD],	[AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])])
+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])])
+m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])])
+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])])
+m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS],	[AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])])
+m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP],	[AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])])
+m4_ifndef([LT_AC_PROG_EGREP],		[AC_DEFUN([LT_AC_PROG_EGREP])])
+m4_ifndef([LT_AC_PROG_SED],		[AC_DEFUN([LT_AC_PROG_SED])])
+m4_ifndef([_LT_CC_BASENAME],		[AC_DEFUN([_LT_CC_BASENAME])])
+m4_ifndef([_LT_COMPILER_BOILERPLATE],	[AC_DEFUN([_LT_COMPILER_BOILERPLATE])])
+m4_ifndef([_LT_LINKER_BOILERPLATE],	[AC_DEFUN([_LT_LINKER_BOILERPLATE])])
+m4_ifndef([_AC_PROG_LIBTOOL],		[AC_DEFUN([_AC_PROG_LIBTOOL])])
+m4_ifndef([AC_LIBTOOL_SETUP],		[AC_DEFUN([AC_LIBTOOL_SETUP])])
+m4_ifndef([_LT_AC_CHECK_DLFCN],		[AC_DEFUN([_LT_AC_CHECK_DLFCN])])
+m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER],	[AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])])
+m4_ifndef([_LT_AC_TAGCONFIG],		[AC_DEFUN([_LT_AC_TAGCONFIG])])
+m4_ifndef([AC_DISABLE_FAST_INSTALL],	[AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
+m4_ifndef([_LT_AC_LANG_CXX],		[AC_DEFUN([_LT_AC_LANG_CXX])])
+m4_ifndef([_LT_AC_LANG_F77],		[AC_DEFUN([_LT_AC_LANG_F77])])
+m4_ifndef([_LT_AC_LANG_GCJ],		[AC_DEFUN([_LT_AC_LANG_GCJ])])
+m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
+m4_ifndef([_LT_AC_LANG_C_CONFIG],	[AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
+m4_ifndef([_LT_AC_LANG_CXX_CONFIG],	[AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])])
+m4_ifndef([_LT_AC_LANG_F77_CONFIG],	[AC_DEFUN([_LT_AC_LANG_F77_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])])
+m4_ifndef([_LT_AC_LANG_GCJ_CONFIG],	[AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
+m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
+m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
+m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
+m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS],	[AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
+m4_ifndef([_LT_AC_PROG_CXXCPP],		[AC_DEFUN([_LT_AC_PROG_CXXCPP])])
+m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS],	[AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
+m4_ifndef([_LT_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
+m4_ifndef([_LT_PROG_F77],		[AC_DEFUN([_LT_PROG_F77])])
+m4_ifndef([_LT_PROG_FC],		[AC_DEFUN([_LT_PROG_FC])])
+m4_ifndef([_LT_PROG_CXX],		[AC_DEFUN([_LT_PROG_CXX])])
diff --git a/conf/missing b/conf/missing
new file mode 100755
index 0000000..cdea514
--- /dev/null
+++ b/conf/missing
@@ -0,0 +1,215 @@
+#! /bin/sh
+# Common wrapper for a few potentially missing GNU programs.
+
+scriptversion=2012-06-26.16; # UTC
+
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+if test $# -eq 0; then
+  echo 1>&2 "Try '$0 --help' for more information"
+  exit 1
+fi
+
+case $1 in
+
+  --is-lightweight)
+    # Used by our autoconf macros to check whether the available missing
+    # script is modern enough.
+    exit 0
+    ;;
+
+  --run)
+    # Back-compat with the calling convention used by older automake.
+    shift
+    ;;
+
+  -h|--h|--he|--hel|--help)
+    echo "\
+$0 [OPTION]... PROGRAM [ARGUMENT]...
+
+Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
+to PROGRAM being missing or too old.
+
+Options:
+  -h, --help      display this help and exit
+  -v, --version   output version information and exit
+
+Supported PROGRAM values:
+  aclocal   autoconf  autoheader   autom4te  automake  makeinfo
+  bison     yacc      flex         lex       help2man
+
+Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+'g' are ignored when checking the name.
+
+Send bug reports to <bug-automake@gnu.org>."
+    exit $?
+    ;;
+
+  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
+    echo "missing $scriptversion (GNU Automake)"
+    exit $?
+    ;;
+
+  -*)
+    echo 1>&2 "$0: unknown '$1' option"
+    echo 1>&2 "Try '$0 --help' for more information"
+    exit 1
+    ;;
+
+esac
+
+# Run the given program, remember its exit status.
+"$@"; st=$?
+
+# If it succeeded, we are done.
+test $st -eq 0 && exit 0
+
+# Also exit now if we it failed (or wasn't found), and '--version' was
+# passed; such an option is passed most likely to detect whether the
+# program is present and works.
+case $2 in --version|--help) exit $st;; esac
+
+# Exit code 63 means version mismatch.  This often happens when the user
+# tries to use an ancient version of a tool on a file that requires a
+# minimum version.
+if test $st -eq 63; then
+  msg="probably too old"
+elif test $st -eq 127; then
+  # Program was missing.
+  msg="missing on your system"
+else
+  # Program was found and executed, but failed.  Give up.
+  exit $st
+fi
+
+perl_URL=http://www.perl.org/
+flex_URL=http://flex.sourceforge.net/
+gnu_software_URL=http://www.gnu.org/software
+
+program_details ()
+{
+  case $1 in
+    aclocal|automake)
+      echo "The '$1' program is part of the GNU Automake package:"
+      echo "<$gnu_software_URL/automake>"
+      echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/autoconf>"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+    autoconf|autom4te|autoheader)
+      echo "The '$1' program is part of the GNU Autoconf package:"
+      echo "<$gnu_software_URL/autoconf/>"
+      echo "It also requires GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+  esac
+}
+
+give_advice ()
+{
+  # Normalize program name to check for.
+  normalized_program=`echo "$1" | sed '
+    s/^gnu-//; t
+    s/^gnu//; t
+    s/^g//; t'`
+
+  printf '%s\n' "'$1' is $msg."
+
+  configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
+  case $normalized_program in
+    autoconf*)
+      echo "You should only need it if you modified 'configure.ac',"
+      echo "or m4 files included by it."
+      program_details 'autoconf'
+      ;;
+    autoheader*)
+      echo "You should only need it if you modified 'acconfig.h' or"
+      echo "$configure_deps."
+      program_details 'autoheader'
+      ;;
+    automake*)
+      echo "You should only need it if you modified 'Makefile.am' or"
+      echo "$configure_deps."
+      program_details 'automake'
+      ;;
+    aclocal*)
+      echo "You should only need it if you modified 'acinclude.m4' or"
+      echo "$configure_deps."
+      program_details 'aclocal'
+      ;;
+   autom4te*)
+      echo "You might have modified some maintainer files that require"
+      echo "the 'automa4te' program to be rebuilt."
+      program_details 'autom4te'
+      ;;
+    bison*|yacc*)
+      echo "You should only need it if you modified a '.y' file."
+      echo "You may want to install the GNU Bison package:"
+      echo "<$gnu_software_URL/bison/>"
+      ;;
+    lex*|flex*)
+      echo "You should only need it if you modified a '.l' file."
+      echo "You may want to install the Fast Lexical Analyzer package:"
+      echo "<$flex_URL>"
+      ;;
+    help2man*)
+      echo "You should only need it if you modified a dependency" \
+           "of a man page."
+      echo "You may want to install the GNU Help2man package:"
+      echo "<$gnu_software_URL/help2man/>"
+    ;;
+    makeinfo*)
+      echo "You should only need it if you modified a '.texi' file, or"
+      echo "any other file indirectly affecting the aspect of the manual."
+      echo "You might want to install the Texinfo package:"
+      echo "<$gnu_software_URL/texinfo/>"
+      echo "The spurious makeinfo call might also be the consequence of"
+      echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
+      echo "want to install GNU make:"
+      echo "<$gnu_software_URL/make/>"
+      ;;
+    *)
+      echo "You might have modified some files without having the proper"
+      echo "tools for further handling them.  Check the 'README' file, it"
+      echo "often tells you about the needed prerequisites for installing"
+      echo "this package.  You may also peek at any GNU archive site, in"
+      echo "case some other package contains this missing '$1' program."
+      ;;
+  esac
+}
+
+give_advice "$1" | sed -e '1s/^/WARNING: /' \
+                       -e '2,$s/^/         /' >&2
+
+# Propagate the correct exit status (expected to be 127 for a program
+# not found, 63 for a program that failed due to version mismatch).
+exit $st
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/conf/pkg.m4 b/conf/pkg.m4
new file mode 100644
index 0000000..c29b6c0
--- /dev/null
+++ b/conf/pkg.m4
@@ -0,0 +1,157 @@
+# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
+# 
+# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
+# ----------------------------------
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=m4_default([$1], [0.9.0])
+	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		AC_MSG_RESULT([yes])
+	else
+		AC_MSG_RESULT([no])
+		PKG_CONFIG=""
+	fi
+		
+fi[]dnl
+])# PKG_PROG_PKG_CONFIG
+
+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+#
+# Check to see whether a particular set of modules exists.  Similar
+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+#
+#
+# Similar to PKG_CHECK_MODULES, make sure that the first instance of
+# this or PKG_CHECK_MODULES is called, or make sure to call
+# PKG_CHECK_EXISTS manually
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_EXISTS],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+if test -n "$PKG_CONFIG" && \
+    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+  m4_ifval([$2], [$2], [:])
+m4_ifvaln([$3], [else
+  $3])dnl
+fi])
+
+
+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+# ---------------------------------------------
+m4_define([_PKG_CONFIG],
+[if test -n "$PKG_CONFIG"; then
+    if test -n "$$1"; then
+        pkg_cv_[]$1="$$1"
+    else
+        PKG_CHECK_EXISTS([$3],
+                         [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+			 [pkg_failed=yes])
+    fi
+else
+	pkg_failed=untried
+fi[]dnl
+])# _PKG_CONFIG
+
+# _PKG_SHORT_ERRORS_SUPPORTED
+# -----------------------------
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi[]dnl
+])# _PKG_SHORT_ERRORS_SUPPORTED
+
+
+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+# [ACTION-IF-NOT-FOUND])
+#
+#
+# Note that if there is a possibility the first call to
+# PKG_CHECK_MODULES might not happen, you should be sure to include an
+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+#
+#
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_MODULES],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+
+pkg_failed=no
+AC_MSG_CHECKING([for $1])
+
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
+
+if test $pkg_failed = yes; then
+        _PKG_SHORT_ERRORS_SUPPORTED
+        if test $_pkg_short_errors_supported = yes; then
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
+        else 
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+
+	ifelse([$4], , [AC_MSG_ERROR(dnl
+[Package requirements ($2) were not met:
+
+$$1_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+_PKG_TEXT
+])],
+		[AC_MSG_RESULT([no])
+                $4])
+elif test $pkg_failed = untried; then
+	ifelse([$4], , [AC_MSG_FAILURE(dnl
+[The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+_PKG_TEXT
+
+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
+		[$4])
+else
+	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+        AC_MSG_RESULT([yes])
+	ifelse([$3], , :, [$3])
+fi[]dnl
+])# PKG_CHECK_MODULES
diff --git a/conf/test-driver b/conf/test-driver
new file mode 100755
index 0000000..32bf39e
--- /dev/null
+++ b/conf/test-driver
@@ -0,0 +1,127 @@
+#! /bin/sh
+# test-driver - basic testsuite driver script.
+
+scriptversion=2012-06-27.10; # UTC
+
+# Copyright (C) 2011-2013 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+# Make unconditional expansion of undefined variables an error.  This
+# helps a lot in preventing typo-related bugs.
+set -u
+
+usage_error ()
+{
+  echo "$0: $*" >&2
+  print_usage >&2
+  exit 2
+}
+
+print_usage ()
+{
+  cat <<END
+Usage:
+  test-driver --test-name=NAME --log-file=PATH --trs-file=PATH
+              [--expect-failure={yes|no}] [--color-tests={yes|no}]
+              [--enable-hard-errors={yes|no}] [--] TEST-SCRIPT
+The '--test-name', '--log-file' and '--trs-file' options are mandatory.
+END
+}
+
+# TODO: better error handling in option parsing (in particular, ensure
+# TODO: $log_file, $trs_file and $test_name are defined).
+test_name= # Used for reporting.
+log_file=  # Where to save the output of the test script.
+trs_file=  # Where to save the metadata of the test run.
+expect_failure=no
+color_tests=no
+enable_hard_errors=yes
+while test $# -gt 0; do
+  case $1 in
+  --help) print_usage; exit $?;;
+  --version) echo "test-driver $scriptversion"; exit $?;;
+  --test-name) test_name=$2; shift;;
+  --log-file) log_file=$2; shift;;
+  --trs-file) trs_file=$2; shift;;
+  --color-tests) color_tests=$2; shift;;
+  --expect-failure) expect_failure=$2; shift;;
+  --enable-hard-errors) enable_hard_errors=$2; shift;;
+  --) shift; break;;
+  -*) usage_error "invalid option: '$1'";;
+  esac
+  shift
+done
+
+if test $color_tests = yes; then
+  # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'.
+  red='' # Red.
+  grn='' # Green.
+  lgn='' # Light green.
+  blu='' # Blue.
+  mgn='' # Magenta.
+  std=''     # No color.
+else
+  red= grn= lgn= blu= mgn= std=
+fi
+
+do_exit='rm -f $log_file $trs_file; (exit $st); exit $st'
+trap "st=129; $do_exit" 1
+trap "st=130; $do_exit" 2
+trap "st=141; $do_exit" 13
+trap "st=143; $do_exit" 15
+
+# Test script is run here.
+"$@" >$log_file 2>&1
+estatus=$?
+if test $enable_hard_errors = no && test $estatus -eq 99; then
+  estatus=1
+fi
+
+case $estatus:$expect_failure in
+  0:yes) col=$red res=XPASS recheck=yes gcopy=yes;;
+  0:*)   col=$grn res=PASS  recheck=no  gcopy=no;;
+  77:*)  col=$blu res=SKIP  recheck=no  gcopy=yes;;
+  99:*)  col=$mgn res=ERROR recheck=yes gcopy=yes;;
+  *:yes) col=$lgn res=XFAIL recheck=no  gcopy=yes;;
+  *:*)   col=$red res=FAIL  recheck=yes gcopy=yes;;
+esac
+
+# Report outcome to console.
+echo "${col}${res}${std}: $test_name"
+
+# Register the test result, and other relevant metadata.
+echo ":test-result: $res" > $trs_file
+echo ":global-test-result: $res" >> $trs_file
+echo ":recheck: $recheck" >> $trs_file
+echo ":copy-in-global-log: $gcopy" >> $trs_file
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/config.h.in b/config.h.in
new file mode 100644
index 0000000..7dedcc5
--- /dev/null
+++ b/config.h.in
@@ -0,0 +1,1418 @@
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+#ifndef _config_h
+#define _config_h
+
+/* Define if building universal (internal helper macro) */
+#undef AC_APPLE_UNIVERSAL_BUILD
+
+/* Define to the number of bits in type 'ptrdiff_t'. */
+#undef BITSIZEOF_PTRDIFF_T
+
+/* Define to the number of bits in type 'sig_atomic_t'. */
+#undef BITSIZEOF_SIG_ATOMIC_T
+
+/* Define to the number of bits in type 'size_t'. */
+#undef BITSIZEOF_SIZE_T
+
+/* Define to the number of bits in type 'wchar_t'. */
+#undef BITSIZEOF_WCHAR_T
+
+/* Define to the number of bits in type 'wint_t'. */
+#undef BITSIZEOF_WINT_T
+
+/* What sort of HTTP client is this? */
+#undef CNAME
+
+/* 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.
+   */
+#undef CRAY_STACKSEG_END
+
+/* Client version number */
+#undef CVER
+
+/* Define to 1 if using `alloca.c'. */
+#undef C_ALLOCA
+
+/* Define to 1 if the C locale may have encoding errors. */
+#undef C_LOCALE_MAYBE_EILSEQ
+
+/* Should DAP4 support be enabled? */
+#undef DAP4
+
+/* Highest DAP version implemented? */
+#undef DAP_PROTOCOL_VERSION
+
+/* unsigned bytes/chars */
+#undef DBYTE
+
+/* 32-bit real type */
+#undef DFLOAT32
+
+/* 64-bit real type */
+#undef DFLOAT64
+
+/* 16-bit integer type */
+#undef DINT16
+
+/* 32-bit integer type */
+#undef DINT32
+
+/* 64-bit integer type */
+#undef DINT64
+
+/* 8-bit integer type */
+#undef DINT8
+
+/* Set instrumentation to level 1 (see debug.h) */
+#undef DODS_DEBUG
+
+/* Set instrumentation to level 2 */
+#undef DODS_DEBUG2
+
+/* 16-bit unsigned integer type */
+#undef DUINT16
+
+/* 32-bit unsigned integer type */
+#undef DUINT32
+
+/* 64-bit unsigned integer type */
+#undef DUINT64
+
+/* Client name and version combined */
+#undef DVR
+
+/* Define to 1 if nl_langinfo (YESEXPR) returns a non-empty string. */
+#undef FUNC_NL_LANGINFO_YESEXPR_WORKS
+
+/* Define if gettimeofday clobbers the localtime buffer. */
+#undef GETTIMEOFDAY_CLOBBERS_LOCALTIME
+
+/* Define this to 'void' or 'struct timezone' to match the system's
+   declaration of the second argument to gettimeofday. */
+#undef GETTIMEOFDAY_TIMEZONE
+
+/* Define to a C preprocessor expression that evaluates to 1 or 0, depending
+   whether the gnulib module lock shall be considered present. */
+#undef GNULIB_LOCK
+
+/* Define to a C preprocessor expression that evaluates to 1 or 0, depending
+   whether the gnulib module mkstemps shall be considered present. */
+#undef GNULIB_MKSTEMPS
+
+/* Define to 1 when the gnulib module btowc should be tested. */
+#undef GNULIB_TEST_BTOWC
+
+/* Define to 1 when the gnulib module gettimeofday should be tested. */
+#undef GNULIB_TEST_GETTIMEOFDAY
+
+/* Define to 1 when the gnulib module localeconv should be tested. */
+#undef GNULIB_TEST_LOCALECONV
+
+/* Define to 1 when the gnulib module lstat should be tested. */
+#undef GNULIB_TEST_LSTAT
+
+/* Define to 1 when the gnulib module mbrtowc should be tested. */
+#undef GNULIB_TEST_MBRTOWC
+
+/* Define to 1 when the gnulib module mbsinit should be tested. */
+#undef GNULIB_TEST_MBSINIT
+
+/* Define to 1 when the gnulib module mbtowc should be tested. */
+#undef GNULIB_TEST_MBTOWC
+
+/* Define to 1 when the gnulib module mkstemps should be tested. */
+#undef GNULIB_TEST_MKSTEMPS
+
+/* Define to 1 when the gnulib module nl_langinfo should be tested. */
+#undef GNULIB_TEST_NL_LANGINFO
+
+/* Define to 1 when the gnulib module stat should be tested. */
+#undef GNULIB_TEST_STAT
+
+/* Define to 1 when the gnulib module wcrtomb should be tested. */
+#undef GNULIB_TEST_WCRTOMB
+
+/* Define to 1 if you have the `alarm' function. */
+#undef HAVE_ALARM
+
+/* Define to 1 if you have 'alloca' after including <alloca.h>, a header that
+   may be supplied by this distribution. */
+#undef HAVE_ALLOCA
+
+/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
+   */
+#undef HAVE_ALLOCA_H
+
+/* Define to 1 if you have the `atexit' function. */
+#undef HAVE_ATEXIT
+
+/* Define to 1 if you have the `btowc' function. */
+#undef HAVE_BTOWC
+
+/* Define to 1 if you have the <byteswap.h> header file. */
+#undef HAVE_BYTESWAP_H
+
+/* Define to 1 if you have the `bzero' function. */
+#undef HAVE_BZERO
+
+/* Define to 1 if you have the <crtdefs.h> header file. */
+#undef HAVE_CRTDEFS_H
+
+/* Define to 1 if you have the declaration of `alarm', and to 0 if you don't.
+   */
+#undef HAVE_DECL_ALARM
+
+/* Define to 1 if you have the declaration of `getc_unlocked', and to 0 if you
+   don't. */
+#undef HAVE_DECL_GETC_UNLOCKED
+
+/* Define to 1 if you have the declaration of `isblank', and to 0 if you
+   don't. */
+#undef HAVE_DECL_ISBLANK
+
+/* Define to 1 if you have the declaration of `mbrtowc', and to 0 if you
+   don't. */
+#undef HAVE_DECL_MBRTOWC
+
+/* Define to 1 if you have the declaration of `mbsinit', and to 0 if you
+   don't. */
+#undef HAVE_DECL_MBSINIT
+
+/* Define to 1 if you have the declaration of `towlower', and to 0 if you
+   don't. */
+#undef HAVE_DECL_TOWLOWER
+
+/* Define to 1 if you have the declaration of `wcrtomb', and to 0 if you
+   don't. */
+#undef HAVE_DECL_WCRTOMB
+
+/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
+   */
+#undef HAVE_DIRENT_H
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
+/* Define to 1 if you have the `dup2' function. */
+#undef HAVE_DUP2
+
+/* Define to 1 if you have the <fcntl.h> header file. */
+#undef HAVE_FCNTL_H
+
+/* Define to 1 if you have the <features.h> header file. */
+#undef HAVE_FEATURES_H
+
+/* Define to 1 if you have the `getcwd' function. */
+#undef HAVE_GETCWD
+
+/* Define to 1 if you have the `getpagesize' function. */
+#undef HAVE_GETPAGESIZE
+
+/* Define to 1 if you have the `gettimeofday' function. */
+#undef HAVE_GETTIMEOFDAY
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the `isblank' function. */
+#undef HAVE_ISBLANK
+
+/* Define to 1 if you have the `iswcntrl' function. */
+#undef HAVE_ISWCNTRL
+
+/* Define to 1 if you have the `iswctype' function. */
+#undef HAVE_ISWCTYPE
+
+/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
+#undef HAVE_LANGINFO_CODESET
+
+/* Define to 1 if you have the <langinfo.h> header file. */
+#undef HAVE_LANGINFO_H
+
+/* Define to 1 if you have the <libintl.h> header file. */
+#undef HAVE_LIBINTL_H
+
+/* Define to 1 if you have the <limits.h> header file. */
+#undef HAVE_LIMITS_H
+
+/* Define to 1 if you have the `localtime_r' function. */
+#undef HAVE_LOCALTIME_R
+
+/* Define to 1 if the system has the type 'long long int'. */
+#undef HAVE_LONG_LONG_INT
+
+/* Define to 1 if you have the `lstat' function. */
+#undef HAVE_LSTAT
+
+/* Define to 1 if you have the <malloc.h> header file. */
+#undef HAVE_MALLOC_H
+
+/* Define to 1 if you have the `mbrtowc' function. */
+#undef HAVE_MBRTOWC
+
+/* Define to 1 if you have the `mbsinit' function. */
+#undef HAVE_MBSINIT
+
+/* Define to 1 if <wchar.h> declares mbstate_t. */
+#undef HAVE_MBSTATE_T
+
+/* Define to 1 if you have the `memmove' function. */
+#undef HAVE_MEMMOVE
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the `memset' function. */
+#undef HAVE_MEMSET
+
+/* Define to 1 if you have the `mkstemps' function. */
+#undef HAVE_MKSTEMPS
+
+/* Define to 1 if you have the `mktime' function. */
+#undef HAVE_MKTIME
+
+/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
+#undef HAVE_NDIR_H
+
+/* Define to 1 if you have the <netinet/in.h> header file. */
+#undef HAVE_NETINET_IN_H
+
+/* Define to 1 if you have the `nl_langinfo' function. */
+#undef HAVE_NL_LANGINFO
+
+/* Define to 1 if you have the `pow' function. */
+#undef HAVE_POW
+
+/* Define to 1 if you have the <pthread.h> header file. */
+#undef HAVE_PTHREAD_H
+
+/* Define if the <pthread.h> defines PTHREAD_MUTEX_RECURSIVE. */
+#undef HAVE_PTHREAD_MUTEX_RECURSIVE
+
+/* Define if the POSIX multithreading library has read/write locks. */
+#undef HAVE_PTHREAD_RWLOCK
+
+/* Define if the 'pthread_rwlock_rdlock' function prefers a writer to a
+   reader. */
+#undef HAVE_PTHREAD_RWLOCK_RDLOCK_PREFER_WRITER
+
+/* Define to 1 if you have the `putenv' function. */
+#undef HAVE_PUTENV
+
+/* Define to 1 if atoll is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_ATOLL
+
+/* Define to 1 if btowc is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_BTOWC
+
+/* Define to 1 if canonicalize_file_name is declared even after undefining
+   macros. */
+#undef HAVE_RAW_DECL_CANONICALIZE_FILE_NAME
+
+/* Define to 1 if chdir is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_CHDIR
+
+/* Define to 1 if chown is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_CHOWN
+
+/* Define to 1 if dup is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_DUP
+
+/* Define to 1 if dup2 is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_DUP2
+
+/* Define to 1 if dup3 is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_DUP3
+
+/* Define to 1 if duplocale is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_DUPLOCALE
+
+/* Define to 1 if endusershell is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_ENDUSERSHELL
+
+/* Define to 1 if environ is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_ENVIRON
+
+/* Define to 1 if euidaccess is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_EUIDACCESS
+
+/* Define to 1 if faccessat is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_FACCESSAT
+
+/* Define to 1 if fchdir is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_FCHDIR
+
+/* Define to 1 if fchmodat is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_FCHMODAT
+
+/* Define to 1 if fchownat is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_FCHOWNAT
+
+/* Define to 1 if fcntl is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_FCNTL
+
+/* Define to 1 if fdatasync is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_FDATASYNC
+
+/* Define to 1 if fstat is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_FSTAT
+
+/* Define to 1 if fstatat is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_FSTATAT
+
+/* Define to 1 if fsync is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_FSYNC
+
+/* Define to 1 if ftruncate is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_FTRUNCATE
+
+/* Define to 1 if futimens is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_FUTIMENS
+
+/* Define to 1 if getcwd is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_GETCWD
+
+/* Define to 1 if getdomainname is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_GETDOMAINNAME
+
+/* Define to 1 if getdtablesize is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_GETDTABLESIZE
+
+/* Define to 1 if getgroups is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_GETGROUPS
+
+/* Define to 1 if gethostname is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_GETHOSTNAME
+
+/* Define to 1 if getloadavg is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_GETLOADAVG
+
+/* Define to 1 if getlogin is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_GETLOGIN
+
+/* Define to 1 if getlogin_r is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_GETLOGIN_R
+
+/* Define to 1 if getpagesize is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_GETPAGESIZE
+
+/* Define to 1 if getsubopt is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_GETSUBOPT
+
+/* Define to 1 if gettimeofday is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_GETTIMEOFDAY
+
+/* Define to 1 if getusershell is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_GETUSERSHELL
+
+/* Define to 1 if grantpt is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_GRANTPT
+
+/* Define to 1 if group_member is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_GROUP_MEMBER
+
+/* Define to 1 if initstate is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_INITSTATE
+
+/* Define to 1 if initstate_r is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_INITSTATE_R
+
+/* Define to 1 if isatty is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_ISATTY
+
+/* Define to 1 if iswctype is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_ISWCTYPE
+
+/* Define to 1 if lchmod is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_LCHMOD
+
+/* Define to 1 if lchown is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_LCHOWN
+
+/* Define to 1 if link is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_LINK
+
+/* Define to 1 if linkat is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_LINKAT
+
+/* Define to 1 if lseek is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_LSEEK
+
+/* Define to 1 if lstat is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_LSTAT
+
+/* Define to 1 if mbrlen is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_MBRLEN
+
+/* Define to 1 if mbrtowc is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_MBRTOWC
+
+/* Define to 1 if mbsinit is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_MBSINIT
+
+/* Define to 1 if mbsnrtowcs is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_MBSNRTOWCS
+
+/* Define to 1 if mbsrtowcs is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_MBSRTOWCS
+
+/* Define to 1 if mkdirat is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_MKDIRAT
+
+/* Define to 1 if mkdtemp is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_MKDTEMP
+
+/* Define to 1 if mkfifo is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_MKFIFO
+
+/* Define to 1 if mkfifoat is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_MKFIFOAT
+
+/* Define to 1 if mknod is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_MKNOD
+
+/* Define to 1 if mknodat is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_MKNODAT
+
+/* Define to 1 if mkostemp is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_MKOSTEMP
+
+/* Define to 1 if mkostemps is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_MKOSTEMPS
+
+/* Define to 1 if mkstemp is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_MKSTEMP
+
+/* Define to 1 if mkstemps is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_MKSTEMPS
+
+/* Define to 1 if nl_langinfo is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_NL_LANGINFO
+
+/* Define to 1 if openat is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_OPENAT
+
+/* Define to 1 if pipe is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_PIPE
+
+/* Define to 1 if pipe2 is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_PIPE2
+
+/* Define to 1 if posix_openpt is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_POSIX_OPENPT
+
+/* Define to 1 if pread is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_PREAD
+
+/* Define to 1 if ptsname is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_PTSNAME
+
+/* Define to 1 if ptsname_r is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_PTSNAME_R
+
+/* Define to 1 if pwrite is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_PWRITE
+
+/* Define to 1 if qsort_r is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_QSORT_R
+
+/* Define to 1 if random is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_RANDOM
+
+/* Define to 1 if random_r is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_RANDOM_R
+
+/* Define to 1 if readlink is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_READLINK
+
+/* Define to 1 if readlinkat is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_READLINKAT
+
+/* Define to 1 if reallocarray is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_REALLOCARRAY
+
+/* Define to 1 if realpath is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_REALPATH
+
+/* Define to 1 if rmdir is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_RMDIR
+
+/* Define to 1 if rpmatch is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_RPMATCH
+
+/* Define to 1 if secure_getenv is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_SECURE_GETENV
+
+/* Define to 1 if setenv is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_SETENV
+
+/* Define to 1 if sethostname is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_SETHOSTNAME
+
+/* Define to 1 if setlocale is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_SETLOCALE
+
+/* Define to 1 if setstate is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_SETSTATE
+
+/* Define to 1 if setstate_r is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_SETSTATE_R
+
+/* Define to 1 if setusershell is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_SETUSERSHELL
+
+/* Define to 1 if sleep is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_SLEEP
+
+/* Define to 1 if srandom is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_SRANDOM
+
+/* Define to 1 if srandom_r is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_SRANDOM_R
+
+/* Define to 1 if stat is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_STAT
+
+/* Define to 1 if strtod is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_STRTOD
+
+/* Define to 1 if strtoll is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_STRTOLL
+
+/* Define to 1 if strtoull is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_STRTOULL
+
+/* Define to 1 if symlink is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_SYMLINK
+
+/* Define to 1 if symlinkat is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_SYMLINKAT
+
+/* Define to 1 if towctrans is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_TOWCTRANS
+
+/* Define to 1 if truncate is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_TRUNCATE
+
+/* Define to 1 if ttyname_r is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_TTYNAME_R
+
+/* Define to 1 if unlink is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_UNLINK
+
+/* Define to 1 if unlinkat is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_UNLINKAT
+
+/* Define to 1 if unlockpt is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_UNLOCKPT
+
+/* Define to 1 if unsetenv is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_UNSETENV
+
+/* Define to 1 if usleep is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_USLEEP
+
+/* Define to 1 if utimensat is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_UTIMENSAT
+
+/* Define to 1 if wcpcpy is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_WCPCPY
+
+/* Define to 1 if wcpncpy is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_WCPNCPY
+
+/* Define to 1 if wcrtomb is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_WCRTOMB
+
+/* Define to 1 if wcscasecmp is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_WCSCASECMP
+
+/* Define to 1 if wcscat is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_WCSCAT
+
+/* Define to 1 if wcschr is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_WCSCHR
+
+/* Define to 1 if wcscmp is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_WCSCMP
+
+/* Define to 1 if wcscoll is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_WCSCOLL
+
+/* Define to 1 if wcscpy is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_WCSCPY
+
+/* Define to 1 if wcscspn is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_WCSCSPN
+
+/* Define to 1 if wcsdup is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_WCSDUP
+
+/* Define to 1 if wcsftime is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_WCSFTIME
+
+/* Define to 1 if wcslen is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_WCSLEN
+
+/* Define to 1 if wcsncasecmp is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_WCSNCASECMP
+
+/* Define to 1 if wcsncat is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_WCSNCAT
+
+/* Define to 1 if wcsncmp is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_WCSNCMP
+
+/* Define to 1 if wcsncpy is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_WCSNCPY
+
+/* Define to 1 if wcsnlen is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_WCSNLEN
+
+/* Define to 1 if wcsnrtombs is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_WCSNRTOMBS
+
+/* Define to 1 if wcspbrk is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_WCSPBRK
+
+/* Define to 1 if wcsrchr is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_WCSRCHR
+
+/* Define to 1 if wcsrtombs is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_WCSRTOMBS
+
+/* Define to 1 if wcsspn is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_WCSSPN
+
+/* Define to 1 if wcsstr is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_WCSSTR
+
+/* Define to 1 if wcstok is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_WCSTOK
+
+/* Define to 1 if wcswidth is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_WCSWIDTH
+
+/* Define to 1 if wcsxfrm is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_WCSXFRM
+
+/* Define to 1 if wctob is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_WCTOB
+
+/* Define to 1 if wctrans is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_WCTRANS
+
+/* Define to 1 if wctype is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_WCTYPE
+
+/* Define to 1 if wcwidth is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_WCWIDTH
+
+/* Define to 1 if wmemchr is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_WMEMCHR
+
+/* Define to 1 if wmemcmp is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_WMEMCMP
+
+/* Define to 1 if wmemcpy is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_WMEMCPY
+
+/* Define to 1 if wmemmove is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_WMEMMOVE
+
+/* Define to 1 if wmemset is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_WMEMSET
+
+/* Define to 1 if _Exit is declared even after undefining macros. */
+#undef HAVE_RAW_DECL__EXIT
+
+/* Define to 1 if you have the `setenv' function. */
+#undef HAVE_SETENV
+
+/* Define to 1 if 'sig_atomic_t' is a signed integer type. */
+#undef HAVE_SIGNED_SIG_ATOMIC_T
+
+/* Define to 1 if 'wchar_t' is a signed integer type. */
+#undef HAVE_SIGNED_WCHAR_T
+
+/* Define to 1 if 'wint_t' is a signed integer type. */
+#undef HAVE_SIGNED_WINT_T
+
+/* Define to 1 if you have the <stddef.h> header file. */
+#undef HAVE_STDDEF_H
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the `strchr' function. */
+#undef HAVE_STRCHR
+
+/* Define to 1 if you have the `strerror' function. */
+#undef HAVE_STRERROR
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the `strtol' function. */
+#undef HAVE_STRTOL
+
+/* Define to 1 if you have the `strtoul' function. */
+#undef HAVE_STRTOUL
+
+/* Define to 1 if `decimal_point' is a member of `struct lconv'. */
+#undef HAVE_STRUCT_LCONV_DECIMAL_POINT
+
+/* Define to 1 if `st_blksize' is a member of `struct stat'. */
+#undef HAVE_STRUCT_STAT_ST_BLKSIZE
+
+/* Define to 1 if you have the `symlink' function. */
+#undef HAVE_SYMLINK
+
+/* Define to 1 if you have the <sys/bitypes.h> header file. */
+#undef HAVE_SYS_BITYPES_H
+
+/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
+   */
+#undef HAVE_SYS_DIR_H
+
+/* Define to 1 if you have the <sys/inttypes.h> header file. */
+#undef HAVE_SYS_INTTYPES_H
+
+/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
+   */
+#undef HAVE_SYS_NDIR_H
+
+/* Define to 1 if you have the <sys/param.h> header file. */
+#undef HAVE_SYS_PARAM_H
+
+/* Define to 1 if you have the <sys/socket.h> header file. */
+#undef HAVE_SYS_SOCKET_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+#undef HAVE_SYS_TIME_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
+#undef HAVE_SYS_WAIT_H
+
+/* Define to 1 if you have the `timegm' function. */
+#undef HAVE_TIMEGM
+
+/* Define to 1 if you have the `towlower' function. */
+#undef HAVE_TOWLOWER
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Define to 1 if the system has the type 'unsigned long long int'. */
+#undef HAVE_UNSIGNED_LONG_LONG_INT
+
+/* Define to 1 if you have the <uuid.h> header file. */
+#undef HAVE_UUID_H
+
+/* Define to 1 if you have the <uuid/uuid.h> header file. */
+#undef HAVE_UUID_UUID_H
+
+/* Define to 1 if you have the <wchar.h> header file. */
+#undef HAVE_WCHAR_H
+
+/* Define if you have the 'wchar_t' type. */
+#undef HAVE_WCHAR_T
+
+/* Define to 1 if you have the `wcrtomb' function. */
+#undef HAVE_WCRTOMB
+
+/* Define to 1 if you have the <wctype.h> header file. */
+#undef HAVE_WCTYPE_H
+
+/* Define to 1 if you have the <winsock2.h> header file. */
+#undef HAVE_WINSOCK2_H
+
+/* Define if you have the 'wint_t' type. */
+#undef HAVE_WINT_T
+
+/* Define to 1 if O_NOATIME works. */
+#undef HAVE_WORKING_O_NOATIME
+
+/* Define to 1 if O_NOFOLLOW works. */
+#undef HAVE_WORKING_O_NOFOLLOW
+
+/* Define to 1 if you have the <xlocale.h> header file. */
+#undef HAVE_XLOCALE_H
+
+/* Define to 1 if the system has the type `_Bool'. */
+#undef HAVE__BOOL
+
+/* Define to 1 if the compiler supports __builtin_expect,
+   and to 2 if <builtins.h> does.  */
+#undef HAVE___BUILTIN_EXPECT
+#ifndef HAVE___BUILTIN_EXPECT
+# define __builtin_expect(e, c) (e)
+#elif HAVE___BUILTIN_EXPECT == 2
+# include <builtins.h>
+#endif
+    
+
+/* Set to the prefix directory */
+#undef LIBDAP_ROOT
+
+/* Define to 1 if 'lstat' dereferences a symlink specified with a trailing
+   slash. */
+#undef LSTAT_FOLLOWS_SLASHED_SYMLINK
+
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
+#undef LT_OBJDIR
+
+/* If malloc(0) is != NULL, define this to 1. Otherwise define this to 0. */
+#undef MALLOC_0_IS_NONNULL
+
+/* Define if the mbrtowc function does not return (size_t) -2 for empty input.
+   */
+#undef MBRTOWC_EMPTY_INPUT_BUG
+
+/* Define if the mbrtowc function has the NULL pwc argument bug. */
+#undef MBRTOWC_NULL_ARG1_BUG
+
+/* Define if the mbrtowc function has the NULL string argument bug. */
+#undef MBRTOWC_NULL_ARG2_BUG
+
+/* Define if the mbrtowc function does not return 0 for a NUL character. */
+#undef MBRTOWC_NUL_RETVAL_BUG
+
+/* Define if the mbrtowc function returns a wrong return value. */
+#undef MBRTOWC_RETVAL_BUG
+
+/* Define this to suppres assert() calls. */
+#undef NDEBUG
+
+/* Name of package */
+#undef PACKAGE
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* 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
+
+/* Define if the pthread_in_use() detection is hard. */
+#undef PTHREAD_IN_USE_DETECTION_HARD
+
+/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
+   'ptrdiff_t'. */
+#undef PTRDIFF_T_SUFFIX
+
+/* Define to 1 if stat needs help when passed a file name with a trailing
+   slash */
+#undef REPLACE_FUNC_STAT_FILE
+
+/* Define if nl_langinfo exists but is overridden by gnulib. */
+#undef REPLACE_NL_LANGINFO
+
+/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
+   'sig_atomic_t'. */
+#undef SIG_ATOMIC_T_SUFFIX
+
+/* The size of `char', as computed by sizeof. */
+#undef SIZEOF_CHAR
+
+/* The size of `double', as computed by sizeof. */
+#undef SIZEOF_DOUBLE
+
+/* The size of `float', as computed by sizeof. */
+#undef SIZEOF_FLOAT
+
+/* The size of `int', as computed by sizeof. */
+#undef SIZEOF_INT
+
+/* The size of `int16_t', as computed by sizeof. */
+#undef SIZEOF_INT16_T
+
+/* The size of `int32_t', as computed by sizeof. */
+#undef SIZEOF_INT32_T
+
+/* The size of `long', as computed by sizeof. */
+#undef SIZEOF_LONG
+
+/* The size of `uint16_t', as computed by sizeof. */
+#undef SIZEOF_UINT16_T
+
+/* The size of `uint32_t', as computed by sizeof. */
+#undef SIZEOF_UINT32_T
+
+/* The size of `uint8_t', as computed by sizeof. */
+#undef SIZEOF_UINT8_T
+
+/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
+   'size_t'. */
+#undef SIZE_T_SUFFIX
+
+/* 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 */
+#undef STACK_DIRECTION
+
+/* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */
+#undef STAT_MACROS_BROKEN
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
+#undef TIME_WITH_SYS_TIME
+
+/* Define to 1 if your <sys/time.h> declares `struct tm'. */
+#undef TM_IN_SYS_TIME
+
+/* Define if the POSIX multithreading library can be used. */
+#undef USE_POSIX_THREADS
+
+/* Define if references to the POSIX multithreading library should be made
+   weak. */
+#undef USE_POSIX_THREADS_WEAK
+
+/* Define if the GNU Pth multithreading library can be used. */
+#undef USE_PTH_THREADS
+
+/* Define if references to the GNU Pth multithreading library should be made
+   weak. */
+#undef USE_PTH_THREADS_WEAK
+
+/* Define if the old Solaris multithreading library can be used. */
+#undef USE_SOLARIS_THREADS
+
+/* Define if references to the old Solaris multithreading library should be
+   made weak. */
+#undef USE_SOLARIS_THREADS_WEAK
+
+/* Enable extensions on AIX 3, Interix.  */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
+#endif
+/* Enable general extensions on macOS.  */
+#ifndef _DARWIN_C_SOURCE
+# undef _DARWIN_C_SOURCE
+#endif
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif
+/* Enable NetBSD extensions on NetBSD.  */
+#ifndef _NETBSD_SOURCE
+# undef _NETBSD_SOURCE
+#endif
+/* Enable OpenBSD extensions on NetBSD.  */
+#ifndef _OPENBSD_SOURCE
+# undef _OPENBSD_SOURCE
+#endif
+/* Enable threading extensions on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-5:2014.  */
+#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__
+# undef __STDC_WANT_IEC_60559_ATTRIBS_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-1:2014.  */
+#ifndef __STDC_WANT_IEC_60559_BFP_EXT__
+# undef __STDC_WANT_IEC_60559_BFP_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-2:2015.  */
+#ifndef __STDC_WANT_IEC_60559_DFP_EXT__
+# undef __STDC_WANT_IEC_60559_DFP_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-4:2015.  */
+#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__
+# undef __STDC_WANT_IEC_60559_FUNCS_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-3:2015.  */
+#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__
+# undef __STDC_WANT_IEC_60559_TYPES_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TR 24731-2:2010.  */
+#ifndef __STDC_WANT_LIB_EXT2__
+# undef __STDC_WANT_LIB_EXT2__
+#endif
+/* Enable extensions specified by ISO/IEC 24747:2009.  */
+#ifndef __STDC_WANT_MATH_SPEC_FUNCS__
+# undef __STDC_WANT_MATH_SPEC_FUNCS__
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable X/Open extensions if necessary.  HP-UX 11.11 defines
+   mbstate_t only if _XOPEN_SOURCE is defined to 500, regardless of
+   whether compiling with -Ae or -D_HPUX_SOURCE=1.  */
+#ifndef _XOPEN_SOURCE
+# undef _XOPEN_SOURCE
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+
+
+/* Define if the native Windows multithreading API can be used. */
+#undef USE_WINDOWS_THREADS
+
+/* Version number of package */
+#undef VERSION
+
+/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
+   'wchar_t'. */
+#undef WCHAR_T_SUFFIX
+
+/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
+   'wint_t'. */
+#undef WINT_T_SUFFIX
+
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+#  define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+#  undef WORDS_BIGENDIAN
+# endif
+#endif
+
+/* xdr float32 */
+#undef XDR_FLOAT32
+
+/* xdr float64 */
+#undef XDR_FLOAT64
+
+/* xdr int16 */
+#undef XDR_INT16
+
+/* xdr int32 */
+#undef XDR_INT32
+
+/* xdr uint16 */
+#undef XDR_UINT16
+
+/* xdr uint32 */
+#undef XDR_UINT32
+
+/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
+   `char[]'. */
+#undef YYTEXT_POINTER
+
+/* Enable large inode numbers on Mac OS X 10.5. */
+#undef _DARWIN_USE_64_BIT_INODE
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+#undef _FILE_OFFSET_BITS
+
+/* Define for large files, on AIX-style hosts. */
+#undef _LARGE_FILES
+
+/* Define to 1 on Solaris. */
+#undef _LCONV_C99
+
+/* Define to 1 if on MINIX. */
+#undef _MINIX
+
+/* Define to 1 to make NetBSD features available. MINIX 3 needs this. */
+#undef _NETBSD_SOURCE
+
+/* The _Noreturn keyword of C11.  */
+#if ! (defined _Noreturn \
+       || (defined __STDC_VERSION__ && 201112 <= __STDC_VERSION__))
+# if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__) \
+      || 0x5110 <= __SUNPRO_C)
+#  define _Noreturn __attribute__ ((__noreturn__))
+# elif defined _MSC_VER && 1200 <= _MSC_VER
+#  define _Noreturn __declspec (noreturn)
+# else
+#  define _Noreturn
+# endif
+#endif
+
+
+/* Define to 2 if the system does not provide POSIX.1 features except with
+   this defined. */
+#undef _POSIX_1_SOURCE
+
+/* Define to 1 if you need to in order for 'stat' and other things to work. */
+#undef _POSIX_SOURCE
+
+/* Define if you want <regex.h> to include <limits.h>, so that it consistently
+   overrides <limits.h>'s RE_DUP_MAX. */
+#undef _REGEX_INCLUDE_LIMITS_H
+
+/* Define if you want regoff_t to be at least as wide POSIX requires. */
+#undef _REGEX_LARGE_OFFSETS
+
+/* For standard stat data types on VMS. */
+#undef _USE_STD_STAT
+
+/* Define to 1 if the system <stdint.h> predates C++11. */
+#undef __STDC_CONSTANT_MACROS
+
+/* Define to 1 if the system <stdint.h> predates C++11. */
+#undef __STDC_LIMIT_MACROS
+
+/* Define to empty if `const' does not conform to ANSI C. */
+#undef const
+
+/* Please see the Gnulib manual for how to use these macros.
+
+   Suppress extern inline with HP-UX cc, as it appears to be broken; see
+   <http://lists.gnu.org/archive/html/bug-texinfo/2013-02/msg00030.html>.
+
+   Suppress extern inline with Sun C in standards-conformance mode, as it
+   mishandles inline functions that call each other.  E.g., for 'inline void f
+   (void) { } inline void g (void) { f (); }', c99 incorrectly complains
+   'reference to static identifier "f" in extern inline function'.
+   This bug was observed with Sun C 5.12 SunOS_i386 2011/11/16.
+
+   Suppress extern inline (with or without __attribute__ ((__gnu_inline__)))
+   on configurations that mistakenly use 'static inline' to implement
+   functions or macros in standard C headers like <ctype.h>.  For example,
+   if isdigit is mistakenly implemented via a static inline function,
+   a program containing an extern inline function that calls isdigit
+   may not work since the C standard prohibits extern inline functions
+   from calling static functions.  This bug is known to occur on:
+
+     OS X 10.8 and earlier; see:
+     http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00023.html
+
+     DragonFly; see
+     http://muscles.dragonflybsd.org/bulk/bleeding-edge-potential/latest-per-pkg/ah-tty-0.3.12.log
+
+     FreeBSD; see:
+     http://lists.gnu.org/archive/html/bug-gnulib/2014-07/msg00104.html
+
+   OS X 10.9 has a macro __header_inline indicating the bug is fixed for C and
+   for clang but remains for g++; see <http://trac.macports.org/ticket/41033>.
+   Assume DragonFly and FreeBSD will be similar.  */
+#if (((defined __APPLE__ && defined __MACH__) \
+      || defined __DragonFly__ || defined __FreeBSD__) \
+     && (defined __header_inline \
+         ? (defined __cplusplus && defined __GNUC_STDC_INLINE__ \
+            && ! defined __clang__) \
+         : ((! defined _DONT_USE_CTYPE_INLINE_ \
+             && (defined __GNUC__ || defined __cplusplus)) \
+            || (defined _FORTIFY_SOURCE && 0 < _FORTIFY_SOURCE \
+                && defined __GNUC__ && ! defined __cplusplus))))
+# define _GL_EXTERN_INLINE_STDHEADER_BUG
+#endif
+#if ((__GNUC__ \
+      ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \
+      : (199901L <= __STDC_VERSION__ \
+         && !defined __HP_cc \
+         && !defined __PGI \
+         && !(defined __SUNPRO_C && __STDC__))) \
+     && !defined _GL_EXTERN_INLINE_STDHEADER_BUG)
+# define _GL_INLINE inline
+# define _GL_EXTERN_INLINE extern inline
+# define _GL_EXTERN_INLINE_IN_USE
+#elif (2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __STRICT_ANSI__ \
+       && !defined _GL_EXTERN_INLINE_STDHEADER_BUG)
+# if defined __GNUC_GNU_INLINE__ && __GNUC_GNU_INLINE__
+   /* __gnu_inline__ suppresses a GCC 4.2 diagnostic.  */
+#  define _GL_INLINE extern inline __attribute__ ((__gnu_inline__))
+# else
+#  define _GL_INLINE extern inline
+# endif
+# define _GL_EXTERN_INLINE extern
+# define _GL_EXTERN_INLINE_IN_USE
+#else
+# define _GL_INLINE static _GL_UNUSED
+# define _GL_EXTERN_INLINE static _GL_UNUSED
+#endif
+
+/* In GCC 4.6 (inclusive) to 5.1 (exclusive),
+   suppress bogus "no previous prototype for 'FOO'"
+   and "no previous declaration for 'FOO'" diagnostics,
+   when FOO is an inline function in the header; see
+   <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=54113> and
+   <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63877>.  */
+#if __GNUC__ == 4 && 6 <= __GNUC_MINOR__
+# if defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__
+#  define _GL_INLINE_HEADER_CONST_PRAGMA
+# else
+#  define _GL_INLINE_HEADER_CONST_PRAGMA \
+     _Pragma ("GCC diagnostic ignored \"-Wsuggest-attribute=const\"")
+# endif
+# define _GL_INLINE_HEADER_BEGIN \
+    _Pragma ("GCC diagnostic push") \
+    _Pragma ("GCC diagnostic ignored \"-Wmissing-prototypes\"") \
+    _Pragma ("GCC diagnostic ignored \"-Wmissing-declarations\"") \
+    _GL_INLINE_HEADER_CONST_PRAGMA
+# define _GL_INLINE_HEADER_END \
+    _Pragma ("GCC diagnostic pop")
+#else
+# define _GL_INLINE_HEADER_BEGIN
+# define _GL_INLINE_HEADER_END
+#endif
+
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+   calls it, or to nothing if 'inline' is not supported under any name.  */
+#ifndef __cplusplus
+#undef inline
+#endif
+
+/* Work around a bug in Apple GCC 4.0.1 build 5465: In C99 mode, it supports
+   the ISO C 99 semantics of 'extern inline' (unlike the GNU C semantics of
+   earlier versions), but does not display it by setting __GNUC_STDC_INLINE__.
+   __APPLE__ && __MACH__ test for Mac OS X.
+   __APPLE_CC__ tests for the Apple compiler and its version.
+   __STDC_VERSION__ tests for the C99 mode.  */
+#if defined __APPLE__ && defined __MACH__ && __APPLE_CC__ >= 5465 && !defined __cplusplus && __STDC_VERSION__ >= 199901L && !defined __GNUC_STDC_INLINE__
+# define __GNUC_STDC_INLINE__ 1
+#endif
+
+/* Define to a type if <wchar.h> does not define. */
+#undef mbstate_t
+
+/* Define to `int' if <sys/types.h> does not define. */
+#undef mode_t
+
+/* Define to the type of st_nlink in struct stat, or a supertype. */
+#undef nlink_t
+
+/* Define to `int' if <sys/types.h> does not define. */
+#undef pid_t
+
+/* Define to rpl_re_comp if the replacement should be used. */
+#undef re_comp
+
+/* Define to rpl_re_compile_fastmap if the replacement should be used. */
+#undef re_compile_fastmap
+
+/* Define to rpl_re_compile_pattern if the replacement should be used. */
+#undef re_compile_pattern
+
+/* Define to rpl_re_exec if the replacement should be used. */
+#undef re_exec
+
+/* Define to rpl_re_match if the replacement should be used. */
+#undef re_match
+
+/* Define to rpl_re_match_2 if the replacement should be used. */
+#undef re_match_2
+
+/* Define to rpl_re_search if the replacement should be used. */
+#undef re_search
+
+/* Define to rpl_re_search_2 if the replacement should be used. */
+#undef re_search_2
+
+/* Define to rpl_re_set_registers if the replacement should be used. */
+#undef re_set_registers
+
+/* Define to rpl_re_set_syntax if the replacement should be used. */
+#undef re_set_syntax
+
+/* Define to rpl_re_syntax_options if the replacement should be used. */
+#undef re_syntax_options
+
+/* Define to rpl_regcomp if the replacement should be used. */
+#undef regcomp
+
+/* Define to rpl_regerror if the replacement should be used. */
+#undef regerror
+
+/* Define to rpl_regexec if the replacement should be used. */
+#undef regexec
+
+/* Define to rpl_regfree if the replacement should be used. */
+#undef regfree
+
+/* Define to the equivalent of the C99 'restrict' keyword, or to
+   nothing if this is not supported.  Do not define if restrict is
+   supported directly.  */
+#undef restrict
+/* Work around a bug in Sun C++: it does not support _Restrict or
+   __restrict__, even though the corresponding Sun C compiler ends up with
+   "#define restrict _Restrict" or "#define restrict __restrict__" in the
+   previous line.  Perhaps some future version of Sun C++ will work with
+   restrict; if so, hopefully it defines __RESTRICT like Sun C does.  */
+#if defined __SUNPRO_CC && !defined __RESTRICT
+# define _Restrict
+# define __restrict__
+#endif
+
+/* Define to `unsigned int' if <sys/types.h> does not define. */
+#undef size_t
+
+/* Define as a signed type of the same size as size_t. */
+#undef ssize_t
+
+/* Define as a marker that can be attached to declarations that might not
+    be used.  This helps to reduce warnings, such as from
+    GCC -Wunused-parameter.  */
+#if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
+# define _GL_UNUSED __attribute__ ((__unused__))
+#else
+# define _GL_UNUSED
+#endif
+/* The name _UNUSED_PARAMETER_ is an earlier spelling, although the name
+   is a misnomer outside of parameter lists.  */
+#define _UNUSED_PARAMETER_ _GL_UNUSED
+
+/* gcc supports the "unused" attribute on possibly unused labels, and
+   g++ has since version 4.5.  Note to support C++ as well as C,
+   _GL_UNUSED_LABEL should be used with a trailing ;  */
+#if !defined __cplusplus || __GNUC__ > 4 \
+    || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
+# define _GL_UNUSED_LABEL _GL_UNUSED
+#else
+# define _GL_UNUSED_LABEL
+#endif
+
+/* The __pure__ attribute was added in gcc 2.96.  */
+#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
+# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__))
+#else
+# define _GL_ATTRIBUTE_PURE /* empty */
+#endif
+
+/* The __const__ attribute was added in gcc 2.95.  */
+#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
+# define _GL_ATTRIBUTE_CONST __attribute__ ((__const__))
+#else
+# define _GL_ATTRIBUTE_CONST /* empty */
+#endif
+
+
+/* Define to empty if the keyword `volatile' does not work. Warning: valid
+   code using `volatile' can become incorrect without. Disable with care. */
+#undef volatile
+
+#endif /* _config_h */
diff --git a/config_dap.h b/config_dap.h
new file mode 100644
index 0000000..e9e1c3f
--- /dev/null
+++ b/config_dap.h
@@ -0,0 +1,20 @@
+/* config.h.  Generated by configure.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+#ifndef _config_dap_h
+#define _config_dap_h
+
+#ifdef HAVE_CONFIG_H
+
+#include "config.h"
+
+#endif /* HAVE_CONFIG_H */
+
+/* Shorthand for gcc's unused attribute feature */
+#if defined(__GNUG__) || defined(__GNUC__)
+#define not_used __attribute__ ((unused))
+#else
+#define not_used
+#endif /* __GNUG__ || __GNUC__ */
+
+#endif /* _config_dap_h */
diff --git a/configure b/configure
new file mode 100755
index 0000000..5c4fbb4
--- /dev/null
+++ b/configure
@@ -0,0 +1,33346 @@
+#! /bin/sh
+# Guess values for system-dependent variables and create Makefiles.
+# Generated by GNU Autoconf 2.69 for libdap 3.19.1.
+#
+# Report bugs to <opendap-tech@opendap.org>.
+#
+#
+# Copyright (C) 1992-1996, 1998-2012 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. ##
+## -------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+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_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+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
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  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
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
+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
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  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 || :
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+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
+
+  test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
+    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+    PATH=/empty FPATH=/empty; export PATH FPATH
+    test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
+      || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || 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@gnu.org and
+$0: opendap-tech@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
+
+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
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+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'`
+
+# 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_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 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
+}
+
+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
+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 -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'
+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"'
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+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'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+as_awk_strverscmp='
+  # Use only awk features that work with 7th edition Unix awk (1978).
+  # My, what an old awk you have, Mr. Solaris!
+  END {
+    while (length(v1) && length(v2)) {
+      # Set d1 to be the next thing to compare from v1, and likewise for d2.
+      # Normally this is a single character, but if v1 and v2 contain digits,
+      # compare them as integers and fractions as strverscmp does.
+      if (v1 ~ /^[0-9]/ && v2 ~ /^[0-9]/) {
+	# Split v1 and v2 into their leading digit string components d1 and d2,
+	# and advance v1 and v2 past the leading digit strings.
+	for (len1 = 1; substr(v1, len1 + 1) ~ /^[0-9]/; len1++) continue
+	for (len2 = 1; substr(v2, len2 + 1) ~ /^[0-9]/; len2++) continue
+	d1 = substr(v1, 1, len1); v1 = substr(v1, len1 + 1)
+	d2 = substr(v2, 1, len2); v2 = substr(v2, len2 + 1)
+	if (d1 ~ /^0/) {
+	  if (d2 ~ /^0/) {
+	    # Compare two fractions.
+	    while (d1 ~ /^0/ && d2 ~ /^0/) {
+	      d1 = substr(d1, 2); len1--
+	      d2 = substr(d2, 2); len2--
+	    }
+	    if (len1 != len2 && ! (len1 && len2 && substr(d1, 1, 1) == substr(d2, 1, 1))) {
+	      # The two components differ in length, and the common prefix
+	      # contains only leading zeros.  Consider the longer to be less.
+	      d1 = -len1
+	      d2 = -len2
+	    } else {
+	      # Otherwise, compare as strings.
+	      d1 = "x" d1
+	      d2 = "x" d2
+	    }
+	  } else {
+	    # A fraction is less than an integer.
+	    exit 1
+	  }
+	} else {
+	  if (d2 ~ /^0/) {
+	    # An integer is greater than a fraction.
+	    exit 2
+	  } else {
+	    # Compare two integers.
+	    d1 += 0
+	    d2 += 0
+	  }
+	}
+      } else {
+	# The normal case, without worrying about digits.
+	d1 = substr(v1, 1, 1); v1 = substr(v1, 2)
+	d2 = substr(v2, 1, 1); v2 = substr(v2, 2)
+      }
+      if (d1 < d2) exit 1
+      if (d1 > d2) exit 2
+    }
+    # Beware Solaris /usr/xgp4/bin/awk (at least through Solaris 10),
+    # which mishandles some comparisons of empty strings to integers.
+    if (length(v2)) exit 1
+    if (length(v1)) exit 2
+  }
+'
+
+test -n "$DJDIR" || exec 7<&0 </dev/null
+exec 6>&1
+
+# Name of the host.
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
+# so uname gets run too.
+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+
+#
+# Initializations.
+#
+ac_default_prefix=/usr/local
+ac_clean_files=
+ac_config_libobj_dir=.
+LIBOBJS=
+cross_compiling=no
+subdirs=
+MFLAGS=
+MAKEFLAGS=
+
+# Identity of this package.
+PACKAGE_NAME='libdap'
+PACKAGE_TARNAME='libdap'
+PACKAGE_VERSION='3.19.1'
+PACKAGE_STRING='libdap 3.19.1'
+PACKAGE_BUGREPORT='opendap-tech@opendap.org'
+PACKAGE_URL=''
+
+ac_unique_file="Connect.cc"
+# Factoring default headers for most tests.
+ac_includes_default="\
+#include <stdio.h>
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+#ifdef STDC_HEADERS
+# include <stdlib.h>
+# include <stddef.h>
+#else
+# ifdef HAVE_STDLIB_H
+#  include <stdlib.h>
+# endif
+#endif
+#ifdef HAVE_STRING_H
+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
+#  include <memory.h>
+# endif
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#ifdef HAVE_INTTYPES_H
+# include <inttypes.h>
+#endif
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif"
+
+gl_use_threads_default=
+ac_header_list=
+ac_func_list=
+ac_subst_vars='gltests_LTLIBOBJS
+gltests_LIBOBJS
+gl_LTLIBOBJS
+gl_LIBOBJS
+am__EXEEXT_FALSE
+am__EXEEXT_TRUE
+LTLIBOBJS
+LIBOBJS
+USE_VALGRIND_FALSE
+USE_VALGRIND_TRUE
+HAVE_VALGRIND
+BUILD_DEVELOPER_FALSE
+BUILD_DEVELOPER_TRUE
+DAP4_DEFINED_FALSE
+DAP4_DEFINED_TRUE
+CPPUNIT_LIBS
+CPPUNIT_CFLAGS
+CPPUNIT_FALSE
+CPPUNIT_TRUE
+CPPUNIT_CONFIG
+UUID_LIBS
+PTHREAD_LIBS
+xmlprivatelibs
+xmlprivatereq
+XML2_LIBS
+XML2_CFLAGS
+CURL_STATIC_LIBS
+curlprivatelibs
+curlprivatereq
+CURL_LIBS
+CURL_CFLAGS
+PKG_CONFIG
+gltests_WITNESS
+REPLACE_TOWLOWER
+REPLACE_ISWCNTRL
+HAVE_WCTYPE_H
+NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H
+NEXT_WCTYPE_H
+HAVE_ISWCNTRL
+REPLACE_ISWBLANK
+HAVE_WCTRANS_T
+HAVE_WCTYPE_T
+HAVE_ISWBLANK
+GNULIB_TOWCTRANS
+GNULIB_WCTRANS
+GNULIB_ISWCTYPE
+GNULIB_WCTYPE
+GNULIB_ISWBLANK
+HAVE_CRTDEFS_H
+HAVE_WINT_T
+HAVE_FEATURES_H
+NEXT_AS_FIRST_DIRECTIVE_WCHAR_H
+NEXT_WCHAR_H
+HAVE_UNISTD_H
+NEXT_AS_FIRST_DIRECTIVE_UNISTD_H
+NEXT_UNISTD_H
+UNISTD_H_DEFINES_STRUCT_TIMESPEC
+PTHREAD_H_DEFINES_STRUCT_TIMESPEC
+SYS_TIME_H_DEFINES_STRUCT_TIMESPEC
+TIME_H_DEFINES_STRUCT_TIMESPEC
+NEXT_AS_FIRST_DIRECTIVE_TIME_H
+NEXT_TIME_H
+WINDOWS_STAT_INODES
+WINDOWS_64_BIT_OFF_T
+NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H
+NEXT_SYS_TYPES_H
+NEXT_AS_FIRST_DIRECTIVE_STDLIB_H
+NEXT_STDLIB_H
+GL_GENERATE_STDINT_H_FALSE
+GL_GENERATE_STDINT_H_TRUE
+STDINT_H
+HAVE_SYS_INTTYPES_H
+HAVE_SYS_BITYPES_H
+HAVE_C99_STDINT_H
+WINT_T_SUFFIX
+WCHAR_T_SUFFIX
+SIG_ATOMIC_T_SUFFIX
+SIZE_T_SUFFIX
+PTRDIFF_T_SUFFIX
+HAVE_SIGNED_WINT_T
+HAVE_SIGNED_WCHAR_T
+HAVE_SIGNED_SIG_ATOMIC_T
+BITSIZEOF_WINT_T
+BITSIZEOF_WCHAR_T
+BITSIZEOF_SIG_ATOMIC_T
+BITSIZEOF_SIZE_T
+BITSIZEOF_PTRDIFF_T
+HAVE_STDINT_H
+NEXT_AS_FIRST_DIRECTIVE_STDINT_H
+NEXT_STDINT_H
+HAVE_SYS_TYPES_H
+HAVE_INTTYPES_H
+HAVE_WCHAR_H
+HAVE_UNSIGNED_LONG_LONG_INT
+HAVE_LONG_LONG_INT
+GNULIB_OVERRIDES_WINT_T
+HAVE__BOOL
+GL_GENERATE_STDBOOL_H_FALSE
+GL_GENERATE_STDBOOL_H_TRUE
+STDBOOL_H
+WINDOWS_64_BIT_ST_SIZE
+WINDOWS_STAT_TIMESPEC
+NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H
+NEXT_SYS_STAT_H
+APPLE_UNIVERSAL_BUILD
+REPLACE_WCTOMB
+REPLACE_UNSETENV
+REPLACE_STRTOD
+REPLACE_SETENV
+REPLACE_REALPATH
+REPLACE_REALLOC
+REPLACE_RANDOM_R
+REPLACE_QSORT_R
+REPLACE_PUTENV
+REPLACE_PTSNAME_R
+REPLACE_PTSNAME
+REPLACE_MKSTEMP
+REPLACE_MBTOWC
+REPLACE_MALLOC
+REPLACE_CANONICALIZE_FILE_NAME
+REPLACE_CALLOC
+HAVE_DECL_UNSETENV
+HAVE_UNLOCKPT
+HAVE_SYS_LOADAVG_H
+HAVE_STRUCT_RANDOM_DATA
+HAVE_STRTOULL
+HAVE_STRTOLL
+HAVE_STRTOD
+HAVE_DECL_SETSTATE
+HAVE_DECL_SETENV
+HAVE_SETENV
+HAVE_SECURE_GETENV
+HAVE_RPMATCH
+HAVE_REALPATH
+HAVE_REALLOCARRAY
+HAVE_RANDOM_R
+HAVE_RANDOM_H
+HAVE_RANDOM
+HAVE_QSORT_R
+HAVE_PTSNAME_R
+HAVE_PTSNAME
+HAVE_POSIX_OPENPT
+HAVE_MKSTEMPS
+HAVE_MKSTEMP
+HAVE_MKOSTEMPS
+HAVE_MKOSTEMP
+HAVE_MKDTEMP
+HAVE_DECL_INITSTATE
+HAVE_GRANTPT
+HAVE_GETSUBOPT
+HAVE_DECL_GETLOADAVG
+HAVE_CANONICALIZE_FILE_NAME
+HAVE_ATOLL
+HAVE__EXIT
+GNULIB_WCTOMB
+GNULIB_UNSETENV
+GNULIB_UNLOCKPT
+GNULIB_SYSTEM_POSIX
+GNULIB_STRTOULL
+GNULIB_STRTOLL
+GNULIB_STRTOD
+GNULIB_SETENV
+GNULIB_SECURE_GETENV
+GNULIB_RPMATCH
+GNULIB_REALPATH
+GNULIB_REALLOC_POSIX
+GNULIB_REALLOCARRAY
+GNULIB_RANDOM_R
+GNULIB_RANDOM
+GNULIB_QSORT_R
+GNULIB_PUTENV
+GNULIB_PTSNAME_R
+GNULIB_PTSNAME
+GNULIB_POSIX_OPENPT
+GNULIB_MKSTEMPS
+GNULIB_MKSTEMP
+GNULIB_MKOSTEMPS
+GNULIB_MKOSTEMP
+GNULIB_MKDTEMP
+GNULIB_MBTOWC
+GNULIB_MALLOC_POSIX
+GNULIB_GRANTPT
+GNULIB_GETSUBOPT
+GNULIB_GETLOADAVG
+GNULIB_CANONICALIZE_FILE_NAME
+GNULIB_CALLOC_POSIX
+GNULIB_ATOLL
+GNULIB__EXIT
+LOCALE_FR_UTF8
+LOCALE_ZH_CN
+LOCALE_JA
+REPLACE_UTIMENSAT
+REPLACE_STAT
+REPLACE_MKNOD
+REPLACE_MKFIFO
+REPLACE_MKDIR
+REPLACE_LSTAT
+REPLACE_FUTIMENS
+REPLACE_FSTATAT
+REPLACE_FSTAT
+HAVE_UTIMENSAT
+HAVE_MKNODAT
+HAVE_MKNOD
+HAVE_MKFIFOAT
+HAVE_MKFIFO
+HAVE_MKDIRAT
+HAVE_LSTAT
+HAVE_LCHMOD
+HAVE_FUTIMENS
+HAVE_FSTATAT
+HAVE_FCHMODAT
+GNULIB_OVERRIDES_STRUCT_STAT
+GNULIB_UTIMENSAT
+GNULIB_STAT
+GNULIB_MKNODAT
+GNULIB_MKNOD
+GNULIB_MKFIFOAT
+GNULIB_MKFIFO
+GNULIB_MKDIRAT
+GNULIB_LSTAT
+GNULIB_LCHMOD
+GNULIB_FUTIMENS
+GNULIB_FSTATAT
+GNULIB_FSTAT
+GNULIB_FCHMODAT
+LTLIBMULTITHREAD
+LIBMULTITHREAD
+LTLIBTHREAD
+LIBTHREAD
+LIBPTH_PREFIX
+LTLIBPTH
+LIBPTH
+NEXT_AS_FIRST_DIRECTIVE_LOCALE_H
+NEXT_LOCALE_H
+HAVE_XLOCALE_H
+NEXT_AS_FIRST_DIRECTIVE_STDDEF_H
+NEXT_STDDEF_H
+GL_GENERATE_STDDEF_H_FALSE
+GL_GENERATE_STDDEF_H_TRUE
+STDDEF_H
+HAVE_WCHAR_T
+HAVE_MAX_ALIGN_T
+REPLACE_NULL
+REPLACE_STRUCT_LCONV
+REPLACE_DUPLOCALE
+REPLACE_SETLOCALE
+REPLACE_LOCALECONV
+HAVE_DUPLOCALE
+GNULIB_DUPLOCALE
+GNULIB_SETLOCALE
+GNULIB_LOCALECONV
+LOCALCHARSET_TESTS_ENVIRONMENT
+GLIBC21
+GL_GENERATE_LIMITS_H_FALSE
+GL_GENERATE_LIMITS_H_TRUE
+LIMITS_H
+NEXT_AS_FIRST_DIRECTIVE_LIMITS_H
+NEXT_LIMITS_H
+HAVE_LANGINFO_YESEXPR
+HAVE_LANGINFO_ERA
+HAVE_LANGINFO_T_FMT_AMPM
+HAVE_LANGINFO_CODESET
+HAVE_LANGINFO_H
+NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H
+NEXT_LANGINFO_H
+REPLACE_NL_LANGINFO
+HAVE_NL_LANGINFO
+GNULIB_NL_LANGINFO
+REPLACE_LOCALTIME
+REPLACE_GMTIME
+REPLACE_TZSET
+REPLACE_TIMEGM
+REPLACE_STRFTIME
+REPLACE_NANOSLEEP
+REPLACE_MKTIME
+REPLACE_LOCALTIME_R
+REPLACE_CTIME
+HAVE_TIMEZONE_T
+HAVE_TZSET
+HAVE_TIMEGM
+HAVE_STRPTIME
+HAVE_NANOSLEEP
+HAVE_DECL_LOCALTIME_R
+GNULIB_TZSET
+GNULIB_TIME_RZ
+GNULIB_TIME_R
+GNULIB_TIMEGM
+GNULIB_STRPTIME
+GNULIB_STRFTIME
+GNULIB_NANOSLEEP
+GNULIB_LOCALTIME
+GNULIB_MKTIME
+GNULIB_CTIME
+HAVE_WINSOCK2_H
+UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS
+UNISTD_H_HAVE_WINSOCK2_H
+REPLACE_WRITE
+REPLACE_USLEEP
+REPLACE_UNLINKAT
+REPLACE_UNLINK
+REPLACE_TTYNAME_R
+REPLACE_TRUNCATE
+REPLACE_SYMLINKAT
+REPLACE_SYMLINK
+REPLACE_SLEEP
+REPLACE_RMDIR
+REPLACE_READLINKAT
+REPLACE_READLINK
+REPLACE_READ
+REPLACE_PWRITE
+REPLACE_PREAD
+REPLACE_LSEEK
+REPLACE_LINKAT
+REPLACE_LINK
+REPLACE_LCHOWN
+REPLACE_ISATTY
+REPLACE_GETPAGESIZE
+REPLACE_GETGROUPS
+REPLACE_GETLOGIN_R
+REPLACE_GETDTABLESIZE
+REPLACE_GETDOMAINNAME
+REPLACE_GETCWD
+REPLACE_FTRUNCATE
+REPLACE_FCHOWNAT
+REPLACE_DUP2
+REPLACE_DUP
+REPLACE_CLOSE
+REPLACE_CHOWN
+HAVE_SYS_PARAM_H
+HAVE_OS_H
+HAVE_DECL_TTYNAME_R
+HAVE_DECL_SETHOSTNAME
+HAVE_DECL_GETUSERSHELL
+HAVE_DECL_GETPAGESIZE
+HAVE_DECL_GETLOGIN_R
+HAVE_DECL_GETLOGIN
+HAVE_DECL_GETDOMAINNAME
+HAVE_DECL_FDATASYNC
+HAVE_DECL_FCHDIR
+HAVE_DECL_ENVIRON
+HAVE_USLEEP
+HAVE_UNLINKAT
+HAVE_TRUNCATE
+HAVE_SYMLINKAT
+HAVE_SYMLINK
+HAVE_SLEEP
+HAVE_SETHOSTNAME
+HAVE_READLINKAT
+HAVE_READLINK
+HAVE_PWRITE
+HAVE_PREAD
+HAVE_PIPE2
+HAVE_PIPE
+HAVE_LINKAT
+HAVE_LINK
+HAVE_LCHOWN
+HAVE_GROUP_MEMBER
+HAVE_GETPAGESIZE
+HAVE_GETLOGIN
+HAVE_GETHOSTNAME
+HAVE_GETGROUPS
+HAVE_GETDTABLESIZE
+HAVE_FTRUNCATE
+HAVE_FSYNC
+HAVE_FDATASYNC
+HAVE_FCHOWNAT
+HAVE_FCHDIR
+HAVE_FACCESSAT
+HAVE_EUIDACCESS
+HAVE_DUP3
+HAVE_DUP2
+HAVE_CHOWN
+GNULIB_WRITE
+GNULIB_USLEEP
+GNULIB_UNLINKAT
+GNULIB_UNLINK
+GNULIB_UNISTD_H_SIGPIPE
+GNULIB_UNISTD_H_NONBLOCKING
+GNULIB_TTYNAME_R
+GNULIB_TRUNCATE
+GNULIB_SYMLINKAT
+GNULIB_SYMLINK
+GNULIB_SLEEP
+GNULIB_SETHOSTNAME
+GNULIB_RMDIR
+GNULIB_READLINKAT
+GNULIB_READLINK
+GNULIB_READ
+GNULIB_PWRITE
+GNULIB_PREAD
+GNULIB_PIPE2
+GNULIB_PIPE
+GNULIB_LSEEK
+GNULIB_LINKAT
+GNULIB_LINK
+GNULIB_LCHOWN
+GNULIB_ISATTY
+GNULIB_GROUP_MEMBER
+GNULIB_GETUSERSHELL
+GNULIB_GETPAGESIZE
+GNULIB_GETLOGIN_R
+GNULIB_GETLOGIN
+GNULIB_GETHOSTNAME
+GNULIB_GETGROUPS
+GNULIB_GETDTABLESIZE
+GNULIB_GETDOMAINNAME
+GNULIB_GETCWD
+GNULIB_FTRUNCATE
+GNULIB_FSYNC
+GNULIB_FDATASYNC
+GNULIB_FCHOWNAT
+GNULIB_FCHDIR
+GNULIB_FACCESSAT
+GNULIB_EUIDACCESS
+GNULIB_ENVIRON
+GNULIB_DUP3
+GNULIB_DUP2
+GNULIB_DUP
+GNULIB_CLOSE
+GNULIB_CHOWN
+GNULIB_CHDIR
+NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H
+NEXT_SYS_TIME_H
+REPLACE_STRUCT_TIMEVAL
+REPLACE_GETTIMEOFDAY
+HAVE_SYS_TIME_H
+HAVE_STRUCT_TIMEVAL
+HAVE_GETTIMEOFDAY
+GNULIB_GETTIMEOFDAY
+LTLIBINTL
+LIBINTL
+NEXT_AS_FIRST_DIRECTIVE_FCNTL_H
+NEXT_FCNTL_H
+PRAGMA_COLUMNS
+PRAGMA_SYSTEM_HEADER
+INCLUDE_NEXT_AS_FIRST_DIRECTIVE
+INCLUDE_NEXT
+REPLACE_OPENAT
+REPLACE_OPEN
+REPLACE_FCNTL
+HAVE_OPENAT
+HAVE_FCNTL
+GNULIB_OPENAT
+GNULIB_OPEN
+GNULIB_NONBLOCKING
+GNULIB_FCNTL
+pkglibexecdir
+runstatedir
+lispdir
+GL_GENERATE_BYTESWAP_H_FALSE
+GL_GENERATE_BYTESWAP_H_TRUE
+BYTESWAP_H
+LOCALE_FR
+REPLACE_WCSFTIME
+REPLACE_WCSWIDTH
+REPLACE_WCWIDTH
+REPLACE_WCSNRTOMBS
+REPLACE_WCSRTOMBS
+REPLACE_WCRTOMB
+REPLACE_MBSNRTOWCS
+REPLACE_MBSRTOWCS
+REPLACE_MBRLEN
+REPLACE_MBRTOWC
+REPLACE_MBSINIT
+REPLACE_WCTOB
+REPLACE_BTOWC
+REPLACE_MBSTATE_T
+HAVE_DECL_WCWIDTH
+HAVE_DECL_WCTOB
+HAVE_WCSFTIME
+HAVE_WCSWIDTH
+HAVE_WCSTOK
+HAVE_WCSSTR
+HAVE_WCSPBRK
+HAVE_WCSSPN
+HAVE_WCSCSPN
+HAVE_WCSRCHR
+HAVE_WCSCHR
+HAVE_WCSDUP
+HAVE_WCSXFRM
+HAVE_WCSCOLL
+HAVE_WCSNCASECMP
+HAVE_WCSCASECMP
+HAVE_WCSNCMP
+HAVE_WCSCMP
+HAVE_WCSNCAT
+HAVE_WCSCAT
+HAVE_WCPNCPY
+HAVE_WCSNCPY
+HAVE_WCPCPY
+HAVE_WCSCPY
+HAVE_WCSNLEN
+HAVE_WCSLEN
+HAVE_WMEMSET
+HAVE_WMEMMOVE
+HAVE_WMEMCPY
+HAVE_WMEMCMP
+HAVE_WMEMCHR
+HAVE_WCSNRTOMBS
+HAVE_WCSRTOMBS
+HAVE_WCRTOMB
+HAVE_MBSNRTOWCS
+HAVE_MBSRTOWCS
+HAVE_MBRLEN
+HAVE_MBRTOWC
+HAVE_MBSINIT
+HAVE_BTOWC
+GNULIB_WCSFTIME
+GNULIB_WCSWIDTH
+GNULIB_WCSTOK
+GNULIB_WCSSTR
+GNULIB_WCSPBRK
+GNULIB_WCSSPN
+GNULIB_WCSCSPN
+GNULIB_WCSRCHR
+GNULIB_WCSCHR
+GNULIB_WCSDUP
+GNULIB_WCSXFRM
+GNULIB_WCSCOLL
+GNULIB_WCSNCASECMP
+GNULIB_WCSCASECMP
+GNULIB_WCSNCMP
+GNULIB_WCSCMP
+GNULIB_WCSNCAT
+GNULIB_WCSCAT
+GNULIB_WCPNCPY
+GNULIB_WCSNCPY
+GNULIB_WCPCPY
+GNULIB_WCSCPY
+GNULIB_WCSNLEN
+GNULIB_WCSLEN
+GNULIB_WMEMSET
+GNULIB_WMEMMOVE
+GNULIB_WMEMCPY
+GNULIB_WMEMCMP
+GNULIB_WMEMCHR
+GNULIB_WCWIDTH
+GNULIB_WCSNRTOMBS
+GNULIB_WCSRTOMBS
+GNULIB_WCRTOMB
+GNULIB_MBSNRTOWCS
+GNULIB_MBSRTOWCS
+GNULIB_MBRLEN
+GNULIB_MBRTOWC
+GNULIB_MBSINIT
+GNULIB_WCTOB
+GNULIB_BTOWC
+GL_GENERATE_ALLOCA_H_FALSE
+GL_GENERATE_ALLOCA_H_TRUE
+ALLOCA_H
+ALLOCA
+GL_COND_LIBTOOL_FALSE
+GL_COND_LIBTOOL_TRUE
+USE_C99_TYPES_FALSE
+USE_C99_TYPES_TRUE
+ac_word_order
+YACC
+CXXCPP
+LT_SYS_LIBRARY_PATH
+OTOOL64
+OTOOL
+LIPO
+NMEDIT
+DSYMUTIL
+MANIFEST_TOOL
+ac_ct_AR
+DLLTOOL
+OBJDUMP
+NM
+ac_ct_DUMPBIN
+DUMPBIN
+LD
+FGREP
+SED
+LIBTOOL
+LN_S
+LEXLIB
+LEX_OUTPUT_ROOT
+LEX
+COMPILER_IS_GCC_FALSE
+COMPILER_IS_GCC_TRUE
+RANLIB
+ARFLAGS
+AR
+EGREP
+GREP
+CPP
+am__fastdepCC_FALSE
+am__fastdepCC_TRUE
+CCDEPMODE
+ac_ct_CC
+CFLAGS
+CC
+am__fastdepCXX_FALSE
+am__fastdepCXX_TRUE
+CXXDEPMODE
+am__nodep
+AMDEPBACKSLASH
+AMDEP_FALSE
+AMDEP_TRUE
+am__quote
+am__include
+DEPDIR
+OBJEXT
+EXEEXT
+ac_ct_CXX
+CPPFLAGS
+LDFLAGS
+CXXFLAGS
+CXX
+SERVERLIB_VERSION
+SERVERLIB_REVISION
+SERVERLIB_AGE
+SERVERLIB_CURRENT
+CLIENTLIB_VERSION
+CLIENTLIB_REVISION
+CLIENTLIB_AGE
+CLIENTLIB_CURRENT
+LIBDAP_VERSION
+DAPLIB_REVISION
+DAPLIB_AGE
+DAPLIB_CURRENT
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
+PACKAGE_SUBMINOR_VERSION
+PACKAGE_MINOR_VERSION
+PACKAGE_MAJOR_VERSION
+DVR
+AM_BACKSLASH
+AM_DEFAULT_VERBOSITY
+AM_DEFAULT_V
+AM_V
+am__untar
+am__tar
+AMTAR
+am__leading_dot
+SET_MAKE
+AWK
+mkdir_p
+MKDIR_P
+INSTALL_STRIP_PROGRAM
+STRIP
+install_sh
+MAKEINFO
+AUTOHEADER
+AUTOMAKE
+AUTOCONF
+ACLOCAL
+VERSION
+PACKAGE
+CYGPATH_W
+am__isrc
+INSTALL_DATA
+INSTALL_SCRIPT
+INSTALL_PROGRAM
+DAP_PROTOCOL_VERSION
+target_alias
+host_alias
+build_alias
+LIBS
+ECHO_T
+ECHO_N
+ECHO_C
+DEFS
+mandir
+localedir
+libdir
+psdir
+pdfdir
+dvidir
+htmldir
+infodir
+docdir
+oldincludedir
+includedir
+localstatedir
+sharedstatedir
+sysconfdir
+datadir
+datarootdir
+libexecdir
+sbindir
+bindir
+program_transform_name
+prefix
+exec_prefix
+PACKAGE_URL
+PACKAGE_BUGREPORT
+PACKAGE_STRING
+PACKAGE_VERSION
+PACKAGE_TARNAME
+PACKAGE_NAME
+PATH_SEPARATOR
+SHELL'
+ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+enable_silent_rules
+enable_dependency_tracking
+enable_largefile
+enable_threads
+enable_shared
+enable_static
+with_pic
+enable_fast_install
+with_aix_soname
+with_gnu_ld
+with_sysroot
+enable_libtool_lock
+enable_runtime_endian_check
+enable_rpath
+with_libpth_prefix
+with_included_regex
+with_curl
+with_xml2
+with_cppunit_prefix
+with_cppunit_exec_prefix
+enable_debug
+enable_dap4
+enable_developer
+enable_coverage
+enable_valgrind
+'
+      ac_precious_vars='build_alias
+host_alias
+target_alias
+CXX
+CXXFLAGS
+LDFLAGS
+LIBS
+CPPFLAGS
+CCC
+CC
+CFLAGS
+CPP
+LT_SYS_LIBRARY_PATH
+CXXCPP
+PKG_CONFIG
+CURL_CFLAGS
+CURL_LIBS
+XML2_CFLAGS
+XML2_LIBS
+CPPUNIT_CFLAGS
+CPPUNIT_LIBS'
+
+
+# Initialize some variables set by options.
+ac_init_help=
+ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
+# The variables have the same names as the options, with
+# dashes changed to underlines.
+cache_file=/dev/null
+exec_prefix=NONE
+no_create=
+no_recursion=
+prefix=NONE
+program_prefix=NONE
+program_suffix=NONE
+program_transform_name=s,x,x,
+silent=
+site=
+srcdir=
+verbose=
+x_includes=NONE
+x_libraries=NONE
+
+# Installation directory options.
+# These are left unexpanded so users can "make install exec_prefix=/foo"
+# and all the variables that are supposed to be based on exec_prefix
+# by default will actually change.
+# Use braces instead of parens because sh, perl, etc. also accept them.
+# (The list follows the same order as the GNU Coding Standards.)
+bindir='${exec_prefix}/bin'
+sbindir='${exec_prefix}/sbin'
+libexecdir='${exec_prefix}/libexec'
+datarootdir='${prefix}/share'
+datadir='${datarootdir}'
+sysconfdir='${prefix}/etc'
+sharedstatedir='${prefix}/com'
+localstatedir='${prefix}/var'
+includedir='${prefix}/include'
+oldincludedir='/usr/include'
+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
+infodir='${datarootdir}/info'
+htmldir='${docdir}'
+dvidir='${docdir}'
+pdfdir='${docdir}'
+psdir='${docdir}'
+libdir='${exec_prefix}/lib'
+localedir='${datarootdir}/locale'
+mandir='${datarootdir}/man'
+
+ac_prev=
+ac_dashdash=
+for ac_option
+do
+  # If the previous option needs an argument, assign it.
+  if test -n "$ac_prev"; then
+    eval $ac_prev=\$ac_option
+    ac_prev=
+    continue
+  fi
+
+  case $ac_option in
+  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *=)   ac_optarg= ;;
+  *)    ac_optarg=yes ;;
+  esac
+
+  # Accept the important Cygnus configure options, so we can diagnose typos.
+
+  case $ac_dashdash$ac_option in
+  --)
+    ac_dashdash=yes ;;
+
+  -bindir | --bindir | --bindi | --bind | --bin | --bi)
+    ac_prev=bindir ;;
+  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
+    bindir=$ac_optarg ;;
+
+  -build | --build | --buil | --bui | --bu)
+    ac_prev=build_alias ;;
+  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
+    build_alias=$ac_optarg ;;
+
+  -cache-file | --cache-file | --cache-fil | --cache-fi \
+  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
+    ac_prev=cache_file ;;
+  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
+  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
+    cache_file=$ac_optarg ;;
+
+  --config-cache | -C)
+    cache_file=config.cache ;;
+
+  -datadir | --datadir | --datadi | --datad)
+    ac_prev=datadir ;;
+  -datadir=* | --datadir=* | --datadi=* | --datad=*)
+    datadir=$ac_optarg ;;
+
+  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
+  | --dataroo | --dataro | --datar)
+    ac_prev=datarootdir ;;
+  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
+  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
+    datarootdir=$ac_optarg ;;
+
+  -disable-* | --disable-*)
+    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"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=no ;;
+
+  -docdir | --docdir | --docdi | --doc | --do)
+    ac_prev=docdir ;;
+  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
+    docdir=$ac_optarg ;;
+
+  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
+    ac_prev=dvidir ;;
+  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
+    dvidir=$ac_optarg ;;
+
+  -enable-* | --enable-*)
+    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"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=\$ac_optarg ;;
+
+  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+  | --exec | --exe | --ex)
+    ac_prev=exec_prefix ;;
+  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
+  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
+  | --exec=* | --exe=* | --ex=*)
+    exec_prefix=$ac_optarg ;;
+
+  -gas | --gas | --ga | --g)
+    # Obsolete; use --with-gas.
+    with_gas=yes ;;
+
+  -help | --help | --hel | --he | -h)
+    ac_init_help=long ;;
+  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
+    ac_init_help=recursive ;;
+  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
+    ac_init_help=short ;;
+
+  -host | --host | --hos | --ho)
+    ac_prev=host_alias ;;
+  -host=* | --host=* | --hos=* | --ho=*)
+    host_alias=$ac_optarg ;;
+
+  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
+    ac_prev=htmldir ;;
+  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
+  | --ht=*)
+    htmldir=$ac_optarg ;;
+
+  -includedir | --includedir | --includedi | --included | --include \
+  | --includ | --inclu | --incl | --inc)
+    ac_prev=includedir ;;
+  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
+  | --includ=* | --inclu=* | --incl=* | --inc=*)
+    includedir=$ac_optarg ;;
+
+  -infodir | --infodir | --infodi | --infod | --info | --inf)
+    ac_prev=infodir ;;
+  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
+    infodir=$ac_optarg ;;
+
+  -libdir | --libdir | --libdi | --libd)
+    ac_prev=libdir ;;
+  -libdir=* | --libdir=* | --libdi=* | --libd=*)
+    libdir=$ac_optarg ;;
+
+  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
+  | --libexe | --libex | --libe)
+    ac_prev=libexecdir ;;
+  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
+  | --libexe=* | --libex=* | --libe=*)
+    libexecdir=$ac_optarg ;;
+
+  -localedir | --localedir | --localedi | --localed | --locale)
+    ac_prev=localedir ;;
+  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
+    localedir=$ac_optarg ;;
+
+  -localstatedir | --localstatedir | --localstatedi | --localstated \
+  | --localstate | --localstat | --localsta | --localst | --locals)
+    ac_prev=localstatedir ;;
+  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
+    localstatedir=$ac_optarg ;;
+
+  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
+    ac_prev=mandir ;;
+  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
+    mandir=$ac_optarg ;;
+
+  -nfp | --nfp | --nf)
+    # Obsolete; use --without-fp.
+    with_fp=no ;;
+
+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+  | --no-cr | --no-c | -n)
+    no_create=yes ;;
+
+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
+    no_recursion=yes ;;
+
+  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
+  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
+  | --oldin | --oldi | --old | --ol | --o)
+    ac_prev=oldincludedir ;;
+  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
+  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
+  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
+    oldincludedir=$ac_optarg ;;
+
+  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
+    ac_prev=prefix ;;
+  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
+    prefix=$ac_optarg ;;
+
+  -program-prefix | --program-prefix | --program-prefi | --program-pref \
+  | --program-pre | --program-pr | --program-p)
+    ac_prev=program_prefix ;;
+  -program-prefix=* | --program-prefix=* | --program-prefi=* \
+  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
+    program_prefix=$ac_optarg ;;
+
+  -program-suffix | --program-suffix | --program-suffi | --program-suff \
+  | --program-suf | --program-su | --program-s)
+    ac_prev=program_suffix ;;
+  -program-suffix=* | --program-suffix=* | --program-suffi=* \
+  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
+    program_suffix=$ac_optarg ;;
+
+  -program-transform-name | --program-transform-name \
+  | --program-transform-nam | --program-transform-na \
+  | --program-transform-n | --program-transform- \
+  | --program-transform | --program-transfor \
+  | --program-transfo | --program-transf \
+  | --program-trans | --program-tran \
+  | --progr-tra | --program-tr | --program-t)
+    ac_prev=program_transform_name ;;
+  -program-transform-name=* | --program-transform-name=* \
+  | --program-transform-nam=* | --program-transform-na=* \
+  | --program-transform-n=* | --program-transform-=* \
+  | --program-transform=* | --program-transfor=* \
+  | --program-transfo=* | --program-transf=* \
+  | --program-trans=* | --program-tran=* \
+  | --progr-tra=* | --program-tr=* | --program-t=*)
+    program_transform_name=$ac_optarg ;;
+
+  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
+    ac_prev=pdfdir ;;
+  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
+    pdfdir=$ac_optarg ;;
+
+  -psdir | --psdir | --psdi | --psd | --ps)
+    ac_prev=psdir ;;
+  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
+    psdir=$ac_optarg ;;
+
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil)
+    silent=yes ;;
+
+  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+    ac_prev=sbindir ;;
+  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+  | --sbi=* | --sb=*)
+    sbindir=$ac_optarg ;;
+
+  -sharedstatedir | --sharedstatedir | --sharedstatedi \
+  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
+  | --sharedst | --shareds | --shared | --share | --shar \
+  | --sha | --sh)
+    ac_prev=sharedstatedir ;;
+  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
+  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
+  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
+  | --sha=* | --sh=*)
+    sharedstatedir=$ac_optarg ;;
+
+  -site | --site | --sit)
+    ac_prev=site ;;
+  -site=* | --site=* | --sit=*)
+    site=$ac_optarg ;;
+
+  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
+    ac_prev=srcdir ;;
+  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
+    srcdir=$ac_optarg ;;
+
+  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
+  | --syscon | --sysco | --sysc | --sys | --sy)
+    ac_prev=sysconfdir ;;
+  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
+  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
+    sysconfdir=$ac_optarg ;;
+
+  -target | --target | --targe | --targ | --tar | --ta | --t)
+    ac_prev=target_alias ;;
+  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
+    target_alias=$ac_optarg ;;
+
+  -v | -verbose | --verbose | --verbos | --verbo | --verb)
+    verbose=yes ;;
+
+  -version | --version | --versio | --versi | --vers | -V)
+    ac_init_version=: ;;
+
+  -with-* | --with-*)
+    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"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=\$ac_optarg ;;
+
+  -without-* | --without-*)
+    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"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=no ;;
+
+  --x)
+    # Obsolete; use --with-x.
+    with_x=yes ;;
+
+  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
+  | --x-incl | --x-inc | --x-in | --x-i)
+    ac_prev=x_includes ;;
+  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
+  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
+    x_includes=$ac_optarg ;;
+
+  -x-libraries | --x-libraries | --x-librarie | --x-librari \
+  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
+    ac_prev=x_libraries ;;
+  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
+  | --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"
+    ;;
+
+  *=*)
+    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
+    eval $ac_envvar=\$ac_optarg
+    export $ac_envvar ;;
+
+  *)
+    # FIXME: should be removed in autoconf 3.0.
+    $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}"
+    ;;
+
+  esac
+done
+
+if test -n "$ac_prev"; then
+  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+  as_fn_error $? "missing argument to $ac_option"
+fi
+
+if test -n "$ac_unrecognized_opts"; then
+  case $enable_option_checking in
+    no) ;;
+    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
+    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+  esac
+fi
+
+# Check all directory arguments for consistency.
+for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
+		datadir sysconfdir sharedstatedir localstatedir includedir \
+		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+		libdir localedir mandir
+do
+  eval ac_val=\$$ac_var
+  # Remove trailing slashes.
+  case $ac_val in
+    */ )
+      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+      eval $ac_var=\$ac_val;;
+  esac
+  # Be sure to have absolute directory names.
+  case $ac_val in
+    [\\/$]* | ?:[\\/]* )  continue;;
+    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+  esac
+  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
+done
+
+# There might be people who depend on the old broken behavior: `$host'
+# used to hold the argument of --host etc.
+# FIXME: To remove some day.
+build=$build_alias
+host=$host_alias
+target=$target_alias
+
+# FIXME: To remove some day.
+if test "x$host_alias" != x; then
+  if test "x$build_alias" = x; then
+    cross_compiling=maybe
+  elif test "x$build_alias" != "x$host_alias"; then
+    cross_compiling=yes
+  fi
+fi
+
+ac_tool_prefix=
+test -n "$host_alias" && ac_tool_prefix=$host_alias-
+
+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"
+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+  as_fn_error $? "pwd does not report name of working directory"
+
+
+# Find the source files, if location was not specified.
+if test -z "$srcdir"; then
+  ac_srcdir_defaulted=yes
+  # Try the directory containing this script, then the parent directory.
+  ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_myself" : 'X\(//\)[^/]' \| \
+	 X"$as_myself" : 'X\(//\)$' \| \
+	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_myself" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  srcdir=$ac_confdir
+  if test ! -r "$srcdir/$ac_unique_file"; then
+    srcdir=..
+  fi
+else
+  ac_srcdir_defaulted=no
+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"
+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"
+	pwd)`
+# When building in place, set srcdir=.
+if test "$ac_abs_confdir" = "$ac_pwd"; then
+  srcdir=.
+fi
+# Remove unnecessary trailing slashes from srcdir.
+# Double slashes in file names in object file debugging info
+# mess up M-x gdb in Emacs.
+case $srcdir in
+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
+esac
+for ac_var in $ac_precious_vars; do
+  eval ac_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_env_${ac_var}_value=\$${ac_var}
+  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_cv_env_${ac_var}_value=\$${ac_var}
+done
+
+#
+# Report the --help message.
+#
+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.19.1 to adapt to many kinds of systems.
+
+Usage: $0 [OPTION]... [VAR=VALUE]...
+
+To assign environment variables (e.g., CC, CFLAGS...), specify them as
+VAR=VALUE.  See below for descriptions of some of the useful variables.
+
+Defaults for the options are specified in brackets.
+
+Configuration:
+  -h, --help              display this help and exit
+      --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
+      --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
+      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
+
+Installation directories:
+  --prefix=PREFIX         install architecture-independent files in PREFIX
+                          [$ac_default_prefix]
+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+                          [PREFIX]
+
+By default, \`make install' will install all the files in
+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
+an installation prefix other than \`$ac_default_prefix' using \`--prefix',
+for instance \`--prefix=\$HOME'.
+
+For better control, use the options below.
+
+Fine tuning of the installation directories:
+  --bindir=DIR            user executables [EPREFIX/bin]
+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR        program executables [EPREFIX/libexec]
+  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --libdir=DIR            object code libraries [EPREFIX/lib]
+  --includedir=DIR        C header files [PREFIX/include]
+  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR           info documentation [DATAROOTDIR/info]
+  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR            man documentation [DATAROOTDIR/man]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/libdap]
+  --htmldir=DIR           html documentation [DOCDIR]
+  --dvidir=DIR            dvi documentation [DOCDIR]
+  --pdfdir=DIR            pdf documentation [DOCDIR]
+  --psdir=DIR             ps documentation [DOCDIR]
+_ACEOF
+
+  cat <<\_ACEOF
+
+Program names:
+  --program-prefix=PREFIX            prepend PREFIX to installed program names
+  --program-suffix=SUFFIX            append SUFFIX to installed program names
+  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
+
+System types:
+  --build=BUILD     configure for building on BUILD [guessed]
+  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
+_ACEOF
+fi
+
+if test -n "$ac_init_help"; then
+  case $ac_init_help in
+     short | recursive ) echo "Configuration of libdap 3.19.1:";;
+   esac
+  cat <<\_ACEOF
+
+Optional Features:
+  --disable-option-checking  ignore unrecognized --enable/--with options
+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --enable-silent-rules   less verbose build output (undo: "make V=1")
+  --disable-silent-rules  verbose build output (undo: "make V=0")
+  --enable-dependency-tracking
+                          do not reject slow dependency extractors
+  --disable-dependency-tracking
+                          speeds up one-time build
+  --disable-largefile     omit support for large files
+  --enable-threads={posix|solaris|pth|windows}
+                          specify multithreading API
+  --disable-threads       build without multithread safety
+  --enable-shared[=PKGS]  build shared libraries [default=yes]
+  --enable-static[=PKGS]  build static libraries [default=yes]
+  --enable-fast-install[=PKGS]
+                          optimize for fast installation [default=yes]
+  --disable-libtool-lock  avoid locking (might break parallel builds)
+  --enable-runtime-endian-check
+                          Enable runtime tests for big- or little-endian byte
+                          order (default is NO)
+
+  --disable-rpath         do not hardcode runtime library paths
+  --enable-debug=ARG      Program instrumentation (1,2)
+  --enable-dap4           Enable DAP4 types and responses (default is Yes)
+  --enable-developer      Build a debug (-g3 -O0) version of this code and
+                          include assert() calls in the code (default is no)
+  --enable-coverage       Collect coverage data (default is no)
+  --enable-valgrind       Use valgrind when running unit tests. (default is
+                          no)
+
+Optional Packages:
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
+                          both]
+  --with-aix-soname=aix|svr4|both
+                          shared library versioning (aka "SONAME") variant to
+                          provide on AIX, [default=aix].
+  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
+  --with-sysroot[=DIR]    Search for dependent libraries within DIR (or the
+                          compiler's sysroot if not specified).
+  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
+  --with-libpth-prefix[=DIR]  search for libpth in DIR/include and DIR/lib
+  --without-libpth-prefix     don't search for libpth in includedir and libdir
+  --without-included-regex
+                          don't compile regex; this is the default on systems
+                          with recent-enough versions of the GNU C Library
+                          (use with caution on other systems).
+  --with-curl=PFX   Prefix where curl/libcurl is installed (optional). This will override pkgconfig, etc.
+  --with-xml2=PFX   Prefix where libxml2 is installed (optional). This will override pkgconfig, etc.
+  --with-cppunit-prefix=PFX   Prefix where CppUnit is installed (optional)
+  --with-cppunit-exec-prefix=PFX  Exec prefix where CppUnit is installed (optional)
+
+Some influential environment variables:
+  CXX         C++ compiler command
+  CXXFLAGS    C++ compiler flags
+  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
+              you have headers in a nonstandard directory <include dir>
+  CC          C compiler command
+  CFLAGS      C compiler flags
+  CPP         C preprocessor
+  LT_SYS_LIBRARY_PATH
+              User-defined run-time library search path.
+  CXXCPP      C++ preprocessor
+  PKG_CONFIG  path to pkg-config utility
+  CURL_CFLAGS C compiler flags for CURL, overriding pkg-config
+  CURL_LIBS   linker flags for CURL, overriding pkg-config
+  XML2_CFLAGS C compiler flags for XML2, overriding pkg-config
+  XML2_LIBS   linker flags for XML2, overriding pkg-config
+  CPPUNIT_CFLAGS
+              C compiler flags for CPPUNIT, overriding pkg-config
+  CPPUNIT_LIBS
+              linker flags for CPPUNIT, overriding pkg-config
+
+Use these variables to override the choices made by `configure' or to help
+it to find libraries and programs with nonstandard names/locations.
+
+Report bugs to <opendap-tech@opendap.org>.
+_ACEOF
+ac_status=$?
+fi
+
+if test "$ac_init_help" = "recursive"; then
+  # If there are subdirs, report their specific --help.
+  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+    test -d "$ac_dir" ||
+      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+      continue
+    ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+  .)  # We are building in place.
+    ac_srcdir=.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+    cd "$ac_dir" || { ac_status=$?; continue; }
+    # Check for guested configure.
+    if test -f "$ac_srcdir/configure.gnu"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
+    elif test -f "$ac_srcdir/configure"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure" --help=recursive
+    else
+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+    fi || ac_status=$?
+    cd "$ac_pwd" || { ac_status=$?; break; }
+  done
+fi
+
+test -n "$ac_init_help" && exit $ac_status
+if $ac_init_version; then
+  cat <<\_ACEOF
+libdap configure 3.19.1
+generated by GNU Autoconf 2.69
+
+Copyright (C) 2012 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
+
+## ------------------------ ##
+## 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
+
+} # ac_fn_cxx_try_compile
+
+# ac_fn_c_try_compile LINENO
+# --------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_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_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
+
+	ac_retval=1
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_compile
+
+# 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
+
+    ac_retval=1
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_cpp
+
+# 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; }
+
+# 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; }
+
+# 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@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
+
+# 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
+
+       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
+
+# 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
+
+} # ac_fn_c_check_header_compile
+
+# 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
+
+	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_c_try_link
+
+# 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
+
+/* 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.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#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
+
+int
+main ()
+{
+return $2 ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext 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_func
+
+# 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
+  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
+
+    ac_retval=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;
+}
+_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
+
+  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
+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.19.1, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
+
+  $ $0 $@
+
+_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`
+
+/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
+
+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
+
+} >&5
+
+cat >&5 <<_ACEOF
+
+
+## ----------- ##
+## Core tests. ##
+## ----------- ##
+
+_ACEOF
+
+
+# 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
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_URL "$PACKAGE_URL"
+_ACEOF
+
+
+# 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;;
+  esac
+elif test "x$prefix" != xNONE; then
+  ac_site_file1=$prefix/share/config.site
+  ac_site_file2=$prefix/etc/config.site
+else
+  ac_site_file1=$ac_default_prefix/share/config.site
+  ac_site_file2=$ac_default_prefix/etc/config.site
+fi
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+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; }
+  fi
+done
+
+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
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
+  >$cache_file
+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_func_list " symlink"
+as_fn_append ac_header_list " sys/socket.h"
+as_fn_append ac_func_list " gettimeofday"
+as_fn_append ac_header_list " langinfo.h"
+as_fn_append ac_header_list " limits.h"
+as_fn_append ac_header_list " xlocale.h"
+as_fn_append ac_func_list " lstat"
+as_fn_append ac_func_list " mbsinit"
+as_fn_append ac_func_list " mbrtowc"
+as_fn_append ac_func_list " mkstemps"
+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 " sys/stat.h"
+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_header_list " crtdefs.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
+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
+
+
+
+
+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
+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
+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.14'
+
+# 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_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 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
+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:${as_lineno-$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 build environment is sane" >&5
+$as_echo_n "checking whether build environment is sane... " >&6; }
+# 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 (
+   am_has_slept=no
+   for am_try in 1 2; do
+     echo "timestamp, slept: $am_has_slept" > conftest.file
+     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
+     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
+     if test "$2" = conftest.file || test $am_try -eq 2; then
+       break
+     fi
+     # Just in case.
+     sleep 1
+     am_has_slept=yes
+   done
+   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; }
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+  ( sleep 1 ) &
+  am_sleep_pid=$!
+fi
+
+rm -f conftest.file
+
+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 --is-lightweight"; then
+  am_missing_run="$MISSING "
+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; }
+
+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
+
+
+  test -n "$AWK" && break
+done
+
+{ $as_echo "$as_me:${as_lineno-$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 :
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.make <<\_ACEOF
+SHELL = /bin/sh
+all:
+	@echo '@@@%%%=$(MAKE)=@@@%%%'
+_ACEOF
+# 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;;
+  *)
+    eval ac_cv_prog_make_${ac_make}_set=no;;
+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 "yes" >&6; }
+  SET_MAKE=
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+  SET_MAKE="MAKE=${MAKE-make}"
+fi
+
+rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+  am__leading_dot=.
+else
+  am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+
+# Check whether --enable-silent-rules was given.
+if test "${enable_silent_rules+set}" = set; then :
+  enableval=$enable_silent_rules;
+fi
+
+case $enable_silent_rules in # (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=1;;
+esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+    AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AM_BACKSLASH='\'
+
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  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
+  fi
+fi
+
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+  if (cygpath --version) >/dev/null 2>/dev/null; then
+    CYGPATH_W='cygpath -w'
+  else
+    CYGPATH_W=echo
+  fi
+fi
+
+
+# Define the identity of the package.
+ PACKAGE='libdap'
+ VERSION='3.19.1'
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define VERSION "$VERSION"
+_ACEOF
+
+# Some tools Automake needs.
+
+ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
+
+
+AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
+
+
+AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
+
+
+AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
+
+
+MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+
+# For better backward compatibility.  To be removed once Automake 1.9.x
+# dies out for good.  For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+mkdir_p='$(MKDIR_P)'
+
+# We need awk for the "check" target.  The system "awk" is bad on
+# some platforms.
+# Always define AMTAR for backward compatibility.  Yes, it's still used
+# in the wild :-(  We should find a proper way to deprecate it ...
+AMTAR='$${TAR-tar}'
+
+
+# We'll loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar  pax cpio none'
+
+am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
+
+
+
+
+
+
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
+
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+    as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
+  fi
+fi
+ac_config_commands="$ac_config_commands tests/atconfig"
+
+
+
+$as_echo "#define CNAME \"libdap\"" >>confdefs.h
+
+
+cat >>confdefs.h <<_ACEOF
+#define CVER "$PACKAGE_VERSION"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define DVR "libdap/$PACKAGE_VERSION"
+_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: 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: 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: 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:${as_lineno-$LINENO}: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
+if ${ac_cv_build+:} false; 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
+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
+
+fi
+{ $as_echo "$as_me:${as_lineno-$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;;
+esac
+build=$ac_cv_build
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+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_n "checking host system type... " >&6; }
+if ${ac_cv_host+:} false; 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
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$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;;
+esac
+host=$ac_cv_host
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
+
+
+
+
+DAPLIB_CURRENT=25
+DAPLIB_AGE=0
+DAPLIB_REVISION=1
+
+
+
+
+LIBDAP_VERSION="$DAPLIB_CURRENT:$DAPLIB_REVISION:$DAPLIB_AGE"
+
+
+CLIENTLIB_CURRENT=7
+CLIENTLIB_AGE=1
+CLIENTLIB_REVISION=7
+
+
+
+
+CLIENTLIB_VERSION="$CLIENTLIB_CURRENT:$CLIENTLIB_REVISION:$CLIENTLIB_AGE"
+
+
+SERVERLIB_CURRENT=13
+SERVERLIB_AGE=6
+SERVERLIB_REVISION=7
+
+
+
+
+SERVERLIB_VERSION="$SERVERLIB_CURRENT:$SERVERLIB_REVISION:$SERVERLIB_AGE"
+
+
+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
+
+
+  test -n "$AWK" && break
+done
+
+ac_ext=cpp
+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
+if test -z "$CXX"; then
+  if test -n "$CCC"; then
+    CXX=$CCC
+  else
+    if test -n "$ac_tool_prefix"; then
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+  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_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CXX"; then
+  ac_cv_prog_CXX="$CXX" # 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_CXX="$ac_tool_prefix$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
+CXX=$ac_cv_prog_CXX
+if test -n "$CXX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
+$as_echo "$CXX" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$CXX" && break
+  done
+fi
+if test -z "$CXX"; then
+  ac_ct_CXX=$CXX
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+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_ac_ct_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CXX"; then
+  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # 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_CXX="$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
+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 "$ac_ct_CXX" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_CXX" && break
+done
+
+  if test "x$ac_ct_CXX" = x; then
+    CXX="g++"
+  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
+    CXX=$ac_ct_CXX
+  fi
+fi
+
+  fi
+fi
+# Provide some information about the compiler.
+$as_echo "$as_me:${as_lineno-$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"
+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
+  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
+
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+ac_clean_files_save=$ac_clean_files
+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; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
+ac_rmfiles=
+for ac_file in $ac_files
+do
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
+  esac
+done
+rm -f $ac_rmfiles
+
+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_link_default") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; 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,
+# so that the user can short-circuit this test for compilers unknown to
+# Autoconf.
+for ac_file in $ac_files ''
+do
+  test -f "$ac_file" || continue
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
+	;;
+    [ab].out )
+	# We found the default executable, but exeext='' is most
+	# certainly right.
+	break;;
+    *.* )
+	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+	then :; else
+	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+	fi
+	# We set ac_cv_exeext here because the later test for it is not
+	# safe: cross compilers may not add the suffix if given an `-o'
+	# argument, so we may need to know it at that point already.
+	# Even if this section looks crufty: it has the advantage of
+	# actually working.
+	break;;
+    * )
+	break;;
+  esac
+done
+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 "$ac_file" >&6; }
+ac_exeext=$ac_cv_exeext
+
+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
+$as_echo_n "checking for suffix of executables... " >&6; }
+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; }; 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
+# `rm'.
+for ac_file in conftest.exe conftest conftest.*; do
+  test -f "$ac_file" || continue
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+	  break;;
+    * ) break;;
+  esac
+done
+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 compute suffix of executables: cannot compile and link
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+rm -f conftest conftest$ac_cv_exeext
+{ $as_echo "$as_me:${as_lineno-$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_n "checking for suffix of object files... " >&6; }
+if ${ac_cv_objext+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.o conftest.obj
+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>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  for ac_file in conftest.o conftest.obj conftest.*; do
+  test -f "$ac_file" || continue;
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
+    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+       break;;
+  esac
+done
+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: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details" "$LINENO" 5; }
+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 "$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_n "checking whether we are using the GNU C++ compiler... " >&6; }
+if ${ac_cv_cxx_compiler_gnu+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_compiler_gnu=yes
+else
+  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 "$ac_cv_cxx_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GXX=yes
+else
+  GXX=
+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_n "checking whether $CXX accepts -g... " >&6; }
+if ${ac_cv_prog_cxx_g+:} false; 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
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_cv_prog_cxx_g=yes
+else
+  CXXFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+
+else
+  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+	 CXXFLAGS="-g"
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_cv_prog_cxx_g=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
+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 "$ac_cv_prog_cxx_g" >&6; }
+if test "$ac_test_CXXFLAGS" = set; then
+  CXXFLAGS=$ac_save_CXXFLAGS
+elif test $ac_cv_prog_cxx_g = yes; then
+  if test "$GXX" = yes; then
+    CXXFLAGS="-g -O2"
+  else
+    CXXFLAGS="-g"
+  fi
+else
+  if test "$GXX" = yes; then
+    CXXFLAGS="-O2"
+  else
+    CXXFLAGS=
+  fi
+fi
+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
+DEPDIR="${am__leading_dot}deps"
+
+ac_config_commands="$ac_config_commands depfiles"
+
+
+am_make=${MAKE-make}
+cat > confinc << 'END'
+am__doit:
+	@echo this is the am__doit target
+.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_n "checking for style of include used by $am_make... " >&6; }
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# Ignore all kinds of additional output from 'make'.
+case `$am_make -s -f confmf 2> /dev/null` in #(
+*the\ am__doit\ target*)
+  am__include=include
+  am__quote=
+  _am_result=GNU
+  ;;
+esac
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+   echo '.include "confinc"' > confmf
+   case `$am_make -s -f confmf 2> /dev/null` in #(
+   *the\ am__doit\ target*)
+     am__include=.include
+     am__quote="\""
+     _am_result=BSD
+     ;;
+   esac
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$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 :
+  enableval=$enable_dependency_tracking;
+fi
+
+if test "x$enable_dependency_tracking" != xno; then
+  am_depcomp="$ac_aux_dir/depcomp"
+  AMDEPBACKSLASH='\'
+  am__nodep='_no'
+fi
+ if test "x$enable_dependency_tracking" != xno; then
+  AMDEP_TRUE=
+  AMDEP_FALSE='#'
+else
+  AMDEP_TRUE='#'
+  AMDEP_FALSE=
+fi
+
+
+
+depcc="$CXX"  am_compiler_list=
+
+{ $as_echo "$as_me:${as_lineno-$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 :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
+  rm -rf conftest.dir
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
+
+  am_cv_CXX_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+  fi
+  am__universal=false
+  case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac
+
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
+    case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
+    nosideeffect)
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+      # This compiler won't grok '-c -o', but also, the minuso test has
+      # not run yet.  These depmodes are late enough in the game, and
+      # so weak that their functioning should not be impacted.
+      am__obj=conftest.${OBJEXT-o}
+      am__minus_obj=
+      ;;
+    none) break ;;
+    esac
+    if depmode=$depmode \
+       source=sub/conftest.c object=$am__obj \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_CXX_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_CXX_dependencies_compiler_type=none
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$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
+
+ if
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
+  am__fastdepCXX_TRUE=
+  am__fastdepCXX_FALSE='#'
+else
+  am__fastdepCXX_TRUE='#'
+  am__fastdepCXX_FALSE=
+fi
+
+
+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
+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_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # 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_CC="${ac_tool_prefix}gcc"
+    $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
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+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_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # 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_CC="gcc"
+    $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_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 "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  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
+    CC=$ac_ct_CC
+  fi
+else
+  CC="$ac_cv_prog_CC"
+fi
+
+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_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # 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_CC="${ac_tool_prefix}cc"
+    $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
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  fi
+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_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  ac_prog_rejected=no
+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
+    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
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+if test $ac_prog_rejected = yes; then
+  # We found a bogon in the path, so make sure we never use it.
+  set dummy $ac_cv_prog_CC
+  shift
+  if test $# != 0; then
+    # We chose a different compiler from the bogus one.
+    # However, it has the same basename, so the bogon will be chosen
+    # first if we set CC to just the basename; use the full file name.
+    shift
+    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+  fi
+fi
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  for ac_prog in cl.exe
+  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_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # 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_CC="$ac_tool_prefix$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
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$CC" && break
+  done
+fi
+if test -z "$CC"; then
+  ac_ct_CC=$CC
+  for ac_prog in cl.exe
+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_ac_ct_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # 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_CC="$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
+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 "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_CC" && break
+done
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  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
+    CC=$ac_ct_CC
+  fi
+fi
+
+fi
+
+
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$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; }
+
+# Provide some information about the compiler.
+$as_echo "$as_me:${as_lineno-$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"
+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
+  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:${as_lineno-$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 :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_compiler_gnu=yes
+else
+  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 "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+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_n "checking whether $CC accepts -g... " >&6; }
+if ${ac_cv_prog_cc_g+:} false; 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
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_g=yes
+else
+  CFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+  ac_c_werror_flag=$ac_save_c_werror_flag
+	 CFLAGS="-g"
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_g=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
+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 "$ac_cv_prog_cc_g" >&6; }
+if test "$ac_test_CFLAGS" = set; then
+  CFLAGS=$ac_save_CFLAGS
+elif test $ac_cv_prog_cc_g = yes; then
+  if test "$GCC" = yes; then
+    CFLAGS="-g -O2"
+  else
+    CFLAGS="-g"
+  fi
+else
+  if test "$GCC" = yes; then
+    CFLAGS="-O2"
+  else
+    CFLAGS=
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$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 :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_prog_cc_c89=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdarg.h>
+#include <stdio.h>
+struct stat;
+/* 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);
+static char *e (p, i)
+     char **p;
+     int i;
+{
+  return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+  char *s;
+  va_list v;
+  va_start (v,p);
+  s = g (p, va_arg (v,int));
+  va_end (v);
+  return s;
+}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+   function prototypes and stuff, but not '\xHH' hex character constants.
+   These don't provoke an error unfortunately, instead are silently treated
+   as 'x'.  The following induces an error, until -std is added to get
+   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
+   array size at least.  It's necessary to write '\x00'==0 to get something
+   that's true only with -std.  */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
+  ;
+  return 0;
+}
+_ACEOF
+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 :
+  ac_cv_prog_cc_c89=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c89" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+
+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 "none needed" >&6; } ;;
+  xno)
+    { $as_echo "$as_me:${as_lineno-$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 "$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'
+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
+
+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 "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
+if ${am_cv_prog_cc_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
+   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+$as_echo "$am_cv_prog_cc_c_o" >&6; }
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+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
+
+
+depcc="$CC"   am_compiler_list=
+
+{ $as_echo "$as_me:${as_lineno-$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 :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
+  rm -rf conftest.dir
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
+
+  am_cv_CC_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+  fi
+  am__universal=false
+  case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac
+
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
+    case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
+    nosideeffect)
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+      # This compiler won't grok '-c -o', but also, the minuso test has
+      # not run yet.  These depmodes are late enough in the game, and
+      # so weak that their functioning should not be impacted.
+      am__obj=conftest.${OBJEXT-o}
+      am__minus_obj=
+      ;;
+    none) break ;;
+    esac
+    if depmode=$depmode \
+       source=sub/conftest.c object=$am__obj \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_CC_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_CC_dependencies_compiler_type=none
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$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
+
+ if
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
+  am__fastdepCC_TRUE=
+  am__fastdepCC_FALSE='#'
+else
+  am__fastdepCC_TRUE='#'
+  am__fastdepCC_FALSE=
+fi
+
+
+
+
+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 "$as_me:${as_lineno-$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 :
+  $as_echo_n "(cached) " >&6
+else
+      # Double quotes because CPP needs to be expanded
+    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <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
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i 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
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i 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 :
+  break
+fi
+
+    done
+    ac_cv_prog_CPP=$CPP
+
+fi
+  CPP=$ac_cv_prog_CPP
+else
+  ac_cv_prog_CPP=$CPP
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
+ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <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
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i 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
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i 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 :
+
+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 $? "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+
+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 "$as_me:${as_lineno-$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 :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$GREP"; then
+  ac_path_GREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+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_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
+# 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
+*GNU*)
+  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $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
+    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"
+      ac_path_GREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_GREP_found && break 3
+    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
+  fi
+else
+  ac_cv_path_GREP=$GREP
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$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_n "checking for egrep... " >&6; }
+if ${ac_cv_path_EGREP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+   then ac_cv_path_EGREP="$GREP -E"
+   else
+     if test -z "$EGREP"; then
+  ac_path_EGREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+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_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
+# 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
+*GNU*)
+  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $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
+    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"
+      ac_path_EGREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_EGREP_found && break 3
+    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
+  fi
+else
+  ac_cv_path_EGREP=$EGREP
+fi
+
+   fi
+fi
+{ $as_echo "$as_me:${as_lineno-$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 ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if ${ac_cv_header_stdc+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_header_stdc=yes
+else
+  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
+/* end confdefs.h.  */
+#include <string.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "memchr" >/dev/null 2>&1; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+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
+/* end confdefs.h.  */
+#include <stdlib.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "free" >/dev/null 2>&1; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+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 :
+  :
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ctype.h>
+#include <stdlib.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+		   (('a' <= (c) && (c) <= 'i') \
+		     || ('j' <= (c) && (c) <= 'r') \
+		     || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif
+
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int
+main ()
+{
+  int i;
+  for (i = 0; i < 256; i++)
+    if (XOR (islower (i), ISLOWER (i))
+	|| toupper (i) != TOUPPER (i))
+      return 2;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+
+else
+  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
+fi
+
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$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
+
+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 :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+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 :
+  MINIX=yes
+else
+  MINIX=
+fi
+
+
+  if test "$MINIX" = yes; then
+
+$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h
+
+
+$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h
+
+
+$as_echo "#define _MINIX 1" >>confdefs.h
+
+
+$as_echo "#define _NETBSD_SOURCE 1" >>confdefs.h
+
+  fi
+
+
+  { $as_echo "$as_me:${as_lineno-$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 :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#         define __EXTENSIONS__ 1
+          $ac_includes_default
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_safe_to_define___extensions__=yes
+else
+  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 "$ac_cv_safe_to_define___extensions__" >&6; }
+  test $ac_cv_safe_to_define___extensions__ = yes &&
+    $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
+
+  $as_echo "#define _ALL_SOURCE 1" >>confdefs.h
+
+  $as_echo "#define _DARWIN_C_SOURCE 1" >>confdefs.h
+
+  $as_echo "#define _GNU_SOURCE 1" >>confdefs.h
+
+  $as_echo "#define _NETBSD_SOURCE 1" >>confdefs.h
+
+  $as_echo "#define _OPENBSD_SOURCE 1" >>confdefs.h
+
+  $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
+
+  $as_echo "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h
+
+  $as_echo "#define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h
+
+  $as_echo "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h
+
+  $as_echo "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h
+
+  $as_echo "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h
+
+  $as_echo "#define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h
+
+  $as_echo "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h
+
+  $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h
+
+  { $as_echo "$as_me:${as_lineno-$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 :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_should_define__xopen_source=no
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+          #include <wchar.h>
+          mbstate_t x;
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+             #define _XOPEN_SOURCE 500
+             #include <wchar.h>
+             mbstate_t x;
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_should_define__xopen_source=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
+{ $as_echo "$as_me:${as_lineno-$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
+
+
+
+
+
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Minix Amsterdam compiler" >&5
+$as_echo_n "checking for Minix Amsterdam compiler... " >&6; }
+if ${gl_cv_c_amsterdam_compiler+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#ifdef __ACK__
+Amsterdam
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "Amsterdam" >/dev/null 2>&1; then :
+  gl_cv_c_amsterdam_compiler=yes
+else
+  gl_cv_c_amsterdam_compiler=no
+fi
+rm -f conftest*
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_c_amsterdam_compiler" >&5
+$as_echo "$gl_cv_c_amsterdam_compiler" >&6; }
+
+      if test $gl_cv_c_amsterdam_compiler = yes; then
+    if test -z "$AR"; then
+      AR='cc -c.a'
+    fi
+    if test -z "$ARFLAGS"; then
+      ARFLAGS='-o'
+    fi
+  else
+                                                :
+  fi
+
+        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_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AR"; then
+  ac_cv_prog_AR="$AR" # 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_AR="${ac_tool_prefix}ar"
+    $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
+AR=$ac_cv_prog_AR
+if test -n "$AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+$as_echo "$AR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+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_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_AR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_AR"; then
+  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # 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_AR="ar"
+    $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_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 "$ac_ct_AR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_AR" = x; then
+    AR="ar"
+  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
+    AR=$ac_ct_AR
+  fi
+else
+  AR="$ac_cv_prog_AR"
+fi
+
+  if test -z "$ARFLAGS"; then
+    ARFLAGS='cr'
+  fi
+
+
+
+  if test -z "$RANLIB"; then
+    if test $gl_cv_c_amsterdam_compiler = yes; then
+      RANLIB=':'
+    else
+            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_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_RANLIB+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # 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_RANLIB="${ac_tool_prefix}ranlib"
+    $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
+RANLIB=$ac_cv_prog_RANLIB
+if test -n "$RANLIB"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+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_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_RANLIB"; then
+  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # 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_RANLIB="ranlib"
+    $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_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 "$ac_ct_RANLIB" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_RANLIB" = x; then
+    RANLIB=":"
+  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
+    RANLIB=$ac_ct_RANLIB
+  fi
+else
+  RANLIB="$ac_cv_prog_RANLIB"
+fi
+
+    fi
+  fi
+
+
+
+# Check whether --enable-largefile was given.
+if test "${enable_largefile+set}" = set; then :
+  enableval=$enable_largefile;
+fi
+
+if test "$enable_largefile" != no; then
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
+$as_echo_n "checking for special C compiler options needed for large files... " >&6; }
+if ${ac_cv_sys_largefile_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_sys_largefile_CC=no
+     if test "$GCC" != yes; then
+       ac_save_CC=$CC
+       while :; do
+         # IRIX 6.2 and later do not support large files by default,
+         # so use the C compiler's -n32 option if that helps.
+         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+                       && LARGE_OFF_T % 2147483647 == 1)
+                      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+         if ac_fn_c_try_compile "$LINENO"; then :
+  break
+fi
+rm -f core conftest.err conftest.$ac_objext
+         CC="$CC -n32"
+         if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_sys_largefile_CC=' -n32'; break
+fi
+rm -f core conftest.err conftest.$ac_objext
+         break
+       done
+       CC=$ac_save_CC
+       rm -f conftest.$ac_ext
+    fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
+$as_echo "$ac_cv_sys_largefile_CC" >&6; }
+  if test "$ac_cv_sys_largefile_CC" != no; then
+    CC=$CC$ac_cv_sys_largefile_CC
+  fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
+if ${ac_cv_sys_file_offset_bits+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  while :; do
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+                       && LARGE_OFF_T % 2147483647 == 1)
+                      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_sys_file_offset_bits=no; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#define _FILE_OFFSET_BITS 64
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+                       && LARGE_OFF_T % 2147483647 == 1)
+                      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_sys_file_offset_bits=64; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  ac_cv_sys_file_offset_bits=unknown
+  break
+done
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
+$as_echo "$ac_cv_sys_file_offset_bits" >&6; }
+case $ac_cv_sys_file_offset_bits in #(
+  no | unknown) ;;
+  *)
+cat >>confdefs.h <<_ACEOF
+#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
+_ACEOF
+;;
+esac
+rm -rf conftest*
+  if test $ac_cv_sys_file_offset_bits = unknown; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
+$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
+if ${ac_cv_sys_large_files+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  while :; do
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+                       && LARGE_OFF_T % 2147483647 == 1)
+                      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_sys_large_files=no; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#define _LARGE_FILES 1
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+                       && LARGE_OFF_T % 2147483647 == 1)
+                      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_sys_large_files=1; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  ac_cv_sys_large_files=unknown
+  break
+done
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
+$as_echo "$ac_cv_sys_large_files" >&6; }
+case $ac_cv_sys_large_files in #(
+  no | unknown) ;;
+  *)
+cat >>confdefs.h <<_ACEOF
+#define _LARGE_FILES $ac_cv_sys_large_files
+_ACEOF
+;;
+esac
+rm -rf conftest*
+  fi
+
+
+$as_echo "#define _DARWIN_USE_64_BIT_INODE 1" >>confdefs.h
+
+fi
+
+
+
+
+
+
+  # Check whether --enable-threads was given.
+if test "${enable_threads+set}" = set; then :
+  enableval=$enable_threads; gl_use_threads=$enableval
+else
+  if test -n "$gl_use_threads_default"; then
+       gl_use_threads="$gl_use_threads_default"
+     else
+       case "$host_os" in
+                                                               osf*) gl_use_threads=no ;;
+         cygwin*)
+               case `uname -r` in
+                 1.[0-5].*) gl_use_threads=no ;;
+                 *)         gl_use_threads=yes ;;
+               esac
+               ;;
+         *)    gl_use_threads=yes ;;
+       esac
+     fi
+
+fi
+
+  if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then
+    # For using <pthread.h>:
+    case "$host_os" in
+      osf*)
+        # On OSF/1, the compiler needs the flag -D_REENTRANT so that it
+        # groks <pthread.h>. cc also understands the flag -pthread, but
+        # we don't use it because 1. gcc-2.95 doesn't understand -pthread,
+        # 2. putting a flag into CPPFLAGS that has an effect on the linker
+        # causes the AC_LINK_IFELSE test below to succeed unexpectedly,
+        # leading to wrong values of LIBTHREAD and LTLIBTHREAD.
+        CPPFLAGS="$CPPFLAGS -D_REENTRANT"
+        ;;
+    esac
+    # Some systems optimize for single-threaded programs by default, and
+    # need special flags to disable these optimizations. For example, the
+    # definition of 'errno' in <errno.h>.
+    case "$host_os" in
+      aix* | freebsd*) CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE" ;;
+      solaris*) CPPFLAGS="$CPPFLAGS -D_REENTRANT" ;;
+    esac
+  fi
+
+
+
+  # Pre-early section.
+
+
+
+
+  # Code from module absolute-header:
+  # Code from module alloca-opt:
+  # Code from module btowc:
+  # Code from module builtin-expect:
+  # Code from module byteswap:
+  # Code from module configmake:
+  # Code from module dosname:
+  # Code from module extensions:
+  # Code from module extern-inline:
+  # Code from module fcntl-h:
+  # Code from module filename:
+  # Code from module gettext-h:
+  # Code from module gettimeofday:
+  # Code from module hard-locale:
+  # Code from module havelib:
+  # Code from module include_next:
+  # Code from module intprops:
+  # Code from module langinfo:
+  # Code from module largefile:
+
+  # Code from module limits-h:
+  # Code from module localcharset:
+  # Code from module locale:
+  # Code from module localeconv:
+  # Code from module localtime-buffer:
+  # Code from module lock:
+  # Code from module lstat:
+  # Code from module malloca:
+  # Code from module mbrtowc:
+  # Code from module mbsinit:
+  # Code from module mbtowc:
+  # Code from module mkstemps:
+  # Code from module multiarch:
+  # Code from module nl_langinfo:
+  # Code from module pathmax:
+  # Code from module regex:
+  # Code from module snippet/_Noreturn:
+  # Code from module snippet/arg-nonnull:
+  # Code from module snippet/c++defs:
+  # Code from module snippet/warn-on-use:
+  # Code from module ssize_t:
+  # Code from module stat:
+  # Code from module stdbool:
+  # Code from module stddef:
+  # Code from module stdint:
+  # Code from module stdlib:
+  # Code from module streq:
+  # Code from module sys_stat:
+  # Code from module sys_time:
+  # Code from module sys_types:
+  # Code from module tempname:
+  # Code from module threadlib:
+
+
+
+  # Code from module time:
+  # Code from module unistd:
+  # Code from module verify:
+  # Code from module wchar:
+  # Code from module wcrtomb:
+  # Code from module wctype-h:
+  # Code from module xalloc-oversized:
+
+
+if test x$CC = xgcc; then :
+   if true; then
+  COMPILER_IS_GCC_TRUE=
+  COMPILER_IS_GCC_FALSE='#'
+else
+  COMPILER_IS_GCC_TRUE='#'
+  COMPILER_IS_GCC_FALSE=
+fi
+
+else
+   if false; then
+  COMPILER_IS_GCC_TRUE=
+  COMPILER_IS_GCC_FALSE='#'
+else
+  COMPILER_IS_GCC_TRUE='#'
+  COMPILER_IS_GCC_FALSE=
+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_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_LEX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$LEX"; then
+  ac_cv_prog_LEX="$LEX" # 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_LEX="$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
+LEX=$ac_cv_prog_LEX
+if test -n "$LEX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LEX" >&5
+$as_echo "$LEX" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$LEX" && break
+done
+test -n "$LEX" || LEX=":"
+
+if test "x$LEX" != "x:"; then
+  cat >conftest.l <<_ACEOF
+%%
+a { ECHO; }
+b { REJECT; }
+c { yymore (); }
+d { yyless (1); }
+e { /* IRIX 6.5 flex 2.5.4 underquotes its yyless argument.  */
+    yyless ((input () != 0)); }
+f { unput (yytext[0]); }
+. { BEGIN INITIAL; }
+%%
+#ifdef YYTEXT_POINTER
+extern char *yytext;
+#endif
+int
+main (void)
+{
+  return ! yylex () + ! yywrap ();
+}
+_ACEOF
+{ { 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 "$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_n "checking lex output file root... " >&6; }
+if ${ac_cv_prog_lex_root+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+if test -f lex.yy.c; then
+  ac_cv_prog_lex_root=lex.yy
+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
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$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_n "checking lex library... " >&6; }
+if ${ac_cv_lib_lex+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+    ac_save_LIBS=$LIBS
+    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 $LEX_OUTPUT_ROOT.c`
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_lex=$ac_lib
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    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 "$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_n "checking whether yytext is a pointer... " >&6; }
+if ${ac_cv_prog_lex_yytext_pointer+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  # POSIX says lex can declare yytext either as a pointer or an array; the
+# default is implementation-dependent.  Figure out which it is, since
+# not all implementations provide the %pointer and %array declarations.
+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 $LEX_OUTPUT_ROOT.c`
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_prog_lex_yytext_pointer=yes
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    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 "$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
+
+fi
+rm -f conftest.l $LEX_OUTPUT_ROOT.c
+
+fi
+if test "$LEX" = :; then
+  LEX=${am_missing_run}flex
+fi
+
+{ $as_echo "$as_me:${as_lineno-$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 "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$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_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 :
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.make <<\_ACEOF
+SHELL = /bin/sh
+all:
+	@echo '@@@%%%=$(MAKE)=@@@%%%'
+_ACEOF
+# 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;;
+  *)
+    eval ac_cv_prog_make_${ac_make}_set=no;;
+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 "yes" >&6; }
+  SET_MAKE=
+else
+  { $as_echo "$as_me:${as_lineno-$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: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
+esac
+
+
+
+macro_version='2.4.6'
+macro_revision='2.4.6'
+
+
+
+
+
+
+
+
+
+
+
+
+
+ltmain=$ac_aux_dir/ltmain.sh
+
+# Backslashify metacharacters that are still active within
+# double-quoted strings.
+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\(["`\\]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
+ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
+$as_echo_n "checking how to print strings... " >&6; }
+# Test print first, because it will be a builtin if present.
+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
+   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='print -r --'
+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='printf %s\n'
+else
+  # Use this function as a fallback that always works.
+  func_fallback_echo ()
+  {
+    eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+  }
+  ECHO='func_fallback_echo'
+fi
+
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO ""
+}
+
+case $ECHO in
+  printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
+$as_echo "printf" >&6; } ;;
+  print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
+$as_echo "print -r" >&6; } ;;
+  *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
+$as_echo "cat" >&6; } ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$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 :
+  $as_echo_n "(cached) " >&6
+else
+            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+     for ac_i in 1 2 3 4 5 6 7; do
+       ac_script="$ac_script$as_nl$ac_script"
+     done
+     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
+     { ac_script=; unset 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
+  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_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
+# 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
+*GNU*)
+  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $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
+    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"
+      ac_path_SED_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_SED_found && break 3
+    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
+  fi
+else
+  ac_cv_path_SED=$SED
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+$as_echo "$ac_cv_path_SED" >&6; }
+ SED="$ac_cv_path_SED"
+  rm -f conftest.sed
+
+test -z "$SED" && SED=sed
+Xsed="$SED -e 1s/^X//"
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
+$as_echo_n "checking for fgrep... " >&6; }
+if ${ac_cv_path_FGREP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
+   then ac_cv_path_FGREP="$GREP -F"
+   else
+     if test -z "$FGREP"; then
+  ac_path_FGREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+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_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
+# 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
+*GNU*)
+  ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $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
+    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"
+      ac_path_FGREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_FGREP_found && break 3
+    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
+  fi
+else
+  ac_cv_path_FGREP=$FGREP
+fi
+
+   fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
+$as_echo "$ac_cv_path_FGREP" >&6; }
+ FGREP="$ac_cv_path_FGREP"
+
+
+test -z "$GREP" && GREP=grep
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Check whether --with-gnu-ld was given.
+if test "${with_gnu_ld+set}" = set; then :
+  withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes
+else
+  with_gnu_ld=no
+fi
+
+ac_prog=ld
+if test yes = "$GCC"; 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 yes = "$with_gnu_ld"; 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 ${lt_cv_path_LD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$LD"; then
+  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS=$lt_save_ifs
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      lt_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 `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
+	test no != "$with_gnu_ld" && break
+	;;
+      *)
+	test yes != "$with_gnu_ld" && break
+	;;
+      esac
+    fi
+  done
+  IFS=$lt_save_ifs
+else
+  lt_cv_path_LD=$LD # Let the user override the test with a path.
+fi
+fi
+
+LD=$lt_cv_path_LD
+if test -n "$LD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+$as_echo "$LD" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$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
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+if ${lt_cv_prog_gnu_ld+:} false; 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'*)
+  lt_cv_prog_gnu_ld=yes
+  ;;
+*)
+  lt_cv_prog_gnu_ld=no
+  ;;
+esac
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
+$as_echo "$lt_cv_prog_gnu_ld" >&6; }
+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_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
+if ${lt_cv_path_NM+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$NM"; then
+  # Let the user override the test.
+  lt_cv_path_NM=$NM
+else
+  lt_nm_to_check=${ac_tool_prefix}nm
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+    lt_nm_to_check="$lt_nm_to_check nm"
+  fi
+  for lt_tmp_nm in $lt_nm_to_check; do
+    lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+      IFS=$lt_save_ifs
+      test -z "$ac_dir" && ac_dir=.
+      tmp_nm=$ac_dir/$lt_tmp_nm
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then
+	# Check to see if the nm accepts a BSD-compat flag.
+	# Adding the 'sed 1q' prevents false positives on HP-UX, which says:
+	#   nm: unknown option "B" ignored
+	# Tru64's nm complains that /dev/null is an invalid object file
+	# MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
+	case $build_os in
+	mingw*) lt_bad_file=conftest.nm/nofile ;;
+	*) lt_bad_file=/dev/null ;;
+	esac
+	case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
+	*$lt_bad_file* | *'Invalid file or object type'*)
+	  lt_cv_path_NM="$tmp_nm -B"
+	  break 2
+	  ;;
+	*)
+	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	  */dev/null*)
+	    lt_cv_path_NM="$tmp_nm -p"
+	    break 2
+	    ;;
+	  *)
+	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	    continue # so that we can try to find one that supports BSD flags
+	    ;;
+	  esac
+	  ;;
+	esac
+      fi
+    done
+    IFS=$lt_save_ifs
+  done
+  : ${lt_cv_path_NM=no}
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
+$as_echo "$lt_cv_path_NM" >&6; }
+if test no != "$lt_cv_path_NM"; then
+  NM=$lt_cv_path_NM
+else
+  # Didn't find any BSD compatible name lister, look for dumpbin.
+  if test -n "$DUMPBIN"; then :
+    # Let the user override the test.
+  else
+    if test -n "$ac_tool_prefix"; then
+  for ac_prog in dumpbin "link -dump"
+  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_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_DUMPBIN+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DUMPBIN"; then
+  ac_cv_prog_DUMPBIN="$DUMPBIN" # 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_DUMPBIN="$ac_tool_prefix$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
+DUMPBIN=$ac_cv_prog_DUMPBIN
+if test -n "$DUMPBIN"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
+$as_echo "$DUMPBIN" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$DUMPBIN" && break
+  done
+fi
+if test -z "$DUMPBIN"; then
+  ac_ct_DUMPBIN=$DUMPBIN
+  for ac_prog in dumpbin "link -dump"
+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_ac_ct_DUMPBIN+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DUMPBIN"; then
+  ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # 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_DUMPBIN="$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
+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 "$ac_ct_DUMPBIN" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_DUMPBIN" && break
+done
+
+  if test "x$ac_ct_DUMPBIN" = x; then
+    DUMPBIN=":"
+  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
+    DUMPBIN=$ac_ct_DUMPBIN
+  fi
+fi
+
+    case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in
+    *COFF*)
+      DUMPBIN="$DUMPBIN -symbols -headers"
+      ;;
+    *)
+      DUMPBIN=:
+      ;;
+    esac
+  fi
+
+  if test : != "$DUMPBIN"; then
+    NM=$DUMPBIN
+  fi
+fi
+test -z "$NM" && NM=nm
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$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 :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_nm_interface="BSD nm"
+  echo "int some_variable = 0;" > conftest.$ac_ext
+  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
+  (eval "$ac_compile" 2>conftest.err)
+  cat conftest.err >&5
+  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+  cat conftest.err >&5
+  (eval echo "\"\$as_me:$LINENO: 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 "$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_n "checking the maximum length of command line arguments... " >&6; }
+if ${lt_cv_sys_max_cmd_len+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+    i=0
+  teststring=ABCD
+
+  case $build_os in
+  msdosdjgpp*)
+    # On DJGPP, this test can blow up pretty badly due to problems in libc
+    # (any single argument exceeding 2000 bytes causes a buffer overrun
+    # during glob expansion).  Even if it were fixed, the result of this
+    # check would be larger than it should be.
+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
+    ;;
+
+  gnu*)
+    # Under GNU Hurd, this test is not required because there is
+    # no limit to the length of command line arguments.
+    # Libtool will interpret -1 as no limit whatsoever
+    lt_cv_sys_max_cmd_len=-1;
+    ;;
+
+  cygwin* | mingw* | cegcc*)
+    # On Win9x/ME, this test blows up -- it succeeds, but takes
+    # about 5 minutes as the teststring grows exponentially.
+    # Worse, since 9x/ME are not pre-emptively multitasking,
+    # you end up with a "frozen" computer, even though with patience
+    # the test eventually succeeds (with a max line length of 256k).
+    # Instead, let's just punt: use the minimum linelength reported by
+    # all of the supported platforms: 8192 (on NT/2K/XP).
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  mint*)
+    # On MiNT this can take a long time and run out of memory.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  amigaos*)
+    # On AmigaOS with pdksh, this test takes hours, literally.
+    # So we just punt and use a minimum line length of 8192.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
+    # This has been around since 386BSD, at least.  Likely further.
+    if test -x /sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+    elif test -x /usr/sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+    else
+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
+    fi
+    # And add a safety zone
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    ;;
+
+  interix*)
+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
+    lt_cv_sys_max_cmd_len=196608
+    ;;
+
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
+  osf*)
+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+    # nice to cause kernel panics so lets avoid the loop below.
+    # First set a reasonable default.
+    lt_cv_sys_max_cmd_len=16384
+    #
+    if test -x /sbin/sysconfig; then
+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
+      esac
+    fi
+    ;;
+  sco3.2v5*)
+    lt_cv_sys_max_cmd_len=102400
+    ;;
+  sysv5* | sco5v6* | sysv4.2uw2*)
+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+    if test -n "$kargmax"; then
+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[	 ]//'`
+    else
+      lt_cv_sys_max_cmd_len=32768
+    fi
+    ;;
+  *)
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len" && \
+       test undefined != "$lt_cv_sys_max_cmd_len"; then
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    else
+      # Make teststring a little bigger before we do anything with it.
+      # a 1K string should be a reasonable start.
+      for i in 1 2 3 4 5 6 7 8; do
+        teststring=$teststring$teststring
+      done
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      # If test is not a shell built-in, we'll probably end up computing a
+      # maximum length that is only half of the actual maximum length, but
+      # we can't tell.
+      while { test X`env echo "$teststring$teststring" 2>/dev/null` \
+	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
+	      test 17 != "$i" # 1/2 MB should be enough
+      do
+        i=`expr $i + 1`
+        teststring=$teststring$teststring
+      done
+      # Only check the string length outside the loop.
+      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
+      teststring=
+      # Add a significant safety factor because C++ compilers can tack on
+      # massive amounts of additional arguments before passing them to the
+      # linker.  It appears as though 1/2 is a usable value.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
+    ;;
+  esac
+
+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 "$lt_cv_sys_max_cmd_len" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
+$as_echo "none" >&6; }
+fi
+max_cmd_len=$lt_cv_sys_max_cmd_len
+
+
+
+
+
+
+: ${CP="cp -f"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  lt_unset=unset
+else
+  lt_unset=false
+fi
+
+
+
+
+
+# test EBCDIC or ASCII
+case `echo X|tr X '\101'` in
+ A) # ASCII based system
+    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
+  lt_SP2NL='tr \040 \012'
+  lt_NL2SP='tr \015\012 \040\040'
+  ;;
+ *) # EBCDIC based system
+  lt_SP2NL='tr \100 \n'
+  lt_NL2SP='tr \r\n \100\100'
+  ;;
+esac
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
+if ${lt_cv_to_host_file_cmd+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
+        ;;
+    esac
+    ;;
+  *-*-cygwin* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_noop
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
+        ;;
+    esac
+    ;;
+  * ) # unhandled hosts (and "normal" native builds)
+    lt_cv_to_host_file_cmd=func_convert_file_noop
+    ;;
+esac
+
+fi
+
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
+if ${lt_cv_to_tool_file_cmd+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  #assume ordinary cross tools, or native build.
+lt_cv_to_tool_file_cmd=func_convert_file_noop
+case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
+        ;;
+    esac
+    ;;
+esac
+
+fi
+
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$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 :
+  $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 "$lt_cv_ld_reload_flag" >&6; }
+reload_flag=$lt_cv_ld_reload_flag
+case $reload_flag in
+"" | " "*) ;;
+*) reload_flag=" $reload_flag" ;;
+esac
+reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    if test yes != "$GCC"; then
+      reload_cmds=false
+    fi
+    ;;
+  darwin*)
+    if test yes = "$GCC"; then
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
+    else
+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
+    fi
+    ;;
+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_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_OBJDUMP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OBJDUMP"; then
+  ac_cv_prog_OBJDUMP="$OBJDUMP" # 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_OBJDUMP="${ac_tool_prefix}objdump"
+    $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
+OBJDUMP=$ac_cv_prog_OBJDUMP
+if test -n "$OBJDUMP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+$as_echo "$OBJDUMP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+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_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OBJDUMP"; then
+  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # 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_OBJDUMP="objdump"
+    $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_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 "$ac_ct_OBJDUMP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_OBJDUMP" = x; then
+    OBJDUMP="false"
+  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
+    OBJDUMP=$ac_ct_OBJDUMP
+  fi
+else
+  OBJDUMP="$ac_cv_prog_OBJDUMP"
+fi
+
+test -z "$OBJDUMP" && OBJDUMP=objdump
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$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 :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_file_magic_cmd='$MAGIC_CMD'
+lt_cv_file_magic_test_file=
+lt_cv_deplibs_check_method='unknown'
+# Need to set the preceding variable on all platforms that support
+# interlibrary dependencies.
+# 'none' -- dependencies not supported.
+# 'unknown' -- same as none, but documents that we really don't know.
+# 'pass_all' -- all dependencies passed with no checks.
+# 'test_compile' -- check by making test program.
+# 'file_magic [[regex]]' -- check by looking for files in library path
+# that responds to the $file_magic_cmd with a given extended regex.
+# If you have 'file' or equivalent on your system and you're not sure
+# whether 'pass_all' will *always* work, you probably want this one.
+
+case $host_os in
+aix[4-9]*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+beos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+bsdi[45]*)
+  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
+  lt_cv_file_magic_cmd='/usr/bin/file -L'
+  lt_cv_file_magic_test_file=/shlib/libc.so
+  ;;
+
+cygwin*)
+  # func_win32_libid is a shell function defined in ltmain.sh
+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+  lt_cv_file_magic_cmd='func_win32_libid'
+  ;;
+
+mingw* | pw32*)
+  # Base MSYS/MinGW do not provide the 'file' command needed by
+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
+  # unless we find 'file', for example because we are cross-compiling.
+  if ( file / ) >/dev/null 2>&1; then
+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+    lt_cv_file_magic_cmd='func_win32_libid'
+  else
+    # Keep this pattern in sync with the one in func_win32_libid.
+    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
+    lt_cv_file_magic_cmd='$OBJDUMP -f'
+  fi
+  ;;
+
+cegcc*)
+  # use the weaker test based on 'objdump'. See mingw*.
+  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
+  lt_cv_file_magic_cmd='$OBJDUMP -f'
+  ;;
+
+darwin* | rhapsody*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+freebsd* | dragonfly*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    case $host_cpu in
+    i*86 )
+      # Not sure whether the presence of OpenBSD here was a mistake.
+      # Let's accept both of them until this is cleared up.
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
+      lt_cv_file_magic_cmd=/usr/bin/file
+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+      ;;
+    esac
+  else
+    lt_cv_deplibs_check_method=pass_all
+  fi
+  ;;
+
+haiku*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+hpux10.20* | hpux11*)
+  lt_cv_file_magic_cmd=/usr/bin/file
+  case $host_cpu in
+  ia64*)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
+    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+    ;;
+  hppa*64*)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'
+    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+    ;;
+  *)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library'
+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
+    ;;
+  esac
+  ;;
+
+interix[3-9]*)
+  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $LD in
+  *-32|*"-32 ") libmagic=32-bit;;
+  *-n32|*"-n32 ") libmagic=N32;;
+  *-64|*"-64 ") libmagic=64-bit;;
+  *) libmagic=never-match;;
+  esac
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+netbsd*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
+  fi
+  ;;
+
+newos6*)
+  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
+  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
+  ;;
+
+*nto* | *qnx*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+openbsd* | bitrig*)
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  fi
+  ;;
+
+osf3* | osf4* | osf5*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+rdos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+solaris*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv4 | sysv4.3*)
+  case $host_vendor in
+  motorola)
+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+    ;;
+  ncr)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  sequent)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
+    ;;
+  sni)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
+    lt_cv_file_magic_test_file=/lib/libc.so
+    ;;
+  siemens)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  pc)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  esac
+  ;;
+
+tpf*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+os2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+esac
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
+$as_echo "$lt_cv_deplibs_check_method" >&6; }
+
+file_magic_glob=
+want_nocaseglob=no
+if test "$build" = "$host"; then
+  case $host_os in
+  mingw* | pw32*)
+    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
+      want_nocaseglob=yes
+    else
+      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
+    fi
+    ;;
+  esac
+fi
+
+file_magic_cmd=$lt_cv_file_magic_cmd
+deplibs_check_method=$lt_cv_deplibs_check_method
+test -z "$deplibs_check_method" && deplibs_check_method=unknown
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dlltool; 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_DLLTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DLLTOOL"; then
+  ac_cv_prog_DLLTOOL="$DLLTOOL" # 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_DLLTOOL="${ac_tool_prefix}dlltool"
+    $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
+DLLTOOL=$ac_cv_prog_DLLTOOL
+if test -n "$DLLTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+$as_echo "$DLLTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_DLLTOOL"; then
+  ac_ct_DLLTOOL=$DLLTOOL
+  # Extract the first word of "dlltool", so it can be a program name with args.
+set dummy dlltool; 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_DLLTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DLLTOOL"; then
+  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # 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_DLLTOOL="dlltool"
+    $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_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
+if test -n "$ac_ct_DLLTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
+$as_echo "$ac_ct_DLLTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_DLLTOOL" = x; then
+    DLLTOOL="false"
+  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
+    DLLTOOL=$ac_ct_DLLTOOL
+  fi
+else
+  DLLTOOL="$ac_cv_prog_DLLTOOL"
+fi
+
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_sharedlib_from_linklib_cmd='unknown'
+
+case $host_os in
+cygwin* | mingw* | pw32* | cegcc*)
+  # two different shell functions defined in ltmain.sh;
+  # decide which one to use based on capabilities of $DLLTOOL
+  case `$DLLTOOL --help 2>&1` in
+  *--identify-strict*)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
+    ;;
+  *)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
+    ;;
+  esac
+  ;;
+*)
+  # fallback: assume linklib IS sharedlib
+  lt_cv_sharedlib_from_linklib_cmd=$ECHO
+  ;;
+esac
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  for ac_prog in ar
+  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_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AR"; then
+  ac_cv_prog_AR="$AR" # 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_AR="$ac_tool_prefix$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
+AR=$ac_cv_prog_AR
+if test -n "$AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+$as_echo "$AR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$AR" && break
+  done
+fi
+if test -z "$AR"; then
+  ac_ct_AR=$AR
+  for ac_prog in ar
+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_ac_ct_AR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_AR"; then
+  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # 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_AR="$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
+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 "$ac_ct_AR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_AR" && break
+done
+
+  if test "x$ac_ct_AR" = x; then
+    AR="false"
+  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
+    AR=$ac_ct_AR
+  fi
+fi
+
+: ${AR=ar}
+: ${AR_FLAGS=cru}
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
+$as_echo_n "checking for archiver @FILE support... " >&6; }
+if ${lt_cv_ar_at_file+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ar_at_file=no
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  echo conftest.$ac_objext > conftest.lst
+      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
+      { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
+  (eval $lt_ar_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+      if test 0 -eq "$ac_status"; then
+	# Ensure the archiver fails upon bogus file names.
+	rm -f conftest.$ac_objext libconftest.a
+	{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
+  (eval $lt_ar_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+	if test 0 -ne "$ac_status"; then
+          lt_cv_ar_at_file=@
+        fi
+      fi
+      rm -f conftest.* libconftest.a
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
+$as_echo "$lt_cv_ar_at_file" >&6; }
+
+if test no = "$lt_cv_ar_at_file"; then
+  archiver_list_spec=
+else
+  archiver_list_spec=$lt_cv_ar_at_file
+fi
+
+
+
+
+
+
+
+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
+
+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_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_RANLIB+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # 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_RANLIB="${ac_tool_prefix}ranlib"
+    $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
+RANLIB=$ac_cv_prog_RANLIB
+if test -n "$RANLIB"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+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_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_RANLIB"; then
+  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # 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_RANLIB="ranlib"
+    $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_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 "$ac_ct_RANLIB" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_RANLIB" = x; then
+    RANLIB=":"
+  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
+    RANLIB=$ac_ct_RANLIB
+  fi
+else
+  RANLIB="$ac_cv_prog_RANLIB"
+fi
+
+test -z "$RANLIB" && RANLIB=:
+
+
+
+
+
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+  case $host_os in
+  bitrig* | openbsd*)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
+    ;;
+  *)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
+    ;;
+  esac
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
+fi
+
+case $host_os in
+  darwin*)
+    lock_old_archive_extraction=yes ;;
+  *)
+    lock_old_archive_extraction=no ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+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_n "checking command to parse $NM output from $compiler object... " >&6; }
+if ${lt_cv_sys_global_symbol_pipe+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+# These are sane defaults that work on at least a few old systems.
+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+
+# Character class describing NM global symbol codes.
+symcode='[BCDEGRST]'
+
+# Regexp to match symbols that can be accessed directly from C.
+sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
+
+# Define system-specific variables.
+case $host_os in
+aix*)
+  symcode='[BCDT]'
+  ;;
+cygwin* | mingw* | pw32* | cegcc*)
+  symcode='[ABCDGISTW]'
+  ;;
+hpux*)
+  if test ia64 = "$host_cpu"; then
+    symcode='[ABCDEGRST]'
+  fi
+  ;;
+irix* | nonstopux*)
+  symcode='[BCDEGRST]'
+  ;;
+osf*)
+  symcode='[BCDEGQRST]'
+  ;;
+solaris*)
+  symcode='[BDRT]'
+  ;;
+sco3.2v5*)
+  symcode='[DT]'
+  ;;
+sysv4.2uw2*)
+  symcode='[DT]'
+  ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+  symcode='[ABDT]'
+  ;;
+sysv4)
+  symcode='[DFNSTU]'
+  ;;
+esac
+
+# If we're using GNU nm, then use its standard symbol codes.
+case `$NM -V 2>&1` in
+*GNU* | *'with BFD'*)
+  symcode='[ABCDGIRSTW]' ;;
+esac
+
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  # Gets list of data symbols to import.
+  lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'"
+  # Adjust the below global symbol transforms to fixup imported variables.
+  lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"
+  lt_c_name_hook=" -e 's/^I .* \(.*\)$/  {\"\1\", (void *) 0},/p'"
+  lt_c_name_lib_hook="\
+  -e 's/^I .* \(lib.*\)$/  {\"\1\", (void *) 0},/p'\
+  -e 's/^I .* \(.*\)$/  {\"lib\1\", (void *) 0},/p'"
+else
+  # Disable hooks by default.
+  lt_cv_sys_global_symbol_to_import=
+  lt_cdecl_hook=
+  lt_c_name_hook=
+  lt_c_name_lib_hook=
+fi
+
+# Transform an extracted symbol line into a proper C declaration.
+# Some systems (esp. on ia64) link data and code symbols differently,
+# so use this general approach.
+lt_cv_sys_global_symbol_to_cdecl="sed -n"\
+$lt_cdecl_hook\
+" -e 's/^T .* \(.*\)$/extern int \1();/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'"
+
+# Transform an extracted symbol line into symbol name and symbol address
+lt_cv_sys_global_symbol_to_c_name_address="sed -n"\
+$lt_c_name_hook\
+" -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/p'"
+
+# Transform an extracted symbol line into symbol name with lib prefix and
+# symbol address.
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\
+$lt_c_name_lib_hook\
+" -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(lib.*\)$/  {\"\1\", (void *) \&\1},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"lib\1\", (void *) \&\1},/p'"
+
+# Handle CRLF in mingw tool chain
+opt_cr=
+case $build_os in
+mingw*)
+  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+  ;;
+esac
+
+# Try without a prefix underscore, then with it.
+for ac_symprfx in "" "_"; do
+
+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+  symxfrm="\\1 $ac_symprfx\\2 \\2"
+
+  # Write the raw and C identifiers.
+  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+    # Fake it for dumpbin and say T for any non-static function,
+    # D for any global variable and I for any imported variable.
+    # Also find C++ and __fastcall symbols from MSVC++,
+    # which start with @ or ?.
+    lt_cv_sys_global_symbol_pipe="$AWK '"\
+"     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
+"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+"     /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\
+"     /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\
+"     /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\
+"     \$ 0!~/External *\|/{next};"\
+"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
+"     {if(hide[section]) next};"\
+"     {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\
+"     {split(\$ 0,a,/\||\r/); split(a[2],s)};"\
+"     s[1]~/^[@?]/{print f,s[1],s[1]; next};"\
+"     s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\
+"     ' prfx=^$ac_symprfx"
+  else
+    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[	 ]\($symcode$symcode*\)[	 ][	 ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+  fi
+  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
+
+  # Check to see that the pipe works correctly.
+  pipe_works=no
+
+  rm -f conftest*
+  cat > conftest.$ac_ext <<_LT_EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(void);
+void nm_test_func(void){}
+#ifdef __cplusplus
+}
+#endif
+int main(){nm_test_var='a';nm_test_func();return(0);}
+_LT_EOF
+
+  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
+    # 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
+  (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
+      # Try sorting and uniquifying the output.
+      if sort "$nlist" | uniq > "$nlist"T; then
+	mv -f "$nlist"T "$nlist"
+      else
+	rm -f "$nlist"T
+      fi
+
+      # Make sure that we snagged all the symbols we need.
+      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
+	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
+	  cat <<_LT_EOF > conftest.$ac_ext
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
+#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
+/* DATA imports from DLLs on WIN32 can't be const, because runtime
+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
+# define LT_DLSYM_CONST
+#elif defined __osf__
+/* This system does not cope well with relocations in const data.  */
+# define LT_DLSYM_CONST
+#else
+# define LT_DLSYM_CONST const
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+_LT_EOF
+	  # Now generate the symbol file.
+	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
+
+	  cat <<_LT_EOF >> conftest.$ac_ext
+
+/* The mapping between symbol names and symbols.  */
+LT_DLSYM_CONST struct {
+  const char *name;
+  void       *address;
+}
+lt__PROGRAM__LTX_preloaded_symbols[] =
+{
+  { "@PROGRAM@", (void *) 0 },
+_LT_EOF
+	  $SED "s/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+	  cat <<\_LT_EOF >> conftest.$ac_ext
+  {0, (void *) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt__PROGRAM__LTX_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+_LT_EOF
+	  # Now try linking the two files.
+	  mv conftest.$ac_objext conftstm.$ac_objext
+	  lt_globsym_save_LIBS=$LIBS
+	  lt_globsym_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
+  (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
+	    pipe_works=yes
+	  fi
+	  LIBS=$lt_globsym_save_LIBS
+	  CFLAGS=$lt_globsym_save_CFLAGS
+	else
+	  echo "cannot find nm_test_func in $nlist" >&5
+	fi
+      else
+	echo "cannot find nm_test_var in $nlist" >&5
+      fi
+    else
+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
+    fi
+  else
+    echo "$progname: failed program was:" >&5
+    cat conftest.$ac_ext >&5
+  fi
+  rm -rf conftest* conftst*
+
+  # Do not use the global_symbol_pipe unless it works.
+  if test yes = "$pipe_works"; then
+    break
+  else
+    lt_cv_sys_global_symbol_pipe=
+  fi
+done
+
+fi
+
+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 "failed" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+$as_echo "ok" >&6; }
+fi
+
+# Response file support.
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  nm_file_list_spec='@'
+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
+  nm_file_list_spec='@'
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
+$as_echo_n "checking for sysroot... " >&6; }
+
+# Check whether --with-sysroot was given.
+if test "${with_sysroot+set}" = set; then :
+  withval=$with_sysroot;
+else
+  with_sysroot=no
+fi
+
+
+lt_sysroot=
+case $with_sysroot in #(
+ yes)
+   if test yes = "$GCC"; then
+     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
+   fi
+   ;; #(
+ /*)
+   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
+   ;; #(
+ no|'')
+   ;; #(
+ *)
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5
+$as_echo "$with_sysroot" >&6; }
+   as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
+   ;;
+esac
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
+$as_echo "${lt_sysroot:-no}" >&6; }
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5
+$as_echo_n "checking for a working dd... " >&6; }
+if ${ac_cv_path_lt_DD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+: ${lt_DD:=$DD}
+if test -z "$lt_DD"; then
+  ac_path_lt_DD_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  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_prog in dd; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_lt_DD="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_lt_DD" || continue
+if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+  cmp -s conftest.i conftest.out \
+  && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=:
+fi
+      $ac_path_lt_DD_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_lt_DD"; then
+    :
+  fi
+else
+  ac_cv_path_lt_DD=$lt_DD
+fi
+
+rm -f conftest.i conftest2.i conftest.out
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5
+$as_echo "$ac_cv_path_lt_DD" >&6; }
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5
+$as_echo_n "checking how to truncate binary pipes... " >&6; }
+if ${lt_cv_truncate_bin+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+lt_cv_truncate_bin=
+if "$ac_cv_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+  cmp -s conftest.i conftest.out \
+  && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1"
+fi
+rm -f conftest.i conftest2.i conftest.out
+test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5
+$as_echo "$lt_cv_truncate_bin" >&6; }
+
+
+
+
+
+
+
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+func_cc_basename ()
+{
+    for cc_temp in $*""; do
+      case $cc_temp in
+        compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+        distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+        \-*) ;;
+        *) break;;
+      esac
+    done
+    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+}
+
+# Check whether --enable-libtool-lock was given.
+if test "${enable_libtool_lock+set}" = set; then :
+  enableval=$enable_libtool_lock;
+fi
+
+test no = "$enable_libtool_lock" || enable_libtool_lock=yes
+
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case $host in
+ia64-*-hpux*)
+  # Find out what ABI is being produced by ac_compile, and set mode
+  # options accordingly.
+  echo 'int i;' > conftest.$ac_ext
+  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
+    case `/usr/bin/file conftest.$ac_objext` in
+      *ELF-32*)
+	HPUX_IA64_MODE=32
+	;;
+      *ELF-64*)
+	HPUX_IA64_MODE=64
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+*-*-irix6*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
+  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
+  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
+    if test yes = "$lt_cv_prog_gnu_ld"; then
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -melf32bsmip"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -melf32bmipn32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -melf64bmip"
+	;;
+      esac
+    else
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -32"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -n32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -64"
+	  ;;
+      esac
+    fi
+  fi
+  rm -rf conftest*
+  ;;
+
+mips64*-*linux*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
+  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
+  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
+    emul=elf
+    case `/usr/bin/file conftest.$ac_objext` in
+      *32-bit*)
+	emul="${emul}32"
+	;;
+      *64-bit*)
+	emul="${emul}64"
+	;;
+    esac
+    case `/usr/bin/file conftest.$ac_objext` in
+      *MSB*)
+	emul="${emul}btsmip"
+	;;
+      *LSB*)
+	emul="${emul}ltsmip"
+	;;
+    esac
+    case `/usr/bin/file conftest.$ac_objext` in
+      *N32*)
+	emul="${emul}n32"
+	;;
+    esac
+    LD="${LD-ld} -m $emul"
+  fi
+  rm -rf conftest*
+  ;;
+
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
+s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.  Note that the listed cases only cover the
+  # situations where additional linker options are needed (such as when
+  # doing 32-bit compilation for a host where ld defaults to 64-bit, or
+  # vice versa); the common cases where no linker options are needed do
+  # not appear in the list.
+  echo 'int i;' > conftest.$ac_ext
+  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
+    case `/usr/bin/file conftest.o` in
+      *32-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_i386_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    case `/usr/bin/file conftest.o` in
+	      *x86-64*)
+		LD="${LD-ld} -m elf32_x86_64"
+		;;
+	      *)
+		LD="${LD-ld} -m elf_i386"
+		;;
+	    esac
+	    ;;
+	  powerpc64le-*linux*)
+	    LD="${LD-ld} -m elf32lppclinux"
+	    ;;
+	  powerpc64-*linux*)
+	    LD="${LD-ld} -m elf32ppclinux"
+	    ;;
+	  s390x-*linux*)
+	    LD="${LD-ld} -m elf_s390"
+	    ;;
+	  sparc64-*linux*)
+	    LD="${LD-ld} -m elf32_sparc"
+	    ;;
+	esac
+	;;
+      *64-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_x86_64_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    LD="${LD-ld} -m elf_x86_64"
+	    ;;
+	  powerpcle-*linux*)
+	    LD="${LD-ld} -m elf64lppc"
+	    ;;
+	  powerpc-*linux*)
+	    LD="${LD-ld} -m elf64ppc"
+	    ;;
+	  s390*-*linux*|s390*-*tpf*)
+	    LD="${LD-ld} -m elf64_s390"
+	    ;;
+	  sparc*-*linux*)
+	    LD="${LD-ld} -m elf64_sparc"
+	    ;;
+	esac
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
+*-*-sco3.2v5*)
+  # 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_n "checking whether the C compiler needs -belf... " >&6; }
+if ${lt_cv_cc_needs_belf+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  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 >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  lt_cv_cc_needs_belf=yes
+else
+  lt_cv_cc_needs_belf=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+     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
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
+$as_echo "$lt_cv_cc_needs_belf" >&6; }
+  if test yes != "$lt_cv_cc_needs_belf"; then
+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+    CFLAGS=$SAVE_CFLAGS
+  fi
+  ;;
+*-*solaris*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
+  echo 'int i;' > conftest.$ac_ext
+  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
+    case `/usr/bin/file conftest.o` in
+    *64-bit*)
+      case $lt_cv_prog_gnu_ld in
+      yes*)
+        case $host in
+        i?86-*-solaris*|x86_64-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD=${LD-ld}_sol2
+        fi
+        ;;
+      *)
+	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+	  LD="${LD-ld} -64"
+	fi
+	;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+esac
+
+need_locks=$enable_libtool_lock
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
+set dummy ${ac_tool_prefix}mt; 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_MANIFEST_TOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$MANIFEST_TOOL"; then
+  ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # 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_MANIFEST_TOOL="${ac_tool_prefix}mt"
+    $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
+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
+if test -n "$MANIFEST_TOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
+$as_echo "$MANIFEST_TOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
+  ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
+  # Extract the first word of "mt", so it can be a program name with args.
+set dummy mt; 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_MANIFEST_TOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_MANIFEST_TOOL"; then
+  ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # 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_MANIFEST_TOOL="mt"
+    $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_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
+if test -n "$ac_ct_MANIFEST_TOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_MANIFEST_TOOL" = x; then
+    MANIFEST_TOOL=":"
+  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
+    MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
+  fi
+else
+  MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
+fi
+
+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
+if ${lt_cv_path_mainfest_tool+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_path_mainfest_tool=no
+  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
+  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
+  cat conftest.err >&5
+  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
+    lt_cv_path_mainfest_tool=yes
+  fi
+  rm -f conftest*
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
+if test yes != "$lt_cv_path_mainfest_tool"; then
+  MANIFEST_TOOL=:
+fi
+
+
+
+
+
+
+  case $host_os in
+    rhapsody* | darwin*)
+    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_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_DSYMUTIL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DSYMUTIL"; then
+  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # 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_DSYMUTIL="${ac_tool_prefix}dsymutil"
+    $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
+DSYMUTIL=$ac_cv_prog_DSYMUTIL
+if test -n "$DSYMUTIL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
+$as_echo "$DSYMUTIL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+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_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DSYMUTIL"; then
+  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # 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_DSYMUTIL="dsymutil"
+    $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_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 "$ac_ct_DSYMUTIL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_DSYMUTIL" = x; then
+    DSYMUTIL=":"
+  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
+    DSYMUTIL=$ac_ct_DSYMUTIL
+  fi
+else
+  DSYMUTIL="$ac_cv_prog_DSYMUTIL"
+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_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_NMEDIT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$NMEDIT"; then
+  ac_cv_prog_NMEDIT="$NMEDIT" # 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_NMEDIT="${ac_tool_prefix}nmedit"
+    $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
+NMEDIT=$ac_cv_prog_NMEDIT
+if test -n "$NMEDIT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
+$as_echo "$NMEDIT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+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_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_NMEDIT"; then
+  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # 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_NMEDIT="nmedit"
+    $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_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 "$ac_ct_NMEDIT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_NMEDIT" = x; then
+    NMEDIT=":"
+  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
+    NMEDIT=$ac_ct_NMEDIT
+  fi
+else
+  NMEDIT="$ac_cv_prog_NMEDIT"
+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_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_LIPO+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$LIPO"; then
+  ac_cv_prog_LIPO="$LIPO" # 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_LIPO="${ac_tool_prefix}lipo"
+    $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
+LIPO=$ac_cv_prog_LIPO
+if test -n "$LIPO"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
+$as_echo "$LIPO" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+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_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_LIPO+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_LIPO"; then
+  ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # 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_LIPO="lipo"
+    $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_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 "$ac_ct_LIPO" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_LIPO" = x; then
+    LIPO=":"
+  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
+    LIPO=$ac_ct_LIPO
+  fi
+else
+  LIPO="$ac_cv_prog_LIPO"
+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_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_OTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OTOOL"; then
+  ac_cv_prog_OTOOL="$OTOOL" # 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_OTOOL="${ac_tool_prefix}otool"
+    $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
+OTOOL=$ac_cv_prog_OTOOL
+if test -n "$OTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
+$as_echo "$OTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+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_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_OTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OTOOL"; then
+  ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # 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_OTOOL="otool"
+    $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_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 "$ac_ct_OTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_OTOOL" = x; then
+    OTOOL=":"
+  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
+    OTOOL=$ac_ct_OTOOL
+  fi
+else
+  OTOOL="$ac_cv_prog_OTOOL"
+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_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_OTOOL64+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OTOOL64"; then
+  ac_cv_prog_OTOOL64="$OTOOL64" # 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_OTOOL64="${ac_tool_prefix}otool64"
+    $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
+OTOOL64=$ac_cv_prog_OTOOL64
+if test -n "$OTOOL64"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
+$as_echo "$OTOOL64" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+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_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OTOOL64"; then
+  ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # 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_OTOOL64="otool64"
+    $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_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 "$ac_ct_OTOOL64" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_OTOOL64" = x; then
+    OTOOL64=":"
+  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
+    OTOOL64=$ac_ct_OTOOL64
+  fi
+else
+  OTOOL64="$ac_cv_prog_OTOOL64"
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    { $as_echo "$as_me:${as_lineno-$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 :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_apple_cc_single_mod=no
+      if test -z "$LT_MULTI_MODULE"; then
+	# By default we will add the -single_module flag. You can override
+	# by either setting the environment variable LT_MULTI_MODULE
+	# non-empty at configure time, or by adding -multi_module to the
+	# link flags.
+	rm -rf libconftest.dylib*
+	echo "int foo(void){return 1;}" > conftest.c
+	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+-dynamiclib -Wl,-single_module conftest.c" >&5
+	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
+        _lt_result=$?
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&5
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test 0 = "$_lt_result"; then
+	  lt_cv_apple_cc_single_mod=yes
+	else
+	  cat conftest.err >&5
+	fi
+	rm -rf libconftest.dylib*
+	rm -f conftest.*
+      fi
+fi
+{ $as_echo "$as_me:${as_lineno-$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_n "checking for -exported_symbols_list linker flag... " >&6; }
+if ${lt_cv_ld_exported_symbols_list+:} false; 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
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  lt_cv_ld_exported_symbols_list=yes
+else
+  lt_cv_ld_exported_symbols_list=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    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 "$lt_cv_ld_exported_symbols_list" >&6; }
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
+$as_echo_n "checking for -force_load linker flag... " >&6; }
+if ${lt_cv_ld_force_load+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ld_force_load=no
+      cat > conftest.c << _LT_EOF
+int forced_loaded() { return 2;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
+      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
+      echo "$AR cru libconftest.a conftest.o" >&5
+      $AR cru libconftest.a conftest.o 2>&5
+      echo "$RANLIB libconftest.a" >&5
+      $RANLIB libconftest.a 2>&5
+      cat > conftest.c << _LT_EOF
+int main() { return 0;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
+      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+      _lt_result=$?
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&5
+      elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then
+	lt_cv_ld_force_load=yes
+      else
+	cat conftest.err >&5
+      fi
+        rm -f conftest.err libconftest.a conftest conftest.c
+        rm -rf conftest.dSYM
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
+$as_echo "$lt_cv_ld_force_load" >&6; }
+    case $host_os in
+    rhapsody* | darwin1.[012])
+      _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
+    darwin1.*)
+      _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
+    darwin*) # darwin 5.x on
+      # if running on 10.5 or later, the deployment target defaults
+      # to the OS version, if on x86, and 10.4, the deployment
+      # target defaults to 10.4. Don't you love it?
+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+	10.0,*86*-darwin8*|10.0,*-darwin[91]*)
+	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+	10.[012][,.]*)
+	  _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
+	10.*)
+	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+      esac
+    ;;
+  esac
+    if test yes = "$lt_cv_apple_cc_single_mod"; then
+      _lt_dar_single_mod='$single_module'
+    fi
+    if test yes = "$lt_cv_ld_exported_symbols_list"; then
+      _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym'
+    else
+      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib'
+    fi
+    if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then
+      _lt_dsymutil='~$DSYMUTIL $lib || :'
+    else
+      _lt_dsymutil=
+    fi
+    ;;
+  esac
+
+# func_munge_path_list VARIABLE PATH
+# -----------------------------------
+# VARIABLE is name of variable containing _space_ separated list of
+# directories to be munged by the contents of PATH, which is string
+# having a format:
+# "DIR[:DIR]:"
+#       string "DIR[ DIR]" will be prepended to VARIABLE
+# ":DIR[:DIR]"
+#       string "DIR[ DIR]" will be appended to VARIABLE
+# "DIRP[:DIRP]::[DIRA:]DIRA"
+#       string "DIRP[ DIRP]" will be prepended to VARIABLE and string
+#       "DIRA[ DIRA]" will be appended to VARIABLE
+# "DIR[:DIR]"
+#       VARIABLE will be replaced by "DIR[ DIR]"
+func_munge_path_list ()
+{
+    case x$2 in
+    x)
+        ;;
+    *:)
+        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
+        ;;
+    x:*)
+        eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
+        ;;
+    *::*)
+        eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+        eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
+        ;;
+    *)
+        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
+        ;;
+    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 :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DLFCN_H 1
+_ACEOF
+
+fi
+
+done
+
+
+
+
+func_stripname_cnf ()
+{
+  case $2 in
+  .*) func_stripname_result=`$ECHO "$3" | $SED "s%^$1%%; s%\\\\$2\$%%"`;;
+  *)  func_stripname_result=`$ECHO "$3" | $SED "s%^$1%%; s%$2\$%%"`;;
+  esac
+} # func_stripname_cnf
+
+
+
+
+
+# Set options
+
+
+
+        enable_dlopen=no
+
+
+  enable_win32_dll=no
+
+
+            # Check whether --enable-shared was given.
+if test "${enable_shared+set}" = set; then :
+  enableval=$enable_shared; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_shared=yes ;;
+    no) enable_shared=no ;;
+    *)
+      enable_shared=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for pkg in $enableval; do
+	IFS=$lt_save_ifs
+	if test "X$pkg" = "X$p"; then
+	  enable_shared=yes
+	fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac
+else
+  enable_shared=yes
+fi
+
+
+
+
+
+
+
+
+
+  # Check whether --enable-static was given.
+if test "${enable_static+set}" = set; then :
+  enableval=$enable_static; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_static=yes ;;
+    no) enable_static=no ;;
+    *)
+     enable_static=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for pkg in $enableval; do
+	IFS=$lt_save_ifs
+	if test "X$pkg" = "X$p"; then
+	  enable_static=yes
+	fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac
+else
+  enable_static=yes
+fi
+
+
+
+
+
+
+
+
+
+
+# Check whether --with-pic was given.
+if test "${with_pic+set}" = set; then :
+  withval=$with_pic; lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for lt_pkg in $withval; do
+	IFS=$lt_save_ifs
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac
+else
+  pic_mode=default
+fi
+
+
+
+
+
+
+
+
+  # Check whether --enable-fast-install was given.
+if test "${enable_fast_install+set}" = set; then :
+  enableval=$enable_fast_install; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_fast_install=yes ;;
+    no) enable_fast_install=no ;;
+    *)
+      enable_fast_install=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for pkg in $enableval; do
+	IFS=$lt_save_ifs
+	if test "X$pkg" = "X$p"; then
+	  enable_fast_install=yes
+	fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac
+else
+  enable_fast_install=yes
+fi
+
+
+
+
+
+
+
+
+  shared_archive_member_spec=
+case $host,$enable_shared in
+power*-*-aix[5-9]*,yes)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
+$as_echo_n "checking which variant of shared library versioning to provide... " >&6; }
+
+# Check whether --with-aix-soname was given.
+if test "${with_aix_soname+set}" = set; then :
+  withval=$with_aix_soname; case $withval in
+    aix|svr4|both)
+      ;;
+    *)
+      as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5
+      ;;
+    esac
+    lt_cv_with_aix_soname=$with_aix_soname
+else
+  if ${lt_cv_with_aix_soname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_with_aix_soname=aix
+fi
+
+    with_aix_soname=$lt_cv_with_aix_soname
+fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
+$as_echo "$with_aix_soname" >&6; }
+  if test aix != "$with_aix_soname"; then
+    # For the AIX way of multilib, we name the shared archive member
+    # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
+    # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
+    # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
+    # the AIX toolchain works better with OBJECT_MODE set (default 32).
+    if test 64 = "${OBJECT_MODE-32}"; then
+      shared_archive_member_spec=shr_64
+    else
+      shared_archive_member_spec=shr
+    fi
+  fi
+  ;;
+*)
+  with_aix_soname=aix
+  ;;
+esac
+
+
+
+
+
+
+
+
+
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS=$ltmain
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+test -z "$LN_S" && LN_S="ln -s"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+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_n "checking for objdir... " >&6; }
+if ${lt_cv_objdir+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+  lt_cv_objdir=.libs
+else
+  # MS-DOS does not allow filenames that begin with a dot.
+  lt_cv_objdir=_libs
+fi
+rmdir .libs 2>/dev/null
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
+$as_echo "$lt_cv_objdir" >&6; }
+objdir=$lt_cv_objdir
+
+
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define LT_OBJDIR "$lt_cv_objdir/"
+_ACEOF
+
+
+
+
+case $host_os in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems
+  # vanish in a puff of smoke.
+  if test set != "${COLLECT_NAMES+set}"; then
+    COLLECT_NAMES=
+    export COLLECT_NAMES
+  fi
+  ;;
+esac
+
+# Global variables:
+ofile=libtool
+can_build_shared=yes
+
+# All known linkers require a '.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+
+with_gnu_ld=$lt_cv_prog_gnu_ld
+
+old_CC=$CC
+old_CFLAGS=$CFLAGS
+
+# Set sane defaults for various variables
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+test -z "$LD" && LD=ld
+test -z "$ac_objext" && ac_objext=o
+
+func_cc_basename $compiler
+cc_basename=$func_cc_basename_result
+
+
+# Only perform the check for file, if the check method requires it
+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_n "checking for ${ac_tool_prefix}file... " >&6; }
+if ${lt_cv_path_MAGIC_CMD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $MAGIC_CMD in
+[\\/*] |  ?:[\\/]*)
+  lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD=$MAGIC_CMD
+  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
+  for ac_dir in $ac_dummy; do
+    IFS=$lt_save_ifs
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/${ac_tool_prefix}file"; then
+      lt_cv_path_MAGIC_CMD=$ac_dir/"${ac_tool_prefix}file"
+      if test -n "$file_magic_test_file"; then
+	case $deplibs_check_method in
+	"file_magic "*)
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+	  MAGIC_CMD=$lt_cv_path_MAGIC_CMD
+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+	    $EGREP "$file_magic_regex" > /dev/null; then
+	    :
+	  else
+	    cat <<_LT_EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
+
+_LT_EOF
+	  fi ;;
+	esac
+      fi
+      break
+    fi
+  done
+  IFS=$lt_save_ifs
+  MAGIC_CMD=$lt_save_MAGIC_CMD
+  ;;
+esac
+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 "$MAGIC_CMD" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+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_n "checking for file... " >&6; }
+if ${lt_cv_path_MAGIC_CMD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $MAGIC_CMD in
+[\\/*] |  ?:[\\/]*)
+  lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD=$MAGIC_CMD
+  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
+  for ac_dir in $ac_dummy; do
+    IFS=$lt_save_ifs
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/file"; then
+      lt_cv_path_MAGIC_CMD=$ac_dir/"file"
+      if test -n "$file_magic_test_file"; then
+	case $deplibs_check_method in
+	"file_magic "*)
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+	  MAGIC_CMD=$lt_cv_path_MAGIC_CMD
+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+	    $EGREP "$file_magic_regex" > /dev/null; then
+	    :
+	  else
+	    cat <<_LT_EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
+
+_LT_EOF
+	  fi ;;
+	esac
+      fi
+      break
+    fi
+  done
+  IFS=$lt_save_ifs
+  MAGIC_CMD=$lt_save_MAGIC_CMD
+  ;;
+esac
+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 "$MAGIC_CMD" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  else
+    MAGIC_CMD=:
+  fi
+fi
+
+  fi
+  ;;
+esac
+
+# Use C for the default configuration in the libtool script
+
+lt_save_CC=$CC
+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
+
+
+# Source file extension for C test sources.
+ac_ext=c
+
+# Object file extension for compiled C test sources.
+objext=o
+objext=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(){return(0);}'
+
+
+
+
+
+
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+
+# Save the default compiler, since it gets overwritten when the other
+# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
+compiler_DEFAULT=$CC
+
+# save warnings/boilerplate of simple test code
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$RM conftest*
+
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$RM -r conftest*
+
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+
+lt_prog_compiler_no_builtin_flag=
+
+if test yes = "$GCC"; then
+  case $cc_basename in
+  nvcc*)
+    lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
+  *)
+    lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
+  esac
+
+  { $as_echo "$as_me:${as_lineno-$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 :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_rtti_exceptions=no
+   ac_outfile=conftest.$ac_objext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="-fno-rtti -fno-exceptions"  ## exclude from sc_useless_quotes_in_assignment
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -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:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $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.
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_rtti_exceptions=yes
+     fi
+   fi
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+
+if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then
+    lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
+else
+    :
+fi
+
+fi
+
+
+
+
+
+
+  lt_prog_compiler_wl=
+lt_prog_compiler_pic=
+lt_prog_compiler_static=
+
+
+  if test yes = "$GCC"; then
+    lt_prog_compiler_wl='-Wl,'
+    lt_prog_compiler_static='-static'
+
+    case $host_os in
+      aix*)
+      # All AIX code is PIC.
+      if test ia64 = "$host_cpu"; then
+	# AIX 5 now supports IA64 processor
+	lt_prog_compiler_static='-Bstatic'
+      fi
+      lt_prog_compiler_pic='-fPIC'
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            lt_prog_compiler_pic='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the '-m68020' flag to GCC prevents building anything better,
+            # like '-m68040'.
+            lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      lt_prog_compiler_pic='-DDLL_EXPORT'
+      case $host_os in
+      os2*)
+	lt_prog_compiler_static='$wl-static'
+	;;
+      esac
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      lt_prog_compiler_pic='-fno-common'
+      ;;
+
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      lt_prog_compiler_static=
+      ;;
+
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	# +Z the default
+	;;
+      *)
+	lt_prog_compiler_pic='-fPIC'
+	;;
+      esac
+      ;;
+
+    interix[3-9]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+
+    msdosdjgpp*)
+      # Just because we use GCC doesn't mean we suddenly get shared libraries
+      # on systems that don't support them.
+      lt_prog_compiler_can_build_shared=no
+      enable_shared=no
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      lt_prog_compiler_pic='-fPIC -shared'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	lt_prog_compiler_pic=-Kconform_pic
+      fi
+      ;;
+
+    *)
+      lt_prog_compiler_pic='-fPIC'
+      ;;
+    esac
+
+    case $cc_basename in
+    nvcc*) # Cuda Compiler Driver 2.2
+      lt_prog_compiler_wl='-Xlinker '
+      if test -n "$lt_prog_compiler_pic"; then
+        lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
+      fi
+      ;;
+    esac
+  else
+    # PORTME Check for flag to pass linker flags through the system compiler.
+    case $host_os in
+    aix*)
+      lt_prog_compiler_wl='-Wl,'
+      if test ia64 = "$host_cpu"; then
+	# AIX 5 now supports IA64 processor
+	lt_prog_compiler_static='-Bstatic'
+      else
+	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
+      fi
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      lt_prog_compiler_pic='-fno-common'
+      case $cc_basename in
+      nagfor*)
+        # NAG Fortran compiler
+        lt_prog_compiler_wl='-Wl,-Wl,,'
+        lt_prog_compiler_pic='-PIC'
+        lt_prog_compiler_static='-Bstatic'
+        ;;
+      esac
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      lt_prog_compiler_pic='-DDLL_EXPORT'
+      case $host_os in
+      os2*)
+	lt_prog_compiler_static='$wl-static'
+	;;
+      esac
+      ;;
+
+    hpux9* | hpux10* | hpux11*)
+      lt_prog_compiler_wl='-Wl,'
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	lt_prog_compiler_pic='+Z'
+	;;
+      esac
+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+      lt_prog_compiler_static='$wl-a ${wl}archive'
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      lt_prog_compiler_wl='-Wl,'
+      # PIC (with -KPIC) is the default.
+      lt_prog_compiler_static='-non_shared'
+      ;;
+
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+      case $cc_basename in
+      # old Intel for x86_64, which still supported -KPIC.
+      ecc*)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-KPIC'
+	lt_prog_compiler_static='-static'
+        ;;
+      # icc used to be incompatible with GCC.
+      # ICC 10 doesn't accept -KPIC any more.
+      icc* | ifort*)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fPIC'
+	lt_prog_compiler_static='-static'
+        ;;
+      # Lahey Fortran 8.1.
+      lf95*)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='--shared'
+	lt_prog_compiler_static='--static'
+	;;
+      nagfor*)
+	# NAG Fortran compiler
+	lt_prog_compiler_wl='-Wl,-Wl,,'
+	lt_prog_compiler_pic='-PIC'
+	lt_prog_compiler_static='-Bstatic'
+	;;
+      tcc*)
+	# Fabrice Bellard et al's Tiny C Compiler
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fPIC'
+	lt_prog_compiler_static='-static'
+	;;
+      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+	# which looks to be a dead project)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fpic'
+	lt_prog_compiler_static='-Bstatic'
+        ;;
+      ccc*)
+        lt_prog_compiler_wl='-Wl,'
+        # All Alpha code is PIC.
+        lt_prog_compiler_static='-non_shared'
+        ;;
+      xl* | bgxl* | bgf* | mpixl*)
+	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-qpic'
+	lt_prog_compiler_static='-qstaticlink'
+	;;
+      *)
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl=''
+	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl='-Qoption ld '
+	  ;;
+	*Sun\ C*)
+	  # Sun C 5.9
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl='-Wl,'
+	  ;;
+        *Intel*\ [CF]*Compiler*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fPIC'
+	  lt_prog_compiler_static='-static'
+	  ;;
+	*Portland\ Group*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fpic'
+	  lt_prog_compiler_static='-Bstatic'
+	  ;;
+	esac
+	;;
+      esac
+      ;;
+
+    newsos6)
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      lt_prog_compiler_pic='-fPIC -shared'
+      ;;
+
+    osf3* | osf4* | osf5*)
+      lt_prog_compiler_wl='-Wl,'
+      # All OSF/1 code is PIC.
+      lt_prog_compiler_static='-non_shared'
+      ;;
+
+    rdos*)
+      lt_prog_compiler_static='-non_shared'
+      ;;
+
+    solaris*)
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
+	lt_prog_compiler_wl='-Qoption ld ';;
+      *)
+	lt_prog_compiler_wl='-Wl,';;
+      esac
+      ;;
+
+    sunos4*)
+      lt_prog_compiler_wl='-Qoption ld '
+      lt_prog_compiler_pic='-PIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    sysv4 | sysv4.2uw2* | sysv4.3*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	lt_prog_compiler_pic='-Kconform_pic'
+	lt_prog_compiler_static='-Bstatic'
+      fi
+      ;;
+
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    unicos*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_can_build_shared=no
+      ;;
+
+    uts4*)
+      lt_prog_compiler_pic='-pic'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    *)
+      lt_prog_compiler_can_build_shared=no
+      ;;
+    esac
+  fi
+
+case $host_os in
+  # For platforms that do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    lt_prog_compiler_pic=
+    ;;
+  *)
+    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
+    ;;
+esac
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+if ${lt_cv_prog_compiler_pic+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
+
+#
+# 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_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
+if ${lt_cv_prog_compiler_pic_works+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_pic_works=no
+   ac_outfile=conftest.$ac_objext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"  ## exclude from sc_useless_quotes_in_assignment
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -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:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $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.
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_pic_works=yes
+     fi
+   fi
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
+
+if test yes = "$lt_cv_prog_compiler_pic_works"; then
+    case $lt_prog_compiler_pic in
+     "" | " "*) ;;
+     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
+     esac
+else
+    lt_prog_compiler_pic=
+     lt_prog_compiler_can_build_shared=no
+fi
+
+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_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if ${lt_cv_prog_compiler_static_works+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_static_works=no
+   save_LDFLAGS=$LDFLAGS
+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&5
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_cv_prog_compiler_static_works=yes
+       fi
+     else
+       lt_cv_prog_compiler_static_works=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS=$save_LDFLAGS
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
+$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
+
+if test yes = "$lt_cv_prog_compiler_static_works"; then
+    :
+else
+    lt_prog_compiler_static=
+fi
+
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$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 :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_c_o=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -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:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $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
+     # So say no if there are warnings
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_c_o=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+$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_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if ${lt_cv_prog_compiler_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_c_o=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -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:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $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
+     # So say no if there are warnings
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_c_o=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
+
+
+
+
+hard_links=nottested
+if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; 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_n "checking if we can lock with hard links... " >&6; }
+  hard_links=yes
+  $RM conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  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 "$hard_links" >&6; }
+  if test no = "$hard_links"; 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: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$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=
+  allow_undefined_flag=
+  always_export_symbols=no
+  archive_cmds=
+  archive_expsym_cmds=
+  compiler_needs_object=no
+  enable_shared_with_static_runtimes=no
+  export_dynamic_flag_spec=
+  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  hardcode_automatic=no
+  hardcode_direct=no
+  hardcode_direct_absolute=no
+  hardcode_libdir_flag_spec=
+  hardcode_libdir_separator=
+  hardcode_minus_L=no
+  hardcode_shlibpath_var=unsupported
+  inherit_rpath=no
+  link_all_deplibs=unknown
+  module_cmds=
+  module_expsym_cmds=
+  old_archive_from_new_cmds=
+  old_archive_from_expsyms_cmds=
+  thread_safe_flag_spec=
+  whole_archive_flag_spec=
+  # include_expsyms should be a list of space-separated symbols to be *always*
+  # included in the symbol list
+  include_expsyms=
+  # exclude_expsyms can be an extended regexp of symbols to exclude
+  # it will be wrapped by ' (' and ')$', so one must not match beginning or
+  # end of line.  Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc',
+  # as well as any symbol that contains 'd'.
+  exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+  # platforms (ab)use it in PIC code, but their linkers get confused if
+  # the symbol is explicitly referenced.  Since portable code cannot
+  # rely on this symbol name, it's probably fine to never include it in
+  # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
+  extract_expsyms_cmds=
+
+  case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test yes != "$GCC"; then
+      with_gnu_ld=no
+    fi
+    ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
+  openbsd* | bitrig*)
+    with_gnu_ld=no
+    ;;
+  esac
+
+  ld_shlibs=yes
+
+  # On some targets, GNU ld is compatible enough with the native linker
+  # that we're better off using the native interface for both.
+  lt_use_gnu_ld_interface=no
+  if test yes = "$with_gnu_ld"; then
+    case $host_os in
+      aix*)
+	# The AIX port of GNU ld has always aspired to compatibility
+	# with the native linker.  However, as the warning in the GNU ld
+	# block says, versions before 2.19.5* couldn't really create working
+	# shared libraries, regardless of the interface used.
+	case `$LD -v 2>&1` in
+	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
+	  *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;;
+	  *\ \(GNU\ Binutils\)\ [3-9]*) ;;
+	  *)
+	    lt_use_gnu_ld_interface=yes
+	    ;;
+	esac
+	;;
+      *)
+	lt_use_gnu_ld_interface=yes
+	;;
+    esac
+  fi
+
+  if test yes = "$lt_use_gnu_ld_interface"; then
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    wlarc='$wl'
+
+    # Set some defaults for GNU ld with shared library support. These
+    # are reset later if shared libraries are not supported. Putting them
+    # here allows them to be overridden if necessary.
+    runpath_var=LD_RUN_PATH
+    hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+    export_dynamic_flag_spec='$wl--export-dynamic'
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
+      whole_archive_flag_spec=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
+    else
+      whole_archive_flag_spec=
+    fi
+    supports_anon_versioning=no
+    case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in
+      *GNU\ gold*) supports_anon_versioning=yes ;;
+      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+      *\ 2.11.*) ;; # other 2.11 versions
+      *) supports_anon_versioning=yes ;;
+    esac
+
+    # See if GNU ld supports shared libraries.
+    case $host_os in
+    aix[3-9]*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test ia64 != "$host_cpu"; then
+	ld_shlibs=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: the GNU linker, at least up to release 2.19, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support.  If you
+*** really care for shared libraries, you may want to install binutils
+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
+*** You will then need to restart the configuration process.
+
+_LT_EOF
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+            archive_expsym_cmds=''
+        ;;
+      m68k)
+            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            hardcode_libdir_flag_spec='-L$libdir'
+            hardcode_minus_L=yes
+        ;;
+      esac
+      ;;
+
+    beos*)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	allow_undefined_flag=unsupported
+	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	# support --undefined.  This deserves some investigation.  FIXME
+	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
+      # as there is no search path for DLLs.
+      hardcode_libdir_flag_spec='-L$libdir'
+      export_dynamic_flag_spec='$wl--export-all-symbols'
+      allow_undefined_flag=unsupported
+      always_export_symbols=no
+      enable_shared_with_static_runtimes=yes
+      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
+      exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
+
+      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	# If the export-symbols file already is a .def file, use it as
+	# is; otherwise, prepend EXPORTS...
+	archive_expsym_cmds='if   test DEF = "`$SED -n     -e '\''s/^[	 ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
+          cp $export_symbols $output_objdir/$soname.def;
+        else
+          echo EXPORTS > $output_objdir/$soname.def;
+          cat $export_symbols >> $output_objdir/$soname.def;
+        fi~
+        $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    haiku*)
+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+      link_all_deplibs=yes
+      ;;
+
+    os2*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      allow_undefined_flag=unsupported
+      shrext_cmds=.dll
+      archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	prefix_cmds="$SED"~
+	if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	  prefix_cmds="$prefix_cmds -e 1d";
+	fi~
+	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+      enable_shared_with_static_runtimes=yes
+      ;;
+
+    interix[3-9]*)
+      hardcode_direct=no
+      hardcode_shlibpath_var=no
+      hardcode_libdir_flag_spec='$wl-rpath,$libdir'
+      export_dynamic_flag_spec='$wl-E'
+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+      # Instead, shared libraries are loaded at an image base (0x10000000 by
+      # default) and relocated if they conflict, which is a slow very memory
+      # consuming and fragmenting process.  To avoid this, we pick a random,
+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      archive_expsym_cmds='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      ;;
+
+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+      tmp_diet=no
+      if test linux-dietlibc = "$host_os"; then
+	case $cc_basename in
+	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
+	esac
+      fi
+      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
+	 && test no = "$tmp_diet"
+      then
+	tmp_addflag=' $pic_flag'
+	tmp_sharedflag='-shared'
+	case $cc_basename,$host_cpu in
+        pgcc*)				# Portland Group C compiler
+	  whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	  tmp_addflag=' $pic_flag'
+	  ;;
+	pgf77* | pgf90* | pgf95* | pgfortran*)
+					# Portland Group f77 and f90 compilers
+	  whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	  tmp_addflag=' $pic_flag -Mnomain' ;;
+	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
+	  tmp_addflag=' -i_dynamic' ;;
+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+	ifc* | ifort*)			# Intel Fortran compiler
+	  tmp_addflag=' -nofor_main' ;;
+	lf95*)				# Lahey Fortran 8.1
+	  whole_archive_flag_spec=
+	  tmp_sharedflag='--shared' ;;
+        nagfor*)                        # NAGFOR 5.3
+          tmp_sharedflag='-Wl,-shared' ;;
+	xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+	  tmp_sharedflag='-qmkshrobj'
+	  tmp_addflag= ;;
+	nvcc*)	# Cuda Compiler Driver 2.2
+	  whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	  compiler_needs_object=yes
+	  ;;
+	esac
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  whole_archive_flag_spec='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	  compiler_needs_object=yes
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	esac
+	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+
+        if test yes = "$supports_anon_versioning"; then
+          archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
+            cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+            echo "local: *; };" >> $output_objdir/$libname.ver~
+            $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
+        fi
+
+	case $cc_basename in
+	tcc*)
+	  export_dynamic_flag_spec='-rdynamic'
+	  ;;
+	xlf* | bgf* | bgxlf* | mpixlf*)
+	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
+	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
+	  hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+	  archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
+	  if test yes = "$supports_anon_versioning"; then
+	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
+              cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+              echo "local: *; };" >> $output_objdir/$libname.ver~
+              $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+	  fi
+	  ;;
+	esac
+      else
+        ld_shlibs=no
+      fi
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+	wlarc=
+      else
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+      fi
+      ;;
+
+    solaris*)
+      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
+	ld_shlibs=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
+	ld_shlibs=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot
+*** reliably create shared libraries on SCO systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+	;;
+	*)
+	  # For security reasons, it is highly recommended that you always
+	  # use absolute paths for naming shared libraries, and exclude the
+	  # DT_RUNPATH tag from executables and libraries.  But doing so
+	  # requires that you compile everything twice, which is a pain.
+	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	    hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+	  else
+	    ld_shlibs=no
+	  fi
+	;;
+      esac
+      ;;
+
+    sunos4*)
+      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      wlarc=
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    *)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+    esac
+
+    if test no = "$ld_shlibs"; then
+      runpath_var=
+      hardcode_libdir_flag_spec=
+      export_dynamic_flag_spec=
+      whole_archive_flag_spec=
+    fi
+  else
+    # PORTME fill in a description of your system's linker (not GNU ld)
+    case $host_os in
+    aix3*)
+      allow_undefined_flag=unsupported
+      always_export_symbols=yes
+      archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      hardcode_minus_L=yes
+      if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then
+	# Neither direct hardcoding nor static linking is supported with a
+	# broken collect2.
+	hardcode_direct=unsupported
+      fi
+      ;;
+
+    aix[4-9]*)
+      if test ia64 = "$host_cpu"; then
+	# On IA64, the linker does run time linking by default, so we don't
+	# have to do anything special.
+	aix_use_runtimelinking=no
+	exp_sym_flag='-Bexport'
+	no_entry_flag=
+      else
+	# If we're using GNU nm, then we don't want the "-C" option.
+	# -C means demangle to GNU nm, but means don't demangle to AIX nm.
+	# Without the "-l" option, or with the "-B" option, AIX nm treats
+	# weak defined symbols like other global defined symbols, whereas
+	# GNU nm marks them as "W".
+	# While the 'weak' keyword is ignored in the Export File, we need
+	# it in the Import File for the 'aix-soname' feature, so we have
+	# to replace the "-B" option with "-P" for AIX nm.
+	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
+	else
+	  export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
+	fi
+	aix_use_runtimelinking=no
+
+	# Test if we are trying to use run time linking or normal
+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+	# have runtime linking enabled, and use it for executables.
+	# For shared libraries, we enable/disable runtime linking
+	# depending on the kind of the shared library created -
+	# when "with_aix_soname,aix_use_runtimelinking" is:
+	# "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
+	# "aix,yes"  lib.so          shared, rtl:yes, for executables
+	#            lib.a           static archive
+	# "both,no"  lib.so.V(shr.o) shared, rtl:yes
+	#            lib.a(lib.so.V) shared, rtl:no,  for executables
+	# "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+	#            lib.a(lib.so.V) shared, rtl:no
+	# "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
+	#            lib.a           static archive
+	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+	  for ld_flag in $LDFLAGS; do
+	  if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
+	    aix_use_runtimelinking=yes
+	    break
+	  fi
+	  done
+	  if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+	    # With aix-soname=svr4, we create the lib.so.V shared archives only,
+	    # so we don't have lib.a shared libs to link our executables.
+	    # We have to force runtime linking in this case.
+	    aix_use_runtimelinking=yes
+	    LDFLAGS="$LDFLAGS -Wl,-brtl"
+	  fi
+	  ;;
+	esac
+
+	exp_sym_flag='-bexport'
+	no_entry_flag='-bnoentry'
+      fi
+
+      # When large executables or shared objects are built, AIX ld can
+      # have problems creating the table of contents.  If linking a library
+      # or program results in "error TOC overflow" add -mminimal-toc to
+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+      archive_cmds=''
+      hardcode_direct=yes
+      hardcode_direct_absolute=yes
+      hardcode_libdir_separator=':'
+      link_all_deplibs=yes
+      file_list_spec='$wl-f,'
+      case $with_aix_soname,$aix_use_runtimelinking in
+      aix,*) ;; # traditional, no import file
+      svr4,* | *,yes) # use import file
+	# The Import File defines what to hardcode.
+	hardcode_direct=no
+	hardcode_direct_absolute=no
+	;;
+      esac
+
+      if test yes = "$GCC"; then
+	case $host_os in aix4.[012]|aix4.[012].*)
+	# We only want to do this on AIX 4.2 and lower, the check
+	# below for broken collect2 doesn't work under 4.3+
+	  collect2name=`$CC -print-prog-name=collect2`
+	  if test -f "$collect2name" &&
+	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	  then
+	  # We have reworked collect2
+	  :
+	  else
+	  # We have old collect2
+	  hardcode_direct=unsupported
+	  # It fails to find uninstalled libraries when the uninstalled
+	  # path is not listed in the libpath.  Setting hardcode_minus_L
+	  # to unsupported forces relinking
+	  hardcode_minus_L=yes
+	  hardcode_libdir_flag_spec='-L$libdir'
+	  hardcode_libdir_separator=
+	  fi
+	  ;;
+	esac
+	shared_flag='-shared'
+	if test yes = "$aix_use_runtimelinking"; then
+	  shared_flag="$shared_flag "'$wl-G'
+	fi
+	# Need to ensure runtime linking is disabled for the traditional
+	# shared library, or the linker may eventually find shared libraries
+	# /with/ Import File - we do not want to mix them.
+	shared_flag_aix='-shared'
+	shared_flag_svr4='-shared $wl-G'
+      else
+	# not using gcc
+	if test ia64 = "$host_cpu"; then
+	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	# chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+	else
+	  if test yes = "$aix_use_runtimelinking"; then
+	    shared_flag='$wl-G'
+	  else
+	    shared_flag='$wl-bM:SRE'
+	  fi
+	  shared_flag_aix='$wl-bM:SRE'
+	  shared_flag_svr4='$wl-G'
+	fi
+      fi
+
+      export_dynamic_flag_spec='$wl-bexpall'
+      # It seems that -bexpall does not export symbols beginning with
+      # underscore (_), so it is better to generate a list of symbols to export.
+      always_export_symbols=yes
+      if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
+	# Warning - without using the other runtime loading flags (-brtl),
+	# -berok will link without error, but may produce a broken library.
+	allow_undefined_flag='-berok'
+        # Determine the default libpath from the value encoded in an
+        # empty executable.
+        if test set = "${lt_cv_aix_libpath+set}"; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  if ${lt_cv_aix_libpath_+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }'
+  lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_=/usr/lib:/lib
+  fi
+
+fi
+
+  aix_libpath=$lt_cv_aix_libpath_
+fi
+
+        hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath"
+        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
+      else
+	if test ia64 = "$host_cpu"; then
+	  hardcode_libdir_flag_spec='$wl-R $libdir:/usr/lib:/lib'
+	  allow_undefined_flag="-z nodefs"
+	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
+	else
+	 # Determine the default libpath from the value encoded in an
+	 # empty executable.
+	 if test set = "${lt_cv_aix_libpath+set}"; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  if ${lt_cv_aix_libpath_+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }'
+  lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_=/usr/lib:/lib
+  fi
+
+fi
+
+  aix_libpath=$lt_cv_aix_libpath_
+fi
+
+	 hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath"
+	  # Warning - without using the other run time loading flags,
+	  # -berok will link without error, but may produce a broken library.
+	  no_undefined_flag=' $wl-bernotok'
+	  allow_undefined_flag=' $wl-berok'
+	  if test yes = "$with_gnu_ld"; then
+	    # We only use this code for GNU lds that support --whole-archive.
+	    whole_archive_flag_spec='$wl--whole-archive$convenience $wl--no-whole-archive'
+	  else
+	    # Exported symbols can be pulled into shared objects from archives
+	    whole_archive_flag_spec='$convenience'
+	  fi
+	  archive_cmds_need_lc=yes
+	  archive_expsym_cmds='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+	  # -brtl affects multiple linker settings, -berok does not and is overridden later
+	  compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`'
+	  if test svr4 != "$with_aix_soname"; then
+	    # This is similar to how AIX traditionally builds its shared libraries.
+	    archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+	  fi
+	  if test aix != "$with_aix_soname"; then
+	    archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+	  else
+	    # used by -dlpreopen to get the symbols
+	    archive_expsym_cmds="$archive_expsym_cmds"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
+	  fi
+	  archive_expsym_cmds="$archive_expsym_cmds"'~$RM -r $output_objdir/$realname.d'
+	fi
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+            archive_expsym_cmds=''
+        ;;
+      m68k)
+            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            hardcode_libdir_flag_spec='-L$libdir'
+            hardcode_minus_L=yes
+        ;;
+      esac
+      ;;
+
+    bsdi[45]*)
+      export_dynamic_flag_spec=-rdynamic
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      case $cc_basename in
+      cl*)
+	# Native MSVC
+	hardcode_libdir_flag_spec=' '
+	allow_undefined_flag=unsupported
+	always_export_symbols=yes
+	file_list_spec='@'
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=.dll
+	# FIXME: Setting linknames here is a bad hack.
+	archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+	archive_expsym_cmds='if   test DEF = "`$SED -n     -e '\''s/^[	 ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
+            cp "$export_symbols" "$output_objdir/$soname.def";
+            echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+          else
+            $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+          fi~
+          $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+          linknames='
+	# The linker will not automatically build a static lib if we build a DLL.
+	# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
+	enable_shared_with_static_runtimes=yes
+	exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+	export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+	# Don't use ranlib
+	old_postinstall_cmds='chmod 644 $oldlib'
+	postlink_cmds='lt_outputfile="@OUTPUT@"~
+          lt_tool_outputfile="@TOOL_OUTPUT@"~
+          case $lt_outputfile in
+            *.exe|*.EXE) ;;
+            *)
+              lt_outputfile=$lt_outputfile.exe
+              lt_tool_outputfile=$lt_tool_outputfile.exe
+              ;;
+          esac~
+          if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
+            $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+            $RM "$lt_outputfile.manifest";
+          fi'
+	;;
+      *)
+	# Assume MSVC wrapper
+	hardcode_libdir_flag_spec=' '
+	allow_undefined_flag=unsupported
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=.dll
+	# FIXME: Setting linknames here is a bad hack.
+	archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+	# The linker will automatically build a .lib file if we build a DLL.
+	old_archive_from_new_cmds='true'
+	# FIXME: Should let the user specify the lib program.
+	old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
+	enable_shared_with_static_runtimes=yes
+	;;
+      esac
+      ;;
+
+    darwin* | rhapsody*)
+
+
+  archive_cmds_need_lc=no
+  hardcode_direct=no
+  hardcode_automatic=yes
+  hardcode_shlibpath_var=unsupported
+  if test yes = "$lt_cv_ld_force_load"; then
+    whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+
+  else
+    whole_archive_flag_spec=''
+  fi
+  link_all_deplibs=yes
+  allow_undefined_flag=$_lt_dar_allow_undefined
+  case $cc_basename in
+     ifort*|nagfor*) _lt_dar_can_shared=yes ;;
+     *) _lt_dar_can_shared=$GCC ;;
+  esac
+  if test yes = "$_lt_dar_can_shared"; then
+    output_verbose_link_cmd=func_echo_all
+    archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
+    module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
+    archive_expsym_cmds="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
+    module_expsym_cmds="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
+
+  else
+  ld_shlibs=no
+  fi
+
+      ;;
+
+    dgux*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_shlibpath_var=no
+      ;;
+
+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+    # support.  Future versions do this automatically, but an explicit c++rt0.o
+    # does not break anything, and helps significantly (at the cost of a little
+    # extra space).
+    freebsd2.2*)
+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+    freebsd2.*)
+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+    freebsd* | dragonfly*)
+      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    hpux9*)
+      if test yes = "$GCC"; then
+	archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
+      else
+	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
+      fi
+      hardcode_libdir_flag_spec='$wl+b $wl$libdir'
+      hardcode_libdir_separator=:
+      hardcode_direct=yes
+
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      hardcode_minus_L=yes
+      export_dynamic_flag_spec='$wl-E'
+      ;;
+
+    hpux10*)
+      if test yes,no = "$GCC,$with_gnu_ld"; then
+	archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      if test no = "$with_gnu_ld"; then
+	hardcode_libdir_flag_spec='$wl+b $wl$libdir'
+	hardcode_libdir_separator=:
+	hardcode_direct=yes
+	hardcode_direct_absolute=yes
+	export_dynamic_flag_spec='$wl-E'
+	# hardcode_minus_L: Not really in the search PATH,
+	# but as the default location of the library.
+	hardcode_minus_L=yes
+      fi
+      ;;
+
+    hpux11*)
+      if test yes,no = "$GCC,$with_gnu_ld"; then
+	case $host_cpu in
+	hppa*64*)
+	  archive_cmds='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      else
+	case $host_cpu in
+	hppa*64*)
+	  archive_cmds='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  archive_cmds='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+
+	  # Older versions of the 11.00 compiler do not understand -b yet
+	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
+$as_echo_n "checking if $CC understands -b... " >&6; }
+if ${lt_cv_prog_compiler__b+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler__b=no
+   save_LDFLAGS=$LDFLAGS
+   LDFLAGS="$LDFLAGS -b"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&5
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_cv_prog_compiler__b=yes
+       fi
+     else
+       lt_cv_prog_compiler__b=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS=$save_LDFLAGS
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
+$as_echo "$lt_cv_prog_compiler__b" >&6; }
+
+if test yes = "$lt_cv_prog_compiler__b"; then
+    archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+else
+    archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+fi
+
+	  ;;
+	esac
+      fi
+      if test no = "$with_gnu_ld"; then
+	hardcode_libdir_flag_spec='$wl+b $wl$libdir'
+	hardcode_libdir_separator=:
+
+	case $host_cpu in
+	hppa*64*|ia64*)
+	  hardcode_direct=no
+	  hardcode_shlibpath_var=no
+	  ;;
+	*)
+	  hardcode_direct=yes
+	  hardcode_direct_absolute=yes
+	  export_dynamic_flag_spec='$wl-E'
+
+	  # hardcode_minus_L: Not really in the search PATH,
+	  # but as the default location of the library.
+	  hardcode_minus_L=yes
+	  ;;
+	esac
+      fi
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      if test yes = "$GCC"; then
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+	# Try to use the -exported_symbol ld option, if it does not
+	# work, assume that -exports_file does not work either and
+	# implicitly export all symbols.
+	# This should be the same for all languages, so no per-tag cache variable.
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
+if ${lt_cv_irix_exported_symbol+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  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.  */
+int foo (void) { return 0; }
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  lt_cv_irix_exported_symbol=yes
+else
+  lt_cv_irix_exported_symbol=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+           LDFLAGS=$save_LDFLAGS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
+	if test yes = "$lt_cv_irix_exported_symbol"; then
+          archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
+	fi
+      else
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
+      fi
+      archive_cmds_need_lc='no'
+      hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+      hardcode_libdir_separator=:
+      inherit_rpath=yes
+      link_all_deplibs=yes
+      ;;
+
+    linux*)
+      case $cc_basename in
+      tcc*)
+	# Fabrice Bellard et al's Tiny C Compiler
+	ld_shlibs=yes
+	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+      esac
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+      else
+	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+      fi
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    newsos6)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_direct=yes
+      hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+      hardcode_libdir_separator=:
+      hardcode_shlibpath_var=no
+      ;;
+
+    *nto* | *qnx*)
+      ;;
+
+    openbsd* | bitrig*)
+      if test -f /usr/libexec/ld.so; then
+	hardcode_direct=yes
+	hardcode_shlibpath_var=no
+	hardcode_direct_absolute=yes
+	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
+	  hardcode_libdir_flag_spec='$wl-rpath,$libdir'
+	  export_dynamic_flag_spec='$wl-E'
+	else
+	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  hardcode_libdir_flag_spec='$wl-rpath,$libdir'
+	fi
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    os2*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      allow_undefined_flag=unsupported
+      shrext_cmds=.dll
+      archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	prefix_cmds="$SED"~
+	if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	  prefix_cmds="$prefix_cmds -e 1d";
+	fi~
+	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+      enable_shared_with_static_runtimes=yes
+      ;;
+
+    osf3*)
+      if test yes = "$GCC"; then
+	allow_undefined_flag=' $wl-expect_unresolved $wl\*'
+	archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+      else
+	allow_undefined_flag=' -expect_unresolved \*'
+	archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+      fi
+      archive_cmds_need_lc='no'
+      hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+      hardcode_libdir_separator=:
+      ;;
+
+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
+      if test yes = "$GCC"; then
+	allow_undefined_flag=' $wl-expect_unresolved $wl\*'
+	archive_cmds='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+	hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+      else
+	allow_undefined_flag=' -expect_unresolved \*'
+	archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
+          $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp'
+
+	# Both c and cxx compiler support -rpath directly
+	hardcode_libdir_flag_spec='-rpath $libdir'
+      fi
+      archive_cmds_need_lc='no'
+      hardcode_libdir_separator=:
+      ;;
+
+    solaris*)
+      no_undefined_flag=' -z defs'
+      if test yes = "$GCC"; then
+	wlarc='$wl'
+	archive_cmds='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+          $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+      else
+	case `$CC -V 2>&1` in
+	*"Compilers 5.0"*)
+	  wlarc=''
+	  archive_cmds='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+            $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+	  ;;
+	*)
+	  wlarc='$wl'
+	  archive_cmds='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+            $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	  ;;
+	esac
+      fi
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_shlibpath_var=no
+      case $host_os in
+      solaris2.[0-5] | solaris2.[0-5].*) ;;
+      *)
+	# The compiler driver will combine and reorder linker options,
+	# but understands '-z linker_flag'.  GCC discards it without '$wl',
+	# but is careful enough not to reorder.
+	# Supported since Solaris 2.6 (maybe 2.5.1?)
+	if test yes = "$GCC"; then
+	  whole_archive_flag_spec='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
+	else
+	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
+	fi
+	;;
+      esac
+      link_all_deplibs=yes
+      ;;
+
+    sunos4*)
+      if test sequent = "$host_vendor"; then
+	# Use $CC to link under sequent, because it throws in some extra .o
+	# files that make .init and .fini sections work.
+	archive_cmds='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    sysv4)
+      case $host_vendor in
+	sni)
+	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  hardcode_direct=yes # is this really true???
+	;;
+	siemens)
+	  ## LD is ld it makes a PLAMLIB
+	  ## CC just makes a GrossModule.
+	  archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+	  reload_cmds='$CC -r -o $output$reload_objs'
+	  hardcode_direct=no
+        ;;
+	motorola)
+	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  hardcode_direct=no #Motorola manual says yes, but my tests say they lie
+	;;
+      esac
+      runpath_var='LD_RUN_PATH'
+      hardcode_shlibpath_var=no
+      ;;
+
+    sysv4.3*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_shlibpath_var=no
+      export_dynamic_flag_spec='-Bexport'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	hardcode_shlibpath_var=no
+	runpath_var=LD_RUN_PATH
+	hardcode_runpath_var=yes
+	ld_shlibs=yes
+      fi
+      ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+      no_undefined_flag='$wl-z,text'
+      archive_cmds_need_lc=no
+      hardcode_shlibpath_var=no
+      runpath_var='LD_RUN_PATH'
+
+      if test yes = "$GCC"; then
+	archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6*)
+      # Note: We CANNOT use -z defs as we might desire, because we do not
+      # link with -lc, and that would cause any symbols used from libc to
+      # always be unresolved, which means just about no library would
+      # ever link correctly.  If we're not using GNU ld we use -z text
+      # though, which does catch some bad symbols but isn't as heavy-handed
+      # as -z defs.
+      no_undefined_flag='$wl-z,text'
+      allow_undefined_flag='$wl-z,nodefs'
+      archive_cmds_need_lc=no
+      hardcode_shlibpath_var=no
+      hardcode_libdir_flag_spec='$wl-R,$libdir'
+      hardcode_libdir_separator=':'
+      link_all_deplibs=yes
+      export_dynamic_flag_spec='$wl-Bexport'
+      runpath_var='LD_RUN_PATH'
+
+      if test yes = "$GCC"; then
+	archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    uts4*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_shlibpath_var=no
+      ;;
+
+    *)
+      ld_shlibs=no
+      ;;
+    esac
+
+    if test sni = "$host_vendor"; then
+      case $host in
+      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+	export_dynamic_flag_spec='$wl-Blargedynsym'
+	;;
+      esac
+    fi
+  fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
+$as_echo "$ld_shlibs" >&6; }
+test no = "$ld_shlibs" && can_build_shared=no
+
+with_gnu_ld=$with_gnu_ld
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#
+# Do we need to explicitly link libc?
+#
+case "x$archive_cmds_need_lc" in
+x|xyes)
+  # Assume -lc should be added
+  archive_cmds_need_lc=yes
+
+  if test yes,yes = "$GCC,$enable_shared"; then
+    case $archive_cmds in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # 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_n "checking whether -lc should be explicitly linked in... " >&6; }
+if ${lt_cv_archive_cmds_need_lc+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  $RM conftest*
+	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+	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; } 2>conftest.err; then
+	  soname=conftest
+	  lib=conftest
+	  libobjs=conftest.$ac_objext
+	  deplibs=
+	  wl=$lt_prog_compiler_wl
+	  pic_flag=$lt_prog_compiler_pic
+	  compiler_flags=-v
+	  linker_flags=-v
+	  verstring=
+	  output_objdir=.
+	  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
+  (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; }
+	  then
+	    lt_cv_archive_cmds_need_lc=no
+	  else
+	    lt_cv_archive_cmds_need_lc=yes
+	  fi
+	  allow_undefined_flag=$lt_save_allow_undefined_flag
+	else
+	  cat conftest.err 1>&5
+	fi
+	$RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
+$as_echo "$lt_cv_archive_cmds_need_lc" >&6; }
+      archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
+      ;;
+    esac
+  fi
+  ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
+
+if test yes = "$GCC"; then
+  case $host_os in
+    darwin*) lt_awk_arg='/^libraries:/,/LR/' ;;
+    *) lt_awk_arg='/^libraries:/' ;;
+  esac
+  case $host_os in
+    mingw* | cegcc*) lt_sed_strip_eq='s|=\([A-Za-z]:\)|\1|g' ;;
+    *) lt_sed_strip_eq='s|=/|/|g' ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
+  case $lt_search_path_spec in
+  *\;*)
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
+    ;;
+  *)
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
+    ;;
+  esac
+  # Ok, now we have the path, separated by spaces, we can step through it
+  # and add multilib dir if necessary...
+  lt_tmp_lt_search_path_spec=
+  lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  # ...but if some path component already ends with the multilib dir we assume
+  # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer).
+  case "$lt_multi_os_dir; $lt_search_path_spec " in
+  "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*)
+    lt_multi_os_dir=
+    ;;
+  esac
+  for lt_sys_path in $lt_search_path_spec; do
+    if test -d "$lt_sys_path$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir"
+    elif test -n "$lt_multi_os_dir"; then
+      test -d "$lt_sys_path" && \
+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+    fi
+  done
+  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
+BEGIN {RS = " "; FS = "/|\n";} {
+  lt_foo = "";
+  lt_count = 0;
+  for (lt_i = NF; lt_i > 0; lt_i--) {
+    if ($lt_i != "" && $lt_i != ".") {
+      if ($lt_i == "..") {
+        lt_count++;
+      } else {
+        if (lt_count == 0) {
+          lt_foo = "/" $lt_i lt_foo;
+        } else {
+          lt_count--;
+        }
+      }
+    }
+  }
+  if (lt_foo != "") { lt_freq[lt_foo]++; }
+  if (lt_freq[lt_foo] == 1) { print lt_foo; }
+}'`
+  # AWK program above erroneously prepends '/' to C:/dos/paths
+  # for these hosts.
+  case $host_os in
+    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
+      $SED 's|/\([A-Za-z]:\)|\1|g'` ;;
+  esac
+  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=.so
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+
+
+
+case $host_os in
+aix3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
+  shlibpath_var=LIBPATH
+
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='$libname$release$shared_ext$major'
+  ;;
+
+aix[4-9]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  hardcode_into_libs=yes
+  if test ia64 = "$host_cpu"; then
+    # AIX 5 supports IA64
+    library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line '#! .'.  This would cause the generated library to
+    # depend on '.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      aix4 | aix4.[01] | aix4.[01].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+	   echo ' yes '
+	   echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
+	:
+      else
+	can_build_shared=no
+      fi
+      ;;
+    esac
+    # Using Import Files as archive members, it is possible to support
+    # filename-based versioning of shared library archives on AIX. While
+    # this would work for both with and without runtime linking, it will
+    # prevent static linking of such archives. So we do filename-based
+    # shared library versioning with .so extension only, which is used
+    # when both runtime linking and shared linking is enabled.
+    # Unfortunately, runtime linking may impact performance, so we do
+    # not want this to be the default eventually. Also, we use the
+    # versioned .so libs for executables only if there is the -brtl
+    # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+    # To allow for filename-based versioning support, we need to create
+    # libNAME.so.V as an archive file, containing:
+    # *) an Import File, referring to the versioned filename of the
+    #    archive as well as the shared archive member, telling the
+    #    bitwidth (32 or 64) of that shared object, and providing the
+    #    list of exported symbols of that shared object, eventually
+    #    decorated with the 'weak' keyword
+    # *) the shared object with the F_LOADONLY flag set, to really avoid
+    #    it being seen by the linker.
+    # At run time we better use the real file rather than another symlink,
+    # but for link time we create the symlink libNAME.so -> libNAME.so.V
+
+    case $with_aix_soname,$aix_use_runtimelinking in
+    # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    aix,yes) # traditional libtool
+      dynamic_linker='AIX unversionable lib.so'
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      ;;
+    aix,no) # traditional AIX only
+      dynamic_linker='AIX lib.a(lib.so.V)'
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='$libname$release.a $libname.a'
+      soname_spec='$libname$release$shared_ext$major'
+      ;;
+    svr4,*) # full svr4 only
+      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,yes) # both, prefer svr4
+      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # unpreferred sharedlib libNAME.a needs extra handling
+      postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+      postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,no) # both, prefer aix
+      dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)"
+      library_names_spec='$libname$release.a $libname.a'
+      soname_spec='$libname$release$shared_ext$major'
+      # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+      postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+      postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+      ;;
+    esac
+    shlibpath_var=LIBPATH
+  fi
+  ;;
+
+amigaos*)
+  case $host_cpu in
+  powerpc)
+    # Since July 2007 AmigaOS4 officially supports .so libraries.
+    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    ;;
+  m68k)
+    library_names_spec='$libname.ixlibrary $libname.a'
+    # Create ${libname}_ixlibrary.a entries in /sys/libs.
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    ;;
+  esac
+  ;;
+
+beos*)
+  library_names_spec='$libname$shared_ext'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
+
+bsdi[45]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
+
+cygwin* | mingw* | pw32* | cegcc*)
+  version_type=windows
+  shrext_cmds=.dll
+  need_version=no
+  need_lib_prefix=no
+
+  case $GCC,$cc_basename in
+  yes,*)
+    # gcc
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \$file`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname~
+      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+      fi'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+
+      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
+      ;;
+    mingw* | cegcc*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+      ;;
+    esac
+    dynamic_linker='Win32 ld.exe'
+    ;;
+
+  *,cl*)
+    # Native MSVC
+    libname_spec='$name'
+    soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+    library_names_spec='$libname.dll.lib'
+
+    case $build_os in
+    mingw*)
+      sys_lib_search_path_spec=
+      lt_save_ifs=$IFS
+      IFS=';'
+      for lt_path in $LIB
+      do
+        IFS=$lt_save_ifs
+        # Let DOS variable expansion print the short 8.3 style file name.
+        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+      done
+      IFS=$lt_save_ifs
+      # Convert to MSYS style.
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
+      ;;
+    cygwin*)
+      # Convert to unix form, then to dos form, then back to unix form
+      # but this time dos style (no spaces!) so that the unix form looks
+      # like /cygdrive/c/PROGRA~1:/cygdr...
+      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      ;;
+    *)
+      sys_lib_search_path_spec=$LIB
+      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
+        # It is most probably a Windows format PATH.
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      # FIXME: find the short name or the path components, as spaces are
+      # common. (e.g. "Program Files" -> "PROGRA~1")
+      ;;
+    esac
+
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \$file`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+    dynamic_linker='Win32 link.exe'
+    ;;
+
+  *)
+    # Assume MSVC wrapper
+    library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib'
+    dynamic_linker='Win32 ld.exe'
+    ;;
+  esac
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
+
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
+  soname_spec='$libname$release$major$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
+
+dgux*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[23].*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
+  version_type=freebsd-$objformat
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      soname_spec='$libname$release$shared_ext$major'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+      need_version=yes
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_os in
+  freebsd2.*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  freebsd3.[01]* | freebsdelf3.[01]*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
+  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  *) # from 4.6 on, and DragonFly
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
+
+haiku*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  dynamic_linker="$host_os runtime_loader"
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+  hardcode_into_libs=yes
+  ;;
+
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  case $host_cpu in
+  ia64*)
+    shrext_cmds='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    if test 32 = "$HPUX_IA64_MODE"; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux32
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux64
+    fi
+    ;;
+  hppa*64*)
+    shrext_cmds='.sl'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  *)
+    shrext_cmds='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
+  postinstall_cmds='chmod 555 $lib'
+  # or fails outright, so override atomically:
+  install_override_mode=555
+  ;;
+
+interix[3-9]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)
+	if test yes = "$lt_cv_prog_gnu_ld"; then
+		version_type=linux # correct to gnu/linux during the next big refactor
+	else
+		version_type=irix
+	fi ;;
+  esac
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='$libname$release$shared_ext$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
+  case $host_os in
+  irix5* | nonstopux*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
+  sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
+  hardcode_into_libs=yes
+  ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
+
+linux*android*)
+  version_type=none # Android doesn't support versioned libraries.
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext'
+  soname_spec='$libname$release$shared_ext'
+  finish_cmds=
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  dynamic_linker='Android linker'
+  # Don't embed -rpath directories since the linker doesn't support them.
+  hardcode_libdir_flag_spec='-L$libdir'
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+
+  # Some binutils ld are patched to set DT_RUNPATH
+  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_shlibpath_overrides_runpath=no
+    save_LDFLAGS=$LDFLAGS
+    save_libdir=$libdir
+    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
+	 LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+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 :
+  lt_cv_shlibpath_overrides_runpath=yes
+fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+    LDFLAGS=$save_LDFLAGS
+    libdir=$save_libdir
+
+fi
+
+  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  # Ideally, we could use ldconfig to report *all* directores which are
+  # searched for libraries, however this is still not possible.  Aside from not
+  # being certain /sbin/ldconfig is available, command
+  # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
+  # even though it is searched at run-time.  Try to do the best guess by
+  # appending ld.so.conf contents (and includes) 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;s/"//g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+  fi
+
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
+
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+newsos6)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+*nto* | *qnx*)
+  version_type=qnx
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='ldqnx.so'
+  ;;
+
+openbsd* | bitrig*)
+  version_type=sunos
+  sys_lib_dlsearch_path_spec=/usr/lib
+  need_lib_prefix=no
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+    need_version=no
+  else
+    need_version=yes
+  fi
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+os2*)
+  libname_spec='$name'
+  version_type=windows
+  shrext_cmds=.dll
+  need_version=no
+  need_lib_prefix=no
+  # OS/2 can only load a DLL with a base name of 8 characters or less.
+  soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+    v=$($ECHO $release$versuffix | tr -d .-);
+    n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+    $ECHO $n$v`$shared_ext'
+  library_names_spec='${libname}_dll.$libext'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=BEGINLIBPATH
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+  postinstall_cmds='base_file=`basename \$file`~
+    dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
+    dldir=$destdir/`dirname \$dlpath`~
+    test -d \$dldir || mkdir -p \$dldir~
+    $install_prog $dir/$dlname \$dldir/$dlname~
+    chmod a+x \$dldir/$dlname~
+    if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+      eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+    fi'
+  postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
+    dlpath=$dir/\$dldll~
+    $RM \$dlpath'
+  ;;
+
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='$libname$release$shared_ext$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+  ;;
+
+rdos*)
+  dynamic_linker=no
+  ;;
+
+solaris*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
+
+sunos4*)
+  version_type=sunos
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test yes = "$with_gnu_ld"; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
+
+sysv4 | sysv4.3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+
+sysv4*MP*)
+  if test -d /usr/nec; then
+    version_type=linux # correct to gnu/linux during the next big refactor
+    library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext'
+    soname_spec='$libname$shared_ext.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=sco
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  if test yes = "$with_gnu_ld"; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+
+tpf*)
+  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+uts4*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+*)
+  dynamic_linker=no
+  ;;
+esac
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
+test no = "$dynamic_linker" && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test yes = "$GCC"; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
+if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
+  sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
+fi
+
+if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
+  sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
+fi
+
+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
+
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
+func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$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" ||
+   test -n "$runpath_var" ||
+   test yes = "$hardcode_automatic"; then
+
+  # We can hardcode non-existent directories.
+  if test no != "$hardcode_direct" &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, )" &&
+     test no != "$hardcode_minus_L"; then
+    # Linking always hardcodes the temporary library directory.
+    hardcode_action=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    hardcode_action=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  hardcode_action=unsupported
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
+$as_echo "$hardcode_action" >&6; }
+
+if test relink = "$hardcode_action" ||
+   test yes = "$inherit_rpath"; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test yes = "$shlibpath_overrides_runpath" ||
+     test no = "$enable_shared"; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+
+
+
+
+
+
+  if test yes != "$enable_dlopen"; then
+  enable_dlopen=unknown
+  enable_dlopen_self=unknown
+  enable_dlopen_self_static=unknown
+else
+  lt_cv_dlopen=no
+  lt_cv_dlopen_libs=
+
+  case $host_os in
+  beos*)
+    lt_cv_dlopen=load_add_on
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ;;
+
+  mingw* | pw32* | cegcc*)
+    lt_cv_dlopen=LoadLibrary
+    lt_cv_dlopen_libs=
+    ;;
+
+  cygwin*)
+    lt_cv_dlopen=dlopen
+    lt_cv_dlopen_libs=
+    ;;
+
+  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_n "checking for dlopen in -ldl... " >&6; }
+if ${ac_cv_lib_dl_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* 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 dlopen ();
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dl_dlopen=yes
+else
+  ac_cv_lib_dl_dlopen=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_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+  lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
+else
+
+    lt_cv_dlopen=dyld
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+
+fi
+
+    ;;
+
+  tpf*)
+    # Don't try to run any link tests for TPF.  We know it's impossible
+    # because TPF is a cross-compiler, and we know how we open DSOs.
+    lt_cv_dlopen=dlopen
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=no
+    ;;
+
+  *)
+    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_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldld  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* 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
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dld_shl_load=yes
+else
+  ac_cv_lib_dld_shl_load=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_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
+else
+  ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
+if test "x$ac_cv_func_dlopen" = xyes; then :
+  lt_cv_dlopen=dlopen
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if ${ac_cv_lib_dl_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* 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 dlopen ();
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dl_dlopen=yes
+else
+  ac_cv_lib_dl_dlopen=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_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = xyes; 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_n "checking for dlopen in -lsvld... " >&6; }
+if ${ac_cv_lib_svld_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsvld  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* 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 dlopen ();
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_svld_dlopen=yes
+else
+  ac_cv_lib_svld_dlopen=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_svld_dlopen" >&5
+$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
+if test "x$ac_cv_lib_svld_dlopen" = xyes; 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_n "checking for dld_link in -ldld... " >&6; }
+if ${ac_cv_lib_dld_dld_link+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldld  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* 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 dld_link ();
+int
+main ()
+{
+return dld_link ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dld_dld_link=yes
+else
+  ac_cv_lib_dld_dld_link=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_dld_dld_link" >&5
+$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
+if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
+  lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+    ;;
+  esac
+
+  if test no = "$lt_cv_dlopen"; then
+    enable_dlopen=no
+  else
+    enable_dlopen=yes
+  fi
+
+  case $lt_cv_dlopen in
+  dlopen)
+    save_CPPFLAGS=$CPPFLAGS
+    test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+    save_LDFLAGS=$LDFLAGS
+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+    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_n "checking whether a program can dlopen itself... " >&6; }
+if ${lt_cv_dlopen_self+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  	  if test yes = "$cross_compiling"; then :
+  lt_cv_dlopen_self=cross
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<_LT_EOF
+#line $LINENO "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+/* When -fvisibility=hidden is used, assume the code has been annotated
+   correspondingly for the symbols needed.  */
+#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+
+int fnord () { return 42; }
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else
+        {
+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+	}
+      /* dlclose (self); */
+    }
+  else
+    puts (dlerror ());
+
+  return status;
+}
+_LT_EOF
+  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" 2>/dev/null; then
+    (./conftest; exit; ) >&5 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
+      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
+      x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
+    esac
+  else :
+    # compilation failed
+    lt_cv_dlopen_self=no
+  fi
+fi
+rm -fr conftest*
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
+$as_echo "$lt_cv_dlopen_self" >&6; }
+
+    if test yes = "$lt_cv_dlopen_self"; 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_n "checking whether a statically linked program can dlopen itself... " >&6; }
+if ${lt_cv_dlopen_self_static+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  	  if test yes = "$cross_compiling"; then :
+  lt_cv_dlopen_self_static=cross
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<_LT_EOF
+#line $LINENO "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+/* When -fvisibility=hidden is used, assume the code has been annotated
+   correspondingly for the symbols needed.  */
+#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+
+int fnord () { return 42; }
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else
+        {
+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+	}
+      /* dlclose (self); */
+    }
+  else
+    puts (dlerror ());
+
+  return status;
+}
+_LT_EOF
+  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" 2>/dev/null; then
+    (./conftest; exit; ) >&5 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
+      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
+      x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
+    esac
+  else :
+    # compilation failed
+    lt_cv_dlopen_self_static=no
+  fi
+fi
+rm -fr conftest*
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
+$as_echo "$lt_cv_dlopen_self_static" >&6; }
+    fi
+
+    CPPFLAGS=$save_CPPFLAGS
+    LDFLAGS=$save_LDFLAGS
+    LIBS=$save_LIBS
+    ;;
+  esac
+
+  case $lt_cv_dlopen_self in
+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+  *) enable_dlopen_self=unknown ;;
+  esac
+
+  case $lt_cv_dlopen_self_static in
+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+  *) enable_dlopen_self_static=unknown ;;
+  esac
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+striplib=
+old_striplib=
+{ $as_echo "$as_me:${as_lineno-$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 "yes" >&6; }
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+  case $host_os in
+  darwin*)
+    if test -n "$STRIP"; then
+      striplib="$STRIP -x"
+      old_striplib="$STRIP -S"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+    ;;
+  *)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    ;;
+  esac
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+  # Report what library types will actually be built
+  { $as_echo "$as_me:${as_lineno-$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 "$can_build_shared" >&6; }
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
+$as_echo_n "checking whether to build shared libraries... " >&6; }
+  test no = "$can_build_shared" && enable_shared=no
+
+  # On AIX, shared libraries and static libraries use the same namespace, and
+  # are all built from PIC.
+  case $host_os in
+  aix3*)
+    test yes = "$enable_shared" && enable_static=no
+    if test -n "$RANLIB"; then
+      archive_cmds="$archive_cmds~\$RANLIB \$lib"
+      postinstall_cmds='$RANLIB $lib'
+    fi
+    ;;
+
+  aix[4-9]*)
+    if test ia64 != "$host_cpu"; then
+      case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+      yes,aix,yes) ;;			# shared object as lib.so file only
+      yes,svr4,*) ;;			# shared object as lib.so archive member only
+      yes,*) enable_static=no ;;	# shared object in lib.a archive as well
+      esac
+    fi
+    ;;
+  esac
+  { $as_echo "$as_me:${as_lineno-$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_n "checking whether to build static libraries... " >&6; }
+  # Make sure either enable_shared or enable_static is yes.
+  test yes = "$enable_shared" || enable_static=yes
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
+$as_echo "$enable_static" >&6; }
+
+
+
+
+fi
+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
+
+CC=$lt_save_CC
+
+      if test -n "$CXX" && ( test no != "$CXX" &&
+    ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) ||
+    (test g++ != "$CXX"))); then
+  ac_ext=cpp
+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_n "checking how to run the C++ preprocessor... " >&6; }
+if test -z "$CXXCPP"; then
+  if ${ac_cv_prog_CXXCPP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+      # Double quotes because CXXCPP needs to be expanded
+    for CXXCPP in "$CXX -E" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_cxx_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <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
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i 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
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i 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 :
+  break
+fi
+
+    done
+    ac_cv_prog_CXXCPP=$CXXCPP
+
+fi
+  CXXCPP=$ac_cv_prog_CXXCPP
+else
+  ac_cv_prog_CXXCPP=$CXXCPP
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
+$as_echo "$CXXCPP" >&6; }
+ac_preproc_ok=false
+for ac_cxx_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <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
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i 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
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i 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 :
+
+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 $? "C++ preprocessor \"$CXXCPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+
+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
+
+else
+  _lt_caught_CXX_error=yes
+fi
+
+ac_ext=cpp
+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
+
+archive_cmds_need_lc_CXX=no
+allow_undefined_flag_CXX=
+always_export_symbols_CXX=no
+archive_expsym_cmds_CXX=
+compiler_needs_object_CXX=no
+export_dynamic_flag_spec_CXX=
+hardcode_direct_CXX=no
+hardcode_direct_absolute_CXX=no
+hardcode_libdir_flag_spec_CXX=
+hardcode_libdir_separator_CXX=
+hardcode_minus_L_CXX=no
+hardcode_shlibpath_var_CXX=unsupported
+hardcode_automatic_CXX=no
+inherit_rpath_CXX=no
+module_cmds_CXX=
+module_expsym_cmds_CXX=
+link_all_deplibs_CXX=unknown
+old_archive_cmds_CXX=$old_archive_cmds
+reload_flag_CXX=$reload_flag
+reload_cmds_CXX=$reload_cmds
+no_undefined_flag_CXX=
+whole_archive_flag_spec_CXX=
+enable_shared_with_static_runtimes_CXX=no
+
+# Source file extension for C++ test sources.
+ac_ext=cpp
+
+# Object file extension for compiled C++ test sources.
+objext=o
+objext_CXX=$objext
+
+# No sense in running all these tests if we already determined that
+# the CXX compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test yes != "$_lt_caught_CXX_error"; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="int some_variable = 0;"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code='int main(int, char *[]) { return(0); }'
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+
+
+
+
+
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+
+
+  # save warnings/boilerplate of simple test code
+  ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$RM conftest*
+
+  ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$RM -r conftest*
+
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC=$CC
+  lt_save_CFLAGS=$CFLAGS
+  lt_save_LD=$LD
+  lt_save_GCC=$GCC
+  GCC=$GXX
+  lt_save_with_gnu_ld=$with_gnu_ld
+  lt_save_path_LD=$lt_cv_path_LD
+  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+  else
+    $as_unset lt_cv_prog_gnu_ld
+  fi
+  if test -n "${lt_cv_path_LDCXX+set}"; then
+    lt_cv_path_LD=$lt_cv_path_LDCXX
+  else
+    $as_unset lt_cv_path_LD
+  fi
+  test -z "${LDCXX+set}" || LD=$LDCXX
+  CC=${CXX-"c++"}
+  CFLAGS=$CXXFLAGS
+  compiler=$CC
+  compiler_CXX=$CC
+  func_cc_basename $compiler
+cc_basename=$func_cc_basename_result
+
+
+  if test -n "$compiler"; then
+    # We don't want -fno-exception when compiling C++ code, so set the
+    # no_builtin_flag separately
+    if test yes = "$GXX"; then
+      lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin'
+    else
+      lt_prog_compiler_no_builtin_flag_CXX=
+    fi
+
+    if test yes = "$GXX"; then
+      # Set up default GNU C++ configuration
+
+
+
+# Check whether --with-gnu-ld was given.
+if test "${with_gnu_ld+set}" = set; then :
+  withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes
+else
+  with_gnu_ld=no
+fi
+
+ac_prog=ld
+if test yes = "$GCC"; 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 yes = "$with_gnu_ld"; 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 ${lt_cv_path_LD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$LD"; then
+  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS=$lt_save_ifs
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      lt_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 `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
+	test no != "$with_gnu_ld" && break
+	;;
+      *)
+	test yes != "$with_gnu_ld" && break
+	;;
+      esac
+    fi
+  done
+  IFS=$lt_save_ifs
+else
+  lt_cv_path_LD=$LD # Let the user override the test with a path.
+fi
+fi
+
+LD=$lt_cv_path_LD
+if test -n "$LD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+$as_echo "$LD" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$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
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+if ${lt_cv_prog_gnu_ld+:} false; 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'*)
+  lt_cv_prog_gnu_ld=yes
+  ;;
+*)
+  lt_cv_prog_gnu_ld=no
+  ;;
+esac
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
+$as_echo "$lt_cv_prog_gnu_ld" >&6; }
+with_gnu_ld=$lt_cv_prog_gnu_ld
+
+
+
+
+
+
+
+      # Check if GNU C++ uses GNU ld as the underlying linker, since the
+      # archiving commands below assume that GNU ld is being used.
+      if test yes = "$with_gnu_ld"; then
+        archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+        archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+
+        hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
+        export_dynamic_flag_spec_CXX='$wl--export-dynamic'
+
+        # If archive_cmds runs LD, not CC, wlarc should be empty
+        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+        #     investigate it a little bit more. (MM)
+        wlarc='$wl'
+
+        # ancient GNU ld didn't support --whole-archive et. al.
+        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
+	  $GREP 'no-whole-archive' > /dev/null; then
+          whole_archive_flag_spec_CXX=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
+        else
+          whole_archive_flag_spec_CXX=
+        fi
+      else
+        with_gnu_ld=no
+        wlarc=
+
+        # A generic and very simple default shared library creation
+        # command for GNU C++ for the case where it uses the native
+        # linker, instead of GNU ld.  If possible, this setting should
+        # overridden to take advantage of the native linker features on
+        # the platform it is being used on.
+        archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+      fi
+
+      # Commands to make compiler produce verbose output that lists
+      # what "hidden" libraries, object files and flags are used when
+      # linking a shared library.
+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+
+    else
+      GXX=no
+      with_gnu_ld=no
+      wlarc=
+    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_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+    ld_shlibs_CXX=yes
+    case $host_os in
+      aix3*)
+        # FIXME: insert proper C++ library support
+        ld_shlibs_CXX=no
+        ;;
+      aix[4-9]*)
+        if test ia64 = "$host_cpu"; then
+          # On IA64, the linker does run time linking by default, so we don't
+          # have to do anything special.
+          aix_use_runtimelinking=no
+          exp_sym_flag='-Bexport'
+          no_entry_flag=
+        else
+          aix_use_runtimelinking=no
+
+          # Test if we are trying to use run time linking or normal
+          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+          # have runtime linking enabled, and use it for executables.
+          # For shared libraries, we enable/disable runtime linking
+          # depending on the kind of the shared library created -
+          # when "with_aix_soname,aix_use_runtimelinking" is:
+          # "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
+          # "aix,yes"  lib.so          shared, rtl:yes, for executables
+          #            lib.a           static archive
+          # "both,no"  lib.so.V(shr.o) shared, rtl:yes
+          #            lib.a(lib.so.V) shared, rtl:no,  for executables
+          # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+          #            lib.a(lib.so.V) shared, rtl:no
+          # "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
+          #            lib.a           static archive
+          case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+	    for ld_flag in $LDFLAGS; do
+	      case $ld_flag in
+	      *-brtl*)
+	        aix_use_runtimelinking=yes
+	        break
+	        ;;
+	      esac
+	    done
+	    if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+	      # With aix-soname=svr4, we create the lib.so.V shared archives only,
+	      # so we don't have lib.a shared libs to link our executables.
+	      # We have to force runtime linking in this case.
+	      aix_use_runtimelinking=yes
+	      LDFLAGS="$LDFLAGS -Wl,-brtl"
+	    fi
+	    ;;
+          esac
+
+          exp_sym_flag='-bexport'
+          no_entry_flag='-bnoentry'
+        fi
+
+        # When large executables or shared objects are built, AIX ld can
+        # have problems creating the table of contents.  If linking a library
+        # or program results in "error TOC overflow" add -mminimal-toc to
+        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+        archive_cmds_CXX=''
+        hardcode_direct_CXX=yes
+        hardcode_direct_absolute_CXX=yes
+        hardcode_libdir_separator_CXX=':'
+        link_all_deplibs_CXX=yes
+        file_list_spec_CXX='$wl-f,'
+        case $with_aix_soname,$aix_use_runtimelinking in
+        aix,*) ;;	# no import file
+        svr4,* | *,yes) # use import file
+          # The Import File defines what to hardcode.
+          hardcode_direct_CXX=no
+          hardcode_direct_absolute_CXX=no
+          ;;
+        esac
+
+        if test yes = "$GXX"; then
+          case $host_os in aix4.[012]|aix4.[012].*)
+          # We only want to do this on AIX 4.2 and lower, the check
+          # below for broken collect2 doesn't work under 4.3+
+	  collect2name=`$CC -print-prog-name=collect2`
+	  if test -f "$collect2name" &&
+	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	  then
+	    # We have reworked collect2
+	    :
+	  else
+	    # We have old collect2
+	    hardcode_direct_CXX=unsupported
+	    # It fails to find uninstalled libraries when the uninstalled
+	    # path is not listed in the libpath.  Setting hardcode_minus_L
+	    # to unsupported forces relinking
+	    hardcode_minus_L_CXX=yes
+	    hardcode_libdir_flag_spec_CXX='-L$libdir'
+	    hardcode_libdir_separator_CXX=
+	  fi
+          esac
+          shared_flag='-shared'
+	  if test yes = "$aix_use_runtimelinking"; then
+	    shared_flag=$shared_flag' $wl-G'
+	  fi
+	  # Need to ensure runtime linking is disabled for the traditional
+	  # shared library, or the linker may eventually find shared libraries
+	  # /with/ Import File - we do not want to mix them.
+	  shared_flag_aix='-shared'
+	  shared_flag_svr4='-shared $wl-G'
+        else
+          # not using gcc
+          if test ia64 = "$host_cpu"; then
+	  # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	  # chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+          else
+	    if test yes = "$aix_use_runtimelinking"; then
+	      shared_flag='$wl-G'
+	    else
+	      shared_flag='$wl-bM:SRE'
+	    fi
+	    shared_flag_aix='$wl-bM:SRE'
+	    shared_flag_svr4='$wl-G'
+          fi
+        fi
+
+        export_dynamic_flag_spec_CXX='$wl-bexpall'
+        # It seems that -bexpall does not export symbols beginning with
+        # underscore (_), so it is better to generate a list of symbols to
+	# export.
+        always_export_symbols_CXX=yes
+	if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
+          # Warning - without using the other runtime loading flags (-brtl),
+          # -berok will link without error, but may produce a broken library.
+          # The "-G" linker flag allows undefined symbols.
+          no_undefined_flag_CXX='-bernotok'
+          # Determine the default libpath from the value encoded in an empty
+          # executable.
+          if test set = "${lt_cv_aix_libpath+set}"; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  if ${lt_cv_aix_libpath__CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }'
+  lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$lt_cv_aix_libpath__CXX"; then
+    lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  if test -z "$lt_cv_aix_libpath__CXX"; then
+    lt_cv_aix_libpath__CXX=/usr/lib:/lib
+  fi
+
+fi
+
+  aix_libpath=$lt_cv_aix_libpath__CXX
+fi
+
+          hardcode_libdir_flag_spec_CXX='$wl-blibpath:$libdir:'"$aix_libpath"
+
+          archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
+        else
+          if test ia64 = "$host_cpu"; then
+	    hardcode_libdir_flag_spec_CXX='$wl-R $libdir:/usr/lib:/lib'
+	    allow_undefined_flag_CXX="-z nodefs"
+	    archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
+          else
+	    # Determine the default libpath from the value encoded in an
+	    # empty executable.
+	    if test set = "${lt_cv_aix_libpath+set}"; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  if ${lt_cv_aix_libpath__CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }'
+  lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$lt_cv_aix_libpath__CXX"; then
+    lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  if test -z "$lt_cv_aix_libpath__CXX"; then
+    lt_cv_aix_libpath__CXX=/usr/lib:/lib
+  fi
+
+fi
+
+  aix_libpath=$lt_cv_aix_libpath__CXX
+fi
+
+	    hardcode_libdir_flag_spec_CXX='$wl-blibpath:$libdir:'"$aix_libpath"
+	    # Warning - without using the other run time loading flags,
+	    # -berok will link without error, but may produce a broken library.
+	    no_undefined_flag_CXX=' $wl-bernotok'
+	    allow_undefined_flag_CXX=' $wl-berok'
+	    if test yes = "$with_gnu_ld"; then
+	      # We only use this code for GNU lds that support --whole-archive.
+	      whole_archive_flag_spec_CXX='$wl--whole-archive$convenience $wl--no-whole-archive'
+	    else
+	      # Exported symbols can be pulled into shared objects from archives
+	      whole_archive_flag_spec_CXX='$convenience'
+	    fi
+	    archive_cmds_need_lc_CXX=yes
+	    archive_expsym_cmds_CXX='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+	    # -brtl affects multiple linker settings, -berok does not and is overridden later
+	    compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`'
+	    if test svr4 != "$with_aix_soname"; then
+	      # This is similar to how AIX traditionally builds its shared
+	      # libraries. Need -bnortl late, we may have -brtl in LDFLAGS.
+	      archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+	    fi
+	    if test aix != "$with_aix_soname"; then
+	      archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+	    else
+	      # used by -dlpreopen to get the symbols
+	      archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
+	    fi
+	    archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$RM -r $output_objdir/$realname.d'
+          fi
+        fi
+        ;;
+
+      beos*)
+	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	  allow_undefined_flag_CXX=unsupported
+	  # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	  # support --undefined.  This deserves some investigation.  FIXME
+	  archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	else
+	  ld_shlibs_CXX=no
+	fi
+	;;
+
+      chorus*)
+        case $cc_basename in
+          *)
+	  # FIXME: insert proper C++ library support
+	  ld_shlibs_CXX=no
+	  ;;
+        esac
+        ;;
+
+      cygwin* | mingw* | pw32* | cegcc*)
+	case $GXX,$cc_basename in
+	,cl* | no,cl*)
+	  # Native MSVC
+	  # hardcode_libdir_flag_spec is actually meaningless, as there is
+	  # no search path for DLLs.
+	  hardcode_libdir_flag_spec_CXX=' '
+	  allow_undefined_flag_CXX=unsupported
+	  always_export_symbols_CXX=yes
+	  file_list_spec_CXX='@'
+	  # Tell ltmain to make .lib files, not .a files.
+	  libext=lib
+	  # Tell ltmain to make .dll files, not .so files.
+	  shrext_cmds=.dll
+	  # FIXME: Setting linknames here is a bad hack.
+	  archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+	  archive_expsym_cmds_CXX='if   test DEF = "`$SED -n     -e '\''s/^[	 ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
+              cp "$export_symbols" "$output_objdir/$soname.def";
+              echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+            else
+              $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+            fi~
+            $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+            linknames='
+	  # The linker will not automatically build a static lib if we build a DLL.
+	  # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true'
+	  enable_shared_with_static_runtimes_CXX=yes
+	  # Don't use ranlib
+	  old_postinstall_cmds_CXX='chmod 644 $oldlib'
+	  postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~
+            lt_tool_outputfile="@TOOL_OUTPUT@"~
+            case $lt_outputfile in
+              *.exe|*.EXE) ;;
+              *)
+                lt_outputfile=$lt_outputfile.exe
+                lt_tool_outputfile=$lt_tool_outputfile.exe
+                ;;
+            esac~
+            func_to_tool_file "$lt_outputfile"~
+            if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
+              $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+              $RM "$lt_outputfile.manifest";
+            fi'
+	  ;;
+	*)
+	  # g++
+	  # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
+	  # as there is no search path for DLLs.
+	  hardcode_libdir_flag_spec_CXX='-L$libdir'
+	  export_dynamic_flag_spec_CXX='$wl--export-all-symbols'
+	  allow_undefined_flag_CXX=unsupported
+	  always_export_symbols_CXX=no
+	  enable_shared_with_static_runtimes_CXX=yes
+
+	  if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	    # If the export-symbols file already is a .def file, use it as
+	    # is; otherwise, prepend EXPORTS...
+	    archive_expsym_cmds_CXX='if   test DEF = "`$SED -n     -e '\''s/^[	 ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
+              cp $export_symbols $output_objdir/$soname.def;
+            else
+              echo EXPORTS > $output_objdir/$soname.def;
+              cat $export_symbols >> $output_objdir/$soname.def;
+            fi~
+            $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	  else
+	    ld_shlibs_CXX=no
+	  fi
+	  ;;
+	esac
+	;;
+      darwin* | rhapsody*)
+
+
+  archive_cmds_need_lc_CXX=no
+  hardcode_direct_CXX=no
+  hardcode_automatic_CXX=yes
+  hardcode_shlibpath_var_CXX=unsupported
+  if test yes = "$lt_cv_ld_force_load"; then
+    whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+
+  else
+    whole_archive_flag_spec_CXX=''
+  fi
+  link_all_deplibs_CXX=yes
+  allow_undefined_flag_CXX=$_lt_dar_allow_undefined
+  case $cc_basename in
+     ifort*|nagfor*) _lt_dar_can_shared=yes ;;
+     *) _lt_dar_can_shared=$GCC ;;
+  esac
+  if test yes = "$_lt_dar_can_shared"; then
+    output_verbose_link_cmd=func_echo_all
+    archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
+    module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
+    archive_expsym_cmds_CXX="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
+    module_expsym_cmds_CXX="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
+       if test yes != "$lt_cv_apple_cc_single_mod"; then
+      archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil"
+      archive_expsym_cmds_CXX="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil"
+    fi
+
+  else
+  ld_shlibs_CXX=no
+  fi
+
+	;;
+
+      os2*)
+	hardcode_libdir_flag_spec_CXX='-L$libdir'
+	hardcode_minus_L_CXX=yes
+	allow_undefined_flag_CXX=unsupported
+	shrext_cmds=.dll
+	archive_cmds_CXX='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	  $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	  $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	  $ECHO EXPORTS >> $output_objdir/$libname.def~
+	  emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	  emximp -o $lib $output_objdir/$libname.def'
+	archive_expsym_cmds_CXX='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	  $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	  $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	  $ECHO EXPORTS >> $output_objdir/$libname.def~
+	  prefix_cmds="$SED"~
+	  if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	    prefix_cmds="$prefix_cmds -e 1d";
+	  fi~
+	  prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+	  cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	  emximp -o $lib $output_objdir/$libname.def'
+	old_archive_From_new_cmds_CXX='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+	enable_shared_with_static_runtimes_CXX=yes
+	;;
+
+      dgux*)
+        case $cc_basename in
+          ec++*)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          ghcx*)
+	    # Green Hills C++ Compiler
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+        esac
+        ;;
+
+      freebsd2.*)
+        # C++ shared libraries reported to be fairly broken before
+	# switch to ELF
+        ld_shlibs_CXX=no
+        ;;
+
+      freebsd-elf*)
+        archive_cmds_need_lc_CXX=no
+        ;;
+
+      freebsd* | dragonfly*)
+        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+        # conventions
+        ld_shlibs_CXX=yes
+        ;;
+
+      haiku*)
+        archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+        link_all_deplibs_CXX=yes
+        ;;
+
+      hpux9*)
+        hardcode_libdir_flag_spec_CXX='$wl+b $wl$libdir'
+        hardcode_libdir_separator_CXX=:
+        export_dynamic_flag_spec_CXX='$wl-E'
+        hardcode_direct_CXX=yes
+        hardcode_minus_L_CXX=yes # Not in the search PATH,
+				             # but as the default
+				             # location of the library.
+
+        case $cc_basename in
+          CC*)
+            # FIXME: insert proper C++ library support
+            ld_shlibs_CXX=no
+            ;;
+          aCC*)
+            archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
+            # Commands to make compiler produce verbose output that lists
+            # what "hidden" libraries, object files and flags are used when
+            # linking a shared library.
+            #
+            # There doesn't appear to be a way to prevent this compiler from
+            # explicitly linking system object files so we need to strip them
+            # from the output so that they don't get included in the library
+            # dependencies.
+            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+            ;;
+          *)
+            if test yes = "$GXX"; then
+              archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
+            else
+              # FIXME: insert proper C++ library support
+              ld_shlibs_CXX=no
+            fi
+            ;;
+        esac
+        ;;
+
+      hpux10*|hpux11*)
+        if test no = "$with_gnu_ld"; then
+	  hardcode_libdir_flag_spec_CXX='$wl+b $wl$libdir'
+	  hardcode_libdir_separator_CXX=:
+
+          case $host_cpu in
+            hppa*64*|ia64*)
+              ;;
+            *)
+	      export_dynamic_flag_spec_CXX='$wl-E'
+              ;;
+          esac
+        fi
+        case $host_cpu in
+          hppa*64*|ia64*)
+            hardcode_direct_CXX=no
+            hardcode_shlibpath_var_CXX=no
+            ;;
+          *)
+            hardcode_direct_CXX=yes
+            hardcode_direct_absolute_CXX=yes
+            hardcode_minus_L_CXX=yes # Not in the search PATH,
+					         # but as the default
+					         # location of the library.
+            ;;
+        esac
+
+        case $cc_basename in
+          CC*)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          aCC*)
+	    case $host_cpu in
+	      hppa*64*)
+	        archive_cmds_CXX='$CC -b $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	      ia64*)
+	        archive_cmds_CXX='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	      *)
+	        archive_cmds_CXX='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	    esac
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    ;;
+          *)
+	    if test yes = "$GXX"; then
+	      if test no = "$with_gnu_ld"; then
+	        case $host_cpu in
+	          hppa*64*)
+	            archive_cmds_CXX='$CC -shared -nostdlib -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	          ia64*)
+	            archive_cmds_CXX='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	          *)
+	            archive_cmds_CXX='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	        esac
+	      fi
+	    else
+	      # FIXME: insert proper C++ library support
+	      ld_shlibs_CXX=no
+	    fi
+	    ;;
+        esac
+        ;;
+
+      interix[3-9]*)
+	hardcode_direct_CXX=no
+	hardcode_shlibpath_var_CXX=no
+	hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
+	export_dynamic_flag_spec_CXX='$wl-E'
+	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+	# Instead, shared libraries are loaded at an image base (0x10000000 by
+	# default) and relocated if they conflict, which is a slow very memory
+	# consuming and fragmenting process.  To avoid this, we pick a random,
+	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+	archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	archive_expsym_cmds_CXX='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	;;
+      irix5* | irix6*)
+        case $cc_basename in
+          CC*)
+	    # SGI C++
+	    archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
+	    # necessary to make sure instantiated templates are included
+	    # in the archive.
+	    old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs'
+	    ;;
+          *)
+	    if test yes = "$GXX"; then
+	      if test no = "$with_gnu_ld"; then
+	        archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+	      else
+	        archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib'
+	      fi
+	    fi
+	    link_all_deplibs_CXX=yes
+	    ;;
+        esac
+        hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
+        hardcode_libdir_separator_CXX=:
+        inherit_rpath_CXX=yes
+        ;;
+
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+        case $cc_basename in
+          KCC*)
+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	    # KCC will only create a shared library if the output file
+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
+	    # to its proper name (with version) after linking.
+	    archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+	    archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib $wl-retain-symbols-file,$export_symbols; mv \$templib $lib'
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+
+	    hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
+	    export_dynamic_flag_spec_CXX='$wl--export-dynamic'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
+	    old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
+	    ;;
+	  icpc* | ecpc* )
+	    # Intel C++
+	    with_gnu_ld=yes
+	    # version 8.0 and above of icpc choke on multiply defined symbols
+	    # if we add $predep_objects and $postdep_objects, however 7.1 and
+	    # earlier do not add the objects themselves.
+	    case `$CC -V 2>&1` in
+	      *"Version 7."*)
+	        archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+		archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+		;;
+	      *)  # Version 8.0 or newer
+	        tmp_idyn=
+	        case $host_cpu in
+		  ia64*) tmp_idyn=' -i_dynamic';;
+		esac
+	        archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+		archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+		;;
+	    esac
+	    archive_cmds_need_lc_CXX=no
+	    hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
+	    export_dynamic_flag_spec_CXX='$wl--export-dynamic'
+	    whole_archive_flag_spec_CXX='$wl--whole-archive$convenience $wl--no-whole-archive'
+	    ;;
+          pgCC* | pgcpp*)
+            # Portland Group C++ compiler
+	    case `$CC -V` in
+	    *pgCC\ [1-5].* | *pgcpp\ [1-5].*)
+	      prelink_cmds_CXX='tpldir=Template.dir~
+               rm -rf $tpldir~
+               $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
+               compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
+	      old_archive_cmds_CXX='tpldir=Template.dir~
+                rm -rf $tpldir~
+                $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
+                $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
+                $RANLIB $oldlib'
+	      archive_cmds_CXX='tpldir=Template.dir~
+                rm -rf $tpldir~
+                $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+                $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+	      archive_expsym_cmds_CXX='tpldir=Template.dir~
+                rm -rf $tpldir~
+                $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+                $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+	      ;;
+	    *) # Version 6 and above use weak symbols
+	      archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+	      archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+	      ;;
+	    esac
+
+	    hardcode_libdir_flag_spec_CXX='$wl--rpath $wl$libdir'
+	    export_dynamic_flag_spec_CXX='$wl--export-dynamic'
+	    whole_archive_flag_spec_CXX='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+            ;;
+	  cxx*)
+	    # Compaq C++
+	    archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+	    archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname  -o $lib $wl-retain-symbols-file $wl$export_symbols'
+
+	    runpath_var=LD_RUN_PATH
+	    hardcode_libdir_flag_spec_CXX='-rpath $libdir'
+	    hardcode_libdir_separator_CXX=:
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
+	    ;;
+	  xl* | mpixl* | bgxl*)
+	    # IBM XL 8.0 on PPC, with GNU ld
+	    hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
+	    export_dynamic_flag_spec_CXX='$wl--export-dynamic'
+	    archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	    if test yes = "$supports_anon_versioning"; then
+	      archive_expsym_cmds_CXX='echo "{ global:" > $output_objdir/$libname.ver~
+                cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+                echo "local: *; };" >> $output_objdir/$libname.ver~
+                $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
+	    fi
+	    ;;
+	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      no_undefined_flag_CXX=' -zdefs'
+	      archive_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	      archive_expsym_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols'
+	      hardcode_libdir_flag_spec_CXX='-R$libdir'
+	      whole_archive_flag_spec_CXX='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	      compiler_needs_object_CXX=yes
+
+	      # Not sure whether something based on
+	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+	      # would be better.
+	      output_verbose_link_cmd='func_echo_all'
+
+	      # Archives containing C++ object files must be created using
+	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	      # necessary to make sure instantiated templates are included
+	      # in the archive.
+	      old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
+	      ;;
+	    esac
+	    ;;
+	esac
+	;;
+
+      lynxos*)
+        # FIXME: insert proper C++ library support
+	ld_shlibs_CXX=no
+	;;
+
+      m88k*)
+        # FIXME: insert proper C++ library support
+        ld_shlibs_CXX=no
+	;;
+
+      mvs*)
+        case $cc_basename in
+          cxx*)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+	  *)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+	esac
+	;;
+
+      netbsd*)
+        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	  archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+	  wlarc=
+	  hardcode_libdir_flag_spec_CXX='-R$libdir'
+	  hardcode_direct_CXX=yes
+	  hardcode_shlibpath_var_CXX=no
+	fi
+	# Workaround some broken pre-1.5 toolchains
+	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+	;;
+
+      *nto* | *qnx*)
+        ld_shlibs_CXX=yes
+	;;
+
+      openbsd* | bitrig*)
+	if test -f /usr/libexec/ld.so; then
+	  hardcode_direct_CXX=yes
+	  hardcode_shlibpath_var_CXX=no
+	  hardcode_direct_absolute_CXX=yes
+	  archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+	  hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
+	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then
+	    archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib'
+	    export_dynamic_flag_spec_CXX='$wl-E'
+	    whole_archive_flag_spec_CXX=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
+	  fi
+	  output_verbose_link_cmd=func_echo_all
+	else
+	  ld_shlibs_CXX=no
+	fi
+	;;
+
+      osf3* | osf4* | osf5*)
+        case $cc_basename in
+          KCC*)
+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	    # KCC will only create a shared library if the output file
+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
+	    # to its proper name (with version) after linking.
+	    archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+	    hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
+	    hardcode_libdir_separator_CXX=:
+
+	    # Archives containing C++ object files must be created using
+	    # the KAI C++ compiler.
+	    case $host in
+	      osf3*) old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' ;;
+	      *) old_archive_cmds_CXX='$CC -o $oldlib $oldobjs' ;;
+	    esac
+	    ;;
+          RCC*)
+	    # Rational C++ 2.4.1
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          cxx*)
+	    case $host in
+	      osf3*)
+	        allow_undefined_flag_CXX=' $wl-expect_unresolved $wl\*'
+	        archive_cmds_CXX='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $soname `test -n "$verstring" && func_echo_all "$wl-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+	        hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
+		;;
+	      *)
+	        allow_undefined_flag_CXX=' -expect_unresolved \*'
+	        archive_cmds_CXX='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+	        archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+                  echo "-hidden">> $lib.exp~
+                  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~
+                  $RM $lib.exp'
+	        hardcode_libdir_flag_spec_CXX='-rpath $libdir'
+		;;
+	    esac
+
+	    hardcode_libdir_separator_CXX=:
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    ;;
+	  *)
+	    if test yes,no = "$GXX,$with_gnu_ld"; then
+	      allow_undefined_flag_CXX=' $wl-expect_unresolved $wl\*'
+	      case $host in
+	        osf3*)
+	          archive_cmds_CXX='$CC -shared -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+		  ;;
+	        *)
+	          archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+		  ;;
+	      esac
+
+	      hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
+	      hardcode_libdir_separator_CXX=:
+
+	      # Commands to make compiler produce verbose output that lists
+	      # what "hidden" libraries, object files and flags are used when
+	      # linking a shared library.
+	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+
+	    else
+	      # FIXME: insert proper C++ library support
+	      ld_shlibs_CXX=no
+	    fi
+	    ;;
+        esac
+        ;;
+
+      psos*)
+        # FIXME: insert proper C++ library support
+        ld_shlibs_CXX=no
+        ;;
+
+      sunos4*)
+        case $cc_basename in
+          CC*)
+	    # Sun C++ 4.x
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          lcc*)
+	    # Lucid
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+        esac
+        ;;
+
+      solaris*)
+        case $cc_basename in
+          CC* | sunCC*)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+            archive_cmds_need_lc_CXX=yes
+	    no_undefined_flag_CXX=' -zdefs'
+	    archive_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	    archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+              $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	    hardcode_libdir_flag_spec_CXX='-R$libdir'
+	    hardcode_shlibpath_var_CXX=no
+	    case $host_os in
+	      solaris2.[0-5] | solaris2.[0-5].*) ;;
+	      *)
+		# The compiler driver will combine and reorder linker options,
+		# but understands '-z linker_flag'.
+	        # Supported since Solaris 2.6 (maybe 2.5.1?)
+		whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract'
+	        ;;
+	    esac
+	    link_all_deplibs_CXX=yes
+
+	    output_verbose_link_cmd='func_echo_all'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	    # necessary to make sure instantiated templates are included
+	    # in the archive.
+	    old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
+	    ;;
+          gcx*)
+	    # Green Hills C++ Compiler
+	    archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
+
+	    # The C++ compiler must be used to create the archive.
+	    old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+	    ;;
+          *)
+	    # GNU C++ compiler with Solaris linker
+	    if test yes,no = "$GXX,$with_gnu_ld"; then
+	      no_undefined_flag_CXX=' $wl-z ${wl}defs'
+	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
+	        archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
+	        archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+                  $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	        # Commands to make compiler produce verbose output that lists
+	        # what "hidden" libraries, object files and flags are used when
+	        # linking a shared library.
+	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	      else
+	        # g++ 2.7 appears to require '-G' NOT '-shared' on this
+	        # platform.
+	        archive_cmds_CXX='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
+	        archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+                  $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	        # Commands to make compiler produce verbose output that lists
+	        # what "hidden" libraries, object files and flags are used when
+	        # linking a shared library.
+	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	      fi
+
+	      hardcode_libdir_flag_spec_CXX='$wl-R $wl$libdir'
+	      case $host_os in
+		solaris2.[0-5] | solaris2.[0-5].*) ;;
+		*)
+		  whole_archive_flag_spec_CXX='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
+		  ;;
+	      esac
+	    fi
+	    ;;
+        esac
+        ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+      no_undefined_flag_CXX='$wl-z,text'
+      archive_cmds_need_lc_CXX=no
+      hardcode_shlibpath_var_CXX=no
+      runpath_var='LD_RUN_PATH'
+
+      case $cc_basename in
+        CC*)
+	  archive_cmds_CXX='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds_CXX='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  archive_cmds_CXX='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds_CXX='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+      esac
+      ;;
+
+      sysv5* | sco3.2v5* | sco5v6*)
+	# Note: We CANNOT use -z defs as we might desire, because we do not
+	# link with -lc, and that would cause any symbols used from libc to
+	# always be unresolved, which means just about no library would
+	# ever link correctly.  If we're not using GNU ld we use -z text
+	# though, which does catch some bad symbols but isn't as heavy-handed
+	# as -z defs.
+	no_undefined_flag_CXX='$wl-z,text'
+	allow_undefined_flag_CXX='$wl-z,nodefs'
+	archive_cmds_need_lc_CXX=no
+	hardcode_shlibpath_var_CXX=no
+	hardcode_libdir_flag_spec_CXX='$wl-R,$libdir'
+	hardcode_libdir_separator_CXX=':'
+	link_all_deplibs_CXX=yes
+	export_dynamic_flag_spec_CXX='$wl-Bexport'
+	runpath_var='LD_RUN_PATH'
+
+	case $cc_basename in
+          CC*)
+	    archive_cmds_CXX='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    archive_expsym_cmds_CXX='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    old_archive_cmds_CXX='$CC -Tprelink_objects $oldobjs~
+              '"$old_archive_cmds_CXX"
+	    reload_cmds_CXX='$CC -Tprelink_objects $reload_objs~
+              '"$reload_cmds_CXX"
+	    ;;
+	  *)
+	    archive_cmds_CXX='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    archive_expsym_cmds_CXX='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    ;;
+	esac
+      ;;
+
+      tandem*)
+        case $cc_basename in
+          NCC*)
+	    # NonStop-UX NCC 3.20
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+        esac
+        ;;
+
+      vxworks*)
+        # FIXME: insert proper C++ library support
+        ld_shlibs_CXX=no
+        ;;
+
+      *)
+        # FIXME: insert proper C++ library support
+        ld_shlibs_CXX=no
+        ;;
+    esac
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
+$as_echo "$ld_shlibs_CXX" >&6; }
+    test no = "$ld_shlibs_CXX" && can_build_shared=no
+
+    GCC_CXX=$GXX
+    LD_CXX=$LD
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    # Dependencies to place before and after the object being linked:
+predep_objects_CXX=
+postdep_objects_CXX=
+predeps_CXX=
+postdeps_CXX=
+compiler_lib_search_path_CXX=
+
+cat > conftest.$ac_ext <<_LT_EOF
+class Foo
+{
+public:
+  Foo (void) { a = 0; }
+private:
+  int a;
+};
+_LT_EOF
+
+
+_lt_libdeps_save_CFLAGS=$CFLAGS
+case "$CC $CFLAGS " in #(
+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
+esac
+
+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
+  # Parse the compiler output and extract the necessary
+  # objects, libraries and library flags.
+
+  # Sentinel used to keep track of whether or not we are before
+  # the conftest object file.
+  pre_test_object_deps_done=no
+
+  for p in `eval "$output_verbose_link_cmd"`; do
+    case $prev$p in
+
+    -L* | -R* | -l*)
+       # Some compilers place space between "-{L,R}" and the path.
+       # Remove the space.
+       if test x-L = "$p" ||
+          test x-R = "$p"; then
+	 prev=$p
+	 continue
+       fi
+
+       # Expand the sysroot to ease extracting the directories later.
+       if test -z "$prev"; then
+         case $p in
+         -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
+         -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
+         -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
+         esac
+       fi
+       case $p in
+       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
+       esac
+       if test no = "$pre_test_object_deps_done"; then
+	 case $prev in
+	 -L | -R)
+	   # Internal compiler library paths should come after those
+	   # provided the user.  The postdeps already come after the
+	   # user supplied libs so there is no need to process them.
+	   if test -z "$compiler_lib_search_path_CXX"; then
+	     compiler_lib_search_path_CXX=$prev$p
+	   else
+	     compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} $prev$p"
+	   fi
+	   ;;
+	 # The "-l" case would never come before the object being
+	 # linked, so don't bother handling this case.
+	 esac
+       else
+	 if test -z "$postdeps_CXX"; then
+	   postdeps_CXX=$prev$p
+	 else
+	   postdeps_CXX="${postdeps_CXX} $prev$p"
+	 fi
+       fi
+       prev=
+       ;;
+
+    *.lto.$objext) ;; # Ignore GCC LTO objects
+    *.$objext)
+       # This assumes that the test object file only shows up
+       # once in the compiler output.
+       if test "$p" = "conftest.$objext"; then
+	 pre_test_object_deps_done=yes
+	 continue
+       fi
+
+       if test no = "$pre_test_object_deps_done"; then
+	 if test -z "$predep_objects_CXX"; then
+	   predep_objects_CXX=$p
+	 else
+	   predep_objects_CXX="$predep_objects_CXX $p"
+	 fi
+       else
+	 if test -z "$postdep_objects_CXX"; then
+	   postdep_objects_CXX=$p
+	 else
+	   postdep_objects_CXX="$postdep_objects_CXX $p"
+	 fi
+       fi
+       ;;
+
+    *) ;; # Ignore the rest.
+
+    esac
+  done
+
+  # Clean up.
+  rm -f a.out a.exe
+else
+  echo "libtool.m4: error: problem compiling CXX test program"
+fi
+
+$RM -f confest.$objext
+CFLAGS=$_lt_libdeps_save_CFLAGS
+
+# PORTME: override above test on systems where it is broken
+case $host_os in
+interix[3-9]*)
+  # Interix 3.5 installs completely hosed .la files for C++, so rather than
+  # hack all around it, let's just trust "g++" to DTRT.
+  predep_objects_CXX=
+  postdep_objects_CXX=
+  postdeps_CXX=
+  ;;
+esac
+
+
+case " $postdeps_CXX " in
+*" -lc "*) archive_cmds_need_lc_CXX=no ;;
+esac
+ compiler_lib_search_dirs_CXX=
+if test -n "${compiler_lib_search_path_CXX}"; then
+ compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | $SED -e 's! -L! !g' -e 's!^ !!'`
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    lt_prog_compiler_wl_CXX=
+lt_prog_compiler_pic_CXX=
+lt_prog_compiler_static_CXX=
+
+
+  # C++ specific cases for pic, static, wl, etc.
+  if test yes = "$GXX"; then
+    lt_prog_compiler_wl_CXX='-Wl,'
+    lt_prog_compiler_static_CXX='-static'
+
+    case $host_os in
+    aix*)
+      # All AIX code is PIC.
+      if test ia64 = "$host_cpu"; then
+	# AIX 5 now supports IA64 processor
+	lt_prog_compiler_static_CXX='-Bstatic'
+      fi
+      lt_prog_compiler_pic_CXX='-fPIC'
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            lt_prog_compiler_pic_CXX='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the '-m68020' flag to GCC prevents building anything better,
+            # like '-m68040'.
+            lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+    mingw* | cygwin* | os2* | pw32* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
+      case $host_os in
+      os2*)
+	lt_prog_compiler_static_CXX='$wl-static'
+	;;
+      esac
+      ;;
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      lt_prog_compiler_pic_CXX='-fno-common'
+      ;;
+    *djgpp*)
+      # DJGPP does not support shared libraries at all
+      lt_prog_compiler_pic_CXX=
+      ;;
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      lt_prog_compiler_static_CXX=
+      ;;
+    interix[3-9]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	lt_prog_compiler_pic_CXX=-Kconform_pic
+      fi
+      ;;
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	;;
+      *)
+	lt_prog_compiler_pic_CXX='-fPIC'
+	;;
+      esac
+      ;;
+    *qnx* | *nto*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      lt_prog_compiler_pic_CXX='-fPIC -shared'
+      ;;
+    *)
+      lt_prog_compiler_pic_CXX='-fPIC'
+      ;;
+    esac
+  else
+    case $host_os in
+      aix[4-9]*)
+	# All AIX code is PIC.
+	if test ia64 = "$host_cpu"; then
+	  # AIX 5 now supports IA64 processor
+	  lt_prog_compiler_static_CXX='-Bstatic'
+	else
+	  lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp'
+	fi
+	;;
+      chorus*)
+	case $cc_basename in
+	cxch68*)
+	  # Green Hills C++ Compiler
+	  # _LT_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+	  ;;
+	esac
+	;;
+      mingw* | cygwin* | os2* | pw32* | cegcc*)
+	# This hack is so that the source file can tell whether it is being
+	# built for inclusion in a dll (and should export symbols for example).
+	lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
+	;;
+      dgux*)
+	case $cc_basename in
+	  ec++*)
+	    lt_prog_compiler_pic_CXX='-KPIC'
+	    ;;
+	  ghcx*)
+	    # Green Hills C++ Compiler
+	    lt_prog_compiler_pic_CXX='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      freebsd* | dragonfly*)
+	# FreeBSD uses GNU C++
+	;;
+      hpux9* | hpux10* | hpux11*)
+	case $cc_basename in
+	  CC*)
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_static_CXX='$wl-a ${wl}archive'
+	    if test ia64 != "$host_cpu"; then
+	      lt_prog_compiler_pic_CXX='+Z'
+	    fi
+	    ;;
+	  aCC*)
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_static_CXX='$wl-a ${wl}archive'
+	    case $host_cpu in
+	    hppa*64*|ia64*)
+	      # +Z the default
+	      ;;
+	    *)
+	      lt_prog_compiler_pic_CXX='+Z'
+	      ;;
+	    esac
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      interix*)
+	# This is c89, which is MS Visual C++ (no shared libs)
+	# Anyone wants to do a port?
+	;;
+      irix5* | irix6* | nonstopux*)
+	case $cc_basename in
+	  CC*)
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_static_CXX='-non_shared'
+	    # CC pic flag -KPIC is the default.
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+	case $cc_basename in
+	  KCC*)
+	    # KAI C++ Compiler
+	    lt_prog_compiler_wl_CXX='--backend -Wl,'
+	    lt_prog_compiler_pic_CXX='-fPIC'
+	    ;;
+	  ecpc* )
+	    # old Intel C++ for x86_64, which still supported -KPIC.
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_pic_CXX='-KPIC'
+	    lt_prog_compiler_static_CXX='-static'
+	    ;;
+	  icpc* )
+	    # Intel C++, used to be incompatible with GCC.
+	    # ICC 10 doesn't accept -KPIC any more.
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_pic_CXX='-fPIC'
+	    lt_prog_compiler_static_CXX='-static'
+	    ;;
+	  pgCC* | pgcpp*)
+	    # Portland Group C++ compiler
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_pic_CXX='-fpic'
+	    lt_prog_compiler_static_CXX='-Bstatic'
+	    ;;
+	  cxx*)
+	    # Compaq C++
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    lt_prog_compiler_pic_CXX=
+	    lt_prog_compiler_static_CXX='-non_shared'
+	    ;;
+	  xlc* | xlC* | bgxl[cC]* | mpixl[cC]*)
+	    # IBM XL 8.0, 9.0 on PPC and BlueGene
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_pic_CXX='-qpic'
+	    lt_prog_compiler_static_CXX='-qstaticlink'
+	    ;;
+	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      lt_prog_compiler_pic_CXX='-KPIC'
+	      lt_prog_compiler_static_CXX='-Bstatic'
+	      lt_prog_compiler_wl_CXX='-Qoption ld '
+	      ;;
+	    esac
+	    ;;
+	esac
+	;;
+      lynxos*)
+	;;
+      m88k*)
+	;;
+      mvs*)
+	case $cc_basename in
+	  cxx*)
+	    lt_prog_compiler_pic_CXX='-W c,exportall'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      netbsd*)
+	;;
+      *qnx* | *nto*)
+        # QNX uses GNU C++, but need to define -shared option too, otherwise
+        # it will coredump.
+        lt_prog_compiler_pic_CXX='-fPIC -shared'
+        ;;
+      osf3* | osf4* | osf5*)
+	case $cc_basename in
+	  KCC*)
+	    lt_prog_compiler_wl_CXX='--backend -Wl,'
+	    ;;
+	  RCC*)
+	    # Rational C++ 2.4.1
+	    lt_prog_compiler_pic_CXX='-pic'
+	    ;;
+	  cxx*)
+	    # Digital/Compaq C++
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    lt_prog_compiler_pic_CXX=
+	    lt_prog_compiler_static_CXX='-non_shared'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      psos*)
+	;;
+      solaris*)
+	case $cc_basename in
+	  CC* | sunCC*)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+	    lt_prog_compiler_pic_CXX='-KPIC'
+	    lt_prog_compiler_static_CXX='-Bstatic'
+	    lt_prog_compiler_wl_CXX='-Qoption ld '
+	    ;;
+	  gcx*)
+	    # Green Hills C++ Compiler
+	    lt_prog_compiler_pic_CXX='-PIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sunos4*)
+	case $cc_basename in
+	  CC*)
+	    # Sun C++ 4.x
+	    lt_prog_compiler_pic_CXX='-pic'
+	    lt_prog_compiler_static_CXX='-Bstatic'
+	    ;;
+	  lcc*)
+	    # Lucid
+	    lt_prog_compiler_pic_CXX='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+	case $cc_basename in
+	  CC*)
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_pic_CXX='-KPIC'
+	    lt_prog_compiler_static_CXX='-Bstatic'
+	    ;;
+	esac
+	;;
+      tandem*)
+	case $cc_basename in
+	  NCC*)
+	    # NonStop-UX NCC 3.20
+	    lt_prog_compiler_pic_CXX='-KPIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      vxworks*)
+	;;
+      *)
+	lt_prog_compiler_can_build_shared_CXX=no
+	;;
+    esac
+  fi
+
+case $host_os in
+  # For platforms that do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    lt_prog_compiler_pic_CXX=
+    ;;
+  *)
+    lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
+    ;;
+esac
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+if ${lt_cv_prog_compiler_pic_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; }
+lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX
+
+#
+# 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_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }
+if ${lt_cv_prog_compiler_pic_works_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_pic_works_CXX=no
+   ac_outfile=conftest.$ac_objext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"  ## exclude from sc_useless_quotes_in_assignment
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -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:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $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.
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_pic_works_CXX=yes
+     fi
+   fi
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
+
+if test yes = "$lt_cv_prog_compiler_pic_works_CXX"; then
+    case $lt_prog_compiler_pic_CXX in
+     "" | " "*) ;;
+     *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
+     esac
+else
+    lt_prog_compiler_pic_CXX=
+     lt_prog_compiler_can_build_shared_CXX=no
+fi
+
+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_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if ${lt_cv_prog_compiler_static_works_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_static_works_CXX=no
+   save_LDFLAGS=$LDFLAGS
+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&5
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_cv_prog_compiler_static_works_CXX=yes
+       fi
+     else
+       lt_cv_prog_compiler_static_works_CXX=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS=$save_LDFLAGS
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
+
+if test yes = "$lt_cv_prog_compiler_static_works_CXX"; then
+    :
+else
+    lt_prog_compiler_static_CXX=
+fi
+
+
+
+
+    { $as_echo "$as_me:${as_lineno-$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 :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_c_o_CXX=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -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:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $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
+     # So say no if there are warnings
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_c_o_CXX=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$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_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if ${lt_cv_prog_compiler_c_o_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_c_o_CXX=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -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:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $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
+     # So say no if there are warnings
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_c_o_CXX=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
+
+
+
+
+hard_links=nottested
+if test no = "$lt_cv_prog_compiler_c_o_CXX" && test no != "$need_locks"; 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_n "checking if we can lock with hard links... " >&6; }
+  hard_links=yes
+  $RM conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  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 "$hard_links" >&6; }
+  if test no = "$hard_links"; 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: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+
+
+
+    { $as_echo "$as_me:${as_lineno-$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'
+  exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+  case $host_os in
+  aix[4-9]*)
+    # If we're using GNU nm, then we don't want the "-C" option.
+    # -C means demangle to GNU nm, but means don't demangle to AIX nm.
+    # Without the "-l" option, or with the "-B" option, AIX nm treats
+    # weak defined symbols like other global defined symbols, whereas
+    # GNU nm marks them as "W".
+    # While the 'weak' keyword is ignored in the Export File, we need
+    # it in the Import File for the 'aix-soname' feature, so we have
+    # to replace the "-B" option with "-P" for AIX nm.
+    if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+      export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
+    else
+      export_symbols_cmds_CXX='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
+    fi
+    ;;
+  pw32*)
+    export_symbols_cmds_CXX=$ltdll_cmds
+    ;;
+  cygwin* | mingw* | cegcc*)
+    case $cc_basename in
+    cl*)
+      exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+      ;;
+    *)
+      export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
+      exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
+      ;;
+    esac
+    ;;
+  *)
+    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+    ;;
+  esac
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
+$as_echo "$ld_shlibs_CXX" >&6; }
+test no = "$ld_shlibs_CXX" && can_build_shared=no
+
+with_gnu_ld_CXX=$with_gnu_ld
+
+
+
+
+
+
+#
+# Do we need to explicitly link libc?
+#
+case "x$archive_cmds_need_lc_CXX" in
+x|xyes)
+  # Assume -lc should be added
+  archive_cmds_need_lc_CXX=yes
+
+  if test yes,yes = "$GCC,$enable_shared"; then
+    case $archive_cmds_CXX in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # 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_n "checking whether -lc should be explicitly linked in... " >&6; }
+if ${lt_cv_archive_cmds_need_lc_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  $RM conftest*
+	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+	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; } 2>conftest.err; then
+	  soname=conftest
+	  lib=conftest
+	  libobjs=conftest.$ac_objext
+	  deplibs=
+	  wl=$lt_prog_compiler_wl_CXX
+	  pic_flag=$lt_prog_compiler_pic_CXX
+	  compiler_flags=-v
+	  linker_flags=-v
+	  verstring=
+	  output_objdir=.
+	  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
+  (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; }
+	  then
+	    lt_cv_archive_cmds_need_lc_CXX=no
+	  else
+	    lt_cv_archive_cmds_need_lc_CXX=yes
+	  fi
+	  allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
+	else
+	  cat conftest.err 1>&5
+	fi
+	$RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_CXX" >&5
+$as_echo "$lt_cv_archive_cmds_need_lc_CXX" >&6; }
+      archive_cmds_need_lc_CXX=$lt_cv_archive_cmds_need_lc_CXX
+      ;;
+    esac
+  fi
+  ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
+
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=.so
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+
+
+
+case $host_os in
+aix3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
+  shlibpath_var=LIBPATH
+
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='$libname$release$shared_ext$major'
+  ;;
+
+aix[4-9]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  hardcode_into_libs=yes
+  if test ia64 = "$host_cpu"; then
+    # AIX 5 supports IA64
+    library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line '#! .'.  This would cause the generated library to
+    # depend on '.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      aix4 | aix4.[01] | aix4.[01].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+	   echo ' yes '
+	   echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
+	:
+      else
+	can_build_shared=no
+      fi
+      ;;
+    esac
+    # Using Import Files as archive members, it is possible to support
+    # filename-based versioning of shared library archives on AIX. While
+    # this would work for both with and without runtime linking, it will
+    # prevent static linking of such archives. So we do filename-based
+    # shared library versioning with .so extension only, which is used
+    # when both runtime linking and shared linking is enabled.
+    # Unfortunately, runtime linking may impact performance, so we do
+    # not want this to be the default eventually. Also, we use the
+    # versioned .so libs for executables only if there is the -brtl
+    # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+    # To allow for filename-based versioning support, we need to create
+    # libNAME.so.V as an archive file, containing:
+    # *) an Import File, referring to the versioned filename of the
+    #    archive as well as the shared archive member, telling the
+    #    bitwidth (32 or 64) of that shared object, and providing the
+    #    list of exported symbols of that shared object, eventually
+    #    decorated with the 'weak' keyword
+    # *) the shared object with the F_LOADONLY flag set, to really avoid
+    #    it being seen by the linker.
+    # At run time we better use the real file rather than another symlink,
+    # but for link time we create the symlink libNAME.so -> libNAME.so.V
+
+    case $with_aix_soname,$aix_use_runtimelinking in
+    # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    aix,yes) # traditional libtool
+      dynamic_linker='AIX unversionable lib.so'
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      ;;
+    aix,no) # traditional AIX only
+      dynamic_linker='AIX lib.a(lib.so.V)'
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='$libname$release.a $libname.a'
+      soname_spec='$libname$release$shared_ext$major'
+      ;;
+    svr4,*) # full svr4 only
+      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,yes) # both, prefer svr4
+      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # unpreferred sharedlib libNAME.a needs extra handling
+      postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+      postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,no) # both, prefer aix
+      dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)"
+      library_names_spec='$libname$release.a $libname.a'
+      soname_spec='$libname$release$shared_ext$major'
+      # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+      postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+      postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+      ;;
+    esac
+    shlibpath_var=LIBPATH
+  fi
+  ;;
+
+amigaos*)
+  case $host_cpu in
+  powerpc)
+    # Since July 2007 AmigaOS4 officially supports .so libraries.
+    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    ;;
+  m68k)
+    library_names_spec='$libname.ixlibrary $libname.a'
+    # Create ${libname}_ixlibrary.a entries in /sys/libs.
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    ;;
+  esac
+  ;;
+
+beos*)
+  library_names_spec='$libname$shared_ext'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
+
+bsdi[45]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
+
+cygwin* | mingw* | pw32* | cegcc*)
+  version_type=windows
+  shrext_cmds=.dll
+  need_version=no
+  need_lib_prefix=no
+
+  case $GCC,$cc_basename in
+  yes,*)
+    # gcc
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \$file`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname~
+      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+      fi'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+
+      ;;
+    mingw* | cegcc*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+      ;;
+    esac
+    dynamic_linker='Win32 ld.exe'
+    ;;
+
+  *,cl*)
+    # Native MSVC
+    libname_spec='$name'
+    soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+    library_names_spec='$libname.dll.lib'
+
+    case $build_os in
+    mingw*)
+      sys_lib_search_path_spec=
+      lt_save_ifs=$IFS
+      IFS=';'
+      for lt_path in $LIB
+      do
+        IFS=$lt_save_ifs
+        # Let DOS variable expansion print the short 8.3 style file name.
+        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+      done
+      IFS=$lt_save_ifs
+      # Convert to MSYS style.
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
+      ;;
+    cygwin*)
+      # Convert to unix form, then to dos form, then back to unix form
+      # but this time dos style (no spaces!) so that the unix form looks
+      # like /cygdrive/c/PROGRA~1:/cygdr...
+      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      ;;
+    *)
+      sys_lib_search_path_spec=$LIB
+      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
+        # It is most probably a Windows format PATH.
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      # FIXME: find the short name or the path components, as spaces are
+      # common. (e.g. "Program Files" -> "PROGRA~1")
+      ;;
+    esac
+
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \$file`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+    dynamic_linker='Win32 link.exe'
+    ;;
+
+  *)
+    # Assume MSVC wrapper
+    library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib'
+    dynamic_linker='Win32 ld.exe'
+    ;;
+  esac
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
+
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
+  soname_spec='$libname$release$major$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
+
+dgux*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[23].*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
+  version_type=freebsd-$objformat
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      soname_spec='$libname$release$shared_ext$major'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+      need_version=yes
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_os in
+  freebsd2.*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  freebsd3.[01]* | freebsdelf3.[01]*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
+  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  *) # from 4.6 on, and DragonFly
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
+
+haiku*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  dynamic_linker="$host_os runtime_loader"
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+  hardcode_into_libs=yes
+  ;;
+
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  case $host_cpu in
+  ia64*)
+    shrext_cmds='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    if test 32 = "$HPUX_IA64_MODE"; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux32
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux64
+    fi
+    ;;
+  hppa*64*)
+    shrext_cmds='.sl'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  *)
+    shrext_cmds='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
+  postinstall_cmds='chmod 555 $lib'
+  # or fails outright, so override atomically:
+  install_override_mode=555
+  ;;
+
+interix[3-9]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)
+	if test yes = "$lt_cv_prog_gnu_ld"; then
+		version_type=linux # correct to gnu/linux during the next big refactor
+	else
+		version_type=irix
+	fi ;;
+  esac
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='$libname$release$shared_ext$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
+  case $host_os in
+  irix5* | nonstopux*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
+  sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
+  hardcode_into_libs=yes
+  ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
+
+linux*android*)
+  version_type=none # Android doesn't support versioned libraries.
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext'
+  soname_spec='$libname$release$shared_ext'
+  finish_cmds=
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  dynamic_linker='Android linker'
+  # Don't embed -rpath directories since the linker doesn't support them.
+  hardcode_libdir_flag_spec_CXX='-L$libdir'
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+
+  # Some binutils ld are patched to set DT_RUNPATH
+  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_shlibpath_overrides_runpath=no
+    save_LDFLAGS=$LDFLAGS
+    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
+/* end confdefs.h.  */
+
+int
+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 :
+  lt_cv_shlibpath_overrides_runpath=yes
+fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+    LDFLAGS=$save_LDFLAGS
+    libdir=$save_libdir
+
+fi
+
+  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  # Ideally, we could use ldconfig to report *all* directores which are
+  # searched for libraries, however this is still not possible.  Aside from not
+  # being certain /sbin/ldconfig is available, command
+  # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
+  # even though it is searched at run-time.  Try to do the best guess by
+  # appending ld.so.conf contents (and includes) 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;s/"//g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+  fi
+
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
+
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+newsos6)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+*nto* | *qnx*)
+  version_type=qnx
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='ldqnx.so'
+  ;;
+
+openbsd* | bitrig*)
+  version_type=sunos
+  sys_lib_dlsearch_path_spec=/usr/lib
+  need_lib_prefix=no
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+    need_version=no
+  else
+    need_version=yes
+  fi
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+os2*)
+  libname_spec='$name'
+  version_type=windows
+  shrext_cmds=.dll
+  need_version=no
+  need_lib_prefix=no
+  # OS/2 can only load a DLL with a base name of 8 characters or less.
+  soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+    v=$($ECHO $release$versuffix | tr -d .-);
+    n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+    $ECHO $n$v`$shared_ext'
+  library_names_spec='${libname}_dll.$libext'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=BEGINLIBPATH
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+  postinstall_cmds='base_file=`basename \$file`~
+    dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
+    dldir=$destdir/`dirname \$dlpath`~
+    test -d \$dldir || mkdir -p \$dldir~
+    $install_prog $dir/$dlname \$dldir/$dlname~
+    chmod a+x \$dldir/$dlname~
+    if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+      eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+    fi'
+  postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
+    dlpath=$dir/\$dldll~
+    $RM \$dlpath'
+  ;;
+
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='$libname$release$shared_ext$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+  ;;
+
+rdos*)
+  dynamic_linker=no
+  ;;
+
+solaris*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
+
+sunos4*)
+  version_type=sunos
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test yes = "$with_gnu_ld"; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
+
+sysv4 | sysv4.3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+
+sysv4*MP*)
+  if test -d /usr/nec; then
+    version_type=linux # correct to gnu/linux during the next big refactor
+    library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext'
+    soname_spec='$libname$shared_ext.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=sco
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  if test yes = "$with_gnu_ld"; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+
+tpf*)
+  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+uts4*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+*)
+  dynamic_linker=no
+  ;;
+esac
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
+test no = "$dynamic_linker" && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test yes = "$GCC"; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
+if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
+  sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
+fi
+
+if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
+  sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
+fi
+
+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
+
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
+func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    { $as_echo "$as_me:${as_lineno-$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" ||
+   test -n "$runpath_var_CXX" ||
+   test yes = "$hardcode_automatic_CXX"; then
+
+  # We can hardcode non-existent directories.
+  if test no != "$hardcode_direct_CXX" &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, CXX)" &&
+     test no != "$hardcode_minus_L_CXX"; then
+    # Linking always hardcodes the temporary library directory.
+    hardcode_action_CXX=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    hardcode_action_CXX=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  hardcode_action_CXX=unsupported
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5
+$as_echo "$hardcode_action_CXX" >&6; }
+
+if test relink = "$hardcode_action_CXX" ||
+   test yes = "$inherit_rpath_CXX"; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test yes = "$shlibpath_overrides_runpath" ||
+     test no = "$enable_shared"; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+
+
+
+
+
+
+
+  fi # test -n "$compiler"
+
+  CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
+  LDCXX=$LD
+  LD=$lt_save_LD
+  GCC=$lt_save_GCC
+  with_gnu_ld=$lt_save_with_gnu_ld
+  lt_cv_path_LDCXX=$lt_cv_path_LD
+  lt_cv_path_LD=$lt_save_path_LD
+  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
+  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
+fi # test yes != "$_lt_caught_CXX_error"
+
+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
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+        ac_config_commands="$ac_config_commands libtool"
+
+
+
+
+# Only expand once:
+
+
+
+# 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_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_YACC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$YACC"; then
+  ac_cv_prog_YACC="$YACC" # 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_YACC="bison"
+    $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
+YACC=$ac_cv_prog_YACC
+if test -n "$YACC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5
+$as_echo "$YACC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+bison_version=`bison --version | sed -n '/^bison.*/p' | sed 's@.* \(.*\)@\1@'`
+
+{ $as_echo "$as_me:${as_lineno-$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
+# the DAP4 parsers using bison 3 or get pre-built sources from a set
+# of template files. That didn't work on some linux machines, so bison
+# 3 is a requirement for building until that gets sorted out. jhrg 4/5/15
+
+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) :
+      ;; #(
+  *) :
+     ;;
+esac
+
+{ $as_echo "$as_me:${as_lineno-$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_n "checking for $ac_hdr that defines DIR... " >&6; }
+if eval \${$as_ac_Header+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+#include <$ac_hdr>
+
+int
+main ()
+{
+if ((DIR *) 0)
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$as_ac_Header=yes"
+else
+  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
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
+_ACEOF
+
+ac_header_dirent=$ac_hdr; break
+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_n "checking for library containing opendir... " >&6; }
+if ${ac_cv_search_opendir+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* 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 opendir ();
+int
+main ()
+{
+return opendir ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' dir; 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_opendir=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_opendir+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_opendir+:} false; 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 "$ac_cv_search_opendir" >&6; }
+ac_res=$ac_cv_search_opendir
+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_n "checking for library containing opendir... " >&6; }
+if ${ac_cv_search_opendir+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* 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 opendir ();
+int
+main ()
+{
+return opendir ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' x; 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_opendir=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_opendir+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_opendir+:} false; 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 "$ac_cv_search_opendir" >&6; }
+ac_res=$ac_cv_search_opendir
+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_n "checking for ANSI C header files... " >&6; }
+if ${ac_cv_header_stdc+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_header_stdc=yes
+else
+  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
+/* end confdefs.h.  */
+#include <string.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "memchr" >/dev/null 2>&1; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+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
+/* end confdefs.h.  */
+#include <stdlib.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "free" >/dev/null 2>&1; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+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 :
+  :
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ctype.h>
+#include <stdlib.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+		   (('a' <= (c) && (c) <= 'i') \
+		     || ('j' <= (c) && (c) <= 'r') \
+		     || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif
+
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int
+main ()
+{
+  int i;
+  for (i = 0; i < 256; i++)
+    if (XOR (islower (i), ISLOWER (i))
+	|| toupper (i) != TOUPPER (i))
+      return 2;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+
+else
+  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
+fi
+
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$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
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$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 :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+#include <sys/wait.h>
+#ifndef WEXITSTATUS
+# define WEXITSTATUS(stat_val) ((unsigned int) (stat_val) >> 8)
+#endif
+#ifndef WIFEXITED
+# define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
+#endif
+
+int
+main ()
+{
+  int s;
+  wait (&s);
+  s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_header_sys_wait_h=yes
+else
+  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 "$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
+
+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 :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+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 :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* 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
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_struct_tm=time.h
+else
+  ac_cv_struct_tm=sys/time.h
+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 "#define TM_IN_SYS_TIME 1" >>confdefs.h
+
+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 :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+volatile int x;
+int * volatile y = (int *) 0;
+return !x && !y;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_c_volatile=yes
+else
+  ac_cv_c_volatile=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_volatile" >&5
+$as_echo "$ac_cv_c_volatile" >&6; }
+if test $ac_cv_c_volatile = no; then
+
+$as_echo "#define volatile /**/" >>confdefs.h
+
+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 :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_c_bigendian=unknown
+    # See if we're dealing with a universal compiler.
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifndef __APPLE_CC__
+	       not a universal capable compiler
+	     #endif
+	     typedef int dummy;
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+	# 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
+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
+
+  ;
+  return 0;
+}
+_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
+/* end confdefs.h.  */
+#include <sys/types.h>
+		#include <sys/param.h>
+
+int
+main ()
+{
+#if BYTE_ORDER != 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
+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;
+}
+_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
+/* 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
+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
+/* 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;
+
+int
+main ()
+{
+return use_ascii (foo) == use_ebcdic (foo);
+  ;
+  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
+/* 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;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  ac_cv_c_bigendian=no
+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
+
+    fi
+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
+else
+  ac_word_order=little-endian
+fi
+
+
+    # Ignore the errors about AC_TRY_RUN missing an argument. jhrg 5/2/95
+
+
+
+    # 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
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5
+$as_echo "$ac_cv_sizeof_int" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_INT $ac_cv_sizeof_int
+_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 long" >&5
+$as_echo_n "checking size of long... " >&6; }
+if ${ac_cv_sizeof_long+:} false; 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
+_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
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (char))" "ac_cv_sizeof_char"        "$ac_includes_default"; then :
+
+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
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_char" >&5
+$as_echo "$ac_cv_sizeof_char" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_CHAR $ac_cv_sizeof_char
+_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 :
+  $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 :
+
+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
+
+fi
+{ $as_echo "$as_me:${as_lineno-$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
+
+
+    # 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_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (float))" "ac_cv_sizeof_float"        "$ac_includes_default"; then :
+
+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
+
+fi
+{ $as_echo "$as_me:${as_lineno-$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
+
+
+
+    # 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_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 :
+
+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
+
+fi
+{ $as_echo "$as_me:${as_lineno-$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
+
+
+    # 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_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 :
+
+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
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_uint32_t" >&5
+$as_echo "$ac_cv_sizeof_uint32_t" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_UINT32_T $ac_cv_sizeof_uint32_t
+_ACEOF
+
+
+    # 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 :
+
+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
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$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
+
+
+    # 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
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (uint16_t))" "ac_cv_sizeof_uint16_t"        "$ac_includes_default"; then :
+
+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
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$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:${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
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (uint8_t))" "ac_cv_sizeof_uint8_t"        "$ac_includes_default"; then :
+
+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
+_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:${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
+/* 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
+  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//'`
+else
+
+      { $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;}
+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
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-l$dap_xdrlib  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* 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
+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
+_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
+/* 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
+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
+else
+
+      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.  */
+
+/* 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"
+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=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
+/* 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
+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=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
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-l$dap_xdrlib  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* 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
+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=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_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
+_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 :
+
+
+$as_echo "#define COMPUTE_ENDIAN_AT_RUNTIME 1" >>confdefs.h
+
+
+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`
+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
+_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:${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
+/* end confdefs.h.  */
+#include <alloca.h>
+int
+main ()
+{
+char *p = (char *) alloca (2 * sizeof (int));
+			  if (p) return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_working_alloca_h=yes
+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
+
+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
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* 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
+
+int
+main ()
+{
+char *p = (char *) alloca (1);
+				    if (p) return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_func_alloca_works=yes
+else
+  ac_cv_func_alloca_works=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_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
+fi
+rm -f conftest*
+
+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
+_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 :
+  $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
+/* 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
+if ac_fn_c_try_run "$LINENO"; then :
+  ac_cv_c_stack_direction=1
+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
+
+
+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;
+  GNULIB_WCSFTIME=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_WCSFTIME=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;
+  REPLACE_WCSFTIME=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
+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(); }
+
+_ACEOF
+                              save_ac_compile="$ac_compile"
+     ac_compile=`echo "$save_ac_compile" | sed s/conftest/conftest1/`
+     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
+       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>
+int zero (void) { return 0; }
+
+_ACEOF
+              ac_compile=`echo "$save_ac_compile" | sed s/conftest/conftest2/`
+       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
+         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
+     ac_compile="$save_ac_compile"
+     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
+_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
+/* end confdefs.h.  */
+#include <langinfo.h>
+int
+main ()
+{
+char* cs = nl_langinfo(CODESET); return !cs;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  am_cv_langinfo_codeset=yes
+else
+  am_cv_langinfo_codeset=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: $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
+
+
+
+
+  { $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
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* 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\":${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 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:${as_lineno-$LINENO}: result: $gt_cv_locale_fr" >&5
+$as_echo "$gt_cv_locale_fr" >&6; }
+  LOCALE_FR=$gt_cv_locale_fr
+
+
+
+
+
+
+  GNULIB_FCNTL=0;
+  GNULIB_NONBLOCKING=0;
+  GNULIB_OPEN=0;
+  GNULIB_OPENAT=0;
+    HAVE_FCNTL=1;
+  HAVE_OPENAT=1;
+  REPLACE_FCNTL=0;
+  REPLACE_OPEN=0;
+  REPLACE_OPENAT=0;
+
+
+
+
+
+
+
+
+  { $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 :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
+  case "$host_os" in
+                  # Guess 'no' on native Windows.
+          mingw*) gl_cv_header_working_fcntl_h='no' ;;
+          *)      gl_cv_header_working_fcntl_h=cross-compiling ;;
+        esac
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* 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
+if ac_fn_c_try_run "$LINENO"; then :
+  gl_cv_header_working_fcntl_h=yes
+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
+
+
+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
+
+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:${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 :
+  $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>
+_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
+/* 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
+
+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
+
+
+
+  { $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
+else
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* 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:${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
+
+
+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 :
+
+else
+
+cat >>confdefs.h <<_ACEOF
+#define pid_t int
+_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 :
+
+else
+
+cat >>confdefs.h <<_ACEOF
+#define mode_t int
+_ACEOF
+
+fi
+
+
+  GNULIB_GETTIMEOFDAY=0;
+    HAVE_GETTIMEOFDAY=1;
+  HAVE_STRUCT_TIMEVAL=1;
+  HAVE_SYS_TIME_H=1;
+  REPLACE_GETTIMEOFDAY=0;
+  REPLACE_STRUCT_TIMEVAL=0;
+
+{ $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 :
+  $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);
+
+  ;
+  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
+_ACEOF
+ ;;
+ esac
+
+
+  GNULIB_CHDIR=0;
+  GNULIB_CHOWN=0;
+  GNULIB_CLOSE=0;
+  GNULIB_DUP=0;
+  GNULIB_DUP2=0;
+  GNULIB_DUP3=0;
+  GNULIB_ENVIRON=0;
+  GNULIB_EUIDACCESS=0;
+  GNULIB_FACCESSAT=0;
+  GNULIB_FCHDIR=0;
+  GNULIB_FCHOWNAT=0;
+  GNULIB_FDATASYNC=0;
+  GNULIB_FSYNC=0;
+  GNULIB_FTRUNCATE=0;
+  GNULIB_GETCWD=0;
+  GNULIB_GETDOMAINNAME=0;
+  GNULIB_GETDTABLESIZE=0;
+  GNULIB_GETGROUPS=0;
+  GNULIB_GETHOSTNAME=0;
+  GNULIB_GETLOGIN=0;
+  GNULIB_GETLOGIN_R=0;
+  GNULIB_GETPAGESIZE=0;
+  GNULIB_GETUSERSHELL=0;
+  GNULIB_GROUP_MEMBER=0;
+  GNULIB_ISATTY=0;
+  GNULIB_LCHOWN=0;
+  GNULIB_LINK=0;
+  GNULIB_LINKAT=0;
+  GNULIB_LSEEK=0;
+  GNULIB_PIPE=0;
+  GNULIB_PIPE2=0;
+  GNULIB_PREAD=0;
+  GNULIB_PWRITE=0;
+  GNULIB_READ=0;
+  GNULIB_READLINK=0;
+  GNULIB_READLINKAT=0;
+  GNULIB_RMDIR=0;
+  GNULIB_SETHOSTNAME=0;
+  GNULIB_SLEEP=0;
+  GNULIB_SYMLINK=0;
+  GNULIB_SYMLINKAT=0;
+  GNULIB_TRUNCATE=0;
+  GNULIB_TTYNAME_R=0;
+  GNULIB_UNISTD_H_NONBLOCKING=0;
+  GNULIB_UNISTD_H_SIGPIPE=0;
+  GNULIB_UNLINK=0;
+  GNULIB_UNLINKAT=0;
+  GNULIB_USLEEP=0;
+  GNULIB_WRITE=0;
+    HAVE_CHOWN=1;
+  HAVE_DUP2=1;
+  HAVE_DUP3=1;
+  HAVE_EUIDACCESS=1;
+  HAVE_FACCESSAT=1;
+  HAVE_FCHDIR=1;
+  HAVE_FCHOWNAT=1;
+  HAVE_FDATASYNC=1;
+  HAVE_FSYNC=1;
+  HAVE_FTRUNCATE=1;
+  HAVE_GETDTABLESIZE=1;
+  HAVE_GETGROUPS=1;
+  HAVE_GETHOSTNAME=1;
+  HAVE_GETLOGIN=1;
+  HAVE_GETPAGESIZE=1;
+  HAVE_GROUP_MEMBER=1;
+  HAVE_LCHOWN=1;
+  HAVE_LINK=1;
+  HAVE_LINKAT=1;
+  HAVE_PIPE=1;
+  HAVE_PIPE2=1;
+  HAVE_PREAD=1;
+  HAVE_PWRITE=1;
+  HAVE_READLINK=1;
+  HAVE_READLINKAT=1;
+  HAVE_SETHOSTNAME=1;
+  HAVE_SLEEP=1;
+  HAVE_SYMLINK=1;
+  HAVE_SYMLINKAT=1;
+  HAVE_TRUNCATE=1;
+  HAVE_UNLINKAT=1;
+  HAVE_USLEEP=1;
+  HAVE_DECL_ENVIRON=1;
+  HAVE_DECL_FCHDIR=1;
+  HAVE_DECL_FDATASYNC=1;
+  HAVE_DECL_GETDOMAINNAME=1;
+  HAVE_DECL_GETLOGIN=1;
+  HAVE_DECL_GETLOGIN_R=1;
+  HAVE_DECL_GETPAGESIZE=1;
+  HAVE_DECL_GETUSERSHELL=1;
+  HAVE_DECL_SETHOSTNAME=1;
+  HAVE_DECL_TTYNAME_R=1;
+  HAVE_OS_H=0;
+  HAVE_SYS_PARAM_H=0;
+  REPLACE_CHOWN=0;
+  REPLACE_CLOSE=0;
+  REPLACE_DUP=0;
+  REPLACE_DUP2=0;
+  REPLACE_FCHOWNAT=0;
+  REPLACE_FTRUNCATE=0;
+  REPLACE_GETCWD=0;
+  REPLACE_GETDOMAINNAME=0;
+  REPLACE_GETDTABLESIZE=0;
+  REPLACE_GETLOGIN_R=0;
+  REPLACE_GETGROUPS=0;
+  REPLACE_GETPAGESIZE=0;
+  REPLACE_ISATTY=0;
+  REPLACE_LCHOWN=0;
+  REPLACE_LINK=0;
+  REPLACE_LINKAT=0;
+  REPLACE_LSEEK=0;
+  REPLACE_PREAD=0;
+  REPLACE_PWRITE=0;
+  REPLACE_READ=0;
+  REPLACE_READLINK=0;
+  REPLACE_READLINKAT=0;
+  REPLACE_RMDIR=0;
+  REPLACE_SLEEP=0;
+  REPLACE_SYMLINK=0;
+  REPLACE_SYMLINKAT=0;
+  REPLACE_TRUNCATE=0;
+  REPLACE_TTYNAME_R=0;
+  REPLACE_UNLINK=0;
+  REPLACE_UNLINKAT=0;
+  REPLACE_USLEEP=0;
+  REPLACE_WRITE=0;
+  UNISTD_H_HAVE_WINSOCK2_H=0;
+  UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS=0;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+     if test $gl_cv_have_include_next = yes; then
+       gl_cv_next_sys_time_h='<'sys/time.h'>'
+     else
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <sys/time.h>" >&5
+$as_echo_n "checking absolute name of <sys/time.h>... " >&6; }
+if ${gl_cv_next_sys_time_h+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+             if test $ac_cv_header_sys_time_h = yes; then
+
+
+
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/time.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 'sys/time.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_sys_time_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+  sed -n "$gl_absolute_header_sed"`
+
+           gl_header=$gl_cv_absolute_sys_time_h
+           gl_cv_next_sys_time_h='"'$gl_header'"'
+          else
+               gl_cv_next_sys_time_h='<'sys/time.h'>'
+             fi
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_time_h" >&5
+$as_echo "$gl_cv_next_sys_time_h" >&6; }
+     fi
+     NEXT_SYS_TIME_H=$gl_cv_next_sys_time_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='<'sys/time.h'>'
+     else
+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
+       gl_next_as_first_directive=$gl_cv_next_sys_time_h
+     fi
+     NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H=$gl_next_as_first_directive
+
+
+
+
+
+  if test $ac_cv_header_sys_time_h != yes; then
+    HAVE_SYS_TIME_H=0
+  fi
+
+
+
+
+
+  if test $ac_cv_header_sys_socket_h != yes; then
+                    for ac_header in winsock2.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default"
+if test "x$ac_cv_header_winsock2_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_WINSOCK2_H 1
+_ACEOF
+
+fi
+
+done
+
+  fi
+  if test "$ac_cv_header_winsock2_h" = yes; then
+    HAVE_WINSOCK2_H=1
+    UNISTD_H_HAVE_WINSOCK2_H=1
+    SYS_IOCTL_H_HAVE_WINSOCK2_H=1
+  else
+    HAVE_WINSOCK2_H=0
+  fi
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct timeval" >&5
+$as_echo_n "checking for struct timeval... " >&6; }
+if ${gl_cv_sys_struct_timeval+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#if HAVE_SYS_TIME_H
+             #include <sys/time.h>
+            #endif
+            #include <time.h>
+            #if HAVE_WINSOCK2_H
+            # include <winsock2.h>
+            #endif
+
+int
+main ()
+{
+static struct timeval x; x.tv_sec = x.tv_usec;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  gl_cv_sys_struct_timeval=yes
+else
+  gl_cv_sys_struct_timeval=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_timeval" >&5
+$as_echo "$gl_cv_sys_struct_timeval" >&6; }
+  if test $gl_cv_sys_struct_timeval != yes; then
+    HAVE_STRUCT_TIMEVAL=0
+  else
+                            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wide-enough struct timeval.tv_sec member" >&5
+$as_echo_n "checking for wide-enough struct timeval.tv_sec member... " >&6; }
+if ${gl_cv_sys_struct_timeval_tv_sec+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#if HAVE_SYS_TIME_H
+               #include <sys/time.h>
+              #endif
+              #include <time.h>
+              #if HAVE_WINSOCK2_H
+              # include <winsock2.h>
+              #endif
+
+int
+main ()
+{
+static struct timeval x;
+              typedef int verify_tv_sec_type[
+                sizeof (time_t) <= sizeof x.tv_sec ? 1 : -1
+              ];
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  gl_cv_sys_struct_timeval_tv_sec=yes
+else
+  gl_cv_sys_struct_timeval_tv_sec=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_timeval_tv_sec" >&5
+$as_echo "$gl_cv_sys_struct_timeval_tv_sec" >&6; }
+    if test $gl_cv_sys_struct_timeval_tv_sec != yes; then
+      REPLACE_STRUCT_TIMEVAL=1
+    fi
+  fi
+
+
+    for gl_func in gettimeofday; 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_n "checking whether $gl_func is declared without a macro... " >&6; }
+if eval \${$as_gl_Symbol+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#if HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+#include <time.h>
+
+int
+main ()
+{
+#undef $gl_func
+  (void) $gl_func;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$as_gl_Symbol=yes"
+else
+  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
+$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
+fi
+      done
+
+
+
+
+
+
+
+
+  NEED_LOCALTIME_BUFFER=0
+
+
+  GNULIB_CTIME=0;
+  GNULIB_MKTIME=0;
+  GNULIB_LOCALTIME=0;
+  GNULIB_NANOSLEEP=0;
+  GNULIB_STRFTIME=0;
+  GNULIB_STRPTIME=0;
+  GNULIB_TIMEGM=0;
+  GNULIB_TIME_R=0;
+  GNULIB_TIME_RZ=0;
+  GNULIB_TZSET=0;
+    HAVE_DECL_LOCALTIME_R=1;
+  HAVE_NANOSLEEP=1;
+  HAVE_STRPTIME=1;
+  HAVE_TIMEGM=1;
+  HAVE_TZSET=1;
+    HAVE_TIMEZONE_T=0;
+        REPLACE_CTIME=GNULIB_PORTCHECK;
+  REPLACE_LOCALTIME_R=GNULIB_PORTCHECK;
+  REPLACE_MKTIME=GNULIB_PORTCHECK;
+  REPLACE_NANOSLEEP=GNULIB_PORTCHECK;
+  REPLACE_STRFTIME=GNULIB_PORTCHECK;
+  REPLACE_TIMEGM=GNULIB_PORTCHECK;
+  REPLACE_TZSET=GNULIB_PORTCHECK;
+
+      : ${GNULIB_GETTIMEOFDAY=0};
+        REPLACE_GMTIME=0;
+  REPLACE_LOCALTIME=0;
+
+
+  GNULIB_NL_LANGINFO=0;
+    HAVE_NL_LANGINFO=1;
+  REPLACE_NL_LANGINFO=0;
+
+
+
+
+
+  case "$host_os" in
+    mingw*)
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit off_t" >&5
+$as_echo_n "checking for 64-bit off_t... " >&6; }
+if ${gl_cv_type_off_t_64+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+                int verify_off_t_size[sizeof (off_t) >= 8 ? 1 : -1];
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  gl_cv_type_off_t_64=yes
+else
+  gl_cv_type_off_t_64=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_off_t_64" >&5
+$as_echo "$gl_cv_type_off_t_64" >&6; }
+      if test $gl_cv_type_off_t_64 = no; then
+        WINDOWS_64_BIT_OFF_T=1
+      else
+        WINDOWS_64_BIT_OFF_T=0
+      fi
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit st_size" >&5
+$as_echo_n "checking for 64-bit st_size... " >&6; }
+if ${gl_cv_member_st_size_64+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+                struct stat buf;
+                int verify_st_size_size[sizeof (buf.st_size) >= 8 ? 1 : -1];
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  gl_cv_member_st_size_64=yes
+else
+  gl_cv_member_st_size_64=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_member_st_size_64" >&5
+$as_echo "$gl_cv_member_st_size_64" >&6; }
+      if test $gl_cv_member_st_size_64 = no; then
+        WINDOWS_64_BIT_ST_SIZE=1
+      else
+        WINDOWS_64_BIT_ST_SIZE=0
+      fi
+      ;;
+    *)
+                                                      WINDOWS_64_BIT_OFF_T=0
+      WINDOWS_64_BIT_ST_SIZE=0
+      ;;
+  esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+     if test $gl_cv_have_include_next = yes; then
+       gl_cv_next_limits_h='<'limits.h'>'
+     else
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <limits.h>" >&5
+$as_echo_n "checking absolute name of <limits.h>... " >&6; }
+if ${gl_cv_next_limits_h+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+             if test $ac_cv_header_limits_h = yes; then
+
+
+
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <limits.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 'limits.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_limits_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+  sed -n "$gl_absolute_header_sed"`
+
+           gl_header=$gl_cv_absolute_limits_h
+           gl_cv_next_limits_h='"'$gl_header'"'
+          else
+               gl_cv_next_limits_h='<'limits.h'>'
+             fi
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_limits_h" >&5
+$as_echo "$gl_cv_next_limits_h" >&6; }
+     fi
+     NEXT_LIMITS_H=$gl_cv_next_limits_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='<'limits.h'>'
+     else
+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
+       gl_next_as_first_directive=$gl_cv_next_limits_h
+     fi
+     NEXT_AS_FIRST_DIRECTIVE_LIMITS_H=$gl_next_as_first_directive
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether limits.h has ULLONG_WIDTH etc." >&5
+$as_echo_n "checking whether limits.h has ULLONG_WIDTH etc.... " >&6; }
+if ${gl_cv_header_limits_width+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifndef __STDC_WANT_IEC_60559_BFP_EXT__
+                           #define __STDC_WANT_IEC_60559_BFP_EXT__ 1
+                          #endif
+                          #include <limits.h>
+                          int ullw = ULLONG_WIDTH;
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  gl_cv_header_limits_width=yes
+else
+  gl_cv_header_limits_width=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_limits_width" >&5
+$as_echo "$gl_cv_header_limits_width" >&6; }
+  if test "$gl_cv_header_limits_width" = yes; then
+    LIMITS_H=
+  else
+    LIMITS_H=limits.h
+  fi
+
+   if test -n "$LIMITS_H"; then
+  GL_GENERATE_LIMITS_H_TRUE=
+  GL_GENERATE_LIMITS_H_FALSE='#'
+else
+  GL_GENERATE_LIMITS_H_TRUE='#'
+  GL_GENERATE_LIMITS_H_FALSE=
+fi
+
+
+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
+_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
+/* 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:${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;
+
+
+    REPLACE_NULL=0;
+  HAVE_MAX_ALIGN_T=1;
+  HAVE_WCHAR_T=1;
+
+
+  { $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
+/* end confdefs.h.  */
+#include <stddef.h>
+            wchar_t foo = (wchar_t)'\0';
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  gt_cv_c_wchar_t=yes
+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
+
+
+
+
+  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
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stddef.h>
+      int test[2 * (sizeof NULL == sizeof (void *)) -1];
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  gl_cv_decl_null_works=yes
+else
+  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 "$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:${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 :
+  $as_echo_n "(cached) " >&6
+else
+
+
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* 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:${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
+
+     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
+
+if test -n "$LD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld" >&5
+$as_echo_n "checking for ld... " >&6; }
+elif test "$GCC" = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+$as_echo_n "checking for ld used by $CC... " >&6; }
+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 test -n "$LD"; then
+  # Let the user override the test with a path.
+  :
+else
+  if ${acl_cv_path_LD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+    acl_cv_path_LD= # Final result of this test
+    ac_prog=ld # Program to search in $PATH
+    if test "$GCC" = yes; then
+      # Check if gcc -print-prog-name=ld gives a path.
+      case $host in
+        *-*-mingw*)
+          # gcc leaves a trailing carriage return which upsets mingw
+          acl_output=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+        *)
+          acl_output=`($CC -print-prog-name=ld) 2>&5` ;;
+      esac
+      case $acl_output in
+        # Accept absolute paths.
+        [\\/]* | ?:[\\/]*)
+          re_direlt='/[^/][^/]*/\.\./'
+          # Canonicalize the pathname of ld
+          acl_output=`echo "$acl_output" | sed 's%\\\\%/%g'`
+          while echo "$acl_output" | grep "$re_direlt" > /dev/null 2>&1; do
+            acl_output=`echo $acl_output | sed "s%$re_direlt%/%"`
+          done
+          # Got the pathname. No search in PATH is needed.
+          acl_cv_path_LD="$acl_output"
+          ac_prog=
+          ;;
+        "")
+          # If it fails, then pretend we aren't using GCC.
+          ;;
+        *)
+          # If it is relative, then search for the first ld in PATH.
+          with_gnu_ld=unknown
+          ;;
+      esac
+    fi
+    if test -n "$ac_prog"; then
+      # Search for $ac_prog in $PATH.
+      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"
+    fi
+    case $host in
+      *-*-aix*)
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#if defined __powerpc64__ || defined _ARCH_PPC64
+           yes
+           #endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "yes" >/dev/null 2>&1; then :
+  # The compiler produces 64-bit code. Add option '-b64' so that the
+           # linker groks 64-bit object files.
+           case "$acl_cv_path_LD " in
+             *" -b64 "*) ;;
+             *) acl_cv_path_LD="$acl_cv_path_LD -b64" ;;
+           esac
+
+fi
+rm -f conftest*
+
+        ;;
+    esac
+
+fi
+
+  LD="$acl_cv_path_LD"
+fi
+if test -n "$LD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+$as_echo "$LD" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+  as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+fi
+{ $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
+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:${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
+
+
+
+
+                                                { $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 :
+  $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:${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
+
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the common suffixes of directories in the library search path" >&5
+$as_echo_n "checking for the common suffixes of directories in the library search path... " >&6; }
+if ${acl_cv_libdirstems+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  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
+/* 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:${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=`(if test -f /usr/bin/gcc \
+                         && LC_ALL=C /usr/bin/gcc -print-search-dirs >/dev/null 2>/dev/null; then \
+                        LC_ALL=C /usr/bin/gcc -print-search-dirs; \
+                      else \
+                        LC_ALL=C $CC -print-search-dirs; \
+                      fi) 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"
+     acl_cv_libdirstems="$acl_libdirstem,$acl_libdirstem2"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_libdirstems" >&5
+$as_echo "$acl_cv_libdirstems" >&6; }
+  # Decompose acl_cv_libdirstems into acl_libdirstem and acl_libdirstem2.
+  acl_libdirstem=`echo "$acl_cv_libdirstems" | sed -e 's/,.*//'`
+  acl_libdirstem2=`echo "$acl_cv_libdirstems" | sed -e '/,/s/.*,//'`
+
+
+
+  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
+else
+  gl_cv_have_weak=no
+              cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+extern void xyzzy ();
+#pragma weak xyzzy
+int
+main ()
+{
+xyzzy();
+  ;
+  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
+
+_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
+/* end confdefs.h.  */
+
+#include <stdio.h>
+#pragma weak fputs
+int main ()
+{
+  return (fputs == NULL);
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  gl_cv_have_weak=yes
+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
+              case " $LDFLAGS " in
+         *" -static "*) gl_cv_have_weak=no ;;
+       esac
+
+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
+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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* 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
+if ac_fn_c_try_link "$LINENO"; then :
+  gl_have_pthread=yes
+             LIBTHREAD=$gl_pthread LTLIBTHREAD=$gl_pthread
+             LIBMULTITHREAD=$gl_pthread LTLIBMULTITHREAD=$gl_pthread
+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
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lpthread  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* 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
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_pthread_pthread_kill=yes
+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 :
+  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.
+             # On Solaris 10 or newer, this test is no longer needed, because
+             # libc contains the fully functional pthread functions.
+             case "$host_os" in
+               solaris | solaris2.1-9 | solaris2.1-9.* | hpux*)
+
+$as_echo "#define PTHREAD_IN_USE_DETECTION_HARD 1" >>confdefs.h
+
+             esac
+
+fi
+
+        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 :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lpthread  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* 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
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_pthread_pthread_kill=yes
+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
+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
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lc_r  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* 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
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_c_r_pthread_kill=yes
+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
+
+          fi
+        fi
+        if test -n "$gl_have_pthread"; then
+          gl_threads_api=posix
+
+$as_echo "#define USE_POSIX_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_POSIX_THREADS_WEAK 1" >>confdefs.h
+
+              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
+/* end confdefs.h.  */
+
+#include <thread.h>
+#include <synch.h>
+
+int
+main ()
+{
+thr_self();
+  ;
+  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"
+
+$as_echo "#define USE_SOLARIS_THREADS 1" >>confdefs.h
+
+          if case "$gl_cv_have_weak" in *yes) true;; *) false;; esac; then
+
+$as_echo "#define USE_SOLARIS_THREADS_WEAK 1" >>confdefs.h
+
+            LIBTHREAD=
+            LTLIBTHREAD=
+          fi
+        fi
+      fi
+    fi
+    if test "$gl_use_threads" = pth; then
+      gl_save_CPPFLAGS="$CPPFLAGS"
+
+
+
+
+
+  { $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 :
+  $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" \
+           && ! test -d "$withval/$acl_libdirstem"; then
+          additional_libdir="$withval/$acl_libdirstem2"
+        fi
+      fi
+    fi
+
+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"
+          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:${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"
+
+  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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <pth.h>
+int
+main ()
+{
+pth_self();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  gl_have_pth=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_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
+
+            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; }
+
+
+
+
+
+
+
+
+
+
+     GNULIB_FCHMODAT=0;
+  GNULIB_FSTAT=0;
+  GNULIB_FSTATAT=0;
+  GNULIB_FUTIMENS=0;
+  GNULIB_LCHMOD=0;
+  GNULIB_LSTAT=0;
+  GNULIB_MKDIRAT=0;
+  GNULIB_MKFIFO=0;
+  GNULIB_MKFIFOAT=0;
+  GNULIB_MKNOD=0;
+  GNULIB_MKNODAT=0;
+  GNULIB_STAT=0;
+  GNULIB_UTIMENSAT=0;
+  GNULIB_OVERRIDES_STRUCT_STAT=0;
+    HAVE_FCHMODAT=1;
+  HAVE_FSTATAT=1;
+  HAVE_FUTIMENS=1;
+  HAVE_LCHMOD=1;
+  HAVE_LSTAT=1;
+  HAVE_MKDIRAT=1;
+  HAVE_MKFIFO=1;
+  HAVE_MKFIFOAT=1;
+  HAVE_MKNOD=1;
+  HAVE_MKNODAT=1;
+  HAVE_UTIMENSAT=1;
+  REPLACE_FSTAT=0;
+  REPLACE_FSTATAT=0;
+  REPLACE_FUTIMENS=0;
+  REPLACE_LSTAT=0;
+  REPLACE_MKDIR=0;
+  REPLACE_MKFIFO=0;
+  REPLACE_MKNOD=0;
+  REPLACE_STAT=0;
+  REPLACE_UTIMENSAT=0;
+
+
+
+
+         { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5
+$as_echo_n "checking whether lstat correctly handles trailing slash... " >&6; }
+if ${gl_cv_func_lstat_dereferences_slashed_symlink+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  rm -f conftest.sym conftest.file
+     echo >conftest.file
+     if test "$cross_compiling" = yes; then :
+  case "$host_os" in
+          *-gnu*)
+            # Guess yes on glibc systems.
+            gl_cv_func_lstat_dereferences_slashed_symlink="guessing yes" ;;
+          mingw*)
+            # Guess no on native Windows.
+            gl_cv_func_lstat_dereferences_slashed_symlink="guessing no" ;;
+          *)
+            # If we don't know, assume the worst.
+            gl_cv_func_lstat_dereferences_slashed_symlink="guessing no" ;;
+        esac
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+struct stat sbuf;
+            if (symlink ("conftest.file", "conftest.sym") != 0)
+              return 1;
+            /* Linux will dereference the symlink and fail, as required by
+               POSIX.  That is better in the sense that it means we will not
+               have to compile and use the lstat wrapper.  */
+            return lstat ("conftest.sym/", &sbuf) == 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  gl_cv_func_lstat_dereferences_slashed_symlink=yes
+else
+  gl_cv_func_lstat_dereferences_slashed_symlink=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.sym conftest.file
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_lstat_dereferences_slashed_symlink" >&5
+$as_echo "$gl_cv_func_lstat_dereferences_slashed_symlink" >&6; }
+  case "$gl_cv_func_lstat_dereferences_slashed_symlink" in
+    *yes)
+
+cat >>confdefs.h <<_ACEOF
+#define LSTAT_FOLLOWS_SLASHED_SYMLINK 1
+_ACEOF
+
+      ;;
+  esac
+
+
+  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
+
+done
+
+{ $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 :
+  $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
+/* end confdefs.h.  */
+#if defined STDC_HEADERS || defined HAVE_STDLIB_H
+# include <stdlib.h>
+#else
+char *malloc ();
+#endif
+
+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
+
+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 >>confdefs.h <<_ACEOF
+#define MALLOC_0_IS_NONNULL $gl_cv_func_malloc_0_nonnull
+_ACEOF
+
+
+
+  { $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 :
+
+else
+  ac_cv_type_unsigned_long_long_int=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+     fi
+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 :
+
+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
+
+  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 :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* 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
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_type_mbstate_t=yes
+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
+
+   else
+
+$as_echo "#define mbstate_t int" >>confdefs.h
+
+   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_n "(cached) " >&6
+else
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* 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\":${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*)
+          # 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:${as_lineno-$LINENO}: result: $gt_cv_locale_ja" >&5
+$as_echo "$gt_cv_locale_ja" >&6; }
+  LOCALE_JA=$gt_cv_locale_ja
+
+
+
+
+
+  { $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_n "(cached) " >&6
+else
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* 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\":${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=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:${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
+
+
+
+
+  { $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.  */
+
+#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_REALLOCARRAY=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_DECL_INITSTATE=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_QSORT_R=1;
+  HAVE_RANDOM=1;
+  HAVE_RANDOM_H=1;
+  HAVE_RANDOM_R=1;
+  HAVE_REALLOCARRAY=1;
+  HAVE_REALPATH=1;
+  HAVE_RPMATCH=1;
+  HAVE_SECURE_GETENV=1;
+  HAVE_SETENV=1;
+  HAVE_DECL_SETENV=1;
+  HAVE_DECL_SETSTATE=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;
+
+_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
+
+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
+
+
+
+
+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 whether stat file-mode macros are broken" >&5
+$as_echo_n "checking whether stat file-mode macros are broken... " >&6; }
+if ${ac_cv_header_stat_broken+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#if defined S_ISBLK && defined S_IFDIR
+extern char c1[S_ISBLK (S_IFDIR) ? -1 : 1];
+#endif
+
+#if defined S_ISBLK && defined S_IFCHR
+extern char c2[S_ISBLK (S_IFCHR) ? -1 : 1];
+#endif
+
+#if defined S_ISLNK && defined S_IFREG
+extern char c3[S_ISLNK (S_IFREG) ? -1 : 1];
+#endif
+
+#if defined S_ISSOCK && defined S_IFREG
+extern char c4[S_ISSOCK (S_IFREG) ? -1 : 1];
+#endif
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_header_stat_broken=no
+else
+  ac_cv_header_stat_broken=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stat_broken" >&5
+$as_echo "$ac_cv_header_stat_broken" >&6; }
+if test $ac_cv_header_stat_broken = yes; then
+
+$as_echo "#define STAT_MACROS_BROKEN 1" >>confdefs.h
+
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+     if test $gl_cv_have_include_next = yes; then
+       gl_cv_next_sys_stat_h='<'sys/stat.h'>'
+     else
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <sys/stat.h>" >&5
+$as_echo_n "checking absolute name of <sys/stat.h>... " >&6; }
+if ${gl_cv_next_sys_stat_h+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+             if test $ac_cv_header_sys_stat_h = yes; then
+
+
+
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/stat.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 'sys/stat.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_sys_stat_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+  sed -n "$gl_absolute_header_sed"`
+
+           gl_header=$gl_cv_absolute_sys_stat_h
+           gl_cv_next_sys_stat_h='"'$gl_header'"'
+          else
+               gl_cv_next_sys_stat_h='<'sys/stat.h'>'
+             fi
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_stat_h" >&5
+$as_echo "$gl_cv_next_sys_stat_h" >&6; }
+     fi
+     NEXT_SYS_STAT_H=$gl_cv_next_sys_stat_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='<'sys/stat.h'>'
+     else
+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
+       gl_next_as_first_directive=$gl_cv_next_sys_stat_h
+     fi
+     NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H=$gl_next_as_first_directive
+
+
+
+
+
+
+
+
+    WINDOWS_STAT_TIMESPEC=0
+
+
+
+
+
+
+
+
+      ac_fn_c_check_type "$LINENO" "nlink_t" "ac_cv_type_nlink_t" "#include <sys/types.h>
+     #include <sys/stat.h>
+"
+if test "x$ac_cv_type_nlink_t" = xyes; then :
+
+else
+
+$as_echo "#define nlink_t int" >>confdefs.h
+
+fi
+
+
+
+    for gl_func in fchmodat fstat fstatat futimens lchmod lstat mkdirat mkfifo mkfifoat     mknod mknodat stat utimensat; 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_n "checking whether $gl_func is declared without a macro... " >&6; }
+if eval \${$as_gl_Symbol+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/stat.h>
+
+int
+main ()
+{
+#undef $gl_func
+  (void) $gl_func;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$as_gl_Symbol=yes"
+else
+  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
+$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
+fi
+      done
+
+
+{ $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>
+
+             #ifdef __cplusplus
+              typedef bool Bool;
+             #else
+              typedef _Bool Bool;
+              #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
+             #endif
+
+             #ifndef __bool_true_false_are_defined
+              "error: __bool_true_false_are_defined is not defined"
+             #endif
+
+             struct s { Bool s: 1; Bool t; bool u: 1; bool v; } 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;
+             bool *qq = &q;
+
+int
+main ()
+{
+
+             bool e = &s;
+             *pq |= q; *pq |= ! q;
+             *qq |= q; *qq |= ! 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 + !qq);
+
+  ;
+  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 wint_t" >&5
+$as_echo_n "checking for wint_t... " >&6; }
+if ${gt_cv_c_wint_t+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* 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>
+            wint_t foo = (wchar_t)'\0';
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  gt_cv_c_wint_t=yes
+else
+  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 "$gt_cv_c_wint_t" >&6; }
+  if test $gt_cv_c_wint_t = yes; then
+
+$as_echo "#define HAVE_WINT_T 1" >>confdefs.h
+
+
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether wint_t is too small" >&5
+$as_echo_n "checking whether wint_t is too small... " >&6; }
+if ${gl_cv_type_wint_t_too_small+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* 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>.  */
+#if !(defined __GLIBC__ && !defined __UCLIBC__)
+# include <stddef.h>
+# include <stdio.h>
+# include <time.h>
+#endif
+#include <wchar.h>
+              int verify[sizeof (wint_t) < sizeof (int) ? -1 : 1];
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  gl_cv_type_wint_t_too_small=no
+else
+  gl_cv_type_wint_t_too_small=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_wint_t_too_small" >&5
+$as_echo "$gl_cv_type_wint_t_too_small" >&6; }
+    if test $gl_cv_type_wint_t_too_small = yes; then
+      GNULIB_OVERRIDES_WINT_T=1
+    else
+      GNULIB_OVERRIDES_WINT_T=0
+    fi
+  else
+    GNULIB_OVERRIDES_WINT_T=0
+  fi
+
+
+
+
+
+
+
+
+
+
+
+
+  if test $ac_cv_type_long_long_int = yes; then
+    HAVE_LONG_LONG_INT=1
+  else
+    HAVE_LONG_LONG_INT=0
+  fi
+
+
+  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
+
+
+
+  if test $ac_cv_header_wchar_h = yes; then
+    HAVE_WCHAR_H=1
+  else
+    HAVE_WCHAR_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 $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
+else
+
+             if test $ac_cv_header_stdint_h = yes; then
+
+
+
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* 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
+
+
+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
+
+
+
+
+  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:${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
+else
+  gl_cv_header_working_stdint_h=no
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+
+#define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
+#define __STDC_CONSTANT_MACROS 1
+#define __STDC_LIMIT_MACROS 1
+#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
+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;
+
+/* Check that SIZE_MAX has the correct type, if possible.  */
+#if 201112 <= __STDC_VERSION__
+int k = _Generic (SIZE_MAX, size_t: 0);
+#elif (2 <= __GNUC__ || defined __IBM__TYPEOF__ \
+       || (0x5110 <= __SUNPRO_C && !__STDC__))
+extern size_t k;
+extern __typeof__ (SIZE_MAX) k;
+#endif
+
+#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 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+                                                    if test "$cross_compiling" = yes; then :
+  case "$host_os" in
+                         # Guess yes on native Windows.
+                 mingw*) gl_cv_header_working_stdint_h="guessing yes" ;;
+                         # In general, assume it works.
+                 *)      gl_cv_header_working_stdint_h="guessing yes" ;;
+               esac
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+
+#define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
+#define __STDC_CONSTANT_MACROS 1
+#define __STDC_LIMIT_MACROS 1
+#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
+
+
+#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 ()
+{
+
+  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;
+
+  ;
+  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
+
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+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
+
+  HAVE_C99_STDINT_H=0
+  HAVE_SYS_BITYPES_H=0
+  HAVE_SYS_INTTYPES_H=0
+  STDINT_H=stdint.h
+  case "$gl_cv_header_working_stdint_h" in
+    *yes)
+      HAVE_C99_STDINT_H=1
+                  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stdint.h predates C++11" >&5
+$as_echo_n "checking whether stdint.h predates C++11... " >&6; }
+if ${gl_cv_header_stdint_predates_cxx11_h+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  gl_cv_header_stdint_predates_cxx11_h=yes
+         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* 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
+
+
+intmax_t im = INTMAX_MAX;
+int32_t i32 = INT32_C (0x7fffffff);
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  gl_cv_header_stdint_predates_cxx11_h=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_stdint_predates_cxx11_h" >&5
+$as_echo "$gl_cv_header_stdint_predates_cxx11_h" >&6; }
+
+      if test "$gl_cv_header_stdint_predates_cxx11_h" = yes; then
+
+$as_echo "#define __STDC_CONSTANT_MACROS 1" >>confdefs.h
+
+
+$as_echo "#define __STDC_LIMIT_MACROS 1" >>confdefs.h
+
+      fi
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stdint.h has UINTMAX_WIDTH etc." >&5
+$as_echo_n "checking whether stdint.h has UINTMAX_WIDTH etc.... " >&6; }
+if ${gl_cv_header_stdint_width+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  gl_cv_header_stdint_width=no
+         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+              /* Work if build is not clean.  */
+              #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1
+              #ifndef __STDC_WANT_IEC_60559_BFP_EXT__
+               #define __STDC_WANT_IEC_60559_BFP_EXT__ 1
+              #endif
+              #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
+
+              int iw = UINTMAX_WIDTH;
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  gl_cv_header_stdint_width=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_stdint_width" >&5
+$as_echo "$gl_cv_header_stdint_width" >&6; }
+      if test "$gl_cv_header_stdint_width" = yes; then
+        STDINT_H=
+      fi
+      ;;
+    *)
+                  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
+_ACEOF
+
+fi
+
+done
+
+      if test $ac_cv_header_sys_inttypes_h = yes; then
+        HAVE_SYS_INTTYPES_H=1
+      fi
+      if test $ac_cv_header_sys_bitypes_h = yes; then
+        HAVE_SYS_BITYPES_H=1
+      fi
+
+
+  if test $APPLE_UNIVERSAL_BUILD = 0; then
+
+
+  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>
+  #include <signal.h>
+  #if HAVE_WCHAR_H
+  # include <stdio.h>
+  # include <time.h>
+  # include <wchar.h>
+  #endif
+
+#include <limits.h>"; then :
+
+else
+  result=unknown
+fi
+
+       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
+$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
+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>
+  #include <signal.h>
+  #if HAVE_WCHAR_H
+  # include <stdio.h>
+  # include <time.h>
+  # include <wchar.h>
+  #endif
+
+#include <limits.h>"; then :
+
+else
+  result=unknown
+fi
+
+       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
+$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
+
+
+
+
+  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_n "checking whether $gltype is signed... " >&6; }
+if eval \${gl_cv_type_${gltype}_signed+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* 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
+
+            int verify[2 * (($gltype) -1 < ($gltype) 0) - 1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  result=yes
+else
+  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
+$as_echo "$ac_res" >&6; }
+    eval result=\$gl_cv_type_${gltype}_signed
+    GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
+    if test "$result" = yes; then
+      cat >>confdefs.h <<_ACEOF
+#define HAVE_SIGNED_${GLTYPE} 1
+_ACEOF
+
+      eval HAVE_SIGNED_${GLTYPE}=1
+    else
+      eval HAVE_SIGNED_${GLTYPE}=0
+    fi
+  done
+
+
+  gl_cv_type_ptrdiff_t_signed=yes
+  gl_cv_type_size_t_signed=no
+  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_n "checking for $gltype integer literal suffix... " >&6; }
+if eval \${gl_cv_type_${gltype}_suffix+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval gl_cv_type_${gltype}_suffix=no
+       eval result=\$gl_cv_type_${gltype}_signed
+       if test "$result" = yes; then
+         glsufu=
+       else
+         glsufu=u
+       fi
+       for glsuf in "$glsufu" ${glsufu}l ${glsufu}ll ${glsufu}i64; do
+         case $glsuf in
+           '')  gltype1='int';;
+           l)   gltype1='long int';;
+           ll)  gltype1='long long int';;
+           i64) gltype1='__int64';;
+           u)   gltype1='unsigned int';;
+           ul)  gltype1='unsigned long int';;
+           ull) gltype1='unsigned long long int';;
+           ui64)gltype1='unsigned __int64';;
+         esac
+         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* 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
+
+              extern $gltype foo;
+              extern $gltype1 foo;
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval gl_cv_type_${gltype}_suffix=\$glsuf
+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
+$as_echo "$ac_res" >&6; }
+    GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
+    eval result=\$gl_cv_type_${gltype}_suffix
+    test "$result" = no && result=
+    eval ${GLTYPE}_SUFFIX=\$result
+    cat >>confdefs.h <<_ACEOF
+#define ${GLTYPE}_SUFFIX $result
+_ACEOF
+
+  done
+
+
+  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_n "checking for $gltype integer literal suffix... " >&6; }
+if eval \${gl_cv_type_${gltype}_suffix+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval gl_cv_type_${gltype}_suffix=no
+       eval result=\$gl_cv_type_${gltype}_signed
+       if test "$result" = yes; then
+         glsufu=
+       else
+         glsufu=u
+       fi
+       for glsuf in "$glsufu" ${glsufu}l ${glsufu}ll ${glsufu}i64; do
+         case $glsuf in
+           '')  gltype1='int';;
+           l)   gltype1='long int';;
+           ll)  gltype1='long long int';;
+           i64) gltype1='__int64';;
+           u)   gltype1='unsigned int';;
+           ul)  gltype1='unsigned long int';;
+           ull) gltype1='unsigned long long int';;
+           ui64)gltype1='unsigned __int64';;
+         esac
+         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* 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
+
+              extern $gltype foo;
+              extern $gltype1 foo;
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval gl_cv_type_${gltype}_suffix=\$glsuf
+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
+$as_echo "$ac_res" >&6; }
+    GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
+    eval result=\$gl_cv_type_${gltype}_suffix
+    test "$result" = no && result=
+    eval ${GLTYPE}_SUFFIX=\$result
+    cat >>confdefs.h <<_ACEOF
+#define ${GLTYPE}_SUFFIX $result
+_ACEOF
+
+  done
+
+
+
+          if test $GNULIB_OVERRIDES_WINT_T = 1; then
+    BITSIZEOF_WINT_T=32
+  fi
+
+      ;;
+  esac
+
+    LIMITS_H=limits.h
+   if test -n "$LIMITS_H"; then
+  GL_GENERATE_LIMITS_H_TRUE=
+  GL_GENERATE_LIMITS_H_FALSE='#'
+else
+  GL_GENERATE_LIMITS_H_TRUE='#'
+  GL_GENERATE_LIMITS_H_FALSE=
+fi
+
+
+
+
+
+
+   if test -n "$STDINT_H"; then
+  GL_GENERATE_STDINT_H_TRUE=
+  GL_GENERATE_STDINT_H_FALSE='#'
+else
+  GL_GENERATE_STDINT_H_TRUE='#'
+  GL_GENERATE_STDINT_H_FALSE=
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+$as_echo "#define _USE_STD_STAT 1" >>confdefs.h
+
+
+
+
+
+
+
+
+
+
+
+     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_n "checking absolute name of <sys/types.h>... " >&6; }
+if ${gl_cv_next_sys_types_h+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.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 'sys/types.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_sys_types_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+  sed -n "$gl_absolute_header_sed"`
+
+           gl_header=$gl_cv_absolute_sys_types_h
+           gl_cv_next_sys_types_h='"'$gl_header'"'
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$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
+
+     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='<'sys/types.h'>'
+     else
+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
+       gl_next_as_first_directive=$gl_cv_next_sys_types_h
+     fi
+     NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H=$gl_next_as_first_directive
+
+
+
+
+
+
+
+
+
+
+
+
+    WINDOWS_STAT_INODES=0
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <time.h>" >&5
+$as_echo_n "checking for struct timespec in <time.h>... " >&6; }
+if ${gl_cv_sys_struct_timespec_in_time_h+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <time.h>
+
+int
+main ()
+{
+static struct timespec x; x.tv_sec = x.tv_nsec;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  gl_cv_sys_struct_timespec_in_time_h=yes
+else
+  gl_cv_sys_struct_timespec_in_time_h=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_timespec_in_time_h" >&5
+$as_echo "$gl_cv_sys_struct_timespec_in_time_h" >&6; }
+
+  TIME_H_DEFINES_STRUCT_TIMESPEC=0
+  SYS_TIME_H_DEFINES_STRUCT_TIMESPEC=0
+  PTHREAD_H_DEFINES_STRUCT_TIMESPEC=0
+  UNISTD_H_DEFINES_STRUCT_TIMESPEC=0
+  if test $gl_cv_sys_struct_timespec_in_time_h = yes; then
+    TIME_H_DEFINES_STRUCT_TIMESPEC=1
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <sys/time.h>" >&5
+$as_echo_n "checking for struct timespec in <sys/time.h>... " >&6; }
+if ${gl_cv_sys_struct_timespec_in_sys_time_h+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/time.h>
+
+int
+main ()
+{
+static struct timespec x; x.tv_sec = x.tv_nsec;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  gl_cv_sys_struct_timespec_in_sys_time_h=yes
+else
+  gl_cv_sys_struct_timespec_in_sys_time_h=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_timespec_in_sys_time_h" >&5
+$as_echo "$gl_cv_sys_struct_timespec_in_sys_time_h" >&6; }
+    if test $gl_cv_sys_struct_timespec_in_sys_time_h = yes; then
+      SYS_TIME_H_DEFINES_STRUCT_TIMESPEC=1
+    else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <pthread.h>" >&5
+$as_echo_n "checking for struct timespec in <pthread.h>... " >&6; }
+if ${gl_cv_sys_struct_timespec_in_pthread_h+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <pthread.h>
+
+int
+main ()
+{
+static struct timespec x; x.tv_sec = x.tv_nsec;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  gl_cv_sys_struct_timespec_in_pthread_h=yes
+else
+  gl_cv_sys_struct_timespec_in_pthread_h=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_timespec_in_pthread_h" >&5
+$as_echo "$gl_cv_sys_struct_timespec_in_pthread_h" >&6; }
+      if test $gl_cv_sys_struct_timespec_in_pthread_h = yes; then
+        PTHREAD_H_DEFINES_STRUCT_TIMESPEC=1
+      else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <unistd.h>" >&5
+$as_echo_n "checking for struct timespec in <unistd.h>... " >&6; }
+if ${gl_cv_sys_struct_timespec_in_unistd_h+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <unistd.h>
+
+int
+main ()
+{
+static struct timespec x; x.tv_sec = x.tv_nsec;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  gl_cv_sys_struct_timespec_in_unistd_h=yes
+else
+  gl_cv_sys_struct_timespec_in_unistd_h=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_timespec_in_unistd_h" >&5
+$as_echo "$gl_cv_sys_struct_timespec_in_unistd_h" >&6; }
+        if test $gl_cv_sys_struct_timespec_in_unistd_h = yes; then
+          UNISTD_H_DEFINES_STRUCT_TIMESPEC=1
+        fi
+      fi
+    fi
+  fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+     if test $gl_cv_have_include_next = yes; then
+       gl_cv_next_time_h='<'time.h'>'
+     else
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <time.h>" >&5
+$as_echo_n "checking absolute name of <time.h>... " >&6; }
+if ${gl_cv_next_time_h+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <time.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 'time.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_time_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+  sed -n "$gl_absolute_header_sed"`
+
+           gl_header=$gl_cv_absolute_time_h
+           gl_cv_next_time_h='"'$gl_header'"'
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_time_h" >&5
+$as_echo "$gl_cv_next_time_h" >&6; }
+     fi
+     NEXT_TIME_H=$gl_cv_next_time_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='<'time.h'>'
+     else
+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
+       gl_next_as_first_directive=$gl_cv_next_time_h
+     fi
+     NEXT_AS_FIRST_DIRECTIVE_TIME_H=$gl_next_as_first_directive
+
+
+
+
+
+
+
+
+
+
+  if test $ac_cv_header_features_h = yes; then
+    HAVE_FEATURES_H=1
+  else
+    HAVE_FEATURES_H=0
+  fi
+
+
+
+
+
+
+  if test $ac_cv_header_crtdefs_h = yes; then
+    HAVE_CRTDEFS_H=1
+  else
+    HAVE_CRTDEFS_H=0
+  fi
+
+
+
+
+
+  GNULIB_ISWBLANK=0;
+  GNULIB_WCTYPE=0;
+  GNULIB_ISWCTYPE=0;
+  GNULIB_WCTRANS=0;
+  GNULIB_TOWCTRANS=0;
+    HAVE_ISWBLANK=1;
+  HAVE_WCTYPE_T=1;
+  HAVE_WCTRANS_T=1;
+  REPLACE_ISWBLANK=0;
+
+
+
+
+
+
+   if true; then
+  GL_COND_LIBTOOL_TRUE=
+  GL_COND_LIBTOOL_FALSE='#'
+else
+  GL_COND_LIBTOOL_TRUE='#'
+  GL_COND_LIBTOOL_FALSE=
+fi
+
+  gl_cond_libtool=true
+  gl_m4_base='gl/m4'
+
+
+
+
+
+
+
+
+
+  gl_source_base='gl'
+
+
+  if test $ac_cv_func_alloca_works = no; then
+    :
+  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_n "checking for alloca as a compiler built-in... " >&6; }
+if ${gl_cv_rpl_alloca+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#if defined __GNUC__ || defined _AIX || defined _MSC_VER
+        Need own alloca
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "Need own alloca" >/dev/null 2>&1; then :
+  gl_cv_rpl_alloca=yes
+else
+  gl_cv_rpl_alloca=no
+fi
+rm -f conftest*
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$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
+
+      ALLOCA_H=alloca.h
+    else
+                  ALLOCA_H=
+    fi
+  else
+    ALLOCA_H=alloca.h
+  fi
+
+   if test -n "$ALLOCA_H"; then
+  GL_GENERATE_ALLOCA_H_TRUE=
+  GL_GENERATE_ALLOCA_H_FALSE='#'
+else
+  GL_GENERATE_ALLOCA_H_TRUE='#'
+  GL_GENERATE_ALLOCA_H_FALSE=
+fi
+
+
+
+
+
+
+
+
+  if test $ac_cv_func_btowc = no; then
+    HAVE_BTOWC=0
+  else
+
+
+
+
+        { $as_echo "$as_me:${as_lineno-$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 :
+  $as_echo_n "(cached) " >&6
+else
+
+        if test "$cross_compiling" = yes; then :
+
+           case "$host_os" in
+                      # Guess no on Cygwin.
+             cygwin*) gl_cv_func_btowc_nul="guessing no" ;;
+                      # Guess yes on native Windows.
+             mingw*)  gl_cv_func_btowc_nul="guessing yes" ;;
+                      # Guess yes otherwise.
+             *)       gl_cv_func_btowc_nul="guessing yes" ;;
+           esac
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <string.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 ()
+{
+  if (btowc ('\0') != 0)
+    return 1;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  gl_cv_func_btowc_nul=yes
+else
+  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
+fi
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$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_n "checking whether btowc(EOF) is correct... " >&6; }
+if ${gl_cv_func_btowc_eof+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+                        case "$host_os" in
+                  # Guess no on IRIX.
+          irix*)  gl_cv_func_btowc_eof="guessing no" ;;
+                  # Guess yes on native Windows.
+          mingw*) gl_cv_func_btowc_eof="guessing yes" ;;
+                  # Guess yes otherwise.
+          *)      gl_cv_func_btowc_eof="guessing yes" ;;
+        esac
+        if test $LOCALE_FR != none; then
+          if test "$cross_compiling" = yes; then :
+  :
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <locale.h>
+#include <string.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 ()
+{
+  if (setlocale (LC_ALL, "$LOCALE_FR") != NULL)
+    {
+      if (btowc (EOF) != WEOF)
+        return 1;
+    }
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  gl_cv_func_btowc_eof=yes
+else
+  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
+fi
+
+        fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_btowc_eof" >&5
+$as_echo "$gl_cv_func_btowc_eof" >&6; }
+
+    case "$gl_cv_func_btowc_nul" in
+      *yes) ;;
+      *) REPLACE_BTOWC=1 ;;
+    esac
+    case "$gl_cv_func_btowc_eof" in
+      *yes) ;;
+      *) REPLACE_BTOWC=1 ;;
+    esac
+  fi
+
+  if test $HAVE_BTOWC = 0 || test $REPLACE_BTOWC = 1; then
+
+
+
+
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS btowc.$ac_objext"
+
+
+  :
+
+  fi
+
+
+
+
+
+          GNULIB_BTOWC=1
+
+
+
+
+
+$as_echo "#define GNULIB_TEST_BTOWC 1" >>confdefs.h
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_expect" >&5
+$as_echo_n "checking for __builtin_expect... " >&6; }
+if ${gl_cv___builtin_expect+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+         int
+         main (int argc, char **argv)
+         {
+           argc = __builtin_expect (argc, 100);
+           return argv[argc != 100][0];
+         }
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  gl_cv___builtin_expect=yes
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+             #include <builtins.h>
+             int
+             main (int argc, char **argv)
+             {
+               argc = __builtin_expect (argc, 100);
+               return argv[argc != 100][0];
+             }
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  gl_cv___builtin_expect="in <builtins.h>"
+else
+  gl_cv___builtin_expect=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv___builtin_expect" >&5
+$as_echo "$gl_cv___builtin_expect" >&6; }
+  if test "$gl_cv___builtin_expect" = yes; then
+    $as_echo "#define HAVE___BUILTIN_EXPECT 1" >>confdefs.h
+
+  elif test "$gl_cv___builtin_expect" = "in <builtins.h>"; then
+    $as_echo "#define HAVE___BUILTIN_EXPECT 2" >>confdefs.h
+
+  fi
+
+
+
+    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 :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_BYTESWAP_H 1
+_ACEOF
+
+    BYTESWAP_H=''
+
+else
+
+    BYTESWAP_H='byteswap.h'
+
+fi
+
+done
+
+
+   if test -n "$BYTESWAP_H"; then
+  GL_GENERATE_BYTESWAP_H_TRUE=
+  GL_GENERATE_BYTESWAP_H_FALSE='#'
+else
+  GL_GENERATE_BYTESWAP_H_TRUE='#'
+  GL_GENERATE_BYTESWAP_H_FALSE=
+fi
+
+
+
+          if test "x$datarootdir" = x; then
+    datarootdir='${datadir}'
+
+  fi
+    if test "x$docdir" = x; then
+    docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
+
+  fi
+    if test "x$htmldir" = x; then
+    htmldir='${docdir}'
+
+  fi
+  if test "x$dvidir" = x; then
+    dvidir='${docdir}'
+
+  fi
+  if test "x$pdfdir" = x; then
+    pdfdir='${docdir}'
+
+  fi
+  if test "x$psdir" = x; then
+    psdir='${docdir}'
+
+  fi
+  if test "x$lispdir" = x; then
+    lispdir='${datarootdir}/emacs/site-lisp'
+
+  fi
+  if test "x$localedir" = x; then
+    localedir='${datarootdir}/locale'
+
+  fi
+    if test "x$runstatedir" = x; then
+    runstatedir='${localstatedir}/run'
+
+  fi
+
+      pkglibexecdir='${libexecdir}/${PACKAGE}'
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+     if test $gl_cv_have_include_next = yes; then
+       gl_cv_next_fcntl_h='<'fcntl.h'>'
+     else
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <fcntl.h>" >&5
+$as_echo_n "checking absolute name of <fcntl.h>... " >&6; }
+if ${gl_cv_next_fcntl_h+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <fcntl.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 'fcntl.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_fcntl_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+  sed -n "$gl_absolute_header_sed"`
+
+           gl_header=$gl_cv_absolute_fcntl_h
+           gl_cv_next_fcntl_h='"'$gl_header'"'
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_fcntl_h" >&5
+$as_echo "$gl_cv_next_fcntl_h" >&6; }
+     fi
+     NEXT_FCNTL_H=$gl_cv_next_fcntl_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='<'fcntl.h'>'
+     else
+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
+       gl_next_as_first_directive=$gl_cv_next_fcntl_h
+     fi
+     NEXT_AS_FIRST_DIRECTIVE_FCNTL_H=$gl_next_as_first_directive
+
+
+
+
+
+
+
+
+
+
+    for gl_func in fcntl openat; 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_n "checking whether $gl_func is declared without a macro... " >&6; }
+if eval \${$as_gl_Symbol+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <fcntl.h>
+
+int
+main ()
+{
+#undef $gl_func
+  (void) $gl_func;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$as_gl_Symbol=yes"
+else
+  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
+$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
+fi
+      done
+
+
+
+
+
+
+
+
+
+
+
+  gl_gettimeofday_timezone=void
+  if test $ac_cv_func_gettimeofday != yes; then
+    HAVE_GETTIMEOFDAY=0
+  else
+
+
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gettimeofday clobbers localtime buffer" >&5
+$as_echo_n "checking whether gettimeofday clobbers localtime buffer... " >&6; }
+if ${gl_cv_func_gettimeofday_clobber+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
+  # When cross-compiling:
+      case "$host_os" in
+                # Guess all is fine on glibc systems.
+        *-gnu*) gl_cv_func_gettimeofday_clobber="guessing no" ;;
+                # Guess no on native Windows.
+        mingw*) gl_cv_func_gettimeofday_clobber="guessing no" ;;
+                # If we don't know, assume the worst.
+        *)      gl_cv_func_gettimeofday_clobber="guessing yes" ;;
+      esac
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <string.h>
+          #include <sys/time.h>
+          #include <time.h>
+          #include <stdlib.h>
+
+int
+main ()
+{
+
+          time_t t = 0;
+          struct tm *lt;
+          struct tm saved_lt;
+          struct timeval tv;
+          lt = localtime (&t);
+          saved_lt = *lt;
+          gettimeofday (&tv, NULL);
+          return memcmp (lt, &saved_lt, sizeof (struct tm)) != 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  gl_cv_func_gettimeofday_clobber=no
+else
+  gl_cv_func_gettimeofday_clobber=yes
+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: $gl_cv_func_gettimeofday_clobber" >&5
+$as_echo "$gl_cv_func_gettimeofday_clobber" >&6; }
+
+ case "$gl_cv_func_gettimeofday_clobber" in
+   *yes)
+     REPLACE_GETTIMEOFDAY=1
+
+$as_echo "#define GETTIMEOFDAY_CLOBBERS_LOCALTIME 1" >>confdefs.h
+
+
+
+
+  NEED_LOCALTIME_BUFFER=1
+  REPLACE_GMTIME=1
+  REPLACE_LOCALTIME=1
+
+     ;;
+ esac
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gettimeofday with POSIX signature" >&5
+$as_echo_n "checking for gettimeofday with POSIX signature... " >&6; }
+if ${gl_cv_func_gettimeofday_posix_signature+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/time.h>
+              struct timeval c;
+              int gettimeofday (struct timeval *restrict, void *restrict);
+
+int
+main ()
+{
+/* glibc uses struct timezone * rather than the POSIX void *
+                 if _GNU_SOURCE is defined.  However, since the only portable
+                 use of gettimeofday uses NULL as the second parameter, and
+                 since the glibc definition is actually more typesafe, it is
+                 not worth wrapping this to get a compliant signature.  */
+              int (*f) (struct timeval *restrict, void *restrict)
+                = gettimeofday;
+              int x = f (&c, 0);
+              return !(x | c.tv_sec | c.tv_usec);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  gl_cv_func_gettimeofday_posix_signature=yes
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/time.h>
+int gettimeofday (struct timeval *restrict, struct timezone *restrict);
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  gl_cv_func_gettimeofday_posix_signature=almost
+else
+  gl_cv_func_gettimeofday_posix_signature=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:${as_lineno-$LINENO}: result: $gl_cv_func_gettimeofday_posix_signature" >&5
+$as_echo "$gl_cv_func_gettimeofday_posix_signature" >&6; }
+    if test $gl_cv_func_gettimeofday_posix_signature = almost; then
+      gl_gettimeofday_timezone='struct timezone'
+    elif test $gl_cv_func_gettimeofday_posix_signature != yes; then
+      REPLACE_GETTIMEOFDAY=1
+    fi
+        if test $REPLACE_STRUCT_TIMEVAL = 1; then
+      REPLACE_GETTIMEOFDAY=1
+    fi
+            case "$host_os" in
+      mingw*) REPLACE_GETTIMEOFDAY=1 ;;
+    esac
+  fi
+
+cat >>confdefs.h <<_ACEOF
+#define GETTIMEOFDAY_TIMEZONE $gl_gettimeofday_timezone
+_ACEOF
+
+
+  if test $HAVE_GETTIMEOFDAY = 0 || test $REPLACE_GETTIMEOFDAY = 1; then
+
+
+
+
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS gettimeofday.$ac_objext"
+
+    :
+  fi
+
+
+
+
+
+          GNULIB_GETTIMEOFDAY=1
+
+
+
+
+
+$as_echo "#define GNULIB_TEST_GETTIMEOFDAY 1" >>confdefs.h
+
+
+
+
+  :
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+     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_n "checking absolute name of <langinfo.h>... " >&6; }
+if ${gl_cv_next_langinfo_h+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+             if test $ac_cv_header_langinfo_h = yes; then
+
+
+
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <langinfo.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 'langinfo.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_langinfo_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+  sed -n "$gl_absolute_header_sed"`
+
+           gl_header=$gl_cv_absolute_langinfo_h
+           gl_cv_next_langinfo_h='"'$gl_header'"'
+          else
+               gl_cv_next_langinfo_h='<'langinfo.h'>'
+             fi
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$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
+
+     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='<'langinfo.h'>'
+     else
+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
+       gl_next_as_first_directive=$gl_cv_next_langinfo_h
+     fi
+     NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H=$gl_next_as_first_directive
+
+
+
+
+
+    HAVE_LANGINFO_CODESET=0
+  HAVE_LANGINFO_T_FMT_AMPM=0
+  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_n "checking whether langinfo.h defines CODESET... " >&6; }
+if ${gl_cv_header_langinfo_codeset+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <langinfo.h>
+int a = CODESET;
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  gl_cv_header_langinfo_codeset=yes
+else
+  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 "$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_n "checking whether langinfo.h defines T_FMT_AMPM... " >&6; }
+if ${gl_cv_header_langinfo_t_fmt_ampm+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <langinfo.h>
+int a = T_FMT_AMPM;
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  gl_cv_header_langinfo_t_fmt_ampm=yes
+else
+  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 "$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_n "checking whether langinfo.h defines ERA... " >&6; }
+if ${gl_cv_header_langinfo_era+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <langinfo.h>
+int a = ERA;
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  gl_cv_header_langinfo_era=yes
+else
+  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 "$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_n "checking whether langinfo.h defines YESEXPR... " >&6; }
+if ${gl_cv_header_langinfo_yesexpr+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <langinfo.h>
+int a = YESEXPR;
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  gl_cv_header_langinfo_yesexpr=yes
+else
+  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 "$gl_cv_header_langinfo_yesexpr" >&6; }
+    if test $gl_cv_header_langinfo_yesexpr = yes; then
+      HAVE_LANGINFO_YESEXPR=1
+    fi
+  else
+    HAVE_LANGINFO_H=0
+  fi
+
+
+
+
+
+
+
+    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_n "checking whether $gl_func is declared without a macro... " >&6; }
+if eval \${$as_gl_Symbol+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <langinfo.h>
+
+int
+main ()
+{
+#undef $gl_func
+  (void) $gl_func;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$as_gl_Symbol=yes"
+else
+  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
+$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
+fi
+      done
+
+
+
+
+
+
+
+
+
+
+
+
+  LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(abs_top_builddir)/$gl_source_base\""
+
+
+
+
+
+
+
+
+
+  case "$host_os" in
+    solaris*)
+
+$as_echo "#define _LCONV_C99 1" >>confdefs.h
+
+      ;;
+  esac
+
+  { $as_echo "$as_me:${as_lineno-$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 :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <locale.h>
+            int x = LC_MESSAGES;
+            int y = sizeof (((struct lconv *) 0)->decimal_point);
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  gl_cv_header_locale_h_posix2001=yes
+else
+  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 "$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_n "checking whether locale.h defines locale_t... " >&6; }
+if ${gl_cv_header_locale_has_locale_t+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <locale.h>
+              locale_t x;
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  gl_cv_header_locale_has_locale_t=yes
+else
+  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 "$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
+    else
+      gl_cv_header_locale_h_needs_xlocale_h=yes
+    fi
+  else
+    HAVE_XLOCALE_H=0
+    gl_cv_header_locale_h_needs_xlocale_h=no
+  fi
+
+
+          { $as_echo "$as_me:${as_lineno-$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 :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <locale.h>
+            struct lconv l;
+            int x = sizeof (l.decimal_point);
+            int y = sizeof (l.int_p_cs_precedes);
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  gl_cv_sys_struct_lconv_ok=yes
+else
+  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 "$gl_cv_sys_struct_lconv_ok" >&6; }
+  if test $gl_cv_sys_struct_lconv_ok = no; then
+    REPLACE_STRUCT_LCONV=1
+  fi
+
+
+
+
+
+
+
+
+
+     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_n "checking absolute name of <locale.h>... " >&6; }
+if ${gl_cv_next_locale_h+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <locale.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 'locale.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_locale_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+  sed -n "$gl_absolute_header_sed"`
+
+           gl_header=$gl_cv_absolute_locale_h
+           gl_cv_next_locale_h='"'$gl_header'"'
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$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
+
+     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='<'locale.h'>'
+     else
+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
+       gl_next_as_first_directive=$gl_cv_next_locale_h
+     fi
+     NEXT_AS_FIRST_DIRECTIVE_LOCALE_H=$gl_next_as_first_directive
+
+
+
+
+
+
+    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_n "checking whether $gl_func is declared without a macro... " >&6; }
+if eval \${$as_gl_Symbol+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <locale.h>
+/* Some systems provide declarations in a non-standard header.  */
+#if HAVE_XLOCALE_H
+# include <xlocale.h>
+#endif
+
+int
+main ()
+{
+#undef $gl_func
+  (void) $gl_func;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$as_gl_Symbol=yes"
+else
+  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
+$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
+fi
+      done
+
+
+
+
+
+
+  if test $REPLACE_STRUCT_LCONV = 1; then
+    REPLACE_LOCALECONV=1
+  fi
+
+  if test $REPLACE_LOCALECONV = 1; then
+
+
+
+
+
+
+
+
+  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 :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_LCONV_DECIMAL_POINT 1
+_ACEOF
+
+
+fi
+
+
+  fi
+
+
+
+
+
+          GNULIB_LOCALECONV=1
+
+
+
+
+
+$as_echo "#define GNULIB_TEST_LOCALECONV 1" >>confdefs.h
+
+
+
+
+
+
+
+
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS localtime-buffer.$ac_objext"
+
+
+
+  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.
+    has_rwlock=false
+    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 :
+  has_rwlock=true
+
+$as_echo "#define HAVE_PTHREAD_RWLOCK 1" >>confdefs.h
+
+fi
+
+    if $has_rwlock; then
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthread_rwlock_rdlock prefers a writer to a reader" >&5
+$as_echo_n "checking whether pthread_rwlock_rdlock prefers a writer to a reader... " >&6; }
+if ${gl_cv_pthread_rwlock_rdlock_prefer_writer+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  save_LIBS="$LIBS"
+     LIBS="$LIBS $LIBMULTITHREAD"
+     if test "$cross_compiling" = yes; then :
+  gl_cv_pthread_rwlock_rdlock_prefer_writer="guessing yes"
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <errno.h>
+#include <pthread.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#define SUCCEED() exit (0)
+#define FAILURE() exit (1)
+#define UNEXPECTED(n) (exit (10 + (n)))
+
+/* The main thread creates the waiting writer and the requesting reader threads
+   in the default way; this guarantees that they have the same priority.
+   We can reuse the main thread as first reader thread.  */
+
+static pthread_rwlock_t lock;
+static pthread_t reader1;
+static pthread_t writer;
+static pthread_t reader2;
+static pthread_t timer;
+/* Used to pass control from writer to reader2 and from reader2 to timer,
+   as in a relay race.
+   Passing control from one running thread to another running thread
+   is most likely faster than to create the second thread.  */
+static pthread_mutex_t baton;
+
+static void *
+timer_func (void *ignored)
+{
+  /* Step 13 (can be before or after step 12):
+     The timer thread takes the baton, then waits a moment to make sure
+     it can tell whether the second reader thread is blocked at step 12.  */
+  if (pthread_mutex_lock (&baton))
+    UNEXPECTED (13);
+  usleep (100000);
+  /* By the time we get here, it's clear that the second reader thread is
+     blocked at step 12.  This is the desired behaviour.  */
+  SUCCEED ();
+}
+
+static void *
+reader2_func (void *ignored)
+{
+  int err;
+
+  /* Step 8 (can be before or after step 7):
+     The second reader thread takes the baton, then waits a moment to make sure
+     the writer thread has reached step 7.  */
+  if (pthread_mutex_lock (&baton))
+    UNEXPECTED (8);
+  usleep (100000);
+  /* Step 9: The second reader thread requests the lock.  */
+  err = pthread_rwlock_tryrdlock (&lock);
+  if (err == 0)
+    FAILURE ();
+  else if (err != EBUSY)
+    UNEXPECTED (9);
+  /* Step 10: Launch a timer, to test whether the next call blocks.  */
+  if (pthread_create (&timer, NULL, timer_func, NULL))
+    UNEXPECTED (10);
+  /* Step 11: Release the baton.  */
+  if (pthread_mutex_unlock (&baton))
+    UNEXPECTED (11);
+  /* Step 12: The second reader thread requests the lock.  */
+  err = pthread_rwlock_rdlock (&lock);
+  if (err == 0)
+    FAILURE ();
+  else
+    UNEXPECTED (12);
+}
+
+static void *
+writer_func (void *ignored)
+{
+  /* Step 4: Take the baton, so that the second reader thread does not go ahead
+     too early.  */
+  if (pthread_mutex_lock (&baton))
+    UNEXPECTED (4);
+  /* Step 5: Create the second reader thread.  */
+  if (pthread_create (&reader2, NULL, reader2_func, NULL))
+    UNEXPECTED (5);
+  /* Step 6: Release the baton.  */
+  if (pthread_mutex_unlock (&baton))
+    UNEXPECTED (6);
+  /* Step 7: The writer thread requests the lock.  */
+  if (pthread_rwlock_wrlock (&lock))
+    UNEXPECTED (7);
+  return NULL;
+}
+
+int
+main ()
+{
+  reader1 = pthread_self ();
+
+  /* Step 1: The main thread initializes the lock and the baton.  */
+  if (pthread_rwlock_init (&lock, NULL))
+    UNEXPECTED (1);
+  if (pthread_mutex_init (&baton, NULL))
+    UNEXPECTED (1);
+  /* Step 2: The main thread acquires the lock as a reader.  */
+  if (pthread_rwlock_rdlock (&lock))
+    UNEXPECTED (2);
+  /* Step 3: Create the writer thread.  */
+  if (pthread_create (&writer, NULL, writer_func, NULL))
+    UNEXPECTED (3);
+  /* Job done.  Go to sleep.  */
+  for (;;)
+    {
+      sleep (1);
+    }
+}
+
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  gl_cv_pthread_rwlock_rdlock_prefer_writer=yes
+else
+  gl_cv_pthread_rwlock_rdlock_prefer_writer=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+     LIBS="$save_LIBS"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_pthread_rwlock_rdlock_prefer_writer" >&5
+$as_echo "$gl_cv_pthread_rwlock_rdlock_prefer_writer" >&6; }
+  case "$gl_cv_pthread_rwlock_rdlock_prefer_writer" in
+    *yes)
+
+$as_echo "#define HAVE_PTHREAD_RWLOCK_RDLOCK_PREFER_WRITER 1" >>confdefs.h
+
+      ;;
+  esac
+
+    fi
+    # glibc defines PTHREAD_MUTEX_RECURSIVE as enum, not as a macro.
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+      #include <pthread.h>
+int
+main ()
+{
+
+#if __FreeBSD__ == 4
+error "No, in FreeBSD 4.0 recursive mutexes actually don't work."
+#elif (defined __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ \
+       && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1070)
+error "No, in Mac OS X < 10.7 recursive mutexes actually don't work."
+#else
+int x = (int)PTHREAD_MUTEX_RECURSIVE;
+return !x;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+$as_echo "#define HAVE_PTHREAD_MUTEX_RECURSIVE 1" >>confdefs.h
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  fi
+  :
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define GNULIB_LOCK 1
+_ACEOF
+
+
+
+
+
+  if test $ac_cv_func_lstat = yes; then
+
+    case "$gl_cv_func_lstat_dereferences_slashed_symlink" in
+      *no)
+        REPLACE_LSTAT=1
+        ;;
+    esac
+  else
+    HAVE_LSTAT=0
+  fi
+
+  if test $REPLACE_LSTAT = 1; then
+
+
+
+
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS lstat.$ac_objext"
+
+    :
+  fi
+
+
+
+
+
+          GNULIB_LSTAT=1
+
+
+
+
+
+$as_echo "#define GNULIB_TEST_LSTAT 1" >>confdefs.h
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  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_n "checking whether mbrtowc handles incomplete characters... " >&6; }
+if ${gl_cv_func_mbrtowc_incomplete_state+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+                  case "$host_os" in
+                     # Guess no on AIX and OSF/1.
+        aix* | osf*) gl_cv_func_mbrtowc_incomplete_state="guessing no" ;;
+                     # Guess yes otherwise.
+        *)           gl_cv_func_mbrtowc_incomplete_state="guessing yes" ;;
+      esac
+      if test $LOCALE_JA != none; then
+        if test "$cross_compiling" = yes; then :
+  :
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <locale.h>
+#include <string.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 ()
+{
+  if (setlocale (LC_ALL, "$LOCALE_JA") != NULL)
+    {
+      const char input[] = "B\217\253\344\217\251\316er"; /* "Büßer" */
+      mbstate_t state;
+      wchar_t wc;
+
+      memset (&state, '\0', sizeof (mbstate_t));
+      if (mbrtowc (&wc, input + 1, 1, &state) == (size_t)(-2))
+        if (mbsinit (&state))
+          return 2;
+    }
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  gl_cv_func_mbrtowc_incomplete_state=yes
+else
+  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
+fi
+
+      fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$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_n "checking whether mbrtowc works as well as mbtowc... " >&6; }
+if ${gl_cv_func_mbrtowc_sanitycheck+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+                  case "$host_os" in
+                    # Guess no on Solaris 8.
+        solaris2.8) gl_cv_func_mbrtowc_sanitycheck="guessing no" ;;
+                    # Guess yes otherwise.
+        *)          gl_cv_func_mbrtowc_sanitycheck="guessing yes" ;;
+      esac
+      if test $LOCALE_ZH_CN != none; then
+        if test "$cross_compiling" = yes; then :
+  :
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <locale.h>
+#include <stdlib.h>
+#include <string.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 ()
+{
+  /* This fails on Solaris 8:
+     mbrtowc returns 2, and sets wc to 0x00F0.
+     mbtowc returns 4 (correct) and sets wc to 0x5EDC.  */
+  if (setlocale (LC_ALL, "$LOCALE_ZH_CN") != NULL)
+    {
+      char input[] = "B\250\271\201\060\211\070er"; /* "Büßer" */
+      mbstate_t state;
+      wchar_t wc;
+
+      memset (&state, '\0', sizeof (mbstate_t));
+      if (mbrtowc (&wc, input + 3, 6, &state) != 4
+          && mbtowc (&wc, input + 3, 6) == 4)
+        return 2;
+    }
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  gl_cv_func_mbrtowc_sanitycheck=yes
+else
+  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
+fi
+
+      fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_sanitycheck" >&5
+$as_echo "$gl_cv_func_mbrtowc_sanitycheck" >&6; }
+
+    REPLACE_MBSTATE_T=0
+    case "$gl_cv_func_mbrtowc_incomplete_state" in
+      *yes) ;;
+      *) REPLACE_MBSTATE_T=1 ;;
+    esac
+    case "$gl_cv_func_mbrtowc_sanitycheck" in
+      *yes) ;;
+      *) REPLACE_MBSTATE_T=1 ;;
+    esac
+  else
+    REPLACE_MBSTATE_T=1
+  fi
+
+
+
+  if test $ac_cv_func_mbrtowc = no; then
+    HAVE_MBRTOWC=0
+    ac_fn_c_check_decl "$LINENO" "mbrtowc" "ac_cv_have_decl_mbrtowc" "
+/* 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_mbrtowc" = xyes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_MBRTOWC $ac_have_decl
+_ACEOF
+
+    if test $ac_cv_have_decl_mbrtowc = yes; then
+                        REPLACE_MBRTOWC=1
+    fi
+  else
+    if test $REPLACE_MBSTATE_T = 1; then
+      REPLACE_MBRTOWC=1
+    else
+
+
+
+     { $as_echo "$as_me:${as_lineno-$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 :
+  $as_echo_n "(cached) " >&6
+else
+
+                  case "$host_os" in
+                  # Guess no on Solaris.
+        solaris*) gl_cv_func_mbrtowc_null_arg1="guessing no" ;;
+                  # Guess yes otherwise.
+        *)        gl_cv_func_mbrtowc_null_arg1="guessing yes" ;;
+      esac
+      if test $LOCALE_FR_UTF8 != none; then
+        if test "$cross_compiling" = yes; then :
+  :
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <locale.h>
+#include <stdlib.h>
+#include <string.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 ()
+{
+  int result = 0;
+
+  if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL)
+    {
+      char input[] = "\303\237er";
+      mbstate_t state;
+      wchar_t wc;
+      size_t ret;
+
+      memset (&state, '\0', sizeof (mbstate_t));
+      wc = (wchar_t) 0xBADFACE;
+      ret = mbrtowc (&wc, input, 5, &state);
+      if (ret != 2)
+        result |= 1;
+      if (!mbsinit (&state))
+        result |= 2;
+
+      memset (&state, '\0', sizeof (mbstate_t));
+      ret = mbrtowc (NULL, input, 5, &state);
+      if (ret != 2) /* Solaris 7 fails here: ret is -1.  */
+        result |= 4;
+      if (!mbsinit (&state))
+        result |= 8;
+    }
+  return result;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  gl_cv_func_mbrtowc_null_arg1=yes
+else
+  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
+fi
+
+      fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$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_n "checking whether mbrtowc handles a NULL string argument... " >&6; }
+if ${gl_cv_func_mbrtowc_null_arg2+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+                  case "$host_os" in
+              # Guess no on OSF/1.
+        osf*) gl_cv_func_mbrtowc_null_arg2="guessing no" ;;
+              # Guess yes otherwise.
+        *)    gl_cv_func_mbrtowc_null_arg2="guessing yes" ;;
+      esac
+      if test $LOCALE_FR_UTF8 != none; then
+        if test "$cross_compiling" = yes; then :
+  :
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <locale.h>
+#include <string.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 ()
+{
+  if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL)
+    {
+      mbstate_t state;
+      wchar_t wc;
+      int ret;
+
+      memset (&state, '\0', sizeof (mbstate_t));
+      wc = (wchar_t) 0xBADFACE;
+      mbrtowc (&wc, NULL, 5, &state);
+      /* Check that wc was not modified.  */
+      if (wc != (wchar_t) 0xBADFACE)
+        return 2;
+    }
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  gl_cv_func_mbrtowc_null_arg2=yes
+else
+  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
+fi
+
+      fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_null_arg2" >&5
+$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_n "checking whether mbrtowc has a correct return value... " >&6; }
+if ${gl_cv_func_mbrtowc_retval+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+                  case "$host_os" in
+                                   # Guess no on HP-UX, Solaris, native Windows.
+        hpux* | solaris* | mingw*) gl_cv_func_mbrtowc_retval="guessing no" ;;
+                                   # Guess yes otherwise.
+        *)                         gl_cv_func_mbrtowc_retval="guessing yes" ;;
+      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 :
+  :
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <locale.h>
+#include <string.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 ()
+{
+  int result = 0;
+  int found_some_locale = 0;
+  /* This fails on Solaris.  */
+  if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL)
+    {
+      char input[] = "B\303\274\303\237er"; /* "Büßer" */
+      mbstate_t state;
+      wchar_t wc;
+
+      memset (&state, '\0', sizeof (mbstate_t));
+      if (mbrtowc (&wc, input + 1, 1, &state) == (size_t)(-2))
+        {
+          input[1] = '\0';
+          if (mbrtowc (&wc, input + 2, 5, &state) != 1)
+            result |= 1;
+        }
+      found_some_locale = 1;
+    }
+  /* This fails on HP-UX 11.11.  */
+  if (setlocale (LC_ALL, "$LOCALE_JA") != NULL)
+    {
+      char input[] = "B\217\253\344\217\251\316er"; /* "Büßer" */
+      mbstate_t state;
+      wchar_t wc;
+
+      memset (&state, '\0', sizeof (mbstate_t));
+      if (mbrtowc (&wc, input + 1, 1, &state) == (size_t)(-2))
+        {
+          input[1] = '\0';
+          if (mbrtowc (&wc, input + 2, 5, &state) != 2)
+            result |= 2;
+        }
+      found_some_locale = 1;
+    }
+  /* This fails on native Windows.  */
+  if (setlocale (LC_ALL, "Japanese_Japan.932") != NULL)
+    {
+      char input[] = "<\223\372\226\173\214\352>"; /* "<日本語>" */
+      mbstate_t state;
+      wchar_t wc;
+
+      memset (&state, '\0', sizeof (mbstate_t));
+      if (mbrtowc (&wc, input + 3, 1, &state) == (size_t)(-2))
+        {
+          input[3] = '\0';
+          if (mbrtowc (&wc, input + 4, 4, &state) != 1)
+            result |= 4;
+        }
+      found_some_locale = 1;
+    }
+  if (setlocale (LC_ALL, "Chinese_Taiwan.950") != NULL)
+    {
+      char input[] = "<\244\351\245\273\273\171>"; /* "<日本語>" */
+      mbstate_t state;
+      wchar_t wc;
+
+      memset (&state, '\0', sizeof (mbstate_t));
+      if (mbrtowc (&wc, input + 3, 1, &state) == (size_t)(-2))
+        {
+          input[3] = '\0';
+          if (mbrtowc (&wc, input + 4, 4, &state) != 1)
+            result |= 8;
+        }
+      found_some_locale = 1;
+    }
+  if (setlocale (LC_ALL, "Chinese_China.936") != NULL)
+    {
+      char input[] = "<\310\325\261\276\325\132>"; /* "<日本語>" */
+      mbstate_t state;
+      wchar_t wc;
+
+      memset (&state, '\0', sizeof (mbstate_t));
+      if (mbrtowc (&wc, input + 3, 1, &state) == (size_t)(-2))
+        {
+          input[3] = '\0';
+          if (mbrtowc (&wc, input + 4, 4, &state) != 1)
+            result |= 16;
+        }
+      found_some_locale = 1;
+    }
+  return (found_some_locale ? result : 77);
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  gl_cv_func_mbrtowc_retval=yes
+else
+  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
+fi
+
+      fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$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_n "checking whether mbrtowc returns 0 when parsing a NUL character... " >&6; }
+if ${gl_cv_func_mbrtowc_nul_retval+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+                  case "$host_os" in
+                       # Guess no on Solaris 8 and 9.
+        solaris2.[89]) gl_cv_func_mbrtowc_nul_retval="guessing no" ;;
+                       # Guess yes otherwise.
+        *)             gl_cv_func_mbrtowc_nul_retval="guessing yes" ;;
+      esac
+      if test $LOCALE_ZH_CN != none; then
+        if test "$cross_compiling" = yes; then :
+  :
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <locale.h>
+#include <string.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 ()
+{
+  /* This fails on Solaris 8 and 9.  */
+  if (setlocale (LC_ALL, "$LOCALE_ZH_CN") != NULL)
+    {
+      mbstate_t state;
+      wchar_t wc;
+
+      memset (&state, '\0', sizeof (mbstate_t));
+      if (mbrtowc (&wc, "", 1, &state) != 0)
+        return 2;
+    }
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  gl_cv_func_mbrtowc_nul_retval=yes
+else
+  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
+fi
+
+      fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$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_n "checking whether mbrtowc works on empty input... " >&6; }
+if ${gl_cv_func_mbrtowc_empty_input+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+                  case "$host_os" in
+                    # Guess no on AIX and glibc systems.
+        aix* | *-gnu*)
+                    gl_cv_func_mbrtowc_empty_input="guessing no" ;;
+                    # Guess yes on native Windows.
+        mingw*)     gl_cv_func_mbrtowc_empty_input="guessing yes" ;;
+        *)          gl_cv_func_mbrtowc_empty_input="guessing yes" ;;
+      esac
+      if test "$cross_compiling" = yes; then :
+  :
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+           #include <wchar.h>
+           static wchar_t wc;
+           static mbstate_t mbs;
+           int
+           main (void)
+           {
+             return mbrtowc (&wc, "", 0, &mbs) != (size_t) -2;
+           }
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  gl_cv_func_mbrtowc_empty_input=yes
+else
+  gl_cv_func_mbrtowc_empty_input=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:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_empty_input" >&5
+$as_echo "$gl_cv_func_mbrtowc_empty_input" >&6; }
+
+
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C locale is free of encoding errors" >&5
+$as_echo_n "checking whether the C locale is free of encoding errors... " >&6; }
+if ${gl_cv_C_locale_sans_EILSEQ+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+               gl_cv_C_locale_sans_EILSEQ="guessing no"
+
+     if test "$cross_compiling" = yes; then :
+  case "$host_os" in
+                 # Guess yes on native Windows.
+         mingw*) gl_cv_C_locale_sans_EILSEQ="guessing yes" ;;
+       esac
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <limits.h>
+            #include <locale.h>
+            #include <wchar.h>
+
+int
+main ()
+{
+
+            int i;
+            char *locale = setlocale (LC_ALL, "C");
+            if (! locale)
+              return 2;
+            for (i = CHAR_MIN; i <= CHAR_MAX; i++)
+              {
+                char c = i;
+                wchar_t wc;
+                mbstate_t mbs = { 0, };
+                size_t ss = mbrtowc (&wc, &c, 1, &mbs);
+                if (1 < ss)
+                  return 3;
+              }
+            return 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  gl_cv_C_locale_sans_EILSEQ=yes
+else
+  gl_cv_C_locale_sans_EILSEQ=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:${as_lineno-$LINENO}: result: $gl_cv_C_locale_sans_EILSEQ" >&5
+$as_echo "$gl_cv_C_locale_sans_EILSEQ" >&6; }
+
+      case "$gl_cv_func_mbrtowc_null_arg1" in
+        *yes) ;;
+        *)
+$as_echo "#define MBRTOWC_NULL_ARG1_BUG 1" >>confdefs.h
+
+           REPLACE_MBRTOWC=1
+           ;;
+      esac
+      case "$gl_cv_func_mbrtowc_null_arg2" in
+        *yes) ;;
+        *)
+$as_echo "#define MBRTOWC_NULL_ARG2_BUG 1" >>confdefs.h
+
+           REPLACE_MBRTOWC=1
+           ;;
+      esac
+      case "$gl_cv_func_mbrtowc_retval" in
+        *yes) ;;
+        *)
+$as_echo "#define MBRTOWC_RETVAL_BUG 1" >>confdefs.h
+
+           REPLACE_MBRTOWC=1
+           ;;
+      esac
+      case "$gl_cv_func_mbrtowc_nul_retval" in
+        *yes) ;;
+        *)
+$as_echo "#define MBRTOWC_NUL_RETVAL_BUG 1" >>confdefs.h
+
+           REPLACE_MBRTOWC=1
+           ;;
+      esac
+      case "$gl_cv_func_mbrtowc_empty_input" in
+        *yes) ;;
+        *)
+$as_echo "#define MBRTOWC_EMPTY_INPUT_BUG 1" >>confdefs.h
+
+           REPLACE_MBRTOWC=1
+           ;;
+      esac
+      case $gl_cv_C_locale_sans_EILSEQ in
+        *yes) ;;
+        *)
+$as_echo "#define C_LOCALE_MAYBE_EILSEQ 1" >>confdefs.h
+
+           REPLACE_MBRTOWC=1
+           ;;
+      esac
+    fi
+  fi
+
+  if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then
+
+
+
+
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS mbrtowc.$ac_objext"
+
+
+  :
+
+  fi
+
+
+
+
+
+          GNULIB_MBRTOWC=1
+
+
+
+
+
+$as_echo "#define GNULIB_TEST_MBRTOWC 1" >>confdefs.h
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  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_n "checking whether mbrtowc handles incomplete characters... " >&6; }
+if ${gl_cv_func_mbrtowc_incomplete_state+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+                  case "$host_os" in
+                     # Guess no on AIX and OSF/1.
+        aix* | osf*) gl_cv_func_mbrtowc_incomplete_state="guessing no" ;;
+                     # Guess yes otherwise.
+        *)           gl_cv_func_mbrtowc_incomplete_state="guessing yes" ;;
+      esac
+      if test $LOCALE_JA != none; then
+        if test "$cross_compiling" = yes; then :
+  :
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <locale.h>
+#include <string.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 ()
+{
+  if (setlocale (LC_ALL, "$LOCALE_JA") != NULL)
+    {
+      const char input[] = "B\217\253\344\217\251\316er"; /* "Büßer" */
+      mbstate_t state;
+      wchar_t wc;
+
+      memset (&state, '\0', sizeof (mbstate_t));
+      if (mbrtowc (&wc, input + 1, 1, &state) == (size_t)(-2))
+        if (mbsinit (&state))
+          return 2;
+    }
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  gl_cv_func_mbrtowc_incomplete_state=yes
+else
+  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
+fi
+
+      fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$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_n "checking whether mbrtowc works as well as mbtowc... " >&6; }
+if ${gl_cv_func_mbrtowc_sanitycheck+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+                  case "$host_os" in
+                    # Guess no on Solaris 8.
+        solaris2.8) gl_cv_func_mbrtowc_sanitycheck="guessing no" ;;
+                    # Guess yes otherwise.
+        *)          gl_cv_func_mbrtowc_sanitycheck="guessing yes" ;;
+      esac
+      if test $LOCALE_ZH_CN != none; then
+        if test "$cross_compiling" = yes; then :
+  :
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <locale.h>
+#include <stdlib.h>
+#include <string.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 ()
+{
+  /* This fails on Solaris 8:
+     mbrtowc returns 2, and sets wc to 0x00F0.
+     mbtowc returns 4 (correct) and sets wc to 0x5EDC.  */
+  if (setlocale (LC_ALL, "$LOCALE_ZH_CN") != NULL)
+    {
+      char input[] = "B\250\271\201\060\211\070er"; /* "Büßer" */
+      mbstate_t state;
+      wchar_t wc;
+
+      memset (&state, '\0', sizeof (mbstate_t));
+      if (mbrtowc (&wc, input + 3, 6, &state) != 4
+          && mbtowc (&wc, input + 3, 6) == 4)
+        return 2;
+    }
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  gl_cv_func_mbrtowc_sanitycheck=yes
+else
+  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
+fi
+
+      fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_sanitycheck" >&5
+$as_echo "$gl_cv_func_mbrtowc_sanitycheck" >&6; }
+
+    REPLACE_MBSTATE_T=0
+    case "$gl_cv_func_mbrtowc_incomplete_state" in
+      *yes) ;;
+      *) REPLACE_MBSTATE_T=1 ;;
+    esac
+    case "$gl_cv_func_mbrtowc_sanitycheck" in
+      *yes) ;;
+      *) REPLACE_MBSTATE_T=1 ;;
+    esac
+  else
+    REPLACE_MBSTATE_T=1
+  fi
+
+
+
+  if test $ac_cv_func_mbsinit = no; then
+    HAVE_MBSINIT=0
+    ac_fn_c_check_decl "$LINENO" "mbsinit" "ac_cv_have_decl_mbsinit" "
+/* 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_mbsinit" = xyes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_MBSINIT $ac_have_decl
+_ACEOF
+
+    if test $ac_cv_have_decl_mbsinit = yes; then
+                        REPLACE_MBSINIT=1
+    fi
+  else
+    if test $REPLACE_MBSTATE_T = 1; then
+      REPLACE_MBSINIT=1
+    else
+                        case "$host_os" in
+        mingw*) REPLACE_MBSINIT=1 ;;
+      esac
+    fi
+  fi
+
+  if test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1; then
+
+
+
+
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS mbsinit.$ac_objext"
+
+
+  :
+
+  fi
+
+
+
+
+
+          GNULIB_MBSINIT=1
+
+
+
+
+
+$as_echo "#define GNULIB_TEST_MBSINIT 1" >>confdefs.h
+
+
+
+
+
+
+  if false; then
+    REPLACE_MBTOWC=1
+  fi
+
+  if test $REPLACE_MBTOWC = 1; then
+
+
+
+
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS mbtowc.$ac_objext"
+
+
+  :
+
+  fi
+
+
+
+
+
+          GNULIB_MBTOWC=1
+
+
+
+
+
+$as_echo "#define GNULIB_TEST_MBTOWC 1" >>confdefs.h
+
+
+
+
+
+
+
+
+
+  if test $ac_cv_func_mkstemps != yes; then
+    HAVE_MKSTEMPS=0
+  fi
+
+  if test $HAVE_MKSTEMPS = 0; then
+
+
+
+
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS mkstemps.$ac_objext"
+
+  fi
+
+
+cat >>confdefs.h <<_ACEOF
+#define GNULIB_MKSTEMPS 1
+_ACEOF
+
+
+
+
+
+
+
+          GNULIB_MKSTEMPS=1
+
+
+
+
+
+$as_echo "#define GNULIB_TEST_MKSTEMPS 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_n "checking whether YESEXPR works... " >&6; }
+if ${gl_cv_func_nl_langinfo_yesexpr_works+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
+
+         case "$host_os" in
+                   # Guess no on irix systems.
+           irix*)  gl_cv_func_nl_langinfo_yesexpr_works="guessing no";;
+                   # Guess yes elsewhere.
+           *)      gl_cv_func_nl_langinfo_yesexpr_works="guessing yes";;
+         esac
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <langinfo.h>
+
+int
+main ()
+{
+return !*nl_langinfo(YESEXPR);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  gl_cv_func_nl_langinfo_yesexpr_works=yes
+else
+  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
+fi
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$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 ;;
+      *)    FUNC_NL_LANGINFO_YESEXPR_WORKS=0 ;;
+    esac
+
+cat >>confdefs.h <<_ACEOF
+#define FUNC_NL_LANGINFO_YESEXPR_WORKS $FUNC_NL_LANGINFO_YESEXPR_WORKS
+_ACEOF
+
+    if test $HAVE_LANGINFO_CODESET = 1 && test $HAVE_LANGINFO_ERA = 1 \
+        && test $FUNC_NL_LANGINFO_YESEXPR_WORKS = 1; then
+      :
+    else
+      REPLACE_NL_LANGINFO=1
+
+$as_echo "#define REPLACE_NL_LANGINFO 1" >>confdefs.h
+
+    fi
+  else
+    HAVE_NL_LANGINFO=0
+  fi
+
+  if test $HAVE_NL_LANGINFO = 0 || test $REPLACE_NL_LANGINFO = 1; then
+
+
+
+
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS nl_langinfo.$ac_objext"
+
+  fi
+
+
+
+
+
+          GNULIB_NL_LANGINFO=1
+
+
+
+
+
+$as_echo "#define GNULIB_TEST_NL_LANGINFO 1" >>confdefs.h
+
+
+
+
+
+
+
+
+# Check whether --with-included-regex was given.
+if test "${with_included_regex+set}" = set; then :
+  withval=$with_included_regex;
+fi
+
+
+  case $with_included_regex in #(
+  yes|no) ac_use_included_regex=$with_included_regex
+        ;;
+  '')
+    # If the system regex support is good enough that it passes the
+    # following run test, then default to *not* using the included regex.c.
+    # If cross compiling, assume the test would fail and use the included
+    # regex.c.
+
+
+    { $as_echo "$as_me:${as_lineno-$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 :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
+  case "$host_os" in
+                   # Guess no on native Windows.
+           mingw*) gl_cv_func_re_compile_pattern_working="guessing no" ;;
+                   # Otherwise, assume it is not working.
+           *)      gl_cv_func_re_compile_pattern_working="guessing no" ;;
+         esac
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <regex.h>
+
+            #include <locale.h>
+            #include <limits.h>
+            #include <string.h>
+
+            #if defined M_CHECK_ACTION || HAVE_DECL_ALARM
+            # include <signal.h>
+            # include <unistd.h>
+            #endif
+
+            #if HAVE_MALLOC_H
+            # include <malloc.h>
+            #endif
+
+            #ifdef M_CHECK_ACTION
+            /* Exit with distinguishable exit code.  */
+            static void sigabrt_no_core (int sig) { raise (SIGTERM); }
+            #endif
+
+int
+main ()
+{
+int result = 0;
+            static struct re_pattern_buffer regex;
+            unsigned char folded_chars[UCHAR_MAX + 1];
+            int i;
+            const char *s;
+            struct re_registers regs;
+
+            /* Some builds of glibc go into an infinite loop on this
+               test.  Use alarm to force death, and mallopt to avoid
+               malloc recursion in diagnosing the corrupted heap. */
+#if HAVE_DECL_ALARM
+            signal (SIGALRM, SIG_DFL);
+            alarm (2);
+#endif
+#ifdef M_CHECK_ACTION
+            signal (SIGABRT, sigabrt_no_core);
+            mallopt (M_CHECK_ACTION, 2);
+#endif
+
+            if (setlocale (LC_ALL, "en_US.UTF-8"))
+              {
+                {
+                  /* http://sourceware.org/ml/libc-hacker/2006-09/msg00008.html
+                     This test needs valgrind to catch the bug on Debian
+                     GNU/Linux 3.1 x86, but it might catch the bug better
+                     on other platforms and it shouldn't hurt to try the
+                     test here.  */
+                  static char const pat[] = "insert into";
+                  static char const data[] =
+                    "\xFF\0\x12\xA2\xAA\xC4\xB1,K\x12\xC4\xB1*\xACK";
+                  re_set_syntax (RE_SYNTAX_GREP | RE_HAT_LISTS_NOT_NEWLINE
+                                 | RE_ICASE);
+                  memset (&regex, 0, sizeof regex);
+                  s = re_compile_pattern (pat, sizeof pat - 1, &regex);
+                  if (s)
+                    result |= 1;
+                  else if (re_search (&regex, data, sizeof data - 1,
+                                      0, sizeof data - 1, &regs)
+                           != -1)
+                    result |= 1;
+                  regfree (&regex);
+                }
+
+                {
+                  /* This test is from glibc bug 15078.
+                     The test case is from Andreas Schwab in
+                     <http://www.sourceware.org/ml/libc-alpha/2013-01/msg00967.html>.
+                     */
+                  static char const pat[] = "[^x]x";
+                  static char const data[] =
+                    /* <U1000><U103B><U103D><U1014><U103A><U102F><U1015><U103A> */
+                    "\xe1\x80\x80"
+                    "\xe1\x80\xbb"
+                    "\xe1\x80\xbd"
+                    "\xe1\x80\x94"
+                    "\xe1\x80\xba"
+                    "\xe1\x80\xaf"
+                    "\xe1\x80\x95"
+                    "\xe1\x80\xba"
+                    "x";
+                  re_set_syntax (0);
+                  memset (&regex, 0, sizeof regex);
+                  s = re_compile_pattern (pat, sizeof pat - 1, &regex);
+                  if (s)
+                    result |= 1;
+                  else
+                    {
+                      i = re_search (&regex, data, sizeof data - 1,
+                                     0, sizeof data - 1, 0);
+                      if (i != 0 && i != 21)
+                        result |= 1;
+                    }
+                  regfree (&regex);
+                }
+
+                if (! setlocale (LC_ALL, "C"))
+                  return 1;
+              }
+
+            /* This test is from glibc bug 3957, reported by Andrew Mackey.  */
+            re_set_syntax (RE_SYNTAX_EGREP | RE_HAT_LISTS_NOT_NEWLINE);
+            memset (&regex, 0, sizeof regex);
+            s = re_compile_pattern ("a[^x]b", 6, &regex);
+            if (s)
+              result |= 2;
+            /* This should fail, but succeeds for glibc-2.5.  */
+            else if (re_search (&regex, "a\nb", 3, 0, 3, &regs) != -1)
+              result |= 2;
+
+            /* This regular expression is from Spencer ere test number 75
+               in grep-2.3.  */
+            re_set_syntax (RE_SYNTAX_POSIX_EGREP);
+            memset (&regex, 0, sizeof regex);
+            for (i = 0; i <= UCHAR_MAX; i++)
+              folded_chars[i] = i;
+            regex.translate = folded_chars;
+            s = re_compile_pattern ("a[[:]:]]b\n", 11, &regex);
+            /* This should fail with _Invalid character class name_ error.  */
+            if (!s)
+              result |= 4;
+
+            /* Ensure that [b-a] is diagnosed as invalid, when
+               using RE_NO_EMPTY_RANGES. */
+            re_set_syntax (RE_SYNTAX_POSIX_EGREP | RE_NO_EMPTY_RANGES);
+            memset (&regex, 0, sizeof regex);
+            s = re_compile_pattern ("a[b-a]", 6, &regex);
+            if (s == 0)
+              result |= 8;
+
+            /* This should succeed, but does not for glibc-2.1.3.  */
+            memset (&regex, 0, sizeof regex);
+            s = re_compile_pattern ("{1", 2, &regex);
+            if (s)
+              result |= 8;
+
+            /* The following example is derived from a problem report
+               against gawk from Jorge Stolfi <stolfi@ic.unicamp.br>.  */
+            memset (&regex, 0, sizeof regex);
+            s = re_compile_pattern ("[an\371]*n", 7, &regex);
+            if (s)
+              result |= 8;
+            /* This should match, but does not for glibc-2.2.1.  */
+            else if (re_match (&regex, "an", 2, 0, &regs) != 2)
+              result |= 8;
+
+            memset (&regex, 0, sizeof regex);
+            s = re_compile_pattern ("x", 1, &regex);
+            if (s)
+              result |= 8;
+            /* glibc-2.2.93 does not work with a negative RANGE argument.  */
+            else if (re_search (&regex, "wxy", 3, 2, -2, &regs) != 1)
+              result |= 8;
+
+            /* The version of regex.c in older versions of gnulib
+               ignored RE_ICASE.  Detect that problem too.  */
+            re_set_syntax (RE_SYNTAX_EMACS | RE_ICASE);
+            memset (&regex, 0, sizeof regex);
+            s = re_compile_pattern ("x", 1, &regex);
+            if (s)
+              result |= 16;
+            else if (re_search (&regex, "WXY", 3, 0, 3, &regs) < 0)
+              result |= 16;
+
+            /* Catch a bug reported by Vin Shelton in
+               http://lists.gnu.org/archive/html/bug-coreutils/2007-06/msg00089.html
+               */
+            re_set_syntax (RE_SYNTAX_POSIX_BASIC
+                           & ~RE_CONTEXT_INVALID_DUP
+                           & ~RE_NO_EMPTY_RANGES);
+            memset (&regex, 0, sizeof regex);
+            s = re_compile_pattern ("[[:alnum:]_-]\\\\+$", 16, &regex);
+            if (s)
+              result |= 32;
+
+            /* REG_STARTEND was added to glibc on 2004-01-15.
+               Reject older versions.  */
+            if (! REG_STARTEND)
+              result |= 64;
+
+#if 0
+            /* It would be nice to reject hosts whose regoff_t values are too
+               narrow (including glibc on hosts with 64-bit ptrdiff_t and
+               32-bit int), but we should wait until glibc implements this
+               feature.  Otherwise, support for equivalence classes and
+               multibyte collation symbols would always be broken except
+               when compiling --without-included-regex.   */
+            if (sizeof (regoff_t) < sizeof (ptrdiff_t)
+                || sizeof (regoff_t) < sizeof (ssize_t))
+              result |= 64;
+#endif
+
+            return result;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  gl_cv_func_re_compile_pattern_working=yes
+else
+  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
+fi
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$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
+    ;;
+  esac
+
+  if test $ac_use_included_regex = yes; then
+
+$as_echo "#define _REGEX_INCLUDE_LIMITS_H 1" >>confdefs.h
+
+
+$as_echo "#define _REGEX_LARGE_OFFSETS 1" >>confdefs.h
+
+
+$as_echo "#define re_syntax_options rpl_re_syntax_options" >>confdefs.h
+
+
+$as_echo "#define re_set_syntax rpl_re_set_syntax" >>confdefs.h
+
+
+$as_echo "#define re_compile_pattern rpl_re_compile_pattern" >>confdefs.h
+
+
+$as_echo "#define re_compile_fastmap rpl_re_compile_fastmap" >>confdefs.h
+
+
+$as_echo "#define re_search rpl_re_search" >>confdefs.h
+
+
+$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
+
+
+$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
+
+
+$as_echo "#define regfree rpl_regfree" >>confdefs.h
+
+  fi
+
+  if test $ac_use_included_regex = yes; then
+
+
+
+
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS regex.$ac_objext"
+
+
+
+
+
+
+
+
+  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
+_ACEOF
+
+fi
+
+done
+
+
+  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
+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_n "checking for ssize_t... " >&6; }
+if ${gt_cv_ssize_t+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+int
+main ()
+{
+int x = sizeof (ssize_t *) + sizeof (ssize_t);
+            return !x;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  gt_cv_ssize_t=yes
+else
+  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 "$gt_cv_ssize_t" >&6; }
+  if test $gt_cv_ssize_t = no; then
+
+$as_echo "#define ssize_t int" >>confdefs.h
+
+  fi
+
+
+
+
+
+  case "$host_os" in
+    mingw*)
+                  REPLACE_STAT=1
+      ;;
+    *)
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat handles trailing slashes on files" >&5
+$as_echo_n "checking whether stat handles trailing slashes on files... " >&6; }
+if ${gl_cv_func_stat_file_slash+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  touch conftest.tmp
+         # Assume that if we have lstat, we can also check symlinks.
+         if test $ac_cv_func_lstat = yes; then
+           ln -s conftest.tmp conftest.lnk
+         fi
+         if test "$cross_compiling" = yes; then :
+  case "$host_os" in
+                      # Guess yes on glibc systems.
+              *-gnu*) gl_cv_func_stat_file_slash="guessing yes" ;;
+                      # If we don't know, assume the worst.
+              *)      gl_cv_func_stat_file_slash="guessing no" ;;
+            esac
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/stat.h>
+
+int
+main ()
+{
+int result = 0;
+               struct stat st;
+               if (!stat ("conftest.tmp/", &st))
+                 result |= 1;
+#if HAVE_LSTAT
+               if (!stat ("conftest.lnk/", &st))
+                 result |= 2;
+#endif
+               return result;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  gl_cv_func_stat_file_slash=yes
+else
+  gl_cv_func_stat_file_slash=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.tmp conftest.lnk
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_stat_file_slash" >&5
+$as_echo "$gl_cv_func_stat_file_slash" >&6; }
+      case $gl_cv_func_stat_file_slash in
+        *no)
+          REPLACE_STAT=1
+
+$as_echo "#define REPLACE_FUNC_STAT_FILE 1" >>confdefs.h
+;;
+      esac
+      ;;
+  esac
+
+  if test $REPLACE_STAT = 1; then
+
+
+
+
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS stat.$ac_objext"
+
+    case "$host_os" in
+      mingw*)
+
+
+
+
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS stat-w32.$ac_objext"
+
+        ;;
+    esac
+
+
+  :
+
+  fi
+
+
+
+
+
+          GNULIB_STAT=1
+
+
+
+
+
+$as_echo "#define GNULIB_TEST_STAT 1" >>confdefs.h
+
+
+
+
+
+
+  # Define two additional variables used in the Makefile substitution.
+
+  if test "$ac_cv_header_stdbool_h" = yes; then
+    STDBOOL_H=''
+  else
+    STDBOOL_H='stdbool.h'
+  fi
+
+   if test -n "$STDBOOL_H"; then
+  GL_GENERATE_STDBOOL_H_TRUE=
+  GL_GENERATE_STDBOOL_H_FALSE='#'
+else
+  GL_GENERATE_STDBOOL_H_TRUE='#'
+  GL_GENERATE_STDBOOL_H_FALSE=
+fi
+
+
+  if test "$ac_cv_type__Bool" = yes; then
+    HAVE__BOOL=1
+  else
+    HAVE__BOOL=0
+  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
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stddef.h>
+      int test[2 * (sizeof NULL == sizeof (void *)) -1];
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  gl_cv_decl_null_works=yes
+else
+  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 "$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:${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 :
+  $as_echo_n "(cached) " >&6
+else
+
+
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* 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:${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
+
+     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 $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_n "checking absolute name of <stdlib.h>... " >&6; }
+if ${gl_cv_next_stdlib_h+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.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 'stdlib.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_stdlib_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+  sed -n "$gl_absolute_header_sed"`
+
+           gl_header=$gl_cv_absolute_stdlib_h
+           gl_cv_next_stdlib_h='"'$gl_header'"'
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$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
+
+     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='<'stdlib.h'>'
+     else
+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
+       gl_next_as_first_directive=$gl_cv_next_stdlib_h
+     fi
+     NEXT_AS_FIRST_DIRECTIVE_STDLIB_H=$gl_next_as_first_directive
+
+
+
+
+
+
+    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 qsort_r random random_r reallocarray     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_n "checking whether $gl_func is declared without a macro... " >&6; }
+if eval \${$as_gl_Symbol+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+#if HAVE_SYS_LOADAVG_H
+# include <sys/loadavg.h>
+#endif
+#if HAVE_RANDOM_H
+# include <random.h>
+#endif
+
+int
+main ()
+{
+#undef $gl_func
+  (void) $gl_func;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$as_gl_Symbol=yes"
+else
+  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
+$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
+fi
+      done
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+     if test $gl_cv_have_include_next = yes; then
+       gl_cv_next_sys_stat_h='<'sys/stat.h'>'
+     else
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <sys/stat.h>" >&5
+$as_echo_n "checking absolute name of <sys/stat.h>... " >&6; }
+if ${gl_cv_next_sys_stat_h+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+             if test $ac_cv_header_sys_stat_h = yes; then
+
+
+
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/stat.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 'sys/stat.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_sys_stat_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+  sed -n "$gl_absolute_header_sed"`
+
+           gl_header=$gl_cv_absolute_sys_stat_h
+           gl_cv_next_sys_stat_h='"'$gl_header'"'
+          else
+               gl_cv_next_sys_stat_h='<'sys/stat.h'>'
+             fi
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_stat_h" >&5
+$as_echo "$gl_cv_next_sys_stat_h" >&6; }
+     fi
+     NEXT_SYS_STAT_H=$gl_cv_next_sys_stat_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='<'sys/stat.h'>'
+     else
+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
+       gl_next_as_first_directive=$gl_cv_next_sys_stat_h
+     fi
+     NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H=$gl_next_as_first_directive
+
+
+
+
+
+
+
+
+    WINDOWS_STAT_TIMESPEC=0
+
+
+
+
+
+
+
+
+      ac_fn_c_check_type "$LINENO" "nlink_t" "ac_cv_type_nlink_t" "#include <sys/types.h>
+     #include <sys/stat.h>
+"
+if test "x$ac_cv_type_nlink_t" = xyes; then :
+
+else
+
+$as_echo "#define nlink_t int" >>confdefs.h
+
+fi
+
+
+
+    for gl_func in fchmodat fstat fstatat futimens lchmod lstat mkdirat mkfifo mkfifoat     mknod mknodat stat utimensat; 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_n "checking whether $gl_func is declared without a macro... " >&6; }
+if eval \${$as_gl_Symbol+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/stat.h>
+
+int
+main ()
+{
+#undef $gl_func
+  (void) $gl_func;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$as_gl_Symbol=yes"
+else
+  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
+$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
+fi
+      done
+
+
+
+
+
+
+
+
+
+
+
+  :
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+     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_n "checking absolute name of <unistd.h>... " >&6; }
+if ${gl_cv_next_unistd_h+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+             if test $ac_cv_header_unistd_h = yes; then
+
+
+
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <unistd.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 'unistd.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_unistd_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+  sed -n "$gl_absolute_header_sed"`
+
+           gl_header=$gl_cv_absolute_unistd_h
+           gl_cv_next_unistd_h='"'$gl_header'"'
+          else
+               gl_cv_next_unistd_h='<'unistd.h'>'
+             fi
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$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
+
+     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='<'unistd.h'>'
+     else
+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
+       gl_next_as_first_directive=$gl_cv_next_unistd_h
+     fi
+     NEXT_AS_FIRST_DIRECTIVE_UNISTD_H=$gl_next_as_first_directive
+
+
+
+
+  if test $ac_cv_header_unistd_h = yes; then
+    HAVE_UNISTD_H=1
+  else
+    HAVE_UNISTD_H=0
+  fi
+
+
+
+
+
+
+
+    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     truncate 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_n "checking whether $gl_func is declared without a macro... " >&6; }
+if eval \${$as_gl_Symbol+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+/* Some systems declare various items in the wrong headers.  */
+#if !(defined __GLIBC__ && !defined __UCLIBC__)
+# include <fcntl.h>
+# include <stdio.h>
+# include <stdlib.h>
+# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+#  include <io.h>
+# endif
+#endif
+
+int
+main ()
+{
+#undef $gl_func
+  (void) $gl_func;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$as_gl_Symbol=yes"
+else
+  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
+$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
+fi
+      done
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+     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_n "checking absolute name of <wchar.h>... " >&6; }
+if ${gl_cv_next_wchar_h+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+             if test $ac_cv_header_wchar_h = yes; then
+
+
+
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <wchar.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 'wchar.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_wchar_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+  sed -n "$gl_absolute_header_sed"`
+
+           gl_header=$gl_cv_absolute_wchar_h
+           gl_cv_next_wchar_h='"'$gl_header'"'
+          else
+               gl_cv_next_wchar_h='<'wchar.h'>'
+             fi
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$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
+
+     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='<'wchar.h'>'
+     else
+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
+       gl_next_as_first_directive=$gl_cv_next_wchar_h
+     fi
+     NEXT_AS_FIRST_DIRECTIVE_WCHAR_H=$gl_next_as_first_directive
+
+
+
+
+  if test $ac_cv_header_wchar_h = yes; then
+    HAVE_WCHAR_H=1
+  else
+    HAVE_WCHAR_H=0
+  fi
+
+
+
+
+
+  if test $gt_cv_c_wint_t = yes; then
+    HAVE_WINT_T=1
+  else
+    HAVE_WINT_T=0
+  fi
+
+
+
+
+
+    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 wcsftime     ; 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_n "checking whether $gl_func is declared without a macro... " >&6; }
+if eval \${$as_gl_Symbol+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* 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>.  */
+#if !(defined __GLIBC__ && !defined __UCLIBC__)
+# include <stddef.h>
+# include <stdio.h>
+# include <time.h>
+#endif
+#include <wchar.h>
+
+int
+main ()
+{
+#undef $gl_func
+  (void) $gl_func;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$as_gl_Symbol=yes"
+else
+  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
+$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
+fi
+      done
+
+
+
+
+
+
+
+
+
+
+
+
+  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_n "checking whether mbrtowc handles incomplete characters... " >&6; }
+if ${gl_cv_func_mbrtowc_incomplete_state+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+                  case "$host_os" in
+                     # Guess no on AIX and OSF/1.
+        aix* | osf*) gl_cv_func_mbrtowc_incomplete_state="guessing no" ;;
+                     # Guess yes otherwise.
+        *)           gl_cv_func_mbrtowc_incomplete_state="guessing yes" ;;
+      esac
+      if test $LOCALE_JA != none; then
+        if test "$cross_compiling" = yes; then :
+  :
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <locale.h>
+#include <string.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 ()
+{
+  if (setlocale (LC_ALL, "$LOCALE_JA") != NULL)
+    {
+      const char input[] = "B\217\253\344\217\251\316er"; /* "Büßer" */
+      mbstate_t state;
+      wchar_t wc;
+
+      memset (&state, '\0', sizeof (mbstate_t));
+      if (mbrtowc (&wc, input + 1, 1, &state) == (size_t)(-2))
+        if (mbsinit (&state))
+          return 2;
+    }
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  gl_cv_func_mbrtowc_incomplete_state=yes
+else
+  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
+fi
+
+      fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$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_n "checking whether mbrtowc works as well as mbtowc... " >&6; }
+if ${gl_cv_func_mbrtowc_sanitycheck+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+                  case "$host_os" in
+                    # Guess no on Solaris 8.
+        solaris2.8) gl_cv_func_mbrtowc_sanitycheck="guessing no" ;;
+                    # Guess yes otherwise.
+        *)          gl_cv_func_mbrtowc_sanitycheck="guessing yes" ;;
+      esac
+      if test $LOCALE_ZH_CN != none; then
+        if test "$cross_compiling" = yes; then :
+  :
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <locale.h>
+#include <stdlib.h>
+#include <string.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 ()
+{
+  /* This fails on Solaris 8:
+     mbrtowc returns 2, and sets wc to 0x00F0.
+     mbtowc returns 4 (correct) and sets wc to 0x5EDC.  */
+  if (setlocale (LC_ALL, "$LOCALE_ZH_CN") != NULL)
+    {
+      char input[] = "B\250\271\201\060\211\070er"; /* "Büßer" */
+      mbstate_t state;
+      wchar_t wc;
+
+      memset (&state, '\0', sizeof (mbstate_t));
+      if (mbrtowc (&wc, input + 3, 6, &state) != 4
+          && mbtowc (&wc, input + 3, 6) == 4)
+        return 2;
+    }
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  gl_cv_func_mbrtowc_sanitycheck=yes
+else
+  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
+fi
+
+      fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_sanitycheck" >&5
+$as_echo "$gl_cv_func_mbrtowc_sanitycheck" >&6; }
+
+    REPLACE_MBSTATE_T=0
+    case "$gl_cv_func_mbrtowc_incomplete_state" in
+      *yes) ;;
+      *) REPLACE_MBSTATE_T=1 ;;
+    esac
+    case "$gl_cv_func_mbrtowc_sanitycheck" in
+      *yes) ;;
+      *) REPLACE_MBSTATE_T=1 ;;
+    esac
+  else
+    REPLACE_MBSTATE_T=1
+  fi
+
+
+
+  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
+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
+    fi
+  else
+    if test $REPLACE_MBSTATE_T = 1; then
+      REPLACE_WCRTOMB=1
+    else
+
+
+
+
+
+             { $as_echo "$as_me:${as_lineno-$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 :
+  $as_echo_n "(cached) " >&6
+else
+
+                              case "$host_os" in
+                                     # Guess no on AIX 4, OSF/1 and Solaris.
+            aix4* | osf* | solaris*) gl_cv_func_wcrtomb_retval="guessing no" ;;
+                                     # Guess yes on native Windows.
+            mingw*)                  gl_cv_func_wcrtomb_retval="guessing yes" ;;
+                                     # Guess yes otherwise.
+            *)                       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 :
+  :
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <locale.h>
+#include <string.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 ()
+{
+  int result = 0;
+  if (setlocale (LC_ALL, "$LOCALE_FR") != NULL)
+    {
+      if (wcrtomb (NULL, 0, NULL) != 1)
+        result |= 1;
+    }
+  if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL)
+    {
+      if (wcrtomb (NULL, 0, NULL) != 1)
+        result |= 2;
+    }
+  if (setlocale (LC_ALL, "$LOCALE_JA") != NULL)
+    {
+      if (wcrtomb (NULL, 0, NULL) != 1)
+        result |= 4;
+    }
+  if (setlocale (LC_ALL, "$LOCALE_ZH_CN") != NULL)
+    {
+      if (wcrtomb (NULL, 0, NULL) != 1)
+        result |= 8;
+    }
+  return result;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  gl_cv_func_wcrtomb_retval=yes
+else
+  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
+fi
+
+          fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_wcrtomb_retval" >&5
+$as_echo "$gl_cv_func_wcrtomb_retval" >&6; }
+      case "$gl_cv_func_wcrtomb_retval" in
+        *yes) ;;
+        *) REPLACE_WCRTOMB=1 ;;
+      esac
+    fi
+  fi
+
+  if test $HAVE_WCRTOMB = 0 || test $REPLACE_WCRTOMB = 1; then
+
+
+
+
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS wcrtomb.$ac_objext"
+
+
+  :
+
+  fi
+
+
+
+
+
+          GNULIB_WCRTOMB=1
+
+
+
+
+
+$as_echo "#define GNULIB_TEST_WCRTOMB 1" >>confdefs.h
+
+
+
+
+
+
+
+
+  if test $ac_cv_func_iswcntrl = yes; then
+    HAVE_ISWCNTRL=1
+  else
+    HAVE_ISWCNTRL=0
+  fi
+
+
+
+  if test $gt_cv_c_wint_t = yes; then
+    HAVE_WINT_T=1
+  else
+    HAVE_WINT_T=0
+  fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+     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_n "checking absolute name of <wctype.h>... " >&6; }
+if ${gl_cv_next_wctype_h+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+             if test $ac_cv_header_wctype_h = yes; then
+
+
+
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <wctype.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 'wctype.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_wctype_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+  sed -n "$gl_absolute_header_sed"`
+
+           gl_header=$gl_cv_absolute_wctype_h
+           gl_cv_next_wctype_h='"'$gl_header'"'
+          else
+               gl_cv_next_wctype_h='<'wctype.h'>'
+             fi
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$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
+
+     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='<'wctype.h'>'
+     else
+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
+       gl_next_as_first_directive=$gl_cv_next_wctype_h
+     fi
+     NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H=$gl_next_as_first_directive
+
+
+
+
+  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_n "checking whether iswcntrl works... " >&6; }
+if ${gl_cv_func_iswcntrl_works+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+          if test "$cross_compiling" = yes; then :
+               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+                          #if __GNU_LIBRARY__ == 1
+                          Linux libc5 i18n is broken.
+                          #endif
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  gl_cv_func_iswcntrl_works="guessing yes"
+else
+  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
+/* 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>
+               #include <wctype.h>
+               int main () { return iswprint ('x') == 0; }
+
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  gl_cv_func_iswcntrl_works=yes
+else
+  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
+fi
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_iswcntrl_works" >&5
+$as_echo "$gl_cv_func_iswcntrl_works" >&6; }
+    fi
+    HAVE_WCTYPE_H=1
+  else
+    HAVE_WCTYPE_H=0
+  fi
+
+
+  case "$gl_cv_func_iswcntrl_works" in
+    *yes) REPLACE_ISWCNTRL=0 ;;
+    *)    REPLACE_ISWCNTRL=1 ;;
+  esac
+
+
+  if test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; then
+        :
+  fi
+
+  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 :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_TOWLOWER 1
+_ACEOF
+
+fi
+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
+             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 HAVE_WCTYPE_H
+          # include <wctype.h>
+          #endif
+
+"
+if test "x$ac_cv_have_decl_towlower" = xyes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_TOWLOWER $ac_have_decl
+_ACEOF
+
+      if test $ac_cv_have_decl_towlower = yes; then
+                                REPLACE_TOWLOWER=1
+      else
+        REPLACE_TOWLOWER=0
+      fi
+    fi
+  fi
+
+
+  if test $HAVE_ISWCNTRL = 0 || test $REPLACE_TOWLOWER = 1; then
+        :
+  fi
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wctype_t" >&5
+$as_echo_n "checking for wctype_t... " >&6; }
+if ${gl_cv_type_wctype_t+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* 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>
+            #if HAVE_WCTYPE_H
+            # include <wctype.h>
+            #endif
+            wctype_t a;
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  gl_cv_type_wctype_t=yes
+else
+  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 "$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_n "checking for wctrans_t... " >&6; }
+if ${gl_cv_type_wctrans_t+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* 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>
+            #include <wctype.h>
+            wctrans_t a;
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  gl_cv_type_wctrans_t=yes
+else
+  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 "$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
+    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_n "checking whether $gl_func is declared without a macro... " >&6; }
+if eval \${$as_gl_Symbol+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* 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>.  */
+#if !(defined __GLIBC__ && !defined __UCLIBC__)
+# include <stddef.h>
+# include <stdio.h>
+# include <time.h>
+# include <wchar.h>
+#endif
+#include <wctype.h>
+
+int
+main ()
+{
+#undef $gl_func
+  (void) $gl_func;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$as_gl_Symbol=yes"
+else
+  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
+$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
+fi
+      done
+
+
+  # End of code from modules
+
+
+
+
+
+
+
+
+
+  gltests_libdeps=
+  gltests_ltlibdeps=
+
+
+
+
+
+
+
+
+
+  gl_source_base='tests'
+  gltests_WITNESS=IN_`echo "${PACKAGE-$PACKAGE_TARNAME}" | LC_ALL=C tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ | LC_ALL=C sed -e 's/[^A-Z0-9_]/_/g'`_GNULIB_TESTS
+
+  gl_module_indicator_condition=$gltests_WITNESS
+
+
+
+
+
+
+
+
+
+
+
+
+# Check whether --with-curl was given.
+if test "${with_curl+set}" = set; then :
+  withval=$with_curl; with_curl_prefix="$withval"
+else
+  with_curl_prefix=""
+fi
+
+
+
+curlprivatereq=
+curlprivatelibs=
+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: Using $with_curl_prefix as the curl prefix directory." >&6;}
+    CURL_LIBS="`$with_curl_prefix/bin/curl-config --libs`"
+    CURL_STATIC_LIBS=$CURL_LIBS
+    curlprivatelibs="`$with_curl_prefix/bin/curl-config --libs`"
+    CURL_CFLAGS="`$with_curl_prefix/bin/curl-config --cflags`"
+    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
+fi
+
+if test -z "$curl_set"
+then
+    # curlprivatereq=
+    # curlprivatelibs=
+    libdap_pkgconfig_libcurl=yes
+    libdap_libcurl_module='libcurl >= 7.19.0'
+
+
+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_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  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_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
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+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 "$PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+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_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  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_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
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+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 "$ac_pt_PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_pt_PKG_CONFIG" = x; then
+    PKG_CONFIG=""
+  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
+    PKG_CONFIG=$ac_pt_PKG_CONFIG
+  fi
+else
+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+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_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 "yes" >&6; }
+	else
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+		PKG_CONFIG=""
+	fi
+
+fi
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CURL" >&5
+$as_echo_n "checking for CURL... " >&6; }
+
+if test -n "$PKG_CONFIG"; then
+    if test -n "$CURL_CFLAGS"; 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
+  ($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
+  pkg_cv_CURL_CFLAGS=`$PKG_CONFIG --cflags "$libdap_libcurl_module" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+	pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+    if test -n "$CURL_LIBS"; 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
+  ($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
+  pkg_cv_CURL_LIBS=`$PKG_CONFIG --libs "$libdap_libcurl_module" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+	pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        CURL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$libdap_libcurl_module"`
+        else
+	        CURL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$libdap_libcurl_module"`
+        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 "no" >&6; }
+                libdap_pkgconfig_libcurl=no
+elif test $pkg_failed = untried; then
+	libdap_pkgconfig_libcurl=no
+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 "yes" >&6; }
+	:
+fi
+    { $as_echo "$as_me:${as_lineno-$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 "yes; used pkg-config" >&6; }
+    elif curl-config --version > /dev/null 2>&1
+    then
+	   version_libcurl=`curl-config --version | sed 's@libcurl \(.*\)@\1@'`
+
+       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) :
+     ;; #(
+  *) :
+     ;;
+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 "yes; used curl-config and found version $version_libcurl" >&6; }
+    else
+	   as_fn_error $? "I could not find libcurl" "$LINENO" 5
+    fi
+fi
+
+
+
+
+
+
+
+
+# Check whether --with-xml2 was given.
+if test "${with_xml2+set}" = set; then :
+  withval=$with_xml2; with_xml2_prefix="$withval"
+else
+  with_xml2_prefix=""
+fi
+
+
+xmlprivatereq=
+xmlprivatelibs=
+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: 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`"
+    XML2_CFLAGS="`$with_xml2_prefix/bin/xml2-config --cflags`"
+    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
+fi
+
+if test -z "$xml_set"
+then
+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_n "checking for XML2... " >&6; }
+
+if test -n "$PKG_CONFIG"; then
+    if test -n "$XML2_CFLAGS"; 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
+  ($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
+  pkg_cv_XML2_CFLAGS=`$PKG_CONFIG --cflags "$libdap_libxml2_module" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+	pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+    if test -n "$XML2_LIBS"; 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
+  ($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
+  pkg_cv_XML2_LIBS=`$PKG_CONFIG --libs "$libdap_libxml2_module" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+	pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        XML2_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$libdap_libxml2_module"`
+        else
+	        XML2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$libdap_libxml2_module"`
+        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 "no" >&6; }
+                libdap_pkgconfig_libxml2=no
+elif test $pkg_failed = untried; then
+	libdap_pkgconfig_libxml2=no
+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 "yes" >&6; }
+	:
+fi
+{ $as_echo "$as_me:${as_lineno-$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 "yes; used pkg-config" >&6; }
+elif xml2-config --version > /dev/null 2>&1
+then
+	version_libxml2=`xml2-config --version`
+
+        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) :
+     ;; #(
+  *) :
+     ;;
+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 "yes; used xml2-config and found version $version_libxml2" >&6; }
+else
+	as_fn_error $? "I could not find ml2-config" "$LINENO" 5
+fi
+fi
+
+
+
+
+
+
+{ $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
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lpthread  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* 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
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_pthread_pthread_kill=yes
+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 :
+  PTHREAD_LIBS="-lpthread"
+else
+  as_fn_error $? "I could not find pthreads" "$LINENO" 5
+fi
+
+
+
+{ $as_echo "$as_me:${as_lineno-$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 :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-luuid  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* 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 uuid_generate ();
+int
+main ()
+{
+return uuid_generate ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_uuid_uuid_generate=yes
+else
+  ac_cv_lib_uuid_uuid_generate=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_uuid_uuid_generate" >&5
+$as_echo "$ac_cv_lib_uuid_uuid_generate" >&6; }
+if test "x$ac_cv_lib_uuid_uuid_generate" = xyes; then :
+  UUID_LIBS="-luuid"
+else
+  UUID_LIBS=""
+fi
+
+
+
+
+
+
+# Check whether --with-cppunit-prefix was given.
+if test "${with_cppunit_prefix+set}" = set; then :
+  withval=$with_cppunit_prefix; cppunit_config_prefix="$withval"
+else
+  cppunit_config_prefix=""
+fi
+
+
+# Check whether --with-cppunit-exec-prefix was given.
+if test "${with_cppunit_exec_prefix+set}" = set; then :
+  withval=$with_cppunit_exec_prefix; cppunit_config_exec_prefix="$withval"
+else
+  cppunit_config_exec_prefix=""
+fi
+
+
+  if test x$cppunit_config_exec_prefix != x ; then
+     cppunit_config_args="$cppunit_config_args --exec-prefix=$cppunit_config_exec_prefix"
+     if test x${CPPUNIT_CONFIG+set} != xset ; then
+        CPPUNIT_CONFIG=$cppunit_config_exec_prefix/bin/cppunit-config
+     fi
+  fi
+  if test x$cppunit_config_prefix != x ; then
+     cppunit_config_args="$cppunit_config_args --prefix=$cppunit_config_prefix"
+     if test x${CPPUNIT_CONFIG+set} != xset ; then
+        CPPUNIT_CONFIG=$cppunit_config_prefix/bin/cppunit-config
+     fi
+  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_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_CPPUNIT_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $CPPUNIT_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_CPPUNIT_CONFIG="$CPPUNIT_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  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_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
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_CPPUNIT_CONFIG" && ac_cv_path_CPPUNIT_CONFIG="no"
+  ;;
+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 "$CPPUNIT_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$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_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 "no" >&6; }
+    no_cppunit=yes
+  else
+    CPPUNIT_CFLAGS=`$CPPUNIT_CONFIG --cflags`
+    CPPUNIT_LIBS=`$CPPUNIT_CONFIG --libs`
+    cppunit_version=`$CPPUNIT_CONFIG --version`
+
+    cppunit_major_version=`echo $cppunit_version | \
+           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
+    cppunit_minor_version=`echo $cppunit_version | \
+           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
+    cppunit_micro_version=`echo $cppunit_version | \
+           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
+
+    cppunit_major_min=`echo $cppunit_version_min | \
+           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
+    if test "x${cppunit_major_min}" = "x" ; then
+       cppunit_major_min=0
+    fi
+
+    cppunit_minor_min=`echo $cppunit_version_min | \
+           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
+    if test "x${cppunit_minor_min}" = "x" ; then
+       cppunit_minor_min=0
+    fi
+
+    cppunit_micro_min=`echo $cppunit_version_min | \
+           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
+    if test "x${cppunit_micro_min}" = "x" ; then
+       cppunit_micro_min=0
+    fi
+
+    cppunit_version_proper=`expr \
+        $cppunit_major_version \> $cppunit_major_min \| \
+        $cppunit_major_version \= $cppunit_major_min \& \
+        $cppunit_minor_version \> $cppunit_minor_min \| \
+        $cppunit_major_version \= $cppunit_major_min \& \
+        $cppunit_minor_version \= $cppunit_minor_min \& \
+        $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 "$cppunit_major_version.$cppunit_minor_version.$cppunit_micro_version" >&6; }
+    else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+      no_cppunit=yes
+    fi
+  fi
+
+  if test "x$no_cppunit" = x ; then
+      if true; then
+  CPPUNIT_TRUE=
+  CPPUNIT_FALSE='#'
+else
+  CPPUNIT_TRUE='#'
+  CPPUNIT_FALSE=
+fi
+
+  else
+     CPPUNIT_CFLAGS=""
+     CPPUNIT_LIBS=""
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CPPUNIT" >&5
+$as_echo_n "checking for CPPUNIT... " >&6; }
+
+if test -n "$PKG_CONFIG"; then
+    if test -n "$CPPUNIT_CFLAGS"; 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
+  ($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
+  pkg_cv_CPPUNIT_CFLAGS=`$PKG_CONFIG --cflags "cppunit >= 1.12.0" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+	pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+    if test -n "$CPPUNIT_LIBS"; 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
+  ($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
+  pkg_cv_CPPUNIT_LIBS=`$PKG_CONFIG --libs "cppunit >= 1.12.0" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+	pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        CPPUNIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "cppunit >= 1.12.0"`
+        else
+	        CPPUNIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "cppunit >= 1.12.0"`
+        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 "no" >&6; }
+                 if false; then
+  CPPUNIT_TRUE=
+  CPPUNIT_FALSE='#'
+else
+  CPPUNIT_TRUE='#'
+  CPPUNIT_FALSE=
+fi
+
+
+elif test $pkg_failed = untried; then
+	 if false; then
+  CPPUNIT_TRUE=
+  CPPUNIT_FALSE='#'
+else
+  CPPUNIT_TRUE='#'
+  CPPUNIT_FALSE=
+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 "yes" >&6; }
+	 if true; then
+  CPPUNIT_TRUE=
+  CPPUNIT_FALSE='#'
+else
+  CPPUNIT_TRUE='#'
+  CPPUNIT_FALSE=
+fi
+
+fi
+
+
+  fi
+
+
+
+
+
+    # Check whether --enable-debug was given.
+if test "${enable_debug+set}" = set; then :
+  enableval=$enable_debug; DEBUG=$enableval
+else
+  DEBUG=no
+fi
+
+
+    case "$DEBUG" in
+    no)
+      ;;
+    1)
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: Setting debugging to level 1" >&5
+$as_echo "Setting debugging to level 1" >&6; }
+      $as_echo "#define DODS_DEBUG 1" >>confdefs.h
+
+      ;;
+    2)
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: Setting debugging to level 2" >&5
+$as_echo "Setting debugging to level 2" >&6; }
+
+$as_echo "#define DODS_DEBUG /**/" >>confdefs.h
+
+
+$as_echo "#define DODS_DEBUG2 /**/" >>confdefs.h
+
+      ;;
+    *)
+      as_fn_error $? "Bad debug value" "$LINENO" 5
+      ;;
+    esac
+
+if test "$prefix" = "NONE"; then :
+
+$as_echo "#define LIBDAP_ROOT \"/usr/local\"" >>confdefs.h
+
+else
+
+cat >>confdefs.h <<_ACEOF
+#define LIBDAP_ROOT "$prefix"
+_ACEOF
+
+fi
+
+# Check whether --enable-dap4 was given.
+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 :
+
+
+$as_echo "#define DAP4 1" >>confdefs.h
+
+     if true; then
+  DAP4_DEFINED_TRUE=
+  DAP4_DEFINED_FALSE='#'
+else
+  DAP4_DEFINED_TRUE='#'
+  DAP4_DEFINED_FALSE=
+fi
+
+else
+        if false; then
+  DAP4_DEFINED_TRUE=
+  DAP4_DEFINED_FALSE='#'
+else
+  DAP4_DEFINED_TRUE='#'
+  DAP4_DEFINED_FALSE=
+fi
+
+
+fi
+
+# Check whether --enable-developer was given.
+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
+$as_echo "$as_me: Building developer version" >&6;}
+        if true; then
+  BUILD_DEVELOPER_TRUE=
+  BUILD_DEVELOPER_FALSE='#'
+else
+  BUILD_DEVELOPER_TRUE='#'
+  BUILD_DEVELOPER_FALSE=
+fi
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: Not building developer version" >&5
+$as_echo "$as_me: Not building developer version" >&6;}
+        if false; then
+  BUILD_DEVELOPER_TRUE=
+  BUILD_DEVELOPER_FALSE='#'
+else
+  BUILD_DEVELOPER_TRUE='#'
+  BUILD_DEVELOPER_FALSE=
+fi
+
+
+$as_echo "#define NDEBUG 1" >>confdefs.h
+
+fi
+
+
+
+# Check whether --enable-coverage was given.
+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 :
+   CFLAGS="-fprofile-arcs -ftest-coverage -pg $CFLAGS"
+              CXXFLAGS="-fprofile-arcs -ftest-coverage -pg $CXXFLAGS"
+              LDFLAGS="-pg $LDFLAGS"
+              { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gcov_open in -lgcov" >&5
+$as_echo_n "checking for gcov_open in -lgcov... " >&6; }
+if ${ac_cv_lib_gcov_gcov_open+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lgcov  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* 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 gcov_open ();
+int
+main ()
+{
+return gcov_open ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_gcov_gcov_open=yes
+else
+  ac_cv_lib_gcov_gcov_open=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_gcov_gcov_open" >&5
+$as_echo "$ac_cv_lib_gcov_gcov_open" >&6; }
+if test "x$ac_cv_lib_gcov_gcov_open" = xyes; then :
+  LIBS="$LIBS -lgcov"
+fi
+
+	          { $as_echo "$as_me:${as_lineno-$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
+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 :
+  enableval=$enable_valgrind; use_valgrind=$enableval
+else
+  use_valgrind=no
+fi
+
+
+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_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_HAVE_VALGRIND+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$HAVE_VALGRIND"; then
+  ac_cv_prog_HAVE_VALGRIND="$HAVE_VALGRIND" # 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_HAVE_VALGRIND="yes"
+    $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
+
+  test -z "$ac_cv_prog_HAVE_VALGRIND" && ac_cv_prog_HAVE_VALGRIND="no"
+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 "$HAVE_VALGRIND" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$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
+$as_echo "$as_me: Using valgrind with unit tests." >&6;}
+else
+  as_fn_error $? "Valgrind not found in PATH." "$LINENO" 5
+fi
+fi
+
+ if test x$use_valgrind = xyes; then
+  USE_VALGRIND_TRUE=
+  USE_VALGRIND_FALSE='#'
+else
+  USE_VALGRIND_TRUE='#'
+  USE_VALGRIND_FALSE=
+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"
+
+
+ac_config_files="$ac_config_files dap-config"
+
+
+cat >confcache <<\_ACEOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.
+#
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
+#
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
+
+_ACEOF
+
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, we kill variables containing newlines.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+(
+  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=\ *)
+      # `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"
+      ;; #(
+    *)
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      ;;
+    esac |
+    sort
+) |
+  sed '
+     /^ac_cv_env_/b end
+     t clear
+     :clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\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
+$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
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+  fi
+fi
+rm -f confcache
+
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+# Let make expand exec_prefix.
+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+
+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'
+done
+LIBOBJS=$ac_libobjs
+
+LTLIBOBJS=$ac_ltlibobjs
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
+$as_echo_n "checking that generated files are newer than configure... " >&6; }
+   if test -n "$am_sleep_pid"; then
+     # Hide warnings about reused PIDs.
+     wait $am_sleep_pid 2>/dev/null
+   fi
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
+$as_echo "done" >&6; }
+ if test -n "$EXEEXT"; then
+  am__EXEEXT_TRUE=
+  am__EXEEXT_FALSE='#'
+else
+  am__EXEEXT_TRUE='#'
+  am__EXEEXT_FALSE=
+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
+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
+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
+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
+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
+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
+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
+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
+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
+fi
+if test -z "${GL_GENERATE_LIMITS_H_TRUE}" && test -z "${GL_GENERATE_LIMITS_H_FALSE}"; then
+  as_fn_error $? "conditional \"GL_GENERATE_LIMITS_H\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+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
+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
+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
+fi
+if test -z "${GL_GENERATE_LIMITS_H_TRUE}" && test -z "${GL_GENERATE_LIMITS_H_FALSE}"; then
+  as_fn_error $? "conditional \"GL_GENERATE_LIMITS_H\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+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
+fi
+
+    gl_libobjs=
+    gl_ltlibobjs=
+    if test -n "$gl_LIBOBJS"; then
+      # Remove the extension.
+      sed_drop_objext='s/\.o$//;s/\.obj$//'
+      for i in `for i in $gl_LIBOBJS; do echo "$i"; done | sed -e "$sed_drop_objext" | sort | uniq`; do
+        gl_libobjs="$gl_libobjs $i.$ac_objext"
+        gl_ltlibobjs="$gl_ltlibobjs $i.lo"
+      done
+    fi
+    gl_LIBOBJS=$gl_libobjs
+
+    gl_LTLIBOBJS=$gl_ltlibobjs
+
+
+
+    gltests_libobjs=
+    gltests_ltlibobjs=
+    if test -n "$gltests_LIBOBJS"; then
+      # Remove the extension.
+      sed_drop_objext='s/\.o$//;s/\.obj$//'
+      for i in `for i in $gltests_LIBOBJS; do echo "$i"; done | sed -e "$sed_drop_objext" | sort | uniq`; do
+        gltests_libobjs="$gltests_libobjs $i.$ac_objext"
+        gltests_ltlibobjs="$gltests_ltlibobjs $i.lo"
+      done
+    fi
+    gltests_LIBOBJS=$gltests_libobjs
+
+    gltests_LTLIBOBJS=$gltests_ltlibobjs
+
+
+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
+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
+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
+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
+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
+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
+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
+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
+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
+fi
+
+: "${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: creating $CONFIG_STATUS" >&6;}
+as_write_fail=0
+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
+#! $SHELL
+# Generated by $as_me.
+# Run this file to recreate the current configuration.
+# Compiler output produced by configure, useful for debugging
+# configure, is in config.log if it exists.
+
+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. ##
+## -------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+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_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+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
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  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
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
+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
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  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 || :
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+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
+
+
+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
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+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'`
+
+# 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
+
+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
+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 -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'
+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"'
+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
+
+# 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'"
+
+
+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
+# 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.19.1, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
+
+  CONFIG_FILES    = $CONFIG_FILES
+  CONFIG_HEADERS  = $CONFIG_HEADERS
+  CONFIG_LINKS    = $CONFIG_LINKS
+  CONFIG_COMMANDS = $CONFIG_COMMANDS
+  $ $0 $@
+
+on `(hostname || uname -n) 2>/dev/null | sed 1q`
+"
+
+_ACEOF
+
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
+esac
+
+case $ac_config_headers in *"
+"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
+esac
+
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+# Files that config.status was made for.
+config_files="$ac_config_files"
+config_headers="$ac_config_headers"
+config_commands="$ac_config_commands"
+
+_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.
+
+Usage: $0 [OPTION]... [TAG]...
+
+  -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
+      --recheck    update $as_me by reconfiguring in the same conditions
+      --file=FILE[:TEMPLATE]
+                   instantiate the configuration file FILE
+      --header=FILE[:TEMPLATE]
+                   instantiate the configuration header FILE
+
+Configuration files:
+$config_files
+
+Configuration headers:
+$config_headers
+
+Configuration commands:
+$config_commands
+
+Report bugs to <opendap-tech@opendap.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.19.1
+configured by $0, generated by GNU Autoconf 2.69,
+  with options \\"\$ac_cs_config\\"
+
+Copyright (C) 2012 Free Software Foundation, Inc.
+This config.status script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it."
+
+ac_pwd='$ac_pwd'
+srcdir='$srcdir'
+INSTALL='$INSTALL'
+MKDIR_P='$MKDIR_P'
+AWK='$AWK'
+test -n "\$AWK" || AWK=awk
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
+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
+    ac_shift=shift
+    ;;
+  esac
+
+  case $ac_option in
+  # Handling of the options.
+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+    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'"
+    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'"
+    ac_need_defaults=false;;
+  --he | --h)
+    # Conflict between --help and --header
+    as_fn_error $? "ambiguous option: \`$1'
+Try \`$0 --help' for more information.";;
+  --help | --hel | -h )
+    $as_echo "$ac_cs_usage"; exit ;;
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil | --si | --s)
+    ac_cs_silent=: ;;
+
+  # This is an error.
+  -*) as_fn_error $? "unrecognized option: \`$1'
+Try \`$0 --help' for more information." ;;
+
+  *) as_fn_append ac_config_targets " $1"
+     ac_need_defaults=false ;;
+
+  esac
+  shift
+done
+
+ac_configure_extra_args=
+
+if $ac_cs_silent; then
+  exec 6>/dev/null
+  ac_configure_extra_args="$ac_configure_extra_args --silent"
+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
+  shift
+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  CONFIG_SHELL='$SHELL'
+  export CONFIG_SHELL
+  exec "\$@"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+exec 5>>config.log
+{
+  echo
+  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## Running $as_me. ##
+_ASBOX
+  $as_echo "$ac_log"
+} >&5
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+#
+# INIT-COMMANDS
+#
+
+AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+sed_quote_subst='$sed_quote_subst'
+double_quote_subst='$double_quote_subst'
+delay_variable_subst='$delay_variable_subst'
+macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
+macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
+enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
+enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
+pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
+enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
+shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $SED "$delay_single_quote_subst"`'
+SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
+ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
+PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
+host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
+host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
+host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
+build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`'
+build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`'
+build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`'
+SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`'
+Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`'
+GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`'
+EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`'
+FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'
+LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'
+NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'
+LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'
+max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'
+ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'
+exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
+lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
+lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
+lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
+reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
+reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
+OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
+deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
+file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
+AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
+AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
+STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
+RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
+old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
+old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
+old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`'
+lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`'
+CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`'
+CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`'
+compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
+GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_import='`$ECHO "$lt_cv_sys_global_symbol_to_import" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
+lt_cv_nm_interface='`$ECHO "$lt_cv_nm_interface" | $SED "$delay_single_quote_subst"`'
+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
+lt_cv_truncate_bin='`$ECHO "$lt_cv_truncate_bin" | $SED "$delay_single_quote_subst"`'
+objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
+MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
+need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
+DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
+NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
+LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
+OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`'
+OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`'
+libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`'
+shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`'
+extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
+archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`'
+export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`'
+whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`'
+compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`'
+old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
+archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`'
+archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`'
+module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`'
+module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`'
+with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
+allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
+no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
+hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
+hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
+hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`'
+hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`'
+hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
+inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
+link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
+always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
+export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
+exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
+include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
+prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
+file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
+variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
+need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
+need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`'
+version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`'
+runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`'
+shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`'
+shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`'
+libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`'
+library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`'
+soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`'
+install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`'
+postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`'
+postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
+finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
+finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
+hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
+sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
+configure_time_dlsearch_path='`$ECHO "$configure_time_dlsearch_path" | $SED "$delay_single_quote_subst"`'
+configure_time_lt_sys_library_path='`$ECHO "$configure_time_lt_sys_library_path" | $SED "$delay_single_quote_subst"`'
+hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
+enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
+enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
+enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
+old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
+striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
+compiler_lib_search_dirs='`$ECHO "$compiler_lib_search_dirs" | $SED "$delay_single_quote_subst"`'
+predep_objects='`$ECHO "$predep_objects" | $SED "$delay_single_quote_subst"`'
+postdep_objects='`$ECHO "$postdep_objects" | $SED "$delay_single_quote_subst"`'
+predeps='`$ECHO "$predeps" | $SED "$delay_single_quote_subst"`'
+postdeps='`$ECHO "$postdeps" | $SED "$delay_single_quote_subst"`'
+compiler_lib_search_path='`$ECHO "$compiler_lib_search_path" | $SED "$delay_single_quote_subst"`'
+LD_CXX='`$ECHO "$LD_CXX" | $SED "$delay_single_quote_subst"`'
+reload_flag_CXX='`$ECHO "$reload_flag_CXX" | $SED "$delay_single_quote_subst"`'
+reload_cmds_CXX='`$ECHO "$reload_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`'
+GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`'
+archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes_CXX='`$ECHO "$enable_shared_with_static_runtimes_CXX" | $SED "$delay_single_quote_subst"`'
+export_dynamic_flag_spec_CXX='`$ECHO "$export_dynamic_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
+whole_archive_flag_spec_CXX='`$ECHO "$whole_archive_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
+compiler_needs_object_CXX='`$ECHO "$compiler_needs_object_CXX" | $SED "$delay_single_quote_subst"`'
+old_archive_from_new_cmds_CXX='`$ECHO "$old_archive_from_new_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds_CXX='`$ECHO "$old_archive_from_expsyms_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+archive_cmds_CXX='`$ECHO "$archive_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+archive_expsym_cmds_CXX='`$ECHO "$archive_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+module_cmds_CXX='`$ECHO "$module_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+module_expsym_cmds_CXX='`$ECHO "$module_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+with_gnu_ld_CXX='`$ECHO "$with_gnu_ld_CXX" | $SED "$delay_single_quote_subst"`'
+allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
+no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_minus_L_CXX='`$ECHO "$hardcode_minus_L_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`'
+inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`'
+link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`'
+always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`'
+export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
+include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
+prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`'
+compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`'
+predep_objects_CXX='`$ECHO "$predep_objects_CXX" | $SED "$delay_single_quote_subst"`'
+postdep_objects_CXX='`$ECHO "$postdep_objects_CXX" | $SED "$delay_single_quote_subst"`'
+predeps_CXX='`$ECHO "$predeps_CXX" | $SED "$delay_single_quote_subst"`'
+postdeps_CXX='`$ECHO "$postdeps_CXX" | $SED "$delay_single_quote_subst"`'
+compiler_lib_search_path_CXX='`$ECHO "$compiler_lib_search_path_CXX" | $SED "$delay_single_quote_subst"`'
+
+LTCC='$LTCC'
+LTCFLAGS='$LTCFLAGS'
+compiler='$compiler_DEFAULT'
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$1
+_LTECHO_EOF'
+}
+
+# Quote evaled strings.
+for var in SHELL \
+ECHO \
+PATH_SEPARATOR \
+SED \
+GREP \
+EGREP \
+FGREP \
+LD \
+NM \
+LN_S \
+lt_SP2NL \
+lt_NL2SP \
+reload_flag \
+OBJDUMP \
+deplibs_check_method \
+file_magic_cmd \
+file_magic_glob \
+want_nocaseglob \
+DLLTOOL \
+sharedlib_from_linklib_cmd \
+AR \
+AR_FLAGS \
+archiver_list_spec \
+STRIP \
+RANLIB \
+CC \
+CFLAGS \
+compiler \
+lt_cv_sys_global_symbol_pipe \
+lt_cv_sys_global_symbol_to_cdecl \
+lt_cv_sys_global_symbol_to_import \
+lt_cv_sys_global_symbol_to_c_name_address \
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
+lt_cv_nm_interface \
+nm_file_list_spec \
+lt_cv_truncate_bin \
+lt_prog_compiler_no_builtin_flag \
+lt_prog_compiler_pic \
+lt_prog_compiler_wl \
+lt_prog_compiler_static \
+lt_cv_prog_compiler_c_o \
+need_locks \
+MANIFEST_TOOL \
+DSYMUTIL \
+NMEDIT \
+LIPO \
+OTOOL \
+OTOOL64 \
+shrext_cmds \
+export_dynamic_flag_spec \
+whole_archive_flag_spec \
+compiler_needs_object \
+with_gnu_ld \
+allow_undefined_flag \
+no_undefined_flag \
+hardcode_libdir_flag_spec \
+hardcode_libdir_separator \
+exclude_expsyms \
+include_expsyms \
+file_list_spec \
+variables_saved_for_relink \
+libname_spec \
+library_names_spec \
+soname_spec \
+install_override_mode \
+finish_eval \
+old_striplib \
+striplib \
+compiler_lib_search_dirs \
+predep_objects \
+postdep_objects \
+predeps \
+postdeps \
+compiler_lib_search_path \
+LD_CXX \
+reload_flag_CXX \
+compiler_CXX \
+lt_prog_compiler_no_builtin_flag_CXX \
+lt_prog_compiler_pic_CXX \
+lt_prog_compiler_wl_CXX \
+lt_prog_compiler_static_CXX \
+lt_cv_prog_compiler_c_o_CXX \
+export_dynamic_flag_spec_CXX \
+whole_archive_flag_spec_CXX \
+compiler_needs_object_CXX \
+with_gnu_ld_CXX \
+allow_undefined_flag_CXX \
+no_undefined_flag_CXX \
+hardcode_libdir_flag_spec_CXX \
+hardcode_libdir_separator_CXX \
+exclude_expsyms_CXX \
+include_expsyms_CXX \
+file_list_spec_CXX \
+compiler_lib_search_dirs_CXX \
+predep_objects_CXX \
+postdep_objects_CXX \
+predeps_CXX \
+postdeps_CXX \
+compiler_lib_search_path_CXX; do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[\\\\\\\`\\"\\\$]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+# Double-quote double-evaled strings.
+for var in reload_cmds \
+old_postinstall_cmds \
+old_postuninstall_cmds \
+old_archive_cmds \
+extract_expsyms_cmds \
+old_archive_from_new_cmds \
+old_archive_from_expsyms_cmds \
+archive_cmds \
+archive_expsym_cmds \
+module_cmds \
+module_expsym_cmds \
+export_symbols_cmds \
+prelink_cmds \
+postlink_cmds \
+postinstall_cmds \
+postuninstall_cmds \
+finish_cmds \
+sys_lib_search_path_spec \
+configure_time_dlsearch_path \
+configure_time_lt_sys_library_path \
+reload_cmds_CXX \
+old_archive_cmds_CXX \
+old_archive_from_new_cmds_CXX \
+old_archive_from_expsyms_cmds_CXX \
+archive_cmds_CXX \
+archive_expsym_cmds_CXX \
+module_cmds_CXX \
+module_expsym_cmds_CXX \
+export_symbols_cmds_CXX \
+prelink_cmds_CXX \
+postlink_cmds_CXX; do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[\\\\\\\`\\"\\\$]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+ac_aux_dir='$ac_aux_dir'
+
+# See if we are running on zsh, and set the options that allow our
+# commands through without removal of \ escapes INIT.
+if test -n "\${ZSH_VERSION+set}"; then
+   setopt NO_GLOB_SUBST
+fi
+
+
+    PACKAGE='$PACKAGE'
+    VERSION='$VERSION'
+    RM='$RM'
+    ofile='$ofile'
+
+
+
+
+
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+
+# Handling of arguments.
+for ac_config_target in $ac_config_targets
+do
+  case $ac_config_target in
+    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+    "dods-datatypes-config.h") CONFIG_HEADERS="$CONFIG_HEADERS dods-datatypes-config.h" ;;
+    "xdr-datatypes-config.h") CONFIG_HEADERS="$CONFIG_HEADERS xdr-datatypes-config.h" ;;
+    "tests/atconfig") CONFIG_COMMANDS="$CONFIG_COMMANDS tests/atconfig" ;;
+    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+    "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
+    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+    "libdap.pc") CONFIG_FILES="$CONFIG_FILES libdap.pc" ;;
+    "libdapclient.pc") CONFIG_FILES="$CONFIG_FILES libdapclient.pc" ;;
+    "libdapserver.pc") CONFIG_FILES="$CONFIG_FILES libdapserver.pc" ;;
+    "main_page.doxygen") CONFIG_FILES="$CONFIG_FILES main_page.doxygen" ;;
+    "doxy.conf") CONFIG_FILES="$CONFIG_FILES doxy.conf" ;;
+    "abi_checker.xml") CONFIG_FILES="$CONFIG_FILES abi_checker.xml" ;;
+    "gl/Makefile") CONFIG_FILES="$CONFIG_FILES gl/Makefile" ;;
+    "d4_ce/Makefile") CONFIG_FILES="$CONFIG_FILES d4_ce/Makefile" ;;
+    "d4_function/Makefile") CONFIG_FILES="$CONFIG_FILES d4_function/Makefile" ;;
+    "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
+    "tests/atlocal") CONFIG_FILES="$CONFIG_FILES tests/atlocal" ;;
+    "unit-tests/Makefile") CONFIG_FILES="$CONFIG_FILES unit-tests/Makefile" ;;
+    "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;;
+  esac
+done
+
+
+# If the user did not use the arguments to specify the items to instantiate,
+# then the envvar interface is used.  Set only those that are not.
+# We use the long form for the default assignment because of an extremely
+# bizarre bug on SunOS 4.1.3.
+if $ac_need_defaults; then
+  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
+  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
+fi
+
+# Have a temporary directory for convenience.  Make it in the build tree
+# simply because there is no reason against having it here, and in addition,
+# creating and moving files from /tmp can sometimes cause problems.
+# Hook for its removal unless debugging.
+# Note that there is a small window in which the directory will not be cleaned:
+# after its creation but before its name has been assigned to `$tmp'.
+$debug ||
+{
+  tmp= ac_tmp=
+  trap 'exit_status=$?
+  : "${ac_tmp:=$tmp}"
+  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
+' 0
+  trap 'as_fn_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"
+}  ||
+{
+  tmp=./conf$$-$RANDOM
+  (umask 077 && mkdir "$tmp")
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ac_tmp=$tmp
+
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
+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_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'
+else
+  ac_cs_awk_cr=$ac_cr
+fi
+
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
+_ACEOF
+
+
+{
+  echo "cat >conf$$subs.awk <<_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 '^'`
+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
+
+  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
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+rm -f conf$$subs.sh
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\)..*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\)..*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+  N
+  s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
+  for (key in S) S_is_set[key] = 1
+  FS = ""
+
+}
+{
+  line = $ 0
+  nfields = split(line, field, "@")
+  substed = 0
+  len = length(field[1])
+  for (i = 2; i < nfields; i++) {
+    key = field[i]
+    keylen = length(key)
+    if (S_is_set[key]) {
+      value = S[key]
+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+      len += length(value) + length(field[++i])
+      substed = 1
+    } else
+      len += 1 + keylen
+  }
+
+  print line
+}
+
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+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
+_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
+# 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/^:*//
+s/:*$//
+x
+s/\(=[	 ]*\).*/\1/
+G
+s/\n//
+s/^[^=]*=[	 ]*$//
+}'
+fi
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+fi # test -n "$CONFIG_FILES"
+
+# Set up the scripts for CONFIG_HEADERS section.
+# 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 ||
+BEGIN {
+_ACEOF
+
+# Transform confdefs.h into an awk script `defines.awk', embedded as
+# here-document in config.status, that substitutes the proper values into
+# config.h.in to produce config.h.
+
+# Create a delimiter string that does not exist in confdefs.h, to ease
+# 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
+    break
+  elif $ac_last_try; then
+    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+
+# For the awk script, D is an array of macro values keyed by name,
+# likewise P contains macro parameters if any.  Preserve backslash
+# newline sequences.
+
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+sed -n '
+s/.\{148\}/&'"$ac_delim"'/g
+t rset
+:rset
+s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
+t def
+d
+:def
+s/\\$//
+t bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3"/p
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
+d
+:bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3\\\\\\n"\\/p
+t cont
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
+t cont
+d
+:cont
+n
+s/.\{148\}/&'"$ac_delim"'/g
+t clear
+:clear
+s/\\$//
+t bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/"/p
+d
+:bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
+b cont
+' <confdefs.h | sed '
+s/'"$ac_delim"'/"\\\
+"/g' >>$CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  for (key in D) D_is_set[key] = 1
+  FS = ""
+}
+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
+  line = \$ 0
+  split(line, arg, " ")
+  if (arg[1] == "#") {
+    defundef = arg[2]
+    mac1 = arg[3]
+  } else {
+    defundef = substr(arg[1], 2)
+    mac1 = arg[2]
+  }
+  split(mac1, mac2, "(") #)
+  macro = mac2[1]
+  prefix = substr(line, 1, index(line, defundef) - 1)
+  if (D_is_set[macro]) {
+    # Preserve the white space surrounding the "#".
+    print prefix "define", macro P[macro] D[macro]
+    next
+  } else {
+    # Replace #undef with comments.  This is necessary, for example,
+    # in the case of _POSIX_SOURCE, which is predefined and required
+    # on some systems where configure will not decide to define it.
+    if (defundef == "undef") {
+      print "/*", prefix defundef, macro, "*/"
+      next
+    }
+  }
+}
+{ print }
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
+fi # test -n "$CONFIG_HEADERS"
+
+
+eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
+shift
+for ac_tag
+do
+  case $ac_tag in
+  :[FHLC]) ac_mode=$ac_tag; continue;;
+  esac
+  case $ac_mode$ac_tag in
+  :[FHL]*:*);;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
+  :[FH]-) ac_tag=-:-;;
+  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+  esac
+  ac_save_IFS=$IFS
+  IFS=:
+  set x $ac_tag
+  IFS=$ac_save_IFS
+  shift
+  ac_file=$1
+  shift
+
+  case $ac_mode in
+  :L) ac_source=$1;;
+  :[FH])
+    ac_file_inputs=
+    for ac_f
+    do
+      case $ac_f in
+      -) ac_f="$ac_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 `:'.
+	 test -f "$ac_f" ||
+	   case $ac_f in
+	   [\\/$]*) false;;
+	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+	   esac ||
+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+      esac
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      as_fn_append ac_file_inputs " '$ac_f'"
+    done
+
+    # Let's still pretend it is `configure' which instantiates (i.e., don't
+    # use $as_me), people would be surprised to read:
+    #    /* config.h.  Generated by config.status.  */
+    configure_input='Generated from '`
+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	`' 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: creating $ac_file" >&6;}
+    fi
+    # Neutralize special characters interpreted by sed in replacement strings.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=`$as_echo "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
+
+    case $ac_tag in
+    *:-:* | *:-) cat >"$ac_tmp/stdin" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+    esac
+    ;;
+  esac
+
+  ac_dir=`$as_dirname -- "$ac_file" ||
+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$ac_file" : 'X\(//\)[^/]' \| \
+	 X"$ac_file" : 'X\(//\)$' \| \
+	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$ac_file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  as_dir="$ac_dir"; as_fn_mkdir_p
+  ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+  .)  # We are building in place.
+    ac_srcdir=.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+
+  case $ac_mode in
+  :F)
+  #
+  # CONFIG_FILE
+  #
+
+  case $INSTALL in
+  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
+  esac
+  ac_MKDIR_P=$MKDIR_P
+  case $MKDIR_P in
+  [\\/$]* | ?:[\\/]* ) ;;
+  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
+  esac
+_ACEOF
+
+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
+  q
+}
+/@datadir@/p
+/@docdir@/p
+/@infodir@/p
+/@localedir@/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: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  ac_datarootdir_hack='
+  s&@datadir@&$datadir&g
+  s&@docdir@&$docdir&g
+  s&@infodir@&$infodir&g
+  s&@localedir@&$localedir&g
+  s&@mandir@&$mandir&g
+  s&\\\${datarootdir}&$datarootdir&g' ;;
+esac
+_ACEOF
+
+# Neutralize VPATH when `$srcdir' = `.'.
+# Shell code in configure.ac might set extrasub.
+# FIXME: do we really want to maintain this feature?
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
+$extrasub
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+:t
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+s|@configure_input@|$ac_sed_conf_input|;t t
+s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
+s&@srcdir@&$ac_srcdir&;t t
+s&@abs_srcdir@&$ac_abs_srcdir&;t t
+s&@top_srcdir@&$ac_top_srcdir&;t t
+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
+s&@builddir@&$ac_builddir&;t t
+s&@abs_builddir@&$ac_abs_builddir&;t t
+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
+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
+
+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
+$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;}
+
+  rm -f "$ac_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";;
+  esac \
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ ;;
+  :H)
+  #
+  # CONFIG_HEADER
+  #
+  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
+$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
+    fi
+  else
+    $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
+      || as_fn_error $? "could not create -" "$LINENO" 5
+  fi
+# Compute "$ac_file"'s index in $config_headers.
+_am_arg="$ac_file"
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+  case $_am_header in
+    $_am_arg | $_am_arg:* )
+      break ;;
+    * )
+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+  esac
+done
+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$_am_arg" : 'X\(//\)[^/]' \| \
+	 X"$_am_arg" : 'X\(//\)$' \| \
+	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$_am_arg" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`/stamp-h$_am_stamp_count
+ ;;
+
+  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
+$as_echo "$as_me: executing $ac_file commands" >&6;}
+ ;;
+  esac
+
+
+  case $ac_file$ac_mode in
+    "tests/atconfig":C) cat >tests/atconfig <<ATEOF
+# Configurable variable values for building test suites.
+# Generated by $0.
+# Copyright (C) 2012 Free Software Foundation, Inc.
+
+# The test suite will define top_srcdir=$at_top_srcdir/../.. etc.
+at_testdir='tests'
+abs_builddir='$ac_abs_builddir'
+at_srcdir='$ac_srcdir'
+abs_srcdir='$ac_abs_srcdir'
+at_top_srcdir='$ac_top_srcdir'
+abs_top_srcdir='$ac_abs_top_srcdir'
+at_top_build_prefix='$ac_top_build_prefix'
+abs_top_builddir='$ac_abs_top_builddir'
+
+# Backward compatibility with Autotest <= 2.59b:
+at_top_builddir=\$at_top_build_prefix
+
+AUTOTEST_PATH='.'
+
+SHELL=\${CONFIG_SHELL-'$SHELL'}
+ATEOF
+ ;;
+    "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
+  # Older Autoconf quotes --file arguments for eval, but not when files
+  # are listed without --file.  Let's play safe and only enable the eval
+  # if we detect the quoting.
+  case $CONFIG_FILES in
+  *\'*) eval set x "$CONFIG_FILES" ;;
+  *)   set x $CONFIG_FILES ;;
+  esac
+  shift
+  for mf
+  do
+    # Strip MF so we end up with the name of the file.
+    mf=`echo "$mf" | sed -e 's/:.*$//'`
+    # Check whether this is an Automake generated Makefile or not.
+    # We used to match only the files named 'Makefile.in', but
+    # some people rename them; so instead we look at the file content.
+    # Grep'ing the first line is not enough: some people post-process
+    # each Makefile.in and add a new line on top of each file to say so.
+    # Grep'ing the whole file is not good either: AIX grep has a line
+    # limit of 2048, but all sed's we know have understand at least 4000.
+    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+      dirpart=`$as_dirname -- "$mf" ||
+$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$mf" : 'X\(//\)[^/]' \| \
+	 X"$mf" : 'X\(//\)$' \| \
+	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$mf" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+    else
+      continue
+    fi
+    # Extract the definition of DEPDIR, am__include, and am__quote
+    # from the Makefile without running 'make'.
+    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+    test -z "$DEPDIR" && continue
+    am__include=`sed -n 's/^am__include = //p' < "$mf"`
+    test -z "$am__include" && continue
+    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+    # Find all dependency output files, they are included files with
+    # $(DEPDIR) in their names.  We invoke sed twice because it is the
+    # simplest approach to changing $(DEPDIR) to its actual value in the
+    # expansion.
+    for file in `sed -n "
+      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
+      # Make sure the directory exists.
+      test -f "$dirpart/$file" && continue
+      fdir=`$as_dirname -- "$file" ||
+$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$file" : 'X\(//\)[^/]' \| \
+	 X"$file" : 'X\(//\)$' \| \
+	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      as_dir=$dirpart/$fdir; as_fn_mkdir_p
+      # echo "creating $dirpart/$file"
+      echo '# dummy' > "$dirpart/$file"
+    done
+  done
+}
+ ;;
+    "libtool":C)
+
+    # See if we are running on zsh, and set the options that allow our
+    # commands through without removal of \ escapes.
+    if test -n "${ZSH_VERSION+set}"; then
+      setopt NO_GLOB_SUBST
+    fi
+
+    cfgfile=${ofile}T
+    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
+    $RM "$cfgfile"
+
+    cat <<_LT_EOF >> "$cfgfile"
+#! $SHELL
+# Generated automatically by $as_me ($PACKAGE) $VERSION
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+
+# Provide generalized library-building support services.
+# Written by Gordon Matzigkeit, 1996
+
+# Copyright (C) 2014 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions.  There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# GNU Libtool is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of of the License, or
+# (at your option) any later version.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program or library that is built
+# using GNU Libtool, you may include this file under the  same
+# distribution terms that you use for the rest of that program.
+#
+# GNU Libtool is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+# The names of the tagged configurations supported by this script.
+available_tags='CXX '
+
+# Configured defaults for sys_lib_dlsearch_path munging.
+: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
+
+# ### BEGIN LIBTOOL CONFIG
+
+# Which release of libtool.m4 was used?
+macro_version=$macro_version
+macro_revision=$macro_revision
+
+# Whether or not to build shared libraries.
+build_libtool_libs=$enable_shared
+
+# Whether or not to build static libraries.
+build_old_libs=$enable_static
+
+# What type of objects to build.
+pic_mode=$pic_mode
+
+# Whether or not to optimize for fast installation.
+fast_install=$enable_fast_install
+
+# Shared archive member basename,for filename based shared library versioning on AIX.
+shared_archive_member_spec=$shared_archive_member_spec
+
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
+
+# An echo program that protects backslashes.
+ECHO=$lt_ECHO
+
+# The PATH separator for the build system.
+PATH_SEPARATOR=$lt_PATH_SEPARATOR
+
+# The host system.
+host_alias=$host_alias
+host=$host
+host_os=$host_os
+
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
+
+# A sed program that does not truncate output.
+SED=$lt_SED
+
+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
+Xsed="\$SED -e 1s/^X//"
+
+# A grep program that handles long lines.
+GREP=$lt_GREP
+
+# An ERE matcher.
+EGREP=$lt_EGREP
+
+# A literal string matcher.
+FGREP=$lt_FGREP
+
+# A BSD- or MS-compatible name lister.
+NM=$lt_NM
+
+# Whether we need soft or hard links.
+LN_S=$lt_LN_S
+
+# What is the maximum length of a command?
+max_cmd_len=$max_cmd_len
+
+# Object file suffix (normally "o").
+objext=$ac_objext
+
+# Executable file suffix (normally "").
+exeext=$exeext
+
+# whether the shell understands "unset".
+lt_unset=$lt_unset
+
+# turn spaces into newlines.
+SP2NL=$lt_lt_SP2NL
+
+# turn newlines into spaces.
+NL2SP=$lt_lt_NL2SP
+
+# convert \$build file names to \$host format.
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+
+# convert \$build files to toolchain format.
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+
+# An object symbol dumper.
+OBJDUMP=$lt_OBJDUMP
+
+# Method to check whether dependent libraries are shared objects.
+deplibs_check_method=$lt_deplibs_check_method
+
+# Command to use when deplibs_check_method = "file_magic".
+file_magic_cmd=$lt_file_magic_cmd
+
+# How to find potential files when deplibs_check_method = "file_magic".
+file_magic_glob=$lt_file_magic_glob
+
+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
+want_nocaseglob=$lt_want_nocaseglob
+
+# DLL creation program.
+DLLTOOL=$lt_DLLTOOL
+
+# Command to associate shared and link libraries.
+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
+
+# The archiver.
+AR=$lt_AR
+
+# Flags to create an archive.
+AR_FLAGS=$lt_AR_FLAGS
+
+# How to feed a file listing to the archiver.
+archiver_list_spec=$lt_archiver_list_spec
+
+# A symbol stripping program.
+STRIP=$lt_STRIP
+
+# Commands used to install an old-style archive.
+RANLIB=$lt_RANLIB
+old_postinstall_cmds=$lt_old_postinstall_cmds
+old_postuninstall_cmds=$lt_old_postuninstall_cmds
+
+# Whether to use a lock for old archive extraction.
+lock_old_archive_extraction=$lock_old_archive_extraction
+
+# A C compiler.
+LTCC=$lt_CC
+
+# LTCC compiler flags.
+LTCFLAGS=$lt_CFLAGS
+
+# Take the output of nm and produce a listing of raw symbols and C names.
+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+
+# Transform the output of nm in a proper C declaration.
+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+
+# Transform the output of nm into a list of symbols to manually relocate.
+global_symbol_to_import=$lt_lt_cv_sys_global_symbol_to_import
+
+# Transform the output of nm in a C name address pair.
+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+
+# Transform the output of nm in a C name address pair when lib prefix is needed.
+global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
+
+# The name lister interface.
+nm_interface=$lt_lt_cv_nm_interface
+
+# Specify filename containing input files for \$NM.
+nm_file_list_spec=$lt_nm_file_list_spec
+
+# The root where to search for dependent libraries,and where our libraries should be installed.
+lt_sysroot=$lt_sysroot
+
+# Command to truncate a binary pipe.
+lt_truncate_bin=$lt_lt_cv_truncate_bin
+
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
+
+# Used to examine libraries when file_magic_cmd begins with "file".
+MAGIC_CMD=$MAGIC_CMD
+
+# Must we lock files when doing compilation?
+need_locks=$lt_need_locks
+
+# Manifest tool.
+MANIFEST_TOOL=$lt_MANIFEST_TOOL
+
+# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
+DSYMUTIL=$lt_DSYMUTIL
+
+# Tool to change global to local symbols on Mac OS X.
+NMEDIT=$lt_NMEDIT
+
+# Tool to manipulate fat objects and archives on Mac OS X.
+LIPO=$lt_LIPO
+
+# ldd/readelf like tool for Mach-O binaries on Mac OS X.
+OTOOL=$lt_OTOOL
+
+# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4.
+OTOOL64=$lt_OTOOL64
+
+# Old archive suffix (normally "a").
+libext=$libext
+
+# Shared library suffix (normally ".so").
+shrext_cmds=$lt_shrext_cmds
+
+# The commands to extract the exported symbol list from a shared archive.
+extract_expsyms_cmds=$lt_extract_expsyms_cmds
+
+# Variables whose values should be saved in libtool wrapper scripts and
+# restored at link time.
+variables_saved_for_relink=$lt_variables_saved_for_relink
+
+# Do we need the "lib" prefix for modules?
+need_lib_prefix=$need_lib_prefix
+
+# Do we need a version for libraries?
+need_version=$need_version
+
+# Library versioning type.
+version_type=$version_type
+
+# Shared library runtime path variable.
+runpath_var=$runpath_var
+
+# Shared library path variable.
+shlibpath_var=$shlibpath_var
+
+# Is shlibpath searched before the hard-coded library search path?
+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+
+# Format of library name prefix.
+libname_spec=$lt_libname_spec
+
+# List of archive names.  First name is the real one, the rest are links.
+# The last name is the one that the linker finds with -lNAME
+library_names_spec=$lt_library_names_spec
+
+# The coded name of the library, if different from the real name.
+soname_spec=$lt_soname_spec
+
+# Permission mode override for installation of shared libraries.
+install_override_mode=$lt_install_override_mode
+
+# Command to use after installation of a shared archive.
+postinstall_cmds=$lt_postinstall_cmds
+
+# Command to use after uninstallation of a shared archive.
+postuninstall_cmds=$lt_postuninstall_cmds
+
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds=$lt_finish_cmds
+
+# As "finish_cmds", except a single script fragment to be evaled but
+# not shown.
+finish_eval=$lt_finish_eval
+
+# Whether we should hardcode library paths into libraries.
+hardcode_into_libs=$hardcode_into_libs
+
+# Compile-time system search path for libraries.
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+
+# Detected run-time system search path for libraries.
+sys_lib_dlsearch_path_spec=$lt_configure_time_dlsearch_path
+
+# Explicit LT_SYS_LIBRARY_PATH set during ./configure time.
+configure_time_lt_sys_library_path=$lt_configure_time_lt_sys_library_path
+
+# Whether dlopen is supported.
+dlopen_support=$enable_dlopen
+
+# Whether dlopen of programs is supported.
+dlopen_self=$enable_dlopen_self
+
+# Whether dlopen of statically linked programs is supported.
+dlopen_self_static=$enable_dlopen_self_static
+
+# Commands to strip libraries.
+old_striplib=$lt_old_striplib
+striplib=$lt_striplib
+
+
+# The linker used to build libraries.
+LD=$lt_LD
+
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
+
+# Commands used to build an old-style archive.
+old_archive_cmds=$lt_old_archive_cmds
+
+# A language specific compiler.
+CC=$lt_compiler
+
+# Is the compiler the GNU compiler?
+with_gcc=$GCC
+
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
+
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic
+
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_lt_prog_compiler_static
+
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_lt_cv_prog_compiler_c_o
+
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$archive_cmds_need_lc
+
+# Whether or not to disallow shared libs when runtime libs are static.
+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_whole_archive_flag_spec
+
+# Whether the compiler copes with passing no objects directly.
+compiler_needs_object=$lt_compiler_needs_object
+
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
+
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
+
+# Commands used to build a shared archive.
+archive_cmds=$lt_archive_cmds
+archive_expsym_cmds=$lt_archive_expsym_cmds
+
+# Commands used to build a loadable module if different from building
+# a shared archive.
+module_cmds=$lt_module_cmds
+module_expsym_cmds=$lt_module_expsym_cmds
+
+# Whether we are building with GNU ld or not.
+with_gnu_ld=$lt_with_gnu_ld
+
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_allow_undefined_flag
+
+# Flag that enforces no undefined symbols.
+no_undefined_flag=$lt_no_undefined_flag
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist
+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
+
+# Whether we need a single "-rpath" flag with a separated argument.
+hardcode_libdir_separator=$lt_hardcode_libdir_separator
+
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
+# DIR into the resulting binary.
+hardcode_direct=$hardcode_direct
+
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
+# DIR into the resulting binary and the resulting library dependency is
+# "absolute",i.e impossible to change by setting \$shlibpath_var if the
+# library is relocated.
+hardcode_direct_absolute=$hardcode_direct_absolute
+
+# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+# into the resulting binary.
+hardcode_minus_L=$hardcode_minus_L
+
+# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
+# into the resulting binary.
+hardcode_shlibpath_var=$hardcode_shlibpath_var
+
+# Set to "yes" if building a shared library automatically hardcodes DIR
+# into the library and all subsequent libraries and executables linked
+# against it.
+hardcode_automatic=$hardcode_automatic
+
+# Set to yes if linker adds runtime paths of dependent libraries
+# to runtime path list.
+inherit_rpath=$inherit_rpath
+
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$link_all_deplibs
+
+# Set to "yes" if exported symbols are required.
+always_export_symbols=$always_export_symbols
+
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_export_symbols_cmds
+
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_exclude_expsyms
+
+# Symbols that must always be exported.
+include_expsyms=$lt_include_expsyms
+
+# Commands necessary for linking programs (against libraries) with templates.
+prelink_cmds=$lt_prelink_cmds
+
+# Commands necessary for finishing linking programs.
+postlink_cmds=$lt_postlink_cmds
+
+# Specify filename containing input files.
+file_list_spec=$lt_file_list_spec
+
+# How to hardcode a shared library path into an executable.
+hardcode_action=$hardcode_action
+
+# The directories searched by this compiler when creating a shared library.
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs
+
+# Dependencies to place before and after the objects being linked to
+# create a shared library.
+predep_objects=$lt_predep_objects
+postdep_objects=$lt_postdep_objects
+predeps=$lt_predeps
+postdeps=$lt_postdeps
+
+# The library search path used internally by the compiler when linking
+# a shared library.
+compiler_lib_search_path=$lt_compiler_lib_search_path
+
+# ### END LIBTOOL CONFIG
+
+_LT_EOF
+
+    cat <<'_LT_EOF' >> "$cfgfile"
+
+# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
+
+# func_munge_path_list VARIABLE PATH
+# -----------------------------------
+# VARIABLE is name of variable containing _space_ separated list of
+# directories to be munged by the contents of PATH, which is string
+# having a format:
+# "DIR[:DIR]:"
+#       string "DIR[ DIR]" will be prepended to VARIABLE
+# ":DIR[:DIR]"
+#       string "DIR[ DIR]" will be appended to VARIABLE
+# "DIRP[:DIRP]::[DIRA:]DIRA"
+#       string "DIRP[ DIRP]" will be prepended to VARIABLE and string
+#       "DIRA[ DIRA]" will be appended to VARIABLE
+# "DIR[:DIR]"
+#       VARIABLE will be replaced by "DIR[ DIR]"
+func_munge_path_list ()
+{
+    case x$2 in
+    x)
+        ;;
+    *:)
+        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
+        ;;
+    x:*)
+        eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
+        ;;
+    *::*)
+        eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+        eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
+        ;;
+    *)
+        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
+        ;;
+    esac
+}
+
+
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+func_cc_basename ()
+{
+    for cc_temp in $*""; do
+      case $cc_temp in
+        compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+        distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+        \-*) ;;
+        *) break;;
+      esac
+    done
+    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+}
+
+
+# ### END FUNCTIONS SHARED WITH CONFIGURE
+
+_LT_EOF
+
+  case $host_os in
+  aix3*)
+    cat <<\_LT_EOF >> "$cfgfile"
+# AIX sometimes has problems with the GCC collect2 program.  For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test set != "${COLLECT_NAMES+set}"; then
+  COLLECT_NAMES=
+  export COLLECT_NAMES
+fi
+_LT_EOF
+    ;;
+  esac
+
+
+ltmain=$ac_aux_dir/ltmain.sh
+
+
+  # We use sed instead of cat because bash on DJGPP gets confused if
+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+  # text mode, it properly converts lines to CR/LF.  This bash problem
+  # is reportedly fixed, but why not run on old versions too?
+  sed '$q' "$ltmain" >> "$cfgfile" \
+     || (rm -f "$cfgfile"; exit 1)
+
+   mv -f "$cfgfile" "$ofile" ||
+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+  chmod +x "$ofile"
+
+
+    cat <<_LT_EOF >> "$ofile"
+
+# ### BEGIN LIBTOOL TAG CONFIG: CXX
+
+# The linker used to build libraries.
+LD=$lt_LD_CXX
+
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag_CXX
+reload_cmds=$lt_reload_cmds_CXX
+
+# Commands used to build an old-style archive.
+old_archive_cmds=$lt_old_archive_cmds_CXX
+
+# A language specific compiler.
+CC=$lt_compiler_CXX
+
+# Is the compiler the GNU compiler?
+with_gcc=$GCC_CXX
+
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
+
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic_CXX
+
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl_CXX
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_lt_prog_compiler_static_CXX
+
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
+
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$archive_cmds_need_lc_CXX
+
+# Whether or not to disallow shared libs when runtime libs are static.
+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
+
+# Whether the compiler copes with passing no objects directly.
+compiler_needs_object=$lt_compiler_needs_object_CXX
+
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
+
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
+
+# Commands used to build a shared archive.
+archive_cmds=$lt_archive_cmds_CXX
+archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
+
+# Commands used to build a loadable module if different from building
+# a shared archive.
+module_cmds=$lt_module_cmds_CXX
+module_expsym_cmds=$lt_module_expsym_cmds_CXX
+
+# Whether we are building with GNU ld or not.
+with_gnu_ld=$lt_with_gnu_ld_CXX
+
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_allow_undefined_flag_CXX
+
+# Flag that enforces no undefined symbols.
+no_undefined_flag=$lt_no_undefined_flag_CXX
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist
+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
+
+# Whether we need a single "-rpath" flag with a separated argument.
+hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
+
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
+# DIR into the resulting binary.
+hardcode_direct=$hardcode_direct_CXX
+
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
+# DIR into the resulting binary and the resulting library dependency is
+# "absolute",i.e impossible to change by setting \$shlibpath_var if the
+# library is relocated.
+hardcode_direct_absolute=$hardcode_direct_absolute_CXX
+
+# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+# into the resulting binary.
+hardcode_minus_L=$hardcode_minus_L_CXX
+
+# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
+# into the resulting binary.
+hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
+
+# Set to "yes" if building a shared library automatically hardcodes DIR
+# into the library and all subsequent libraries and executables linked
+# against it.
+hardcode_automatic=$hardcode_automatic_CXX
+
+# Set to yes if linker adds runtime paths of dependent libraries
+# to runtime path list.
+inherit_rpath=$inherit_rpath_CXX
+
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$link_all_deplibs_CXX
+
+# Set to "yes" if exported symbols are required.
+always_export_symbols=$always_export_symbols_CXX
+
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_export_symbols_cmds_CXX
+
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_exclude_expsyms_CXX
+
+# Symbols that must always be exported.
+include_expsyms=$lt_include_expsyms_CXX
+
+# Commands necessary for linking programs (against libraries) with templates.
+prelink_cmds=$lt_prelink_cmds_CXX
+
+# Commands necessary for finishing linking programs.
+postlink_cmds=$lt_postlink_cmds_CXX
+
+# Specify filename containing input files.
+file_list_spec=$lt_file_list_spec_CXX
+
+# How to hardcode a shared library path into an executable.
+hardcode_action=$hardcode_action_CXX
+
+# The directories searched by this compiler when creating a shared library.
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX
+
+# Dependencies to place before and after the objects being linked to
+# create a shared library.
+predep_objects=$lt_predep_objects_CXX
+postdep_objects=$lt_postdep_objects_CXX
+predeps=$lt_predeps_CXX
+postdeps=$lt_postdeps_CXX
+
+# The library search path used internally by the compiler when linking
+# a shared library.
+compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
+
+# ### END LIBTOOL TAG CONFIG: CXX
+_LT_EOF
+
+ ;;
+    "dap-config":F) chmod +x dap-config ;;
+
+  esac
+done # for ac_tag
+
+
+as_fn_exit 0
+_ACEOF
+ac_clean_files=$ac_clean_files_save
+
+test $ac_write_fail = 0 ||
+  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
+
+
+# configure is writing to config.log, and then calls config.status.
+# config.status does its own redirection, appending to config.log.
+# Unfortunately, on DOS this fails, as config.log is still kept open
+# by configure, so config.status won't be able to write to it; its
+# output is simply discarded.  So we exec the FD to /dev/null,
+# effectively closing config.log, so it can be properly (re)opened and
+# appended to by config.status.  When coming back to configure, we
+# need to make the FD available again.
+if test "$no_create" != yes; then
+  ac_cs_success=:
+  ac_config_status_args=
+  test "$silent" = yes &&
+    ac_config_status_args="$ac_config_status_args --quiet"
+  exec 5>/dev/null
+  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
+  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
+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: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
+
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 0000000..2529e41
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,379 @@
+
+dnl -*- autoconf -*-
+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.19.1, opendap-tech@opendap.org)
+AC_DEFINE(DAP_PROTOCOL_VERSION, ["4.0"], [Highest DAP version implemented?])
+AC_SUBST(DAP_PROTOCOL_VERSION)
+
+AC_CONFIG_SRCDIR([Connect.cc])
+AC_CONFIG_AUX_DIR(conf)
+AC_CONFIG_HEADERS([config.h dods-datatypes-config.h xdr-datatypes-config.h])
+AC_CONFIG_MACRO_DIR([conf])
+
+AM_INIT_AUTOMAKE
+AC_CONFIG_TESTDIR(tests, [.])
+
+AC_DEFINE(CNAME, "libdap", [What sort of HTTP client is this?])
+AC_DEFINE_UNQUOTED(CVER, "$PACKAGE_VERSION", [Client version number])
+AC_DEFINE_UNQUOTED(DVR, "libdap/$PACKAGE_VERSION", [Client name and version combined])
+AC_SUBST(DVR)
+
+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@'`
+AC_MSG_NOTICE(Package Major Version:     $PACKAGE_MAJOR_VERSION)
+AC_MSG_NOTICE(Package Minor Version:     $PACKAGE_MINOR_VERSION)
+AC_MSG_NOTICE(Package SubMinor Version:  $PACKAGE_SUBMINOR_VERSION)
+AC_SUBST(PACKAGE_MAJOR_VERSION)
+AC_SUBST(PACKAGE_MINOR_VERSION)
+AC_SUBST(PACKAGE_SUBMINOR_VERSION)
+
+dnl flags for the compilers and linkers - set these before locating the
+dnl actual tools since some of the AC_PROG macros set these `flag variables'
+dnl to default values otherwise.
+
+AC_CANONICAL_HOST
+AC_SUBST(host)
+
+dnl How to set these SO variables:
+dnl No interfaces changed, only implementations (good): ==> Increment REVISION.
+dnl Interfaces added, none removed (good): ==> Increment CURRENT,
+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=25
+DAPLIB_AGE=0
+DAPLIB_REVISION=1
+AC_SUBST(DAPLIB_CURRENT)
+AC_SUBST(DAPLIB_AGE)
+AC_SUBST(DAPLIB_REVISION)
+
+LIBDAP_VERSION="$DAPLIB_CURRENT:$DAPLIB_REVISION:$DAPLIB_AGE"
+AC_SUBST(LIBDAP_VERSION)
+
+CLIENTLIB_CURRENT=7
+CLIENTLIB_AGE=1
+CLIENTLIB_REVISION=7
+AC_SUBST(CLIENTLIB_CURRENT)
+AC_SUBST(CLIENTLIB_AGE)
+AC_SUBST(CLIENTLIB_REVISION)
+
+CLIENTLIB_VERSION="$CLIENTLIB_CURRENT:$CLIENTLIB_REVISION:$CLIENTLIB_AGE"
+AC_SUBST(CLIENTLIB_VERSION)
+
+SERVERLIB_CURRENT=13
+SERVERLIB_AGE=6
+SERVERLIB_REVISION=7
+AC_SUBST(SERVERLIB_CURRENT)
+AC_SUBST(SERVERLIB_AGE)
+AC_SUBST(SERVERLIB_REVISION)
+
+SERVERLIB_VERSION="$SERVERLIB_CURRENT:$SERVERLIB_REVISION:$SERVERLIB_AGE"
+AC_SUBST(SERVERLIB_VERSION)
+
+dnl Checks for programs.
+AC_PROG_AWK
+AC_PROG_CXX
+AC_PROG_CC
+
+dnl Call this gnulib macro right after a working C Compiler is found
+gl_EARLY
+
+dnl echo "CC = $CC"
+AS_IF([test x$CC = xgcc],
+      [AM_CONDITIONAL([COMPILER_IS_GCC],[true])],
+      [AM_CONDITIONAL([COMPILER_IS_GCC],[false])])
+
+dnl AC_PROG_YACC
+dnl AC_PROG_LEX
+AM_PROG_LEX
+AC_PROG_INSTALL
+AC_PROG_LN_S
+AC_PROG_MAKE_SET
+AC_PROG_LIBTOOL
+
+dnl We really need bison and not yacc. If you use AC_PROG_YACC, the resulting 
+dnl Makefile will call bison -y which doesn't know how to make the parsers 
+dnl we require. jhrg 6/15/05
+AC_CHECK_PROG(YACC,[bison],[bison])
+
+dnl We have found bison; get its version
+bison_version=`bison --version | sed -n '/^bison.*/p' | sed 's@.* \(.*\)@\1@'`
+
+AC_MSG_CHECKING([for bison 3.0])
+
+# This was used to set a conditional in the d4_ce/Makefile.am to build
+# the DAP4 parsers using bison 3 or get pre-built sources from a set
+# of template files. That didn't work on some linux machines, so bison
+# 3 is a requirement for building until that gets sorted out. jhrg 4/5/15
+dnl AS_VERSION_COMPARE(["$bison_version"], ["3.0"], 
+dnl 	[AM_CONDITIONAL([BISON3], [false])],
+dnl 	[AM_CONDITIONAL([BISON3], [true])],
+dnl 	[AM_CONDITIONAL([BISON3], [true])])
+        
+AS_VERSION_COMPARE(["$bison_version"], ["3.0"], 
+	[AC_MSG_ERROR([not found])],
+	[ ],
+	[ ])
+
+AC_MSG_RESULT([found vesion $bison_version])
+
+dnl Checks for header files.
+AC_HEADER_DIRENT
+AC_HEADER_STDC
+AC_HEADER_SYS_WAIT
+
+AC_CHECK_HEADERS_ONCE([fcntl.h malloc.h memory.h stddef.h stdlib.h string.h strings.h unistd.h pthread.h])
+AC_CHECK_HEADERS_ONCE([sys/param.h sys/time.h])
+AC_CHECK_HEADERS_ONCE([netinet/in.h])
+
+dnl AC_CHECK_HEADERS_ONCE([uuid/uuid.h uuid.h])
+dnl Do this because we have had a number of problems with the UUID header/library
+AC_CHECK_HEADERS([uuid/uuid.h],[found_uuid_uuid_h=true],[found_uuid_uuid_h=false])
+AC_CHECK_HEADERS([uuid.h],[found_uuid_h=true],[found_uuid_h=false])
+
+AS_IF([test $found_uuid_uuid_h = true -o $found_uuid_h = true], [], [AC_MSG_ERROR([Could not find uuid.h])])
+
+dnl Checks for typedefs, structures, and compiler characteristics.
+AC_C_CONST
+AC_C_INLINE
+AC_TYPE_SIZE_T
+AC_CHECK_MEMBERS([struct stat.st_blksize])
+AC_HEADER_TIME
+AC_STRUCT_TM
+AC_C_VOLATILE
+AC_C_BIGENDIAN
+
+# 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
+AS_IF([test $ac_cv_c_bigendian = yes], [ac_word_order=big-endian], [ac_word_order=little-endian])
+AC_SUBST([ac_word_order])
+        
+DODS_CHECK_SIZES
+
+AC_ARG_ENABLE([runtime-endian-check],
+    AC_HELP_STRING([--enable-runtime-endian-check], [Enable runtime tests for big- or little-endian byte order (default is NO)])
+)
+
+AS_IF([test "x$enable_runtime_endian_check" = "xyes"], [
+    dnl Do the stuff needed for enabling the feature
+    AC_DEFINE([COMPUTE_ENDIAN_AT_RUNTIME], 1, [Should a function (run-time) be used to determine the byte order?])
+])
+
+# Checks for library functions.
+
+dnl using AC_CHECK_FUNCS does not run macros from gnulib.
+AC_CHECK_FUNCS([alarm atexit bzero dup2 getcwd getpagesize localtime_r memmove memset pow putenv setenv strchr strerror strtol strtoul timegm mktime])
+
+gl_SOURCE_BASE(gl)
+gl_M4_BASE(gl/m4)
+gl_MODULES(regex btyeswap)
+
+gl_INIT
+
+AC_ARG_WITH(curl,[  --with-curl=PFX   Prefix where curl/libcurl is installed (optional). This will override pkgconfig, etc.],
+            with_curl_prefix="$withval", with_curl_prefix="")
+
+dnl I wrote these checks because we need the *-config scripts to build, so 
+dnl the AC_CHECK_LIB macro is not needed.
+
+curlprivatereq=
+curlprivatelibs=
+curl_set=
+
+if test -n "$with_curl_prefix" -a -x $with_curl_prefix/bin/curl-config
+then
+    AC_MSG_NOTICE([Using $with_curl_prefix as the curl prefix directory.])
+    CURL_LIBS="`$with_curl_prefix/bin/curl-config --libs`"
+    CURL_STATIC_LIBS=$CURL_LIBS
+    curlprivatelibs="`$with_curl_prefix/bin/curl-config --libs`"
+    CURL_CFLAGS="`$with_curl_prefix/bin/curl-config --cflags`"
+    curl_set="yes"
+elif test -n "$with_curl_prefix"
+then
+    AC_MSG_ERROR([You set the curl-prefix directory to $with_curl_prefix, but curl-config is not there.])
+fi
+
+if test -z "$curl_set"
+then
+    # curlprivatereq=
+    # curlprivatelibs=
+    libdap_pkgconfig_libcurl=yes
+    libdap_libcurl_module='libcurl >= 7.19.0'
+    PKG_CHECK_MODULES([CURL],[$libdap_libcurl_module],,
+        [libdap_pkgconfig_libcurl=no])
+    AC_MSG_CHECKING([for libcurl])
+    
+    if test $libdap_pkgconfig_libcurl = 'yes'
+    then
+	   curlprivatereq=$libdap_libcurl_module
+	   CURL_STATIC_LIBS="`$PKG_CONFIG --static --libs libcurl`"
+	   AC_MSG_RESULT([yes; used pkg-config])
+    elif curl-config --version > /dev/null 2>&1
+    then
+	   version_libcurl=`curl-config --version | sed 's@libcurl \(.*\)@\1@'`
+
+       AS_VERSION_COMPARE(["$version_libcurl"], ["7.19.0"], 
+                [AC_MSG_ERROR([I could not find libcurl 7.19.0 or newer, found $version_libcurl])])
+        
+	   CURL_LIBS="`curl-config --libs`"
+	   CURL_STATIC_LIBS=$CURL_LIBS
+	   curlprivatelibs="`curl-config --libs`"
+	   CURL_CFLAGS="`curl-config --cflags`"
+	   AC_MSG_RESULT([yes; used curl-config and found version $version_libcurl])
+    else
+	   AC_MSG_ERROR([I could not find libcurl])
+    fi
+fi
+
+AC_SUBST([curlprivatereq])
+AC_SUBST([curlprivatelibs])
+AC_SUBST([CURL_LIBS])
+AC_SUBST([CURL_STATIC_LIBS])
+AC_SUBST([CURL_CFLAGS])
+
+AC_ARG_WITH(xml2,[  --with-xml2=PFX   Prefix where libxml2 is installed (optional). This will override pkgconfig, etc.],
+            with_xml2_prefix="$withval", with_xml2_prefix="")
+
+xmlprivatereq=
+xmlprivatelibs=
+xml_set=
+
+if test -n "$with_xml2_prefix" -a -x $with_xml2_prefix/bin/xml2-config
+then
+    AC_MSG_NOTICE([Using $with_xml2_prefix as the libxml2 prefix directory.])
+    XML2_LIBS="`$with_xml2_prefix/bin/xml2-config --libs`"
+    dnl XML2_STATIC_LIBS=$XML2_LIBS
+    xmlprivatelibs="`$with_xml2_prefix/bin/xml2-config --libs`"
+    XML2_CFLAGS="`$with_xml2_prefix/bin/xml2-config --cflags`"
+    xml_set="yes"
+elif test -n "$with_xml2_prefix"
+then
+    AC_MSG_ERROR([You set the libxml2 prefix directory to $with_xml2_prefix, but xml2-config is not there.])
+fi
+
+if test -z "$xml_set"
+then
+libdap_pkgconfig_libxml2=yes
+libdap_libxml2_module='libxml-2.0 >= 2.7.0'
+PKG_CHECK_MODULES([XML2],[$libdap_libxml2_module], ,[libdap_pkgconfig_libxml2=no])
+AC_MSG_CHECKING([for libxml2])
+if test $libdap_pkgconfig_libxml2 = 'yes'
+then
+	xmlprivatereq=$libdap_libxml2_module
+	dnl XML2_STATIC_LIBS="`$PKG_CONFIG --static --libs libxml-2.0`"
+	XML2_LIBS="`$PKG_CONFIG --libs libxml-2.0`"
+	AC_MSG_RESULT([yes; used pkg-config])
+elif xml2-config --version > /dev/null 2>&1
+then
+	version_libxml2=`xml2-config --version`
+
+        AS_VERSION_COMPARE(["$version_libxml2"], ["2.7.0"], 
+                [AC_MSG_ERROR([I could not find libxml2 2.7.0 or newer])])
+        
+	XML2_LIBS="`xml2-config --libs`"
+	dnl XML2_STATIC_LIBS=$XML2_LIBS
+	XML2_CFLAGS="`xml2-config --cflags`"
+	xmlprivatelibs="`xml2-config --libs `"
+	dnl `
+	AC_MSG_RESULT([yes; used xml2-config and found version $version_libxml2])
+else
+	AC_MSG_ERROR([I could not find ml2-config])
+fi
+fi
+
+AC_SUBST([xmlprivatereq])
+AC_SUBST([xmlprivatelibs])
+AC_SUBST([XML2_LIBS])
+dnl AC_SUBST([XML2_STATIC_LIBS])
+AC_SUBST([XML2_CFLAGS])
+
+AC_CHECK_LIB([pthread], [pthread_kill], 
+	[PTHREAD_LIBS="-lpthread"],
+	[AC_MSG_ERROR([I could not find pthreads])])
+AC_SUBST([PTHREAD_LIBS])
+
+AC_CHECK_LIB([uuid], [uuid_generate], 
+	[UUID_LIBS="-luuid"],
+	[UUID_LIBS=""])
+AC_SUBST([UUID_LIBS])
+
+AM_PATH_CPPUNIT(1.12.0,
+	[AM_CONDITIONAL([CPPUNIT], [true])],
+	[
+	    PKG_CHECK_MODULES(CPPUNIT, [cppunit >= 1.12.0],
+		[AM_CONDITIONAL([CPPUNIT], [true])],
+		[AM_CONDITIONAL([CPPUNIT], [false])]
+	    )
+	]
+)
+
+DODS_DEBUG_OPTION
+
+dnl See util.cc:dods_root()
+AS_IF([test "$prefix" = "NONE"],
+      [AC_DEFINE([LIBDAP_ROOT], ["/usr/local"], [Set to the prefix directory])],
+	  [AC_DEFINE_UNQUOTED([LIBDAP_ROOT], ["$prefix"], [Set to the prefix directory])])
+
+dnl By default, DAP4 is enabled. Use this to disable. jhrg 5/12/15
+AC_ARG_ENABLE([dap4], 
+    [AC_HELP_STRING([--enable-dap4], [Enable DAP4 types and responses (default is Yes)])],
+    [enable_dap4=${enableval}], [enable_dap4=yes])
+
+AS_IF([test x$enable_dap4 = xyes], [
+    dnl Do the stuff needed for enabling the feature
+    dnl echo "Defining DAP4! "
+    AC_DEFINE([DAP4], 1, [Should DAP4 support be enabled?])
+    AM_CONDITIONAL([DAP4_DEFINED], [true]) ],
+    [ dnl else enable_dap4 is false
+    AM_CONDITIONAL([DAP4_DEFINED], [false])
+])
+
+AC_ARG_ENABLE([developer],
+	[AS_HELP_STRING([--enable-developer],
+				    [Build a debug (-g3 -O0) version of this code and include assert() calls in the code (default is no)])],
+    [build_developer=${enableval}],
+    [build_developer=no])
+
+AS_IF([test x$build_developer = xyes],
+      [AC_MSG_NOTICE([Building developer version])
+       AM_CONDITIONAL([BUILD_DEVELOPER], [true])],
+      [AC_MSG_NOTICE([Not building developer version])
+       AM_CONDITIONAL([BUILD_DEVELOPER], [false])
+       AC_DEFINE([NDEBUG], [1], [Define this to suppres assert() calls.])])
+
+DODS_GCOV_VALGRIND
+
+dnl autoheader macros; tack some text at the top and bottom of config_dap.h.in
+
+AH_TOP([#ifndef _config_h
+#define _config_h])
+
+AH_BOTTOM([#endif /* _config_h */])
+
+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])
+
+AC_CONFIG_FILES([dap-config], [chmod +x dap-config]) 
+	
+AC_OUTPUT
diff --git a/crc.h b/crc.h
new file mode 100644
index 0000000..820b185
--- /dev/null
+++ b/crc.h
@@ -0,0 +1,116 @@
+/*
+ * From Tom Distler
+ * See http://tdistler.com/2011/06/22/crc32-a-simple-c-class
+ */
+
+#ifndef CRC_H_
+#define CRC_H_
+
+static const uint32_t kCrc32Table[256] = {
+    0x00000000, 0x77073096, 0xee0e612c, 0x990951ba,
+    0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3,
+    0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,
+    0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91,
+    0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de,
+    0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,
+    0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec,
+    0x14015c4f, 0x63066cd9, 0xfa0f3d63, 0x8d080df5,
+    0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172,
+    0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b,
+    0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940,
+    0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,
+    0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116,
+    0x21b4f4b5, 0x56b3c423, 0xcfba9599, 0xb8bda50f,
+    0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
+    0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d,
+    0x76dc4190, 0x01db7106, 0x98d220bc, 0xefd5102a,
+    0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,
+    0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818,
+    0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01,
+    0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e,
+    0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457,
+    0x65b0d9c6, 0x12b7e950, 0x8bbeb8ea, 0xfcb9887c,
+    0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
+    0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2,
+    0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb,
+    0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0,
+    0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9,
+    0x5005713c, 0x270241aa, 0xbe0b1010, 0xc90c2086,
+    0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
+    0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4,
+    0x59b33d17, 0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad,
+    0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a,
+    0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683,
+    0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8,
+    0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,
+    0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe,
+    0xf762575d, 0x806567cb, 0x196c3671, 0x6e6b06e7,
+    0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc,
+    0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5,
+    0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252,
+    0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
+    0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60,
+    0xdf60efc3, 0xa867df55, 0x316e8eef, 0x4669be79,
+    0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
+    0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f,
+    0xc5ba3bbe, 0xb2bd0b28, 0x2bb45a92, 0x5cb36a04,
+    0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,
+    0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a,
+    0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713,
+    0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38,
+    0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21,
+    0x86d3d2d4, 0xf1d4e242, 0x68ddb3f8, 0x1fda836e,
+    0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
+    0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c,
+    0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45,
+    0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2,
+    0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db,
+    0xaed16a4a, 0xd9d65adc, 0x40df0b66, 0x37d83bf0,
+    0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
+    0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6,
+    0xbad03605, 0xcdd70693, 0x54de5729, 0x23d967bf,
+    0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94,
+    0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d,
+}; // kCrc32Table
+
+class Crc32
+{
+public:
+    typedef uint32_t checksum;
+
+    /**
+     * Initialize the Crc32 instance to 0.
+     */
+    Crc32() { Reset(); }
+
+    ~Crc32() throw() {}
+
+    /**
+     * Re-initialize/re-set the Crc32 instance to zero.
+     * @note The constructor uses this method to initialize a new instance.
+     */
+    void Reset() { _crc = (uint32_t)~0; }
+
+    /**
+     * Add new data, incrementally computing the CRC 32 checksum. If
+     * length is zero, calling this has no effect on the checksum.
+     */
+    void AddData(const uint8_t* pData, const uint32_t length)
+    {
+        uint8_t* pCur = (uint8_t*)pData;
+        uint32_t remaining = length;
+        for (; remaining--; ++pCur)
+            _crc = ( _crc >> 8 ) ^ kCrc32Table[(_crc ^ *pCur) & 0xff];
+    }
+
+    /**
+     * Get the current value of the CRC 32 checksum.
+     * @return An unsigned 32-bit checksum value.
+     */
+    checksum GetCrc32() const { return ~_crc; }
+
+private:
+    uint32_t _crc;
+};
+
+#endif /* CRC_H_ */
diff --git a/d4_ce/D4CEScanner.h b/d4_ce/D4CEScanner.h
new file mode 100644
index 0000000..f58c2b7
--- /dev/null
+++ b/d4_ce/D4CEScanner.h
@@ -0,0 +1,76 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+
+#ifndef D4CESCANNER_H_
+#define D4CESCANNER_H_
+
+// Only include FlexLexer.h if it hasn't been already included
+#if ! defined(yyFlexLexerOnce)
+#undef yyFlexLexer
+#define yyFlexLexer d4_ceFlexLexer
+#include "FlexLexer.h"
+#endif
+
+# ifndef YY_NULL
+#  if defined __cplusplus && 201103L <= __cplusplus
+#   define YY_NULL nullptr
+#  else
+#   define YY_NULL 0
+#  endif
+# endif
+
+#undef  YY_DECL
+#define YY_DECL int  libdap::D4CEScanner::yylex()
+
+#include "d4_ce_parser.tab.hh"
+
+namespace libdap {
+
+class D4CEScanner : public d4_ceFlexLexer{
+public:
+
+	D4CEScanner(std::istream &in) : d4_ceFlexLexer(&in), yylval(0), loc(0) { };
+
+	int yylex(libdap::D4CEParser::semantic_type *lval, libdap::location *l)
+	{
+		loc = l;
+		yylval = lval;
+		return( yylex() );
+	}
+
+private:
+	/* hide this one from public view */
+	int yylex();
+
+	/* yyval ptr */
+	libdap::D4CEParser::semantic_type *yylval;
+
+	libdap::location *loc;
+};
+
+} /* end namespace libdap */
+
+#endif /* D4CESCANNER_H_ */
diff --git a/d4_ce/D4ConstraintEvaluator.cc b/d4_ce/D4ConstraintEvaluator.cc
new file mode 100644
index 0000000..ba1c79a
--- /dev/null
+++ b/d4_ce/D4ConstraintEvaluator.cc
@@ -0,0 +1,444 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#include <string>
+#include <sstream>
+#include <iterator>
+
+//#define DODS_DEBUG
+
+#include "D4CEScanner.h"
+#include "D4ConstraintEvaluator.h"
+#include "d4_ce_parser.tab.hh"
+
+#include "DMR.h"
+#include "D4Group.h"
+#include "D4Dimensions.h"
+#include "D4Maps.h"
+#include "BaseType.h"
+#include "Array.h"
+#include "Constructor.h"
+#include "D4Sequence.h"
+
+#include "D4RValue.h"
+#include "D4FilterClause.h"
+
+#include "escaping.h"
+#include "parser.h"		// for get_ull()
+#include "debug.h"
+
+namespace libdap {
+
+bool D4ConstraintEvaluator::parse(const std::string &expr)
+{
+	d_expr = expr;	// set for error messages. See the %initial-action section of .yy
+
+	std::istringstream iss(expr);
+	D4CEScanner scanner(iss);
+	D4CEParser parser(scanner, *this /* driver */);
+
+	if (trace_parsing()) {
+		parser.set_debug_level(1);
+		parser.set_debug_stream(std::cerr);
+	}
+
+	return parser.parse() == 0;
+}
+
+void
+D4ConstraintEvaluator::throw_not_found(const string &id, const string &ident)
+{
+    throw Error(no_such_variable, d_expr + ": The variable " + id + " was not found in the dataset (" + ident + ").");
+}
+
+void
+D4ConstraintEvaluator::throw_not_array(const string &id, const string &ident)
+{
+	throw Error(no_such_variable, d_expr + ": The variable '" + id + "' is not an Array variable (" + ident + ").");
+}
+
+void
+D4ConstraintEvaluator::search_for_and_mark_arrays(BaseType *btp)
+{
+	DBG(cerr << "Entering D4ConstraintEvaluator::search_for_and_mark_arrays...(" << btp->name() << ")" << endl);
+
+	assert(btp->is_constructor_type());
+
+	Constructor *ctor = static_cast<Constructor*>(btp);
+	for (Constructor::Vars_iter i = ctor->var_begin(), e = ctor->var_end(); i != e; ++i) {
+		switch ((*i)->type()) {
+		case dods_array_c:
+			DBG(cerr << "Found an array: " << (*i)->name() << endl);
+			mark_array_variable(*i);
+			break;
+		case dods_structure_c:
+		case dods_sequence_c:
+			DBG(cerr << "Found a ctor: " << (*i)->name() << endl);
+			search_for_and_mark_arrays(*i);
+			break;
+		default:
+			break;
+		}
+	}
+}
+
+/**
+ * When an identifier is used in a CE, is becomes part of the 'current projection,'
+ * which means it is part of the set of variables to be sent back to the client. This
+ * method sets a flag in the variable (send_p; pronounced 'send predicate') indicating that.
+ *
+ * @note This will check if the variable is an array and set it's slices accordingly
+ * @param btp BaseType pointer to the variable. Must be non-null
+ * @return The BaseType* to the variable; the send_p flag is set as a side effect.
+ */
+BaseType *
+D4ConstraintEvaluator::mark_variable(BaseType *btp)
+{
+    assert(btp);
+
+    DBG(cerr << "In D4ConstraintEvaluator::mark_variable... (" << btp->name() << "; " << btp->type_name() << ")" << endl);
+
+    btp->set_send_p(true);
+
+    if (btp->type() == dods_array_c ) {
+    	mark_array_variable(btp);
+    }
+
+    // Test for Constructors and marks arrays they contain
+	if (btp->is_constructor_type()) {
+		search_for_and_mark_arrays(btp);
+	}
+	else if (btp->type() == dods_array_c && btp->var() && btp->var()->is_constructor_type()) {
+		search_for_and_mark_arrays(btp->var());
+	}
+
+    // Now set the parent variables
+    BaseType *parent = btp->get_parent();
+    while (parent) {
+        parent->BaseType::set_send_p(true); // Just set the parent using BaseType's impl.
+        parent = parent->get_parent();
+    }
+
+    return btp;
+}
+
+static bool
+array_uses_shared_dimension(Array *map, D4Dimension *source_dim)
+{
+    for (Array::Dim_iter d = map->dim_begin(), e = map->dim_end(); d != e; ++d) {
+        if (source_dim->name() == (*d).name)
+            return true;
+    }
+
+    return false;
+}
+
+/**
+ * Add an array to the current projection with slicing. Calling this method will result
+ * in the array being returned with anonymous dimensions.
+ *
+ * @note If btp is an array that has shared dimensions and uses '[]' where a shared dimension
+ * is found and if that shared dimension has been sliced, then the slice is used as the array's
+ * slice for that dimension (there must be an easier way to explain that...)
+ *
+ * @param btp
+ * @return The BaseType* to the Array variable; the send_p and slicing information is
+ * set as a side effect.
+ */
+
+// Note: If a Map is not part of the current projection, do not include mention of it
+// in the response DMR (CDMR)
+BaseType *
+D4ConstraintEvaluator::mark_array_variable(BaseType *btp)
+{
+	assert(btp->type() == dods_array_c);
+
+	Array *a = static_cast<Array*>(btp);
+
+	// If an array appears in a CE without the slicing operators ([]) we still have to
+	// call add_constraint(...) for all of it's sdims for them to appear in
+	// the Constrained DMR.
+	if (d_indexes.empty()) {
+	    for (Array::Dim_iter d = a->dim_begin(), de = a->dim_end(); d != de; ++d) {
+	        D4Dimension *dim = a->dimension_D4dim(d);
+	        if (dim) {
+	        	a->add_constraint(d, dim);
+	        }
+	    }
+	}
+    else {
+        // Test that the indexes and dimensions match in number
+        if (d_indexes.size() != a->dimensions())
+            throw Error(malformed_expr, "The index constraint for '" + btp->name() + "' does not match its rank.");
+
+        Array::Dim_iter d = a->dim_begin();
+        for (vector<index>::iterator i = d_indexes.begin(), e = d_indexes.end(); i != e; ++i) {
+            if ((*i).stride > (unsigned long long) (a->dimension_stop(d, false) - a->dimension_start(d, false)) + 1)
+                throw Error(malformed_expr, "For '" + btp->name() + "', the index stride value is greater than the number of elements in the Array");
+            if (!(*i).rest && ((*i).stop) > (unsigned long long) (a->dimension_stop(d, false) - a->dimension_start(d, false)) + 1)
+                throw Error(malformed_expr, "For '" + btp->name() + "', the index stop value is greater than the number of elements in the Array");
+
+            D4Dimension *dim = a->dimension_D4dim(d);
+
+            // In a DAP4 CE, specifying '[]' as an array dimension slice has two meanings.
+            // It can mean 'all the elements' of the dimension or 'apply the slicing inherited
+            // from the shared dimension'. The latter might be provide 'all the elements'
+            // but regardless, the Array object must record the CE correctly.
+
+            if (dim && (*i).empty) {
+                // This case corresponds to a CE that uses the '[]' notation for a
+                // particular dimension - meaning, use the Shared Dimension size for
+                // this dimension's 'slice'.
+                a->add_constraint(d, dim);  // calls set_used_by_projected_var(true) + more
+            }
+            else {
+                // This case corresponds to a 'local dimension slice' (See sections 8.6.2 and
+                // 8.7 of the spec as of 4/12/16). When a local dimension slice is used, drop
+                // the Map(s) that include that dimension. This enables people to constrain
+                // an Array when some of the Array's dimensions don't use Shared Dimensions
+                // but others do.
+
+                // First apply the constraint to the Array's dimension
+                a->add_constraint(d, (*i).start, (*i).stride, (*i).rest ? -1 : (*i).stop);
+
+                // Then, if the Array has Maps, scan those Maps for any that use dimensions
+                // that match the name of this particular dimension. If any such Maps are found
+                // remove them. This ensure that the Array can be constrained using the  'local
+                // dimension slice' without the constrained DMR containing references to Maps
+                // that don't exist (or are otherwise nonsensical).
+                //
+                // This code came about as a fix for problems discovered during testing of
+                // local dimension slices. See https://opendap.atlassian.net/browse/HYRAX-98
+                // jhrg 4/12/16
+                if (!a->maps()->empty()) {
+                    for(D4Maps::D4MapsIter m = a->maps()->map_begin(), e = a->maps()->map_end(); m != e; ++m) {
+                        if ((*m)->array() == 0)
+                            throw Error(malformed_expr, "An array with Maps was found, but one of the Maps was not defined correctly.");
+
+                        Array *map = const_cast<Array*>((*m)->array()); // Array lacks const iterator support
+                        // Added a test to ensure 'dim' is not null. This could be the case if
+                        // execution gets here and the index *i was not empty. jhrg 4/18/17
+                        if (dim && array_uses_shared_dimension(map, dim)) {
+                            D4Map *map_to_be_removed = *m;
+                            a->maps()->remove_map(map_to_be_removed); // Invalidates the iterator
+                            delete map_to_be_removed;   // removed from container; delete
+                            break; // must leave the for loop because 'm' is now invalid
+                        }
+                    }
+                }
+            }
+
+            ++d;
+        }
+    }
+
+    d_indexes.clear();  // Clear the info so the next slice expression can be parsed.
+
+	return btp;
+}
+
+/**
+ * Add an array to the current projection with slicing. Calling this method will result
+ * in the array being returned with anonymous dimensions.
+ *
+ * @param id
+ * @return The BaseType* to the Array variable; the send_p and slicing information is
+ * set as a side effect.
+ */
+D4Dimension *
+D4ConstraintEvaluator::slice_dimension(const std::string &id, const index &i)
+{
+    D4Dimension *dim = dmr()->root()->find_dim(id);
+
+    if (i.stride > dim->size())
+        throw Error(malformed_expr, "For '" + id + "', the index stride value is greater than the size of the dimension");
+    if (!i.rest && (i.stop > dim->size() - 1))
+        throw Error(malformed_expr, "For '" + id + "', the index stop value is greater than the size of the dimension");
+
+    dim->set_constraint(i.start, i.stride, i.rest ? dim->size() - 1: i.stop);
+
+    return dim;
+}
+
+D4ConstraintEvaluator::index
+D4ConstraintEvaluator::make_index(const std::string &i)
+{
+	unsigned long long v = get_int64(i.c_str());
+	return index(v, 1, v, false, false /*empty*/, "");
+}
+
+D4ConstraintEvaluator::index
+D4ConstraintEvaluator::make_index(const std::string &i, const std::string &s, const std::string &e)
+{
+	return index(get_int64(i.c_str()), get_int64(s.c_str()), get_int64(e.c_str()), false, false /*empty*/, "");
+}
+
+D4ConstraintEvaluator::index
+D4ConstraintEvaluator::make_index(const std::string &i, unsigned long long s, const std::string &e)
+{
+	return index(get_int64(i.c_str()), s, get_int64(e.c_str()), false, false /*empty*/, "");
+}
+
+D4ConstraintEvaluator::index
+D4ConstraintEvaluator::make_index(const std::string &i, const std::string &s)
+{
+	return index(get_int64(i.c_str()), get_int64(s.c_str()), 0, true, false /*empty*/, "");
+}
+
+D4ConstraintEvaluator::index
+D4ConstraintEvaluator::make_index(const std::string &i, unsigned long long s)
+{
+    return index(get_uint64(i.c_str()), s, 0, true, false /*empty*/, "");
+}
+
+static string
+expr_msg(const std::string &op, const std::string &arg1, const std::string &arg2)
+{
+    return "(" + arg1 + " " + op + " " + arg2 + ").";
+}
+
+/**
+ * @brief Return the D4FilterClause constant for an operator
+ *
+ * Here are the strings returned by the parser:
+ *   GREATER ">"
+ *   LESS_EQUAL "<="
+ *   GREATER_EQUAL ">="
+ *   EQUAL "=="
+ *   NOT_EQUAL "!="
+ *   REGEX_MATCH "~="
+ *
+ *   LESS_BBOX "<<"
+ *   GREATER_BBOX ">>"
+ *
+ *   MASK "@="
+ *   ND "ND"
+ */
+static D4FilterClause::ops
+get_op_code(const std::string &op)
+{
+    DBGN(cerr << "Entering " << __PRETTY_FUNCTION__ << endl << "op: " << op << endl);
+
+    if (op == "<")
+        return D4FilterClause::less;
+    else if (op == ">")
+        return D4FilterClause::greater;
+    else if (op == "<=")
+        return D4FilterClause::less_equal;
+    else if (op == ">=")
+        return D4FilterClause::greater_equal;
+    else if (op == "==")
+        return D4FilterClause::equal;
+    else if (op == "!=")
+        return D4FilterClause::not_equal;
+    else if (op == "~=")
+        return D4FilterClause::match;
+    else
+        throw Error(malformed_expr, "The opertator '" + op + "' is not supported.");
+}
+
+/**
+ * @brief Add a D4FilterClause
+ *
+ * This method adds a filter clause to the D4Sequence that is on the top of the
+ * parser's stack. If there is not a D4Sequence on the stack, an exception is
+ * thrown. Similarly, if the filter clause parameters are not valid, then an
+ * exception is thrown.
+ *
+ * Filter clause rules: One of the parameters must be a variable in a D4Sequence
+ * and the other must be a constant. The operator must be one of the valid relops.
+ * Note that the D4FilterClause objects use the same numerical codes as the DAP2
+ * parser/evaluator.
+ *
+ * @note The parser will have pushed the Sequence onto the BaseType stack during
+ * the parse, so variables can be looked up using the top_basetype() (which
+ * must be a D4Sequence).
+ *
+ * @param arg1 The first argument; a D4Sequence variable or a constant.
+ * @param arg2 The second argument; a D4Sequence variable or a constant.
+ * @param op The infix relop
+ */
+void
+D4ConstraintEvaluator::add_filter_clause(const std::string &op, const std::string &arg1, const std::string &arg2)
+{
+    DBG(cerr << "Entering: " << __PRETTY_FUNCTION__  << endl);
+
+    // Check that there really is a D4Sequence associated with this filter clause.
+    D4Sequence *s = dynamic_cast<D4Sequence*>(top_basetype());
+    if (!s)
+        throw Error(malformed_expr,
+            "When a filter expression is used, it must be bound to a Sequence variable: " + expr_msg(op, arg1, arg2));
+
+    DBG(cerr << "s->name(): " << s->name() << endl);
+
+    // Check that arg1 and 2 are valid
+    BaseType *a1 = s->var(arg1);
+    BaseType *a2 = s->var(arg2);
+    DBG(cerr << "a1: " << a1 << ", a2: " << a2 << endl);
+
+    if (a1 && a2)
+        throw Error(malformed_expr,
+            "One of the arguments in a filter expression must be a constant: " + expr_msg(op, arg1, arg2));
+    if (!(a1 || a2))
+        throw Error(malformed_expr,
+            "One of the arguments in a filter expression must be a variable in a Sequence: " + expr_msg(op, arg1, arg2));
+
+    // Now we know a1 XOR a2 is true
+    if (a1) {
+        s->clauses().add_clause(new D4FilterClause(get_op_code(op), new D4RValue(a1), D4RValueFactory(arg2)));
+    }
+    else {
+        s->clauses().add_clause(new D4FilterClause(get_op_code(op), D4RValueFactory(arg1), new D4RValue(a2)));
+    }
+}
+
+/**
+ * @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(...)
+void
+D4ConstraintEvaluator::error(const libdap::location &l, const std::string &m)
+{
+	ostringstream oss;
+	oss << l << ": " << m << ends;
+	throw Error(malformed_expr, oss.str());
+}
+
+} /* namespace libdap */
diff --git a/d4_ce/D4ConstraintEvaluator.h b/d4_ce/D4ConstraintEvaluator.h
new file mode 100644
index 0000000..8691b38
--- /dev/null
+++ b/d4_ce/D4ConstraintEvaluator.h
@@ -0,0 +1,144 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#ifndef D4CEDRIVER_H_
+#define D4CEDRIVER_H_
+
+#include <string>
+#include <vector>
+#include <stack>
+
+namespace libdap {
+
+class location;
+class DMR;
+class BaseType;
+class Array;
+class D4Dimension;
+class D4FilterClause;
+class D4FilterClauseList;
+
+/**
+ * Driver for the DAP4 Constraint Expression parser.
+ */
+class D4ConstraintEvaluator {
+	struct index {
+		// start and stride are simple numbers; stop is either the stopping index or
+		// if rest is true, is ignored and the subset runs to the end of the dimension
+		unsigned long long start, stride, stop;
+		// true if the slice indicates it does not contain a specific 'stop' value but
+		// goes to the end, whatever that value is.
+		bool rest;
+		// An empty slice ([]) means either the entire dimension or apply the shared
+		// dimension slice, depending on whether the corresponding shared dimension has
+		// been sliced.
+		bool empty;
+		// When a slice is applied to an Array with Maps, we need to know the name of
+		// each dimension. These names are then used to apply the slice to each of the
+		// Maps (Maps may have fewer dimensions than the Array, but the idea that a
+		// Map is a simple vector doesn't hold for DAP4, so the mapping between a slice's
+		// indexes and the set of Maps can be complex - use the names to make sure
+		// all cases are covered. The value of this field may be empty.
+		std::string dim_name;
+
+		// Added because the parser code needs it. Our code does not use this. jhrg 11/26/13
+		index(): start(0), stride(0), stop(0), rest(false), empty(false), dim_name("") {}
+		index(unsigned long long i, unsigned long long s, unsigned long long e, bool r, bool em, const std::string &n)
+			: start(i), stride(s), stop(e), rest(r), empty(em), dim_name(n) {}
+	};
+
+	index make_index() { return index(0, 1, 0, true /*rest*/, true /*empty*/, ""); }
+
+	index make_index(const std::string &is);
+
+	index make_index(const std::string &i, const std::string &s, const std::string &e);
+	index make_index(const std::string &i, unsigned long long s, const std::string &e);
+
+	index make_index(const std::string &i, const std::string &s);
+	index make_index(const std::string &i, unsigned long long s);
+
+	bool d_trace_scanning;
+	bool d_trace_parsing;
+	bool d_result;
+	std::string d_expr;
+
+	DMR *d_dmr;
+
+	std::vector<index> d_indexes;
+
+	std::stack<BaseType*> d_basetype_stack;
+
+	// d_expr should be set by parse! Its value is used by the parser right before
+	// the actual parsing operation starts. jhrg 11/26/13
+	std::string *expression() { return &d_expr; }
+
+	void search_for_and_mark_arrays(BaseType *btp);
+	BaseType *mark_variable(BaseType *btp);
+	BaseType *mark_array_variable(BaseType *btp);
+
+	D4Dimension *slice_dimension(const std::string &id, const index &i);
+
+	void push_index(const index &i) { d_indexes.push_back(i); }
+
+	void push_basetype(BaseType *btp) { d_basetype_stack.push(btp); }
+	BaseType *top_basetype() const { return d_basetype_stack.empty() ? 0 : d_basetype_stack.top(); }
+	// throw on pop with an empty stack?
+	void pop_basetype() { d_basetype_stack.pop(); }
+
+	void throw_not_found(const std::string &id, const std::string &ident);
+	void throw_not_array(const std::string &id, const std::string &ident);
+
+	// 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:
+	D4ConstraintEvaluator() : d_trace_scanning(false), d_trace_parsing(false), d_result(false), d_expr(""), d_dmr(0) { }
+	D4ConstraintEvaluator(DMR *dmr) : d_trace_scanning(false), d_trace_parsing(false), d_result(false), d_expr(""), d_dmr(dmr) { }
+
+	virtual ~D4ConstraintEvaluator() { }
+
+	bool parse(const std::string &expr);
+
+	bool trace_scanning() const { return d_trace_scanning; }
+	void set_trace_scanning(bool ts) { d_trace_scanning = ts; }
+
+	bool trace_parsing() const { return d_trace_parsing; }
+	void set_trace_parsing(bool tp) { d_trace_parsing = tp; }
+
+	bool result() const { return d_result; }
+	void set_result(bool r) { d_result = r; }
+
+	DMR *dmr() const { return d_dmr; }
+	void set_dmr(DMR *dmr) { d_dmr = dmr; }
+
+	void error(const libdap::location &l, const std::string &m);
+};
+
+} /* namespace libdap */
+#endif /* D4CEDRIVER_H_ */
diff --git a/d4_ce/Makefile.am b/d4_ce/Makefile.am
new file mode 100644
index 0000000..aa1a070
--- /dev/null
+++ b/d4_ce/Makefile.am
@@ -0,0 +1,75 @@
+
+AUTOMAKE_OPTIONS = foreign
+
+# We need this to make sure that parallel jobs don't fail for 
+# lack of stack.hh, ... because those are built by bison in one
+# shot.
+.NOTPARALLEL:
+
+# Arrange to build with the backward compatibility mode enabled.
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/d4_ce -I$(srcdir) $(XML2_CFLAGS)
+AM_CXXFLAGS =  
+
+if COMPILER_IS_GCC
+AM_CXXFLAGS += -Wall -W -Wcast-align
+endif
+
+# autoconf/automake includes support for yacc and lex so that the input
+# files for those compilers can be listed in a _SOURCES variable and the
+# build will just work. I had a fair amount of hassle getting that going
+# and then realized that cmake might undo all that effort. Also, the
+# changes are not local to this dir only since I'd have to edit the DAP2
+# grammars as well. I've left the edits in a comments although I'm not sure
+# it ever worked correctly. jhrg 10/21/14
+#
+# AM_YFLAGS= -d
+# AM_LFLAGS = -d
+
+CXXFLAGS_DEBUG = -g3 -O0 -Wall -W -Wcast-align
+TEST_COV_FLAGS = -ftest-coverage -fprofile-arcs
+
+if BUILD_DEVELOPER
+AM_CXXFLAGS += $(CXXFLAGS_DEBUG)
+endif
+
+noinst_LTLIBRARIES = libd4_ce_parser.la
+pkginclude_HEADERS = D4ConstraintEvaluator.h
+
+# This line forces make to build the grammar files first, which is
+# important because some of the cc files include the parser headers.
+BUILT_SOURCES = lex.d4_ce.cc d4_ce_parser.tab.hh d4_ce_parser.tab.cc \
+	stack.hh location.hh position.hh
+
+libd4_ce_parser_la_SOURCES = lex.d4_ce.cc d4_ce_parser.tab.cc	\
+	d4_ce_parser.tab.hh stack.hh location.hh position.hh \
+	D4ConstraintEvaluator.cc  D4ConstraintEvaluator.h D4CEScanner.h   
+
+libd4_ce_parser_la_CXXFLAGS=$(AM_CPPFLAGS)
+
+EXTRA_DIST = d4_ce_parser.yy d4_ce_scanner.ll
+
+DISTCLEANFILES = 
+
+clean-local:
+	-rm d4_ce_parser.tab.cc	d4_ce_parser.tab.hh lex.d4_ce.cc stack.hh \
+		location.hh position.hh
+
+%.tab.cc %.tab.hh: %.yy
+	$(YACC) $(YFLAGS) $<
+
+#d4_ce_parser.tab.cc d4_ce_parser.tab.hh stack.hh location.hh position.hh: d4_ce_parser.yy
+#	$(YACC) $(YFLAGS) $<
+
+# For now there are two min versions of flex's FlexLexer.h; one that
+# defines the LexerInput() method returning int and one returning size_t.
+# Including the gnerated lex.*.cc code causes a compilation error when
+# the version on the packaging machine differs from the version on the
+# building machine. For now I just remove the generated file. However, 
+# if a fix can be found, then we can remove the flex requirement from
+# a simple (tar.gz) source build. jhrg 7.9.15
+dist-hook:
+	rm $(distdir)/lex.d4_ce.cc
+
+lex.d4_ce.cc: d4_ce_scanner.ll d4_ce_parser.tab.cc d4_ce_parser.tab.hh
+	$(LEX) $(LFLAGS) $<
+
diff --git a/d4_ce/Makefile.in b/d4_ce/Makefile.in
new file mode 100644
index 0000000..31b70a0
--- /dev/null
+++ b/d4_ce/Makefile.in
@@ -0,0 +1,1354 @@
+# Makefile.in generated by automake 1.14 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+@COMPILER_IS_GCC_TRUE@am__append_1 = -Wall -W -Wcast-align
+@BUILD_DEVELOPER_TRUE@am__append_2 = $(CXXFLAGS_DEBUG)
+subdir = d4_ce
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/conf/depcomp $(pkginclude_HEADERS)
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/gl/m4/00gnulib.m4 \
+	$(top_srcdir)/gl/m4/absolute-header.m4 \
+	$(top_srcdir)/gl/m4/alloca.m4 $(top_srcdir)/gl/m4/btowc.m4 \
+	$(top_srcdir)/gl/m4/builtin-expect.m4 \
+	$(top_srcdir)/gl/m4/byteswap.m4 $(top_srcdir)/gl/m4/codeset.m4 \
+	$(top_srcdir)/gl/m4/configmake.m4 \
+	$(top_srcdir)/gl/m4/eealloc.m4 \
+	$(top_srcdir)/gl/m4/extensions.m4 \
+	$(top_srcdir)/gl/m4/extern-inline.m4 \
+	$(top_srcdir)/gl/m4/fcntl-o.m4 $(top_srcdir)/gl/m4/fcntl_h.m4 \
+	$(top_srcdir)/gl/m4/gettimeofday.m4 \
+	$(top_srcdir)/gl/m4/glibc21.m4 \
+	$(top_srcdir)/gl/m4/gnulib-common.m4 \
+	$(top_srcdir)/gl/m4/gnulib-comp.m4 \
+	$(top_srcdir)/gl/m4/gnulib-tool.m4 \
+	$(top_srcdir)/gl/m4/hard-locale.m4 \
+	$(top_srcdir)/gl/m4/include_next.m4 \
+	$(top_srcdir)/gl/m4/langinfo_h.m4 \
+	$(top_srcdir)/gl/m4/largefile.m4 $(top_srcdir)/gl/m4/lib-ld.m4 \
+	$(top_srcdir)/gl/m4/lib-link.m4 \
+	$(top_srcdir)/gl/m4/lib-prefix.m4 \
+	$(top_srcdir)/gl/m4/limits-h.m4 \
+	$(top_srcdir)/gl/m4/localcharset.m4 \
+	$(top_srcdir)/gl/m4/locale-fr.m4 \
+	$(top_srcdir)/gl/m4/locale-ja.m4 \
+	$(top_srcdir)/gl/m4/locale-zh.m4 \
+	$(top_srcdir)/gl/m4/locale_h.m4 \
+	$(top_srcdir)/gl/m4/localeconv.m4 \
+	$(top_srcdir)/gl/m4/localtime-buffer.m4 \
+	$(top_srcdir)/gl/m4/lock.m4 $(top_srcdir)/gl/m4/longlong.m4 \
+	$(top_srcdir)/gl/m4/lstat.m4 $(top_srcdir)/gl/m4/malloca.m4 \
+	$(top_srcdir)/gl/m4/mbrtowc.m4 $(top_srcdir)/gl/m4/mbsinit.m4 \
+	$(top_srcdir)/gl/m4/mbstate_t.m4 $(top_srcdir)/gl/m4/mbtowc.m4 \
+	$(top_srcdir)/gl/m4/mkstemps.m4 \
+	$(top_srcdir)/gl/m4/multiarch.m4 \
+	$(top_srcdir)/gl/m4/nl_langinfo.m4 \
+	$(top_srcdir)/gl/m4/off_t.m4 $(top_srcdir)/gl/m4/pathmax.m4 \
+	$(top_srcdir)/gl/m4/pthread_rwlock_rdlock.m4 \
+	$(top_srcdir)/gl/m4/regex.m4 $(top_srcdir)/gl/m4/ssize_t.m4 \
+	$(top_srcdir)/gl/m4/stat.m4 $(top_srcdir)/gl/m4/stdbool.m4 \
+	$(top_srcdir)/gl/m4/stddef_h.m4 $(top_srcdir)/gl/m4/stdint.m4 \
+	$(top_srcdir)/gl/m4/stdlib_h.m4 \
+	$(top_srcdir)/gl/m4/sys_socket_h.m4 \
+	$(top_srcdir)/gl/m4/sys_stat_h.m4 \
+	$(top_srcdir)/gl/m4/sys_time_h.m4 \
+	$(top_srcdir)/gl/m4/sys_types_h.m4 \
+	$(top_srcdir)/gl/m4/tempname.m4 \
+	$(top_srcdir)/gl/m4/threadlib.m4 $(top_srcdir)/gl/m4/time_h.m4 \
+	$(top_srcdir)/gl/m4/unistd_h.m4 \
+	$(top_srcdir)/gl/m4/warn-on-use.m4 \
+	$(top_srcdir)/gl/m4/wchar_h.m4 $(top_srcdir)/gl/m4/wchar_t.m4 \
+	$(top_srcdir)/gl/m4/wcrtomb.m4 $(top_srcdir)/gl/m4/wctype_h.m4 \
+	$(top_srcdir)/gl/m4/wint_t.m4 $(top_srcdir)/conf/acinclude.m4 \
+	$(top_srcdir)/conf/cppunit.m4 \
+	$(top_srcdir)/conf/gcov_valgrind.m4 \
+	$(top_srcdir)/conf/libtool.m4 $(top_srcdir)/conf/ltoptions.m4 \
+	$(top_srcdir)/conf/ltsugar.m4 $(top_srcdir)/conf/ltversion.m4 \
+	$(top_srcdir)/conf/lt~obsolete.m4 $(top_srcdir)/conf/pkg.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h \
+	$(top_builddir)/dods-datatypes-config.h \
+	$(top_builddir)/xdr-datatypes-config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libd4_ce_parser_la_LIBADD =
+am_libd4_ce_parser_la_OBJECTS = libd4_ce_parser_la-lex.d4_ce.lo \
+	libd4_ce_parser_la-d4_ce_parser.tab.lo \
+	libd4_ce_parser_la-D4ConstraintEvaluator.lo
+libd4_ce_parser_la_OBJECTS = $(am_libd4_ce_parser_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+libd4_ce_parser_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
+	$(libd4_ce_parser_la_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/conf/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_@AM_V@)
+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
+am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_1 = 
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_1 = 
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libd4_ce_parser_la_SOURCES)
+DIST_SOURCES = $(libd4_ce_parser_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(pkgincludedir)"
+HEADERS = $(pkginclude_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+pkglibexecdir = @pkglibexecdir@
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALLOCA_H = @ALLOCA_H@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
+AR = @AR@
+ARFLAGS = @ARFLAGS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BITSIZEOF_PTRDIFF_T = @BITSIZEOF_PTRDIFF_T@
+BITSIZEOF_SIG_ATOMIC_T = @BITSIZEOF_SIG_ATOMIC_T@
+BITSIZEOF_SIZE_T = @BITSIZEOF_SIZE_T@
+BITSIZEOF_WCHAR_T = @BITSIZEOF_WCHAR_T@
+BITSIZEOF_WINT_T = @BITSIZEOF_WINT_T@
+BYTESWAP_H = @BYTESWAP_H@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CLIENTLIB_AGE = @CLIENTLIB_AGE@
+CLIENTLIB_CURRENT = @CLIENTLIB_CURRENT@
+CLIENTLIB_REVISION = @CLIENTLIB_REVISION@
+CLIENTLIB_VERSION = @CLIENTLIB_VERSION@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@
+CPPUNIT_CONFIG = @CPPUNIT_CONFIG@
+CPPUNIT_LIBS = @CPPUNIT_LIBS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_LIBS = @CURL_LIBS@
+CURL_STATIC_LIBS = @CURL_STATIC_LIBS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DAPLIB_AGE = @DAPLIB_AGE@
+DAPLIB_CURRENT = @DAPLIB_CURRENT@
+DAPLIB_REVISION = @DAPLIB_REVISION@
+DAP_PROTOCOL_VERSION = @DAP_PROTOCOL_VERSION@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+DVR = @DVR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GLIBC21 = @GLIBC21@
+GNULIB_ATOLL = @GNULIB_ATOLL@
+GNULIB_BTOWC = @GNULIB_BTOWC@
+GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@
+GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
+GNULIB_CHDIR = @GNULIB_CHDIR@
+GNULIB_CHOWN = @GNULIB_CHOWN@
+GNULIB_CLOSE = @GNULIB_CLOSE@
+GNULIB_CTIME = @GNULIB_CTIME@
+GNULIB_DUP = @GNULIB_DUP@
+GNULIB_DUP2 = @GNULIB_DUP2@
+GNULIB_DUP3 = @GNULIB_DUP3@
+GNULIB_DUPLOCALE = @GNULIB_DUPLOCALE@
+GNULIB_ENVIRON = @GNULIB_ENVIRON@
+GNULIB_EUIDACCESS = @GNULIB_EUIDACCESS@
+GNULIB_FACCESSAT = @GNULIB_FACCESSAT@
+GNULIB_FCHDIR = @GNULIB_FCHDIR@
+GNULIB_FCHMODAT = @GNULIB_FCHMODAT@
+GNULIB_FCHOWNAT = @GNULIB_FCHOWNAT@
+GNULIB_FCNTL = @GNULIB_FCNTL@
+GNULIB_FDATASYNC = @GNULIB_FDATASYNC@
+GNULIB_FSTAT = @GNULIB_FSTAT@
+GNULIB_FSTATAT = @GNULIB_FSTATAT@
+GNULIB_FSYNC = @GNULIB_FSYNC@
+GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@
+GNULIB_FUTIMENS = @GNULIB_FUTIMENS@
+GNULIB_GETCWD = @GNULIB_GETCWD@
+GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@
+GNULIB_GETDTABLESIZE = @GNULIB_GETDTABLESIZE@
+GNULIB_GETGROUPS = @GNULIB_GETGROUPS@
+GNULIB_GETHOSTNAME = @GNULIB_GETHOSTNAME@
+GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@
+GNULIB_GETLOGIN = @GNULIB_GETLOGIN@
+GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@
+GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@
+GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@
+GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@
+GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@
+GNULIB_GRANTPT = @GNULIB_GRANTPT@
+GNULIB_GROUP_MEMBER = @GNULIB_GROUP_MEMBER@
+GNULIB_ISATTY = @GNULIB_ISATTY@
+GNULIB_ISWBLANK = @GNULIB_ISWBLANK@
+GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@
+GNULIB_LCHMOD = @GNULIB_LCHMOD@
+GNULIB_LCHOWN = @GNULIB_LCHOWN@
+GNULIB_LINK = @GNULIB_LINK@
+GNULIB_LINKAT = @GNULIB_LINKAT@
+GNULIB_LOCALECONV = @GNULIB_LOCALECONV@
+GNULIB_LOCALTIME = @GNULIB_LOCALTIME@
+GNULIB_LSEEK = @GNULIB_LSEEK@
+GNULIB_LSTAT = @GNULIB_LSTAT@
+GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@
+GNULIB_MBRLEN = @GNULIB_MBRLEN@
+GNULIB_MBRTOWC = @GNULIB_MBRTOWC@
+GNULIB_MBSINIT = @GNULIB_MBSINIT@
+GNULIB_MBSNRTOWCS = @GNULIB_MBSNRTOWCS@
+GNULIB_MBSRTOWCS = @GNULIB_MBSRTOWCS@
+GNULIB_MBTOWC = @GNULIB_MBTOWC@
+GNULIB_MKDIRAT = @GNULIB_MKDIRAT@
+GNULIB_MKDTEMP = @GNULIB_MKDTEMP@
+GNULIB_MKFIFO = @GNULIB_MKFIFO@
+GNULIB_MKFIFOAT = @GNULIB_MKFIFOAT@
+GNULIB_MKNOD = @GNULIB_MKNOD@
+GNULIB_MKNODAT = @GNULIB_MKNODAT@
+GNULIB_MKOSTEMP = @GNULIB_MKOSTEMP@
+GNULIB_MKOSTEMPS = @GNULIB_MKOSTEMPS@
+GNULIB_MKSTEMP = @GNULIB_MKSTEMP@
+GNULIB_MKSTEMPS = @GNULIB_MKSTEMPS@
+GNULIB_MKTIME = @GNULIB_MKTIME@
+GNULIB_NANOSLEEP = @GNULIB_NANOSLEEP@
+GNULIB_NL_LANGINFO = @GNULIB_NL_LANGINFO@
+GNULIB_NONBLOCKING = @GNULIB_NONBLOCKING@
+GNULIB_OPEN = @GNULIB_OPEN@
+GNULIB_OPENAT = @GNULIB_OPENAT@
+GNULIB_OVERRIDES_STRUCT_STAT = @GNULIB_OVERRIDES_STRUCT_STAT@
+GNULIB_OVERRIDES_WINT_T = @GNULIB_OVERRIDES_WINT_T@
+GNULIB_PIPE = @GNULIB_PIPE@
+GNULIB_PIPE2 = @GNULIB_PIPE2@
+GNULIB_POSIX_OPENPT = @GNULIB_POSIX_OPENPT@
+GNULIB_PREAD = @GNULIB_PREAD@
+GNULIB_PTSNAME = @GNULIB_PTSNAME@
+GNULIB_PTSNAME_R = @GNULIB_PTSNAME_R@
+GNULIB_PUTENV = @GNULIB_PUTENV@
+GNULIB_PWRITE = @GNULIB_PWRITE@
+GNULIB_QSORT_R = @GNULIB_QSORT_R@
+GNULIB_RANDOM = @GNULIB_RANDOM@
+GNULIB_RANDOM_R = @GNULIB_RANDOM_R@
+GNULIB_READ = @GNULIB_READ@
+GNULIB_READLINK = @GNULIB_READLINK@
+GNULIB_READLINKAT = @GNULIB_READLINKAT@
+GNULIB_REALLOCARRAY = @GNULIB_REALLOCARRAY@
+GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@
+GNULIB_REALPATH = @GNULIB_REALPATH@
+GNULIB_RMDIR = @GNULIB_RMDIR@
+GNULIB_RPMATCH = @GNULIB_RPMATCH@
+GNULIB_SECURE_GETENV = @GNULIB_SECURE_GETENV@
+GNULIB_SETENV = @GNULIB_SETENV@
+GNULIB_SETHOSTNAME = @GNULIB_SETHOSTNAME@
+GNULIB_SETLOCALE = @GNULIB_SETLOCALE@
+GNULIB_SLEEP = @GNULIB_SLEEP@
+GNULIB_STAT = @GNULIB_STAT@
+GNULIB_STRFTIME = @GNULIB_STRFTIME@
+GNULIB_STRPTIME = @GNULIB_STRPTIME@
+GNULIB_STRTOD = @GNULIB_STRTOD@
+GNULIB_STRTOLL = @GNULIB_STRTOLL@
+GNULIB_STRTOULL = @GNULIB_STRTOULL@
+GNULIB_SYMLINK = @GNULIB_SYMLINK@
+GNULIB_SYMLINKAT = @GNULIB_SYMLINKAT@
+GNULIB_SYSTEM_POSIX = @GNULIB_SYSTEM_POSIX@
+GNULIB_TIMEGM = @GNULIB_TIMEGM@
+GNULIB_TIME_R = @GNULIB_TIME_R@
+GNULIB_TIME_RZ = @GNULIB_TIME_RZ@
+GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@
+GNULIB_TRUNCATE = @GNULIB_TRUNCATE@
+GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@
+GNULIB_TZSET = @GNULIB_TZSET@
+GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@
+GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@
+GNULIB_UNLINK = @GNULIB_UNLINK@
+GNULIB_UNLINKAT = @GNULIB_UNLINKAT@
+GNULIB_UNLOCKPT = @GNULIB_UNLOCKPT@
+GNULIB_UNSETENV = @GNULIB_UNSETENV@
+GNULIB_USLEEP = @GNULIB_USLEEP@
+GNULIB_UTIMENSAT = @GNULIB_UTIMENSAT@
+GNULIB_WCPCPY = @GNULIB_WCPCPY@
+GNULIB_WCPNCPY = @GNULIB_WCPNCPY@
+GNULIB_WCRTOMB = @GNULIB_WCRTOMB@
+GNULIB_WCSCASECMP = @GNULIB_WCSCASECMP@
+GNULIB_WCSCAT = @GNULIB_WCSCAT@
+GNULIB_WCSCHR = @GNULIB_WCSCHR@
+GNULIB_WCSCMP = @GNULIB_WCSCMP@
+GNULIB_WCSCOLL = @GNULIB_WCSCOLL@
+GNULIB_WCSCPY = @GNULIB_WCSCPY@
+GNULIB_WCSCSPN = @GNULIB_WCSCSPN@
+GNULIB_WCSDUP = @GNULIB_WCSDUP@
+GNULIB_WCSFTIME = @GNULIB_WCSFTIME@
+GNULIB_WCSLEN = @GNULIB_WCSLEN@
+GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@
+GNULIB_WCSNCAT = @GNULIB_WCSNCAT@
+GNULIB_WCSNCMP = @GNULIB_WCSNCMP@
+GNULIB_WCSNCPY = @GNULIB_WCSNCPY@
+GNULIB_WCSNLEN = @GNULIB_WCSNLEN@
+GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@
+GNULIB_WCSPBRK = @GNULIB_WCSPBRK@
+GNULIB_WCSRCHR = @GNULIB_WCSRCHR@
+GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@
+GNULIB_WCSSPN = @GNULIB_WCSSPN@
+GNULIB_WCSSTR = @GNULIB_WCSSTR@
+GNULIB_WCSTOK = @GNULIB_WCSTOK@
+GNULIB_WCSWIDTH = @GNULIB_WCSWIDTH@
+GNULIB_WCSXFRM = @GNULIB_WCSXFRM@
+GNULIB_WCTOB = @GNULIB_WCTOB@
+GNULIB_WCTOMB = @GNULIB_WCTOMB@
+GNULIB_WCTRANS = @GNULIB_WCTRANS@
+GNULIB_WCTYPE = @GNULIB_WCTYPE@
+GNULIB_WCWIDTH = @GNULIB_WCWIDTH@
+GNULIB_WMEMCHR = @GNULIB_WMEMCHR@
+GNULIB_WMEMCMP = @GNULIB_WMEMCMP@
+GNULIB_WMEMCPY = @GNULIB_WMEMCPY@
+GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@
+GNULIB_WMEMSET = @GNULIB_WMEMSET@
+GNULIB_WRITE = @GNULIB_WRITE@
+GNULIB__EXIT = @GNULIB__EXIT@
+GREP = @GREP@
+HAVE_ATOLL = @HAVE_ATOLL@
+HAVE_BTOWC = @HAVE_BTOWC@
+HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@
+HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
+HAVE_CHOWN = @HAVE_CHOWN@
+HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@
+HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
+HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@
+HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@
+HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@
+HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@
+HAVE_DECL_GETLOGIN = @HAVE_DECL_GETLOGIN@
+HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@
+HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@
+HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@
+HAVE_DECL_INITSTATE = @HAVE_DECL_INITSTATE@
+HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@
+HAVE_DECL_SETENV = @HAVE_DECL_SETENV@
+HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@
+HAVE_DECL_SETSTATE = @HAVE_DECL_SETSTATE@
+HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@
+HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@
+HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@
+HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@
+HAVE_DUP2 = @HAVE_DUP2@
+HAVE_DUP3 = @HAVE_DUP3@
+HAVE_DUPLOCALE = @HAVE_DUPLOCALE@
+HAVE_EUIDACCESS = @HAVE_EUIDACCESS@
+HAVE_FACCESSAT = @HAVE_FACCESSAT@
+HAVE_FCHDIR = @HAVE_FCHDIR@
+HAVE_FCHMODAT = @HAVE_FCHMODAT@
+HAVE_FCHOWNAT = @HAVE_FCHOWNAT@
+HAVE_FCNTL = @HAVE_FCNTL@
+HAVE_FDATASYNC = @HAVE_FDATASYNC@
+HAVE_FEATURES_H = @HAVE_FEATURES_H@
+HAVE_FSTATAT = @HAVE_FSTATAT@
+HAVE_FSYNC = @HAVE_FSYNC@
+HAVE_FTRUNCATE = @HAVE_FTRUNCATE@
+HAVE_FUTIMENS = @HAVE_FUTIMENS@
+HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@
+HAVE_GETGROUPS = @HAVE_GETGROUPS@
+HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@
+HAVE_GETLOGIN = @HAVE_GETLOGIN@
+HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@
+HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
+HAVE_GETTIMEOFDAY = @HAVE_GETTIMEOFDAY@
+HAVE_GRANTPT = @HAVE_GRANTPT@
+HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
+HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
+HAVE_ISWBLANK = @HAVE_ISWBLANK@
+HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
+HAVE_LANGINFO_CODESET = @HAVE_LANGINFO_CODESET@
+HAVE_LANGINFO_ERA = @HAVE_LANGINFO_ERA@
+HAVE_LANGINFO_H = @HAVE_LANGINFO_H@
+HAVE_LANGINFO_T_FMT_AMPM = @HAVE_LANGINFO_T_FMT_AMPM@
+HAVE_LANGINFO_YESEXPR = @HAVE_LANGINFO_YESEXPR@
+HAVE_LCHMOD = @HAVE_LCHMOD@
+HAVE_LCHOWN = @HAVE_LCHOWN@
+HAVE_LINK = @HAVE_LINK@
+HAVE_LINKAT = @HAVE_LINKAT@
+HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@
+HAVE_LSTAT = @HAVE_LSTAT@
+HAVE_MAX_ALIGN_T = @HAVE_MAX_ALIGN_T@
+HAVE_MBRLEN = @HAVE_MBRLEN@
+HAVE_MBRTOWC = @HAVE_MBRTOWC@
+HAVE_MBSINIT = @HAVE_MBSINIT@
+HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@
+HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@
+HAVE_MKDIRAT = @HAVE_MKDIRAT@
+HAVE_MKDTEMP = @HAVE_MKDTEMP@
+HAVE_MKFIFO = @HAVE_MKFIFO@
+HAVE_MKFIFOAT = @HAVE_MKFIFOAT@
+HAVE_MKNOD = @HAVE_MKNOD@
+HAVE_MKNODAT = @HAVE_MKNODAT@
+HAVE_MKOSTEMP = @HAVE_MKOSTEMP@
+HAVE_MKOSTEMPS = @HAVE_MKOSTEMPS@
+HAVE_MKSTEMP = @HAVE_MKSTEMP@
+HAVE_MKSTEMPS = @HAVE_MKSTEMPS@
+HAVE_NANOSLEEP = @HAVE_NANOSLEEP@
+HAVE_NL_LANGINFO = @HAVE_NL_LANGINFO@
+HAVE_OPENAT = @HAVE_OPENAT@
+HAVE_OS_H = @HAVE_OS_H@
+HAVE_PIPE = @HAVE_PIPE@
+HAVE_PIPE2 = @HAVE_PIPE2@
+HAVE_POSIX_OPENPT = @HAVE_POSIX_OPENPT@
+HAVE_PREAD = @HAVE_PREAD@
+HAVE_PTSNAME = @HAVE_PTSNAME@
+HAVE_PTSNAME_R = @HAVE_PTSNAME_R@
+HAVE_PWRITE = @HAVE_PWRITE@
+HAVE_QSORT_R = @HAVE_QSORT_R@
+HAVE_RANDOM = @HAVE_RANDOM@
+HAVE_RANDOM_H = @HAVE_RANDOM_H@
+HAVE_RANDOM_R = @HAVE_RANDOM_R@
+HAVE_READLINK = @HAVE_READLINK@
+HAVE_READLINKAT = @HAVE_READLINKAT@
+HAVE_REALLOCARRAY = @HAVE_REALLOCARRAY@
+HAVE_REALPATH = @HAVE_REALPATH@
+HAVE_RPMATCH = @HAVE_RPMATCH@
+HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@
+HAVE_SETENV = @HAVE_SETENV@
+HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@
+HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
+HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
+HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@
+HAVE_SLEEP = @HAVE_SLEEP@
+HAVE_STDINT_H = @HAVE_STDINT_H@
+HAVE_STRPTIME = @HAVE_STRPTIME@
+HAVE_STRTOD = @HAVE_STRTOD@
+HAVE_STRTOLL = @HAVE_STRTOLL@
+HAVE_STRTOULL = @HAVE_STRTOULL@
+HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@
+HAVE_STRUCT_TIMEVAL = @HAVE_STRUCT_TIMEVAL@
+HAVE_SYMLINK = @HAVE_SYMLINK@
+HAVE_SYMLINKAT = @HAVE_SYMLINKAT@
+HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@
+HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@
+HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@
+HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@
+HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@
+HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
+HAVE_TIMEGM = @HAVE_TIMEGM@
+HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@
+HAVE_TRUNCATE = @HAVE_TRUNCATE@
+HAVE_TZSET = @HAVE_TZSET@
+HAVE_UNISTD_H = @HAVE_UNISTD_H@
+HAVE_UNLINKAT = @HAVE_UNLINKAT@
+HAVE_UNLOCKPT = @HAVE_UNLOCKPT@
+HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@
+HAVE_USLEEP = @HAVE_USLEEP@
+HAVE_UTIMENSAT = @HAVE_UTIMENSAT@
+HAVE_VALGRIND = @HAVE_VALGRIND@
+HAVE_WCHAR_H = @HAVE_WCHAR_H@
+HAVE_WCHAR_T = @HAVE_WCHAR_T@
+HAVE_WCPCPY = @HAVE_WCPCPY@
+HAVE_WCPNCPY = @HAVE_WCPNCPY@
+HAVE_WCRTOMB = @HAVE_WCRTOMB@
+HAVE_WCSCASECMP = @HAVE_WCSCASECMP@
+HAVE_WCSCAT = @HAVE_WCSCAT@
+HAVE_WCSCHR = @HAVE_WCSCHR@
+HAVE_WCSCMP = @HAVE_WCSCMP@
+HAVE_WCSCOLL = @HAVE_WCSCOLL@
+HAVE_WCSCPY = @HAVE_WCSCPY@
+HAVE_WCSCSPN = @HAVE_WCSCSPN@
+HAVE_WCSDUP = @HAVE_WCSDUP@
+HAVE_WCSFTIME = @HAVE_WCSFTIME@
+HAVE_WCSLEN = @HAVE_WCSLEN@
+HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@
+HAVE_WCSNCAT = @HAVE_WCSNCAT@
+HAVE_WCSNCMP = @HAVE_WCSNCMP@
+HAVE_WCSNCPY = @HAVE_WCSNCPY@
+HAVE_WCSNLEN = @HAVE_WCSNLEN@
+HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@
+HAVE_WCSPBRK = @HAVE_WCSPBRK@
+HAVE_WCSRCHR = @HAVE_WCSRCHR@
+HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@
+HAVE_WCSSPN = @HAVE_WCSSPN@
+HAVE_WCSSTR = @HAVE_WCSSTR@
+HAVE_WCSTOK = @HAVE_WCSTOK@
+HAVE_WCSWIDTH = @HAVE_WCSWIDTH@
+HAVE_WCSXFRM = @HAVE_WCSXFRM@
+HAVE_WCTRANS_T = @HAVE_WCTRANS_T@
+HAVE_WCTYPE_H = @HAVE_WCTYPE_H@
+HAVE_WCTYPE_T = @HAVE_WCTYPE_T@
+HAVE_WINSOCK2_H = @HAVE_WINSOCK2_H@
+HAVE_WINT_T = @HAVE_WINT_T@
+HAVE_WMEMCHR = @HAVE_WMEMCHR@
+HAVE_WMEMCMP = @HAVE_WMEMCMP@
+HAVE_WMEMCPY = @HAVE_WMEMCPY@
+HAVE_WMEMMOVE = @HAVE_WMEMMOVE@
+HAVE_WMEMSET = @HAVE_WMEMSET@
+HAVE_XLOCALE_H = @HAVE_XLOCALE_H@
+HAVE__BOOL = @HAVE__BOOL@
+HAVE__EXIT = @HAVE__EXIT@
+INCLUDE_NEXT = @INCLUDE_NEXT@
+INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBDAP_VERSION = @LIBDAP_VERSION@
+LIBINTL = @LIBINTL@
+LIBMULTITHREAD = @LIBMULTITHREAD@
+LIBOBJS = @LIBOBJS@
+LIBPTH = @LIBPTH@
+LIBPTH_PREFIX = @LIBPTH_PREFIX@
+LIBS = @LIBS@
+LIBTHREAD = @LIBTHREAD@
+LIBTOOL = @LIBTOOL@
+LIMITS_H = @LIMITS_H@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@
+LOCALE_FR = @LOCALE_FR@
+LOCALE_FR_UTF8 = @LOCALE_FR_UTF8@
+LOCALE_JA = @LOCALE_JA@
+LOCALE_ZH_CN = @LOCALE_ZH_CN@
+LTLIBINTL = @LTLIBINTL@
+LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
+LTLIBOBJS = @LTLIBOBJS@
+LTLIBPTH = @LTLIBPTH@
+LTLIBTHREAD = @LTLIBTHREAD@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@
+NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H = @NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H@
+NEXT_AS_FIRST_DIRECTIVE_LIMITS_H = @NEXT_AS_FIRST_DIRECTIVE_LIMITS_H@
+NEXT_AS_FIRST_DIRECTIVE_LOCALE_H = @NEXT_AS_FIRST_DIRECTIVE_LOCALE_H@
+NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@
+NEXT_AS_FIRST_DIRECTIVE_STDINT_H = @NEXT_AS_FIRST_DIRECTIVE_STDINT_H@
+NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@
+NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@
+NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@
+NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@
+NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@
+NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@
+NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@
+NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@
+NEXT_FCNTL_H = @NEXT_FCNTL_H@
+NEXT_LANGINFO_H = @NEXT_LANGINFO_H@
+NEXT_LIMITS_H = @NEXT_LIMITS_H@
+NEXT_LOCALE_H = @NEXT_LOCALE_H@
+NEXT_STDDEF_H = @NEXT_STDDEF_H@
+NEXT_STDINT_H = @NEXT_STDINT_H@
+NEXT_STDLIB_H = @NEXT_STDLIB_H@
+NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@
+NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@
+NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@
+NEXT_TIME_H = @NEXT_TIME_H@
+NEXT_UNISTD_H = @NEXT_UNISTD_H@
+NEXT_WCHAR_H = @NEXT_WCHAR_H@
+NEXT_WCTYPE_H = @NEXT_WCTYPE_H@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_MAJOR_VERSION = @PACKAGE_MAJOR_VERSION@
+PACKAGE_MINOR_VERSION = @PACKAGE_MINOR_VERSION@
+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@
+PRAGMA_COLUMNS = @PRAGMA_COLUMNS@
+PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
+PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@
+PTHREAD_LIBS = @PTHREAD_LIBS@
+PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
+RANLIB = @RANLIB@
+REPLACE_BTOWC = @REPLACE_BTOWC@
+REPLACE_CALLOC = @REPLACE_CALLOC@
+REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@
+REPLACE_CHOWN = @REPLACE_CHOWN@
+REPLACE_CLOSE = @REPLACE_CLOSE@
+REPLACE_CTIME = @REPLACE_CTIME@
+REPLACE_DUP = @REPLACE_DUP@
+REPLACE_DUP2 = @REPLACE_DUP2@
+REPLACE_DUPLOCALE = @REPLACE_DUPLOCALE@
+REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@
+REPLACE_FCNTL = @REPLACE_FCNTL@
+REPLACE_FSTAT = @REPLACE_FSTAT@
+REPLACE_FSTATAT = @REPLACE_FSTATAT@
+REPLACE_FTRUNCATE = @REPLACE_FTRUNCATE@
+REPLACE_FUTIMENS = @REPLACE_FUTIMENS@
+REPLACE_GETCWD = @REPLACE_GETCWD@
+REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@
+REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@
+REPLACE_GETGROUPS = @REPLACE_GETGROUPS@
+REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
+REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
+REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@
+REPLACE_GMTIME = @REPLACE_GMTIME@
+REPLACE_ISATTY = @REPLACE_ISATTY@
+REPLACE_ISWBLANK = @REPLACE_ISWBLANK@
+REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@
+REPLACE_LCHOWN = @REPLACE_LCHOWN@
+REPLACE_LINK = @REPLACE_LINK@
+REPLACE_LINKAT = @REPLACE_LINKAT@
+REPLACE_LOCALECONV = @REPLACE_LOCALECONV@
+REPLACE_LOCALTIME = @REPLACE_LOCALTIME@
+REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@
+REPLACE_LSEEK = @REPLACE_LSEEK@
+REPLACE_LSTAT = @REPLACE_LSTAT@
+REPLACE_MALLOC = @REPLACE_MALLOC@
+REPLACE_MBRLEN = @REPLACE_MBRLEN@
+REPLACE_MBRTOWC = @REPLACE_MBRTOWC@
+REPLACE_MBSINIT = @REPLACE_MBSINIT@
+REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@
+REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@
+REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@
+REPLACE_MBTOWC = @REPLACE_MBTOWC@
+REPLACE_MKDIR = @REPLACE_MKDIR@
+REPLACE_MKFIFO = @REPLACE_MKFIFO@
+REPLACE_MKNOD = @REPLACE_MKNOD@
+REPLACE_MKSTEMP = @REPLACE_MKSTEMP@
+REPLACE_MKTIME = @REPLACE_MKTIME@
+REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@
+REPLACE_NL_LANGINFO = @REPLACE_NL_LANGINFO@
+REPLACE_NULL = @REPLACE_NULL@
+REPLACE_OPEN = @REPLACE_OPEN@
+REPLACE_OPENAT = @REPLACE_OPENAT@
+REPLACE_PREAD = @REPLACE_PREAD@
+REPLACE_PTSNAME = @REPLACE_PTSNAME@
+REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@
+REPLACE_PUTENV = @REPLACE_PUTENV@
+REPLACE_PWRITE = @REPLACE_PWRITE@
+REPLACE_QSORT_R = @REPLACE_QSORT_R@
+REPLACE_RANDOM_R = @REPLACE_RANDOM_R@
+REPLACE_READ = @REPLACE_READ@
+REPLACE_READLINK = @REPLACE_READLINK@
+REPLACE_READLINKAT = @REPLACE_READLINKAT@
+REPLACE_REALLOC = @REPLACE_REALLOC@
+REPLACE_REALPATH = @REPLACE_REALPATH@
+REPLACE_RMDIR = @REPLACE_RMDIR@
+REPLACE_SETENV = @REPLACE_SETENV@
+REPLACE_SETLOCALE = @REPLACE_SETLOCALE@
+REPLACE_SLEEP = @REPLACE_SLEEP@
+REPLACE_STAT = @REPLACE_STAT@
+REPLACE_STRFTIME = @REPLACE_STRFTIME@
+REPLACE_STRTOD = @REPLACE_STRTOD@
+REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@
+REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@
+REPLACE_SYMLINK = @REPLACE_SYMLINK@
+REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@
+REPLACE_TIMEGM = @REPLACE_TIMEGM@
+REPLACE_TOWLOWER = @REPLACE_TOWLOWER@
+REPLACE_TRUNCATE = @REPLACE_TRUNCATE@
+REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@
+REPLACE_TZSET = @REPLACE_TZSET@
+REPLACE_UNLINK = @REPLACE_UNLINK@
+REPLACE_UNLINKAT = @REPLACE_UNLINKAT@
+REPLACE_UNSETENV = @REPLACE_UNSETENV@
+REPLACE_USLEEP = @REPLACE_USLEEP@
+REPLACE_UTIMENSAT = @REPLACE_UTIMENSAT@
+REPLACE_WCRTOMB = @REPLACE_WCRTOMB@
+REPLACE_WCSFTIME = @REPLACE_WCSFTIME@
+REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@
+REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@
+REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@
+REPLACE_WCTOB = @REPLACE_WCTOB@
+REPLACE_WCTOMB = @REPLACE_WCTOMB@
+REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
+REPLACE_WRITE = @REPLACE_WRITE@
+SED = @SED@
+SERVERLIB_AGE = @SERVERLIB_AGE@
+SERVERLIB_CURRENT = @SERVERLIB_CURRENT@
+SERVERLIB_REVISION = @SERVERLIB_REVISION@
+SERVERLIB_VERSION = @SERVERLIB_VERSION@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@
+SIZE_T_SUFFIX = @SIZE_T_SUFFIX@
+STDBOOL_H = @STDBOOL_H@
+STDDEF_H = @STDDEF_H@
+STDINT_H = @STDINT_H@
+STRIP = @STRIP@
+SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@
+TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@
+UNISTD_H_DEFINES_STRUCT_TIMESPEC = @UNISTD_H_DEFINES_STRUCT_TIMESPEC@
+UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@
+UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@
+UUID_LIBS = @UUID_LIBS@
+VERSION = @VERSION@
+WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
+WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@
+WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@
+WINDOWS_STAT_INODES = @WINDOWS_STAT_INODES@
+WINDOWS_STAT_TIMESPEC = @WINDOWS_STAT_TIMESPEC@
+WINT_T_SUFFIX = @WINT_T_SUFFIX@
+XML2_CFLAGS = @XML2_CFLAGS@
+XML2_LIBS = @XML2_LIBS@
+YACC = @YACC@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_word_order = @ac_word_order@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+curlprivatelibs = @curlprivatelibs@
+curlprivatereq = @curlprivatereq@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gl_LIBOBJS = @gl_LIBOBJS@
+gl_LTLIBOBJS = @gl_LTLIBOBJS@
+gltests_LIBOBJS = @gltests_LIBOBJS@
+gltests_LTLIBOBJS = @gltests_LTLIBOBJS@
+gltests_WITNESS = @gltests_WITNESS@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+lispdir = @lispdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+runstatedir = @runstatedir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+xmlprivatelibs = @xmlprivatelibs@
+xmlprivatereq = @xmlprivatereq@
+AUTOMAKE_OPTIONS = foreign
+
+# Arrange to build with the backward compatibility mode enabled.
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/d4_ce -I$(srcdir) $(XML2_CFLAGS)
+AM_CXXFLAGS = $(am__append_1) $(am__append_2)
+
+# autoconf/automake includes support for yacc and lex so that the input
+# files for those compilers can be listed in a _SOURCES variable and the
+# build will just work. I had a fair amount of hassle getting that going
+# and then realized that cmake might undo all that effort. Also, the
+# changes are not local to this dir only since I'd have to edit the DAP2
+# grammars as well. I've left the edits in a comments although I'm not sure
+# it ever worked correctly. jhrg 10/21/14
+#
+# AM_YFLAGS= -d
+# AM_LFLAGS = -d
+CXXFLAGS_DEBUG = -g3 -O0 -Wall -W -Wcast-align
+TEST_COV_FLAGS = -ftest-coverage -fprofile-arcs
+noinst_LTLIBRARIES = libd4_ce_parser.la
+pkginclude_HEADERS = D4ConstraintEvaluator.h
+
+# This line forces make to build the grammar files first, which is
+# important because some of the cc files include the parser headers.
+BUILT_SOURCES = lex.d4_ce.cc d4_ce_parser.tab.hh d4_ce_parser.tab.cc \
+	stack.hh location.hh position.hh
+
+libd4_ce_parser_la_SOURCES = lex.d4_ce.cc d4_ce_parser.tab.cc	\
+	d4_ce_parser.tab.hh stack.hh location.hh position.hh \
+	D4ConstraintEvaluator.cc  D4ConstraintEvaluator.h D4CEScanner.h   
+
+libd4_ce_parser_la_CXXFLAGS = $(AM_CPPFLAGS)
+EXTRA_DIST = d4_ce_parser.yy d4_ce_scanner.ll
+DISTCLEANFILES = 
+all: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) all-am
+
+.SUFFIXES:
+.SUFFIXES: .cc .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign d4_ce/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign d4_ce/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
+libd4_ce_parser.la: $(libd4_ce_parser_la_OBJECTS) $(libd4_ce_parser_la_DEPENDENCIES) $(EXTRA_libd4_ce_parser_la_DEPENDENCIES) 
+	$(AM_V_CXXLD)$(libd4_ce_parser_la_LINK)  $(libd4_ce_parser_la_OBJECTS) $(libd4_ce_parser_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libd4_ce_parser_la-D4ConstraintEvaluator.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libd4_ce_parser_la-d4_ce_parser.tab.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libd4_ce_parser_la-lex.d4_ce.Plo@am__quote@
+
+.cc.o:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
+
+.cc.obj:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cc.lo:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
+
+libd4_ce_parser_la-lex.d4_ce.lo: lex.d4_ce.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libd4_ce_parser_la_CXXFLAGS) $(CXXFLAGS) -MT libd4_ce_parser_la-lex.d4_ce.lo -MD -MP -MF $(DEPDIR)/libd4_ce_parser_la-lex.d4_ce.Tpo -c -o libd4_ce_parser_la-lex.d4_ce.lo `test -f 'lex.d4_ce.cc' || echo '$(srcdir)/'`lex.d4_ce.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libd4_ce_parser_la-lex.d4_ce.Tpo $(DEPDIR)/libd4_ce_parser_la-lex.d4_ce.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='lex.d4_ce.cc' object='libd4_ce_parser_la-lex.d4_ce.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libd4_ce_parser_la_CXXFLAGS) $(CXXFLAGS) -c -o libd4_ce_parser_la-lex.d4_ce.lo `test -f 'lex.d4_ce.cc' || echo '$(srcdir)/'`lex.d4_ce.cc
+
+libd4_ce_parser_la-d4_ce_parser.tab.lo: d4_ce_parser.tab.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libd4_ce_parser_la_CXXFLAGS) $(CXXFLAGS) -MT libd4_ce_parser_la-d4_ce_parser.tab.lo -MD -MP -MF $(DEPDIR)/libd4_ce_parser_la-d4_ce_parser.tab.Tpo -c -o libd4_ce_parser_la-d4_ce_parser.tab.lo `test -f 'd4_ce_parser.tab.cc' || echo '$(srcdir)/'`d4_ce_parser.tab.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libd4_ce_parser_la-d4_ce_parser.tab.Tpo $(DEPDIR)/libd4_ce_parser_la-d4_ce_parser.tab.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='d4_ce_parser.tab.cc' object='libd4_ce_parser_la-d4_ce_parser.tab.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libd4_ce_parser_la_CXXFLAGS) $(CXXFLAGS) -c -o libd4_ce_parser_la-d4_ce_parser.tab.lo `test -f 'd4_ce_parser.tab.cc' || echo '$(srcdir)/'`d4_ce_parser.tab.cc
+
+libd4_ce_parser_la-D4ConstraintEvaluator.lo: D4ConstraintEvaluator.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libd4_ce_parser_la_CXXFLAGS) $(CXXFLAGS) -MT libd4_ce_parser_la-D4ConstraintEvaluator.lo -MD -MP -MF $(DEPDIR)/libd4_ce_parser_la-D4ConstraintEvaluator.Tpo -c -o libd4_ce_parser_la-D4ConstraintEvaluator.lo `test -f 'D4ConstraintEvaluator.cc' || echo '$(srcdir)/'`D4ConstraintEvaluator.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libd4_ce_parser_la-D4ConstraintEvaluator.Tpo $(DEPDIR)/libd4_ce_parser_la-D4ConstraintEvaluator.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='D4ConstraintEvaluator.cc' object='libd4_ce_parser_la-D4ConstraintEvaluator.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libd4_ce_parser_la_CXXFLAGS) $(CXXFLAGS) -c -o libd4_ce_parser_la-D4ConstraintEvaluator.lo `test -f 'D4ConstraintEvaluator.cc' || echo '$(srcdir)/'`D4ConstraintEvaluator.cc
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-pkgincludeHEADERS: $(pkginclude_HEADERS)
+	@$(NORMAL_INSTALL)
+	@list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgincludedir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(pkgincludedir)'"; \
+	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(pkgincludedir)" || exit $$?; \
+	done
+
+uninstall-pkgincludeHEADERS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(pkgincludedir)'; $(am__uninstall_files_from_dir)
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	$(MAKE) $(AM_MAKEFLAGS) \
+	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
+	  dist-hook
+check-am: all-am
+check: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) check-am
+all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+installdirs:
+	for dir in "$(DESTDIR)$(pkgincludedir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-local \
+	clean-noinstLTLIBRARIES mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-pkgincludeHEADERS
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-pkgincludeHEADERS
+
+.MAKE: all check install install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-local clean-noinstLTLIBRARIES \
+	cscopelist-am ctags ctags-am dist-hook distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-pkgincludeHEADERS \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am \
+	uninstall-pkgincludeHEADERS
+
+
+# We need this to make sure that parallel jobs don't fail for 
+# lack of stack.hh, ... because those are built by bison in one
+# shot.
+.NOTPARALLEL:
+
+clean-local:
+	-rm d4_ce_parser.tab.cc	d4_ce_parser.tab.hh lex.d4_ce.cc stack.hh \
+		location.hh position.hh
+
+%.tab.cc %.tab.hh: %.yy
+	$(YACC) $(YFLAGS) $<
+
+#d4_ce_parser.tab.cc d4_ce_parser.tab.hh stack.hh location.hh position.hh: d4_ce_parser.yy
+#	$(YACC) $(YFLAGS) $<
+
+# For now there are two min versions of flex's FlexLexer.h; one that
+# defines the LexerInput() method returning int and one returning size_t.
+# Including the gnerated lex.*.cc code causes a compilation error when
+# the version on the packaging machine differs from the version on the
+# building machine. For now I just remove the generated file. However, 
+# if a fix can be found, then we can remove the flex requirement from
+# a simple (tar.gz) source build. jhrg 7.9.15
+dist-hook:
+	rm $(distdir)/lex.d4_ce.cc
+
+lex.d4_ce.cc: d4_ce_scanner.ll d4_ce_parser.tab.cc d4_ce_parser.tab.hh
+	$(LEX) $(LFLAGS) $<
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/d4_ce/d4_ce_parser.tab.cc b/d4_ce/d4_ce_parser.tab.cc
new file mode 100644
index 0000000..f5c2120
--- /dev/null
+++ b/d4_ce/d4_ce_parser.tab.cc
@@ -0,0 +1,1961 @@
+// A Bison parser, made by GNU Bison 3.0.4.
+
+// Skeleton implementation for Bison LALR(1) parsers in C++
+
+// Copyright (C) 2002-2015 Free Software Foundation, Inc.
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+// As a special exception, you may create a larger work that contains
+// part or all of the Bison parser skeleton and distribute that work
+// under terms of your choice, so long as that work isn't itself a
+// parser generator using the skeleton or a modified version thereof
+// as a parser skeleton.  Alternatively, if you modify or redistribute
+// the parser skeleton itself, you may (at your option) remove this
+// special exception, which will cause the skeleton and the resulting
+// Bison output files to be licensed under the GNU General Public
+// License without this special exception.
+
+// This special exception was added by the Free Software Foundation in
+// version 2.2 of Bison.
+
+
+// First part of user declarations.
+
+#line 37 "d4_ce_parser.tab.cc" // lalr1.cc:404
+
+# ifndef YY_NULLPTR
+#  if defined __cplusplus && 201103L <= __cplusplus
+#   define YY_NULLPTR nullptr
+#  else
+#   define YY_NULLPTR 0
+#  endif
+# endif
+
+#include "d4_ce_parser.tab.hh"
+
+// User implementation prologue.
+
+#line 51 "d4_ce_parser.tab.cc" // lalr1.cc:412
+// Unqualified %code blocks.
+#line 76 "d4_ce_parser.yy" // lalr1.cc:413
+
+   #include <iostream>
+   #include <cstdlib>
+   #include <fstream>
+   
+   #include "BaseType.h"
+   #include "DMR.h"
+   #include "D4Group.h"
+
+   /* include for all driver functions */
+   #include "D4ConstraintEvaluator.h"
+
+   /* this is silly, but I can't figure out a way around it */
+   static int yylex(libdap::D4CEParser::semantic_type *yylval,
+                    libdap::location *loc,
+                    libdap::D4CEScanner  &scanner,
+                    libdap::D4ConstraintEvaluator   &driver);
+
+
+#line 73 "d4_ce_parser.tab.cc" // lalr1.cc:413
+
+
+#ifndef YY_
+# if defined YYENABLE_NLS && YYENABLE_NLS
+#  if ENABLE_NLS
+#   include <libintl.h> // FIXME: INFRINGES ON USER NAME SPACE.
+#   define YY_(msgid) dgettext ("bison-runtime", msgid)
+#  endif
+# endif
+# ifndef YY_
+#  define YY_(msgid) msgid
+# endif
+#endif
+
+#define YYRHSLOC(Rhs, K) ((Rhs)[K].location)
+/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
+   If N is 0, then set CURRENT to the empty location which ends
+   the previous symbol: RHS[0] (always defined).  */
+
+# ifndef YYLLOC_DEFAULT
+#  define YYLLOC_DEFAULT(Current, Rhs, N)                               \
+    do                                                                  \
+      if (N)                                                            \
+        {                                                               \
+          (Current).begin  = YYRHSLOC (Rhs, 1).begin;                   \
+          (Current).end    = YYRHSLOC (Rhs, N).end;                     \
+        }                                                               \
+      else                                                              \
+        {                                                               \
+          (Current).begin = (Current).end = YYRHSLOC (Rhs, 0).end;      \
+        }                                                               \
+    while (/*CONSTCOND*/ false)
+# endif
+
+
+// Suppress unused-variable warnings by "using" E.
+#define YYUSE(E) ((void) (E))
+
+// Enable debugging if requested.
+#if YYDEBUG
+
+// A pseudo ostream that takes yydebug_ into account.
+# define YYCDEBUG if (yydebug_) (*yycdebug_)
+
+# define YY_SYMBOL_PRINT(Title, Symbol)         \
+  do {                                          \
+    if (yydebug_)                               \
+    {                                           \
+      *yycdebug_ << Title << ' ';               \
+      yy_print_ (*yycdebug_, Symbol);           \
+      *yycdebug_ << std::endl;                  \
+    }                                           \
+  } while (false)
+
+# define YY_REDUCE_PRINT(Rule)          \
+  do {                                  \
+    if (yydebug_)                       \
+      yy_reduce_print_ (Rule);          \
+  } while (false)
+
+# define YY_STACK_PRINT()               \
+  do {                                  \
+    if (yydebug_)                       \
+      yystack_print_ ();                \
+  } while (false)
+
+#else // !YYDEBUG
+
+# define YYCDEBUG if (false) std::cerr
+# define YY_SYMBOL_PRINT(Title, Symbol)  YYUSE(Symbol)
+# define YY_REDUCE_PRINT(Rule)           static_cast<void>(0)
+# define YY_STACK_PRINT()                static_cast<void>(0)
+
+#endif // !YYDEBUG
+
+#define yyerrok         (yyerrstatus_ = 0)
+#define yyclearin       (yyla.clear ())
+
+#define YYACCEPT        goto yyacceptlab
+#define YYABORT         goto yyabortlab
+#define YYERROR         goto yyerrorlab
+#define YYRECOVERING()  (!!yyerrstatus_)
+
+#line 35 "d4_ce_parser.yy" // lalr1.cc:479
+namespace libdap {
+#line 159 "d4_ce_parser.tab.cc" // lalr1.cc:479
+
+  /* Return YYSTR after stripping away unnecessary quotes and
+     backslashes, so that it's suitable for yyerror.  The heuristic is
+     that double-quoting is unnecessary unless the string contains an
+     apostrophe, a comma, or backslash (other than backslash-backslash).
+     YYSTR is taken from yytname.  */
+  std::string
+  D4CEParser::yytnamerr_ (const char *yystr)
+  {
+    if (*yystr == '"')
+      {
+        std::string yyr = "";
+        char const *yyp = yystr;
+
+        for (;;)
+          switch (*++yyp)
+            {
+            case '\'':
+            case ',':
+              goto do_not_strip_quotes;
+
+            case '\\':
+              if (*++yyp != '\\')
+                goto do_not_strip_quotes;
+              // Fall through.
+            default:
+              yyr += *yyp;
+              break;
+
+            case '"':
+              return yyr;
+            }
+      do_not_strip_quotes: ;
+      }
+
+    return yystr;
+  }
+
+
+  /// Build a parser object.
+  D4CEParser::D4CEParser (D4CEScanner  &scanner_yyarg, D4ConstraintEvaluator  &driver_yyarg)
+    :
+#if YYDEBUG
+      yydebug_ (false),
+      yycdebug_ (&std::cerr),
+#endif
+      scanner (scanner_yyarg),
+      driver (driver_yyarg)
+  {}
+
+  D4CEParser::~D4CEParser ()
+  {}
+
+
+  /*---------------.
+  | Symbol types.  |
+  `---------------*/
+
+  inline
+  D4CEParser::syntax_error::syntax_error (const location_type& l, const std::string& m)
+    : std::runtime_error (m)
+    , location (l)
+  {}
+
+  // basic_symbol.
+  template <typename Base>
+  inline
+  D4CEParser::basic_symbol<Base>::basic_symbol ()
+    : value ()
+  {}
+
+  template <typename Base>
+  inline
+  D4CEParser::basic_symbol<Base>::basic_symbol (const basic_symbol& other)
+    : Base (other)
+    , value ()
+    , location (other.location)
+  {
+      switch (other.type_get ())
+    {
+      case 29: // dimensions
+      case 30: // dimension
+      case 31: // clauses
+      case 32: // clause
+      case 33: // subset
+      case 36: // indexes
+      case 39: // fields
+      case 40: // filter
+      case 41: // predicate
+        value.copy< bool > (other.value);
+        break;
+
+      case 38: // index
+        value.copy< libdap::D4ConstraintEvaluator::index > (other.value);
+        break;
+
+      case 3: // "word"
+      case 4: // "string"
+      case 42: // op
+      case 43: // id
+      case 44: // group
+      case 45: // path
+      case 46: // name
+        value.copy< std::string > (other.value);
+        break;
+
+      default:
+        break;
+    }
+
+  }
+
+
+  template <typename Base>
+  inline
+  D4CEParser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, const semantic_type& v, const location_type& l)
+    : Base (t)
+    , value ()
+    , location (l)
+  {
+    (void) v;
+      switch (this->type_get ())
+    {
+      case 29: // dimensions
+      case 30: // dimension
+      case 31: // clauses
+      case 32: // clause
+      case 33: // subset
+      case 36: // indexes
+      case 39: // fields
+      case 40: // filter
+      case 41: // predicate
+        value.copy< bool > (v);
+        break;
+
+      case 38: // index
+        value.copy< libdap::D4ConstraintEvaluator::index > (v);
+        break;
+
+      case 3: // "word"
+      case 4: // "string"
+      case 42: // op
+      case 43: // id
+      case 44: // group
+      case 45: // path
+      case 46: // name
+        value.copy< std::string > (v);
+        break;
+
+      default:
+        break;
+    }
+}
+
+
+  // Implementation of basic_symbol constructor for each type.
+
+  template <typename Base>
+  D4CEParser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, const location_type& l)
+    : Base (t)
+    , value ()
+    , location (l)
+  {}
+
+  template <typename Base>
+  D4CEParser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, const bool v, const location_type& l)
+    : Base (t)
+    , value (v)
+    , location (l)
+  {}
+
+  template <typename Base>
+  D4CEParser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, const libdap::D4ConstraintEvaluator::index v, const location_type& l)
+    : Base (t)
+    , value (v)
+    , location (l)
+  {}
+
+  template <typename Base>
+  D4CEParser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, const std::string v, const location_type& l)
+    : Base (t)
+    , value (v)
+    , location (l)
+  {}
+
+
+  template <typename Base>
+  inline
+  D4CEParser::basic_symbol<Base>::~basic_symbol ()
+  {
+    clear ();
+  }
+
+  template <typename Base>
+  inline
+  void
+  D4CEParser::basic_symbol<Base>::clear ()
+  {
+    // User destructor.
+    symbol_number_type yytype = this->type_get ();
+    basic_symbol<Base>& yysym = *this;
+    (void) yysym;
+    switch (yytype)
+    {
+   default:
+      break;
+    }
+
+    // Type destructor.
+    switch (yytype)
+    {
+      case 29: // dimensions
+      case 30: // dimension
+      case 31: // clauses
+      case 32: // clause
+      case 33: // subset
+      case 36: // indexes
+      case 39: // fields
+      case 40: // filter
+      case 41: // predicate
+        value.template destroy< bool > ();
+        break;
+
+      case 38: // index
+        value.template destroy< libdap::D4ConstraintEvaluator::index > ();
+        break;
+
+      case 3: // "word"
+      case 4: // "string"
+      case 42: // op
+      case 43: // id
+      case 44: // group
+      case 45: // path
+      case 46: // name
+        value.template destroy< std::string > ();
+        break;
+
+      default:
+        break;
+    }
+
+    Base::clear ();
+  }
+
+  template <typename Base>
+  inline
+  bool
+  D4CEParser::basic_symbol<Base>::empty () const
+  {
+    return Base::type_get () == empty_symbol;
+  }
+
+  template <typename Base>
+  inline
+  void
+  D4CEParser::basic_symbol<Base>::move (basic_symbol& s)
+  {
+    super_type::move(s);
+      switch (this->type_get ())
+    {
+      case 29: // dimensions
+      case 30: // dimension
+      case 31: // clauses
+      case 32: // clause
+      case 33: // subset
+      case 36: // indexes
+      case 39: // fields
+      case 40: // filter
+      case 41: // predicate
+        value.move< bool > (s.value);
+        break;
+
+      case 38: // index
+        value.move< libdap::D4ConstraintEvaluator::index > (s.value);
+        break;
+
+      case 3: // "word"
+      case 4: // "string"
+      case 42: // op
+      case 43: // id
+      case 44: // group
+      case 45: // path
+      case 46: // name
+        value.move< std::string > (s.value);
+        break;
+
+      default:
+        break;
+    }
+
+    location = s.location;
+  }
+
+  // by_type.
+  inline
+  D4CEParser::by_type::by_type ()
+    : type (empty_symbol)
+  {}
+
+  inline
+  D4CEParser::by_type::by_type (const by_type& other)
+    : type (other.type)
+  {}
+
+  inline
+  D4CEParser::by_type::by_type (token_type t)
+    : type (yytranslate_ (t))
+  {}
+
+  inline
+  void
+  D4CEParser::by_type::clear ()
+  {
+    type = empty_symbol;
+  }
+
+  inline
+  void
+  D4CEParser::by_type::move (by_type& that)
+  {
+    type = that.type;
+    that.clear ();
+  }
+
+  inline
+  int
+  D4CEParser::by_type::type_get () const
+  {
+    return type;
+  }
+  // Implementation of make_symbol for each symbol type.
+  D4CEParser::symbol_type
+  D4CEParser::make_END (const location_type& l)
+  {
+    return symbol_type (token::END, l);
+  }
+
+  D4CEParser::symbol_type
+  D4CEParser::make_WORD (const std::string& v, const location_type& l)
+  {
+    return symbol_type (token::WORD, v, l);
+  }
+
+  D4CEParser::symbol_type
+  D4CEParser::make_STRING (const std::string& v, const location_type& l)
+  {
+    return symbol_type (token::STRING, v, l);
+  }
+
+  D4CEParser::symbol_type
+  D4CEParser::make_SEMICOLON (const location_type& l)
+  {
+    return symbol_type (token::SEMICOLON, l);
+  }
+
+  D4CEParser::symbol_type
+  D4CEParser::make_PIPE (const location_type& l)
+  {
+    return symbol_type (token::PIPE, l);
+  }
+
+  D4CEParser::symbol_type
+  D4CEParser::make_LBRACKET (const location_type& l)
+  {
+    return symbol_type (token::LBRACKET, l);
+  }
+
+  D4CEParser::symbol_type
+  D4CEParser::make_RBRACKET (const location_type& l)
+  {
+    return symbol_type (token::RBRACKET, l);
+  }
+
+  D4CEParser::symbol_type
+  D4CEParser::make_COLON (const location_type& l)
+  {
+    return symbol_type (token::COLON, l);
+  }
+
+  D4CEParser::symbol_type
+  D4CEParser::make_LBRACE (const location_type& l)
+  {
+    return symbol_type (token::LBRACE, l);
+  }
+
+  D4CEParser::symbol_type
+  D4CEParser::make_RBRACE (const location_type& l)
+  {
+    return symbol_type (token::RBRACE, l);
+  }
+
+  D4CEParser::symbol_type
+  D4CEParser::make_LESS (const location_type& l)
+  {
+    return symbol_type (token::LESS, l);
+  }
+
+  D4CEParser::symbol_type
+  D4CEParser::make_GREATER (const location_type& l)
+  {
+    return symbol_type (token::GREATER, l);
+  }
+
+  D4CEParser::symbol_type
+  D4CEParser::make_LESS_EQUAL (const location_type& l)
+  {
+    return symbol_type (token::LESS_EQUAL, l);
+  }
+
+  D4CEParser::symbol_type
+  D4CEParser::make_GREATER_EQUAL (const location_type& l)
+  {
+    return symbol_type (token::GREATER_EQUAL, l);
+  }
+
+  D4CEParser::symbol_type
+  D4CEParser::make_EQUAL (const location_type& l)
+  {
+    return symbol_type (token::EQUAL, l);
+  }
+
+  D4CEParser::symbol_type
+  D4CEParser::make_NOT_EQUAL (const location_type& l)
+  {
+    return symbol_type (token::NOT_EQUAL, l);
+  }
+
+  D4CEParser::symbol_type
+  D4CEParser::make_REGEX_MATCH (const location_type& l)
+  {
+    return symbol_type (token::REGEX_MATCH, l);
+  }
+
+  D4CEParser::symbol_type
+  D4CEParser::make_LESS_BBOX (const location_type& l)
+  {
+    return symbol_type (token::LESS_BBOX, l);
+  }
+
+  D4CEParser::symbol_type
+  D4CEParser::make_GREATER_BBOX (const location_type& l)
+  {
+    return symbol_type (token::GREATER_BBOX, l);
+  }
+
+  D4CEParser::symbol_type
+  D4CEParser::make_MASK (const location_type& l)
+  {
+    return symbol_type (token::MASK, l);
+  }
+
+  D4CEParser::symbol_type
+  D4CEParser::make_ND (const location_type& l)
+  {
+    return symbol_type (token::ND, l);
+  }
+
+  D4CEParser::symbol_type
+  D4CEParser::make_COMMA (const location_type& l)
+  {
+    return symbol_type (token::COMMA, l);
+  }
+
+  D4CEParser::symbol_type
+  D4CEParser::make_ASSIGN (const location_type& l)
+  {
+    return symbol_type (token::ASSIGN, l);
+  }
+
+  D4CEParser::symbol_type
+  D4CEParser::make_GROUP_SEP (const location_type& l)
+  {
+    return symbol_type (token::GROUP_SEP, l);
+  }
+
+  D4CEParser::symbol_type
+  D4CEParser::make_PATH_SEP (const location_type& l)
+  {
+    return symbol_type (token::PATH_SEP, l);
+  }
+
+
+
+  // by_state.
+  inline
+  D4CEParser::by_state::by_state ()
+    : state (empty_state)
+  {}
+
+  inline
+  D4CEParser::by_state::by_state (const by_state& other)
+    : state (other.state)
+  {}
+
+  inline
+  void
+  D4CEParser::by_state::clear ()
+  {
+    state = empty_state;
+  }
+
+  inline
+  void
+  D4CEParser::by_state::move (by_state& that)
+  {
+    state = that.state;
+    that.clear ();
+  }
+
+  inline
+  D4CEParser::by_state::by_state (state_type s)
+    : state (s)
+  {}
+
+  inline
+  D4CEParser::symbol_number_type
+  D4CEParser::by_state::type_get () const
+  {
+    if (state == empty_state)
+      return empty_symbol;
+    else
+      return yystos_[state];
+  }
+
+  inline
+  D4CEParser::stack_symbol_type::stack_symbol_type ()
+  {}
+
+
+  inline
+  D4CEParser::stack_symbol_type::stack_symbol_type (state_type s, symbol_type& that)
+    : super_type (s, that.location)
+  {
+      switch (that.type_get ())
+    {
+      case 29: // dimensions
+      case 30: // dimension
+      case 31: // clauses
+      case 32: // clause
+      case 33: // subset
+      case 36: // indexes
+      case 39: // fields
+      case 40: // filter
+      case 41: // predicate
+        value.move< bool > (that.value);
+        break;
+
+      case 38: // index
+        value.move< libdap::D4ConstraintEvaluator::index > (that.value);
+        break;
+
+      case 3: // "word"
+      case 4: // "string"
+      case 42: // op
+      case 43: // id
+      case 44: // group
+      case 45: // path
+      case 46: // name
+        value.move< std::string > (that.value);
+        break;
+
+      default:
+        break;
+    }
+
+    // that is emptied.
+    that.type = empty_symbol;
+  }
+
+  inline
+  D4CEParser::stack_symbol_type&
+  D4CEParser::stack_symbol_type::operator= (const stack_symbol_type& that)
+  {
+    state = that.state;
+      switch (that.type_get ())
+    {
+      case 29: // dimensions
+      case 30: // dimension
+      case 31: // clauses
+      case 32: // clause
+      case 33: // subset
+      case 36: // indexes
+      case 39: // fields
+      case 40: // filter
+      case 41: // predicate
+        value.copy< bool > (that.value);
+        break;
+
+      case 38: // index
+        value.copy< libdap::D4ConstraintEvaluator::index > (that.value);
+        break;
+
+      case 3: // "word"
+      case 4: // "string"
+      case 42: // op
+      case 43: // id
+      case 44: // group
+      case 45: // path
+      case 46: // name
+        value.copy< std::string > (that.value);
+        break;
+
+      default:
+        break;
+    }
+
+    location = that.location;
+    return *this;
+  }
+
+
+  template <typename Base>
+  inline
+  void
+  D4CEParser::yy_destroy_ (const char* yymsg, basic_symbol<Base>& yysym) const
+  {
+    if (yymsg)
+      YY_SYMBOL_PRINT (yymsg, yysym);
+  }
+
+#if YYDEBUG
+  template <typename Base>
+  void
+  D4CEParser::yy_print_ (std::ostream& yyo,
+                                     const basic_symbol<Base>& yysym) const
+  {
+    std::ostream& yyoutput = yyo;
+    YYUSE (yyoutput);
+    symbol_number_type yytype = yysym.type_get ();
+    // Avoid a (spurious) G++ 4.8 warning about "array subscript is
+    // below array bounds".
+    if (yysym.empty ())
+      std::abort ();
+    yyo << (yytype < yyntokens_ ? "token" : "nterm")
+        << ' ' << yytname_[yytype] << " ("
+        << yysym.location << ": ";
+    YYUSE (yytype);
+    yyo << ')';
+  }
+#endif
+
+  inline
+  void
+  D4CEParser::yypush_ (const char* m, state_type s, symbol_type& sym)
+  {
+    stack_symbol_type t (s, sym);
+    yypush_ (m, t);
+  }
+
+  inline
+  void
+  D4CEParser::yypush_ (const char* m, stack_symbol_type& s)
+  {
+    if (m)
+      YY_SYMBOL_PRINT (m, s);
+    yystack_.push (s);
+  }
+
+  inline
+  void
+  D4CEParser::yypop_ (unsigned int n)
+  {
+    yystack_.pop (n);
+  }
+
+#if YYDEBUG
+  std::ostream&
+  D4CEParser::debug_stream () const
+  {
+    return *yycdebug_;
+  }
+
+  void
+  D4CEParser::set_debug_stream (std::ostream& o)
+  {
+    yycdebug_ = &o;
+  }
+
+
+  D4CEParser::debug_level_type
+  D4CEParser::debug_level () const
+  {
+    return yydebug_;
+  }
+
+  void
+  D4CEParser::set_debug_level (debug_level_type l)
+  {
+    yydebug_ = l;
+  }
+#endif // YYDEBUG
+
+  inline D4CEParser::state_type
+  D4CEParser::yy_lr_goto_state_ (state_type yystate, int yysym)
+  {
+    int yyr = yypgoto_[yysym - yyntokens_] + yystate;
+    if (0 <= yyr && yyr <= yylast_ && yycheck_[yyr] == yystate)
+      return yytable_[yyr];
+    else
+      return yydefgoto_[yysym - yyntokens_];
+  }
+
+  inline bool
+  D4CEParser::yy_pact_value_is_default_ (int yyvalue)
+  {
+    return yyvalue == yypact_ninf_;
+  }
+
+  inline bool
+  D4CEParser::yy_table_value_is_error_ (int yyvalue)
+  {
+    return yyvalue == yytable_ninf_;
+  }
+
+  int
+  D4CEParser::parse ()
+  {
+    // State.
+    int yyn;
+    /// Length of the RHS of the rule being reduced.
+    int yylen = 0;
+
+    // Error handling.
+    int yynerrs_ = 0;
+    int yyerrstatus_ = 0;
+
+    /// The lookahead symbol.
+    symbol_type yyla;
+
+    /// The locations where the error started and ended.
+    stack_symbol_type yyerror_range[3];
+
+    /// The return value of parse ().
+    int yyresult;
+
+    // FIXME: This shoud be completely indented.  It is not yet to
+    // avoid gratuitous conflicts when merging into the master branch.
+    try
+      {
+    YYCDEBUG << "Starting parse" << std::endl;
+
+
+    // User initialization code.
+    #line 68 "d4_ce_parser.yy" // lalr1.cc:745
+{
+    // Initialize the initial location. This is printed when the parser builds
+    // its own error messages - when the parse fails as opposed to when the 
+    // CE names a missing variables, ...
+
+    yyla.location.initialize (driver.expression());
+}
+
+#line 912 "d4_ce_parser.tab.cc" // lalr1.cc:745
+
+    /* Initialize the stack.  The initial state will be set in
+       yynewstate, since the latter expects the semantical and the
+       location values to have been already stored, initialize these
+       stacks with a primary value.  */
+    yystack_.clear ();
+    yypush_ (YY_NULLPTR, 0, yyla);
+
+    // A new symbol was pushed on the stack.
+  yynewstate:
+    YYCDEBUG << "Entering state " << yystack_[0].state << std::endl;
+
+    // Accept?
+    if (yystack_[0].state == yyfinal_)
+      goto yyacceptlab;
+
+    goto yybackup;
+
+    // Backup.
+  yybackup:
+
+    // Try to take a decision without lookahead.
+    yyn = yypact_[yystack_[0].state];
+    if (yy_pact_value_is_default_ (yyn))
+      goto yydefault;
+
+    // Read a lookahead token.
+    if (yyla.empty ())
+      {
+        YYCDEBUG << "Reading a token: ";
+        try
+          {
+            yyla.type = yytranslate_ (yylex (&yyla.value, &yyla.location, scanner, driver));
+          }
+        catch (const syntax_error& yyexc)
+          {
+            error (yyexc);
+            goto yyerrlab1;
+          }
+      }
+    YY_SYMBOL_PRINT ("Next token is", yyla);
+
+    /* If the proper action on seeing token YYLA.TYPE is to reduce or
+       to detect an error, take that action.  */
+    yyn += yyla.type_get ();
+    if (yyn < 0 || yylast_ < yyn || yycheck_[yyn] != yyla.type_get ())
+      goto yydefault;
+
+    // Reduce or error.
+    yyn = yytable_[yyn];
+    if (yyn <= 0)
+      {
+        if (yy_table_value_is_error_ (yyn))
+          goto yyerrlab;
+        yyn = -yyn;
+        goto yyreduce;
+      }
+
+    // Count tokens shifted since error; after three, turn off error status.
+    if (yyerrstatus_)
+      --yyerrstatus_;
+
+    // Shift the lookahead token.
+    yypush_ ("Shifting", yyn, yyla);
+    goto yynewstate;
+
+  /*-----------------------------------------------------------.
+  | yydefault -- do the default action for the current state.  |
+  `-----------------------------------------------------------*/
+  yydefault:
+    yyn = yydefact_[yystack_[0].state];
+    if (yyn == 0)
+      goto yyerrlab;
+    goto yyreduce;
+
+  /*-----------------------------.
+  | yyreduce -- Do a reduction.  |
+  `-----------------------------*/
+  yyreduce:
+    yylen = yyr2_[yyn];
+    {
+      stack_symbol_type yylhs;
+      yylhs.state = yy_lr_goto_state_(yystack_[yylen].state, yyr1_[yyn]);
+      /* Variants are always initialized to an empty instance of the
+         correct type. The default '$$ = $1' action is NOT applied
+         when using variants.  */
+        switch (yyr1_[yyn])
+    {
+      case 29: // dimensions
+      case 30: // dimension
+      case 31: // clauses
+      case 32: // clause
+      case 33: // subset
+      case 36: // indexes
+      case 39: // fields
+      case 40: // filter
+      case 41: // predicate
+        yylhs.value.build< bool > ();
+        break;
+
+      case 38: // index
+        yylhs.value.build< libdap::D4ConstraintEvaluator::index > ();
+        break;
+
+      case 3: // "word"
+      case 4: // "string"
+      case 42: // op
+      case 43: // id
+      case 44: // group
+      case 45: // path
+      case 46: // name
+        yylhs.value.build< std::string > ();
+        break;
+
+      default:
+        break;
+    }
+
+
+      // Compute the default @$.
+      {
+        slice<stack_symbol_type, stack_type> slice (yystack_, yylen);
+        YYLLOC_DEFAULT (yylhs.location, slice, yylen);
+      }
+
+      // Perform the reduction.
+      YY_REDUCE_PRINT (yyn);
+      try
+        {
+          switch (yyn)
+            {
+  case 2:
+#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 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 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 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 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 > ());
+}
+#line 1073 "d4_ce_parser.tab.cc" // lalr1.cc:859
+    break;
+
+  case 7:
+#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 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 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 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 184 "d4_ce_parser.yy" // lalr1.cc:859
+    {
+    BaseType *btp = 0;
+    if (driver.top_basetype()) {
+        btp = driver.top_basetype()->var(yystack_[0].value.as< std::string > ());
+    }
+    else {
+        btp = driver.dmr()->root()->find_var(yystack_[0].value.as< std::string > ());
+    }
+    
+    if (!btp)
+        driver.throw_not_found(yystack_[0].value.as< std::string > (), "id");
+
+    yylhs.value.as< bool > () = driver.mark_variable(btp);
+    
+    // push the basetype so that it is
+    // accessible if/while filters are parsed
+    driver.push_basetype(btp);
+}
+#line 1120 "d4_ce_parser.tab.cc" // lalr1.cc:859
+    break;
+
+  case 12:
+#line 204 "d4_ce_parser.yy" // lalr1.cc:859
+    {
+    BaseType *btp = 0;
+    if (driver.top_basetype()) {
+        btp = driver.top_basetype()->var(yystack_[1].value.as< std::string > ());
+    }
+    else {
+        btp = driver.dmr()->root()->find_var(yystack_[1].value.as< std::string > ());
+    }
+    
+    if (!btp)
+        driver.throw_not_found(yystack_[1].value.as< std::string > (), "id indexes");
+        
+    if (btp->type() != dods_array_c)
+        driver.throw_not_array(yystack_[1].value.as< std::string > (), "id indexes");
+        
+    yylhs.value.as< bool > () = driver.mark_variable(btp);
+    
+    // push the basetype so that it is
+    // accessible if/while filters are parsed
+    driver.push_basetype(btp);
+}
+#line 1146 "d4_ce_parser.tab.cc" // lalr1.cc:859
+    break;
+
+  case 13:
+#line 228 "d4_ce_parser.yy" // lalr1.cc:859
+    {
+    BaseType *btp = 0;
+    if (driver.top_basetype()) {
+        btp = driver.top_basetype()->var(yystack_[0].value.as< std::string > ());
+    }
+    else {
+        btp = driver.dmr()->root()->find_var(yystack_[0].value.as< std::string > ());
+    }
+
+    if (!btp)
+        driver.throw_not_found(yystack_[0].value.as< std::string > (), "id fields");
+    
+    if (btp->type() == dods_array_c) {
+        if (btp->var() && !btp->var()->is_constructor_type())
+            throw Error(no_such_variable, "The variable " + yystack_[0].value.as< std::string > () + " must be a Structure or Sequence to be used with {}.");
+            
+        // This call also tests the btp to make sure it's an array
+        driver.mark_array_variable(btp);
+    }
+    else {
+        // Don't mark the variable here because only some fields are to be sent and those
+        // will be marked when the fields are parsed
+        if (!btp->is_constructor_type())
+            throw Error(no_such_variable, "The variable " + yystack_[0].value.as< std::string > () + " must be a Structure or Sequence to be used with {}.");
+    }
+    
+    // push the basetype so that it is
+    // accessible when fields and if/while filters are parsed
+    driver.push_basetype(btp);
+}
+#line 1181 "d4_ce_parser.tab.cc" // lalr1.cc:859
+    break;
+
+  case 14:
+#line 259 "d4_ce_parser.yy" // lalr1.cc:859
+    { 
+    //driver.pop_basetype(); 
+    yylhs.value.as< bool > () = true; 
+}
+#line 1190 "d4_ce_parser.tab.cc" // lalr1.cc:859
+    break;
+
+  case 15:
+#line 267 "d4_ce_parser.yy" // lalr1.cc:859
+    {
+    BaseType *btp = 0;
+    if (driver.top_basetype()) {
+        btp = driver.top_basetype()->var(yystack_[1].value.as< std::string > ());
+    }
+    else {
+        btp = driver.dmr()->root()->find_var(yystack_[1].value.as< std::string > ());
+    }
+
+    if (!btp)
+        driver.throw_not_found(yystack_[1].value.as< std::string > (), "id indexes fields");
+    
+    if (btp->type() != dods_array_c)
+        driver.throw_not_array(yystack_[1].value.as< std::string > (), "id indexes fields");
+
+    // This call also tests the btp to make sure it's an array
+    driver.mark_array_variable(btp);
+    
+    if (!btp->var()->is_constructor_type())
+        throw Error(no_such_variable, "The variable " + yystack_[1].value.as< std::string > () + " must be a Structure or Sequence to be used with {}.");
+      
+    driver.push_basetype(btp->var());       
+}
+#line 1218 "d4_ce_parser.tab.cc" // lalr1.cc:859
+    break;
+
+  case 16:
+#line 291 "d4_ce_parser.yy" // lalr1.cc:859
+    { 
+    //driver.pop_basetype();
+    yylhs.value.as< bool > () = true; 
+}
+#line 1227 "d4_ce_parser.tab.cc" // lalr1.cc:859
+    break;
+
+  case 17:
+#line 302 "d4_ce_parser.yy" // lalr1.cc:859
+    { 
+    driver.push_index(yystack_[0].value.as< libdap::D4ConstraintEvaluator::index > ()); 
+    yylhs.value.as< bool > () = true; 
+}
+#line 1236 "d4_ce_parser.tab.cc" // lalr1.cc:859
+    break;
+
+  case 18:
+#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 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 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 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 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 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 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 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 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 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 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 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 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 > ()); 
+    yylhs.value.as< bool > () = true; 
+
+}
+#line 1319 "d4_ce_parser.tab.cc" // lalr1.cc:859
+    break;
+
+  case 31:
+#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 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 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 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 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 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 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 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 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 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 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 370 "d4_ce_parser.yy" // lalr1.cc:859
+    {
+    yylhs.value.as< std::string > () = yystack_[0].value.as< std::string > ();
+}
+#line 1393 "d4_ce_parser.tab.cc" // lalr1.cc:859
+    break;
+
+  case 43:
+#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 > ());
+}
+#line 1402 "d4_ce_parser.tab.cc" // lalr1.cc:859
+    break;
+
+  case 44:
+#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 > ());
+    yylhs.value.as< std::string > () = yystack_[2].value.as< std::string > ();
+}
+#line 1412 "d4_ce_parser.tab.cc" // lalr1.cc:859
+    break;
+
+  case 45:
+#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 > ());
+}
+#line 1421 "d4_ce_parser.tab.cc" // lalr1.cc:859
+    break;
+
+  case 46:
+#line 392 "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 > ());
+    yylhs.value.as< std::string > () = yystack_[2].value.as< std::string > ();
+}
+#line 1431 "d4_ce_parser.tab.cc" // lalr1.cc:859
+    break;
+
+  case 47:
+#line 400 "d4_ce_parser.yy" // lalr1.cc:859
+    {
+    yylhs.value.as< std::string > () = yystack_[0].value.as< std::string > ();
+}
+#line 1439 "d4_ce_parser.tab.cc" // lalr1.cc:859
+    break;
+
+  case 48:
+#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 > ());
+    yylhs.value.as< std::string > () = yystack_[2].value.as< std::string > ();
+}
+#line 1449 "d4_ce_parser.tab.cc" // lalr1.cc:859
+    break;
+
+  case 49:
+#line 421 "d4_ce_parser.yy" // lalr1.cc:859
+    {
+    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 425 "d4_ce_parser.yy" // lalr1.cc:859
+    {
+    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;
+
+
+#line 1469 "d4_ce_parser.tab.cc" // lalr1.cc:859
+            default:
+              break;
+            }
+        }
+      catch (const syntax_error& yyexc)
+        {
+          error (yyexc);
+          YYERROR;
+        }
+      YY_SYMBOL_PRINT ("-> $$ =", yylhs);
+      yypop_ (yylen);
+      yylen = 0;
+      YY_STACK_PRINT ();
+
+      // Shift the result of the reduction.
+      yypush_ (YY_NULLPTR, yylhs);
+    }
+    goto yynewstate;
+
+  /*--------------------------------------.
+  | yyerrlab -- here on detecting error.  |
+  `--------------------------------------*/
+  yyerrlab:
+    // If not already recovering from an error, report this error.
+    if (!yyerrstatus_)
+      {
+        ++yynerrs_;
+        error (yyla.location, yysyntax_error_ (yystack_[0].state, yyla));
+      }
+
+
+    yyerror_range[1].location = yyla.location;
+    if (yyerrstatus_ == 3)
+      {
+        /* If just tried and failed to reuse lookahead token after an
+           error, discard it.  */
+
+        // Return failure if at end of input.
+        if (yyla.type_get () == yyeof_)
+          YYABORT;
+        else if (!yyla.empty ())
+          {
+            yy_destroy_ ("Error: discarding", yyla);
+            yyla.clear ();
+          }
+      }
+
+    // Else will try to reuse lookahead token after shifting the error token.
+    goto yyerrlab1;
+
+
+  /*---------------------------------------------------.
+  | yyerrorlab -- error raised explicitly by YYERROR.  |
+  `---------------------------------------------------*/
+  yyerrorlab:
+
+    /* Pacify compilers like GCC when the user code never invokes
+       YYERROR and the label yyerrorlab therefore never appears in user
+       code.  */
+    if (false)
+      goto yyerrorlab;
+    yyerror_range[1].location = yystack_[yylen - 1].location;
+    /* Do not reclaim the symbols of the rule whose action triggered
+       this YYERROR.  */
+    yypop_ (yylen);
+    yylen = 0;
+    goto yyerrlab1;
+
+  /*-------------------------------------------------------------.
+  | yyerrlab1 -- common code for both syntax error and YYERROR.  |
+  `-------------------------------------------------------------*/
+  yyerrlab1:
+    yyerrstatus_ = 3;   // Each real token shifted decrements this.
+    {
+      stack_symbol_type error_token;
+      for (;;)
+        {
+          yyn = yypact_[yystack_[0].state];
+          if (!yy_pact_value_is_default_ (yyn))
+            {
+              yyn += yyterror_;
+              if (0 <= yyn && yyn <= yylast_ && yycheck_[yyn] == yyterror_)
+                {
+                  yyn = yytable_[yyn];
+                  if (0 < yyn)
+                    break;
+                }
+            }
+
+          // Pop the current state because it cannot handle the error token.
+          if (yystack_.size () == 1)
+            YYABORT;
+
+          yyerror_range[1].location = yystack_[0].location;
+          yy_destroy_ ("Error: popping", yystack_[0]);
+          yypop_ ();
+          YY_STACK_PRINT ();
+        }
+
+      yyerror_range[2].location = yyla.location;
+      YYLLOC_DEFAULT (error_token.location, yyerror_range, 2);
+
+      // Shift the error token.
+      error_token.state = yyn;
+      yypush_ ("Shifting", error_token);
+    }
+    goto yynewstate;
+
+    // Accept.
+  yyacceptlab:
+    yyresult = 0;
+    goto yyreturn;
+
+    // Abort.
+  yyabortlab:
+    yyresult = 1;
+    goto yyreturn;
+
+  yyreturn:
+    if (!yyla.empty ())
+      yy_destroy_ ("Cleanup: discarding lookahead", yyla);
+
+    /* Do not reclaim the symbols of the rule whose action triggered
+       this YYABORT or YYACCEPT.  */
+    yypop_ (yylen);
+    while (1 < yystack_.size ())
+      {
+        yy_destroy_ ("Cleanup: popping", yystack_[0]);
+        yypop_ ();
+      }
+
+    return yyresult;
+  }
+    catch (...)
+      {
+        YYCDEBUG << "Exception caught: cleaning lookahead and stack"
+                 << std::endl;
+        // Do not try to display the values of the reclaimed symbols,
+        // as their printer might throw an exception.
+        if (!yyla.empty ())
+          yy_destroy_ (YY_NULLPTR, yyla);
+
+        while (1 < yystack_.size ())
+          {
+            yy_destroy_ (YY_NULLPTR, yystack_[0]);
+            yypop_ ();
+          }
+        throw;
+      }
+  }
+
+  void
+  D4CEParser::error (const syntax_error& yyexc)
+  {
+    error (yyexc.location, yyexc.what());
+  }
+
+  // Generate an error message.
+  std::string
+  D4CEParser::yysyntax_error_ (state_type yystate, const symbol_type& yyla) const
+  {
+    // Number of reported tokens (one for the "unexpected", one per
+    // "expected").
+    size_t yycount = 0;
+    // Its maximum.
+    enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+    // Arguments of yyformat.
+    char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+
+    /* There are many possibilities here to consider:
+       - If this state is a consistent state with a default action, then
+         the only way this function was invoked is if the default action
+         is an error action.  In that case, don't check for expected
+         tokens because there are none.
+       - The only way there can be no lookahead present (in yyla) is
+         if this state is a consistent state with a default action.
+         Thus, detecting the absence of a lookahead is sufficient to
+         determine that there is no unexpected or expected token to
+         report.  In that case, just report a simple "syntax error".
+       - Don't assume there isn't a lookahead just because this state is
+         a consistent state with a default action.  There might have
+         been a previous inconsistent state, consistent state with a
+         non-default action, or user semantic action that manipulated
+         yyla.  (However, yyla is currently not documented for users.)
+       - Of course, the expected token list depends on states to have
+         correct lookahead information, and it depends on the parser not
+         to perform extra reductions after fetching a lookahead from the
+         scanner and before detecting a syntax error.  Thus, state
+         merging (from LALR or IELR) and default reductions corrupt the
+         expected token list.  However, the list is correct for
+         canonical LR with one exception: it will still contain any
+         token that will not be accepted due to an error action in a
+         later state.
+    */
+    if (!yyla.empty ())
+      {
+        int yytoken = yyla.type_get ();
+        yyarg[yycount++] = yytname_[yytoken];
+        int yyn = yypact_[yystate];
+        if (!yy_pact_value_is_default_ (yyn))
+          {
+            /* Start YYX at -YYN if negative to avoid negative indexes in
+               YYCHECK.  In other words, skip the first -YYN actions for
+               this state because they are default actions.  */
+            int yyxbegin = yyn < 0 ? -yyn : 0;
+            // Stay within bounds of both yycheck and yytname.
+            int yychecklim = yylast_ - yyn + 1;
+            int yyxend = yychecklim < yyntokens_ ? yychecklim : yyntokens_;
+            for (int yyx = yyxbegin; yyx < yyxend; ++yyx)
+              if (yycheck_[yyx + yyn] == yyx && yyx != yyterror_
+                  && !yy_table_value_is_error_ (yytable_[yyx + yyn]))
+                {
+                  if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+                    {
+                      yycount = 1;
+                      break;
+                    }
+                  else
+                    yyarg[yycount++] = yytname_[yyx];
+                }
+          }
+      }
+
+    char const* yyformat = YY_NULLPTR;
+    switch (yycount)
+      {
+#define YYCASE_(N, S)                         \
+        case N:                               \
+          yyformat = S;                       \
+        break
+        YYCASE_(0, YY_("syntax error"));
+        YYCASE_(1, YY_("syntax error, unexpected %s"));
+        YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
+        YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
+        YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
+        YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
+#undef YYCASE_
+      }
+
+    std::string yyres;
+    // Argument number.
+    size_t yyi = 0;
+    for (char const* yyp = yyformat; *yyp; ++yyp)
+      if (yyp[0] == '%' && yyp[1] == 's' && yyi < yycount)
+        {
+          yyres += yytnamerr_ (yyarg[yyi++]);
+          ++yyp;
+        }
+      else
+        yyres += *yyp;
+    return yyres;
+  }
+
+
+  const signed char D4CEParser::yypact_ninf_ = -19;
+
+  const signed char D4CEParser::yytable_ninf_ = -47;
+
+  const signed char
+  D4CEParser::yypact_[] =
+  {
+       4,   -19,   -19,    10,    15,     5,   -19,    16,   -19,    30,
+       9,    31,     8,   -19,     8,    32,   -19,     4,     4,     1,
+      14,    51,    49,    50,    54,    10,    10,   -19,    16,   -19,
+      -4,    38,    40,   -19,    28,    29,   -19,   -19,     4,   -19,
+      49,    51,     8,    39,   -19,     4,     1,   -19,   -19,   -19,
+     -19,   -19,   -19,   -19,   -19,   -19,   -19,     4,   -19,    27,
+       7,   -19,   -19,   -19,   -19,    28,    44,   -19,   -19,     4,
+     -19,    47,   -19,    46,   -19,   -19
+  };
+
+  const unsigned char
+  D4CEParser::yydefact_[] =
+  {
+       0,    49,    50,     0,     0,     0,     4,     2,     7,     9,
+      11,     0,    42,    47,    43,    47,     1,     0,     0,     0,
+       0,     0,     0,    12,    17,     0,     0,     5,     3,     8,
+      11,     0,    10,    27,     0,     0,    20,     6,     0,    14,
+       0,     0,    44,    47,    48,     0,     0,    32,    33,    34,
+      35,    36,    37,    38,    39,    40,    41,     0,    21,     0,
+       0,    16,    19,    31,    28,    29,     0,    24,    26,     0,
+      22,     0,    30,     0,    25,    23
+  };
+
+  const signed char
+  D4CEParser::yypgoto_[] =
+  {
+     -19,   -19,   -19,    48,    -6,    52,   -19,   -19,   -19,    25,
+     -19,    53,    33,   -19,    21,     3,   -18,   -19,     6,    -1
+  };
+
+  const signed char
+  D4CEParser::yydefgoto_[] =
+  {
+      -1,     4,     5,     6,     7,     8,     9,    22,    40,    23,
+      41,    24,    39,    32,    33,    57,    10,    11,    12,    13
+  };
+
+  const signed char
+  D4CEParser::yytable_[] =
+  {
+      30,    34,    15,    20,     1,     2,   -13,     1,     2,    14,
+      17,    28,    18,     1,     2,    16,    20,    35,    68,   -13,
+      30,    18,    36,    31,    43,    44,     3,    63,    34,     3,
+      66,    42,    60,    21,    26,    67,    19,    58,    59,    65,
+      47,    48,    49,    50,    51,    52,    53,    54,    55,    56,
+      73,    72,    70,    71,    75,    74,    25,   -45,    20,    38,
+     -15,   -18,    45,    46,   -46,    27,    62,    64,    69,     0,
+      29,     0,     0,    61,    37
+  };
+
+  const signed char
+  D4CEParser::yycheck_[] =
+  {
+      18,    19,     3,     7,     3,     4,    10,     3,     4,     3,
+       5,    17,     5,     3,     4,     0,     7,     3,    11,    10,
+      38,     5,     8,    22,    25,    26,    25,    45,    46,    25,
+       3,    25,    38,    24,    26,     8,     6,     8,     9,    57,
+      12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
+       3,    69,     8,     9,     8,     8,    25,    25,     7,    10,
+      10,     7,    24,    23,    25,    17,    41,    46,    65,    -1,
+      18,    -1,    -1,    40,    21
+  };
+
+  const unsigned char
+  D4CEParser::yystos_[] =
+  {
+       0,     3,     4,    25,    28,    29,    30,    31,    32,    33,
+      43,    44,    45,    46,    45,    46,     0,     5,     5,     6,
+       7,    24,    34,    36,    38,    25,    26,    30,    31,    32,
+      43,    22,    40,    41,    43,     3,     8,    38,    10,    39,
+      35,    37,    45,    46,    46,    24,    23,    12,    13,    14,
+      15,    16,    17,    18,    19,    20,    21,    42,     8,     9,
+      31,    39,    36,    43,    41,    43,     3,     8,    11,    42,
+       8,     9,    43,     3,     8,     8
+  };
+
+  const unsigned char
+  D4CEParser::yyr1_[] =
+  {
+       0,    27,    28,    28,    29,    29,    30,    31,    31,    32,
+      32,    33,    33,    34,    33,    35,    33,    36,    37,    36,
+      38,    38,    38,    38,    38,    38,    39,    40,    40,    41,
+      41,    41,    42,    42,    42,    42,    42,    42,    42,    42,
+      42,    42,    43,    43,    43,    44,    44,    45,    45,    46,
+      46
+  };
+
+  const unsigned char
+  D4CEParser::yyr2_[] =
+  {
+       0,     2,     1,     3,     1,     3,     3,     1,     3,     1,
+       3,     1,     2,     0,     3,     0,     4,     1,     0,     3,
+       2,     3,     5,     7,     4,     6,     3,     1,     3,     3,
+       5,     3,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     2,     3,     2,     3,     1,     3,     1,
+       1
+  };
+
+
+
+  // YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
+  // First, the terminals, then, starting at \a yyntokens_, nonterminals.
+  const char*
+  const D4CEParser::yytname_[] =
+  {
+  "\"end of file\"", "error", "$undefined", "\"word\"", "\"string\"",
+  "\";\"", "\"|\"", "\"[\"", "\"]\"", "\":\"", "\"{\"", "\"}\"", "\"<\"",
+  "\">\"", "\"<=\"", "\">=\"", "\"==\"", "\"!=\"", "\"~=\"", "\"<<\"",
+  "\">>\"", "\"@=\"", "\"ND\"", "\",\"", "\"=\"", "\"/\"", "\".\"",
+  "$accept", "expression", "dimensions", "dimension", "clauses", "clause",
+  "subset", "$@1", "$@2", "indexes", "$@3", "index", "fields", "filter",
+  "predicate", "op", "id", "group", "path", "name", YY_NULLPTR
+  };
+
+#if YYDEBUG
+  const unsigned short int
+  D4CEParser::yyrline_[] =
+  {
+       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.
+  void
+  D4CEParser::yystack_print_ ()
+  {
+    *yycdebug_ << "Stack now";
+    for (stack_type::const_iterator
+           i = yystack_.begin (),
+           i_end = yystack_.end ();
+         i != i_end; ++i)
+      *yycdebug_ << ' ' << i->state;
+    *yycdebug_ << std::endl;
+  }
+
+  // Report on the debug stream that the rule \a yyrule is going to be reduced.
+  void
+  D4CEParser::yy_reduce_print_ (int yyrule)
+  {
+    unsigned int yylno = yyrline_[yyrule];
+    int yynrhs = yyr2_[yyrule];
+    // Print the symbols being reduced, and their result.
+    *yycdebug_ << "Reducing stack by rule " << yyrule - 1
+               << " (line " << yylno << "):" << std::endl;
+    // The symbols being reduced.
+    for (int yyi = 0; yyi < yynrhs; yyi++)
+      YY_SYMBOL_PRINT ("   $" << yyi + 1 << " =",
+                       yystack_[(yynrhs) - (yyi + 1)]);
+  }
+#endif // YYDEBUG
+
+  // Symbol number corresponding to token number t.
+  inline
+  D4CEParser::token_number_type
+  D4CEParser::yytranslate_ (int t)
+  {
+    static
+    const token_number_type
+    translate_table[] =
+    {
+     0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     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
+    };
+    const unsigned int user_token_number_max_ = 281;
+    const token_number_type undef_token_ = 2;
+
+    if (static_cast<int>(t) <= yyeof_)
+      return yyeof_;
+    else if (static_cast<unsigned int> (t) <= user_token_number_max_)
+      return translate_table[t];
+    else
+      return undef_token_;
+  }
+
+#line 35 "d4_ce_parser.yy" // lalr1.cc:1167
+} // libdap
+#line 1938 "d4_ce_parser.tab.cc" // lalr1.cc:1167
+#line 430 "d4_ce_parser.yy" // lalr1.cc:1168
+
+
+// Forward the error to the driver for handling. The location parameter
+// provides the line number and character position of the error.
+void
+libdap::D4CEParser::error(const location_type &l, const std::string &m)
+{
+    driver.error(l, m);
+}
+
+/* include for access to scanner.yylex */
+#include "D4CEScanner.h"
+
+static int yylex(libdap::D4CEParser::semantic_type *yylval,
+                 libdap::location *loc,
+                 libdap::D4CEScanner &scanner,
+                 libdap::D4ConstraintEvaluator &driver)
+{
+    if (driver.trace_scanning())
+        scanner.set_debug(true);
+    
+    return( scanner.yylex(yylval, loc) );
+}
diff --git a/d4_ce/d4_ce_parser.tab.hh b/d4_ce/d4_ce_parser.tab.hh
new file mode 100644
index 0000000..0a32aa0
--- /dev/null
+++ b/d4_ce/d4_ce_parser.tab.hh
@@ -0,0 +1,802 @@
+// A Bison parser, made by GNU Bison 3.0.4.
+
+// Skeleton interface for Bison LALR(1) parsers in C++
+
+// Copyright (C) 2002-2015 Free Software Foundation, Inc.
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+// As a special exception, you may create a larger work that contains
+// part or all of the Bison parser skeleton and distribute that work
+// under terms of your choice, so long as that work isn't itself a
+// parser generator using the skeleton or a modified version thereof
+// as a parser skeleton.  Alternatively, if you modify or redistribute
+// the parser skeleton itself, you may (at your option) remove this
+// special exception, which will cause the skeleton and the resulting
+// Bison output files to be licensed under the GNU General Public
+// License without this special exception.
+
+// This special exception was added by the Free Software Foundation in
+// version 2.2 of Bison.
+
+/**
+ ** \file d4_ce_parser.tab.hh
+ ** Define the libdap::parser class.
+ */
+
+// C++ LALR(1) parser skeleton written by Akim Demaille.
+
+#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
+
+#include "D4ConstraintEvaluator.h"
+#include "escaping.h" // for www2id() used with WORD and STRING
+namespace libdap {
+    class D4CEScanner;
+}
+
+
+#line 53 "d4_ce_parser.tab.hh" // lalr1.cc:392
+
+# include <cassert>
+# include <cstdlib> // std::abort
+# include <iostream>
+# include <stdexcept>
+# include <string>
+# include <vector>
+# include "stack.hh"
+# include "location.hh"
+#include <typeinfo>
+#ifndef YYASSERT
+# include <cassert>
+# define YYASSERT assert
+#endif
+
+
+#ifndef YY_ATTRIBUTE
+# if (defined __GNUC__                                               \
+      && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__)))  \
+     || defined __SUNPRO_C && 0x5110 <= __SUNPRO_C
+#  define YY_ATTRIBUTE(Spec) __attribute__(Spec)
+# else
+#  define YY_ATTRIBUTE(Spec) /* empty */
+# endif
+#endif
+
+#ifndef YY_ATTRIBUTE_PURE
+# define YY_ATTRIBUTE_PURE   YY_ATTRIBUTE ((__pure__))
+#endif
+
+#ifndef YY_ATTRIBUTE_UNUSED
+# define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__))
+#endif
+
+#if !defined _Noreturn \
+     && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112)
+# if defined _MSC_VER && 1200 <= _MSC_VER
+#  define _Noreturn __declspec (noreturn)
+# else
+#  define _Noreturn YY_ATTRIBUTE ((__noreturn__))
+# endif
+#endif
+
+/* Suppress unused-variable warnings by "using" E.  */
+#if ! defined lint || defined __GNUC__
+# define YYUSE(E) ((void) (E))
+#else
+# define YYUSE(E) /* empty */
+#endif
+
+#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
+/* Suppress an incorrect diagnostic about yylval being uninitialized.  */
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
+    _Pragma ("GCC diagnostic push") \
+    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\
+    _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END \
+    _Pragma ("GCC diagnostic pop")
+#else
+# define YY_INITIAL_VALUE(Value) Value
+#endif
+#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END
+#endif
+#ifndef YY_INITIAL_VALUE
+# define YY_INITIAL_VALUE(Value) /* Nothing. */
+#endif
+
+/* Debug traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 1
+#endif
+
+#line 35 "d4_ce_parser.yy" // lalr1.cc:392
+namespace libdap {
+#line 130 "d4_ce_parser.tab.hh" // lalr1.cc:392
+
+
+
+  /// A char[S] buffer to store and retrieve objects.
+  ///
+  /// Sort of a variant, but does not keep track of the nature
+  /// of the stored data, since that knowledge is available
+  /// via the current state.
+  template <size_t S>
+  struct variant
+  {
+    /// Type of *this.
+    typedef variant<S> self_type;
+
+    /// Empty construction.
+    variant ()
+      : yytypeid_ (YY_NULLPTR)
+    {}
+
+    /// Construct and fill.
+    template <typename T>
+    variant (const T& t)
+      : yytypeid_ (&typeid (T))
+    {
+      YYASSERT (sizeof (T) <= S);
+      new (yyas_<T> ()) T (t);
+    }
+
+    /// Destruction, allowed only if empty.
+    ~variant ()
+    {
+      YYASSERT (!yytypeid_);
+    }
+
+    /// Instantiate an empty \a T in here.
+    template <typename T>
+    T&
+    build ()
+    {
+      YYASSERT (!yytypeid_);
+      YYASSERT (sizeof (T) <= S);
+      yytypeid_ = & typeid (T);
+      return *new (yyas_<T> ()) T;
+    }
+
+    /// Instantiate a \a T in here from \a t.
+    template <typename T>
+    T&
+    build (const T& t)
+    {
+      YYASSERT (!yytypeid_);
+      YYASSERT (sizeof (T) <= S);
+      yytypeid_ = & typeid (T);
+      return *new (yyas_<T> ()) T (t);
+    }
+
+    /// Accessor to a built \a T.
+    template <typename T>
+    T&
+    as ()
+    {
+      YYASSERT (*yytypeid_ == typeid (T));
+      YYASSERT (sizeof (T) <= S);
+      return *yyas_<T> ();
+    }
+
+    /// Const accessor to a built \a T (for %printer).
+    template <typename T>
+    const T&
+    as () const
+    {
+      YYASSERT (*yytypeid_ == typeid (T));
+      YYASSERT (sizeof (T) <= S);
+      return *yyas_<T> ();
+    }
+
+    /// Swap the content with \a other, of same type.
+    ///
+    /// Both variants must be built beforehand, because swapping the actual
+    /// data requires reading it (with as()), and this is not possible on
+    /// unconstructed variants: it would require some dynamic testing, which
+    /// should not be the variant's responsability.
+    /// Swapping between built and (possibly) non-built is done with
+    /// variant::move ().
+    template <typename T>
+    void
+    swap (self_type& other)
+    {
+      YYASSERT (yytypeid_);
+      YYASSERT (*yytypeid_ == *other.yytypeid_);
+      std::swap (as<T> (), other.as<T> ());
+    }
+
+    /// Move the content of \a other to this.
+    ///
+    /// Destroys \a other.
+    template <typename T>
+    void
+    move (self_type& other)
+    {
+      build<T> ();
+      swap<T> (other);
+      other.destroy<T> ();
+    }
+
+    /// Copy the content of \a other to this.
+    template <typename T>
+    void
+    copy (const self_type& other)
+    {
+      build<T> (other.as<T> ());
+    }
+
+    /// Destroy the stored \a T.
+    template <typename T>
+    void
+    destroy ()
+    {
+      as<T> ().~T ();
+      yytypeid_ = YY_NULLPTR;
+    }
+
+  private:
+    /// Prohibit blind copies.
+    self_type& operator=(const self_type&);
+    variant (const self_type&);
+
+    /// Accessor to raw memory as \a T.
+    template <typename T>
+    T*
+    yyas_ ()
+    {
+      void *yyp = yybuffer_.yyraw;
+      return static_cast<T*> (yyp);
+     }
+
+    /// Const accessor to raw memory as \a T.
+    template <typename T>
+    const T*
+    yyas_ () const
+    {
+      const void *yyp = yybuffer_.yyraw;
+      return static_cast<const T*> (yyp);
+     }
+
+    union
+    {
+      /// Strongest alignment constraints.
+      long double yyalign_me;
+      /// A buffer large enough to store any of the semantic values.
+      char yyraw[S];
+    } yybuffer_;
+
+    /// Whether the content is built: if defined, the name of the stored type.
+    const std::type_info *yytypeid_;
+  };
+
+
+  /// A Bison parser.
+  class D4CEParser
+  {
+  public:
+#ifndef YYSTYPE
+    /// An auxiliary type to compute the largest semantic type.
+    union union_type
+    {
+      // dimensions
+      // dimension
+      // clauses
+      // clause
+      // subset
+      // indexes
+      // fields
+      // filter
+      // predicate
+      char dummy1[sizeof(bool)];
+
+      // index
+      char dummy2[sizeof(libdap::D4ConstraintEvaluator::index)];
+
+      // "word"
+      // "string"
+      // op
+      // id
+      // group
+      // path
+      // name
+      char dummy3[sizeof(std::string)];
+};
+
+    /// Symbol semantic values.
+    typedef variant<sizeof(union_type)> semantic_type;
+#else
+    typedef YYSTYPE semantic_type;
+#endif
+    /// Symbol locations.
+    typedef location location_type;
+
+    /// Syntax errors thrown from user actions.
+    struct syntax_error : std::runtime_error
+    {
+      syntax_error (const location_type& l, const std::string& m);
+      location_type location;
+    };
+
+    /// Tokens.
+    struct token
+    {
+      enum yytokentype
+      {
+        END = 0,
+        WORD = 258,
+        STRING = 259,
+        SEMICOLON = 260,
+        PIPE = 261,
+        LBRACKET = 262,
+        RBRACKET = 263,
+        COLON = 264,
+        LBRACE = 265,
+        RBRACE = 266,
+        LESS = 267,
+        GREATER = 268,
+        LESS_EQUAL = 269,
+        GREATER_EQUAL = 270,
+        EQUAL = 271,
+        NOT_EQUAL = 272,
+        REGEX_MATCH = 273,
+        LESS_BBOX = 274,
+        GREATER_BBOX = 275,
+        MASK = 276,
+        ND = 277,
+        COMMA = 278,
+        ASSIGN = 279,
+        GROUP_SEP = 280,
+        PATH_SEP = 281
+      };
+    };
+
+    /// (External) token type, as returned by yylex.
+    typedef token::yytokentype token_type;
+
+    /// Symbol type: an internal symbol number.
+    typedef int symbol_number_type;
+
+    /// The symbol type number to denote an empty symbol.
+    enum { empty_symbol = -2 };
+
+    /// Internal symbol number for tokens (subsumed by symbol_number_type).
+    typedef unsigned char token_number_type;
+
+    /// A complete symbol.
+    ///
+    /// Expects its Base type to provide access to the symbol type
+    /// via type_get().
+    ///
+    /// Provide access to semantic value and location.
+    template <typename Base>
+    struct basic_symbol : Base
+    {
+      /// Alias to Base.
+      typedef Base super_type;
+
+      /// Default constructor.
+      basic_symbol ();
+
+      /// Copy constructor.
+      basic_symbol (const basic_symbol& other);
+
+      /// Constructor for valueless symbols, and symbols from each type.
+
+  basic_symbol (typename Base::kind_type t, const location_type& l);
+
+  basic_symbol (typename Base::kind_type t, const bool v, const location_type& l);
+
+  basic_symbol (typename Base::kind_type t, const libdap::D4ConstraintEvaluator::index v, const location_type& l);
+
+  basic_symbol (typename Base::kind_type t, const std::string v, const location_type& l);
+
+
+      /// Constructor for symbols with semantic value.
+      basic_symbol (typename Base::kind_type t,
+                    const semantic_type& v,
+                    const location_type& l);
+
+      /// Destroy the symbol.
+      ~basic_symbol ();
+
+      /// Destroy contents, and record that is empty.
+      void clear ();
+
+      /// Whether empty.
+      bool empty () const;
+
+      /// Destructive move, \a s is emptied into this.
+      void move (basic_symbol& s);
+
+      /// The semantic value.
+      semantic_type value;
+
+      /// The location.
+      location_type location;
+
+    private:
+      /// Assignment operator.
+      basic_symbol& operator= (const basic_symbol& other);
+    };
+
+    /// Type access provider for token (enum) based symbols.
+    struct by_type
+    {
+      /// Default constructor.
+      by_type ();
+
+      /// Copy constructor.
+      by_type (const by_type& other);
+
+      /// The symbol type as needed by the constructor.
+      typedef token_type kind_type;
+
+      /// Constructor from (external) token numbers.
+      by_type (kind_type t);
+
+      /// Record that this symbol is empty.
+      void clear ();
+
+      /// Steal the symbol type from \a that.
+      void move (by_type& that);
+
+      /// The (internal) type number (corresponding to \a type).
+      /// \a empty when empty.
+      symbol_number_type type_get () const;
+
+      /// The token.
+      token_type token () const;
+
+      /// The symbol type.
+      /// \a empty_symbol when empty.
+      /// An int, not token_number_type, to be able to store empty_symbol.
+      int type;
+    };
+
+    /// "External" symbols: returned by the scanner.
+    typedef basic_symbol<by_type> symbol_type;
+
+    // Symbol constructors declarations.
+    static inline
+    symbol_type
+    make_END (const location_type& l);
+
+    static inline
+    symbol_type
+    make_WORD (const std::string& v, const location_type& l);
+
+    static inline
+    symbol_type
+    make_STRING (const std::string& v, const location_type& l);
+
+    static inline
+    symbol_type
+    make_SEMICOLON (const location_type& l);
+
+    static inline
+    symbol_type
+    make_PIPE (const location_type& l);
+
+    static inline
+    symbol_type
+    make_LBRACKET (const location_type& l);
+
+    static inline
+    symbol_type
+    make_RBRACKET (const location_type& l);
+
+    static inline
+    symbol_type
+    make_COLON (const location_type& l);
+
+    static inline
+    symbol_type
+    make_LBRACE (const location_type& l);
+
+    static inline
+    symbol_type
+    make_RBRACE (const location_type& l);
+
+    static inline
+    symbol_type
+    make_LESS (const location_type& l);
+
+    static inline
+    symbol_type
+    make_GREATER (const location_type& l);
+
+    static inline
+    symbol_type
+    make_LESS_EQUAL (const location_type& l);
+
+    static inline
+    symbol_type
+    make_GREATER_EQUAL (const location_type& l);
+
+    static inline
+    symbol_type
+    make_EQUAL (const location_type& l);
+
+    static inline
+    symbol_type
+    make_NOT_EQUAL (const location_type& l);
+
+    static inline
+    symbol_type
+    make_REGEX_MATCH (const location_type& l);
+
+    static inline
+    symbol_type
+    make_LESS_BBOX (const location_type& l);
+
+    static inline
+    symbol_type
+    make_GREATER_BBOX (const location_type& l);
+
+    static inline
+    symbol_type
+    make_MASK (const location_type& l);
+
+    static inline
+    symbol_type
+    make_ND (const location_type& l);
+
+    static inline
+    symbol_type
+    make_COMMA (const location_type& l);
+
+    static inline
+    symbol_type
+    make_ASSIGN (const location_type& l);
+
+    static inline
+    symbol_type
+    make_GROUP_SEP (const location_type& l);
+
+    static inline
+    symbol_type
+    make_PATH_SEP (const location_type& l);
+
+
+    /// Build a parser object.
+    D4CEParser (D4CEScanner  &scanner_yyarg, D4ConstraintEvaluator  &driver_yyarg);
+    virtual ~D4CEParser ();
+
+    /// Parse.
+    /// \returns  0 iff parsing succeeded.
+    virtual int parse ();
+
+#if YYDEBUG
+    /// The current debugging stream.
+    std::ostream& debug_stream () const YY_ATTRIBUTE_PURE;
+    /// Set the current debugging stream.
+    void set_debug_stream (std::ostream &);
+
+    /// Type for debugging levels.
+    typedef int debug_level_type;
+    /// The current debugging level.
+    debug_level_type debug_level () const YY_ATTRIBUTE_PURE;
+    /// Set the current debugging level.
+    void set_debug_level (debug_level_type l);
+#endif
+
+    /// Report a syntax error.
+    /// \param loc    where the syntax error is found.
+    /// \param msg    a description of the syntax error.
+    virtual void error (const location_type& loc, const std::string& msg);
+
+    /// Report a syntax error.
+    void error (const syntax_error& err);
+
+  private:
+    /// This class is not copyable.
+    D4CEParser (const D4CEParser&);
+    D4CEParser& operator= (const D4CEParser&);
+
+    /// State numbers.
+    typedef int state_type;
+
+    /// Generate an error message.
+    /// \param yystate   the state where the error occurred.
+    /// \param yyla      the lookahead token.
+    virtual std::string yysyntax_error_ (state_type yystate,
+                                         const symbol_type& yyla) const;
+
+    /// Compute post-reduction state.
+    /// \param yystate   the current state
+    /// \param yysym     the nonterminal to push on the stack
+    state_type yy_lr_goto_state_ (state_type yystate, int yysym);
+
+    /// Whether the given \c yypact_ value indicates a defaulted state.
+    /// \param yyvalue   the value to check
+    static bool yy_pact_value_is_default_ (int yyvalue);
+
+    /// Whether the given \c yytable_ value indicates a syntax error.
+    /// \param yyvalue   the value to check
+    static bool yy_table_value_is_error_ (int yyvalue);
+
+    static const signed char yypact_ninf_;
+    static const signed char yytable_ninf_;
+
+    /// Convert a scanner token number \a t to a symbol number.
+    static token_number_type yytranslate_ (int t);
+
+    // Tables.
+  // YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+  // STATE-NUM.
+  static const signed char yypact_[];
+
+  // YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
+  // Performed when YYTABLE does not specify something else to do.  Zero
+  // means the default is an error.
+  static const unsigned char yydefact_[];
+
+  // YYPGOTO[NTERM-NUM].
+  static const signed char yypgoto_[];
+
+  // YYDEFGOTO[NTERM-NUM].
+  static const signed char yydefgoto_[];
+
+  // YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
+  // positive, shift that token.  If negative, reduce the rule whose
+  // number is the opposite.  If YYTABLE_NINF, syntax error.
+  static const signed char yytable_[];
+
+  static const signed char yycheck_[];
+
+  // YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+  // symbol of state STATE-NUM.
+  static const unsigned char yystos_[];
+
+  // YYR1[YYN] -- Symbol number of symbol that rule YYN derives.
+  static const unsigned char yyr1_[];
+
+  // YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.
+  static const unsigned char yyr2_[];
+
+
+    /// Convert the symbol name \a n to a form suitable for a diagnostic.
+    static std::string yytnamerr_ (const char *n);
+
+
+    /// For a symbol, its name in clear.
+    static const char* const yytname_[];
+#if YYDEBUG
+  // YYRLINE[YYN] -- Source line where rule number YYN was defined.
+  static const unsigned short int yyrline_[];
+    /// Report on the debug stream that the rule \a r is going to be reduced.
+    virtual void yy_reduce_print_ (int r);
+    /// Print the state stack on the debug stream.
+    virtual void yystack_print_ ();
+
+    // Debugging.
+    int yydebug_;
+    std::ostream* yycdebug_;
+
+    /// \brief Display a symbol type, value and location.
+    /// \param yyo    The output stream.
+    /// \param yysym  The symbol.
+    template <typename Base>
+    void yy_print_ (std::ostream& yyo, const basic_symbol<Base>& yysym) const;
+#endif
+
+    /// \brief Reclaim the memory associated to a symbol.
+    /// \param yymsg     Why this token is reclaimed.
+    ///                  If null, print nothing.
+    /// \param yysym     The symbol.
+    template <typename Base>
+    void yy_destroy_ (const char* yymsg, basic_symbol<Base>& yysym) const;
+
+  private:
+    /// Type access provider for state based symbols.
+    struct by_state
+    {
+      /// Default constructor.
+      by_state ();
+
+      /// The symbol type as needed by the constructor.
+      typedef state_type kind_type;
+
+      /// Constructor.
+      by_state (kind_type s);
+
+      /// Copy constructor.
+      by_state (const by_state& other);
+
+      /// Record that this symbol is empty.
+      void clear ();
+
+      /// Steal the symbol type from \a that.
+      void move (by_state& that);
+
+      /// The (internal) type number (corresponding to \a state).
+      /// \a empty_symbol when empty.
+      symbol_number_type type_get () const;
+
+      /// The state number used to denote an empty symbol.
+      enum { empty_state = -1 };
+
+      /// The state.
+      /// \a empty when empty.
+      state_type state;
+    };
+
+    /// "Internal" symbol: element of the stack.
+    struct stack_symbol_type : basic_symbol<by_state>
+    {
+      /// Superclass.
+      typedef basic_symbol<by_state> super_type;
+      /// Construct an empty symbol.
+      stack_symbol_type ();
+      /// Steal the contents from \a sym to build this.
+      stack_symbol_type (state_type s, symbol_type& sym);
+      /// Assignment, needed by push_back.
+      stack_symbol_type& operator= (const stack_symbol_type& that);
+    };
+
+    /// Stack type.
+    typedef stack<stack_symbol_type> stack_type;
+
+    /// The stack.
+    stack_type yystack_;
+
+    /// Push a new state on the stack.
+    /// \param m    a debug message to display
+    ///             if null, no trace is output.
+    /// \param s    the symbol
+    /// \warning the contents of \a s.value is stolen.
+    void yypush_ (const char* m, stack_symbol_type& s);
+
+    /// Push a new look ahead token on the state on the stack.
+    /// \param m    a debug message to display
+    ///             if null, no trace is output.
+    /// \param s    the state
+    /// \param sym  the symbol (for its value and location).
+    /// \warning the contents of \a s.value is stolen.
+    void yypush_ (const char* m, state_type s, symbol_type& sym);
+
+    /// Pop \a n symbols the three stacks.
+    void yypop_ (unsigned int n = 1);
+
+    /// Constants.
+    enum
+    {
+      yyeof_ = 0,
+      yylast_ = 74,     ///< Last index in yytable_.
+      yynnts_ = 20,  ///< Number of nonterminal symbols.
+      yyfinal_ = 16, ///< Termination state number.
+      yyterror_ = 1,
+      yyerrcode_ = 256,
+      yyntokens_ = 27  ///< Number of tokens.
+    };
+
+
+    // User arguments.
+    D4CEScanner  &scanner;
+    D4ConstraintEvaluator  &driver;
+  };
+
+
+#line 35 "d4_ce_parser.yy" // lalr1.cc:392
+} // libdap
+#line 798 "d4_ce_parser.tab.hh" // lalr1.cc:392
+
+
+
+
+#endif // !YY_YY_D4_CE_PARSER_TAB_HH_INCLUDED
diff --git a/d4_ce/d4_ce_parser.yy b/d4_ce/d4_ce_parser.yy
new file mode 100644
index 0000000..2866654
--- /dev/null
+++ b/d4_ce/d4_ce_parser.yy
@@ -0,0 +1,452 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2013 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+// 
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+// 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// A minor edit
+
+%skeleton "lalr1.cc" /* -*- C++ -*- */
+%require "2.5"
+%defines
+
+// The d4ce_parser.tab.cc and .hh files define and declare this class
+%define parser_class_name {D4CEParser}
+// D4CEParser is in this namespace
+%define api.namespace {libdap}
+
+%define parse.trace
+%define parse.error verbose
+%define parse.assert
+
+// Could not get this to work with a C++ scanner built by flex. 8/10/13 jhrg
+// %define api.token.constructor
+%define api.value.type variant
+
+// Because the code uses the C++ mode of flex, we don't use this. 8/8/13 jhrg
+// %define api.prefix { d4_ce }
+
+%code requires {
+#include "D4ConstraintEvaluator.h"
+#include "escaping.h" // for www2id() used with WORD and STRING
+namespace libdap {
+    class D4CEScanner;
+}
+
+}
+
+// Pass both the scanner and parser objects to both the automatically generated
+// parser and scanner. Note that in the actions bound to the rules, 'driver' 
+// means use the 'D4ConstraintEvaluator' instance.
+%lex-param   { D4CEScanner  &scanner  }
+%parse-param { D4CEScanner  &scanner  }
+
+%lex-param   { D4ConstraintEvaluator  &driver  }
+%parse-param { D4ConstraintEvaluator  &driver  }
+
+%locations
+%initial-action
+{
+    // Initialize the initial location. This is printed when the parser builds
+    // its own error messages - when the parse fails as opposed to when the 
+    // CE names a missing variables, ...
+
+    @$.initialize (driver.expression());
+};
+
+%code {
+   #include <iostream>
+   #include <cstdlib>
+   #include <fstream>
+   
+   #include "BaseType.h"
+   #include "DMR.h"
+   #include "D4Group.h"
+
+   /* include for all driver functions */
+   #include "D4ConstraintEvaluator.h"
+
+   /* this is silly, but I can't figure out a way around it */
+   static int yylex(libdap::D4CEParser::semantic_type *yylval,
+                    libdap::location *loc,
+                    libdap::D4CEScanner  &scanner,
+                    libdap::D4ConstraintEvaluator   &driver);
+
+}
+
+// The strings used in the token definitions are used for error messages
+%token <std::string> WORD "word"
+%token <std::string> STRING "string"
+
+// %type is used to set the return type of non-terminals; %token sets the
+// return type for terminals.
+%type <bool> filter predicate fields indexes subset clause clauses dimension dimensions
+%type <std::string> id path group name op
+
+%type <libdap::D4ConstraintEvaluator::index> index
+// %type <libdap::D4FilterClause> predicate
+
+%token
+    END  0  "end of file"
+  
+%token 
+    SEMICOLON ";"
+    PIPE "|"
+
+    LBRACKET "["
+    RBRACKET "]"
+    COLON ":"
+
+    LBRACE "{"
+    RBRACE "}"
+
+    LESS "<"
+    GREATER ">"
+    LESS_EQUAL "<="
+    GREATER_EQUAL ">="
+    EQUAL "=="
+    NOT_EQUAL "!="
+    REGEX_MATCH "~="
+
+    LESS_BBOX "<<"
+    GREATER_BBOX ">>"
+
+    MASK "@="
+    ND "ND"
+
+    COMMA ","
+
+    ASSIGN "="
+
+    GROUP_SEP "/"
+    PATH_SEP "."
+    
+%%
+
+%start expression;
+
+expression : clauses { driver.set_result($1); }
+| dimensions ";" clauses { driver.set_result($1 && $3); }
+;
+
+dimensions : dimension { $$ = $1; }
+| dimensions ";" dimension { $$ = $1 && $3; }
+;
+
+dimension : id "=" index
+{
+    $$ = driver.slice_dimension($1, $3);
+}
+;
+
+clauses : clause { $$ = $1; }
+| clauses ";" clause { $$ = $1 && $3; }
+;
+    
+// Change: I moved the pop_basetype() call out of the 'fields'
+// actions in 'subset' so that I could push the basetype for
+// all of the cases. That way I'm sure to have a top_baseype()
+// when processing the 'filter' part of the grammar. I need the
+// the top basetype so that I know which Sequence to use.
+// jhrg 4/23/16
+               
+clause : subset { $$ = $1; driver.pop_basetype(); }
+
+// For the DAP4 at this time (3/18/15) filters apply only to D4Sequences 
+
+| subset "|" filter { driver.pop_basetype(); $$ = $1 && $3; }
+;
+
+// mark_variable returns a BaseType* or throws Error
+// Note that this is a fairly long production rule with a number
+// of different right hand sides spanning about 110 lines.
+// jhrg 4/8/16
+subset : id 
+{
+    BaseType *btp = 0;
+    if (driver.top_basetype()) {
+        btp = driver.top_basetype()->var($1);
+    }
+    else {
+        btp = driver.dmr()->root()->find_var($1);
+    }
+    
+    if (!btp)
+        driver.throw_not_found($1, "id");
+
+    $$ = driver.mark_variable(btp);
+    
+    // push the basetype so that it is
+    // accessible if/while filters are parsed
+    driver.push_basetype(btp);
+}
+
+| id indexes 
+{
+    BaseType *btp = 0;
+    if (driver.top_basetype()) {
+        btp = driver.top_basetype()->var($1);
+    }
+    else {
+        btp = driver.dmr()->root()->find_var($1);
+    }
+    
+    if (!btp)
+        driver.throw_not_found($1, "id indexes");
+        
+    if (btp->type() != dods_array_c)
+        driver.throw_not_array($1, "id indexes");
+        
+    $$ = driver.mark_variable(btp);
+    
+    // push the basetype so that it is
+    // accessible if/while filters are parsed
+    driver.push_basetype(btp);
+}
+
+// Note this case is '| id fields'
+| id 
+{
+    BaseType *btp = 0;
+    if (driver.top_basetype()) {
+        btp = driver.top_basetype()->var($1);
+    }
+    else {
+        btp = driver.dmr()->root()->find_var($1);
+    }
+
+    if (!btp)
+        driver.throw_not_found($1, "id fields");
+    
+    if (btp->type() == dods_array_c) {
+        if (btp->var() && !btp->var()->is_constructor_type())
+            throw Error(no_such_variable, "The variable " + $1 + " must be a Structure or Sequence to be used with {}.");
+            
+        // This call also tests the btp to make sure it's an array
+        driver.mark_array_variable(btp);
+    }
+    else {
+        // Don't mark the variable here because only some fields are to be sent and those
+        // will be marked when the fields are parsed
+        if (!btp->is_constructor_type())
+            throw Error(no_such_variable, "The variable " + $1 + " must be a Structure or Sequence to be used with {}.");
+    }
+    
+    // push the basetype so that it is
+    // accessible when fields and if/while filters are parsed
+    driver.push_basetype(btp);
+} 
+fields 
+{ 
+    //driver.pop_basetype(); 
+    $$ = true; 
+}
+
+// Note this case is '| id indexes fields'
+
+| id indexes
+{
+    BaseType *btp = 0;
+    if (driver.top_basetype()) {
+        btp = driver.top_basetype()->var($1);
+    }
+    else {
+        btp = driver.dmr()->root()->find_var($1);
+    }
+
+    if (!btp)
+        driver.throw_not_found($1, "id indexes fields");
+    
+    if (btp->type() != dods_array_c)
+        driver.throw_not_array($1, "id indexes fields");
+
+    // This call also tests the btp to make sure it's an array
+    driver.mark_array_variable(btp);
+    
+    if (!btp->var()->is_constructor_type())
+        throw Error(no_such_variable, "The variable " + $1 + " must be a Structure or Sequence to be used with {}.");
+      
+    driver.push_basetype(btp->var());       
+} 
+fields 
+{ 
+    //driver.pop_basetype();
+    $$ = true; 
+}
+
+// The following has been removed from the syntax
+// | fields indexes { $$ = true; }
+;
+
+// push_index stores the index in the D4ConstraintEvaluator
+indexes : index 
+{ 
+    driver.push_index($1); 
+    $$ = true; 
+}
+| 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); }
+| "[" WORD ":" WORD ":" WORD "]" { $$ = driver.make_index($2, $4, $6); }
+| "[" WORD ":" "]" { $$ = driver.make_index($2, 1); }
+| "[" WORD ":" WORD ":" "]" { $$ = driver.make_index($2, $4); }
+;
+        
+fields : "{" clauses "}" { $$ = $2; }
+;
+
+// A filter should return a FilterClauseList; a predicate should return a single
+// FilterClause.
+
+filter : predicate { $$ = true; }
+| filter "," predicate { $$ = $1 && $3; }
+;
+
+// Here we use a grammar that is overly general: id op id is not really
+// supported by the CE evaluator. However, id op constant, which captures
+// the intent of the evaluator design introduces a number of reduce/reduce
+// conflicts because any sensible definition of 'constant' will be the
+// same as the definition of 'name'. This happens because we must make 'name'
+// far more general than ideal (it must include tokens that start with digits,
+// odd characters that clash with the operators, et cetera).
+
+predicate : id op id
+{ driver.add_filter_clause($2, $1, $3); $$ = true; }
+          
+| id op id op id 
+{ 
+    driver.add_filter_clause($2, $1, $3); 
+    driver.add_filter_clause($4, $3, $5); 
+    $$ = true; 
+
+}
+| "ND" "=" id { throw Error(malformed_expr, "The 'ND' operator is not currently supported."); }
+;
+
+// See http://docs.opendap.org/index.php/DAP4:_Constraint_Expressions,_v2
+// for a discussion of filters that's quite a bit longer than the current
+// draft spec. << and >> are the 'less than bbox' and '> bbox' operations
+// that I'm not so sure about now; @= is the same as *= and is the mapping
+// operation. jhrg 3/18/15 
+op : "<" {$$ = "<";}
+   | ">" {$$ = ">";}
+   | "<=" {$$ = "<=";}
+   | ">=" {$$ = ">=";}
+   | "==" {$$ = "==";}
+   | "!=" {$$ = "!=";}
+   | "~=" {$$ = "~=";}
+
+   | "<<" {$$ = "<<";}
+   | ">>" {$$ = ">>";}
+
+   | "@=" {$$ = "@=";}
+;
+
+id : path
+{
+    $$ = $1;
+}
+| "/" path
+{
+    $$.append("/");
+    $$.append($2);
+}
+| group "/" path
+{
+    $1.append("/");
+    $1.append($3);
+    $$ = $1;
+}
+;
+
+group : "/" name
+{
+    $$.append("/");
+    $$.append($2);
+}
+| group "/" name
+{
+    $1.append("/");
+    $1.append($3);
+    $$ = $1;
+}
+;
+
+path : name 
+{
+    $$ = $1;
+}
+| path "." name
+{
+    $1.append(".");
+    $1.append($3);
+    $$ = $1;
+}
+;
+
+// 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 
+{
+    $$=www2id($1);
+}
+| STRING 
+{
+    $$=driver.remove_quotes($1);
+}
+;
+
+%%
+
+// Forward the error to the driver for handling. The location parameter
+// provides the line number and character position of the error.
+void
+libdap::D4CEParser::error(const location_type &l, const std::string &m)
+{
+    driver.error(l, m);
+}
+
+/* include for access to scanner.yylex */
+#include "D4CEScanner.h"
+
+static int yylex(libdap::D4CEParser::semantic_type *yylval,
+                 libdap::location *loc,
+                 libdap::D4CEScanner &scanner,
+                 libdap::D4ConstraintEvaluator &driver)
+{
+    if (driver.trace_scanning())
+        scanner.set_debug(true);
+    
+    return( scanner.yylex(yylval, loc) );
+}
diff --git a/d4_ce/d4_ce_scanner.ll b/d4_ce/d4_ce_scanner.ll
new file mode 100644
index 0000000..1e28096
--- /dev/null
+++ b/d4_ce/d4_ce_scanner.ll
@@ -0,0 +1,170 @@
+
+/*
+ -*- mode: c++; c-basic-offset:4 -*-
+
+ This file is part of libdap, A C++ implementation of the OPeNDAP Data
+ Access Protocol.
+
+ Copyright (c) 2013 OPeNDAP, Inc.
+ Author: James Gallagher <jgallagher@opendap.org>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+ 
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+ 
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+ You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+*/ 
+
+%{ /* -*- C++ -*- */
+//#include "config.h"
+
+#include <string>
+#include "Error.h"
+
+#include "D4CEScanner.h"
+
+/* typedef to make the returns for the tokens shorter */
+typedef libdap::D4CEParser::token token;
+
+/* This was added because of some notes on the net about compiler version
+   issues. I don't know if it's needed when using the C++ mode of flex. */
+#undef yywrap
+#define yywrap() 1
+
+/* define yyterminate as this instead of NULL */
+#define yyterminate() return(token::END)
+
+#define YY_FATAL_ERROR(msg) {\
+    throw(libdap::Error(malformed_expr, std::string("Error scanning constraint expression text: ") + std::string(msg))); \
+}
+
+%}
+
+%option c++
+%option yyclass="D4CEScanner"
+
+/* Use this if several scanners are needed. This will cause flex to
+   #define yyFlexLexer to be <prefix>FlexLexer (the yyFlexLexer is defined
+   in lex.<prefix>.cc. jhrg 8/8/13 */
+%option prefix="d4_ce"
+
+/* These two options turn on line counting - useful for error messages - 
+   and debugging, respectively. When debugging is on, it's possible to see
+   which scanner rules are used at which points in the input. */
+%option yylineno
+%option debug
+
+/* Do not output the default rule (where any unmatched input is echoed to 
+   stdout). When set, nodefault will cause the scanner to exit on an error. */
+%option nodefault
+/* noyywrap makes the scanner assume that EOF/EOS is the end of the input.
+   If this is not set, the scanner will assume there are more files to 
+   scan. */ 
+%option noyywrap
+%option nounput
+/* When set, warn prints a message when the default rule can be matched
+   but nodefault is given (among other warnings). */
+%option warn
+
+%option batch
+
+%x quote
+
+/* This pattern just ensures that a word does not start with '#' which
+   is the DAP2 comment character. 
+
+   Having the characters !, ~, and @ in the second set of the chars allowed
+   in a WORD token meant that 'var!=' parsed as WORD == 'var!' and '=' ane not
+   'var' and '!='. I see that in DAP2 I did not include these in the definition
+   of a WORD.
+   jhrg 4/29/16 */
+   
+WORD    [-+a-zA-Z0-9_%*\\!~@][-+a-zA-Z0-9_%*\\#]* 
+
+%{
+// Code run each time a pattern is matched
+#define YY_USER_ACTION loc->columns(yyleng);
+%}
+
+%%
+
+%{
+// Code run each time yylex is called
+loc->step();
+%}
+
+"["     return token::LBRACKET;
+"]"     return token::RBRACKET;
+":"     return token::COLON;
+","		return token::COMMA;
+";"		return token::SEMICOLON;
+"|"     return token::PIPE;
+"{"		return token::LBRACE;
+"}"		return token::RBRACE;
+"/"     return token::GROUP_SEP;
+"."     return token::PATH_SEP;
+"="     return token::ASSIGN;
+
+"=="    return token::EQUAL;
+"!="    return token::NOT_EQUAL;
+">"	    return token::GREATER;
+">="    return token::GREATER_EQUAL;
+"<"     return token::LESS;
+"<="    return token::LESS_EQUAL;
+"~="    return token::REGEX_MATCH;
+"<<"    return token::LESS_BBOX;
+">>"    return token::GREATER_BBOX;
+"@="    return token::MASK;
+
+[ \t]+  /* ignore these */
+
+[\r\n]+ /* ignore these */
+
+{WORD}  { yylval->build<std::string>(yytext); return token::WORD; }
+
+<INITIAL><<EOF>> return token::END;
+
+["]    { BEGIN(quote); yymore(); }
+
+<quote>[^"\\]*  yymore(); /* Anything that's not a double quote or a backslash */
+
+<quote>[\\]["]	yymore(); /* This matches the escaped double quote (\") */
+
+<quote>[\\]{2}  yymore(); /* This matches an escaped escape (\\) */
+
+<quote>[\\]{1}  {
+                    BEGIN(INITIAL);
+                    if (yytext) {
+                        YY_FATAL_ERROR("Inside a string, backslash (\\) can escape a double quote or must itself be escaped (\\\\).");
+                    }
+                }
+
+<quote>["]  { 
+                /* An unescaped double quote in the 'quote' state indicates the end of the string */
+                BEGIN(INITIAL); 
+                yylval->build<std::string>(yytext);
+                return token::STRING;
+            }
+
+<quote><<EOF>>	{
+                  BEGIN(INITIAL);   /* resetting the state is needed for reentrant parsers */
+                  YY_FATAL_ERROR("Unterminated quote");
+                }
+
+.   {
+        BEGIN(INITIAL);
+        if (yytext) {
+            YY_FATAL_ERROR("Characters found in the input were not recognized.");
+        }
+    }
+%%
diff --git a/d4_ce/location.hh b/d4_ce/location.hh
new file mode 100644
index 0000000..052f4a1
--- /dev/null
+++ b/d4_ce/location.hh
@@ -0,0 +1,192 @@
+// A Bison parser, made by GNU Bison 3.0.4.
+
+// Locations for Bison parsers in C++
+
+// Copyright (C) 2002-2015 Free Software Foundation, Inc.
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+// As a special exception, you may create a larger work that contains
+// part or all of the Bison parser skeleton and distribute that work
+// under terms of your choice, so long as that work isn't itself a
+// parser generator using the skeleton or a modified version thereof
+// as a parser skeleton.  Alternatively, if you modify or redistribute
+// the parser skeleton itself, you may (at your option) remove this
+// special exception, which will cause the skeleton and the resulting
+// Bison output files to be licensed under the GNU General Public
+// License without this special exception.
+
+// This special exception was added by the Free Software Foundation in
+// version 2.2 of Bison.
+
+/**
+ ** \file location.hh
+ ** Define the libdap::location class.
+ */
+
+#ifndef YY_YY_LOCATION_HH_INCLUDED
+# define YY_YY_LOCATION_HH_INCLUDED
+
+# include "position.hh"
+
+#line 35 "d4_ce_parser.yy" // location.cc:337
+namespace libdap {
+#line 46 "location.hh" // location.cc:337
+  /// Abstract a location.
+  class location
+  {
+  public:
+
+    /// Construct a location from \a b to \a e.
+    location (const position& b, const position& e)
+      : begin (b)
+      , end (e)
+    {
+    }
+
+    /// Construct a 0-width location in \a p.
+    explicit location (const position& p = position ())
+      : begin (p)
+      , end (p)
+    {
+    }
+
+    /// Construct a 0-width location in \a f, \a l, \a c.
+    explicit location (std::string* f,
+                       unsigned int l = 1u,
+                       unsigned int c = 1u)
+      : begin (f, l, c)
+      , end (f, l, c)
+    {
+    }
+
+
+    /// Initialization.
+    void initialize (std::string* f = YY_NULLPTR,
+                     unsigned int l = 1u,
+                     unsigned int c = 1u)
+    {
+      begin.initialize (f, l, c);
+      end = begin;
+    }
+
+    /** \name Line and Column related manipulators
+     ** \{ */
+  public:
+    /// Reset initial location to final location.
+    void step ()
+    {
+      begin = end;
+    }
+
+    /// Extend the current location to the COUNT next columns.
+    void columns (int count = 1)
+    {
+      end += count;
+    }
+
+    /// Extend the current location to the COUNT next lines.
+    void lines (int count = 1)
+    {
+      end.lines (count);
+    }
+    /** \} */
+
+
+  public:
+    /// Beginning of the located region.
+    position begin;
+    /// End of the located region.
+    position end;
+  };
+
+  /// Join two locations, in place.
+  inline location& operator+= (location& res, const location& end)
+  {
+    res.end = end.end;
+    return res;
+  }
+
+  /// Join two locations.
+  inline location operator+ (location res, const location& end)
+  {
+    return res += end;
+  }
+
+  /// Add \a width columns to the end position, in place.
+  inline location& operator+= (location& res, int width)
+  {
+    res.columns (width);
+    return res;
+  }
+
+  /// Add \a width columns to the end position.
+  inline location operator+ (location res, int width)
+  {
+    return res += width;
+  }
+
+  /// Subtract \a width columns to the end position, in place.
+  inline location& operator-= (location& res, int width)
+  {
+    return res += -width;
+  }
+
+  /// Subtract \a width columns to the end position.
+  inline location operator- (location res, int width)
+  {
+    return res -= width;
+  }
+
+  /// Compare two location objects.
+  inline bool
+  operator== (const location& loc1, const location& loc2)
+  {
+    return loc1.begin == loc2.begin && loc1.end == loc2.end;
+  }
+
+  /// Compare two location objects.
+  inline bool
+  operator!= (const location& loc1, const location& loc2)
+  {
+    return !(loc1 == loc2);
+  }
+
+  /** \brief Intercept output stream redirection.
+   ** \param ostr the destination output stream
+   ** \param loc a reference to the location to redirect
+   **
+   ** Avoid duplicate information.
+   */
+  template <typename YYChar>
+  inline std::basic_ostream<YYChar>&
+  operator<< (std::basic_ostream<YYChar>& ostr, const location& loc)
+  {
+    unsigned int end_col = 0 < loc.end.column ? loc.end.column - 1 : 0;
+    ostr << loc.begin;
+    if (loc.end.filename
+        && (!loc.begin.filename
+            || *loc.begin.filename != *loc.end.filename))
+      ostr << '-' << loc.end.filename << ':' << loc.end.line << '.' << end_col;
+    else if (loc.begin.line < loc.end.line)
+      ostr << '-' << loc.end.line << '.' << end_col;
+    else if (loc.begin.column < end_col)
+      ostr << '-' << end_col;
+    return ostr;
+  }
+
+#line 35 "d4_ce_parser.yy" // location.cc:337
+} // libdap
+#line 192 "location.hh" // location.cc:337
+#endif // !YY_YY_LOCATION_HH_INCLUDED
diff --git a/d4_ce/position.hh b/d4_ce/position.hh
new file mode 100644
index 0000000..3f982db
--- /dev/null
+++ b/d4_ce/position.hh
@@ -0,0 +1,180 @@
+// A Bison parser, made by GNU Bison 3.0.4.
+
+// Positions for Bison parsers in C++
+
+// Copyright (C) 2002-2015 Free Software Foundation, Inc.
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+// As a special exception, you may create a larger work that contains
+// part or all of the Bison parser skeleton and distribute that work
+// under terms of your choice, so long as that work isn't itself a
+// parser generator using the skeleton or a modified version thereof
+// as a parser skeleton.  Alternatively, if you modify or redistribute
+// the parser skeleton itself, you may (at your option) remove this
+// special exception, which will cause the skeleton and the resulting
+// Bison output files to be licensed under the GNU General Public
+// License without this special exception.
+
+// This special exception was added by the Free Software Foundation in
+// version 2.2 of Bison.
+
+/**
+ ** \file position.hh
+ ** Define the libdap::position class.
+ */
+
+#ifndef YY_YY_POSITION_HH_INCLUDED
+# define YY_YY_POSITION_HH_INCLUDED
+
+# include <algorithm> // std::max
+# include <iostream>
+# include <string>
+
+# ifndef YY_NULLPTR
+#  if defined __cplusplus && 201103L <= __cplusplus
+#   define YY_NULLPTR nullptr
+#  else
+#   define YY_NULLPTR 0
+#  endif
+# endif
+
+#line 35 "d4_ce_parser.yy" // location.cc:337
+namespace libdap {
+#line 56 "position.hh" // location.cc:337
+  /// Abstract a position.
+  class position
+  {
+  public:
+    /// Construct a position.
+    explicit position (std::string* f = YY_NULLPTR,
+                       unsigned int l = 1u,
+                       unsigned int c = 1u)
+      : filename (f)
+      , line (l)
+      , column (c)
+    {
+    }
+
+
+    /// Initialization.
+    void initialize (std::string* fn = YY_NULLPTR,
+                     unsigned int l = 1u,
+                     unsigned int c = 1u)
+    {
+      filename = fn;
+      line = l;
+      column = c;
+    }
+
+    /** \name Line and Column related manipulators
+     ** \{ */
+    /// (line related) Advance to the COUNT next lines.
+    void lines (int count = 1)
+    {
+      if (count)
+        {
+          column = 1u;
+          line = add_ (line, count, 1);
+        }
+    }
+
+    /// (column related) Advance to the COUNT next columns.
+    void columns (int count = 1)
+    {
+      column = add_ (column, count, 1);
+    }
+    /** \} */
+
+    /// File name to which this position refers.
+    std::string* filename;
+    /// Current line number.
+    unsigned int line;
+    /// Current column number.
+    unsigned int column;
+
+  private:
+    /// Compute max(min, lhs+rhs) (provided min <= lhs).
+    static unsigned int add_ (unsigned int lhs, int rhs, unsigned int min)
+    {
+      return (0 < rhs || -static_cast<unsigned int>(rhs) < lhs
+              ? rhs + lhs
+              : min);
+    }
+  };
+
+  /// Add \a width columns, in place.
+  inline position&
+  operator+= (position& res, int width)
+  {
+    res.columns (width);
+    return res;
+  }
+
+  /// Add \a width columns.
+  inline position
+  operator+ (position res, int width)
+  {
+    return res += width;
+  }
+
+  /// Subtract \a width columns, in place.
+  inline position&
+  operator-= (position& res, int width)
+  {
+    return res += -width;
+  }
+
+  /// Subtract \a width columns.
+  inline position
+  operator- (position res, int width)
+  {
+    return res -= width;
+  }
+
+  /// Compare two position objects.
+  inline bool
+  operator== (const position& pos1, const position& pos2)
+  {
+    return (pos1.line == pos2.line
+            && pos1.column == pos2.column
+            && (pos1.filename == pos2.filename
+                || (pos1.filename && pos2.filename
+                    && *pos1.filename == *pos2.filename)));
+  }
+
+  /// Compare two position objects.
+  inline bool
+  operator!= (const position& pos1, const position& pos2)
+  {
+    return !(pos1 == pos2);
+  }
+
+  /** \brief Intercept output stream redirection.
+   ** \param ostr the destination output stream
+   ** \param pos a reference to the position to redirect
+   */
+  template <typename YYChar>
+  inline std::basic_ostream<YYChar>&
+  operator<< (std::basic_ostream<YYChar>& ostr, const position& pos)
+  {
+    if (pos.filename)
+      ostr << *pos.filename << ':';
+    return ostr << pos.line << '.' << pos.column;
+  }
+
+#line 35 "d4_ce_parser.yy" // location.cc:337
+} // libdap
+#line 180 "position.hh" // location.cc:337
+#endif // !YY_YY_POSITION_HH_INCLUDED
diff --git a/d4_ce/stack.hh b/d4_ce/stack.hh
new file mode 100644
index 0000000..d46725b
--- /dev/null
+++ b/d4_ce/stack.hh
@@ -0,0 +1,157 @@
+// A Bison parser, made by GNU Bison 3.0.4.
+
+// Stack handling for Bison parsers in C++
+
+// Copyright (C) 2002-2015 Free Software Foundation, Inc.
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+// As a special exception, you may create a larger work that contains
+// part or all of the Bison parser skeleton and distribute that work
+// under terms of your choice, so long as that work isn't itself a
+// parser generator using the skeleton or a modified version thereof
+// as a parser skeleton.  Alternatively, if you modify or redistribute
+// the parser skeleton itself, you may (at your option) remove this
+// special exception, which will cause the skeleton and the resulting
+// Bison output files to be licensed under the GNU General Public
+// License without this special exception.
+
+// This special exception was added by the Free Software Foundation in
+// version 2.2 of Bison.
+
+/**
+ ** \file stack.hh
+ ** Define the libdap::stack class.
+ */
+
+#ifndef YY_YY_STACK_HH_INCLUDED
+# define YY_YY_STACK_HH_INCLUDED
+
+# include <vector>
+
+#line 35 "d4_ce_parser.yy" // stack.hh:151
+namespace libdap {
+#line 46 "stack.hh" // stack.hh:151
+  template <class T, class S = std::vector<T> >
+  class stack
+  {
+  public:
+    // Hide our reversed order.
+    typedef typename S::reverse_iterator iterator;
+    typedef typename S::const_reverse_iterator const_iterator;
+
+    stack ()
+      : seq_ ()
+    {
+      seq_.reserve (200);
+    }
+
+    stack (unsigned int n)
+      : seq_ (n)
+    {}
+
+    inline
+    T&
+    operator[] (unsigned int i)
+    {
+      return seq_[seq_.size () - 1 - i];
+    }
+
+    inline
+    const T&
+    operator[] (unsigned int i) const
+    {
+      return seq_[seq_.size () - 1 - i];
+    }
+
+    /// Steal the contents of \a t.
+    ///
+    /// Close to move-semantics.
+    inline
+    void
+    push (T& t)
+    {
+      seq_.push_back (T());
+      operator[](0).move (t);
+    }
+
+    inline
+    void
+    pop (unsigned int n = 1)
+    {
+      for (; n; --n)
+        seq_.pop_back ();
+    }
+
+    void
+    clear ()
+    {
+      seq_.clear ();
+    }
+
+    inline
+    typename S::size_type
+    size () const
+    {
+      return seq_.size ();
+    }
+
+    inline
+    const_iterator
+    begin () const
+    {
+      return seq_.rbegin ();
+    }
+
+    inline
+    const_iterator
+    end () const
+    {
+      return seq_.rend ();
+    }
+
+  private:
+    stack (const stack&);
+    stack& operator= (const stack&);
+    /// The wrapped container.
+    S seq_;
+  };
+
+  /// Present a slice of the top of a stack.
+  template <class T, class S = stack<T> >
+  class slice
+  {
+  public:
+    slice (const S& stack, unsigned int range)
+      : stack_ (stack)
+      , range_ (range)
+    {}
+
+    inline
+    const T&
+    operator [] (unsigned int i) const
+    {
+      return stack_[range_ - i];
+    }
+
+  private:
+    const S& stack_;
+    unsigned int range_;
+  };
+
+#line 35 "d4_ce_parser.yy" // stack.hh:151
+} // libdap
+#line 156 "stack.hh" // stack.hh:151
+
+#endif // !YY_YY_STACK_HH_INCLUDED
diff --git a/d4_function/D4FunctionEvaluator.cc b/d4_function/D4FunctionEvaluator.cc
new file mode 100644
index 0000000..010e6f0
--- /dev/null
+++ b/d4_function/D4FunctionEvaluator.cc
@@ -0,0 +1,271 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2014 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#include <cstdlib>
+#include <cerrno>
+
+#include <string>
+#include <sstream>
+#include <iterator>
+
+//#define DODS_DEBUG
+
+#include "D4FunctionScanner.h"
+#include "D4FunctionEvaluator.h"
+#include "d4_function_parser.tab.hh"
+
+#include "DMR.h"
+#include "D4Group.h"
+#include "D4RValue.h"
+
+#include "BaseType.h"
+#include "Array.h"
+#include "D4Enum.h"
+
+#include "escaping.h"
+#include "util.h"
+#include "debug.h"
+
+namespace libdap {
+
+/**
+ * Parse the DAP4 function expression.
+ *
+ * Calling this method with a DAP4 function expression builds a
+ * D4RvalueList that can then be evaluated. The list of rvalues
+ * can be accessed or evaluated (using the result() or eval()
+ * methods). Note that the result is a list of rvalues because the
+ * input can be zero or more function expressions.
+ *
+ * @param expr The function expression.
+ * @return True if the parse succeeded, false otherwise.
+ */
+bool D4FunctionEvaluator::parse(const std::string &expr)
+{
+    d_expr = expr;	// set for error messages. See the %initial-action section of .yy
+
+    std::istringstream iss(expr);
+    D4FunctionScanner scanner(iss);
+    D4FunctionParser parser(scanner, *this /* driver */);
+
+    if (trace_parsing()) {
+        parser.set_debug_level(1);
+        parser.set_debug_stream(std::cerr);
+    }
+
+    return parser.parse() == 0;
+}
+
+/**
+ * Evaluate the recently parsed function expression and put the resulting
+ * rvalues (which return values packaged in libdap BaseType objects) into
+ * the top-level Group of the DMR passed as a param here.
+ *
+ * @note The DMR passed to this method can (and usually will) be different
+ * from the DMR passed to the D4FunctionEvaluator constructor. That DMR is
+ * the 'source dataset' for values of variables used by the functions. It
+ * is not generally where the results of evaluating the functions wind up.
+ * Usually, you'll want those results in their own DMR; the functions
+ * effectively make a new dataset. However, you _can_ pass the source dataset
+ * DMR into this method and in that case the new variables will be appended
+ * to its root Group.
+ *
+ * @note This code is really just a place to package results. The actual
+ * evaluation happens in the D4RValue object when values are accessed.
+ * The parse() method here builds the list of D4RValue objects and this
+ * code accesses the values which triggers the function evaluation. Thus,
+ * if you'd like to build a system that performs lazy evaluation, you can
+ * work with the result() method from this class instead of this one.
+ *
+ * @note Calling this method will delete the D4RValueList object built
+ * by the parse() method.
+ *
+ * @param dmr Store the results here
+ * @exception Throws Error if the evaluation fails.
+ */
+void D4FunctionEvaluator::eval(DMR *function_result)
+{
+#if 0
+    ServerFunctionsList *sf_list = ServerFunctionsList::TheList();
+    ServerFunction *scale = new D4TestFunction;
+    sf_list->add_function(scale);
+
+    D4FunctionEvaluator parser(dataset, sf_list);
+    if (ce_parser_debug) parser.set_trace_parsing(true);
+    bool parse_ok = parser.parse(function);
+    if (!parse_ok)
+    Error(malformed_expr, "Function Expression failed to parse.");
+    else {
+        if (ce_parser_debug) cerr << "Function Parse OK" << endl;
+        D4RValueList *result = parser.result();
+
+        function_result = new DMR(&d4_factory, "function_results");
+#endif
+
+    if (!d_result) throw InternalErr(__FILE__, __LINE__, "Must parse() the function expression before calling eval()");
+
+    D4Group *root = function_result->root();	// Load everything in the root group
+
+    for (D4RValueList::iter i = d_result->begin(), e = d_result->end(); i != e; ++i) {
+        // Copy the BaseTypes; this means all of the function results can
+        // be deleted, which addresses the memory leak issue with function
+        // results. This should also copy the D4Dimensions. jhrg 3/17/14
+        root->add_var((*i)->value(*d_dmr));
+    }
+
+    delete d_result;	// The parser/function allocates the BaseType*s that hold the results.
+    d_result = 0;
+
+    // Variables can use Dimensions and Enumerations, so those need to be copied
+    // from the source dataset to the result. NB: The variables that refer to these
+    // use weak pointers.
+
+    // Make a set of D4Dimensions. For each variable in 'function_result', look
+    // for its dimensions in 'dataset' (by name) and add a pointer to those to the
+    // set. Then copy all the stuff in the set into the root group of 'function_
+    // result.'
+    set<D4Dimension*> dim_set;
+
+    for (Constructor::Vars_iter i = root->var_begin(), ie = root->var_end(); i != ie; ++i) {
+        if ((*i)->is_vector_type()) {
+            Array *a = static_cast<Array*>(*i);
+            for (Array::Dim_iter d = a->dim_begin(), de = a->dim_end(); d != de; ++d) {
+                if (a->dimension_D4dim(d)) {
+                    dim_set.insert(a->dimension_D4dim(d));
+                }
+            }
+        }
+    }
+
+    // Copy the D4Dimensions and EnumDefs because this all goes in a new DMR - we don't
+    // want to share those across DMRs because the DMRs delete those (so sharing htem
+    // across DMRs would lead to dangling pointers.
+    for (set<D4Dimension*>::iterator i = dim_set.begin(), e = dim_set.end(); i != e; ++i) {
+        root->dims()->add_dim(*i);
+    }
+
+    // Now lets do the enumerations....
+    set<D4EnumDef*> enum_def_set;
+    for (Constructor::Vars_iter i = root->var_begin(), ie = root->var_end(); i != ie; ++i) {
+        if ((*i)->type() == dods_enum_c) {
+            enum_def_set.insert(static_cast<D4Enum*>(*i)->enumeration());
+        }
+    }
+
+    for (set<D4EnumDef*>::iterator i = enum_def_set.begin(), e = enum_def_set.end(); i != e; ++i) {
+        root->enum_defs()->add_enum(*i);
+    }
+}
+
+// libdap contains functions (in parser-util.cc) that test if a string
+// can be converted to an int32, e.g., but I used a more streamlined
+// approach here. 3/13/14 jhrg
+/**
+ * Build and return a new RValue. Allocates the new D4RValue object.
+ * The code tries first to find the id in the DMR - that is, it checks
+ * first to see if it is a variable in the current dataset. If that
+ * fails it will try to build an unsigned long long, a long long or
+ * a double from the string (in that order). If that fails the code
+ * converts the id into a string.
+ *
+ * @param id An identifier (really a string) parsed from the function
+ * expression. May contain quotes.
+ * @return Return a pointer to the new allocated D4RValue object.
+ */
+D4RValue *
+D4FunctionEvaluator::build_rvalue(const std::string &id)
+{
+    BaseType *btp = 0;
+
+    // Look for the id in the dataset first
+    if (top_basetype()) {
+        btp = top_basetype()->var(id);
+    }
+    else {
+        btp = dmr()->root()->find_var(id);
+    }
+
+    if (btp) return new D4RValue(btp);
+
+    // If the id is not a variable, try to turn it into a constant,
+    // otherwise, its an error.
+    char *end_ptr = 0;
+
+    errno = 0;
+    long long ll_val = strtoll(id.c_str(), &end_ptr, 0);
+    if (*end_ptr == '\0' && errno == 0) return new D4RValue(ll_val);
+
+    // Test for unsigned after signed since strtoull() accepts a minus sign
+    // (and will return a huge number if that's the case). jhrg 3/13/14
+    errno = 0;
+    unsigned long long ull_val = strtoull(id.c_str(), &end_ptr, 0);
+    if (*end_ptr == '\0' && errno == 0) return new D4RValue(ull_val);
+
+    errno = 0;
+    double d_val = strtod(id.c_str(), &end_ptr);
+    if (*end_ptr == '\0' && errno == 0) return new D4RValue(d_val);
+
+    // To be a valid string, the id must be quoted (using double quotes)
+    if (is_quoted(id)) return new D4RValue(www2id(id));
+
+    // if it's none of these, return null
+    return 0;
+}
+
+template<typename T>
+std::vector<T> *
+D4FunctionEvaluator::init_arg_list(T val)
+{
+    std::vector<T> *arg_list = new std::vector<T>();
+    if (get_arg_length_hint() > 0) arg_list->reserve(get_arg_length_hint());
+
+    arg_list->push_back(val);
+
+    return arg_list;
+}
+
+// Force an instantiation so this can be called from within the d4_function.yy
+// parser.
+template std::vector<dods_byte> *D4FunctionEvaluator::init_arg_list(dods_byte val);
+template std::vector<dods_int8> *D4FunctionEvaluator::init_arg_list(dods_int8 val);
+template std::vector<dods_uint16> *D4FunctionEvaluator::init_arg_list(dods_uint16 val);
+template std::vector<dods_int16> *D4FunctionEvaluator::init_arg_list(dods_int16 val);
+template std::vector<dods_uint32> *D4FunctionEvaluator::init_arg_list(dods_uint32 val);
+template std::vector<dods_int32> *D4FunctionEvaluator::init_arg_list(dods_int32 val);
+template std::vector<dods_uint64> *D4FunctionEvaluator::init_arg_list(dods_uint64 val);
+template std::vector<dods_int64> *D4FunctionEvaluator::init_arg_list(dods_int64 val);
+template std::vector<dods_float32> *D4FunctionEvaluator::init_arg_list(dods_float32 val);
+template std::vector<dods_float64> *D4FunctionEvaluator::init_arg_list(dods_float64 val);
+
+// This method is called from the parser (see d4_function_parser.yy, down in the code
+// section). This will be called during the call to D4FunctionParser::parse(), that
+// is inside D4FunctionEvaluator::parse(...)
+void D4FunctionEvaluator::error(const libdap::location &l, const std::string &m)
+{
+    ostringstream oss;
+    oss << l << ": " << m << ends;
+    throw Error(malformed_expr, oss.str());
+}
+
+} /* namespace libdap */
diff --git a/d4_function/D4FunctionEvaluator.h b/d4_function/D4FunctionEvaluator.h
new file mode 100644
index 0000000..bb8660b
--- /dev/null
+++ b/d4_function/D4FunctionEvaluator.h
@@ -0,0 +1,171 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2014 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#ifndef D4_FUNCTION_DRIVER_H_
+#define D4_FUNCTION_DRIVER_H_
+
+#include <string>
+#include <vector>
+#include <stack>
+
+namespace libdap {
+
+class location;
+
+class BaseType;
+class Array;
+class ServerFunctionsList;
+
+class DMR;
+class D4Dimension;
+class D4RValue;
+class D4RValueList;
+
+/**
+ * Driver for the DAP4 Functional expression parser.
+ */
+class D4FunctionEvaluator
+{
+    bool d_trace_scanning;
+    bool d_trace_parsing;
+    std::string d_expr;
+
+    DMR *d_dmr;
+    ServerFunctionsList *d_sf_list;
+
+    D4RValueList *d_result;
+
+    std::stack<BaseType*> d_basetype_stack;
+
+    unsigned long long d_arg_length_hint;
+
+    // d_expr should be set by parse! Its value is used by the parser right before
+    // the actual parsing operation starts. jhrg 11/26/13
+    std::string *expression()
+    {
+        return &d_expr;
+    }
+
+    void push_basetype(BaseType *btp)
+    {
+        d_basetype_stack.push(btp);
+    }
+    BaseType *top_basetype() const
+    {
+        return d_basetype_stack.empty() ? 0 : d_basetype_stack.top();
+    }
+    void pop_basetype()
+    {
+        d_basetype_stack.pop();
+    }
+
+    D4RValue *build_rvalue(const std::string &id);
+
+    friend class D4FunctionParser;
+
+public:
+    D4FunctionEvaluator() :
+            d_trace_scanning(false), d_trace_parsing(false), d_expr(""), d_dmr(0), d_sf_list(0), d_result(0), d_arg_length_hint(
+                    0)
+    {
+    }
+    D4FunctionEvaluator(DMR *dmr, ServerFunctionsList *sf_list) :
+            d_trace_scanning(false), d_trace_parsing(false), d_expr(""), d_dmr(dmr), d_sf_list(sf_list), d_result(0), d_arg_length_hint(
+                    0)
+    {
+    }
+
+    virtual ~D4FunctionEvaluator()
+    {
+    }
+
+    bool parse(const std::string &expr);
+
+    bool trace_scanning() const
+    {
+        return d_trace_scanning;
+    }
+    void set_trace_scanning(bool ts)
+    {
+        d_trace_scanning = ts;
+    }
+
+    bool trace_parsing() const
+    {
+        return d_trace_parsing;
+    }
+    void set_trace_parsing(bool tp)
+    {
+        d_trace_parsing = tp;
+    }
+
+    /** Get the result of parsing the function(s)
+     *
+     * @return The result(s) packages in a D4RValueList
+     */
+    D4RValueList *result() const
+    {
+        return d_result;
+    }
+    void set_result(D4RValueList *rv_list)
+    {
+        d_result = rv_list;
+    }
+
+    void eval(DMR *dmr);
+
+    unsigned long long get_arg_length_hint() const
+    {
+        return d_arg_length_hint;
+    }
+    void set_arg_length_hint(unsigned long long alh)
+    {
+        d_arg_length_hint = alh;
+    }
+
+    DMR *dmr() const
+    {
+        return d_dmr;
+    }
+    void set_dmr(DMR *dmr)
+    {
+        d_dmr = dmr;
+    }
+
+    ServerFunctionsList *sf_list() const
+    {
+        return d_sf_list;
+    }
+    void set_sf_list(ServerFunctionsList *sf_list)
+    {
+        d_sf_list = sf_list;
+    }
+
+    template<typename t> std::vector<t> *init_arg_list(t val);
+
+    void error(const libdap::location &l, const std::string &m);
+};
+
+} /* namespace libdap */
+#endif /* D4_FUNCTION_DRIVER_H_ */
diff --git a/d4_function/D4FunctionScanner.h b/d4_function/D4FunctionScanner.h
new file mode 100644
index 0000000..2f19724
--- /dev/null
+++ b/d4_function/D4FunctionScanner.h
@@ -0,0 +1,76 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+
+#ifndef D4_FUNCTION_SCANNER_H_
+#define D4_FUNCTION_SCANNER_H_
+
+// Only include FlexLexer.h if it hasn't been already included
+#if ! defined(yyFlexLexerOnce)
+#undef yyFlexLexer
+#define yyFlexLexer d4_functionFlexLexer
+#include "FlexLexer.h"
+#endif
+
+# ifndef YY_NULL
+#  if defined __cplusplus && 201103L <= __cplusplus
+#   define YY_NULL nullptr
+#  else
+#   define YY_NULL 0
+#  endif
+# endif
+
+#undef  YY_DECL
+#define YY_DECL int  libdap::D4FunctionScanner::yylex()
+
+#include "d4_function_parser.tab.hh"
+
+namespace libdap {
+
+class D4FunctionScanner : public d4_functionFlexLexer{
+public:
+
+	D4FunctionScanner(std::istream &in) : d4_functionFlexLexer(&in), yylval(0), loc(0) { };
+
+	int yylex(libdap::D4FunctionParser::semantic_type *lval, libdap::location *l)
+	{
+		loc = l;
+		yylval = lval;
+		return( yylex() );
+	}
+
+private:
+	/* hide this one from public view */
+	int yylex();
+
+	/* yyval ptr */
+	libdap::D4FunctionParser::semantic_type *yylval;
+
+	libdap::location *loc;
+};
+
+} /* end namespace libdap */
+
+#endif /* D4_FUNCTION_SCANNER_H_ */
diff --git a/d4_function/Makefile.am b/d4_function/Makefile.am
new file mode 100644
index 0000000..b3afae4
--- /dev/null
+++ b/d4_function/Makefile.am
@@ -0,0 +1,68 @@
+
+AUTOMAKE_OPTIONS = foreign
+
+.NOTPARALLEL:
+
+# Arrange to build with the backward compatibility mode enabled.
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/d4_ce -I$(srcdir) $(XML2_CFLAGS)
+AM_CXXFLAGS =  
+
+if COMPILER_IS_GCC
+AM_CXXFLAGS += -Wall -W -Wcast-align
+endif
+
+# autoconf/automake includes support for yacc and lex so that the input
+# files for those compilers can be listed in a _SOURCES variable and the
+# build will just work. I had a fair amount of hassle getting that going
+# and then realized that cmake might undo all that effort. Also, the
+# changes are not local to this dir only since I'd have to edit the DAP2
+# grammars as well. I've left the edits in a comments although I'm not sure
+# it ever worked correctly. jhrg 10/21/14
+#
+# AM_YFLAGS= -d
+# AM_LFLAGS = -d
+
+CXXFLAGS_DEBUG = -g3 -O0 -Wall -W -Wcast-align
+TEST_COV_FLAGS = -ftest-coverage -fprofile-arcs
+
+if BUILD_DEVELOPER
+AM_CXXFLAGS += $(CXXFLAGS_DEBUG)
+endif
+
+noinst_LTLIBRARIES = libd4_function_parser.la
+pkginclude_HEADERS = D4FunctionEvaluator.h
+
+# This line forces make to build the grammar files first, which is
+# important because some of the cc files include the parser headers.
+BUILT_SOURCES = lex.d4_function.cc d4_function_parser.tab.cc d4_function_parser.tab.hh \
+	stack.hh location.hh position.hh
+
+libd4_function_parser_la_SOURCES = D4FunctionEvaluator.cc	\
+	D4FunctionEvaluator.h D4FunctionScanner.h	\
+	d4_function_parser.tab.cc d4_function_parser.tab.hh lex.d4_function.cc \
+	stack.hh location.hh position.hh
+
+libd4_ce_parser_la_CXXFLAGS=$(AM_CPPFLAGS)
+
+EXTRA_DIST = d4_function_parser.yy d4_function_scanner.ll
+
+DISTCLEANFILES = 
+
+clean-local:
+	-rm d4_function_parser.tab.cc d4_function_parser.tab.hh lex.d4_function.cc \
+	    stack.hh position.hh location.hh
+
+%.tab.cc %.tab.hh: %.yy
+	$(YACC) $(YFLAGS) $<
+
+stack.hh location.hh position.hh: d4_function_parser.tab.cc d4_function_parser.tab.hh
+
+#d4_function_parser.tab.cc d4_function_parser.tab.hh stack.hh location.hh position.hh: d4_function_parser.yy
+#	$(YACC) $(YFLAGS) $<
+
+# See the comment in ../d4_ce
+dist-hook:
+	rm $(distdir)/lex.d4_function.cc
+
+lex.d4_function.cc: d4_function_scanner.ll d4_function_parser.tab.cc d4_function_parser.tab.hh
+	$(LEX) $(LFLAGS) $<
diff --git a/d4_function/Makefile.in b/d4_function/Makefile.in
new file mode 100644
index 0000000..be8756f
--- /dev/null
+++ b/d4_function/Makefile.in
@@ -0,0 +1,1323 @@
+# Makefile.in generated by automake 1.14 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+@COMPILER_IS_GCC_TRUE@am__append_1 = -Wall -W -Wcast-align
+@BUILD_DEVELOPER_TRUE@am__append_2 = $(CXXFLAGS_DEBUG)
+subdir = d4_function
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/conf/depcomp $(pkginclude_HEADERS)
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/gl/m4/00gnulib.m4 \
+	$(top_srcdir)/gl/m4/absolute-header.m4 \
+	$(top_srcdir)/gl/m4/alloca.m4 $(top_srcdir)/gl/m4/btowc.m4 \
+	$(top_srcdir)/gl/m4/builtin-expect.m4 \
+	$(top_srcdir)/gl/m4/byteswap.m4 $(top_srcdir)/gl/m4/codeset.m4 \
+	$(top_srcdir)/gl/m4/configmake.m4 \
+	$(top_srcdir)/gl/m4/eealloc.m4 \
+	$(top_srcdir)/gl/m4/extensions.m4 \
+	$(top_srcdir)/gl/m4/extern-inline.m4 \
+	$(top_srcdir)/gl/m4/fcntl-o.m4 $(top_srcdir)/gl/m4/fcntl_h.m4 \
+	$(top_srcdir)/gl/m4/gettimeofday.m4 \
+	$(top_srcdir)/gl/m4/glibc21.m4 \
+	$(top_srcdir)/gl/m4/gnulib-common.m4 \
+	$(top_srcdir)/gl/m4/gnulib-comp.m4 \
+	$(top_srcdir)/gl/m4/gnulib-tool.m4 \
+	$(top_srcdir)/gl/m4/hard-locale.m4 \
+	$(top_srcdir)/gl/m4/include_next.m4 \
+	$(top_srcdir)/gl/m4/langinfo_h.m4 \
+	$(top_srcdir)/gl/m4/largefile.m4 $(top_srcdir)/gl/m4/lib-ld.m4 \
+	$(top_srcdir)/gl/m4/lib-link.m4 \
+	$(top_srcdir)/gl/m4/lib-prefix.m4 \
+	$(top_srcdir)/gl/m4/limits-h.m4 \
+	$(top_srcdir)/gl/m4/localcharset.m4 \
+	$(top_srcdir)/gl/m4/locale-fr.m4 \
+	$(top_srcdir)/gl/m4/locale-ja.m4 \
+	$(top_srcdir)/gl/m4/locale-zh.m4 \
+	$(top_srcdir)/gl/m4/locale_h.m4 \
+	$(top_srcdir)/gl/m4/localeconv.m4 \
+	$(top_srcdir)/gl/m4/localtime-buffer.m4 \
+	$(top_srcdir)/gl/m4/lock.m4 $(top_srcdir)/gl/m4/longlong.m4 \
+	$(top_srcdir)/gl/m4/lstat.m4 $(top_srcdir)/gl/m4/malloca.m4 \
+	$(top_srcdir)/gl/m4/mbrtowc.m4 $(top_srcdir)/gl/m4/mbsinit.m4 \
+	$(top_srcdir)/gl/m4/mbstate_t.m4 $(top_srcdir)/gl/m4/mbtowc.m4 \
+	$(top_srcdir)/gl/m4/mkstemps.m4 \
+	$(top_srcdir)/gl/m4/multiarch.m4 \
+	$(top_srcdir)/gl/m4/nl_langinfo.m4 \
+	$(top_srcdir)/gl/m4/off_t.m4 $(top_srcdir)/gl/m4/pathmax.m4 \
+	$(top_srcdir)/gl/m4/pthread_rwlock_rdlock.m4 \
+	$(top_srcdir)/gl/m4/regex.m4 $(top_srcdir)/gl/m4/ssize_t.m4 \
+	$(top_srcdir)/gl/m4/stat.m4 $(top_srcdir)/gl/m4/stdbool.m4 \
+	$(top_srcdir)/gl/m4/stddef_h.m4 $(top_srcdir)/gl/m4/stdint.m4 \
+	$(top_srcdir)/gl/m4/stdlib_h.m4 \
+	$(top_srcdir)/gl/m4/sys_socket_h.m4 \
+	$(top_srcdir)/gl/m4/sys_stat_h.m4 \
+	$(top_srcdir)/gl/m4/sys_time_h.m4 \
+	$(top_srcdir)/gl/m4/sys_types_h.m4 \
+	$(top_srcdir)/gl/m4/tempname.m4 \
+	$(top_srcdir)/gl/m4/threadlib.m4 $(top_srcdir)/gl/m4/time_h.m4 \
+	$(top_srcdir)/gl/m4/unistd_h.m4 \
+	$(top_srcdir)/gl/m4/warn-on-use.m4 \
+	$(top_srcdir)/gl/m4/wchar_h.m4 $(top_srcdir)/gl/m4/wchar_t.m4 \
+	$(top_srcdir)/gl/m4/wcrtomb.m4 $(top_srcdir)/gl/m4/wctype_h.m4 \
+	$(top_srcdir)/gl/m4/wint_t.m4 $(top_srcdir)/conf/acinclude.m4 \
+	$(top_srcdir)/conf/cppunit.m4 \
+	$(top_srcdir)/conf/gcov_valgrind.m4 \
+	$(top_srcdir)/conf/libtool.m4 $(top_srcdir)/conf/ltoptions.m4 \
+	$(top_srcdir)/conf/ltsugar.m4 $(top_srcdir)/conf/ltversion.m4 \
+	$(top_srcdir)/conf/lt~obsolete.m4 $(top_srcdir)/conf/pkg.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h \
+	$(top_builddir)/dods-datatypes-config.h \
+	$(top_builddir)/xdr-datatypes-config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libd4_function_parser_la_LIBADD =
+am_libd4_function_parser_la_OBJECTS = D4FunctionEvaluator.lo \
+	d4_function_parser.tab.lo lex.d4_function.lo
+libd4_function_parser_la_OBJECTS =  \
+	$(am_libd4_function_parser_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/conf/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_@AM_V@)
+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
+am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_1 = 
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_1 = 
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libd4_function_parser_la_SOURCES)
+DIST_SOURCES = $(libd4_function_parser_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(pkgincludedir)"
+HEADERS = $(pkginclude_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+pkglibexecdir = @pkglibexecdir@
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALLOCA_H = @ALLOCA_H@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
+AR = @AR@
+ARFLAGS = @ARFLAGS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BITSIZEOF_PTRDIFF_T = @BITSIZEOF_PTRDIFF_T@
+BITSIZEOF_SIG_ATOMIC_T = @BITSIZEOF_SIG_ATOMIC_T@
+BITSIZEOF_SIZE_T = @BITSIZEOF_SIZE_T@
+BITSIZEOF_WCHAR_T = @BITSIZEOF_WCHAR_T@
+BITSIZEOF_WINT_T = @BITSIZEOF_WINT_T@
+BYTESWAP_H = @BYTESWAP_H@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CLIENTLIB_AGE = @CLIENTLIB_AGE@
+CLIENTLIB_CURRENT = @CLIENTLIB_CURRENT@
+CLIENTLIB_REVISION = @CLIENTLIB_REVISION@
+CLIENTLIB_VERSION = @CLIENTLIB_VERSION@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@
+CPPUNIT_CONFIG = @CPPUNIT_CONFIG@
+CPPUNIT_LIBS = @CPPUNIT_LIBS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_LIBS = @CURL_LIBS@
+CURL_STATIC_LIBS = @CURL_STATIC_LIBS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DAPLIB_AGE = @DAPLIB_AGE@
+DAPLIB_CURRENT = @DAPLIB_CURRENT@
+DAPLIB_REVISION = @DAPLIB_REVISION@
+DAP_PROTOCOL_VERSION = @DAP_PROTOCOL_VERSION@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+DVR = @DVR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GLIBC21 = @GLIBC21@
+GNULIB_ATOLL = @GNULIB_ATOLL@
+GNULIB_BTOWC = @GNULIB_BTOWC@
+GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@
+GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
+GNULIB_CHDIR = @GNULIB_CHDIR@
+GNULIB_CHOWN = @GNULIB_CHOWN@
+GNULIB_CLOSE = @GNULIB_CLOSE@
+GNULIB_CTIME = @GNULIB_CTIME@
+GNULIB_DUP = @GNULIB_DUP@
+GNULIB_DUP2 = @GNULIB_DUP2@
+GNULIB_DUP3 = @GNULIB_DUP3@
+GNULIB_DUPLOCALE = @GNULIB_DUPLOCALE@
+GNULIB_ENVIRON = @GNULIB_ENVIRON@
+GNULIB_EUIDACCESS = @GNULIB_EUIDACCESS@
+GNULIB_FACCESSAT = @GNULIB_FACCESSAT@
+GNULIB_FCHDIR = @GNULIB_FCHDIR@
+GNULIB_FCHMODAT = @GNULIB_FCHMODAT@
+GNULIB_FCHOWNAT = @GNULIB_FCHOWNAT@
+GNULIB_FCNTL = @GNULIB_FCNTL@
+GNULIB_FDATASYNC = @GNULIB_FDATASYNC@
+GNULIB_FSTAT = @GNULIB_FSTAT@
+GNULIB_FSTATAT = @GNULIB_FSTATAT@
+GNULIB_FSYNC = @GNULIB_FSYNC@
+GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@
+GNULIB_FUTIMENS = @GNULIB_FUTIMENS@
+GNULIB_GETCWD = @GNULIB_GETCWD@
+GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@
+GNULIB_GETDTABLESIZE = @GNULIB_GETDTABLESIZE@
+GNULIB_GETGROUPS = @GNULIB_GETGROUPS@
+GNULIB_GETHOSTNAME = @GNULIB_GETHOSTNAME@
+GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@
+GNULIB_GETLOGIN = @GNULIB_GETLOGIN@
+GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@
+GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@
+GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@
+GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@
+GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@
+GNULIB_GRANTPT = @GNULIB_GRANTPT@
+GNULIB_GROUP_MEMBER = @GNULIB_GROUP_MEMBER@
+GNULIB_ISATTY = @GNULIB_ISATTY@
+GNULIB_ISWBLANK = @GNULIB_ISWBLANK@
+GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@
+GNULIB_LCHMOD = @GNULIB_LCHMOD@
+GNULIB_LCHOWN = @GNULIB_LCHOWN@
+GNULIB_LINK = @GNULIB_LINK@
+GNULIB_LINKAT = @GNULIB_LINKAT@
+GNULIB_LOCALECONV = @GNULIB_LOCALECONV@
+GNULIB_LOCALTIME = @GNULIB_LOCALTIME@
+GNULIB_LSEEK = @GNULIB_LSEEK@
+GNULIB_LSTAT = @GNULIB_LSTAT@
+GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@
+GNULIB_MBRLEN = @GNULIB_MBRLEN@
+GNULIB_MBRTOWC = @GNULIB_MBRTOWC@
+GNULIB_MBSINIT = @GNULIB_MBSINIT@
+GNULIB_MBSNRTOWCS = @GNULIB_MBSNRTOWCS@
+GNULIB_MBSRTOWCS = @GNULIB_MBSRTOWCS@
+GNULIB_MBTOWC = @GNULIB_MBTOWC@
+GNULIB_MKDIRAT = @GNULIB_MKDIRAT@
+GNULIB_MKDTEMP = @GNULIB_MKDTEMP@
+GNULIB_MKFIFO = @GNULIB_MKFIFO@
+GNULIB_MKFIFOAT = @GNULIB_MKFIFOAT@
+GNULIB_MKNOD = @GNULIB_MKNOD@
+GNULIB_MKNODAT = @GNULIB_MKNODAT@
+GNULIB_MKOSTEMP = @GNULIB_MKOSTEMP@
+GNULIB_MKOSTEMPS = @GNULIB_MKOSTEMPS@
+GNULIB_MKSTEMP = @GNULIB_MKSTEMP@
+GNULIB_MKSTEMPS = @GNULIB_MKSTEMPS@
+GNULIB_MKTIME = @GNULIB_MKTIME@
+GNULIB_NANOSLEEP = @GNULIB_NANOSLEEP@
+GNULIB_NL_LANGINFO = @GNULIB_NL_LANGINFO@
+GNULIB_NONBLOCKING = @GNULIB_NONBLOCKING@
+GNULIB_OPEN = @GNULIB_OPEN@
+GNULIB_OPENAT = @GNULIB_OPENAT@
+GNULIB_OVERRIDES_STRUCT_STAT = @GNULIB_OVERRIDES_STRUCT_STAT@
+GNULIB_OVERRIDES_WINT_T = @GNULIB_OVERRIDES_WINT_T@
+GNULIB_PIPE = @GNULIB_PIPE@
+GNULIB_PIPE2 = @GNULIB_PIPE2@
+GNULIB_POSIX_OPENPT = @GNULIB_POSIX_OPENPT@
+GNULIB_PREAD = @GNULIB_PREAD@
+GNULIB_PTSNAME = @GNULIB_PTSNAME@
+GNULIB_PTSNAME_R = @GNULIB_PTSNAME_R@
+GNULIB_PUTENV = @GNULIB_PUTENV@
+GNULIB_PWRITE = @GNULIB_PWRITE@
+GNULIB_QSORT_R = @GNULIB_QSORT_R@
+GNULIB_RANDOM = @GNULIB_RANDOM@
+GNULIB_RANDOM_R = @GNULIB_RANDOM_R@
+GNULIB_READ = @GNULIB_READ@
+GNULIB_READLINK = @GNULIB_READLINK@
+GNULIB_READLINKAT = @GNULIB_READLINKAT@
+GNULIB_REALLOCARRAY = @GNULIB_REALLOCARRAY@
+GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@
+GNULIB_REALPATH = @GNULIB_REALPATH@
+GNULIB_RMDIR = @GNULIB_RMDIR@
+GNULIB_RPMATCH = @GNULIB_RPMATCH@
+GNULIB_SECURE_GETENV = @GNULIB_SECURE_GETENV@
+GNULIB_SETENV = @GNULIB_SETENV@
+GNULIB_SETHOSTNAME = @GNULIB_SETHOSTNAME@
+GNULIB_SETLOCALE = @GNULIB_SETLOCALE@
+GNULIB_SLEEP = @GNULIB_SLEEP@
+GNULIB_STAT = @GNULIB_STAT@
+GNULIB_STRFTIME = @GNULIB_STRFTIME@
+GNULIB_STRPTIME = @GNULIB_STRPTIME@
+GNULIB_STRTOD = @GNULIB_STRTOD@
+GNULIB_STRTOLL = @GNULIB_STRTOLL@
+GNULIB_STRTOULL = @GNULIB_STRTOULL@
+GNULIB_SYMLINK = @GNULIB_SYMLINK@
+GNULIB_SYMLINKAT = @GNULIB_SYMLINKAT@
+GNULIB_SYSTEM_POSIX = @GNULIB_SYSTEM_POSIX@
+GNULIB_TIMEGM = @GNULIB_TIMEGM@
+GNULIB_TIME_R = @GNULIB_TIME_R@
+GNULIB_TIME_RZ = @GNULIB_TIME_RZ@
+GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@
+GNULIB_TRUNCATE = @GNULIB_TRUNCATE@
+GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@
+GNULIB_TZSET = @GNULIB_TZSET@
+GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@
+GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@
+GNULIB_UNLINK = @GNULIB_UNLINK@
+GNULIB_UNLINKAT = @GNULIB_UNLINKAT@
+GNULIB_UNLOCKPT = @GNULIB_UNLOCKPT@
+GNULIB_UNSETENV = @GNULIB_UNSETENV@
+GNULIB_USLEEP = @GNULIB_USLEEP@
+GNULIB_UTIMENSAT = @GNULIB_UTIMENSAT@
+GNULIB_WCPCPY = @GNULIB_WCPCPY@
+GNULIB_WCPNCPY = @GNULIB_WCPNCPY@
+GNULIB_WCRTOMB = @GNULIB_WCRTOMB@
+GNULIB_WCSCASECMP = @GNULIB_WCSCASECMP@
+GNULIB_WCSCAT = @GNULIB_WCSCAT@
+GNULIB_WCSCHR = @GNULIB_WCSCHR@
+GNULIB_WCSCMP = @GNULIB_WCSCMP@
+GNULIB_WCSCOLL = @GNULIB_WCSCOLL@
+GNULIB_WCSCPY = @GNULIB_WCSCPY@
+GNULIB_WCSCSPN = @GNULIB_WCSCSPN@
+GNULIB_WCSDUP = @GNULIB_WCSDUP@
+GNULIB_WCSFTIME = @GNULIB_WCSFTIME@
+GNULIB_WCSLEN = @GNULIB_WCSLEN@
+GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@
+GNULIB_WCSNCAT = @GNULIB_WCSNCAT@
+GNULIB_WCSNCMP = @GNULIB_WCSNCMP@
+GNULIB_WCSNCPY = @GNULIB_WCSNCPY@
+GNULIB_WCSNLEN = @GNULIB_WCSNLEN@
+GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@
+GNULIB_WCSPBRK = @GNULIB_WCSPBRK@
+GNULIB_WCSRCHR = @GNULIB_WCSRCHR@
+GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@
+GNULIB_WCSSPN = @GNULIB_WCSSPN@
+GNULIB_WCSSTR = @GNULIB_WCSSTR@
+GNULIB_WCSTOK = @GNULIB_WCSTOK@
+GNULIB_WCSWIDTH = @GNULIB_WCSWIDTH@
+GNULIB_WCSXFRM = @GNULIB_WCSXFRM@
+GNULIB_WCTOB = @GNULIB_WCTOB@
+GNULIB_WCTOMB = @GNULIB_WCTOMB@
+GNULIB_WCTRANS = @GNULIB_WCTRANS@
+GNULIB_WCTYPE = @GNULIB_WCTYPE@
+GNULIB_WCWIDTH = @GNULIB_WCWIDTH@
+GNULIB_WMEMCHR = @GNULIB_WMEMCHR@
+GNULIB_WMEMCMP = @GNULIB_WMEMCMP@
+GNULIB_WMEMCPY = @GNULIB_WMEMCPY@
+GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@
+GNULIB_WMEMSET = @GNULIB_WMEMSET@
+GNULIB_WRITE = @GNULIB_WRITE@
+GNULIB__EXIT = @GNULIB__EXIT@
+GREP = @GREP@
+HAVE_ATOLL = @HAVE_ATOLL@
+HAVE_BTOWC = @HAVE_BTOWC@
+HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@
+HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
+HAVE_CHOWN = @HAVE_CHOWN@
+HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@
+HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
+HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@
+HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@
+HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@
+HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@
+HAVE_DECL_GETLOGIN = @HAVE_DECL_GETLOGIN@
+HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@
+HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@
+HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@
+HAVE_DECL_INITSTATE = @HAVE_DECL_INITSTATE@
+HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@
+HAVE_DECL_SETENV = @HAVE_DECL_SETENV@
+HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@
+HAVE_DECL_SETSTATE = @HAVE_DECL_SETSTATE@
+HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@
+HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@
+HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@
+HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@
+HAVE_DUP2 = @HAVE_DUP2@
+HAVE_DUP3 = @HAVE_DUP3@
+HAVE_DUPLOCALE = @HAVE_DUPLOCALE@
+HAVE_EUIDACCESS = @HAVE_EUIDACCESS@
+HAVE_FACCESSAT = @HAVE_FACCESSAT@
+HAVE_FCHDIR = @HAVE_FCHDIR@
+HAVE_FCHMODAT = @HAVE_FCHMODAT@
+HAVE_FCHOWNAT = @HAVE_FCHOWNAT@
+HAVE_FCNTL = @HAVE_FCNTL@
+HAVE_FDATASYNC = @HAVE_FDATASYNC@
+HAVE_FEATURES_H = @HAVE_FEATURES_H@
+HAVE_FSTATAT = @HAVE_FSTATAT@
+HAVE_FSYNC = @HAVE_FSYNC@
+HAVE_FTRUNCATE = @HAVE_FTRUNCATE@
+HAVE_FUTIMENS = @HAVE_FUTIMENS@
+HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@
+HAVE_GETGROUPS = @HAVE_GETGROUPS@
+HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@
+HAVE_GETLOGIN = @HAVE_GETLOGIN@
+HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@
+HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
+HAVE_GETTIMEOFDAY = @HAVE_GETTIMEOFDAY@
+HAVE_GRANTPT = @HAVE_GRANTPT@
+HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
+HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
+HAVE_ISWBLANK = @HAVE_ISWBLANK@
+HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
+HAVE_LANGINFO_CODESET = @HAVE_LANGINFO_CODESET@
+HAVE_LANGINFO_ERA = @HAVE_LANGINFO_ERA@
+HAVE_LANGINFO_H = @HAVE_LANGINFO_H@
+HAVE_LANGINFO_T_FMT_AMPM = @HAVE_LANGINFO_T_FMT_AMPM@
+HAVE_LANGINFO_YESEXPR = @HAVE_LANGINFO_YESEXPR@
+HAVE_LCHMOD = @HAVE_LCHMOD@
+HAVE_LCHOWN = @HAVE_LCHOWN@
+HAVE_LINK = @HAVE_LINK@
+HAVE_LINKAT = @HAVE_LINKAT@
+HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@
+HAVE_LSTAT = @HAVE_LSTAT@
+HAVE_MAX_ALIGN_T = @HAVE_MAX_ALIGN_T@
+HAVE_MBRLEN = @HAVE_MBRLEN@
+HAVE_MBRTOWC = @HAVE_MBRTOWC@
+HAVE_MBSINIT = @HAVE_MBSINIT@
+HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@
+HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@
+HAVE_MKDIRAT = @HAVE_MKDIRAT@
+HAVE_MKDTEMP = @HAVE_MKDTEMP@
+HAVE_MKFIFO = @HAVE_MKFIFO@
+HAVE_MKFIFOAT = @HAVE_MKFIFOAT@
+HAVE_MKNOD = @HAVE_MKNOD@
+HAVE_MKNODAT = @HAVE_MKNODAT@
+HAVE_MKOSTEMP = @HAVE_MKOSTEMP@
+HAVE_MKOSTEMPS = @HAVE_MKOSTEMPS@
+HAVE_MKSTEMP = @HAVE_MKSTEMP@
+HAVE_MKSTEMPS = @HAVE_MKSTEMPS@
+HAVE_NANOSLEEP = @HAVE_NANOSLEEP@
+HAVE_NL_LANGINFO = @HAVE_NL_LANGINFO@
+HAVE_OPENAT = @HAVE_OPENAT@
+HAVE_OS_H = @HAVE_OS_H@
+HAVE_PIPE = @HAVE_PIPE@
+HAVE_PIPE2 = @HAVE_PIPE2@
+HAVE_POSIX_OPENPT = @HAVE_POSIX_OPENPT@
+HAVE_PREAD = @HAVE_PREAD@
+HAVE_PTSNAME = @HAVE_PTSNAME@
+HAVE_PTSNAME_R = @HAVE_PTSNAME_R@
+HAVE_PWRITE = @HAVE_PWRITE@
+HAVE_QSORT_R = @HAVE_QSORT_R@
+HAVE_RANDOM = @HAVE_RANDOM@
+HAVE_RANDOM_H = @HAVE_RANDOM_H@
+HAVE_RANDOM_R = @HAVE_RANDOM_R@
+HAVE_READLINK = @HAVE_READLINK@
+HAVE_READLINKAT = @HAVE_READLINKAT@
+HAVE_REALLOCARRAY = @HAVE_REALLOCARRAY@
+HAVE_REALPATH = @HAVE_REALPATH@
+HAVE_RPMATCH = @HAVE_RPMATCH@
+HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@
+HAVE_SETENV = @HAVE_SETENV@
+HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@
+HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
+HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
+HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@
+HAVE_SLEEP = @HAVE_SLEEP@
+HAVE_STDINT_H = @HAVE_STDINT_H@
+HAVE_STRPTIME = @HAVE_STRPTIME@
+HAVE_STRTOD = @HAVE_STRTOD@
+HAVE_STRTOLL = @HAVE_STRTOLL@
+HAVE_STRTOULL = @HAVE_STRTOULL@
+HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@
+HAVE_STRUCT_TIMEVAL = @HAVE_STRUCT_TIMEVAL@
+HAVE_SYMLINK = @HAVE_SYMLINK@
+HAVE_SYMLINKAT = @HAVE_SYMLINKAT@
+HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@
+HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@
+HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@
+HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@
+HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@
+HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
+HAVE_TIMEGM = @HAVE_TIMEGM@
+HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@
+HAVE_TRUNCATE = @HAVE_TRUNCATE@
+HAVE_TZSET = @HAVE_TZSET@
+HAVE_UNISTD_H = @HAVE_UNISTD_H@
+HAVE_UNLINKAT = @HAVE_UNLINKAT@
+HAVE_UNLOCKPT = @HAVE_UNLOCKPT@
+HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@
+HAVE_USLEEP = @HAVE_USLEEP@
+HAVE_UTIMENSAT = @HAVE_UTIMENSAT@
+HAVE_VALGRIND = @HAVE_VALGRIND@
+HAVE_WCHAR_H = @HAVE_WCHAR_H@
+HAVE_WCHAR_T = @HAVE_WCHAR_T@
+HAVE_WCPCPY = @HAVE_WCPCPY@
+HAVE_WCPNCPY = @HAVE_WCPNCPY@
+HAVE_WCRTOMB = @HAVE_WCRTOMB@
+HAVE_WCSCASECMP = @HAVE_WCSCASECMP@
+HAVE_WCSCAT = @HAVE_WCSCAT@
+HAVE_WCSCHR = @HAVE_WCSCHR@
+HAVE_WCSCMP = @HAVE_WCSCMP@
+HAVE_WCSCOLL = @HAVE_WCSCOLL@
+HAVE_WCSCPY = @HAVE_WCSCPY@
+HAVE_WCSCSPN = @HAVE_WCSCSPN@
+HAVE_WCSDUP = @HAVE_WCSDUP@
+HAVE_WCSFTIME = @HAVE_WCSFTIME@
+HAVE_WCSLEN = @HAVE_WCSLEN@
+HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@
+HAVE_WCSNCAT = @HAVE_WCSNCAT@
+HAVE_WCSNCMP = @HAVE_WCSNCMP@
+HAVE_WCSNCPY = @HAVE_WCSNCPY@
+HAVE_WCSNLEN = @HAVE_WCSNLEN@
+HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@
+HAVE_WCSPBRK = @HAVE_WCSPBRK@
+HAVE_WCSRCHR = @HAVE_WCSRCHR@
+HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@
+HAVE_WCSSPN = @HAVE_WCSSPN@
+HAVE_WCSSTR = @HAVE_WCSSTR@
+HAVE_WCSTOK = @HAVE_WCSTOK@
+HAVE_WCSWIDTH = @HAVE_WCSWIDTH@
+HAVE_WCSXFRM = @HAVE_WCSXFRM@
+HAVE_WCTRANS_T = @HAVE_WCTRANS_T@
+HAVE_WCTYPE_H = @HAVE_WCTYPE_H@
+HAVE_WCTYPE_T = @HAVE_WCTYPE_T@
+HAVE_WINSOCK2_H = @HAVE_WINSOCK2_H@
+HAVE_WINT_T = @HAVE_WINT_T@
+HAVE_WMEMCHR = @HAVE_WMEMCHR@
+HAVE_WMEMCMP = @HAVE_WMEMCMP@
+HAVE_WMEMCPY = @HAVE_WMEMCPY@
+HAVE_WMEMMOVE = @HAVE_WMEMMOVE@
+HAVE_WMEMSET = @HAVE_WMEMSET@
+HAVE_XLOCALE_H = @HAVE_XLOCALE_H@
+HAVE__BOOL = @HAVE__BOOL@
+HAVE__EXIT = @HAVE__EXIT@
+INCLUDE_NEXT = @INCLUDE_NEXT@
+INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBDAP_VERSION = @LIBDAP_VERSION@
+LIBINTL = @LIBINTL@
+LIBMULTITHREAD = @LIBMULTITHREAD@
+LIBOBJS = @LIBOBJS@
+LIBPTH = @LIBPTH@
+LIBPTH_PREFIX = @LIBPTH_PREFIX@
+LIBS = @LIBS@
+LIBTHREAD = @LIBTHREAD@
+LIBTOOL = @LIBTOOL@
+LIMITS_H = @LIMITS_H@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@
+LOCALE_FR = @LOCALE_FR@
+LOCALE_FR_UTF8 = @LOCALE_FR_UTF8@
+LOCALE_JA = @LOCALE_JA@
+LOCALE_ZH_CN = @LOCALE_ZH_CN@
+LTLIBINTL = @LTLIBINTL@
+LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
+LTLIBOBJS = @LTLIBOBJS@
+LTLIBPTH = @LTLIBPTH@
+LTLIBTHREAD = @LTLIBTHREAD@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@
+NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H = @NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H@
+NEXT_AS_FIRST_DIRECTIVE_LIMITS_H = @NEXT_AS_FIRST_DIRECTIVE_LIMITS_H@
+NEXT_AS_FIRST_DIRECTIVE_LOCALE_H = @NEXT_AS_FIRST_DIRECTIVE_LOCALE_H@
+NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@
+NEXT_AS_FIRST_DIRECTIVE_STDINT_H = @NEXT_AS_FIRST_DIRECTIVE_STDINT_H@
+NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@
+NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@
+NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@
+NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@
+NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@
+NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@
+NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@
+NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@
+NEXT_FCNTL_H = @NEXT_FCNTL_H@
+NEXT_LANGINFO_H = @NEXT_LANGINFO_H@
+NEXT_LIMITS_H = @NEXT_LIMITS_H@
+NEXT_LOCALE_H = @NEXT_LOCALE_H@
+NEXT_STDDEF_H = @NEXT_STDDEF_H@
+NEXT_STDINT_H = @NEXT_STDINT_H@
+NEXT_STDLIB_H = @NEXT_STDLIB_H@
+NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@
+NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@
+NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@
+NEXT_TIME_H = @NEXT_TIME_H@
+NEXT_UNISTD_H = @NEXT_UNISTD_H@
+NEXT_WCHAR_H = @NEXT_WCHAR_H@
+NEXT_WCTYPE_H = @NEXT_WCTYPE_H@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_MAJOR_VERSION = @PACKAGE_MAJOR_VERSION@
+PACKAGE_MINOR_VERSION = @PACKAGE_MINOR_VERSION@
+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@
+PRAGMA_COLUMNS = @PRAGMA_COLUMNS@
+PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
+PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@
+PTHREAD_LIBS = @PTHREAD_LIBS@
+PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
+RANLIB = @RANLIB@
+REPLACE_BTOWC = @REPLACE_BTOWC@
+REPLACE_CALLOC = @REPLACE_CALLOC@
+REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@
+REPLACE_CHOWN = @REPLACE_CHOWN@
+REPLACE_CLOSE = @REPLACE_CLOSE@
+REPLACE_CTIME = @REPLACE_CTIME@
+REPLACE_DUP = @REPLACE_DUP@
+REPLACE_DUP2 = @REPLACE_DUP2@
+REPLACE_DUPLOCALE = @REPLACE_DUPLOCALE@
+REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@
+REPLACE_FCNTL = @REPLACE_FCNTL@
+REPLACE_FSTAT = @REPLACE_FSTAT@
+REPLACE_FSTATAT = @REPLACE_FSTATAT@
+REPLACE_FTRUNCATE = @REPLACE_FTRUNCATE@
+REPLACE_FUTIMENS = @REPLACE_FUTIMENS@
+REPLACE_GETCWD = @REPLACE_GETCWD@
+REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@
+REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@
+REPLACE_GETGROUPS = @REPLACE_GETGROUPS@
+REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
+REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
+REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@
+REPLACE_GMTIME = @REPLACE_GMTIME@
+REPLACE_ISATTY = @REPLACE_ISATTY@
+REPLACE_ISWBLANK = @REPLACE_ISWBLANK@
+REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@
+REPLACE_LCHOWN = @REPLACE_LCHOWN@
+REPLACE_LINK = @REPLACE_LINK@
+REPLACE_LINKAT = @REPLACE_LINKAT@
+REPLACE_LOCALECONV = @REPLACE_LOCALECONV@
+REPLACE_LOCALTIME = @REPLACE_LOCALTIME@
+REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@
+REPLACE_LSEEK = @REPLACE_LSEEK@
+REPLACE_LSTAT = @REPLACE_LSTAT@
+REPLACE_MALLOC = @REPLACE_MALLOC@
+REPLACE_MBRLEN = @REPLACE_MBRLEN@
+REPLACE_MBRTOWC = @REPLACE_MBRTOWC@
+REPLACE_MBSINIT = @REPLACE_MBSINIT@
+REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@
+REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@
+REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@
+REPLACE_MBTOWC = @REPLACE_MBTOWC@
+REPLACE_MKDIR = @REPLACE_MKDIR@
+REPLACE_MKFIFO = @REPLACE_MKFIFO@
+REPLACE_MKNOD = @REPLACE_MKNOD@
+REPLACE_MKSTEMP = @REPLACE_MKSTEMP@
+REPLACE_MKTIME = @REPLACE_MKTIME@
+REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@
+REPLACE_NL_LANGINFO = @REPLACE_NL_LANGINFO@
+REPLACE_NULL = @REPLACE_NULL@
+REPLACE_OPEN = @REPLACE_OPEN@
+REPLACE_OPENAT = @REPLACE_OPENAT@
+REPLACE_PREAD = @REPLACE_PREAD@
+REPLACE_PTSNAME = @REPLACE_PTSNAME@
+REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@
+REPLACE_PUTENV = @REPLACE_PUTENV@
+REPLACE_PWRITE = @REPLACE_PWRITE@
+REPLACE_QSORT_R = @REPLACE_QSORT_R@
+REPLACE_RANDOM_R = @REPLACE_RANDOM_R@
+REPLACE_READ = @REPLACE_READ@
+REPLACE_READLINK = @REPLACE_READLINK@
+REPLACE_READLINKAT = @REPLACE_READLINKAT@
+REPLACE_REALLOC = @REPLACE_REALLOC@
+REPLACE_REALPATH = @REPLACE_REALPATH@
+REPLACE_RMDIR = @REPLACE_RMDIR@
+REPLACE_SETENV = @REPLACE_SETENV@
+REPLACE_SETLOCALE = @REPLACE_SETLOCALE@
+REPLACE_SLEEP = @REPLACE_SLEEP@
+REPLACE_STAT = @REPLACE_STAT@
+REPLACE_STRFTIME = @REPLACE_STRFTIME@
+REPLACE_STRTOD = @REPLACE_STRTOD@
+REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@
+REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@
+REPLACE_SYMLINK = @REPLACE_SYMLINK@
+REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@
+REPLACE_TIMEGM = @REPLACE_TIMEGM@
+REPLACE_TOWLOWER = @REPLACE_TOWLOWER@
+REPLACE_TRUNCATE = @REPLACE_TRUNCATE@
+REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@
+REPLACE_TZSET = @REPLACE_TZSET@
+REPLACE_UNLINK = @REPLACE_UNLINK@
+REPLACE_UNLINKAT = @REPLACE_UNLINKAT@
+REPLACE_UNSETENV = @REPLACE_UNSETENV@
+REPLACE_USLEEP = @REPLACE_USLEEP@
+REPLACE_UTIMENSAT = @REPLACE_UTIMENSAT@
+REPLACE_WCRTOMB = @REPLACE_WCRTOMB@
+REPLACE_WCSFTIME = @REPLACE_WCSFTIME@
+REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@
+REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@
+REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@
+REPLACE_WCTOB = @REPLACE_WCTOB@
+REPLACE_WCTOMB = @REPLACE_WCTOMB@
+REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
+REPLACE_WRITE = @REPLACE_WRITE@
+SED = @SED@
+SERVERLIB_AGE = @SERVERLIB_AGE@
+SERVERLIB_CURRENT = @SERVERLIB_CURRENT@
+SERVERLIB_REVISION = @SERVERLIB_REVISION@
+SERVERLIB_VERSION = @SERVERLIB_VERSION@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@
+SIZE_T_SUFFIX = @SIZE_T_SUFFIX@
+STDBOOL_H = @STDBOOL_H@
+STDDEF_H = @STDDEF_H@
+STDINT_H = @STDINT_H@
+STRIP = @STRIP@
+SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@
+TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@
+UNISTD_H_DEFINES_STRUCT_TIMESPEC = @UNISTD_H_DEFINES_STRUCT_TIMESPEC@
+UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@
+UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@
+UUID_LIBS = @UUID_LIBS@
+VERSION = @VERSION@
+WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
+WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@
+WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@
+WINDOWS_STAT_INODES = @WINDOWS_STAT_INODES@
+WINDOWS_STAT_TIMESPEC = @WINDOWS_STAT_TIMESPEC@
+WINT_T_SUFFIX = @WINT_T_SUFFIX@
+XML2_CFLAGS = @XML2_CFLAGS@
+XML2_LIBS = @XML2_LIBS@
+YACC = @YACC@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_word_order = @ac_word_order@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+curlprivatelibs = @curlprivatelibs@
+curlprivatereq = @curlprivatereq@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gl_LIBOBJS = @gl_LIBOBJS@
+gl_LTLIBOBJS = @gl_LTLIBOBJS@
+gltests_LIBOBJS = @gltests_LIBOBJS@
+gltests_LTLIBOBJS = @gltests_LTLIBOBJS@
+gltests_WITNESS = @gltests_WITNESS@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+lispdir = @lispdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+runstatedir = @runstatedir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+xmlprivatelibs = @xmlprivatelibs@
+xmlprivatereq = @xmlprivatereq@
+AUTOMAKE_OPTIONS = foreign
+
+# Arrange to build with the backward compatibility mode enabled.
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/d4_ce -I$(srcdir) $(XML2_CFLAGS)
+AM_CXXFLAGS = $(am__append_1) $(am__append_2)
+
+# autoconf/automake includes support for yacc and lex so that the input
+# files for those compilers can be listed in a _SOURCES variable and the
+# build will just work. I had a fair amount of hassle getting that going
+# and then realized that cmake might undo all that effort. Also, the
+# changes are not local to this dir only since I'd have to edit the DAP2
+# grammars as well. I've left the edits in a comments although I'm not sure
+# it ever worked correctly. jhrg 10/21/14
+#
+# AM_YFLAGS= -d
+# AM_LFLAGS = -d
+CXXFLAGS_DEBUG = -g3 -O0 -Wall -W -Wcast-align
+TEST_COV_FLAGS = -ftest-coverage -fprofile-arcs
+noinst_LTLIBRARIES = libd4_function_parser.la
+pkginclude_HEADERS = D4FunctionEvaluator.h
+
+# This line forces make to build the grammar files first, which is
+# important because some of the cc files include the parser headers.
+BUILT_SOURCES = lex.d4_function.cc d4_function_parser.tab.cc d4_function_parser.tab.hh \
+	stack.hh location.hh position.hh
+
+libd4_function_parser_la_SOURCES = D4FunctionEvaluator.cc	\
+	D4FunctionEvaluator.h D4FunctionScanner.h	\
+	d4_function_parser.tab.cc d4_function_parser.tab.hh lex.d4_function.cc \
+	stack.hh location.hh position.hh
+
+libd4_ce_parser_la_CXXFLAGS = $(AM_CPPFLAGS)
+EXTRA_DIST = d4_function_parser.yy d4_function_scanner.ll
+DISTCLEANFILES = 
+all: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) all-am
+
+.SUFFIXES:
+.SUFFIXES: .cc .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign d4_function/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign d4_function/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
+libd4_function_parser.la: $(libd4_function_parser_la_OBJECTS) $(libd4_function_parser_la_DEPENDENCIES) $(EXTRA_libd4_function_parser_la_DEPENDENCIES) 
+	$(AM_V_CXXLD)$(CXXLINK)  $(libd4_function_parser_la_OBJECTS) $(libd4_function_parser_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/D4FunctionEvaluator.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/d4_function_parser.tab.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lex.d4_function.Plo@am__quote@
+
+.cc.o:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
+
+.cc.obj:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cc.lo:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-pkgincludeHEADERS: $(pkginclude_HEADERS)
+	@$(NORMAL_INSTALL)
+	@list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgincludedir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(pkgincludedir)'"; \
+	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(pkgincludedir)" || exit $$?; \
+	done
+
+uninstall-pkgincludeHEADERS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(pkgincludedir)'; $(am__uninstall_files_from_dir)
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	$(MAKE) $(AM_MAKEFLAGS) \
+	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
+	  dist-hook
+check-am: all-am
+check: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) check-am
+all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+installdirs:
+	for dir in "$(DESTDIR)$(pkgincludedir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-local \
+	clean-noinstLTLIBRARIES mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-pkgincludeHEADERS
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-pkgincludeHEADERS
+
+.MAKE: all check install install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-local clean-noinstLTLIBRARIES \
+	cscopelist-am ctags ctags-am dist-hook distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-pkgincludeHEADERS \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am \
+	uninstall-pkgincludeHEADERS
+
+
+.NOTPARALLEL:
+
+clean-local:
+	-rm d4_function_parser.tab.cc d4_function_parser.tab.hh lex.d4_function.cc \
+	    stack.hh position.hh location.hh
+
+%.tab.cc %.tab.hh: %.yy
+	$(YACC) $(YFLAGS) $<
+
+stack.hh location.hh position.hh: d4_function_parser.tab.cc d4_function_parser.tab.hh
+
+#d4_function_parser.tab.cc d4_function_parser.tab.hh stack.hh location.hh position.hh: d4_function_parser.yy
+#	$(YACC) $(YFLAGS) $<
+
+# See the comment in ../d4_ce
+dist-hook:
+	rm $(distdir)/lex.d4_function.cc
+
+lex.d4_function.cc: d4_function_scanner.ll d4_function_parser.tab.cc d4_function_parser.tab.hh
+	$(LEX) $(LFLAGS) $<
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/d4_function/d4_function_parser.tab.cc b/d4_function/d4_function_parser.tab.cc
new file mode 100644
index 0000000..a3ed27a
--- /dev/null
+++ b/d4_function/d4_function_parser.tab.cc
@@ -0,0 +1,2477 @@
+// A Bison parser, made by GNU Bison 3.0.4.
+
+// Skeleton implementation for Bison LALR(1) parsers in C++
+
+// Copyright (C) 2002-2015 Free Software Foundation, Inc.
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+// As a special exception, you may create a larger work that contains
+// part or all of the Bison parser skeleton and distribute that work
+// under terms of your choice, so long as that work isn't itself a
+// parser generator using the skeleton or a modified version thereof
+// as a parser skeleton.  Alternatively, if you modify or redistribute
+// the parser skeleton itself, you may (at your option) remove this
+// special exception, which will cause the skeleton and the resulting
+// Bison output files to be licensed under the GNU General Public
+// License without this special exception.
+
+// This special exception was added by the Free Software Foundation in
+// version 2.2 of Bison.
+
+
+// First part of user declarations.
+
+#line 37 "d4_function_parser.tab.cc" // lalr1.cc:404
+
+# ifndef YY_NULLPTR
+#  if defined __cplusplus && 201103L <= __cplusplus
+#   define YY_NULLPTR nullptr
+#  else
+#   define YY_NULLPTR 0
+#  endif
+# endif
+
+#include "d4_function_parser.tab.hh"
+
+// User implementation prologue.
+
+#line 51 "d4_function_parser.tab.cc" // lalr1.cc:412
+// Unqualified %code blocks.
+#line 77 "d4_function_parser.yy" // lalr1.cc:413
+
+    #include "BaseType.h"
+    #include "DMR.h"
+    #include "D4RValue.h"
+    #include "ServerFunctionsList.h"
+   
+    #include "parser-util.h"
+
+    /* include for all driver functions */
+    #include "D4FunctionEvaluator.h"
+
+    using namespace libdap ;
+    
+    /* this is silly, but I can't figure out a way around it */
+    static int yylex(libdap::D4FunctionParser::semantic_type *yylval,
+                     libdap::location *loc,
+                     libdap::D4FunctionScanner  &scanner,
+                     libdap::D4FunctionEvaluator   &evaluator);
+
+#line 73 "d4_function_parser.tab.cc" // lalr1.cc:413
+
+
+#ifndef YY_
+# if defined YYENABLE_NLS && YYENABLE_NLS
+#  if ENABLE_NLS
+#   include <libintl.h> // FIXME: INFRINGES ON USER NAME SPACE.
+#   define YY_(msgid) dgettext ("bison-runtime", msgid)
+#  endif
+# endif
+# ifndef YY_
+#  define YY_(msgid) msgid
+# endif
+#endif
+
+#define YYRHSLOC(Rhs, K) ((Rhs)[K].location)
+/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
+   If N is 0, then set CURRENT to the empty location which ends
+   the previous symbol: RHS[0] (always defined).  */
+
+# ifndef YYLLOC_DEFAULT
+#  define YYLLOC_DEFAULT(Current, Rhs, N)                               \
+    do                                                                  \
+      if (N)                                                            \
+        {                                                               \
+          (Current).begin  = YYRHSLOC (Rhs, 1).begin;                   \
+          (Current).end    = YYRHSLOC (Rhs, N).end;                     \
+        }                                                               \
+      else                                                              \
+        {                                                               \
+          (Current).begin = (Current).end = YYRHSLOC (Rhs, 0).end;      \
+        }                                                               \
+    while (/*CONSTCOND*/ false)
+# endif
+
+
+// Suppress unused-variable warnings by "using" E.
+#define YYUSE(E) ((void) (E))
+
+// Enable debugging if requested.
+#if YYDEBUG
+
+// A pseudo ostream that takes yydebug_ into account.
+# define YYCDEBUG if (yydebug_) (*yycdebug_)
+
+# define YY_SYMBOL_PRINT(Title, Symbol)         \
+  do {                                          \
+    if (yydebug_)                               \
+    {                                           \
+      *yycdebug_ << Title << ' ';               \
+      yy_print_ (*yycdebug_, Symbol);           \
+      *yycdebug_ << std::endl;                  \
+    }                                           \
+  } while (false)
+
+# define YY_REDUCE_PRINT(Rule)          \
+  do {                                  \
+    if (yydebug_)                       \
+      yy_reduce_print_ (Rule);          \
+  } while (false)
+
+# define YY_STACK_PRINT()               \
+  do {                                  \
+    if (yydebug_)                       \
+      yystack_print_ ();                \
+  } while (false)
+
+#else // !YYDEBUG
+
+# define YYCDEBUG if (false) std::cerr
+# define YY_SYMBOL_PRINT(Title, Symbol)  YYUSE(Symbol)
+# define YY_REDUCE_PRINT(Rule)           static_cast<void>(0)
+# define YY_STACK_PRINT()                static_cast<void>(0)
+
+#endif // !YYDEBUG
+
+#define yyerrok         (yyerrstatus_ = 0)
+#define yyclearin       (yyla.clear ())
+
+#define YYACCEPT        goto yyacceptlab
+#define YYABORT         goto yyabortlab
+#define YYERROR         goto yyerrorlab
+#define YYRECOVERING()  (!!yyerrstatus_)
+
+#line 34 "d4_function_parser.yy" // lalr1.cc:479
+namespace libdap {
+#line 159 "d4_function_parser.tab.cc" // lalr1.cc:479
+
+  /* Return YYSTR after stripping away unnecessary quotes and
+     backslashes, so that it's suitable for yyerror.  The heuristic is
+     that double-quoting is unnecessary unless the string contains an
+     apostrophe, a comma, or backslash (other than backslash-backslash).
+     YYSTR is taken from yytname.  */
+  std::string
+  D4FunctionParser::yytnamerr_ (const char *yystr)
+  {
+    if (*yystr == '"')
+      {
+        std::string yyr = "";
+        char const *yyp = yystr;
+
+        for (;;)
+          switch (*++yyp)
+            {
+            case '\'':
+            case ',':
+              goto do_not_strip_quotes;
+
+            case '\\':
+              if (*++yyp != '\\')
+                goto do_not_strip_quotes;
+              // Fall through.
+            default:
+              yyr += *yyp;
+              break;
+
+            case '"':
+              return yyr;
+            }
+      do_not_strip_quotes: ;
+      }
+
+    return yystr;
+  }
+
+
+  /// Build a parser object.
+  D4FunctionParser::D4FunctionParser (D4FunctionScanner  &scanner_yyarg, D4FunctionEvaluator  &evaluator_yyarg)
+    :
+#if YYDEBUG
+      yydebug_ (false),
+      yycdebug_ (&std::cerr),
+#endif
+      scanner (scanner_yyarg),
+      evaluator (evaluator_yyarg)
+  {}
+
+  D4FunctionParser::~D4FunctionParser ()
+  {}
+
+
+  /*---------------.
+  | Symbol types.  |
+  `---------------*/
+
+  inline
+  D4FunctionParser::syntax_error::syntax_error (const location_type& l, const std::string& m)
+    : std::runtime_error (m)
+    , location (l)
+  {}
+
+  // basic_symbol.
+  template <typename Base>
+  inline
+  D4FunctionParser::basic_symbol<Base>::basic_symbol ()
+    : value ()
+  {}
+
+  template <typename Base>
+  inline
+  D4FunctionParser::basic_symbol<Base>::basic_symbol (const basic_symbol& other)
+    : Base (other)
+    , value ()
+    , location (other.location)
+  {
+      switch (other.type_get ())
+    {
+      case 7: // "function name"
+      case 44: // fname
+        value.copy< D4Function > (other.value);
+        break;
+
+      case 5: // "argument"
+      case 6: // "function"
+      case 8: // "variable or constant"
+      case 9: // "array constant"
+      case 43: // function
+      case 46: // arg
+      case 47: // variable_or_constant
+      case 48: // array_constant
+        value.copy< D4RValue* > (other.value);
+        break;
+
+      case 3: // "functions"
+      case 4: // "arguments"
+      case 42: // functions
+      case 45: // args
+        value.copy< D4RValueList* > (other.value);
+        break;
+
+      case 20: // "word"
+      case 21: // "string"
+      case 60: // id
+      case 61: // group
+      case 62: // path
+      case 63: // name
+        value.copy< std::string > (other.value);
+        break;
+
+      case 10: // "fast byte arg list"
+      case 50: // fast_byte_arg_list
+        value.copy< std::vector<dods_byte>* > (other.value);
+        break;
+
+      case 18: // "fast float32 arg list"
+      case 58: // fast_float32_arg_list
+        value.copy< std::vector<dods_float32>* > (other.value);
+        break;
+
+      case 19: // "fast float64 arg list"
+      case 59: // fast_float64_arg_list
+        value.copy< std::vector<dods_float64>* > (other.value);
+        break;
+
+      case 13: // "fast int16 arg list"
+      case 53: // fast_int16_arg_list
+        value.copy< std::vector<dods_int16>* > (other.value);
+        break;
+
+      case 15: // "fast int32 arg list"
+      case 55: // fast_int32_arg_list
+        value.copy< std::vector<dods_int32>* > (other.value);
+        break;
+
+      case 17: // "fast int64 arg list"
+      case 57: // fast_int64_arg_list
+        value.copy< std::vector<dods_int64>* > (other.value);
+        break;
+
+      case 11: // "fast int8 arg list"
+      case 51: // fast_int8_arg_list
+        value.copy< std::vector<dods_int8>* > (other.value);
+        break;
+
+      case 12: // "fast uint16 arg list"
+      case 52: // fast_uint16_arg_list
+        value.copy< std::vector<dods_uint16>* > (other.value);
+        break;
+
+      case 14: // "fast uint32 arg list"
+      case 54: // fast_uint32_arg_list
+        value.copy< std::vector<dods_uint32>* > (other.value);
+        break;
+
+      case 16: // "fast uint64 arg list"
+      case 56: // fast_uint64_arg_list
+        value.copy< std::vector<dods_uint64>* > (other.value);
+        break;
+
+      default:
+        break;
+    }
+
+  }
+
+
+  template <typename Base>
+  inline
+  D4FunctionParser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, const semantic_type& v, const location_type& l)
+    : Base (t)
+    , value ()
+    , location (l)
+  {
+    (void) v;
+      switch (this->type_get ())
+    {
+      case 7: // "function name"
+      case 44: // fname
+        value.copy< D4Function > (v);
+        break;
+
+      case 5: // "argument"
+      case 6: // "function"
+      case 8: // "variable or constant"
+      case 9: // "array constant"
+      case 43: // function
+      case 46: // arg
+      case 47: // variable_or_constant
+      case 48: // array_constant
+        value.copy< D4RValue* > (v);
+        break;
+
+      case 3: // "functions"
+      case 4: // "arguments"
+      case 42: // functions
+      case 45: // args
+        value.copy< D4RValueList* > (v);
+        break;
+
+      case 20: // "word"
+      case 21: // "string"
+      case 60: // id
+      case 61: // group
+      case 62: // path
+      case 63: // name
+        value.copy< std::string > (v);
+        break;
+
+      case 10: // "fast byte arg list"
+      case 50: // fast_byte_arg_list
+        value.copy< std::vector<dods_byte>* > (v);
+        break;
+
+      case 18: // "fast float32 arg list"
+      case 58: // fast_float32_arg_list
+        value.copy< std::vector<dods_float32>* > (v);
+        break;
+
+      case 19: // "fast float64 arg list"
+      case 59: // fast_float64_arg_list
+        value.copy< std::vector<dods_float64>* > (v);
+        break;
+
+      case 13: // "fast int16 arg list"
+      case 53: // fast_int16_arg_list
+        value.copy< std::vector<dods_int16>* > (v);
+        break;
+
+      case 15: // "fast int32 arg list"
+      case 55: // fast_int32_arg_list
+        value.copy< std::vector<dods_int32>* > (v);
+        break;
+
+      case 17: // "fast int64 arg list"
+      case 57: // fast_int64_arg_list
+        value.copy< std::vector<dods_int64>* > (v);
+        break;
+
+      case 11: // "fast int8 arg list"
+      case 51: // fast_int8_arg_list
+        value.copy< std::vector<dods_int8>* > (v);
+        break;
+
+      case 12: // "fast uint16 arg list"
+      case 52: // fast_uint16_arg_list
+        value.copy< std::vector<dods_uint16>* > (v);
+        break;
+
+      case 14: // "fast uint32 arg list"
+      case 54: // fast_uint32_arg_list
+        value.copy< std::vector<dods_uint32>* > (v);
+        break;
+
+      case 16: // "fast uint64 arg list"
+      case 56: // fast_uint64_arg_list
+        value.copy< std::vector<dods_uint64>* > (v);
+        break;
+
+      default:
+        break;
+    }
+}
+
+
+  // Implementation of basic_symbol constructor for each type.
+
+  template <typename Base>
+  D4FunctionParser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, const location_type& l)
+    : Base (t)
+    , value ()
+    , location (l)
+  {}
+
+  template <typename Base>
+  D4FunctionParser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, const D4Function v, const location_type& l)
+    : Base (t)
+    , value (v)
+    , location (l)
+  {}
+
+  template <typename Base>
+  D4FunctionParser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, const D4RValue* v, const location_type& l)
+    : Base (t)
+    , value (v)
+    , location (l)
+  {}
+
+  template <typename Base>
+  D4FunctionParser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, const D4RValueList* v, const location_type& l)
+    : Base (t)
+    , value (v)
+    , location (l)
+  {}
+
+  template <typename Base>
+  D4FunctionParser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, const std::string v, const location_type& l)
+    : Base (t)
+    , value (v)
+    , location (l)
+  {}
+
+  template <typename Base>
+  D4FunctionParser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, const std::vector<dods_byte>* v, const location_type& l)
+    : Base (t)
+    , value (v)
+    , location (l)
+  {}
+
+  template <typename Base>
+  D4FunctionParser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, const std::vector<dods_float32>* v, const location_type& l)
+    : Base (t)
+    , value (v)
+    , location (l)
+  {}
+
+  template <typename Base>
+  D4FunctionParser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, const std::vector<dods_float64>* v, const location_type& l)
+    : Base (t)
+    , value (v)
+    , location (l)
+  {}
+
+  template <typename Base>
+  D4FunctionParser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, const std::vector<dods_int16>* v, const location_type& l)
+    : Base (t)
+    , value (v)
+    , location (l)
+  {}
+
+  template <typename Base>
+  D4FunctionParser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, const std::vector<dods_int32>* v, const location_type& l)
+    : Base (t)
+    , value (v)
+    , location (l)
+  {}
+
+  template <typename Base>
+  D4FunctionParser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, const std::vector<dods_int64>* v, const location_type& l)
+    : Base (t)
+    , value (v)
+    , location (l)
+  {}
+
+  template <typename Base>
+  D4FunctionParser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, const std::vector<dods_int8>* v, const location_type& l)
+    : Base (t)
+    , value (v)
+    , location (l)
+  {}
+
+  template <typename Base>
+  D4FunctionParser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, const std::vector<dods_uint16>* v, const location_type& l)
+    : Base (t)
+    , value (v)
+    , location (l)
+  {}
+
+  template <typename Base>
+  D4FunctionParser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, const std::vector<dods_uint32>* v, const location_type& l)
+    : Base (t)
+    , value (v)
+    , location (l)
+  {}
+
+  template <typename Base>
+  D4FunctionParser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, const std::vector<dods_uint64>* v, const location_type& l)
+    : Base (t)
+    , value (v)
+    , location (l)
+  {}
+
+
+  template <typename Base>
+  inline
+  D4FunctionParser::basic_symbol<Base>::~basic_symbol ()
+  {
+    clear ();
+  }
+
+  template <typename Base>
+  inline
+  void
+  D4FunctionParser::basic_symbol<Base>::clear ()
+  {
+    // User destructor.
+    symbol_number_type yytype = this->type_get ();
+    basic_symbol<Base>& yysym = *this;
+    (void) yysym;
+    switch (yytype)
+    {
+   default:
+      break;
+    }
+
+    // Type destructor.
+    switch (yytype)
+    {
+      case 7: // "function name"
+      case 44: // fname
+        value.template destroy< D4Function > ();
+        break;
+
+      case 5: // "argument"
+      case 6: // "function"
+      case 8: // "variable or constant"
+      case 9: // "array constant"
+      case 43: // function
+      case 46: // arg
+      case 47: // variable_or_constant
+      case 48: // array_constant
+        value.template destroy< D4RValue* > ();
+        break;
+
+      case 3: // "functions"
+      case 4: // "arguments"
+      case 42: // functions
+      case 45: // args
+        value.template destroy< D4RValueList* > ();
+        break;
+
+      case 20: // "word"
+      case 21: // "string"
+      case 60: // id
+      case 61: // group
+      case 62: // path
+      case 63: // name
+        value.template destroy< std::string > ();
+        break;
+
+      case 10: // "fast byte arg list"
+      case 50: // fast_byte_arg_list
+        value.template destroy< std::vector<dods_byte>* > ();
+        break;
+
+      case 18: // "fast float32 arg list"
+      case 58: // fast_float32_arg_list
+        value.template destroy< std::vector<dods_float32>* > ();
+        break;
+
+      case 19: // "fast float64 arg list"
+      case 59: // fast_float64_arg_list
+        value.template destroy< std::vector<dods_float64>* > ();
+        break;
+
+      case 13: // "fast int16 arg list"
+      case 53: // fast_int16_arg_list
+        value.template destroy< std::vector<dods_int16>* > ();
+        break;
+
+      case 15: // "fast int32 arg list"
+      case 55: // fast_int32_arg_list
+        value.template destroy< std::vector<dods_int32>* > ();
+        break;
+
+      case 17: // "fast int64 arg list"
+      case 57: // fast_int64_arg_list
+        value.template destroy< std::vector<dods_int64>* > ();
+        break;
+
+      case 11: // "fast int8 arg list"
+      case 51: // fast_int8_arg_list
+        value.template destroy< std::vector<dods_int8>* > ();
+        break;
+
+      case 12: // "fast uint16 arg list"
+      case 52: // fast_uint16_arg_list
+        value.template destroy< std::vector<dods_uint16>* > ();
+        break;
+
+      case 14: // "fast uint32 arg list"
+      case 54: // fast_uint32_arg_list
+        value.template destroy< std::vector<dods_uint32>* > ();
+        break;
+
+      case 16: // "fast uint64 arg list"
+      case 56: // fast_uint64_arg_list
+        value.template destroy< std::vector<dods_uint64>* > ();
+        break;
+
+      default:
+        break;
+    }
+
+    Base::clear ();
+  }
+
+  template <typename Base>
+  inline
+  bool
+  D4FunctionParser::basic_symbol<Base>::empty () const
+  {
+    return Base::type_get () == empty_symbol;
+  }
+
+  template <typename Base>
+  inline
+  void
+  D4FunctionParser::basic_symbol<Base>::move (basic_symbol& s)
+  {
+    super_type::move(s);
+      switch (this->type_get ())
+    {
+      case 7: // "function name"
+      case 44: // fname
+        value.move< D4Function > (s.value);
+        break;
+
+      case 5: // "argument"
+      case 6: // "function"
+      case 8: // "variable or constant"
+      case 9: // "array constant"
+      case 43: // function
+      case 46: // arg
+      case 47: // variable_or_constant
+      case 48: // array_constant
+        value.move< D4RValue* > (s.value);
+        break;
+
+      case 3: // "functions"
+      case 4: // "arguments"
+      case 42: // functions
+      case 45: // args
+        value.move< D4RValueList* > (s.value);
+        break;
+
+      case 20: // "word"
+      case 21: // "string"
+      case 60: // id
+      case 61: // group
+      case 62: // path
+      case 63: // name
+        value.move< std::string > (s.value);
+        break;
+
+      case 10: // "fast byte arg list"
+      case 50: // fast_byte_arg_list
+        value.move< std::vector<dods_byte>* > (s.value);
+        break;
+
+      case 18: // "fast float32 arg list"
+      case 58: // fast_float32_arg_list
+        value.move< std::vector<dods_float32>* > (s.value);
+        break;
+
+      case 19: // "fast float64 arg list"
+      case 59: // fast_float64_arg_list
+        value.move< std::vector<dods_float64>* > (s.value);
+        break;
+
+      case 13: // "fast int16 arg list"
+      case 53: // fast_int16_arg_list
+        value.move< std::vector<dods_int16>* > (s.value);
+        break;
+
+      case 15: // "fast int32 arg list"
+      case 55: // fast_int32_arg_list
+        value.move< std::vector<dods_int32>* > (s.value);
+        break;
+
+      case 17: // "fast int64 arg list"
+      case 57: // fast_int64_arg_list
+        value.move< std::vector<dods_int64>* > (s.value);
+        break;
+
+      case 11: // "fast int8 arg list"
+      case 51: // fast_int8_arg_list
+        value.move< std::vector<dods_int8>* > (s.value);
+        break;
+
+      case 12: // "fast uint16 arg list"
+      case 52: // fast_uint16_arg_list
+        value.move< std::vector<dods_uint16>* > (s.value);
+        break;
+
+      case 14: // "fast uint32 arg list"
+      case 54: // fast_uint32_arg_list
+        value.move< std::vector<dods_uint32>* > (s.value);
+        break;
+
+      case 16: // "fast uint64 arg list"
+      case 56: // fast_uint64_arg_list
+        value.move< std::vector<dods_uint64>* > (s.value);
+        break;
+
+      default:
+        break;
+    }
+
+    location = s.location;
+  }
+
+  // by_type.
+  inline
+  D4FunctionParser::by_type::by_type ()
+    : type (empty_symbol)
+  {}
+
+  inline
+  D4FunctionParser::by_type::by_type (const by_type& other)
+    : type (other.type)
+  {}
+
+  inline
+  D4FunctionParser::by_type::by_type (token_type t)
+    : type (yytranslate_ (t))
+  {}
+
+  inline
+  void
+  D4FunctionParser::by_type::clear ()
+  {
+    type = empty_symbol;
+  }
+
+  inline
+  void
+  D4FunctionParser::by_type::move (by_type& that)
+  {
+    type = that.type;
+    that.clear ();
+  }
+
+  inline
+  int
+  D4FunctionParser::by_type::type_get () const
+  {
+    return type;
+  }
+  // Implementation of make_symbol for each symbol type.
+  D4FunctionParser::symbol_type
+  D4FunctionParser::make_END (const location_type& l)
+  {
+    return symbol_type (token::END, l);
+  }
+
+  D4FunctionParser::symbol_type
+  D4FunctionParser::make_WORD (const std::string& v, const location_type& l)
+  {
+    return symbol_type (token::WORD, v, l);
+  }
+
+  D4FunctionParser::symbol_type
+  D4FunctionParser::make_STRING (const std::string& v, const location_type& l)
+  {
+    return symbol_type (token::STRING, v, l);
+  }
+
+  D4FunctionParser::symbol_type
+  D4FunctionParser::make_SEMICOLON (const location_type& l)
+  {
+    return symbol_type (token::SEMICOLON, l);
+  }
+
+  D4FunctionParser::symbol_type
+  D4FunctionParser::make_COLON (const location_type& l)
+  {
+    return symbol_type (token::COLON, l);
+  }
+
+  D4FunctionParser::symbol_type
+  D4FunctionParser::make_LPAREN (const location_type& l)
+  {
+    return symbol_type (token::LPAREN, l);
+  }
+
+  D4FunctionParser::symbol_type
+  D4FunctionParser::make_RPAREN (const location_type& l)
+  {
+    return symbol_type (token::RPAREN, l);
+  }
+
+  D4FunctionParser::symbol_type
+  D4FunctionParser::make_COMMA (const location_type& l)
+  {
+    return symbol_type (token::COMMA, l);
+  }
+
+  D4FunctionParser::symbol_type
+  D4FunctionParser::make_GROUP_SEP (const location_type& l)
+  {
+    return symbol_type (token::GROUP_SEP, l);
+  }
+
+  D4FunctionParser::symbol_type
+  D4FunctionParser::make_PATH_SEP (const location_type& l)
+  {
+    return symbol_type (token::PATH_SEP, l);
+  }
+
+  D4FunctionParser::symbol_type
+  D4FunctionParser::make_DOLLAR_BYTE (const location_type& l)
+  {
+    return symbol_type (token::DOLLAR_BYTE, l);
+  }
+
+  D4FunctionParser::symbol_type
+  D4FunctionParser::make_DOLLAR_UINT8 (const location_type& l)
+  {
+    return symbol_type (token::DOLLAR_UINT8, l);
+  }
+
+  D4FunctionParser::symbol_type
+  D4FunctionParser::make_DOLLAR_INT8 (const location_type& l)
+  {
+    return symbol_type (token::DOLLAR_INT8, l);
+  }
+
+  D4FunctionParser::symbol_type
+  D4FunctionParser::make_DOLLAR_UINT16 (const location_type& l)
+  {
+    return symbol_type (token::DOLLAR_UINT16, l);
+  }
+
+  D4FunctionParser::symbol_type
+  D4FunctionParser::make_DOLLAR_INT16 (const location_type& l)
+  {
+    return symbol_type (token::DOLLAR_INT16, l);
+  }
+
+  D4FunctionParser::symbol_type
+  D4FunctionParser::make_DOLLAR_UINT32 (const location_type& l)
+  {
+    return symbol_type (token::DOLLAR_UINT32, l);
+  }
+
+  D4FunctionParser::symbol_type
+  D4FunctionParser::make_DOLLAR_INT32 (const location_type& l)
+  {
+    return symbol_type (token::DOLLAR_INT32, l);
+  }
+
+  D4FunctionParser::symbol_type
+  D4FunctionParser::make_DOLLAR_UINT64 (const location_type& l)
+  {
+    return symbol_type (token::DOLLAR_UINT64, l);
+  }
+
+  D4FunctionParser::symbol_type
+  D4FunctionParser::make_DOLLAR_INT64 (const location_type& l)
+  {
+    return symbol_type (token::DOLLAR_INT64, l);
+  }
+
+  D4FunctionParser::symbol_type
+  D4FunctionParser::make_DOLLAR_FLOAT32 (const location_type& l)
+  {
+    return symbol_type (token::DOLLAR_FLOAT32, l);
+  }
+
+  D4FunctionParser::symbol_type
+  D4FunctionParser::make_DOLLAR_FLOAT64 (const location_type& l)
+  {
+    return symbol_type (token::DOLLAR_FLOAT64, l);
+  }
+
+
+
+  // by_state.
+  inline
+  D4FunctionParser::by_state::by_state ()
+    : state (empty_state)
+  {}
+
+  inline
+  D4FunctionParser::by_state::by_state (const by_state& other)
+    : state (other.state)
+  {}
+
+  inline
+  void
+  D4FunctionParser::by_state::clear ()
+  {
+    state = empty_state;
+  }
+
+  inline
+  void
+  D4FunctionParser::by_state::move (by_state& that)
+  {
+    state = that.state;
+    that.clear ();
+  }
+
+  inline
+  D4FunctionParser::by_state::by_state (state_type s)
+    : state (s)
+  {}
+
+  inline
+  D4FunctionParser::symbol_number_type
+  D4FunctionParser::by_state::type_get () const
+  {
+    if (state == empty_state)
+      return empty_symbol;
+    else
+      return yystos_[state];
+  }
+
+  inline
+  D4FunctionParser::stack_symbol_type::stack_symbol_type ()
+  {}
+
+
+  inline
+  D4FunctionParser::stack_symbol_type::stack_symbol_type (state_type s, symbol_type& that)
+    : super_type (s, that.location)
+  {
+      switch (that.type_get ())
+    {
+      case 7: // "function name"
+      case 44: // fname
+        value.move< D4Function > (that.value);
+        break;
+
+      case 5: // "argument"
+      case 6: // "function"
+      case 8: // "variable or constant"
+      case 9: // "array constant"
+      case 43: // function
+      case 46: // arg
+      case 47: // variable_or_constant
+      case 48: // array_constant
+        value.move< D4RValue* > (that.value);
+        break;
+
+      case 3: // "functions"
+      case 4: // "arguments"
+      case 42: // functions
+      case 45: // args
+        value.move< D4RValueList* > (that.value);
+        break;
+
+      case 20: // "word"
+      case 21: // "string"
+      case 60: // id
+      case 61: // group
+      case 62: // path
+      case 63: // name
+        value.move< std::string > (that.value);
+        break;
+
+      case 10: // "fast byte arg list"
+      case 50: // fast_byte_arg_list
+        value.move< std::vector<dods_byte>* > (that.value);
+        break;
+
+      case 18: // "fast float32 arg list"
+      case 58: // fast_float32_arg_list
+        value.move< std::vector<dods_float32>* > (that.value);
+        break;
+
+      case 19: // "fast float64 arg list"
+      case 59: // fast_float64_arg_list
+        value.move< std::vector<dods_float64>* > (that.value);
+        break;
+
+      case 13: // "fast int16 arg list"
+      case 53: // fast_int16_arg_list
+        value.move< std::vector<dods_int16>* > (that.value);
+        break;
+
+      case 15: // "fast int32 arg list"
+      case 55: // fast_int32_arg_list
+        value.move< std::vector<dods_int32>* > (that.value);
+        break;
+
+      case 17: // "fast int64 arg list"
+      case 57: // fast_int64_arg_list
+        value.move< std::vector<dods_int64>* > (that.value);
+        break;
+
+      case 11: // "fast int8 arg list"
+      case 51: // fast_int8_arg_list
+        value.move< std::vector<dods_int8>* > (that.value);
+        break;
+
+      case 12: // "fast uint16 arg list"
+      case 52: // fast_uint16_arg_list
+        value.move< std::vector<dods_uint16>* > (that.value);
+        break;
+
+      case 14: // "fast uint32 arg list"
+      case 54: // fast_uint32_arg_list
+        value.move< std::vector<dods_uint32>* > (that.value);
+        break;
+
+      case 16: // "fast uint64 arg list"
+      case 56: // fast_uint64_arg_list
+        value.move< std::vector<dods_uint64>* > (that.value);
+        break;
+
+      default:
+        break;
+    }
+
+    // that is emptied.
+    that.type = empty_symbol;
+  }
+
+  inline
+  D4FunctionParser::stack_symbol_type&
+  D4FunctionParser::stack_symbol_type::operator= (const stack_symbol_type& that)
+  {
+    state = that.state;
+      switch (that.type_get ())
+    {
+      case 7: // "function name"
+      case 44: // fname
+        value.copy< D4Function > (that.value);
+        break;
+
+      case 5: // "argument"
+      case 6: // "function"
+      case 8: // "variable or constant"
+      case 9: // "array constant"
+      case 43: // function
+      case 46: // arg
+      case 47: // variable_or_constant
+      case 48: // array_constant
+        value.copy< D4RValue* > (that.value);
+        break;
+
+      case 3: // "functions"
+      case 4: // "arguments"
+      case 42: // functions
+      case 45: // args
+        value.copy< D4RValueList* > (that.value);
+        break;
+
+      case 20: // "word"
+      case 21: // "string"
+      case 60: // id
+      case 61: // group
+      case 62: // path
+      case 63: // name
+        value.copy< std::string > (that.value);
+        break;
+
+      case 10: // "fast byte arg list"
+      case 50: // fast_byte_arg_list
+        value.copy< std::vector<dods_byte>* > (that.value);
+        break;
+
+      case 18: // "fast float32 arg list"
+      case 58: // fast_float32_arg_list
+        value.copy< std::vector<dods_float32>* > (that.value);
+        break;
+
+      case 19: // "fast float64 arg list"
+      case 59: // fast_float64_arg_list
+        value.copy< std::vector<dods_float64>* > (that.value);
+        break;
+
+      case 13: // "fast int16 arg list"
+      case 53: // fast_int16_arg_list
+        value.copy< std::vector<dods_int16>* > (that.value);
+        break;
+
+      case 15: // "fast int32 arg list"
+      case 55: // fast_int32_arg_list
+        value.copy< std::vector<dods_int32>* > (that.value);
+        break;
+
+      case 17: // "fast int64 arg list"
+      case 57: // fast_int64_arg_list
+        value.copy< std::vector<dods_int64>* > (that.value);
+        break;
+
+      case 11: // "fast int8 arg list"
+      case 51: // fast_int8_arg_list
+        value.copy< std::vector<dods_int8>* > (that.value);
+        break;
+
+      case 12: // "fast uint16 arg list"
+      case 52: // fast_uint16_arg_list
+        value.copy< std::vector<dods_uint16>* > (that.value);
+        break;
+
+      case 14: // "fast uint32 arg list"
+      case 54: // fast_uint32_arg_list
+        value.copy< std::vector<dods_uint32>* > (that.value);
+        break;
+
+      case 16: // "fast uint64 arg list"
+      case 56: // fast_uint64_arg_list
+        value.copy< std::vector<dods_uint64>* > (that.value);
+        break;
+
+      default:
+        break;
+    }
+
+    location = that.location;
+    return *this;
+  }
+
+
+  template <typename Base>
+  inline
+  void
+  D4FunctionParser::yy_destroy_ (const char* yymsg, basic_symbol<Base>& yysym) const
+  {
+    if (yymsg)
+      YY_SYMBOL_PRINT (yymsg, yysym);
+  }
+
+#if YYDEBUG
+  template <typename Base>
+  void
+  D4FunctionParser::yy_print_ (std::ostream& yyo,
+                                     const basic_symbol<Base>& yysym) const
+  {
+    std::ostream& yyoutput = yyo;
+    YYUSE (yyoutput);
+    symbol_number_type yytype = yysym.type_get ();
+    // Avoid a (spurious) G++ 4.8 warning about "array subscript is
+    // below array bounds".
+    if (yysym.empty ())
+      std::abort ();
+    yyo << (yytype < yyntokens_ ? "token" : "nterm")
+        << ' ' << yytname_[yytype] << " ("
+        << yysym.location << ": ";
+    YYUSE (yytype);
+    yyo << ')';
+  }
+#endif
+
+  inline
+  void
+  D4FunctionParser::yypush_ (const char* m, state_type s, symbol_type& sym)
+  {
+    stack_symbol_type t (s, sym);
+    yypush_ (m, t);
+  }
+
+  inline
+  void
+  D4FunctionParser::yypush_ (const char* m, stack_symbol_type& s)
+  {
+    if (m)
+      YY_SYMBOL_PRINT (m, s);
+    yystack_.push (s);
+  }
+
+  inline
+  void
+  D4FunctionParser::yypop_ (unsigned int n)
+  {
+    yystack_.pop (n);
+  }
+
+#if YYDEBUG
+  std::ostream&
+  D4FunctionParser::debug_stream () const
+  {
+    return *yycdebug_;
+  }
+
+  void
+  D4FunctionParser::set_debug_stream (std::ostream& o)
+  {
+    yycdebug_ = &o;
+  }
+
+
+  D4FunctionParser::debug_level_type
+  D4FunctionParser::debug_level () const
+  {
+    return yydebug_;
+  }
+
+  void
+  D4FunctionParser::set_debug_level (debug_level_type l)
+  {
+    yydebug_ = l;
+  }
+#endif // YYDEBUG
+
+  inline D4FunctionParser::state_type
+  D4FunctionParser::yy_lr_goto_state_ (state_type yystate, int yysym)
+  {
+    int yyr = yypgoto_[yysym - yyntokens_] + yystate;
+    if (0 <= yyr && yyr <= yylast_ && yycheck_[yyr] == yystate)
+      return yytable_[yyr];
+    else
+      return yydefgoto_[yysym - yyntokens_];
+  }
+
+  inline bool
+  D4FunctionParser::yy_pact_value_is_default_ (int yyvalue)
+  {
+    return yyvalue == yypact_ninf_;
+  }
+
+  inline bool
+  D4FunctionParser::yy_table_value_is_error_ (int yyvalue)
+  {
+    return yyvalue == yytable_ninf_;
+  }
+
+  int
+  D4FunctionParser::parse ()
+  {
+    // State.
+    int yyn;
+    /// Length of the RHS of the rule being reduced.
+    int yylen = 0;
+
+    // Error handling.
+    int yynerrs_ = 0;
+    int yyerrstatus_ = 0;
+
+    /// The lookahead symbol.
+    symbol_type yyla;
+
+    /// The locations where the error started and ended.
+    stack_symbol_type yyerror_range[3];
+
+    /// The return value of parse ().
+    int yyresult;
+
+    // FIXME: This shoud be completely indented.  It is not yet to
+    // avoid gratuitous conflicts when merging into the master branch.
+    try
+      {
+    YYCDEBUG << "Starting parse" << std::endl;
+
+
+    // User initialization code.
+    #line 69 "d4_function_parser.yy" // lalr1.cc:745
+{
+    // Initialize the initial location. This is printed when the parser builds
+    // its own error messages - when the parse fails as opposed to when the 
+    // function(s) name(s) a missing variable, ...
+
+    yyla.location.initialize (evaluator.expression());
+}
+
+#line 1301 "d4_function_parser.tab.cc" // lalr1.cc:745
+
+    /* Initialize the stack.  The initial state will be set in
+       yynewstate, since the latter expects the semantical and the
+       location values to have been already stored, initialize these
+       stacks with a primary value.  */
+    yystack_.clear ();
+    yypush_ (YY_NULLPTR, 0, yyla);
+
+    // A new symbol was pushed on the stack.
+  yynewstate:
+    YYCDEBUG << "Entering state " << yystack_[0].state << std::endl;
+
+    // Accept?
+    if (yystack_[0].state == yyfinal_)
+      goto yyacceptlab;
+
+    goto yybackup;
+
+    // Backup.
+  yybackup:
+
+    // Try to take a decision without lookahead.
+    yyn = yypact_[yystack_[0].state];
+    if (yy_pact_value_is_default_ (yyn))
+      goto yydefault;
+
+    // Read a lookahead token.
+    if (yyla.empty ())
+      {
+        YYCDEBUG << "Reading a token: ";
+        try
+          {
+            yyla.type = yytranslate_ (yylex (&yyla.value, &yyla.location, scanner, evaluator));
+          }
+        catch (const syntax_error& yyexc)
+          {
+            error (yyexc);
+            goto yyerrlab1;
+          }
+      }
+    YY_SYMBOL_PRINT ("Next token is", yyla);
+
+    /* If the proper action on seeing token YYLA.TYPE is to reduce or
+       to detect an error, take that action.  */
+    yyn += yyla.type_get ();
+    if (yyn < 0 || yylast_ < yyn || yycheck_[yyn] != yyla.type_get ())
+      goto yydefault;
+
+    // Reduce or error.
+    yyn = yytable_[yyn];
+    if (yyn <= 0)
+      {
+        if (yy_table_value_is_error_ (yyn))
+          goto yyerrlab;
+        yyn = -yyn;
+        goto yyreduce;
+      }
+
+    // Count tokens shifted since error; after three, turn off error status.
+    if (yyerrstatus_)
+      --yyerrstatus_;
+
+    // Shift the lookahead token.
+    yypush_ ("Shifting", yyn, yyla);
+    goto yynewstate;
+
+  /*-----------------------------------------------------------.
+  | yydefault -- do the default action for the current state.  |
+  `-----------------------------------------------------------*/
+  yydefault:
+    yyn = yydefact_[yystack_[0].state];
+    if (yyn == 0)
+      goto yyerrlab;
+    goto yyreduce;
+
+  /*-----------------------------.
+  | yyreduce -- Do a reduction.  |
+  `-----------------------------*/
+  yyreduce:
+    yylen = yyr2_[yyn];
+    {
+      stack_symbol_type yylhs;
+      yylhs.state = yy_lr_goto_state_(yystack_[yylen].state, yyr1_[yyn]);
+      /* Variants are always initialized to an empty instance of the
+         correct type. The default '$$ = $1' action is NOT applied
+         when using variants.  */
+        switch (yyr1_[yyn])
+    {
+      case 7: // "function name"
+      case 44: // fname
+        yylhs.value.build< D4Function > ();
+        break;
+
+      case 5: // "argument"
+      case 6: // "function"
+      case 8: // "variable or constant"
+      case 9: // "array constant"
+      case 43: // function
+      case 46: // arg
+      case 47: // variable_or_constant
+      case 48: // array_constant
+        yylhs.value.build< D4RValue* > ();
+        break;
+
+      case 3: // "functions"
+      case 4: // "arguments"
+      case 42: // functions
+      case 45: // args
+        yylhs.value.build< D4RValueList* > ();
+        break;
+
+      case 20: // "word"
+      case 21: // "string"
+      case 60: // id
+      case 61: // group
+      case 62: // path
+      case 63: // name
+        yylhs.value.build< std::string > ();
+        break;
+
+      case 10: // "fast byte arg list"
+      case 50: // fast_byte_arg_list
+        yylhs.value.build< std::vector<dods_byte>* > ();
+        break;
+
+      case 18: // "fast float32 arg list"
+      case 58: // fast_float32_arg_list
+        yylhs.value.build< std::vector<dods_float32>* > ();
+        break;
+
+      case 19: // "fast float64 arg list"
+      case 59: // fast_float64_arg_list
+        yylhs.value.build< std::vector<dods_float64>* > ();
+        break;
+
+      case 13: // "fast int16 arg list"
+      case 53: // fast_int16_arg_list
+        yylhs.value.build< std::vector<dods_int16>* > ();
+        break;
+
+      case 15: // "fast int32 arg list"
+      case 55: // fast_int32_arg_list
+        yylhs.value.build< std::vector<dods_int32>* > ();
+        break;
+
+      case 17: // "fast int64 arg list"
+      case 57: // fast_int64_arg_list
+        yylhs.value.build< std::vector<dods_int64>* > ();
+        break;
+
+      case 11: // "fast int8 arg list"
+      case 51: // fast_int8_arg_list
+        yylhs.value.build< std::vector<dods_int8>* > ();
+        break;
+
+      case 12: // "fast uint16 arg list"
+      case 52: // fast_uint16_arg_list
+        yylhs.value.build< std::vector<dods_uint16>* > ();
+        break;
+
+      case 14: // "fast uint32 arg list"
+      case 54: // fast_uint32_arg_list
+        yylhs.value.build< std::vector<dods_uint32>* > ();
+        break;
+
+      case 16: // "fast uint64 arg list"
+      case 56: // fast_uint64_arg_list
+        yylhs.value.build< std::vector<dods_uint64>* > ();
+        break;
+
+      default:
+        break;
+    }
+
+
+      // Compute the default @$.
+      {
+        slice<stack_symbol_type, stack_type> slice (yystack_, yylen);
+        YYLLOC_DEFAULT (yylhs.location, slice, yylen);
+      }
+
+      // Perform the reduction.
+      YY_REDUCE_PRINT (yyn);
+      try
+        {
+          switch (yyn)
+            {
+  case 2:
+#line 156 "d4_function_parser.yy" // lalr1.cc:859
+    { 
+    evaluator.set_result(yystack_[0].value.as< D4RValueList* > ()); 
+}
+#line 1494 "d4_function_parser.tab.cc" // lalr1.cc:859
+    break;
+
+  case 3:
+#line 162 "d4_function_parser.yy" // lalr1.cc:859
+    {
+    yylhs.value.as< D4RValueList* > () = new D4RValueList(yystack_[0].value.as< D4RValue* > ()); 
+}
+#line 1502 "d4_function_parser.tab.cc" // lalr1.cc:859
+    break;
+
+  case 4:
+#line 166 "d4_function_parser.yy" // lalr1.cc:859
+    { 
+    yystack_[2].value.as< D4RValueList* > ()->add_rvalue(yystack_[0].value.as< D4RValue* > ());
+    yylhs.value.as< D4RValueList* > () = yystack_[2].value.as< D4RValueList* > (); 
+}
+#line 1511 "d4_function_parser.tab.cc" // lalr1.cc:859
+    break;
+
+  case 5:
+#line 173 "d4_function_parser.yy" // lalr1.cc:859
+    { 
+    yylhs.value.as< D4RValue* > () = new D4RValue(yystack_[3].value.as< D4Function > (), yystack_[1].value.as< D4RValueList* > ()); // Build a D4RValue from a D4Function pointer and a D4RValueList 
+}
+#line 1519 "d4_function_parser.tab.cc" // lalr1.cc:859
+    break;
+
+  case 6:
+#line 179 "d4_function_parser.yy" // lalr1.cc:859
+    { 
+    D4Function f;
+    if (!evaluator.sf_list()->find_function(yystack_[0].value.as< std::string > (), &f)) {
+        // ...cloud use @1.{first,last}_column in these error messages.
+        throw Error(malformed_expr, "'" + yystack_[0].value.as< std::string > () + "' is not a registered DAP4 server function.");
+    }
+
+    yylhs.value.as< D4Function > () = f;
+}
+#line 1533 "d4_function_parser.tab.cc" // lalr1.cc:859
+    break;
+
+  case 7:
+#line 191 "d4_function_parser.yy" // lalr1.cc:859
+    { 
+    yylhs.value.as< D4RValueList* > () = new D4RValueList(yystack_[0].value.as< D4RValue* > ()); // build a D4RValueList from the D4RValue
+}
+#line 1541 "d4_function_parser.tab.cc" // lalr1.cc:859
+    break;
+
+  case 8:
+#line 195 "d4_function_parser.yy" // lalr1.cc:859
+    { 
+    yystack_[2].value.as< D4RValueList* > ()->add_rvalue(yystack_[0].value.as< D4RValue* > ());
+    yylhs.value.as< D4RValueList* > () = yystack_[2].value.as< D4RValueList* > (); // Append the D4RValue ($3) to the D4RValueList ($1), then return
+}
+#line 1550 "d4_function_parser.tab.cc" // lalr1.cc:859
+    break;
+
+  case 9:
+#line 202 "d4_function_parser.yy" // lalr1.cc:859
+    {
+    yylhs.value.as< D4RValue* > () = yystack_[0].value.as< D4RValue* > ();
+}
+#line 1558 "d4_function_parser.tab.cc" // lalr1.cc:859
+    break;
+
+  case 10:
+#line 206 "d4_function_parser.yy" // lalr1.cc:859
+    {
+    yylhs.value.as< D4RValue* > () = yystack_[0].value.as< D4RValue* > ();
+}
+#line 1566 "d4_function_parser.tab.cc" // lalr1.cc:859
+    break;
+
+  case 11:
+#line 210 "d4_function_parser.yy" // lalr1.cc:859
+    {
+    yylhs.value.as< D4RValue* > () = yystack_[0].value.as< D4RValue* > ();
+}
+#line 1574 "d4_function_parser.tab.cc" // lalr1.cc:859
+    break;
+
+  case 12:
+#line 216 "d4_function_parser.yy" // lalr1.cc:859
+    {
+    D4RValue *rvalue = evaluator.build_rvalue(yystack_[0].value.as< std::string > ());
+    if (!rvalue) {
+        throw Error(malformed_expr, "'" + yystack_[0].value.as< std::string > () + "' is not a variable, number or string.");
+    }
+    
+    yylhs.value.as< D4RValue* > () = rvalue;
+}
+#line 1587 "d4_function_parser.tab.cc" // lalr1.cc:859
+    break;
+
+  case 13:
+#line 228 "d4_function_parser.yy" // lalr1.cc:859
+    {
+    yylhs.value.as< D4RValue* > () = new D4RValue(*(yystack_[1].value.as< std::vector<dods_byte>* > ()));
+    delete yystack_[1].value.as< std::vector<dods_byte>* > ();
+}
+#line 1596 "d4_function_parser.tab.cc" // lalr1.cc:859
+    break;
+
+  case 14:
+#line 234 "d4_function_parser.yy" // lalr1.cc:859
+    {
+    yylhs.value.as< D4RValue* > () = new D4RValue(*(yystack_[1].value.as< std::vector<dods_byte>* > ()));
+    delete yystack_[1].value.as< std::vector<dods_byte>* > ();
+}
+#line 1605 "d4_function_parser.tab.cc" // lalr1.cc:859
+    break;
+
+  case 15:
+#line 240 "d4_function_parser.yy" // lalr1.cc:859
+    {
+    yylhs.value.as< D4RValue* > () = new D4RValue(*(yystack_[1].value.as< std::vector<dods_int8>* > ()));
+    delete yystack_[1].value.as< std::vector<dods_int8>* > ();
+}
+#line 1614 "d4_function_parser.tab.cc" // lalr1.cc:859
+    break;
+
+  case 16:
+#line 246 "d4_function_parser.yy" // lalr1.cc:859
+    {
+    yylhs.value.as< D4RValue* > () = new D4RValue(*(yystack_[1].value.as< std::vector<dods_uint16>* > ()));
+    delete yystack_[1].value.as< std::vector<dods_uint16>* > ();
+}
+#line 1623 "d4_function_parser.tab.cc" // lalr1.cc:859
+    break;
+
+  case 17:
+#line 252 "d4_function_parser.yy" // lalr1.cc:859
+    {
+    yylhs.value.as< D4RValue* > () = new D4RValue(*(yystack_[1].value.as< std::vector<dods_int16>* > ()));
+    delete yystack_[1].value.as< std::vector<dods_int16>* > ();
+}
+#line 1632 "d4_function_parser.tab.cc" // lalr1.cc:859
+    break;
+
+  case 18:
+#line 258 "d4_function_parser.yy" // lalr1.cc:859
+    {
+    yylhs.value.as< D4RValue* > () = new D4RValue(*(yystack_[1].value.as< std::vector<dods_uint32>* > ()));
+    delete yystack_[1].value.as< std::vector<dods_uint32>* > ();
+}
+#line 1641 "d4_function_parser.tab.cc" // lalr1.cc:859
+    break;
+
+  case 19:
+#line 264 "d4_function_parser.yy" // lalr1.cc:859
+    {
+    yylhs.value.as< D4RValue* > () = new D4RValue(*(yystack_[1].value.as< std::vector<dods_int32>* > ()));
+    delete yystack_[1].value.as< std::vector<dods_int32>* > ();
+}
+#line 1650 "d4_function_parser.tab.cc" // lalr1.cc:859
+    break;
+
+  case 20:
+#line 270 "d4_function_parser.yy" // lalr1.cc:859
+    {
+    yylhs.value.as< D4RValue* > () = new D4RValue(*(yystack_[1].value.as< std::vector<dods_uint64>* > ()));
+    delete yystack_[1].value.as< std::vector<dods_uint64>* > ();
+}
+#line 1659 "d4_function_parser.tab.cc" // lalr1.cc:859
+    break;
+
+  case 21:
+#line 276 "d4_function_parser.yy" // lalr1.cc:859
+    {
+    yylhs.value.as< D4RValue* > () = new D4RValue(*(yystack_[1].value.as< std::vector<dods_int64>* > ()));
+    delete yystack_[1].value.as< std::vector<dods_int64>* > ();
+}
+#line 1668 "d4_function_parser.tab.cc" // lalr1.cc:859
+    break;
+
+  case 22:
+#line 282 "d4_function_parser.yy" // lalr1.cc:859
+    {
+    yylhs.value.as< D4RValue* > () = new D4RValue(*(yystack_[1].value.as< std::vector<dods_float32>* > ()));
+    delete yystack_[1].value.as< std::vector<dods_float32>* > ();
+}
+#line 1677 "d4_function_parser.tab.cc" // lalr1.cc:859
+    break;
+
+  case 23:
+#line 288 "d4_function_parser.yy" // lalr1.cc:859
+    {
+    yylhs.value.as< D4RValue* > () = new D4RValue(*(yystack_[1].value.as< std::vector<dods_float64>* > ()));
+    delete yystack_[1].value.as< std::vector<dods_float64>* > ();
+}
+#line 1686 "d4_function_parser.tab.cc" // lalr1.cc:859
+    break;
+
+  case 24:
+#line 300 "d4_function_parser.yy" // lalr1.cc:859
+    {
+    evaluator.set_arg_length_hint(get_uint64(yystack_[0].value.as< std::string > ().c_str()));
+}
+#line 1694 "d4_function_parser.tab.cc" // lalr1.cc:859
+    break;
+
+  case 25:
+#line 306 "d4_function_parser.yy" // lalr1.cc:859
+    {
+    yylhs.value.as< std::vector<dods_byte>* > () = evaluator.init_arg_list(dods_byte(strtol(yystack_[0].value.as< std::string > ().c_str(), 0, 0)));
+}
+#line 1702 "d4_function_parser.tab.cc" // lalr1.cc:859
+    break;
+
+  case 26:
+#line 310 "d4_function_parser.yy" // lalr1.cc:859
+    {
+    yystack_[2].value.as< std::vector<dods_byte>* > ()->push_back(strtol(yystack_[0].value.as< std::string > ().c_str(), 0, 0));
+    yylhs.value.as< std::vector<dods_byte>* > () = yystack_[2].value.as< std::vector<dods_byte>* > ();
+}
+#line 1711 "d4_function_parser.tab.cc" // lalr1.cc:859
+    break;
+
+  case 27:
+#line 317 "d4_function_parser.yy" // lalr1.cc:859
+    {
+    yylhs.value.as< std::vector<dods_int8>* > () = evaluator.init_arg_list(dods_int8(strtol(yystack_[0].value.as< std::string > ().c_str(), 0, 0)));
+}
+#line 1719 "d4_function_parser.tab.cc" // lalr1.cc:859
+    break;
+
+  case 28:
+#line 321 "d4_function_parser.yy" // lalr1.cc:859
+    {
+    yystack_[2].value.as< std::vector<dods_int8>* > ()->push_back(strtol(yystack_[0].value.as< std::string > ().c_str(), 0, 0));
+    yylhs.value.as< std::vector<dods_int8>* > () = yystack_[2].value.as< std::vector<dods_int8>* > ();
+}
+#line 1728 "d4_function_parser.tab.cc" // lalr1.cc:859
+    break;
+
+  case 29:
+#line 328 "d4_function_parser.yy" // lalr1.cc:859
+    {
+    yylhs.value.as< std::vector<dods_uint16>* > () = evaluator.init_arg_list(dods_uint16(strtol(yystack_[0].value.as< std::string > ().c_str(), 0, 0)));
+}
+#line 1736 "d4_function_parser.tab.cc" // lalr1.cc:859
+    break;
+
+  case 30:
+#line 332 "d4_function_parser.yy" // lalr1.cc:859
+    {
+    yystack_[2].value.as< std::vector<dods_uint16>* > ()->push_back(strtol(yystack_[0].value.as< std::string > ().c_str(), 0, 0));
+    yylhs.value.as< std::vector<dods_uint16>* > () = yystack_[2].value.as< std::vector<dods_uint16>* > ();
+}
+#line 1745 "d4_function_parser.tab.cc" // lalr1.cc:859
+    break;
+
+  case 31:
+#line 339 "d4_function_parser.yy" // lalr1.cc:859
+    {
+    yylhs.value.as< std::vector<dods_int16>* > () = evaluator.init_arg_list(dods_int16(strtol(yystack_[0].value.as< std::string > ().c_str(), 0, 0)));
+}
+#line 1753 "d4_function_parser.tab.cc" // lalr1.cc:859
+    break;
+
+  case 32:
+#line 343 "d4_function_parser.yy" // lalr1.cc:859
+    {
+    yystack_[2].value.as< std::vector<dods_int16>* > ()->push_back(strtol(yystack_[0].value.as< std::string > ().c_str(), 0, 0));
+    yylhs.value.as< std::vector<dods_int16>* > () = yystack_[2].value.as< std::vector<dods_int16>* > ();
+}
+#line 1762 "d4_function_parser.tab.cc" // lalr1.cc:859
+    break;
+
+  case 33:
+#line 350 "d4_function_parser.yy" // lalr1.cc:859
+    {
+    yylhs.value.as< std::vector<dods_uint32>* > () = evaluator.init_arg_list(dods_uint32(strtoul(yystack_[0].value.as< std::string > ().c_str(), 0, 0)));
+}
+#line 1770 "d4_function_parser.tab.cc" // lalr1.cc:859
+    break;
+
+  case 34:
+#line 354 "d4_function_parser.yy" // lalr1.cc:859
+    {
+    yystack_[2].value.as< std::vector<dods_uint32>* > ()->push_back(strtoul(yystack_[0].value.as< std::string > ().c_str(), 0, 0));
+    yylhs.value.as< std::vector<dods_uint32>* > () = yystack_[2].value.as< std::vector<dods_uint32>* > ();
+}
+#line 1779 "d4_function_parser.tab.cc" // lalr1.cc:859
+    break;
+
+  case 35:
+#line 360 "d4_function_parser.yy" // lalr1.cc:859
+    {
+    yylhs.value.as< std::vector<dods_int32>* > () = evaluator.init_arg_list(dods_int32(strtol(yystack_[0].value.as< std::string > ().c_str(), 0, 0)));
+}
+#line 1787 "d4_function_parser.tab.cc" // lalr1.cc:859
+    break;
+
+  case 36:
+#line 364 "d4_function_parser.yy" // lalr1.cc:859
+    {
+    yystack_[2].value.as< std::vector<dods_int32>* > ()->push_back(strtol(yystack_[0].value.as< std::string > ().c_str(), 0, 0));
+    yylhs.value.as< std::vector<dods_int32>* > () = yystack_[2].value.as< std::vector<dods_int32>* > ();
+}
+#line 1796 "d4_function_parser.tab.cc" // lalr1.cc:859
+    break;
+
+  case 37:
+#line 371 "d4_function_parser.yy" // lalr1.cc:859
+    {
+    yylhs.value.as< std::vector<dods_uint64>* > () = evaluator.init_arg_list(dods_uint64(strtoull(yystack_[0].value.as< std::string > ().c_str(), 0, 0)));
+}
+#line 1804 "d4_function_parser.tab.cc" // lalr1.cc:859
+    break;
+
+  case 38:
+#line 375 "d4_function_parser.yy" // lalr1.cc:859
+    {
+    yystack_[2].value.as< std::vector<dods_uint64>* > ()->push_back(strtoull(yystack_[0].value.as< std::string > ().c_str(), 0, 0));
+    yylhs.value.as< std::vector<dods_uint64>* > () = yystack_[2].value.as< std::vector<dods_uint64>* > ();
+}
+#line 1813 "d4_function_parser.tab.cc" // lalr1.cc:859
+    break;
+
+  case 39:
+#line 382 "d4_function_parser.yy" // lalr1.cc:859
+    {
+    yylhs.value.as< std::vector<dods_int64>* > () = evaluator.init_arg_list(dods_int64(strtoll(yystack_[0].value.as< std::string > ().c_str(), 0, 0)));
+}
+#line 1821 "d4_function_parser.tab.cc" // lalr1.cc:859
+    break;
+
+  case 40:
+#line 386 "d4_function_parser.yy" // lalr1.cc:859
+    {
+    yystack_[2].value.as< std::vector<dods_int64>* > ()->push_back(strtoll(yystack_[0].value.as< std::string > ().c_str(), 0, 0));
+    yylhs.value.as< std::vector<dods_int64>* > () = yystack_[2].value.as< std::vector<dods_int64>* > ();
+}
+#line 1830 "d4_function_parser.tab.cc" // lalr1.cc:859
+    break;
+
+  case 41:
+#line 396 "d4_function_parser.yy" // lalr1.cc:859
+    {
+    yylhs.value.as< std::vector<dods_float32>* > () = evaluator.init_arg_list(dods_float32(strtof(yystack_[0].value.as< std::string > ().c_str(), 0)));
+}
+#line 1838 "d4_function_parser.tab.cc" // lalr1.cc:859
+    break;
+
+  case 42:
+#line 400 "d4_function_parser.yy" // lalr1.cc:859
+    {
+    yystack_[2].value.as< std::vector<dods_float32>* > ()->push_back(strtof(yystack_[0].value.as< std::string > ().c_str(), 0));
+    yylhs.value.as< std::vector<dods_float32>* > () = yystack_[2].value.as< std::vector<dods_float32>* > ();
+}
+#line 1847 "d4_function_parser.tab.cc" // lalr1.cc:859
+    break;
+
+  case 43:
+#line 407 "d4_function_parser.yy" // lalr1.cc:859
+    {
+    yylhs.value.as< std::vector<dods_float64>* > () = evaluator.init_arg_list(dods_float64(strtod(yystack_[0].value.as< std::string > ().c_str(), 0)));
+}
+#line 1855 "d4_function_parser.tab.cc" // lalr1.cc:859
+    break;
+
+  case 44:
+#line 411 "d4_function_parser.yy" // lalr1.cc:859
+    {
+    yystack_[2].value.as< std::vector<dods_float64>* > ()->push_back(strtod(yystack_[0].value.as< std::string > ().c_str(), 0));
+    yylhs.value.as< std::vector<dods_float64>* > () = yystack_[2].value.as< std::vector<dods_float64>* > ();
+}
+#line 1864 "d4_function_parser.tab.cc" // lalr1.cc:859
+    break;
+
+  case 45:
+#line 418 "d4_function_parser.yy" // lalr1.cc:859
+    {
+    yylhs.value.as< std::string > () = yystack_[0].value.as< std::string > ();
+}
+#line 1872 "d4_function_parser.tab.cc" // lalr1.cc:859
+    break;
+
+  case 46:
+#line 422 "d4_function_parser.yy" // lalr1.cc:859
+    {
+    yylhs.value.as< std::string > ().append("/");
+    yylhs.value.as< std::string > ().append(yystack_[0].value.as< std::string > ());
+}
+#line 1881 "d4_function_parser.tab.cc" // lalr1.cc:859
+    break;
+
+  case 47:
+#line 427 "d4_function_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 > ());
+    yylhs.value.as< std::string > () = yystack_[2].value.as< std::string > ();
+}
+#line 1891 "d4_function_parser.tab.cc" // lalr1.cc:859
+    break;
+
+  case 48:
+#line 435 "d4_function_parser.yy" // lalr1.cc:859
+    {
+    yylhs.value.as< std::string > ().append("/");
+    yylhs.value.as< std::string > ().append(yystack_[0].value.as< std::string > ());
+}
+#line 1900 "d4_function_parser.tab.cc" // lalr1.cc:859
+    break;
+
+  case 49:
+#line 440 "d4_function_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 > ());
+    yylhs.value.as< std::string > () = yystack_[2].value.as< std::string > ();
+}
+#line 1910 "d4_function_parser.tab.cc" // lalr1.cc:859
+    break;
+
+  case 50:
+#line 448 "d4_function_parser.yy" // lalr1.cc:859
+    {
+    yylhs.value.as< std::string > () = yystack_[0].value.as< std::string > ();
+}
+#line 1918 "d4_function_parser.tab.cc" // lalr1.cc:859
+    break;
+
+  case 51:
+#line 452 "d4_function_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 > ());
+    yylhs.value.as< std::string > () = yystack_[2].value.as< std::string > ();
+}
+#line 1928 "d4_function_parser.tab.cc" // lalr1.cc:859
+    break;
+
+  case 52:
+#line 463 "d4_function_parser.yy" // lalr1.cc:859
+    {
+    yylhs.value.as< std::string > ()=yystack_[0].value.as< std::string > ();
+}
+#line 1936 "d4_function_parser.tab.cc" // lalr1.cc:859
+    break;
+
+  case 53:
+#line 467 "d4_function_parser.yy" // lalr1.cc:859
+    {
+    yylhs.value.as< std::string > ()=yystack_[0].value.as< std::string > ();
+}
+#line 1944 "d4_function_parser.tab.cc" // lalr1.cc:859
+    break;
+
+
+#line 1948 "d4_function_parser.tab.cc" // lalr1.cc:859
+            default:
+              break;
+            }
+        }
+      catch (const syntax_error& yyexc)
+        {
+          error (yyexc);
+          YYERROR;
+        }
+      YY_SYMBOL_PRINT ("-> $$ =", yylhs);
+      yypop_ (yylen);
+      yylen = 0;
+      YY_STACK_PRINT ();
+
+      // Shift the result of the reduction.
+      yypush_ (YY_NULLPTR, yylhs);
+    }
+    goto yynewstate;
+
+  /*--------------------------------------.
+  | yyerrlab -- here on detecting error.  |
+  `--------------------------------------*/
+  yyerrlab:
+    // If not already recovering from an error, report this error.
+    if (!yyerrstatus_)
+      {
+        ++yynerrs_;
+        error (yyla.location, yysyntax_error_ (yystack_[0].state, yyla));
+      }
+
+
+    yyerror_range[1].location = yyla.location;
+    if (yyerrstatus_ == 3)
+      {
+        /* If just tried and failed to reuse lookahead token after an
+           error, discard it.  */
+
+        // Return failure if at end of input.
+        if (yyla.type_get () == yyeof_)
+          YYABORT;
+        else if (!yyla.empty ())
+          {
+            yy_destroy_ ("Error: discarding", yyla);
+            yyla.clear ();
+          }
+      }
+
+    // Else will try to reuse lookahead token after shifting the error token.
+    goto yyerrlab1;
+
+
+  /*---------------------------------------------------.
+  | yyerrorlab -- error raised explicitly by YYERROR.  |
+  `---------------------------------------------------*/
+  yyerrorlab:
+
+    /* Pacify compilers like GCC when the user code never invokes
+       YYERROR and the label yyerrorlab therefore never appears in user
+       code.  */
+    if (false)
+      goto yyerrorlab;
+    yyerror_range[1].location = yystack_[yylen - 1].location;
+    /* Do not reclaim the symbols of the rule whose action triggered
+       this YYERROR.  */
+    yypop_ (yylen);
+    yylen = 0;
+    goto yyerrlab1;
+
+  /*-------------------------------------------------------------.
+  | yyerrlab1 -- common code for both syntax error and YYERROR.  |
+  `-------------------------------------------------------------*/
+  yyerrlab1:
+    yyerrstatus_ = 3;   // Each real token shifted decrements this.
+    {
+      stack_symbol_type error_token;
+      for (;;)
+        {
+          yyn = yypact_[yystack_[0].state];
+          if (!yy_pact_value_is_default_ (yyn))
+            {
+              yyn += yyterror_;
+              if (0 <= yyn && yyn <= yylast_ && yycheck_[yyn] == yyterror_)
+                {
+                  yyn = yytable_[yyn];
+                  if (0 < yyn)
+                    break;
+                }
+            }
+
+          // Pop the current state because it cannot handle the error token.
+          if (yystack_.size () == 1)
+            YYABORT;
+
+          yyerror_range[1].location = yystack_[0].location;
+          yy_destroy_ ("Error: popping", yystack_[0]);
+          yypop_ ();
+          YY_STACK_PRINT ();
+        }
+
+      yyerror_range[2].location = yyla.location;
+      YYLLOC_DEFAULT (error_token.location, yyerror_range, 2);
+
+      // Shift the error token.
+      error_token.state = yyn;
+      yypush_ ("Shifting", error_token);
+    }
+    goto yynewstate;
+
+    // Accept.
+  yyacceptlab:
+    yyresult = 0;
+    goto yyreturn;
+
+    // Abort.
+  yyabortlab:
+    yyresult = 1;
+    goto yyreturn;
+
+  yyreturn:
+    if (!yyla.empty ())
+      yy_destroy_ ("Cleanup: discarding lookahead", yyla);
+
+    /* Do not reclaim the symbols of the rule whose action triggered
+       this YYABORT or YYACCEPT.  */
+    yypop_ (yylen);
+    while (1 < yystack_.size ())
+      {
+        yy_destroy_ ("Cleanup: popping", yystack_[0]);
+        yypop_ ();
+      }
+
+    return yyresult;
+  }
+    catch (...)
+      {
+        YYCDEBUG << "Exception caught: cleaning lookahead and stack"
+                 << std::endl;
+        // Do not try to display the values of the reclaimed symbols,
+        // as their printer might throw an exception.
+        if (!yyla.empty ())
+          yy_destroy_ (YY_NULLPTR, yyla);
+
+        while (1 < yystack_.size ())
+          {
+            yy_destroy_ (YY_NULLPTR, yystack_[0]);
+            yypop_ ();
+          }
+        throw;
+      }
+  }
+
+  void
+  D4FunctionParser::error (const syntax_error& yyexc)
+  {
+    error (yyexc.location, yyexc.what());
+  }
+
+  // Generate an error message.
+  std::string
+  D4FunctionParser::yysyntax_error_ (state_type yystate, const symbol_type& yyla) const
+  {
+    // Number of reported tokens (one for the "unexpected", one per
+    // "expected").
+    size_t yycount = 0;
+    // Its maximum.
+    enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+    // Arguments of yyformat.
+    char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+
+    /* There are many possibilities here to consider:
+       - If this state is a consistent state with a default action, then
+         the only way this function was invoked is if the default action
+         is an error action.  In that case, don't check for expected
+         tokens because there are none.
+       - The only way there can be no lookahead present (in yyla) is
+         if this state is a consistent state with a default action.
+         Thus, detecting the absence of a lookahead is sufficient to
+         determine that there is no unexpected or expected token to
+         report.  In that case, just report a simple "syntax error".
+       - Don't assume there isn't a lookahead just because this state is
+         a consistent state with a default action.  There might have
+         been a previous inconsistent state, consistent state with a
+         non-default action, or user semantic action that manipulated
+         yyla.  (However, yyla is currently not documented for users.)
+       - Of course, the expected token list depends on states to have
+         correct lookahead information, and it depends on the parser not
+         to perform extra reductions after fetching a lookahead from the
+         scanner and before detecting a syntax error.  Thus, state
+         merging (from LALR or IELR) and default reductions corrupt the
+         expected token list.  However, the list is correct for
+         canonical LR with one exception: it will still contain any
+         token that will not be accepted due to an error action in a
+         later state.
+    */
+    if (!yyla.empty ())
+      {
+        int yytoken = yyla.type_get ();
+        yyarg[yycount++] = yytname_[yytoken];
+        int yyn = yypact_[yystate];
+        if (!yy_pact_value_is_default_ (yyn))
+          {
+            /* Start YYX at -YYN if negative to avoid negative indexes in
+               YYCHECK.  In other words, skip the first -YYN actions for
+               this state because they are default actions.  */
+            int yyxbegin = yyn < 0 ? -yyn : 0;
+            // Stay within bounds of both yycheck and yytname.
+            int yychecklim = yylast_ - yyn + 1;
+            int yyxend = yychecklim < yyntokens_ ? yychecklim : yyntokens_;
+            for (int yyx = yyxbegin; yyx < yyxend; ++yyx)
+              if (yycheck_[yyx + yyn] == yyx && yyx != yyterror_
+                  && !yy_table_value_is_error_ (yytable_[yyx + yyn]))
+                {
+                  if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+                    {
+                      yycount = 1;
+                      break;
+                    }
+                  else
+                    yyarg[yycount++] = yytname_[yyx];
+                }
+          }
+      }
+
+    char const* yyformat = YY_NULLPTR;
+    switch (yycount)
+      {
+#define YYCASE_(N, S)                         \
+        case N:                               \
+          yyformat = S;                       \
+        break
+        YYCASE_(0, YY_("syntax error"));
+        YYCASE_(1, YY_("syntax error, unexpected %s"));
+        YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
+        YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
+        YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
+        YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
+#undef YYCASE_
+      }
+
+    std::string yyres;
+    // Argument number.
+    size_t yyi = 0;
+    for (char const* yyp = yyformat; *yyp; ++yyp)
+      if (yyp[0] == '%' && yyp[1] == 's' && yyi < yycount)
+        {
+          yyres += yytnamerr_ (yyarg[yyi++]);
+          ++yyp;
+        }
+      else
+        yyres += *yyp;
+    return yyres;
+  }
+
+
+  const signed char D4FunctionParser::yypact_ninf_ = -20;
+
+  const signed char D4FunctionParser::yytable_ninf_ = -50;
+
+  const signed char
+  D4FunctionParser::yypact_[] =
+  {
+     -10,   -20,     8,    10,   -20,    12,   -20,   -10,   -18,   -20,
+      37,   -20,   -16,    38,    39,    42,    43,    44,    45,    46,
+      47,    48,    49,    50,   -20,   -19,   -20,   -20,   -20,   -20,
+      51,    52,   -20,   -20,    52,    54,    55,    55,    55,    55,
+      55,    55,    55,    55,    55,    55,    55,   -20,   -18,   -16,
+     -16,   -20,    53,    56,    59,    60,    61,    62,    63,    64,
+      65,    66,    67,   -20,    52,    68,   -20,    57,    57,    71,
+      72,    73,    74,    76,    77,    78,   -16,   -16,   -20,     9,
+      16,   -20,    18,   -20,    20,   -20,    22,   -20,    24,   -20,
+      26,   -20,    28,   -20,    30,    32,    52,    34,    52,   -20,
+      79,   -20,   -20,    80,   -20,    81,   -20,    82,   -20,    83,
+     -20,    84,   -20,    86,   -20,    88,   -20,   -16,   -20,   -16,
+     -20,   -20,   -20,   -20,   -20,   -20,   -20,   -20,    52,    52
+  };
+
+  const unsigned char
+  D4FunctionParser::yydefact_[] =
+  {
+       0,     6,     0,     2,     3,     0,     1,     0,     0,     4,
+      52,    53,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     9,     0,     7,    10,    11,    12,
+       0,    45,    50,    52,    46,    50,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     5,     0,     0,
+       0,    24,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     8,    47,    50,    51,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    25,     0,
+       0,    27,     0,    29,     0,    31,     0,    33,     0,    35,
+       0,    37,     0,    39,     0,     0,    41,     0,    43,    13,
+       0,    14,    15,     0,    16,     0,    17,     0,    18,     0,
+      19,     0,    20,     0,    21,     0,    22,     0,    23,     0,
+      26,    28,    30,    32,    34,    36,    38,    40,    42,    44
+  };
+
+  const signed char
+  D4FunctionParser::yypgoto_[] =
+  {
+     -20,   -20,   -20,    33,   -20,   -20,    69,   -20,   -20,   -15,
+      41,   -20,   -20,   -20,   -20,   -20,   -20,   -20,   -20,   -20,
+     -20,   -20,   -12,   -11
+  };
+
+  const signed char
+  D4FunctionParser::yydefgoto_[] =
+  {
+      -1,     2,     3,    24,     5,    25,    26,    27,    28,    52,
+      79,    82,    84,    86,    88,    90,    92,    94,    95,    97,
+      29,    30,    31,    32
+  };
+
+  const short int
+  D4FunctionParser::yytable_[] =
+  {
+      34,    35,    10,    11,    33,    11,    47,    48,     6,    12,
+       1,    13,    14,    15,    16,    17,    18,    19,    20,    21,
+      22,    23,    53,    54,    55,    56,    57,    58,    59,    60,
+      61,    62,     7,     4,    99,   100,     8,    64,    65,    66,
+       9,   101,   100,   102,   103,   104,   105,   106,   107,   108,
+     109,   110,   111,   112,   113,   114,   115,   116,   117,   118,
+     119,    -6,    36,    37,    96,    98,    38,    39,    40,    41,
+      42,    43,    44,    45,    46,    51,    67,    78,    49,    68,
+      50,   -48,    69,    70,    71,    72,    73,    74,    75,    76,
+      77,    81,    83,    85,    87,   -49,    89,    91,    93,   120,
+     121,   122,   123,   124,   125,   128,   126,   129,   127,    80,
+       0,     0,     0,     0,     0,     0,     0,    63
+  };
+
+  const signed char
+  D4FunctionParser::yycheck_[] =
+  {
+      12,    12,    20,    21,    20,    21,    25,    26,     0,    27,
+      20,    29,    30,    31,    32,    33,    34,    35,    36,    37,
+      38,    39,    37,    38,    39,    40,    41,    42,    43,    44,
+      45,    46,    22,     0,    25,    26,    24,    49,    49,    50,
+       7,    25,    26,    25,    26,    25,    26,    25,    26,    25,
+      26,    25,    26,    25,    26,    25,    26,    25,    26,    25,
+      26,    24,    24,    24,    76,    77,    24,    24,    24,    24,
+      24,    24,    24,    24,    24,    20,    23,    20,    27,    23,
+      28,    27,    23,    23,    23,    23,    23,    23,    23,    23,
+      23,    20,    20,    20,    20,    27,    20,    20,    20,    20,
+      20,    20,    20,    20,    20,   117,    20,   119,    20,    68,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    48
+  };
+
+  const unsigned char
+  D4FunctionParser::yystos_[] =
+  {
+       0,    20,    41,    42,    43,    44,     0,    22,    24,    43,
+      20,    21,    27,    29,    30,    31,    32,    33,    34,    35,
+      36,    37,    38,    39,    43,    45,    46,    47,    48,    60,
+      61,    62,    63,    20,    62,    63,    24,    24,    24,    24,
+      24,    24,    24,    24,    24,    24,    24,    25,    26,    27,
+      28,    20,    49,    49,    49,    49,    49,    49,    49,    49,
+      49,    49,    49,    46,    62,    63,    63,    23,    23,    23,
+      23,    23,    23,    23,    23,    23,    23,    23,    20,    50,
+      50,    20,    51,    20,    52,    20,    53,    20,    54,    20,
+      55,    20,    56,    20,    57,    58,    62,    59,    62,    25,
+      26,    25,    25,    26,    25,    26,    25,    26,    25,    26,
+      25,    26,    25,    26,    25,    26,    25,    26,    25,    26,
+      20,    20,    20,    20,    20,    20,    20,    20,    62,    62
+  };
+
+  const unsigned char
+  D4FunctionParser::yyr1_[] =
+  {
+       0,    40,    41,    42,    42,    43,    44,    45,    45,    46,
+      46,    46,    47,    48,    48,    48,    48,    48,    48,    48,
+      48,    48,    48,    48,    49,    50,    50,    51,    51,    52,
+      52,    53,    53,    54,    54,    55,    55,    56,    56,    57,
+      57,    58,    58,    59,    59,    60,    60,    60,    61,    61,
+      62,    62,    63,    63
+  };
+
+  const unsigned char
+  D4FunctionParser::yyr2_[] =
+  {
+       0,     2,     1,     1,     3,     4,     1,     1,     3,     1,
+       1,     1,     1,     6,     6,     6,     6,     6,     6,     6,
+       6,     6,     6,     6,     1,     1,     3,     1,     3,     1,
+       3,     1,     3,     1,     3,     1,     3,     1,     3,     1,
+       3,     1,     3,     1,     3,     1,     2,     3,     2,     3,
+       1,     3,     1,     1
+  };
+
+
+
+  // YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
+  // First, the terminals, then, starting at \a yyntokens_, nonterminals.
+  const char*
+  const D4FunctionParser::yytname_[] =
+  {
+  "\"end of file\"", "error", "$undefined", "\"functions\"",
+  "\"arguments\"", "\"argument\"", "\"function\"", "\"function name\"",
+  "\"variable or constant\"", "\"array constant\"",
+  "\"fast byte arg list\"", "\"fast int8 arg list\"",
+  "\"fast uint16 arg list\"", "\"fast int16 arg list\"",
+  "\"fast uint32 arg list\"", "\"fast int32 arg list\"",
+  "\"fast uint64 arg list\"", "\"fast int64 arg list\"",
+  "\"fast float32 arg list\"", "\"fast float64 arg list\"", "\"word\"",
+  "\"string\"", "\";\"", "\":\"", "\"(\"", "\")\"", "\",\"", "\"/\"",
+  "\".\"", "\"$Byte\"", "\"$UInt8\"", "\"$Int8\"", "\"$UInt16\"",
+  "\"$Int16\"", "\"$UInt32\"", "\"$Int32\"", "\"$UInt64\"", "\"$Int64\"",
+  "\"$Float32\"", "\"$Float64\"", "$accept", "program", "functions",
+  "function", "fname", "args", "arg", "variable_or_constant",
+  "array_constant", "arg_length_hint", "fast_byte_arg_list",
+  "fast_int8_arg_list", "fast_uint16_arg_list", "fast_int16_arg_list",
+  "fast_uint32_arg_list", "fast_int32_arg_list", "fast_uint64_arg_list",
+  "fast_int64_arg_list", "fast_float32_arg_list", "fast_float64_arg_list",
+  "id", "group", "path", "name", YY_NULLPTR
+  };
+
+#if YYDEBUG
+  const unsigned short int
+  D4FunctionParser::yyrline_[] =
+  {
+       0,   155,   155,   161,   165,   172,   178,   190,   194,   201,
+     205,   209,   215,   227,   233,   239,   245,   251,   257,   263,
+     269,   275,   281,   287,   299,   305,   309,   316,   320,   327,
+     331,   338,   342,   349,   353,   359,   363,   370,   374,   381,
+     385,   395,   399,   406,   410,   417,   421,   426,   434,   439,
+     447,   451,   462,   466
+  };
+
+  // Print the state stack on the debug stream.
+  void
+  D4FunctionParser::yystack_print_ ()
+  {
+    *yycdebug_ << "Stack now";
+    for (stack_type::const_iterator
+           i = yystack_.begin (),
+           i_end = yystack_.end ();
+         i != i_end; ++i)
+      *yycdebug_ << ' ' << i->state;
+    *yycdebug_ << std::endl;
+  }
+
+  // Report on the debug stream that the rule \a yyrule is going to be reduced.
+  void
+  D4FunctionParser::yy_reduce_print_ (int yyrule)
+  {
+    unsigned int yylno = yyrline_[yyrule];
+    int yynrhs = yyr2_[yyrule];
+    // Print the symbols being reduced, and their result.
+    *yycdebug_ << "Reducing stack by rule " << yyrule - 1
+               << " (line " << yylno << "):" << std::endl;
+    // The symbols being reduced.
+    for (int yyi = 0; yyi < yynrhs; yyi++)
+      YY_SYMBOL_PRINT ("   $" << yyi + 1 << " =",
+                       yystack_[(yynrhs) - (yyi + 1)]);
+  }
+#endif // YYDEBUG
+
+  // Symbol number corresponding to token number t.
+  inline
+  D4FunctionParser::token_number_type
+  D4FunctionParser::yytranslate_ (int t)
+  {
+    static
+    const token_number_type
+    translate_table[] =
+    {
+     0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     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
+    };
+    const unsigned int user_token_number_max_ = 294;
+    const token_number_type undef_token_ = 2;
+
+    if (static_cast<int>(t) <= yyeof_)
+      return yyeof_;
+    else if (static_cast<unsigned int> (t) <= user_token_number_max_)
+      return translate_table[t];
+    else
+      return undef_token_;
+  }
+
+#line 34 "d4_function_parser.yy" // lalr1.cc:1167
+} // libdap
+#line 2454 "d4_function_parser.tab.cc" // lalr1.cc:1167
+#line 472 "d4_function_parser.yy" // lalr1.cc:1168
+
+
+// Forward the error to the driver for handling. The location parameter
+// provides the line number and character position of the error.
+void
+libdap::D4FunctionParser::error(const location_type &l, const std::string &m)
+{
+    evaluator.error(l, m);
+}
+
+/* include for access to scanner.yylex */
+#include "D4FunctionScanner.h"
+
+static int yylex(libdap::D4FunctionParser::semantic_type *yylval,
+                 libdap::location *loc,
+                 libdap::D4FunctionScanner &scanner,
+                 libdap::D4FunctionEvaluator &evaluator)
+{
+    if (evaluator.trace_scanning())
+        scanner.set_debug(true);
+    
+    return( scanner.yylex(yylval, loc) );
+}
diff --git a/d4_function/d4_function_parser.tab.hh b/d4_function/d4_function_parser.tab.hh
new file mode 100644
index 0000000..c099ee5
--- /dev/null
+++ b/d4_function/d4_function_parser.tab.hh
@@ -0,0 +1,852 @@
+// A Bison parser, made by GNU Bison 3.0.4.
+
+// Skeleton interface for Bison LALR(1) parsers in C++
+
+// Copyright (C) 2002-2015 Free Software Foundation, Inc.
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+// As a special exception, you may create a larger work that contains
+// part or all of the Bison parser skeleton and distribute that work
+// under terms of your choice, so long as that work isn't itself a
+// parser generator using the skeleton or a modified version thereof
+// as a parser skeleton.  Alternatively, if you modify or redistribute
+// the parser skeleton itself, you may (at your option) remove this
+// special exception, which will cause the skeleton and the resulting
+// Bison output files to be licensed under the GNU General Public
+// License without this special exception.
+
+// This special exception was added by the Free Software Foundation in
+// version 2.2 of Bison.
+
+/**
+ ** \file d4_function_parser.tab.hh
+ ** Define the libdap::parser class.
+ */
+
+// C++ LALR(1) parser skeleton written by Akim Demaille.
+
+#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
+
+
+#include "D4FunctionEvaluator.h"
+#include "D4RValue.h"
+#include "dods-datatypes.h"
+
+namespace libdap {
+    class D4FunctionScanner;
+}
+
+
+#line 56 "d4_function_parser.tab.hh" // lalr1.cc:392
+
+# include <cassert>
+# include <cstdlib> // std::abort
+# include <iostream>
+# include <stdexcept>
+# include <string>
+# include <vector>
+# include "stack.hh"
+# include "location.hh"
+#include <typeinfo>
+#ifndef YYASSERT
+# include <cassert>
+# define YYASSERT assert
+#endif
+
+
+#ifndef YY_ATTRIBUTE
+# if (defined __GNUC__                                               \
+      && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__)))  \
+     || defined __SUNPRO_C && 0x5110 <= __SUNPRO_C
+#  define YY_ATTRIBUTE(Spec) __attribute__(Spec)
+# else
+#  define YY_ATTRIBUTE(Spec) /* empty */
+# endif
+#endif
+
+#ifndef YY_ATTRIBUTE_PURE
+# define YY_ATTRIBUTE_PURE   YY_ATTRIBUTE ((__pure__))
+#endif
+
+#ifndef YY_ATTRIBUTE_UNUSED
+# define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__))
+#endif
+
+#if !defined _Noreturn \
+     && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112)
+# if defined _MSC_VER && 1200 <= _MSC_VER
+#  define _Noreturn __declspec (noreturn)
+# else
+#  define _Noreturn YY_ATTRIBUTE ((__noreturn__))
+# endif
+#endif
+
+/* Suppress unused-variable warnings by "using" E.  */
+#if ! defined lint || defined __GNUC__
+# define YYUSE(E) ((void) (E))
+#else
+# define YYUSE(E) /* empty */
+#endif
+
+#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
+/* Suppress an incorrect diagnostic about yylval being uninitialized.  */
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
+    _Pragma ("GCC diagnostic push") \
+    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\
+    _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END \
+    _Pragma ("GCC diagnostic pop")
+#else
+# define YY_INITIAL_VALUE(Value) Value
+#endif
+#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END
+#endif
+#ifndef YY_INITIAL_VALUE
+# define YY_INITIAL_VALUE(Value) /* Nothing. */
+#endif
+
+/* Debug traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 1
+#endif
+
+#line 34 "d4_function_parser.yy" // lalr1.cc:392
+namespace libdap {
+#line 133 "d4_function_parser.tab.hh" // lalr1.cc:392
+
+
+
+  /// A char[S] buffer to store and retrieve objects.
+  ///
+  /// Sort of a variant, but does not keep track of the nature
+  /// of the stored data, since that knowledge is available
+  /// via the current state.
+  template <size_t S>
+  struct variant
+  {
+    /// Type of *this.
+    typedef variant<S> self_type;
+
+    /// Empty construction.
+    variant ()
+      : yytypeid_ (YY_NULLPTR)
+    {}
+
+    /// Construct and fill.
+    template <typename T>
+    variant (const T& t)
+      : yytypeid_ (&typeid (T))
+    {
+      YYASSERT (sizeof (T) <= S);
+      new (yyas_<T> ()) T (t);
+    }
+
+    /// Destruction, allowed only if empty.
+    ~variant ()
+    {
+      YYASSERT (!yytypeid_);
+    }
+
+    /// Instantiate an empty \a T in here.
+    template <typename T>
+    T&
+    build ()
+    {
+      YYASSERT (!yytypeid_);
+      YYASSERT (sizeof (T) <= S);
+      yytypeid_ = & typeid (T);
+      return *new (yyas_<T> ()) T;
+    }
+
+    /// Instantiate a \a T in here from \a t.
+    template <typename T>
+    T&
+    build (const T& t)
+    {
+      YYASSERT (!yytypeid_);
+      YYASSERT (sizeof (T) <= S);
+      yytypeid_ = & typeid (T);
+      return *new (yyas_<T> ()) T (t);
+    }
+
+    /// Accessor to a built \a T.
+    template <typename T>
+    T&
+    as ()
+    {
+      YYASSERT (*yytypeid_ == typeid (T));
+      YYASSERT (sizeof (T) <= S);
+      return *yyas_<T> ();
+    }
+
+    /// Const accessor to a built \a T (for %printer).
+    template <typename T>
+    const T&
+    as () const
+    {
+      YYASSERT (*yytypeid_ == typeid (T));
+      YYASSERT (sizeof (T) <= S);
+      return *yyas_<T> ();
+    }
+
+    /// Swap the content with \a other, of same type.
+    ///
+    /// Both variants must be built beforehand, because swapping the actual
+    /// data requires reading it (with as()), and this is not possible on
+    /// unconstructed variants: it would require some dynamic testing, which
+    /// should not be the variant's responsability.
+    /// Swapping between built and (possibly) non-built is done with
+    /// variant::move ().
+    template <typename T>
+    void
+    swap (self_type& other)
+    {
+      YYASSERT (yytypeid_);
+      YYASSERT (*yytypeid_ == *other.yytypeid_);
+      std::swap (as<T> (), other.as<T> ());
+    }
+
+    /// Move the content of \a other to this.
+    ///
+    /// Destroys \a other.
+    template <typename T>
+    void
+    move (self_type& other)
+    {
+      build<T> ();
+      swap<T> (other);
+      other.destroy<T> ();
+    }
+
+    /// Copy the content of \a other to this.
+    template <typename T>
+    void
+    copy (const self_type& other)
+    {
+      build<T> (other.as<T> ());
+    }
+
+    /// Destroy the stored \a T.
+    template <typename T>
+    void
+    destroy ()
+    {
+      as<T> ().~T ();
+      yytypeid_ = YY_NULLPTR;
+    }
+
+  private:
+    /// Prohibit blind copies.
+    self_type& operator=(const self_type&);
+    variant (const self_type&);
+
+    /// Accessor to raw memory as \a T.
+    template <typename T>
+    T*
+    yyas_ ()
+    {
+      void *yyp = yybuffer_.yyraw;
+      return static_cast<T*> (yyp);
+     }
+
+    /// Const accessor to raw memory as \a T.
+    template <typename T>
+    const T*
+    yyas_ () const
+    {
+      const void *yyp = yybuffer_.yyraw;
+      return static_cast<const T*> (yyp);
+     }
+
+    union
+    {
+      /// Strongest alignment constraints.
+      long double yyalign_me;
+      /// A buffer large enough to store any of the semantic values.
+      char yyraw[S];
+    } yybuffer_;
+
+    /// Whether the content is built: if defined, the name of the stored type.
+    const std::type_info *yytypeid_;
+  };
+
+
+  /// A Bison parser.
+  class D4FunctionParser
+  {
+  public:
+#ifndef YYSTYPE
+    /// An auxiliary type to compute the largest semantic type.
+    union union_type
+    {
+      // "function name"
+      // fname
+      char dummy1[sizeof(D4Function)];
+
+      // "argument"
+      // "function"
+      // "variable or constant"
+      // "array constant"
+      // function
+      // arg
+      // variable_or_constant
+      // array_constant
+      char dummy2[sizeof(D4RValue*)];
+
+      // "functions"
+      // "arguments"
+      // functions
+      // args
+      char dummy3[sizeof(D4RValueList*)];
+
+      // "word"
+      // "string"
+      // id
+      // group
+      // path
+      // name
+      char dummy4[sizeof(std::string)];
+
+      // "fast byte arg list"
+      // fast_byte_arg_list
+      char dummy5[sizeof(std::vector<dods_byte>*)];
+
+      // "fast float32 arg list"
+      // fast_float32_arg_list
+      char dummy6[sizeof(std::vector<dods_float32>*)];
+
+      // "fast float64 arg list"
+      // fast_float64_arg_list
+      char dummy7[sizeof(std::vector<dods_float64>*)];
+
+      // "fast int16 arg list"
+      // fast_int16_arg_list
+      char dummy8[sizeof(std::vector<dods_int16>*)];
+
+      // "fast int32 arg list"
+      // fast_int32_arg_list
+      char dummy9[sizeof(std::vector<dods_int32>*)];
+
+      // "fast int64 arg list"
+      // fast_int64_arg_list
+      char dummy10[sizeof(std::vector<dods_int64>*)];
+
+      // "fast int8 arg list"
+      // fast_int8_arg_list
+      char dummy11[sizeof(std::vector<dods_int8>*)];
+
+      // "fast uint16 arg list"
+      // fast_uint16_arg_list
+      char dummy12[sizeof(std::vector<dods_uint16>*)];
+
+      // "fast uint32 arg list"
+      // fast_uint32_arg_list
+      char dummy13[sizeof(std::vector<dods_uint32>*)];
+
+      // "fast uint64 arg list"
+      // fast_uint64_arg_list
+      char dummy14[sizeof(std::vector<dods_uint64>*)];
+};
+
+    /// Symbol semantic values.
+    typedef variant<sizeof(union_type)> semantic_type;
+#else
+    typedef YYSTYPE semantic_type;
+#endif
+    /// Symbol locations.
+    typedef location location_type;
+
+    /// Syntax errors thrown from user actions.
+    struct syntax_error : std::runtime_error
+    {
+      syntax_error (const location_type& l, const std::string& m);
+      location_type location;
+    };
+
+    /// Tokens.
+    struct token
+    {
+      enum yytokentype
+      {
+        END = 0,
+        WORD = 275,
+        STRING = 276,
+        SEMICOLON = 277,
+        COLON = 278,
+        LPAREN = 279,
+        RPAREN = 280,
+        COMMA = 281,
+        GROUP_SEP = 282,
+        PATH_SEP = 283,
+        DOLLAR_BYTE = 284,
+        DOLLAR_UINT8 = 285,
+        DOLLAR_INT8 = 286,
+        DOLLAR_UINT16 = 287,
+        DOLLAR_INT16 = 288,
+        DOLLAR_UINT32 = 289,
+        DOLLAR_INT32 = 290,
+        DOLLAR_UINT64 = 291,
+        DOLLAR_INT64 = 292,
+        DOLLAR_FLOAT32 = 293,
+        DOLLAR_FLOAT64 = 294
+      };
+    };
+
+    /// (External) token type, as returned by yylex.
+    typedef token::yytokentype token_type;
+
+    /// Symbol type: an internal symbol number.
+    typedef int symbol_number_type;
+
+    /// The symbol type number to denote an empty symbol.
+    enum { empty_symbol = -2 };
+
+    /// Internal symbol number for tokens (subsumed by symbol_number_type).
+    typedef unsigned char token_number_type;
+
+    /// A complete symbol.
+    ///
+    /// Expects its Base type to provide access to the symbol type
+    /// via type_get().
+    ///
+    /// Provide access to semantic value and location.
+    template <typename Base>
+    struct basic_symbol : Base
+    {
+      /// Alias to Base.
+      typedef Base super_type;
+
+      /// Default constructor.
+      basic_symbol ();
+
+      /// Copy constructor.
+      basic_symbol (const basic_symbol& other);
+
+      /// Constructor for valueless symbols, and symbols from each type.
+
+  basic_symbol (typename Base::kind_type t, const location_type& l);
+
+  basic_symbol (typename Base::kind_type t, const D4Function v, const location_type& l);
+
+  basic_symbol (typename Base::kind_type t, const D4RValue* v, const location_type& l);
+
+  basic_symbol (typename Base::kind_type t, const D4RValueList* v, const location_type& l);
+
+  basic_symbol (typename Base::kind_type t, const std::string v, const location_type& l);
+
+  basic_symbol (typename Base::kind_type t, const std::vector<dods_byte>* v, const location_type& l);
+
+  basic_symbol (typename Base::kind_type t, const std::vector<dods_float32>* v, const location_type& l);
+
+  basic_symbol (typename Base::kind_type t, const std::vector<dods_float64>* v, const location_type& l);
+
+  basic_symbol (typename Base::kind_type t, const std::vector<dods_int16>* v, const location_type& l);
+
+  basic_symbol (typename Base::kind_type t, const std::vector<dods_int32>* v, const location_type& l);
+
+  basic_symbol (typename Base::kind_type t, const std::vector<dods_int64>* v, const location_type& l);
+
+  basic_symbol (typename Base::kind_type t, const std::vector<dods_int8>* v, const location_type& l);
+
+  basic_symbol (typename Base::kind_type t, const std::vector<dods_uint16>* v, const location_type& l);
+
+  basic_symbol (typename Base::kind_type t, const std::vector<dods_uint32>* v, const location_type& l);
+
+  basic_symbol (typename Base::kind_type t, const std::vector<dods_uint64>* v, const location_type& l);
+
+
+      /// Constructor for symbols with semantic value.
+      basic_symbol (typename Base::kind_type t,
+                    const semantic_type& v,
+                    const location_type& l);
+
+      /// Destroy the symbol.
+      ~basic_symbol ();
+
+      /// Destroy contents, and record that is empty.
+      void clear ();
+
+      /// Whether empty.
+      bool empty () const;
+
+      /// Destructive move, \a s is emptied into this.
+      void move (basic_symbol& s);
+
+      /// The semantic value.
+      semantic_type value;
+
+      /// The location.
+      location_type location;
+
+    private:
+      /// Assignment operator.
+      basic_symbol& operator= (const basic_symbol& other);
+    };
+
+    /// Type access provider for token (enum) based symbols.
+    struct by_type
+    {
+      /// Default constructor.
+      by_type ();
+
+      /// Copy constructor.
+      by_type (const by_type& other);
+
+      /// The symbol type as needed by the constructor.
+      typedef token_type kind_type;
+
+      /// Constructor from (external) token numbers.
+      by_type (kind_type t);
+
+      /// Record that this symbol is empty.
+      void clear ();
+
+      /// Steal the symbol type from \a that.
+      void move (by_type& that);
+
+      /// The (internal) type number (corresponding to \a type).
+      /// \a empty when empty.
+      symbol_number_type type_get () const;
+
+      /// The token.
+      token_type token () const;
+
+      /// The symbol type.
+      /// \a empty_symbol when empty.
+      /// An int, not token_number_type, to be able to store empty_symbol.
+      int type;
+    };
+
+    /// "External" symbols: returned by the scanner.
+    typedef basic_symbol<by_type> symbol_type;
+
+    // Symbol constructors declarations.
+    static inline
+    symbol_type
+    make_END (const location_type& l);
+
+    static inline
+    symbol_type
+    make_WORD (const std::string& v, const location_type& l);
+
+    static inline
+    symbol_type
+    make_STRING (const std::string& v, const location_type& l);
+
+    static inline
+    symbol_type
+    make_SEMICOLON (const location_type& l);
+
+    static inline
+    symbol_type
+    make_COLON (const location_type& l);
+
+    static inline
+    symbol_type
+    make_LPAREN (const location_type& l);
+
+    static inline
+    symbol_type
+    make_RPAREN (const location_type& l);
+
+    static inline
+    symbol_type
+    make_COMMA (const location_type& l);
+
+    static inline
+    symbol_type
+    make_GROUP_SEP (const location_type& l);
+
+    static inline
+    symbol_type
+    make_PATH_SEP (const location_type& l);
+
+    static inline
+    symbol_type
+    make_DOLLAR_BYTE (const location_type& l);
+
+    static inline
+    symbol_type
+    make_DOLLAR_UINT8 (const location_type& l);
+
+    static inline
+    symbol_type
+    make_DOLLAR_INT8 (const location_type& l);
+
+    static inline
+    symbol_type
+    make_DOLLAR_UINT16 (const location_type& l);
+
+    static inline
+    symbol_type
+    make_DOLLAR_INT16 (const location_type& l);
+
+    static inline
+    symbol_type
+    make_DOLLAR_UINT32 (const location_type& l);
+
+    static inline
+    symbol_type
+    make_DOLLAR_INT32 (const location_type& l);
+
+    static inline
+    symbol_type
+    make_DOLLAR_UINT64 (const location_type& l);
+
+    static inline
+    symbol_type
+    make_DOLLAR_INT64 (const location_type& l);
+
+    static inline
+    symbol_type
+    make_DOLLAR_FLOAT32 (const location_type& l);
+
+    static inline
+    symbol_type
+    make_DOLLAR_FLOAT64 (const location_type& l);
+
+
+    /// Build a parser object.
+    D4FunctionParser (D4FunctionScanner  &scanner_yyarg, D4FunctionEvaluator  &evaluator_yyarg);
+    virtual ~D4FunctionParser ();
+
+    /// Parse.
+    /// \returns  0 iff parsing succeeded.
+    virtual int parse ();
+
+#if YYDEBUG
+    /// The current debugging stream.
+    std::ostream& debug_stream () const YY_ATTRIBUTE_PURE;
+    /// Set the current debugging stream.
+    void set_debug_stream (std::ostream &);
+
+    /// Type for debugging levels.
+    typedef int debug_level_type;
+    /// The current debugging level.
+    debug_level_type debug_level () const YY_ATTRIBUTE_PURE;
+    /// Set the current debugging level.
+    void set_debug_level (debug_level_type l);
+#endif
+
+    /// Report a syntax error.
+    /// \param loc    where the syntax error is found.
+    /// \param msg    a description of the syntax error.
+    virtual void error (const location_type& loc, const std::string& msg);
+
+    /// Report a syntax error.
+    void error (const syntax_error& err);
+
+  private:
+    /// This class is not copyable.
+    D4FunctionParser (const D4FunctionParser&);
+    D4FunctionParser& operator= (const D4FunctionParser&);
+
+    /// State numbers.
+    typedef int state_type;
+
+    /// Generate an error message.
+    /// \param yystate   the state where the error occurred.
+    /// \param yyla      the lookahead token.
+    virtual std::string yysyntax_error_ (state_type yystate,
+                                         const symbol_type& yyla) const;
+
+    /// Compute post-reduction state.
+    /// \param yystate   the current state
+    /// \param yysym     the nonterminal to push on the stack
+    state_type yy_lr_goto_state_ (state_type yystate, int yysym);
+
+    /// Whether the given \c yypact_ value indicates a defaulted state.
+    /// \param yyvalue   the value to check
+    static bool yy_pact_value_is_default_ (int yyvalue);
+
+    /// Whether the given \c yytable_ value indicates a syntax error.
+    /// \param yyvalue   the value to check
+    static bool yy_table_value_is_error_ (int yyvalue);
+
+    static const signed char yypact_ninf_;
+    static const signed char yytable_ninf_;
+
+    /// Convert a scanner token number \a t to a symbol number.
+    static token_number_type yytranslate_ (int t);
+
+    // Tables.
+  // YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+  // STATE-NUM.
+  static const signed char yypact_[];
+
+  // YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
+  // Performed when YYTABLE does not specify something else to do.  Zero
+  // means the default is an error.
+  static const unsigned char yydefact_[];
+
+  // YYPGOTO[NTERM-NUM].
+  static const signed char yypgoto_[];
+
+  // YYDEFGOTO[NTERM-NUM].
+  static const signed char yydefgoto_[];
+
+  // YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
+  // positive, shift that token.  If negative, reduce the rule whose
+  // number is the opposite.  If YYTABLE_NINF, syntax error.
+  static const short int yytable_[];
+
+  static const signed char yycheck_[];
+
+  // YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+  // symbol of state STATE-NUM.
+  static const unsigned char yystos_[];
+
+  // YYR1[YYN] -- Symbol number of symbol that rule YYN derives.
+  static const unsigned char yyr1_[];
+
+  // YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.
+  static const unsigned char yyr2_[];
+
+
+    /// Convert the symbol name \a n to a form suitable for a diagnostic.
+    static std::string yytnamerr_ (const char *n);
+
+
+    /// For a symbol, its name in clear.
+    static const char* const yytname_[];
+#if YYDEBUG
+  // YYRLINE[YYN] -- Source line where rule number YYN was defined.
+  static const unsigned short int yyrline_[];
+    /// Report on the debug stream that the rule \a r is going to be reduced.
+    virtual void yy_reduce_print_ (int r);
+    /// Print the state stack on the debug stream.
+    virtual void yystack_print_ ();
+
+    // Debugging.
+    int yydebug_;
+    std::ostream* yycdebug_;
+
+    /// \brief Display a symbol type, value and location.
+    /// \param yyo    The output stream.
+    /// \param yysym  The symbol.
+    template <typename Base>
+    void yy_print_ (std::ostream& yyo, const basic_symbol<Base>& yysym) const;
+#endif
+
+    /// \brief Reclaim the memory associated to a symbol.
+    /// \param yymsg     Why this token is reclaimed.
+    ///                  If null, print nothing.
+    /// \param yysym     The symbol.
+    template <typename Base>
+    void yy_destroy_ (const char* yymsg, basic_symbol<Base>& yysym) const;
+
+  private:
+    /// Type access provider for state based symbols.
+    struct by_state
+    {
+      /// Default constructor.
+      by_state ();
+
+      /// The symbol type as needed by the constructor.
+      typedef state_type kind_type;
+
+      /// Constructor.
+      by_state (kind_type s);
+
+      /// Copy constructor.
+      by_state (const by_state& other);
+
+      /// Record that this symbol is empty.
+      void clear ();
+
+      /// Steal the symbol type from \a that.
+      void move (by_state& that);
+
+      /// The (internal) type number (corresponding to \a state).
+      /// \a empty_symbol when empty.
+      symbol_number_type type_get () const;
+
+      /// The state number used to denote an empty symbol.
+      enum { empty_state = -1 };
+
+      /// The state.
+      /// \a empty when empty.
+      state_type state;
+    };
+
+    /// "Internal" symbol: element of the stack.
+    struct stack_symbol_type : basic_symbol<by_state>
+    {
+      /// Superclass.
+      typedef basic_symbol<by_state> super_type;
+      /// Construct an empty symbol.
+      stack_symbol_type ();
+      /// Steal the contents from \a sym to build this.
+      stack_symbol_type (state_type s, symbol_type& sym);
+      /// Assignment, needed by push_back.
+      stack_symbol_type& operator= (const stack_symbol_type& that);
+    };
+
+    /// Stack type.
+    typedef stack<stack_symbol_type> stack_type;
+
+    /// The stack.
+    stack_type yystack_;
+
+    /// Push a new state on the stack.
+    /// \param m    a debug message to display
+    ///             if null, no trace is output.
+    /// \param s    the symbol
+    /// \warning the contents of \a s.value is stolen.
+    void yypush_ (const char* m, stack_symbol_type& s);
+
+    /// Push a new look ahead token on the state on the stack.
+    /// \param m    a debug message to display
+    ///             if null, no trace is output.
+    /// \param s    the state
+    /// \param sym  the symbol (for its value and location).
+    /// \warning the contents of \a s.value is stolen.
+    void yypush_ (const char* m, state_type s, symbol_type& sym);
+
+    /// Pop \a n symbols the three stacks.
+    void yypop_ (unsigned int n = 1);
+
+    /// Constants.
+    enum
+    {
+      yyeof_ = 0,
+      yylast_ = 117,     ///< Last index in yytable_.
+      yynnts_ = 24,  ///< Number of nonterminal symbols.
+      yyfinal_ = 6, ///< Termination state number.
+      yyterror_ = 1,
+      yyerrcode_ = 256,
+      yyntokens_ = 40  ///< Number of tokens.
+    };
+
+
+    // User arguments.
+    D4FunctionScanner  &scanner;
+    D4FunctionEvaluator  &evaluator;
+  };
+
+
+#line 34 "d4_function_parser.yy" // lalr1.cc:392
+} // libdap
+#line 848 "d4_function_parser.tab.hh" // lalr1.cc:392
+
+
+
+
+#endif // !YY_YY_D4_FUNCTION_PARSER_TAB_HH_INCLUDED
diff --git a/d4_function/d4_function_parser.yy b/d4_function/d4_function_parser.yy
new file mode 100644
index 0000000..7e84b49
--- /dev/null
+++ b/d4_function/d4_function_parser.yy
@@ -0,0 +1,494 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2014 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+// 
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+// 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+%skeleton "lalr1.cc" /* -*- C++ -*- */
+%require "2.5"
+%defines
+
+// The d4_function_parser.tab.cc and .hh files define and declare this class
+%define parser_class_name {D4FunctionParser}
+
+// D4FunctionParser is in this namespace
+%define api.namespace {libdap}
+
+%define parse.trace
+%define parse.error verbose
+%define parse.assert
+
+// Could not get this to work with a C++ scanner built by flex. 8/10/13 jhrg
+// %define api.token.constructor
+%define api.value.type variant
+
+// Because the code uses the C++ mode of flex, we don't use this. 8/8/13 jhrg
+// %define api.prefix { d4_function_ }
+
+%code requires {
+
+#include "D4FunctionEvaluator.h"
+#include "D4RValue.h"
+#include "dods-datatypes.h"
+
+namespace libdap {
+    class D4FunctionScanner;
+}
+
+}
+
+// Pass both the scanner and parser objects to both the automatically generated
+// parser and scanner.
+%lex-param   { D4FunctionScanner  &scanner  }
+%parse-param { D4FunctionScanner  &scanner  }
+
+%lex-param   { D4FunctionEvaluator  &evaluator  }
+%parse-param { D4FunctionEvaluator  &evaluator  }
+
+%locations
+%initial-action
+{
+    // Initialize the initial location. This is printed when the parser builds
+    // its own error messages - when the parse fails as opposed to when the 
+    // function(s) name(s) a missing variable, ...
+
+    @$.initialize (evaluator.expression());
+};
+
+%code {
+    #include "BaseType.h"
+    #include "DMR.h"
+    #include "D4RValue.h"
+    #include "ServerFunctionsList.h"
+   
+    #include "parser-util.h"
+
+    /* include for all driver functions */
+    #include "D4FunctionEvaluator.h"
+
+    using namespace libdap ;
+    
+    /* this is silly, but I can't figure out a way around it */
+    static int yylex(libdap::D4FunctionParser::semantic_type *yylval,
+                     libdap::location *loc,
+                     libdap::D4FunctionScanner  &scanner,
+                     libdap::D4FunctionEvaluator   &evaluator);
+}
+
+%type <D4RValueList*> functions "functions"
+%type <D4RValueList*> args "arguments"
+
+%type <D4RValue*> arg "argument"
+%type <D4RValue*> function "function"
+
+%type <D4Function> fname "function name"
+%type <D4RValue*> variable_or_constant "variable or constant"
+%type <D4RValue*> array_constant "array constant"
+
+%type <std::vector<dods_byte>*> fast_byte_arg_list "fast byte arg list"
+%type <std::vector<dods_int8>*> fast_int8_arg_list "fast int8 arg list"
+%type <std::vector<dods_uint16>*> fast_uint16_arg_list "fast uint16 arg list"
+%type <std::vector<dods_int16>*> fast_int16_arg_list "fast int16 arg list"
+%type <std::vector<dods_uint32>*> fast_uint32_arg_list "fast uint32 arg list"
+%type <std::vector<dods_int32>*> fast_int32_arg_list "fast int32 arg list"
+%type <std::vector<dods_uint64>*> fast_uint64_arg_list "fast uint64 arg list"
+%type <std::vector<dods_int64>*> fast_int64_arg_list "fast int64 arg list"
+%type <std::vector<dods_float32>*> fast_float32_arg_list "fast float32 arg list"
+%type <std::vector<dods_float64>*> fast_float64_arg_list "fast float64 arg list"
+
+%type <std::string> id path group name
+
+// The strings used in the token definitions are used for error messages
+%token <std::string> WORD "word"
+%token <std::string> STRING "string"
+
+%token 
+    END  0  "end of file"
+    
+    SEMICOLON ";"
+    COLON ":"
+
+    LPAREN "("
+    RPAREN ")"
+    
+    COMMA ","
+
+    GROUP_SEP "/"
+    PATH_SEP "."
+    
+    DOLLAR_BYTE "$Byte"
+    DOLLAR_UINT8 "$UInt8"
+    DOLLAR_INT8 "$Int8"
+    DOLLAR_UINT16 "$UInt16"
+    DOLLAR_INT16 "$Int16"
+    DOLLAR_UINT32 "$UInt32"
+    DOLLAR_INT32 "$Int32"
+    DOLLAR_UINT64 "$UInt64"
+    DOLLAR_INT64 "$Int64"
+    DOLLAR_FLOAT32 "$Float32"
+    DOLLAR_FLOAT64 "$Float64"
+;
+
+%%
+
+%start program;
+
+program : functions 
+{ 
+    evaluator.set_result($1); 
+}
+;
+
+functions : function 
+{
+    $$ = new D4RValueList($1); 
+}
+| functions ";" function 
+{ 
+    $1->add_rvalue($3);
+    $$ = $1; 
+}
+;
+                    
+function : fname "(" args ")" 
+{ 
+    $$ = new D4RValue($1, $3); // Build a D4RValue from a D4Function pointer and a D4RValueList 
+} 
+;
+
+fname: WORD 
+{ 
+    D4Function f;
+    if (!evaluator.sf_list()->find_function($1, &f)) {
+        // ...cloud use @1.{first,last}_column in these error messages.
+        throw Error(malformed_expr, "'" + $1 + "' is not a registered DAP4 server function.");
+    }
+
+    $$ = f;
+}        
+;
+
+args: arg
+{ 
+    $$ = new D4RValueList($1); // build a D4RValueList from the D4RValue
+} 
+| args "," arg 
+{ 
+    $1->add_rvalue($3);
+    $$ = $1; // Append the D4RValue ($3) to the D4RValueList ($1), then return
+} 
+;
+
+arg: function
+{
+    $$ = $1;
+}
+| variable_or_constant
+{
+    $$ = $1;
+}
+| array_constant 
+{
+    $$ = $1;
+}
+;
+
+variable_or_constant : id
+{
+    D4RValue *rvalue = evaluator.build_rvalue($1);
+    if (!rvalue) {
+        throw Error(malformed_expr, "'" + $1 + "' is not a variable, number or string.");
+    }
+    
+    $$ = rvalue;
+}
+;
+  
+array_constant : 
+DOLLAR_BYTE "(" arg_length_hint ":" fast_byte_arg_list ")"
+{
+    $$ = new D4RValue(*($5));
+    delete $5;
+}
+|
+DOLLAR_UINT8 "(" arg_length_hint ":" fast_byte_arg_list ")"
+{
+    $$ = new D4RValue(*($5));
+    delete $5;
+}
+|
+DOLLAR_INT8 "(" arg_length_hint ":" fast_int8_arg_list ")"
+{
+    $$ = new D4RValue(*($5));
+    delete $5;
+}
+|
+DOLLAR_UINT16 "(" arg_length_hint ":" fast_uint16_arg_list ")"
+{
+    $$ = new D4RValue(*($5));
+    delete $5;
+}
+|
+DOLLAR_INT16 "(" arg_length_hint ":" fast_int16_arg_list ")"
+{
+    $$ = new D4RValue(*($5));
+    delete $5;
+}
+|
+DOLLAR_UINT32 "(" arg_length_hint ":" fast_uint32_arg_list ")"
+{
+    $$ = new D4RValue(*($5));
+    delete $5;
+}
+|
+DOLLAR_INT32 "(" arg_length_hint ":" fast_int32_arg_list ")"
+{
+    $$ = new D4RValue(*($5));
+    delete $5;
+}
+|
+DOLLAR_UINT64 "(" arg_length_hint ":" fast_uint64_arg_list ")"
+{
+    $$ = new D4RValue(*($5));
+    delete $5;
+}
+|
+DOLLAR_INT64 "(" arg_length_hint ":" fast_int64_arg_list ")"
+{
+    $$ = new D4RValue(*($5));
+    delete $5;
+}
+|
+DOLLAR_FLOAT32 "(" arg_length_hint ":" fast_float32_arg_list ")"
+{
+    $$ = new D4RValue(*($5));
+    delete $5;
+}
+|
+DOLLAR_FLOAT64 "(" arg_length_hint ":" fast_float64_arg_list ")"
+{
+    $$ = new D4RValue(*($5));
+    delete $5;
+}
+;
+
+/* Here the arg length hint is stored in the eval class so it can be used by the 
+   method that allocates the vector. The value is passed to vector::reserve().
+   This rule is run for it's side-effect only. This is also used to track the 
+   current arg number so that the hint can be used. */
+   
+arg_length_hint : WORD
+{
+    evaluator.set_arg_length_hint(get_uint64($1.c_str()));
+}
+;
+
+fast_byte_arg_list: WORD
+{
+    $$ = evaluator.init_arg_list(dods_byte(strtol($1.c_str(), 0, 0)));
+}
+| fast_byte_arg_list "," WORD
+{
+    $1->push_back(strtol($3.c_str(), 0, 0));
+    $$ = $1;
+}
+;
+
+fast_int8_arg_list: WORD
+{
+    $$ = evaluator.init_arg_list(dods_int8(strtol($1.c_str(), 0, 0)));
+}
+| fast_int8_arg_list "," WORD
+{
+    $1->push_back(strtol($3.c_str(), 0, 0));
+    $$ = $1;
+}
+;
+
+fast_uint16_arg_list: WORD
+{
+    $$ = evaluator.init_arg_list(dods_uint16(strtol($1.c_str(), 0, 0)));
+}
+| fast_uint16_arg_list "," WORD
+{
+    $1->push_back(strtol($3.c_str(), 0, 0));
+    $$ = $1;
+}
+;
+
+fast_int16_arg_list: WORD
+{
+    $$ = evaluator.init_arg_list(dods_int16(strtol($1.c_str(), 0, 0)));
+}
+| fast_int16_arg_list "," WORD
+{
+    $1->push_back(strtol($3.c_str(), 0, 0));
+    $$ = $1;
+}
+;
+
+fast_uint32_arg_list: WORD
+{
+    $$ = evaluator.init_arg_list(dods_uint32(strtoul($1.c_str(), 0, 0)));
+}
+| fast_uint32_arg_list "," WORD
+{
+    $1->push_back(strtoul($3.c_str(), 0, 0));
+    $$ = $1;
+}
+;
+fast_int32_arg_list: WORD
+{
+    $$ = evaluator.init_arg_list(dods_int32(strtol($1.c_str(), 0, 0)));
+}
+| fast_int32_arg_list "," WORD
+{
+    $1->push_back(strtol($3.c_str(), 0, 0));
+    $$ = $1;
+}
+;
+
+fast_uint64_arg_list: WORD
+{
+    $$ = evaluator.init_arg_list(dods_uint64(strtoull($1.c_str(), 0, 0)));
+}
+| fast_uint64_arg_list "," WORD
+{
+    $1->push_back(strtoull($3.c_str(), 0, 0));
+    $$ = $1;
+}
+;
+
+fast_int64_arg_list: WORD
+{
+    $$ = evaluator.init_arg_list(dods_int64(strtoll($1.c_str(), 0, 0)));
+}
+| fast_int64_arg_list "," WORD
+{
+    $1->push_back(strtoll($3.c_str(), 0, 0));
+    $$ = $1;
+}
+;
+
+// I'm using path for the $Float constants so that tokens with dots will 
+// parse. I could add a FLOAT token, and I might have to do that later on
+// when filters are added to the CE, but this will work for now.
+fast_float32_arg_list: path
+{
+    $$ = evaluator.init_arg_list(dods_float32(strtof($1.c_str(), 0)));
+}
+| fast_float32_arg_list "," path
+{
+    $1->push_back(strtof($3.c_str(), 0));
+    $$ = $1;
+}
+;
+
+fast_float64_arg_list: path
+{
+    $$ = evaluator.init_arg_list(dods_float64(strtod($1.c_str(), 0)));
+}
+| fast_float64_arg_list "," path
+{
+    $1->push_back(strtod($3.c_str(), 0));
+    $$ = $1;
+}
+;
+
+id : path
+{
+    $$ = $1;
+}
+| "/" path
+{
+    $$.append("/");
+    $$.append($2);
+}
+| group "/" path
+{
+    $1.append("/");
+    $1.append($3);
+    $$ = $1;
+}
+;
+
+group : "/" name
+{
+    $$.append("/");
+    $$.append($2);
+}
+| group "/" name
+{
+    $1.append(".");
+    $1.append($3);
+    $$ = $1;
+}
+;
+
+path : name 
+{
+    $$ = $1;
+}
+| path "." name
+{
+    $1.append(".");
+    $1.append($3);
+    $$ = $1;
+}
+;
+
+// 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
+name : WORD 
+{
+    $$=$1;
+}
+| STRING 
+{
+    $$=$1;
+}
+;
+
+%%
+
+// Forward the error to the driver for handling. The location parameter
+// provides the line number and character position of the error.
+void
+libdap::D4FunctionParser::error(const location_type &l, const std::string &m)
+{
+    evaluator.error(l, m);
+}
+
+/* include for access to scanner.yylex */
+#include "D4FunctionScanner.h"
+
+static int yylex(libdap::D4FunctionParser::semantic_type *yylval,
+                 libdap::location *loc,
+                 libdap::D4FunctionScanner &scanner,
+                 libdap::D4FunctionEvaluator &evaluator)
+{
+    if (evaluator.trace_scanning())
+        scanner.set_debug(true);
+    
+    return( scanner.yylex(yylval, loc) );
+}
diff --git a/d4_function/d4_function_scanner.ll b/d4_function/d4_function_scanner.ll
new file mode 100644
index 0000000..7da6733
--- /dev/null
+++ b/d4_function/d4_function_scanner.ll
@@ -0,0 +1,189 @@
+
+/*
+ -*- mode: c++; c-basic-offset:4 -*-
+
+ This file is part of libdap, A C++ implementation of the OPeNDAP Data
+ Access Protocol.
+
+ Copyright (c) 2014 OPeNDAP, Inc.
+ Author: James Gallagher <jgallagher@opendap.org>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+ 
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+ 
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+ You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+*/ 
+
+%{ /* -*- C++ -*- */
+
+//#include "config.h"
+
+#include <string>
+#include "Error.h"
+
+#include "D4FunctionScanner.h"
+
+/* typedef to make the returns for the tokens shorter */
+
+/* NB: It would be best to use the same scanner (and maybe parser) for
+   both the D4 CE and Function parameters, but for the initial version 
+   far less complexity is require by the Function expression scanner
+   (since the initial version will just support variables, constants, 
+   functions and the $<type> array special form) and not function arguments
+   that are general expressions (like array slicing and/or filters).
+   
+   This comment is here because this is the first place where there is 
+   coupling between the CE parser and its scanner. I'm not sure, however,
+   if one string can be parsed by two parsers if they are using two scanners,
+   so extending the Function parser to allow function args to be any CE 
+   clause may mean some more serious work with the parsers.
+   
+   jhrg 3/10/14 */
+typedef libdap::D4FunctionParser::token token;
+
+/* This was added because of some notes on the net about compiler version
+   issues. I don't know if it's needed when using the C++ mode of flex. */
+#undef yywrap
+#define yywrap() 1
+
+/* define yyterminate as this instead of NULL */
+#define yyterminate() return(token::END)
+
+#define YY_FATAL_ERROR(msg) {\
+    throw(libdap::Error(malformed_expr, std::string("Error scanning function expression text: ") + std::string(msg))); \
+}
+
+%}
+
+%option c++
+%option yyclass="D4FunctionScanner"
+
+/* Use this if several scanners are needed. This will cause flex to
+   #define yyFlexLexer to be <prefix>FlexLexer (the yyFlexLexer is defined
+   in lex.<prefix>.cc. jhrg 8/8/13 */
+%option prefix="d4_function"
+
+/* These two options turn on line counting - useful for error messages - 
+   and debugging, respectively. When debugging is on, it's possible to see
+   which scanner rules are used at which points in the input. */
+%option yylineno
+%option debug
+
+/* Do not output the default rule (where any unmatched input is echoed to 
+   stdout). When set, nodefault will cause the scanner to exit on an error. */
+%option nodefault
+/* noyywrap makes the scanner assume that EOF/EOS is the end of the input.
+   If this is not set, the scanner will assume there are more files to 
+   scan. */ 
+%option noyywrap
+%option nounput
+/* When set, warn prints a message when the default rule can be matched
+   but nodefault is given (among other warnings). */
+%option warn
+
+%option batch
+
+%x quote
+
+/* This pattern is slightly different from the one used by the CE scanner
+   because it allows a WORD to start with a '#' so that the #<type> 
+   array constant syntax can be used in functions. Otherwise, a WORD must
+   be able to contain this hideous mix of characters because a variable 
+   can. jhrg 3/10/14 */
+WORD    [-+a-zA-Z0-9_%*\\~@!#][-+a-zA-Z0-9_%*\\~@!#]* 
+
+/* I added these tokens because floating point values may contain dots and
+   added a '.' to WORD will break the parsing of paths (or make for some 
+   fairly obscure code - where $Float32() takes tokens that match 'path'.
+   Since we have a separate scanner for the function expressions, might as
+   well add a FLOAT token... jhg 3/17/14 
+FLOAT   [-+eE.0-9][-+eE.0-9]*
+*/
+
+%{
+// Code run each time a pattern is matched
+#define YY_USER_ACTION loc->columns(yyleng);
+%}
+
+%%
+
+%{
+// Code run each time yylex is called
+loc->step();
+%}
+
+","		return token::COMMA;
+";"		return token::SEMICOLON;
+":"     return token::COLON;
+
+"("     return token::LPAREN;
+")"     return token::RPAREN;
+
+"/"     return token::GROUP_SEP;
+"."     return token::PATH_SEP;
+
+"$Byte" return token::DOLLAR_BYTE;
+"$UInt8" return token::DOLLAR_UINT8;
+"$Int8" return token::DOLLAR_INT8;
+"$UInt16" return token::DOLLAR_UINT16;
+"$Int16" return token::DOLLAR_INT16;
+"$UInt32" return token::DOLLAR_UINT32;
+"$Int32" return token::DOLLAR_INT32;
+"$UInt64" return token::DOLLAR_UINT64;
+"$Int64" return token::DOLLAR_INT64;
+"$Float32" return token::DOLLAR_FLOAT32;
+"$Float64" return token::DOLLAR_FLOAT64;
+
+[ \t]+  /* ignore these */
+
+[\r\n]+ /* ignore these */
+
+{WORD}  { yylval->build<std::string>(yytext); return token::WORD; }
+
+<INITIAL><<EOF>> return token::END;
+
+["]    { BEGIN(quote); yymore(); }
+
+<quote>[^"\\]*  yymore(); /* Anything that's not a double quote or a backslash */
+
+<quote>[\\]["]	yymore(); /* This matches the escaped double quote (\") */
+
+<quote>[\\]{2}  yymore(); /* This matches an escaped escape (\\) */
+
+<quote>[\\]{1}  {
+                    BEGIN(INITIAL);
+                    if (yytext) {
+                        YY_FATAL_ERROR("Inside a string, backslash (\\) can escape a double quote or must itself be escaped (\\\\).");
+                    }
+                }
+
+<quote>["]  { 
+                /* An unescaped double quote in the 'quote' state indicates the end of the string */
+                BEGIN(INITIAL); 
+                yylval->build<std::string>(yytext); 
+                return token::STRING;
+            }
+
+<quote><<EOF>>	{
+                  BEGIN(INITIAL);   /* resetting the state is needed for reentrant parsers */
+                  YY_FATAL_ERROR("Unterminated quote");
+                }
+
+.   {
+        BEGIN(INITIAL);
+        if (yytext) {
+            YY_FATAL_ERROR("Characters found in the input were not recognized.");
+        }
+    }
+%%
diff --git a/d4_function/location.hh b/d4_function/location.hh
new file mode 100644
index 0000000..ca6215a
--- /dev/null
+++ b/d4_function/location.hh
@@ -0,0 +1,192 @@
+// A Bison parser, made by GNU Bison 3.0.4.
+
+// Locations for Bison parsers in C++
+
+// Copyright (C) 2002-2015 Free Software Foundation, Inc.
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+// As a special exception, you may create a larger work that contains
+// part or all of the Bison parser skeleton and distribute that work
+// under terms of your choice, so long as that work isn't itself a
+// parser generator using the skeleton or a modified version thereof
+// as a parser skeleton.  Alternatively, if you modify or redistribute
+// the parser skeleton itself, you may (at your option) remove this
+// special exception, which will cause the skeleton and the resulting
+// Bison output files to be licensed under the GNU General Public
+// License without this special exception.
+
+// This special exception was added by the Free Software Foundation in
+// version 2.2 of Bison.
+
+/**
+ ** \file location.hh
+ ** Define the libdap::location class.
+ */
+
+#ifndef YY_YY_LOCATION_HH_INCLUDED
+# define YY_YY_LOCATION_HH_INCLUDED
+
+# include "position.hh"
+
+#line 34 "d4_function_parser.yy" // location.cc:337
+namespace libdap {
+#line 46 "location.hh" // location.cc:337
+  /// Abstract a location.
+  class location
+  {
+  public:
+
+    /// Construct a location from \a b to \a e.
+    location (const position& b, const position& e)
+      : begin (b)
+      , end (e)
+    {
+    }
+
+    /// Construct a 0-width location in \a p.
+    explicit location (const position& p = position ())
+      : begin (p)
+      , end (p)
+    {
+    }
+
+    /// Construct a 0-width location in \a f, \a l, \a c.
+    explicit location (std::string* f,
+                       unsigned int l = 1u,
+                       unsigned int c = 1u)
+      : begin (f, l, c)
+      , end (f, l, c)
+    {
+    }
+
+
+    /// Initialization.
+    void initialize (std::string* f = YY_NULLPTR,
+                     unsigned int l = 1u,
+                     unsigned int c = 1u)
+    {
+      begin.initialize (f, l, c);
+      end = begin;
+    }
+
+    /** \name Line and Column related manipulators
+     ** \{ */
+  public:
+    /// Reset initial location to final location.
+    void step ()
+    {
+      begin = end;
+    }
+
+    /// Extend the current location to the COUNT next columns.
+    void columns (int count = 1)
+    {
+      end += count;
+    }
+
+    /// Extend the current location to the COUNT next lines.
+    void lines (int count = 1)
+    {
+      end.lines (count);
+    }
+    /** \} */
+
+
+  public:
+    /// Beginning of the located region.
+    position begin;
+    /// End of the located region.
+    position end;
+  };
+
+  /// Join two locations, in place.
+  inline location& operator+= (location& res, const location& end)
+  {
+    res.end = end.end;
+    return res;
+  }
+
+  /// Join two locations.
+  inline location operator+ (location res, const location& end)
+  {
+    return res += end;
+  }
+
+  /// Add \a width columns to the end position, in place.
+  inline location& operator+= (location& res, int width)
+  {
+    res.columns (width);
+    return res;
+  }
+
+  /// Add \a width columns to the end position.
+  inline location operator+ (location res, int width)
+  {
+    return res += width;
+  }
+
+  /// Subtract \a width columns to the end position, in place.
+  inline location& operator-= (location& res, int width)
+  {
+    return res += -width;
+  }
+
+  /// Subtract \a width columns to the end position.
+  inline location operator- (location res, int width)
+  {
+    return res -= width;
+  }
+
+  /// Compare two location objects.
+  inline bool
+  operator== (const location& loc1, const location& loc2)
+  {
+    return loc1.begin == loc2.begin && loc1.end == loc2.end;
+  }
+
+  /// Compare two location objects.
+  inline bool
+  operator!= (const location& loc1, const location& loc2)
+  {
+    return !(loc1 == loc2);
+  }
+
+  /** \brief Intercept output stream redirection.
+   ** \param ostr the destination output stream
+   ** \param loc a reference to the location to redirect
+   **
+   ** Avoid duplicate information.
+   */
+  template <typename YYChar>
+  inline std::basic_ostream<YYChar>&
+  operator<< (std::basic_ostream<YYChar>& ostr, const location& loc)
+  {
+    unsigned int end_col = 0 < loc.end.column ? loc.end.column - 1 : 0;
+    ostr << loc.begin;
+    if (loc.end.filename
+        && (!loc.begin.filename
+            || *loc.begin.filename != *loc.end.filename))
+      ostr << '-' << loc.end.filename << ':' << loc.end.line << '.' << end_col;
+    else if (loc.begin.line < loc.end.line)
+      ostr << '-' << loc.end.line << '.' << end_col;
+    else if (loc.begin.column < end_col)
+      ostr << '-' << end_col;
+    return ostr;
+  }
+
+#line 34 "d4_function_parser.yy" // location.cc:337
+} // libdap
+#line 192 "location.hh" // location.cc:337
+#endif // !YY_YY_LOCATION_HH_INCLUDED
diff --git a/d4_function/position.hh b/d4_function/position.hh
new file mode 100644
index 0000000..123a22b
--- /dev/null
+++ b/d4_function/position.hh
@@ -0,0 +1,180 @@
+// A Bison parser, made by GNU Bison 3.0.4.
+
+// Positions for Bison parsers in C++
+
+// Copyright (C) 2002-2015 Free Software Foundation, Inc.
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+// As a special exception, you may create a larger work that contains
+// part or all of the Bison parser skeleton and distribute that work
+// under terms of your choice, so long as that work isn't itself a
+// parser generator using the skeleton or a modified version thereof
+// as a parser skeleton.  Alternatively, if you modify or redistribute
+// the parser skeleton itself, you may (at your option) remove this
+// special exception, which will cause the skeleton and the resulting
+// Bison output files to be licensed under the GNU General Public
+// License without this special exception.
+
+// This special exception was added by the Free Software Foundation in
+// version 2.2 of Bison.
+
+/**
+ ** \file position.hh
+ ** Define the libdap::position class.
+ */
+
+#ifndef YY_YY_POSITION_HH_INCLUDED
+# define YY_YY_POSITION_HH_INCLUDED
+
+# include <algorithm> // std::max
+# include <iostream>
+# include <string>
+
+# ifndef YY_NULLPTR
+#  if defined __cplusplus && 201103L <= __cplusplus
+#   define YY_NULLPTR nullptr
+#  else
+#   define YY_NULLPTR 0
+#  endif
+# endif
+
+#line 34 "d4_function_parser.yy" // location.cc:337
+namespace libdap {
+#line 56 "position.hh" // location.cc:337
+  /// Abstract a position.
+  class position
+  {
+  public:
+    /// Construct a position.
+    explicit position (std::string* f = YY_NULLPTR,
+                       unsigned int l = 1u,
+                       unsigned int c = 1u)
+      : filename (f)
+      , line (l)
+      , column (c)
+    {
+    }
+
+
+    /// Initialization.
+    void initialize (std::string* fn = YY_NULLPTR,
+                     unsigned int l = 1u,
+                     unsigned int c = 1u)
+    {
+      filename = fn;
+      line = l;
+      column = c;
+    }
+
+    /** \name Line and Column related manipulators
+     ** \{ */
+    /// (line related) Advance to the COUNT next lines.
+    void lines (int count = 1)
+    {
+      if (count)
+        {
+          column = 1u;
+          line = add_ (line, count, 1);
+        }
+    }
+
+    /// (column related) Advance to the COUNT next columns.
+    void columns (int count = 1)
+    {
+      column = add_ (column, count, 1);
+    }
+    /** \} */
+
+    /// File name to which this position refers.
+    std::string* filename;
+    /// Current line number.
+    unsigned int line;
+    /// Current column number.
+    unsigned int column;
+
+  private:
+    /// Compute max(min, lhs+rhs) (provided min <= lhs).
+    static unsigned int add_ (unsigned int lhs, int rhs, unsigned int min)
+    {
+      return (0 < rhs || -static_cast<unsigned int>(rhs) < lhs
+              ? rhs + lhs
+              : min);
+    }
+  };
+
+  /// Add \a width columns, in place.
+  inline position&
+  operator+= (position& res, int width)
+  {
+    res.columns (width);
+    return res;
+  }
+
+  /// Add \a width columns.
+  inline position
+  operator+ (position res, int width)
+  {
+    return res += width;
+  }
+
+  /// Subtract \a width columns, in place.
+  inline position&
+  operator-= (position& res, int width)
+  {
+    return res += -width;
+  }
+
+  /// Subtract \a width columns.
+  inline position
+  operator- (position res, int width)
+  {
+    return res -= width;
+  }
+
+  /// Compare two position objects.
+  inline bool
+  operator== (const position& pos1, const position& pos2)
+  {
+    return (pos1.line == pos2.line
+            && pos1.column == pos2.column
+            && (pos1.filename == pos2.filename
+                || (pos1.filename && pos2.filename
+                    && *pos1.filename == *pos2.filename)));
+  }
+
+  /// Compare two position objects.
+  inline bool
+  operator!= (const position& pos1, const position& pos2)
+  {
+    return !(pos1 == pos2);
+  }
+
+  /** \brief Intercept output stream redirection.
+   ** \param ostr the destination output stream
+   ** \param pos a reference to the position to redirect
+   */
+  template <typename YYChar>
+  inline std::basic_ostream<YYChar>&
+  operator<< (std::basic_ostream<YYChar>& ostr, const position& pos)
+  {
+    if (pos.filename)
+      ostr << *pos.filename << ':';
+    return ostr << pos.line << '.' << pos.column;
+  }
+
+#line 34 "d4_function_parser.yy" // location.cc:337
+} // libdap
+#line 180 "position.hh" // location.cc:337
+#endif // !YY_YY_POSITION_HH_INCLUDED
diff --git a/d4_function/stack.hh b/d4_function/stack.hh
new file mode 100644
index 0000000..1fb476f
--- /dev/null
+++ b/d4_function/stack.hh
@@ -0,0 +1,157 @@
+// A Bison parser, made by GNU Bison 3.0.4.
+
+// Stack handling for Bison parsers in C++
+
+// Copyright (C) 2002-2015 Free Software Foundation, Inc.
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+// As a special exception, you may create a larger work that contains
+// part or all of the Bison parser skeleton and distribute that work
+// under terms of your choice, so long as that work isn't itself a
+// parser generator using the skeleton or a modified version thereof
+// as a parser skeleton.  Alternatively, if you modify or redistribute
+// the parser skeleton itself, you may (at your option) remove this
+// special exception, which will cause the skeleton and the resulting
+// Bison output files to be licensed under the GNU General Public
+// License without this special exception.
+
+// This special exception was added by the Free Software Foundation in
+// version 2.2 of Bison.
+
+/**
+ ** \file stack.hh
+ ** Define the libdap::stack class.
+ */
+
+#ifndef YY_YY_STACK_HH_INCLUDED
+# define YY_YY_STACK_HH_INCLUDED
+
+# include <vector>
+
+#line 34 "d4_function_parser.yy" // stack.hh:151
+namespace libdap {
+#line 46 "stack.hh" // stack.hh:151
+  template <class T, class S = std::vector<T> >
+  class stack
+  {
+  public:
+    // Hide our reversed order.
+    typedef typename S::reverse_iterator iterator;
+    typedef typename S::const_reverse_iterator const_iterator;
+
+    stack ()
+      : seq_ ()
+    {
+      seq_.reserve (200);
+    }
+
+    stack (unsigned int n)
+      : seq_ (n)
+    {}
+
+    inline
+    T&
+    operator[] (unsigned int i)
+    {
+      return seq_[seq_.size () - 1 - i];
+    }
+
+    inline
+    const T&
+    operator[] (unsigned int i) const
+    {
+      return seq_[seq_.size () - 1 - i];
+    }
+
+    /// Steal the contents of \a t.
+    ///
+    /// Close to move-semantics.
+    inline
+    void
+    push (T& t)
+    {
+      seq_.push_back (T());
+      operator[](0).move (t);
+    }
+
+    inline
+    void
+    pop (unsigned int n = 1)
+    {
+      for (; n; --n)
+        seq_.pop_back ();
+    }
+
+    void
+    clear ()
+    {
+      seq_.clear ();
+    }
+
+    inline
+    typename S::size_type
+    size () const
+    {
+      return seq_.size ();
+    }
+
+    inline
+    const_iterator
+    begin () const
+    {
+      return seq_.rbegin ();
+    }
+
+    inline
+    const_iterator
+    end () const
+    {
+      return seq_.rend ();
+    }
+
+  private:
+    stack (const stack&);
+    stack& operator= (const stack&);
+    /// The wrapped container.
+    S seq_;
+  };
+
+  /// Present a slice of the top of a stack.
+  template <class T, class S = stack<T> >
+  class slice
+  {
+  public:
+    slice (const S& stack, unsigned int range)
+      : stack_ (stack)
+      , range_ (range)
+    {}
+
+    inline
+    const T&
+    operator [] (unsigned int i) const
+    {
+      return stack_[range_ - i];
+    }
+
+  private:
+    const S& stack_;
+    unsigned int range_;
+  };
+
+#line 34 "d4_function_parser.yy" // stack.hh:151
+} // libdap
+#line 156 "stack.hh" // stack.hh:151
+
+#endif // !YY_YY_STACK_HH_INCLUDED
diff --git a/dap-config-pkgconfig b/dap-config-pkgconfig
new file mode 100644
index 0000000..a3efb58
--- /dev/null
+++ b/dap-config-pkgconfig
@@ -0,0 +1,86 @@
+#! /bin/sh
+#
+# Borrowed the idea for this script (and some code) from libcurl.
+#
+
+usage()
+{
+    cat <<EOF
+Usage: dap-config [OPTION]
+
+Available values for OPTION include:
+
+  --help      	display this help message and exit
+  --cc        	C compiler
+  --cxx       	C++ compiler
+  --cflags    	pre-processor and compiler flags
+  --libs      	library linking information for libdap (both clients and servers)
+  --server-libs libraries for servers
+  --client-libs libraries for clients
+  --prefix    	OPeNDAP install prefix
+  --version   	Library version
+EOF
+
+    exit $1
+}
+
+if test $# -eq 0; then
+    usage 1
+fi
+
+while test $# -gt 0; do
+    case "$1" in
+    # this deals with options in the style
+    # --option=value and extracts the value part
+    # [not currently used]
+    -*=*) value=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+    *) value= ;;
+    esac
+
+    case "$1" in
+    --help)
+	usage 0
+	;;
+
+    --cc)
+	pkg-config --variable ccompiler libdap
+	;;
+
+    --cxx)
+	pkg-config --variable cppcompiler libdap
+	;;
+
+    --cflags)
+	pkg-config --cflags libdap
+	;;
+
+    --libs)
+       	pkg-config --libs libdapclient libdapserver
+       	;;
+
+    --server-libs)
+       	pkg-config --libs libdapserver
+       	;;
+
+    --client-libs)
+       	pkg-config --libs libdapclient
+       	;;
+
+    --prefix)
+       	pkg-config --variable prefix libdap
+       	;;
+
+    --version)
+	echo "libdap `pkg-config --modversion libdap`"
+	;;
+
+    *)
+        echo "unknown option: $1"
+	usage
+	exit 1
+	;;
+    esac
+    shift
+done
+
+exit 0
diff --git a/dap-config.in b/dap-config.in
new file mode 100644
index 0000000..0553cfd
--- /dev/null
+++ b/dap-config.in
@@ -0,0 +1,96 @@
+#! /bin/sh
+#
+# Borrowed the idea for this script (and some code) from libcurl.
+#
+prefix=@prefix@
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+libdir64=${exec_prefix}/lib64
+includedir=${prefix}/include
+
+usage()
+{
+    cat <<EOF
+Usage: dap-config [OPTION]
+
+Available values for OPTION include:
+
+  --help      	display this help message and exit
+  --cc        	C compiler
+  --cxx       	C++ compiler
+  --cflags    	pre-processor and compiler flags
+  --libs      	library linking information for libdap (both clients and servers)
+  --server-libs libraries for servers
+  --client-libs libraries for clients
+  --prefix    	OPeNDAP install prefix
+  --version   	Library version
+EOF
+
+    exit $1
+}
+
+if test $# -eq 0; then
+    usage 1
+fi
+
+while test $# -gt 0; do
+    case "$1" in
+    # this deals with options in the style
+    # --option=value and extracts the value part
+    # [not currently used]
+    -*=*) value=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+    *) value= ;;
+    esac
+
+    case "$1" in
+    --help)
+	usage 0
+	;;
+
+    --cc)
+	echo "@CC@"
+	;;
+
+    --cxx)
+	echo "@CXX@"
+	;;
+
+    --cflags)
+	echo "-I${includedir}/libdap @XML2_CFLAGS@ @CURL_CFLAGS@"
+	;;
+
+    --libs)
+       	echo "-L${libdir64} -L${libdir} -ldap -ldapserver -ldapclient @CURL_LIBS@ @XML2_LIBS@ @PTHREAD_LIBS@ @UUID_LIBS@ @LIBS@"
+        ;;
+#
+#   Changed CURL_STATIC_LIBS to CURL_LIBS because the former was including a
+#   a boatload of crypto stuff that might or might not be present on a server.
+#   Various handlers use this script to determine which libraries to link with.
+#   jhrg 2/7/12
+
+    --server-libs)
+       	echo "-L${libdir64} -L${libdir} -ldap -ldapserver @XML2_LIBS@ @PTHREAD_LIBS@ @UUID_LIBS@ @LIBS@"
+       	;;
+
+    --client-libs)
+       	echo "-L${libdir64} -L${libdir} -ldap -ldapclient @CURL_LIBS@ @XML2_LIBS@ @PTHREAD_LIBS@ @UUID_LIBS@ @LIBS@"
+       	;;
+
+    --prefix)
+       	echo "${prefix}"
+       	;;
+
+    --version)
+	echo "libdap @PACKAGE_VERSION@"
+	;;
+
+    *)
+        echo "unknown option: $1"
+	usage
+	exit 1
+	;;
+    esac
+    shift
+done
+
+exit 0
diff --git a/dap-config.man1 b/dap-config.man1
new file mode 100644
index 0000000..9e101da
--- /dev/null
+++ b/dap-config.man1
@@ -0,0 +1,48 @@
+.\" dap-config.1
+.\"
+.\" Created on: Dec 29, 2011
+.\"     Author: jimg
+.TH DAP-CONFIG 1 "December 2011" Linux "User Manuals"
+.SH NAME
+dap-config \- get information about the libdap library
+.SH SYNOPSIS
+.B dap-config [OPTIONS] 
+.SH DESCRIPTION
+.B dap-config
+Get information about the libdap library so that it can be easily used
+in building other software. Option exist to help with build configuration,
+compilation, linking.
+.SH OPTIONS
+Available values for OPTION include:
+
+.IP  --help        
+display a help message and exit
+.IP  --cc          
+C compiler
+.IP  --cxx         
+C++ compiler
+.IP  --cflags      
+pre-processor and compiler flags
+.IP  --libs        
+library linking information for libdap (both clients and servers)
+.IP  --server-libs 
+libraries for servers
+.IP  --client-libs 
+libraries for clients
+.IP  --prefix      
+OPeNDAP install prefix
+.IP  --version     
+Library version
+.SH FILES
+.I none
+.SH ENVIRONMENT
+.I none
+.SH DIAGNOSTICS
+.I none
+.SH BUGS
+The pkg-config tool provides the same information, although it is sometimes
+not available.
+.SH AUTHOR
+James Gallagher <jgallagher at opendap.org>
+.SH "SEE ALSO"
+.BR getdap (1)
\ No newline at end of file
diff --git a/das.lex b/das.lex
new file mode 100644
index 0000000..3a7cdd1
--- /dev/null
+++ b/das.lex
@@ -0,0 +1,223 @@
+
+/*
+ -*- mode: c++; c-basic-offset:4 -*-
+
+ This file is part of libdap, A C++ implementation of the OPeNDAP Data
+ Access Protocol.
+
+ Copyright (c) 2002,2003 OPeNDAP, Inc.
+ Author: James Gallagher <jgallagher@opendap.org>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+ 
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+ 
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+ You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+ (c) COPYRIGHT URI/MIT 1994-2000
+*/ 
+
+/*
+   Scanner for the DAS. This file works with gnu's flex scanner generator. It
+   returns either ATTR, ID, VAL, TYPE or one of the single character tokens
+   `{', `}', `;', `,' or `\n' as integers. In the case of an ID or VAL, the
+   scanner stores a pointer to the lexeme in yylval (whose type is char *).
+
+   The scanner discards all comment text.
+
+   The scanner returns quoted strings as VALs. Any characters may appear in a
+   quoted string except backslash (\) and quote("). To include these escape
+   them with a backslash.
+   
+   The scanner is not reentrant, but can share name spaces with other
+   scanners.
+   
+   Note:
+   1) The `defines' file das.tab.h is built using `bison -d'.
+   2) Define YY_DECL such that the scanner is called `daslex'.
+   3) When bison builds the das.tab.h file, it uses `das' instead of `yy' for
+   variable name prefixes (e.g., yylval --> daslval).
+   4) The quote stuff is very complicated because we want backslash (\)
+   escapes to work and because we want line counts to work too. In order to
+   properly scan a quoted string two C functions are used: one to remove the
+   escape characters from escape sequences and one to remove the trailing
+   quote on the end of the string. 
+
+   jhrg 7/12/94 
+
+   NB: We don't remove the \'s or ending quotes any more -- that way the
+   printed das can be re-parsed. 9/28/94. 
+*/
+
+%{
+#include "config_dap.h"
+
+#include <cstdio>
+
+static char rcsid[] not_used ={"$Id$"};
+
+#ifndef _MSC_VER
+#include <string.h>
+#else
+#include <string>
+#endif
+
+using namespace std;
+
+#include "debug.h"
+#include "parser.h"
+
+using namespace libdap ;
+
+#ifndef YY_PROTO
+#define YY_PROTO(proto) proto
+#endif
+
+/* These defines must precede the das.tab.h include. */
+#define YYSTYPE char *
+#define YY_DECL int daslex YY_PROTO(( void ))
+#define YY_FATAL_ERROR(msg) {\
+    throw(Error(string("Error scanning DAS object text: ") + string(msg))); \
+    yy_fatal_error(msg); /* This will never be run but putting it here removes a warning that the function is never used. */ \
+}
+
+#include "das.tab.hh"
+
+int das_line_num = 1;
+static int start_line;		/* used in quote and comment error handlers */
+
+%}
+    
+%option noyywrap
+%option nounput
+%option noinput
+%option 8bit
+%option prefix="das"
+%option outfile="lex.das.cc"
+ 
+%x quote
+%x comment
+%x xml
+
+ATTR 	attributes|Attributes|ATTRIBUTES
+
+ALIAS   ALIAS|Alias|alias
+BYTE	BYTE|Byte|byte
+INT16	INT16|Int16|int16
+UINT16	UINT16|UInt16|Uint16|uint16
+INT32	INT32|Int32|int32
+UINT32	UINT32|UInt32|Uint32|uint32
+FLOAT32 FLOAT32|Float32|float32
+FLOAT64 FLOAT64|Float64|float64
+STRING  STRING|String|string
+URL	URL|Url|url
+XML     OTHERXML|OtherXML|OtherXml|otherxml
+
+/* Comment chars (#) are treated specially. Lets hope nobody wants to start
+   A variable name with one... Note that the DAS allows Identifiers to have 
+   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 */
+
+WORD    [-+a-zA-Z0-9_/%.:\\()*][-+a-zA-Z0-9_/%.:\\()#*]*
+
+NEVER   [^\-+a-zA-Z0-9_/%.:\\()#{};,[\]]
+
+%%
+
+{ATTR}	    	    	daslval = yytext; return SCAN_ATTR;
+
+{ALIAS}                 daslval = yytext; return SCAN_ALIAS;
+{BYTE}                  daslval = yytext; return SCAN_BYTE;
+{INT16}                 daslval = yytext; return SCAN_INT16;
+{UINT16}                daslval = yytext; return SCAN_UINT16;
+{INT32}                 daslval = yytext; return SCAN_INT32;
+{UINT32}                daslval = yytext; return SCAN_UINT32;
+{FLOAT32}               daslval = yytext; return SCAN_FLOAT32;
+{FLOAT64}               daslval = yytext; return SCAN_FLOAT64;
+{STRING}                daslval = yytext; return SCAN_STRING;
+{URL}                   daslval = yytext; return SCAN_URL;
+{XML}                   daslval = yytext; return SCAN_XML;
+
+{WORD}	    	    	{
+			    daslval = yytext; 
+			    DBG(cerr << "WORD: " << yytext << endl); 
+			    return SCAN_WORD;
+			}
+
+"{" 	    	    	return (int)*yytext;
+"}" 	    	    	return (int)*yytext;
+";" 	    	    	return (int)*yytext;
+","                     return (int)*yytext;
+
+[ \t\r]+
+\n	    	    	++das_line_num;
+<INITIAL><<EOF>>    	yy_init = 1; das_line_num = 1; yyterminate();
+
+"#"	    	    	BEGIN(comment);
+<comment>[^\r\n]*
+<comment>\n		++das_line_num; BEGIN(INITIAL);
+<comment>\r\n		++das_line_num; BEGIN(INITIAL);
+<comment><<EOF>>        yy_init = 1; das_line_num = 1; yyterminate();
+
+\"                      BEGIN(quote); start_line = das_line_num; yymore();
+<quote>[^"\r\n\\]*      yymore();
+<quote>[^"\r\n\\]*\n    yymore(); ++das_line_num;
+<quote>[^"\r\n\\]*\r\n  yymore(); ++das_line_num;
+<quote>\\.              yymore();
+<quote>\"               { 
+                          BEGIN(INITIAL); 
+
+                          daslval = yytext;
+
+                          return SCAN_WORD;
+                        }
+<quote><<EOF>>          {
+                          char msg[256];
+                          sprintf(msg,
+                                  "Unterminated quote (starts on line %d)\n",
+                                  start_line);
+                          YY_FATAL_ERROR(msg);
+                        }
+
+{NEVER}                 {
+                          if (yytext) {
+                            fprintf(stderr, "Character '%c' (%d) is not",
+                            	    *yytext, *yytext);
+                            fprintf(stderr, " allowed.");
+			  }
+			}
+%%
+
+// These three glue routines enable DDS to reclaim the memory used to parse a
+// DDS off the wire. They are here because this file can see the YY_*
+// symbols; the file DDS.cc cannot.
+
+void *
+das_buffer(FILE *fp)
+{
+    return (void *)das_create_buffer(fp, YY_BUF_SIZE);
+}
+
+void
+das_switch_to_buffer(void *buf)
+{
+    das_switch_to_buffer((YY_BUFFER_STATE)buf);
+}
+
+void
+das_delete_buffer(void *buf)
+{
+    das_delete_buffer((YY_BUFFER_STATE)buf);
+}
+
diff --git a/das.tab.cc b/das.tab.cc
new file mode 100644
index 0000000..949641d
--- /dev/null
+++ b/das.tab.cc
@@ -0,0 +1,2119 @@
+/* A Bison parser, made by GNU Bison 3.0.4.  */
+
+/* Bison implementation for Yacc-like parsers in C
+
+   Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
+
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
+
+/* C LALR(1) parser skeleton written by Richard Stallman, by
+   simplifying the original so-called "semantic" parser.  */
+
+/* All symbols defined below should begin with yy or YY, to avoid
+   infringing on user name space.  This should be done even for local
+   variables, as they might otherwise be expanded by user macros.
+   There are some unavoidable exceptions within include files to
+   define necessary library symbols; they are noted "INFRINGES ON
+   USER NAME SPACE" below.  */
+
+/* Identify Bison output.  */
+#define YYBISON 1
+
+/* Bison version.  */
+#define YYBISON_VERSION "3.0.4"
+
+/* Skeleton name.  */
+#define YYSKELETON_NAME "yacc.c"
+
+/* Pure parsers.  */
+#define YYPURE 0
+
+/* Push parsers.  */
+#define YYPUSH 0
+
+/* Pull parsers.  */
+#define YYPULL 1
+
+
+/* Substitute the variable and function names.  */
+#define yyparse         dasparse
+#define yylex           daslex
+#define yyerror         daserror
+#define yydebug         dasdebug
+#define yynerrs         dasnerrs
+
+#define yylval          daslval
+#define yychar          daschar
+
+/* Copy the first part of user declarations.  */
+
+#line 75 "das.tab.cc" /* yacc.c:339  */
+
+# ifndef YY_NULLPTR
+#  if defined __cplusplus && 201103L <= __cplusplus
+#   define YY_NULLPTR nullptr
+#  else
+#   define YY_NULLPTR 0
+#  endif
+# endif
+
+/* Enabling verbose error messages.  */
+#ifdef YYERROR_VERBOSE
+# undef YYERROR_VERBOSE
+# define YYERROR_VERBOSE 1
+#else
+# define YYERROR_VERBOSE 0
+#endif
+
+/* In a future release of Bison, this section will be replaced
+   by #include "das.tab.hh".  */
+#ifndef YY_DAS_DAS_TAB_HH_INCLUDED
+# define YY_DAS_DAS_TAB_HH_INCLUDED
+/* Debug traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 1
+#endif
+#if YYDEBUG
+extern int dasdebug;
+#endif
+/* "%code requires" blocks.  */
+#line 40 "das.yy" /* yacc.c:355  */
+
+
+#define YYSTYPE char *
+#define ATTR_STRING_QUOTE_FIX
+
+#include "config.h"
+
+#include <string>
+
+#include <vector>
+
+#include "DAS.h"
+#include "Error.h"
+#include "util.h"
+#include "escaping.h"
+#include "debug.h"
+#include "parser.h"
+#include "util.h"
+// #include "das.tab.hh"
+
+#ifdef TRACE_NEW
+#include "trace_new.h"
+#endif
+
+#define yylex daslex
+#define yyerror daserror 
+
+using namespace std;
+using namespace libdap ;
+
+// These macros are used to access the `arguments' passed to the parser. A
+// pointer to an error object and a pointer to an integer status variable are
+// passed in to the parser within a structure (which itself is passed as a
+// pointer). Note that the ERROR macro explicitly casts OBJ to an ERROR *. 
+// The parser now throws an exception when it encounters an error. 5/23/2002
+// jhrg 
+
+#define DAS_OBJ(arg) ((DAS *)((parser_arg *)(arg))->_object)
+
+//#define YYPARSE_PARAM arg
+
+extern int das_line_num;	/* defined in das.lex */
+
+
+#line 150 "das.tab.cc" /* yacc.c:355  */
+
+/* Token type.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+  enum yytokentype
+  {
+    SCAN_ATTR = 258,
+    SCAN_WORD = 259,
+    SCAN_ALIAS = 260,
+    SCAN_BYTE = 261,
+    SCAN_INT16 = 262,
+    SCAN_UINT16 = 263,
+    SCAN_INT32 = 264,
+    SCAN_UINT32 = 265,
+    SCAN_FLOAT32 = 266,
+    SCAN_FLOAT64 = 267,
+    SCAN_STRING = 268,
+    SCAN_URL = 269,
+    SCAN_XML = 270
+  };
+#endif
+
+/* Value type.  */
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef int YYSTYPE;
+# define YYSTYPE_IS_TRIVIAL 1
+# define YYSTYPE_IS_DECLARED 1
+#endif
+
+
+extern YYSTYPE daslval;
+
+int dasparse (parser_arg *arg);
+
+#endif /* !YY_DAS_DAS_TAB_HH_INCLUDED  */
+
+/* Copy the second part of user declarations.  */
+
+#line 189 "das.tab.cc" /* yacc.c:358  */
+/* Unqualified %code blocks.  */
+#line 85 "das.yy" /* yacc.c:359  */
+
+// No global static objects. We go through this every so often, I guess I
+// should learn... 1/24/2000 jhrg
+static string *name;	/* holds name in attr_pair rule */
+static string *type;	/* holds type in attr_pair rule */
+
+static vector<AttrTable *> *attr_tab_stack;
+
+// I use a vector of AttrTable pointers for a stack
+
+#define TOP_OF_STACK (attr_tab_stack->back())
+#define PUSH(x) (attr_tab_stack->push_back((x)))
+#define POP (attr_tab_stack->pop_back())
+#define STACK_LENGTH (attr_tab_stack->size())
+#define OUTER_TABLE_ONLY (attr_tab_stack->size() == 1)
+#define STACK_EMPTY (attr_tab_stack->empty())
+
+#define TYPE_NAME_VALUE(x) *type << " " << *name << " " << (x)
+
+static const char *ATTR_TUPLE_MSG = 
+"Expected an attribute type (Byte, Int16, UInt16, Int32, UInt32, Float32,\n\
+Float64, String or Url) followed by a name and value.";
+static const char *NO_DAS_MSG =
+"The attribute object returned from the dataset was null\n\
+Check that the URL is correct.";
+
+typedef int checker(const char *);
+
+int daslex(void);
+static void daserror(parser_arg *arg, const string &s /*char *s*/);
+static void add_attribute(const string &type, const string &name, 
+			  const string &value, checker *chk) throw (Error);
+static void add_alias(AttrTable *das, AttrTable *current, const string &name, 
+		      const string &src) throw (Error);
+static void add_bad_attribute(AttrTable *attr, const string &type,
+			      const string &name, const string &value,
+			      const string &msg);
+
+
+#line 231 "das.tab.cc" /* yacc.c:359  */
+
+#ifdef short
+# undef short
+#endif
+
+#ifdef YYTYPE_UINT8
+typedef YYTYPE_UINT8 yytype_uint8;
+#else
+typedef unsigned char yytype_uint8;
+#endif
+
+#ifdef YYTYPE_INT8
+typedef YYTYPE_INT8 yytype_int8;
+#else
+typedef signed char yytype_int8;
+#endif
+
+#ifdef YYTYPE_UINT16
+typedef YYTYPE_UINT16 yytype_uint16;
+#else
+typedef unsigned short int yytype_uint16;
+#endif
+
+#ifdef YYTYPE_INT16
+typedef YYTYPE_INT16 yytype_int16;
+#else
+typedef short int yytype_int16;
+#endif
+
+#ifndef YYSIZE_T
+# ifdef __SIZE_TYPE__
+#  define YYSIZE_T __SIZE_TYPE__
+# elif defined size_t
+#  define YYSIZE_T size_t
+# elif ! defined YYSIZE_T
+#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYSIZE_T size_t
+# else
+#  define YYSIZE_T unsigned int
+# endif
+#endif
+
+#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
+
+#ifndef YY_
+# if defined YYENABLE_NLS && YYENABLE_NLS
+#  if ENABLE_NLS
+#   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
+#   define YY_(Msgid) dgettext ("bison-runtime", Msgid)
+#  endif
+# endif
+# ifndef YY_
+#  define YY_(Msgid) Msgid
+# endif
+#endif
+
+#ifndef YY_ATTRIBUTE
+# if (defined __GNUC__                                               \
+      && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__)))  \
+     || defined __SUNPRO_C && 0x5110 <= __SUNPRO_C
+#  define YY_ATTRIBUTE(Spec) __attribute__(Spec)
+# else
+#  define YY_ATTRIBUTE(Spec) /* empty */
+# endif
+#endif
+
+#ifndef YY_ATTRIBUTE_PURE
+# define YY_ATTRIBUTE_PURE   YY_ATTRIBUTE ((__pure__))
+#endif
+
+#ifndef YY_ATTRIBUTE_UNUSED
+# define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__))
+#endif
+
+#if !defined _Noreturn \
+     && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112)
+# if defined _MSC_VER && 1200 <= _MSC_VER
+#  define _Noreturn __declspec (noreturn)
+# else
+#  define _Noreturn YY_ATTRIBUTE ((__noreturn__))
+# endif
+#endif
+
+/* Suppress unused-variable warnings by "using" E.  */
+#if ! defined lint || defined __GNUC__
+# define YYUSE(E) ((void) (E))
+#else
+# define YYUSE(E) /* empty */
+#endif
+
+#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
+/* Suppress an incorrect diagnostic about yylval being uninitialized.  */
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
+    _Pragma ("GCC diagnostic push") \
+    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\
+    _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END \
+    _Pragma ("GCC diagnostic pop")
+#else
+# define YY_INITIAL_VALUE(Value) Value
+#endif
+#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END
+#endif
+#ifndef YY_INITIAL_VALUE
+# define YY_INITIAL_VALUE(Value) /* Nothing. */
+#endif
+
+
+#if ! defined yyoverflow || YYERROR_VERBOSE
+
+/* The parser invokes alloca or malloc; define the necessary symbols.  */
+
+# ifdef YYSTACK_USE_ALLOCA
+#  if YYSTACK_USE_ALLOCA
+#   ifdef __GNUC__
+#    define YYSTACK_ALLOC __builtin_alloca
+#   elif defined __BUILTIN_VA_ARG_INCR
+#    include <alloca.h> /* INFRINGES ON USER NAME SPACE */
+#   elif defined _AIX
+#    define YYSTACK_ALLOC __alloca
+#   elif defined _MSC_VER
+#    include <malloc.h> /* INFRINGES ON USER NAME SPACE */
+#    define alloca _alloca
+#   else
+#    define YYSTACK_ALLOC alloca
+#    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS
+#     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+      /* Use EXIT_SUCCESS as a witness for stdlib.h.  */
+#     ifndef EXIT_SUCCESS
+#      define EXIT_SUCCESS 0
+#     endif
+#    endif
+#   endif
+#  endif
+# endif
+
+# ifdef YYSTACK_ALLOC
+   /* Pacify GCC's 'empty if-body' warning.  */
+#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+    /* The OS might guarantee only one guard page at the bottom of the stack,
+       and a page size can be as small as 4096 bytes.  So we cannot safely
+       invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
+       to allow for a few compiler-allocated temporary stack slots.  */
+#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
+#  endif
+# else
+#  define YYSTACK_ALLOC YYMALLOC
+#  define YYSTACK_FREE YYFREE
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+#   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
+#  endif
+#  if (defined __cplusplus && ! defined EXIT_SUCCESS \
+       && ! ((defined YYMALLOC || defined malloc) \
+             && (defined YYFREE || defined free)))
+#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#   ifndef EXIT_SUCCESS
+#    define EXIT_SUCCESS 0
+#   endif
+#  endif
+#  ifndef YYMALLOC
+#   define YYMALLOC malloc
+#   if ! defined malloc && ! defined EXIT_SUCCESS
+void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+#  ifndef YYFREE
+#   define YYFREE free
+#   if ! defined free && ! defined EXIT_SUCCESS
+void free (void *); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+# endif
+#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
+
+
+#if (! defined yyoverflow \
+     && (! defined __cplusplus \
+         || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+
+/* A type that is properly aligned for any stack member.  */
+union yyalloc
+{
+  yytype_int16 yyss_alloc;
+  YYSTYPE yyvs_alloc;
+};
+
+/* The size of the maximum gap between one aligned stack and the next.  */
+# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
+
+/* The size of an array large to enough to hold all stacks, each with
+   N elements.  */
+# define YYSTACK_BYTES(N) \
+     ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
+      + YYSTACK_GAP_MAXIMUM)
+
+# define YYCOPY_NEEDED 1
+
+/* Relocate STACK from its old location to the new one.  The
+   local variables YYSIZE and YYSTACKSIZE give the old and new number of
+   elements in the stack, and YYPTR gives the new location of the
+   stack.  Advance YYPTR to a properly aligned location for the next
+   stack.  */
+# define YYSTACK_RELOCATE(Stack_alloc, Stack)                           \
+    do                                                                  \
+      {                                                                 \
+        YYSIZE_T yynewbytes;                                            \
+        YYCOPY (&yyptr->Stack_alloc, Stack, yysize);                    \
+        Stack = &yyptr->Stack_alloc;                                    \
+        yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
+        yyptr += yynewbytes / sizeof (*yyptr);                          \
+      }                                                                 \
+    while (0)
+
+#endif
+
+#if defined YYCOPY_NEEDED && YYCOPY_NEEDED
+/* Copy COUNT objects from SRC to DST.  The source and destination do
+   not overlap.  */
+# ifndef YYCOPY
+#  if defined __GNUC__ && 1 < __GNUC__
+#   define YYCOPY(Dst, Src, Count) \
+      __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src)))
+#  else
+#   define YYCOPY(Dst, Src, Count)              \
+      do                                        \
+        {                                       \
+          YYSIZE_T yyi;                         \
+          for (yyi = 0; yyi < (Count); yyi++)   \
+            (Dst)[yyi] = (Src)[yyi];            \
+        }                                       \
+      while (0)
+#  endif
+# endif
+#endif /* !YYCOPY_NEEDED */
+
+/* YYFINAL -- State number of the termination state.  */
+#define YYFINAL  3
+/* YYLAST -- Last index in YYTABLE.  */
+#define YYLAST   118
+
+/* YYNTOKENS -- Number of terminals.  */
+#define YYNTOKENS  20
+/* YYNNTS -- Number of nonterminals.  */
+#define YYNNTS  47
+/* YYNRULES -- Number of rules.  */
+#define YYNRULES  84
+/* YYNSTATES -- Number of states.  */
+#define YYNSTATES  134
+
+/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
+   by yylex, with out-of-bounds checking.  */
+#define YYUNDEFTOK  2
+#define YYMAXUTOK   270
+
+#define YYTRANSLATE(YYX)                                                \
+  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
+
+/* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM
+   as returned by yylex, without out-of-bounds checking.  */
+static const yytype_uint8 yytranslate[] =
+{
+       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,    19,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,    18,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,    16,     2,    17,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
+      15
+};
+
+#if YYDEBUG
+  /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
+static const yytype_uint16 yyrline[] =
+{
+       0,   194,   194,   194,   211,   212,   216,   217,   223,   224,
+     225,   228,   230,   231,   230,   234,   235,   234,   238,   239,
+     238,   242,   243,   242,   246,   247,   246,   250,   251,   250,
+     254,   255,   254,   258,   259,   258,   262,   263,   262,   266,
+     267,   266,   271,   291,   270,   299,   298,   304,   308,   314,
+     318,   324,   328,   334,   338,   344,   348,   354,   358,   364,
+     368,   374,   379,   386,   390,   396,   410,   413,   416,   419,
+     419,   419,   419,   419,   420,   420,   420,   420,   421,   421,
+     421,   421,   425,   429,   424
+};
+#endif
+
+#if YYDEBUG || YYERROR_VERBOSE || 0
+/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
+   First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
+static const char *const yytname[] =
+{
+  "$end", "error", "$undefined", "SCAN_ATTR", "SCAN_WORD", "SCAN_ALIAS",
+  "SCAN_BYTE", "SCAN_INT16", "SCAN_UINT16", "SCAN_INT32", "SCAN_UINT32",
+  "SCAN_FLOAT32", "SCAN_FLOAT64", "SCAN_STRING", "SCAN_URL", "SCAN_XML",
+  "'{'", "'}'", "';'", "','", "$accept", "attr_start", "$@1", "attributes",
+  "attribute", "attr_list", "attr_tuple", "$@2", "$@3", "$@4", "$@5",
+  "$@6", "$@7", "$@8", "$@9", "$@10", "$@11", "$@12", "$@13", "$@14",
+  "$@15", "$@16", "$@17", "$@18", "$@19", "$@20", "$@21", "$@22", "$@23",
+  "$@24", "bytes", "int16", "uint16", "int32", "uint32", "float32",
+  "float64", "strs", "urls", "xml", "url", "str_or_id", "float_or_int",
+  "name", "alias", "$@25", "$@26", YY_NULLPTR
+};
+#endif
+
+# ifdef YYPRINT
+/* YYTOKNUM[NUM] -- (External) token number corresponding to the
+   (internal) symbol number NUM (which must be that of a token).  */
+static const yytype_uint16 yytoknum[] =
+{
+       0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
+     265,   266,   267,   268,   269,   270,   123,   125,    59,    44
+};
+# endif
+
+#define YYPACT_NINF -76
+
+#define yypact_value_is_default(Yystate) \
+  (!!((Yystate) == (-76)))
+
+#define YYTABLE_NINF -44
+
+#define yytable_value_is_error(Yytable_value) \
+  0
+
+  /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+     STATE-NUM.  */
+static const yytype_int8 yypact[] =
+{
+     -76,    19,    35,   -76,   -76,    25,    34,   -76,     1,   -76,
+     -76,   -76,    28,   -76,   -76,   -76,   -76,   -76,   -76,   -76,
+     -76,   -76,   -76,    16,   -76,   -76,    40,    80,   -76,    57,
+      57,    57,    57,    57,    57,    57,    57,    57,    57,   -76,
+     -76,   -76,     1,    93,   -76,   -76,   -76,   -76,   -76,   -76,
+     -76,   -76,   -76,   -76,   -76,   -76,   -76,   -76,   -76,   -76,
+     -76,   -76,   -76,   -76,   -76,   -76,   -76,    42,   -76,    94,
+      95,    96,    97,    98,    99,    99,   100,   101,   102,    90,
+      91,   -76,   -15,   -76,    21,   -76,    64,   -76,    66,   -76,
+      68,   -76,    70,   -76,    72,   -76,   -76,    74,   -76,   -76,
+      76,   -76,   -76,    92,   -76,   -76,   -76,   104,   -76,   107,
+     -76,   108,   -76,   109,   -76,   110,   -76,    99,   -76,    99,
+     -76,   100,   -76,   101,   -76,   -76,   -76,   -76,   -76,   -76,
+     -76,   -76,   -76,   -76
+};
+
+  /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
+     Performed when YYTABLE does not specify something else to do.  Zero
+     means the default is an error.  */
+static const yytype_uint8 yydefact[] =
+{
+       2,     0,     0,     1,     7,     0,     0,     4,     0,     5,
+      45,    42,     0,    12,    15,    18,    21,    24,    27,    30,
+      33,    36,    39,     0,     9,    11,     0,     0,    82,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     6,
+      10,    46,     0,     0,    70,    69,    71,    72,    73,    74,
+      75,    76,    77,    78,    79,    80,    81,    13,    16,    19,
+      22,    25,    28,    31,    34,    37,    40,     0,    83,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,    47,     0,    49,     0,    51,     0,    53,     0,    55,
+       0,    68,     0,    57,     0,    59,    67,     0,    61,    66,
+       0,    63,    65,     0,    44,    84,    14,     0,    17,     0,
+      20,     0,    23,     0,    26,     0,    29,     0,    32,     0,
+      35,     0,    38,     0,    41,    48,    50,    52,    54,    56,
+      58,    60,    62,    64
+};
+
+  /* YYPGOTO[NTERM-NUM].  */
+static const yytype_int8 yypgoto[] =
+{
+     -76,   -76,   -76,   -76,   111,    73,   -22,   -76,   -76,   -76,
+     -76,   -76,   -76,   -76,   -76,   -76,   -76,   -76,   -76,   -76,
+     -76,   -76,   -76,   -76,   -76,   -76,   -76,   -76,   -76,   -76,
+     -76,   -76,   -76,   -76,   -76,   -76,   -76,   -76,   -76,   -76,
+      -7,    -3,   -75,    43,   -76,   -76,   -76
+};
+
+  /* YYDEFGOTO[NTERM-NUM].  */
+static const yytype_int8 yydefgoto[] =
+{
+      -1,     1,     2,     6,     7,    23,    24,    29,    69,    30,
+      70,    31,    71,    32,    72,    33,    73,    34,    74,    35,
+      75,    36,    76,    37,    77,    38,    78,    27,    79,    26,
+      82,    84,    86,    88,    90,    92,    94,    97,   100,   103,
+     101,    98,    93,    57,    25,    43,    80
+};
+
+  /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
+     positive, shift that token.  If negative, reduce the rule whose
+     number is the opposite.  If YYTABLE_NINF, syntax error.  */
+static const yytype_int16 yytable[] =
+{
+      95,    40,    10,   106,   107,    11,    12,    13,    14,    15,
+      16,    17,    18,    19,    20,    21,    22,    10,    -8,     3,
+      11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
+      21,    22,    28,    39,    -3,     4,     4,     5,     5,   108,
+     109,     8,   130,    10,   131,    40,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    20,    21,    22,    41,   -43,
+      44,    45,    46,    47,    48,    49,    50,    51,    52,    53,
+      54,    55,    56,    58,    59,    60,    61,    62,    63,    64,
+      65,    66,   110,   111,   112,   113,   114,   115,   116,   117,
+     118,   119,   120,   121,   122,   123,    42,    68,    81,    83,
+      85,    87,    89,    91,    96,    99,   102,   104,   125,   105,
+     124,   126,   127,   128,   129,    67,   133,     9,   132
+};
+
+static const yytype_uint8 yycheck[] =
+{
+      75,    23,     1,    18,    19,     4,     5,     6,     7,     8,
+       9,    10,    11,    12,    13,    14,    15,     1,    17,     0,
+       4,     5,     6,     7,     8,     9,    10,    11,    12,    13,
+      14,    15,     4,    17,     0,     1,     1,     3,     3,    18,
+      19,    16,   117,     1,   119,    67,     4,     5,     6,     7,
+       8,     9,    10,    11,    12,    13,    14,    15,    18,    17,
+       3,     4,     5,     6,     7,     8,     9,    10,    11,    12,
+      13,    14,    15,    30,    31,    32,    33,    34,    35,    36,
+      37,    38,    18,    19,    18,    19,    18,    19,    18,    19,
+      18,    19,    18,    19,    18,    19,    16,     4,     4,     4,
+       4,     4,     4,     4,     4,     4,     4,    17,     4,    18,
+      18,     4,     4,     4,     4,    42,   123,     6,   121
+};
+
+  /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+     symbol of state STATE-NUM.  */
+static const yytype_uint8 yystos[] =
+{
+       0,    21,    22,     0,     1,     3,    23,    24,    16,    24,
+       1,     4,     5,     6,     7,     8,     9,    10,    11,    12,
+      13,    14,    15,    25,    26,    64,    49,    47,     4,    27,
+      29,    31,    33,    35,    37,    39,    41,    43,    45,    17,
+      26,    18,    16,    65,     3,     4,     5,     6,     7,     8,
+       9,    10,    11,    12,    13,    14,    15,    63,    63,    63,
+      63,    63,    63,    63,    63,    63,    63,    25,     4,    28,
+      30,    32,    34,    36,    38,    40,    42,    44,    46,    48,
+      66,     4,    50,     4,    51,     4,    52,     4,    53,     4,
+      54,     4,    55,    62,    56,    62,     4,    57,    61,     4,
+      58,    60,     4,    59,    17,    18,    18,    19,    18,    19,
+      18,    19,    18,    19,    18,    19,    18,    19,    18,    19,
+      18,    19,    18,    19,    18,     4,     4,     4,     4,     4,
+      62,    62,    61,    60
+};
+
+  /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
+static const yytype_uint8 yyr1[] =
+{
+       0,    20,    22,    21,    23,    23,    24,    24,    25,    25,
+      25,    26,    27,    28,    26,    29,    30,    26,    31,    32,
+      26,    33,    34,    26,    35,    36,    26,    37,    38,    26,
+      39,    40,    26,    41,    42,    26,    43,    44,    26,    45,
+      46,    26,    47,    48,    26,    49,    26,    50,    50,    51,
+      51,    52,    52,    53,    53,    54,    54,    55,    55,    56,
+      56,    57,    57,    58,    58,    59,    60,    61,    62,    63,
+      63,    63,    63,    63,    63,    63,    63,    63,    63,    63,
+      63,    63,    65,    66,    64
+};
+
+  /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
+static const yytype_uint8 yyr2[] =
+{
+       0,     2,     0,     2,     1,     2,     4,     1,     0,     1,
+       2,     1,     0,     0,     6,     0,     0,     6,     0,     0,
+       6,     0,     0,     6,     0,     0,     6,     0,     0,     6,
+       0,     0,     6,     0,     0,     6,     0,     0,     6,     0,
+       0,     6,     0,     0,     6,     0,     3,     1,     3,     1,
+       3,     1,     3,     1,     3,     1,     3,     1,     3,     1,
+       3,     1,     3,     1,     3,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     0,     0,     6
+};
+
+
+#define yyerrok         (yyerrstatus = 0)
+#define yyclearin       (yychar = YYEMPTY)
+#define YYEMPTY         (-2)
+#define YYEOF           0
+
+#define YYACCEPT        goto yyacceptlab
+#define YYABORT         goto yyabortlab
+#define YYERROR         goto yyerrorlab
+
+
+#define YYRECOVERING()  (!!yyerrstatus)
+
+#define YYBACKUP(Token, Value)                                  \
+do                                                              \
+  if (yychar == YYEMPTY)                                        \
+    {                                                           \
+      yychar = (Token);                                         \
+      yylval = (Value);                                         \
+      YYPOPSTACK (yylen);                                       \
+      yystate = *yyssp;                                         \
+      goto yybackup;                                            \
+    }                                                           \
+  else                                                          \
+    {                                                           \
+      yyerror (arg, YY_("syntax error: cannot back up")); \
+      YYERROR;                                                  \
+    }                                                           \
+while (0)
+
+/* Error token number */
+#define YYTERROR        1
+#define YYERRCODE       256
+
+
+
+/* Enable debugging if requested.  */
+#if YYDEBUG
+
+# ifndef YYFPRINTF
+#  include <stdio.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYFPRINTF fprintf
+# endif
+
+# define YYDPRINTF(Args)                        \
+do {                                            \
+  if (yydebug)                                  \
+    YYFPRINTF Args;                             \
+} while (0)
+
+/* This macro is provided for backward compatibility. */
+#ifndef YY_LOCATION_PRINT
+# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+#endif
+
+
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)                    \
+do {                                                                      \
+  if (yydebug)                                                            \
+    {                                                                     \
+      YYFPRINTF (stderr, "%s ", Title);                                   \
+      yy_symbol_print (stderr,                                            \
+                  Type, Value, arg); \
+      YYFPRINTF (stderr, "\n");                                           \
+    }                                                                     \
+} while (0)
+
+
+/*----------------------------------------.
+| Print this symbol's value on YYOUTPUT.  |
+`----------------------------------------*/
+
+static void
+yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, parser_arg *arg)
+{
+  FILE *yyo = yyoutput;
+  YYUSE (yyo);
+  YYUSE (arg);
+  if (!yyvaluep)
+    return;
+# ifdef YYPRINT
+  if (yytype < YYNTOKENS)
+    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+# endif
+  YYUSE (yytype);
+}
+
+
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
+
+static void
+yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, parser_arg *arg)
+{
+  YYFPRINTF (yyoutput, "%s %s (",
+             yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]);
+
+  yy_symbol_value_print (yyoutput, yytype, yyvaluep, arg);
+  YYFPRINTF (yyoutput, ")");
+}
+
+/*------------------------------------------------------------------.
+| yy_stack_print -- Print the state stack from its BOTTOM up to its |
+| TOP (included).                                                   |
+`------------------------------------------------------------------*/
+
+static void
+yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
+{
+  YYFPRINTF (stderr, "Stack now");
+  for (; yybottom <= yytop; yybottom++)
+    {
+      int yybot = *yybottom;
+      YYFPRINTF (stderr, " %d", yybot);
+    }
+  YYFPRINTF (stderr, "\n");
+}
+
+# define YY_STACK_PRINT(Bottom, Top)                            \
+do {                                                            \
+  if (yydebug)                                                  \
+    yy_stack_print ((Bottom), (Top));                           \
+} while (0)
+
+
+/*------------------------------------------------.
+| Report that the YYRULE is going to be reduced.  |
+`------------------------------------------------*/
+
+static void
+yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule, parser_arg *arg)
+{
+  unsigned long int yylno = yyrline[yyrule];
+  int yynrhs = yyr2[yyrule];
+  int yyi;
+  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
+             yyrule - 1, yylno);
+  /* The symbols being reduced.  */
+  for (yyi = 0; yyi < yynrhs; yyi++)
+    {
+      YYFPRINTF (stderr, "   $%d = ", yyi + 1);
+      yy_symbol_print (stderr,
+                       yystos[yyssp[yyi + 1 - yynrhs]],
+                       &(yyvsp[(yyi + 1) - (yynrhs)])
+                                              , arg);
+      YYFPRINTF (stderr, "\n");
+    }
+}
+
+# define YY_REDUCE_PRINT(Rule)          \
+do {                                    \
+  if (yydebug)                          \
+    yy_reduce_print (yyssp, yyvsp, Rule, arg); \
+} while (0)
+
+/* Nonzero means print parse trace.  It is left uninitialized so that
+   multiple parsers can coexist.  */
+int yydebug;
+#else /* !YYDEBUG */
+# define YYDPRINTF(Args)
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
+# define YY_STACK_PRINT(Bottom, Top)
+# define YY_REDUCE_PRINT(Rule)
+#endif /* !YYDEBUG */
+
+
+/* YYINITDEPTH -- initial size of the parser's stacks.  */
+#ifndef YYINITDEPTH
+# define YYINITDEPTH 200
+#endif
+
+/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
+   if the built-in stack extension method is used).
+
+   Do not make this value too large; the results are undefined if
+   YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
+   evaluated with infinite-precision integer arithmetic.  */
+
+#ifndef YYMAXDEPTH
+# define YYMAXDEPTH 10000
+#endif
+
+
+#if YYERROR_VERBOSE
+
+# ifndef yystrlen
+#  if defined __GLIBC__ && defined _STRING_H
+#   define yystrlen strlen
+#  else
+/* Return the length of YYSTR.  */
+static YYSIZE_T
+yystrlen (const char *yystr)
+{
+  YYSIZE_T yylen;
+  for (yylen = 0; yystr[yylen]; yylen++)
+    continue;
+  return yylen;
+}
+#  endif
+# endif
+
+# ifndef yystpcpy
+#  if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
+#   define yystpcpy stpcpy
+#  else
+/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
+   YYDEST.  */
+static char *
+yystpcpy (char *yydest, const char *yysrc)
+{
+  char *yyd = yydest;
+  const char *yys = yysrc;
+
+  while ((*yyd++ = *yys++) != '\0')
+    continue;
+
+  return yyd - 1;
+}
+#  endif
+# endif
+
+# ifndef yytnamerr
+/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
+   quotes and backslashes, so that it's suitable for yyerror.  The
+   heuristic is that double-quoting is unnecessary unless the string
+   contains an apostrophe, a comma, or backslash (other than
+   backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
+   null, do not copy; instead, return the length of what the result
+   would have been.  */
+static YYSIZE_T
+yytnamerr (char *yyres, const char *yystr)
+{
+  if (*yystr == '"')
+    {
+      YYSIZE_T yyn = 0;
+      char const *yyp = yystr;
+
+      for (;;)
+        switch (*++yyp)
+          {
+          case '\'':
+          case ',':
+            goto do_not_strip_quotes;
+
+          case '\\':
+            if (*++yyp != '\\')
+              goto do_not_strip_quotes;
+            /* Fall through.  */
+          default:
+            if (yyres)
+              yyres[yyn] = *yyp;
+            yyn++;
+            break;
+
+          case '"':
+            if (yyres)
+              yyres[yyn] = '\0';
+            return yyn;
+          }
+    do_not_strip_quotes: ;
+    }
+
+  if (! yyres)
+    return yystrlen (yystr);
+
+  return yystpcpy (yyres, yystr) - yyres;
+}
+# endif
+
+/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
+   about the unexpected token YYTOKEN for the state stack whose top is
+   YYSSP.
+
+   Return 0 if *YYMSG was successfully written.  Return 1 if *YYMSG is
+   not large enough to hold the message.  In that case, also set
+   *YYMSG_ALLOC to the required number of bytes.  Return 2 if the
+   required number of bytes is too large to store.  */
+static int
+yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
+                yytype_int16 *yyssp, int yytoken)
+{
+  YYSIZE_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]);
+  YYSIZE_T yysize = yysize0;
+  enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+  /* Internationalized format string. */
+  const char *yyformat = YY_NULLPTR;
+  /* Arguments of yyformat. */
+  char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+  /* Number of reported tokens (one for the "unexpected", one per
+     "expected"). */
+  int yycount = 0;
+
+  /* There are many possibilities here to consider:
+     - If this state is a consistent state with a default action, then
+       the only way this function was invoked is if the default action
+       is an error action.  In that case, don't check for expected
+       tokens because there are none.
+     - The only way there can be no lookahead present (in yychar) is if
+       this state is a consistent state with a default action.  Thus,
+       detecting the absence of a lookahead is sufficient to determine
+       that there is no unexpected or expected token to report.  In that
+       case, just report a simple "syntax error".
+     - Don't assume there isn't a lookahead just because this state is a
+       consistent state with a default action.  There might have been a
+       previous inconsistent state, consistent state with a non-default
+       action, or user semantic action that manipulated yychar.
+     - Of course, the expected token list depends on states to have
+       correct lookahead information, and it depends on the parser not
+       to perform extra reductions after fetching a lookahead from the
+       scanner and before detecting a syntax error.  Thus, state merging
+       (from LALR or IELR) and default reductions corrupt the expected
+       token list.  However, the list is correct for canonical LR with
+       one exception: it will still contain any token that will not be
+       accepted due to an error action in a later state.
+  */
+  if (yytoken != YYEMPTY)
+    {
+      int yyn = yypact[*yyssp];
+      yyarg[yycount++] = yytname[yytoken];
+      if (!yypact_value_is_default (yyn))
+        {
+          /* Start YYX at -YYN if negative to avoid negative indexes in
+             YYCHECK.  In other words, skip the first -YYN actions for
+             this state because they are default actions.  */
+          int yyxbegin = yyn < 0 ? -yyn : 0;
+          /* Stay within bounds of both yycheck and yytname.  */
+          int yychecklim = YYLAST - yyn + 1;
+          int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+          int yyx;
+
+          for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+            if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
+                && !yytable_value_is_error (yytable[yyx + yyn]))
+              {
+                if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+                  {
+                    yycount = 1;
+                    yysize = yysize0;
+                    break;
+                  }
+                yyarg[yycount++] = yytname[yyx];
+                {
+                  YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]);
+                  if (! (yysize <= yysize1
+                         && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+                    return 2;
+                  yysize = yysize1;
+                }
+              }
+        }
+    }
+
+  switch (yycount)
+    {
+# define YYCASE_(N, S)                      \
+      case N:                               \
+        yyformat = S;                       \
+      break
+      YYCASE_(0, YY_("syntax error"));
+      YYCASE_(1, YY_("syntax error, unexpected %s"));
+      YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
+      YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
+      YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
+      YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
+# undef YYCASE_
+    }
+
+  {
+    YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
+    if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+      return 2;
+    yysize = yysize1;
+  }
+
+  if (*yymsg_alloc < yysize)
+    {
+      *yymsg_alloc = 2 * yysize;
+      if (! (yysize <= *yymsg_alloc
+             && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
+        *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
+      return 1;
+    }
+
+  /* Avoid sprintf, as that infringes on the user's name space.
+     Don't have undefined behavior even if the translation
+     produced a string with the wrong number of "%s"s.  */
+  {
+    char *yyp = *yymsg;
+    int yyi = 0;
+    while ((*yyp = *yyformat) != '\0')
+      if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
+        {
+          yyp += yytnamerr (yyp, yyarg[yyi++]);
+          yyformat += 2;
+        }
+      else
+        {
+          yyp++;
+          yyformat++;
+        }
+  }
+  return 0;
+}
+#endif /* YYERROR_VERBOSE */
+
+/*-----------------------------------------------.
+| Release the memory associated to this symbol.  |
+`-----------------------------------------------*/
+
+static void
+yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, parser_arg *arg)
+{
+  YYUSE (yyvaluep);
+  YYUSE (arg);
+  if (!yymsg)
+    yymsg = "Deleting";
+  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
+
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+  YYUSE (yytype);
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
+}
+
+
+
+
+/* The lookahead symbol.  */
+int yychar;
+
+/* The semantic value of the lookahead symbol.  */
+YYSTYPE yylval;
+/* Number of syntax errors so far.  */
+int yynerrs;
+
+
+/*----------.
+| yyparse.  |
+`----------*/
+
+int
+yyparse (parser_arg *arg)
+{
+    int yystate;
+    /* Number of tokens to shift before error messages enabled.  */
+    int yyerrstatus;
+
+    /* The stacks and their tools:
+       'yyss': related to states.
+       'yyvs': related to semantic values.
+
+       Refer to the stacks through separate pointers, to allow yyoverflow
+       to reallocate them elsewhere.  */
+
+    /* The state stack.  */
+    yytype_int16 yyssa[YYINITDEPTH];
+    yytype_int16 *yyss;
+    yytype_int16 *yyssp;
+
+    /* The semantic value stack.  */
+    YYSTYPE yyvsa[YYINITDEPTH];
+    YYSTYPE *yyvs;
+    YYSTYPE *yyvsp;
+
+    YYSIZE_T yystacksize;
+
+  int yyn;
+  int yyresult;
+  /* Lookahead token as an internal (translated) token number.  */
+  int yytoken = 0;
+  /* The variables used to return semantic value and location from the
+     action routines.  */
+  YYSTYPE yyval;
+
+#if YYERROR_VERBOSE
+  /* Buffer for error messages, and its allocated size.  */
+  char yymsgbuf[128];
+  char *yymsg = yymsgbuf;
+  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
+#endif
+
+#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
+
+  /* The number of symbols on the RHS of the reduced rule.
+     Keep to zero when no symbol should be popped.  */
+  int yylen = 0;
+
+  yyssp = yyss = yyssa;
+  yyvsp = yyvs = yyvsa;
+  yystacksize = YYINITDEPTH;
+
+  YYDPRINTF ((stderr, "Starting parse\n"));
+
+  yystate = 0;
+  yyerrstatus = 0;
+  yynerrs = 0;
+  yychar = YYEMPTY; /* Cause a token to be read.  */
+  goto yysetstate;
+
+/*------------------------------------------------------------.
+| yynewstate -- Push a new state, which is found in yystate.  |
+`------------------------------------------------------------*/
+ yynewstate:
+  /* In all cases, when you get here, the value and location stacks
+     have just been pushed.  So pushing a state here evens the stacks.  */
+  yyssp++;
+
+ yysetstate:
+  *yyssp = yystate;
+
+  if (yyss + yystacksize - 1 <= yyssp)
+    {
+      /* Get the current used size of the three stacks, in elements.  */
+      YYSIZE_T yysize = yyssp - yyss + 1;
+
+#ifdef yyoverflow
+      {
+        /* Give user a chance to reallocate the stack.  Use copies of
+           these so that the &'s don't force the real ones into
+           memory.  */
+        YYSTYPE *yyvs1 = yyvs;
+        yytype_int16 *yyss1 = yyss;
+
+        /* Each stack pointer address is followed by the size of the
+           data in use in that stack, in bytes.  This used to be a
+           conditional around just the two extra args, but that might
+           be undefined if yyoverflow is a macro.  */
+        yyoverflow (YY_("memory exhausted"),
+                    &yyss1, yysize * sizeof (*yyssp),
+                    &yyvs1, yysize * sizeof (*yyvsp),
+                    &yystacksize);
+
+        yyss = yyss1;
+        yyvs = yyvs1;
+      }
+#else /* no yyoverflow */
+# ifndef YYSTACK_RELOCATE
+      goto yyexhaustedlab;
+# else
+      /* Extend the stack our own way.  */
+      if (YYMAXDEPTH <= yystacksize)
+        goto yyexhaustedlab;
+      yystacksize *= 2;
+      if (YYMAXDEPTH < yystacksize)
+        yystacksize = YYMAXDEPTH;
+
+      {
+        yytype_int16 *yyss1 = yyss;
+        union yyalloc *yyptr =
+          (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
+        if (! yyptr)
+          goto yyexhaustedlab;
+        YYSTACK_RELOCATE (yyss_alloc, yyss);
+        YYSTACK_RELOCATE (yyvs_alloc, yyvs);
+#  undef YYSTACK_RELOCATE
+        if (yyss1 != yyssa)
+          YYSTACK_FREE (yyss1);
+      }
+# endif
+#endif /* no yyoverflow */
+
+      yyssp = yyss + yysize - 1;
+      yyvsp = yyvs + yysize - 1;
+
+      YYDPRINTF ((stderr, "Stack size increased to %lu\n",
+                  (unsigned long int) yystacksize));
+
+      if (yyss + yystacksize - 1 <= yyssp)
+        YYABORT;
+    }
+
+  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
+
+  if (yystate == YYFINAL)
+    YYACCEPT;
+
+  goto yybackup;
+
+/*-----------.
+| yybackup.  |
+`-----------*/
+yybackup:
+
+  /* Do appropriate processing given the current state.  Read a
+     lookahead token if we need one and don't already have one.  */
+
+  /* First try to decide what to do without reference to lookahead token.  */
+  yyn = yypact[yystate];
+  if (yypact_value_is_default (yyn))
+    goto yydefault;
+
+  /* Not known => get a lookahead token if don't already have one.  */
+
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
+  if (yychar == YYEMPTY)
+    {
+      YYDPRINTF ((stderr, "Reading a token: "));
+      yychar = yylex ();
+    }
+
+  if (yychar <= YYEOF)
+    {
+      yychar = yytoken = YYEOF;
+      YYDPRINTF ((stderr, "Now at end of input.\n"));
+    }
+  else
+    {
+      yytoken = YYTRANSLATE (yychar);
+      YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
+    }
+
+  /* If the proper action on seeing token YYTOKEN is to reduce or to
+     detect an error, take that action.  */
+  yyn += yytoken;
+  if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
+    goto yydefault;
+  yyn = yytable[yyn];
+  if (yyn <= 0)
+    {
+      if (yytable_value_is_error (yyn))
+        goto yyerrlab;
+      yyn = -yyn;
+      goto yyreduce;
+    }
+
+  /* Count tokens shifted since error; after three, turn off error
+     status.  */
+  if (yyerrstatus)
+    yyerrstatus--;
+
+  /* Shift the lookahead token.  */
+  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
+
+  /* Discard the shifted token.  */
+  yychar = YYEMPTY;
+
+  yystate = yyn;
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+  *++yyvsp = yylval;
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
+
+  goto yynewstate;
+
+
+/*-----------------------------------------------------------.
+| yydefault -- do the default action for the current state.  |
+`-----------------------------------------------------------*/
+yydefault:
+  yyn = yydefact[yystate];
+  if (yyn == 0)
+    goto yyerrlab;
+  goto yyreduce;
+
+
+/*-----------------------------.
+| yyreduce -- Do a reduction.  |
+`-----------------------------*/
+yyreduce:
+  /* yyn is the number of a rule to reduce with.  */
+  yylen = yyr2[yyn];
+
+  /* If YYLEN is nonzero, implement the default value of the action:
+     '$$ = $1'.
+
+     Otherwise, the following line sets YYVAL to garbage.
+     This behavior is undocumented and Bison
+     users should not rely upon it.  Assigning to YYVAL
+     unconditionally makes the parser a bit smaller, and it avoids a
+     GCC warning that YYVAL may be used uninitialized.  */
+  yyval = yyvsp[1-yylen];
+
+
+  YY_REDUCE_PRINT (yyn);
+  switch (yyn)
+    {
+        case 2:
+#line 194 "das.yy" /* yacc.c:1661  */
+    {
+		if (!name) name = new string();
+		if (!type) type = new string();
+		if (!attr_tab_stack) attr_tab_stack = new vector<AttrTable *>;
+
+		// push outermost AttrTable
+		PUSH(DAS_OBJ(arg)->get_top_level_attributes());
+	}
+#line 1409 "das.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 3:
+#line 203 "das.yy" /* yacc.c:1661  */
+    {
+		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  */
+    break;
+
+  case 7:
+#line 218 "das.yy" /* yacc.c:1661  */
+    {
+		    parse_error((parser_arg *)arg, NO_DAS_MSG, das_line_num);
+		}
+#line 1428 "das.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 12:
+#line 230 "das.yy" /* yacc.c:1661  */
+    { save_str(*type, "Byte", das_line_num); }
+#line 1434 "das.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 13:
+#line 231 "das.yy" /* yacc.c:1661  */
+    { save_str(*name, (yyvsp[0]), das_line_num); }
+#line 1440 "das.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 15:
+#line 234 "das.yy" /* yacc.c:1661  */
+    { save_str(*type, "Int16", das_line_num); }
+#line 1446 "das.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 16:
+#line 235 "das.yy" /* yacc.c:1661  */
+    { save_str(*name, (yyvsp[0]), das_line_num); }
+#line 1452 "das.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 18:
+#line 238 "das.yy" /* yacc.c:1661  */
+    { save_str(*type, "UInt16", das_line_num); }
+#line 1458 "das.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 19:
+#line 239 "das.yy" /* yacc.c:1661  */
+    { save_str(*name, (yyvsp[0]), das_line_num); }
+#line 1464 "das.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 21:
+#line 242 "das.yy" /* yacc.c:1661  */
+    { save_str(*type, "Int32", das_line_num); }
+#line 1470 "das.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 22:
+#line 243 "das.yy" /* yacc.c:1661  */
+    { save_str(*name, (yyvsp[0]), das_line_num); }
+#line 1476 "das.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 24:
+#line 246 "das.yy" /* yacc.c:1661  */
+    { save_str(*type, "UInt32", das_line_num); }
+#line 1482 "das.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 25:
+#line 247 "das.yy" /* yacc.c:1661  */
+    { save_str(*name, (yyvsp[0]), das_line_num); }
+#line 1488 "das.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 27:
+#line 250 "das.yy" /* yacc.c:1661  */
+    { save_str(*type, "Float32", das_line_num); }
+#line 1494 "das.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 28:
+#line 251 "das.yy" /* yacc.c:1661  */
+    { save_str(*name, (yyvsp[0]), das_line_num); }
+#line 1500 "das.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 30:
+#line 254 "das.yy" /* yacc.c:1661  */
+    { save_str(*type, "Float64", das_line_num); }
+#line 1506 "das.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 31:
+#line 255 "das.yy" /* yacc.c:1661  */
+    { save_str(*name, (yyvsp[0]), das_line_num); }
+#line 1512 "das.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 33:
+#line 258 "das.yy" /* yacc.c:1661  */
+    { *type = "String"; }
+#line 1518 "das.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 34:
+#line 259 "das.yy" /* yacc.c:1661  */
+    { *name = (yyvsp[0]); }
+#line 1524 "das.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 36:
+#line 262 "das.yy" /* yacc.c:1661  */
+    { *type = "Url"; }
+#line 1530 "das.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 37:
+#line 263 "das.yy" /* yacc.c:1661  */
+    { *name = (yyvsp[0]); }
+#line 1536 "das.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 39:
+#line 266 "das.yy" /* yacc.c:1661  */
+    { *type = "OtherXML"; }
+#line 1542 "das.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 40:
+#line 267 "das.yy" /* yacc.c:1661  */
+    { *name = (yyvsp[0]); }
+#line 1548 "das.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 42:
+#line 271 "das.yy" /* yacc.c:1661  */
+    {
+		    DBG(cerr << "Processing ID: " << (yyvsp[0]) << endl);
+		    
+		    AttrTable *at = TOP_OF_STACK->get_attr_table((yyvsp[0]));
+		    if (!at) {
+			try {
+			    at = TOP_OF_STACK->append_container((yyvsp[0]));
+			}
+			catch (Error &e) {
+			    // re-throw with line number info
+			    parse_error(e.get_error_message().c_str(), 
+					das_line_num);
+			}
+		    }
+		    PUSH(at);
+
+		    DBG(cerr << " Pushed attr_tab: " << at << endl);
+
+		}
+#line 1572 "das.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 43:
+#line 291 "das.yy" /* yacc.c:1661  */
+    {
+		    /* 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  */
+    break;
+
+  case 45:
+#line 299 "das.yy" /* yacc.c:1661  */
+    { 
+		    parse_error(ATTR_TUPLE_MSG, das_line_num, (yyvsp[0]));
+		}
+#line 1590 "das.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 47:
+#line 305 "das.yy" /* yacc.c:1661  */
+    {
+		    add_attribute(*type, *name, (yyvsp[0]), &check_byte);
+		}
+#line 1598 "das.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 48:
+#line 309 "das.yy" /* yacc.c:1661  */
+    {
+		    add_attribute(*type, *name, (yyvsp[0]), &check_byte);
+		}
+#line 1606 "das.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 49:
+#line 315 "das.yy" /* yacc.c:1661  */
+    {
+		    add_attribute(*type, *name, (yyvsp[0]), &check_int16);
+		}
+#line 1614 "das.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 50:
+#line 319 "das.yy" /* yacc.c:1661  */
+    {
+		    add_attribute(*type, *name, (yyvsp[0]), &check_int16);
+		}
+#line 1622 "das.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 51:
+#line 325 "das.yy" /* yacc.c:1661  */
+    {
+		    add_attribute(*type, *name, (yyvsp[0]), &check_uint16);
+		}
+#line 1630 "das.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 52:
+#line 329 "das.yy" /* yacc.c:1661  */
+    {
+		    add_attribute(*type, *name, (yyvsp[0]), &check_uint16);
+		}
+#line 1638 "das.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 53:
+#line 335 "das.yy" /* yacc.c:1661  */
+    {
+		    add_attribute(*type, *name, (yyvsp[0]), &check_int32);
+		}
+#line 1646 "das.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 54:
+#line 339 "das.yy" /* yacc.c:1661  */
+    {
+		    add_attribute(*type, *name, (yyvsp[0]), &check_int32);
+		}
+#line 1654 "das.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 55:
+#line 345 "das.yy" /* yacc.c:1661  */
+    {
+		    add_attribute(*type, *name, (yyvsp[0]), &check_uint32);
+		}
+#line 1662 "das.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 56:
+#line 349 "das.yy" /* yacc.c:1661  */
+    {
+		    add_attribute(*type, *name, (yyvsp[0]), &check_uint32);
+		}
+#line 1670 "das.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 57:
+#line 355 "das.yy" /* yacc.c:1661  */
+    {
+		    add_attribute(*type, *name, (yyvsp[0]), &check_float32);
+		}
+#line 1678 "das.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 58:
+#line 359 "das.yy" /* yacc.c:1661  */
+    {
+		    add_attribute(*type, *name, (yyvsp[0]), &check_float32);
+		}
+#line 1686 "das.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 59:
+#line 365 "das.yy" /* yacc.c:1661  */
+    {
+		    add_attribute(*type, *name, (yyvsp[0]), &check_float64);
+		}
+#line 1694 "das.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 60:
+#line 369 "das.yy" /* yacc.c:1661  */
+    {
+		    add_attribute(*type, *name, (yyvsp[0]), &check_float64);
+		}
+#line 1702 "das.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 61:
+#line 375 "das.yy" /* yacc.c:1661  */
+    {
+		    string attr = remove_quotes((yyvsp[0]));
+		    add_attribute(*type, *name, attr, 0);
+		}
+#line 1711 "das.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 62:
+#line 380 "das.yy" /* yacc.c:1661  */
+    {
+		    string attr = remove_quotes((yyvsp[0]));
+		    add_attribute(*type, *name, attr, 0);
+		}
+#line 1720 "das.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 63:
+#line 387 "das.yy" /* yacc.c:1661  */
+    {
+                    add_attribute(*type, *name, (yyvsp[0]), &check_url);
+                }
+#line 1728 "das.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 64:
+#line 391 "das.yy" /* yacc.c:1661  */
+    {
+                    add_attribute(*type, *name, (yyvsp[0]), &check_url);
+                }
+#line 1736 "das.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 65:
+#line 397 "das.yy" /* yacc.c:1661  */
+    {
+                    // XML must be quoted in the DAS but the quotes are an
+                    // artifact of the DAS syntax so they are not part of the
+                    // value.
+                    string xml = unescape_double_quotes((yyvsp[0]));
+                    
+                    if (is_quoted(xml))
+                        add_attribute(*type, *name, remove_quotes(xml), 0);
+                    else
+                        add_attribute(*type, *name, xml, 0);
+                }
+#line 1752 "das.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 82:
+#line 425 "das.yy" /* yacc.c:1661  */
+    { 
+		    *name = (yyvsp[0]);
+		}
+#line 1760 "das.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 83:
+#line 429 "das.yy" /* yacc.c:1661  */
+    {
+		    add_alias( DAS_OBJ(arg)->get_top_level_attributes(),
+		               TOP_OF_STACK, *name, string((yyvsp[0])) ) ;
+                }
+#line 1769 "das.tab.cc" /* yacc.c:1661  */
+    break;
+
+
+#line 1773 "das.tab.cc" /* yacc.c:1661  */
+      default: break;
+    }
+  /* User semantic actions sometimes alter yychar, and that requires
+     that yytoken be updated with the new translation.  We take the
+     approach of translating immediately before every use of yytoken.
+     One alternative is translating here after every semantic action,
+     but that translation would be missed if the semantic action invokes
+     YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
+     if it invokes YYBACKUP.  In the case of YYABORT or YYACCEPT, an
+     incorrect destructor might then be invoked immediately.  In the
+     case of YYERROR or YYBACKUP, subsequent parser actions might lead
+     to an incorrect destructor call or verbose syntax error message
+     before the lookahead is translated.  */
+  YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
+
+  YYPOPSTACK (yylen);
+  yylen = 0;
+  YY_STACK_PRINT (yyss, yyssp);
+
+  *++yyvsp = yyval;
+
+  /* Now 'shift' the result of the reduction.  Determine what state
+     that goes to, based on the state we popped back to and the rule
+     number reduced by.  */
+
+  yyn = yyr1[yyn];
+
+  yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
+  if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
+    yystate = yytable[yystate];
+  else
+    yystate = yydefgoto[yyn - YYNTOKENS];
+
+  goto yynewstate;
+
+
+/*--------------------------------------.
+| yyerrlab -- here on detecting error.  |
+`--------------------------------------*/
+yyerrlab:
+  /* Make sure we have latest lookahead translation.  See comments at
+     user semantic actions for why this is necessary.  */
+  yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
+
+  /* If not already recovering from an error, report this error.  */
+  if (!yyerrstatus)
+    {
+      ++yynerrs;
+#if ! YYERROR_VERBOSE
+      yyerror (arg, YY_("syntax error"));
+#else
+# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
+                                        yyssp, yytoken)
+      {
+        char const *yymsgp = YY_("syntax error");
+        int yysyntax_error_status;
+        yysyntax_error_status = YYSYNTAX_ERROR;
+        if (yysyntax_error_status == 0)
+          yymsgp = yymsg;
+        else if (yysyntax_error_status == 1)
+          {
+            if (yymsg != yymsgbuf)
+              YYSTACK_FREE (yymsg);
+            yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
+            if (!yymsg)
+              {
+                yymsg = yymsgbuf;
+                yymsg_alloc = sizeof yymsgbuf;
+                yysyntax_error_status = 2;
+              }
+            else
+              {
+                yysyntax_error_status = YYSYNTAX_ERROR;
+                yymsgp = yymsg;
+              }
+          }
+        yyerror (arg, yymsgp);
+        if (yysyntax_error_status == 2)
+          goto yyexhaustedlab;
+      }
+# undef YYSYNTAX_ERROR
+#endif
+    }
+
+
+
+  if (yyerrstatus == 3)
+    {
+      /* If just tried and failed to reuse lookahead token after an
+         error, discard it.  */
+
+      if (yychar <= YYEOF)
+        {
+          /* Return failure if at end of input.  */
+          if (yychar == YYEOF)
+            YYABORT;
+        }
+      else
+        {
+          yydestruct ("Error: discarding",
+                      yytoken, &yylval, arg);
+          yychar = YYEMPTY;
+        }
+    }
+
+  /* Else will try to reuse lookahead token after shifting the error
+     token.  */
+  goto yyerrlab1;
+
+
+/*---------------------------------------------------.
+| yyerrorlab -- error raised explicitly by YYERROR.  |
+`---------------------------------------------------*/
+yyerrorlab:
+
+  /* Pacify compilers like GCC when the user code never invokes
+     YYERROR and the label yyerrorlab therefore never appears in user
+     code.  */
+  if (/*CONSTCOND*/ 0)
+     goto yyerrorlab;
+
+  /* Do not reclaim the symbols of the rule whose action triggered
+     this YYERROR.  */
+  YYPOPSTACK (yylen);
+  yylen = 0;
+  YY_STACK_PRINT (yyss, yyssp);
+  yystate = *yyssp;
+  goto yyerrlab1;
+
+
+/*-------------------------------------------------------------.
+| yyerrlab1 -- common code for both syntax error and YYERROR.  |
+`-------------------------------------------------------------*/
+yyerrlab1:
+  yyerrstatus = 3;      /* Each real token shifted decrements this.  */
+
+  for (;;)
+    {
+      yyn = yypact[yystate];
+      if (!yypact_value_is_default (yyn))
+        {
+          yyn += YYTERROR;
+          if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
+            {
+              yyn = yytable[yyn];
+              if (0 < yyn)
+                break;
+            }
+        }
+
+      /* Pop the current state because it cannot handle the error token.  */
+      if (yyssp == yyss)
+        YYABORT;
+
+
+      yydestruct ("Error: popping",
+                  yystos[yystate], yyvsp, arg);
+      YYPOPSTACK (1);
+      yystate = *yyssp;
+      YY_STACK_PRINT (yyss, yyssp);
+    }
+
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+  *++yyvsp = yylval;
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
+
+
+  /* Shift the error token.  */
+  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
+
+  yystate = yyn;
+  goto yynewstate;
+
+
+/*-------------------------------------.
+| yyacceptlab -- YYACCEPT comes here.  |
+`-------------------------------------*/
+yyacceptlab:
+  yyresult = 0;
+  goto yyreturn;
+
+/*-----------------------------------.
+| yyabortlab -- YYABORT comes here.  |
+`-----------------------------------*/
+yyabortlab:
+  yyresult = 1;
+  goto yyreturn;
+
+#if !defined yyoverflow || YYERROR_VERBOSE
+/*-------------------------------------------------.
+| yyexhaustedlab -- memory exhaustion comes here.  |
+`-------------------------------------------------*/
+yyexhaustedlab:
+  yyerror (arg, YY_("memory exhausted"));
+  yyresult = 2;
+  /* Fall through.  */
+#endif
+
+yyreturn:
+  if (yychar != YYEMPTY)
+    {
+      /* Make sure we have latest lookahead translation.  See comments at
+         user semantic actions for why this is necessary.  */
+      yytoken = YYTRANSLATE (yychar);
+      yydestruct ("Cleanup: discarding lookahead",
+                  yytoken, &yylval, arg);
+    }
+  /* Do not reclaim the symbols of the rule whose action triggered
+     this YYABORT or YYACCEPT.  */
+  YYPOPSTACK (yylen);
+  YY_STACK_PRINT (yyss, yyssp);
+  while (yyssp != yyss)
+    {
+      yydestruct ("Cleanup: popping",
+                  yystos[*yyssp], yyvsp, arg);
+      YYPOPSTACK (1);
+    }
+#ifndef yyoverflow
+  if (yyss != yyssa)
+    YYSTACK_FREE (yyss);
+#endif
+#if YYERROR_VERBOSE
+  if (yymsg != yymsgbuf)
+    YYSTACK_FREE (yymsg);
+#endif
+  return yyresult;
+}
+#line 436 "das.yy" /* yacc.c:1906  */
+
+
+// This function is required for linking, but DODS uses its own error
+// reporting mechanism.
+
+static void
+daserror(parser_arg *, const string &)
+{
+}
+
+static string
+a_or_an(const string &subject)
+{
+    string first_char(1, subject[0]);
+    string::size_type pos = first_char.find_first_of("aeiouAEIOUyY");
+    
+    if (pos == string::npos)
+		return "a";
+    else
+		return "an";
+}
+
+// This code used to throw an exception when a bad attribute value came
+// along; now it dumps the errant value(s) into a sub container called *_DODS
+// and stores the parser's error message in a string attribute named
+// `explanation.' 
+static void
+add_attribute(const string &type, const string &name, const string &value,
+	      checker *chk) throw (Error)
+{
+    DBG(cerr << "Adding: " << type << " " << name << " " << value \
+	<< " to Attrtable: " << TOP_OF_STACK << endl);
+
+    if (chk && !(*chk)(value.c_str())) {
+		string msg = "`";
+		msg += value + "' is not " + a_or_an(type) + " " + type + " value.";
+		add_bad_attribute(TOP_OF_STACK, type, name, value, msg);
+		return;
+    }
+    
+    if (STACK_EMPTY) {
+		string msg = "Whoa! Attribute table stack empty when adding `" ;
+		msg += name + ".' ";
+		parse_error(msg, das_line_num);
+    }
+    
+    try {
+#if 0
+        // Special treatment for XML: remove the double quotes that were 
+        // included in the value by this parser.
+        if (type == OtherXML && is_quoted(value))
+            TOP_OF_STACK->append_attr(name, type, value.substr(1, value.size()-2));
+        else    
+#endif
+	    TOP_OF_STACK->append_attr(name, type, value);
+    }
+    catch (Error &e) {
+	 	// re-throw with line number
+		parse_error(e.get_error_message().c_str(), das_line_num);
+    }
+}
+
+static void
+add_alias(AttrTable *das, AttrTable *current, const string &name, 
+	  const string &src) throw (Error)
+{
+    DBG(cerr << "Adding an alias: " << name << ": " << src << endl);
+
+    AttrTable *table = das->get_attr_table(src);
+    if (table) {
+	try {
+	    current->add_container_alias(name, table);
+	}
+	catch (Error &e) {
+	    parse_error(e.get_error_message().c_str(), das_line_num);
+	}
+    }
+    else {
+	try {
+	    current->add_value_alias(das, name, src);
+	}
+	catch (Error &e) {
+	    parse_error(e.get_error_message().c_str(), das_line_num);
+	}
+    }
+}
+
+static void
+add_bad_attribute(AttrTable *attr, const string &type, const string &name,
+		  const string &value, const string &msg)
+{
+    // First, if this bad value is already in a *_dods_errors container,
+    // then just add it. This can happen when the server side processes a DAS
+    // and then hands it off to a client which does the same.
+    // Make a new container. Call it <attr's name>_errors. If that container
+    // already exists, use it.
+    // Add the attribute.
+    // Add the error string to an attribute in the container called
+    // `<name_explanation.'. 
+    
+    if (attr->get_name().find("_dods_errors") != string::npos) {
+	attr->append_attr(name, type, value);
+    }
+    else {
+	string error_cont_name = attr->get_name() + "_dods_errors";
+	AttrTable *error_cont = attr->get_attr_table(error_cont_name);
+	if (!error_cont)
+	    error_cont = attr->append_container(error_cont_name);
+
+	error_cont->append_attr(name, type, value);
+#ifndef ATTR_STRING_QUOTE_FIX
+    error_cont->append_attr(name + "_explanation", "String",
+                "\"" + msg + "\"");
+#else
+       error_cont->append_attr(name + "_explanation", "String", msg);
+#endif
+    }
+}
+
diff --git a/das.tab.hh b/das.tab.hh
new file mode 100644
index 0000000..8c3664b
--- /dev/null
+++ b/das.tab.hh
@@ -0,0 +1,123 @@
+/* A Bison parser, made by GNU Bison 3.0.4.  */
+
+/* Bison interface for Yacc-like parsers in C
+
+   Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
+
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
+
+#ifndef YY_DAS_DAS_TAB_HH_INCLUDED
+# define YY_DAS_DAS_TAB_HH_INCLUDED
+/* Debug traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 1
+#endif
+#if YYDEBUG
+extern int dasdebug;
+#endif
+/* "%code requires" blocks.  */
+#line 40 "das.yy" /* yacc.c:1915  */
+
+
+#define YYSTYPE char *
+#define ATTR_STRING_QUOTE_FIX
+
+#include "config.h"
+
+#include <string>
+
+#include <vector>
+
+#include "DAS.h"
+#include "Error.h"
+#include "util.h"
+#include "escaping.h"
+#include "debug.h"
+#include "parser.h"
+#include "util.h"
+// #include "das.tab.hh"
+
+#ifdef TRACE_NEW
+#include "trace_new.h"
+#endif
+
+#define yylex daslex
+#define yyerror daserror 
+
+using namespace std;
+using namespace libdap ;
+
+// These macros are used to access the `arguments' passed to the parser. A
+// pointer to an error object and a pointer to an integer status variable are
+// passed in to the parser within a structure (which itself is passed as a
+// pointer). Note that the ERROR macro explicitly casts OBJ to an ERROR *. 
+// The parser now throws an exception when it encounters an error. 5/23/2002
+// jhrg 
+
+#define DAS_OBJ(arg) ((DAS *)((parser_arg *)(arg))->_object)
+
+//#define YYPARSE_PARAM arg
+
+extern int das_line_num;	/* defined in das.lex */
+
+
+#line 89 "das.tab.hh" /* yacc.c:1915  */
+
+/* Token type.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+  enum yytokentype
+  {
+    SCAN_ATTR = 258,
+    SCAN_WORD = 259,
+    SCAN_ALIAS = 260,
+    SCAN_BYTE = 261,
+    SCAN_INT16 = 262,
+    SCAN_UINT16 = 263,
+    SCAN_INT32 = 264,
+    SCAN_UINT32 = 265,
+    SCAN_FLOAT32 = 266,
+    SCAN_FLOAT64 = 267,
+    SCAN_STRING = 268,
+    SCAN_URL = 269,
+    SCAN_XML = 270
+  };
+#endif
+
+/* Value type.  */
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef int YYSTYPE;
+# define YYSTYPE_IS_TRIVIAL 1
+# define YYSTYPE_IS_DECLARED 1
+#endif
+
+
+extern YYSTYPE daslval;
+
+int dasparse (parser_arg *arg);
+
+#endif /* !YY_DAS_DAS_TAB_HH_INCLUDED  */
diff --git a/das.yy b/das.yy
new file mode 100644
index 0000000..8ff0c9d
--- /dev/null
+++ b/das.yy
@@ -0,0 +1,554 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+// 
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+// 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+ 
+// (c) COPYRIGHT URI/MIT 1994-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+/*
+   Grammar for the DAS. This grammar can be used with the bison parser
+   generator to build a parser for the DAS. It assumes that a scanner called
+   `daslex()' exists and that the objects DAS and AttrTable also exist.
+
+   jhrg 7/12/94 
+*/
+
+%code requires {
+
+#define YYSTYPE char *
+#define ATTR_STRING_QUOTE_FIX
+
+#include "config.h"
+
+#include <string>
+
+#include <vector>
+
+#include "DAS.h"
+#include "Error.h"
+#include "util.h"
+#include "escaping.h"
+#include "debug.h"
+#include "parser.h"
+#include "util.h"
+// #include "das.tab.hh"
+
+#ifdef TRACE_NEW
+#include "trace_new.h"
+#endif
+
+#define yylex daslex
+#define yyerror daserror 
+
+using namespace std;
+using namespace libdap ;
+
+// These macros are used to access the `arguments' passed to the parser. A
+// pointer to an error object and a pointer to an integer status variable are
+// passed in to the parser within a structure (which itself is passed as a
+// pointer). Note that the ERROR macro explicitly casts OBJ to an ERROR *. 
+// The parser now throws an exception when it encounters an error. 5/23/2002
+// jhrg 
+
+#define DAS_OBJ(arg) ((DAS *)((parser_arg *)(arg))->_object)
+
+//#define YYPARSE_PARAM arg
+
+extern int das_line_num;	/* defined in das.lex */
+
+} // code requires
+
+%code {
+// No global static objects. We go through this every so often, I guess I
+// should learn... 1/24/2000 jhrg
+static string *name;	/* holds name in attr_pair rule */
+static string *type;	/* holds type in attr_pair rule */
+
+static vector<AttrTable *> *attr_tab_stack;
+
+// I use a vector of AttrTable pointers for a stack
+
+#define TOP_OF_STACK (attr_tab_stack->back())
+#define PUSH(x) (attr_tab_stack->push_back((x)))
+#define POP (attr_tab_stack->pop_back())
+#define STACK_LENGTH (attr_tab_stack->size())
+#define OUTER_TABLE_ONLY (attr_tab_stack->size() == 1)
+#define STACK_EMPTY (attr_tab_stack->empty())
+
+#define TYPE_NAME_VALUE(x) *type << " " << *name << " " << (x)
+
+static const char *ATTR_TUPLE_MSG = 
+"Expected an attribute type (Byte, Int16, UInt16, Int32, UInt32, Float32,\n\
+Float64, String or Url) followed by a name and value.";
+static const char *NO_DAS_MSG =
+"The attribute object returned from the dataset was null\n\
+Check that the URL is correct.";
+
+typedef int checker(const char *);
+
+int daslex(void);
+static void daserror(parser_arg *arg, const string &s /*char *s*/);
+static void add_attribute(const string &type, const string &name, 
+			  const string &value, checker *chk) throw (Error);
+static void add_alias(AttrTable *das, AttrTable *current, const string &name, 
+		      const string &src) throw (Error);
+static void add_bad_attribute(AttrTable *attr, const string &type,
+			      const string &name, const string &value,
+			      const string &msg);
+
+} // code
+
+%require "2.4"
+
+%parse-param {parser_arg *arg}
+%name-prefix "das"
+%defines
+%debug
+%verbose
+
+%expect 26
+
+%token SCAN_ATTR
+
+%token SCAN_WORD
+
+%token SCAN_ALIAS
+
+%token SCAN_BYTE
+%token SCAN_INT16
+%token SCAN_UINT16
+%token SCAN_INT32
+%token SCAN_UINT32
+%token SCAN_FLOAT32
+%token SCAN_FLOAT64
+%token SCAN_STRING
+%token SCAN_URL
+%token SCAN_XML
+
+%%
+
+/*
+  Parser algorithm: 
+
+  Look for a `variable' name (this can be any identifier, but by convention
+  it is either the name of a variable in a dataset or the name of a grouping
+  of global attributes). Create a new attribute table for this identifier and
+  push the new attribute table onto a stack. If attribute tuples
+  (type-name-value tuples) are found, intern them in the attribute table
+  found on the top of the stack. If the start of a new attribute table if
+  found (before the current table is closed), create the new table and push
+  *it* on the stack. As attribute tables are closed, pop them off the stack.
+  This algorithm ensures that we can nest attribute tables to an arbitrary
+  depth.
+
+  Aliases are handled using mfuncs of both the DAS and AttrTable objects. This
+  is necessary because the first level of a DAS object can contain only
+  AttrTables, not attribute tuples. Whereas, the subsequent levels can
+  contain both. Thus the compete definition is split into two objects. In
+  part this is also a hold over from an older design which did not
+  have the recursive properties of the current design.
+
+  Aliases can be made between attributes within a given lexical level, from
+  one level to the next within a sub-hierarchy or across hierarchies.
+
+  Tokens:
+
+  BYTE, INT32, UINT32, FLOAT64, STRING and URL are tokens for the type
+  keywords. The tokens INT, FLOAT, STR and ID are returned by the scanner to
+  indicate the type of the value represented by the string contained in the
+  global DASLVAL. These two types of tokens are used to implement type
+  checking for the attributes. See the rules `bytes', etc. Additional tokens:
+  ATTR (indicates the start of an attribute object) and ALIAS (indicates an
+  alias). */
+
+/* This rule makes sure the objects needed by this parser are built. Because
+   the DODS DAP library is often used with linkers that are not C++-aware, we
+   cannot use global objects (because their constructors might never be
+   called). I had thought this was going to go away... 1/24/2000 jhrg */
+
+attr_start:
+	{
+		if (!name) name = new string();
+		if (!type) type = new string();
+		if (!attr_tab_stack) attr_tab_stack = new vector<AttrTable *>;
+
+		// push outermost AttrTable
+		PUSH(DAS_OBJ(arg)->get_top_level_attributes());
+	}
+    attributes
+    {
+		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;
+	}
+;
+
+attributes:     attribute
+    | attributes attribute
+
+;
+    	    	
+attribute:    	SCAN_ATTR '{' attr_list '}'
+        | error
+        {
+		    parse_error((parser_arg *)arg, NO_DAS_MSG, das_line_num);
+		}
+;
+
+attr_list:  	/* empty */
+    	| attr_tuple
+    	| attr_list attr_tuple
+;
+
+attr_tuple:	alias
+
+        | SCAN_BYTE { save_str(*type, "Byte", das_line_num); }
+                name { save_str(*name, $3, das_line_num); } 
+		bytes ';'
+
+		| SCAN_INT16 { save_str(*type, "Int16", das_line_num); } 
+                name { save_str(*name, $3, das_line_num); } 
+		int16 ';'
+
+		| SCAN_UINT16 { save_str(*type, "UInt16", das_line_num); } 
+                name { save_str(*name, $3, das_line_num); } 
+		uint16 ';'
+
+		| SCAN_INT32 { save_str(*type, "Int32", das_line_num); } 
+                name { save_str(*name, $3, das_line_num); } 
+		int32 ';'
+
+		| SCAN_UINT32 { save_str(*type, "UInt32", das_line_num); } 
+                name { save_str(*name, $3, das_line_num); } 
+		uint32 ';'
+
+		| SCAN_FLOAT32 { save_str(*type, "Float32", das_line_num); } 
+                name { save_str(*name, $3, das_line_num); } 
+		float32 ';'
+
+		| SCAN_FLOAT64 { save_str(*type, "Float64", das_line_num); } 
+                name { save_str(*name, $3, das_line_num); } 
+		float64 ';'
+
+		| SCAN_STRING { *type = "String"; } 
+                name { *name = $3; } 
+		strs ';'
+
+                | SCAN_URL { *type = "Url"; } 
+                name { *name = $3; } 
+                urls ';'
+
+                | SCAN_XML { *type = "OtherXML"; } 
+                name { *name = $3; } 
+                xml ';'
+
+		| SCAN_WORD
+                {
+		    DBG(cerr << "Processing ID: " << $1 << endl);
+		    
+		    AttrTable *at = TOP_OF_STACK->get_attr_table($1);
+		    if (!at) {
+			try {
+			    at = TOP_OF_STACK->append_container($1);
+			}
+			catch (Error &e) {
+			    // re-throw with line number info
+			    parse_error(e.get_error_message().c_str(), 
+					das_line_num);
+			}
+		    }
+		    PUSH(at);
+
+		    DBG(cerr << " Pushed attr_tab: " << at << endl);
+
+		}
+		'{' attr_list 
+                {
+		    /* pop top of stack; store in attr_tab */
+		    DBG(cerr << " Popped attr_tab: " << TOP_OF_STACK << endl);
+		    POP;
+		}
+		'}'
+
+		| error 
+                { 
+		    parse_error(ATTR_TUPLE_MSG, das_line_num, $1);
+		} ';'
+;
+
+bytes:		SCAN_WORD
+		{
+		    add_attribute(*type, *name, $1, &check_byte);
+		}
+		| bytes ',' SCAN_WORD
+		{
+		    add_attribute(*type, *name, $3, &check_byte);
+		}
+;
+
+int16:		SCAN_WORD
+		{
+		    add_attribute(*type, *name, $1, &check_int16);
+		}
+		| int16 ',' SCAN_WORD
+		{
+		    add_attribute(*type, *name, $3, &check_int16);
+		}
+;
+
+uint16:		SCAN_WORD
+		{
+		    add_attribute(*type, *name, $1, &check_uint16);
+		}
+		| uint16 ',' SCAN_WORD
+		{
+		    add_attribute(*type, *name, $3, &check_uint16);
+		}
+;
+
+int32:		SCAN_WORD
+		{
+		    add_attribute(*type, *name, $1, &check_int32);
+		}
+		| int32 ',' SCAN_WORD
+		{
+		    add_attribute(*type, *name, $3, &check_int32);
+		}
+;
+
+uint32:		SCAN_WORD
+		{
+		    add_attribute(*type, *name, $1, &check_uint32);
+		}
+		| uint32 ',' SCAN_WORD
+		{
+		    add_attribute(*type, *name, $3, &check_uint32);
+		}
+;
+
+float32:	float_or_int
+		{
+		    add_attribute(*type, *name, $1, &check_float32);
+		}
+		| float32 ',' float_or_int
+		{
+		    add_attribute(*type, *name, $3, &check_float32);
+		}
+;
+
+float64:	float_or_int
+		{
+		    add_attribute(*type, *name, $1, &check_float64);
+		}
+		| float64 ',' float_or_int
+		{
+		    add_attribute(*type, *name, $3, &check_float64);
+		}
+;
+
+strs:		str_or_id
+		{
+		    string attr = remove_quotes($1);
+		    add_attribute(*type, *name, attr, 0);
+		}
+		| strs ',' str_or_id
+		{
+		    string attr = remove_quotes($3);
+		    add_attribute(*type, *name, attr, 0);
+		}
+;
+
+urls:           url
+                {
+                    add_attribute(*type, *name, $1, &check_url);
+                }
+                | urls ',' url
+                {
+                    add_attribute(*type, *name, $3, &check_url);
+                }
+;
+
+xml:            SCAN_WORD
+                {
+                    // XML must be quoted in the DAS but the quotes are an
+                    // artifact of the DAS syntax so they are not part of the
+                    // value.
+                    string xml = unescape_double_quotes($1);
+                    
+                    if (is_quoted(xml))
+                        add_attribute(*type, *name, remove_quotes(xml), 0);
+                    else
+                        add_attribute(*type, *name, xml, 0);
+                }
+;
+
+url:		SCAN_WORD
+;
+
+str_or_id:	SCAN_WORD
+;
+
+float_or_int:   SCAN_WORD
+;
+
+name:           SCAN_WORD | SCAN_ATTR | SCAN_ALIAS | SCAN_BYTE | SCAN_INT16 
+                | SCAN_UINT16 | SCAN_INT32 | SCAN_UINT32 | SCAN_FLOAT32 
+                | SCAN_FLOAT64 | SCAN_STRING | SCAN_URL | SCAN_XML
+;
+
+alias:          SCAN_ALIAS SCAN_WORD
+                { 
+		    *name = $2;
+		} 
+                SCAN_WORD
+                {
+		    add_alias( DAS_OBJ(arg)->get_top_level_attributes(),
+		               TOP_OF_STACK, *name, string($4) ) ;
+                }
+                ';'
+;
+
+%%
+
+// This function is required for linking, but DODS uses its own error
+// reporting mechanism.
+
+static void
+daserror(parser_arg *, const string &)
+{
+}
+
+static string
+a_or_an(const string &subject)
+{
+    string first_char(1, subject[0]);
+    string::size_type pos = first_char.find_first_of("aeiouAEIOUyY");
+    
+    if (pos == string::npos)
+		return "a";
+    else
+		return "an";
+}
+
+// This code used to throw an exception when a bad attribute value came
+// along; now it dumps the errant value(s) into a sub container called *_DODS
+// and stores the parser's error message in a string attribute named
+// `explanation.' 
+static void
+add_attribute(const string &type, const string &name, const string &value,
+	      checker *chk) throw (Error)
+{
+    DBG(cerr << "Adding: " << type << " " << name << " " << value \
+	<< " to Attrtable: " << TOP_OF_STACK << endl);
+
+    if (chk && !(*chk)(value.c_str())) {
+		string msg = "`";
+		msg += value + "' is not " + a_or_an(type) + " " + type + " value.";
+		add_bad_attribute(TOP_OF_STACK, type, name, value, msg);
+		return;
+    }
+    
+    if (STACK_EMPTY) {
+		string msg = "Whoa! Attribute table stack empty when adding `" ;
+		msg += name + ".' ";
+		parse_error(msg, das_line_num);
+    }
+    
+    try {
+#if 0
+        // Special treatment for XML: remove the double quotes that were 
+        // included in the value by this parser.
+        if (type == OtherXML && is_quoted(value))
+            TOP_OF_STACK->append_attr(name, type, value.substr(1, value.size()-2));
+        else    
+#endif
+	    TOP_OF_STACK->append_attr(name, type, value);
+    }
+    catch (Error &e) {
+	 	// re-throw with line number
+		parse_error(e.get_error_message().c_str(), das_line_num);
+    }
+}
+
+static void
+add_alias(AttrTable *das, AttrTable *current, const string &name, 
+	  const string &src) throw (Error)
+{
+    DBG(cerr << "Adding an alias: " << name << ": " << src << endl);
+
+    AttrTable *table = das->get_attr_table(src);
+    if (table) {
+	try {
+	    current->add_container_alias(name, table);
+	}
+	catch (Error &e) {
+	    parse_error(e.get_error_message().c_str(), das_line_num);
+	}
+    }
+    else {
+	try {
+	    current->add_value_alias(das, name, src);
+	}
+	catch (Error &e) {
+	    parse_error(e.get_error_message().c_str(), das_line_num);
+	}
+    }
+}
+
+static void
+add_bad_attribute(AttrTable *attr, const string &type, const string &name,
+		  const string &value, const string &msg)
+{
+    // First, if this bad value is already in a *_dods_errors container,
+    // then just add it. This can happen when the server side processes a DAS
+    // and then hands it off to a client which does the same.
+    // Make a new container. Call it <attr's name>_errors. If that container
+    // already exists, use it.
+    // Add the attribute.
+    // Add the error string to an attribute in the container called
+    // `<name_explanation.'. 
+    
+    if (attr->get_name().find("_dods_errors") != string::npos) {
+	attr->append_attr(name, type, value);
+    }
+    else {
+	string error_cont_name = attr->get_name() + "_dods_errors";
+	AttrTable *error_cont = attr->get_attr_table(error_cont_name);
+	if (!error_cont)
+	    error_cont = attr->append_container(error_cont_name);
+
+	error_cont->append_attr(name, type, value);
+#ifndef ATTR_STRING_QUOTE_FIX
+    error_cont->append_attr(name + "_explanation", "String",
+                "\"" + msg + "\"");
+#else
+       error_cont->append_attr(name + "_explanation", "String", msg);
+#endif
+    }
+}
+
diff --git a/dds.lex b/dds.lex
new file mode 100644
index 0000000..82b8b51
--- /dev/null
+++ b/dds.lex
@@ -0,0 +1,196 @@
+/*
+ -*- mode: c++; c-basic-offset:4 -*-
+
+ This file is part of libdap, A C++ implementation of the OPeNDAP Data
+ Access Protocol.
+
+ Copyright (c) 2002,2003 OPeNDAP, Inc.
+ Author: James Gallagher <jgallagher@opendap.org>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+ You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+ (c) COPYRIGHT URI/MIT 1994-1999
+
+*/
+
+/*
+   Scanner for the DDS. This file works with gnu's flex scanner generator. It
+   returns either DATASET, INDEPENDENT, DEPENDENT, ARRAY, MAPS, LIST,
+   SEQUENCE, STRUCTURE, FUNCTION, GRID, BYTE, INT32, FLOAT64, STRING, URL, ID
+   or one of the single character tokens `{', `}', `;', `=' or `\n' as
+   integers. In the case of an ID, the scanner stores a pointer to the lexeme
+   in yylval (whose type is char *).
+
+   The scanner discards all comment text.
+
+   The scanner is not reentrant, but can share name spaces with other
+   scanners.
+
+   Note:
+   1) The `defines' file dds.tab.h is built using `bison -d'.
+   2) Define YY_DECL such that the scanner is called `ddslex'.
+   3) When bison builds the dds.tab.h file, it uses `dds' instead of `yy' for
+   variable name prefixes (e.g., yylval --> ddslval).
+
+   jhrg 8/29/94
+*/
+
+%{
+
+#include "config_dap.h"
+
+#include <cstdio>
+#include <cstring>
+
+#include "parser.h"
+#include "dds.tab.hh"
+#include "escaping.h"
+
+using namespace libdap ;
+
+#ifndef YY_PROTO
+#define YY_PROTO(proto) proto
+#endif
+
+#define YY_DECL int ddslex YY_PROTO(( void ))
+
+#define YY_INPUT(buf,result,max_size) { \
+    if (fgets((buf), (max_size), (ddsin)) == NULL) { \
+      *buf = '\0'; \
+    } \
+    result = (feof(ddsin) || *buf == '\0' || strncmp(buf, "Data:\n", 6) == 0) \
+             ? YY_NULL : strlen(buf); \
+}
+
+#define YY_FATAL_ERROR(msg) {\
+    throw(Error(string("Error scanning DDS object text: ") + string(msg))); \
+    yy_fatal_error(msg); /* see das.lex */ \
+}
+
+int dds_line_num = 1;
+
+static void store_word();
+
+%}
+
+%option noyywrap
+%option nounput
+%option noinput
+%option 8bit
+%option prefix="dds"
+%option outfile="lex.dds.cc"
+%x comment
+
+DATASET 	DATASET|Dataset|dataset
+LIST 		LIST|List|list
+SEQUENCE 	SEQUENCE|Sequence|sequence
+STRUCTURE 	STRUCTURE|Structure|structure
+GRID 		GRID|Grid|grid
+BYTE 		BYTE|Byte|byte
+INT16 		INT16|Int16|int16
+UINT16 		UINT16|UInt16|uint16
+INT32 		INT32|Int32|int32
+UINT32 		UINT32|UInt32|uint32
+FLOAT32 	FLOAT32|Float32|float32
+FLOAT64 	FLOAT64|Float64|float64
+STRING 		STRING|String|string
+URL 		URL|Url|url
+
+/* See das.lex for comments about the characters allowed in a WORD.
+   10/31/2001 jhrg */
+
+WORD        [-+a-zA-Z0-9_/%.\\*][-+a-zA-Z0-9_/%.\\#*]*
+
+NEVER		[^\-+a-zA-Z0-9_/%.\\#,(){}[\]]
+
+%%
+
+"{"         return (int)*yytext;
+"}" 	    return (int)*yytext;
+"["			return (int)*yytext;
+"]"			return (int)*yytext;
+":"			return (int)*yytext;
+";" 	    return (int)*yytext;
+"="			return (int)*yytext;
+
+{DATASET}		store_word(); return SCAN_DATASET;
+{LIST}			store_word(); return SCAN_LIST;
+{SEQUENCE}		store_word(); return SCAN_SEQUENCE;
+{STRUCTURE}		store_word(); return SCAN_STRUCTURE;
+{GRID}			store_word(); return SCAN_GRID;
+{BYTE}			store_word(); return SCAN_BYTE;
+{INT16}			store_word(); return SCAN_INT16;
+{UINT16}		store_word(); return SCAN_UINT16;
+{INT32}			store_word(); return SCAN_INT32;
+{UINT32}		store_word(); return SCAN_UINT32;
+{FLOAT32}		store_word(); return SCAN_FLOAT32;
+{FLOAT64}		store_word(); return SCAN_FLOAT64;
+{STRING}		store_word(); return SCAN_STRING;
+{URL}			store_word(); return SCAN_URL;
+
+{WORD}      store_word(); return SCAN_WORD;
+
+[ \t\r]+
+\n	    	++dds_line_num;
+<INITIAL><<EOF>>    yy_init = 1; dds_line_num = 1; yyterminate();
+
+"#"     BEGIN(comment);
+<comment>[^\n]*
+<comment>\n		++dds_line_num; BEGIN(INITIAL);
+<comment><<EOF>>    yy_init = 1; dds_line_num = 1; yyterminate();
+
+"Data:\n"		yyterminate();
+"Data:\r\n"		yyterminate();
+
+{NEVER} {
+            if (yytext) {	/* suppress msgs about `' chars */
+                fprintf(stderr, "Character `%c' is not", *yytext);
+                fprintf(stderr, " allowed and has been ignored\n");
+	    }
+	}
+%%
+
+// These three glue routines enable DDS to reclaim the memory used to parse a
+// DDS off the wire. They are here because this file can see the YY_*
+// symbols; the file DDS.cc cannot.
+
+void *
+dds_buffer(FILE *fp)
+{
+    return (void *)dds_create_buffer(fp, YY_BUF_SIZE);
+}
+
+void
+dds_switch_to_buffer(void *buf)
+{
+    dds_switch_to_buffer((YY_BUFFER_STATE)buf);
+}
+
+void
+dds_delete_buffer(void *buf)
+{
+    dds_delete_buffer((YY_BUFFER_STATE)buf);
+}
+
+static void
+store_word()
+{
+    // dods2id(string(yytext)).c_str()
+    strncpy(ddslval.word, yytext, ID_MAX-1);
+    ddslval.word[ID_MAX-1] = '\0'; // for the paranoid...
+}
+
diff --git a/dds.tab.cc b/dds.tab.cc
new file mode 100644
index 0000000..a6ba517
--- /dev/null
+++ b/dds.tab.cc
@@ -0,0 +1,2091 @@
+/* A Bison parser, made by GNU Bison 3.0.4.  */
+
+/* Bison implementation for Yacc-like parsers in C
+
+   Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
+
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
+
+/* C LALR(1) parser skeleton written by Richard Stallman, by
+   simplifying the original so-called "semantic" parser.  */
+
+/* All symbols defined below should begin with yy or YY, to avoid
+   infringing on user name space.  This should be done even for local
+   variables, as they might otherwise be expanded by user macros.
+   There are some unavoidable exceptions within include files to
+   define necessary library symbols; they are noted "INFRINGES ON
+   USER NAME SPACE" below.  */
+
+/* Identify Bison output.  */
+#define YYBISON 1
+
+/* Bison version.  */
+#define YYBISON_VERSION "3.0.4"
+
+/* Skeleton name.  */
+#define YYSKELETON_NAME "yacc.c"
+
+/* Pure parsers.  */
+#define YYPURE 0
+
+/* Push parsers.  */
+#define YYPUSH 0
+
+/* Pull parsers.  */
+#define YYPULL 1
+
+
+/* Substitute the variable and function names.  */
+#define yyparse         ddsparse
+#define yylex           ddslex
+#define yyerror         ddserror
+#define yydebug         ddsdebug
+#define yynerrs         ddsnerrs
+
+#define yylval          ddslval
+#define yychar          ddschar
+
+/* Copy the first part of user declarations.  */
+
+#line 75 "dds.tab.cc" /* yacc.c:339  */
+
+# ifndef YY_NULLPTR
+#  if defined __cplusplus && 201103L <= __cplusplus
+#   define YY_NULLPTR nullptr
+#  else
+#   define YY_NULLPTR 0
+#  endif
+# endif
+
+/* Enabling verbose error messages.  */
+#ifdef YYERROR_VERBOSE
+# undef YYERROR_VERBOSE
+# define YYERROR_VERBOSE 1
+#else
+# define YYERROR_VERBOSE 0
+#endif
+
+/* In a future release of Bison, this section will be replaced
+   by #include "dds.tab.hh".  */
+#ifndef YY_DDS_DDS_TAB_HH_INCLUDED
+# define YY_DDS_DDS_TAB_HH_INCLUDED
+/* Debug traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 1
+#endif
+#if YYDEBUG
+extern int ddsdebug;
+#endif
+/* "%code requires" blocks.  */
+#line 47 "dds.yy" /* yacc.c:355  */
+
+
+#include "config_dap.h"
+
+#include <cstring>
+#include <cassert>
+#include <iostream>
+#include <stack>
+#include <sstream>
+
+#include "Byte.h"
+#include "Int16.h"
+#include "UInt16.h"
+#include "Int32.h"
+#include "UInt32.h"
+#include "Float32.h"
+#include "Float64.h"
+#include "Str.h"
+#include "Url.h"
+#include "Array.h"
+#include "Structure.h"
+#include "Sequence.h"
+#include "Grid.h"
+
+#include "DDS.h"
+#include "Error.h"
+#include "parser.h"
+#include "util.h"
+
+using namespace std;
+using namespace libdap;
+
+// These macros are used to access the `arguments' passed to the parser. A
+// pointer to an error object and a pointer to an integer status variable are
+// passed in to the parser within a structure (which itself is passed as a
+// pointer). Note that the ERROR macro explicitly casts OBJ to an ERROR *. 
+// ERROR is no longer used. These parsers now signal problems by throwing
+// exceptions. 5/22/2002 jhrg
+#define DDS_OBJ(arg) ((DDS *)((parser_arg *)(arg))->_object)
+
+// #define YYPARSE_PARAM arg
+
+extern int dds_line_num;	/* defined in dds.lex */
+
+
+#line 151 "dds.tab.cc" /* yacc.c:355  */
+
+/* Token type.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+  enum yytokentype
+  {
+    SCAN_WORD = 258,
+    SCAN_DATASET = 259,
+    SCAN_LIST = 260,
+    SCAN_SEQUENCE = 261,
+    SCAN_STRUCTURE = 262,
+    SCAN_FUNCTION = 263,
+    SCAN_GRID = 264,
+    SCAN_BYTE = 265,
+    SCAN_INT16 = 266,
+    SCAN_UINT16 = 267,
+    SCAN_INT32 = 268,
+    SCAN_UINT32 = 269,
+    SCAN_FLOAT32 = 270,
+    SCAN_FLOAT64 = 271,
+    SCAN_STRING = 272,
+    SCAN_URL = 273
+  };
+#endif
+
+/* Value type.  */
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+
+union YYSTYPE
+{
+#line 131 "dds.yy" /* yacc.c:355  */
+
+    bool boolean;
+    char word[ID_MAX];
+
+#line 187 "dds.tab.cc" /* yacc.c:355  */
+};
+
+typedef union YYSTYPE YYSTYPE;
+# define YYSTYPE_IS_TRIVIAL 1
+# define YYSTYPE_IS_DECLARED 1
+#endif
+
+
+extern YYSTYPE ddslval;
+
+int ddsparse (parser_arg *arg);
+
+#endif /* !YY_DDS_DDS_TAB_HH_INCLUDED  */
+
+/* Copy the second part of user declarations.  */
+
+#line 204 "dds.tab.cc" /* yacc.c:358  */
+/* Unqualified %code blocks.  */
+#line 93 "dds.yy" /* yacc.c:359  */
+
+
+// No global static objects in the dap library! 1/24/2000 jhrg
+static stack<BaseType *> *ctor;
+static BaseType *current;
+static string *id;
+static Part part = nil;		/* Part is defined in BaseType */
+
+static const char *NO_DDS_MSG =
+"The descriptor object returned from the dataset was null.\n\
+Check that the URL is correct.";
+
+static const char *BAD_DECLARATION =
+"In the dataset descriptor object: Expected a variable declaration\n\
+(e.g., Int32 i;). Make sure that the variable name is not the name\n\
+of a datatype and that the Array: and Maps: sections of a Grid are\n\
+labeled properly.";
+
+int ddslex();
+void ddserror(parser_arg *arg, const string &s /*char *s*/);
+void error_exit_cleanup();
+void add_entry(DDS &table, stack<BaseType *> **ctor, BaseType **current, 
+	       Part p);
+void invalid_declaration(parser_arg *arg, string semantic_err_msg, 
+			 char *type, char *name);
+
+
+#line 234 "dds.tab.cc" /* yacc.c:359  */
+
+#ifdef short
+# undef short
+#endif
+
+#ifdef YYTYPE_UINT8
+typedef YYTYPE_UINT8 yytype_uint8;
+#else
+typedef unsigned char yytype_uint8;
+#endif
+
+#ifdef YYTYPE_INT8
+typedef YYTYPE_INT8 yytype_int8;
+#else
+typedef signed char yytype_int8;
+#endif
+
+#ifdef YYTYPE_UINT16
+typedef YYTYPE_UINT16 yytype_uint16;
+#else
+typedef unsigned short int yytype_uint16;
+#endif
+
+#ifdef YYTYPE_INT16
+typedef YYTYPE_INT16 yytype_int16;
+#else
+typedef short int yytype_int16;
+#endif
+
+#ifndef YYSIZE_T
+# ifdef __SIZE_TYPE__
+#  define YYSIZE_T __SIZE_TYPE__
+# elif defined size_t
+#  define YYSIZE_T size_t
+# elif ! defined YYSIZE_T
+#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYSIZE_T size_t
+# else
+#  define YYSIZE_T unsigned int
+# endif
+#endif
+
+#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
+
+#ifndef YY_
+# if defined YYENABLE_NLS && YYENABLE_NLS
+#  if ENABLE_NLS
+#   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
+#   define YY_(Msgid) dgettext ("bison-runtime", Msgid)
+#  endif
+# endif
+# ifndef YY_
+#  define YY_(Msgid) Msgid
+# endif
+#endif
+
+#ifndef YY_ATTRIBUTE
+# if (defined __GNUC__                                               \
+      && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__)))  \
+     || defined __SUNPRO_C && 0x5110 <= __SUNPRO_C
+#  define YY_ATTRIBUTE(Spec) __attribute__(Spec)
+# else
+#  define YY_ATTRIBUTE(Spec) /* empty */
+# endif
+#endif
+
+#ifndef YY_ATTRIBUTE_PURE
+# define YY_ATTRIBUTE_PURE   YY_ATTRIBUTE ((__pure__))
+#endif
+
+#ifndef YY_ATTRIBUTE_UNUSED
+# define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__))
+#endif
+
+#if !defined _Noreturn \
+     && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112)
+# if defined _MSC_VER && 1200 <= _MSC_VER
+#  define _Noreturn __declspec (noreturn)
+# else
+#  define _Noreturn YY_ATTRIBUTE ((__noreturn__))
+# endif
+#endif
+
+/* Suppress unused-variable warnings by "using" E.  */
+#if ! defined lint || defined __GNUC__
+# define YYUSE(E) ((void) (E))
+#else
+# define YYUSE(E) /* empty */
+#endif
+
+#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
+/* Suppress an incorrect diagnostic about yylval being uninitialized.  */
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
+    _Pragma ("GCC diagnostic push") \
+    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\
+    _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END \
+    _Pragma ("GCC diagnostic pop")
+#else
+# define YY_INITIAL_VALUE(Value) Value
+#endif
+#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END
+#endif
+#ifndef YY_INITIAL_VALUE
+# define YY_INITIAL_VALUE(Value) /* Nothing. */
+#endif
+
+
+#if ! defined yyoverflow || YYERROR_VERBOSE
+
+/* The parser invokes alloca or malloc; define the necessary symbols.  */
+
+# ifdef YYSTACK_USE_ALLOCA
+#  if YYSTACK_USE_ALLOCA
+#   ifdef __GNUC__
+#    define YYSTACK_ALLOC __builtin_alloca
+#   elif defined __BUILTIN_VA_ARG_INCR
+#    include <alloca.h> /* INFRINGES ON USER NAME SPACE */
+#   elif defined _AIX
+#    define YYSTACK_ALLOC __alloca
+#   elif defined _MSC_VER
+#    include <malloc.h> /* INFRINGES ON USER NAME SPACE */
+#    define alloca _alloca
+#   else
+#    define YYSTACK_ALLOC alloca
+#    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS
+#     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+      /* Use EXIT_SUCCESS as a witness for stdlib.h.  */
+#     ifndef EXIT_SUCCESS
+#      define EXIT_SUCCESS 0
+#     endif
+#    endif
+#   endif
+#  endif
+# endif
+
+# ifdef YYSTACK_ALLOC
+   /* Pacify GCC's 'empty if-body' warning.  */
+#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+    /* The OS might guarantee only one guard page at the bottom of the stack,
+       and a page size can be as small as 4096 bytes.  So we cannot safely
+       invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
+       to allow for a few compiler-allocated temporary stack slots.  */
+#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
+#  endif
+# else
+#  define YYSTACK_ALLOC YYMALLOC
+#  define YYSTACK_FREE YYFREE
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+#   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
+#  endif
+#  if (defined __cplusplus && ! defined EXIT_SUCCESS \
+       && ! ((defined YYMALLOC || defined malloc) \
+             && (defined YYFREE || defined free)))
+#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#   ifndef EXIT_SUCCESS
+#    define EXIT_SUCCESS 0
+#   endif
+#  endif
+#  ifndef YYMALLOC
+#   define YYMALLOC malloc
+#   if ! defined malloc && ! defined EXIT_SUCCESS
+void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+#  ifndef YYFREE
+#   define YYFREE free
+#   if ! defined free && ! defined EXIT_SUCCESS
+void free (void *); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+# endif
+#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
+
+
+#if (! defined yyoverflow \
+     && (! defined __cplusplus \
+         || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+
+/* A type that is properly aligned for any stack member.  */
+union yyalloc
+{
+  yytype_int16 yyss_alloc;
+  YYSTYPE yyvs_alloc;
+};
+
+/* The size of the maximum gap between one aligned stack and the next.  */
+# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
+
+/* The size of an array large to enough to hold all stacks, each with
+   N elements.  */
+# define YYSTACK_BYTES(N) \
+     ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
+      + YYSTACK_GAP_MAXIMUM)
+
+# define YYCOPY_NEEDED 1
+
+/* Relocate STACK from its old location to the new one.  The
+   local variables YYSIZE and YYSTACKSIZE give the old and new number of
+   elements in the stack, and YYPTR gives the new location of the
+   stack.  Advance YYPTR to a properly aligned location for the next
+   stack.  */
+# define YYSTACK_RELOCATE(Stack_alloc, Stack)                           \
+    do                                                                  \
+      {                                                                 \
+        YYSIZE_T yynewbytes;                                            \
+        YYCOPY (&yyptr->Stack_alloc, Stack, yysize);                    \
+        Stack = &yyptr->Stack_alloc;                                    \
+        yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
+        yyptr += yynewbytes / sizeof (*yyptr);                          \
+      }                                                                 \
+    while (0)
+
+#endif
+
+#if defined YYCOPY_NEEDED && YYCOPY_NEEDED
+/* Copy COUNT objects from SRC to DST.  The source and destination do
+   not overlap.  */
+# ifndef YYCOPY
+#  if defined __GNUC__ && 1 < __GNUC__
+#   define YYCOPY(Dst, Src, Count) \
+      __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src)))
+#  else
+#   define YYCOPY(Dst, Src, Count)              \
+      do                                        \
+        {                                       \
+          YYSIZE_T yyi;                         \
+          for (yyi = 0; yyi < (Count); yyi++)   \
+            (Dst)[yyi] = (Src)[yyi];            \
+        }                                       \
+      while (0)
+#  endif
+# endif
+#endif /* !YYCOPY_NEEDED */
+
+/* YYFINAL -- State number of the termination state.  */
+#define YYFINAL  3
+/* YYLAST -- Last index in YYTABLE.  */
+#define YYLAST   194
+
+/* YYNTOKENS -- Number of terminals.  */
+#define YYNTOKENS  26
+/* YYNNTS -- Number of nonterminals.  */
+#define YYNNTS  22
+/* YYNRULES -- Number of rules.  */
+#define YYNRULES  56
+/* YYNSTATES -- Number of states.  */
+#define YYNSTATES  88
+
+/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
+   by yylex, with out-of-bounds checking.  */
+#define YYUNDEFTOK  2
+#define YYMAXUTOK   273
+
+#define YYTRANSLATE(YYX)                                                \
+  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
+
+/* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM
+   as returned by yylex, without out-of-bounds checking.  */
+static const yytype_uint8 yytranslate[] =
+{
+       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,    22,    21,
+       2,    25,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,    23,     2,    24,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,    19,     2,    20,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18
+};
+
+#if YYDEBUG
+  /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
+static const yytype_uint16 yyrline[] =
+{
+       0,   160,   160,   160,   176,   177,   180,   184,   193,   196,
+     197,   206,   221,   220,   242,   241,   263,   275,   287,   262,
+     308,   318,   324,   330,   336,   337,   338,   339,   340,   341,
+     342,   343,   344,   347,   348,   351,   351,   351,   351,   351,
+     352,   352,   352,   352,   353,   353,   353,   353,   354,   357,
+     379,   383,   378,   409,   419,   420,   421
+};
+#endif
+
+#if YYDEBUG || YYERROR_VERBOSE || 0
+/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
+   First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
+static const char *const yytname[] =
+{
+  "$end", "error", "$undefined", "SCAN_WORD", "SCAN_DATASET", "SCAN_LIST",
+  "SCAN_SEQUENCE", "SCAN_STRUCTURE", "SCAN_FUNCTION", "SCAN_GRID",
+  "SCAN_BYTE", "SCAN_INT16", "SCAN_UINT16", "SCAN_INT32", "SCAN_UINT32",
+  "SCAN_FLOAT32", "SCAN_FLOAT64", "SCAN_STRING", "SCAN_URL", "'{'", "'}'",
+  "';'", "':'", "'['", "']'", "'='", "$accept", "start", "$@1", "datasets",
+  "dataset", "declarations", "declaration", "$@2", "$@3", "$@4", "$@5",
+  "$@6", "structure", "sequence", "grid", "base_type", "var", "var_name",
+  "array_decl", "$@7", "$@8", "name", YY_NULLPTR
+};
+#endif
+
+# ifdef YYPRINT
+/* YYTOKNUM[NUM] -- (External) token number corresponding to the
+   (internal) symbol number NUM (which must be that of a token).  */
+static const yytype_uint16 yytoknum[] =
+{
+       0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
+     265,   266,   267,   268,   269,   270,   271,   272,   273,   123,
+     125,    59,    58,    91,    93,    61
+};
+# endif
+
+#define YYPACT_NINF -53
+
+#define yypact_value_is_default(Yystate) \
+  (!!((Yystate) == (-53)))
+
+#define YYTABLE_NINF -9
+
+#define yytable_value_is_error(Yytable_value) \
+  0
+
+  /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+     STATE-NUM.  */
+static const yytype_int16 yypact[] =
+{
+     -53,    11,     9,   -53,   -53,    -7,     5,   -53,    52,   -53,
+     -53,   -53,   -53,   -53,   -53,   -53,   -53,   -53,   -53,   -53,
+     -53,   -53,   -53,    70,   -53,    -3,    -2,    -1,   176,   142,
+     -53,    52,    52,    16,   -53,   -53,   -53,   -53,   -53,   -53,
+     -53,   -53,   -53,   -53,   -53,   -53,   -53,   -53,     2,   -53,
+     -53,   -53,   -53,     0,    88,   106,    12,   -53,   -53,    17,
+     -53,   -53,   -53,   -53,   -53,    13,   176,   176,   160,   -53,
+      10,     3,     6,    19,    33,   -53,   -53,    18,   -53,   -53,
+      14,    52,   -53,   124,   -53,   176,     7,   -53
+};
+
+  /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
+     Performed when YYTABLE does not specify something else to do.  Zero
+     means the default is an error.  */
+static const yytype_uint8 yydefact[] =
+{
+       2,     0,     0,     1,     7,     0,     0,     4,     0,     5,
+      20,    22,    21,    23,    24,    25,    26,    27,    28,    29,
+      30,    31,    32,     0,     9,     0,     0,     0,     0,     0,
+      10,     0,     0,     0,    35,    48,    46,    45,    47,    36,
+      37,    39,    38,    40,    41,    42,    43,    44,     0,    33,
+      56,    55,    54,     0,     0,     0,     0,    53,    11,     0,
+      34,     6,    12,    14,    16,    50,     0,     0,     0,    49,
+       0,     0,     0,     0,     0,    13,    15,     0,    51,    17,
+       0,     0,    52,     0,    18,     0,     0,    19
+};
+
+  /* YYPGOTO[NTERM-NUM].  */
+static const yytype_int8 yypgoto[] =
+{
+     -53,   -53,   -53,   -53,    35,   -30,   -23,   -53,   -53,   -53,
+     -53,   -53,   -53,   -53,   -53,   -53,   -52,    15,   -53,   -53,
+     -53,   -53
+};
+
+  /* YYDEFGOTO[NTERM-NUM].  */
+static const yytype_int8 yydefgoto[] =
+{
+      -1,     1,     2,     6,     7,    23,    24,    66,    67,    68,
+      81,    85,    25,    26,    27,    28,    48,    49,    60,    70,
+      80,    53
+};
+
+  /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
+     positive, shift that token.  If negative, reduce the rule whose
+     number is the opposite.  If YYTABLE_NINF, syntax error.  */
+static const yytype_int8 yytable[] =
+{
+      30,    54,    55,    57,    57,    -3,     4,    57,    57,     5,
+       4,     3,     8,     5,    71,    72,    31,    32,    33,    56,
+      65,    61,    77,    58,    75,    59,    59,    76,    87,    59,
+      59,    30,    30,    86,    64,    74,    78,    69,    82,     0,
+      79,     9,     0,     0,    52,    73,     0,     0,     0,     0,
+       0,    83,     0,    10,     0,     0,     0,     0,    11,    12,
+      30,    13,    14,    15,    16,    17,    18,    19,    20,    21,
+      22,    10,    -8,     0,     0,     0,    11,    12,     0,    13,
+      14,    15,    16,    17,    18,    19,    20,    21,    22,    10,
+      29,     0,     0,     0,    11,    12,     0,    13,    14,    15,
+      16,    17,    18,    19,    20,    21,    22,    10,    62,     0,
+       0,     0,    11,    12,     0,    13,    14,    15,    16,    17,
+      18,    19,    20,    21,    22,    10,    63,     0,     0,     0,
+      11,    12,     0,    13,    14,    15,    16,    17,    18,    19,
+      20,    21,    22,    50,    84,    34,    51,    35,    36,    37,
+       0,    38,    39,    40,    41,    42,    43,    44,    45,    46,
+      47,    10,     0,     0,     0,     0,    11,    12,     0,    13,
+      14,    15,    16,    17,    18,    19,    20,    21,    22,    34,
+       0,    35,    36,    37,     0,    38,    39,    40,    41,    42,
+      43,    44,    45,    46,    47
+};
+
+static const yytype_int8 yycheck[] =
+{
+      23,    31,    32,     1,     1,     0,     1,     1,     1,     4,
+       1,     0,    19,     4,    66,    67,    19,    19,    19,     3,
+       3,    21,     3,    21,    21,    23,    23,    21,    21,    23,
+      23,    54,    55,    85,    22,    25,     3,    24,    24,    -1,
+      22,     6,    -1,    -1,    29,    68,    -1,    -1,    -1,    -1,
+      -1,    81,    -1,     1,    -1,    -1,    -1,    -1,     6,     7,
+      83,     9,    10,    11,    12,    13,    14,    15,    16,    17,
+      18,     1,    20,    -1,    -1,    -1,     6,     7,    -1,     9,
+      10,    11,    12,    13,    14,    15,    16,    17,    18,     1,
+      20,    -1,    -1,    -1,     6,     7,    -1,     9,    10,    11,
+      12,    13,    14,    15,    16,    17,    18,     1,    20,    -1,
+      -1,    -1,     6,     7,    -1,     9,    10,    11,    12,    13,
+      14,    15,    16,    17,    18,     1,    20,    -1,    -1,    -1,
+       6,     7,    -1,     9,    10,    11,    12,    13,    14,    15,
+      16,    17,    18,     1,    20,     3,     4,     5,     6,     7,
+      -1,     9,    10,    11,    12,    13,    14,    15,    16,    17,
+      18,     1,    -1,    -1,    -1,    -1,     6,     7,    -1,     9,
+      10,    11,    12,    13,    14,    15,    16,    17,    18,     3,
+      -1,     5,     6,     7,    -1,     9,    10,    11,    12,    13,
+      14,    15,    16,    17,    18
+};
+
+  /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+     symbol of state STATE-NUM.  */
+static const yytype_uint8 yystos[] =
+{
+       0,    27,    28,     0,     1,     4,    29,    30,    19,    30,
+       1,     6,     7,     9,    10,    11,    12,    13,    14,    15,
+      16,    17,    18,    31,    32,    38,    39,    40,    41,    20,
+      32,    19,    19,    19,     3,     5,     6,     7,     9,    10,
+      11,    12,    13,    14,    15,    16,    17,    18,    42,    43,
+       1,     4,    43,    47,    31,    31,     3,     1,    21,    23,
+      44,    21,    20,    20,    22,     3,    33,    34,    35,    24,
+      45,    42,    42,    32,    25,    21,    21,     3,     3,    22,
+      46,    36,    24,    31,    20,    37,    42,    21
+};
+
+  /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
+static const yytype_uint8 yyr1[] =
+{
+       0,    26,    28,    27,    29,    29,    30,    30,    31,    31,
+      31,    32,    33,    32,    34,    32,    35,    36,    37,    32,
+      32,    38,    39,    40,    41,    41,    41,    41,    41,    41,
+      41,    41,    41,    42,    42,    43,    43,    43,    43,    43,
+      43,    43,    43,    43,    43,    43,    43,    43,    43,    44,
+      45,    46,    44,    44,    47,    47,    47
+};
+
+  /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
+static const yytype_uint8 yyr2[] =
+{
+       0,     2,     0,     2,     1,     2,     6,     1,     0,     1,
+       2,     3,     0,     7,     0,     7,     0,     0,     0,    14,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     2,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     3,
+       0,     0,     7,     1,     1,     1,     1
+};
+
+
+#define yyerrok         (yyerrstatus = 0)
+#define yyclearin       (yychar = YYEMPTY)
+#define YYEMPTY         (-2)
+#define YYEOF           0
+
+#define YYACCEPT        goto yyacceptlab
+#define YYABORT         goto yyabortlab
+#define YYERROR         goto yyerrorlab
+
+
+#define YYRECOVERING()  (!!yyerrstatus)
+
+#define YYBACKUP(Token, Value)                                  \
+do                                                              \
+  if (yychar == YYEMPTY)                                        \
+    {                                                           \
+      yychar = (Token);                                         \
+      yylval = (Value);                                         \
+      YYPOPSTACK (yylen);                                       \
+      yystate = *yyssp;                                         \
+      goto yybackup;                                            \
+    }                                                           \
+  else                                                          \
+    {                                                           \
+      yyerror (arg, YY_("syntax error: cannot back up")); \
+      YYERROR;                                                  \
+    }                                                           \
+while (0)
+
+/* Error token number */
+#define YYTERROR        1
+#define YYERRCODE       256
+
+
+
+/* Enable debugging if requested.  */
+#if YYDEBUG
+
+# ifndef YYFPRINTF
+#  include <stdio.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYFPRINTF fprintf
+# endif
+
+# define YYDPRINTF(Args)                        \
+do {                                            \
+  if (yydebug)                                  \
+    YYFPRINTF Args;                             \
+} while (0)
+
+/* This macro is provided for backward compatibility. */
+#ifndef YY_LOCATION_PRINT
+# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+#endif
+
+
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)                    \
+do {                                                                      \
+  if (yydebug)                                                            \
+    {                                                                     \
+      YYFPRINTF (stderr, "%s ", Title);                                   \
+      yy_symbol_print (stderr,                                            \
+                  Type, Value, arg); \
+      YYFPRINTF (stderr, "\n");                                           \
+    }                                                                     \
+} while (0)
+
+
+/*----------------------------------------.
+| Print this symbol's value on YYOUTPUT.  |
+`----------------------------------------*/
+
+static void
+yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, parser_arg *arg)
+{
+  FILE *yyo = yyoutput;
+  YYUSE (yyo);
+  YYUSE (arg);
+  if (!yyvaluep)
+    return;
+# ifdef YYPRINT
+  if (yytype < YYNTOKENS)
+    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+# endif
+  YYUSE (yytype);
+}
+
+
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
+
+static void
+yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, parser_arg *arg)
+{
+  YYFPRINTF (yyoutput, "%s %s (",
+             yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]);
+
+  yy_symbol_value_print (yyoutput, yytype, yyvaluep, arg);
+  YYFPRINTF (yyoutput, ")");
+}
+
+/*------------------------------------------------------------------.
+| yy_stack_print -- Print the state stack from its BOTTOM up to its |
+| TOP (included).                                                   |
+`------------------------------------------------------------------*/
+
+static void
+yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
+{
+  YYFPRINTF (stderr, "Stack now");
+  for (; yybottom <= yytop; yybottom++)
+    {
+      int yybot = *yybottom;
+      YYFPRINTF (stderr, " %d", yybot);
+    }
+  YYFPRINTF (stderr, "\n");
+}
+
+# define YY_STACK_PRINT(Bottom, Top)                            \
+do {                                                            \
+  if (yydebug)                                                  \
+    yy_stack_print ((Bottom), (Top));                           \
+} while (0)
+
+
+/*------------------------------------------------.
+| Report that the YYRULE is going to be reduced.  |
+`------------------------------------------------*/
+
+static void
+yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule, parser_arg *arg)
+{
+  unsigned long int yylno = yyrline[yyrule];
+  int yynrhs = yyr2[yyrule];
+  int yyi;
+  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
+             yyrule - 1, yylno);
+  /* The symbols being reduced.  */
+  for (yyi = 0; yyi < yynrhs; yyi++)
+    {
+      YYFPRINTF (stderr, "   $%d = ", yyi + 1);
+      yy_symbol_print (stderr,
+                       yystos[yyssp[yyi + 1 - yynrhs]],
+                       &(yyvsp[(yyi + 1) - (yynrhs)])
+                                              , arg);
+      YYFPRINTF (stderr, "\n");
+    }
+}
+
+# define YY_REDUCE_PRINT(Rule)          \
+do {                                    \
+  if (yydebug)                          \
+    yy_reduce_print (yyssp, yyvsp, Rule, arg); \
+} while (0)
+
+/* Nonzero means print parse trace.  It is left uninitialized so that
+   multiple parsers can coexist.  */
+int yydebug;
+#else /* !YYDEBUG */
+# define YYDPRINTF(Args)
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
+# define YY_STACK_PRINT(Bottom, Top)
+# define YY_REDUCE_PRINT(Rule)
+#endif /* !YYDEBUG */
+
+
+/* YYINITDEPTH -- initial size of the parser's stacks.  */
+#ifndef YYINITDEPTH
+# define YYINITDEPTH 200
+#endif
+
+/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
+   if the built-in stack extension method is used).
+
+   Do not make this value too large; the results are undefined if
+   YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
+   evaluated with infinite-precision integer arithmetic.  */
+
+#ifndef YYMAXDEPTH
+# define YYMAXDEPTH 10000
+#endif
+
+
+#if YYERROR_VERBOSE
+
+# ifndef yystrlen
+#  if defined __GLIBC__ && defined _STRING_H
+#   define yystrlen strlen
+#  else
+/* Return the length of YYSTR.  */
+static YYSIZE_T
+yystrlen (const char *yystr)
+{
+  YYSIZE_T yylen;
+  for (yylen = 0; yystr[yylen]; yylen++)
+    continue;
+  return yylen;
+}
+#  endif
+# endif
+
+# ifndef yystpcpy
+#  if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
+#   define yystpcpy stpcpy
+#  else
+/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
+   YYDEST.  */
+static char *
+yystpcpy (char *yydest, const char *yysrc)
+{
+  char *yyd = yydest;
+  const char *yys = yysrc;
+
+  while ((*yyd++ = *yys++) != '\0')
+    continue;
+
+  return yyd - 1;
+}
+#  endif
+# endif
+
+# ifndef yytnamerr
+/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
+   quotes and backslashes, so that it's suitable for yyerror.  The
+   heuristic is that double-quoting is unnecessary unless the string
+   contains an apostrophe, a comma, or backslash (other than
+   backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
+   null, do not copy; instead, return the length of what the result
+   would have been.  */
+static YYSIZE_T
+yytnamerr (char *yyres, const char *yystr)
+{
+  if (*yystr == '"')
+    {
+      YYSIZE_T yyn = 0;
+      char const *yyp = yystr;
+
+      for (;;)
+        switch (*++yyp)
+          {
+          case '\'':
+          case ',':
+            goto do_not_strip_quotes;
+
+          case '\\':
+            if (*++yyp != '\\')
+              goto do_not_strip_quotes;
+            /* Fall through.  */
+          default:
+            if (yyres)
+              yyres[yyn] = *yyp;
+            yyn++;
+            break;
+
+          case '"':
+            if (yyres)
+              yyres[yyn] = '\0';
+            return yyn;
+          }
+    do_not_strip_quotes: ;
+    }
+
+  if (! yyres)
+    return yystrlen (yystr);
+
+  return yystpcpy (yyres, yystr) - yyres;
+}
+# endif
+
+/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
+   about the unexpected token YYTOKEN for the state stack whose top is
+   YYSSP.
+
+   Return 0 if *YYMSG was successfully written.  Return 1 if *YYMSG is
+   not large enough to hold the message.  In that case, also set
+   *YYMSG_ALLOC to the required number of bytes.  Return 2 if the
+   required number of bytes is too large to store.  */
+static int
+yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
+                yytype_int16 *yyssp, int yytoken)
+{
+  YYSIZE_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]);
+  YYSIZE_T yysize = yysize0;
+  enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+  /* Internationalized format string. */
+  const char *yyformat = YY_NULLPTR;
+  /* Arguments of yyformat. */
+  char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+  /* Number of reported tokens (one for the "unexpected", one per
+     "expected"). */
+  int yycount = 0;
+
+  /* There are many possibilities here to consider:
+     - If this state is a consistent state with a default action, then
+       the only way this function was invoked is if the default action
+       is an error action.  In that case, don't check for expected
+       tokens because there are none.
+     - The only way there can be no lookahead present (in yychar) is if
+       this state is a consistent state with a default action.  Thus,
+       detecting the absence of a lookahead is sufficient to determine
+       that there is no unexpected or expected token to report.  In that
+       case, just report a simple "syntax error".
+     - Don't assume there isn't a lookahead just because this state is a
+       consistent state with a default action.  There might have been a
+       previous inconsistent state, consistent state with a non-default
+       action, or user semantic action that manipulated yychar.
+     - Of course, the expected token list depends on states to have
+       correct lookahead information, and it depends on the parser not
+       to perform extra reductions after fetching a lookahead from the
+       scanner and before detecting a syntax error.  Thus, state merging
+       (from LALR or IELR) and default reductions corrupt the expected
+       token list.  However, the list is correct for canonical LR with
+       one exception: it will still contain any token that will not be
+       accepted due to an error action in a later state.
+  */
+  if (yytoken != YYEMPTY)
+    {
+      int yyn = yypact[*yyssp];
+      yyarg[yycount++] = yytname[yytoken];
+      if (!yypact_value_is_default (yyn))
+        {
+          /* Start YYX at -YYN if negative to avoid negative indexes in
+             YYCHECK.  In other words, skip the first -YYN actions for
+             this state because they are default actions.  */
+          int yyxbegin = yyn < 0 ? -yyn : 0;
+          /* Stay within bounds of both yycheck and yytname.  */
+          int yychecklim = YYLAST - yyn + 1;
+          int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+          int yyx;
+
+          for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+            if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
+                && !yytable_value_is_error (yytable[yyx + yyn]))
+              {
+                if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+                  {
+                    yycount = 1;
+                    yysize = yysize0;
+                    break;
+                  }
+                yyarg[yycount++] = yytname[yyx];
+                {
+                  YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]);
+                  if (! (yysize <= yysize1
+                         && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+                    return 2;
+                  yysize = yysize1;
+                }
+              }
+        }
+    }
+
+  switch (yycount)
+    {
+# define YYCASE_(N, S)                      \
+      case N:                               \
+        yyformat = S;                       \
+      break
+      YYCASE_(0, YY_("syntax error"));
+      YYCASE_(1, YY_("syntax error, unexpected %s"));
+      YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
+      YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
+      YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
+      YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
+# undef YYCASE_
+    }
+
+  {
+    YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
+    if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+      return 2;
+    yysize = yysize1;
+  }
+
+  if (*yymsg_alloc < yysize)
+    {
+      *yymsg_alloc = 2 * yysize;
+      if (! (yysize <= *yymsg_alloc
+             && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
+        *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
+      return 1;
+    }
+
+  /* Avoid sprintf, as that infringes on the user's name space.
+     Don't have undefined behavior even if the translation
+     produced a string with the wrong number of "%s"s.  */
+  {
+    char *yyp = *yymsg;
+    int yyi = 0;
+    while ((*yyp = *yyformat) != '\0')
+      if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
+        {
+          yyp += yytnamerr (yyp, yyarg[yyi++]);
+          yyformat += 2;
+        }
+      else
+        {
+          yyp++;
+          yyformat++;
+        }
+  }
+  return 0;
+}
+#endif /* YYERROR_VERBOSE */
+
+/*-----------------------------------------------.
+| Release the memory associated to this symbol.  |
+`-----------------------------------------------*/
+
+static void
+yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, parser_arg *arg)
+{
+  YYUSE (yyvaluep);
+  YYUSE (arg);
+  if (!yymsg)
+    yymsg = "Deleting";
+  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
+
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+  YYUSE (yytype);
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
+}
+
+
+
+
+/* The lookahead symbol.  */
+int yychar;
+
+/* The semantic value of the lookahead symbol.  */
+YYSTYPE yylval;
+/* Number of syntax errors so far.  */
+int yynerrs;
+
+
+/*----------.
+| yyparse.  |
+`----------*/
+
+int
+yyparse (parser_arg *arg)
+{
+    int yystate;
+    /* Number of tokens to shift before error messages enabled.  */
+    int yyerrstatus;
+
+    /* The stacks and their tools:
+       'yyss': related to states.
+       'yyvs': related to semantic values.
+
+       Refer to the stacks through separate pointers, to allow yyoverflow
+       to reallocate them elsewhere.  */
+
+    /* The state stack.  */
+    yytype_int16 yyssa[YYINITDEPTH];
+    yytype_int16 *yyss;
+    yytype_int16 *yyssp;
+
+    /* The semantic value stack.  */
+    YYSTYPE yyvsa[YYINITDEPTH];
+    YYSTYPE *yyvs;
+    YYSTYPE *yyvsp;
+
+    YYSIZE_T yystacksize;
+
+  int yyn;
+  int yyresult;
+  /* Lookahead token as an internal (translated) token number.  */
+  int yytoken = 0;
+  /* The variables used to return semantic value and location from the
+     action routines.  */
+  YYSTYPE yyval;
+
+#if YYERROR_VERBOSE
+  /* Buffer for error messages, and its allocated size.  */
+  char yymsgbuf[128];
+  char *yymsg = yymsgbuf;
+  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
+#endif
+
+#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
+
+  /* The number of symbols on the RHS of the reduced rule.
+     Keep to zero when no symbol should be popped.  */
+  int yylen = 0;
+
+  yyssp = yyss = yyssa;
+  yyvsp = yyvs = yyvsa;
+  yystacksize = YYINITDEPTH;
+
+  YYDPRINTF ((stderr, "Starting parse\n"));
+
+  yystate = 0;
+  yyerrstatus = 0;
+  yynerrs = 0;
+  yychar = YYEMPTY; /* Cause a token to be read.  */
+  goto yysetstate;
+
+/*------------------------------------------------------------.
+| yynewstate -- Push a new state, which is found in yystate.  |
+`------------------------------------------------------------*/
+ yynewstate:
+  /* In all cases, when you get here, the value and location stacks
+     have just been pushed.  So pushing a state here evens the stacks.  */
+  yyssp++;
+
+ yysetstate:
+  *yyssp = yystate;
+
+  if (yyss + yystacksize - 1 <= yyssp)
+    {
+      /* Get the current used size of the three stacks, in elements.  */
+      YYSIZE_T yysize = yyssp - yyss + 1;
+
+#ifdef yyoverflow
+      {
+        /* Give user a chance to reallocate the stack.  Use copies of
+           these so that the &'s don't force the real ones into
+           memory.  */
+        YYSTYPE *yyvs1 = yyvs;
+        yytype_int16 *yyss1 = yyss;
+
+        /* Each stack pointer address is followed by the size of the
+           data in use in that stack, in bytes.  This used to be a
+           conditional around just the two extra args, but that might
+           be undefined if yyoverflow is a macro.  */
+        yyoverflow (YY_("memory exhausted"),
+                    &yyss1, yysize * sizeof (*yyssp),
+                    &yyvs1, yysize * sizeof (*yyvsp),
+                    &yystacksize);
+
+        yyss = yyss1;
+        yyvs = yyvs1;
+      }
+#else /* no yyoverflow */
+# ifndef YYSTACK_RELOCATE
+      goto yyexhaustedlab;
+# else
+      /* Extend the stack our own way.  */
+      if (YYMAXDEPTH <= yystacksize)
+        goto yyexhaustedlab;
+      yystacksize *= 2;
+      if (YYMAXDEPTH < yystacksize)
+        yystacksize = YYMAXDEPTH;
+
+      {
+        yytype_int16 *yyss1 = yyss;
+        union yyalloc *yyptr =
+          (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
+        if (! yyptr)
+          goto yyexhaustedlab;
+        YYSTACK_RELOCATE (yyss_alloc, yyss);
+        YYSTACK_RELOCATE (yyvs_alloc, yyvs);
+#  undef YYSTACK_RELOCATE
+        if (yyss1 != yyssa)
+          YYSTACK_FREE (yyss1);
+      }
+# endif
+#endif /* no yyoverflow */
+
+      yyssp = yyss + yysize - 1;
+      yyvsp = yyvs + yysize - 1;
+
+      YYDPRINTF ((stderr, "Stack size increased to %lu\n",
+                  (unsigned long int) yystacksize));
+
+      if (yyss + yystacksize - 1 <= yyssp)
+        YYABORT;
+    }
+
+  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
+
+  if (yystate == YYFINAL)
+    YYACCEPT;
+
+  goto yybackup;
+
+/*-----------.
+| yybackup.  |
+`-----------*/
+yybackup:
+
+  /* Do appropriate processing given the current state.  Read a
+     lookahead token if we need one and don't already have one.  */
+
+  /* First try to decide what to do without reference to lookahead token.  */
+  yyn = yypact[yystate];
+  if (yypact_value_is_default (yyn))
+    goto yydefault;
+
+  /* Not known => get a lookahead token if don't already have one.  */
+
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
+  if (yychar == YYEMPTY)
+    {
+      YYDPRINTF ((stderr, "Reading a token: "));
+      yychar = yylex ();
+    }
+
+  if (yychar <= YYEOF)
+    {
+      yychar = yytoken = YYEOF;
+      YYDPRINTF ((stderr, "Now at end of input.\n"));
+    }
+  else
+    {
+      yytoken = YYTRANSLATE (yychar);
+      YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
+    }
+
+  /* If the proper action on seeing token YYTOKEN is to reduce or to
+     detect an error, take that action.  */
+  yyn += yytoken;
+  if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
+    goto yydefault;
+  yyn = yytable[yyn];
+  if (yyn <= 0)
+    {
+      if (yytable_value_is_error (yyn))
+        goto yyerrlab;
+      yyn = -yyn;
+      goto yyreduce;
+    }
+
+  /* Count tokens shifted since error; after three, turn off error
+     status.  */
+  if (yyerrstatus)
+    yyerrstatus--;
+
+  /* Shift the lookahead token.  */
+  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
+
+  /* Discard the shifted token.  */
+  yychar = YYEMPTY;
+
+  yystate = yyn;
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+  *++yyvsp = yylval;
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
+
+  goto yynewstate;
+
+
+/*-----------------------------------------------------------.
+| yydefault -- do the default action for the current state.  |
+`-----------------------------------------------------------*/
+yydefault:
+  yyn = yydefact[yystate];
+  if (yyn == 0)
+    goto yyerrlab;
+  goto yyreduce;
+
+
+/*-----------------------------.
+| yyreduce -- Do a reduction.  |
+`-----------------------------*/
+yyreduce:
+  /* yyn is the number of a rule to reduce with.  */
+  yylen = yyr2[yyn];
+
+  /* If YYLEN is nonzero, implement the default value of the action:
+     '$$ = $1'.
+
+     Otherwise, the following line sets YYVAL to garbage.
+     This behavior is undocumented and Bison
+     users should not rely upon it.  Assigning to YYVAL
+     unconditionally makes the parser a bit smaller, and it avoids a
+     GCC warning that YYVAL may be used uninitialized.  */
+  yyval = yyvsp[1-yylen];
+
+
+  YY_REDUCE_PRINT (yyn);
+  switch (yyn)
+    {
+        case 2:
+#line 160 "dds.yy" /* yacc.c:1661  */
+    {
+		    /* On entry to the parser, make the BaseType stack. 
+		       I use if (!ctor) here because in the tab.cc file,
+		       this is a case block in a switch, so it could be
+		       run more than once, causing the storage to be
+		       overwritten. jhrg 6/26/15 */
+		       
+		    if (!ctor)
+		    	ctor = new stack<BaseType *>;
+        }
+#line 1401 "dds.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 3:
+#line 171 "dds.yy" /* yacc.c:1661  */
+    {
+		    delete ctor; ctor = 0;
+		}
+#line 1409 "dds.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 6:
+#line 181 "dds.yy" /* yacc.c:1661  */
+    {
+		    (yyval.boolean) = (yyvsp[-3].boolean) && (yyvsp[-1].boolean);
+		}
+#line 1417 "dds.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 7:
+#line 185 "dds.yy" /* yacc.c:1661  */
+    {
+		    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  */
+    break;
+
+  case 8:
+#line 193 "dds.yy" /* yacc.c:1661  */
+    {
+		    (yyval.boolean) = true;
+		}
+#line 1435 "dds.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 9:
+#line 196 "dds.yy" /* yacc.c:1661  */
+    { (yyval.boolean) = true; }
+#line 1441 "dds.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 10:
+#line 197 "dds.yy" /* yacc.c:1661  */
+    { (yyval.boolean) = true; }
+#line 1447 "dds.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 11:
+#line 207 "dds.yy" /* yacc.c:1661  */
+    { 
+		    string smsg;
+		    if (current->check_semantics(smsg)) {
+			    add_entry(*DDS_OBJ(arg), &ctor, &current, part); 
+		    } else {
+		      invalid_declaration((parser_arg *)arg, smsg, (yyvsp[-2].word), (yyvsp[-1].word));
+		      error_exit_cleanup();
+		      YYABORT;
+		    }
+            strncpy((yyval.word),(yyvsp[-1].word),ID_MAX);
+            (yyval.word)[ID_MAX-1] = '\0';
+		}
+#line 1464 "dds.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 12:
+#line 221 "dds.yy" /* yacc.c:1661  */
+    { 
+		    if( current ) delete current ;
+		    current = ctor->top(); 
+		    ctor->pop();
+		}
+#line 1474 "dds.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 13:
+#line 227 "dds.yy" /* yacc.c:1661  */
+    { 
+		    string smsg;
+		    if (current->check_semantics(smsg)) {
+			    add_entry(*DDS_OBJ(arg), &ctor, &current, part); 
+			}
+		    else {
+		        invalid_declaration((parser_arg *)arg, smsg, (yyvsp[-6].word), (yyvsp[-1].word));
+		        error_exit_cleanup();
+		        YYABORT;
+		    }
+            strncpy((yyval.word),(yyvsp[-1].word),ID_MAX);
+            (yyval.word)[ID_MAX-1] = '\0';
+		}
+#line 1492 "dds.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 14:
+#line 242 "dds.yy" /* yacc.c:1661  */
+    { 
+		    if( current ) delete current ;
+		    current = ctor->top(); 
+		    ctor->pop();
+		}
+#line 1502 "dds.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 15:
+#line 248 "dds.yy" /* yacc.c:1661  */
+    { 
+		    string smsg;
+		    if (current->check_semantics(smsg)) {
+			    add_entry(*DDS_OBJ(arg), &ctor, &current, part); 
+			}
+		    else {
+		      invalid_declaration((parser_arg *)arg, smsg, (yyvsp[-6].word), (yyvsp[-1].word));
+		      error_exit_cleanup();
+		      YYABORT;
+		    }
+            strncpy((yyval.word),(yyvsp[-1].word),ID_MAX);
+            (yyval.word)[ID_MAX-1] = '\0';
+		}
+#line 1520 "dds.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 16:
+#line 263 "dds.yy" /* yacc.c:1661  */
+    { 
+		    if (is_keyword(string((yyvsp[-1].word)), "array")) {
+			    part = libdap::array;
+			}
+		    else {
+			    ostringstream msg;
+			    msg << BAD_DECLARATION;
+			    parse_error((parser_arg *)arg, msg.str().c_str(), dds_line_num, (yyvsp[-1].word));
+			    YYABORT;
+		    }
+        }
+#line 1536 "dds.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 17:
+#line 275 "dds.yy" /* yacc.c:1661  */
+    { 
+		    if (is_keyword(string((yyvsp[-1].word)), "maps")) {
+			    part = maps; 
+			}
+		    else {
+			    ostringstream msg;
+			    msg << BAD_DECLARATION;
+			    parse_error((parser_arg *)arg, msg.str().c_str(), dds_line_num, (yyvsp[-1].word));
+			    YYABORT;
+		    }
+        }
+#line 1552 "dds.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 18:
+#line 287 "dds.yy" /* yacc.c:1661  */
+    {
+		    if( current ) delete current ;
+		    current = ctor->top(); 
+		    ctor->pop();
+		}
+#line 1562 "dds.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 19:
+#line 293 "dds.yy" /* yacc.c:1661  */
+    {
+		    string smsg;
+		    if (current->check_semantics(smsg)) {
+			    part = nil; 
+			    add_entry(*DDS_OBJ(arg), &ctor, &current, part); 
+		    }
+		    else {
+		      invalid_declaration((parser_arg *)arg, smsg, (yyvsp[-13].word), (yyvsp[-1].word));
+		      error_exit_cleanup();
+		      YYABORT;
+		    }
+        strncpy((yyval.word),(yyvsp[-1].word),ID_MAX);
+        (yyval.word)[ID_MAX-1] = '\0';
+		}
+#line 1581 "dds.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 20:
+#line 309 "dds.yy" /* yacc.c:1661  */
+    {
+		    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  */
+    break;
+
+  case 21:
+#line 319 "dds.yy" /* yacc.c:1661  */
+    { 
+		    ctor->push(DDS_OBJ(arg)->get_factory()->NewStructure()); 
+		}
+#line 1600 "dds.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 22:
+#line 325 "dds.yy" /* yacc.c:1661  */
+    { 
+		    ctor->push(DDS_OBJ(arg)->get_factory()->NewSequence()); 
+		}
+#line 1608 "dds.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 23:
+#line 331 "dds.yy" /* yacc.c:1661  */
+    { 
+		    ctor->push(DDS_OBJ(arg)->get_factory()->NewGrid()); 
+		}
+#line 1616 "dds.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 24:
+#line 336 "dds.yy" /* yacc.c:1661  */
+    { if( current ) delete current ;current = DDS_OBJ(arg)->get_factory()->NewByte(); }
+#line 1622 "dds.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 25:
+#line 337 "dds.yy" /* yacc.c:1661  */
+    { if( current ) delete current ;current = DDS_OBJ(arg)->get_factory()->NewInt16(); }
+#line 1628 "dds.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 26:
+#line 338 "dds.yy" /* yacc.c:1661  */
+    { if( current ) delete current ;current = DDS_OBJ(arg)->get_factory()->NewUInt16(); }
+#line 1634 "dds.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 27:
+#line 339 "dds.yy" /* yacc.c:1661  */
+    { if( current ) delete current ;current = DDS_OBJ(arg)->get_factory()->NewInt32(); }
+#line 1640 "dds.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 28:
+#line 340 "dds.yy" /* yacc.c:1661  */
+    { if( current ) delete current ;current = DDS_OBJ(arg)->get_factory()->NewUInt32(); }
+#line 1646 "dds.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 29:
+#line 341 "dds.yy" /* yacc.c:1661  */
+    { if( current ) delete current ;current = DDS_OBJ(arg)->get_factory()->NewFloat32(); }
+#line 1652 "dds.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 30:
+#line 342 "dds.yy" /* yacc.c:1661  */
+    { if( current ) delete current ;current = DDS_OBJ(arg)->get_factory()->NewFloat64(); }
+#line 1658 "dds.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 31:
+#line 343 "dds.yy" /* yacc.c:1661  */
+    { if( current ) delete current ;current = DDS_OBJ(arg)->get_factory()->NewStr(); }
+#line 1664 "dds.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 32:
+#line 344 "dds.yy" /* yacc.c:1661  */
+    { if( current ) delete current ;current = DDS_OBJ(arg)->get_factory()->NewUrl(); }
+#line 1670 "dds.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 33:
+#line 347 "dds.yy" /* yacc.c:1661  */
+    { current->set_name((yyvsp[0].word)); }
+#line 1676 "dds.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 49:
+#line 358 "dds.yy" /* yacc.c:1661  */
+    { 
+		    if (!check_int32((yyvsp[-1].word))) {
+			    string msg = "In the dataset descriptor object:\n";
+			    msg += "Expected an array subscript.\n";
+			    parse_error((parser_arg *)arg, msg.c_str(), dds_line_num, (yyvsp[-1].word));
+		    }
+		    if (current->type() == dods_array_c && check_int32((yyvsp[-1].word))) {
+			    ((Array *)current)->append_dim(atoi((yyvsp[-1].word)));
+		    }
+		    else {
+			    Array *a = DDS_OBJ(arg)->get_factory()->NewArray(); 
+			    a->add_var(current); 
+			    a->append_dim(atoi((yyvsp[-1].word)));
+			    if( current ) delete current ;
+			    current = a;
+		    }
+
+		    (yyval.boolean) = true;
+		 }
+#line 1700 "dds.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 50:
+#line 379 "dds.yy" /* yacc.c:1661  */
+    {
+		     if (!id) id = new string((yyvsp[0].word));
+		 }
+#line 1708 "dds.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 51:
+#line 383 "dds.yy" /* yacc.c:1661  */
+    { 
+		     if (!check_int32((yyvsp[0].word))) {
+			     string msg = "In the dataset descriptor object:\n";
+			     msg += "Expected an array subscript.\n";
+			     parse_error((parser_arg *)arg, msg.c_str(), dds_line_num, (yyvsp[0].word));
+			     error_exit_cleanup();
+			     YYABORT;
+		     }
+		     if (current->type() == dods_array_c) {
+			     ((Array *)current)->append_dim(atoi((yyvsp[0].word)), *id);
+		     }
+		     else {
+			     Array *a = DDS_OBJ(arg)->get_factory()->NewArray(); 
+			     a->add_var(current); 
+			     a->append_dim(atoi((yyvsp[0].word)), *id);
+			     if( current ) delete current ;
+			     current = a;
+		     }
+
+		     delete id; id = 0;
+		 }
+#line 1734 "dds.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 52:
+#line 405 "dds.yy" /* yacc.c:1661  */
+    {
+		     (yyval.boolean) = true;
+		 }
+#line 1742 "dds.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 53:
+#line 410 "dds.yy" /* yacc.c:1661  */
+    {
+		     ostringstream msg;
+		     msg << "In the dataset descriptor object:" << endl
+			     << "Expected an array subscript." << endl;
+		     parse_error((parser_arg *)arg, msg.str().c_str(), dds_line_num, (yyvsp[0].word));
+		     YYABORT;
+		 }
+#line 1754 "dds.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 54:
+#line 419 "dds.yy" /* yacc.c:1661  */
+    { (*DDS_OBJ(arg)).set_dataset_name((yyvsp[0].word)); (yyval.boolean) = true;}
+#line 1760 "dds.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 55:
+#line 420 "dds.yy" /* yacc.c:1661  */
+    { (*DDS_OBJ(arg)).set_dataset_name((yyvsp[0].word)); (yyval.boolean) = true; }
+#line 1766 "dds.tab.cc" /* yacc.c:1661  */
+    break;
+
+  case 56:
+#line 422 "dds.yy" /* yacc.c:1661  */
+    {
+		    ostringstream msg;
+		    msg << "Error parsing the dataset name." << endl
+		        << "The name may be missing or may contain an illegal character." << endl;
+		    parse_error((parser_arg *)arg, msg.str().c_str(), dds_line_num, (yyvsp[0].word));
+		    YYABORT;
+		}
+#line 1778 "dds.tab.cc" /* yacc.c:1661  */
+    break;
+
+
+#line 1782 "dds.tab.cc" /* yacc.c:1661  */
+      default: break;
+    }
+  /* User semantic actions sometimes alter yychar, and that requires
+     that yytoken be updated with the new translation.  We take the
+     approach of translating immediately before every use of yytoken.
+     One alternative is translating here after every semantic action,
+     but that translation would be missed if the semantic action invokes
+     YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
+     if it invokes YYBACKUP.  In the case of YYABORT or YYACCEPT, an
+     incorrect destructor might then be invoked immediately.  In the
+     case of YYERROR or YYBACKUP, subsequent parser actions might lead
+     to an incorrect destructor call or verbose syntax error message
+     before the lookahead is translated.  */
+  YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
+
+  YYPOPSTACK (yylen);
+  yylen = 0;
+  YY_STACK_PRINT (yyss, yyssp);
+
+  *++yyvsp = yyval;
+
+  /* Now 'shift' the result of the reduction.  Determine what state
+     that goes to, based on the state we popped back to and the rule
+     number reduced by.  */
+
+  yyn = yyr1[yyn];
+
+  yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
+  if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
+    yystate = yytable[yystate];
+  else
+    yystate = yydefgoto[yyn - YYNTOKENS];
+
+  goto yynewstate;
+
+
+/*--------------------------------------.
+| yyerrlab -- here on detecting error.  |
+`--------------------------------------*/
+yyerrlab:
+  /* Make sure we have latest lookahead translation.  See comments at
+     user semantic actions for why this is necessary.  */
+  yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
+
+  /* If not already recovering from an error, report this error.  */
+  if (!yyerrstatus)
+    {
+      ++yynerrs;
+#if ! YYERROR_VERBOSE
+      yyerror (arg, YY_("syntax error"));
+#else
+# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
+                                        yyssp, yytoken)
+      {
+        char const *yymsgp = YY_("syntax error");
+        int yysyntax_error_status;
+        yysyntax_error_status = YYSYNTAX_ERROR;
+        if (yysyntax_error_status == 0)
+          yymsgp = yymsg;
+        else if (yysyntax_error_status == 1)
+          {
+            if (yymsg != yymsgbuf)
+              YYSTACK_FREE (yymsg);
+            yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
+            if (!yymsg)
+              {
+                yymsg = yymsgbuf;
+                yymsg_alloc = sizeof yymsgbuf;
+                yysyntax_error_status = 2;
+              }
+            else
+              {
+                yysyntax_error_status = YYSYNTAX_ERROR;
+                yymsgp = yymsg;
+              }
+          }
+        yyerror (arg, yymsgp);
+        if (yysyntax_error_status == 2)
+          goto yyexhaustedlab;
+      }
+# undef YYSYNTAX_ERROR
+#endif
+    }
+
+
+
+  if (yyerrstatus == 3)
+    {
+      /* If just tried and failed to reuse lookahead token after an
+         error, discard it.  */
+
+      if (yychar <= YYEOF)
+        {
+          /* Return failure if at end of input.  */
+          if (yychar == YYEOF)
+            YYABORT;
+        }
+      else
+        {
+          yydestruct ("Error: discarding",
+                      yytoken, &yylval, arg);
+          yychar = YYEMPTY;
+        }
+    }
+
+  /* Else will try to reuse lookahead token after shifting the error
+     token.  */
+  goto yyerrlab1;
+
+
+/*---------------------------------------------------.
+| yyerrorlab -- error raised explicitly by YYERROR.  |
+`---------------------------------------------------*/
+yyerrorlab:
+
+  /* Pacify compilers like GCC when the user code never invokes
+     YYERROR and the label yyerrorlab therefore never appears in user
+     code.  */
+  if (/*CONSTCOND*/ 0)
+     goto yyerrorlab;
+
+  /* Do not reclaim the symbols of the rule whose action triggered
+     this YYERROR.  */
+  YYPOPSTACK (yylen);
+  yylen = 0;
+  YY_STACK_PRINT (yyss, yyssp);
+  yystate = *yyssp;
+  goto yyerrlab1;
+
+
+/*-------------------------------------------------------------.
+| yyerrlab1 -- common code for both syntax error and YYERROR.  |
+`-------------------------------------------------------------*/
+yyerrlab1:
+  yyerrstatus = 3;      /* Each real token shifted decrements this.  */
+
+  for (;;)
+    {
+      yyn = yypact[yystate];
+      if (!yypact_value_is_default (yyn))
+        {
+          yyn += YYTERROR;
+          if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
+            {
+              yyn = yytable[yyn];
+              if (0 < yyn)
+                break;
+            }
+        }
+
+      /* Pop the current state because it cannot handle the error token.  */
+      if (yyssp == yyss)
+        YYABORT;
+
+
+      yydestruct ("Error: popping",
+                  yystos[yystate], yyvsp, arg);
+      YYPOPSTACK (1);
+      yystate = *yyssp;
+      YY_STACK_PRINT (yyss, yyssp);
+    }
+
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+  *++yyvsp = yylval;
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
+
+
+  /* Shift the error token.  */
+  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
+
+  yystate = yyn;
+  goto yynewstate;
+
+
+/*-------------------------------------.
+| yyacceptlab -- YYACCEPT comes here.  |
+`-------------------------------------*/
+yyacceptlab:
+  yyresult = 0;
+  goto yyreturn;
+
+/*-----------------------------------.
+| yyabortlab -- YYABORT comes here.  |
+`-----------------------------------*/
+yyabortlab:
+  yyresult = 1;
+  goto yyreturn;
+
+#if !defined yyoverflow || YYERROR_VERBOSE
+/*-------------------------------------------------.
+| yyexhaustedlab -- memory exhaustion comes here.  |
+`-------------------------------------------------*/
+yyexhaustedlab:
+  yyerror (arg, YY_("memory exhausted"));
+  yyresult = 2;
+  /* Fall through.  */
+#endif
+
+yyreturn:
+  if (yychar != YYEMPTY)
+    {
+      /* Make sure we have latest lookahead translation.  See comments at
+         user semantic actions for why this is necessary.  */
+      yytoken = YYTRANSLATE (yychar);
+      yydestruct ("Cleanup: discarding lookahead",
+                  yytoken, &yylval, arg);
+    }
+  /* Do not reclaim the symbols of the rule whose action triggered
+     this YYABORT or YYACCEPT.  */
+  YYPOPSTACK (yylen);
+  YY_STACK_PRINT (yyss, yyssp);
+  while (yyssp != yyss)
+    {
+      yydestruct ("Cleanup: popping",
+                  yystos[*yyssp], yyvsp, arg);
+      YYPOPSTACK (1);
+    }
+#ifndef yyoverflow
+  if (yyss != yyssa)
+    YYSTACK_FREE (yyss);
+#endif
+#if YYERROR_VERBOSE
+  if (yymsg != yymsgbuf)
+    YYSTACK_FREE (yymsg);
+#endif
+  return yyresult;
+}
+#line 431 "dds.yy" /* yacc.c:1906  */
+
+
+/* 
+ This function must be defined. However, use the error reporting code in
+ parser-utils.cc.
+ */
+
+void
+ddserror(parser_arg *, const string &)
+{
+}
+
+/*
+ Error clean up. Call this before calling YYBORT. Don't call this on a
+ normal exit.
+ */
+
+void error_exit_cleanup()
+{
+    delete id;
+    id = 0;
+    delete current;
+    current = 0;
+    delete ctor;
+    ctor = 0;
+}
+
+/*
+ Invalid declaration message.
+ */
+
+void invalid_declaration(parser_arg *arg, string semantic_err_msg, char *type, char *name)
+{
+    ostringstream msg;
+    msg << "In the dataset descriptor object: `" << type << " " << name << "'" << endl << "is not a valid declaration."
+            << endl << semantic_err_msg;
+    parse_error((parser_arg *) arg, msg.str().c_str(), dds_line_num);
+}
+
+/*
+ Add the variable pointed to by CURRENT to either the topmost ctor object on
+ the stack CTOR or to the dataset variable table TABLE if CTOR is empty.  If
+ it exists, the current ctor object is popped off the stack and assigned to
+ CURRENT.
+
+ NB: the ctor stack is popped for arrays because they are ctors which
+ contain only a single variable. For other ctor types, several variables may
+ be members and the parse rule (see `declaration' above) determines when to
+ pop the stack.
+
+ Returns: void 
+ */
+
+void add_entry(DDS &table, stack<BaseType *> **ctor, BaseType **current, Part part)
+{
+    if (!*ctor)
+        *ctor = new stack<BaseType *> ;
+
+    if (!(*ctor)->empty()) { /* must be parsing a ctor type */
+        (*ctor)->top()->add_var(*current, part);
+
+        const Type &ctor_type = (*ctor)->top()->type();
+
+        if (ctor_type == dods_array_c) {
+            if (*current)
+                delete *current;
+            *current = (*ctor)->top();
+            (*ctor)->pop();
+
+            // Return here to avoid deleting the new value of 'current.'
+            return;
+        }
+    }
+    else {
+        table.add_var(*current);
+    }
+
+    if (*current)
+        delete *current;
+    *current = 0;
+}
+
diff --git a/dds.tab.hh b/dds.tab.hh
new file mode 100644
index 0000000..4d35647
--- /dev/null
+++ b/dds.tab.hh
@@ -0,0 +1,138 @@
+/* A Bison parser, made by GNU Bison 3.0.4.  */
+
+/* Bison interface for Yacc-like parsers in C
+
+   Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
+
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
+
+#ifndef YY_DDS_DDS_TAB_HH_INCLUDED
+# define YY_DDS_DDS_TAB_HH_INCLUDED
+/* Debug traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 1
+#endif
+#if YYDEBUG
+extern int ddsdebug;
+#endif
+/* "%code requires" blocks.  */
+#line 47 "dds.yy" /* yacc.c:1915  */
+
+
+#include "config_dap.h"
+
+#include <cstring>
+#include <cassert>
+#include <iostream>
+#include <stack>
+#include <sstream>
+
+#include "Byte.h"
+#include "Int16.h"
+#include "UInt16.h"
+#include "Int32.h"
+#include "UInt32.h"
+#include "Float32.h"
+#include "Float64.h"
+#include "Str.h"
+#include "Url.h"
+#include "Array.h"
+#include "Structure.h"
+#include "Sequence.h"
+#include "Grid.h"
+
+#include "DDS.h"
+#include "Error.h"
+#include "parser.h"
+#include "util.h"
+
+using namespace std;
+using namespace libdap;
+
+// These macros are used to access the `arguments' passed to the parser. A
+// pointer to an error object and a pointer to an integer status variable are
+// passed in to the parser within a structure (which itself is passed as a
+// pointer). Note that the ERROR macro explicitly casts OBJ to an ERROR *. 
+// ERROR is no longer used. These parsers now signal problems by throwing
+// exceptions. 5/22/2002 jhrg
+#define DDS_OBJ(arg) ((DDS *)((parser_arg *)(arg))->_object)
+
+// #define YYPARSE_PARAM arg
+
+extern int dds_line_num;	/* defined in dds.lex */
+
+
+#line 90 "dds.tab.hh" /* yacc.c:1915  */
+
+/* Token type.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+  enum yytokentype
+  {
+    SCAN_WORD = 258,
+    SCAN_DATASET = 259,
+    SCAN_LIST = 260,
+    SCAN_SEQUENCE = 261,
+    SCAN_STRUCTURE = 262,
+    SCAN_FUNCTION = 263,
+    SCAN_GRID = 264,
+    SCAN_BYTE = 265,
+    SCAN_INT16 = 266,
+    SCAN_UINT16 = 267,
+    SCAN_INT32 = 268,
+    SCAN_UINT32 = 269,
+    SCAN_FLOAT32 = 270,
+    SCAN_FLOAT64 = 271,
+    SCAN_STRING = 272,
+    SCAN_URL = 273
+  };
+#endif
+
+/* Value type.  */
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+
+union YYSTYPE
+{
+#line 131 "dds.yy" /* yacc.c:1915  */
+
+    bool boolean;
+    char word[ID_MAX];
+
+#line 126 "dds.tab.hh" /* yacc.c:1915  */
+};
+
+typedef union YYSTYPE YYSTYPE;
+# define YYSTYPE_IS_TRIVIAL 1
+# define YYSTYPE_IS_DECLARED 1
+#endif
+
+
+extern YYSTYPE ddslval;
+
+int ddsparse (parser_arg *arg);
+
+#endif /* !YY_DDS_DDS_TAB_HH_INCLUDED  */
diff --git a/dds.yy b/dds.yy
new file mode 100644
index 0000000..b3aeaac
--- /dev/null
+++ b/dds.yy
@@ -0,0 +1,512 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+// 
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+// 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+ 
+// (c) COPYRIGHT URI/MIT 1994-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+/*
+   Grammar for the DDS. This grammar can be used with the bison parser
+   generator to build a parser for the DDS. It assumes that a scanner called
+   `ddslex()' exists and returns several token types (see das.tab.h)
+   in addition to several single character token types. The matched lexeme
+   for an ID is stored by the scanner in a global char * `ddslval'.
+   Because the scanner returns a value via this global and because the parser
+   stores ddslval (not the information pointed to), the values of rule
+   components must be stored as they are parsed and used once accumulated at
+   or near the end of a rule. If ddslval returned a value (instead of a
+   pointer to a value) this would not be necessary.
+
+   jhrg 8/29/94 
+*/
+
+%code requires {
+
+#include "config_dap.h"
+
+#include <cstring>
+#include <cassert>
+#include <iostream>
+#include <stack>
+#include <sstream>
+
+#include "Byte.h"
+#include "Int16.h"
+#include "UInt16.h"
+#include "Int32.h"
+#include "UInt32.h"
+#include "Float32.h"
+#include "Float64.h"
+#include "Str.h"
+#include "Url.h"
+#include "Array.h"
+#include "Structure.h"
+#include "Sequence.h"
+#include "Grid.h"
+
+#include "DDS.h"
+#include "Error.h"
+#include "parser.h"
+#include "util.h"
+
+using namespace std;
+using namespace libdap;
+
+// These macros are used to access the `arguments' passed to the parser. A
+// pointer to an error object and a pointer to an integer status variable are
+// passed in to the parser within a structure (which itself is passed as a
+// pointer). Note that the ERROR macro explicitly casts OBJ to an ERROR *. 
+// ERROR is no longer used. These parsers now signal problems by throwing
+// exceptions. 5/22/2002 jhrg
+#define DDS_OBJ(arg) ((DDS *)((parser_arg *)(arg))->_object)
+
+// #define YYPARSE_PARAM arg
+
+extern int dds_line_num;	/* defined in dds.lex */
+
+} // code requires
+
+%code {
+
+// No global static objects in the dap library! 1/24/2000 jhrg
+static stack<BaseType *> *ctor;
+static BaseType *current;
+static string *id;
+static Part part = nil;		/* Part is defined in BaseType */
+
+static const char *NO_DDS_MSG =
+"The descriptor object returned from the dataset was null.\n\
+Check that the URL is correct.";
+
+static const char *BAD_DECLARATION =
+"In the dataset descriptor object: Expected a variable declaration\n\
+(e.g., Int32 i;). Make sure that the variable name is not the name\n\
+of a datatype and that the Array: and Maps: sections of a Grid are\n\
+labeled properly.";
+
+int ddslex();
+void ddserror(parser_arg *arg, const string &s /*char *s*/);
+void error_exit_cleanup();
+void add_entry(DDS &table, stack<BaseType *> **ctor, BaseType **current, 
+	       Part p);
+void invalid_declaration(parser_arg *arg, string semantic_err_msg, 
+			 char *type, char *name);
+
+} // code
+
+%require "2.4"
+
+%parse-param {parser_arg *arg}
+%name-prefix "dds"
+%defines
+%debug
+%verbose
+
+%expect 52
+
+%union {
+    bool boolean;
+    char word[ID_MAX];
+}
+
+%token <word> SCAN_WORD
+%token <word> SCAN_DATASET
+%token <word> SCAN_LIST
+%token <word> SCAN_SEQUENCE
+%token <word> SCAN_STRUCTURE
+%token <word> SCAN_FUNCTION
+%token <word> SCAN_GRID
+%token <word> SCAN_BYTE
+%token <word> SCAN_INT16
+%token <word> SCAN_UINT16
+%token <word> SCAN_INT32
+%token <word> SCAN_UINT32
+%token <word> SCAN_FLOAT32
+%token <word> SCAN_FLOAT64
+%token <word> SCAN_STRING
+%token <word> SCAN_URL 
+
+%type <boolean> datasets dataset declarations array_decl name
+
+%type <word> declaration base_type structure sequence grid var var_name
+
+%%
+
+start:
+        {
+		    /* On entry to the parser, make the BaseType stack. 
+		       I use if (!ctor) here because in the tab.cc file,
+		       this is a case block in a switch, so it could be
+		       run more than once, causing the storage to be
+		       overwritten. jhrg 6/26/15 */
+		       
+		    if (!ctor)
+		    	ctor = new stack<BaseType *>;
+        }
+        datasets
+        {
+		    delete ctor; ctor = 0;
+		}
+;
+
+datasets:	dataset
+		| datasets dataset
+;
+
+dataset:	SCAN_DATASET '{' declarations '}' name ';'
+        {
+		    $$ = $3 && $5;
+		}
+        | error
+        {
+		    parse_error((parser_arg *)arg, NO_DDS_MSG, dds_line_num, $<word>1);
+		    error_exit_cleanup();
+		    YYABORT;
+		}
+;
+
+declarations:	/* empty */
+        {
+		    $$ = true;
+		}
+        | declaration { $$ = true; }
+        | declarations declaration { $$ = true; }
+;
+
+/* This non-terminal is here only to keep types like `List List Int32' from
+   parsing. DODS does not allow Lists of Lists. Those types make translation
+   to/from arrays too hard. 
+   
+   NB: I removed the List type from DAP years ago. jhrg 6/26/15 */
+
+declaration:  base_type var ';' 
+        { 
+		    string smsg;
+		    if (current->check_semantics(smsg)) {
+			    add_entry(*DDS_OBJ(arg), &ctor, &current, part); 
+		    } else {
+		      invalid_declaration((parser_arg *)arg, smsg, $1, $2);
+		      error_exit_cleanup();
+		      YYABORT;
+		    }
+            strncpy($$,$2,ID_MAX);
+            $$[ID_MAX-1] = '\0';
+		}
+
+		| structure  '{' declarations '}' 
+		{ 
+		    if( current ) delete current ;
+		    current = ctor->top(); 
+		    ctor->pop();
+		} 
+        var ';' 
+        { 
+		    string smsg;
+		    if (current->check_semantics(smsg)) {
+			    add_entry(*DDS_OBJ(arg), &ctor, &current, part); 
+			}
+		    else {
+		        invalid_declaration((parser_arg *)arg, smsg, $1, $6);
+		        error_exit_cleanup();
+		        YYABORT;
+		    }
+            strncpy($$,$6,ID_MAX);
+            $$[ID_MAX-1] = '\0';
+		}
+
+		| sequence '{' declarations '}' 
+        { 
+		    if( current ) delete current ;
+		    current = ctor->top(); 
+		    ctor->pop();
+		} 
+        var ';' 
+        { 
+		    string smsg;
+		    if (current->check_semantics(smsg)) {
+			    add_entry(*DDS_OBJ(arg), &ctor, &current, part); 
+			}
+		    else {
+		      invalid_declaration((parser_arg *)arg, smsg, $1, $6);
+		      error_exit_cleanup();
+		      YYABORT;
+		    }
+            strncpy($$,$6,ID_MAX);
+            $$[ID_MAX-1] = '\0';
+		}
+
+		| grid '{' SCAN_WORD ':'
+		{ 
+		    if (is_keyword(string($3), "array")) {
+			    part = libdap::array;
+			}
+		    else {
+			    ostringstream msg;
+			    msg << BAD_DECLARATION;
+			    parse_error((parser_arg *)arg, msg.str().c_str(), dds_line_num, $3);
+			    YYABORT;
+		    }
+        }
+        declaration SCAN_WORD ':'
+		{ 
+		    if (is_keyword(string($7), "maps")) {
+			    part = maps; 
+			}
+		    else {
+			    ostringstream msg;
+			    msg << BAD_DECLARATION;
+			    parse_error((parser_arg *)arg, msg.str().c_str(), dds_line_num, $7);
+			    YYABORT;
+		    }
+        }
+        declarations '}' 
+		{
+		    if( current ) delete current ;
+		    current = ctor->top(); 
+		    ctor->pop();
+		}
+        var ';' 
+        {
+		    string smsg;
+		    if (current->check_semantics(smsg)) {
+			    part = nil; 
+			    add_entry(*DDS_OBJ(arg), &ctor, &current, part); 
+		    }
+		    else {
+		      invalid_declaration((parser_arg *)arg, smsg, $1, $13);
+		      error_exit_cleanup();
+		      YYABORT;
+		    }
+        strncpy($$,$13,ID_MAX);
+        $$[ID_MAX-1] = '\0';
+		}
+
+        | error 
+        {
+		    ostringstream msg;
+		    msg << BAD_DECLARATION;
+		    parse_error((parser_arg *)arg, msg.str().c_str(), dds_line_num, $<word>1);
+		    YYABORT;
+		}
+;
+ 
+
+structure:	SCAN_STRUCTURE
+		{ 
+		    ctor->push(DDS_OBJ(arg)->get_factory()->NewStructure()); 
+		}
+;
+
+sequence:	SCAN_SEQUENCE 
+		{ 
+		    ctor->push(DDS_OBJ(arg)->get_factory()->NewSequence()); 
+		}
+;
+
+grid:		SCAN_GRID 
+		{ 
+		    ctor->push(DDS_OBJ(arg)->get_factory()->NewGrid()); 
+		}
+;
+
+base_type:	SCAN_BYTE { if( current ) delete current ;current = DDS_OBJ(arg)->get_factory()->NewByte(); }
+		| SCAN_INT16 { if( current ) delete current ;current = DDS_OBJ(arg)->get_factory()->NewInt16(); }
+		| SCAN_UINT16 { if( current ) delete current ;current = DDS_OBJ(arg)->get_factory()->NewUInt16(); }
+		| SCAN_INT32 { if( current ) delete current ;current = DDS_OBJ(arg)->get_factory()->NewInt32(); }
+		| SCAN_UINT32 { if( current ) delete current ;current = DDS_OBJ(arg)->get_factory()->NewUInt32(); }
+		| SCAN_FLOAT32 { if( current ) delete current ;current = DDS_OBJ(arg)->get_factory()->NewFloat32(); }
+		| SCAN_FLOAT64 { if( current ) delete current ;current = DDS_OBJ(arg)->get_factory()->NewFloat64(); }
+		| SCAN_STRING { if( current ) delete current ;current = DDS_OBJ(arg)->get_factory()->NewStr(); }
+		| SCAN_URL { if( current ) delete current ;current = DDS_OBJ(arg)->get_factory()->NewUrl(); }
+;
+
+var:		var_name { current->set_name($1); }
+ 		| var array_decl
+;
+
+var_name:       SCAN_WORD | SCAN_BYTE | SCAN_INT16 | SCAN_INT32 | SCAN_UINT16
+        | SCAN_UINT32 | SCAN_FLOAT32 | SCAN_FLOAT64 | SCAN_STRING
+        | SCAN_URL | SCAN_STRUCTURE | SCAN_SEQUENCE | SCAN_GRID
+        | SCAN_LIST
+;
+
+array_decl:	'[' SCAN_WORD ']'
+        { 
+		    if (!check_int32($2)) {
+			    string msg = "In the dataset descriptor object:\n";
+			    msg += "Expected an array subscript.\n";
+			    parse_error((parser_arg *)arg, msg.c_str(), dds_line_num, $2);
+		    }
+		    if (current->type() == dods_array_c && check_int32($2)) {
+			    ((Array *)current)->append_dim(atoi($2));
+		    }
+		    else {
+			    Array *a = DDS_OBJ(arg)->get_factory()->NewArray(); 
+			    a->add_var(current); 
+			    a->append_dim(atoi($2));
+			    if( current ) delete current ;
+			    current = a;
+		    }
+
+		    $$ = true;
+		 }
+
+		 | '[' SCAN_WORD 
+		 {
+		     if (!id) id = new string($2);
+		 } 
+         '=' SCAN_WORD 
+         { 
+		     if (!check_int32($5)) {
+			     string msg = "In the dataset descriptor object:\n";
+			     msg += "Expected an array subscript.\n";
+			     parse_error((parser_arg *)arg, msg.c_str(), dds_line_num, $5);
+			     error_exit_cleanup();
+			     YYABORT;
+		     }
+		     if (current->type() == dods_array_c) {
+			     ((Array *)current)->append_dim(atoi($5), *id);
+		     }
+		     else {
+			     Array *a = DDS_OBJ(arg)->get_factory()->NewArray(); 
+			     a->add_var(current); 
+			     a->append_dim(atoi($5), *id);
+			     if( current ) delete current ;
+			     current = a;
+		     }
+
+		     delete id; id = 0;
+		 }
+		 ']'
+         {
+		     $$ = true;
+		 }
+
+		 | error
+         {
+		     ostringstream msg;
+		     msg << "In the dataset descriptor object:" << endl
+			     << "Expected an array subscript." << endl;
+		     parse_error((parser_arg *)arg, msg.str().c_str(), dds_line_num, $<word>1);
+		     YYABORT;
+		 }
+;
+
+name:		var_name { (*DDS_OBJ(arg)).set_dataset_name($1); $$ = true;}
+		| SCAN_DATASET { (*DDS_OBJ(arg)).set_dataset_name($1); $$ = true; }
+        | error 
+        {
+		    ostringstream msg;
+		    msg << "Error parsing the dataset name." << endl
+		        << "The name may be missing or may contain an illegal character." << endl;
+		    parse_error((parser_arg *)arg, msg.str().c_str(), dds_line_num, $<word>1);
+		    YYABORT;
+		}
+;
+
+%%
+
+/* 
+ This function must be defined. However, use the error reporting code in
+ parser-utils.cc.
+ */
+
+void
+ddserror(parser_arg *, const string &)
+{
+}
+
+/*
+ Error clean up. Call this before calling YYBORT. Don't call this on a
+ normal exit.
+ */
+
+void error_exit_cleanup()
+{
+    delete id;
+    id = 0;
+    delete current;
+    current = 0;
+    delete ctor;
+    ctor = 0;
+}
+
+/*
+ Invalid declaration message.
+ */
+
+void invalid_declaration(parser_arg *arg, string semantic_err_msg, char *type, char *name)
+{
+    ostringstream msg;
+    msg << "In the dataset descriptor object: `" << type << " " << name << "'" << endl << "is not a valid declaration."
+            << endl << semantic_err_msg;
+    parse_error((parser_arg *) arg, msg.str().c_str(), dds_line_num);
+}
+
+/*
+ Add the variable pointed to by CURRENT to either the topmost ctor object on
+ the stack CTOR or to the dataset variable table TABLE if CTOR is empty.  If
+ it exists, the current ctor object is popped off the stack and assigned to
+ CURRENT.
+
+ NB: the ctor stack is popped for arrays because they are ctors which
+ contain only a single variable. For other ctor types, several variables may
+ be members and the parse rule (see `declaration' above) determines when to
+ pop the stack.
+
+ Returns: void 
+ */
+
+void add_entry(DDS &table, stack<BaseType *> **ctor, BaseType **current, Part part)
+{
+    if (!*ctor)
+        *ctor = new stack<BaseType *> ;
+
+    if (!(*ctor)->empty()) { /* must be parsing a ctor type */
+        (*ctor)->top()->add_var(*current, part);
+
+        const Type &ctor_type = (*ctor)->top()->type();
+
+        if (ctor_type == dods_array_c) {
+            if (*current)
+                delete *current;
+            *current = (*ctor)->top();
+            (*ctor)->pop();
+
+            // Return here to avoid deleting the new value of 'current.'
+            return;
+        }
+    }
+    else {
+        table.add_var(*current);
+    }
+
+    if (*current)
+        delete *current;
+    *current = 0;
+}
+
diff --git a/debug.h b/debug.h
new file mode 100644
index 0000000..10614a1
--- /dev/null
+++ b/debug.h
@@ -0,0 +1,82 @@
+/*
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+*/
+
+/*
+  This header defines macros which enable compile-time program
+  instrumentation. These macros work for both C and C++. Enclose the entire
+  statement to be debugged within the DBG() macro *and* put the semicolon
+  after the macro. (e.g., DBG(cerr << "Bad program" << endl); ). Statements
+  should not span lines unless they include `\'s to escape the newlines.
+
+  jhrg 10/13/94
+*/
+
+#ifndef _debug_h
+#define _debug_h
+
+#ifdef __cplusplus
+
+#include <iostream>
+using std::cerr;
+using std::string;
+using std::endl;
+#define FILE_N_LINE cerr << __FILE__ << ": " << __LINE__ << ":"
+
+#else
+
+#define FILE_N_LINE fprintf(stderr, "%s:%d: ", __FILE__, __LINE__);
+
+#endif /* cplusplus */
+
+#ifdef DODS_DEBUG
+#define DBG(x) FILE_N_LINE; x
+#define DBGN(x) x
+#else
+#define DBG(x) /* x */
+#define DBGN(x) /* x */
+#endif
+
+/** The purpose of DODS_DEBUG1 is to look at only a handful of the DBG()
+    macros by changing them to DBG1() macros and defining DODS_DEBUG1. */
+#ifdef DODS_DEBUG1
+#define DBG1(x) FILE_N_LINE; x
+#else
+#define DBG1(x) /* x */
+#endif
+
+#ifdef DODS_DEBUG2
+#define DBG2(x) FILE_N_LINE; x
+#define DBG2N(x) x
+#else
+#define DBG2(x) /* x */
+#define DBG2n(x) /* x */
+#endif
+
+#ifdef DODS_PERF
+#error "Deprecated macro!"
+#endif
+
+#endif /* _debug_h */
diff --git a/dods-datatypes-config.h.in b/dods-datatypes-config.h.in
new file mode 100644
index 0000000..aea7a2b
--- /dev/null
+++ b/dods-datatypes-config.h.in
@@ -0,0 +1,61 @@
+
+/*
+  Determine at compile-time the sizes of various datatypes. This uses symbols
+  defined by configure (See configure.in).
+  jhrg 10/24/94
+
+  This header is included by all of the DODS DAP library header files which
+  make use of the dods_* typedefs. C or C++ files can either include
+  config_dap.h, use their own configure script which defines SIZEOF_LONG,
+  _INT, _CHAR and _DOUBLE or set these preprocessor symbols themselves in a
+  Makefile, etc.
+
+  This used to be part of the config_dap.h header, but including that in the
+  DAP library headers introduced problems when the DAP was used in conjunction
+  with other libraries. 8/1/2000 jhrg
+*/
+
+#ifndef __DODS_DATATYPES__
+#define __DODS_DATATYPES__
+
+/* The typedefs are done using a preprocessor symbol so that autoconf's
+   `CONFIG_HEADER' can be used. The configure script will then only modify
+   the dods-datatypes.h header when its contents change. This saves on
+   compilation since the header is used by many files in the dap++ library.
+   The downside is that the typedefs are so ugly... 2/14/2001 jhrg */
+   
+#undef DINT32
+typedef DINT32 dods_int32;
+
+#undef DUINT32
+typedef DUINT32 dods_uint32;
+
+#undef DINT16
+typedef DINT16 dods_int16;
+
+#undef DUINT16
+typedef DUINT16 dods_uint16;
+
+#undef DBYTE
+typedef DBYTE dods_byte;
+
+#undef DFLOAT64
+typedef DFLOAT64 dods_float64;
+
+#undef DFLOAT32
+typedef DFLOAT32 dods_float32;	
+
+#undef DINT8
+typedef DINT8 dods_int8;
+
+#undef DINT64
+typedef DINT64 dods_int64;
+
+#undef DUINT64
+typedef DUINT64 dods_uint64;
+
+/* Enums in DAP4 are 64-bit signed integers */
+typedef DINT64 dods_enum;
+
+#endif /* __DODS_DATATYPES__ */
+
diff --git a/dods-datatypes-static.h b/dods-datatypes-static.h
new file mode 100644
index 0000000..5cba1f6
--- /dev/null
+++ b/dods-datatypes-static.h
@@ -0,0 +1,38 @@
+/*
+    This header is used when the compile-time definitions won't work.
+*/
+
+#ifndef __DODS_DATATYPES__
+#define __DODS_DATATYPES__
+
+#include <inttypes.h>
+
+namespace libdap
+{
+
+typedef int32_t dods_int32;
+
+typedef uint32_t dods_uint32;
+
+typedef int16_t dods_int16;
+
+typedef uint16_t dods_uint16;
+
+typedef uint8_t dods_byte;
+
+typedef double dods_float64;
+
+typedef float dods_float32;		
+
+// Added for DAP4
+typedef int8_t dods_int8;
+
+typedef int64_t dods_int64;
+
+typedef uint64_t dods_uint64;
+
+typedef int64_t dods_enum;
+
+} // namespace libdap
+
+#endif /* __DODS_DATATYPES__ */
diff --git a/dods-datatypes.h b/dods-datatypes.h
new file mode 100644
index 0000000..5cba1f6
--- /dev/null
+++ b/dods-datatypes.h
@@ -0,0 +1,38 @@
+/*
+    This header is used when the compile-time definitions won't work.
+*/
+
+#ifndef __DODS_DATATYPES__
+#define __DODS_DATATYPES__
+
+#include <inttypes.h>
+
+namespace libdap
+{
+
+typedef int32_t dods_int32;
+
+typedef uint32_t dods_uint32;
+
+typedef int16_t dods_int16;
+
+typedef uint16_t dods_uint16;
+
+typedef uint8_t dods_byte;
+
+typedef double dods_float64;
+
+typedef float dods_float32;		
+
+// Added for DAP4
+typedef int8_t dods_int8;
+
+typedef int64_t dods_int64;
+
+typedef uint64_t dods_uint64;
+
+typedef int64_t dods_enum;
+
+} // namespace libdap
+
+#endif /* __DODS_DATATYPES__ */
diff --git a/dods-limits.h b/dods-limits.h
new file mode 100644
index 0000000..f3ecd6c
--- /dev/null
+++ b/dods-limits.h
@@ -0,0 +1,98 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1996,1998,1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// Limits for DAP2. Use these *instead* of <limits.h> since DAP2 needs to see
+// the same values on all machines.
+
+#ifndef _dods_limits_h
+#define _dods_limits_h
+
+#if 0
+// The old values. I switched to hex notation when 64-bit ints were added
+// to DAP4.
+#define DODS_CHAR_BIT 8
+#define DODS_SCHAR_MIN -128
+#define DODS_SCHAR_MAX 127
+#define DODS_UCHAR_MAX 255U
+#define DODS_UCHAR_MIN 0
+
+#define DODS_SHRT_MIN -32768
+#define DODS_SHRT_MAX 32767
+#define DODS_USHRT_MAX 65535U
+
+#define DODS_INT_MIN -2147483648
+// was (-2147483647 - 1)
+#define DODS_INT_MAX 2147483647
+#define DODS_UINT_MAX 4294967295U
+
+#define DODS_LONG_MIN -2147483648
+// was (-2147483647 - 1)
+#define DODS_LONG_MAX 2147483647
+#define DODS_ULONG_MAX 4294967295UL
+#endif
+
+#define DODS_CHAR_BIT 8
+#define DODS_SCHAR_MIN (-0x7f-1)
+#define DODS_SCHAR_MAX 0x7f
+#define DODS_UCHAR_MAX 0xffU
+#define DODS_UCHAR_MIN 0
+
+#define DODS_SHRT_MIN (-0x7fff-1)
+#define DODS_SHRT_MAX 0x7fff
+#define DODS_USHRT_MAX 0xffffU
+
+#define DODS_INT_MIN (-0x7fffffff-1)
+#define DODS_INT_MAX 0x7fffffff
+#define DODS_UINT_MAX 0xffffffffUL
+
+#define DODS_LONG_MIN DODS_INT_MIN
+#define DODS_LONG_MAX DODS_INT_MAX
+#define DODS_ULONG_MAX DODS_UINT_MAX
+
+#define DODS_LLONG_MIN (-0x7fffffffffffffffLL-1)
+#define DODS_LLONG_MAX 0x7fffffffffffffffLL
+#define DODS_ULLONG_MAX 0xffffffffffffffffULL
+
+#define DODS_MAX_ARRAY_INDEX 0x1fffffffffffffffULL
+
+#define DODS_DBL_DIG 15 /* digits of precision of a "double" */
+#define DODS_DBL_MAX 1.7976931348623157E+308 /* max decimal value of a */
+/* "double" */
+#define DODS_DBL_MIN 2.2250738585072014E-308 /* min decimal value of a */
+/* "double" */
+#define DODS_FLT_DIG 6  /* digits of precision of a "float" */
+#define DODS_FLT_MAX 3.402823466E+38F  /* max decimal value of a "float" */
+#define DODS_FLT_MIN 1.175494351E-38F  /* min decimal value of a "float" */
+
+/* This constant should not be used. */
+#define DODS_MB_LEN_MAX 4
+
+#endif // _dods_limits_h
diff --git a/doxy.conf.in b/doxy.conf.in
new file mode 100644
index 0000000..de8cdd7
--- /dev/null
+++ b/doxy.conf.in
@@ -0,0 +1,2440 @@
+# Doxyfile 1.8.11
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project.
+#
+# All text after a double hash (##) is considered a comment and is placed in
+# front of the TAG it is preceding.
+#
+# All text after a single hash (#) is considered a comment and will be ignored.
+# The format is:
+# TAG = value [value, ...]
+# For lists, items can also be appended using:
+# TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (\" \").
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all text
+# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
+# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv
+# for the list of possible encodings.
+# The default value is: UTF-8.
+
+DOXYFILE_ENCODING      = UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
+# double-quotes, unless you are using Doxywizard) that should identify the
+# project for which the documentation is generated. This name is used in the
+# title of most generated pages and in a few other places.
+# The default value is: My Project.
+
+PROJECT_NAME           = @PACKAGE_NAME@
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
+# could be handy for archiving the generated documentation or if some version
+# control system is used.
+
+PROJECT_NUMBER         = "Updated for version @PACKAGE_VERSION@"
+
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer a
+# quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF          = "libdap4 is an implementation of OPeNDAP's DAP protocol."
+
+# With the PROJECT_LOGO tag one can specify a logo or an icon that is included
+# in the documentation. The maximum height of the logo should not exceed 55
+# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
+# the logo to the output directory.
+
+PROJECT_LOGO           =
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
+# into which the generated documentation will be written. If a relative path is
+# entered, it will be relative to the location where doxygen was started. If
+# left blank the current directory will be used.
+
+OUTPUT_DIRECTORY       = 
+
+# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
+# directories (in 2 levels) under the output directory of each output format and
+# will distribute the generated files over these directories. Enabling this
+# option can be useful when feeding doxygen a huge amount of source files, where
+# putting all generated files in the same directory would otherwise causes
+# performance problems for the file system.
+# The default value is: NO.
+
+CREATE_SUBDIRS         = 
+
+# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
+# characters to appear in the names of generated files. If set to NO, non-ASCII
+# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
+# U+3044.
+# The default value is: NO.
+
+ALLOW_UNICODE_NAMES    = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
+# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
+# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
+# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
+# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
+# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
+# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
+# Ukrainian and Vietnamese.
+# The default value is: English.
+
+OUTPUT_LANGUAGE        = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
+# descriptions after the members that are listed in the file and class
+# documentation (similar to Javadoc). Set to NO to disable this.
+# The default value is: YES.
+
+BRIEF_MEMBER_DESC      = YES
+
+# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief
+# description of a member or function before the detailed description
+#
+# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# brief descriptions will be completely suppressed.
+# The default value is: YES.
+
+REPEAT_BRIEF           = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator that is
+# used to form the text in various listings. Each string in this list, if found
+# as the leading text of the brief description, will be stripped from the text
+# and the result, after processing the whole list, is used as the annotated
+# text. Otherwise, the brief description is used as-is. If left blank, the
+# following values are used ($name is automatically replaced with the name of
+# the entity):The $name class, The $name widget, The $name file, is, provides,
+# specifies, contains, represents, a, an and the.
+
+ABBREVIATE_BRIEF       =
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# doxygen will generate a detailed section even if there is only a brief
+# description.
+# The default value is: NO.
+
+ALWAYS_DETAILED_SEC    = YES
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
+# operators of the base classes will not be shown.
+# The default value is: NO.
+
+INLINE_INHERITED_MEMB  = YES
+
+# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path
+# before files name in the file list and in the header files. If set to NO the
+# shortest path that makes the file name unique will be used
+# The default value is: YES.
+
+FULL_PATH_NAMES        = NO
+
+# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
+# Stripping is only done if one of the specified strings matches the left-hand
+# part of the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the path to
+# strip.
+#
+# Note that you can specify absolute paths here, but also relative paths, which
+# will be relative from the directory where doxygen is started.
+# This tag requires that the tag FULL_PATH_NAMES is set to YES.
+
+STRIP_FROM_PATH        =
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
+# path mentioned in the documentation of a class, which tells the reader which
+# header file to include in order to use a class. If left blank only the name of
+# the header file containing the class definition is used. Otherwise one should
+# specify the list of include paths that are normally passed to the compiler
+# using the -I flag.
+
+STRIP_FROM_INC_PATH    =
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
+# less readable) file names. This can be useful is your file systems doesn't
+# support long names like on DOS, Mac, or CD-ROM.
+# The default value is: NO.
+
+SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
+# first line (until the first dot) of a Javadoc-style comment as the brief
+# description. If set to NO, the Javadoc-style will behave just like regular Qt-
+# style comments (thus requiring an explicit @brief command for a brief
+# description.)
+# The default value is: NO.
+
+JAVADOC_AUTOBRIEF      = NO
+
+# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
+# line (until the first dot) of a Qt-style comment as the brief description. If
+# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
+# requiring an explicit \brief command for a brief description.)
+# The default value is: NO.
+
+QT_AUTOBRIEF           = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
+# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
+# a brief description. This used to be the default behavior. The new default is
+# to treat a multi-line C++ comment block as a detailed description. Set this
+# tag to YES if you prefer the old behavior instead.
+#
+# Note that setting this tag to YES also means that rational rose comments are
+# not recognized any more.
+# The default value is: NO.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
+# documentation from any documented member that it re-implements.
+# The default value is: YES.
+
+INHERIT_DOCS           = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new
+# page for each member. If set to NO, the documentation of a member will be part
+# of the file/class/namespace that contains it.
+# The default value is: NO.
+
+SEPARATE_MEMBER_PAGES  = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
+# uses this value to replace tabs by spaces in code fragments.
+# Minimum value: 1, maximum value: 16, default value: 4.
+
+TAB_SIZE               =
+
+# This tag can be used to specify a number of aliases that act as commands in
+# the documentation. An alias has the form:
+# name=value
+# For example adding
+# "sideeffect=@par Side Effects:\n"
+# will allow you to put the command \sideeffect (or @sideeffect) in the
+# documentation, which will result in a user-defined paragraph with heading
+# "Side Effects:". You can put \n's in the value part of an alias to insert
+# newlines.
+
+ALIASES                =
+
+# This tag can be used to specify a number of word-keyword mappings (TCL only).
+# A mapping has the form "name=value". For example adding "class=itcl::class"
+# will allow you to use the command class in the itcl::class meaning.
+
+TCL_SUBST              =
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
+# only. Doxygen will then generate output that is more tailored for C. For
+# instance, some of the names that are used will be different. The list of all
+# members will be omitted, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_FOR_C  = NO
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
+# Python sources only. Doxygen will then generate output that is more tailored
+# for that language. For instance, namespaces will be presented as packages,
+# qualified scopes will look different, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_JAVA   = NO
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources. Doxygen will then generate output that is tailored for Fortran.
+# The default value is: NO.
+
+OPTIMIZE_FOR_FORTRAN   = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for VHDL.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_VHDL   = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it
+# parses. With this tag you can assign which parser to use for a given
+# extension. Doxygen has a built-in mapping, but you can override or extend it
+# using this tag. The format is ext=language, where ext is a file extension, and
+# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
+# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran:
+# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran:
+# Fortran. In the later case the parser tries to guess whether the code is fixed
+# or free formatted code, this is the default for Fortran type files), VHDL. For
+# instance to make doxygen treat .inc files as Fortran files (default is PHP),
+# and .f files as C (default is Fortran), use: inc=Fortran f=C.
+#
+# Note: For files without extension you can use no_extension as a placeholder.
+#
+# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
+# the files are not read by doxygen.
+
+EXTENSION_MAPPING      =
+
+# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
+# according to the Markdown format, which allows for more readable
+# documentation. See http://daringfireball.net/projects/markdown/ for details.
+# The output of markdown processing is further processed by doxygen, so you can
+# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
+# case of backward compatibilities issues.
+# The default value is: YES.
+
+MARKDOWN_SUPPORT       = YES
+
+# When enabled doxygen tries to link words that correspond to documented
+# classes, or namespaces to their corresponding documentation. Such a link can
+# be prevented in individual cases by putting a % sign in front of the word or
+# globally by setting AUTOLINK_SUPPORT to NO.
+# The default value is: YES.
+
+AUTOLINK_SUPPORT       = YES
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should set this
+# tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string);
+# versus func(std::string) {}). This also make the inheritance and collaboration
+# diagrams that involve STL classes more complete and accurate.
+# The default value is: NO.
+
+BUILTIN_STL_SUPPORT    = YES
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+# The default value is: NO.
+
+CPP_CLI_SUPPORT        = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
+# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen
+# will parse them like normal C++ but will assume all classes use public instead
+# of private inheritance when no explicit protection keyword is present.
+# The default value is: NO.
+
+SIP_SUPPORT            = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate
+# getter and setter methods for a property. Setting this option to YES will make
+# doxygen to replace the get and set methods by a property in the documentation.
+# This will only work if the methods are indeed getting or setting a simple
+# type. If this is not the case, or you want to show the methods anyway, you
+# should set this option to NO.
+# The default value is: YES.
+
+IDL_PROPERTY_SUPPORT   = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
+# all members of a group must be documented explicitly.
+# The default value is: NO.
+
+DISTRIBUTE_GROUP_DOC   = NO
+
+# If one adds a struct or class to a group and this option is enabled, then also
+# any nested class or struct is added to the same group. By default this option
+# is disabled and one has to add nested compounds explicitly via \ingroup.
+# The default value is: NO.
+
+GROUP_NESTED_COMPOUNDS = NO
+
+# Set the SUBGROUPING tag to YES to allow class member groups of the same type
+# (for instance a group of public functions) to be put as a subgroup of that
+# type (e.g. under the Public Functions section). Set it to NO to prevent
+# subgrouping. Alternatively, this can be done per class using the
+# \nosubgrouping command.
+# The default value is: YES.
+
+SUBGROUPING            = YES
+
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
+# are shown inside the group in which they are included (e.g. using \ingroup)
+# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
+# and RTF).
+#
+# Note that this feature does not work in combination with
+# SEPARATE_MEMBER_PAGES.
+# The default value is: NO.
+
+INLINE_GROUPED_CLASSES = NO
+
+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
+# with only public data fields or simple typedef fields will be shown inline in
+# the documentation of the scope in which they are defined (i.e. file,
+# namespace, or group documentation), provided this scope is documented. If set
+# to NO, structs, classes, and unions are shown on a separate page (for HTML and
+# Man pages) or section (for LaTeX and RTF).
+# The default value is: NO.
+
+INLINE_SIMPLE_STRUCTS  = NO
+
+# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
+# enum is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically be
+# useful for C code in case the coding convention dictates that all compound
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+# The default value is: NO.
+
+TYPEDEF_HIDES_STRUCT   = NO
+
+# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
+# cache is used to resolve symbols given their name and scope. Since this can be
+# an expensive process and often the same symbol appears multiple times in the
+# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
+# doxygen will become slower. If the cache is too large, memory is wasted. The
+# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
+# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
+# symbols. At the end of a run doxygen will report the cache usage and suggest
+# the optimal cache size from a speed point of view.
+# Minimum value: 0, maximum value: 9, default value: 0.
+
+LOOKUP_CACHE_SIZE      = 0
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in
+# documentation are documented, even if no documentation was available. Private
+# class members and static file members will be hidden unless the
+# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
+# Note: This will also disable the warnings about undocumented members that are
+# normally produced when WARNINGS is set to YES.
+# The default value is: NO.
+
+EXTRACT_ALL            = NO
+# EXTRACT_ALL            = YES
+
+# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will
+# be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PRIVATE        = NO
+
+# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal
+# scope will be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PACKAGE        = NO
+
+# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be
+# included in the documentation.
+# The default value is: NO.
+
+EXTRACT_STATIC         = NO
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined
+# locally in source files will be included in the documentation. If set to NO,
+# only classes defined in header files are included. Does not have any effect
+# for Java sources.
+# The default value is: YES.
+
+EXTRACT_LOCAL_CLASSES  = NO
+
+# This flag is only useful for Objective-C code. If set to YES, local methods,
+# which are defined in the implementation section but not in the interface are
+# included in the documentation. If set to NO, only methods in the interface are
+# included.
+# The default value is: NO.
+
+EXTRACT_LOCAL_METHODS  = NO
+
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base name of
+# the file that contains the anonymous namespace. By default anonymous namespace
+# are hidden.
+# The default value is: NO.
+
+EXTRACT_ANON_NSPACES   = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
+# undocumented members inside documented classes or files. If set to NO these
+# members will be included in the various overviews, but no documentation
+# section is generated. This option has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_MEMBERS     = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy. If set
+# to NO, these classes will be included in the various overviews. This option
+# has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_CLASSES     = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
+# (class|struct|union) declarations. If set to NO, these declarations will be
+# included in the documentation.
+# The default value is: NO.
+
+HIDE_FRIEND_COMPOUNDS  = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
+# documentation blocks found inside the body of a function. If set to NO, these
+# blocks will be appended to the function's detailed documentation block.
+# The default value is: NO.
+
+HIDE_IN_BODY_DOCS      = NO
+
+# The INTERNAL_DOCS tag determines if documentation that is typed after a
+# \internal command is included. If the tag is set to NO then the documentation
+# will be excluded. Set it to YES to include the internal documentation.
+# The default value is: NO.
+
+INTERNAL_DOCS          = NO
+
+# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
+# names in lower-case letters. If set to YES, upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
+# and Mac users are advised to set this option to NO.
+# The default value is: system dependent.
+
+CASE_SENSE_NAMES       = YES
+
+# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
+# their full class and namespace scopes in the documentation. If set to YES, the
+# scope will be hidden.
+# The default value is: NO.
+
+HIDE_SCOPE_NAMES       = NO
+
+# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will
+# append additional text to a page's title, such as Class Reference. If set to
+# YES the compound reference will be hidden.
+# The default value is: NO.
+
+HIDE_COMPOUND_REFERENCE= NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
+# the files that are included by a file in the documentation of that file.
+# The default value is: YES.
+
+SHOW_INCLUDE_FILES     = YES
+
+# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
+# grouped member an include statement to the documentation, telling the reader
+# which file to include in order to use the member.
+# The default value is: NO.
+
+SHOW_GROUPED_MEMB_INC  = NO
+
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
+# files with double quotes in the documentation rather than with sharp brackets.
+# The default value is: NO.
+
+FORCE_LOCAL_INCLUDES   = NO
+
+# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
+# documentation for inline members.
+# The default value is: YES.
+
+INLINE_INFO            = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
+# (detailed) documentation of file and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order.
+# The default value is: YES.
+
+SORT_MEMBER_DOCS       = YES
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
+# descriptions of file, namespace and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order. Note that
+# this will also influence the order of the classes in the class list.
+# The default value is: NO.
+
+SORT_BRIEF_DOCS        = YES
+
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
+# (brief and detailed) documentation of class members so that constructors and
+# destructors are listed first. If set to NO the constructors will appear in the
+# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
+# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
+# member documentation.
+# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
+# detailed member documentation.
+# The default value is: NO.
+
+SORT_MEMBERS_CTORS_1ST = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
+# of group names into alphabetical order. If set to NO the group names will
+# appear in their defined order.
+# The default value is: NO.
+
+SORT_GROUP_NAMES       = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
+# fully-qualified names, including namespaces. If set to NO, the class list will
+# be sorted only by class name, not including the namespace part.
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the alphabetical
+# list.
+# The default value is: NO.
+
+SORT_BY_SCOPE_NAME     = NO
+
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
+# type resolution of all parameters of a function it will reject a match between
+# the prototype and the implementation of a member function even if there is
+# only one candidate or it is obvious which candidate to choose by doing a
+# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
+# accept a match between prototype and implementation in such cases.
+# The default value is: NO.
+
+STRICT_PROTO_MATCHING  = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo
+# list. This list is created by putting \todo commands in the documentation.
+# The default value is: YES.
+
+GENERATE_TODOLIST      = YES
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test
+# list. This list is created by putting \test commands in the documentation.
+# The default value is: YES.
+
+GENERATE_TESTLIST      = YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug
+# list. This list is created by putting \bug commands in the documentation.
+# The default value is: YES.
+
+GENERATE_BUGLIST       = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO)
+# the deprecated list. This list is created by putting \deprecated commands in
+# the documentation.
+# The default value is: YES.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional documentation
+# sections, marked by \if <section_label> ... \endif and \cond <section_label>
+# ... \endcond blocks.
+
+ENABLED_SECTIONS       =
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
+# initial value of a variable or macro / define can have for it to appear in the
+# documentation. If the initializer consists of more lines than specified here
+# it will be hidden. Use a value of 0 to hide initializers completely. The
+# appearance of the value of individual variables and macros / defines can be
+# controlled using \showinitializer or \hideinitializer command in the
+# documentation regardless of this setting.
+# Minimum value: 0, maximum value: 10000, default value: 30.
+
+MAX_INITIALIZER_LINES  = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
+# the bottom of the documentation of classes and structs. If set to YES, the
+# list will mention the files that were used to generate the documentation.
+# The default value is: YES.
+
+SHOW_USED_FILES        = YES
+
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
+# will remove the Files entry from the Quick Index and from the Folder Tree View
+# (if specified).
+# The default value is: YES.
+
+SHOW_FILES             = YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
+# page. This will remove the Namespaces entry from the Quick Index and from the
+# Folder Tree View (if specified).
+# The default value is: YES.
+
+SHOW_NAMESPACES        = YES
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from
+# the version control system). Doxygen will invoke the program by executing (via
+# popen()) the command command input-file, where command is the value of the
+# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
+# by doxygen. Whatever the program writes to standard output is used as the file
+# version. For an example see the documentation.
+
+FILE_VERSION_FILTER    =
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
+# by doxygen. The layout file controls the global structure of the generated
+# output files in an output format independent way. To create the layout file
+# that represents doxygen's defaults, run doxygen with the -l option. You can
+# optionally specify a file name after the option, if omitted DoxygenLayout.xml
+# will be used as the name of the layout file.
+#
+# Note that if you run doxygen from a directory containing a file called
+# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
+# tag is left empty.
+
+LAYOUT_FILE            =
+
+# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
+# the reference definitions. This must be a list of .bib files. The .bib
+# extension is automatically appended if omitted. This requires the bibtex tool
+# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info.
+# For LaTeX the style of the bibliography can be controlled using
+# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
+# search path. See also \cite for info how to create references.
+
+CITE_BIB_FILES         =
+
+#---------------------------------------------------------------------------
+# Configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated to
+# standard output by doxygen. If QUIET is set to YES this implies that the
+# messages are off.
+# The default value is: NO.
+
+QUIET                  = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES
+# this implies that the warnings are on.
+#
+# Tip: Turn warnings on while writing the documentation.
+# The default value is: YES.
+
+WARNINGS               = YES
+
+# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate
+# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
+# will automatically be disabled.
+# The default value is: YES.
+
+WARN_IF_UNDOCUMENTED   = YES
+
+# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some parameters
+# in a documented function, or documenting parameters that don't exist or using
+# markup commands wrongly.
+# The default value is: YES.
+
+WARN_IF_DOC_ERROR      = YES
+
+# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
+# are documented, but have no documentation for their parameters or return
+# value. If set to NO, doxygen will only warn about wrong or incomplete
+# parameter documentation, but not about the absence of documentation.
+# The default value is: NO.
+
+WARN_NO_PARAMDOC       = NO
+
+# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when
+# a warning is encountered.
+# The default value is: NO.
+
+WARN_AS_ERROR          = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that doxygen
+# can produce. The string should contain the $file, $line, and $text tags, which
+# will be replaced by the file and line number from which the warning originated
+# and the warning text. Optionally the format may contain $version, which will
+# be replaced by the version of the file (if it could be obtained via
+# FILE_VERSION_FILTER)
+# The default value is: $file:$line: $text.
+
+WARN_FORMAT            = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning and error
+# messages should be written. If left blank the output is written to standard
+# error (stderr).
+
+WARN_LOGFILE           = doxygen_warnings.txt
+
+#---------------------------------------------------------------------------
+# Configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag is used to specify the files and/or directories that contain
+# documented source files. You may enter file names like myfile.cpp or
+# directories like /usr/src/myproject. Separate the files or directories with
+# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
+# Note: If this tag is empty the current directory is searched.
+
+INPUT                  = .
+
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
+# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
+# documentation (see: http://www.gnu.org/software/libiconv) for the list of
+# possible encodings.
+# The default value is: UTF-8.
+
+INPUT_ENCODING         = UTF-8
+
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
+# *.h) to filter out the source-files in the directories.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# read by doxygen.
+#
+# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
+# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
+# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
+# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f, *.for, *.tcl,
+# *.vhd, *.vhdl, *.ucf, *.qsf, *.as and *.js.
+
+FILE_PATTERNS          = *.cc \
+                         *.h \
+                         *.doxygen
+
+# The RECURSIVE tag can be used to specify whether or not subdirectories should
+# be searched for input files as well.
+# The default value is: NO.
+
+RECURSIVE              = YES
+
+# The EXCLUDE tag can be used to specify files and/or directories that should be
+# excluded from the INPUT source files. This way you can easily exclude a
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+#
+# Note that relative paths are relative to the directory from which doxygen is
+# run.
+
+EXCLUDE                = expr.h
+
+# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
+# directories that are symbolic links (a Unix file system feature) are excluded
+# from the input.
+# The default value is: NO.
+
+EXCLUDE_SYMLINKS       = NO
+
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories.
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories for example use the pattern */test/*
+
+EXCLUDE_PATTERNS       = *.tab.cc \
+                         *.tab.h \
+                         lex.* \
+                         Test*.cc \
+                         Test*.h \
+                         *Test.cc \
+			 */unit-tests/* \
+			 */tests/* \
+			 */gl/* \
+			 */old/* \
+			 */unused/* \
+			 */win32/* \
+			 */VCPP/*
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the
+# output. The symbol name can be a fully qualified name, a word, or if the
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
+# AClass::ANamespace, ANamespace::*Test
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories use the pattern */test/*
+
+EXCLUDE_SYMBOLS        =
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or directories
+# that contain example code fragments that are included (see the \include
+# command).
+
+EXAMPLE_PATH           =
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
+# *.h) to filter out the source-files in the directories. If left blank all
+# files are included.
+
+EXAMPLE_PATTERNS       =
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude commands
+# irrespective of the value of the RECURSIVE tag.
+# The default value is: NO.
+
+EXAMPLE_RECURSIVE      = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or directories
+# that contain images that are to be included in the documentation (see the
+# \image command).
+
+IMAGE_PATH             =
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command:
+#
+# <filter> <input-file>
+#
+# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
+# name of an input file. Doxygen will then use the output that the filter
+# program writes to standard output. If FILTER_PATTERNS is specified, this tag
+# will be ignored.
+#
+# Note that the filter must not add or remove lines; it is applied before the
+# code is scanned, but not when the output code is generated. If lines are added
+# or removed, the anchors will not be placed correctly.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# properly processed by doxygen.
+
+INPUT_FILTER           =
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis. Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match. The filters are a list of the form: pattern=filter
+# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
+# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
+# patterns match the file name, INPUT_FILTER is applied.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# properly processed by doxygen.
+
+FILTER_PATTERNS        =
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER) will also be used to filter the input files that are used for
+# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
+# The default value is: NO.
+
+FILTER_SOURCE_FILES    = NO
+
+# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
+# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
+# it is also possible to disable source filtering for a specific pattern using
+# *.ext= (so without naming a filter).
+# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
+
+FILTER_SOURCE_PATTERNS =
+
+# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
+# is part of the input, its contents will be placed on the main page
+# (index.html). This can be useful if you have a project on for instance GitHub
+# and want to reuse the introduction page also for the doxygen output.
+
+USE_MDFILE_AS_MAINPAGE =
+
+#---------------------------------------------------------------------------
+# Configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
+# generated. Documented entities will be cross-referenced with these sources.
+#
+# Note: To get rid of all source code in the generated output, make sure that
+# also VERBATIM_HEADERS is set to NO.
+# The default value is: NO.
+
+SOURCE_BROWSER         = YES
+
+# Setting the INLINE_SOURCES tag to YES will include the body of functions,
+# classes and enums directly into the documentation.
+# The default value is: NO.
+
+INLINE_SOURCES         = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
+# special comment blocks from generated source code fragments. Normal C, C++ and
+# Fortran comments will always remain visible.
+# The default value is: YES.
+
+STRIP_CODE_COMMENTS    = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
+# function all documented functions referencing it will be listed.
+# The default value is: NO.
+
+REFERENCED_BY_RELATION = NO
+
+# If the REFERENCES_RELATION tag is set to YES then for each documented function
+# all documented entities called/used by that function will be listed.
+# The default value is: NO.
+
+REFERENCES_RELATION    = NO
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
+# to YES then the hyperlinks from functions in REFERENCES_RELATION and
+# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
+# link to the documentation.
+# The default value is: YES.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
+# source code will show a tooltip with additional information such as prototype,
+# brief description and links to the definition and documentation. Since this
+# will make the HTML file larger and loading of large files a bit slower, you
+# can opt to disable this feature.
+# The default value is: YES.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+SOURCE_TOOLTIPS        = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code will
+# point to the HTML generated by the htags(1) tool instead of doxygen built-in
+# source browser. The htags tool is part of GNU's global source tagging system
+# (see http://www.gnu.org/software/global/global.html). You will need version
+# 4.8.6 or higher.
+#
+# To use it do the following:
+# - Install the latest version of global
+# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
+# - Make sure the INPUT points to the root of the source tree
+# - Run doxygen as normal
+#
+# Doxygen will invoke htags (and that will in turn invoke gtags), so these
+# tools must be available from the command line (i.e. in the search path).
+#
+# The result: instead of the source browser generated by doxygen, the links to
+# source code will now point to the output of htags.
+# The default value is: NO.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+USE_HTAGS              = NO
+
+# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
+# verbatim copy of the header file for each class for which an include is
+# specified. Set to NO to disable this.
+# See also: Section \class.
+# The default value is: YES.
+
+VERBATIM_HEADERS       = YES
+
+# If the CLANG_ASSISTED_PARSING tag is set to YES then doxygen will use the
+# clang parser (see: http://clang.llvm.org/) for more accurate parsing at the
+# cost of reduced performance. This can be particularly helpful with template
+# rich C++ code for which doxygen's built-in parser lacks the necessary type
+# information.
+# Note: The availability of this option depends on whether or not doxygen was
+# generated with the -Duse-libclang=ON option for CMake.
+# The default value is: NO.
+
+CLANG_ASSISTED_PARSING = NO
+
+# If clang assisted parsing is enabled you can provide the compiler with command
+# line options that you would normally use when invoking the compiler. Note that
+# the include paths will already be set by doxygen for the files and directories
+# specified with INPUT and INCLUDE_PATH.
+# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
+
+CLANG_OPTIONS          =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
+# compounds will be generated. Enable this if the project contains a lot of
+# classes, structs, unions or interfaces.
+# The default value is: YES.
+
+ALPHABETICAL_INDEX     = YES
+
+# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
+# which the alphabetical index list will be split.
+# Minimum value: 1, maximum value: 20, default value: 5.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
+
+COLS_IN_ALPHA_INDEX    = 5
+
+# In case all classes in a project start with a common prefix, all classes will
+# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
+# can be used to specify a prefix (or a list of prefixes) that should be ignored
+# while generating the index headers.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
+
+IGNORE_PREFIX          =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output
+# The default value is: YES.
+
+GENERATE_HTML          = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_OUTPUT            = html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
+# generated HTML page (for example: .htm, .php, .asp).
+# The default value is: .html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FILE_EXTENSION    = .html
+
+# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
+# each generated HTML page. If the tag is left blank doxygen will generate a
+# standard header.
+#
+# To get valid HTML the header file that includes any scripts and style sheets
+# that doxygen needs, which is dependent on the configuration options used (e.g.
+# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
+# default header using
+# doxygen -w html new_header.html new_footer.html new_stylesheet.css
+# YourConfigFile
+# and then modify the file new_header.html. See also section "Doxygen usage"
+# for information on how to generate the default header that doxygen normally
+# uses.
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. For a description
+# of the possible markers and block names see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_HEADER            =
+
+# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
+# generated HTML page. If the tag is left blank doxygen will generate a standard
+# footer. See HTML_HEADER for more information on how to generate a default
+# footer and what special commands can be used inside the footer. See also
+# section "Doxygen usage" for information on how to generate the default footer
+# that doxygen normally uses.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FOOTER            =
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
+# sheet that is used by each HTML page. It can be used to fine-tune the look of
+# the HTML output. If left blank doxygen will generate a default style sheet.
+# See also section "Doxygen usage" for information on how to generate the style
+# sheet that doxygen normally uses.
+# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
+# it is more robust and this tag (HTML_STYLESHEET) will in the future become
+# obsolete.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_STYLESHEET        =
+
+# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# cascading style sheets that are included after the standard style sheets
+# created by doxygen. Using this option one can overrule certain style aspects.
+# This is preferred over using HTML_STYLESHEET since it does not replace the
+# standard style sheet and is therefore more robust against future updates.
+# Doxygen will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list). For an example see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_STYLESHEET  =
+
+# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the HTML output directory. Note
+# that these files will be copied to the base HTML output directory. Use the
+# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
+# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
+# files will be copied as-is; there are no commands or markers available.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_FILES       =
+
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
+# will adjust the colors in the style sheet and background images according to
+# this color. Hue is specified as an angle on a colorwheel, see
+# http://en.wikipedia.org/wiki/Hue for more information. For instance the value
+# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
+# purple, and 360 is red again.
+# Minimum value: 0, maximum value: 359, default value: 220.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_HUE    = 220
+
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
+# in the HTML output. For a value of 0 the output will use grayscales only. A
+# value of 255 will produce the most vivid colors.
+# Minimum value: 0, maximum value: 255, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_SAT    = 100
+
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
+# luminance component of the colors in the HTML output. Values below 100
+# gradually make the output lighter, whereas values above 100 make the output
+# darker. The value divided by 100 is the actual gamma applied, so 80 represents
+# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
+# change the gamma.
+# Minimum value: 40, maximum value: 240, default value: 80.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_GAMMA  = 80
+
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
+# page will contain the date and time when the page was generated. Setting this
+# to YES can help to show when doxygen was last run and thus if the
+# documentation is up to date.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_TIMESTAMP         = NO
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after the
+# page has loaded.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_DYNAMIC_SECTIONS  = NO
+
+# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
+# shown in the various tree structured indices initially; the user can expand
+# and collapse entries dynamically later on. Doxygen will expand the tree to
+# such a level that at most the specified number of entries are visible (unless
+# a fully collapsed tree already exceeds this amount). So setting the number of
+# entries 1 will produce a full collapsed tree by default. 0 is a special value
+# representing an infinite number of entries and will result in a full expanded
+# tree by default.
+# Minimum value: 0, maximum value: 9999, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_INDEX_NUM_ENTRIES = 100
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files will be
+# generated that can be used as input for Apple's Xcode 3 integrated development
+# environment (see: http://developer.apple.com/tools/xcode/), introduced with
+# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a
+# Makefile in the HTML output directory. Running make will produce the docset in
+# that directory and running make install will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
+# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
+# for more information.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_DOCSET        = YES
+
+# This tag determines the name of the docset feed. A documentation feed provides
+# an umbrella under which multiple documentation sets from a single provider
+# (such as a company or product suite) can be grouped.
+# The default value is: Doxygen generated docs.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_FEEDNAME        = "@PACKAGE_NAME@ Doxygen generated docs"
+
+# This tag specifies a string that should uniquely identify the documentation
+# set bundle. This should be a reverse domain-name style string, e.g.
+# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_BUNDLE_ID       = org.opendap.@PACKAGE_NAME@
+
+# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
+# the documentation publisher. This should be a reverse domain-name style
+# string, e.g. com.mycompany.MyDocSet.documentation.
+# The default value is: org.doxygen.Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
+
+# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
+# The default value is: Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_NAME  = Publisher
+
+# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
+# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
+# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
+# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on
+# Windows.
+#
+# The HTML Help Workshop contains a compiler that can convert all HTML output
+# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
+# files are now used as the Windows 98 help format, and will replace the old
+# Windows help format (.hlp) on all Windows platforms in the future. Compressed
+# HTML files also contain an index, a table of contents, and you can search for
+# words in the documentation. The HTML workshop also contains a viewer for
+# compressed HTML files.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_HTMLHELP      = NO
+
+# The CHM_FILE tag can be used to specify the file name of the resulting .chm
+# file. You can add a path in front of the file if the result should not be
+# written to the html output directory.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+CHM_FILE               =
+
+# The HHC_LOCATION tag can be used to specify the location (absolute path
+# including file name) of the HTML help compiler (hhc.exe). If non-empty,
+# doxygen will try to run the HTML help compiler on the generated index.hhp.
+# The file has to be specified with full path.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+HHC_LOCATION           =
+
+# The GENERATE_CHI flag controls if a separate .chi index file is generated
+# (YES) or that it should be included in the master .chm file (NO).
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+GENERATE_CHI           = NO
+
+# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc)
+# and project file content.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+CHM_INDEX_ENCODING     =
+
+# The BINARY_TOC flag controls whether a binary table of contents is generated
+# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it
+# enables the Previous and Next buttons.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+BINARY_TOC             = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members to
+# the table of contents of the HTML help documentation and to the tree view.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+TOC_EXPAND             = YES
+
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
+# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
+# (.qch) of the generated HTML documentation.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_QHP           = NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
+# the file name of the resulting .qch file. The path specified is relative to
+# the HTML output folder.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QCH_FILE               =
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
+# Project output. For more information please see Qt Help Project / Namespace
+# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace).
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_NAMESPACE          = org.doxygen.Project
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
+# Help Project output. For more information please see Qt Help Project / Virtual
+# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual-
+# folders).
+# The default value is: doc.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_VIRTUAL_FOLDER     = doc
+
+# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
+# filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_NAME   =
+
+# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
+# custom filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_ATTRS  =
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
+# project's filter section matches. Qt Help Project / Filter Attributes (see:
+# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_SECT_FILTER_ATTRS  =
+
+# The QHG_LOCATION tag can be used to specify the location of Qt's
+# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
+# generated .qhp file.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHG_LOCATION           =
+
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
+# generated, together with the HTML files, they form an Eclipse help plugin. To
+# install this plugin and make it available under the help contents menu in
+# Eclipse, the contents of the directory containing the HTML and XML files needs
+# to be copied into the plugins directory of eclipse. The name of the directory
+# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
+# After copying Eclipse needs to be restarted before the help appears.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_ECLIPSEHELP   = NO
+
+# A unique identifier for the Eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have this
+# name. Each documentation set should have its own identifier.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
+
+ECLIPSE_DOC_ID         = org.doxygen.Project
+
+# If you want full control over the layout of the generated HTML pages it might
+# be necessary to disable the index and replace it with your own. The
+# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
+# of each HTML page. A value of NO enables the index and the value YES disables
+# it. Since the tabs in the index contain the same information as the navigation
+# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+DISABLE_INDEX          = NO
+
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
+# structure should be generated to display hierarchical information. If the tag
+# value is set to YES, a side panel will be generated containing a tree-like
+# index structure (just like the one that is generated for HTML Help). For this
+# to work a browser that supports JavaScript, DHTML, CSS and frames is required
+# (i.e. any modern browser). Windows users are probably better off using the
+# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
+# further fine-tune the look of the index. As an example, the default style
+# sheet generated by doxygen has an example that shows how to put an image at
+# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
+# the same information as the tab index, you could consider setting
+# DISABLE_INDEX to YES when enabling this option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_TREEVIEW      = YES
+
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
+# doxygen will group on one line in the generated HTML documentation.
+#
+# Note that a value of 0 will completely suppress the enum values from appearing
+# in the overview section.
+# Minimum value: 0, maximum value: 20, default value: 4.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+ENUM_VALUES_PER_LINE   = 4
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
+# to set the initial width (in pixels) of the frame in which the tree is shown.
+# Minimum value: 0, maximum value: 1500, default value: 250.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+TREEVIEW_WIDTH         = 250
+
+# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to
+# external symbols imported via tag files in a separate window.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+EXT_LINKS_IN_WINDOW    = NO
+
+# Use this tag to change the font size of LaTeX formulas included as images in
+# the HTML documentation. When you change the font size after a successful
+# doxygen run you need to manually remove any form_*.png images from the HTML
+# output directory to force them to be regenerated.
+# Minimum value: 8, maximum value: 50, default value: 10.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FORMULA_FONTSIZE       = 10
+
+# Use the FORMULA_TRANPARENT tag to determine whether or not the images
+# generated for formulas are transparent PNGs. Transparent PNGs are not
+# supported properly for IE 6.0, but are supported on all modern browsers.
+#
+# Note that when changing this option you need to delete any form_*.png files in
+# the HTML output directory before the changes have effect.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FORMULA_TRANSPARENT    = YES
+
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
+# http://www.mathjax.org) which uses client side Javascript for the rendering
+# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
+# installed or if you want to formulas look prettier in the HTML output. When
+# enabled you may also need to install MathJax separately and configure the path
+# to it using the MATHJAX_RELPATH option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+USE_MATHJAX            = NO
+
+# When MathJax is enabled you can set the default output format to be used for
+# the MathJax output. See the MathJax site (see:
+# http://docs.mathjax.org/en/latest/output.html) for more details.
+# Possible values are: HTML-CSS (which is slower, but has the best
+# compatibility), NativeMML (i.e. MathML) and SVG.
+# The default value is: HTML-CSS.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_FORMAT         = HTML-CSS
+
+# When MathJax is enabled you need to specify the location relative to the HTML
+# output directory using the MATHJAX_RELPATH option. The destination directory
+# should contain the MathJax.js script. For instance, if the mathjax directory
+# is located at the same level as the HTML output directory, then
+# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
+# Content Delivery Network so you can quickly see the result without installing
+# MathJax. However, it is strongly recommended to install a local copy of
+# MathJax from http://www.mathjax.org before deployment.
+# The default value is: http://cdn.mathjax.org/mathjax/latest.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
+
+# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
+# extension names that should be enabled during MathJax rendering. For example
+# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_EXTENSIONS     =
+
+# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
+# of code that will be used on startup of the MathJax code. See the MathJax site
+# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
+# example see the documentation.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_CODEFILE       =
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
+# the HTML output. The underlying search engine uses javascript and DHTML and
+# should work on any modern browser. Note that when using HTML help
+# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
+# there is already a search function so this one should typically be disabled.
+# For large projects the javascript based search engine can be slow, then
+# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
+# search using the keyboard; to jump to the search box use <access key> + S
+# (what the <access key> is depends on the OS and browser, but it is typically
+# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
+# key> to jump into the search results window, the results can be navigated
+# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
+# the search. The filter options can be selected when the cursor is inside the
+# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
+# to select a filter and <Enter> or <escape> to activate or cancel the filter
+# option.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+SEARCHENGINE           = NO
+
+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
+# implemented using a web server instead of a web client using Javascript. There
+# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
+# setting. When disabled, doxygen will generate a PHP script for searching and
+# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
+# and searching needs to be provided by external tools. See the section
+# "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SERVER_BASED_SEARCH    = NO
+
+# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
+# script for searching. Instead the search results are written to an XML file
+# which needs to be processed by an external indexer. Doxygen will invoke an
+# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
+# search results.
+#
+# Doxygen ships with an example indexer (doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: http://xapian.org/).
+#
+# See the section "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH        = NO
+
+# The SEARCHENGINE_URL should point to a search engine hosted by a web server
+# which will return the search results when EXTERNAL_SEARCH is enabled.
+#
+# Doxygen ships with an example indexer (doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: http://xapian.org/). See the section "External Indexing and
+# Searching" for details.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHENGINE_URL       =
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
+# search data is written to a file for indexing by an external tool. With the
+# SEARCHDATA_FILE tag the name of this file can be specified.
+# The default file is: searchdata.xml.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHDATA_FILE        = searchdata.xml
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
+# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
+# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
+# projects and redirect the results back to the right project.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH_ID     =
+
+# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
+# projects other than the one defined by this configuration file, but that are
+# all added to the same external search index. Each project needs to have a
+# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
+# to a relative location where the documentation can be found. The format is:
+# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTRA_SEARCH_MAPPINGS  =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
+# The default value is: YES.
+
+GENERATE_LATEX         = NO
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_OUTPUT           = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# invoked.
+#
+# Note that when enabling USE_PDFLATEX this option is only used for generating
+# bitmaps for formulas in the HTML output, but not in the Makefile that is
+# written to the output directory.
+# The default file is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_CMD_NAME         = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
+# index for LaTeX.
+# The default file is: makeindex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+MAKEINDEX_CMD_NAME     = makeindex
+
+# If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+COMPACT_LATEX          = YES
+
+# The PAPER_TYPE tag can be used to set the paper type that is used by the
+# printer.
+# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
+# 14 inches) and executive (7.25 x 10.5 inches).
+# The default value is: a4.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+PAPER_TYPE             = letter
+
+# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
+# that should be included in the LaTeX output. The package can be specified just
+# by its name or with the correct syntax as to be used with the LaTeX
+# \usepackage command. To get the times font for instance you can specify :
+# EXTRA_PACKAGES=times or EXTRA_PACKAGES={times}
+# To use the option intlimits with the amsmath package you can specify:
+# EXTRA_PACKAGES=[intlimits]{amsmath}
+# If left blank no extra packages will be included.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+EXTRA_PACKAGES         =
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
+# generated LaTeX document. The header should contain everything until the first
+# chapter. If it is left blank doxygen will generate a standard header. See
+# section "Doxygen usage" for information on how to let doxygen write the
+# default header to a separate file.
+#
+# Note: Only use a user-defined header if you know what you are doing! The
+# following commands have a special meaning inside the header: $title,
+# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
+# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
+# string, for the replacement values of the other commands the user is referred
+# to HTML_HEADER.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HEADER           =
+
+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
+# generated LaTeX document. The footer should contain everything after the last
+# chapter. If it is left blank doxygen will generate a standard footer. See
+# LATEX_HEADER for more information on how to generate a default footer and what
+# special commands can be used inside the footer.
+#
+# Note: Only use a user-defined footer if you know what you are doing!
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_FOOTER           =
+
+# The LATEX_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# LaTeX style sheets that are included after the standard style sheets created
+# by doxygen. Using this option one can overrule certain style aspects. Doxygen
+# will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list).
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_STYLESHEET =
+
+# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the LATEX_OUTPUT output
+# directory. Note that the files will be copied as-is; there are no commands or
+# markers available.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_FILES      =
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
+# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
+# contain links (just like the HTML output) instead of page references. This
+# makes the output suitable for online browsing using a PDF viewer.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+PDF_HYPERLINKS         = YES
+
+# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
+# the PDF file directly from the LaTeX files. Set this option to YES, to get a
+# higher quality PDF documentation.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+USE_PDFLATEX           = NO
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
+# command to the generated LaTeX files. This will instruct LaTeX to keep running
+# if errors occur, instead of asking the user for help. This option is also used
+# when generating formulas in HTML.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BATCHMODE        = NO
+
+# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
+# index chapters (such as File Index, Compound Index, etc.) in the output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HIDE_INDICES     = NO
+
+# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
+# code with syntax highlighting in the LaTeX output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_SOURCE_CODE      = NO
+
+# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
+# bibliography, e.g. plainnat, or ieeetr. See
+# http://en.wikipedia.org/wiki/BibTeX and \cite for more info.
+# The default value is: plain.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BIB_STYLE        = plain
+
+# If the LATEX_TIMESTAMP tag is set to YES then the footer of each generated
+# page will contain the date and time when the page was generated. Setting this
+# to NO can help when comparing the output of multiple runs.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_TIMESTAMP        = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES, doxygen will generate RTF output. The
+# RTF output is optimized for Word 97 and may not look too pretty with other RTF
+# readers/editors.
+# The default value is: NO.
+
+GENERATE_RTF           = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: rtf.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_OUTPUT             = rtf
+
+# If the COMPACT_RTF tag is set to YES, doxygen generates more compact RTF
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+COMPACT_RTF            = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
+# contain hyperlink fields. The RTF file will contain links (just like the HTML
+# output) instead of page references. This makes the output suitable for online
+# browsing using Word or some other Word compatible readers that support those
+# fields.
+#
+# Note: WordPad (write) and others do not support links.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_HYPERLINKS         = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's config
+# file, i.e. a series of assignments. You only have to provide replacements,
+# missing definitions are set to their default value.
+#
+# See also section "Doxygen usage" for information on how to generate the
+# default style sheet that doxygen normally uses.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_STYLESHEET_FILE    =
+
+# Set optional variables used in the generation of an RTF document. Syntax is
+# similar to doxygen's config file. A template extensions file can be generated
+# using doxygen -e rtf extensionFile.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_EXTENSIONS_FILE    =
+
+# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
+# with syntax highlighting in the RTF output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_SOURCE_CODE        = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES, doxygen will generate man pages for
+# classes and files.
+# The default value is: NO.
+
+GENERATE_MAN           = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it. A directory man3 will be created inside the directory specified by
+# MAN_OUTPUT.
+# The default directory is: man.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_OUTPUT             = man
+
+# The MAN_EXTENSION tag determines the extension that is added to the generated
+# man pages. In case the manual section does not start with a number, the number
+# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
+# optional.
+# The default value is: .3.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_EXTENSION          = .3n
+
+# The MAN_SUBDIR tag determines the name of the directory created within
+# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by
+# MAN_EXTENSION with the initial . removed.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_SUBDIR             =
+
+# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
+# will generate one additional man file for each entity documented in the real
+# man page(s). These additional files only source the real man page, but without
+# them the man command would be unable to find the correct page.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_LINKS              = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES, doxygen will generate an XML file that
+# captures the structure of the code including all documentation.
+# The default value is: NO.
+
+GENERATE_XML           = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: xml.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_OUTPUT             = xml
+
+# If the XML_PROGRAMLISTING tag is set to YES, doxygen will dump the program
+# listings (including syntax highlighting and cross-referencing information) to
+# the XML output. Note that enabling this will significantly increase the size
+# of the XML output.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_PROGRAMLISTING     = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to the DOCBOOK output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_DOCBOOK tag is set to YES, doxygen will generate Docbook files
+# that can be used to generate PDF.
+# The default value is: NO.
+
+GENERATE_DOCBOOK       = NO
+
+# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
+# front of it.
+# The default directory is: docbook.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_OUTPUT         = docbook
+
+# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
+# program listings (including syntax highlighting and cross-referencing
+# information) to the DOCBOOK output. Note that enabling this will significantly
+# increase the size of the DOCBOOK output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_PROGRAMLISTING = NO
+
+#---------------------------------------------------------------------------
+# Configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an
+# AutoGen Definitions (see http://autogen.sf.net) file that captures the
+# structure of the code including all documentation. Note that this feature is
+# still experimental and incomplete at the moment.
+# The default value is: NO.
+
+GENERATE_AUTOGEN_DEF   = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES, doxygen will generate a Perl module
+# file that captures the structure of the code including all documentation.
+#
+# Note that this feature is still experimental and incomplete at the moment.
+# The default value is: NO.
+
+GENERATE_PERLMOD       = NO
+
+# If the PERLMOD_LATEX tag is set to YES, doxygen will generate the necessary
+# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
+# output from the Perl module output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_LATEX          = NO
+
+# If the PERLMOD_PRETTY tag is set to YES, the Perl module output will be nicely
+# formatted so it can be parsed by a human reader. This is useful if you want to
+# understand what is going on. On the other hand, if this tag is set to NO, the
+# size of the Perl module output will be much smaller and Perl will parse it
+# just the same.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_PRETTY         = YES
+
+# The names of the make variables in the generated doxyrules.make file are
+# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
+# so different doxyrules.make files included by the same Makefile don't
+# overwrite each other's variables.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_MAKEVAR_PREFIX =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES, doxygen will evaluate all
+# C-preprocessor directives found in the sources and include files.
+# The default value is: YES.
+
+ENABLE_PREPROCESSING   = YES
+
+# If the MACRO_EXPANSION tag is set to YES, doxygen will expand all macro names
+# in the source code. If set to NO, only conditional compilation will be
+# performed. Macro expansion can be done in a controlled way by setting
+# EXPAND_ONLY_PREDEF to YES.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+MACRO_EXPANSION        = NO
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
+# the macro expansion is limited to the macros specified with the PREDEFINED and
+# EXPAND_AS_DEFINED tags.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+EXPAND_ONLY_PREDEF     = NO
+
+# If the SEARCH_INCLUDES tag is set to YES, the include files in the
+# INCLUDE_PATH will be searched if a #include is found.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+SEARCH_INCLUDES        = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by the
+# preprocessor.
+# This tag requires that the tag SEARCH_INCLUDES is set to YES.
+
+INCLUDE_PATH           =
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will be
+# used.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+INCLUDE_FILE_PATTERNS  =
+
+# The PREDEFINED tag can be used to specify one or more macro names that are
+# defined before the preprocessor is started (similar to the -D option of e.g.
+# gcc). The argument of the tag is a list of macros of the form: name or
+# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
+# is assumed. To prevent a macro definition from being undefined via #undef or
+# recursively expanded use the := operator instead of the = operator.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+PREDEFINED             =
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
+# tag can be used to specify a list of macro names that should be expanded. The
+# macro definition that is found in the sources will be used. Use the PREDEFINED
+# tag if you want to use a different macro definition that overrules the
+# definition found in the source code.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+EXPAND_AS_DEFINED      =
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
+# remove all references to function-like macros that are alone on a line, have
+# an all uppercase name, and do not end with a semicolon. Such function macros
+# are typically used for boiler-plate code, and will confuse the parser if not
+# removed.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+SKIP_FUNCTION_MACROS   = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to external references
+#---------------------------------------------------------------------------
+
+# The TAGFILES tag can be used to specify one or more tag files. For each tag
+# file the location of the external documentation should be added. The format of
+# a tag file without this location is as follows:
+# TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+# TAGFILES = file1=loc1 "file2 = loc2" ...
+# where loc1 and loc2 can be relative or absolute paths or URLs. See the
+# section "Linking to external documentation" for more information about the use
+# of tag files.
+# Note: Each tag file must have a unique name (where the name does NOT include
+# the path). If a tag file is not located in the directory in which doxygen is
+# run, you must also specify the path to the tagfile here.
+
+TAGFILES               =
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
+# tag file that is based on the input files it reads. See section "Linking to
+# external documentation" for more information about the usage of tag files.
+
+GENERATE_TAGFILE       =
+
+# If the ALLEXTERNALS tag is set to YES, all external class will be listed in
+# the class index. If set to NO, only the inherited external classes will be
+# listed.
+# The default value is: NO.
+
+ALLEXTERNALS           = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES, all external groups will be listed
+# in the modules index. If set to NO, only the current project's groups will be
+# listed.
+# The default value is: YES.
+
+EXTERNAL_GROUPS        = YES
+
+# If the EXTERNAL_PAGES tag is set to YES, all external pages will be listed in
+# the related pages index. If set to NO, only the current project's pages will
+# be listed.
+# The default value is: YES.
+
+EXTERNAL_PAGES         = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script
+# interpreter (i.e. the result of 'which perl').
+# The default file (with absolute path) is: /usr/bin/perl.
+
+PERL_PATH              = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram
+# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
+# NO turns the diagrams off. Note that this option also works with HAVE_DOT
+# disabled, but it is recommended to install and use dot, since it yields more
+# powerful graphs.
+# The default value is: YES.
+
+CLASS_DIAGRAMS         = YES
+
+# You can define message sequence charts within doxygen comments using the \msc
+# command. Doxygen will then run the mscgen tool (see:
+# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where
+# the mscgen tool resides. If left empty the tool is assumed to be found in the
+# default search path.
+
+MSCGEN_PATH            =
+
+# You can include diagrams made with dia in doxygen documentation. Doxygen will
+# then run dia to produce the diagram and insert it in the documentation. The
+# DIA_PATH tag allows you to specify the directory where the dia binary resides.
+# If left empty dia is assumed to be found in the default search path.
+
+DIA_PATH               =
+
+# If set to YES the inheritance and collaboration graphs will hide inheritance
+# and usage relations if the target is undocumented or is not a class.
+# The default value is: YES.
+
+HIDE_UNDOC_RELATIONS   = NO
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz (see:
+# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
+# Bell Labs. The other options in this section have no effect if this option is
+# set to NO
+# The default value is: NO.
+
+HAVE_DOT               = YES
+
+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
+# to run in parallel. When set to 0 doxygen will base this on the number of
+# processors available in the system. You can set it explicitly to a value
+# larger than 0 to get control over the balance between CPU load and processing
+# speed.
+# Minimum value: 0, maximum value: 32, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_NUM_THREADS        = 0
+
+# When you want a differently looking font in the dot files that doxygen
+# generates you can specify the font name using DOT_FONTNAME. You need to make
+# sure dot is able to find the font, which can be done by putting it in a
+# standard location or by setting the DOTFONTPATH environment variable or by
+# setting DOT_FONTPATH to the directory containing the font.
+# The default value is: Helvetica.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTNAME           = Helvetica
+
+# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
+# dot graphs.
+# Minimum value: 4, maximum value: 24, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTSIZE           = 10
+
+# By default doxygen will tell dot to use the default font as specified with
+# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
+# the path where dot can find it using this tag.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTPATH           =
+
+# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
+# each documented class showing the direct and indirect inheritance relations.
+# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CLASS_GRAPH            = YES
+
+# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
+# graph for each documented class showing the direct and indirect implementation
+# dependencies (inheritance, containment, and class references variables) of the
+# class with other documented classes.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+COLLABORATION_GRAPH    = NO
+
+# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
+# groups, showing the direct groups dependencies.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GROUP_GRAPHS           = NO
+
+# If the UML_LOOK tag is set to YES, doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
+# Language.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+UML_LOOK               = YES
+
+# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
+# class node. If there are many fields or methods and many nodes the graph may
+# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
+# number of items for each type to make the size more manageable. Set this to 0
+# for no limit. Note that the threshold may be exceeded by 50% before the limit
+# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
+# but if the number exceeds 15, the total amount of fields shown is limited to
+# 10.
+# Minimum value: 0, maximum value: 100, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+UML_LIMIT_NUM_FIELDS   = 10
+
+# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
+# collaboration graphs will show the relations between templates and their
+# instances.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+TEMPLATE_RELATIONS     = YES
+
+# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
+# YES then doxygen will generate a graph for each documented file showing the
+# direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INCLUDE_GRAPH          = YES
+
+# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
+# set to YES then doxygen will generate a graph for each documented file showing
+# the direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INCLUDED_BY_GRAPH      = YES
+
+# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable call graphs for selected
+# functions only using the \callgraph command. Disabling a call graph can be
+# accomplished by means of the command \hidecallgraph.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CALL_GRAPH             = NO
+
+# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable caller graphs for selected
+# functions only using the \callergraph command. Disabling a caller graph can be
+# accomplished by means of the command \hidecallergraph.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CALLER_GRAPH           = NO
+
+# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
+# hierarchy of all classes instead of a textual one.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GRAPHICAL_HIERARCHY    = YES
+
+# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
+# dependencies a directory has on other directories in a graphical way. The
+# dependency relations are determined by the #include relations between the
+# files in the directories.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DIRECTORY_GRAPH        = YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
+# generated by dot. For an explanation of the image formats see the section
+# output formats in the documentation of the dot tool (Graphviz (see:
+# http://www.graphviz.org/)).
+# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
+# to make the SVG files visible in IE 9+ (other browsers do not have this
+# requirement).
+# Possible values are: png, jpg, gif, svg, png:gd, png:gd:gd, png:cairo,
+# png:cairo:gd, png:cairo:cairo, png:cairo:gdiplus, png:gdiplus and
+# png:gdiplus:gdiplus.
+# The default value is: png.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_IMAGE_FORMAT       = png
+
+# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
+# enable generation of interactive SVG images that allow zooming and panning.
+#
+# Note that this requires a modern browser other than Internet Explorer. Tested
+# and working are Firefox, Chrome, Safari, and Opera.
+# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
+# the SVG files visible. Older versions of IE do not have SVG support.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INTERACTIVE_SVG        = NO
+
+# The DOT_PATH tag can be used to specify the path where the dot tool can be
+# found. If left blank, it is assumed the dot tool can be found in the path.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_PATH               =
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the \dotfile
+# command).
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOTFILE_DIRS           =
+
+# The MSCFILE_DIRS tag can be used to specify one or more directories that
+# contain msc files that are included in the documentation (see the \mscfile
+# command).
+
+MSCFILE_DIRS           =
+
+# The DIAFILE_DIRS tag can be used to specify one or more directories that
+# contain dia files that are included in the documentation (see the \diafile
+# command).
+
+DIAFILE_DIRS           =
+
+# When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the
+# path where java can find the plantuml.jar file. If left blank, it is assumed
+# PlantUML is not used or called during a preprocessing step. Doxygen will
+# generate a warning when it encounters a \startuml command in this case and
+# will not generate output for the diagram.
+
+PLANTUML_JAR_PATH      =
+
+# When using plantuml, the specified paths are searched for files specified by
+# the !include statement in a plantuml block.
+
+PLANTUML_INCLUDE_PATH  =
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
+# that will be shown in the graph. If the number of nodes in a graph becomes
+# larger than this value, doxygen will truncate the graph, which is visualized
+# by representing a node as a red box. Note that doxygen if the number of direct
+# children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
+# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+# Minimum value: 0, maximum value: 10000, default value: 50.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_GRAPH_MAX_NODES    = 50
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
+# generated by dot. A depth value of 3 means that only nodes reachable from the
+# root by following a path via at most 3 edges will be shown. Nodes that lay
+# further from the root node will be omitted. Note that setting this option to 1
+# or 2 may greatly reduce the computation time needed for large code bases. Also
+# note that the size of a graph can be further restricted by
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+# Minimum value: 0, maximum value: 1000, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+MAX_DOT_GRAPH_DEPTH    = 0
+
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
+# background. This is disabled by default, because dot on Windows does not seem
+# to support this out of the box.
+#
+# Warning: Depending on the platform used, enabling this option may lead to
+# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
+# read).
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_TRANSPARENT        = YES
+
+# Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output
+# files in one run (i.e. multiple -o and -T options on the command line). This
+# makes dot run faster, but since only newer versions of dot (>1.8.10) support
+# this, this feature is disabled by default.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_MULTI_TARGETS      = YES
+
+# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
+# explaining the meaning of the various boxes and arrows in the dot generated
+# graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GENERATE_LEGEND        = YES
+
+# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate dot
+# files that are used to generate the various graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_CLEANUP            = YES
diff --git a/escaping.cc b/escaping.cc
new file mode 100644
index 0000000..bb1d87d
--- /dev/null
+++ b/escaping.cc
@@ -0,0 +1,499 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// Copyright (c) 1996, California Institute of Technology.
+// ALL RIGHTS RESERVED.   U.S. Government Sponsorship acknowledged.
+//
+// Please read the full copyright notice in the file COPYRIGHT_URI
+// in this directory.
+//
+// Author: Todd Karakashian, NASA/Jet Propulsion Laboratory
+//         Todd.K.Karakashian@jpl.nasa.gov
+//
+// $RCSfile: escaping.cc,v $ - Miscellaneous routines for OPeNDAP HDF server
+//
+// These two routines are for escaping/unescaping strings that are identifiers
+// in DAP2
+// id2www() -- escape (using WWW hex codes) non-allowable characters in a
+// DAP2 identifier
+// www2id() -- given an WWW hexcode escaped identifier, restore it
+//
+// These two routines are for escaping/unescaping strings storing attribute
+// values.  They use traditional octal escapes (\nnn) because they are
+// intended to be viewed by a user
+// escattr() -- escape (using traditional octal backslash) non-allowable
+// characters in the value of a DAP2 attribute
+// unescattr() -- given an octally escaped string, restore it
+//
+// These are routines used by the above, not intended to be called directly:
+//
+// hexstring()
+// unhexstring()
+// octstring()
+// unoctstring()
+//
+// -Todd
+
+#include "config.h"
+
+#include <ctype.h>
+
+#include <iomanip>
+#include <string>
+#include <sstream>
+
+#include "GNURegex.h"
+#include "Error.h"
+#include "InternalErr.h"
+//#define DODS_DEBUG
+#include "debug.h"
+
+using namespace std;
+
+namespace libdap {
+
+// The next four functions were originally defined static, but I removed that
+// to make testing them (see generalUtilTest.cc) easier to write. 5/7/2001
+// jhrg
+
+string
+hexstring(unsigned char val)
+{
+    ostringstream buf;
+    buf << hex << setw(2) << setfill('0') << static_cast<unsigned int>(val);
+
+    return buf.str();
+}
+
+string
+unhexstring(string s)
+{
+    int val;
+    istringstream ss(s);
+    ss >> hex >> val;
+    char tmp_str[2];
+    tmp_str[0] = static_cast<char>(val);
+    tmp_str[1] = '\0';
+    return string(tmp_str);
+}
+
+string
+octstring(unsigned char val)
+{
+    ostringstream buf;
+    buf << oct << setw(3) << setfill('0')
+    << static_cast<unsigned int>(val);
+
+    return buf.str();
+}
+
+string
+unoctstring(string s)
+{
+    int val;
+
+    istringstream ss(s);
+    ss >> oct >> val;
+
+    DBG(cerr << "unoctstring: " << val << endl);
+
+    char tmp_str[2];
+    tmp_str[0] = static_cast<char>(val);
+    tmp_str[1] = '\0';
+    return string(tmp_str);
+}
+
+/** Replace characters that are not allowed in DAP2 identifiers.
+
+    -In the DAP itself, id2www() is called in:
+     -# Array::print_decl() where dimension names are escaped
+     -# AttrTable::print() (which calls AttrTable::simple_print()) where
+        attribute names are escaped
+     -# BaseType::print_decl() where variable names are escaped.
+     -# Constructor::print_decl() where the name of the constructor type is
+        printed.
+     -# DDS::print() and DDS::print_constrained() where the name of the
+        dataset is printed.
+     -# Grid::print_decl() where the name of the grid is printed.
+
+    -In the client code:
+     -# id2www_ce() is called five times in the five methods that are used to
+        request responses where a CE is appended to a URL
+        (Connect::request_version, request_protocol, request_das, request_dds,
+        request_data).
+
+    @param in Replace characters in this string.
+    @param allowable The set of characters that are allowed in a URI.
+    default: "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-+_/.\\*"
+    @see id2www_ce()
+    @return The modified identifier. */
+string
+id2www(string in, const string &allowable)
+{
+    string::size_type i = 0;
+    DBG(cerr<<"Input string: [" << in << "]" << endl);
+    while ((i = in.find_first_not_of(allowable, i)) != string::npos) {
+	DBG(cerr<<"Found escapee: [" << in[i] << "]");
+        in.replace(i, 1, "%" + hexstring(in[i]));
+        DBGN(cerr<<" now the string is: " << in << endl);
+        i += 3;//i++;
+    }
+
+    return in;
+}
+
+/** Replace characters that are not allowed in WWW URLs using rules specific
+    to Constraint Expressions. This has changed over time and now the only
+    difference is that '*' is escaped by this function while it is not
+    escaped by id2www().
+
+    @param in The string in which to replace characters.
+    @param allowable The set of characters that are allowed in a URI.
+    default: "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-+_/.\\"
+    @see id2www()
+    @return The modified identifier. */
+string
+id2www_ce(string in, const string &allowable)
+{
+    return id2www(in, allowable);
+
+
+}
+
+/** Given a string that contains WWW escape sequences, translate those escape
+    sequences back into the ASCII characters they represent. Return the
+    modified string.
+
+    -Places in the dap code where www2id() is called:
+     -# Array::append_dim() the name is decoded before it is added
+     -# AttrTable::set_name(), AttrTable::append_attr(),
+        AttrTable::append_container(), AttrTable::del_attr(),
+        AttrTable::add_container_alias(), AttrTable::add_value_alias()
+        names are decoded before that are set/used.
+     -# BaseType::set_name() Names are decoded before they are set
+     -# When the constraint expression parser looks for a variable, the name is
+        first decoded.
+     -# DAS::DAS() Named attribute containers are decoded
+     -# DDS::var() When a DDS searches for a variable, the name is first decoded.
+     -# Grid::var(), Sequence::var(), Structure::var() Variable names are decoded.
+
+   -In the server code:
+     -# ResponseBuilder::initialize() The dataset name is decoded except that %20
+        is not removed.
+     -# ResponseBuilder::set_ce() The CE is decoded, except for spaces (%20).
+     -# ResponseBuilder::set_dataset_name() same logic as the first case.
+     -# The ResponseBuilder methods supersede methods with the same names
+        from DODSFilter, which is still in the code although deprecated.
+
+    @param in The string to modify.
+    @param escape The character used to signal the beginning of an escape
+    sequence. default: "%"
+    @param except If there are some escape codes that should not be removed by
+    this call (e.g., you might not want to remove spaces, %20) use this
+    parameter to specify those codes. The function will then transform all
+    escapes \e except those given. For example, to suppress translation of both
+    spaces and the ampersand, pass "%20%26" for 'except'. default: ""
+    @return The modified string. */
+string
+www2id(const string &in, const string &escape, const string &except)
+{
+    string::size_type i = 0;
+    string res = in;
+    while ((i = res.find_first_of(escape, i)) != string::npos) {
+        if (except.find(res.substr(i, 3)) != string::npos) {
+            i += 3;
+            continue;
+        }
+        res.replace(i, 3, unhexstring(res.substr(i + 1, 2)));
+        ++i;
+    }
+
+    return res;
+}
+
+static string
+entity(char c)
+{
+    switch (c) {
+    case '>': return "&gt;";
+    case '<': return "&lt;";
+    case '&': return "&amp;";
+    case '\'': return "&apos;";
+    case '\"': return "&quot;";
+    default:
+        throw InternalErr(__FILE__, __LINE__, "Unrecognized character.");
+    }
+}
+
+// Assumption: There are always exactly two octal digits in the input
+// and two hex digits in the result.
+string
+octal_to_hex(const string &octal_digits)
+{
+    int val;
+
+    istringstream ss(octal_digits);
+    ss >> oct >> val;
+
+    ostringstream ds;
+    ds << hex << setw(2) << setfill('0') << val;
+    return ds.str();
+}
+
+/** Replace characters that are not allowed in XML
+
+    @param in The string in which to replace characters.
+    @param not_allowed The set of characters that are not allowed in XML.
+    default: ><&'(single quote)"(double quote)
+    @return The modified identifier. */
+string
+id2xml(string in, const string &not_allowed)
+{
+    string::size_type i = 0;
+
+    while ((i = in.find_first_of(not_allowed, i)) != string::npos) {
+        in.replace(i, 1, entity(in[i]));
+        ++i;
+    }
+#if 0
+    // Removed the encoding of octal escapes. This function is used by
+    // AttrTable to encode the stuff that is the value of the <value>
+    // element in the DDX. The problem is that some of the values are not
+    // valid UTF-8 and that makes a XML parser gag.; ticket 1512.
+    // jhrg 3/19/10
+
+    // OK, now scan for octal escape sequences like \\012 (where the '\'
+    // is itself escaped). This type of attribute value comes from the netCDF
+    // handler and maybe others. Assumption: The '\' will always appear as
+    // in its escaped form: '\\'. NB: Both backslashes must be escaped in the
+    // C++ string.
+    string octal_escape = "\\\\";
+    i = 0;
+    string::size_type length = in.length();
+    while ((i = in.find(octal_escape, i)) != string::npos) {
+        // Get the three octal digits following the '\\0'
+        string::size_type j = i + 2;
+        if (j + 1 >= length)  // Check that we're not past the end
+            break;
+        string octal_digits = in.substr(j, 3);
+        // convert to a &#xdd; XML escape
+        string hex_escape = string("&#x");
+        hex_escape.append(octal_to_hex(octal_digits));
+        hex_escape.append(string(";"));
+
+        // replace the octal escape with an XML/hex escape
+        in.replace(i, 5, hex_escape);
+
+        // increment i
+        i += 6;
+    }
+#endif
+    return in;
+}
+
+/** Given a string that contains XML escape sequences (i.e., entities),
+    translate those back into ASCII characters. Return the modified string.
+
+    @param in The string to modify.
+    @return The modified string. */
+string
+xml2id(string in)
+{
+    string::size_type i = 0;
+
+    while ((i = in.find("&gt;", i)) != string::npos)
+        in.replace(i, 4, ">");
+
+    i = 0;
+    while ((i = in.find("&lt;", i)) != string::npos)
+        in.replace(i, 4, "<");
+
+    i = 0;
+    while ((i = in.find("&amp;", i)) != string::npos)
+        in.replace(i, 5, "&");
+
+    i = 0;
+    while ((i = in.find("&apos;", i)) != string::npos)
+        in.replace(i, 6, "'");
+
+    i = 0;
+    while ((i = in.find("&quot;", i)) != string::npos)
+        in.replace(i, 6, "\"");
+
+    return in;
+}
+
+/** Return a string that has all the \c %&lt;hex digit&gt;&lt;hex digit&gt;
+    sequences replaced with underscores (`_').
+
+    @param s The string to transform
+    @return The modified string. */
+string
+esc2underscore(string s)
+{
+    string::size_type pos;
+    while ((pos = s.find('%')) != string::npos)
+        s.replace(pos, 3, "_");
+
+    return s;
+}
+
+
+/** Escape non-printable characters and quotes from an HDF attribute.
+    @param s The attribute to modify.
+    @return The modified attribute. */
+string
+escattr(string s)
+{
+    const string printable = " ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789~`!@#$%^&*()_-+={[}]|\\:;<,>.?/'\"";
+    const string ESC = "\\";
+    const string DOUBLE_ESC = ESC + ESC;
+    const string QUOTE = "\"";
+    const string ESCQUOTE = ESC + QUOTE;
+
+    // escape \ with a second backslash
+    string::size_type ind = 0;
+    while ((ind = s.find(ESC, ind)) != s.npos) {
+        s.replace(ind, 1, DOUBLE_ESC);
+        ind += DOUBLE_ESC.length();
+    }
+
+    // escape non-printing characters with octal escape
+    ind = 0;
+    while ((ind = s.find_first_not_of(printable, ind)) != s.npos)
+        s.replace(ind, 1, ESC + octstring(s[ind]));
+
+    // escape " with backslash
+    ind = 0;
+    while ((ind = s.find(QUOTE, ind)) != s.npos) {
+        s.replace(ind, 1, ESCQUOTE);
+        ind += ESCQUOTE.length();
+    }
+
+    return s;
+}
+
+/** Un-escape special characters, quotes and backslashes from an HDF
+    attribute.
+
+    Note: A regex to match one \ must be defined as: Regex foo = "\\\\";
+    because both C++ strings and GNU's Regex also employ \ as an escape
+    character!
+
+    @param s The escaped attribute. @return The unescaped attribute. */
+string
+unescattr(string s)
+{
+    Regex octal("\\\\[0-3][0-7][0-7]");  // matches 4 characters
+    Regex esc_quote("\\\\\"");  // matches 3 characters
+    Regex esc_esc("\\\\\\\\");      // matches 2 characters
+    const string ESC = "\\";
+    const string QUOTE = "\"";
+    int matchlen;
+    unsigned int index;
+
+    DBG(cerr << "0XX" << s << "XXX" << endl);
+    // unescape any escaped backslashes
+    index = esc_esc.search(s.c_str(), s.length(), matchlen, 0);
+    while (index < s.length()) {
+        DBG(cerr << "1aXX" << s << "XXX index: " << index << endl);
+        s.replace(index, 2, ESC);
+        DBG(cerr << "1bXX" << s << "XXX index: " << index << endl);
+        index = esc_esc.search(s.c_str(), s.length(), matchlen, 0);
+    }
+
+    // unescape any escaped double quote characters
+    index = esc_quote.search(s.c_str(), s.length(), matchlen, 0);
+    while (index < s.length()) {
+        s.replace(index, 2, QUOTE);
+        DBG(cerr << "2XX" << s << "XXX index: " << index << endl);
+        index = esc_quote.search(s.c_str(), s.length(), matchlen, 0);
+    }
+
+    // unescape octal characters
+    index = octal.search(s.c_str(), s.length(), matchlen, 0);
+    while (index < s.length()) {
+        s.replace(index, 4, unoctstring(s.substr(index + 1, 3)));
+        DBG(cerr << "3XX" << s << "XXX index: " << index << endl);
+        index = octal.search(s.c_str(), s.length(), matchlen, 0);
+    }
+
+    DBG(cerr << "4XX" << s << "XXX" << endl);
+    return s;
+}
+
+string
+munge_error_message(string msg)
+{
+    // First, add enclosing quotes if needed.
+    if (*msg.begin() != '"')
+        msg.insert(msg.begin(), '"');
+    if (*(msg.end() - 1) != '"')
+        msg += "\"";
+
+    // Now escape any internal double quotes that aren't escaped.
+    string::iterator miter;
+    for (miter = msg.begin() + 1; miter != msg.end() - 1; miter++)
+        if (*miter == '"' && *(miter - 1) != '\\')
+            miter = msg.insert(miter, '\\');
+
+    return msg;
+}
+
+/** Rip through a string and replace all the double quotes with \" sequences.
+    @param source
+    @return result
+ */
+string
+escape_double_quotes(string source)
+{
+    string::size_type idx = 0;
+    while((idx = source.find('\"', idx)) != string::npos) {
+        source.replace(idx, 1, "\\\""); // a backslash and a double quote
+        idx += 2;
+    }
+
+    return source;
+}
+
+/** Rip through a string and replace all the escaped double quotes with
+    regular double quotes.
+    @param source
+    @return result
+ */
+string
+unescape_double_quotes(string source)
+{
+    string::size_type idx = 0;
+    while((idx = source.find("\\\"", idx)) != string::npos) {
+        source.replace(idx, 2, "\""); // a backslash and a double quote
+        ++idx;
+    }
+
+    return source;
+}
+
+} // namespace libdap
+
diff --git a/escaping.h b/escaping.h
new file mode 100644
index 0000000..6976b60
--- /dev/null
+++ b/escaping.h
@@ -0,0 +1,87 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// Declarations for identifier escaping and un-escaping functions.
+
+#ifndef _escaping_h
+#define _escaping_h
+
+#include <string>
+
+using std::string;
+
+namespace libdap
+{
+
+string hexstring(unsigned char val);
+string unhexstring(string s);
+string octstring(unsigned char val);
+string unoctstring(string s);
+
+// The original set of allowed characters was: [0-9a-zA-Z_%]
+// The characters accepted in DAP2 ids: [-+a-zA-Z0-9_/%.\\#*]; everything
+// else must be escaped.  Note that for some inscrutable reason, we've been
+// escaping '*'.
+
+// The characters allowable in an id in a URI (see RFC 2396):
+// [-A-Za-z0-9_.!~*'()].
+
+string id2www(string s, const string &allowable = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-+_/.\\*");
+
+// This is what DAP2 allows in a ce: [-+a-zA-Z0-9_/%.\\#]
+string id2www_ce(string s, const string &allowable = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-+_/.\\");
+
+string www2id(const string &in, const string &escape = "%",
+              const string &except = "");
+
+// Include these for compatibility with the old names. 7/19/2001 jhrg
+#define id2dods id2www
+#define dods2id www2id
+
+string octal_to_hex(const string &octal_digits);
+
+string id2xml(string in, const string &not_allowed = "><&'\"");
+string xml2id(string in);
+
+string esc2underscore(string s);
+string char2ASCII(string s, const string escape = "%[0-7][0-9a-fA-F]");
+string escattr(string s);
+string unescattr(string s);
+
+string munge_error_message(string msg);
+
+string unescape_double_quotes(string source);
+string escape_double_quotes(string source);
+
+} // namespace libdap
+
+#endif // _escaping_h
+
diff --git a/expr.h b/expr.h
new file mode 100644
index 0000000..23591a7
--- /dev/null
+++ b/expr.h
@@ -0,0 +1,98 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1995-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// Types for the expr parser.
+//
+// 11/4/95 jhrg
+
+#ifndef _expr_h
+#define _expr_h
+
+#include <string>
+#include <vector>
+
+#include <Type.h>
+
+namespace libdap
+{
+
+class BaseType;
+class DDS;
+class ConstraintEvaluator;
+
+// VALUE is used to return constant values from the scanner to the parser.
+// Constants are packaged in BaseType *s for evaluation by the parser.
+
+typedef struct
+{
+    Type type;   // Type is an enum defined in Type.h
+    union {
+        unsigned int ui;
+        int i;
+        double f;
+        std::string *s;
+    } v;
+} value;
+
+// Syntactic sugar for `pointer to function returning boolean' (bool_func)
+// and `pointer to function returning BaseType *' (btp_func). Both function
+// types take four arguments, an integer (argc), a vector of BaseType *s
+// (argv), the DDS for the dataset for which these function is being
+// evaluated (analogous to the ENVP in UNIX) and a pointer for the function's
+// return value. ARGC is the length of ARGV.
+
+typedef void (*bool_func)(int argc, BaseType *argv[], DDS &dds, bool *result);
+typedef void (*btp_func)(int argc, BaseType *argv[], DDS &dds, BaseType **btpp);
+
+// Projection function: A function that appears in the projection part of the
+// CE and is executed for its side-effect. Usually adds a new variable to
+// the DDS. These are run _during the parse_ so their side-effects can be used
+// by subsequent parts of the CE.
+
+typedef void (*proj_func)(int argc, BaseType *argv[], DDS &dds, ConstraintEvaluator &ce);
+
+// INT_LIST and INT_LIST_LIST are used by the parser to store the array
+// indexes.
+
+// To add the new feature of 'to the end' in an array projection (denoted using
+// start), I used the value -1 for an index. This makes do difference here. jhrg
+// 12/20/12
+
+typedef std::vector<int> int_list;
+typedef std::vector<int>::const_iterator int_citer ;
+typedef std::vector<int>::iterator int_iter ;
+typedef std::vector<int_list *> int_list_list;
+typedef std::vector<int_list *>::const_iterator int_list_citer ;
+typedef std::vector<int_list *>::iterator int_list_iter ;
+
+} // namespace libdap
+
+#endif /* _expr_h */
diff --git a/getdap.cc b/getdap.cc
new file mode 100644
index 0000000..ea640ce
--- /dev/null
+++ b/getdap.cc
@@ -0,0 +1,475 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1997-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// This is the source to `getdap'; a simple tool to exercise the Connect
+// class. It can be used to get naked URLs as well as the DAP2 DAS and DDS
+// objects.  jhrg.
+
+#include "config.h"
+
+#ifdef WIN32
+#include <io.h>
+#include <fcntl.h>
+#endif
+
+#include <cstring>
+#include <string>
+#include <sstream>
+
+#include "GetOpt.h"
+
+#include "Sequence.h"
+#include "Connect.h"
+#include "Response.h"
+#include "StdinResponse.h"
+
+using std::cerr;
+using std::endl;
+using std::flush;
+
+using namespace libdap ;
+
+const char *version = CVER " (" DVR " DAP/" DAP_PROTOCOL_VERSION ")";
+
+extern int libdap::dods_keep_temps;     // defined in HTTPResponse.h
+extern int libdap::www_trace;
+
+void usage(string name)
+{
+	cerr << "Usage: " << name << endl;
+	cerr << " [idaDxBzp vVkms][-c <expr>][-m <num>] <url> [<url> ...]" << endl;
+	cerr << " [M vVkms] <file> [<file> ...]" << endl;
+	cerr << endl;
+	cerr << "In the first form of the command, dereference the URL and" << endl;
+	cerr << "perform the requested operations. This includes routing" << endl;
+	cerr << "the returned information through the DAP processing" << endl;
+	cerr << "library (parsing the returned objects, et c.). If none" << endl;
+	cerr << "of a, d, or D are used with a URL, then the DAP library" << endl;
+	cerr << "routines are NOT used and the URLs contents are dumped" << endl;
+	cerr << "to standard output." << endl;
+	cerr << endl;
+	cerr << "In the second form of the command, assume the files are" << endl;
+	cerr << "DataDDS objects (stored in files or read from pipes)" << endl;
+	cerr << "and process them as if -D were given. In this case the" << endl;
+	cerr << "information *must* contain valid MIME header in order" << endl;
+	cerr << "to be processed." << endl;
+	cerr << endl;
+	cerr << "Options:" << endl;
+	cerr << "        i: For each URL, get the server version." << endl;
+	cerr << "        d: For each URL, get the the DDS." << endl;
+	cerr << "        a: For each URL, get the the DAS." << endl;
+	cerr << "        D: For each URL, get the the DataDDS." << endl;
+	cerr << "        x: For each URL, get the (DAP2) DDX object. Does not get data." << endl;
+	cerr << "        B: Build a DDX in getdap using the DDS and DAS." << endl;
+	cerr << "        v: Verbose output." << endl;
+	cerr << "        V: Version of this client; see 'i' for server version." << endl;
+	cerr << "        c: <expr> is a constraint expression. Used with -D/X and -d/r" << endl;
+	cerr << "           NB: You can use a `?' for the CE also." << endl;
+	cerr << "        k: Keep temporary files created by libdap." << endl;
+	cerr << "        m: Request the same URL <num> times." << endl;
+	cerr << "        z: Ask the server to compress data." << endl;
+	cerr << "        s: Print Sequences using numbered rows." << endl;
+	cerr << "        M: Assume data read from a file has no MIME headers" << endl;
+	cerr << "           (the default is to assume the headers are present)." << endl;
+	cerr << "        p: Set DAP protocol to x.y" << endl;
+}
+
+bool read_data(FILE * fp)
+{
+    if (!fp) {
+        fprintf(stderr, "getdap: Whoa!!! Null stream pointer.\n");
+        return false;
+    }
+    // Changed from a loop that used getc() to one that uses fread(). getc()
+    // worked fine for transfers of text information, but *not* for binary
+    // transfers. fread() will handle both.
+    char c;
+    while (fp && !feof(fp) && fread(&c, 1, 1, fp))
+        printf("%c", c);        // stick with stdio
+
+    return true;
+}
+
+static void print_data(DDS & dds, bool print_rows = false)
+{
+    cout << "The data:" << endl;
+
+    for (DDS::Vars_iter i = dds.var_begin(); i != dds.var_end(); i++) {
+        BaseType *v = *i;
+        if (print_rows && (*i)->type() == dods_sequence_c)
+            dynamic_cast < Sequence * >(*i)->print_val_by_rows(cout);
+        else
+            v->print_val(cout);
+    }
+
+    cout << endl << flush;
+}
+
+int main(int argc, char *argv[])
+{
+    GetOpt getopt(argc, argv, "idaDxrXBVvkc:m:zshM?Hp:t");
+    int option_char;
+
+    bool get_das = false;
+    bool get_dds = false;
+    bool get_data = false;
+    bool get_ddx = false;
+    bool build_ddx = false;
+    bool get_version = false;
+    bool cexpr = false;
+    bool verbose = false;
+    bool multi = false;
+    bool accept_deflate = false;
+    bool print_rows = false;
+    bool mime_headers = true;
+    int times = 1;
+    int dap_client_major = 2;
+    int dap_client_minor = 0;
+    string expr = "";
+
+#ifdef WIN32
+    _setmode(_fileno(stdout), _O_BINARY);
+#endif
+
+    while ((option_char = getopt()) != -1)
+        switch (option_char) {
+        case 'd':
+            get_dds = true;
+            break;
+        case 'a':
+            get_das = true;
+            break;
+        case 'D':
+            get_data = true;
+            break;
+        case 'x':
+            get_ddx = true;
+            break;
+        case 'V':
+            fprintf(stderr, "getdap version: %s\n", version);
+            exit(0);
+        case 'i':
+            get_version = true;
+            break;
+        case 'v':
+            verbose = true;
+            break;
+        case 'k':
+            dods_keep_temps = 1;
+            break;              // keep_temp is in Connect.cc
+        case 'c':
+            cexpr = true;
+            expr = getopt.optarg;
+            break;
+        case 'm':
+            multi = true;
+            times = atoi(getopt.optarg);
+            break;
+        case 'B':
+            build_ddx = true;
+            break;
+        case 'z':
+            accept_deflate = true;
+            break;
+        case 's':
+            print_rows = true;
+            break;
+        case 'M':
+            mime_headers = false;
+            break;
+        case 'p': {
+            istringstream iss(getopt.optarg);
+            char dot;
+            iss >> dap_client_major;
+            iss >> dot;
+            iss >> dap_client_minor;
+            break;
+        }
+        case 't':
+            www_trace = 1;
+            break;
+        case 'h':
+        case '?':
+        default:
+            usage(argv[0]);
+            exit(1);
+            break;
+        }
+
+    try {
+        // If after processing all the command line options there is nothing
+        // left (no URL or file) assume that we should read from stdin.
+        for (int i = getopt.optind; i < argc; ++i) {
+            if (verbose)
+                fprintf(stderr, "Fetching: %s\n", argv[i]);
+
+            string name = argv[i];
+            Connect *url = 0;
+
+            url = new Connect(name);
+
+            // This overrides the value set in the .dodsrc file.
+            if (accept_deflate)
+                url->set_accept_deflate(accept_deflate);
+
+            if (dap_client_major > 2)
+                url->set_xdap_protocol(dap_client_major, dap_client_minor);
+
+            if (url->is_local()) {
+                if (verbose) {
+                    fprintf(stderr, "Assuming that the argument %s is a file that contains a response object; decoding.\n", argv[i]);
+                }
+
+                Response *r = 0;
+
+                BaseTypeFactory factory;
+                DataDDS dds(&factory);
+
+                try {
+                    if (strcmp(argv[i], "-") == 0) {
+                        r = new StdinResponse(stdin);
+
+                        if (!r->get_stream())
+                            throw Error("Could not open standard input.");
+
+                        if (mime_headers)
+                            url->read_data(dds, r); // The default case
+                        else
+                            url->read_data_no_mime(dds, r);
+                    }
+                    else {
+                        r = new Response(fopen(argv[i], "r"), 0);
+
+                        if (!r->get_stream())
+                            throw Error(string("The input source: ")
+                                        + string(argv[i])
+                                        + string(" could not be opened"));
+
+                        url->read_data_no_mime(dds, r);
+                    }
+                }
+                catch (Error & e) {
+                    cerr << e.get_error_message() << endl;
+                    delete r;
+                    r = 0;
+                    delete url;
+                    url = 0;
+                    break;
+                }
+
+                if (verbose)
+                    fprintf(stderr, "DAP version: %s, Server version: %s\n",
+                            url->get_protocol().c_str(),
+                            url->get_version().c_str());
+
+                print_data(dds, print_rows);
+
+            }
+
+            else if (get_version) {
+                fprintf(stderr, "DAP version: %s, Server version: %s\n",
+                        url->request_protocol().c_str(),
+                        url->get_version().c_str());
+            }
+
+            else if (get_das) {
+                for (int j = 0; j < times; ++j) {
+                    DAS das;
+                    try {
+                        url->request_das(das);
+                    }
+                    catch (Error & e) {
+                        cerr << e.get_error_message() << endl;
+                        delete url;
+                        url = 0;
+                        continue;
+                    }
+
+                    if (verbose) {
+                        fprintf(stderr, "DAP version: %s, Server version: %s\n",
+                                url->get_protocol().c_str(),
+                                url->get_version().c_str());
+
+                        fprintf(stderr, "DAS:\n");
+                    }
+
+                    das.print(stdout);
+                }
+            }
+
+            else if (get_dds) {
+                for (int j = 0; j < times; ++j) {
+                    BaseTypeFactory factory;
+                    DDS dds(&factory);
+                    try {
+                        url->request_dds(dds, expr);
+                    }
+                    catch (Error & e) {
+                        cerr << e.get_error_message() << endl;
+                        delete url;
+                        url = 0;
+                        continue;       // Goto the next URL or exit the loop.
+                    }
+
+                    if (verbose) {
+                        fprintf(stderr, "DAP version: %s, Server version: %s\n",
+                                url->get_protocol().c_str(),
+                                url->get_version().c_str());
+
+                        fprintf(stderr, "DDS:\n");
+                    }
+
+                    dds.print(cout);
+                }
+            }
+
+            else if (get_ddx) {
+                for (int j = 0; j < times; ++j) {
+                    BaseTypeFactory factory;
+                    DDS dds(&factory);
+                    try {
+                        url->request_ddx(dds, expr);
+                    }
+                    catch (Error & e) {
+                        cerr << e.get_error_message() << endl;
+                        continue;       // Goto the next URL or exit the loop.
+                    }
+
+                    if (verbose) {
+                        fprintf(stderr, "DAP version: %s, Server version: %s\n",
+                                url->get_protocol().c_str(),
+                                url->get_version().c_str());
+
+                        fprintf(stderr, "DDX:\n");
+                    }
+
+                    dds.print_xml(cout, false);
+                }
+            }
+
+            else if (build_ddx) {
+                for (int j = 0; j < times; ++j) {
+                    BaseTypeFactory factory;
+                    DDS dds(&factory);
+                    try {
+                        url->request_dds(dds, expr);
+                        DAS das;
+                        url->request_das(das);
+                        dds.transfer_attributes(&das);
+                    }
+                    catch (Error & e) {
+                        cerr << e.get_error_message() << endl;
+                        continue;       // Goto the next URL or exit the loop.
+                    }
+
+                    if (verbose) {
+                        fprintf(stderr, "DAP version: %s, Server version: %s\n",
+                                url->get_protocol().c_str(),
+                                url->get_version().c_str());
+
+                        fprintf(stderr, "Client-built DDX:\n");
+                    }
+
+                    dds.print_xml(cout, false);
+                }
+            }
+
+            else if (get_data) {
+                for (int j = 0; j < times; ++j) {
+                    BaseTypeFactory factory;
+                    DataDDS dds(&factory);
+                    try {
+                        DBG(cerr << "URL: " << url->URL(false) << endl);
+                        DBG(cerr << "CE: " << expr << endl);
+                        url->request_data(dds, expr);
+
+                        if (verbose)
+                            fprintf(stderr, "DAP version: %s, Server version: %s\n",
+                                    url->get_protocol().c_str(),
+                                    url->get_version().c_str());
+
+                        print_data(dds, print_rows);
+                    }
+                    catch (Error & e) {
+                        cerr << e.get_error_message() << endl;
+                        delete url;
+                        url = 0;
+                        continue;
+                    }
+                }
+            }
+            else {
+                // if (!get_das && !get_dds && !get_data ...) This code uses
+                // HTTPConnect::fetch_url which cannot be accessed using an
+                // instance of Connect. So some of the options supported by
+                // other URLs won't work here (e.g., the verbose option
+                // doesn't show the server version number).
+                HTTPConnect http(RCReader::instance());
+
+                // This overrides the value set in the .dodsrc file.
+                if (accept_deflate)
+                    http.set_accept_deflate(accept_deflate);
+
+                if (dap_client_major > 2)
+                    url->set_xdap_protocol(dap_client_major, dap_client_minor);
+
+                string url_string = argv[i];
+                for (int j = 0; j < times; ++j) {
+                    try {
+                        Response *r = http.fetch_url(url_string);
+                        if (!read_data(r->get_stream())) {
+                            continue;
+                        }
+                        delete r;
+                        r = 0;
+                    }
+                    catch (Error & e) {
+                        cerr << e.get_error_message() << endl;
+                        continue;
+                    }
+                }
+            }
+
+            delete url;
+            url = 0;
+        }
+    }
+    catch (Error &e) {
+        cerr << e.get_error_message() << endl;
+        return 1;
+    }
+    catch (exception &e) {
+        cerr << "C++ library exception: " << e.what() << endl;
+        return 1;
+    }
+
+    return 0;
+}
diff --git a/getdap.man1 b/getdap.man1
new file mode 100644
index 0000000..875fc5c
--- /dev/null
+++ b/getdap.man1
@@ -0,0 +1,107 @@
+.\" getdap.man
+.\" 
+.\"  Created on: Dec 29, 2011
+.\"      Author: jimg
+.\" 
+.\" Process this file with
+.\" groff -man -Tascii getdap.1
+.\"
+.TH GETDAP 1 "December 2011" Linux "User Manuals"
+.SH NAME
+getdap \- test driver for the libdap library
+.SH SYNOPSIS
+.B getdap [-idaDxXBvVkzsM] [-c 
+.I expr
+.B ] [-m 
+.I num
+.B ] [-p 
+.I x.y
+.B ] 
+.I url
+.B ...
+
+.B getdap [-VvksM]
+.I file
+.B ...
+.SH DESCRIPTION
+.B getdap
+In the first form of the command, dereference the URL and
+perform the requested operations. This includes routing
+the returned information through the DAP processing
+library (parsing the returned objects, et c.). If none
+of a, d, or D are used with a URL, then the DAP library
+routines are NOT used and the URLs contents are dumped
+to standard output.
+
+In the second form of the command, assume the files are
+DataDDS objects (stored in files or read from pipes)
+and process them as if -D were given. In this case the
+information *must* contain valid MIME header in order
+to be processed.
+.SH OPTIONS
+.IP -i 
+For each URL, get the server version.
+.IP -d
+For each URL, get the the DDS.
+.IP -a
+For each URL, get the the DAS.
+.IP -D
+For each URL, get the the DataDDS.
+.IP -x
+For each URL, get the DDX object. Does not get data.
+.IP -X
+Request a DataDDX from the server (the DAP4 data response).
+.IP -B
+Build a DDX in getdap using the DDS and DAS.
+.IP -v
+Verbose output.
+.IP -V
+Version of this client; see 'i' for server version.
+.IP "-c expr" 
+.I expr
+is a constraint expression. Used with -D/X.
+You can use a `?' for the CE also.
+.IP -k
+Keep temporary files created by libdap.
+.IP "-m num"
+Request the same URL 
+.I num
+times
+.IP -z
+Ask the server to compress data.
+.IP -s
+Print Sequences using numbered rows.
+.IP -M
+Assume data read from a file has no MIME headers
+(the default is to assume the headers are present).
+.IP "-p x.y"
+Set DAP protocol to 
+.I x.y
+.
+.SH FILES
+.I ~/.dodsrc
+.RS
+The 
+.I .dodsrc
+file contains various parameters that affect the runtime behavior for DAP clients.
+See
+.BR dodsrc (5)
+for further details.
+.RE
+.SH ENVIRONMENT
+.IP DODS_CONF
+Specifies an alternate file or directory for the 
+.I .dodsrc
+file.
+.SH DIAGNOSTICS
+Various self-explanitory messages may be issued on stderr.
+
+.SH BUGS
+The command name should have been chosen more carefully
+to reflect its purpose.
+
+The dodsrc man page needs to be written.
+.SH AUTHOR
+James Gallagher <jgallagher at opendap.org>
+.SH "SEE ALSO"
+.BR dodsrc (5)
diff --git a/getdap4.cc b/getdap4.cc
new file mode 100644
index 0000000..6b9b4f8
--- /dev/null
+++ b/getdap4.cc
@@ -0,0 +1,431 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1997-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// This is the source to `getdap'; a simple tool to exercise the Connect
+// class. It can be used to get naked URLs as well as the DAP2 DAS and DDS
+// objects.  jhrg.
+
+#include "config.h"
+
+#ifdef WIN32
+#include <io.h>
+#include <fcntl.h>
+#endif
+
+#include <cstring>
+#include <string>
+#include <sstream>
+
+#include "GetOpt.h"
+
+#include "DMR.h"
+#include "XMLWriter.h"
+#include "D4BaseTypeFactory.h"
+#include "D4Group.h"
+#include "D4Sequence.h"
+#include "D4Connect.h"
+#include "StdinResponse.h"
+#include "HTTPConnect.h"
+#include "RCReader.h"
+
+using namespace std;
+using namespace libdap ;
+
+const char *version = CVER " (" DVR " DAP/" DAP_PROTOCOL_VERSION ")";
+#if 0
+extern int libdap::dods_keep_temps;     // defined in HTTPResponse.h
+extern int libdap::www_trace;
+#endif
+static void usage(const string &name)
+{
+	cerr << "Usage: " << name << endl;
+	cerr << " [dD vVikmzstM][-c <expr>][-m <num>] <url> [<url> ...] | <file> [<file> ...]" << endl;
+	cerr << endl;
+	cerr << "In the first form of the command, dereference the URL and" << endl;
+	cerr << "perform the requested operations. This includes routing" << endl;
+	cerr << "the returned information through the DAP processing" << endl;
+	cerr << "library (parsing the returned objects, et c.). If none" << endl;
+	cerr << "of a, d, or D are used with a URL, then the DAP library" << endl;
+	cerr << "routines are NOT used and the URLs contents are dumped" << endl;
+	cerr << "to standard output." << endl;
+	cerr << "Note: If the URL contains a query string the query string" << endl;
+	cerr << "will be preserved in the request. However, if the query " << endl;
+	cerr << "string contains DAP4 keys they may interfere with the" << endl;
+	cerr << "operation of " << name << ". A warning will be" << endl;
+	cerr << "written to stderr when "<< name << " identifies" << endl;
+	cerr << "the presence of a DAP4 query key in the submitted" << endl;
+	cerr << "URL's query string." << endl;
+	cerr << endl;
+	cerr << "In the second form of the command, assume the files are" << endl;
+	cerr << "DataDDS objects (stored in files or read from pipes)" << endl;
+	cerr << "and process them as if -D were given. In this case the" << endl;
+	cerr << "information *must* contain valid MIME header in order" << endl;
+	cerr << "to be processed." << endl;
+	cerr << endl;
+	cerr << "Options:" << endl;
+	cerr << "        d: For each URL, get the (DAP4) DMR object. Does not get data." << endl;
+	cerr << "        D: For each URL, get the DAP4 Data response." << endl;
+	cerr << endl;
+	cerr << "        v: Verbose output." << endl;
+	cerr << "        V: Version of this client; see 'i' for server version." << endl;
+	cerr << "        i: For each URL, get the server version." << endl;
+	cerr << "        k: Keep temporary files created by libdap." << endl;
+	cerr << "        m: Request the same URL <num> times." << endl;
+	cerr << "        z: Ask the server to compress data." << endl;
+	cerr << "        s: Print Sequences using numbered rows." << endl;
+	cerr << "        t: Trace www accesses." << endl;
+	cerr << "        M: Assume data read from a file has no MIME headers; use only with files" << endl;
+	cerr << endl;
+	cerr << "        c: <expr> is a constraint expression. Used with -d/D" << endl;
+	cerr << "           NB: You can use a `?' for the CE also." << endl;
+}
+
+// Used for raw http access/transfer
+bool read_data(FILE * fp)
+{
+    if (!fp) {
+        fprintf(stderr, "getdap4: Whoa!!! Null stream pointer.\n");
+        return false;
+    }
+    // Changed from a loop that used getc() to one that uses fread(). getc()
+    // worked fine for transfers of text information, but *not* for binary
+    // transfers. fread() will handle both.
+    char c;
+    while (fp && !feof(fp) && fread(&c, 1, 1, fp))
+        printf("%c", c);        // stick with stdio
+
+    return true;
+}
+
+static void read_response_from_file(D4Connect *url, DMR &dmr, Response &r, bool mime_headers, bool get_dap4_data, bool get_dmr)
+{
+    if (mime_headers) {
+    	if (get_dap4_data)
+    		url->read_data(dmr, r);
+    	else if (get_dmr)
+    		url->read_dmr(dmr, r);
+    	else
+    		throw Error("Only supports Data or DMR responses");
+    }
+    else {
+    	if (get_dap4_data)
+    		url->read_data_no_mime(dmr, r);
+    	else if (get_dmr)
+    		url->read_dmr_no_mime(dmr, r);
+    	else
+    		throw Error("Only supports Data or DMR responses");
+    }
+}
+
+static void print_group_data(D4Group *g, bool print_rows = false)
+{
+    for (Constructor::Vars_iter i = g->var_begin(), e = g->var_end(); i != e; i++) {
+        if (print_rows && (*i)->type() == dods_sequence_c)
+            dynamic_cast<D4Sequence &>(**i).print_val_by_rows(cout);
+        else
+            (*i)->print_val(cout);
+    }
+
+    for (D4Group::groupsIter gi = g->grp_begin(), ge = g->grp_end(); gi != ge; ++gi) {
+        print_group_data(*gi, print_rows);
+    }
+}
+
+static void print_data(DMR &dmr, bool print_rows = false)
+{
+    cout << "The data:" << endl;
+
+    D4Group *g = dmr.root();
+
+    print_group_data(g, print_rows);
+
+    cout << endl << flush;
+}
+
+int main(int argc, char *argv[])
+{
+    GetOpt getopt(argc, argv, "[dDvVikrm:Mzstc:]");
+    int option_char;
+
+    bool get_dmr = false;
+    bool get_dap4_data = false;
+    bool get_version = false;
+    bool cexpr = false;
+    bool verbose = false;
+    bool multi = false;
+    bool accept_deflate = false;
+    bool print_rows = false;
+    bool mime_headers = true;
+    bool report_errors = false;
+    int times = 1;
+    int dap_client_major = 4;
+    int dap_client_minor = 0;
+    string expr = "";
+
+#ifdef WIN32
+    _setmode(_fileno(stdout), _O_BINARY);
+#endif
+
+    while ((option_char = getopt()) != -1)
+        switch (option_char) {
+        case 'd':
+            get_dmr = true;
+            break;
+        case 'D':
+            get_dap4_data = true;
+            break;
+        case 'v':
+            verbose = true;
+            break;
+        case 'V':
+        	cerr << "getdap4 version: " << version << endl;
+            exit(0);
+        case 'i':
+            get_version = true;
+            break;
+#if 0
+        case 'k':
+            dods_keep_temps = 1;
+            break;              // keep_temp is in Connect.cc
+#endif
+        case 'r':
+        	report_errors = true;
+        	break;
+        case 'm':
+            multi = true;
+            times = atoi(getopt.optarg);
+            break;
+        case 'z':
+            accept_deflate = true;
+            break;
+        case 's':
+            print_rows = true;
+            break;
+        case 'M':
+            mime_headers = false;
+            break;
+#if 0
+        case 't':
+            www_trace = 1;
+            break;
+#endif
+        case 'c':
+            cexpr = true;
+            expr = getopt.optarg;
+            break;
+        case 'h':
+        case '?':
+        default:
+            usage(argv[0]);
+            exit(1);
+            break;
+        }
+
+    try {
+        // If after processing all the command line options there is nothing
+        // left (no URL or file) assume that we should read from stdin.
+        for (int i = getopt.optind; i < argc; ++i) {
+            if (verbose)
+                cerr << "Fetching: " << argv[i] << endl;
+
+            string name = argv[i];
+            D4Connect *url = 0;
+            // auto_ptr? jhrg 10/19/15
+            url = new D4Connect(name);
+
+            // This overrides the value set in the .dodsrc file.
+            if (accept_deflate)
+                url->set_accept_deflate(accept_deflate);
+
+            if (dap_client_major > 2)
+                url->set_xdap_protocol(dap_client_major, dap_client_minor);
+
+            if (url->is_local()) {
+                if (verbose)
+                    cerr << "Assuming " << argv[i] << " is a file that contains a response object; decoding." << endl;
+
+                try {
+                    D4BaseTypeFactory factory;
+                    DMR dmr(&factory);
+
+                    if (strcmp(argv[i], "-") == 0) {
+                        StdinResponse r(cin);
+
+                        if (!r.get_cpp_stream())
+                            throw Error("Could not open standard input.");
+
+                        read_response_from_file(url, dmr, r, mime_headers, get_dap4_data, get_dmr);
+                    }
+                    else {
+                    	fstream f(argv[i], std::ios_base::in);
+                    	if (!f.is_open() || f.bad() || f.eof())
+                    		throw Error((string)"Could not open: " + argv[i]);
+
+                    	Response r(&f, 0);
+
+                        read_response_from_file(url, dmr, r, mime_headers, get_dap4_data, get_dmr);
+                    }
+
+                    if (verbose)
+                        cerr << "DAP version: " << url->get_protocol().c_str() << " Server version: "
+    						<< url->get_version().c_str() << endl;
+
+                    // Always write the DMR
+                    XMLWriter xml;
+                    dmr.print_dap4(xml);
+                    cout << xml.get_doc() << endl;
+
+                    if (get_dap4_data)
+                    	print_data(dmr, print_rows);
+                }
+                catch (Error & e) {
+                    cerr << "Error: " << e.get_error_message() << endl;
+                    delete url; url = 0;
+                    if (report_errors)
+                        return EXIT_FAILURE;
+                }
+            }
+            else if (get_dmr) {
+                for (int j = 0; j < times; ++j) {
+                    D4BaseTypeFactory factory;
+                    DMR dmr(&factory);
+                    try {
+                        url->request_dmr(dmr, expr);
+
+                        if (verbose) {
+                            cout << "DAP version: " << url->get_protocol() << ", Server version: " << url->get_version() << endl;
+                            cout << "DMR:" << endl;
+                        }
+
+                        XMLWriter xml;
+                        dmr.print_dap4(xml);
+                        cout << xml.get_doc() << endl;
+                    }
+                    catch (Error & e) {
+                        cerr << e.get_error_message() << endl;
+                        if (report_errors)
+                        	return EXIT_FAILURE;
+                        continue;       // Goto the next URL or exit the loop.
+                    }
+                }
+            }
+            else if (get_dap4_data) {
+                 for (int j = 0; j < times; ++j) {
+                     D4BaseTypeFactory factory;
+                     DMR dmr(&factory);
+                     try {
+                         url->request_dap4_data(dmr, expr);
+
+                         if (verbose) {
+                             cout << "DAP version: " << url->get_protocol() << ", Server version: " << url->get_version() << endl;
+                             cout << "DMR:" << endl;
+                         }
+
+                         XMLWriter xml;
+                         dmr.print_dap4(xml);
+                         cout << xml.get_doc() << endl;
+
+                         print_data(dmr, print_rows);
+                    }
+                     catch (Error & e) {
+                         cerr << e.get_error_message() << endl;
+                         if (report_errors)
+                             return EXIT_FAILURE;
+                         continue;       // Goto the next URL or exit the loop.
+                     }
+                 }
+            }
+            else {
+                HTTPConnect http(RCReader::instance());
+
+                // This overrides the value set in the .dodsrc file.
+                if (accept_deflate)
+                    http.set_accept_deflate(accept_deflate);
+
+                if (dap_client_major > 2)
+                    url->set_xdap_protocol(dap_client_major, dap_client_minor);
+
+                string url_string = argv[i];
+                for (int j = 0; j < times; ++j) {
+                    try {
+                        HTTPResponse *r = http.fetch_url(url_string);
+                        if (verbose) {
+                        	vector<string> *headers = r->get_headers();
+                        	copy(headers->begin(), headers->end(), ostream_iterator<string>(cout, "\n"));
+                        }
+                        if (!read_data(r->get_stream())) {
+                            continue;
+                        }
+                        delete r;
+                        r = 0;
+                    }
+                    catch (Error & e) {
+                        cerr << e.get_error_message() << endl;
+                        if (report_errors)
+                            return EXIT_FAILURE;
+                        continue;
+                    }
+                }
+            }
+
+#if 0
+            else if (get_version) {
+                fprintf(stderr, "DAP version: %s, Server version: %s\n",
+                        url->request_protocol().c_str(),
+                        url->get_version().c_str());
+            }
+#endif
+
+            delete url;  url = 0;
+        }
+    }
+    catch (Error &e) {
+
+    	if(e.get_error_code() == malformed_expr || e.get_error_code() == malformed_expr){
+        	cerr << e.get_error_message() << endl;
+        	usage(argv[0]);
+    	}
+    	else {
+        	cerr << e.get_error_message() << endl;
+
+    	}
+
+        cerr << "Exiting." << endl;
+        return 1;
+    }
+    catch (exception &e) {
+        cerr << "C++ library exception: " << e.what() << endl;
+        cerr << "Exiting." << endl;
+        return 1;
+    }
+
+    return 0;
+}
diff --git a/getdap4.man1 b/getdap4.man1
new file mode 100644
index 0000000..343c4d7
--- /dev/null
+++ b/getdap4.man1
@@ -0,0 +1,99 @@
+.\" getdap.man
+.\" 
+.\"  Created on: Oct 28, 2013
+.\"      Author: jimg
+.\" 
+.\" Process this file with
+.\" groff -man -Tascii getdap4.1
+.\"
+.TH GETDAP4 1 "October 2013" Linux "User Manuals"
+.SH NAME
+getdap4 \- test driver for the libdap library DAP4 protocol
+.SH SYNOPSIS
+.B getdap4 [dD vVikmzst] [-c 
+.I expr
+.B ] [-m 
+.I num
+.B ]
+.I url
+.B ...
+
+.B getdap4 [-VvksM]
+.I file
+.B ...
+.SH DESCRIPTION
+.B getdap4
+A command line interface for DAP4, the follow-on to DAP2.
+While getdap can be used to access DAP2 response objects 
+and process those responses with the libdap client-side
+software, getdap4 fills the same role for DAP4.
+
+In the first form of the command, dereference the URL and
+perform the requested operations. This includes routing
+the returned information through the DAP processing
+library (parsing the returned objects, et c.). If neither
+of d or D are used with a URL, then the DAP library
+routines are NOT used and the URLs contents are dumped
+to standard output.
+
+In the second form of the command, assume the files are
+DAP4 Data objects (stored in files or read from pipes)
+and process them as if -D were given. In this case the
+information must contain valid MIME header in order
+to be processed or -M should be used.
+.SH OPTIONS
+.IP -i 
+For each URL, get the server version.
+.IP -d
+For each URL, get the the DAP4 DMR response.
+.IP -D
+For each URL, get the the DAP4 Data response.
+.IP -v
+Verbose output.
+.IP -V
+Version of this client; see 'i' for server version.
+.IP "-c expr" 
+.I expr
+is a constraint expression. Used with -D/X.
+You can use a `?' for the CE also.
+.IP -k
+Keep temporary files created by libdap.
+.IP "-m num"
+Request the same URL 
+.I num
+times
+.IP -z
+Ask the server to compress data.
+.IP -s
+Print Sequences using numbered rows.
+.IP -M
+Assume data read from a file has no MIME headers
+(the default is to assume the headers are present).
+.
+.SH FILES
+.I ~/.dodsrc
+.RS
+The 
+.I .dodsrc
+file contains various parameters that affect the runtime behavior for DAP clients.
+See
+.BR dodsrc (5)
+for further details.
+.RE
+.SH ENVIRONMENT
+.IP DODS_CONF
+Specifies an alternate file or directory for the 
+.I .dodsrc
+file.
+.SH DIAGNOSTICS
+Various self-explanatory messages may be issued on stderr.
+
+.SH BUGS
+The command name should have been chosen more carefully
+to reflect its purpose.
+
+The dodsrc man page needs to be written.
+.SH AUTHOR
+James Gallagher <jgallagher at opendap.org>
+.SH "SEE ALSO"
+.BR dodsrc (5)
diff --git a/gl/Makefile.am b/gl/Makefile.am
new file mode 100644
index 0000000..80230ce
--- /dev/null
+++ b/gl/Makefile.am
@@ -0,0 +1,1354 @@
+## DO NOT EDIT! GENERATED AUTOMATICALLY!
+## Process this file with automake to produce Makefile.in.
+# Copyright (C) 2002-2017 Free Software Foundation, Inc.
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this file.  If not, see <http://www.gnu.org/licenses/>.
+#
+# As a special exception to the GNU General Public License,
+# this file may be distributed as part of a program that
+# contains a configuration script generated by Autoconf, under
+# the same distribution terms as the rest of that program.
+#
+# Generated by gnulib-tool.
+# Reproduce by: gnulib-tool --import --lib=libgnu --source-base=gl --m4-base=gl/m4 --doc-base=gl/doc --tests-base=tests --aux-dir=conf --lgpl --no-conditional-dependencies --libtool --macro-prefix=gl byteswap mkstemps regex
+
+AUTOMAKE_OPTIONS = 1.9.6 gnits subdir-objects
+
+SUBDIRS =
+noinst_HEADERS =
+noinst_LIBRARIES =
+noinst_LTLIBRARIES =
+EXTRA_DIST =
+BUILT_SOURCES =
+SUFFIXES =
+MOSTLYCLEANFILES = core *.stackdump
+MOSTLYCLEANDIRS =
+CLEANFILES =
+DISTCLEANFILES =
+MAINTAINERCLEANFILES =
+# No GNU Make output.
+EXTRA_DIST += m4/gnulib-cache.m4
+
+AM_CPPFLAGS =
+AM_CFLAGS =
+
+noinst_LTLIBRARIES += libgnu.la
+
+libgnu_la_SOURCES =
+libgnu_la_LIBADD = $(gl_LTLIBOBJS)
+libgnu_la_DEPENDENCIES = $(gl_LTLIBOBJS)
+EXTRA_libgnu_la_SOURCES =
+libgnu_la_LDFLAGS = $(AM_LDFLAGS)
+libgnu_la_LDFLAGS += -no-undefined
+libgnu_la_LDFLAGS += $(LTLIBINTL)
+libgnu_la_LDFLAGS += $(LTLIBTHREAD)
+
+## begin gnulib module absolute-header
+
+# Use this preprocessor expression to decide whether #include_next works.
+# Do not rely on a 'configure'-time test for this, since the expression
+# might appear in an installed header, which is used by some other compiler.
+HAVE_INCLUDE_NEXT = (__GNUC__ || 60000000 <= __DECC_VER)
+
+## end   gnulib module absolute-header
+
+## begin gnulib module alloca-opt
+
+BUILT_SOURCES += $(ALLOCA_H)
+
+# We need the following in order to create <alloca.h> when the system
+# doesn't have one that works with the given compiler.
+if GL_GENERATE_ALLOCA_H
+alloca.h: alloca.in.h $(top_builddir)/config.status
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  cat $(srcdir)/alloca.in.h; \
+	} > $@-t && \
+	mv -f $@-t $@
+else
+alloca.h: $(top_builddir)/config.status
+	rm -f $@
+endif
+MOSTLYCLEANFILES += alloca.h alloca.h-t
+
+EXTRA_DIST += alloca.in.h
+
+## end   gnulib module alloca-opt
+
+## begin gnulib module btowc
+
+
+EXTRA_DIST += btowc.c
+
+EXTRA_libgnu_la_SOURCES += btowc.c
+
+## end   gnulib module btowc
+
+## begin gnulib module byteswap
+
+BUILT_SOURCES += $(BYTESWAP_H)
+
+# We need the following in order to create <byteswap.h> when the system
+# doesn't have one.
+if GL_GENERATE_BYTESWAP_H
+byteswap.h: byteswap.in.h $(top_builddir)/config.status
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  cat $(srcdir)/byteswap.in.h; \
+	} > $@-t && \
+	mv -f $@-t $@
+else
+byteswap.h: $(top_builddir)/config.status
+	rm -f $@
+endif
+MOSTLYCLEANFILES += byteswap.h byteswap.h-t
+
+EXTRA_DIST += byteswap.in.h
+
+## end   gnulib module byteswap
+
+## begin gnulib module configmake
+
+# Listed in the same order as the GNU makefile conventions, and
+# provided by autoconf 2.59c+ or 2.70.
+# The Automake-defined pkg* macros are appended, in the order
+# listed in the Automake 1.10a+ documentation.
+configmake.h: Makefile
+	$(AM_V_GEN)rm -f $@-t && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  echo '#define PREFIX "$(prefix)"'; \
+	  echo '#define EXEC_PREFIX "$(exec_prefix)"'; \
+	  echo '#define BINDIR "$(bindir)"'; \
+	  echo '#define SBINDIR "$(sbindir)"'; \
+	  echo '#define LIBEXECDIR "$(libexecdir)"'; \
+	  echo '#define DATAROOTDIR "$(datarootdir)"'; \
+	  echo '#define DATADIR "$(datadir)"'; \
+	  echo '#define SYSCONFDIR "$(sysconfdir)"'; \
+	  echo '#define SHAREDSTATEDIR "$(sharedstatedir)"'; \
+	  echo '#define LOCALSTATEDIR "$(localstatedir)"'; \
+	  echo '#define RUNSTATEDIR "$(runstatedir)"'; \
+	  echo '#define INCLUDEDIR "$(includedir)"'; \
+	  echo '#define OLDINCLUDEDIR "$(oldincludedir)"'; \
+	  echo '#define DOCDIR "$(docdir)"'; \
+	  echo '#define INFODIR "$(infodir)"'; \
+	  echo '#define HTMLDIR "$(htmldir)"'; \
+	  echo '#define DVIDIR "$(dvidir)"'; \
+	  echo '#define PDFDIR "$(pdfdir)"'; \
+	  echo '#define PSDIR "$(psdir)"'; \
+	  echo '#define LIBDIR "$(libdir)"'; \
+	  echo '#define LISPDIR "$(lispdir)"'; \
+	  echo '#define LOCALEDIR "$(localedir)"'; \
+	  echo '#define MANDIR "$(mandir)"'; \
+	  echo '#define MANEXT "$(manext)"'; \
+	  echo '#define PKGDATADIR "$(pkgdatadir)"'; \
+	  echo '#define PKGINCLUDEDIR "$(pkgincludedir)"'; \
+	  echo '#define PKGLIBDIR "$(pkglibdir)"'; \
+	  echo '#define PKGLIBEXECDIR "$(pkglibexecdir)"'; \
+	} | sed '/""/d' > $@-t && \
+	mv -f $@-t $@
+
+BUILT_SOURCES += configmake.h
+CLEANFILES += configmake.h configmake.h-t
+
+## end   gnulib module configmake
+
+## begin gnulib module dosname
+
+
+EXTRA_DIST += dosname.h
+
+## end   gnulib module dosname
+
+## begin gnulib module fcntl-h
+
+BUILT_SOURCES += fcntl.h
+
+# We need the following in order to create <fcntl.h> when the system
+# doesn't have one that works with the given compiler.
+fcntl.h: fcntl.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
+	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+	      -e 's|@''NEXT_FCNTL_H''@|$(NEXT_FCNTL_H)|g' \
+	      -e 's/@''GNULIB_FCNTL''@/$(GNULIB_FCNTL)/g' \
+	      -e 's/@''GNULIB_NONBLOCKING''@/$(GNULIB_NONBLOCKING)/g' \
+	      -e 's/@''GNULIB_OPEN''@/$(GNULIB_OPEN)/g' \
+	      -e 's/@''GNULIB_OPENAT''@/$(GNULIB_OPENAT)/g' \
+	      -e 's|@''HAVE_FCNTL''@|$(HAVE_FCNTL)|g' \
+	      -e 's|@''HAVE_OPENAT''@|$(HAVE_OPENAT)|g' \
+	      -e 's|@''REPLACE_FCNTL''@|$(REPLACE_FCNTL)|g' \
+	      -e 's|@''REPLACE_OPEN''@|$(REPLACE_OPEN)|g' \
+	      -e 's|@''REPLACE_OPENAT''@|$(REPLACE_OPENAT)|g' \
+	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+	      < $(srcdir)/fcntl.in.h; \
+	} > $@-t && \
+	mv $@-t $@
+MOSTLYCLEANFILES += fcntl.h fcntl.h-t
+
+EXTRA_DIST += fcntl.in.h
+
+## end   gnulib module fcntl-h
+
+## begin gnulib module filename
+
+
+EXTRA_DIST += filename.h
+
+## end   gnulib module filename
+
+## begin gnulib module gettext-h
+
+libgnu_la_SOURCES += gettext.h
+
+## end   gnulib module gettext-h
+
+## begin gnulib module gettimeofday
+
+
+EXTRA_DIST += gettimeofday.c
+
+EXTRA_libgnu_la_SOURCES += gettimeofday.c
+
+## end   gnulib module gettimeofday
+
+## begin gnulib module hard-locale
+
+libgnu_la_SOURCES += hard-locale.c
+
+EXTRA_DIST += hard-locale.h
+
+## end   gnulib module hard-locale
+
+## begin gnulib module havelib
+
+
+EXTRA_DIST += $(top_srcdir)/conf/config.rpath
+
+## end   gnulib module havelib
+
+## begin gnulib module intprops
+
+
+EXTRA_DIST += intprops.h
+
+## end   gnulib module intprops
+
+## begin gnulib module langinfo
+
+BUILT_SOURCES += langinfo.h
+
+# We need the following in order to create an empty placeholder for
+# <langinfo.h> when the system doesn't have one.
+langinfo.h: langinfo.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
+	      -e 's|@''HAVE_LANGINFO_H''@|$(HAVE_LANGINFO_H)|g' \
+	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+	      -e 's|@''NEXT_LANGINFO_H''@|$(NEXT_LANGINFO_H)|g' \
+	      -e 's/@''GNULIB_NL_LANGINFO''@/$(GNULIB_NL_LANGINFO)/g' \
+	      -e 's|@''HAVE_LANGINFO_CODESET''@|$(HAVE_LANGINFO_CODESET)|g' \
+	      -e 's|@''HAVE_LANGINFO_T_FMT_AMPM''@|$(HAVE_LANGINFO_T_FMT_AMPM)|g' \
+	      -e 's|@''HAVE_LANGINFO_ERA''@|$(HAVE_LANGINFO_ERA)|g' \
+	      -e 's|@''HAVE_LANGINFO_YESEXPR''@|$(HAVE_LANGINFO_YESEXPR)|g' \
+	      -e 's|@''HAVE_NL_LANGINFO''@|$(HAVE_NL_LANGINFO)|g' \
+	      -e 's|@''REPLACE_NL_LANGINFO''@|$(REPLACE_NL_LANGINFO)|g' \
+	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+	      < $(srcdir)/langinfo.in.h; \
+	} > $@-t && \
+	mv $@-t $@
+MOSTLYCLEANFILES += langinfo.h langinfo.h-t
+
+EXTRA_DIST += langinfo.in.h
+
+## end   gnulib module langinfo
+
+## begin gnulib module limits-h
+
+BUILT_SOURCES += $(LIMITS_H)
+
+# We need the following in order to create <limits.h> when the system
+# doesn't have one that is compatible with GNU.
+if GL_GENERATE_LIMITS_H
+limits.h: limits.in.h $(top_builddir)/config.status
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
+	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
+	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+	      -e 's|@''NEXT_LIMITS_H''@|$(NEXT_LIMITS_H)|g' \
+	      < $(srcdir)/limits.in.h; \
+	} > $@-t && \
+	mv $@-t $@
+else
+limits.h: $(top_builddir)/config.status
+	rm -f $@
+endif
+MOSTLYCLEANFILES += limits.h limits.h-t
+
+EXTRA_DIST += limits.in.h
+
+## end   gnulib module limits-h
+
+## begin gnulib module localcharset
+
+libgnu_la_SOURCES += localcharset.h localcharset.c
+
+# We need the following in order to install a simple file in $(libdir)
+# which is shared with other installed packages. We use a list of referencing
+# packages so that "make uninstall" will remove the file if and only if it
+# is not used by another installed package.
+# On systems with glibc-2.1 or newer, the file is redundant, therefore we
+# avoid installing it.
+
+all-local: charset.alias ref-add.sed ref-del.sed
+
+charset_alias = $(DESTDIR)$(libdir)/charset.alias
+charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
+install-exec-local: install-exec-localcharset
+install-exec-localcharset: all-local
+	if test $(GLIBC21) = no; then \
+	  case '$(host_os)' in \
+	    darwin[56]*) \
+	      need_charset_alias=true ;; \
+	    darwin* | cygwin* | mingw* | pw32* | cegcc*) \
+	      need_charset_alias=false ;; \
+	    *) \
+	      need_charset_alias=true ;; \
+	  esac ; \
+	else \
+	  need_charset_alias=false ; \
+	fi ; \
+	if $$need_charset_alias; then \
+	  $(mkinstalldirs) $(DESTDIR)$(libdir) ; \
+	fi ; \
+	if test -f $(charset_alias); then \
+	  sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \
+	  $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
+	  rm -f $(charset_tmp) ; \
+	else \
+	  if $$need_charset_alias; then \
+	    sed -f ref-add.sed charset.alias > $(charset_tmp) ; \
+	    $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
+	    rm -f $(charset_tmp) ; \
+	  fi ; \
+	fi
+
+uninstall-local: uninstall-localcharset
+uninstall-localcharset: all-local
+	if test -f $(charset_alias); then \
+	  sed -f ref-del.sed $(charset_alias) > $(charset_tmp); \
+	  if grep '^# Packages using this file: $$' $(charset_tmp) \
+	      > /dev/null; then \
+	    rm -f $(charset_alias); \
+	  else \
+	    $(INSTALL_DATA) $(charset_tmp) $(charset_alias); \
+	  fi; \
+	  rm -f $(charset_tmp); \
+	fi
+
+charset.alias: config.charset
+	$(AM_V_GEN)rm -f t-$@ $@ && \
+	$(SHELL) $(srcdir)/config.charset '$(host)' > t-$@ && \
+	mv t-$@ $@
+
+SUFFIXES += .sed .sin
+.sin.sed:
+	$(AM_V_GEN)rm -f t-$@ $@ && \
+	sed -e '/^#/d' -e 's/@''PACKAGE''@/$(PACKAGE)/g' $< > t-$@ && \
+	mv t-$@ $@
+
+CLEANFILES += charset.alias ref-add.sed ref-del.sed
+
+EXTRA_DIST += config.charset ref-add.sin ref-del.sin
+
+## end   gnulib module localcharset
+
+## begin gnulib module locale
+
+BUILT_SOURCES += locale.h
+
+# We need the following in order to create <locale.h> when the system
+# doesn't have one that provides all definitions.
+locale.h: locale.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
+	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
+	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+	      -e 's|@''NEXT_LOCALE_H''@|$(NEXT_LOCALE_H)|g' \
+	      -e 's/@''GNULIB_LOCALECONV''@/$(GNULIB_LOCALECONV)/g' \
+	      -e 's/@''GNULIB_SETLOCALE''@/$(GNULIB_SETLOCALE)/g' \
+	      -e 's/@''GNULIB_DUPLOCALE''@/$(GNULIB_DUPLOCALE)/g' \
+	      -e 's|@''HAVE_DUPLOCALE''@|$(HAVE_DUPLOCALE)|g' \
+	      -e 's|@''HAVE_XLOCALE_H''@|$(HAVE_XLOCALE_H)|g' \
+	      -e 's|@''REPLACE_LOCALECONV''@|$(REPLACE_LOCALECONV)|g' \
+	      -e 's|@''REPLACE_SETLOCALE''@|$(REPLACE_SETLOCALE)|g' \
+	      -e 's|@''REPLACE_DUPLOCALE''@|$(REPLACE_DUPLOCALE)|g' \
+	      -e 's|@''REPLACE_STRUCT_LCONV''@|$(REPLACE_STRUCT_LCONV)|g' \
+	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+	      < $(srcdir)/locale.in.h; \
+	} > $@-t && \
+	mv $@-t $@
+MOSTLYCLEANFILES += locale.h locale.h-t
+
+EXTRA_DIST += locale.in.h
+
+## end   gnulib module locale
+
+## begin gnulib module localeconv
+
+
+EXTRA_DIST += localeconv.c
+
+EXTRA_libgnu_la_SOURCES += localeconv.c
+
+## end   gnulib module localeconv
+
+## begin gnulib module localtime-buffer
+
+
+EXTRA_DIST += localtime-buffer.c localtime-buffer.h
+
+EXTRA_libgnu_la_SOURCES += localtime-buffer.c
+
+## end   gnulib module localtime-buffer
+
+## begin gnulib module lock
+
+libgnu_la_SOURCES += glthread/lock.h glthread/lock.c
+
+## end   gnulib module lock
+
+## begin gnulib module lstat
+
+
+EXTRA_DIST += lstat.c
+
+EXTRA_libgnu_la_SOURCES += lstat.c
+
+## end   gnulib module lstat
+
+## begin gnulib module malloca
+
+libgnu_la_SOURCES += malloca.c
+
+EXTRA_DIST += malloca.h malloca.valgrind
+
+## end   gnulib module malloca
+
+## begin gnulib module mbrtowc
+
+
+EXTRA_DIST += mbrtowc.c
+
+EXTRA_libgnu_la_SOURCES += mbrtowc.c
+
+## end   gnulib module mbrtowc
+
+## begin gnulib module mbsinit
+
+
+EXTRA_DIST += mbsinit.c
+
+EXTRA_libgnu_la_SOURCES += mbsinit.c
+
+## end   gnulib module mbsinit
+
+## begin gnulib module mbtowc
+
+
+EXTRA_DIST += mbtowc-impl.h mbtowc.c
+
+EXTRA_libgnu_la_SOURCES += mbtowc.c
+
+## end   gnulib module mbtowc
+
+## begin gnulib module mkstemps
+
+
+EXTRA_DIST += mkstemps.c
+
+EXTRA_libgnu_la_SOURCES += mkstemps.c
+
+## end   gnulib module mkstemps
+
+## begin gnulib module nl_langinfo
+
+
+EXTRA_DIST += nl_langinfo.c
+
+EXTRA_libgnu_la_SOURCES += nl_langinfo.c
+
+## end   gnulib module nl_langinfo
+
+## begin gnulib module pathmax
+
+
+EXTRA_DIST += pathmax.h
+
+## end   gnulib module pathmax
+
+## begin gnulib module regex
+
+
+EXTRA_DIST += regcomp.c regex.c regex.h regex_internal.c regex_internal.h regexec.c
+
+EXTRA_libgnu_la_SOURCES += regcomp.c regex.c regex_internal.c regexec.c
+
+## end   gnulib module regex
+
+## begin gnulib module snippet/_Noreturn
+
+# Because this Makefile snippet defines a variable used by other
+# gnulib Makefile snippets, it must be present in all makefiles that
+# need it. This is ensured by the applicability 'all' defined above.
+
+_NORETURN_H=$(srcdir)/_Noreturn.h
+
+EXTRA_DIST += _Noreturn.h
+
+## end   gnulib module snippet/_Noreturn
+
+## begin gnulib module snippet/arg-nonnull
+
+# Because this Makefile snippet defines a variable used by other
+# gnulib Makefile snippets, it must be present in all makefiles that
+# need it. This is ensured by the applicability 'all' defined above.
+
+ARG_NONNULL_H=$(srcdir)/arg-nonnull.h
+
+EXTRA_DIST += arg-nonnull.h
+
+## end   gnulib module snippet/arg-nonnull
+
+## begin gnulib module snippet/c++defs
+
+# Because this Makefile snippet defines a variable used by other
+# gnulib Makefile snippets, it must be present in all makefiles that
+# need it. This is ensured by the applicability 'all' defined above.
+
+CXXDEFS_H=$(srcdir)/c++defs.h
+
+EXTRA_DIST += c++defs.h
+
+## end   gnulib module snippet/c++defs
+
+## begin gnulib module snippet/warn-on-use
+
+# Because this Makefile snippet defines a variable used by other
+# gnulib Makefile snippets, it must be present in all makefiles that
+# need it. This is ensured by the applicability 'all' defined above.
+
+WARN_ON_USE_H=$(srcdir)/warn-on-use.h
+
+EXTRA_DIST += warn-on-use.h
+
+## end   gnulib module snippet/warn-on-use
+
+## begin gnulib module stat
+
+
+EXTRA_DIST += stat-w32.c stat-w32.h stat.c
+
+EXTRA_libgnu_la_SOURCES += stat-w32.c stat.c
+
+## end   gnulib module stat
+
+## begin gnulib module stdbool
+
+BUILT_SOURCES += $(STDBOOL_H)
+
+# We need the following in order to create <stdbool.h> when the system
+# doesn't have one that works.
+if GL_GENERATE_STDBOOL_H
+stdbool.h: stdbool.in.h $(top_builddir)/config.status
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' < $(srcdir)/stdbool.in.h; \
+	} > $@-t && \
+	mv $@-t $@
+else
+stdbool.h: $(top_builddir)/config.status
+	rm -f $@
+endif
+MOSTLYCLEANFILES += stdbool.h stdbool.h-t
+
+EXTRA_DIST += stdbool.in.h
+
+## end   gnulib module stdbool
+
+## begin gnulib module stddef
+
+BUILT_SOURCES += $(STDDEF_H)
+
+# We need the following in order to create <stddef.h> when the system
+# doesn't have one that works with the given compiler.
+if GL_GENERATE_STDDEF_H
+stddef.h: stddef.in.h $(top_builddir)/config.status
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
+	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
+	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+	      -e 's|@''NEXT_STDDEF_H''@|$(NEXT_STDDEF_H)|g' \
+	      -e 's|@''HAVE_MAX_ALIGN_T''@|$(HAVE_MAX_ALIGN_T)|g' \
+	      -e 's|@''HAVE_WCHAR_T''@|$(HAVE_WCHAR_T)|g' \
+	      -e 's|@''REPLACE_NULL''@|$(REPLACE_NULL)|g' \
+	      < $(srcdir)/stddef.in.h; \
+	} > $@-t && \
+	mv $@-t $@
+else
+stddef.h: $(top_builddir)/config.status
+	rm -f $@
+endif
+MOSTLYCLEANFILES += stddef.h stddef.h-t
+
+EXTRA_DIST += stddef.in.h
+
+## end   gnulib module stddef
+
+## begin gnulib module stdint
+
+BUILT_SOURCES += $(STDINT_H)
+
+# We need the following in order to create <stdint.h> when the system
+# doesn't have one that works with the given compiler.
+if GL_GENERATE_STDINT_H
+stdint.h: stdint.in.h $(top_builddir)/config.status
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
+	      -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \
+	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+	      -e 's|@''NEXT_STDINT_H''@|$(NEXT_STDINT_H)|g' \
+	      -e 's/@''HAVE_C99_STDINT_H''@/$(HAVE_C99_STDINT_H)/g' \
+	      -e 's/@''HAVE_SYS_TYPES_H''@/$(HAVE_SYS_TYPES_H)/g' \
+	      -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \
+	      -e 's/@''HAVE_SYS_INTTYPES_H''@/$(HAVE_SYS_INTTYPES_H)/g' \
+	      -e 's/@''HAVE_SYS_BITYPES_H''@/$(HAVE_SYS_BITYPES_H)/g' \
+	      -e 's/@''HAVE_WCHAR_H''@/$(HAVE_WCHAR_H)/g' \
+	      -e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \
+	      -e 's/@''HAVE_UNSIGNED_LONG_LONG_INT''@/$(HAVE_UNSIGNED_LONG_LONG_INT)/g' \
+	      -e 's/@''APPLE_UNIVERSAL_BUILD''@/$(APPLE_UNIVERSAL_BUILD)/g' \
+	      -e 's/@''BITSIZEOF_PTRDIFF_T''@/$(BITSIZEOF_PTRDIFF_T)/g' \
+	      -e 's/@''PTRDIFF_T_SUFFIX''@/$(PTRDIFF_T_SUFFIX)/g' \
+	      -e 's/@''BITSIZEOF_SIG_ATOMIC_T''@/$(BITSIZEOF_SIG_ATOMIC_T)/g' \
+	      -e 's/@''HAVE_SIGNED_SIG_ATOMIC_T''@/$(HAVE_SIGNED_SIG_ATOMIC_T)/g' \
+	      -e 's/@''SIG_ATOMIC_T_SUFFIX''@/$(SIG_ATOMIC_T_SUFFIX)/g' \
+	      -e 's/@''BITSIZEOF_SIZE_T''@/$(BITSIZEOF_SIZE_T)/g' \
+	      -e 's/@''SIZE_T_SUFFIX''@/$(SIZE_T_SUFFIX)/g' \
+	      -e 's/@''BITSIZEOF_WCHAR_T''@/$(BITSIZEOF_WCHAR_T)/g' \
+	      -e 's/@''HAVE_SIGNED_WCHAR_T''@/$(HAVE_SIGNED_WCHAR_T)/g' \
+	      -e 's/@''WCHAR_T_SUFFIX''@/$(WCHAR_T_SUFFIX)/g' \
+	      -e 's/@''BITSIZEOF_WINT_T''@/$(BITSIZEOF_WINT_T)/g' \
+	      -e 's/@''HAVE_SIGNED_WINT_T''@/$(HAVE_SIGNED_WINT_T)/g' \
+	      -e 's/@''WINT_T_SUFFIX''@/$(WINT_T_SUFFIX)/g' \
+	      -e 's/@''GNULIB_OVERRIDES_WINT_T''@/$(GNULIB_OVERRIDES_WINT_T)/g' \
+	      < $(srcdir)/stdint.in.h; \
+	} > $@-t && \
+	mv $@-t $@
+else
+stdint.h: $(top_builddir)/config.status
+	rm -f $@
+endif
+MOSTLYCLEANFILES += stdint.h stdint.h-t
+
+EXTRA_DIST += stdint.in.h
+
+## end   gnulib module stdint
+
+## begin gnulib module stdlib
+
+BUILT_SOURCES += stdlib.h
+
+# We need the following in order to create <stdlib.h> when the system
+# doesn't have one that works with the given compiler.
+stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
+  $(_NORETURN_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
+	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
+	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+	      -e 's|@''NEXT_STDLIB_H''@|$(NEXT_STDLIB_H)|g' \
+	      -e 's/@''GNULIB__EXIT''@/$(GNULIB__EXIT)/g' \
+	      -e 's/@''GNULIB_ATOLL''@/$(GNULIB_ATOLL)/g' \
+	      -e 's/@''GNULIB_CALLOC_POSIX''@/$(GNULIB_CALLOC_POSIX)/g' \
+	      -e 's/@''GNULIB_CANONICALIZE_FILE_NAME''@/$(GNULIB_CANONICALIZE_FILE_NAME)/g' \
+	      -e 's/@''GNULIB_GETLOADAVG''@/$(GNULIB_GETLOADAVG)/g' \
+	      -e 's/@''GNULIB_GETSUBOPT''@/$(GNULIB_GETSUBOPT)/g' \
+	      -e 's/@''GNULIB_GRANTPT''@/$(GNULIB_GRANTPT)/g' \
+	      -e 's/@''GNULIB_MALLOC_POSIX''@/$(GNULIB_MALLOC_POSIX)/g' \
+	      -e 's/@''GNULIB_MBTOWC''@/$(GNULIB_MBTOWC)/g' \
+	      -e 's/@''GNULIB_MKDTEMP''@/$(GNULIB_MKDTEMP)/g' \
+	      -e 's/@''GNULIB_MKOSTEMP''@/$(GNULIB_MKOSTEMP)/g' \
+	      -e 's/@''GNULIB_MKOSTEMPS''@/$(GNULIB_MKOSTEMPS)/g' \
+	      -e 's/@''GNULIB_MKSTEMP''@/$(GNULIB_MKSTEMP)/g' \
+	      -e 's/@''GNULIB_MKSTEMPS''@/$(GNULIB_MKSTEMPS)/g' \
+	      -e 's/@''GNULIB_POSIX_OPENPT''@/$(GNULIB_POSIX_OPENPT)/g' \
+	      -e 's/@''GNULIB_PTSNAME''@/$(GNULIB_PTSNAME)/g' \
+	      -e 's/@''GNULIB_PTSNAME_R''@/$(GNULIB_PTSNAME_R)/g' \
+	      -e 's/@''GNULIB_PUTENV''@/$(GNULIB_PUTENV)/g' \
+	      -e 's/@''GNULIB_QSORT_R''@/$(GNULIB_QSORT_R)/g' \
+	      -e 's/@''GNULIB_RANDOM''@/$(GNULIB_RANDOM)/g' \
+	      -e 's/@''GNULIB_RANDOM_R''@/$(GNULIB_RANDOM_R)/g' \
+	      -e 's/@''GNULIB_REALLOC_POSIX''@/$(GNULIB_REALLOC_POSIX)/g' \
+	      -e 's/@''GNULIB_REALLOCARRAY''@/$(GNULIB_REALLOCARRAY)/g' \
+	      -e 's/@''GNULIB_REALPATH''@/$(GNULIB_REALPATH)/g' \
+	      -e 's/@''GNULIB_RPMATCH''@/$(GNULIB_RPMATCH)/g' \
+	      -e 's/@''GNULIB_SECURE_GETENV''@/$(GNULIB_SECURE_GETENV)/g' \
+	      -e 's/@''GNULIB_SETENV''@/$(GNULIB_SETENV)/g' \
+	      -e 's/@''GNULIB_STRTOD''@/$(GNULIB_STRTOD)/g' \
+	      -e 's/@''GNULIB_STRTOLL''@/$(GNULIB_STRTOLL)/g' \
+	      -e 's/@''GNULIB_STRTOULL''@/$(GNULIB_STRTOULL)/g' \
+	      -e 's/@''GNULIB_SYSTEM_POSIX''@/$(GNULIB_SYSTEM_POSIX)/g' \
+	      -e 's/@''GNULIB_UNLOCKPT''@/$(GNULIB_UNLOCKPT)/g' \
+	      -e 's/@''GNULIB_UNSETENV''@/$(GNULIB_UNSETENV)/g' \
+	      -e 's/@''GNULIB_WCTOMB''@/$(GNULIB_WCTOMB)/g' \
+	      < $(srcdir)/stdlib.in.h | \
+	  sed -e 's|@''HAVE__EXIT''@|$(HAVE__EXIT)|g' \
+	      -e 's|@''HAVE_ATOLL''@|$(HAVE_ATOLL)|g' \
+	      -e 's|@''HAVE_CANONICALIZE_FILE_NAME''@|$(HAVE_CANONICALIZE_FILE_NAME)|g' \
+	      -e 's|@''HAVE_DECL_GETLOADAVG''@|$(HAVE_DECL_GETLOADAVG)|g' \
+	      -e 's|@''HAVE_GETSUBOPT''@|$(HAVE_GETSUBOPT)|g' \
+	      -e 's|@''HAVE_GRANTPT''@|$(HAVE_GRANTPT)|g' \
+	      -e 's|@''HAVE_DECL_INITSTATE''@|$(HAVE_DECL_INITSTATE)|g' \
+	      -e 's|@''HAVE_MKDTEMP''@|$(HAVE_MKDTEMP)|g' \
+	      -e 's|@''HAVE_MKOSTEMP''@|$(HAVE_MKOSTEMP)|g' \
+	      -e 's|@''HAVE_MKOSTEMPS''@|$(HAVE_MKOSTEMPS)|g' \
+	      -e 's|@''HAVE_MKSTEMP''@|$(HAVE_MKSTEMP)|g' \
+	      -e 's|@''HAVE_MKSTEMPS''@|$(HAVE_MKSTEMPS)|g' \
+	      -e 's|@''HAVE_POSIX_OPENPT''@|$(HAVE_POSIX_OPENPT)|g' \
+	      -e 's|@''HAVE_PTSNAME''@|$(HAVE_PTSNAME)|g' \
+	      -e 's|@''HAVE_PTSNAME_R''@|$(HAVE_PTSNAME_R)|g' \
+	      -e 's|@''HAVE_QSORT_R''@|$(HAVE_QSORT_R)|g' \
+	      -e 's|@''HAVE_RANDOM''@|$(HAVE_RANDOM)|g' \
+	      -e 's|@''HAVE_RANDOM_H''@|$(HAVE_RANDOM_H)|g' \
+	      -e 's|@''HAVE_RANDOM_R''@|$(HAVE_RANDOM_R)|g' \
+	      -e 's|@''HAVE_REALLOCARRAY''@|$(HAVE_REALLOCARRAY)|g' \
+	      -e 's|@''HAVE_REALPATH''@|$(HAVE_REALPATH)|g' \
+	      -e 's|@''HAVE_RPMATCH''@|$(HAVE_RPMATCH)|g' \
+	      -e 's|@''HAVE_SECURE_GETENV''@|$(HAVE_SECURE_GETENV)|g' \
+	      -e 's|@''HAVE_DECL_SETENV''@|$(HAVE_DECL_SETENV)|g' \
+	      -e 's|@''HAVE_DECL_SETSTATE''@|$(HAVE_DECL_SETSTATE)|g' \
+	      -e 's|@''HAVE_STRTOD''@|$(HAVE_STRTOD)|g' \
+	      -e 's|@''HAVE_STRTOLL''@|$(HAVE_STRTOLL)|g' \
+	      -e 's|@''HAVE_STRTOULL''@|$(HAVE_STRTOULL)|g' \
+	      -e 's|@''HAVE_STRUCT_RANDOM_DATA''@|$(HAVE_STRUCT_RANDOM_DATA)|g' \
+	      -e 's|@''HAVE_SYS_LOADAVG_H''@|$(HAVE_SYS_LOADAVG_H)|g' \
+	      -e 's|@''HAVE_UNLOCKPT''@|$(HAVE_UNLOCKPT)|g' \
+	      -e 's|@''HAVE_DECL_UNSETENV''@|$(HAVE_DECL_UNSETENV)|g' \
+	      -e 's|@''REPLACE_CALLOC''@|$(REPLACE_CALLOC)|g' \
+	      -e 's|@''REPLACE_CANONICALIZE_FILE_NAME''@|$(REPLACE_CANONICALIZE_FILE_NAME)|g' \
+	      -e 's|@''REPLACE_MALLOC''@|$(REPLACE_MALLOC)|g' \
+	      -e 's|@''REPLACE_MBTOWC''@|$(REPLACE_MBTOWC)|g' \
+	      -e 's|@''REPLACE_MKSTEMP''@|$(REPLACE_MKSTEMP)|g' \
+	      -e 's|@''REPLACE_PTSNAME''@|$(REPLACE_PTSNAME)|g' \
+	      -e 's|@''REPLACE_PTSNAME_R''@|$(REPLACE_PTSNAME_R)|g' \
+	      -e 's|@''REPLACE_PUTENV''@|$(REPLACE_PUTENV)|g' \
+	      -e 's|@''REPLACE_QSORT_R''@|$(REPLACE_QSORT_R)|g' \
+	      -e 's|@''REPLACE_RANDOM_R''@|$(REPLACE_RANDOM_R)|g' \
+	      -e 's|@''REPLACE_REALLOC''@|$(REPLACE_REALLOC)|g' \
+	      -e 's|@''REPLACE_REALPATH''@|$(REPLACE_REALPATH)|g' \
+	      -e 's|@''REPLACE_SETENV''@|$(REPLACE_SETENV)|g' \
+	      -e 's|@''REPLACE_STRTOD''@|$(REPLACE_STRTOD)|g' \
+	      -e 's|@''REPLACE_UNSETENV''@|$(REPLACE_UNSETENV)|g' \
+	      -e 's|@''REPLACE_WCTOMB''@|$(REPLACE_WCTOMB)|g' \
+	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+	      -e '/definition of _Noreturn/r $(_NORETURN_H)' \
+	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \
+	} > $@-t && \
+	mv $@-t $@
+MOSTLYCLEANFILES += stdlib.h stdlib.h-t
+
+EXTRA_DIST += stdlib.in.h
+
+## end   gnulib module stdlib
+
+## begin gnulib module streq
+
+
+EXTRA_DIST += streq.h
+
+## end   gnulib module streq
+
+## begin gnulib module sys_stat
+
+BUILT_SOURCES += sys/stat.h
+
+# We need the following in order to create <sys/stat.h> when the system
+# has one that is incomplete.
+sys/stat.h: sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+	$(AM_V_at)$(MKDIR_P) sys
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
+	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+	      -e 's|@''NEXT_SYS_STAT_H''@|$(NEXT_SYS_STAT_H)|g' \
+	      -e 's|@''WINDOWS_64_BIT_ST_SIZE''@|$(WINDOWS_64_BIT_ST_SIZE)|g' \
+	      -e 's|@''WINDOWS_STAT_TIMESPEC''@|$(WINDOWS_STAT_TIMESPEC)|g' \
+	      -e 's/@''GNULIB_FCHMODAT''@/$(GNULIB_FCHMODAT)/g' \
+	      -e 's/@''GNULIB_FSTAT''@/$(GNULIB_FSTAT)/g' \
+	      -e 's/@''GNULIB_FSTATAT''@/$(GNULIB_FSTATAT)/g' \
+	      -e 's/@''GNULIB_FUTIMENS''@/$(GNULIB_FUTIMENS)/g' \
+	      -e 's/@''GNULIB_LCHMOD''@/$(GNULIB_LCHMOD)/g' \
+	      -e 's/@''GNULIB_LSTAT''@/$(GNULIB_LSTAT)/g' \
+	      -e 's/@''GNULIB_MKDIRAT''@/$(GNULIB_MKDIRAT)/g' \
+	      -e 's/@''GNULIB_MKFIFO''@/$(GNULIB_MKFIFO)/g' \
+	      -e 's/@''GNULIB_MKFIFOAT''@/$(GNULIB_MKFIFOAT)/g' \
+	      -e 's/@''GNULIB_MKNOD''@/$(GNULIB_MKNOD)/g' \
+	      -e 's/@''GNULIB_MKNODAT''@/$(GNULIB_MKNODAT)/g' \
+	      -e 's/@''GNULIB_STAT''@/$(GNULIB_STAT)/g' \
+	      -e 's/@''GNULIB_UTIMENSAT''@/$(GNULIB_UTIMENSAT)/g' \
+	      -e 's/@''GNULIB_OVERRIDES_STRUCT_STAT''@/$(GNULIB_OVERRIDES_STRUCT_STAT)/g' \
+	      -e 's|@''HAVE_FCHMODAT''@|$(HAVE_FCHMODAT)|g' \
+	      -e 's|@''HAVE_FSTATAT''@|$(HAVE_FSTATAT)|g' \
+	      -e 's|@''HAVE_FUTIMENS''@|$(HAVE_FUTIMENS)|g' \
+	      -e 's|@''HAVE_LCHMOD''@|$(HAVE_LCHMOD)|g' \
+	      -e 's|@''HAVE_LSTAT''@|$(HAVE_LSTAT)|g' \
+	      -e 's|@''HAVE_MKDIRAT''@|$(HAVE_MKDIRAT)|g' \
+	      -e 's|@''HAVE_MKFIFO''@|$(HAVE_MKFIFO)|g' \
+	      -e 's|@''HAVE_MKFIFOAT''@|$(HAVE_MKFIFOAT)|g' \
+	      -e 's|@''HAVE_MKNOD''@|$(HAVE_MKNOD)|g' \
+	      -e 's|@''HAVE_MKNODAT''@|$(HAVE_MKNODAT)|g' \
+	      -e 's|@''HAVE_UTIMENSAT''@|$(HAVE_UTIMENSAT)|g' \
+	      -e 's|@''REPLACE_FSTAT''@|$(REPLACE_FSTAT)|g' \
+	      -e 's|@''REPLACE_FSTATAT''@|$(REPLACE_FSTATAT)|g' \
+	      -e 's|@''REPLACE_FUTIMENS''@|$(REPLACE_FUTIMENS)|g' \
+	      -e 's|@''REPLACE_LSTAT''@|$(REPLACE_LSTAT)|g' \
+	      -e 's|@''REPLACE_MKDIR''@|$(REPLACE_MKDIR)|g' \
+	      -e 's|@''REPLACE_MKFIFO''@|$(REPLACE_MKFIFO)|g' \
+	      -e 's|@''REPLACE_MKNOD''@|$(REPLACE_MKNOD)|g' \
+	      -e 's|@''REPLACE_STAT''@|$(REPLACE_STAT)|g' \
+	      -e 's|@''REPLACE_UTIMENSAT''@|$(REPLACE_UTIMENSAT)|g' \
+	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+	      < $(srcdir)/sys_stat.in.h; \
+	} > $@-t && \
+	mv $@-t $@
+MOSTLYCLEANFILES += sys/stat.h sys/stat.h-t
+MOSTLYCLEANDIRS += sys
+
+EXTRA_DIST += sys_stat.in.h
+
+## end   gnulib module sys_stat
+
+## begin gnulib module sys_time
+
+BUILT_SOURCES += sys/time.h
+
+# We need the following in order to create <sys/time.h> when the system
+# doesn't have one that works with the given compiler.
+sys/time.h: sys_time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+	$(AM_V_at)$(MKDIR_P) sys
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
+	      -e 's/@''HAVE_SYS_TIME_H''@/$(HAVE_SYS_TIME_H)/g' \
+	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+	      -e 's|@''NEXT_SYS_TIME_H''@|$(NEXT_SYS_TIME_H)|g' \
+	      -e 's/@''GNULIB_GETTIMEOFDAY''@/$(GNULIB_GETTIMEOFDAY)/g' \
+	      -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \
+	      -e 's/@''HAVE_GETTIMEOFDAY''@/$(HAVE_GETTIMEOFDAY)/g' \
+	      -e 's/@''HAVE_STRUCT_TIMEVAL''@/$(HAVE_STRUCT_TIMEVAL)/g' \
+	      -e 's/@''REPLACE_GETTIMEOFDAY''@/$(REPLACE_GETTIMEOFDAY)/g' \
+	      -e 's/@''REPLACE_STRUCT_TIMEVAL''@/$(REPLACE_STRUCT_TIMEVAL)/g' \
+	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+	      < $(srcdir)/sys_time.in.h; \
+	} > $@-t && \
+	mv $@-t $@
+MOSTLYCLEANFILES += sys/time.h sys/time.h-t
+
+EXTRA_DIST += sys_time.in.h
+
+## end   gnulib module sys_time
+
+## begin gnulib module sys_types
+
+BUILT_SOURCES += sys/types.h
+
+# We need the following in order to create <sys/types.h> when the system
+# doesn't have one that works with the given compiler.
+sys/types.h: sys_types.in.h $(top_builddir)/config.status
+	$(AM_V_at)$(MKDIR_P) sys
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
+	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+	      -e 's|@''NEXT_SYS_TYPES_H''@|$(NEXT_SYS_TYPES_H)|g' \
+	      -e 's|@''WINDOWS_64_BIT_OFF_T''@|$(WINDOWS_64_BIT_OFF_T)|g' \
+	      -e 's|@''WINDOWS_STAT_INODES''@|$(WINDOWS_STAT_INODES)|g' \
+	      < $(srcdir)/sys_types.in.h; \
+	} > $@-t && \
+	mv $@-t $@
+MOSTLYCLEANFILES += sys/types.h sys/types.h-t
+
+EXTRA_DIST += sys_types.in.h
+
+## end   gnulib module sys_types
+
+## begin gnulib module tempname
+
+libgnu_la_SOURCES += tempname.c
+
+EXTRA_DIST += tempname.h
+
+## end   gnulib module tempname
+
+## begin gnulib module threadlib
+
+libgnu_la_SOURCES += glthread/threadlib.c
+
+EXTRA_DIST += $(top_srcdir)/conf/config.rpath
+
+## end   gnulib module threadlib
+
+## begin gnulib module time
+
+BUILT_SOURCES += time.h
+
+# We need the following in order to create <time.h> when the system
+# doesn't have one that works with the given compiler.
+time.h: time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
+	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
+	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+	      -e 's|@''NEXT_TIME_H''@|$(NEXT_TIME_H)|g' \
+	      -e 's/@''GNULIB_CTIME''@/$(GNULIB_CTIME)/g' \
+	      -e 's/@''GNULIB_LOCALTIME''@/$(GNULIB_LOCALTIME)/g' \
+	      -e 's/@''GNULIB_MKTIME''@/$(GNULIB_MKTIME)/g' \
+	      -e 's/@''GNULIB_NANOSLEEP''@/$(GNULIB_NANOSLEEP)/g' \
+	      -e 's/@''GNULIB_STRFTIME''@/$(GNULIB_STRFTIME)/g' \
+	      -e 's/@''GNULIB_STRPTIME''@/$(GNULIB_STRPTIME)/g' \
+	      -e 's/@''GNULIB_TIMEGM''@/$(GNULIB_TIMEGM)/g' \
+	      -e 's/@''GNULIB_TIME_R''@/$(GNULIB_TIME_R)/g' \
+	      -e 's/@''GNULIB_TIME_RZ''@/$(GNULIB_TIME_RZ)/g' \
+	      -e 's/@''GNULIB_TZSET''@/$(GNULIB_TZSET)/g' \
+	      -e 's|@''HAVE_DECL_LOCALTIME_R''@|$(HAVE_DECL_LOCALTIME_R)|g' \
+	      -e 's|@''HAVE_NANOSLEEP''@|$(HAVE_NANOSLEEP)|g' \
+	      -e 's|@''HAVE_STRPTIME''@|$(HAVE_STRPTIME)|g' \
+	      -e 's|@''HAVE_TIMEGM''@|$(HAVE_TIMEGM)|g' \
+	      -e 's|@''HAVE_TIMEZONE_T''@|$(HAVE_TIMEZONE_T)|g' \
+	      -e 's|@''HAVE_TZSET''@|$(HAVE_TZSET)|g' \
+	      -e 's|@''REPLACE_CTIME''@|$(REPLACE_CTIME)|g' \
+	      -e 's|@''REPLACE_GMTIME''@|$(REPLACE_GMTIME)|g' \
+	      -e 's|@''REPLACE_LOCALTIME''@|$(REPLACE_LOCALTIME)|g' \
+	      -e 's|@''REPLACE_LOCALTIME_R''@|$(REPLACE_LOCALTIME_R)|g' \
+	      -e 's|@''REPLACE_MKTIME''@|$(REPLACE_MKTIME)|g' \
+	      -e 's|@''REPLACE_NANOSLEEP''@|$(REPLACE_NANOSLEEP)|g' \
+	      -e 's|@''REPLACE_STRFTIME''@|$(REPLACE_STRFTIME)|g' \
+	      -e 's|@''REPLACE_TIMEGM''@|$(REPLACE_TIMEGM)|g' \
+	      -e 's|@''REPLACE_TZSET''@|$(REPLACE_TZSET)|g' \
+	      -e 's|@''PTHREAD_H_DEFINES_STRUCT_TIMESPEC''@|$(PTHREAD_H_DEFINES_STRUCT_TIMESPEC)|g' \
+	      -e 's|@''SYS_TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(SYS_TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \
+	      -e 's|@''TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \
+	      -e 's|@''UNISTD_H_DEFINES_STRUCT_TIMESPEC''@|$(UNISTD_H_DEFINES_STRUCT_TIMESPEC)|g' \
+	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+	      < $(srcdir)/time.in.h; \
+	} > $@-t && \
+	mv $@-t $@
+MOSTLYCLEANFILES += time.h time.h-t
+
+EXTRA_DIST += time.in.h
+
+## end   gnulib module time
+
+## begin gnulib module unistd
+
+BUILT_SOURCES += unistd.h
+libgnu_la_SOURCES += unistd.c
+
+# We need the following in order to create an empty placeholder for
+# <unistd.h> when the system doesn't have one.
+unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
+	      -e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \
+	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+	      -e 's|@''NEXT_UNISTD_H''@|$(NEXT_UNISTD_H)|g' \
+	      -e 's|@''WINDOWS_64_BIT_OFF_T''@|$(WINDOWS_64_BIT_OFF_T)|g' \
+	      -e 's/@''GNULIB_CHDIR''@/$(GNULIB_CHDIR)/g' \
+	      -e 's/@''GNULIB_CHOWN''@/$(GNULIB_CHOWN)/g' \
+	      -e 's/@''GNULIB_CLOSE''@/$(GNULIB_CLOSE)/g' \
+	      -e 's/@''GNULIB_DUP''@/$(GNULIB_DUP)/g' \
+	      -e 's/@''GNULIB_DUP2''@/$(GNULIB_DUP2)/g' \
+	      -e 's/@''GNULIB_DUP3''@/$(GNULIB_DUP3)/g' \
+	      -e 's/@''GNULIB_ENVIRON''@/$(GNULIB_ENVIRON)/g' \
+	      -e 's/@''GNULIB_EUIDACCESS''@/$(GNULIB_EUIDACCESS)/g' \
+	      -e 's/@''GNULIB_FACCESSAT''@/$(GNULIB_FACCESSAT)/g' \
+	      -e 's/@''GNULIB_FCHDIR''@/$(GNULIB_FCHDIR)/g' \
+	      -e 's/@''GNULIB_FCHOWNAT''@/$(GNULIB_FCHOWNAT)/g' \
+	      -e 's/@''GNULIB_FDATASYNC''@/$(GNULIB_FDATASYNC)/g' \
+	      -e 's/@''GNULIB_FSYNC''@/$(GNULIB_FSYNC)/g' \
+	      -e 's/@''GNULIB_FTRUNCATE''@/$(GNULIB_FTRUNCATE)/g' \
+	      -e 's/@''GNULIB_GETCWD''@/$(GNULIB_GETCWD)/g' \
+	      -e 's/@''GNULIB_GETDOMAINNAME''@/$(GNULIB_GETDOMAINNAME)/g' \
+	      -e 's/@''GNULIB_GETDTABLESIZE''@/$(GNULIB_GETDTABLESIZE)/g' \
+	      -e 's/@''GNULIB_GETGROUPS''@/$(GNULIB_GETGROUPS)/g' \
+	      -e 's/@''GNULIB_GETHOSTNAME''@/$(GNULIB_GETHOSTNAME)/g' \
+	      -e 's/@''GNULIB_GETLOGIN''@/$(GNULIB_GETLOGIN)/g' \
+	      -e 's/@''GNULIB_GETLOGIN_R''@/$(GNULIB_GETLOGIN_R)/g' \
+	      -e 's/@''GNULIB_GETPAGESIZE''@/$(GNULIB_GETPAGESIZE)/g' \
+	      -e 's/@''GNULIB_GETUSERSHELL''@/$(GNULIB_GETUSERSHELL)/g' \
+	      -e 's/@''GNULIB_GROUP_MEMBER''@/$(GNULIB_GROUP_MEMBER)/g' \
+	      -e 's/@''GNULIB_ISATTY''@/$(GNULIB_ISATTY)/g' \
+	      -e 's/@''GNULIB_LCHOWN''@/$(GNULIB_LCHOWN)/g' \
+	      -e 's/@''GNULIB_LINK''@/$(GNULIB_LINK)/g' \
+	      -e 's/@''GNULIB_LINKAT''@/$(GNULIB_LINKAT)/g' \
+	      -e 's/@''GNULIB_LSEEK''@/$(GNULIB_LSEEK)/g' \
+	      -e 's/@''GNULIB_PIPE''@/$(GNULIB_PIPE)/g' \
+	      -e 's/@''GNULIB_PIPE2''@/$(GNULIB_PIPE2)/g' \
+	      -e 's/@''GNULIB_PREAD''@/$(GNULIB_PREAD)/g' \
+	      -e 's/@''GNULIB_PWRITE''@/$(GNULIB_PWRITE)/g' \
+	      -e 's/@''GNULIB_READ''@/$(GNULIB_READ)/g' \
+	      -e 's/@''GNULIB_READLINK''@/$(GNULIB_READLINK)/g' \
+	      -e 's/@''GNULIB_READLINKAT''@/$(GNULIB_READLINKAT)/g' \
+	      -e 's/@''GNULIB_RMDIR''@/$(GNULIB_RMDIR)/g' \
+	      -e 's/@''GNULIB_SETHOSTNAME''@/$(GNULIB_SETHOSTNAME)/g' \
+	      -e 's/@''GNULIB_SLEEP''@/$(GNULIB_SLEEP)/g' \
+	      -e 's/@''GNULIB_SYMLINK''@/$(GNULIB_SYMLINK)/g' \
+	      -e 's/@''GNULIB_SYMLINKAT''@/$(GNULIB_SYMLINKAT)/g' \
+	      -e 's/@''GNULIB_TRUNCATE''@/$(GNULIB_TRUNCATE)/g' \
+	      -e 's/@''GNULIB_TTYNAME_R''@/$(GNULIB_TTYNAME_R)/g' \
+	      -e 's/@''GNULIB_UNISTD_H_GETOPT''@/0$(GNULIB_GL_UNISTD_H_GETOPT)/g' \
+	      -e 's/@''GNULIB_UNISTD_H_NONBLOCKING''@/$(GNULIB_UNISTD_H_NONBLOCKING)/g' \
+	      -e 's/@''GNULIB_UNISTD_H_SIGPIPE''@/$(GNULIB_UNISTD_H_SIGPIPE)/g' \
+	      -e 's/@''GNULIB_UNLINK''@/$(GNULIB_UNLINK)/g' \
+	      -e 's/@''GNULIB_UNLINKAT''@/$(GNULIB_UNLINKAT)/g' \
+	      -e 's/@''GNULIB_USLEEP''@/$(GNULIB_USLEEP)/g' \
+	      -e 's/@''GNULIB_WRITE''@/$(GNULIB_WRITE)/g' \
+	      < $(srcdir)/unistd.in.h | \
+	  sed -e 's|@''HAVE_CHOWN''@|$(HAVE_CHOWN)|g' \
+	      -e 's|@''HAVE_DUP2''@|$(HAVE_DUP2)|g' \
+	      -e 's|@''HAVE_DUP3''@|$(HAVE_DUP3)|g' \
+	      -e 's|@''HAVE_EUIDACCESS''@|$(HAVE_EUIDACCESS)|g' \
+	      -e 's|@''HAVE_FACCESSAT''@|$(HAVE_FACCESSAT)|g' \
+	      -e 's|@''HAVE_FCHDIR''@|$(HAVE_FCHDIR)|g' \
+	      -e 's|@''HAVE_FCHOWNAT''@|$(HAVE_FCHOWNAT)|g' \
+	      -e 's|@''HAVE_FDATASYNC''@|$(HAVE_FDATASYNC)|g' \
+	      -e 's|@''HAVE_FSYNC''@|$(HAVE_FSYNC)|g' \
+	      -e 's|@''HAVE_FTRUNCATE''@|$(HAVE_FTRUNCATE)|g' \
+	      -e 's|@''HAVE_GETDTABLESIZE''@|$(HAVE_GETDTABLESIZE)|g' \
+	      -e 's|@''HAVE_GETGROUPS''@|$(HAVE_GETGROUPS)|g' \
+	      -e 's|@''HAVE_GETHOSTNAME''@|$(HAVE_GETHOSTNAME)|g' \
+	      -e 's|@''HAVE_GETPAGESIZE''@|$(HAVE_GETPAGESIZE)|g' \
+	      -e 's|@''HAVE_GROUP_MEMBER''@|$(HAVE_GROUP_MEMBER)|g' \
+	      -e 's|@''HAVE_LCHOWN''@|$(HAVE_LCHOWN)|g' \
+	      -e 's|@''HAVE_LINK''@|$(HAVE_LINK)|g' \
+	      -e 's|@''HAVE_LINKAT''@|$(HAVE_LINKAT)|g' \
+	      -e 's|@''HAVE_PIPE''@|$(HAVE_PIPE)|g' \
+	      -e 's|@''HAVE_PIPE2''@|$(HAVE_PIPE2)|g' \
+	      -e 's|@''HAVE_PREAD''@|$(HAVE_PREAD)|g' \
+	      -e 's|@''HAVE_PWRITE''@|$(HAVE_PWRITE)|g' \
+	      -e 's|@''HAVE_READLINK''@|$(HAVE_READLINK)|g' \
+	      -e 's|@''HAVE_READLINKAT''@|$(HAVE_READLINKAT)|g' \
+	      -e 's|@''HAVE_SETHOSTNAME''@|$(HAVE_SETHOSTNAME)|g' \
+	      -e 's|@''HAVE_SLEEP''@|$(HAVE_SLEEP)|g' \
+	      -e 's|@''HAVE_SYMLINK''@|$(HAVE_SYMLINK)|g' \
+	      -e 's|@''HAVE_SYMLINKAT''@|$(HAVE_SYMLINKAT)|g' \
+	      -e 's|@''HAVE_TRUNCATE''@|$(HAVE_TRUNCATE)|g' \
+	      -e 's|@''HAVE_UNLINKAT''@|$(HAVE_UNLINKAT)|g' \
+	      -e 's|@''HAVE_USLEEP''@|$(HAVE_USLEEP)|g' \
+	      -e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|g' \
+	      -e 's|@''HAVE_DECL_FCHDIR''@|$(HAVE_DECL_FCHDIR)|g' \
+	      -e 's|@''HAVE_DECL_FDATASYNC''@|$(HAVE_DECL_FDATASYNC)|g' \
+	      -e 's|@''HAVE_DECL_GETDOMAINNAME''@|$(HAVE_DECL_GETDOMAINNAME)|g' \
+	      -e 's|@''HAVE_DECL_GETLOGIN''@|$(HAVE_DECL_GETLOGIN)|g' \
+	      -e 's|@''HAVE_DECL_GETLOGIN_R''@|$(HAVE_DECL_GETLOGIN_R)|g' \
+	      -e 's|@''HAVE_DECL_GETPAGESIZE''@|$(HAVE_DECL_GETPAGESIZE)|g' \
+	      -e 's|@''HAVE_DECL_GETUSERSHELL''@|$(HAVE_DECL_GETUSERSHELL)|g' \
+	      -e 's|@''HAVE_DECL_SETHOSTNAME''@|$(HAVE_DECL_SETHOSTNAME)|g' \
+	      -e 's|@''HAVE_DECL_TTYNAME_R''@|$(HAVE_DECL_TTYNAME_R)|g' \
+	      -e 's|@''HAVE_OS_H''@|$(HAVE_OS_H)|g' \
+	      -e 's|@''HAVE_SYS_PARAM_H''@|$(HAVE_SYS_PARAM_H)|g' \
+	  | \
+	  sed -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \
+	      -e 's|@''REPLACE_CLOSE''@|$(REPLACE_CLOSE)|g' \
+	      -e 's|@''REPLACE_DUP''@|$(REPLACE_DUP)|g' \
+	      -e 's|@''REPLACE_DUP2''@|$(REPLACE_DUP2)|g' \
+	      -e 's|@''REPLACE_FCHOWNAT''@|$(REPLACE_FCHOWNAT)|g' \
+	      -e 's|@''REPLACE_FTRUNCATE''@|$(REPLACE_FTRUNCATE)|g' \
+	      -e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \
+	      -e 's|@''REPLACE_GETDOMAINNAME''@|$(REPLACE_GETDOMAINNAME)|g' \
+	      -e 's|@''REPLACE_GETDTABLESIZE''@|$(REPLACE_GETDTABLESIZE)|g' \
+	      -e 's|@''REPLACE_GETLOGIN_R''@|$(REPLACE_GETLOGIN_R)|g' \
+	      -e 's|@''REPLACE_GETGROUPS''@|$(REPLACE_GETGROUPS)|g' \
+	      -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \
+	      -e 's|@''REPLACE_ISATTY''@|$(REPLACE_ISATTY)|g' \
+	      -e 's|@''REPLACE_LCHOWN''@|$(REPLACE_LCHOWN)|g' \
+	      -e 's|@''REPLACE_LINK''@|$(REPLACE_LINK)|g' \
+	      -e 's|@''REPLACE_LINKAT''@|$(REPLACE_LINKAT)|g' \
+	      -e 's|@''REPLACE_LSEEK''@|$(REPLACE_LSEEK)|g' \
+	      -e 's|@''REPLACE_PREAD''@|$(REPLACE_PREAD)|g' \
+	      -e 's|@''REPLACE_PWRITE''@|$(REPLACE_PWRITE)|g' \
+	      -e 's|@''REPLACE_READ''@|$(REPLACE_READ)|g' \
+	      -e 's|@''REPLACE_READLINK''@|$(REPLACE_READLINK)|g' \
+	      -e 's|@''REPLACE_READLINKAT''@|$(REPLACE_READLINKAT)|g' \
+	      -e 's|@''REPLACE_RMDIR''@|$(REPLACE_RMDIR)|g' \
+	      -e 's|@''REPLACE_SLEEP''@|$(REPLACE_SLEEP)|g' \
+	      -e 's|@''REPLACE_SYMLINK''@|$(REPLACE_SYMLINK)|g' \
+	      -e 's|@''REPLACE_SYMLINKAT''@|$(REPLACE_SYMLINKAT)|g' \
+	      -e 's|@''REPLACE_TRUNCATE''@|$(REPLACE_TRUNCATE)|g' \
+	      -e 's|@''REPLACE_TTYNAME_R''@|$(REPLACE_TTYNAME_R)|g' \
+	      -e 's|@''REPLACE_UNLINK''@|$(REPLACE_UNLINK)|g' \
+	      -e 's|@''REPLACE_UNLINKAT''@|$(REPLACE_UNLINKAT)|g' \
+	      -e 's|@''REPLACE_USLEEP''@|$(REPLACE_USLEEP)|g' \
+	      -e 's|@''REPLACE_WRITE''@|$(REPLACE_WRITE)|g' \
+	      -e 's|@''UNISTD_H_HAVE_WINSOCK2_H''@|$(UNISTD_H_HAVE_WINSOCK2_H)|g' \
+	      -e 's|@''UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS''@|$(UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS)|g' \
+	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \
+	} > $@-t && \
+	mv $@-t $@
+MOSTLYCLEANFILES += unistd.h unistd.h-t
+
+EXTRA_DIST += unistd.in.h
+
+## end   gnulib module unistd
+
+## begin gnulib module verify
+
+
+EXTRA_DIST += verify.h
+
+## end   gnulib module verify
+
+## begin gnulib module wchar
+
+BUILT_SOURCES += wchar.h
+
+# We need the following in order to create <wchar.h> when the system
+# version does not work standalone.
+wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
+	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+	      -e 's|@''HAVE_FEATURES_H''@|$(HAVE_FEATURES_H)|g' \
+	      -e 's|@''NEXT_WCHAR_H''@|$(NEXT_WCHAR_H)|g' \
+	      -e 's|@''HAVE_WCHAR_H''@|$(HAVE_WCHAR_H)|g' \
+	      -e 's/@''HAVE_CRTDEFS_H''@/$(HAVE_CRTDEFS_H)/g' \
+	      -e 's/@''GNULIB_OVERRIDES_WINT_T''@/$(GNULIB_OVERRIDES_WINT_T)/g' \
+	      -e 's/@''GNULIB_BTOWC''@/$(GNULIB_BTOWC)/g' \
+	      -e 's/@''GNULIB_WCTOB''@/$(GNULIB_WCTOB)/g' \
+	      -e 's/@''GNULIB_MBSINIT''@/$(GNULIB_MBSINIT)/g' \
+	      -e 's/@''GNULIB_MBRTOWC''@/$(GNULIB_MBRTOWC)/g' \
+	      -e 's/@''GNULIB_MBRLEN''@/$(GNULIB_MBRLEN)/g' \
+	      -e 's/@''GNULIB_MBSRTOWCS''@/$(GNULIB_MBSRTOWCS)/g' \
+	      -e 's/@''GNULIB_MBSNRTOWCS''@/$(GNULIB_MBSNRTOWCS)/g' \
+	      -e 's/@''GNULIB_WCRTOMB''@/$(GNULIB_WCRTOMB)/g' \
+	      -e 's/@''GNULIB_WCSRTOMBS''@/$(GNULIB_WCSRTOMBS)/g' \
+	      -e 's/@''GNULIB_WCSNRTOMBS''@/$(GNULIB_WCSNRTOMBS)/g' \
+	      -e 's/@''GNULIB_WCWIDTH''@/$(GNULIB_WCWIDTH)/g' \
+	      -e 's/@''GNULIB_WMEMCHR''@/$(GNULIB_WMEMCHR)/g' \
+	      -e 's/@''GNULIB_WMEMCMP''@/$(GNULIB_WMEMCMP)/g' \
+	      -e 's/@''GNULIB_WMEMCPY''@/$(GNULIB_WMEMCPY)/g' \
+	      -e 's/@''GNULIB_WMEMMOVE''@/$(GNULIB_WMEMMOVE)/g' \
+	      -e 's/@''GNULIB_WMEMSET''@/$(GNULIB_WMEMSET)/g' \
+	      -e 's/@''GNULIB_WCSLEN''@/$(GNULIB_WCSLEN)/g' \
+	      -e 's/@''GNULIB_WCSNLEN''@/$(GNULIB_WCSNLEN)/g' \
+	      -e 's/@''GNULIB_WCSCPY''@/$(GNULIB_WCSCPY)/g' \
+	      -e 's/@''GNULIB_WCPCPY''@/$(GNULIB_WCPCPY)/g' \
+	      -e 's/@''GNULIB_WCSNCPY''@/$(GNULIB_WCSNCPY)/g' \
+	      -e 's/@''GNULIB_WCPNCPY''@/$(GNULIB_WCPNCPY)/g' \
+	      -e 's/@''GNULIB_WCSCAT''@/$(GNULIB_WCSCAT)/g' \
+	      -e 's/@''GNULIB_WCSNCAT''@/$(GNULIB_WCSNCAT)/g' \
+	      -e 's/@''GNULIB_WCSCMP''@/$(GNULIB_WCSCMP)/g' \
+	      -e 's/@''GNULIB_WCSNCMP''@/$(GNULIB_WCSNCMP)/g' \
+	      -e 's/@''GNULIB_WCSCASECMP''@/$(GNULIB_WCSCASECMP)/g' \
+	      -e 's/@''GNULIB_WCSNCASECMP''@/$(GNULIB_WCSNCASECMP)/g' \
+	      -e 's/@''GNULIB_WCSCOLL''@/$(GNULIB_WCSCOLL)/g' \
+	      -e 's/@''GNULIB_WCSXFRM''@/$(GNULIB_WCSXFRM)/g' \
+	      -e 's/@''GNULIB_WCSDUP''@/$(GNULIB_WCSDUP)/g' \
+	      -e 's/@''GNULIB_WCSCHR''@/$(GNULIB_WCSCHR)/g' \
+	      -e 's/@''GNULIB_WCSRCHR''@/$(GNULIB_WCSRCHR)/g' \
+	      -e 's/@''GNULIB_WCSCSPN''@/$(GNULIB_WCSCSPN)/g' \
+	      -e 's/@''GNULIB_WCSSPN''@/$(GNULIB_WCSSPN)/g' \
+	      -e 's/@''GNULIB_WCSPBRK''@/$(GNULIB_WCSPBRK)/g' \
+	      -e 's/@''GNULIB_WCSSTR''@/$(GNULIB_WCSSTR)/g' \
+	      -e 's/@''GNULIB_WCSTOK''@/$(GNULIB_WCSTOK)/g' \
+	      -e 's/@''GNULIB_WCSWIDTH''@/$(GNULIB_WCSWIDTH)/g' \
+	      -e 's/@''GNULIB_WCSFTIME''@/$(GNULIB_WCSFTIME)/g' \
+	      < $(srcdir)/wchar.in.h | \
+	  sed -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \
+	      -e 's|@''HAVE_BTOWC''@|$(HAVE_BTOWC)|g' \
+	      -e 's|@''HAVE_MBSINIT''@|$(HAVE_MBSINIT)|g' \
+	      -e 's|@''HAVE_MBRTOWC''@|$(HAVE_MBRTOWC)|g' \
+	      -e 's|@''HAVE_MBRLEN''@|$(HAVE_MBRLEN)|g' \
+	      -e 's|@''HAVE_MBSRTOWCS''@|$(HAVE_MBSRTOWCS)|g' \
+	      -e 's|@''HAVE_MBSNRTOWCS''@|$(HAVE_MBSNRTOWCS)|g' \
+	      -e 's|@''HAVE_WCRTOMB''@|$(HAVE_WCRTOMB)|g' \
+	      -e 's|@''HAVE_WCSRTOMBS''@|$(HAVE_WCSRTOMBS)|g' \
+	      -e 's|@''HAVE_WCSNRTOMBS''@|$(HAVE_WCSNRTOMBS)|g' \
+	      -e 's|@''HAVE_WMEMCHR''@|$(HAVE_WMEMCHR)|g' \
+	      -e 's|@''HAVE_WMEMCMP''@|$(HAVE_WMEMCMP)|g' \
+	      -e 's|@''HAVE_WMEMCPY''@|$(HAVE_WMEMCPY)|g' \
+	      -e 's|@''HAVE_WMEMMOVE''@|$(HAVE_WMEMMOVE)|g' \
+	      -e 's|@''HAVE_WMEMSET''@|$(HAVE_WMEMSET)|g' \
+	      -e 's|@''HAVE_WCSLEN''@|$(HAVE_WCSLEN)|g' \
+	      -e 's|@''HAVE_WCSNLEN''@|$(HAVE_WCSNLEN)|g' \
+	      -e 's|@''HAVE_WCSCPY''@|$(HAVE_WCSCPY)|g' \
+	      -e 's|@''HAVE_WCPCPY''@|$(HAVE_WCPCPY)|g' \
+	      -e 's|@''HAVE_WCSNCPY''@|$(HAVE_WCSNCPY)|g' \
+	      -e 's|@''HAVE_WCPNCPY''@|$(HAVE_WCPNCPY)|g' \
+	      -e 's|@''HAVE_WCSCAT''@|$(HAVE_WCSCAT)|g' \
+	      -e 's|@''HAVE_WCSNCAT''@|$(HAVE_WCSNCAT)|g' \
+	      -e 's|@''HAVE_WCSCMP''@|$(HAVE_WCSCMP)|g' \
+	      -e 's|@''HAVE_WCSNCMP''@|$(HAVE_WCSNCMP)|g' \
+	      -e 's|@''HAVE_WCSCASECMP''@|$(HAVE_WCSCASECMP)|g' \
+	      -e 's|@''HAVE_WCSNCASECMP''@|$(HAVE_WCSNCASECMP)|g' \
+	      -e 's|@''HAVE_WCSCOLL''@|$(HAVE_WCSCOLL)|g' \
+	      -e 's|@''HAVE_WCSXFRM''@|$(HAVE_WCSXFRM)|g' \
+	      -e 's|@''HAVE_WCSDUP''@|$(HAVE_WCSDUP)|g' \
+	      -e 's|@''HAVE_WCSCHR''@|$(HAVE_WCSCHR)|g' \
+	      -e 's|@''HAVE_WCSRCHR''@|$(HAVE_WCSRCHR)|g' \
+	      -e 's|@''HAVE_WCSCSPN''@|$(HAVE_WCSCSPN)|g' \
+	      -e 's|@''HAVE_WCSSPN''@|$(HAVE_WCSSPN)|g' \
+	      -e 's|@''HAVE_WCSPBRK''@|$(HAVE_WCSPBRK)|g' \
+	      -e 's|@''HAVE_WCSSTR''@|$(HAVE_WCSSTR)|g' \
+	      -e 's|@''HAVE_WCSTOK''@|$(HAVE_WCSTOK)|g' \
+	      -e 's|@''HAVE_WCSWIDTH''@|$(HAVE_WCSWIDTH)|g' \
+	      -e 's|@''HAVE_WCSFTIME''@|$(HAVE_WCSFTIME)|g' \
+	      -e 's|@''HAVE_DECL_WCTOB''@|$(HAVE_DECL_WCTOB)|g' \
+	      -e 's|@''HAVE_DECL_WCWIDTH''@|$(HAVE_DECL_WCWIDTH)|g' \
+	  | \
+	  sed -e 's|@''REPLACE_MBSTATE_T''@|$(REPLACE_MBSTATE_T)|g' \
+	      -e 's|@''REPLACE_BTOWC''@|$(REPLACE_BTOWC)|g' \
+	      -e 's|@''REPLACE_WCTOB''@|$(REPLACE_WCTOB)|g' \
+	      -e 's|@''REPLACE_MBSINIT''@|$(REPLACE_MBSINIT)|g' \
+	      -e 's|@''REPLACE_MBRTOWC''@|$(REPLACE_MBRTOWC)|g' \
+	      -e 's|@''REPLACE_MBRLEN''@|$(REPLACE_MBRLEN)|g' \
+	      -e 's|@''REPLACE_MBSRTOWCS''@|$(REPLACE_MBSRTOWCS)|g' \
+	      -e 's|@''REPLACE_MBSNRTOWCS''@|$(REPLACE_MBSNRTOWCS)|g' \
+	      -e 's|@''REPLACE_WCRTOMB''@|$(REPLACE_WCRTOMB)|g' \
+	      -e 's|@''REPLACE_WCSRTOMBS''@|$(REPLACE_WCSRTOMBS)|g' \
+	      -e 's|@''REPLACE_WCSNRTOMBS''@|$(REPLACE_WCSNRTOMBS)|g' \
+	      -e 's|@''REPLACE_WCWIDTH''@|$(REPLACE_WCWIDTH)|g' \
+	      -e 's|@''REPLACE_WCSWIDTH''@|$(REPLACE_WCSWIDTH)|g' \
+	      -e 's|@''REPLACE_WCSFTIME''@|$(REPLACE_WCSFTIME)|g' \
+	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \
+	} > $@-t && \
+	mv $@-t $@
+MOSTLYCLEANFILES += wchar.h wchar.h-t
+
+EXTRA_DIST += wchar.in.h
+
+## end   gnulib module wchar
+
+## begin gnulib module wcrtomb
+
+
+EXTRA_DIST += wcrtomb.c
+
+EXTRA_libgnu_la_SOURCES += wcrtomb.c
+
+## end   gnulib module wcrtomb
+
+## begin gnulib module wctype-h
+
+BUILT_SOURCES += wctype.h
+libgnu_la_SOURCES += wctype-h.c
+
+# We need the following in order to create <wctype.h> when the system
+# doesn't have one that works with the given compiler.
+wctype.h: wctype.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
+	      -e 's/@''HAVE_WCTYPE_H''@/$(HAVE_WCTYPE_H)/g' \
+	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+	      -e 's|@''NEXT_WCTYPE_H''@|$(NEXT_WCTYPE_H)|g' \
+	      -e 's/@''HAVE_CRTDEFS_H''@/$(HAVE_CRTDEFS_H)/g' \
+	      -e 's/@''GNULIB_OVERRIDES_WINT_T''@/$(GNULIB_OVERRIDES_WINT_T)/g' \
+	      -e 's/@''GNULIB_ISWBLANK''@/$(GNULIB_ISWBLANK)/g' \
+	      -e 's/@''GNULIB_WCTYPE''@/$(GNULIB_WCTYPE)/g' \
+	      -e 's/@''GNULIB_ISWCTYPE''@/$(GNULIB_ISWCTYPE)/g' \
+	      -e 's/@''GNULIB_WCTRANS''@/$(GNULIB_WCTRANS)/g' \
+	      -e 's/@''GNULIB_TOWCTRANS''@/$(GNULIB_TOWCTRANS)/g' \
+	      -e 's/@''HAVE_ISWBLANK''@/$(HAVE_ISWBLANK)/g' \
+	      -e 's/@''HAVE_ISWCNTRL''@/$(HAVE_ISWCNTRL)/g' \
+	      -e 's/@''HAVE_WCTYPE_T''@/$(HAVE_WCTYPE_T)/g' \
+	      -e 's/@''HAVE_WCTRANS_T''@/$(HAVE_WCTRANS_T)/g' \
+	      -e 's/@''HAVE_WINT_T''@/$(HAVE_WINT_T)/g' \
+	      -e 's/@''REPLACE_ISWBLANK''@/$(REPLACE_ISWBLANK)/g' \
+	      -e 's/@''REPLACE_ISWCNTRL''@/$(REPLACE_ISWCNTRL)/g' \
+	      -e 's/@''REPLACE_TOWLOWER''@/$(REPLACE_TOWLOWER)/g' \
+	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+	      < $(srcdir)/wctype.in.h; \
+	} > $@-t && \
+	mv $@-t $@
+MOSTLYCLEANFILES += wctype.h wctype.h-t
+
+EXTRA_DIST += wctype.in.h
+
+## end   gnulib module wctype-h
+
+## begin gnulib module xalloc-oversized
+
+
+EXTRA_DIST += xalloc-oversized.h
+
+## end   gnulib module xalloc-oversized
+
+
+mostlyclean-local: mostlyclean-generic
+	@for dir in '' $(MOSTLYCLEANDIRS); do \
+	  if test -n "$$dir" && test -d $$dir; then \
+	    echo "rmdir $$dir"; rmdir $$dir; \
+	  fi; \
+	done; \
+	:
diff --git a/gl/Makefile.in b/gl/Makefile.in
new file mode 100644
index 0000000..d35fe62
--- /dev/null
+++ b/gl/Makefile.in
@@ -0,0 +1,2289 @@
+# Makefile.in generated by automake 1.14 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# Copyright (C) 2002-2017 Free Software Foundation, Inc.
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this file.  If not, see <http://www.gnu.org/licenses/>.
+#
+# As a special exception to the GNU General Public License,
+# this file may be distributed as part of a program that
+# contains a configuration script generated by Autoconf, under
+# the same distribution terms as the rest of that program.
+#
+# Generated by gnulib-tool.
+# Reproduce by: gnulib-tool --import --lib=libgnu --source-base=gl --m4-base=gl/m4 --doc-base=gl/doc --tests-base=tests --aux-dir=conf --lgpl --no-conditional-dependencies --libtool --macro-prefix=gl byteswap mkstemps regex
+
+
+
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = gl
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/conf/depcomp $(noinst_HEADERS)
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/gl/m4/00gnulib.m4 \
+	$(top_srcdir)/gl/m4/absolute-header.m4 \
+	$(top_srcdir)/gl/m4/alloca.m4 $(top_srcdir)/gl/m4/btowc.m4 \
+	$(top_srcdir)/gl/m4/builtin-expect.m4 \
+	$(top_srcdir)/gl/m4/byteswap.m4 $(top_srcdir)/gl/m4/codeset.m4 \
+	$(top_srcdir)/gl/m4/configmake.m4 \
+	$(top_srcdir)/gl/m4/eealloc.m4 \
+	$(top_srcdir)/gl/m4/extensions.m4 \
+	$(top_srcdir)/gl/m4/extern-inline.m4 \
+	$(top_srcdir)/gl/m4/fcntl-o.m4 $(top_srcdir)/gl/m4/fcntl_h.m4 \
+	$(top_srcdir)/gl/m4/gettimeofday.m4 \
+	$(top_srcdir)/gl/m4/glibc21.m4 \
+	$(top_srcdir)/gl/m4/gnulib-common.m4 \
+	$(top_srcdir)/gl/m4/gnulib-comp.m4 \
+	$(top_srcdir)/gl/m4/gnulib-tool.m4 \
+	$(top_srcdir)/gl/m4/hard-locale.m4 \
+	$(top_srcdir)/gl/m4/include_next.m4 \
+	$(top_srcdir)/gl/m4/langinfo_h.m4 \
+	$(top_srcdir)/gl/m4/largefile.m4 $(top_srcdir)/gl/m4/lib-ld.m4 \
+	$(top_srcdir)/gl/m4/lib-link.m4 \
+	$(top_srcdir)/gl/m4/lib-prefix.m4 \
+	$(top_srcdir)/gl/m4/limits-h.m4 \
+	$(top_srcdir)/gl/m4/localcharset.m4 \
+	$(top_srcdir)/gl/m4/locale-fr.m4 \
+	$(top_srcdir)/gl/m4/locale-ja.m4 \
+	$(top_srcdir)/gl/m4/locale-zh.m4 \
+	$(top_srcdir)/gl/m4/locale_h.m4 \
+	$(top_srcdir)/gl/m4/localeconv.m4 \
+	$(top_srcdir)/gl/m4/localtime-buffer.m4 \
+	$(top_srcdir)/gl/m4/lock.m4 $(top_srcdir)/gl/m4/longlong.m4 \
+	$(top_srcdir)/gl/m4/lstat.m4 $(top_srcdir)/gl/m4/malloca.m4 \
+	$(top_srcdir)/gl/m4/mbrtowc.m4 $(top_srcdir)/gl/m4/mbsinit.m4 \
+	$(top_srcdir)/gl/m4/mbstate_t.m4 $(top_srcdir)/gl/m4/mbtowc.m4 \
+	$(top_srcdir)/gl/m4/mkstemps.m4 \
+	$(top_srcdir)/gl/m4/multiarch.m4 \
+	$(top_srcdir)/gl/m4/nl_langinfo.m4 \
+	$(top_srcdir)/gl/m4/off_t.m4 $(top_srcdir)/gl/m4/pathmax.m4 \
+	$(top_srcdir)/gl/m4/pthread_rwlock_rdlock.m4 \
+	$(top_srcdir)/gl/m4/regex.m4 $(top_srcdir)/gl/m4/ssize_t.m4 \
+	$(top_srcdir)/gl/m4/stat.m4 $(top_srcdir)/gl/m4/stdbool.m4 \
+	$(top_srcdir)/gl/m4/stddef_h.m4 $(top_srcdir)/gl/m4/stdint.m4 \
+	$(top_srcdir)/gl/m4/stdlib_h.m4 \
+	$(top_srcdir)/gl/m4/sys_socket_h.m4 \
+	$(top_srcdir)/gl/m4/sys_stat_h.m4 \
+	$(top_srcdir)/gl/m4/sys_time_h.m4 \
+	$(top_srcdir)/gl/m4/sys_types_h.m4 \
+	$(top_srcdir)/gl/m4/tempname.m4 \
+	$(top_srcdir)/gl/m4/threadlib.m4 $(top_srcdir)/gl/m4/time_h.m4 \
+	$(top_srcdir)/gl/m4/unistd_h.m4 \
+	$(top_srcdir)/gl/m4/warn-on-use.m4 \
+	$(top_srcdir)/gl/m4/wchar_h.m4 $(top_srcdir)/gl/m4/wchar_t.m4 \
+	$(top_srcdir)/gl/m4/wcrtomb.m4 $(top_srcdir)/gl/m4/wctype_h.m4 \
+	$(top_srcdir)/gl/m4/wint_t.m4 $(top_srcdir)/conf/acinclude.m4 \
+	$(top_srcdir)/conf/cppunit.m4 \
+	$(top_srcdir)/conf/gcov_valgrind.m4 \
+	$(top_srcdir)/conf/libtool.m4 $(top_srcdir)/conf/ltoptions.m4 \
+	$(top_srcdir)/conf/ltsugar.m4 $(top_srcdir)/conf/ltversion.m4 \
+	$(top_srcdir)/conf/lt~obsolete.m4 $(top_srcdir)/conf/pkg.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h \
+	$(top_builddir)/dods-datatypes-config.h \
+	$(top_builddir)/xdr-datatypes-config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+am__DEPENDENCIES_1 =
+am__dirstamp = $(am__leading_dot)dirstamp
+am_libgnu_la_OBJECTS = hard-locale.lo localcharset.lo glthread/lock.lo \
+	malloca.lo tempname.lo glthread/threadlib.lo unistd.lo \
+	wctype-h.lo
+libgnu_la_OBJECTS = $(am_libgnu_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+libgnu_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(libgnu_la_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/conf/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libgnu_la_SOURCES) $(EXTRA_libgnu_la_SOURCES)
+DIST_SOURCES = $(libgnu_la_SOURCES) $(EXTRA_libgnu_la_SOURCES)
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+HEADERS = $(noinst_HEADERS)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
+pkglibexecdir = @pkglibexecdir@
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALLOCA_H = @ALLOCA_H@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
+AR = @AR@
+ARFLAGS = @ARFLAGS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BITSIZEOF_PTRDIFF_T = @BITSIZEOF_PTRDIFF_T@
+BITSIZEOF_SIG_ATOMIC_T = @BITSIZEOF_SIG_ATOMIC_T@
+BITSIZEOF_SIZE_T = @BITSIZEOF_SIZE_T@
+BITSIZEOF_WCHAR_T = @BITSIZEOF_WCHAR_T@
+BITSIZEOF_WINT_T = @BITSIZEOF_WINT_T@
+BYTESWAP_H = @BYTESWAP_H@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CLIENTLIB_AGE = @CLIENTLIB_AGE@
+CLIENTLIB_CURRENT = @CLIENTLIB_CURRENT@
+CLIENTLIB_REVISION = @CLIENTLIB_REVISION@
+CLIENTLIB_VERSION = @CLIENTLIB_VERSION@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@
+CPPUNIT_CONFIG = @CPPUNIT_CONFIG@
+CPPUNIT_LIBS = @CPPUNIT_LIBS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_LIBS = @CURL_LIBS@
+CURL_STATIC_LIBS = @CURL_STATIC_LIBS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DAPLIB_AGE = @DAPLIB_AGE@
+DAPLIB_CURRENT = @DAPLIB_CURRENT@
+DAPLIB_REVISION = @DAPLIB_REVISION@
+DAP_PROTOCOL_VERSION = @DAP_PROTOCOL_VERSION@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+DVR = @DVR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GLIBC21 = @GLIBC21@
+GNULIB_ATOLL = @GNULIB_ATOLL@
+GNULIB_BTOWC = @GNULIB_BTOWC@
+GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@
+GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
+GNULIB_CHDIR = @GNULIB_CHDIR@
+GNULIB_CHOWN = @GNULIB_CHOWN@
+GNULIB_CLOSE = @GNULIB_CLOSE@
+GNULIB_CTIME = @GNULIB_CTIME@
+GNULIB_DUP = @GNULIB_DUP@
+GNULIB_DUP2 = @GNULIB_DUP2@
+GNULIB_DUP3 = @GNULIB_DUP3@
+GNULIB_DUPLOCALE = @GNULIB_DUPLOCALE@
+GNULIB_ENVIRON = @GNULIB_ENVIRON@
+GNULIB_EUIDACCESS = @GNULIB_EUIDACCESS@
+GNULIB_FACCESSAT = @GNULIB_FACCESSAT@
+GNULIB_FCHDIR = @GNULIB_FCHDIR@
+GNULIB_FCHMODAT = @GNULIB_FCHMODAT@
+GNULIB_FCHOWNAT = @GNULIB_FCHOWNAT@
+GNULIB_FCNTL = @GNULIB_FCNTL@
+GNULIB_FDATASYNC = @GNULIB_FDATASYNC@
+GNULIB_FSTAT = @GNULIB_FSTAT@
+GNULIB_FSTATAT = @GNULIB_FSTATAT@
+GNULIB_FSYNC = @GNULIB_FSYNC@
+GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@
+GNULIB_FUTIMENS = @GNULIB_FUTIMENS@
+GNULIB_GETCWD = @GNULIB_GETCWD@
+GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@
+GNULIB_GETDTABLESIZE = @GNULIB_GETDTABLESIZE@
+GNULIB_GETGROUPS = @GNULIB_GETGROUPS@
+GNULIB_GETHOSTNAME = @GNULIB_GETHOSTNAME@
+GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@
+GNULIB_GETLOGIN = @GNULIB_GETLOGIN@
+GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@
+GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@
+GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@
+GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@
+GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@
+GNULIB_GRANTPT = @GNULIB_GRANTPT@
+GNULIB_GROUP_MEMBER = @GNULIB_GROUP_MEMBER@
+GNULIB_ISATTY = @GNULIB_ISATTY@
+GNULIB_ISWBLANK = @GNULIB_ISWBLANK@
+GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@
+GNULIB_LCHMOD = @GNULIB_LCHMOD@
+GNULIB_LCHOWN = @GNULIB_LCHOWN@
+GNULIB_LINK = @GNULIB_LINK@
+GNULIB_LINKAT = @GNULIB_LINKAT@
+GNULIB_LOCALECONV = @GNULIB_LOCALECONV@
+GNULIB_LOCALTIME = @GNULIB_LOCALTIME@
+GNULIB_LSEEK = @GNULIB_LSEEK@
+GNULIB_LSTAT = @GNULIB_LSTAT@
+GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@
+GNULIB_MBRLEN = @GNULIB_MBRLEN@
+GNULIB_MBRTOWC = @GNULIB_MBRTOWC@
+GNULIB_MBSINIT = @GNULIB_MBSINIT@
+GNULIB_MBSNRTOWCS = @GNULIB_MBSNRTOWCS@
+GNULIB_MBSRTOWCS = @GNULIB_MBSRTOWCS@
+GNULIB_MBTOWC = @GNULIB_MBTOWC@
+GNULIB_MKDIRAT = @GNULIB_MKDIRAT@
+GNULIB_MKDTEMP = @GNULIB_MKDTEMP@
+GNULIB_MKFIFO = @GNULIB_MKFIFO@
+GNULIB_MKFIFOAT = @GNULIB_MKFIFOAT@
+GNULIB_MKNOD = @GNULIB_MKNOD@
+GNULIB_MKNODAT = @GNULIB_MKNODAT@
+GNULIB_MKOSTEMP = @GNULIB_MKOSTEMP@
+GNULIB_MKOSTEMPS = @GNULIB_MKOSTEMPS@
+GNULIB_MKSTEMP = @GNULIB_MKSTEMP@
+GNULIB_MKSTEMPS = @GNULIB_MKSTEMPS@
+GNULIB_MKTIME = @GNULIB_MKTIME@
+GNULIB_NANOSLEEP = @GNULIB_NANOSLEEP@
+GNULIB_NL_LANGINFO = @GNULIB_NL_LANGINFO@
+GNULIB_NONBLOCKING = @GNULIB_NONBLOCKING@
+GNULIB_OPEN = @GNULIB_OPEN@
+GNULIB_OPENAT = @GNULIB_OPENAT@
+GNULIB_OVERRIDES_STRUCT_STAT = @GNULIB_OVERRIDES_STRUCT_STAT@
+GNULIB_OVERRIDES_WINT_T = @GNULIB_OVERRIDES_WINT_T@
+GNULIB_PIPE = @GNULIB_PIPE@
+GNULIB_PIPE2 = @GNULIB_PIPE2@
+GNULIB_POSIX_OPENPT = @GNULIB_POSIX_OPENPT@
+GNULIB_PREAD = @GNULIB_PREAD@
+GNULIB_PTSNAME = @GNULIB_PTSNAME@
+GNULIB_PTSNAME_R = @GNULIB_PTSNAME_R@
+GNULIB_PUTENV = @GNULIB_PUTENV@
+GNULIB_PWRITE = @GNULIB_PWRITE@
+GNULIB_QSORT_R = @GNULIB_QSORT_R@
+GNULIB_RANDOM = @GNULIB_RANDOM@
+GNULIB_RANDOM_R = @GNULIB_RANDOM_R@
+GNULIB_READ = @GNULIB_READ@
+GNULIB_READLINK = @GNULIB_READLINK@
+GNULIB_READLINKAT = @GNULIB_READLINKAT@
+GNULIB_REALLOCARRAY = @GNULIB_REALLOCARRAY@
+GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@
+GNULIB_REALPATH = @GNULIB_REALPATH@
+GNULIB_RMDIR = @GNULIB_RMDIR@
+GNULIB_RPMATCH = @GNULIB_RPMATCH@
+GNULIB_SECURE_GETENV = @GNULIB_SECURE_GETENV@
+GNULIB_SETENV = @GNULIB_SETENV@
+GNULIB_SETHOSTNAME = @GNULIB_SETHOSTNAME@
+GNULIB_SETLOCALE = @GNULIB_SETLOCALE@
+GNULIB_SLEEP = @GNULIB_SLEEP@
+GNULIB_STAT = @GNULIB_STAT@
+GNULIB_STRFTIME = @GNULIB_STRFTIME@
+GNULIB_STRPTIME = @GNULIB_STRPTIME@
+GNULIB_STRTOD = @GNULIB_STRTOD@
+GNULIB_STRTOLL = @GNULIB_STRTOLL@
+GNULIB_STRTOULL = @GNULIB_STRTOULL@
+GNULIB_SYMLINK = @GNULIB_SYMLINK@
+GNULIB_SYMLINKAT = @GNULIB_SYMLINKAT@
+GNULIB_SYSTEM_POSIX = @GNULIB_SYSTEM_POSIX@
+GNULIB_TIMEGM = @GNULIB_TIMEGM@
+GNULIB_TIME_R = @GNULIB_TIME_R@
+GNULIB_TIME_RZ = @GNULIB_TIME_RZ@
+GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@
+GNULIB_TRUNCATE = @GNULIB_TRUNCATE@
+GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@
+GNULIB_TZSET = @GNULIB_TZSET@
+GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@
+GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@
+GNULIB_UNLINK = @GNULIB_UNLINK@
+GNULIB_UNLINKAT = @GNULIB_UNLINKAT@
+GNULIB_UNLOCKPT = @GNULIB_UNLOCKPT@
+GNULIB_UNSETENV = @GNULIB_UNSETENV@
+GNULIB_USLEEP = @GNULIB_USLEEP@
+GNULIB_UTIMENSAT = @GNULIB_UTIMENSAT@
+GNULIB_WCPCPY = @GNULIB_WCPCPY@
+GNULIB_WCPNCPY = @GNULIB_WCPNCPY@
+GNULIB_WCRTOMB = @GNULIB_WCRTOMB@
+GNULIB_WCSCASECMP = @GNULIB_WCSCASECMP@
+GNULIB_WCSCAT = @GNULIB_WCSCAT@
+GNULIB_WCSCHR = @GNULIB_WCSCHR@
+GNULIB_WCSCMP = @GNULIB_WCSCMP@
+GNULIB_WCSCOLL = @GNULIB_WCSCOLL@
+GNULIB_WCSCPY = @GNULIB_WCSCPY@
+GNULIB_WCSCSPN = @GNULIB_WCSCSPN@
+GNULIB_WCSDUP = @GNULIB_WCSDUP@
+GNULIB_WCSFTIME = @GNULIB_WCSFTIME@
+GNULIB_WCSLEN = @GNULIB_WCSLEN@
+GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@
+GNULIB_WCSNCAT = @GNULIB_WCSNCAT@
+GNULIB_WCSNCMP = @GNULIB_WCSNCMP@
+GNULIB_WCSNCPY = @GNULIB_WCSNCPY@
+GNULIB_WCSNLEN = @GNULIB_WCSNLEN@
+GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@
+GNULIB_WCSPBRK = @GNULIB_WCSPBRK@
+GNULIB_WCSRCHR = @GNULIB_WCSRCHR@
+GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@
+GNULIB_WCSSPN = @GNULIB_WCSSPN@
+GNULIB_WCSSTR = @GNULIB_WCSSTR@
+GNULIB_WCSTOK = @GNULIB_WCSTOK@
+GNULIB_WCSWIDTH = @GNULIB_WCSWIDTH@
+GNULIB_WCSXFRM = @GNULIB_WCSXFRM@
+GNULIB_WCTOB = @GNULIB_WCTOB@
+GNULIB_WCTOMB = @GNULIB_WCTOMB@
+GNULIB_WCTRANS = @GNULIB_WCTRANS@
+GNULIB_WCTYPE = @GNULIB_WCTYPE@
+GNULIB_WCWIDTH = @GNULIB_WCWIDTH@
+GNULIB_WMEMCHR = @GNULIB_WMEMCHR@
+GNULIB_WMEMCMP = @GNULIB_WMEMCMP@
+GNULIB_WMEMCPY = @GNULIB_WMEMCPY@
+GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@
+GNULIB_WMEMSET = @GNULIB_WMEMSET@
+GNULIB_WRITE = @GNULIB_WRITE@
+GNULIB__EXIT = @GNULIB__EXIT@
+GREP = @GREP@
+HAVE_ATOLL = @HAVE_ATOLL@
+HAVE_BTOWC = @HAVE_BTOWC@
+HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@
+HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
+HAVE_CHOWN = @HAVE_CHOWN@
+HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@
+HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
+HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@
+HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@
+HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@
+HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@
+HAVE_DECL_GETLOGIN = @HAVE_DECL_GETLOGIN@
+HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@
+HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@
+HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@
+HAVE_DECL_INITSTATE = @HAVE_DECL_INITSTATE@
+HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@
+HAVE_DECL_SETENV = @HAVE_DECL_SETENV@
+HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@
+HAVE_DECL_SETSTATE = @HAVE_DECL_SETSTATE@
+HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@
+HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@
+HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@
+HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@
+HAVE_DUP2 = @HAVE_DUP2@
+HAVE_DUP3 = @HAVE_DUP3@
+HAVE_DUPLOCALE = @HAVE_DUPLOCALE@
+HAVE_EUIDACCESS = @HAVE_EUIDACCESS@
+HAVE_FACCESSAT = @HAVE_FACCESSAT@
+HAVE_FCHDIR = @HAVE_FCHDIR@
+HAVE_FCHMODAT = @HAVE_FCHMODAT@
+HAVE_FCHOWNAT = @HAVE_FCHOWNAT@
+HAVE_FCNTL = @HAVE_FCNTL@
+HAVE_FDATASYNC = @HAVE_FDATASYNC@
+HAVE_FEATURES_H = @HAVE_FEATURES_H@
+HAVE_FSTATAT = @HAVE_FSTATAT@
+HAVE_FSYNC = @HAVE_FSYNC@
+HAVE_FTRUNCATE = @HAVE_FTRUNCATE@
+HAVE_FUTIMENS = @HAVE_FUTIMENS@
+HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@
+HAVE_GETGROUPS = @HAVE_GETGROUPS@
+HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@
+HAVE_GETLOGIN = @HAVE_GETLOGIN@
+HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@
+HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
+HAVE_GETTIMEOFDAY = @HAVE_GETTIMEOFDAY@
+HAVE_GRANTPT = @HAVE_GRANTPT@
+HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
+HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
+HAVE_ISWBLANK = @HAVE_ISWBLANK@
+HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
+HAVE_LANGINFO_CODESET = @HAVE_LANGINFO_CODESET@
+HAVE_LANGINFO_ERA = @HAVE_LANGINFO_ERA@
+HAVE_LANGINFO_H = @HAVE_LANGINFO_H@
+HAVE_LANGINFO_T_FMT_AMPM = @HAVE_LANGINFO_T_FMT_AMPM@
+HAVE_LANGINFO_YESEXPR = @HAVE_LANGINFO_YESEXPR@
+HAVE_LCHMOD = @HAVE_LCHMOD@
+HAVE_LCHOWN = @HAVE_LCHOWN@
+HAVE_LINK = @HAVE_LINK@
+HAVE_LINKAT = @HAVE_LINKAT@
+HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@
+HAVE_LSTAT = @HAVE_LSTAT@
+HAVE_MAX_ALIGN_T = @HAVE_MAX_ALIGN_T@
+HAVE_MBRLEN = @HAVE_MBRLEN@
+HAVE_MBRTOWC = @HAVE_MBRTOWC@
+HAVE_MBSINIT = @HAVE_MBSINIT@
+HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@
+HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@
+HAVE_MKDIRAT = @HAVE_MKDIRAT@
+HAVE_MKDTEMP = @HAVE_MKDTEMP@
+HAVE_MKFIFO = @HAVE_MKFIFO@
+HAVE_MKFIFOAT = @HAVE_MKFIFOAT@
+HAVE_MKNOD = @HAVE_MKNOD@
+HAVE_MKNODAT = @HAVE_MKNODAT@
+HAVE_MKOSTEMP = @HAVE_MKOSTEMP@
+HAVE_MKOSTEMPS = @HAVE_MKOSTEMPS@
+HAVE_MKSTEMP = @HAVE_MKSTEMP@
+HAVE_MKSTEMPS = @HAVE_MKSTEMPS@
+HAVE_NANOSLEEP = @HAVE_NANOSLEEP@
+HAVE_NL_LANGINFO = @HAVE_NL_LANGINFO@
+HAVE_OPENAT = @HAVE_OPENAT@
+HAVE_OS_H = @HAVE_OS_H@
+HAVE_PIPE = @HAVE_PIPE@
+HAVE_PIPE2 = @HAVE_PIPE2@
+HAVE_POSIX_OPENPT = @HAVE_POSIX_OPENPT@
+HAVE_PREAD = @HAVE_PREAD@
+HAVE_PTSNAME = @HAVE_PTSNAME@
+HAVE_PTSNAME_R = @HAVE_PTSNAME_R@
+HAVE_PWRITE = @HAVE_PWRITE@
+HAVE_QSORT_R = @HAVE_QSORT_R@
+HAVE_RANDOM = @HAVE_RANDOM@
+HAVE_RANDOM_H = @HAVE_RANDOM_H@
+HAVE_RANDOM_R = @HAVE_RANDOM_R@
+HAVE_READLINK = @HAVE_READLINK@
+HAVE_READLINKAT = @HAVE_READLINKAT@
+HAVE_REALLOCARRAY = @HAVE_REALLOCARRAY@
+HAVE_REALPATH = @HAVE_REALPATH@
+HAVE_RPMATCH = @HAVE_RPMATCH@
+HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@
+HAVE_SETENV = @HAVE_SETENV@
+HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@
+HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
+HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
+HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@
+HAVE_SLEEP = @HAVE_SLEEP@
+HAVE_STDINT_H = @HAVE_STDINT_H@
+HAVE_STRPTIME = @HAVE_STRPTIME@
+HAVE_STRTOD = @HAVE_STRTOD@
+HAVE_STRTOLL = @HAVE_STRTOLL@
+HAVE_STRTOULL = @HAVE_STRTOULL@
+HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@
+HAVE_STRUCT_TIMEVAL = @HAVE_STRUCT_TIMEVAL@
+HAVE_SYMLINK = @HAVE_SYMLINK@
+HAVE_SYMLINKAT = @HAVE_SYMLINKAT@
+HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@
+HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@
+HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@
+HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@
+HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@
+HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
+HAVE_TIMEGM = @HAVE_TIMEGM@
+HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@
+HAVE_TRUNCATE = @HAVE_TRUNCATE@
+HAVE_TZSET = @HAVE_TZSET@
+HAVE_UNISTD_H = @HAVE_UNISTD_H@
+HAVE_UNLINKAT = @HAVE_UNLINKAT@
+HAVE_UNLOCKPT = @HAVE_UNLOCKPT@
+HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@
+HAVE_USLEEP = @HAVE_USLEEP@
+HAVE_UTIMENSAT = @HAVE_UTIMENSAT@
+HAVE_VALGRIND = @HAVE_VALGRIND@
+HAVE_WCHAR_H = @HAVE_WCHAR_H@
+HAVE_WCHAR_T = @HAVE_WCHAR_T@
+HAVE_WCPCPY = @HAVE_WCPCPY@
+HAVE_WCPNCPY = @HAVE_WCPNCPY@
+HAVE_WCRTOMB = @HAVE_WCRTOMB@
+HAVE_WCSCASECMP = @HAVE_WCSCASECMP@
+HAVE_WCSCAT = @HAVE_WCSCAT@
+HAVE_WCSCHR = @HAVE_WCSCHR@
+HAVE_WCSCMP = @HAVE_WCSCMP@
+HAVE_WCSCOLL = @HAVE_WCSCOLL@
+HAVE_WCSCPY = @HAVE_WCSCPY@
+HAVE_WCSCSPN = @HAVE_WCSCSPN@
+HAVE_WCSDUP = @HAVE_WCSDUP@
+HAVE_WCSFTIME = @HAVE_WCSFTIME@
+HAVE_WCSLEN = @HAVE_WCSLEN@
+HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@
+HAVE_WCSNCAT = @HAVE_WCSNCAT@
+HAVE_WCSNCMP = @HAVE_WCSNCMP@
+HAVE_WCSNCPY = @HAVE_WCSNCPY@
+HAVE_WCSNLEN = @HAVE_WCSNLEN@
+HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@
+HAVE_WCSPBRK = @HAVE_WCSPBRK@
+HAVE_WCSRCHR = @HAVE_WCSRCHR@
+HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@
+HAVE_WCSSPN = @HAVE_WCSSPN@
+HAVE_WCSSTR = @HAVE_WCSSTR@
+HAVE_WCSTOK = @HAVE_WCSTOK@
+HAVE_WCSWIDTH = @HAVE_WCSWIDTH@
+HAVE_WCSXFRM = @HAVE_WCSXFRM@
+HAVE_WCTRANS_T = @HAVE_WCTRANS_T@
+HAVE_WCTYPE_H = @HAVE_WCTYPE_H@
+HAVE_WCTYPE_T = @HAVE_WCTYPE_T@
+HAVE_WINSOCK2_H = @HAVE_WINSOCK2_H@
+HAVE_WINT_T = @HAVE_WINT_T@
+HAVE_WMEMCHR = @HAVE_WMEMCHR@
+HAVE_WMEMCMP = @HAVE_WMEMCMP@
+HAVE_WMEMCPY = @HAVE_WMEMCPY@
+HAVE_WMEMMOVE = @HAVE_WMEMMOVE@
+HAVE_WMEMSET = @HAVE_WMEMSET@
+HAVE_XLOCALE_H = @HAVE_XLOCALE_H@
+HAVE__BOOL = @HAVE__BOOL@
+HAVE__EXIT = @HAVE__EXIT@
+INCLUDE_NEXT = @INCLUDE_NEXT@
+INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBDAP_VERSION = @LIBDAP_VERSION@
+LIBINTL = @LIBINTL@
+LIBMULTITHREAD = @LIBMULTITHREAD@
+LIBOBJS = @LIBOBJS@
+LIBPTH = @LIBPTH@
+LIBPTH_PREFIX = @LIBPTH_PREFIX@
+LIBS = @LIBS@
+LIBTHREAD = @LIBTHREAD@
+LIBTOOL = @LIBTOOL@
+LIMITS_H = @LIMITS_H@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@
+LOCALE_FR = @LOCALE_FR@
+LOCALE_FR_UTF8 = @LOCALE_FR_UTF8@
+LOCALE_JA = @LOCALE_JA@
+LOCALE_ZH_CN = @LOCALE_ZH_CN@
+LTLIBINTL = @LTLIBINTL@
+LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
+LTLIBOBJS = @LTLIBOBJS@
+LTLIBPTH = @LTLIBPTH@
+LTLIBTHREAD = @LTLIBTHREAD@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@
+NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H = @NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H@
+NEXT_AS_FIRST_DIRECTIVE_LIMITS_H = @NEXT_AS_FIRST_DIRECTIVE_LIMITS_H@
+NEXT_AS_FIRST_DIRECTIVE_LOCALE_H = @NEXT_AS_FIRST_DIRECTIVE_LOCALE_H@
+NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@
+NEXT_AS_FIRST_DIRECTIVE_STDINT_H = @NEXT_AS_FIRST_DIRECTIVE_STDINT_H@
+NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@
+NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@
+NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@
+NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@
+NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@
+NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@
+NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@
+NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@
+NEXT_FCNTL_H = @NEXT_FCNTL_H@
+NEXT_LANGINFO_H = @NEXT_LANGINFO_H@
+NEXT_LIMITS_H = @NEXT_LIMITS_H@
+NEXT_LOCALE_H = @NEXT_LOCALE_H@
+NEXT_STDDEF_H = @NEXT_STDDEF_H@
+NEXT_STDINT_H = @NEXT_STDINT_H@
+NEXT_STDLIB_H = @NEXT_STDLIB_H@
+NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@
+NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@
+NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@
+NEXT_TIME_H = @NEXT_TIME_H@
+NEXT_UNISTD_H = @NEXT_UNISTD_H@
+NEXT_WCHAR_H = @NEXT_WCHAR_H@
+NEXT_WCTYPE_H = @NEXT_WCTYPE_H@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_MAJOR_VERSION = @PACKAGE_MAJOR_VERSION@
+PACKAGE_MINOR_VERSION = @PACKAGE_MINOR_VERSION@
+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@
+PRAGMA_COLUMNS = @PRAGMA_COLUMNS@
+PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
+PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@
+PTHREAD_LIBS = @PTHREAD_LIBS@
+PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
+RANLIB = @RANLIB@
+REPLACE_BTOWC = @REPLACE_BTOWC@
+REPLACE_CALLOC = @REPLACE_CALLOC@
+REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@
+REPLACE_CHOWN = @REPLACE_CHOWN@
+REPLACE_CLOSE = @REPLACE_CLOSE@
+REPLACE_CTIME = @REPLACE_CTIME@
+REPLACE_DUP = @REPLACE_DUP@
+REPLACE_DUP2 = @REPLACE_DUP2@
+REPLACE_DUPLOCALE = @REPLACE_DUPLOCALE@
+REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@
+REPLACE_FCNTL = @REPLACE_FCNTL@
+REPLACE_FSTAT = @REPLACE_FSTAT@
+REPLACE_FSTATAT = @REPLACE_FSTATAT@
+REPLACE_FTRUNCATE = @REPLACE_FTRUNCATE@
+REPLACE_FUTIMENS = @REPLACE_FUTIMENS@
+REPLACE_GETCWD = @REPLACE_GETCWD@
+REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@
+REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@
+REPLACE_GETGROUPS = @REPLACE_GETGROUPS@
+REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
+REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
+REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@
+REPLACE_GMTIME = @REPLACE_GMTIME@
+REPLACE_ISATTY = @REPLACE_ISATTY@
+REPLACE_ISWBLANK = @REPLACE_ISWBLANK@
+REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@
+REPLACE_LCHOWN = @REPLACE_LCHOWN@
+REPLACE_LINK = @REPLACE_LINK@
+REPLACE_LINKAT = @REPLACE_LINKAT@
+REPLACE_LOCALECONV = @REPLACE_LOCALECONV@
+REPLACE_LOCALTIME = @REPLACE_LOCALTIME@
+REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@
+REPLACE_LSEEK = @REPLACE_LSEEK@
+REPLACE_LSTAT = @REPLACE_LSTAT@
+REPLACE_MALLOC = @REPLACE_MALLOC@
+REPLACE_MBRLEN = @REPLACE_MBRLEN@
+REPLACE_MBRTOWC = @REPLACE_MBRTOWC@
+REPLACE_MBSINIT = @REPLACE_MBSINIT@
+REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@
+REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@
+REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@
+REPLACE_MBTOWC = @REPLACE_MBTOWC@
+REPLACE_MKDIR = @REPLACE_MKDIR@
+REPLACE_MKFIFO = @REPLACE_MKFIFO@
+REPLACE_MKNOD = @REPLACE_MKNOD@
+REPLACE_MKSTEMP = @REPLACE_MKSTEMP@
+REPLACE_MKTIME = @REPLACE_MKTIME@
+REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@
+REPLACE_NL_LANGINFO = @REPLACE_NL_LANGINFO@
+REPLACE_NULL = @REPLACE_NULL@
+REPLACE_OPEN = @REPLACE_OPEN@
+REPLACE_OPENAT = @REPLACE_OPENAT@
+REPLACE_PREAD = @REPLACE_PREAD@
+REPLACE_PTSNAME = @REPLACE_PTSNAME@
+REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@
+REPLACE_PUTENV = @REPLACE_PUTENV@
+REPLACE_PWRITE = @REPLACE_PWRITE@
+REPLACE_QSORT_R = @REPLACE_QSORT_R@
+REPLACE_RANDOM_R = @REPLACE_RANDOM_R@
+REPLACE_READ = @REPLACE_READ@
+REPLACE_READLINK = @REPLACE_READLINK@
+REPLACE_READLINKAT = @REPLACE_READLINKAT@
+REPLACE_REALLOC = @REPLACE_REALLOC@
+REPLACE_REALPATH = @REPLACE_REALPATH@
+REPLACE_RMDIR = @REPLACE_RMDIR@
+REPLACE_SETENV = @REPLACE_SETENV@
+REPLACE_SETLOCALE = @REPLACE_SETLOCALE@
+REPLACE_SLEEP = @REPLACE_SLEEP@
+REPLACE_STAT = @REPLACE_STAT@
+REPLACE_STRFTIME = @REPLACE_STRFTIME@
+REPLACE_STRTOD = @REPLACE_STRTOD@
+REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@
+REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@
+REPLACE_SYMLINK = @REPLACE_SYMLINK@
+REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@
+REPLACE_TIMEGM = @REPLACE_TIMEGM@
+REPLACE_TOWLOWER = @REPLACE_TOWLOWER@
+REPLACE_TRUNCATE = @REPLACE_TRUNCATE@
+REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@
+REPLACE_TZSET = @REPLACE_TZSET@
+REPLACE_UNLINK = @REPLACE_UNLINK@
+REPLACE_UNLINKAT = @REPLACE_UNLINKAT@
+REPLACE_UNSETENV = @REPLACE_UNSETENV@
+REPLACE_USLEEP = @REPLACE_USLEEP@
+REPLACE_UTIMENSAT = @REPLACE_UTIMENSAT@
+REPLACE_WCRTOMB = @REPLACE_WCRTOMB@
+REPLACE_WCSFTIME = @REPLACE_WCSFTIME@
+REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@
+REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@
+REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@
+REPLACE_WCTOB = @REPLACE_WCTOB@
+REPLACE_WCTOMB = @REPLACE_WCTOMB@
+REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
+REPLACE_WRITE = @REPLACE_WRITE@
+SED = @SED@
+SERVERLIB_AGE = @SERVERLIB_AGE@
+SERVERLIB_CURRENT = @SERVERLIB_CURRENT@
+SERVERLIB_REVISION = @SERVERLIB_REVISION@
+SERVERLIB_VERSION = @SERVERLIB_VERSION@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@
+SIZE_T_SUFFIX = @SIZE_T_SUFFIX@
+STDBOOL_H = @STDBOOL_H@
+STDDEF_H = @STDDEF_H@
+STDINT_H = @STDINT_H@
+STRIP = @STRIP@
+SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@
+TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@
+UNISTD_H_DEFINES_STRUCT_TIMESPEC = @UNISTD_H_DEFINES_STRUCT_TIMESPEC@
+UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@
+UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@
+UUID_LIBS = @UUID_LIBS@
+VERSION = @VERSION@
+WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
+WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@
+WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@
+WINDOWS_STAT_INODES = @WINDOWS_STAT_INODES@
+WINDOWS_STAT_TIMESPEC = @WINDOWS_STAT_TIMESPEC@
+WINT_T_SUFFIX = @WINT_T_SUFFIX@
+XML2_CFLAGS = @XML2_CFLAGS@
+XML2_LIBS = @XML2_LIBS@
+YACC = @YACC@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_word_order = @ac_word_order@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+curlprivatelibs = @curlprivatelibs@
+curlprivatereq = @curlprivatereq@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gl_LIBOBJS = @gl_LIBOBJS@
+gl_LTLIBOBJS = @gl_LTLIBOBJS@
+gltests_LIBOBJS = @gltests_LIBOBJS@
+gltests_LTLIBOBJS = @gltests_LTLIBOBJS@
+gltests_WITNESS = @gltests_WITNESS@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+lispdir = @lispdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+runstatedir = @runstatedir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+xmlprivatelibs = @xmlprivatelibs@
+xmlprivatereq = @xmlprivatereq@
+AUTOMAKE_OPTIONS = 1.9.6 gnits subdir-objects
+SUBDIRS = 
+noinst_HEADERS = 
+noinst_LIBRARIES = 
+noinst_LTLIBRARIES = libgnu.la
+# No GNU Make output.
+EXTRA_DIST = m4/gnulib-cache.m4 alloca.in.h btowc.c byteswap.in.h \
+	dosname.h fcntl.in.h filename.h gettimeofday.c hard-locale.h \
+	$(top_srcdir)/conf/config.rpath intprops.h langinfo.in.h \
+	limits.in.h config.charset ref-add.sin ref-del.sin locale.in.h \
+	localeconv.c localtime-buffer.c localtime-buffer.h lstat.c \
+	malloca.h malloca.valgrind mbrtowc.c mbsinit.c mbtowc-impl.h \
+	mbtowc.c mkstemps.c nl_langinfo.c pathmax.h regcomp.c regex.c \
+	regex.h regex_internal.c regex_internal.h regexec.c \
+	_Noreturn.h arg-nonnull.h c++defs.h warn-on-use.h stat-w32.c \
+	stat-w32.h stat.c stdbool.in.h stddef.in.h stdint.in.h \
+	stdlib.in.h streq.h sys_stat.in.h sys_time.in.h sys_types.in.h \
+	tempname.h $(top_srcdir)/conf/config.rpath time.in.h \
+	unistd.in.h verify.h wchar.in.h wcrtomb.c wctype.in.h \
+	xalloc-oversized.h
+BUILT_SOURCES = $(ALLOCA_H) $(BYTESWAP_H) configmake.h fcntl.h \
+	langinfo.h $(LIMITS_H) locale.h $(STDBOOL_H) $(STDDEF_H) \
+	$(STDINT_H) stdlib.h sys/stat.h sys/time.h sys/types.h time.h \
+	unistd.h wchar.h wctype.h
+SUFFIXES = .sed .sin
+MOSTLYCLEANFILES = core *.stackdump alloca.h alloca.h-t byteswap.h \
+	byteswap.h-t fcntl.h fcntl.h-t langinfo.h langinfo.h-t \
+	limits.h limits.h-t locale.h locale.h-t stdbool.h stdbool.h-t \
+	stddef.h stddef.h-t stdint.h stdint.h-t stdlib.h stdlib.h-t \
+	sys/stat.h sys/stat.h-t sys/time.h sys/time.h-t sys/types.h \
+	sys/types.h-t time.h time.h-t unistd.h unistd.h-t wchar.h \
+	wchar.h-t wctype.h wctype.h-t
+MOSTLYCLEANDIRS = sys
+CLEANFILES = configmake.h configmake.h-t charset.alias ref-add.sed \
+	ref-del.sed
+DISTCLEANFILES = 
+MAINTAINERCLEANFILES = 
+AM_CPPFLAGS = 
+AM_CFLAGS = 
+libgnu_la_SOURCES = gettext.h hard-locale.c localcharset.h \
+	localcharset.c glthread/lock.h glthread/lock.c malloca.c \
+	tempname.c glthread/threadlib.c unistd.c wctype-h.c
+libgnu_la_LIBADD = $(gl_LTLIBOBJS)
+libgnu_la_DEPENDENCIES = $(gl_LTLIBOBJS)
+EXTRA_libgnu_la_SOURCES = btowc.c gettimeofday.c localeconv.c \
+	localtime-buffer.c lstat.c mbrtowc.c mbsinit.c mbtowc.c \
+	mkstemps.c nl_langinfo.c regcomp.c regex.c regex_internal.c \
+	regexec.c stat-w32.c stat.c wcrtomb.c
+libgnu_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined $(LTLIBINTL) \
+	$(LTLIBTHREAD)
+
+# Use this preprocessor expression to decide whether #include_next works.
+# Do not rely on a 'configure'-time test for this, since the expression
+# might appear in an installed header, which is used by some other compiler.
+HAVE_INCLUDE_NEXT = (__GNUC__ || 60000000 <= __DECC_VER)
+charset_alias = $(DESTDIR)$(libdir)/charset.alias
+charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
+
+# Because this Makefile snippet defines a variable used by other
+# gnulib Makefile snippets, it must be present in all makefiles that
+# need it. This is ensured by the applicability 'all' defined above.
+_NORETURN_H = $(srcdir)/_Noreturn.h
+
+# Because this Makefile snippet defines a variable used by other
+# gnulib Makefile snippets, it must be present in all makefiles that
+# need it. This is ensured by the applicability 'all' defined above.
+ARG_NONNULL_H = $(srcdir)/arg-nonnull.h
+
+# Because this Makefile snippet defines a variable used by other
+# gnulib Makefile snippets, it must be present in all makefiles that
+# need it. This is ensured by the applicability 'all' defined above.
+CXXDEFS_H = $(srcdir)/c++defs.h
+
+# Because this Makefile snippet defines a variable used by other
+# gnulib Makefile snippets, it must be present in all makefiles that
+# need it. This is ensured by the applicability 'all' defined above.
+WARN_ON_USE_H = $(srcdir)/warn-on-use.h
+all: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+
+.SUFFIXES:
+.SUFFIXES: .sed .sin .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnits gl/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnits gl/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLIBRARIES:
+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+glthread/$(am__dirstamp):
+	@$(MKDIR_P) glthread
+	@: > glthread/$(am__dirstamp)
+glthread/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) glthread/$(DEPDIR)
+	@: > glthread/$(DEPDIR)/$(am__dirstamp)
+glthread/lock.lo: glthread/$(am__dirstamp) \
+	glthread/$(DEPDIR)/$(am__dirstamp)
+glthread/threadlib.lo: glthread/$(am__dirstamp) \
+	glthread/$(DEPDIR)/$(am__dirstamp)
+
+libgnu.la: $(libgnu_la_OBJECTS) $(libgnu_la_DEPENDENCIES) $(EXTRA_libgnu_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(libgnu_la_LINK)  $(libgnu_la_OBJECTS) $(libgnu_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+	-rm -f glthread/*.$(OBJEXT)
+	-rm -f glthread/*.lo
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/btowc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gettimeofday.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hard-locale.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/localcharset.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/localeconv.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/localtime-buffer.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lstat.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/malloca.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbrtowc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbsinit.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbtowc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkstemps.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nl_langinfo.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regcomp.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regex.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regex_internal.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regexec.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stat-w32.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stat.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tempname.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unistd.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wcrtomb.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wctype-h.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@glthread/$(DEPDIR)/lock.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@glthread/$(DEPDIR)/threadlib.Plo@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+	-rm -rf glthread/.libs glthread/_libs
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) check-recursive
+all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(HEADERS) all-local
+installdirs: installdirs-recursive
+installdirs-am:
+install: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+	-rm -f glthread/$(DEPDIR)/$(am__dirstamp)
+	-rm -f glthread/$(am__dirstamp)
+	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
+	clean-noinstLTLIBRARIES mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -rf ./$(DEPDIR) glthread/$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am: install-exec-local
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -rf ./$(DEPDIR) glthread/$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool mostlyclean-local
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-local
+
+.MAKE: $(am__recursive_targets) all check install install-am \
+	install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am all-local \
+	check check-am clean clean-generic clean-libtool \
+	clean-noinstLIBRARIES clean-noinstLTLIBRARIES cscopelist-am \
+	ctags ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-exec-local install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool mostlyclean-local pdf pdf-am ps ps-am tags \
+	tags-am uninstall uninstall-am uninstall-local
+
+
+# We need the following in order to create <alloca.h> when the system
+# doesn't have one that works with the given compiler.
+@GL_GENERATE_ALLOCA_H_TRUE@alloca.h: alloca.in.h $(top_builddir)/config.status
+@GL_GENERATE_ALLOCA_H_TRUE@	$(AM_V_GEN)rm -f $@-t $@ && \
+@GL_GENERATE_ALLOCA_H_TRUE@	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+@GL_GENERATE_ALLOCA_H_TRUE@	  cat $(srcdir)/alloca.in.h; \
+@GL_GENERATE_ALLOCA_H_TRUE@	} > $@-t && \
+@GL_GENERATE_ALLOCA_H_TRUE@	mv -f $@-t $@
+@GL_GENERATE_ALLOCA_H_FALSE@alloca.h: $(top_builddir)/config.status
+@GL_GENERATE_ALLOCA_H_FALSE@	rm -f $@
+
+# We need the following in order to create <byteswap.h> when the system
+# doesn't have one.
+@GL_GENERATE_BYTESWAP_H_TRUE@byteswap.h: byteswap.in.h $(top_builddir)/config.status
+@GL_GENERATE_BYTESWAP_H_TRUE@	$(AM_V_GEN)rm -f $@-t $@ && \
+@GL_GENERATE_BYTESWAP_H_TRUE@	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+@GL_GENERATE_BYTESWAP_H_TRUE@	  cat $(srcdir)/byteswap.in.h; \
+@GL_GENERATE_BYTESWAP_H_TRUE@	} > $@-t && \
+@GL_GENERATE_BYTESWAP_H_TRUE@	mv -f $@-t $@
+@GL_GENERATE_BYTESWAP_H_FALSE@byteswap.h: $(top_builddir)/config.status
+@GL_GENERATE_BYTESWAP_H_FALSE@	rm -f $@
+
+# Listed in the same order as the GNU makefile conventions, and
+# provided by autoconf 2.59c+ or 2.70.
+# The Automake-defined pkg* macros are appended, in the order
+# listed in the Automake 1.10a+ documentation.
+configmake.h: Makefile
+	$(AM_V_GEN)rm -f $@-t && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  echo '#define PREFIX "$(prefix)"'; \
+	  echo '#define EXEC_PREFIX "$(exec_prefix)"'; \
+	  echo '#define BINDIR "$(bindir)"'; \
+	  echo '#define SBINDIR "$(sbindir)"'; \
+	  echo '#define LIBEXECDIR "$(libexecdir)"'; \
+	  echo '#define DATAROOTDIR "$(datarootdir)"'; \
+	  echo '#define DATADIR "$(datadir)"'; \
+	  echo '#define SYSCONFDIR "$(sysconfdir)"'; \
+	  echo '#define SHAREDSTATEDIR "$(sharedstatedir)"'; \
+	  echo '#define LOCALSTATEDIR "$(localstatedir)"'; \
+	  echo '#define RUNSTATEDIR "$(runstatedir)"'; \
+	  echo '#define INCLUDEDIR "$(includedir)"'; \
+	  echo '#define OLDINCLUDEDIR "$(oldincludedir)"'; \
+	  echo '#define DOCDIR "$(docdir)"'; \
+	  echo '#define INFODIR "$(infodir)"'; \
+	  echo '#define HTMLDIR "$(htmldir)"'; \
+	  echo '#define DVIDIR "$(dvidir)"'; \
+	  echo '#define PDFDIR "$(pdfdir)"'; \
+	  echo '#define PSDIR "$(psdir)"'; \
+	  echo '#define LIBDIR "$(libdir)"'; \
+	  echo '#define LISPDIR "$(lispdir)"'; \
+	  echo '#define LOCALEDIR "$(localedir)"'; \
+	  echo '#define MANDIR "$(mandir)"'; \
+	  echo '#define MANEXT "$(manext)"'; \
+	  echo '#define PKGDATADIR "$(pkgdatadir)"'; \
+	  echo '#define PKGINCLUDEDIR "$(pkgincludedir)"'; \
+	  echo '#define PKGLIBDIR "$(pkglibdir)"'; \
+	  echo '#define PKGLIBEXECDIR "$(pkglibexecdir)"'; \
+	} | sed '/""/d' > $@-t && \
+	mv -f $@-t $@
+
+# We need the following in order to create <fcntl.h> when the system
+# doesn't have one that works with the given compiler.
+fcntl.h: fcntl.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
+	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+	      -e 's|@''NEXT_FCNTL_H''@|$(NEXT_FCNTL_H)|g' \
+	      -e 's/@''GNULIB_FCNTL''@/$(GNULIB_FCNTL)/g' \
+	      -e 's/@''GNULIB_NONBLOCKING''@/$(GNULIB_NONBLOCKING)/g' \
+	      -e 's/@''GNULIB_OPEN''@/$(GNULIB_OPEN)/g' \
+	      -e 's/@''GNULIB_OPENAT''@/$(GNULIB_OPENAT)/g' \
+	      -e 's|@''HAVE_FCNTL''@|$(HAVE_FCNTL)|g' \
+	      -e 's|@''HAVE_OPENAT''@|$(HAVE_OPENAT)|g' \
+	      -e 's|@''REPLACE_FCNTL''@|$(REPLACE_FCNTL)|g' \
+	      -e 's|@''REPLACE_OPEN''@|$(REPLACE_OPEN)|g' \
+	      -e 's|@''REPLACE_OPENAT''@|$(REPLACE_OPENAT)|g' \
+	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+	      < $(srcdir)/fcntl.in.h; \
+	} > $@-t && \
+	mv $@-t $@
+
+# We need the following in order to create an empty placeholder for
+# <langinfo.h> when the system doesn't have one.
+langinfo.h: langinfo.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
+	      -e 's|@''HAVE_LANGINFO_H''@|$(HAVE_LANGINFO_H)|g' \
+	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+	      -e 's|@''NEXT_LANGINFO_H''@|$(NEXT_LANGINFO_H)|g' \
+	      -e 's/@''GNULIB_NL_LANGINFO''@/$(GNULIB_NL_LANGINFO)/g' \
+	      -e 's|@''HAVE_LANGINFO_CODESET''@|$(HAVE_LANGINFO_CODESET)|g' \
+	      -e 's|@''HAVE_LANGINFO_T_FMT_AMPM''@|$(HAVE_LANGINFO_T_FMT_AMPM)|g' \
+	      -e 's|@''HAVE_LANGINFO_ERA''@|$(HAVE_LANGINFO_ERA)|g' \
+	      -e 's|@''HAVE_LANGINFO_YESEXPR''@|$(HAVE_LANGINFO_YESEXPR)|g' \
+	      -e 's|@''HAVE_NL_LANGINFO''@|$(HAVE_NL_LANGINFO)|g' \
+	      -e 's|@''REPLACE_NL_LANGINFO''@|$(REPLACE_NL_LANGINFO)|g' \
+	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+	      < $(srcdir)/langinfo.in.h; \
+	} > $@-t && \
+	mv $@-t $@
+
+# We need the following in order to create <limits.h> when the system
+# doesn't have one that is compatible with GNU.
+@GL_GENERATE_LIMITS_H_TRUE@limits.h: limits.in.h $(top_builddir)/config.status
+@GL_GENERATE_LIMITS_H_TRUE@	$(AM_V_GEN)rm -f $@-t $@ && \
+@GL_GENERATE_LIMITS_H_TRUE@	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
+@GL_GENERATE_LIMITS_H_TRUE@	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
+@GL_GENERATE_LIMITS_H_TRUE@	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+@GL_GENERATE_LIMITS_H_TRUE@	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+@GL_GENERATE_LIMITS_H_TRUE@	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+@GL_GENERATE_LIMITS_H_TRUE@	      -e 's|@''NEXT_LIMITS_H''@|$(NEXT_LIMITS_H)|g' \
+@GL_GENERATE_LIMITS_H_TRUE@	      < $(srcdir)/limits.in.h; \
+@GL_GENERATE_LIMITS_H_TRUE@	} > $@-t && \
+@GL_GENERATE_LIMITS_H_TRUE@	mv $@-t $@
+@GL_GENERATE_LIMITS_H_FALSE@limits.h: $(top_builddir)/config.status
+@GL_GENERATE_LIMITS_H_FALSE@	rm -f $@
+
+# We need the following in order to install a simple file in $(libdir)
+# which is shared with other installed packages. We use a list of referencing
+# packages so that "make uninstall" will remove the file if and only if it
+# is not used by another installed package.
+# On systems with glibc-2.1 or newer, the file is redundant, therefore we
+# avoid installing it.
+
+all-local: charset.alias ref-add.sed ref-del.sed
+install-exec-local: install-exec-localcharset
+install-exec-localcharset: all-local
+	if test $(GLIBC21) = no; then \
+	  case '$(host_os)' in \
+	    darwin[56]*) \
+	      need_charset_alias=true ;; \
+	    darwin* | cygwin* | mingw* | pw32* | cegcc*) \
+	      need_charset_alias=false ;; \
+	    *) \
+	      need_charset_alias=true ;; \
+	  esac ; \
+	else \
+	  need_charset_alias=false ; \
+	fi ; \
+	if $$need_charset_alias; then \
+	  $(mkinstalldirs) $(DESTDIR)$(libdir) ; \
+	fi ; \
+	if test -f $(charset_alias); then \
+	  sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \
+	  $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
+	  rm -f $(charset_tmp) ; \
+	else \
+	  if $$need_charset_alias; then \
+	    sed -f ref-add.sed charset.alias > $(charset_tmp) ; \
+	    $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
+	    rm -f $(charset_tmp) ; \
+	  fi ; \
+	fi
+
+uninstall-local: uninstall-localcharset
+uninstall-localcharset: all-local
+	if test -f $(charset_alias); then \
+	  sed -f ref-del.sed $(charset_alias) > $(charset_tmp); \
+	  if grep '^# Packages using this file: $$' $(charset_tmp) \
+	      > /dev/null; then \
+	    rm -f $(charset_alias); \
+	  else \
+	    $(INSTALL_DATA) $(charset_tmp) $(charset_alias); \
+	  fi; \
+	  rm -f $(charset_tmp); \
+	fi
+
+charset.alias: config.charset
+	$(AM_V_GEN)rm -f t-$@ $@ && \
+	$(SHELL) $(srcdir)/config.charset '$(host)' > t-$@ && \
+	mv t-$@ $@
+.sin.sed:
+	$(AM_V_GEN)rm -f t-$@ $@ && \
+	sed -e '/^#/d' -e 's/@''PACKAGE''@/$(PACKAGE)/g' $< > t-$@ && \
+	mv t-$@ $@
+
+# We need the following in order to create <locale.h> when the system
+# doesn't have one that provides all definitions.
+locale.h: locale.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
+	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
+	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+	      -e 's|@''NEXT_LOCALE_H''@|$(NEXT_LOCALE_H)|g' \
+	      -e 's/@''GNULIB_LOCALECONV''@/$(GNULIB_LOCALECONV)/g' \
+	      -e 's/@''GNULIB_SETLOCALE''@/$(GNULIB_SETLOCALE)/g' \
+	      -e 's/@''GNULIB_DUPLOCALE''@/$(GNULIB_DUPLOCALE)/g' \
+	      -e 's|@''HAVE_DUPLOCALE''@|$(HAVE_DUPLOCALE)|g' \
+	      -e 's|@''HAVE_XLOCALE_H''@|$(HAVE_XLOCALE_H)|g' \
+	      -e 's|@''REPLACE_LOCALECONV''@|$(REPLACE_LOCALECONV)|g' \
+	      -e 's|@''REPLACE_SETLOCALE''@|$(REPLACE_SETLOCALE)|g' \
+	      -e 's|@''REPLACE_DUPLOCALE''@|$(REPLACE_DUPLOCALE)|g' \
+	      -e 's|@''REPLACE_STRUCT_LCONV''@|$(REPLACE_STRUCT_LCONV)|g' \
+	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+	      < $(srcdir)/locale.in.h; \
+	} > $@-t && \
+	mv $@-t $@
+
+# We need the following in order to create <stdbool.h> when the system
+# doesn't have one that works.
+@GL_GENERATE_STDBOOL_H_TRUE@stdbool.h: stdbool.in.h $(top_builddir)/config.status
+@GL_GENERATE_STDBOOL_H_TRUE@	$(AM_V_GEN)rm -f $@-t $@ && \
+@GL_GENERATE_STDBOOL_H_TRUE@	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+@GL_GENERATE_STDBOOL_H_TRUE@	  sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' < $(srcdir)/stdbool.in.h; \
+@GL_GENERATE_STDBOOL_H_TRUE@	} > $@-t && \
+@GL_GENERATE_STDBOOL_H_TRUE@	mv $@-t $@
+@GL_GENERATE_STDBOOL_H_FALSE@stdbool.h: $(top_builddir)/config.status
+@GL_GENERATE_STDBOOL_H_FALSE@	rm -f $@
+
+# We need the following in order to create <stddef.h> when the system
+# doesn't have one that works with the given compiler.
+@GL_GENERATE_STDDEF_H_TRUE@stddef.h: stddef.in.h $(top_builddir)/config.status
+@GL_GENERATE_STDDEF_H_TRUE@	$(AM_V_GEN)rm -f $@-t $@ && \
+@GL_GENERATE_STDDEF_H_TRUE@	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
+@GL_GENERATE_STDDEF_H_TRUE@	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
+@GL_GENERATE_STDDEF_H_TRUE@	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+@GL_GENERATE_STDDEF_H_TRUE@	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+@GL_GENERATE_STDDEF_H_TRUE@	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+@GL_GENERATE_STDDEF_H_TRUE@	      -e 's|@''NEXT_STDDEF_H''@|$(NEXT_STDDEF_H)|g' \
+@GL_GENERATE_STDDEF_H_TRUE@	      -e 's|@''HAVE_MAX_ALIGN_T''@|$(HAVE_MAX_ALIGN_T)|g' \
+@GL_GENERATE_STDDEF_H_TRUE@	      -e 's|@''HAVE_WCHAR_T''@|$(HAVE_WCHAR_T)|g' \
+@GL_GENERATE_STDDEF_H_TRUE@	      -e 's|@''REPLACE_NULL''@|$(REPLACE_NULL)|g' \
+@GL_GENERATE_STDDEF_H_TRUE@	      < $(srcdir)/stddef.in.h; \
+@GL_GENERATE_STDDEF_H_TRUE@	} > $@-t && \
+@GL_GENERATE_STDDEF_H_TRUE@	mv $@-t $@
+@GL_GENERATE_STDDEF_H_FALSE@stddef.h: $(top_builddir)/config.status
+@GL_GENERATE_STDDEF_H_FALSE@	rm -f $@
+
+# We need the following in order to create <stdint.h> when the system
+# doesn't have one that works with the given compiler.
+@GL_GENERATE_STDINT_H_TRUE@stdint.h: stdint.in.h $(top_builddir)/config.status
+@GL_GENERATE_STDINT_H_TRUE@	$(AM_V_GEN)rm -f $@-t $@ && \
+@GL_GENERATE_STDINT_H_TRUE@	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+@GL_GENERATE_STDINT_H_TRUE@	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
+@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \
+@GL_GENERATE_STDINT_H_TRUE@	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+@GL_GENERATE_STDINT_H_TRUE@	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+@GL_GENERATE_STDINT_H_TRUE@	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+@GL_GENERATE_STDINT_H_TRUE@	      -e 's|@''NEXT_STDINT_H''@|$(NEXT_STDINT_H)|g' \
+@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''HAVE_C99_STDINT_H''@/$(HAVE_C99_STDINT_H)/g' \
+@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''HAVE_SYS_TYPES_H''@/$(HAVE_SYS_TYPES_H)/g' \
+@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \
+@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''HAVE_SYS_INTTYPES_H''@/$(HAVE_SYS_INTTYPES_H)/g' \
+@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''HAVE_SYS_BITYPES_H''@/$(HAVE_SYS_BITYPES_H)/g' \
+@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''HAVE_WCHAR_H''@/$(HAVE_WCHAR_H)/g' \
+@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \
+@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''HAVE_UNSIGNED_LONG_LONG_INT''@/$(HAVE_UNSIGNED_LONG_LONG_INT)/g' \
+@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''APPLE_UNIVERSAL_BUILD''@/$(APPLE_UNIVERSAL_BUILD)/g' \
+@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''BITSIZEOF_PTRDIFF_T''@/$(BITSIZEOF_PTRDIFF_T)/g' \
+@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''PTRDIFF_T_SUFFIX''@/$(PTRDIFF_T_SUFFIX)/g' \
+@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''BITSIZEOF_SIG_ATOMIC_T''@/$(BITSIZEOF_SIG_ATOMIC_T)/g' \
+@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''HAVE_SIGNED_SIG_ATOMIC_T''@/$(HAVE_SIGNED_SIG_ATOMIC_T)/g' \
+@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''SIG_ATOMIC_T_SUFFIX''@/$(SIG_ATOMIC_T_SUFFIX)/g' \
+@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''BITSIZEOF_SIZE_T''@/$(BITSIZEOF_SIZE_T)/g' \
+@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''SIZE_T_SUFFIX''@/$(SIZE_T_SUFFIX)/g' \
+@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''BITSIZEOF_WCHAR_T''@/$(BITSIZEOF_WCHAR_T)/g' \
+@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''HAVE_SIGNED_WCHAR_T''@/$(HAVE_SIGNED_WCHAR_T)/g' \
+@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''WCHAR_T_SUFFIX''@/$(WCHAR_T_SUFFIX)/g' \
+@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''BITSIZEOF_WINT_T''@/$(BITSIZEOF_WINT_T)/g' \
+@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''HAVE_SIGNED_WINT_T''@/$(HAVE_SIGNED_WINT_T)/g' \
+@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''WINT_T_SUFFIX''@/$(WINT_T_SUFFIX)/g' \
+@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''GNULIB_OVERRIDES_WINT_T''@/$(GNULIB_OVERRIDES_WINT_T)/g' \
+@GL_GENERATE_STDINT_H_TRUE@	      < $(srcdir)/stdint.in.h; \
+@GL_GENERATE_STDINT_H_TRUE@	} > $@-t && \
+@GL_GENERATE_STDINT_H_TRUE@	mv $@-t $@
+@GL_GENERATE_STDINT_H_FALSE@stdint.h: $(top_builddir)/config.status
+@GL_GENERATE_STDINT_H_FALSE@	rm -f $@
+
+# We need the following in order to create <stdlib.h> when the system
+# doesn't have one that works with the given compiler.
+stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
+  $(_NORETURN_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
+	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
+	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+	      -e 's|@''NEXT_STDLIB_H''@|$(NEXT_STDLIB_H)|g' \
+	      -e 's/@''GNULIB__EXIT''@/$(GNULIB__EXIT)/g' \
+	      -e 's/@''GNULIB_ATOLL''@/$(GNULIB_ATOLL)/g' \
+	      -e 's/@''GNULIB_CALLOC_POSIX''@/$(GNULIB_CALLOC_POSIX)/g' \
+	      -e 's/@''GNULIB_CANONICALIZE_FILE_NAME''@/$(GNULIB_CANONICALIZE_FILE_NAME)/g' \
+	      -e 's/@''GNULIB_GETLOADAVG''@/$(GNULIB_GETLOADAVG)/g' \
+	      -e 's/@''GNULIB_GETSUBOPT''@/$(GNULIB_GETSUBOPT)/g' \
+	      -e 's/@''GNULIB_GRANTPT''@/$(GNULIB_GRANTPT)/g' \
+	      -e 's/@''GNULIB_MALLOC_POSIX''@/$(GNULIB_MALLOC_POSIX)/g' \
+	      -e 's/@''GNULIB_MBTOWC''@/$(GNULIB_MBTOWC)/g' \
+	      -e 's/@''GNULIB_MKDTEMP''@/$(GNULIB_MKDTEMP)/g' \
+	      -e 's/@''GNULIB_MKOSTEMP''@/$(GNULIB_MKOSTEMP)/g' \
+	      -e 's/@''GNULIB_MKOSTEMPS''@/$(GNULIB_MKOSTEMPS)/g' \
+	      -e 's/@''GNULIB_MKSTEMP''@/$(GNULIB_MKSTEMP)/g' \
+	      -e 's/@''GNULIB_MKSTEMPS''@/$(GNULIB_MKSTEMPS)/g' \
+	      -e 's/@''GNULIB_POSIX_OPENPT''@/$(GNULIB_POSIX_OPENPT)/g' \
+	      -e 's/@''GNULIB_PTSNAME''@/$(GNULIB_PTSNAME)/g' \
+	      -e 's/@''GNULIB_PTSNAME_R''@/$(GNULIB_PTSNAME_R)/g' \
+	      -e 's/@''GNULIB_PUTENV''@/$(GNULIB_PUTENV)/g' \
+	      -e 's/@''GNULIB_QSORT_R''@/$(GNULIB_QSORT_R)/g' \
+	      -e 's/@''GNULIB_RANDOM''@/$(GNULIB_RANDOM)/g' \
+	      -e 's/@''GNULIB_RANDOM_R''@/$(GNULIB_RANDOM_R)/g' \
+	      -e 's/@''GNULIB_REALLOC_POSIX''@/$(GNULIB_REALLOC_POSIX)/g' \
+	      -e 's/@''GNULIB_REALLOCARRAY''@/$(GNULIB_REALLOCARRAY)/g' \
+	      -e 's/@''GNULIB_REALPATH''@/$(GNULIB_REALPATH)/g' \
+	      -e 's/@''GNULIB_RPMATCH''@/$(GNULIB_RPMATCH)/g' \
+	      -e 's/@''GNULIB_SECURE_GETENV''@/$(GNULIB_SECURE_GETENV)/g' \
+	      -e 's/@''GNULIB_SETENV''@/$(GNULIB_SETENV)/g' \
+	      -e 's/@''GNULIB_STRTOD''@/$(GNULIB_STRTOD)/g' \
+	      -e 's/@''GNULIB_STRTOLL''@/$(GNULIB_STRTOLL)/g' \
+	      -e 's/@''GNULIB_STRTOULL''@/$(GNULIB_STRTOULL)/g' \
+	      -e 's/@''GNULIB_SYSTEM_POSIX''@/$(GNULIB_SYSTEM_POSIX)/g' \
+	      -e 's/@''GNULIB_UNLOCKPT''@/$(GNULIB_UNLOCKPT)/g' \
+	      -e 's/@''GNULIB_UNSETENV''@/$(GNULIB_UNSETENV)/g' \
+	      -e 's/@''GNULIB_WCTOMB''@/$(GNULIB_WCTOMB)/g' \
+	      < $(srcdir)/stdlib.in.h | \
+	  sed -e 's|@''HAVE__EXIT''@|$(HAVE__EXIT)|g' \
+	      -e 's|@''HAVE_ATOLL''@|$(HAVE_ATOLL)|g' \
+	      -e 's|@''HAVE_CANONICALIZE_FILE_NAME''@|$(HAVE_CANONICALIZE_FILE_NAME)|g' \
+	      -e 's|@''HAVE_DECL_GETLOADAVG''@|$(HAVE_DECL_GETLOADAVG)|g' \
+	      -e 's|@''HAVE_GETSUBOPT''@|$(HAVE_GETSUBOPT)|g' \
+	      -e 's|@''HAVE_GRANTPT''@|$(HAVE_GRANTPT)|g' \
+	      -e 's|@''HAVE_DECL_INITSTATE''@|$(HAVE_DECL_INITSTATE)|g' \
+	      -e 's|@''HAVE_MKDTEMP''@|$(HAVE_MKDTEMP)|g' \
+	      -e 's|@''HAVE_MKOSTEMP''@|$(HAVE_MKOSTEMP)|g' \
+	      -e 's|@''HAVE_MKOSTEMPS''@|$(HAVE_MKOSTEMPS)|g' \
+	      -e 's|@''HAVE_MKSTEMP''@|$(HAVE_MKSTEMP)|g' \
+	      -e 's|@''HAVE_MKSTEMPS''@|$(HAVE_MKSTEMPS)|g' \
+	      -e 's|@''HAVE_POSIX_OPENPT''@|$(HAVE_POSIX_OPENPT)|g' \
+	      -e 's|@''HAVE_PTSNAME''@|$(HAVE_PTSNAME)|g' \
+	      -e 's|@''HAVE_PTSNAME_R''@|$(HAVE_PTSNAME_R)|g' \
+	      -e 's|@''HAVE_QSORT_R''@|$(HAVE_QSORT_R)|g' \
+	      -e 's|@''HAVE_RANDOM''@|$(HAVE_RANDOM)|g' \
+	      -e 's|@''HAVE_RANDOM_H''@|$(HAVE_RANDOM_H)|g' \
+	      -e 's|@''HAVE_RANDOM_R''@|$(HAVE_RANDOM_R)|g' \
+	      -e 's|@''HAVE_REALLOCARRAY''@|$(HAVE_REALLOCARRAY)|g' \
+	      -e 's|@''HAVE_REALPATH''@|$(HAVE_REALPATH)|g' \
+	      -e 's|@''HAVE_RPMATCH''@|$(HAVE_RPMATCH)|g' \
+	      -e 's|@''HAVE_SECURE_GETENV''@|$(HAVE_SECURE_GETENV)|g' \
+	      -e 's|@''HAVE_DECL_SETENV''@|$(HAVE_DECL_SETENV)|g' \
+	      -e 's|@''HAVE_DECL_SETSTATE''@|$(HAVE_DECL_SETSTATE)|g' \
+	      -e 's|@''HAVE_STRTOD''@|$(HAVE_STRTOD)|g' \
+	      -e 's|@''HAVE_STRTOLL''@|$(HAVE_STRTOLL)|g' \
+	      -e 's|@''HAVE_STRTOULL''@|$(HAVE_STRTOULL)|g' \
+	      -e 's|@''HAVE_STRUCT_RANDOM_DATA''@|$(HAVE_STRUCT_RANDOM_DATA)|g' \
+	      -e 's|@''HAVE_SYS_LOADAVG_H''@|$(HAVE_SYS_LOADAVG_H)|g' \
+	      -e 's|@''HAVE_UNLOCKPT''@|$(HAVE_UNLOCKPT)|g' \
+	      -e 's|@''HAVE_DECL_UNSETENV''@|$(HAVE_DECL_UNSETENV)|g' \
+	      -e 's|@''REPLACE_CALLOC''@|$(REPLACE_CALLOC)|g' \
+	      -e 's|@''REPLACE_CANONICALIZE_FILE_NAME''@|$(REPLACE_CANONICALIZE_FILE_NAME)|g' \
+	      -e 's|@''REPLACE_MALLOC''@|$(REPLACE_MALLOC)|g' \
+	      -e 's|@''REPLACE_MBTOWC''@|$(REPLACE_MBTOWC)|g' \
+	      -e 's|@''REPLACE_MKSTEMP''@|$(REPLACE_MKSTEMP)|g' \
+	      -e 's|@''REPLACE_PTSNAME''@|$(REPLACE_PTSNAME)|g' \
+	      -e 's|@''REPLACE_PTSNAME_R''@|$(REPLACE_PTSNAME_R)|g' \
+	      -e 's|@''REPLACE_PUTENV''@|$(REPLACE_PUTENV)|g' \
+	      -e 's|@''REPLACE_QSORT_R''@|$(REPLACE_QSORT_R)|g' \
+	      -e 's|@''REPLACE_RANDOM_R''@|$(REPLACE_RANDOM_R)|g' \
+	      -e 's|@''REPLACE_REALLOC''@|$(REPLACE_REALLOC)|g' \
+	      -e 's|@''REPLACE_REALPATH''@|$(REPLACE_REALPATH)|g' \
+	      -e 's|@''REPLACE_SETENV''@|$(REPLACE_SETENV)|g' \
+	      -e 's|@''REPLACE_STRTOD''@|$(REPLACE_STRTOD)|g' \
+	      -e 's|@''REPLACE_UNSETENV''@|$(REPLACE_UNSETENV)|g' \
+	      -e 's|@''REPLACE_WCTOMB''@|$(REPLACE_WCTOMB)|g' \
+	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+	      -e '/definition of _Noreturn/r $(_NORETURN_H)' \
+	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \
+	} > $@-t && \
+	mv $@-t $@
+
+# We need the following in order to create <sys/stat.h> when the system
+# has one that is incomplete.
+sys/stat.h: sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+	$(AM_V_at)$(MKDIR_P) sys
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
+	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+	      -e 's|@''NEXT_SYS_STAT_H''@|$(NEXT_SYS_STAT_H)|g' \
+	      -e 's|@''WINDOWS_64_BIT_ST_SIZE''@|$(WINDOWS_64_BIT_ST_SIZE)|g' \
+	      -e 's|@''WINDOWS_STAT_TIMESPEC''@|$(WINDOWS_STAT_TIMESPEC)|g' \
+	      -e 's/@''GNULIB_FCHMODAT''@/$(GNULIB_FCHMODAT)/g' \
+	      -e 's/@''GNULIB_FSTAT''@/$(GNULIB_FSTAT)/g' \
+	      -e 's/@''GNULIB_FSTATAT''@/$(GNULIB_FSTATAT)/g' \
+	      -e 's/@''GNULIB_FUTIMENS''@/$(GNULIB_FUTIMENS)/g' \
+	      -e 's/@''GNULIB_LCHMOD''@/$(GNULIB_LCHMOD)/g' \
+	      -e 's/@''GNULIB_LSTAT''@/$(GNULIB_LSTAT)/g' \
+	      -e 's/@''GNULIB_MKDIRAT''@/$(GNULIB_MKDIRAT)/g' \
+	      -e 's/@''GNULIB_MKFIFO''@/$(GNULIB_MKFIFO)/g' \
+	      -e 's/@''GNULIB_MKFIFOAT''@/$(GNULIB_MKFIFOAT)/g' \
+	      -e 's/@''GNULIB_MKNOD''@/$(GNULIB_MKNOD)/g' \
+	      -e 's/@''GNULIB_MKNODAT''@/$(GNULIB_MKNODAT)/g' \
+	      -e 's/@''GNULIB_STAT''@/$(GNULIB_STAT)/g' \
+	      -e 's/@''GNULIB_UTIMENSAT''@/$(GNULIB_UTIMENSAT)/g' \
+	      -e 's/@''GNULIB_OVERRIDES_STRUCT_STAT''@/$(GNULIB_OVERRIDES_STRUCT_STAT)/g' \
+	      -e 's|@''HAVE_FCHMODAT''@|$(HAVE_FCHMODAT)|g' \
+	      -e 's|@''HAVE_FSTATAT''@|$(HAVE_FSTATAT)|g' \
+	      -e 's|@''HAVE_FUTIMENS''@|$(HAVE_FUTIMENS)|g' \
+	      -e 's|@''HAVE_LCHMOD''@|$(HAVE_LCHMOD)|g' \
+	      -e 's|@''HAVE_LSTAT''@|$(HAVE_LSTAT)|g' \
+	      -e 's|@''HAVE_MKDIRAT''@|$(HAVE_MKDIRAT)|g' \
+	      -e 's|@''HAVE_MKFIFO''@|$(HAVE_MKFIFO)|g' \
+	      -e 's|@''HAVE_MKFIFOAT''@|$(HAVE_MKFIFOAT)|g' \
+	      -e 's|@''HAVE_MKNOD''@|$(HAVE_MKNOD)|g' \
+	      -e 's|@''HAVE_MKNODAT''@|$(HAVE_MKNODAT)|g' \
+	      -e 's|@''HAVE_UTIMENSAT''@|$(HAVE_UTIMENSAT)|g' \
+	      -e 's|@''REPLACE_FSTAT''@|$(REPLACE_FSTAT)|g' \
+	      -e 's|@''REPLACE_FSTATAT''@|$(REPLACE_FSTATAT)|g' \
+	      -e 's|@''REPLACE_FUTIMENS''@|$(REPLACE_FUTIMENS)|g' \
+	      -e 's|@''REPLACE_LSTAT''@|$(REPLACE_LSTAT)|g' \
+	      -e 's|@''REPLACE_MKDIR''@|$(REPLACE_MKDIR)|g' \
+	      -e 's|@''REPLACE_MKFIFO''@|$(REPLACE_MKFIFO)|g' \
+	      -e 's|@''REPLACE_MKNOD''@|$(REPLACE_MKNOD)|g' \
+	      -e 's|@''REPLACE_STAT''@|$(REPLACE_STAT)|g' \
+	      -e 's|@''REPLACE_UTIMENSAT''@|$(REPLACE_UTIMENSAT)|g' \
+	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+	      < $(srcdir)/sys_stat.in.h; \
+	} > $@-t && \
+	mv $@-t $@
+
+# We need the following in order to create <sys/time.h> when the system
+# doesn't have one that works with the given compiler.
+sys/time.h: sys_time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+	$(AM_V_at)$(MKDIR_P) sys
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
+	      -e 's/@''HAVE_SYS_TIME_H''@/$(HAVE_SYS_TIME_H)/g' \
+	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+	      -e 's|@''NEXT_SYS_TIME_H''@|$(NEXT_SYS_TIME_H)|g' \
+	      -e 's/@''GNULIB_GETTIMEOFDAY''@/$(GNULIB_GETTIMEOFDAY)/g' \
+	      -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \
+	      -e 's/@''HAVE_GETTIMEOFDAY''@/$(HAVE_GETTIMEOFDAY)/g' \
+	      -e 's/@''HAVE_STRUCT_TIMEVAL''@/$(HAVE_STRUCT_TIMEVAL)/g' \
+	      -e 's/@''REPLACE_GETTIMEOFDAY''@/$(REPLACE_GETTIMEOFDAY)/g' \
+	      -e 's/@''REPLACE_STRUCT_TIMEVAL''@/$(REPLACE_STRUCT_TIMEVAL)/g' \
+	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+	      < $(srcdir)/sys_time.in.h; \
+	} > $@-t && \
+	mv $@-t $@
+
+# We need the following in order to create <sys/types.h> when the system
+# doesn't have one that works with the given compiler.
+sys/types.h: sys_types.in.h $(top_builddir)/config.status
+	$(AM_V_at)$(MKDIR_P) sys
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
+	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+	      -e 's|@''NEXT_SYS_TYPES_H''@|$(NEXT_SYS_TYPES_H)|g' \
+	      -e 's|@''WINDOWS_64_BIT_OFF_T''@|$(WINDOWS_64_BIT_OFF_T)|g' \
+	      -e 's|@''WINDOWS_STAT_INODES''@|$(WINDOWS_STAT_INODES)|g' \
+	      < $(srcdir)/sys_types.in.h; \
+	} > $@-t && \
+	mv $@-t $@
+
+# We need the following in order to create <time.h> when the system
+# doesn't have one that works with the given compiler.
+time.h: time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
+	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
+	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+	      -e 's|@''NEXT_TIME_H''@|$(NEXT_TIME_H)|g' \
+	      -e 's/@''GNULIB_CTIME''@/$(GNULIB_CTIME)/g' \
+	      -e 's/@''GNULIB_LOCALTIME''@/$(GNULIB_LOCALTIME)/g' \
+	      -e 's/@''GNULIB_MKTIME''@/$(GNULIB_MKTIME)/g' \
+	      -e 's/@''GNULIB_NANOSLEEP''@/$(GNULIB_NANOSLEEP)/g' \
+	      -e 's/@''GNULIB_STRFTIME''@/$(GNULIB_STRFTIME)/g' \
+	      -e 's/@''GNULIB_STRPTIME''@/$(GNULIB_STRPTIME)/g' \
+	      -e 's/@''GNULIB_TIMEGM''@/$(GNULIB_TIMEGM)/g' \
+	      -e 's/@''GNULIB_TIME_R''@/$(GNULIB_TIME_R)/g' \
+	      -e 's/@''GNULIB_TIME_RZ''@/$(GNULIB_TIME_RZ)/g' \
+	      -e 's/@''GNULIB_TZSET''@/$(GNULIB_TZSET)/g' \
+	      -e 's|@''HAVE_DECL_LOCALTIME_R''@|$(HAVE_DECL_LOCALTIME_R)|g' \
+	      -e 's|@''HAVE_NANOSLEEP''@|$(HAVE_NANOSLEEP)|g' \
+	      -e 's|@''HAVE_STRPTIME''@|$(HAVE_STRPTIME)|g' \
+	      -e 's|@''HAVE_TIMEGM''@|$(HAVE_TIMEGM)|g' \
+	      -e 's|@''HAVE_TIMEZONE_T''@|$(HAVE_TIMEZONE_T)|g' \
+	      -e 's|@''HAVE_TZSET''@|$(HAVE_TZSET)|g' \
+	      -e 's|@''REPLACE_CTIME''@|$(REPLACE_CTIME)|g' \
+	      -e 's|@''REPLACE_GMTIME''@|$(REPLACE_GMTIME)|g' \
+	      -e 's|@''REPLACE_LOCALTIME''@|$(REPLACE_LOCALTIME)|g' \
+	      -e 's|@''REPLACE_LOCALTIME_R''@|$(REPLACE_LOCALTIME_R)|g' \
+	      -e 's|@''REPLACE_MKTIME''@|$(REPLACE_MKTIME)|g' \
+	      -e 's|@''REPLACE_NANOSLEEP''@|$(REPLACE_NANOSLEEP)|g' \
+	      -e 's|@''REPLACE_STRFTIME''@|$(REPLACE_STRFTIME)|g' \
+	      -e 's|@''REPLACE_TIMEGM''@|$(REPLACE_TIMEGM)|g' \
+	      -e 's|@''REPLACE_TZSET''@|$(REPLACE_TZSET)|g' \
+	      -e 's|@''PTHREAD_H_DEFINES_STRUCT_TIMESPEC''@|$(PTHREAD_H_DEFINES_STRUCT_TIMESPEC)|g' \
+	      -e 's|@''SYS_TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(SYS_TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \
+	      -e 's|@''TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \
+	      -e 's|@''UNISTD_H_DEFINES_STRUCT_TIMESPEC''@|$(UNISTD_H_DEFINES_STRUCT_TIMESPEC)|g' \
+	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+	      < $(srcdir)/time.in.h; \
+	} > $@-t && \
+	mv $@-t $@
+
+# We need the following in order to create an empty placeholder for
+# <unistd.h> when the system doesn't have one.
+unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
+	      -e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \
+	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+	      -e 's|@''NEXT_UNISTD_H''@|$(NEXT_UNISTD_H)|g' \
+	      -e 's|@''WINDOWS_64_BIT_OFF_T''@|$(WINDOWS_64_BIT_OFF_T)|g' \
+	      -e 's/@''GNULIB_CHDIR''@/$(GNULIB_CHDIR)/g' \
+	      -e 's/@''GNULIB_CHOWN''@/$(GNULIB_CHOWN)/g' \
+	      -e 's/@''GNULIB_CLOSE''@/$(GNULIB_CLOSE)/g' \
+	      -e 's/@''GNULIB_DUP''@/$(GNULIB_DUP)/g' \
+	      -e 's/@''GNULIB_DUP2''@/$(GNULIB_DUP2)/g' \
+	      -e 's/@''GNULIB_DUP3''@/$(GNULIB_DUP3)/g' \
+	      -e 's/@''GNULIB_ENVIRON''@/$(GNULIB_ENVIRON)/g' \
+	      -e 's/@''GNULIB_EUIDACCESS''@/$(GNULIB_EUIDACCESS)/g' \
+	      -e 's/@''GNULIB_FACCESSAT''@/$(GNULIB_FACCESSAT)/g' \
+	      -e 's/@''GNULIB_FCHDIR''@/$(GNULIB_FCHDIR)/g' \
+	      -e 's/@''GNULIB_FCHOWNAT''@/$(GNULIB_FCHOWNAT)/g' \
+	      -e 's/@''GNULIB_FDATASYNC''@/$(GNULIB_FDATASYNC)/g' \
+	      -e 's/@''GNULIB_FSYNC''@/$(GNULIB_FSYNC)/g' \
+	      -e 's/@''GNULIB_FTRUNCATE''@/$(GNULIB_FTRUNCATE)/g' \
+	      -e 's/@''GNULIB_GETCWD''@/$(GNULIB_GETCWD)/g' \
+	      -e 's/@''GNULIB_GETDOMAINNAME''@/$(GNULIB_GETDOMAINNAME)/g' \
+	      -e 's/@''GNULIB_GETDTABLESIZE''@/$(GNULIB_GETDTABLESIZE)/g' \
+	      -e 's/@''GNULIB_GETGROUPS''@/$(GNULIB_GETGROUPS)/g' \
+	      -e 's/@''GNULIB_GETHOSTNAME''@/$(GNULIB_GETHOSTNAME)/g' \
+	      -e 's/@''GNULIB_GETLOGIN''@/$(GNULIB_GETLOGIN)/g' \
+	      -e 's/@''GNULIB_GETLOGIN_R''@/$(GNULIB_GETLOGIN_R)/g' \
+	      -e 's/@''GNULIB_GETPAGESIZE''@/$(GNULIB_GETPAGESIZE)/g' \
+	      -e 's/@''GNULIB_GETUSERSHELL''@/$(GNULIB_GETUSERSHELL)/g' \
+	      -e 's/@''GNULIB_GROUP_MEMBER''@/$(GNULIB_GROUP_MEMBER)/g' \
+	      -e 's/@''GNULIB_ISATTY''@/$(GNULIB_ISATTY)/g' \
+	      -e 's/@''GNULIB_LCHOWN''@/$(GNULIB_LCHOWN)/g' \
+	      -e 's/@''GNULIB_LINK''@/$(GNULIB_LINK)/g' \
+	      -e 's/@''GNULIB_LINKAT''@/$(GNULIB_LINKAT)/g' \
+	      -e 's/@''GNULIB_LSEEK''@/$(GNULIB_LSEEK)/g' \
+	      -e 's/@''GNULIB_PIPE''@/$(GNULIB_PIPE)/g' \
+	      -e 's/@''GNULIB_PIPE2''@/$(GNULIB_PIPE2)/g' \
+	      -e 's/@''GNULIB_PREAD''@/$(GNULIB_PREAD)/g' \
+	      -e 's/@''GNULIB_PWRITE''@/$(GNULIB_PWRITE)/g' \
+	      -e 's/@''GNULIB_READ''@/$(GNULIB_READ)/g' \
+	      -e 's/@''GNULIB_READLINK''@/$(GNULIB_READLINK)/g' \
+	      -e 's/@''GNULIB_READLINKAT''@/$(GNULIB_READLINKAT)/g' \
+	      -e 's/@''GNULIB_RMDIR''@/$(GNULIB_RMDIR)/g' \
+	      -e 's/@''GNULIB_SETHOSTNAME''@/$(GNULIB_SETHOSTNAME)/g' \
+	      -e 's/@''GNULIB_SLEEP''@/$(GNULIB_SLEEP)/g' \
+	      -e 's/@''GNULIB_SYMLINK''@/$(GNULIB_SYMLINK)/g' \
+	      -e 's/@''GNULIB_SYMLINKAT''@/$(GNULIB_SYMLINKAT)/g' \
+	      -e 's/@''GNULIB_TRUNCATE''@/$(GNULIB_TRUNCATE)/g' \
+	      -e 's/@''GNULIB_TTYNAME_R''@/$(GNULIB_TTYNAME_R)/g' \
+	      -e 's/@''GNULIB_UNISTD_H_GETOPT''@/0$(GNULIB_GL_UNISTD_H_GETOPT)/g' \
+	      -e 's/@''GNULIB_UNISTD_H_NONBLOCKING''@/$(GNULIB_UNISTD_H_NONBLOCKING)/g' \
+	      -e 's/@''GNULIB_UNISTD_H_SIGPIPE''@/$(GNULIB_UNISTD_H_SIGPIPE)/g' \
+	      -e 's/@''GNULIB_UNLINK''@/$(GNULIB_UNLINK)/g' \
+	      -e 's/@''GNULIB_UNLINKAT''@/$(GNULIB_UNLINKAT)/g' \
+	      -e 's/@''GNULIB_USLEEP''@/$(GNULIB_USLEEP)/g' \
+	      -e 's/@''GNULIB_WRITE''@/$(GNULIB_WRITE)/g' \
+	      < $(srcdir)/unistd.in.h | \
+	  sed -e 's|@''HAVE_CHOWN''@|$(HAVE_CHOWN)|g' \
+	      -e 's|@''HAVE_DUP2''@|$(HAVE_DUP2)|g' \
+	      -e 's|@''HAVE_DUP3''@|$(HAVE_DUP3)|g' \
+	      -e 's|@''HAVE_EUIDACCESS''@|$(HAVE_EUIDACCESS)|g' \
+	      -e 's|@''HAVE_FACCESSAT''@|$(HAVE_FACCESSAT)|g' \
+	      -e 's|@''HAVE_FCHDIR''@|$(HAVE_FCHDIR)|g' \
+	      -e 's|@''HAVE_FCHOWNAT''@|$(HAVE_FCHOWNAT)|g' \
+	      -e 's|@''HAVE_FDATASYNC''@|$(HAVE_FDATASYNC)|g' \
+	      -e 's|@''HAVE_FSYNC''@|$(HAVE_FSYNC)|g' \
+	      -e 's|@''HAVE_FTRUNCATE''@|$(HAVE_FTRUNCATE)|g' \
+	      -e 's|@''HAVE_GETDTABLESIZE''@|$(HAVE_GETDTABLESIZE)|g' \
+	      -e 's|@''HAVE_GETGROUPS''@|$(HAVE_GETGROUPS)|g' \
+	      -e 's|@''HAVE_GETHOSTNAME''@|$(HAVE_GETHOSTNAME)|g' \
+	      -e 's|@''HAVE_GETPAGESIZE''@|$(HAVE_GETPAGESIZE)|g' \
+	      -e 's|@''HAVE_GROUP_MEMBER''@|$(HAVE_GROUP_MEMBER)|g' \
+	      -e 's|@''HAVE_LCHOWN''@|$(HAVE_LCHOWN)|g' \
+	      -e 's|@''HAVE_LINK''@|$(HAVE_LINK)|g' \
+	      -e 's|@''HAVE_LINKAT''@|$(HAVE_LINKAT)|g' \
+	      -e 's|@''HAVE_PIPE''@|$(HAVE_PIPE)|g' \
+	      -e 's|@''HAVE_PIPE2''@|$(HAVE_PIPE2)|g' \
+	      -e 's|@''HAVE_PREAD''@|$(HAVE_PREAD)|g' \
+	      -e 's|@''HAVE_PWRITE''@|$(HAVE_PWRITE)|g' \
+	      -e 's|@''HAVE_READLINK''@|$(HAVE_READLINK)|g' \
+	      -e 's|@''HAVE_READLINKAT''@|$(HAVE_READLINKAT)|g' \
+	      -e 's|@''HAVE_SETHOSTNAME''@|$(HAVE_SETHOSTNAME)|g' \
+	      -e 's|@''HAVE_SLEEP''@|$(HAVE_SLEEP)|g' \
+	      -e 's|@''HAVE_SYMLINK''@|$(HAVE_SYMLINK)|g' \
+	      -e 's|@''HAVE_SYMLINKAT''@|$(HAVE_SYMLINKAT)|g' \
+	      -e 's|@''HAVE_TRUNCATE''@|$(HAVE_TRUNCATE)|g' \
+	      -e 's|@''HAVE_UNLINKAT''@|$(HAVE_UNLINKAT)|g' \
+	      -e 's|@''HAVE_USLEEP''@|$(HAVE_USLEEP)|g' \
+	      -e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|g' \
+	      -e 's|@''HAVE_DECL_FCHDIR''@|$(HAVE_DECL_FCHDIR)|g' \
+	      -e 's|@''HAVE_DECL_FDATASYNC''@|$(HAVE_DECL_FDATASYNC)|g' \
+	      -e 's|@''HAVE_DECL_GETDOMAINNAME''@|$(HAVE_DECL_GETDOMAINNAME)|g' \
+	      -e 's|@''HAVE_DECL_GETLOGIN''@|$(HAVE_DECL_GETLOGIN)|g' \
+	      -e 's|@''HAVE_DECL_GETLOGIN_R''@|$(HAVE_DECL_GETLOGIN_R)|g' \
+	      -e 's|@''HAVE_DECL_GETPAGESIZE''@|$(HAVE_DECL_GETPAGESIZE)|g' \
+	      -e 's|@''HAVE_DECL_GETUSERSHELL''@|$(HAVE_DECL_GETUSERSHELL)|g' \
+	      -e 's|@''HAVE_DECL_SETHOSTNAME''@|$(HAVE_DECL_SETHOSTNAME)|g' \
+	      -e 's|@''HAVE_DECL_TTYNAME_R''@|$(HAVE_DECL_TTYNAME_R)|g' \
+	      -e 's|@''HAVE_OS_H''@|$(HAVE_OS_H)|g' \
+	      -e 's|@''HAVE_SYS_PARAM_H''@|$(HAVE_SYS_PARAM_H)|g' \
+	  | \
+	  sed -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \
+	      -e 's|@''REPLACE_CLOSE''@|$(REPLACE_CLOSE)|g' \
+	      -e 's|@''REPLACE_DUP''@|$(REPLACE_DUP)|g' \
+	      -e 's|@''REPLACE_DUP2''@|$(REPLACE_DUP2)|g' \
+	      -e 's|@''REPLACE_FCHOWNAT''@|$(REPLACE_FCHOWNAT)|g' \
+	      -e 's|@''REPLACE_FTRUNCATE''@|$(REPLACE_FTRUNCATE)|g' \
+	      -e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \
+	      -e 's|@''REPLACE_GETDOMAINNAME''@|$(REPLACE_GETDOMAINNAME)|g' \
+	      -e 's|@''REPLACE_GETDTABLESIZE''@|$(REPLACE_GETDTABLESIZE)|g' \
+	      -e 's|@''REPLACE_GETLOGIN_R''@|$(REPLACE_GETLOGIN_R)|g' \
+	      -e 's|@''REPLACE_GETGROUPS''@|$(REPLACE_GETGROUPS)|g' \
+	      -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \
+	      -e 's|@''REPLACE_ISATTY''@|$(REPLACE_ISATTY)|g' \
+	      -e 's|@''REPLACE_LCHOWN''@|$(REPLACE_LCHOWN)|g' \
+	      -e 's|@''REPLACE_LINK''@|$(REPLACE_LINK)|g' \
+	      -e 's|@''REPLACE_LINKAT''@|$(REPLACE_LINKAT)|g' \
+	      -e 's|@''REPLACE_LSEEK''@|$(REPLACE_LSEEK)|g' \
+	      -e 's|@''REPLACE_PREAD''@|$(REPLACE_PREAD)|g' \
+	      -e 's|@''REPLACE_PWRITE''@|$(REPLACE_PWRITE)|g' \
+	      -e 's|@''REPLACE_READ''@|$(REPLACE_READ)|g' \
+	      -e 's|@''REPLACE_READLINK''@|$(REPLACE_READLINK)|g' \
+	      -e 's|@''REPLACE_READLINKAT''@|$(REPLACE_READLINKAT)|g' \
+	      -e 's|@''REPLACE_RMDIR''@|$(REPLACE_RMDIR)|g' \
+	      -e 's|@''REPLACE_SLEEP''@|$(REPLACE_SLEEP)|g' \
+	      -e 's|@''REPLACE_SYMLINK''@|$(REPLACE_SYMLINK)|g' \
+	      -e 's|@''REPLACE_SYMLINKAT''@|$(REPLACE_SYMLINKAT)|g' \
+	      -e 's|@''REPLACE_TRUNCATE''@|$(REPLACE_TRUNCATE)|g' \
+	      -e 's|@''REPLACE_TTYNAME_R''@|$(REPLACE_TTYNAME_R)|g' \
+	      -e 's|@''REPLACE_UNLINK''@|$(REPLACE_UNLINK)|g' \
+	      -e 's|@''REPLACE_UNLINKAT''@|$(REPLACE_UNLINKAT)|g' \
+	      -e 's|@''REPLACE_USLEEP''@|$(REPLACE_USLEEP)|g' \
+	      -e 's|@''REPLACE_WRITE''@|$(REPLACE_WRITE)|g' \
+	      -e 's|@''UNISTD_H_HAVE_WINSOCK2_H''@|$(UNISTD_H_HAVE_WINSOCK2_H)|g' \
+	      -e 's|@''UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS''@|$(UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS)|g' \
+	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \
+	} > $@-t && \
+	mv $@-t $@
+
+# We need the following in order to create <wchar.h> when the system
+# version does not work standalone.
+wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
+	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+	      -e 's|@''HAVE_FEATURES_H''@|$(HAVE_FEATURES_H)|g' \
+	      -e 's|@''NEXT_WCHAR_H''@|$(NEXT_WCHAR_H)|g' \
+	      -e 's|@''HAVE_WCHAR_H''@|$(HAVE_WCHAR_H)|g' \
+	      -e 's/@''HAVE_CRTDEFS_H''@/$(HAVE_CRTDEFS_H)/g' \
+	      -e 's/@''GNULIB_OVERRIDES_WINT_T''@/$(GNULIB_OVERRIDES_WINT_T)/g' \
+	      -e 's/@''GNULIB_BTOWC''@/$(GNULIB_BTOWC)/g' \
+	      -e 's/@''GNULIB_WCTOB''@/$(GNULIB_WCTOB)/g' \
+	      -e 's/@''GNULIB_MBSINIT''@/$(GNULIB_MBSINIT)/g' \
+	      -e 's/@''GNULIB_MBRTOWC''@/$(GNULIB_MBRTOWC)/g' \
+	      -e 's/@''GNULIB_MBRLEN''@/$(GNULIB_MBRLEN)/g' \
+	      -e 's/@''GNULIB_MBSRTOWCS''@/$(GNULIB_MBSRTOWCS)/g' \
+	      -e 's/@''GNULIB_MBSNRTOWCS''@/$(GNULIB_MBSNRTOWCS)/g' \
+	      -e 's/@''GNULIB_WCRTOMB''@/$(GNULIB_WCRTOMB)/g' \
+	      -e 's/@''GNULIB_WCSRTOMBS''@/$(GNULIB_WCSRTOMBS)/g' \
+	      -e 's/@''GNULIB_WCSNRTOMBS''@/$(GNULIB_WCSNRTOMBS)/g' \
+	      -e 's/@''GNULIB_WCWIDTH''@/$(GNULIB_WCWIDTH)/g' \
+	      -e 's/@''GNULIB_WMEMCHR''@/$(GNULIB_WMEMCHR)/g' \
+	      -e 's/@''GNULIB_WMEMCMP''@/$(GNULIB_WMEMCMP)/g' \
+	      -e 's/@''GNULIB_WMEMCPY''@/$(GNULIB_WMEMCPY)/g' \
+	      -e 's/@''GNULIB_WMEMMOVE''@/$(GNULIB_WMEMMOVE)/g' \
+	      -e 's/@''GNULIB_WMEMSET''@/$(GNULIB_WMEMSET)/g' \
+	      -e 's/@''GNULIB_WCSLEN''@/$(GNULIB_WCSLEN)/g' \
+	      -e 's/@''GNULIB_WCSNLEN''@/$(GNULIB_WCSNLEN)/g' \
+	      -e 's/@''GNULIB_WCSCPY''@/$(GNULIB_WCSCPY)/g' \
+	      -e 's/@''GNULIB_WCPCPY''@/$(GNULIB_WCPCPY)/g' \
+	      -e 's/@''GNULIB_WCSNCPY''@/$(GNULIB_WCSNCPY)/g' \
+	      -e 's/@''GNULIB_WCPNCPY''@/$(GNULIB_WCPNCPY)/g' \
+	      -e 's/@''GNULIB_WCSCAT''@/$(GNULIB_WCSCAT)/g' \
+	      -e 's/@''GNULIB_WCSNCAT''@/$(GNULIB_WCSNCAT)/g' \
+	      -e 's/@''GNULIB_WCSCMP''@/$(GNULIB_WCSCMP)/g' \
+	      -e 's/@''GNULIB_WCSNCMP''@/$(GNULIB_WCSNCMP)/g' \
+	      -e 's/@''GNULIB_WCSCASECMP''@/$(GNULIB_WCSCASECMP)/g' \
+	      -e 's/@''GNULIB_WCSNCASECMP''@/$(GNULIB_WCSNCASECMP)/g' \
+	      -e 's/@''GNULIB_WCSCOLL''@/$(GNULIB_WCSCOLL)/g' \
+	      -e 's/@''GNULIB_WCSXFRM''@/$(GNULIB_WCSXFRM)/g' \
+	      -e 's/@''GNULIB_WCSDUP''@/$(GNULIB_WCSDUP)/g' \
+	      -e 's/@''GNULIB_WCSCHR''@/$(GNULIB_WCSCHR)/g' \
+	      -e 's/@''GNULIB_WCSRCHR''@/$(GNULIB_WCSRCHR)/g' \
+	      -e 's/@''GNULIB_WCSCSPN''@/$(GNULIB_WCSCSPN)/g' \
+	      -e 's/@''GNULIB_WCSSPN''@/$(GNULIB_WCSSPN)/g' \
+	      -e 's/@''GNULIB_WCSPBRK''@/$(GNULIB_WCSPBRK)/g' \
+	      -e 's/@''GNULIB_WCSSTR''@/$(GNULIB_WCSSTR)/g' \
+	      -e 's/@''GNULIB_WCSTOK''@/$(GNULIB_WCSTOK)/g' \
+	      -e 's/@''GNULIB_WCSWIDTH''@/$(GNULIB_WCSWIDTH)/g' \
+	      -e 's/@''GNULIB_WCSFTIME''@/$(GNULIB_WCSFTIME)/g' \
+	      < $(srcdir)/wchar.in.h | \
+	  sed -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \
+	      -e 's|@''HAVE_BTOWC''@|$(HAVE_BTOWC)|g' \
+	      -e 's|@''HAVE_MBSINIT''@|$(HAVE_MBSINIT)|g' \
+	      -e 's|@''HAVE_MBRTOWC''@|$(HAVE_MBRTOWC)|g' \
+	      -e 's|@''HAVE_MBRLEN''@|$(HAVE_MBRLEN)|g' \
+	      -e 's|@''HAVE_MBSRTOWCS''@|$(HAVE_MBSRTOWCS)|g' \
+	      -e 's|@''HAVE_MBSNRTOWCS''@|$(HAVE_MBSNRTOWCS)|g' \
+	      -e 's|@''HAVE_WCRTOMB''@|$(HAVE_WCRTOMB)|g' \
+	      -e 's|@''HAVE_WCSRTOMBS''@|$(HAVE_WCSRTOMBS)|g' \
+	      -e 's|@''HAVE_WCSNRTOMBS''@|$(HAVE_WCSNRTOMBS)|g' \
+	      -e 's|@''HAVE_WMEMCHR''@|$(HAVE_WMEMCHR)|g' \
+	      -e 's|@''HAVE_WMEMCMP''@|$(HAVE_WMEMCMP)|g' \
+	      -e 's|@''HAVE_WMEMCPY''@|$(HAVE_WMEMCPY)|g' \
+	      -e 's|@''HAVE_WMEMMOVE''@|$(HAVE_WMEMMOVE)|g' \
+	      -e 's|@''HAVE_WMEMSET''@|$(HAVE_WMEMSET)|g' \
+	      -e 's|@''HAVE_WCSLEN''@|$(HAVE_WCSLEN)|g' \
+	      -e 's|@''HAVE_WCSNLEN''@|$(HAVE_WCSNLEN)|g' \
+	      -e 's|@''HAVE_WCSCPY''@|$(HAVE_WCSCPY)|g' \
+	      -e 's|@''HAVE_WCPCPY''@|$(HAVE_WCPCPY)|g' \
+	      -e 's|@''HAVE_WCSNCPY''@|$(HAVE_WCSNCPY)|g' \
+	      -e 's|@''HAVE_WCPNCPY''@|$(HAVE_WCPNCPY)|g' \
+	      -e 's|@''HAVE_WCSCAT''@|$(HAVE_WCSCAT)|g' \
+	      -e 's|@''HAVE_WCSNCAT''@|$(HAVE_WCSNCAT)|g' \
+	      -e 's|@''HAVE_WCSCMP''@|$(HAVE_WCSCMP)|g' \
+	      -e 's|@''HAVE_WCSNCMP''@|$(HAVE_WCSNCMP)|g' \
+	      -e 's|@''HAVE_WCSCASECMP''@|$(HAVE_WCSCASECMP)|g' \
+	      -e 's|@''HAVE_WCSNCASECMP''@|$(HAVE_WCSNCASECMP)|g' \
+	      -e 's|@''HAVE_WCSCOLL''@|$(HAVE_WCSCOLL)|g' \
+	      -e 's|@''HAVE_WCSXFRM''@|$(HAVE_WCSXFRM)|g' \
+	      -e 's|@''HAVE_WCSDUP''@|$(HAVE_WCSDUP)|g' \
+	      -e 's|@''HAVE_WCSCHR''@|$(HAVE_WCSCHR)|g' \
+	      -e 's|@''HAVE_WCSRCHR''@|$(HAVE_WCSRCHR)|g' \
+	      -e 's|@''HAVE_WCSCSPN''@|$(HAVE_WCSCSPN)|g' \
+	      -e 's|@''HAVE_WCSSPN''@|$(HAVE_WCSSPN)|g' \
+	      -e 's|@''HAVE_WCSPBRK''@|$(HAVE_WCSPBRK)|g' \
+	      -e 's|@''HAVE_WCSSTR''@|$(HAVE_WCSSTR)|g' \
+	      -e 's|@''HAVE_WCSTOK''@|$(HAVE_WCSTOK)|g' \
+	      -e 's|@''HAVE_WCSWIDTH''@|$(HAVE_WCSWIDTH)|g' \
+	      -e 's|@''HAVE_WCSFTIME''@|$(HAVE_WCSFTIME)|g' \
+	      -e 's|@''HAVE_DECL_WCTOB''@|$(HAVE_DECL_WCTOB)|g' \
+	      -e 's|@''HAVE_DECL_WCWIDTH''@|$(HAVE_DECL_WCWIDTH)|g' \
+	  | \
+	  sed -e 's|@''REPLACE_MBSTATE_T''@|$(REPLACE_MBSTATE_T)|g' \
+	      -e 's|@''REPLACE_BTOWC''@|$(REPLACE_BTOWC)|g' \
+	      -e 's|@''REPLACE_WCTOB''@|$(REPLACE_WCTOB)|g' \
+	      -e 's|@''REPLACE_MBSINIT''@|$(REPLACE_MBSINIT)|g' \
+	      -e 's|@''REPLACE_MBRTOWC''@|$(REPLACE_MBRTOWC)|g' \
+	      -e 's|@''REPLACE_MBRLEN''@|$(REPLACE_MBRLEN)|g' \
+	      -e 's|@''REPLACE_MBSRTOWCS''@|$(REPLACE_MBSRTOWCS)|g' \
+	      -e 's|@''REPLACE_MBSNRTOWCS''@|$(REPLACE_MBSNRTOWCS)|g' \
+	      -e 's|@''REPLACE_WCRTOMB''@|$(REPLACE_WCRTOMB)|g' \
+	      -e 's|@''REPLACE_WCSRTOMBS''@|$(REPLACE_WCSRTOMBS)|g' \
+	      -e 's|@''REPLACE_WCSNRTOMBS''@|$(REPLACE_WCSNRTOMBS)|g' \
+	      -e 's|@''REPLACE_WCWIDTH''@|$(REPLACE_WCWIDTH)|g' \
+	      -e 's|@''REPLACE_WCSWIDTH''@|$(REPLACE_WCSWIDTH)|g' \
+	      -e 's|@''REPLACE_WCSFTIME''@|$(REPLACE_WCSFTIME)|g' \
+	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \
+	} > $@-t && \
+	mv $@-t $@
+
+# We need the following in order to create <wctype.h> when the system
+# doesn't have one that works with the given compiler.
+wctype.h: wctype.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
+	      -e 's/@''HAVE_WCTYPE_H''@/$(HAVE_WCTYPE_H)/g' \
+	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+	      -e 's|@''NEXT_WCTYPE_H''@|$(NEXT_WCTYPE_H)|g' \
+	      -e 's/@''HAVE_CRTDEFS_H''@/$(HAVE_CRTDEFS_H)/g' \
+	      -e 's/@''GNULIB_OVERRIDES_WINT_T''@/$(GNULIB_OVERRIDES_WINT_T)/g' \
+	      -e 's/@''GNULIB_ISWBLANK''@/$(GNULIB_ISWBLANK)/g' \
+	      -e 's/@''GNULIB_WCTYPE''@/$(GNULIB_WCTYPE)/g' \
+	      -e 's/@''GNULIB_ISWCTYPE''@/$(GNULIB_ISWCTYPE)/g' \
+	      -e 's/@''GNULIB_WCTRANS''@/$(GNULIB_WCTRANS)/g' \
+	      -e 's/@''GNULIB_TOWCTRANS''@/$(GNULIB_TOWCTRANS)/g' \
+	      -e 's/@''HAVE_ISWBLANK''@/$(HAVE_ISWBLANK)/g' \
+	      -e 's/@''HAVE_ISWCNTRL''@/$(HAVE_ISWCNTRL)/g' \
+	      -e 's/@''HAVE_WCTYPE_T''@/$(HAVE_WCTYPE_T)/g' \
+	      -e 's/@''HAVE_WCTRANS_T''@/$(HAVE_WCTRANS_T)/g' \
+	      -e 's/@''HAVE_WINT_T''@/$(HAVE_WINT_T)/g' \
+	      -e 's/@''REPLACE_ISWBLANK''@/$(REPLACE_ISWBLANK)/g' \
+	      -e 's/@''REPLACE_ISWCNTRL''@/$(REPLACE_ISWCNTRL)/g' \
+	      -e 's/@''REPLACE_TOWLOWER''@/$(REPLACE_TOWLOWER)/g' \
+	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+	      < $(srcdir)/wctype.in.h; \
+	} > $@-t && \
+	mv $@-t $@
+
+mostlyclean-local: mostlyclean-generic
+	@for dir in '' $(MOSTLYCLEANDIRS); do \
+	  if test -n "$$dir" && test -d $$dir; then \
+	    echo "rmdir $$dir"; rmdir $$dir; \
+	  fi; \
+	done; \
+	:
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/gl/_Noreturn.h b/gl/_Noreturn.h
new file mode 100644
index 0000000..c44ad89
--- /dev/null
+++ b/gl/_Noreturn.h
@@ -0,0 +1,10 @@
+#if !defined _Noreturn && __STDC_VERSION__ < 201112
+# if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__) \
+      || 0x5110 <= __SUNPRO_C)
+#  define _Noreturn __attribute__ ((__noreturn__))
+# elif 1200 <= _MSC_VER
+#  define _Noreturn __declspec (noreturn)
+# else
+#  define _Noreturn
+# endif
+#endif
diff --git a/gl/alloca.in.h b/gl/alloca.in.h
new file mode 100644
index 0000000..f6d41db
--- /dev/null
+++ b/gl/alloca.in.h
@@ -0,0 +1,65 @@
+/* Memory allocation on the stack.
+
+   Copyright (C) 1995, 1999, 2001-2004, 2006-2017 Free Software Foundation,
+   Inc.
+
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Lesser General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with this program; if not, see
+   <http://www.gnu.org/licenses/>.
+  */
+
+/* Avoid using the symbol _ALLOCA_H here, as Bison assumes _ALLOCA_H
+   means there is a real alloca function.  */
+#ifndef _GL_ALLOCA_H
+#define _GL_ALLOCA_H
+
+/* alloca (N) returns a pointer to N bytes of memory
+   allocated on the stack, which will last until the function returns.
+   Use of alloca should be avoided:
+     - inside arguments of function calls - undefined behaviour,
+     - in inline functions - the allocation may actually last until the
+       calling function returns,
+     - for huge N (say, N >= 65536) - you never know how large (or small)
+       the stack is, and when the stack cannot fulfill the memory allocation
+       request, the program just crashes.
+ */
+
+#ifndef alloca
+# ifdef __GNUC__
+#  define alloca __builtin_alloca
+# elif defined _AIX
+#  define alloca __alloca
+# elif defined _MSC_VER
+#  include <malloc.h>
+#  define alloca _alloca
+# elif defined __DECC && defined __VMS
+#  define alloca __ALLOCA
+# elif defined __TANDEM && defined _TNS_E_TARGET
+#  ifdef  __cplusplus
+extern "C"
+#  endif
+void *_alloca (unsigned short);
+#  pragma intrinsic (_alloca)
+#  define alloca _alloca
+# elif defined __MVS__
+#  include <stdlib.h>
+# else
+#  include <stddef.h>
+#  ifdef  __cplusplus
+extern "C"
+#  endif
+void *alloca (size_t);
+# endif
+#endif
+
+#endif /* _GL_ALLOCA_H */
diff --git a/gl/arg-nonnull.h b/gl/arg-nonnull.h
new file mode 100644
index 0000000..f98a9ca
--- /dev/null
+++ b/gl/arg-nonnull.h
@@ -0,0 +1,26 @@
+/* A C macro for declaring that specific arguments must not be NULL.
+   Copyright (C) 2009-2017 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify it
+   under the terms of the GNU Lesser General Public License as published
+   by the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* _GL_ARG_NONNULL((n,...,m)) tells the compiler and static analyzer tools
+   that the values passed as arguments n, ..., m must be non-NULL pointers.
+   n = 1 stands for the first argument, n = 2 for the second argument etc.  */
+#ifndef _GL_ARG_NONNULL
+# if (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || __GNUC__ > 3
+#  define _GL_ARG_NONNULL(params) __attribute__ ((__nonnull__ params))
+# else
+#  define _GL_ARG_NONNULL(params)
+# endif
+#endif
diff --git a/gl/btowc.c b/gl/btowc.c
new file mode 100644
index 0000000..bfc694e
--- /dev/null
+++ b/gl/btowc.c
@@ -0,0 +1,39 @@
+/* Convert unibyte character to wide character.
+   Copyright (C) 2008, 2010-2017 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2008.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include <wchar.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+
+wint_t
+btowc (int c)
+{
+  if (c != EOF)
+    {
+      char buf[1];
+      wchar_t wc;
+
+      buf[0] = c;
+      if (mbtowc (&wc, buf, 1) >= 0)
+        return wc;
+    }
+  return WEOF;
+}
diff --git a/gl/byteswap.in.h b/gl/byteswap.in.h
new file mode 100644
index 0000000..026f5fc
--- /dev/null
+++ b/gl/byteswap.in.h
@@ -0,0 +1,44 @@
+/* byteswap.h - Byte swapping
+   Copyright (C) 2005, 2007, 2009-2017 Free Software Foundation, Inc.
+   Written by Oskar Liljeblad <oskar@osk.mine.nu>, 2005.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#ifndef _GL_BYTESWAP_H
+#define _GL_BYTESWAP_H
+
+/* Given an unsigned 16-bit argument X, return the value corresponding to
+   X with reversed byte order.  */
+#define bswap_16(x) ((((x) & 0x00FF) << 8) | \
+                     (((x) & 0xFF00) >> 8))
+
+/* Given an unsigned 32-bit argument X, return the value corresponding to
+   X with reversed byte order.  */
+#define bswap_32(x) ((((x) & 0x000000FF) << 24) | \
+                     (((x) & 0x0000FF00) << 8) | \
+                     (((x) & 0x00FF0000) >> 8) | \
+                     (((x) & 0xFF000000) >> 24))
+
+/* Given an unsigned 64-bit argument X, return the value corresponding to
+   X with reversed byte order.  */
+#define bswap_64(x) ((((x) & 0x00000000000000FFULL) << 56) | \
+                     (((x) & 0x000000000000FF00ULL) << 40) | \
+                     (((x) & 0x0000000000FF0000ULL) << 24) | \
+                     (((x) & 0x00000000FF000000ULL) << 8) | \
+                     (((x) & 0x000000FF00000000ULL) >> 8) | \
+                     (((x) & 0x0000FF0000000000ULL) >> 24) | \
+                     (((x) & 0x00FF000000000000ULL) >> 40) | \
+                     (((x) & 0xFF00000000000000ULL) >> 56))
+
+#endif /* _GL_BYTESWAP_H */
diff --git a/gl/c++defs.h b/gl/c++defs.h
new file mode 100644
index 0000000..ae10653
--- /dev/null
+++ b/gl/c++defs.h
@@ -0,0 +1,316 @@
+/* C++ compatible function declaration macros.
+   Copyright (C) 2010-2017 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify it
+   under the terms of the GNU Lesser General Public License as published
+   by the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#ifndef _GL_CXXDEFS_H
+#define _GL_CXXDEFS_H
+
+/* Begin/end the GNULIB_NAMESPACE namespace.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_BEGIN_NAMESPACE namespace GNULIB_NAMESPACE {
+# define _GL_END_NAMESPACE }
+#else
+# define _GL_BEGIN_NAMESPACE
+# define _GL_END_NAMESPACE
+#endif
+
+/* The three most frequent use cases of these macros are:
+
+   * For providing a substitute for a function that is missing on some
+     platforms, but is declared and works fine on the platforms on which
+     it exists:
+
+       #if @GNULIB_FOO@
+       # if !@HAVE_FOO@
+       _GL_FUNCDECL_SYS (foo, ...);
+       # endif
+       _GL_CXXALIAS_SYS (foo, ...);
+       _GL_CXXALIASWARN (foo);
+       #elif defined GNULIB_POSIXCHECK
+       ...
+       #endif
+
+   * For providing a replacement for a function that exists on all platforms,
+     but is broken/insufficient and needs to be replaced on some platforms:
+
+       #if @GNULIB_FOO@
+       # if @REPLACE_FOO@
+       #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+       #   undef foo
+       #   define foo rpl_foo
+       #  endif
+       _GL_FUNCDECL_RPL (foo, ...);
+       _GL_CXXALIAS_RPL (foo, ...);
+       # else
+       _GL_CXXALIAS_SYS (foo, ...);
+       # endif
+       _GL_CXXALIASWARN (foo);
+       #elif defined GNULIB_POSIXCHECK
+       ...
+       #endif
+
+   * For providing a replacement for a function that exists on some platforms
+     but is broken/insufficient and needs to be replaced on some of them and
+     is additionally either missing or undeclared on some other platforms:
+
+       #if @GNULIB_FOO@
+       # if @REPLACE_FOO@
+       #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+       #   undef foo
+       #   define foo rpl_foo
+       #  endif
+       _GL_FUNCDECL_RPL (foo, ...);
+       _GL_CXXALIAS_RPL (foo, ...);
+       # else
+       #  if !@HAVE_FOO@   or   if !@HAVE_DECL_FOO@
+       _GL_FUNCDECL_SYS (foo, ...);
+       #  endif
+       _GL_CXXALIAS_SYS (foo, ...);
+       # endif
+       _GL_CXXALIASWARN (foo);
+       #elif defined GNULIB_POSIXCHECK
+       ...
+       #endif
+*/
+
+/* _GL_EXTERN_C declaration;
+   performs the declaration with C linkage.  */
+#if defined __cplusplus
+# define _GL_EXTERN_C extern "C"
+#else
+# define _GL_EXTERN_C extern
+#endif
+
+/* _GL_FUNCDECL_RPL (func, rettype, parameters_and_attributes);
+   declares a replacement function, named rpl_func, with the given prototype,
+   consisting of return type, parameters, and attributes.
+   Example:
+     _GL_FUNCDECL_RPL (open, int, (const char *filename, int flags, ...)
+                                  _GL_ARG_NONNULL ((1)));
+ */
+#define _GL_FUNCDECL_RPL(func,rettype,parameters_and_attributes) \
+  _GL_FUNCDECL_RPL_1 (rpl_##func, rettype, parameters_and_attributes)
+#define _GL_FUNCDECL_RPL_1(rpl_func,rettype,parameters_and_attributes) \
+  _GL_EXTERN_C rettype rpl_func parameters_and_attributes
+
+/* _GL_FUNCDECL_SYS (func, rettype, parameters_and_attributes);
+   declares the system function, named func, with the given prototype,
+   consisting of return type, parameters, and attributes.
+   Example:
+     _GL_FUNCDECL_SYS (open, int, (const char *filename, int flags, ...)
+                                  _GL_ARG_NONNULL ((1)));
+ */
+#define _GL_FUNCDECL_SYS(func,rettype,parameters_and_attributes) \
+  _GL_EXTERN_C rettype func parameters_and_attributes
+
+/* _GL_CXXALIAS_RPL (func, rettype, parameters);
+   declares a C++ alias called GNULIB_NAMESPACE::func
+   that redirects to rpl_func, if GNULIB_NAMESPACE is defined.
+   Example:
+     _GL_CXXALIAS_RPL (open, int, (const char *filename, int flags, ...));
+
+   Wrapping rpl_func in an object with an inline conversion operator
+   avoids a reference to rpl_func unless GNULIB_NAMESPACE::func is
+   actually used in the program.  */
+#define _GL_CXXALIAS_RPL(func,rettype,parameters) \
+  _GL_CXXALIAS_RPL_1 (func, rpl_##func, rettype, parameters)
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \
+    namespace GNULIB_NAMESPACE                                \
+    {                                                         \
+      static const struct _gl_ ## func ## _wrapper            \
+      {                                                       \
+        typedef rettype (*type) parameters;                   \
+                                                              \
+        inline operator type () const                         \
+        {                                                     \
+          return ::rpl_func;                                  \
+        }                                                     \
+      } func = {};                                            \
+    }                                                         \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#else
+# define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIAS_RPL_CAST_1 (func, rpl_func, rettype, parameters);
+   is like  _GL_CXXALIAS_RPL_1 (func, rpl_func, rettype, parameters);
+   except that the C function rpl_func may have a slightly different
+   declaration.  A cast is used to silence the "invalid conversion" error
+   that would otherwise occur.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \
+    namespace GNULIB_NAMESPACE                                     \
+    {                                                              \
+      static const struct _gl_ ## func ## _wrapper                 \
+      {                                                            \
+        typedef rettype (*type) parameters;                        \
+                                                                   \
+        inline operator type () const                              \
+        {                                                          \
+          return reinterpret_cast<type>(::rpl_func);               \
+        }                                                          \
+      } func = {};                                                 \
+    }                                                              \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#else
+# define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIAS_SYS (func, rettype, parameters);
+   declares a C++ alias called GNULIB_NAMESPACE::func
+   that redirects to the system provided function func, if GNULIB_NAMESPACE
+   is defined.
+   Example:
+     _GL_CXXALIAS_SYS (open, int, (const char *filename, int flags, ...));
+
+   Wrapping func in an object with an inline conversion operator
+   avoids a reference to func unless GNULIB_NAMESPACE::func is
+   actually used in the program.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_CXXALIAS_SYS(func,rettype,parameters)            \
+    namespace GNULIB_NAMESPACE                                \
+    {                                                         \
+      static const struct _gl_ ## func ## _wrapper            \
+      {                                                       \
+        typedef rettype (*type) parameters;                   \
+                                                              \
+        inline operator type () const                         \
+        {                                                     \
+          return ::func;                                      \
+        }                                                     \
+      } func = {};                                            \
+    }                                                         \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#else
+# define _GL_CXXALIAS_SYS(func,rettype,parameters) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIAS_SYS_CAST (func, rettype, parameters);
+   is like  _GL_CXXALIAS_SYS (func, rettype, parameters);
+   except that the C function func may have a slightly different declaration.
+   A cast is used to silence the "invalid conversion" error that would
+   otherwise occur.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \
+    namespace GNULIB_NAMESPACE                          \
+    {                                                   \
+      static const struct _gl_ ## func ## _wrapper      \
+      {                                                 \
+        typedef rettype (*type) parameters;             \
+                                                        \
+        inline operator type () const                   \
+        {                                               \
+          return reinterpret_cast<type>(::func);        \
+        }                                               \
+      } func = {};                                      \
+    }                                                   \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#else
+# define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIAS_SYS_CAST2 (func, rettype, parameters, rettype2, parameters2);
+   is like  _GL_CXXALIAS_SYS (func, rettype, parameters);
+   except that the C function is picked among a set of overloaded functions,
+   namely the one with rettype2 and parameters2.  Two consecutive casts
+   are used to silence the "cannot find a match" and "invalid conversion"
+   errors that would otherwise occur.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+  /* The outer cast must be a reinterpret_cast.
+     The inner cast: When the function is defined as a set of overloaded
+     functions, it works as a static_cast<>, choosing the designated variant.
+     When the function is defined as a single variant, it works as a
+     reinterpret_cast<>. The parenthesized cast syntax works both ways.  */
+# define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \
+    namespace GNULIB_NAMESPACE                                                \
+    {                                                                         \
+      static const struct _gl_ ## func ## _wrapper                            \
+      {                                                                       \
+        typedef rettype (*type) parameters;                                   \
+                                                                              \
+        inline operator type () const                                         \
+        {                                                                     \
+          return reinterpret_cast<type>((rettype2 (*) parameters2)(::func));  \
+        }                                                                     \
+      } func = {};                                                            \
+    }                                                                         \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#else
+# define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIASWARN (func);
+   causes a warning to be emitted when ::func is used but not when
+   GNULIB_NAMESPACE::func is used.  func must be defined without overloaded
+   variants.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_CXXALIASWARN(func) \
+   _GL_CXXALIASWARN_1 (func, GNULIB_NAMESPACE)
+# define _GL_CXXALIASWARN_1(func,namespace) \
+   _GL_CXXALIASWARN_2 (func, namespace)
+/* To work around GCC bug <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43881>,
+   we enable the warning only when not optimizing.  */
+# if !__OPTIMIZE__
+#  define _GL_CXXALIASWARN_2(func,namespace) \
+    _GL_WARN_ON_USE (func, \
+                     "The symbol ::" #func " refers to the system function. " \
+                     "Use " #namespace "::" #func " instead.")
+# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
+#  define _GL_CXXALIASWARN_2(func,namespace) \
+     extern __typeof__ (func) func
+# else
+#  define _GL_CXXALIASWARN_2(func,namespace) \
+     _GL_EXTERN_C int _gl_cxxalias_dummy
+# endif
+#else
+# define _GL_CXXALIASWARN(func) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIASWARN1 (func, rettype, parameters_and_attributes);
+   causes a warning to be emitted when the given overloaded variant of ::func
+   is used but not when GNULIB_NAMESPACE::func is used.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \
+   _GL_CXXALIASWARN1_1 (func, rettype, parameters_and_attributes, \
+                        GNULIB_NAMESPACE)
+# define _GL_CXXALIASWARN1_1(func,rettype,parameters_and_attributes,namespace) \
+   _GL_CXXALIASWARN1_2 (func, rettype, parameters_and_attributes, namespace)
+/* To work around GCC bug <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43881>,
+   we enable the warning only when not optimizing.  */
+# if !__OPTIMIZE__
+#  define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \
+    _GL_WARN_ON_USE_CXX (func, rettype, parameters_and_attributes, \
+                         "The symbol ::" #func " refers to the system function. " \
+                         "Use " #namespace "::" #func " instead.")
+# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
+#  define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \
+     extern __typeof__ (func) func
+# else
+#  define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \
+     _GL_EXTERN_C int _gl_cxxalias_dummy
+# endif
+#else
+# define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+#endif /* _GL_CXXDEFS_H */
diff --git a/gl/config.charset b/gl/config.charset
new file mode 100644
index 0000000..83cf4ec
--- /dev/null
+++ b/gl/config.charset
@@ -0,0 +1,682 @@
+#! /bin/sh
+# Output a system dependent table of character encoding aliases.
+#
+#   Copyright (C) 2000-2004, 2006-2017 Free Software Foundation, Inc.
+#
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU Lesser General Public License as published by
+#   the Free Software Foundation; either version 2, or (at your option)
+#   any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU Lesser General Public License for more details.
+#
+#   You should have received a copy of the GNU Lesser General Public License along
+#   with this program; if not, see <http://www.gnu.org/licenses/>.
+#
+# The table consists of lines of the form
+#    ALIAS  CANONICAL
+#
+# ALIAS is the (system dependent) result of "nl_langinfo (CODESET)".
+# ALIAS is compared in a case sensitive way.
+#
+# CANONICAL is the GNU canonical name for this character encoding.
+# It must be an encoding supported by libiconv. Support by GNU libc is
+# also desirable. CANONICAL is case insensitive. Usually an upper case
+# MIME charset name is preferred.
+# The current list of GNU canonical charset names is as follows.
+#
+#       name              MIME?             used by which systems
+#                                    (darwin = Mac OS X, woe32 = native Windows)
+#
+#   ASCII, ANSI_X3.4-1968       glibc solaris freebsd netbsd darwin cygwin
+#   ISO-8859-1              Y   glibc aix hpux irix osf solaris freebsd netbsd openbsd darwin cygwin
+#   ISO-8859-2              Y   glibc aix hpux irix osf solaris freebsd netbsd openbsd darwin cygwin
+#   ISO-8859-3              Y   glibc solaris cygwin
+#   ISO-8859-4              Y   osf solaris freebsd netbsd openbsd darwin
+#   ISO-8859-5              Y   glibc aix hpux irix osf solaris freebsd netbsd openbsd darwin cygwin
+#   ISO-8859-6              Y   glibc aix hpux solaris cygwin
+#   ISO-8859-7              Y   glibc aix hpux irix osf solaris netbsd openbsd darwin cygwin
+#   ISO-8859-8              Y   glibc aix hpux osf solaris cygwin
+#   ISO-8859-9              Y   glibc aix hpux irix osf solaris darwin cygwin
+#   ISO-8859-13                 glibc netbsd openbsd darwin cygwin
+#   ISO-8859-14                 glibc cygwin
+#   ISO-8859-15                 glibc aix osf solaris freebsd netbsd openbsd darwin cygwin
+#   KOI8-R                  Y   glibc solaris freebsd netbsd openbsd darwin
+#   KOI8-U                  Y   glibc freebsd netbsd openbsd darwin cygwin
+#   KOI8-T                      glibc
+#   CP437                       dos
+#   CP775                       dos
+#   CP850                       aix osf dos
+#   CP852                       dos
+#   CP855                       dos
+#   CP856                       aix
+#   CP857                       dos
+#   CP861                       dos
+#   CP862                       dos
+#   CP864                       dos
+#   CP865                       dos
+#   CP866                       freebsd netbsd openbsd darwin dos
+#   CP869                       dos
+#   CP874                       woe32 dos
+#   CP922                       aix
+#   CP932                       aix cygwin woe32 dos
+#   CP943                       aix
+#   CP949                       osf darwin woe32 dos
+#   CP950                       woe32 dos
+#   CP1046                      aix
+#   CP1124                      aix
+#   CP1125                      dos
+#   CP1129                      aix
+#   CP1131                      darwin
+#   CP1250                      woe32
+#   CP1251                      glibc solaris netbsd openbsd darwin cygwin woe32
+#   CP1252                      aix woe32
+#   CP1253                      woe32
+#   CP1254                      woe32
+#   CP1255                      glibc woe32
+#   CP1256                      woe32
+#   CP1257                      woe32
+#   GB2312                  Y   glibc aix hpux irix solaris freebsd netbsd darwin
+#   EUC-JP                  Y   glibc aix hpux irix osf solaris freebsd netbsd darwin
+#   EUC-KR                  Y   glibc aix hpux irix osf solaris freebsd netbsd darwin cygwin
+#   EUC-TW                      glibc aix hpux irix osf solaris netbsd
+#   BIG5                    Y   glibc aix hpux osf solaris freebsd netbsd darwin cygwin
+#   BIG5-HKSCS                  glibc solaris darwin
+#   GBK                         glibc aix osf solaris darwin cygwin woe32 dos
+#   GB18030                     glibc solaris netbsd darwin
+#   SHIFT_JIS               Y   hpux osf solaris freebsd netbsd darwin
+#   JOHAB                       glibc solaris woe32
+#   TIS-620                     glibc aix hpux osf solaris cygwin
+#   VISCII                  Y   glibc
+#   TCVN5712-1                  glibc
+#   ARMSCII-8                   glibc darwin
+#   GEORGIAN-PS                 glibc cygwin
+#   PT154                       glibc
+#   HP-ROMAN8                   hpux
+#   HP-ARABIC8                  hpux
+#   HP-GREEK8                   hpux
+#   HP-HEBREW8                  hpux
+#   HP-TURKISH8                 hpux
+#   HP-KANA8                    hpux
+#   DEC-KANJI                   osf
+#   DEC-HANYU                   osf
+#   UTF-8                   Y   glibc aix hpux osf solaris netbsd darwin cygwin
+#
+# Note: Names which are not marked as being a MIME name should not be used in
+# Internet protocols for information interchange (mail, news, etc.).
+#
+# Note: ASCII and ANSI_X3.4-1968 are synonymous canonical names. Applications
+# must understand both names and treat them as equivalent.
+#
+# The first argument passed to this file is the canonical host specification,
+#    CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or
+#    CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+
+host="$1"
+os=`echo "$host" | sed -e 's/^[^-]*-[^-]*-\(.*\)$/\1/'`
+echo "# This file contains a table of character encoding aliases,"
+echo "# suitable for operating system '${os}'."
+echo "# It was automatically generated from config.charset."
+# List of references, updated during installation:
+echo "# Packages using this file: "
+case "$os" in
+  linux-gnulibc1*)
+    # Linux libc5 doesn't have nl_langinfo(CODESET); therefore
+    # localcharset.c falls back to using the full locale name
+    # from the environment variables.
+    echo "C ASCII"
+    echo "POSIX ASCII"
+    for l in af af_ZA ca ca_ES da da_DK de de_AT de_BE de_CH de_DE de_LU \
+             en en_AU en_BW en_CA en_DK en_GB en_IE en_NZ en_US en_ZA \
+             en_ZW es es_AR es_BO es_CL es_CO es_DO es_EC es_ES es_GT \
+             es_HN es_MX es_PA es_PE es_PY es_SV es_US es_UY es_VE et \
+             et_EE eu eu_ES fi fi_FI fo fo_FO fr fr_BE fr_CA fr_CH fr_FR \
+             fr_LU ga ga_IE gl gl_ES id id_ID in in_ID is is_IS it it_CH \
+             it_IT kl kl_GL nl nl_BE nl_NL no no_NO pt pt_BR pt_PT sv \
+             sv_FI sv_SE; do
+      echo "$l ISO-8859-1"
+      echo "$l.iso-8859-1 ISO-8859-1"
+      echo "$l.iso-8859-15 ISO-8859-15"
+      echo "$l.iso-8859-15@euro ISO-8859-15"
+      echo "$l@euro ISO-8859-15"
+      echo "$l.cp-437 CP437"
+      echo "$l.cp-850 CP850"
+      echo "$l.cp-1252 CP1252"
+      echo "$l.cp-1252@euro CP1252"
+      #echo "$l.atari-st ATARI-ST" # not a commonly used encoding
+      echo "$l.utf-8 UTF-8"
+      echo "$l.utf-8@euro UTF-8"
+    done
+    for l in cs cs_CZ hr hr_HR hu hu_HU pl pl_PL ro ro_RO sk sk_SK sl \
+             sl_SI sr sr_CS sr_YU; do
+      echo "$l ISO-8859-2"
+      echo "$l.iso-8859-2 ISO-8859-2"
+      echo "$l.cp-852 CP852"
+      echo "$l.cp-1250 CP1250"
+      echo "$l.utf-8 UTF-8"
+    done
+    for l in mk mk_MK ru ru_RU; do
+      echo "$l ISO-8859-5"
+      echo "$l.iso-8859-5 ISO-8859-5"
+      echo "$l.koi8-r KOI8-R"
+      echo "$l.cp-866 CP866"
+      echo "$l.cp-1251 CP1251"
+      echo "$l.utf-8 UTF-8"
+    done
+    for l in ar ar_SA; do
+      echo "$l ISO-8859-6"
+      echo "$l.iso-8859-6 ISO-8859-6"
+      echo "$l.cp-864 CP864"
+      #echo "$l.cp-868 CP868" # not a commonly used encoding
+      echo "$l.cp-1256 CP1256"
+      echo "$l.utf-8 UTF-8"
+    done
+    for l in el el_GR gr gr_GR; do
+      echo "$l ISO-8859-7"
+      echo "$l.iso-8859-7 ISO-8859-7"
+      echo "$l.cp-869 CP869"
+      echo "$l.cp-1253 CP1253"
+      echo "$l.cp-1253@euro CP1253"
+      echo "$l.utf-8 UTF-8"
+      echo "$l.utf-8@euro UTF-8"
+    done
+    for l in he he_IL iw iw_IL; do
+      echo "$l ISO-8859-8"
+      echo "$l.iso-8859-8 ISO-8859-8"
+      echo "$l.cp-862 CP862"
+      echo "$l.cp-1255 CP1255"
+      echo "$l.utf-8 UTF-8"
+    done
+    for l in tr tr_TR; do
+      echo "$l ISO-8859-9"
+      echo "$l.iso-8859-9 ISO-8859-9"
+      echo "$l.cp-857 CP857"
+      echo "$l.cp-1254 CP1254"
+      echo "$l.utf-8 UTF-8"
+    done
+    for l in lt lt_LT lv lv_LV; do
+      #echo "$l BALTIC" # not a commonly used encoding, wrong encoding name
+      echo "$l ISO-8859-13"
+    done
+    for l in ru_UA uk uk_UA; do
+      echo "$l KOI8-U"
+    done
+    for l in zh zh_CN; do
+      #echo "$l GB_2312-80" # not a commonly used encoding, wrong encoding name
+      echo "$l GB2312"
+    done
+    for l in ja ja_JP ja_JP.EUC; do
+      echo "$l EUC-JP"
+    done
+    for l in ko ko_KR; do
+      echo "$l EUC-KR"
+    done
+    for l in th th_TH; do
+      echo "$l TIS-620"
+    done
+    for l in fa fa_IR; do
+      #echo "$l ISIRI-3342" # a broken encoding
+      echo "$l.utf-8 UTF-8"
+    done
+    ;;
+  linux* | *-gnu*)
+    # With glibc-2.1 or newer, we don't need any canonicalization,
+    # because glibc has iconv and both glibc and libiconv support all
+    # GNU canonical names directly. Therefore, the Makefile does not
+    # need to install the alias file at all.
+    # The following applies only to glibc-2.0.x and older libcs.
+    echo "ISO_646.IRV:1983 ASCII"
+    ;;
+  aix*)
+    echo "ISO8859-1 ISO-8859-1"
+    echo "ISO8859-2 ISO-8859-2"
+    echo "ISO8859-5 ISO-8859-5"
+    echo "ISO8859-6 ISO-8859-6"
+    echo "ISO8859-7 ISO-8859-7"
+    echo "ISO8859-8 ISO-8859-8"
+    echo "ISO8859-9 ISO-8859-9"
+    echo "ISO8859-15 ISO-8859-15"
+    echo "IBM-850 CP850"
+    echo "IBM-856 CP856"
+    echo "IBM-921 ISO-8859-13"
+    echo "IBM-922 CP922"
+    echo "IBM-932 CP932"
+    echo "IBM-943 CP943"
+    echo "IBM-1046 CP1046"
+    echo "IBM-1124 CP1124"
+    echo "IBM-1129 CP1129"
+    echo "IBM-1252 CP1252"
+    echo "IBM-eucCN GB2312"
+    echo "IBM-eucJP EUC-JP"
+    echo "IBM-eucKR EUC-KR"
+    echo "IBM-eucTW EUC-TW"
+    echo "big5 BIG5"
+    echo "GBK GBK"
+    echo "TIS-620 TIS-620"
+    echo "UTF-8 UTF-8"
+    ;;
+  hpux*)
+    echo "iso88591 ISO-8859-1"
+    echo "iso88592 ISO-8859-2"
+    echo "iso88595 ISO-8859-5"
+    echo "iso88596 ISO-8859-6"
+    echo "iso88597 ISO-8859-7"
+    echo "iso88598 ISO-8859-8"
+    echo "iso88599 ISO-8859-9"
+    echo "iso885915 ISO-8859-15"
+    echo "roman8 HP-ROMAN8"
+    echo "arabic8 HP-ARABIC8"
+    echo "greek8 HP-GREEK8"
+    echo "hebrew8 HP-HEBREW8"
+    echo "turkish8 HP-TURKISH8"
+    echo "kana8 HP-KANA8"
+    echo "tis620 TIS-620"
+    echo "big5 BIG5"
+    echo "eucJP EUC-JP"
+    echo "eucKR EUC-KR"
+    echo "eucTW EUC-TW"
+    echo "hp15CN GB2312"
+    #echo "ccdc ?" # what is this?
+    echo "SJIS SHIFT_JIS"
+    echo "utf8 UTF-8"
+    ;;
+  irix*)
+    echo "ISO8859-1 ISO-8859-1"
+    echo "ISO8859-2 ISO-8859-2"
+    echo "ISO8859-5 ISO-8859-5"
+    echo "ISO8859-7 ISO-8859-7"
+    echo "ISO8859-9 ISO-8859-9"
+    echo "eucCN GB2312"
+    echo "eucJP EUC-JP"
+    echo "eucKR EUC-KR"
+    echo "eucTW EUC-TW"
+    ;;
+  osf*)
+    echo "ISO8859-1 ISO-8859-1"
+    echo "ISO8859-2 ISO-8859-2"
+    echo "ISO8859-4 ISO-8859-4"
+    echo "ISO8859-5 ISO-8859-5"
+    echo "ISO8859-7 ISO-8859-7"
+    echo "ISO8859-8 ISO-8859-8"
+    echo "ISO8859-9 ISO-8859-9"
+    echo "ISO8859-15 ISO-8859-15"
+    echo "cp850 CP850"
+    echo "big5 BIG5"
+    echo "dechanyu DEC-HANYU"
+    echo "dechanzi GB2312"
+    echo "deckanji DEC-KANJI"
+    echo "deckorean EUC-KR"
+    echo "eucJP EUC-JP"
+    echo "eucKR EUC-KR"
+    echo "eucTW EUC-TW"
+    echo "GBK GBK"
+    echo "KSC5601 CP949"
+    echo "sdeckanji EUC-JP"
+    echo "SJIS SHIFT_JIS"
+    echo "TACTIS TIS-620"
+    echo "UTF-8 UTF-8"
+    ;;
+  solaris*)
+    echo "646 ASCII"
+    echo "ISO8859-1 ISO-8859-1"
+    echo "ISO8859-2 ISO-8859-2"
+    echo "ISO8859-3 ISO-8859-3"
+    echo "ISO8859-4 ISO-8859-4"
+    echo "ISO8859-5 ISO-8859-5"
+    echo "ISO8859-6 ISO-8859-6"
+    echo "ISO8859-7 ISO-8859-7"
+    echo "ISO8859-8 ISO-8859-8"
+    echo "ISO8859-9 ISO-8859-9"
+    echo "ISO8859-15 ISO-8859-15"
+    echo "koi8-r KOI8-R"
+    echo "ansi-1251 CP1251"
+    echo "BIG5 BIG5"
+    echo "Big5-HKSCS BIG5-HKSCS"
+    echo "gb2312 GB2312"
+    echo "GBK GBK"
+    echo "GB18030 GB18030"
+    echo "cns11643 EUC-TW"
+    echo "5601 EUC-KR"
+    echo "ko_KR.johap92 JOHAB"
+    echo "eucJP EUC-JP"
+    echo "PCK SHIFT_JIS"
+    echo "TIS620.2533 TIS-620"
+    #echo "sun_eu_greek ?" # what is this?
+    echo "UTF-8 UTF-8"
+    ;;
+  freebsd*)
+    # FreeBSD 4.2 doesn't have nl_langinfo(CODESET); therefore
+    # localcharset.c falls back to using the full locale name
+    # from the environment variables.
+    echo "C ASCII"
+    echo "US-ASCII ASCII"
+    for l in la_LN lt_LN; do
+      echo "$l.ASCII ASCII"
+    done
+    for l in da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_US es_ES \
+             fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH it_IT la_LN \
+             lt_LN nl_BE nl_NL no_NO pt_PT sv_SE; do
+      echo "$l.ISO_8859-1 ISO-8859-1"
+      echo "$l.DIS_8859-15 ISO-8859-15"
+    done
+    for l in cs_CZ hr_HR hu_HU la_LN lt_LN pl_PL sl_SI; do
+      echo "$l.ISO_8859-2 ISO-8859-2"
+    done
+    for l in la_LN lt_LT; do
+      echo "$l.ISO_8859-4 ISO-8859-4"
+    done
+    for l in ru_RU ru_SU; do
+      echo "$l.KOI8-R KOI8-R"
+      echo "$l.ISO_8859-5 ISO-8859-5"
+      echo "$l.CP866 CP866"
+    done
+    echo "uk_UA.KOI8-U KOI8-U"
+    echo "zh_TW.BIG5 BIG5"
+    echo "zh_TW.Big5 BIG5"
+    echo "zh_CN.EUC GB2312"
+    echo "ja_JP.EUC EUC-JP"
+    echo "ja_JP.SJIS SHIFT_JIS"
+    echo "ja_JP.Shift_JIS SHIFT_JIS"
+    echo "ko_KR.EUC EUC-KR"
+    ;;
+  netbsd*)
+    echo "646 ASCII"
+    echo "ISO8859-1 ISO-8859-1"
+    echo "ISO8859-2 ISO-8859-2"
+    echo "ISO8859-4 ISO-8859-4"
+    echo "ISO8859-5 ISO-8859-5"
+    echo "ISO8859-7 ISO-8859-7"
+    echo "ISO8859-13 ISO-8859-13"
+    echo "ISO8859-15 ISO-8859-15"
+    echo "eucCN GB2312"
+    echo "eucJP EUC-JP"
+    echo "eucKR EUC-KR"
+    echo "eucTW EUC-TW"
+    echo "BIG5 BIG5"
+    echo "SJIS SHIFT_JIS"
+    ;;
+  openbsd*)
+    echo "646 ASCII"
+    echo "ISO8859-1 ISO-8859-1"
+    echo "ISO8859-2 ISO-8859-2"
+    echo "ISO8859-4 ISO-8859-4"
+    echo "ISO8859-5 ISO-8859-5"
+    echo "ISO8859-7 ISO-8859-7"
+    echo "ISO8859-13 ISO-8859-13"
+    echo "ISO8859-15 ISO-8859-15"
+    ;;
+  darwin[56]*)
+    # Darwin 6.8 doesn't have nl_langinfo(CODESET); therefore
+    # localcharset.c falls back to using the full locale name
+    # from the environment variables.
+    echo "C ASCII"
+    for l in en_AU en_CA en_GB en_US la_LN; do
+      echo "$l.US-ASCII ASCII"
+    done
+    for l in da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_US es_ES \
+             fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH it_IT nl_BE \
+             nl_NL no_NO pt_PT sv_SE; do
+      echo "$l ISO-8859-1"
+      echo "$l.ISO8859-1 ISO-8859-1"
+      echo "$l.ISO8859-15 ISO-8859-15"
+    done
+    for l in la_LN; do
+      echo "$l.ISO8859-1 ISO-8859-1"
+      echo "$l.ISO8859-15 ISO-8859-15"
+    done
+    for l in cs_CZ hr_HR hu_HU la_LN pl_PL sl_SI; do
+      echo "$l.ISO8859-2 ISO-8859-2"
+    done
+    for l in la_LN lt_LT; do
+      echo "$l.ISO8859-4 ISO-8859-4"
+    done
+    for l in ru_RU; do
+      echo "$l.KOI8-R KOI8-R"
+      echo "$l.ISO8859-5 ISO-8859-5"
+      echo "$l.CP866 CP866"
+    done
+    for l in bg_BG; do
+      echo "$l.CP1251 CP1251"
+    done
+    echo "uk_UA.KOI8-U KOI8-U"
+    echo "zh_TW.BIG5 BIG5"
+    echo "zh_TW.Big5 BIG5"
+    echo "zh_CN.EUC GB2312"
+    echo "ja_JP.EUC EUC-JP"
+    echo "ja_JP.SJIS SHIFT_JIS"
+    echo "ko_KR.EUC EUC-KR"
+    ;;
+  darwin*)
+    # Darwin 7.5 has nl_langinfo(CODESET), but sometimes its value is
+    # useless:
+    # - It returns the empty string when LANG is set to a locale of the
+    #   form ll_CC, although ll_CC/LC_CTYPE is a symlink to an UTF-8
+    #   LC_CTYPE file.
+    # - The environment variables LANG, LC_CTYPE, LC_ALL are not set by
+    #   the system; nl_langinfo(CODESET) returns "US-ASCII" in this case.
+    # - The documentation says:
+    #     "... all code that calls BSD system routines should ensure
+    #      that the const *char parameters of these routines are in UTF-8
+    #      encoding. All BSD system functions expect their string
+    #      parameters to be in UTF-8 encoding and nothing else."
+    #   It also says
+    #     "An additional caveat is that string parameters for files,
+    #      paths, and other file-system entities must be in canonical
+    #      UTF-8. In a canonical UTF-8 Unicode string, all decomposable
+    #      characters are decomposed ..."
+    #   but this is not true: You can pass non-decomposed UTF-8 strings
+    #   to file system functions, and it is the OS which will convert
+    #   them to decomposed UTF-8 before accessing the file system.
+    # - The Apple Terminal application displays UTF-8 by default.
+    # - However, other applications are free to use different encodings:
+    #   - xterm uses ISO-8859-1 by default.
+    #   - TextEdit uses MacRoman by default.
+    # We prefer UTF-8 over decomposed UTF-8-MAC because one should
+    # minimize the use of decomposed Unicode. Unfortunately, through the
+    # Darwin file system, decomposed UTF-8 strings are leaked into user
+    # space nevertheless.
+    # Then there are also the locales with encodings other than US-ASCII
+    # and UTF-8. These locales can be occasionally useful to users (e.g.
+    # when grepping through ISO-8859-1 encoded text files), when all their
+    # file names are in US-ASCII.
+    echo "ISO8859-1 ISO-8859-1"
+    echo "ISO8859-2 ISO-8859-2"
+    echo "ISO8859-4 ISO-8859-4"
+    echo "ISO8859-5 ISO-8859-5"
+    echo "ISO8859-7 ISO-8859-7"
+    echo "ISO8859-9 ISO-8859-9"
+    echo "ISO8859-13 ISO-8859-13"
+    echo "ISO8859-15 ISO-8859-15"
+    echo "KOI8-R KOI8-R"
+    echo "KOI8-U KOI8-U"
+    echo "CP866 CP866"
+    echo "CP949 CP949"
+    echo "CP1131 CP1131"
+    echo "CP1251 CP1251"
+    echo "eucCN GB2312"
+    echo "GB2312 GB2312"
+    echo "eucJP EUC-JP"
+    echo "eucKR EUC-KR"
+    echo "Big5 BIG5"
+    echo "Big5HKSCS BIG5-HKSCS"
+    echo "GBK GBK"
+    echo "GB18030 GB18030"
+    echo "SJIS SHIFT_JIS"
+    echo "ARMSCII-8 ARMSCII-8"
+    echo "PT154 PT154"
+    #echo "ISCII-DEV ?"
+    echo "* UTF-8"
+    ;;
+  beos* | haiku*)
+    # BeOS and Haiku have a single locale, and it has UTF-8 encoding.
+    echo "* UTF-8"
+    ;;
+  msdosdjgpp*)
+    # DJGPP 2.03 doesn't have nl_langinfo(CODESET); therefore
+    # localcharset.c falls back to using the full locale name
+    # from the environment variables.
+    echo "#"
+    echo "# The encodings given here may not all be correct."
+    echo "# If you find that the encoding given for your language and"
+    echo "# country is not the one your DOS machine actually uses, just"
+    echo "# correct it in this file, and send a mail to"
+    echo "# Juan Manuel Guerrero <juan.guerrero@gmx.de>"
+    echo "# and Bruno Haible <bruno@clisp.org>."
+    echo "#"
+    echo "C ASCII"
+    # ISO-8859-1 languages
+    echo "ca CP850"
+    echo "ca_ES CP850"
+    echo "da CP865"    # not CP850 ??
+    echo "da_DK CP865" # not CP850 ??
+    echo "de CP850"
+    echo "de_AT CP850"
+    echo "de_CH CP850"
+    echo "de_DE CP850"
+    echo "en CP850"
+    echo "en_AU CP850" # not CP437 ??
+    echo "en_CA CP850"
+    echo "en_GB CP850"
+    echo "en_NZ CP437"
+    echo "en_US CP437"
+    echo "en_ZA CP850" # not CP437 ??
+    echo "es CP850"
+    echo "es_AR CP850"
+    echo "es_BO CP850"
+    echo "es_CL CP850"
+    echo "es_CO CP850"
+    echo "es_CR CP850"
+    echo "es_CU CP850"
+    echo "es_DO CP850"
+    echo "es_EC CP850"
+    echo "es_ES CP850"
+    echo "es_GT CP850"
+    echo "es_HN CP850"
+    echo "es_MX CP850"
+    echo "es_NI CP850"
+    echo "es_PA CP850"
+    echo "es_PY CP850"
+    echo "es_PE CP850"
+    echo "es_SV CP850"
+    echo "es_UY CP850"
+    echo "es_VE CP850"
+    echo "et CP850"
+    echo "et_EE CP850"
+    echo "eu CP850"
+    echo "eu_ES CP850"
+    echo "fi CP850"
+    echo "fi_FI CP850"
+    echo "fr CP850"
+    echo "fr_BE CP850"
+    echo "fr_CA CP850"
+    echo "fr_CH CP850"
+    echo "fr_FR CP850"
+    echo "ga CP850"
+    echo "ga_IE CP850"
+    echo "gd CP850"
+    echo "gd_GB CP850"
+    echo "gl CP850"
+    echo "gl_ES CP850"
+    echo "id CP850"    # not CP437 ??
+    echo "id_ID CP850" # not CP437 ??
+    echo "is CP861"    # not CP850 ??
+    echo "is_IS CP861" # not CP850 ??
+    echo "it CP850"
+    echo "it_CH CP850"
+    echo "it_IT CP850"
+    echo "lt CP775"
+    echo "lt_LT CP775"
+    echo "lv CP775"
+    echo "lv_LV CP775"
+    echo "nb CP865"    # not CP850 ??
+    echo "nb_NO CP865" # not CP850 ??
+    echo "nl CP850"
+    echo "nl_BE CP850"
+    echo "nl_NL CP850"
+    echo "nn CP865"    # not CP850 ??
+    echo "nn_NO CP865" # not CP850 ??
+    echo "no CP865"    # not CP850 ??
+    echo "no_NO CP865" # not CP850 ??
+    echo "pt CP850"
+    echo "pt_BR CP850"
+    echo "pt_PT CP850"
+    echo "sv CP850"
+    echo "sv_SE CP850"
+    # ISO-8859-2 languages
+    echo "cs CP852"
+    echo "cs_CZ CP852"
+    echo "hr CP852"
+    echo "hr_HR CP852"
+    echo "hu CP852"
+    echo "hu_HU CP852"
+    echo "pl CP852"
+    echo "pl_PL CP852"
+    echo "ro CP852"
+    echo "ro_RO CP852"
+    echo "sk CP852"
+    echo "sk_SK CP852"
+    echo "sl CP852"
+    echo "sl_SI CP852"
+    echo "sq CP852"
+    echo "sq_AL CP852"
+    echo "sr CP852"    # CP852 or CP866 or CP855 ??
+    echo "sr_CS CP852" # CP852 or CP866 or CP855 ??
+    echo "sr_YU CP852" # CP852 or CP866 or CP855 ??
+    # ISO-8859-3 languages
+    echo "mt CP850"
+    echo "mt_MT CP850"
+    # ISO-8859-5 languages
+    echo "be CP866"
+    echo "be_BE CP866"
+    echo "bg CP866"    # not CP855 ??
+    echo "bg_BG CP866" # not CP855 ??
+    echo "mk CP866"    # not CP855 ??
+    echo "mk_MK CP866" # not CP855 ??
+    echo "ru CP866"
+    echo "ru_RU CP866"
+    echo "uk CP1125"
+    echo "uk_UA CP1125"
+    # ISO-8859-6 languages
+    echo "ar CP864"
+    echo "ar_AE CP864"
+    echo "ar_DZ CP864"
+    echo "ar_EG CP864"
+    echo "ar_IQ CP864"
+    echo "ar_IR CP864"
+    echo "ar_JO CP864"
+    echo "ar_KW CP864"
+    echo "ar_MA CP864"
+    echo "ar_OM CP864"
+    echo "ar_QA CP864"
+    echo "ar_SA CP864"
+    echo "ar_SY CP864"
+    # ISO-8859-7 languages
+    echo "el CP869"
+    echo "el_GR CP869"
+    # ISO-8859-8 languages
+    echo "he CP862"
+    echo "he_IL CP862"
+    # ISO-8859-9 languages
+    echo "tr CP857"
+    echo "tr_TR CP857"
+    # Japanese
+    echo "ja CP932"
+    echo "ja_JP CP932"
+    # Chinese
+    echo "zh_CN GBK"
+    echo "zh_TW CP950" # not CP938 ??
+    # Korean
+    echo "kr CP949"    # not CP934 ??
+    echo "kr_KR CP949" # not CP934 ??
+    # Thai
+    echo "th CP874"
+    echo "th_TH CP874"
+    # Other
+    echo "eo CP850"
+    echo "eo_EO CP850"
+    ;;
+esac
diff --git a/gl/dosname.h b/gl/dosname.h
new file mode 100644
index 0000000..774623f
--- /dev/null
+++ b/gl/dosname.h
@@ -0,0 +1,53 @@
+/* File names on MS-DOS/Windows systems.
+
+   Copyright (C) 2000-2001, 2004-2006, 2009-2017 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+   From Paul Eggert and Jim Meyering.  */
+
+#ifndef _DOSNAME_H
+#define _DOSNAME_H
+
+#if (defined _WIN32 || defined __WIN32__ ||     \
+     defined __MSDOS__ || defined __CYGWIN__ || \
+     defined __EMX__ || defined __DJGPP__)
+   /* This internal macro assumes ASCII, but all hosts that support drive
+      letters use ASCII.  */
+# define _IS_DRIVE_LETTER(C) (((unsigned int) (C) | ('a' - 'A')) - 'a'  \
+                              <= 'z' - 'a')
+# define FILE_SYSTEM_PREFIX_LEN(Filename) \
+          (_IS_DRIVE_LETTER ((Filename)[0]) && (Filename)[1] == ':' ? 2 : 0)
+# ifndef __CYGWIN__
+#  define FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE 1
+# endif
+# define ISSLASH(C) ((C) == '/' || (C) == '\\')
+#else
+# define FILE_SYSTEM_PREFIX_LEN(Filename) 0
+# define ISSLASH(C) ((C) == '/')
+#endif
+
+#ifndef FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE
+# define FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE 0
+#endif
+
+#if FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE
+#  define IS_ABSOLUTE_FILE_NAME(F) ISSLASH ((F)[FILE_SYSTEM_PREFIX_LEN (F)])
+# else
+#  define IS_ABSOLUTE_FILE_NAME(F)                              \
+     (ISSLASH ((F)[0]) || FILE_SYSTEM_PREFIX_LEN (F) != 0)
+#endif
+#define IS_RELATIVE_FILE_NAME(F) (! IS_ABSOLUTE_FILE_NAME (F))
+
+#endif /* DOSNAME_H_ */
diff --git a/gl/fcntl.in.h b/gl/fcntl.in.h
new file mode 100644
index 0000000..d814ad6
--- /dev/null
+++ b/gl/fcntl.in.h
@@ -0,0 +1,366 @@
+/* Like <fcntl.h>, but with non-working flags defined to 0.
+
+   Copyright (C) 2006-2017 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* written by Paul Eggert */
+
+#if __GNUC__ >= 3
+@PRAGMA_SYSTEM_HEADER@
+#endif
+@PRAGMA_COLUMNS@
+
+#if defined __need_system_fcntl_h
+/* Special invocation convention.  */
+
+/* Needed before <sys/stat.h>.
+   May also define off_t to a 64-bit type on native Windows.  */
+#include <sys/types.h>
+/* On some systems other than glibc, <sys/stat.h> is a prerequisite of
+   <fcntl.h>.  On glibc systems, we would like to avoid namespace pollution.
+   But on glibc systems, <fcntl.h> includes <sys/stat.h> inside an
+   extern "C" { ... } block, which leads to errors in C++ mode with the
+   overridden <sys/stat.h> from gnulib.  These errors are known to be gone
+   with g++ version >= 4.3.  */
+#if !(defined __GLIBC__ || defined __UCLIBC__) || (defined __cplusplus && defined GNULIB_NAMESPACE && (defined __ICC || !(__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3))))
+# include <sys/stat.h>
+#endif
+#@INCLUDE_NEXT@ @NEXT_FCNTL_H@
+
+#else
+/* Normal invocation convention.  */
+
+#ifndef _@GUARD_PREFIX@_FCNTL_H
+
+/* Needed before <sys/stat.h>.
+   May also define off_t to a 64-bit type on native Windows.  */
+#include <sys/types.h>
+/* On some systems other than glibc, <sys/stat.h> is a prerequisite of
+   <fcntl.h>.  On glibc systems, we would like to avoid namespace pollution.
+   But on glibc systems, <fcntl.h> includes <sys/stat.h> inside an
+   extern "C" { ... } block, which leads to errors in C++ mode with the
+   overridden <sys/stat.h> from gnulib.  These errors are known to be gone
+   with g++ version >= 4.3.  */
+#if !(defined __GLIBC__ || defined __UCLIBC__) || (defined __cplusplus && defined GNULIB_NAMESPACE && (defined __ICC || !(__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3))))
+# include <sys/stat.h>
+#endif
+/* The include_next requires a split double-inclusion guard.  */
+#@INCLUDE_NEXT@ @NEXT_FCNTL_H@
+
+#ifndef _@GUARD_PREFIX@_FCNTL_H
+#define _@GUARD_PREFIX@_FCNTL_H
+
+#ifndef __GLIBC__ /* Avoid namespace pollution on glibc systems.  */
+# include <unistd.h>
+#endif
+
+/* Native Windows platforms declare open(), creat() in <io.h>.  */
+#if (@GNULIB_OPEN@ || defined GNULIB_POSIXCHECK) \
+    && ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)
+# include <io.h>
+#endif
+
+
+/* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
+
+/* The definition of _GL_ARG_NONNULL is copied here.  */
+
+/* The definition of _GL_WARN_ON_USE is copied here.  */
+
+
+/* Declare overridden functions.  */
+
+#if @GNULIB_FCNTL@
+# if @REPLACE_FCNTL@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef fcntl
+#   define fcntl rpl_fcntl
+#  endif
+_GL_FUNCDECL_RPL (fcntl, int, (int fd, int action, ...));
+_GL_CXXALIAS_RPL (fcntl, int, (int fd, int action, ...));
+# else
+#  if !@HAVE_FCNTL@
+_GL_FUNCDECL_SYS (fcntl, int, (int fd, int action, ...));
+#  endif
+_GL_CXXALIAS_SYS (fcntl, int, (int fd, int action, ...));
+# endif
+_GL_CXXALIASWARN (fcntl);
+#elif defined GNULIB_POSIXCHECK
+# undef fcntl
+# if HAVE_RAW_DECL_FCNTL
+_GL_WARN_ON_USE (fcntl, "fcntl is not always POSIX compliant - "
+                 "use gnulib module fcntl for portability");
+# endif
+#endif
+
+#if @GNULIB_OPEN@
+# if @REPLACE_OPEN@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef open
+#   define open rpl_open
+#  endif
+_GL_FUNCDECL_RPL (open, int, (const char *filename, int flags, ...)
+                             _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (open, int, (const char *filename, int flags, ...));
+# else
+_GL_CXXALIAS_SYS (open, int, (const char *filename, int flags, ...));
+# endif
+/* On HP-UX 11, in C++ mode, open() is defined as an inline function with a
+   default argument.  _GL_CXXALIASWARN does not work in this case.  */
+# if !defined __hpux
+_GL_CXXALIASWARN (open);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef open
+/* Assume open is always declared.  */
+_GL_WARN_ON_USE (open, "open is not always POSIX compliant - "
+                 "use gnulib module open for portability");
+#endif
+
+#if @GNULIB_OPENAT@
+# if @REPLACE_OPENAT@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef openat
+#   define openat rpl_openat
+#  endif
+_GL_FUNCDECL_RPL (openat, int,
+                  (int fd, char const *file, int flags, /* mode_t mode */ ...)
+                  _GL_ARG_NONNULL ((2)));
+_GL_CXXALIAS_RPL (openat, int,
+                  (int fd, char const *file, int flags, /* mode_t mode */ ...));
+# else
+#  if !@HAVE_OPENAT@
+_GL_FUNCDECL_SYS (openat, int,
+                  (int fd, char const *file, int flags, /* mode_t mode */ ...)
+                  _GL_ARG_NONNULL ((2)));
+#  endif
+_GL_CXXALIAS_SYS (openat, int,
+                  (int fd, char const *file, int flags, /* mode_t mode */ ...));
+# endif
+_GL_CXXALIASWARN (openat);
+#elif defined GNULIB_POSIXCHECK
+# undef openat
+# if HAVE_RAW_DECL_OPENAT
+_GL_WARN_ON_USE (openat, "openat is not portable - "
+                 "use gnulib module openat for portability");
+# endif
+#endif
+
+
+/* Fix up the FD_* macros, only known to be missing on mingw.  */
+
+#ifndef FD_CLOEXEC
+# define FD_CLOEXEC 1
+#endif
+
+/* Fix up the supported F_* macros.  Intentionally leave other F_*
+   macros undefined.  Only known to be missing on mingw.  */
+
+#ifndef F_DUPFD_CLOEXEC
+# define F_DUPFD_CLOEXEC 0x40000000
+/* Witness variable: 1 if gnulib defined F_DUPFD_CLOEXEC, 0 otherwise.  */
+# define GNULIB_defined_F_DUPFD_CLOEXEC 1
+#else
+# define GNULIB_defined_F_DUPFD_CLOEXEC 0
+#endif
+
+#ifndef F_DUPFD
+# define F_DUPFD 1
+#endif
+
+#ifndef F_GETFD
+# define F_GETFD 2
+#endif
+
+/* Fix up the O_* macros.  */
+
+/* AIX 7.1 with XL C 12.1 defines O_CLOEXEC, O_NOFOLLOW, and O_TTY_INIT
+   to values outside 'int' range, so omit these misdefinitions.
+   But avoid namespace pollution on non-AIX systems.  */
+#ifdef _AIX
+# include <limits.h>
+# if defined O_CLOEXEC && ! (INT_MIN <= O_CLOEXEC && O_CLOEXEC <= INT_MAX)
+#  undef O_CLOEXEC
+# endif
+# if defined O_NOFOLLOW && ! (INT_MIN <= O_NOFOLLOW && O_NOFOLLOW <= INT_MAX)
+#  undef O_NOFOLLOW
+# endif
+# if defined O_TTY_INIT && ! (INT_MIN <= O_TTY_INIT && O_TTY_INIT <= INT_MAX)
+#  undef O_TTY_INIT
+# endif
+#endif
+
+#if !defined O_DIRECT && defined O_DIRECTIO
+/* Tru64 spells it 'O_DIRECTIO'.  */
+# define O_DIRECT O_DIRECTIO
+#endif
+
+#if !defined O_CLOEXEC && defined O_NOINHERIT
+/* Mingw spells it 'O_NOINHERIT'.  */
+# define O_CLOEXEC O_NOINHERIT
+#endif
+
+#ifndef O_CLOEXEC
+# define O_CLOEXEC 0x40000000 /* Try to not collide with system O_* flags.  */
+# define GNULIB_defined_O_CLOEXEC 1
+#else
+# define GNULIB_defined_O_CLOEXEC 0
+#endif
+
+#ifndef O_DIRECT
+# define O_DIRECT 0
+#endif
+
+#ifndef O_DIRECTORY
+# define O_DIRECTORY 0
+#endif
+
+#ifndef O_DSYNC
+# define O_DSYNC 0
+#endif
+
+#ifndef O_EXEC
+# define O_EXEC O_RDONLY /* This is often close enough in older systems.  */
+#endif
+
+#ifndef O_IGNORE_CTTY
+# define O_IGNORE_CTTY 0
+#endif
+
+#ifndef O_NDELAY
+# define O_NDELAY 0
+#endif
+
+#ifndef O_NOATIME
+# define O_NOATIME 0
+#endif
+
+#ifndef O_NONBLOCK
+# define O_NONBLOCK O_NDELAY
+#endif
+
+/* If the gnulib module 'nonblocking' is in use, guarantee a working non-zero
+   value of O_NONBLOCK.  Otherwise, O_NONBLOCK is defined (above) to O_NDELAY
+   or to 0 as fallback.  */
+#if @GNULIB_NONBLOCKING@
+# if O_NONBLOCK
+#  define GNULIB_defined_O_NONBLOCK 0
+# else
+#  define GNULIB_defined_O_NONBLOCK 1
+#  undef O_NONBLOCK
+#  define O_NONBLOCK 0x40000000
+# endif
+#endif
+
+#ifndef O_NOCTTY
+# define O_NOCTTY 0
+#endif
+
+#ifndef O_NOFOLLOW
+# define O_NOFOLLOW 0
+#endif
+
+#ifndef O_NOLINK
+# define O_NOLINK 0
+#endif
+
+#ifndef O_NOLINKS
+# define O_NOLINKS 0
+#endif
+
+#ifndef O_NOTRANS
+# define O_NOTRANS 0
+#endif
+
+#ifndef O_RSYNC
+# define O_RSYNC 0
+#endif
+
+#ifndef O_SEARCH
+# define O_SEARCH O_RDONLY /* This is often close enough in older systems.  */
+#endif
+
+#ifndef O_SYNC
+# define O_SYNC 0
+#endif
+
+#ifndef O_TTY_INIT
+# define O_TTY_INIT 0
+#endif
+
+#if ~O_ACCMODE & (O_RDONLY | O_WRONLY | O_RDWR | O_EXEC | O_SEARCH)
+# undef O_ACCMODE
+# define O_ACCMODE (O_RDONLY | O_WRONLY | O_RDWR | O_EXEC | O_SEARCH)
+#endif
+
+/* For systems that distinguish between text and binary I/O.
+   O_BINARY is usually declared in fcntl.h  */
+#if !defined O_BINARY && defined _O_BINARY
+  /* For MSC-compatible compilers.  */
+# define O_BINARY _O_BINARY
+# define O_TEXT _O_TEXT
+#endif
+
+#if defined __BEOS__ || defined __HAIKU__
+  /* BeOS 5 and Haiku have O_BINARY and O_TEXT, but they have no effect.  */
+# undef O_BINARY
+# undef O_TEXT
+#endif
+
+#ifndef O_BINARY
+# define O_BINARY 0
+# define O_TEXT 0
+#endif
+
+/* Fix up the AT_* macros.  */
+
+/* Work around a bug in Solaris 9 and 10: AT_FDCWD is positive.  Its
+   value exceeds INT_MAX, so its use as an int doesn't conform to the
+   C standard, and GCC and Sun C complain in some cases.  If the bug
+   is present, undef AT_FDCWD here, so it can be redefined below.  */
+#if 0 < AT_FDCWD && AT_FDCWD == 0xffd19553
+# undef AT_FDCWD
+#endif
+
+/* Use the same bit pattern as Solaris 9, but with the proper
+   signedness.  The bit pattern is important, in case this actually is
+   Solaris with the above workaround.  */
+#ifndef AT_FDCWD
+# define AT_FDCWD (-3041965)
+#endif
+
+/* Use the same values as Solaris 9.  This shouldn't matter, but
+   there's no real reason to differ.  */
+#ifndef AT_SYMLINK_NOFOLLOW
+# define AT_SYMLINK_NOFOLLOW 4096
+#endif
+
+#ifndef AT_REMOVEDIR
+# define AT_REMOVEDIR 1
+#endif
+
+/* Solaris 9 lacks these two, so just pick unique values.  */
+#ifndef AT_SYMLINK_FOLLOW
+# define AT_SYMLINK_FOLLOW 2
+#endif
+
+#ifndef AT_EACCESS
+# define AT_EACCESS 4
+#endif
+
+
+#endif /* _@GUARD_PREFIX@_FCNTL_H */
+#endif /* _@GUARD_PREFIX@_FCNTL_H */
+#endif
diff --git a/gl/filename.h b/gl/filename.h
new file mode 100644
index 0000000..db54f11
--- /dev/null
+++ b/gl/filename.h
@@ -0,0 +1,54 @@
+/* Basic filename support macros.
+   Copyright (C) 2001-2004, 2007-2017 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#ifndef _FILENAME_H
+#define _FILENAME_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/* Pathname support.
+   ISSLASH(C)           tests whether C is a directory separator character.
+   IS_ABSOLUTE_PATH(P)  tests whether P is an absolute path.  If it is not,
+                        it may be concatenated to a directory pathname.
+   IS_PATH_WITH_DIR(P)  tests whether P contains a directory specification.
+ */
+#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
+  /* Native Windows, Cygwin, OS/2, DOS */
+# define ISSLASH(C) ((C) == '/' || (C) == '\\')
+# define HAS_DEVICE(P) \
+    ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \
+     && (P)[1] == ':')
+# define IS_ABSOLUTE_PATH(P) (ISSLASH ((P)[0]) || HAS_DEVICE (P))
+# define IS_PATH_WITH_DIR(P) \
+    (strchr (P, '/') != NULL || strchr (P, '\\') != NULL || HAS_DEVICE (P))
+# define FILE_SYSTEM_PREFIX_LEN(P) (HAS_DEVICE (P) ? 2 : 0)
+#else
+  /* Unix */
+# define ISSLASH(C) ((C) == '/')
+# define IS_ABSOLUTE_PATH(P) ISSLASH ((P)[0])
+# define IS_PATH_WITH_DIR(P) (strchr (P, '/') != NULL)
+# define FILE_SYSTEM_PREFIX_LEN(P) 0
+#endif
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _FILENAME_H */
diff --git a/gl/gettext.h b/gl/gettext.h
new file mode 100644
index 0000000..c7f1cde
--- /dev/null
+++ b/gl/gettext.h
@@ -0,0 +1,294 @@
+/* Convenience header for conditional use of GNU <libintl.h>.
+   Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2017 Free Software
+   Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License along
+   with this program; if not, see <http://www.gnu.org/licenses/>.  */
+
+#ifndef _LIBGETTEXT_H
+#define _LIBGETTEXT_H 1
+
+/* NLS can be disabled through the configure --disable-nls option
+   or through "#define ENABLE NLS 0" before including this file.  */
+#if defined ENABLE_NLS && ENABLE_NLS
+
+/* Get declarations of GNU message catalog functions.  */
+# include <libintl.h>
+
+/* You can set the DEFAULT_TEXT_DOMAIN macro to specify the domain used by
+   the gettext() and ngettext() macros.  This is an alternative to calling
+   textdomain(), and is useful for libraries.  */
+# ifdef DEFAULT_TEXT_DOMAIN
+#  undef gettext
+#  define gettext(Msgid) \
+     dgettext (DEFAULT_TEXT_DOMAIN, Msgid)
+#  undef ngettext
+#  define ngettext(Msgid1, Msgid2, N) \
+     dngettext (DEFAULT_TEXT_DOMAIN, Msgid1, Msgid2, N)
+# endif
+
+#else
+
+/* Solaris /usr/include/locale.h includes /usr/include/libintl.h, which
+   chokes if dcgettext is defined as a macro.  So include it now, to make
+   later inclusions of <locale.h> a NOP.  We don't include <libintl.h>
+   as well because people using "gettext.h" will not include <libintl.h>,
+   and also including <libintl.h> would fail on SunOS 4, whereas <locale.h>
+   is OK.  */
+#if defined(__sun)
+# include <locale.h>
+#endif
+
+/* Many header files from the libstdc++ coming with g++ 3.3 or newer include
+   <libintl.h>, which chokes if dcgettext is defined as a macro.  So include
+   it now, to make later inclusions of <libintl.h> a NOP.  */
+#if defined(__cplusplus) && defined(__GNUG__) && (__GNUC__ >= 3)
+# include <cstdlib>
+# if (__GLIBC__ >= 2 && !defined __UCLIBC__) || _GLIBCXX_HAVE_LIBINTL_H
+#  include <libintl.h>
+# endif
+#endif
+
+/* Disabled NLS.
+   The casts to 'const char *' serve the purpose of producing warnings
+   for invalid uses of the value returned from these functions.
+   On pre-ANSI systems without 'const', the config.h file is supposed to
+   contain "#define const".  */
+# undef gettext
+# define gettext(Msgid) ((const char *) (Msgid))
+# undef dgettext
+# define dgettext(Domainname, Msgid) ((void) (Domainname), gettext (Msgid))
+# undef dcgettext
+# define dcgettext(Domainname, Msgid, Category) \
+    ((void) (Category), dgettext (Domainname, Msgid))
+# undef ngettext
+# define ngettext(Msgid1, Msgid2, N) \
+    ((N) == 1 \
+     ? ((void) (Msgid2), (const char *) (Msgid1)) \
+     : ((void) (Msgid1), (const char *) (Msgid2)))
+# undef dngettext
+# define dngettext(Domainname, Msgid1, Msgid2, N) \
+    ((void) (Domainname), ngettext (Msgid1, Msgid2, N))
+# undef dcngettext
+# define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \
+    ((void) (Category), dngettext (Domainname, Msgid1, Msgid2, N))
+# undef textdomain
+# define textdomain(Domainname) ((const char *) (Domainname))
+# undef bindtextdomain
+# define bindtextdomain(Domainname, Dirname) \
+    ((void) (Domainname), (const char *) (Dirname))
+# undef bind_textdomain_codeset
+# define bind_textdomain_codeset(Domainname, Codeset) \
+    ((void) (Domainname), (const char *) (Codeset))
+
+#endif
+
+/* Prefer gnulib's setlocale override over libintl's setlocale override.  */
+#ifdef GNULIB_defined_setlocale
+# undef setlocale
+# define setlocale rpl_setlocale
+#endif
+
+/* A pseudo function call that serves as a marker for the automated
+   extraction of messages, but does not call gettext().  The run-time
+   translation is done at a different place in the code.
+   The argument, String, should be a literal string.  Concatenated strings
+   and other string expressions won't work.
+   The macro's expansion is not parenthesized, so that it is suitable as
+   initializer for static 'char[]' or 'const char[]' variables.  */
+#define gettext_noop(String) String
+
+/* The separator between msgctxt and msgid in a .mo file.  */
+#define GETTEXT_CONTEXT_GLUE "\004"
+
+/* Pseudo function calls, taking a MSGCTXT and a MSGID instead of just a
+   MSGID.  MSGCTXT and MSGID must be string literals.  MSGCTXT should be
+   short and rarely need to change.
+   The letter 'p' stands for 'particular' or 'special'.  */
+#ifdef DEFAULT_TEXT_DOMAIN
+# define pgettext(Msgctxt, Msgid) \
+   pgettext_aux (DEFAULT_TEXT_DOMAIN, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, LC_MESSAGES)
+#else
+# define pgettext(Msgctxt, Msgid) \
+   pgettext_aux (NULL, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, LC_MESSAGES)
+#endif
+#define dpgettext(Domainname, Msgctxt, Msgid) \
+  pgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, LC_MESSAGES)
+#define dcpgettext(Domainname, Msgctxt, Msgid, Category) \
+  pgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, Category)
+#ifdef DEFAULT_TEXT_DOMAIN
+# define npgettext(Msgctxt, Msgid, MsgidPlural, N) \
+   npgettext_aux (DEFAULT_TEXT_DOMAIN, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, MsgidPlural, N, LC_MESSAGES)
+#else
+# define npgettext(Msgctxt, Msgid, MsgidPlural, N) \
+   npgettext_aux (NULL, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, MsgidPlural, N, LC_MESSAGES)
+#endif
+#define dnpgettext(Domainname, Msgctxt, Msgid, MsgidPlural, N) \
+  npgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, MsgidPlural, N, LC_MESSAGES)
+#define dcnpgettext(Domainname, Msgctxt, Msgid, MsgidPlural, N, Category) \
+  npgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, MsgidPlural, N, Category)
+
+#ifdef __GNUC__
+__inline
+#else
+#ifdef __cplusplus
+inline
+#endif
+#endif
+static const char *
+pgettext_aux (const char *domain,
+              const char *msg_ctxt_id, const char *msgid,
+              int category)
+{
+  const char *translation = dcgettext (domain, msg_ctxt_id, category);
+  if (translation == msg_ctxt_id)
+    return msgid;
+  else
+    return translation;
+}
+
+#ifdef __GNUC__
+__inline
+#else
+#ifdef __cplusplus
+inline
+#endif
+#endif
+static const char *
+npgettext_aux (const char *domain,
+               const char *msg_ctxt_id, const char *msgid,
+               const char *msgid_plural, unsigned long int n,
+               int category)
+{
+  const char *translation =
+    dcngettext (domain, msg_ctxt_id, msgid_plural, n, category);
+  if (translation == msg_ctxt_id || translation == msgid_plural)
+    return (n == 1 ? msgid : msgid_plural);
+  else
+    return translation;
+}
+
+/* The same thing extended for non-constant arguments.  Here MSGCTXT and MSGID
+   can be arbitrary expressions.  But for string literals these macros are
+   less efficient than those above.  */
+
+#include <string.h>
+
+#if (((__GNUC__ >= 3 || __GNUG__ >= 2) && !defined __STRICT_ANSI__) \
+     /* || __STDC_VERSION__ == 199901L
+        || (__STDC_VERSION__ >= 201112L && !defined __STDC_NO_VLA__) */ )
+# define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS 1
+#else
+# define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS 0
+#endif
+
+#if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
+#include <stdlib.h>
+#endif
+
+#define pgettext_expr(Msgctxt, Msgid) \
+  dcpgettext_expr (NULL, Msgctxt, Msgid, LC_MESSAGES)
+#define dpgettext_expr(Domainname, Msgctxt, Msgid) \
+  dcpgettext_expr (Domainname, Msgctxt, Msgid, LC_MESSAGES)
+
+#ifdef __GNUC__
+__inline
+#else
+#ifdef __cplusplus
+inline
+#endif
+#endif
+static const char *
+dcpgettext_expr (const char *domain,
+                 const char *msgctxt, const char *msgid,
+                 int category)
+{
+  size_t msgctxt_len = strlen (msgctxt) + 1;
+  size_t msgid_len = strlen (msgid) + 1;
+  const char *translation;
+#if _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
+  char msg_ctxt_id[msgctxt_len + msgid_len];
+#else
+  char buf[1024];
+  char *msg_ctxt_id =
+    (msgctxt_len + msgid_len <= sizeof (buf)
+     ? buf
+     : (char *) malloc (msgctxt_len + msgid_len));
+  if (msg_ctxt_id != NULL)
+#endif
+    {
+      int found_translation;
+      memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1);
+      msg_ctxt_id[msgctxt_len - 1] = '\004';
+      memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len);
+      translation = dcgettext (domain, msg_ctxt_id, category);
+      found_translation = (translation != msg_ctxt_id);
+#if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
+      if (msg_ctxt_id != buf)
+        free (msg_ctxt_id);
+#endif
+      if (found_translation)
+        return translation;
+    }
+  return msgid;
+}
+
+#define npgettext_expr(Msgctxt, Msgid, MsgidPlural, N) \
+  dcnpgettext_expr (NULL, Msgctxt, Msgid, MsgidPlural, N, LC_MESSAGES)
+#define dnpgettext_expr(Domainname, Msgctxt, Msgid, MsgidPlural, N) \
+  dcnpgettext_expr (Domainname, Msgctxt, Msgid, MsgidPlural, N, LC_MESSAGES)
+
+#ifdef __GNUC__
+__inline
+#else
+#ifdef __cplusplus
+inline
+#endif
+#endif
+static const char *
+dcnpgettext_expr (const char *domain,
+                  const char *msgctxt, const char *msgid,
+                  const char *msgid_plural, unsigned long int n,
+                  int category)
+{
+  size_t msgctxt_len = strlen (msgctxt) + 1;
+  size_t msgid_len = strlen (msgid) + 1;
+  const char *translation;
+#if _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
+  char msg_ctxt_id[msgctxt_len + msgid_len];
+#else
+  char buf[1024];
+  char *msg_ctxt_id =
+    (msgctxt_len + msgid_len <= sizeof (buf)
+     ? buf
+     : (char *) malloc (msgctxt_len + msgid_len));
+  if (msg_ctxt_id != NULL)
+#endif
+    {
+      int found_translation;
+      memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1);
+      msg_ctxt_id[msgctxt_len - 1] = '\004';
+      memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len);
+      translation = dcngettext (domain, msg_ctxt_id, msgid_plural, n, category);
+      found_translation = !(translation == msg_ctxt_id || translation == msgid_plural);
+#if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
+      if (msg_ctxt_id != buf)
+        free (msg_ctxt_id);
+#endif
+      if (found_translation)
+        return translation;
+    }
+  return (n == 1 ? msgid : msgid_plural);
+}
+
+#endif /* _LIBGETTEXT_H */
diff --git a/gl/gettimeofday.c b/gl/gettimeofday.c
new file mode 100644
index 0000000..8a346d1
--- /dev/null
+++ b/gl/gettimeofday.c
@@ -0,0 +1,146 @@
+/* Provide gettimeofday for systems that don't have it or for which it's broken.
+
+   Copyright (C) 2001-2003, 2005-2007, 2009-2017 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
+
+/* written by Jim Meyering */
+
+#include <config.h>
+
+/* Specification.  */
+#include <sys/time.h>
+
+#include <time.h>
+
+#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+# define WINDOWS_NATIVE
+# include <windows.h>
+#endif
+
+#include "localtime-buffer.h"
+
+#ifdef WINDOWS_NATIVE
+
+/* GetSystemTimePreciseAsFileTime was introduced only in Windows 8.  */
+typedef void (WINAPI * GetSystemTimePreciseAsFileTimeFuncType) (FILETIME *lpTime);
+static GetSystemTimePreciseAsFileTimeFuncType GetSystemTimePreciseAsFileTimeFunc = NULL;
+static BOOL initialized = FALSE;
+
+static void
+initialize (void)
+{
+  HMODULE kernel32 = LoadLibrary ("kernel32.dll");
+  if (kernel32 != NULL)
+    {
+      GetSystemTimePreciseAsFileTimeFunc =
+	(GetSystemTimePreciseAsFileTimeFuncType) GetProcAddress (kernel32, "GetSystemTimePreciseAsFileTime");
+    }
+  initialized = TRUE;
+}
+
+#endif
+
+/* This is a wrapper for gettimeofday.  It is used only on systems
+   that lack this function, or whose implementation of this function
+   causes problems.
+   Work around the bug in some systems whereby gettimeofday clobbers
+   the static buffer that localtime uses for its return value.  The
+   gettimeofday function from Mac OS X 10.0.4 (i.e., Darwin 1.3.7) has
+   this problem.  */
+
+int
+gettimeofday (struct timeval *restrict tv, void *restrict tz)
+{
+#undef gettimeofday
+#ifdef WINDOWS_NATIVE
+
+  /* On native Windows, there are two ways to get the current time:
+     GetSystemTimeAsFileTime
+     <https://msdn.microsoft.com/en-us/library/ms724397.aspx>
+     or
+     GetSystemTimePreciseAsFileTime
+     <https://msdn.microsoft.com/en-us/library/hh706895.aspx>.
+     GetSystemTimeAsFileTime produces values that jump by increments of
+     15.627 milliseconds (!) on average.
+     Whereas GetSystemTimePreciseAsFileTime values usually jump by 1 or 2
+     microseconds.
+     More discussion on this topic:
+     <http://www.windowstimestamp.com/description>.  */
+  FILETIME current_time;
+
+  if (!initialized)
+    initialize ();
+  if (GetSystemTimePreciseAsFileTimeFunc != NULL)
+    GetSystemTimePreciseAsFileTimeFunc (&current_time);
+  else
+    GetSystemTimeAsFileTime (&current_time);
+
+  /* Convert from FILETIME to 'struct timeval'.  */
+  /* FILETIME: <https://msdn.microsoft.com/en-us/library/ms724284.aspx> */
+  ULONGLONG since_1601 =
+    ((ULONGLONG) current_time.dwHighDateTime << 32)
+    | (ULONGLONG) current_time.dwLowDateTime;
+  /* Between 1601-01-01 and 1970-01-01 there were 280 normal years and 89 leap
+     years, in total 134774 days.  */
+  ULONGLONG since_1970 =
+    since_1601 - (ULONGLONG) 134774 * (ULONGLONG) 86400 * (ULONGLONG) 10000000;
+  ULONGLONG microseconds_since_1970 = since_1970 / (ULONGLONG) 10;
+  tv->tv_sec = microseconds_since_1970 / (ULONGLONG) 1000000;
+  tv->tv_usec = microseconds_since_1970 % (ULONGLONG) 1000000;
+
+  return 0;
+
+#else
+
+# if HAVE_GETTIMEOFDAY
+#  if GETTIMEOFDAY_CLOBBERS_LOCALTIME
+  /* Save and restore the contents of the buffer used for localtime's
+     result around the call to gettimeofday.  */
+  struct tm save = *localtime_buffer_addr;
+#  endif
+
+#  if defined timeval /* 'struct timeval' overridden by gnulib?  */
+#   undef timeval
+  struct timeval otv;
+  int result = gettimeofday (&otv, (struct timezone *) tz);
+  if (result == 0)
+    {
+      tv->tv_sec = otv.tv_sec;
+      tv->tv_usec = otv.tv_usec;
+    }
+#  else
+  int result = gettimeofday (tv, (struct timezone *) tz);
+#  endif
+
+#  if GETTIMEOFDAY_CLOBBERS_LOCALTIME
+  *localtime_buffer_addr = save;
+#  endif
+
+  return result;
+
+# else
+
+#  if !defined OK_TO_USE_1S_CLOCK
+#   error "Only 1-second nominal clock resolution found.  Is that intended?" \
+          "If so, compile with the -DOK_TO_USE_1S_CLOCK option."
+#  endif
+  tv->tv_sec = time (NULL);
+  tv->tv_usec = 0;
+
+  return 0;
+
+# endif
+#endif
+}
diff --git a/gl/glthread/lock.c b/gl/glthread/lock.c
new file mode 100644
index 0000000..1b38e4d
--- /dev/null
+++ b/gl/glthread/lock.c
@@ -0,0 +1,1221 @@
+/* Locking in multithreaded situations.
+   Copyright (C) 2005-2017 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
+
+/* Written by Bruno Haible <bruno@clisp.org>, 2005.
+   Based on GCC's gthr-posix.h, gthr-posix95.h, gthr-solaris.h,
+   gthr-win32.h.  */
+
+#include <config.h>
+
+#include "glthread/lock.h"
+
+/* ========================================================================= */
+
+#if USE_POSIX_THREADS
+
+/* -------------------------- gl_lock_t datatype -------------------------- */
+
+/* ------------------------- gl_rwlock_t datatype ------------------------- */
+
+# if HAVE_PTHREAD_RWLOCK && (HAVE_PTHREAD_RWLOCK_RDLOCK_PREFER_WRITER || (defined PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP && (__GNU_LIBRARY__ > 1)))
+
+#  ifdef PTHREAD_RWLOCK_INITIALIZER
+
+#   if !HAVE_PTHREAD_RWLOCK_RDLOCK_PREFER_WRITER
+     /* glibc with bug https://sourceware.org/bugzilla/show_bug.cgi?id=13701 */
+
+int
+glthread_rwlock_init_for_glibc (pthread_rwlock_t *lock)
+{
+  pthread_rwlockattr_t attributes;
+  int err;
+
+  err = pthread_rwlockattr_init (&attributes);
+  if (err != 0)
+    return err;
+  /* Note: PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP is the only value that
+     causes the writer to be preferred. PTHREAD_RWLOCK_PREFER_WRITER_NP does not
+     do this; see
+     http://man7.org/linux/man-pages/man3/pthread_rwlockattr_setkind_np.3.html */
+  err = pthread_rwlockattr_setkind_np (&attributes,
+                                       PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP);
+  if (err == 0)
+    err = pthread_rwlock_init(lock, &attributes);
+  /* pthread_rwlockattr_destroy always returns 0.  It cannot influence the
+     return value.  */
+  pthread_rwlockattr_destroy (&attributes);
+  return err;
+}
+
+#   endif
+#  else
+
+int
+glthread_rwlock_init_multithreaded (gl_rwlock_t *lock)
+{
+  int err;
+
+  err = pthread_rwlock_init (&lock->rwlock, NULL);
+  if (err != 0)
+    return err;
+  lock->initialized = 1;
+  return 0;
+}
+
+int
+glthread_rwlock_rdlock_multithreaded (gl_rwlock_t *lock)
+{
+  if (!lock->initialized)
+    {
+      int err;
+
+      err = pthread_mutex_lock (&lock->guard);
+      if (err != 0)
+        return err;
+      if (!lock->initialized)
+        {
+          err = glthread_rwlock_init_multithreaded (lock);
+          if (err != 0)
+            {
+              pthread_mutex_unlock (&lock->guard);
+              return err;
+            }
+        }
+      err = pthread_mutex_unlock (&lock->guard);
+      if (err != 0)
+        return err;
+    }
+  return pthread_rwlock_rdlock (&lock->rwlock);
+}
+
+int
+glthread_rwlock_wrlock_multithreaded (gl_rwlock_t *lock)
+{
+  if (!lock->initialized)
+    {
+      int err;
+
+      err = pthread_mutex_lock (&lock->guard);
+      if (err != 0)
+        return err;
+      if (!lock->initialized)
+        {
+          err = glthread_rwlock_init_multithreaded (lock);
+          if (err != 0)
+            {
+              pthread_mutex_unlock (&lock->guard);
+              return err;
+            }
+        }
+      err = pthread_mutex_unlock (&lock->guard);
+      if (err != 0)
+        return err;
+    }
+  return pthread_rwlock_wrlock (&lock->rwlock);
+}
+
+int
+glthread_rwlock_unlock_multithreaded (gl_rwlock_t *lock)
+{
+  if (!lock->initialized)
+    return EINVAL;
+  return pthread_rwlock_unlock (&lock->rwlock);
+}
+
+int
+glthread_rwlock_destroy_multithreaded (gl_rwlock_t *lock)
+{
+  int err;
+
+  if (!lock->initialized)
+    return EINVAL;
+  err = pthread_rwlock_destroy (&lock->rwlock);
+  if (err != 0)
+    return err;
+  lock->initialized = 0;
+  return 0;
+}
+
+#  endif
+
+# else
+
+int
+glthread_rwlock_init_multithreaded (gl_rwlock_t *lock)
+{
+  int err;
+
+  err = pthread_mutex_init (&lock->lock, NULL);
+  if (err != 0)
+    return err;
+  err = pthread_cond_init (&lock->waiting_readers, NULL);
+  if (err != 0)
+    return err;
+  err = pthread_cond_init (&lock->waiting_writers, NULL);
+  if (err != 0)
+    return err;
+  lock->waiting_writers_count = 0;
+  lock->runcount = 0;
+  return 0;
+}
+
+int
+glthread_rwlock_rdlock_multithreaded (gl_rwlock_t *lock)
+{
+  int err;
+
+  err = pthread_mutex_lock (&lock->lock);
+  if (err != 0)
+    return err;
+  /* Test whether only readers are currently running, and whether the runcount
+     field will not overflow, and whether no writer is waiting.  The latter
+     condition is because POSIX recommends that "write locks shall take
+     precedence over read locks", to avoid "writer starvation".  */
+  while (!(lock->runcount + 1 > 0 && lock->waiting_writers_count == 0))
+    {
+      /* This thread has to wait for a while.  Enqueue it among the
+         waiting_readers.  */
+      err = pthread_cond_wait (&lock->waiting_readers, &lock->lock);
+      if (err != 0)
+        {
+          pthread_mutex_unlock (&lock->lock);
+          return err;
+        }
+    }
+  lock->runcount++;
+  return pthread_mutex_unlock (&lock->lock);
+}
+
+int
+glthread_rwlock_wrlock_multithreaded (gl_rwlock_t *lock)
+{
+  int err;
+
+  err = pthread_mutex_lock (&lock->lock);
+  if (err != 0)
+    return err;
+  /* Test whether no readers or writers are currently running.  */
+  while (!(lock->runcount == 0))
+    {
+      /* This thread has to wait for a while.  Enqueue it among the
+         waiting_writers.  */
+      lock->waiting_writers_count++;
+      err = pthread_cond_wait (&lock->waiting_writers, &lock->lock);
+      if (err != 0)
+        {
+          lock->waiting_writers_count--;
+          pthread_mutex_unlock (&lock->lock);
+          return err;
+        }
+      lock->waiting_writers_count--;
+    }
+  lock->runcount--; /* runcount becomes -1 */
+  return pthread_mutex_unlock (&lock->lock);
+}
+
+int
+glthread_rwlock_unlock_multithreaded (gl_rwlock_t *lock)
+{
+  int err;
+
+  err = pthread_mutex_lock (&lock->lock);
+  if (err != 0)
+    return err;
+  if (lock->runcount < 0)
+    {
+      /* Drop a writer lock.  */
+      if (!(lock->runcount == -1))
+        {
+          pthread_mutex_unlock (&lock->lock);
+          return EINVAL;
+        }
+      lock->runcount = 0;
+    }
+  else
+    {
+      /* Drop a reader lock.  */
+      if (!(lock->runcount > 0))
+        {
+          pthread_mutex_unlock (&lock->lock);
+          return EINVAL;
+        }
+      lock->runcount--;
+    }
+  if (lock->runcount == 0)
+    {
+      /* POSIX recommends that "write locks shall take precedence over read
+         locks", to avoid "writer starvation".  */
+      if (lock->waiting_writers_count > 0)
+        {
+          /* Wake up one of the waiting writers.  */
+          err = pthread_cond_signal (&lock->waiting_writers);
+          if (err != 0)
+            {
+              pthread_mutex_unlock (&lock->lock);
+              return err;
+            }
+        }
+      else
+        {
+          /* Wake up all waiting readers.  */
+          err = pthread_cond_broadcast (&lock->waiting_readers);
+          if (err != 0)
+            {
+              pthread_mutex_unlock (&lock->lock);
+              return err;
+            }
+        }
+    }
+  return pthread_mutex_unlock (&lock->lock);
+}
+
+int
+glthread_rwlock_destroy_multithreaded (gl_rwlock_t *lock)
+{
+  int err;
+
+  err = pthread_mutex_destroy (&lock->lock);
+  if (err != 0)
+    return err;
+  err = pthread_cond_destroy (&lock->waiting_readers);
+  if (err != 0)
+    return err;
+  err = pthread_cond_destroy (&lock->waiting_writers);
+  if (err != 0)
+    return err;
+  return 0;
+}
+
+# endif
+
+/* --------------------- gl_recursive_lock_t datatype --------------------- */
+
+# if HAVE_PTHREAD_MUTEX_RECURSIVE
+
+#  if defined PTHREAD_RECURSIVE_MUTEX_INITIALIZER || defined PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
+
+int
+glthread_recursive_lock_init_multithreaded (gl_recursive_lock_t *lock)
+{
+  pthread_mutexattr_t attributes;
+  int err;
+
+  err = pthread_mutexattr_init (&attributes);
+  if (err != 0)
+    return err;
+  err = pthread_mutexattr_settype (&attributes, PTHREAD_MUTEX_RECURSIVE);
+  if (err != 0)
+    {
+      pthread_mutexattr_destroy (&attributes);
+      return err;
+    }
+  err = pthread_mutex_init (lock, &attributes);
+  if (err != 0)
+    {
+      pthread_mutexattr_destroy (&attributes);
+      return err;
+    }
+  err = pthread_mutexattr_destroy (&attributes);
+  if (err != 0)
+    return err;
+  return 0;
+}
+
+#  else
+
+int
+glthread_recursive_lock_init_multithreaded (gl_recursive_lock_t *lock)
+{
+  pthread_mutexattr_t attributes;
+  int err;
+
+  err = pthread_mutexattr_init (&attributes);
+  if (err != 0)
+    return err;
+  err = pthread_mutexattr_settype (&attributes, PTHREAD_MUTEX_RECURSIVE);
+  if (err != 0)
+    {
+      pthread_mutexattr_destroy (&attributes);
+      return err;
+    }
+  err = pthread_mutex_init (&lock->recmutex, &attributes);
+  if (err != 0)
+    {
+      pthread_mutexattr_destroy (&attributes);
+      return err;
+    }
+  err = pthread_mutexattr_destroy (&attributes);
+  if (err != 0)
+    return err;
+  lock->initialized = 1;
+  return 0;
+}
+
+int
+glthread_recursive_lock_lock_multithreaded (gl_recursive_lock_t *lock)
+{
+  if (!lock->initialized)
+    {
+      int err;
+
+      err = pthread_mutex_lock (&lock->guard);
+      if (err != 0)
+        return err;
+      if (!lock->initialized)
+        {
+          err = glthread_recursive_lock_init_multithreaded (lock);
+          if (err != 0)
+            {
+              pthread_mutex_unlock (&lock->guard);
+              return err;
+            }
+        }
+      err = pthread_mutex_unlock (&lock->guard);
+      if (err != 0)
+        return err;
+    }
+  return pthread_mutex_lock (&lock->recmutex);
+}
+
+int
+glthread_recursive_lock_unlock_multithreaded (gl_recursive_lock_t *lock)
+{
+  if (!lock->initialized)
+    return EINVAL;
+  return pthread_mutex_unlock (&lock->recmutex);
+}
+
+int
+glthread_recursive_lock_destroy_multithreaded (gl_recursive_lock_t *lock)
+{
+  int err;
+
+  if (!lock->initialized)
+    return EINVAL;
+  err = pthread_mutex_destroy (&lock->recmutex);
+  if (err != 0)
+    return err;
+  lock->initialized = 0;
+  return 0;
+}
+
+#  endif
+
+# else
+
+int
+glthread_recursive_lock_init_multithreaded (gl_recursive_lock_t *lock)
+{
+  int err;
+
+  err = pthread_mutex_init (&lock->mutex, NULL);
+  if (err != 0)
+    return err;
+  lock->owner = (pthread_t) 0;
+  lock->depth = 0;
+  return 0;
+}
+
+int
+glthread_recursive_lock_lock_multithreaded (gl_recursive_lock_t *lock)
+{
+  pthread_t self = pthread_self ();
+  if (lock->owner != self)
+    {
+      int err;
+
+      err = pthread_mutex_lock (&lock->mutex);
+      if (err != 0)
+        return err;
+      lock->owner = self;
+    }
+  if (++(lock->depth) == 0) /* wraparound? */
+    {
+      lock->depth--;
+      return EAGAIN;
+    }
+  return 0;
+}
+
+int
+glthread_recursive_lock_unlock_multithreaded (gl_recursive_lock_t *lock)
+{
+  if (lock->owner != pthread_self ())
+    return EPERM;
+  if (lock->depth == 0)
+    return EINVAL;
+  if (--(lock->depth) == 0)
+    {
+      lock->owner = (pthread_t) 0;
+      return pthread_mutex_unlock (&lock->mutex);
+    }
+  else
+    return 0;
+}
+
+int
+glthread_recursive_lock_destroy_multithreaded (gl_recursive_lock_t *lock)
+{
+  if (lock->owner != (pthread_t) 0)
+    return EBUSY;
+  return pthread_mutex_destroy (&lock->mutex);
+}
+
+# endif
+
+/* -------------------------- gl_once_t datatype -------------------------- */
+
+static const pthread_once_t fresh_once = PTHREAD_ONCE_INIT;
+
+int
+glthread_once_singlethreaded (pthread_once_t *once_control)
+{
+  /* We don't know whether pthread_once_t is an integer type, a floating-point
+     type, a pointer type, or a structure type.  */
+  char *firstbyte = (char *)once_control;
+  if (*firstbyte == *(const char *)&fresh_once)
+    {
+      /* First time use of once_control.  Invert the first byte.  */
+      *firstbyte = ~ *(const char *)&fresh_once;
+      return 1;
+    }
+  else
+    return 0;
+}
+
+#endif
+
+/* ========================================================================= */
+
+#if USE_PTH_THREADS
+
+/* Use the GNU Pth threads library.  */
+
+/* -------------------------- gl_lock_t datatype -------------------------- */
+
+/* ------------------------- gl_rwlock_t datatype ------------------------- */
+
+# if !HAVE_PTH_RWLOCK_ACQUIRE_PREFER_WRITER
+
+int
+glthread_rwlock_init_multithreaded (gl_rwlock_t *lock)
+{
+  if (!pth_mutex_init (&lock->lock))
+    return errno;
+  if (!pth_cond_init (&lock->waiting_readers))
+    return errno;
+  if (!pth_cond_init (&lock->waiting_writers))
+    return errno;
+  lock->waiting_writers_count = 0;
+  lock->runcount = 0;
+  lock->initialized = 1;
+  return 0;
+}
+
+int
+glthread_rwlock_rdlock_multithreaded (gl_rwlock_t *lock)
+{
+  if (!lock->initialized)
+    glthread_rwlock_init_multithreaded (lock);
+  if (!pth_mutex_acquire (&lock->lock, 0, NULL))
+    return errno;
+  /* Test whether only readers are currently running, and whether the runcount
+     field will not overflow, and whether no writer is waiting.  The latter
+     condition is because POSIX recommends that "write locks shall take
+     precedence over read locks", to avoid "writer starvation".  */
+  while (!(lock->runcount + 1 > 0 && lock->waiting_writers_count == 0))
+    {
+      /* This thread has to wait for a while.  Enqueue it among the
+         waiting_readers.  */
+      if (!pth_cond_await (&lock->waiting_readers, &lock->lock, NULL))
+        {
+          int err = errno;
+          pth_mutex_release (&lock->lock);
+          return err;
+        }
+    }
+  lock->runcount++;
+  return (!pth_mutex_release (&lock->lock) ? errno : 0);
+}
+
+int
+glthread_rwlock_wrlock_multithreaded (gl_rwlock_t *lock)
+{
+  if (!lock->initialized)
+    glthread_rwlock_init_multithreaded (lock);
+  if (!pth_mutex_acquire (&lock->lock, 0, NULL))
+    return errno;
+  /* Test whether no readers or writers are currently running.  */
+  while (!(lock->runcount == 0))
+    {
+      /* This thread has to wait for a while.  Enqueue it among the
+         waiting_writers.  */
+      lock->waiting_writers_count++;
+      if (!pth_cond_await (&lock->waiting_writers, &lock->lock, NULL))
+        {
+          int err = errno;
+          lock->waiting_writers_count--;
+          pth_mutex_release (&lock->lock);
+          return err;
+        }
+      lock->waiting_writers_count--;
+    }
+  lock->runcount--; /* runcount becomes -1 */
+  return (!pth_mutex_release (&lock->lock) ? errno : 0);
+}
+
+int
+glthread_rwlock_unlock_multithreaded (gl_rwlock_t *lock)
+{
+  int err;
+
+  if (!lock->initialized)
+    return EINVAL;
+  if (!pth_mutex_acquire (&lock->lock, 0, NULL))
+    return errno;
+  if (lock->runcount < 0)
+    {
+      /* Drop a writer lock.  */
+      if (!(lock->runcount == -1))
+        {
+          pth_mutex_release (&lock->lock);
+          return EINVAL;
+        }
+      lock->runcount = 0;
+    }
+  else
+    {
+      /* Drop a reader lock.  */
+      if (!(lock->runcount > 0))
+        {
+          pth_mutex_release (&lock->lock);
+          return EINVAL;
+        }
+      lock->runcount--;
+    }
+  if (lock->runcount == 0)
+    {
+      /* POSIX recommends that "write locks shall take precedence over read
+         locks", to avoid "writer starvation".  */
+      if (lock->waiting_writers_count > 0)
+        {
+          /* Wake up one of the waiting writers.  */
+          if (!pth_cond_notify (&lock->waiting_writers, FALSE))
+            {
+              int err = errno;
+              pth_mutex_release (&lock->lock);
+              return err;
+            }
+        }
+      else
+        {
+          /* Wake up all waiting readers.  */
+          if (!pth_cond_notify (&lock->waiting_readers, TRUE))
+            {
+              int err = errno;
+              pth_mutex_release (&lock->lock);
+              return err;
+            }
+        }
+    }
+  return (!pth_mutex_release (&lock->lock) ? errno : 0);
+}
+
+int
+glthread_rwlock_destroy_multithreaded (gl_rwlock_t *lock)
+{
+  lock->initialized = 0;
+  return 0;
+}
+
+# endif
+
+/* --------------------- gl_recursive_lock_t datatype --------------------- */
+
+/* -------------------------- gl_once_t datatype -------------------------- */
+
+static void
+glthread_once_call (void *arg)
+{
+  void (**gl_once_temp_addr) (void) = (void (**) (void)) arg;
+  void (*initfunction) (void) = *gl_once_temp_addr;
+  initfunction ();
+}
+
+int
+glthread_once_multithreaded (pth_once_t *once_control, void (*initfunction) (void))
+{
+  void (*temp) (void) = initfunction;
+  return (!pth_once (once_control, glthread_once_call, &temp) ? errno : 0);
+}
+
+int
+glthread_once_singlethreaded (pth_once_t *once_control)
+{
+  /* We know that pth_once_t is an integer type.  */
+  if (*once_control == PTH_ONCE_INIT)
+    {
+      /* First time use of once_control.  Invert the marker.  */
+      *once_control = ~ PTH_ONCE_INIT;
+      return 1;
+    }
+  else
+    return 0;
+}
+
+#endif
+
+/* ========================================================================= */
+
+#if USE_SOLARIS_THREADS
+
+/* Use the old Solaris threads library.  */
+
+/* -------------------------- gl_lock_t datatype -------------------------- */
+
+/* ------------------------- gl_rwlock_t datatype ------------------------- */
+
+/* --------------------- gl_recursive_lock_t datatype --------------------- */
+
+int
+glthread_recursive_lock_init_multithreaded (gl_recursive_lock_t *lock)
+{
+  int err;
+
+  err = mutex_init (&lock->mutex, USYNC_THREAD, NULL);
+  if (err != 0)
+    return err;
+  lock->owner = (thread_t) 0;
+  lock->depth = 0;
+  return 0;
+}
+
+int
+glthread_recursive_lock_lock_multithreaded (gl_recursive_lock_t *lock)
+{
+  thread_t self = thr_self ();
+  if (lock->owner != self)
+    {
+      int err;
+
+      err = mutex_lock (&lock->mutex);
+      if (err != 0)
+        return err;
+      lock->owner = self;
+    }
+  if (++(lock->depth) == 0) /* wraparound? */
+    {
+      lock->depth--;
+      return EAGAIN;
+    }
+  return 0;
+}
+
+int
+glthread_recursive_lock_unlock_multithreaded (gl_recursive_lock_t *lock)
+{
+  if (lock->owner != thr_self ())
+    return EPERM;
+  if (lock->depth == 0)
+    return EINVAL;
+  if (--(lock->depth) == 0)
+    {
+      lock->owner = (thread_t) 0;
+      return mutex_unlock (&lock->mutex);
+    }
+  else
+    return 0;
+}
+
+int
+glthread_recursive_lock_destroy_multithreaded (gl_recursive_lock_t *lock)
+{
+  if (lock->owner != (thread_t) 0)
+    return EBUSY;
+  return mutex_destroy (&lock->mutex);
+}
+
+/* -------------------------- gl_once_t datatype -------------------------- */
+
+int
+glthread_once_multithreaded (gl_once_t *once_control, void (*initfunction) (void))
+{
+  if (!once_control->inited)
+    {
+      int err;
+
+      /* Use the mutex to guarantee that if another thread is already calling
+         the initfunction, this thread waits until it's finished.  */
+      err = mutex_lock (&once_control->mutex);
+      if (err != 0)
+        return err;
+      if (!once_control->inited)
+        {
+          once_control->inited = 1;
+          initfunction ();
+        }
+      return mutex_unlock (&once_control->mutex);
+    }
+  else
+    return 0;
+}
+
+int
+glthread_once_singlethreaded (gl_once_t *once_control)
+{
+  /* We know that gl_once_t contains an integer type.  */
+  if (!once_control->inited)
+    {
+      /* First time use of once_control.  Invert the marker.  */
+      once_control->inited = ~ 0;
+      return 1;
+    }
+  else
+    return 0;
+}
+
+#endif
+
+/* ========================================================================= */
+
+#if USE_WINDOWS_THREADS
+
+/* -------------------------- gl_lock_t datatype -------------------------- */
+
+void
+glthread_lock_init_func (gl_lock_t *lock)
+{
+  InitializeCriticalSection (&lock->lock);
+  lock->guard.done = 1;
+}
+
+int
+glthread_lock_lock_func (gl_lock_t *lock)
+{
+  if (!lock->guard.done)
+    {
+      if (InterlockedIncrement (&lock->guard.started) == 0)
+        /* This thread is the first one to need this lock.  Initialize it.  */
+        glthread_lock_init (lock);
+      else
+        /* Yield the CPU while waiting for another thread to finish
+           initializing this lock.  */
+        while (!lock->guard.done)
+          Sleep (0);
+    }
+  EnterCriticalSection (&lock->lock);
+  return 0;
+}
+
+int
+glthread_lock_unlock_func (gl_lock_t *lock)
+{
+  if (!lock->guard.done)
+    return EINVAL;
+  LeaveCriticalSection (&lock->lock);
+  return 0;
+}
+
+int
+glthread_lock_destroy_func (gl_lock_t *lock)
+{
+  if (!lock->guard.done)
+    return EINVAL;
+  DeleteCriticalSection (&lock->lock);
+  lock->guard.done = 0;
+  return 0;
+}
+
+/* ------------------------- gl_rwlock_t datatype ------------------------- */
+
+/* In this file, the waitqueues are implemented as circular arrays.  */
+#define gl_waitqueue_t gl_carray_waitqueue_t
+
+static void
+gl_waitqueue_init (gl_waitqueue_t *wq)
+{
+  wq->array = NULL;
+  wq->count = 0;
+  wq->alloc = 0;
+  wq->offset = 0;
+}
+
+/* Enqueues the current thread, represented by an event, in a wait queue.
+   Returns INVALID_HANDLE_VALUE if an allocation failure occurs.  */
+static HANDLE
+gl_waitqueue_add (gl_waitqueue_t *wq)
+{
+  HANDLE event;
+  unsigned int index;
+
+  if (wq->count == wq->alloc)
+    {
+      unsigned int new_alloc = 2 * wq->alloc + 1;
+      HANDLE *new_array =
+        (HANDLE *) realloc (wq->array, new_alloc * sizeof (HANDLE));
+      if (new_array == NULL)
+        /* No more memory.  */
+        return INVALID_HANDLE_VALUE;
+      /* Now is a good opportunity to rotate the array so that its contents
+         starts at offset 0.  */
+      if (wq->offset > 0)
+        {
+          unsigned int old_count = wq->count;
+          unsigned int old_alloc = wq->alloc;
+          unsigned int old_offset = wq->offset;
+          unsigned int i;
+          if (old_offset + old_count > old_alloc)
+            {
+              unsigned int limit = old_offset + old_count - old_alloc;
+              for (i = 0; i < limit; i++)
+                new_array[old_alloc + i] = new_array[i];
+            }
+          for (i = 0; i < old_count; i++)
+            new_array[i] = new_array[old_offset + i];
+          wq->offset = 0;
+        }
+      wq->array = new_array;
+      wq->alloc = new_alloc;
+    }
+  /* Whether the created event is a manual-reset one or an auto-reset one,
+     does not matter, since we will wait on it only once.  */
+  event = CreateEvent (NULL, TRUE, FALSE, NULL);
+  if (event == INVALID_HANDLE_VALUE)
+    /* No way to allocate an event.  */
+    return INVALID_HANDLE_VALUE;
+  index = wq->offset + wq->count;
+  if (index >= wq->alloc)
+    index -= wq->alloc;
+  wq->array[index] = event;
+  wq->count++;
+  return event;
+}
+
+/* Notifies the first thread from a wait queue and dequeues it.  */
+static void
+gl_waitqueue_notify_first (gl_waitqueue_t *wq)
+{
+  SetEvent (wq->array[wq->offset + 0]);
+  wq->offset++;
+  wq->count--;
+  if (wq->count == 0 || wq->offset == wq->alloc)
+    wq->offset = 0;
+}
+
+/* Notifies all threads from a wait queue and dequeues them all.  */
+static void
+gl_waitqueue_notify_all (gl_waitqueue_t *wq)
+{
+  unsigned int i;
+
+  for (i = 0; i < wq->count; i++)
+    {
+      unsigned int index = wq->offset + i;
+      if (index >= wq->alloc)
+        index -= wq->alloc;
+      SetEvent (wq->array[index]);
+    }
+  wq->count = 0;
+  wq->offset = 0;
+}
+
+void
+glthread_rwlock_init_func (gl_rwlock_t *lock)
+{
+  InitializeCriticalSection (&lock->lock);
+  gl_waitqueue_init (&lock->waiting_readers);
+  gl_waitqueue_init (&lock->waiting_writers);
+  lock->runcount = 0;
+  lock->guard.done = 1;
+}
+
+int
+glthread_rwlock_rdlock_func (gl_rwlock_t *lock)
+{
+  if (!lock->guard.done)
+    {
+      if (InterlockedIncrement (&lock->guard.started) == 0)
+        /* This thread is the first one to need this lock.  Initialize it.  */
+        glthread_rwlock_init (lock);
+      else
+        /* Yield the CPU while waiting for another thread to finish
+           initializing this lock.  */
+        while (!lock->guard.done)
+          Sleep (0);
+    }
+  EnterCriticalSection (&lock->lock);
+  /* Test whether only readers are currently running, and whether the runcount
+     field will not overflow, and whether no writer is waiting.  The latter
+     condition is because POSIX recommends that "write locks shall take
+     precedence over read locks", to avoid "writer starvation".  */
+  if (!(lock->runcount + 1 > 0 && lock->waiting_writers.count == 0))
+    {
+      /* This thread has to wait for a while.  Enqueue it among the
+         waiting_readers.  */
+      HANDLE event = gl_waitqueue_add (&lock->waiting_readers);
+      if (event != INVALID_HANDLE_VALUE)
+        {
+          DWORD result;
+          LeaveCriticalSection (&lock->lock);
+          /* Wait until another thread signals this event.  */
+          result = WaitForSingleObject (event, INFINITE);
+          if (result == WAIT_FAILED || result == WAIT_TIMEOUT)
+            abort ();
+          CloseHandle (event);
+          /* The thread which signalled the event already did the bookkeeping:
+             removed us from the waiting_readers, incremented lock->runcount.  */
+          if (!(lock->runcount > 0))
+            abort ();
+          return 0;
+        }
+      else
+        {
+          /* Allocation failure.  Weird.  */
+          do
+            {
+              LeaveCriticalSection (&lock->lock);
+              Sleep (1);
+              EnterCriticalSection (&lock->lock);
+            }
+          while (!(lock->runcount + 1 > 0));
+        }
+    }
+  lock->runcount++;
+  LeaveCriticalSection (&lock->lock);
+  return 0;
+}
+
+int
+glthread_rwlock_wrlock_func (gl_rwlock_t *lock)
+{
+  if (!lock->guard.done)
+    {
+      if (InterlockedIncrement (&lock->guard.started) == 0)
+        /* This thread is the first one to need this lock.  Initialize it.  */
+        glthread_rwlock_init (lock);
+      else
+        /* Yield the CPU while waiting for another thread to finish
+           initializing this lock.  */
+        while (!lock->guard.done)
+          Sleep (0);
+    }
+  EnterCriticalSection (&lock->lock);
+  /* Test whether no readers or writers are currently running.  */
+  if (!(lock->runcount == 0))
+    {
+      /* This thread has to wait for a while.  Enqueue it among the
+         waiting_writers.  */
+      HANDLE event = gl_waitqueue_add (&lock->waiting_writers);
+      if (event != INVALID_HANDLE_VALUE)
+        {
+          DWORD result;
+          LeaveCriticalSection (&lock->lock);
+          /* Wait until another thread signals this event.  */
+          result = WaitForSingleObject (event, INFINITE);
+          if (result == WAIT_FAILED || result == WAIT_TIMEOUT)
+            abort ();
+          CloseHandle (event);
+          /* The thread which signalled the event already did the bookkeeping:
+             removed us from the waiting_writers, set lock->runcount = -1.  */
+          if (!(lock->runcount == -1))
+            abort ();
+          return 0;
+        }
+      else
+        {
+          /* Allocation failure.  Weird.  */
+          do
+            {
+              LeaveCriticalSection (&lock->lock);
+              Sleep (1);
+              EnterCriticalSection (&lock->lock);
+            }
+          while (!(lock->runcount == 0));
+        }
+    }
+  lock->runcount--; /* runcount becomes -1 */
+  LeaveCriticalSection (&lock->lock);
+  return 0;
+}
+
+int
+glthread_rwlock_unlock_func (gl_rwlock_t *lock)
+{
+  if (!lock->guard.done)
+    return EINVAL;
+  EnterCriticalSection (&lock->lock);
+  if (lock->runcount < 0)
+    {
+      /* Drop a writer lock.  */
+      if (!(lock->runcount == -1))
+        abort ();
+      lock->runcount = 0;
+    }
+  else
+    {
+      /* Drop a reader lock.  */
+      if (!(lock->runcount > 0))
+        {
+          LeaveCriticalSection (&lock->lock);
+          return EPERM;
+        }
+      lock->runcount--;
+    }
+  if (lock->runcount == 0)
+    {
+      /* POSIX recommends that "write locks shall take precedence over read
+         locks", to avoid "writer starvation".  */
+      if (lock->waiting_writers.count > 0)
+        {
+          /* Wake up one of the waiting writers.  */
+          lock->runcount--;
+          gl_waitqueue_notify_first (&lock->waiting_writers);
+        }
+      else
+        {
+          /* Wake up all waiting readers.  */
+          lock->runcount += lock->waiting_readers.count;
+          gl_waitqueue_notify_all (&lock->waiting_readers);
+        }
+    }
+  LeaveCriticalSection (&lock->lock);
+  return 0;
+}
+
+int
+glthread_rwlock_destroy_func (gl_rwlock_t *lock)
+{
+  if (!lock->guard.done)
+    return EINVAL;
+  if (lock->runcount != 0)
+    return EBUSY;
+  DeleteCriticalSection (&lock->lock);
+  if (lock->waiting_readers.array != NULL)
+    free (lock->waiting_readers.array);
+  if (lock->waiting_writers.array != NULL)
+    free (lock->waiting_writers.array);
+  lock->guard.done = 0;
+  return 0;
+}
+
+/* --------------------- gl_recursive_lock_t datatype --------------------- */
+
+void
+glthread_recursive_lock_init_func (gl_recursive_lock_t *lock)
+{
+  lock->owner = 0;
+  lock->depth = 0;
+  InitializeCriticalSection (&lock->lock);
+  lock->guard.done = 1;
+}
+
+int
+glthread_recursive_lock_lock_func (gl_recursive_lock_t *lock)
+{
+  if (!lock->guard.done)
+    {
+      if (InterlockedIncrement (&lock->guard.started) == 0)
+        /* This thread is the first one to need this lock.  Initialize it.  */
+        glthread_recursive_lock_init (lock);
+      else
+        /* Yield the CPU while waiting for another thread to finish
+           initializing this lock.  */
+        while (!lock->guard.done)
+          Sleep (0);
+    }
+  {
+    DWORD self = GetCurrentThreadId ();
+    if (lock->owner != self)
+      {
+        EnterCriticalSection (&lock->lock);
+        lock->owner = self;
+      }
+    if (++(lock->depth) == 0) /* wraparound? */
+      {
+        lock->depth--;
+        return EAGAIN;
+      }
+  }
+  return 0;
+}
+
+int
+glthread_recursive_lock_unlock_func (gl_recursive_lock_t *lock)
+{
+  if (lock->owner != GetCurrentThreadId ())
+    return EPERM;
+  if (lock->depth == 0)
+    return EINVAL;
+  if (--(lock->depth) == 0)
+    {
+      lock->owner = 0;
+      LeaveCriticalSection (&lock->lock);
+    }
+  return 0;
+}
+
+int
+glthread_recursive_lock_destroy_func (gl_recursive_lock_t *lock)
+{
+  if (lock->owner != 0)
+    return EBUSY;
+  DeleteCriticalSection (&lock->lock);
+  lock->guard.done = 0;
+  return 0;
+}
+
+/* -------------------------- gl_once_t datatype -------------------------- */
+
+void
+glthread_once_func (gl_once_t *once_control, void (*initfunction) (void))
+{
+  if (once_control->inited <= 0)
+    {
+      if (InterlockedIncrement (&once_control->started) == 0)
+        {
+          /* This thread is the first one to come to this once_control.  */
+          InitializeCriticalSection (&once_control->lock);
+          EnterCriticalSection (&once_control->lock);
+          once_control->inited = 0;
+          initfunction ();
+          once_control->inited = 1;
+          LeaveCriticalSection (&once_control->lock);
+        }
+      else
+        {
+          /* Undo last operation.  */
+          InterlockedDecrement (&once_control->started);
+          /* Some other thread has already started the initialization.
+             Yield the CPU while waiting for the other thread to finish
+             initializing and taking the lock.  */
+          while (once_control->inited < 0)
+            Sleep (0);
+          if (once_control->inited <= 0)
+            {
+              /* Take the lock.  This blocks until the other thread has
+                 finished calling the initfunction.  */
+              EnterCriticalSection (&once_control->lock);
+              LeaveCriticalSection (&once_control->lock);
+              if (!(once_control->inited > 0))
+                abort ();
+            }
+        }
+    }
+}
+
+#endif
+
+/* ========================================================================= */
diff --git a/gl/glthread/lock.h b/gl/glthread/lock.h
new file mode 100644
index 0000000..c6b46ac
--- /dev/null
+++ b/gl/glthread/lock.h
@@ -0,0 +1,979 @@
+/* Locking in multithreaded situations.
+   Copyright (C) 2005-2017 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
+
+/* Written by Bruno Haible <bruno@clisp.org>, 2005.
+   Based on GCC's gthr-posix.h, gthr-posix95.h, gthr-solaris.h,
+   gthr-win32.h.  */
+
+/* This file contains locking primitives for use with a given thread library.
+   It does not contain primitives for creating threads or for other
+   synchronization primitives.
+
+   Normal (non-recursive) locks:
+     Type:                gl_lock_t
+     Declaration:         gl_lock_define(extern, name)
+     Initializer:         gl_lock_define_initialized(, name)
+     Initialization:      gl_lock_init (name);
+     Taking the lock:     gl_lock_lock (name);
+     Releasing the lock:  gl_lock_unlock (name);
+     De-initialization:   gl_lock_destroy (name);
+   Equivalent functions with control of error handling:
+     Initialization:      err = glthread_lock_init (&name);
+     Taking the lock:     err = glthread_lock_lock (&name);
+     Releasing the lock:  err = glthread_lock_unlock (&name);
+     De-initialization:   err = glthread_lock_destroy (&name);
+
+   Read-Write (non-recursive) locks:
+     Type:                gl_rwlock_t
+     Declaration:         gl_rwlock_define(extern, name)
+     Initializer:         gl_rwlock_define_initialized(, name)
+     Initialization:      gl_rwlock_init (name);
+     Taking the lock:     gl_rwlock_rdlock (name);
+                          gl_rwlock_wrlock (name);
+     Releasing the lock:  gl_rwlock_unlock (name);
+     De-initialization:   gl_rwlock_destroy (name);
+   Equivalent functions with control of error handling:
+     Initialization:      err = glthread_rwlock_init (&name);
+     Taking the lock:     err = glthread_rwlock_rdlock (&name);
+                          err = glthread_rwlock_wrlock (&name);
+     Releasing the lock:  err = glthread_rwlock_unlock (&name);
+     De-initialization:   err = glthread_rwlock_destroy (&name);
+
+   Recursive locks:
+     Type:                gl_recursive_lock_t
+     Declaration:         gl_recursive_lock_define(extern, name)
+     Initializer:         gl_recursive_lock_define_initialized(, name)
+     Initialization:      gl_recursive_lock_init (name);
+     Taking the lock:     gl_recursive_lock_lock (name);
+     Releasing the lock:  gl_recursive_lock_unlock (name);
+     De-initialization:   gl_recursive_lock_destroy (name);
+   Equivalent functions with control of error handling:
+     Initialization:      err = glthread_recursive_lock_init (&name);
+     Taking the lock:     err = glthread_recursive_lock_lock (&name);
+     Releasing the lock:  err = glthread_recursive_lock_unlock (&name);
+     De-initialization:   err = glthread_recursive_lock_destroy (&name);
+
+  Once-only execution:
+     Type:                gl_once_t
+     Initializer:         gl_once_define(extern, name)
+     Execution:           gl_once (name, initfunction);
+   Equivalent functions with control of error handling:
+     Execution:           err = glthread_once (&name, initfunction);
+*/
+
+
+#ifndef _LOCK_H
+#define _LOCK_H
+
+#include <errno.h>
+#include <stdlib.h>
+
+/* ========================================================================= */
+
+#if USE_POSIX_THREADS
+
+/* Use the POSIX threads library.  */
+
+# include <pthread.h>
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+# if PTHREAD_IN_USE_DETECTION_HARD
+
+/* The pthread_in_use() detection needs to be done at runtime.  */
+#  define pthread_in_use() \
+     glthread_in_use ()
+extern int glthread_in_use (void);
+
+# endif
+
+# if USE_POSIX_THREADS_WEAK
+
+/* Use weak references to the POSIX threads library.  */
+
+/* Weak references avoid dragging in external libraries if the other parts
+   of the program don't use them.  Here we use them, because we don't want
+   every program that uses libintl to depend on libpthread.  This assumes
+   that libpthread would not be loaded after libintl; i.e. if libintl is
+   loaded first, by an executable that does not depend on libpthread, and
+   then a module is dynamically loaded that depends on libpthread, libintl
+   will not be multithread-safe.  */
+
+/* The way to test at runtime whether libpthread is present is to test
+   whether a function pointer's value, such as &pthread_mutex_init, is
+   non-NULL.  However, some versions of GCC have a bug through which, in
+   PIC mode, &foo != NULL always evaluates to true if there is a direct
+   call to foo(...) in the same function.  To avoid this, we test the
+   address of a function in libpthread that we don't use.  */
+
+#  pragma weak pthread_mutex_init
+#  pragma weak pthread_mutex_lock
+#  pragma weak pthread_mutex_unlock
+#  pragma weak pthread_mutex_destroy
+#  pragma weak pthread_rwlock_init
+#  pragma weak pthread_rwlock_rdlock
+#  pragma weak pthread_rwlock_wrlock
+#  pragma weak pthread_rwlock_unlock
+#  pragma weak pthread_rwlock_destroy
+#  pragma weak pthread_once
+#  pragma weak pthread_cond_init
+#  pragma weak pthread_cond_wait
+#  pragma weak pthread_cond_signal
+#  pragma weak pthread_cond_broadcast
+#  pragma weak pthread_cond_destroy
+#  pragma weak pthread_mutexattr_init
+#  pragma weak pthread_mutexattr_settype
+#  pragma weak pthread_mutexattr_destroy
+#  pragma weak pthread_rwlockattr_init
+#  if __GNU_LIBRARY__ > 1
+#   pragma weak pthread_rwlockattr_setkind_np
+#  endif
+#  pragma weak pthread_rwlockattr_destroy
+#  ifndef pthread_self
+#   pragma weak pthread_self
+#  endif
+
+#  if !PTHREAD_IN_USE_DETECTION_HARD
+#   pragma weak pthread_cancel
+#   define pthread_in_use() (pthread_cancel != NULL)
+#  endif
+
+# else
+
+#  if !PTHREAD_IN_USE_DETECTION_HARD
+#   define pthread_in_use() 1
+#  endif
+
+# endif
+
+/* -------------------------- gl_lock_t datatype -------------------------- */
+
+typedef pthread_mutex_t gl_lock_t;
+# define gl_lock_define(STORAGECLASS, NAME) \
+    STORAGECLASS pthread_mutex_t NAME;
+# define gl_lock_define_initialized(STORAGECLASS, NAME) \
+    STORAGECLASS pthread_mutex_t NAME = gl_lock_initializer;
+# define gl_lock_initializer \
+    PTHREAD_MUTEX_INITIALIZER
+# define glthread_lock_init(LOCK) \
+    (pthread_in_use () ? pthread_mutex_init (LOCK, NULL) : 0)
+# define glthread_lock_lock(LOCK) \
+    (pthread_in_use () ? pthread_mutex_lock (LOCK) : 0)
+# define glthread_lock_unlock(LOCK) \
+    (pthread_in_use () ? pthread_mutex_unlock (LOCK) : 0)
+# define glthread_lock_destroy(LOCK) \
+    (pthread_in_use () ? pthread_mutex_destroy (LOCK) : 0)
+
+/* ------------------------- gl_rwlock_t datatype ------------------------- */
+
+# if HAVE_PTHREAD_RWLOCK && (HAVE_PTHREAD_RWLOCK_RDLOCK_PREFER_WRITER || (defined PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP && (__GNU_LIBRARY__ > 1)))
+
+#  ifdef PTHREAD_RWLOCK_INITIALIZER
+
+typedef pthread_rwlock_t gl_rwlock_t;
+#   define gl_rwlock_define(STORAGECLASS, NAME) \
+      STORAGECLASS pthread_rwlock_t NAME;
+#   define gl_rwlock_define_initialized(STORAGECLASS, NAME) \
+      STORAGECLASS pthread_rwlock_t NAME = gl_rwlock_initializer;
+#   if HAVE_PTHREAD_RWLOCK_RDLOCK_PREFER_WRITER
+#    define gl_rwlock_initializer \
+       PTHREAD_RWLOCK_INITIALIZER
+#    define glthread_rwlock_init(LOCK) \
+       (pthread_in_use () ? pthread_rwlock_init (LOCK, NULL) : 0)
+#   else /* glibc with bug https://sourceware.org/bugzilla/show_bug.cgi?id=13701 */
+#    define gl_rwlock_initializer \
+       PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP
+#    define glthread_rwlock_init(LOCK) \
+       (pthread_in_use () ? glthread_rwlock_init_for_glibc (LOCK) : 0)
+extern int glthread_rwlock_init_for_glibc (pthread_rwlock_t *lock);
+#   endif
+#   define glthread_rwlock_rdlock(LOCK) \
+      (pthread_in_use () ? pthread_rwlock_rdlock (LOCK) : 0)
+#   define glthread_rwlock_wrlock(LOCK) \
+      (pthread_in_use () ? pthread_rwlock_wrlock (LOCK) : 0)
+#   define glthread_rwlock_unlock(LOCK) \
+      (pthread_in_use () ? pthread_rwlock_unlock (LOCK) : 0)
+#   define glthread_rwlock_destroy(LOCK) \
+      (pthread_in_use () ? pthread_rwlock_destroy (LOCK) : 0)
+
+#  else
+
+typedef struct
+        {
+          int initialized;
+          pthread_mutex_t guard;   /* protects the initialization */
+          pthread_rwlock_t rwlock; /* read-write lock */
+        }
+        gl_rwlock_t;
+#   define gl_rwlock_define(STORAGECLASS, NAME) \
+      STORAGECLASS gl_rwlock_t NAME;
+#   define gl_rwlock_define_initialized(STORAGECLASS, NAME) \
+      STORAGECLASS gl_rwlock_t NAME = gl_rwlock_initializer;
+#   define gl_rwlock_initializer \
+      { 0, PTHREAD_MUTEX_INITIALIZER }
+#   define glthread_rwlock_init(LOCK) \
+      (pthread_in_use () ? glthread_rwlock_init_multithreaded (LOCK) : 0)
+#   define glthread_rwlock_rdlock(LOCK) \
+      (pthread_in_use () ? glthread_rwlock_rdlock_multithreaded (LOCK) : 0)
+#   define glthread_rwlock_wrlock(LOCK) \
+      (pthread_in_use () ? glthread_rwlock_wrlock_multithreaded (LOCK) : 0)
+#   define glthread_rwlock_unlock(LOCK) \
+      (pthread_in_use () ? glthread_rwlock_unlock_multithreaded (LOCK) : 0)
+#   define glthread_rwlock_destroy(LOCK) \
+      (pthread_in_use () ? glthread_rwlock_destroy_multithreaded (LOCK) : 0)
+extern int glthread_rwlock_init_multithreaded (gl_rwlock_t *lock);
+extern int glthread_rwlock_rdlock_multithreaded (gl_rwlock_t *lock);
+extern int glthread_rwlock_wrlock_multithreaded (gl_rwlock_t *lock);
+extern int glthread_rwlock_unlock_multithreaded (gl_rwlock_t *lock);
+extern int glthread_rwlock_destroy_multithreaded (gl_rwlock_t *lock);
+
+#  endif
+
+# else
+
+typedef struct
+        {
+          pthread_mutex_t lock; /* protects the remaining fields */
+          pthread_cond_t waiting_readers; /* waiting readers */
+          pthread_cond_t waiting_writers; /* waiting writers */
+          unsigned int waiting_writers_count; /* number of waiting writers */
+          int runcount; /* number of readers running, or -1 when a writer runs */
+        }
+        gl_rwlock_t;
+# define gl_rwlock_define(STORAGECLASS, NAME) \
+    STORAGECLASS gl_rwlock_t NAME;
+# define gl_rwlock_define_initialized(STORAGECLASS, NAME) \
+    STORAGECLASS gl_rwlock_t NAME = gl_rwlock_initializer;
+# define gl_rwlock_initializer \
+    { PTHREAD_MUTEX_INITIALIZER, PTHREAD_COND_INITIALIZER, PTHREAD_COND_INITIALIZER, 0, 0 }
+# define glthread_rwlock_init(LOCK) \
+    (pthread_in_use () ? glthread_rwlock_init_multithreaded (LOCK) : 0)
+# define glthread_rwlock_rdlock(LOCK) \
+    (pthread_in_use () ? glthread_rwlock_rdlock_multithreaded (LOCK) : 0)
+# define glthread_rwlock_wrlock(LOCK) \
+    (pthread_in_use () ? glthread_rwlock_wrlock_multithreaded (LOCK) : 0)
+# define glthread_rwlock_unlock(LOCK) \
+    (pthread_in_use () ? glthread_rwlock_unlock_multithreaded (LOCK) : 0)
+# define glthread_rwlock_destroy(LOCK) \
+    (pthread_in_use () ? glthread_rwlock_destroy_multithreaded (LOCK) : 0)
+extern int glthread_rwlock_init_multithreaded (gl_rwlock_t *lock);
+extern int glthread_rwlock_rdlock_multithreaded (gl_rwlock_t *lock);
+extern int glthread_rwlock_wrlock_multithreaded (gl_rwlock_t *lock);
+extern int glthread_rwlock_unlock_multithreaded (gl_rwlock_t *lock);
+extern int glthread_rwlock_destroy_multithreaded (gl_rwlock_t *lock);
+
+# endif
+
+/* --------------------- gl_recursive_lock_t datatype --------------------- */
+
+# if HAVE_PTHREAD_MUTEX_RECURSIVE
+
+#  if defined PTHREAD_RECURSIVE_MUTEX_INITIALIZER || defined PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
+
+typedef pthread_mutex_t gl_recursive_lock_t;
+#   define gl_recursive_lock_define(STORAGECLASS, NAME) \
+      STORAGECLASS pthread_mutex_t NAME;
+#   define gl_recursive_lock_define_initialized(STORAGECLASS, NAME) \
+      STORAGECLASS pthread_mutex_t NAME = gl_recursive_lock_initializer;
+#   ifdef PTHREAD_RECURSIVE_MUTEX_INITIALIZER
+#    define gl_recursive_lock_initializer \
+       PTHREAD_RECURSIVE_MUTEX_INITIALIZER
+#   else
+#    define gl_recursive_lock_initializer \
+       PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
+#   endif
+#   define glthread_recursive_lock_init(LOCK) \
+      (pthread_in_use () ? glthread_recursive_lock_init_multithreaded (LOCK) : 0)
+#   define glthread_recursive_lock_lock(LOCK) \
+      (pthread_in_use () ? pthread_mutex_lock (LOCK) : 0)
+#   define glthread_recursive_lock_unlock(LOCK) \
+      (pthread_in_use () ? pthread_mutex_unlock (LOCK) : 0)
+#   define glthread_recursive_lock_destroy(LOCK) \
+      (pthread_in_use () ? pthread_mutex_destroy (LOCK) : 0)
+extern int glthread_recursive_lock_init_multithreaded (gl_recursive_lock_t *lock);
+
+#  else
+
+typedef struct
+        {
+          pthread_mutex_t recmutex; /* recursive mutex */
+          pthread_mutex_t guard;    /* protects the initialization */
+          int initialized;
+        }
+        gl_recursive_lock_t;
+#   define gl_recursive_lock_define(STORAGECLASS, NAME) \
+      STORAGECLASS gl_recursive_lock_t NAME;
+#   define gl_recursive_lock_define_initialized(STORAGECLASS, NAME) \
+      STORAGECLASS gl_recursive_lock_t NAME = gl_recursive_lock_initializer;
+#   define gl_recursive_lock_initializer \
+      { PTHREAD_MUTEX_INITIALIZER, PTHREAD_MUTEX_INITIALIZER, 0 }
+#   define glthread_recursive_lock_init(LOCK) \
+      (pthread_in_use () ? glthread_recursive_lock_init_multithreaded (LOCK) : 0)
+#   define glthread_recursive_lock_lock(LOCK) \
+      (pthread_in_use () ? glthread_recursive_lock_lock_multithreaded (LOCK) : 0)
+#   define glthread_recursive_lock_unlock(LOCK) \
+      (pthread_in_use () ? glthread_recursive_lock_unlock_multithreaded (LOCK) : 0)
+#   define glthread_recursive_lock_destroy(LOCK) \
+      (pthread_in_use () ? glthread_recursive_lock_destroy_multithreaded (LOCK) : 0)
+extern int glthread_recursive_lock_init_multithreaded (gl_recursive_lock_t *lock);
+extern int glthread_recursive_lock_lock_multithreaded (gl_recursive_lock_t *lock);
+extern int glthread_recursive_lock_unlock_multithreaded (gl_recursive_lock_t *lock);
+extern int glthread_recursive_lock_destroy_multithreaded (gl_recursive_lock_t *lock);
+
+#  endif
+
+# else
+
+/* Old versions of POSIX threads on Solaris did not have recursive locks.
+   We have to implement them ourselves.  */
+
+typedef struct
+        {
+          pthread_mutex_t mutex;
+          pthread_t owner;
+          unsigned long depth;
+        }
+        gl_recursive_lock_t;
+#  define gl_recursive_lock_define(STORAGECLASS, NAME) \
+     STORAGECLASS gl_recursive_lock_t NAME;
+#  define gl_recursive_lock_define_initialized(STORAGECLASS, NAME) \
+     STORAGECLASS gl_recursive_lock_t NAME = gl_recursive_lock_initializer;
+#  define gl_recursive_lock_initializer \
+     { PTHREAD_MUTEX_INITIALIZER, (pthread_t) 0, 0 }
+#  define glthread_recursive_lock_init(LOCK) \
+     (pthread_in_use () ? glthread_recursive_lock_init_multithreaded (LOCK) : 0)
+#  define glthread_recursive_lock_lock(LOCK) \
+     (pthread_in_use () ? glthread_recursive_lock_lock_multithreaded (LOCK) : 0)
+#  define glthread_recursive_lock_unlock(LOCK) \
+     (pthread_in_use () ? glthread_recursive_lock_unlock_multithreaded (LOCK) : 0)
+#  define glthread_recursive_lock_destroy(LOCK) \
+     (pthread_in_use () ? glthread_recursive_lock_destroy_multithreaded (LOCK) : 0)
+extern int glthread_recursive_lock_init_multithreaded (gl_recursive_lock_t *lock);
+extern int glthread_recursive_lock_lock_multithreaded (gl_recursive_lock_t *lock);
+extern int glthread_recursive_lock_unlock_multithreaded (gl_recursive_lock_t *lock);
+extern int glthread_recursive_lock_destroy_multithreaded (gl_recursive_lock_t *lock);
+
+# endif
+
+/* -------------------------- gl_once_t datatype -------------------------- */
+
+typedef pthread_once_t gl_once_t;
+# define gl_once_define(STORAGECLASS, NAME) \
+    STORAGECLASS pthread_once_t NAME = PTHREAD_ONCE_INIT;
+# define glthread_once(ONCE_CONTROL, INITFUNCTION) \
+    (pthread_in_use ()                                                         \
+     ? pthread_once (ONCE_CONTROL, INITFUNCTION)                               \
+     : (glthread_once_singlethreaded (ONCE_CONTROL) ? (INITFUNCTION (), 0) : 0))
+extern int glthread_once_singlethreaded (pthread_once_t *once_control);
+
+# ifdef __cplusplus
+}
+# endif
+
+#endif
+
+/* ========================================================================= */
+
+#if USE_PTH_THREADS
+
+/* Use the GNU Pth threads library.  */
+
+# include <pth.h>
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+# if USE_PTH_THREADS_WEAK
+
+/* Use weak references to the GNU Pth threads library.  */
+
+#  pragma weak pth_mutex_init
+#  pragma weak pth_mutex_acquire
+#  pragma weak pth_mutex_release
+#  pragma weak pth_rwlock_init
+#  pragma weak pth_rwlock_acquire
+#  pragma weak pth_rwlock_release
+#  pragma weak pth_once
+
+#  pragma weak pth_cancel
+#  define pth_in_use() (pth_cancel != NULL)
+
+# else
+
+#  define pth_in_use() 1
+
+# endif
+
+/* -------------------------- gl_lock_t datatype -------------------------- */
+
+typedef pth_mutex_t gl_lock_t;
+# define gl_lock_define(STORAGECLASS, NAME) \
+    STORAGECLASS pth_mutex_t NAME;
+# define gl_lock_define_initialized(STORAGECLASS, NAME) \
+    STORAGECLASS pth_mutex_t NAME = gl_lock_initializer;
+# define gl_lock_initializer \
+    PTH_MUTEX_INIT
+# define glthread_lock_init(LOCK) \
+    (pth_in_use () && !pth_mutex_init (LOCK) ? errno : 0)
+# define glthread_lock_lock(LOCK) \
+    (pth_in_use () && !pth_mutex_acquire (LOCK, 0, NULL) ? errno : 0)
+# define glthread_lock_unlock(LOCK) \
+    (pth_in_use () && !pth_mutex_release (LOCK) ? errno : 0)
+# define glthread_lock_destroy(LOCK) \
+    ((void)(LOCK), 0)
+
+/* ------------------------- gl_rwlock_t datatype ------------------------- */
+
+/* Pth pth_rwlock_acquire always prefers readers.  No autoconf test so far.  */
+# if HAVE_PTH_RWLOCK_ACQUIRE_PREFER_WRITER
+
+typedef pth_rwlock_t gl_rwlock_t;
+#  define gl_rwlock_define(STORAGECLASS, NAME) \
+     STORAGECLASS pth_rwlock_t NAME;
+#  define gl_rwlock_define_initialized(STORAGECLASS, NAME) \
+     STORAGECLASS pth_rwlock_t NAME = gl_rwlock_initializer;
+#  define gl_rwlock_initializer \
+     PTH_RWLOCK_INIT
+#  define glthread_rwlock_init(LOCK) \
+     (pth_in_use () && !pth_rwlock_init (LOCK) ? errno : 0)
+#  define glthread_rwlock_rdlock(LOCK) \
+     (pth_in_use () && !pth_rwlock_acquire (LOCK, PTH_RWLOCK_RD, 0, NULL) ? errno : 0)
+#  define glthread_rwlock_wrlock(LOCK) \
+     (pth_in_use () && !pth_rwlock_acquire (LOCK, PTH_RWLOCK_RW, 0, NULL) ? errno : 0)
+#  define glthread_rwlock_unlock(LOCK) \
+     (pth_in_use () && !pth_rwlock_release (LOCK) ? errno : 0)
+#  define glthread_rwlock_destroy(LOCK) \
+     ((void)(LOCK), 0)
+
+# else
+
+typedef struct
+        {
+          int initialized;
+          pth_mutex_t lock; /* protects the remaining fields */
+          pth_cond_t waiting_readers; /* waiting readers */
+          pth_cond_t waiting_writers; /* waiting writers */
+          unsigned int waiting_writers_count; /* number of waiting writers */
+          int runcount; /* number of readers running, or -1 when a writer runs */
+        }
+        gl_rwlock_t;
+#  define gl_rwlock_define(STORAGECLASS, NAME) \
+     STORAGECLASS gl_rwlock_t NAME;
+#  define gl_rwlock_define_initialized(STORAGECLASS, NAME) \
+     STORAGECLASS gl_rwlock_t NAME = gl_rwlock_initializer;
+#  define gl_rwlock_initializer \
+     { 0 }
+#  define glthread_rwlock_init(LOCK) \
+     (pth_in_use () ? glthread_rwlock_init_multithreaded (LOCK) : 0)
+#  define glthread_rwlock_rdlock(LOCK) \
+     (pth_in_use () ? glthread_rwlock_rdlock_multithreaded (LOCK) : 0)
+#  define glthread_rwlock_wrlock(LOCK) \
+     (pth_in_use () ? glthread_rwlock_wrlock_multithreaded (LOCK) : 0)
+#  define glthread_rwlock_unlock(LOCK) \
+     (pth_in_use () ? glthread_rwlock_unlock_multithreaded (LOCK) : 0)
+#  define glthread_rwlock_destroy(LOCK) \
+     (pth_in_use () ? glthread_rwlock_destroy_multithreaded (LOCK) : 0)
+extern int glthread_rwlock_init_multithreaded (gl_rwlock_t *lock);
+extern int glthread_rwlock_rdlock_multithreaded (gl_rwlock_t *lock);
+extern int glthread_rwlock_wrlock_multithreaded (gl_rwlock_t *lock);
+extern int glthread_rwlock_unlock_multithreaded (gl_rwlock_t *lock);
+extern int glthread_rwlock_destroy_multithreaded (gl_rwlock_t *lock);
+
+# endif
+
+/* --------------------- gl_recursive_lock_t datatype --------------------- */
+
+/* In Pth, mutexes are recursive by default.  */
+typedef pth_mutex_t gl_recursive_lock_t;
+#  define gl_recursive_lock_define(STORAGECLASS, NAME) \
+     STORAGECLASS pth_mutex_t NAME;
+#  define gl_recursive_lock_define_initialized(STORAGECLASS, NAME) \
+     STORAGECLASS pth_mutex_t NAME = gl_recursive_lock_initializer;
+#  define gl_recursive_lock_initializer \
+     PTH_MUTEX_INIT
+#  define glthread_recursive_lock_init(LOCK) \
+     (pth_in_use () && !pth_mutex_init (LOCK) ? errno : 0)
+#  define glthread_recursive_lock_lock(LOCK) \
+     (pth_in_use () && !pth_mutex_acquire (LOCK, 0, NULL) ? errno : 0)
+#  define glthread_recursive_lock_unlock(LOCK) \
+     (pth_in_use () && !pth_mutex_release (LOCK) ? errno : 0)
+#  define glthread_recursive_lock_destroy(LOCK) \
+     ((void)(LOCK), 0)
+
+/* -------------------------- gl_once_t datatype -------------------------- */
+
+typedef pth_once_t gl_once_t;
+# define gl_once_define(STORAGECLASS, NAME) \
+    STORAGECLASS pth_once_t NAME = PTH_ONCE_INIT;
+# define glthread_once(ONCE_CONTROL, INITFUNCTION) \
+    (pth_in_use ()                                                             \
+     ? glthread_once_multithreaded (ONCE_CONTROL, INITFUNCTION)                \
+     : (glthread_once_singlethreaded (ONCE_CONTROL) ? (INITFUNCTION (), 0) : 0))
+extern int glthread_once_multithreaded (pth_once_t *once_control, void (*initfunction) (void));
+extern int glthread_once_singlethreaded (pth_once_t *once_control);
+
+# ifdef __cplusplus
+}
+# endif
+
+#endif
+
+/* ========================================================================= */
+
+#if USE_SOLARIS_THREADS
+
+/* Use the old Solaris threads library.  */
+
+# include <thread.h>
+# include <synch.h>
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+# if USE_SOLARIS_THREADS_WEAK
+
+/* Use weak references to the old Solaris threads library.  */
+
+#  pragma weak mutex_init
+#  pragma weak mutex_lock
+#  pragma weak mutex_unlock
+#  pragma weak mutex_destroy
+#  pragma weak rwlock_init
+#  pragma weak rw_rdlock
+#  pragma weak rw_wrlock
+#  pragma weak rw_unlock
+#  pragma weak rwlock_destroy
+#  pragma weak thr_self
+
+#  pragma weak thr_suspend
+#  define thread_in_use() (thr_suspend != NULL)
+
+# else
+
+#  define thread_in_use() 1
+
+# endif
+
+/* -------------------------- gl_lock_t datatype -------------------------- */
+
+typedef mutex_t gl_lock_t;
+# define gl_lock_define(STORAGECLASS, NAME) \
+    STORAGECLASS mutex_t NAME;
+# define gl_lock_define_initialized(STORAGECLASS, NAME) \
+    STORAGECLASS mutex_t NAME = gl_lock_initializer;
+# define gl_lock_initializer \
+    DEFAULTMUTEX
+# define glthread_lock_init(LOCK) \
+    (thread_in_use () ? mutex_init (LOCK, USYNC_THREAD, NULL) : 0)
+# define glthread_lock_lock(LOCK) \
+    (thread_in_use () ? mutex_lock (LOCK) : 0)
+# define glthread_lock_unlock(LOCK) \
+    (thread_in_use () ? mutex_unlock (LOCK) : 0)
+# define glthread_lock_destroy(LOCK) \
+    (thread_in_use () ? mutex_destroy (LOCK) : 0)
+
+/* ------------------------- gl_rwlock_t datatype ------------------------- */
+
+typedef rwlock_t gl_rwlock_t;
+# define gl_rwlock_define(STORAGECLASS, NAME) \
+    STORAGECLASS rwlock_t NAME;
+# define gl_rwlock_define_initialized(STORAGECLASS, NAME) \
+    STORAGECLASS rwlock_t NAME = gl_rwlock_initializer;
+# define gl_rwlock_initializer \
+    DEFAULTRWLOCK
+# define glthread_rwlock_init(LOCK) \
+    (thread_in_use () ? rwlock_init (LOCK, USYNC_THREAD, NULL) : 0)
+# define glthread_rwlock_rdlock(LOCK) \
+    (thread_in_use () ? rw_rdlock (LOCK) : 0)
+# define glthread_rwlock_wrlock(LOCK) \
+    (thread_in_use () ? rw_wrlock (LOCK) : 0)
+# define glthread_rwlock_unlock(LOCK) \
+    (thread_in_use () ? rw_unlock (LOCK) : 0)
+# define glthread_rwlock_destroy(LOCK) \
+    (thread_in_use () ? rwlock_destroy (LOCK) : 0)
+
+/* --------------------- gl_recursive_lock_t datatype --------------------- */
+
+/* Old Solaris threads did not have recursive locks.
+   We have to implement them ourselves.  */
+
+typedef struct
+        {
+          mutex_t mutex;
+          thread_t owner;
+          unsigned long depth;
+        }
+        gl_recursive_lock_t;
+# define gl_recursive_lock_define(STORAGECLASS, NAME) \
+    STORAGECLASS gl_recursive_lock_t NAME;
+# define gl_recursive_lock_define_initialized(STORAGECLASS, NAME) \
+    STORAGECLASS gl_recursive_lock_t NAME = gl_recursive_lock_initializer;
+# define gl_recursive_lock_initializer \
+    { DEFAULTMUTEX, (thread_t) 0, 0 }
+# define glthread_recursive_lock_init(LOCK) \
+    (thread_in_use () ? glthread_recursive_lock_init_multithreaded (LOCK) : 0)
+# define glthread_recursive_lock_lock(LOCK) \
+    (thread_in_use () ? glthread_recursive_lock_lock_multithreaded (LOCK) : 0)
+# define glthread_recursive_lock_unlock(LOCK) \
+    (thread_in_use () ? glthread_recursive_lock_unlock_multithreaded (LOCK) : 0)
+# define glthread_recursive_lock_destroy(LOCK) \
+    (thread_in_use () ? glthread_recursive_lock_destroy_multithreaded (LOCK) : 0)
+extern int glthread_recursive_lock_init_multithreaded (gl_recursive_lock_t *lock);
+extern int glthread_recursive_lock_lock_multithreaded (gl_recursive_lock_t *lock);
+extern int glthread_recursive_lock_unlock_multithreaded (gl_recursive_lock_t *lock);
+extern int glthread_recursive_lock_destroy_multithreaded (gl_recursive_lock_t *lock);
+
+/* -------------------------- gl_once_t datatype -------------------------- */
+
+typedef struct
+        {
+          volatile int inited;
+          mutex_t mutex;
+        }
+        gl_once_t;
+# define gl_once_define(STORAGECLASS, NAME) \
+    STORAGECLASS gl_once_t NAME = { 0, DEFAULTMUTEX };
+# define glthread_once(ONCE_CONTROL, INITFUNCTION) \
+    (thread_in_use ()                                                          \
+     ? glthread_once_multithreaded (ONCE_CONTROL, INITFUNCTION)                \
+     : (glthread_once_singlethreaded (ONCE_CONTROL) ? (INITFUNCTION (), 0) : 0))
+extern int glthread_once_multithreaded (gl_once_t *once_control, void (*initfunction) (void));
+extern int glthread_once_singlethreaded (gl_once_t *once_control);
+
+# ifdef __cplusplus
+}
+# endif
+
+#endif
+
+/* ========================================================================= */
+
+#if USE_WINDOWS_THREADS
+
+# define WIN32_LEAN_AND_MEAN  /* avoid including junk */
+# include <windows.h>
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+/* We can use CRITICAL_SECTION directly, rather than the native Windows Event,
+   Mutex, Semaphore types, because
+     - we need only to synchronize inside a single process (address space),
+       not inter-process locking,
+     - we don't need to support trylock operations.  (TryEnterCriticalSection
+       does not work on Windows 95/98/ME.  Packages that need trylock usually
+       define their own mutex type.)  */
+
+/* There is no way to statically initialize a CRITICAL_SECTION.  It needs
+   to be done lazily, once only.  For this we need spinlocks.  */
+
+typedef struct { volatile int done; volatile long started; } gl_spinlock_t;
+
+/* -------------------------- gl_lock_t datatype -------------------------- */
+
+typedef struct
+        {
+          gl_spinlock_t guard; /* protects the initialization */
+          CRITICAL_SECTION lock;
+        }
+        gl_lock_t;
+# define gl_lock_define(STORAGECLASS, NAME) \
+    STORAGECLASS gl_lock_t NAME;
+# define gl_lock_define_initialized(STORAGECLASS, NAME) \
+    STORAGECLASS gl_lock_t NAME = gl_lock_initializer;
+# define gl_lock_initializer \
+    { { 0, -1 } }
+# define glthread_lock_init(LOCK) \
+    (glthread_lock_init_func (LOCK), 0)
+# define glthread_lock_lock(LOCK) \
+    glthread_lock_lock_func (LOCK)
+# define glthread_lock_unlock(LOCK) \
+    glthread_lock_unlock_func (LOCK)
+# define glthread_lock_destroy(LOCK) \
+    glthread_lock_destroy_func (LOCK)
+extern void glthread_lock_init_func (gl_lock_t *lock);
+extern int glthread_lock_lock_func (gl_lock_t *lock);
+extern int glthread_lock_unlock_func (gl_lock_t *lock);
+extern int glthread_lock_destroy_func (gl_lock_t *lock);
+
+/* ------------------------- gl_rwlock_t datatype ------------------------- */
+
+/* It is impossible to implement read-write locks using plain locks, without
+   introducing an extra thread dedicated to managing read-write locks.
+   Therefore here we need to use the low-level Event type.  */
+
+typedef struct
+        {
+          HANDLE *array; /* array of waiting threads, each represented by an event */
+          unsigned int count; /* number of waiting threads */
+          unsigned int alloc; /* length of allocated array */
+          unsigned int offset; /* index of first waiting thread in array */
+        }
+        gl_carray_waitqueue_t;
+typedef struct
+        {
+          gl_spinlock_t guard; /* protects the initialization */
+          CRITICAL_SECTION lock; /* protects the remaining fields */
+          gl_carray_waitqueue_t waiting_readers; /* waiting readers */
+          gl_carray_waitqueue_t waiting_writers; /* waiting writers */
+          int runcount; /* number of readers running, or -1 when a writer runs */
+        }
+        gl_rwlock_t;
+# define gl_rwlock_define(STORAGECLASS, NAME) \
+    STORAGECLASS gl_rwlock_t NAME;
+# define gl_rwlock_define_initialized(STORAGECLASS, NAME) \
+    STORAGECLASS gl_rwlock_t NAME = gl_rwlock_initializer;
+# define gl_rwlock_initializer \
+    { { 0, -1 } }
+# define glthread_rwlock_init(LOCK) \
+    (glthread_rwlock_init_func (LOCK), 0)
+# define glthread_rwlock_rdlock(LOCK) \
+    glthread_rwlock_rdlock_func (LOCK)
+# define glthread_rwlock_wrlock(LOCK) \
+    glthread_rwlock_wrlock_func (LOCK)
+# define glthread_rwlock_unlock(LOCK) \
+    glthread_rwlock_unlock_func (LOCK)
+# define glthread_rwlock_destroy(LOCK) \
+    glthread_rwlock_destroy_func (LOCK)
+extern void glthread_rwlock_init_func (gl_rwlock_t *lock);
+extern int glthread_rwlock_rdlock_func (gl_rwlock_t *lock);
+extern int glthread_rwlock_wrlock_func (gl_rwlock_t *lock);
+extern int glthread_rwlock_unlock_func (gl_rwlock_t *lock);
+extern int glthread_rwlock_destroy_func (gl_rwlock_t *lock);
+
+/* --------------------- gl_recursive_lock_t datatype --------------------- */
+
+/* The native Windows documentation says that CRITICAL_SECTION already
+   implements a recursive lock.  But we need not rely on it: It's easy to
+   implement a recursive lock without this assumption.  */
+
+typedef struct
+        {
+          gl_spinlock_t guard; /* protects the initialization */
+          DWORD owner;
+          unsigned long depth;
+          CRITICAL_SECTION lock;
+        }
+        gl_recursive_lock_t;
+# define gl_recursive_lock_define(STORAGECLASS, NAME) \
+    STORAGECLASS gl_recursive_lock_t NAME;
+# define gl_recursive_lock_define_initialized(STORAGECLASS, NAME) \
+    STORAGECLASS gl_recursive_lock_t NAME = gl_recursive_lock_initializer;
+# define gl_recursive_lock_initializer \
+    { { 0, -1 }, 0, 0 }
+# define glthread_recursive_lock_init(LOCK) \
+    (glthread_recursive_lock_init_func (LOCK), 0)
+# define glthread_recursive_lock_lock(LOCK) \
+    glthread_recursive_lock_lock_func (LOCK)
+# define glthread_recursive_lock_unlock(LOCK) \
+    glthread_recursive_lock_unlock_func (LOCK)
+# define glthread_recursive_lock_destroy(LOCK) \
+    glthread_recursive_lock_destroy_func (LOCK)
+extern void glthread_recursive_lock_init_func (gl_recursive_lock_t *lock);
+extern int glthread_recursive_lock_lock_func (gl_recursive_lock_t *lock);
+extern int glthread_recursive_lock_unlock_func (gl_recursive_lock_t *lock);
+extern int glthread_recursive_lock_destroy_func (gl_recursive_lock_t *lock);
+
+/* -------------------------- gl_once_t datatype -------------------------- */
+
+typedef struct
+        {
+          volatile int inited;
+          volatile long started;
+          CRITICAL_SECTION lock;
+        }
+        gl_once_t;
+# define gl_once_define(STORAGECLASS, NAME) \
+    STORAGECLASS gl_once_t NAME = { -1, -1 };
+# define glthread_once(ONCE_CONTROL, INITFUNCTION) \
+    (glthread_once_func (ONCE_CONTROL, INITFUNCTION), 0)
+extern void glthread_once_func (gl_once_t *once_control, void (*initfunction) (void));
+
+# ifdef __cplusplus
+}
+# endif
+
+#endif
+
+/* ========================================================================= */
+
+#if !(USE_POSIX_THREADS || USE_PTH_THREADS || USE_SOLARIS_THREADS || USE_WINDOWS_THREADS)
+
+/* Provide dummy implementation if threads are not supported.  */
+
+/* -------------------------- gl_lock_t datatype -------------------------- */
+
+typedef int gl_lock_t;
+# define gl_lock_define(STORAGECLASS, NAME)
+# define gl_lock_define_initialized(STORAGECLASS, NAME)
+# define glthread_lock_init(NAME) 0
+# define glthread_lock_lock(NAME) 0
+# define glthread_lock_unlock(NAME) 0
+# define glthread_lock_destroy(NAME) 0
+
+/* ------------------------- gl_rwlock_t datatype ------------------------- */
+
+typedef int gl_rwlock_t;
+# define gl_rwlock_define(STORAGECLASS, NAME)
+# define gl_rwlock_define_initialized(STORAGECLASS, NAME)
+# define glthread_rwlock_init(NAME) 0
+# define glthread_rwlock_rdlock(NAME) 0
+# define glthread_rwlock_wrlock(NAME) 0
+# define glthread_rwlock_unlock(NAME) 0
+# define glthread_rwlock_destroy(NAME) 0
+
+/* --------------------- gl_recursive_lock_t datatype --------------------- */
+
+typedef int gl_recursive_lock_t;
+# define gl_recursive_lock_define(STORAGECLASS, NAME)
+# define gl_recursive_lock_define_initialized(STORAGECLASS, NAME)
+# define glthread_recursive_lock_init(NAME) 0
+# define glthread_recursive_lock_lock(NAME) 0
+# define glthread_recursive_lock_unlock(NAME) 0
+# define glthread_recursive_lock_destroy(NAME) 0
+
+/* -------------------------- gl_once_t datatype -------------------------- */
+
+typedef int gl_once_t;
+# define gl_once_define(STORAGECLASS, NAME) \
+    STORAGECLASS gl_once_t NAME = 0;
+# define glthread_once(ONCE_CONTROL, INITFUNCTION) \
+    (*(ONCE_CONTROL) == 0 ? (*(ONCE_CONTROL) = ~ 0, INITFUNCTION (), 0) : 0)
+
+#endif
+
+/* ========================================================================= */
+
+/* Macros with built-in error handling.  */
+
+/* -------------------------- gl_lock_t datatype -------------------------- */
+
+#define gl_lock_init(NAME) \
+   do                                  \
+     {                                 \
+       if (glthread_lock_init (&NAME)) \
+         abort ();                     \
+     }                                 \
+   while (0)
+#define gl_lock_lock(NAME) \
+   do                                  \
+     {                                 \
+       if (glthread_lock_lock (&NAME)) \
+         abort ();                     \
+     }                                 \
+   while (0)
+#define gl_lock_unlock(NAME) \
+   do                                    \
+     {                                   \
+       if (glthread_lock_unlock (&NAME)) \
+         abort ();                       \
+     }                                   \
+   while (0)
+#define gl_lock_destroy(NAME) \
+   do                                     \
+     {                                    \
+       if (glthread_lock_destroy (&NAME)) \
+         abort ();                        \
+     }                                    \
+   while (0)
+
+/* ------------------------- gl_rwlock_t datatype ------------------------- */
+
+#define gl_rwlock_init(NAME) \
+   do                                    \
+     {                                   \
+       if (glthread_rwlock_init (&NAME)) \
+         abort ();                       \
+     }                                   \
+   while (0)
+#define gl_rwlock_rdlock(NAME) \
+   do                                      \
+     {                                     \
+       if (glthread_rwlock_rdlock (&NAME)) \
+         abort ();                         \
+     }                                     \
+   while (0)
+#define gl_rwlock_wrlock(NAME) \
+   do                                      \
+     {                                     \
+       if (glthread_rwlock_wrlock (&NAME)) \
+         abort ();                         \
+     }                                     \
+   while (0)
+#define gl_rwlock_unlock(NAME) \
+   do                                      \
+     {                                     \
+       if (glthread_rwlock_unlock (&NAME)) \
+         abort ();                         \
+     }                                     \
+   while (0)
+#define gl_rwlock_destroy(NAME) \
+   do                                       \
+     {                                      \
+       if (glthread_rwlock_destroy (&NAME)) \
+         abort ();                          \
+     }                                      \
+   while (0)
+
+/* --------------------- gl_recursive_lock_t datatype --------------------- */
+
+#define gl_recursive_lock_init(NAME) \
+   do                                            \
+     {                                           \
+       if (glthread_recursive_lock_init (&NAME)) \
+         abort ();                               \
+     }                                           \
+   while (0)
+#define gl_recursive_lock_lock(NAME) \
+   do                                            \
+     {                                           \
+       if (glthread_recursive_lock_lock (&NAME)) \
+         abort ();                               \
+     }                                           \
+   while (0)
+#define gl_recursive_lock_unlock(NAME) \
+   do                                              \
+     {                                             \
+       if (glthread_recursive_lock_unlock (&NAME)) \
+         abort ();                                 \
+     }                                             \
+   while (0)
+#define gl_recursive_lock_destroy(NAME) \
+   do                                               \
+     {                                              \
+       if (glthread_recursive_lock_destroy (&NAME)) \
+         abort ();                                  \
+     }                                              \
+   while (0)
+
+/* -------------------------- gl_once_t datatype -------------------------- */
+
+#define gl_once(NAME, INITFUNCTION) \
+   do                                           \
+     {                                          \
+       if (glthread_once (&NAME, INITFUNCTION)) \
+         abort ();                              \
+     }                                          \
+   while (0)
+
+/* ========================================================================= */
+
+#endif /* _LOCK_H */
diff --git a/gl/glthread/threadlib.c b/gl/glthread/threadlib.c
new file mode 100644
index 0000000..2f5af26
--- /dev/null
+++ b/gl/glthread/threadlib.c
@@ -0,0 +1,73 @@
+/* Multithreading primitives.
+   Copyright (C) 2005-2017 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
+
+/* Written by Bruno Haible <bruno@clisp.org>, 2005.  */
+
+#include <config.h>
+
+/* ========================================================================= */
+
+#if USE_POSIX_THREADS
+
+/* Use the POSIX threads library.  */
+
+# include <pthread.h>
+# include <stdlib.h>
+
+# if PTHREAD_IN_USE_DETECTION_HARD
+
+/* The function to be executed by a dummy thread.  */
+static void *
+dummy_thread_func (void *arg)
+{
+  return arg;
+}
+
+int
+glthread_in_use (void)
+{
+  static int tested;
+  static int result; /* 1: linked with -lpthread, 0: only with libc */
+
+  if (!tested)
+    {
+      pthread_t thread;
+
+      if (pthread_create (&thread, NULL, dummy_thread_func, NULL) != 0)
+        /* Thread creation failed.  */
+        result = 0;
+      else
+        {
+          /* Thread creation works.  */
+          void *retval;
+          if (pthread_join (thread, &retval) != 0)
+            abort ();
+          result = 1;
+        }
+      tested = 1;
+    }
+  return result;
+}
+
+# endif
+
+#endif
+
+/* ========================================================================= */
+
+/* This declaration is solely to ensure that after preprocessing
+   this file is never empty.  */
+typedef int dummy;
diff --git a/gl/hard-locale.c b/gl/hard-locale.c
new file mode 100644
index 0000000..845282d
--- /dev/null
+++ b/gl/hard-locale.c
@@ -0,0 +1,72 @@
+/* hard-locale.c -- Determine whether a locale is hard.
+
+   Copyright (C) 1997-1999, 2002-2004, 2006-2007, 2009-2017 Free Software
+   Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+#include "hard-locale.h"
+
+#include <locale.h>
+#include <stdlib.h>
+#include <string.h>
+
+#ifdef __GLIBC__
+# define GLIBC_VERSION __GLIBC__
+#elif defined __UCLIBC__
+# define GLIBC_VERSION 2
+#else
+# define GLIBC_VERSION 0
+#endif
+
+/* Return true if the current CATEGORY locale is hard, i.e. if you
+   can't get away with assuming traditional C or POSIX behavior.  */
+bool
+hard_locale (int category)
+{
+  bool hard = true;
+  char const *p = setlocale (category, NULL);
+
+  if (p)
+    {
+      if (2 <= GLIBC_VERSION)
+        {
+          if (strcmp (p, "C") == 0 || strcmp (p, "POSIX") == 0)
+            hard = false;
+        }
+      else
+        {
+          char *locale = strdup (p);
+          if (locale)
+            {
+              /* Temporarily set the locale to the "C" and "POSIX" locales
+                 to find their names, so that we can determine whether one
+                 or the other is the caller's locale.  */
+              if (((p = setlocale (category, "C"))
+                   && strcmp (p, locale) == 0)
+                  || ((p = setlocale (category, "POSIX"))
+                      && strcmp (p, locale) == 0))
+                hard = false;
+
+              /* Restore the caller's locale.  */
+              setlocale (category, locale);
+              free (locale);
+            }
+        }
+    }
+
+  return hard;
+}
diff --git a/gl/hard-locale.h b/gl/hard-locale.h
new file mode 100644
index 0000000..b7cd5d1
--- /dev/null
+++ b/gl/hard-locale.h
@@ -0,0 +1,25 @@
+/* Determine whether a locale is hard.
+
+   Copyright (C) 1999, 2003-2004, 2009-2017 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#ifndef HARD_LOCALE_H_
+# define HARD_LOCALE_H_ 1
+
+# include <stdbool.h>
+
+bool hard_locale (int);
+
+#endif /* HARD_LOCALE_H_ */
diff --git a/gl/intprops.h b/gl/intprops.h
new file mode 100644
index 0000000..33a7ec5
--- /dev/null
+++ b/gl/intprops.h
@@ -0,0 +1,453 @@
+/* intprops.h -- properties of integer types
+
+   Copyright (C) 2001-2017 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify it
+   under the terms of the GNU Lesser General Public License as published
+   by the Free Software Foundation; either version 2.1 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* Written by Paul Eggert.  */
+
+#ifndef _GL_INTPROPS_H
+#define _GL_INTPROPS_H
+
+#include <limits.h>
+
+/* Return a value with the common real type of E and V and the value of V.  */
+#define _GL_INT_CONVERT(e, v) (0 * (e) + (v))
+
+/* Act like _GL_INT_CONVERT (E, -V) but work around a bug in IRIX 6.5 cc; see
+   <http://lists.gnu.org/archive/html/bug-gnulib/2011-05/msg00406.html>.  */
+#define _GL_INT_NEGATE_CONVERT(e, v) (0 * (e) - (v))
+
+/* The extra casts in the following macros work around compiler bugs,
+   e.g., in Cray C 5.0.3.0.  */
+
+/* True if the arithmetic type T is an integer type.  bool counts as
+   an integer.  */
+#define TYPE_IS_INTEGER(t) ((t) 1.5 == 1)
+
+/* True if the real type T is signed.  */
+#define TYPE_SIGNED(t) (! ((t) 0 < (t) -1))
+
+/* Return 1 if the real expression E, after promotion, has a
+   signed or floating type.  */
+#define EXPR_SIGNED(e) (_GL_INT_NEGATE_CONVERT (e, 1) < 0)
+
+
+/* Minimum and maximum values for integer types and expressions.  */
+
+/* The width in bits of the integer type or expression T.
+   Padding bits are not supported; this is checked at compile-time below.  */
+#define TYPE_WIDTH(t) (sizeof (t) * CHAR_BIT)
+
+/* The maximum and minimum values for the integer type T.  */
+#define TYPE_MINIMUM(t) ((t) ~ TYPE_MAXIMUM (t))
+#define TYPE_MAXIMUM(t)                                                 \
+  ((t) (! TYPE_SIGNED (t)                                               \
+        ? (t) -1                                                        \
+        : ((((t) 1 << (TYPE_WIDTH (t) - 2)) - 1) * 2 + 1)))
+
+/* The maximum and minimum values for the type of the expression E,
+   after integer promotion.  E should not have side effects.  */
+#define _GL_INT_MINIMUM(e)                                              \
+  (EXPR_SIGNED (e)                                                      \
+   ? ~ _GL_SIGNED_INT_MAXIMUM (e)                                       \
+   : _GL_INT_CONVERT (e, 0))
+#define _GL_INT_MAXIMUM(e)                                              \
+  (EXPR_SIGNED (e)                                                      \
+   ? _GL_SIGNED_INT_MAXIMUM (e)                                         \
+   : _GL_INT_NEGATE_CONVERT (e, 1))
+#define _GL_SIGNED_INT_MAXIMUM(e)                                       \
+  (((_GL_INT_CONVERT (e, 1) << (TYPE_WIDTH ((e) + 0) - 2)) - 1) * 2 + 1)
+
+/* Work around OpenVMS incompatibility with C99.  */
+#if !defined LLONG_MAX && defined __INT64_MAX
+# define LLONG_MAX __INT64_MAX
+# define LLONG_MIN __INT64_MIN
+#endif
+
+/* This include file assumes that signed types are two's complement without
+   padding bits; the above macros have undefined behavior otherwise.
+   If this is a problem for you, please let us know how to fix it for your host.
+   This assumption is tested by the intprops-tests module.  */
+
+/* Does the __typeof__ keyword work?  This could be done by
+   'configure', but for now it's easier to do it by hand.  */
+#if (2 <= __GNUC__ \
+     || (1210 <= __IBMC__ && defined __IBM__TYPEOF__) \
+     || (0x5110 <= __SUNPRO_C && !__STDC__))
+# define _GL_HAVE___TYPEOF__ 1
+#else
+# define _GL_HAVE___TYPEOF__ 0
+#endif
+
+/* Return 1 if the integer type or expression T might be signed.  Return 0
+   if it is definitely unsigned.  This macro does not evaluate its argument,
+   and expands to an integer constant expression.  */
+#if _GL_HAVE___TYPEOF__
+# define _GL_SIGNED_TYPE_OR_EXPR(t) TYPE_SIGNED (__typeof__ (t))
+#else
+# define _GL_SIGNED_TYPE_OR_EXPR(t) 1
+#endif
+
+/* Bound on length of the string representing an unsigned integer
+   value representable in B bits.  log10 (2.0) < 146/485.  The
+   smallest value of B where this bound is not tight is 2621.  */
+#define INT_BITS_STRLEN_BOUND(b) (((b) * 146 + 484) / 485)
+
+/* Bound on length of the string representing an integer type or expression T.
+   Subtract 1 for the sign bit if T is signed, and then add 1 more for
+   a minus sign if needed.
+
+   Because _GL_SIGNED_TYPE_OR_EXPR sometimes returns 0 when its argument is
+   signed, this macro may overestimate the true bound by one byte when
+   applied to unsigned types of size 2, 4, 16, ... bytes.  */
+#define INT_STRLEN_BOUND(t)                                     \
+  (INT_BITS_STRLEN_BOUND (TYPE_WIDTH (t) - _GL_SIGNED_TYPE_OR_EXPR (t)) \
+   + _GL_SIGNED_TYPE_OR_EXPR (t))
+
+/* Bound on buffer size needed to represent an integer type or expression T,
+   including the terminating null.  */
+#define INT_BUFSIZE_BOUND(t) (INT_STRLEN_BOUND (t) + 1)
+
+
+/* Range overflow checks.
+
+   The INT_<op>_RANGE_OVERFLOW macros return 1 if the corresponding C
+   operators might not yield numerically correct answers due to
+   arithmetic overflow.  They do not rely on undefined or
+   implementation-defined behavior.  Their implementations are simple
+   and straightforward, but they are a bit harder to use than the
+   INT_<op>_OVERFLOW macros described below.
+
+   Example usage:
+
+     long int i = ...;
+     long int j = ...;
+     if (INT_MULTIPLY_RANGE_OVERFLOW (i, j, LONG_MIN, LONG_MAX))
+       printf ("multiply would overflow");
+     else
+       printf ("product is %ld", i * j);
+
+   Restrictions on *_RANGE_OVERFLOW macros:
+
+   These macros do not check for all possible numerical problems or
+   undefined or unspecified behavior: they do not check for division
+   by zero, for bad shift counts, or for shifting negative numbers.
+
+   These macros may evaluate their arguments zero or multiple times,
+   so the arguments should not have side effects.  The arithmetic
+   arguments (including the MIN and MAX arguments) must be of the same
+   integer type after the usual arithmetic conversions, and the type
+   must have minimum value MIN and maximum MAX.  Unsigned types should
+   use a zero MIN of the proper type.
+
+   These macros are tuned for constant MIN and MAX.  For commutative
+   operations such as A + B, they are also tuned for constant B.  */
+
+/* Return 1 if A + B would overflow in [MIN,MAX] arithmetic.
+   See above for restrictions.  */
+#define INT_ADD_RANGE_OVERFLOW(a, b, min, max)          \
+  ((b) < 0                                              \
+   ? (a) < (min) - (b)                                  \
+   : (max) - (b) < (a))
+
+/* Return 1 if A - B would overflow in [MIN,MAX] arithmetic.
+   See above for restrictions.  */
+#define INT_SUBTRACT_RANGE_OVERFLOW(a, b, min, max)     \
+  ((b) < 0                                              \
+   ? (max) + (b) < (a)                                  \
+   : (a) < (min) + (b))
+
+/* Return 1 if - A would overflow in [MIN,MAX] arithmetic.
+   See above for restrictions.  */
+#define INT_NEGATE_RANGE_OVERFLOW(a, min, max)          \
+  ((min) < 0                                            \
+   ? (a) < - (max)                                      \
+   : 0 < (a))
+
+/* Return 1 if A * B would overflow in [MIN,MAX] arithmetic.
+   See above for restrictions.  Avoid && and || as they tickle
+   bugs in Sun C 5.11 2010/08/13 and other compilers; see
+   <http://lists.gnu.org/archive/html/bug-gnulib/2011-05/msg00401.html>.  */
+#define INT_MULTIPLY_RANGE_OVERFLOW(a, b, min, max)     \
+  ((b) < 0                                              \
+   ? ((a) < 0                                           \
+      ? (a) < (max) / (b)                               \
+      : (b) == -1                                       \
+      ? 0                                               \
+      : (min) / (b) < (a))                              \
+   : (b) == 0                                           \
+   ? 0                                                  \
+   : ((a) < 0                                           \
+      ? (a) < (min) / (b)                               \
+      : (max) / (b) < (a)))
+
+/* Return 1 if A / B would overflow in [MIN,MAX] arithmetic.
+   See above for restrictions.  Do not check for division by zero.  */
+#define INT_DIVIDE_RANGE_OVERFLOW(a, b, min, max)       \
+  ((min) < 0 && (b) == -1 && (a) < - (max))
+
+/* Return 1 if A % B would overflow in [MIN,MAX] arithmetic.
+   See above for restrictions.  Do not check for division by zero.
+   Mathematically, % should never overflow, but on x86-like hosts
+   INT_MIN % -1 traps, and the C standard permits this, so treat this
+   as an overflow too.  */
+#define INT_REMAINDER_RANGE_OVERFLOW(a, b, min, max)    \
+  INT_DIVIDE_RANGE_OVERFLOW (a, b, min, max)
+
+/* Return 1 if A << B would overflow in [MIN,MAX] arithmetic.
+   See above for restrictions.  Here, MIN and MAX are for A only, and B need
+   not be of the same type as the other arguments.  The C standard says that
+   behavior is undefined for shifts unless 0 <= B < wordwidth, and that when
+   A is negative then A << B has undefined behavior and A >> B has
+   implementation-defined behavior, but do not check these other
+   restrictions.  */
+#define INT_LEFT_SHIFT_RANGE_OVERFLOW(a, b, min, max)   \
+  ((a) < 0                                              \
+   ? (a) < (min) >> (b)                                 \
+   : (max) >> (b) < (a))
+
+/* True if __builtin_add_overflow (A, B, P) works when P is non-null.  */
+#if 5 <= __GNUC__ && !defined __ICC
+# define _GL_HAS_BUILTIN_OVERFLOW 1
+#else
+# define _GL_HAS_BUILTIN_OVERFLOW 0
+#endif
+
+/* True if __builtin_add_overflow_p (A, B, C) works.  */
+#define _GL_HAS_BUILTIN_OVERFLOW_P (7 <= __GNUC__)
+
+/* The _GL*_OVERFLOW macros have the same restrictions as the
+   *_RANGE_OVERFLOW macros, except that they do not assume that operands
+   (e.g., A and B) have the same type as MIN and MAX.  Instead, they assume
+   that the result (e.g., A + B) has that type.  */
+#if _GL_HAS_BUILTIN_OVERFLOW_P
+# define _GL_ADD_OVERFLOW(a, b, min, max)                               \
+   __builtin_add_overflow_p (a, b, (__typeof__ ((a) + (b))) 0)
+# define _GL_SUBTRACT_OVERFLOW(a, b, min, max)                          \
+   __builtin_sub_overflow_p (a, b, (__typeof__ ((a) - (b))) 0)
+# define _GL_MULTIPLY_OVERFLOW(a, b, min, max)                          \
+   __builtin_mul_overflow_p (a, b, (__typeof__ ((a) * (b))) 0)
+#else
+# define _GL_ADD_OVERFLOW(a, b, min, max)                                \
+   ((min) < 0 ? INT_ADD_RANGE_OVERFLOW (a, b, min, max)                  \
+    : (a) < 0 ? (b) <= (a) + (b)                                         \
+    : (b) < 0 ? (a) <= (a) + (b)                                         \
+    : (a) + (b) < (b))
+# define _GL_SUBTRACT_OVERFLOW(a, b, min, max)                           \
+   ((min) < 0 ? INT_SUBTRACT_RANGE_OVERFLOW (a, b, min, max)             \
+    : (a) < 0 ? 1                                                        \
+    : (b) < 0 ? (a) - (b) <= (a)                                         \
+    : (a) < (b))
+# define _GL_MULTIPLY_OVERFLOW(a, b, min, max)                           \
+   (((min) == 0 && (((a) < 0 && 0 < (b)) || ((b) < 0 && 0 < (a))))       \
+    || INT_MULTIPLY_RANGE_OVERFLOW (a, b, min, max))
+#endif
+#define _GL_DIVIDE_OVERFLOW(a, b, min, max)                             \
+  ((min) < 0 ? (b) == _GL_INT_NEGATE_CONVERT (min, 1) && (a) < - (max)  \
+   : (a) < 0 ? (b) <= (a) + (b) - 1                                     \
+   : (b) < 0 && (a) + (b) <= (a))
+#define _GL_REMAINDER_OVERFLOW(a, b, min, max)                          \
+  ((min) < 0 ? (b) == _GL_INT_NEGATE_CONVERT (min, 1) && (a) < - (max)  \
+   : (a) < 0 ? (a) % (b) != ((max) - (b) + 1) % (b)                     \
+   : (b) < 0 && ! _GL_UNSIGNED_NEG_MULTIPLE (a, b, max))
+
+/* Return a nonzero value if A is a mathematical multiple of B, where
+   A is unsigned, B is negative, and MAX is the maximum value of A's
+   type.  A's type must be the same as (A % B)'s type.  Normally (A %
+   -B == 0) suffices, but things get tricky if -B would overflow.  */
+#define _GL_UNSIGNED_NEG_MULTIPLE(a, b, max)                            \
+  (((b) < -_GL_SIGNED_INT_MAXIMUM (b)                                   \
+    ? (_GL_SIGNED_INT_MAXIMUM (b) == (max)                              \
+       ? (a)                                                            \
+       : (a) % (_GL_INT_CONVERT (a, _GL_SIGNED_INT_MAXIMUM (b)) + 1))   \
+    : (a) % - (b))                                                      \
+   == 0)
+
+/* Check for integer overflow, and report low order bits of answer.
+
+   The INT_<op>_OVERFLOW macros return 1 if the corresponding C operators
+   might not yield numerically correct answers due to arithmetic overflow.
+   The INT_<op>_WRAPV macros also store the low-order bits of the answer.
+   These macros work correctly on all known practical hosts, and do not rely
+   on undefined behavior due to signed arithmetic overflow.
+
+   Example usage, assuming A and B are long int:
+
+     if (INT_MULTIPLY_OVERFLOW (a, b))
+       printf ("result would overflow\n");
+     else
+       printf ("result is %ld (no overflow)\n", a * b);
+
+   Example usage with WRAPV flavor:
+
+     long int result;
+     bool overflow = INT_MULTIPLY_WRAPV (a, b, &result);
+     printf ("result is %ld (%s)\n", result,
+             overflow ? "after overflow" : "no overflow");
+
+   Restrictions on these macros:
+
+   These macros do not check for all possible numerical problems or
+   undefined or unspecified behavior: they do not check for division
+   by zero, for bad shift counts, or for shifting negative numbers.
+
+   These macros may evaluate their arguments zero or multiple times, so the
+   arguments should not have side effects.
+
+   The WRAPV macros are not constant expressions.  They support only
+   +, binary -, and *.  The result type must be signed.
+
+   These macros are tuned for their last argument being a constant.
+
+   Return 1 if the integer expressions A * B, A - B, -A, A * B, A / B,
+   A % B, and A << B would overflow, respectively.  */
+
+#define INT_ADD_OVERFLOW(a, b) \
+  _GL_BINARY_OP_OVERFLOW (a, b, _GL_ADD_OVERFLOW)
+#define INT_SUBTRACT_OVERFLOW(a, b) \
+  _GL_BINARY_OP_OVERFLOW (a, b, _GL_SUBTRACT_OVERFLOW)
+#if _GL_HAS_BUILTIN_OVERFLOW_P
+# define INT_NEGATE_OVERFLOW(a) INT_SUBTRACT_OVERFLOW (0, a)
+#else
+# define INT_NEGATE_OVERFLOW(a) \
+   INT_NEGATE_RANGE_OVERFLOW (a, _GL_INT_MINIMUM (a), _GL_INT_MAXIMUM (a))
+#endif
+#define INT_MULTIPLY_OVERFLOW(a, b) \
+  _GL_BINARY_OP_OVERFLOW (a, b, _GL_MULTIPLY_OVERFLOW)
+#define INT_DIVIDE_OVERFLOW(a, b) \
+  _GL_BINARY_OP_OVERFLOW (a, b, _GL_DIVIDE_OVERFLOW)
+#define INT_REMAINDER_OVERFLOW(a, b) \
+  _GL_BINARY_OP_OVERFLOW (a, b, _GL_REMAINDER_OVERFLOW)
+#define INT_LEFT_SHIFT_OVERFLOW(a, b) \
+  INT_LEFT_SHIFT_RANGE_OVERFLOW (a, b, \
+                                 _GL_INT_MINIMUM (a), _GL_INT_MAXIMUM (a))
+
+/* Return 1 if the expression A <op> B would overflow,
+   where OP_RESULT_OVERFLOW (A, B, MIN, MAX) does the actual test,
+   assuming MIN and MAX are the minimum and maximum for the result type.
+   Arguments should be free of side effects.  */
+#define _GL_BINARY_OP_OVERFLOW(a, b, op_result_overflow)        \
+  op_result_overflow (a, b,                                     \
+                      _GL_INT_MINIMUM (0 * (b) + (a)),          \
+                      _GL_INT_MAXIMUM (0 * (b) + (a)))
+
+/* Store the low-order bits of A + B, A - B, A * B, respectively, into *R.
+   Return 1 if the result overflows.  See above for restrictions.  */
+#define INT_ADD_WRAPV(a, b, r) \
+  _GL_INT_OP_WRAPV (a, b, r, +, __builtin_add_overflow, INT_ADD_OVERFLOW)
+#define INT_SUBTRACT_WRAPV(a, b, r) \
+  _GL_INT_OP_WRAPV (a, b, r, -, __builtin_sub_overflow, INT_SUBTRACT_OVERFLOW)
+#define INT_MULTIPLY_WRAPV(a, b, r) \
+  _GL_INT_OP_WRAPV (a, b, r, *, __builtin_mul_overflow, INT_MULTIPLY_OVERFLOW)
+
+/* Nonzero if this compiler has GCC bug 68193 or Clang bug 25390.  See:
+   https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68193
+   https://llvm.org/bugs/show_bug.cgi?id=25390
+   For now, assume all versions of GCC-like compilers generate bogus
+   warnings for _Generic.  This matters only for older compilers that
+   lack __builtin_add_overflow.  */
+#if __GNUC__
+# define _GL__GENERIC_BOGUS 1
+#else
+# define _GL__GENERIC_BOGUS 0
+#endif
+
+/* Store the low-order bits of A <op> B into *R, where OP specifies
+   the operation.  BUILTIN is the builtin operation, and OVERFLOW the
+   overflow predicate.  Return 1 if the result overflows.  See above
+   for restrictions.  */
+#if _GL_HAS_BUILTIN_OVERFLOW
+# define _GL_INT_OP_WRAPV(a, b, r, op, builtin, overflow) builtin (a, b, r)
+#elif 201112 <= __STDC_VERSION__ && !_GL__GENERIC_BOGUS
+# define _GL_INT_OP_WRAPV(a, b, r, op, builtin, overflow) \
+   (_Generic \
+    (*(r), \
+     signed char: \
+       _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \
+                        signed char, SCHAR_MIN, SCHAR_MAX), \
+     short int: \
+       _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \
+                        short int, SHRT_MIN, SHRT_MAX), \
+     int: \
+       _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \
+                        int, INT_MIN, INT_MAX), \
+     long int: \
+       _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \
+                        long int, LONG_MIN, LONG_MAX), \
+     long long int: \
+       _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long long int, \
+                        long long int, LLONG_MIN, LLONG_MAX)))
+#else
+# define _GL_INT_OP_WRAPV(a, b, r, op, builtin, overflow) \
+   (sizeof *(r) == sizeof (signed char) \
+    ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \
+                       signed char, SCHAR_MIN, SCHAR_MAX) \
+    : sizeof *(r) == sizeof (short int) \
+    ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \
+                       short int, SHRT_MIN, SHRT_MAX) \
+    : sizeof *(r) == sizeof (int) \
+    ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \
+                       int, INT_MIN, INT_MAX) \
+    : _GL_INT_OP_WRAPV_LONGISH(a, b, r, op, overflow))
+# ifdef LLONG_MAX
+#  define _GL_INT_OP_WRAPV_LONGISH(a, b, r, op, overflow) \
+    (sizeof *(r) == sizeof (long int) \
+     ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \
+                        long int, LONG_MIN, LONG_MAX) \
+     : _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long long int, \
+                        long long int, LLONG_MIN, LLONG_MAX))
+# else
+#  define _GL_INT_OP_WRAPV_LONGISH(a, b, r, op, overflow) \
+    _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \
+                     long int, LONG_MIN, LONG_MAX)
+# endif
+#endif
+
+/* Store the low-order bits of A <op> B into *R, where the operation
+   is given by OP.  Use the unsigned type UT for calculation to avoid
+   overflow problems.  *R's type is T, with extrema TMIN and TMAX.
+   T must be a signed integer type.  Return 1 if the result overflows.  */
+#define _GL_INT_OP_CALC(a, b, r, op, overflow, ut, t, tmin, tmax) \
+  (sizeof ((a) op (b)) < sizeof (t) \
+   ? _GL_INT_OP_CALC1 ((t) (a), (t) (b), r, op, overflow, ut, t, tmin, tmax) \
+   : _GL_INT_OP_CALC1 (a, b, r, op, overflow, ut, t, tmin, tmax))
+#define _GL_INT_OP_CALC1(a, b, r, op, overflow, ut, t, tmin, tmax) \
+  ((overflow (a, b) \
+    || (EXPR_SIGNED ((a) op (b)) && ((a) op (b)) < (tmin)) \
+    || (tmax) < ((a) op (b))) \
+   ? (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a, b, op, ut, t), 1) \
+   : (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a, b, op, ut, t), 0))
+
+/* Return the low-order bits of A <op> B, where the operation is given
+   by OP.  Use the unsigned type UT for calculation to avoid undefined
+   behavior on signed integer overflow, and convert the result to type T.
+   UT is at least as wide as T and is no narrower than unsigned int,
+   T is two's complement, and there is no padding or trap representations.
+   Assume that converting UT to T yields the low-order bits, as is
+   done in all known two's-complement C compilers.  E.g., see:
+   https://gcc.gnu.org/onlinedocs/gcc/Integers-implementation.html
+
+   According to the C standard, converting UT to T yields an
+   implementation-defined result or signal for values outside T's
+   range.  However, code that works around this theoretical problem
+   runs afoul of a compiler bug in Oracle Studio 12.3 x86.  See:
+   http://lists.gnu.org/archive/html/bug-gnulib/2017-04/msg00049.html
+   As the compiler bug is real, don't try to work around the
+   theoretical problem.  */
+
+#define _GL_INT_OP_WRAPV_VIA_UNSIGNED(a, b, op, ut, t) \
+  ((t) ((ut) (a) op (ut) (b)))
+
+#endif /* _GL_INTPROPS_H */
diff --git a/gl/langinfo.in.h b/gl/langinfo.in.h
new file mode 100644
index 0000000..689e82c
--- /dev/null
+++ b/gl/langinfo.in.h
@@ -0,0 +1,194 @@
+/* Substitute for and wrapper around <langinfo.h>.
+   Copyright (C) 2009-2017 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
+
+/*
+ * POSIX <langinfo.h> for platforms that lack it or have an incomplete one.
+ * <http://www.opengroup.org/onlinepubs/9699919799/basedefs/langinfo.h.html>
+ */
+
+#ifndef _@GUARD_PREFIX@_LANGINFO_H
+
+#if __GNUC__ >= 3
+@PRAGMA_SYSTEM_HEADER@
+#endif
+@PRAGMA_COLUMNS@
+
+/* The include_next requires a split double-inclusion guard.  */
+#if @HAVE_LANGINFO_H@
+# @INCLUDE_NEXT@ @NEXT_LANGINFO_H@
+#endif
+
+#ifndef _@GUARD_PREFIX@_LANGINFO_H
+#define _@GUARD_PREFIX@_LANGINFO_H
+
+
+#if !@HAVE_LANGINFO_H@
+
+/* A platform that lacks <langinfo.h>.  */
+
+/* Assume that it also lacks <nl_types.h> and the nl_item type.  */
+# if !GNULIB_defined_nl_item
+typedef int nl_item;
+#  define GNULIB_defined_nl_item 1
+# endif
+
+/* nl_langinfo items of the LC_CTYPE category */
+# define CODESET     10000
+/* nl_langinfo items of the LC_NUMERIC category */
+# define RADIXCHAR   10001
+# define DECIMAL_POINT RADIXCHAR
+# define THOUSEP     10002
+# define THOUSANDS_SEP THOUSEP
+# define GROUPING    10114
+/* nl_langinfo items of the LC_TIME category */
+# define D_T_FMT     10003
+# define D_FMT       10004
+# define T_FMT       10005
+# define T_FMT_AMPM  10006
+# define AM_STR      10007
+# define PM_STR      10008
+# define DAY_1       10009
+# define DAY_2       (DAY_1 + 1)
+# define DAY_3       (DAY_1 + 2)
+# define DAY_4       (DAY_1 + 3)
+# define DAY_5       (DAY_1 + 4)
+# define DAY_6       (DAY_1 + 5)
+# define DAY_7       (DAY_1 + 6)
+# define ABDAY_1     10016
+# define ABDAY_2     (ABDAY_1 + 1)
+# define ABDAY_3     (ABDAY_1 + 2)
+# define ABDAY_4     (ABDAY_1 + 3)
+# define ABDAY_5     (ABDAY_1 + 4)
+# define ABDAY_6     (ABDAY_1 + 5)
+# define ABDAY_7     (ABDAY_1 + 6)
+# define MON_1       10023
+# define MON_2       (MON_1 + 1)
+# define MON_3       (MON_1 + 2)
+# define MON_4       (MON_1 + 3)
+# define MON_5       (MON_1 + 4)
+# define MON_6       (MON_1 + 5)
+# define MON_7       (MON_1 + 6)
+# define MON_8       (MON_1 + 7)
+# define MON_9       (MON_1 + 8)
+# define MON_10      (MON_1 + 9)
+# define MON_11      (MON_1 + 10)
+# define MON_12      (MON_1 + 11)
+# define ABMON_1     10035
+# define ABMON_2     (ABMON_1 + 1)
+# define ABMON_3     (ABMON_1 + 2)
+# define ABMON_4     (ABMON_1 + 3)
+# define ABMON_5     (ABMON_1 + 4)
+# define ABMON_6     (ABMON_1 + 5)
+# define ABMON_7     (ABMON_1 + 6)
+# define ABMON_8     (ABMON_1 + 7)
+# define ABMON_9     (ABMON_1 + 8)
+# define ABMON_10    (ABMON_1 + 9)
+# define ABMON_11    (ABMON_1 + 10)
+# define ABMON_12    (ABMON_1 + 11)
+# define ERA         10047
+# define ERA_D_FMT   10048
+# define ERA_D_T_FMT 10049
+# define ERA_T_FMT   10050
+# define ALT_DIGITS  10051
+/* nl_langinfo items of the LC_MONETARY category */
+# define CRNCYSTR    10052
+# define CURRENCY_SYMBOL   CRNCYSTR
+# define INT_CURR_SYMBOL   10100
+# define MON_DECIMAL_POINT 10101
+# define MON_THOUSANDS_SEP 10102
+# define MON_GROUPING      10103
+# define POSITIVE_SIGN     10104
+# define NEGATIVE_SIGN     10105
+# define FRAC_DIGITS       10106
+# define INT_FRAC_DIGITS   10107
+# define P_CS_PRECEDES     10108
+# define N_CS_PRECEDES     10109
+# define P_SEP_BY_SPACE    10110
+# define N_SEP_BY_SPACE    10111
+# define P_SIGN_POSN       10112
+# define N_SIGN_POSN       10113
+/* nl_langinfo items of the LC_MESSAGES category */
+# define YESEXPR     10053
+# define NOEXPR      10054
+
+#else
+
+/* A platform that has <langinfo.h>.  */
+
+# if !@HAVE_LANGINFO_CODESET@
+#  define CODESET     10000
+#  define GNULIB_defined_CODESET 1
+# endif
+
+# if !@HAVE_LANGINFO_T_FMT_AMPM@
+#  define T_FMT_AMPM  10006
+#  define GNULIB_defined_T_FMT_AMPM 1
+# endif
+
+# if !@HAVE_LANGINFO_ERA@
+#  define ERA         10047
+#  define ERA_D_FMT   10048
+#  define ERA_D_T_FMT 10049
+#  define ERA_T_FMT   10050
+#  define ALT_DIGITS  10051
+#  define GNULIB_defined_ERA 1
+# endif
+
+# if !@HAVE_LANGINFO_YESEXPR@
+#  define YESEXPR     10053
+#  define NOEXPR      10054
+#  define GNULIB_defined_YESEXPR 1
+# endif
+
+#endif
+
+/* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
+
+/* The definition of _GL_WARN_ON_USE is copied here.  */
+
+/* Declare overridden functions.  */
+
+
+/* Return a piece of locale dependent information.
+   Note: The difference between nl_langinfo (CODESET) and locale_charset ()
+   is that the latter normalizes the encoding names to GNU conventions.  */
+
+#if @GNULIB_NL_LANGINFO@
+# if @REPLACE_NL_LANGINFO@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef nl_langinfo
+#   define nl_langinfo rpl_nl_langinfo
+#  endif
+_GL_FUNCDECL_RPL (nl_langinfo, char *, (nl_item item));
+_GL_CXXALIAS_RPL (nl_langinfo, char *, (nl_item item));
+# else
+#  if !@HAVE_NL_LANGINFO@
+_GL_FUNCDECL_SYS (nl_langinfo, char *, (nl_item item));
+#  endif
+_GL_CXXALIAS_SYS (nl_langinfo, char *, (nl_item item));
+# endif
+_GL_CXXALIASWARN (nl_langinfo);
+#elif defined GNULIB_POSIXCHECK
+# undef nl_langinfo
+# if HAVE_RAW_DECL_NL_LANGINFO
+_GL_WARN_ON_USE (nl_langinfo, "nl_langinfo is not portable - "
+                 "use gnulib module nl_langinfo for portability");
+# endif
+#endif
+
+
+#endif /* _@GUARD_PREFIX@_LANGINFO_H */
+#endif /* _@GUARD_PREFIX@_LANGINFO_H */
diff --git a/gl/limits.in.h b/gl/limits.in.h
new file mode 100644
index 0000000..1846704
--- /dev/null
+++ b/gl/limits.in.h
@@ -0,0 +1,74 @@
+/* A GNU-like <limits.h>.
+
+   Copyright 2016-2017 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public License
+   as published by the Free Software Foundation; either version 2, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
+
+#ifndef _@GUARD_PREFIX@_LIMITS_H
+
+#if __GNUC__ >= 3
+@PRAGMA_SYSTEM_HEADER@
+#endif
+@PRAGMA_COLUMNS@
+
+/* The include_next requires a split double-inclusion guard.  */
+#@INCLUDE_NEXT@ @NEXT_LIMITS_H@
+
+#ifndef _@GUARD_PREFIX@_LIMITS_H
+#define _@GUARD_PREFIX@_LIMITS_H
+
+/* For HP-UX 11.31.  */
+#if defined LONG_LONG_MIN && !defined LLONG_MIN
+# define LLONG_MIN LONG_LONG_MIN
+#endif
+#if defined LONG_LONG_MAX && !defined LLONG_MAX
+# define LLONG_MAX LONG_LONG_MAX
+#endif
+#if defined ULONG_LONG_MAX && !defined ULLONG_MAX
+# define ULLONG_MAX ULONG_LONG_MAX
+#endif
+
+/* The number of usable bits in an unsigned or signed integer type
+   with minimum value MIN and maximum value MAX, as an int expression
+   suitable in #if.  Cover all known practical hosts.  This
+   implementation exploits the fact that MAX is 1 less than a power of
+   2, and merely counts the number of 1 bits in MAX; "COBn" means
+   "count the number of 1 bits in the low-order n bits").  */
+#define _GL_INTEGER_WIDTH(min, max) (((min) < 0) + _GL_COB128 (max))
+#define _GL_COB128(n) (_GL_COB64 ((n) >> 31 >> 31 >> 2) + _GL_COB64 (n))
+#define _GL_COB64(n) (_GL_COB32 ((n) >> 31 >> 1) + _GL_COB32 (n))
+#define _GL_COB32(n) (_GL_COB16 ((n) >> 16) + _GL_COB16 (n))
+#define _GL_COB16(n) (_GL_COB8 ((n) >> 8) + _GL_COB8 (n))
+#define _GL_COB8(n) (_GL_COB4 ((n) >> 4) + _GL_COB4 (n))
+#define _GL_COB4(n) (!!((n) & 8) + !!((n) & 4) + !!((n) & 2) + !!((n) & 1))
+
+/* Macros specified by ISO/IEC TS 18661-1:2014.  */
+
+#if (! defined ULLONG_WIDTH                                             \
+     && (defined _GNU_SOURCE || defined __STDC_WANT_IEC_60559_BFP_EXT__))
+# define CHAR_WIDTH _GL_INTEGER_WIDTH (CHAR_MIN, CHAR_MAX)
+# define SCHAR_WIDTH _GL_INTEGER_WIDTH (SCHAR_MIN, SCHAR_MAX)
+# define UCHAR_WIDTH _GL_INTEGER_WIDTH (0, UCHAR_MAX)
+# define SHRT_WIDTH _GL_INTEGER_WIDTH (SHRT_MIN, SHRT_MAX)
+# define USHRT_WIDTH _GL_INTEGER_WIDTH (0, USHRT_MAX)
+# define INT_WIDTH _GL_INTEGER_WIDTH (INT_MIN, INT_MAX)
+# define UINT_WIDTH _GL_INTEGER_WIDTH (0, UINT_MAX)
+# define LONG_WIDTH _GL_INTEGER_WIDTH (LONG_MIN, LONG_MAX)
+# define ULONG_WIDTH _GL_INTEGER_WIDTH (0, ULONG_MAX)
+# define LLONG_WIDTH _GL_INTEGER_WIDTH (LLONG_MIN, LLONG_MAX)
+# define ULLONG_WIDTH _GL_INTEGER_WIDTH (0, ULLONG_MAX)
+#endif /* !ULLONG_WIDTH && (_GNU_SOURCE || __STDC_WANT_IEC_60559_BFP_EXT__) */
+
+#endif /* _@GUARD_PREFIX@_LIMITS_H */
+#endif /* _@GUARD_PREFIX@_LIMITS_H */
diff --git a/gl/localcharset.c b/gl/localcharset.c
new file mode 100644
index 0000000..376d889
--- /dev/null
+++ b/gl/localcharset.c
@@ -0,0 +1,617 @@
+/* Determine a canonical name for the current locale's character encoding.
+
+   Copyright (C) 2000-2006, 2008-2017 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License along
+   with this program; if not, see <http://www.gnu.org/licenses/>.  */
+
+/* Written by Bruno Haible <bruno@clisp.org>.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include "localcharset.h"
+
+#include <fcntl.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+#if defined __APPLE__ && defined __MACH__ && HAVE_LANGINFO_CODESET
+# define DARWIN7 /* Darwin 7 or newer, i.e. Mac OS X 10.3 or newer */
+#endif
+
+#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
+# define WINDOWS_NATIVE
+# include <locale.h>
+#endif
+
+#if defined __EMX__
+/* Assume EMX program runs on OS/2, even if compiled under DOS.  */
+# ifndef OS2
+#  define OS2
+# endif
+#endif
+
+#if !defined WINDOWS_NATIVE
+# include <unistd.h>
+# if HAVE_LANGINFO_CODESET
+#  include <langinfo.h>
+# else
+#  if 0 /* see comment below */
+#   include <locale.h>
+#  endif
+# endif
+# ifdef __CYGWIN__
+#  define WIN32_LEAN_AND_MEAN
+#  include <windows.h>
+# endif
+#elif defined WINDOWS_NATIVE
+# define WIN32_LEAN_AND_MEAN
+# include <windows.h>
+#endif
+#if defined OS2
+# define INCL_DOS
+# include <os2.h>
+#endif
+
+/* For MB_CUR_MAX_L */
+#if defined DARWIN7
+# include <xlocale.h>
+#endif
+
+#if ENABLE_RELOCATABLE
+# include "relocatable.h"
+#else
+# define relocate(pathname) (pathname)
+# define relocate2(pathname,allocatedp) (*(allocatedp) = NULL, (pathname))
+#endif
+
+/* Get LIBDIR.  */
+#ifndef LIBDIR
+# include "configmake.h"
+#endif
+
+/* Define O_NOFOLLOW to 0 on platforms where it does not exist.  */
+#ifndef O_NOFOLLOW
+# define O_NOFOLLOW 0
+#endif
+
+#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
+  /* Native Windows, Cygwin, OS/2, DOS */
+# define ISSLASH(C) ((C) == '/' || (C) == '\\')
+#endif
+
+#ifndef DIRECTORY_SEPARATOR
+# define DIRECTORY_SEPARATOR '/'
+#endif
+
+#ifndef ISSLASH
+# define ISSLASH(C) ((C) == DIRECTORY_SEPARATOR)
+#endif
+
+#if HAVE_DECL_GETC_UNLOCKED
+# undef getc
+# define getc getc_unlocked
+#endif
+
+/* The following static variable is declared 'volatile' to avoid a
+   possible multithread problem in the function get_charset_aliases. If we
+   are running in a threaded environment, and if two threads initialize
+   'charset_aliases' simultaneously, both will produce the same value,
+   and everything will be ok if the two assignments to 'charset_aliases'
+   are atomic. But I don't know what will happen if the two assignments mix.  */
+#if __STDC__ != 1
+# define volatile /* empty */
+#endif
+/* Pointer to the contents of the charset.alias file, if it has already been
+   read, else NULL.  Its format is:
+   ALIAS_1 '\0' CANONICAL_1 '\0' ... ALIAS_n '\0' CANONICAL_n '\0' '\0'  */
+static const char * volatile charset_aliases;
+
+/* Return a pointer to the contents of the charset.alias file.  */
+static const char *
+get_charset_aliases (void)
+{
+  const char *cp;
+
+  cp = charset_aliases;
+  if (cp == NULL)
+    {
+#if !(defined DARWIN7 || defined VMS || defined WINDOWS_NATIVE || defined __CYGWIN__ || defined OS2)
+      char *malloc_dir = NULL;
+      const char *dir;
+      const char *base = "charset.alias";
+      char *file_name;
+
+      /* Make it possible to override the charset.alias location.  This is
+         necessary for running the testsuite before "make install".  */
+      dir = getenv ("CHARSETALIASDIR");
+      if (dir == NULL || dir[0] == '\0')
+        dir = relocate2 (LIBDIR, &malloc_dir);
+
+      /* Concatenate dir and base into freshly allocated file_name.  */
+      {
+        size_t dir_len = strlen (dir);
+        size_t base_len = strlen (base);
+        int add_slash = (dir_len > 0 && !ISSLASH (dir[dir_len - 1]));
+        file_name = (char *) malloc (dir_len + add_slash + base_len + 1);
+        if (file_name != NULL)
+          {
+            memcpy (file_name, dir, dir_len);
+            if (add_slash)
+              file_name[dir_len] = DIRECTORY_SEPARATOR;
+            memcpy (file_name + dir_len + add_slash, base, base_len + 1);
+          }
+      }
+
+      free (malloc_dir);
+
+      if (file_name == NULL)
+        /* Out of memory.  Treat the file as empty.  */
+        cp = "";
+      else
+        {
+          int fd;
+
+          /* Open the file.  Reject symbolic links on platforms that support
+             O_NOFOLLOW.  This is a security feature.  Without it, an attacker
+             could retrieve parts of the contents (namely, the tail of the
+             first line that starts with "* ") of an arbitrary file by placing
+             a symbolic link to that file under the name "charset.alias" in
+             some writable directory and defining the environment variable
+             CHARSETALIASDIR to point to that directory.  */
+          fd = open (file_name,
+                     O_RDONLY | (HAVE_WORKING_O_NOFOLLOW ? O_NOFOLLOW : 0));
+          if (fd < 0)
+            /* File not found.  Treat it as empty.  */
+            cp = "";
+          else
+            {
+              FILE *fp;
+
+              fp = fdopen (fd, "r");
+              if (fp == NULL)
+                {
+                  /* Out of memory.  Treat the file as empty.  */
+                  close (fd);
+                  cp = "";
+                }
+              else
+                {
+                  /* Parse the file's contents.  */
+                  char *res_ptr = NULL;
+                  size_t res_size = 0;
+
+                  for (;;)
+                    {
+                      int c;
+                      char buf1[50+1];
+                      char buf2[50+1];
+                      size_t l1, l2;
+                      char *old_res_ptr;
+
+                      c = getc (fp);
+                      if (c == EOF)
+                        break;
+                      if (c == '\n' || c == ' ' || c == '\t')
+                        continue;
+                      if (c == '#')
+                        {
+                          /* Skip comment, to end of line.  */
+                          do
+                            c = getc (fp);
+                          while (!(c == EOF || c == '\n'));
+                          if (c == EOF)
+                            break;
+                          continue;
+                        }
+                      ungetc (c, fp);
+                      if (fscanf (fp, "%50s %50s", buf1, buf2) < 2)
+                        break;
+                      l1 = strlen (buf1);
+                      l2 = strlen (buf2);
+                      old_res_ptr = res_ptr;
+                      if (res_size == 0)
+                        {
+                          res_size = l1 + 1 + l2 + 1;
+                          res_ptr = (char *) malloc (res_size + 1);
+                        }
+                      else
+                        {
+                          res_size += l1 + 1 + l2 + 1;
+                          res_ptr = (char *) realloc (res_ptr, res_size + 1);
+                        }
+                      if (res_ptr == NULL)
+                        {
+                          /* Out of memory. */
+                          res_size = 0;
+                          free (old_res_ptr);
+                          break;
+                        }
+                      strcpy (res_ptr + res_size - (l2 + 1) - (l1 + 1), buf1);
+                      strcpy (res_ptr + res_size - (l2 + 1), buf2);
+                    }
+                  fclose (fp);
+                  if (res_size == 0)
+                    cp = "";
+                  else
+                    {
+                      *(res_ptr + res_size) = '\0';
+                      cp = res_ptr;
+                    }
+                }
+            }
+
+          free (file_name);
+        }
+
+#else
+
+# if defined DARWIN7
+      /* To avoid the trouble of installing a file that is shared by many
+         GNU packages -- many packaging systems have problems with this --,
+         simply inline the aliases here.  */
+      cp = "ISO8859-1" "\0" "ISO-8859-1" "\0"
+           "ISO8859-2" "\0" "ISO-8859-2" "\0"
+           "ISO8859-4" "\0" "ISO-8859-4" "\0"
+           "ISO8859-5" "\0" "ISO-8859-5" "\0"
+           "ISO8859-7" "\0" "ISO-8859-7" "\0"
+           "ISO8859-9" "\0" "ISO-8859-9" "\0"
+           "ISO8859-13" "\0" "ISO-8859-13" "\0"
+           "ISO8859-15" "\0" "ISO-8859-15" "\0"
+           "KOI8-R" "\0" "KOI8-R" "\0"
+           "KOI8-U" "\0" "KOI8-U" "\0"
+           "CP866" "\0" "CP866" "\0"
+           "CP949" "\0" "CP949" "\0"
+           "CP1131" "\0" "CP1131" "\0"
+           "CP1251" "\0" "CP1251" "\0"
+           "eucCN" "\0" "GB2312" "\0"
+           "GB2312" "\0" "GB2312" "\0"
+           "eucJP" "\0" "EUC-JP" "\0"
+           "eucKR" "\0" "EUC-KR" "\0"
+           "Big5" "\0" "BIG5" "\0"
+           "Big5HKSCS" "\0" "BIG5-HKSCS" "\0"
+           "GBK" "\0" "GBK" "\0"
+           "GB18030" "\0" "GB18030" "\0"
+           "SJIS" "\0" "SHIFT_JIS" "\0"
+           "ARMSCII-8" "\0" "ARMSCII-8" "\0"
+           "PT154" "\0" "PT154" "\0"
+         /*"ISCII-DEV" "\0" "?" "\0"*/
+           "*" "\0" "UTF-8" "\0";
+# endif
+
+# if defined VMS
+      /* To avoid the troubles of an extra file charset.alias_vms in the
+         sources of many GNU packages, simply inline the aliases here.  */
+      /* The list of encodings is taken from the OpenVMS 7.3-1 documentation
+         "Compaq C Run-Time Library Reference Manual for OpenVMS systems"
+         section 10.7 "Handling Different Character Sets".  */
+      cp = "ISO8859-1" "\0" "ISO-8859-1" "\0"
+           "ISO8859-2" "\0" "ISO-8859-2" "\0"
+           "ISO8859-5" "\0" "ISO-8859-5" "\0"
+           "ISO8859-7" "\0" "ISO-8859-7" "\0"
+           "ISO8859-8" "\0" "ISO-8859-8" "\0"
+           "ISO8859-9" "\0" "ISO-8859-9" "\0"
+           /* Japanese */
+           "eucJP" "\0" "EUC-JP" "\0"
+           "SJIS" "\0" "SHIFT_JIS" "\0"
+           "DECKANJI" "\0" "DEC-KANJI" "\0"
+           "SDECKANJI" "\0" "EUC-JP" "\0"
+           /* Chinese */
+           "eucTW" "\0" "EUC-TW" "\0"
+           "DECHANYU" "\0" "DEC-HANYU" "\0"
+           "DECHANZI" "\0" "GB2312" "\0"
+           /* Korean */
+           "DECKOREAN" "\0" "EUC-KR" "\0";
+# endif
+
+# if defined WINDOWS_NATIVE || defined __CYGWIN__
+      /* To avoid the troubles of installing a separate file in the same
+         directory as the DLL and of retrieving the DLL's directory at
+         runtime, simply inline the aliases here.  */
+
+      cp = "CP936" "\0" "GBK" "\0"
+           "CP1361" "\0" "JOHAB" "\0"
+           "CP20127" "\0" "ASCII" "\0"
+           "CP20866" "\0" "KOI8-R" "\0"
+           "CP20936" "\0" "GB2312" "\0"
+           "CP21866" "\0" "KOI8-RU" "\0"
+           "CP28591" "\0" "ISO-8859-1" "\0"
+           "CP28592" "\0" "ISO-8859-2" "\0"
+           "CP28593" "\0" "ISO-8859-3" "\0"
+           "CP28594" "\0" "ISO-8859-4" "\0"
+           "CP28595" "\0" "ISO-8859-5" "\0"
+           "CP28596" "\0" "ISO-8859-6" "\0"
+           "CP28597" "\0" "ISO-8859-7" "\0"
+           "CP28598" "\0" "ISO-8859-8" "\0"
+           "CP28599" "\0" "ISO-8859-9" "\0"
+           "CP28605" "\0" "ISO-8859-15" "\0"
+           "CP38598" "\0" "ISO-8859-8" "\0"
+           "CP51932" "\0" "EUC-JP" "\0"
+           "CP51936" "\0" "GB2312" "\0"
+           "CP51949" "\0" "EUC-KR" "\0"
+           "CP51950" "\0" "EUC-TW" "\0"
+           "CP54936" "\0" "GB18030" "\0"
+           "CP65001" "\0" "UTF-8" "\0";
+# endif
+# if defined OS2
+      /* To avoid the troubles of installing a separate file in the same
+         directory as the DLL and of retrieving the DLL's directory at
+         runtime, simply inline the aliases here.  */
+
+      /* The list of encodings is taken from "List of OS/2 Codepages"
+         by Alex Taylor:
+         <http://altsan.org/os2/toolkits/uls/index.html#codepages>.
+         See also "IBM Globalization - Code page identifiers":
+         <http://www-01.ibm.com/software/globalization/cp/cp_cpgid.html>.  */
+      cp = "CP813" "\0" "ISO-8859-7" "\0"
+           "CP878" "\0" "KOI8-R" "\0"
+           "CP819" "\0" "ISO-8859-1" "\0"
+           "CP912" "\0" "ISO-8859-2" "\0"
+           "CP913" "\0" "ISO-8859-3" "\0"
+           "CP914" "\0" "ISO-8859-4" "\0"
+           "CP915" "\0" "ISO-8859-5" "\0"
+           "CP916" "\0" "ISO-8859-8" "\0"
+           "CP920" "\0" "ISO-8859-9" "\0"
+           "CP921" "\0" "ISO-8859-13" "\0"
+           "CP923" "\0" "ISO-8859-15" "\0"
+           "CP954" "\0" "EUC-JP" "\0"
+           "CP964" "\0" "EUC-TW" "\0"
+           "CP970" "\0" "EUC-KR" "\0"
+           "CP1089" "\0" "ISO-8859-6" "\0"
+           "CP1208" "\0" "UTF-8" "\0"
+           "CP1381" "\0" "GB2312" "\0"
+           "CP1386" "\0" "GBK" "\0"
+           "CP3372" "\0" "EUC-JP" "\0";
+# endif
+#endif
+
+      charset_aliases = cp;
+    }
+
+  return cp;
+}
+
+/* Determine the current locale's character encoding, and canonicalize it
+   into one of the canonical names listed in config.charset.
+   The result must not be freed; it is statically allocated.
+   If the canonical name cannot be determined, the result is a non-canonical
+   name.  */
+
+#ifdef STATIC
+STATIC
+#endif
+const char *
+locale_charset (void)
+{
+  const char *codeset;
+  const char *aliases;
+
+#if !(defined WINDOWS_NATIVE || defined OS2)
+
+# if HAVE_LANGINFO_CODESET
+
+  /* Most systems support nl_langinfo (CODESET) nowadays.  */
+  codeset = nl_langinfo (CODESET);
+
+#  ifdef __CYGWIN__
+  /* Cygwin < 1.7 does not have locales.  nl_langinfo (CODESET) always
+     returns "US-ASCII".  Return the suffix of the locale name from the
+     environment variables (if present) or the codepage as a number.  */
+  if (codeset != NULL && strcmp (codeset, "US-ASCII") == 0)
+    {
+      const char *locale;
+      static char buf[2 + 10 + 1];
+
+      locale = getenv ("LC_ALL");
+      if (locale == NULL || locale[0] == '\0')
+        {
+          locale = getenv ("LC_CTYPE");
+          if (locale == NULL || locale[0] == '\0')
+            locale = getenv ("LANG");
+        }
+      if (locale != NULL && locale[0] != '\0')
+        {
+          /* If the locale name contains an encoding after the dot, return
+             it.  */
+          const char *dot = strchr (locale, '.');
+
+          if (dot != NULL)
+            {
+              const char *modifier;
+
+              dot++;
+              /* Look for the possible @... trailer and remove it, if any.  */
+              modifier = strchr (dot, '@');
+              if (modifier == NULL)
+                return dot;
+              if (modifier - dot < sizeof (buf))
+                {
+                  memcpy (buf, dot, modifier - dot);
+                  buf [modifier - dot] = '\0';
+                  return buf;
+                }
+            }
+        }
+
+      /* The Windows API has a function returning the locale's codepage as a
+         number: GetACP().  This encoding is used by Cygwin, unless the user
+         has set the environment variable CYGWIN=codepage:oem (which very few
+         people do).
+         Output directed to console windows needs to be converted (to
+         GetOEMCP() if the console is using a raster font, or to
+         GetConsoleOutputCP() if it is using a TrueType font).  Cygwin does
+         this conversion transparently (see winsup/cygwin/fhandler_console.cc),
+         converting to GetConsoleOutputCP().  This leads to correct results,
+         except when SetConsoleOutputCP has been called and a raster font is
+         in use.  */
+      sprintf (buf, "CP%u", GetACP ());
+      codeset = buf;
+    }
+#  endif
+
+# else
+
+  /* On old systems which lack it, use setlocale or getenv.  */
+  const char *locale = NULL;
+
+  /* But most old systems don't have a complete set of locales.  Some
+     (like SunOS 4 or DJGPP) have only the C locale.  Therefore we don't
+     use setlocale here; it would return "C" when it doesn't support the
+     locale name the user has set.  */
+#  if 0
+  locale = setlocale (LC_CTYPE, NULL);
+#  endif
+  if (locale == NULL || locale[0] == '\0')
+    {
+      locale = getenv ("LC_ALL");
+      if (locale == NULL || locale[0] == '\0')
+        {
+          locale = getenv ("LC_CTYPE");
+          if (locale == NULL || locale[0] == '\0')
+            locale = getenv ("LANG");
+        }
+    }
+
+  /* On some old systems, one used to set locale = "iso8859_1". On others,
+     you set it to "language_COUNTRY.charset". In any case, we resolve it
+     through the charset.alias file.  */
+  codeset = locale;
+
+# endif
+
+#elif defined WINDOWS_NATIVE
+
+  static char buf[2 + 10 + 1];
+
+  /* The Windows API has a function returning the locale's codepage as
+     a number, but the value doesn't change according to what the
+     'setlocale' call specified.  So we use it as a last resort, in
+     case the string returned by 'setlocale' doesn't specify the
+     codepage.  */
+  char *current_locale = setlocale (LC_ALL, NULL);
+  char *pdot;
+
+  /* If they set different locales for different categories,
+     'setlocale' will return a semi-colon separated list of locale
+     values.  To make sure we use the correct one, we choose LC_CTYPE.  */
+  if (strchr (current_locale, ';'))
+    current_locale = setlocale (LC_CTYPE, NULL);
+
+  pdot = strrchr (current_locale, '.');
+  if (pdot && 2 + strlen (pdot + 1) + 1 <= sizeof (buf))
+    sprintf (buf, "CP%s", pdot + 1);
+  else
+    {
+      /* The Windows API has a function returning the locale's codepage as a
+        number: GetACP().
+        When the output goes to a console window, it needs to be provided in
+        GetOEMCP() encoding if the console is using a raster font, or in
+        GetConsoleOutputCP() encoding if it is using a TrueType font.
+        But in GUI programs and for output sent to files and pipes, GetACP()
+        encoding is the best bet.  */
+      sprintf (buf, "CP%u", GetACP ());
+    }
+  codeset = buf;
+
+#elif defined OS2
+
+  const char *locale;
+  static char buf[2 + 10 + 1];
+  ULONG cp[3];
+  ULONG cplen;
+
+  codeset = NULL;
+
+  /* Allow user to override the codeset, as set in the operating system,
+     with standard language environment variables.  */
+  locale = getenv ("LC_ALL");
+  if (locale == NULL || locale[0] == '\0')
+    {
+      locale = getenv ("LC_CTYPE");
+      if (locale == NULL || locale[0] == '\0')
+        locale = getenv ("LANG");
+    }
+  if (locale != NULL && locale[0] != '\0')
+    {
+      /* If the locale name contains an encoding after the dot, return it.  */
+      const char *dot = strchr (locale, '.');
+
+      if (dot != NULL)
+        {
+          const char *modifier;
+
+          dot++;
+          /* Look for the possible @... trailer and remove it, if any.  */
+          modifier = strchr (dot, '@');
+          if (modifier == NULL)
+            return dot;
+          if (modifier - dot < sizeof (buf))
+            {
+              memcpy (buf, dot, modifier - dot);
+              buf [modifier - dot] = '\0';
+              return buf;
+            }
+        }
+
+      /* For the POSIX locale, don't use the system's codepage.  */
+      if (strcmp (locale, "C") == 0 || strcmp (locale, "POSIX") == 0)
+        codeset = "";
+    }
+
+  if (codeset == NULL)
+    {
+      /* OS/2 has a function returning the locale's codepage as a number.  */
+      if (DosQueryCp (sizeof (cp), cp, &cplen))
+        codeset = "";
+      else
+        {
+          sprintf (buf, "CP%u", cp[0]);
+          codeset = buf;
+        }
+    }
+
+#endif
+
+  if (codeset == NULL)
+    /* The canonical name cannot be determined.  */
+    codeset = "";
+
+  /* Resolve alias. */
+  for (aliases = get_charset_aliases ();
+       *aliases != '\0';
+       aliases += strlen (aliases) + 1, aliases += strlen (aliases) + 1)
+    if (strcmp (codeset, aliases) == 0
+        || (aliases[0] == '*' && aliases[1] == '\0'))
+      {
+        codeset = aliases + strlen (aliases) + 1;
+        break;
+      }
+
+  /* Don't return an empty string.  GNU libc and GNU libiconv interpret
+     the empty string as denoting "the locale's character encoding",
+     thus GNU libiconv would call this function a second time.  */
+  if (codeset[0] == '\0')
+    codeset = "ASCII";
+
+#ifdef DARWIN7
+  /* Mac OS X sets MB_CUR_MAX to 1 when LC_ALL=C, and "UTF-8"
+     (the default codeset) does not work when MB_CUR_MAX is 1.  */
+  if (strcmp (codeset, "UTF-8") == 0 && MB_CUR_MAX_L (uselocale (NULL)) <= 1)
+    codeset = "ASCII";
+#endif
+
+  return codeset;
+}
diff --git a/gl/localcharset.h b/gl/localcharset.h
new file mode 100644
index 0000000..3dc4dec
--- /dev/null
+++ b/gl/localcharset.h
@@ -0,0 +1,40 @@
+/* Determine a canonical name for the current locale's character encoding.
+   Copyright (C) 2000-2003, 2009-2017 Free Software Foundation, Inc.
+   This file is part of the GNU CHARSET Library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License along
+   with this program; if not, see <http://www.gnu.org/licenses/>.  */
+
+#ifndef _LOCALCHARSET_H
+#define _LOCALCHARSET_H
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/* Determine the current locale's character encoding, and canonicalize it
+   into one of the canonical names listed in config.charset.
+   The result must not be freed; it is statically allocated.
+   If the canonical name cannot be determined, the result is a non-canonical
+   name.  */
+extern const char * locale_charset (void);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* _LOCALCHARSET_H */
diff --git a/gl/locale.in.h b/gl/locale.in.h
new file mode 100644
index 0000000..50ccae6
--- /dev/null
+++ b/gl/locale.in.h
@@ -0,0 +1,216 @@
+/* A POSIX <locale.h>.
+   Copyright (C) 2007-2017 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#if __GNUC__ >= 3
+@PRAGMA_SYSTEM_HEADER@
+#endif
+@PRAGMA_COLUMNS@
+
+#ifdef _GL_ALREADY_INCLUDING_LOCALE_H
+
+/* Special invocation conventions to handle Solaris header files
+   (through Solaris 10) when combined with gettext's libintl.h.  */
+
+#@INCLUDE_NEXT@ @NEXT_LOCALE_H@
+
+#else
+/* Normal invocation convention.  */
+
+#ifndef _@GUARD_PREFIX@_LOCALE_H
+
+#define _GL_ALREADY_INCLUDING_LOCALE_H
+
+/* The include_next requires a split double-inclusion guard.  */
+#@INCLUDE_NEXT@ @NEXT_LOCALE_H@
+
+#undef _GL_ALREADY_INCLUDING_LOCALE_H
+
+#ifndef _@GUARD_PREFIX@_LOCALE_H
+#define _@GUARD_PREFIX@_LOCALE_H
+
+/* NetBSD 5.0 mis-defines NULL.  */
+#include <stddef.h>
+
+/* Mac OS X 10.5 defines the locale_t type in <xlocale.h>.  */
+#if @HAVE_XLOCALE_H@
+# include <xlocale.h>
+#endif
+
+/* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
+
+/* The definition of _GL_ARG_NONNULL is copied here.  */
+
+/* The definition of _GL_WARN_ON_USE is copied here.  */
+
+/* The LC_MESSAGES locale category is specified in POSIX, but not in ISO C.
+   On systems that don't define it, use the same value as GNU libintl.  */
+#if !defined LC_MESSAGES
+# define LC_MESSAGES 1729
+#endif
+
+/* Bionic libc's 'struct lconv' is just a dummy.  */
+#if @REPLACE_STRUCT_LCONV@
+# define lconv rpl_lconv
+struct lconv
+{
+  /* All 'char *' are actually 'const char *'.  */
+
+  /* Members that depend on the LC_NUMERIC category of the locale.  See
+     <http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap07.html#tag_07_03_04> */
+
+  /* Symbol used as decimal point.  */
+  char *decimal_point;
+  /* Symbol used to separate groups of digits to the left of the decimal
+     point.  */
+  char *thousands_sep;
+  /* Definition of the size of groups of digits to the left of the decimal
+     point.  */
+  char *grouping;
+
+  /* Members that depend on the LC_MONETARY category of the locale.  See
+     <http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap07.html#tag_07_03_03> */
+
+  /* Symbol used as decimal point.  */
+  char *mon_decimal_point;
+  /* Symbol used to separate groups of digits to the left of the decimal
+     point.  */
+  char *mon_thousands_sep;
+  /* Definition of the size of groups of digits to the left of the decimal
+     point.  */
+  char *mon_grouping;
+  /* Sign used to indicate a value >= 0.  */
+  char *positive_sign;
+  /* Sign used to indicate a value < 0.  */
+  char *negative_sign;
+
+  /* For formatting local currency.  */
+  /* Currency symbol (3 characters) followed by separator (1 character).  */
+  char *currency_symbol;
+  /* Number of digits after the decimal point.  */
+  char frac_digits;
+  /* For values >= 0: 1 if the currency symbol precedes the number, 0 if it
+     comes after the number.  */
+  char p_cs_precedes;
+  /* For values >= 0: Position of the sign.  */
+  char p_sign_posn;
+  /* For values >= 0: Placement of spaces between currency symbol, sign, and
+     number.  */
+  char p_sep_by_space;
+  /* For values < 0: 1 if the currency symbol precedes the number, 0 if it
+     comes after the number.  */
+  char n_cs_precedes;
+  /* For values < 0: Position of the sign.  */
+  char n_sign_posn;
+  /* For values < 0: Placement of spaces between currency symbol, sign, and
+     number.  */
+  char n_sep_by_space;
+
+  /* For formatting international currency.  */
+  /* Currency symbol (3 characters) followed by separator (1 character).  */
+  char *int_curr_symbol;
+  /* Number of digits after the decimal point.  */
+  char int_frac_digits;
+  /* For values >= 0: 1 if the currency symbol precedes the number, 0 if it
+     comes after the number.  */
+  char int_p_cs_precedes;
+  /* For values >= 0: Position of the sign.  */
+  char int_p_sign_posn;
+  /* For values >= 0: Placement of spaces between currency symbol, sign, and
+     number.  */
+  char int_p_sep_by_space;
+  /* For values < 0: 1 if the currency symbol precedes the number, 0 if it
+     comes after the number.  */
+  char int_n_cs_precedes;
+  /* For values < 0: Position of the sign.  */
+  char int_n_sign_posn;
+  /* For values < 0: Placement of spaces between currency symbol, sign, and
+     number.  */
+  char int_n_sep_by_space;
+};
+#endif
+
+#if @GNULIB_LOCALECONV@
+# if @REPLACE_LOCALECONV@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef localeconv
+#   define localeconv rpl_localeconv
+#  endif
+_GL_FUNCDECL_RPL (localeconv, struct lconv *, (void));
+_GL_CXXALIAS_RPL (localeconv, struct lconv *, (void));
+# else
+_GL_CXXALIAS_SYS (localeconv, struct lconv *, (void));
+# endif
+_GL_CXXALIASWARN (localeconv);
+#elif @REPLACE_STRUCT_LCONV@
+# undef localeconv
+# define localeconv localeconv_used_without_requesting_gnulib_module_localeconv
+#elif defined GNULIB_POSIXCHECK
+# undef localeconv
+# if HAVE_RAW_DECL_LOCALECONV
+_GL_WARN_ON_USE (localeconv,
+                 "localeconv returns too few information on some platforms - "
+                 "use gnulib module localeconv for portability");
+# endif
+#endif
+
+#if @GNULIB_SETLOCALE@
+# if @REPLACE_SETLOCALE@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef setlocale
+#   define setlocale rpl_setlocale
+#   define GNULIB_defined_setlocale 1
+#  endif
+_GL_FUNCDECL_RPL (setlocale, char *, (int category, const char *locale));
+_GL_CXXALIAS_RPL (setlocale, char *, (int category, const char *locale));
+# else
+_GL_CXXALIAS_SYS (setlocale, char *, (int category, const char *locale));
+# endif
+_GL_CXXALIASWARN (setlocale);
+#elif defined GNULIB_POSIXCHECK
+# undef setlocale
+# if HAVE_RAW_DECL_SETLOCALE
+_GL_WARN_ON_USE (setlocale, "setlocale works differently on native Windows - "
+                 "use gnulib module setlocale for portability");
+# endif
+#endif
+
+#if @GNULIB_DUPLOCALE@
+# if @REPLACE_DUPLOCALE@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef duplocale
+#   define duplocale rpl_duplocale
+#  endif
+_GL_FUNCDECL_RPL (duplocale, locale_t, (locale_t locale) _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (duplocale, locale_t, (locale_t locale));
+# else
+#  if @HAVE_DUPLOCALE@
+_GL_CXXALIAS_SYS (duplocale, locale_t, (locale_t locale));
+#  endif
+# endif
+# if @HAVE_DUPLOCALE@
+_GL_CXXALIASWARN (duplocale);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef duplocale
+# if HAVE_RAW_DECL_DUPLOCALE
+_GL_WARN_ON_USE (duplocale, "duplocale is buggy on some glibc systems - "
+                 "use gnulib module duplocale for portability");
+# endif
+#endif
+
+#endif /* _@GUARD_PREFIX@_LOCALE_H */
+#endif /* ! _GL_ALREADY_INCLUDING_LOCALE_H */
+#endif /* _@GUARD_PREFIX@_LOCALE_H */
diff --git a/gl/localeconv.c b/gl/localeconv.c
new file mode 100644
index 0000000..c38035f
--- /dev/null
+++ b/gl/localeconv.c
@@ -0,0 +1,103 @@
+/* Query locale dependent information for formatting numbers.
+   Copyright (C) 2012-2017 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include <locale.h>
+
+#if HAVE_STRUCT_LCONV_DECIMAL_POINT
+
+/* Override for platforms where 'struct lconv' lacks the int_p_*, int_n_*
+   members.  */
+
+struct lconv *
+localeconv (void)
+{
+  static struct lconv result;
+# undef lconv
+# undef localeconv
+  struct lconv *sys_result = localeconv ();
+
+  result.decimal_point = sys_result->decimal_point;
+  result.thousands_sep = sys_result->thousands_sep;
+  result.grouping = sys_result->grouping;
+  result.mon_decimal_point = sys_result->mon_decimal_point;
+  result.mon_thousands_sep = sys_result->mon_thousands_sep;
+  result.mon_grouping = sys_result->mon_grouping;
+  result.positive_sign = sys_result->positive_sign;
+  result.negative_sign = sys_result->negative_sign;
+  result.currency_symbol = sys_result->currency_symbol;
+  result.frac_digits = sys_result->frac_digits;
+  result.p_cs_precedes = sys_result->p_cs_precedes;
+  result.p_sign_posn = sys_result->p_sign_posn;
+  result.p_sep_by_space = sys_result->p_sep_by_space;
+  result.n_cs_precedes = sys_result->n_cs_precedes;
+  result.n_sign_posn = sys_result->n_sign_posn;
+  result.n_sep_by_space = sys_result->n_sep_by_space;
+  result.int_curr_symbol = sys_result->int_curr_symbol;
+  result.int_frac_digits = sys_result->int_frac_digits;
+  result.int_p_cs_precedes = sys_result->p_cs_precedes;
+  result.int_p_sign_posn = sys_result->p_sign_posn;
+  result.int_p_sep_by_space = sys_result->p_sep_by_space;
+  result.int_n_cs_precedes = sys_result->n_cs_precedes;
+  result.int_n_sign_posn = sys_result->n_sign_posn;
+  result.int_n_sep_by_space = sys_result->n_sep_by_space;
+
+  return &result;
+}
+
+#else
+
+/* Override for platforms where 'struct lconv' is a dummy.  */
+
+# include <limits.h>
+
+struct lconv *
+localeconv (void)
+{
+  static /*const*/ struct lconv result =
+    {
+      /* decimal_point */ ".",
+      /* thousands_sep */ "",
+      /* grouping */ "",
+      /* mon_decimal_point */ "",
+      /* mon_thousands_sep */ "",
+      /* mon_grouping */ "",
+      /* positive_sign */ "",
+      /* negative_sign */ "",
+      /* currency_symbol */ "",
+      /* frac_digits */ CHAR_MAX,
+      /* p_cs_precedes */ CHAR_MAX,
+      /* p_sign_posn */ CHAR_MAX,
+      /* p_sep_by_space */ CHAR_MAX,
+      /* n_cs_precedes */ CHAR_MAX,
+      /* n_sign_posn */ CHAR_MAX,
+      /* n_sep_by_space */ CHAR_MAX,
+      /* int_curr_symbol */ "",
+      /* int_frac_digits */ CHAR_MAX,
+      /* int_p_cs_precedes */ CHAR_MAX,
+      /* int_p_sign_posn */ CHAR_MAX,
+      /* int_p_sep_by_space */ CHAR_MAX,
+      /* int_n_cs_precedes */ CHAR_MAX,
+      /* int_n_sign_posn */ CHAR_MAX,
+      /* int_n_sep_by_space */ CHAR_MAX
+    };
+
+  return &result;
+}
+
+#endif
diff --git a/gl/localtime-buffer.c b/gl/localtime-buffer.c
new file mode 100644
index 0000000..2887852
--- /dev/null
+++ b/gl/localtime-buffer.c
@@ -0,0 +1,58 @@
+/* Provide access to the last buffer returned by localtime() or gmtime().
+
+   Copyright (C) 2001-2003, 2005-2007, 2009-2017 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
+
+/* written by Jim Meyering */
+
+#include <config.h>
+
+/* Specification.  */
+#include "localtime-buffer.h"
+
+#if GETTIMEOFDAY_CLOBBERS_LOCALTIME || TZSET_CLOBBERS_LOCALTIME
+
+static struct tm tm_zero_buffer;
+struct tm *localtime_buffer_addr = &tm_zero_buffer;
+
+/* This is a wrapper for localtime.
+
+   On the first call, record the address of the static buffer that
+   localtime uses for its result.  */
+
+struct tm *
+rpl_localtime (time_t const *timep)
+{
+  struct tm *tm = localtime (timep);
+
+  if (localtime_buffer_addr == &tm_zero_buffer)
+    localtime_buffer_addr = tm;
+
+  return tm;
+}
+
+/* Same as above, since gmtime and localtime use the same buffer.  */
+struct tm *
+rpl_gmtime (time_t const *timep)
+{
+  struct tm *tm = gmtime (timep);
+
+  if (localtime_buffer_addr == &tm_zero_buffer)
+    localtime_buffer_addr = tm;
+
+  return tm;
+}
+
+#endif
diff --git a/gl/localtime-buffer.h b/gl/localtime-buffer.h
new file mode 100644
index 0000000..304c10d
--- /dev/null
+++ b/gl/localtime-buffer.h
@@ -0,0 +1,27 @@
+/* Provide access to the last buffer returned by localtime() or gmtime().
+
+   Copyright (C) 2001-2003, 2005-2007, 2009-2017 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
+
+/* written by Jim Meyering */
+
+#include <time.h>
+
+#if GETTIMEOFDAY_CLOBBERS_LOCALTIME || TZSET_CLOBBERS_LOCALTIME
+
+/* The address of the last buffer returned by localtime() or gmtime().  */
+extern struct tm *localtime_buffer_addr;
+
+#endif
diff --git a/gl/lstat.c b/gl/lstat.c
new file mode 100644
index 0000000..f4cdb2a
--- /dev/null
+++ b/gl/lstat.c
@@ -0,0 +1,97 @@
+/* Work around a bug of lstat on some systems
+
+   Copyright (C) 1997-2006, 2008-2017 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* written by Jim Meyering */
+
+/* If the user's config.h happens to include <sys/stat.h>, let it include only
+   the system's <sys/stat.h> here, so that orig_lstat doesn't recurse to
+   rpl_lstat.  */
+#define __need_system_sys_stat_h
+#include <config.h>
+
+#if !HAVE_LSTAT
+/* On systems that lack symlinks, our replacement <sys/stat.h> already
+   defined lstat as stat, so there is nothing further to do other than
+   avoid an empty file.  */
+typedef int dummy;
+#else /* HAVE_LSTAT */
+
+/* Get the original definition of lstat.  It might be defined as a macro.  */
+# include <sys/types.h>
+# include <sys/stat.h>
+# undef __need_system_sys_stat_h
+
+static int
+orig_lstat (const char *filename, struct stat *buf)
+{
+  return lstat (filename, buf);
+}
+
+/* Specification.  */
+/* Write "sys/stat.h" here, not <sys/stat.h>, otherwise OSF/1 5.1 DTK cc
+   eliminates this include because of the preliminary #include <sys/stat.h>
+   above.  */
+# include "sys/stat.h"
+
+# include <string.h>
+# include <errno.h>
+
+/* lstat works differently on Linux and Solaris systems.  POSIX (see
+   "pathname resolution" in the glossary) requires that programs like
+   'ls' take into consideration the fact that FILE has a trailing slash
+   when FILE is a symbolic link.  On Linux and Solaris 10 systems, the
+   lstat function already has the desired semantics (in treating
+   'lstat ("symlink/", sbuf)' just like 'lstat ("symlink/.", sbuf)',
+   but on Solaris 9 and earlier it does not.
+
+   If FILE has a trailing slash and specifies a symbolic link,
+   then use stat() to get more info on the referent of FILE.
+   If the referent is a non-directory, then set errno to ENOTDIR
+   and return -1.  Otherwise, return stat's result.  */
+
+int
+rpl_lstat (const char *file, struct stat *sbuf)
+{
+  size_t len;
+  int lstat_result = orig_lstat (file, sbuf);
+
+  if (lstat_result != 0)
+    return lstat_result;
+
+  /* This replacement file can blindly check against '/' rather than
+     using the ISSLASH macro, because all platforms with '\\' either
+     lack symlinks (mingw) or have working lstat (cygwin) and thus do
+     not compile this file.  0 len should have already been filtered
+     out above, with a failure return of ENOENT.  */
+  len = strlen (file);
+  if (file[len - 1] != '/' || S_ISDIR (sbuf->st_mode))
+    return 0;
+
+  /* At this point, a trailing slash is only permitted on
+     symlink-to-dir; but it should have found information on the
+     directory, not the symlink.  Call stat() to get info about the
+     link's referent.  Our replacement stat guarantees valid results,
+     even if the symlink is not pointing to a directory.  */
+  if (!S_ISLNK (sbuf->st_mode))
+    {
+      errno = ENOTDIR;
+      return -1;
+    }
+  return stat (file, sbuf);
+}
+
+#endif /* HAVE_LSTAT */
diff --git a/gl/m4/00gnulib.m4 b/gl/m4/00gnulib.m4
new file mode 100644
index 0000000..bb3512f
--- /dev/null
+++ b/gl/m4/00gnulib.m4
@@ -0,0 +1,46 @@
+# 00gnulib.m4 serial 3
+dnl Copyright (C) 2009-2017 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl This file must be named something that sorts before all other
+dnl gnulib-provided .m4 files.  It is needed until such time as we can
+dnl assume Autoconf 2.64, with its improved AC_DEFUN_ONCE and
+dnl m4_divert semantics.
+
+# Until autoconf 2.63, handling of the diversion stack required m4_init
+# to be called first; but this does not happen with aclocal.  Wrapping
+# the entire execution in another layer of the diversion stack fixes this.
+# Worse, prior to autoconf 2.62, m4_wrap depended on the underlying m4
+# for whether it was FIFO or LIFO; in order to properly balance with
+# m4_init, we need to undo our push just before anything wrapped within
+# the m4_init body.  The way to ensure this is to wrap both sides of
+# m4_init with a one-shot macro that does the pop at the right time.
+m4_ifndef([_m4_divert_diversion],
+[m4_divert_push([KILL])
+m4_define([gl_divert_fixup], [m4_divert_pop()m4_define([$0])])
+m4_define([m4_init],
+  [gl_divert_fixup()]m4_defn([m4_init])[gl_divert_fixup()])])
+
+
+# AC_DEFUN_ONCE([NAME], VALUE)
+# ----------------------------
+# Define NAME to expand to VALUE on the first use (whether by direct
+# expansion, or by AC_REQUIRE), and to nothing on all subsequent uses.
+# Avoid bugs in AC_REQUIRE in Autoconf 2.63 and earlier.  This
+# definition is slower than the version in Autoconf 2.64, because it
+# can only use interfaces that existed since 2.59; but it achieves the
+# same effect.  Quoting is necessary to avoid confusing Automake.
+m4_version_prereq([2.63.263], [],
+[m4_define([AC][_DEFUN_ONCE],
+  [AC][_DEFUN([$1],
+    [AC_REQUIRE([_gl_DEFUN_ONCE([$1])],
+      [m4_indir([_gl_DEFUN_ONCE([$1])])])])]dnl
+[AC][_DEFUN([_gl_DEFUN_ONCE([$1])], [$2])])])
+
+# gl_00GNULIB
+# -----------
+# Witness macro that this file has been included.  Needed to force
+# Automake to include this file prior to all other gnulib .m4 files.
+AC_DEFUN([gl_00GNULIB])
diff --git a/gl/m4/absolute-header.m4 b/gl/m4/absolute-header.m4
new file mode 100644
index 0000000..c73adc8
--- /dev/null
+++ b/gl/m4/absolute-header.m4
@@ -0,0 +1,102 @@
+# absolute-header.m4 serial 16
+dnl Copyright (C) 2006-2017 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Derek Price.
+
+# gl_ABSOLUTE_HEADER(HEADER1 HEADER2 ...)
+# ---------------------------------------
+# Find the absolute name of a header file, testing first if the header exists.
+# If the header were sys/inttypes.h, this macro would define
+# ABSOLUTE_SYS_INTTYPES_H to the '""' quoted absolute name of sys/inttypes.h
+# in config.h
+# (e.g. '#define ABSOLUTE_SYS_INTTYPES_H "///usr/include/sys/inttypes.h"').
+# The three "///" are to pacify Sun C 5.8, which otherwise would say
+# "warning: #include of /usr/include/... may be non-portable".
+# Use '""', not '<>', so that the /// cannot be confused with a C99 comment.
+# Note: This macro assumes that the header file is not empty after
+# preprocessing, i.e. it does not only define preprocessor macros but also
+# provides some type/enum definitions or function/variable declarations.
+AC_DEFUN([gl_ABSOLUTE_HEADER],
+[AC_REQUIRE([AC_CANONICAL_HOST])
+AC_LANG_PREPROC_REQUIRE()dnl
+dnl FIXME: gl_absolute_header and ac_header_exists must be used unquoted
+dnl until we can assume autoconf 2.64 or newer.
+m4_foreach_w([gl_HEADER_NAME], [$1],
+  [AS_VAR_PUSHDEF([gl_absolute_header],
+                  [gl_cv_absolute_]m4_defn([gl_HEADER_NAME]))dnl
+  AC_CACHE_CHECK([absolute name of <]m4_defn([gl_HEADER_NAME])[>],
+    m4_defn([gl_absolute_header]),
+    [AS_VAR_PUSHDEF([ac_header_exists],
+                    [ac_cv_header_]m4_defn([gl_HEADER_NAME]))dnl
+    AC_CHECK_HEADERS_ONCE(m4_defn([gl_HEADER_NAME]))dnl
+    if test AS_VAR_GET(ac_header_exists) = yes; then
+      gl_ABSOLUTE_HEADER_ONE(m4_defn([gl_HEADER_NAME]))
+    fi
+    AS_VAR_POPDEF([ac_header_exists])dnl
+    ])dnl
+  AC_DEFINE_UNQUOTED(AS_TR_CPP([ABSOLUTE_]m4_defn([gl_HEADER_NAME])),
+                     ["AS_VAR_GET(gl_absolute_header)"],
+                     [Define this to an absolute name of <]m4_defn([gl_HEADER_NAME])[>.])
+  AS_VAR_POPDEF([gl_absolute_header])dnl
+])dnl
+])# gl_ABSOLUTE_HEADER
+
+# gl_ABSOLUTE_HEADER_ONE(HEADER)
+# ------------------------------
+# Like gl_ABSOLUTE_HEADER, except that:
+#   - it assumes that the header exists,
+#   - it uses the current CPPFLAGS,
+#   - it does not cache the result,
+#   - it is silent.
+AC_DEFUN([gl_ABSOLUTE_HEADER_ONE],
+[
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_LANG_CONFTEST([AC_LANG_SOURCE([[#include <]]m4_dquote([$1])[[>]])])
+  dnl AIX "xlc -E" and "cc -E" omit #line directives for header files
+  dnl that contain only a #include of other header files and no
+  dnl non-comment tokens of their own. This leads to a failure to
+  dnl detect the absolute name of <dirent.h>, <signal.h>, <poll.h>
+  dnl and others. The workaround is to force preservation of comments
+  dnl through option -C. This ensures all necessary #line directives
+  dnl are present. GCC supports option -C as well.
+  case "$host_os" in
+    aix*) gl_absname_cpp="$ac_cpp -C" ;;
+    *)    gl_absname_cpp="$ac_cpp" ;;
+  esac
+changequote(,)
+  case "$host_os" in
+    mingw*)
+      dnl For the sake of native Windows compilers (excluding gcc),
+      dnl treat backslash as a directory separator, like /.
+      dnl Actually, these compilers use a double-backslash as
+      dnl directory separator, inside the
+      dnl   # line "filename"
+      dnl directives.
+      gl_dirsep_regex='[/\\]'
+      ;;
+    *)
+      gl_dirsep_regex='\/'
+      ;;
+  esac
+  dnl A sed expression that turns a string into a basic regular
+  dnl expression, for use within "/.../".
+  gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+  gl_header_literal_regex=`echo '$1' \
+                           | 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
+    }'
+changequote([,])
+  dnl eval is necessary to expand gl_absname_cpp.
+  dnl Ultrix and Pyramid sh refuse to redirect output of eval,
+  dnl so use subshell.
+  AS_VAR_SET([gl_cv_absolute_]AS_TR_SH([[$1]]),
+[`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD |
+  sed -n "$gl_absolute_header_sed"`])
+])
diff --git a/gl/m4/alloca.m4 b/gl/m4/alloca.m4
new file mode 100644
index 0000000..7f0604c
--- /dev/null
+++ b/gl/m4/alloca.m4
@@ -0,0 +1,121 @@
+# alloca.m4 serial 14
+dnl Copyright (C) 2002-2004, 2006-2007, 2009-2017 Free Software Foundation,
+dnl Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_FUNC_ALLOCA],
+[
+  AC_REQUIRE([AC_FUNC_ALLOCA])
+  if test $ac_cv_func_alloca_works = no; then
+    gl_PREREQ_ALLOCA
+  fi
+
+  # Define an additional variable used in the Makefile substitution.
+  if test $ac_cv_working_alloca_h = yes; then
+    AC_CACHE_CHECK([for alloca as a compiler built-in], [gl_cv_rpl_alloca], [
+      AC_EGREP_CPP([Need own alloca], [
+#if defined __GNUC__ || defined _AIX || defined _MSC_VER
+        Need own alloca
+#endif
+        ], [gl_cv_rpl_alloca=yes], [gl_cv_rpl_alloca=no])
+    ])
+    if test $gl_cv_rpl_alloca = yes; then
+      dnl OK, alloca can be implemented through a compiler built-in.
+      AC_DEFINE([HAVE_ALLOCA], [1],
+        [Define to 1 if you have 'alloca' after including <alloca.h>,
+         a header that may be supplied by this distribution.])
+      ALLOCA_H=alloca.h
+    else
+      dnl alloca exists as a library function, i.e. it is slow and probably
+      dnl a memory leak. Don't define HAVE_ALLOCA in this case.
+      ALLOCA_H=
+    fi
+  else
+    ALLOCA_H=alloca.h
+  fi
+  AC_SUBST([ALLOCA_H])
+  AM_CONDITIONAL([GL_GENERATE_ALLOCA_H], [test -n "$ALLOCA_H"])
+])
+
+# Prerequisites of lib/alloca.c.
+# STACK_DIRECTION is already handled by AC_FUNC_ALLOCA.
+AC_DEFUN([gl_PREREQ_ALLOCA], [:])
+
+# This works around a bug in autoconf <= 2.68.
+# See <http://lists.gnu.org/archive/html/bug-gnulib/2011-06/msg00277.html>.
+
+m4_version_prereq([2.69], [] ,[
+
+# This is taken from the following Autoconf patch:
+# http://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=6cd9f12520b0d6f76d3230d7565feba1ecf29497
+
+# _AC_LIBOBJ_ALLOCA
+# -----------------
+# Set up the LIBOBJ replacement of 'alloca'.  Well, not exactly
+# AC_LIBOBJ since we actually set the output variable 'ALLOCA'.
+# Nevertheless, for Automake, AC_LIBSOURCES it.
+m4_define([_AC_LIBOBJ_ALLOCA],
+[# 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.
+AC_LIBSOURCES(alloca.c)
+AC_SUBST([ALLOCA], [\${LIBOBJDIR}alloca.$ac_objext])dnl
+AC_DEFINE(C_ALLOCA, 1, [Define to 1 if using 'alloca.c'.])
+
+AC_CACHE_CHECK(whether 'alloca.c' needs Cray hooks, ac_cv_os_cray,
+[AC_EGREP_CPP(webecray,
+[#if defined CRAY && ! defined CRAY2
+webecray
+#else
+wenotbecray
+#endif
+], ac_cv_os_cray=yes, ac_cv_os_cray=no)])
+if test $ac_cv_os_cray = yes; then
+  for ac_func in _getb67 GETB67 getb67; do
+    AC_CHECK_FUNC($ac_func,
+                  [AC_DEFINE_UNQUOTED(CRAY_STACKSEG_END, $ac_func,
+                                      [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.])
+    break])
+  done
+fi
+
+AC_CACHE_CHECK([stack direction for C alloca],
+               [ac_cv_c_stack_direction],
+[AC_RUN_IFELSE([AC_LANG_SOURCE(
+[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;
+}])],
+               [ac_cv_c_stack_direction=1],
+               [ac_cv_c_stack_direction=-1],
+               [ac_cv_c_stack_direction=0])])
+AH_VERBATIM([STACK_DIRECTION],
+[/* 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 */
+@%:@undef STACK_DIRECTION])dnl
+AC_DEFINE_UNQUOTED(STACK_DIRECTION, $ac_cv_c_stack_direction)
+])# _AC_LIBOBJ_ALLOCA
+])
diff --git a/gl/m4/btowc.m4 b/gl/m4/btowc.m4
new file mode 100644
index 0000000..5e031e0
--- /dev/null
+++ b/gl/m4/btowc.m4
@@ -0,0 +1,120 @@
+# btowc.m4 serial 11
+dnl Copyright (C) 2008-2017 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_FUNC_BTOWC],
+[
+  AC_REQUIRE([gl_WCHAR_H_DEFAULTS])
+
+  dnl Check whether <wchar.h> is usable at all, first. Otherwise the test
+  dnl program below may lead to an endless loop. See
+  dnl <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=42440>.
+  AC_REQUIRE([gl_WCHAR_H_INLINE_OK])
+
+  AC_CHECK_FUNCS_ONCE([btowc])
+  if test $ac_cv_func_btowc = no; then
+    HAVE_BTOWC=0
+  else
+
+    AC_REQUIRE([AC_PROG_CC])
+    AC_REQUIRE([gt_LOCALE_FR])
+    AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+
+    dnl Cygwin 1.7.2 btowc('\0') is WEOF, not 0.
+    AC_CACHE_CHECK([whether btowc(0) is correct],
+      [gl_cv_func_btowc_nul],
+      [
+        AC_RUN_IFELSE(
+          [AC_LANG_SOURCE([[
+#include <string.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 ()
+{
+  if (btowc ('\0') != 0)
+    return 1;
+  return 0;
+}]])],
+          [gl_cv_func_btowc_nul=yes],
+          [gl_cv_func_btowc_nul=no],
+          [
+changequote(,)dnl
+           case "$host_os" in
+                      # Guess no on Cygwin.
+             cygwin*) gl_cv_func_btowc_nul="guessing no" ;;
+                      # Guess yes on native Windows.
+             mingw*)  gl_cv_func_btowc_nul="guessing yes" ;;
+                      # Guess yes otherwise.
+             *)       gl_cv_func_btowc_nul="guessing yes" ;;
+           esac
+changequote([,])dnl
+          ])
+      ])
+
+    dnl IRIX 6.5 btowc(EOF) is 0xFF, not WEOF.
+    AC_CACHE_CHECK([whether btowc(EOF) is correct],
+      [gl_cv_func_btowc_eof],
+      [
+        dnl Initial guess, used when cross-compiling or when no suitable locale
+        dnl is present.
+changequote(,)dnl
+        case "$host_os" in
+                  # Guess no on IRIX.
+          irix*)  gl_cv_func_btowc_eof="guessing no" ;;
+                  # Guess yes on native Windows.
+          mingw*) gl_cv_func_btowc_eof="guessing yes" ;;
+                  # Guess yes otherwise.
+          *)      gl_cv_func_btowc_eof="guessing yes" ;;
+        esac
+changequote([,])dnl
+        if test $LOCALE_FR != none; then
+          AC_RUN_IFELSE(
+            [AC_LANG_SOURCE([[
+#include <locale.h>
+#include <string.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 ()
+{
+  if (setlocale (LC_ALL, "$LOCALE_FR") != NULL)
+    {
+      if (btowc (EOF) != WEOF)
+        return 1;
+    }
+  return 0;
+}]])],
+            [gl_cv_func_btowc_eof=yes],
+            [gl_cv_func_btowc_eof=no],
+            [:])
+        fi
+      ])
+
+    case "$gl_cv_func_btowc_nul" in
+      *yes) ;;
+      *) REPLACE_BTOWC=1 ;;
+    esac
+    case "$gl_cv_func_btowc_eof" in
+      *yes) ;;
+      *) REPLACE_BTOWC=1 ;;
+    esac
+  fi
+])
+
+# Prerequisites of lib/btowc.c.
+AC_DEFUN([gl_PREREQ_BTOWC], [
+  :
+])
diff --git a/gl/m4/builtin-expect.m4 b/gl/m4/builtin-expect.m4
new file mode 100644
index 0000000..aa3364b
--- /dev/null
+++ b/gl/m4/builtin-expect.m4
@@ -0,0 +1,49 @@
+dnl Check for __builtin_expect.
+
+dnl Copyright 2016-2017 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl Written by Paul Eggert.
+
+AC_DEFUN([gl___BUILTIN_EXPECT],
+[
+  AC_CACHE_CHECK([for __builtin_expect],
+    [gl_cv___builtin_expect],
+    [AC_LINK_IFELSE(
+       [AC_LANG_SOURCE([[
+         int
+         main (int argc, char **argv)
+         {
+           argc = __builtin_expect (argc, 100);
+           return argv[argc != 100][0];
+         }]])],
+       [gl_cv___builtin_expect=yes],
+       [AC_LINK_IFELSE(
+          [AC_LANG_SOURCE([[
+             #include <builtins.h>
+             int
+             main (int argc, char **argv)
+             {
+               argc = __builtin_expect (argc, 100);
+               return argv[argc != 100][0];
+             }]])],
+          [gl_cv___builtin_expect="in <builtins.h>"],
+          [gl_cv___builtin_expect=no])])])
+  if test "$gl_cv___builtin_expect" = yes; then
+    AC_DEFINE([HAVE___BUILTIN_EXPECT], [1])
+  elif test "$gl_cv___builtin_expect" = "in <builtins.h>"; then
+    AC_DEFINE([HAVE___BUILTIN_EXPECT], [2])
+  fi
+  AH_VERBATIM([HAVE___BUILTIN_EXPECT],
+    [/* Define to 1 if the compiler supports __builtin_expect,
+   and to 2 if <builtins.h> does.  */
+#undef HAVE___BUILTIN_EXPECT
+#ifndef HAVE___BUILTIN_EXPECT
+# define __builtin_expect(e, c) (e)
+#elif HAVE___BUILTIN_EXPECT == 2
+# include <builtins.h>
+#endif
+    ])
+])
diff --git a/gl/m4/byteswap.m4 b/gl/m4/byteswap.m4
new file mode 100644
index 0000000..f20d0f4
--- /dev/null
+++ b/gl/m4/byteswap.m4
@@ -0,0 +1,19 @@
+# byteswap.m4 serial 4
+dnl Copyright (C) 2005, 2007, 2009-2017 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl Written by Oskar Liljeblad.
+
+AC_DEFUN([gl_BYTESWAP],
+[
+  dnl Prerequisites of lib/byteswap.in.h.
+  AC_CHECK_HEADERS([byteswap.h], [
+    BYTESWAP_H=''
+  ], [
+    BYTESWAP_H='byteswap.h'
+  ])
+  AC_SUBST([BYTESWAP_H])
+  AM_CONDITIONAL([GL_GENERATE_BYTESWAP_H], [test -n "$BYTESWAP_H"])
+])
diff --git a/gl/m4/codeset.m4 b/gl/m4/codeset.m4
new file mode 100644
index 0000000..bc98201
--- /dev/null
+++ b/gl/m4/codeset.m4
@@ -0,0 +1,24 @@
+# codeset.m4 serial 5 (gettext-0.18.2)
+dnl Copyright (C) 2000-2002, 2006, 2008-2014, 2016 Free Software Foundation,
+dnl Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+AC_DEFUN([AM_LANGINFO_CODESET],
+[
+  AC_CACHE_CHECK([for nl_langinfo and CODESET], [am_cv_langinfo_codeset],
+    [AC_LINK_IFELSE(
+       [AC_LANG_PROGRAM(
+          [[#include <langinfo.h>]],
+          [[char* cs = nl_langinfo(CODESET); return !cs;]])],
+       [am_cv_langinfo_codeset=yes],
+       [am_cv_langinfo_codeset=no])
+    ])
+  if test $am_cv_langinfo_codeset = yes; then
+    AC_DEFINE([HAVE_LANGINFO_CODESET], [1],
+      [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
+  fi
+])
diff --git a/gl/m4/configmake.m4 b/gl/m4/configmake.m4
new file mode 100644
index 0000000..b783296
--- /dev/null
+++ b/gl/m4/configmake.m4
@@ -0,0 +1,55 @@
+# configmake.m4 serial 2
+dnl Copyright (C) 2010-2017 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+# gl_CONFIGMAKE_PREP
+# ------------------
+# Guarantee all of the standard directory variables, even when used with
+# autoconf 2.59 (datarootdir wasn't supported until 2.59c, and runstatedir
+# in 2.70) or automake 1.9.6 (pkglibexecdir wasn't supported until 1.10b,
+# and runstatedir in 1.14.1).
+AC_DEFUN([gl_CONFIGMAKE_PREP],
+[
+  dnl Technically, datadir should default to datarootdir.  But if
+  dnl autoconf is too old to provide datarootdir, then reversing the
+  dnl definition is a reasonable compromise.  Only AC_SUBST a variable
+  dnl if it was not already defined earlier by autoconf.
+  if test "x$datarootdir" = x; then
+    AC_SUBST([datarootdir], ['${datadir}'])
+  fi
+  dnl Copy the approach used in autoconf 2.60.
+  if test "x$docdir" = x; then
+    AC_SUBST([docdir], [m4_ifset([AC_PACKAGE_TARNAME],
+      ['${datarootdir}/doc/${PACKAGE_TARNAME}'],
+      ['${datarootdir}/doc/${PACKAGE}'])])
+  fi
+  dnl The remaining variables missing from autoconf 2.59 are easier.
+  if test "x$htmldir" = x; then
+    AC_SUBST([htmldir], ['${docdir}'])
+  fi
+  if test "x$dvidir" = x; then
+    AC_SUBST([dvidir], ['${docdir}'])
+  fi
+  if test "x$pdfdir" = x; then
+    AC_SUBST([pdfdir], ['${docdir}'])
+  fi
+  if test "x$psdir" = x; then
+    AC_SUBST([psdir], ['${docdir}'])
+  fi
+  if test "x$lispdir" = x; then
+    AC_SUBST([lispdir], ['${datarootdir}/emacs/site-lisp'])
+  fi
+  if test "x$localedir" = x; then
+    AC_SUBST([localedir], ['${datarootdir}/locale'])
+  fi
+  dnl Added in autoconf 2.70
+  if test "x$runstatedir" = x; then
+    AC_SUBST([runstatedir], ['${localstatedir}/run'])
+  fi
+
+  dnl Automake 1.9.6 only lacks pkglibexecdir; and since 1.11 merely
+  dnl provides it without AC_SUBST, this blind use of AC_SUBST is safe.
+  AC_SUBST([pkglibexecdir], ['${libexecdir}/${PACKAGE}'])
+])
diff --git a/gl/m4/eealloc.m4 b/gl/m4/eealloc.m4
new file mode 100644
index 0000000..96b9bca
--- /dev/null
+++ b/gl/m4/eealloc.m4
@@ -0,0 +1,31 @@
+# eealloc.m4 serial 3
+dnl Copyright (C) 2003, 2009-2017 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_EEALLOC],
+[
+  AC_REQUIRE([gl_EEMALLOC])
+  AC_REQUIRE([gl_EEREALLOC])
+])
+
+AC_DEFUN([gl_EEMALLOC],
+[
+  _AC_FUNC_MALLOC_IF(
+    [gl_cv_func_malloc_0_nonnull=1],
+    [gl_cv_func_malloc_0_nonnull=0])
+  AC_DEFINE_UNQUOTED([MALLOC_0_IS_NONNULL], [$gl_cv_func_malloc_0_nonnull],
+    [If malloc(0) is != NULL, define this to 1.  Otherwise define this
+     to 0.])
+])
+
+AC_DEFUN([gl_EEREALLOC],
+[
+  _AC_FUNC_REALLOC_IF(
+    [gl_cv_func_realloc_0_nonnull=1],
+    [gl_cv_func_realloc_0_nonnull=0])
+  AC_DEFINE_UNQUOTED([REALLOC_0_IS_NONNULL], [$gl_cv_func_realloc_0_nonnull],
+    [If realloc(NULL,0) is != NULL, define this to 1.  Otherwise define this
+     to 0.])
+])
diff --git a/gl/m4/extensions.m4 b/gl/m4/extensions.m4
new file mode 100644
index 0000000..f854338
--- /dev/null
+++ b/gl/m4/extensions.m4
@@ -0,0 +1,183 @@
+# serial 17  -*- Autoconf -*-
+# Enable extensions on systems that normally disable them.
+
+# Copyright (C) 2003, 2006-2017 Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This definition of AC_USE_SYSTEM_EXTENSIONS is stolen from git
+# Autoconf.  Perhaps we can remove this once we can assume Autoconf
+# 2.70 or later everywhere, but since Autoconf mutates rapidly
+# enough in this area it's likely we'll need to redefine
+# AC_USE_SYSTEM_EXTENSIONS for quite some time.
+
+# If autoconf reports a warning
+#     warning: AC_COMPILE_IFELSE was called before AC_USE_SYSTEM_EXTENSIONS
+# or  warning: AC_RUN_IFELSE was called before AC_USE_SYSTEM_EXTENSIONS
+# the fix is
+#   1) to ensure that AC_USE_SYSTEM_EXTENSIONS is never directly invoked
+#      but always AC_REQUIREd,
+#   2) to ensure that for each occurrence of
+#        AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
+#      or
+#        AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
+#      the corresponding gnulib module description has 'extensions' among
+#      its dependencies. This will ensure that the gl_USE_SYSTEM_EXTENSIONS
+#      invocation occurs in gl_EARLY, not in gl_INIT.
+
+# AC_USE_SYSTEM_EXTENSIONS
+# ------------------------
+# Enable extensions on systems that normally disable them,
+# typically due to standards-conformance issues.
+#
+# Remember that #undef in AH_VERBATIM gets replaced with #define by
+# AC_DEFINE.  The goal here is to define all known feature-enabling
+# macros, then, if reports of conflicts are made, disable macros that
+# cause problems on some platforms (such as __EXTENSIONS__).
+AC_DEFUN_ONCE([AC_USE_SYSTEM_EXTENSIONS],
+[AC_BEFORE([$0], [AC_COMPILE_IFELSE])dnl
+AC_BEFORE([$0], [AC_RUN_IFELSE])dnl
+
+  AC_CHECK_HEADER([minix/config.h], [MINIX=yes], [MINIX=])
+  if test "$MINIX" = yes; then
+    AC_DEFINE([_POSIX_SOURCE], [1],
+      [Define to 1 if you need to in order for 'stat' and other
+       things to work.])
+    AC_DEFINE([_POSIX_1_SOURCE], [2],
+      [Define to 2 if the system does not provide POSIX.1 features
+       except with this defined.])
+    AC_DEFINE([_MINIX], [1],
+      [Define to 1 if on MINIX.])
+    AC_DEFINE([_NETBSD_SOURCE], [1],
+      [Define to 1 to make NetBSD features available.  MINIX 3 needs this.])
+  fi
+
+dnl Use a different key than __EXTENSIONS__, as that name broke existing
+dnl configure.ac when using autoheader 2.62.
+  AH_VERBATIM([USE_SYSTEM_EXTENSIONS],
+[/* Enable extensions on AIX 3, Interix.  */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
+#endif
+/* Enable general extensions on macOS.  */
+#ifndef _DARWIN_C_SOURCE
+# undef _DARWIN_C_SOURCE
+#endif
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif
+/* Enable NetBSD extensions on NetBSD.  */
+#ifndef _NETBSD_SOURCE
+# undef _NETBSD_SOURCE
+#endif
+/* Enable OpenBSD extensions on NetBSD.  */
+#ifndef _OPENBSD_SOURCE
+# undef _OPENBSD_SOURCE
+#endif
+/* Enable threading extensions on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-5:2014.  */
+#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__
+# undef __STDC_WANT_IEC_60559_ATTRIBS_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-1:2014.  */
+#ifndef __STDC_WANT_IEC_60559_BFP_EXT__
+# undef __STDC_WANT_IEC_60559_BFP_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-2:2015.  */
+#ifndef __STDC_WANT_IEC_60559_DFP_EXT__
+# undef __STDC_WANT_IEC_60559_DFP_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-4:2015.  */
+#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__
+# undef __STDC_WANT_IEC_60559_FUNCS_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-3:2015.  */
+#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__
+# undef __STDC_WANT_IEC_60559_TYPES_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TR 24731-2:2010.  */
+#ifndef __STDC_WANT_LIB_EXT2__
+# undef __STDC_WANT_LIB_EXT2__
+#endif
+/* Enable extensions specified by ISO/IEC 24747:2009.  */
+#ifndef __STDC_WANT_MATH_SPEC_FUNCS__
+# undef __STDC_WANT_MATH_SPEC_FUNCS__
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable X/Open extensions if necessary.  HP-UX 11.11 defines
+   mbstate_t only if _XOPEN_SOURCE is defined to 500, regardless of
+   whether compiling with -Ae or -D_HPUX_SOURCE=1.  */
+#ifndef _XOPEN_SOURCE
+# undef _XOPEN_SOURCE
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+])
+  AC_CACHE_CHECK([whether it is safe to define __EXTENSIONS__],
+    [ac_cv_safe_to_define___extensions__],
+    [AC_COMPILE_IFELSE(
+       [AC_LANG_PROGRAM([[
+#         define __EXTENSIONS__ 1
+          ]AC_INCLUDES_DEFAULT])],
+       [ac_cv_safe_to_define___extensions__=yes],
+       [ac_cv_safe_to_define___extensions__=no])])
+  test $ac_cv_safe_to_define___extensions__ = yes &&
+    AC_DEFINE([__EXTENSIONS__])
+  AC_DEFINE([_ALL_SOURCE])
+  AC_DEFINE([_DARWIN_C_SOURCE])
+  AC_DEFINE([_GNU_SOURCE])
+  AC_DEFINE([_NETBSD_SOURCE])
+  AC_DEFINE([_OPENBSD_SOURCE])
+  AC_DEFINE([_POSIX_PTHREAD_SEMANTICS])
+  AC_DEFINE([__STDC_WANT_IEC_60559_ATTRIBS_EXT__])
+  AC_DEFINE([__STDC_WANT_IEC_60559_BFP_EXT__])
+  AC_DEFINE([__STDC_WANT_IEC_60559_DFP_EXT__])
+  AC_DEFINE([__STDC_WANT_IEC_60559_FUNCS_EXT__])
+  AC_DEFINE([__STDC_WANT_IEC_60559_TYPES_EXT__])
+  AC_DEFINE([__STDC_WANT_LIB_EXT2__])
+  AC_DEFINE([__STDC_WANT_MATH_SPEC_FUNCS__])
+  AC_DEFINE([_TANDEM_SOURCE])
+  AC_CACHE_CHECK([whether _XOPEN_SOURCE should be defined],
+    [ac_cv_should_define__xopen_source],
+    [ac_cv_should_define__xopen_source=no
+     AC_COMPILE_IFELSE(
+       [AC_LANG_PROGRAM([[
+          #include <wchar.h>
+          mbstate_t x;]])],
+       [],
+       [AC_COMPILE_IFELSE(
+          [AC_LANG_PROGRAM([[
+             #define _XOPEN_SOURCE 500
+             #include <wchar.h>
+             mbstate_t x;]])],
+          [ac_cv_should_define__xopen_source=yes])])])
+  test $ac_cv_should_define__xopen_source = yes &&
+    AC_DEFINE([_XOPEN_SOURCE], [500])
+])# AC_USE_SYSTEM_EXTENSIONS
+
+# gl_USE_SYSTEM_EXTENSIONS
+# ------------------------
+# Enable extensions on systems that normally disable them,
+# typically due to standards-conformance issues.
+AC_DEFUN_ONCE([gl_USE_SYSTEM_EXTENSIONS],
+[
+  dnl Require this macro before AC_USE_SYSTEM_EXTENSIONS.
+  dnl gnulib does not need it. But if it gets required by third-party macros
+  dnl after AC_USE_SYSTEM_EXTENSIONS is required, autoconf 2.62..2.63 emit a
+  dnl warning: "AC_COMPILE_IFELSE was called before AC_USE_SYSTEM_EXTENSIONS".
+  dnl Note: We can do this only for one of the macros AC_AIX, AC_GNU_SOURCE,
+  dnl AC_MINIX. If people still use AC_AIX or AC_MINIX, they are out of luck.
+  AC_REQUIRE([AC_GNU_SOURCE])
+
+  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
+])
diff --git a/gl/m4/extern-inline.m4 b/gl/m4/extern-inline.m4
new file mode 100644
index 0000000..00f9609
--- /dev/null
+++ b/gl/m4/extern-inline.m4
@@ -0,0 +1,102 @@
+dnl 'extern inline' a la ISO C99.
+
+dnl Copyright 2012-2017 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_EXTERN_INLINE],
+[
+  AH_VERBATIM([extern_inline],
+[/* Please see the Gnulib manual for how to use these macros.
+
+   Suppress extern inline with HP-UX cc, as it appears to be broken; see
+   <http://lists.gnu.org/archive/html/bug-texinfo/2013-02/msg00030.html>.
+
+   Suppress extern inline with Sun C in standards-conformance mode, as it
+   mishandles inline functions that call each other.  E.g., for 'inline void f
+   (void) { } inline void g (void) { f (); }', c99 incorrectly complains
+   'reference to static identifier "f" in extern inline function'.
+   This bug was observed with Sun C 5.12 SunOS_i386 2011/11/16.
+
+   Suppress extern inline (with or without __attribute__ ((__gnu_inline__)))
+   on configurations that mistakenly use 'static inline' to implement
+   functions or macros in standard C headers like <ctype.h>.  For example,
+   if isdigit is mistakenly implemented via a static inline function,
+   a program containing an extern inline function that calls isdigit
+   may not work since the C standard prohibits extern inline functions
+   from calling static functions.  This bug is known to occur on:
+
+     OS X 10.8 and earlier; see:
+     http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00023.html
+
+     DragonFly; see
+     http://muscles.dragonflybsd.org/bulk/bleeding-edge-potential/latest-per-pkg/ah-tty-0.3.12.log
+
+     FreeBSD; see:
+     http://lists.gnu.org/archive/html/bug-gnulib/2014-07/msg00104.html
+
+   OS X 10.9 has a macro __header_inline indicating the bug is fixed for C and
+   for clang but remains for g++; see <http://trac.macports.org/ticket/41033>.
+   Assume DragonFly and FreeBSD will be similar.  */
+#if (((defined __APPLE__ && defined __MACH__) \
+      || defined __DragonFly__ || defined __FreeBSD__) \
+     && (defined __header_inline \
+         ? (defined __cplusplus && defined __GNUC_STDC_INLINE__ \
+            && ! defined __clang__) \
+         : ((! defined _DONT_USE_CTYPE_INLINE_ \
+             && (defined __GNUC__ || defined __cplusplus)) \
+            || (defined _FORTIFY_SOURCE && 0 < _FORTIFY_SOURCE \
+                && defined __GNUC__ && ! defined __cplusplus))))
+# define _GL_EXTERN_INLINE_STDHEADER_BUG
+#endif
+#if ((__GNUC__ \
+      ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \
+      : (199901L <= __STDC_VERSION__ \
+         && !defined __HP_cc \
+         && !defined __PGI \
+         && !(defined __SUNPRO_C && __STDC__))) \
+     && !defined _GL_EXTERN_INLINE_STDHEADER_BUG)
+# define _GL_INLINE inline
+# define _GL_EXTERN_INLINE extern inline
+# define _GL_EXTERN_INLINE_IN_USE
+#elif (2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __STRICT_ANSI__ \
+       && !defined _GL_EXTERN_INLINE_STDHEADER_BUG)
+# if defined __GNUC_GNU_INLINE__ && __GNUC_GNU_INLINE__
+   /* __gnu_inline__ suppresses a GCC 4.2 diagnostic.  */
+#  define _GL_INLINE extern inline __attribute__ ((__gnu_inline__))
+# else
+#  define _GL_INLINE extern inline
+# endif
+# define _GL_EXTERN_INLINE extern
+# define _GL_EXTERN_INLINE_IN_USE
+#else
+# define _GL_INLINE static _GL_UNUSED
+# define _GL_EXTERN_INLINE static _GL_UNUSED
+#endif
+
+/* In GCC 4.6 (inclusive) to 5.1 (exclusive),
+   suppress bogus "no previous prototype for 'FOO'"
+   and "no previous declaration for 'FOO'" diagnostics,
+   when FOO is an inline function in the header; see
+   <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=54113> and
+   <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63877>.  */
+#if __GNUC__ == 4 && 6 <= __GNUC_MINOR__
+# if defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__
+#  define _GL_INLINE_HEADER_CONST_PRAGMA
+# else
+#  define _GL_INLINE_HEADER_CONST_PRAGMA \
+     _Pragma ("GCC diagnostic ignored \"-Wsuggest-attribute=const\"")
+# endif
+# define _GL_INLINE_HEADER_BEGIN \
+    _Pragma ("GCC diagnostic push") \
+    _Pragma ("GCC diagnostic ignored \"-Wmissing-prototypes\"") \
+    _Pragma ("GCC diagnostic ignored \"-Wmissing-declarations\"") \
+    _GL_INLINE_HEADER_CONST_PRAGMA
+# define _GL_INLINE_HEADER_END \
+    _Pragma ("GCC diagnostic pop")
+#else
+# define _GL_INLINE_HEADER_BEGIN
+# define _GL_INLINE_HEADER_END
+#endif])
+])
diff --git a/gl/m4/fcntl-o.m4 b/gl/m4/fcntl-o.m4
new file mode 100644
index 0000000..b388d89
--- /dev/null
+++ b/gl/m4/fcntl-o.m4
@@ -0,0 +1,141 @@
+# fcntl-o.m4 serial 5
+dnl Copyright (C) 2006, 2009-2017 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl Written by Paul Eggert.
+
+# Test whether the flags O_NOATIME and O_NOFOLLOW actually work.
+# Define HAVE_WORKING_O_NOATIME to 1 if O_NOATIME works, or to 0 otherwise.
+# Define HAVE_WORKING_O_NOFOLLOW to 1 if O_NOFOLLOW works, or to 0 otherwise.
+AC_DEFUN([gl_FCNTL_O_FLAGS],
+[
+  dnl Persuade glibc <fcntl.h> to define O_NOATIME and O_NOFOLLOW.
+  dnl AC_USE_SYSTEM_EXTENSIONS was introduced in autoconf 2.60 and obsoletes
+  dnl AC_GNU_SOURCE.
+  m4_ifdef([AC_USE_SYSTEM_EXTENSIONS],
+    [AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])],
+    [AC_REQUIRE([AC_GNU_SOURCE])])
+
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+  AC_CHECK_HEADERS_ONCE([unistd.h])
+  AC_CHECK_FUNCS_ONCE([symlink])
+  AC_CACHE_CHECK([for working fcntl.h], [gl_cv_header_working_fcntl_h],
+    [AC_RUN_IFELSE(
+       [AC_LANG_PROGRAM(
+          [[#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 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;]])],
+       [gl_cv_header_working_fcntl_h=yes],
+       [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],
+       [case "$host_os" in
+                  # Guess 'no' on native Windows.
+          mingw*) gl_cv_header_working_fcntl_h='no' ;;
+          *)      gl_cv_header_working_fcntl_h=cross-compiling ;;
+        esac
+       ])
+    ])
+
+  case $gl_cv_header_working_fcntl_h in #(
+  *O_NOATIME* | no | cross-compiling) ac_val=0;; #(
+  *) ac_val=1;;
+  esac
+  AC_DEFINE_UNQUOTED([HAVE_WORKING_O_NOATIME], [$ac_val],
+    [Define to 1 if O_NOATIME works.])
+
+  case $gl_cv_header_working_fcntl_h in #(
+  *O_NOFOLLOW* | no | cross-compiling) ac_val=0;; #(
+  *) ac_val=1;;
+  esac
+  AC_DEFINE_UNQUOTED([HAVE_WORKING_O_NOFOLLOW], [$ac_val],
+    [Define to 1 if O_NOFOLLOW works.])
+])
diff --git a/gl/m4/fcntl_h.m4 b/gl/m4/fcntl_h.m4
new file mode 100644
index 0000000..09c21ef
--- /dev/null
+++ b/gl/m4/fcntl_h.m4
@@ -0,0 +1,50 @@
+# serial 15
+# Configure fcntl.h.
+dnl Copyright (C) 2006-2007, 2009-2017 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl Written by Paul Eggert.
+
+AC_DEFUN([gl_FCNTL_H],
+[
+  AC_REQUIRE([gl_FCNTL_H_DEFAULTS])
+  AC_REQUIRE([gl_FCNTL_O_FLAGS])
+  gl_NEXT_HEADERS([fcntl.h])
+
+  dnl Ensure the type pid_t gets defined.
+  AC_REQUIRE([AC_TYPE_PID_T])
+
+  dnl Ensure the type mode_t gets defined.
+  AC_REQUIRE([AC_TYPE_MODE_T])
+
+  dnl Check for declarations of anything we want to poison if the
+  dnl corresponding gnulib module is not in use, if it is not common
+  dnl enough to be declared everywhere.
+  gl_WARN_ON_USE_PREPARE([[#include <fcntl.h>
+    ]], [fcntl openat])
+])
+
+AC_DEFUN([gl_FCNTL_MODULE_INDICATOR],
+[
+  dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
+  AC_REQUIRE([gl_FCNTL_H_DEFAULTS])
+  gl_MODULE_INDICATOR_SET_VARIABLE([$1])
+  dnl Define it also as a C macro, for the benefit of the unit tests.
+  gl_MODULE_INDICATOR_FOR_TESTS([$1])
+])
+
+AC_DEFUN([gl_FCNTL_H_DEFAULTS],
+[
+  GNULIB_FCNTL=0;        AC_SUBST([GNULIB_FCNTL])
+  GNULIB_NONBLOCKING=0;  AC_SUBST([GNULIB_NONBLOCKING])
+  GNULIB_OPEN=0;         AC_SUBST([GNULIB_OPEN])
+  GNULIB_OPENAT=0;       AC_SUBST([GNULIB_OPENAT])
+  dnl Assume proper GNU behavior unless another module says otherwise.
+  HAVE_FCNTL=1;          AC_SUBST([HAVE_FCNTL])
+  HAVE_OPENAT=1;         AC_SUBST([HAVE_OPENAT])
+  REPLACE_FCNTL=0;       AC_SUBST([REPLACE_FCNTL])
+  REPLACE_OPEN=0;        AC_SUBST([REPLACE_OPEN])
+  REPLACE_OPENAT=0;      AC_SUBST([REPLACE_OPENAT])
+])
diff --git a/gl/m4/gettimeofday.m4 b/gl/m4/gettimeofday.m4
new file mode 100644
index 0000000..efa114d
--- /dev/null
+++ b/gl/m4/gettimeofday.m4
@@ -0,0 +1,126 @@
+# serial 24
+
+# Copyright (C) 2001-2003, 2005, 2007, 2009-2017 Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+dnl From Jim Meyering.
+
+AC_DEFUN([gl_FUNC_GETTIMEOFDAY],
+[
+  AC_REQUIRE([gl_HEADER_SYS_TIME_H_DEFAULTS])
+  AC_REQUIRE([AC_C_RESTRICT])
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_REQUIRE([gl_HEADER_SYS_TIME_H])
+  AC_CHECK_FUNCS_ONCE([gettimeofday])
+
+  gl_gettimeofday_timezone=void
+  if test $ac_cv_func_gettimeofday != yes; then
+    HAVE_GETTIMEOFDAY=0
+  else
+    gl_FUNC_GETTIMEOFDAY_CLOBBER
+    AC_CACHE_CHECK([for gettimeofday with POSIX signature],
+      [gl_cv_func_gettimeofday_posix_signature],
+      [AC_COMPILE_IFELSE(
+         [AC_LANG_PROGRAM(
+            [[#include <sys/time.h>
+              struct timeval c;
+              int gettimeofday (struct timeval *restrict, void *restrict);
+            ]],
+            [[/* glibc uses struct timezone * rather than the POSIX void *
+                 if _GNU_SOURCE is defined.  However, since the only portable
+                 use of gettimeofday uses NULL as the second parameter, and
+                 since the glibc definition is actually more typesafe, it is
+                 not worth wrapping this to get a compliant signature.  */
+              int (*f) (struct timeval *restrict, void *restrict)
+                = gettimeofday;
+              int x = f (&c, 0);
+              return !(x | c.tv_sec | c.tv_usec);
+            ]])],
+          [gl_cv_func_gettimeofday_posix_signature=yes],
+          [AC_COMPILE_IFELSE(
+            [AC_LANG_PROGRAM(
+              [[#include <sys/time.h>
+int gettimeofday (struct timeval *restrict, struct timezone *restrict);
+              ]])],
+            [gl_cv_func_gettimeofday_posix_signature=almost],
+            [gl_cv_func_gettimeofday_posix_signature=no])])])
+    if test $gl_cv_func_gettimeofday_posix_signature = almost; then
+      gl_gettimeofday_timezone='struct timezone'
+    elif test $gl_cv_func_gettimeofday_posix_signature != yes; then
+      REPLACE_GETTIMEOFDAY=1
+    fi
+    dnl If we override 'struct timeval', we also have to override gettimeofday.
+    if test $REPLACE_STRUCT_TIMEVAL = 1; then
+      REPLACE_GETTIMEOFDAY=1
+    fi
+    dnl On mingw, the original gettimeofday has only a precision of 15.6
+    dnl milliseconds. So override it.
+    case "$host_os" in
+      mingw*) REPLACE_GETTIMEOFDAY=1 ;;
+    esac
+  fi
+  AC_DEFINE_UNQUOTED([GETTIMEOFDAY_TIMEZONE], [$gl_gettimeofday_timezone],
+    [Define this to 'void' or 'struct timezone' to match the system's
+     declaration of the second argument to gettimeofday.])
+])
+
+
+dnl See if gettimeofday clobbers the static buffer that localtime uses
+dnl for its return value.  The gettimeofday function from Mac OS X 10.0.4
+dnl (i.e., Darwin 1.3.7) has this problem.
+dnl
+dnl If it does, then arrange to use gettimeofday and localtime only via
+dnl the wrapper functions that work around the problem.
+
+AC_DEFUN([gl_FUNC_GETTIMEOFDAY_CLOBBER],
+[
+ AC_REQUIRE([gl_HEADER_SYS_TIME_H])
+ AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+ AC_REQUIRE([gl_LOCALTIME_BUFFER_DEFAULTS])
+
+ AC_CACHE_CHECK([whether gettimeofday clobbers localtime buffer],
+  [gl_cv_func_gettimeofday_clobber],
+  [AC_RUN_IFELSE(
+     [AC_LANG_PROGRAM(
+        [[#include <string.h>
+          #include <sys/time.h>
+          #include <time.h>
+          #include <stdlib.h>
+        ]],
+        [[
+          time_t t = 0;
+          struct tm *lt;
+          struct tm saved_lt;
+          struct timeval tv;
+          lt = localtime (&t);
+          saved_lt = *lt;
+          gettimeofday (&tv, NULL);
+          return memcmp (lt, &saved_lt, sizeof (struct tm)) != 0;
+        ]])],
+     [gl_cv_func_gettimeofday_clobber=no],
+     [gl_cv_func_gettimeofday_clobber=yes],
+     [# When cross-compiling:
+      case "$host_os" in
+                # Guess all is fine on glibc systems.
+        *-gnu*) gl_cv_func_gettimeofday_clobber="guessing no" ;;
+                # Guess no on native Windows.
+        mingw*) gl_cv_func_gettimeofday_clobber="guessing no" ;;
+                # If we don't know, assume the worst.
+        *)      gl_cv_func_gettimeofday_clobber="guessing yes" ;;
+      esac
+     ])])
+
+ case "$gl_cv_func_gettimeofday_clobber" in
+   *yes)
+     REPLACE_GETTIMEOFDAY=1
+     AC_DEFINE([GETTIMEOFDAY_CLOBBERS_LOCALTIME], [1],
+       [Define if gettimeofday clobbers the localtime buffer.])
+     gl_LOCALTIME_BUFFER_NEEDED
+     ;;
+ esac
+])
+
+# Prerequisites of lib/gettimeofday.c.
+AC_DEFUN([gl_PREREQ_GETTIMEOFDAY], [:])
diff --git a/gl/m4/glibc21.m4 b/gl/m4/glibc21.m4
new file mode 100644
index 0000000..2e30ed6
--- /dev/null
+++ b/gl/m4/glibc21.m4
@@ -0,0 +1,34 @@
+# glibc21.m4 serial 5
+dnl Copyright (C) 2000-2002, 2004, 2008, 2010-2017 Free Software Foundation,
+dnl Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+# Test for the GNU C Library, version 2.1 or newer, or uClibc.
+# From Bruno Haible.
+
+AC_DEFUN([gl_GLIBC21],
+  [
+    AC_CACHE_CHECK([whether we are using the GNU C Library >= 2.1 or uClibc],
+      [ac_cv_gnu_library_2_1],
+      [AC_EGREP_CPP([Lucky],
+        [
+#include <features.h>
+#ifdef __GNU_LIBRARY__
+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
+  Lucky GNU user
+ #endif
+#endif
+#ifdef __UCLIBC__
+ Lucky user
+#endif
+        ],
+        [ac_cv_gnu_library_2_1=yes],
+        [ac_cv_gnu_library_2_1=no])
+      ]
+    )
+    AC_SUBST([GLIBC21])
+    GLIBC21="$ac_cv_gnu_library_2_1"
+  ]
+)
diff --git a/gl/m4/gnulib-cache.m4 b/gl/m4/gnulib-cache.m4
new file mode 100644
index 0000000..a69665a
--- /dev/null
+++ b/gl/m4/gnulib-cache.m4
@@ -0,0 +1,51 @@
+# Copyright (C) 2002-2017 Free Software Foundation, Inc.
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this file.  If not, see <http://www.gnu.org/licenses/>.
+#
+# As a special exception to the GNU General Public License,
+# this file may be distributed as part of a program that
+# contains a configuration script generated by Autoconf, under
+# the same distribution terms as the rest of that program.
+#
+# Generated by gnulib-tool.
+#
+# This file represents the specification of how gnulib-tool is used.
+# It acts as a cache: It is written and read by gnulib-tool.
+# In projects that use version control, this file is meant to be put under
+# version control, like the configure.ac and various Makefile.am files.
+
+
+# Specification in the form of a command-line invocation:
+#   gnulib-tool --import --lib=libgnu --source-base=gl --m4-base=gl/m4 --doc-base=gl/doc --tests-base=tests --aux-dir=conf --lgpl --no-conditional-dependencies --libtool --macro-prefix=gl byteswap mkstemps regex
+
+# Specification in the form of a few gnulib-tool.m4 macro invocations:
+gl_LOCAL_DIR([])
+gl_MODULES([
+  byteswap
+  mkstemps
+  regex
+])
+gl_AVOID([])
+gl_SOURCE_BASE([gl])
+gl_M4_BASE([gl/m4])
+gl_PO_BASE([])
+gl_DOC_BASE([gl/doc])
+gl_TESTS_BASE([tests])
+gl_LIB([libgnu])
+gl_LGPL
+gl_MAKEFILE_NAME([])
+gl_LIBTOOL
+gl_MACRO_PREFIX([gl])
+gl_PO_DOMAIN([])
+gl_WITNESS_C_MACRO([])
diff --git a/gl/m4/gnulib-common.m4 b/gl/m4/gnulib-common.m4
new file mode 100644
index 0000000..36f2acc
--- /dev/null
+++ b/gl/m4/gnulib-common.m4
@@ -0,0 +1,467 @@
+# gnulib-common.m4 serial 38
+dnl Copyright (C) 2007-2017 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+# gl_COMMON
+# is expanded unconditionally through gnulib-tool magic.
+AC_DEFUN([gl_COMMON], [
+  dnl Use AC_REQUIRE here, so that the code is expanded once only.
+  AC_REQUIRE([gl_00GNULIB])
+  AC_REQUIRE([gl_COMMON_BODY])
+])
+AC_DEFUN([gl_COMMON_BODY], [
+  AH_VERBATIM([_Noreturn],
+[/* The _Noreturn keyword of C11.  */
+#if ! (defined _Noreturn \
+       || (defined __STDC_VERSION__ && 201112 <= __STDC_VERSION__))
+# if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__) \
+      || 0x5110 <= __SUNPRO_C)
+#  define _Noreturn __attribute__ ((__noreturn__))
+# elif defined _MSC_VER && 1200 <= _MSC_VER
+#  define _Noreturn __declspec (noreturn)
+# else
+#  define _Noreturn
+# endif
+#endif
+])
+  AH_VERBATIM([isoc99_inline],
+[/* Work around a bug in Apple GCC 4.0.1 build 5465: In C99 mode, it supports
+   the ISO C 99 semantics of 'extern inline' (unlike the GNU C semantics of
+   earlier versions), but does not display it by setting __GNUC_STDC_INLINE__.
+   __APPLE__ && __MACH__ test for Mac OS X.
+   __APPLE_CC__ tests for the Apple compiler and its version.
+   __STDC_VERSION__ tests for the C99 mode.  */
+#if defined __APPLE__ && defined __MACH__ && __APPLE_CC__ >= 5465 && !defined __cplusplus && __STDC_VERSION__ >= 199901L && !defined __GNUC_STDC_INLINE__
+# define __GNUC_STDC_INLINE__ 1
+#endif])
+  AH_VERBATIM([unused_parameter],
+[/* Define as a marker that can be attached to declarations that might not
+    be used.  This helps to reduce warnings, such as from
+    GCC -Wunused-parameter.  */
+#if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
+# define _GL_UNUSED __attribute__ ((__unused__))
+#else
+# define _GL_UNUSED
+#endif
+/* The name _UNUSED_PARAMETER_ is an earlier spelling, although the name
+   is a misnomer outside of parameter lists.  */
+#define _UNUSED_PARAMETER_ _GL_UNUSED
+
+/* gcc supports the "unused" attribute on possibly unused labels, and
+   g++ has since version 4.5.  Note to support C++ as well as C,
+   _GL_UNUSED_LABEL should be used with a trailing ;  */
+#if !defined __cplusplus || __GNUC__ > 4 \
+    || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
+# define _GL_UNUSED_LABEL _GL_UNUSED
+#else
+# define _GL_UNUSED_LABEL
+#endif
+
+/* The __pure__ attribute was added in gcc 2.96.  */
+#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
+# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__))
+#else
+# define _GL_ATTRIBUTE_PURE /* empty */
+#endif
+
+/* The __const__ attribute was added in gcc 2.95.  */
+#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
+# define _GL_ATTRIBUTE_CONST __attribute__ ((__const__))
+#else
+# define _GL_ATTRIBUTE_CONST /* empty */
+#endif
+])
+  dnl Preparation for running test programs:
+  dnl Tell glibc to write diagnostics from -D_FORTIFY_SOURCE=2 to stderr, not
+  dnl to /dev/tty, so they can be redirected to log files.  Such diagnostics
+  dnl arise e.g., in the macros gl_PRINTF_DIRECTIVE_N, gl_SNPRINTF_DIRECTIVE_N.
+  LIBC_FATAL_STDERR_=1
+  export LIBC_FATAL_STDERR_
+])
+
+# gl_MODULE_INDICATOR_CONDITION
+# expands to a C preprocessor expression that evaluates to 1 or 0, depending
+# whether a gnulib module that has been requested shall be considered present
+# or not.
+m4_define([gl_MODULE_INDICATOR_CONDITION], [1])
+
+# gl_MODULE_INDICATOR_SET_VARIABLE([modulename])
+# sets the shell variable that indicates the presence of the given module to
+# a C preprocessor expression that will evaluate to 1.
+AC_DEFUN([gl_MODULE_INDICATOR_SET_VARIABLE],
+[
+  gl_MODULE_INDICATOR_SET_VARIABLE_AUX(
+    [GNULIB_[]m4_translit([[$1]],
+                          [abcdefghijklmnopqrstuvwxyz./-],
+                          [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])],
+    [gl_MODULE_INDICATOR_CONDITION])
+])
+
+# gl_MODULE_INDICATOR_SET_VARIABLE_AUX([variable])
+# modifies the shell variable to include the gl_MODULE_INDICATOR_CONDITION.
+# The shell variable's value is a C preprocessor expression that evaluates
+# to 0 or 1.
+AC_DEFUN([gl_MODULE_INDICATOR_SET_VARIABLE_AUX],
+[
+  m4_if(m4_defn([gl_MODULE_INDICATOR_CONDITION]), [1],
+    [
+     dnl Simplify the expression VALUE || 1 to 1.
+     $1=1
+    ],
+    [gl_MODULE_INDICATOR_SET_VARIABLE_AUX_OR([$1],
+                                             [gl_MODULE_INDICATOR_CONDITION])])
+])
+
+# gl_MODULE_INDICATOR_SET_VARIABLE_AUX_OR([variable], [condition])
+# modifies the shell variable to include the given condition.  The shell
+# variable's value is a C preprocessor expression that evaluates to 0 or 1.
+AC_DEFUN([gl_MODULE_INDICATOR_SET_VARIABLE_AUX_OR],
+[
+  dnl Simplify the expression 1 || CONDITION to 1.
+  if test "$[]$1" != 1; then
+    dnl Simplify the expression 0 || CONDITION to CONDITION.
+    if test "$[]$1" = 0; then
+      $1=$2
+    else
+      $1="($[]$1 || $2)"
+    fi
+  fi
+])
+
+# gl_MODULE_INDICATOR([modulename])
+# defines a C macro indicating the presence of the given module
+# in a location where it can be used.
+#                                             |  Value  |   Value   |
+#                                             | in lib/ | in tests/ |
+# --------------------------------------------+---------+-----------+
+# Module present among main modules:          |    1    |     1     |
+# --------------------------------------------+---------+-----------+
+# Module present among tests-related modules: |    0    |     1     |
+# --------------------------------------------+---------+-----------+
+# Module not present at all:                  |    0    |     0     |
+# --------------------------------------------+---------+-----------+
+AC_DEFUN([gl_MODULE_INDICATOR],
+[
+  AC_DEFINE_UNQUOTED([GNULIB_]m4_translit([[$1]],
+      [abcdefghijklmnopqrstuvwxyz./-],
+      [ABCDEFGHIJKLMNOPQRSTUVWXYZ___]),
+    [gl_MODULE_INDICATOR_CONDITION],
+    [Define to a C preprocessor expression that evaluates to 1 or 0,
+     depending whether the gnulib module $1 shall be considered present.])
+])
+
+# gl_MODULE_INDICATOR_FOR_TESTS([modulename])
+# defines a C macro indicating the presence of the given module
+# in lib or tests. This is useful to determine whether the module
+# should be tested.
+#                                             |  Value  |   Value   |
+#                                             | in lib/ | in tests/ |
+# --------------------------------------------+---------+-----------+
+# Module present among main modules:          |    1    |     1     |
+# --------------------------------------------+---------+-----------+
+# Module present among tests-related modules: |    1    |     1     |
+# --------------------------------------------+---------+-----------+
+# Module not present at all:                  |    0    |     0     |
+# --------------------------------------------+---------+-----------+
+AC_DEFUN([gl_MODULE_INDICATOR_FOR_TESTS],
+[
+  AC_DEFINE([GNULIB_TEST_]m4_translit([[$1]],
+      [abcdefghijklmnopqrstuvwxyz./-],
+      [ABCDEFGHIJKLMNOPQRSTUVWXYZ___]), [1],
+    [Define to 1 when the gnulib module $1 should be tested.])
+])
+
+# gl_ASSERT_NO_GNULIB_POSIXCHECK
+# asserts that there will never be a need to #define GNULIB_POSIXCHECK.
+# and thereby enables an optimization of configure and config.h.
+# Used by Emacs.
+AC_DEFUN([gl_ASSERT_NO_GNULIB_POSIXCHECK],
+[
+  dnl Override gl_WARN_ON_USE_PREPARE.
+  dnl But hide this definition from 'aclocal'.
+  AC_DEFUN([gl_W][ARN_ON_USE_PREPARE], [])
+])
+
+# gl_ASSERT_NO_GNULIB_TESTS
+# asserts that there will be no gnulib tests in the scope of the configure.ac
+# and thereby enables an optimization of config.h.
+# Used by Emacs.
+AC_DEFUN([gl_ASSERT_NO_GNULIB_TESTS],
+[
+  dnl Override gl_MODULE_INDICATOR_FOR_TESTS.
+  AC_DEFUN([gl_MODULE_INDICATOR_FOR_TESTS], [])
+])
+
+# Test whether <features.h> exists.
+# Set HAVE_FEATURES_H.
+AC_DEFUN([gl_FEATURES_H],
+[
+  AC_CHECK_HEADERS_ONCE([features.h])
+  if test $ac_cv_header_features_h = yes; then
+    HAVE_FEATURES_H=1
+  else
+    HAVE_FEATURES_H=0
+  fi
+  AC_SUBST([HAVE_FEATURES_H])
+])
+
+# m4_foreach_w
+# is a backport of autoconf-2.59c's m4_foreach_w.
+# Remove this macro when we can assume autoconf >= 2.60.
+m4_ifndef([m4_foreach_w],
+  [m4_define([m4_foreach_w],
+    [m4_foreach([$1], m4_split(m4_normalize([$2]), [ ]), [$3])])])
+
+# AS_VAR_IF(VAR, VALUE, [IF-MATCH], [IF-NOT-MATCH])
+# ----------------------------------------------------
+# Backport of autoconf-2.63b's macro.
+# Remove this macro when we can assume autoconf >= 2.64.
+m4_ifndef([AS_VAR_IF],
+[m4_define([AS_VAR_IF],
+[AS_IF([test x"AS_VAR_GET([$1])" = x""$2], [$3], [$4])])])
+
+# gl_PROG_CC_C99
+# Modifies the value of the shell variable CC in an attempt to make $CC
+# understand ISO C99 source code.
+# This is like AC_PROG_CC_C99, except that
+# - AC_PROG_CC_C99 did not exist in Autoconf versions < 2.60,
+# - AC_PROG_CC_C99 does not mix well with AC_PROG_CC_STDC
+#   <http://lists.gnu.org/archive/html/bug-gnulib/2011-09/msg00367.html>,
+#   but many more packages use AC_PROG_CC_STDC than AC_PROG_CC_C99
+#   <http://lists.gnu.org/archive/html/bug-gnulib/2011-09/msg00441.html>.
+# Remaining problems:
+# - When AC_PROG_CC_STDC is invoked twice, it adds the C99 enabling options
+#   to CC twice
+#   <http://lists.gnu.org/archive/html/bug-gnulib/2011-09/msg00431.html>.
+# - AC_PROG_CC_STDC is likely to change now that C11 is an ISO standard.
+AC_DEFUN([gl_PROG_CC_C99],
+[
+  dnl Change that version number to the minimum Autoconf version that supports
+  dnl mixing AC_PROG_CC_C99 calls with AC_PROG_CC_STDC calls.
+  m4_version_prereq([9.0],
+    [AC_REQUIRE([AC_PROG_CC_C99])],
+    [AC_REQUIRE([AC_PROG_CC_STDC])])
+])
+
+# gl_PROG_AR_RANLIB
+# Determines the values for AR, ARFLAGS, RANLIB that fit with the compiler.
+# The user can set the variables AR, ARFLAGS, RANLIB if he wants to override
+# the values.
+AC_DEFUN([gl_PROG_AR_RANLIB],
+[
+  dnl Minix 3 comes with two toolchains: The Amsterdam Compiler Kit compiler
+  dnl as "cc", and GCC as "gcc". They have different object file formats and
+  dnl library formats. In particular, the GNU binutils programs ar and ranlib
+  dnl produce libraries that work only with gcc, not with cc.
+  AC_REQUIRE([AC_PROG_CC])
+  dnl The '][' hides this use from 'aclocal'.
+  AC_BEFORE([$0], [A][M_PROG_AR])
+  AC_CACHE_CHECK([for Minix Amsterdam compiler], [gl_cv_c_amsterdam_compiler],
+    [
+      AC_EGREP_CPP([Amsterdam],
+        [
+#ifdef __ACK__
+Amsterdam
+#endif
+        ],
+        [gl_cv_c_amsterdam_compiler=yes],
+        [gl_cv_c_amsterdam_compiler=no])
+    ])
+
+  dnl Don't compete with AM_PROG_AR's decision about AR/ARFLAGS if we are not
+  dnl building with __ACK__.
+  if test $gl_cv_c_amsterdam_compiler = yes; then
+    if test -z "$AR"; then
+      AR='cc -c.a'
+    fi
+    if test -z "$ARFLAGS"; then
+      ARFLAGS='-o'
+    fi
+  else
+    dnl AM_PROG_AR was added in automake v1.11.2.  AM_PROG_AR does not AC_SUBST
+    dnl ARFLAGS variable (it is filed into Makefile.in directly by automake
+    dnl script on-demand, if not specified by ./configure of course).
+    dnl Don't AC_REQUIRE the AM_PROG_AR otherwise the code for __ACK__ above
+    dnl will be ignored.  Also, pay attention to call AM_PROG_AR in else block
+    dnl because AM_PROG_AR is written so it could re-set AR variable even for
+    dnl __ACK__.  It may seem like its easier to avoid calling the macro here,
+    dnl but we need to AC_SUBST both AR/ARFLAGS (thus those must have some good
+    dnl default value and automake should usually know them).
+    dnl
+    dnl The '][' hides this use from 'aclocal'.
+    m4_ifdef([A][M_PROG_AR], [A][M_PROG_AR], [:])
+  fi
+
+  dnl In case the code above has not helped with setting AR/ARFLAGS, use
+  dnl Automake-documented default values for AR and ARFLAGS, but prefer
+  dnl ${host}-ar over ar (useful for cross-compiling).
+  AC_CHECK_TOOL([AR], [ar], [ar])
+  if test -z "$ARFLAGS"; then
+    ARFLAGS='cr'
+  fi
+
+  AC_SUBST([AR])
+  AC_SUBST([ARFLAGS])
+  if test -z "$RANLIB"; then
+    if test $gl_cv_c_amsterdam_compiler = yes; then
+      RANLIB=':'
+    else
+      dnl Use the ranlib program if it is available.
+      AC_PROG_RANLIB
+    fi
+  fi
+  AC_SUBST([RANLIB])
+])
+
+# AC_PROG_MKDIR_P
+# is a backport of autoconf-2.60's AC_PROG_MKDIR_P, with a fix
+# for interoperability with automake-1.9.6 from autoconf-2.62.
+# Remove this macro when we can assume autoconf >= 2.62 or
+# autoconf >= 2.60 && automake >= 1.10.
+# AC_AUTOCONF_VERSION was introduced in 2.62, so use that as the witness.
+m4_ifndef([AC_AUTOCONF_VERSION],[
+m4_ifdef([AC_PROG_MKDIR_P], [
+  dnl For automake-1.9.6 && autoconf < 2.62: Ensure MKDIR_P is AC_SUBSTed.
+  m4_define([AC_PROG_MKDIR_P],
+    m4_defn([AC_PROG_MKDIR_P])[
+    AC_SUBST([MKDIR_P])])], [
+  dnl For autoconf < 2.60: Backport of AC_PROG_MKDIR_P.
+  AC_DEFUN_ONCE([AC_PROG_MKDIR_P],
+    [AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
+     MKDIR_P='$(mkdir_p)'
+     AC_SUBST([MKDIR_P])])])
+])
+
+# AC_C_RESTRICT
+# This definition is copied from post-2.69 Autoconf and overrides the
+# AC_C_RESTRICT macro from autoconf 2.60..2.69.  It can be removed
+# once autoconf >= 2.70 can be assumed.  It's painful to check version
+# numbers, and in practice this macro is more up-to-date than Autoconf
+# is, so override Autoconf unconditionally.
+AC_DEFUN([AC_C_RESTRICT],
+[AC_CACHE_CHECK([for C/C++ restrict keyword], [ac_cv_c_restrict],
+  [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
+     AC_COMPILE_IFELSE(
+      [AC_LANG_PROGRAM(
+	 [[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 s[1];
+	   int *$ac_kw t = s;
+	   t[0] = 0;
+	   return foo (t) + bar (t);
+	 ]])],
+      [ac_cv_c_restrict=$ac_kw])
+     test "$ac_cv_c_restrict" != no && break
+   done
+  ])
+ AH_VERBATIM([restrict],
+[/* Define to the equivalent of the C99 'restrict' keyword, or to
+   nothing if this is not supported.  Do not define if restrict is
+   supported directly.  */
+#undef restrict
+/* Work around a bug in Sun C++: it does not support _Restrict or
+   __restrict__, even though the corresponding Sun C compiler ends up with
+   "#define restrict _Restrict" or "#define restrict __restrict__" in the
+   previous line.  Perhaps some future version of Sun C++ will work with
+   restrict; if so, hopefully it defines __RESTRICT like Sun C does.  */
+#if defined __SUNPRO_CC && !defined __RESTRICT
+# define _Restrict
+# define __restrict__
+#endif])
+ case $ac_cv_c_restrict in
+   restrict) ;;
+   no) AC_DEFINE([restrict], []) ;;
+   *)  AC_DEFINE_UNQUOTED([restrict], [$ac_cv_c_restrict]) ;;
+ esac
+])# AC_C_RESTRICT
+
+# gl_BIGENDIAN
+# is like AC_C_BIGENDIAN, except that it can be AC_REQUIREd.
+# Note that AC_REQUIRE([AC_C_BIGENDIAN]) does not work reliably because some
+# macros invoke AC_C_BIGENDIAN with arguments.
+AC_DEFUN([gl_BIGENDIAN],
+[
+  AC_C_BIGENDIAN
+])
+
+# gl_CACHE_VAL_SILENT(cache-id, command-to-set-it)
+# is like AC_CACHE_VAL(cache-id, command-to-set-it), except that it does not
+# output a spurious "(cached)" mark in the midst of other configure output.
+# This macro should be used instead of AC_CACHE_VAL when it is not surrounded
+# by an AC_MSG_CHECKING/AC_MSG_RESULT pair.
+AC_DEFUN([gl_CACHE_VAL_SILENT],
+[
+  saved_as_echo_n="$as_echo_n"
+  as_echo_n=':'
+  AC_CACHE_VAL([$1], [$2])
+  as_echo_n="$saved_as_echo_n"
+])
+
+# AS_VAR_COPY was added in autoconf 2.63b
+m4_define_default([AS_VAR_COPY],
+[AS_LITERAL_IF([$1[]$2], [$1=$$2], [eval $1=\$$2])])
+
+# AC_PROG_SED was added in autoconf 2.59b
+m4_ifndef([AC_PROG_SED],
+[AC_DEFUN([AC_PROG_SED],
+[AC_CACHE_CHECK([for a sed that does not truncate output], ac_cv_path_SED,
+    [dnl ac_script should not contain more than 99 commands (for HP-UX sed),
+     dnl but more than about 7000 bytes, to catch a limit in Solaris 8 /usr/ucb/sed.
+     ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+     for ac_i in 1 2 3 4 5 6 7; do
+       ac_script="$ac_script$as_nl$ac_script"
+     done
+     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
+     AS_UNSET([ac_script])
+     if test -z "$SED"; then
+       ac_path_SED_found=false
+       _AS_PATH_WALK([], [
+         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_EXECUTABLE_P(["$ac_path_SED"]) || continue
+             case `"$ac_path_SED" --version 2>&1` in
+               *GNU*) ac_cv_path_SED=$ac_path_SED ac_path_SED_found=:;;
+               *)
+                 ac_count=0
+                 _AS_ECHO_N([0123456789]) >conftest.in
+                 while :
+                 do
+                   cat conftest.in conftest.in >conftest.tmp
+                   mv conftest.tmp conftest.in
+                   cp conftest.in conftest.nl
+                   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
+                   ac_count=`expr $ac_count + 1`
+                   if test $ac_count -gt ${ac_path_SED_max-0}; then
+                     # Best so far, but keep looking for better
+                     ac_cv_path_SED=$ac_path_SED
+                     ac_path_SED_max=$ac_count
+                   fi
+                   test $ac_count -gt 10 && break
+                 done
+                 rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+             esac
+             $ac_path_SED_found && break 3
+           done
+         done])
+       if test -z "$ac_cv_path_SED"; then
+         AC_ERROR([no acceptable sed could be found in \$PATH])
+       fi
+     else
+       ac_cv_path_SED=$SED
+     fi
+    ])
+ SED="$ac_cv_path_SED"
+ AC_SUBST([SED])dnl
+ rm -f conftest.sed
+])
+])
diff --git a/gl/m4/gnulib-comp.m4 b/gl/m4/gnulib-comp.m4
new file mode 100644
index 0000000..c76c257
--- /dev/null
+++ b/gl/m4/gnulib-comp.m4
@@ -0,0 +1,508 @@
+# DO NOT EDIT! GENERATED AUTOMATICALLY!
+# Copyright (C) 2002-2017 Free Software Foundation, Inc.
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this file.  If not, see <http://www.gnu.org/licenses/>.
+#
+# As a special exception to the GNU General Public License,
+# this file may be distributed as part of a program that
+# contains a configuration script generated by Autoconf, under
+# the same distribution terms as the rest of that program.
+#
+# Generated by gnulib-tool.
+#
+# This file represents the compiled summary of the specification in
+# gnulib-cache.m4. It lists the computed macro invocations that need
+# to be invoked from configure.ac.
+# In projects that use version control, this file can be treated like
+# other built files.
+
+
+# This macro should be invoked from ./configure.ac, in the section
+# "Checks for programs", right after AC_PROG_CC, and certainly before
+# any checks for libraries, header files, types and library functions.
+AC_DEFUN([gl_EARLY],
+[
+  m4_pattern_forbid([^gl_[A-Z]])dnl the gnulib macro namespace
+  m4_pattern_allow([^gl_ES$])dnl a valid locale name
+  m4_pattern_allow([^gl_LIBOBJS$])dnl a variable
+  m4_pattern_allow([^gl_LTLIBOBJS$])dnl a variable
+
+  # Pre-early section.
+  AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
+  AC_REQUIRE([gl_PROG_AR_RANLIB])
+
+  AC_REQUIRE([AM_PROG_CC_C_O])
+  # Code from module absolute-header:
+  # Code from module alloca-opt:
+  # Code from module btowc:
+  # Code from module builtin-expect:
+  # Code from module byteswap:
+  # Code from module configmake:
+  # Code from module dosname:
+  # Code from module extensions:
+  # Code from module extern-inline:
+  # Code from module fcntl-h:
+  # Code from module filename:
+  # Code from module gettext-h:
+  # Code from module gettimeofday:
+  # Code from module hard-locale:
+  # Code from module havelib:
+  # Code from module include_next:
+  # Code from module intprops:
+  # Code from module langinfo:
+  # Code from module largefile:
+  AC_REQUIRE([AC_SYS_LARGEFILE])
+  # Code from module limits-h:
+  # Code from module localcharset:
+  # Code from module locale:
+  # Code from module localeconv:
+  # Code from module localtime-buffer:
+  # Code from module lock:
+  # Code from module lstat:
+  # Code from module malloca:
+  # Code from module mbrtowc:
+  # Code from module mbsinit:
+  # Code from module mbtowc:
+  # Code from module mkstemps:
+  # Code from module multiarch:
+  # Code from module nl_langinfo:
+  # Code from module pathmax:
+  # Code from module regex:
+  # Code from module snippet/_Noreturn:
+  # Code from module snippet/arg-nonnull:
+  # Code from module snippet/c++defs:
+  # Code from module snippet/warn-on-use:
+  # Code from module ssize_t:
+  # Code from module stat:
+  # Code from module stdbool:
+  # Code from module stddef:
+  # Code from module stdint:
+  # Code from module stdlib:
+  # Code from module streq:
+  # Code from module sys_stat:
+  # Code from module sys_time:
+  # Code from module sys_types:
+  # Code from module tempname:
+  # Code from module threadlib:
+  gl_THREADLIB_EARLY
+  # Code from module time:
+  # Code from module unistd:
+  # Code from module verify:
+  # Code from module wchar:
+  # Code from module wcrtomb:
+  # Code from module wctype-h:
+  # Code from module xalloc-oversized:
+])
+
+# This macro should be invoked from ./configure.ac, in the section
+# "Check for header files, types and library functions".
+AC_DEFUN([gl_INIT],
+[
+  AM_CONDITIONAL([GL_COND_LIBTOOL], [true])
+  gl_cond_libtool=true
+  gl_m4_base='gl/m4'
+  m4_pushdef([AC_LIBOBJ], m4_defn([gl_LIBOBJ]))
+  m4_pushdef([AC_REPLACE_FUNCS], m4_defn([gl_REPLACE_FUNCS]))
+  m4_pushdef([AC_LIBSOURCES], m4_defn([gl_LIBSOURCES]))
+  m4_pushdef([gl_LIBSOURCES_LIST], [])
+  m4_pushdef([gl_LIBSOURCES_DIR], [])
+  gl_COMMON
+  gl_source_base='gl'
+  gl_FUNC_ALLOCA
+  gl_FUNC_BTOWC
+  if test $HAVE_BTOWC = 0 || test $REPLACE_BTOWC = 1; then
+    AC_LIBOBJ([btowc])
+    gl_PREREQ_BTOWC
+  fi
+  gl_WCHAR_MODULE_INDICATOR([btowc])
+  gl___BUILTIN_EXPECT
+  gl_BYTESWAP
+  gl_CONFIGMAKE_PREP
+  AC_REQUIRE([gl_EXTERN_INLINE])
+  gl_FCNTL_H
+  AC_SUBST([LIBINTL])
+  AC_SUBST([LTLIBINTL])
+  gl_FUNC_GETTIMEOFDAY
+  if test $HAVE_GETTIMEOFDAY = 0 || test $REPLACE_GETTIMEOFDAY = 1; then
+    AC_LIBOBJ([gettimeofday])
+    gl_PREREQ_GETTIMEOFDAY
+  fi
+  gl_SYS_TIME_MODULE_INDICATOR([gettimeofday])
+  gl_HARD_LOCALE
+  gl_LANGINFO_H
+  AC_REQUIRE([gl_LARGEFILE])
+  gl_LIMITS_H
+  gl_LOCALCHARSET
+  LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(abs_top_builddir)/$gl_source_base\""
+  AC_SUBST([LOCALCHARSET_TESTS_ENVIRONMENT])
+  gl_LOCALE_H
+  gl_FUNC_LOCALECONV
+  if test $REPLACE_LOCALECONV = 1; then
+    AC_LIBOBJ([localeconv])
+    gl_PREREQ_LOCALECONV
+  fi
+  gl_LOCALE_MODULE_INDICATOR([localeconv])
+  AC_REQUIRE([gl_LOCALTIME_BUFFER_DEFAULTS])
+  AC_LIBOBJ([localtime-buffer])
+  gl_LOCK
+  gl_MODULE_INDICATOR([lock])
+  gl_FUNC_LSTAT
+  if test $REPLACE_LSTAT = 1; then
+    AC_LIBOBJ([lstat])
+    gl_PREREQ_LSTAT
+  fi
+  gl_SYS_STAT_MODULE_INDICATOR([lstat])
+  gl_MALLOCA
+  gl_FUNC_MBRTOWC
+  if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then
+    AC_LIBOBJ([mbrtowc])
+    gl_PREREQ_MBRTOWC
+  fi
+  gl_WCHAR_MODULE_INDICATOR([mbrtowc])
+  gl_FUNC_MBSINIT
+  if test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1; then
+    AC_LIBOBJ([mbsinit])
+    gl_PREREQ_MBSINIT
+  fi
+  gl_WCHAR_MODULE_INDICATOR([mbsinit])
+  gl_FUNC_MBTOWC
+  if test $REPLACE_MBTOWC = 1; then
+    AC_LIBOBJ([mbtowc])
+    gl_PREREQ_MBTOWC
+  fi
+  gl_STDLIB_MODULE_INDICATOR([mbtowc])
+  gl_FUNC_MKSTEMPS
+  if test $HAVE_MKSTEMPS = 0; then
+    AC_LIBOBJ([mkstemps])
+  fi
+  gl_MODULE_INDICATOR([mkstemps])
+  gl_STDLIB_MODULE_INDICATOR([mkstemps])
+  gl_MULTIARCH
+  gl_FUNC_NL_LANGINFO
+  if test $HAVE_NL_LANGINFO = 0 || test $REPLACE_NL_LANGINFO = 1; then
+    AC_LIBOBJ([nl_langinfo])
+  fi
+  gl_LANGINFO_MODULE_INDICATOR([nl_langinfo])
+  gl_PATHMAX
+  gl_REGEX
+  if test $ac_use_included_regex = yes; then
+    AC_LIBOBJ([regex])
+    gl_PREREQ_REGEX
+  fi
+  gt_TYPE_SSIZE_T
+  gl_FUNC_STAT
+  if test $REPLACE_STAT = 1; then
+    AC_LIBOBJ([stat])
+    case "$host_os" in
+      mingw*)
+        AC_LIBOBJ([stat-w32])
+        ;;
+    esac
+    gl_PREREQ_STAT
+  fi
+  gl_SYS_STAT_MODULE_INDICATOR([stat])
+  AM_STDBOOL_H
+  gl_STDDEF_H
+  gl_STDINT_H
+  gl_STDLIB_H
+  gl_HEADER_SYS_STAT_H
+  AC_PROG_MKDIR_P
+  gl_HEADER_SYS_TIME_H
+  AC_PROG_MKDIR_P
+  gl_SYS_TYPES_H
+  AC_PROG_MKDIR_P
+  gl_FUNC_GEN_TEMPNAME
+  gl_THREADLIB
+  gl_HEADER_TIME_H
+  gl_UNISTD_H
+  gl_WCHAR_H
+  gl_FUNC_WCRTOMB
+  if test $HAVE_WCRTOMB = 0 || test $REPLACE_WCRTOMB = 1; then
+    AC_LIBOBJ([wcrtomb])
+    gl_PREREQ_WCRTOMB
+  fi
+  gl_WCHAR_MODULE_INDICATOR([wcrtomb])
+  gl_WCTYPE_H
+  # End of code from modules
+  m4_ifval(gl_LIBSOURCES_LIST, [
+    m4_syscmd([test ! -d ]m4_defn([gl_LIBSOURCES_DIR])[ ||
+      for gl_file in ]gl_LIBSOURCES_LIST[ ; do
+        if test ! -r ]m4_defn([gl_LIBSOURCES_DIR])[/$gl_file ; then
+          echo "missing file ]m4_defn([gl_LIBSOURCES_DIR])[/$gl_file" >&2
+          exit 1
+        fi
+      done])dnl
+      m4_if(m4_sysval, [0], [],
+        [AC_FATAL([expected source file, required through AC_LIBSOURCES, not found])])
+  ])
+  m4_popdef([gl_LIBSOURCES_DIR])
+  m4_popdef([gl_LIBSOURCES_LIST])
+  m4_popdef([AC_LIBSOURCES])
+  m4_popdef([AC_REPLACE_FUNCS])
+  m4_popdef([AC_LIBOBJ])
+  AC_CONFIG_COMMANDS_PRE([
+    gl_libobjs=
+    gl_ltlibobjs=
+    if test -n "$gl_LIBOBJS"; then
+      # Remove the extension.
+      sed_drop_objext='s/\.o$//;s/\.obj$//'
+      for i in `for i in $gl_LIBOBJS; do echo "$i"; done | sed -e "$sed_drop_objext" | sort | uniq`; do
+        gl_libobjs="$gl_libobjs $i.$ac_objext"
+        gl_ltlibobjs="$gl_ltlibobjs $i.lo"
+      done
+    fi
+    AC_SUBST([gl_LIBOBJS], [$gl_libobjs])
+    AC_SUBST([gl_LTLIBOBJS], [$gl_ltlibobjs])
+  ])
+  gltests_libdeps=
+  gltests_ltlibdeps=
+  m4_pushdef([AC_LIBOBJ], m4_defn([gltests_LIBOBJ]))
+  m4_pushdef([AC_REPLACE_FUNCS], m4_defn([gltests_REPLACE_FUNCS]))
+  m4_pushdef([AC_LIBSOURCES], m4_defn([gltests_LIBSOURCES]))
+  m4_pushdef([gltests_LIBSOURCES_LIST], [])
+  m4_pushdef([gltests_LIBSOURCES_DIR], [])
+  gl_COMMON
+  gl_source_base='tests'
+changequote(,)dnl
+  gltests_WITNESS=IN_`echo "${PACKAGE-$PACKAGE_TARNAME}" | LC_ALL=C tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ | LC_ALL=C sed -e 's/[^A-Z0-9_]/_/g'`_GNULIB_TESTS
+changequote([, ])dnl
+  AC_SUBST([gltests_WITNESS])
+  gl_module_indicator_condition=$gltests_WITNESS
+  m4_pushdef([gl_MODULE_INDICATOR_CONDITION], [$gl_module_indicator_condition])
+  m4_popdef([gl_MODULE_INDICATOR_CONDITION])
+  m4_ifval(gltests_LIBSOURCES_LIST, [
+    m4_syscmd([test ! -d ]m4_defn([gltests_LIBSOURCES_DIR])[ ||
+      for gl_file in ]gltests_LIBSOURCES_LIST[ ; do
+        if test ! -r ]m4_defn([gltests_LIBSOURCES_DIR])[/$gl_file ; then
+          echo "missing file ]m4_defn([gltests_LIBSOURCES_DIR])[/$gl_file" >&2
+          exit 1
+        fi
+      done])dnl
+      m4_if(m4_sysval, [0], [],
+        [AC_FATAL([expected source file, required through AC_LIBSOURCES, not found])])
+  ])
+  m4_popdef([gltests_LIBSOURCES_DIR])
+  m4_popdef([gltests_LIBSOURCES_LIST])
+  m4_popdef([AC_LIBSOURCES])
+  m4_popdef([AC_REPLACE_FUNCS])
+  m4_popdef([AC_LIBOBJ])
+  AC_CONFIG_COMMANDS_PRE([
+    gltests_libobjs=
+    gltests_ltlibobjs=
+    if test -n "$gltests_LIBOBJS"; then
+      # Remove the extension.
+      sed_drop_objext='s/\.o$//;s/\.obj$//'
+      for i in `for i in $gltests_LIBOBJS; do echo "$i"; done | sed -e "$sed_drop_objext" | sort | uniq`; do
+        gltests_libobjs="$gltests_libobjs $i.$ac_objext"
+        gltests_ltlibobjs="$gltests_ltlibobjs $i.lo"
+      done
+    fi
+    AC_SUBST([gltests_LIBOBJS], [$gltests_libobjs])
+    AC_SUBST([gltests_LTLIBOBJS], [$gltests_ltlibobjs])
+  ])
+])
+
+# Like AC_LIBOBJ, except that the module name goes
+# into gl_LIBOBJS instead of into LIBOBJS.
+AC_DEFUN([gl_LIBOBJ], [
+  AS_LITERAL_IF([$1], [gl_LIBSOURCES([$1.c])])dnl
+  gl_LIBOBJS="$gl_LIBOBJS $1.$ac_objext"
+])
+
+# Like AC_REPLACE_FUNCS, except that the module name goes
+# into gl_LIBOBJS instead of into LIBOBJS.
+AC_DEFUN([gl_REPLACE_FUNCS], [
+  m4_foreach_w([gl_NAME], [$1], [AC_LIBSOURCES(gl_NAME[.c])])dnl
+  AC_CHECK_FUNCS([$1], , [gl_LIBOBJ($ac_func)])
+])
+
+# Like AC_LIBSOURCES, except the directory where the source file is
+# expected is derived from the gnulib-tool parameterization,
+# and alloca is special cased (for the alloca-opt module).
+# We could also entirely rely on EXTRA_lib..._SOURCES.
+AC_DEFUN([gl_LIBSOURCES], [
+  m4_foreach([_gl_NAME], [$1], [
+    m4_if(_gl_NAME, [alloca.c], [], [
+      m4_define([gl_LIBSOURCES_DIR], [gl])
+      m4_append([gl_LIBSOURCES_LIST], _gl_NAME, [ ])
+    ])
+  ])
+])
+
+# Like AC_LIBOBJ, except that the module name goes
+# into gltests_LIBOBJS instead of into LIBOBJS.
+AC_DEFUN([gltests_LIBOBJ], [
+  AS_LITERAL_IF([$1], [gltests_LIBSOURCES([$1.c])])dnl
+  gltests_LIBOBJS="$gltests_LIBOBJS $1.$ac_objext"
+])
+
+# Like AC_REPLACE_FUNCS, except that the module name goes
+# into gltests_LIBOBJS instead of into LIBOBJS.
+AC_DEFUN([gltests_REPLACE_FUNCS], [
+  m4_foreach_w([gl_NAME], [$1], [AC_LIBSOURCES(gl_NAME[.c])])dnl
+  AC_CHECK_FUNCS([$1], , [gltests_LIBOBJ($ac_func)])
+])
+
+# Like AC_LIBSOURCES, except the directory where the source file is
+# expected is derived from the gnulib-tool parameterization,
+# and alloca is special cased (for the alloca-opt module).
+# We could also entirely rely on EXTRA_lib..._SOURCES.
+AC_DEFUN([gltests_LIBSOURCES], [
+  m4_foreach([_gl_NAME], [$1], [
+    m4_if(_gl_NAME, [alloca.c], [], [
+      m4_define([gltests_LIBSOURCES_DIR], [tests])
+      m4_append([gltests_LIBSOURCES_LIST], _gl_NAME, [ ])
+    ])
+  ])
+])
+
+# This macro records the list of files which have been installed by
+# gnulib-tool and may be removed by future gnulib-tool invocations.
+AC_DEFUN([gl_FILE_LIST], [
+  build-aux/config.rpath
+  lib/_Noreturn.h
+  lib/alloca.in.h
+  lib/arg-nonnull.h
+  lib/btowc.c
+  lib/byteswap.in.h
+  lib/c++defs.h
+  lib/config.charset
+  lib/dosname.h
+  lib/fcntl.in.h
+  lib/filename.h
+  lib/gettext.h
+  lib/gettimeofday.c
+  lib/glthread/lock.c
+  lib/glthread/lock.h
+  lib/glthread/threadlib.c
+  lib/hard-locale.c
+  lib/hard-locale.h
+  lib/intprops.h
+  lib/langinfo.in.h
+  lib/limits.in.h
+  lib/localcharset.c
+  lib/localcharset.h
+  lib/locale.in.h
+  lib/localeconv.c
+  lib/localtime-buffer.c
+  lib/localtime-buffer.h
+  lib/lstat.c
+  lib/malloca.c
+  lib/malloca.h
+  lib/malloca.valgrind
+  lib/mbrtowc.c
+  lib/mbsinit.c
+  lib/mbtowc-impl.h
+  lib/mbtowc.c
+  lib/mkstemps.c
+  lib/nl_langinfo.c
+  lib/pathmax.h
+  lib/ref-add.sin
+  lib/ref-del.sin
+  lib/regcomp.c
+  lib/regex.c
+  lib/regex.h
+  lib/regex_internal.c
+  lib/regex_internal.h
+  lib/regexec.c
+  lib/stat-w32.c
+  lib/stat-w32.h
+  lib/stat.c
+  lib/stdbool.in.h
+  lib/stddef.in.h
+  lib/stdint.in.h
+  lib/stdlib.in.h
+  lib/streq.h
+  lib/sys_stat.in.h
+  lib/sys_time.in.h
+  lib/sys_types.in.h
+  lib/tempname.c
+  lib/tempname.h
+  lib/time.in.h
+  lib/unistd.c
+  lib/unistd.in.h
+  lib/verify.h
+  lib/warn-on-use.h
+  lib/wchar.in.h
+  lib/wcrtomb.c
+  lib/wctype-h.c
+  lib/wctype.in.h
+  lib/xalloc-oversized.h
+  m4/00gnulib.m4
+  m4/absolute-header.m4
+  m4/alloca.m4
+  m4/btowc.m4
+  m4/builtin-expect.m4
+  m4/byteswap.m4
+  m4/codeset.m4
+  m4/configmake.m4
+  m4/eealloc.m4
+  m4/extensions.m4
+  m4/extern-inline.m4
+  m4/fcntl-o.m4
+  m4/fcntl_h.m4
+  m4/gettimeofday.m4
+  m4/glibc21.m4
+  m4/gnulib-common.m4
+  m4/hard-locale.m4
+  m4/include_next.m4
+  m4/langinfo_h.m4
+  m4/largefile.m4
+  m4/lib-ld.m4
+  m4/lib-link.m4
+  m4/lib-prefix.m4
+  m4/limits-h.m4
+  m4/localcharset.m4
+  m4/locale-fr.m4
+  m4/locale-ja.m4
+  m4/locale-zh.m4
+  m4/locale_h.m4
+  m4/localeconv.m4
+  m4/localtime-buffer.m4
+  m4/lock.m4
+  m4/longlong.m4
+  m4/lstat.m4
+  m4/malloca.m4
+  m4/mbrtowc.m4
+  m4/mbsinit.m4
+  m4/mbstate_t.m4
+  m4/mbtowc.m4
+  m4/mkstemps.m4
+  m4/multiarch.m4
+  m4/nl_langinfo.m4
+  m4/off_t.m4
+  m4/pathmax.m4
+  m4/pthread_rwlock_rdlock.m4
+  m4/regex.m4
+  m4/ssize_t.m4
+  m4/stat.m4
+  m4/stdbool.m4
+  m4/stddef_h.m4
+  m4/stdint.m4
+  m4/stdlib_h.m4
+  m4/sys_socket_h.m4
+  m4/sys_stat_h.m4
+  m4/sys_time_h.m4
+  m4/sys_types_h.m4
+  m4/tempname.m4
+  m4/threadlib.m4
+  m4/time_h.m4
+  m4/unistd_h.m4
+  m4/warn-on-use.m4
+  m4/wchar_h.m4
+  m4/wchar_t.m4
+  m4/wcrtomb.m4
+  m4/wctype_h.m4
+  m4/wint_t.m4
+])
diff --git a/gl/m4/gnulib-tool.m4 b/gl/m4/gnulib-tool.m4
new file mode 100644
index 0000000..2e2d8f6
--- /dev/null
+++ b/gl/m4/gnulib-tool.m4
@@ -0,0 +1,57 @@
+# gnulib-tool.m4 serial 2
+dnl Copyright (C) 2004-2005, 2009-2017 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl The following macros need not be invoked explicitly.
+dnl Invoking them does nothing except to declare default arguments
+dnl for "gnulib-tool --import".
+
+dnl Usage: gl_LOCAL_DIR([DIR])
+AC_DEFUN([gl_LOCAL_DIR], [])
+
+dnl Usage: gl_MODULES([module1 module2 ...])
+AC_DEFUN([gl_MODULES], [])
+
+dnl Usage: gl_AVOID([module1 module2 ...])
+AC_DEFUN([gl_AVOID], [])
+
+dnl Usage: gl_SOURCE_BASE([DIR])
+AC_DEFUN([gl_SOURCE_BASE], [])
+
+dnl Usage: gl_M4_BASE([DIR])
+AC_DEFUN([gl_M4_BASE], [])
+
+dnl Usage: gl_PO_BASE([DIR])
+AC_DEFUN([gl_PO_BASE], [])
+
+dnl Usage: gl_DOC_BASE([DIR])
+AC_DEFUN([gl_DOC_BASE], [])
+
+dnl Usage: gl_TESTS_BASE([DIR])
+AC_DEFUN([gl_TESTS_BASE], [])
+
+dnl Usage: gl_WITH_TESTS
+AC_DEFUN([gl_WITH_TESTS], [])
+
+dnl Usage: gl_LIB([LIBNAME])
+AC_DEFUN([gl_LIB], [])
+
+dnl Usage: gl_LGPL or gl_LGPL([VERSION])
+AC_DEFUN([gl_LGPL], [])
+
+dnl Usage: gl_MAKEFILE_NAME([FILENAME])
+AC_DEFUN([gl_MAKEFILE_NAME], [])
+
+dnl Usage: gl_LIBTOOL
+AC_DEFUN([gl_LIBTOOL], [])
+
+dnl Usage: gl_MACRO_PREFIX([PREFIX])
+AC_DEFUN([gl_MACRO_PREFIX], [])
+
+dnl Usage: gl_PO_DOMAIN([DOMAIN])
+AC_DEFUN([gl_PO_DOMAIN], [])
+
+dnl Usage: gl_VC_FILES([BOOLEAN])
+AC_DEFUN([gl_VC_FILES], [])
diff --git a/gl/m4/hard-locale.m4 b/gl/m4/hard-locale.m4
new file mode 100644
index 0000000..d79acd6
--- /dev/null
+++ b/gl/m4/hard-locale.m4
@@ -0,0 +1,11 @@
+# hard-locale.m4 serial 8
+dnl Copyright (C) 2002-2006, 2009-2017 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl No prerequisites of lib/hard-locale.c.
+AC_DEFUN([gl_HARD_LOCALE],
+[
+  :
+])
diff --git a/gl/m4/include_next.m4 b/gl/m4/include_next.m4
new file mode 100644
index 0000000..068f6f6
--- /dev/null
+++ b/gl/m4/include_next.m4
@@ -0,0 +1,224 @@
+# include_next.m4 serial 24
+dnl Copyright (C) 2006-2017 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Paul Eggert and Derek Price.
+
+dnl Sets INCLUDE_NEXT, INCLUDE_NEXT_AS_FIRST_DIRECTIVE, PRAGMA_SYSTEM_HEADER,
+dnl and PRAGMA_COLUMNS.
+dnl
+dnl INCLUDE_NEXT expands to 'include_next' if the compiler supports it, or to
+dnl 'include' otherwise.
+dnl
+dnl INCLUDE_NEXT_AS_FIRST_DIRECTIVE expands to 'include_next' if the compiler
+dnl supports it in the special case that it is the first include directive in
+dnl the given file, or to 'include' otherwise.
+dnl
+dnl PRAGMA_SYSTEM_HEADER can be used in files that contain #include_next,
+dnl so as to avoid GCC warnings when the gcc option -pedantic is used.
+dnl '#pragma GCC system_header' has the same effect as if the file was found
+dnl through the include search path specified with '-isystem' options (as
+dnl opposed to the search path specified with '-I' options). Namely, gcc
+dnl does not warn about some things, and on some systems (Solaris and Interix)
+dnl __STDC__ evaluates to 0 instead of to 1. The latter is an undesired side
+dnl effect; we are therefore careful to use 'defined __STDC__' or '1' instead
+dnl of plain '__STDC__'.
+dnl
+dnl PRAGMA_COLUMNS can be used in files that override system header files, so
+dnl as to avoid compilation errors on HP NonStop systems when the gnulib file
+dnl is included by a system header file that does a "#pragma COLUMNS 80" (which
+dnl has the effect of truncating the lines of that file and all files that it
+dnl includes to 80 columns) and the gnulib file has lines longer than 80
+dnl columns.
+
+AC_DEFUN([gl_INCLUDE_NEXT],
+[
+  AC_LANG_PREPROC_REQUIRE()
+  AC_CACHE_CHECK([whether the preprocessor supports include_next],
+    [gl_cv_have_include_next],
+    [rm -rf conftestd1a conftestd1b conftestd2
+     mkdir conftestd1a conftestd1b conftestd2
+     dnl IBM C 9.0, 10.1 (original versions, prior to the 2009-01 updates) on
+     dnl AIX 6.1 support include_next when used as first preprocessor directive
+     dnl in a file, but not when preceded by another include directive. Check
+     dnl for this bug by including <stdio.h>.
+     dnl Additionally, with this same compiler, include_next is a no-op when
+     dnl used in a header file that was included by specifying its absolute
+     dnl file name. Despite these two bugs, include_next is used in the
+     dnl compiler's <math.h>. By virtue of the second bug, we need to use
+     dnl include_next as well in this case.
+     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"
+dnl We intentionally avoid using AC_LANG_SOURCE here.
+     AC_COMPILE_IFELSE([AC_LANG_DEFINES_PROVIDED[#include <conftest.h>]],
+       [gl_cv_have_include_next=yes],
+       [CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1a -Iconftestd2"
+        AC_COMPILE_IFELSE([AC_LANG_DEFINES_PROVIDED[#include <conftest.h>]],
+          [gl_cv_have_include_next=buggy],
+          [gl_cv_have_include_next=no])
+       ])
+     CPPFLAGS="$gl_save_CPPFLAGS"
+     rm -rf conftestd1a conftestd1b conftestd2
+    ])
+  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
+  AC_SUBST([INCLUDE_NEXT])
+  AC_SUBST([INCLUDE_NEXT_AS_FIRST_DIRECTIVE])
+  AC_SUBST([PRAGMA_SYSTEM_HEADER])
+  AC_CACHE_CHECK([whether system header files limit the line length],
+    [gl_cv_pragma_columns],
+    [dnl HP NonStop systems, which define __TANDEM, have this misfeature.
+     AC_EGREP_CPP([choke me],
+       [
+#ifdef __TANDEM
+choke me
+#endif
+       ],
+       [gl_cv_pragma_columns=yes],
+       [gl_cv_pragma_columns=no])
+    ])
+  if test $gl_cv_pragma_columns = yes; then
+    PRAGMA_COLUMNS="#pragma COLUMNS 10000"
+  else
+    PRAGMA_COLUMNS=
+  fi
+  AC_SUBST([PRAGMA_COLUMNS])
+])
+
+# gl_CHECK_NEXT_HEADERS(HEADER1 HEADER2 ...)
+# ------------------------------------------
+# For each arg foo.h, if #include_next works, define NEXT_FOO_H to be
+# '<foo.h>'; otherwise define it to be
+# '"///usr/include/foo.h"', or whatever other absolute file name is suitable.
+# Also, if #include_next works as first preprocessing directive in a file,
+# define NEXT_AS_FIRST_DIRECTIVE_FOO_H to be '<foo.h>'; otherwise define it to
+# be
+# '"///usr/include/foo.h"', or whatever other absolute file name is suitable.
+# That way, a header file with the following line:
+#       #@INCLUDE_NEXT@ @NEXT_FOO_H@
+# or
+#       #@INCLUDE_NEXT_AS_FIRST_DIRECTIVE@ @NEXT_AS_FIRST_DIRECTIVE_FOO_H@
+# behaves (after sed substitution) as if it contained
+#       #include_next <foo.h>
+# even if the compiler does not support include_next.
+# The three "///" are to pacify Sun C 5.8, which otherwise would say
+# "warning: #include of /usr/include/... may be non-portable".
+# Use '""', not '<>', so that the /// cannot be confused with a C99 comment.
+# Note: This macro assumes that the header file is not empty after
+# preprocessing, i.e. it does not only define preprocessor macros but also
+# provides some type/enum definitions or function/variable declarations.
+#
+# This macro also checks whether each header exists, by invoking
+# AC_CHECK_HEADERS_ONCE or AC_CHECK_HEADERS on each argument.
+AC_DEFUN([gl_CHECK_NEXT_HEADERS],
+[
+  gl_NEXT_HEADERS_INTERNAL([$1], [check])
+])
+
+# gl_NEXT_HEADERS(HEADER1 HEADER2 ...)
+# ------------------------------------
+# Like gl_CHECK_NEXT_HEADERS, except do not check whether the headers exist.
+# This is suitable for headers like <stddef.h> that are standardized by C89
+# and therefore can be assumed to exist.
+AC_DEFUN([gl_NEXT_HEADERS],
+[
+  gl_NEXT_HEADERS_INTERNAL([$1], [assume])
+])
+
+# The guts of gl_CHECK_NEXT_HEADERS and gl_NEXT_HEADERS.
+AC_DEFUN([gl_NEXT_HEADERS_INTERNAL],
+[
+  AC_REQUIRE([gl_INCLUDE_NEXT])
+  AC_REQUIRE([AC_CANONICAL_HOST])
+
+  m4_if([$2], [check],
+    [AC_CHECK_HEADERS_ONCE([$1])
+    ])
+
+dnl FIXME: gl_next_header and gl_header_exists must be used unquoted
+dnl until we can assume autoconf 2.64 or newer.
+  m4_foreach_w([gl_HEADER_NAME], [$1],
+    [AS_VAR_PUSHDEF([gl_next_header],
+                    [gl_cv_next_]m4_defn([gl_HEADER_NAME]))
+     if test $gl_cv_have_include_next = yes; then
+       AS_VAR_SET(gl_next_header, ['<'gl_HEADER_NAME'>'])
+     else
+       AC_CACHE_CHECK(
+         [absolute name of <]m4_defn([gl_HEADER_NAME])[>],
+         m4_defn([gl_next_header]),
+         [m4_if([$2], [check],
+            [AS_VAR_PUSHDEF([gl_header_exists],
+                            [ac_cv_header_]m4_defn([gl_HEADER_NAME]))
+             if test AS_VAR_GET(gl_header_exists) = yes; then
+             AS_VAR_POPDEF([gl_header_exists])
+            ])
+           gl_ABSOLUTE_HEADER_ONE(gl_HEADER_NAME)
+           AS_VAR_COPY([gl_header], [gl_cv_absolute_]AS_TR_SH(gl_HEADER_NAME))
+           AS_VAR_SET(gl_next_header, ['"'$gl_header'"'])
+          m4_if([$2], [check],
+            [else
+               AS_VAR_SET(gl_next_header, ['<'gl_HEADER_NAME'>'])
+             fi
+            ])
+         ])
+     fi
+     AC_SUBST(
+       AS_TR_CPP([NEXT_]m4_defn([gl_HEADER_NAME])),
+       [AS_VAR_GET(gl_next_header)])
+     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='<'gl_HEADER_NAME'>'
+     else
+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
+       gl_next_as_first_directive=AS_VAR_GET(gl_next_header)
+     fi
+     AC_SUBST(
+       AS_TR_CPP([NEXT_AS_FIRST_DIRECTIVE_]m4_defn([gl_HEADER_NAME])),
+       [$gl_next_as_first_directive])
+     AS_VAR_POPDEF([gl_next_header])])
+])
+
+# Autoconf 2.68 added warnings for our use of AC_COMPILE_IFELSE;
+# this fallback is safe for all earlier autoconf versions.
+m4_define_default([AC_LANG_DEFINES_PROVIDED])
diff --git a/gl/m4/langinfo_h.m4 b/gl/m4/langinfo_h.m4
new file mode 100644
index 0000000..ea94b4e
--- /dev/null
+++ b/gl/m4/langinfo_h.m4
@@ -0,0 +1,105 @@
+# langinfo_h.m4 serial 7
+dnl Copyright (C) 2009-2017 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_LANGINFO_H],
+[
+  AC_REQUIRE([gl_LANGINFO_H_DEFAULTS])
+
+  dnl Persuade glibc-2.0.6 <langinfo.h> to define CODESET.
+  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
+
+  dnl <langinfo.h> is always overridden, because of GNULIB_POSIXCHECK.
+  gl_CHECK_NEXT_HEADERS([langinfo.h])
+
+  dnl Determine whether <langinfo.h> exists. It is missing on mingw and BeOS.
+  HAVE_LANGINFO_CODESET=0
+  HAVE_LANGINFO_T_FMT_AMPM=0
+  HAVE_LANGINFO_ERA=0
+  HAVE_LANGINFO_YESEXPR=0
+  AC_CHECK_HEADERS_ONCE([langinfo.h])
+  if test $ac_cv_header_langinfo_h = yes; then
+    HAVE_LANGINFO_H=1
+    dnl Determine what <langinfo.h> defines. CODESET and ERA etc. are missing
+    dnl on OpenBSD 3.8. T_FMT_AMPM and YESEXPR, NOEXPR are missing on IRIX 5.3.
+    AC_CACHE_CHECK([whether langinfo.h defines CODESET],
+      [gl_cv_header_langinfo_codeset],
+      [AC_COMPILE_IFELSE(
+         [AC_LANG_PROGRAM([[#include <langinfo.h>
+int a = CODESET;
+]])],
+         [gl_cv_header_langinfo_codeset=yes],
+         [gl_cv_header_langinfo_codeset=no])
+      ])
+    if test $gl_cv_header_langinfo_codeset = yes; then
+      HAVE_LANGINFO_CODESET=1
+    fi
+    AC_CACHE_CHECK([whether langinfo.h defines T_FMT_AMPM],
+      [gl_cv_header_langinfo_t_fmt_ampm],
+      [AC_COMPILE_IFELSE(
+         [AC_LANG_PROGRAM([[#include <langinfo.h>
+int a = T_FMT_AMPM;
+]])],
+         [gl_cv_header_langinfo_t_fmt_ampm=yes],
+         [gl_cv_header_langinfo_t_fmt_ampm=no])
+      ])
+    if test $gl_cv_header_langinfo_t_fmt_ampm = yes; then
+      HAVE_LANGINFO_T_FMT_AMPM=1
+    fi
+    AC_CACHE_CHECK([whether langinfo.h defines ERA],
+      [gl_cv_header_langinfo_era],
+      [AC_COMPILE_IFELSE(
+         [AC_LANG_PROGRAM([[#include <langinfo.h>
+int a = ERA;
+]])],
+         [gl_cv_header_langinfo_era=yes],
+         [gl_cv_header_langinfo_era=no])
+      ])
+    if test $gl_cv_header_langinfo_era = yes; then
+      HAVE_LANGINFO_ERA=1
+    fi
+    AC_CACHE_CHECK([whether langinfo.h defines YESEXPR],
+      [gl_cv_header_langinfo_yesexpr],
+      [AC_COMPILE_IFELSE(
+         [AC_LANG_PROGRAM([[#include <langinfo.h>
+int a = YESEXPR;
+]])],
+         [gl_cv_header_langinfo_yesexpr=yes],
+         [gl_cv_header_langinfo_yesexpr=no])
+      ])
+    if test $gl_cv_header_langinfo_yesexpr = yes; then
+      HAVE_LANGINFO_YESEXPR=1
+    fi
+  else
+    HAVE_LANGINFO_H=0
+  fi
+  AC_SUBST([HAVE_LANGINFO_H])
+  AC_SUBST([HAVE_LANGINFO_CODESET])
+  AC_SUBST([HAVE_LANGINFO_T_FMT_AMPM])
+  AC_SUBST([HAVE_LANGINFO_ERA])
+  AC_SUBST([HAVE_LANGINFO_YESEXPR])
+
+  dnl Check for declarations of anything we want to poison if the
+  dnl corresponding gnulib module is not in use.
+  gl_WARN_ON_USE_PREPARE([[#include <langinfo.h>
+    ]], [nl_langinfo])
+])
+
+AC_DEFUN([gl_LANGINFO_MODULE_INDICATOR],
+[
+  dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
+  AC_REQUIRE([gl_LANGINFO_H_DEFAULTS])
+  gl_MODULE_INDICATOR_SET_VARIABLE([$1])
+  dnl Define it also as a C macro, for the benefit of the unit tests.
+  gl_MODULE_INDICATOR_FOR_TESTS([$1])
+])
+
+AC_DEFUN([gl_LANGINFO_H_DEFAULTS],
+[
+  GNULIB_NL_LANGINFO=0;  AC_SUBST([GNULIB_NL_LANGINFO])
+  dnl Assume proper GNU behavior unless another module says otherwise.
+  HAVE_NL_LANGINFO=1;    AC_SUBST([HAVE_NL_LANGINFO])
+  REPLACE_NL_LANGINFO=0; AC_SUBST([REPLACE_NL_LANGINFO])
+])
diff --git a/gl/m4/largefile.m4 b/gl/m4/largefile.m4
new file mode 100644
index 0000000..edc1a9b
--- /dev/null
+++ b/gl/m4/largefile.m4
@@ -0,0 +1,161 @@
+# Enable large files on systems where this is not the default.
+
+# Copyright 1992-1996, 1998-2017 Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# The following implementation works around a problem in autoconf <= 2.69;
+# AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5,
+# or configures them incorrectly in some cases.
+m4_version_prereq([2.70], [] ,[
+
+# _AC_SYS_LARGEFILE_TEST_INCLUDES
+# -------------------------------
+m4_define([_AC_SYS_LARGEFILE_TEST_INCLUDES],
+[@%:@include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+@%:@define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[[(LARGE_OFF_T % 2147483629 == 721
+                       && LARGE_OFF_T % 2147483647 == 1)
+                      ? 1 : -1]];[]dnl
+])
+
+
+# _AC_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, VALUE,
+#                               CACHE-VAR,
+#                               DESCRIPTION,
+#                               PROLOGUE, [FUNCTION-BODY])
+# --------------------------------------------------------
+m4_define([_AC_SYS_LARGEFILE_MACRO_VALUE],
+[AC_CACHE_CHECK([for $1 value needed for large files], [$3],
+[while :; do
+  m4_ifval([$6], [AC_LINK_IFELSE], [AC_COMPILE_IFELSE])(
+    [AC_LANG_PROGRAM([$5], [$6])],
+    [$3=no; break])
+  m4_ifval([$6], [AC_LINK_IFELSE], [AC_COMPILE_IFELSE])(
+    [AC_LANG_PROGRAM([@%:@define $1 $2
+$5], [$6])],
+    [$3=$2; break])
+  $3=unknown
+  break
+done])
+case $$3 in #(
+  no | unknown) ;;
+  *) AC_DEFINE_UNQUOTED([$1], [$$3], [$4]);;
+esac
+rm -rf conftest*[]dnl
+])# _AC_SYS_LARGEFILE_MACRO_VALUE
+
+
+# AC_SYS_LARGEFILE
+# ----------------
+# By default, many hosts won't let programs access large files;
+# one must use special compiler options to get large-file access to work.
+# For more details about this brain damage please see:
+# http://www.unix-systems.org/version2/whatsnew/lfs20mar.html
+AC_DEFUN([AC_SYS_LARGEFILE],
+[AC_ARG_ENABLE(largefile,
+               [  --disable-largefile     omit support for large files])
+if test "$enable_largefile" != no; then
+
+  AC_CACHE_CHECK([for special C compiler options needed for large files],
+    ac_cv_sys_largefile_CC,
+    [ac_cv_sys_largefile_CC=no
+     if test "$GCC" != yes; then
+       ac_save_CC=$CC
+       while :; do
+         # IRIX 6.2 and later do not support large files by default,
+         # so use the C compiler's -n32 option if that helps.
+         AC_LANG_CONFTEST([AC_LANG_PROGRAM([_AC_SYS_LARGEFILE_TEST_INCLUDES])])
+         AC_COMPILE_IFELSE([], [break])
+         CC="$CC -n32"
+         AC_COMPILE_IFELSE([], [ac_cv_sys_largefile_CC=' -n32'; break])
+         break
+       done
+       CC=$ac_save_CC
+       rm -f conftest.$ac_ext
+    fi])
+  if test "$ac_cv_sys_largefile_CC" != no; then
+    CC=$CC$ac_cv_sys_largefile_CC
+  fi
+
+  _AC_SYS_LARGEFILE_MACRO_VALUE(_FILE_OFFSET_BITS, 64,
+    ac_cv_sys_file_offset_bits,
+    [Number of bits in a file offset, on hosts where this is settable.],
+    [_AC_SYS_LARGEFILE_TEST_INCLUDES])
+  if test $ac_cv_sys_file_offset_bits = unknown; then
+    _AC_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES, 1,
+      ac_cv_sys_large_files,
+      [Define for large files, on AIX-style hosts.],
+      [_AC_SYS_LARGEFILE_TEST_INCLUDES])
+  fi
+
+  AC_DEFINE([_DARWIN_USE_64_BIT_INODE], [1],
+    [Enable large inode numbers on Mac OS X 10.5.])
+fi
+])# AC_SYS_LARGEFILE
+])# m4_version_prereq 2.70
+
+# Enable large files on systems where this is implemented by Gnulib, not by the
+# system headers.
+# Set the variables WINDOWS_64_BIT_OFF_T, WINDOWS_64_BIT_ST_SIZE if Gnulib
+# overrides ensure that off_t or 'struct size.st_size' are 64-bit, respectively.
+AC_DEFUN([gl_LARGEFILE],
+[
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  case "$host_os" in
+    mingw*)
+      dnl Native Windows.
+      dnl mingw64 defines off_t to a 64-bit type already, if
+      dnl _FILE_OFFSET_BITS=64, which is ensured by AC_SYS_LARGEFILE.
+      AC_CACHE_CHECK([for 64-bit off_t], [gl_cv_type_off_t_64],
+        [AC_COMPILE_IFELSE(
+           [AC_LANG_PROGRAM(
+              [[#include <sys/types.h>
+                int verify_off_t_size[sizeof (off_t) >= 8 ? 1 : -1];
+              ]],
+              [[]])],
+           [gl_cv_type_off_t_64=yes], [gl_cv_type_off_t_64=no])
+        ])
+      if test $gl_cv_type_off_t_64 = no; then
+        WINDOWS_64_BIT_OFF_T=1
+      else
+        WINDOWS_64_BIT_OFF_T=0
+      fi
+      dnl Some mingw versions define, if _FILE_OFFSET_BITS=64, 'struct stat'
+      dnl to 'struct _stat32i64' or 'struct _stat64' (depending on
+      dnl _USE_32BIT_TIME_T), which has a 32-bit st_size member.
+      AC_CACHE_CHECK([for 64-bit st_size], [gl_cv_member_st_size_64],
+        [AC_COMPILE_IFELSE(
+           [AC_LANG_PROGRAM(
+              [[#include <sys/types.h>
+                struct stat buf;
+                int verify_st_size_size[sizeof (buf.st_size) >= 8 ? 1 : -1];
+              ]],
+              [[]])],
+           [gl_cv_member_st_size_64=yes], [gl_cv_member_st_size_64=no])
+        ])
+      if test $gl_cv_member_st_size_64 = no; then
+        WINDOWS_64_BIT_ST_SIZE=1
+      else
+        WINDOWS_64_BIT_ST_SIZE=0
+      fi
+      ;;
+    *)
+      dnl Nothing to do on gnulib's side.
+      dnl A 64-bit off_t is
+      dnl   - already the default on Mac OS X, FreeBSD, NetBSD, OpenBSD, IRIX,
+      dnl     OSF/1, Cygwin,
+      dnl   - enabled by _FILE_OFFSET_BITS=64 (ensured by AC_SYS_LARGEFILE) on
+      dnl     glibc, HP-UX, Solaris,
+      dnl   - enabled by _LARGE_FILES=1 (ensured by AC_SYS_LARGEFILE) on AIX,
+      dnl   - impossible to achieve on Minix 3.1.8.
+      WINDOWS_64_BIT_OFF_T=0
+      WINDOWS_64_BIT_ST_SIZE=0
+      ;;
+  esac
+])
diff --git a/gl/m4/lib-ld.m4 b/gl/m4/lib-ld.m4
new file mode 100644
index 0000000..8b8a26e
--- /dev/null
+++ b/gl/m4/lib-ld.m4
@@ -0,0 +1,147 @@
+# lib-ld.m4 serial 7
+dnl Copyright (C) 1996-2003, 2009-2017 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl Subroutines of libtool.m4,
+dnl with replacements s/_*LT_PATH/AC_LIB_PROG/ and s/lt_/acl_/ to avoid
+dnl collision with libtool.m4.
+
+dnl From libtool-2.4. Sets the variable with_gnu_ld to yes or no.
+AC_DEFUN([AC_LIB_PROG_LD_GNU],
+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld],
+[# 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])
+with_gnu_ld=$acl_cv_prog_gnu_ld
+])
+
+dnl From libtool-2.4. Sets the variable LD.
+AC_DEFUN([AC_LIB_PROG_LD],
+[AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+
+AC_ARG_WITH([gnu-ld],
+    [AS_HELP_STRING([--with-gnu-ld],
+        [assume the C compiler uses GNU ld [default=no]])],
+    [test "$withval" = no || with_gnu_ld=yes],
+    [with_gnu_ld=no])dnl
+
+# 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
+
+if test -n "$LD"; then
+  AC_MSG_CHECKING([for ld])
+elif test "$GCC" = yes; then
+  AC_MSG_CHECKING([for ld used by $CC])
+elif test "$with_gnu_ld" = yes; then
+  AC_MSG_CHECKING([for GNU ld])
+else
+  AC_MSG_CHECKING([for non-GNU ld])
+fi
+if test -n "$LD"; then
+  # Let the user override the test with a path.
+  :
+else
+  AC_CACHE_VAL([acl_cv_path_LD],
+  [
+    acl_cv_path_LD= # Final result of this test
+    ac_prog=ld # Program to search in $PATH
+    if test "$GCC" = yes; then
+      # Check if gcc -print-prog-name=ld gives a path.
+      case $host in
+        *-*-mingw*)
+          # gcc leaves a trailing carriage return which upsets mingw
+          acl_output=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+        *)
+          acl_output=`($CC -print-prog-name=ld) 2>&5` ;;
+      esac
+      case $acl_output in
+        # Accept absolute paths.
+        [[\\/]]* | ?:[[\\/]]*)
+          re_direlt='/[[^/]][[^/]]*/\.\./'
+          # Canonicalize the pathname of ld
+          acl_output=`echo "$acl_output" | sed 's%\\\\%/%g'`
+          while echo "$acl_output" | grep "$re_direlt" > /dev/null 2>&1; do
+            acl_output=`echo $acl_output | sed "s%$re_direlt%/%"`
+          done
+          # Got the pathname. No search in PATH is needed.
+          acl_cv_path_LD="$acl_output"
+          ac_prog=
+          ;;
+        "")
+          # If it fails, then pretend we aren't using GCC.
+          ;;
+        *)
+          # If it is relative, then search for the first ld in PATH.
+          with_gnu_ld=unknown
+          ;;
+      esac
+    fi
+    if test -n "$ac_prog"; then
+      # Search for $ac_prog in $PATH.
+      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"
+    fi
+    case $host in
+      *-*-aix*)
+        AC_EGREP_CPP([yes],
+          [#if defined __powerpc64__ || defined _ARCH_PPC64
+           yes
+           #endif
+          ],
+          [# The compiler produces 64-bit code. Add option '-b64' so that the
+           # linker groks 64-bit object files.
+           case "$acl_cv_path_LD " in
+             *" -b64 "*) ;;
+             *) acl_cv_path_LD="$acl_cv_path_LD -b64" ;;
+           esac
+          ], [])
+        ;;
+    esac
+  ])
+  LD="$acl_cv_path_LD"
+fi
+if test -n "$LD"; then
+  AC_MSG_RESULT([$LD])
+else
+  AC_MSG_RESULT([no])
+  AC_MSG_ERROR([no acceptable ld found in \$PATH])
+fi
+AC_LIB_PROG_LD_GNU
+])
diff --git a/gl/m4/lib-link.m4 b/gl/m4/lib-link.m4
new file mode 100644
index 0000000..1ce9a5a
--- /dev/null
+++ b/gl/m4/lib-link.m4
@@ -0,0 +1,777 @@
+# lib-link.m4 serial 26 (gettext-0.18.2)
+dnl Copyright (C) 2001-2017 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+AC_PREREQ([2.54])
+
+dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
+dnl the libraries corresponding to explicit and implicit dependencies.
+dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
+dnl augments the CPPFLAGS variable.
+dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
+dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
+AC_DEFUN([AC_LIB_LINKFLAGS],
+[
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  AC_REQUIRE([AC_LIB_RPATH])
+  pushdef([Name],[m4_translit([$1],[./+-], [____])])
+  pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
+                                   [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
+  AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
+    AC_LIB_LINKFLAGS_BODY([$1], [$2])
+    ac_cv_lib[]Name[]_libs="$LIB[]NAME"
+    ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
+    ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
+    ac_cv_lib[]Name[]_prefix="$LIB[]NAME[]_PREFIX"
+  ])
+  LIB[]NAME="$ac_cv_lib[]Name[]_libs"
+  LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
+  INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
+  LIB[]NAME[]_PREFIX="$ac_cv_lib[]Name[]_prefix"
+  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
+  AC_SUBST([LIB]NAME)
+  AC_SUBST([LTLIB]NAME)
+  AC_SUBST([LIB]NAME[_PREFIX])
+  dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
+  dnl results of this search when this library appears as a dependency.
+  HAVE_LIB[]NAME=yes
+  popdef([NAME])
+  popdef([Name])
+])
+
+dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode, [missing-message])
+dnl searches for libname and the libraries corresponding to explicit and
+dnl implicit dependencies, together with the specified include files and
+dnl the ability to compile and link the specified testcode. The missing-message
+dnl defaults to 'no' and may contain additional hints for the user.
+dnl If found, it sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME}
+dnl and LTLIB${NAME} variables and augments the CPPFLAGS variable, and
+dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
+dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
+dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
+dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
+AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
+[
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  AC_REQUIRE([AC_LIB_RPATH])
+  pushdef([Name],[m4_translit([$1],[./+-], [____])])
+  pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
+                                   [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
+
+  dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
+  dnl accordingly.
+  AC_LIB_LINKFLAGS_BODY([$1], [$2])
+
+  dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
+  dnl because if the user has installed lib[]Name and not disabled its use
+  dnl via --without-lib[]Name-prefix, he wants to use it.
+  ac_save_CPPFLAGS="$CPPFLAGS"
+  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
+
+  AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
+    ac_save_LIBS="$LIBS"
+    dnl If $LIB[]NAME contains some -l options, add it to the end of LIBS,
+    dnl because these -l options might require -L options that are present in
+    dnl LIBS. -l options benefit only from the -L options listed before it.
+    dnl Otherwise, add it to the front of LIBS, because it may be a static
+    dnl library that depends on another static library that is present in LIBS.
+    dnl Static libraries benefit only from the static libraries listed after
+    dnl it.
+    case " $LIB[]NAME" in
+      *" -l"*) LIBS="$LIBS $LIB[]NAME" ;;
+      *)       LIBS="$LIB[]NAME $LIBS" ;;
+    esac
+    AC_LINK_IFELSE(
+      [AC_LANG_PROGRAM([[$3]], [[$4]])],
+      [ac_cv_lib[]Name=yes],
+      [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])'])
+    LIBS="$ac_save_LIBS"
+  ])
+  if test "$ac_cv_lib[]Name" = yes; then
+    HAVE_LIB[]NAME=yes
+    AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the lib][$1 library.])
+    AC_MSG_CHECKING([how to link with lib[]$1])
+    AC_MSG_RESULT([$LIB[]NAME])
+  else
+    HAVE_LIB[]NAME=no
+    dnl If $LIB[]NAME didn't lead to a usable library, we don't need
+    dnl $INC[]NAME either.
+    CPPFLAGS="$ac_save_CPPFLAGS"
+    LIB[]NAME=
+    LTLIB[]NAME=
+    LIB[]NAME[]_PREFIX=
+  fi
+  AC_SUBST([HAVE_LIB]NAME)
+  AC_SUBST([LIB]NAME)
+  AC_SUBST([LTLIB]NAME)
+  AC_SUBST([LIB]NAME[_PREFIX])
+  popdef([NAME])
+  popdef([Name])
+])
+
+dnl Determine the platform dependent parameters needed to use rpath:
+dnl   acl_libext,
+dnl   acl_shlibext,
+dnl   acl_libname_spec,
+dnl   acl_library_names_spec,
+dnl   acl_hardcode_libdir_flag_spec,
+dnl   acl_hardcode_libdir_separator,
+dnl   acl_hardcode_direct,
+dnl   acl_hardcode_minus_L.
+AC_DEFUN([AC_LIB_RPATH],
+[
+  dnl Tell automake >= 1.10 to complain if config.rpath is missing.
+  m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])])
+  AC_REQUIRE([AC_PROG_CC])                dnl we use $CC, $GCC, $LDFLAGS
+  AC_REQUIRE([AC_LIB_PROG_LD])            dnl we use $LD, $with_gnu_ld
+  AC_REQUIRE([AC_CANONICAL_HOST])         dnl we use $host
+  AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
+  AC_CACHE_CHECK([for shared library run path origin], [acl_cv_rpath], [
+    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
+  ])
+  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"
+  dnl Determine whether the user wants rpath handling at all.
+  AC_ARG_ENABLE([rpath],
+    [  --disable-rpath         do not hardcode runtime library paths],
+    :, enable_rpath=yes)
+])
+
+dnl AC_LIB_FROMPACKAGE(name, package)
+dnl declares that libname comes from the given package. The configure file
+dnl will then not have a --with-libname-prefix option but a
+dnl --with-package-prefix option. Several libraries can come from the same
+dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar
+dnl macro call that searches for libname.
+AC_DEFUN([AC_LIB_FROMPACKAGE],
+[
+  pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
+                                   [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
+  define([acl_frompackage_]NAME, [$2])
+  popdef([NAME])
+  pushdef([PACK],[$2])
+  pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-],
+                                     [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
+  define([acl_libsinpackage_]PACKUP,
+    m4_ifdef([acl_libsinpackage_]PACKUP, [m4_defn([acl_libsinpackage_]PACKUP)[, ]],)[lib$1])
+  popdef([PACKUP])
+  popdef([PACK])
+])
+
+dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
+dnl the libraries corresponding to explicit and implicit dependencies.
+dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
+dnl Also, sets the LIB${NAME}_PREFIX variable to nonempty if libname was found
+dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
+AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
+[
+  AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
+  pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
+                                   [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
+  pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])])
+  pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-],
+                                     [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
+  pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])])
+  dnl Autoconf >= 2.61 supports dots in --with options.
+  pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[m4_translit(PACK,[.],[_])],PACK)])
+  dnl By default, look in $includedir and $libdir.
+  use_additional=yes
+  AC_LIB_WITH_FINAL_PREFIX([
+    eval additional_includedir=\"$includedir\"
+    eval additional_libdir=\"$libdir\"
+  ])
+  AC_ARG_WITH(P_A_C_K[-prefix],
+[[  --with-]]P_A_C_K[[-prefix[=DIR]  search for ]PACKLIBS[ in DIR/include and DIR/lib
+  --without-]]P_A_C_K[[-prefix     don't search for ]PACKLIBS[ in includedir and libdir]],
+[
+    if test "X$withval" = "Xno"; then
+      use_additional=no
+    else
+      if test "X$withval" = "X"; then
+        AC_LIB_WITH_FINAL_PREFIX([
+          eval additional_includedir=\"$includedir\"
+          eval additional_libdir=\"$libdir\"
+        ])
+      else
+        additional_includedir="$withval/include"
+        additional_libdir="$withval/$acl_libdirstem"
+        if test "$acl_libdirstem2" != "$acl_libdirstem" \
+           && ! test -d "$withval/$acl_libdirstem"; then
+          additional_libdir="$withval/$acl_libdirstem2"
+        fi
+      fi
+    fi
+])
+  dnl Search the library and its dependencies in $additional_libdir and
+  dnl $LDFLAGS. Using breadth-first-seach.
+  LIB[]NAME=
+  LTLIB[]NAME=
+  INC[]NAME=
+  LIB[]NAME[]_PREFIX=
+  dnl HAVE_LIB${NAME} is an indicator that LIB${NAME}, LTLIB${NAME} have been
+  dnl computed. So it has to be reset here.
+  HAVE_LIB[]NAME=
+  rpathdirs=
+  ltrpathdirs=
+  names_already_handled=
+  names_next_round='$1 $2'
+  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"
+        dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
+        dnl or AC_LIB_HAVE_LINKFLAGS call.
+        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" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
+            eval value=\"\$LTLIB$uppername\"
+            test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
+          else
+            dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
+            dnl that this library doesn't exist. So just drop it.
+            :
+          fi
+        else
+          dnl Search the library lib$name in $additional_libdir and $LDFLAGS
+          dnl and the already constructed $LIBNAME/$LTLIBNAME.
+          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"
+            dnl The same code as in the loop below:
+            dnl First look for a shared library.
+            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
+            dnl Then look for a static library.
+            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 $LTLIB[]NAME; do
+              AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+              case "$x" in
+                -L*)
+                  dir=`echo "X$x" | sed -e 's/^X-L//'`
+                  dnl First look for a shared library.
+                  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
+                  dnl Then look for a static library.
+                  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
+            dnl Found the library.
+            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
+            if test "X$found_so" != "X"; then
+              dnl Linking with a shared library. We attempt to hardcode its
+              dnl directory into the executable's runpath, unless it's the
+              dnl standard /usr/lib.
+              if test "$enable_rpath" = no \
+                 || test "X$found_dir" = "X/usr/$acl_libdirstem" \
+                 || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
+                dnl No hardcoding is needed.
+                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+              else
+                dnl Use an explicit option to hardcode DIR into the resulting
+                dnl binary.
+                dnl Potentially add DIR to ltrpathdirs.
+                dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
+                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
+                dnl The hardcoding into $LIBNAME is system dependent.
+                if test "$acl_hardcode_direct" = yes; then
+                  dnl Using DIR/libNAME.so during linking hardcodes DIR into the
+                  dnl resulting binary.
+                  LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+                else
+                  if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
+                    dnl Use an explicit option to hardcode DIR into the resulting
+                    dnl binary.
+                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+                    dnl Potentially add DIR to rpathdirs.
+                    dnl The rpathdirs will be appended to $LIBNAME at the end.
+                    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
+                    dnl Rely on "-L$found_dir".
+                    dnl But don't add it if it's already contained in the LDFLAGS
+                    dnl or the already constructed $LIBNAME
+                    haveit=
+                    for x in $LDFLAGS $LIB[]NAME; do
+                      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+                      if test "X$x" = "X-L$found_dir"; then
+                        haveit=yes
+                        break
+                      fi
+                    done
+                    if test -z "$haveit"; then
+                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
+                    fi
+                    if test "$acl_hardcode_minus_L" != no; then
+                      dnl FIXME: Not sure whether we should use
+                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
+                      dnl here.
+                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+                    else
+                      dnl We cannot use $acl_hardcode_runpath_var and LD_RUN_PATH
+                      dnl here, because this doesn't fit in flags passed to the
+                      dnl compiler. So give up. No hardcoding. This affects only
+                      dnl very old systems.
+                      dnl FIXME: Not sure whether we should use
+                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
+                      dnl here.
+                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
+                    fi
+                  fi
+                fi
+              fi
+            else
+              if test "X$found_a" != "X"; then
+                dnl Linking with a static library.
+                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
+              else
+                dnl We shouldn't come here, but anyway it's good to have a
+                dnl fallback.
+                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
+              fi
+            fi
+            dnl Assume the include files are nearby.
+            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" = '$1'; then
+                  LIB[]NAME[]_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" = '$1'; then
+                  LIB[]NAME[]_PREFIX="$basedir"
+                fi
+                additional_includedir="$basedir/include"
+                ;;
+            esac
+            if test "X$additional_includedir" != "X"; then
+              dnl Potentially add $additional_includedir to $INCNAME.
+              dnl But don't add it
+              dnl   1. if it's the standard /usr/include,
+              dnl   2. if it's /usr/local/include and we are using GCC on Linux,
+              dnl   3. if it's already present in $CPPFLAGS or the already
+              dnl      constructed $INCNAME,
+              dnl   4. if it doesn't exist as a directory.
+              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 $INC[]NAME; do
+                    AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+                    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
+                      dnl Really add $additional_includedir to $INCNAME.
+                      INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
+                    fi
+                  fi
+                fi
+              fi
+            fi
+            dnl Look for dependencies.
+            if test -n "$found_la"; then
+              dnl Read the .la file. It defines the variables
+              dnl dlname, library_names, old_library, dependency_libs, current,
+              dnl age, revision, installed, dlopen, dlpreopen, libdir.
+              save_libdir="$libdir"
+              case "$found_la" in
+                */* | *\\*) . "$found_la" ;;
+                *) . "./$found_la" ;;
+              esac
+              libdir="$save_libdir"
+              dnl We use only dependency_libs.
+              for dep in $dependency_libs; do
+                case "$dep" in
+                  -L*)
+                    additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
+                    dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
+                    dnl But don't add it
+                    dnl   1. if it's the standard /usr/lib,
+                    dnl   2. if it's /usr/local/lib and we are using GCC on Linux,
+                    dnl   3. if it's already present in $LDFLAGS or the already
+                    dnl      constructed $LIBNAME,
+                    dnl   4. if it doesn't exist as a directory.
+                    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 $LIB[]NAME; do
+                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+                          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
+                            dnl Really add $additional_libdir to $LIBNAME.
+                            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
+                          fi
+                        fi
+                        haveit=
+                        for x in $LDFLAGS $LTLIB[]NAME; do
+                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+                          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
+                            dnl Really add $additional_libdir to $LTLIBNAME.
+                            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
+                          fi
+                        fi
+                      fi
+                    fi
+                    ;;
+                  -R*)
+                    dir=`echo "X$dep" | sed -e 's/^X-R//'`
+                    if test "$enable_rpath" != no; then
+                      dnl Potentially add DIR to rpathdirs.
+                      dnl The rpathdirs will be appended to $LIBNAME at the end.
+                      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
+                      dnl Potentially add DIR to ltrpathdirs.
+                      dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
+                      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*)
+                    dnl Handle this in the next round.
+                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
+                    ;;
+                  *.la)
+                    dnl Handle this in the next round. Throw away the .la's
+                    dnl directory; it is already contained in a preceding -L
+                    dnl option.
+                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
+                    ;;
+                  *)
+                    dnl Most likely an immediate library name.
+                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
+                    LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
+                    ;;
+                esac
+              done
+            fi
+          else
+            dnl Didn't find the library; assume it is in the system directories
+            dnl known to the linker and runtime loader. (All the system
+            dnl directories known to the linker should also be known to the
+            dnl runtime loader, otherwise the system is severely misconfigured.)
+            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
+            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
+          fi
+        fi
+      fi
+    done
+  done
+  if test "X$rpathdirs" != "X"; then
+    if test -n "$acl_hardcode_libdir_separator"; then
+      dnl Weird platform: only the last -rpath option counts, the user must
+      dnl pass all path elements in one option. We can arrange that for a
+      dnl single library, but not when more than one $LIBNAMEs are used.
+      alldirs=
+      for found_dir in $rpathdirs; do
+        alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
+      done
+      dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl.
+      acl_save_libdir="$libdir"
+      libdir="$alldirs"
+      eval flag=\"$acl_hardcode_libdir_flag_spec\"
+      libdir="$acl_save_libdir"
+      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
+    else
+      dnl The -rpath options are cumulative.
+      for found_dir in $rpathdirs; do
+        acl_save_libdir="$libdir"
+        libdir="$found_dir"
+        eval flag=\"$acl_hardcode_libdir_flag_spec\"
+        libdir="$acl_save_libdir"
+        LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
+      done
+    fi
+  fi
+  if test "X$ltrpathdirs" != "X"; then
+    dnl When using libtool, the option that works for both libraries and
+    dnl executables is -R. The -R options are cumulative.
+    for found_dir in $ltrpathdirs; do
+      LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
+    done
+  fi
+  popdef([P_A_C_K])
+  popdef([PACKLIBS])
+  popdef([PACKUP])
+  popdef([PACK])
+  popdef([NAME])
+])
+
+dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
+dnl unless already present in VAR.
+dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
+dnl contains two or three consecutive elements that belong together.
+AC_DEFUN([AC_LIB_APPENDTOVAR],
+[
+  for element in [$2]; do
+    haveit=
+    for x in $[$1]; do
+      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+      if test "X$x" = "X$element"; then
+        haveit=yes
+        break
+      fi
+    done
+    if test -z "$haveit"; then
+      [$1]="${[$1]}${[$1]:+ }$element"
+    fi
+  done
+])
+
+dnl For those cases where a variable contains several -L and -l options
+dnl referring to unknown libraries and directories, this macro determines the
+dnl necessary additional linker options for the runtime path.
+dnl AC_LIB_LINKFLAGS_FROM_LIBS([LDADDVAR], [LIBSVALUE], [USE-LIBTOOL])
+dnl sets LDADDVAR to linker options needed together with LIBSVALUE.
+dnl If USE-LIBTOOL evaluates to non-empty, linking with libtool is assumed,
+dnl otherwise linking without libtool is assumed.
+AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
+[
+  AC_REQUIRE([AC_LIB_RPATH])
+  AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
+  $1=
+  if test "$enable_rpath" != no; then
+    if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
+      dnl Use an explicit option to hardcode directories into the resulting
+      dnl binary.
+      rpathdirs=
+      next=
+      for opt in $2; do
+        if test -n "$next"; then
+          dir="$next"
+          dnl No need to hardcode the standard /usr/lib.
+          if test "X$dir" != "X/usr/$acl_libdirstem" \
+             && test "X$dir" != "X/usr/$acl_libdirstem2"; then
+            rpathdirs="$rpathdirs $dir"
+          fi
+          next=
+        else
+          case $opt in
+            -L) next=yes ;;
+            -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'`
+                 dnl No need to hardcode the standard /usr/lib.
+                 if test "X$dir" != "X/usr/$acl_libdirstem" \
+                    && test "X$dir" != "X/usr/$acl_libdirstem2"; then
+                   rpathdirs="$rpathdirs $dir"
+                 fi
+                 next= ;;
+            *) next= ;;
+          esac
+        fi
+      done
+      if test "X$rpathdirs" != "X"; then
+        if test -n ""$3""; then
+          dnl libtool is used for linking. Use -R options.
+          for dir in $rpathdirs; do
+            $1="${$1}${$1:+ }-R$dir"
+          done
+        else
+          dnl The linker is used for linking directly.
+          if test -n "$acl_hardcode_libdir_separator"; then
+            dnl Weird platform: only the last -rpath option counts, the user
+            dnl must pass all path elements in one option.
+            alldirs=
+            for dir in $rpathdirs; do
+              alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir"
+            done
+            acl_save_libdir="$libdir"
+            libdir="$alldirs"
+            eval flag=\"$acl_hardcode_libdir_flag_spec\"
+            libdir="$acl_save_libdir"
+            $1="$flag"
+          else
+            dnl The -rpath options are cumulative.
+            for dir in $rpathdirs; do
+              acl_save_libdir="$libdir"
+              libdir="$dir"
+              eval flag=\"$acl_hardcode_libdir_flag_spec\"
+              libdir="$acl_save_libdir"
+              $1="${$1}${$1:+ }$flag"
+            done
+          fi
+        fi
+      fi
+    fi
+  fi
+  AC_SUBST([$1])
+])
diff --git a/gl/m4/lib-prefix.m4 b/gl/m4/lib-prefix.m4
new file mode 100644
index 0000000..a5d56c8
--- /dev/null
+++ b/gl/m4/lib-prefix.m4
@@ -0,0 +1,241 @@
+# lib-prefix.m4 serial 8
+dnl Copyright (C) 2001-2005, 2008-2017 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
+dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
+dnl require excessive bracketing.
+ifdef([AC_HELP_STRING],
+[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
+[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
+
+dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
+dnl to access previously installed libraries. The basic assumption is that
+dnl a user will want packages to use other packages he previously installed
+dnl with the same --prefix option.
+dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
+dnl libraries, but is otherwise very convenient.
+AC_DEFUN([AC_LIB_PREFIX],
+[
+  AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
+  AC_REQUIRE([AC_PROG_CC])
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  dnl By default, look in $includedir and $libdir.
+  use_additional=yes
+  AC_LIB_WITH_FINAL_PREFIX([
+    eval additional_includedir=\"$includedir\"
+    eval additional_libdir=\"$libdir\"
+  ])
+  AC_LIB_ARG_WITH([lib-prefix],
+[  --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
+  --without-lib-prefix    don't search for libraries in includedir and libdir],
+[
+    if test "X$withval" = "Xno"; then
+      use_additional=no
+    else
+      if test "X$withval" = "X"; then
+        AC_LIB_WITH_FINAL_PREFIX([
+          eval additional_includedir=\"$includedir\"
+          eval additional_libdir=\"$libdir\"
+        ])
+      else
+        additional_includedir="$withval/include"
+        additional_libdir="$withval/$acl_libdirstem"
+      fi
+    fi
+])
+  if test $use_additional = yes; then
+    dnl Potentially add $additional_includedir to $CPPFLAGS.
+    dnl But don't add it
+    dnl   1. if it's the standard /usr/include,
+    dnl   2. if it's already present in $CPPFLAGS,
+    dnl   3. if it's /usr/local/include and we are using GCC on Linux,
+    dnl   4. if it doesn't exist as a directory.
+    if test "X$additional_includedir" != "X/usr/include"; then
+      haveit=
+      for x in $CPPFLAGS; do
+        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+        if test "X$x" = "X-I$additional_includedir"; then
+          haveit=yes
+          break
+        fi
+      done
+      if test -z "$haveit"; then
+        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
+          if test -d "$additional_includedir"; then
+            dnl Really add $additional_includedir to $CPPFLAGS.
+            CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
+          fi
+        fi
+      fi
+    fi
+    dnl Potentially add $additional_libdir to $LDFLAGS.
+    dnl But don't add it
+    dnl   1. if it's the standard /usr/lib,
+    dnl   2. if it's already present in $LDFLAGS,
+    dnl   3. if it's /usr/local/lib and we are using GCC on Linux,
+    dnl   4. if it doesn't exist as a directory.
+    if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
+      haveit=
+      for x in $LDFLAGS; do
+        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+        if test "X$x" = "X-L$additional_libdir"; then
+          haveit=yes
+          break
+        fi
+      done
+      if test -z "$haveit"; then
+        if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
+          if test -n "$GCC"; then
+            case $host_os in
+              linux*) haveit=yes;;
+            esac
+          fi
+        fi
+        if test -z "$haveit"; then
+          if test -d "$additional_libdir"; then
+            dnl Really add $additional_libdir to $LDFLAGS.
+            LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
+          fi
+        fi
+      fi
+    fi
+  fi
+])
+
+dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
+dnl acl_final_exec_prefix, containing the values to which $prefix and
+dnl $exec_prefix will expand at the end of the configure script.
+AC_DEFUN([AC_LIB_PREPARE_PREFIX],
+[
+  dnl Unfortunately, prefix and exec_prefix get only finally determined
+  dnl at the end of configure.
+  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"
+])
+
+dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
+dnl variables prefix and exec_prefix bound to the values they will have
+dnl at the end of the configure script.
+AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
+[
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  $1
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+])
+
+dnl AC_LIB_PREPARE_MULTILIB creates
+dnl - a variable acl_libdirstem, containing the basename of the libdir, either
+dnl   "lib" or "lib64" or "lib/64",
+dnl - a variable acl_libdirstem2, as a secondary possible value for
+dnl   acl_libdirstem, either the same as acl_libdirstem or "lib/sparcv9" or
+dnl   "lib/amd64".
+AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
+[
+  dnl There is no formal standard regarding lib and lib64.
+  dnl On glibc systems, the current practice is that on a system supporting
+  dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
+  dnl $prefix/lib64 and 32-bit libraries go under $prefix/lib. We determine
+  dnl the compiler's default mode by looking at the compiler's library search
+  dnl path. If at least one of its elements ends in /lib64 or points to a
+  dnl directory whose absolute pathname ends in /lib64, we assume a 64-bit ABI.
+  dnl Otherwise we use the default, namely "lib".
+  dnl On Solaris systems, the current practice is that on a system supporting
+  dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
+  dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or
+  dnl $prefix/lib/amd64) and 32-bit libraries go under $prefix/lib.
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  dnl Allow the user to override the result by setting acl_cv_libdirstems.
+  AC_CACHE_CHECK([for the common suffixes of directories in the library search path],
+    [acl_cv_libdirstems],
+    [acl_libdirstem=lib
+     acl_libdirstem2=
+     case "$host_os" in
+       solaris*)
+         dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment
+         dnl <http://docs.sun.com/app/docs/doc/816-5138/dev-env?l=en&a=view>.
+         dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link."
+         dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the
+         dnl symlink is missing, so we set acl_libdirstem2 too.
+         AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit],
+           [AC_EGREP_CPP([sixtyfour bits], [
+#ifdef _LP64
+sixtyfour bits
+#endif
+              ], [gl_cv_solaris_64bit=yes], [gl_cv_solaris_64bit=no])
+           ])
+         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
+         ;;
+       *)
+         dnl The result is a property of the system. However, non-system
+         dnl compilers sometimes have odd library search paths. Therefore
+         dnl prefer asking /usr/bin/gcc, if available, rather than $CC.
+         searchpath=`(if test -f /usr/bin/gcc \
+                         && LC_ALL=C /usr/bin/gcc -print-search-dirs >/dev/null 2>/dev/null; then \
+                        LC_ALL=C /usr/bin/gcc -print-search-dirs; \
+                      else \
+                        LC_ALL=C $CC -print-search-dirs; \
+                      fi) 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"
+     acl_cv_libdirstems="$acl_libdirstem,$acl_libdirstem2"
+    ])
+  # Decompose acl_cv_libdirstems into acl_libdirstem and acl_libdirstem2.
+  acl_libdirstem=`echo "$acl_cv_libdirstems" | sed -e 's/,.*//'`
+  acl_libdirstem2=`echo "$acl_cv_libdirstems" | sed -e '/,/s/.*,//'`
+])
diff --git a/gl/m4/limits-h.m4 b/gl/m4/limits-h.m4
new file mode 100644
index 0000000..443f91b
--- /dev/null
+++ b/gl/m4/limits-h.m4
@@ -0,0 +1,31 @@
+dnl Check whether limits.h has needed features.
+
+dnl Copyright 2016-2017 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Paul Eggert.
+
+AC_DEFUN_ONCE([gl_LIMITS_H],
+[
+  gl_CHECK_NEXT_HEADERS([limits.h])
+
+  AC_CACHE_CHECK([whether limits.h has ULLONG_WIDTH etc.],
+    [gl_cv_header_limits_width],
+    [AC_COMPILE_IFELSE(
+       [AC_LANG_PROGRAM([[#ifndef __STDC_WANT_IEC_60559_BFP_EXT__
+                           #define __STDC_WANT_IEC_60559_BFP_EXT__ 1
+                          #endif
+                          #include <limits.h>
+                          int ullw = ULLONG_WIDTH;]])],
+       [gl_cv_header_limits_width=yes],
+       [gl_cv_header_limits_width=no])])
+  if test "$gl_cv_header_limits_width" = yes; then
+    LIMITS_H=
+  else
+    LIMITS_H=limits.h
+  fi
+  AC_SUBST([LIMITS_H])
+  AM_CONDITIONAL([GL_GENERATE_LIMITS_H], [test -n "$LIMITS_H"])
+])
diff --git a/gl/m4/localcharset.m4 b/gl/m4/localcharset.m4
new file mode 100644
index 0000000..0c1ff38
--- /dev/null
+++ b/gl/m4/localcharset.m4
@@ -0,0 +1,17 @@
+# localcharset.m4 serial 7
+dnl Copyright (C) 2002, 2004, 2006, 2009-2017 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_LOCALCHARSET],
+[
+  dnl Prerequisites of lib/localcharset.c.
+  AC_REQUIRE([AM_LANGINFO_CODESET])
+  AC_REQUIRE([gl_FCNTL_O_FLAGS])
+  AC_CHECK_DECLS_ONCE([getc_unlocked])
+
+  dnl Prerequisites of the lib/Makefile.am snippet.
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_REQUIRE([gl_GLIBC21])
+])
diff --git a/gl/m4/locale-fr.m4 b/gl/m4/locale-fr.m4
new file mode 100644
index 0000000..93d3da7
--- /dev/null
+++ b/gl/m4/locale-fr.m4
@@ -0,0 +1,250 @@
+# locale-fr.m4 serial 17
+dnl Copyright (C) 2003, 2005-2017 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+dnl Determine the name of a french locale with traditional encoding.
+AC_DEFUN([gt_LOCALE_FR],
+[
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_REQUIRE([AM_LANGINFO_CODESET])
+  AC_CACHE_CHECK([for a traditional french locale], [gt_cv_locale_fr], [
+    AC_LANG_CONFTEST([AC_LANG_SOURCE([
+changequote(,)dnl
+#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;
+}
+changequote([,])dnl
+      ])])
+    if AC_TRY_EVAL([ac_link]) && 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*
+  ])
+  LOCALE_FR=$gt_cv_locale_fr
+  AC_SUBST([LOCALE_FR])
+])
+
+dnl Determine the name of a french locale with UTF-8 encoding.
+AC_DEFUN([gt_LOCALE_FR_UTF8],
+[
+  AC_REQUIRE([AM_LANGINFO_CODESET])
+  AC_CACHE_CHECK([for a french Unicode locale], [gt_cv_locale_fr_utf8], [
+    AC_LANG_CONFTEST([AC_LANG_SOURCE([
+changequote(,)dnl
+#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;
+}
+changequote([,])dnl
+      ])])
+    if AC_TRY_EVAL([ac_link]) && 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*
+  ])
+  LOCALE_FR_UTF8=$gt_cv_locale_fr_utf8
+  AC_SUBST([LOCALE_FR_UTF8])
+])
diff --git a/gl/m4/locale-ja.m4 b/gl/m4/locale-ja.m4
new file mode 100644
index 0000000..c1d1154
--- /dev/null
+++ b/gl/m4/locale-ja.m4
@@ -0,0 +1,136 @@
+# locale-ja.m4 serial 12
+dnl Copyright (C) 2003, 2005-2017 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+dnl Determine the name of a japanese locale with EUC-JP encoding.
+AC_DEFUN([gt_LOCALE_JA],
+[
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_REQUIRE([AM_LANGINFO_CODESET])
+  AC_CACHE_CHECK([for a traditional japanese locale], [gt_cv_locale_ja], [
+    AC_LANG_CONFTEST([AC_LANG_SOURCE([
+changequote(,)dnl
+#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;
+}
+changequote([,])dnl
+      ])])
+    if AC_TRY_EVAL([ac_link]) && 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*
+  ])
+  LOCALE_JA=$gt_cv_locale_ja
+  AC_SUBST([LOCALE_JA])
+])
diff --git a/gl/m4/locale-zh.m4 b/gl/m4/locale-zh.m4
new file mode 100644
index 0000000..1459418
--- /dev/null
+++ b/gl/m4/locale-zh.m4
@@ -0,0 +1,130 @@
+# locale-zh.m4 serial 12
+dnl Copyright (C) 2003, 2005-2017 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+dnl Determine the name of a chinese locale with GB18030 encoding.
+AC_DEFUN([gt_LOCALE_ZH_CN],
+[
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_REQUIRE([AM_LANGINFO_CODESET])
+  AC_CACHE_CHECK([for a transitional chinese locale], [gt_cv_locale_zh_CN], [
+    AC_LANG_CONFTEST([AC_LANG_SOURCE([
+changequote(,)dnl
+#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;
+}
+changequote([,])dnl
+      ])])
+    if AC_TRY_EVAL([ac_link]) && 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*
+  ])
+  LOCALE_ZH_CN=$gt_cv_locale_zh_CN
+  AC_SUBST([LOCALE_ZH_CN])
+])
diff --git a/gl/m4/locale_h.m4 b/gl/m4/locale_h.m4
new file mode 100644
index 0000000..7426a65
--- /dev/null
+++ b/gl/m4/locale_h.m4
@@ -0,0 +1,122 @@
+# locale_h.m4 serial 19
+dnl Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_LOCALE_H],
+[
+  dnl Use AC_REQUIRE here, so that the default behavior below is expanded
+  dnl once only, before all statements that occur in other macros.
+  AC_REQUIRE([gl_LOCALE_H_DEFAULTS])
+
+  dnl Persuade glibc <locale.h> to define locale_t and the int_p_*, int_n_*
+  dnl members of 'struct lconv'.
+  AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
+
+  dnl If <stddef.h> is replaced, then <locale.h> must also be replaced.
+  AC_REQUIRE([gl_STDDEF_H])
+
+  dnl Solaris 11 2011-11 defines the int_p_*, int_n_* members of 'struct lconv'
+  dnl only if _LCONV_C99 is defined.
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  case "$host_os" in
+    solaris*)
+      AC_DEFINE([_LCONV_C99], [1], [Define to 1 on Solaris.])
+      ;;
+  esac
+
+  AC_CACHE_CHECK([whether locale.h conforms to POSIX:2001],
+    [gl_cv_header_locale_h_posix2001],
+    [AC_COMPILE_IFELSE(
+       [AC_LANG_PROGRAM(
+          [[#include <locale.h>
+            int x = LC_MESSAGES;
+            int y = sizeof (((struct lconv *) 0)->decimal_point);]],
+          [[]])],
+       [gl_cv_header_locale_h_posix2001=yes],
+       [gl_cv_header_locale_h_posix2001=no])])
+
+  dnl Check for <xlocale.h>.
+  AC_CHECK_HEADERS_ONCE([xlocale.h])
+  if test $ac_cv_header_xlocale_h = yes; then
+    HAVE_XLOCALE_H=1
+    dnl Check whether use of locale_t requires inclusion of <xlocale.h>,
+    dnl e.g. on Mac OS X 10.5. If <locale.h> does not define locale_t by
+    dnl itself, we assume that <xlocale.h> will do so.
+    AC_CACHE_CHECK([whether locale.h defines locale_t],
+      [gl_cv_header_locale_has_locale_t],
+      [AC_COMPILE_IFELSE(
+         [AC_LANG_PROGRAM(
+            [[#include <locale.h>
+              locale_t x;]],
+            [[]])],
+         [gl_cv_header_locale_has_locale_t=yes],
+         [gl_cv_header_locale_has_locale_t=no])
+      ])
+    if test $gl_cv_header_locale_has_locale_t = yes; then
+      gl_cv_header_locale_h_needs_xlocale_h=no
+    else
+      gl_cv_header_locale_h_needs_xlocale_h=yes
+    fi
+  else
+    HAVE_XLOCALE_H=0
+    gl_cv_header_locale_h_needs_xlocale_h=no
+  fi
+  AC_SUBST([HAVE_XLOCALE_H])
+
+  dnl Check whether 'struct lconv' is complete.
+  dnl Bionic libc's 'struct lconv' is just a dummy.
+  dnl On OpenBSD 4.9, HP-UX 11, IRIX 6.5, OSF/1 5.1, Solaris 9, Cygwin 1.5.x,
+  dnl mingw, MSVC 9, it lacks the int_p_* and int_n_* members.
+  AC_CACHE_CHECK([whether struct lconv is properly defined],
+    [gl_cv_sys_struct_lconv_ok],
+    [AC_COMPILE_IFELSE(
+       [AC_LANG_PROGRAM(
+          [[#include <locale.h>
+            struct lconv l;
+            int x = sizeof (l.decimal_point);
+            int y = sizeof (l.int_p_cs_precedes);]],
+          [[]])],
+       [gl_cv_sys_struct_lconv_ok=yes],
+       [gl_cv_sys_struct_lconv_ok=no])
+    ])
+  if test $gl_cv_sys_struct_lconv_ok = no; then
+    REPLACE_STRUCT_LCONV=1
+  fi
+
+  dnl <locale.h> is always overridden, because of GNULIB_POSIXCHECK.
+  gl_NEXT_HEADERS([locale.h])
+
+  dnl Check for declarations of anything we want to poison if the
+  dnl corresponding gnulib module is not in use.
+  gl_WARN_ON_USE_PREPARE([[#include <locale.h>
+/* Some systems provide declarations in a non-standard header.  */
+#if HAVE_XLOCALE_H
+# include <xlocale.h>
+#endif
+    ]],
+    [setlocale duplocale])
+])
+
+AC_DEFUN([gl_LOCALE_MODULE_INDICATOR],
+[
+  dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
+  AC_REQUIRE([gl_LOCALE_H_DEFAULTS])
+  gl_MODULE_INDICATOR_SET_VARIABLE([$1])
+  dnl Define it also as a C macro, for the benefit of the unit tests.
+  gl_MODULE_INDICATOR_FOR_TESTS([$1])
+])
+
+AC_DEFUN([gl_LOCALE_H_DEFAULTS],
+[
+  GNULIB_LOCALECONV=0; AC_SUBST([GNULIB_LOCALECONV])
+  GNULIB_SETLOCALE=0;  AC_SUBST([GNULIB_SETLOCALE])
+  GNULIB_DUPLOCALE=0;  AC_SUBST([GNULIB_DUPLOCALE])
+  dnl Assume proper GNU behavior unless another module says otherwise.
+  HAVE_DUPLOCALE=1;       AC_SUBST([HAVE_DUPLOCALE])
+  REPLACE_LOCALECONV=0;   AC_SUBST([REPLACE_LOCALECONV])
+  REPLACE_SETLOCALE=0;    AC_SUBST([REPLACE_SETLOCALE])
+  REPLACE_DUPLOCALE=0;    AC_SUBST([REPLACE_DUPLOCALE])
+  REPLACE_STRUCT_LCONV=0; AC_SUBST([REPLACE_STRUCT_LCONV])
+])
diff --git a/gl/m4/localeconv.m4 b/gl/m4/localeconv.m4
new file mode 100644
index 0000000..c287aa5
--- /dev/null
+++ b/gl/m4/localeconv.m4
@@ -0,0 +1,22 @@
+# localeconv.m4 serial 1
+dnl Copyright (C) 2012-2017 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_FUNC_LOCALECONV],
+[
+  AC_REQUIRE([gl_LOCALE_H_DEFAULTS])
+  AC_REQUIRE([gl_LOCALE_H])
+
+  if test $REPLACE_STRUCT_LCONV = 1; then
+    REPLACE_LOCALECONV=1
+  fi
+])
+
+# Prerequisites of lib/localeconv.c.
+AC_DEFUN([gl_PREREQ_LOCALECONV],
+[
+  AC_CHECK_MEMBERS([struct lconv.decimal_point], [], [],
+    [[#include <locale.h>]])
+])
diff --git a/gl/m4/localtime-buffer.m4 b/gl/m4/localtime-buffer.m4
new file mode 100644
index 0000000..3965b5d
--- /dev/null
+++ b/gl/m4/localtime-buffer.m4
@@ -0,0 +1,21 @@
+# localtime-buffer.m4 serial 1
+dnl Copyright (C) 2017 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_LOCALTIME_BUFFER_DEFAULTS],
+[
+  NEED_LOCALTIME_BUFFER=0
+])
+
+dnl Macro invoked from other modules, to signal that the compilation of
+dnl module 'localtime-buffer' is needed.
+AC_DEFUN([gl_LOCALTIME_BUFFER_NEEDED],
+[
+  AC_REQUIRE([gl_LOCALTIME_BUFFER_DEFAULTS])
+  AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS])
+  NEED_LOCALTIME_BUFFER=1
+  REPLACE_GMTIME=1
+  REPLACE_LOCALTIME=1
+])
diff --git a/gl/m4/lock.m4 b/gl/m4/lock.m4
new file mode 100644
index 0000000..cb04a67
--- /dev/null
+++ b/gl/m4/lock.m4
@@ -0,0 +1,47 @@
+# lock.m4 serial 14
+dnl Copyright (C) 2005-2017 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+AC_DEFUN([gl_LOCK],
+[
+  AC_REQUIRE([gl_THREADLIB])
+  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.
+    has_rwlock=false
+    AC_CHECK_TYPE([pthread_rwlock_t],
+      [has_rwlock=true
+       AC_DEFINE([HAVE_PTHREAD_RWLOCK], [1],
+         [Define if the POSIX multithreading library has read/write locks.])],
+      [],
+      [#include <pthread.h>])
+    if $has_rwlock; then
+      gl_PTHREAD_RWLOCK_RDLOCK_PREFER_WRITER
+    fi
+    # glibc defines PTHREAD_MUTEX_RECURSIVE as enum, not as a macro.
+    AC_COMPILE_IFELSE([
+      AC_LANG_PROGRAM(
+        [[#include <pthread.h>]],
+        [[
+#if __FreeBSD__ == 4
+error "No, in FreeBSD 4.0 recursive mutexes actually don't work."
+#elif (defined __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ \
+       && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1070)
+error "No, in Mac OS X < 10.7 recursive mutexes actually don't work."
+#else
+int x = (int)PTHREAD_MUTEX_RECURSIVE;
+return !x;
+#endif
+        ]])],
+      [AC_DEFINE([HAVE_PTHREAD_MUTEX_RECURSIVE], [1],
+         [Define if the <pthread.h> defines PTHREAD_MUTEX_RECURSIVE.])])
+  fi
+  gl_PREREQ_LOCK
+])
+
+# Prerequisites of lib/glthread/lock.c.
+AC_DEFUN([gl_PREREQ_LOCK], [:])
diff --git a/gl/m4/longlong.m4 b/gl/m4/longlong.m4
new file mode 100644
index 0000000..9a3294b
--- /dev/null
+++ b/gl/m4/longlong.m4
@@ -0,0 +1,113 @@
+# longlong.m4 serial 17
+dnl Copyright (C) 1999-2007, 2009-2017 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Paul Eggert.
+
+# Define HAVE_LONG_LONG_INT if 'long long int' works.
+# This fixes a bug in Autoconf 2.61, and can be faster
+# than what's in Autoconf 2.62 through 2.68.
+
+# Note: If the type 'long long int' exists but is only 32 bits large
+# (as on some very old compilers), HAVE_LONG_LONG_INT will not be
+# defined. In this case you can treat 'long long int' like 'long int'.
+
+AC_DEFUN([AC_TYPE_LONG_LONG_INT],
+[
+  AC_REQUIRE([AC_TYPE_UNSIGNED_LONG_LONG_INT])
+  AC_CACHE_CHECK([for long long int], [ac_cv_type_long_long_int],
+     [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
+          dnl Catch a bug in Tandem NonStop Kernel (OSS) cc -O circa 2004.
+          dnl If cross compiling, assume the bug is not important, since
+          dnl nobody cross compiles for this platform as far as we know.
+          AC_RUN_IFELSE(
+            [AC_LANG_PROGRAM(
+               [[@%:@include <limits.h>
+                 @%:@ifndef LLONG_MAX
+                 @%:@ define HALF \
+                          (1LL << (sizeof (long long int) * CHAR_BIT - 2))
+                 @%:@ define LLONG_MAX (HALF - 1 + HALF)
+                 @%:@endif]],
+               [[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;]])],
+            [],
+            [ac_cv_type_long_long_int=no],
+            [:])
+        fi
+      fi])
+  if test $ac_cv_type_long_long_int = yes; then
+    AC_DEFINE([HAVE_LONG_LONG_INT], [1],
+      [Define to 1 if the system has the type 'long long int'.])
+  fi
+])
+
+# Define HAVE_UNSIGNED_LONG_LONG_INT if 'unsigned long long int' works.
+# This fixes a bug in Autoconf 2.61, and can be faster
+# than what's in Autoconf 2.62 through 2.68.
+
+# Note: If the type 'unsigned long long int' exists but is only 32 bits
+# large (as on some very old compilers), AC_TYPE_UNSIGNED_LONG_LONG_INT
+# will not be defined. In this case you can treat 'unsigned long long int'
+# like 'unsigned long int'.
+
+AC_DEFUN([AC_TYPE_UNSIGNED_LONG_LONG_INT],
+[
+  AC_CACHE_CHECK([for unsigned long long int],
+    [ac_cv_type_unsigned_long_long_int],
+    [ac_cv_type_unsigned_long_long_int=yes
+     if test "x${ac_cv_prog_cc_c99-no}" = xno; then
+       AC_LINK_IFELSE(
+         [_AC_TYPE_LONG_LONG_SNIPPET],
+         [],
+         [ac_cv_type_unsigned_long_long_int=no])
+     fi])
+  if test $ac_cv_type_unsigned_long_long_int = yes; then
+    AC_DEFINE([HAVE_UNSIGNED_LONG_LONG_INT], [1],
+      [Define to 1 if the system has the type 'unsigned long long int'.])
+  fi
+])
+
+# Expands to a C program that can be used to test for simultaneous support
+# of 'long long' and 'unsigned long long'. We don't want to say that
+# 'long long' is available if 'unsigned long long' is not, or vice versa,
+# because too many programs rely on the symmetry between signed and unsigned
+# integer types (excluding 'bool').
+AC_DEFUN([_AC_TYPE_LONG_LONG_SNIPPET],
+[
+  AC_LANG_PROGRAM(
+    [[/* 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;]],
+    [[/* 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));]])
+])
diff --git a/gl/m4/lstat.m4 b/gl/m4/lstat.m4
new file mode 100644
index 0000000..0b6e5d7
--- /dev/null
+++ b/gl/m4/lstat.m4
@@ -0,0 +1,75 @@
+# serial 29
+
+# Copyright (C) 1997-2001, 2003-2017 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+dnl From Jim Meyering.
+
+AC_DEFUN([gl_FUNC_LSTAT],
+[
+  AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS])
+  dnl If lstat does not exist, the replacement <sys/stat.h> does
+  dnl "#define lstat stat", and lstat.c is a no-op.
+  AC_CHECK_FUNCS_ONCE([lstat])
+  if test $ac_cv_func_lstat = yes; then
+    AC_REQUIRE([gl_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK])
+    case "$gl_cv_func_lstat_dereferences_slashed_symlink" in
+      *no)
+        REPLACE_LSTAT=1
+        ;;
+    esac
+  else
+    HAVE_LSTAT=0
+  fi
+])
+
+# Prerequisites of lib/lstat.c.
+AC_DEFUN([gl_PREREQ_LSTAT], [:])
+
+AC_DEFUN([gl_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK],
+[
+  dnl We don't use AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK any more, because it
+  dnl is no longer maintained in Autoconf and because it invokes AC_LIBOBJ.
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+  AC_CACHE_CHECK([whether lstat correctly handles trailing slash],
+    [gl_cv_func_lstat_dereferences_slashed_symlink],
+    [rm -f conftest.sym conftest.file
+     echo >conftest.file
+     AC_RUN_IFELSE(
+       [AC_LANG_PROGRAM(
+          [AC_INCLUDES_DEFAULT],
+          [[struct stat sbuf;
+            if (symlink ("conftest.file", "conftest.sym") != 0)
+              return 1;
+            /* Linux will dereference the symlink and fail, as required by
+               POSIX.  That is better in the sense that it means we will not
+               have to compile and use the lstat wrapper.  */
+            return lstat ("conftest.sym/", &sbuf) == 0;
+          ]])],
+       [gl_cv_func_lstat_dereferences_slashed_symlink=yes],
+       [gl_cv_func_lstat_dereferences_slashed_symlink=no],
+       [case "$host_os" in
+          *-gnu*)
+            # Guess yes on glibc systems.
+            gl_cv_func_lstat_dereferences_slashed_symlink="guessing yes" ;;
+          mingw*)
+            # Guess no on native Windows.
+            gl_cv_func_lstat_dereferences_slashed_symlink="guessing no" ;;
+          *)
+            # If we don't know, assume the worst.
+            gl_cv_func_lstat_dereferences_slashed_symlink="guessing no" ;;
+        esac
+       ])
+     rm -f conftest.sym conftest.file
+    ])
+  case "$gl_cv_func_lstat_dereferences_slashed_symlink" in
+    *yes)
+      AC_DEFINE_UNQUOTED([LSTAT_FOLLOWS_SLASHED_SYMLINK], [1],
+        [Define to 1 if 'lstat' dereferences a symlink specified
+         with a trailing slash.])
+      ;;
+  esac
+])
diff --git a/gl/m4/malloca.m4 b/gl/m4/malloca.m4
new file mode 100644
index 0000000..6956baf
--- /dev/null
+++ b/gl/m4/malloca.m4
@@ -0,0 +1,15 @@
+# malloca.m4 serial 1
+dnl Copyright (C) 2003-2004, 2006-2007, 2009-2017 Free Software Foundation,
+dnl Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_MALLOCA],
+[
+  dnl Use the autoconf tests for alloca(), but not the AC_SUBSTed variables
+  dnl @ALLOCA@ and @LTALLOCA@.
+  dnl gl_FUNC_ALLOCA   dnl Already brought in by the module dependencies.
+  AC_REQUIRE([gl_EEMALLOC])
+  AC_REQUIRE([AC_TYPE_LONG_LONG_INT])
+])
diff --git a/gl/m4/mbrtowc.m4 b/gl/m4/mbrtowc.m4
new file mode 100644
index 0000000..216594e
--- /dev/null
+++ b/gl/m4/mbrtowc.m4
@@ -0,0 +1,672 @@
+# mbrtowc.m4 serial 29  -*- coding: utf-8 -*-
+dnl Copyright (C) 2001-2002, 2004-2005, 2008-2017 Free Software Foundation,
+dnl Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_FUNC_MBRTOWC],
+[
+  AC_REQUIRE([gl_WCHAR_H_DEFAULTS])
+
+  AC_REQUIRE([AC_TYPE_MBSTATE_T])
+  gl_MBSTATE_T_BROKEN
+
+  AC_CHECK_FUNCS_ONCE([mbrtowc])
+  if test $ac_cv_func_mbrtowc = no; then
+    HAVE_MBRTOWC=0
+    AC_CHECK_DECLS([mbrtowc],,, [[
+/* 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 $ac_cv_have_decl_mbrtowc = yes; then
+      dnl On Minix 3.1.8, the system's <wchar.h> declares mbrtowc() although
+      dnl it does not have the function. Avoid a collision with gnulib's
+      dnl replacement.
+      REPLACE_MBRTOWC=1
+    fi
+  else
+    if test $REPLACE_MBSTATE_T = 1; then
+      REPLACE_MBRTOWC=1
+    else
+      gl_MBRTOWC_NULL_ARG1
+      gl_MBRTOWC_NULL_ARG2
+      gl_MBRTOWC_RETVAL
+      gl_MBRTOWC_NUL_RETVAL
+      gl_MBRTOWC_EMPTY_INPUT
+      gl_MBRTOWC_C_LOCALE
+      case "$gl_cv_func_mbrtowc_null_arg1" in
+        *yes) ;;
+        *) AC_DEFINE([MBRTOWC_NULL_ARG1_BUG], [1],
+             [Define if the mbrtowc function has the NULL pwc argument bug.])
+           REPLACE_MBRTOWC=1
+           ;;
+      esac
+      case "$gl_cv_func_mbrtowc_null_arg2" in
+        *yes) ;;
+        *) AC_DEFINE([MBRTOWC_NULL_ARG2_BUG], [1],
+             [Define if the mbrtowc function has the NULL string argument bug.])
+           REPLACE_MBRTOWC=1
+           ;;
+      esac
+      case "$gl_cv_func_mbrtowc_retval" in
+        *yes) ;;
+        *) AC_DEFINE([MBRTOWC_RETVAL_BUG], [1],
+             [Define if the mbrtowc function returns a wrong return value.])
+           REPLACE_MBRTOWC=1
+           ;;
+      esac
+      case "$gl_cv_func_mbrtowc_nul_retval" in
+        *yes) ;;
+        *) AC_DEFINE([MBRTOWC_NUL_RETVAL_BUG], [1],
+             [Define if the mbrtowc function does not return 0 for a NUL character.])
+           REPLACE_MBRTOWC=1
+           ;;
+      esac
+      case "$gl_cv_func_mbrtowc_empty_input" in
+        *yes) ;;
+        *) AC_DEFINE([MBRTOWC_EMPTY_INPUT_BUG], [1],
+             [Define if the mbrtowc function does not return (size_t) -2
+              for empty input.])
+           REPLACE_MBRTOWC=1
+           ;;
+      esac
+      case $gl_cv_C_locale_sans_EILSEQ in
+        *yes) ;;
+        *) AC_DEFINE([C_LOCALE_MAYBE_EILSEQ], [1],
+             [Define to 1 if the C locale may have encoding errors.])
+           REPLACE_MBRTOWC=1
+           ;;
+      esac
+    fi
+  fi
+])
+
+dnl Test whether mbsinit() and mbrtowc() need to be overridden in a way that
+dnl redefines the semantics of the given mbstate_t type.
+dnl Result is REPLACE_MBSTATE_T.
+dnl When this is set to 1, we replace both mbsinit() and mbrtowc(), in order to
+dnl avoid inconsistencies.
+
+AC_DEFUN([gl_MBSTATE_T_BROKEN],
+[
+  AC_REQUIRE([gl_WCHAR_H_DEFAULTS])
+
+  AC_REQUIRE([AC_TYPE_MBSTATE_T])
+  AC_CHECK_FUNCS_ONCE([mbsinit])
+  AC_CHECK_FUNCS_ONCE([mbrtowc])
+  if test $ac_cv_func_mbsinit = yes && test $ac_cv_func_mbrtowc = yes; then
+    gl_MBRTOWC_INCOMPLETE_STATE
+    gl_MBRTOWC_SANITYCHECK
+    REPLACE_MBSTATE_T=0
+    case "$gl_cv_func_mbrtowc_incomplete_state" in
+      *yes) ;;
+      *) REPLACE_MBSTATE_T=1 ;;
+    esac
+    case "$gl_cv_func_mbrtowc_sanitycheck" in
+      *yes) ;;
+      *) REPLACE_MBSTATE_T=1 ;;
+    esac
+  else
+    REPLACE_MBSTATE_T=1
+  fi
+])
+
+dnl Test whether mbrtowc puts the state into non-initial state when parsing an
+dnl incomplete multibyte character.
+dnl Result is gl_cv_func_mbrtowc_incomplete_state.
+
+AC_DEFUN([gl_MBRTOWC_INCOMPLETE_STATE],
+[
+  AC_REQUIRE([AC_PROG_CC])
+  AC_REQUIRE([gt_LOCALE_JA])
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+  AC_CACHE_CHECK([whether mbrtowc handles incomplete characters],
+    [gl_cv_func_mbrtowc_incomplete_state],
+    [
+      dnl Initial guess, used when cross-compiling or when no suitable locale
+      dnl is present.
+changequote(,)dnl
+      case "$host_os" in
+                     # Guess no on AIX and OSF/1.
+        aix* | osf*) gl_cv_func_mbrtowc_incomplete_state="guessing no" ;;
+                     # Guess yes otherwise.
+        *)           gl_cv_func_mbrtowc_incomplete_state="guessing yes" ;;
+      esac
+changequote([,])dnl
+      if test $LOCALE_JA != none; then
+        AC_RUN_IFELSE(
+          [AC_LANG_SOURCE([[
+#include <locale.h>
+#include <string.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 ()
+{
+  if (setlocale (LC_ALL, "$LOCALE_JA") != NULL)
+    {
+      const char input[] = "B\217\253\344\217\251\316er"; /* "Büßer" */
+      mbstate_t state;
+      wchar_t wc;
+
+      memset (&state, '\0', sizeof (mbstate_t));
+      if (mbrtowc (&wc, input + 1, 1, &state) == (size_t)(-2))
+        if (mbsinit (&state))
+          return 2;
+    }
+  return 0;
+}]])],
+          [gl_cv_func_mbrtowc_incomplete_state=yes],
+          [gl_cv_func_mbrtowc_incomplete_state=no],
+          [:])
+      fi
+    ])
+])
+
+dnl Test whether mbrtowc works not worse than mbtowc.
+dnl Result is gl_cv_func_mbrtowc_sanitycheck.
+
+AC_DEFUN([gl_MBRTOWC_SANITYCHECK],
+[
+  AC_REQUIRE([AC_PROG_CC])
+  AC_REQUIRE([gt_LOCALE_ZH_CN])
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+  AC_CACHE_CHECK([whether mbrtowc works as well as mbtowc],
+    [gl_cv_func_mbrtowc_sanitycheck],
+    [
+      dnl Initial guess, used when cross-compiling or when no suitable locale
+      dnl is present.
+changequote(,)dnl
+      case "$host_os" in
+                    # Guess no on Solaris 8.
+        solaris2.8) gl_cv_func_mbrtowc_sanitycheck="guessing no" ;;
+                    # Guess yes otherwise.
+        *)          gl_cv_func_mbrtowc_sanitycheck="guessing yes" ;;
+      esac
+changequote([,])dnl
+      if test $LOCALE_ZH_CN != none; then
+        AC_RUN_IFELSE(
+          [AC_LANG_SOURCE([[
+#include <locale.h>
+#include <stdlib.h>
+#include <string.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 ()
+{
+  /* This fails on Solaris 8:
+     mbrtowc returns 2, and sets wc to 0x00F0.
+     mbtowc returns 4 (correct) and sets wc to 0x5EDC.  */
+  if (setlocale (LC_ALL, "$LOCALE_ZH_CN") != NULL)
+    {
+      char input[] = "B\250\271\201\060\211\070er"; /* "Büßer" */
+      mbstate_t state;
+      wchar_t wc;
+
+      memset (&state, '\0', sizeof (mbstate_t));
+      if (mbrtowc (&wc, input + 3, 6, &state) != 4
+          && mbtowc (&wc, input + 3, 6) == 4)
+        return 2;
+    }
+  return 0;
+}]])],
+          [gl_cv_func_mbrtowc_sanitycheck=yes],
+          [gl_cv_func_mbrtowc_sanitycheck=no],
+          [:])
+      fi
+    ])
+])
+
+dnl Test whether mbrtowc supports a NULL pwc argument correctly.
+dnl Result is gl_cv_func_mbrtowc_null_arg1.
+
+AC_DEFUN([gl_MBRTOWC_NULL_ARG1],
+[
+  AC_REQUIRE([AC_PROG_CC])
+  AC_REQUIRE([gt_LOCALE_FR_UTF8])
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+  AC_CACHE_CHECK([whether mbrtowc handles a NULL pwc argument],
+    [gl_cv_func_mbrtowc_null_arg1],
+    [
+      dnl Initial guess, used when cross-compiling or when no suitable locale
+      dnl is present.
+changequote(,)dnl
+      case "$host_os" in
+                  # Guess no on Solaris.
+        solaris*) gl_cv_func_mbrtowc_null_arg1="guessing no" ;;
+                  # Guess yes otherwise.
+        *)        gl_cv_func_mbrtowc_null_arg1="guessing yes" ;;
+      esac
+changequote([,])dnl
+      if test $LOCALE_FR_UTF8 != none; then
+        AC_RUN_IFELSE(
+          [AC_LANG_SOURCE([[
+#include <locale.h>
+#include <stdlib.h>
+#include <string.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 ()
+{
+  int result = 0;
+
+  if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL)
+    {
+      char input[] = "\303\237er";
+      mbstate_t state;
+      wchar_t wc;
+      size_t ret;
+
+      memset (&state, '\0', sizeof (mbstate_t));
+      wc = (wchar_t) 0xBADFACE;
+      ret = mbrtowc (&wc, input, 5, &state);
+      if (ret != 2)
+        result |= 1;
+      if (!mbsinit (&state))
+        result |= 2;
+
+      memset (&state, '\0', sizeof (mbstate_t));
+      ret = mbrtowc (NULL, input, 5, &state);
+      if (ret != 2) /* Solaris 7 fails here: ret is -1.  */
+        result |= 4;
+      if (!mbsinit (&state))
+        result |= 8;
+    }
+  return result;
+}]])],
+          [gl_cv_func_mbrtowc_null_arg1=yes],
+          [gl_cv_func_mbrtowc_null_arg1=no],
+          [:])
+      fi
+    ])
+])
+
+dnl Test whether mbrtowc supports a NULL string argument correctly.
+dnl Result is gl_cv_func_mbrtowc_null_arg2.
+
+AC_DEFUN([gl_MBRTOWC_NULL_ARG2],
+[
+  AC_REQUIRE([AC_PROG_CC])
+  AC_REQUIRE([gt_LOCALE_FR_UTF8])
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+  AC_CACHE_CHECK([whether mbrtowc handles a NULL string argument],
+    [gl_cv_func_mbrtowc_null_arg2],
+    [
+      dnl Initial guess, used when cross-compiling or when no suitable locale
+      dnl is present.
+changequote(,)dnl
+      case "$host_os" in
+              # Guess no on OSF/1.
+        osf*) gl_cv_func_mbrtowc_null_arg2="guessing no" ;;
+              # Guess yes otherwise.
+        *)    gl_cv_func_mbrtowc_null_arg2="guessing yes" ;;
+      esac
+changequote([,])dnl
+      if test $LOCALE_FR_UTF8 != none; then
+        AC_RUN_IFELSE(
+          [AC_LANG_SOURCE([[
+#include <locale.h>
+#include <string.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 ()
+{
+  if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL)
+    {
+      mbstate_t state;
+      wchar_t wc;
+      int ret;
+
+      memset (&state, '\0', sizeof (mbstate_t));
+      wc = (wchar_t) 0xBADFACE;
+      mbrtowc (&wc, NULL, 5, &state);
+      /* Check that wc was not modified.  */
+      if (wc != (wchar_t) 0xBADFACE)
+        return 2;
+    }
+  return 0;
+}]])],
+          [gl_cv_func_mbrtowc_null_arg2=yes],
+          [gl_cv_func_mbrtowc_null_arg2=no],
+          [:])
+      fi
+    ])
+])
+
+dnl Test whether mbrtowc, when parsing the end of a multibyte character,
+dnl correctly returns the number of bytes that were needed to complete the
+dnl character (not the total number of bytes of the multibyte character).
+dnl Result is gl_cv_func_mbrtowc_retval.
+
+AC_DEFUN([gl_MBRTOWC_RETVAL],
+[
+  AC_REQUIRE([AC_PROG_CC])
+  AC_REQUIRE([gt_LOCALE_FR_UTF8])
+  AC_REQUIRE([gt_LOCALE_JA])
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_CACHE_CHECK([whether mbrtowc has a correct return value],
+    [gl_cv_func_mbrtowc_retval],
+    [
+      dnl Initial guess, used when cross-compiling or when no suitable locale
+      dnl is present.
+changequote(,)dnl
+      case "$host_os" in
+                                   # Guess no on HP-UX, Solaris, native Windows.
+        hpux* | solaris* | mingw*) gl_cv_func_mbrtowc_retval="guessing no" ;;
+                                   # Guess yes otherwise.
+        *)                         gl_cv_func_mbrtowc_retval="guessing yes" ;;
+      esac
+changequote([,])dnl
+      if test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none \
+         || { case "$host_os" in mingw*) true;; *) false;; esac; }; then
+        AC_RUN_IFELSE(
+          [AC_LANG_SOURCE([[
+#include <locale.h>
+#include <string.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 ()
+{
+  int result = 0;
+  int found_some_locale = 0;
+  /* This fails on Solaris.  */
+  if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL)
+    {
+      char input[] = "B\303\274\303\237er"; /* "Büßer" */
+      mbstate_t state;
+      wchar_t wc;
+
+      memset (&state, '\0', sizeof (mbstate_t));
+      if (mbrtowc (&wc, input + 1, 1, &state) == (size_t)(-2))
+        {
+          input[1] = '\0';
+          if (mbrtowc (&wc, input + 2, 5, &state) != 1)
+            result |= 1;
+        }
+      found_some_locale = 1;
+    }
+  /* This fails on HP-UX 11.11.  */
+  if (setlocale (LC_ALL, "$LOCALE_JA") != NULL)
+    {
+      char input[] = "B\217\253\344\217\251\316er"; /* "Büßer" */
+      mbstate_t state;
+      wchar_t wc;
+
+      memset (&state, '\0', sizeof (mbstate_t));
+      if (mbrtowc (&wc, input + 1, 1, &state) == (size_t)(-2))
+        {
+          input[1] = '\0';
+          if (mbrtowc (&wc, input + 2, 5, &state) != 2)
+            result |= 2;
+        }
+      found_some_locale = 1;
+    }
+  /* This fails on native Windows.  */
+  if (setlocale (LC_ALL, "Japanese_Japan.932") != NULL)
+    {
+      char input[] = "<\223\372\226\173\214\352>"; /* "<日本語>" */
+      mbstate_t state;
+      wchar_t wc;
+
+      memset (&state, '\0', sizeof (mbstate_t));
+      if (mbrtowc (&wc, input + 3, 1, &state) == (size_t)(-2))
+        {
+          input[3] = '\0';
+          if (mbrtowc (&wc, input + 4, 4, &state) != 1)
+            result |= 4;
+        }
+      found_some_locale = 1;
+    }
+  if (setlocale (LC_ALL, "Chinese_Taiwan.950") != NULL)
+    {
+      char input[] = "<\244\351\245\273\273\171>"; /* "<日本語>" */
+      mbstate_t state;
+      wchar_t wc;
+
+      memset (&state, '\0', sizeof (mbstate_t));
+      if (mbrtowc (&wc, input + 3, 1, &state) == (size_t)(-2))
+        {
+          input[3] = '\0';
+          if (mbrtowc (&wc, input + 4, 4, &state) != 1)
+            result |= 8;
+        }
+      found_some_locale = 1;
+    }
+  if (setlocale (LC_ALL, "Chinese_China.936") != NULL)
+    {
+      char input[] = "<\310\325\261\276\325\132>"; /* "<日本語>" */
+      mbstate_t state;
+      wchar_t wc;
+
+      memset (&state, '\0', sizeof (mbstate_t));
+      if (mbrtowc (&wc, input + 3, 1, &state) == (size_t)(-2))
+        {
+          input[3] = '\0';
+          if (mbrtowc (&wc, input + 4, 4, &state) != 1)
+            result |= 16;
+        }
+      found_some_locale = 1;
+    }
+  return (found_some_locale ? result : 77);
+}]])],
+          [gl_cv_func_mbrtowc_retval=yes],
+          [if test $? != 77; then
+             gl_cv_func_mbrtowc_retval=no
+           fi
+          ],
+          [:])
+      fi
+    ])
+])
+
+dnl Test whether mbrtowc, when parsing a NUL character, correctly returns 0.
+dnl Result is gl_cv_func_mbrtowc_nul_retval.
+
+AC_DEFUN([gl_MBRTOWC_NUL_RETVAL],
+[
+  AC_REQUIRE([AC_PROG_CC])
+  AC_REQUIRE([gt_LOCALE_ZH_CN])
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+  AC_CACHE_CHECK([whether mbrtowc returns 0 when parsing a NUL character],
+    [gl_cv_func_mbrtowc_nul_retval],
+    [
+      dnl Initial guess, used when cross-compiling or when no suitable locale
+      dnl is present.
+changequote(,)dnl
+      case "$host_os" in
+                       # Guess no on Solaris 8 and 9.
+        solaris2.[89]) gl_cv_func_mbrtowc_nul_retval="guessing no" ;;
+                       # Guess yes otherwise.
+        *)             gl_cv_func_mbrtowc_nul_retval="guessing yes" ;;
+      esac
+changequote([,])dnl
+      if test $LOCALE_ZH_CN != none; then
+        AC_RUN_IFELSE(
+          [AC_LANG_SOURCE([[
+#include <locale.h>
+#include <string.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 ()
+{
+  /* This fails on Solaris 8 and 9.  */
+  if (setlocale (LC_ALL, "$LOCALE_ZH_CN") != NULL)
+    {
+      mbstate_t state;
+      wchar_t wc;
+
+      memset (&state, '\0', sizeof (mbstate_t));
+      if (mbrtowc (&wc, "", 1, &state) != 0)
+        return 2;
+    }
+  return 0;
+}]])],
+          [gl_cv_func_mbrtowc_nul_retval=yes],
+          [gl_cv_func_mbrtowc_nul_retval=no],
+          [:])
+      fi
+    ])
+])
+
+dnl Test whether mbrtowc returns the correct value on empty input.
+
+AC_DEFUN([gl_MBRTOWC_EMPTY_INPUT],
+[
+  AC_REQUIRE([AC_PROG_CC])
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+  AC_CACHE_CHECK([whether mbrtowc works on empty input],
+    [gl_cv_func_mbrtowc_empty_input],
+    [
+      dnl Initial guess, used when cross-compiling or when no suitable locale
+      dnl is present.
+changequote(,)dnl
+      case "$host_os" in
+                    # Guess no on AIX and glibc systems.
+        aix* | *-gnu*)
+                    gl_cv_func_mbrtowc_empty_input="guessing no" ;;
+                    # Guess yes on native Windows.
+        mingw*)     gl_cv_func_mbrtowc_empty_input="guessing yes" ;;
+        *)          gl_cv_func_mbrtowc_empty_input="guessing yes" ;;
+      esac
+changequote([,])dnl
+      AC_RUN_IFELSE(
+        [AC_LANG_SOURCE([[
+           #include <wchar.h>
+           static wchar_t wc;
+           static mbstate_t mbs;
+           int
+           main (void)
+           {
+             return mbrtowc (&wc, "", 0, &mbs) != (size_t) -2;
+           }]])],
+        [gl_cv_func_mbrtowc_empty_input=yes],
+        [gl_cv_func_mbrtowc_empty_input=no],
+        [:])
+    ])
+])
+
+dnl Test whether mbrtowc reports encoding errors in the C locale.
+dnl Although POSIX was never intended to allow this, the GNU C Library
+dnl and other implementations do it.  See:
+dnl https://sourceware.org/bugzilla/show_bug.cgi?id=19932
+
+AC_DEFUN([gl_MBRTOWC_C_LOCALE],
+[
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+  AC_CACHE_CHECK([whether the C locale is free of encoding errors],
+    [gl_cv_C_locale_sans_EILSEQ],
+    [
+     dnl Initial guess, used when cross-compiling or when no suitable locale
+     dnl is present.
+     gl_cv_C_locale_sans_EILSEQ="guessing no"
+
+     AC_RUN_IFELSE(
+       [AC_LANG_PROGRAM(
+          [[#include <limits.h>
+            #include <locale.h>
+            #include <wchar.h>
+          ]], [[
+            int i;
+            char *locale = setlocale (LC_ALL, "C");
+            if (! locale)
+              return 2;
+            for (i = CHAR_MIN; i <= CHAR_MAX; i++)
+              {
+                char c = i;
+                wchar_t wc;
+                mbstate_t mbs = { 0, };
+                size_t ss = mbrtowc (&wc, &c, 1, &mbs);
+                if (1 < ss)
+                  return 3;
+              }
+            return 0;
+          ]])],
+      [gl_cv_C_locale_sans_EILSEQ=yes],
+      [gl_cv_C_locale_sans_EILSEQ=no],
+      [case "$host_os" in
+                 # Guess yes on native Windows.
+         mingw*) gl_cv_C_locale_sans_EILSEQ="guessing yes" ;;
+       esac
+      ])
+    ])
+])
+
+# Prerequisites of lib/mbrtowc.c.
+AC_DEFUN([gl_PREREQ_MBRTOWC], [
+  :
+])
+
+
+dnl From Paul Eggert
+
+dnl This is an override of an autoconf macro.
+
+AC_DEFUN([AC_FUNC_MBRTOWC],
+[
+  dnl Same as AC_FUNC_MBRTOWC in autoconf-2.60.
+  AC_CACHE_CHECK([whether mbrtowc and mbstate_t are properly declared],
+    [gl_cv_func_mbrtowc],
+    [AC_LINK_IFELSE(
+       [AC_LANG_PROGRAM(
+            [[/* 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>]],
+            [[wchar_t wc;
+              char const s[] = "";
+              size_t n = 1;
+              mbstate_t state;
+              return ! (sizeof state && (mbrtowc) (&wc, s, n, &state));]])],
+       [gl_cv_func_mbrtowc=yes],
+       [gl_cv_func_mbrtowc=no])])
+  if test $gl_cv_func_mbrtowc = yes; then
+    AC_DEFINE([HAVE_MBRTOWC], [1],
+      [Define to 1 if mbrtowc and mbstate_t are properly declared.])
+  fi
+])
diff --git a/gl/m4/mbsinit.m4 b/gl/m4/mbsinit.m4
new file mode 100644
index 0000000..5904a51
--- /dev/null
+++ b/gl/m4/mbsinit.m4
@@ -0,0 +1,51 @@
+# mbsinit.m4 serial 8
+dnl Copyright (C) 2008, 2010-2017 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_FUNC_MBSINIT],
+[
+  AC_REQUIRE([gl_WCHAR_H_DEFAULTS])
+  AC_REQUIRE([AC_CANONICAL_HOST])
+
+  AC_REQUIRE([AC_TYPE_MBSTATE_T])
+  gl_MBSTATE_T_BROKEN
+
+  AC_CHECK_FUNCS_ONCE([mbsinit])
+  if test $ac_cv_func_mbsinit = no; then
+    HAVE_MBSINIT=0
+    AC_CHECK_DECLS([mbsinit],,, [[
+/* 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 $ac_cv_have_decl_mbsinit = yes; then
+      dnl On Minix 3.1.8, the system's <wchar.h> declares mbsinit() although
+      dnl it does not have the function. Avoid a collision with gnulib's
+      dnl replacement.
+      REPLACE_MBSINIT=1
+    fi
+  else
+    if test $REPLACE_MBSTATE_T = 1; then
+      REPLACE_MBSINIT=1
+    else
+      dnl On mingw, mbsinit() always returns 1, which is inappropriate for
+      dnl states produced by mbrtowc() for an incomplete multibyte character
+      dnl in multibyte locales.
+      case "$host_os" in
+        mingw*) REPLACE_MBSINIT=1 ;;
+      esac
+    fi
+  fi
+])
+
+# Prerequisites of lib/mbsinit.c.
+AC_DEFUN([gl_PREREQ_MBSINIT], [
+  :
+])
diff --git a/gl/m4/mbstate_t.m4 b/gl/m4/mbstate_t.m4
new file mode 100644
index 0000000..6325cf3
--- /dev/null
+++ b/gl/m4/mbstate_t.m4
@@ -0,0 +1,41 @@
+# mbstate_t.m4 serial 13
+dnl Copyright (C) 2000-2002, 2008-2017 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+# From Paul Eggert.
+
+# BeOS 5 has <wchar.h> but does not define mbstate_t,
+# so you can't declare an object of that type.
+# Check for this incompatibility with Standard C.
+
+# AC_TYPE_MBSTATE_T
+# -----------------
+AC_DEFUN([AC_TYPE_MBSTATE_T],
+[
+   AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) dnl for HP-UX 11.11
+
+   AC_CACHE_CHECK([for mbstate_t], [ac_cv_type_mbstate_t],
+     [AC_COMPILE_IFELSE(
+        [AC_LANG_PROGRAM(
+           [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>]],
+           [[mbstate_t x; return sizeof x;]])],
+        [ac_cv_type_mbstate_t=yes],
+        [ac_cv_type_mbstate_t=no])])
+   if test $ac_cv_type_mbstate_t = yes; then
+     AC_DEFINE([HAVE_MBSTATE_T], [1],
+               [Define to 1 if <wchar.h> declares mbstate_t.])
+   else
+     AC_DEFINE([mbstate_t], [int],
+               [Define to a type if <wchar.h> does not define.])
+   fi
+])
diff --git a/gl/m4/mbtowc.m4 b/gl/m4/mbtowc.m4
new file mode 100644
index 0000000..378a4e2
--- /dev/null
+++ b/gl/m4/mbtowc.m4
@@ -0,0 +1,19 @@
+# mbtowc.m4 serial 2
+dnl Copyright (C) 2011-2017 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_FUNC_MBTOWC],
+[
+  AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
+
+  if false; then
+    REPLACE_MBTOWC=1
+  fi
+])
+
+# Prerequisites of lib/mbtowc.c.
+AC_DEFUN([gl_PREREQ_MBTOWC], [
+  :
+])
diff --git a/gl/m4/mkstemps.m4 b/gl/m4/mkstemps.m4
new file mode 100644
index 0000000..d9fdd2b
--- /dev/null
+++ b/gl/m4/mkstemps.m4
@@ -0,0 +1,18 @@
+# mkstemps.m4 serial 2
+dnl Copyright (C) 2009-2017 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_FUNC_MKSTEMPS],
+[
+  AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
+
+  dnl Persuade glibc <stdlib.h> to declare mkstemps().
+  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
+
+  AC_CHECK_FUNCS_ONCE([mkstemps])
+  if test $ac_cv_func_mkstemps != yes; then
+    HAVE_MKSTEMPS=0
+  fi
+])
diff --git a/gl/m4/multiarch.m4 b/gl/m4/multiarch.m4
new file mode 100644
index 0000000..30006cb
--- /dev/null
+++ b/gl/m4/multiarch.m4
@@ -0,0 +1,62 @@
+# multiarch.m4 serial 7
+dnl Copyright (C) 2008-2017 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+# Determine whether the compiler is or may be producing universal binaries.
+#
+# On Mac OS X 10.5 and later systems, the user can create libraries and
+# executables that work on multiple system types--known as "fat" or
+# "universal" binaries--by specifying multiple '-arch' options to the
+# compiler but only a single '-arch' option to the preprocessor.  Like
+# this:
+#
+#     ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+#                 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+#                 CPP="gcc -E" CXXCPP="g++ -E"
+#
+# Detect this situation and set APPLE_UNIVERSAL_BUILD accordingly.
+
+AC_DEFUN_ONCE([gl_MULTIARCH],
+[
+  dnl Code similar to autoconf-2.63 AC_C_BIGENDIAN.
+  gl_cv_c_multiarch=no
+  AC_COMPILE_IFELSE(
+    [AC_LANG_SOURCE(
+      [[#ifndef __APPLE_CC__
+         not a universal capable compiler
+        #endif
+        typedef int dummy;
+      ]])],
+    [
+     dnl Check for potential -arch flags.  It is not universal unless
+     dnl there are at least two -arch flags with different values.
+     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 $gl_cv_c_multiarch = yes; then
+    APPLE_UNIVERSAL_BUILD=1
+  else
+    APPLE_UNIVERSAL_BUILD=0
+  fi
+  AC_SUBST([APPLE_UNIVERSAL_BUILD])
+])
diff --git a/gl/m4/nl_langinfo.m4 b/gl/m4/nl_langinfo.m4
new file mode 100644
index 0000000..16de8de
--- /dev/null
+++ b/gl/m4/nl_langinfo.m4
@@ -0,0 +1,50 @@
+# nl_langinfo.m4 serial 5
+dnl Copyright (C) 2009-2017 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_FUNC_NL_LANGINFO],
+[
+  AC_REQUIRE([gl_LANGINFO_H_DEFAULTS])
+  AC_REQUIRE([gl_LANGINFO_H])
+  AC_CHECK_FUNCS_ONCE([nl_langinfo])
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+  if test $ac_cv_func_nl_langinfo = yes; then
+    # On Irix 6.5, YESEXPR is defined, but nl_langinfo(YESEXPR) is broken.
+    AC_CACHE_CHECK([whether YESEXPR works],
+      [gl_cv_func_nl_langinfo_yesexpr_works],
+      [AC_RUN_IFELSE(
+         [AC_LANG_PROGRAM([[#include <langinfo.h>
+]], [[return !*nl_langinfo(YESEXPR);
+]])],
+         [gl_cv_func_nl_langinfo_yesexpr_works=yes],
+         [gl_cv_func_nl_langinfo_yesexpr_works=no],
+         [
+         case "$host_os" in
+                   # Guess no on irix systems.
+           irix*)  gl_cv_func_nl_langinfo_yesexpr_works="guessing no";;
+                   # Guess yes elsewhere.
+           *)      gl_cv_func_nl_langinfo_yesexpr_works="guessing yes";;
+         esac
+         ])
+      ])
+    case $gl_cv_func_nl_langinfo_yesexpr_works in
+      *yes) FUNC_NL_LANGINFO_YESEXPR_WORKS=1 ;;
+      *)    FUNC_NL_LANGINFO_YESEXPR_WORKS=0 ;;
+    esac
+    AC_DEFINE_UNQUOTED([FUNC_NL_LANGINFO_YESEXPR_WORKS],
+      [$FUNC_NL_LANGINFO_YESEXPR_WORKS],
+      [Define to 1 if nl_langinfo (YESEXPR) returns a non-empty string.])
+    if test $HAVE_LANGINFO_CODESET = 1 && test $HAVE_LANGINFO_ERA = 1 \
+        && test $FUNC_NL_LANGINFO_YESEXPR_WORKS = 1; then
+      :
+    else
+      REPLACE_NL_LANGINFO=1
+      AC_DEFINE([REPLACE_NL_LANGINFO], [1],
+        [Define if nl_langinfo exists but is overridden by gnulib.])
+    fi
+  else
+    HAVE_NL_LANGINFO=0
+  fi
+])
diff --git a/gl/m4/off_t.m4 b/gl/m4/off_t.m4
new file mode 100644
index 0000000..92c45ef
--- /dev/null
+++ b/gl/m4/off_t.m4
@@ -0,0 +1,18 @@
+# off_t.m4 serial 1
+dnl Copyright (C) 2012-2017 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl Check whether to override the 'off_t' type.
+dnl Set WINDOWS_64_BIT_OFF_T.
+
+AC_DEFUN([gl_TYPE_OFF_T],
+[
+  m4_ifdef([gl_LARGEFILE], [
+    AC_REQUIRE([gl_LARGEFILE])
+  ], [
+    WINDOWS_64_BIT_OFF_T=0
+  ])
+  AC_SUBST([WINDOWS_64_BIT_OFF_T])
+])
diff --git a/gl/m4/pathmax.m4 b/gl/m4/pathmax.m4
new file mode 100644
index 0000000..c6c9f24
--- /dev/null
+++ b/gl/m4/pathmax.m4
@@ -0,0 +1,42 @@
+# pathmax.m4 serial 10
+dnl Copyright (C) 2002-2003, 2005-2006, 2009-2017 Free Software Foundation,
+dnl Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_PATHMAX],
+[
+  dnl Prerequisites of lib/pathmax.h.
+  AC_CHECK_HEADERS_ONCE([sys/param.h])
+])
+
+# Expands to a piece of C program that defines PATH_MAX in the same way as
+# "pathmax.h" will do.
+AC_DEFUN([gl_PATHMAX_SNIPPET], [[
+/* Arrange to define PATH_MAX, like "pathmax.h" does. */
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+#include <limits.h>
+#if defined HAVE_SYS_PARAM_H && !defined PATH_MAX && !defined MAXPATHLEN
+# include <sys/param.h>
+#endif
+#if !defined PATH_MAX && defined MAXPATHLEN
+# define PATH_MAX MAXPATHLEN
+#endif
+#ifdef __hpux
+# undef PATH_MAX
+# define PATH_MAX 1024
+#endif
+#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+# undef PATH_MAX
+# define PATH_MAX 260
+#endif
+]])
+
+# Prerequisites of gl_PATHMAX_SNIPPET.
+AC_DEFUN([gl_PATHMAX_SNIPPET_PREREQ],
+[
+  AC_CHECK_HEADERS_ONCE([unistd.h sys/param.h])
+])
diff --git a/gl/m4/pthread_rwlock_rdlock.m4 b/gl/m4/pthread_rwlock_rdlock.m4
new file mode 100644
index 0000000..da69865
--- /dev/null
+++ b/gl/m4/pthread_rwlock_rdlock.m4
@@ -0,0 +1,163 @@
+# pthread_rwlock_rdlock.m4 serial 1
+dnl Copyright (C) 2017 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+dnl Inspired by
+dnl https://github.com/linux-test-project/ltp/blob/master/testcases/open_posix_testsuite/conformance/interfaces/pthread_rwlock_rdlock/2-2.c
+dnl by Intel Corporation.
+
+dnl Test whether in a situation where
+dnl   - an rwlock is taken by a reader and has a writer waiting,
+dnl   - an additional reader requests the lock,
+dnl   - the waiting writer and the requesting reader threads have the same
+dnl     priority,
+dnl the requesting reader thread gets blocked, so that at some point the
+dnl waiting writer can acquire the lock.
+dnl Without such a guarantee, when there a N readers and each of the readers
+dnl spends more than 1/Nth of the time with the lock held, there is a high
+dnl probability that the waiting writer will not get the lock in a given finite
+dnl time, a phenomenon called "writer starvation".
+dnl Without such a guarantee, applications have a hard time avoiding writer
+dnl starvation.
+dnl
+dnl POSIX:2008 makes this requirement only for implementations that support TPS
+dnl (Thread Priority Scheduling) and only for the scheduling policies SCHED_FIFO
+dnl and SCHED_RR, see
+dnl http://pubs.opengroup.org/onlinepubs/9699919799/functions/pthread_rwlock_rdlock.html
+dnl but test verifies the guarantee regardless of TPS and regardless of
+dnl scheduling policy.
+AC_DEFUN([gl_PTHREAD_RWLOCK_RDLOCK_PREFER_WRITER],
+[
+  AC_REQUIRE([gl_THREADLIB_EARLY])
+  AC_CACHE_CHECK([whether pthread_rwlock_rdlock prefers a writer to a reader],
+    [gl_cv_pthread_rwlock_rdlock_prefer_writer],
+    [save_LIBS="$LIBS"
+     LIBS="$LIBS $LIBMULTITHREAD"
+     AC_RUN_IFELSE(
+       [AC_LANG_SOURCE([[
+#include <errno.h>
+#include <pthread.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#define SUCCEED() exit (0)
+#define FAILURE() exit (1)
+#define UNEXPECTED(n) (exit (10 + (n)))
+
+/* The main thread creates the waiting writer and the requesting reader threads
+   in the default way; this guarantees that they have the same priority.
+   We can reuse the main thread as first reader thread.  */
+
+static pthread_rwlock_t lock;
+static pthread_t reader1;
+static pthread_t writer;
+static pthread_t reader2;
+static pthread_t timer;
+/* Used to pass control from writer to reader2 and from reader2 to timer,
+   as in a relay race.
+   Passing control from one running thread to another running thread
+   is most likely faster than to create the second thread.  */
+static pthread_mutex_t baton;
+
+static void *
+timer_func (void *ignored)
+{
+  /* Step 13 (can be before or after step 12):
+     The timer thread takes the baton, then waits a moment to make sure
+     it can tell whether the second reader thread is blocked at step 12.  */
+  if (pthread_mutex_lock (&baton))
+    UNEXPECTED (13);
+  usleep (100000);
+  /* By the time we get here, it's clear that the second reader thread is
+     blocked at step 12.  This is the desired behaviour.  */
+  SUCCEED ();
+}
+
+static void *
+reader2_func (void *ignored)
+{
+  int err;
+
+  /* Step 8 (can be before or after step 7):
+     The second reader thread takes the baton, then waits a moment to make sure
+     the writer thread has reached step 7.  */
+  if (pthread_mutex_lock (&baton))
+    UNEXPECTED (8);
+  usleep (100000);
+  /* Step 9: The second reader thread requests the lock.  */
+  err = pthread_rwlock_tryrdlock (&lock);
+  if (err == 0)
+    FAILURE ();
+  else if (err != EBUSY)
+    UNEXPECTED (9);
+  /* Step 10: Launch a timer, to test whether the next call blocks.  */
+  if (pthread_create (&timer, NULL, timer_func, NULL))
+    UNEXPECTED (10);
+  /* Step 11: Release the baton.  */
+  if (pthread_mutex_unlock (&baton))
+    UNEXPECTED (11);
+  /* Step 12: The second reader thread requests the lock.  */
+  err = pthread_rwlock_rdlock (&lock);
+  if (err == 0)
+    FAILURE ();
+  else
+    UNEXPECTED (12);
+}
+
+static void *
+writer_func (void *ignored)
+{
+  /* Step 4: Take the baton, so that the second reader thread does not go ahead
+     too early.  */
+  if (pthread_mutex_lock (&baton))
+    UNEXPECTED (4);
+  /* Step 5: Create the second reader thread.  */
+  if (pthread_create (&reader2, NULL, reader2_func, NULL))
+    UNEXPECTED (5);
+  /* Step 6: Release the baton.  */
+  if (pthread_mutex_unlock (&baton))
+    UNEXPECTED (6);
+  /* Step 7: The writer thread requests the lock.  */
+  if (pthread_rwlock_wrlock (&lock))
+    UNEXPECTED (7);
+  return NULL;
+}
+
+int
+main ()
+{
+  reader1 = pthread_self ();
+
+  /* Step 1: The main thread initializes the lock and the baton.  */
+  if (pthread_rwlock_init (&lock, NULL))
+    UNEXPECTED (1);
+  if (pthread_mutex_init (&baton, NULL))
+    UNEXPECTED (1);
+  /* Step 2: The main thread acquires the lock as a reader.  */
+  if (pthread_rwlock_rdlock (&lock))
+    UNEXPECTED (2);
+  /* Step 3: Create the writer thread.  */
+  if (pthread_create (&writer, NULL, writer_func, NULL))
+    UNEXPECTED (3);
+  /* Job done.  Go to sleep.  */
+  for (;;)
+    {
+      sleep (1);
+    }
+}
+]])],
+       [gl_cv_pthread_rwlock_rdlock_prefer_writer=yes],
+       [gl_cv_pthread_rwlock_rdlock_prefer_writer=no],
+       [gl_cv_pthread_rwlock_rdlock_prefer_writer="guessing yes"])
+     LIBS="$save_LIBS"
+    ])
+  case "$gl_cv_pthread_rwlock_rdlock_prefer_writer" in
+    *yes)
+      AC_DEFINE([HAVE_PTHREAD_RWLOCK_RDLOCK_PREFER_WRITER], [1],
+        [Define if the 'pthread_rwlock_rdlock' function prefers a writer to a reader.])
+      ;;
+  esac
+])
diff --git a/gl/m4/regex.m4 b/gl/m4/regex.m4
new file mode 100644
index 0000000..23fe46a
--- /dev/null
+++ b/gl/m4/regex.m4
@@ -0,0 +1,300 @@
+# serial 67
+
+# Copyright (C) 1996-2001, 2003-2017 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+dnl Initially derived from code in GNU grep.
+dnl Mostly written by Jim Meyering.
+
+AC_PREREQ([2.50])
+
+AC_DEFUN([gl_REGEX],
+[
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+  AC_ARG_WITH([included-regex],
+    [AS_HELP_STRING([--without-included-regex],
+                    [don't compile regex; this is the default on systems
+                     with recent-enough versions of the GNU C Library
+                     (use with caution on other systems).])])
+
+  case $with_included_regex in #(
+  yes|no) ac_use_included_regex=$with_included_regex
+        ;;
+  '')
+    # If the system regex support is good enough that it passes the
+    # following run test, then default to *not* using the included regex.c.
+    # If cross compiling, assume the test would fail and use the included
+    # regex.c.
+    AC_CHECK_DECLS_ONCE([alarm])
+    AC_CHECK_HEADERS_ONCE([malloc.h])
+    AC_CACHE_CHECK([for working re_compile_pattern],
+                   [gl_cv_func_re_compile_pattern_working],
+      [AC_RUN_IFELSE(
+        [AC_LANG_PROGRAM(
+          [[#include <regex.h>
+
+            #include <locale.h>
+            #include <limits.h>
+            #include <string.h>
+
+            #if defined M_CHECK_ACTION || HAVE_DECL_ALARM
+            # include <signal.h>
+            # include <unistd.h>
+            #endif
+
+            #if HAVE_MALLOC_H
+            # include <malloc.h>
+            #endif
+
+            #ifdef M_CHECK_ACTION
+            /* Exit with distinguishable exit code.  */
+            static void sigabrt_no_core (int sig) { raise (SIGTERM); }
+            #endif
+          ]],
+          [[int result = 0;
+            static struct re_pattern_buffer regex;
+            unsigned char folded_chars[UCHAR_MAX + 1];
+            int i;
+            const char *s;
+            struct re_registers regs;
+
+            /* Some builds of glibc go into an infinite loop on this
+               test.  Use alarm to force death, and mallopt to avoid
+               malloc recursion in diagnosing the corrupted heap. */
+#if HAVE_DECL_ALARM
+            signal (SIGALRM, SIG_DFL);
+            alarm (2);
+#endif
+#ifdef M_CHECK_ACTION
+            signal (SIGABRT, sigabrt_no_core);
+            mallopt (M_CHECK_ACTION, 2);
+#endif
+
+            if (setlocale (LC_ALL, "en_US.UTF-8"))
+              {
+                {
+                  /* http://sourceware.org/ml/libc-hacker/2006-09/msg00008.html
+                     This test needs valgrind to catch the bug on Debian
+                     GNU/Linux 3.1 x86, but it might catch the bug better
+                     on other platforms and it shouldn't hurt to try the
+                     test here.  */
+                  static char const pat[] = "insert into";
+                  static char const data[] =
+                    "\xFF\0\x12\xA2\xAA\xC4\xB1,K\x12\xC4\xB1*\xACK";
+                  re_set_syntax (RE_SYNTAX_GREP | RE_HAT_LISTS_NOT_NEWLINE
+                                 | RE_ICASE);
+                  memset (&regex, 0, sizeof regex);
+                  s = re_compile_pattern (pat, sizeof pat - 1, &regex);
+                  if (s)
+                    result |= 1;
+                  else if (re_search (&regex, data, sizeof data - 1,
+                                      0, sizeof data - 1, &regs)
+                           != -1)
+                    result |= 1;
+                  regfree (&regex);
+                }
+
+                {
+                  /* This test is from glibc bug 15078.
+                     The test case is from Andreas Schwab in
+                     <http://www.sourceware.org/ml/libc-alpha/2013-01/msg00967.html>.
+                     */
+                  static char const pat[] = "[^x]x";
+                  static char const data[] =
+                    /* <U1000><U103B><U103D><U1014><U103A><U102F><U1015><U103A> */
+                    "\xe1\x80\x80"
+                    "\xe1\x80\xbb"
+                    "\xe1\x80\xbd"
+                    "\xe1\x80\x94"
+                    "\xe1\x80\xba"
+                    "\xe1\x80\xaf"
+                    "\xe1\x80\x95"
+                    "\xe1\x80\xba"
+                    "x";
+                  re_set_syntax (0);
+                  memset (&regex, 0, sizeof regex);
+                  s = re_compile_pattern (pat, sizeof pat - 1, &regex);
+                  if (s)
+                    result |= 1;
+                  else
+                    {
+                      i = re_search (&regex, data, sizeof data - 1,
+                                     0, sizeof data - 1, 0);
+                      if (i != 0 && i != 21)
+                        result |= 1;
+                    }
+                  regfree (&regex);
+                }
+
+                if (! setlocale (LC_ALL, "C"))
+                  return 1;
+              }
+
+            /* This test is from glibc bug 3957, reported by Andrew Mackey.  */
+            re_set_syntax (RE_SYNTAX_EGREP | RE_HAT_LISTS_NOT_NEWLINE);
+            memset (&regex, 0, sizeof regex);
+            s = re_compile_pattern ("a[^x]b", 6, &regex);
+            if (s)
+              result |= 2;
+            /* This should fail, but succeeds for glibc-2.5.  */
+            else if (re_search (&regex, "a\nb", 3, 0, 3, &regs) != -1)
+              result |= 2;
+
+            /* This regular expression is from Spencer ere test number 75
+               in grep-2.3.  */
+            re_set_syntax (RE_SYNTAX_POSIX_EGREP);
+            memset (&regex, 0, sizeof regex);
+            for (i = 0; i <= UCHAR_MAX; i++)
+              folded_chars[i] = i;
+            regex.translate = folded_chars;
+            s = re_compile_pattern ("a[[:@:>@:]]b\n", 11, &regex);
+            /* This should fail with _Invalid character class name_ error.  */
+            if (!s)
+              result |= 4;
+
+            /* Ensure that [b-a] is diagnosed as invalid, when
+               using RE_NO_EMPTY_RANGES. */
+            re_set_syntax (RE_SYNTAX_POSIX_EGREP | RE_NO_EMPTY_RANGES);
+            memset (&regex, 0, sizeof regex);
+            s = re_compile_pattern ("a[b-a]", 6, &regex);
+            if (s == 0)
+              result |= 8;
+
+            /* This should succeed, but does not for glibc-2.1.3.  */
+            memset (&regex, 0, sizeof regex);
+            s = re_compile_pattern ("{1", 2, &regex);
+            if (s)
+              result |= 8;
+
+            /* The following example is derived from a problem report
+               against gawk from Jorge Stolfi <stolfi@ic.unicamp.br>.  */
+            memset (&regex, 0, sizeof regex);
+            s = re_compile_pattern ("[an\371]*n", 7, &regex);
+            if (s)
+              result |= 8;
+            /* This should match, but does not for glibc-2.2.1.  */
+            else if (re_match (&regex, "an", 2, 0, &regs) != 2)
+              result |= 8;
+
+            memset (&regex, 0, sizeof regex);
+            s = re_compile_pattern ("x", 1, &regex);
+            if (s)
+              result |= 8;
+            /* glibc-2.2.93 does not work with a negative RANGE argument.  */
+            else if (re_search (&regex, "wxy", 3, 2, -2, &regs) != 1)
+              result |= 8;
+
+            /* The version of regex.c in older versions of gnulib
+               ignored RE_ICASE.  Detect that problem too.  */
+            re_set_syntax (RE_SYNTAX_EMACS | RE_ICASE);
+            memset (&regex, 0, sizeof regex);
+            s = re_compile_pattern ("x", 1, &regex);
+            if (s)
+              result |= 16;
+            else if (re_search (&regex, "WXY", 3, 0, 3, &regs) < 0)
+              result |= 16;
+
+            /* Catch a bug reported by Vin Shelton in
+               http://lists.gnu.org/archive/html/bug-coreutils/2007-06/msg00089.html
+               */
+            re_set_syntax (RE_SYNTAX_POSIX_BASIC
+                           & ~RE_CONTEXT_INVALID_DUP
+                           & ~RE_NO_EMPTY_RANGES);
+            memset (&regex, 0, sizeof regex);
+            s = re_compile_pattern ("[[:alnum:]_-]\\\\+$", 16, &regex);
+            if (s)
+              result |= 32;
+
+            /* REG_STARTEND was added to glibc on 2004-01-15.
+               Reject older versions.  */
+            if (! REG_STARTEND)
+              result |= 64;
+
+#if 0
+            /* It would be nice to reject hosts whose regoff_t values are too
+               narrow (including glibc on hosts with 64-bit ptrdiff_t and
+               32-bit int), but we should wait until glibc implements this
+               feature.  Otherwise, support for equivalence classes and
+               multibyte collation symbols would always be broken except
+               when compiling --without-included-regex.   */
+            if (sizeof (regoff_t) < sizeof (ptrdiff_t)
+                || sizeof (regoff_t) < sizeof (ssize_t))
+              result |= 64;
+#endif
+
+            return result;
+          ]])],
+        [gl_cv_func_re_compile_pattern_working=yes],
+        [gl_cv_func_re_compile_pattern_working=no],
+        [case "$host_os" in
+                   # Guess no on native Windows.
+           mingw*) gl_cv_func_re_compile_pattern_working="guessing no" ;;
+                   # Otherwise, assume it is not working.
+           *)      gl_cv_func_re_compile_pattern_working="guessing no" ;;
+         esac
+        ])
+      ])
+    case "$gl_cv_func_re_compile_pattern_working" in #(
+      *yes) ac_use_included_regex=no;; #(
+      *no) ac_use_included_regex=yes;;
+    esac
+    ;;
+  *) AC_MSG_ERROR([Invalid value for --with-included-regex: $with_included_regex])
+    ;;
+  esac
+
+  if test $ac_use_included_regex = yes; then
+    AC_DEFINE([_REGEX_INCLUDE_LIMITS_H], [1],
+      [Define if you want <regex.h> to include <limits.h>, so that it
+       consistently overrides <limits.h>'s RE_DUP_MAX.])
+    AC_DEFINE([_REGEX_LARGE_OFFSETS], [1],
+      [Define if you want regoff_t to be at least as wide POSIX requires.])
+    AC_DEFINE([re_syntax_options], [rpl_re_syntax_options],
+      [Define to rpl_re_syntax_options if the replacement should be used.])
+    AC_DEFINE([re_set_syntax], [rpl_re_set_syntax],
+      [Define to rpl_re_set_syntax if the replacement should be used.])
+    AC_DEFINE([re_compile_pattern], [rpl_re_compile_pattern],
+      [Define to rpl_re_compile_pattern if the replacement should be used.])
+    AC_DEFINE([re_compile_fastmap], [rpl_re_compile_fastmap],
+      [Define to rpl_re_compile_fastmap if the replacement should be used.])
+    AC_DEFINE([re_search], [rpl_re_search],
+      [Define to rpl_re_search if the replacement should be used.])
+    AC_DEFINE([re_search_2], [rpl_re_search_2],
+      [Define to rpl_re_search_2 if the replacement should be used.])
+    AC_DEFINE([re_match], [rpl_re_match],
+      [Define to rpl_re_match if the replacement should be used.])
+    AC_DEFINE([re_match_2], [rpl_re_match_2],
+      [Define to rpl_re_match_2 if the replacement should be used.])
+    AC_DEFINE([re_set_registers], [rpl_re_set_registers],
+      [Define to rpl_re_set_registers if the replacement should be used.])
+    AC_DEFINE([re_comp], [rpl_re_comp],
+      [Define to rpl_re_comp if the replacement should be used.])
+    AC_DEFINE([re_exec], [rpl_re_exec],
+      [Define to rpl_re_exec if the replacement should be used.])
+    AC_DEFINE([regcomp], [rpl_regcomp],
+      [Define to rpl_regcomp if the replacement should be used.])
+    AC_DEFINE([regexec], [rpl_regexec],
+      [Define to rpl_regexec if the replacement should be used.])
+    AC_DEFINE([regerror], [rpl_regerror],
+      [Define to rpl_regerror if the replacement should be used.])
+    AC_DEFINE([regfree], [rpl_regfree],
+      [Define to rpl_regfree if the replacement should be used.])
+  fi
+])
+
+# Prerequisites of lib/regex.c and lib/regex_internal.c.
+AC_DEFUN([gl_PREREQ_REGEX],
+[
+  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
+  AC_REQUIRE([AC_C_INLINE])
+  AC_REQUIRE([AC_C_RESTRICT])
+  AC_REQUIRE([AC_TYPE_MBSTATE_T])
+  AC_REQUIRE([gl_EEMALLOC])
+  AC_REQUIRE([gl_GLIBC21])
+  AC_CHECK_HEADERS([libintl.h])
+  AC_CHECK_FUNCS_ONCE([isblank iswctype])
+  AC_CHECK_DECLS([isblank], [], [], [[#include <ctype.h>]])
+])
diff --git a/gl/m4/ssize_t.m4 b/gl/m4/ssize_t.m4
new file mode 100644
index 0000000..66ba9d4
--- /dev/null
+++ b/gl/m4/ssize_t.m4
@@ -0,0 +1,23 @@
+# ssize_t.m4 serial 5 (gettext-0.18.2)
+dnl Copyright (C) 2001-2003, 2006, 2010-2017 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+dnl Test whether ssize_t is defined.
+
+AC_DEFUN([gt_TYPE_SSIZE_T],
+[
+  AC_CACHE_CHECK([for ssize_t], [gt_cv_ssize_t],
+    [AC_COMPILE_IFELSE(
+       [AC_LANG_PROGRAM(
+          [[#include <sys/types.h>]],
+          [[int x = sizeof (ssize_t *) + sizeof (ssize_t);
+            return !x;]])],
+       [gt_cv_ssize_t=yes], [gt_cv_ssize_t=no])])
+  if test $gt_cv_ssize_t = no; then
+    AC_DEFINE([ssize_t], [int],
+              [Define as a signed type of the same size as size_t.])
+  fi
+])
diff --git a/gl/m4/stat.m4 b/gl/m4/stat.m4
new file mode 100644
index 0000000..286fcba
--- /dev/null
+++ b/gl/m4/stat.m4
@@ -0,0 +1,67 @@
+# serial 12
+
+# Copyright (C) 2009-2017 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_FUNC_STAT],
+[
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS])
+  AC_CHECK_FUNCS_ONCE([lstat])
+  case "$host_os" in
+    mingw*)
+      dnl On this platform, the original stat() returns st_atime, st_mtime,
+      dnl st_ctime values that are affected by the time zone.
+      REPLACE_STAT=1
+      ;;
+    *)
+      dnl AIX 7.1, Solaris 9, mingw64 mistakenly succeed on stat("file/").
+      dnl (For mingw, this is due to a broken stat() override in libmingwex.a.)
+      dnl FreeBSD 7.2 mistakenly succeeds on stat("link-to-file/").
+      AC_CACHE_CHECK([whether stat handles trailing slashes on files],
+        [gl_cv_func_stat_file_slash],
+        [touch conftest.tmp
+         # Assume that if we have lstat, we can also check symlinks.
+         if test $ac_cv_func_lstat = yes; then
+           ln -s conftest.tmp conftest.lnk
+         fi
+         AC_RUN_IFELSE(
+           [AC_LANG_PROGRAM(
+             [[#include <sys/stat.h>
+]], [[int result = 0;
+               struct stat st;
+               if (!stat ("conftest.tmp/", &st))
+                 result |= 1;
+#if HAVE_LSTAT
+               if (!stat ("conftest.lnk/", &st))
+                 result |= 2;
+#endif
+               return result;
+             ]])],
+           [gl_cv_func_stat_file_slash=yes], [gl_cv_func_stat_file_slash=no],
+           [case "$host_os" in
+                      # Guess yes on glibc systems.
+              *-gnu*) gl_cv_func_stat_file_slash="guessing yes" ;;
+                      # If we don't know, assume the worst.
+              *)      gl_cv_func_stat_file_slash="guessing no" ;;
+            esac
+           ])
+         rm -f conftest.tmp conftest.lnk])
+      case $gl_cv_func_stat_file_slash in
+        *no)
+          REPLACE_STAT=1
+          AC_DEFINE([REPLACE_FUNC_STAT_FILE], [1], [Define to 1 if stat needs
+            help when passed a file name with a trailing slash]);;
+      esac
+      ;;
+  esac
+])
+
+# Prerequisites of lib/stat.c and lib/stat-w32.c.
+AC_DEFUN([gl_PREREQ_STAT], [
+  AC_REQUIRE([gl_HEADER_SYS_STAT_H])
+  :
+])
diff --git a/gl/m4/stdbool.m4 b/gl/m4/stdbool.m4
new file mode 100644
index 0000000..d368123
--- /dev/null
+++ b/gl/m4/stdbool.m4
@@ -0,0 +1,108 @@
+# Check for stdbool.h that conforms to C99.
+
+dnl Copyright (C) 2002-2006, 2009-2017 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+#serial 7
+
+# Prepare for substituting <stdbool.h> if it is not supported.
+
+AC_DEFUN([AM_STDBOOL_H],
+[
+  AC_REQUIRE([AC_CHECK_HEADER_STDBOOL])
+
+  # Define two additional variables used in the Makefile substitution.
+
+  if test "$ac_cv_header_stdbool_h" = yes; then
+    STDBOOL_H=''
+  else
+    STDBOOL_H='stdbool.h'
+  fi
+  AC_SUBST([STDBOOL_H])
+  AM_CONDITIONAL([GL_GENERATE_STDBOOL_H], [test -n "$STDBOOL_H"])
+
+  if test "$ac_cv_type__Bool" = yes; then
+    HAVE__BOOL=1
+  else
+    HAVE__BOOL=0
+  fi
+  AC_SUBST([HAVE__BOOL])
+])
+
+# AM_STDBOOL_H will be renamed to gl_STDBOOL_H in the future.
+AC_DEFUN([gl_STDBOOL_H], [AM_STDBOOL_H])
+
+# This version of the macro is needed in autoconf <= 2.68.
+
+AC_DEFUN([AC_CHECK_HEADER_STDBOOL],
+  [AC_CACHE_CHECK([for stdbool.h that conforms to C99],
+     [ac_cv_header_stdbool_h],
+     [AC_COMPILE_IFELSE(
+        [AC_LANG_PROGRAM(
+           [[
+             #include <stdbool.h>
+
+             #ifdef __cplusplus
+              typedef bool Bool;
+             #else
+              typedef _Bool Bool;
+              #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
+             #endif
+
+             #ifndef __bool_true_false_are_defined
+              "error: __bool_true_false_are_defined is not defined"
+             #endif
+
+             struct s { Bool s: 1; Bool t; bool u: 1; bool v; } 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;
+             bool *qq = &q;
+           ]],
+           [[
+             bool e = &s;
+             *pq |= q; *pq |= ! q;
+             *qq |= q; *qq |= ! 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 + !qq);
+           ]])],
+        [ac_cv_header_stdbool_h=yes],
+        [ac_cv_header_stdbool_h=no])])
+   AC_CHECK_TYPES([_Bool])
+])
diff --git a/gl/m4/stddef_h.m4 b/gl/m4/stddef_h.m4
new file mode 100644
index 0000000..f45def1
--- /dev/null
+++ b/gl/m4/stddef_h.m4
@@ -0,0 +1,51 @@
+dnl A placeholder for <stddef.h>, for platforms that have issues.
+# stddef_h.m4 serial 5
+dnl Copyright (C) 2009-2017 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_STDDEF_H],
+[
+  AC_REQUIRE([gl_STDDEF_H_DEFAULTS])
+  AC_REQUIRE([gt_TYPE_WCHAR_T])
+  STDDEF_H=
+  AC_CHECK_TYPE([max_align_t], [], [HAVE_MAX_ALIGN_T=0; STDDEF_H=stddef.h],
+    [[#include <stddef.h>
+    ]])
+  if test $gt_cv_c_wchar_t = no; then
+    HAVE_WCHAR_T=0
+    STDDEF_H=stddef.h
+  fi
+  AC_CACHE_CHECK([whether NULL can be used in arbitrary expressions],
+    [gl_cv_decl_null_works],
+    [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stddef.h>
+      int test[2 * (sizeof NULL == sizeof (void *)) -1];
+]])],
+      [gl_cv_decl_null_works=yes],
+      [gl_cv_decl_null_works=no])])
+  if test $gl_cv_decl_null_works = no; then
+    REPLACE_NULL=1
+    STDDEF_H=stddef.h
+  fi
+  AC_SUBST([STDDEF_H])
+  AM_CONDITIONAL([GL_GENERATE_STDDEF_H], [test -n "$STDDEF_H"])
+  if test -n "$STDDEF_H"; then
+    gl_NEXT_HEADERS([stddef.h])
+  fi
+])
+
+AC_DEFUN([gl_STDDEF_MODULE_INDICATOR],
+[
+  dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
+  AC_REQUIRE([gl_STDDEF_H_DEFAULTS])
+  gl_MODULE_INDICATOR_SET_VARIABLE([$1])
+])
+
+AC_DEFUN([gl_STDDEF_H_DEFAULTS],
+[
+  dnl Assume proper GNU behavior unless another module says otherwise.
+  REPLACE_NULL=0;                AC_SUBST([REPLACE_NULL])
+  HAVE_MAX_ALIGN_T=1;            AC_SUBST([HAVE_MAX_ALIGN_T])
+  HAVE_WCHAR_T=1;                AC_SUBST([HAVE_WCHAR_T])
+])
diff --git a/gl/m4/stdint.m4 b/gl/m4/stdint.m4
new file mode 100644
index 0000000..4bf3e47
--- /dev/null
+++ b/gl/m4/stdint.m4
@@ -0,0 +1,549 @@
+# stdint.m4 serial 51
+dnl Copyright (C) 2001-2017 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Paul Eggert and Bruno Haible.
+dnl Test whether <stdint.h> is supported or must be substituted.
+
+AC_DEFUN_ONCE([gl_STDINT_H],
+[
+  AC_PREREQ([2.59])dnl
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+
+  AC_REQUIRE([gl_LIMITS_H])
+  AC_REQUIRE([gt_TYPE_WINT_T])
+
+  dnl Check for long long int and unsigned long long int.
+  AC_REQUIRE([AC_TYPE_LONG_LONG_INT])
+  if test $ac_cv_type_long_long_int = yes; then
+    HAVE_LONG_LONG_INT=1
+  else
+    HAVE_LONG_LONG_INT=0
+  fi
+  AC_SUBST([HAVE_LONG_LONG_INT])
+  AC_REQUIRE([AC_TYPE_UNSIGNED_LONG_LONG_INT])
+  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
+  AC_SUBST([HAVE_UNSIGNED_LONG_LONG_INT])
+
+  dnl Check for <wchar.h>, in the same way as gl_WCHAR_H does.
+  AC_CHECK_HEADERS_ONCE([wchar.h])
+  if test $ac_cv_header_wchar_h = yes; then
+    HAVE_WCHAR_H=1
+  else
+    HAVE_WCHAR_H=0
+  fi
+  AC_SUBST([HAVE_WCHAR_H])
+
+  dnl Check for <inttypes.h>.
+  dnl AC_INCLUDES_DEFAULT defines $ac_cv_header_inttypes_h.
+  if test $ac_cv_header_inttypes_h = yes; then
+    HAVE_INTTYPES_H=1
+  else
+    HAVE_INTTYPES_H=0
+  fi
+  AC_SUBST([HAVE_INTTYPES_H])
+
+  dnl Check for <sys/types.h>.
+  dnl AC_INCLUDES_DEFAULT defines $ac_cv_header_sys_types_h.
+  if test $ac_cv_header_sys_types_h = yes; then
+    HAVE_SYS_TYPES_H=1
+  else
+    HAVE_SYS_TYPES_H=0
+  fi
+  AC_SUBST([HAVE_SYS_TYPES_H])
+
+  gl_CHECK_NEXT_HEADERS([stdint.h])
+  if test $ac_cv_header_stdint_h = yes; then
+    HAVE_STDINT_H=1
+  else
+    HAVE_STDINT_H=0
+  fi
+  AC_SUBST([HAVE_STDINT_H])
+
+  dnl Now see whether we need a substitute <stdint.h>.
+  if test $ac_cv_header_stdint_h = yes; then
+    AC_CACHE_CHECK([whether stdint.h conforms to C99],
+      [gl_cv_header_working_stdint_h],
+      [gl_cv_header_working_stdint_h=no
+       AC_COMPILE_IFELSE([
+         AC_LANG_PROGRAM([[
+#define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
+#define __STDC_CONSTANT_MACROS 1
+#define __STDC_LIMIT_MACROS 1
+#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
+]
+gl_STDINT_INCLUDES
+[
+#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;
+
+/* Check that SIZE_MAX has the correct type, if possible.  */
+#if 201112 <= __STDC_VERSION__
+int k = _Generic (SIZE_MAX, size_t: 0);
+#elif (2 <= __GNUC__ || defined __IBM__TYPEOF__ \
+       || (0x5110 <= __SUNPRO_C && !__STDC__))
+extern size_t k;
+extern __typeof__ (SIZE_MAX) k;
+#endif
+
+#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;
+};
+         ]])],
+         [dnl Determine whether the various *_MIN, *_MAX macros are usable
+          dnl in preprocessor expression. We could do it by compiling a test
+          dnl program for each of these macros. It is faster to run a program
+          dnl that inspects the macro expansion.
+          dnl This detects a bug on HP-UX 11.23/ia64.
+          AC_RUN_IFELSE([
+            AC_LANG_PROGRAM([[
+#define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
+#define __STDC_CONSTANT_MACROS 1
+#define __STDC_LIMIT_MACROS 1
+#include <stdint.h>
+]
+gl_STDINT_INCLUDES
+[
+#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
+  };
+]], [[
+  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;
+]])],
+              [gl_cv_header_working_stdint_h=yes],
+              [],
+              [case "$host_os" in
+                         # Guess yes on native Windows.
+                 mingw*) gl_cv_header_working_stdint_h="guessing yes" ;;
+                         # In general, assume it works.
+                 *)      gl_cv_header_working_stdint_h="guessing yes" ;;
+               esac
+              ])
+         ])
+      ])
+  fi
+
+  HAVE_C99_STDINT_H=0
+  HAVE_SYS_BITYPES_H=0
+  HAVE_SYS_INTTYPES_H=0
+  STDINT_H=stdint.h
+  case "$gl_cv_header_working_stdint_h" in
+    *yes)
+      HAVE_C99_STDINT_H=1
+      dnl Now see whether the system <stdint.h> works without
+      dnl __STDC_CONSTANT_MACROS/__STDC_LIMIT_MACROS defined.
+      AC_CACHE_CHECK([whether stdint.h predates C++11],
+        [gl_cv_header_stdint_predates_cxx11_h],
+        [gl_cv_header_stdint_predates_cxx11_h=yes
+         AC_COMPILE_IFELSE([
+           AC_LANG_PROGRAM([[
+#define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
+#include <stdint.h>
+]
+gl_STDINT_INCLUDES
+[
+intmax_t im = INTMAX_MAX;
+int32_t i32 = INT32_C (0x7fffffff);
+           ]])],
+           [gl_cv_header_stdint_predates_cxx11_h=no])])
+
+      if test "$gl_cv_header_stdint_predates_cxx11_h" = yes; then
+        AC_DEFINE([__STDC_CONSTANT_MACROS], [1],
+                  [Define to 1 if the system <stdint.h> predates C++11.])
+        AC_DEFINE([__STDC_LIMIT_MACROS], [1],
+                  [Define to 1 if the system <stdint.h> predates C++11.])
+      fi
+      AC_CACHE_CHECK([whether stdint.h has UINTMAX_WIDTH etc.],
+        [gl_cv_header_stdint_width],
+        [gl_cv_header_stdint_width=no
+         AC_COMPILE_IFELSE(
+           [AC_LANG_PROGRAM([[
+              /* Work if build is not clean.  */
+              #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1
+              #ifndef __STDC_WANT_IEC_60559_BFP_EXT__
+               #define __STDC_WANT_IEC_60559_BFP_EXT__ 1
+              #endif
+              #include <stdint.h>
+              ]gl_STDINT_INCLUDES[
+              int iw = UINTMAX_WIDTH;
+              ]])],
+           [gl_cv_header_stdint_width=yes])])
+      if test "$gl_cv_header_stdint_width" = yes; then
+        STDINT_H=
+      fi
+      ;;
+    *)
+      dnl Check for <sys/inttypes.h>, and for
+      dnl <sys/bitypes.h> (used in Linux libc4 >= 4.6.7 and libc5).
+      AC_CHECK_HEADERS([sys/inttypes.h sys/bitypes.h])
+      if test $ac_cv_header_sys_inttypes_h = yes; then
+        HAVE_SYS_INTTYPES_H=1
+      fi
+      if test $ac_cv_header_sys_bitypes_h = yes; then
+        HAVE_SYS_BITYPES_H=1
+      fi
+      gl_STDINT_TYPE_PROPERTIES
+      ;;
+  esac
+
+  dnl The substitute stdint.h needs the substitute limit.h's _GL_INTEGER_WIDTH.
+  LIMITS_H=limits.h
+  AM_CONDITIONAL([GL_GENERATE_LIMITS_H], [test -n "$LIMITS_H"])
+
+  AC_SUBST([HAVE_C99_STDINT_H])
+  AC_SUBST([HAVE_SYS_BITYPES_H])
+  AC_SUBST([HAVE_SYS_INTTYPES_H])
+  AC_SUBST([STDINT_H])
+  AM_CONDITIONAL([GL_GENERATE_STDINT_H], [test -n "$STDINT_H"])
+])
+
+dnl gl_STDINT_BITSIZEOF(TYPES, INCLUDES)
+dnl Determine the size of each of the given types in bits.
+AC_DEFUN([gl_STDINT_BITSIZEOF],
+[
+  dnl Use a shell loop, to avoid bloating configure, and
+  dnl - extra AH_TEMPLATE calls, so that autoheader knows what to put into
+  dnl   config.h.in,
+  dnl - extra AC_SUBST calls, so that the right substitutions are made.
+  m4_foreach_w([gltype], [$1],
+    [AH_TEMPLATE([BITSIZEOF_]m4_translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]),
+       [Define to the number of bits in type ']gltype['.])])
+  for gltype in $1 ; do
+    AC_CACHE_CHECK([for bit size of $gltype], [gl_cv_bitsizeof_${gltype}],
+      [AC_COMPUTE_INT([result], [sizeof ($gltype) * CHAR_BIT],
+         [$2
+#include <limits.h>], [result=unknown])
+       eval gl_cv_bitsizeof_${gltype}=\$result
+      ])
+    eval result=\$gl_cv_bitsizeof_${gltype}
+    if test $result = unknown; then
+      dnl Use a nonempty default, because some compilers, such as IRIX 5 cc,
+      dnl do a syntax check even on unused #if conditions and give an error
+      dnl on valid C code like this:
+      dnl   #if 0
+      dnl   # if  > 32
+      dnl   # endif
+      dnl   #endif
+      result=0
+    fi
+    GLTYPE=`echo "$gltype" | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
+    AC_DEFINE_UNQUOTED([BITSIZEOF_${GLTYPE}], [$result])
+    eval BITSIZEOF_${GLTYPE}=\$result
+  done
+  m4_foreach_w([gltype], [$1],
+    [AC_SUBST([BITSIZEOF_]m4_translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]))])
+])
+
+dnl gl_CHECK_TYPES_SIGNED(TYPES, INCLUDES)
+dnl Determine the signedness of each of the given types.
+dnl Define HAVE_SIGNED_TYPE if type is signed.
+AC_DEFUN([gl_CHECK_TYPES_SIGNED],
+[
+  dnl Use a shell loop, to avoid bloating configure, and
+  dnl - extra AH_TEMPLATE calls, so that autoheader knows what to put into
+  dnl   config.h.in,
+  dnl - extra AC_SUBST calls, so that the right substitutions are made.
+  m4_foreach_w([gltype], [$1],
+    [AH_TEMPLATE([HAVE_SIGNED_]m4_translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]),
+       [Define to 1 if ']gltype[' is a signed integer type.])])
+  for gltype in $1 ; do
+    AC_CACHE_CHECK([whether $gltype is signed], [gl_cv_type_${gltype}_signed],
+      [AC_COMPILE_IFELSE(
+         [AC_LANG_PROGRAM([$2[
+            int verify[2 * (($gltype) -1 < ($gltype) 0) - 1];]])],
+         result=yes, result=no)
+       eval gl_cv_type_${gltype}_signed=\$result
+      ])
+    eval result=\$gl_cv_type_${gltype}_signed
+    GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
+    if test "$result" = yes; then
+      AC_DEFINE_UNQUOTED([HAVE_SIGNED_${GLTYPE}], [1])
+      eval HAVE_SIGNED_${GLTYPE}=1
+    else
+      eval HAVE_SIGNED_${GLTYPE}=0
+    fi
+  done
+  m4_foreach_w([gltype], [$1],
+    [AC_SUBST([HAVE_SIGNED_]m4_translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]))])
+])
+
+dnl gl_INTEGER_TYPE_SUFFIX(TYPES, INCLUDES)
+dnl Determine the suffix to use for integer constants of the given types.
+dnl Define t_SUFFIX for each such type.
+AC_DEFUN([gl_INTEGER_TYPE_SUFFIX],
+[
+  dnl Use a shell loop, to avoid bloating configure, and
+  dnl - extra AH_TEMPLATE calls, so that autoheader knows what to put into
+  dnl   config.h.in,
+  dnl - extra AC_SUBST calls, so that the right substitutions are made.
+  m4_foreach_w([gltype], [$1],
+    [AH_TEMPLATE(m4_translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_])[_SUFFIX],
+       [Define to l, ll, u, ul, ull, etc., as suitable for
+        constants of type ']gltype['.])])
+  for gltype in $1 ; do
+    AC_CACHE_CHECK([for $gltype integer literal suffix],
+      [gl_cv_type_${gltype}_suffix],
+      [eval gl_cv_type_${gltype}_suffix=no
+       eval result=\$gl_cv_type_${gltype}_signed
+       if test "$result" = yes; then
+         glsufu=
+       else
+         glsufu=u
+       fi
+       for glsuf in "$glsufu" ${glsufu}l ${glsufu}ll ${glsufu}i64; do
+         case $glsuf in
+           '')  gltype1='int';;
+           l)   gltype1='long int';;
+           ll)  gltype1='long long int';;
+           i64) gltype1='__int64';;
+           u)   gltype1='unsigned int';;
+           ul)  gltype1='unsigned long int';;
+           ull) gltype1='unsigned long long int';;
+           ui64)gltype1='unsigned __int64';;
+         esac
+         AC_COMPILE_IFELSE(
+           [AC_LANG_PROGRAM([$2[
+              extern $gltype foo;
+              extern $gltype1 foo;]])],
+           [eval gl_cv_type_${gltype}_suffix=\$glsuf])
+         eval result=\$gl_cv_type_${gltype}_suffix
+         test "$result" != no && break
+       done])
+    GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
+    eval result=\$gl_cv_type_${gltype}_suffix
+    test "$result" = no && result=
+    eval ${GLTYPE}_SUFFIX=\$result
+    AC_DEFINE_UNQUOTED([${GLTYPE}_SUFFIX], [$result])
+  done
+  m4_foreach_w([gltype], [$1],
+    [AC_SUBST(m4_translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_])[_SUFFIX])])
+])
+
+dnl gl_STDINT_INCLUDES
+AC_DEFUN([gl_STDINT_INCLUDES],
+[[
+  /* 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
+]])
+
+dnl gl_STDINT_TYPE_PROPERTIES
+dnl Compute HAVE_SIGNED_t, BITSIZEOF_t and t_SUFFIX, for all the types t
+dnl of interest to stdint.in.h.
+AC_DEFUN([gl_STDINT_TYPE_PROPERTIES],
+[
+  AC_REQUIRE([gl_MULTIARCH])
+  if test $APPLE_UNIVERSAL_BUILD = 0; then
+    gl_STDINT_BITSIZEOF([ptrdiff_t size_t],
+      [gl_STDINT_INCLUDES])
+  fi
+  gl_STDINT_BITSIZEOF([sig_atomic_t wchar_t wint_t],
+    [gl_STDINT_INCLUDES])
+  gl_CHECK_TYPES_SIGNED([sig_atomic_t wchar_t wint_t],
+    [gl_STDINT_INCLUDES])
+  gl_cv_type_ptrdiff_t_signed=yes
+  gl_cv_type_size_t_signed=no
+  if test $APPLE_UNIVERSAL_BUILD = 0; then
+    gl_INTEGER_TYPE_SUFFIX([ptrdiff_t size_t],
+      [gl_STDINT_INCLUDES])
+  fi
+  gl_INTEGER_TYPE_SUFFIX([sig_atomic_t wchar_t wint_t],
+    [gl_STDINT_INCLUDES])
+
+  dnl If wint_t is smaller than 'int', it cannot satisfy the ISO C 99
+  dnl requirement that wint_t is "unchanged by default argument promotions".
+  dnl In this case gnulib's <wchar.h> and <wctype.h> override wint_t.
+  dnl Set the variable BITSIZEOF_WINT_T accordingly.
+  if test $GNULIB_OVERRIDES_WINT_T = 1; then
+    BITSIZEOF_WINT_T=32
+  fi
+])
+
+dnl Autoconf >= 2.61 has AC_COMPUTE_INT built-in.
+dnl Remove this when we can assume autoconf >= 2.61.
+m4_ifdef([AC_COMPUTE_INT], [], [
+  AC_DEFUN([AC_COMPUTE_INT], [_AC_COMPUTE_INT([$2],[$1],[$3],[$4])])
+])
diff --git a/gl/m4/stdlib_h.m4 b/gl/m4/stdlib_h.m4
new file mode 100644
index 0000000..3537346
--- /dev/null
+++ b/gl/m4/stdlib_h.m4
@@ -0,0 +1,124 @@
+# stdlib_h.m4 serial 44
+dnl Copyright (C) 2007-2017 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_STDLIB_H],
+[
+  AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
+  gl_NEXT_HEADERS([stdlib.h])
+
+  dnl Check for declarations of anything we want to poison if the
+  dnl corresponding gnulib module is not in use, and which is not
+  dnl guaranteed by C89.
+  gl_WARN_ON_USE_PREPARE([[#include <stdlib.h>
+#if HAVE_SYS_LOADAVG_H
+# include <sys/loadavg.h>
+#endif
+#if HAVE_RANDOM_H
+# include <random.h>
+#endif
+    ]], [_Exit atoll canonicalize_file_name getloadavg getsubopt grantpt
+    initstate initstate_r mkdtemp mkostemp mkostemps mkstemp mkstemps
+    posix_openpt ptsname ptsname_r qsort_r random random_r reallocarray
+    realpath rpmatch secure_getenv setenv setstate setstate_r srandom
+    srandom_r strtod strtoll strtoull unlockpt unsetenv])
+])
+
+AC_DEFUN([gl_STDLIB_MODULE_INDICATOR],
+[
+  dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
+  AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
+  gl_MODULE_INDICATOR_SET_VARIABLE([$1])
+  dnl Define it also as a C macro, for the benefit of the unit tests.
+  gl_MODULE_INDICATOR_FOR_TESTS([$1])
+])
+
+AC_DEFUN([gl_STDLIB_H_DEFAULTS],
+[
+  GNULIB__EXIT=0;         AC_SUBST([GNULIB__EXIT])
+  GNULIB_ATOLL=0;         AC_SUBST([GNULIB_ATOLL])
+  GNULIB_CALLOC_POSIX=0;  AC_SUBST([GNULIB_CALLOC_POSIX])
+  GNULIB_CANONICALIZE_FILE_NAME=0;  AC_SUBST([GNULIB_CANONICALIZE_FILE_NAME])
+  GNULIB_GETLOADAVG=0;    AC_SUBST([GNULIB_GETLOADAVG])
+  GNULIB_GETSUBOPT=0;     AC_SUBST([GNULIB_GETSUBOPT])
+  GNULIB_GRANTPT=0;       AC_SUBST([GNULIB_GRANTPT])
+  GNULIB_MALLOC_POSIX=0;  AC_SUBST([GNULIB_MALLOC_POSIX])
+  GNULIB_MBTOWC=0;        AC_SUBST([GNULIB_MBTOWC])
+  GNULIB_MKDTEMP=0;       AC_SUBST([GNULIB_MKDTEMP])
+  GNULIB_MKOSTEMP=0;      AC_SUBST([GNULIB_MKOSTEMP])
+  GNULIB_MKOSTEMPS=0;     AC_SUBST([GNULIB_MKOSTEMPS])
+  GNULIB_MKSTEMP=0;       AC_SUBST([GNULIB_MKSTEMP])
+  GNULIB_MKSTEMPS=0;      AC_SUBST([GNULIB_MKSTEMPS])
+  GNULIB_POSIX_OPENPT=0;  AC_SUBST([GNULIB_POSIX_OPENPT])
+  GNULIB_PTSNAME=0;       AC_SUBST([GNULIB_PTSNAME])
+  GNULIB_PTSNAME_R=0;     AC_SUBST([GNULIB_PTSNAME_R])
+  GNULIB_PUTENV=0;        AC_SUBST([GNULIB_PUTENV])
+  GNULIB_QSORT_R=0;       AC_SUBST([GNULIB_QSORT_R])
+  GNULIB_RANDOM=0;        AC_SUBST([GNULIB_RANDOM])
+  GNULIB_RANDOM_R=0;      AC_SUBST([GNULIB_RANDOM_R])
+  GNULIB_REALLOCARRAY=0;  AC_SUBST([GNULIB_REALLOCARRAY])
+  GNULIB_REALLOC_POSIX=0; AC_SUBST([GNULIB_REALLOC_POSIX])
+  GNULIB_REALPATH=0;      AC_SUBST([GNULIB_REALPATH])
+  GNULIB_RPMATCH=0;       AC_SUBST([GNULIB_RPMATCH])
+  GNULIB_SECURE_GETENV=0; AC_SUBST([GNULIB_SECURE_GETENV])
+  GNULIB_SETENV=0;        AC_SUBST([GNULIB_SETENV])
+  GNULIB_STRTOD=0;        AC_SUBST([GNULIB_STRTOD])
+  GNULIB_STRTOLL=0;       AC_SUBST([GNULIB_STRTOLL])
+  GNULIB_STRTOULL=0;      AC_SUBST([GNULIB_STRTOULL])
+  GNULIB_SYSTEM_POSIX=0;  AC_SUBST([GNULIB_SYSTEM_POSIX])
+  GNULIB_UNLOCKPT=0;      AC_SUBST([GNULIB_UNLOCKPT])
+  GNULIB_UNSETENV=0;      AC_SUBST([GNULIB_UNSETENV])
+  GNULIB_WCTOMB=0;        AC_SUBST([GNULIB_WCTOMB])
+  dnl Assume proper GNU behavior unless another module says otherwise.
+  HAVE__EXIT=1;              AC_SUBST([HAVE__EXIT])
+  HAVE_ATOLL=1;              AC_SUBST([HAVE_ATOLL])
+  HAVE_CANONICALIZE_FILE_NAME=1;  AC_SUBST([HAVE_CANONICALIZE_FILE_NAME])
+  HAVE_DECL_GETLOADAVG=1;    AC_SUBST([HAVE_DECL_GETLOADAVG])
+  HAVE_GETSUBOPT=1;          AC_SUBST([HAVE_GETSUBOPT])
+  HAVE_GRANTPT=1;            AC_SUBST([HAVE_GRANTPT])
+  HAVE_DECL_INITSTATE=1;     AC_SUBST([HAVE_DECL_INITSTATE])
+  HAVE_MKDTEMP=1;            AC_SUBST([HAVE_MKDTEMP])
+  HAVE_MKOSTEMP=1;           AC_SUBST([HAVE_MKOSTEMP])
+  HAVE_MKOSTEMPS=1;          AC_SUBST([HAVE_MKOSTEMPS])
+  HAVE_MKSTEMP=1;            AC_SUBST([HAVE_MKSTEMP])
+  HAVE_MKSTEMPS=1;           AC_SUBST([HAVE_MKSTEMPS])
+  HAVE_POSIX_OPENPT=1;       AC_SUBST([HAVE_POSIX_OPENPT])
+  HAVE_PTSNAME=1;            AC_SUBST([HAVE_PTSNAME])
+  HAVE_PTSNAME_R=1;          AC_SUBST([HAVE_PTSNAME_R])
+  HAVE_QSORT_R=1;            AC_SUBST([HAVE_QSORT_R])
+  HAVE_RANDOM=1;             AC_SUBST([HAVE_RANDOM])
+  HAVE_RANDOM_H=1;           AC_SUBST([HAVE_RANDOM_H])
+  HAVE_RANDOM_R=1;           AC_SUBST([HAVE_RANDOM_R])
+  HAVE_REALLOCARRAY=1;       AC_SUBST([HAVE_REALLOCARRAY])
+  HAVE_REALPATH=1;           AC_SUBST([HAVE_REALPATH])
+  HAVE_RPMATCH=1;            AC_SUBST([HAVE_RPMATCH])
+  HAVE_SECURE_GETENV=1;      AC_SUBST([HAVE_SECURE_GETENV])
+  HAVE_SETENV=1;             AC_SUBST([HAVE_SETENV])
+  HAVE_DECL_SETENV=1;        AC_SUBST([HAVE_DECL_SETENV])
+  HAVE_DECL_SETSTATE=1;      AC_SUBST([HAVE_DECL_SETSTATE])
+  HAVE_STRTOD=1;             AC_SUBST([HAVE_STRTOD])
+  HAVE_STRTOLL=1;            AC_SUBST([HAVE_STRTOLL])
+  HAVE_STRTOULL=1;           AC_SUBST([HAVE_STRTOULL])
+  HAVE_STRUCT_RANDOM_DATA=1; AC_SUBST([HAVE_STRUCT_RANDOM_DATA])
+  HAVE_SYS_LOADAVG_H=0;      AC_SUBST([HAVE_SYS_LOADAVG_H])
+  HAVE_UNLOCKPT=1;           AC_SUBST([HAVE_UNLOCKPT])
+  HAVE_DECL_UNSETENV=1;      AC_SUBST([HAVE_DECL_UNSETENV])
+  REPLACE_CALLOC=0;          AC_SUBST([REPLACE_CALLOC])
+  REPLACE_CANONICALIZE_FILE_NAME=0;  AC_SUBST([REPLACE_CANONICALIZE_FILE_NAME])
+  REPLACE_MALLOC=0;          AC_SUBST([REPLACE_MALLOC])
+  REPLACE_MBTOWC=0;          AC_SUBST([REPLACE_MBTOWC])
+  REPLACE_MKSTEMP=0;         AC_SUBST([REPLACE_MKSTEMP])
+  REPLACE_PTSNAME=0;         AC_SUBST([REPLACE_PTSNAME])
+  REPLACE_PTSNAME_R=0;       AC_SUBST([REPLACE_PTSNAME_R])
+  REPLACE_PUTENV=0;          AC_SUBST([REPLACE_PUTENV])
+  REPLACE_QSORT_R=0;         AC_SUBST([REPLACE_QSORT_R])
+  REPLACE_RANDOM_R=0;        AC_SUBST([REPLACE_RANDOM_R])
+  REPLACE_REALLOC=0;         AC_SUBST([REPLACE_REALLOC])
+  REPLACE_REALPATH=0;        AC_SUBST([REPLACE_REALPATH])
+  REPLACE_SETENV=0;          AC_SUBST([REPLACE_SETENV])
+  REPLACE_STRTOD=0;          AC_SUBST([REPLACE_STRTOD])
+  REPLACE_UNSETENV=0;        AC_SUBST([REPLACE_UNSETENV])
+  REPLACE_WCTOMB=0;          AC_SUBST([REPLACE_WCTOMB])
+])
diff --git a/gl/m4/sys_socket_h.m4 b/gl/m4/sys_socket_h.m4
new file mode 100644
index 0000000..3ecbe7c
--- /dev/null
+++ b/gl/m4/sys_socket_h.m4
@@ -0,0 +1,176 @@
+# sys_socket_h.m4 serial 23
+dnl Copyright (C) 2005-2017 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Simon Josefsson.
+
+AC_DEFUN([gl_HEADER_SYS_SOCKET],
+[
+  AC_REQUIRE([gl_SYS_SOCKET_H_DEFAULTS])
+  AC_REQUIRE([AC_CANONICAL_HOST])
+
+  dnl On OSF/1, the functions recv(), send(), recvfrom(), sendto() have
+  dnl old-style declarations (with return type 'int' instead of 'ssize_t')
+  dnl unless _POSIX_PII_SOCKET is defined.
+  case "$host_os" in
+    osf*)
+      AC_DEFINE([_POSIX_PII_SOCKET], [1],
+        [Define to 1 in order to get the POSIX compatible declarations
+         of socket functions.])
+      ;;
+  esac
+
+  AC_CACHE_CHECK([whether <sys/socket.h> is self-contained],
+    [gl_cv_header_sys_socket_h_selfcontained],
+    [
+      AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/socket.h>]], [[]])],
+        [gl_cv_header_sys_socket_h_selfcontained=yes],
+        [gl_cv_header_sys_socket_h_selfcontained=no])
+    ])
+  if test $gl_cv_header_sys_socket_h_selfcontained = yes; then
+    dnl If the shutdown function exists, <sys/socket.h> should define
+    dnl SHUT_RD, SHUT_WR, SHUT_RDWR.
+    AC_CHECK_FUNCS([shutdown])
+    if test $ac_cv_func_shutdown = yes; then
+      AC_CACHE_CHECK([whether <sys/socket.h> defines the SHUT_* macros],
+        [gl_cv_header_sys_socket_h_shut],
+        [
+          AC_COMPILE_IFELSE(
+            [AC_LANG_PROGRAM([[#include <sys/socket.h>]],
+               [[int a[] = { SHUT_RD, SHUT_WR, SHUT_RDWR };]])],
+            [gl_cv_header_sys_socket_h_shut=yes],
+            [gl_cv_header_sys_socket_h_shut=no])
+        ])
+      if test $gl_cv_header_sys_socket_h_shut = no; then
+        SYS_SOCKET_H='sys/socket.h'
+      fi
+    fi
+  fi
+  # We need to check for ws2tcpip.h now.
+  gl_PREREQ_SYS_H_SOCKET
+  AC_CHECK_TYPES([struct sockaddr_storage, sa_family_t],,,[
+  /* sys/types.h is not needed according to POSIX, but the
+     sys/socket.h in i386-unknown-freebsd4.10 and
+     powerpc-apple-darwin5.5 required it. */
+#include <sys/types.h>
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_WS2TCPIP_H
+#include <ws2tcpip.h>
+#endif
+])
+  if test $ac_cv_type_struct_sockaddr_storage = no; then
+    HAVE_STRUCT_SOCKADDR_STORAGE=0
+  fi
+  if test $ac_cv_type_sa_family_t = no; then
+    HAVE_SA_FAMILY_T=0
+  fi
+  if test $ac_cv_type_struct_sockaddr_storage != no; then
+    AC_CHECK_MEMBERS([struct sockaddr_storage.ss_family],
+      [],
+      [HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY=0],
+      [#include <sys/types.h>
+       #ifdef HAVE_SYS_SOCKET_H
+       #include <sys/socket.h>
+       #endif
+       #ifdef HAVE_WS2TCPIP_H
+       #include <ws2tcpip.h>
+       #endif
+      ])
+  fi
+  if test $HAVE_STRUCT_SOCKADDR_STORAGE = 0 || test $HAVE_SA_FAMILY_T = 0 \
+     || test $HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY = 0; then
+    SYS_SOCKET_H='sys/socket.h'
+  fi
+  gl_PREREQ_SYS_H_WINSOCK2
+
+  dnl Check for declarations of anything we want to poison if the
+  dnl corresponding gnulib module is not in use.
+  gl_WARN_ON_USE_PREPARE([[
+/* Some systems require prerequisite headers.  */
+#include <sys/types.h>
+#include <sys/socket.h>
+    ]], [socket connect accept bind getpeername getsockname getsockopt
+    listen recv send recvfrom sendto setsockopt shutdown accept4])
+])
+
+AC_DEFUN([gl_PREREQ_SYS_H_SOCKET],
+[
+  dnl Check prerequisites of the <sys/socket.h> replacement.
+  AC_REQUIRE([gl_CHECK_SOCKET_HEADERS])
+  gl_CHECK_NEXT_HEADERS([sys/socket.h])
+  if test $ac_cv_header_sys_socket_h = yes; then
+    HAVE_SYS_SOCKET_H=1
+    HAVE_WS2TCPIP_H=0
+  else
+    HAVE_SYS_SOCKET_H=0
+    if test $ac_cv_header_ws2tcpip_h = yes; then
+      HAVE_WS2TCPIP_H=1
+    else
+      HAVE_WS2TCPIP_H=0
+    fi
+  fi
+  AC_SUBST([HAVE_SYS_SOCKET_H])
+  AC_SUBST([HAVE_WS2TCPIP_H])
+])
+
+# Common prerequisites of the <sys/socket.h> replacement and of the
+# <sys/select.h> replacement.
+# Sets and substitutes HAVE_WINSOCK2_H.
+AC_DEFUN([gl_PREREQ_SYS_H_WINSOCK2],
+[
+  m4_ifdef([gl_UNISTD_H_DEFAULTS], [AC_REQUIRE([gl_UNISTD_H_DEFAULTS])])
+  m4_ifdef([gl_SYS_IOCTL_H_DEFAULTS], [AC_REQUIRE([gl_SYS_IOCTL_H_DEFAULTS])])
+  AC_CHECK_HEADERS_ONCE([sys/socket.h])
+  if test $ac_cv_header_sys_socket_h != yes; then
+    dnl We cannot use AC_CHECK_HEADERS_ONCE here, because that would make
+    dnl the check for those headers unconditional; yet cygwin reports
+    dnl that the headers are present but cannot be compiled (since on
+    dnl cygwin, all socket information should come from sys/socket.h).
+    AC_CHECK_HEADERS([winsock2.h])
+  fi
+  if test "$ac_cv_header_winsock2_h" = yes; then
+    HAVE_WINSOCK2_H=1
+    UNISTD_H_HAVE_WINSOCK2_H=1
+    SYS_IOCTL_H_HAVE_WINSOCK2_H=1
+  else
+    HAVE_WINSOCK2_H=0
+  fi
+  AC_SUBST([HAVE_WINSOCK2_H])
+])
+
+AC_DEFUN([gl_SYS_SOCKET_MODULE_INDICATOR],
+[
+  dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
+  AC_REQUIRE([gl_SYS_SOCKET_H_DEFAULTS])
+  gl_MODULE_INDICATOR_SET_VARIABLE([$1])
+  dnl Define it also as a C macro, for the benefit of the unit tests.
+  gl_MODULE_INDICATOR_FOR_TESTS([$1])
+])
+
+AC_DEFUN([gl_SYS_SOCKET_H_DEFAULTS],
+[
+  GNULIB_SOCKET=0;      AC_SUBST([GNULIB_SOCKET])
+  GNULIB_CONNECT=0;     AC_SUBST([GNULIB_CONNECT])
+  GNULIB_ACCEPT=0;      AC_SUBST([GNULIB_ACCEPT])
+  GNULIB_BIND=0;        AC_SUBST([GNULIB_BIND])
+  GNULIB_GETPEERNAME=0; AC_SUBST([GNULIB_GETPEERNAME])
+  GNULIB_GETSOCKNAME=0; AC_SUBST([GNULIB_GETSOCKNAME])
+  GNULIB_GETSOCKOPT=0;  AC_SUBST([GNULIB_GETSOCKOPT])
+  GNULIB_LISTEN=0;      AC_SUBST([GNULIB_LISTEN])
+  GNULIB_RECV=0;        AC_SUBST([GNULIB_RECV])
+  GNULIB_SEND=0;        AC_SUBST([GNULIB_SEND])
+  GNULIB_RECVFROM=0;    AC_SUBST([GNULIB_RECVFROM])
+  GNULIB_SENDTO=0;      AC_SUBST([GNULIB_SENDTO])
+  GNULIB_SETSOCKOPT=0;  AC_SUBST([GNULIB_SETSOCKOPT])
+  GNULIB_SHUTDOWN=0;    AC_SUBST([GNULIB_SHUTDOWN])
+  GNULIB_ACCEPT4=0;     AC_SUBST([GNULIB_ACCEPT4])
+  HAVE_STRUCT_SOCKADDR_STORAGE=1; AC_SUBST([HAVE_STRUCT_SOCKADDR_STORAGE])
+  HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY=1;
+                        AC_SUBST([HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY])
+  HAVE_SA_FAMILY_T=1;   AC_SUBST([HAVE_SA_FAMILY_T])
+  HAVE_ACCEPT4=1;       AC_SUBST([HAVE_ACCEPT4])
+])
diff --git a/gl/m4/sys_stat_h.m4 b/gl/m4/sys_stat_h.m4
new file mode 100644
index 0000000..8934278
--- /dev/null
+++ b/gl/m4/sys_stat_h.m4
@@ -0,0 +1,100 @@
+# sys_stat_h.m4 serial 31   -*- Autoconf -*-
+dnl Copyright (C) 2006-2017 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Eric Blake.
+dnl Provide a GNU-like <sys/stat.h>.
+
+AC_DEFUN([gl_HEADER_SYS_STAT_H],
+[
+  AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS])
+
+  dnl Check for broken stat macros.
+  AC_REQUIRE([AC_HEADER_STAT])
+
+  gl_CHECK_NEXT_HEADERS([sys/stat.h])
+
+  dnl Ensure the type mode_t gets defined.
+  AC_REQUIRE([AC_TYPE_MODE_T])
+
+  dnl Whether to enable precise timestamps in 'struct stat'.
+  m4_ifdef([gl_WINDOWS_STAT_TIMESPEC], [
+    AC_REQUIRE([gl_WINDOWS_STAT_TIMESPEC])
+  ], [
+    WINDOWS_STAT_TIMESPEC=0
+  ])
+  AC_SUBST([WINDOWS_STAT_TIMESPEC])
+
+  dnl Whether to ensure that struct stat.st_size is 64-bit wide.
+  m4_ifdef([gl_LARGEFILE], [
+    AC_REQUIRE([gl_LARGEFILE])
+  ], [
+    WINDOWS_64_BIT_ST_SIZE=0
+  ])
+  AC_SUBST([WINDOWS_64_BIT_ST_SIZE])
+
+  dnl Define types that are supposed to be defined in <sys/types.h> or
+  dnl <sys/stat.h>.
+  AC_CHECK_TYPE([nlink_t], [],
+    [AC_DEFINE([nlink_t], [int],
+       [Define to the type of st_nlink in struct stat, or a supertype.])],
+    [#include <sys/types.h>
+     #include <sys/stat.h>])
+
+  dnl Check for declarations of anything we want to poison if the
+  dnl corresponding gnulib module is not in use.
+  gl_WARN_ON_USE_PREPARE([[#include <sys/stat.h>
+    ]], [fchmodat fstat fstatat futimens lchmod lstat mkdirat mkfifo mkfifoat
+    mknod mknodat stat utimensat])
+]) # gl_HEADER_SYS_STAT_H
+
+AC_DEFUN([gl_SYS_STAT_MODULE_INDICATOR],
+[
+  dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
+  AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS])
+  gl_MODULE_INDICATOR_SET_VARIABLE([$1])
+  dnl Define it also as a C macro, for the benefit of the unit tests.
+  gl_MODULE_INDICATOR_FOR_TESTS([$1])
+])
+
+AC_DEFUN([gl_SYS_STAT_H_DEFAULTS],
+[
+  AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) dnl for REPLACE_FCHDIR
+  GNULIB_FCHMODAT=0;    AC_SUBST([GNULIB_FCHMODAT])
+  GNULIB_FSTAT=0;       AC_SUBST([GNULIB_FSTAT])
+  GNULIB_FSTATAT=0;     AC_SUBST([GNULIB_FSTATAT])
+  GNULIB_FUTIMENS=0;    AC_SUBST([GNULIB_FUTIMENS])
+  GNULIB_LCHMOD=0;      AC_SUBST([GNULIB_LCHMOD])
+  GNULIB_LSTAT=0;       AC_SUBST([GNULIB_LSTAT])
+  GNULIB_MKDIRAT=0;     AC_SUBST([GNULIB_MKDIRAT])
+  GNULIB_MKFIFO=0;      AC_SUBST([GNULIB_MKFIFO])
+  GNULIB_MKFIFOAT=0;    AC_SUBST([GNULIB_MKFIFOAT])
+  GNULIB_MKNOD=0;       AC_SUBST([GNULIB_MKNOD])
+  GNULIB_MKNODAT=0;     AC_SUBST([GNULIB_MKNODAT])
+  GNULIB_STAT=0;        AC_SUBST([GNULIB_STAT])
+  GNULIB_UTIMENSAT=0;   AC_SUBST([GNULIB_UTIMENSAT])
+  GNULIB_OVERRIDES_STRUCT_STAT=0; AC_SUBST([GNULIB_OVERRIDES_STRUCT_STAT])
+  dnl Assume proper GNU behavior unless another module says otherwise.
+  HAVE_FCHMODAT=1;      AC_SUBST([HAVE_FCHMODAT])
+  HAVE_FSTATAT=1;       AC_SUBST([HAVE_FSTATAT])
+  HAVE_FUTIMENS=1;      AC_SUBST([HAVE_FUTIMENS])
+  HAVE_LCHMOD=1;        AC_SUBST([HAVE_LCHMOD])
+  HAVE_LSTAT=1;         AC_SUBST([HAVE_LSTAT])
+  HAVE_MKDIRAT=1;       AC_SUBST([HAVE_MKDIRAT])
+  HAVE_MKFIFO=1;        AC_SUBST([HAVE_MKFIFO])
+  HAVE_MKFIFOAT=1;      AC_SUBST([HAVE_MKFIFOAT])
+  HAVE_MKNOD=1;         AC_SUBST([HAVE_MKNOD])
+  HAVE_MKNODAT=1;       AC_SUBST([HAVE_MKNODAT])
+  HAVE_UTIMENSAT=1;     AC_SUBST([HAVE_UTIMENSAT])
+  REPLACE_FSTAT=0;      AC_SUBST([REPLACE_FSTAT])
+  REPLACE_FSTATAT=0;    AC_SUBST([REPLACE_FSTATAT])
+  REPLACE_FUTIMENS=0;   AC_SUBST([REPLACE_FUTIMENS])
+  REPLACE_LSTAT=0;      AC_SUBST([REPLACE_LSTAT])
+  REPLACE_MKDIR=0;      AC_SUBST([REPLACE_MKDIR])
+  REPLACE_MKFIFO=0;     AC_SUBST([REPLACE_MKFIFO])
+  REPLACE_MKNOD=0;      AC_SUBST([REPLACE_MKNOD])
+  REPLACE_STAT=0;       AC_SUBST([REPLACE_STAT])
+  REPLACE_UTIMENSAT=0;  AC_SUBST([REPLACE_UTIMENSAT])
+])
diff --git a/gl/m4/sys_time_h.m4 b/gl/m4/sys_time_h.m4
new file mode 100644
index 0000000..1c8c3cf
--- /dev/null
+++ b/gl/m4/sys_time_h.m4
@@ -0,0 +1,110 @@
+# Configure a replacement for <sys/time.h>.
+# serial 9
+
+# Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# Written by Paul Eggert and Martin Lambers.
+
+AC_DEFUN([gl_HEADER_SYS_TIME_H],
+[
+  dnl Use AC_REQUIRE here, so that the REPLACE_GETTIMEOFDAY=0 statement
+  dnl below is expanded once only, before all REPLACE_GETTIMEOFDAY=1
+  dnl statements that occur in other macros.
+  AC_REQUIRE([gl_HEADER_SYS_TIME_H_BODY])
+])
+
+AC_DEFUN([gl_HEADER_SYS_TIME_H_BODY],
+[
+  AC_REQUIRE([AC_C_RESTRICT])
+  AC_REQUIRE([gl_HEADER_SYS_TIME_H_DEFAULTS])
+  AC_CHECK_HEADERS_ONCE([sys/time.h])
+  gl_CHECK_NEXT_HEADERS([sys/time.h])
+
+  if test $ac_cv_header_sys_time_h != yes; then
+    HAVE_SYS_TIME_H=0
+  fi
+
+  dnl On native Windows with MSVC, 'struct timeval' is defined in <winsock2.h>
+  dnl only. So include that header in the list.
+  gl_PREREQ_SYS_H_WINSOCK2
+  AC_CACHE_CHECK([for struct timeval], [gl_cv_sys_struct_timeval],
+    [AC_COMPILE_IFELSE(
+       [AC_LANG_PROGRAM(
+          [[#if HAVE_SYS_TIME_H
+             #include <sys/time.h>
+            #endif
+            #include <time.h>
+            #if HAVE_WINSOCK2_H
+            # include <winsock2.h>
+            #endif
+          ]],
+          [[static struct timeval x; x.tv_sec = x.tv_usec;]])],
+       [gl_cv_sys_struct_timeval=yes],
+       [gl_cv_sys_struct_timeval=no])
+    ])
+  if test $gl_cv_sys_struct_timeval != yes; then
+    HAVE_STRUCT_TIMEVAL=0
+  else
+    dnl On native Windows with a 64-bit 'time_t', 'struct timeval' is defined
+    dnl (in <sys/time.h> and <winsock2.h> for mingw64, in <winsock2.h> only
+    dnl for MSVC) with a tv_sec field of type 'long' (32-bit!), which is
+    dnl smaller than the 'time_t' type mandated by POSIX.
+    dnl On OpenBSD 5.1 amd64, tv_sec is 64 bits and time_t 32 bits, but
+    dnl that is good enough.
+    AC_CACHE_CHECK([for wide-enough struct timeval.tv_sec member],
+      [gl_cv_sys_struct_timeval_tv_sec],
+      [AC_COMPILE_IFELSE(
+         [AC_LANG_PROGRAM(
+            [[#if HAVE_SYS_TIME_H
+               #include <sys/time.h>
+              #endif
+              #include <time.h>
+              #if HAVE_WINSOCK2_H
+              # include <winsock2.h>
+              #endif
+            ]],
+            [[static struct timeval x;
+              typedef int verify_tv_sec_type[
+                sizeof (time_t) <= sizeof x.tv_sec ? 1 : -1
+              ];
+            ]])],
+         [gl_cv_sys_struct_timeval_tv_sec=yes],
+         [gl_cv_sys_struct_timeval_tv_sec=no])
+      ])
+    if test $gl_cv_sys_struct_timeval_tv_sec != yes; then
+      REPLACE_STRUCT_TIMEVAL=1
+    fi
+  fi
+
+  dnl Check for declarations of anything we want to poison if the
+  dnl corresponding gnulib module is not in use.
+  gl_WARN_ON_USE_PREPARE([[
+#if HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+#include <time.h>
+    ]], [gettimeofday])
+])
+
+AC_DEFUN([gl_SYS_TIME_MODULE_INDICATOR],
+[
+  dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
+  AC_REQUIRE([gl_HEADER_SYS_TIME_H_DEFAULTS])
+  gl_MODULE_INDICATOR_SET_VARIABLE([$1])
+  dnl Define it also as a C macro, for the benefit of the unit tests.
+  gl_MODULE_INDICATOR_FOR_TESTS([$1])
+])
+
+AC_DEFUN([gl_HEADER_SYS_TIME_H_DEFAULTS],
+[
+  GNULIB_GETTIMEOFDAY=0;     AC_SUBST([GNULIB_GETTIMEOFDAY])
+  dnl Assume POSIX behavior unless another module says otherwise.
+  HAVE_GETTIMEOFDAY=1;       AC_SUBST([HAVE_GETTIMEOFDAY])
+  HAVE_STRUCT_TIMEVAL=1;     AC_SUBST([HAVE_STRUCT_TIMEVAL])
+  HAVE_SYS_TIME_H=1;         AC_SUBST([HAVE_SYS_TIME_H])
+  REPLACE_GETTIMEOFDAY=0;    AC_SUBST([REPLACE_GETTIMEOFDAY])
+  REPLACE_STRUCT_TIMEVAL=0;  AC_SUBST([REPLACE_STRUCT_TIMEVAL])
+])
diff --git a/gl/m4/sys_types_h.m4 b/gl/m4/sys_types_h.m4
new file mode 100644
index 0000000..ec0860b
--- /dev/null
+++ b/gl/m4/sys_types_h.m4
@@ -0,0 +1,60 @@
+# sys_types_h.m4 serial 8
+dnl Copyright (C) 2011-2017 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN_ONCE([gl_SYS_TYPES_H],
+[
+  dnl Use sane struct stat types in OpenVMS 8.2 and later.
+  AC_DEFINE([_USE_STD_STAT], 1, [For standard stat data types on VMS.])
+
+  AC_REQUIRE([gl_SYS_TYPES_H_DEFAULTS])
+  gl_NEXT_HEADERS([sys/types.h])
+
+  dnl Ensure the type pid_t gets defined.
+  AC_REQUIRE([AC_TYPE_PID_T])
+
+  dnl Ensure the type mode_t gets defined.
+  AC_REQUIRE([AC_TYPE_MODE_T])
+
+  dnl Whether to override the 'off_t' type.
+  AC_REQUIRE([gl_TYPE_OFF_T])
+
+  dnl Whether to override the 'dev_t' and 'ino_t' types.
+  m4_ifdef([gl_WINDOWS_STAT_INODES], [
+    AC_REQUIRE([gl_WINDOWS_STAT_INODES])
+  ], [
+    WINDOWS_STAT_INODES=0
+  ])
+  AC_SUBST([WINDOWS_STAT_INODES])
+])
+
+AC_DEFUN([gl_SYS_TYPES_H_DEFAULTS],
+[
+])
+
+# This works around a buggy version in autoconf <= 2.69.
+# See <https://lists.gnu.org/archive/html/autoconf/2016-08/msg00014.html>
+
+m4_version_prereq([2.70], [], [
+
+# This is taken from the following Autoconf patch:
+# http://git.sv.gnu.org/cgit/autoconf.git/commit/?id=e17a30e98
+
+m4_undefine([AC_HEADER_MAJOR])
+AC_DEFUN([AC_HEADER_MAJOR],
+[AC_CHECK_HEADERS_ONCE([sys/types.h])
+AC_CHECK_HEADER([sys/mkdev.h],
+  [AC_DEFINE([MAJOR_IN_MKDEV], [1],
+    [Define to 1 if `major', `minor', and `makedev' are declared in
+     <mkdev.h>.])])
+if test $ac_cv_header_sys_mkdev_h = no; then
+  AC_CHECK_HEADER([sys/sysmacros.h],
+    [AC_DEFINE([MAJOR_IN_SYSMACROS], [1],
+      [Define to 1 if `major', `minor', and `makedev' are declared in
+       <sysmacros.h>.])])
+fi
+])
+
+])
diff --git a/gl/m4/tempname.m4 b/gl/m4/tempname.m4
new file mode 100644
index 0000000..a59f4c0
--- /dev/null
+++ b/gl/m4/tempname.m4
@@ -0,0 +1,19 @@
+#serial 5
+
+# Copyright (C) 2006-2007, 2009-2017 Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# glibc provides __gen_tempname as a wrapper for mk[ds]temp.  Expose
+# it as a public API, and provide it on systems that are lacking.
+AC_DEFUN([gl_FUNC_GEN_TEMPNAME],
+[
+  gl_PREREQ_TEMPNAME
+])
+
+# Prerequisites of lib/tempname.c.
+AC_DEFUN([gl_PREREQ_TEMPNAME],
+[
+  :
+])
diff --git a/gl/m4/threadlib.m4 b/gl/m4/threadlib.m4
new file mode 100644
index 0000000..6fd1b9e
--- /dev/null
+++ b/gl/m4/threadlib.m4
@@ -0,0 +1,395 @@
+# threadlib.m4 serial 13
+dnl Copyright (C) 2005-2017 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+dnl gl_THREADLIB
+dnl ------------
+dnl Tests for a multithreading library to be used.
+dnl If the configure.ac contains a definition of the gl_THREADLIB_DEFAULT_NO
+dnl (it must be placed before the invocation of gl_THREADLIB_EARLY!), then the
+dnl default is 'no', otherwise it is system dependent. In both cases, the user
+dnl can change the choice through the options --enable-threads=choice or
+dnl --disable-threads.
+dnl Defines at most one of the macros USE_POSIX_THREADS, USE_SOLARIS_THREADS,
+dnl USE_PTH_THREADS, USE_WINDOWS_THREADS
+dnl Sets the variables LIBTHREAD and LTLIBTHREAD to the linker options for use
+dnl in a Makefile (LIBTHREAD for use without libtool, LTLIBTHREAD for use with
+dnl libtool).
+dnl Sets the variables LIBMULTITHREAD and LTLIBMULTITHREAD similarly, for
+dnl programs that really need multithread functionality. The difference
+dnl between LIBTHREAD and LIBMULTITHREAD is that on platforms supporting weak
+dnl symbols, typically LIBTHREAD is empty whereas LIBMULTITHREAD is not.
+dnl Adds to CPPFLAGS the flag -D_REENTRANT or -D_THREAD_SAFE if needed for
+dnl multithread-safe programs.
+
+AC_DEFUN([gl_THREADLIB_EARLY],
+[
+  AC_REQUIRE([gl_THREADLIB_EARLY_BODY])
+])
+
+dnl The guts of gl_THREADLIB_EARLY. Needs to be expanded only once.
+
+AC_DEFUN([gl_THREADLIB_EARLY_BODY],
+[
+  dnl Ordering constraints: This macro modifies CPPFLAGS in a way that
+  dnl influences the result of the autoconf tests that test for *_unlocked
+  dnl declarations, on AIX 5 at least. Therefore it must come early.
+  AC_BEFORE([$0], [gl_FUNC_GLIBC_UNLOCKED_IO])dnl
+  AC_BEFORE([$0], [gl_ARGP])dnl
+
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  dnl _GNU_SOURCE is needed for pthread_rwlock_t on glibc systems.
+  dnl AC_USE_SYSTEM_EXTENSIONS was introduced in autoconf 2.60 and obsoletes
+  dnl AC_GNU_SOURCE.
+  m4_ifdef([AC_USE_SYSTEM_EXTENSIONS],
+    [AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])],
+    [AC_REQUIRE([AC_GNU_SOURCE])])
+  dnl Check for multithreading.
+  m4_ifdef([gl_THREADLIB_DEFAULT_NO],
+    [m4_divert_text([DEFAULTS], [gl_use_threads_default=no])],
+    [m4_divert_text([DEFAULTS], [gl_use_threads_default=])])
+  AC_ARG_ENABLE([threads],
+AC_HELP_STRING([--enable-threads={posix|solaris|pth|windows}], [specify multithreading API])m4_ifdef([gl_THREADLIB_DEFAULT_NO], [], [
+AC_HELP_STRING([--disable-threads], [build without multithread safety])]),
+    [gl_use_threads=$enableval],
+    [if test -n "$gl_use_threads_default"; then
+       gl_use_threads="$gl_use_threads_default"
+     else
+changequote(,)dnl
+       case "$host_os" in
+         dnl Disable multithreading by default on OSF/1, because it interferes
+         dnl with fork()/exec(): When msgexec is linked with -lpthread, its
+         dnl child process gets an endless segmentation fault inside execvp().
+         dnl Disable multithreading by default on Cygwin 1.5.x, because it has
+         dnl bugs that lead to endless loops or crashes. See
+         dnl <http://cygwin.com/ml/cygwin/2009-08/msg00283.html>.
+         osf*) gl_use_threads=no ;;
+         cygwin*)
+               case `uname -r` in
+                 1.[0-5].*) gl_use_threads=no ;;
+                 *)         gl_use_threads=yes ;;
+               esac
+               ;;
+         *)    gl_use_threads=yes ;;
+       esac
+changequote([,])dnl
+     fi
+    ])
+  if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then
+    # For using <pthread.h>:
+    case "$host_os" in
+      osf*)
+        # On OSF/1, the compiler needs the flag -D_REENTRANT so that it
+        # groks <pthread.h>. cc also understands the flag -pthread, but
+        # we don't use it because 1. gcc-2.95 doesn't understand -pthread,
+        # 2. putting a flag into CPPFLAGS that has an effect on the linker
+        # causes the AC_LINK_IFELSE test below to succeed unexpectedly,
+        # leading to wrong values of LIBTHREAD and LTLIBTHREAD.
+        CPPFLAGS="$CPPFLAGS -D_REENTRANT"
+        ;;
+    esac
+    # Some systems optimize for single-threaded programs by default, and
+    # need special flags to disable these optimizations. For example, the
+    # definition of 'errno' in <errno.h>.
+    case "$host_os" in
+      aix* | freebsd*) CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE" ;;
+      solaris*) CPPFLAGS="$CPPFLAGS -D_REENTRANT" ;;
+    esac
+  fi
+])
+
+dnl The guts of gl_THREADLIB. Needs to be expanded only once.
+
+AC_DEFUN([gl_THREADLIB_BODY],
+[
+  AC_REQUIRE([gl_THREADLIB_EARLY_BODY])
+  gl_threads_api=none
+  LIBTHREAD=
+  LTLIBTHREAD=
+  LIBMULTITHREAD=
+  LTLIBMULTITHREAD=
+  if test "$gl_use_threads" != no; then
+    dnl Check whether the compiler and linker support weak declarations.
+    AC_CACHE_CHECK([whether imported symbols can be declared weak],
+      [gl_cv_have_weak],
+      [gl_cv_have_weak=no
+       dnl First, test whether the compiler accepts it syntactically.
+       AC_LINK_IFELSE(
+         [AC_LANG_PROGRAM(
+            [[extern void xyzzy ();
+#pragma weak xyzzy]],
+            [[xyzzy();]])],
+         [gl_cv_have_weak=maybe])
+       if test $gl_cv_have_weak = maybe; then
+         dnl Second, test whether it actually works. On Cygwin 1.7.2, with
+         dnl gcc 4.3, symbols declared weak always evaluate to the address 0.
+         AC_RUN_IFELSE(
+           [AC_LANG_SOURCE([[
+#include <stdio.h>
+#pragma weak fputs
+int main ()
+{
+  return (fputs == NULL);
+}]])],
+           [gl_cv_have_weak=yes],
+           [gl_cv_have_weak=no],
+           [dnl When cross-compiling, assume that only ELF platforms support
+            dnl weak symbols.
+            AC_EGREP_CPP([Extensible Linking Format],
+              [#ifdef __ELF__
+               Extensible Linking Format
+               #endif
+              ],
+              [gl_cv_have_weak="guessing yes"],
+              [gl_cv_have_weak="guessing no"])
+           ])
+       fi
+       dnl But when linking statically, weak symbols don't work.
+       case " $LDFLAGS " in
+         *" -static "*) gl_cv_have_weak=no ;;
+       esac
+      ])
+    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_CHECK_HEADER([pthread.h],
+        [gl_have_pthread_h=yes], [gl_have_pthread_h=no])
+      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"
+          AC_LINK_IFELSE(
+            [AC_LANG_PROGRAM(
+               [[#include <pthread.h>
+                 pthread_mutex_t m;
+                 pthread_mutexattr_t ma;
+               ]],
+               [[pthread_mutex_lock (&m);
+                 pthread_mutexattr_init (&ma);]])],
+            [gl_have_pthread=yes
+             LIBTHREAD=$gl_pthread LTLIBTHREAD=$gl_pthread
+             LIBMULTITHREAD=$gl_pthread LTLIBMULTITHREAD=$gl_pthread])
+          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.
+          AC_CHECK_LIB([pthread], [pthread_kill],
+            [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.
+             # On Solaris 10 or newer, this test is no longer needed, because
+             # libc contains the fully functional pthread functions.
+             case "$host_os" in
+               solaris | solaris2.[1-9] | solaris2.[1-9].* | hpux*)
+                 AC_DEFINE([PTHREAD_IN_USE_DETECTION_HARD], [1],
+                   [Define if the pthread_in_use() detection is hard.])
+             esac
+            ])
+        elif test -z "$gl_have_pthread"; then
+          # Some library is needed. Try libpthread and libc_r.
+          AC_CHECK_LIB([pthread], [pthread_kill],
+            [gl_have_pthread=yes
+             LIBTHREAD=-lpthread LTLIBTHREAD=-lpthread
+             LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread])
+          if test -z "$gl_have_pthread"; then
+            # For FreeBSD 4.
+            AC_CHECK_LIB([c_r], [pthread_kill],
+              [gl_have_pthread=yes
+               LIBTHREAD=-lc_r LTLIBTHREAD=-lc_r
+               LIBMULTITHREAD=-lc_r LTLIBMULTITHREAD=-lc_r])
+          fi
+        fi
+        if test -n "$gl_have_pthread"; then
+          gl_threads_api=posix
+          AC_DEFINE([USE_POSIX_THREADS], [1],
+            [Define if the POSIX multithreading library can be used.])
+          if test -n "$LIBMULTITHREAD" || test -n "$LTLIBMULTITHREAD"; then
+            if case "$gl_cv_have_weak" in *yes) true;; *) false;; esac; then
+              AC_DEFINE([USE_POSIX_THREADS_WEAK], [1],
+                [Define if references to the POSIX multithreading library should be made weak.])
+              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"
+        AC_LINK_IFELSE(
+          [AC_LANG_PROGRAM(
+             [[
+#include <thread.h>
+#include <synch.h>
+             ]],
+             [[thr_self();]])],
+          [gl_have_solaristhread=yes])
+        LIBS="$gl_save_LIBS"
+        if test -n "$gl_have_solaristhread"; then
+          gl_threads_api=solaris
+          LIBTHREAD=-lthread
+          LTLIBTHREAD=-lthread
+          LIBMULTITHREAD="$LIBTHREAD"
+          LTLIBMULTITHREAD="$LTLIBTHREAD"
+          AC_DEFINE([USE_SOLARIS_THREADS], [1],
+            [Define if the old Solaris multithreading library can be used.])
+          if case "$gl_cv_have_weak" in *yes) true;; *) false;; esac; then
+            AC_DEFINE([USE_SOLARIS_THREADS_WEAK], [1],
+              [Define if references to the old Solaris multithreading library should be made weak.])
+            LIBTHREAD=
+            LTLIBTHREAD=
+          fi
+        fi
+      fi
+    fi
+    if test "$gl_use_threads" = pth; then
+      gl_save_CPPFLAGS="$CPPFLAGS"
+      AC_LIB_LINKFLAGS([pth])
+      gl_have_pth=
+      gl_save_LIBS="$LIBS"
+      LIBS="$LIBS $LIBPTH"
+      AC_LINK_IFELSE(
+        [AC_LANG_PROGRAM([[#include <pth.h>]], [[pth_self();]])],
+        [gl_have_pth=yes])
+      LIBS="$gl_save_LIBS"
+      if test -n "$gl_have_pth"; then
+        gl_threads_api=pth
+        LIBTHREAD="$LIBPTH"
+        LTLIBTHREAD="$LTLIBPTH"
+        LIBMULTITHREAD="$LIBTHREAD"
+        LTLIBMULTITHREAD="$LTLIBTHREAD"
+        AC_DEFINE([USE_PTH_THREADS], [1],
+          [Define if the GNU Pth multithreading library can be used.])
+        if test -n "$LIBMULTITHREAD" || test -n "$LTLIBMULTITHREAD"; then
+          if case "$gl_cv_have_weak" in *yes) true;; *) false;; esac; then
+            AC_DEFINE([USE_PTH_THREADS_WEAK], [1],
+              [Define if references to the GNU Pth multithreading library should be made weak.])
+            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
+            AC_DEFINE([USE_WINDOWS_THREADS], [1],
+              [Define if the native Windows multithreading API can be used.])
+          fi
+          ;;
+      esac
+    fi
+  fi
+  AC_MSG_CHECKING([for multithread API to use])
+  AC_MSG_RESULT([$gl_threads_api])
+  AC_SUBST([LIBTHREAD])
+  AC_SUBST([LTLIBTHREAD])
+  AC_SUBST([LIBMULTITHREAD])
+  AC_SUBST([LTLIBMULTITHREAD])
+])
+
+AC_DEFUN([gl_THREADLIB],
+[
+  AC_REQUIRE([gl_THREADLIB_EARLY])
+  AC_REQUIRE([gl_THREADLIB_BODY])
+])
+
+
+dnl gl_DISABLE_THREADS
+dnl ------------------
+dnl Sets the gl_THREADLIB default so that threads are not used by default.
+dnl The user can still override it at installation time, by using the
+dnl configure option '--enable-threads'.
+
+AC_DEFUN([gl_DISABLE_THREADS], [
+  m4_divert_text([INIT_PREPARE], [gl_use_threads_default=no])
+])
+
+
+dnl Survey of platforms:
+dnl
+dnl Platform           Available  Compiler    Supports   test-lock
+dnl                    flavours   option      weak       result
+dnl ---------------    ---------  ---------   --------   ---------
+dnl Linux 2.4/glibc    posix      -lpthread       Y      OK
+dnl
+dnl GNU Hurd/glibc     posix
+dnl
+dnl Ubuntu 14.04       posix      -pthread        Y      OK
+dnl
+dnl FreeBSD 5.3        posix      -lc_r           Y
+dnl                    posix      -lkse ?         Y
+dnl                    posix      -lpthread ?     Y
+dnl                    posix      -lthr           Y
+dnl
+dnl FreeBSD 5.2        posix      -lc_r           Y
+dnl                    posix      -lkse           Y
+dnl                    posix      -lthr           Y
+dnl
+dnl FreeBSD 4.0,4.10   posix      -lc_r           Y      OK
+dnl
+dnl NetBSD 1.6         --
+dnl
+dnl OpenBSD 3.4        posix      -lpthread       Y      OK
+dnl
+dnl Mac OS X 10.[123]  posix      -lpthread       Y      OK
+dnl
+dnl Solaris 7,8,9      posix      -lpthread       Y      Sol 7,8: 0.0; Sol 9: OK
+dnl                    solaris    -lthread        Y      Sol 7,8: 0.0; Sol 9: OK
+dnl
+dnl HP-UX 11           posix      -lpthread       N (cc) OK
+dnl                                               Y (gcc)
+dnl
+dnl IRIX 6.5           posix      -lpthread       Y      0.5
+dnl
+dnl AIX 4.3,5.1        posix      -lpthread       N      AIX 4: 0.5; AIX 5: OK
+dnl
+dnl OSF/1 4.0,5.1      posix      -pthread (cc)   N      OK
+dnl                               -lpthread (gcc) Y
+dnl
+dnl Cygwin             posix      -lpthread       Y      OK
+dnl
+dnl Any of the above   pth        -lpth                  0.0
+dnl
+dnl Mingw              windows                    N      OK
+dnl
+dnl BeOS 5             --
+dnl
+dnl The test-lock result shows what happens if in test-lock.c EXPLICIT_YIELD is
+dnl turned off:
+dnl   OK if all three tests terminate OK,
+dnl   0.5 if the first test terminates OK but the second one loops endlessly,
+dnl   0.0 if the first test already loops endlessly.
diff --git a/gl/m4/time_h.m4 b/gl/m4/time_h.m4
new file mode 100644
index 0000000..28e2209
--- /dev/null
+++ b/gl/m4/time_h.m4
@@ -0,0 +1,144 @@
+# Configure a more-standard replacement for <time.h>.
+
+# Copyright (C) 2000-2001, 2003-2007, 2009-2017 Free Software Foundation, Inc.
+
+# serial 11
+
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# Written by Paul Eggert and Jim Meyering.
+
+AC_DEFUN([gl_HEADER_TIME_H],
+[
+  dnl Use AC_REQUIRE here, so that the default behavior below is expanded
+  dnl once only, before all statements that occur in other macros.
+  AC_REQUIRE([gl_HEADER_TIME_H_BODY])
+])
+
+AC_DEFUN([gl_HEADER_TIME_H_BODY],
+[
+  AC_REQUIRE([AC_C_RESTRICT])
+  AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS])
+  gl_NEXT_HEADERS([time.h])
+  AC_REQUIRE([gl_CHECK_TYPE_STRUCT_TIMESPEC])
+])
+
+dnl Check whether 'struct timespec' is declared
+dnl in time.h, sys/time.h, pthread.h, or unistd.h.
+
+AC_DEFUN([gl_CHECK_TYPE_STRUCT_TIMESPEC],
+[
+  AC_CHECK_HEADERS_ONCE([sys/time.h])
+  AC_CACHE_CHECK([for struct timespec in <time.h>],
+    [gl_cv_sys_struct_timespec_in_time_h],
+    [AC_COMPILE_IFELSE(
+       [AC_LANG_PROGRAM(
+          [[#include <time.h>
+          ]],
+          [[static struct timespec x; x.tv_sec = x.tv_nsec;]])],
+       [gl_cv_sys_struct_timespec_in_time_h=yes],
+       [gl_cv_sys_struct_timespec_in_time_h=no])])
+
+  TIME_H_DEFINES_STRUCT_TIMESPEC=0
+  SYS_TIME_H_DEFINES_STRUCT_TIMESPEC=0
+  PTHREAD_H_DEFINES_STRUCT_TIMESPEC=0
+  UNISTD_H_DEFINES_STRUCT_TIMESPEC=0
+  if test $gl_cv_sys_struct_timespec_in_time_h = yes; then
+    TIME_H_DEFINES_STRUCT_TIMESPEC=1
+  else
+    AC_CACHE_CHECK([for struct timespec in <sys/time.h>],
+      [gl_cv_sys_struct_timespec_in_sys_time_h],
+      [AC_COMPILE_IFELSE(
+         [AC_LANG_PROGRAM(
+            [[#include <sys/time.h>
+            ]],
+            [[static struct timespec x; x.tv_sec = x.tv_nsec;]])],
+         [gl_cv_sys_struct_timespec_in_sys_time_h=yes],
+         [gl_cv_sys_struct_timespec_in_sys_time_h=no])])
+    if test $gl_cv_sys_struct_timespec_in_sys_time_h = yes; then
+      SYS_TIME_H_DEFINES_STRUCT_TIMESPEC=1
+    else
+      AC_CACHE_CHECK([for struct timespec in <pthread.h>],
+        [gl_cv_sys_struct_timespec_in_pthread_h],
+        [AC_COMPILE_IFELSE(
+           [AC_LANG_PROGRAM(
+              [[#include <pthread.h>
+              ]],
+              [[static struct timespec x; x.tv_sec = x.tv_nsec;]])],
+           [gl_cv_sys_struct_timespec_in_pthread_h=yes],
+           [gl_cv_sys_struct_timespec_in_pthread_h=no])])
+      if test $gl_cv_sys_struct_timespec_in_pthread_h = yes; then
+        PTHREAD_H_DEFINES_STRUCT_TIMESPEC=1
+      else
+        AC_CACHE_CHECK([for struct timespec in <unistd.h>],
+          [gl_cv_sys_struct_timespec_in_unistd_h],
+          [AC_COMPILE_IFELSE(
+             [AC_LANG_PROGRAM(
+                [[#include <unistd.h>
+                ]],
+                [[static struct timespec x; x.tv_sec = x.tv_nsec;]])],
+             [gl_cv_sys_struct_timespec_in_unistd_h=yes],
+             [gl_cv_sys_struct_timespec_in_unistd_h=no])])
+        if test $gl_cv_sys_struct_timespec_in_unistd_h = yes; then
+          UNISTD_H_DEFINES_STRUCT_TIMESPEC=1
+        fi
+      fi
+    fi
+  fi
+  AC_SUBST([TIME_H_DEFINES_STRUCT_TIMESPEC])
+  AC_SUBST([SYS_TIME_H_DEFINES_STRUCT_TIMESPEC])
+  AC_SUBST([PTHREAD_H_DEFINES_STRUCT_TIMESPEC])
+  AC_SUBST([UNISTD_H_DEFINES_STRUCT_TIMESPEC])
+])
+
+AC_DEFUN([gl_TIME_MODULE_INDICATOR],
+[
+  dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
+  AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS])
+  gl_MODULE_INDICATOR_SET_VARIABLE([$1])
+  dnl Define it also as a C macro, for the benefit of the unit tests.
+  gl_MODULE_INDICATOR_FOR_TESTS([$1])
+])
+
+AC_DEFUN([gl_HEADER_TIME_H_DEFAULTS],
+[
+  GNULIB_CTIME=0;                        AC_SUBST([GNULIB_CTIME])
+  GNULIB_MKTIME=0;                       AC_SUBST([GNULIB_MKTIME])
+  GNULIB_LOCALTIME=0;                    AC_SUBST([GNULIB_LOCALTIME])
+  GNULIB_NANOSLEEP=0;                    AC_SUBST([GNULIB_NANOSLEEP])
+  GNULIB_STRFTIME=0;                     AC_SUBST([GNULIB_STRFTIME])
+  GNULIB_STRPTIME=0;                     AC_SUBST([GNULIB_STRPTIME])
+  GNULIB_TIMEGM=0;                       AC_SUBST([GNULIB_TIMEGM])
+  GNULIB_TIME_R=0;                       AC_SUBST([GNULIB_TIME_R])
+  GNULIB_TIME_RZ=0;                      AC_SUBST([GNULIB_TIME_RZ])
+  GNULIB_TZSET=0;                        AC_SUBST([GNULIB_TZSET])
+  dnl Assume proper GNU behavior unless another module says otherwise.
+  HAVE_DECL_LOCALTIME_R=1;               AC_SUBST([HAVE_DECL_LOCALTIME_R])
+  HAVE_NANOSLEEP=1;                      AC_SUBST([HAVE_NANOSLEEP])
+  HAVE_STRPTIME=1;                       AC_SUBST([HAVE_STRPTIME])
+  HAVE_TIMEGM=1;                         AC_SUBST([HAVE_TIMEGM])
+  HAVE_TZSET=1;                          AC_SUBST([HAVE_TZSET])
+  dnl Even GNU libc does not have timezone_t yet.
+  HAVE_TIMEZONE_T=0;                     AC_SUBST([HAVE_TIMEZONE_T])
+  dnl If another module says to replace or to not replace, do that.
+  dnl Otherwise, replace only if someone compiles with -DGNULIB_PORTCHECK;
+  dnl this lets maintainers check for portability.
+  REPLACE_CTIME=GNULIB_PORTCHECK;        AC_SUBST([REPLACE_CTIME])
+  REPLACE_LOCALTIME_R=GNULIB_PORTCHECK;  AC_SUBST([REPLACE_LOCALTIME_R])
+  REPLACE_MKTIME=GNULIB_PORTCHECK;       AC_SUBST([REPLACE_MKTIME])
+  REPLACE_NANOSLEEP=GNULIB_PORTCHECK;    AC_SUBST([REPLACE_NANOSLEEP])
+  REPLACE_STRFTIME=GNULIB_PORTCHECK;     AC_SUBST([REPLACE_STRFTIME])
+  REPLACE_TIMEGM=GNULIB_PORTCHECK;       AC_SUBST([REPLACE_TIMEGM])
+  REPLACE_TZSET=GNULIB_PORTCHECK;        AC_SUBST([REPLACE_TZSET])
+
+  dnl Hack so that the time module doesn't depend on the sys_time module.
+  dnl First, default GNULIB_GETTIMEOFDAY to 0 if sys_time is absent.
+  : ${GNULIB_GETTIMEOFDAY=0};            AC_SUBST([GNULIB_GETTIMEOFDAY])
+  dnl Second, it's OK to not use GNULIB_PORTCHECK for REPLACE_GMTIME
+  dnl and REPLACE_LOCALTIME, as portability to Solaris 2.6 and earlier
+  dnl is no longer a big deal.
+  REPLACE_GMTIME=0;                      AC_SUBST([REPLACE_GMTIME])
+  REPLACE_LOCALTIME=0;                   AC_SUBST([REPLACE_LOCALTIME])
+])
diff --git a/gl/m4/unistd_h.m4 b/gl/m4/unistd_h.m4
new file mode 100644
index 0000000..cc44677
--- /dev/null
+++ b/gl/m4/unistd_h.m4
@@ -0,0 +1,193 @@
+# unistd_h.m4 serial 70
+dnl Copyright (C) 2006-2017 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl Written by Simon Josefsson, Bruno Haible.
+
+AC_DEFUN([gl_UNISTD_H],
+[
+  dnl Use AC_REQUIRE here, so that the default behavior below is expanded
+  dnl once only, before all statements that occur in other macros.
+  AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
+
+  gl_CHECK_NEXT_HEADERS([unistd.h])
+  if test $ac_cv_header_unistd_h = yes; then
+    HAVE_UNISTD_H=1
+  else
+    HAVE_UNISTD_H=0
+  fi
+  AC_SUBST([HAVE_UNISTD_H])
+
+  dnl Ensure the type pid_t gets defined.
+  AC_REQUIRE([AC_TYPE_PID_T])
+
+  dnl Determine WINDOWS_64_BIT_OFF_T.
+  AC_REQUIRE([gl_TYPE_OFF_T])
+
+  dnl Check for declarations of anything we want to poison if the
+  dnl corresponding gnulib module is not in use.
+  gl_WARN_ON_USE_PREPARE([[
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+/* Some systems declare various items in the wrong headers.  */
+#if !(defined __GLIBC__ && !defined __UCLIBC__)
+# include <fcntl.h>
+# include <stdio.h>
+# include <stdlib.h>
+# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+#  include <io.h>
+# endif
+#endif
+    ]], [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
+    truncate ttyname_r unlink unlinkat usleep])
+])
+
+AC_DEFUN([gl_UNISTD_MODULE_INDICATOR],
+[
+  dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
+  AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
+  gl_MODULE_INDICATOR_SET_VARIABLE([$1])
+  dnl Define it also as a C macro, for the benefit of the unit tests.
+  gl_MODULE_INDICATOR_FOR_TESTS([$1])
+])
+
+AC_DEFUN([gl_UNISTD_H_DEFAULTS],
+[
+  GNULIB_CHDIR=0;                AC_SUBST([GNULIB_CHDIR])
+  GNULIB_CHOWN=0;                AC_SUBST([GNULIB_CHOWN])
+  GNULIB_CLOSE=0;                AC_SUBST([GNULIB_CLOSE])
+  GNULIB_DUP=0;                  AC_SUBST([GNULIB_DUP])
+  GNULIB_DUP2=0;                 AC_SUBST([GNULIB_DUP2])
+  GNULIB_DUP3=0;                 AC_SUBST([GNULIB_DUP3])
+  GNULIB_ENVIRON=0;              AC_SUBST([GNULIB_ENVIRON])
+  GNULIB_EUIDACCESS=0;           AC_SUBST([GNULIB_EUIDACCESS])
+  GNULIB_FACCESSAT=0;            AC_SUBST([GNULIB_FACCESSAT])
+  GNULIB_FCHDIR=0;               AC_SUBST([GNULIB_FCHDIR])
+  GNULIB_FCHOWNAT=0;             AC_SUBST([GNULIB_FCHOWNAT])
+  GNULIB_FDATASYNC=0;            AC_SUBST([GNULIB_FDATASYNC])
+  GNULIB_FSYNC=0;                AC_SUBST([GNULIB_FSYNC])
+  GNULIB_FTRUNCATE=0;            AC_SUBST([GNULIB_FTRUNCATE])
+  GNULIB_GETCWD=0;               AC_SUBST([GNULIB_GETCWD])
+  GNULIB_GETDOMAINNAME=0;        AC_SUBST([GNULIB_GETDOMAINNAME])
+  GNULIB_GETDTABLESIZE=0;        AC_SUBST([GNULIB_GETDTABLESIZE])
+  GNULIB_GETGROUPS=0;            AC_SUBST([GNULIB_GETGROUPS])
+  GNULIB_GETHOSTNAME=0;          AC_SUBST([GNULIB_GETHOSTNAME])
+  GNULIB_GETLOGIN=0;             AC_SUBST([GNULIB_GETLOGIN])
+  GNULIB_GETLOGIN_R=0;           AC_SUBST([GNULIB_GETLOGIN_R])
+  GNULIB_GETPAGESIZE=0;          AC_SUBST([GNULIB_GETPAGESIZE])
+  GNULIB_GETUSERSHELL=0;         AC_SUBST([GNULIB_GETUSERSHELL])
+  GNULIB_GROUP_MEMBER=0;         AC_SUBST([GNULIB_GROUP_MEMBER])
+  GNULIB_ISATTY=0;               AC_SUBST([GNULIB_ISATTY])
+  GNULIB_LCHOWN=0;               AC_SUBST([GNULIB_LCHOWN])
+  GNULIB_LINK=0;                 AC_SUBST([GNULIB_LINK])
+  GNULIB_LINKAT=0;               AC_SUBST([GNULIB_LINKAT])
+  GNULIB_LSEEK=0;                AC_SUBST([GNULIB_LSEEK])
+  GNULIB_PIPE=0;                 AC_SUBST([GNULIB_PIPE])
+  GNULIB_PIPE2=0;                AC_SUBST([GNULIB_PIPE2])
+  GNULIB_PREAD=0;                AC_SUBST([GNULIB_PREAD])
+  GNULIB_PWRITE=0;               AC_SUBST([GNULIB_PWRITE])
+  GNULIB_READ=0;                 AC_SUBST([GNULIB_READ])
+  GNULIB_READLINK=0;             AC_SUBST([GNULIB_READLINK])
+  GNULIB_READLINKAT=0;           AC_SUBST([GNULIB_READLINKAT])
+  GNULIB_RMDIR=0;                AC_SUBST([GNULIB_RMDIR])
+  GNULIB_SETHOSTNAME=0;          AC_SUBST([GNULIB_SETHOSTNAME])
+  GNULIB_SLEEP=0;                AC_SUBST([GNULIB_SLEEP])
+  GNULIB_SYMLINK=0;              AC_SUBST([GNULIB_SYMLINK])
+  GNULIB_SYMLINKAT=0;            AC_SUBST([GNULIB_SYMLINKAT])
+  GNULIB_TRUNCATE=0;             AC_SUBST([GNULIB_TRUNCATE])
+  GNULIB_TTYNAME_R=0;            AC_SUBST([GNULIB_TTYNAME_R])
+  GNULIB_UNISTD_H_NONBLOCKING=0; AC_SUBST([GNULIB_UNISTD_H_NONBLOCKING])
+  GNULIB_UNISTD_H_SIGPIPE=0;     AC_SUBST([GNULIB_UNISTD_H_SIGPIPE])
+  GNULIB_UNLINK=0;               AC_SUBST([GNULIB_UNLINK])
+  GNULIB_UNLINKAT=0;             AC_SUBST([GNULIB_UNLINKAT])
+  GNULIB_USLEEP=0;               AC_SUBST([GNULIB_USLEEP])
+  GNULIB_WRITE=0;                AC_SUBST([GNULIB_WRITE])
+  dnl Assume proper GNU behavior unless another module says otherwise.
+  HAVE_CHOWN=1;           AC_SUBST([HAVE_CHOWN])
+  HAVE_DUP2=1;            AC_SUBST([HAVE_DUP2])
+  HAVE_DUP3=1;            AC_SUBST([HAVE_DUP3])
+  HAVE_EUIDACCESS=1;      AC_SUBST([HAVE_EUIDACCESS])
+  HAVE_FACCESSAT=1;       AC_SUBST([HAVE_FACCESSAT])
+  HAVE_FCHDIR=1;          AC_SUBST([HAVE_FCHDIR])
+  HAVE_FCHOWNAT=1;        AC_SUBST([HAVE_FCHOWNAT])
+  HAVE_FDATASYNC=1;       AC_SUBST([HAVE_FDATASYNC])
+  HAVE_FSYNC=1;           AC_SUBST([HAVE_FSYNC])
+  HAVE_FTRUNCATE=1;       AC_SUBST([HAVE_FTRUNCATE])
+  HAVE_GETDTABLESIZE=1;   AC_SUBST([HAVE_GETDTABLESIZE])
+  HAVE_GETGROUPS=1;       AC_SUBST([HAVE_GETGROUPS])
+  HAVE_GETHOSTNAME=1;     AC_SUBST([HAVE_GETHOSTNAME])
+  HAVE_GETLOGIN=1;        AC_SUBST([HAVE_GETLOGIN])
+  HAVE_GETPAGESIZE=1;     AC_SUBST([HAVE_GETPAGESIZE])
+  HAVE_GROUP_MEMBER=1;    AC_SUBST([HAVE_GROUP_MEMBER])
+  HAVE_LCHOWN=1;          AC_SUBST([HAVE_LCHOWN])
+  HAVE_LINK=1;            AC_SUBST([HAVE_LINK])
+  HAVE_LINKAT=1;          AC_SUBST([HAVE_LINKAT])
+  HAVE_PIPE=1;            AC_SUBST([HAVE_PIPE])
+  HAVE_PIPE2=1;           AC_SUBST([HAVE_PIPE2])
+  HAVE_PREAD=1;           AC_SUBST([HAVE_PREAD])
+  HAVE_PWRITE=1;          AC_SUBST([HAVE_PWRITE])
+  HAVE_READLINK=1;        AC_SUBST([HAVE_READLINK])
+  HAVE_READLINKAT=1;      AC_SUBST([HAVE_READLINKAT])
+  HAVE_SETHOSTNAME=1;     AC_SUBST([HAVE_SETHOSTNAME])
+  HAVE_SLEEP=1;           AC_SUBST([HAVE_SLEEP])
+  HAVE_SYMLINK=1;         AC_SUBST([HAVE_SYMLINK])
+  HAVE_SYMLINKAT=1;       AC_SUBST([HAVE_SYMLINKAT])
+  HAVE_TRUNCATE=1;        AC_SUBST([HAVE_TRUNCATE])
+  HAVE_UNLINKAT=1;        AC_SUBST([HAVE_UNLINKAT])
+  HAVE_USLEEP=1;          AC_SUBST([HAVE_USLEEP])
+  HAVE_DECL_ENVIRON=1;    AC_SUBST([HAVE_DECL_ENVIRON])
+  HAVE_DECL_FCHDIR=1;     AC_SUBST([HAVE_DECL_FCHDIR])
+  HAVE_DECL_FDATASYNC=1;  AC_SUBST([HAVE_DECL_FDATASYNC])
+  HAVE_DECL_GETDOMAINNAME=1; AC_SUBST([HAVE_DECL_GETDOMAINNAME])
+  HAVE_DECL_GETLOGIN=1;   AC_SUBST([HAVE_DECL_GETLOGIN])
+  HAVE_DECL_GETLOGIN_R=1; AC_SUBST([HAVE_DECL_GETLOGIN_R])
+  HAVE_DECL_GETPAGESIZE=1; AC_SUBST([HAVE_DECL_GETPAGESIZE])
+  HAVE_DECL_GETUSERSHELL=1; AC_SUBST([HAVE_DECL_GETUSERSHELL])
+  HAVE_DECL_SETHOSTNAME=1; AC_SUBST([HAVE_DECL_SETHOSTNAME])
+  HAVE_DECL_TTYNAME_R=1;  AC_SUBST([HAVE_DECL_TTYNAME_R])
+  HAVE_OS_H=0;            AC_SUBST([HAVE_OS_H])
+  HAVE_SYS_PARAM_H=0;     AC_SUBST([HAVE_SYS_PARAM_H])
+  REPLACE_CHOWN=0;        AC_SUBST([REPLACE_CHOWN])
+  REPLACE_CLOSE=0;        AC_SUBST([REPLACE_CLOSE])
+  REPLACE_DUP=0;          AC_SUBST([REPLACE_DUP])
+  REPLACE_DUP2=0;         AC_SUBST([REPLACE_DUP2])
+  REPLACE_FCHOWNAT=0;     AC_SUBST([REPLACE_FCHOWNAT])
+  REPLACE_FTRUNCATE=0;    AC_SUBST([REPLACE_FTRUNCATE])
+  REPLACE_GETCWD=0;       AC_SUBST([REPLACE_GETCWD])
+  REPLACE_GETDOMAINNAME=0; AC_SUBST([REPLACE_GETDOMAINNAME])
+  REPLACE_GETDTABLESIZE=0; AC_SUBST([REPLACE_GETDTABLESIZE])
+  REPLACE_GETLOGIN_R=0;   AC_SUBST([REPLACE_GETLOGIN_R])
+  REPLACE_GETGROUPS=0;    AC_SUBST([REPLACE_GETGROUPS])
+  REPLACE_GETPAGESIZE=0;  AC_SUBST([REPLACE_GETPAGESIZE])
+  REPLACE_ISATTY=0;       AC_SUBST([REPLACE_ISATTY])
+  REPLACE_LCHOWN=0;       AC_SUBST([REPLACE_LCHOWN])
+  REPLACE_LINK=0;         AC_SUBST([REPLACE_LINK])
+  REPLACE_LINKAT=0;       AC_SUBST([REPLACE_LINKAT])
+  REPLACE_LSEEK=0;        AC_SUBST([REPLACE_LSEEK])
+  REPLACE_PREAD=0;        AC_SUBST([REPLACE_PREAD])
+  REPLACE_PWRITE=0;       AC_SUBST([REPLACE_PWRITE])
+  REPLACE_READ=0;         AC_SUBST([REPLACE_READ])
+  REPLACE_READLINK=0;     AC_SUBST([REPLACE_READLINK])
+  REPLACE_READLINKAT=0;   AC_SUBST([REPLACE_READLINKAT])
+  REPLACE_RMDIR=0;        AC_SUBST([REPLACE_RMDIR])
+  REPLACE_SLEEP=0;        AC_SUBST([REPLACE_SLEEP])
+  REPLACE_SYMLINK=0;      AC_SUBST([REPLACE_SYMLINK])
+  REPLACE_SYMLINKAT=0;    AC_SUBST([REPLACE_SYMLINKAT])
+  REPLACE_TRUNCATE=0;     AC_SUBST([REPLACE_TRUNCATE])
+  REPLACE_TTYNAME_R=0;    AC_SUBST([REPLACE_TTYNAME_R])
+  REPLACE_UNLINK=0;       AC_SUBST([REPLACE_UNLINK])
+  REPLACE_UNLINKAT=0;     AC_SUBST([REPLACE_UNLINKAT])
+  REPLACE_USLEEP=0;       AC_SUBST([REPLACE_USLEEP])
+  REPLACE_WRITE=0;        AC_SUBST([REPLACE_WRITE])
+  UNISTD_H_HAVE_WINSOCK2_H=0; AC_SUBST([UNISTD_H_HAVE_WINSOCK2_H])
+  UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS=0;
+                           AC_SUBST([UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS])
+])
diff --git a/gl/m4/warn-on-use.m4 b/gl/m4/warn-on-use.m4
new file mode 100644
index 0000000..25ce737
--- /dev/null
+++ b/gl/m4/warn-on-use.m4
@@ -0,0 +1,47 @@
+# warn-on-use.m4 serial 5
+dnl Copyright (C) 2010-2017 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+# gl_WARN_ON_USE_PREPARE(INCLUDES, NAMES)
+# ---------------------------------------
+# For each whitespace-separated element in the list of NAMES, define
+# HAVE_RAW_DECL_name if the function has a declaration among INCLUDES
+# even after being undefined as a macro.
+#
+# See warn-on-use.h for some hints on how to poison function names, as
+# well as ideas on poisoning global variables and macros.  NAMES may
+# include global variables, but remember that only functions work with
+# _GL_WARN_ON_USE.  Typically, INCLUDES only needs to list a single
+# header, but if the replacement header pulls in other headers because
+# some systems declare functions in the wrong header, then INCLUDES
+# should do likewise.
+#
+# It is generally safe to assume declarations for functions declared
+# in the intersection of C89 and C11 (such as printf) without
+# needing gl_WARN_ON_USE_PREPARE.
+AC_DEFUN([gl_WARN_ON_USE_PREPARE],
+[
+  m4_foreach_w([gl_decl], [$2],
+    [AH_TEMPLATE([HAVE_RAW_DECL_]AS_TR_CPP(m4_defn([gl_decl])),
+      [Define to 1 if ]m4_defn([gl_decl])[ is declared even after
+       undefining macros.])])dnl
+dnl FIXME: gl_Symbol must be used unquoted until we can assume
+dnl autoconf 2.64 or newer.
+  for gl_func in m4_flatten([$2]); do
+    AS_VAR_PUSHDEF([gl_Symbol], [gl_cv_have_raw_decl_$gl_func])dnl
+    AC_CACHE_CHECK([whether $gl_func is declared without a macro],
+      gl_Symbol,
+      [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([$1],
+[@%:@undef $gl_func
+  (void) $gl_func;])],
+        [AS_VAR_SET(gl_Symbol, [yes])], [AS_VAR_SET(gl_Symbol, [no])])])
+    AS_VAR_IF(gl_Symbol, [yes],
+      [AC_DEFINE_UNQUOTED(AS_TR_CPP([HAVE_RAW_DECL_$gl_func]), [1])
+       dnl shortcut - if the raw declaration exists, then set a cache
+       dnl variable to allow skipping any later AC_CHECK_DECL efforts
+       eval ac_cv_have_decl_$gl_func=yes])
+    AS_VAR_POPDEF([gl_Symbol])dnl
+  done
+])
diff --git a/gl/m4/wchar_h.m4 b/gl/m4/wchar_h.m4
new file mode 100644
index 0000000..1a2734c
--- /dev/null
+++ b/gl/m4/wchar_h.m4
@@ -0,0 +1,238 @@
+dnl A placeholder for ISO C99 <wchar.h>, for platforms that have issues.
+
+dnl Copyright (C) 2007-2017 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl Written by Eric Blake.
+
+# wchar_h.m4 serial 42
+
+AC_DEFUN([gl_WCHAR_H],
+[
+  AC_REQUIRE([gl_WCHAR_H_DEFAULTS])
+  AC_REQUIRE([gl_WCHAR_H_INLINE_OK])
+  dnl Prepare for creating substitute <wchar.h>.
+  dnl Check for <wchar.h> (missing in Linux uClibc when built without wide
+  dnl character support).
+  dnl <wchar.h> is always overridden, because of GNULIB_POSIXCHECK.
+  gl_CHECK_NEXT_HEADERS([wchar.h])
+  if test $ac_cv_header_wchar_h = yes; then
+    HAVE_WCHAR_H=1
+  else
+    HAVE_WCHAR_H=0
+  fi
+  AC_SUBST([HAVE_WCHAR_H])
+
+  AC_REQUIRE([gl_FEATURES_H])
+
+  AC_REQUIRE([gt_TYPE_WINT_T])
+  if test $gt_cv_c_wint_t = yes; then
+    HAVE_WINT_T=1
+  else
+    HAVE_WINT_T=0
+  fi
+  AC_SUBST([HAVE_WINT_T])
+
+  AC_REQUIRE([gl_TYPE_WINT_T_PREREQ])
+
+  dnl Check for declarations of anything we want to poison if the
+  dnl corresponding gnulib module is not in use.
+  gl_WARN_ON_USE_PREPARE([[
+/* 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>.  */
+#if !(defined __GLIBC__ && !defined __UCLIBC__)
+# include <stddef.h>
+# include <stdio.h>
+# include <time.h>
+#endif
+#include <wchar.h>
+    ]],
+    [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 wcsftime
+    ])
+])
+
+dnl Check whether <wchar.h> is usable at all.
+AC_DEFUN([gl_WCHAR_H_INLINE_OK],
+[
+  dnl Test whether <wchar.h> suffers due to the transition from '__inline' to
+  dnl 'gnu_inline'. See <http://sourceware.org/bugzilla/show_bug.cgi?id=4022>
+  dnl and <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=42440>. In summary,
+  dnl glibc version 2.5 or older, together with gcc version 4.3 or newer and
+  dnl the option -std=c99 or -std=gnu99, leads to a broken <wchar.h>.
+  AC_CACHE_CHECK([whether <wchar.h> uses 'inline' correctly],
+    [gl_cv_header_wchar_h_correct_inline],
+    [gl_cv_header_wchar_h_correct_inline=yes
+     AC_LANG_CONFTEST([
+       AC_LANG_SOURCE([[#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(); }
+]])])
+     dnl Do not rename the object file from conftest.$ac_objext to
+     dnl conftest1.$ac_objext, as this will cause the link to fail on
+     dnl z/OS when using the XPLINK object format (due to duplicate
+     dnl CSECT names). Instead, temporarily redefine $ac_compile so
+     dnl that the object file has the latter name from the start.
+     save_ac_compile="$ac_compile"
+     ac_compile=`echo "$save_ac_compile" | sed s/conftest/conftest1/`
+     if AC_TRY_EVAL([ac_compile]); then
+       AC_LANG_CONFTEST([
+         AC_LANG_SOURCE([[#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; }
+]])])
+       dnl See note above about renaming object files.
+       ac_compile=`echo "$save_ac_compile" | sed s/conftest/conftest2/`
+       if AC_TRY_EVAL([ac_compile]); then
+         if $CC -o conftest$ac_exeext $CFLAGS $LDFLAGS conftest1.$ac_objext conftest2.$ac_objext $LIBS >&AS_MESSAGE_LOG_FD 2>&1; then
+           :
+         else
+           gl_cv_header_wchar_h_correct_inline=no
+         fi
+       fi
+     fi
+     ac_compile="$save_ac_compile"
+     rm -f conftest1.$ac_objext conftest2.$ac_objext conftest$ac_exeext
+    ])
+  if test $gl_cv_header_wchar_h_correct_inline = no; then
+    AC_MSG_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.])
+  fi
+])
+
+AC_DEFUN([gl_WCHAR_MODULE_INDICATOR],
+[
+  dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
+  AC_REQUIRE([gl_WCHAR_H_DEFAULTS])
+  gl_MODULE_INDICATOR_SET_VARIABLE([$1])
+  dnl Define it also as a C macro, for the benefit of the unit tests.
+  gl_MODULE_INDICATOR_FOR_TESTS([$1])
+])
+
+AC_DEFUN([gl_WCHAR_H_DEFAULTS],
+[
+  GNULIB_BTOWC=0;       AC_SUBST([GNULIB_BTOWC])
+  GNULIB_WCTOB=0;       AC_SUBST([GNULIB_WCTOB])
+  GNULIB_MBSINIT=0;     AC_SUBST([GNULIB_MBSINIT])
+  GNULIB_MBRTOWC=0;     AC_SUBST([GNULIB_MBRTOWC])
+  GNULIB_MBRLEN=0;      AC_SUBST([GNULIB_MBRLEN])
+  GNULIB_MBSRTOWCS=0;   AC_SUBST([GNULIB_MBSRTOWCS])
+  GNULIB_MBSNRTOWCS=0;  AC_SUBST([GNULIB_MBSNRTOWCS])
+  GNULIB_WCRTOMB=0;     AC_SUBST([GNULIB_WCRTOMB])
+  GNULIB_WCSRTOMBS=0;   AC_SUBST([GNULIB_WCSRTOMBS])
+  GNULIB_WCSNRTOMBS=0;  AC_SUBST([GNULIB_WCSNRTOMBS])
+  GNULIB_WCWIDTH=0;     AC_SUBST([GNULIB_WCWIDTH])
+  GNULIB_WMEMCHR=0;     AC_SUBST([GNULIB_WMEMCHR])
+  GNULIB_WMEMCMP=0;     AC_SUBST([GNULIB_WMEMCMP])
+  GNULIB_WMEMCPY=0;     AC_SUBST([GNULIB_WMEMCPY])
+  GNULIB_WMEMMOVE=0;    AC_SUBST([GNULIB_WMEMMOVE])
+  GNULIB_WMEMSET=0;     AC_SUBST([GNULIB_WMEMSET])
+  GNULIB_WCSLEN=0;      AC_SUBST([GNULIB_WCSLEN])
+  GNULIB_WCSNLEN=0;     AC_SUBST([GNULIB_WCSNLEN])
+  GNULIB_WCSCPY=0;      AC_SUBST([GNULIB_WCSCPY])
+  GNULIB_WCPCPY=0;      AC_SUBST([GNULIB_WCPCPY])
+  GNULIB_WCSNCPY=0;     AC_SUBST([GNULIB_WCSNCPY])
+  GNULIB_WCPNCPY=0;     AC_SUBST([GNULIB_WCPNCPY])
+  GNULIB_WCSCAT=0;      AC_SUBST([GNULIB_WCSCAT])
+  GNULIB_WCSNCAT=0;     AC_SUBST([GNULIB_WCSNCAT])
+  GNULIB_WCSCMP=0;      AC_SUBST([GNULIB_WCSCMP])
+  GNULIB_WCSNCMP=0;     AC_SUBST([GNULIB_WCSNCMP])
+  GNULIB_WCSCASECMP=0;  AC_SUBST([GNULIB_WCSCASECMP])
+  GNULIB_WCSNCASECMP=0; AC_SUBST([GNULIB_WCSNCASECMP])
+  GNULIB_WCSCOLL=0;     AC_SUBST([GNULIB_WCSCOLL])
+  GNULIB_WCSXFRM=0;     AC_SUBST([GNULIB_WCSXFRM])
+  GNULIB_WCSDUP=0;      AC_SUBST([GNULIB_WCSDUP])
+  GNULIB_WCSCHR=0;      AC_SUBST([GNULIB_WCSCHR])
+  GNULIB_WCSRCHR=0;     AC_SUBST([GNULIB_WCSRCHR])
+  GNULIB_WCSCSPN=0;     AC_SUBST([GNULIB_WCSCSPN])
+  GNULIB_WCSSPN=0;      AC_SUBST([GNULIB_WCSSPN])
+  GNULIB_WCSPBRK=0;     AC_SUBST([GNULIB_WCSPBRK])
+  GNULIB_WCSSTR=0;      AC_SUBST([GNULIB_WCSSTR])
+  GNULIB_WCSTOK=0;      AC_SUBST([GNULIB_WCSTOK])
+  GNULIB_WCSWIDTH=0;    AC_SUBST([GNULIB_WCSWIDTH])
+  GNULIB_WCSFTIME=0;    AC_SUBST([GNULIB_WCSFTIME])
+  dnl Assume proper GNU behavior unless another module says otherwise.
+  HAVE_BTOWC=1;         AC_SUBST([HAVE_BTOWC])
+  HAVE_MBSINIT=1;       AC_SUBST([HAVE_MBSINIT])
+  HAVE_MBRTOWC=1;       AC_SUBST([HAVE_MBRTOWC])
+  HAVE_MBRLEN=1;        AC_SUBST([HAVE_MBRLEN])
+  HAVE_MBSRTOWCS=1;     AC_SUBST([HAVE_MBSRTOWCS])
+  HAVE_MBSNRTOWCS=1;    AC_SUBST([HAVE_MBSNRTOWCS])
+  HAVE_WCRTOMB=1;       AC_SUBST([HAVE_WCRTOMB])
+  HAVE_WCSRTOMBS=1;     AC_SUBST([HAVE_WCSRTOMBS])
+  HAVE_WCSNRTOMBS=1;    AC_SUBST([HAVE_WCSNRTOMBS])
+  HAVE_WMEMCHR=1;       AC_SUBST([HAVE_WMEMCHR])
+  HAVE_WMEMCMP=1;       AC_SUBST([HAVE_WMEMCMP])
+  HAVE_WMEMCPY=1;       AC_SUBST([HAVE_WMEMCPY])
+  HAVE_WMEMMOVE=1;      AC_SUBST([HAVE_WMEMMOVE])
+  HAVE_WMEMSET=1;       AC_SUBST([HAVE_WMEMSET])
+  HAVE_WCSLEN=1;        AC_SUBST([HAVE_WCSLEN])
+  HAVE_WCSNLEN=1;       AC_SUBST([HAVE_WCSNLEN])
+  HAVE_WCSCPY=1;        AC_SUBST([HAVE_WCSCPY])
+  HAVE_WCPCPY=1;        AC_SUBST([HAVE_WCPCPY])
+  HAVE_WCSNCPY=1;       AC_SUBST([HAVE_WCSNCPY])
+  HAVE_WCPNCPY=1;       AC_SUBST([HAVE_WCPNCPY])
+  HAVE_WCSCAT=1;        AC_SUBST([HAVE_WCSCAT])
+  HAVE_WCSNCAT=1;       AC_SUBST([HAVE_WCSNCAT])
+  HAVE_WCSCMP=1;        AC_SUBST([HAVE_WCSCMP])
+  HAVE_WCSNCMP=1;       AC_SUBST([HAVE_WCSNCMP])
+  HAVE_WCSCASECMP=1;    AC_SUBST([HAVE_WCSCASECMP])
+  HAVE_WCSNCASECMP=1;   AC_SUBST([HAVE_WCSNCASECMP])
+  HAVE_WCSCOLL=1;       AC_SUBST([HAVE_WCSCOLL])
+  HAVE_WCSXFRM=1;       AC_SUBST([HAVE_WCSXFRM])
+  HAVE_WCSDUP=1;        AC_SUBST([HAVE_WCSDUP])
+  HAVE_WCSCHR=1;        AC_SUBST([HAVE_WCSCHR])
+  HAVE_WCSRCHR=1;       AC_SUBST([HAVE_WCSRCHR])
+  HAVE_WCSCSPN=1;       AC_SUBST([HAVE_WCSCSPN])
+  HAVE_WCSSPN=1;        AC_SUBST([HAVE_WCSSPN])
+  HAVE_WCSPBRK=1;       AC_SUBST([HAVE_WCSPBRK])
+  HAVE_WCSSTR=1;        AC_SUBST([HAVE_WCSSTR])
+  HAVE_WCSTOK=1;        AC_SUBST([HAVE_WCSTOK])
+  HAVE_WCSWIDTH=1;      AC_SUBST([HAVE_WCSWIDTH])
+  HAVE_WCSFTIME=1;      AC_SUBST([HAVE_WCSFTIME])
+  HAVE_DECL_WCTOB=1;    AC_SUBST([HAVE_DECL_WCTOB])
+  HAVE_DECL_WCWIDTH=1;  AC_SUBST([HAVE_DECL_WCWIDTH])
+  REPLACE_MBSTATE_T=0;  AC_SUBST([REPLACE_MBSTATE_T])
+  REPLACE_BTOWC=0;      AC_SUBST([REPLACE_BTOWC])
+  REPLACE_WCTOB=0;      AC_SUBST([REPLACE_WCTOB])
+  REPLACE_MBSINIT=0;    AC_SUBST([REPLACE_MBSINIT])
+  REPLACE_MBRTOWC=0;    AC_SUBST([REPLACE_MBRTOWC])
+  REPLACE_MBRLEN=0;     AC_SUBST([REPLACE_MBRLEN])
+  REPLACE_MBSRTOWCS=0;  AC_SUBST([REPLACE_MBSRTOWCS])
+  REPLACE_MBSNRTOWCS=0; AC_SUBST([REPLACE_MBSNRTOWCS])
+  REPLACE_WCRTOMB=0;    AC_SUBST([REPLACE_WCRTOMB])
+  REPLACE_WCSRTOMBS=0;  AC_SUBST([REPLACE_WCSRTOMBS])
+  REPLACE_WCSNRTOMBS=0; AC_SUBST([REPLACE_WCSNRTOMBS])
+  REPLACE_WCWIDTH=0;    AC_SUBST([REPLACE_WCWIDTH])
+  REPLACE_WCSWIDTH=0;   AC_SUBST([REPLACE_WCSWIDTH])
+  REPLACE_WCSFTIME=0;   AC_SUBST([REPLACE_WCSFTIME])
+])
diff --git a/gl/m4/wchar_t.m4 b/gl/m4/wchar_t.m4
new file mode 100644
index 0000000..11783d2
--- /dev/null
+++ b/gl/m4/wchar_t.m4
@@ -0,0 +1,24 @@
+# wchar_t.m4 serial 4 (gettext-0.18.2)
+dnl Copyright (C) 2002-2003, 2008-2017 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+dnl Test whether <stddef.h> has the 'wchar_t' type.
+dnl Prerequisite: AC_PROG_CC
+
+AC_DEFUN([gt_TYPE_WCHAR_T],
+[
+  AC_CACHE_CHECK([for wchar_t], [gt_cv_c_wchar_t],
+    [AC_COMPILE_IFELSE(
+       [AC_LANG_PROGRAM(
+          [[#include <stddef.h>
+            wchar_t foo = (wchar_t)'\0';]],
+          [[]])],
+       [gt_cv_c_wchar_t=yes],
+       [gt_cv_c_wchar_t=no])])
+  if test $gt_cv_c_wchar_t = yes; then
+    AC_DEFINE([HAVE_WCHAR_T], [1], [Define if you have the 'wchar_t' type.])
+  fi
+])
diff --git a/gl/m4/wcrtomb.m4 b/gl/m4/wcrtomb.m4
new file mode 100644
index 0000000..fcc3f8c
--- /dev/null
+++ b/gl/m4/wcrtomb.m4
@@ -0,0 +1,114 @@
+# wcrtomb.m4 serial 12
+dnl Copyright (C) 2008-2017 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_FUNC_WCRTOMB],
+[
+  AC_REQUIRE([gl_WCHAR_H_DEFAULTS])
+
+  AC_REQUIRE([AC_TYPE_MBSTATE_T])
+  gl_MBSTATE_T_BROKEN
+
+  AC_CHECK_FUNCS_ONCE([wcrtomb])
+  if test $ac_cv_func_wcrtomb = no; then
+    HAVE_WCRTOMB=0
+    AC_CHECK_DECLS([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 $ac_cv_have_decl_wcrtomb = yes; then
+      dnl On Minix 3.1.8, the system's <wchar.h> declares wcrtomb() although
+      dnl it does not have the function. Avoid a collision with gnulib's
+      dnl replacement.
+      REPLACE_WCRTOMB=1
+    fi
+  else
+    if test $REPLACE_MBSTATE_T = 1; then
+      REPLACE_WCRTOMB=1
+    else
+      dnl On AIX 4.3, OSF/1 5.1 and Solaris 10, wcrtomb (NULL, 0, NULL) sometimes
+      dnl returns 0 instead of 1.
+      AC_REQUIRE([AC_PROG_CC])
+      AC_REQUIRE([gt_LOCALE_FR])
+      AC_REQUIRE([gt_LOCALE_FR_UTF8])
+      AC_REQUIRE([gt_LOCALE_JA])
+      AC_REQUIRE([gt_LOCALE_ZH_CN])
+      AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+      AC_CACHE_CHECK([whether wcrtomb return value is correct],
+        [gl_cv_func_wcrtomb_retval],
+        [
+          dnl Initial guess, used when cross-compiling or when no suitable locale
+          dnl is present.
+changequote(,)dnl
+          case "$host_os" in
+                                     # Guess no on AIX 4, OSF/1 and Solaris.
+            aix4* | osf* | solaris*) gl_cv_func_wcrtomb_retval="guessing no" ;;
+                                     # Guess yes on native Windows.
+            mingw*)                  gl_cv_func_wcrtomb_retval="guessing yes" ;;
+                                     # Guess yes otherwise.
+            *)                       gl_cv_func_wcrtomb_retval="guessing yes" ;;
+          esac
+changequote([,])dnl
+          if test $LOCALE_FR != none || test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none || test $LOCALE_ZH_CN != none; then
+            AC_RUN_IFELSE(
+              [AC_LANG_SOURCE([[
+#include <locale.h>
+#include <string.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 ()
+{
+  int result = 0;
+  if (setlocale (LC_ALL, "$LOCALE_FR") != NULL)
+    {
+      if (wcrtomb (NULL, 0, NULL) != 1)
+        result |= 1;
+    }
+  if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL)
+    {
+      if (wcrtomb (NULL, 0, NULL) != 1)
+        result |= 2;
+    }
+  if (setlocale (LC_ALL, "$LOCALE_JA") != NULL)
+    {
+      if (wcrtomb (NULL, 0, NULL) != 1)
+        result |= 4;
+    }
+  if (setlocale (LC_ALL, "$LOCALE_ZH_CN") != NULL)
+    {
+      if (wcrtomb (NULL, 0, NULL) != 1)
+        result |= 8;
+    }
+  return result;
+}]])],
+              [gl_cv_func_wcrtomb_retval=yes],
+              [gl_cv_func_wcrtomb_retval=no],
+              [:])
+          fi
+        ])
+      case "$gl_cv_func_wcrtomb_retval" in
+        *yes) ;;
+        *) REPLACE_WCRTOMB=1 ;;
+      esac
+    fi
+  fi
+])
+
+# Prerequisites of lib/wcrtomb.c.
+AC_DEFUN([gl_PREREQ_WCRTOMB], [
+  :
+])
diff --git a/gl/m4/wctype_h.m4 b/gl/m4/wctype_h.m4
new file mode 100644
index 0000000..596f26b
--- /dev/null
+++ b/gl/m4/wctype_h.m4
@@ -0,0 +1,212 @@
+# wctype_h.m4 serial 21
+
+dnl A placeholder for ISO C99 <wctype.h>, for platforms that lack it.
+
+dnl Copyright (C) 2006-2017 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl Written by Paul Eggert.
+
+AC_DEFUN([gl_WCTYPE_H],
+[
+  AC_REQUIRE([gl_WCTYPE_H_DEFAULTS])
+  AC_REQUIRE([AC_PROG_CC])
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_CHECK_FUNCS_ONCE([iswcntrl])
+  if test $ac_cv_func_iswcntrl = yes; then
+    HAVE_ISWCNTRL=1
+  else
+    HAVE_ISWCNTRL=0
+  fi
+  AC_SUBST([HAVE_ISWCNTRL])
+
+  AC_REQUIRE([gt_TYPE_WINT_T])
+  if test $gt_cv_c_wint_t = yes; then
+    HAVE_WINT_T=1
+  else
+    HAVE_WINT_T=0
+  fi
+  AC_SUBST([HAVE_WINT_T])
+
+  AC_REQUIRE([gl_TYPE_WINT_T_PREREQ])
+
+  gl_CHECK_NEXT_HEADERS([wctype.h])
+  if test $ac_cv_header_wctype_h = yes; then
+    if test $ac_cv_func_iswcntrl = yes; then
+      dnl Linux libc5 has an iswprint function that returns 0 for all arguments.
+      dnl The other functions are likely broken in the same way.
+      AC_CACHE_CHECK([whether iswcntrl works], [gl_cv_func_iswcntrl_works],
+        [
+          AC_RUN_IFELSE(
+            [AC_LANG_SOURCE([[
+               /* 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>
+               #include <wctype.h>
+               int main () { return iswprint ('x') == 0; }
+            ]])],
+            [gl_cv_func_iswcntrl_works=yes], [gl_cv_func_iswcntrl_works=no],
+            [dnl Guess no on Linux libc5, yes otherwise.
+             AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h>
+                          #if __GNU_LIBRARY__ == 1
+                          Linux libc5 i18n is broken.
+                          #endif]], [])],
+              [gl_cv_func_iswcntrl_works="guessing yes"],
+              [gl_cv_func_iswcntrl_works="guessing no"])
+            ])
+        ])
+    fi
+    HAVE_WCTYPE_H=1
+  else
+    HAVE_WCTYPE_H=0
+  fi
+  AC_SUBST([HAVE_WCTYPE_H])
+
+  case "$gl_cv_func_iswcntrl_works" in
+    *yes) REPLACE_ISWCNTRL=0 ;;
+    *)    REPLACE_ISWCNTRL=1 ;;
+  esac
+  AC_SUBST([REPLACE_ISWCNTRL])
+
+  if test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; then
+    dnl Redefine all of iswcntrl, ..., iswxdigit in <wctype.h>.
+    :
+  fi
+
+  if test $REPLACE_ISWCNTRL = 1; then
+    REPLACE_TOWLOWER=1
+  else
+    AC_CHECK_FUNCS([towlower])
+    if test $ac_cv_func_towlower = yes; then
+      REPLACE_TOWLOWER=0
+    else
+      AC_CHECK_DECLS([towlower],,,
+        [[/* 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 HAVE_WCTYPE_H
+          # include <wctype.h>
+          #endif
+        ]])
+      if test $ac_cv_have_decl_towlower = yes; then
+        dnl On Minix 3.1.8, the system's <wctype.h> declares towlower() and
+        dnl towupper() although it does not have the functions. Avoid a
+        dnl collision with gnulib's replacement.
+        REPLACE_TOWLOWER=1
+      else
+        REPLACE_TOWLOWER=0
+      fi
+    fi
+  fi
+  AC_SUBST([REPLACE_TOWLOWER])
+
+  if test $HAVE_ISWCNTRL = 0 || test $REPLACE_TOWLOWER = 1; then
+    dnl Redefine towlower, towupper in <wctype.h>.
+    :
+  fi
+
+  dnl We assume that the wctype() and iswctype() functions exist if and only
+  dnl if the type wctype_t is defined in <wchar.h> or in <wctype.h> if that
+  dnl exists.
+  dnl HP-UX 11.00 declares all these in <wchar.h> and lacks <wctype.h>.
+  AC_CACHE_CHECK([for wctype_t], [gl_cv_type_wctype_t],
+    [AC_COMPILE_IFELSE(
+       [AC_LANG_PROGRAM(
+          [[/* 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 HAVE_WCTYPE_H
+            # include <wctype.h>
+            #endif
+            wctype_t a;
+          ]],
+          [[]])],
+       [gl_cv_type_wctype_t=yes],
+       [gl_cv_type_wctype_t=no])
+    ])
+  if test $gl_cv_type_wctype_t = no; then
+    HAVE_WCTYPE_T=0
+  fi
+
+  dnl We assume that the wctrans() and towctrans() functions exist if and only
+  dnl if the type wctrans_t is defined in <wctype.h>.
+  AC_CACHE_CHECK([for wctrans_t], [gl_cv_type_wctrans_t],
+    [AC_COMPILE_IFELSE(
+       [AC_LANG_PROGRAM(
+          [[/* 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>
+            #include <wctype.h>
+            wctrans_t a;
+          ]],
+          [[]])],
+       [gl_cv_type_wctrans_t=yes],
+       [gl_cv_type_wctrans_t=no])
+    ])
+  if test $gl_cv_type_wctrans_t = no; then
+    HAVE_WCTRANS_T=0
+  fi
+
+  dnl Check for declarations of anything we want to poison if the
+  dnl corresponding gnulib module is not in use.
+  gl_WARN_ON_USE_PREPARE([[
+/* 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>.  */
+#if !(defined __GLIBC__ && !defined __UCLIBC__)
+# include <stddef.h>
+# include <stdio.h>
+# include <time.h>
+# include <wchar.h>
+#endif
+#include <wctype.h>
+    ]],
+    [wctype iswctype wctrans towctrans
+    ])
+])
+
+AC_DEFUN([gl_WCTYPE_MODULE_INDICATOR],
+[
+  dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
+  AC_REQUIRE([gl_WCTYPE_H_DEFAULTS])
+  gl_MODULE_INDICATOR_SET_VARIABLE([$1])
+  dnl Define it also as a C macro, for the benefit of the unit tests.
+  gl_MODULE_INDICATOR_FOR_TESTS([$1])
+])
+
+AC_DEFUN([gl_WCTYPE_H_DEFAULTS],
+[
+  GNULIB_ISWBLANK=0;    AC_SUBST([GNULIB_ISWBLANK])
+  GNULIB_WCTYPE=0;      AC_SUBST([GNULIB_WCTYPE])
+  GNULIB_ISWCTYPE=0;    AC_SUBST([GNULIB_ISWCTYPE])
+  GNULIB_WCTRANS=0;     AC_SUBST([GNULIB_WCTRANS])
+  GNULIB_TOWCTRANS=0;   AC_SUBST([GNULIB_TOWCTRANS])
+  dnl Assume proper GNU behavior unless another module says otherwise.
+  HAVE_ISWBLANK=1;      AC_SUBST([HAVE_ISWBLANK])
+  HAVE_WCTYPE_T=1;      AC_SUBST([HAVE_WCTYPE_T])
+  HAVE_WCTRANS_T=1;     AC_SUBST([HAVE_WCTRANS_T])
+  REPLACE_ISWBLANK=0;   AC_SUBST([REPLACE_ISWBLANK])
+])
diff --git a/gl/m4/wint_t.m4 b/gl/m4/wint_t.m4
new file mode 100644
index 0000000..d30b8bc
--- /dev/null
+++ b/gl/m4/wint_t.m4
@@ -0,0 +1,74 @@
+# wint_t.m4 serial 7
+dnl Copyright (C) 2003, 2007-2017 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+dnl Test whether <wchar.h> has the 'wint_t' type and whether gnulib's
+dnl <wchar.h> or <wctype.h> would, if present, override 'wint_t'.
+dnl Prerequisite: AC_PROG_CC
+
+AC_DEFUN([gt_TYPE_WINT_T],
+[
+  AC_CACHE_CHECK([for wint_t], [gt_cv_c_wint_t],
+    [AC_COMPILE_IFELSE(
+       [AC_LANG_PROGRAM(
+          [[
+/* 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>
+            wint_t foo = (wchar_t)'\0';]],
+          [[]])],
+       [gt_cv_c_wint_t=yes],
+       [gt_cv_c_wint_t=no])])
+  if test $gt_cv_c_wint_t = yes; then
+    AC_DEFINE([HAVE_WINT_T], [1], [Define if you have the 'wint_t' type.])
+
+    dnl Determine whether gnulib's <wchar.h> or <wctype.h> would, if present,
+    dnl override 'wint_t'.
+    AC_CACHE_CHECK([whether wint_t is too small],
+      [gl_cv_type_wint_t_too_small],
+      [AC_COMPILE_IFELSE(
+           [AC_LANG_PROGRAM([[
+/* 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>.  */
+#if !(defined __GLIBC__ && !defined __UCLIBC__)
+# include <stddef.h>
+# include <stdio.h>
+# include <time.h>
+#endif
+#include <wchar.h>
+              int verify[sizeof (wint_t) < sizeof (int) ? -1 : 1];
+              ]])],
+           [gl_cv_type_wint_t_too_small=no],
+           [gl_cv_type_wint_t_too_small=yes])])
+    if test $gl_cv_type_wint_t_too_small = yes; then
+      GNULIB_OVERRIDES_WINT_T=1
+    else
+      GNULIB_OVERRIDES_WINT_T=0
+    fi
+  else
+    GNULIB_OVERRIDES_WINT_T=0
+  fi
+  AC_SUBST([GNULIB_OVERRIDES_WINT_T])
+])
+
+dnl Prerequisites of the 'wint_t' override.
+AC_DEFUN([gl_TYPE_WINT_T_PREREQ],
+[
+  AC_CHECK_HEADERS_ONCE([crtdefs.h])
+  if test $ac_cv_header_crtdefs_h = yes; then
+    HAVE_CRTDEFS_H=1
+  else
+    HAVE_CRTDEFS_H=0
+  fi
+  AC_SUBST([HAVE_CRTDEFS_H])
+])
diff --git a/gl/malloca.c b/gl/malloca.c
new file mode 100644
index 0000000..971a948
--- /dev/null
+++ b/gl/malloca.c
@@ -0,0 +1,159 @@
+/* Safe automatic memory allocation.
+   Copyright (C) 2003, 2006-2007, 2009-2017 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2003.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
+
+#define _GL_USE_STDLIB_ALLOC 1
+#include <config.h>
+
+/* Specification.  */
+#include "malloca.h"
+
+#include <stdint.h>
+
+#include "verify.h"
+
+/* Silence a warning from clang's MemorySanitizer.  */
+#if defined __has_feature
+# if __has_feature(memory_sanitizer)
+#  define NO_SANITIZE_MEMORY __attribute__((no_sanitize("memory")))
+# endif
+#endif
+#ifndef NO_SANITIZE_MEMORY
+# define NO_SANITIZE_MEMORY
+#endif
+
+/* The speed critical point in this file is freea() applied to an alloca()
+   result: it must be fast, to match the speed of alloca().  The speed of
+   mmalloca() and freea() in the other case are not critical, because they
+   are only invoked for big memory sizes.  */
+
+#if HAVE_ALLOCA
+
+/* Store the mmalloca() results in a hash table.  This is needed to reliably
+   distinguish a mmalloca() result and an alloca() result.
+
+   Although it is possible that the same pointer is returned by alloca() and
+   by mmalloca() at different times in the same application, it does not lead
+   to a bug in freea(), because:
+     - Before a pointer returned by alloca() can point into malloc()ed memory,
+       the function must return, and once this has happened the programmer must
+       not call freea() on it anyway.
+     - Before a pointer returned by mmalloca() can point into the stack, it
+       must be freed.  The only function that can free it is freea(), and
+       when freea() frees it, it also removes it from the hash table.  */
+
+#define MAGIC_NUMBER 0x1415fb4a
+#define MAGIC_SIZE sizeof (int)
+/* This is how the header info would look like without any alignment
+   considerations.  */
+struct preliminary_header { void *next; int magic; };
+/* But the header's size must be a multiple of sa_alignment_max.  */
+#define HEADER_SIZE \
+  (((sizeof (struct preliminary_header) + sa_alignment_max - 1) / sa_alignment_max) * sa_alignment_max)
+union header {
+  void *next;
+  struct {
+    char room[HEADER_SIZE - MAGIC_SIZE];
+    int word;
+  } magic;
+};
+verify (HEADER_SIZE == sizeof (union header));
+/* We make the hash table quite big, so that during lookups the probability
+   of empty hash buckets is quite high.  There is no need to make the hash
+   table resizable, because when the hash table gets filled so much that the
+   lookup becomes slow, it means that the application has memory leaks.  */
+#define HASH_TABLE_SIZE 257
+static void * mmalloca_results[HASH_TABLE_SIZE];
+
+#endif
+
+void *
+mmalloca (size_t n)
+{
+#if HAVE_ALLOCA
+  /* Allocate one more word, that serves as an indicator for malloc()ed
+     memory, so that freea() of an alloca() result is fast.  */
+  size_t nplus = n + HEADER_SIZE;
+
+  if (nplus >= n)
+    {
+      void *p = malloc (nplus);
+
+      if (p != NULL)
+        {
+          size_t slot;
+          union header *h = p;
+
+          p = h + 1;
+
+          /* Put a magic number into the indicator word.  */
+          h->magic.word = MAGIC_NUMBER;
+
+          /* Enter p into the hash table.  */
+          slot = (uintptr_t) p % HASH_TABLE_SIZE;
+          h->next = mmalloca_results[slot];
+          mmalloca_results[slot] = p;
+
+          return p;
+        }
+    }
+  /* Out of memory.  */
+  return NULL;
+#else
+# if !MALLOC_0_IS_NONNULL
+  if (n == 0)
+    n = 1;
+# endif
+  return malloc (n);
+#endif
+}
+
+#if HAVE_ALLOCA
+void NO_SANITIZE_MEMORY
+freea (void *p)
+{
+  /* mmalloca() may have returned NULL.  */
+  if (p != NULL)
+    {
+      /* Attempt to quickly distinguish the mmalloca() result - which has
+         a magic indicator word - and the alloca() result - which has an
+         uninitialized indicator word.  It is for this test that sa_increment
+         additional bytes are allocated in the alloca() case.  */
+      if (((int *) p)[-1] == MAGIC_NUMBER)
+        {
+          /* Looks like a mmalloca() result.  To see whether it really is one,
+             perform a lookup in the hash table.  */
+          size_t slot = (uintptr_t) p % HASH_TABLE_SIZE;
+          void **chain = &mmalloca_results[slot];
+          for (; *chain != NULL;)
+            {
+              union header *h = p;
+              if (*chain == p)
+                {
+                  /* Found it.  Remove it from the hash table and free it.  */
+                  union header *p_begin = h - 1;
+                  *chain = p_begin->next;
+                  free (p_begin);
+                  return;
+                }
+              h = *chain;
+              chain = &h[-1].next;
+            }
+        }
+      /* At this point, we know it was not a mmalloca() result.  */
+    }
+}
+#endif
diff --git a/gl/malloca.h b/gl/malloca.h
new file mode 100644
index 0000000..3b61ca2
--- /dev/null
+++ b/gl/malloca.h
@@ -0,0 +1,128 @@
+/* Safe automatic memory allocation.
+   Copyright (C) 2003-2007, 2009-2017 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2003.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
+
+#ifndef _MALLOCA_H
+#define _MALLOCA_H
+
+#include <alloca.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <stdint.h>
+
+#include "xalloc-oversized.h"
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/* safe_alloca(N) is equivalent to alloca(N) when it is safe to call
+   alloca(N); otherwise it returns NULL.  It either returns N bytes of
+   memory allocated on the stack, that lasts until the function returns,
+   or NULL.
+   Use of safe_alloca should be avoided:
+     - inside arguments of function calls - undefined behaviour,
+     - in inline functions - the allocation may actually last until the
+       calling function returns.
+*/
+#if HAVE_ALLOCA
+/* The OS usually guarantees only one guard page at the bottom of the stack,
+   and a page size can be as small as 4096 bytes.  So we cannot safely
+   allocate anything larger than 4096 bytes.  Also care for the possibility
+   of a few compiler-allocated temporary stack slots.
+   This must be a macro, not a function.  */
+# define safe_alloca(N) ((N) < 4032 ? alloca (N) : NULL)
+#else
+# define safe_alloca(N) ((void) (N), NULL)
+#endif
+
+/* malloca(N) is a safe variant of alloca(N).  It allocates N bytes of
+   memory allocated on the stack, that must be freed using freea() before
+   the function returns.  Upon failure, it returns NULL.  */
+#if HAVE_ALLOCA
+# define malloca(N) \
+  ((N) < 4032 - sa_increment                                        \
+   ? (void *) ((char *) alloca ((N) + sa_increment) + sa_increment) \
+   : mmalloca (N))
+#else
+# define malloca(N) \
+  mmalloca (N)
+#endif
+extern void * mmalloca (size_t n);
+
+/* Free a block of memory allocated through malloca().  */
+#if HAVE_ALLOCA
+extern void freea (void *p);
+#else
+# define freea free
+#endif
+
+/* nmalloca(N,S) is an overflow-safe variant of malloca (N * S).
+   It allocates an array of N objects, each with S bytes of memory,
+   on the stack.  S must be positive and N must be nonnegative.
+   The array must be freed using freea() before the function returns.  */
+#define nmalloca(n, s) (xalloc_oversized (n, s) ? NULL : malloca ((n) * (s)))
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
+/* ------------------- Auxiliary, non-public definitions ------------------- */
+
+/* Determine the alignment of a type at compile time.  */
+#if defined __GNUC__ || defined __IBM__ALIGNOF__
+# define sa_alignof __alignof__
+#elif defined __cplusplus
+  template <class type> struct sa_alignof_helper { char __slot1; type __slot2; };
+# define sa_alignof(type) offsetof (sa_alignof_helper<type>, __slot2)
+#elif defined __hpux
+  /* Work around a HP-UX 10.20 cc bug with enums constants defined as offsetof
+     values.  */
+# define sa_alignof(type) (sizeof (type) <= 4 ? 4 : 8)
+#elif defined _AIX
+  /* Work around an AIX 3.2.5 xlc bug with enums constants defined as offsetof
+     values.  */
+# define sa_alignof(type) (sizeof (type) <= 4 ? 4 : 8)
+#else
+# define sa_alignof(type) offsetof (struct { char __slot1; type __slot2; }, __slot2)
+#endif
+
+enum
+{
+/* The desired alignment of memory allocations is the maximum alignment
+   among all elementary types.  */
+  sa_alignment_long = sa_alignof (long),
+  sa_alignment_double = sa_alignof (double),
+#if HAVE_LONG_LONG_INT
+  sa_alignment_longlong = sa_alignof (long long),
+#endif
+  sa_alignment_longdouble = sa_alignof (long double),
+  sa_alignment_max = ((sa_alignment_long - 1) | (sa_alignment_double - 1)
+#if HAVE_LONG_LONG_INT
+                      | (sa_alignment_longlong - 1)
+#endif
+                      | (sa_alignment_longdouble - 1)
+                     ) + 1,
+/* The increment that guarantees room for a magic word must be >= sizeof (int)
+   and a multiple of sa_alignment_max.  */
+  sa_increment = ((sizeof (int) + sa_alignment_max - 1) / sa_alignment_max) * sa_alignment_max
+};
+
+#endif /* _MALLOCA_H */
diff --git a/gl/malloca.valgrind b/gl/malloca.valgrind
new file mode 100644
index 0000000..52f0a50
--- /dev/null
+++ b/gl/malloca.valgrind
@@ -0,0 +1,7 @@
+# Suppress a valgrind message about use of uninitialized memory in freea().
+# This use is OK because it provides only a speedup.
+{
+    freea
+    Memcheck:Cond
+    fun:freea
+}
diff --git a/gl/mbrtowc.c b/gl/mbrtowc.c
new file mode 100644
index 0000000..c427f62
--- /dev/null
+++ b/gl/mbrtowc.c
@@ -0,0 +1,414 @@
+/* Convert multibyte character to wide character.
+   Copyright (C) 1999-2002, 2005-2017 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2008.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include <wchar.h>
+
+#if C_LOCALE_MAYBE_EILSEQ
+# include "hard-locale.h"
+# include <locale.h>
+#endif
+
+#if GNULIB_defined_mbstate_t
+/* Implement mbrtowc() on top of mbtowc().  */
+
+# include <errno.h>
+# include <stdlib.h>
+
+# include "localcharset.h"
+# include "streq.h"
+# include "verify.h"
+
+#ifndef FALLTHROUGH
+# if __GNUC__ < 7
+#  define FALLTHROUGH ((void) 0)
+# else
+#  define FALLTHROUGH __attribute__ ((__fallthrough__))
+# endif
+#endif
+
+verify (sizeof (mbstate_t) >= 4);
+
+static char internal_state[4];
+
+size_t
+mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
+{
+  char *pstate = (char *)ps;
+
+  if (s == NULL)
+    {
+      pwc = NULL;
+      s = "";
+      n = 1;
+    }
+
+  if (n == 0)
+    return (size_t)(-2);
+
+  /* Here n > 0.  */
+
+  if (pstate == NULL)
+    pstate = internal_state;
+
+  {
+    size_t nstate = pstate[0];
+    char buf[4];
+    const char *p;
+    size_t m;
+
+    switch (nstate)
+      {
+      case 0:
+        p = s;
+        m = n;
+        break;
+      case 3:
+        buf[2] = pstate[3];
+        FALLTHROUGH;
+      case 2:
+        buf[1] = pstate[2];
+        FALLTHROUGH;
+      case 1:
+        buf[0] = pstate[1];
+        p = buf;
+        m = nstate;
+        buf[m++] = s[0];
+        if (n >= 2 && m < 4)
+          {
+            buf[m++] = s[1];
+            if (n >= 3 && m < 4)
+              buf[m++] = s[2];
+          }
+        break;
+      default:
+        errno = EINVAL;
+        return (size_t)(-1);
+      }
+
+    /* Here m > 0.  */
+
+# if __GLIBC__ || defined __UCLIBC__
+    /* Work around bug <http://sourceware.org/bugzilla/show_bug.cgi?id=9674> */
+    mbtowc (NULL, NULL, 0);
+# endif
+    {
+      int res = mbtowc (pwc, p, m);
+
+      if (res >= 0)
+        {
+          if (pwc != NULL && ((*pwc == 0) != (res == 0)))
+            abort ();
+          if (nstate >= (res > 0 ? res : 1))
+            abort ();
+          res -= nstate;
+          pstate[0] = 0;
+          return res;
+        }
+
+      /* mbtowc does not distinguish between invalid and incomplete multibyte
+         sequences.  But mbrtowc needs to make this distinction.
+         There are two possible approaches:
+           - Use iconv() and its return value.
+           - Use built-in knowledge about the possible encodings.
+         Given the low quality of implementation of iconv() on the systems that
+         lack mbrtowc(), we use the second approach.
+         The possible encodings are:
+           - 8-bit encodings,
+           - EUC-JP, EUC-KR, GB2312, EUC-TW, BIG5, GB18030, SJIS,
+           - UTF-8.
+         Use specialized code for each.  */
+      if (m >= 4 || m >= MB_CUR_MAX)
+        goto invalid;
+      /* Here MB_CUR_MAX > 1 and 0 < m < 4.  */
+      {
+        const char *encoding = locale_charset ();
+
+        if (STREQ_OPT (encoding, "UTF-8", 'U', 'T', 'F', '-', '8', 0, 0, 0, 0))
+          {
+            /* Cf. unistr/u8-mblen.c.  */
+            unsigned char c = (unsigned char) p[0];
+
+            if (c >= 0xc2)
+              {
+                if (c < 0xe0)
+                  {
+                    if (m == 1)
+                      goto incomplete;
+                  }
+                else if (c < 0xf0)
+                  {
+                    if (m == 1)
+                      goto incomplete;
+                    if (m == 2)
+                      {
+                        unsigned char c2 = (unsigned char) p[1];
+
+                        if ((c2 ^ 0x80) < 0x40
+                            && (c >= 0xe1 || c2 >= 0xa0)
+                            && (c != 0xed || c2 < 0xa0))
+                          goto incomplete;
+                      }
+                  }
+                else if (c <= 0xf4)
+                  {
+                    if (m == 1)
+                      goto incomplete;
+                    else /* m == 2 || m == 3 */
+                      {
+                        unsigned char c2 = (unsigned char) p[1];
+
+                        if ((c2 ^ 0x80) < 0x40
+                            && (c >= 0xf1 || c2 >= 0x90)
+                            && (c < 0xf4 || (c == 0xf4 && c2 < 0x90)))
+                          {
+                            if (m == 2)
+                              goto incomplete;
+                            else /* m == 3 */
+                              {
+                                unsigned char c3 = (unsigned char) p[2];
+
+                                if ((c3 ^ 0x80) < 0x40)
+                                  goto incomplete;
+                              }
+                          }
+                      }
+                  }
+              }
+            goto invalid;
+          }
+
+        /* As a reference for this code, you can use the GNU libiconv
+           implementation.  Look for uses of the RET_TOOFEW macro.  */
+
+        if (STREQ_OPT (encoding,
+                       "EUC-JP", 'E', 'U', 'C', '-', 'J', 'P', 0, 0, 0))
+          {
+            if (m == 1)
+              {
+                unsigned char c = (unsigned char) p[0];
+
+                if ((c >= 0xa1 && c < 0xff) || c == 0x8e || c == 0x8f)
+                  goto incomplete;
+              }
+            if (m == 2)
+              {
+                unsigned char c = (unsigned char) p[0];
+
+                if (c == 0x8f)
+                  {
+                    unsigned char c2 = (unsigned char) p[1];
+
+                    if (c2 >= 0xa1 && c2 < 0xff)
+                      goto incomplete;
+                  }
+              }
+            goto invalid;
+          }
+        if (STREQ_OPT (encoding,
+                       "EUC-KR", 'E', 'U', 'C', '-', 'K', 'R', 0, 0, 0)
+            || STREQ_OPT (encoding,
+                          "GB2312", 'G', 'B', '2', '3', '1', '2', 0, 0, 0)
+            || STREQ_OPT (encoding,
+                          "BIG5", 'B', 'I', 'G', '5', 0, 0, 0, 0, 0))
+          {
+            if (m == 1)
+              {
+                unsigned char c = (unsigned char) p[0];
+
+                if (c >= 0xa1 && c < 0xff)
+                  goto incomplete;
+              }
+            goto invalid;
+          }
+        if (STREQ_OPT (encoding,
+                       "EUC-TW", 'E', 'U', 'C', '-', 'T', 'W', 0, 0, 0))
+          {
+            if (m == 1)
+              {
+                unsigned char c = (unsigned char) p[0];
+
+                if ((c >= 0xa1 && c < 0xff) || c == 0x8e)
+                  goto incomplete;
+              }
+            else /* m == 2 || m == 3 */
+              {
+                unsigned char c = (unsigned char) p[0];
+
+                if (c == 0x8e)
+                  goto incomplete;
+              }
+            goto invalid;
+          }
+        if (STREQ_OPT (encoding,
+                       "GB18030", 'G', 'B', '1', '8', '0', '3', '0', 0, 0))
+          {
+            if (m == 1)
+              {
+                unsigned char c = (unsigned char) p[0];
+
+                if ((c >= 0x90 && c <= 0xe3) || (c >= 0xf8 && c <= 0xfe))
+                  goto incomplete;
+              }
+            else /* m == 2 || m == 3 */
+              {
+                unsigned char c = (unsigned char) p[0];
+
+                if (c >= 0x90 && c <= 0xe3)
+                  {
+                    unsigned char c2 = (unsigned char) p[1];
+
+                    if (c2 >= 0x30 && c2 <= 0x39)
+                      {
+                        if (m == 2)
+                          goto incomplete;
+                        else /* m == 3 */
+                          {
+                            unsigned char c3 = (unsigned char) p[2];
+
+                            if (c3 >= 0x81 && c3 <= 0xfe)
+                              goto incomplete;
+                          }
+                      }
+                  }
+              }
+            goto invalid;
+          }
+        if (STREQ_OPT (encoding, "SJIS", 'S', 'J', 'I', 'S', 0, 0, 0, 0, 0))
+          {
+            if (m == 1)
+              {
+                unsigned char c = (unsigned char) p[0];
+
+                if ((c >= 0x81 && c <= 0x9f) || (c >= 0xe0 && c <= 0xea)
+                    || (c >= 0xf0 && c <= 0xf9))
+                  goto incomplete;
+              }
+            goto invalid;
+          }
+
+        /* An unknown multibyte encoding.  */
+        goto incomplete;
+      }
+
+     incomplete:
+      {
+        size_t k = nstate;
+        /* Here 0 <= k < m < 4.  */
+        pstate[++k] = s[0];
+        if (k < m)
+          {
+            pstate[++k] = s[1];
+            if (k < m)
+              pstate[++k] = s[2];
+          }
+        if (k != m)
+          abort ();
+      }
+      pstate[0] = m;
+      return (size_t)(-2);
+
+     invalid:
+      errno = EILSEQ;
+      /* The conversion state is undefined, says POSIX.  */
+      return (size_t)(-1);
+    }
+  }
+}
+
+#else
+/* Override the system's mbrtowc() function.  */
+
+# undef mbrtowc
+
+size_t
+rpl_mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
+{
+  size_t ret;
+  wchar_t wc;
+
+# if MBRTOWC_NULL_ARG2_BUG || MBRTOWC_RETVAL_BUG || MBRTOWC_EMPTY_INPUT_BUG
+  if (s == NULL)
+    {
+      pwc = NULL;
+      s = "";
+      n = 1;
+    }
+# endif
+
+# if MBRTOWC_EMPTY_INPUT_BUG
+  if (n == 0)
+    return (size_t) -2;
+# endif
+
+  if (! pwc)
+    pwc = &wc;
+
+# if MBRTOWC_RETVAL_BUG
+  {
+    static mbstate_t internal_state;
+
+    /* Override mbrtowc's internal state.  We cannot call mbsinit() on the
+       hidden internal state, but we can call it on our variable.  */
+    if (ps == NULL)
+      ps = &internal_state;
+
+    if (!mbsinit (ps))
+      {
+        /* Parse the rest of the multibyte character byte for byte.  */
+        size_t count = 0;
+        for (; n > 0; s++, n--)
+          {
+            ret = mbrtowc (&wc, s, 1, ps);
+
+            if (ret == (size_t)(-1))
+              return (size_t)(-1);
+            count++;
+            if (ret != (size_t)(-2))
+              {
+                /* The multibyte character has been completed.  */
+                *pwc = wc;
+                return (wc == 0 ? 0 : count);
+              }
+          }
+        return (size_t)(-2);
+      }
+  }
+# endif
+
+  ret = mbrtowc (pwc, s, n, ps);
+
+# if MBRTOWC_NUL_RETVAL_BUG
+  if (ret < (size_t) -2 && !*pwc)
+    return 0;
+# endif
+
+# if C_LOCALE_MAYBE_EILSEQ
+  if ((size_t) -2 <= ret && n != 0 && ! hard_locale (LC_CTYPE))
+    {
+      unsigned char uc = *s;
+      *pwc = uc;
+      return 1;
+    }
+# endif
+
+  return ret;
+}
+
+#endif
diff --git a/gl/mbsinit.c b/gl/mbsinit.c
new file mode 100644
index 0000000..67871ec
--- /dev/null
+++ b/gl/mbsinit.c
@@ -0,0 +1,73 @@
+/* Test for initial conversion state.
+   Copyright (C) 2008-2017 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2008.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include <wchar.h>
+
+#include "verify.h"
+
+#if GNULIB_defined_mbstate_t
+
+/* Platforms that lack mbsinit() also lack mbrlen(), mbrtowc(), mbsrtowcs()
+   and wcrtomb(), wcsrtombs().
+   We assume that
+     - sizeof (mbstate_t) >= 4,
+     - only stateless encodings are supported (such as UTF-8 and EUC-JP, but
+       not ISO-2022 variants),
+     - for each encoding, the number of bytes for a wide character is <= 4.
+       (This maximum is attained for UTF-8, GB18030, EUC-TW.)
+   We define the meaning of mbstate_t as follows:
+     - In mb -> wc direction, mbstate_t's first byte contains the number of
+       buffered bytes (in the range 0..3), followed by up to 3 buffered bytes.
+       See mbrtowc.c.
+     - In wc -> mb direction, mbstate_t contains no information. In other
+       words, it is always in the initial state.  */
+
+verify (sizeof (mbstate_t) >= 4);
+
+int
+mbsinit (const mbstate_t *ps)
+{
+  const char *pstate = (const char *)ps;
+
+  return pstate == NULL || pstate[0] == 0;
+}
+
+#else
+
+int
+mbsinit (const mbstate_t *ps)
+{
+# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
+  /* Native Windows.  */
+#  ifdef __MINGW32__
+  /* On mingw, 'mbstate_t' is defined as 'int'.  */
+  return ps == NULL || *ps == 0;
+#  else
+  /* MSVC defines 'mbstate_t' as an 8-byte struct; the first 4-bytes matter.  */
+  return ps == NULL || *(const unsigned int *)ps == 0;
+#  endif
+# else
+  /* Minix, HP-UX 11.00, Solaris 2.6, Interix, ...  */
+  /* Maybe this definition works, maybe not...  */
+  return ps == NULL || *(const char *)ps == 0;
+# endif
+}
+
+#endif
diff --git a/gl/mbtowc-impl.h b/gl/mbtowc-impl.h
new file mode 100644
index 0000000..268f0e3
--- /dev/null
+++ b/gl/mbtowc-impl.h
@@ -0,0 +1,44 @@
+/* Convert multibyte character to wide character.
+   Copyright (C) 2011-2017 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2011.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* We don't need a static internal state, because the encoding is not state
+   dependent, and when mbrtowc returns (size_t)(-2). we throw the result
+   away. */
+
+int
+mbtowc (wchar_t *pwc, const char *s, size_t n)
+{
+  if (s == NULL)
+    return 0;
+  else
+    {
+      mbstate_t state;
+      wchar_t wc;
+      size_t result;
+
+      memset (&state, 0, sizeof (mbstate_t));
+      result = mbrtowc (&wc, s, n, &state);
+      if (result == (size_t)-1 || result == (size_t)-2)
+        {
+          errno = EILSEQ;
+          return -1;
+        }
+      if (pwc != NULL)
+        *pwc = wc;
+      return (wc == 0 ? 0 : result);
+    }
+}
diff --git a/gl/mbtowc.c b/gl/mbtowc.c
new file mode 100644
index 0000000..fbed5dc
--- /dev/null
+++ b/gl/mbtowc.c
@@ -0,0 +1,26 @@
+/* Convert multibyte character to wide character.
+   Copyright (C) 2011-2017 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2011.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+#include <stdlib.h>
+
+#include <errno.h>
+#include <string.h>
+#include <wchar.h>
+
+#include "mbtowc-impl.h"
diff --git a/gl/mkstemps.c b/gl/mkstemps.c
new file mode 100644
index 0000000..da9976b
--- /dev/null
+++ b/gl/mkstemps.c
@@ -0,0 +1,54 @@
+/* Copyright (C) 1998-1999, 2001, 2005-2007, 2009-2017 Free Software
+   Foundation, Inc.
+   This file is derived from the one in the GNU C Library.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#if !_LIBC
+# include <config.h>
+#endif
+
+#include <stdlib.h>
+
+#if !_LIBC
+# include <errno.h>
+# include "tempname.h"
+# define __gen_tempname gen_tempname
+# ifndef __GT_FILE
+#  define __GT_FILE GT_FILE
+# endif
+# define __set_errno(x) errno = x;
+#endif
+
+#include <stdio.h>
+
+#ifndef __GT_FILE
+# define __GT_FILE 0
+#endif
+
+/* Generate a unique temporary file name from XTEMPLATE.  The last six
+   characters before a suffix of length SUFFIXLEN of XTEMPLATE must be
+   "XXXXXX"; they are replaced with a string that makes the filename
+   unique.  Then open the file and return a fd. */
+int
+mkstemps (char *xtemplate, int suffixlen)
+{
+  if (suffixlen < 0)
+    {
+      __set_errno (EINVAL);
+      return -1;
+    }
+
+  return __gen_tempname (xtemplate, suffixlen, 0, __GT_FILE);
+}
diff --git a/gl/nl_langinfo.c b/gl/nl_langinfo.c
new file mode 100644
index 0000000..441e75c
--- /dev/null
+++ b/gl/nl_langinfo.c
@@ -0,0 +1,321 @@
+/* nl_langinfo() replacement: query locale dependent information.
+
+   Copyright (C) 2007-2017 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include <langinfo.h>
+
+#include <locale.h>
+#include <string.h>
+#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+# define WIN32_LEAN_AND_MEAN  /* avoid including junk */
+# include <windows.h>
+# include <stdio.h>
+#endif
+
+/* Return the codeset of the current locale, if this is easily deducible.
+   Otherwise, return "".  */
+static char *
+ctype_codeset (void)
+{
+  static char buf[2 + 10 + 1];
+  char const *locale = setlocale (LC_CTYPE, NULL);
+  char *codeset = buf;
+  size_t codesetlen;
+  codeset[0] = '\0';
+
+  if (locale && locale[0])
+    {
+      /* If the locale name contains an encoding after the dot, return it.  */
+      char *dot = strchr (locale, '.');
+
+      if (dot)
+        {
+          /* Look for the possible @... trailer and remove it, if any.  */
+          char *codeset_start = dot + 1;
+          char const *modifier = strchr (codeset_start, '@');
+
+          if (! modifier)
+            codeset = codeset_start;
+          else
+            {
+              codesetlen = modifier - codeset_start;
+              if (codesetlen < sizeof buf)
+                {
+                  codeset = memcpy (buf, codeset_start, codesetlen);
+                  codeset[codesetlen] = '\0';
+                }
+            }
+        }
+    }
+
+#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+  /* If setlocale is successful, it returns the number of the
+     codepage, as a string.  Otherwise, fall back on Windows API
+     GetACP, which returns the locale's codepage as a number (although
+     this doesn't change according to what the 'setlocale' call specified).
+     Either way, prepend "CP" to make it a valid codeset name.  */
+  codesetlen = strlen (codeset);
+  if (0 < codesetlen && codesetlen < sizeof buf - 2)
+    memmove (buf + 2, codeset, codesetlen + 1);
+  else
+    sprintf (buf + 2, "%u", GetACP ());
+  codeset = memcpy (buf, "CP", 2);
+#endif
+  return codeset;
+}
+
+
+#if REPLACE_NL_LANGINFO
+
+/* Override nl_langinfo with support for added nl_item values.  */
+
+# undef nl_langinfo
+
+char *
+rpl_nl_langinfo (nl_item item)
+{
+  switch (item)
+    {
+# if GNULIB_defined_CODESET
+    case CODESET:
+      return ctype_codeset ();
+# endif
+# if GNULIB_defined_T_FMT_AMPM
+    case T_FMT_AMPM:
+      return (char *) "%I:%M:%S %p";
+# endif
+# if GNULIB_defined_ERA
+    case ERA:
+      /* The format is not standardized.  In glibc it is a sequence of strings
+         of the form "direction:offset:start_date:end_date:era_name:era_format"
+         with an empty string at the end.  */
+      return (char *) "";
+    case ERA_D_FMT:
+      /* The %Ex conversion in strftime behaves like %x if the locale does not
+         have an alternative time format.  */
+      item = D_FMT;
+      break;
+    case ERA_D_T_FMT:
+      /* The %Ec conversion in strftime behaves like %c if the locale does not
+         have an alternative time format.  */
+      item = D_T_FMT;
+      break;
+    case ERA_T_FMT:
+      /* The %EX conversion in strftime behaves like %X if the locale does not
+         have an alternative time format.  */
+      item = T_FMT;
+      break;
+    case ALT_DIGITS:
+      /* The format is not standardized.  In glibc it is a sequence of 10
+         strings, appended in memory.  */
+      return (char *) "\0\0\0\0\0\0\0\0\0\0";
+# endif
+# if GNULIB_defined_YESEXPR || !FUNC_NL_LANGINFO_YESEXPR_WORKS
+    case YESEXPR:
+      return (char *) "^[yY]";
+    case NOEXPR:
+      return (char *) "^[nN]";
+# endif
+    default:
+      break;
+    }
+  return nl_langinfo (item);
+}
+
+#else
+
+/* Provide nl_langinfo from scratch, either for native MS-Windows, or
+   for old Unix platforms without locales, such as Linux libc5 or
+   BeOS.  */
+
+# include <time.h>
+
+char *
+nl_langinfo (nl_item item)
+{
+  static char nlbuf[100];
+  struct tm tmm = { 0 };
+
+  switch (item)
+    {
+    /* nl_langinfo items of the LC_CTYPE category */
+    case CODESET:
+      {
+        char *codeset = ctype_codeset ();
+        if (*codeset)
+          return codeset;
+      }
+# ifdef __BEOS__
+      return (char *) "UTF-8";
+# else
+      return (char *) "ISO-8859-1";
+# endif
+    /* nl_langinfo items of the LC_NUMERIC category */
+    case RADIXCHAR:
+      return localeconv () ->decimal_point;
+    case THOUSEP:
+      return localeconv () ->thousands_sep;
+    case GROUPING:
+      return localeconv () ->grouping;
+    /* nl_langinfo items of the LC_TIME category.
+       TODO: Really use the locale.  */
+    case D_T_FMT:
+    case ERA_D_T_FMT:
+      return (char *) "%a %b %e %H:%M:%S %Y";
+    case D_FMT:
+    case ERA_D_FMT:
+      return (char *) "%m/%d/%y";
+    case T_FMT:
+    case ERA_T_FMT:
+      return (char *) "%H:%M:%S";
+    case T_FMT_AMPM:
+      return (char *) "%I:%M:%S %p";
+    case AM_STR:
+      if (!strftime (nlbuf, sizeof nlbuf, "%p", &tmm))
+        return (char *) "AM";
+      return nlbuf;
+    case PM_STR:
+      tmm.tm_hour = 12;
+      if (!strftime (nlbuf, sizeof nlbuf, "%p", &tmm))
+        return (char *) "PM";
+      return nlbuf;
+    case DAY_1:
+    case DAY_2:
+    case DAY_3:
+    case DAY_4:
+    case DAY_5:
+    case DAY_6:
+    case DAY_7:
+      {
+        static char const days[][sizeof "Wednesday"] = {
+          "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday",
+          "Friday", "Saturday"
+        };
+        tmm.tm_wday = item - DAY_1;
+        if (!strftime (nlbuf, sizeof nlbuf, "%A", &tmm))
+          return (char *) days[item - DAY_1];
+        return nlbuf;
+      }
+    case ABDAY_1:
+    case ABDAY_2:
+    case ABDAY_3:
+    case ABDAY_4:
+    case ABDAY_5:
+    case ABDAY_6:
+    case ABDAY_7:
+      {
+        static char const abdays[][sizeof "Sun"] = {
+          "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
+        };
+        tmm.tm_wday = item - ABDAY_1;
+        if (!strftime (nlbuf, sizeof nlbuf, "%a", &tmm))
+          return (char *) abdays[item - ABDAY_1];
+        return nlbuf;
+      }
+    case MON_1:
+    case MON_2:
+    case MON_3:
+    case MON_4:
+    case MON_5:
+    case MON_6:
+    case MON_7:
+    case MON_8:
+    case MON_9:
+    case MON_10:
+    case MON_11:
+    case MON_12:
+      {
+        static char const months[][sizeof "September"] = {
+          "January", "February", "March", "April", "May", "June", "July",
+          "September", "October", "November", "December"
+        };
+        tmm.tm_mon = item - MON_1;
+        if (!strftime (nlbuf, sizeof nlbuf, "%B", &tmm))
+          return (char *) months[item - MON_1];
+        return nlbuf;
+      }
+    case ABMON_1:
+    case ABMON_2:
+    case ABMON_3:
+    case ABMON_4:
+    case ABMON_5:
+    case ABMON_6:
+    case ABMON_7:
+    case ABMON_8:
+    case ABMON_9:
+    case ABMON_10:
+    case ABMON_11:
+    case ABMON_12:
+      {
+        static char const abmonths[][sizeof "Jan"] = {
+          "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul",
+          "Sep", "Oct", "Nov", "Dec"
+        };
+        tmm.tm_mon = item - ABMON_1;
+        if (!strftime (nlbuf, sizeof nlbuf, "%b", &tmm))
+          return (char *) abmonths[item - ABMON_1];
+        return nlbuf;
+      }
+    case ERA:
+      return (char *) "";
+    case ALT_DIGITS:
+      return (char *) "\0\0\0\0\0\0\0\0\0\0";
+    /* nl_langinfo items of the LC_MONETARY category.  */
+    case CRNCYSTR:
+      return localeconv () ->currency_symbol;
+    case INT_CURR_SYMBOL:
+      return localeconv () ->int_curr_symbol;
+    case MON_DECIMAL_POINT:
+      return localeconv () ->mon_decimal_point;
+    case MON_THOUSANDS_SEP:
+      return localeconv () ->mon_thousands_sep;
+    case MON_GROUPING:
+      return localeconv () ->mon_grouping;
+    case POSITIVE_SIGN:
+      return localeconv () ->positive_sign;
+    case NEGATIVE_SIGN:
+      return localeconv () ->negative_sign;
+    case FRAC_DIGITS:
+      return & localeconv () ->frac_digits;
+    case INT_FRAC_DIGITS:
+      return & localeconv () ->int_frac_digits;
+    case P_CS_PRECEDES:
+      return & localeconv () ->p_cs_precedes;
+    case N_CS_PRECEDES:
+      return & localeconv () ->n_cs_precedes;
+    case P_SEP_BY_SPACE:
+      return & localeconv () ->p_sep_by_space;
+    case N_SEP_BY_SPACE:
+      return & localeconv () ->n_sep_by_space;
+    case P_SIGN_POSN:
+      return & localeconv () ->p_sign_posn;
+    case N_SIGN_POSN:
+      return & localeconv () ->n_sign_posn;
+    /* nl_langinfo items of the LC_MESSAGES category
+       TODO: Really use the locale. */
+    case YESEXPR:
+      return (char *) "^[yY]";
+    case NOEXPR:
+      return (char *) "^[nN]";
+    default:
+      return (char *) "";
+    }
+}
+
+#endif
diff --git a/gl/pathmax.h b/gl/pathmax.h
new file mode 100644
index 0000000..0ebce81
--- /dev/null
+++ b/gl/pathmax.h
@@ -0,0 +1,83 @@
+/* Define PATH_MAX somehow.  Requires sys/types.h.
+   Copyright (C) 1992, 1999, 2001, 2003, 2005, 2009-2017 Free Software
+   Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
+
+#ifndef _PATHMAX_H
+# define _PATHMAX_H
+
+/* POSIX:2008 defines PATH_MAX to be the maximum number of bytes in a filename,
+   including the terminating NUL byte.
+   <http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/limits.h.html>
+   PATH_MAX is not defined on systems which have no limit on filename length,
+   such as GNU/Hurd.
+
+   This file does *not* define PATH_MAX always.  Programs that use this file
+   can handle the GNU/Hurd case in several ways:
+     - Either with a package-wide handling, or with a per-file handling,
+     - Either through a
+         #ifdef PATH_MAX
+       or through a fallback like
+         #ifndef PATH_MAX
+         # define PATH_MAX 8192
+         #endif
+       or through a fallback like
+         #ifndef PATH_MAX
+         # define PATH_MAX pathconf ("/", _PC_PATH_MAX)
+         #endif
+ */
+
+# include <unistd.h>
+
+# include <limits.h>
+
+# ifndef _POSIX_PATH_MAX
+#  define _POSIX_PATH_MAX 256
+# endif
+
+/* Don't include sys/param.h if it already has been.  */
+# if defined HAVE_SYS_PARAM_H && !defined PATH_MAX && !defined MAXPATHLEN
+#  include <sys/param.h>
+# endif
+
+# if !defined PATH_MAX && defined MAXPATHLEN
+#  define PATH_MAX MAXPATHLEN
+# endif
+
+# ifdef __hpux
+/* On HP-UX, PATH_MAX designates the maximum number of bytes in a filename,
+   *not* including the terminating NUL byte, and is set to 1023.
+   Additionally, when _XOPEN_SOURCE is defined to 500 or more, PATH_MAX is
+   not defined at all any more.  */
+#  undef PATH_MAX
+#  define PATH_MAX 1024
+# endif
+
+# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+/* The page "Naming Files, Paths, and Namespaces" on msdn.microsoft.com,
+   section "Maximum Path Length Limitation",
+   <http://msdn.microsoft.com/en-us/library/aa365247(v=vs.85).aspx#maxpath>
+   explains that the maximum size of a filename, including the terminating
+   NUL byte, is 260 = 3 + 256 + 1.
+   This is the same value as
+     - FILENAME_MAX in <stdio.h>,
+     - _MAX_PATH in <stdlib.h>,
+     - MAX_PATH in <windef.h>.
+   Undefine the original value, because mingw's <limits.h> gets it wrong.  */
+#  undef PATH_MAX
+#  define PATH_MAX 260
+# endif
+
+#endif /* _PATHMAX_H */
diff --git a/gl/ref-add.sin b/gl/ref-add.sin
new file mode 100644
index 0000000..bfd5b80
--- /dev/null
+++ b/gl/ref-add.sin
@@ -0,0 +1,29 @@
+# Add this package to a list of references stored in a text file.
+#
+#   Copyright (C) 2000, 2009-2017 Free Software Foundation, Inc.
+#
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU Lesser General Public License as published by
+#   the Free Software Foundation; either version 2, or (at your option)
+#   any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU Lesser General Public License for more details.
+#
+#   You should have received a copy of the GNU Lesser General Public License along
+#   with this program; if not, see <http://www.gnu.org/licenses/>.
+#
+# Written by Bruno Haible <haible@clisp.cons.org>.
+#
+/^# Packages using this file: / {
+  s/# Packages using this file://
+  ta
+  :a
+  s/ @PACKAGE@ / @PACKAGE@ /
+  tb
+  s/ $/ @PACKAGE@ /
+  :b
+  s/^/# Packages using this file:/
+}
diff --git a/gl/ref-del.sin b/gl/ref-del.sin
new file mode 100644
index 0000000..f281f21
--- /dev/null
+++ b/gl/ref-del.sin
@@ -0,0 +1,24 @@
+# Remove this package from a list of references stored in a text file.
+#
+#   Copyright (C) 2000, 2009-2017 Free Software Foundation, Inc.
+#
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU Lesser General Public License as published by
+#   the Free Software Foundation; either version 2, or (at your option)
+#   any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU Lesser General Public License for more details.
+#
+#   You should have received a copy of the GNU Lesser General Public License along
+#   with this program; if not, see <http://www.gnu.org/licenses/>.
+#
+# Written by Bruno Haible <haible@clisp.cons.org>.
+#
+/^# Packages using this file: / {
+  s/# Packages using this file://
+  s/ @PACKAGE@ / /
+  s/^/# Packages using this file:/
+}
diff --git a/gl/regcomp.c b/gl/regcomp.c
new file mode 100644
index 0000000..2824521
--- /dev/null
+++ b/gl/regcomp.c
@@ -0,0 +1,3950 @@
+/* Extended regular expression matching and search library.
+   Copyright (C) 2002-2017 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
+
+#ifdef _LIBC
+# include <locale/weight.h>
+#endif
+
+static reg_errcode_t re_compile_internal (regex_t *preg, const char * pattern,
+					  size_t length, reg_syntax_t syntax);
+static void re_compile_fastmap_iter (regex_t *bufp,
+				     const re_dfastate_t *init_state,
+				     char *fastmap);
+static reg_errcode_t init_dfa (re_dfa_t *dfa, size_t pat_len);
+#ifdef RE_ENABLE_I18N
+static void free_charset (re_charset_t *cset);
+#endif /* RE_ENABLE_I18N */
+static void free_workarea_compile (regex_t *preg);
+static reg_errcode_t create_initial_state (re_dfa_t *dfa);
+#ifdef RE_ENABLE_I18N
+static void optimize_utf8 (re_dfa_t *dfa);
+#endif
+static reg_errcode_t analyze (regex_t *preg);
+static reg_errcode_t preorder (bin_tree_t *root,
+			       reg_errcode_t (fn (void *, bin_tree_t *)),
+			       void *extra);
+static reg_errcode_t postorder (bin_tree_t *root,
+				reg_errcode_t (fn (void *, bin_tree_t *)),
+				void *extra);
+static reg_errcode_t optimize_subexps (void *extra, bin_tree_t *node);
+static reg_errcode_t lower_subexps (void *extra, bin_tree_t *node);
+static bin_tree_t *lower_subexp (reg_errcode_t *err, regex_t *preg,
+				 bin_tree_t *node);
+static reg_errcode_t calc_first (void *extra, bin_tree_t *node);
+static reg_errcode_t calc_next (void *extra, bin_tree_t *node);
+static reg_errcode_t link_nfa_nodes (void *extra, bin_tree_t *node);
+static Idx duplicate_node (re_dfa_t *dfa, Idx org_idx, unsigned int constraint);
+static Idx search_duplicated_node (const re_dfa_t *dfa, Idx org_node,
+				   unsigned int constraint);
+static reg_errcode_t calc_eclosure (re_dfa_t *dfa);
+static reg_errcode_t calc_eclosure_iter (re_node_set *new_set, re_dfa_t *dfa,
+					 Idx node, bool root);
+static reg_errcode_t calc_inveclosure (re_dfa_t *dfa);
+static Idx fetch_number (re_string_t *input, re_token_t *token,
+			 reg_syntax_t syntax);
+static int peek_token (re_token_t *token, re_string_t *input,
+			reg_syntax_t syntax) internal_function;
+static bin_tree_t *parse (re_string_t *regexp, regex_t *preg,
+			  reg_syntax_t syntax, reg_errcode_t *err);
+static bin_tree_t *parse_reg_exp (re_string_t *regexp, regex_t *preg,
+				  re_token_t *token, reg_syntax_t syntax,
+				  Idx nest, reg_errcode_t *err);
+static bin_tree_t *parse_branch (re_string_t *regexp, regex_t *preg,
+				 re_token_t *token, reg_syntax_t syntax,
+				 Idx nest, reg_errcode_t *err);
+static bin_tree_t *parse_expression (re_string_t *regexp, regex_t *preg,
+				     re_token_t *token, reg_syntax_t syntax,
+				     Idx nest, reg_errcode_t *err);
+static bin_tree_t *parse_sub_exp (re_string_t *regexp, regex_t *preg,
+				  re_token_t *token, reg_syntax_t syntax,
+				  Idx nest, reg_errcode_t *err);
+static bin_tree_t *parse_dup_op (bin_tree_t *dup_elem, re_string_t *regexp,
+				 re_dfa_t *dfa, re_token_t *token,
+				 reg_syntax_t syntax, reg_errcode_t *err);
+static bin_tree_t *parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa,
+				      re_token_t *token, reg_syntax_t syntax,
+				      reg_errcode_t *err);
+static reg_errcode_t parse_bracket_element (bracket_elem_t *elem,
+					    re_string_t *regexp,
+					    re_token_t *token, int token_len,
+					    re_dfa_t *dfa,
+					    reg_syntax_t syntax,
+					    bool accept_hyphen);
+static reg_errcode_t parse_bracket_symbol (bracket_elem_t *elem,
+					  re_string_t *regexp,
+					  re_token_t *token);
+#ifdef RE_ENABLE_I18N
+static reg_errcode_t build_equiv_class (bitset_t sbcset,
+					re_charset_t *mbcset,
+					Idx *equiv_class_alloc,
+					const unsigned char *name);
+static reg_errcode_t build_charclass (RE_TRANSLATE_TYPE trans,
+				      bitset_t sbcset,
+				      re_charset_t *mbcset,
+				      Idx *char_class_alloc,
+				      const char *class_name,
+				      reg_syntax_t syntax);
+#else  /* not RE_ENABLE_I18N */
+static reg_errcode_t build_equiv_class (bitset_t sbcset,
+					const unsigned char *name);
+static reg_errcode_t build_charclass (RE_TRANSLATE_TYPE trans,
+				      bitset_t sbcset,
+				      const char *class_name,
+				      reg_syntax_t syntax);
+#endif /* not RE_ENABLE_I18N */
+static bin_tree_t *build_charclass_op (re_dfa_t *dfa,
+				       RE_TRANSLATE_TYPE trans,
+				       const char *class_name,
+				       const char *extra,
+				       bool non_match, reg_errcode_t *err);
+static bin_tree_t *create_tree (re_dfa_t *dfa,
+				bin_tree_t *left, bin_tree_t *right,
+				re_token_type_t type);
+static bin_tree_t *create_token_tree (re_dfa_t *dfa,
+				      bin_tree_t *left, bin_tree_t *right,
+				      const re_token_t *token);
+static bin_tree_t *duplicate_tree (const bin_tree_t *src, re_dfa_t *dfa);
+static void free_token (re_token_t *node);
+static reg_errcode_t free_tree (void *extra, bin_tree_t *node);
+static reg_errcode_t mark_opt_subexp (void *extra, bin_tree_t *node);
+
+/* This table gives an error message for each of the error codes listed
+   in regex.h.  Obviously the order here has to be same as there.
+   POSIX doesn't require that we do anything for REG_NOERROR,
+   but why not be nice?  */
+
+static const char __re_error_msgid[] =
+  {
+#define REG_NOERROR_IDX	0
+    gettext_noop ("Success")	/* REG_NOERROR */
+    "\0"
+#define REG_NOMATCH_IDX (REG_NOERROR_IDX + sizeof "Success")
+    gettext_noop ("No match")	/* REG_NOMATCH */
+    "\0"
+#define REG_BADPAT_IDX	(REG_NOMATCH_IDX + sizeof "No match")
+    gettext_noop ("Invalid regular expression") /* REG_BADPAT */
+    "\0"
+#define REG_ECOLLATE_IDX (REG_BADPAT_IDX + sizeof "Invalid regular expression")
+    gettext_noop ("Invalid collation character") /* REG_ECOLLATE */
+    "\0"
+#define REG_ECTYPE_IDX	(REG_ECOLLATE_IDX + sizeof "Invalid collation character")
+    gettext_noop ("Invalid character class name") /* REG_ECTYPE */
+    "\0"
+#define REG_EESCAPE_IDX	(REG_ECTYPE_IDX + sizeof "Invalid character class name")
+    gettext_noop ("Trailing backslash") /* REG_EESCAPE */
+    "\0"
+#define REG_ESUBREG_IDX	(REG_EESCAPE_IDX + sizeof "Trailing backslash")
+    gettext_noop ("Invalid back reference") /* REG_ESUBREG */
+    "\0"
+#define REG_EBRACK_IDX	(REG_ESUBREG_IDX + sizeof "Invalid back reference")
+    gettext_noop ("Unmatched [, [^, [:, [., or [=")	/* REG_EBRACK */
+    "\0"
+#define REG_EPAREN_IDX	(REG_EBRACK_IDX + sizeof "Unmatched [, [^, [:, [., or [=")
+    gettext_noop ("Unmatched ( or \\(") /* REG_EPAREN */
+    "\0"
+#define REG_EBRACE_IDX	(REG_EPAREN_IDX + sizeof "Unmatched ( or \\(")
+    gettext_noop ("Unmatched \\{") /* REG_EBRACE */
+    "\0"
+#define REG_BADBR_IDX	(REG_EBRACE_IDX + sizeof "Unmatched \\{")
+    gettext_noop ("Invalid content of \\{\\}") /* REG_BADBR */
+    "\0"
+#define REG_ERANGE_IDX	(REG_BADBR_IDX + sizeof "Invalid content of \\{\\}")
+    gettext_noop ("Invalid range end")	/* REG_ERANGE */
+    "\0"
+#define REG_ESPACE_IDX	(REG_ERANGE_IDX + sizeof "Invalid range end")
+    gettext_noop ("Memory exhausted") /* REG_ESPACE */
+    "\0"
+#define REG_BADRPT_IDX	(REG_ESPACE_IDX + sizeof "Memory exhausted")
+    gettext_noop ("Invalid preceding regular expression") /* REG_BADRPT */
+    "\0"
+#define REG_EEND_IDX	(REG_BADRPT_IDX + sizeof "Invalid preceding regular expression")
+    gettext_noop ("Premature end of regular expression") /* REG_EEND */
+    "\0"
+#define REG_ESIZE_IDX	(REG_EEND_IDX + sizeof "Premature end of regular expression")
+    gettext_noop ("Regular expression too big") /* REG_ESIZE */
+    "\0"
+#define REG_ERPAREN_IDX	(REG_ESIZE_IDX + sizeof "Regular expression too big")
+    gettext_noop ("Unmatched ) or \\)") /* REG_ERPAREN */
+  };
+
+static const size_t __re_error_msgid_idx[] =
+  {
+    REG_NOERROR_IDX,
+    REG_NOMATCH_IDX,
+    REG_BADPAT_IDX,
+    REG_ECOLLATE_IDX,
+    REG_ECTYPE_IDX,
+    REG_EESCAPE_IDX,
+    REG_ESUBREG_IDX,
+    REG_EBRACK_IDX,
+    REG_EPAREN_IDX,
+    REG_EBRACE_IDX,
+    REG_BADBR_IDX,
+    REG_ERANGE_IDX,
+    REG_ESPACE_IDX,
+    REG_BADRPT_IDX,
+    REG_EEND_IDX,
+    REG_ESIZE_IDX,
+    REG_ERPAREN_IDX
+  };
+
+/* Entry points for GNU code.  */
+
+/* re_compile_pattern is the GNU regular expression compiler: it
+   compiles PATTERN (of length LENGTH) and puts the result in BUFP.
+   Returns 0 if the pattern was valid, otherwise an error string.
+
+   Assumes the 'allocated' (and perhaps 'buffer') and 'translate' fields
+   are set in BUFP on entry.  */
+
+const char *
+re_compile_pattern (const char *pattern, size_t length,
+		    struct re_pattern_buffer *bufp)
+{
+  reg_errcode_t ret;
+
+  /* And GNU code determines whether or not to get register information
+     by passing null for the REGS argument to re_match, etc., not by
+     setting no_sub, unless RE_NO_SUB is set.  */
+  bufp->no_sub = !!(re_syntax_options & RE_NO_SUB);
+
+  /* Match anchors at newline.  */
+  bufp->newline_anchor = 1;
+
+  ret = re_compile_internal (bufp, pattern, length, re_syntax_options);
+
+  if (!ret)
+    return NULL;
+  return gettext (__re_error_msgid + __re_error_msgid_idx[(int) ret]);
+}
+#ifdef _LIBC
+weak_alias (__re_compile_pattern, re_compile_pattern)
+#endif
+
+/* Set by 're_set_syntax' to the current regexp syntax to recognize.  Can
+   also be assigned to arbitrarily: each pattern buffer stores its own
+   syntax, so it can be changed between regex compilations.  */
+/* This has no initializer because initialized variables in Emacs
+   become read-only after dumping.  */
+reg_syntax_t re_syntax_options;
+
+
+/* Specify the precise syntax of regexps for compilation.  This provides
+   for compatibility for various utilities which historically have
+   different, incompatible syntaxes.
+
+   The argument SYNTAX is a bit mask comprised of the various bits
+   defined in regex.h.  We return the old syntax.  */
+
+reg_syntax_t
+re_set_syntax (reg_syntax_t syntax)
+{
+  reg_syntax_t ret = re_syntax_options;
+
+  re_syntax_options = syntax;
+  return ret;
+}
+#ifdef _LIBC
+weak_alias (__re_set_syntax, re_set_syntax)
+#endif
+
+int
+re_compile_fastmap (struct re_pattern_buffer *bufp)
+{
+  re_dfa_t *dfa = bufp->buffer;
+  char *fastmap = bufp->fastmap;
+
+  memset (fastmap, '\0', sizeof (char) * SBC_MAX);
+  re_compile_fastmap_iter (bufp, dfa->init_state, fastmap);
+  if (dfa->init_state != dfa->init_state_word)
+    re_compile_fastmap_iter (bufp, dfa->init_state_word, fastmap);
+  if (dfa->init_state != dfa->init_state_nl)
+    re_compile_fastmap_iter (bufp, dfa->init_state_nl, fastmap);
+  if (dfa->init_state != dfa->init_state_begbuf)
+    re_compile_fastmap_iter (bufp, dfa->init_state_begbuf, fastmap);
+  bufp->fastmap_accurate = 1;
+  return 0;
+}
+#ifdef _LIBC
+weak_alias (__re_compile_fastmap, re_compile_fastmap)
+#endif
+
+static inline void
+__attribute__ ((always_inline))
+re_set_fastmap (char *fastmap, bool icase, int ch)
+{
+  fastmap[ch] = 1;
+  if (icase)
+    fastmap[tolower (ch)] = 1;
+}
+
+/* Helper function for re_compile_fastmap.
+   Compile fastmap for the initial_state INIT_STATE.  */
+
+static void
+re_compile_fastmap_iter (regex_t *bufp, const re_dfastate_t *init_state,
+			 char *fastmap)
+{
+  re_dfa_t *dfa = bufp->buffer;
+  Idx node_cnt;
+  bool icase = (dfa->mb_cur_max == 1 && (bufp->syntax & RE_ICASE));
+  for (node_cnt = 0; node_cnt < init_state->nodes.nelem; ++node_cnt)
+    {
+      Idx node = init_state->nodes.elems[node_cnt];
+      re_token_type_t type = dfa->nodes[node].type;
+
+      if (type == CHARACTER)
+	{
+	  re_set_fastmap (fastmap, icase, dfa->nodes[node].opr.c);
+#ifdef RE_ENABLE_I18N
+	  if ((bufp->syntax & RE_ICASE) && dfa->mb_cur_max > 1)
+	    {
+	      unsigned char buf[MB_LEN_MAX];
+	      unsigned char *p;
+	      wchar_t wc;
+	      mbstate_t state;
+
+	      p = buf;
+	      *p++ = dfa->nodes[node].opr.c;
+	      while (++node < dfa->nodes_len
+		     &&	dfa->nodes[node].type == CHARACTER
+		     && dfa->nodes[node].mb_partial)
+		*p++ = dfa->nodes[node].opr.c;
+	      memset (&state, '\0', sizeof (state));
+	      if (__mbrtowc (&wc, (const char *) buf, p - buf,
+			     &state) == p - buf
+		  && (__wcrtomb ((char *) buf, __towlower (wc), &state)
+		      != (size_t) -1))
+		re_set_fastmap (fastmap, false, buf[0]);
+	    }
+#endif
+	}
+      else if (type == SIMPLE_BRACKET)
+	{
+	  int i, ch;
+	  for (i = 0, ch = 0; i < BITSET_WORDS; ++i)
+	    {
+	      int j;
+	      bitset_word_t w = dfa->nodes[node].opr.sbcset[i];
+	      for (j = 0; j < BITSET_WORD_BITS; ++j, ++ch)
+		if (w & ((bitset_word_t) 1 << j))
+		  re_set_fastmap (fastmap, icase, ch);
+	    }
+	}
+#ifdef RE_ENABLE_I18N
+      else if (type == COMPLEX_BRACKET)
+	{
+	  re_charset_t *cset = dfa->nodes[node].opr.mbcset;
+	  Idx i;
+
+# ifdef _LIBC
+	  /* See if we have to try all bytes which start multiple collation
+	     elements.
+	     e.g. In da_DK, we want to catch 'a' since "aa" is a valid
+		  collation element, and don't catch 'b' since 'b' is
+		  the only collation element which starts from 'b' (and
+		  it is caught by SIMPLE_BRACKET).  */
+	      if (_NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES) != 0
+		  && (cset->ncoll_syms || cset->nranges))
+		{
+		  const int32_t *table = (const int32_t *)
+		    _NL_CURRENT (LC_COLLATE, _NL_COLLATE_TABLEMB);
+		  for (i = 0; i < SBC_MAX; ++i)
+		    if (table[i] < 0)
+		      re_set_fastmap (fastmap, icase, i);
+		}
+# endif /* _LIBC */
+
+	  /* See if we have to start the match at all multibyte characters,
+	     i.e. where we would not find an invalid sequence.  This only
+	     applies to multibyte character sets; for single byte character
+	     sets, the SIMPLE_BRACKET again suffices.  */
+	  if (dfa->mb_cur_max > 1
+	      && (cset->nchar_classes || cset->non_match || cset->nranges
+# ifdef _LIBC
+		  || cset->nequiv_classes
+# endif /* _LIBC */
+		 ))
+	    {
+	      unsigned char c = 0;
+	      do
+		{
+		  mbstate_t mbs;
+		  memset (&mbs, 0, sizeof (mbs));
+		  if (__mbrtowc (NULL, (char *) &c, 1, &mbs) == (size_t) -2)
+		    re_set_fastmap (fastmap, false, (int) c);
+		}
+	      while (++c != 0);
+	    }
+
+	  else
+	    {
+	      /* ... Else catch all bytes which can start the mbchars.  */
+	      for (i = 0; i < cset->nmbchars; ++i)
+		{
+		  char buf[256];
+		  mbstate_t state;
+		  memset (&state, '\0', sizeof (state));
+		  if (__wcrtomb (buf, cset->mbchars[i], &state) != (size_t) -1)
+		    re_set_fastmap (fastmap, icase, *(unsigned char *) buf);
+		  if ((bufp->syntax & RE_ICASE) && dfa->mb_cur_max > 1)
+		    {
+		      if (__wcrtomb (buf, __towlower (cset->mbchars[i]), &state)
+			  != (size_t) -1)
+			re_set_fastmap (fastmap, false, *(unsigned char *) buf);
+		    }
+		}
+	    }
+	}
+#endif /* RE_ENABLE_I18N */
+      else if (type == OP_PERIOD
+#ifdef RE_ENABLE_I18N
+	       || type == OP_UTF8_PERIOD
+#endif /* RE_ENABLE_I18N */
+	       || type == END_OF_RE)
+	{
+	  memset (fastmap, '\1', sizeof (char) * SBC_MAX);
+	  if (type == END_OF_RE)
+	    bufp->can_be_null = 1;
+	  return;
+	}
+    }
+}
+
+/* Entry point for POSIX code.  */
+/* regcomp takes a regular expression as a string and compiles it.
+
+   PREG is a regex_t *.  We do not expect any fields to be initialized,
+   since POSIX says we shouldn't.  Thus, we set
+
+     'buffer' to the compiled pattern;
+     'used' to the length of the compiled pattern;
+     'syntax' to RE_SYNTAX_POSIX_EXTENDED if the
+       REG_EXTENDED bit in CFLAGS is set; otherwise, to
+       RE_SYNTAX_POSIX_BASIC;
+     'newline_anchor' to REG_NEWLINE being set in CFLAGS;
+     'fastmap' to an allocated space for the fastmap;
+     'fastmap_accurate' to zero;
+     're_nsub' to the number of subexpressions in PATTERN.
+
+   PATTERN is the address of the pattern string.
+
+   CFLAGS is a series of bits which affect compilation.
+
+     If REG_EXTENDED is set, we use POSIX extended syntax; otherwise, we
+     use POSIX basic syntax.
+
+     If REG_NEWLINE is set, then . and [^...] don't match newline.
+     Also, regexec will try a match beginning after every newline.
+
+     If REG_ICASE is set, then we considers upper- and lowercase
+     versions of letters to be equivalent when matching.
+
+     If REG_NOSUB is set, then when PREG is passed to regexec, that
+     routine will report only success or failure, and nothing about the
+     registers.
+
+   It returns 0 if it succeeds, nonzero if it doesn't.  (See regex.h for
+   the return codes and their meanings.)  */
+
+int
+regcomp (regex_t *_Restrict_ preg, const char *_Restrict_ pattern, int cflags)
+{
+  reg_errcode_t ret;
+  reg_syntax_t syntax = ((cflags & REG_EXTENDED) ? RE_SYNTAX_POSIX_EXTENDED
+			 : RE_SYNTAX_POSIX_BASIC);
+
+  preg->buffer = NULL;
+  preg->allocated = 0;
+  preg->used = 0;
+
+  /* Try to allocate space for the fastmap.  */
+  preg->fastmap = re_malloc (char, SBC_MAX);
+  if (BE (preg->fastmap == NULL, 0))
+    return REG_ESPACE;
+
+  syntax |= (cflags & REG_ICASE) ? RE_ICASE : 0;
+
+  /* If REG_NEWLINE is set, newlines are treated differently.  */
+  if (cflags & REG_NEWLINE)
+    { /* REG_NEWLINE implies neither . nor [^...] match newline.  */
+      syntax &= ~RE_DOT_NEWLINE;
+      syntax |= RE_HAT_LISTS_NOT_NEWLINE;
+      /* It also changes the matching behavior.  */
+      preg->newline_anchor = 1;
+    }
+  else
+    preg->newline_anchor = 0;
+  preg->no_sub = !!(cflags & REG_NOSUB);
+  preg->translate = NULL;
+
+  ret = re_compile_internal (preg, pattern, strlen (pattern), syntax);
+
+  /* POSIX doesn't distinguish between an unmatched open-group and an
+     unmatched close-group: both are REG_EPAREN.  */
+  if (ret == REG_ERPAREN)
+    ret = REG_EPAREN;
+
+  /* We have already checked preg->fastmap != NULL.  */
+  if (BE (ret == REG_NOERROR, 1))
+    /* Compute the fastmap now, since regexec cannot modify the pattern
+       buffer.  This function never fails in this implementation.  */
+    (void) re_compile_fastmap (preg);
+  else
+    {
+      /* Some error occurred while compiling the expression.  */
+      re_free (preg->fastmap);
+      preg->fastmap = NULL;
+    }
+
+  return (int) ret;
+}
+#ifdef _LIBC
+weak_alias (__regcomp, regcomp)
+#endif
+
+/* Returns a message corresponding to an error code, ERRCODE, returned
+   from either regcomp or regexec.   We don't use PREG here.  */
+
+size_t
+regerror (int errcode, const regex_t *_Restrict_ preg, char *_Restrict_ errbuf,
+	  size_t errbuf_size)
+{
+  const char *msg;
+  size_t msg_size;
+
+  if (BE (errcode < 0
+	  || errcode >= (int) (sizeof (__re_error_msgid_idx)
+			       / sizeof (__re_error_msgid_idx[0])), 0))
+    /* Only error codes returned by the rest of the code should be passed
+       to this routine.  If we are given anything else, or if other regex
+       code generates an invalid error code, then the program has a bug.
+       Dump core so we can fix it.  */
+    abort ();
+
+  msg = gettext (__re_error_msgid + __re_error_msgid_idx[errcode]);
+
+  msg_size = strlen (msg) + 1; /* Includes the null.  */
+
+  if (BE (errbuf_size != 0, 1))
+    {
+      size_t cpy_size = msg_size;
+      if (BE (msg_size > errbuf_size, 0))
+	{
+	  cpy_size = errbuf_size - 1;
+	  errbuf[cpy_size] = '\0';
+	}
+      memcpy (errbuf, msg, cpy_size);
+    }
+
+  return msg_size;
+}
+#ifdef _LIBC
+weak_alias (__regerror, regerror)
+#endif
+
+
+#ifdef RE_ENABLE_I18N
+/* This static array is used for the map to single-byte characters when
+   UTF-8 is used.  Otherwise we would allocate memory just to initialize
+   it the same all the time.  UTF-8 is the preferred encoding so this is
+   a worthwhile optimization.  */
+static const bitset_t utf8_sb_map =
+{
+  /* Set the first 128 bits.  */
+# if defined __GNUC__ && !defined __STRICT_ANSI__
+  [0 ... 0x80 / BITSET_WORD_BITS - 1] = BITSET_WORD_MAX
+# else
+#  if 4 * BITSET_WORD_BITS < ASCII_CHARS
+#   error "bitset_word_t is narrower than 32 bits"
+#  elif 3 * BITSET_WORD_BITS < ASCII_CHARS
+  BITSET_WORD_MAX, BITSET_WORD_MAX, BITSET_WORD_MAX,
+#  elif 2 * BITSET_WORD_BITS < ASCII_CHARS
+  BITSET_WORD_MAX, BITSET_WORD_MAX,
+#  elif 1 * BITSET_WORD_BITS < ASCII_CHARS
+  BITSET_WORD_MAX,
+#  endif
+  (BITSET_WORD_MAX
+   >> (SBC_MAX % BITSET_WORD_BITS == 0
+       ? 0
+       : BITSET_WORD_BITS - SBC_MAX % BITSET_WORD_BITS))
+# endif
+};
+#endif
+
+
+static void
+free_dfa_content (re_dfa_t *dfa)
+{
+  Idx i, j;
+
+  if (dfa->nodes)
+    for (i = 0; i < dfa->nodes_len; ++i)
+      free_token (dfa->nodes + i);
+  re_free (dfa->nexts);
+  for (i = 0; i < dfa->nodes_len; ++i)
+    {
+      if (dfa->eclosures != NULL)
+	re_node_set_free (dfa->eclosures + i);
+      if (dfa->inveclosures != NULL)
+	re_node_set_free (dfa->inveclosures + i);
+      if (dfa->edests != NULL)
+	re_node_set_free (dfa->edests + i);
+    }
+  re_free (dfa->edests);
+  re_free (dfa->eclosures);
+  re_free (dfa->inveclosures);
+  re_free (dfa->nodes);
+
+  if (dfa->state_table)
+    for (i = 0; i <= dfa->state_hash_mask; ++i)
+      {
+	struct re_state_table_entry *entry = dfa->state_table + i;
+	for (j = 0; j < entry->num; ++j)
+	  {
+	    re_dfastate_t *state = entry->array[j];
+	    free_state (state);
+	  }
+	re_free (entry->array);
+      }
+  re_free (dfa->state_table);
+#ifdef RE_ENABLE_I18N
+  if (dfa->sb_char != utf8_sb_map)
+    re_free (dfa->sb_char);
+#endif
+  re_free (dfa->subexp_map);
+#ifdef DEBUG
+  re_free (dfa->re_str);
+#endif
+
+  re_free (dfa);
+}
+
+
+/* Free dynamically allocated space used by PREG.  */
+
+void
+regfree (regex_t *preg)
+{
+  re_dfa_t *dfa = preg->buffer;
+  if (BE (dfa != NULL, 1))
+    {
+      lock_fini (dfa->lock);
+      free_dfa_content (dfa);
+    }
+  preg->buffer = NULL;
+  preg->allocated = 0;
+
+  re_free (preg->fastmap);
+  preg->fastmap = NULL;
+
+  re_free (preg->translate);
+  preg->translate = NULL;
+}
+#ifdef _LIBC
+weak_alias (__regfree, regfree)
+#endif
+
+/* Entry points compatible with 4.2 BSD regex library.  We don't define
+   them unless specifically requested.  */
+
+#if defined _REGEX_RE_COMP || defined _LIBC
+
+/* BSD has one and only one pattern buffer.  */
+static struct re_pattern_buffer re_comp_buf;
+
+char *
+# ifdef _LIBC
+/* Make these definitions weak in libc, so POSIX programs can redefine
+   these names if they don't use our functions, and still use
+   regcomp/regexec above without link errors.  */
+weak_function
+# endif
+re_comp (const char *s)
+{
+  reg_errcode_t ret;
+  char *fastmap;
+
+  if (!s)
+    {
+      if (!re_comp_buf.buffer)
+	return gettext ("No previous regular expression");
+      return 0;
+    }
+
+  if (re_comp_buf.buffer)
+    {
+      fastmap = re_comp_buf.fastmap;
+      re_comp_buf.fastmap = NULL;
+      __regfree (&re_comp_buf);
+      memset (&re_comp_buf, '\0', sizeof (re_comp_buf));
+      re_comp_buf.fastmap = fastmap;
+    }
+
+  if (re_comp_buf.fastmap == NULL)
+    {
+      re_comp_buf.fastmap = (char *) malloc (SBC_MAX);
+      if (re_comp_buf.fastmap == NULL)
+	return (char *) gettext (__re_error_msgid
+				 + __re_error_msgid_idx[(int) REG_ESPACE]);
+    }
+
+  /* Since 're_exec' always passes NULL for the 'regs' argument, we
+     don't need to initialize the pattern buffer fields which affect it.  */
+
+  /* Match anchors at newlines.  */
+  re_comp_buf.newline_anchor = 1;
+
+  ret = re_compile_internal (&re_comp_buf, s, strlen (s), re_syntax_options);
+
+  if (!ret)
+    return NULL;
+
+  /* Yes, we're discarding 'const' here if !HAVE_LIBINTL.  */
+  return (char *) gettext (__re_error_msgid + __re_error_msgid_idx[(int) ret]);
+}
+
+#ifdef _LIBC
+libc_freeres_fn (free_mem)
+{
+  __regfree (&re_comp_buf);
+}
+#endif
+
+#endif /* _REGEX_RE_COMP */
+
+/* Internal entry point.
+   Compile the regular expression PATTERN, whose length is LENGTH.
+   SYNTAX indicate regular expression's syntax.  */
+
+static reg_errcode_t
+re_compile_internal (regex_t *preg, const char * pattern, size_t length,
+		     reg_syntax_t syntax)
+{
+  reg_errcode_t err = REG_NOERROR;
+  re_dfa_t *dfa;
+  re_string_t regexp;
+
+  /* Initialize the pattern buffer.  */
+  preg->fastmap_accurate = 0;
+  preg->syntax = syntax;
+  preg->not_bol = preg->not_eol = 0;
+  preg->used = 0;
+  preg->re_nsub = 0;
+  preg->can_be_null = 0;
+  preg->regs_allocated = REGS_UNALLOCATED;
+
+  /* Initialize the dfa.  */
+  dfa = preg->buffer;
+  if (BE (preg->allocated < sizeof (re_dfa_t), 0))
+    {
+      /* If zero allocated, but buffer is non-null, try to realloc
+	 enough space.  This loses if buffer's address is bogus, but
+	 that is the user's responsibility.  If ->buffer is NULL this
+	 is a simple allocation.  */
+      dfa = re_realloc (preg->buffer, re_dfa_t, 1);
+      if (dfa == NULL)
+	return REG_ESPACE;
+      preg->allocated = sizeof (re_dfa_t);
+      preg->buffer = dfa;
+    }
+  preg->used = sizeof (re_dfa_t);
+
+  err = init_dfa (dfa, length);
+  if (BE (err == REG_NOERROR && lock_init (dfa->lock) != 0, 0))
+    err = REG_ESPACE;
+  if (BE (err != REG_NOERROR, 0))
+    {
+      free_dfa_content (dfa);
+      preg->buffer = NULL;
+      preg->allocated = 0;
+      return err;
+    }
+#ifdef DEBUG
+  /* Note: length+1 will not overflow since it is checked in init_dfa.  */
+  dfa->re_str = re_malloc (char, length + 1);
+  strncpy (dfa->re_str, pattern, length + 1);
+#endif
+
+  err = re_string_construct (&regexp, pattern, length, preg->translate,
+			     (syntax & RE_ICASE) != 0, dfa);
+  if (BE (err != REG_NOERROR, 0))
+    {
+    re_compile_internal_free_return:
+      free_workarea_compile (preg);
+      re_string_destruct (&regexp);
+      lock_fini (dfa->lock);
+      free_dfa_content (dfa);
+      preg->buffer = NULL;
+      preg->allocated = 0;
+      return err;
+    }
+
+  /* Parse the regular expression, and build a structure tree.  */
+  preg->re_nsub = 0;
+  dfa->str_tree = parse (&regexp, preg, syntax, &err);
+  if (BE (dfa->str_tree == NULL, 0))
+    goto re_compile_internal_free_return;
+
+  /* Analyze the tree and create the nfa.  */
+  err = analyze (preg);
+  if (BE (err != REG_NOERROR, 0))
+    goto re_compile_internal_free_return;
+
+#ifdef RE_ENABLE_I18N
+  /* If possible, do searching in single byte encoding to speed things up.  */
+  if (dfa->is_utf8 && !(syntax & RE_ICASE) && preg->translate == NULL)
+    optimize_utf8 (dfa);
+#endif
+
+  /* Then create the initial state of the dfa.  */
+  err = create_initial_state (dfa);
+
+  /* Release work areas.  */
+  free_workarea_compile (preg);
+  re_string_destruct (&regexp);
+
+  if (BE (err != REG_NOERROR, 0))
+    {
+      lock_fini (dfa->lock);
+      free_dfa_content (dfa);
+      preg->buffer = NULL;
+      preg->allocated = 0;
+    }
+
+  return err;
+}
+
+/* Initialize DFA.  We use the length of the regular expression PAT_LEN
+   as the initial length of some arrays.  */
+
+static reg_errcode_t
+init_dfa (re_dfa_t *dfa, size_t pat_len)
+{
+  __re_size_t table_size;
+#ifndef _LIBC
+  const char *codeset_name;
+#endif
+#ifdef RE_ENABLE_I18N
+  size_t max_i18n_object_size = MAX (sizeof (wchar_t), sizeof (wctype_t));
+#else
+  size_t max_i18n_object_size = 0;
+#endif
+  size_t max_object_size =
+    MAX (sizeof (struct re_state_table_entry),
+	 MAX (sizeof (re_token_t),
+	      MAX (sizeof (re_node_set),
+		   MAX (sizeof (regmatch_t),
+			max_i18n_object_size))));
+
+  memset (dfa, '\0', sizeof (re_dfa_t));
+
+  /* Force allocation of str_tree_storage the first time.  */
+  dfa->str_tree_storage_idx = BIN_TREE_STORAGE_SIZE;
+
+  /* Avoid overflows.  The extra "/ 2" is for the table_size doubling
+     calculation below, and for similar doubling calculations
+     elsewhere.  And it's <= rather than <, because some of the
+     doubling calculations add 1 afterwards.  */
+  if (BE (MIN (IDX_MAX, SIZE_MAX / max_object_size) / 2 <= pat_len, 0))
+    return REG_ESPACE;
+
+  dfa->nodes_alloc = pat_len + 1;
+  dfa->nodes = re_malloc (re_token_t, dfa->nodes_alloc);
+
+  /*  table_size = 2 ^ ceil(log pat_len) */
+  for (table_size = 1; ; table_size <<= 1)
+    if (table_size > pat_len)
+      break;
+
+  dfa->state_table = calloc (sizeof (struct re_state_table_entry), table_size);
+  dfa->state_hash_mask = table_size - 1;
+
+  dfa->mb_cur_max = MB_CUR_MAX;
+#ifdef _LIBC
+  if (dfa->mb_cur_max == 6
+      && strcmp (_NL_CURRENT (LC_CTYPE, _NL_CTYPE_CODESET_NAME), "UTF-8") == 0)
+    dfa->is_utf8 = 1;
+  dfa->map_notascii = (_NL_CURRENT_WORD (LC_CTYPE, _NL_CTYPE_MAP_TO_NONASCII)
+		       != 0);
+#else
+  codeset_name = nl_langinfo (CODESET);
+  if ((codeset_name[0] == 'U' || codeset_name[0] == 'u')
+      && (codeset_name[1] == 'T' || codeset_name[1] == 't')
+      && (codeset_name[2] == 'F' || codeset_name[2] == 'f')
+      && strcmp (codeset_name + 3 + (codeset_name[3] == '-'), "8") == 0)
+    dfa->is_utf8 = 1;
+
+  /* We check exhaustively in the loop below if this charset is a
+     superset of ASCII.  */
+  dfa->map_notascii = 0;
+#endif
+
+#ifdef RE_ENABLE_I18N
+  if (dfa->mb_cur_max > 1)
+    {
+      if (dfa->is_utf8)
+	dfa->sb_char = (re_bitset_ptr_t) utf8_sb_map;
+      else
+	{
+	  int i, j, ch;
+
+	  dfa->sb_char = (re_bitset_ptr_t) calloc (sizeof (bitset_t), 1);
+	  if (BE (dfa->sb_char == NULL, 0))
+	    return REG_ESPACE;
+
+	  /* Set the bits corresponding to single byte chars.  */
+	  for (i = 0, ch = 0; i < BITSET_WORDS; ++i)
+	    for (j = 0; j < BITSET_WORD_BITS; ++j, ++ch)
+	      {
+		wint_t wch = __btowc (ch);
+		if (wch != WEOF)
+		  dfa->sb_char[i] |= (bitset_word_t) 1 << j;
+# ifndef _LIBC
+		if (isascii (ch) && wch != ch)
+		  dfa->map_notascii = 1;
+# endif
+	      }
+	}
+    }
+#endif
+
+  if (BE (dfa->nodes == NULL || dfa->state_table == NULL, 0))
+    return REG_ESPACE;
+  return REG_NOERROR;
+}
+
+/* Initialize WORD_CHAR table, which indicate which character is
+   "word".  In this case "word" means that it is the word construction
+   character used by some operators like "\<", "\>", etc.  */
+
+static void
+internal_function
+init_word_char (re_dfa_t *dfa)
+{
+  int i = 0;
+  int j;
+  int ch = 0;
+  dfa->word_ops_used = 1;
+  if (BE (dfa->map_notascii == 0, 1))
+    {
+      bitset_word_t bits0 = 0x00000000;
+      bitset_word_t bits1 = 0x03ff0000;
+      bitset_word_t bits2 = 0x87fffffe;
+      bitset_word_t bits3 = 0x07fffffe;
+      if (BITSET_WORD_BITS == 64)
+	{
+	  dfa->word_char[0] = bits1 << 31 << 1 | bits0;
+	  dfa->word_char[1] = bits3 << 31 << 1 | bits2;
+	  i = 2;
+	}
+      else if (BITSET_WORD_BITS == 32)
+	{
+	  dfa->word_char[0] = bits0;
+	  dfa->word_char[1] = bits1;
+	  dfa->word_char[2] = bits2;
+	  dfa->word_char[3] = bits3;
+	  i = 4;
+	}
+      else
+        goto general_case;
+      ch = 128;
+
+      if (BE (dfa->is_utf8, 1))
+	{
+	  memset (&dfa->word_char[i], '\0', (SBC_MAX - ch) / 8);
+	  return;
+	}
+    }
+
+ general_case:
+  for (; i < BITSET_WORDS; ++i)
+    for (j = 0; j < BITSET_WORD_BITS; ++j, ++ch)
+      if (isalnum (ch) || ch == '_')
+	dfa->word_char[i] |= (bitset_word_t) 1 << j;
+}
+
+/* Free the work area which are only used while compiling.  */
+
+static void
+free_workarea_compile (regex_t *preg)
+{
+  re_dfa_t *dfa = preg->buffer;
+  bin_tree_storage_t *storage, *next;
+  for (storage = dfa->str_tree_storage; storage; storage = next)
+    {
+      next = storage->next;
+      re_free (storage);
+    }
+  dfa->str_tree_storage = NULL;
+  dfa->str_tree_storage_idx = BIN_TREE_STORAGE_SIZE;
+  dfa->str_tree = NULL;
+  re_free (dfa->org_indices);
+  dfa->org_indices = NULL;
+}
+
+/* Create initial states for all contexts.  */
+
+static reg_errcode_t
+create_initial_state (re_dfa_t *dfa)
+{
+  Idx first, i;
+  reg_errcode_t err;
+  re_node_set init_nodes;
+
+  /* Initial states have the epsilon closure of the node which is
+     the first node of the regular expression.  */
+  first = dfa->str_tree->first->node_idx;
+  dfa->init_node = first;
+  err = re_node_set_init_copy (&init_nodes, dfa->eclosures + first);
+  if (BE (err != REG_NOERROR, 0))
+    return err;
+
+  /* The back-references which are in initial states can epsilon transit,
+     since in this case all of the subexpressions can be null.
+     Then we add epsilon closures of the nodes which are the next nodes of
+     the back-references.  */
+  if (dfa->nbackref > 0)
+    for (i = 0; i < init_nodes.nelem; ++i)
+      {
+	Idx node_idx = init_nodes.elems[i];
+	re_token_type_t type = dfa->nodes[node_idx].type;
+
+	Idx clexp_idx;
+	if (type != OP_BACK_REF)
+	  continue;
+	for (clexp_idx = 0; clexp_idx < init_nodes.nelem; ++clexp_idx)
+	  {
+	    re_token_t *clexp_node;
+	    clexp_node = dfa->nodes + init_nodes.elems[clexp_idx];
+	    if (clexp_node->type == OP_CLOSE_SUBEXP
+		&& clexp_node->opr.idx == dfa->nodes[node_idx].opr.idx)
+	      break;
+	  }
+	if (clexp_idx == init_nodes.nelem)
+	  continue;
+
+	if (type == OP_BACK_REF)
+	  {
+	    Idx dest_idx = dfa->edests[node_idx].elems[0];
+	    if (!re_node_set_contains (&init_nodes, dest_idx))
+	      {
+		reg_errcode_t merge_err
+                  = re_node_set_merge (&init_nodes, dfa->eclosures + dest_idx);
+		if (merge_err != REG_NOERROR)
+		  return merge_err;
+		i = 0;
+	      }
+	  }
+      }
+
+  /* It must be the first time to invoke acquire_state.  */
+  dfa->init_state = re_acquire_state_context (&err, dfa, &init_nodes, 0);
+  /* We don't check ERR here, since the initial state must not be NULL.  */
+  if (BE (dfa->init_state == NULL, 0))
+    return err;
+  if (dfa->init_state->has_constraint)
+    {
+      dfa->init_state_word = re_acquire_state_context (&err, dfa, &init_nodes,
+						       CONTEXT_WORD);
+      dfa->init_state_nl = re_acquire_state_context (&err, dfa, &init_nodes,
+						     CONTEXT_NEWLINE);
+      dfa->init_state_begbuf = re_acquire_state_context (&err, dfa,
+							 &init_nodes,
+							 CONTEXT_NEWLINE
+							 | CONTEXT_BEGBUF);
+      if (BE (dfa->init_state_word == NULL || dfa->init_state_nl == NULL
+	      || dfa->init_state_begbuf == NULL, 0))
+	return err;
+    }
+  else
+    dfa->init_state_word = dfa->init_state_nl
+      = dfa->init_state_begbuf = dfa->init_state;
+
+  re_node_set_free (&init_nodes);
+  return REG_NOERROR;
+}
+
+#ifdef RE_ENABLE_I18N
+/* If it is possible to do searching in single byte encoding instead of UTF-8
+   to speed things up, set dfa->mb_cur_max to 1, clear is_utf8 and change
+   DFA nodes where needed.  */
+
+static void
+optimize_utf8 (re_dfa_t *dfa)
+{
+  Idx node;
+  int i;
+  bool mb_chars = false;
+  bool has_period = false;
+
+  for (node = 0; node < dfa->nodes_len; ++node)
+    switch (dfa->nodes[node].type)
+      {
+      case CHARACTER:
+	if (dfa->nodes[node].opr.c >= ASCII_CHARS)
+	  mb_chars = true;
+	break;
+      case ANCHOR:
+	switch (dfa->nodes[node].opr.ctx_type)
+	  {
+	  case LINE_FIRST:
+	  case LINE_LAST:
+	  case BUF_FIRST:
+	  case BUF_LAST:
+	    break;
+	  default:
+	    /* Word anchors etc. cannot be handled.  It's okay to test
+	       opr.ctx_type since constraints (for all DFA nodes) are
+	       created by ORing one or more opr.ctx_type values.  */
+	    return;
+	  }
+	break;
+      case OP_PERIOD:
+	has_period = true;
+	break;
+      case OP_BACK_REF:
+      case OP_ALT:
+      case END_OF_RE:
+      case OP_DUP_ASTERISK:
+      case OP_OPEN_SUBEXP:
+      case OP_CLOSE_SUBEXP:
+	break;
+      case COMPLEX_BRACKET:
+	return;
+      case SIMPLE_BRACKET:
+	/* Just double check.  */
+	{
+	  int rshift = (ASCII_CHARS % BITSET_WORD_BITS == 0
+			? 0
+			: BITSET_WORD_BITS - ASCII_CHARS % BITSET_WORD_BITS);
+	  for (i = ASCII_CHARS / BITSET_WORD_BITS; i < BITSET_WORDS; ++i)
+	    {
+	      if (dfa->nodes[node].opr.sbcset[i] >> rshift != 0)
+		return;
+	      rshift = 0;
+	    }
+	}
+	break;
+      default:
+	abort ();
+      }
+
+  if (mb_chars || has_period)
+    for (node = 0; node < dfa->nodes_len; ++node)
+      {
+	if (dfa->nodes[node].type == CHARACTER
+	    && dfa->nodes[node].opr.c >= ASCII_CHARS)
+	  dfa->nodes[node].mb_partial = 0;
+	else if (dfa->nodes[node].type == OP_PERIOD)
+	  dfa->nodes[node].type = OP_UTF8_PERIOD;
+      }
+
+  /* The search can be in single byte locale.  */
+  dfa->mb_cur_max = 1;
+  dfa->is_utf8 = 0;
+  dfa->has_mb_node = dfa->nbackref > 0 || has_period;
+}
+#endif
+
+/* Analyze the structure tree, and calculate "first", "next", "edest",
+   "eclosure", and "inveclosure".  */
+
+static reg_errcode_t
+analyze (regex_t *preg)
+{
+  re_dfa_t *dfa = preg->buffer;
+  reg_errcode_t ret;
+
+  /* Allocate arrays.  */
+  dfa->nexts = re_malloc (Idx, dfa->nodes_alloc);
+  dfa->org_indices = re_malloc (Idx, dfa->nodes_alloc);
+  dfa->edests = re_malloc (re_node_set, dfa->nodes_alloc);
+  dfa->eclosures = re_malloc (re_node_set, dfa->nodes_alloc);
+  if (BE (dfa->nexts == NULL || dfa->org_indices == NULL || dfa->edests == NULL
+	  || dfa->eclosures == NULL, 0))
+    return REG_ESPACE;
+
+  dfa->subexp_map = re_malloc (Idx, preg->re_nsub);
+  if (dfa->subexp_map != NULL)
+    {
+      Idx i;
+      for (i = 0; i < preg->re_nsub; i++)
+	dfa->subexp_map[i] = i;
+      preorder (dfa->str_tree, optimize_subexps, dfa);
+      for (i = 0; i < preg->re_nsub; i++)
+	if (dfa->subexp_map[i] != i)
+	  break;
+      if (i == preg->re_nsub)
+	{
+	  free (dfa->subexp_map);
+	  dfa->subexp_map = NULL;
+	}
+    }
+
+  ret = postorder (dfa->str_tree, lower_subexps, preg);
+  if (BE (ret != REG_NOERROR, 0))
+    return ret;
+  ret = postorder (dfa->str_tree, calc_first, dfa);
+  if (BE (ret != REG_NOERROR, 0))
+    return ret;
+  preorder (dfa->str_tree, calc_next, dfa);
+  ret = preorder (dfa->str_tree, link_nfa_nodes, dfa);
+  if (BE (ret != REG_NOERROR, 0))
+    return ret;
+  ret = calc_eclosure (dfa);
+  if (BE (ret != REG_NOERROR, 0))
+    return ret;
+
+  /* We only need this during the prune_impossible_nodes pass in regexec.c;
+     skip it if p_i_n will not run, as calc_inveclosure can be quadratic.  */
+  if ((!preg->no_sub && preg->re_nsub > 0 && dfa->has_plural_match)
+      || dfa->nbackref)
+    {
+      dfa->inveclosures = re_malloc (re_node_set, dfa->nodes_len);
+      if (BE (dfa->inveclosures == NULL, 0))
+	return REG_ESPACE;
+      ret = calc_inveclosure (dfa);
+    }
+
+  return ret;
+}
+
+/* Our parse trees are very unbalanced, so we cannot use a stack to
+   implement parse tree visits.  Instead, we use parent pointers and
+   some hairy code in these two functions.  */
+static reg_errcode_t
+postorder (bin_tree_t *root, reg_errcode_t (fn (void *, bin_tree_t *)),
+	   void *extra)
+{
+  bin_tree_t *node, *prev;
+
+  for (node = root; ; )
+    {
+      /* Descend down the tree, preferably to the left (or to the right
+	 if that's the only child).  */
+      while (node->left || node->right)
+	if (node->left)
+	  node = node->left;
+	else
+	  node = node->right;
+
+      do
+	{
+	  reg_errcode_t err = fn (extra, node);
+	  if (BE (err != REG_NOERROR, 0))
+	    return err;
+	  if (node->parent == NULL)
+	    return REG_NOERROR;
+	  prev = node;
+	  node = node->parent;
+	}
+      /* Go up while we have a node that is reached from the right.  */
+      while (node->right == prev || node->right == NULL);
+      node = node->right;
+    }
+}
+
+static reg_errcode_t
+preorder (bin_tree_t *root, reg_errcode_t (fn (void *, bin_tree_t *)),
+	  void *extra)
+{
+  bin_tree_t *node;
+
+  for (node = root; ; )
+    {
+      reg_errcode_t err = fn (extra, node);
+      if (BE (err != REG_NOERROR, 0))
+	return err;
+
+      /* Go to the left node, or up and to the right.  */
+      if (node->left)
+	node = node->left;
+      else
+	{
+	  bin_tree_t *prev = NULL;
+	  while (node->right == prev || node->right == NULL)
+	    {
+	      prev = node;
+	      node = node->parent;
+	      if (!node)
+		return REG_NOERROR;
+	    }
+	  node = node->right;
+	}
+    }
+}
+
+/* Optimization pass: if a SUBEXP is entirely contained, strip it and tell
+   re_search_internal to map the inner one's opr.idx to this one's.  Adjust
+   backreferences as well.  Requires a preorder visit.  */
+static reg_errcode_t
+optimize_subexps (void *extra, bin_tree_t *node)
+{
+  re_dfa_t *dfa = (re_dfa_t *) extra;
+
+  if (node->token.type == OP_BACK_REF && dfa->subexp_map)
+    {
+      int idx = node->token.opr.idx;
+      node->token.opr.idx = dfa->subexp_map[idx];
+      dfa->used_bkref_map |= 1 << node->token.opr.idx;
+    }
+
+  else if (node->token.type == SUBEXP
+	   && node->left && node->left->token.type == SUBEXP)
+    {
+      Idx other_idx = node->left->token.opr.idx;
+
+      node->left = node->left->left;
+      if (node->left)
+	node->left->parent = node;
+
+      dfa->subexp_map[other_idx] = dfa->subexp_map[node->token.opr.idx];
+      if (other_idx < BITSET_WORD_BITS)
+	dfa->used_bkref_map &= ~((bitset_word_t) 1 << other_idx);
+    }
+
+  return REG_NOERROR;
+}
+
+/* Lowering pass: Turn each SUBEXP node into the appropriate concatenation
+   of OP_OPEN_SUBEXP, the body of the SUBEXP (if any) and OP_CLOSE_SUBEXP.  */
+static reg_errcode_t
+lower_subexps (void *extra, bin_tree_t *node)
+{
+  regex_t *preg = (regex_t *) extra;
+  reg_errcode_t err = REG_NOERROR;
+
+  if (node->left && node->left->token.type == SUBEXP)
+    {
+      node->left = lower_subexp (&err, preg, node->left);
+      if (node->left)
+	node->left->parent = node;
+    }
+  if (node->right && node->right->token.type == SUBEXP)
+    {
+      node->right = lower_subexp (&err, preg, node->right);
+      if (node->right)
+	node->right->parent = node;
+    }
+
+  return err;
+}
+
+static bin_tree_t *
+lower_subexp (reg_errcode_t *err, regex_t *preg, bin_tree_t *node)
+{
+  re_dfa_t *dfa = preg->buffer;
+  bin_tree_t *body = node->left;
+  bin_tree_t *op, *cls, *tree1, *tree;
+
+  if (preg->no_sub
+      /* We do not optimize empty subexpressions, because otherwise we may
+	 have bad CONCAT nodes with NULL children.  This is obviously not
+	 very common, so we do not lose much.  An example that triggers
+	 this case is the sed "script" /\(\)/x.  */
+      && node->left != NULL
+      && (node->token.opr.idx >= BITSET_WORD_BITS
+	  || !(dfa->used_bkref_map
+	       & ((bitset_word_t) 1 << node->token.opr.idx))))
+    return node->left;
+
+  /* Convert the SUBEXP node to the concatenation of an
+     OP_OPEN_SUBEXP, the contents, and an OP_CLOSE_SUBEXP.  */
+  op = create_tree (dfa, NULL, NULL, OP_OPEN_SUBEXP);
+  cls = create_tree (dfa, NULL, NULL, OP_CLOSE_SUBEXP);
+  tree1 = body ? create_tree (dfa, body, cls, CONCAT) : cls;
+  tree = create_tree (dfa, op, tree1, CONCAT);
+  if (BE (tree == NULL || tree1 == NULL || op == NULL || cls == NULL, 0))
+    {
+      *err = REG_ESPACE;
+      return NULL;
+    }
+
+  op->token.opr.idx = cls->token.opr.idx = node->token.opr.idx;
+  op->token.opt_subexp = cls->token.opt_subexp = node->token.opt_subexp;
+  return tree;
+}
+
+/* Pass 1 in building the NFA: compute FIRST and create unlinked automaton
+   nodes.  Requires a postorder visit.  */
+static reg_errcode_t
+calc_first (void *extra, bin_tree_t *node)
+{
+  re_dfa_t *dfa = (re_dfa_t *) extra;
+  if (node->token.type == CONCAT)
+    {
+      node->first = node->left->first;
+      node->node_idx = node->left->node_idx;
+    }
+  else
+    {
+      node->first = node;
+      node->node_idx = re_dfa_add_node (dfa, node->token);
+      if (BE (node->node_idx == -1, 0))
+	return REG_ESPACE;
+      if (node->token.type == ANCHOR)
+	dfa->nodes[node->node_idx].constraint = node->token.opr.ctx_type;
+    }
+  return REG_NOERROR;
+}
+
+/* Pass 2: compute NEXT on the tree.  Preorder visit.  */
+static reg_errcode_t
+calc_next (void *extra, bin_tree_t *node)
+{
+  switch (node->token.type)
+    {
+    case OP_DUP_ASTERISK:
+      node->left->next = node;
+      break;
+    case CONCAT:
+      node->left->next = node->right->first;
+      node->right->next = node->next;
+      break;
+    default:
+      if (node->left)
+	node->left->next = node->next;
+      if (node->right)
+	node->right->next = node->next;
+      break;
+    }
+  return REG_NOERROR;
+}
+
+/* Pass 3: link all DFA nodes to their NEXT node (any order will do).  */
+static reg_errcode_t
+link_nfa_nodes (void *extra, bin_tree_t *node)
+{
+  re_dfa_t *dfa = (re_dfa_t *) extra;
+  Idx idx = node->node_idx;
+  reg_errcode_t err = REG_NOERROR;
+
+  switch (node->token.type)
+    {
+    case CONCAT:
+      break;
+
+    case END_OF_RE:
+      assert (node->next == NULL);
+      break;
+
+    case OP_DUP_ASTERISK:
+    case OP_ALT:
+      {
+	Idx left, right;
+	dfa->has_plural_match = 1;
+	if (node->left != NULL)
+	  left = node->left->first->node_idx;
+	else
+	  left = node->next->node_idx;
+	if (node->right != NULL)
+	  right = node->right->first->node_idx;
+	else
+	  right = node->next->node_idx;
+	assert (left > -1);
+	assert (right > -1);
+	err = re_node_set_init_2 (dfa->edests + idx, left, right);
+      }
+      break;
+
+    case ANCHOR:
+    case OP_OPEN_SUBEXP:
+    case OP_CLOSE_SUBEXP:
+      err = re_node_set_init_1 (dfa->edests + idx, node->next->node_idx);
+      break;
+
+    case OP_BACK_REF:
+      dfa->nexts[idx] = node->next->node_idx;
+      if (node->token.type == OP_BACK_REF)
+	err = re_node_set_init_1 (dfa->edests + idx, dfa->nexts[idx]);
+      break;
+
+    default:
+      assert (!IS_EPSILON_NODE (node->token.type));
+      dfa->nexts[idx] = node->next->node_idx;
+      break;
+    }
+
+  return err;
+}
+
+/* Duplicate the epsilon closure of the node ROOT_NODE.
+   Note that duplicated nodes have constraint INIT_CONSTRAINT in addition
+   to their own constraint.  */
+
+static reg_errcode_t
+internal_function
+duplicate_node_closure (re_dfa_t *dfa, Idx top_org_node, Idx top_clone_node,
+			Idx root_node, unsigned int init_constraint)
+{
+  Idx org_node, clone_node;
+  bool ok;
+  unsigned int constraint = init_constraint;
+  for (org_node = top_org_node, clone_node = top_clone_node;;)
+    {
+      Idx org_dest, clone_dest;
+      if (dfa->nodes[org_node].type == OP_BACK_REF)
+	{
+	  /* If the back reference epsilon-transit, its destination must
+	     also have the constraint.  Then duplicate the epsilon closure
+	     of the destination of the back reference, and store it in
+	     edests of the back reference.  */
+	  org_dest = dfa->nexts[org_node];
+	  re_node_set_empty (dfa->edests + clone_node);
+	  clone_dest = duplicate_node (dfa, org_dest, constraint);
+	  if (BE (clone_dest == -1, 0))
+	    return REG_ESPACE;
+	  dfa->nexts[clone_node] = dfa->nexts[org_node];
+	  ok = re_node_set_insert (dfa->edests + clone_node, clone_dest);
+	  if (BE (! ok, 0))
+	    return REG_ESPACE;
+	}
+      else if (dfa->edests[org_node].nelem == 0)
+	{
+	  /* In case of the node can't epsilon-transit, don't duplicate the
+	     destination and store the original destination as the
+	     destination of the node.  */
+	  dfa->nexts[clone_node] = dfa->nexts[org_node];
+	  break;
+	}
+      else if (dfa->edests[org_node].nelem == 1)
+	{
+	  /* In case of the node can epsilon-transit, and it has only one
+	     destination.  */
+	  org_dest = dfa->edests[org_node].elems[0];
+	  re_node_set_empty (dfa->edests + clone_node);
+	  /* If the node is root_node itself, it means the epsilon closure
+	     has a loop.  Then tie it to the destination of the root_node.  */
+	  if (org_node == root_node && clone_node != org_node)
+	    {
+	      ok = re_node_set_insert (dfa->edests + clone_node, org_dest);
+	      if (BE (! ok, 0))
+	        return REG_ESPACE;
+	      break;
+	    }
+	  /* In case the node has another constraint, append it.  */
+	  constraint |= dfa->nodes[org_node].constraint;
+	  clone_dest = duplicate_node (dfa, org_dest, constraint);
+	  if (BE (clone_dest == -1, 0))
+	    return REG_ESPACE;
+	  ok = re_node_set_insert (dfa->edests + clone_node, clone_dest);
+	  if (BE (! ok, 0))
+	    return REG_ESPACE;
+	}
+      else /* dfa->edests[org_node].nelem == 2 */
+	{
+	  /* In case of the node can epsilon-transit, and it has two
+	     destinations. In the bin_tree_t and DFA, that's '|' and '*'.   */
+	  org_dest = dfa->edests[org_node].elems[0];
+	  re_node_set_empty (dfa->edests + clone_node);
+	  /* Search for a duplicated node which satisfies the constraint.  */
+	  clone_dest = search_duplicated_node (dfa, org_dest, constraint);
+	  if (clone_dest == -1)
+	    {
+	      /* There is no such duplicated node, create a new one.  */
+	      reg_errcode_t err;
+	      clone_dest = duplicate_node (dfa, org_dest, constraint);
+	      if (BE (clone_dest == -1, 0))
+		return REG_ESPACE;
+	      ok = re_node_set_insert (dfa->edests + clone_node, clone_dest);
+	      if (BE (! ok, 0))
+		return REG_ESPACE;
+	      err = duplicate_node_closure (dfa, org_dest, clone_dest,
+					    root_node, constraint);
+	      if (BE (err != REG_NOERROR, 0))
+		return err;
+	    }
+	  else
+	    {
+	      /* There is a duplicated node which satisfies the constraint,
+		 use it to avoid infinite loop.  */
+	      ok = re_node_set_insert (dfa->edests + clone_node, clone_dest);
+	      if (BE (! ok, 0))
+		return REG_ESPACE;
+	    }
+
+	  org_dest = dfa->edests[org_node].elems[1];
+	  clone_dest = duplicate_node (dfa, org_dest, constraint);
+	  if (BE (clone_dest == -1, 0))
+	    return REG_ESPACE;
+	  ok = re_node_set_insert (dfa->edests + clone_node, clone_dest);
+	  if (BE (! ok, 0))
+	    return REG_ESPACE;
+	}
+      org_node = org_dest;
+      clone_node = clone_dest;
+    }
+  return REG_NOERROR;
+}
+
+/* Search for a node which is duplicated from the node ORG_NODE, and
+   satisfies the constraint CONSTRAINT.  */
+
+static Idx
+search_duplicated_node (const re_dfa_t *dfa, Idx org_node,
+			unsigned int constraint)
+{
+  Idx idx;
+  for (idx = dfa->nodes_len - 1; dfa->nodes[idx].duplicated && idx > 0; --idx)
+    {
+      if (org_node == dfa->org_indices[idx]
+	  && constraint == dfa->nodes[idx].constraint)
+	return idx; /* Found.  */
+    }
+  return -1; /* Not found.  */
+}
+
+/* Duplicate the node whose index is ORG_IDX and set the constraint CONSTRAINT.
+   Return the index of the new node, or -1 if insufficient storage is
+   available.  */
+
+static Idx
+duplicate_node (re_dfa_t *dfa, Idx org_idx, unsigned int constraint)
+{
+  Idx dup_idx = re_dfa_add_node (dfa, dfa->nodes[org_idx]);
+  if (BE (dup_idx != -1, 1))
+    {
+      dfa->nodes[dup_idx].constraint = constraint;
+      dfa->nodes[dup_idx].constraint |= dfa->nodes[org_idx].constraint;
+      dfa->nodes[dup_idx].duplicated = 1;
+
+      /* Store the index of the original node.  */
+      dfa->org_indices[dup_idx] = org_idx;
+    }
+  return dup_idx;
+}
+
+static reg_errcode_t
+calc_inveclosure (re_dfa_t *dfa)
+{
+  Idx src, idx;
+  bool ok;
+  for (idx = 0; idx < dfa->nodes_len; ++idx)
+    re_node_set_init_empty (dfa->inveclosures + idx);
+
+  for (src = 0; src < dfa->nodes_len; ++src)
+    {
+      Idx *elems = dfa->eclosures[src].elems;
+      for (idx = 0; idx < dfa->eclosures[src].nelem; ++idx)
+	{
+	  ok = re_node_set_insert_last (dfa->inveclosures + elems[idx], src);
+	  if (BE (! ok, 0))
+	    return REG_ESPACE;
+	}
+    }
+
+  return REG_NOERROR;
+}
+
+/* Calculate "eclosure" for all the node in DFA.  */
+
+static reg_errcode_t
+calc_eclosure (re_dfa_t *dfa)
+{
+  Idx node_idx;
+  bool incomplete;
+#ifdef DEBUG
+  assert (dfa->nodes_len > 0);
+#endif
+  incomplete = false;
+  /* For each nodes, calculate epsilon closure.  */
+  for (node_idx = 0; ; ++node_idx)
+    {
+      reg_errcode_t err;
+      re_node_set eclosure_elem;
+      if (node_idx == dfa->nodes_len)
+	{
+	  if (!incomplete)
+	    break;
+	  incomplete = false;
+	  node_idx = 0;
+	}
+
+#ifdef DEBUG
+      assert (dfa->eclosures[node_idx].nelem != -1);
+#endif
+
+      /* If we have already calculated, skip it.  */
+      if (dfa->eclosures[node_idx].nelem != 0)
+	continue;
+      /* Calculate epsilon closure of 'node_idx'.  */
+      err = calc_eclosure_iter (&eclosure_elem, dfa, node_idx, true);
+      if (BE (err != REG_NOERROR, 0))
+	return err;
+
+      if (dfa->eclosures[node_idx].nelem == 0)
+	{
+	  incomplete = true;
+	  re_node_set_free (&eclosure_elem);
+	}
+    }
+  return REG_NOERROR;
+}
+
+/* Calculate epsilon closure of NODE.  */
+
+static reg_errcode_t
+calc_eclosure_iter (re_node_set *new_set, re_dfa_t *dfa, Idx node, bool root)
+{
+  reg_errcode_t err;
+  Idx i;
+  re_node_set eclosure;
+  bool ok;
+  bool incomplete = false;
+  err = re_node_set_alloc (&eclosure, dfa->edests[node].nelem + 1);
+  if (BE (err != REG_NOERROR, 0))
+    return err;
+
+  /* This indicates that we are calculating this node now.
+     We reference this value to avoid infinite loop.  */
+  dfa->eclosures[node].nelem = -1;
+
+  /* If the current node has constraints, duplicate all nodes
+     since they must inherit the constraints.  */
+  if (dfa->nodes[node].constraint
+      && dfa->edests[node].nelem
+      && !dfa->nodes[dfa->edests[node].elems[0]].duplicated)
+    {
+      err = duplicate_node_closure (dfa, node, node, node,
+				    dfa->nodes[node].constraint);
+      if (BE (err != REG_NOERROR, 0))
+	return err;
+    }
+
+  /* Expand each epsilon destination nodes.  */
+  if (IS_EPSILON_NODE(dfa->nodes[node].type))
+    for (i = 0; i < dfa->edests[node].nelem; ++i)
+      {
+	re_node_set eclosure_elem;
+	Idx edest = dfa->edests[node].elems[i];
+	/* If calculating the epsilon closure of 'edest' is in progress,
+	   return intermediate result.  */
+	if (dfa->eclosures[edest].nelem == -1)
+	  {
+	    incomplete = true;
+	    continue;
+	  }
+	/* If we haven't calculated the epsilon closure of 'edest' yet,
+	   calculate now. Otherwise use calculated epsilon closure.  */
+	if (dfa->eclosures[edest].nelem == 0)
+	  {
+	    err = calc_eclosure_iter (&eclosure_elem, dfa, edest, false);
+	    if (BE (err != REG_NOERROR, 0))
+	      return err;
+	  }
+	else
+	  eclosure_elem = dfa->eclosures[edest];
+	/* Merge the epsilon closure of 'edest'.  */
+	err = re_node_set_merge (&eclosure, &eclosure_elem);
+	if (BE (err != REG_NOERROR, 0))
+	  return err;
+	/* If the epsilon closure of 'edest' is incomplete,
+	   the epsilon closure of this node is also incomplete.  */
+	if (dfa->eclosures[edest].nelem == 0)
+	  {
+	    incomplete = true;
+	    re_node_set_free (&eclosure_elem);
+	  }
+      }
+
+  /* An epsilon closure includes itself.  */
+  ok = re_node_set_insert (&eclosure, node);
+  if (BE (! ok, 0))
+    return REG_ESPACE;
+  if (incomplete && !root)
+    dfa->eclosures[node].nelem = 0;
+  else
+    dfa->eclosures[node] = eclosure;
+  *new_set = eclosure;
+  return REG_NOERROR;
+}
+
+/* Functions for token which are used in the parser.  */
+
+/* Fetch a token from INPUT.
+   We must not use this function inside bracket expressions.  */
+
+static void
+internal_function
+fetch_token (re_token_t *result, re_string_t *input, reg_syntax_t syntax)
+{
+  re_string_skip_bytes (input, peek_token (result, input, syntax));
+}
+
+/* Peek a token from INPUT, and return the length of the token.
+   We must not use this function inside bracket expressions.  */
+
+static int
+internal_function
+peek_token (re_token_t *token, re_string_t *input, reg_syntax_t syntax)
+{
+  unsigned char c;
+
+  if (re_string_eoi (input))
+    {
+      token->type = END_OF_RE;
+      return 0;
+    }
+
+  c = re_string_peek_byte (input, 0);
+  token->opr.c = c;
+
+  token->word_char = 0;
+#ifdef RE_ENABLE_I18N
+  token->mb_partial = 0;
+  if (input->mb_cur_max > 1 &&
+      !re_string_first_byte (input, re_string_cur_idx (input)))
+    {
+      token->type = CHARACTER;
+      token->mb_partial = 1;
+      return 1;
+    }
+#endif
+  if (c == '\\')
+    {
+      unsigned char c2;
+      if (re_string_cur_idx (input) + 1 >= re_string_length (input))
+	{
+	  token->type = BACK_SLASH;
+	  return 1;
+	}
+
+      c2 = re_string_peek_byte_case (input, 1);
+      token->opr.c = c2;
+      token->type = CHARACTER;
+#ifdef RE_ENABLE_I18N
+      if (input->mb_cur_max > 1)
+	{
+	  wint_t wc = re_string_wchar_at (input,
+					  re_string_cur_idx (input) + 1);
+	  token->word_char = IS_WIDE_WORD_CHAR (wc) != 0;
+	}
+      else
+#endif
+	token->word_char = IS_WORD_CHAR (c2) != 0;
+
+      switch (c2)
+	{
+	case '|':
+	  if (!(syntax & RE_LIMITED_OPS) && !(syntax & RE_NO_BK_VBAR))
+	    token->type = OP_ALT;
+	  break;
+	case '1': case '2': case '3': case '4': case '5':
+	case '6': case '7': case '8': case '9':
+	  if (!(syntax & RE_NO_BK_REFS))
+	    {
+	      token->type = OP_BACK_REF;
+	      token->opr.idx = c2 - '1';
+	    }
+	  break;
+	case '<':
+	  if (!(syntax & RE_NO_GNU_OPS))
+	    {
+	      token->type = ANCHOR;
+	      token->opr.ctx_type = WORD_FIRST;
+	    }
+	  break;
+	case '>':
+	  if (!(syntax & RE_NO_GNU_OPS))
+	    {
+	      token->type = ANCHOR;
+	      token->opr.ctx_type = WORD_LAST;
+	    }
+	  break;
+	case 'b':
+	  if (!(syntax & RE_NO_GNU_OPS))
+	    {
+	      token->type = ANCHOR;
+	      token->opr.ctx_type = WORD_DELIM;
+	    }
+	  break;
+	case 'B':
+	  if (!(syntax & RE_NO_GNU_OPS))
+	    {
+	      token->type = ANCHOR;
+	      token->opr.ctx_type = NOT_WORD_DELIM;
+	    }
+	  break;
+	case 'w':
+	  if (!(syntax & RE_NO_GNU_OPS))
+	    token->type = OP_WORD;
+	  break;
+	case 'W':
+	  if (!(syntax & RE_NO_GNU_OPS))
+	    token->type = OP_NOTWORD;
+	  break;
+	case 's':
+	  if (!(syntax & RE_NO_GNU_OPS))
+	    token->type = OP_SPACE;
+	  break;
+	case 'S':
+	  if (!(syntax & RE_NO_GNU_OPS))
+	    token->type = OP_NOTSPACE;
+	  break;
+	case '`':
+	  if (!(syntax & RE_NO_GNU_OPS))
+	    {
+	      token->type = ANCHOR;
+	      token->opr.ctx_type = BUF_FIRST;
+	    }
+	  break;
+	case '\'':
+	  if (!(syntax & RE_NO_GNU_OPS))
+	    {
+	      token->type = ANCHOR;
+	      token->opr.ctx_type = BUF_LAST;
+	    }
+	  break;
+	case '(':
+	  if (!(syntax & RE_NO_BK_PARENS))
+	    token->type = OP_OPEN_SUBEXP;
+	  break;
+	case ')':
+	  if (!(syntax & RE_NO_BK_PARENS))
+	    token->type = OP_CLOSE_SUBEXP;
+	  break;
+	case '+':
+	  if (!(syntax & RE_LIMITED_OPS) && (syntax & RE_BK_PLUS_QM))
+	    token->type = OP_DUP_PLUS;
+	  break;
+	case '?':
+	  if (!(syntax & RE_LIMITED_OPS) && (syntax & RE_BK_PLUS_QM))
+	    token->type = OP_DUP_QUESTION;
+	  break;
+	case '{':
+	  if ((syntax & RE_INTERVALS) && (!(syntax & RE_NO_BK_BRACES)))
+	    token->type = OP_OPEN_DUP_NUM;
+	  break;
+	case '}':
+	  if ((syntax & RE_INTERVALS) && (!(syntax & RE_NO_BK_BRACES)))
+	    token->type = OP_CLOSE_DUP_NUM;
+	  break;
+	default:
+	  break;
+	}
+      return 2;
+    }
+
+  token->type = CHARACTER;
+#ifdef RE_ENABLE_I18N
+  if (input->mb_cur_max > 1)
+    {
+      wint_t wc = re_string_wchar_at (input, re_string_cur_idx (input));
+      token->word_char = IS_WIDE_WORD_CHAR (wc) != 0;
+    }
+  else
+#endif
+    token->word_char = IS_WORD_CHAR (token->opr.c);
+
+  switch (c)
+    {
+    case '\n':
+      if (syntax & RE_NEWLINE_ALT)
+	token->type = OP_ALT;
+      break;
+    case '|':
+      if (!(syntax & RE_LIMITED_OPS) && (syntax & RE_NO_BK_VBAR))
+	token->type = OP_ALT;
+      break;
+    case '*':
+      token->type = OP_DUP_ASTERISK;
+      break;
+    case '+':
+      if (!(syntax & RE_LIMITED_OPS) && !(syntax & RE_BK_PLUS_QM))
+	token->type = OP_DUP_PLUS;
+      break;
+    case '?':
+      if (!(syntax & RE_LIMITED_OPS) && !(syntax & RE_BK_PLUS_QM))
+	token->type = OP_DUP_QUESTION;
+      break;
+    case '{':
+      if ((syntax & RE_INTERVALS) && (syntax & RE_NO_BK_BRACES))
+	token->type = OP_OPEN_DUP_NUM;
+      break;
+    case '}':
+      if ((syntax & RE_INTERVALS) && (syntax & RE_NO_BK_BRACES))
+	token->type = OP_CLOSE_DUP_NUM;
+      break;
+    case '(':
+      if (syntax & RE_NO_BK_PARENS)
+	token->type = OP_OPEN_SUBEXP;
+      break;
+    case ')':
+      if (syntax & RE_NO_BK_PARENS)
+	token->type = OP_CLOSE_SUBEXP;
+      break;
+    case '[':
+      token->type = OP_OPEN_BRACKET;
+      break;
+    case '.':
+      token->type = OP_PERIOD;
+      break;
+    case '^':
+      if (!(syntax & (RE_CONTEXT_INDEP_ANCHORS | RE_CARET_ANCHORS_HERE)) &&
+	  re_string_cur_idx (input) != 0)
+	{
+	  char prev = re_string_peek_byte (input, -1);
+	  if (!(syntax & RE_NEWLINE_ALT) || prev != '\n')
+	    break;
+	}
+      token->type = ANCHOR;
+      token->opr.ctx_type = LINE_FIRST;
+      break;
+    case '$':
+      if (!(syntax & RE_CONTEXT_INDEP_ANCHORS) &&
+	  re_string_cur_idx (input) + 1 != re_string_length (input))
+	{
+	  re_token_t next;
+	  re_string_skip_bytes (input, 1);
+	  peek_token (&next, input, syntax);
+	  re_string_skip_bytes (input, -1);
+	  if (next.type != OP_ALT && next.type != OP_CLOSE_SUBEXP)
+	    break;
+	}
+      token->type = ANCHOR;
+      token->opr.ctx_type = LINE_LAST;
+      break;
+    default:
+      break;
+    }
+  return 1;
+}
+
+/* Peek a token from INPUT, and return the length of the token.
+   We must not use this function out of bracket expressions.  */
+
+static int
+internal_function
+peek_token_bracket (re_token_t *token, re_string_t *input, reg_syntax_t syntax)
+{
+  unsigned char c;
+  if (re_string_eoi (input))
+    {
+      token->type = END_OF_RE;
+      return 0;
+    }
+  c = re_string_peek_byte (input, 0);
+  token->opr.c = c;
+
+#ifdef RE_ENABLE_I18N
+  if (input->mb_cur_max > 1 &&
+      !re_string_first_byte (input, re_string_cur_idx (input)))
+    {
+      token->type = CHARACTER;
+      return 1;
+    }
+#endif /* RE_ENABLE_I18N */
+
+  if (c == '\\' && (syntax & RE_BACKSLASH_ESCAPE_IN_LISTS)
+      && re_string_cur_idx (input) + 1 < re_string_length (input))
+    {
+      /* In this case, '\' escape a character.  */
+      unsigned char c2;
+      re_string_skip_bytes (input, 1);
+      c2 = re_string_peek_byte (input, 0);
+      token->opr.c = c2;
+      token->type = CHARACTER;
+      return 1;
+    }
+  if (c == '[') /* '[' is a special char in a bracket exps.  */
+    {
+      unsigned char c2;
+      int token_len;
+      if (re_string_cur_idx (input) + 1 < re_string_length (input))
+	c2 = re_string_peek_byte (input, 1);
+      else
+	c2 = 0;
+      token->opr.c = c2;
+      token_len = 2;
+      switch (c2)
+	{
+	case '.':
+	  token->type = OP_OPEN_COLL_ELEM;
+	  break;
+
+	case '=':
+	  token->type = OP_OPEN_EQUIV_CLASS;
+	  break;
+
+	case ':':
+	  if (syntax & RE_CHAR_CLASSES)
+	    {
+	      token->type = OP_OPEN_CHAR_CLASS;
+	      break;
+	    }
+	  FALLTHROUGH;
+	default:
+	  token->type = CHARACTER;
+	  token->opr.c = c;
+	  token_len = 1;
+	  break;
+	}
+      return token_len;
+    }
+  switch (c)
+    {
+    case '-':
+      token->type = OP_CHARSET_RANGE;
+      break;
+    case ']':
+      token->type = OP_CLOSE_BRACKET;
+      break;
+    case '^':
+      token->type = OP_NON_MATCH_LIST;
+      break;
+    default:
+      token->type = CHARACTER;
+    }
+  return 1;
+}
+
+/* Functions for parser.  */
+
+/* Entry point of the parser.
+   Parse the regular expression REGEXP and return the structure tree.
+   If an error occurs, ERR is set by error code, and return NULL.
+   This function build the following tree, from regular expression <reg_exp>:
+	   CAT
+	   / \
+	  /   \
+   <reg_exp>  EOR
+
+   CAT means concatenation.
+   EOR means end of regular expression.  */
+
+static bin_tree_t *
+parse (re_string_t *regexp, regex_t *preg, reg_syntax_t syntax,
+       reg_errcode_t *err)
+{
+  re_dfa_t *dfa = preg->buffer;
+  bin_tree_t *tree, *eor, *root;
+  re_token_t current_token;
+  dfa->syntax = syntax;
+  fetch_token (&current_token, regexp, syntax | RE_CARET_ANCHORS_HERE);
+  tree = parse_reg_exp (regexp, preg, &current_token, syntax, 0, err);
+  if (BE (*err != REG_NOERROR && tree == NULL, 0))
+    return NULL;
+  eor = create_tree (dfa, NULL, NULL, END_OF_RE);
+  if (tree != NULL)
+    root = create_tree (dfa, tree, eor, CONCAT);
+  else
+    root = eor;
+  if (BE (eor == NULL || root == NULL, 0))
+    {
+      *err = REG_ESPACE;
+      return NULL;
+    }
+  return root;
+}
+
+/* This function build the following tree, from regular expression
+   <branch1>|<branch2>:
+	   ALT
+	   / \
+	  /   \
+   <branch1> <branch2>
+
+   ALT means alternative, which represents the operator '|'.  */
+
+static bin_tree_t *
+parse_reg_exp (re_string_t *regexp, regex_t *preg, re_token_t *token,
+	       reg_syntax_t syntax, Idx nest, reg_errcode_t *err)
+{
+  re_dfa_t *dfa = preg->buffer;
+  bin_tree_t *tree, *branch = NULL;
+  bitset_word_t initial_bkref_map = dfa->completed_bkref_map;
+  tree = parse_branch (regexp, preg, token, syntax, nest, err);
+  if (BE (*err != REG_NOERROR && tree == NULL, 0))
+    return NULL;
+
+  while (token->type == OP_ALT)
+    {
+      fetch_token (token, regexp, syntax | RE_CARET_ANCHORS_HERE);
+      if (token->type != OP_ALT && token->type != END_OF_RE
+	  && (nest == 0 || token->type != OP_CLOSE_SUBEXP))
+	{
+	  bitset_word_t accumulated_bkref_map = dfa->completed_bkref_map;
+	  dfa->completed_bkref_map = initial_bkref_map;
+	  branch = parse_branch (regexp, preg, token, syntax, nest, err);
+	  if (BE (*err != REG_NOERROR && branch == NULL, 0))
+	    {
+	      if (tree != NULL)
+		postorder (tree, free_tree, NULL);
+	      return NULL;
+	    }
+	  dfa->completed_bkref_map |= accumulated_bkref_map;
+	}
+      else
+	branch = NULL;
+      tree = create_tree (dfa, tree, branch, OP_ALT);
+      if (BE (tree == NULL, 0))
+	{
+	  *err = REG_ESPACE;
+	  return NULL;
+	}
+    }
+  return tree;
+}
+
+/* This function build the following tree, from regular expression
+   <exp1><exp2>:
+	CAT
+	/ \
+       /   \
+   <exp1> <exp2>
+
+   CAT means concatenation.  */
+
+static bin_tree_t *
+parse_branch (re_string_t *regexp, regex_t *preg, re_token_t *token,
+	      reg_syntax_t syntax, Idx nest, reg_errcode_t *err)
+{
+  bin_tree_t *tree, *expr;
+  re_dfa_t *dfa = preg->buffer;
+  tree = parse_expression (regexp, preg, token, syntax, nest, err);
+  if (BE (*err != REG_NOERROR && tree == NULL, 0))
+    return NULL;
+
+  while (token->type != OP_ALT && token->type != END_OF_RE
+	 && (nest == 0 || token->type != OP_CLOSE_SUBEXP))
+    {
+      expr = parse_expression (regexp, preg, token, syntax, nest, err);
+      if (BE (*err != REG_NOERROR && expr == NULL, 0))
+	{
+	  if (tree != NULL)
+	    postorder (tree, free_tree, NULL);
+	  return NULL;
+	}
+      if (tree != NULL && expr != NULL)
+	{
+	  bin_tree_t *newtree = create_tree (dfa, tree, expr, CONCAT);
+	  if (newtree == NULL)
+	    {
+	      postorder (expr, free_tree, NULL);
+	      postorder (tree, free_tree, NULL);
+	      *err = REG_ESPACE;
+	      return NULL;
+	    }
+	  tree = newtree;
+	}
+      else if (tree == NULL)
+	tree = expr;
+      /* Otherwise expr == NULL, we don't need to create new tree.  */
+    }
+  return tree;
+}
+
+/* This function build the following tree, from regular expression a*:
+	 *
+	 |
+	 a
+*/
+
+static bin_tree_t *
+parse_expression (re_string_t *regexp, regex_t *preg, re_token_t *token,
+		  reg_syntax_t syntax, Idx nest, reg_errcode_t *err)
+{
+  re_dfa_t *dfa = preg->buffer;
+  bin_tree_t *tree;
+  switch (token->type)
+    {
+    case CHARACTER:
+      tree = create_token_tree (dfa, NULL, NULL, token);
+      if (BE (tree == NULL, 0))
+	{
+	  *err = REG_ESPACE;
+	  return NULL;
+	}
+#ifdef RE_ENABLE_I18N
+      if (dfa->mb_cur_max > 1)
+	{
+	  while (!re_string_eoi (regexp)
+		 && !re_string_first_byte (regexp, re_string_cur_idx (regexp)))
+	    {
+	      bin_tree_t *mbc_remain;
+	      fetch_token (token, regexp, syntax);
+	      mbc_remain = create_token_tree (dfa, NULL, NULL, token);
+	      tree = create_tree (dfa, tree, mbc_remain, CONCAT);
+	      if (BE (mbc_remain == NULL || tree == NULL, 0))
+		{
+		  *err = REG_ESPACE;
+		  return NULL;
+		}
+	    }
+	}
+#endif
+      break;
+
+    case OP_OPEN_SUBEXP:
+      tree = parse_sub_exp (regexp, preg, token, syntax, nest + 1, err);
+      if (BE (*err != REG_NOERROR && tree == NULL, 0))
+	return NULL;
+      break;
+
+    case OP_OPEN_BRACKET:
+      tree = parse_bracket_exp (regexp, dfa, token, syntax, err);
+      if (BE (*err != REG_NOERROR && tree == NULL, 0))
+	return NULL;
+      break;
+
+    case OP_BACK_REF:
+      if (!BE (dfa->completed_bkref_map & (1 << token->opr.idx), 1))
+	{
+	  *err = REG_ESUBREG;
+	  return NULL;
+	}
+      dfa->used_bkref_map |= 1 << token->opr.idx;
+      tree = create_token_tree (dfa, NULL, NULL, token);
+      if (BE (tree == NULL, 0))
+	{
+	  *err = REG_ESPACE;
+	  return NULL;
+	}
+      ++dfa->nbackref;
+      dfa->has_mb_node = 1;
+      break;
+
+    case OP_OPEN_DUP_NUM:
+      if (syntax & RE_CONTEXT_INVALID_DUP)
+	{
+	  *err = REG_BADRPT;
+	  return NULL;
+	}
+      FALLTHROUGH;
+    case OP_DUP_ASTERISK:
+    case OP_DUP_PLUS:
+    case OP_DUP_QUESTION:
+      if (syntax & RE_CONTEXT_INVALID_OPS)
+	{
+	  *err = REG_BADRPT;
+	  return NULL;
+	}
+      else if (syntax & RE_CONTEXT_INDEP_OPS)
+	{
+	  fetch_token (token, regexp, syntax);
+	  return parse_expression (regexp, preg, token, syntax, nest, err);
+	}
+      FALLTHROUGH;
+    case OP_CLOSE_SUBEXP:
+      if ((token->type == OP_CLOSE_SUBEXP) &&
+	  !(syntax & RE_UNMATCHED_RIGHT_PAREN_ORD))
+	{
+	  *err = REG_ERPAREN;
+	  return NULL;
+	}
+      FALLTHROUGH;
+    case OP_CLOSE_DUP_NUM:
+      /* We treat it as a normal character.  */
+
+      /* Then we can these characters as normal characters.  */
+      token->type = CHARACTER;
+      /* mb_partial and word_char bits should be initialized already
+	 by peek_token.  */
+      tree = create_token_tree (dfa, NULL, NULL, token);
+      if (BE (tree == NULL, 0))
+	{
+	  *err = REG_ESPACE;
+	  return NULL;
+	}
+      break;
+
+    case ANCHOR:
+      if ((token->opr.ctx_type
+	   & (WORD_DELIM | NOT_WORD_DELIM | WORD_FIRST | WORD_LAST))
+	  && dfa->word_ops_used == 0)
+	init_word_char (dfa);
+      if (token->opr.ctx_type == WORD_DELIM
+	  || token->opr.ctx_type == NOT_WORD_DELIM)
+	{
+	  bin_tree_t *tree_first, *tree_last;
+	  if (token->opr.ctx_type == WORD_DELIM)
+	    {
+	      token->opr.ctx_type = WORD_FIRST;
+	      tree_first = create_token_tree (dfa, NULL, NULL, token);
+	      token->opr.ctx_type = WORD_LAST;
+	    }
+	  else
+	    {
+	      token->opr.ctx_type = INSIDE_WORD;
+	      tree_first = create_token_tree (dfa, NULL, NULL, token);
+	      token->opr.ctx_type = INSIDE_NOTWORD;
+	    }
+	  tree_last = create_token_tree (dfa, NULL, NULL, token);
+	  tree = create_tree (dfa, tree_first, tree_last, OP_ALT);
+	  if (BE (tree_first == NULL || tree_last == NULL || tree == NULL, 0))
+	    {
+	      *err = REG_ESPACE;
+	      return NULL;
+	    }
+	}
+      else
+	{
+	  tree = create_token_tree (dfa, NULL, NULL, token);
+	  if (BE (tree == NULL, 0))
+	    {
+	      *err = REG_ESPACE;
+	      return NULL;
+	    }
+	}
+      /* We must return here, since ANCHORs can't be followed
+	 by repetition operators.
+	 eg. RE"^*" is invalid or "<ANCHOR(^)><CHAR(*)>",
+	     it must not be "<ANCHOR(^)><REPEAT(*)>".  */
+      fetch_token (token, regexp, syntax);
+      return tree;
+
+    case OP_PERIOD:
+      tree = create_token_tree (dfa, NULL, NULL, token);
+      if (BE (tree == NULL, 0))
+	{
+	  *err = REG_ESPACE;
+	  return NULL;
+	}
+      if (dfa->mb_cur_max > 1)
+	dfa->has_mb_node = 1;
+      break;
+
+    case OP_WORD:
+    case OP_NOTWORD:
+      tree = build_charclass_op (dfa, regexp->trans,
+				 "alnum",
+				 "_",
+				 token->type == OP_NOTWORD, err);
+      if (BE (*err != REG_NOERROR && tree == NULL, 0))
+	return NULL;
+      break;
+
+    case OP_SPACE:
+    case OP_NOTSPACE:
+      tree = build_charclass_op (dfa, regexp->trans,
+				 "space",
+				 "",
+				 token->type == OP_NOTSPACE, err);
+      if (BE (*err != REG_NOERROR && tree == NULL, 0))
+	return NULL;
+      break;
+
+    case OP_ALT:
+    case END_OF_RE:
+      return NULL;
+
+    case BACK_SLASH:
+      *err = REG_EESCAPE;
+      return NULL;
+
+    default:
+      /* Must not happen?  */
+#ifdef DEBUG
+      assert (0);
+#endif
+      return NULL;
+    }
+  fetch_token (token, regexp, syntax);
+
+  while (token->type == OP_DUP_ASTERISK || token->type == OP_DUP_PLUS
+	 || token->type == OP_DUP_QUESTION || token->type == OP_OPEN_DUP_NUM)
+    {
+      bin_tree_t *dup_tree = parse_dup_op (tree, regexp, dfa, token,
+					   syntax, err);
+      if (BE (*err != REG_NOERROR && dup_tree == NULL, 0))
+	{
+	  if (tree != NULL)
+	    postorder (tree, free_tree, NULL);
+	  return NULL;
+	}
+      tree = dup_tree;
+      /* In BRE consecutive duplications are not allowed.  */
+      if ((syntax & RE_CONTEXT_INVALID_DUP)
+	  && (token->type == OP_DUP_ASTERISK
+	      || token->type == OP_OPEN_DUP_NUM))
+	{
+	  if (tree != NULL)
+	    postorder (tree, free_tree, NULL);
+	  *err = REG_BADRPT;
+	  return NULL;
+	}
+    }
+
+  return tree;
+}
+
+/* This function build the following tree, from regular expression
+   (<reg_exp>):
+	 SUBEXP
+	    |
+	<reg_exp>
+*/
+
+static bin_tree_t *
+parse_sub_exp (re_string_t *regexp, regex_t *preg, re_token_t *token,
+	       reg_syntax_t syntax, Idx nest, reg_errcode_t *err)
+{
+  re_dfa_t *dfa = preg->buffer;
+  bin_tree_t *tree;
+  size_t cur_nsub;
+  cur_nsub = preg->re_nsub++;
+
+  fetch_token (token, regexp, syntax | RE_CARET_ANCHORS_HERE);
+
+  /* The subexpression may be a null string.  */
+  if (token->type == OP_CLOSE_SUBEXP)
+    tree = NULL;
+  else
+    {
+      tree = parse_reg_exp (regexp, preg, token, syntax, nest, err);
+      if (BE (*err == REG_NOERROR && token->type != OP_CLOSE_SUBEXP, 0))
+	{
+	  if (tree != NULL)
+	    postorder (tree, free_tree, NULL);
+	  *err = REG_EPAREN;
+	}
+      if (BE (*err != REG_NOERROR, 0))
+	return NULL;
+    }
+
+  if (cur_nsub <= '9' - '1')
+    dfa->completed_bkref_map |= 1 << cur_nsub;
+
+  tree = create_tree (dfa, tree, NULL, SUBEXP);
+  if (BE (tree == NULL, 0))
+    {
+      *err = REG_ESPACE;
+      return NULL;
+    }
+  tree->token.opr.idx = cur_nsub;
+  return tree;
+}
+
+/* This function parse repetition operators like "*", "+", "{1,3}" etc.  */
+
+static bin_tree_t *
+parse_dup_op (bin_tree_t *elem, re_string_t *regexp, re_dfa_t *dfa,
+	      re_token_t *token, reg_syntax_t syntax, reg_errcode_t *err)
+{
+  bin_tree_t *tree = NULL, *old_tree = NULL;
+  Idx i, start, end, start_idx = re_string_cur_idx (regexp);
+  re_token_t start_token = *token;
+
+  if (token->type == OP_OPEN_DUP_NUM)
+    {
+      end = 0;
+      start = fetch_number (regexp, token, syntax);
+      if (start == -1)
+	{
+	  if (token->type == CHARACTER && token->opr.c == ',')
+	    start = 0; /* We treat "{,m}" as "{0,m}".  */
+	  else
+	    {
+	      *err = REG_BADBR; /* <re>{} is invalid.  */
+	      return NULL;
+	    }
+	}
+      if (BE (start != -2, 1))
+	{
+	  /* We treat "{n}" as "{n,n}".  */
+	  end = ((token->type == OP_CLOSE_DUP_NUM) ? start
+		 : ((token->type == CHARACTER && token->opr.c == ',')
+		    ? fetch_number (regexp, token, syntax) : -2));
+	}
+      if (BE (start == -2 || end == -2, 0))
+	{
+	  /* Invalid sequence.  */
+	  if (BE (!(syntax & RE_INVALID_INTERVAL_ORD), 0))
+	    {
+	      if (token->type == END_OF_RE)
+		*err = REG_EBRACE;
+	      else
+		*err = REG_BADBR;
+
+	      return NULL;
+	    }
+
+	  /* If the syntax bit is set, rollback.  */
+	  re_string_set_index (regexp, start_idx);
+	  *token = start_token;
+	  token->type = CHARACTER;
+	  /* mb_partial and word_char bits should be already initialized by
+	     peek_token.  */
+	  return elem;
+	}
+
+      if (BE ((end != -1 && start > end)
+	      || token->type != OP_CLOSE_DUP_NUM, 0))
+	{
+	  /* First number greater than second.  */
+	  *err = REG_BADBR;
+	  return NULL;
+	}
+
+      if (BE (RE_DUP_MAX < (end == -1 ? start : end), 0))
+	{
+	  *err = REG_ESIZE;
+	  return NULL;
+	}
+    }
+  else
+    {
+      start = (token->type == OP_DUP_PLUS) ? 1 : 0;
+      end = (token->type == OP_DUP_QUESTION) ? 1 : -1;
+    }
+
+  fetch_token (token, regexp, syntax);
+
+  if (BE (elem == NULL, 0))
+    return NULL;
+  if (BE (start == 0 && end == 0, 0))
+    {
+      postorder (elem, free_tree, NULL);
+      return NULL;
+    }
+
+  /* Extract "<re>{n,m}" to "<re><re>...<re><re>{0,<m-n>}".  */
+  if (BE (start > 0, 0))
+    {
+      tree = elem;
+      for (i = 2; i <= start; ++i)
+	{
+	  elem = duplicate_tree (elem, dfa);
+	  tree = create_tree (dfa, tree, elem, CONCAT);
+	  if (BE (elem == NULL || tree == NULL, 0))
+	    goto parse_dup_op_espace;
+	}
+
+      if (start == end)
+	return tree;
+
+      /* Duplicate ELEM before it is marked optional.  */
+      elem = duplicate_tree (elem, dfa);
+      if (BE (elem == NULL, 0))
+        goto parse_dup_op_espace;
+      old_tree = tree;
+    }
+  else
+    old_tree = NULL;
+
+  if (elem->token.type == SUBEXP)
+    {
+      uintptr_t subidx = elem->token.opr.idx;
+      postorder (elem, mark_opt_subexp, (void *) subidx);
+    }
+
+  tree = create_tree (dfa, elem, NULL,
+		      (end == -1 ? OP_DUP_ASTERISK : OP_ALT));
+  if (BE (tree == NULL, 0))
+    goto parse_dup_op_espace;
+
+/* From gnulib's "intprops.h":
+   True if the arithmetic type T is signed.  */
+#define TYPE_SIGNED(t) (! ((t) 0 < (t) -1))
+
+  /* This loop is actually executed only when end != -1,
+     to rewrite <re>{0,n} as (<re>(<re>...<re>?)?)?...  We have
+     already created the start+1-th copy.  */
+  if (TYPE_SIGNED (Idx) || end != -1)
+    for (i = start + 2; i <= end; ++i)
+      {
+	elem = duplicate_tree (elem, dfa);
+	tree = create_tree (dfa, tree, elem, CONCAT);
+	if (BE (elem == NULL || tree == NULL, 0))
+	  goto parse_dup_op_espace;
+
+	tree = create_tree (dfa, tree, NULL, OP_ALT);
+	if (BE (tree == NULL, 0))
+	  goto parse_dup_op_espace;
+      }
+
+  if (old_tree)
+    tree = create_tree (dfa, old_tree, tree, CONCAT);
+
+  return tree;
+
+ parse_dup_op_espace:
+  *err = REG_ESPACE;
+  return NULL;
+}
+
+/* Size of the names for collating symbol/equivalence_class/character_class.
+   I'm not sure, but maybe enough.  */
+#define BRACKET_NAME_BUF_SIZE 32
+
+#ifndef _LIBC
+
+# ifdef RE_ENABLE_I18N
+/* Convert the byte B to the corresponding wide character.  In a
+   unibyte locale, treat B as itself if it is an encoding error.
+   In a multibyte locale, return WEOF if B is an encoding error.  */
+static wint_t
+parse_byte (unsigned char b, re_charset_t *mbcset)
+{
+  wint_t wc = __btowc (b);
+  return wc == WEOF && !mbcset ? b : wc;
+}
+#endif
+
+  /* Local function for parse_bracket_exp only used in case of NOT _LIBC.
+     Build the range expression which starts from START_ELEM, and ends
+     at END_ELEM.  The result are written to MBCSET and SBCSET.
+     RANGE_ALLOC is the allocated size of mbcset->range_starts, and
+     mbcset->range_ends, is a pointer argument since we may
+     update it.  */
+
+static reg_errcode_t
+internal_function
+# ifdef RE_ENABLE_I18N
+build_range_exp (const reg_syntax_t syntax,
+                 bitset_t sbcset,
+                 re_charset_t *mbcset,
+                 Idx *range_alloc,
+                 const bracket_elem_t *start_elem,
+                 const bracket_elem_t *end_elem)
+# else /* not RE_ENABLE_I18N */
+build_range_exp (const reg_syntax_t syntax,
+                 bitset_t sbcset,
+                 const bracket_elem_t *start_elem,
+                 const bracket_elem_t *end_elem)
+# endif /* not RE_ENABLE_I18N */
+{
+  unsigned int start_ch, end_ch;
+  /* Equivalence Classes and Character Classes can't be a range start/end.  */
+  if (BE (start_elem->type == EQUIV_CLASS || start_elem->type == CHAR_CLASS
+	  || end_elem->type == EQUIV_CLASS || end_elem->type == CHAR_CLASS,
+	  0))
+    return REG_ERANGE;
+
+  /* We can handle no multi character collating elements without libc
+     support.  */
+  if (BE ((start_elem->type == COLL_SYM
+	   && strlen ((char *) start_elem->opr.name) > 1)
+	  || (end_elem->type == COLL_SYM
+	      && strlen ((char *) end_elem->opr.name) > 1), 0))
+    return REG_ECOLLATE;
+
+# ifdef RE_ENABLE_I18N
+  {
+    wchar_t wc;
+    wint_t start_wc;
+    wint_t end_wc;
+
+    start_ch = ((start_elem->type == SB_CHAR) ? start_elem->opr.ch
+		: ((start_elem->type == COLL_SYM) ? start_elem->opr.name[0]
+		   : 0));
+    end_ch = ((end_elem->type == SB_CHAR) ? end_elem->opr.ch
+	      : ((end_elem->type == COLL_SYM) ? end_elem->opr.name[0]
+		 : 0));
+    start_wc = ((start_elem->type == SB_CHAR || start_elem->type == COLL_SYM)
+		? parse_byte (start_ch, mbcset) : start_elem->opr.wch);
+    end_wc = ((end_elem->type == SB_CHAR || end_elem->type == COLL_SYM)
+	      ? parse_byte (end_ch, mbcset) : end_elem->opr.wch);
+    if (start_wc == WEOF || end_wc == WEOF)
+      return REG_ECOLLATE;
+    else if (BE ((syntax & RE_NO_EMPTY_RANGES) && start_wc > end_wc, 0))
+      return REG_ERANGE;
+
+    /* Got valid collation sequence values, add them as a new entry.
+       However, for !_LIBC we have no collation elements: if the
+       character set is single byte, the single byte character set
+       that we build below suffices.  parse_bracket_exp passes
+       no MBCSET if dfa->mb_cur_max == 1.  */
+    if (mbcset)
+      {
+	/* Check the space of the arrays.  */
+	if (BE (*range_alloc == mbcset->nranges, 0))
+	  {
+	    /* There is not enough space, need realloc.  */
+	    wchar_t *new_array_start, *new_array_end;
+	    Idx new_nranges;
+
+	    /* +1 in case of mbcset->nranges is 0.  */
+	    new_nranges = 2 * mbcset->nranges + 1;
+	    /* Use realloc since mbcset->range_starts and mbcset->range_ends
+	       are NULL if *range_alloc == 0.  */
+	    new_array_start = re_realloc (mbcset->range_starts, wchar_t,
+					  new_nranges);
+	    new_array_end = re_realloc (mbcset->range_ends, wchar_t,
+					new_nranges);
+
+	    if (BE (new_array_start == NULL || new_array_end == NULL, 0))
+	      {
+		re_free (new_array_start);
+		re_free (new_array_end);
+		return REG_ESPACE;
+	      }
+
+	    mbcset->range_starts = new_array_start;
+	    mbcset->range_ends = new_array_end;
+	    *range_alloc = new_nranges;
+	  }
+
+	mbcset->range_starts[mbcset->nranges] = start_wc;
+	mbcset->range_ends[mbcset->nranges++] = end_wc;
+      }
+
+    /* Build the table for single byte characters.  */
+    for (wc = 0; wc < SBC_MAX; ++wc)
+      {
+	if (start_wc <= wc && wc <= end_wc)
+	  bitset_set (sbcset, wc);
+      }
+  }
+# else /* not RE_ENABLE_I18N */
+  {
+    unsigned int ch;
+    start_ch = ((start_elem->type == SB_CHAR ) ? start_elem->opr.ch
+		: ((start_elem->type == COLL_SYM) ? start_elem->opr.name[0]
+		   : 0));
+    end_ch = ((end_elem->type == SB_CHAR ) ? end_elem->opr.ch
+	      : ((end_elem->type == COLL_SYM) ? end_elem->opr.name[0]
+		 : 0));
+    if (start_ch > end_ch)
+      return REG_ERANGE;
+    /* Build the table for single byte characters.  */
+    for (ch = 0; ch < SBC_MAX; ++ch)
+      if (start_ch <= ch  && ch <= end_ch)
+	bitset_set (sbcset, ch);
+  }
+# endif /* not RE_ENABLE_I18N */
+  return REG_NOERROR;
+}
+#endif /* not _LIBC */
+
+#ifndef _LIBC
+/* Helper function for parse_bracket_exp only used in case of NOT _LIBC..
+   Build the collating element which is represented by NAME.
+   The result are written to MBCSET and SBCSET.
+   COLL_SYM_ALLOC is the allocated size of mbcset->coll_sym, is a
+   pointer argument since we may update it.  */
+
+static reg_errcode_t
+internal_function
+# ifdef RE_ENABLE_I18N
+build_collating_symbol (bitset_t sbcset, re_charset_t *mbcset,
+			Idx *coll_sym_alloc, const unsigned char *name)
+# else /* not RE_ENABLE_I18N */
+build_collating_symbol (bitset_t sbcset, const unsigned char *name)
+# endif /* not RE_ENABLE_I18N */
+{
+  size_t name_len = strlen ((const char *) name);
+  if (BE (name_len != 1, 0))
+    return REG_ECOLLATE;
+  else
+    {
+      bitset_set (sbcset, name[0]);
+      return REG_NOERROR;
+    }
+}
+#endif /* not _LIBC */
+
+/* This function parse bracket expression like "[abc]", "[a-c]",
+   "[[.a-a.]]" etc.  */
+
+static bin_tree_t *
+parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
+		   reg_syntax_t syntax, reg_errcode_t *err)
+{
+#ifdef _LIBC
+  const unsigned char *collseqmb;
+  const char *collseqwc;
+  uint32_t nrules;
+  int32_t table_size;
+  const int32_t *symb_table;
+  const unsigned char *extra;
+
+  /* Local function for parse_bracket_exp used in _LIBC environment.
+     Seek the collating symbol entry corresponding to NAME.
+     Return the index of the symbol in the SYMB_TABLE,
+     or -1 if not found.  */
+
+  auto inline int32_t
+  __attribute__ ((always_inline))
+  seek_collating_symbol_entry (const unsigned char *name, size_t name_len)
+    {
+      int32_t elem;
+
+      for (elem = 0; elem < table_size; elem++)
+	if (symb_table[2 * elem] != 0)
+	  {
+	    int32_t idx = symb_table[2 * elem + 1];
+	    /* Skip the name of collating element name.  */
+	    idx += 1 + extra[idx];
+	    if (/* Compare the length of the name.  */
+		name_len == extra[idx]
+		/* Compare the name.  */
+		&& memcmp (name, &extra[idx + 1], name_len) == 0)
+	      /* Yep, this is the entry.  */
+	      return elem;
+	  }
+      return -1;
+    }
+
+  /* Local function for parse_bracket_exp used in _LIBC environment.
+     Look up the collation sequence value of BR_ELEM.
+     Return the value if succeeded, UINT_MAX otherwise.  */
+
+  auto inline unsigned int
+  __attribute__ ((always_inline))
+  lookup_collation_sequence_value (bracket_elem_t *br_elem)
+    {
+      if (br_elem->type == SB_CHAR)
+	{
+	  /*
+	  if (MB_CUR_MAX == 1)
+	  */
+	  if (nrules == 0)
+	    return collseqmb[br_elem->opr.ch];
+	  else
+	    {
+	      wint_t wc = __btowc (br_elem->opr.ch);
+	      return __collseq_table_lookup (collseqwc, wc);
+	    }
+	}
+      else if (br_elem->type == MB_CHAR)
+	{
+	  if (nrules != 0)
+	    return __collseq_table_lookup (collseqwc, br_elem->opr.wch);
+	}
+      else if (br_elem->type == COLL_SYM)
+	{
+	  size_t sym_name_len = strlen ((char *) br_elem->opr.name);
+	  if (nrules != 0)
+	    {
+	      int32_t elem, idx;
+	      elem = seek_collating_symbol_entry (br_elem->opr.name,
+						  sym_name_len);
+	      if (elem != -1)
+		{
+		  /* We found the entry.  */
+		  idx = symb_table[2 * elem + 1];
+		  /* Skip the name of collating element name.  */
+		  idx += 1 + extra[idx];
+		  /* Skip the byte sequence of the collating element.  */
+		  idx += 1 + extra[idx];
+		  /* Adjust for the alignment.  */
+		  idx = (idx + 3) & ~3;
+		  /* Skip the multibyte collation sequence value.  */
+		  idx += sizeof (unsigned int);
+		  /* Skip the wide char sequence of the collating element.  */
+		  idx += sizeof (unsigned int) *
+		    (1 + *(unsigned int *) (extra + idx));
+		  /* Return the collation sequence value.  */
+		  return *(unsigned int *) (extra + idx);
+		}
+	      else if (sym_name_len == 1)
+		{
+		  /* No valid character.  Match it as a single byte
+		     character.  */
+		  return collseqmb[br_elem->opr.name[0]];
+		}
+	    }
+	  else if (sym_name_len == 1)
+	    return collseqmb[br_elem->opr.name[0]];
+	}
+      return UINT_MAX;
+    }
+
+  /* Local function for parse_bracket_exp used in _LIBC environment.
+     Build the range expression which starts from START_ELEM, and ends
+     at END_ELEM.  The result are written to MBCSET and SBCSET.
+     RANGE_ALLOC is the allocated size of mbcset->range_starts, and
+     mbcset->range_ends, is a pointer argument since we may
+     update it.  */
+
+  auto inline reg_errcode_t
+  __attribute__ ((always_inline))
+  build_range_exp (bitset_t sbcset, re_charset_t *mbcset, int *range_alloc,
+		   bracket_elem_t *start_elem, bracket_elem_t *end_elem)
+    {
+      unsigned int ch;
+      uint32_t start_collseq;
+      uint32_t end_collseq;
+
+      /* Equivalence Classes and Character Classes can't be a range
+	 start/end.  */
+      if (BE (start_elem->type == EQUIV_CLASS || start_elem->type == CHAR_CLASS
+	      || end_elem->type == EQUIV_CLASS || end_elem->type == CHAR_CLASS,
+	      0))
+	return REG_ERANGE;
+
+      /* FIXME: Implement rational ranges here, too.  */
+      start_collseq = lookup_collation_sequence_value (start_elem);
+      end_collseq = lookup_collation_sequence_value (end_elem);
+      /* Check start/end collation sequence values.  */
+      if (BE (start_collseq == UINT_MAX || end_collseq == UINT_MAX, 0))
+	return REG_ECOLLATE;
+      if (BE ((syntax & RE_NO_EMPTY_RANGES) && start_collseq > end_collseq, 0))
+	return REG_ERANGE;
+
+      /* Got valid collation sequence values, add them as a new entry.
+	 However, if we have no collation elements, and the character set
+	 is single byte, the single byte character set that we
+	 build below suffices. */
+      if (nrules > 0 || dfa->mb_cur_max > 1)
+	{
+	  /* Check the space of the arrays.  */
+	  if (BE (*range_alloc == mbcset->nranges, 0))
+	    {
+	      /* There is not enough space, need realloc.  */
+	      uint32_t *new_array_start;
+	      uint32_t *new_array_end;
+	      Idx new_nranges;
+
+	      /* +1 in case of mbcset->nranges is 0.  */
+	      new_nranges = 2 * mbcset->nranges + 1;
+	      new_array_start = re_realloc (mbcset->range_starts, uint32_t,
+					    new_nranges);
+	      new_array_end = re_realloc (mbcset->range_ends, uint32_t,
+					  new_nranges);
+
+	      if (BE (new_array_start == NULL || new_array_end == NULL, 0))
+		return REG_ESPACE;
+
+	      mbcset->range_starts = new_array_start;
+	      mbcset->range_ends = new_array_end;
+	      *range_alloc = new_nranges;
+	    }
+
+	  mbcset->range_starts[mbcset->nranges] = start_collseq;
+	  mbcset->range_ends[mbcset->nranges++] = end_collseq;
+	}
+
+      /* Build the table for single byte characters.  */
+      for (ch = 0; ch < SBC_MAX; ch++)
+	{
+	  uint32_t ch_collseq;
+	  /*
+	  if (MB_CUR_MAX == 1)
+	  */
+	  if (nrules == 0)
+	    ch_collseq = collseqmb[ch];
+	  else
+	    ch_collseq = __collseq_table_lookup (collseqwc, __btowc (ch));
+	  if (start_collseq <= ch_collseq && ch_collseq <= end_collseq)
+	    bitset_set (sbcset, ch);
+	}
+      return REG_NOERROR;
+    }
+
+  /* Local function for parse_bracket_exp used in _LIBC environment.
+     Build the collating element which is represented by NAME.
+     The result are written to MBCSET and SBCSET.
+     COLL_SYM_ALLOC is the allocated size of mbcset->coll_sym, is a
+     pointer argument since we may update it.  */
+
+  auto inline reg_errcode_t
+  __attribute__ ((always_inline))
+  build_collating_symbol (bitset_t sbcset, re_charset_t *mbcset,
+			  Idx *coll_sym_alloc, const unsigned char *name)
+    {
+      int32_t elem, idx;
+      size_t name_len = strlen ((const char *) name);
+      if (nrules != 0)
+	{
+	  elem = seek_collating_symbol_entry (name, name_len);
+	  if (elem != -1)
+	    {
+	      /* We found the entry.  */
+	      idx = symb_table[2 * elem + 1];
+	      /* Skip the name of collating element name.  */
+	      idx += 1 + extra[idx];
+	    }
+	  else if (name_len == 1)
+	    {
+	      /* No valid character, treat it as a normal
+		 character.  */
+	      bitset_set (sbcset, name[0]);
+	      return REG_NOERROR;
+	    }
+	  else
+	    return REG_ECOLLATE;
+
+	  /* Got valid collation sequence, add it as a new entry.  */
+	  /* Check the space of the arrays.  */
+	  if (BE (*coll_sym_alloc == mbcset->ncoll_syms, 0))
+	    {
+	      /* Not enough, realloc it.  */
+	      /* +1 in case of mbcset->ncoll_syms is 0.  */
+	      Idx new_coll_sym_alloc = 2 * mbcset->ncoll_syms + 1;
+	      /* Use realloc since mbcset->coll_syms is NULL
+		 if *alloc == 0.  */
+	      int32_t *new_coll_syms = re_realloc (mbcset->coll_syms, int32_t,
+						   new_coll_sym_alloc);
+	      if (BE (new_coll_syms == NULL, 0))
+		return REG_ESPACE;
+	      mbcset->coll_syms = new_coll_syms;
+	      *coll_sym_alloc = new_coll_sym_alloc;
+	    }
+	  mbcset->coll_syms[mbcset->ncoll_syms++] = idx;
+	  return REG_NOERROR;
+	}
+      else
+	{
+	  if (BE (name_len != 1, 0))
+	    return REG_ECOLLATE;
+	  else
+	    {
+	      bitset_set (sbcset, name[0]);
+	      return REG_NOERROR;
+	    }
+	}
+    }
+#endif
+
+  re_token_t br_token;
+  re_bitset_ptr_t sbcset;
+#ifdef RE_ENABLE_I18N
+  re_charset_t *mbcset;
+  Idx coll_sym_alloc = 0, range_alloc = 0, mbchar_alloc = 0;
+  Idx equiv_class_alloc = 0, char_class_alloc = 0;
+#endif /* not RE_ENABLE_I18N */
+  bool non_match = false;
+  bin_tree_t *work_tree;
+  int token_len;
+  bool first_round = true;
+#ifdef _LIBC
+  collseqmb = (const unsigned char *)
+    _NL_CURRENT (LC_COLLATE, _NL_COLLATE_COLLSEQMB);
+  nrules = _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES);
+  if (nrules)
+    {
+      /*
+      if (MB_CUR_MAX > 1)
+      */
+      collseqwc = _NL_CURRENT (LC_COLLATE, _NL_COLLATE_COLLSEQWC);
+      table_size = _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_SYMB_HASH_SIZEMB);
+      symb_table = (const int32_t *) _NL_CURRENT (LC_COLLATE,
+						  _NL_COLLATE_SYMB_TABLEMB);
+      extra = (const unsigned char *) _NL_CURRENT (LC_COLLATE,
+						   _NL_COLLATE_SYMB_EXTRAMB);
+    }
+#endif
+  sbcset = (re_bitset_ptr_t) calloc (sizeof (bitset_t), 1);
+#ifdef RE_ENABLE_I18N
+  mbcset = (re_charset_t *) calloc (sizeof (re_charset_t), 1);
+#endif /* RE_ENABLE_I18N */
+#ifdef RE_ENABLE_I18N
+  if (BE (sbcset == NULL || mbcset == NULL, 0))
+#else
+  if (BE (sbcset == NULL, 0))
+#endif /* RE_ENABLE_I18N */
+    {
+      re_free (sbcset);
+#ifdef RE_ENABLE_I18N
+      re_free (mbcset);
+#endif
+      *err = REG_ESPACE;
+      return NULL;
+    }
+
+  token_len = peek_token_bracket (token, regexp, syntax);
+  if (BE (token->type == END_OF_RE, 0))
+    {
+      *err = REG_BADPAT;
+      goto parse_bracket_exp_free_return;
+    }
+  if (token->type == OP_NON_MATCH_LIST)
+    {
+#ifdef RE_ENABLE_I18N
+      mbcset->non_match = 1;
+#endif /* not RE_ENABLE_I18N */
+      non_match = true;
+      if (syntax & RE_HAT_LISTS_NOT_NEWLINE)
+	bitset_set (sbcset, '\n');
+      re_string_skip_bytes (regexp, token_len); /* Skip a token.  */
+      token_len = peek_token_bracket (token, regexp, syntax);
+      if (BE (token->type == END_OF_RE, 0))
+	{
+	  *err = REG_BADPAT;
+	  goto parse_bracket_exp_free_return;
+	}
+    }
+
+  /* We treat the first ']' as a normal character.  */
+  if (token->type == OP_CLOSE_BRACKET)
+    token->type = CHARACTER;
+
+  while (1)
+    {
+      bracket_elem_t start_elem, end_elem;
+      unsigned char start_name_buf[BRACKET_NAME_BUF_SIZE];
+      unsigned char end_name_buf[BRACKET_NAME_BUF_SIZE];
+      reg_errcode_t ret;
+      int token_len2 = 0;
+      bool is_range_exp = false;
+      re_token_t token2;
+
+      start_elem.opr.name = start_name_buf;
+      start_elem.type = COLL_SYM;
+      ret = parse_bracket_element (&start_elem, regexp, token, token_len, dfa,
+				   syntax, first_round);
+      if (BE (ret != REG_NOERROR, 0))
+	{
+	  *err = ret;
+	  goto parse_bracket_exp_free_return;
+	}
+      first_round = false;
+
+      /* Get information about the next token.  We need it in any case.  */
+      token_len = peek_token_bracket (token, regexp, syntax);
+
+      /* Do not check for ranges if we know they are not allowed.  */
+      if (start_elem.type != CHAR_CLASS && start_elem.type != EQUIV_CLASS)
+	{
+	  if (BE (token->type == END_OF_RE, 0))
+	    {
+	      *err = REG_EBRACK;
+	      goto parse_bracket_exp_free_return;
+	    }
+	  if (token->type == OP_CHARSET_RANGE)
+	    {
+	      re_string_skip_bytes (regexp, token_len); /* Skip '-'.  */
+	      token_len2 = peek_token_bracket (&token2, regexp, syntax);
+	      if (BE (token2.type == END_OF_RE, 0))
+		{
+		  *err = REG_EBRACK;
+		  goto parse_bracket_exp_free_return;
+		}
+	      if (token2.type == OP_CLOSE_BRACKET)
+		{
+		  /* We treat the last '-' as a normal character.  */
+		  re_string_skip_bytes (regexp, -token_len);
+		  token->type = CHARACTER;
+		}
+	      else
+		is_range_exp = true;
+	    }
+	}
+
+      if (is_range_exp == true)
+	{
+	  end_elem.opr.name = end_name_buf;
+	  end_elem.type = COLL_SYM;
+	  ret = parse_bracket_element (&end_elem, regexp, &token2, token_len2,
+				       dfa, syntax, true);
+	  if (BE (ret != REG_NOERROR, 0))
+	    {
+	      *err = ret;
+	      goto parse_bracket_exp_free_return;
+	    }
+
+	  token_len = peek_token_bracket (token, regexp, syntax);
+
+#ifdef _LIBC
+	  *err = build_range_exp (sbcset, mbcset, &range_alloc,
+				  &start_elem, &end_elem);
+#else
+# ifdef RE_ENABLE_I18N
+	  *err = build_range_exp (syntax, sbcset,
+				  dfa->mb_cur_max > 1 ? mbcset : NULL,
+				  &range_alloc, &start_elem, &end_elem);
+# else
+	  *err = build_range_exp (syntax, sbcset, &start_elem, &end_elem);
+# endif
+#endif /* RE_ENABLE_I18N */
+	  if (BE (*err != REG_NOERROR, 0))
+	    goto parse_bracket_exp_free_return;
+	}
+      else
+	{
+	  switch (start_elem.type)
+	    {
+	    case SB_CHAR:
+	      bitset_set (sbcset, start_elem.opr.ch);
+	      break;
+#ifdef RE_ENABLE_I18N
+	    case MB_CHAR:
+	      /* Check whether the array has enough space.  */
+	      if (BE (mbchar_alloc == mbcset->nmbchars, 0))
+		{
+		  wchar_t *new_mbchars;
+		  /* Not enough, realloc it.  */
+		  /* +1 in case of mbcset->nmbchars is 0.  */
+		  mbchar_alloc = 2 * mbcset->nmbchars + 1;
+		  /* Use realloc since array is NULL if *alloc == 0.  */
+		  new_mbchars = re_realloc (mbcset->mbchars, wchar_t,
+					    mbchar_alloc);
+		  if (BE (new_mbchars == NULL, 0))
+		    goto parse_bracket_exp_espace;
+		  mbcset->mbchars = new_mbchars;
+		}
+	      mbcset->mbchars[mbcset->nmbchars++] = start_elem.opr.wch;
+	      break;
+#endif /* RE_ENABLE_I18N */
+	    case EQUIV_CLASS:
+	      *err = build_equiv_class (sbcset,
+#ifdef RE_ENABLE_I18N
+					mbcset, &equiv_class_alloc,
+#endif /* RE_ENABLE_I18N */
+					start_elem.opr.name);
+	      if (BE (*err != REG_NOERROR, 0))
+		goto parse_bracket_exp_free_return;
+	      break;
+	    case COLL_SYM:
+	      *err = build_collating_symbol (sbcset,
+#ifdef RE_ENABLE_I18N
+					     mbcset, &coll_sym_alloc,
+#endif /* RE_ENABLE_I18N */
+					     start_elem.opr.name);
+	      if (BE (*err != REG_NOERROR, 0))
+		goto parse_bracket_exp_free_return;
+	      break;
+	    case CHAR_CLASS:
+	      *err = build_charclass (regexp->trans, sbcset,
+#ifdef RE_ENABLE_I18N
+				      mbcset, &char_class_alloc,
+#endif /* RE_ENABLE_I18N */
+				      (const char *) start_elem.opr.name,
+				      syntax);
+	      if (BE (*err != REG_NOERROR, 0))
+	       goto parse_bracket_exp_free_return;
+	      break;
+	    default:
+	      assert (0);
+	      break;
+	    }
+	}
+      if (BE (token->type == END_OF_RE, 0))
+	{
+	  *err = REG_EBRACK;
+	  goto parse_bracket_exp_free_return;
+	}
+      if (token->type == OP_CLOSE_BRACKET)
+	break;
+    }
+
+  re_string_skip_bytes (regexp, token_len); /* Skip a token.  */
+
+  /* If it is non-matching list.  */
+  if (non_match)
+    bitset_not (sbcset);
+
+#ifdef RE_ENABLE_I18N
+  /* Ensure only single byte characters are set.  */
+  if (dfa->mb_cur_max > 1)
+    bitset_mask (sbcset, dfa->sb_char);
+
+  if (mbcset->nmbchars || mbcset->ncoll_syms || mbcset->nequiv_classes
+      || mbcset->nranges || (dfa->mb_cur_max > 1 && (mbcset->nchar_classes
+						     || mbcset->non_match)))
+    {
+      bin_tree_t *mbc_tree;
+      int sbc_idx;
+      /* Build a tree for complex bracket.  */
+      dfa->has_mb_node = 1;
+      br_token.type = COMPLEX_BRACKET;
+      br_token.opr.mbcset = mbcset;
+      mbc_tree = create_token_tree (dfa, NULL, NULL, &br_token);
+      if (BE (mbc_tree == NULL, 0))
+	goto parse_bracket_exp_espace;
+      for (sbc_idx = 0; sbc_idx < BITSET_WORDS; ++sbc_idx)
+	if (sbcset[sbc_idx])
+	  break;
+      /* If there are no bits set in sbcset, there is no point
+	 of having both SIMPLE_BRACKET and COMPLEX_BRACKET.  */
+      if (sbc_idx < BITSET_WORDS)
+	{
+	  /* Build a tree for simple bracket.  */
+	  br_token.type = SIMPLE_BRACKET;
+	  br_token.opr.sbcset = sbcset;
+	  work_tree = create_token_tree (dfa, NULL, NULL, &br_token);
+	  if (BE (work_tree == NULL, 0))
+	    goto parse_bracket_exp_espace;
+
+	  /* Then join them by ALT node.  */
+	  work_tree = create_tree (dfa, work_tree, mbc_tree, OP_ALT);
+	  if (BE (work_tree == NULL, 0))
+	    goto parse_bracket_exp_espace;
+	}
+      else
+	{
+	  re_free (sbcset);
+	  work_tree = mbc_tree;
+	}
+    }
+  else
+#endif /* not RE_ENABLE_I18N */
+    {
+#ifdef RE_ENABLE_I18N
+      free_charset (mbcset);
+#endif
+      /* Build a tree for simple bracket.  */
+      br_token.type = SIMPLE_BRACKET;
+      br_token.opr.sbcset = sbcset;
+      work_tree = create_token_tree (dfa, NULL, NULL, &br_token);
+      if (BE (work_tree == NULL, 0))
+	goto parse_bracket_exp_espace;
+    }
+  return work_tree;
+
+ parse_bracket_exp_espace:
+  *err = REG_ESPACE;
+ parse_bracket_exp_free_return:
+  re_free (sbcset);
+#ifdef RE_ENABLE_I18N
+  free_charset (mbcset);
+#endif /* RE_ENABLE_I18N */
+  return NULL;
+}
+
+/* Parse an element in the bracket expression.  */
+
+static reg_errcode_t
+parse_bracket_element (bracket_elem_t *elem, re_string_t *regexp,
+		       re_token_t *token, int token_len, re_dfa_t *dfa,
+		       reg_syntax_t syntax, bool accept_hyphen)
+{
+#ifdef RE_ENABLE_I18N
+  int cur_char_size;
+  cur_char_size = re_string_char_size_at (regexp, re_string_cur_idx (regexp));
+  if (cur_char_size > 1)
+    {
+      elem->type = MB_CHAR;
+      elem->opr.wch = re_string_wchar_at (regexp, re_string_cur_idx (regexp));
+      re_string_skip_bytes (regexp, cur_char_size);
+      return REG_NOERROR;
+    }
+#endif /* RE_ENABLE_I18N */
+  re_string_skip_bytes (regexp, token_len); /* Skip a token.  */
+  if (token->type == OP_OPEN_COLL_ELEM || token->type == OP_OPEN_CHAR_CLASS
+      || token->type == OP_OPEN_EQUIV_CLASS)
+    return parse_bracket_symbol (elem, regexp, token);
+  if (BE (token->type == OP_CHARSET_RANGE, 0) && !accept_hyphen)
+    {
+      /* A '-' must only appear as anything but a range indicator before
+	 the closing bracket.  Everything else is an error.  */
+      re_token_t token2;
+      (void) peek_token_bracket (&token2, regexp, syntax);
+      if (token2.type != OP_CLOSE_BRACKET)
+	/* The actual error value is not standardized since this whole
+	   case is undefined.  But ERANGE makes good sense.  */
+	return REG_ERANGE;
+    }
+  elem->type = SB_CHAR;
+  elem->opr.ch = token->opr.c;
+  return REG_NOERROR;
+}
+
+/* Parse a bracket symbol in the bracket expression.  Bracket symbols are
+   such as [:<character_class>:], [.<collating_element>.], and
+   [=<equivalent_class>=].  */
+
+static reg_errcode_t
+parse_bracket_symbol (bracket_elem_t *elem, re_string_t *regexp,
+		      re_token_t *token)
+{
+  unsigned char ch, delim = token->opr.c;
+  int i = 0;
+  if (re_string_eoi(regexp))
+    return REG_EBRACK;
+  for (;; ++i)
+    {
+      if (i >= BRACKET_NAME_BUF_SIZE)
+	return REG_EBRACK;
+      if (token->type == OP_OPEN_CHAR_CLASS)
+	ch = re_string_fetch_byte_case (regexp);
+      else
+	ch = re_string_fetch_byte (regexp);
+      if (re_string_eoi(regexp))
+	return REG_EBRACK;
+      if (ch == delim && re_string_peek_byte (regexp, 0) == ']')
+	break;
+      elem->opr.name[i] = ch;
+    }
+  re_string_skip_bytes (regexp, 1);
+  elem->opr.name[i] = '\0';
+  switch (token->type)
+    {
+    case OP_OPEN_COLL_ELEM:
+      elem->type = COLL_SYM;
+      break;
+    case OP_OPEN_EQUIV_CLASS:
+      elem->type = EQUIV_CLASS;
+      break;
+    case OP_OPEN_CHAR_CLASS:
+      elem->type = CHAR_CLASS;
+      break;
+    default:
+      break;
+    }
+  return REG_NOERROR;
+}
+
+  /* Helper function for parse_bracket_exp.
+     Build the equivalence class which is represented by NAME.
+     The result are written to MBCSET and SBCSET.
+     EQUIV_CLASS_ALLOC is the allocated size of mbcset->equiv_classes,
+     is a pointer argument since we may update it.  */
+
+static reg_errcode_t
+#ifdef RE_ENABLE_I18N
+build_equiv_class (bitset_t sbcset, re_charset_t *mbcset,
+		   Idx *equiv_class_alloc, const unsigned char *name)
+#else /* not RE_ENABLE_I18N */
+build_equiv_class (bitset_t sbcset, const unsigned char *name)
+#endif /* not RE_ENABLE_I18N */
+{
+#ifdef _LIBC
+  uint32_t nrules = _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES);
+  if (nrules != 0)
+    {
+      const int32_t *table, *indirect;
+      const unsigned char *weights, *extra, *cp;
+      unsigned char char_buf[2];
+      int32_t idx1, idx2;
+      unsigned int ch;
+      size_t len;
+      /* Calculate the index for equivalence class.  */
+      cp = name;
+      table = (const int32_t *) _NL_CURRENT (LC_COLLATE, _NL_COLLATE_TABLEMB);
+      weights = (const unsigned char *) _NL_CURRENT (LC_COLLATE,
+					       _NL_COLLATE_WEIGHTMB);
+      extra = (const unsigned char *) _NL_CURRENT (LC_COLLATE,
+						   _NL_COLLATE_EXTRAMB);
+      indirect = (const int32_t *) _NL_CURRENT (LC_COLLATE,
+						_NL_COLLATE_INDIRECTMB);
+      idx1 = findidx (table, indirect, extra, &cp, -1);
+      if (BE (idx1 == 0 || *cp != '\0', 0))
+	/* This isn't a valid character.  */
+	return REG_ECOLLATE;
+
+      /* Build single byte matching table for this equivalence class.  */
+      len = weights[idx1 & 0xffffff];
+      for (ch = 0; ch < SBC_MAX; ++ch)
+	{
+	  char_buf[0] = ch;
+	  cp = char_buf;
+	  idx2 = findidx (table, indirect, extra, &cp, 1);
+/*
+	  idx2 = table[ch];
+*/
+	  if (idx2 == 0)
+	    /* This isn't a valid character.  */
+	    continue;
+	  /* Compare only if the length matches and the collation rule
+	     index is the same.  */
+	  if (len == weights[idx2 & 0xffffff] && (idx1 >> 24) == (idx2 >> 24))
+	    {
+	      int cnt = 0;
+
+	      while (cnt <= len &&
+		     weights[(idx1 & 0xffffff) + 1 + cnt]
+		     == weights[(idx2 & 0xffffff) + 1 + cnt])
+		++cnt;
+
+	      if (cnt > len)
+		bitset_set (sbcset, ch);
+	    }
+	}
+      /* Check whether the array has enough space.  */
+      if (BE (*equiv_class_alloc == mbcset->nequiv_classes, 0))
+	{
+	  /* Not enough, realloc it.  */
+	  /* +1 in case of mbcset->nequiv_classes is 0.  */
+	  Idx new_equiv_class_alloc = 2 * mbcset->nequiv_classes + 1;
+	  /* Use realloc since the array is NULL if *alloc == 0.  */
+	  int32_t *new_equiv_classes = re_realloc (mbcset->equiv_classes,
+						   int32_t,
+						   new_equiv_class_alloc);
+	  if (BE (new_equiv_classes == NULL, 0))
+	    return REG_ESPACE;
+	  mbcset->equiv_classes = new_equiv_classes;
+	  *equiv_class_alloc = new_equiv_class_alloc;
+	}
+      mbcset->equiv_classes[mbcset->nequiv_classes++] = idx1;
+    }
+  else
+#endif /* _LIBC */
+    {
+      if (BE (strlen ((const char *) name) != 1, 0))
+	return REG_ECOLLATE;
+      bitset_set (sbcset, *name);
+    }
+  return REG_NOERROR;
+}
+
+  /* Helper function for parse_bracket_exp.
+     Build the character class which is represented by NAME.
+     The result are written to MBCSET and SBCSET.
+     CHAR_CLASS_ALLOC is the allocated size of mbcset->char_classes,
+     is a pointer argument since we may update it.  */
+
+static reg_errcode_t
+#ifdef RE_ENABLE_I18N
+build_charclass (RE_TRANSLATE_TYPE trans, bitset_t sbcset,
+		 re_charset_t *mbcset, Idx *char_class_alloc,
+		 const char *class_name, reg_syntax_t syntax)
+#else /* not RE_ENABLE_I18N */
+build_charclass (RE_TRANSLATE_TYPE trans, bitset_t sbcset,
+		 const char *class_name, reg_syntax_t syntax)
+#endif /* not RE_ENABLE_I18N */
+{
+  int i;
+  const char *name = class_name;
+
+  /* In case of REG_ICASE "upper" and "lower" match the both of
+     upper and lower cases.  */
+  if ((syntax & RE_ICASE)
+      && (strcmp (name, "upper") == 0 || strcmp (name, "lower") == 0))
+    name = "alpha";
+
+#ifdef RE_ENABLE_I18N
+  /* Check the space of the arrays.  */
+  if (BE (*char_class_alloc == mbcset->nchar_classes, 0))
+    {
+      /* Not enough, realloc it.  */
+      /* +1 in case of mbcset->nchar_classes is 0.  */
+      Idx new_char_class_alloc = 2 * mbcset->nchar_classes + 1;
+      /* Use realloc since array is NULL if *alloc == 0.  */
+      wctype_t *new_char_classes = re_realloc (mbcset->char_classes, wctype_t,
+					       new_char_class_alloc);
+      if (BE (new_char_classes == NULL, 0))
+	return REG_ESPACE;
+      mbcset->char_classes = new_char_classes;
+      *char_class_alloc = new_char_class_alloc;
+    }
+  mbcset->char_classes[mbcset->nchar_classes++] = __wctype (name);
+#endif /* RE_ENABLE_I18N */
+
+#define BUILD_CHARCLASS_LOOP(ctype_func)	\
+  do {						\
+    if (BE (trans != NULL, 0))			\
+      {						\
+	for (i = 0; i < SBC_MAX; ++i)		\
+	  if (ctype_func (i))			\
+	    bitset_set (sbcset, trans[i]);	\
+      }						\
+    else					\
+      {						\
+	for (i = 0; i < SBC_MAX; ++i)		\
+	  if (ctype_func (i))			\
+	    bitset_set (sbcset, i);		\
+      }						\
+  } while (0)
+
+  if (strcmp (name, "alnum") == 0)
+    BUILD_CHARCLASS_LOOP (isalnum);
+  else if (strcmp (name, "cntrl") == 0)
+    BUILD_CHARCLASS_LOOP (iscntrl);
+  else if (strcmp (name, "lower") == 0)
+    BUILD_CHARCLASS_LOOP (islower);
+  else if (strcmp (name, "space") == 0)
+    BUILD_CHARCLASS_LOOP (isspace);
+  else if (strcmp (name, "alpha") == 0)
+    BUILD_CHARCLASS_LOOP (isalpha);
+  else if (strcmp (name, "digit") == 0)
+    BUILD_CHARCLASS_LOOP (isdigit);
+  else if (strcmp (name, "print") == 0)
+    BUILD_CHARCLASS_LOOP (isprint);
+  else if (strcmp (name, "upper") == 0)
+    BUILD_CHARCLASS_LOOP (isupper);
+  else if (strcmp (name, "blank") == 0)
+    BUILD_CHARCLASS_LOOP (isblank);
+  else if (strcmp (name, "graph") == 0)
+    BUILD_CHARCLASS_LOOP (isgraph);
+  else if (strcmp (name, "punct") == 0)
+    BUILD_CHARCLASS_LOOP (ispunct);
+  else if (strcmp (name, "xdigit") == 0)
+    BUILD_CHARCLASS_LOOP (isxdigit);
+  else
+    return REG_ECTYPE;
+
+  return REG_NOERROR;
+}
+
+static bin_tree_t *
+build_charclass_op (re_dfa_t *dfa, RE_TRANSLATE_TYPE trans,
+		    const char *class_name,
+		    const char *extra, bool non_match,
+		    reg_errcode_t *err)
+{
+  re_bitset_ptr_t sbcset;
+#ifdef RE_ENABLE_I18N
+  re_charset_t *mbcset;
+  Idx alloc = 0;
+#endif /* not RE_ENABLE_I18N */
+  reg_errcode_t ret;
+  re_token_t br_token;
+  bin_tree_t *tree;
+
+  sbcset = (re_bitset_ptr_t) calloc (sizeof (bitset_t), 1);
+  if (BE (sbcset == NULL, 0))
+    {
+      *err = REG_ESPACE;
+      return NULL;
+    }
+#ifdef RE_ENABLE_I18N
+  mbcset = (re_charset_t *) calloc (sizeof (re_charset_t), 1);
+  if (BE (mbcset == NULL, 0))
+    {
+      re_free (sbcset);
+      *err = REG_ESPACE;
+      return NULL;
+    }
+  mbcset->non_match = non_match;
+#endif /* RE_ENABLE_I18N */
+
+  /* We don't care the syntax in this case.  */
+  ret = build_charclass (trans, sbcset,
+#ifdef RE_ENABLE_I18N
+			 mbcset, &alloc,
+#endif /* RE_ENABLE_I18N */
+			 class_name, 0);
+
+  if (BE (ret != REG_NOERROR, 0))
+    {
+      re_free (sbcset);
+#ifdef RE_ENABLE_I18N
+      free_charset (mbcset);
+#endif /* RE_ENABLE_I18N */
+      *err = ret;
+      return NULL;
+    }
+  /* \w match '_' also.  */
+  for (; *extra; extra++)
+    bitset_set (sbcset, *extra);
+
+  /* If it is non-matching list.  */
+  if (non_match)
+    bitset_not (sbcset);
+
+#ifdef RE_ENABLE_I18N
+  /* Ensure only single byte characters are set.  */
+  if (dfa->mb_cur_max > 1)
+    bitset_mask (sbcset, dfa->sb_char);
+#endif
+
+  /* Build a tree for simple bracket.  */
+#if defined GCC_LINT || defined lint
+  memset (&br_token, 0, sizeof br_token);
+#endif
+  br_token.type = SIMPLE_BRACKET;
+  br_token.opr.sbcset = sbcset;
+  tree = create_token_tree (dfa, NULL, NULL, &br_token);
+  if (BE (tree == NULL, 0))
+    goto build_word_op_espace;
+
+#ifdef RE_ENABLE_I18N
+  if (dfa->mb_cur_max > 1)
+    {
+      bin_tree_t *mbc_tree;
+      /* Build a tree for complex bracket.  */
+      br_token.type = COMPLEX_BRACKET;
+      br_token.opr.mbcset = mbcset;
+      dfa->has_mb_node = 1;
+      mbc_tree = create_token_tree (dfa, NULL, NULL, &br_token);
+      if (BE (mbc_tree == NULL, 0))
+	goto build_word_op_espace;
+      /* Then join them by ALT node.  */
+      tree = create_tree (dfa, tree, mbc_tree, OP_ALT);
+      if (BE (mbc_tree != NULL, 1))
+	return tree;
+    }
+  else
+    {
+      free_charset (mbcset);
+      return tree;
+    }
+#else /* not RE_ENABLE_I18N */
+  return tree;
+#endif /* not RE_ENABLE_I18N */
+
+ build_word_op_espace:
+  re_free (sbcset);
+#ifdef RE_ENABLE_I18N
+  free_charset (mbcset);
+#endif /* RE_ENABLE_I18N */
+  *err = REG_ESPACE;
+  return NULL;
+}
+
+/* This is intended for the expressions like "a{1,3}".
+   Fetch a number from 'input', and return the number.
+   Return -1 if the number field is empty like "{,1}".
+   Return RE_DUP_MAX + 1 if the number field is too large.
+   Return -2 if an error occurred.  */
+
+static Idx
+fetch_number (re_string_t *input, re_token_t *token, reg_syntax_t syntax)
+{
+  Idx num = -1;
+  unsigned char c;
+  while (1)
+    {
+      fetch_token (token, input, syntax);
+      c = token->opr.c;
+      if (BE (token->type == END_OF_RE, 0))
+	return -2;
+      if (token->type == OP_CLOSE_DUP_NUM || c == ',')
+	break;
+      num = ((token->type != CHARACTER || c < '0' || '9' < c || num == -2)
+	     ? -2
+	     : num == -1
+	     ? c - '0'
+	     : MIN (RE_DUP_MAX + 1, num * 10 + c - '0'));
+    }
+  return num;
+}
+
+#ifdef RE_ENABLE_I18N
+static void
+free_charset (re_charset_t *cset)
+{
+  re_free (cset->mbchars);
+# ifdef _LIBC
+  re_free (cset->coll_syms);
+  re_free (cset->equiv_classes);
+  re_free (cset->range_starts);
+  re_free (cset->range_ends);
+# endif
+  re_free (cset->char_classes);
+  re_free (cset);
+}
+#endif /* RE_ENABLE_I18N */
+
+/* Functions for binary tree operation.  */
+
+/* Create a tree node.  */
+
+static bin_tree_t *
+create_tree (re_dfa_t *dfa, bin_tree_t *left, bin_tree_t *right,
+	     re_token_type_t type)
+{
+  re_token_t t;
+#if defined GCC_LINT || defined lint
+  memset (&t, 0, sizeof t);
+#endif
+  t.type = type;
+  return create_token_tree (dfa, left, right, &t);
+}
+
+static bin_tree_t *
+create_token_tree (re_dfa_t *dfa, bin_tree_t *left, bin_tree_t *right,
+		   const re_token_t *token)
+{
+  bin_tree_t *tree;
+  if (BE (dfa->str_tree_storage_idx == BIN_TREE_STORAGE_SIZE, 0))
+    {
+      bin_tree_storage_t *storage = re_malloc (bin_tree_storage_t, 1);
+
+      if (storage == NULL)
+	return NULL;
+      storage->next = dfa->str_tree_storage;
+      dfa->str_tree_storage = storage;
+      dfa->str_tree_storage_idx = 0;
+    }
+  tree = &dfa->str_tree_storage->data[dfa->str_tree_storage_idx++];
+
+  tree->parent = NULL;
+  tree->left = left;
+  tree->right = right;
+  tree->token = *token;
+  tree->token.duplicated = 0;
+  tree->token.opt_subexp = 0;
+  tree->first = NULL;
+  tree->next = NULL;
+  tree->node_idx = -1;
+
+  if (left != NULL)
+    left->parent = tree;
+  if (right != NULL)
+    right->parent = tree;
+  return tree;
+}
+
+/* Mark the tree SRC as an optional subexpression.
+   To be called from preorder or postorder.  */
+
+static reg_errcode_t
+mark_opt_subexp (void *extra, bin_tree_t *node)
+{
+  Idx idx = (uintptr_t) extra;
+  if (node->token.type == SUBEXP && node->token.opr.idx == idx)
+    node->token.opt_subexp = 1;
+
+  return REG_NOERROR;
+}
+
+/* Free the allocated memory inside NODE. */
+
+static void
+free_token (re_token_t *node)
+{
+#ifdef RE_ENABLE_I18N
+  if (node->type == COMPLEX_BRACKET && node->duplicated == 0)
+    free_charset (node->opr.mbcset);
+  else
+#endif /* RE_ENABLE_I18N */
+    if (node->type == SIMPLE_BRACKET && node->duplicated == 0)
+      re_free (node->opr.sbcset);
+}
+
+/* Worker function for tree walking.  Free the allocated memory inside NODE
+   and its children. */
+
+static reg_errcode_t
+free_tree (void *extra, bin_tree_t *node)
+{
+  free_token (&node->token);
+  return REG_NOERROR;
+}
+
+
+/* Duplicate the node SRC, and return new node.  This is a preorder
+   visit similar to the one implemented by the generic visitor, but
+   we need more infrastructure to maintain two parallel trees --- so,
+   it's easier to duplicate.  */
+
+static bin_tree_t *
+duplicate_tree (const bin_tree_t *root, re_dfa_t *dfa)
+{
+  const bin_tree_t *node;
+  bin_tree_t *dup_root;
+  bin_tree_t **p_new = &dup_root, *dup_node = root->parent;
+
+  for (node = root; ; )
+    {
+      /* Create a new tree and link it back to the current parent.  */
+      *p_new = create_token_tree (dfa, NULL, NULL, &node->token);
+      if (*p_new == NULL)
+	return NULL;
+      (*p_new)->parent = dup_node;
+      (*p_new)->token.duplicated = 1;
+      dup_node = *p_new;
+
+      /* Go to the left node, or up and to the right.  */
+      if (node->left)
+	{
+	  node = node->left;
+	  p_new = &dup_node->left;
+	}
+      else
+	{
+	  const bin_tree_t *prev = NULL;
+	  while (node->right == prev || node->right == NULL)
+	    {
+	      prev = node;
+	      node = node->parent;
+	      dup_node = dup_node->parent;
+	      if (!node)
+		return dup_root;
+	    }
+	  node = node->right;
+	  p_new = &dup_node->right;
+	}
+    }
+}
diff --git a/gl/regex.c b/gl/regex.c
new file mode 100644
index 0000000..d1de139
--- /dev/null
+++ b/gl/regex.c
@@ -0,0 +1,81 @@
+/* Extended regular expression matching and search library.
+   Copyright (C) 2002-2017 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
+
+#ifndef _LIBC
+# include <config.h>
+
+# if (__GNUC__ == 4 && 6 <= __GNUC_MINOR__) || 4 < __GNUC__
+#  pragma GCC diagnostic ignored "-Wsuggest-attribute=pure"
+# endif
+# if (__GNUC__ == 4 && 3 <= __GNUC_MINOR__) || 4 < __GNUC__
+#  pragma GCC diagnostic ignored "-Wold-style-definition"
+#  pragma GCC diagnostic ignored "-Wtype-limits"
+# endif
+#endif
+
+/* Make sure no one compiles this code with a C++ compiler.  */
+#if defined __cplusplus && defined _LIBC
+# error "This is C code, use a C compiler"
+#endif
+
+#ifdef _LIBC
+/* We have to keep the namespace clean.  */
+# define regfree(preg) __regfree (preg)
+# define regexec(pr, st, nm, pm, ef) __regexec (pr, st, nm, pm, ef)
+# define regcomp(preg, pattern, cflags) __regcomp (preg, pattern, cflags)
+# define regerror(errcode, preg, errbuf, errbuf_size) \
+	__regerror(errcode, preg, errbuf, errbuf_size)
+# define re_set_registers(bu, re, nu, st, en) \
+	__re_set_registers (bu, re, nu, st, en)
+# define re_match_2(bufp, string1, size1, string2, size2, pos, regs, stop) \
+	__re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop)
+# define re_match(bufp, string, size, pos, regs) \
+	__re_match (bufp, string, size, pos, regs)
+# define re_search(bufp, string, size, startpos, range, regs) \
+	__re_search (bufp, string, size, startpos, range, regs)
+# define re_compile_pattern(pattern, length, bufp) \
+	__re_compile_pattern (pattern, length, bufp)
+# define re_set_syntax(syntax) __re_set_syntax (syntax)
+# define re_search_2(bufp, st1, s1, st2, s2, startpos, range, regs, stop) \
+	__re_search_2 (bufp, st1, s1, st2, s2, startpos, range, regs, stop)
+# define re_compile_fastmap(bufp) __re_compile_fastmap (bufp)
+
+# include "../locale/localeinfo.h"
+#endif
+
+/* On some systems, limits.h sets RE_DUP_MAX to a lower value than
+   GNU regex allows.  Include it before <regex.h>, which correctly
+   #undefs RE_DUP_MAX and sets it to the right value.  */
+#include <limits.h>
+
+#include <regex.h>
+#include "regex_internal.h"
+
+#include "regex_internal.c"
+#include "regcomp.c"
+#include "regexec.c"
+
+/* Binary backward compatibility.  */
+#if _LIBC
+# include <shlib-compat.h>
+# if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_3)
+link_warning (re_max_failures, "the 're_max_failures' variable is obsolete and will go away.")
+int re_max_failures = 2000;
+# endif
+#endif
diff --git a/gl/regex.h b/gl/regex.h
new file mode 100644
index 0000000..e356b2c
--- /dev/null
+++ b/gl/regex.h
@@ -0,0 +1,659 @@
+/* Definitions for data structures and routines for the regular
+   expression library.
+   Copyright (C) 1985, 1989-1993, 1995-1998, 2000-2003, 2005-2017 Free Software
+   Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
+
+#ifndef _REGEX_H
+#define _REGEX_H 1
+
+#include <sys/types.h>
+
+/* Allow the use in C++ code.  */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Define __USE_GNU to declare GNU extensions that violate the
+   POSIX name space rules.  */
+#ifdef _GNU_SOURCE
+# define __USE_GNU 1
+#endif
+
+#ifdef _REGEX_LARGE_OFFSETS
+
+/* Use types and values that are wide enough to represent signed and
+   unsigned byte offsets in memory.  This currently works only when
+   the regex code is used outside of the GNU C library; it is not yet
+   supported within glibc itself, and glibc users should not define
+   _REGEX_LARGE_OFFSETS.  */
+
+/* The type of object sizes.  */
+typedef size_t __re_size_t;
+
+/* The type of object sizes, in places where the traditional code
+   uses unsigned long int.  */
+typedef size_t __re_long_size_t;
+
+#else
+
+/* The traditional GNU regex implementation mishandles strings longer
+   than INT_MAX.  */
+typedef unsigned int __re_size_t;
+typedef unsigned long int __re_long_size_t;
+
+#endif
+
+/* The following two types have to be signed and unsigned integer type
+   wide enough to hold a value of a pointer.  For most ANSI compilers
+   ptrdiff_t and size_t should be likely OK.  Still size of these two
+   types is 2 for Microsoft C.  Ugh... */
+typedef long int s_reg_t;
+typedef unsigned long int active_reg_t;
+
+/* The following bits are used to determine the regexp syntax we
+   recognize.  The set/not-set meanings are chosen so that Emacs syntax
+   remains the value 0.  The bits are given in alphabetical order, and
+   the definitions shifted by one from the previous bit; thus, when we
+   add or remove a bit, only one other definition need change.  */
+typedef unsigned long int reg_syntax_t;
+
+#ifdef __USE_GNU
+/* If this bit is not set, then \ inside a bracket expression is literal.
+   If set, then such a \ quotes the following character.  */
+# define RE_BACKSLASH_ESCAPE_IN_LISTS ((unsigned long int) 1)
+
+/* If this bit is not set, then + and ? are operators, and \+ and \? are
+     literals.
+   If set, then \+ and \? are operators and + and ? are literals.  */
+# define RE_BK_PLUS_QM (RE_BACKSLASH_ESCAPE_IN_LISTS << 1)
+
+/* If this bit is set, then character classes are supported.  They are:
+     [:alpha:], [:upper:], [:lower:],  [:digit:], [:alnum:], [:xdigit:],
+     [:space:], [:print:], [:punct:], [:graph:], and [:cntrl:].
+   If not set, then character classes are not supported.  */
+# define RE_CHAR_CLASSES (RE_BK_PLUS_QM << 1)
+
+/* If this bit is set, then ^ and $ are always anchors (outside bracket
+     expressions, of course).
+   If this bit is not set, then it depends:
+	^  is an anchor if it is at the beginning of a regular
+	   expression or after an open-group or an alternation operator;
+	$  is an anchor if it is at the end of a regular expression, or
+	   before a close-group or an alternation operator.
+
+   This bit could be (re)combined with RE_CONTEXT_INDEP_OPS, because
+   POSIX draft 11.2 says that * etc. in leading positions is undefined.
+   We already implemented a previous draft which made those constructs
+   invalid, though, so we haven't changed the code back.  */
+# define RE_CONTEXT_INDEP_ANCHORS (RE_CHAR_CLASSES << 1)
+
+/* If this bit is set, then special characters are always special
+     regardless of where they are in the pattern.
+   If this bit is not set, then special characters are special only in
+     some contexts; otherwise they are ordinary.  Specifically,
+     * + ? and intervals are only special when not after the beginning,
+     open-group, or alternation operator.  */
+# define RE_CONTEXT_INDEP_OPS (RE_CONTEXT_INDEP_ANCHORS << 1)
+
+/* If this bit is set, then *, +, ?, and { cannot be first in an re or
+     immediately after an alternation or begin-group operator.  */
+# define RE_CONTEXT_INVALID_OPS (RE_CONTEXT_INDEP_OPS << 1)
+
+/* If this bit is set, then . matches newline.
+   If not set, then it doesn't.  */
+# define RE_DOT_NEWLINE (RE_CONTEXT_INVALID_OPS << 1)
+
+/* If this bit is set, then . doesn't match NUL.
+   If not set, then it does.  */
+# define RE_DOT_NOT_NULL (RE_DOT_NEWLINE << 1)
+
+/* If this bit is set, nonmatching lists [^...] do not match newline.
+   If not set, they do.  */
+# define RE_HAT_LISTS_NOT_NEWLINE (RE_DOT_NOT_NULL << 1)
+
+/* If this bit is set, either \{...\} or {...} defines an
+     interval, depending on RE_NO_BK_BRACES.
+   If not set, \{, \}, {, and } are literals.  */
+# define RE_INTERVALS (RE_HAT_LISTS_NOT_NEWLINE << 1)
+
+/* If this bit is set, +, ? and | aren't recognized as operators.
+   If not set, they are.  */
+# define RE_LIMITED_OPS (RE_INTERVALS << 1)
+
+/* If this bit is set, newline is an alternation operator.
+   If not set, newline is literal.  */
+# define RE_NEWLINE_ALT (RE_LIMITED_OPS << 1)
+
+/* If this bit is set, then '{...}' defines an interval, and \{ and \}
+     are literals.
+  If not set, then '\{...\}' defines an interval.  */
+# define RE_NO_BK_BRACES (RE_NEWLINE_ALT << 1)
+
+/* If this bit is set, (...) defines a group, and \( and \) are literals.
+   If not set, \(...\) defines a group, and ( and ) are literals.  */
+# define RE_NO_BK_PARENS (RE_NO_BK_BRACES << 1)
+
+/* If this bit is set, then \<digit> matches <digit>.
+   If not set, then \<digit> is a back-reference.  */
+# define RE_NO_BK_REFS (RE_NO_BK_PARENS << 1)
+
+/* If this bit is set, then | is an alternation operator, and \| is literal.
+   If not set, then \| is an alternation operator, and | is literal.  */
+# define RE_NO_BK_VBAR (RE_NO_BK_REFS << 1)
+
+/* If this bit is set, then an ending range point collating higher
+     than the starting range point, as in [z-a], is invalid.
+   If not set, then when ending range point collates higher than the
+     starting range point, the range is ignored.  */
+# define RE_NO_EMPTY_RANGES (RE_NO_BK_VBAR << 1)
+
+/* If this bit is set, then an unmatched ) is ordinary.
+   If not set, then an unmatched ) is invalid.  */
+# define RE_UNMATCHED_RIGHT_PAREN_ORD (RE_NO_EMPTY_RANGES << 1)
+
+/* If this bit is set, succeed as soon as we match the whole pattern,
+   without further backtracking.  */
+# define RE_NO_POSIX_BACKTRACKING (RE_UNMATCHED_RIGHT_PAREN_ORD << 1)
+
+/* If this bit is set, do not process the GNU regex operators.
+   If not set, then the GNU regex operators are recognized. */
+# define RE_NO_GNU_OPS (RE_NO_POSIX_BACKTRACKING << 1)
+
+/* If this bit is set, turn on internal regex debugging.
+   If not set, and debugging was on, turn it off.
+   This only works if regex.c is compiled -DDEBUG.
+   We define this bit always, so that all that's needed to turn on
+   debugging is to recompile regex.c; the calling code can always have
+   this bit set, and it won't affect anything in the normal case. */
+# define RE_DEBUG (RE_NO_GNU_OPS << 1)
+
+/* If this bit is set, a syntactically invalid interval is treated as
+   a string of ordinary characters.  For example, the ERE 'a{1' is
+   treated as 'a\{1'.  */
+# define RE_INVALID_INTERVAL_ORD (RE_DEBUG << 1)
+
+/* If this bit is set, then ignore case when matching.
+   If not set, then case is significant.  */
+# define RE_ICASE (RE_INVALID_INTERVAL_ORD << 1)
+
+/* This bit is used internally like RE_CONTEXT_INDEP_ANCHORS but only
+   for ^, because it is difficult to scan the regex backwards to find
+   whether ^ should be special.  */
+# define RE_CARET_ANCHORS_HERE (RE_ICASE << 1)
+
+/* If this bit is set, then \{ cannot be first in a regex or
+   immediately after an alternation, open-group or \} operator.  */
+# define RE_CONTEXT_INVALID_DUP (RE_CARET_ANCHORS_HERE << 1)
+
+/* If this bit is set, then no_sub will be set to 1 during
+   re_compile_pattern.  */
+# define RE_NO_SUB (RE_CONTEXT_INVALID_DUP << 1)
+#endif
+
+/* This global variable defines the particular regexp syntax to use (for
+   some interfaces).  When a regexp is compiled, the syntax used is
+   stored in the pattern buffer, so changing this does not affect
+   already-compiled regexps.  */
+extern reg_syntax_t re_syntax_options;
+
+#ifdef __USE_GNU
+/* Define combinations of the above bits for the standard possibilities.
+   (The [[[ comments delimit what gets put into the Texinfo file, so
+   don't delete them!)  */
+/* [[[begin syntaxes]]] */
+# define RE_SYNTAX_EMACS 0
+
+# define RE_SYNTAX_AWK							\
+  (RE_BACKSLASH_ESCAPE_IN_LISTS   | RE_DOT_NOT_NULL			\
+   | RE_NO_BK_PARENS              | RE_NO_BK_REFS			\
+   | RE_NO_BK_VBAR                | RE_NO_EMPTY_RANGES			\
+   | RE_DOT_NEWLINE		  | RE_CONTEXT_INDEP_ANCHORS		\
+   | RE_CHAR_CLASSES							\
+   | RE_UNMATCHED_RIGHT_PAREN_ORD | RE_NO_GNU_OPS)
+
+# define RE_SYNTAX_GNU_AWK						\
+  ((RE_SYNTAX_POSIX_EXTENDED | RE_BACKSLASH_ESCAPE_IN_LISTS		\
+    | RE_INVALID_INTERVAL_ORD)						\
+   & ~(RE_DOT_NOT_NULL | RE_CONTEXT_INDEP_OPS				\
+      | RE_CONTEXT_INVALID_OPS ))
+
+# define RE_SYNTAX_POSIX_AWK						\
+  (RE_SYNTAX_POSIX_EXTENDED | RE_BACKSLASH_ESCAPE_IN_LISTS		\
+   | RE_INTERVALS	    | RE_NO_GNU_OPS				\
+   | RE_INVALID_INTERVAL_ORD)
+
+# define RE_SYNTAX_GREP							\
+  ((RE_SYNTAX_POSIX_BASIC | RE_NEWLINE_ALT)				\
+   & ~(RE_CONTEXT_INVALID_DUP | RE_DOT_NOT_NULL))
+
+# define RE_SYNTAX_EGREP						\
+  ((RE_SYNTAX_POSIX_EXTENDED | RE_INVALID_INTERVAL_ORD | RE_NEWLINE_ALT) \
+   & ~(RE_CONTEXT_INVALID_OPS | RE_DOT_NOT_NULL))
+
+/* POSIX grep -E behavior is no longer incompatible with GNU.  */
+# define RE_SYNTAX_POSIX_EGREP						\
+  RE_SYNTAX_EGREP
+
+/* P1003.2/D11.2, section 4.20.7.1, lines 5078ff.  */
+# define RE_SYNTAX_ED RE_SYNTAX_POSIX_BASIC
+
+# define RE_SYNTAX_SED RE_SYNTAX_POSIX_BASIC
+
+/* Syntax bits common to both basic and extended POSIX regex syntax.  */
+# define _RE_SYNTAX_POSIX_COMMON					\
+  (RE_CHAR_CLASSES | RE_DOT_NEWLINE      | RE_DOT_NOT_NULL		\
+   | RE_INTERVALS  | RE_NO_EMPTY_RANGES)
+
+# define RE_SYNTAX_POSIX_BASIC						\
+  (_RE_SYNTAX_POSIX_COMMON | RE_BK_PLUS_QM | RE_CONTEXT_INVALID_DUP)
+
+/* Differs from ..._POSIX_BASIC only in that RE_BK_PLUS_QM becomes
+   RE_LIMITED_OPS, i.e., \? \+ \| are not recognized.  Actually, this
+   isn't minimal, since other operators, such as \`, aren't disabled.  */
+# define RE_SYNTAX_POSIX_MINIMAL_BASIC					\
+  (_RE_SYNTAX_POSIX_COMMON | RE_LIMITED_OPS)
+
+# define RE_SYNTAX_POSIX_EXTENDED					\
+  (_RE_SYNTAX_POSIX_COMMON  | RE_CONTEXT_INDEP_ANCHORS			\
+   | RE_CONTEXT_INDEP_OPS   | RE_NO_BK_BRACES				\
+   | RE_NO_BK_PARENS        | RE_NO_BK_VBAR				\
+   | RE_CONTEXT_INVALID_OPS | RE_UNMATCHED_RIGHT_PAREN_ORD)
+
+/* Differs from ..._POSIX_EXTENDED in that RE_CONTEXT_INDEP_OPS is
+   removed and RE_NO_BK_REFS is added.  */
+# define RE_SYNTAX_POSIX_MINIMAL_EXTENDED				\
+  (_RE_SYNTAX_POSIX_COMMON  | RE_CONTEXT_INDEP_ANCHORS			\
+   | RE_CONTEXT_INVALID_OPS | RE_NO_BK_BRACES				\
+   | RE_NO_BK_PARENS        | RE_NO_BK_REFS				\
+   | RE_NO_BK_VBAR	    | RE_UNMATCHED_RIGHT_PAREN_ORD)
+/* [[[end syntaxes]]] */
+
+/* Maximum number of duplicates an interval can allow.  POSIX-conforming
+   systems might define this in <limits.h>, but we want our
+   value, so remove any previous define.  */
+# ifdef _REGEX_INCLUDE_LIMITS_H
+#  include <limits.h>
+# endif
+# ifdef RE_DUP_MAX
+#  undef RE_DUP_MAX
+# endif
+
+/* RE_DUP_MAX is 2**15 - 1 because an earlier implementation stored
+   the counter as a 2-byte signed integer.  This is no longer true, so
+   RE_DUP_MAX could be increased to (INT_MAX / 10 - 1), or to
+   ((SIZE_MAX - 9) / 10) if _REGEX_LARGE_OFFSETS is defined.
+   However, there would be a huge performance problem if someone
+   actually used a pattern like a\{214748363\}, so RE_DUP_MAX retains
+   its historical value.  */
+# define RE_DUP_MAX (0x7fff)
+#endif
+
+
+/* POSIX 'cflags' bits (i.e., information for 'regcomp').  */
+
+/* If this bit is set, then use extended regular expression syntax.
+   If not set, then use basic regular expression syntax.  */
+#define REG_EXTENDED 1
+
+/* If this bit is set, then ignore case when matching.
+   If not set, then case is significant.  */
+#define REG_ICASE (1 << 1)
+
+/* If this bit is set, then anchors do not match at newline
+     characters in the string.
+   If not set, then anchors do match at newlines.  */
+#define REG_NEWLINE (1 << 2)
+
+/* If this bit is set, then report only success or fail in regexec.
+   If not set, then returns differ between not matching and errors.  */
+#define REG_NOSUB (1 << 3)
+
+
+/* POSIX 'eflags' bits (i.e., information for regexec).  */
+
+/* If this bit is set, then the beginning-of-line operator doesn't match
+     the beginning of the string (presumably because it's not the
+     beginning of a line).
+   If not set, then the beginning-of-line operator does match the
+     beginning of the string.  */
+#define REG_NOTBOL 1
+
+/* Like REG_NOTBOL, except for the end-of-line.  */
+#define REG_NOTEOL (1 << 1)
+
+/* Use PMATCH[0] to delimit the start and end of the search in the
+   buffer.  */
+#define REG_STARTEND (1 << 2)
+
+
+/* If any error codes are removed, changed, or added, update the
+   '__re_error_msgid' table in regcomp.c.  */
+
+typedef enum
+{
+  _REG_ENOSYS = -1,	/* This will never happen for this implementation.  */
+  _REG_NOERROR = 0,	/* Success.  */
+  _REG_NOMATCH,		/* Didn't find a match (for regexec).  */
+
+  /* POSIX regcomp return error codes.  (In the order listed in the
+     standard.)  */
+  _REG_BADPAT,		/* Invalid pattern.  */
+  _REG_ECOLLATE,	/* Invalid collating element.  */
+  _REG_ECTYPE,		/* Invalid character class name.  */
+  _REG_EESCAPE,		/* Trailing backslash.  */
+  _REG_ESUBREG,		/* Invalid back reference.  */
+  _REG_EBRACK,		/* Unmatched left bracket.  */
+  _REG_EPAREN,		/* Parenthesis imbalance.  */
+  _REG_EBRACE,		/* Unmatched \{.  */
+  _REG_BADBR,		/* Invalid contents of \{\}.  */
+  _REG_ERANGE,		/* Invalid range end.  */
+  _REG_ESPACE,		/* Ran out of memory.  */
+  _REG_BADRPT,		/* No preceding re for repetition op.  */
+
+  /* Error codes we've added.  */
+  _REG_EEND,		/* Premature end.  */
+  _REG_ESIZE,		/* Too large (e.g., repeat count too large).  */
+  _REG_ERPAREN		/* Unmatched ) or \); not returned from regcomp.  */
+} reg_errcode_t;
+
+#if defined _XOPEN_SOURCE || defined __USE_XOPEN2K
+# define REG_ENOSYS	_REG_ENOSYS
+#endif
+#define REG_NOERROR	_REG_NOERROR
+#define REG_NOMATCH	_REG_NOMATCH
+#define REG_BADPAT	_REG_BADPAT
+#define REG_ECOLLATE	_REG_ECOLLATE
+#define REG_ECTYPE	_REG_ECTYPE
+#define REG_EESCAPE	_REG_EESCAPE
+#define REG_ESUBREG	_REG_ESUBREG
+#define REG_EBRACK	_REG_EBRACK
+#define REG_EPAREN	_REG_EPAREN
+#define REG_EBRACE	_REG_EBRACE
+#define REG_BADBR	_REG_BADBR
+#define REG_ERANGE	_REG_ERANGE
+#define REG_ESPACE	_REG_ESPACE
+#define REG_BADRPT	_REG_BADRPT
+#define REG_EEND	_REG_EEND
+#define REG_ESIZE	_REG_ESIZE
+#define REG_ERPAREN	_REG_ERPAREN
+
+/* This data structure represents a compiled pattern.  Before calling
+   the pattern compiler, the fields 'buffer', 'allocated', 'fastmap',
+   and 'translate' can be set.  After the pattern has been compiled,
+   the fields 're_nsub', 'not_bol' and 'not_eol' are available.  All
+   other fields are private to the regex routines.  */
+
+#ifndef RE_TRANSLATE_TYPE
+# define __RE_TRANSLATE_TYPE unsigned char *
+# ifdef __USE_GNU
+#  define RE_TRANSLATE_TYPE __RE_TRANSLATE_TYPE
+# endif
+#endif
+
+#ifdef __USE_GNU
+# define __REPB_PREFIX(name) name
+#else
+# define __REPB_PREFIX(name) __##name
+#endif
+
+struct re_pattern_buffer
+{
+  /* Space that holds the compiled pattern.  The type
+     'struct re_dfa_t' is private and is not declared here.  */
+  struct re_dfa_t *__REPB_PREFIX(buffer);
+
+  /* Number of bytes to which 'buffer' points.  */
+  __re_long_size_t __REPB_PREFIX(allocated);
+
+  /* Number of bytes actually used in 'buffer'.  */
+  __re_long_size_t __REPB_PREFIX(used);
+
+  /* Syntax setting with which the pattern was compiled.  */
+  reg_syntax_t __REPB_PREFIX(syntax);
+
+  /* Pointer to a fastmap, if any, otherwise zero.  re_search uses the
+     fastmap, if there is one, to skip over impossible starting points
+     for matches.  */
+  char *__REPB_PREFIX(fastmap);
+
+  /* Either a translate table to apply to all characters before
+     comparing them, or zero for no translation.  The translation is
+     applied to a pattern when it is compiled and to a string when it
+     is matched.  */
+  __RE_TRANSLATE_TYPE __REPB_PREFIX(translate);
+
+  /* Number of subexpressions found by the compiler.  */
+  size_t re_nsub;
+
+  /* Zero if this pattern cannot match the empty string, one else.
+     Well, in truth it's used only in 're_search_2', to see whether or
+     not we should use the fastmap, so we don't set this absolutely
+     perfectly; see 're_compile_fastmap' (the "duplicate" case).  */
+  unsigned __REPB_PREFIX(can_be_null) : 1;
+
+  /* If REGS_UNALLOCATED, allocate space in the 'regs' structure
+     for 'max (RE_NREGS, re_nsub + 1)' groups.
+     If REGS_REALLOCATE, reallocate space if necessary.
+     If REGS_FIXED, use what's there.  */
+#ifdef __USE_GNU
+# define REGS_UNALLOCATED 0
+# define REGS_REALLOCATE 1
+# define REGS_FIXED 2
+#endif
+  unsigned __REPB_PREFIX(regs_allocated) : 2;
+
+  /* Set to zero when 're_compile_pattern' compiles a pattern; set to
+     one by 're_compile_fastmap' if it updates the fastmap.  */
+  unsigned __REPB_PREFIX(fastmap_accurate) : 1;
+
+  /* If set, 're_match_2' does not return information about
+     subexpressions.  */
+  unsigned __REPB_PREFIX(no_sub) : 1;
+
+  /* If set, a beginning-of-line anchor doesn't match at the beginning
+     of the string.  */
+  unsigned __REPB_PREFIX(not_bol) : 1;
+
+  /* Similarly for an end-of-line anchor.  */
+  unsigned __REPB_PREFIX(not_eol) : 1;
+
+  /* If true, an anchor at a newline matches.  */
+  unsigned __REPB_PREFIX(newline_anchor) : 1;
+};
+
+typedef struct re_pattern_buffer regex_t;
+
+/* Type for byte offsets within the string.  POSIX mandates this.  */
+#ifdef _REGEX_LARGE_OFFSETS
+/* POSIX 1003.1-2008 requires that regoff_t be at least as wide as
+   ptrdiff_t and ssize_t.  We don't know of any hosts where ptrdiff_t
+   is wider than ssize_t, so ssize_t is safe.  ptrdiff_t is not
+   visible here, so use ssize_t.  */
+typedef ssize_t regoff_t;
+#else
+/* The traditional GNU regex implementation mishandles strings longer
+   than INT_MAX.  */
+typedef int regoff_t;
+#endif
+
+
+#ifdef __USE_GNU
+/* This is the structure we store register match data in.  See
+   regex.texinfo for a full description of what registers match.  */
+struct re_registers
+{
+  __re_size_t num_regs;
+  regoff_t *start;
+  regoff_t *end;
+};
+
+
+/* If 'regs_allocated' is REGS_UNALLOCATED in the pattern buffer,
+   're_match_2' returns information about at least this many registers
+   the first time a 'regs' structure is passed.  */
+# ifndef RE_NREGS
+#  define RE_NREGS 30
+# endif
+#endif
+
+
+/* POSIX specification for registers.  Aside from the different names than
+   're_registers', POSIX uses an array of structures, instead of a
+   structure of arrays.  */
+typedef struct
+{
+  regoff_t rm_so;  /* Byte offset from string's start to substring's start.  */
+  regoff_t rm_eo;  /* Byte offset from string's start to substring's end.  */
+} regmatch_t;
+
+/* Declarations for routines.  */
+
+#ifdef __USE_GNU
+/* Sets the current default syntax to SYNTAX, and return the old syntax.
+   You can also simply assign to the 're_syntax_options' variable.  */
+extern reg_syntax_t re_set_syntax (reg_syntax_t __syntax);
+
+/* Compile the regular expression PATTERN, with length LENGTH
+   and syntax given by the global 're_syntax_options', into the buffer
+   BUFFER.  Return NULL if successful, and an error string if not.
+
+   To free the allocated storage, you must call 'regfree' on BUFFER.
+   Note that the translate table must either have been initialized by
+   'regcomp', with a malloc'ed value, or set to NULL before calling
+   'regfree'.  */
+extern const char *re_compile_pattern (const char *__pattern, size_t __length,
+				       struct re_pattern_buffer *__buffer);
+
+
+/* Compile a fastmap for the compiled pattern in BUFFER; used to
+   accelerate searches.  Return 0 if successful and -2 if was an
+   internal error.  */
+extern int re_compile_fastmap (struct re_pattern_buffer *__buffer);
+
+
+/* Search in the string STRING (with length LENGTH) for the pattern
+   compiled into BUFFER.  Start searching at position START, for RANGE
+   characters.  Return the starting position of the match, -1 for no
+   match, or -2 for an internal error.  Also return register
+   information in REGS (if REGS and BUFFER->no_sub are nonzero).  */
+extern regoff_t re_search (struct re_pattern_buffer *__buffer,
+			   const char *__String, regoff_t __length,
+			   regoff_t __start, regoff_t __range,
+			   struct re_registers *__regs);
+
+
+/* Like 're_search', but search in the concatenation of STRING1 and
+   STRING2.  Also, stop searching at index START + STOP.  */
+extern regoff_t re_search_2 (struct re_pattern_buffer *__buffer,
+			     const char *__string1, regoff_t __length1,
+			     const char *__string2, regoff_t __length2,
+			     regoff_t __start, regoff_t __range,
+			     struct re_registers *__regs,
+			     regoff_t __stop);
+
+
+/* Like 're_search', but return how many characters in STRING the regexp
+   in BUFFER matched, starting at position START.  */
+extern regoff_t re_match (struct re_pattern_buffer *__buffer,
+			  const char *__String, regoff_t __length,
+			  regoff_t __start, struct re_registers *__regs);
+
+
+/* Relates to 're_match' as 're_search_2' relates to 're_search'.  */
+extern regoff_t re_match_2 (struct re_pattern_buffer *__buffer,
+			    const char *__string1, regoff_t __length1,
+			    const char *__string2, regoff_t __length2,
+			    regoff_t __start, struct re_registers *__regs,
+			    regoff_t __stop);
+
+
+/* Set REGS to hold NUM_REGS registers, storing them in STARTS and
+   ENDS.  Subsequent matches using BUFFER and REGS will use this memory
+   for recording register information.  STARTS and ENDS must be
+   allocated with malloc, and must each be at least 'NUM_REGS * sizeof
+   (regoff_t)' bytes long.
+
+   If NUM_REGS == 0, then subsequent matches should allocate their own
+   register data.
+
+   Unless this function is called, the first search or match using
+   BUFFER will allocate its own register data, without
+   freeing the old data.  */
+extern void re_set_registers (struct re_pattern_buffer *__buffer,
+			      struct re_registers *__regs,
+			      __re_size_t __num_regs,
+			      regoff_t *__starts, regoff_t *__ends);
+#endif	/* Use GNU */
+
+#if defined _REGEX_RE_COMP || (defined _LIBC && defined __USE_MISC)
+# ifndef _CRAY
+/* 4.2 bsd compatibility.  */
+extern char *re_comp (const char *);
+extern int re_exec (const char *);
+# endif
+#endif
+
+/* GCC 2.95 and later have "__restrict"; C99 compilers have
+   "restrict", and "configure" may have defined "restrict".
+   Other compilers use __restrict, __restrict__, and _Restrict, and
+   'configure' might #define 'restrict' to those words, so pick a
+   different name.  */
+#ifndef _Restrict_
+# if 199901L <= __STDC_VERSION__
+#  define _Restrict_ restrict
+# elif 2 < __GNUC__ || (2 == __GNUC__ && 95 <= __GNUC_MINOR__)
+#  define _Restrict_ __restrict
+# else
+#  define _Restrict_
+# endif
+#endif
+/* gcc 3.1 and up support the [restrict] syntax.  Don't trust
+   sys/cdefs.h's definition of __restrict_arr, though, as it
+   mishandles gcc -ansi -pedantic.  */
+#ifndef _Restrict_arr_
+# if ((199901L <= __STDC_VERSION__					\
+       || ((3 < __GNUC__ || (3 == __GNUC__ && 1 <= __GNUC_MINOR__))	\
+	   && !defined __STRICT_ANSI__))					\
+      && !defined __GNUG__)
+#  define _Restrict_arr_ _Restrict_
+# else
+#  define _Restrict_arr_
+# endif
+#endif
+
+/* POSIX compatibility.  */
+extern int regcomp (regex_t *_Restrict_ __preg,
+		    const char *_Restrict_ __pattern,
+		    int __cflags);
+
+extern int regexec (const regex_t *_Restrict_ __preg,
+		    const char *_Restrict_ __String, size_t __nmatch,
+		    regmatch_t __pmatch[_Restrict_arr_],
+		    int __eflags);
+
+extern size_t regerror (int __errcode, const regex_t *_Restrict_ __preg,
+			char *_Restrict_ __errbuf, size_t __errbuf_size);
+
+extern void regfree (regex_t *__preg);
+
+
+#ifdef __cplusplus
+}
+#endif	/* C++ */
+
+#endif /* regex.h */
diff --git a/gl/regex_internal.c b/gl/regex_internal.c
new file mode 100644
index 0000000..03f6895
--- /dev/null
+++ b/gl/regex_internal.c
@@ -0,0 +1,1741 @@
+/* Extended regular expression matching and search library.
+   Copyright (C) 2002-2017 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
+
+static void re_string_construct_common (const char *str, Idx len,
+					re_string_t *pstr,
+					RE_TRANSLATE_TYPE trans, bool icase,
+					const re_dfa_t *dfa) internal_function;
+static re_dfastate_t *create_ci_newstate (const re_dfa_t *dfa,
+					  const re_node_set *nodes,
+					  re_hashval_t hash) internal_function;
+static re_dfastate_t *create_cd_newstate (const re_dfa_t *dfa,
+					  const re_node_set *nodes,
+					  unsigned int context,
+					  re_hashval_t hash) internal_function;
+
+/* Functions for string operation.  */
+
+/* This function allocate the buffers.  It is necessary to call
+   re_string_reconstruct before using the object.  */
+
+static reg_errcode_t
+internal_function __attribute_warn_unused_result__
+re_string_allocate (re_string_t *pstr, const char *str, Idx len, Idx init_len,
+		    RE_TRANSLATE_TYPE trans, bool icase, const re_dfa_t *dfa)
+{
+  reg_errcode_t ret;
+  Idx init_buf_len;
+
+  /* Ensure at least one character fits into the buffers.  */
+  if (init_len < dfa->mb_cur_max)
+    init_len = dfa->mb_cur_max;
+  init_buf_len = (len + 1 < init_len) ? len + 1: init_len;
+  re_string_construct_common (str, len, pstr, trans, icase, dfa);
+
+  ret = re_string_realloc_buffers (pstr, init_buf_len);
+  if (BE (ret != REG_NOERROR, 0))
+    return ret;
+
+  pstr->word_char = dfa->word_char;
+  pstr->word_ops_used = dfa->word_ops_used;
+  pstr->mbs = pstr->mbs_allocated ? pstr->mbs : (unsigned char *) str;
+  pstr->valid_len = (pstr->mbs_allocated || dfa->mb_cur_max > 1) ? 0 : len;
+  pstr->valid_raw_len = pstr->valid_len;
+  return REG_NOERROR;
+}
+
+/* This function allocate the buffers, and initialize them.  */
+
+static reg_errcode_t
+internal_function __attribute_warn_unused_result__
+re_string_construct (re_string_t *pstr, const char *str, Idx len,
+		     RE_TRANSLATE_TYPE trans, bool icase, const re_dfa_t *dfa)
+{
+  reg_errcode_t ret;
+  memset (pstr, '\0', sizeof (re_string_t));
+  re_string_construct_common (str, len, pstr, trans, icase, dfa);
+
+  if (len > 0)
+    {
+      ret = re_string_realloc_buffers (pstr, len + 1);
+      if (BE (ret != REG_NOERROR, 0))
+	return ret;
+    }
+  pstr->mbs = pstr->mbs_allocated ? pstr->mbs : (unsigned char *) str;
+
+  if (icase)
+    {
+#ifdef RE_ENABLE_I18N
+      if (dfa->mb_cur_max > 1)
+	{
+	  while (1)
+	    {
+	      ret = build_wcs_upper_buffer (pstr);
+	      if (BE (ret != REG_NOERROR, 0))
+		return ret;
+	      if (pstr->valid_raw_len >= len)
+		break;
+	      if (pstr->bufs_len > pstr->valid_len + dfa->mb_cur_max)
+		break;
+	      ret = re_string_realloc_buffers (pstr, pstr->bufs_len * 2);
+	      if (BE (ret != REG_NOERROR, 0))
+		return ret;
+	    }
+	}
+      else
+#endif /* RE_ENABLE_I18N  */
+	build_upper_buffer (pstr);
+    }
+  else
+    {
+#ifdef RE_ENABLE_I18N
+      if (dfa->mb_cur_max > 1)
+	build_wcs_buffer (pstr);
+      else
+#endif /* RE_ENABLE_I18N  */
+	{
+	  if (trans != NULL)
+	    re_string_translate_buffer (pstr);
+	  else
+	    {
+	      pstr->valid_len = pstr->bufs_len;
+	      pstr->valid_raw_len = pstr->bufs_len;
+	    }
+	}
+    }
+
+  return REG_NOERROR;
+}
+
+/* Helper functions for re_string_allocate, and re_string_construct.  */
+
+static reg_errcode_t
+internal_function __attribute_warn_unused_result__
+re_string_realloc_buffers (re_string_t *pstr, Idx new_buf_len)
+{
+#ifdef RE_ENABLE_I18N
+  if (pstr->mb_cur_max > 1)
+    {
+      wint_t *new_wcs;
+
+      /* Avoid overflow in realloc.  */
+      const size_t max_object_size = MAX (sizeof (wint_t), sizeof (Idx));
+      if (BE (MIN (IDX_MAX, SIZE_MAX / max_object_size) < new_buf_len, 0))
+	return REG_ESPACE;
+
+      new_wcs = re_realloc (pstr->wcs, wint_t, new_buf_len);
+      if (BE (new_wcs == NULL, 0))
+	return REG_ESPACE;
+      pstr->wcs = new_wcs;
+      if (pstr->offsets != NULL)
+	{
+	  Idx *new_offsets = re_realloc (pstr->offsets, Idx, new_buf_len);
+	  if (BE (new_offsets == NULL, 0))
+	    return REG_ESPACE;
+	  pstr->offsets = new_offsets;
+	}
+    }
+#endif /* RE_ENABLE_I18N  */
+  if (pstr->mbs_allocated)
+    {
+      unsigned char *new_mbs = re_realloc (pstr->mbs, unsigned char,
+					   new_buf_len);
+      if (BE (new_mbs == NULL, 0))
+	return REG_ESPACE;
+      pstr->mbs = new_mbs;
+    }
+  pstr->bufs_len = new_buf_len;
+  return REG_NOERROR;
+}
+
+
+static void
+internal_function
+re_string_construct_common (const char *str, Idx len, re_string_t *pstr,
+			    RE_TRANSLATE_TYPE trans, bool icase,
+			    const re_dfa_t *dfa)
+{
+  pstr->raw_mbs = (const unsigned char *) str;
+  pstr->len = len;
+  pstr->raw_len = len;
+  pstr->trans = trans;
+  pstr->icase = icase;
+  pstr->mbs_allocated = (trans != NULL || icase);
+  pstr->mb_cur_max = dfa->mb_cur_max;
+  pstr->is_utf8 = dfa->is_utf8;
+  pstr->map_notascii = dfa->map_notascii;
+  pstr->stop = pstr->len;
+  pstr->raw_stop = pstr->stop;
+}
+
+#ifdef RE_ENABLE_I18N
+
+/* Build wide character buffer PSTR->WCS.
+   If the byte sequence of the string are:
+     <mb1>(0), <mb1>(1), <mb2>(0), <mb2>(1), <sb3>
+   Then wide character buffer will be:
+     <wc1>   , WEOF    , <wc2>   , WEOF    , <wc3>
+   We use WEOF for padding, they indicate that the position isn't
+   a first byte of a multibyte character.
+
+   Note that this function assumes PSTR->VALID_LEN elements are already
+   built and starts from PSTR->VALID_LEN.  */
+
+static void
+internal_function
+build_wcs_buffer (re_string_t *pstr)
+{
+#ifdef _LIBC
+  unsigned char buf[MB_LEN_MAX];
+  assert (MB_LEN_MAX >= pstr->mb_cur_max);
+#else
+  unsigned char buf[64];
+#endif
+  mbstate_t prev_st;
+  Idx byte_idx, end_idx, remain_len;
+  size_t mbclen;
+
+  /* Build the buffers from pstr->valid_len to either pstr->len or
+     pstr->bufs_len.  */
+  end_idx = (pstr->bufs_len > pstr->len) ? pstr->len : pstr->bufs_len;
+  for (byte_idx = pstr->valid_len; byte_idx < end_idx;)
+    {
+      wchar_t wc;
+      const char *p;
+
+      remain_len = end_idx - byte_idx;
+      prev_st = pstr->cur_state;
+      /* Apply the translation if we need.  */
+      if (BE (pstr->trans != NULL, 0))
+	{
+	  int i, ch;
+
+	  for (i = 0; i < pstr->mb_cur_max && i < remain_len; ++i)
+	    {
+	      ch = pstr->raw_mbs [pstr->raw_mbs_idx + byte_idx + i];
+	      buf[i] = pstr->mbs[byte_idx + i] = pstr->trans[ch];
+	    }
+	  p = (const char *) buf;
+	}
+      else
+	p = (const char *) pstr->raw_mbs + pstr->raw_mbs_idx + byte_idx;
+      mbclen = __mbrtowc (&wc, p, remain_len, &pstr->cur_state);
+      if (BE (mbclen == (size_t) -1 || mbclen == 0
+	      || (mbclen == (size_t) -2 && pstr->bufs_len >= pstr->len), 0))
+	{
+	  /* We treat these cases as a singlebyte character.  */
+	  mbclen = 1;
+	  wc = (wchar_t) pstr->raw_mbs[pstr->raw_mbs_idx + byte_idx];
+	  if (BE (pstr->trans != NULL, 0))
+	    wc = pstr->trans[wc];
+	  pstr->cur_state = prev_st;
+	}
+      else if (BE (mbclen == (size_t) -2, 0))
+	{
+	  /* The buffer doesn't have enough space, finish to build.  */
+	  pstr->cur_state = prev_st;
+	  break;
+	}
+
+      /* Write wide character and padding.  */
+      pstr->wcs[byte_idx++] = wc;
+      /* Write paddings.  */
+      for (remain_len = byte_idx + mbclen - 1; byte_idx < remain_len ;)
+	pstr->wcs[byte_idx++] = WEOF;
+    }
+  pstr->valid_len = byte_idx;
+  pstr->valid_raw_len = byte_idx;
+}
+
+/* Build wide character buffer PSTR->WCS like build_wcs_buffer,
+   but for REG_ICASE.  */
+
+static reg_errcode_t
+internal_function __attribute_warn_unused_result__
+build_wcs_upper_buffer (re_string_t *pstr)
+{
+  mbstate_t prev_st;
+  Idx src_idx, byte_idx, end_idx, remain_len;
+  size_t mbclen;
+#ifdef _LIBC
+  char buf[MB_LEN_MAX];
+  assert (MB_LEN_MAX >= pstr->mb_cur_max);
+#else
+  char buf[64];
+#endif
+
+  byte_idx = pstr->valid_len;
+  end_idx = (pstr->bufs_len > pstr->len) ? pstr->len : pstr->bufs_len;
+
+  /* The following optimization assumes that ASCII characters can be
+     mapped to wide characters with a simple cast.  */
+  if (! pstr->map_notascii && pstr->trans == NULL && !pstr->offsets_needed)
+    {
+      while (byte_idx < end_idx)
+	{
+	  wchar_t wc;
+
+	  if (isascii (pstr->raw_mbs[pstr->raw_mbs_idx + byte_idx])
+	      && mbsinit (&pstr->cur_state))
+	    {
+	      /* In case of a singlebyte character.  */
+	      pstr->mbs[byte_idx]
+		= toupper (pstr->raw_mbs[pstr->raw_mbs_idx + byte_idx]);
+	      /* The next step uses the assumption that wchar_t is encoded
+		 ASCII-safe: all ASCII values can be converted like this.  */
+	      pstr->wcs[byte_idx] = (wchar_t) pstr->mbs[byte_idx];
+	      ++byte_idx;
+	      continue;
+	    }
+
+	  remain_len = end_idx - byte_idx;
+	  prev_st = pstr->cur_state;
+	  mbclen = __mbrtowc (&wc,
+			      ((const char *) pstr->raw_mbs + pstr->raw_mbs_idx
+			       + byte_idx), remain_len, &pstr->cur_state);
+	  if (BE (mbclen < (size_t) -2, 1))
+	    {
+	      wchar_t wcu = __towupper (wc);
+	      if (wcu != wc)
+		{
+		  size_t mbcdlen;
+
+		  mbcdlen = __wcrtomb (buf, wcu, &prev_st);
+		  if (BE (mbclen == mbcdlen, 1))
+		    memcpy (pstr->mbs + byte_idx, buf, mbclen);
+		  else
+		    {
+		      src_idx = byte_idx;
+		      goto offsets_needed;
+		    }
+		}
+	      else
+		memcpy (pstr->mbs + byte_idx,
+			pstr->raw_mbs + pstr->raw_mbs_idx + byte_idx, mbclen);
+	      pstr->wcs[byte_idx++] = wcu;
+	      /* Write paddings.  */
+	      for (remain_len = byte_idx + mbclen - 1; byte_idx < remain_len ;)
+		pstr->wcs[byte_idx++] = WEOF;
+	    }
+	  else if (mbclen == (size_t) -1 || mbclen == 0
+		   || (mbclen == (size_t) -2 && pstr->bufs_len >= pstr->len))
+	    {
+	      /* It is an invalid character, an incomplete character
+		 at the end of the string, or '\0'.  Just use the byte.  */
+	      int ch = pstr->raw_mbs[pstr->raw_mbs_idx + byte_idx];
+	      pstr->mbs[byte_idx] = ch;
+	      /* And also cast it to wide char.  */
+	      pstr->wcs[byte_idx++] = (wchar_t) ch;
+	      if (BE (mbclen == (size_t) -1, 0))
+		pstr->cur_state = prev_st;
+	    }
+	  else
+	    {
+	      /* The buffer doesn't have enough space, finish to build.  */
+	      pstr->cur_state = prev_st;
+	      break;
+	    }
+	}
+      pstr->valid_len = byte_idx;
+      pstr->valid_raw_len = byte_idx;
+      return REG_NOERROR;
+    }
+  else
+    for (src_idx = pstr->valid_raw_len; byte_idx < end_idx;)
+      {
+	wchar_t wc;
+	const char *p;
+      offsets_needed:
+	remain_len = end_idx - byte_idx;
+	prev_st = pstr->cur_state;
+	if (BE (pstr->trans != NULL, 0))
+	  {
+	    int i, ch;
+
+	    for (i = 0; i < pstr->mb_cur_max && i < remain_len; ++i)
+	      {
+		ch = pstr->raw_mbs [pstr->raw_mbs_idx + src_idx + i];
+		buf[i] = pstr->trans[ch];
+	      }
+	    p = (const char *) buf;
+	  }
+	else
+	  p = (const char *) pstr->raw_mbs + pstr->raw_mbs_idx + src_idx;
+	mbclen = __mbrtowc (&wc, p, remain_len, &pstr->cur_state);
+	if (BE (mbclen < (size_t) -2, 1))
+	  {
+	    wchar_t wcu = __towupper (wc);
+	    if (wcu != wc)
+	      {
+		size_t mbcdlen;
+
+		mbcdlen = wcrtomb ((char *) buf, wcu, &prev_st);
+		if (BE (mbclen == mbcdlen, 1))
+		  memcpy (pstr->mbs + byte_idx, buf, mbclen);
+		else if (mbcdlen != (size_t) -1)
+		  {
+		    size_t i;
+
+		    if (byte_idx + mbcdlen > pstr->bufs_len)
+		      {
+			pstr->cur_state = prev_st;
+			break;
+		      }
+
+		    if (pstr->offsets == NULL)
+		      {
+			pstr->offsets = re_malloc (Idx, pstr->bufs_len);
+
+			if (pstr->offsets == NULL)
+			  return REG_ESPACE;
+		      }
+		    if (!pstr->offsets_needed)
+		      {
+			for (i = 0; i < (size_t) byte_idx; ++i)
+			  pstr->offsets[i] = i;
+			pstr->offsets_needed = 1;
+		      }
+
+		    memcpy (pstr->mbs + byte_idx, buf, mbcdlen);
+		    pstr->wcs[byte_idx] = wcu;
+		    pstr->offsets[byte_idx] = src_idx;
+		    for (i = 1; i < mbcdlen; ++i)
+		      {
+			pstr->offsets[byte_idx + i]
+			  = src_idx + (i < mbclen ? i : mbclen - 1);
+			pstr->wcs[byte_idx + i] = WEOF;
+		      }
+		    pstr->len += mbcdlen - mbclen;
+		    if (pstr->raw_stop > src_idx)
+		      pstr->stop += mbcdlen - mbclen;
+		    end_idx = (pstr->bufs_len > pstr->len)
+			      ? pstr->len : pstr->bufs_len;
+		    byte_idx += mbcdlen;
+		    src_idx += mbclen;
+		    continue;
+		  }
+		else
+		  memcpy (pstr->mbs + byte_idx, p, mbclen);
+	      }
+	    else
+	      memcpy (pstr->mbs + byte_idx, p, mbclen);
+
+	    if (BE (pstr->offsets_needed != 0, 0))
+	      {
+		size_t i;
+		for (i = 0; i < mbclen; ++i)
+		  pstr->offsets[byte_idx + i] = src_idx + i;
+	      }
+	    src_idx += mbclen;
+
+	    pstr->wcs[byte_idx++] = wcu;
+	    /* Write paddings.  */
+	    for (remain_len = byte_idx + mbclen - 1; byte_idx < remain_len ;)
+	      pstr->wcs[byte_idx++] = WEOF;
+	  }
+	else if (mbclen == (size_t) -1 || mbclen == 0
+		 || (mbclen == (size_t) -2 && pstr->bufs_len >= pstr->len))
+	  {
+	    /* It is an invalid character or '\0'.  Just use the byte.  */
+	    int ch = pstr->raw_mbs[pstr->raw_mbs_idx + src_idx];
+
+	    if (BE (pstr->trans != NULL, 0))
+	      ch = pstr->trans [ch];
+	    pstr->mbs[byte_idx] = ch;
+
+	    if (BE (pstr->offsets_needed != 0, 0))
+	      pstr->offsets[byte_idx] = src_idx;
+	    ++src_idx;
+
+	    /* And also cast it to wide char.  */
+	    pstr->wcs[byte_idx++] = (wchar_t) ch;
+	    if (BE (mbclen == (size_t) -1, 0))
+	      pstr->cur_state = prev_st;
+	  }
+	else
+	  {
+	    /* The buffer doesn't have enough space, finish to build.  */
+	    pstr->cur_state = prev_st;
+	    break;
+	  }
+      }
+  pstr->valid_len = byte_idx;
+  pstr->valid_raw_len = src_idx;
+  return REG_NOERROR;
+}
+
+/* Skip characters until the index becomes greater than NEW_RAW_IDX.
+   Return the index.  */
+
+static Idx
+internal_function
+re_string_skip_chars (re_string_t *pstr, Idx new_raw_idx, wint_t *last_wc)
+{
+  mbstate_t prev_st;
+  Idx rawbuf_idx;
+  size_t mbclen;
+  wint_t wc = WEOF;
+
+  /* Skip the characters which are not necessary to check.  */
+  for (rawbuf_idx = pstr->raw_mbs_idx + pstr->valid_raw_len;
+       rawbuf_idx < new_raw_idx;)
+    {
+      wchar_t wc2;
+      Idx remain_len = pstr->raw_len - rawbuf_idx;
+      prev_st = pstr->cur_state;
+      mbclen = __mbrtowc (&wc2, (const char *) pstr->raw_mbs + rawbuf_idx,
+			  remain_len, &pstr->cur_state);
+      if (BE (mbclen == (size_t) -2 || mbclen == (size_t) -1 || mbclen == 0, 0))
+	{
+	  /* We treat these cases as a single byte character.  */
+	  if (mbclen == 0 || remain_len == 0)
+	    wc = L'\0';
+	  else
+	    wc = *(unsigned char *) (pstr->raw_mbs + rawbuf_idx);
+	  mbclen = 1;
+	  pstr->cur_state = prev_st;
+	}
+      else
+	wc = wc2;
+      /* Then proceed the next character.  */
+      rawbuf_idx += mbclen;
+    }
+  *last_wc = wc;
+  return rawbuf_idx;
+}
+#endif /* RE_ENABLE_I18N  */
+
+/* Build the buffer PSTR->MBS, and apply the translation if we need.
+   This function is used in case of REG_ICASE.  */
+
+static void
+internal_function
+build_upper_buffer (re_string_t *pstr)
+{
+  Idx char_idx, end_idx;
+  end_idx = (pstr->bufs_len > pstr->len) ? pstr->len : pstr->bufs_len;
+
+  for (char_idx = pstr->valid_len; char_idx < end_idx; ++char_idx)
+    {
+      int ch = pstr->raw_mbs[pstr->raw_mbs_idx + char_idx];
+      if (BE (pstr->trans != NULL, 0))
+	ch = pstr->trans[ch];
+      pstr->mbs[char_idx] = toupper (ch);
+    }
+  pstr->valid_len = char_idx;
+  pstr->valid_raw_len = char_idx;
+}
+
+/* Apply TRANS to the buffer in PSTR.  */
+
+static void
+internal_function
+re_string_translate_buffer (re_string_t *pstr)
+{
+  Idx buf_idx, end_idx;
+  end_idx = (pstr->bufs_len > pstr->len) ? pstr->len : pstr->bufs_len;
+
+  for (buf_idx = pstr->valid_len; buf_idx < end_idx; ++buf_idx)
+    {
+      int ch = pstr->raw_mbs[pstr->raw_mbs_idx + buf_idx];
+      pstr->mbs[buf_idx] = pstr->trans[ch];
+    }
+
+  pstr->valid_len = buf_idx;
+  pstr->valid_raw_len = buf_idx;
+}
+
+/* This function re-construct the buffers.
+   Concretely, convert to wide character in case of pstr->mb_cur_max > 1,
+   convert to upper case in case of REG_ICASE, apply translation.  */
+
+static reg_errcode_t
+internal_function __attribute_warn_unused_result__
+re_string_reconstruct (re_string_t *pstr, Idx idx, int eflags)
+{
+  Idx offset;
+
+  if (BE (pstr->raw_mbs_idx <= idx, 0))
+    offset = idx - pstr->raw_mbs_idx;
+  else
+    {
+      /* Reset buffer.  */
+#ifdef RE_ENABLE_I18N
+      if (pstr->mb_cur_max > 1)
+	memset (&pstr->cur_state, '\0', sizeof (mbstate_t));
+#endif /* RE_ENABLE_I18N */
+      pstr->len = pstr->raw_len;
+      pstr->stop = pstr->raw_stop;
+      pstr->valid_len = 0;
+      pstr->raw_mbs_idx = 0;
+      pstr->valid_raw_len = 0;
+      pstr->offsets_needed = 0;
+      pstr->tip_context = ((eflags & REG_NOTBOL) ? CONTEXT_BEGBUF
+			   : CONTEXT_NEWLINE | CONTEXT_BEGBUF);
+      if (!pstr->mbs_allocated)
+	pstr->mbs = (unsigned char *) pstr->raw_mbs;
+      offset = idx;
+    }
+
+  if (BE (offset != 0, 1))
+    {
+      /* Should the already checked characters be kept?  */
+      if (BE (offset < pstr->valid_raw_len, 1))
+	{
+	  /* Yes, move them to the front of the buffer.  */
+#ifdef RE_ENABLE_I18N
+	  if (BE (pstr->offsets_needed, 0))
+	    {
+	      Idx low = 0, high = pstr->valid_len, mid;
+	      do
+		{
+		  mid = (high + low) / 2;
+		  if (pstr->offsets[mid] > offset)
+		    high = mid;
+		  else if (pstr->offsets[mid] < offset)
+		    low = mid + 1;
+		  else
+		    break;
+		}
+	      while (low < high);
+	      if (pstr->offsets[mid] < offset)
+		++mid;
+	      pstr->tip_context = re_string_context_at (pstr, mid - 1,
+							eflags);
+	      /* This can be quite complicated, so handle specially
+		 only the common and easy case where the character with
+		 different length representation of lower and upper
+		 case is present at or after offset.  */
+	      if (pstr->valid_len > offset
+		  && mid == offset && pstr->offsets[mid] == offset)
+		{
+		  memmove (pstr->wcs, pstr->wcs + offset,
+			   (pstr->valid_len - offset) * sizeof (wint_t));
+		  memmove (pstr->mbs, pstr->mbs + offset, pstr->valid_len - offset);
+		  pstr->valid_len -= offset;
+		  pstr->valid_raw_len -= offset;
+		  for (low = 0; low < pstr->valid_len; low++)
+		    pstr->offsets[low] = pstr->offsets[low + offset] - offset;
+		}
+	      else
+		{
+		  /* Otherwise, just find out how long the partial multibyte
+		     character at offset is and fill it with WEOF/255.  */
+		  pstr->len = pstr->raw_len - idx + offset;
+		  pstr->stop = pstr->raw_stop - idx + offset;
+		  pstr->offsets_needed = 0;
+		  while (mid > 0 && pstr->offsets[mid - 1] == offset)
+		    --mid;
+		  while (mid < pstr->valid_len)
+		    if (pstr->wcs[mid] != WEOF)
+		      break;
+		    else
+		      ++mid;
+		  if (mid == pstr->valid_len)
+		    pstr->valid_len = 0;
+		  else
+		    {
+		      pstr->valid_len = pstr->offsets[mid] - offset;
+		      if (pstr->valid_len)
+			{
+			  for (low = 0; low < pstr->valid_len; ++low)
+			    pstr->wcs[low] = WEOF;
+			  memset (pstr->mbs, 255, pstr->valid_len);
+			}
+		    }
+		  pstr->valid_raw_len = pstr->valid_len;
+		}
+	    }
+	  else
+#endif
+	    {
+	      pstr->tip_context = re_string_context_at (pstr, offset - 1,
+							eflags);
+#ifdef RE_ENABLE_I18N
+	      if (pstr->mb_cur_max > 1)
+		memmove (pstr->wcs, pstr->wcs + offset,
+			 (pstr->valid_len - offset) * sizeof (wint_t));
+#endif /* RE_ENABLE_I18N */
+	      if (BE (pstr->mbs_allocated, 0))
+		memmove (pstr->mbs, pstr->mbs + offset,
+			 pstr->valid_len - offset);
+	      pstr->valid_len -= offset;
+	      pstr->valid_raw_len -= offset;
+#if defined DEBUG && DEBUG
+	      assert (pstr->valid_len > 0);
+#endif
+	    }
+	}
+      else
+	{
+#ifdef RE_ENABLE_I18N
+	  /* No, skip all characters until IDX.  */
+	  Idx prev_valid_len = pstr->valid_len;
+
+	  if (BE (pstr->offsets_needed, 0))
+	    {
+	      pstr->len = pstr->raw_len - idx + offset;
+	      pstr->stop = pstr->raw_stop - idx + offset;
+	      pstr->offsets_needed = 0;
+	    }
+#endif
+	  pstr->valid_len = 0;
+#ifdef RE_ENABLE_I18N
+	  if (pstr->mb_cur_max > 1)
+	    {
+	      Idx wcs_idx;
+	      wint_t wc = WEOF;
+
+	      if (pstr->is_utf8)
+		{
+		  const unsigned char *raw, *p, *end;
+
+		  /* Special case UTF-8.  Multi-byte chars start with any
+		     byte other than 0x80 - 0xbf.  */
+		  raw = pstr->raw_mbs + pstr->raw_mbs_idx;
+		  end = raw + (offset - pstr->mb_cur_max);
+		  if (end < pstr->raw_mbs)
+		    end = pstr->raw_mbs;
+		  p = raw + offset - 1;
+#ifdef _LIBC
+		  /* We know the wchar_t encoding is UCS4, so for the simple
+		     case, ASCII characters, skip the conversion step.  */
+		  if (isascii (*p) && BE (pstr->trans == NULL, 1))
+		    {
+		      memset (&pstr->cur_state, '\0', sizeof (mbstate_t));
+		      /* pstr->valid_len = 0; */
+		      wc = (wchar_t) *p;
+		    }
+		  else
+#endif
+		    for (; p >= end; --p)
+		      if ((*p & 0xc0) != 0x80)
+			{
+			  mbstate_t cur_state;
+			  wchar_t wc2;
+			  Idx mlen = raw + pstr->len - p;
+			  unsigned char buf[6];
+			  size_t mbclen;
+
+			  const unsigned char *pp = p;
+			  if (BE (pstr->trans != NULL, 0))
+			    {
+			      int i = mlen < 6 ? mlen : 6;
+			      while (--i >= 0)
+				buf[i] = pstr->trans[p[i]];
+			      pp = buf;
+			    }
+			  /* XXX Don't use mbrtowc, we know which conversion
+			     to use (UTF-8 -> UCS4).  */
+			  memset (&cur_state, 0, sizeof (cur_state));
+			  mbclen = __mbrtowc (&wc2, (const char *) pp, mlen,
+					      &cur_state);
+			  if (raw + offset - p <= mbclen
+			      && mbclen < (size_t) -2)
+			    {
+			      memset (&pstr->cur_state, '\0',
+				      sizeof (mbstate_t));
+			      pstr->valid_len = mbclen - (raw + offset - p);
+			      wc = wc2;
+			    }
+			  break;
+			}
+		}
+
+	      if (wc == WEOF)
+		pstr->valid_len = re_string_skip_chars (pstr, idx, &wc) - idx;
+	      if (wc == WEOF)
+		pstr->tip_context
+		  = re_string_context_at (pstr, prev_valid_len - 1, eflags);
+	      else
+		pstr->tip_context = ((BE (pstr->word_ops_used != 0, 0)
+				      && IS_WIDE_WORD_CHAR (wc))
+				     ? CONTEXT_WORD
+				     : ((IS_WIDE_NEWLINE (wc)
+					 && pstr->newline_anchor)
+					? CONTEXT_NEWLINE : 0));
+	      if (BE (pstr->valid_len, 0))
+		{
+		  for (wcs_idx = 0; wcs_idx < pstr->valid_len; ++wcs_idx)
+		    pstr->wcs[wcs_idx] = WEOF;
+		  if (pstr->mbs_allocated)
+		    memset (pstr->mbs, 255, pstr->valid_len);
+		}
+	      pstr->valid_raw_len = pstr->valid_len;
+	    }
+	  else
+#endif /* RE_ENABLE_I18N */
+	    {
+	      int c = pstr->raw_mbs[pstr->raw_mbs_idx + offset - 1];
+	      pstr->valid_raw_len = 0;
+	      if (pstr->trans)
+		c = pstr->trans[c];
+	      pstr->tip_context = (bitset_contain (pstr->word_char, c)
+				   ? CONTEXT_WORD
+				   : ((IS_NEWLINE (c) && pstr->newline_anchor)
+				      ? CONTEXT_NEWLINE : 0));
+	    }
+	}
+      if (!BE (pstr->mbs_allocated, 0))
+	pstr->mbs += offset;
+    }
+  pstr->raw_mbs_idx = idx;
+  pstr->len -= offset;
+  pstr->stop -= offset;
+
+  /* Then build the buffers.  */
+#ifdef RE_ENABLE_I18N
+  if (pstr->mb_cur_max > 1)
+    {
+      if (pstr->icase)
+	{
+	  reg_errcode_t ret = build_wcs_upper_buffer (pstr);
+	  if (BE (ret != REG_NOERROR, 0))
+	    return ret;
+	}
+      else
+	build_wcs_buffer (pstr);
+    }
+  else
+#endif /* RE_ENABLE_I18N */
+    if (BE (pstr->mbs_allocated, 0))
+      {
+	if (pstr->icase)
+	  build_upper_buffer (pstr);
+	else if (pstr->trans != NULL)
+	  re_string_translate_buffer (pstr);
+      }
+    else
+      pstr->valid_len = pstr->len;
+
+  pstr->cur_idx = 0;
+  return REG_NOERROR;
+}
+
+static unsigned char
+internal_function __attribute__ ((pure))
+re_string_peek_byte_case (const re_string_t *pstr, Idx idx)
+{
+  int ch;
+  Idx off;
+
+  /* Handle the common (easiest) cases first.  */
+  if (BE (!pstr->mbs_allocated, 1))
+    return re_string_peek_byte (pstr, idx);
+
+#ifdef RE_ENABLE_I18N
+  if (pstr->mb_cur_max > 1
+      && ! re_string_is_single_byte_char (pstr, pstr->cur_idx + idx))
+    return re_string_peek_byte (pstr, idx);
+#endif
+
+  off = pstr->cur_idx + idx;
+#ifdef RE_ENABLE_I18N
+  if (pstr->offsets_needed)
+    off = pstr->offsets[off];
+#endif
+
+  ch = pstr->raw_mbs[pstr->raw_mbs_idx + off];
+
+#ifdef RE_ENABLE_I18N
+  /* Ensure that e.g. for tr_TR.UTF-8 BACKSLASH DOTLESS SMALL LETTER I
+     this function returns CAPITAL LETTER I instead of first byte of
+     DOTLESS SMALL LETTER I.  The latter would confuse the parser,
+     since peek_byte_case doesn't advance cur_idx in any way.  */
+  if (pstr->offsets_needed && !isascii (ch))
+    return re_string_peek_byte (pstr, idx);
+#endif
+
+  return ch;
+}
+
+static unsigned char
+internal_function
+re_string_fetch_byte_case (re_string_t *pstr)
+{
+  if (BE (!pstr->mbs_allocated, 1))
+    return re_string_fetch_byte (pstr);
+
+#ifdef RE_ENABLE_I18N
+  if (pstr->offsets_needed)
+    {
+      Idx off;
+      int ch;
+
+      /* For tr_TR.UTF-8 [[:islower:]] there is
+	 [[: CAPITAL LETTER I WITH DOT lower:]] in mbs.  Skip
+	 in that case the whole multi-byte character and return
+	 the original letter.  On the other side, with
+	 [[: DOTLESS SMALL LETTER I return [[:I, as doing
+	 anything else would complicate things too much.  */
+
+      if (!re_string_first_byte (pstr, pstr->cur_idx))
+	return re_string_fetch_byte (pstr);
+
+      off = pstr->offsets[pstr->cur_idx];
+      ch = pstr->raw_mbs[pstr->raw_mbs_idx + off];
+
+      if (! isascii (ch))
+	return re_string_fetch_byte (pstr);
+
+      re_string_skip_bytes (pstr,
+			    re_string_char_size_at (pstr, pstr->cur_idx));
+      return ch;
+    }
+#endif
+
+  return pstr->raw_mbs[pstr->raw_mbs_idx + pstr->cur_idx++];
+}
+
+static void
+internal_function
+re_string_destruct (re_string_t *pstr)
+{
+#ifdef RE_ENABLE_I18N
+  re_free (pstr->wcs);
+  re_free (pstr->offsets);
+#endif /* RE_ENABLE_I18N  */
+  if (pstr->mbs_allocated)
+    re_free (pstr->mbs);
+}
+
+/* Return the context at IDX in INPUT.  */
+
+static unsigned int
+internal_function
+re_string_context_at (const re_string_t *input, Idx idx, int eflags)
+{
+  int c;
+  if (BE (idx < 0, 0))
+    /* In this case, we use the value stored in input->tip_context,
+       since we can't know the character in input->mbs[-1] here.  */
+    return input->tip_context;
+  if (BE (idx == input->len, 0))
+    return ((eflags & REG_NOTEOL) ? CONTEXT_ENDBUF
+	    : CONTEXT_NEWLINE | CONTEXT_ENDBUF);
+#ifdef RE_ENABLE_I18N
+  if (input->mb_cur_max > 1)
+    {
+      wint_t wc;
+      Idx wc_idx = idx;
+      while(input->wcs[wc_idx] == WEOF)
+	{
+#if defined DEBUG && DEBUG
+	  /* It must not happen.  */
+	  assert (wc_idx >= 0);
+#endif
+	  --wc_idx;
+	  if (wc_idx < 0)
+	    return input->tip_context;
+	}
+      wc = input->wcs[wc_idx];
+      if (BE (input->word_ops_used != 0, 0) && IS_WIDE_WORD_CHAR (wc))
+	return CONTEXT_WORD;
+      return (IS_WIDE_NEWLINE (wc) && input->newline_anchor
+	      ? CONTEXT_NEWLINE : 0);
+    }
+  else
+#endif
+    {
+      c = re_string_byte_at (input, idx);
+      if (bitset_contain (input->word_char, c))
+	return CONTEXT_WORD;
+      return IS_NEWLINE (c) && input->newline_anchor ? CONTEXT_NEWLINE : 0;
+    }
+}
+
+/* Functions for set operation.  */
+
+static reg_errcode_t
+internal_function __attribute_warn_unused_result__
+re_node_set_alloc (re_node_set *set, Idx size)
+{
+  set->alloc = size;
+  set->nelem = 0;
+  set->elems = re_malloc (Idx, size);
+  if (BE (set->elems == NULL, 0) && (MALLOC_0_IS_NONNULL || size != 0))
+    return REG_ESPACE;
+  return REG_NOERROR;
+}
+
+static reg_errcode_t
+internal_function __attribute_warn_unused_result__
+re_node_set_init_1 (re_node_set *set, Idx elem)
+{
+  set->alloc = 1;
+  set->nelem = 1;
+  set->elems = re_malloc (Idx, 1);
+  if (BE (set->elems == NULL, 0))
+    {
+      set->alloc = set->nelem = 0;
+      return REG_ESPACE;
+    }
+  set->elems[0] = elem;
+  return REG_NOERROR;
+}
+
+static reg_errcode_t
+internal_function __attribute_warn_unused_result__
+re_node_set_init_2 (re_node_set *set, Idx elem1, Idx elem2)
+{
+  set->alloc = 2;
+  set->elems = re_malloc (Idx, 2);
+  if (BE (set->elems == NULL, 0))
+    return REG_ESPACE;
+  if (elem1 == elem2)
+    {
+      set->nelem = 1;
+      set->elems[0] = elem1;
+    }
+  else
+    {
+      set->nelem = 2;
+      if (elem1 < elem2)
+	{
+	  set->elems[0] = elem1;
+	  set->elems[1] = elem2;
+	}
+      else
+	{
+	  set->elems[0] = elem2;
+	  set->elems[1] = elem1;
+	}
+    }
+  return REG_NOERROR;
+}
+
+static reg_errcode_t
+internal_function __attribute_warn_unused_result__
+re_node_set_init_copy (re_node_set *dest, const re_node_set *src)
+{
+  dest->nelem = src->nelem;
+  if (src->nelem > 0)
+    {
+      dest->alloc = dest->nelem;
+      dest->elems = re_malloc (Idx, dest->alloc);
+      if (BE (dest->elems == NULL, 0))
+	{
+	  dest->alloc = dest->nelem = 0;
+	  return REG_ESPACE;
+	}
+      memcpy (dest->elems, src->elems, src->nelem * sizeof (Idx));
+    }
+  else
+    re_node_set_init_empty (dest);
+  return REG_NOERROR;
+}
+
+/* Calculate the intersection of the sets SRC1 and SRC2. And merge it to
+   DEST. Return value indicate the error code or REG_NOERROR if succeeded.
+   Note: We assume dest->elems is NULL, when dest->alloc is 0.  */
+
+static reg_errcode_t
+internal_function __attribute_warn_unused_result__
+re_node_set_add_intersect (re_node_set *dest, const re_node_set *src1,
+			   const re_node_set *src2)
+{
+  Idx i1, i2, is, id, delta, sbase;
+  if (src1->nelem == 0 || src2->nelem == 0)
+    return REG_NOERROR;
+
+  /* We need dest->nelem + 2 * elems_in_intersection; this is a
+     conservative estimate.  */
+  if (src1->nelem + src2->nelem + dest->nelem > dest->alloc)
+    {
+      Idx new_alloc = src1->nelem + src2->nelem + dest->alloc;
+      Idx *new_elems = re_realloc (dest->elems, Idx, new_alloc);
+      if (BE (new_elems == NULL, 0))
+	return REG_ESPACE;
+      dest->elems = new_elems;
+      dest->alloc = new_alloc;
+    }
+
+  /* Find the items in the intersection of SRC1 and SRC2, and copy
+     into the top of DEST those that are not already in DEST itself.  */
+  sbase = dest->nelem + src1->nelem + src2->nelem;
+  i1 = src1->nelem - 1;
+  i2 = src2->nelem - 1;
+  id = dest->nelem - 1;
+  for (;;)
+    {
+      if (src1->elems[i1] == src2->elems[i2])
+	{
+	  /* Try to find the item in DEST.  Maybe we could binary search?  */
+	  while (id >= 0 && dest->elems[id] > src1->elems[i1])
+	    --id;
+
+	  if (id < 0 || dest->elems[id] != src1->elems[i1])
+            dest->elems[--sbase] = src1->elems[i1];
+
+	  if (--i1 < 0 || --i2 < 0)
+	    break;
+	}
+
+      /* Lower the highest of the two items.  */
+      else if (src1->elems[i1] < src2->elems[i2])
+	{
+	  if (--i2 < 0)
+	    break;
+	}
+      else
+	{
+	  if (--i1 < 0)
+	    break;
+	}
+    }
+
+  id = dest->nelem - 1;
+  is = dest->nelem + src1->nelem + src2->nelem - 1;
+  delta = is - sbase + 1;
+
+  /* Now copy.  When DELTA becomes zero, the remaining
+     DEST elements are already in place; this is more or
+     less the same loop that is in re_node_set_merge.  */
+  dest->nelem += delta;
+  if (delta > 0 && id >= 0)
+    for (;;)
+      {
+	if (dest->elems[is] > dest->elems[id])
+	  {
+	    /* Copy from the top.  */
+	    dest->elems[id + delta--] = dest->elems[is--];
+	    if (delta == 0)
+	      break;
+	  }
+	else
+	  {
+	    /* Slide from the bottom.  */
+	    dest->elems[id + delta] = dest->elems[id];
+	    if (--id < 0)
+	      break;
+	  }
+      }
+
+  /* Copy remaining SRC elements.  */
+  memcpy (dest->elems, dest->elems + sbase, delta * sizeof (Idx));
+
+  return REG_NOERROR;
+}
+
+/* Calculate the union set of the sets SRC1 and SRC2. And store it to
+   DEST. Return value indicate the error code or REG_NOERROR if succeeded.  */
+
+static reg_errcode_t
+internal_function __attribute_warn_unused_result__
+re_node_set_init_union (re_node_set *dest, const re_node_set *src1,
+			const re_node_set *src2)
+{
+  Idx i1, i2, id;
+  if (src1 != NULL && src1->nelem > 0 && src2 != NULL && src2->nelem > 0)
+    {
+      dest->alloc = src1->nelem + src2->nelem;
+      dest->elems = re_malloc (Idx, dest->alloc);
+      if (BE (dest->elems == NULL, 0))
+	return REG_ESPACE;
+    }
+  else
+    {
+      if (src1 != NULL && src1->nelem > 0)
+	return re_node_set_init_copy (dest, src1);
+      else if (src2 != NULL && src2->nelem > 0)
+	return re_node_set_init_copy (dest, src2);
+      else
+	re_node_set_init_empty (dest);
+      return REG_NOERROR;
+    }
+  for (i1 = i2 = id = 0 ; i1 < src1->nelem && i2 < src2->nelem ;)
+    {
+      if (src1->elems[i1] > src2->elems[i2])
+	{
+	  dest->elems[id++] = src2->elems[i2++];
+	  continue;
+	}
+      if (src1->elems[i1] == src2->elems[i2])
+	++i2;
+      dest->elems[id++] = src1->elems[i1++];
+    }
+  if (i1 < src1->nelem)
+    {
+      memcpy (dest->elems + id, src1->elems + i1,
+	     (src1->nelem - i1) * sizeof (Idx));
+      id += src1->nelem - i1;
+    }
+  else if (i2 < src2->nelem)
+    {
+      memcpy (dest->elems + id, src2->elems + i2,
+	     (src2->nelem - i2) * sizeof (Idx));
+      id += src2->nelem - i2;
+    }
+  dest->nelem = id;
+  return REG_NOERROR;
+}
+
+/* Calculate the union set of the sets DEST and SRC. And store it to
+   DEST. Return value indicate the error code or REG_NOERROR if succeeded.  */
+
+static reg_errcode_t
+internal_function __attribute_warn_unused_result__
+re_node_set_merge (re_node_set *dest, const re_node_set *src)
+{
+  Idx is, id, sbase, delta;
+  if (src == NULL || src->nelem == 0)
+    return REG_NOERROR;
+  if (dest->alloc < 2 * src->nelem + dest->nelem)
+    {
+      Idx new_alloc = 2 * (src->nelem + dest->alloc);
+      Idx *new_buffer = re_realloc (dest->elems, Idx, new_alloc);
+      if (BE (new_buffer == NULL, 0))
+	return REG_ESPACE;
+      dest->elems = new_buffer;
+      dest->alloc = new_alloc;
+    }
+
+  if (BE (dest->nelem == 0, 0))
+    {
+      dest->nelem = src->nelem;
+      memcpy (dest->elems, src->elems, src->nelem * sizeof (Idx));
+      return REG_NOERROR;
+    }
+
+  /* Copy into the top of DEST the items of SRC that are not
+     found in DEST.  Maybe we could binary search in DEST?  */
+  for (sbase = dest->nelem + 2 * src->nelem,
+       is = src->nelem - 1, id = dest->nelem - 1; is >= 0 && id >= 0; )
+    {
+      if (dest->elems[id] == src->elems[is])
+	is--, id--;
+      else if (dest->elems[id] < src->elems[is])
+	dest->elems[--sbase] = src->elems[is--];
+      else /* if (dest->elems[id] > src->elems[is]) */
+	--id;
+    }
+
+  if (is >= 0)
+    {
+      /* If DEST is exhausted, the remaining items of SRC must be unique.  */
+      sbase -= is + 1;
+      memcpy (dest->elems + sbase, src->elems, (is + 1) * sizeof (Idx));
+    }
+
+  id = dest->nelem - 1;
+  is = dest->nelem + 2 * src->nelem - 1;
+  delta = is - sbase + 1;
+  if (delta == 0)
+    return REG_NOERROR;
+
+  /* Now copy.  When DELTA becomes zero, the remaining
+     DEST elements are already in place.  */
+  dest->nelem += delta;
+  for (;;)
+    {
+      if (dest->elems[is] > dest->elems[id])
+	{
+	  /* Copy from the top.  */
+	  dest->elems[id + delta--] = dest->elems[is--];
+	  if (delta == 0)
+	    break;
+	}
+      else
+	{
+	  /* Slide from the bottom.  */
+	  dest->elems[id + delta] = dest->elems[id];
+	  if (--id < 0)
+	    {
+	      /* Copy remaining SRC elements.  */
+	      memcpy (dest->elems, dest->elems + sbase,
+		      delta * sizeof (Idx));
+	      break;
+	    }
+	}
+    }
+
+  return REG_NOERROR;
+}
+
+/* Insert the new element ELEM to the re_node_set* SET.
+   SET should not already have ELEM.
+   Return true if successful.  */
+
+static bool
+internal_function __attribute_warn_unused_result__
+re_node_set_insert (re_node_set *set, Idx elem)
+{
+  Idx idx;
+  /* In case the set is empty.  */
+  if (set->alloc == 0)
+    return BE (re_node_set_init_1 (set, elem) == REG_NOERROR, 1);
+
+  if (BE (set->nelem, 0) == 0)
+    {
+      /* We already guaranteed above that set->alloc != 0.  */
+      set->elems[0] = elem;
+      ++set->nelem;
+      return true;
+    }
+
+  /* Realloc if we need.  */
+  if (set->alloc == set->nelem)
+    {
+      Idx *new_elems;
+      set->alloc = set->alloc * 2;
+      new_elems = re_realloc (set->elems, Idx, set->alloc);
+      if (BE (new_elems == NULL, 0))
+	return false;
+      set->elems = new_elems;
+    }
+
+  /* Move the elements which follows the new element.  Test the
+     first element separately to skip a check in the inner loop.  */
+  if (elem < set->elems[0])
+    {
+      idx = 0;
+      for (idx = set->nelem; idx > 0; idx--)
+	set->elems[idx] = set->elems[idx - 1];
+    }
+  else
+    {
+      for (idx = set->nelem; set->elems[idx - 1] > elem; idx--)
+	set->elems[idx] = set->elems[idx - 1];
+    }
+
+  /* Insert the new element.  */
+  set->elems[idx] = elem;
+  ++set->nelem;
+  return true;
+}
+
+/* Insert the new element ELEM to the re_node_set* SET.
+   SET should not already have any element greater than or equal to ELEM.
+   Return true if successful.  */
+
+static bool
+internal_function __attribute_warn_unused_result__
+re_node_set_insert_last (re_node_set *set, Idx elem)
+{
+  /* Realloc if we need.  */
+  if (set->alloc == set->nelem)
+    {
+      Idx *new_elems;
+      set->alloc = (set->alloc + 1) * 2;
+      new_elems = re_realloc (set->elems, Idx, set->alloc);
+      if (BE (new_elems == NULL, 0))
+	return false;
+      set->elems = new_elems;
+    }
+
+  /* Insert the new element.  */
+  set->elems[set->nelem++] = elem;
+  return true;
+}
+
+/* Compare two node sets SET1 and SET2.
+   Return true if SET1 and SET2 are equivalent.  */
+
+static bool
+internal_function __attribute__ ((pure))
+re_node_set_compare (const re_node_set *set1, const re_node_set *set2)
+{
+  Idx i;
+  if (set1 == NULL || set2 == NULL || set1->nelem != set2->nelem)
+    return false;
+  for (i = set1->nelem ; --i >= 0 ; )
+    if (set1->elems[i] != set2->elems[i])
+      return false;
+  return true;
+}
+
+/* Return (idx + 1) if SET contains the element ELEM, return 0 otherwise.  */
+
+static Idx
+internal_function __attribute__ ((pure))
+re_node_set_contains (const re_node_set *set, Idx elem)
+{
+  __re_size_t idx, right, mid;
+  if (set->nelem <= 0)
+    return 0;
+
+  /* Binary search the element.  */
+  idx = 0;
+  right = set->nelem - 1;
+  while (idx < right)
+    {
+      mid = (idx + right) / 2;
+      if (set->elems[mid] < elem)
+	idx = mid + 1;
+      else
+	right = mid;
+    }
+  return set->elems[idx] == elem ? idx + 1 : 0;
+}
+
+static void
+internal_function
+re_node_set_remove_at (re_node_set *set, Idx idx)
+{
+  if (idx < 0 || idx >= set->nelem)
+    return;
+  --set->nelem;
+  for (; idx < set->nelem; idx++)
+    set->elems[idx] = set->elems[idx + 1];
+}
+
+
+/* Add the token TOKEN to dfa->nodes, and return the index of the token.
+   Or return -1 if an error occurred.  */
+
+static Idx
+internal_function
+re_dfa_add_node (re_dfa_t *dfa, re_token_t token)
+{
+  if (BE (dfa->nodes_len >= dfa->nodes_alloc, 0))
+    {
+      size_t new_nodes_alloc = dfa->nodes_alloc * 2;
+      Idx *new_nexts, *new_indices;
+      re_node_set *new_edests, *new_eclosures;
+      re_token_t *new_nodes;
+
+      /* Avoid overflows in realloc.  */
+      const size_t max_object_size = MAX (sizeof (re_token_t),
+					  MAX (sizeof (re_node_set),
+					       sizeof (Idx)));
+      if (BE (MIN (IDX_MAX, SIZE_MAX / max_object_size) < new_nodes_alloc, 0))
+	return -1;
+
+      new_nodes = re_realloc (dfa->nodes, re_token_t, new_nodes_alloc);
+      if (BE (new_nodes == NULL, 0))
+	return -1;
+      dfa->nodes = new_nodes;
+      new_nexts = re_realloc (dfa->nexts, Idx, new_nodes_alloc);
+      new_indices = re_realloc (dfa->org_indices, Idx, new_nodes_alloc);
+      new_edests = re_realloc (dfa->edests, re_node_set, new_nodes_alloc);
+      new_eclosures = re_realloc (dfa->eclosures, re_node_set, new_nodes_alloc);
+      if (BE (new_nexts == NULL || new_indices == NULL
+	      || new_edests == NULL || new_eclosures == NULL, 0))
+	{
+	   re_free (new_nexts);
+	   re_free (new_indices);
+	   re_free (new_edests);
+	   re_free (new_eclosures);
+	   return -1;
+	}
+      dfa->nexts = new_nexts;
+      dfa->org_indices = new_indices;
+      dfa->edests = new_edests;
+      dfa->eclosures = new_eclosures;
+      dfa->nodes_alloc = new_nodes_alloc;
+    }
+  dfa->nodes[dfa->nodes_len] = token;
+  dfa->nodes[dfa->nodes_len].constraint = 0;
+#ifdef RE_ENABLE_I18N
+  dfa->nodes[dfa->nodes_len].accept_mb =
+    ((token.type == OP_PERIOD && dfa->mb_cur_max > 1)
+     || token.type == COMPLEX_BRACKET);
+#endif
+  dfa->nexts[dfa->nodes_len] = -1;
+  re_node_set_init_empty (dfa->edests + dfa->nodes_len);
+  re_node_set_init_empty (dfa->eclosures + dfa->nodes_len);
+  return dfa->nodes_len++;
+}
+
+static re_hashval_t
+internal_function
+calc_state_hash (const re_node_set *nodes, unsigned int context)
+{
+  re_hashval_t hash = nodes->nelem + context;
+  Idx i;
+  for (i = 0 ; i < nodes->nelem ; i++)
+    hash += nodes->elems[i];
+  return hash;
+}
+
+/* Search for the state whose node_set is equivalent to NODES.
+   Return the pointer to the state, if we found it in the DFA.
+   Otherwise create the new one and return it.  In case of an error
+   return NULL and set the error code in ERR.
+   Note: - We assume NULL as the invalid state, then it is possible that
+	   return value is NULL and ERR is REG_NOERROR.
+	 - We never return non-NULL value in case of any errors, it is for
+	   optimization.  */
+
+static re_dfastate_t *
+internal_function __attribute_warn_unused_result__
+re_acquire_state (reg_errcode_t *err, const re_dfa_t *dfa,
+		  const re_node_set *nodes)
+{
+  re_hashval_t hash;
+  re_dfastate_t *new_state;
+  struct re_state_table_entry *spot;
+  Idx i;
+#if defined GCC_LINT || defined lint
+  /* Suppress bogus uninitialized-variable warnings.  */
+  *err = REG_NOERROR;
+#endif
+  if (BE (nodes->nelem == 0, 0))
+    {
+      *err = REG_NOERROR;
+      return NULL;
+    }
+  hash = calc_state_hash (nodes, 0);
+  spot = dfa->state_table + (hash & dfa->state_hash_mask);
+
+  for (i = 0 ; i < spot->num ; i++)
+    {
+      re_dfastate_t *state = spot->array[i];
+      if (hash != state->hash)
+	continue;
+      if (re_node_set_compare (&state->nodes, nodes))
+	return state;
+    }
+
+  /* There are no appropriate state in the dfa, create the new one.  */
+  new_state = create_ci_newstate (dfa, nodes, hash);
+  if (BE (new_state == NULL, 0))
+    *err = REG_ESPACE;
+
+  return new_state;
+}
+
+/* Search for the state whose node_set is equivalent to NODES and
+   whose context is equivalent to CONTEXT.
+   Return the pointer to the state, if we found it in the DFA.
+   Otherwise create the new one and return it.  In case of an error
+   return NULL and set the error code in ERR.
+   Note: - We assume NULL as the invalid state, then it is possible that
+	   return value is NULL and ERR is REG_NOERROR.
+	 - We never return non-NULL value in case of any errors, it is for
+	   optimization.  */
+
+static re_dfastate_t *
+internal_function __attribute_warn_unused_result__
+re_acquire_state_context (reg_errcode_t *err, const re_dfa_t *dfa,
+			  const re_node_set *nodes, unsigned int context)
+{
+  re_hashval_t hash;
+  re_dfastate_t *new_state;
+  struct re_state_table_entry *spot;
+  Idx i;
+#if defined GCC_LINT || defined lint
+  /* Suppress bogus uninitialized-variable warnings.  */
+  *err = REG_NOERROR;
+#endif
+  if (nodes->nelem == 0)
+    {
+      *err = REG_NOERROR;
+      return NULL;
+    }
+  hash = calc_state_hash (nodes, context);
+  spot = dfa->state_table + (hash & dfa->state_hash_mask);
+
+  for (i = 0 ; i < spot->num ; i++)
+    {
+      re_dfastate_t *state = spot->array[i];
+      if (state->hash == hash
+	  && state->context == context
+	  && re_node_set_compare (state->entrance_nodes, nodes))
+	return state;
+    }
+  /* There are no appropriate state in 'dfa', create the new one.  */
+  new_state = create_cd_newstate (dfa, nodes, context, hash);
+  if (BE (new_state == NULL, 0))
+    *err = REG_ESPACE;
+
+  return new_state;
+}
+
+/* Finish initialization of the new state NEWSTATE, and using its hash value
+   HASH put in the appropriate bucket of DFA's state table.  Return value
+   indicates the error code if failed.  */
+
+static reg_errcode_t
+__attribute_warn_unused_result__
+register_state (const re_dfa_t *dfa, re_dfastate_t *newstate,
+		re_hashval_t hash)
+{
+  struct re_state_table_entry *spot;
+  reg_errcode_t err;
+  Idx i;
+
+  newstate->hash = hash;
+  err = re_node_set_alloc (&newstate->non_eps_nodes, newstate->nodes.nelem);
+  if (BE (err != REG_NOERROR, 0))
+    return REG_ESPACE;
+  for (i = 0; i < newstate->nodes.nelem; i++)
+    {
+      Idx elem = newstate->nodes.elems[i];
+      if (!IS_EPSILON_NODE (dfa->nodes[elem].type))
+	if (! re_node_set_insert_last (&newstate->non_eps_nodes, elem))
+	  return REG_ESPACE;
+    }
+
+  spot = dfa->state_table + (hash & dfa->state_hash_mask);
+  if (BE (spot->alloc <= spot->num, 0))
+    {
+      Idx new_alloc = 2 * spot->num + 2;
+      re_dfastate_t **new_array = re_realloc (spot->array, re_dfastate_t *,
+					      new_alloc);
+      if (BE (new_array == NULL, 0))
+	return REG_ESPACE;
+      spot->array = new_array;
+      spot->alloc = new_alloc;
+    }
+  spot->array[spot->num++] = newstate;
+  return REG_NOERROR;
+}
+
+static void
+free_state (re_dfastate_t *state)
+{
+  re_node_set_free (&state->non_eps_nodes);
+  re_node_set_free (&state->inveclosure);
+  if (state->entrance_nodes != &state->nodes)
+    {
+      re_node_set_free (state->entrance_nodes);
+      re_free (state->entrance_nodes);
+    }
+  re_node_set_free (&state->nodes);
+  re_free (state->word_trtable);
+  re_free (state->trtable);
+  re_free (state);
+}
+
+/* Create the new state which is independent of contexts.
+   Return the new state if succeeded, otherwise return NULL.  */
+
+static re_dfastate_t *
+internal_function __attribute_warn_unused_result__
+create_ci_newstate (const re_dfa_t *dfa, const re_node_set *nodes,
+		    re_hashval_t hash)
+{
+  Idx i;
+  reg_errcode_t err;
+  re_dfastate_t *newstate;
+
+  newstate = (re_dfastate_t *) calloc (sizeof (re_dfastate_t), 1);
+  if (BE (newstate == NULL, 0))
+    return NULL;
+  err = re_node_set_init_copy (&newstate->nodes, nodes);
+  if (BE (err != REG_NOERROR, 0))
+    {
+      re_free (newstate);
+      return NULL;
+    }
+
+  newstate->entrance_nodes = &newstate->nodes;
+  for (i = 0 ; i < nodes->nelem ; i++)
+    {
+      re_token_t *node = dfa->nodes + nodes->elems[i];
+      re_token_type_t type = node->type;
+      if (type == CHARACTER && !node->constraint)
+	continue;
+#ifdef RE_ENABLE_I18N
+      newstate->accept_mb |= node->accept_mb;
+#endif /* RE_ENABLE_I18N */
+
+      /* If the state has the halt node, the state is a halt state.  */
+      if (type == END_OF_RE)
+	newstate->halt = 1;
+      else if (type == OP_BACK_REF)
+	newstate->has_backref = 1;
+      else if (type == ANCHOR || node->constraint)
+	newstate->has_constraint = 1;
+    }
+  err = register_state (dfa, newstate, hash);
+  if (BE (err != REG_NOERROR, 0))
+    {
+      free_state (newstate);
+      newstate = NULL;
+    }
+  return newstate;
+}
+
+/* Create the new state which is depend on the context CONTEXT.
+   Return the new state if succeeded, otherwise return NULL.  */
+
+static re_dfastate_t *
+internal_function __attribute_warn_unused_result__
+create_cd_newstate (const re_dfa_t *dfa, const re_node_set *nodes,
+		    unsigned int context, re_hashval_t hash)
+{
+  Idx i, nctx_nodes = 0;
+  reg_errcode_t err;
+  re_dfastate_t *newstate;
+
+  newstate = (re_dfastate_t *) calloc (sizeof (re_dfastate_t), 1);
+  if (BE (newstate == NULL, 0))
+    return NULL;
+  err = re_node_set_init_copy (&newstate->nodes, nodes);
+  if (BE (err != REG_NOERROR, 0))
+    {
+      re_free (newstate);
+      return NULL;
+    }
+
+  newstate->context = context;
+  newstate->entrance_nodes = &newstate->nodes;
+
+  for (i = 0 ; i < nodes->nelem ; i++)
+    {
+      re_token_t *node = dfa->nodes + nodes->elems[i];
+      re_token_type_t type = node->type;
+      unsigned int constraint = node->constraint;
+
+      if (type == CHARACTER && !constraint)
+	continue;
+#ifdef RE_ENABLE_I18N
+      newstate->accept_mb |= node->accept_mb;
+#endif /* RE_ENABLE_I18N */
+
+      /* If the state has the halt node, the state is a halt state.  */
+      if (type == END_OF_RE)
+	newstate->halt = 1;
+      else if (type == OP_BACK_REF)
+	newstate->has_backref = 1;
+
+      if (constraint)
+	{
+	  if (newstate->entrance_nodes == &newstate->nodes)
+	    {
+	      newstate->entrance_nodes = re_malloc (re_node_set, 1);
+	      if (BE (newstate->entrance_nodes == NULL, 0))
+		{
+		  free_state (newstate);
+		  return NULL;
+		}
+	      if (re_node_set_init_copy (newstate->entrance_nodes, nodes)
+		  != REG_NOERROR)
+		return NULL;
+	      nctx_nodes = 0;
+	      newstate->has_constraint = 1;
+	    }
+
+	  if (NOT_SATISFY_PREV_CONSTRAINT (constraint,context))
+	    {
+	      re_node_set_remove_at (&newstate->nodes, i - nctx_nodes);
+	      ++nctx_nodes;
+	    }
+	}
+    }
+  err = register_state (dfa, newstate, hash);
+  if (BE (err != REG_NOERROR, 0))
+    {
+      free_state (newstate);
+      newstate = NULL;
+    }
+  return  newstate;
+}
diff --git a/gl/regex_internal.h b/gl/regex_internal.h
new file mode 100644
index 0000000..d7f76d6
--- /dev/null
+++ b/gl/regex_internal.h
@@ -0,0 +1,910 @@
+/* Extended regular expression matching and search library.
+   Copyright (C) 2002-2017 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
+
+#ifndef _REGEX_INTERNAL_H
+#define _REGEX_INTERNAL_H 1
+
+#include <assert.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <langinfo.h>
+#include <locale.h>
+#include <wchar.h>
+#include <wctype.h>
+#include <stdbool.h>
+#include <stdint.h>
+
+#include "intprops.h"
+
+#ifdef _LIBC
+# include <libc-lock.h>
+# define lock_define(name) __libc_lock_define (, name)
+# define lock_init(lock) (__libc_lock_init (lock), 0)
+# define lock_fini(lock) 0
+# define lock_lock(lock) __libc_lock_lock (lock)
+# define lock_unlock(lock) __libc_lock_unlock (lock)
+#elif defined GNULIB_LOCK && !defined USE_UNLOCKED_IO
+# include "glthread/lock.h"
+  /* Use gl_lock_define if empty macro arguments are known to work.
+     Otherwise, fall back on less-portable substitutes.  */
+# if ((defined __GNUC__ && !defined __STRICT_ANSI__) \
+      || (defined __STDC_VERSION__ && 199901L <= __STDC_VERSION__))
+#  define lock_define(name) gl_lock_define (, name)
+# elif USE_POSIX_THREADS
+#  define lock_define(name) pthread_mutex_t name;
+# elif USE_PTH_THREADS
+#  define lock_define(name) pth_mutex_t name;
+# elif USE_SOLARIS_THREADS
+#  define lock_define(name) mutex_t name;
+# elif USE_WINDOWS_THREADS
+#  define lock_define(name) gl_lock_t name;
+# else
+#  define lock_define(name)
+# endif
+# define lock_init(lock) glthread_lock_init (&(lock))
+# define lock_fini(lock) glthread_lock_destroy (&(lock))
+# define lock_lock(lock) glthread_lock_lock (&(lock))
+# define lock_unlock(lock) glthread_lock_unlock (&(lock))
+#elif defined GNULIB_PTHREAD && !defined USE_UNLOCKED_IO
+# include <pthread.h>
+# define lock_define(name) pthread_mutex_t name;
+# define lock_init(lock) pthread_mutex_init (&(lock), 0)
+# define lock_fini(lock) pthread_mutex_destroy (&(lock))
+# define lock_lock(lock) pthread_mutex_lock (&(lock))
+# define lock_unlock(lock) pthread_mutex_unlock (&(lock))
+#else
+# define lock_define(name)
+# define lock_init(lock) 0
+# define lock_fini(lock) ((void) 0)
+  /* The 'dfa' avoids an "unused variable 'dfa'" warning from GCC.  */
+# define lock_lock(lock) ((void) dfa)
+# define lock_unlock(lock) ((void) 0)
+#endif
+
+/* In case that the system doesn't have isblank().  */
+#if !defined _LIBC && ! (defined isblank || (HAVE_ISBLANK && HAVE_DECL_ISBLANK))
+# define isblank(ch) ((ch) == ' ' || (ch) == '\t')
+#endif
+
+#ifdef _LIBC
+# ifndef _RE_DEFINE_LOCALE_FUNCTIONS
+#  define _RE_DEFINE_LOCALE_FUNCTIONS 1
+#   include <locale/localeinfo.h>
+#   include <locale/coll-lookup.h>
+# endif
+#endif
+
+/* This is for other GNU distributions with internationalized messages.  */
+#if (HAVE_LIBINTL_H && ENABLE_NLS) || defined _LIBC
+# include <libintl.h>
+# ifdef _LIBC
+#  undef gettext
+#  define gettext(msgid) \
+  __dcgettext (_libc_intl_domainname, msgid, LC_MESSAGES)
+# endif
+#else
+# undef gettext
+# define gettext(msgid) (msgid)
+#endif
+
+#ifndef gettext_noop
+/* This define is so xgettext can find the internationalizable
+   strings.  */
+# define gettext_noop(String) String
+#endif
+
+#if (defined MB_CUR_MAX && HAVE_WCTYPE_H && HAVE_ISWCTYPE) || _LIBC
+# define RE_ENABLE_I18N
+#endif
+
+#define BE(expr, val) __builtin_expect (expr, val)
+
+/* Number of ASCII characters.  */
+#define ASCII_CHARS 0x80
+
+/* Number of single byte characters.  */
+#define SBC_MAX (UCHAR_MAX + 1)
+
+#define COLL_ELEM_LEN_MAX 8
+
+/* The character which represents newline.  */
+#define NEWLINE_CHAR '\n'
+#define WIDE_NEWLINE_CHAR L'\n'
+
+/* Rename to standard API for using out of glibc.  */
+#ifndef _LIBC
+# undef __wctype
+# undef __iswctype
+# define __wctype wctype
+# define __iswalnum iswalnum
+# define __iswctype iswctype
+# define __towlower towlower
+# define __towupper towupper
+# define __btowc btowc
+# define __mbrtowc mbrtowc
+# define __wcrtomb wcrtomb
+# define __regfree regfree
+# define attribute_hidden
+#endif /* not _LIBC */
+
+#if __GNUC__ < 3 + (__GNUC_MINOR__ < 1)
+# define __attribute__(arg)
+#endif
+
+#ifndef SSIZE_MAX
+# define SSIZE_MAX ((ssize_t) (SIZE_MAX / 2))
+#endif
+
+/* The type of indexes into strings.  This is signed, not size_t,
+   since the API requires indexes to fit in regoff_t anyway, and using
+   signed integers makes the code a bit smaller and presumably faster.
+   The traditional GNU regex implementation uses int for indexes.
+   The POSIX-compatible implementation uses a possibly-wider type.
+   The name 'Idx' is three letters to minimize the hassle of
+   reindenting a lot of regex code that formerly used 'int'.  */
+typedef regoff_t Idx;
+#ifdef _REGEX_LARGE_OFFSETS
+# define IDX_MAX SSIZE_MAX
+#else
+# define IDX_MAX INT_MAX
+#endif
+
+/* A hash value, suitable for computing hash tables.  */
+typedef __re_size_t re_hashval_t;
+
+/* An integer used to represent a set of bits.  It must be unsigned,
+   and must be at least as wide as unsigned int.  */
+typedef unsigned long int bitset_word_t;
+/* All bits set in a bitset_word_t.  */
+#define BITSET_WORD_MAX ULONG_MAX
+
+/* Number of bits in a bitset_word_t.  For portability to hosts with
+   padding bits, do not use '(sizeof (bitset_word_t) * CHAR_BIT)';
+   instead, deduce it directly from BITSET_WORD_MAX.  Avoid
+   greater-than-32-bit integers and unconditional shifts by more than
+   31 bits, as they're not portable.  */
+#if BITSET_WORD_MAX == 0xffffffffUL
+# define BITSET_WORD_BITS 32
+#elif BITSET_WORD_MAX >> 31 >> 4 == 1
+# define BITSET_WORD_BITS 36
+#elif BITSET_WORD_MAX >> 31 >> 16 == 1
+# define BITSET_WORD_BITS 48
+#elif BITSET_WORD_MAX >> 31 >> 28 == 1
+# define BITSET_WORD_BITS 60
+#elif BITSET_WORD_MAX >> 31 >> 31 >> 1 == 1
+# define BITSET_WORD_BITS 64
+#elif BITSET_WORD_MAX >> 31 >> 31 >> 9 == 1
+# define BITSET_WORD_BITS 72
+#elif BITSET_WORD_MAX >> 31 >> 31 >> 31 >> 31 >> 3 == 1
+# define BITSET_WORD_BITS 128
+#elif BITSET_WORD_MAX >> 31 >> 31 >> 31 >> 31 >> 31 >> 31 >> 31 >> 31 >> 7 == 1
+# define BITSET_WORD_BITS 256
+#elif BITSET_WORD_MAX >> 31 >> 31 >> 31 >> 31 >> 31 >> 31 >> 31 >> 31 >> 7 > 1
+# define BITSET_WORD_BITS 257 /* any value > SBC_MAX will do here */
+# if BITSET_WORD_BITS <= SBC_MAX
+#  error "Invalid SBC_MAX"
+# endif
+#else
+# error "Add case for new bitset_word_t size"
+#endif
+
+/* Number of bitset_word_t values in a bitset_t.  */
+#define BITSET_WORDS ((SBC_MAX + BITSET_WORD_BITS - 1) / BITSET_WORD_BITS)
+
+typedef bitset_word_t bitset_t[BITSET_WORDS];
+typedef bitset_word_t *re_bitset_ptr_t;
+typedef const bitset_word_t *re_const_bitset_ptr_t;
+
+#define PREV_WORD_CONSTRAINT 0x0001
+#define PREV_NOTWORD_CONSTRAINT 0x0002
+#define NEXT_WORD_CONSTRAINT 0x0004
+#define NEXT_NOTWORD_CONSTRAINT 0x0008
+#define PREV_NEWLINE_CONSTRAINT 0x0010
+#define NEXT_NEWLINE_CONSTRAINT 0x0020
+#define PREV_BEGBUF_CONSTRAINT 0x0040
+#define NEXT_ENDBUF_CONSTRAINT 0x0080
+#define WORD_DELIM_CONSTRAINT 0x0100
+#define NOT_WORD_DELIM_CONSTRAINT 0x0200
+
+typedef enum
+{
+  INSIDE_WORD = PREV_WORD_CONSTRAINT | NEXT_WORD_CONSTRAINT,
+  WORD_FIRST = PREV_NOTWORD_CONSTRAINT | NEXT_WORD_CONSTRAINT,
+  WORD_LAST = PREV_WORD_CONSTRAINT | NEXT_NOTWORD_CONSTRAINT,
+  INSIDE_NOTWORD = PREV_NOTWORD_CONSTRAINT | NEXT_NOTWORD_CONSTRAINT,
+  LINE_FIRST = PREV_NEWLINE_CONSTRAINT,
+  LINE_LAST = NEXT_NEWLINE_CONSTRAINT,
+  BUF_FIRST = PREV_BEGBUF_CONSTRAINT,
+  BUF_LAST = NEXT_ENDBUF_CONSTRAINT,
+  WORD_DELIM = WORD_DELIM_CONSTRAINT,
+  NOT_WORD_DELIM = NOT_WORD_DELIM_CONSTRAINT
+} re_context_type;
+
+typedef struct
+{
+  Idx alloc;
+  Idx nelem;
+  Idx *elems;
+} re_node_set;
+
+typedef enum
+{
+  NON_TYPE = 0,
+
+  /* Node type, These are used by token, node, tree.  */
+  CHARACTER = 1,
+  END_OF_RE = 2,
+  SIMPLE_BRACKET = 3,
+  OP_BACK_REF = 4,
+  OP_PERIOD = 5,
+#ifdef RE_ENABLE_I18N
+  COMPLEX_BRACKET = 6,
+  OP_UTF8_PERIOD = 7,
+#endif /* RE_ENABLE_I18N */
+
+  /* We define EPSILON_BIT as a macro so that OP_OPEN_SUBEXP is used
+     when the debugger shows values of this enum type.  */
+#define EPSILON_BIT 8
+  OP_OPEN_SUBEXP = EPSILON_BIT | 0,
+  OP_CLOSE_SUBEXP = EPSILON_BIT | 1,
+  OP_ALT = EPSILON_BIT | 2,
+  OP_DUP_ASTERISK = EPSILON_BIT | 3,
+  ANCHOR = EPSILON_BIT | 4,
+
+  /* Tree type, these are used only by tree. */
+  CONCAT = 16,
+  SUBEXP = 17,
+
+  /* Token type, these are used only by token.  */
+  OP_DUP_PLUS = 18,
+  OP_DUP_QUESTION,
+  OP_OPEN_BRACKET,
+  OP_CLOSE_BRACKET,
+  OP_CHARSET_RANGE,
+  OP_OPEN_DUP_NUM,
+  OP_CLOSE_DUP_NUM,
+  OP_NON_MATCH_LIST,
+  OP_OPEN_COLL_ELEM,
+  OP_CLOSE_COLL_ELEM,
+  OP_OPEN_EQUIV_CLASS,
+  OP_CLOSE_EQUIV_CLASS,
+  OP_OPEN_CHAR_CLASS,
+  OP_CLOSE_CHAR_CLASS,
+  OP_WORD,
+  OP_NOTWORD,
+  OP_SPACE,
+  OP_NOTSPACE,
+  BACK_SLASH
+
+} re_token_type_t;
+
+#ifdef RE_ENABLE_I18N
+typedef struct
+{
+  /* Multibyte characters.  */
+  wchar_t *mbchars;
+
+  /* Collating symbols.  */
+# ifdef _LIBC
+  int32_t *coll_syms;
+# endif
+
+  /* Equivalence classes. */
+# ifdef _LIBC
+  int32_t *equiv_classes;
+# endif
+
+  /* Range expressions. */
+# ifdef _LIBC
+  uint32_t *range_starts;
+  uint32_t *range_ends;
+# else /* not _LIBC */
+  wchar_t *range_starts;
+  wchar_t *range_ends;
+# endif /* not _LIBC */
+
+  /* Character classes. */
+  wctype_t *char_classes;
+
+  /* If this character set is the non-matching list.  */
+  unsigned int non_match : 1;
+
+  /* # of multibyte characters.  */
+  Idx nmbchars;
+
+  /* # of collating symbols.  */
+  Idx ncoll_syms;
+
+  /* # of equivalence classes. */
+  Idx nequiv_classes;
+
+  /* # of range expressions. */
+  Idx nranges;
+
+  /* # of character classes. */
+  Idx nchar_classes;
+} re_charset_t;
+#endif /* RE_ENABLE_I18N */
+
+typedef struct
+{
+  union
+  {
+    unsigned char c;		/* for CHARACTER */
+    re_bitset_ptr_t sbcset;	/* for SIMPLE_BRACKET */
+#ifdef RE_ENABLE_I18N
+    re_charset_t *mbcset;	/* for COMPLEX_BRACKET */
+#endif /* RE_ENABLE_I18N */
+    Idx idx;			/* for BACK_REF */
+    re_context_type ctx_type;	/* for ANCHOR */
+  } opr;
+#if __GNUC__ >= 2 && !defined __STRICT_ANSI__
+  re_token_type_t type : 8;
+#else
+  re_token_type_t type;
+#endif
+  unsigned int constraint : 10;	/* context constraint */
+  unsigned int duplicated : 1;
+  unsigned int opt_subexp : 1;
+#ifdef RE_ENABLE_I18N
+  unsigned int accept_mb : 1;
+  /* These 2 bits can be moved into the union if needed (e.g. if running out
+     of bits; move opr.c to opr.c.c and move the flags to opr.c.flags).  */
+  unsigned int mb_partial : 1;
+#endif
+  unsigned int word_char : 1;
+} re_token_t;
+
+#define IS_EPSILON_NODE(type) ((type) & EPSILON_BIT)
+
+struct re_string_t
+{
+  /* Indicate the raw buffer which is the original string passed as an
+     argument of regexec(), re_search(), etc..  */
+  const unsigned char *raw_mbs;
+  /* Store the multibyte string.  In case of "case insensitive mode" like
+     REG_ICASE, upper cases of the string are stored, otherwise MBS points
+     the same address that RAW_MBS points.  */
+  unsigned char *mbs;
+#ifdef RE_ENABLE_I18N
+  /* Store the wide character string which is corresponding to MBS.  */
+  wint_t *wcs;
+  Idx *offsets;
+  mbstate_t cur_state;
+#endif
+  /* Index in RAW_MBS.  Each character mbs[i] corresponds to
+     raw_mbs[raw_mbs_idx + i].  */
+  Idx raw_mbs_idx;
+  /* The length of the valid characters in the buffers.  */
+  Idx valid_len;
+  /* The corresponding number of bytes in raw_mbs array.  */
+  Idx valid_raw_len;
+  /* The length of the buffers MBS and WCS.  */
+  Idx bufs_len;
+  /* The index in MBS, which is updated by re_string_fetch_byte.  */
+  Idx cur_idx;
+  /* length of RAW_MBS array.  */
+  Idx raw_len;
+  /* This is RAW_LEN - RAW_MBS_IDX + VALID_LEN - VALID_RAW_LEN.  */
+  Idx len;
+  /* End of the buffer may be shorter than its length in the cases such
+     as re_match_2, re_search_2.  Then, we use STOP for end of the buffer
+     instead of LEN.  */
+  Idx raw_stop;
+  /* This is RAW_STOP - RAW_MBS_IDX adjusted through OFFSETS.  */
+  Idx stop;
+
+  /* The context of mbs[0].  We store the context independently, since
+     the context of mbs[0] may be different from raw_mbs[0], which is
+     the beginning of the input string.  */
+  unsigned int tip_context;
+  /* The translation passed as a part of an argument of re_compile_pattern.  */
+  RE_TRANSLATE_TYPE trans;
+  /* Copy of re_dfa_t's word_char.  */
+  re_const_bitset_ptr_t word_char;
+  /* true if REG_ICASE.  */
+  unsigned char icase;
+  unsigned char is_utf8;
+  unsigned char map_notascii;
+  unsigned char mbs_allocated;
+  unsigned char offsets_needed;
+  unsigned char newline_anchor;
+  unsigned char word_ops_used;
+  int mb_cur_max;
+};
+typedef struct re_string_t re_string_t;
+
+
+struct re_dfa_t;
+typedef struct re_dfa_t re_dfa_t;
+
+#ifndef _LIBC
+# define internal_function
+# define IS_IN(libc) false
+#endif
+
+static reg_errcode_t re_string_realloc_buffers (re_string_t *pstr,
+						Idx new_buf_len)
+     internal_function;
+#ifdef RE_ENABLE_I18N
+static void build_wcs_buffer (re_string_t *pstr) internal_function;
+static reg_errcode_t build_wcs_upper_buffer (re_string_t *pstr)
+  internal_function;
+#endif /* RE_ENABLE_I18N */
+static void build_upper_buffer (re_string_t *pstr) internal_function;
+static void re_string_translate_buffer (re_string_t *pstr) internal_function;
+static unsigned int re_string_context_at (const re_string_t *input, Idx idx,
+					  int eflags)
+     internal_function __attribute__ ((pure));
+
+#define re_string_peek_byte(pstr, offset) \
+  ((pstr)->mbs[(pstr)->cur_idx + offset])
+#define re_string_fetch_byte(pstr) \
+  ((pstr)->mbs[(pstr)->cur_idx++])
+#define re_string_first_byte(pstr, idx) \
+  ((idx) == (pstr)->valid_len || (pstr)->wcs[idx] != WEOF)
+#define re_string_is_single_byte_char(pstr, idx) \
+  ((pstr)->wcs[idx] != WEOF && ((pstr)->valid_len == (idx) + 1 \
+				|| (pstr)->wcs[(idx) + 1] != WEOF))
+#define re_string_eoi(pstr) ((pstr)->stop <= (pstr)->cur_idx)
+#define re_string_cur_idx(pstr) ((pstr)->cur_idx)
+#define re_string_get_buffer(pstr) ((pstr)->mbs)
+#define re_string_length(pstr) ((pstr)->len)
+#define re_string_byte_at(pstr,idx) ((pstr)->mbs[idx])
+#define re_string_skip_bytes(pstr,idx) ((pstr)->cur_idx += (idx))
+#define re_string_set_index(pstr,idx) ((pstr)->cur_idx = (idx))
+
+#if defined _LIBC || HAVE_ALLOCA
+# include <alloca.h>
+#endif
+
+#ifndef _LIBC
+# if HAVE_ALLOCA
+/* The OS usually guarantees only one guard page at the bottom of the stack,
+   and a page size can be as small as 4096 bytes.  So we cannot safely
+   allocate anything larger than 4096 bytes.  Also care for the possibility
+   of a few compiler-allocated temporary stack slots.  */
+#  define __libc_use_alloca(n) ((n) < 4032)
+# else
+/* alloca is implemented with malloc, so just use malloc.  */
+#  define __libc_use_alloca(n) 0
+#  undef alloca
+#  define alloca(n) malloc (n)
+# endif
+#endif
+
+#ifdef _LIBC
+# define MALLOC_0_IS_NONNULL 1
+#elif !defined MALLOC_0_IS_NONNULL
+# define MALLOC_0_IS_NONNULL 0
+#endif
+
+#ifndef MAX
+# define MAX(a,b) ((a) < (b) ? (b) : (a))
+#endif
+#ifndef MIN
+# define MIN(a,b) ((a) < (b) ? (a) : (b))
+#endif
+
+#define re_malloc(t,n) ((t *) malloc ((n) * sizeof (t)))
+#define re_realloc(p,t,n) ((t *) realloc (p, (n) * sizeof (t)))
+#define re_free(p) free (p)
+
+struct bin_tree_t
+{
+  struct bin_tree_t *parent;
+  struct bin_tree_t *left;
+  struct bin_tree_t *right;
+  struct bin_tree_t *first;
+  struct bin_tree_t *next;
+
+  re_token_t token;
+
+  /* 'node_idx' is the index in dfa->nodes, if 'type' == 0.
+     Otherwise 'type' indicate the type of this node.  */
+  Idx node_idx;
+};
+typedef struct bin_tree_t bin_tree_t;
+
+#define BIN_TREE_STORAGE_SIZE \
+  ((1024 - sizeof (void *)) / sizeof (bin_tree_t))
+
+struct bin_tree_storage_t
+{
+  struct bin_tree_storage_t *next;
+  bin_tree_t data[BIN_TREE_STORAGE_SIZE];
+};
+typedef struct bin_tree_storage_t bin_tree_storage_t;
+
+#define CONTEXT_WORD 1
+#define CONTEXT_NEWLINE (CONTEXT_WORD << 1)
+#define CONTEXT_BEGBUF (CONTEXT_NEWLINE << 1)
+#define CONTEXT_ENDBUF (CONTEXT_BEGBUF << 1)
+
+#define IS_WORD_CONTEXT(c) ((c) & CONTEXT_WORD)
+#define IS_NEWLINE_CONTEXT(c) ((c) & CONTEXT_NEWLINE)
+#define IS_BEGBUF_CONTEXT(c) ((c) & CONTEXT_BEGBUF)
+#define IS_ENDBUF_CONTEXT(c) ((c) & CONTEXT_ENDBUF)
+#define IS_ORDINARY_CONTEXT(c) ((c) == 0)
+
+#define IS_WORD_CHAR(ch) (isalnum (ch) || (ch) == '_')
+#define IS_NEWLINE(ch) ((ch) == NEWLINE_CHAR)
+#define IS_WIDE_WORD_CHAR(ch) (__iswalnum (ch) || (ch) == L'_')
+#define IS_WIDE_NEWLINE(ch) ((ch) == WIDE_NEWLINE_CHAR)
+
+#define NOT_SATISFY_PREV_CONSTRAINT(constraint,context) \
+ ((((constraint) & PREV_WORD_CONSTRAINT) && !IS_WORD_CONTEXT (context)) \
+  || ((constraint & PREV_NOTWORD_CONSTRAINT) && IS_WORD_CONTEXT (context)) \
+  || ((constraint & PREV_NEWLINE_CONSTRAINT) && !IS_NEWLINE_CONTEXT (context))\
+  || ((constraint & PREV_BEGBUF_CONSTRAINT) && !IS_BEGBUF_CONTEXT (context)))
+
+#define NOT_SATISFY_NEXT_CONSTRAINT(constraint,context) \
+ ((((constraint) & NEXT_WORD_CONSTRAINT) && !IS_WORD_CONTEXT (context)) \
+  || (((constraint) & NEXT_NOTWORD_CONSTRAINT) && IS_WORD_CONTEXT (context)) \
+  || (((constraint) & NEXT_NEWLINE_CONSTRAINT) && !IS_NEWLINE_CONTEXT (context)) \
+  || (((constraint) & NEXT_ENDBUF_CONSTRAINT) && !IS_ENDBUF_CONTEXT (context)))
+
+struct re_dfastate_t
+{
+  re_hashval_t hash;
+  re_node_set nodes;
+  re_node_set non_eps_nodes;
+  re_node_set inveclosure;
+  re_node_set *entrance_nodes;
+  struct re_dfastate_t **trtable, **word_trtable;
+  unsigned int context : 4;
+  unsigned int halt : 1;
+  /* If this state can accept "multi byte".
+     Note that we refer to multibyte characters, and multi character
+     collating elements as "multi byte".  */
+  unsigned int accept_mb : 1;
+  /* If this state has backreference node(s).  */
+  unsigned int has_backref : 1;
+  unsigned int has_constraint : 1;
+};
+typedef struct re_dfastate_t re_dfastate_t;
+
+struct re_state_table_entry
+{
+  Idx num;
+  Idx alloc;
+  re_dfastate_t **array;
+};
+
+/* Array type used in re_sub_match_last_t and re_sub_match_top_t.  */
+
+typedef struct
+{
+  Idx next_idx;
+  Idx alloc;
+  re_dfastate_t **array;
+} state_array_t;
+
+/* Store information about the node NODE whose type is OP_CLOSE_SUBEXP.  */
+
+typedef struct
+{
+  Idx node;
+  Idx str_idx; /* The position NODE match at.  */
+  state_array_t path;
+} re_sub_match_last_t;
+
+/* Store information about the node NODE whose type is OP_OPEN_SUBEXP.
+   And information about the node, whose type is OP_CLOSE_SUBEXP,
+   corresponding to NODE is stored in LASTS.  */
+
+typedef struct
+{
+  Idx str_idx;
+  Idx node;
+  state_array_t *path;
+  Idx alasts; /* Allocation size of LASTS.  */
+  Idx nlasts; /* The number of LASTS.  */
+  re_sub_match_last_t **lasts;
+} re_sub_match_top_t;
+
+struct re_backref_cache_entry
+{
+  Idx node;
+  Idx str_idx;
+  Idx subexp_from;
+  Idx subexp_to;
+  char more;
+  char unused;
+  unsigned short int eps_reachable_subexps_map;
+};
+
+typedef struct
+{
+  /* The string object corresponding to the input string.  */
+  re_string_t input;
+#if defined _LIBC || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L)
+  const re_dfa_t *const dfa;
+#else
+  const re_dfa_t *dfa;
+#endif
+  /* EFLAGS of the argument of regexec.  */
+  int eflags;
+  /* Where the matching ends.  */
+  Idx match_last;
+  Idx last_node;
+  /* The state log used by the matcher.  */
+  re_dfastate_t **state_log;
+  Idx state_log_top;
+  /* Back reference cache.  */
+  Idx nbkref_ents;
+  Idx abkref_ents;
+  struct re_backref_cache_entry *bkref_ents;
+  int max_mb_elem_len;
+  Idx nsub_tops;
+  Idx asub_tops;
+  re_sub_match_top_t **sub_tops;
+} re_match_context_t;
+
+typedef struct
+{
+  re_dfastate_t **sifted_states;
+  re_dfastate_t **limited_states;
+  Idx last_node;
+  Idx last_str_idx;
+  re_node_set limits;
+} re_sift_context_t;
+
+struct re_fail_stack_ent_t
+{
+  Idx idx;
+  Idx node;
+  regmatch_t *regs;
+  re_node_set eps_via_nodes;
+};
+
+struct re_fail_stack_t
+{
+  Idx num;
+  Idx alloc;
+  struct re_fail_stack_ent_t *stack;
+};
+
+struct re_dfa_t
+{
+  re_token_t *nodes;
+  size_t nodes_alloc;
+  size_t nodes_len;
+  Idx *nexts;
+  Idx *org_indices;
+  re_node_set *edests;
+  re_node_set *eclosures;
+  re_node_set *inveclosures;
+  struct re_state_table_entry *state_table;
+  re_dfastate_t *init_state;
+  re_dfastate_t *init_state_word;
+  re_dfastate_t *init_state_nl;
+  re_dfastate_t *init_state_begbuf;
+  bin_tree_t *str_tree;
+  bin_tree_storage_t *str_tree_storage;
+  re_bitset_ptr_t sb_char;
+  int str_tree_storage_idx;
+
+  /* number of subexpressions 're_nsub' is in regex_t.  */
+  re_hashval_t state_hash_mask;
+  Idx init_node;
+  Idx nbackref; /* The number of backreference in this dfa.  */
+
+  /* Bitmap expressing which backreference is used.  */
+  bitset_word_t used_bkref_map;
+  bitset_word_t completed_bkref_map;
+
+  unsigned int has_plural_match : 1;
+  /* If this dfa has "multibyte node", which is a backreference or
+     a node which can accept multibyte character or multi character
+     collating element.  */
+  unsigned int has_mb_node : 1;
+  unsigned int is_utf8 : 1;
+  unsigned int map_notascii : 1;
+  unsigned int word_ops_used : 1;
+  int mb_cur_max;
+  bitset_t word_char;
+  reg_syntax_t syntax;
+  Idx *subexp_map;
+#ifdef DEBUG
+  char* re_str;
+#endif
+  lock_define (lock)
+};
+
+#define re_node_set_init_empty(set) memset (set, '\0', sizeof (re_node_set))
+#define re_node_set_remove(set,id) \
+  (re_node_set_remove_at (set, re_node_set_contains (set, id) - 1))
+#define re_node_set_empty(p) ((p)->nelem = 0)
+#define re_node_set_free(set) re_free ((set)->elems)
+
+
+typedef enum
+{
+  SB_CHAR,
+  MB_CHAR,
+  EQUIV_CLASS,
+  COLL_SYM,
+  CHAR_CLASS
+} bracket_elem_type;
+
+typedef struct
+{
+  bracket_elem_type type;
+  union
+  {
+    unsigned char ch;
+    unsigned char *name;
+    wchar_t wch;
+  } opr;
+} bracket_elem_t;
+
+
+/* Functions for bitset_t operation.  */
+
+static void
+bitset_set (bitset_t set, Idx i)
+{
+  set[i / BITSET_WORD_BITS] |= (bitset_word_t) 1 << i % BITSET_WORD_BITS;
+}
+
+static void
+bitset_clear (bitset_t set, Idx i)
+{
+  set[i / BITSET_WORD_BITS] &= ~ ((bitset_word_t) 1 << i % BITSET_WORD_BITS);
+}
+
+static bool
+bitset_contain (const bitset_t set, Idx i)
+{
+  return (set[i / BITSET_WORD_BITS] >> i % BITSET_WORD_BITS) & 1;
+}
+
+static void
+bitset_empty (bitset_t set)
+{
+  memset (set, '\0', sizeof (bitset_t));
+}
+
+static void
+bitset_set_all (bitset_t set)
+{
+  memset (set, -1, sizeof (bitset_word_t) * (SBC_MAX / BITSET_WORD_BITS));
+  if (SBC_MAX % BITSET_WORD_BITS != 0)
+    set[BITSET_WORDS - 1] =
+      ((bitset_word_t) 1 << SBC_MAX % BITSET_WORD_BITS) - 1;
+}
+
+static void
+bitset_copy (bitset_t dest, const bitset_t src)
+{
+  memcpy (dest, src, sizeof (bitset_t));
+}
+
+static void __attribute__ ((unused))
+bitset_not (bitset_t set)
+{
+  int bitset_i;
+  for (bitset_i = 0; bitset_i < SBC_MAX / BITSET_WORD_BITS; ++bitset_i)
+    set[bitset_i] = ~set[bitset_i];
+  if (SBC_MAX % BITSET_WORD_BITS != 0)
+    set[BITSET_WORDS - 1] =
+      ((((bitset_word_t) 1 << SBC_MAX % BITSET_WORD_BITS) - 1)
+       & ~set[BITSET_WORDS - 1]);
+}
+
+static void __attribute__ ((unused))
+bitset_merge (bitset_t dest, const bitset_t src)
+{
+  int bitset_i;
+  for (bitset_i = 0; bitset_i < BITSET_WORDS; ++bitset_i)
+    dest[bitset_i] |= src[bitset_i];
+}
+
+static void __attribute__ ((unused))
+bitset_mask (bitset_t dest, const bitset_t src)
+{
+  int bitset_i;
+  for (bitset_i = 0; bitset_i < BITSET_WORDS; ++bitset_i)
+    dest[bitset_i] &= src[bitset_i];
+}
+
+#ifdef RE_ENABLE_I18N
+/* Functions for re_string.  */
+static int
+internal_function __attribute__ ((pure, unused))
+re_string_char_size_at (const re_string_t *pstr, Idx idx)
+{
+  int byte_idx;
+  if (pstr->mb_cur_max == 1)
+    return 1;
+  for (byte_idx = 1; idx + byte_idx < pstr->valid_len; ++byte_idx)
+    if (pstr->wcs[idx + byte_idx] != WEOF)
+      break;
+  return byte_idx;
+}
+
+static wint_t
+internal_function __attribute__ ((pure, unused))
+re_string_wchar_at (const re_string_t *pstr, Idx idx)
+{
+  if (pstr->mb_cur_max == 1)
+    return (wint_t) pstr->mbs[idx];
+  return (wint_t) pstr->wcs[idx];
+}
+
+# ifdef _LIBC
+#  include <locale/weight.h>
+# endif
+
+static int
+internal_function __attribute__ ((pure, unused))
+re_string_elem_size_at (const re_string_t *pstr, Idx idx)
+{
+# ifdef _LIBC
+  const unsigned char *p, *extra;
+  const int32_t *table, *indirect;
+  uint_fast32_t nrules = _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES);
+
+  if (nrules != 0)
+    {
+      table = (const int32_t *) _NL_CURRENT (LC_COLLATE, _NL_COLLATE_TABLEMB);
+      extra = (const unsigned char *)
+	_NL_CURRENT (LC_COLLATE, _NL_COLLATE_EXTRAMB);
+      indirect = (const int32_t *) _NL_CURRENT (LC_COLLATE,
+						_NL_COLLATE_INDIRECTMB);
+      p = pstr->mbs + idx;
+      findidx (table, indirect, extra, &p, pstr->len - idx);
+      return p - pstr->mbs - idx;
+    }
+  else
+# endif /* _LIBC */
+    return 1;
+}
+#endif /* RE_ENABLE_I18N */
+
+#ifndef __GNUC_PREREQ
+# if defined __GNUC__ && defined __GNUC_MINOR__
+#  define __GNUC_PREREQ(maj, min) \
+         ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
+# else
+#  define __GNUC_PREREQ(maj, min) 0
+# endif
+#endif
+
+#if __GNUC_PREREQ (3,4)
+# undef __attribute_warn_unused_result__
+# define __attribute_warn_unused_result__ \
+   __attribute__ ((__warn_unused_result__))
+#else
+# define __attribute_warn_unused_result__ /* empty */
+#endif
+
+#ifndef FALLTHROUGH
+# if __GNUC__ < 7
+#  define FALLTHROUGH ((void) 0)
+# else
+#  define FALLTHROUGH __attribute__ ((__fallthrough__))
+# endif
+#endif
+
+#endif /*  _REGEX_INTERNAL_H */
diff --git a/gl/regexec.c b/gl/regexec.c
new file mode 100644
index 0000000..497ba0f
--- /dev/null
+++ b/gl/regexec.c
@@ -0,0 +1,4393 @@
+/* Extended regular expression matching and search library.
+   Copyright (C) 2002-2017 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
+
+static reg_errcode_t match_ctx_init (re_match_context_t *cache, int eflags,
+				     Idx n) internal_function;
+static void match_ctx_clean (re_match_context_t *mctx) internal_function;
+static void match_ctx_free (re_match_context_t *cache) internal_function;
+static reg_errcode_t match_ctx_add_entry (re_match_context_t *cache, Idx node,
+					  Idx str_idx, Idx from, Idx to)
+     internal_function;
+static Idx search_cur_bkref_entry (const re_match_context_t *mctx, Idx str_idx)
+     internal_function;
+static reg_errcode_t match_ctx_add_subtop (re_match_context_t *mctx, Idx node,
+					   Idx str_idx) internal_function;
+static re_sub_match_last_t * match_ctx_add_sublast (re_sub_match_top_t *subtop,
+						    Idx node, Idx str_idx)
+     internal_function;
+static void sift_ctx_init (re_sift_context_t *sctx, re_dfastate_t **sifted_sts,
+			   re_dfastate_t **limited_sts, Idx last_node,
+			   Idx last_str_idx)
+     internal_function;
+static reg_errcode_t re_search_internal (const regex_t *preg,
+					 const char *string, Idx length,
+					 Idx start, Idx last_start, Idx stop,
+					 size_t nmatch, regmatch_t pmatch[],
+					 int eflags) internal_function;
+static regoff_t re_search_2_stub (struct re_pattern_buffer *bufp,
+				  const char *string1, Idx length1,
+				  const char *string2, Idx length2,
+				  Idx start, regoff_t range,
+				  struct re_registers *regs,
+				  Idx stop, bool ret_len) internal_function;
+static regoff_t re_search_stub (struct re_pattern_buffer *bufp,
+				const char *string, Idx length, Idx start,
+				regoff_t range, Idx stop,
+				struct re_registers *regs,
+				bool ret_len) internal_function;
+static unsigned re_copy_regs (struct re_registers *regs, regmatch_t *pmatch,
+                              Idx nregs, int regs_allocated) internal_function;
+static reg_errcode_t prune_impossible_nodes (re_match_context_t *mctx)
+     internal_function;
+static Idx check_matching (re_match_context_t *mctx, bool fl_longest_match,
+			   Idx *p_match_first) internal_function;
+static Idx check_halt_state_context (const re_match_context_t *mctx,
+				     const re_dfastate_t *state, Idx idx)
+     internal_function;
+static void update_regs (const re_dfa_t *dfa, regmatch_t *pmatch,
+			 regmatch_t *prev_idx_match, Idx cur_node,
+			 Idx cur_idx, Idx nmatch) internal_function;
+static reg_errcode_t push_fail_stack (struct re_fail_stack_t *fs,
+				      Idx str_idx, Idx dest_node, Idx nregs,
+				      regmatch_t *regs,
+				      re_node_set *eps_via_nodes)
+     internal_function;
+static reg_errcode_t set_regs (const regex_t *preg,
+			       const re_match_context_t *mctx,
+			       size_t nmatch, regmatch_t *pmatch,
+			       bool fl_backtrack) internal_function;
+static reg_errcode_t free_fail_stack_return (struct re_fail_stack_t *fs)
+     internal_function;
+
+#ifdef RE_ENABLE_I18N
+static int sift_states_iter_mb (const re_match_context_t *mctx,
+				re_sift_context_t *sctx,
+				Idx node_idx, Idx str_idx, Idx max_str_idx)
+     internal_function;
+#endif /* RE_ENABLE_I18N */
+static reg_errcode_t sift_states_backward (const re_match_context_t *mctx,
+					   re_sift_context_t *sctx)
+     internal_function;
+static reg_errcode_t build_sifted_states (const re_match_context_t *mctx,
+					  re_sift_context_t *sctx, Idx str_idx,
+					  re_node_set *cur_dest)
+     internal_function;
+static reg_errcode_t update_cur_sifted_state (const re_match_context_t *mctx,
+					      re_sift_context_t *sctx,
+					      Idx str_idx,
+					      re_node_set *dest_nodes)
+     internal_function;
+static reg_errcode_t add_epsilon_src_nodes (const re_dfa_t *dfa,
+					    re_node_set *dest_nodes,
+					    const re_node_set *candidates)
+     internal_function;
+static bool check_dst_limits (const re_match_context_t *mctx,
+			      const re_node_set *limits,
+			      Idx dst_node, Idx dst_idx, Idx src_node,
+			      Idx src_idx) internal_function;
+static int check_dst_limits_calc_pos_1 (const re_match_context_t *mctx,
+					int boundaries, Idx subexp_idx,
+					Idx from_node, Idx bkref_idx)
+     internal_function;
+static int check_dst_limits_calc_pos (const re_match_context_t *mctx,
+				      Idx limit, Idx subexp_idx,
+				      Idx node, Idx str_idx,
+				      Idx bkref_idx) internal_function;
+static reg_errcode_t check_subexp_limits (const re_dfa_t *dfa,
+					  re_node_set *dest_nodes,
+					  const re_node_set *candidates,
+					  re_node_set *limits,
+					  struct re_backref_cache_entry *bkref_ents,
+					  Idx str_idx) internal_function;
+static reg_errcode_t sift_states_bkref (const re_match_context_t *mctx,
+					re_sift_context_t *sctx,
+					Idx str_idx, const re_node_set *candidates)
+     internal_function;
+static reg_errcode_t merge_state_array (const re_dfa_t *dfa,
+					re_dfastate_t **dst,
+					re_dfastate_t **src, Idx num)
+     internal_function;
+static re_dfastate_t *find_recover_state (reg_errcode_t *err,
+					 re_match_context_t *mctx) internal_function;
+static re_dfastate_t *transit_state (reg_errcode_t *err,
+				     re_match_context_t *mctx,
+				     re_dfastate_t *state) internal_function;
+static re_dfastate_t *merge_state_with_log (reg_errcode_t *err,
+					    re_match_context_t *mctx,
+					    re_dfastate_t *next_state)
+     internal_function;
+static reg_errcode_t check_subexp_matching_top (re_match_context_t *mctx,
+						re_node_set *cur_nodes,
+						Idx str_idx) internal_function;
+#if 0
+static re_dfastate_t *transit_state_sb (reg_errcode_t *err,
+					re_match_context_t *mctx,
+					re_dfastate_t *pstate)
+     internal_function;
+#endif
+#ifdef RE_ENABLE_I18N
+static reg_errcode_t transit_state_mb (re_match_context_t *mctx,
+				       re_dfastate_t *pstate)
+     internal_function;
+#endif /* RE_ENABLE_I18N */
+static reg_errcode_t transit_state_bkref (re_match_context_t *mctx,
+					  const re_node_set *nodes)
+     internal_function;
+static reg_errcode_t get_subexp (re_match_context_t *mctx,
+				 Idx bkref_node, Idx bkref_str_idx)
+     internal_function;
+static reg_errcode_t get_subexp_sub (re_match_context_t *mctx,
+				     const re_sub_match_top_t *sub_top,
+				     re_sub_match_last_t *sub_last,
+				     Idx bkref_node, Idx bkref_str)
+     internal_function;
+static Idx find_subexp_node (const re_dfa_t *dfa, const re_node_set *nodes,
+			     Idx subexp_idx, int type) internal_function;
+static reg_errcode_t check_arrival (re_match_context_t *mctx,
+				    state_array_t *path, Idx top_node,
+				    Idx top_str, Idx last_node, Idx last_str,
+				    int type) internal_function;
+static reg_errcode_t check_arrival_add_next_nodes (re_match_context_t *mctx,
+						   Idx str_idx,
+						   re_node_set *cur_nodes,
+						   re_node_set *next_nodes)
+     internal_function;
+static reg_errcode_t check_arrival_expand_ecl (const re_dfa_t *dfa,
+					       re_node_set *cur_nodes,
+					       Idx ex_subexp, int type)
+     internal_function;
+static reg_errcode_t check_arrival_expand_ecl_sub (const re_dfa_t *dfa,
+						   re_node_set *dst_nodes,
+						   Idx target, Idx ex_subexp,
+						   int type) internal_function;
+static reg_errcode_t expand_bkref_cache (re_match_context_t *mctx,
+					 re_node_set *cur_nodes, Idx cur_str,
+					 Idx subexp_num, int type)
+     internal_function;
+static bool build_trtable (const re_dfa_t *dfa,
+			   re_dfastate_t *state) internal_function;
+#ifdef RE_ENABLE_I18N
+static int check_node_accept_bytes (const re_dfa_t *dfa, Idx node_idx,
+				    const re_string_t *input, Idx idx)
+     internal_function;
+# ifdef _LIBC
+static unsigned int find_collation_sequence_value (const unsigned char *mbs,
+						   size_t name_len)
+     internal_function;
+# endif /* _LIBC */
+#endif /* RE_ENABLE_I18N */
+static Idx group_nodes_into_DFAstates (const re_dfa_t *dfa,
+				       const re_dfastate_t *state,
+				       re_node_set *states_node,
+				       bitset_t *states_ch) internal_function;
+static bool check_node_accept (const re_match_context_t *mctx,
+			       const re_token_t *node, Idx idx)
+     internal_function;
+static reg_errcode_t extend_buffers (re_match_context_t *mctx, int min_len)
+     internal_function;
+
+/* Entry point for POSIX code.  */
+
+/* regexec searches for a given pattern, specified by PREG, in the
+   string STRING.
+
+   If NMATCH is zero or REG_NOSUB was set in the cflags argument to
+   'regcomp', we ignore PMATCH.  Otherwise, we assume PMATCH has at
+   least NMATCH elements, and we set them to the offsets of the
+   corresponding matched substrings.
+
+   EFLAGS specifies "execution flags" which affect matching: if
+   REG_NOTBOL is set, then ^ does not match at the beginning of the
+   string; if REG_NOTEOL is set, then $ does not match at the end.
+
+   We return 0 if we find a match and REG_NOMATCH if not.  */
+
+int
+regexec (const regex_t *_Restrict_ preg, const char *_Restrict_ string,
+	 size_t nmatch, regmatch_t pmatch[], int eflags)
+{
+  reg_errcode_t err;
+  Idx start, length;
+  re_dfa_t *dfa = preg->buffer;
+
+  if (eflags & ~(REG_NOTBOL | REG_NOTEOL | REG_STARTEND))
+    return REG_BADPAT;
+
+  if (eflags & REG_STARTEND)
+    {
+      start = pmatch[0].rm_so;
+      length = pmatch[0].rm_eo;
+    }
+  else
+    {
+      start = 0;
+      length = strlen (string);
+    }
+
+  lock_lock (dfa->lock);
+  if (preg->no_sub)
+    err = re_search_internal (preg, string, length, start, length,
+			      length, 0, NULL, eflags);
+  else
+    err = re_search_internal (preg, string, length, start, length,
+			      length, nmatch, pmatch, eflags);
+  lock_unlock (dfa->lock);
+  return err != REG_NOERROR;
+}
+
+#ifdef _LIBC
+# include <shlib-compat.h>
+versioned_symbol (libc, __regexec, regexec, GLIBC_2_3_4);
+
+# if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_3_4)
+__typeof__ (__regexec) __compat_regexec;
+
+int
+attribute_compat_text_section
+__compat_regexec (const regex_t *_Restrict_ preg,
+		  const char *_Restrict_ string, size_t nmatch,
+		  regmatch_t pmatch[], int eflags)
+{
+  return regexec (preg, string, nmatch, pmatch,
+		  eflags & (REG_NOTBOL | REG_NOTEOL));
+}
+compat_symbol (libc, __compat_regexec, regexec, GLIBC_2_0);
+# endif
+#endif
+
+/* Entry points for GNU code.  */
+
+/* re_match, re_search, re_match_2, re_search_2
+
+   The former two functions operate on STRING with length LENGTH,
+   while the later two operate on concatenation of STRING1 and STRING2
+   with lengths LENGTH1 and LENGTH2, respectively.
+
+   re_match() matches the compiled pattern in BUFP against the string,
+   starting at index START.
+
+   re_search() first tries matching at index START, then it tries to match
+   starting from index START + 1, and so on.  The last start position tried
+   is START + RANGE.  (Thus RANGE = 0 forces re_search to operate the same
+   way as re_match().)
+
+   The parameter STOP of re_{match,search}_2 specifies that no match exceeding
+   the first STOP characters of the concatenation of the strings should be
+   concerned.
+
+   If REGS is not NULL, and BUFP->no_sub is not set, the offsets of the match
+   and all groups is stored in REGS.  (For the "_2" variants, the offsets are
+   computed relative to the concatenation, not relative to the individual
+   strings.)
+
+   On success, re_match* functions return the length of the match, re_search*
+   return the position of the start of the match.  Return value -1 means no
+   match was found and -2 indicates an internal error.  */
+
+regoff_t
+re_match (struct re_pattern_buffer *bufp, const char *string, Idx length,
+	  Idx start, struct re_registers *regs)
+{
+  return re_search_stub (bufp, string, length, start, 0, length, regs, true);
+}
+#ifdef _LIBC
+weak_alias (__re_match, re_match)
+#endif
+
+regoff_t
+re_search (struct re_pattern_buffer *bufp, const char *string, Idx length,
+	   Idx start, regoff_t range, struct re_registers *regs)
+{
+  return re_search_stub (bufp, string, length, start, range, length, regs,
+			 false);
+}
+#ifdef _LIBC
+weak_alias (__re_search, re_search)
+#endif
+
+regoff_t
+re_match_2 (struct re_pattern_buffer *bufp, const char *string1, Idx length1,
+	    const char *string2, Idx length2, Idx start,
+	    struct re_registers *regs, Idx stop)
+{
+  return re_search_2_stub (bufp, string1, length1, string2, length2,
+			   start, 0, regs, stop, true);
+}
+#ifdef _LIBC
+weak_alias (__re_match_2, re_match_2)
+#endif
+
+regoff_t
+re_search_2 (struct re_pattern_buffer *bufp, const char *string1, Idx length1,
+	     const char *string2, Idx length2, Idx start, regoff_t range,
+	     struct re_registers *regs, Idx stop)
+{
+  return re_search_2_stub (bufp, string1, length1, string2, length2,
+			   start, range, regs, stop, false);
+}
+#ifdef _LIBC
+weak_alias (__re_search_2, re_search_2)
+#endif
+
+static regoff_t
+internal_function
+re_search_2_stub (struct re_pattern_buffer *bufp, const char *string1,
+		  Idx length1, const char *string2, Idx length2, Idx start,
+		  regoff_t range, struct re_registers *regs,
+		  Idx stop, bool ret_len)
+{
+  const char *str;
+  regoff_t rval;
+  Idx len;
+  char *s = NULL;
+
+  if (BE ((length1 < 0 || length2 < 0 || stop < 0
+           || INT_ADD_WRAPV (length1, length2, &len)),
+          0))
+    return -2;
+
+  /* Concatenate the strings.  */
+  if (length2 > 0)
+    if (length1 > 0)
+      {
+	s = re_malloc (char, len);
+
+	if (BE (s == NULL, 0))
+	  return -2;
+#ifdef _LIBC
+	memcpy (__mempcpy (s, string1, length1), string2, length2);
+#else
+	memcpy (s, string1, length1);
+	memcpy (s + length1, string2, length2);
+#endif
+	str = s;
+      }
+    else
+      str = string2;
+  else
+    str = string1;
+
+  rval = re_search_stub (bufp, str, len, start, range, stop, regs,
+			 ret_len);
+  re_free (s);
+  return rval;
+}
+
+/* The parameters have the same meaning as those of re_search.
+   Additional parameters:
+   If RET_LEN is true the length of the match is returned (re_match style);
+   otherwise the position of the match is returned.  */
+
+static regoff_t
+internal_function
+re_search_stub (struct re_pattern_buffer *bufp, const char *string, Idx length,
+		Idx start, regoff_t range, Idx stop, struct re_registers *regs,
+		bool ret_len)
+{
+  reg_errcode_t result;
+  regmatch_t *pmatch;
+  Idx nregs;
+  regoff_t rval;
+  int eflags = 0;
+  re_dfa_t *dfa = bufp->buffer;
+  Idx last_start = start + range;
+
+  /* Check for out-of-range.  */
+  if (BE (start < 0 || start > length, 0))
+    return -1;
+  if (BE (length < last_start || (0 <= range && last_start < start), 0))
+    last_start = length;
+  else if (BE (last_start < 0 || (range < 0 && start <= last_start), 0))
+    last_start = 0;
+
+  lock_lock (dfa->lock);
+
+  eflags |= (bufp->not_bol) ? REG_NOTBOL : 0;
+  eflags |= (bufp->not_eol) ? REG_NOTEOL : 0;
+
+  /* Compile fastmap if we haven't yet.  */
+  if (start < last_start && bufp->fastmap != NULL && !bufp->fastmap_accurate)
+    re_compile_fastmap (bufp);
+
+  if (BE (bufp->no_sub, 0))
+    regs = NULL;
+
+  /* We need at least 1 register.  */
+  if (regs == NULL)
+    nregs = 1;
+  else if (BE (bufp->regs_allocated == REGS_FIXED
+	       && regs->num_regs <= bufp->re_nsub, 0))
+    {
+      nregs = regs->num_regs;
+      if (BE (nregs < 1, 0))
+	{
+	  /* Nothing can be copied to regs.  */
+	  regs = NULL;
+	  nregs = 1;
+	}
+    }
+  else
+    nregs = bufp->re_nsub + 1;
+  pmatch = re_malloc (regmatch_t, nregs);
+  if (BE (pmatch == NULL, 0))
+    {
+      rval = -2;
+      goto out;
+    }
+
+  result = re_search_internal (bufp, string, length, start, last_start, stop,
+			       nregs, pmatch, eflags);
+
+  rval = 0;
+
+  /* I hope we needn't fill their regs with -1's when no match was found.  */
+  if (result != REG_NOERROR)
+    rval = result == REG_NOMATCH ? -1 : -2;
+  else if (regs != NULL)
+    {
+      /* If caller wants register contents data back, copy them.  */
+      bufp->regs_allocated = re_copy_regs (regs, pmatch, nregs,
+					   bufp->regs_allocated);
+      if (BE (bufp->regs_allocated == REGS_UNALLOCATED, 0))
+	rval = -2;
+    }
+
+  if (BE (rval == 0, 1))
+    {
+      if (ret_len)
+	{
+	  assert (pmatch[0].rm_so == start);
+	  rval = pmatch[0].rm_eo - start;
+	}
+      else
+	rval = pmatch[0].rm_so;
+    }
+  re_free (pmatch);
+ out:
+  lock_unlock (dfa->lock);
+  return rval;
+}
+
+static unsigned
+internal_function
+re_copy_regs (struct re_registers *regs, regmatch_t *pmatch, Idx nregs,
+	      int regs_allocated)
+{
+  int rval = REGS_REALLOCATE;
+  Idx i;
+  Idx need_regs = nregs + 1;
+  /* We need one extra element beyond 'num_regs' for the '-1' marker GNU code
+     uses.  */
+
+  /* Have the register data arrays been allocated?  */
+  if (regs_allocated == REGS_UNALLOCATED)
+    { /* No.  So allocate them with malloc.  */
+      regs->start = re_malloc (regoff_t, need_regs);
+      if (BE (regs->start == NULL, 0))
+	return REGS_UNALLOCATED;
+      regs->end = re_malloc (regoff_t, need_regs);
+      if (BE (regs->end == NULL, 0))
+	{
+	  re_free (regs->start);
+	  return REGS_UNALLOCATED;
+	}
+      regs->num_regs = need_regs;
+    }
+  else if (regs_allocated == REGS_REALLOCATE)
+    { /* Yes.  If we need more elements than were already
+	 allocated, reallocate them.  If we need fewer, just
+	 leave it alone.  */
+      if (BE (need_regs > regs->num_regs, 0))
+	{
+	  regoff_t *new_start = re_realloc (regs->start, regoff_t, need_regs);
+	  regoff_t *new_end;
+	  if (BE (new_start == NULL, 0))
+	    return REGS_UNALLOCATED;
+	  new_end = re_realloc (regs->end, regoff_t, need_regs);
+	  if (BE (new_end == NULL, 0))
+	    {
+	      re_free (new_start);
+	      return REGS_UNALLOCATED;
+	    }
+	  regs->start = new_start;
+	  regs->end = new_end;
+	  regs->num_regs = need_regs;
+	}
+    }
+  else
+    {
+      assert (regs_allocated == REGS_FIXED);
+      /* This function may not be called with REGS_FIXED and nregs too big.  */
+      assert (regs->num_regs >= nregs);
+      rval = REGS_FIXED;
+    }
+
+  /* Copy the regs.  */
+  for (i = 0; i < nregs; ++i)
+    {
+      regs->start[i] = pmatch[i].rm_so;
+      regs->end[i] = pmatch[i].rm_eo;
+    }
+  for ( ; i < regs->num_regs; ++i)
+    regs->start[i] = regs->end[i] = -1;
+
+  return rval;
+}
+
+/* Set REGS to hold NUM_REGS registers, storing them in STARTS and
+   ENDS.  Subsequent matches using PATTERN_BUFFER and REGS will use
+   this memory for recording register information.  STARTS and ENDS
+   must be allocated using the malloc library routine, and must each
+   be at least NUM_REGS * sizeof (regoff_t) bytes long.
+
+   If NUM_REGS == 0, then subsequent matches should allocate their own
+   register data.
+
+   Unless this function is called, the first search or match using
+   PATTERN_BUFFER will allocate its own register data, without
+   freeing the old data.  */
+
+void
+re_set_registers (struct re_pattern_buffer *bufp, struct re_registers *regs,
+		  __re_size_t num_regs, regoff_t *starts, regoff_t *ends)
+{
+  if (num_regs)
+    {
+      bufp->regs_allocated = REGS_REALLOCATE;
+      regs->num_regs = num_regs;
+      regs->start = starts;
+      regs->end = ends;
+    }
+  else
+    {
+      bufp->regs_allocated = REGS_UNALLOCATED;
+      regs->num_regs = 0;
+      regs->start = regs->end = NULL;
+    }
+}
+#ifdef _LIBC
+weak_alias (__re_set_registers, re_set_registers)
+#endif
+
+/* Entry points compatible with 4.2 BSD regex library.  We don't define
+   them unless specifically requested.  */
+
+#if defined _REGEX_RE_COMP || defined _LIBC
+int
+# ifdef _LIBC
+weak_function
+# endif
+re_exec (const char *s)
+{
+  return 0 == regexec (&re_comp_buf, s, 0, NULL, 0);
+}
+#endif /* _REGEX_RE_COMP */
+
+/* Internal entry point.  */
+
+/* Searches for a compiled pattern PREG in the string STRING, whose
+   length is LENGTH.  NMATCH, PMATCH, and EFLAGS have the same
+   meaning as with regexec.  LAST_START is START + RANGE, where
+   START and RANGE have the same meaning as with re_search.
+   Return REG_NOERROR if we find a match, and REG_NOMATCH if not,
+   otherwise return the error code.
+   Note: We assume front end functions already check ranges.
+   (0 <= LAST_START && LAST_START <= LENGTH)  */
+
+static reg_errcode_t
+__attribute_warn_unused_result__ internal_function
+re_search_internal (const regex_t *preg, const char *string, Idx length,
+		    Idx start, Idx last_start, Idx stop, size_t nmatch,
+		    regmatch_t pmatch[], int eflags)
+{
+  reg_errcode_t err;
+  const re_dfa_t *dfa = preg->buffer;
+  Idx left_lim, right_lim;
+  int incr;
+  bool fl_longest_match;
+  int match_kind;
+  Idx match_first;
+  Idx match_last = -1;
+  Idx extra_nmatch;
+  bool sb;
+  int ch;
+#if defined _LIBC || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L)
+  re_match_context_t mctx = { .dfa = dfa };
+#else
+  re_match_context_t mctx;
+#endif
+  char *fastmap = ((preg->fastmap != NULL && preg->fastmap_accurate
+		    && start != last_start && !preg->can_be_null)
+		   ? preg->fastmap : NULL);
+  RE_TRANSLATE_TYPE t = preg->translate;
+
+#if !(defined _LIBC || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L))
+  memset (&mctx, '\0', sizeof (re_match_context_t));
+  mctx.dfa = dfa;
+#endif
+
+  extra_nmatch = (nmatch > preg->re_nsub) ? nmatch - (preg->re_nsub + 1) : 0;
+  nmatch -= extra_nmatch;
+
+  /* Check if the DFA haven't been compiled.  */
+  if (BE (preg->used == 0 || dfa->init_state == NULL
+	  || dfa->init_state_word == NULL || dfa->init_state_nl == NULL
+	  || dfa->init_state_begbuf == NULL, 0))
+    return REG_NOMATCH;
+
+#ifdef DEBUG
+  /* We assume front-end functions already check them.  */
+  assert (0 <= last_start && last_start <= length);
+#endif
+
+  /* If initial states with non-begbuf contexts have no elements,
+     the regex must be anchored.  If preg->newline_anchor is set,
+     we'll never use init_state_nl, so do not check it.  */
+  if (dfa->init_state->nodes.nelem == 0
+      && dfa->init_state_word->nodes.nelem == 0
+      && (dfa->init_state_nl->nodes.nelem == 0
+	  || !preg->newline_anchor))
+    {
+      if (start != 0 && last_start != 0)
+        return REG_NOMATCH;
+      start = last_start = 0;
+    }
+
+  /* We must check the longest matching, if nmatch > 0.  */
+  fl_longest_match = (nmatch != 0 || dfa->nbackref);
+
+  err = re_string_allocate (&mctx.input, string, length, dfa->nodes_len + 1,
+			    preg->translate, (preg->syntax & RE_ICASE) != 0,
+			    dfa);
+  if (BE (err != REG_NOERROR, 0))
+    goto free_return;
+  mctx.input.stop = stop;
+  mctx.input.raw_stop = stop;
+  mctx.input.newline_anchor = preg->newline_anchor;
+
+  err = match_ctx_init (&mctx, eflags, dfa->nbackref * 2);
+  if (BE (err != REG_NOERROR, 0))
+    goto free_return;
+
+  /* We will log all the DFA states through which the dfa pass,
+     if nmatch > 1, or this dfa has "multibyte node", which is a
+     back-reference or a node which can accept multibyte character or
+     multi character collating element.  */
+  if (nmatch > 1 || dfa->has_mb_node)
+    {
+      /* Avoid overflow.  */
+      if (BE ((MIN (IDX_MAX, SIZE_MAX / sizeof (re_dfastate_t *))
+               <= mctx.input.bufs_len), 0))
+	{
+	  err = REG_ESPACE;
+	  goto free_return;
+	}
+
+      mctx.state_log = re_malloc (re_dfastate_t *, mctx.input.bufs_len + 1);
+      if (BE (mctx.state_log == NULL, 0))
+	{
+	  err = REG_ESPACE;
+	  goto free_return;
+	}
+    }
+  else
+    mctx.state_log = NULL;
+
+  match_first = start;
+  mctx.input.tip_context = (eflags & REG_NOTBOL) ? CONTEXT_BEGBUF
+			   : CONTEXT_NEWLINE | CONTEXT_BEGBUF;
+
+  /* Check incrementally whether the input string matches.  */
+  incr = (last_start < start) ? -1 : 1;
+  left_lim = (last_start < start) ? last_start : start;
+  right_lim = (last_start < start) ? start : last_start;
+  sb = dfa->mb_cur_max == 1;
+  match_kind =
+    (fastmap
+     ? ((sb || !(preg->syntax & RE_ICASE || t) ? 4 : 0)
+	| (start <= last_start ? 2 : 0)
+	| (t != NULL ? 1 : 0))
+     : 8);
+
+  for (;; match_first += incr)
+    {
+      err = REG_NOMATCH;
+      if (match_first < left_lim || right_lim < match_first)
+	goto free_return;
+
+      /* Advance as rapidly as possible through the string, until we
+	 find a plausible place to start matching.  This may be done
+	 with varying efficiency, so there are various possibilities:
+	 only the most common of them are specialized, in order to
+	 save on code size.  We use a switch statement for speed.  */
+      switch (match_kind)
+	{
+	case 8:
+	  /* No fastmap.  */
+	  break;
+
+	case 7:
+	  /* Fastmap with single-byte translation, match forward.  */
+	  while (BE (match_first < right_lim, 1)
+		 && !fastmap[t[(unsigned char) string[match_first]]])
+	    ++match_first;
+	  goto forward_match_found_start_or_reached_end;
+
+	case 6:
+	  /* Fastmap without translation, match forward.  */
+	  while (BE (match_first < right_lim, 1)
+		 && !fastmap[(unsigned char) string[match_first]])
+	    ++match_first;
+
+	forward_match_found_start_or_reached_end:
+	  if (BE (match_first == right_lim, 0))
+	    {
+	      ch = match_first >= length
+		       ? 0 : (unsigned char) string[match_first];
+	      if (!fastmap[t ? t[ch] : ch])
+		goto free_return;
+	    }
+	  break;
+
+	case 4:
+	case 5:
+	  /* Fastmap without multi-byte translation, match backwards.  */
+	  while (match_first >= left_lim)
+	    {
+	      ch = match_first >= length
+		       ? 0 : (unsigned char) string[match_first];
+	      if (fastmap[t ? t[ch] : ch])
+		break;
+	      --match_first;
+	    }
+	  if (match_first < left_lim)
+	    goto free_return;
+	  break;
+
+	default:
+	  /* In this case, we can't determine easily the current byte,
+	     since it might be a component byte of a multibyte
+	     character.  Then we use the constructed buffer instead.  */
+	  for (;;)
+	    {
+	      /* If MATCH_FIRST is out of the valid range, reconstruct the
+		 buffers.  */
+	      __re_size_t offset = match_first - mctx.input.raw_mbs_idx;
+	      if (BE (offset >= (__re_size_t) mctx.input.valid_raw_len, 0))
+		{
+		  err = re_string_reconstruct (&mctx.input, match_first,
+					       eflags);
+		  if (BE (err != REG_NOERROR, 0))
+		    goto free_return;
+
+		  offset = match_first - mctx.input.raw_mbs_idx;
+		}
+	      /* If MATCH_FIRST is out of the buffer, leave it as '\0'.
+		 Note that MATCH_FIRST must not be smaller than 0.  */
+	      ch = (match_first >= length
+		    ? 0 : re_string_byte_at (&mctx.input, offset));
+	      if (fastmap[ch])
+		break;
+	      match_first += incr;
+	      if (match_first < left_lim || match_first > right_lim)
+		{
+		  err = REG_NOMATCH;
+		  goto free_return;
+		}
+	    }
+	  break;
+	}
+
+      /* Reconstruct the buffers so that the matcher can assume that
+	 the matching starts from the beginning of the buffer.  */
+      err = re_string_reconstruct (&mctx.input, match_first, eflags);
+      if (BE (err != REG_NOERROR, 0))
+	goto free_return;
+
+#ifdef RE_ENABLE_I18N
+     /* Don't consider this char as a possible match start if it part,
+	yet isn't the head, of a multibyte character.  */
+      if (!sb && !re_string_first_byte (&mctx.input, 0))
+	continue;
+#endif
+
+      /* It seems to be appropriate one, then use the matcher.  */
+      /* We assume that the matching starts from 0.  */
+      mctx.state_log_top = mctx.nbkref_ents = mctx.max_mb_elem_len = 0;
+      match_last = check_matching (&mctx, fl_longest_match,
+				   start <= last_start ? &match_first : NULL);
+      if (match_last != -1)
+	{
+	  if (BE (match_last == -2, 0))
+	    {
+	      err = REG_ESPACE;
+	      goto free_return;
+	    }
+	  else
+	    {
+	      mctx.match_last = match_last;
+	      if ((!preg->no_sub && nmatch > 1) || dfa->nbackref)
+		{
+		  re_dfastate_t *pstate = mctx.state_log[match_last];
+		  mctx.last_node = check_halt_state_context (&mctx, pstate,
+							     match_last);
+		}
+	      if ((!preg->no_sub && nmatch > 1 && dfa->has_plural_match)
+		  || dfa->nbackref)
+		{
+		  err = prune_impossible_nodes (&mctx);
+		  if (err == REG_NOERROR)
+		    break;
+		  if (BE (err != REG_NOMATCH, 0))
+		    goto free_return;
+		  match_last = -1;
+		}
+	      else
+		break; /* We found a match.  */
+	    }
+	}
+
+      match_ctx_clean (&mctx);
+    }
+
+#ifdef DEBUG
+  assert (match_last != -1);
+  assert (err == REG_NOERROR);
+#endif
+
+  /* Set pmatch[] if we need.  */
+  if (nmatch > 0)
+    {
+      Idx reg_idx;
+
+      /* Initialize registers.  */
+      for (reg_idx = 1; reg_idx < nmatch; ++reg_idx)
+	pmatch[reg_idx].rm_so = pmatch[reg_idx].rm_eo = -1;
+
+      /* Set the points where matching start/end.  */
+      pmatch[0].rm_so = 0;
+      pmatch[0].rm_eo = mctx.match_last;
+      /* FIXME: This function should fail if mctx.match_last exceeds
+	 the maximum possible regoff_t value.  We need a new error
+	 code REG_OVERFLOW.  */
+
+      if (!preg->no_sub && nmatch > 1)
+	{
+	  err = set_regs (preg, &mctx, nmatch, pmatch,
+			  dfa->has_plural_match && dfa->nbackref > 0);
+	  if (BE (err != REG_NOERROR, 0))
+	    goto free_return;
+	}
+
+      /* At last, add the offset to each register, since we slid
+	 the buffers so that we could assume that the matching starts
+	 from 0.  */
+      for (reg_idx = 0; reg_idx < nmatch; ++reg_idx)
+	if (pmatch[reg_idx].rm_so != -1)
+	  {
+#ifdef RE_ENABLE_I18N
+	    if (BE (mctx.input.offsets_needed != 0, 0))
+	      {
+		pmatch[reg_idx].rm_so =
+		  (pmatch[reg_idx].rm_so == mctx.input.valid_len
+		   ? mctx.input.valid_raw_len
+		   : mctx.input.offsets[pmatch[reg_idx].rm_so]);
+		pmatch[reg_idx].rm_eo =
+		  (pmatch[reg_idx].rm_eo == mctx.input.valid_len
+		   ? mctx.input.valid_raw_len
+		   : mctx.input.offsets[pmatch[reg_idx].rm_eo]);
+	      }
+#else
+	    assert (mctx.input.offsets_needed == 0);
+#endif
+	    pmatch[reg_idx].rm_so += match_first;
+	    pmatch[reg_idx].rm_eo += match_first;
+	  }
+      for (reg_idx = 0; reg_idx < extra_nmatch; ++reg_idx)
+	{
+	  pmatch[nmatch + reg_idx].rm_so = -1;
+	  pmatch[nmatch + reg_idx].rm_eo = -1;
+	}
+
+      if (dfa->subexp_map)
+	for (reg_idx = 0; reg_idx + 1 < nmatch; reg_idx++)
+	  if (dfa->subexp_map[reg_idx] != reg_idx)
+	    {
+	      pmatch[reg_idx + 1].rm_so
+		= pmatch[dfa->subexp_map[reg_idx] + 1].rm_so;
+	      pmatch[reg_idx + 1].rm_eo
+		= pmatch[dfa->subexp_map[reg_idx] + 1].rm_eo;
+	    }
+    }
+
+ free_return:
+  re_free (mctx.state_log);
+  if (dfa->nbackref)
+    match_ctx_free (&mctx);
+  re_string_destruct (&mctx.input);
+  return err;
+}
+
+static reg_errcode_t
+internal_function __attribute_warn_unused_result__
+prune_impossible_nodes (re_match_context_t *mctx)
+{
+  const re_dfa_t *const dfa = mctx->dfa;
+  Idx halt_node, match_last;
+  reg_errcode_t ret;
+  re_dfastate_t **sifted_states;
+  re_dfastate_t **lim_states = NULL;
+  re_sift_context_t sctx;
+#ifdef DEBUG
+  assert (mctx->state_log != NULL);
+#endif
+  match_last = mctx->match_last;
+  halt_node = mctx->last_node;
+
+  /* Avoid overflow.  */
+  if (BE (MIN (IDX_MAX, SIZE_MAX / sizeof (re_dfastate_t *)) <= match_last, 0))
+    return REG_ESPACE;
+
+  sifted_states = re_malloc (re_dfastate_t *, match_last + 1);
+  if (BE (sifted_states == NULL, 0))
+    {
+      ret = REG_ESPACE;
+      goto free_return;
+    }
+  if (dfa->nbackref)
+    {
+      lim_states = re_malloc (re_dfastate_t *, match_last + 1);
+      if (BE (lim_states == NULL, 0))
+	{
+	  ret = REG_ESPACE;
+	  goto free_return;
+	}
+      while (1)
+	{
+	  memset (lim_states, '\0',
+		  sizeof (re_dfastate_t *) * (match_last + 1));
+	  sift_ctx_init (&sctx, sifted_states, lim_states, halt_node,
+			 match_last);
+	  ret = sift_states_backward (mctx, &sctx);
+	  re_node_set_free (&sctx.limits);
+	  if (BE (ret != REG_NOERROR, 0))
+	      goto free_return;
+	  if (sifted_states[0] != NULL || lim_states[0] != NULL)
+	    break;
+	  do
+	    {
+	      --match_last;
+	      if (match_last < 0)
+		{
+		  ret = REG_NOMATCH;
+		  goto free_return;
+		}
+	    } while (mctx->state_log[match_last] == NULL
+		     || !mctx->state_log[match_last]->halt);
+	  halt_node = check_halt_state_context (mctx,
+						mctx->state_log[match_last],
+						match_last);
+	}
+      ret = merge_state_array (dfa, sifted_states, lim_states,
+			       match_last + 1);
+      re_free (lim_states);
+      lim_states = NULL;
+      if (BE (ret != REG_NOERROR, 0))
+	goto free_return;
+    }
+  else
+    {
+      sift_ctx_init (&sctx, sifted_states, lim_states, halt_node, match_last);
+      ret = sift_states_backward (mctx, &sctx);
+      re_node_set_free (&sctx.limits);
+      if (BE (ret != REG_NOERROR, 0))
+	goto free_return;
+      if (sifted_states[0] == NULL)
+	{
+	  ret = REG_NOMATCH;
+	  goto free_return;
+	}
+    }
+  re_free (mctx->state_log);
+  mctx->state_log = sifted_states;
+  sifted_states = NULL;
+  mctx->last_node = halt_node;
+  mctx->match_last = match_last;
+  ret = REG_NOERROR;
+ free_return:
+  re_free (sifted_states);
+  re_free (lim_states);
+  return ret;
+}
+
+/* Acquire an initial state and return it.
+   We must select appropriate initial state depending on the context,
+   since initial states may have constraints like "\<", "^", etc..  */
+
+static inline re_dfastate_t *
+__attribute__ ((always_inline)) internal_function
+acquire_init_state_context (reg_errcode_t *err, const re_match_context_t *mctx,
+			    Idx idx)
+{
+  const re_dfa_t *const dfa = mctx->dfa;
+  if (dfa->init_state->has_constraint)
+    {
+      unsigned int context;
+      context = re_string_context_at (&mctx->input, idx - 1, mctx->eflags);
+      if (IS_WORD_CONTEXT (context))
+	return dfa->init_state_word;
+      else if (IS_ORDINARY_CONTEXT (context))
+	return dfa->init_state;
+      else if (IS_BEGBUF_CONTEXT (context) && IS_NEWLINE_CONTEXT (context))
+	return dfa->init_state_begbuf;
+      else if (IS_NEWLINE_CONTEXT (context))
+	return dfa->init_state_nl;
+      else if (IS_BEGBUF_CONTEXT (context))
+	{
+	  /* It is relatively rare case, then calculate on demand.  */
+	  return re_acquire_state_context (err, dfa,
+					   dfa->init_state->entrance_nodes,
+					   context);
+	}
+      else
+	/* Must not happen?  */
+	return dfa->init_state;
+    }
+  else
+    return dfa->init_state;
+}
+
+/* Check whether the regular expression match input string INPUT or not,
+   and return the index where the matching end.  Return -1 if
+   there is no match, and return -2 in case of an error.
+   FL_LONGEST_MATCH means we want the POSIX longest matching.
+   If P_MATCH_FIRST is not NULL, and the match fails, it is set to the
+   next place where we may want to try matching.
+   Note that the matcher assumes that the matching starts from the current
+   index of the buffer.  */
+
+static Idx
+internal_function __attribute_warn_unused_result__
+check_matching (re_match_context_t *mctx, bool fl_longest_match,
+		Idx *p_match_first)
+{
+  const re_dfa_t *const dfa = mctx->dfa;
+  reg_errcode_t err;
+  Idx match = 0;
+  Idx match_last = -1;
+  Idx cur_str_idx = re_string_cur_idx (&mctx->input);
+  re_dfastate_t *cur_state;
+  bool at_init_state = p_match_first != NULL;
+  Idx next_start_idx = cur_str_idx;
+
+  err = REG_NOERROR;
+  cur_state = acquire_init_state_context (&err, mctx, cur_str_idx);
+  /* An initial state must not be NULL (invalid).  */
+  if (BE (cur_state == NULL, 0))
+    {
+      assert (err == REG_ESPACE);
+      return -2;
+    }
+
+  if (mctx->state_log != NULL)
+    {
+      mctx->state_log[cur_str_idx] = cur_state;
+
+      /* Check OP_OPEN_SUBEXP in the initial state in case that we use them
+	 later.  E.g. Processing back references.  */
+      if (BE (dfa->nbackref, 0))
+	{
+	  at_init_state = false;
+	  err = check_subexp_matching_top (mctx, &cur_state->nodes, 0);
+	  if (BE (err != REG_NOERROR, 0))
+	    return err;
+
+	  if (cur_state->has_backref)
+	    {
+	      err = transit_state_bkref (mctx, &cur_state->nodes);
+	      if (BE (err != REG_NOERROR, 0))
+		return err;
+	    }
+	}
+    }
+
+  /* If the RE accepts NULL string.  */
+  if (BE (cur_state->halt, 0))
+    {
+      if (!cur_state->has_constraint
+	  || check_halt_state_context (mctx, cur_state, cur_str_idx))
+	{
+	  if (!fl_longest_match)
+	    return cur_str_idx;
+	  else
+	    {
+	      match_last = cur_str_idx;
+	      match = 1;
+	    }
+	}
+    }
+
+  while (!re_string_eoi (&mctx->input))
+    {
+      re_dfastate_t *old_state = cur_state;
+      Idx next_char_idx = re_string_cur_idx (&mctx->input) + 1;
+
+      if ((BE (next_char_idx >= mctx->input.bufs_len, 0)
+	   && mctx->input.bufs_len < mctx->input.len)
+	  || (BE (next_char_idx >= mctx->input.valid_len, 0)
+	      && mctx->input.valid_len < mctx->input.len))
+	{
+	  err = extend_buffers (mctx, next_char_idx + 1);
+	  if (BE (err != REG_NOERROR, 0))
+	    {
+	      assert (err == REG_ESPACE);
+	      return -2;
+	    }
+	}
+
+      cur_state = transit_state (&err, mctx, cur_state);
+      if (mctx->state_log != NULL)
+	cur_state = merge_state_with_log (&err, mctx, cur_state);
+
+      if (cur_state == NULL)
+	{
+	  /* Reached the invalid state or an error.  Try to recover a valid
+	     state using the state log, if available and if we have not
+	     already found a valid (even if not the longest) match.  */
+	  if (BE (err != REG_NOERROR, 0))
+	    return -2;
+
+	  if (mctx->state_log == NULL
+	      || (match && !fl_longest_match)
+	      || (cur_state = find_recover_state (&err, mctx)) == NULL)
+	    break;
+	}
+
+      if (BE (at_init_state, 0))
+	{
+	  if (old_state == cur_state)
+	    next_start_idx = next_char_idx;
+	  else
+	    at_init_state = false;
+	}
+
+      if (cur_state->halt)
+	{
+	  /* Reached a halt state.
+	     Check the halt state can satisfy the current context.  */
+	  if (!cur_state->has_constraint
+	      || check_halt_state_context (mctx, cur_state,
+					   re_string_cur_idx (&mctx->input)))
+	    {
+	      /* We found an appropriate halt state.  */
+	      match_last = re_string_cur_idx (&mctx->input);
+	      match = 1;
+
+	      /* We found a match, do not modify match_first below.  */
+	      p_match_first = NULL;
+	      if (!fl_longest_match)
+		break;
+	    }
+	}
+    }
+
+  if (p_match_first)
+    *p_match_first += next_start_idx;
+
+  return match_last;
+}
+
+/* Check NODE match the current context.  */
+
+static bool
+internal_function
+check_halt_node_context (const re_dfa_t *dfa, Idx node, unsigned int context)
+{
+  re_token_type_t type = dfa->nodes[node].type;
+  unsigned int constraint = dfa->nodes[node].constraint;
+  if (type != END_OF_RE)
+    return false;
+  if (!constraint)
+    return true;
+  if (NOT_SATISFY_NEXT_CONSTRAINT (constraint, context))
+    return false;
+  return true;
+}
+
+/* Check the halt state STATE match the current context.
+   Return 0 if not match, if the node, STATE has, is a halt node and
+   match the context, return the node.  */
+
+static Idx
+internal_function
+check_halt_state_context (const re_match_context_t *mctx,
+			  const re_dfastate_t *state, Idx idx)
+{
+  Idx i;
+  unsigned int context;
+#ifdef DEBUG
+  assert (state->halt);
+#endif
+  context = re_string_context_at (&mctx->input, idx, mctx->eflags);
+  for (i = 0; i < state->nodes.nelem; ++i)
+    if (check_halt_node_context (mctx->dfa, state->nodes.elems[i], context))
+      return state->nodes.elems[i];
+  return 0;
+}
+
+/* Compute the next node to which "NFA" transit from NODE("NFA" is a NFA
+   corresponding to the DFA).
+   Return the destination node, and update EPS_VIA_NODES;
+   return -1 in case of errors.  */
+
+static Idx
+internal_function
+proceed_next_node (const re_match_context_t *mctx, Idx nregs, regmatch_t *regs,
+		   Idx *pidx, Idx node, re_node_set *eps_via_nodes,
+		   struct re_fail_stack_t *fs)
+{
+  const re_dfa_t *const dfa = mctx->dfa;
+  Idx i;
+  bool ok;
+  if (IS_EPSILON_NODE (dfa->nodes[node].type))
+    {
+      re_node_set *cur_nodes = &mctx->state_log[*pidx]->nodes;
+      re_node_set *edests = &dfa->edests[node];
+      Idx dest_node;
+      ok = re_node_set_insert (eps_via_nodes, node);
+      if (BE (! ok, 0))
+	return -2;
+      /* Pick up a valid destination, or return -1 if none
+	 is found.  */
+      for (dest_node = -1, i = 0; i < edests->nelem; ++i)
+	{
+	  Idx candidate = edests->elems[i];
+	  if (!re_node_set_contains (cur_nodes, candidate))
+	    continue;
+          if (dest_node == -1)
+	    dest_node = candidate;
+
+	  else
+	    {
+	      /* In order to avoid infinite loop like "(a*)*", return the second
+		 epsilon-transition if the first was already considered.  */
+	      if (re_node_set_contains (eps_via_nodes, dest_node))
+		return candidate;
+
+	      /* Otherwise, push the second epsilon-transition on the fail stack.  */
+	      else if (fs != NULL
+		       && push_fail_stack (fs, *pidx, candidate, nregs, regs,
+					   eps_via_nodes))
+		return -2;
+
+	      /* We know we are going to exit.  */
+	      break;
+	    }
+	}
+      return dest_node;
+    }
+  else
+    {
+      Idx naccepted = 0;
+      re_token_type_t type = dfa->nodes[node].type;
+
+#ifdef RE_ENABLE_I18N
+      if (dfa->nodes[node].accept_mb)
+	naccepted = check_node_accept_bytes (dfa, node, &mctx->input, *pidx);
+      else
+#endif /* RE_ENABLE_I18N */
+      if (type == OP_BACK_REF)
+	{
+	  Idx subexp_idx = dfa->nodes[node].opr.idx + 1;
+	  naccepted = regs[subexp_idx].rm_eo - regs[subexp_idx].rm_so;
+	  if (fs != NULL)
+	    {
+	      if (regs[subexp_idx].rm_so == -1 || regs[subexp_idx].rm_eo == -1)
+		return -1;
+	      else if (naccepted)
+		{
+		  char *buf = (char *) re_string_get_buffer (&mctx->input);
+		  if (memcmp (buf + regs[subexp_idx].rm_so, buf + *pidx,
+			      naccepted) != 0)
+		    return -1;
+		}
+	    }
+
+	  if (naccepted == 0)
+	    {
+	      Idx dest_node;
+	      ok = re_node_set_insert (eps_via_nodes, node);
+	      if (BE (! ok, 0))
+		return -2;
+	      dest_node = dfa->edests[node].elems[0];
+	      if (re_node_set_contains (&mctx->state_log[*pidx]->nodes,
+					dest_node))
+		return dest_node;
+	    }
+	}
+
+      if (naccepted != 0
+	  || check_node_accept (mctx, dfa->nodes + node, *pidx))
+	{
+	  Idx dest_node = dfa->nexts[node];
+	  *pidx = (naccepted == 0) ? *pidx + 1 : *pidx + naccepted;
+	  if (fs && (*pidx > mctx->match_last || mctx->state_log[*pidx] == NULL
+		     || !re_node_set_contains (&mctx->state_log[*pidx]->nodes,
+					       dest_node)))
+	    return -1;
+	  re_node_set_empty (eps_via_nodes);
+	  return dest_node;
+	}
+    }
+  return -1;
+}
+
+static reg_errcode_t
+internal_function __attribute_warn_unused_result__
+push_fail_stack (struct re_fail_stack_t *fs, Idx str_idx, Idx dest_node,
+		 Idx nregs, regmatch_t *regs, re_node_set *eps_via_nodes)
+{
+  reg_errcode_t err;
+  Idx num = fs->num++;
+  if (fs->num == fs->alloc)
+    {
+      struct re_fail_stack_ent_t *new_array;
+      new_array = realloc (fs->stack, (sizeof (struct re_fail_stack_ent_t)
+				       * fs->alloc * 2));
+      if (new_array == NULL)
+	return REG_ESPACE;
+      fs->alloc *= 2;
+      fs->stack = new_array;
+    }
+  fs->stack[num].idx = str_idx;
+  fs->stack[num].node = dest_node;
+  fs->stack[num].regs = re_malloc (regmatch_t, nregs);
+  if (fs->stack[num].regs == NULL)
+    return REG_ESPACE;
+  memcpy (fs->stack[num].regs, regs, sizeof (regmatch_t) * nregs);
+  err = re_node_set_init_copy (&fs->stack[num].eps_via_nodes, eps_via_nodes);
+  return err;
+}
+
+static Idx
+internal_function
+pop_fail_stack (struct re_fail_stack_t *fs, Idx *pidx, Idx nregs,
+		regmatch_t *regs, re_node_set *eps_via_nodes)
+{
+  Idx num = --fs->num;
+  assert (num >= 0);
+  *pidx = fs->stack[num].idx;
+  memcpy (regs, fs->stack[num].regs, sizeof (regmatch_t) * nregs);
+  re_node_set_free (eps_via_nodes);
+  re_free (fs->stack[num].regs);
+  *eps_via_nodes = fs->stack[num].eps_via_nodes;
+  return fs->stack[num].node;
+}
+
+/* Set the positions where the subexpressions are starts/ends to registers
+   PMATCH.
+   Note: We assume that pmatch[0] is already set, and
+   pmatch[i].rm_so == pmatch[i].rm_eo == -1 for 0 < i < nmatch.  */
+
+static reg_errcode_t
+internal_function __attribute_warn_unused_result__
+set_regs (const regex_t *preg, const re_match_context_t *mctx, size_t nmatch,
+	  regmatch_t *pmatch, bool fl_backtrack)
+{
+  const re_dfa_t *dfa = preg->buffer;
+  Idx idx, cur_node;
+  re_node_set eps_via_nodes;
+  struct re_fail_stack_t *fs;
+  struct re_fail_stack_t fs_body = { 0, 2, NULL };
+  regmatch_t *prev_idx_match;
+  bool prev_idx_match_malloced = false;
+
+#ifdef DEBUG
+  assert (nmatch > 1);
+  assert (mctx->state_log != NULL);
+#endif
+  if (fl_backtrack)
+    {
+      fs = &fs_body;
+      fs->stack = re_malloc (struct re_fail_stack_ent_t, fs->alloc);
+      if (fs->stack == NULL)
+	return REG_ESPACE;
+    }
+  else
+    fs = NULL;
+
+  cur_node = dfa->init_node;
+  re_node_set_init_empty (&eps_via_nodes);
+
+  if (__libc_use_alloca (nmatch * sizeof (regmatch_t)))
+    prev_idx_match = (regmatch_t *) alloca (nmatch * sizeof (regmatch_t));
+  else
+    {
+      prev_idx_match = re_malloc (regmatch_t, nmatch);
+      if (prev_idx_match == NULL)
+	{
+	  free_fail_stack_return (fs);
+	  return REG_ESPACE;
+	}
+      prev_idx_match_malloced = true;
+    }
+  memcpy (prev_idx_match, pmatch, sizeof (regmatch_t) * nmatch);
+
+  for (idx = pmatch[0].rm_so; idx <= pmatch[0].rm_eo ;)
+    {
+      update_regs (dfa, pmatch, prev_idx_match, cur_node, idx, nmatch);
+
+      if (idx == pmatch[0].rm_eo && cur_node == mctx->last_node)
+	{
+	  Idx reg_idx;
+	  if (fs)
+	    {
+	      for (reg_idx = 0; reg_idx < nmatch; ++reg_idx)
+		if (pmatch[reg_idx].rm_so > -1 && pmatch[reg_idx].rm_eo == -1)
+		  break;
+	      if (reg_idx == nmatch)
+		{
+		  re_node_set_free (&eps_via_nodes);
+		  if (prev_idx_match_malloced)
+		    re_free (prev_idx_match);
+		  return free_fail_stack_return (fs);
+		}
+	      cur_node = pop_fail_stack (fs, &idx, nmatch, pmatch,
+					 &eps_via_nodes);
+	    }
+	  else
+	    {
+	      re_node_set_free (&eps_via_nodes);
+	      if (prev_idx_match_malloced)
+		re_free (prev_idx_match);
+	      return REG_NOERROR;
+	    }
+	}
+
+      /* Proceed to next node.  */
+      cur_node = proceed_next_node (mctx, nmatch, pmatch, &idx, cur_node,
+				    &eps_via_nodes, fs);
+
+      if (BE (cur_node < 0, 0))
+	{
+	  if (BE (cur_node == -2, 0))
+	    {
+	      re_node_set_free (&eps_via_nodes);
+	      if (prev_idx_match_malloced)
+		re_free (prev_idx_match);
+	      free_fail_stack_return (fs);
+	      return REG_ESPACE;
+	    }
+	  if (fs)
+	    cur_node = pop_fail_stack (fs, &idx, nmatch, pmatch,
+				       &eps_via_nodes);
+	  else
+	    {
+	      re_node_set_free (&eps_via_nodes);
+	      if (prev_idx_match_malloced)
+		re_free (prev_idx_match);
+	      return REG_NOMATCH;
+	    }
+	}
+    }
+  re_node_set_free (&eps_via_nodes);
+  if (prev_idx_match_malloced)
+    re_free (prev_idx_match);
+  return free_fail_stack_return (fs);
+}
+
+static reg_errcode_t
+internal_function
+free_fail_stack_return (struct re_fail_stack_t *fs)
+{
+  if (fs)
+    {
+      Idx fs_idx;
+      for (fs_idx = 0; fs_idx < fs->num; ++fs_idx)
+	{
+	  re_node_set_free (&fs->stack[fs_idx].eps_via_nodes);
+	  re_free (fs->stack[fs_idx].regs);
+	}
+      re_free (fs->stack);
+    }
+  return REG_NOERROR;
+}
+
+static void
+internal_function
+update_regs (const re_dfa_t *dfa, regmatch_t *pmatch,
+	     regmatch_t *prev_idx_match, Idx cur_node, Idx cur_idx, Idx nmatch)
+{
+  int type = dfa->nodes[cur_node].type;
+  if (type == OP_OPEN_SUBEXP)
+    {
+      Idx reg_num = dfa->nodes[cur_node].opr.idx + 1;
+
+      /* We are at the first node of this sub expression.  */
+      if (reg_num < nmatch)
+	{
+	  pmatch[reg_num].rm_so = cur_idx;
+	  pmatch[reg_num].rm_eo = -1;
+	}
+    }
+  else if (type == OP_CLOSE_SUBEXP)
+    {
+      Idx reg_num = dfa->nodes[cur_node].opr.idx + 1;
+      if (reg_num < nmatch)
+	{
+	  /* We are at the last node of this sub expression.  */
+	  if (pmatch[reg_num].rm_so < cur_idx)
+	    {
+	      pmatch[reg_num].rm_eo = cur_idx;
+	      /* This is a non-empty match or we are not inside an optional
+		 subexpression.  Accept this right away.  */
+	      memcpy (prev_idx_match, pmatch, sizeof (regmatch_t) * nmatch);
+	    }
+	  else
+	    {
+	      if (dfa->nodes[cur_node].opt_subexp
+		  && prev_idx_match[reg_num].rm_so != -1)
+		/* We transited through an empty match for an optional
+		   subexpression, like (a?)*, and this is not the subexp's
+		   first match.  Copy back the old content of the registers
+		   so that matches of an inner subexpression are undone as
+		   well, like in ((a?))*.  */
+		memcpy (pmatch, prev_idx_match, sizeof (regmatch_t) * nmatch);
+	      else
+		/* We completed a subexpression, but it may be part of
+		   an optional one, so do not update PREV_IDX_MATCH.  */
+		pmatch[reg_num].rm_eo = cur_idx;
+	    }
+	}
+    }
+}
+
+/* This function checks the STATE_LOG from the SCTX->last_str_idx to 0
+   and sift the nodes in each states according to the following rules.
+   Updated state_log will be wrote to STATE_LOG.
+
+   Rules: We throw away the Node 'a' in the STATE_LOG[STR_IDX] if...
+     1. When STR_IDX == MATCH_LAST(the last index in the state_log):
+	If 'a' isn't the LAST_NODE and 'a' can't epsilon transit to
+	the LAST_NODE, we throw away the node 'a'.
+     2. When 0 <= STR_IDX < MATCH_LAST and 'a' accepts
+	string 's' and transit to 'b':
+	i. If 'b' isn't in the STATE_LOG[STR_IDX+strlen('s')], we throw
+	   away the node 'a'.
+	ii. If 'b' is in the STATE_LOG[STR_IDX+strlen('s')] but 'b' is
+	    thrown away, we throw away the node 'a'.
+     3. When 0 <= STR_IDX < MATCH_LAST and 'a' epsilon transit to 'b':
+	i. If 'b' isn't in the STATE_LOG[STR_IDX], we throw away the
+	   node 'a'.
+	ii. If 'b' is in the STATE_LOG[STR_IDX] but 'b' is thrown away,
+	    we throw away the node 'a'.  */
+
+#define STATE_NODE_CONTAINS(state,node) \
+  ((state) != NULL && re_node_set_contains (&(state)->nodes, node))
+
+static reg_errcode_t
+internal_function
+sift_states_backward (const re_match_context_t *mctx, re_sift_context_t *sctx)
+{
+  reg_errcode_t err;
+  int null_cnt = 0;
+  Idx str_idx = sctx->last_str_idx;
+  re_node_set cur_dest;
+
+#ifdef DEBUG
+  assert (mctx->state_log != NULL && mctx->state_log[str_idx] != NULL);
+#endif
+
+  /* Build sifted state_log[str_idx].  It has the nodes which can epsilon
+     transit to the last_node and the last_node itself.  */
+  err = re_node_set_init_1 (&cur_dest, sctx->last_node);
+  if (BE (err != REG_NOERROR, 0))
+    return err;
+  err = update_cur_sifted_state (mctx, sctx, str_idx, &cur_dest);
+  if (BE (err != REG_NOERROR, 0))
+    goto free_return;
+
+  /* Then check each states in the state_log.  */
+  while (str_idx > 0)
+    {
+      /* Update counters.  */
+      null_cnt = (sctx->sifted_states[str_idx] == NULL) ? null_cnt + 1 : 0;
+      if (null_cnt > mctx->max_mb_elem_len)
+	{
+	  memset (sctx->sifted_states, '\0',
+		  sizeof (re_dfastate_t *) * str_idx);
+	  re_node_set_free (&cur_dest);
+	  return REG_NOERROR;
+	}
+      re_node_set_empty (&cur_dest);
+      --str_idx;
+
+      if (mctx->state_log[str_idx])
+	{
+	  err = build_sifted_states (mctx, sctx, str_idx, &cur_dest);
+	  if (BE (err != REG_NOERROR, 0))
+	    goto free_return;
+	}
+
+      /* Add all the nodes which satisfy the following conditions:
+	 - It can epsilon transit to a node in CUR_DEST.
+	 - It is in CUR_SRC.
+	 And update state_log.  */
+      err = update_cur_sifted_state (mctx, sctx, str_idx, &cur_dest);
+      if (BE (err != REG_NOERROR, 0))
+	goto free_return;
+    }
+  err = REG_NOERROR;
+ free_return:
+  re_node_set_free (&cur_dest);
+  return err;
+}
+
+static reg_errcode_t
+internal_function __attribute_warn_unused_result__
+build_sifted_states (const re_match_context_t *mctx, re_sift_context_t *sctx,
+		     Idx str_idx, re_node_set *cur_dest)
+{
+  const re_dfa_t *const dfa = mctx->dfa;
+  const re_node_set *cur_src = &mctx->state_log[str_idx]->non_eps_nodes;
+  Idx i;
+
+  /* Then build the next sifted state.
+     We build the next sifted state on 'cur_dest', and update
+     'sifted_states[str_idx]' with 'cur_dest'.
+     Note:
+     'cur_dest' is the sifted state from 'state_log[str_idx + 1]'.
+     'cur_src' points the node_set of the old 'state_log[str_idx]'
+     (with the epsilon nodes pre-filtered out).  */
+  for (i = 0; i < cur_src->nelem; i++)
+    {
+      Idx prev_node = cur_src->elems[i];
+      int naccepted = 0;
+      bool ok;
+
+#ifdef DEBUG
+      re_token_type_t type = dfa->nodes[prev_node].type;
+      assert (!IS_EPSILON_NODE (type));
+#endif
+#ifdef RE_ENABLE_I18N
+      /* If the node may accept "multi byte".  */
+      if (dfa->nodes[prev_node].accept_mb)
+	naccepted = sift_states_iter_mb (mctx, sctx, prev_node,
+					 str_idx, sctx->last_str_idx);
+#endif /* RE_ENABLE_I18N */
+
+      /* We don't check backreferences here.
+	 See update_cur_sifted_state().  */
+      if (!naccepted
+	  && check_node_accept (mctx, dfa->nodes + prev_node, str_idx)
+	  && STATE_NODE_CONTAINS (sctx->sifted_states[str_idx + 1],
+				  dfa->nexts[prev_node]))
+	naccepted = 1;
+
+      if (naccepted == 0)
+	continue;
+
+      if (sctx->limits.nelem)
+	{
+	  Idx to_idx = str_idx + naccepted;
+	  if (check_dst_limits (mctx, &sctx->limits,
+				dfa->nexts[prev_node], to_idx,
+				prev_node, str_idx))
+	    continue;
+	}
+      ok = re_node_set_insert (cur_dest, prev_node);
+      if (BE (! ok, 0))
+	return REG_ESPACE;
+    }
+
+  return REG_NOERROR;
+}
+
+/* Helper functions.  */
+
+static reg_errcode_t
+internal_function
+clean_state_log_if_needed (re_match_context_t *mctx, Idx next_state_log_idx)
+{
+  Idx top = mctx->state_log_top;
+
+  if ((next_state_log_idx >= mctx->input.bufs_len
+       && mctx->input.bufs_len < mctx->input.len)
+      || (next_state_log_idx >= mctx->input.valid_len
+	  && mctx->input.valid_len < mctx->input.len))
+    {
+      reg_errcode_t err;
+      err = extend_buffers (mctx, next_state_log_idx + 1);
+      if (BE (err != REG_NOERROR, 0))
+	return err;
+    }
+
+  if (top < next_state_log_idx)
+    {
+      memset (mctx->state_log + top + 1, '\0',
+	      sizeof (re_dfastate_t *) * (next_state_log_idx - top));
+      mctx->state_log_top = next_state_log_idx;
+    }
+  return REG_NOERROR;
+}
+
+static reg_errcode_t
+internal_function
+merge_state_array (const re_dfa_t *dfa, re_dfastate_t **dst,
+		   re_dfastate_t **src, Idx num)
+{
+  Idx st_idx;
+  reg_errcode_t err;
+  for (st_idx = 0; st_idx < num; ++st_idx)
+    {
+      if (dst[st_idx] == NULL)
+	dst[st_idx] = src[st_idx];
+      else if (src[st_idx] != NULL)
+	{
+	  re_node_set merged_set;
+	  err = re_node_set_init_union (&merged_set, &dst[st_idx]->nodes,
+					&src[st_idx]->nodes);
+	  if (BE (err != REG_NOERROR, 0))
+	    return err;
+	  dst[st_idx] = re_acquire_state (&err, dfa, &merged_set);
+	  re_node_set_free (&merged_set);
+	  if (BE (err != REG_NOERROR, 0))
+	    return err;
+	}
+    }
+  return REG_NOERROR;
+}
+
+static reg_errcode_t
+internal_function
+update_cur_sifted_state (const re_match_context_t *mctx,
+			 re_sift_context_t *sctx, Idx str_idx,
+			 re_node_set *dest_nodes)
+{
+  const re_dfa_t *const dfa = mctx->dfa;
+  reg_errcode_t err = REG_NOERROR;
+  const re_node_set *candidates;
+  candidates = ((mctx->state_log[str_idx] == NULL) ? NULL
+		: &mctx->state_log[str_idx]->nodes);
+
+  if (dest_nodes->nelem == 0)
+    sctx->sifted_states[str_idx] = NULL;
+  else
+    {
+      if (candidates)
+	{
+	  /* At first, add the nodes which can epsilon transit to a node in
+	     DEST_NODE.  */
+	  err = add_epsilon_src_nodes (dfa, dest_nodes, candidates);
+	  if (BE (err != REG_NOERROR, 0))
+	    return err;
+
+	  /* Then, check the limitations in the current sift_context.  */
+	  if (sctx->limits.nelem)
+	    {
+	      err = check_subexp_limits (dfa, dest_nodes, candidates, &sctx->limits,
+					 mctx->bkref_ents, str_idx);
+	      if (BE (err != REG_NOERROR, 0))
+		return err;
+	    }
+	}
+
+      sctx->sifted_states[str_idx] = re_acquire_state (&err, dfa, dest_nodes);
+      if (BE (err != REG_NOERROR, 0))
+	return err;
+    }
+
+  if (candidates && mctx->state_log[str_idx]->has_backref)
+    {
+      err = sift_states_bkref (mctx, sctx, str_idx, candidates);
+      if (BE (err != REG_NOERROR, 0))
+	return err;
+    }
+  return REG_NOERROR;
+}
+
+static reg_errcode_t
+internal_function __attribute_warn_unused_result__
+add_epsilon_src_nodes (const re_dfa_t *dfa, re_node_set *dest_nodes,
+		       const re_node_set *candidates)
+{
+  reg_errcode_t err = REG_NOERROR;
+  Idx i;
+
+  re_dfastate_t *state = re_acquire_state (&err, dfa, dest_nodes);
+  if (BE (err != REG_NOERROR, 0))
+    return err;
+
+  if (!state->inveclosure.alloc)
+    {
+      err = re_node_set_alloc (&state->inveclosure, dest_nodes->nelem);
+      if (BE (err != REG_NOERROR, 0))
+	return REG_ESPACE;
+      for (i = 0; i < dest_nodes->nelem; i++)
+	{
+	  err = re_node_set_merge (&state->inveclosure,
+				   dfa->inveclosures + dest_nodes->elems[i]);
+	  if (BE (err != REG_NOERROR, 0))
+	    return REG_ESPACE;
+	}
+    }
+  return re_node_set_add_intersect (dest_nodes, candidates,
+				    &state->inveclosure);
+}
+
+static reg_errcode_t
+internal_function
+sub_epsilon_src_nodes (const re_dfa_t *dfa, Idx node, re_node_set *dest_nodes,
+		       const re_node_set *candidates)
+{
+    Idx ecl_idx;
+    reg_errcode_t err;
+    re_node_set *inv_eclosure = dfa->inveclosures + node;
+    re_node_set except_nodes;
+    re_node_set_init_empty (&except_nodes);
+    for (ecl_idx = 0; ecl_idx < inv_eclosure->nelem; ++ecl_idx)
+      {
+	Idx cur_node = inv_eclosure->elems[ecl_idx];
+	if (cur_node == node)
+	  continue;
+	if (IS_EPSILON_NODE (dfa->nodes[cur_node].type))
+	  {
+	    Idx edst1 = dfa->edests[cur_node].elems[0];
+	    Idx edst2 = ((dfa->edests[cur_node].nelem > 1)
+			 ? dfa->edests[cur_node].elems[1] : -1);
+	    if ((!re_node_set_contains (inv_eclosure, edst1)
+		 && re_node_set_contains (dest_nodes, edst1))
+		|| (edst2 > 0
+		    && !re_node_set_contains (inv_eclosure, edst2)
+		    && re_node_set_contains (dest_nodes, edst2)))
+	      {
+		err = re_node_set_add_intersect (&except_nodes, candidates,
+						 dfa->inveclosures + cur_node);
+		if (BE (err != REG_NOERROR, 0))
+		  {
+		    re_node_set_free (&except_nodes);
+		    return err;
+		  }
+	      }
+	  }
+      }
+    for (ecl_idx = 0; ecl_idx < inv_eclosure->nelem; ++ecl_idx)
+      {
+	Idx cur_node = inv_eclosure->elems[ecl_idx];
+	if (!re_node_set_contains (&except_nodes, cur_node))
+	  {
+	    Idx idx = re_node_set_contains (dest_nodes, cur_node) - 1;
+	    re_node_set_remove_at (dest_nodes, idx);
+	  }
+      }
+    re_node_set_free (&except_nodes);
+    return REG_NOERROR;
+}
+
+static bool
+internal_function
+check_dst_limits (const re_match_context_t *mctx, const re_node_set *limits,
+		  Idx dst_node, Idx dst_idx, Idx src_node, Idx src_idx)
+{
+  const re_dfa_t *const dfa = mctx->dfa;
+  Idx lim_idx, src_pos, dst_pos;
+
+  Idx dst_bkref_idx = search_cur_bkref_entry (mctx, dst_idx);
+  Idx src_bkref_idx = search_cur_bkref_entry (mctx, src_idx);
+  for (lim_idx = 0; lim_idx < limits->nelem; ++lim_idx)
+    {
+      Idx subexp_idx;
+      struct re_backref_cache_entry *ent;
+      ent = mctx->bkref_ents + limits->elems[lim_idx];
+      subexp_idx = dfa->nodes[ent->node].opr.idx;
+
+      dst_pos = check_dst_limits_calc_pos (mctx, limits->elems[lim_idx],
+					   subexp_idx, dst_node, dst_idx,
+					   dst_bkref_idx);
+      src_pos = check_dst_limits_calc_pos (mctx, limits->elems[lim_idx],
+					   subexp_idx, src_node, src_idx,
+					   src_bkref_idx);
+
+      /* In case of:
+	 <src> <dst> ( <subexp> )
+	 ( <subexp> ) <src> <dst>
+	 ( <subexp1> <src> <subexp2> <dst> <subexp3> )  */
+      if (src_pos == dst_pos)
+	continue; /* This is unrelated limitation.  */
+      else
+	return true;
+    }
+  return false;
+}
+
+static int
+internal_function
+check_dst_limits_calc_pos_1 (const re_match_context_t *mctx, int boundaries,
+			     Idx subexp_idx, Idx from_node, Idx bkref_idx)
+{
+  const re_dfa_t *const dfa = mctx->dfa;
+  const re_node_set *eclosures = dfa->eclosures + from_node;
+  Idx node_idx;
+
+  /* Else, we are on the boundary: examine the nodes on the epsilon
+     closure.  */
+  for (node_idx = 0; node_idx < eclosures->nelem; ++node_idx)
+    {
+      Idx node = eclosures->elems[node_idx];
+      switch (dfa->nodes[node].type)
+	{
+	case OP_BACK_REF:
+	  if (bkref_idx != -1)
+	    {
+	      struct re_backref_cache_entry *ent = mctx->bkref_ents + bkref_idx;
+	      do
+		{
+		  Idx dst;
+		  int cpos;
+
+		  if (ent->node != node)
+		    continue;
+
+		  if (subexp_idx < BITSET_WORD_BITS
+		      && !(ent->eps_reachable_subexps_map
+			   & ((bitset_word_t) 1 << subexp_idx)))
+		    continue;
+
+		  /* Recurse trying to reach the OP_OPEN_SUBEXP and
+		     OP_CLOSE_SUBEXP cases below.  But, if the
+		     destination node is the same node as the source
+		     node, don't recurse because it would cause an
+		     infinite loop: a regex that exhibits this behavior
+		     is ()\1*\1*  */
+		  dst = dfa->edests[node].elems[0];
+		  if (dst == from_node)
+		    {
+		      if (boundaries & 1)
+			return -1;
+		      else /* if (boundaries & 2) */
+			return 0;
+		    }
+
+		  cpos =
+		    check_dst_limits_calc_pos_1 (mctx, boundaries, subexp_idx,
+						 dst, bkref_idx);
+		  if (cpos == -1 /* && (boundaries & 1) */)
+		    return -1;
+		  if (cpos == 0 && (boundaries & 2))
+		    return 0;
+
+		  if (subexp_idx < BITSET_WORD_BITS)
+		    ent->eps_reachable_subexps_map
+		      &= ~((bitset_word_t) 1 << subexp_idx);
+		}
+	      while (ent++->more);
+	    }
+	  break;
+
+	case OP_OPEN_SUBEXP:
+	  if ((boundaries & 1) && subexp_idx == dfa->nodes[node].opr.idx)
+	    return -1;
+	  break;
+
+	case OP_CLOSE_SUBEXP:
+	  if ((boundaries & 2) && subexp_idx == dfa->nodes[node].opr.idx)
+	    return 0;
+	  break;
+
+	default:
+	    break;
+	}
+    }
+
+  return (boundaries & 2) ? 1 : 0;
+}
+
+static int
+internal_function
+check_dst_limits_calc_pos (const re_match_context_t *mctx, Idx limit,
+			   Idx subexp_idx, Idx from_node, Idx str_idx,
+			   Idx bkref_idx)
+{
+  struct re_backref_cache_entry *lim = mctx->bkref_ents + limit;
+  int boundaries;
+
+  /* If we are outside the range of the subexpression, return -1 or 1.  */
+  if (str_idx < lim->subexp_from)
+    return -1;
+
+  if (lim->subexp_to < str_idx)
+    return 1;
+
+  /* If we are within the subexpression, return 0.  */
+  boundaries = (str_idx == lim->subexp_from);
+  boundaries |= (str_idx == lim->subexp_to) << 1;
+  if (boundaries == 0)
+    return 0;
+
+  /* Else, examine epsilon closure.  */
+  return check_dst_limits_calc_pos_1 (mctx, boundaries, subexp_idx,
+				      from_node, bkref_idx);
+}
+
+/* Check the limitations of sub expressions LIMITS, and remove the nodes
+   which are against limitations from DEST_NODES. */
+
+static reg_errcode_t
+internal_function
+check_subexp_limits (const re_dfa_t *dfa, re_node_set *dest_nodes,
+		     const re_node_set *candidates, re_node_set *limits,
+		     struct re_backref_cache_entry *bkref_ents, Idx str_idx)
+{
+  reg_errcode_t err;
+  Idx node_idx, lim_idx;
+
+  for (lim_idx = 0; lim_idx < limits->nelem; ++lim_idx)
+    {
+      Idx subexp_idx;
+      struct re_backref_cache_entry *ent;
+      ent = bkref_ents + limits->elems[lim_idx];
+
+      if (str_idx <= ent->subexp_from || ent->str_idx < str_idx)
+	continue; /* This is unrelated limitation.  */
+
+      subexp_idx = dfa->nodes[ent->node].opr.idx;
+      if (ent->subexp_to == str_idx)
+	{
+	  Idx ops_node = -1;
+	  Idx cls_node = -1;
+	  for (node_idx = 0; node_idx < dest_nodes->nelem; ++node_idx)
+	    {
+	      Idx node = dest_nodes->elems[node_idx];
+	      re_token_type_t type = dfa->nodes[node].type;
+	      if (type == OP_OPEN_SUBEXP
+		  && subexp_idx == dfa->nodes[node].opr.idx)
+		ops_node = node;
+	      else if (type == OP_CLOSE_SUBEXP
+		       && subexp_idx == dfa->nodes[node].opr.idx)
+		cls_node = node;
+	    }
+
+	  /* Check the limitation of the open subexpression.  */
+	  /* Note that (ent->subexp_to = str_idx != ent->subexp_from).  */
+	  if (ops_node >= 0)
+	    {
+	      err = sub_epsilon_src_nodes (dfa, ops_node, dest_nodes,
+					   candidates);
+	      if (BE (err != REG_NOERROR, 0))
+		return err;
+	    }
+
+	  /* Check the limitation of the close subexpression.  */
+	  if (cls_node >= 0)
+	    for (node_idx = 0; node_idx < dest_nodes->nelem; ++node_idx)
+	      {
+		Idx node = dest_nodes->elems[node_idx];
+		if (!re_node_set_contains (dfa->inveclosures + node,
+					   cls_node)
+		    && !re_node_set_contains (dfa->eclosures + node,
+					      cls_node))
+		  {
+		    /* It is against this limitation.
+		       Remove it form the current sifted state.  */
+		    err = sub_epsilon_src_nodes (dfa, node, dest_nodes,
+						 candidates);
+		    if (BE (err != REG_NOERROR, 0))
+		      return err;
+		    --node_idx;
+		  }
+	      }
+	}
+      else /* (ent->subexp_to != str_idx)  */
+	{
+	  for (node_idx = 0; node_idx < dest_nodes->nelem; ++node_idx)
+	    {
+	      Idx node = dest_nodes->elems[node_idx];
+	      re_token_type_t type = dfa->nodes[node].type;
+	      if (type == OP_CLOSE_SUBEXP || type == OP_OPEN_SUBEXP)
+		{
+		  if (subexp_idx != dfa->nodes[node].opr.idx)
+		    continue;
+		  /* It is against this limitation.
+		     Remove it form the current sifted state.  */
+		  err = sub_epsilon_src_nodes (dfa, node, dest_nodes,
+					       candidates);
+		  if (BE (err != REG_NOERROR, 0))
+		    return err;
+		}
+	    }
+	}
+    }
+  return REG_NOERROR;
+}
+
+static reg_errcode_t
+internal_function __attribute_warn_unused_result__
+sift_states_bkref (const re_match_context_t *mctx, re_sift_context_t *sctx,
+		   Idx str_idx, const re_node_set *candidates)
+{
+  const re_dfa_t *const dfa = mctx->dfa;
+  reg_errcode_t err;
+  Idx node_idx, node;
+  re_sift_context_t local_sctx;
+  Idx first_idx = search_cur_bkref_entry (mctx, str_idx);
+
+  if (first_idx == -1)
+    return REG_NOERROR;
+
+  local_sctx.sifted_states = NULL; /* Mark that it hasn't been initialized.  */
+
+  for (node_idx = 0; node_idx < candidates->nelem; ++node_idx)
+    {
+      Idx enabled_idx;
+      re_token_type_t type;
+      struct re_backref_cache_entry *entry;
+      node = candidates->elems[node_idx];
+      type = dfa->nodes[node].type;
+      /* Avoid infinite loop for the REs like "()\1+".  */
+      if (node == sctx->last_node && str_idx == sctx->last_str_idx)
+	continue;
+      if (type != OP_BACK_REF)
+	continue;
+
+      entry = mctx->bkref_ents + first_idx;
+      enabled_idx = first_idx;
+      do
+	{
+	  Idx subexp_len;
+	  Idx to_idx;
+	  Idx dst_node;
+	  bool ok;
+	  re_dfastate_t *cur_state;
+
+	  if (entry->node != node)
+	    continue;
+	  subexp_len = entry->subexp_to - entry->subexp_from;
+	  to_idx = str_idx + subexp_len;
+	  dst_node = (subexp_len ? dfa->nexts[node]
+		      : dfa->edests[node].elems[0]);
+
+	  if (to_idx > sctx->last_str_idx
+	      || sctx->sifted_states[to_idx] == NULL
+	      || !STATE_NODE_CONTAINS (sctx->sifted_states[to_idx], dst_node)
+	      || check_dst_limits (mctx, &sctx->limits, node,
+				   str_idx, dst_node, to_idx))
+	    continue;
+
+	  if (local_sctx.sifted_states == NULL)
+	    {
+	      local_sctx = *sctx;
+	      err = re_node_set_init_copy (&local_sctx.limits, &sctx->limits);
+	      if (BE (err != REG_NOERROR, 0))
+		goto free_return;
+	    }
+	  local_sctx.last_node = node;
+	  local_sctx.last_str_idx = str_idx;
+	  ok = re_node_set_insert (&local_sctx.limits, enabled_idx);
+	  if (BE (! ok, 0))
+	    {
+	      err = REG_ESPACE;
+	      goto free_return;
+	    }
+	  cur_state = local_sctx.sifted_states[str_idx];
+	  err = sift_states_backward (mctx, &local_sctx);
+	  if (BE (err != REG_NOERROR, 0))
+	    goto free_return;
+	  if (sctx->limited_states != NULL)
+	    {
+	      err = merge_state_array (dfa, sctx->limited_states,
+				       local_sctx.sifted_states,
+				       str_idx + 1);
+	      if (BE (err != REG_NOERROR, 0))
+		goto free_return;
+	    }
+	  local_sctx.sifted_states[str_idx] = cur_state;
+	  re_node_set_remove (&local_sctx.limits, enabled_idx);
+
+	  /* mctx->bkref_ents may have changed, reload the pointer.  */
+	  entry = mctx->bkref_ents + enabled_idx;
+	}
+      while (enabled_idx++, entry++->more);
+    }
+  err = REG_NOERROR;
+ free_return:
+  if (local_sctx.sifted_states != NULL)
+    {
+      re_node_set_free (&local_sctx.limits);
+    }
+
+  return err;
+}
+
+
+#ifdef RE_ENABLE_I18N
+static int
+internal_function
+sift_states_iter_mb (const re_match_context_t *mctx, re_sift_context_t *sctx,
+		     Idx node_idx, Idx str_idx, Idx max_str_idx)
+{
+  const re_dfa_t *const dfa = mctx->dfa;
+  int naccepted;
+  /* Check the node can accept "multi byte".  */
+  naccepted = check_node_accept_bytes (dfa, node_idx, &mctx->input, str_idx);
+  if (naccepted > 0 && str_idx + naccepted <= max_str_idx &&
+      !STATE_NODE_CONTAINS (sctx->sifted_states[str_idx + naccepted],
+			    dfa->nexts[node_idx]))
+    /* The node can't accept the "multi byte", or the
+       destination was already thrown away, then the node
+       could't accept the current input "multi byte".   */
+    naccepted = 0;
+  /* Otherwise, it is sure that the node could accept
+     'naccepted' bytes input.  */
+  return naccepted;
+}
+#endif /* RE_ENABLE_I18N */
+
+
+/* Functions for state transition.  */
+
+/* Return the next state to which the current state STATE will transit by
+   accepting the current input byte, and update STATE_LOG if necessary.
+   If STATE can accept a multibyte char/collating element/back reference
+   update the destination of STATE_LOG.  */
+
+static re_dfastate_t *
+internal_function __attribute_warn_unused_result__
+transit_state (reg_errcode_t *err, re_match_context_t *mctx,
+	       re_dfastate_t *state)
+{
+  re_dfastate_t **trtable;
+  unsigned char ch;
+
+#ifdef RE_ENABLE_I18N
+  /* If the current state can accept multibyte.  */
+  if (BE (state->accept_mb, 0))
+    {
+      *err = transit_state_mb (mctx, state);
+      if (BE (*err != REG_NOERROR, 0))
+	return NULL;
+    }
+#endif /* RE_ENABLE_I18N */
+
+  /* Then decide the next state with the single byte.  */
+#if 0
+  if (0)
+    /* don't use transition table  */
+    return transit_state_sb (err, mctx, state);
+#endif
+
+  /* Use transition table  */
+  ch = re_string_fetch_byte (&mctx->input);
+  for (;;)
+    {
+      trtable = state->trtable;
+      if (BE (trtable != NULL, 1))
+	return trtable[ch];
+
+      trtable = state->word_trtable;
+      if (BE (trtable != NULL, 1))
+	{
+	  unsigned int context;
+	  context
+	    = re_string_context_at (&mctx->input,
+				    re_string_cur_idx (&mctx->input) - 1,
+				    mctx->eflags);
+	  if (IS_WORD_CONTEXT (context))
+	    return trtable[ch + SBC_MAX];
+	  else
+	    return trtable[ch];
+	}
+
+      if (!build_trtable (mctx->dfa, state))
+	{
+	  *err = REG_ESPACE;
+	  return NULL;
+	}
+
+      /* Retry, we now have a transition table.  */
+    }
+}
+
+/* Update the state_log if we need */
+static re_dfastate_t *
+internal_function
+merge_state_with_log (reg_errcode_t *err, re_match_context_t *mctx,
+		      re_dfastate_t *next_state)
+{
+  const re_dfa_t *const dfa = mctx->dfa;
+  Idx cur_idx = re_string_cur_idx (&mctx->input);
+
+  if (cur_idx > mctx->state_log_top)
+    {
+      mctx->state_log[cur_idx] = next_state;
+      mctx->state_log_top = cur_idx;
+    }
+  else if (mctx->state_log[cur_idx] == 0)
+    {
+      mctx->state_log[cur_idx] = next_state;
+    }
+  else
+    {
+      re_dfastate_t *pstate;
+      unsigned int context;
+      re_node_set next_nodes, *log_nodes, *table_nodes = NULL;
+      /* If (state_log[cur_idx] != 0), it implies that cur_idx is
+	 the destination of a multibyte char/collating element/
+	 back reference.  Then the next state is the union set of
+	 these destinations and the results of the transition table.  */
+      pstate = mctx->state_log[cur_idx];
+      log_nodes = pstate->entrance_nodes;
+      if (next_state != NULL)
+	{
+	  table_nodes = next_state->entrance_nodes;
+	  *err = re_node_set_init_union (&next_nodes, table_nodes,
+					     log_nodes);
+	  if (BE (*err != REG_NOERROR, 0))
+	    return NULL;
+	}
+      else
+	next_nodes = *log_nodes;
+      /* Note: We already add the nodes of the initial state,
+	 then we don't need to add them here.  */
+
+      context = re_string_context_at (&mctx->input,
+				      re_string_cur_idx (&mctx->input) - 1,
+				      mctx->eflags);
+      next_state = mctx->state_log[cur_idx]
+	= re_acquire_state_context (err, dfa, &next_nodes, context);
+      /* We don't need to check errors here, since the return value of
+	 this function is next_state and ERR is already set.  */
+
+      if (table_nodes != NULL)
+	re_node_set_free (&next_nodes);
+    }
+
+  if (BE (dfa->nbackref, 0) && next_state != NULL)
+    {
+      /* Check OP_OPEN_SUBEXP in the current state in case that we use them
+	 later.  We must check them here, since the back references in the
+	 next state might use them.  */
+      *err = check_subexp_matching_top (mctx, &next_state->nodes,
+					cur_idx);
+      if (BE (*err != REG_NOERROR, 0))
+	return NULL;
+
+      /* If the next state has back references.  */
+      if (next_state->has_backref)
+	{
+	  *err = transit_state_bkref (mctx, &next_state->nodes);
+	  if (BE (*err != REG_NOERROR, 0))
+	    return NULL;
+	  next_state = mctx->state_log[cur_idx];
+	}
+    }
+
+  return next_state;
+}
+
+/* Skip bytes in the input that correspond to part of a
+   multi-byte match, then look in the log for a state
+   from which to restart matching.  */
+static re_dfastate_t *
+internal_function
+find_recover_state (reg_errcode_t *err, re_match_context_t *mctx)
+{
+  re_dfastate_t *cur_state;
+  do
+    {
+      Idx max = mctx->state_log_top;
+      Idx cur_str_idx = re_string_cur_idx (&mctx->input);
+
+      do
+	{
+	  if (++cur_str_idx > max)
+	    return NULL;
+	  re_string_skip_bytes (&mctx->input, 1);
+	}
+      while (mctx->state_log[cur_str_idx] == NULL);
+
+      cur_state = merge_state_with_log (err, mctx, NULL);
+    }
+  while (*err == REG_NOERROR && cur_state == NULL);
+  return cur_state;
+}
+
+/* Helper functions for transit_state.  */
+
+/* From the node set CUR_NODES, pick up the nodes whose types are
+   OP_OPEN_SUBEXP and which have corresponding back references in the regular
+   expression. And register them to use them later for evaluating the
+   corresponding back references.  */
+
+static reg_errcode_t
+internal_function
+check_subexp_matching_top (re_match_context_t *mctx, re_node_set *cur_nodes,
+			   Idx str_idx)
+{
+  const re_dfa_t *const dfa = mctx->dfa;
+  Idx node_idx;
+  reg_errcode_t err;
+
+  /* TODO: This isn't efficient.
+	   Because there might be more than one nodes whose types are
+	   OP_OPEN_SUBEXP and whose index is SUBEXP_IDX, we must check all
+	   nodes.
+	   E.g. RE: (a){2}  */
+  for (node_idx = 0; node_idx < cur_nodes->nelem; ++node_idx)
+    {
+      Idx node = cur_nodes->elems[node_idx];
+      if (dfa->nodes[node].type == OP_OPEN_SUBEXP
+	  && dfa->nodes[node].opr.idx < BITSET_WORD_BITS
+	  && (dfa->used_bkref_map
+	      & ((bitset_word_t) 1 << dfa->nodes[node].opr.idx)))
+	{
+	  err = match_ctx_add_subtop (mctx, node, str_idx);
+	  if (BE (err != REG_NOERROR, 0))
+	    return err;
+	}
+    }
+  return REG_NOERROR;
+}
+
+#if 0
+/* Return the next state to which the current state STATE will transit by
+   accepting the current input byte.  */
+
+static re_dfastate_t *
+transit_state_sb (reg_errcode_t *err, re_match_context_t *mctx,
+		  re_dfastate_t *state)
+{
+  const re_dfa_t *const dfa = mctx->dfa;
+  re_node_set next_nodes;
+  re_dfastate_t *next_state;
+  Idx node_cnt, cur_str_idx = re_string_cur_idx (&mctx->input);
+  unsigned int context;
+
+  *err = re_node_set_alloc (&next_nodes, state->nodes.nelem + 1);
+  if (BE (*err != REG_NOERROR, 0))
+    return NULL;
+  for (node_cnt = 0; node_cnt < state->nodes.nelem; ++node_cnt)
+    {
+      Idx cur_node = state->nodes.elems[node_cnt];
+      if (check_node_accept (mctx, dfa->nodes + cur_node, cur_str_idx))
+	{
+	  *err = re_node_set_merge (&next_nodes,
+				    dfa->eclosures + dfa->nexts[cur_node]);
+	  if (BE (*err != REG_NOERROR, 0))
+	    {
+	      re_node_set_free (&next_nodes);
+	      return NULL;
+	    }
+	}
+    }
+  context = re_string_context_at (&mctx->input, cur_str_idx, mctx->eflags);
+  next_state = re_acquire_state_context (err, dfa, &next_nodes, context);
+  /* We don't need to check errors here, since the return value of
+     this function is next_state and ERR is already set.  */
+
+  re_node_set_free (&next_nodes);
+  re_string_skip_bytes (&mctx->input, 1);
+  return next_state;
+}
+#endif
+
+#ifdef RE_ENABLE_I18N
+static reg_errcode_t
+internal_function
+transit_state_mb (re_match_context_t *mctx, re_dfastate_t *pstate)
+{
+  const re_dfa_t *const dfa = mctx->dfa;
+  reg_errcode_t err;
+  Idx i;
+
+  for (i = 0; i < pstate->nodes.nelem; ++i)
+    {
+      re_node_set dest_nodes, *new_nodes;
+      Idx cur_node_idx = pstate->nodes.elems[i];
+      int naccepted;
+      Idx dest_idx;
+      unsigned int context;
+      re_dfastate_t *dest_state;
+
+      if (!dfa->nodes[cur_node_idx].accept_mb)
+	continue;
+
+      if (dfa->nodes[cur_node_idx].constraint)
+	{
+	  context = re_string_context_at (&mctx->input,
+					  re_string_cur_idx (&mctx->input),
+					  mctx->eflags);
+	  if (NOT_SATISFY_NEXT_CONSTRAINT (dfa->nodes[cur_node_idx].constraint,
+					   context))
+	    continue;
+	}
+
+      /* How many bytes the node can accept?  */
+      naccepted = check_node_accept_bytes (dfa, cur_node_idx, &mctx->input,
+					   re_string_cur_idx (&mctx->input));
+      if (naccepted == 0)
+	continue;
+
+      /* The node can accepts 'naccepted' bytes.  */
+      dest_idx = re_string_cur_idx (&mctx->input) + naccepted;
+      mctx->max_mb_elem_len = ((mctx->max_mb_elem_len < naccepted) ? naccepted
+			       : mctx->max_mb_elem_len);
+      err = clean_state_log_if_needed (mctx, dest_idx);
+      if (BE (err != REG_NOERROR, 0))
+	return err;
+#ifdef DEBUG
+      assert (dfa->nexts[cur_node_idx] != -1);
+#endif
+      new_nodes = dfa->eclosures + dfa->nexts[cur_node_idx];
+
+      dest_state = mctx->state_log[dest_idx];
+      if (dest_state == NULL)
+	dest_nodes = *new_nodes;
+      else
+	{
+	  err = re_node_set_init_union (&dest_nodes,
+					dest_state->entrance_nodes, new_nodes);
+	  if (BE (err != REG_NOERROR, 0))
+	    return err;
+	}
+      context = re_string_context_at (&mctx->input, dest_idx - 1,
+				      mctx->eflags);
+      mctx->state_log[dest_idx]
+	= re_acquire_state_context (&err, dfa, &dest_nodes, context);
+      if (dest_state != NULL)
+	re_node_set_free (&dest_nodes);
+      if (BE (mctx->state_log[dest_idx] == NULL && err != REG_NOERROR, 0))
+	return err;
+    }
+  return REG_NOERROR;
+}
+#endif /* RE_ENABLE_I18N */
+
+static reg_errcode_t
+internal_function
+transit_state_bkref (re_match_context_t *mctx, const re_node_set *nodes)
+{
+  const re_dfa_t *const dfa = mctx->dfa;
+  reg_errcode_t err;
+  Idx i;
+  Idx cur_str_idx = re_string_cur_idx (&mctx->input);
+
+  for (i = 0; i < nodes->nelem; ++i)
+    {
+      Idx dest_str_idx, prev_nelem, bkc_idx;
+      Idx node_idx = nodes->elems[i];
+      unsigned int context;
+      const re_token_t *node = dfa->nodes + node_idx;
+      re_node_set *new_dest_nodes;
+
+      /* Check whether 'node' is a backreference or not.  */
+      if (node->type != OP_BACK_REF)
+	continue;
+
+      if (node->constraint)
+	{
+	  context = re_string_context_at (&mctx->input, cur_str_idx,
+					  mctx->eflags);
+	  if (NOT_SATISFY_NEXT_CONSTRAINT (node->constraint, context))
+	    continue;
+	}
+
+      /* 'node' is a backreference.
+	 Check the substring which the substring matched.  */
+      bkc_idx = mctx->nbkref_ents;
+      err = get_subexp (mctx, node_idx, cur_str_idx);
+      if (BE (err != REG_NOERROR, 0))
+	goto free_return;
+
+      /* And add the epsilon closures (which is 'new_dest_nodes') of
+	 the backreference to appropriate state_log.  */
+#ifdef DEBUG
+      assert (dfa->nexts[node_idx] != -1);
+#endif
+      for (; bkc_idx < mctx->nbkref_ents; ++bkc_idx)
+	{
+	  Idx subexp_len;
+	  re_dfastate_t *dest_state;
+	  struct re_backref_cache_entry *bkref_ent;
+	  bkref_ent = mctx->bkref_ents + bkc_idx;
+	  if (bkref_ent->node != node_idx || bkref_ent->str_idx != cur_str_idx)
+	    continue;
+	  subexp_len = bkref_ent->subexp_to - bkref_ent->subexp_from;
+	  new_dest_nodes = (subexp_len == 0
+			    ? dfa->eclosures + dfa->edests[node_idx].elems[0]
+			    : dfa->eclosures + dfa->nexts[node_idx]);
+	  dest_str_idx = (cur_str_idx + bkref_ent->subexp_to
+			  - bkref_ent->subexp_from);
+	  context = re_string_context_at (&mctx->input, dest_str_idx - 1,
+					  mctx->eflags);
+	  dest_state = mctx->state_log[dest_str_idx];
+	  prev_nelem = ((mctx->state_log[cur_str_idx] == NULL) ? 0
+			: mctx->state_log[cur_str_idx]->nodes.nelem);
+	  /* Add 'new_dest_node' to state_log.  */
+	  if (dest_state == NULL)
+	    {
+	      mctx->state_log[dest_str_idx]
+		= re_acquire_state_context (&err, dfa, new_dest_nodes,
+					    context);
+	      if (BE (mctx->state_log[dest_str_idx] == NULL
+		      && err != REG_NOERROR, 0))
+		goto free_return;
+	    }
+	  else
+	    {
+	      re_node_set dest_nodes;
+	      err = re_node_set_init_union (&dest_nodes,
+					    dest_state->entrance_nodes,
+					    new_dest_nodes);
+	      if (BE (err != REG_NOERROR, 0))
+		{
+		  re_node_set_free (&dest_nodes);
+		  goto free_return;
+		}
+	      mctx->state_log[dest_str_idx]
+		= re_acquire_state_context (&err, dfa, &dest_nodes, context);
+	      re_node_set_free (&dest_nodes);
+	      if (BE (mctx->state_log[dest_str_idx] == NULL
+		      && err != REG_NOERROR, 0))
+		goto free_return;
+	    }
+	  /* We need to check recursively if the backreference can epsilon
+	     transit.  */
+	  if (subexp_len == 0
+	      && mctx->state_log[cur_str_idx]->nodes.nelem > prev_nelem)
+	    {
+	      err = check_subexp_matching_top (mctx, new_dest_nodes,
+					       cur_str_idx);
+	      if (BE (err != REG_NOERROR, 0))
+		goto free_return;
+	      err = transit_state_bkref (mctx, new_dest_nodes);
+	      if (BE (err != REG_NOERROR, 0))
+		goto free_return;
+	    }
+	}
+    }
+  err = REG_NOERROR;
+ free_return:
+  return err;
+}
+
+/* Enumerate all the candidates which the backreference BKREF_NODE can match
+   at BKREF_STR_IDX, and register them by match_ctx_add_entry().
+   Note that we might collect inappropriate candidates here.
+   However, the cost of checking them strictly here is too high, then we
+   delay these checking for prune_impossible_nodes().  */
+
+static reg_errcode_t
+internal_function __attribute_warn_unused_result__
+get_subexp (re_match_context_t *mctx, Idx bkref_node, Idx bkref_str_idx)
+{
+  const re_dfa_t *const dfa = mctx->dfa;
+  Idx subexp_num, sub_top_idx;
+  const char *buf = (const char *) re_string_get_buffer (&mctx->input);
+  /* Return if we have already checked BKREF_NODE at BKREF_STR_IDX.  */
+  Idx cache_idx = search_cur_bkref_entry (mctx, bkref_str_idx);
+  if (cache_idx != -1)
+    {
+      const struct re_backref_cache_entry *entry
+	= mctx->bkref_ents + cache_idx;
+      do
+	if (entry->node == bkref_node)
+	  return REG_NOERROR; /* We already checked it.  */
+      while (entry++->more);
+    }
+
+  subexp_num = dfa->nodes[bkref_node].opr.idx;
+
+  /* For each sub expression  */
+  for (sub_top_idx = 0; sub_top_idx < mctx->nsub_tops; ++sub_top_idx)
+    {
+      reg_errcode_t err;
+      re_sub_match_top_t *sub_top = mctx->sub_tops[sub_top_idx];
+      re_sub_match_last_t *sub_last;
+      Idx sub_last_idx, sl_str, bkref_str_off;
+
+      if (dfa->nodes[sub_top->node].opr.idx != subexp_num)
+	continue; /* It isn't related.  */
+
+      sl_str = sub_top->str_idx;
+      bkref_str_off = bkref_str_idx;
+      /* At first, check the last node of sub expressions we already
+	 evaluated.  */
+      for (sub_last_idx = 0; sub_last_idx < sub_top->nlasts; ++sub_last_idx)
+	{
+	  regoff_t sl_str_diff;
+	  sub_last = sub_top->lasts[sub_last_idx];
+	  sl_str_diff = sub_last->str_idx - sl_str;
+	  /* The matched string by the sub expression match with the substring
+	     at the back reference?  */
+	  if (sl_str_diff > 0)
+	    {
+	      if (BE (bkref_str_off + sl_str_diff > mctx->input.valid_len, 0))
+		{
+		  /* Not enough chars for a successful match.  */
+		  if (bkref_str_off + sl_str_diff > mctx->input.len)
+		    break;
+
+		  err = clean_state_log_if_needed (mctx,
+						   bkref_str_off
+						   + sl_str_diff);
+		  if (BE (err != REG_NOERROR, 0))
+		    return err;
+		  buf = (const char *) re_string_get_buffer (&mctx->input);
+		}
+	      if (memcmp (buf + bkref_str_off, buf + sl_str, sl_str_diff) != 0)
+		/* We don't need to search this sub expression any more.  */
+		break;
+	    }
+	  bkref_str_off += sl_str_diff;
+	  sl_str += sl_str_diff;
+	  err = get_subexp_sub (mctx, sub_top, sub_last, bkref_node,
+				bkref_str_idx);
+
+	  /* Reload buf, since the preceding call might have reallocated
+	     the buffer.  */
+	  buf = (const char *) re_string_get_buffer (&mctx->input);
+
+	  if (err == REG_NOMATCH)
+	    continue;
+	  if (BE (err != REG_NOERROR, 0))
+	    return err;
+	}
+
+      if (sub_last_idx < sub_top->nlasts)
+	continue;
+      if (sub_last_idx > 0)
+	++sl_str;
+      /* Then, search for the other last nodes of the sub expression.  */
+      for (; sl_str <= bkref_str_idx; ++sl_str)
+	{
+	  Idx cls_node;
+	  regoff_t sl_str_off;
+	  const re_node_set *nodes;
+	  sl_str_off = sl_str - sub_top->str_idx;
+	  /* The matched string by the sub expression match with the substring
+	     at the back reference?  */
+	  if (sl_str_off > 0)
+	    {
+	      if (BE (bkref_str_off >= mctx->input.valid_len, 0))
+		{
+		  /* If we are at the end of the input, we cannot match.  */
+		  if (bkref_str_off >= mctx->input.len)
+		    break;
+
+		  err = extend_buffers (mctx, bkref_str_off + 1);
+		  if (BE (err != REG_NOERROR, 0))
+		    return err;
+
+		  buf = (const char *) re_string_get_buffer (&mctx->input);
+		}
+	      if (buf [bkref_str_off++] != buf[sl_str - 1])
+		break; /* We don't need to search this sub expression
+			  any more.  */
+	    }
+	  if (mctx->state_log[sl_str] == NULL)
+	    continue;
+	  /* Does this state have a ')' of the sub expression?  */
+	  nodes = &mctx->state_log[sl_str]->nodes;
+	  cls_node = find_subexp_node (dfa, nodes, subexp_num,
+				       OP_CLOSE_SUBEXP);
+	  if (cls_node == -1)
+	    continue; /* No.  */
+	  if (sub_top->path == NULL)
+	    {
+	      sub_top->path = calloc (sizeof (state_array_t),
+				      sl_str - sub_top->str_idx + 1);
+	      if (sub_top->path == NULL)
+		return REG_ESPACE;
+	    }
+	  /* Can the OP_OPEN_SUBEXP node arrive the OP_CLOSE_SUBEXP node
+	     in the current context?  */
+	  err = check_arrival (mctx, sub_top->path, sub_top->node,
+			       sub_top->str_idx, cls_node, sl_str,
+			       OP_CLOSE_SUBEXP);
+	  if (err == REG_NOMATCH)
+	      continue;
+	  if (BE (err != REG_NOERROR, 0))
+	      return err;
+	  sub_last = match_ctx_add_sublast (sub_top, cls_node, sl_str);
+	  if (BE (sub_last == NULL, 0))
+	    return REG_ESPACE;
+	  err = get_subexp_sub (mctx, sub_top, sub_last, bkref_node,
+				bkref_str_idx);
+	  if (err == REG_NOMATCH)
+	    continue;
+	}
+    }
+  return REG_NOERROR;
+}
+
+/* Helper functions for get_subexp().  */
+
+/* Check SUB_LAST can arrive to the back reference BKREF_NODE at BKREF_STR.
+   If it can arrive, register the sub expression expressed with SUB_TOP
+   and SUB_LAST.  */
+
+static reg_errcode_t
+internal_function
+get_subexp_sub (re_match_context_t *mctx, const re_sub_match_top_t *sub_top,
+		re_sub_match_last_t *sub_last, Idx bkref_node, Idx bkref_str)
+{
+  reg_errcode_t err;
+  Idx to_idx;
+  /* Can the subexpression arrive the back reference?  */
+  err = check_arrival (mctx, &sub_last->path, sub_last->node,
+		       sub_last->str_idx, bkref_node, bkref_str,
+		       OP_OPEN_SUBEXP);
+  if (err != REG_NOERROR)
+    return err;
+  err = match_ctx_add_entry (mctx, bkref_node, bkref_str, sub_top->str_idx,
+			     sub_last->str_idx);
+  if (BE (err != REG_NOERROR, 0))
+    return err;
+  to_idx = bkref_str + sub_last->str_idx - sub_top->str_idx;
+  return clean_state_log_if_needed (mctx, to_idx);
+}
+
+/* Find the first node which is '(' or ')' and whose index is SUBEXP_IDX.
+   Search '(' if FL_OPEN, or search ')' otherwise.
+   TODO: This function isn't efficient...
+	 Because there might be more than one nodes whose types are
+	 OP_OPEN_SUBEXP and whose index is SUBEXP_IDX, we must check all
+	 nodes.
+	 E.g. RE: (a){2}  */
+
+static Idx
+internal_function
+find_subexp_node (const re_dfa_t *dfa, const re_node_set *nodes,
+		  Idx subexp_idx, int type)
+{
+  Idx cls_idx;
+  for (cls_idx = 0; cls_idx < nodes->nelem; ++cls_idx)
+    {
+      Idx cls_node = nodes->elems[cls_idx];
+      const re_token_t *node = dfa->nodes + cls_node;
+      if (node->type == type
+	  && node->opr.idx == subexp_idx)
+	return cls_node;
+    }
+  return -1;
+}
+
+/* Check whether the node TOP_NODE at TOP_STR can arrive to the node
+   LAST_NODE at LAST_STR.  We record the path onto PATH since it will be
+   heavily reused.
+   Return REG_NOERROR if it can arrive, or REG_NOMATCH otherwise.  */
+
+static reg_errcode_t
+internal_function __attribute_warn_unused_result__
+check_arrival (re_match_context_t *mctx, state_array_t *path, Idx top_node,
+	       Idx top_str, Idx last_node, Idx last_str, int type)
+{
+  const re_dfa_t *const dfa = mctx->dfa;
+  reg_errcode_t err = REG_NOERROR;
+  Idx subexp_num, backup_cur_idx, str_idx, null_cnt;
+  re_dfastate_t *cur_state = NULL;
+  re_node_set *cur_nodes, next_nodes;
+  re_dfastate_t **backup_state_log;
+  unsigned int context;
+
+  subexp_num = dfa->nodes[top_node].opr.idx;
+  /* Extend the buffer if we need.  */
+  if (BE (path->alloc < last_str + mctx->max_mb_elem_len + 1, 0))
+    {
+      re_dfastate_t **new_array;
+      Idx old_alloc = path->alloc;
+      Idx incr_alloc = last_str + mctx->max_mb_elem_len + 1;
+      Idx new_alloc;
+      if (BE (IDX_MAX - old_alloc < incr_alloc, 0))
+	return REG_ESPACE;
+      new_alloc = old_alloc + incr_alloc;
+      if (BE (SIZE_MAX / sizeof (re_dfastate_t *) < new_alloc, 0))
+	return REG_ESPACE;
+      new_array = re_realloc (path->array, re_dfastate_t *, new_alloc);
+      if (BE (new_array == NULL, 0))
+	return REG_ESPACE;
+      path->array = new_array;
+      path->alloc = new_alloc;
+      memset (new_array + old_alloc, '\0',
+	      sizeof (re_dfastate_t *) * (path->alloc - old_alloc));
+    }
+
+  str_idx = path->next_idx ? path->next_idx : top_str;
+
+  /* Temporary modify MCTX.  */
+  backup_state_log = mctx->state_log;
+  backup_cur_idx = mctx->input.cur_idx;
+  mctx->state_log = path->array;
+  mctx->input.cur_idx = str_idx;
+
+  /* Setup initial node set.  */
+  context = re_string_context_at (&mctx->input, str_idx - 1, mctx->eflags);
+  if (str_idx == top_str)
+    {
+      err = re_node_set_init_1 (&next_nodes, top_node);
+      if (BE (err != REG_NOERROR, 0))
+	return err;
+      err = check_arrival_expand_ecl (dfa, &next_nodes, subexp_num, type);
+      if (BE (err != REG_NOERROR, 0))
+	{
+	  re_node_set_free (&next_nodes);
+	  return err;
+	}
+    }
+  else
+    {
+      cur_state = mctx->state_log[str_idx];
+      if (cur_state && cur_state->has_backref)
+	{
+	  err = re_node_set_init_copy (&next_nodes, &cur_state->nodes);
+	  if (BE (err != REG_NOERROR, 0))
+	    return err;
+	}
+      else
+	re_node_set_init_empty (&next_nodes);
+    }
+  if (str_idx == top_str || (cur_state && cur_state->has_backref))
+    {
+      if (next_nodes.nelem)
+	{
+	  err = expand_bkref_cache (mctx, &next_nodes, str_idx,
+				    subexp_num, type);
+	  if (BE (err != REG_NOERROR, 0))
+	    {
+	      re_node_set_free (&next_nodes);
+	      return err;
+	    }
+	}
+      cur_state = re_acquire_state_context (&err, dfa, &next_nodes, context);
+      if (BE (cur_state == NULL && err != REG_NOERROR, 0))
+	{
+	  re_node_set_free (&next_nodes);
+	  return err;
+	}
+      mctx->state_log[str_idx] = cur_state;
+    }
+
+  for (null_cnt = 0; str_idx < last_str && null_cnt <= mctx->max_mb_elem_len;)
+    {
+      re_node_set_empty (&next_nodes);
+      if (mctx->state_log[str_idx + 1])
+	{
+	  err = re_node_set_merge (&next_nodes,
+				   &mctx->state_log[str_idx + 1]->nodes);
+	  if (BE (err != REG_NOERROR, 0))
+	    {
+	      re_node_set_free (&next_nodes);
+	      return err;
+	    }
+	}
+      if (cur_state)
+	{
+	  err = check_arrival_add_next_nodes (mctx, str_idx,
+					      &cur_state->non_eps_nodes,
+					      &next_nodes);
+	  if (BE (err != REG_NOERROR, 0))
+	    {
+	      re_node_set_free (&next_nodes);
+	      return err;
+	    }
+	}
+      ++str_idx;
+      if (next_nodes.nelem)
+	{
+	  err = check_arrival_expand_ecl (dfa, &next_nodes, subexp_num, type);
+	  if (BE (err != REG_NOERROR, 0))
+	    {
+	      re_node_set_free (&next_nodes);
+	      return err;
+	    }
+	  err = expand_bkref_cache (mctx, &next_nodes, str_idx,
+				    subexp_num, type);
+	  if (BE (err != REG_NOERROR, 0))
+	    {
+	      re_node_set_free (&next_nodes);
+	      return err;
+	    }
+	}
+      context = re_string_context_at (&mctx->input, str_idx - 1, mctx->eflags);
+      cur_state = re_acquire_state_context (&err, dfa, &next_nodes, context);
+      if (BE (cur_state == NULL && err != REG_NOERROR, 0))
+	{
+	  re_node_set_free (&next_nodes);
+	  return err;
+	}
+      mctx->state_log[str_idx] = cur_state;
+      null_cnt = cur_state == NULL ? null_cnt + 1 : 0;
+    }
+  re_node_set_free (&next_nodes);
+  cur_nodes = (mctx->state_log[last_str] == NULL ? NULL
+	       : &mctx->state_log[last_str]->nodes);
+  path->next_idx = str_idx;
+
+  /* Fix MCTX.  */
+  mctx->state_log = backup_state_log;
+  mctx->input.cur_idx = backup_cur_idx;
+
+  /* Then check the current node set has the node LAST_NODE.  */
+  if (cur_nodes != NULL && re_node_set_contains (cur_nodes, last_node))
+    return REG_NOERROR;
+
+  return REG_NOMATCH;
+}
+
+/* Helper functions for check_arrival.  */
+
+/* Calculate the destination nodes of CUR_NODES at STR_IDX, and append them
+   to NEXT_NODES.
+   TODO: This function is similar to the functions transit_state*(),
+	 however this function has many additional works.
+	 Can't we unify them?  */
+
+static reg_errcode_t
+internal_function __attribute_warn_unused_result__
+check_arrival_add_next_nodes (re_match_context_t *mctx, Idx str_idx,
+			      re_node_set *cur_nodes, re_node_set *next_nodes)
+{
+  const re_dfa_t *const dfa = mctx->dfa;
+  bool ok;
+  Idx cur_idx;
+#ifdef RE_ENABLE_I18N
+  reg_errcode_t err = REG_NOERROR;
+#endif
+  re_node_set union_set;
+  re_node_set_init_empty (&union_set);
+  for (cur_idx = 0; cur_idx < cur_nodes->nelem; ++cur_idx)
+    {
+      int naccepted = 0;
+      Idx cur_node = cur_nodes->elems[cur_idx];
+#ifdef DEBUG
+      re_token_type_t type = dfa->nodes[cur_node].type;
+      assert (!IS_EPSILON_NODE (type));
+#endif
+#ifdef RE_ENABLE_I18N
+      /* If the node may accept "multi byte".  */
+      if (dfa->nodes[cur_node].accept_mb)
+	{
+	  naccepted = check_node_accept_bytes (dfa, cur_node, &mctx->input,
+					       str_idx);
+	  if (naccepted > 1)
+	    {
+	      re_dfastate_t *dest_state;
+	      Idx next_node = dfa->nexts[cur_node];
+	      Idx next_idx = str_idx + naccepted;
+	      dest_state = mctx->state_log[next_idx];
+	      re_node_set_empty (&union_set);
+	      if (dest_state)
+		{
+		  err = re_node_set_merge (&union_set, &dest_state->nodes);
+		  if (BE (err != REG_NOERROR, 0))
+		    {
+		      re_node_set_free (&union_set);
+		      return err;
+		    }
+		}
+	      ok = re_node_set_insert (&union_set, next_node);
+	      if (BE (! ok, 0))
+		{
+		  re_node_set_free (&union_set);
+		  return REG_ESPACE;
+		}
+	      mctx->state_log[next_idx] = re_acquire_state (&err, dfa,
+							    &union_set);
+	      if (BE (mctx->state_log[next_idx] == NULL
+		      && err != REG_NOERROR, 0))
+		{
+		  re_node_set_free (&union_set);
+		  return err;
+		}
+	    }
+	}
+#endif /* RE_ENABLE_I18N */
+      if (naccepted
+	  || check_node_accept (mctx, dfa->nodes + cur_node, str_idx))
+	{
+	  ok = re_node_set_insert (next_nodes, dfa->nexts[cur_node]);
+	  if (BE (! ok, 0))
+	    {
+	      re_node_set_free (&union_set);
+	      return REG_ESPACE;
+	    }
+	}
+    }
+  re_node_set_free (&union_set);
+  return REG_NOERROR;
+}
+
+/* For all the nodes in CUR_NODES, add the epsilon closures of them to
+   CUR_NODES, however exclude the nodes which are:
+    - inside the sub expression whose number is EX_SUBEXP, if FL_OPEN.
+    - out of the sub expression whose number is EX_SUBEXP, if !FL_OPEN.
+*/
+
+static reg_errcode_t
+internal_function
+check_arrival_expand_ecl (const re_dfa_t *dfa, re_node_set *cur_nodes,
+			  Idx ex_subexp, int type)
+{
+  reg_errcode_t err;
+  Idx idx, outside_node;
+  re_node_set new_nodes;
+#ifdef DEBUG
+  assert (cur_nodes->nelem);
+#endif
+  err = re_node_set_alloc (&new_nodes, cur_nodes->nelem);
+  if (BE (err != REG_NOERROR, 0))
+    return err;
+  /* Create a new node set NEW_NODES with the nodes which are epsilon
+     closures of the node in CUR_NODES.  */
+
+  for (idx = 0; idx < cur_nodes->nelem; ++idx)
+    {
+      Idx cur_node = cur_nodes->elems[idx];
+      const re_node_set *eclosure = dfa->eclosures + cur_node;
+      outside_node = find_subexp_node (dfa, eclosure, ex_subexp, type);
+      if (outside_node == -1)
+	{
+	  /* There are no problematic nodes, just merge them.  */
+	  err = re_node_set_merge (&new_nodes, eclosure);
+	  if (BE (err != REG_NOERROR, 0))
+	    {
+	      re_node_set_free (&new_nodes);
+	      return err;
+	    }
+	}
+      else
+	{
+	  /* There are problematic nodes, re-calculate incrementally.  */
+	  err = check_arrival_expand_ecl_sub (dfa, &new_nodes, cur_node,
+					      ex_subexp, type);
+	  if (BE (err != REG_NOERROR, 0))
+	    {
+	      re_node_set_free (&new_nodes);
+	      return err;
+	    }
+	}
+    }
+  re_node_set_free (cur_nodes);
+  *cur_nodes = new_nodes;
+  return REG_NOERROR;
+}
+
+/* Helper function for check_arrival_expand_ecl.
+   Check incrementally the epsilon closure of TARGET, and if it isn't
+   problematic append it to DST_NODES.  */
+
+static reg_errcode_t
+internal_function __attribute_warn_unused_result__
+check_arrival_expand_ecl_sub (const re_dfa_t *dfa, re_node_set *dst_nodes,
+			      Idx target, Idx ex_subexp, int type)
+{
+  Idx cur_node;
+  for (cur_node = target; !re_node_set_contains (dst_nodes, cur_node);)
+    {
+      bool ok;
+
+      if (dfa->nodes[cur_node].type == type
+	  && dfa->nodes[cur_node].opr.idx == ex_subexp)
+	{
+	  if (type == OP_CLOSE_SUBEXP)
+	    {
+	      ok = re_node_set_insert (dst_nodes, cur_node);
+	      if (BE (! ok, 0))
+		return REG_ESPACE;
+	    }
+	  break;
+	}
+      ok = re_node_set_insert (dst_nodes, cur_node);
+      if (BE (! ok, 0))
+	return REG_ESPACE;
+      if (dfa->edests[cur_node].nelem == 0)
+	break;
+      if (dfa->edests[cur_node].nelem == 2)
+	{
+	  reg_errcode_t err;
+	  err = check_arrival_expand_ecl_sub (dfa, dst_nodes,
+					      dfa->edests[cur_node].elems[1],
+					      ex_subexp, type);
+	  if (BE (err != REG_NOERROR, 0))
+	    return err;
+	}
+      cur_node = dfa->edests[cur_node].elems[0];
+    }
+  return REG_NOERROR;
+}
+
+
+/* For all the back references in the current state, calculate the
+   destination of the back references by the appropriate entry
+   in MCTX->BKREF_ENTS.  */
+
+static reg_errcode_t
+internal_function __attribute_warn_unused_result__
+expand_bkref_cache (re_match_context_t *mctx, re_node_set *cur_nodes,
+		    Idx cur_str, Idx subexp_num, int type)
+{
+  const re_dfa_t *const dfa = mctx->dfa;
+  reg_errcode_t err;
+  Idx cache_idx_start = search_cur_bkref_entry (mctx, cur_str);
+  struct re_backref_cache_entry *ent;
+
+  if (cache_idx_start == -1)
+    return REG_NOERROR;
+
+ restart:
+  ent = mctx->bkref_ents + cache_idx_start;
+  do
+    {
+      Idx to_idx, next_node;
+
+      /* Is this entry ENT is appropriate?  */
+      if (!re_node_set_contains (cur_nodes, ent->node))
+	continue; /* No.  */
+
+      to_idx = cur_str + ent->subexp_to - ent->subexp_from;
+      /* Calculate the destination of the back reference, and append it
+	 to MCTX->STATE_LOG.  */
+      if (to_idx == cur_str)
+	{
+	  /* The backreference did epsilon transit, we must re-check all the
+	     node in the current state.  */
+	  re_node_set new_dests;
+	  reg_errcode_t err2, err3;
+	  next_node = dfa->edests[ent->node].elems[0];
+	  if (re_node_set_contains (cur_nodes, next_node))
+	    continue;
+	  err = re_node_set_init_1 (&new_dests, next_node);
+	  err2 = check_arrival_expand_ecl (dfa, &new_dests, subexp_num, type);
+	  err3 = re_node_set_merge (cur_nodes, &new_dests);
+	  re_node_set_free (&new_dests);
+	  if (BE (err != REG_NOERROR || err2 != REG_NOERROR
+		  || err3 != REG_NOERROR, 0))
+	    {
+	      err = (err != REG_NOERROR ? err
+		     : (err2 != REG_NOERROR ? err2 : err3));
+	      return err;
+	    }
+	  /* TODO: It is still inefficient...  */
+	  goto restart;
+	}
+      else
+	{
+	  re_node_set union_set;
+	  next_node = dfa->nexts[ent->node];
+	  if (mctx->state_log[to_idx])
+	    {
+	      bool ok;
+	      if (re_node_set_contains (&mctx->state_log[to_idx]->nodes,
+					next_node))
+		continue;
+	      err = re_node_set_init_copy (&union_set,
+					   &mctx->state_log[to_idx]->nodes);
+	      ok = re_node_set_insert (&union_set, next_node);
+	      if (BE (err != REG_NOERROR || ! ok, 0))
+		{
+		  re_node_set_free (&union_set);
+		  err = err != REG_NOERROR ? err : REG_ESPACE;
+		  return err;
+		}
+	    }
+	  else
+	    {
+	      err = re_node_set_init_1 (&union_set, next_node);
+	      if (BE (err != REG_NOERROR, 0))
+		return err;
+	    }
+	  mctx->state_log[to_idx] = re_acquire_state (&err, dfa, &union_set);
+	  re_node_set_free (&union_set);
+	  if (BE (mctx->state_log[to_idx] == NULL
+		  && err != REG_NOERROR, 0))
+	    return err;
+	}
+    }
+  while (ent++->more);
+  return REG_NOERROR;
+}
+
+/* Build transition table for the state.
+   Return true if successful.  */
+
+static bool
+internal_function
+build_trtable (const re_dfa_t *dfa, re_dfastate_t *state)
+{
+  reg_errcode_t err;
+  Idx i, j;
+  int ch;
+  bool need_word_trtable = false;
+  bitset_word_t elem, mask;
+  bool dests_node_malloced = false;
+  bool dest_states_malloced = false;
+  Idx ndests; /* Number of the destination states from 'state'.  */
+  re_dfastate_t **trtable;
+  re_dfastate_t **dest_states = NULL, **dest_states_word, **dest_states_nl;
+  re_node_set follows, *dests_node;
+  bitset_t *dests_ch;
+  bitset_t acceptable;
+
+  struct dests_alloc
+  {
+    re_node_set dests_node[SBC_MAX];
+    bitset_t dests_ch[SBC_MAX];
+  } *dests_alloc;
+
+  /* We build DFA states which corresponds to the destination nodes
+     from 'state'.  'dests_node[i]' represents the nodes which i-th
+     destination state contains, and 'dests_ch[i]' represents the
+     characters which i-th destination state accepts.  */
+  if (__libc_use_alloca (sizeof (struct dests_alloc)))
+    dests_alloc = (struct dests_alloc *) alloca (sizeof (struct dests_alloc));
+  else
+    {
+      dests_alloc = re_malloc (struct dests_alloc, 1);
+      if (BE (dests_alloc == NULL, 0))
+	return false;
+      dests_node_malloced = true;
+    }
+  dests_node = dests_alloc->dests_node;
+  dests_ch = dests_alloc->dests_ch;
+
+  /* Initialize transition table.  */
+  state->word_trtable = state->trtable = NULL;
+
+  /* At first, group all nodes belonging to 'state' into several
+     destinations.  */
+  ndests = group_nodes_into_DFAstates (dfa, state, dests_node, dests_ch);
+  if (BE (ndests <= 0, 0))
+    {
+      if (dests_node_malloced)
+	free (dests_alloc);
+      /* Return false in case of an error, true otherwise.  */
+      if (ndests == 0)
+	{
+	  state->trtable = (re_dfastate_t **)
+	    calloc (sizeof (re_dfastate_t *), SBC_MAX);
+          if (BE (state->trtable == NULL, 0))
+            return false;
+	  return true;
+	}
+      return false;
+    }
+
+  err = re_node_set_alloc (&follows, ndests + 1);
+  if (BE (err != REG_NOERROR, 0))
+    goto out_free;
+
+  /* Avoid arithmetic overflow in size calculation.  */
+  if (BE ((((SIZE_MAX - (sizeof (re_node_set) + sizeof (bitset_t)) * SBC_MAX)
+	    / (3 * sizeof (re_dfastate_t *)))
+	   < ndests),
+	  0))
+    goto out_free;
+
+  if (__libc_use_alloca ((sizeof (re_node_set) + sizeof (bitset_t)) * SBC_MAX
+			 + ndests * 3 * sizeof (re_dfastate_t *)))
+    dest_states = (re_dfastate_t **)
+      alloca (ndests * 3 * sizeof (re_dfastate_t *));
+  else
+    {
+      dest_states = (re_dfastate_t **)
+	malloc (ndests * 3 * sizeof (re_dfastate_t *));
+      if (BE (dest_states == NULL, 0))
+	{
+out_free:
+	  if (dest_states_malloced)
+	    free (dest_states);
+	  re_node_set_free (&follows);
+	  for (i = 0; i < ndests; ++i)
+	    re_node_set_free (dests_node + i);
+	  if (dests_node_malloced)
+	    free (dests_alloc);
+	  return false;
+	}
+      dest_states_malloced = true;
+    }
+  dest_states_word = dest_states + ndests;
+  dest_states_nl = dest_states_word + ndests;
+  bitset_empty (acceptable);
+
+  /* Then build the states for all destinations.  */
+  for (i = 0; i < ndests; ++i)
+    {
+      Idx next_node;
+      re_node_set_empty (&follows);
+      /* Merge the follows of this destination states.  */
+      for (j = 0; j < dests_node[i].nelem; ++j)
+	{
+	  next_node = dfa->nexts[dests_node[i].elems[j]];
+	  if (next_node != -1)
+	    {
+	      err = re_node_set_merge (&follows, dfa->eclosures + next_node);
+	      if (BE (err != REG_NOERROR, 0))
+		goto out_free;
+	    }
+	}
+      dest_states[i] = re_acquire_state_context (&err, dfa, &follows, 0);
+      if (BE (dest_states[i] == NULL && err != REG_NOERROR, 0))
+	goto out_free;
+      /* If the new state has context constraint,
+	 build appropriate states for these contexts.  */
+      if (dest_states[i]->has_constraint)
+	{
+	  dest_states_word[i] = re_acquire_state_context (&err, dfa, &follows,
+							  CONTEXT_WORD);
+	  if (BE (dest_states_word[i] == NULL && err != REG_NOERROR, 0))
+	    goto out_free;
+
+	  if (dest_states[i] != dest_states_word[i] && dfa->mb_cur_max > 1)
+	    need_word_trtable = true;
+
+	  dest_states_nl[i] = re_acquire_state_context (&err, dfa, &follows,
+							CONTEXT_NEWLINE);
+	  if (BE (dest_states_nl[i] == NULL && err != REG_NOERROR, 0))
+	    goto out_free;
+	}
+      else
+	{
+	  dest_states_word[i] = dest_states[i];
+	  dest_states_nl[i] = dest_states[i];
+	}
+      bitset_merge (acceptable, dests_ch[i]);
+    }
+
+  if (!BE (need_word_trtable, 0))
+    {
+      /* We don't care about whether the following character is a word
+	 character, or we are in a single-byte character set so we can
+	 discern by looking at the character code: allocate a
+	 256-entry transition table.  */
+      trtable = state->trtable =
+	(re_dfastate_t **) calloc (sizeof (re_dfastate_t *), SBC_MAX);
+      if (BE (trtable == NULL, 0))
+	goto out_free;
+
+      /* For all characters ch...:  */
+      for (i = 0; i < BITSET_WORDS; ++i)
+	for (ch = i * BITSET_WORD_BITS, elem = acceptable[i], mask = 1;
+	     elem;
+	     mask <<= 1, elem >>= 1, ++ch)
+	  if (BE (elem & 1, 0))
+	    {
+	      /* There must be exactly one destination which accepts
+		 character ch.  See group_nodes_into_DFAstates.  */
+	      for (j = 0; (dests_ch[j][i] & mask) == 0; ++j)
+		;
+
+	      /* j-th destination accepts the word character ch.  */
+	      if (dfa->word_char[i] & mask)
+		trtable[ch] = dest_states_word[j];
+	      else
+		trtable[ch] = dest_states[j];
+	    }
+    }
+  else
+    {
+      /* We care about whether the following character is a word
+	 character, and we are in a multi-byte character set: discern
+	 by looking at the character code: build two 256-entry
+	 transition tables, one starting at trtable[0] and one
+	 starting at trtable[SBC_MAX].  */
+      trtable = state->word_trtable =
+	(re_dfastate_t **) calloc (sizeof (re_dfastate_t *), 2 * SBC_MAX);
+      if (BE (trtable == NULL, 0))
+	goto out_free;
+
+      /* For all characters ch...:  */
+      for (i = 0; i < BITSET_WORDS; ++i)
+	for (ch = i * BITSET_WORD_BITS, elem = acceptable[i], mask = 1;
+	     elem;
+	     mask <<= 1, elem >>= 1, ++ch)
+	  if (BE (elem & 1, 0))
+	    {
+	      /* There must be exactly one destination which accepts
+		 character ch.  See group_nodes_into_DFAstates.  */
+	      for (j = 0; (dests_ch[j][i] & mask) == 0; ++j)
+		;
+
+	      /* j-th destination accepts the word character ch.  */
+	      trtable[ch] = dest_states[j];
+	      trtable[ch + SBC_MAX] = dest_states_word[j];
+	    }
+    }
+
+  /* new line */
+  if (bitset_contain (acceptable, NEWLINE_CHAR))
+    {
+      /* The current state accepts newline character.  */
+      for (j = 0; j < ndests; ++j)
+	if (bitset_contain (dests_ch[j], NEWLINE_CHAR))
+	  {
+	    /* k-th destination accepts newline character.  */
+	    trtable[NEWLINE_CHAR] = dest_states_nl[j];
+	    if (need_word_trtable)
+	      trtable[NEWLINE_CHAR + SBC_MAX] = dest_states_nl[j];
+	    /* There must be only one destination which accepts
+	       newline.  See group_nodes_into_DFAstates.  */
+	    break;
+	  }
+    }
+
+  if (dest_states_malloced)
+    free (dest_states);
+
+  re_node_set_free (&follows);
+  for (i = 0; i < ndests; ++i)
+    re_node_set_free (dests_node + i);
+
+  if (dests_node_malloced)
+    free (dests_alloc);
+
+  return true;
+}
+
+/* Group all nodes belonging to STATE into several destinations.
+   Then for all destinations, set the nodes belonging to the destination
+   to DESTS_NODE[i] and set the characters accepted by the destination
+   to DEST_CH[i].  This function return the number of destinations.  */
+
+static Idx
+internal_function
+group_nodes_into_DFAstates (const re_dfa_t *dfa, const re_dfastate_t *state,
+			    re_node_set *dests_node, bitset_t *dests_ch)
+{
+  reg_errcode_t err;
+  bool ok;
+  Idx i, j, k;
+  Idx ndests; /* Number of the destinations from 'state'.  */
+  bitset_t accepts; /* Characters a node can accept.  */
+  const re_node_set *cur_nodes = &state->nodes;
+  bitset_empty (accepts);
+  ndests = 0;
+
+  /* For all the nodes belonging to 'state',  */
+  for (i = 0; i < cur_nodes->nelem; ++i)
+    {
+      re_token_t *node = &dfa->nodes[cur_nodes->elems[i]];
+      re_token_type_t type = node->type;
+      unsigned int constraint = node->constraint;
+
+      /* Enumerate all single byte character this node can accept.  */
+      if (type == CHARACTER)
+	bitset_set (accepts, node->opr.c);
+      else if (type == SIMPLE_BRACKET)
+	{
+	  bitset_merge (accepts, node->opr.sbcset);
+	}
+      else if (type == OP_PERIOD)
+	{
+#ifdef RE_ENABLE_I18N
+	  if (dfa->mb_cur_max > 1)
+	    bitset_merge (accepts, dfa->sb_char);
+	  else
+#endif
+	    bitset_set_all (accepts);
+	  if (!(dfa->syntax & RE_DOT_NEWLINE))
+	    bitset_clear (accepts, '\n');
+	  if (dfa->syntax & RE_DOT_NOT_NULL)
+	    bitset_clear (accepts, '\0');
+	}
+#ifdef RE_ENABLE_I18N
+      else if (type == OP_UTF8_PERIOD)
+	{
+	  if (ASCII_CHARS % BITSET_WORD_BITS == 0)
+	    memset (accepts, -1, ASCII_CHARS / CHAR_BIT);
+	  else
+	    bitset_merge (accepts, utf8_sb_map);
+	  if (!(dfa->syntax & RE_DOT_NEWLINE))
+	    bitset_clear (accepts, '\n');
+	  if (dfa->syntax & RE_DOT_NOT_NULL)
+	    bitset_clear (accepts, '\0');
+	}
+#endif
+      else
+	continue;
+
+      /* Check the 'accepts' and sift the characters which are not
+	 match it the context.  */
+      if (constraint)
+	{
+	  if (constraint & NEXT_NEWLINE_CONSTRAINT)
+	    {
+	      bool accepts_newline = bitset_contain (accepts, NEWLINE_CHAR);
+	      bitset_empty (accepts);
+	      if (accepts_newline)
+		bitset_set (accepts, NEWLINE_CHAR);
+	      else
+		continue;
+	    }
+	  if (constraint & NEXT_ENDBUF_CONSTRAINT)
+	    {
+	      bitset_empty (accepts);
+	      continue;
+	    }
+
+	  if (constraint & NEXT_WORD_CONSTRAINT)
+	    {
+	      bitset_word_t any_set = 0;
+	      if (type == CHARACTER && !node->word_char)
+		{
+		  bitset_empty (accepts);
+		  continue;
+		}
+#ifdef RE_ENABLE_I18N
+	      if (dfa->mb_cur_max > 1)
+		for (j = 0; j < BITSET_WORDS; ++j)
+		  any_set |= (accepts[j] &= (dfa->word_char[j] | ~dfa->sb_char[j]));
+	      else
+#endif
+		for (j = 0; j < BITSET_WORDS; ++j)
+		  any_set |= (accepts[j] &= dfa->word_char[j]);
+	      if (!any_set)
+		continue;
+	    }
+	  if (constraint & NEXT_NOTWORD_CONSTRAINT)
+	    {
+	      bitset_word_t any_set = 0;
+	      if (type == CHARACTER && node->word_char)
+		{
+		  bitset_empty (accepts);
+		  continue;
+		}
+#ifdef RE_ENABLE_I18N
+	      if (dfa->mb_cur_max > 1)
+		for (j = 0; j < BITSET_WORDS; ++j)
+		  any_set |= (accepts[j] &= ~(dfa->word_char[j] & dfa->sb_char[j]));
+	      else
+#endif
+		for (j = 0; j < BITSET_WORDS; ++j)
+		  any_set |= (accepts[j] &= ~dfa->word_char[j]);
+	      if (!any_set)
+		continue;
+	    }
+	}
+
+      /* Then divide 'accepts' into DFA states, or create a new
+	 state.  Above, we make sure that accepts is not empty.  */
+      for (j = 0; j < ndests; ++j)
+	{
+	  bitset_t intersec; /* Intersection sets, see below.  */
+	  bitset_t remains;
+	  /* Flags, see below.  */
+	  bitset_word_t has_intersec, not_subset, not_consumed;
+
+	  /* Optimization, skip if this state doesn't accept the character.  */
+	  if (type == CHARACTER && !bitset_contain (dests_ch[j], node->opr.c))
+	    continue;
+
+	  /* Enumerate the intersection set of this state and 'accepts'.  */
+	  has_intersec = 0;
+	  for (k = 0; k < BITSET_WORDS; ++k)
+	    has_intersec |= intersec[k] = accepts[k] & dests_ch[j][k];
+	  /* And skip if the intersection set is empty.  */
+	  if (!has_intersec)
+	    continue;
+
+	  /* Then check if this state is a subset of 'accepts'.  */
+	  not_subset = not_consumed = 0;
+	  for (k = 0; k < BITSET_WORDS; ++k)
+	    {
+	      not_subset |= remains[k] = ~accepts[k] & dests_ch[j][k];
+	      not_consumed |= accepts[k] = accepts[k] & ~dests_ch[j][k];
+	    }
+
+	  /* If this state isn't a subset of 'accepts', create a
+	     new group state, which has the 'remains'. */
+	  if (not_subset)
+	    {
+	      bitset_copy (dests_ch[ndests], remains);
+	      bitset_copy (dests_ch[j], intersec);
+	      err = re_node_set_init_copy (dests_node + ndests, &dests_node[j]);
+	      if (BE (err != REG_NOERROR, 0))
+		goto error_return;
+	      ++ndests;
+	    }
+
+	  /* Put the position in the current group. */
+	  ok = re_node_set_insert (&dests_node[j], cur_nodes->elems[i]);
+	  if (BE (! ok, 0))
+	    goto error_return;
+
+	  /* If all characters are consumed, go to next node. */
+	  if (!not_consumed)
+	    break;
+	}
+      /* Some characters remain, create a new group. */
+      if (j == ndests)
+	{
+	  bitset_copy (dests_ch[ndests], accepts);
+	  err = re_node_set_init_1 (dests_node + ndests, cur_nodes->elems[i]);
+	  if (BE (err != REG_NOERROR, 0))
+	    goto error_return;
+	  ++ndests;
+	  bitset_empty (accepts);
+	}
+    }
+  return ndests;
+ error_return:
+  for (j = 0; j < ndests; ++j)
+    re_node_set_free (dests_node + j);
+  return -1;
+}
+
+#ifdef RE_ENABLE_I18N
+/* Check how many bytes the node 'dfa->nodes[node_idx]' accepts.
+   Return the number of the bytes the node accepts.
+   STR_IDX is the current index of the input string.
+
+   This function handles the nodes which can accept one character, or
+   one collating element like '.', '[a-z]', opposite to the other nodes
+   can only accept one byte.  */
+
+# ifdef _LIBC
+#  include <locale/weight.h>
+# endif
+
+static int
+internal_function
+check_node_accept_bytes (const re_dfa_t *dfa, Idx node_idx,
+			 const re_string_t *input, Idx str_idx)
+{
+  const re_token_t *node = dfa->nodes + node_idx;
+  int char_len, elem_len;
+  Idx i;
+
+  if (BE (node->type == OP_UTF8_PERIOD, 0))
+    {
+      unsigned char c = re_string_byte_at (input, str_idx), d;
+      if (BE (c < 0xc2, 1))
+	return 0;
+
+      if (str_idx + 2 > input->len)
+	return 0;
+
+      d = re_string_byte_at (input, str_idx + 1);
+      if (c < 0xe0)
+	return (d < 0x80 || d > 0xbf) ? 0 : 2;
+      else if (c < 0xf0)
+	{
+	  char_len = 3;
+	  if (c == 0xe0 && d < 0xa0)
+	    return 0;
+	}
+      else if (c < 0xf8)
+	{
+	  char_len = 4;
+	  if (c == 0xf0 && d < 0x90)
+	    return 0;
+	}
+      else if (c < 0xfc)
+	{
+	  char_len = 5;
+	  if (c == 0xf8 && d < 0x88)
+	    return 0;
+	}
+      else if (c < 0xfe)
+	{
+	  char_len = 6;
+	  if (c == 0xfc && d < 0x84)
+	    return 0;
+	}
+      else
+	return 0;
+
+      if (str_idx + char_len > input->len)
+	return 0;
+
+      for (i = 1; i < char_len; ++i)
+	{
+	  d = re_string_byte_at (input, str_idx + i);
+	  if (d < 0x80 || d > 0xbf)
+	    return 0;
+	}
+      return char_len;
+    }
+
+  char_len = re_string_char_size_at (input, str_idx);
+  if (node->type == OP_PERIOD)
+    {
+      if (char_len <= 1)
+	return 0;
+      /* FIXME: I don't think this if is needed, as both '\n'
+	 and '\0' are char_len == 1.  */
+      /* '.' accepts any one character except the following two cases.  */
+      if ((!(dfa->syntax & RE_DOT_NEWLINE) &&
+	   re_string_byte_at (input, str_idx) == '\n') ||
+	  ((dfa->syntax & RE_DOT_NOT_NULL) &&
+	   re_string_byte_at (input, str_idx) == '\0'))
+	return 0;
+      return char_len;
+    }
+
+  elem_len = re_string_elem_size_at (input, str_idx);
+  if ((elem_len <= 1 && char_len <= 1) || char_len == 0)
+    return 0;
+
+  if (node->type == COMPLEX_BRACKET)
+    {
+      const re_charset_t *cset = node->opr.mbcset;
+# ifdef _LIBC
+      const unsigned char *pin
+	= ((const unsigned char *) re_string_get_buffer (input) + str_idx);
+      Idx j;
+      uint32_t nrules;
+# endif /* _LIBC */
+      int match_len = 0;
+      wchar_t wc = ((cset->nranges || cset->nchar_classes || cset->nmbchars)
+		    ? re_string_wchar_at (input, str_idx) : 0);
+
+      /* match with multibyte character?  */
+      for (i = 0; i < cset->nmbchars; ++i)
+	if (wc == cset->mbchars[i])
+	  {
+	    match_len = char_len;
+	    goto check_node_accept_bytes_match;
+	  }
+      /* match with character_class?  */
+      for (i = 0; i < cset->nchar_classes; ++i)
+	{
+	  wctype_t wt = cset->char_classes[i];
+	  if (__iswctype (wc, wt))
+	    {
+	      match_len = char_len;
+	      goto check_node_accept_bytes_match;
+	    }
+	}
+
+# ifdef _LIBC
+      nrules = _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES);
+      if (nrules != 0)
+	{
+	  unsigned int in_collseq = 0;
+	  const int32_t *table, *indirect;
+	  const unsigned char *weights, *extra;
+	  const char *collseqwc;
+
+	  /* match with collating_symbol?  */
+	  if (cset->ncoll_syms)
+	    extra = (const unsigned char *)
+	      _NL_CURRENT (LC_COLLATE, _NL_COLLATE_SYMB_EXTRAMB);
+	  for (i = 0; i < cset->ncoll_syms; ++i)
+	    {
+	      const unsigned char *coll_sym = extra + cset->coll_syms[i];
+	      /* Compare the length of input collating element and
+		 the length of current collating element.  */
+	      if (*coll_sym != elem_len)
+		continue;
+	      /* Compare each bytes.  */
+	      for (j = 0; j < *coll_sym; j++)
+		if (pin[j] != coll_sym[1 + j])
+		  break;
+	      if (j == *coll_sym)
+		{
+		  /* Match if every bytes is equal.  */
+		  match_len = j;
+		  goto check_node_accept_bytes_match;
+		}
+	    }
+
+	  if (cset->nranges)
+	    {
+	      if (elem_len <= char_len)
+		{
+		  collseqwc = _NL_CURRENT (LC_COLLATE, _NL_COLLATE_COLLSEQWC);
+		  in_collseq = __collseq_table_lookup (collseqwc, wc);
+		}
+	      else
+		in_collseq = find_collation_sequence_value (pin, elem_len);
+	    }
+	  /* match with range expression?  */
+	  /* FIXME: Implement rational ranges here, too.  */
+	  for (i = 0; i < cset->nranges; ++i)
+	    if (cset->range_starts[i] <= in_collseq
+		&& in_collseq <= cset->range_ends[i])
+	      {
+		match_len = elem_len;
+		goto check_node_accept_bytes_match;
+	      }
+
+	  /* match with equivalence_class?  */
+	  if (cset->nequiv_classes)
+	    {
+	      const unsigned char *cp = pin;
+	      table = (const int32_t *)
+		_NL_CURRENT (LC_COLLATE, _NL_COLLATE_TABLEMB);
+	      weights = (const unsigned char *)
+		_NL_CURRENT (LC_COLLATE, _NL_COLLATE_WEIGHTMB);
+	      extra = (const unsigned char *)
+		_NL_CURRENT (LC_COLLATE, _NL_COLLATE_EXTRAMB);
+	      indirect = (const int32_t *)
+		_NL_CURRENT (LC_COLLATE, _NL_COLLATE_INDIRECTMB);
+	      int32_t idx = findidx (table, indirect, extra, &cp, elem_len);
+	      if (idx > 0)
+		for (i = 0; i < cset->nequiv_classes; ++i)
+		  {
+		    int32_t equiv_class_idx = cset->equiv_classes[i];
+		    size_t weight_len = weights[idx & 0xffffff];
+		    if (weight_len == weights[equiv_class_idx & 0xffffff]
+			&& (idx >> 24) == (equiv_class_idx >> 24))
+		      {
+			Idx cnt = 0;
+
+			idx &= 0xffffff;
+			equiv_class_idx &= 0xffffff;
+
+			while (cnt <= weight_len
+			       && (weights[equiv_class_idx + 1 + cnt]
+				   == weights[idx + 1 + cnt]))
+			  ++cnt;
+			if (cnt > weight_len)
+			  {
+			    match_len = elem_len;
+			    goto check_node_accept_bytes_match;
+			  }
+		      }
+		  }
+	    }
+	}
+      else
+# endif /* _LIBC */
+	{
+	  /* match with range expression?  */
+	  for (i = 0; i < cset->nranges; ++i)
+	    {
+	      if (cset->range_starts[i] <= wc && wc <= cset->range_ends[i])
+		{
+		  match_len = char_len;
+		  goto check_node_accept_bytes_match;
+		}
+	    }
+	}
+    check_node_accept_bytes_match:
+      if (!cset->non_match)
+	return match_len;
+      else
+	{
+	  if (match_len > 0)
+	    return 0;
+	  else
+	    return (elem_len > char_len) ? elem_len : char_len;
+	}
+    }
+  return 0;
+}
+
+# ifdef _LIBC
+static unsigned int
+internal_function
+find_collation_sequence_value (const unsigned char *mbs, size_t mbs_len)
+{
+  uint32_t nrules = _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES);
+  if (nrules == 0)
+    {
+      if (mbs_len == 1)
+	{
+	  /* No valid character.  Match it as a single byte character.  */
+	  const unsigned char *collseq = (const unsigned char *)
+	    _NL_CURRENT (LC_COLLATE, _NL_COLLATE_COLLSEQMB);
+	  return collseq[mbs[0]];
+	}
+      return UINT_MAX;
+    }
+  else
+    {
+      int32_t idx;
+      const unsigned char *extra = (const unsigned char *)
+	_NL_CURRENT (LC_COLLATE, _NL_COLLATE_SYMB_EXTRAMB);
+      int32_t extrasize = (const unsigned char *)
+	_NL_CURRENT (LC_COLLATE, _NL_COLLATE_SYMB_EXTRAMB + 1) - extra;
+
+      for (idx = 0; idx < extrasize;)
+	{
+	  int mbs_cnt;
+	  bool found = false;
+	  int32_t elem_mbs_len;
+	  /* Skip the name of collating element name.  */
+	  idx = idx + extra[idx] + 1;
+	  elem_mbs_len = extra[idx++];
+	  if (mbs_len == elem_mbs_len)
+	    {
+	      for (mbs_cnt = 0; mbs_cnt < elem_mbs_len; ++mbs_cnt)
+		if (extra[idx + mbs_cnt] != mbs[mbs_cnt])
+		  break;
+	      if (mbs_cnt == elem_mbs_len)
+		/* Found the entry.  */
+		found = true;
+	    }
+	  /* Skip the byte sequence of the collating element.  */
+	  idx += elem_mbs_len;
+	  /* Adjust for the alignment.  */
+	  idx = (idx + 3) & ~3;
+	  /* Skip the collation sequence value.  */
+	  idx += sizeof (uint32_t);
+	  /* Skip the wide char sequence of the collating element.  */
+	  idx = idx + sizeof (uint32_t) * (*(int32_t *) (extra + idx) + 1);
+	  /* If we found the entry, return the sequence value.  */
+	  if (found)
+	    return *(uint32_t *) (extra + idx);
+	  /* Skip the collation sequence value.  */
+	  idx += sizeof (uint32_t);
+	}
+      return UINT_MAX;
+    }
+}
+# endif /* _LIBC */
+#endif /* RE_ENABLE_I18N */
+
+/* Check whether the node accepts the byte which is IDX-th
+   byte of the INPUT.  */
+
+static bool
+internal_function
+check_node_accept (const re_match_context_t *mctx, const re_token_t *node,
+		   Idx idx)
+{
+  unsigned char ch;
+  ch = re_string_byte_at (&mctx->input, idx);
+  switch (node->type)
+    {
+    case CHARACTER:
+      if (node->opr.c != ch)
+        return false;
+      break;
+
+    case SIMPLE_BRACKET:
+      if (!bitset_contain (node->opr.sbcset, ch))
+        return false;
+      break;
+
+#ifdef RE_ENABLE_I18N
+    case OP_UTF8_PERIOD:
+      if (ch >= ASCII_CHARS)
+        return false;
+      FALLTHROUGH;
+#endif
+    case OP_PERIOD:
+      if ((ch == '\n' && !(mctx->dfa->syntax & RE_DOT_NEWLINE))
+	  || (ch == '\0' && (mctx->dfa->syntax & RE_DOT_NOT_NULL)))
+	return false;
+      break;
+
+    default:
+      return false;
+    }
+
+  if (node->constraint)
+    {
+      /* The node has constraints.  Check whether the current context
+	 satisfies the constraints.  */
+      unsigned int context = re_string_context_at (&mctx->input, idx,
+						   mctx->eflags);
+      if (NOT_SATISFY_NEXT_CONSTRAINT (node->constraint, context))
+	return false;
+    }
+
+  return true;
+}
+
+/* Extend the buffers, if the buffers have run out.  */
+
+static reg_errcode_t
+internal_function __attribute_warn_unused_result__
+extend_buffers (re_match_context_t *mctx, int min_len)
+{
+  reg_errcode_t ret;
+  re_string_t *pstr = &mctx->input;
+
+  /* Avoid overflow.  */
+  if (BE (MIN (IDX_MAX, SIZE_MAX / sizeof (re_dfastate_t *)) / 2
+          <= pstr->bufs_len, 0))
+    return REG_ESPACE;
+
+  /* Double the lengths of the buffers, but allocate at least MIN_LEN.  */
+  ret = re_string_realloc_buffers (pstr,
+				   MAX (min_len,
+					MIN (pstr->len, pstr->bufs_len * 2)));
+  if (BE (ret != REG_NOERROR, 0))
+    return ret;
+
+  if (mctx->state_log != NULL)
+    {
+      /* And double the length of state_log.  */
+      /* XXX We have no indication of the size of this buffer.  If this
+	 allocation fail we have no indication that the state_log array
+	 does not have the right size.  */
+      re_dfastate_t **new_array = re_realloc (mctx->state_log, re_dfastate_t *,
+					      pstr->bufs_len + 1);
+      if (BE (new_array == NULL, 0))
+	return REG_ESPACE;
+      mctx->state_log = new_array;
+    }
+
+  /* Then reconstruct the buffers.  */
+  if (pstr->icase)
+    {
+#ifdef RE_ENABLE_I18N
+      if (pstr->mb_cur_max > 1)
+	{
+	  ret = build_wcs_upper_buffer (pstr);
+	  if (BE (ret != REG_NOERROR, 0))
+	    return ret;
+	}
+      else
+#endif /* RE_ENABLE_I18N  */
+	build_upper_buffer (pstr);
+    }
+  else
+    {
+#ifdef RE_ENABLE_I18N
+      if (pstr->mb_cur_max > 1)
+	build_wcs_buffer (pstr);
+      else
+#endif /* RE_ENABLE_I18N  */
+	{
+	  if (pstr->trans != NULL)
+	    re_string_translate_buffer (pstr);
+	}
+    }
+  return REG_NOERROR;
+}
+
+
+/* Functions for matching context.  */
+
+/* Initialize MCTX.  */
+
+static reg_errcode_t
+internal_function __attribute_warn_unused_result__
+match_ctx_init (re_match_context_t *mctx, int eflags, Idx n)
+{
+  mctx->eflags = eflags;
+  mctx->match_last = -1;
+  if (n > 0)
+    {
+      /* Avoid overflow.  */
+      size_t max_object_size =
+	MAX (sizeof (struct re_backref_cache_entry),
+	     sizeof (re_sub_match_top_t *));
+      if (BE (MIN (IDX_MAX, SIZE_MAX / max_object_size) < n, 0))
+	return REG_ESPACE;
+
+      mctx->bkref_ents = re_malloc (struct re_backref_cache_entry, n);
+      mctx->sub_tops = re_malloc (re_sub_match_top_t *, n);
+      if (BE (mctx->bkref_ents == NULL || mctx->sub_tops == NULL, 0))
+	return REG_ESPACE;
+    }
+  /* Already zero-ed by the caller.
+     else
+       mctx->bkref_ents = NULL;
+     mctx->nbkref_ents = 0;
+     mctx->nsub_tops = 0;  */
+  mctx->abkref_ents = n;
+  mctx->max_mb_elem_len = 1;
+  mctx->asub_tops = n;
+  return REG_NOERROR;
+}
+
+/* Clean the entries which depend on the current input in MCTX.
+   This function must be invoked when the matcher changes the start index
+   of the input, or changes the input string.  */
+
+static void
+internal_function
+match_ctx_clean (re_match_context_t *mctx)
+{
+  Idx st_idx;
+  for (st_idx = 0; st_idx < mctx->nsub_tops; ++st_idx)
+    {
+      Idx sl_idx;
+      re_sub_match_top_t *top = mctx->sub_tops[st_idx];
+      for (sl_idx = 0; sl_idx < top->nlasts; ++sl_idx)
+	{
+	  re_sub_match_last_t *last = top->lasts[sl_idx];
+	  re_free (last->path.array);
+	  re_free (last);
+	}
+      re_free (top->lasts);
+      if (top->path)
+	{
+	  re_free (top->path->array);
+	  re_free (top->path);
+	}
+      free (top);
+    }
+
+  mctx->nsub_tops = 0;
+  mctx->nbkref_ents = 0;
+}
+
+/* Free all the memory associated with MCTX.  */
+
+static void
+internal_function
+match_ctx_free (re_match_context_t *mctx)
+{
+  /* First, free all the memory associated with MCTX->SUB_TOPS.  */
+  match_ctx_clean (mctx);
+  re_free (mctx->sub_tops);
+  re_free (mctx->bkref_ents);
+}
+
+/* Add a new backreference entry to MCTX.
+   Note that we assume that caller never call this function with duplicate
+   entry, and call with STR_IDX which isn't smaller than any existing entry.
+*/
+
+static reg_errcode_t
+internal_function __attribute_warn_unused_result__
+match_ctx_add_entry (re_match_context_t *mctx, Idx node, Idx str_idx, Idx from,
+		     Idx to)
+{
+  if (mctx->nbkref_ents >= mctx->abkref_ents)
+    {
+      struct re_backref_cache_entry* new_entry;
+      new_entry = re_realloc (mctx->bkref_ents, struct re_backref_cache_entry,
+			      mctx->abkref_ents * 2);
+      if (BE (new_entry == NULL, 0))
+	{
+	  re_free (mctx->bkref_ents);
+	  return REG_ESPACE;
+	}
+      mctx->bkref_ents = new_entry;
+      memset (mctx->bkref_ents + mctx->nbkref_ents, '\0',
+	      sizeof (struct re_backref_cache_entry) * mctx->abkref_ents);
+      mctx->abkref_ents *= 2;
+    }
+  if (mctx->nbkref_ents > 0
+      && mctx->bkref_ents[mctx->nbkref_ents - 1].str_idx == str_idx)
+    mctx->bkref_ents[mctx->nbkref_ents - 1].more = 1;
+
+  mctx->bkref_ents[mctx->nbkref_ents].node = node;
+  mctx->bkref_ents[mctx->nbkref_ents].str_idx = str_idx;
+  mctx->bkref_ents[mctx->nbkref_ents].subexp_from = from;
+  mctx->bkref_ents[mctx->nbkref_ents].subexp_to = to;
+
+  /* This is a cache that saves negative results of check_dst_limits_calc_pos.
+     If bit N is clear, means that this entry won't epsilon-transition to
+     an OP_OPEN_SUBEXP or OP_CLOSE_SUBEXP for the N+1-th subexpression.  If
+     it is set, check_dst_limits_calc_pos_1 will recurse and try to find one
+     such node.
+
+     A backreference does not epsilon-transition unless it is empty, so set
+     to all zeros if FROM != TO.  */
+  mctx->bkref_ents[mctx->nbkref_ents].eps_reachable_subexps_map
+    = (from == to ? -1 : 0);
+
+  mctx->bkref_ents[mctx->nbkref_ents++].more = 0;
+  if (mctx->max_mb_elem_len < to - from)
+    mctx->max_mb_elem_len = to - from;
+  return REG_NOERROR;
+}
+
+/* Return the first entry with the same str_idx, or -1 if none is
+   found.  Note that MCTX->BKREF_ENTS is already sorted by MCTX->STR_IDX.  */
+
+static Idx
+internal_function
+search_cur_bkref_entry (const re_match_context_t *mctx, Idx str_idx)
+{
+  Idx left, right, mid, last;
+  last = right = mctx->nbkref_ents;
+  for (left = 0; left < right;)
+    {
+      mid = (left + right) / 2;
+      if (mctx->bkref_ents[mid].str_idx < str_idx)
+	left = mid + 1;
+      else
+	right = mid;
+    }
+  if (left < last && mctx->bkref_ents[left].str_idx == str_idx)
+    return left;
+  else
+    return -1;
+}
+
+/* Register the node NODE, whose type is OP_OPEN_SUBEXP, and which matches
+   at STR_IDX.  */
+
+static reg_errcode_t
+internal_function __attribute_warn_unused_result__
+match_ctx_add_subtop (re_match_context_t *mctx, Idx node, Idx str_idx)
+{
+#ifdef DEBUG
+  assert (mctx->sub_tops != NULL);
+  assert (mctx->asub_tops > 0);
+#endif
+  if (BE (mctx->nsub_tops == mctx->asub_tops, 0))
+    {
+      Idx new_asub_tops = mctx->asub_tops * 2;
+      re_sub_match_top_t **new_array = re_realloc (mctx->sub_tops,
+						   re_sub_match_top_t *,
+						   new_asub_tops);
+      if (BE (new_array == NULL, 0))
+	return REG_ESPACE;
+      mctx->sub_tops = new_array;
+      mctx->asub_tops = new_asub_tops;
+    }
+  mctx->sub_tops[mctx->nsub_tops] = calloc (1, sizeof (re_sub_match_top_t));
+  if (BE (mctx->sub_tops[mctx->nsub_tops] == NULL, 0))
+    return REG_ESPACE;
+  mctx->sub_tops[mctx->nsub_tops]->node = node;
+  mctx->sub_tops[mctx->nsub_tops++]->str_idx = str_idx;
+  return REG_NOERROR;
+}
+
+/* Register the node NODE, whose type is OP_CLOSE_SUBEXP, and which matches
+   at STR_IDX, whose corresponding OP_OPEN_SUBEXP is SUB_TOP.  */
+
+static re_sub_match_last_t *
+internal_function
+match_ctx_add_sublast (re_sub_match_top_t *subtop, Idx node, Idx str_idx)
+{
+  re_sub_match_last_t *new_entry;
+  if (BE (subtop->nlasts == subtop->alasts, 0))
+    {
+      Idx new_alasts = 2 * subtop->alasts + 1;
+      re_sub_match_last_t **new_array = re_realloc (subtop->lasts,
+						    re_sub_match_last_t *,
+						    new_alasts);
+      if (BE (new_array == NULL, 0))
+	return NULL;
+      subtop->lasts = new_array;
+      subtop->alasts = new_alasts;
+    }
+  new_entry = calloc (1, sizeof (re_sub_match_last_t));
+  if (BE (new_entry != NULL, 1))
+    {
+      subtop->lasts[subtop->nlasts] = new_entry;
+      new_entry->node = node;
+      new_entry->str_idx = str_idx;
+      ++subtop->nlasts;
+    }
+  return new_entry;
+}
+
+static void
+internal_function
+sift_ctx_init (re_sift_context_t *sctx, re_dfastate_t **sifted_sts,
+	       re_dfastate_t **limited_sts, Idx last_node, Idx last_str_idx)
+{
+  sctx->sifted_states = sifted_sts;
+  sctx->limited_states = limited_sts;
+  sctx->last_node = last_node;
+  sctx->last_str_idx = last_str_idx;
+  re_node_set_init_empty (&sctx->limits);
+}
diff --git a/gl/stat-w32.c b/gl/stat-w32.c
new file mode 100644
index 0000000..788282c
--- /dev/null
+++ b/gl/stat-w32.c
@@ -0,0 +1,421 @@
+/* Core of implementation of fstat and stat for native Windows.
+   Copyright (C) 2017 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* Written by Bruno Haible.  */
+
+#include <config.h>
+
+#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+
+/* Ensure that <windows.h> defines FILE_ID_INFO.  */
+#undef _WIN32_WINNT
+#define _WIN32_WINNT _WIN32_WINNT_WIN8
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <errno.h>
+#include <limits.h>
+#include <string.h>
+#include <unistd.h>
+#include <windows.h>
+
+/* Specification.  */
+#include "stat-w32.h"
+
+#include "pathmax.h"
+#include "verify.h"
+
+#if _GL_WINDOWS_STAT_INODES == 2
+/* GetFileInformationByHandleEx was introduced only in Windows Vista.  */
+typedef DWORD (WINAPI * GetFileInformationByHandleExFuncType) (HANDLE hFile,
+                                                               FILE_INFO_BY_HANDLE_CLASS fiClass,
+                                                               LPVOID lpBuffer,
+                                                               DWORD dwBufferSize);
+static GetFileInformationByHandleExFuncType GetFileInformationByHandleExFunc = NULL;
+#endif
+/* GetFinalPathNameByHandle was introduced only in Windows Vista.  */
+typedef DWORD (WINAPI * GetFinalPathNameByHandleFuncType) (HANDLE hFile,
+                                                           LPTSTR lpFilePath,
+                                                           DWORD lenFilePath,
+                                                           DWORD dwFlags);
+static GetFinalPathNameByHandleFuncType GetFinalPathNameByHandleFunc = NULL;
+static BOOL initialized = FALSE;
+
+static void
+initialize (void)
+{
+  HMODULE kernel32 = LoadLibrary ("kernel32.dll");
+  if (kernel32 != NULL)
+    {
+#if _GL_WINDOWS_STAT_INODES == 2
+      GetFileInformationByHandleExFunc =
+        (GetFileInformationByHandleExFuncType) GetProcAddress (kernel32, "GetFileInformationByHandleEx");
+#endif
+      GetFinalPathNameByHandleFunc =
+        (GetFinalPathNameByHandleFuncType) GetProcAddress (kernel32, "GetFinalPathNameByHandleA");
+    }
+  initialized = TRUE;
+}
+
+/* Converts a FILETIME to GMT time since 1970-01-01 00:00:00.  */
+#if _GL_WINDOWS_STAT_TIMESPEC
+struct timespec
+_gl_convert_FILETIME_to_timespec (const FILETIME *ft)
+{
+  struct timespec result;
+  /* FILETIME: <https://msdn.microsoft.com/en-us/library/ms724284.aspx> */
+  unsigned long long since_1601 =
+    ((unsigned long long) ft->dwHighDateTime << 32)
+    | (unsigned long long) ft->dwLowDateTime;
+  if (since_1601 == 0)
+    {
+      result.tv_sec = 0;
+      result.tv_nsec = 0;
+    }
+  else
+    {
+      /* Between 1601-01-01 and 1970-01-01 there were 280 normal years and 89
+         leap years, in total 134774 days.  */
+      unsigned long long since_1970 =
+        since_1601 - (unsigned long long) 134774 * (unsigned long long) 86400 * (unsigned long long) 10000000;
+      result.tv_sec = since_1970 / (unsigned long long) 10000000;
+      result.tv_nsec = (unsigned long) (since_1970 % (unsigned long long) 10000000) * 100;
+    }
+  return result;
+}
+#else
+time_t
+_gl_convert_FILETIME_to_POSIX (const FILETIME *ft)
+{
+  /* FILETIME: <https://msdn.microsoft.com/en-us/library/ms724284.aspx> */
+  unsigned long long since_1601 =
+    ((unsigned long long) ft->dwHighDateTime << 32)
+    | (unsigned long long) ft->dwLowDateTime;
+  if (since_1601 == 0)
+    return 0;
+  else
+    {
+      /* Between 1601-01-01 and 1970-01-01 there were 280 normal years and 89
+         leap years, in total 134774 days.  */
+      unsigned long long since_1970 =
+        since_1601 - (unsigned long long) 134774 * (unsigned long long) 86400 * (unsigned long long) 10000000;
+      return since_1970 / (unsigned long long) 10000000;
+    }
+}
+#endif
+
+/* Fill *BUF with information about the file designated by H.
+   PATH is the file name, if known, otherwise NULL.
+   Return 0 if successful, or -1 with errno set upon failure.  */
+int
+_gl_fstat_by_handle (HANDLE h, const char *path, struct stat *buf)
+{
+  /* GetFileType
+     <https://msdn.microsoft.com/en-us/library/aa364960.aspx> */
+  DWORD type = GetFileType (h);
+  if (type == FILE_TYPE_DISK)
+    {
+      if (!initialized)
+        initialize ();
+
+      /* st_mode can be determined through
+         GetFileAttributesEx
+         <https://msdn.microsoft.com/en-us/library/aa364946.aspx>
+         <https://msdn.microsoft.com/en-us/library/aa365739.aspx>
+         or through
+         GetFileInformationByHandle
+         <https://msdn.microsoft.com/en-us/library/aa364952.aspx>
+         <https://msdn.microsoft.com/en-us/library/aa363788.aspx>
+         or through
+         GetFileInformationByHandleEx with argument FileBasicInfo
+         <https://msdn.microsoft.com/en-us/library/aa364953.aspx>
+         <https://msdn.microsoft.com/en-us/library/aa364217.aspx>
+         The latter requires -D_WIN32_WINNT=_WIN32_WINNT_VISTA or higher.  */
+      BY_HANDLE_FILE_INFORMATION info;
+      if (! GetFileInformationByHandle (h, &info))
+        goto failed;
+
+      /* Test for error conditions before starting to fill *buf.  */
+      if (sizeof (buf->st_size) <= 4 && info.nFileSizeHigh > 0)
+        {
+          errno = EOVERFLOW;
+          return -1;
+        }
+
+#if _GL_WINDOWS_STAT_INODES
+      /* st_ino can be determined through
+         GetFileInformationByHandle
+         <https://msdn.microsoft.com/en-us/library/aa364952.aspx>
+         <https://msdn.microsoft.com/en-us/library/aa363788.aspx>
+         as 64 bits, or through
+         GetFileInformationByHandleEx with argument FileIdInfo
+         <https://msdn.microsoft.com/en-us/library/aa364953.aspx>
+         <https://msdn.microsoft.com/en-us/library/hh802691.aspx>
+         as 128 bits.
+         The latter requires -D_WIN32_WINNT=_WIN32_WINNT_WIN8 or higher.  */
+      /* Experiments show that GetFileInformationByHandleEx does not provide
+         much more information than GetFileInformationByHandle:
+           * The dwVolumeSerialNumber from GetFileInformationByHandle is equal
+             to the low 32 bits of the 64-bit VolumeSerialNumber from
+             GetFileInformationByHandleEx, and is apparently sufficient for
+             identifying the device.
+           * The nFileIndex from GetFileInformationByHandle is equal to the low
+             64 bits of the 128-bit FileId from GetFileInformationByHandleEx,
+             and the high 64 bits of this 128-bit FileId are zero.
+           * On a FAT file system, GetFileInformationByHandleEx fails with error
+             ERROR_INVALID_PARAMETER, whereas GetFileInformationByHandle
+             succeeds.
+           * On a CIFS/SMB file system, GetFileInformationByHandleEx fails with
+             error ERROR_INVALID_LEVEL, whereas GetFileInformationByHandle
+             succeeds.  */
+# if _GL_WINDOWS_STAT_INODES == 2
+      if (GetFileInformationByHandleExFunc != NULL)
+        {
+          FILE_ID_INFO id;
+          if (GetFileInformationByHandleExFunc (h, FileIdInfo, &id, sizeof (id)))
+            {
+              buf->st_dev = id.VolumeSerialNumber;
+              verify (sizeof (ino_t) == sizeof (id.FileId));
+              memcpy (&buf->st_ino, &id.FileId, sizeof (ino_t));
+              goto ino_done;
+            }
+          else
+            {
+              switch (GetLastError ())
+                {
+                case ERROR_INVALID_PARAMETER: /* older Windows version, or FAT */
+                case ERROR_INVALID_LEVEL: /* CIFS/SMB file system */
+                  goto fallback;
+                default:
+                  goto failed;
+                }
+            }
+        }
+     fallback: ;
+      /* Fallback for older Windows versions.  */
+      buf->st_dev = info.dwVolumeSerialNumber;
+      buf->st_ino._gl_ino[0] = ((ULONGLONG) info.nFileIndexHigh << 32) | (ULONGLONG) info.nFileIndexLow;
+      buf->st_ino._gl_ino[1] = 0;
+     ino_done: ;
+# else /* _GL_WINDOWS_STAT_INODES == 1 */
+      buf->st_dev = info.dwVolumeSerialNumber;
+      buf->st_ino = ((ULONGLONG) info.nFileIndexHigh << 32) | (ULONGLONG) info.nFileIndexLow;
+# endif
+#else
+      /* st_ino is not wide enough for identifying a file on a device.
+         Without st_ino, st_dev is pointless.  */
+      buf->st_dev = 0;
+      buf->st_ino = 0;
+#endif
+
+      /* st_mode.  */
+      unsigned int mode =
+        /* XXX How to handle FILE_ATTRIBUTE_REPARSE_POINT ?  */
+        ((info.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) ? _S_IFDIR | S_IEXEC_UGO : _S_IFREG)
+        | S_IREAD_UGO
+        | ((info.dwFileAttributes & FILE_ATTRIBUTE_READONLY) ? 0 : S_IWRITE_UGO);
+      if (!(info.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY))
+        {
+          /* Determine whether the file is executable by looking at the file
+             name suffix.
+             If the file name is already known, use it. Otherwise, for
+             non-empty files, it can be determined through
+             GetFinalPathNameByHandle
+             <https://msdn.microsoft.com/en-us/library/aa364962.aspx>
+             or through
+             GetFileInformationByHandleEx with argument FileNameInfo
+             <https://msdn.microsoft.com/en-us/library/aa364953.aspx>
+             <https://msdn.microsoft.com/en-us/library/aa364388.aspx>
+             Both require -D_WIN32_WINNT=_WIN32_WINNT_VISTA or higher.  */
+          if (info.nFileSizeHigh > 0 || info.nFileSizeLow > 0)
+            {
+              char fpath[PATH_MAX];
+              if (path != NULL
+                  || (GetFinalPathNameByHandleFunc != NULL
+                      && GetFinalPathNameByHandleFunc (h, fpath, sizeof (fpath), VOLUME_NAME_NONE)
+                         < sizeof (fpath)
+                      && (path = fpath, 1)))
+                {
+                  const char *last_dot = NULL;
+                  const char *p;
+                  for (p = path; *p != '\0'; p++)
+                    if (*p == '.')
+                      last_dot = p;
+                  if (last_dot != NULL)
+                    {
+                      const char *suffix = last_dot + 1;
+                      if (_stricmp (suffix, "exe") == 0
+                          || _stricmp (suffix, "bat") == 0
+                          || _stricmp (suffix, "cmd") == 0
+                          || _stricmp (suffix, "com") == 0)
+                        mode |= S_IEXEC_UGO;
+                    }
+                }
+              else
+                /* Cannot determine file name.  Pretend that it is executable.  */
+                mode |= S_IEXEC_UGO;
+            }
+        }
+      buf->st_mode = mode;
+
+      /* st_nlink can be determined through
+         GetFileInformationByHandle
+         <https://msdn.microsoft.com/en-us/library/aa364952.aspx>
+         <https://msdn.microsoft.com/en-us/library/aa363788.aspx>
+         or through
+         GetFileInformationByHandleEx with argument FileStandardInfo
+         <https://msdn.microsoft.com/en-us/library/aa364953.aspx>
+         <https://msdn.microsoft.com/en-us/library/aa364401.aspx>
+         The latter requires -D_WIN32_WINNT=_WIN32_WINNT_VISTA or higher.  */
+      buf->st_nlink = (info.nNumberOfLinks > SHRT_MAX ? SHRT_MAX : info.nNumberOfLinks);
+
+      /* There's no easy way to map the Windows SID concept to an integer.  */
+      buf->st_uid = 0;
+      buf->st_gid = 0;
+
+      /* st_rdev is irrelevant for normal files and directories.  */
+      buf->st_rdev = 0;
+
+      /* st_size can be determined through
+         GetFileSizeEx
+         <https://msdn.microsoft.com/en-us/library/aa364957.aspx>
+         or through
+         GetFileAttributesEx
+         <https://msdn.microsoft.com/en-us/library/aa364946.aspx>
+         <https://msdn.microsoft.com/en-us/library/aa365739.aspx>
+         or through
+         GetFileInformationByHandle
+         <https://msdn.microsoft.com/en-us/library/aa364952.aspx>
+         <https://msdn.microsoft.com/en-us/library/aa363788.aspx>
+         or through
+         GetFileInformationByHandleEx with argument FileStandardInfo
+         <https://msdn.microsoft.com/en-us/library/aa364953.aspx>
+         <https://msdn.microsoft.com/en-us/library/aa364401.aspx>
+         The latter requires -D_WIN32_WINNT=_WIN32_WINNT_VISTA or higher.  */
+      if (sizeof (buf->st_size) <= 4)
+        /* Range check already done above.  */
+        buf->st_size = info.nFileSizeLow;
+      else
+        buf->st_size = ((long long) info.nFileSizeHigh << 32) | (long long) info.nFileSizeLow;
+
+      /* st_atime, st_mtime, st_ctime can be determined through
+         GetFileTime
+         <https://msdn.microsoft.com/en-us/library/ms724320.aspx>
+         or through
+         GetFileAttributesEx
+         <https://msdn.microsoft.com/en-us/library/aa364946.aspx>
+         <https://msdn.microsoft.com/en-us/library/aa365739.aspx>
+         or through
+         GetFileInformationByHandle
+         <https://msdn.microsoft.com/en-us/library/aa364952.aspx>
+         <https://msdn.microsoft.com/en-us/library/aa363788.aspx>
+         or through
+         GetFileInformationByHandleEx with argument FileBasicInfo
+         <https://msdn.microsoft.com/en-us/library/aa364953.aspx>
+         <https://msdn.microsoft.com/en-us/library/aa364217.aspx>
+         The latter requires -D_WIN32_WINNT=_WIN32_WINNT_VISTA or higher.  */
+#if _GL_WINDOWS_STAT_TIMESPEC
+      buf->st_atim = _gl_convert_FILETIME_to_timespec (&info.ftLastAccessTime);
+      buf->st_mtim = _gl_convert_FILETIME_to_timespec (&info.ftLastWriteTime);
+      buf->st_ctim = _gl_convert_FILETIME_to_timespec (&info.ftCreationTime);
+#else
+      buf->st_atime = _gl_convert_FILETIME_to_POSIX (&info.ftLastAccessTime);
+      buf->st_mtime = _gl_convert_FILETIME_to_POSIX (&info.ftLastWriteTime);
+      buf->st_ctime = _gl_convert_FILETIME_to_POSIX (&info.ftCreationTime);
+#endif
+
+      return 0;
+    }
+  else if (type == FILE_TYPE_CHAR || type == FILE_TYPE_PIPE)
+    {
+      buf->st_dev = 0;
+#if _GL_WINDOWS_STAT_INODES == 2
+      buf->st_ino._gl_ino[0] = buf->st_ino._gl_ino[1] = 0;
+#else
+      buf->st_ino = 0;
+#endif
+      buf->st_mode = (type == FILE_TYPE_PIPE ? _S_IFIFO : _S_IFCHR);
+      buf->st_nlink = 1;
+      buf->st_uid = 0;
+      buf->st_gid = 0;
+      buf->st_rdev = 0;
+      if (type == FILE_TYPE_PIPE)
+        {
+          /* PeekNamedPipe
+             <https://msdn.microsoft.com/en-us/library/aa365779.aspx> */
+          DWORD bytes_available;
+          if (PeekNamedPipe (h, NULL, 0, NULL, &bytes_available, NULL))
+            buf->st_size = bytes_available;
+          else
+            buf->st_size = 0;
+        }
+      else
+        buf->st_size = 0;
+#if _GL_WINDOWS_STAT_TIMESPEC
+      buf->st_atim.tv_sec = 0; buf->st_atim.tv_nsec = 0;
+      buf->st_mtim.tv_sec = 0; buf->st_mtim.tv_nsec = 0;
+      buf->st_ctim.tv_sec = 0; buf->st_ctim.tv_nsec = 0;
+#else
+      buf->st_atime = 0;
+      buf->st_mtime = 0;
+      buf->st_ctime = 0;
+#endif
+      return 0;
+    }
+  else
+    {
+      errno = ENOENT;
+      return -1;
+    }
+
+ failed:
+  {
+    DWORD error = GetLastError ();
+    #if 0
+    fprintf (stderr, "_gl_fstat_by_handle error 0x%x\n", (unsigned int) error);
+    #endif
+    switch (error)
+      {
+      case ERROR_ACCESS_DENIED:
+      case ERROR_SHARING_VIOLATION:
+        errno = EACCES;
+        break;
+
+      case ERROR_OUTOFMEMORY:
+        errno = ENOMEM;
+        break;
+
+      case ERROR_WRITE_FAULT:
+      case ERROR_READ_FAULT:
+      case ERROR_GEN_FAILURE:
+        errno = EIO;
+        break;
+
+      default:
+        errno = EINVAL;
+        break;
+      }
+    return -1;
+  }
+}
+
+#else
+
+/* This declaration is solely to ensure that after preprocessing
+   this file is never empty.  */
+typedef int dummy;
+
+#endif
diff --git a/gl/stat-w32.h b/gl/stat-w32.h
new file mode 100644
index 0000000..1068371
--- /dev/null
+++ b/gl/stat-w32.h
@@ -0,0 +1,37 @@
+/* Core of implementation of fstat and stat for native Windows.
+   Copyright (C) 2017 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#ifndef _STAT_W32_H
+#define _STAT_W32_H 1
+
+/* Converts a FILETIME to GMT time since 1970-01-01 00:00:00.  */
+#if _GL_WINDOWS_STAT_TIMESPEC
+extern struct timespec _gl_convert_FILETIME_to_timespec (const FILETIME *ft);
+#else
+extern time_t _gl_convert_FILETIME_to_POSIX (const FILETIME *ft);
+#endif
+
+/* Fill *BUF with information about the file designated by H.
+   PATH is the file name, if known, otherwise NULL.
+   Return 0 if successful, or -1 with errno set upon failure.  */
+extern int _gl_fstat_by_handle (HANDLE h, const char *path, struct stat *buf);
+
+/* Bitmasks for st_mode.  */
+#define S_IREAD_UGO  (_S_IREAD | (_S_IREAD >> 3) | (_S_IREAD >> 6))
+#define S_IWRITE_UGO (_S_IWRITE | (_S_IWRITE >> 3) | (_S_IWRITE >> 6))
+#define S_IEXEC_UGO  (_S_IEXEC | (_S_IEXEC >> 3) | (_S_IEXEC >> 6))
+
+#endif /* _STAT_W32_H */
diff --git a/gl/stat.c b/gl/stat.c
new file mode 100644
index 0000000..fa68250
--- /dev/null
+++ b/gl/stat.c
@@ -0,0 +1,423 @@
+/* Work around platform bugs in stat.
+   Copyright (C) 2009-2017 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* Written by Eric Blake and Bruno Haible.  */
+
+/* If the user's config.h happens to include <sys/stat.h>, let it include only
+   the system's <sys/stat.h> here, so that orig_stat doesn't recurse to
+   rpl_stat.  */
+#define __need_system_sys_stat_h
+#include <config.h>
+
+/* Get the original definition of stat.  It might be defined as a macro.  */
+#include <sys/types.h>
+#include <sys/stat.h>
+#undef __need_system_sys_stat_h
+
+#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+# define WINDOWS_NATIVE
+#endif
+
+#if !defined WINDOWS_NATIVE
+
+static int
+orig_stat (const char *filename, struct stat *buf)
+{
+  return stat (filename, buf);
+}
+
+#endif
+
+/* Specification.  */
+/* Write "sys/stat.h" here, not <sys/stat.h>, otherwise OSF/1 5.1 DTK cc
+   eliminates this include because of the preliminary #include <sys/stat.h>
+   above.  */
+#include "sys/stat.h"
+
+#include <errno.h>
+#include <limits.h>
+#include <stdbool.h>
+#include <string.h>
+#include "filename.h"
+#include "malloca.h"
+#include "verify.h"
+
+#ifdef WINDOWS_NATIVE
+# define WIN32_LEAN_AND_MEAN
+# include <windows.h>
+# include "stat-w32.h"
+#endif
+
+#ifdef WINDOWS_NATIVE
+/* Return TRUE if the given file name denotes an UNC root.  */
+static BOOL
+is_unc_root (const char *rname)
+{
+  /* Test whether it has the syntax '\\server\share'.  */
+  if (ISSLASH (rname[0]) && ISSLASH (rname[1]))
+    {
+      /* It starts with two slashes.  Find the next slash.  */
+      const char *p = rname + 2;
+      const char *q = p;
+      while (*q != '\0' && !ISSLASH (*q))
+        q++;
+      if (q > p && *q != '\0')
+        {
+          /* Found the next slash at q.  */
+          q++;
+          const char *r = q;
+          while (*r != '\0' && !ISSLASH (*r))
+            r++;
+          if (r > q && *r == '\0')
+            return TRUE;
+        }
+    }
+  return FALSE;
+}
+#endif
+
+/* Store information about NAME into ST.  Work around bugs with
+   trailing slashes.  Mingw has other bugs (such as st_ino always
+   being 0 on success) which this wrapper does not work around.  But
+   at least this implementation provides the ability to emulate fchdir
+   correctly.  */
+
+int
+rpl_stat (char const *name, struct stat *buf)
+{
+#ifdef WINDOWS_NATIVE
+  /* Fill the fields ourselves, because the original stat function returns
+     values for st_atime, st_mtime, st_ctime that depend on the current time
+     zone.  See
+     <https://lists.gnu.org/archive/html/bug-gnulib/2017-04/msg00134.html>  */
+  /* XXX Should we convert to wchar_t* and prepend '\\?\', in order to work
+     around length limitations
+     <https://msdn.microsoft.com/en-us/library/aa365247.aspx> ?  */
+
+  /* POSIX <http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap04.html#tag_04_13>
+     specifies: "More than two leading <slash> characters shall be treated as
+     a single <slash> character."  */
+  if (ISSLASH (name[0]) && ISSLASH (name[1]) && ISSLASH (name[2]))
+    {
+      name += 2;
+      while (ISSLASH (name[1]))
+        name++;
+    }
+
+  size_t len = strlen (name);
+  size_t drive_prefix_len = (HAS_DEVICE (name) ? 2 : 0);
+
+  /* Remove trailing slashes (except the very first one, at position
+     drive_prefix_len), but remember their presence.  */
+  size_t rlen;
+  bool check_dir = false;
+
+  rlen = len;
+  while (rlen > drive_prefix_len && ISSLASH (name[rlen-1]))
+    {
+      check_dir = true;
+      if (rlen == drive_prefix_len + 1)
+        break;
+      rlen--;
+    }
+
+  /* Handle '' and 'C:'.  */
+  if (!check_dir && rlen == drive_prefix_len)
+    {
+      errno = ENOENT;
+      return -1;
+    }
+
+  /* Handle '\\'.  */
+  if (rlen == 1 && ISSLASH (name[0]) && len >= 2)
+    {
+      errno = ENOENT;
+      return -1;
+    }
+
+  const char *rname;
+  char *malloca_rname;
+  if (rlen == len)
+    {
+      rname = name;
+      malloca_rname = NULL;
+    }
+  else
+    {
+      malloca_rname = malloca (rlen + 1);
+      if (malloca_rname == NULL)
+        {
+          errno = ENOMEM;
+          return -1;
+        }
+      memcpy (malloca_rname, name, rlen);
+      malloca_rname[rlen] = '\0';
+      rname = malloca_rname;
+    }
+
+  /* There are two ways to get at the requested information:
+       - by scanning the parent directory and examining the relevant
+         directory entry,
+       - by opening the file directly.
+     The first approach fails for root directories (e.g. 'C:\') and
+     UNC root directories (e.g. '\\server\share').
+     The second approach fails for some system files (e.g. 'C:\pagefile.sys'
+     and 'C:\hiberfil.sys'): ERROR_SHARING_VIOLATION.
+     The second approach gives more information (in particular, correct
+     st_dev, st_ino, st_nlink fields).
+     So we use the second approach and, as a fallback except for root and
+     UNC root directories, also the first approach.  */
+  {
+    int ret;
+
+    {
+      /* Approach based on the file.  */
+
+      /* Open a handle to the file.
+         CreateFile
+         <https://msdn.microsoft.com/en-us/library/aa363858.aspx>
+         <https://msdn.microsoft.com/en-us/library/aa363874.aspx>  */
+      HANDLE h =
+        CreateFile (rname,
+                    FILE_READ_ATTRIBUTES,
+                    FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
+                    NULL,
+                    OPEN_EXISTING,
+                    /* FILE_FLAG_POSIX_SEMANTICS (treat file names that differ only
+                       in case as different) makes sense only when applied to *all*
+                       filesystem operations.  */
+                    FILE_FLAG_BACKUP_SEMANTICS /* | FILE_FLAG_POSIX_SEMANTICS */,
+                    NULL);
+      if (h != INVALID_HANDLE_VALUE)
+        {
+          ret = _gl_fstat_by_handle (h, rname, buf);
+          CloseHandle (h);
+          goto done;
+        }
+    }
+
+    /* Test for root and UNC root directories.  */
+    if ((rlen == drive_prefix_len + 1 && ISSLASH (rname[drive_prefix_len]))
+        || is_unc_root (rname))
+      goto failed;
+
+    /* Fallback.  */
+    {
+      /* Approach based on the directory entry.  */
+
+      if (strchr (rname, '?') != NULL || strchr (rname, '*') != NULL)
+        {
+          /* Other Windows API functions would fail with error
+             ERROR_INVALID_NAME.  */
+          if (malloca_rname != NULL)
+            freea (malloca_rname);
+          errno = ENOENT;
+          return -1;
+        }
+
+      /* Get the details about the directory entry.  This can be done through
+         FindFirstFile
+         <https://msdn.microsoft.com/en-us/library/aa364418.aspx>
+         <https://msdn.microsoft.com/en-us/library/aa365740.aspx>
+         or through
+         FindFirstFileEx with argument FindExInfoBasic
+         <https://msdn.microsoft.com/en-us/library/aa364419.aspx>
+         <https://msdn.microsoft.com/en-us/library/aa364415.aspx>
+         <https://msdn.microsoft.com/en-us/library/aa365740.aspx>  */
+      WIN32_FIND_DATA info;
+      HANDLE h = FindFirstFile (rname, &info);
+      if (h == INVALID_HANDLE_VALUE)
+        goto failed;
+
+      /* Test for error conditions before starting to fill *buf.  */
+      if (sizeof (buf->st_size) <= 4 && info.nFileSizeHigh > 0)
+        {
+          FindClose (h);
+          if (malloca_rname != NULL)
+            freea (malloca_rname);
+          errno = EOVERFLOW;
+          return -1;
+        }
+
+# if _GL_WINDOWS_STAT_INODES
+      buf->st_dev = 0;
+#  if _GL_WINDOWS_STAT_INODES == 2
+      buf->st_ino._gl_ino[0] = buf->st_ino._gl_ino[1] = 0;
+#  else /* _GL_WINDOWS_STAT_INODES == 1 */
+      buf->st_ino = 0;
+#  endif
+# else
+      /* st_ino is not wide enough for identifying a file on a device.
+         Without st_ino, st_dev is pointless.  */
+      buf->st_dev = 0;
+      buf->st_ino = 0;
+# endif
+
+      /* st_mode.  */
+      unsigned int mode =
+        /* XXX How to handle FILE_ATTRIBUTE_REPARSE_POINT ?  */
+        ((info.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) ? _S_IFDIR | S_IEXEC_UGO : _S_IFREG)
+        | S_IREAD_UGO
+        | ((info.dwFileAttributes & FILE_ATTRIBUTE_READONLY) ? 0 : S_IWRITE_UGO);
+      if (!(info.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY))
+        {
+          /* Determine whether the file is executable by looking at the file
+             name suffix.  */
+          if (info.nFileSizeHigh > 0 || info.nFileSizeLow > 0)
+            {
+              const char *last_dot = NULL;
+              const char *p;
+              for (p = info.cFileName; *p != '\0'; p++)
+                if (*p == '.')
+                  last_dot = p;
+              if (last_dot != NULL)
+                {
+                  const char *suffix = last_dot + 1;
+                  if (_stricmp (suffix, "exe") == 0
+                      || _stricmp (suffix, "bat") == 0
+                      || _stricmp (suffix, "cmd") == 0
+                      || _stricmp (suffix, "com") == 0)
+                    mode |= S_IEXEC_UGO;
+                }
+            }
+        }
+      buf->st_mode = mode;
+
+      /* st_nlink.  Ignore hard links here.  */
+      buf->st_nlink = 1;
+
+      /* There's no easy way to map the Windows SID concept to an integer.  */
+      buf->st_uid = 0;
+      buf->st_gid = 0;
+
+      /* st_rdev is irrelevant for normal files and directories.  */
+      buf->st_rdev = 0;
+
+      /* st_size.  */
+      if (sizeof (buf->st_size) <= 4)
+        /* Range check already done above.  */
+        buf->st_size = info.nFileSizeLow;
+      else
+        buf->st_size = ((long long) info.nFileSizeHigh << 32) | (long long) info.nFileSizeLow;
+
+      /* st_atime, st_mtime, st_ctime.  */
+# if _GL_WINDOWS_STAT_TIMESPEC
+      buf->st_atim = _gl_convert_FILETIME_to_timespec (&info.ftLastAccessTime);
+      buf->st_mtim = _gl_convert_FILETIME_to_timespec (&info.ftLastWriteTime);
+      buf->st_ctim = _gl_convert_FILETIME_to_timespec (&info.ftCreationTime);
+# else
+      buf->st_atime = _gl_convert_FILETIME_to_POSIX (&info.ftLastAccessTime);
+      buf->st_mtime = _gl_convert_FILETIME_to_POSIX (&info.ftLastWriteTime);
+      buf->st_ctime = _gl_convert_FILETIME_to_POSIX (&info.ftCreationTime);
+# endif
+
+      FindClose (h);
+
+      ret = 0;
+    }
+
+   done:
+    if (ret >= 0 && check_dir && !S_ISDIR (buf->st_mode))
+      {
+        errno = ENOTDIR;
+        ret = -1;
+      }
+    if (malloca_rname != NULL)
+      {
+        int saved_errno = errno;
+        freea (malloca_rname);
+        errno = saved_errno;
+      }
+    return ret;
+  }
+
+ failed:
+  {
+    DWORD error = GetLastError ();
+    #if 0
+    fprintf (stderr, "rpl_stat error 0x%x\n", (unsigned int) error);
+    #endif
+
+    if (malloca_rname != NULL)
+      freea (malloca_rname);
+
+    switch (error)
+      {
+      /* Some of these errors probably cannot happen with the specific flags
+         that we pass to CreateFile.  But who knows...  */
+      case ERROR_FILE_NOT_FOUND: /* The last component of rname does not exist.  */
+      case ERROR_PATH_NOT_FOUND: /* Some directory component in rname does not exist.  */
+      case ERROR_BAD_PATHNAME:   /* rname is such as '\\server'.  */
+      case ERROR_BAD_NET_NAME:   /* rname is such as '\\server\nonexistentshare'.  */
+      case ERROR_INVALID_NAME:   /* rname contains wildcards, misplaced colon, etc.  */
+      case ERROR_DIRECTORY:
+        errno = ENOENT;
+        break;
+
+      case ERROR_ACCESS_DENIED:  /* rname is such as 'C:\System Volume Information\foo'.  */
+      case ERROR_SHARING_VIOLATION: /* rname is such as 'C:\pagefile.sys' (second approach only).  */
+                                    /* XXX map to EACCESS or EPERM? */
+        errno = EACCES;
+        break;
+
+      case ERROR_OUTOFMEMORY:
+        errno = ENOMEM;
+        break;
+
+      case ERROR_WRITE_PROTECT:
+        errno = EROFS;
+        break;
+
+      case ERROR_WRITE_FAULT:
+      case ERROR_READ_FAULT:
+      case ERROR_GEN_FAILURE:
+        errno = EIO;
+        break;
+
+      case ERROR_BUFFER_OVERFLOW:
+      case ERROR_FILENAME_EXCED_RANGE:
+        errno = ENAMETOOLONG;
+        break;
+
+      case ERROR_DELETE_PENDING: /* XXX map to EACCESS or EPERM? */
+        errno = EPERM;
+        break;
+
+      default:
+        errno = EINVAL;
+        break;
+      }
+
+    return -1;
+  }
+#else
+  int result = orig_stat (name, buf);
+# if REPLACE_FUNC_STAT_FILE
+  /* Solaris 9 mistakenly succeeds when given a non-directory with a
+     trailing slash.  */
+  if (result == 0 && !S_ISDIR (buf->st_mode))
+    {
+      size_t len = strlen (name);
+      if (ISSLASH (name[len - 1]))
+        {
+          errno = ENOTDIR;
+          return -1;
+        }
+    }
+# endif /* REPLACE_FUNC_STAT_FILE */
+  return result;
+#endif
+}
diff --git a/gl/stdbool.in.h b/gl/stdbool.in.h
new file mode 100644
index 0000000..301df94
--- /dev/null
+++ b/gl/stdbool.in.h
@@ -0,0 +1,132 @@
+/* Copyright (C) 2001-2003, 2006-2017 Free Software Foundation, Inc.
+   Written by Bruno Haible <haible@clisp.cons.org>, 2001.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
+
+#ifndef _GL_STDBOOL_H
+#define _GL_STDBOOL_H
+
+/* ISO C 99 <stdbool.h> for platforms that lack it.  */
+
+/* Usage suggestions:
+
+   Programs that use <stdbool.h> should be aware of some limitations
+   and standards compliance issues.
+
+   Standards compliance:
+
+       - <stdbool.h> must be #included before 'bool', 'false', 'true'
+         can be used.
+
+       - You cannot assume that sizeof (bool) == 1.
+
+       - Programs should not undefine the macros bool, true, and false,
+         as C99 lists that as an "obsolescent feature".
+
+   Limitations of this substitute, when used in a C89 environment:
+
+       - <stdbool.h> must be #included before the '_Bool' type can be used.
+
+       - You cannot assume that _Bool is a typedef; it might be a macro.
+
+       - Bit-fields of type 'bool' are not supported.  Portable code
+         should use 'unsigned int foo : 1;' rather than 'bool foo : 1;'.
+
+       - In C99, casts and automatic conversions to '_Bool' or 'bool' are
+         performed in such a way that every nonzero value gets converted
+         to 'true', and zero gets converted to 'false'.  This doesn't work
+         with this substitute.  With this substitute, only the values 0 and 1
+         give the expected result when converted to _Bool' or 'bool'.
+
+       - C99 allows the use of (_Bool)0.0 in constant expressions, but
+         this substitute cannot always provide this property.
+
+   Also, it is suggested that programs use 'bool' rather than '_Bool';
+   this isn't required, but 'bool' is more common.  */
+
+
+/* 7.16. Boolean type and values */
+
+/* BeOS <sys/socket.h> already #defines false 0, true 1.  We use the same
+   definitions below, but temporarily we have to #undef them.  */
+#if defined __BEOS__ && !defined __HAIKU__
+# include <OS.h> /* defines bool but not _Bool */
+# undef false
+# undef true
+#endif
+
+#ifdef __cplusplus
+# define _Bool bool
+# define bool bool
+#else
+# if defined __BEOS__ && !defined __HAIKU__
+  /* A compiler known to have 'bool'.  */
+  /* If the compiler already has both 'bool' and '_Bool', we can assume they
+     are the same types.  */
+#  if !@HAVE__BOOL@
+typedef bool _Bool;
+#  endif
+# else
+#  if !defined __GNUC__
+   /* If @HAVE__BOOL@:
+        Some HP-UX cc and AIX IBM C compiler versions have compiler bugs when
+        the built-in _Bool type is used.  See
+          http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
+          http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
+          http://lists.gnu.org/archive/html/bug-coreutils/2005-10/msg00086.html
+        Similar bugs are likely with other compilers as well; this file
+        wouldn't be used if <stdbool.h> was working.
+        So we override the _Bool type.
+      If !@HAVE__BOOL@:
+        Need to define _Bool ourselves. As 'signed char' or as an enum type?
+        Use of a typedef, with SunPRO C, leads to a stupid
+          "warning: _Bool is a keyword in ISO C99".
+        Use of an enum type, with IRIX cc, leads to a stupid
+          "warning(1185): enumerated type mixed with another type".
+        Even the existence of an enum type, without a typedef,
+          "Invalid enumerator. (badenum)" with HP-UX cc on Tru64.
+        The only benefit of the enum, debuggability, is not important
+        with these compilers.  So use 'signed char' and no enum.  */
+#   define _Bool signed char
+#  else
+   /* With this compiler, trust the _Bool type if the compiler has it.  */
+#   if !@HAVE__BOOL@
+   /* For the sake of symbolic names in gdb, define true and false as
+      enum constants, not only as macros.
+      It is tempting to write
+         typedef enum { false = 0, true = 1 } _Bool;
+      so that gdb prints values of type 'bool' symbolically.  But then
+      values of type '_Bool' might promote to 'int' or 'unsigned int'
+      (see ISO C 99 6.7.2.2.(4)); however, '_Bool' must promote to 'int'
+      (see ISO C 99 6.3.1.1.(2)).  So add a negative value to the
+      enum; this ensures that '_Bool' promotes to 'int'.  */
+typedef enum { _Bool_must_promote_to_int = -1, false = 0, true = 1 } _Bool;
+#   endif
+#  endif
+# endif
+# define bool _Bool
+#endif
+
+/* The other macros must be usable in preprocessor directives.  */
+#ifdef __cplusplus
+# define false false
+# define true true
+#else
+# define false 0
+# define true 1
+#endif
+
+#define __bool_true_false_are_defined 1
+
+#endif /* _GL_STDBOOL_H */
diff --git a/gl/stddef.in.h b/gl/stddef.in.h
new file mode 100644
index 0000000..7b0ce95
--- /dev/null
+++ b/gl/stddef.in.h
@@ -0,0 +1,110 @@
+/* A substitute for POSIX 2008 <stddef.h>, for platforms that have issues.
+
+   Copyright (C) 2009-2017 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
+
+/* Written by Eric Blake.  */
+
+/*
+ * POSIX 2008 <stddef.h> for platforms that have issues.
+ * <http://www.opengroup.org/susv3xbd/stddef.h.html>
+ */
+
+#if __GNUC__ >= 3
+@PRAGMA_SYSTEM_HEADER@
+#endif
+@PRAGMA_COLUMNS@
+
+#if defined __need_wchar_t || defined __need_size_t  \
+  || defined __need_ptrdiff_t || defined __need_NULL \
+  || defined __need_wint_t
+/* Special invocation convention inside gcc header files.  In
+   particular, gcc provides a version of <stddef.h> that blindly
+   redefines NULL even when __need_wint_t was defined, even though
+   wint_t is not normally provided by <stddef.h>.  Hence, we must
+   remember if special invocation has ever been used to obtain wint_t,
+   in which case we need to clean up NULL yet again.  */
+
+# if !(defined _@GUARD_PREFIX@_STDDEF_H && defined _GL_STDDEF_WINT_T)
+#  ifdef __need_wint_t
+#   define _GL_STDDEF_WINT_T
+#  endif
+#  @INCLUDE_NEXT@ @NEXT_STDDEF_H@
+# endif
+
+#else
+/* Normal invocation convention.  */
+
+# ifndef _@GUARD_PREFIX@_STDDEF_H
+
+/* The include_next requires a split double-inclusion guard.  */
+
+#  @INCLUDE_NEXT@ @NEXT_STDDEF_H@
+
+/* On NetBSD 5.0, the definition of NULL lacks proper parentheses.  */
+#  if (@REPLACE_NULL@ \
+       && (!defined _@GUARD_PREFIX@_STDDEF_H || defined _GL_STDDEF_WINT_T))
+#   undef NULL
+#   ifdef __cplusplus
+   /* ISO C++ says that the macro NULL must expand to an integer constant
+      expression, hence '((void *) 0)' is not allowed in C++.  */
+#    if __GNUG__ >= 3
+    /* GNU C++ has a __null macro that behaves like an integer ('int' or
+       'long') but has the same size as a pointer.  Use that, to avoid
+       warnings.  */
+#     define NULL __null
+#    else
+#     define NULL 0L
+#    endif
+#   else
+#    define NULL ((void *) 0)
+#   endif
+#  endif
+
+#  ifndef _@GUARD_PREFIX@_STDDEF_H
+#   define _@GUARD_PREFIX@_STDDEF_H
+
+/* Some platforms lack wchar_t.  */
+#if !@HAVE_WCHAR_T@
+# define wchar_t int
+#endif
+
+/* Some platforms lack max_align_t.  The check for _GCC_MAX_ALIGN_T is
+   a hack in case the configure-time test was done with g++ even though
+   we are currently compiling with gcc.  */
+#if ! (@HAVE_MAX_ALIGN_T@ || defined _GCC_MAX_ALIGN_T)
+/* On the x86, the maximum storage alignment of double, long, etc. is 4,
+   but GCC's C11 ABI for x86 says that max_align_t has an alignment of 8,
+   and the C11 standard allows this.  Work around this problem by
+   using __alignof__ (which returns 8 for double) rather than _Alignof
+   (which returns 4), and align each union member accordingly.  */
+# ifdef __GNUC__
+#  define _GL_STDDEF_ALIGNAS(type) \
+     __attribute__ ((__aligned__ (__alignof__ (type))))
+# else
+#  define _GL_STDDEF_ALIGNAS(type) /* */
+# endif
+typedef union
+{
+  char *__p _GL_STDDEF_ALIGNAS (char *);
+  double __d _GL_STDDEF_ALIGNAS (double);
+  long double __ld _GL_STDDEF_ALIGNAS (long double);
+  long int __i _GL_STDDEF_ALIGNAS (long int);
+} max_align_t;
+#endif
+
+#  endif /* _@GUARD_PREFIX@_STDDEF_H */
+# endif /* _@GUARD_PREFIX@_STDDEF_H */
+#endif /* __need_XXX */
diff --git a/gl/stdint.in.h b/gl/stdint.in.h
new file mode 100644
index 0000000..cbe6694
--- /dev/null
+++ b/gl/stdint.in.h
@@ -0,0 +1,726 @@
+/* Copyright (C) 2001-2002, 2004-2017 Free Software Foundation, Inc.
+   Written by Paul Eggert, Bruno Haible, Sam Steingold, Peter Burwood.
+   This file is part of gnulib.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
+
+/*
+ * ISO C 99 <stdint.h> for platforms that lack it.
+ * <http://www.opengroup.org/susv3xbd/stdint.h.html>
+ */
+
+#ifndef _@GUARD_PREFIX@_STDINT_H
+
+#if __GNUC__ >= 3
+@PRAGMA_SYSTEM_HEADER@
+#endif
+@PRAGMA_COLUMNS@
+
+/* When including a system file that in turn includes <inttypes.h>,
+   use the system <inttypes.h>, not our substitute.  This avoids
+   problems with (for example) VMS, whose <sys/bitypes.h> includes
+   <inttypes.h>.  */
+#define _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H
+
+/* On Android (Bionic libc), <sys/types.h> includes this file before
+   having defined 'time_t'.  Therefore in this case avoid including
+   other system header files; just include the system's <stdint.h>.
+   Ideally we should test __BIONIC__ here, but it is only defined after
+   <sys/cdefs.h> has been included; hence test __ANDROID__ instead.  */
+#if defined __ANDROID__ && defined _GL_INCLUDING_SYS_TYPES_H
+# @INCLUDE_NEXT@ @NEXT_STDINT_H@
+#else
+
+/* Get those types that are already defined in other system include
+   files, so that we can "#define int8_t signed char" below without
+   worrying about a later system include file containing a "typedef
+   signed char int8_t;" that will get messed up by our macro.  Our
+   macros should all be consistent with the system versions, except
+   for the "fast" types and macros, which we recommend against using
+   in public interfaces due to compiler differences.  */
+
+#if @HAVE_STDINT_H@
+# if defined __sgi && ! defined __c99
+   /* Bypass IRIX's <stdint.h> if in C89 mode, since it merely annoys users
+      with "This header file is to be used only for c99 mode compilations"
+      diagnostics.  */
+#  define __STDINT_H__
+# endif
+
+  /* Some pre-C++11 <stdint.h> implementations need this.  */
+# ifdef __cplusplus
+#  ifndef __STDC_CONSTANT_MACROS
+#   define __STDC_CONSTANT_MACROS 1
+#  endif
+#  ifndef __STDC_LIMIT_MACROS
+#   define __STDC_LIMIT_MACROS 1
+#  endif
+# endif
+
+  /* Other systems may have an incomplete or buggy <stdint.h>.
+     Include it before <inttypes.h>, since any "#include <stdint.h>"
+     in <inttypes.h> would reinclude us, skipping our contents because
+     _@GUARD_PREFIX@_STDINT_H is defined.
+     The include_next requires a split double-inclusion guard.  */
+# @INCLUDE_NEXT@ @NEXT_STDINT_H@
+#endif
+
+#if ! defined _@GUARD_PREFIX@_STDINT_H && ! defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H
+#define _@GUARD_PREFIX@_STDINT_H
+
+/* Get SCHAR_MIN, SCHAR_MAX, UCHAR_MAX, INT_MIN, INT_MAX,
+   LONG_MIN, LONG_MAX, ULONG_MAX, _GL_INTEGER_WIDTH.  */
+#include <limits.h>
+
+/* Override WINT_MIN and WINT_MAX if gnulib's <wchar.h> or <wctype.h> overrides
+   wint_t.  */
+#if @GNULIB_OVERRIDES_WINT_T@
+# undef WINT_MIN
+# undef WINT_MAX
+# define WINT_MIN 0x0U
+# define WINT_MAX 0xffffffffU
+#endif
+
+#if ! @HAVE_C99_STDINT_H@
+
+/* <sys/types.h> defines some of the stdint.h types as well, on glibc,
+   IRIX 6.5, and OpenBSD 3.8 (via <machine/types.h>).
+   AIX 5.2 <sys/types.h> isn't needed and causes troubles.
+   Mac OS X 10.4.6 <sys/types.h> includes <stdint.h> (which is us), but
+   relies on the system <stdint.h> definitions, so include
+   <sys/types.h> after @NEXT_STDINT_H@.  */
+# if @HAVE_SYS_TYPES_H@ && ! defined _AIX
+#  include <sys/types.h>
+# endif
+
+# if @HAVE_INTTYPES_H@
+  /* In OpenBSD 3.8, <inttypes.h> includes <machine/types.h>, which defines
+     int{8,16,32,64}_t, uint{8,16,32,64}_t and __BIT_TYPES_DEFINED__.
+     <inttypes.h> also defines intptr_t and uintptr_t.  */
+#  include <inttypes.h>
+# elif @HAVE_SYS_INTTYPES_H@
+  /* Solaris 7 <sys/inttypes.h> has the types except the *_fast*_t types, and
+     the macros except for *_FAST*_*, INTPTR_MIN, PTRDIFF_MIN, PTRDIFF_MAX.  */
+#  include <sys/inttypes.h>
+# endif
+
+# if @HAVE_SYS_BITYPES_H@ && ! defined __BIT_TYPES_DEFINED__
+  /* Linux libc4 >= 4.6.7 and libc5 have a <sys/bitypes.h> that defines
+     int{8,16,32,64}_t and __BIT_TYPES_DEFINED__.  In libc5 >= 5.2.2 it is
+     included by <sys/types.h>.  */
+#  include <sys/bitypes.h>
+# endif
+
+# undef _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H
+
+/* Minimum and maximum values for an integer type under the usual assumption.
+   Return an unspecified value if BITS == 0, adding a check to pacify
+   picky compilers.  */
+
+/* These are separate macros, because if you try to merge these macros into
+   a single one, HP-UX cc rejects the resulting expression in constant
+   expressions.  */
+# define _STDINT_UNSIGNED_MIN(bits, zero) \
+    (zero)
+# define _STDINT_SIGNED_MIN(bits, zero) \
+    (~ _STDINT_MAX (1, bits, zero))
+
+# define _STDINT_MAX(signed, bits, zero) \
+    (((((zero) + 1) << ((bits) ? (bits) - 1 - (signed) : 0)) - 1) * 2 + 1)
+
+#if !GNULIB_defined_stdint_types
+
+/* 7.18.1.1. Exact-width integer types */
+
+/* Here we assume a standard architecture where the hardware integer
+   types have 8, 16, 32, optionally 64 bits.  */
+
+# undef int8_t
+# undef uint8_t
+typedef signed char gl_int8_t;
+typedef unsigned char gl_uint8_t;
+# define int8_t gl_int8_t
+# define uint8_t gl_uint8_t
+
+# undef int16_t
+# undef uint16_t
+typedef short int gl_int16_t;
+typedef unsigned short int gl_uint16_t;
+# define int16_t gl_int16_t
+# define uint16_t gl_uint16_t
+
+# undef int32_t
+# undef uint32_t
+typedef int gl_int32_t;
+typedef unsigned int gl_uint32_t;
+# define int32_t gl_int32_t
+# define uint32_t gl_uint32_t
+
+/* If the system defines INT64_MAX, assume int64_t works.  That way,
+   if the underlying platform defines int64_t to be a 64-bit long long
+   int, the code below won't mistakenly define it to be a 64-bit long
+   int, which would mess up C++ name mangling.  We must use #ifdef
+   rather than #if, to avoid an error with HP-UX 10.20 cc.  */
+
+# ifdef INT64_MAX
+#  define GL_INT64_T
+# else
+/* Do not undefine int64_t if gnulib is not being used with 64-bit
+   types, since otherwise it breaks platforms like Tandem/NSK.  */
+#  if LONG_MAX >> 31 >> 31 == 1
+#   undef int64_t
+typedef long int gl_int64_t;
+#   define int64_t gl_int64_t
+#   define GL_INT64_T
+#  elif defined _MSC_VER
+#   undef int64_t
+typedef __int64 gl_int64_t;
+#   define int64_t gl_int64_t
+#   define GL_INT64_T
+#  elif @HAVE_LONG_LONG_INT@
+#   undef int64_t
+typedef long long int gl_int64_t;
+#   define int64_t gl_int64_t
+#   define GL_INT64_T
+#  endif
+# endif
+
+# ifdef UINT64_MAX
+#  define GL_UINT64_T
+# else
+#  if ULONG_MAX >> 31 >> 31 >> 1 == 1
+#   undef uint64_t
+typedef unsigned long int gl_uint64_t;
+#   define uint64_t gl_uint64_t
+#   define GL_UINT64_T
+#  elif defined _MSC_VER
+#   undef uint64_t
+typedef unsigned __int64 gl_uint64_t;
+#   define uint64_t gl_uint64_t
+#   define GL_UINT64_T
+#  elif @HAVE_UNSIGNED_LONG_LONG_INT@
+#   undef uint64_t
+typedef unsigned long long int gl_uint64_t;
+#   define uint64_t gl_uint64_t
+#   define GL_UINT64_T
+#  endif
+# endif
+
+/* Avoid collision with Solaris 2.5.1 <pthread.h> etc.  */
+# define _UINT8_T
+# define _UINT32_T
+# define _UINT64_T
+
+
+/* 7.18.1.2. Minimum-width integer types */
+
+/* Here we assume a standard architecture where the hardware integer
+   types have 8, 16, 32, optionally 64 bits. Therefore the leastN_t types
+   are the same as the corresponding N_t types.  */
+
+# undef int_least8_t
+# undef uint_least8_t
+# undef int_least16_t
+# undef uint_least16_t
+# undef int_least32_t
+# undef uint_least32_t
+# undef int_least64_t
+# undef uint_least64_t
+# define int_least8_t int8_t
+# define uint_least8_t uint8_t
+# define int_least16_t int16_t
+# define uint_least16_t uint16_t
+# define int_least32_t int32_t
+# define uint_least32_t uint32_t
+# ifdef GL_INT64_T
+#  define int_least64_t int64_t
+# endif
+# ifdef GL_UINT64_T
+#  define uint_least64_t uint64_t
+# endif
+
+/* 7.18.1.3. Fastest minimum-width integer types */
+
+/* Note: Other <stdint.h> substitutes may define these types differently.
+   It is not recommended to use these types in public header files. */
+
+/* Here we assume a standard architecture where the hardware integer
+   types have 8, 16, 32, optionally 64 bits. Therefore the fastN_t types
+   are taken from the same list of types.  The following code normally
+   uses types consistent with glibc, as that lessens the chance of
+   incompatibility with older GNU hosts.  */
+
+# undef int_fast8_t
+# undef uint_fast8_t
+# undef int_fast16_t
+# undef uint_fast16_t
+# undef int_fast32_t
+# undef uint_fast32_t
+# undef int_fast64_t
+# undef uint_fast64_t
+typedef signed char gl_int_fast8_t;
+typedef unsigned char gl_uint_fast8_t;
+
+# ifdef __sun
+/* Define types compatible with SunOS 5.10, so that code compiled under
+   earlier SunOS versions works with code compiled under SunOS 5.10.  */
+typedef int gl_int_fast32_t;
+typedef unsigned int gl_uint_fast32_t;
+# else
+typedef long int gl_int_fast32_t;
+typedef unsigned long int gl_uint_fast32_t;
+# endif
+typedef gl_int_fast32_t gl_int_fast16_t;
+typedef gl_uint_fast32_t gl_uint_fast16_t;
+
+# define int_fast8_t gl_int_fast8_t
+# define uint_fast8_t gl_uint_fast8_t
+# define int_fast16_t gl_int_fast16_t
+# define uint_fast16_t gl_uint_fast16_t
+# define int_fast32_t gl_int_fast32_t
+# define uint_fast32_t gl_uint_fast32_t
+# ifdef GL_INT64_T
+#  define int_fast64_t int64_t
+# endif
+# ifdef GL_UINT64_T
+#  define uint_fast64_t uint64_t
+# endif
+
+/* 7.18.1.4. Integer types capable of holding object pointers */
+
+/* kLIBC's stdint.h defines _INTPTR_T_DECLARED and needs its own
+   definitions of intptr_t and uintptr_t (which use int and unsigned)
+   to avoid clashes with declarations of system functions like sbrk.  */
+# ifndef _INTPTR_T_DECLARED
+# undef intptr_t
+# undef uintptr_t
+typedef long int gl_intptr_t;
+typedef unsigned long int gl_uintptr_t;
+# define intptr_t gl_intptr_t
+# define uintptr_t gl_uintptr_t
+# endif
+
+/* 7.18.1.5. Greatest-width integer types */
+
+/* Note: These types are compiler dependent. It may be unwise to use them in
+   public header files. */
+
+/* If the system defines INTMAX_MAX, assume that intmax_t works, and
+   similarly for UINTMAX_MAX and uintmax_t.  This avoids problems with
+   assuming one type where another is used by the system.  */
+
+# ifndef INTMAX_MAX
+#  undef INTMAX_C
+#  undef intmax_t
+#  if @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1
+typedef long long int gl_intmax_t;
+#   define intmax_t gl_intmax_t
+#  elif defined GL_INT64_T
+#   define intmax_t int64_t
+#  else
+typedef long int gl_intmax_t;
+#   define intmax_t gl_intmax_t
+#  endif
+# endif
+
+# ifndef UINTMAX_MAX
+#  undef UINTMAX_C
+#  undef uintmax_t
+#  if @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1
+typedef unsigned long long int gl_uintmax_t;
+#   define uintmax_t gl_uintmax_t
+#  elif defined GL_UINT64_T
+#   define uintmax_t uint64_t
+#  else
+typedef unsigned long int gl_uintmax_t;
+#   define uintmax_t gl_uintmax_t
+#  endif
+# endif
+
+/* Verify that intmax_t and uintmax_t have the same size.  Too much code
+   breaks if this is not the case.  If this check fails, the reason is likely
+   to be found in the autoconf macros.  */
+typedef int _verify_intmax_size[sizeof (intmax_t) == sizeof (uintmax_t)
+                                ? 1 : -1];
+
+# define GNULIB_defined_stdint_types 1
+# endif /* !GNULIB_defined_stdint_types */
+
+/* 7.18.2. Limits of specified-width integer types */
+
+/* 7.18.2.1. Limits of exact-width integer types */
+
+/* Here we assume a standard architecture where the hardware integer
+   types have 8, 16, 32, optionally 64 bits.  */
+
+# undef INT8_MIN
+# undef INT8_MAX
+# undef UINT8_MAX
+# define INT8_MIN  (~ INT8_MAX)
+# define INT8_MAX  127
+# define UINT8_MAX  255
+
+# undef INT16_MIN
+# undef INT16_MAX
+# undef UINT16_MAX
+# define INT16_MIN  (~ INT16_MAX)
+# define INT16_MAX  32767
+# define UINT16_MAX  65535
+
+# undef INT32_MIN
+# undef INT32_MAX
+# undef UINT32_MAX
+# define INT32_MIN  (~ INT32_MAX)
+# define INT32_MAX  2147483647
+# define UINT32_MAX  4294967295U
+
+# if defined GL_INT64_T && ! defined INT64_MAX
+/* Prefer (- INTMAX_C (1) << 63) over (~ INT64_MAX) because SunPRO C 5.0
+   evaluates the latter incorrectly in preprocessor expressions.  */
+#  define INT64_MIN  (- INTMAX_C (1) << 63)
+#  define INT64_MAX  INTMAX_C (9223372036854775807)
+# endif
+
+# if defined GL_UINT64_T && ! defined UINT64_MAX
+#  define UINT64_MAX  UINTMAX_C (18446744073709551615)
+# endif
+
+/* 7.18.2.2. Limits of minimum-width integer types */
+
+/* Here we assume a standard architecture where the hardware integer
+   types have 8, 16, 32, optionally 64 bits. Therefore the leastN_t types
+   are the same as the corresponding N_t types.  */
+
+# undef INT_LEAST8_MIN
+# undef INT_LEAST8_MAX
+# undef UINT_LEAST8_MAX
+# define INT_LEAST8_MIN  INT8_MIN
+# define INT_LEAST8_MAX  INT8_MAX
+# define UINT_LEAST8_MAX  UINT8_MAX
+
+# undef INT_LEAST16_MIN
+# undef INT_LEAST16_MAX
+# undef UINT_LEAST16_MAX
+# define INT_LEAST16_MIN  INT16_MIN
+# define INT_LEAST16_MAX  INT16_MAX
+# define UINT_LEAST16_MAX  UINT16_MAX
+
+# undef INT_LEAST32_MIN
+# undef INT_LEAST32_MAX
+# undef UINT_LEAST32_MAX
+# define INT_LEAST32_MIN  INT32_MIN
+# define INT_LEAST32_MAX  INT32_MAX
+# define UINT_LEAST32_MAX  UINT32_MAX
+
+# undef INT_LEAST64_MIN
+# undef INT_LEAST64_MAX
+# ifdef GL_INT64_T
+#  define INT_LEAST64_MIN  INT64_MIN
+#  define INT_LEAST64_MAX  INT64_MAX
+# endif
+
+# undef UINT_LEAST64_MAX
+# ifdef GL_UINT64_T
+#  define UINT_LEAST64_MAX  UINT64_MAX
+# endif
+
+/* 7.18.2.3. Limits of fastest minimum-width integer types */
+
+/* Here we assume a standard architecture where the hardware integer
+   types have 8, 16, 32, optionally 64 bits. Therefore the fastN_t types
+   are taken from the same list of types.  */
+
+# undef INT_FAST8_MIN
+# undef INT_FAST8_MAX
+# undef UINT_FAST8_MAX
+# define INT_FAST8_MIN  SCHAR_MIN
+# define INT_FAST8_MAX  SCHAR_MAX
+# define UINT_FAST8_MAX  UCHAR_MAX
+
+# undef INT_FAST16_MIN
+# undef INT_FAST16_MAX
+# undef UINT_FAST16_MAX
+# define INT_FAST16_MIN  INT_FAST32_MIN
+# define INT_FAST16_MAX  INT_FAST32_MAX
+# define UINT_FAST16_MAX  UINT_FAST32_MAX
+
+# undef INT_FAST32_MIN
+# undef INT_FAST32_MAX
+# undef UINT_FAST32_MAX
+# ifdef __sun
+#  define INT_FAST32_MIN  INT_MIN
+#  define INT_FAST32_MAX  INT_MAX
+#  define UINT_FAST32_MAX  UINT_MAX
+# else
+#  define INT_FAST32_MIN  LONG_MIN
+#  define INT_FAST32_MAX  LONG_MAX
+#  define UINT_FAST32_MAX  ULONG_MAX
+# endif
+
+# undef INT_FAST64_MIN
+# undef INT_FAST64_MAX
+# ifdef GL_INT64_T
+#  define INT_FAST64_MIN  INT64_MIN
+#  define INT_FAST64_MAX  INT64_MAX
+# endif
+
+# undef UINT_FAST64_MAX
+# ifdef GL_UINT64_T
+#  define UINT_FAST64_MAX  UINT64_MAX
+# endif
+
+/* 7.18.2.4. Limits of integer types capable of holding object pointers */
+
+# undef INTPTR_MIN
+# undef INTPTR_MAX
+# undef UINTPTR_MAX
+# define INTPTR_MIN  LONG_MIN
+# define INTPTR_MAX  LONG_MAX
+# define UINTPTR_MAX  ULONG_MAX
+
+/* 7.18.2.5. Limits of greatest-width integer types */
+
+# ifndef INTMAX_MAX
+#  undef INTMAX_MIN
+#  ifdef INT64_MAX
+#   define INTMAX_MIN  INT64_MIN
+#   define INTMAX_MAX  INT64_MAX
+#  else
+#   define INTMAX_MIN  INT32_MIN
+#   define INTMAX_MAX  INT32_MAX
+#  endif
+# endif
+
+# ifndef UINTMAX_MAX
+#  ifdef UINT64_MAX
+#   define UINTMAX_MAX  UINT64_MAX
+#  else
+#   define UINTMAX_MAX  UINT32_MAX
+#  endif
+# endif
+
+/* 7.18.3. Limits of other integer types */
+
+/* ptrdiff_t limits */
+# undef PTRDIFF_MIN
+# undef PTRDIFF_MAX
+# if @APPLE_UNIVERSAL_BUILD@
+#  ifdef _LP64
+#   define PTRDIFF_MIN  _STDINT_SIGNED_MIN (64, 0l)
+#   define PTRDIFF_MAX  _STDINT_MAX (1, 64, 0l)
+#  else
+#   define PTRDIFF_MIN  _STDINT_SIGNED_MIN (32, 0)
+#   define PTRDIFF_MAX  _STDINT_MAX (1, 32, 0)
+#  endif
+# else
+#  define PTRDIFF_MIN  \
+    _STDINT_SIGNED_MIN (@BITSIZEOF_PTRDIFF_T@, 0@PTRDIFF_T_SUFFIX@)
+#  define PTRDIFF_MAX  \
+    _STDINT_MAX (1, @BITSIZEOF_PTRDIFF_T@, 0@PTRDIFF_T_SUFFIX@)
+# endif
+
+/* sig_atomic_t limits */
+# undef SIG_ATOMIC_MIN
+# undef SIG_ATOMIC_MAX
+# if @HAVE_SIGNED_SIG_ATOMIC_T@
+#  define SIG_ATOMIC_MIN  \
+    _STDINT_SIGNED_MIN (@BITSIZEOF_SIG_ATOMIC_T@, 0@SIG_ATOMIC_T_SUFFIX@)
+# else
+#  define SIG_ATOMIC_MIN  \
+    _STDINT_UNSIGNED_MIN (@BITSIZEOF_SIG_ATOMIC_T@, 0@SIG_ATOMIC_T_SUFFIX@)
+# endif
+# define SIG_ATOMIC_MAX  \
+   _STDINT_MAX (@HAVE_SIGNED_SIG_ATOMIC_T@, @BITSIZEOF_SIG_ATOMIC_T@, \
+                0@SIG_ATOMIC_T_SUFFIX@)
+
+
+/* size_t limit */
+# undef SIZE_MAX
+# if @APPLE_UNIVERSAL_BUILD@
+#  ifdef _LP64
+#   define SIZE_MAX  _STDINT_MAX (0, 64, 0ul)
+#  else
+#   define SIZE_MAX  _STDINT_MAX (0, 32, 0ul)
+#  endif
+# else
+#  define SIZE_MAX  _STDINT_MAX (0, @BITSIZEOF_SIZE_T@, 0@SIZE_T_SUFFIX@)
+# endif
+
+/* wchar_t limits */
+/* Get WCHAR_MIN, WCHAR_MAX.
+   This include is not on the top, above, because on OSF/1 4.0 we have a
+   sequence of nested includes
+   <wchar.h> -> <stdio.h> -> <getopt.h> -> <stdlib.h>, and the latter includes
+   <stdint.h> and assumes its types are already defined.  */
+# if @HAVE_WCHAR_H@ && ! (defined WCHAR_MIN && defined WCHAR_MAX)
+  /* 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>
+#  define _GL_JUST_INCLUDE_SYSTEM_WCHAR_H
+#  include <wchar.h>
+#  undef _GL_JUST_INCLUDE_SYSTEM_WCHAR_H
+# endif
+# undef WCHAR_MIN
+# undef WCHAR_MAX
+# if @HAVE_SIGNED_WCHAR_T@
+#  define WCHAR_MIN  \
+    _STDINT_SIGNED_MIN (@BITSIZEOF_WCHAR_T@, 0@WCHAR_T_SUFFIX@)
+# else
+#  define WCHAR_MIN  \
+    _STDINT_UNSIGNED_MIN (@BITSIZEOF_WCHAR_T@, 0@WCHAR_T_SUFFIX@)
+# endif
+# define WCHAR_MAX  \
+   _STDINT_MAX (@HAVE_SIGNED_WCHAR_T@, @BITSIZEOF_WCHAR_T@, 0@WCHAR_T_SUFFIX@)
+
+/* wint_t limits */
+# undef WINT_MIN
+# undef WINT_MAX
+# if @HAVE_SIGNED_WINT_T@
+#  define WINT_MIN  \
+    _STDINT_SIGNED_MIN (@BITSIZEOF_WINT_T@, 0@WINT_T_SUFFIX@)
+# else
+#  define WINT_MIN  \
+    _STDINT_UNSIGNED_MIN (@BITSIZEOF_WINT_T@, 0@WINT_T_SUFFIX@)
+# endif
+# define WINT_MAX  \
+   _STDINT_MAX (@HAVE_SIGNED_WINT_T@, @BITSIZEOF_WINT_T@, 0@WINT_T_SUFFIX@)
+
+/* 7.18.4. Macros for integer constants */
+
+/* 7.18.4.1. Macros for minimum-width integer constants */
+/* According to ISO C 99 Technical Corrigendum 1 */
+
+/* Here we assume a standard architecture where the hardware integer
+   types have 8, 16, 32, optionally 64 bits, and int is 32 bits.  */
+
+# undef INT8_C
+# undef UINT8_C
+# define INT8_C(x) x
+# define UINT8_C(x) x
+
+# undef INT16_C
+# undef UINT16_C
+# define INT16_C(x) x
+# define UINT16_C(x) x
+
+# undef INT32_C
+# undef UINT32_C
+# define INT32_C(x) x
+# define UINT32_C(x) x ## U
+
+# undef INT64_C
+# undef UINT64_C
+# if LONG_MAX >> 31 >> 31 == 1
+#  define INT64_C(x) x##L
+# elif defined _MSC_VER
+#  define INT64_C(x) x##i64
+# elif @HAVE_LONG_LONG_INT@
+#  define INT64_C(x) x##LL
+# endif
+# if ULONG_MAX >> 31 >> 31 >> 1 == 1
+#  define UINT64_C(x) x##UL
+# elif defined _MSC_VER
+#  define UINT64_C(x) x##ui64
+# elif @HAVE_UNSIGNED_LONG_LONG_INT@
+#  define UINT64_C(x) x##ULL
+# endif
+
+/* 7.18.4.2. Macros for greatest-width integer constants */
+
+# ifndef INTMAX_C
+#  if @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1
+#   define INTMAX_C(x)   x##LL
+#  elif defined GL_INT64_T
+#   define INTMAX_C(x)   INT64_C(x)
+#  else
+#   define INTMAX_C(x)   x##L
+#  endif
+# endif
+
+# ifndef UINTMAX_C
+#  if @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1
+#   define UINTMAX_C(x)  x##ULL
+#  elif defined GL_UINT64_T
+#   define UINTMAX_C(x)  UINT64_C(x)
+#  else
+#   define UINTMAX_C(x)  x##UL
+#  endif
+# endif
+
+#endif /* !@HAVE_C99_STDINT_H@ */
+
+/* Macros specified by ISO/IEC TS 18661-1:2014.  */
+
+#if (!defined UINTMAX_WIDTH \
+     && (defined _GNU_SOURCE || defined __STDC_WANT_IEC_60559_BFP_EXT__))
+# ifdef INT8_MAX
+#  define INT8_WIDTH _GL_INTEGER_WIDTH (INT8_MIN, INT8_MAX)
+# endif
+# ifdef UINT8_MAX
+#  define UINT8_WIDTH _GL_INTEGER_WIDTH (0, UINT8_MAX)
+# endif
+# ifdef INT16_MAX
+#  define INT16_WIDTH _GL_INTEGER_WIDTH (INT16_MIN, INT16_MAX)
+# endif
+# ifdef UINT16_MAX
+#  define UINT16_WIDTH _GL_INTEGER_WIDTH (0, UINT16_MAX)
+# endif
+# ifdef INT32_MAX
+#  define INT32_WIDTH _GL_INTEGER_WIDTH (INT32_MIN, INT32_MAX)
+# endif
+# ifdef UINT32_MAX
+#  define UINT32_WIDTH _GL_INTEGER_WIDTH (0, UINT32_MAX)
+# endif
+# ifdef INT64_MAX
+#  define INT64_WIDTH _GL_INTEGER_WIDTH (INT64_MIN, INT64_MAX)
+# endif
+# ifdef UINT64_MAX
+#  define UINT64_WIDTH _GL_INTEGER_WIDTH (0, UINT64_MAX)
+# endif
+# define INT_LEAST8_WIDTH _GL_INTEGER_WIDTH (INT_LEAST8_MIN, INT_LEAST8_MAX)
+# define UINT_LEAST8_WIDTH _GL_INTEGER_WIDTH (0, UINT_LEAST8_MAX)
+# define INT_LEAST16_WIDTH _GL_INTEGER_WIDTH (INT_LEAST16_MIN, INT_LEAST16_MAX)
+# define UINT_LEAST16_WIDTH _GL_INTEGER_WIDTH (0, UINT_LEAST16_MAX)
+# define INT_LEAST32_WIDTH _GL_INTEGER_WIDTH (INT_LEAST32_MIN, INT_LEAST32_MAX)
+# define UINT_LEAST32_WIDTH _GL_INTEGER_WIDTH (0, UINT_LEAST32_MAX)
+# define INT_LEAST64_WIDTH _GL_INTEGER_WIDTH (INT_LEAST64_MIN, INT_LEAST64_MAX)
+# define UINT_LEAST64_WIDTH _GL_INTEGER_WIDTH (0, UINT_LEAST64_MAX)
+# define INT_FAST8_WIDTH _GL_INTEGER_WIDTH (INT_FAST8_MIN, INT_FAST8_MAX)
+# define UINT_FAST8_WIDTH _GL_INTEGER_WIDTH (0, UINT_FAST8_MAX)
+# define INT_FAST16_WIDTH _GL_INTEGER_WIDTH (INT_FAST16_MIN, INT_FAST16_MAX)
+# define UINT_FAST16_WIDTH _GL_INTEGER_WIDTH (0, UINT_FAST16_MAX)
+# define INT_FAST32_WIDTH _GL_INTEGER_WIDTH (INT_FAST32_MIN, INT_FAST32_MAX)
+# define UINT_FAST32_WIDTH _GL_INTEGER_WIDTH (0, UINT_FAST32_MAX)
+# define INT_FAST64_WIDTH _GL_INTEGER_WIDTH (INT_FAST64_MIN, INT_FAST64_MAX)
+# define UINT_FAST64_WIDTH _GL_INTEGER_WIDTH (0, UINT_FAST64_MAX)
+# define INTPTR_WIDTH _GL_INTEGER_WIDTH (INTPTR_MIN, INTPTR_MAX)
+# define UINTPTR_WIDTH _GL_INTEGER_WIDTH (0, UINTPTR_MAX)
+# define INTMAX_WIDTH _GL_INTEGER_WIDTH (INTMAX_MIN, INTMAX_MAX)
+# define UINTMAX_WIDTH _GL_INTEGER_WIDTH (0, UINTMAX_MAX)
+# define PTRDIFF_WIDTH _GL_INTEGER_WIDTH (PTRDIFF_MIN, PTRDIFF_MAX)
+# define SIZE_WIDTH _GL_INTEGER_WIDTH (0, SIZE_MAX)
+# define WCHAR_WIDTH _GL_INTEGER_WIDTH (WCHAR_MIN, WCHAR_MAX)
+# ifdef WINT_MAX
+#  define WINT_WIDTH _GL_INTEGER_WIDTH (WINT_MIN, WINT_MAX)
+# endif
+# ifdef SIG_ATOMIC_MAX
+#  define SIG_ATOMIC_WIDTH _GL_INTEGER_WIDTH (SIG_ATOMIC_MIN, SIG_ATOMIC_MAX)
+# endif
+#endif /* !WINT_WIDTH && (_GNU_SOURCE || __STDC_WANT_IEC_60559_BFP_EXT__) */
+
+#endif /* _@GUARD_PREFIX@_STDINT_H */
+#endif /* !(defined __ANDROID__ && ...) */
+#endif /* !defined _@GUARD_PREFIX@_STDINT_H && !defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H */
diff --git a/gl/stdlib.in.h b/gl/stdlib.in.h
new file mode 100644
index 0000000..1b4d6f2
--- /dev/null
+++ b/gl/stdlib.in.h
@@ -0,0 +1,1009 @@
+/* A GNU-like <stdlib.h>.
+
+   Copyright (C) 1995, 2001-2004, 2006-2017 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#if __GNUC__ >= 3
+@PRAGMA_SYSTEM_HEADER@
+#endif
+@PRAGMA_COLUMNS@
+
+#if defined __need_system_stdlib_h || defined __need_malloc_and_calloc
+/* Special invocation conventions inside some gnulib header files,
+   and inside some glibc header files, respectively.  */
+
+#@INCLUDE_NEXT@ @NEXT_STDLIB_H@
+
+#else
+/* Normal invocation convention.  */
+
+#ifndef _@GUARD_PREFIX@_STDLIB_H
+
+/* The include_next requires a split double-inclusion guard.  */
+#@INCLUDE_NEXT@ @NEXT_STDLIB_H@
+
+#ifndef _@GUARD_PREFIX@_STDLIB_H
+#define _@GUARD_PREFIX@_STDLIB_H
+
+/* NetBSD 5.0 mis-defines NULL.  */
+#include <stddef.h>
+
+/* MirBSD 10 defines WEXITSTATUS in <sys/wait.h>, not in <stdlib.h>.  */
+#if @GNULIB_SYSTEM_POSIX@ && !defined WEXITSTATUS
+# include <sys/wait.h>
+#endif
+
+/* Solaris declares getloadavg() in <sys/loadavg.h>.  */
+#if (@GNULIB_GETLOADAVG@ || defined GNULIB_POSIXCHECK) && @HAVE_SYS_LOADAVG_H@
+# include <sys/loadavg.h>
+#endif
+
+/* Native Windows platforms declare mktemp() in <io.h>.  */
+#if 0 && ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)
+# include <io.h>
+#endif
+
+#if @GNULIB_RANDOM_R@
+
+/* OSF/1 5.1 declares 'struct random_data' in <random.h>, which is included
+   from <stdlib.h> if _REENTRANT is defined.  Include it whenever we need
+   'struct random_data'.  */
+# if @HAVE_RANDOM_H@
+#  include <random.h>
+# endif
+
+# if !@HAVE_STRUCT_RANDOM_DATA@ || @REPLACE_RANDOM_R@ || !@HAVE_RANDOM_R@
+#  include <stdint.h>
+# endif
+
+# if !@HAVE_STRUCT_RANDOM_DATA@
+/* Define 'struct random_data'.
+   But allow multiple gnulib generated <stdlib.h> replacements to coexist.  */
+#  if !GNULIB_defined_struct_random_data
+struct random_data
+{
+  int32_t *fptr;                /* Front pointer.  */
+  int32_t *rptr;                /* Rear pointer.  */
+  int32_t *state;               /* Array of state values.  */
+  int rand_type;                /* Type of random number generator.  */
+  int rand_deg;                 /* Degree of random number generator.  */
+  int rand_sep;                 /* Distance between front and rear.  */
+  int32_t *end_ptr;             /* Pointer behind state table.  */
+};
+#   define GNULIB_defined_struct_random_data 1
+#  endif
+# endif
+#endif
+
+#if (@GNULIB_MKSTEMP@ || @GNULIB_MKSTEMPS@ || @GNULIB_GETSUBOPT@ || defined GNULIB_POSIXCHECK) && ! defined __GLIBC__ && !((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)
+/* On Mac OS X 10.3, only <unistd.h> declares mkstemp.  */
+/* On Mac OS X 10.5, only <unistd.h> declares mkstemps.  */
+/* On Cygwin 1.7.1, only <unistd.h> declares getsubopt.  */
+/* But avoid namespace pollution on glibc systems and native Windows.  */
+# include <unistd.h>
+#endif
+
+/* The __attribute__ feature is available in gcc versions 2.5 and later.
+   The attribute __pure__ was added in gcc 2.96.  */
+#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
+# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__))
+#else
+# define _GL_ATTRIBUTE_PURE /* empty */
+#endif
+
+/* The definition of _Noreturn is copied here.  */
+
+/* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
+
+/* The definition of _GL_ARG_NONNULL is copied here.  */
+
+/* The definition of _GL_WARN_ON_USE is copied here.  */
+
+
+/* Some systems do not define EXIT_*, despite otherwise supporting C89.  */
+#ifndef EXIT_SUCCESS
+# define EXIT_SUCCESS 0
+#endif
+/* Tandem/NSK and other platforms that define EXIT_FAILURE as -1 interfere
+   with proper operation of xargs.  */
+#ifndef EXIT_FAILURE
+# define EXIT_FAILURE 1
+#elif EXIT_FAILURE != 1
+# undef EXIT_FAILURE
+# define EXIT_FAILURE 1
+#endif
+
+
+#if @GNULIB__EXIT@
+/* Terminate the current process with the given return code, without running
+   the 'atexit' handlers.  */
+# if !@HAVE__EXIT@
+_GL_FUNCDECL_SYS (_Exit, _Noreturn void, (int status));
+# endif
+_GL_CXXALIAS_SYS (_Exit, void, (int status));
+_GL_CXXALIASWARN (_Exit);
+#elif defined GNULIB_POSIXCHECK
+# undef _Exit
+# if HAVE_RAW_DECL__EXIT
+_GL_WARN_ON_USE (_Exit, "_Exit is unportable - "
+                 "use gnulib module _Exit for portability");
+# endif
+#endif
+
+
+#if @GNULIB_ATOLL@
+/* Parse a signed decimal integer.
+   Returns the value of the integer.  Errors are not detected.  */
+# if !@HAVE_ATOLL@
+_GL_FUNCDECL_SYS (atoll, long long, (const char *string)
+                                    _GL_ATTRIBUTE_PURE
+                                    _GL_ARG_NONNULL ((1)));
+# endif
+_GL_CXXALIAS_SYS (atoll, long long, (const char *string));
+_GL_CXXALIASWARN (atoll);
+#elif defined GNULIB_POSIXCHECK
+# undef atoll
+# if HAVE_RAW_DECL_ATOLL
+_GL_WARN_ON_USE (atoll, "atoll is unportable - "
+                 "use gnulib module atoll for portability");
+# endif
+#endif
+
+#if @GNULIB_CALLOC_POSIX@
+# if @REPLACE_CALLOC@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef calloc
+#   define calloc rpl_calloc
+#  endif
+_GL_FUNCDECL_RPL (calloc, void *, (size_t nmemb, size_t size));
+_GL_CXXALIAS_RPL (calloc, void *, (size_t nmemb, size_t size));
+# else
+_GL_CXXALIAS_SYS (calloc, void *, (size_t nmemb, size_t size));
+# endif
+_GL_CXXALIASWARN (calloc);
+#elif defined GNULIB_POSIXCHECK
+# undef calloc
+/* Assume calloc is always declared.  */
+_GL_WARN_ON_USE (calloc, "calloc is not POSIX compliant everywhere - "
+                 "use gnulib module calloc-posix for portability");
+#endif
+
+#if @GNULIB_CANONICALIZE_FILE_NAME@
+# if @REPLACE_CANONICALIZE_FILE_NAME@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   define canonicalize_file_name rpl_canonicalize_file_name
+#  endif
+_GL_FUNCDECL_RPL (canonicalize_file_name, char *, (const char *name)
+                                                  _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (canonicalize_file_name, char *, (const char *name));
+# else
+#  if !@HAVE_CANONICALIZE_FILE_NAME@
+_GL_FUNCDECL_SYS (canonicalize_file_name, char *, (const char *name)
+                                                  _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (canonicalize_file_name, char *, (const char *name));
+# endif
+_GL_CXXALIASWARN (canonicalize_file_name);
+#elif defined GNULIB_POSIXCHECK
+# undef canonicalize_file_name
+# if HAVE_RAW_DECL_CANONICALIZE_FILE_NAME
+_GL_WARN_ON_USE (canonicalize_file_name,
+                 "canonicalize_file_name is unportable - "
+                 "use gnulib module canonicalize-lgpl for portability");
+# endif
+#endif
+
+#if @GNULIB_GETLOADAVG@
+/* Store max(NELEM,3) load average numbers in LOADAVG[].
+   The three numbers are the load average of the last 1 minute, the last 5
+   minutes, and the last 15 minutes, respectively.
+   LOADAVG is an array of NELEM numbers.  */
+# if !@HAVE_DECL_GETLOADAVG@
+_GL_FUNCDECL_SYS (getloadavg, int, (double loadavg[], int nelem)
+                                   _GL_ARG_NONNULL ((1)));
+# endif
+_GL_CXXALIAS_SYS (getloadavg, int, (double loadavg[], int nelem));
+_GL_CXXALIASWARN (getloadavg);
+#elif defined GNULIB_POSIXCHECK
+# undef getloadavg
+# if HAVE_RAW_DECL_GETLOADAVG
+_GL_WARN_ON_USE (getloadavg, "getloadavg is not portable - "
+                 "use gnulib module getloadavg for portability");
+# endif
+#endif
+
+#if @GNULIB_GETSUBOPT@
+/* Assuming *OPTIONP is a comma separated list of elements of the form
+   "token" or "token=value", getsubopt parses the first of these elements.
+   If the first element refers to a "token" that is member of the given
+   NULL-terminated array of tokens:
+     - It replaces the comma with a NUL byte, updates *OPTIONP to point past
+       the first option and the comma, sets *VALUEP to the value of the
+       element (or NULL if it doesn't contain an "=" sign),
+     - It returns the index of the "token" in the given array of tokens.
+   Otherwise it returns -1, and *OPTIONP and *VALUEP are undefined.
+   For more details see the POSIX:2001 specification.
+   http://www.opengroup.org/susv3xsh/getsubopt.html */
+# if !@HAVE_GETSUBOPT@
+_GL_FUNCDECL_SYS (getsubopt, int,
+                  (char **optionp, char *const *tokens, char **valuep)
+                  _GL_ARG_NONNULL ((1, 2, 3)));
+# endif
+_GL_CXXALIAS_SYS (getsubopt, int,
+                  (char **optionp, char *const *tokens, char **valuep));
+_GL_CXXALIASWARN (getsubopt);
+#elif defined GNULIB_POSIXCHECK
+# undef getsubopt
+# if HAVE_RAW_DECL_GETSUBOPT
+_GL_WARN_ON_USE (getsubopt, "getsubopt is unportable - "
+                 "use gnulib module getsubopt for portability");
+# endif
+#endif
+
+#if @GNULIB_GRANTPT@
+/* Change the ownership and access permission of the slave side of the
+   pseudo-terminal whose master side is specified by FD.  */
+# if !@HAVE_GRANTPT@
+_GL_FUNCDECL_SYS (grantpt, int, (int fd));
+# endif
+_GL_CXXALIAS_SYS (grantpt, int, (int fd));
+_GL_CXXALIASWARN (grantpt);
+#elif defined GNULIB_POSIXCHECK
+# undef grantpt
+# if HAVE_RAW_DECL_GRANTPT
+_GL_WARN_ON_USE (grantpt, "grantpt is not portable - "
+                 "use gnulib module grantpt for portability");
+# endif
+#endif
+
+/* If _GL_USE_STDLIB_ALLOC is nonzero, the including module does not
+   rely on GNU or POSIX semantics for malloc and realloc (for example,
+   by never specifying a zero size), so it does not need malloc or
+   realloc to be redefined.  */
+#if @GNULIB_MALLOC_POSIX@
+# if @REPLACE_MALLOC@
+#  if !((defined __cplusplus && defined GNULIB_NAMESPACE) \
+        || _GL_USE_STDLIB_ALLOC)
+#   undef malloc
+#   define malloc rpl_malloc
+#  endif
+_GL_FUNCDECL_RPL (malloc, void *, (size_t size));
+_GL_CXXALIAS_RPL (malloc, void *, (size_t size));
+# else
+_GL_CXXALIAS_SYS (malloc, void *, (size_t size));
+# endif
+_GL_CXXALIASWARN (malloc);
+#elif defined GNULIB_POSIXCHECK && !_GL_USE_STDLIB_ALLOC
+# undef malloc
+/* Assume malloc is always declared.  */
+_GL_WARN_ON_USE (malloc, "malloc is not POSIX compliant everywhere - "
+                 "use gnulib module malloc-posix for portability");
+#endif
+
+/* Convert a multibyte character to a wide character.  */
+#if @GNULIB_MBTOWC@
+# if @REPLACE_MBTOWC@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef mbtowc
+#   define mbtowc rpl_mbtowc
+#  endif
+_GL_FUNCDECL_RPL (mbtowc, int, (wchar_t *pwc, const char *s, size_t n));
+_GL_CXXALIAS_RPL (mbtowc, int, (wchar_t *pwc, const char *s, size_t n));
+# else
+_GL_CXXALIAS_SYS (mbtowc, int, (wchar_t *pwc, const char *s, size_t n));
+# endif
+_GL_CXXALIASWARN (mbtowc);
+#endif
+
+#if @GNULIB_MKDTEMP@
+/* Create a unique temporary directory from TEMPLATE.
+   The last six characters of TEMPLATE must be "XXXXXX";
+   they are replaced with a string that makes the directory name unique.
+   Returns TEMPLATE, or a null pointer if it cannot get a unique name.
+   The directory is created mode 700.  */
+# if !@HAVE_MKDTEMP@
+_GL_FUNCDECL_SYS (mkdtemp, char *, (char * /*template*/) _GL_ARG_NONNULL ((1)));
+# endif
+_GL_CXXALIAS_SYS (mkdtemp, char *, (char * /*template*/));
+_GL_CXXALIASWARN (mkdtemp);
+#elif defined GNULIB_POSIXCHECK
+# undef mkdtemp
+# if HAVE_RAW_DECL_MKDTEMP
+_GL_WARN_ON_USE (mkdtemp, "mkdtemp is unportable - "
+                 "use gnulib module mkdtemp for portability");
+# endif
+#endif
+
+#if @GNULIB_MKOSTEMP@
+/* Create a unique temporary file from TEMPLATE.
+   The last six characters of TEMPLATE must be "XXXXXX";
+   they are replaced with a string that makes the file name unique.
+   The flags are a bitmask, possibly including O_CLOEXEC (defined in <fcntl.h>)
+   and O_TEXT, O_BINARY (defined in "binary-io.h").
+   The file is then created, with the specified flags, ensuring it didn't exist
+   before.
+   The file is created read-write (mask at least 0600 & ~umask), but it may be
+   world-readable and world-writable (mask 0666 & ~umask), depending on the
+   implementation.
+   Returns the open file descriptor if successful, otherwise -1 and errno
+   set.  */
+# if !@HAVE_MKOSTEMP@
+_GL_FUNCDECL_SYS (mkostemp, int, (char * /*template*/, int /*flags*/)
+                                 _GL_ARG_NONNULL ((1)));
+# endif
+_GL_CXXALIAS_SYS (mkostemp, int, (char * /*template*/, int /*flags*/));
+_GL_CXXALIASWARN (mkostemp);
+#elif defined GNULIB_POSIXCHECK
+# undef mkostemp
+# if HAVE_RAW_DECL_MKOSTEMP
+_GL_WARN_ON_USE (mkostemp, "mkostemp is unportable - "
+                 "use gnulib module mkostemp for portability");
+# endif
+#endif
+
+#if @GNULIB_MKOSTEMPS@
+/* Create a unique temporary file from TEMPLATE.
+   The last six characters of TEMPLATE before a suffix of length
+   SUFFIXLEN must be "XXXXXX";
+   they are replaced with a string that makes the file name unique.
+   The flags are a bitmask, possibly including O_CLOEXEC (defined in <fcntl.h>)
+   and O_TEXT, O_BINARY (defined in "binary-io.h").
+   The file is then created, with the specified flags, ensuring it didn't exist
+   before.
+   The file is created read-write (mask at least 0600 & ~umask), but it may be
+   world-readable and world-writable (mask 0666 & ~umask), depending on the
+   implementation.
+   Returns the open file descriptor if successful, otherwise -1 and errno
+   set.  */
+# if !@HAVE_MKOSTEMPS@
+_GL_FUNCDECL_SYS (mkostemps, int,
+                  (char * /*template*/, int /*suffixlen*/, int /*flags*/)
+                  _GL_ARG_NONNULL ((1)));
+# endif
+_GL_CXXALIAS_SYS (mkostemps, int,
+                  (char * /*template*/, int /*suffixlen*/, int /*flags*/));
+_GL_CXXALIASWARN (mkostemps);
+#elif defined GNULIB_POSIXCHECK
+# undef mkostemps
+# if HAVE_RAW_DECL_MKOSTEMPS
+_GL_WARN_ON_USE (mkostemps, "mkostemps is unportable - "
+                 "use gnulib module mkostemps for portability");
+# endif
+#endif
+
+#if @GNULIB_MKSTEMP@
+/* Create a unique temporary file from TEMPLATE.
+   The last six characters of TEMPLATE must be "XXXXXX";
+   they are replaced with a string that makes the file name unique.
+   The file is then created, ensuring it didn't exist before.
+   The file is created read-write (mask at least 0600 & ~umask), but it may be
+   world-readable and world-writable (mask 0666 & ~umask), depending on the
+   implementation.
+   Returns the open file descriptor if successful, otherwise -1 and errno
+   set.  */
+# if @REPLACE_MKSTEMP@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   define mkstemp rpl_mkstemp
+#  endif
+_GL_FUNCDECL_RPL (mkstemp, int, (char * /*template*/) _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (mkstemp, int, (char * /*template*/));
+# else
+#  if ! @HAVE_MKSTEMP@
+_GL_FUNCDECL_SYS (mkstemp, int, (char * /*template*/) _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (mkstemp, int, (char * /*template*/));
+# endif
+_GL_CXXALIASWARN (mkstemp);
+#elif defined GNULIB_POSIXCHECK
+# undef mkstemp
+# if HAVE_RAW_DECL_MKSTEMP
+_GL_WARN_ON_USE (mkstemp, "mkstemp is unportable - "
+                 "use gnulib module mkstemp for portability");
+# endif
+#endif
+
+#if @GNULIB_MKSTEMPS@
+/* Create a unique temporary file from TEMPLATE.
+   The last six characters of TEMPLATE prior to a suffix of length
+   SUFFIXLEN must be "XXXXXX";
+   they are replaced with a string that makes the file name unique.
+   The file is then created, ensuring it didn't exist before.
+   The file is created read-write (mask at least 0600 & ~umask), but it may be
+   world-readable and world-writable (mask 0666 & ~umask), depending on the
+   implementation.
+   Returns the open file descriptor if successful, otherwise -1 and errno
+   set.  */
+# if !@HAVE_MKSTEMPS@
+_GL_FUNCDECL_SYS (mkstemps, int, (char * /*template*/, int /*suffixlen*/)
+                                 _GL_ARG_NONNULL ((1)));
+# endif
+_GL_CXXALIAS_SYS (mkstemps, int, (char * /*template*/, int /*suffixlen*/));
+_GL_CXXALIASWARN (mkstemps);
+#elif defined GNULIB_POSIXCHECK
+# undef mkstemps
+# if HAVE_RAW_DECL_MKSTEMPS
+_GL_WARN_ON_USE (mkstemps, "mkstemps is unportable - "
+                 "use gnulib module mkstemps for portability");
+# endif
+#endif
+
+#if @GNULIB_POSIX_OPENPT@
+/* Return an FD open to the master side of a pseudo-terminal.  Flags should
+   include O_RDWR, and may also include O_NOCTTY.  */
+# if !@HAVE_POSIX_OPENPT@
+_GL_FUNCDECL_SYS (posix_openpt, int, (int flags));
+# endif
+_GL_CXXALIAS_SYS (posix_openpt, int, (int flags));
+_GL_CXXALIASWARN (posix_openpt);
+#elif defined GNULIB_POSIXCHECK
+# undef posix_openpt
+# if HAVE_RAW_DECL_POSIX_OPENPT
+_GL_WARN_ON_USE (posix_openpt, "posix_openpt is not portable - "
+                 "use gnulib module posix_openpt for portability");
+# endif
+#endif
+
+#if @GNULIB_PTSNAME@
+/* Return the pathname of the pseudo-terminal slave associated with
+   the master FD is open on, or NULL on errors.  */
+# if @REPLACE_PTSNAME@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef ptsname
+#   define ptsname rpl_ptsname
+#  endif
+_GL_FUNCDECL_RPL (ptsname, char *, (int fd));
+_GL_CXXALIAS_RPL (ptsname, char *, (int fd));
+# else
+#  if !@HAVE_PTSNAME@
+_GL_FUNCDECL_SYS (ptsname, char *, (int fd));
+#  endif
+_GL_CXXALIAS_SYS (ptsname, char *, (int fd));
+# endif
+_GL_CXXALIASWARN (ptsname);
+#elif defined GNULIB_POSIXCHECK
+# undef ptsname
+# if HAVE_RAW_DECL_PTSNAME
+_GL_WARN_ON_USE (ptsname, "ptsname is not portable - "
+                 "use gnulib module ptsname for portability");
+# endif
+#endif
+
+#if @GNULIB_PTSNAME_R@
+/* Set the pathname of the pseudo-terminal slave associated with
+   the master FD is open on and return 0, or set errno and return
+   non-zero on errors.  */
+# if @REPLACE_PTSNAME_R@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef ptsname_r
+#   define ptsname_r rpl_ptsname_r
+#  endif
+_GL_FUNCDECL_RPL (ptsname_r, int, (int fd, char *buf, size_t len));
+_GL_CXXALIAS_RPL (ptsname_r, int, (int fd, char *buf, size_t len));
+# else
+#  if !@HAVE_PTSNAME_R@
+_GL_FUNCDECL_SYS (ptsname_r, int, (int fd, char *buf, size_t len));
+#  endif
+_GL_CXXALIAS_SYS (ptsname_r, int, (int fd, char *buf, size_t len));
+# endif
+_GL_CXXALIASWARN (ptsname_r);
+#elif defined GNULIB_POSIXCHECK
+# undef ptsname_r
+# if HAVE_RAW_DECL_PTSNAME_R
+_GL_WARN_ON_USE (ptsname_r, "ptsname_r is not portable - "
+                 "use gnulib module ptsname_r for portability");
+# endif
+#endif
+
+#if @GNULIB_PUTENV@
+# if @REPLACE_PUTENV@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef putenv
+#   define putenv rpl_putenv
+#  endif
+_GL_FUNCDECL_RPL (putenv, int, (char *string) _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (putenv, int, (char *string));
+# else
+_GL_CXXALIAS_SYS (putenv, int, (char *string));
+# endif
+_GL_CXXALIASWARN (putenv);
+#endif
+
+#if @GNULIB_QSORT_R@
+/* Sort an array of NMEMB elements, starting at address BASE, each element
+   occupying SIZE bytes, in ascending order according to the comparison
+   function COMPARE.  */
+# if @REPLACE_QSORT_R@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef qsort_r
+#   define qsort_r rpl_qsort_r
+#  endif
+_GL_FUNCDECL_RPL (qsort_r, void, (void *base, size_t nmemb, size_t size,
+                                  int (*compare) (void const *, void const *,
+                                                  void *),
+                                  void *arg) _GL_ARG_NONNULL ((1, 4)));
+_GL_CXXALIAS_RPL (qsort_r, void, (void *base, size_t nmemb, size_t size,
+                                  int (*compare) (void const *, void const *,
+                                                  void *),
+                                  void *arg));
+# else
+#  if !@HAVE_QSORT_R@
+_GL_FUNCDECL_SYS (qsort_r, void, (void *base, size_t nmemb, size_t size,
+                                  int (*compare) (void const *, void const *,
+                                                  void *),
+                                  void *arg) _GL_ARG_NONNULL ((1, 4)));
+#  endif
+_GL_CXXALIAS_SYS (qsort_r, void, (void *base, size_t nmemb, size_t size,
+                                  int (*compare) (void const *, void const *,
+                                                  void *),
+                                  void *arg));
+# endif
+_GL_CXXALIASWARN (qsort_r);
+#elif defined GNULIB_POSIXCHECK
+# undef qsort_r
+# if HAVE_RAW_DECL_QSORT_R
+_GL_WARN_ON_USE (qsort_r, "qsort_r is not portable - "
+                 "use gnulib module qsort_r for portability");
+# endif
+#endif
+
+
+#if @GNULIB_RANDOM_R@
+# if !@HAVE_RANDOM_R@
+#  ifndef RAND_MAX
+#   define RAND_MAX 2147483647
+#  endif
+# endif
+#endif
+
+
+#if @GNULIB_RANDOM@
+# if !@HAVE_RANDOM@
+_GL_FUNCDECL_SYS (random, long, (void));
+# endif
+_GL_CXXALIAS_SYS (random, long, (void));
+_GL_CXXALIASWARN (random);
+#elif defined GNULIB_POSIXCHECK
+# undef random
+# if HAVE_RAW_DECL_RANDOM
+_GL_WARN_ON_USE (random, "random is unportable - "
+                 "use gnulib module random for portability");
+# endif
+#endif
+
+#if @GNULIB_RANDOM@
+# if !@HAVE_RANDOM@
+_GL_FUNCDECL_SYS (srandom, void, (unsigned int seed));
+# endif
+_GL_CXXALIAS_SYS (srandom, void, (unsigned int seed));
+_GL_CXXALIASWARN (srandom);
+#elif defined GNULIB_POSIXCHECK
+# undef srandom
+# if HAVE_RAW_DECL_SRANDOM
+_GL_WARN_ON_USE (srandom, "srandom is unportable - "
+                 "use gnulib module random for portability");
+# endif
+#endif
+
+#if @GNULIB_RANDOM@
+# if !@HAVE_RANDOM@ || !@HAVE_DECL_INITSTATE@
+_GL_FUNCDECL_SYS (initstate, char *,
+                  (unsigned int seed, char *buf, size_t buf_size)
+                  _GL_ARG_NONNULL ((2)));
+# endif
+_GL_CXXALIAS_SYS (initstate, char *,
+                  (unsigned int seed, char *buf, size_t buf_size));
+_GL_CXXALIASWARN (initstate);
+#elif defined GNULIB_POSIXCHECK
+# undef initstate
+# if HAVE_RAW_DECL_INITSTATE_R
+_GL_WARN_ON_USE (initstate, "initstate is unportable - "
+                 "use gnulib module random for portability");
+# endif
+#endif
+
+#if @GNULIB_RANDOM@
+# if !@HAVE_RANDOM@ || !@HAVE_DECL_SETSTATE@
+_GL_FUNCDECL_SYS (setstate, char *, (char *arg_state) _GL_ARG_NONNULL ((1)));
+# endif
+_GL_CXXALIAS_SYS (setstate, char *, (char *arg_state));
+_GL_CXXALIASWARN (setstate);
+#elif defined GNULIB_POSIXCHECK
+# undef setstate
+# if HAVE_RAW_DECL_SETSTATE_R
+_GL_WARN_ON_USE (setstate, "setstate is unportable - "
+                 "use gnulib module random for portability");
+# endif
+#endif
+
+
+#if @GNULIB_RANDOM_R@
+# if @REPLACE_RANDOM_R@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef random_r
+#   define random_r rpl_random_r
+#  endif
+_GL_FUNCDECL_RPL (random_r, int, (struct random_data *buf, int32_t *result)
+                                 _GL_ARG_NONNULL ((1, 2)));
+_GL_CXXALIAS_RPL (random_r, int, (struct random_data *buf, int32_t *result));
+# else
+#  if !@HAVE_RANDOM_R@
+_GL_FUNCDECL_SYS (random_r, int, (struct random_data *buf, int32_t *result)
+                                 _GL_ARG_NONNULL ((1, 2)));
+#  endif
+_GL_CXXALIAS_SYS (random_r, int, (struct random_data *buf, int32_t *result));
+# endif
+_GL_CXXALIASWARN (random_r);
+#elif defined GNULIB_POSIXCHECK
+# undef random_r
+# if HAVE_RAW_DECL_RANDOM_R
+_GL_WARN_ON_USE (random_r, "random_r is unportable - "
+                 "use gnulib module random_r for portability");
+# endif
+#endif
+
+#if @GNULIB_RANDOM_R@
+# if @REPLACE_RANDOM_R@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef srandom_r
+#   define srandom_r rpl_srandom_r
+#  endif
+_GL_FUNCDECL_RPL (srandom_r, int,
+                  (unsigned int seed, struct random_data *rand_state)
+                  _GL_ARG_NONNULL ((2)));
+_GL_CXXALIAS_RPL (srandom_r, int,
+                  (unsigned int seed, struct random_data *rand_state));
+# else
+#  if !@HAVE_RANDOM_R@
+_GL_FUNCDECL_SYS (srandom_r, int,
+                  (unsigned int seed, struct random_data *rand_state)
+                  _GL_ARG_NONNULL ((2)));
+#  endif
+_GL_CXXALIAS_SYS (srandom_r, int,
+                  (unsigned int seed, struct random_data *rand_state));
+# endif
+_GL_CXXALIASWARN (srandom_r);
+#elif defined GNULIB_POSIXCHECK
+# undef srandom_r
+# if HAVE_RAW_DECL_SRANDOM_R
+_GL_WARN_ON_USE (srandom_r, "srandom_r is unportable - "
+                 "use gnulib module random_r for portability");
+# endif
+#endif
+
+#if @GNULIB_RANDOM_R@
+# if @REPLACE_RANDOM_R@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef initstate_r
+#   define initstate_r rpl_initstate_r
+#  endif
+_GL_FUNCDECL_RPL (initstate_r, int,
+                  (unsigned int seed, char *buf, size_t buf_size,
+                   struct random_data *rand_state)
+                  _GL_ARG_NONNULL ((2, 4)));
+_GL_CXXALIAS_RPL (initstate_r, int,
+                  (unsigned int seed, char *buf, size_t buf_size,
+                   struct random_data *rand_state));
+# else
+#  if !@HAVE_RANDOM_R@
+_GL_FUNCDECL_SYS (initstate_r, int,
+                  (unsigned int seed, char *buf, size_t buf_size,
+                   struct random_data *rand_state)
+                  _GL_ARG_NONNULL ((2, 4)));
+#  endif
+_GL_CXXALIAS_SYS (initstate_r, int,
+                  (unsigned int seed, char *buf, size_t buf_size,
+                   struct random_data *rand_state));
+# endif
+_GL_CXXALIASWARN (initstate_r);
+#elif defined GNULIB_POSIXCHECK
+# undef initstate_r
+# if HAVE_RAW_DECL_INITSTATE_R
+_GL_WARN_ON_USE (initstate_r, "initstate_r is unportable - "
+                 "use gnulib module random_r for portability");
+# endif
+#endif
+
+#if @GNULIB_RANDOM_R@
+# if @REPLACE_RANDOM_R@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef setstate_r
+#   define setstate_r rpl_setstate_r
+#  endif
+_GL_FUNCDECL_RPL (setstate_r, int,
+                  (char *arg_state, struct random_data *rand_state)
+                  _GL_ARG_NONNULL ((1, 2)));
+_GL_CXXALIAS_RPL (setstate_r, int,
+                  (char *arg_state, struct random_data *rand_state));
+# else
+#  if !@HAVE_RANDOM_R@
+_GL_FUNCDECL_SYS (setstate_r, int,
+                  (char *arg_state, struct random_data *rand_state)
+                  _GL_ARG_NONNULL ((1, 2)));
+#  endif
+_GL_CXXALIAS_SYS (setstate_r, int,
+                  (char *arg_state, struct random_data *rand_state));
+# endif
+_GL_CXXALIASWARN (setstate_r);
+#elif defined GNULIB_POSIXCHECK
+# undef setstate_r
+# if HAVE_RAW_DECL_SETSTATE_R
+_GL_WARN_ON_USE (setstate_r, "setstate_r is unportable - "
+                 "use gnulib module random_r for portability");
+# endif
+#endif
+
+
+#if @GNULIB_REALLOC_POSIX@
+# if @REPLACE_REALLOC@
+#  if !((defined __cplusplus && defined GNULIB_NAMESPACE) \
+        || _GL_USE_STDLIB_ALLOC)
+#   undef realloc
+#   define realloc rpl_realloc
+#  endif
+_GL_FUNCDECL_RPL (realloc, void *, (void *ptr, size_t size));
+_GL_CXXALIAS_RPL (realloc, void *, (void *ptr, size_t size));
+# else
+_GL_CXXALIAS_SYS (realloc, void *, (void *ptr, size_t size));
+# endif
+_GL_CXXALIASWARN (realloc);
+#elif defined GNULIB_POSIXCHECK && !_GL_USE_STDLIB_ALLOC
+# undef realloc
+/* Assume realloc is always declared.  */
+_GL_WARN_ON_USE (realloc, "realloc is not POSIX compliant everywhere - "
+                 "use gnulib module realloc-posix for portability");
+#endif
+
+
+#if @GNULIB_REALLOCARRAY@
+# if ! @HAVE_REALLOCARRAY@
+_GL_FUNCDECL_SYS (reallocarray, void *,
+                  (void *ptr, size_t nmemb, size_t size));
+# endif
+_GL_CXXALIAS_SYS (reallocarray, void *,
+                  (void *ptr, size_t nmemb, size_t size));
+_GL_CXXALIASWARN (reallocarray);
+#elif defined GNULIB_POSIXCHECK
+# undef reallocarray
+# if HAVE_RAW_DECL_REALLOCARRAY
+_GL_WARN_ON_USE (reallocarray, "reallocarray is not portable - "
+                 "use gnulib module reallocarray for portability");
+# endif
+#endif
+
+#if @GNULIB_REALPATH@
+# if @REPLACE_REALPATH@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   define realpath rpl_realpath
+#  endif
+_GL_FUNCDECL_RPL (realpath, char *, (const char *name, char *resolved)
+                                    _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (realpath, char *, (const char *name, char *resolved));
+# else
+#  if !@HAVE_REALPATH@
+_GL_FUNCDECL_SYS (realpath, char *, (const char *name, char *resolved)
+                                    _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (realpath, char *, (const char *name, char *resolved));
+# endif
+_GL_CXXALIASWARN (realpath);
+#elif defined GNULIB_POSIXCHECK
+# undef realpath
+# if HAVE_RAW_DECL_REALPATH
+_GL_WARN_ON_USE (realpath, "realpath is unportable - use gnulib module "
+                 "canonicalize or canonicalize-lgpl for portability");
+# endif
+#endif
+
+#if @GNULIB_RPMATCH@
+/* Test a user response to a question.
+   Return 1 if it is affirmative, 0 if it is negative, or -1 if not clear.  */
+# if !@HAVE_RPMATCH@
+_GL_FUNCDECL_SYS (rpmatch, int, (const char *response) _GL_ARG_NONNULL ((1)));
+# endif
+_GL_CXXALIAS_SYS (rpmatch, int, (const char *response));
+_GL_CXXALIASWARN (rpmatch);
+#elif defined GNULIB_POSIXCHECK
+# undef rpmatch
+# if HAVE_RAW_DECL_RPMATCH
+_GL_WARN_ON_USE (rpmatch, "rpmatch is unportable - "
+                 "use gnulib module rpmatch for portability");
+# endif
+#endif
+
+#if @GNULIB_SECURE_GETENV@
+/* Look up NAME in the environment, returning 0 in insecure situations.  */
+# if !@HAVE_SECURE_GETENV@
+_GL_FUNCDECL_SYS (secure_getenv, char *,
+                  (char const *name) _GL_ARG_NONNULL ((1)));
+# endif
+_GL_CXXALIAS_SYS (secure_getenv, char *, (char const *name));
+_GL_CXXALIASWARN (secure_getenv);
+#elif defined GNULIB_POSIXCHECK
+# undef secure_getenv
+# if HAVE_RAW_DECL_SECURE_GETENV
+_GL_WARN_ON_USE (secure_getenv, "secure_getenv is unportable - "
+                 "use gnulib module secure_getenv for portability");
+# endif
+#endif
+
+#if @GNULIB_SETENV@
+/* Set NAME to VALUE in the environment.
+   If REPLACE is nonzero, overwrite an existing value.  */
+# if @REPLACE_SETENV@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef setenv
+#   define setenv rpl_setenv
+#  endif
+_GL_FUNCDECL_RPL (setenv, int,
+                  (const char *name, const char *value, int replace)
+                  _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (setenv, int,
+                  (const char *name, const char *value, int replace));
+# else
+#  if !@HAVE_DECL_SETENV@
+_GL_FUNCDECL_SYS (setenv, int,
+                  (const char *name, const char *value, int replace)
+                  _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (setenv, int,
+                  (const char *name, const char *value, int replace));
+# endif
+# if !(@REPLACE_SETENV@ && !@HAVE_DECL_SETENV@)
+_GL_CXXALIASWARN (setenv);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef setenv
+# if HAVE_RAW_DECL_SETENV
+_GL_WARN_ON_USE (setenv, "setenv is unportable - "
+                 "use gnulib module setenv for portability");
+# endif
+#endif
+
+#if @GNULIB_STRTOD@
+ /* Parse a double from STRING, updating ENDP if appropriate.  */
+# if @REPLACE_STRTOD@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   define strtod rpl_strtod
+#  endif
+_GL_FUNCDECL_RPL (strtod, double, (const char *str, char **endp)
+                                  _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (strtod, double, (const char *str, char **endp));
+# else
+#  if !@HAVE_STRTOD@
+_GL_FUNCDECL_SYS (strtod, double, (const char *str, char **endp)
+                                  _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (strtod, double, (const char *str, char **endp));
+# endif
+_GL_CXXALIASWARN (strtod);
+#elif defined GNULIB_POSIXCHECK
+# undef strtod
+# if HAVE_RAW_DECL_STRTOD
+_GL_WARN_ON_USE (strtod, "strtod is unportable - "
+                 "use gnulib module strtod for portability");
+# endif
+#endif
+
+#if @GNULIB_STRTOLL@
+/* Parse a signed integer whose textual representation starts at STRING.
+   The integer is expected to be in base BASE (2 <= BASE <= 36); if BASE == 0,
+   it may be decimal or octal (with prefix "0") or hexadecimal (with prefix
+   "0x").
+   If ENDPTR is not NULL, the address of the first byte after the integer is
+   stored in *ENDPTR.
+   Upon overflow, the return value is LLONG_MAX or LLONG_MIN, and errno is set
+   to ERANGE.  */
+# if !@HAVE_STRTOLL@
+_GL_FUNCDECL_SYS (strtoll, long long,
+                  (const char *string, char **endptr, int base)
+                  _GL_ARG_NONNULL ((1)));
+# endif
+_GL_CXXALIAS_SYS (strtoll, long long,
+                  (const char *string, char **endptr, int base));
+_GL_CXXALIASWARN (strtoll);
+#elif defined GNULIB_POSIXCHECK
+# undef strtoll
+# if HAVE_RAW_DECL_STRTOLL
+_GL_WARN_ON_USE (strtoll, "strtoll is unportable - "
+                 "use gnulib module strtoll for portability");
+# endif
+#endif
+
+#if @GNULIB_STRTOULL@
+/* Parse an unsigned integer whose textual representation starts at STRING.
+   The integer is expected to be in base BASE (2 <= BASE <= 36); if BASE == 0,
+   it may be decimal or octal (with prefix "0") or hexadecimal (with prefix
+   "0x").
+   If ENDPTR is not NULL, the address of the first byte after the integer is
+   stored in *ENDPTR.
+   Upon overflow, the return value is ULLONG_MAX, and errno is set to
+   ERANGE.  */
+# if !@HAVE_STRTOULL@
+_GL_FUNCDECL_SYS (strtoull, unsigned long long,
+                  (const char *string, char **endptr, int base)
+                  _GL_ARG_NONNULL ((1)));
+# endif
+_GL_CXXALIAS_SYS (strtoull, unsigned long long,
+                  (const char *string, char **endptr, int base));
+_GL_CXXALIASWARN (strtoull);
+#elif defined GNULIB_POSIXCHECK
+# undef strtoull
+# if HAVE_RAW_DECL_STRTOULL
+_GL_WARN_ON_USE (strtoull, "strtoull is unportable - "
+                 "use gnulib module strtoull for portability");
+# endif
+#endif
+
+#if @GNULIB_UNLOCKPT@
+/* Unlock the slave side of the pseudo-terminal whose master side is specified
+   by FD, so that it can be opened.  */
+# if !@HAVE_UNLOCKPT@
+_GL_FUNCDECL_SYS (unlockpt, int, (int fd));
+# endif
+_GL_CXXALIAS_SYS (unlockpt, int, (int fd));
+_GL_CXXALIASWARN (unlockpt);
+#elif defined GNULIB_POSIXCHECK
+# undef unlockpt
+# if HAVE_RAW_DECL_UNLOCKPT
+_GL_WARN_ON_USE (unlockpt, "unlockpt is not portable - "
+                 "use gnulib module unlockpt for portability");
+# endif
+#endif
+
+#if @GNULIB_UNSETENV@
+/* Remove the variable NAME from the environment.  */
+# if @REPLACE_UNSETENV@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef unsetenv
+#   define unsetenv rpl_unsetenv
+#  endif
+_GL_FUNCDECL_RPL (unsetenv, int, (const char *name) _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (unsetenv, int, (const char *name));
+# else
+#  if !@HAVE_DECL_UNSETENV@
+_GL_FUNCDECL_SYS (unsetenv, int, (const char *name) _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (unsetenv, int, (const char *name));
+# endif
+# if !(@REPLACE_UNSETENV@ && !@HAVE_DECL_UNSETENV@)
+_GL_CXXALIASWARN (unsetenv);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef unsetenv
+# if HAVE_RAW_DECL_UNSETENV
+_GL_WARN_ON_USE (unsetenv, "unsetenv is unportable - "
+                 "use gnulib module unsetenv for portability");
+# endif
+#endif
+
+/* Convert a wide character to a multibyte character.  */
+#if @GNULIB_WCTOMB@
+# if @REPLACE_WCTOMB@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef wctomb
+#   define wctomb rpl_wctomb
+#  endif
+_GL_FUNCDECL_RPL (wctomb, int, (char *s, wchar_t wc));
+_GL_CXXALIAS_RPL (wctomb, int, (char *s, wchar_t wc));
+# else
+_GL_CXXALIAS_SYS (wctomb, int, (char *s, wchar_t wc));
+# endif
+_GL_CXXALIASWARN (wctomb);
+#endif
+
+
+#endif /* _@GUARD_PREFIX@_STDLIB_H */
+#endif /* _@GUARD_PREFIX@_STDLIB_H */
+#endif
diff --git a/gl/streq.h b/gl/streq.h
new file mode 100644
index 0000000..831ded2
--- /dev/null
+++ b/gl/streq.h
@@ -0,0 +1,176 @@
+/* Optimized string comparison.
+   Copyright (C) 2001-2002, 2007, 2009-2017 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify it
+   under the terms of the GNU Lesser General Public License as published
+   by the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* Written by Bruno Haible <bruno@clisp.org>.  */
+
+#ifndef _GL_STREQ_H
+#define _GL_STREQ_H
+
+#include <string.h>
+
+/* STREQ_OPT allows to optimize string comparison with a small literal string.
+     STREQ_OPT (s, "EUC-KR", 'E', 'U', 'C', '-', 'K', 'R', 0, 0, 0)
+   is semantically equivalent to
+     strcmp (s, "EUC-KR") == 0
+   just faster.  */
+
+/* Help GCC to generate good code for string comparisons with
+   immediate strings. */
+#if defined (__GNUC__) && defined (__OPTIMIZE__)
+
+static inline int
+streq9 (const char *s1, const char *s2)
+{
+  return strcmp (s1 + 9, s2 + 9) == 0;
+}
+
+static inline int
+streq8 (const char *s1, const char *s2, char s28)
+{
+  if (s1[8] == s28)
+    {
+      if (s28 == 0)
+        return 1;
+      else
+        return streq9 (s1, s2);
+    }
+  else
+    return 0;
+}
+
+static inline int
+streq7 (const char *s1, const char *s2, char s27, char s28)
+{
+  if (s1[7] == s27)
+    {
+      if (s27 == 0)
+        return 1;
+      else
+        return streq8 (s1, s2, s28);
+    }
+  else
+    return 0;
+}
+
+static inline int
+streq6 (const char *s1, const char *s2, char s26, char s27, char s28)
+{
+  if (s1[6] == s26)
+    {
+      if (s26 == 0)
+        return 1;
+      else
+        return streq7 (s1, s2, s27, s28);
+    }
+  else
+    return 0;
+}
+
+static inline int
+streq5 (const char *s1, const char *s2, char s25, char s26, char s27, char s28)
+{
+  if (s1[5] == s25)
+    {
+      if (s25 == 0)
+        return 1;
+      else
+        return streq6 (s1, s2, s26, s27, s28);
+    }
+  else
+    return 0;
+}
+
+static inline int
+streq4 (const char *s1, const char *s2, char s24, char s25, char s26, char s27, char s28)
+{
+  if (s1[4] == s24)
+    {
+      if (s24 == 0)
+        return 1;
+      else
+        return streq5 (s1, s2, s25, s26, s27, s28);
+    }
+  else
+    return 0;
+}
+
+static inline int
+streq3 (const char *s1, const char *s2, char s23, char s24, char s25, char s26, char s27, char s28)
+{
+  if (s1[3] == s23)
+    {
+      if (s23 == 0)
+        return 1;
+      else
+        return streq4 (s1, s2, s24, s25, s26, s27, s28);
+    }
+  else
+    return 0;
+}
+
+static inline int
+streq2 (const char *s1, const char *s2, char s22, char s23, char s24, char s25, char s26, char s27, char s28)
+{
+  if (s1[2] == s22)
+    {
+      if (s22 == 0)
+        return 1;
+      else
+        return streq3 (s1, s2, s23, s24, s25, s26, s27, s28);
+    }
+  else
+    return 0;
+}
+
+static inline int
+streq1 (const char *s1, const char *s2, char s21, char s22, char s23, char s24, char s25, char s26, char s27, char s28)
+{
+  if (s1[1] == s21)
+    {
+      if (s21 == 0)
+        return 1;
+      else
+        return streq2 (s1, s2, s22, s23, s24, s25, s26, s27, s28);
+    }
+  else
+    return 0;
+}
+
+static inline int
+streq0 (const char *s1, const char *s2, char s20, char s21, char s22, char s23, char s24, char s25, char s26, char s27, char s28)
+{
+  if (s1[0] == s20)
+    {
+      if (s20 == 0)
+        return 1;
+      else
+        return streq1 (s1, s2, s21, s22, s23, s24, s25, s26, s27, s28);
+    }
+  else
+    return 0;
+}
+
+#define STREQ_OPT(s1,s2,s20,s21,s22,s23,s24,s25,s26,s27,s28) \
+  streq0 (s1, s2, s20, s21, s22, s23, s24, s25, s26, s27, s28)
+
+#else
+
+#define STREQ_OPT(s1,s2,s20,s21,s22,s23,s24,s25,s26,s27,s28) \
+  (strcmp (s1, s2) == 0)
+
+#endif
+
+#endif /* _GL_STREQ_H */
diff --git a/gl/sys_stat.in.h b/gl/sys_stat.in.h
new file mode 100644
index 0000000..2d4972a
--- /dev/null
+++ b/gl/sys_stat.in.h
@@ -0,0 +1,816 @@
+/* Provide a more complete sys/stat.h header file.
+   Copyright (C) 2005-2017 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
+
+/* Written by Eric Blake, Paul Eggert, and Jim Meyering.  */
+
+/* This file is supposed to be used on platforms where <sys/stat.h> is
+   incomplete.  It is intended to provide definitions and prototypes
+   needed by an application.  Start with what the system provides.  */
+
+#if __GNUC__ >= 3
+@PRAGMA_SYSTEM_HEADER@
+#endif
+@PRAGMA_COLUMNS@
+
+#if defined __need_system_sys_stat_h
+/* Special invocation convention.  */
+
+#@INCLUDE_NEXT@ @NEXT_SYS_STAT_H@
+
+#else
+/* Normal invocation convention.  */
+
+#ifndef _@GUARD_PREFIX@_SYS_STAT_H
+
+/* Get nlink_t.
+   May also define off_t to a 64-bit type on native Windows.  */
+#include <sys/types.h>
+
+/* Get struct timespec.  */
+#include <time.h>
+
+/* The include_next requires a split double-inclusion guard.  */
+#@INCLUDE_NEXT@ @NEXT_SYS_STAT_H@
+
+#ifndef _@GUARD_PREFIX@_SYS_STAT_H
+#define _@GUARD_PREFIX@_SYS_STAT_H
+
+/* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
+
+/* The definition of _GL_ARG_NONNULL is copied here.  */
+
+/* The definition of _GL_WARN_ON_USE is copied here.  */
+
+/* Before doing "#define mkdir rpl_mkdir" below, we need to include all
+   headers that may declare mkdir().  Native Windows platforms declare mkdir
+   in <io.h> and/or <direct.h>, not in <unistd.h>.  */
+#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+# include <io.h>     /* mingw32, mingw64 */
+# include <direct.h> /* mingw64, MSVC 9 */
+#endif
+
+/* Native Windows platforms declare umask() in <io.h>.  */
+#if 0 && ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)
+# include <io.h>
+#endif
+
+/* Large File Support on native Windows.  */
+#if @WINDOWS_64_BIT_ST_SIZE@
+# define stat _stati64
+#endif
+
+/* Optionally, override 'struct stat' on native Windows.  */
+#if @GNULIB_OVERRIDES_STRUCT_STAT@
+
+# undef stat
+# if @GNULIB_STAT@
+#  define stat rpl_stat
+# else
+   /* Provoke a clear link error if stat() is used as a function and
+      module 'stat' is not in use.  */
+#  define stat stat_used_without_requesting_gnulib_module_stat
+# endif
+
+# if !GNULIB_defined_struct_stat
+struct stat
+{
+  dev_t st_dev;
+  ino_t st_ino;
+  mode_t st_mode;
+  nlink_t st_nlink;
+#  if 0
+  uid_t st_uid;
+#  else /* uid_t is not defined by default on native Windows.  */
+  short st_uid;
+#  endif
+#  if 0
+  gid_t st_gid;
+#  else /* gid_t is not defined by default on native Windows.  */
+  short st_gid;
+#  endif
+  dev_t st_rdev;
+  off_t st_size;
+#  if 0
+  blksize_t st_blksize;
+  blkcnt_t st_blocks;
+#  endif
+
+#  if @WINDOWS_STAT_TIMESPEC@
+  struct timespec st_atim;
+  struct timespec st_mtim;
+  struct timespec st_ctim;
+#  else
+  time_t st_atime;
+  time_t st_mtime;
+  time_t st_ctime;
+#  endif
+};
+#  if @WINDOWS_STAT_TIMESPEC@
+#   define st_atime st_atim.tv_sec
+#   define st_mtime st_mtim.tv_sec
+#   define st_ctime st_ctim.tv_sec
+    /* Indicator, for gnulib internal purposes.  */
+#   define _GL_WINDOWS_STAT_TIMESPEC 1
+#  endif
+#  define GNULIB_defined_struct_stat 1
+# endif
+
+/* Other possible values of st_mode.  */
+# if 0
+#  define _S_IFBLK  0x6000
+# endif
+# if 0
+#  define _S_IFLNK  0xA000
+# endif
+# if 0
+#  define _S_IFSOCK 0xC000
+# endif
+
+#endif
+
+#ifndef S_IFIFO
+# ifdef _S_IFIFO
+#  define S_IFIFO _S_IFIFO
+# endif
+#endif
+
+#ifndef S_IFMT
+# define S_IFMT 0170000
+#endif
+
+#if STAT_MACROS_BROKEN
+# undef S_ISBLK
+# undef S_ISCHR
+# undef S_ISDIR
+# undef S_ISFIFO
+# undef S_ISLNK
+# undef S_ISNAM
+# undef S_ISMPB
+# undef S_ISMPC
+# undef S_ISNWK
+# undef S_ISREG
+# undef S_ISSOCK
+#endif
+
+#ifndef S_ISBLK
+# ifdef S_IFBLK
+#  define S_ISBLK(m) (((m) & S_IFMT) == S_IFBLK)
+# else
+#  define S_ISBLK(m) 0
+# endif
+#endif
+
+#ifndef S_ISCHR
+# ifdef S_IFCHR
+#  define S_ISCHR(m) (((m) & S_IFMT) == S_IFCHR)
+# else
+#  define S_ISCHR(m) 0
+# endif
+#endif
+
+#ifndef S_ISDIR
+# ifdef S_IFDIR
+#  define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
+# else
+#  define S_ISDIR(m) 0
+# endif
+#endif
+
+#ifndef S_ISDOOR /* Solaris 2.5 and up */
+# define S_ISDOOR(m) 0
+#endif
+
+#ifndef S_ISFIFO
+# ifdef S_IFIFO
+#  define S_ISFIFO(m) (((m) & S_IFMT) == S_IFIFO)
+# else
+#  define S_ISFIFO(m) 0
+# endif
+#endif
+
+#ifndef S_ISLNK
+# ifdef S_IFLNK
+#  define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK)
+# else
+#  define S_ISLNK(m) 0
+# endif
+#endif
+
+#ifndef S_ISMPB /* V7 */
+# ifdef S_IFMPB
+#  define S_ISMPB(m) (((m) & S_IFMT) == S_IFMPB)
+#  define S_ISMPC(m) (((m) & S_IFMT) == S_IFMPC)
+# else
+#  define S_ISMPB(m) 0
+#  define S_ISMPC(m) 0
+# endif
+#endif
+
+#ifndef S_ISMPX /* AIX */
+# define S_ISMPX(m) 0
+#endif
+
+#ifndef S_ISNAM /* Xenix */
+# ifdef S_IFNAM
+#  define S_ISNAM(m) (((m) & S_IFMT) == S_IFNAM)
+# else
+#  define S_ISNAM(m) 0
+# endif
+#endif
+
+#ifndef S_ISNWK /* HP/UX */
+# ifdef S_IFNWK
+#  define S_ISNWK(m) (((m) & S_IFMT) == S_IFNWK)
+# else
+#  define S_ISNWK(m) 0
+# endif
+#endif
+
+#ifndef S_ISPORT /* Solaris 10 and up */
+# define S_ISPORT(m) 0
+#endif
+
+#ifndef S_ISREG
+# ifdef S_IFREG
+#  define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
+# else
+#  define S_ISREG(m) 0
+# endif
+#endif
+
+#ifndef S_ISSOCK
+# ifdef S_IFSOCK
+#  define S_ISSOCK(m) (((m) & S_IFMT) == S_IFSOCK)
+# else
+#  define S_ISSOCK(m) 0
+# endif
+#endif
+
+
+#ifndef S_TYPEISMQ
+# define S_TYPEISMQ(p) 0
+#endif
+
+#ifndef S_TYPEISTMO
+# define S_TYPEISTMO(p) 0
+#endif
+
+
+#ifndef S_TYPEISSEM
+# ifdef S_INSEM
+#  define S_TYPEISSEM(p) (S_ISNAM ((p)->st_mode) && (p)->st_rdev == S_INSEM)
+# else
+#  define S_TYPEISSEM(p) 0
+# endif
+#endif
+
+#ifndef S_TYPEISSHM
+# ifdef S_INSHD
+#  define S_TYPEISSHM(p) (S_ISNAM ((p)->st_mode) && (p)->st_rdev == S_INSHD)
+# else
+#  define S_TYPEISSHM(p) 0
+# endif
+#endif
+
+/* high performance ("contiguous data") */
+#ifndef S_ISCTG
+# define S_ISCTG(p) 0
+#endif
+
+/* Cray DMF (data migration facility): off line, with data  */
+#ifndef S_ISOFD
+# define S_ISOFD(p) 0
+#endif
+
+/* Cray DMF (data migration facility): off line, with no data  */
+#ifndef S_ISOFL
+# define S_ISOFL(p) 0
+#endif
+
+/* 4.4BSD whiteout */
+#ifndef S_ISWHT
+# define S_ISWHT(m) 0
+#endif
+
+/* If any of the following are undefined,
+   define them to their de facto standard values.  */
+#if !S_ISUID
+# define S_ISUID 04000
+#endif
+#if !S_ISGID
+# define S_ISGID 02000
+#endif
+
+/* S_ISVTX is a common extension to POSIX.  */
+#ifndef S_ISVTX
+# define S_ISVTX 01000
+#endif
+
+#if !S_IRUSR && S_IREAD
+# define S_IRUSR S_IREAD
+#endif
+#if !S_IRUSR
+# define S_IRUSR 00400
+#endif
+#if !S_IRGRP
+# define S_IRGRP (S_IRUSR >> 3)
+#endif
+#if !S_IROTH
+# define S_IROTH (S_IRUSR >> 6)
+#endif
+
+#if !S_IWUSR && S_IWRITE
+# define S_IWUSR S_IWRITE
+#endif
+#if !S_IWUSR
+# define S_IWUSR 00200
+#endif
+#if !S_IWGRP
+# define S_IWGRP (S_IWUSR >> 3)
+#endif
+#if !S_IWOTH
+# define S_IWOTH (S_IWUSR >> 6)
+#endif
+
+#if !S_IXUSR && S_IEXEC
+# define S_IXUSR S_IEXEC
+#endif
+#if !S_IXUSR
+# define S_IXUSR 00100
+#endif
+#if !S_IXGRP
+# define S_IXGRP (S_IXUSR >> 3)
+#endif
+#if !S_IXOTH
+# define S_IXOTH (S_IXUSR >> 6)
+#endif
+
+#if !S_IRWXU
+# define S_IRWXU (S_IRUSR | S_IWUSR | S_IXUSR)
+#endif
+#if !S_IRWXG
+# define S_IRWXG (S_IRGRP | S_IWGRP | S_IXGRP)
+#endif
+#if !S_IRWXO
+# define S_IRWXO (S_IROTH | S_IWOTH | S_IXOTH)
+#endif
+
+/* S_IXUGO is a common extension to POSIX.  */
+#if !S_IXUGO
+# define S_IXUGO (S_IXUSR | S_IXGRP | S_IXOTH)
+#endif
+
+#ifndef S_IRWXUGO
+# define S_IRWXUGO (S_IRWXU | S_IRWXG | S_IRWXO)
+#endif
+
+/* Macros for futimens and utimensat.  */
+#ifndef UTIME_NOW
+# define UTIME_NOW (-1)
+# define UTIME_OMIT (-2)
+#endif
+
+
+#if @GNULIB_FCHMODAT@
+# if !@HAVE_FCHMODAT@
+_GL_FUNCDECL_SYS (fchmodat, int,
+                  (int fd, char const *file, mode_t mode, int flag)
+                  _GL_ARG_NONNULL ((2)));
+# endif
+_GL_CXXALIAS_SYS (fchmodat, int,
+                  (int fd, char const *file, mode_t mode, int flag));
+_GL_CXXALIASWARN (fchmodat);
+#elif defined GNULIB_POSIXCHECK
+# undef fchmodat
+# if HAVE_RAW_DECL_FCHMODAT
+_GL_WARN_ON_USE (fchmodat, "fchmodat is not portable - "
+                 "use gnulib module openat for portability");
+# endif
+#endif
+
+
+#if @GNULIB_FSTAT@
+# if @REPLACE_FSTAT@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef fstat
+#   define fstat rpl_fstat
+#  endif
+_GL_FUNCDECL_RPL (fstat, int, (int fd, struct stat *buf) _GL_ARG_NONNULL ((2)));
+_GL_CXXALIAS_RPL (fstat, int, (int fd, struct stat *buf));
+# else
+_GL_CXXALIAS_SYS (fstat, int, (int fd, struct stat *buf));
+# endif
+_GL_CXXALIASWARN (fstat);
+#elif @GNULIB_OVERRIDES_STRUCT_STAT@
+# undef fstat
+# define fstat fstat_used_without_requesting_gnulib_module_fstat
+#elif @WINDOWS_64_BIT_ST_SIZE@
+/* Above, we define stat to _stati64.  */
+# define fstat _fstati64
+#elif defined GNULIB_POSIXCHECK
+# undef fstat
+# if HAVE_RAW_DECL_FSTAT
+_GL_WARN_ON_USE (fstat, "fstat has portability problems - "
+                 "use gnulib module fstat for portability");
+# endif
+#endif
+
+
+#if @GNULIB_FSTATAT@
+# if @REPLACE_FSTATAT@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef fstatat
+#   define fstatat rpl_fstatat
+#  endif
+_GL_FUNCDECL_RPL (fstatat, int,
+                  (int fd, char const *name, struct stat *st, int flags)
+                  _GL_ARG_NONNULL ((2, 3)));
+_GL_CXXALIAS_RPL (fstatat, int,
+                  (int fd, char const *name, struct stat *st, int flags));
+# else
+#  if !@HAVE_FSTATAT@
+_GL_FUNCDECL_SYS (fstatat, int,
+                  (int fd, char const *name, struct stat *st, int flags)
+                  _GL_ARG_NONNULL ((2, 3)));
+#  endif
+_GL_CXXALIAS_SYS (fstatat, int,
+                  (int fd, char const *name, struct stat *st, int flags));
+# endif
+_GL_CXXALIASWARN (fstatat);
+#elif @GNULIB_OVERRIDES_STRUCT_STAT@
+# undef fstatat
+# define fstatat fstatat_used_without_requesting_gnulib_module_fstatat
+#elif defined GNULIB_POSIXCHECK
+# undef fstatat
+# if HAVE_RAW_DECL_FSTATAT
+_GL_WARN_ON_USE (fstatat, "fstatat is not portable - "
+                 "use gnulib module openat for portability");
+# endif
+#endif
+
+
+#if @GNULIB_FUTIMENS@
+/* Use the rpl_ prefix also on Solaris <= 9, because on Solaris 9 our futimens
+   implementation relies on futimesat, which on Solaris 10 makes an invocation
+   to futimens that is meant to invoke the libc's futimens(), not gnulib's
+   futimens().  */
+# if @REPLACE_FUTIMENS@ || (!@HAVE_FUTIMENS@ && defined __sun)
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef futimens
+#   define futimens rpl_futimens
+#  endif
+_GL_FUNCDECL_RPL (futimens, int, (int fd, struct timespec const times[2]));
+_GL_CXXALIAS_RPL (futimens, int, (int fd, struct timespec const times[2]));
+# else
+#  if !@HAVE_FUTIMENS@
+_GL_FUNCDECL_SYS (futimens, int, (int fd, struct timespec const times[2]));
+#  endif
+_GL_CXXALIAS_SYS (futimens, int, (int fd, struct timespec const times[2]));
+# endif
+# if @HAVE_FUTIMENS@
+_GL_CXXALIASWARN (futimens);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef futimens
+# if HAVE_RAW_DECL_FUTIMENS
+_GL_WARN_ON_USE (futimens, "futimens is not portable - "
+                 "use gnulib module futimens for portability");
+# endif
+#endif
+
+
+#if @GNULIB_LCHMOD@
+/* Change the mode of FILENAME to MODE, without dereferencing it if FILENAME
+   denotes a symbolic link.  */
+# if !@HAVE_LCHMOD@
+/* The lchmod replacement follows symbolic links.  Callers should take
+   this into account; lchmod should be applied only to arguments that
+   are known to not be symbolic links.  On hosts that lack lchmod,
+   this can lead to race conditions between the check and the
+   invocation of lchmod, but we know of no workarounds that are
+   reliable in general.  You might try requesting support for lchmod
+   from your operating system supplier.  */
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   define lchmod chmod
+#  endif
+/* Need to cast, because on mingw, the second parameter of chmod is
+                                                int mode.  */
+_GL_CXXALIAS_RPL_CAST_1 (lchmod, chmod, int,
+                         (const char *filename, mode_t mode));
+# else
+#  if 0 /* assume already declared */
+_GL_FUNCDECL_SYS (lchmod, int, (const char *filename, mode_t mode)
+                               _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (lchmod, int, (const char *filename, mode_t mode));
+# endif
+# if @HAVE_LCHMOD@
+_GL_CXXALIASWARN (lchmod);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef lchmod
+# if HAVE_RAW_DECL_LCHMOD
+_GL_WARN_ON_USE (lchmod, "lchmod is unportable - "
+                 "use gnulib module lchmod for portability");
+# endif
+#endif
+
+
+#if @GNULIB_LSTAT@
+# if ! @HAVE_LSTAT@
+/* mingw does not support symlinks, therefore it does not have lstat.  But
+   without links, stat does just fine.  */
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   define lstat stat
+#  endif
+_GL_CXXALIAS_RPL_1 (lstat, stat, int, (const char *name, struct stat *buf));
+# elif @REPLACE_LSTAT@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef lstat
+#   define lstat rpl_lstat
+#  endif
+_GL_FUNCDECL_RPL (lstat, int, (const char *name, struct stat *buf)
+                              _GL_ARG_NONNULL ((1, 2)));
+_GL_CXXALIAS_RPL (lstat, int, (const char *name, struct stat *buf));
+# else
+_GL_CXXALIAS_SYS (lstat, int, (const char *name, struct stat *buf));
+# endif
+# if @HAVE_LSTAT@
+_GL_CXXALIASWARN (lstat);
+# endif
+#elif @GNULIB_OVERRIDES_STRUCT_STAT@
+# undef lstat
+# define lstat lstat_used_without_requesting_gnulib_module_lstat
+#elif defined GNULIB_POSIXCHECK
+# undef lstat
+# if HAVE_RAW_DECL_LSTAT
+_GL_WARN_ON_USE (lstat, "lstat is unportable - "
+                 "use gnulib module lstat for portability");
+# endif
+#endif
+
+
+#if @REPLACE_MKDIR@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#  undef mkdir
+#  define mkdir rpl_mkdir
+# endif
+_GL_FUNCDECL_RPL (mkdir, int, (char const *name, mode_t mode)
+                              _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (mkdir, int, (char const *name, mode_t mode));
+#else
+/* mingw's _mkdir() function has 1 argument, but we pass 2 arguments.
+   Additionally, it declares _mkdir (and depending on compile flags, an
+   alias mkdir), only in the nonstandard includes <direct.h> and <io.h>,
+   which are included above.  */
+# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+
+#  if !GNULIB_defined_rpl_mkdir
+static int
+rpl_mkdir (char const *name, mode_t mode)
+{
+  return _mkdir (name);
+}
+#   define GNULIB_defined_rpl_mkdir 1
+#  endif
+
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   define mkdir rpl_mkdir
+#  endif
+_GL_CXXALIAS_RPL (mkdir, int, (char const *name, mode_t mode));
+# else
+_GL_CXXALIAS_SYS (mkdir, int, (char const *name, mode_t mode));
+# endif
+#endif
+_GL_CXXALIASWARN (mkdir);
+
+
+#if @GNULIB_MKDIRAT@
+# if !@HAVE_MKDIRAT@
+_GL_FUNCDECL_SYS (mkdirat, int, (int fd, char const *file, mode_t mode)
+                                _GL_ARG_NONNULL ((2)));
+# endif
+_GL_CXXALIAS_SYS (mkdirat, int, (int fd, char const *file, mode_t mode));
+_GL_CXXALIASWARN (mkdirat);
+#elif defined GNULIB_POSIXCHECK
+# undef mkdirat
+# if HAVE_RAW_DECL_MKDIRAT
+_GL_WARN_ON_USE (mkdirat, "mkdirat is not portable - "
+                 "use gnulib module openat for portability");
+# endif
+#endif
+
+
+#if @GNULIB_MKFIFO@
+# if @REPLACE_MKFIFO@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef mkfifo
+#   define mkfifo rpl_mkfifo
+#  endif
+_GL_FUNCDECL_RPL (mkfifo, int, (char const *file, mode_t mode)
+                               _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (mkfifo, int, (char const *file, mode_t mode));
+# else
+#  if !@HAVE_MKFIFO@
+_GL_FUNCDECL_SYS (mkfifo, int, (char const *file, mode_t mode)
+                               _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (mkfifo, int, (char const *file, mode_t mode));
+# endif
+_GL_CXXALIASWARN (mkfifo);
+#elif defined GNULIB_POSIXCHECK
+# undef mkfifo
+# if HAVE_RAW_DECL_MKFIFO
+_GL_WARN_ON_USE (mkfifo, "mkfifo is not portable - "
+                 "use gnulib module mkfifo for portability");
+# endif
+#endif
+
+
+#if @GNULIB_MKFIFOAT@
+# if !@HAVE_MKFIFOAT@
+_GL_FUNCDECL_SYS (mkfifoat, int, (int fd, char const *file, mode_t mode)
+                                 _GL_ARG_NONNULL ((2)));
+# endif
+_GL_CXXALIAS_SYS (mkfifoat, int, (int fd, char const *file, mode_t mode));
+_GL_CXXALIASWARN (mkfifoat);
+#elif defined GNULIB_POSIXCHECK
+# undef mkfifoat
+# if HAVE_RAW_DECL_MKFIFOAT
+_GL_WARN_ON_USE (mkfifoat, "mkfifoat is not portable - "
+                 "use gnulib module mkfifoat for portability");
+# endif
+#endif
+
+
+#if @GNULIB_MKNOD@
+# if @REPLACE_MKNOD@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef mknod
+#   define mknod rpl_mknod
+#  endif
+_GL_FUNCDECL_RPL (mknod, int, (char const *file, mode_t mode, dev_t dev)
+                              _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (mknod, int, (char const *file, mode_t mode, dev_t dev));
+# else
+#  if !@HAVE_MKNOD@
+_GL_FUNCDECL_SYS (mknod, int, (char const *file, mode_t mode, dev_t dev)
+                              _GL_ARG_NONNULL ((1)));
+#  endif
+/* Need to cast, because on OSF/1 5.1, the third parameter is '...'.  */
+_GL_CXXALIAS_SYS_CAST (mknod, int, (char const *file, mode_t mode, dev_t dev));
+# endif
+_GL_CXXALIASWARN (mknod);
+#elif defined GNULIB_POSIXCHECK
+# undef mknod
+# if HAVE_RAW_DECL_MKNOD
+_GL_WARN_ON_USE (mknod, "mknod is not portable - "
+                 "use gnulib module mknod for portability");
+# endif
+#endif
+
+
+#if @GNULIB_MKNODAT@
+# if !@HAVE_MKNODAT@
+_GL_FUNCDECL_SYS (mknodat, int,
+                  (int fd, char const *file, mode_t mode, dev_t dev)
+                  _GL_ARG_NONNULL ((2)));
+# endif
+_GL_CXXALIAS_SYS (mknodat, int,
+                  (int fd, char const *file, mode_t mode, dev_t dev));
+_GL_CXXALIASWARN (mknodat);
+#elif defined GNULIB_POSIXCHECK
+# undef mknodat
+# if HAVE_RAW_DECL_MKNODAT
+_GL_WARN_ON_USE (mknodat, "mknodat is not portable - "
+                 "use gnulib module mkfifoat for portability");
+# endif
+#endif
+
+
+#if @GNULIB_STAT@
+# if @REPLACE_STAT@
+#  if !@GNULIB_OVERRIDES_STRUCT_STAT@
+    /* We can't use the object-like #define stat rpl_stat, because of
+       struct stat.  This means that rpl_stat will not be used if the user
+       does (stat)(a,b).  Oh well.  */
+#   if defined _AIX && defined stat && defined _LARGE_FILES
+     /* With _LARGE_FILES defined, AIX (only) defines stat to stat64,
+        so we have to replace stat64() instead of stat(). */
+#    undef stat64
+#    define stat64(name, st) rpl_stat (name, st)
+#   elif @WINDOWS_64_BIT_ST_SIZE@
+     /* Above, we define stat to _stati64.  */
+#    if defined __MINGW32__ && defined _stati64
+#     ifndef _USE_32BIT_TIME_T
+       /* The system headers define _stati64 to _stat64.  */
+#      undef _stat64
+#      define _stat64(name, st) rpl_stat (name, st)
+#     endif
+#    elif defined _MSC_VER && defined _stati64
+#     ifdef _USE_32BIT_TIME_T
+       /* The system headers define _stati64 to _stat32i64.  */
+#      undef _stat32i64
+#      define _stat32i64(name, st) rpl_stat (name, st)
+#     else
+       /* The system headers define _stati64 to _stat64.  */
+#      undef _stat64
+#      define _stat64(name, st) rpl_stat (name, st)
+#     endif
+#    else
+#     undef _stati64
+#     define _stati64(name, st) rpl_stat (name, st)
+#    endif
+#   elif defined __MINGW32__ && defined stat
+#    ifdef _USE_32BIT_TIME_T
+      /* The system headers define stat to _stat32i64.  */
+#     undef _stat32i64
+#     define _stat32i64(name, st) rpl_stat (name, st)
+#    else
+      /* The system headers define stat to _stat64.  */
+#     undef _stat64
+#     define _stat64(name, st) rpl_stat (name, st)
+#    endif
+#   elif defined _MSC_VER && defined stat
+#    ifdef _USE_32BIT_TIME_T
+      /* The system headers define stat to _stat32.  */
+#     undef _stat32
+#     define _stat32(name, st) rpl_stat (name, st)
+#    else
+      /* The system headers define stat to _stat64i32.  */
+#     undef _stat64i32
+#     define _stat64i32(name, st) rpl_stat (name, st)
+#    endif
+#   else /* !(_AIX || __MINGW32__ || _MSC_VER) */
+#    undef stat
+#    define stat(name, st) rpl_stat (name, st)
+#   endif /* !_LARGE_FILES */
+#  endif /* !@GNULIB_OVERRIDES_STRUCT_STAT@ */
+_GL_EXTERN_C int stat (const char *name, struct stat *buf)
+                      _GL_ARG_NONNULL ((1, 2));
+# endif
+#elif @GNULIB_OVERRIDES_STRUCT_STAT@
+/* see above:
+  #define stat stat_used_without_requesting_gnulib_module_stat
+ */
+#elif defined GNULIB_POSIXCHECK
+# undef stat
+# if HAVE_RAW_DECL_STAT
+_GL_WARN_ON_USE (stat, "stat is unportable - "
+                 "use gnulib module stat for portability");
+# endif
+#endif
+
+
+#if @GNULIB_UTIMENSAT@
+/* Use the rpl_ prefix also on Solaris <= 9, because on Solaris 9 our utimensat
+   implementation relies on futimesat, which on Solaris 10 makes an invocation
+   to utimensat that is meant to invoke the libc's utimensat(), not gnulib's
+   utimensat().  */
+# if @REPLACE_UTIMENSAT@ || (!@HAVE_UTIMENSAT@ && defined __sun)
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef utimensat
+#   define utimensat rpl_utimensat
+#  endif
+_GL_FUNCDECL_RPL (utimensat, int, (int fd, char const *name,
+                                   struct timespec const times[2], int flag)
+                                  _GL_ARG_NONNULL ((2)));
+_GL_CXXALIAS_RPL (utimensat, int, (int fd, char const *name,
+                                   struct timespec const times[2], int flag));
+# else
+#  if !@HAVE_UTIMENSAT@
+_GL_FUNCDECL_SYS (utimensat, int, (int fd, char const *name,
+                                   struct timespec const times[2], int flag)
+                                  _GL_ARG_NONNULL ((2)));
+#  endif
+_GL_CXXALIAS_SYS (utimensat, int, (int fd, char const *name,
+                                   struct timespec const times[2], int flag));
+# endif
+# if @HAVE_UTIMENSAT@
+_GL_CXXALIASWARN (utimensat);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef utimensat
+# if HAVE_RAW_DECL_UTIMENSAT
+_GL_WARN_ON_USE (utimensat, "utimensat is not portable - "
+                 "use gnulib module utimensat for portability");
+# endif
+#endif
+
+
+#endif /* _@GUARD_PREFIX@_SYS_STAT_H */
+#endif /* _@GUARD_PREFIX@_SYS_STAT_H */
+#endif
diff --git a/gl/sys_time.in.h b/gl/sys_time.in.h
new file mode 100644
index 0000000..f141b52
--- /dev/null
+++ b/gl/sys_time.in.h
@@ -0,0 +1,220 @@
+/* Provide a more complete sys/time.h.
+
+   Copyright (C) 2007-2017 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
+
+/* Written by Paul Eggert.  */
+
+#ifndef _@GUARD_PREFIX@_SYS_TIME_H
+
+#if __GNUC__ >= 3
+@PRAGMA_SYSTEM_HEADER@
+#endif
+@PRAGMA_COLUMNS@
+
+/* On Cygwin and on many BSDish systems, <sys/time.h> includes itself
+   recursively via <sys/select.h>.
+   Simply delegate to the system's header in this case; it is a no-op.
+   Without this extra ifdef, the C++ gettimeofday declaration below
+   would be a forward declaration in gnulib's nested <sys/time.h>.  */
+#if defined _CYGWIN_SYS_TIME_H || defined _SYS_TIME_H || defined _SYS_TIME_H_
+# @INCLUDE_NEXT@ @NEXT_SYS_TIME_H@
+#else
+
+/* The include_next requires a split double-inclusion guard.  */
+#if @HAVE_SYS_TIME_H@
+# @INCLUDE_NEXT@ @NEXT_SYS_TIME_H@
+#endif
+
+#ifndef _@GUARD_PREFIX@_SYS_TIME_H
+#define _@GUARD_PREFIX@_SYS_TIME_H
+
+#if ! @HAVE_SYS_TIME_H@
+# include <time.h>
+#endif
+
+/* On native Windows with MSVC, get the 'struct timeval' type.
+   Also, on native Windows with a 64-bit time_t, where we are overriding the
+   'struct timeval' type, get all declarations of system functions whose
+   signature contains 'struct timeval'.  */
+#if (defined _MSC_VER || @REPLACE_STRUCT_TIMEVAL@) && @HAVE_WINSOCK2_H@ && !defined _GL_INCLUDING_WINSOCK2_H
+# define _GL_INCLUDING_WINSOCK2_H
+# include <winsock2.h>
+# undef _GL_INCLUDING_WINSOCK2_H
+#endif
+
+/* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
+
+/* The definition of _GL_ARG_NONNULL is copied here.  */
+
+/* The definition of _GL_WARN_ON_USE is copied here.  */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if !@HAVE_STRUCT_TIMEVAL@ || @REPLACE_STRUCT_TIMEVAL@
+
+# if @REPLACE_STRUCT_TIMEVAL@
+#  define timeval rpl_timeval
+# endif
+
+# if !GNULIB_defined_struct_timeval
+struct timeval
+{
+  time_t tv_sec;
+  long int tv_usec;
+};
+#  define GNULIB_defined_struct_timeval 1
+# endif
+
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#if @GNULIB_GETTIMEOFDAY@
+# if @REPLACE_GETTIMEOFDAY@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef gettimeofday
+#   define gettimeofday rpl_gettimeofday
+#  endif
+_GL_FUNCDECL_RPL (gettimeofday, int,
+                  (struct timeval *restrict, void *restrict)
+                  _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (gettimeofday, int,
+                  (struct timeval *restrict, void *restrict));
+# else
+#  if !@HAVE_GETTIMEOFDAY@
+_GL_FUNCDECL_SYS (gettimeofday, int,
+                  (struct timeval *restrict, void *restrict)
+                  _GL_ARG_NONNULL ((1)));
+#  endif
+/* Need to cast, because on glibc systems, by default, the second argument is
+                                                  struct timezone *.  */
+_GL_CXXALIAS_SYS_CAST (gettimeofday, int,
+                       (struct timeval *restrict, void *restrict));
+# endif
+_GL_CXXALIASWARN (gettimeofday);
+# if defined __cplusplus && defined GNULIB_NAMESPACE
+namespace GNULIB_NAMESPACE {
+  typedef ::timeval
+#undef timeval
+    timeval;
+}
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef gettimeofday
+# if HAVE_RAW_DECL_GETTIMEOFDAY
+_GL_WARN_ON_USE (gettimeofday, "gettimeofday is unportable - "
+                 "use gnulib module gettimeofday for portability");
+# endif
+#endif
+
+/* Hide some function declarations from <winsock2.h>.  */
+
+#if defined _MSC_VER && @HAVE_WINSOCK2_H@
+# if !defined _@GUARD_PREFIX@_UNISTD_H
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef close
+#   define close close_used_without_including_unistd_h
+#  else
+     _GL_WARN_ON_USE (close,
+                      "close() used without including <unistd.h>");
+#  endif
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef gethostname
+#   define gethostname gethostname_used_without_including_unistd_h
+#  else
+     _GL_WARN_ON_USE (gethostname,
+                      "gethostname() used without including <unistd.h>");
+#  endif
+# endif
+# if !defined _@GUARD_PREFIX@_SYS_SOCKET_H
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef socket
+#   define socket              socket_used_without_including_sys_socket_h
+#   undef connect
+#   define connect             connect_used_without_including_sys_socket_h
+#   undef accept
+#   define accept              accept_used_without_including_sys_socket_h
+#   undef bind
+#   define bind                bind_used_without_including_sys_socket_h
+#   undef getpeername
+#   define getpeername         getpeername_used_without_including_sys_socket_h
+#   undef getsockname
+#   define getsockname         getsockname_used_without_including_sys_socket_h
+#   undef getsockopt
+#   define getsockopt          getsockopt_used_without_including_sys_socket_h
+#   undef listen
+#   define listen              listen_used_without_including_sys_socket_h
+#   undef recv
+#   define recv                recv_used_without_including_sys_socket_h
+#   undef send
+#   define send                send_used_without_including_sys_socket_h
+#   undef recvfrom
+#   define recvfrom            recvfrom_used_without_including_sys_socket_h
+#   undef sendto
+#   define sendto              sendto_used_without_including_sys_socket_h
+#   undef setsockopt
+#   define setsockopt          setsockopt_used_without_including_sys_socket_h
+#   undef shutdown
+#   define shutdown            shutdown_used_without_including_sys_socket_h
+#  else
+     _GL_WARN_ON_USE (socket,
+                      "socket() used without including <sys/socket.h>");
+     _GL_WARN_ON_USE (connect,
+                      "connect() used without including <sys/socket.h>");
+     _GL_WARN_ON_USE (accept,
+                      "accept() used without including <sys/socket.h>");
+     _GL_WARN_ON_USE (bind,
+                      "bind() used without including <sys/socket.h>");
+     _GL_WARN_ON_USE (getpeername,
+                      "getpeername() used without including <sys/socket.h>");
+     _GL_WARN_ON_USE (getsockname,
+                      "getsockname() used without including <sys/socket.h>");
+     _GL_WARN_ON_USE (getsockopt,
+                      "getsockopt() used without including <sys/socket.h>");
+     _GL_WARN_ON_USE (listen,
+                      "listen() used without including <sys/socket.h>");
+     _GL_WARN_ON_USE (recv,
+                      "recv() used without including <sys/socket.h>");
+     _GL_WARN_ON_USE (send,
+                      "send() used without including <sys/socket.h>");
+     _GL_WARN_ON_USE (recvfrom,
+                      "recvfrom() used without including <sys/socket.h>");
+     _GL_WARN_ON_USE (sendto,
+                      "sendto() used without including <sys/socket.h>");
+     _GL_WARN_ON_USE (setsockopt,
+                      "setsockopt() used without including <sys/socket.h>");
+     _GL_WARN_ON_USE (shutdown,
+                      "shutdown() used without including <sys/socket.h>");
+#  endif
+# endif
+# if !defined _@GUARD_PREFIX@_SYS_SELECT_H
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef select
+#   define select select_used_without_including_sys_select_h
+#  else
+     _GL_WARN_ON_USE (select,
+                      "select() used without including <sys/select.h>");
+#  endif
+# endif
+#endif
+
+#endif /* _@GUARD_PREFIX@_SYS_TIME_H */
+#endif /* _CYGWIN_SYS_TIME_H */
+#endif /* _@GUARD_PREFIX@_SYS_TIME_H */
diff --git a/gl/sys_types.in.h b/gl/sys_types.in.h
new file mode 100644
index 0000000..f9fe622
--- /dev/null
+++ b/gl/sys_types.in.h
@@ -0,0 +1,95 @@
+/* Provide a more complete sys/types.h.
+
+   Copyright (C) 2011-2017 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
+
+#if __GNUC__ >= 3
+@PRAGMA_SYSTEM_HEADER@
+#endif
+@PRAGMA_COLUMNS@
+
+#ifndef _@GUARD_PREFIX@_SYS_TYPES_H
+
+/* The include_next requires a split double-inclusion guard.  */
+# define _GL_INCLUDING_SYS_TYPES_H
+#@INCLUDE_NEXT@ @NEXT_SYS_TYPES_H@
+# undef _GL_INCLUDING_SYS_TYPES_H
+
+#ifndef _@GUARD_PREFIX@_SYS_TYPES_H
+#define _@GUARD_PREFIX@_SYS_TYPES_H
+
+/* Override off_t if Large File Support is requested on native Windows.  */
+#if @WINDOWS_64_BIT_OFF_T@
+/* Same as int64_t in <stdint.h>.  */
+# if defined _MSC_VER
+#  define off_t __int64
+# else
+#  define off_t long long int
+# endif
+/* Indicator, for gnulib internal purposes.  */
+# define _GL_WINDOWS_64_BIT_OFF_T 1
+#endif
+
+/* Override dev_t and ino_t if distinguishable inodes support is requested
+   on native Windows.  */
+#if @WINDOWS_STAT_INODES@
+
+# if @WINDOWS_STAT_INODES@ == 2
+/* Experimental, not useful in Windows 10.  */
+
+/* Define dev_t to a 64-bit type.  */
+#  if !defined GNULIB_defined_dev_t
+typedef unsigned long long int rpl_dev_t;
+#   undef dev_t
+#   define dev_t rpl_dev_t
+#   define GNULIB_defined_dev_t 1
+#  endif
+
+/* Define ino_t to a 128-bit type.  */
+#  if !defined GNULIB_defined_ino_t
+/* MSVC does not have a 128-bit integer type.
+   GCC has a 128-bit integer type __int128, but only on 64-bit targets.  */
+typedef struct { unsigned long long int _gl_ino[2]; } rpl_ino_t;
+#   undef ino_t
+#   define ino_t rpl_ino_t
+#   define GNULIB_defined_ino_t 1
+#  endif
+
+# else /* @WINDOWS_STAT_INODES@ == 1 */
+
+/* Define ino_t to a 64-bit type.  */
+#  if !defined GNULIB_defined_ino_t
+typedef unsigned long long int rpl_ino_t;
+#   undef ino_t
+#   define ino_t rpl_ino_t
+#   define GNULIB_defined_ino_t 1
+#  endif
+
+# endif
+
+/* Indicator, for gnulib internal purposes.  */
+# define _GL_WINDOWS_STAT_INODES @WINDOWS_STAT_INODES@
+
+#endif
+
+/* MSVC 9 defines size_t in <stddef.h>, not in <sys/types.h>.  */
+/* But avoid namespace pollution on glibc systems.  */
+#if ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) \
+    && ! defined __GLIBC__
+# include <stddef.h>
+#endif
+
+#endif /* _@GUARD_PREFIX@_SYS_TYPES_H */
+#endif /* _@GUARD_PREFIX@_SYS_TYPES_H */
diff --git a/gl/tempname.c b/gl/tempname.c
new file mode 100644
index 0000000..26f411a
--- /dev/null
+++ b/gl/tempname.c
@@ -0,0 +1,323 @@
+/* tempname.c - generate the name of a temporary file.
+
+   Copyright (C) 1991-2003, 2005-2007, 2009-2017 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* Extracted from glibc sysdeps/posix/tempname.c.  See also tmpdir.c.  */
+
+#if !_LIBC
+# include <config.h>
+# include "tempname.h"
+#endif
+
+#include <sys/types.h>
+#include <assert.h>
+
+#include <errno.h>
+#ifndef __set_errno
+# define __set_errno(Val) errno = (Val)
+#endif
+
+#include <stdio.h>
+#ifndef P_tmpdir
+# define P_tmpdir "/tmp"
+#endif
+#ifndef TMP_MAX
+# define TMP_MAX 238328
+#endif
+#ifndef __GT_FILE
+# define __GT_FILE      0
+# define __GT_DIR       1
+# define __GT_NOCREATE  2
+#endif
+#if !_LIBC && (GT_FILE != __GT_FILE || GT_DIR != __GT_DIR       \
+               || GT_NOCREATE != __GT_NOCREATE)
+# error report this to bug-gnulib@gnu.org
+#endif
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <fcntl.h>
+#include <sys/time.h>
+#include <stdint.h>
+#include <unistd.h>
+
+#include <sys/stat.h>
+
+#if _LIBC
+# define struct_stat64 struct stat64
+#else
+# define struct_stat64 struct stat
+# define __try_tempname try_tempname
+# define __gen_tempname gen_tempname
+# define __getpid getpid
+# define __gettimeofday gettimeofday
+# define __mkdir mkdir
+# define __open open
+# define __lxstat64(version, file, buf) lstat (file, buf)
+#endif
+
+#ifdef _LIBC
+# include <hp-timing.h>
+# if HP_TIMING_AVAIL
+#  define RANDOM_BITS(Var) \
+  if (__builtin_expect (value == UINT64_C (0), 0))                            \
+    {                                                                         \
+      /* If this is the first time this function is used initialize           \
+         the variable we accumulate the value in to some somewhat             \
+         random value.  If we'd not do this programs at startup time          \
+         might have a reduced set of possible names, at least on slow         \
+         machines.  */                                                        \
+      struct timeval tv;                                                      \
+      __gettimeofday (&tv, NULL);                                             \
+      value = ((uint64_t) tv.tv_usec << 16) ^ tv.tv_sec;                      \
+    }                                                                         \
+  HP_TIMING_NOW (Var)
+# endif
+#endif
+
+/* Use the widest available unsigned type if uint64_t is not
+   available.  The algorithm below extracts a number less than 62**6
+   (approximately 2**35.725) from uint64_t, so ancient hosts where
+   uintmax_t is only 32 bits lose about 3.725 bits of randomness,
+   which is better than not having mkstemp at all.  */
+#if !defined UINT64_MAX && !defined uint64_t
+# define uint64_t uintmax_t
+#endif
+
+#if _LIBC
+/* Return nonzero if DIR is an existent directory.  */
+static int
+direxists (const char *dir)
+{
+  struct_stat64 buf;
+  return __xstat64 (_STAT_VER, dir, &buf) == 0 && S_ISDIR (buf.st_mode);
+}
+
+/* Path search algorithm, for tmpnam, tmpfile, etc.  If DIR is
+   non-null and exists, uses it; otherwise uses the first of $TMPDIR,
+   P_tmpdir, /tmp that exists.  Copies into TMPL a template suitable
+   for use with mk[s]temp.  Will fail (-1) if DIR is non-null and
+   doesn't exist, none of the searched dirs exists, or there's not
+   enough space in TMPL. */
+int
+__path_search (char *tmpl, size_t tmpl_len, const char *dir, const char *pfx,
+               int try_tmpdir)
+{
+  const char *d;
+  size_t dlen, plen;
+
+  if (!pfx || !pfx[0])
+    {
+      pfx = "file";
+      plen = 4;
+    }
+  else
+    {
+      plen = strlen (pfx);
+      if (plen > 5)
+        plen = 5;
+    }
+
+  if (try_tmpdir)
+    {
+      d = __secure_getenv ("TMPDIR");
+      if (d != NULL && direxists (d))
+        dir = d;
+      else if (dir != NULL && direxists (dir))
+        /* nothing */ ;
+      else
+        dir = NULL;
+    }
+  if (dir == NULL)
+    {
+      if (direxists (P_tmpdir))
+        dir = P_tmpdir;
+      else if (strcmp (P_tmpdir, "/tmp") != 0 && direxists ("/tmp"))
+        dir = "/tmp";
+      else
+        {
+          __set_errno (ENOENT);
+          return -1;
+        }
+    }
+
+  dlen = strlen (dir);
+  while (dlen > 1 && dir[dlen - 1] == '/')
+    dlen--;                     /* remove trailing slashes */
+
+  /* check we have room for "${dir}/${pfx}XXXXXX\0" */
+  if (tmpl_len < dlen + 1 + plen + 6 + 1)
+    {
+      __set_errno (EINVAL);
+      return -1;
+    }
+
+  sprintf (tmpl, "%.*s/%.*sXXXXXX", (int) dlen, dir, (int) plen, pfx);
+  return 0;
+}
+#endif /* _LIBC */
+
+/* These are the characters used in temporary file names.  */
+static const char letters[] =
+"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+
+int
+__try_tempname (char *tmpl, int suffixlen, void *args,
+                int (*tryfunc) (char *, void *))
+{
+  int len;
+  char *XXXXXX;
+  static uint64_t value;
+  uint64_t random_time_bits;
+  unsigned int count;
+  int fd = -1;
+  int save_errno = errno;
+
+  /* A lower bound on the number of temporary files to attempt to
+     generate.  The maximum total number of temporary file names that
+     can exist for a given template is 62**6.  It should never be
+     necessary to try all of these combinations.  Instead if a reasonable
+     number of names is tried (we define reasonable as 62**3) fail to
+     give the system administrator the chance to remove the problems.  */
+#define ATTEMPTS_MIN (62 * 62 * 62)
+
+  /* The number of times to attempt to generate a temporary file.  To
+     conform to POSIX, this must be no smaller than TMP_MAX.  */
+#if ATTEMPTS_MIN < TMP_MAX
+  unsigned int attempts = TMP_MAX;
+#else
+  unsigned int attempts = ATTEMPTS_MIN;
+#endif
+
+  len = strlen (tmpl);
+  if (len < 6 + suffixlen || memcmp (&tmpl[len - 6 - suffixlen], "XXXXXX", 6))
+    {
+      __set_errno (EINVAL);
+      return -1;
+    }
+
+  /* This is where the Xs start.  */
+  XXXXXX = &tmpl[len - 6 - suffixlen];
+
+  /* Get some more or less random data.  */
+#ifdef RANDOM_BITS
+  RANDOM_BITS (random_time_bits);
+#else
+  {
+    struct timeval tv;
+    __gettimeofday (&tv, NULL);
+    random_time_bits = ((uint64_t) tv.tv_usec << 16) ^ tv.tv_sec;
+  }
+#endif
+  value += random_time_bits ^ __getpid ();
+
+  for (count = 0; count < attempts; value += 7777, ++count)
+    {
+      uint64_t v = value;
+
+      /* Fill in the random bits.  */
+      XXXXXX[0] = letters[v % 62];
+      v /= 62;
+      XXXXXX[1] = letters[v % 62];
+      v /= 62;
+      XXXXXX[2] = letters[v % 62];
+      v /= 62;
+      XXXXXX[3] = letters[v % 62];
+      v /= 62;
+      XXXXXX[4] = letters[v % 62];
+      v /= 62;
+      XXXXXX[5] = letters[v % 62];
+
+      fd = tryfunc (tmpl, args);
+      if (fd >= 0)
+        {
+          __set_errno (save_errno);
+          return fd;
+        }
+      else if (errno != EEXIST)
+        return -1;
+    }
+
+  /* We got out of the loop because we ran out of combinations to try.  */
+  __set_errno (EEXIST);
+  return -1;
+}
+
+static int
+try_file (char *tmpl, void *flags)
+{
+  int *openflags = flags;
+  return __open (tmpl,
+                 (*openflags & ~O_ACCMODE)
+                 | O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR);
+}
+
+static int
+try_dir (char *tmpl, void *flags _GL_UNUSED)
+{
+  return __mkdir (tmpl, S_IRUSR | S_IWUSR | S_IXUSR);
+}
+
+static int
+try_nocreate (char *tmpl, void *flags _GL_UNUSED)
+{
+  struct_stat64 st;
+
+  if (__lxstat64 (_STAT_VER, tmpl, &st) == 0 || errno == EOVERFLOW)
+    __set_errno (EEXIST);
+  return errno == ENOENT ? 0 : -1;
+}
+
+/* Generate a temporary file name based on TMPL.  TMPL must match the
+   rules for mk[s]temp (i.e. end in "XXXXXX", possibly with a suffix).
+   The name constructed does not exist at the time of the call to
+   __gen_tempname.  TMPL is overwritten with the result.
+
+   KIND may be one of:
+   __GT_NOCREATE:       simply verify that the name does not exist
+                        at the time of the call.
+   __GT_FILE:           create the file using open(O_CREAT|O_EXCL)
+                        and return a read-write fd.  The file is mode 0600.
+   __GT_DIR:            create a directory, which will be mode 0700.
+
+   We use a clever algorithm to get hard-to-predict names. */
+int
+__gen_tempname (char *tmpl, int suffixlen, int flags, int kind)
+{
+  int (*tryfunc) (char *, void *);
+
+  switch (kind)
+    {
+    case __GT_FILE:
+      tryfunc = try_file;
+      break;
+
+    case __GT_DIR:
+      tryfunc = try_dir;
+      break;
+
+    case __GT_NOCREATE:
+      tryfunc = try_nocreate;
+      break;
+
+    default:
+      assert (! "invalid KIND in __gen_tempname");
+      abort ();
+    }
+  return __try_tempname (tmpl, suffixlen, &flags, tryfunc);
+}
diff --git a/gl/tempname.h b/gl/tempname.h
new file mode 100644
index 0000000..5b740e8
--- /dev/null
+++ b/gl/tempname.h
@@ -0,0 +1,65 @@
+/* Create a temporary file or directory.
+
+   Copyright (C) 2006, 2009-2017 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* header written by Eric Blake */
+
+#ifndef GL_TEMPNAME_H
+# define GL_TEMPNAME_H
+
+# include <stdio.h>
+
+# ifdef __GT_FILE
+#  define GT_FILE     __GT_FILE
+#  define GT_DIR      __GT_DIR
+#  define GT_NOCREATE __GT_NOCREATE
+# else
+#  define GT_FILE     0
+#  define GT_DIR      1
+#  define GT_NOCREATE 2
+# endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Generate a temporary file name based on TMPL.  TMPL must match the
+   rules for mk[s]temp (i.e. end in "XXXXXX", possibly with a suffix).
+   The name constructed does not exist at the time of the call to
+   gen_tempname.  TMPL is overwritten with the result.
+
+   KIND may be one of:
+   GT_NOCREATE:         simply verify that the name does not exist
+                        at the time of the call.
+   GT_FILE:             create a large file using open(O_CREAT|O_EXCL)
+                        and return a read-write fd.  The file is mode 0600.
+   GT_DIR:              create a directory, which will be mode 0700.
+
+   We use a clever algorithm to get hard-to-predict names. */
+extern int gen_tempname (char *tmpl, int suffixlen, int flags, int kind);
+
+/* Similar to gen_tempname, but TRYFUNC is called for each temporary
+   name to try.  If TRYFUNC returns a non-negative number, TRY_GEN_TEMPNAME
+   returns with this value.  Otherwise, if errno is set to EEXIST, another
+   name is tried, or else TRY_GEN_TEMPNAME returns -1. */
+extern int try_tempname (char *tmpl, int suffixlen, void *args,
+                         int (*tryfunc) (char *, void *));
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* GL_TEMPNAME_H */
diff --git a/gl/time.in.h b/gl/time.in.h
new file mode 100644
index 0000000..70dceb9
--- /dev/null
+++ b/gl/time.in.h
@@ -0,0 +1,350 @@
+/* A more-standard <time.h>.
+
+   Copyright (C) 2007-2017 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
+
+#if __GNUC__ >= 3
+@PRAGMA_SYSTEM_HEADER@
+#endif
+@PRAGMA_COLUMNS@
+
+/* Don't get in the way of glibc when it includes time.h merely to
+   declare a few standard symbols, rather than to declare all the
+   symbols.  (However, skip this for MinGW as it treats __need_time_t
+   incompatibly.)  Also, Solaris 8 <time.h> eventually includes itself
+   recursively; if that is happening, just include the system <time.h>
+   without adding our own declarations.  */
+#if (((defined __need_time_t || defined __need_clock_t \
+       || defined __need_timespec)                     \
+      && !defined __MINGW32__)                         \
+     || defined _@GUARD_PREFIX@_TIME_H)
+
+# @INCLUDE_NEXT@ @NEXT_TIME_H@
+
+#else
+
+# define _@GUARD_PREFIX@_TIME_H
+
+# @INCLUDE_NEXT@ @NEXT_TIME_H@
+
+/* NetBSD 5.0 mis-defines NULL.  */
+# include <stddef.h>
+
+/* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
+
+/* The definition of _GL_ARG_NONNULL is copied here.  */
+
+/* The definition of _GL_WARN_ON_USE is copied here.  */
+
+/* Some systems don't define struct timespec (e.g., AIX 4.1, Ultrix 4.3).
+   Or they define it with the wrong member names or define it in <sys/time.h>
+   (e.g., FreeBSD circa 1997).  Stock Mingw prior to 3.0 does not define it,
+   but the pthreads-win32 library defines it in <pthread.h>.  */
+# if ! @TIME_H_DEFINES_STRUCT_TIMESPEC@
+#  if @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@
+#   include <sys/time.h>
+#  elif @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@
+#   include <pthread.h>
+#  elif @UNISTD_H_DEFINES_STRUCT_TIMESPEC@
+#   include <unistd.h>
+#  else
+
+#   ifdef __cplusplus
+extern "C" {
+#   endif
+
+#   if !GNULIB_defined_struct_timespec
+#    undef timespec
+#    define timespec rpl_timespec
+struct timespec
+{
+  time_t tv_sec;
+  long int tv_nsec;
+};
+#    define GNULIB_defined_struct_timespec 1
+#   endif
+
+#   ifdef __cplusplus
+}
+#   endif
+
+#  endif
+# endif
+
+# if !GNULIB_defined_struct_time_t_must_be_integral
+/* Per http://austingroupbugs.net/view.php?id=327, POSIX requires
+   time_t to be an integer type, even though C99 permits floating
+   point.  We don't know of any implementation that uses floating
+   point, and it is much easier to write code that doesn't have to
+   worry about that corner case, so we force the issue.  */
+struct __time_t_must_be_integral {
+  unsigned int __floating_time_t_unsupported : (time_t) 1;
+};
+#  define GNULIB_defined_struct_time_t_must_be_integral 1
+# endif
+
+/* Sleep for at least RQTP seconds unless interrupted,  If interrupted,
+   return -1 and store the remaining time into RMTP.  See
+   <http://www.opengroup.org/susv3xsh/nanosleep.html>.  */
+# if @GNULIB_NANOSLEEP@
+#  if @REPLACE_NANOSLEEP@
+#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#    define nanosleep rpl_nanosleep
+#   endif
+_GL_FUNCDECL_RPL (nanosleep, int,
+                  (struct timespec const *__rqtp, struct timespec *__rmtp)
+                  _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (nanosleep, int,
+                  (struct timespec const *__rqtp, struct timespec *__rmtp));
+#  else
+#   if ! @HAVE_NANOSLEEP@
+_GL_FUNCDECL_SYS (nanosleep, int,
+                  (struct timespec const *__rqtp, struct timespec *__rmtp)
+                  _GL_ARG_NONNULL ((1)));
+#   endif
+_GL_CXXALIAS_SYS (nanosleep, int,
+                  (struct timespec const *__rqtp, struct timespec *__rmtp));
+#  endif
+_GL_CXXALIASWARN (nanosleep);
+# endif
+
+/* Initialize time conversion information.  */
+# if @GNULIB_TZSET@
+#  if @REPLACE_TZSET@
+#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#    undef tzset
+#    define tzset rpl_tzset
+#   endif
+_GL_FUNCDECL_RPL (tzset, void, (void));
+_GL_CXXALIAS_RPL (tzset, void, (void));
+#  else
+#   if ! @HAVE_TZSET@
+_GL_FUNCDECL_SYS (tzset, void, (void));
+#   endif
+_GL_CXXALIAS_SYS (tzset, void, (void));
+#  endif
+_GL_CXXALIASWARN (tzset);
+# endif
+
+/* Return the 'time_t' representation of TP and normalize TP.  */
+# if @GNULIB_MKTIME@
+#  if @REPLACE_MKTIME@
+#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#    define mktime rpl_mktime
+#   endif
+_GL_FUNCDECL_RPL (mktime, time_t, (struct tm *__tp) _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (mktime, time_t, (struct tm *__tp));
+#  else
+_GL_CXXALIAS_SYS (mktime, time_t, (struct tm *__tp));
+#  endif
+_GL_CXXALIASWARN (mktime);
+# endif
+
+/* Convert TIMER to RESULT, assuming local time and UTC respectively.  See
+   <http://www.opengroup.org/susv3xsh/localtime_r.html> and
+   <http://www.opengroup.org/susv3xsh/gmtime_r.html>.  */
+# if @GNULIB_TIME_R@
+#  if @REPLACE_LOCALTIME_R@
+#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#    undef localtime_r
+#    define localtime_r rpl_localtime_r
+#   endif
+_GL_FUNCDECL_RPL (localtime_r, struct tm *, (time_t const *restrict __timer,
+                                             struct tm *restrict __result)
+                                            _GL_ARG_NONNULL ((1, 2)));
+_GL_CXXALIAS_RPL (localtime_r, struct tm *, (time_t const *restrict __timer,
+                                             struct tm *restrict __result));
+#  else
+#   if ! @HAVE_DECL_LOCALTIME_R@
+_GL_FUNCDECL_SYS (localtime_r, struct tm *, (time_t const *restrict __timer,
+                                             struct tm *restrict __result)
+                                            _GL_ARG_NONNULL ((1, 2)));
+#   endif
+_GL_CXXALIAS_SYS (localtime_r, struct tm *, (time_t const *restrict __timer,
+                                             struct tm *restrict __result));
+#  endif
+#  if @HAVE_DECL_LOCALTIME_R@
+_GL_CXXALIASWARN (localtime_r);
+#  endif
+#  if @REPLACE_LOCALTIME_R@
+#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#    undef gmtime_r
+#    define gmtime_r rpl_gmtime_r
+#   endif
+_GL_FUNCDECL_RPL (gmtime_r, struct tm *, (time_t const *restrict __timer,
+                                          struct tm *restrict __result)
+                                         _GL_ARG_NONNULL ((1, 2)));
+_GL_CXXALIAS_RPL (gmtime_r, struct tm *, (time_t const *restrict __timer,
+                                          struct tm *restrict __result));
+#  else
+#   if ! @HAVE_DECL_LOCALTIME_R@
+_GL_FUNCDECL_SYS (gmtime_r, struct tm *, (time_t const *restrict __timer,
+                                          struct tm *restrict __result)
+                                         _GL_ARG_NONNULL ((1, 2)));
+#   endif
+_GL_CXXALIAS_SYS (gmtime_r, struct tm *, (time_t const *restrict __timer,
+                                          struct tm *restrict __result));
+#  endif
+#  if @HAVE_DECL_LOCALTIME_R@
+_GL_CXXALIASWARN (gmtime_r);
+#  endif
+# endif
+
+/* Convert TIMER to RESULT, assuming local time and UTC respectively.  See
+   <http://www.opengroup.org/susv3xsh/localtime.html> and
+   <http://www.opengroup.org/susv3xsh/gmtime.html>.  */
+# if @GNULIB_LOCALTIME@ || @REPLACE_LOCALTIME@
+#  if @REPLACE_LOCALTIME@
+#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#    undef localtime
+#    define localtime rpl_localtime
+#   endif
+_GL_FUNCDECL_RPL (localtime, struct tm *, (time_t const *__timer)
+		                          _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (localtime, struct tm *, (time_t const *__timer));
+#  else
+_GL_CXXALIAS_SYS (localtime, struct tm *, (time_t const *__timer));
+#  endif
+_GL_CXXALIASWARN (localtime);
+# endif
+
+# if 0 || @REPLACE_GMTIME@
+#  if @REPLACE_GMTIME@
+#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#    undef gmtime
+#    define gmtime rpl_gmtime
+#   endif
+_GL_FUNCDECL_RPL (gmtime, struct tm *, (time_t const *__timer)
+                                       _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (gmtime, struct tm *, (time_t const *__timer));
+#  else
+_GL_CXXALIAS_SYS (gmtime, struct tm *, (time_t const *__timer));
+#  endif
+_GL_CXXALIASWARN (gmtime);
+# endif
+
+/* Parse BUF as a timestamp, assuming FORMAT specifies its layout, and store
+   the resulting broken-down time into TM.  See
+   <http://www.opengroup.org/susv3xsh/strptime.html>.  */
+# if @GNULIB_STRPTIME@
+#  if ! @HAVE_STRPTIME@
+_GL_FUNCDECL_SYS (strptime, char *, (char const *restrict __buf,
+                                     char const *restrict __format,
+                                     struct tm *restrict __tm)
+                                    _GL_ARG_NONNULL ((1, 2, 3)));
+#  endif
+_GL_CXXALIAS_SYS (strptime, char *, (char const *restrict __buf,
+                                     char const *restrict __format,
+                                     struct tm *restrict __tm));
+_GL_CXXALIASWARN (strptime);
+# endif
+
+/* Convert *TP to a date and time string.  See
+   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/ctime.html>.  */
+# if @GNULIB_CTIME@
+#  if @REPLACE_CTIME@
+#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#    define ctime rpl_ctime
+#   endif
+_GL_FUNCDECL_RPL (ctime, char *, (time_t const *__tp)
+                                 _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (ctime, char *, (time_t const *__tp));
+#  else
+_GL_CXXALIAS_SYS (ctime, char *, (time_t const *__tp));
+#  endif
+_GL_CXXALIASWARN (ctime);
+# endif
+
+/* Convert *TP to a date and time string.  See
+   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/strftime.html>.  */
+# if @GNULIB_STRFTIME@
+#  if @REPLACE_STRFTIME@
+#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#    define strftime rpl_strftime
+#   endif
+_GL_FUNCDECL_RPL (strftime, size_t, (char *__buf, size_t __bufsize,
+                                     const char *__fmt, const struct tm *__tp)
+                                    _GL_ARG_NONNULL ((1, 3, 4)));
+_GL_CXXALIAS_RPL (strftime, size_t, (char *__buf, size_t __bufsize,
+                                     const char *__fmt, const struct tm *__tp));
+#  else
+_GL_CXXALIAS_SYS (strftime, size_t, (char *__buf, size_t __bufsize,
+                                     const char *__fmt, const struct tm *__tp));
+#  endif
+_GL_CXXALIASWARN (strftime);
+# endif
+
+# if defined _GNU_SOURCE && @GNULIB_TIME_RZ@ && ! @HAVE_TIMEZONE_T@
+typedef struct tm_zone *timezone_t;
+_GL_FUNCDECL_SYS (tzalloc, timezone_t, (char const *__name));
+_GL_CXXALIAS_SYS (tzalloc, timezone_t, (char const *__name));
+_GL_FUNCDECL_SYS (tzfree, void, (timezone_t __tz));
+_GL_CXXALIAS_SYS (tzfree, void, (timezone_t __tz));
+_GL_FUNCDECL_SYS (localtime_rz, struct tm *,
+                  (timezone_t __tz, time_t const *restrict __timer,
+                   struct tm *restrict __result) _GL_ARG_NONNULL ((2, 3)));
+_GL_CXXALIAS_SYS (localtime_rz, struct tm *,
+                  (timezone_t __tz, time_t const *restrict __timer,
+                   struct tm *restrict __result));
+_GL_FUNCDECL_SYS (mktime_z, time_t,
+                  (timezone_t __tz, struct tm *restrict __result)
+                  _GL_ARG_NONNULL ((2)));
+_GL_CXXALIAS_SYS (mktime_z, time_t,
+                  (timezone_t __tz, struct tm *restrict __result));
+# endif
+
+/* Convert TM to a time_t value, assuming UTC.  */
+# if @GNULIB_TIMEGM@
+#  if @REPLACE_TIMEGM@
+#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#    undef timegm
+#    define timegm rpl_timegm
+#   endif
+_GL_FUNCDECL_RPL (timegm, time_t, (struct tm *__tm) _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (timegm, time_t, (struct tm *__tm));
+#  else
+#   if ! @HAVE_TIMEGM@
+_GL_FUNCDECL_SYS (timegm, time_t, (struct tm *__tm) _GL_ARG_NONNULL ((1)));
+#   endif
+_GL_CXXALIAS_SYS (timegm, time_t, (struct tm *__tm));
+#  endif
+_GL_CXXALIASWARN (timegm);
+# endif
+
+/* Encourage applications to avoid unsafe functions that can overrun
+   buffers when given outlandish struct tm values.  Portable
+   applications should use strftime (or even sprintf) instead.  */
+# if defined GNULIB_POSIXCHECK
+#  undef asctime
+_GL_WARN_ON_USE (asctime, "asctime can overrun buffers in some cases - "
+                 "better use strftime (or even sprintf) instead");
+# endif
+# if defined GNULIB_POSIXCHECK
+#  undef asctime_r
+_GL_WARN_ON_USE (asctime, "asctime_r can overrun buffers in some cases - "
+                 "better use strftime (or even sprintf) instead");
+# endif
+# if defined GNULIB_POSIXCHECK
+#  undef ctime
+_GL_WARN_ON_USE (asctime, "ctime can overrun buffers in some cases - "
+                 "better use strftime (or even sprintf) instead");
+# endif
+# if defined GNULIB_POSIXCHECK
+#  undef ctime_r
+_GL_WARN_ON_USE (asctime, "ctime_r can overrun buffers in some cases - "
+                 "better use strftime (or even sprintf) instead");
+# endif
+
+#endif
diff --git a/gl/unistd.c b/gl/unistd.c
new file mode 100644
index 0000000..72bad1c
--- /dev/null
+++ b/gl/unistd.c
@@ -0,0 +1,4 @@
+#include <config.h>
+#define _GL_UNISTD_INLINE _GL_EXTERN_INLINE
+#include "unistd.h"
+typedef int dummy;
diff --git a/gl/unistd.in.h b/gl/unistd.in.h
new file mode 100644
index 0000000..7889a83
--- /dev/null
+++ b/gl/unistd.in.h
@@ -0,0 +1,1620 @@
+/* Substitute for and wrapper around <unistd.h>.
+   Copyright (C) 2003-2017 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
+
+#ifndef _@GUARD_PREFIX@_UNISTD_H
+
+#if __GNUC__ >= 3
+@PRAGMA_SYSTEM_HEADER@
+#endif
+@PRAGMA_COLUMNS@
+
+#ifdef _GL_INCLUDING_UNISTD_H
+/* Special invocation convention:
+   - On Mac OS X 10.3.9 we have a sequence of nested includes
+     <unistd.h> -> <signal.h> -> <pthread.h> -> <unistd.h>
+     In this situation, the functions are not yet declared, therefore we cannot
+     provide the C++ aliases.  */
+
+#@INCLUDE_NEXT@ @NEXT_UNISTD_H@
+
+#else
+/* Normal invocation convention.  */
+
+/* The include_next requires a split double-inclusion guard.  */
+#if @HAVE_UNISTD_H@
+# define _GL_INCLUDING_UNISTD_H
+# @INCLUDE_NEXT@ @NEXT_UNISTD_H@
+# undef _GL_INCLUDING_UNISTD_H
+#endif
+
+/* Get all possible declarations of gethostname().  */
+#if @GNULIB_GETHOSTNAME@ && @UNISTD_H_HAVE_WINSOCK2_H@ \
+  && !defined _GL_INCLUDING_WINSOCK2_H
+# define _GL_INCLUDING_WINSOCK2_H
+# include <winsock2.h>
+# undef _GL_INCLUDING_WINSOCK2_H
+#endif
+
+#if !defined _@GUARD_PREFIX@_UNISTD_H && !defined _GL_INCLUDING_WINSOCK2_H
+#define _@GUARD_PREFIX@_UNISTD_H
+
+/* NetBSD 5.0 mis-defines NULL.  Also get size_t.  */
+#include <stddef.h>
+
+/* mingw doesn't define the SEEK_* or *_FILENO macros in <unistd.h>.  */
+/* MSVC declares 'unlink' in <stdio.h>, not in <unistd.h>.  We must include
+   it before we  #define unlink rpl_unlink.  */
+/* Cygwin 1.7.1 declares symlinkat in <stdio.h>, not in <unistd.h>.  */
+/* But avoid namespace pollution on glibc systems.  */
+#if (!(defined SEEK_CUR && defined SEEK_END && defined SEEK_SET) \
+     || ((@GNULIB_UNLINK@ || defined GNULIB_POSIXCHECK) \
+         && ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)) \
+     || ((@GNULIB_SYMLINKAT@ || defined GNULIB_POSIXCHECK) \
+         && defined __CYGWIN__)) \
+    && ! defined __GLIBC__
+# include <stdio.h>
+#endif
+
+/* Cygwin 1.7.1 declares unlinkat in <fcntl.h>, not in <unistd.h>.  */
+/* But avoid namespace pollution on glibc systems.  */
+#if (@GNULIB_UNLINKAT@ || defined GNULIB_POSIXCHECK) && defined __CYGWIN__ \
+    && ! defined __GLIBC__
+# include <fcntl.h>
+#endif
+
+/* mingw fails to declare _exit in <unistd.h>.  */
+/* mingw, MSVC, BeOS, Haiku declare environ in <stdlib.h>, not in
+   <unistd.h>.  */
+/* Solaris declares getcwd not only in <unistd.h> but also in <stdlib.h>.  */
+/* OSF Tru64 Unix cannot see gnulib rpl_strtod when system <stdlib.h> is
+   included here.  */
+/* But avoid namespace pollution on glibc systems.  */
+#if !defined __GLIBC__ && !defined __osf__
+# define __need_system_stdlib_h
+# include <stdlib.h>
+# undef __need_system_stdlib_h
+#endif
+
+/* Native Windows platforms declare chdir, getcwd, rmdir in
+   <io.h> and/or <direct.h>, not in <unistd.h>.
+   They also declare access(), chmod(), close(), dup(), dup2(), isatty(),
+   lseek(), read(), unlink(), write() in <io.h>.  */
+#if ((@GNULIB_CHDIR@ || @GNULIB_GETCWD@ || @GNULIB_RMDIR@ \
+      || defined GNULIB_POSIXCHECK) \
+     && ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__))
+# include <io.h>     /* mingw32, mingw64 */
+# include <direct.h> /* mingw64, MSVC 9 */
+#elif (@GNULIB_CLOSE@ || @GNULIB_DUP@ || @GNULIB_DUP2@ || @GNULIB_ISATTY@ \
+       || @GNULIB_LSEEK@ || @GNULIB_READ@ || @GNULIB_UNLINK@ || @GNULIB_WRITE@ \
+       || defined GNULIB_POSIXCHECK) \
+      && ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)
+# include <io.h>
+#endif
+
+/* AIX and OSF/1 5.1 declare getdomainname in <netdb.h>, not in <unistd.h>.
+   NonStop Kernel declares gethostname in <netdb.h>, not in <unistd.h>.  */
+/* But avoid namespace pollution on glibc systems.  */
+#if ((@GNULIB_GETDOMAINNAME@ && (defined _AIX || defined __osf__)) \
+     || (@GNULIB_GETHOSTNAME@ && defined __TANDEM)) \
+    && !defined __GLIBC__
+# include <netdb.h>
+#endif
+
+/* MSVC defines off_t in <sys/types.h>.
+   May also define off_t to a 64-bit type on native Windows.  */
+#if !@HAVE_UNISTD_H@ || @WINDOWS_64_BIT_OFF_T@
+/* Get off_t.  */
+# include <sys/types.h>
+#endif
+
+#if (@GNULIB_READ@ || @GNULIB_WRITE@ \
+     || @GNULIB_READLINK@ || @GNULIB_READLINKAT@ \
+     || @GNULIB_PREAD@ || @GNULIB_PWRITE@ || defined GNULIB_POSIXCHECK)
+/* Get ssize_t.  */
+# include <sys/types.h>
+#endif
+
+/* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
+
+/* The definition of _GL_ARG_NONNULL is copied here.  */
+
+/* The definition of _GL_WARN_ON_USE is copied here.  */
+
+
+/* Get getopt(), optarg, optind, opterr, optopt.
+   But avoid namespace pollution on glibc systems.  */
+#if @GNULIB_UNISTD_H_GETOPT@ && !defined __GLIBC__ && !defined _GL_SYSTEM_GETOPT
+# include <getopt-cdefs.h>
+# include <getopt-pfx-core.h>
+#endif
+
+#ifndef _GL_INLINE_HEADER_BEGIN
+ #error "Please include config.h first."
+#endif
+_GL_INLINE_HEADER_BEGIN
+#ifndef _GL_UNISTD_INLINE
+# define _GL_UNISTD_INLINE _GL_INLINE
+#endif
+
+/* Hide some function declarations from <winsock2.h>.  */
+
+#if @GNULIB_GETHOSTNAME@ && @UNISTD_H_HAVE_WINSOCK2_H@
+# if !defined _@GUARD_PREFIX@_SYS_SOCKET_H
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef socket
+#   define socket              socket_used_without_including_sys_socket_h
+#   undef connect
+#   define connect             connect_used_without_including_sys_socket_h
+#   undef accept
+#   define accept              accept_used_without_including_sys_socket_h
+#   undef bind
+#   define bind                bind_used_without_including_sys_socket_h
+#   undef getpeername
+#   define getpeername         getpeername_used_without_including_sys_socket_h
+#   undef getsockname
+#   define getsockname         getsockname_used_without_including_sys_socket_h
+#   undef getsockopt
+#   define getsockopt          getsockopt_used_without_including_sys_socket_h
+#   undef listen
+#   define listen              listen_used_without_including_sys_socket_h
+#   undef recv
+#   define recv                recv_used_without_including_sys_socket_h
+#   undef send
+#   define send                send_used_without_including_sys_socket_h
+#   undef recvfrom
+#   define recvfrom            recvfrom_used_without_including_sys_socket_h
+#   undef sendto
+#   define sendto              sendto_used_without_including_sys_socket_h
+#   undef setsockopt
+#   define setsockopt          setsockopt_used_without_including_sys_socket_h
+#   undef shutdown
+#   define shutdown            shutdown_used_without_including_sys_socket_h
+#  else
+    _GL_WARN_ON_USE (socket,
+                     "socket() used without including <sys/socket.h>");
+    _GL_WARN_ON_USE (connect,
+                     "connect() used without including <sys/socket.h>");
+    _GL_WARN_ON_USE (accept,
+                     "accept() used without including <sys/socket.h>");
+    _GL_WARN_ON_USE (bind,
+                     "bind() used without including <sys/socket.h>");
+    _GL_WARN_ON_USE (getpeername,
+                     "getpeername() used without including <sys/socket.h>");
+    _GL_WARN_ON_USE (getsockname,
+                     "getsockname() used without including <sys/socket.h>");
+    _GL_WARN_ON_USE (getsockopt,
+                     "getsockopt() used without including <sys/socket.h>");
+    _GL_WARN_ON_USE (listen,
+                     "listen() used without including <sys/socket.h>");
+    _GL_WARN_ON_USE (recv,
+                     "recv() used without including <sys/socket.h>");
+    _GL_WARN_ON_USE (send,
+                     "send() used without including <sys/socket.h>");
+    _GL_WARN_ON_USE (recvfrom,
+                     "recvfrom() used without including <sys/socket.h>");
+    _GL_WARN_ON_USE (sendto,
+                     "sendto() used without including <sys/socket.h>");
+    _GL_WARN_ON_USE (setsockopt,
+                     "setsockopt() used without including <sys/socket.h>");
+    _GL_WARN_ON_USE (shutdown,
+                     "shutdown() used without including <sys/socket.h>");
+#  endif
+# endif
+# if !defined _@GUARD_PREFIX@_SYS_SELECT_H
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef select
+#   define select              select_used_without_including_sys_select_h
+#  else
+    _GL_WARN_ON_USE (select,
+                     "select() used without including <sys/select.h>");
+#  endif
+# endif
+#endif
+
+
+/* OS/2 EMX lacks these macros.  */
+#ifndef STDIN_FILENO
+# define STDIN_FILENO 0
+#endif
+#ifndef STDOUT_FILENO
+# define STDOUT_FILENO 1
+#endif
+#ifndef STDERR_FILENO
+# define STDERR_FILENO 2
+#endif
+
+/* Ensure *_OK macros exist.  */
+#ifndef F_OK
+# define F_OK 0
+# define X_OK 1
+# define W_OK 2
+# define R_OK 4
+#endif
+
+
+/* Declare overridden functions.  */
+
+
+#if defined GNULIB_POSIXCHECK
+/* The access() function is a security risk.  */
+_GL_WARN_ON_USE (access, "the access function is a security risk - "
+                 "use the gnulib module faccessat instead");
+#endif
+
+
+#if @GNULIB_CHDIR@
+_GL_CXXALIAS_SYS (chdir, int, (const char *file) _GL_ARG_NONNULL ((1)));
+_GL_CXXALIASWARN (chdir);
+#elif defined GNULIB_POSIXCHECK
+# undef chdir
+# if HAVE_RAW_DECL_CHDIR
+_GL_WARN_ON_USE (chown, "chdir is not always in <unistd.h> - "
+                 "use gnulib module chdir for portability");
+# endif
+#endif
+
+
+#if @GNULIB_CHOWN@
+/* Change the owner of FILE to UID (if UID is not -1) and the group of FILE
+   to GID (if GID is not -1).  Follow symbolic links.
+   Return 0 if successful, otherwise -1 and errno set.
+   See the POSIX:2008 specification
+   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/chown.html.  */
+# if @REPLACE_CHOWN@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef chown
+#   define chown rpl_chown
+#  endif
+_GL_FUNCDECL_RPL (chown, int, (const char *file, uid_t uid, gid_t gid)
+                              _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (chown, int, (const char *file, uid_t uid, gid_t gid));
+# else
+#  if !@HAVE_CHOWN@
+_GL_FUNCDECL_SYS (chown, int, (const char *file, uid_t uid, gid_t gid)
+                              _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (chown, int, (const char *file, uid_t uid, gid_t gid));
+# endif
+_GL_CXXALIASWARN (chown);
+#elif defined GNULIB_POSIXCHECK
+# undef chown
+# if HAVE_RAW_DECL_CHOWN
+_GL_WARN_ON_USE (chown, "chown fails to follow symlinks on some systems and "
+                 "doesn't treat a uid or gid of -1 on some systems - "
+                 "use gnulib module chown for portability");
+# endif
+#endif
+
+
+#if @GNULIB_CLOSE@
+# if @REPLACE_CLOSE@
+/* Automatically included by modules that need a replacement for close.  */
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef close
+#   define close rpl_close
+#  endif
+_GL_FUNCDECL_RPL (close, int, (int fd));
+_GL_CXXALIAS_RPL (close, int, (int fd));
+# else
+_GL_CXXALIAS_SYS (close, int, (int fd));
+# endif
+_GL_CXXALIASWARN (close);
+#elif @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@
+# undef close
+# define close close_used_without_requesting_gnulib_module_close
+#elif defined GNULIB_POSIXCHECK
+# undef close
+/* Assume close is always declared.  */
+_GL_WARN_ON_USE (close, "close does not portably work on sockets - "
+                 "use gnulib module close for portability");
+#endif
+
+
+#if @GNULIB_DUP@
+# if @REPLACE_DUP@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   define dup rpl_dup
+#  endif
+_GL_FUNCDECL_RPL (dup, int, (int oldfd));
+_GL_CXXALIAS_RPL (dup, int, (int oldfd));
+# else
+_GL_CXXALIAS_SYS (dup, int, (int oldfd));
+# endif
+_GL_CXXALIASWARN (dup);
+#elif defined GNULIB_POSIXCHECK
+# undef dup
+# if HAVE_RAW_DECL_DUP
+_GL_WARN_ON_USE (dup, "dup is unportable - "
+                 "use gnulib module dup for portability");
+# endif
+#endif
+
+
+#if @GNULIB_DUP2@
+/* Copy the file descriptor OLDFD into file descriptor NEWFD.  Do nothing if
+   NEWFD = OLDFD, otherwise close NEWFD first if it is open.
+   Return newfd if successful, otherwise -1 and errno set.
+   See the POSIX:2008 specification
+   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/dup2.html>.  */
+# if @REPLACE_DUP2@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   define dup2 rpl_dup2
+#  endif
+_GL_FUNCDECL_RPL (dup2, int, (int oldfd, int newfd));
+_GL_CXXALIAS_RPL (dup2, int, (int oldfd, int newfd));
+# else
+#  if !@HAVE_DUP2@
+_GL_FUNCDECL_SYS (dup2, int, (int oldfd, int newfd));
+#  endif
+_GL_CXXALIAS_SYS (dup2, int, (int oldfd, int newfd));
+# endif
+_GL_CXXALIASWARN (dup2);
+#elif defined GNULIB_POSIXCHECK
+# undef dup2
+# if HAVE_RAW_DECL_DUP2
+_GL_WARN_ON_USE (dup2, "dup2 is unportable - "
+                 "use gnulib module dup2 for portability");
+# endif
+#endif
+
+
+#if @GNULIB_DUP3@
+/* Copy the file descriptor OLDFD into file descriptor NEWFD, with the
+   specified flags.
+   The flags are a bitmask, possibly including O_CLOEXEC (defined in <fcntl.h>)
+   and O_TEXT, O_BINARY (defined in "binary-io.h").
+   Close NEWFD first if it is open.
+   Return newfd if successful, otherwise -1 and errno set.
+   See the Linux man page at
+   <http://www.kernel.org/doc/man-pages/online/pages/man2/dup3.2.html>.  */
+# if @HAVE_DUP3@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   define dup3 rpl_dup3
+#  endif
+_GL_FUNCDECL_RPL (dup3, int, (int oldfd, int newfd, int flags));
+_GL_CXXALIAS_RPL (dup3, int, (int oldfd, int newfd, int flags));
+# else
+_GL_FUNCDECL_SYS (dup3, int, (int oldfd, int newfd, int flags));
+_GL_CXXALIAS_SYS (dup3, int, (int oldfd, int newfd, int flags));
+# endif
+_GL_CXXALIASWARN (dup3);
+#elif defined GNULIB_POSIXCHECK
+# undef dup3
+# if HAVE_RAW_DECL_DUP3
+_GL_WARN_ON_USE (dup3, "dup3 is unportable - "
+                 "use gnulib module dup3 for portability");
+# endif
+#endif
+
+
+#if @GNULIB_ENVIRON@
+# if !@HAVE_DECL_ENVIRON@
+/* Set of environment variables and values.  An array of strings of the form
+   "VARIABLE=VALUE", terminated with a NULL.  */
+#  if defined __APPLE__ && defined __MACH__
+#   include <TargetConditionals.h>
+#   if !TARGET_OS_IPHONE && !TARGET_IPHONE_SIMULATOR
+#    define _GL_USE_CRT_EXTERNS
+#   endif
+#  endif
+#  ifdef _GL_USE_CRT_EXTERNS
+#   include <crt_externs.h>
+#   define environ (*_NSGetEnviron ())
+#  else
+#   ifdef __cplusplus
+extern "C" {
+#   endif
+extern char **environ;
+#   ifdef __cplusplus
+}
+#   endif
+#  endif
+# endif
+#elif defined GNULIB_POSIXCHECK
+# if HAVE_RAW_DECL_ENVIRON
+_GL_UNISTD_INLINE char ***
+rpl_environ (void)
+{
+  return &environ;
+}
+_GL_WARN_ON_USE (rpl_environ, "environ is unportable - "
+                 "use gnulib module environ for portability");
+#  undef environ
+#  define environ (*rpl_environ ())
+# endif
+#endif
+
+
+#if @GNULIB_EUIDACCESS@
+/* Like access(), except that it uses the effective user id and group id of
+   the current process.  */
+# if !@HAVE_EUIDACCESS@
+_GL_FUNCDECL_SYS (euidaccess, int, (const char *filename, int mode)
+                                   _GL_ARG_NONNULL ((1)));
+# endif
+_GL_CXXALIAS_SYS (euidaccess, int, (const char *filename, int mode));
+_GL_CXXALIASWARN (euidaccess);
+# if defined GNULIB_POSIXCHECK
+/* Like access(), this function is a security risk.  */
+_GL_WARN_ON_USE (euidaccess, "the euidaccess function is a security risk - "
+                 "use the gnulib module faccessat instead");
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef euidaccess
+# if HAVE_RAW_DECL_EUIDACCESS
+_GL_WARN_ON_USE (euidaccess, "euidaccess is unportable - "
+                 "use gnulib module euidaccess for portability");
+# endif
+#endif
+
+
+#if @GNULIB_FACCESSAT@
+# if !@HAVE_FACCESSAT@
+_GL_FUNCDECL_SYS (faccessat, int,
+                  (int fd, char const *file, int mode, int flag)
+                  _GL_ARG_NONNULL ((2)));
+# endif
+_GL_CXXALIAS_SYS (faccessat, int,
+                  (int fd, char const *file, int mode, int flag));
+_GL_CXXALIASWARN (faccessat);
+#elif defined GNULIB_POSIXCHECK
+# undef faccessat
+# if HAVE_RAW_DECL_FACCESSAT
+_GL_WARN_ON_USE (faccessat, "faccessat is not portable - "
+                 "use gnulib module faccessat for portability");
+# endif
+#endif
+
+
+#if @GNULIB_FCHDIR@
+/* Change the process' current working directory to the directory on which
+   the given file descriptor is open.
+   Return 0 if successful, otherwise -1 and errno set.
+   See the POSIX:2008 specification
+   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/fchdir.html>.  */
+# if ! @HAVE_FCHDIR@
+_GL_FUNCDECL_SYS (fchdir, int, (int /*fd*/));
+
+/* Gnulib internal hooks needed to maintain the fchdir metadata.  */
+_GL_EXTERN_C int _gl_register_fd (int fd, const char *filename)
+     _GL_ARG_NONNULL ((2));
+_GL_EXTERN_C void _gl_unregister_fd (int fd);
+_GL_EXTERN_C int _gl_register_dup (int oldfd, int newfd);
+_GL_EXTERN_C const char *_gl_directory_name (int fd);
+
+# else
+#  if !@HAVE_DECL_FCHDIR@
+_GL_FUNCDECL_SYS (fchdir, int, (int /*fd*/));
+#  endif
+# endif
+_GL_CXXALIAS_SYS (fchdir, int, (int /*fd*/));
+_GL_CXXALIASWARN (fchdir);
+#elif defined GNULIB_POSIXCHECK
+# undef fchdir
+# if HAVE_RAW_DECL_FCHDIR
+_GL_WARN_ON_USE (fchdir, "fchdir is unportable - "
+                 "use gnulib module fchdir for portability");
+# endif
+#endif
+
+
+#if @GNULIB_FCHOWNAT@
+# if @REPLACE_FCHOWNAT@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef fchownat
+#   define fchownat rpl_fchownat
+#  endif
+_GL_FUNCDECL_RPL (fchownat, int, (int fd, char const *file,
+                                  uid_t owner, gid_t group, int flag)
+                                 _GL_ARG_NONNULL ((2)));
+_GL_CXXALIAS_RPL (fchownat, int, (int fd, char const *file,
+                                  uid_t owner, gid_t group, int flag));
+# else
+#  if !@HAVE_FCHOWNAT@
+_GL_FUNCDECL_SYS (fchownat, int, (int fd, char const *file,
+                                  uid_t owner, gid_t group, int flag)
+                                 _GL_ARG_NONNULL ((2)));
+#  endif
+_GL_CXXALIAS_SYS (fchownat, int, (int fd, char const *file,
+                                  uid_t owner, gid_t group, int flag));
+# endif
+_GL_CXXALIASWARN (fchownat);
+#elif defined GNULIB_POSIXCHECK
+# undef fchownat
+# if HAVE_RAW_DECL_FCHOWNAT
+_GL_WARN_ON_USE (fchownat, "fchownat is not portable - "
+                 "use gnulib module openat for portability");
+# endif
+#endif
+
+
+#if @GNULIB_FDATASYNC@
+/* Synchronize changes to a file.
+   Return 0 if successful, otherwise -1 and errno set.
+   See POSIX:2008 specification
+   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/fdatasync.html>.  */
+# if !@HAVE_FDATASYNC@ || !@HAVE_DECL_FDATASYNC@
+_GL_FUNCDECL_SYS (fdatasync, int, (int fd));
+# endif
+_GL_CXXALIAS_SYS (fdatasync, int, (int fd));
+_GL_CXXALIASWARN (fdatasync);
+#elif defined GNULIB_POSIXCHECK
+# undef fdatasync
+# if HAVE_RAW_DECL_FDATASYNC
+_GL_WARN_ON_USE (fdatasync, "fdatasync is unportable - "
+                 "use gnulib module fdatasync for portability");
+# endif
+#endif
+
+
+#if @GNULIB_FSYNC@
+/* Synchronize changes, including metadata, to a file.
+   Return 0 if successful, otherwise -1 and errno set.
+   See POSIX:2008 specification
+   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/fsync.html>.  */
+# if !@HAVE_FSYNC@
+_GL_FUNCDECL_SYS (fsync, int, (int fd));
+# endif
+_GL_CXXALIAS_SYS (fsync, int, (int fd));
+_GL_CXXALIASWARN (fsync);
+#elif defined GNULIB_POSIXCHECK
+# undef fsync
+# if HAVE_RAW_DECL_FSYNC
+_GL_WARN_ON_USE (fsync, "fsync is unportable - "
+                 "use gnulib module fsync for portability");
+# endif
+#endif
+
+
+#if @GNULIB_FTRUNCATE@
+/* Change the size of the file to which FD is opened to become equal to LENGTH.
+   Return 0 if successful, otherwise -1 and errno set.
+   See the POSIX:2008 specification
+   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/ftruncate.html>.  */
+# if @REPLACE_FTRUNCATE@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef ftruncate
+#   define ftruncate rpl_ftruncate
+#  endif
+_GL_FUNCDECL_RPL (ftruncate, int, (int fd, off_t length));
+_GL_CXXALIAS_RPL (ftruncate, int, (int fd, off_t length));
+# else
+#  if !@HAVE_FTRUNCATE@
+_GL_FUNCDECL_SYS (ftruncate, int, (int fd, off_t length));
+#  endif
+_GL_CXXALIAS_SYS (ftruncate, int, (int fd, off_t length));
+# endif
+_GL_CXXALIASWARN (ftruncate);
+#elif defined GNULIB_POSIXCHECK
+# undef ftruncate
+# if HAVE_RAW_DECL_FTRUNCATE
+_GL_WARN_ON_USE (ftruncate, "ftruncate is unportable - "
+                 "use gnulib module ftruncate for portability");
+# endif
+#endif
+
+
+#if @GNULIB_GETCWD@
+/* Get the name of the current working directory, and put it in SIZE bytes
+   of BUF.
+   Return BUF if successful, or NULL if the directory couldn't be determined
+   or SIZE was too small.
+   See the POSIX:2008 specification
+   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/getcwd.html>.
+   Additionally, the gnulib module 'getcwd' guarantees the following GNU
+   extension: If BUF is NULL, an array is allocated with 'malloc'; the array
+   is SIZE bytes long, unless SIZE == 0, in which case it is as big as
+   necessary.  */
+# if @REPLACE_GETCWD@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   define getcwd rpl_getcwd
+#  endif
+_GL_FUNCDECL_RPL (getcwd, char *, (char *buf, size_t size));
+_GL_CXXALIAS_RPL (getcwd, char *, (char *buf, size_t size));
+# else
+/* Need to cast, because on mingw, the second parameter is
+                                                   int size.  */
+_GL_CXXALIAS_SYS_CAST (getcwd, char *, (char *buf, size_t size));
+# endif
+_GL_CXXALIASWARN (getcwd);
+#elif defined GNULIB_POSIXCHECK
+# undef getcwd
+# if HAVE_RAW_DECL_GETCWD
+_GL_WARN_ON_USE (getcwd, "getcwd is unportable - "
+                 "use gnulib module getcwd for portability");
+# endif
+#endif
+
+
+#if @GNULIB_GETDOMAINNAME@
+/* Return the NIS domain name of the machine.
+   WARNING! The NIS domain name is unrelated to the fully qualified host name
+            of the machine.  It is also unrelated to email addresses.
+   WARNING! The NIS domain name is usually the empty string or "(none)" when
+            not using NIS.
+
+   Put up to LEN bytes of the NIS domain name into NAME.
+   Null terminate it if the name is shorter than LEN.
+   If the NIS domain name is longer than LEN, set errno = EINVAL and return -1.
+   Return 0 if successful, otherwise set errno and return -1.  */
+# if @REPLACE_GETDOMAINNAME@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef getdomainname
+#   define getdomainname rpl_getdomainname
+#  endif
+_GL_FUNCDECL_RPL (getdomainname, int, (char *name, size_t len)
+                                      _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (getdomainname, int, (char *name, size_t len));
+# else
+#  if !@HAVE_DECL_GETDOMAINNAME@
+_GL_FUNCDECL_SYS (getdomainname, int, (char *name, size_t len)
+                                      _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (getdomainname, int, (char *name, size_t len));
+# endif
+_GL_CXXALIASWARN (getdomainname);
+#elif defined GNULIB_POSIXCHECK
+# undef getdomainname
+# if HAVE_RAW_DECL_GETDOMAINNAME
+_GL_WARN_ON_USE (getdomainname, "getdomainname is unportable - "
+                 "use gnulib module getdomainname for portability");
+# endif
+#endif
+
+
+#if @GNULIB_GETDTABLESIZE@
+/* Return the maximum number of file descriptors in the current process.
+   In POSIX, this is same as sysconf (_SC_OPEN_MAX).  */
+# if @REPLACE_GETDTABLESIZE@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef getdtablesize
+#   define getdtablesize rpl_getdtablesize
+#  endif
+_GL_FUNCDECL_RPL (getdtablesize, int, (void));
+_GL_CXXALIAS_RPL (getdtablesize, int, (void));
+# else
+#  if !@HAVE_GETDTABLESIZE@
+_GL_FUNCDECL_SYS (getdtablesize, int, (void));
+#  endif
+_GL_CXXALIAS_SYS (getdtablesize, int, (void));
+# endif
+_GL_CXXALIASWARN (getdtablesize);
+#elif defined GNULIB_POSIXCHECK
+# undef getdtablesize
+# if HAVE_RAW_DECL_GETDTABLESIZE
+_GL_WARN_ON_USE (getdtablesize, "getdtablesize is unportable - "
+                 "use gnulib module getdtablesize for portability");
+# endif
+#endif
+
+
+#if @GNULIB_GETGROUPS@
+/* Return the supplemental groups that the current process belongs to.
+   It is unspecified whether the effective group id is in the list.
+   If N is 0, return the group count; otherwise, N describes how many
+   entries are available in GROUPS.  Return -1 and set errno if N is
+   not 0 and not large enough.  Fails with ENOSYS on some systems.  */
+# if @REPLACE_GETGROUPS@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef getgroups
+#   define getgroups rpl_getgroups
+#  endif
+_GL_FUNCDECL_RPL (getgroups, int, (int n, gid_t *groups));
+_GL_CXXALIAS_RPL (getgroups, int, (int n, gid_t *groups));
+# else
+#  if !@HAVE_GETGROUPS@
+_GL_FUNCDECL_SYS (getgroups, int, (int n, gid_t *groups));
+#  endif
+_GL_CXXALIAS_SYS (getgroups, int, (int n, gid_t *groups));
+# endif
+_GL_CXXALIASWARN (getgroups);
+#elif defined GNULIB_POSIXCHECK
+# undef getgroups
+# if HAVE_RAW_DECL_GETGROUPS
+_GL_WARN_ON_USE (getgroups, "getgroups is unportable - "
+                 "use gnulib module getgroups for portability");
+# endif
+#endif
+
+
+#if @GNULIB_GETHOSTNAME@
+/* Return the standard host name of the machine.
+   WARNING! The host name may or may not be fully qualified.
+
+   Put up to LEN bytes of the host name into NAME.
+   Null terminate it if the name is shorter than LEN.
+   If the host name is longer than LEN, set errno = EINVAL and return -1.
+   Return 0 if successful, otherwise set errno and return -1.  */
+# if @UNISTD_H_HAVE_WINSOCK2_H@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef gethostname
+#   define gethostname rpl_gethostname
+#  endif
+_GL_FUNCDECL_RPL (gethostname, int, (char *name, size_t len)
+                                    _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (gethostname, int, (char *name, size_t len));
+# else
+#  if !@HAVE_GETHOSTNAME@
+_GL_FUNCDECL_SYS (gethostname, int, (char *name, size_t len)
+                                    _GL_ARG_NONNULL ((1)));
+#  endif
+/* Need to cast, because on Solaris 10 and OSF/1 5.1 systems, the second
+   parameter is
+                                                      int len.  */
+_GL_CXXALIAS_SYS_CAST (gethostname, int, (char *name, size_t len));
+# endif
+_GL_CXXALIASWARN (gethostname);
+#elif @UNISTD_H_HAVE_WINSOCK2_H@
+# undef gethostname
+# define gethostname gethostname_used_without_requesting_gnulib_module_gethostname
+#elif defined GNULIB_POSIXCHECK
+# undef gethostname
+# if HAVE_RAW_DECL_GETHOSTNAME
+_GL_WARN_ON_USE (gethostname, "gethostname is unportable - "
+                 "use gnulib module gethostname for portability");
+# endif
+#endif
+
+
+#if @GNULIB_GETLOGIN@
+/* Returns the user's login name, or NULL if it cannot be found.  Upon error,
+   returns NULL with errno set.
+
+   See <http://www.opengroup.org/susv3xsh/getlogin.html>.
+
+   Most programs don't need to use this function, because the information is
+   available through environment variables:
+     ${LOGNAME-$USER}        on Unix platforms,
+     $USERNAME               on native Windows platforms.
+ */
+# if !@HAVE_DECL_GETLOGIN@
+_GL_FUNCDECL_SYS (getlogin, char *, (void));
+# endif
+_GL_CXXALIAS_SYS (getlogin, char *, (void));
+_GL_CXXALIASWARN (getlogin);
+#elif defined GNULIB_POSIXCHECK
+# undef getlogin
+# if HAVE_RAW_DECL_GETLOGIN
+_GL_WARN_ON_USE (getlogin, "getlogin is unportable - "
+                 "use gnulib module getlogin for portability");
+# endif
+#endif
+
+
+#if @GNULIB_GETLOGIN_R@
+/* Copies the user's login name to NAME.
+   The array pointed to by NAME has room for SIZE bytes.
+
+   Returns 0 if successful.  Upon error, an error number is returned, or -1 in
+   the case that the login name cannot be found but no specific error is
+   provided (this case is hopefully rare but is left open by the POSIX spec).
+
+   See <http://www.opengroup.org/susv3xsh/getlogin.html>.
+
+   Most programs don't need to use this function, because the information is
+   available through environment variables:
+     ${LOGNAME-$USER}        on Unix platforms,
+     $USERNAME               on native Windows platforms.
+ */
+# if @REPLACE_GETLOGIN_R@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   define getlogin_r rpl_getlogin_r
+#  endif
+_GL_FUNCDECL_RPL (getlogin_r, int, (char *name, size_t size)
+                                   _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (getlogin_r, int, (char *name, size_t size));
+# else
+#  if !@HAVE_DECL_GETLOGIN_R@
+_GL_FUNCDECL_SYS (getlogin_r, int, (char *name, size_t size)
+                                   _GL_ARG_NONNULL ((1)));
+#  endif
+/* Need to cast, because on Solaris 10 systems, the second argument is
+                                                     int size.  */
+_GL_CXXALIAS_SYS_CAST (getlogin_r, int, (char *name, size_t size));
+# endif
+_GL_CXXALIASWARN (getlogin_r);
+#elif defined GNULIB_POSIXCHECK
+# undef getlogin_r
+# if HAVE_RAW_DECL_GETLOGIN_R
+_GL_WARN_ON_USE (getlogin_r, "getlogin_r is unportable - "
+                 "use gnulib module getlogin_r for portability");
+# endif
+#endif
+
+
+#if @GNULIB_GETPAGESIZE@
+# if @REPLACE_GETPAGESIZE@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   define getpagesize rpl_getpagesize
+#  endif
+_GL_FUNCDECL_RPL (getpagesize, int, (void));
+_GL_CXXALIAS_RPL (getpagesize, int, (void));
+# else
+#  if !@HAVE_GETPAGESIZE@
+#   if !defined getpagesize
+/* This is for POSIX systems.  */
+#    if !defined _gl_getpagesize && defined _SC_PAGESIZE
+#     if ! (defined __VMS && __VMS_VER < 70000000)
+#      define _gl_getpagesize() sysconf (_SC_PAGESIZE)
+#     endif
+#    endif
+/* This is for older VMS.  */
+#    if !defined _gl_getpagesize && defined __VMS
+#     ifdef __ALPHA
+#      define _gl_getpagesize() 8192
+#     else
+#      define _gl_getpagesize() 512
+#     endif
+#    endif
+/* This is for BeOS.  */
+#    if !defined _gl_getpagesize && @HAVE_OS_H@
+#     include <OS.h>
+#     if defined B_PAGE_SIZE
+#      define _gl_getpagesize() B_PAGE_SIZE
+#     endif
+#    endif
+/* This is for AmigaOS4.0.  */
+#    if !defined _gl_getpagesize && defined __amigaos4__
+#     define _gl_getpagesize() 2048
+#    endif
+/* This is for older Unix systems.  */
+#    if !defined _gl_getpagesize && @HAVE_SYS_PARAM_H@
+#     include <sys/param.h>
+#     ifdef EXEC_PAGESIZE
+#      define _gl_getpagesize() EXEC_PAGESIZE
+#     else
+#      ifdef NBPG
+#       ifndef CLSIZE
+#        define CLSIZE 1
+#       endif
+#       define _gl_getpagesize() (NBPG * CLSIZE)
+#      else
+#       ifdef NBPC
+#        define _gl_getpagesize() NBPC
+#       endif
+#      endif
+#     endif
+#    endif
+#    if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#     define getpagesize() _gl_getpagesize ()
+#    else
+#     if !GNULIB_defined_getpagesize_function
+_GL_UNISTD_INLINE int
+getpagesize ()
+{
+  return _gl_getpagesize ();
+}
+#      define GNULIB_defined_getpagesize_function 1
+#     endif
+#    endif
+#   endif
+#  endif
+/* Need to cast, because on Cygwin 1.5.x systems, the return type is size_t.  */
+_GL_CXXALIAS_SYS_CAST (getpagesize, int, (void));
+# endif
+# if @HAVE_DECL_GETPAGESIZE@
+_GL_CXXALIASWARN (getpagesize);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef getpagesize
+# if HAVE_RAW_DECL_GETPAGESIZE
+_GL_WARN_ON_USE (getpagesize, "getpagesize is unportable - "
+                 "use gnulib module getpagesize for portability");
+# endif
+#endif
+
+
+#if @GNULIB_GETUSERSHELL@
+/* Return the next valid login shell on the system, or NULL when the end of
+   the list has been reached.  */
+# if !@HAVE_DECL_GETUSERSHELL@
+_GL_FUNCDECL_SYS (getusershell, char *, (void));
+# endif
+_GL_CXXALIAS_SYS (getusershell, char *, (void));
+_GL_CXXALIASWARN (getusershell);
+#elif defined GNULIB_POSIXCHECK
+# undef getusershell
+# if HAVE_RAW_DECL_GETUSERSHELL
+_GL_WARN_ON_USE (getusershell, "getusershell is unportable - "
+                 "use gnulib module getusershell for portability");
+# endif
+#endif
+
+#if @GNULIB_GETUSERSHELL@
+/* Rewind to pointer that is advanced at each getusershell() call.  */
+# if !@HAVE_DECL_GETUSERSHELL@
+_GL_FUNCDECL_SYS (setusershell, void, (void));
+# endif
+_GL_CXXALIAS_SYS (setusershell, void, (void));
+_GL_CXXALIASWARN (setusershell);
+#elif defined GNULIB_POSIXCHECK
+# undef setusershell
+# if HAVE_RAW_DECL_SETUSERSHELL
+_GL_WARN_ON_USE (setusershell, "setusershell is unportable - "
+                 "use gnulib module getusershell for portability");
+# endif
+#endif
+
+#if @GNULIB_GETUSERSHELL@
+/* Free the pointer that is advanced at each getusershell() call and
+   associated resources.  */
+# if !@HAVE_DECL_GETUSERSHELL@
+_GL_FUNCDECL_SYS (endusershell, void, (void));
+# endif
+_GL_CXXALIAS_SYS (endusershell, void, (void));
+_GL_CXXALIASWARN (endusershell);
+#elif defined GNULIB_POSIXCHECK
+# undef endusershell
+# if HAVE_RAW_DECL_ENDUSERSHELL
+_GL_WARN_ON_USE (endusershell, "endusershell is unportable - "
+                 "use gnulib module getusershell for portability");
+# endif
+#endif
+
+
+#if @GNULIB_GROUP_MEMBER@
+/* Determine whether group id is in calling user's group list.  */
+# if !@HAVE_GROUP_MEMBER@
+_GL_FUNCDECL_SYS (group_member, int, (gid_t gid));
+# endif
+_GL_CXXALIAS_SYS (group_member, int, (gid_t gid));
+_GL_CXXALIASWARN (group_member);
+#elif defined GNULIB_POSIXCHECK
+# undef group_member
+# if HAVE_RAW_DECL_GROUP_MEMBER
+_GL_WARN_ON_USE (group_member, "group_member is unportable - "
+                 "use gnulib module group-member for portability");
+# endif
+#endif
+
+
+#if @GNULIB_ISATTY@
+# if @REPLACE_ISATTY@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef isatty
+#   define isatty rpl_isatty
+#  endif
+_GL_FUNCDECL_RPL (isatty, int, (int fd));
+_GL_CXXALIAS_RPL (isatty, int, (int fd));
+# else
+_GL_CXXALIAS_SYS (isatty, int, (int fd));
+# endif
+_GL_CXXALIASWARN (isatty);
+#elif defined GNULIB_POSIXCHECK
+# undef isatty
+# if HAVE_RAW_DECL_ISATTY
+_GL_WARN_ON_USE (isatty, "isatty has portability problems on native Windows - "
+                 "use gnulib module isatty for portability");
+# endif
+#endif
+
+
+#if @GNULIB_LCHOWN@
+/* Change the owner of FILE to UID (if UID is not -1) and the group of FILE
+   to GID (if GID is not -1).  Do not follow symbolic links.
+   Return 0 if successful, otherwise -1 and errno set.
+   See the POSIX:2008 specification
+   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/lchown.html>.  */
+# if @REPLACE_LCHOWN@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef lchown
+#   define lchown rpl_lchown
+#  endif
+_GL_FUNCDECL_RPL (lchown, int, (char const *file, uid_t owner, gid_t group)
+                               _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (lchown, int, (char const *file, uid_t owner, gid_t group));
+# else
+#  if !@HAVE_LCHOWN@
+_GL_FUNCDECL_SYS (lchown, int, (char const *file, uid_t owner, gid_t group)
+                               _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (lchown, int, (char const *file, uid_t owner, gid_t group));
+# endif
+_GL_CXXALIASWARN (lchown);
+#elif defined GNULIB_POSIXCHECK
+# undef lchown
+# if HAVE_RAW_DECL_LCHOWN
+_GL_WARN_ON_USE (lchown, "lchown is unportable to pre-POSIX.1-2001 systems - "
+                 "use gnulib module lchown for portability");
+# endif
+#endif
+
+
+#if @GNULIB_LINK@
+/* Create a new hard link for an existing file.
+   Return 0 if successful, otherwise -1 and errno set.
+   See POSIX:2008 specification
+   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/link.html>.  */
+# if @REPLACE_LINK@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   define link rpl_link
+#  endif
+_GL_FUNCDECL_RPL (link, int, (const char *path1, const char *path2)
+                             _GL_ARG_NONNULL ((1, 2)));
+_GL_CXXALIAS_RPL (link, int, (const char *path1, const char *path2));
+# else
+#  if !@HAVE_LINK@
+_GL_FUNCDECL_SYS (link, int, (const char *path1, const char *path2)
+                             _GL_ARG_NONNULL ((1, 2)));
+#  endif
+_GL_CXXALIAS_SYS (link, int, (const char *path1, const char *path2));
+# endif
+_GL_CXXALIASWARN (link);
+#elif defined GNULIB_POSIXCHECK
+# undef link
+# if HAVE_RAW_DECL_LINK
+_GL_WARN_ON_USE (link, "link is unportable - "
+                 "use gnulib module link for portability");
+# endif
+#endif
+
+
+#if @GNULIB_LINKAT@
+/* Create a new hard link for an existing file, relative to two
+   directories.  FLAG controls whether symlinks are followed.
+   Return 0 if successful, otherwise -1 and errno set.  */
+# if @REPLACE_LINKAT@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef linkat
+#   define linkat rpl_linkat
+#  endif
+_GL_FUNCDECL_RPL (linkat, int,
+                  (int fd1, const char *path1, int fd2, const char *path2,
+                   int flag)
+                  _GL_ARG_NONNULL ((2, 4)));
+_GL_CXXALIAS_RPL (linkat, int,
+                  (int fd1, const char *path1, int fd2, const char *path2,
+                   int flag));
+# else
+#  if !@HAVE_LINKAT@
+_GL_FUNCDECL_SYS (linkat, int,
+                  (int fd1, const char *path1, int fd2, const char *path2,
+                   int flag)
+                  _GL_ARG_NONNULL ((2, 4)));
+#  endif
+_GL_CXXALIAS_SYS (linkat, int,
+                  (int fd1, const char *path1, int fd2, const char *path2,
+                   int flag));
+# endif
+_GL_CXXALIASWARN (linkat);
+#elif defined GNULIB_POSIXCHECK
+# undef linkat
+# if HAVE_RAW_DECL_LINKAT
+_GL_WARN_ON_USE (linkat, "linkat is unportable - "
+                 "use gnulib module linkat for portability");
+# endif
+#endif
+
+
+#if @GNULIB_LSEEK@
+/* Set the offset of FD relative to SEEK_SET, SEEK_CUR, or SEEK_END.
+   Return the new offset if successful, otherwise -1 and errno set.
+   See the POSIX:2008 specification
+   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/lseek.html>.  */
+# if @REPLACE_LSEEK@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   define lseek rpl_lseek
+#  endif
+_GL_FUNCDECL_RPL (lseek, off_t, (int fd, off_t offset, int whence));
+_GL_CXXALIAS_RPL (lseek, off_t, (int fd, off_t offset, int whence));
+# else
+_GL_CXXALIAS_SYS (lseek, off_t, (int fd, off_t offset, int whence));
+# endif
+_GL_CXXALIASWARN (lseek);
+#elif defined GNULIB_POSIXCHECK
+# undef lseek
+# if HAVE_RAW_DECL_LSEEK
+_GL_WARN_ON_USE (lseek, "lseek does not fail with ESPIPE on pipes on some "
+                 "systems - use gnulib module lseek for portability");
+# endif
+#endif
+
+
+#if @GNULIB_PIPE@
+/* Create a pipe, defaulting to O_BINARY mode.
+   Store the read-end as fd[0] and the write-end as fd[1].
+   Return 0 upon success, or -1 with errno set upon failure.  */
+# if !@HAVE_PIPE@
+_GL_FUNCDECL_SYS (pipe, int, (int fd[2]) _GL_ARG_NONNULL ((1)));
+# endif
+_GL_CXXALIAS_SYS (pipe, int, (int fd[2]));
+_GL_CXXALIASWARN (pipe);
+#elif defined GNULIB_POSIXCHECK
+# undef pipe
+# if HAVE_RAW_DECL_PIPE
+_GL_WARN_ON_USE (pipe, "pipe is unportable - "
+                 "use gnulib module pipe-posix for portability");
+# endif
+#endif
+
+
+#if @GNULIB_PIPE2@
+/* Create a pipe, applying the given flags when opening the read-end of the
+   pipe and the write-end of the pipe.
+   The flags are a bitmask, possibly including O_CLOEXEC (defined in <fcntl.h>)
+   and O_TEXT, O_BINARY (defined in "binary-io.h").
+   Store the read-end as fd[0] and the write-end as fd[1].
+   Return 0 upon success, or -1 with errno set upon failure.
+   See also the Linux man page at
+   <http://www.kernel.org/doc/man-pages/online/pages/man2/pipe2.2.html>.  */
+# if @HAVE_PIPE2@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   define pipe2 rpl_pipe2
+#  endif
+_GL_FUNCDECL_RPL (pipe2, int, (int fd[2], int flags) _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (pipe2, int, (int fd[2], int flags));
+# else
+_GL_FUNCDECL_SYS (pipe2, int, (int fd[2], int flags) _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_SYS (pipe2, int, (int fd[2], int flags));
+# endif
+_GL_CXXALIASWARN (pipe2);
+#elif defined GNULIB_POSIXCHECK
+# undef pipe2
+# if HAVE_RAW_DECL_PIPE2
+_GL_WARN_ON_USE (pipe2, "pipe2 is unportable - "
+                 "use gnulib module pipe2 for portability");
+# endif
+#endif
+
+
+#if @GNULIB_PREAD@
+/* Read at most BUFSIZE bytes from FD into BUF, starting at OFFSET.
+   Return the number of bytes placed into BUF if successful, otherwise
+   set errno and return -1.  0 indicates EOF.
+   See the POSIX:2008 specification
+   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/pread.html>.  */
+# if @REPLACE_PREAD@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pread
+#   define pread rpl_pread
+#  endif
+_GL_FUNCDECL_RPL (pread, ssize_t,
+                  (int fd, void *buf, size_t bufsize, off_t offset)
+                  _GL_ARG_NONNULL ((2)));
+_GL_CXXALIAS_RPL (pread, ssize_t,
+                  (int fd, void *buf, size_t bufsize, off_t offset));
+# else
+#  if !@HAVE_PREAD@
+_GL_FUNCDECL_SYS (pread, ssize_t,
+                  (int fd, void *buf, size_t bufsize, off_t offset)
+                  _GL_ARG_NONNULL ((2)));
+#  endif
+_GL_CXXALIAS_SYS (pread, ssize_t,
+                  (int fd, void *buf, size_t bufsize, off_t offset));
+# endif
+_GL_CXXALIASWARN (pread);
+#elif defined GNULIB_POSIXCHECK
+# undef pread
+# if HAVE_RAW_DECL_PREAD
+_GL_WARN_ON_USE (pread, "pread is unportable - "
+                 "use gnulib module pread for portability");
+# endif
+#endif
+
+
+#if @GNULIB_PWRITE@
+/* Write at most BUFSIZE bytes from BUF into FD, starting at OFFSET.
+   Return the number of bytes written if successful, otherwise
+   set errno and return -1.  0 indicates nothing written.  See the
+   POSIX:2008 specification
+   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/pwrite.html>.  */
+# if @REPLACE_PWRITE@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pwrite
+#   define pwrite rpl_pwrite
+#  endif
+_GL_FUNCDECL_RPL (pwrite, ssize_t,
+                  (int fd, const void *buf, size_t bufsize, off_t offset)
+                  _GL_ARG_NONNULL ((2)));
+_GL_CXXALIAS_RPL (pwrite, ssize_t,
+                  (int fd, const void *buf, size_t bufsize, off_t offset));
+# else
+#  if !@HAVE_PWRITE@
+_GL_FUNCDECL_SYS (pwrite, ssize_t,
+                  (int fd, const void *buf, size_t bufsize, off_t offset)
+                  _GL_ARG_NONNULL ((2)));
+#  endif
+_GL_CXXALIAS_SYS (pwrite, ssize_t,
+                  (int fd, const void *buf, size_t bufsize, off_t offset));
+# endif
+_GL_CXXALIASWARN (pwrite);
+#elif defined GNULIB_POSIXCHECK
+# undef pwrite
+# if HAVE_RAW_DECL_PWRITE
+_GL_WARN_ON_USE (pwrite, "pwrite is unportable - "
+                 "use gnulib module pwrite for portability");
+# endif
+#endif
+
+
+#if @GNULIB_READ@
+/* Read up to COUNT bytes from file descriptor FD into the buffer starting
+   at BUF.  See the POSIX:2008 specification
+   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/read.html>.  */
+# if @REPLACE_READ@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef read
+#   define read rpl_read
+#  endif
+_GL_FUNCDECL_RPL (read, ssize_t, (int fd, void *buf, size_t count)
+                                 _GL_ARG_NONNULL ((2)));
+_GL_CXXALIAS_RPL (read, ssize_t, (int fd, void *buf, size_t count));
+# else
+/* Need to cast, because on mingw, the third parameter is
+                                                          unsigned int count
+   and the return type is 'int'.  */
+_GL_CXXALIAS_SYS_CAST (read, ssize_t, (int fd, void *buf, size_t count));
+# endif
+_GL_CXXALIASWARN (read);
+#endif
+
+
+#if @GNULIB_READLINK@
+/* Read the contents of the symbolic link FILE and place the first BUFSIZE
+   bytes of it into BUF.  Return the number of bytes placed into BUF if
+   successful, otherwise -1 and errno set.
+   See the POSIX:2008 specification
+   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/readlink.html>.  */
+# if @REPLACE_READLINK@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   define readlink rpl_readlink
+#  endif
+_GL_FUNCDECL_RPL (readlink, ssize_t,
+                  (const char *file, char *buf, size_t bufsize)
+                  _GL_ARG_NONNULL ((1, 2)));
+_GL_CXXALIAS_RPL (readlink, ssize_t,
+                  (const char *file, char *buf, size_t bufsize));
+# else
+#  if !@HAVE_READLINK@
+_GL_FUNCDECL_SYS (readlink, ssize_t,
+                  (const char *file, char *buf, size_t bufsize)
+                  _GL_ARG_NONNULL ((1, 2)));
+#  endif
+_GL_CXXALIAS_SYS (readlink, ssize_t,
+                  (const char *file, char *buf, size_t bufsize));
+# endif
+_GL_CXXALIASWARN (readlink);
+#elif defined GNULIB_POSIXCHECK
+# undef readlink
+# if HAVE_RAW_DECL_READLINK
+_GL_WARN_ON_USE (readlink, "readlink is unportable - "
+                 "use gnulib module readlink for portability");
+# endif
+#endif
+
+
+#if @GNULIB_READLINKAT@
+# if @REPLACE_READLINKAT@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   define readlinkat rpl_readlinkat
+#  endif
+_GL_FUNCDECL_RPL (readlinkat, ssize_t,
+                  (int fd, char const *file, char *buf, size_t len)
+                  _GL_ARG_NONNULL ((2, 3)));
+_GL_CXXALIAS_RPL (readlinkat, ssize_t,
+                  (int fd, char const *file, char *buf, size_t len));
+# else
+#  if !@HAVE_READLINKAT@
+_GL_FUNCDECL_SYS (readlinkat, ssize_t,
+                  (int fd, char const *file, char *buf, size_t len)
+                  _GL_ARG_NONNULL ((2, 3)));
+#  endif
+_GL_CXXALIAS_SYS (readlinkat, ssize_t,
+                  (int fd, char const *file, char *buf, size_t len));
+# endif
+_GL_CXXALIASWARN (readlinkat);
+#elif defined GNULIB_POSIXCHECK
+# undef readlinkat
+# if HAVE_RAW_DECL_READLINKAT
+_GL_WARN_ON_USE (readlinkat, "readlinkat is not portable - "
+                 "use gnulib module readlinkat for portability");
+# endif
+#endif
+
+
+#if @GNULIB_RMDIR@
+/* Remove the directory DIR.  */
+# if @REPLACE_RMDIR@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   define rmdir rpl_rmdir
+#  endif
+_GL_FUNCDECL_RPL (rmdir, int, (char const *name) _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (rmdir, int, (char const *name));
+# else
+_GL_CXXALIAS_SYS (rmdir, int, (char const *name));
+# endif
+_GL_CXXALIASWARN (rmdir);
+#elif defined GNULIB_POSIXCHECK
+# undef rmdir
+# if HAVE_RAW_DECL_RMDIR
+_GL_WARN_ON_USE (rmdir, "rmdir is unportable - "
+                 "use gnulib module rmdir for portability");
+# endif
+#endif
+
+
+#if @GNULIB_SETHOSTNAME@
+/* Set the host name of the machine.
+   The host name may or may not be fully qualified.
+
+   Put LEN bytes of NAME into the host name.
+   Return 0 if successful, otherwise, set errno and return -1.
+
+   Platforms with no ability to set the hostname return -1 and set
+   errno = ENOSYS.  */
+# if !@HAVE_SETHOSTNAME@ || !@HAVE_DECL_SETHOSTNAME@
+_GL_FUNCDECL_SYS (sethostname, int, (const char *name, size_t len)
+                                    _GL_ARG_NONNULL ((1)));
+# endif
+/* Need to cast, because on Solaris 11 2011-10, Mac OS X 10.5, IRIX 6.5
+   and FreeBSD 6.4 the second parameter is int.  On Solaris 11
+   2011-10, the first parameter is not const.  */
+_GL_CXXALIAS_SYS_CAST (sethostname, int, (const char *name, size_t len));
+_GL_CXXALIASWARN (sethostname);
+#elif defined GNULIB_POSIXCHECK
+# undef sethostname
+# if HAVE_RAW_DECL_SETHOSTNAME
+_GL_WARN_ON_USE (sethostname, "sethostname is unportable - "
+                 "use gnulib module sethostname for portability");
+# endif
+#endif
+
+
+#if @GNULIB_SLEEP@
+/* Pause the execution of the current thread for N seconds.
+   Returns the number of seconds left to sleep.
+   See the POSIX:2008 specification
+   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/sleep.html>.  */
+# if @REPLACE_SLEEP@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef sleep
+#   define sleep rpl_sleep
+#  endif
+_GL_FUNCDECL_RPL (sleep, unsigned int, (unsigned int n));
+_GL_CXXALIAS_RPL (sleep, unsigned int, (unsigned int n));
+# else
+#  if !@HAVE_SLEEP@
+_GL_FUNCDECL_SYS (sleep, unsigned int, (unsigned int n));
+#  endif
+_GL_CXXALIAS_SYS (sleep, unsigned int, (unsigned int n));
+# endif
+_GL_CXXALIASWARN (sleep);
+#elif defined GNULIB_POSIXCHECK
+# undef sleep
+# if HAVE_RAW_DECL_SLEEP
+_GL_WARN_ON_USE (sleep, "sleep is unportable - "
+                 "use gnulib module sleep for portability");
+# endif
+#endif
+
+
+#if @GNULIB_SYMLINK@
+# if @REPLACE_SYMLINK@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef symlink
+#   define symlink rpl_symlink
+#  endif
+_GL_FUNCDECL_RPL (symlink, int, (char const *contents, char const *file)
+                                _GL_ARG_NONNULL ((1, 2)));
+_GL_CXXALIAS_RPL (symlink, int, (char const *contents, char const *file));
+# else
+#  if !@HAVE_SYMLINK@
+_GL_FUNCDECL_SYS (symlink, int, (char const *contents, char const *file)
+                                _GL_ARG_NONNULL ((1, 2)));
+#  endif
+_GL_CXXALIAS_SYS (symlink, int, (char const *contents, char const *file));
+# endif
+_GL_CXXALIASWARN (symlink);
+#elif defined GNULIB_POSIXCHECK
+# undef symlink
+# if HAVE_RAW_DECL_SYMLINK
+_GL_WARN_ON_USE (symlink, "symlink is not portable - "
+                 "use gnulib module symlink for portability");
+# endif
+#endif
+
+
+#if @GNULIB_SYMLINKAT@
+# if @REPLACE_SYMLINKAT@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef symlinkat
+#   define symlinkat rpl_symlinkat
+#  endif
+_GL_FUNCDECL_RPL (symlinkat, int,
+                  (char const *contents, int fd, char const *file)
+                  _GL_ARG_NONNULL ((1, 3)));
+_GL_CXXALIAS_RPL (symlinkat, int,
+                  (char const *contents, int fd, char const *file));
+# else
+#  if !@HAVE_SYMLINKAT@
+_GL_FUNCDECL_SYS (symlinkat, int,
+                  (char const *contents, int fd, char const *file)
+                  _GL_ARG_NONNULL ((1, 3)));
+#  endif
+_GL_CXXALIAS_SYS (symlinkat, int,
+                  (char const *contents, int fd, char const *file));
+# endif
+_GL_CXXALIASWARN (symlinkat);
+#elif defined GNULIB_POSIXCHECK
+# undef symlinkat
+# if HAVE_RAW_DECL_SYMLINKAT
+_GL_WARN_ON_USE (symlinkat, "symlinkat is not portable - "
+                 "use gnulib module symlinkat for portability");
+# endif
+#endif
+
+
+#if @GNULIB_TRUNCATE@
+/* Change the size of the file designated by FILENAME to become equal to LENGTH.
+   Return 0 if successful, otherwise -1 and errno set.
+   See the POSIX:2008 specification
+   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/truncate.html>.  */
+# if @REPLACE_TRUNCATE@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef truncate
+#   define truncate rpl_truncate
+#  endif
+_GL_FUNCDECL_RPL (truncate, int, (const char *filename, off_t length)
+                                 _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (truncate, int, (const char *filename, off_t length));
+# else
+#  if !@HAVE_TRUNCATE@
+_GL_FUNCDECL_SYS (truncate, int, (const char *filename, off_t length)
+                                 _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (truncate, int, (const char *filename, off_t length));
+# endif
+_GL_CXXALIASWARN (truncate);
+#elif defined GNULIB_POSIXCHECK
+# undef truncate
+# if HAVE_RAW_DECL_TRUNCATE
+_GL_WARN_ON_USE (truncate, "truncate is unportable - "
+                 "use gnulib module truncate for portability");
+# endif
+#endif
+
+
+#if @GNULIB_TTYNAME_R@
+/* Store at most BUFLEN characters of the pathname of the terminal FD is
+   open on in BUF.  Return 0 on success, otherwise an error number.  */
+# if @REPLACE_TTYNAME_R@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef ttyname_r
+#   define ttyname_r rpl_ttyname_r
+#  endif
+_GL_FUNCDECL_RPL (ttyname_r, int,
+                  (int fd, char *buf, size_t buflen) _GL_ARG_NONNULL ((2)));
+_GL_CXXALIAS_RPL (ttyname_r, int,
+                  (int fd, char *buf, size_t buflen));
+# else
+#  if !@HAVE_DECL_TTYNAME_R@
+_GL_FUNCDECL_SYS (ttyname_r, int,
+                  (int fd, char *buf, size_t buflen) _GL_ARG_NONNULL ((2)));
+#  endif
+_GL_CXXALIAS_SYS (ttyname_r, int,
+                  (int fd, char *buf, size_t buflen));
+# endif
+_GL_CXXALIASWARN (ttyname_r);
+#elif defined GNULIB_POSIXCHECK
+# undef ttyname_r
+# if HAVE_RAW_DECL_TTYNAME_R
+_GL_WARN_ON_USE (ttyname_r, "ttyname_r is not portable - "
+                 "use gnulib module ttyname_r for portability");
+# endif
+#endif
+
+
+#if @GNULIB_UNLINK@
+# if @REPLACE_UNLINK@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef unlink
+#   define unlink rpl_unlink
+#  endif
+_GL_FUNCDECL_RPL (unlink, int, (char const *file) _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (unlink, int, (char const *file));
+# else
+_GL_CXXALIAS_SYS (unlink, int, (char const *file));
+# endif
+_GL_CXXALIASWARN (unlink);
+#elif defined GNULIB_POSIXCHECK
+# undef unlink
+# if HAVE_RAW_DECL_UNLINK
+_GL_WARN_ON_USE (unlink, "unlink is not portable - "
+                 "use gnulib module unlink for portability");
+# endif
+#endif
+
+
+#if @GNULIB_UNLINKAT@
+# if @REPLACE_UNLINKAT@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef unlinkat
+#   define unlinkat rpl_unlinkat
+#  endif
+_GL_FUNCDECL_RPL (unlinkat, int, (int fd, char const *file, int flag)
+                                 _GL_ARG_NONNULL ((2)));
+_GL_CXXALIAS_RPL (unlinkat, int, (int fd, char const *file, int flag));
+# else
+#  if !@HAVE_UNLINKAT@
+_GL_FUNCDECL_SYS (unlinkat, int, (int fd, char const *file, int flag)
+                                 _GL_ARG_NONNULL ((2)));
+#  endif
+_GL_CXXALIAS_SYS (unlinkat, int, (int fd, char const *file, int flag));
+# endif
+_GL_CXXALIASWARN (unlinkat);
+#elif defined GNULIB_POSIXCHECK
+# undef unlinkat
+# if HAVE_RAW_DECL_UNLINKAT
+_GL_WARN_ON_USE (unlinkat, "unlinkat is not portable - "
+                 "use gnulib module openat for portability");
+# endif
+#endif
+
+
+#if @GNULIB_USLEEP@
+/* Pause the execution of the current thread for N microseconds.
+   Returns 0 on completion, or -1 on range error.
+   See the POSIX:2001 specification
+   <http://www.opengroup.org/susv3xsh/usleep.html>.  */
+# if @REPLACE_USLEEP@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef usleep
+#   define usleep rpl_usleep
+#  endif
+_GL_FUNCDECL_RPL (usleep, int, (useconds_t n));
+_GL_CXXALIAS_RPL (usleep, int, (useconds_t n));
+# else
+#  if !@HAVE_USLEEP@
+_GL_FUNCDECL_SYS (usleep, int, (useconds_t n));
+#  endif
+_GL_CXXALIAS_SYS (usleep, int, (useconds_t n));
+# endif
+_GL_CXXALIASWARN (usleep);
+#elif defined GNULIB_POSIXCHECK
+# undef usleep
+# if HAVE_RAW_DECL_USLEEP
+_GL_WARN_ON_USE (usleep, "usleep is unportable - "
+                 "use gnulib module usleep for portability");
+# endif
+#endif
+
+
+#if @GNULIB_WRITE@
+/* Write up to COUNT bytes starting at BUF to file descriptor FD.
+   See the POSIX:2008 specification
+   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/write.html>.  */
+# if @REPLACE_WRITE@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef write
+#   define write rpl_write
+#  endif
+_GL_FUNCDECL_RPL (write, ssize_t, (int fd, const void *buf, size_t count)
+                                  _GL_ARG_NONNULL ((2)));
+_GL_CXXALIAS_RPL (write, ssize_t, (int fd, const void *buf, size_t count));
+# else
+/* Need to cast, because on mingw, the third parameter is
+                                                             unsigned int count
+   and the return type is 'int'.  */
+_GL_CXXALIAS_SYS_CAST (write, ssize_t, (int fd, const void *buf, size_t count));
+# endif
+_GL_CXXALIASWARN (write);
+#endif
+
+_GL_INLINE_HEADER_END
+
+#endif /* _@GUARD_PREFIX@_UNISTD_H */
+#endif /* _GL_INCLUDING_UNISTD_H */
+#endif /* _@GUARD_PREFIX@_UNISTD_H */
diff --git a/gl/verify.h b/gl/verify.h
new file mode 100644
index 0000000..2d996ad
--- /dev/null
+++ b/gl/verify.h
@@ -0,0 +1,284 @@
+/* Compile-time assert-like macros.
+
+   Copyright (C) 2005-2006, 2009-2017 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* Written by Paul Eggert, Bruno Haible, and Jim Meyering.  */
+
+#ifndef _GL_VERIFY_H
+#define _GL_VERIFY_H
+
+
+/* Define _GL_HAVE__STATIC_ASSERT to 1 if _Static_assert works as per C11.
+   This is supported by GCC 4.6.0 and later, in C mode, and its use
+   here generates easier-to-read diagnostics when verify (R) fails.
+
+   Define _GL_HAVE_STATIC_ASSERT to 1 if static_assert works as per C++11.
+   This will likely be supported by future GCC versions, in C++ mode.
+
+   Use this only with GCC.  If we were willing to slow 'configure'
+   down we could also use it with other compilers, but since this
+   affects only the quality of diagnostics, why bother?  */
+#if (4 < __GNUC__ + (6 <= __GNUC_MINOR__) \
+     && (201112L <= __STDC_VERSION__  || !defined __STRICT_ANSI__) \
+     && !defined __cplusplus)
+# define _GL_HAVE__STATIC_ASSERT 1
+#endif
+/* The condition (99 < __GNUC__) is temporary, until we know about the
+   first G++ release that supports static_assert.  */
+#if (99 < __GNUC__) && defined __cplusplus
+# define _GL_HAVE_STATIC_ASSERT 1
+#endif
+
+/* FreeBSD 9.1 <sys/cdefs.h>, included by <stddef.h> and lots of other
+   system headers, defines a conflicting _Static_assert that is no
+   better than ours; override it.  */
+#ifndef _GL_HAVE_STATIC_ASSERT
+# include <stddef.h>
+# undef _Static_assert
+#endif
+
+/* Each of these macros verifies that its argument R is nonzero.  To
+   be portable, R should be an integer constant expression.  Unlike
+   assert (R), there is no run-time overhead.
+
+   If _Static_assert works, verify (R) uses it directly.  Similarly,
+   _GL_VERIFY_TRUE works by packaging a _Static_assert inside a struct
+   that is an operand of sizeof.
+
+   The code below uses several ideas for C++ compilers, and for C
+   compilers that do not support _Static_assert:
+
+   * The first step is ((R) ? 1 : -1).  Given an expression R, of
+     integral or boolean or floating-point type, this yields an
+     expression of integral type, whose value is later verified to be
+     constant and nonnegative.
+
+   * Next this expression W is wrapped in a type
+     struct _gl_verify_type {
+       unsigned int _gl_verify_error_if_negative: W;
+     }.
+     If W is negative, this yields a compile-time error.  No compiler can
+     deal with a bit-field of negative size.
+
+     One might think that an array size check would have the same
+     effect, that is, that the type struct { unsigned int dummy[W]; }
+     would work as well.  However, inside a function, some compilers
+     (such as C++ compilers and GNU C) allow local parameters and
+     variables inside array size expressions.  With these compilers,
+     an array size check would not properly diagnose this misuse of
+     the verify macro:
+
+       void function (int n) { verify (n < 0); }
+
+   * For the verify macro, the struct _gl_verify_type will need to
+     somehow be embedded into a declaration.  To be portable, this
+     declaration must declare an object, a constant, a function, or a
+     typedef name.  If the declared entity uses the type directly,
+     such as in
+
+       struct dummy {...};
+       typedef struct {...} dummy;
+       extern struct {...} *dummy;
+       extern void dummy (struct {...} *);
+       extern struct {...} *dummy (void);
+
+     two uses of the verify macro would yield colliding declarations
+     if the entity names are not disambiguated.  A workaround is to
+     attach the current line number to the entity name:
+
+       #define _GL_CONCAT0(x, y) x##y
+       #define _GL_CONCAT(x, y) _GL_CONCAT0 (x, y)
+       extern struct {...} * _GL_CONCAT (dummy, __LINE__);
+
+     But this has the problem that two invocations of verify from
+     within the same macro would collide, since the __LINE__ value
+     would be the same for both invocations.  (The GCC __COUNTER__
+     macro solves this problem, but is not portable.)
+
+     A solution is to use the sizeof operator.  It yields a number,
+     getting rid of the identity of the type.  Declarations like
+
+       extern int dummy [sizeof (struct {...})];
+       extern void dummy (int [sizeof (struct {...})]);
+       extern int (*dummy (void)) [sizeof (struct {...})];
+
+     can be repeated.
+
+   * Should the implementation use a named struct or an unnamed struct?
+     Which of the following alternatives can be used?
+
+       extern int dummy [sizeof (struct {...})];
+       extern int dummy [sizeof (struct _gl_verify_type {...})];
+       extern void dummy (int [sizeof (struct {...})]);
+       extern void dummy (int [sizeof (struct _gl_verify_type {...})]);
+       extern int (*dummy (void)) [sizeof (struct {...})];
+       extern int (*dummy (void)) [sizeof (struct _gl_verify_type {...})];
+
+     In the second and sixth case, the struct type is exported to the
+     outer scope; two such declarations therefore collide.  GCC warns
+     about the first, third, and fourth cases.  So the only remaining
+     possibility is the fifth case:
+
+       extern int (*dummy (void)) [sizeof (struct {...})];
+
+   * GCC warns about duplicate declarations of the dummy function if
+     -Wredundant-decls is used.  GCC 4.3 and later have a builtin
+     __COUNTER__ macro that can let us generate unique identifiers for
+     each dummy function, to suppress this warning.
+
+   * This implementation exploits the fact that older versions of GCC,
+     which do not support _Static_assert, also do not warn about the
+     last declaration mentioned above.
+
+   * GCC warns if -Wnested-externs is enabled and verify() is used
+     within a function body; but inside a function, you can always
+     arrange to use verify_expr() instead.
+
+   * In C++, any struct definition inside sizeof is invalid.
+     Use a template type to work around the problem.  */
+
+/* Concatenate two preprocessor tokens.  */
+#define _GL_CONCAT(x, y) _GL_CONCAT0 (x, y)
+#define _GL_CONCAT0(x, y) x##y
+
+/* _GL_COUNTER is an integer, preferably one that changes each time we
+   use it.  Use __COUNTER__ if it works, falling back on __LINE__
+   otherwise.  __LINE__ isn't perfect, but it's better than a
+   constant.  */
+#if defined __COUNTER__ && __COUNTER__ != __COUNTER__
+# define _GL_COUNTER __COUNTER__
+#else
+# define _GL_COUNTER __LINE__
+#endif
+
+/* Generate a symbol with the given prefix, making it unique if
+   possible.  */
+#define _GL_GENSYM(prefix) _GL_CONCAT (prefix, _GL_COUNTER)
+
+/* Verify requirement R at compile-time, as an integer constant expression
+   that returns 1.  If R is false, fail at compile-time, preferably
+   with a diagnostic that includes the string-literal DIAGNOSTIC.  */
+
+#define _GL_VERIFY_TRUE(R, DIAGNOSTIC) \
+   (!!sizeof (_GL_VERIFY_TYPE (R, DIAGNOSTIC)))
+
+#ifdef __cplusplus
+# if !GNULIB_defined_struct__gl_verify_type
+template <int w>
+  struct _gl_verify_type {
+    unsigned int _gl_verify_error_if_negative: w;
+  };
+#  define GNULIB_defined_struct__gl_verify_type 1
+# endif
+# define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \
+    _gl_verify_type<(R) ? 1 : -1>
+#elif defined _GL_HAVE__STATIC_ASSERT
+# define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \
+    struct {                                   \
+      _Static_assert (R, DIAGNOSTIC);          \
+      int _gl_dummy;                          \
+    }
+#else
+# define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \
+    struct { unsigned int _gl_verify_error_if_negative: (R) ? 1 : -1; }
+#endif
+
+/* Verify requirement R at compile-time, as a declaration without a
+   trailing ';'.  If R is false, fail at compile-time, preferably
+   with a diagnostic that includes the string-literal DIAGNOSTIC.
+
+   Unfortunately, unlike C11, this implementation must appear as an
+   ordinary declaration, and cannot appear inside struct { ... }.  */
+
+#ifdef _GL_HAVE__STATIC_ASSERT
+# define _GL_VERIFY _Static_assert
+#else
+# define _GL_VERIFY(R, DIAGNOSTIC)				       \
+    extern int (*_GL_GENSYM (_gl_verify_function) (void))	       \
+      [_GL_VERIFY_TRUE (R, DIAGNOSTIC)]
+#endif
+
+/* _GL_STATIC_ASSERT_H is defined if this code is copied into assert.h.  */
+#ifdef _GL_STATIC_ASSERT_H
+# if !defined _GL_HAVE__STATIC_ASSERT && !defined _Static_assert
+#  define _Static_assert(R, DIAGNOSTIC) _GL_VERIFY (R, DIAGNOSTIC)
+# endif
+# if !defined _GL_HAVE_STATIC_ASSERT && !defined static_assert
+#  define static_assert _Static_assert /* C11 requires this #define.  */
+# endif
+#endif
+
+/* @assert.h omit start@  */
+
+/* Each of these macros verifies that its argument R is nonzero.  To
+   be portable, R should be an integer constant expression.  Unlike
+   assert (R), there is no run-time overhead.
+
+   There are two macros, since no single macro can be used in all
+   contexts in C.  verify_true (R) is for scalar contexts, including
+   integer constant expression contexts.  verify (R) is for declaration
+   contexts, e.g., the top level.  */
+
+/* Verify requirement R at compile-time, as an integer constant expression.
+   Return 1.  This is equivalent to verify_expr (R, 1).
+
+   verify_true is obsolescent; please use verify_expr instead.  */
+
+#define verify_true(R) _GL_VERIFY_TRUE (R, "verify_true (" #R ")")
+
+/* Verify requirement R at compile-time.  Return the value of the
+   expression E.  */
+
+#define verify_expr(R, E) \
+   (_GL_VERIFY_TRUE (R, "verify_expr (" #R ", " #E ")") ? (E) : (E))
+
+/* Verify requirement R at compile-time, as a declaration without a
+   trailing ';'.  */
+
+#ifdef __GNUC__
+# define verify(R) _GL_VERIFY (R, "verify (" #R ")")
+#else
+/* PGI barfs if R is long.  Play it safe.  */
+# define verify(R) _GL_VERIFY (R, "verify (...)")
+#endif
+
+#ifndef __has_builtin
+# define __has_builtin(x) 0
+#endif
+
+/* Assume that R always holds.  This lets the compiler optimize
+   accordingly.  R should not have side-effects; it may or may not be
+   evaluated.  Behavior is undefined if R is false.  */
+
+#if (__has_builtin (__builtin_unreachable) \
+     || 4 < __GNUC__ + (5 <= __GNUC_MINOR__))
+# define assume(R) ((R) ? (void) 0 : __builtin_unreachable ())
+#elif 1200 <= _MSC_VER
+# define assume(R) __assume (R)
+#elif ((defined GCC_LINT || defined lint) \
+       && (__has_builtin (__builtin_trap) \
+           || 3 < __GNUC__ + (3 < __GNUC_MINOR__ + (4 <= __GNUC_PATCHLEVEL__))))
+  /* Doing it this way helps various packages when configured with
+     --enable-gcc-warnings, which compiles with -Dlint.  It's nicer
+     when 'assume' silences warnings even with older GCCs.  */
+# define assume(R) ((R) ? (void) 0 : __builtin_trap ())
+#else
+# define assume(R) ((void) (0 && (R)))
+#endif
+
+/* @assert.h omit end@  */
+
+#endif
diff --git a/gl/warn-on-use.h b/gl/warn-on-use.h
new file mode 100644
index 0000000..f2f69f6
--- /dev/null
+++ b/gl/warn-on-use.h
@@ -0,0 +1,109 @@
+/* A C macro for emitting warnings if a function is used.
+   Copyright (C) 2010-2017 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify it
+   under the terms of the GNU Lesser General Public License as published
+   by the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* _GL_WARN_ON_USE (function, "literal string") issues a declaration
+   for FUNCTION which will then trigger a compiler warning containing
+   the text of "literal string" anywhere that function is called, if
+   supported by the compiler.  If the compiler does not support this
+   feature, the macro expands to an unused extern declaration.
+
+   This macro is useful for marking a function as a potential
+   portability trap, with the intent that "literal string" include
+   instructions on the replacement function that should be used
+   instead.  However, one of the reasons that a function is a
+   portability trap is if it has the wrong signature.  Declaring
+   FUNCTION with a different signature in C is a compilation error, so
+   this macro must use the same type as any existing declaration so
+   that programs that avoid the problematic FUNCTION do not fail to
+   compile merely because they included a header that poisoned the
+   function.  But this implies that _GL_WARN_ON_USE is only safe to
+   use if FUNCTION is known to already have a declaration.  Use of
+   this macro implies that there must not be any other macro hiding
+   the declaration of FUNCTION; but undefining FUNCTION first is part
+   of the poisoning process anyway (although for symbols that are
+   provided only via a macro, the result is a compilation error rather
+   than a warning containing "literal string").  Also note that in
+   C++, it is only safe to use if FUNCTION has no overloads.
+
+   For an example, it is possible to poison 'getline' by:
+   - adding a call to gl_WARN_ON_USE_PREPARE([[#include <stdio.h>]],
+     [getline]) in configure.ac, which potentially defines
+     HAVE_RAW_DECL_GETLINE
+   - adding this code to a header that wraps the system <stdio.h>:
+     #undef getline
+     #if HAVE_RAW_DECL_GETLINE
+     _GL_WARN_ON_USE (getline, "getline is required by POSIX 2008, but"
+       "not universally present; use the gnulib module getline");
+     #endif
+
+   It is not possible to directly poison global variables.  But it is
+   possible to write a wrapper accessor function, and poison that
+   (less common usage, like &environ, will cause a compilation error
+   rather than issue the nice warning, but the end result of informing
+   the developer about their portability problem is still achieved):
+   #if HAVE_RAW_DECL_ENVIRON
+   static char ***rpl_environ (void) { return &environ; }
+   _GL_WARN_ON_USE (rpl_environ, "environ is not always properly declared");
+   # undef environ
+   # define environ (*rpl_environ ())
+   #endif
+   */
+#ifndef _GL_WARN_ON_USE
+
+# if 4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__)
+/* A compiler attribute is available in gcc versions 4.3.0 and later.  */
+#  define _GL_WARN_ON_USE(function, message) \
+extern __typeof__ (function) function __attribute__ ((__warning__ (message)))
+# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
+/* Verify the existence of the function.  */
+#  define _GL_WARN_ON_USE(function, message) \
+extern __typeof__ (function) function
+# else /* Unsupported.  */
+#  define _GL_WARN_ON_USE(function, message) \
+_GL_WARN_EXTERN_C int _gl_warn_on_use
+# endif
+#endif
+
+/* _GL_WARN_ON_USE_CXX (function, rettype, parameters_and_attributes, "string")
+   is like _GL_WARN_ON_USE (function, "string"), except that the function is
+   declared with the given prototype, consisting of return type, parameters,
+   and attributes.
+   This variant is useful for overloaded functions in C++. _GL_WARN_ON_USE does
+   not work in this case.  */
+#ifndef _GL_WARN_ON_USE_CXX
+# if 4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__)
+#  define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \
+extern rettype function parameters_and_attributes \
+     __attribute__ ((__warning__ (msg)))
+# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
+/* Verify the existence of the function.  */
+#  define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \
+extern rettype function parameters_and_attributes
+# else /* Unsupported.  */
+#  define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \
+_GL_WARN_EXTERN_C int _gl_warn_on_use
+# endif
+#endif
+
+/* _GL_WARN_EXTERN_C declaration;
+   performs the declaration with C linkage.  */
+#ifndef _GL_WARN_EXTERN_C
+# if defined __cplusplus
+#  define _GL_WARN_EXTERN_C extern "C"
+# else
+#  define _GL_WARN_EXTERN_C extern
+# endif
+#endif
diff --git a/gl/wchar.in.h b/gl/wchar.in.h
new file mode 100644
index 0000000..15b1664
--- /dev/null
+++ b/gl/wchar.in.h
@@ -0,0 +1,1077 @@
+/* A substitute for ISO C99 <wchar.h>, for platforms that have issues.
+
+   Copyright (C) 2007-2017 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
+
+/* Written by Eric Blake.  */
+
+/*
+ * ISO C 99 <wchar.h> for platforms that have issues.
+ * <http://www.opengroup.org/susv3xbd/wchar.h.html>
+ *
+ * For now, this just ensures proper prerequisite inclusion order and
+ * the declaration of wcwidth().
+ */
+
+#if __GNUC__ >= 3
+@PRAGMA_SYSTEM_HEADER@
+#endif
+@PRAGMA_COLUMNS@
+
+#if (((defined __need_mbstate_t || defined __need_wint_t)               \
+      && !defined __MINGW32__ && !defined __KLIBC__)                    \
+     || (defined __hpux                                                 \
+         && ((defined _INTTYPES_INCLUDED && !defined strtoimax)         \
+             || defined _GL_JUST_INCLUDE_SYSTEM_WCHAR_H))               \
+     || (defined __MINGW32__ && defined __STRING_H_SOURCED__)           \
+     || defined _GL_ALREADY_INCLUDING_WCHAR_H)
+/* Special invocation convention:
+   - Inside glibc and uClibc header files, but not MinGW.
+   - On HP-UX 11.00 we have a sequence of nested includes
+     <wchar.h> -> <stdlib.h> -> <stdint.h>, and the latter includes <wchar.h>,
+     once indirectly <stdint.h> -> <sys/types.h> -> <inttypes.h> -> <wchar.h>
+     and once directly.  In both situations 'wint_t' is not yet defined,
+     therefore we cannot provide the function overrides; instead include only
+     the system's <wchar.h>.
+   - With MinGW 3.22, when <string.h> includes <wchar.h>, only some part of
+     <wchar.h> is actually processed, and that doesn't include 'mbstate_t'.
+   - On IRIX 6.5, similarly, we have an include <wchar.h> -> <wctype.h>, and
+     the latter includes <wchar.h>.  But here, we have no way to detect whether
+     <wctype.h> is completely included or is still being included.  */
+
+#@INCLUDE_NEXT@ @NEXT_WCHAR_H@
+
+#else
+/* Normal invocation convention.  */
+
+#ifndef _@GUARD_PREFIX@_WCHAR_H
+
+#define _GL_ALREADY_INCLUDING_WCHAR_H
+
+#if @HAVE_FEATURES_H@
+# include <features.h> /* for __GLIBC__ */
+#endif
+
+/* 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>.
+   In some builds of uClibc, <wchar.h> is nonexistent and wchar_t is defined
+   by <stddef.h>.
+   But avoid namespace pollution on glibc systems.  */
+#if !(defined __GLIBC__ && !defined __UCLIBC__)
+# include <stddef.h>
+#endif
+#ifndef __GLIBC__
+# include <stdio.h>
+# include <time.h>
+#endif
+
+/* Include the original <wchar.h> if it exists.
+   Some builds of uClibc lack it.  */
+/* The include_next requires a split double-inclusion guard.  */
+#if @HAVE_WCHAR_H@
+# @INCLUDE_NEXT@ @NEXT_WCHAR_H@
+#endif
+
+#undef _GL_ALREADY_INCLUDING_WCHAR_H
+
+#ifndef _@GUARD_PREFIX@_WCHAR_H
+#define _@GUARD_PREFIX@_WCHAR_H
+
+/* The __attribute__ feature is available in gcc versions 2.5 and later.
+   The attribute __pure__ was added in gcc 2.96.  */
+#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
+# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__))
+#else
+# define _GL_ATTRIBUTE_PURE /* empty */
+#endif
+
+/* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
+
+/* The definition of _GL_ARG_NONNULL is copied here.  */
+
+/* The definition of _GL_WARN_ON_USE is copied here.  */
+
+
+/* Define wint_t and WEOF.  (Also done in wctype.in.h.)  */
+#if !@HAVE_WINT_T@ && !defined wint_t
+# define wint_t int
+# ifndef WEOF
+#  define WEOF -1
+# endif
+#else
+/* mingw and MSVC define wint_t as 'unsigned short' in <crtdefs.h> or
+   <stddef.h>.  This is too small: ISO C 99 section 7.24.1.(2) says that
+   wint_t must be "unchanged by default argument promotions".  Override it.  */
+# if @GNULIB_OVERRIDES_WINT_T@
+#  if !GNULIB_defined_wint_t
+#   if @HAVE_CRTDEFS_H@
+#    include <crtdefs.h>
+#   else
+#    include <stddef.h>
+#   endif
+typedef unsigned int rpl_wint_t;
+#   undef wint_t
+#   define wint_t rpl_wint_t
+#   define GNULIB_defined_wint_t 1
+#  endif
+# endif
+# ifndef WEOF
+#  define WEOF ((wint_t) -1)
+# endif
+#endif
+
+
+/* Override mbstate_t if it is too small.
+   On IRIX 6.5, sizeof (mbstate_t) == 1, which is not sufficient for
+   implementing mbrtowc for encodings like UTF-8.  */
+#if !(@HAVE_MBSINIT@ && @HAVE_MBRTOWC@) || @REPLACE_MBSTATE_T@
+# if !GNULIB_defined_mbstate_t
+typedef int rpl_mbstate_t;
+#  undef mbstate_t
+#  define mbstate_t rpl_mbstate_t
+#  define GNULIB_defined_mbstate_t 1
+# endif
+#endif
+
+
+/* Convert a single-byte character to a wide character.  */
+#if @GNULIB_BTOWC@
+# if @REPLACE_BTOWC@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef btowc
+#   define btowc rpl_btowc
+#  endif
+_GL_FUNCDECL_RPL (btowc, wint_t, (int c) _GL_ATTRIBUTE_PURE);
+_GL_CXXALIAS_RPL (btowc, wint_t, (int c));
+# else
+#  if !@HAVE_BTOWC@
+_GL_FUNCDECL_SYS (btowc, wint_t, (int c) _GL_ATTRIBUTE_PURE);
+#  endif
+_GL_CXXALIAS_SYS (btowc, wint_t, (int c));
+# endif
+_GL_CXXALIASWARN (btowc);
+#elif defined GNULIB_POSIXCHECK
+# undef btowc
+# if HAVE_RAW_DECL_BTOWC
+_GL_WARN_ON_USE (btowc, "btowc is unportable - "
+                 "use gnulib module btowc for portability");
+# endif
+#endif
+
+
+/* Convert a wide character to a single-byte character.  */
+#if @GNULIB_WCTOB@
+# if @REPLACE_WCTOB@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef wctob
+#   define wctob rpl_wctob
+#  endif
+_GL_FUNCDECL_RPL (wctob, int, (wint_t wc) _GL_ATTRIBUTE_PURE);
+_GL_CXXALIAS_RPL (wctob, int, (wint_t wc));
+# else
+#  if !defined wctob && !@HAVE_DECL_WCTOB@
+/* wctob is provided by gnulib, or wctob exists but is not declared.  */
+_GL_FUNCDECL_SYS (wctob, int, (wint_t wc) _GL_ATTRIBUTE_PURE);
+#  endif
+_GL_CXXALIAS_SYS (wctob, int, (wint_t wc));
+# endif
+_GL_CXXALIASWARN (wctob);
+#elif defined GNULIB_POSIXCHECK
+# undef wctob
+# if HAVE_RAW_DECL_WCTOB
+_GL_WARN_ON_USE (wctob, "wctob is unportable - "
+                 "use gnulib module wctob for portability");
+# endif
+#endif
+
+
+/* Test whether *PS is in the initial state.  */
+#if @GNULIB_MBSINIT@
+# if @REPLACE_MBSINIT@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef mbsinit
+#   define mbsinit rpl_mbsinit
+#  endif
+_GL_FUNCDECL_RPL (mbsinit, int, (const mbstate_t *ps));
+_GL_CXXALIAS_RPL (mbsinit, int, (const mbstate_t *ps));
+# else
+#  if !@HAVE_MBSINIT@
+_GL_FUNCDECL_SYS (mbsinit, int, (const mbstate_t *ps));
+#  endif
+_GL_CXXALIAS_SYS (mbsinit, int, (const mbstate_t *ps));
+# endif
+_GL_CXXALIASWARN (mbsinit);
+#elif defined GNULIB_POSIXCHECK
+# undef mbsinit
+# if HAVE_RAW_DECL_MBSINIT
+_GL_WARN_ON_USE (mbsinit, "mbsinit is unportable - "
+                 "use gnulib module mbsinit for portability");
+# endif
+#endif
+
+
+/* Convert a multibyte character to a wide character.  */
+#if @GNULIB_MBRTOWC@
+# if @REPLACE_MBRTOWC@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef mbrtowc
+#   define mbrtowc rpl_mbrtowc
+#  endif
+_GL_FUNCDECL_RPL (mbrtowc, size_t,
+                  (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps));
+_GL_CXXALIAS_RPL (mbrtowc, size_t,
+                  (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps));
+# else
+#  if !@HAVE_MBRTOWC@
+_GL_FUNCDECL_SYS (mbrtowc, size_t,
+                  (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps));
+#  endif
+_GL_CXXALIAS_SYS (mbrtowc, size_t,
+                  (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps));
+# endif
+_GL_CXXALIASWARN (mbrtowc);
+#elif defined GNULIB_POSIXCHECK
+# undef mbrtowc
+# if HAVE_RAW_DECL_MBRTOWC
+_GL_WARN_ON_USE (mbrtowc, "mbrtowc is unportable - "
+                 "use gnulib module mbrtowc for portability");
+# endif
+#endif
+
+
+/* Recognize a multibyte character.  */
+#if @GNULIB_MBRLEN@
+# if @REPLACE_MBRLEN@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef mbrlen
+#   define mbrlen rpl_mbrlen
+#  endif
+_GL_FUNCDECL_RPL (mbrlen, size_t, (const char *s, size_t n, mbstate_t *ps));
+_GL_CXXALIAS_RPL (mbrlen, size_t, (const char *s, size_t n, mbstate_t *ps));
+# else
+#  if !@HAVE_MBRLEN@
+_GL_FUNCDECL_SYS (mbrlen, size_t, (const char *s, size_t n, mbstate_t *ps));
+#  endif
+_GL_CXXALIAS_SYS (mbrlen, size_t, (const char *s, size_t n, mbstate_t *ps));
+# endif
+_GL_CXXALIASWARN (mbrlen);
+#elif defined GNULIB_POSIXCHECK
+# undef mbrlen
+# if HAVE_RAW_DECL_MBRLEN
+_GL_WARN_ON_USE (mbrlen, "mbrlen is unportable - "
+                 "use gnulib module mbrlen for portability");
+# endif
+#endif
+
+
+/* Convert a string to a wide string.  */
+#if @GNULIB_MBSRTOWCS@
+# if @REPLACE_MBSRTOWCS@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef mbsrtowcs
+#   define mbsrtowcs rpl_mbsrtowcs
+#  endif
+_GL_FUNCDECL_RPL (mbsrtowcs, size_t,
+                  (wchar_t *dest, const char **srcp, size_t len, mbstate_t *ps)
+                  _GL_ARG_NONNULL ((2)));
+_GL_CXXALIAS_RPL (mbsrtowcs, size_t,
+                  (wchar_t *dest, const char **srcp, size_t len,
+                   mbstate_t *ps));
+# else
+#  if !@HAVE_MBSRTOWCS@
+_GL_FUNCDECL_SYS (mbsrtowcs, size_t,
+                  (wchar_t *dest, const char **srcp, size_t len, mbstate_t *ps)
+                  _GL_ARG_NONNULL ((2)));
+#  endif
+_GL_CXXALIAS_SYS (mbsrtowcs, size_t,
+                  (wchar_t *dest, const char **srcp, size_t len,
+                   mbstate_t *ps));
+# endif
+_GL_CXXALIASWARN (mbsrtowcs);
+#elif defined GNULIB_POSIXCHECK
+# undef mbsrtowcs
+# if HAVE_RAW_DECL_MBSRTOWCS
+_GL_WARN_ON_USE (mbsrtowcs, "mbsrtowcs is unportable - "
+                 "use gnulib module mbsrtowcs for portability");
+# endif
+#endif
+
+
+/* Convert a string to a wide string.  */
+#if @GNULIB_MBSNRTOWCS@
+# if @REPLACE_MBSNRTOWCS@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef mbsnrtowcs
+#   define mbsnrtowcs rpl_mbsnrtowcs
+#  endif
+_GL_FUNCDECL_RPL (mbsnrtowcs, size_t,
+                  (wchar_t *dest, const char **srcp, size_t srclen, size_t len,
+                   mbstate_t *ps)
+                  _GL_ARG_NONNULL ((2)));
+_GL_CXXALIAS_RPL (mbsnrtowcs, size_t,
+                  (wchar_t *dest, const char **srcp, size_t srclen, size_t len,
+                   mbstate_t *ps));
+# else
+#  if !@HAVE_MBSNRTOWCS@
+_GL_FUNCDECL_SYS (mbsnrtowcs, size_t,
+                  (wchar_t *dest, const char **srcp, size_t srclen, size_t len,
+                   mbstate_t *ps)
+                  _GL_ARG_NONNULL ((2)));
+#  endif
+_GL_CXXALIAS_SYS (mbsnrtowcs, size_t,
+                  (wchar_t *dest, const char **srcp, size_t srclen, size_t len,
+                   mbstate_t *ps));
+# endif
+_GL_CXXALIASWARN (mbsnrtowcs);
+#elif defined GNULIB_POSIXCHECK
+# undef mbsnrtowcs
+# if HAVE_RAW_DECL_MBSNRTOWCS
+_GL_WARN_ON_USE (mbsnrtowcs, "mbsnrtowcs is unportable - "
+                 "use gnulib module mbsnrtowcs for portability");
+# endif
+#endif
+
+
+/* Convert a wide character to a multibyte character.  */
+#if @GNULIB_WCRTOMB@
+# if @REPLACE_WCRTOMB@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef wcrtomb
+#   define wcrtomb rpl_wcrtomb
+#  endif
+_GL_FUNCDECL_RPL (wcrtomb, size_t, (char *s, wchar_t wc, mbstate_t *ps));
+_GL_CXXALIAS_RPL (wcrtomb, size_t, (char *s, wchar_t wc, mbstate_t *ps));
+# else
+#  if !@HAVE_WCRTOMB@
+_GL_FUNCDECL_SYS (wcrtomb, size_t, (char *s, wchar_t wc, mbstate_t *ps));
+#  endif
+_GL_CXXALIAS_SYS (wcrtomb, size_t, (char *s, wchar_t wc, mbstate_t *ps));
+# endif
+_GL_CXXALIASWARN (wcrtomb);
+#elif defined GNULIB_POSIXCHECK
+# undef wcrtomb
+# if HAVE_RAW_DECL_WCRTOMB
+_GL_WARN_ON_USE (wcrtomb, "wcrtomb is unportable - "
+                 "use gnulib module wcrtomb for portability");
+# endif
+#endif
+
+
+/* Convert a wide string to a string.  */
+#if @GNULIB_WCSRTOMBS@
+# if @REPLACE_WCSRTOMBS@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef wcsrtombs
+#   define wcsrtombs rpl_wcsrtombs
+#  endif
+_GL_FUNCDECL_RPL (wcsrtombs, size_t,
+                  (char *dest, const wchar_t **srcp, size_t len, mbstate_t *ps)
+                  _GL_ARG_NONNULL ((2)));
+_GL_CXXALIAS_RPL (wcsrtombs, size_t,
+                  (char *dest, const wchar_t **srcp, size_t len,
+                   mbstate_t *ps));
+# else
+#  if !@HAVE_WCSRTOMBS@
+_GL_FUNCDECL_SYS (wcsrtombs, size_t,
+                  (char *dest, const wchar_t **srcp, size_t len, mbstate_t *ps)
+                  _GL_ARG_NONNULL ((2)));
+#  endif
+_GL_CXXALIAS_SYS (wcsrtombs, size_t,
+                  (char *dest, const wchar_t **srcp, size_t len,
+                   mbstate_t *ps));
+# endif
+_GL_CXXALIASWARN (wcsrtombs);
+#elif defined GNULIB_POSIXCHECK
+# undef wcsrtombs
+# if HAVE_RAW_DECL_WCSRTOMBS
+_GL_WARN_ON_USE (wcsrtombs, "wcsrtombs is unportable - "
+                 "use gnulib module wcsrtombs for portability");
+# endif
+#endif
+
+
+/* Convert a wide string to a string.  */
+#if @GNULIB_WCSNRTOMBS@
+# if @REPLACE_WCSNRTOMBS@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef wcsnrtombs
+#   define wcsnrtombs rpl_wcsnrtombs
+#  endif
+_GL_FUNCDECL_RPL (wcsnrtombs, size_t,
+                  (char *dest, const wchar_t **srcp, size_t srclen, size_t len,
+                   mbstate_t *ps)
+                  _GL_ARG_NONNULL ((2)));
+_GL_CXXALIAS_RPL (wcsnrtombs, size_t,
+                  (char *dest, const wchar_t **srcp, size_t srclen, size_t len,
+                   mbstate_t *ps));
+# else
+#  if !@HAVE_WCSNRTOMBS@
+_GL_FUNCDECL_SYS (wcsnrtombs, size_t,
+                  (char *dest, const wchar_t **srcp, size_t srclen, size_t len,
+                   mbstate_t *ps)
+                  _GL_ARG_NONNULL ((2)));
+#  endif
+_GL_CXXALIAS_SYS (wcsnrtombs, size_t,
+                  (char *dest, const wchar_t **srcp, size_t srclen, size_t len,
+                   mbstate_t *ps));
+# endif
+_GL_CXXALIASWARN (wcsnrtombs);
+#elif defined GNULIB_POSIXCHECK
+# undef wcsnrtombs
+# if HAVE_RAW_DECL_WCSNRTOMBS
+_GL_WARN_ON_USE (wcsnrtombs, "wcsnrtombs is unportable - "
+                 "use gnulib module wcsnrtombs for portability");
+# endif
+#endif
+
+
+/* Return the number of screen columns needed for WC.  */
+#if @GNULIB_WCWIDTH@
+# if @REPLACE_WCWIDTH@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef wcwidth
+#   define wcwidth rpl_wcwidth
+#  endif
+_GL_FUNCDECL_RPL (wcwidth, int, (wchar_t) _GL_ATTRIBUTE_PURE);
+_GL_CXXALIAS_RPL (wcwidth, int, (wchar_t));
+# else
+#  if !@HAVE_DECL_WCWIDTH@
+/* wcwidth exists but is not declared.  */
+_GL_FUNCDECL_SYS (wcwidth, int, (wchar_t) _GL_ATTRIBUTE_PURE);
+#  elif defined __KLIBC__
+/* On OS/2 kLIBC, wcwidth is a macro that expands to the name of a
+   static inline function.  The implementation of wcwidth in wcwidth.c
+   causes a "conflicting types" error. */
+#   undef wcwidth
+#  endif
+_GL_CXXALIAS_SYS (wcwidth, int, (wchar_t));
+# endif
+_GL_CXXALIASWARN (wcwidth);
+#elif defined GNULIB_POSIXCHECK
+# undef wcwidth
+# if HAVE_RAW_DECL_WCWIDTH
+_GL_WARN_ON_USE (wcwidth, "wcwidth is unportable - "
+                 "use gnulib module wcwidth for portability");
+# endif
+#endif
+
+
+/* Search N wide characters of S for C.  */
+#if @GNULIB_WMEMCHR@
+# if !@HAVE_WMEMCHR@
+_GL_FUNCDECL_SYS (wmemchr, wchar_t *, (const wchar_t *s, wchar_t c, size_t n)
+                                      _GL_ATTRIBUTE_PURE);
+# endif
+  /* On some systems, this function is defined as an overloaded function:
+       extern "C++" {
+         const wchar_t * std::wmemchr (const wchar_t *, wchar_t, size_t);
+         wchar_t * std::wmemchr (wchar_t *, wchar_t, size_t);
+       }  */
+_GL_CXXALIAS_SYS_CAST2 (wmemchr,
+                        wchar_t *, (const wchar_t *, wchar_t, size_t),
+                        const wchar_t *, (const wchar_t *, wchar_t, size_t));
+# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
+     && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
+_GL_CXXALIASWARN1 (wmemchr, wchar_t *, (wchar_t *s, wchar_t c, size_t n));
+_GL_CXXALIASWARN1 (wmemchr, const wchar_t *,
+                   (const wchar_t *s, wchar_t c, size_t n));
+# else
+_GL_CXXALIASWARN (wmemchr);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef wmemchr
+# if HAVE_RAW_DECL_WMEMCHR
+_GL_WARN_ON_USE (wmemchr, "wmemchr is unportable - "
+                 "use gnulib module wmemchr for portability");
+# endif
+#endif
+
+
+/* Compare N wide characters of S1 and S2.  */
+#if @GNULIB_WMEMCMP@
+# if !@HAVE_WMEMCMP@
+_GL_FUNCDECL_SYS (wmemcmp, int,
+                  (const wchar_t *s1, const wchar_t *s2, size_t n)
+                  _GL_ATTRIBUTE_PURE);
+# endif
+_GL_CXXALIAS_SYS (wmemcmp, int,
+                  (const wchar_t *s1, const wchar_t *s2, size_t n));
+_GL_CXXALIASWARN (wmemcmp);
+#elif defined GNULIB_POSIXCHECK
+# undef wmemcmp
+# if HAVE_RAW_DECL_WMEMCMP
+_GL_WARN_ON_USE (wmemcmp, "wmemcmp is unportable - "
+                 "use gnulib module wmemcmp for portability");
+# endif
+#endif
+
+
+/* Copy N wide characters of SRC to DEST.  */
+#if @GNULIB_WMEMCPY@
+# if !@HAVE_WMEMCPY@
+_GL_FUNCDECL_SYS (wmemcpy, wchar_t *,
+                  (wchar_t *dest, const wchar_t *src, size_t n));
+# endif
+_GL_CXXALIAS_SYS (wmemcpy, wchar_t *,
+                  (wchar_t *dest, const wchar_t *src, size_t n));
+_GL_CXXALIASWARN (wmemcpy);
+#elif defined GNULIB_POSIXCHECK
+# undef wmemcpy
+# if HAVE_RAW_DECL_WMEMCPY
+_GL_WARN_ON_USE (wmemcpy, "wmemcpy is unportable - "
+                 "use gnulib module wmemcpy for portability");
+# endif
+#endif
+
+
+/* Copy N wide characters of SRC to DEST, guaranteeing correct behavior for
+   overlapping memory areas.  */
+#if @GNULIB_WMEMMOVE@
+# if !@HAVE_WMEMMOVE@
+_GL_FUNCDECL_SYS (wmemmove, wchar_t *,
+                  (wchar_t *dest, const wchar_t *src, size_t n));
+# endif
+_GL_CXXALIAS_SYS (wmemmove, wchar_t *,
+                  (wchar_t *dest, const wchar_t *src, size_t n));
+_GL_CXXALIASWARN (wmemmove);
+#elif defined GNULIB_POSIXCHECK
+# undef wmemmove
+# if HAVE_RAW_DECL_WMEMMOVE
+_GL_WARN_ON_USE (wmemmove, "wmemmove is unportable - "
+                 "use gnulib module wmemmove for portability");
+# endif
+#endif
+
+
+/* Set N wide characters of S to C.  */
+#if @GNULIB_WMEMSET@
+# if !@HAVE_WMEMSET@
+_GL_FUNCDECL_SYS (wmemset, wchar_t *, (wchar_t *s, wchar_t c, size_t n));
+# endif
+_GL_CXXALIAS_SYS (wmemset, wchar_t *, (wchar_t *s, wchar_t c, size_t n));
+_GL_CXXALIASWARN (wmemset);
+#elif defined GNULIB_POSIXCHECK
+# undef wmemset
+# if HAVE_RAW_DECL_WMEMSET
+_GL_WARN_ON_USE (wmemset, "wmemset is unportable - "
+                 "use gnulib module wmemset for portability");
+# endif
+#endif
+
+
+/* Return the number of wide characters in S.  */
+#if @GNULIB_WCSLEN@
+# if !@HAVE_WCSLEN@
+_GL_FUNCDECL_SYS (wcslen, size_t, (const wchar_t *s) _GL_ATTRIBUTE_PURE);
+# endif
+_GL_CXXALIAS_SYS (wcslen, size_t, (const wchar_t *s));
+_GL_CXXALIASWARN (wcslen);
+#elif defined GNULIB_POSIXCHECK
+# undef wcslen
+# if HAVE_RAW_DECL_WCSLEN
+_GL_WARN_ON_USE (wcslen, "wcslen is unportable - "
+                 "use gnulib module wcslen for portability");
+# endif
+#endif
+
+
+/* Return the number of wide characters in S, but at most MAXLEN.  */
+#if @GNULIB_WCSNLEN@
+# if !@HAVE_WCSNLEN@
+_GL_FUNCDECL_SYS (wcsnlen, size_t, (const wchar_t *s, size_t maxlen)
+                                   _GL_ATTRIBUTE_PURE);
+# endif
+_GL_CXXALIAS_SYS (wcsnlen, size_t, (const wchar_t *s, size_t maxlen));
+_GL_CXXALIASWARN (wcsnlen);
+#elif defined GNULIB_POSIXCHECK
+# undef wcsnlen
+# if HAVE_RAW_DECL_WCSNLEN
+_GL_WARN_ON_USE (wcsnlen, "wcsnlen is unportable - "
+                 "use gnulib module wcsnlen for portability");
+# endif
+#endif
+
+
+/* Copy SRC to DEST.  */
+#if @GNULIB_WCSCPY@
+# if !@HAVE_WCSCPY@
+_GL_FUNCDECL_SYS (wcscpy, wchar_t *, (wchar_t *dest, const wchar_t *src));
+# endif
+_GL_CXXALIAS_SYS (wcscpy, wchar_t *, (wchar_t *dest, const wchar_t *src));
+_GL_CXXALIASWARN (wcscpy);
+#elif defined GNULIB_POSIXCHECK
+# undef wcscpy
+# if HAVE_RAW_DECL_WCSCPY
+_GL_WARN_ON_USE (wcscpy, "wcscpy is unportable - "
+                 "use gnulib module wcscpy for portability");
+# endif
+#endif
+
+
+/* Copy SRC to DEST, returning the address of the terminating L'\0' in DEST.  */
+#if @GNULIB_WCPCPY@
+# if !@HAVE_WCPCPY@
+_GL_FUNCDECL_SYS (wcpcpy, wchar_t *, (wchar_t *dest, const wchar_t *src));
+# endif
+_GL_CXXALIAS_SYS (wcpcpy, wchar_t *, (wchar_t *dest, const wchar_t *src));
+_GL_CXXALIASWARN (wcpcpy);
+#elif defined GNULIB_POSIXCHECK
+# undef wcpcpy
+# if HAVE_RAW_DECL_WCPCPY
+_GL_WARN_ON_USE (wcpcpy, "wcpcpy is unportable - "
+                 "use gnulib module wcpcpy for portability");
+# endif
+#endif
+
+
+/* Copy no more than N wide characters of SRC to DEST.  */
+#if @GNULIB_WCSNCPY@
+# if !@HAVE_WCSNCPY@
+_GL_FUNCDECL_SYS (wcsncpy, wchar_t *,
+                  (wchar_t *dest, const wchar_t *src, size_t n));
+# endif
+_GL_CXXALIAS_SYS (wcsncpy, wchar_t *,
+                  (wchar_t *dest, const wchar_t *src, size_t n));
+_GL_CXXALIASWARN (wcsncpy);
+#elif defined GNULIB_POSIXCHECK
+# undef wcsncpy
+# if HAVE_RAW_DECL_WCSNCPY
+_GL_WARN_ON_USE (wcsncpy, "wcsncpy is unportable - "
+                 "use gnulib module wcsncpy for portability");
+# endif
+#endif
+
+
+/* Copy no more than N characters of SRC to DEST, returning the address of
+   the last character written into DEST.  */
+#if @GNULIB_WCPNCPY@
+# if !@HAVE_WCPNCPY@
+_GL_FUNCDECL_SYS (wcpncpy, wchar_t *,
+                  (wchar_t *dest, const wchar_t *src, size_t n));
+# endif
+_GL_CXXALIAS_SYS (wcpncpy, wchar_t *,
+                  (wchar_t *dest, const wchar_t *src, size_t n));
+_GL_CXXALIASWARN (wcpncpy);
+#elif defined GNULIB_POSIXCHECK
+# undef wcpncpy
+# if HAVE_RAW_DECL_WCPNCPY
+_GL_WARN_ON_USE (wcpncpy, "wcpncpy is unportable - "
+                 "use gnulib module wcpncpy for portability");
+# endif
+#endif
+
+
+/* Append SRC onto DEST.  */
+#if @GNULIB_WCSCAT@
+# if !@HAVE_WCSCAT@
+_GL_FUNCDECL_SYS (wcscat, wchar_t *, (wchar_t *dest, const wchar_t *src));
+# endif
+_GL_CXXALIAS_SYS (wcscat, wchar_t *, (wchar_t *dest, const wchar_t *src));
+_GL_CXXALIASWARN (wcscat);
+#elif defined GNULIB_POSIXCHECK
+# undef wcscat
+# if HAVE_RAW_DECL_WCSCAT
+_GL_WARN_ON_USE (wcscat, "wcscat is unportable - "
+                 "use gnulib module wcscat for portability");
+# endif
+#endif
+
+
+/* Append no more than N wide characters of SRC onto DEST.  */
+#if @GNULIB_WCSNCAT@
+# if !@HAVE_WCSNCAT@
+_GL_FUNCDECL_SYS (wcsncat, wchar_t *,
+                  (wchar_t *dest, const wchar_t *src, size_t n));
+# endif
+_GL_CXXALIAS_SYS (wcsncat, wchar_t *,
+                  (wchar_t *dest, const wchar_t *src, size_t n));
+_GL_CXXALIASWARN (wcsncat);
+#elif defined GNULIB_POSIXCHECK
+# undef wcsncat
+# if HAVE_RAW_DECL_WCSNCAT
+_GL_WARN_ON_USE (wcsncat, "wcsncat is unportable - "
+                 "use gnulib module wcsncat for portability");
+# endif
+#endif
+
+
+/* Compare S1 and S2.  */
+#if @GNULIB_WCSCMP@
+# if !@HAVE_WCSCMP@
+_GL_FUNCDECL_SYS (wcscmp, int, (const wchar_t *s1, const wchar_t *s2)
+                               _GL_ATTRIBUTE_PURE);
+# endif
+_GL_CXXALIAS_SYS (wcscmp, int, (const wchar_t *s1, const wchar_t *s2));
+_GL_CXXALIASWARN (wcscmp);
+#elif defined GNULIB_POSIXCHECK
+# undef wcscmp
+# if HAVE_RAW_DECL_WCSCMP
+_GL_WARN_ON_USE (wcscmp, "wcscmp is unportable - "
+                 "use gnulib module wcscmp for portability");
+# endif
+#endif
+
+
+/* Compare no more than N wide characters of S1 and S2.  */
+#if @GNULIB_WCSNCMP@
+# if !@HAVE_WCSNCMP@
+_GL_FUNCDECL_SYS (wcsncmp, int,
+                  (const wchar_t *s1, const wchar_t *s2, size_t n)
+                  _GL_ATTRIBUTE_PURE);
+# endif
+_GL_CXXALIAS_SYS (wcsncmp, int,
+                  (const wchar_t *s1, const wchar_t *s2, size_t n));
+_GL_CXXALIASWARN (wcsncmp);
+#elif defined GNULIB_POSIXCHECK
+# undef wcsncmp
+# if HAVE_RAW_DECL_WCSNCMP
+_GL_WARN_ON_USE (wcsncmp, "wcsncmp is unportable - "
+                 "use gnulib module wcsncmp for portability");
+# endif
+#endif
+
+
+/* Compare S1 and S2, ignoring case.  */
+#if @GNULIB_WCSCASECMP@
+# if !@HAVE_WCSCASECMP@
+_GL_FUNCDECL_SYS (wcscasecmp, int, (const wchar_t *s1, const wchar_t *s2)
+                                   _GL_ATTRIBUTE_PURE);
+# endif
+_GL_CXXALIAS_SYS (wcscasecmp, int, (const wchar_t *s1, const wchar_t *s2));
+_GL_CXXALIASWARN (wcscasecmp);
+#elif defined GNULIB_POSIXCHECK
+# undef wcscasecmp
+# if HAVE_RAW_DECL_WCSCASECMP
+_GL_WARN_ON_USE (wcscasecmp, "wcscasecmp is unportable - "
+                 "use gnulib module wcscasecmp for portability");
+# endif
+#endif
+
+
+/* Compare no more than N chars of S1 and S2, ignoring case.  */
+#if @GNULIB_WCSNCASECMP@
+# if !@HAVE_WCSNCASECMP@
+_GL_FUNCDECL_SYS (wcsncasecmp, int,
+                  (const wchar_t *s1, const wchar_t *s2, size_t n)
+                  _GL_ATTRIBUTE_PURE);
+# endif
+_GL_CXXALIAS_SYS (wcsncasecmp, int,
+                  (const wchar_t *s1, const wchar_t *s2, size_t n));
+_GL_CXXALIASWARN (wcsncasecmp);
+#elif defined GNULIB_POSIXCHECK
+# undef wcsncasecmp
+# if HAVE_RAW_DECL_WCSNCASECMP
+_GL_WARN_ON_USE (wcsncasecmp, "wcsncasecmp is unportable - "
+                 "use gnulib module wcsncasecmp for portability");
+# endif
+#endif
+
+
+/* Compare S1 and S2, both interpreted as appropriate to the LC_COLLATE
+   category of the current locale.  */
+#if @GNULIB_WCSCOLL@
+# if !@HAVE_WCSCOLL@
+_GL_FUNCDECL_SYS (wcscoll, int, (const wchar_t *s1, const wchar_t *s2));
+# endif
+_GL_CXXALIAS_SYS (wcscoll, int, (const wchar_t *s1, const wchar_t *s2));
+_GL_CXXALIASWARN (wcscoll);
+#elif defined GNULIB_POSIXCHECK
+# undef wcscoll
+# if HAVE_RAW_DECL_WCSCOLL
+_GL_WARN_ON_USE (wcscoll, "wcscoll is unportable - "
+                 "use gnulib module wcscoll for portability");
+# endif
+#endif
+
+
+/* Transform S2 into array pointed to by S1 such that if wcscmp is applied
+   to two transformed strings the result is the as applying 'wcscoll' to the
+   original strings.  */
+#if @GNULIB_WCSXFRM@
+# if !@HAVE_WCSXFRM@
+_GL_FUNCDECL_SYS (wcsxfrm, size_t, (wchar_t *s1, const wchar_t *s2, size_t n));
+# endif
+_GL_CXXALIAS_SYS (wcsxfrm, size_t, (wchar_t *s1, const wchar_t *s2, size_t n));
+_GL_CXXALIASWARN (wcsxfrm);
+#elif defined GNULIB_POSIXCHECK
+# undef wcsxfrm
+# if HAVE_RAW_DECL_WCSXFRM
+_GL_WARN_ON_USE (wcsxfrm, "wcsxfrm is unportable - "
+                 "use gnulib module wcsxfrm for portability");
+# endif
+#endif
+
+
+/* Duplicate S, returning an identical malloc'd string.  */
+#if @GNULIB_WCSDUP@
+# if !@HAVE_WCSDUP@
+_GL_FUNCDECL_SYS (wcsdup, wchar_t *, (const wchar_t *s));
+# endif
+_GL_CXXALIAS_SYS (wcsdup, wchar_t *, (const wchar_t *s));
+_GL_CXXALIASWARN (wcsdup);
+#elif defined GNULIB_POSIXCHECK
+# undef wcsdup
+# if HAVE_RAW_DECL_WCSDUP
+_GL_WARN_ON_USE (wcsdup, "wcsdup is unportable - "
+                 "use gnulib module wcsdup for portability");
+# endif
+#endif
+
+
+/* Find the first occurrence of WC in WCS.  */
+#if @GNULIB_WCSCHR@
+# if !@HAVE_WCSCHR@
+_GL_FUNCDECL_SYS (wcschr, wchar_t *, (const wchar_t *wcs, wchar_t wc)
+                                     _GL_ATTRIBUTE_PURE);
+# endif
+  /* On some systems, this function is defined as an overloaded function:
+       extern "C++" {
+         const wchar_t * std::wcschr (const wchar_t *, wchar_t);
+         wchar_t * std::wcschr (wchar_t *, wchar_t);
+       }  */
+_GL_CXXALIAS_SYS_CAST2 (wcschr,
+                        wchar_t *, (const wchar_t *, wchar_t),
+                        const wchar_t *, (const wchar_t *, wchar_t));
+# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
+     && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
+_GL_CXXALIASWARN1 (wcschr, wchar_t *, (wchar_t *wcs, wchar_t wc));
+_GL_CXXALIASWARN1 (wcschr, const wchar_t *, (const wchar_t *wcs, wchar_t wc));
+# else
+_GL_CXXALIASWARN (wcschr);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef wcschr
+# if HAVE_RAW_DECL_WCSCHR
+_GL_WARN_ON_USE (wcschr, "wcschr is unportable - "
+                 "use gnulib module wcschr for portability");
+# endif
+#endif
+
+
+/* Find the last occurrence of WC in WCS.  */
+#if @GNULIB_WCSRCHR@
+# if !@HAVE_WCSRCHR@
+_GL_FUNCDECL_SYS (wcsrchr, wchar_t *, (const wchar_t *wcs, wchar_t wc)
+                                      _GL_ATTRIBUTE_PURE);
+# endif
+  /* On some systems, this function is defined as an overloaded function:
+       extern "C++" {
+         const wchar_t * std::wcsrchr (const wchar_t *, wchar_t);
+         wchar_t * std::wcsrchr (wchar_t *, wchar_t);
+       }  */
+_GL_CXXALIAS_SYS_CAST2 (wcsrchr,
+                        wchar_t *, (const wchar_t *, wchar_t),
+                        const wchar_t *, (const wchar_t *, wchar_t));
+# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
+     && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
+_GL_CXXALIASWARN1 (wcsrchr, wchar_t *, (wchar_t *wcs, wchar_t wc));
+_GL_CXXALIASWARN1 (wcsrchr, const wchar_t *, (const wchar_t *wcs, wchar_t wc));
+# else
+_GL_CXXALIASWARN (wcsrchr);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef wcsrchr
+# if HAVE_RAW_DECL_WCSRCHR
+_GL_WARN_ON_USE (wcsrchr, "wcsrchr is unportable - "
+                 "use gnulib module wcsrchr for portability");
+# endif
+#endif
+
+
+/* Return the length of the initial segmet of WCS which consists entirely
+   of wide characters not in REJECT.  */
+#if @GNULIB_WCSCSPN@
+# if !@HAVE_WCSCSPN@
+_GL_FUNCDECL_SYS (wcscspn, size_t, (const wchar_t *wcs, const wchar_t *reject)
+                                   _GL_ATTRIBUTE_PURE);
+# endif
+_GL_CXXALIAS_SYS (wcscspn, size_t, (const wchar_t *wcs, const wchar_t *reject));
+_GL_CXXALIASWARN (wcscspn);
+#elif defined GNULIB_POSIXCHECK
+# undef wcscspn
+# if HAVE_RAW_DECL_WCSCSPN
+_GL_WARN_ON_USE (wcscspn, "wcscspn is unportable - "
+                 "use gnulib module wcscspn for portability");
+# endif
+#endif
+
+
+/* Return the length of the initial segmet of WCS which consists entirely
+   of wide characters in ACCEPT.  */
+#if @GNULIB_WCSSPN@
+# if !@HAVE_WCSSPN@
+_GL_FUNCDECL_SYS (wcsspn, size_t, (const wchar_t *wcs, const wchar_t *accept)
+                                  _GL_ATTRIBUTE_PURE);
+# endif
+_GL_CXXALIAS_SYS (wcsspn, size_t, (const wchar_t *wcs, const wchar_t *accept));
+_GL_CXXALIASWARN (wcsspn);
+#elif defined GNULIB_POSIXCHECK
+# undef wcsspn
+# if HAVE_RAW_DECL_WCSSPN
+_GL_WARN_ON_USE (wcsspn, "wcsspn is unportable - "
+                 "use gnulib module wcsspn for portability");
+# endif
+#endif
+
+
+/* Find the first occurrence in WCS of any character in ACCEPT.  */
+#if @GNULIB_WCSPBRK@
+# if !@HAVE_WCSPBRK@
+_GL_FUNCDECL_SYS (wcspbrk, wchar_t *,
+                  (const wchar_t *wcs, const wchar_t *accept)
+                  _GL_ATTRIBUTE_PURE);
+# endif
+  /* On some systems, this function is defined as an overloaded function:
+       extern "C++" {
+         const wchar_t * std::wcspbrk (const wchar_t *, const wchar_t *);
+         wchar_t * std::wcspbrk (wchar_t *, const wchar_t *);
+       }  */
+_GL_CXXALIAS_SYS_CAST2 (wcspbrk,
+                        wchar_t *, (const wchar_t *, const wchar_t *),
+                        const wchar_t *, (const wchar_t *, const wchar_t *));
+# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
+     && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
+_GL_CXXALIASWARN1 (wcspbrk, wchar_t *,
+                   (wchar_t *wcs, const wchar_t *accept));
+_GL_CXXALIASWARN1 (wcspbrk, const wchar_t *,
+                   (const wchar_t *wcs, const wchar_t *accept));
+# else
+_GL_CXXALIASWARN (wcspbrk);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef wcspbrk
+# if HAVE_RAW_DECL_WCSPBRK
+_GL_WARN_ON_USE (wcspbrk, "wcspbrk is unportable - "
+                 "use gnulib module wcspbrk for portability");
+# endif
+#endif
+
+
+/* Find the first occurrence of NEEDLE in HAYSTACK.  */
+#if @GNULIB_WCSSTR@
+# if !@HAVE_WCSSTR@
+_GL_FUNCDECL_SYS (wcsstr, wchar_t *,
+                  (const wchar_t *haystack, const wchar_t *needle)
+                  _GL_ATTRIBUTE_PURE);
+# endif
+  /* On some systems, this function is defined as an overloaded function:
+       extern "C++" {
+         const wchar_t * std::wcsstr (const wchar_t *, const wchar_t *);
+         wchar_t * std::wcsstr (wchar_t *, const wchar_t *);
+       }  */
+_GL_CXXALIAS_SYS_CAST2 (wcsstr,
+                        wchar_t *, (const wchar_t *, const wchar_t *),
+                        const wchar_t *, (const wchar_t *, const wchar_t *));
+# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
+     && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
+_GL_CXXALIASWARN1 (wcsstr, wchar_t *,
+                   (wchar_t *haystack, const wchar_t *needle));
+_GL_CXXALIASWARN1 (wcsstr, const wchar_t *,
+                   (const wchar_t *haystack, const wchar_t *needle));
+# else
+_GL_CXXALIASWARN (wcsstr);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef wcsstr
+# if HAVE_RAW_DECL_WCSSTR
+_GL_WARN_ON_USE (wcsstr, "wcsstr is unportable - "
+                 "use gnulib module wcsstr for portability");
+# endif
+#endif
+
+
+/* Divide WCS into tokens separated by characters in DELIM.  */
+#if @GNULIB_WCSTOK@
+# if !@HAVE_WCSTOK@
+_GL_FUNCDECL_SYS (wcstok, wchar_t *,
+                  (wchar_t *wcs, const wchar_t *delim, wchar_t **ptr));
+# endif
+_GL_CXXALIAS_SYS (wcstok, wchar_t *,
+                  (wchar_t *wcs, const wchar_t *delim, wchar_t **ptr));
+_GL_CXXALIASWARN (wcstok);
+#elif defined GNULIB_POSIXCHECK
+# undef wcstok
+# if HAVE_RAW_DECL_WCSTOK
+_GL_WARN_ON_USE (wcstok, "wcstok is unportable - "
+                 "use gnulib module wcstok for portability");
+# endif
+#endif
+
+
+/* Determine number of column positions required for first N wide
+   characters (or fewer if S ends before this) in S.  */
+#if @GNULIB_WCSWIDTH@
+# if @REPLACE_WCSWIDTH@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef wcswidth
+#   define wcswidth rpl_wcswidth
+#  endif
+_GL_FUNCDECL_RPL (wcswidth, int, (const wchar_t *s, size_t n)
+                                 _GL_ATTRIBUTE_PURE);
+_GL_CXXALIAS_RPL (wcswidth, int, (const wchar_t *s, size_t n));
+# else
+#  if !@HAVE_WCSWIDTH@
+_GL_FUNCDECL_SYS (wcswidth, int, (const wchar_t *s, size_t n)
+                                 _GL_ATTRIBUTE_PURE);
+#  endif
+_GL_CXXALIAS_SYS (wcswidth, int, (const wchar_t *s, size_t n));
+# endif
+_GL_CXXALIASWARN (wcswidth);
+#elif defined GNULIB_POSIXCHECK
+# undef wcswidth
+# if HAVE_RAW_DECL_WCSWIDTH
+_GL_WARN_ON_USE (wcswidth, "wcswidth is unportable - "
+                 "use gnulib module wcswidth for portability");
+# endif
+#endif
+
+
+/* Convert *TP to a date and time wide string.  See
+   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/wcsftime.html>.  */
+#if @GNULIB_WCSFTIME@
+# if @REPLACE_WCSFTIME@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef wcsftime
+#   define wcsftime rpl_wcsftime
+#  endif
+_GL_FUNCDECL_RPL (wcsftime, size_t, (wchar_t *__buf, size_t __bufsize,
+                                     const wchar_t *__fmt, const struct tm *__tp)
+                                    _GL_ARG_NONNULL ((1, 3, 4)));
+_GL_CXXALIAS_RPL (wcsftime, size_t, (wchar_t *__buf, size_t __bufsize,
+                                     const wchar_t *__fmt, const struct tm *__tp));
+# else
+#  if !@HAVE_WCSFTIME@
+_GL_FUNCDECL_SYS (wcsftime, size_t, (wchar_t *__buf, size_t __bufsize,
+                                     const wchar_t *__fmt, const struct tm *__tp)
+                                    _GL_ARG_NONNULL ((1, 3, 4)));
+#  endif
+_GL_CXXALIAS_SYS (wcsftime, size_t, (wchar_t *__buf, size_t __bufsize,
+                                     const wchar_t *__fmt, const struct tm *__tp));
+# endif
+_GL_CXXALIASWARN (wcsftime);
+#elif defined GNULIB_POSIXCHECK
+# undef wcsftime
+# if HAVE_RAW_DECL_WCSFTIME
+_GL_WARN_ON_USE (wcsftime, "wcsftime is unportable - "
+                 "use gnulib module wcsftime for portability");
+# endif
+#endif
+
+
+#endif /* _@GUARD_PREFIX@_WCHAR_H */
+#endif /* _@GUARD_PREFIX@_WCHAR_H */
+#endif
diff --git a/gl/wcrtomb.c b/gl/wcrtomb.c
new file mode 100644
index 0000000..ee5906c
--- /dev/null
+++ b/gl/wcrtomb.c
@@ -0,0 +1,53 @@
+/* Convert wide character to multibyte character.
+   Copyright (C) 2008-2017 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2008.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include <wchar.h>
+
+#include <errno.h>
+#include <stdlib.h>
+
+
+size_t
+wcrtomb (char *s, wchar_t wc, mbstate_t *ps)
+{
+  /* This implementation of wcrtomb on top of wctomb() supports only
+     stateless encodings.  ps must be in the initial state.  */
+  if (ps != NULL && !mbsinit (ps))
+    {
+      errno = EINVAL;
+      return (size_t)(-1);
+    }
+
+  if (s == NULL)
+    /* We know the NUL wide character corresponds to the NUL character.  */
+    return 1;
+  else
+    {
+      int ret = wctomb (s, wc);
+
+      if (ret >= 0)
+        return ret;
+      else
+        {
+          errno = EILSEQ;
+          return (size_t)(-1);
+        }
+    }
+}
diff --git a/gl/wctype-h.c b/gl/wctype-h.c
new file mode 100644
index 0000000..bb5f847
--- /dev/null
+++ b/gl/wctype-h.c
@@ -0,0 +1,4 @@
+/* Normally this would be wctype.c, but that name's already taken.  */
+#include <config.h>
+#define _GL_WCTYPE_INLINE _GL_EXTERN_INLINE
+#include "wctype.h"
diff --git a/gl/wctype.in.h b/gl/wctype.in.h
new file mode 100644
index 0000000..b0570bd
--- /dev/null
+++ b/gl/wctype.in.h
@@ -0,0 +1,533 @@
+/* A substitute for ISO C99 <wctype.h>, for platforms that lack it.
+
+   Copyright (C) 2006-2017 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
+
+/* Written by Bruno Haible and Paul Eggert.  */
+
+/*
+ * ISO C 99 <wctype.h> for platforms that lack it.
+ * <http://www.opengroup.org/susv3xbd/wctype.h.html>
+ *
+ * iswctype, towctrans, towlower, towupper, wctrans, wctype,
+ * wctrans_t, and wctype_t are not yet implemented.
+ */
+
+#if __GNUC__ >= 3
+@PRAGMA_SYSTEM_HEADER@
+#endif
+@PRAGMA_COLUMNS@
+
+#if (defined __MINGW32__ && defined __CTYPE_H_SOURCED__)
+
+/* Special invocation convention:
+   - With MinGW 3.22, when <ctype.h> includes <wctype.h>, only some part of
+     <wctype.h> is being processed, which doesn't include the idempotency
+     guard.   */
+
+#@INCLUDE_NEXT@ @NEXT_WCTYPE_H@
+
+#else
+/* Normal invocation convention.  */
+
+#ifndef _@GUARD_PREFIX@_WCTYPE_H
+
+#if @HAVE_WINT_T@
+/* Solaris 2.5 has a bug: <wchar.h> must be included before <wctype.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>
+#endif
+
+/* Native Windows (mingw, MSVC) have declarations of towupper, towlower, and
+   isw* functions in <ctype.h>, <wchar.h> as well as in <wctype.h>.  Include
+   <ctype.h>, <wchar.h> in advance to avoid rpl_ prefix being added to the
+   declarations.  */
+#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+# include <ctype.h>
+# include <wchar.h>
+#endif
+
+/* Include the original <wctype.h> if it exists.
+   BeOS 5 has the functions but no <wctype.h>.  */
+/* The include_next requires a split double-inclusion guard.  */
+#if @HAVE_WCTYPE_H@
+# @INCLUDE_NEXT@ @NEXT_WCTYPE_H@
+#endif
+
+#ifndef _@GUARD_PREFIX@_WCTYPE_H
+#define _@GUARD_PREFIX@_WCTYPE_H
+
+#ifndef _GL_INLINE_HEADER_BEGIN
+ #error "Please include config.h first."
+#endif
+_GL_INLINE_HEADER_BEGIN
+#ifndef _GL_WCTYPE_INLINE
+# define _GL_WCTYPE_INLINE _GL_INLINE
+#endif
+
+/* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
+
+/* The definition of _GL_WARN_ON_USE is copied here.  */
+
+/* Solaris 2.6 <wctype.h> includes <widec.h> which includes <euc.h> which
+   #defines a number of identifiers in the application namespace.  Revert
+   these #defines.  */
+#ifdef __sun
+# undef multibyte
+# undef eucw1
+# undef eucw2
+# undef eucw3
+# undef scrw1
+# undef scrw2
+# undef scrw3
+#endif
+
+/* Define wint_t and WEOF.  (Also done in wchar.in.h.)  */
+#if !@HAVE_WINT_T@ && !defined wint_t
+# define wint_t int
+# ifndef WEOF
+#  define WEOF -1
+# endif
+#else
+/* mingw and MSVC define wint_t as 'unsigned short' in <crtdefs.h> or
+   <stddef.h>.  This is too small: ISO C 99 section 7.24.1.(2) says that
+   wint_t must be "unchanged by default argument promotions".  Override it.  */
+# if @GNULIB_OVERRIDES_WINT_T@
+#  if !GNULIB_defined_wint_t
+#   if @HAVE_CRTDEFS_H@
+#    include <crtdefs.h>
+#   else
+#    include <stddef.h>
+#   endif
+typedef unsigned int rpl_wint_t;
+#   undef wint_t
+#   define wint_t rpl_wint_t
+#   define GNULIB_defined_wint_t 1
+#  endif
+# endif
+# ifndef WEOF
+#  define WEOF ((wint_t) -1)
+# endif
+#endif
+
+
+#if !GNULIB_defined_wctype_functions
+
+/* FreeBSD 4.4 to 4.11 has <wctype.h> but lacks the functions.
+   Linux libc5 has <wctype.h> and the functions but they are broken.
+   Assume all 11 functions (all isw* except iswblank) are implemented the
+   same way, or not at all.  */
+# if ! @HAVE_ISWCNTRL@ || @REPLACE_ISWCNTRL@
+
+/* IRIX 5.3 has macros but no functions, its isw* macros refer to an
+   undefined variable _ctmp_ and to <ctype.h> macros like _P, and they
+   refer to system functions like _iswctype that are not in the
+   standard C library.  Rather than try to get ancient buggy
+   implementations like this to work, just disable them.  */
+#  undef iswalnum
+#  undef iswalpha
+#  undef iswblank
+#  undef iswcntrl
+#  undef iswdigit
+#  undef iswgraph
+#  undef iswlower
+#  undef iswprint
+#  undef iswpunct
+#  undef iswspace
+#  undef iswupper
+#  undef iswxdigit
+#  undef towlower
+#  undef towupper
+
+/* Linux libc5 has <wctype.h> and the functions but they are broken.  */
+#  if @REPLACE_ISWCNTRL@
+#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#    define iswalnum rpl_iswalnum
+#    define iswalpha rpl_iswalpha
+#    define iswblank rpl_iswblank
+#    define iswcntrl rpl_iswcntrl
+#    define iswdigit rpl_iswdigit
+#    define iswgraph rpl_iswgraph
+#    define iswlower rpl_iswlower
+#    define iswprint rpl_iswprint
+#    define iswpunct rpl_iswpunct
+#    define iswspace rpl_iswspace
+#    define iswupper rpl_iswupper
+#    define iswxdigit rpl_iswxdigit
+#   endif
+#  endif
+#  if @REPLACE_TOWLOWER@
+#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#    define towlower rpl_towlower
+#    define towupper rpl_towupper
+#   endif
+#  endif
+
+_GL_WCTYPE_INLINE int
+#  if @REPLACE_ISWCNTRL@
+rpl_iswalnum
+#  else
+iswalnum
+#  endif
+         (wint_t wc)
+{
+  return ((wc >= '0' && wc <= '9')
+          || ((wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'Z'));
+}
+
+_GL_WCTYPE_INLINE int
+#  if @REPLACE_ISWCNTRL@
+rpl_iswalpha
+#  else
+iswalpha
+#  endif
+         (wint_t wc)
+{
+  return (wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'Z';
+}
+
+_GL_WCTYPE_INLINE int
+#  if @REPLACE_ISWCNTRL@
+rpl_iswblank
+#  else
+iswblank
+#  endif
+         (wint_t wc)
+{
+  return wc == ' ' || wc == '\t';
+}
+
+_GL_WCTYPE_INLINE int
+#  if @REPLACE_ISWCNTRL@
+rpl_iswcntrl
+#  else
+iswcntrl
+#  endif
+        (wint_t wc)
+{
+  return (wc & ~0x1f) == 0 || wc == 0x7f;
+}
+
+_GL_WCTYPE_INLINE int
+#  if @REPLACE_ISWCNTRL@
+rpl_iswdigit
+#  else
+iswdigit
+#  endif
+         (wint_t wc)
+{
+  return wc >= '0' && wc <= '9';
+}
+
+_GL_WCTYPE_INLINE int
+#  if @REPLACE_ISWCNTRL@
+rpl_iswgraph
+#  else
+iswgraph
+#  endif
+         (wint_t wc)
+{
+  return wc >= '!' && wc <= '~';
+}
+
+_GL_WCTYPE_INLINE int
+#  if @REPLACE_ISWCNTRL@
+rpl_iswlower
+#  else
+iswlower
+#  endif
+         (wint_t wc)
+{
+  return wc >= 'a' && wc <= 'z';
+}
+
+_GL_WCTYPE_INLINE int
+#  if @REPLACE_ISWCNTRL@
+rpl_iswprint
+#  else
+iswprint
+#  endif
+         (wint_t wc)
+{
+  return wc >= ' ' && wc <= '~';
+}
+
+_GL_WCTYPE_INLINE int
+#  if @REPLACE_ISWCNTRL@
+rpl_iswpunct
+#  else
+iswpunct
+#  endif
+         (wint_t wc)
+{
+  return (wc >= '!' && wc <= '~'
+          && !((wc >= '0' && wc <= '9')
+               || ((wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'Z')));
+}
+
+_GL_WCTYPE_INLINE int
+#  if @REPLACE_ISWCNTRL@
+rpl_iswspace
+#  else
+iswspace
+#  endif
+         (wint_t wc)
+{
+  return (wc == ' ' || wc == '\t'
+          || wc == '\n' || wc == '\v' || wc == '\f' || wc == '\r');
+}
+
+_GL_WCTYPE_INLINE int
+#  if @REPLACE_ISWCNTRL@
+rpl_iswupper
+#  else
+iswupper
+#  endif
+         (wint_t wc)
+{
+  return wc >= 'A' && wc <= 'Z';
+}
+
+_GL_WCTYPE_INLINE int
+#  if @REPLACE_ISWCNTRL@
+rpl_iswxdigit
+#  else
+iswxdigit
+#  endif
+          (wint_t wc)
+{
+  return ((wc >= '0' && wc <= '9')
+          || ((wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'F'));
+}
+
+_GL_WCTYPE_INLINE wint_t
+#  if @REPLACE_TOWLOWER@
+rpl_towlower
+#  else
+towlower
+#  endif
+         (wint_t wc)
+{
+  return (wc >= 'A' && wc <= 'Z' ? wc - 'A' + 'a' : wc);
+}
+
+_GL_WCTYPE_INLINE wint_t
+#  if @REPLACE_TOWLOWER@
+rpl_towupper
+#  else
+towupper
+#  endif
+         (wint_t wc)
+{
+  return (wc >= 'a' && wc <= 'z' ? wc - 'a' + 'A' : wc);
+}
+
+# elif @GNULIB_ISWBLANK@ && (! @HAVE_ISWBLANK@ || @REPLACE_ISWBLANK@)
+/* Only the iswblank function is missing.  */
+
+#  if @REPLACE_ISWBLANK@
+#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#    define iswblank rpl_iswblank
+#   endif
+_GL_FUNCDECL_RPL (iswblank, int, (wint_t wc));
+#  else
+_GL_FUNCDECL_SYS (iswblank, int, (wint_t wc));
+#  endif
+
+# endif
+
+# if defined __MINGW32__
+
+/* On native Windows, wchar_t is uint16_t, and wint_t is uint32_t.
+   The functions towlower and towupper are implemented in the MSVCRT library
+   to take a wchar_t argument and return a wchar_t result.  mingw declares
+   these functions to take a wint_t argument and return a wint_t result.
+   This means that:
+   1. When the user passes an argument outside the range 0x0000..0xFFFF, the
+      function will look only at the lower 16 bits.  This is allowed according
+      to POSIX.
+   2. The return value is returned in the lower 16 bits of the result register.
+      The upper 16 bits are random: whatever happened to be in that part of the
+      result register.  We need to fix this by adding a zero-extend from
+      wchar_t to wint_t after the call.  */
+
+_GL_WCTYPE_INLINE wint_t
+rpl_towlower (wint_t wc)
+{
+  return (wint_t) (wchar_t) towlower (wc);
+}
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   define towlower rpl_towlower
+#  endif
+
+_GL_WCTYPE_INLINE wint_t
+rpl_towupper (wint_t wc)
+{
+  return (wint_t) (wchar_t) towupper (wc);
+}
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   define towupper rpl_towupper
+#  endif
+
+# endif /* __MINGW32__ */
+
+# define GNULIB_defined_wctype_functions 1
+#endif
+
+#if @REPLACE_ISWCNTRL@
+_GL_CXXALIAS_RPL (iswalnum, int, (wint_t wc));
+_GL_CXXALIAS_RPL (iswalpha, int, (wint_t wc));
+_GL_CXXALIAS_RPL (iswcntrl, int, (wint_t wc));
+_GL_CXXALIAS_RPL (iswdigit, int, (wint_t wc));
+_GL_CXXALIAS_RPL (iswgraph, int, (wint_t wc));
+_GL_CXXALIAS_RPL (iswlower, int, (wint_t wc));
+_GL_CXXALIAS_RPL (iswprint, int, (wint_t wc));
+_GL_CXXALIAS_RPL (iswpunct, int, (wint_t wc));
+_GL_CXXALIAS_RPL (iswspace, int, (wint_t wc));
+_GL_CXXALIAS_RPL (iswupper, int, (wint_t wc));
+_GL_CXXALIAS_RPL (iswxdigit, int, (wint_t wc));
+#else
+_GL_CXXALIAS_SYS (iswalnum, int, (wint_t wc));
+_GL_CXXALIAS_SYS (iswalpha, int, (wint_t wc));
+_GL_CXXALIAS_SYS (iswcntrl, int, (wint_t wc));
+_GL_CXXALIAS_SYS (iswdigit, int, (wint_t wc));
+_GL_CXXALIAS_SYS (iswgraph, int, (wint_t wc));
+_GL_CXXALIAS_SYS (iswlower, int, (wint_t wc));
+_GL_CXXALIAS_SYS (iswprint, int, (wint_t wc));
+_GL_CXXALIAS_SYS (iswpunct, int, (wint_t wc));
+_GL_CXXALIAS_SYS (iswspace, int, (wint_t wc));
+_GL_CXXALIAS_SYS (iswupper, int, (wint_t wc));
+_GL_CXXALIAS_SYS (iswxdigit, int, (wint_t wc));
+#endif
+_GL_CXXALIASWARN (iswalnum);
+_GL_CXXALIASWARN (iswalpha);
+_GL_CXXALIASWARN (iswcntrl);
+_GL_CXXALIASWARN (iswdigit);
+_GL_CXXALIASWARN (iswgraph);
+_GL_CXXALIASWARN (iswlower);
+_GL_CXXALIASWARN (iswprint);
+_GL_CXXALIASWARN (iswpunct);
+_GL_CXXALIASWARN (iswspace);
+_GL_CXXALIASWARN (iswupper);
+_GL_CXXALIASWARN (iswxdigit);
+
+#if @GNULIB_ISWBLANK@
+# if @REPLACE_ISWCNTRL@ || @REPLACE_ISWBLANK@
+_GL_CXXALIAS_RPL (iswblank, int, (wint_t wc));
+# else
+_GL_CXXALIAS_SYS (iswblank, int, (wint_t wc));
+# endif
+_GL_CXXALIASWARN (iswblank);
+#endif
+
+#if !@HAVE_WCTYPE_T@
+# if !GNULIB_defined_wctype_t
+typedef void * wctype_t;
+#  define GNULIB_defined_wctype_t 1
+# endif
+#endif
+
+/* Get a descriptor for a wide character property.  */
+#if @GNULIB_WCTYPE@
+# if !@HAVE_WCTYPE_T@
+_GL_FUNCDECL_SYS (wctype, wctype_t, (const char *name));
+# endif
+_GL_CXXALIAS_SYS (wctype, wctype_t, (const char *name));
+_GL_CXXALIASWARN (wctype);
+#elif defined GNULIB_POSIXCHECK
+# undef wctype
+# if HAVE_RAW_DECL_WCTYPE
+_GL_WARN_ON_USE (wctype, "wctype is unportable - "
+                 "use gnulib module wctype for portability");
+# endif
+#endif
+
+/* Test whether a wide character has a given property.
+   The argument WC must be either a wchar_t value or WEOF.
+   The argument DESC must have been returned by the wctype() function.  */
+#if @GNULIB_ISWCTYPE@
+# if !@HAVE_WCTYPE_T@
+_GL_FUNCDECL_SYS (iswctype, int, (wint_t wc, wctype_t desc));
+# endif
+_GL_CXXALIAS_SYS (iswctype, int, (wint_t wc, wctype_t desc));
+_GL_CXXALIASWARN (iswctype);
+#elif defined GNULIB_POSIXCHECK
+# undef iswctype
+# if HAVE_RAW_DECL_ISWCTYPE
+_GL_WARN_ON_USE (iswctype, "iswctype is unportable - "
+                 "use gnulib module iswctype for portability");
+# endif
+#endif
+
+#if @REPLACE_TOWLOWER@ || defined __MINGW32__
+_GL_CXXALIAS_RPL (towlower, wint_t, (wint_t wc));
+_GL_CXXALIAS_RPL (towupper, wint_t, (wint_t wc));
+#else
+_GL_CXXALIAS_SYS (towlower, wint_t, (wint_t wc));
+_GL_CXXALIAS_SYS (towupper, wint_t, (wint_t wc));
+#endif
+_GL_CXXALIASWARN (towlower);
+_GL_CXXALIASWARN (towupper);
+
+#if !@HAVE_WCTRANS_T@
+# if !GNULIB_defined_wctrans_t
+typedef void * wctrans_t;
+#  define GNULIB_defined_wctrans_t 1
+# endif
+#endif
+
+/* Get a descriptor for a wide character case conversion.  */
+#if @GNULIB_WCTRANS@
+# if !@HAVE_WCTRANS_T@
+_GL_FUNCDECL_SYS (wctrans, wctrans_t, (const char *name));
+# endif
+_GL_CXXALIAS_SYS (wctrans, wctrans_t, (const char *name));
+_GL_CXXALIASWARN (wctrans);
+#elif defined GNULIB_POSIXCHECK
+# undef wctrans
+# if HAVE_RAW_DECL_WCTRANS
+_GL_WARN_ON_USE (wctrans, "wctrans is unportable - "
+                 "use gnulib module wctrans for portability");
+# endif
+#endif
+
+/* Perform a given case conversion on a wide character.
+   The argument WC must be either a wchar_t value or WEOF.
+   The argument DESC must have been returned by the wctrans() function.  */
+#if @GNULIB_TOWCTRANS@
+# if !@HAVE_WCTRANS_T@
+_GL_FUNCDECL_SYS (towctrans, wint_t, (wint_t wc, wctrans_t desc));
+# endif
+_GL_CXXALIAS_SYS (towctrans, wint_t, (wint_t wc, wctrans_t desc));
+_GL_CXXALIASWARN (towctrans);
+#elif defined GNULIB_POSIXCHECK
+# undef towctrans
+# if HAVE_RAW_DECL_TOWCTRANS
+_GL_WARN_ON_USE (towctrans, "towctrans is unportable - "
+                 "use gnulib module towctrans for portability");
+# endif
+#endif
+
+_GL_INLINE_HEADER_END
+
+#endif /* _@GUARD_PREFIX@_WCTYPE_H */
+#endif /* _@GUARD_PREFIX@_WCTYPE_H */
+#endif
diff --git a/gl/xalloc-oversized.h b/gl/xalloc-oversized.h
new file mode 100644
index 0000000..7235a54
--- /dev/null
+++ b/gl/xalloc-oversized.h
@@ -0,0 +1,60 @@
+/* xalloc-oversized.h -- memory allocation size checking
+
+   Copyright (C) 1990-2000, 2003-2004, 2006-2017 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#ifndef XALLOC_OVERSIZED_H_
+#define XALLOC_OVERSIZED_H_
+
+#include <stddef.h>
+#include <stdint.h>
+
+/* True if N * S would overflow in a size_t calculation,
+   or would generate a value larger than PTRDIFF_MAX.
+   This expands to a constant expression if N and S are both constants.
+   By gnulib convention, SIZE_MAX represents overflow in size
+   calculations, so the conservative size_t-based dividend to use here
+   is SIZE_MAX - 1.  */
+#define __xalloc_oversized(n, s) \
+  ((size_t) (PTRDIFF_MAX < SIZE_MAX ? PTRDIFF_MAX : SIZE_MAX - 1) / (s) < (n))
+
+#if PTRDIFF_MAX < SIZE_MAX
+typedef ptrdiff_t __xalloc_count_type;
+#else
+typedef size_t __xalloc_count_type;
+#endif
+
+/* Return 1 if an array of N objects, each of size S, cannot exist
+   reliably due to size or ptrdiff_t arithmetic overflow.  S must be
+   positive and N must be nonnegative.  This is a macro, not a
+   function, so that it works correctly even when SIZE_MAX < N.  */
+
+#if 7 <= __GNUC__
+# define xalloc_oversized(n, s) \
+   __builtin_mul_overflow_p (n, s, (__xalloc_count_type) 1)
+#elif 5 <= __GNUC__ && !defined __ICC && !__STRICT_ANSI__
+# define xalloc_oversized(n, s) \
+   (__builtin_constant_p (n) && __builtin_constant_p (s) \
+    ? __xalloc_oversized (n, s) \
+    : ({ __xalloc_count_type __xalloc_count; \
+         __builtin_mul_overflow (n, s, &__xalloc_count); }))
+
+/* Other compilers use integer division; this may be slower but is
+   more portable.  */
+#else
+# define xalloc_oversized(n, s) __xalloc_oversized (n, s)
+#endif
+
+#endif /* !XALLOC_OVERSIZED_H_ */
diff --git a/lex.Error.cc b/lex.Error.cc
new file mode 100644
index 0000000..6242fd3
--- /dev/null
+++ b/lex.Error.cc
@@ -0,0 +1,2000 @@
+#line 2 "lex.Error.cc"
+
+#line 4 "lex.Error.cc"
+
+#define  YY_INT_ALIGNED short int
+
+/* A lexical scanner generated by flex */
+
+#define yy_create_buffer Error_create_buffer
+#define yy_delete_buffer Error_delete_buffer
+#define yy_flex_debug Error_flex_debug
+#define yy_init_buffer Error_init_buffer
+#define yy_flush_buffer Error_flush_buffer
+#define yy_load_buffer_state Error_load_buffer_state
+#define yy_switch_to_buffer Error_switch_to_buffer
+#define yyin Errorin
+#define yyleng Errorleng
+#define yylex Errorlex
+#define yylineno Errorlineno
+#define yyout Errorout
+#define yyrestart Errorrestart
+#define yytext Errortext
+#define yywrap Errorwrap
+#define yyalloc Erroralloc
+#define yyrealloc Errorrealloc
+#define yyfree Errorfree
+
+#define FLEX_SCANNER
+#define YY_FLEX_MAJOR_VERSION 2
+#define YY_FLEX_MINOR_VERSION 5
+#define YY_FLEX_SUBMINOR_VERSION 35
+#if YY_FLEX_SUBMINOR_VERSION > 0
+#define FLEX_BETA
+#endif
+
+/* First, we deal with  platform-specific or compiler-specific issues. */
+
+/* begin standard C headers. */
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <stdlib.h>
+
+/* end standard C headers. */
+
+/* flex integer type definitions */
+
+#ifndef FLEXINT_H
+#define FLEXINT_H
+
+/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
+
+#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+
+/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
+ * if you want the limit (max/min) macros for int types. 
+ */
+#ifndef __STDC_LIMIT_MACROS
+#define __STDC_LIMIT_MACROS 1
+#endif
+
+#include <inttypes.h>
+typedef int8_t flex_int8_t;
+typedef uint8_t flex_uint8_t;
+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;
+typedef int flex_int32_t;
+typedef unsigned char flex_uint8_t; 
+typedef unsigned short int flex_uint16_t;
+typedef unsigned int flex_uint32_t;
+#endif /* ! C99 */
+
+/* Limits of integral types. */
+#ifndef INT8_MIN
+#define INT8_MIN               (-128)
+#endif
+#ifndef INT16_MIN
+#define INT16_MIN              (-32767-1)
+#endif
+#ifndef INT32_MIN
+#define INT32_MIN              (-2147483647-1)
+#endif
+#ifndef INT8_MAX
+#define INT8_MAX               (127)
+#endif
+#ifndef INT16_MAX
+#define INT16_MAX              (32767)
+#endif
+#ifndef INT32_MAX
+#define INT32_MAX              (2147483647)
+#endif
+#ifndef UINT8_MAX
+#define UINT8_MAX              (255U)
+#endif
+#ifndef UINT16_MAX
+#define UINT16_MAX             (65535U)
+#endif
+#ifndef UINT32_MAX
+#define UINT32_MAX             (4294967295U)
+#endif
+
+#endif /* ! FLEXINT_H */
+
+#ifdef __cplusplus
+
+/* The "const" storage-class-modifier is valid. */
+#define YY_USE_CONST
+
+#else	/* ! __cplusplus */
+
+/* C99 requires __STDC__ to be defined as 1. */
+#if defined (__STDC__)
+
+#define YY_USE_CONST
+
+#endif	/* defined (__STDC__) */
+#endif	/* ! __cplusplus */
+
+#ifdef YY_USE_CONST
+#define yyconst const
+#else
+#define yyconst
+#endif
+
+/* Returned upon end-of-file. */
+#define YY_NULL 0
+
+/* Promotes a possibly negative, possibly signed char to an unsigned
+ * integer for use as an array index.  If the signed char is negative,
+ * we want to instead treat it as an 8-bit unsigned char, hence the
+ * double cast.
+ */
+#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
+
+/* Enter a start condition.  This macro really ought to take a parameter,
+ * but we do it the disgusting crufty way forced on us by the ()-less
+ * definition of BEGIN.
+ */
+#define BEGIN (yy_start) = 1 + 2 *
+
+/* Translate the current start state into a value that can be later handed
+ * to BEGIN to return to the state.  The YYSTATE alias is for lex
+ * compatibility.
+ */
+#define YY_START (((yy_start) - 1) / 2)
+#define YYSTATE YY_START
+
+/* Action number for EOF rule of a given start state. */
+#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
+
+/* Special action meaning "start processing a new file". */
+#define YY_NEW_FILE Errorrestart(Errorin  )
+
+#define YY_END_OF_BUFFER_CHAR 0
+
+/* Size of default input buffer. */
+#ifndef YY_BUF_SIZE
+#define YY_BUF_SIZE 16384
+#endif
+
+/* The state buf must be large enough to hold one state per character in the main buffer.
+ */
+#define YY_STATE_BUF_SIZE   ((YY_BUF_SIZE + 2) * sizeof(yy_state_type))
+
+#ifndef YY_TYPEDEF_YY_BUFFER_STATE
+#define YY_TYPEDEF_YY_BUFFER_STATE
+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 FILE *Errorin, *Errorout;
+
+#define EOB_ACT_CONTINUE_SCAN 0
+#define EOB_ACT_END_OF_FILE 1
+#define EOB_ACT_LAST_MATCH 2
+
+    #define YY_LESS_LINENO(n)
+    
+/* Return all but the first "n" matched characters back to the input stream. */
+#define yyless(n) \
+	do \
+		{ \
+		/* Undo effects of setting up Errortext. */ \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+		*yy_cp = (yy_hold_char); \
+		YY_RESTORE_YY_MORE_OFFSET \
+		(yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
+		YY_DO_BEFORE_ACTION; /* set up Errortext again */ \
+		} \
+	while ( 0 )
+
+#define unput(c) yyunput( c, (yytext_ptr)  )
+
+#ifndef YY_STRUCT_YY_BUFFER_STATE
+#define YY_STRUCT_YY_BUFFER_STATE
+struct yy_buffer_state
+	{
+	FILE *yy_input_file;
+
+	char *yy_ch_buf;		/* input buffer */
+	char *yy_buf_pos;		/* current position in input buffer */
+
+	/* Size of input buffer in bytes, not including room for EOB
+	 * characters.
+	 */
+	yy_size_t yy_buf_size;
+
+	/* Number of characters read into yy_ch_buf, not including EOB
+	 * characters.
+	 */
+	yy_size_t 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
+	 * delete it.
+	 */
+	int yy_is_our_buffer;
+
+	/* Whether this is an "interactive" input source; if so, and
+	 * if we're using stdio for input, then we want to use getc()
+	 * instead of fread(), to make sure we stop fetching input after
+	 * each newline.
+	 */
+	int yy_is_interactive;
+
+	/* Whether we're considered to be at the beginning of a line.
+	 * If so, '^' rules will be active on the next match, otherwise
+	 * not.
+	 */
+	int yy_at_bol;
+
+    int yy_bs_lineno; /**< The line count. */
+    int yy_bs_column; /**< The column count. */
+    
+	/* Whether to try to fill the input buffer when we reach the
+	 * end of it.
+	 */
+	int yy_fill_buffer;
+
+	int yy_buffer_status;
+
+#define YY_BUFFER_NEW 0
+#define YY_BUFFER_NORMAL 1
+	/* When an EOF's been seen but there's still some text to process
+	 * then we mark the buffer as YY_EOF_PENDING, to indicate that we
+	 * shouldn't try reading from the input source any more.  We might
+	 * still have a bunch of tokens to match, though, because of
+	 * possible backing-up.
+	 *
+	 * When we actually see the EOF, we change the status to "new"
+	 * (via Errorrestart()), so that the user can continue scanning by
+	 * just pointing Errorin at a new input file.
+	 */
+#define YY_BUFFER_EOF_PENDING 2
+
+	};
+#endif /* !YY_STRUCT_YY_BUFFER_STATE */
+
+/* Stack of input buffers. */
+static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
+static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
+static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
+
+/* We provide macros for accessing buffer states in case in the
+ * future we want to put the buffer states in a more general
+ * "scanner state".
+ *
+ * Returns the top of the stack, or NULL.
+ */
+#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
+                          ? (yy_buffer_stack)[(yy_buffer_stack_top)] \
+                          : NULL)
+
+/* Same as previous macro, but useful when we know that the buffer stack is not
+ * NULL or when we need an lvalue. For internal use only.
+ */
+#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)]
+
+/* 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;
+
+/* Points to current character in buffer. */
+static char *yy_c_buf_p = (char *) 0;
+static int yy_init = 0;		/* whether we need to initialize */
+static int yy_start = 0;	/* start state number */
+
+/* Flag which is used to allow Errorwrap()'s to do buffer switches
+ * instead of setting up a fresh Errorin.  A bit of a hack ...
+ */
+static int yy_did_buffer_switch_on_eof;
+
+void Errorrestart (FILE *input_file  );
+void Error_switch_to_buffer (YY_BUFFER_STATE new_buffer  );
+YY_BUFFER_STATE Error_create_buffer (FILE *file,int size  );
+void Error_delete_buffer (YY_BUFFER_STATE b  );
+void Error_flush_buffer (YY_BUFFER_STATE b  );
+void Errorpush_buffer_state (YY_BUFFER_STATE new_buffer  );
+void Errorpop_buffer_state (void );
+
+static void Errorensure_buffer_stack (void );
+static void Error_load_buffer_state (void );
+static void Error_init_buffer (YY_BUFFER_STATE b,FILE *file  );
+
+#define YY_FLUSH_BUFFER Error_flush_buffer(YY_CURRENT_BUFFER )
+
+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  );
+
+void *Erroralloc (yy_size_t  );
+void *Errorrealloc (void *,yy_size_t  );
+void Errorfree (void *  );
+
+#define yy_new_buffer Error_create_buffer
+
+#define yy_set_interactive(is_interactive) \
+	{ \
+	if ( ! YY_CURRENT_BUFFER ){ \
+        Errorensure_buffer_stack (); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            Error_create_buffer(Errorin,YY_BUF_SIZE ); \
+	} \
+	YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
+	}
+
+#define yy_set_bol(at_bol) \
+	{ \
+	if ( ! YY_CURRENT_BUFFER ){\
+        Errorensure_buffer_stack (); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            Error_create_buffer(Errorin,YY_BUF_SIZE ); \
+	} \
+	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
+	}
+
+#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
+
+/* Begin user sect3 */
+
+#define Errorwrap(n) 1
+#define YY_SKIP_YYWRAP
+
+typedef unsigned char YY_CHAR;
+
+FILE *Errorin = (FILE *) 0, *Errorout = (FILE *) 0;
+
+typedef int yy_state_type;
+
+extern int Errorlineno;
+
+int Errorlineno = 1;
+
+extern char *Errortext;
+#define yytext_ptr Errortext
+
+static yy_state_type yy_get_previous_state (void );
+static yy_state_type yy_try_NUL_trans (yy_state_type current_state  );
+static int yy_get_next_buffer (void );
+static void yy_fatal_error (yyconst char msg[]  );
+
+/* Done after the current pattern has been matched and before the
+ * corresponding action - sets up Errortext.
+ */
+#define YY_DO_BEFORE_ACTION \
+	(yytext_ptr) = yy_bp; \
+	(yytext_ptr) -= (yy_more_len); \
+	Errorleng = (yy_size_t) (yy_cp - (yytext_ptr)); \
+	(yy_hold_char) = *yy_cp; \
+	*yy_cp = '\0'; \
+	(yy_c_buf_p) = yy_cp;
+
+#define YY_NUM_RULES 20
+#define YY_END_OF_BUFFER 21
+/* This struct is not used in this scanner,
+   but its presence is necessary. */
+struct yy_trans_info
+	{
+	flex_int32_t yy_verify;
+	flex_int32_t yy_nxt;
+	};
+static yyconst flex_int16_t yy_accept[71] =
+    {   0,
+        0,    0,   15,   15,   12,   12,   21,   19,    9,   10,
+       14,   11,   20,    4,    7,    8,   20,   20,   20,   20,
+       20,   20,    5,    6,   15,   16,   18,   20,   12,   13,
+        9,    4,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,   15,   16,   17,   12,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    2,    0,    0,    0,    0,    0,
+        0,    1,    0,    0,    0,    0,    0,    0,    3,    0
+    } ;
+
+static yyconst flex_int32_t yy_ec[256] =
+    {   0,
+        1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    2,    1,    4,    5,    1,    1,    1,    1,    1,
+        1,    1,    6,    6,    6,    6,    6,    7,    7,    7,
+        7,    7,    7,    7,    7,    7,    7,    6,    8,    1,
+        9,    1,    1,    1,   10,    6,   11,   12,   13,    6,
+       14,    6,    6,    6,    6,    6,   15,    6,   16,    6,
+        6,   17,   18,    6,    6,    6,    6,    6,    6,    6,
+        1,   19,    1,    1,    6,    1,   20,    6,   21,   22,
+
+       23,    6,   24,    6,    6,    6,    6,    6,   25,    6,
+       26,    6,    6,   27,   28,    6,    6,    6,    6,    6,
+        6,    6,   29,    1,   30,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1
+    } ;
+
+static yyconst flex_int32_t yy_meta[31] =
+    {   0,
+        1,    1,    2,    3,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    3,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1
+    } ;
+
+static yyconst flex_int16_t yy_base[76] =
+    {   0,
+        0,    0,   28,   30,   93,   92,   94,   97,   91,   97,
+       97,   97,   97,   85,   97,   97,   19,   19,   25,   65,
+       63,   66,   97,   97,   85,   97,   97,    0,    0,   97,
+       85,   79,   73,   62,   66,   55,   63,   52,   57,   51,
+       49,   73,   97,   97,    0,   62,   51,   57,   46,   53,
+       42,   46,   42,   39,   97,   49,   38,   54,   42,   32,
+       24,   97,   29,   18,   17,   27,   16,   14,   97,   97,
+       49,   52,   55,   57,   60
+    } ;
+
+static yyconst flex_int16_t yy_def[76] =
+    {   0,
+       70,    1,   71,   71,   72,   72,   70,   70,   70,   70,
+       70,   70,   70,   70,   70,   70,   70,   70,   70,   70,
+       70,   70,   70,   70,   73,   70,   70,   74,   75,   70,
+       70,   70,   70,   70,   70,   70,   70,   70,   70,   70,
+       70,   73,   70,   70,   75,   70,   70,   70,   70,   70,
+       70,   70,   70,   70,   70,   70,   70,   70,   70,   70,
+       70,   70,   70,   70,   70,   70,   70,   70,   70,    0,
+       70,   70,   70,   70,   70
+    } ;
+
+static yyconst flex_int16_t yy_nxt[128] =
+    {   0,
+        8,    9,   10,   11,   12,   13,   14,   15,   16,   13,
+       17,   13,   18,   13,   19,   13,   13,   13,    8,   13,
+       20,   13,   21,   13,   22,   13,   13,   13,   23,   24,
+       26,   27,   26,   27,   33,   35,   69,   37,   69,   69,
+       68,   67,   66,   65,   34,   36,   28,   38,   28,   25,
+       25,   25,   29,   29,   29,   42,   42,   44,   62,   44,
+       45,   64,   45,   63,   62,   62,   61,   60,   55,   59,
+       58,   57,   56,   55,   55,   43,   54,   53,   52,   51,
+       50,   49,   48,   47,   46,   32,   31,   43,   41,   40,
+       39,   32,   31,   70,   30,   30,    7,   70,   70,   70,
+
+       70,   70,   70,   70,   70,   70,   70,   70,   70,   70,
+       70,   70,   70,   70,   70,   70,   70,   70,   70,   70,
+       70,   70,   70,   70,   70,   70,   70
+    } ;
+
+static yyconst flex_int16_t yy_chk[128] =
+    {   0,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        3,    3,    4,    4,   17,   18,   68,   19,   67,   66,
+       65,   64,   63,   61,   17,   18,    3,   19,    4,   71,
+       71,   71,   72,   72,   72,   73,   73,   74,   60,   74,
+       75,   59,   75,   58,   57,   56,   54,   53,   52,   51,
+       50,   49,   48,   47,   46,   42,   41,   40,   39,   38,
+       37,   36,   35,   34,   33,   32,   31,   25,   22,   21,
+       20,   14,    9,    7,    6,    5,   70,   70,   70,   70,
+
+       70,   70,   70,   70,   70,   70,   70,   70,   70,   70,
+       70,   70,   70,   70,   70,   70,   70,   70,   70,   70,
+       70,   70,   70,   70,   70,   70,   70
+    } ;
+
+static yy_state_type yy_last_accepting_state;
+static char *yy_last_accepting_cpos;
+
+extern int Error_flex_debug;
+int Error_flex_debug = 0;
+
+/* The intent behind this definition is that it'll catch
+ * any uses of REJECT which flex missed.
+ */
+#define REJECT reject_used_but_not_detected
+static int yy_more_flag = 0;
+static int yy_more_len = 0;
+#define yymore() ((yy_more_flag) = 1)
+#define YY_MORE_ADJ (yy_more_len)
+#define YY_RESTORE_YY_MORE_OFFSET
+char *Errortext;
+#line 1 "Error.lex"
+/*
+ -*- mode: c++; c-basic-offset:4 -*-
+
+ This file is part of libdap, A C++ implementation of the OPeNDAP Data
+ Access Protocol.
+
+ Copyright (c) 2002,2003 OPeNDAP, Inc.
+ Author: James Gallagher <jgallagher@opendap.org>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+ 
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+ 
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+ You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+ (c) COPYRIGHT URI/MIT 1994-1996,1998,1999
+*/ 
+/*
+  Scanner for the Error object. It recognizes the five keywords in the
+  persistent representation of the Error object plus some syntactic sugar
+  (`=', `{', ...). The object's persistent representation uses a keyword =
+  value notation, where the values are quoted strings or integers.
+
+  The scanner is not reentrant, but can share name spaces with other
+  scanners. It must be processed by GNU's flex scanner generator.
+*/
+#line 41 "Error.lex"
+
+#include "config_dap.h"
+
+static char rcsid[] not_used = {"$Id$"};
+
+#include <cstdlib>
+#include <cassert>
+#include <cstring>
+
+#include <string>
+
+#include "parser.h"
+#include "Error.tab.hh"
+
+using namespace libdap;
+
+#ifndef YY_PROTO
+#define YY_PROTO(proto) proto
+#endif
+
+//#define YY_NO_UNPUT
+#define YY_DECL int Errorlex YY_PROTO(( void ))
+
+#define YY_FATAL_ERROR(msg) {\
+    throw(Error(string("Error scanning the error response: ") + string(msg))); \
+    yy_fatal_error(msg); /* see das.lex */ \
+}
+
+int error_line_num = 1;
+static int start_line;		/* used in quote and comment error handlers */
+
+void store_integer();
+void store_string();
+
+#define YY_NO_INPUT 1
+
+
+#line 598 "lex.Error.cc"
+
+#define INITIAL 0
+#define quote 1
+#define comment 2
+
+#ifndef YY_NO_UNISTD_H
+/* Special case for "unistd.h", since it is non-ANSI. We include it way
+ * down here because we want the user's section 1 to have been scanned first.
+ * The user has a chance to override it with an option.
+ */
+#include <unistd.h>
+#endif
+
+#ifndef YY_EXTRA_TYPE
+#define YY_EXTRA_TYPE void *
+#endif
+
+static int yy_init_globals (void );
+
+/* Accessor methods to globals.
+   These are made visible to non-reentrant scanners for convenience. */
+
+int Errorlex_destroy (void );
+
+int Errorget_debug (void );
+
+void Errorset_debug (int debug_flag  );
+
+YY_EXTRA_TYPE Errorget_extra (void );
+
+void Errorset_extra (YY_EXTRA_TYPE user_defined  );
+
+FILE *Errorget_in (void );
+
+void Errorset_in  (FILE * in_str  );
+
+FILE *Errorget_out (void );
+
+void Errorset_out  (FILE * out_str  );
+
+yy_size_t Errorget_leng (void );
+
+char *Errorget_text (void );
+
+int Errorget_lineno (void );
+
+void Errorset_lineno (int line_number  );
+
+/* Macros after this point can all be overridden by user definitions in
+ * section 1.
+ */
+
+#ifndef YY_SKIP_YYWRAP
+#ifdef __cplusplus
+extern "C" int Errorwrap (void );
+#else
+extern int Errorwrap (void );
+#endif
+#endif
+
+#ifndef yytext_ptr
+static void yy_flex_strncpy (char *,yyconst char *,int );
+#endif
+
+#ifdef YY_NEED_STRLEN
+static int yy_flex_strlen (yyconst char * );
+#endif
+
+#ifndef YY_NO_INPUT
+
+#ifdef __cplusplus
+static int yyinput (void );
+#else
+static int input (void );
+#endif
+
+#endif
+
+/* Amount of stuff to slurp up with each read. */
+#ifndef YY_READ_BUF_SIZE
+#define YY_READ_BUF_SIZE 8192
+#endif
+
+/* Copy whatever the last rule matched to the standard output. */
+#ifndef ECHO
+/* 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 )
+#endif
+
+/* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
+ * is returned in "result".
+ */
+#ifndef YY_INPUT
+#define YY_INPUT(buf,result,max_size) \
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
+		{ \
+		int c = '*'; \
+		yy_size_t n; \
+		for ( n = 0; n < max_size && \
+			     (c = getc( Errorin )) != EOF && c != '\n'; ++n ) \
+			buf[n] = (char) c; \
+		if ( c == '\n' ) \
+			buf[n++] = (char) c; \
+		if ( c == EOF && ferror( Errorin ) ) \
+			YY_FATAL_ERROR( "input in flex scanner failed" ); \
+		result = n; \
+		} \
+	else \
+		{ \
+		errno=0; \
+		while ( (result = fread(buf, 1, max_size, Errorin))==0 && ferror(Errorin)) \
+			{ \
+			if( errno != EINTR) \
+				{ \
+				YY_FATAL_ERROR( "input in flex scanner failed" ); \
+				break; \
+				} \
+			errno=0; \
+			clearerr(Errorin); \
+			} \
+		}\
+\
+
+#endif
+
+/* No semi-colon after return; correct usage is to write "yyterminate();" -
+ * we don't want an extra ';' after the "return" because that will cause
+ * some compilers to complain about unreachable statements.
+ */
+#ifndef yyterminate
+#define yyterminate() return YY_NULL
+#endif
+
+/* Number of entries by which start-condition stack grows. */
+#ifndef YY_START_STACK_INCR
+#define YY_START_STACK_INCR 25
+#endif
+
+/* Report a fatal error. */
+#ifndef YY_FATAL_ERROR
+#define YY_FATAL_ERROR(msg) yy_fatal_error( msg )
+#endif
+
+/* end tables serialization structures and prototypes */
+
+/* Default declaration of generated scanner - a define so the user can
+ * easily add parameters.
+ */
+#ifndef YY_DECL
+#define YY_DECL_IS_OURS 1
+
+extern int Errorlex (void);
+
+#define YY_DECL int Errorlex (void)
+#endif /* !YY_DECL */
+
+/* Code executed at the beginning of each rule, after Errortext and Errorleng
+ * have been set up.
+ */
+#ifndef YY_USER_ACTION
+#define YY_USER_ACTION
+#endif
+
+/* Code executed at the end of each rule. */
+#ifndef YY_BREAK
+#define YY_BREAK break;
+#endif
+
+#define YY_RULE_SETUP \
+	YY_USER_ACTION
+
+/** The main scanner function which does all the work.
+ */
+YY_DECL
+{
+	register yy_state_type yy_current_state;
+	register char *yy_cp, *yy_bp;
+	register int yy_act;
+    
+#line 96 "Error.lex"
+
+
+
+#line 784 "lex.Error.cc"
+
+	if ( !(yy_init) )
+		{
+		(yy_init) = 1;
+
+#ifdef YY_USER_INIT
+		YY_USER_INIT;
+#endif
+
+		if ( ! (yy_start) )
+			(yy_start) = 1;	/* first start state */
+
+		if ( ! Errorin )
+			Errorin = stdin;
+
+		if ( ! Errorout )
+			Errorout = stdout;
+
+		if ( ! YY_CURRENT_BUFFER ) {
+			Errorensure_buffer_stack ();
+			YY_CURRENT_BUFFER_LVALUE =
+				Error_create_buffer(Errorin,YY_BUF_SIZE );
+		}
+
+		Error_load_buffer_state( );
+		}
+
+	while ( 1 )		/* loops until end-of-file is reached */
+		{
+		(yy_more_len) = 0;
+		if ( (yy_more_flag) )
+			{
+			(yy_more_len) = (yy_c_buf_p) - (yytext_ptr);
+			(yy_more_flag) = 0;
+			}
+		yy_cp = (yy_c_buf_p);
+
+		/* Support of Errortext. */
+		*yy_cp = (yy_hold_char);
+
+		/* yy_bp points to the position in yy_ch_buf of the start of
+		 * the current run.
+		 */
+		yy_bp = yy_cp;
+
+		yy_current_state = (yy_start);
+yy_match:
+		do
+			{
+			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
+			if ( yy_accept[yy_current_state] )
+				{
+				(yy_last_accepting_state) = yy_current_state;
+				(yy_last_accepting_cpos) = yy_cp;
+				}
+			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+				{
+				yy_current_state = (int) yy_def[yy_current_state];
+				if ( yy_current_state >= 71 )
+					yy_c = yy_meta[(unsigned int) yy_c];
+				}
+			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+			++yy_cp;
+			}
+		while ( yy_base[yy_current_state] != 97 );
+
+yy_find_action:
+		yy_act = yy_accept[yy_current_state];
+		if ( yy_act == 0 )
+			{ /* have to back up */
+			yy_cp = (yy_last_accepting_cpos);
+			yy_current_state = (yy_last_accepting_state);
+			yy_act = yy_accept[yy_current_state];
+			}
+
+		YY_DO_BEFORE_ACTION;
+
+do_action:	/* This label is used only to access EOF actions. */
+
+		switch ( yy_act )
+	{ /* beginning of action switch */
+			case 0: /* must back up */
+			/* undo the effects of YY_DO_BEFORE_ACTION */
+			*yy_cp = (yy_hold_char);
+			yy_cp = (yy_last_accepting_cpos);
+			yy_current_state = (yy_last_accepting_state);
+			goto yy_find_action;
+
+case 1:
+YY_RULE_SETUP
+#line 99 "Error.lex"
+store_string(); return SCAN_ERROR;
+	YY_BREAK
+case 2:
+YY_RULE_SETUP
+#line 101 "Error.lex"
+store_string(); return SCAN_CODE;
+	YY_BREAK
+case 3:
+YY_RULE_SETUP
+#line 102 "Error.lex"
+store_string(); return SCAN_MSG;
+	YY_BREAK
+case 4:
+YY_RULE_SETUP
+#line 104 "Error.lex"
+store_integer(); return SCAN_INT;
+	YY_BREAK
+case 5:
+YY_RULE_SETUP
+#line 106 "Error.lex"
+return (int)*Errortext;
+	YY_BREAK
+case 6:
+YY_RULE_SETUP
+#line 107 "Error.lex"
+return (int)*Errortext;
+	YY_BREAK
+case 7:
+YY_RULE_SETUP
+#line 108 "Error.lex"
+return (int)*Errortext;
+	YY_BREAK
+case 8:
+YY_RULE_SETUP
+#line 109 "Error.lex"
+return (int)*Errortext;
+	YY_BREAK
+case 9:
+YY_RULE_SETUP
+#line 111 "Error.lex"
+
+	YY_BREAK
+case 10:
+/* rule 10 can match eol */
+YY_RULE_SETUP
+#line 112 "Error.lex"
+++error_line_num;
+	YY_BREAK
+case YY_STATE_EOF(INITIAL):
+#line 113 "Error.lex"
+yy_init = 1; error_line_num = 1; yyterminate();
+	YY_BREAK
+case 11:
+YY_RULE_SETUP
+#line 115 "Error.lex"
+BEGIN(comment);
+	YY_BREAK
+case 12:
+YY_RULE_SETUP
+#line 116 "Error.lex"
+
+	YY_BREAK
+case 13:
+/* rule 13 can match eol */
+YY_RULE_SETUP
+#line 117 "Error.lex"
+++error_line_num; BEGIN(INITIAL);
+	YY_BREAK
+case YY_STATE_EOF(comment):
+#line 118 "Error.lex"
+yy_init = 1; error_line_num = 1; yyterminate();
+	YY_BREAK
+case 14:
+YY_RULE_SETUP
+#line 120 "Error.lex"
+BEGIN(quote); start_line = error_line_num; yymore();
+	YY_BREAK
+case 15:
+YY_RULE_SETUP
+#line 121 "Error.lex"
+yymore();
+	YY_BREAK
+case 16:
+/* rule 16 can match eol */
+YY_RULE_SETUP
+#line 122 "Error.lex"
+yymore(); ++error_line_num;
+	YY_BREAK
+case 17:
+YY_RULE_SETUP
+#line 123 "Error.lex"
+yymore();
+	YY_BREAK
+case 18:
+YY_RULE_SETUP
+#line 124 "Error.lex"
+{ 
+    			  BEGIN(INITIAL); 
+			  store_string();
+			  return SCAN_STR;
+                        }
+	YY_BREAK
+case YY_STATE_EOF(quote):
+#line 129 "Error.lex"
+{
+                          char msg[256];
+			  snprintf(msg, 255,
+				  "Unterminated quote (starts on line %d)\n",
+				  start_line);
+			  YY_FATAL_ERROR(msg);
+                        }
+	YY_BREAK
+case 19:
+/* rule 19 can match eol */
+YY_RULE_SETUP
+#line 137 "Error.lex"
+{
+                          if (Errortext) {	/* suppress msgs about `' chars */
+                            fprintf(stderr, "Character `%c' is not", *Errortext);
+                            fprintf(stderr, " allowed (except within");
+			    fprintf(stderr, " quotes) and has been ignored\n");
+			  }
+			}
+	YY_BREAK
+case 20:
+YY_RULE_SETUP
+#line 144 "Error.lex"
+ECHO;
+	YY_BREAK
+#line 1005 "lex.Error.cc"
+
+	case YY_END_OF_BUFFER:
+		{
+		/* Amount of text matched not including the EOB char. */
+		int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1;
+
+		/* Undo the effects of YY_DO_BEFORE_ACTION. */
+		*yy_cp = (yy_hold_char);
+		YY_RESTORE_YY_MORE_OFFSET
+
+		if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
+			{
+			/* We're scanning a new file or input source.  It's
+			 * possible that this happened because the user
+			 * just pointed Errorin at a new source and called
+			 * Errorlex().  If so, then we have to assure
+			 * consistency between YY_CURRENT_BUFFER and our
+			 * globals.  Here is the right place to do so, because
+			 * this is the first action (other than possibly a
+			 * back-up) that will match for the new input source.
+			 */
+			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+			YY_CURRENT_BUFFER_LVALUE->yy_input_file = Errorin;
+			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
+			}
+
+		/* Note that here we test for yy_c_buf_p "<=" to the position
+		 * of the first EOB in the buffer, since yy_c_buf_p will
+		 * already have been incremented past the NUL character
+		 * (since all states make transitions on EOB to the
+		 * end-of-buffer state).  Contrast this with the test
+		 * in input().
+		 */
+		if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
+			{ /* This was really a NUL. */
+			yy_state_type yy_next_state;
+
+			(yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text;
+
+			yy_current_state = yy_get_previous_state(  );
+
+			/* Okay, we're now positioned to make the NUL
+			 * transition.  We couldn't have
+			 * yy_get_previous_state() go ahead and do it
+			 * for us because it doesn't know how to deal
+			 * with the possibility of jamming (and we don't
+			 * want to build jamming into it because then it
+			 * will run more slowly).
+			 */
+
+			yy_next_state = yy_try_NUL_trans( yy_current_state );
+
+			yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+
+			if ( yy_next_state )
+				{
+				/* Consume the NUL. */
+				yy_cp = ++(yy_c_buf_p);
+				yy_current_state = yy_next_state;
+				goto yy_match;
+				}
+
+			else
+				{
+				yy_cp = (yy_c_buf_p);
+				goto yy_find_action;
+				}
+			}
+
+		else switch ( yy_get_next_buffer(  ) )
+			{
+			case EOB_ACT_END_OF_FILE:
+				{
+				(yy_did_buffer_switch_on_eof) = 0;
+
+				if ( Errorwrap( ) )
+					{
+					/* Note: because we've taken care in
+					 * yy_get_next_buffer() to have set up
+					 * Errortext, we can now set up
+					 * yy_c_buf_p so that if some total
+					 * hoser (like flex itself) wants to
+					 * call the scanner after we return the
+					 * YY_NULL, it'll still work - another
+					 * YY_NULL will get returned.
+					 */
+					(yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ;
+
+					yy_act = YY_STATE_EOF(YY_START);
+					goto do_action;
+					}
+
+				else
+					{
+					if ( ! (yy_did_buffer_switch_on_eof) )
+						YY_NEW_FILE;
+					}
+				break;
+				}
+
+			case EOB_ACT_CONTINUE_SCAN:
+				(yy_c_buf_p) =
+					(yytext_ptr) + yy_amount_of_matched_text;
+
+				yy_current_state = yy_get_previous_state(  );
+
+				yy_cp = (yy_c_buf_p);
+				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+				goto yy_match;
+
+			case EOB_ACT_LAST_MATCH:
+				(yy_c_buf_p) =
+				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)];
+
+				yy_current_state = yy_get_previous_state(  );
+
+				yy_cp = (yy_c_buf_p);
+				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+				goto yy_find_action;
+			}
+		break;
+		}
+
+	default:
+		YY_FATAL_ERROR(
+			"fatal flex scanner internal error--no action found" );
+	} /* end of action switch */
+		} /* end of scanning one token */
+} /* end of Errorlex */
+
+/* yy_get_next_buffer - try to read in a new buffer
+ *
+ * Returns a code representing an action:
+ *	EOB_ACT_LAST_MATCH -
+ *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position
+ *	EOB_ACT_END_OF_FILE - end of file
+ */
+static int yy_get_next_buffer (void)
+{
+    	register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
+	register char *source = (yytext_ptr);
+	register int number_to_move, i;
+	int ret_val;
+
+	if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
+		YY_FATAL_ERROR(
+		"fatal flex scanner internal error--end of buffer missed" );
+
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
+		{ /* Don't try to fill the buffer, so this is an EOF. */
+		if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 )
+			{
+			/* We matched a single character, the EOB, so
+			 * treat this as a final EOF.
+			 */
+			return EOB_ACT_END_OF_FILE;
+			}
+
+		else
+			{
+			/* We matched some text prior to the EOB, first
+			 * process it.
+			 */
+			return EOB_ACT_LAST_MATCH;
+			}
+		}
+
+	/* Try to read more data. */
+
+	/* First move last chars to start of buffer. */
+	number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
+
+	for ( i = 0; i < number_to_move; ++i )
+		*(dest++) = *(source++);
+
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
+		/* don't do the read, it's not guaranteed to return an EOF,
+		 * just force an EOF
+		 */
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0;
+
+	else
+		{
+			yy_size_t num_to_read =
+			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
+
+		while ( num_to_read <= 0 )
+			{ /* Not enough room in the buffer - grow it. */
+
+			/* just a shorter name for the current buffer */
+			YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
+
+			int yy_c_buf_p_offset =
+				(int) ((yy_c_buf_p) - b->yy_ch_buf);
+
+			if ( b->yy_is_our_buffer )
+				{
+				yy_size_t new_size = b->yy_buf_size * 2;
+
+				if ( new_size <= 0 )
+					b->yy_buf_size += b->yy_buf_size / 8;
+				else
+					b->yy_buf_size *= 2;
+
+				b->yy_ch_buf = (char *)
+					/* Include room in for 2 EOB chars. */
+					Errorrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2  );
+				}
+			else
+				/* Can't grow it, we don't own it. */
+				b->yy_ch_buf = 0;
+
+			if ( ! b->yy_ch_buf )
+				YY_FATAL_ERROR(
+				"fatal error - scanner input buffer overflow" );
+
+			(yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset];
+
+			num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
+						number_to_move - 1;
+
+			}
+
+		if ( num_to_read > YY_READ_BUF_SIZE )
+			num_to_read = YY_READ_BUF_SIZE;
+
+		/* Read in more data. */
+		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
+			(yy_n_chars), num_to_read );
+
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		}
+
+	if ( (yy_n_chars) == 0 )
+		{
+		if ( number_to_move == YY_MORE_ADJ )
+			{
+			ret_val = EOB_ACT_END_OF_FILE;
+			Errorrestart(Errorin  );
+			}
+
+		else
+			{
+			ret_val = EOB_ACT_LAST_MATCH;
+			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
+				YY_BUFFER_EOF_PENDING;
+			}
+		}
+
+	else
+		ret_val = EOB_ACT_CONTINUE_SCAN;
+
+	if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
+		/* Extend the array by 50%, plus the number we really need. */
+		yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
+		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) Errorrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size  );
+		if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
+			YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
+	}
+
+	(yy_n_chars) += number_to_move;
+	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;
+	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
+
+	(yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
+
+	return ret_val;
+}
+
+/* yy_get_previous_state - get the state just before the EOB char was reached */
+
+    static yy_state_type yy_get_previous_state (void)
+{
+	register yy_state_type yy_current_state;
+	register char *yy_cp;
+    
+	yy_current_state = (yy_start);
+
+	for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
+		{
+		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+		if ( yy_accept[yy_current_state] )
+			{
+			(yy_last_accepting_state) = yy_current_state;
+			(yy_last_accepting_cpos) = yy_cp;
+			}
+		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+			{
+			yy_current_state = (int) yy_def[yy_current_state];
+			if ( yy_current_state >= 71 )
+				yy_c = yy_meta[(unsigned int) yy_c];
+			}
+		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+		}
+
+	return yy_current_state;
+}
+
+/* yy_try_NUL_trans - try to make a transition on the NUL character
+ *
+ * synopsis
+ *	next_state = yy_try_NUL_trans( current_state );
+ */
+    static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
+{
+	register int yy_is_jam;
+    	register char *yy_cp = (yy_c_buf_p);
+
+	register YY_CHAR yy_c = 1;
+	if ( yy_accept[yy_current_state] )
+		{
+		(yy_last_accepting_state) = yy_current_state;
+		(yy_last_accepting_cpos) = yy_cp;
+		}
+	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+		{
+		yy_current_state = (int) yy_def[yy_current_state];
+		if ( yy_current_state >= 71 )
+			yy_c = yy_meta[(unsigned int) yy_c];
+		}
+	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+	yy_is_jam = (yy_current_state == 70);
+
+	return yy_is_jam ? 0 : yy_current_state;
+}
+
+#ifndef YY_NO_INPUT
+#ifdef __cplusplus
+    static int yyinput (void)
+#else
+    static int input  (void)
+#endif
+
+{
+	int c;
+    
+	*(yy_c_buf_p) = (yy_hold_char);
+
+	if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
+		{
+		/* yy_c_buf_p now points to the character we want to return.
+		 * If this occurs *before* the EOB characters, then it's a
+		 * valid NUL; if not, then we've hit the end of the buffer.
+		 */
+		if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
+			/* This was really a NUL. */
+			*(yy_c_buf_p) = '\0';
+
+		else
+			{ /* need more input */
+			yy_size_t offset = (yy_c_buf_p) - (yytext_ptr);
+			++(yy_c_buf_p);
+
+			switch ( yy_get_next_buffer(  ) )
+				{
+				case EOB_ACT_LAST_MATCH:
+					/* This happens because yy_g_n_b()
+					 * sees that we've accumulated a
+					 * token and flags that we need to
+					 * try matching the token before
+					 * proceeding.  But for input(),
+					 * there's no matching to consider.
+					 * So convert the EOB_ACT_LAST_MATCH
+					 * to EOB_ACT_END_OF_FILE.
+					 */
+
+					/* Reset buffer status. */
+					Errorrestart(Errorin );
+
+					/*FALLTHROUGH*/
+
+				case EOB_ACT_END_OF_FILE:
+					{
+					if ( Errorwrap( ) )
+						return 0;
+
+					if ( ! (yy_did_buffer_switch_on_eof) )
+						YY_NEW_FILE;
+#ifdef __cplusplus
+					return yyinput();
+#else
+					return input();
+#endif
+					}
+
+				case EOB_ACT_CONTINUE_SCAN:
+					(yy_c_buf_p) = (yytext_ptr) + offset;
+					break;
+				}
+			}
+		}
+
+	c = *(unsigned char *) (yy_c_buf_p);	/* cast for 8-bit char's */
+	*(yy_c_buf_p) = '\0';	/* preserve Errortext */
+	(yy_hold_char) = *++(yy_c_buf_p);
+
+	return c;
+}
+#endif	/* ifndef YY_NO_INPUT */
+
+/** Immediately switch to a different input stream.
+ * @param input_file A readable stream.
+ * 
+ * @note This function does not reset the start condition to @c INITIAL .
+ */
+    void Errorrestart  (FILE * input_file )
+{
+    
+	if ( ! YY_CURRENT_BUFFER ){
+        Errorensure_buffer_stack ();
+		YY_CURRENT_BUFFER_LVALUE =
+            Error_create_buffer(Errorin,YY_BUF_SIZE );
+	}
+
+	Error_init_buffer(YY_CURRENT_BUFFER,input_file );
+	Error_load_buffer_state( );
+}
+
+/** Switch to a different input buffer.
+ * @param new_buffer The new input buffer.
+ * 
+ */
+    void Error_switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
+{
+    
+	/* TODO. We should be able to replace this entire function body
+	 * with
+	 *		Errorpop_buffer_state();
+	 *		Errorpush_buffer_state(new_buffer);
+     */
+	Errorensure_buffer_stack ();
+	if ( YY_CURRENT_BUFFER == new_buffer )
+		return;
+
+	if ( YY_CURRENT_BUFFER )
+		{
+		/* Flush out information for old buffer. */
+		*(yy_c_buf_p) = (yy_hold_char);
+		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		}
+
+	YY_CURRENT_BUFFER_LVALUE = new_buffer;
+	Error_load_buffer_state( );
+
+	/* We don't actually know whether we did this switch during
+	 * EOF (Errorwrap()) processing, but the only time this flag
+	 * is looked at is after Errorwrap() is called, so it's safe
+	 * to go ahead and always set it.
+	 */
+	(yy_did_buffer_switch_on_eof) = 1;
+}
+
+static void Error_load_buffer_state  (void)
+{
+    	(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+	(yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
+	Errorin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
+	(yy_hold_char) = *(yy_c_buf_p);
+}
+
+/** Allocate and initialize an input buffer state.
+ * @param file A readable stream.
+ * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
+ * 
+ * @return the allocated buffer state.
+ */
+    YY_BUFFER_STATE Error_create_buffer  (FILE * file, int  size )
+{
+	YY_BUFFER_STATE b;
+    
+	b = (YY_BUFFER_STATE) Erroralloc(sizeof( struct yy_buffer_state )  );
+	if ( ! b )
+		YY_FATAL_ERROR( "out of dynamic memory in Error_create_buffer()" );
+
+	b->yy_buf_size = size;
+
+	/* yy_ch_buf has to be 2 characters longer than the size given because
+	 * we need to put in 2 end-of-buffer characters.
+	 */
+	b->yy_ch_buf = (char *) Erroralloc(b->yy_buf_size + 2  );
+	if ( ! b->yy_ch_buf )
+		YY_FATAL_ERROR( "out of dynamic memory in Error_create_buffer()" );
+
+	b->yy_is_our_buffer = 1;
+
+	Error_init_buffer(b,file );
+
+	return b;
+}
+
+/** Destroy the buffer.
+ * @param b a buffer created with Error_create_buffer()
+ * 
+ */
+    void Error_delete_buffer (YY_BUFFER_STATE  b )
+{
+    
+	if ( ! b )
+		return;
+
+	if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
+		YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
+
+	if ( b->yy_is_our_buffer )
+		Errorfree((void *) b->yy_ch_buf  );
+
+	Errorfree((void *) b  );
+}
+
+#ifndef __cplusplus
+extern int isatty (int );
+#endif /* __cplusplus */
+    
+/* Initializes or reinitializes a buffer.
+ * This function is sometimes called more than once on the same buffer,
+ * such as during a Errorrestart() or at EOF.
+ */
+    static void Error_init_buffer  (YY_BUFFER_STATE  b, FILE * file )
+
+{
+	int oerrno = errno;
+    
+	Error_flush_buffer(b );
+
+	b->yy_input_file = file;
+	b->yy_fill_buffer = 1;
+
+    /* If b is the current buffer, then Error_init_buffer was _probably_
+     * called from Errorrestart() or through yy_get_next_buffer.
+     * In that case, we don't want to reset the lineno or column.
+     */
+    if (b != YY_CURRENT_BUFFER){
+        b->yy_bs_lineno = 1;
+        b->yy_bs_column = 0;
+    }
+
+        b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
+    
+	errno = oerrno;
+}
+
+/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
+ * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
+ * 
+ */
+    void Error_flush_buffer (YY_BUFFER_STATE  b )
+{
+    	if ( ! b )
+		return;
+
+	b->yy_n_chars = 0;
+
+	/* We always need two end-of-buffer characters.  The first causes
+	 * a transition to the end-of-buffer state.  The second causes
+	 * a jam in that state.
+	 */
+	b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;
+	b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
+
+	b->yy_buf_pos = &b->yy_ch_buf[0];
+
+	b->yy_at_bol = 1;
+	b->yy_buffer_status = YY_BUFFER_NEW;
+
+	if ( b == YY_CURRENT_BUFFER )
+		Error_load_buffer_state( );
+}
+
+/** Pushes the new state onto the stack. The new state becomes
+ *  the current state. This function will allocate the stack
+ *  if necessary.
+ *  @param new_buffer The new state.
+ *  
+ */
+void Errorpush_buffer_state (YY_BUFFER_STATE new_buffer )
+{
+    	if (new_buffer == NULL)
+		return;
+
+	Errorensure_buffer_stack();
+
+	/* This block is copied from Error_switch_to_buffer. */
+	if ( YY_CURRENT_BUFFER )
+		{
+		/* Flush out information for old buffer. */
+		*(yy_c_buf_p) = (yy_hold_char);
+		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		}
+
+	/* Only push if top exists. Otherwise, replace top. */
+	if (YY_CURRENT_BUFFER)
+		(yy_buffer_stack_top)++;
+	YY_CURRENT_BUFFER_LVALUE = new_buffer;
+
+	/* copied from Error_switch_to_buffer. */
+	Error_load_buffer_state( );
+	(yy_did_buffer_switch_on_eof) = 1;
+}
+
+/** Removes and deletes the top of the stack, if present.
+ *  The next element becomes the new top.
+ *  
+ */
+void Errorpop_buffer_state (void)
+{
+    	if (!YY_CURRENT_BUFFER)
+		return;
+
+	Error_delete_buffer(YY_CURRENT_BUFFER );
+	YY_CURRENT_BUFFER_LVALUE = NULL;
+	if ((yy_buffer_stack_top) > 0)
+		--(yy_buffer_stack_top);
+
+	if (YY_CURRENT_BUFFER) {
+		Error_load_buffer_state( );
+		(yy_did_buffer_switch_on_eof) = 1;
+	}
+}
+
+/* Allocates the stack if it does not exist.
+ *  Guarantees space for at least one push.
+ */
+static void Errorensure_buffer_stack (void)
+{
+	yy_size_t num_to_alloc;
+    
+	if (!(yy_buffer_stack)) {
+
+		/* First allocation is just for 2 elements, since we don't know if this
+		 * scanner will even need a stack. We use 2 instead of 1 to avoid an
+		 * immediate realloc on the next call.
+         */
+		num_to_alloc = 1;
+		(yy_buffer_stack) = (struct yy_buffer_state**)Erroralloc
+								(num_to_alloc * sizeof(struct yy_buffer_state*)
+								);
+		if ( ! (yy_buffer_stack) )
+			YY_FATAL_ERROR( "out of dynamic memory in Errorensure_buffer_stack()" );
+								  
+		memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
+				
+		(yy_buffer_stack_max) = num_to_alloc;
+		(yy_buffer_stack_top) = 0;
+		return;
+	}
+
+	if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
+
+		/* Increase the buffer to prepare for a possible push. */
+		int grow_size = 8 /* arbitrary grow size */;
+
+		num_to_alloc = (yy_buffer_stack_max) + grow_size;
+		(yy_buffer_stack) = (struct yy_buffer_state**)Errorrealloc
+								((yy_buffer_stack),
+								num_to_alloc * sizeof(struct yy_buffer_state*)
+								);
+		if ( ! (yy_buffer_stack) )
+			YY_FATAL_ERROR( "out of dynamic memory in Errorensure_buffer_stack()" );
+
+		/* zero only the new slots.*/
+		memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
+		(yy_buffer_stack_max) = num_to_alloc;
+	}
+}
+
+/** Setup the input buffer state to scan directly from a user-specified character buffer.
+ * @param base the character buffer
+ * @param size the size in bytes of the character buffer
+ * 
+ * @return the newly allocated buffer state object. 
+ */
+YY_BUFFER_STATE Error_scan_buffer  (char * base, yy_size_t  size )
+{
+	YY_BUFFER_STATE b;
+    
+	if ( size < 2 ||
+	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
+	     base[size-1] != YY_END_OF_BUFFER_CHAR )
+		/* They forgot to leave room for the EOB's. */
+		return 0;
+
+	b = (YY_BUFFER_STATE) Erroralloc(sizeof( struct yy_buffer_state )  );
+	if ( ! b )
+		YY_FATAL_ERROR( "out of dynamic memory in Error_scan_buffer()" );
+
+	b->yy_buf_size = size - 2;	/* "- 2" to take care of EOB's */
+	b->yy_buf_pos = b->yy_ch_buf = base;
+	b->yy_is_our_buffer = 0;
+	b->yy_input_file = 0;
+	b->yy_n_chars = b->yy_buf_size;
+	b->yy_is_interactive = 0;
+	b->yy_at_bol = 1;
+	b->yy_fill_buffer = 0;
+	b->yy_buffer_status = YY_BUFFER_NEW;
+
+	Error_switch_to_buffer(b  );
+
+	return b;
+}
+
+/** Setup the input buffer state to scan a string. The next call to Errorlex() will
+ * scan from a @e copy of @a str.
+ * @param yystr a NUL-terminated string to scan
+ * 
+ * @return the newly allocated buffer state object.
+ * @note If you want to scan bytes that may contain NUL values, then use
+ *       Error_scan_bytes() instead.
+ */
+YY_BUFFER_STATE Error_scan_string (yyconst char * yystr )
+{
+    
+	return Error_scan_bytes(yystr,strlen(yystr) );
+}
+
+/** Setup the input buffer state to scan the given bytes. The next call to Errorlex() will
+ * scan from a @e copy of @a bytes.
+ * @param bytes the byte buffer to scan
+ * @param len the number of bytes in the buffer pointed to by @a bytes.
+ * 
+ * @return the newly allocated buffer state object.
+ */
+YY_BUFFER_STATE Error_scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes_len )
+{
+	YY_BUFFER_STATE b;
+	char *buf;
+	yy_size_t n, i;
+    
+	/* Get memory for full buffer, including space for trailing EOB's. */
+	n = _yybytes_len + 2;
+	buf = (char *) Erroralloc(n  );
+	if ( ! buf )
+		YY_FATAL_ERROR( "out of dynamic memory in Error_scan_bytes()" );
+
+	for ( i = 0; i < _yybytes_len; ++i )
+		buf[i] = yybytes[i];
+
+	buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
+
+	b = Error_scan_buffer(buf,n );
+	if ( ! b )
+		YY_FATAL_ERROR( "bad buffer in Error_scan_bytes()" );
+
+	/* It's okay to grow etc. this buffer, and we should throw it
+	 * away when we're done.
+	 */
+	b->yy_is_our_buffer = 1;
+
+	return b;
+}
+
+#ifndef YY_EXIT_FAILURE
+#define YY_EXIT_FAILURE 2
+#endif
+
+static void yy_fatal_error (yyconst char* msg )
+{
+    	(void) fprintf( stderr, "%s\n", msg );
+	exit( YY_EXIT_FAILURE );
+}
+
+/* Redefine yyless() so it works in section 3 code. */
+
+#undef yyless
+#define yyless(n) \
+	do \
+		{ \
+		/* Undo effects of setting up Errortext. */ \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+		Errortext[Errorleng] = (yy_hold_char); \
+		(yy_c_buf_p) = Errortext + yyless_macro_arg; \
+		(yy_hold_char) = *(yy_c_buf_p); \
+		*(yy_c_buf_p) = '\0'; \
+		Errorleng = yyless_macro_arg; \
+		} \
+	while ( 0 )
+
+/* Accessor  methods (get/set functions) to struct members. */
+
+/** Get the current line number.
+ * 
+ */
+int Errorget_lineno  (void)
+{
+        
+    return Errorlineno;
+}
+
+/** Get the input stream.
+ * 
+ */
+FILE *Errorget_in  (void)
+{
+        return Errorin;
+}
+
+/** Get the output stream.
+ * 
+ */
+FILE *Errorget_out  (void)
+{
+        return Errorout;
+}
+
+/** Get the length of the current token.
+ * 
+ */
+yy_size_t Errorget_leng  (void)
+{
+        return Errorleng;
+}
+
+/** Get the current token.
+ * 
+ */
+
+char *Errorget_text  (void)
+{
+        return Errortext;
+}
+
+/** Set the current line number.
+ * @param line_number
+ * 
+ */
+void Errorset_lineno (int  line_number )
+{
+    
+    Errorlineno = line_number;
+}
+
+/** Set the input stream. This does not discard the current
+ * input buffer.
+ * @param in_str A readable stream.
+ * 
+ * @see Error_switch_to_buffer
+ */
+void Errorset_in (FILE *  in_str )
+{
+        Errorin = in_str ;
+}
+
+void Errorset_out (FILE *  out_str )
+{
+        Errorout = out_str ;
+}
+
+int Errorget_debug  (void)
+{
+        return Error_flex_debug;
+}
+
+void Errorset_debug (int  bdebug )
+{
+        Error_flex_debug = bdebug ;
+}
+
+static int yy_init_globals (void)
+{
+        /* Initialization is the same as for the non-reentrant scanner.
+     * This function is called from Errorlex_destroy(), so don't allocate here.
+     */
+
+    (yy_buffer_stack) = 0;
+    (yy_buffer_stack_top) = 0;
+    (yy_buffer_stack_max) = 0;
+    (yy_c_buf_p) = (char *) 0;
+    (yy_init) = 0;
+    (yy_start) = 0;
+
+/* Defined in main.c */
+#ifdef YY_STDINIT
+    Errorin = stdin;
+    Errorout = stdout;
+#else
+    Errorin = (FILE *) 0;
+    Errorout = (FILE *) 0;
+#endif
+
+    /* For future reference: Set errno on error, since we are called by
+     * Errorlex_init()
+     */
+    return 0;
+}
+
+/* Errorlex_destroy is for both reentrant and non-reentrant scanners. */
+int Errorlex_destroy  (void)
+{
+    
+    /* Pop the buffer stack, destroying each element. */
+	while(YY_CURRENT_BUFFER){
+		Error_delete_buffer(YY_CURRENT_BUFFER  );
+		YY_CURRENT_BUFFER_LVALUE = NULL;
+		Errorpop_buffer_state();
+	}
+
+	/* Destroy the stack itself. */
+	Errorfree((yy_buffer_stack) );
+	(yy_buffer_stack) = NULL;
+
+    /* Reset the globals. This is important in a non-reentrant scanner so the next time
+     * Errorlex() is called, initialization will occur. */
+    yy_init_globals( );
+
+    return 0;
+}
+
+/*
+ * Internal utility routines.
+ */
+
+#ifndef yytext_ptr
+static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
+{
+	register int i;
+	for ( i = 0; i < n; ++i )
+		s1[i] = s2[i];
+}
+#endif
+
+#ifdef YY_NEED_STRLEN
+static int yy_flex_strlen (yyconst char * s )
+{
+	register int n;
+	for ( n = 0; s[n]; ++n )
+		;
+
+	return n;
+}
+#endif
+
+void *Erroralloc (yy_size_t  size )
+{
+	return (void *) malloc( size );
+}
+
+void *Errorrealloc  (void * ptr, yy_size_t  size )
+{
+	/* The cast to (char *) in the following accommodates both
+	 * implementations that use char* generic pointers, and those
+	 * that use void* generic pointers.  It works with the latter
+	 * because both ANSI C and C++ allow castless assignment from
+	 * any pointer type to void*, and deal with argument conversions
+	 * as though doing an assignment.
+	 */
+	return (void *) realloc( (char *) ptr, size );
+}
+
+void Errorfree (void * ptr )
+{
+	free( (char *) ptr );	/* see Errorrealloc() for (char *) cast */
+}
+
+#define YYTABLES_NAME "yytables"
+
+#line 144 "Error.lex"
+
+
+
+// These three glue routines enable DDS to reclaim the memory used to parse a
+// DDS off the wire. They are here because this file can see the YY_*
+// symbols; the file DDS.cc cannot.
+
+void *
+Error_buffer(FILE *fp)
+{
+    return (void *)Error_create_buffer(fp, YY_BUF_SIZE);
+}
+
+void
+Error_switch_to_buffer(void *buf)
+{
+    Error_switch_to_buffer((YY_BUFFER_STATE)buf);
+}
+
+void
+Error_delete_buffer(void *buf)
+{
+    Error_delete_buffer((YY_BUFFER_STATE)buf);
+}
+
+void
+store_integer()
+{
+    Errorlval.integer = atoi(Errortext);
+}
+
+void
+store_string()
+{
+    Errorlval.string = Errortext;
+}
+
+
diff --git a/lex.ce_expr.cc b/lex.ce_expr.cc
new file mode 100644
index 0000000..db7b906
--- /dev/null
+++ b/lex.ce_expr.cc
@@ -0,0 +1,2089 @@
+#line 2 "lex.ce_expr.cc"
+
+#line 4 "lex.ce_expr.cc"
+
+#define  YY_INT_ALIGNED short int
+
+/* A lexical scanner generated by flex */
+
+#define yy_create_buffer ce_expr_create_buffer
+#define yy_delete_buffer ce_expr_delete_buffer
+#define yy_flex_debug ce_expr_flex_debug
+#define yy_init_buffer ce_expr_init_buffer
+#define yy_flush_buffer ce_expr_flush_buffer
+#define yy_load_buffer_state ce_expr_load_buffer_state
+#define yy_switch_to_buffer ce_expr_switch_to_buffer
+#define yyin ce_exprin
+#define yyleng ce_exprleng
+#define yylex ce_exprlex
+#define yylineno ce_exprlineno
+#define yyout ce_exprout
+#define yyrestart ce_exprrestart
+#define yytext ce_exprtext
+#define yywrap ce_exprwrap
+#define yyalloc ce_expralloc
+#define yyrealloc ce_exprrealloc
+#define yyfree ce_exprfree
+
+#define FLEX_SCANNER
+#define YY_FLEX_MAJOR_VERSION 2
+#define YY_FLEX_MINOR_VERSION 5
+#define YY_FLEX_SUBMINOR_VERSION 35
+#if YY_FLEX_SUBMINOR_VERSION > 0
+#define FLEX_BETA
+#endif
+
+/* First, we deal with  platform-specific or compiler-specific issues. */
+
+/* begin standard C headers. */
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <stdlib.h>
+
+/* end standard C headers. */
+
+/* flex integer type definitions */
+
+#ifndef FLEXINT_H
+#define FLEXINT_H
+
+/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
+
+#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+
+/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
+ * if you want the limit (max/min) macros for int types. 
+ */
+#ifndef __STDC_LIMIT_MACROS
+#define __STDC_LIMIT_MACROS 1
+#endif
+
+#include <inttypes.h>
+typedef int8_t flex_int8_t;
+typedef uint8_t flex_uint8_t;
+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;
+typedef int flex_int32_t;
+typedef unsigned char flex_uint8_t; 
+typedef unsigned short int flex_uint16_t;
+typedef unsigned int flex_uint32_t;
+#endif /* ! C99 */
+
+/* Limits of integral types. */
+#ifndef INT8_MIN
+#define INT8_MIN               (-128)
+#endif
+#ifndef INT16_MIN
+#define INT16_MIN              (-32767-1)
+#endif
+#ifndef INT32_MIN
+#define INT32_MIN              (-2147483647-1)
+#endif
+#ifndef INT8_MAX
+#define INT8_MAX               (127)
+#endif
+#ifndef INT16_MAX
+#define INT16_MAX              (32767)
+#endif
+#ifndef INT32_MAX
+#define INT32_MAX              (2147483647)
+#endif
+#ifndef UINT8_MAX
+#define UINT8_MAX              (255U)
+#endif
+#ifndef UINT16_MAX
+#define UINT16_MAX             (65535U)
+#endif
+#ifndef UINT32_MAX
+#define UINT32_MAX             (4294967295U)
+#endif
+
+#endif /* ! FLEXINT_H */
+
+#ifdef __cplusplus
+
+/* The "const" storage-class-modifier is valid. */
+#define YY_USE_CONST
+
+#else	/* ! __cplusplus */
+
+/* C99 requires __STDC__ to be defined as 1. */
+#if defined (__STDC__)
+
+#define YY_USE_CONST
+
+#endif	/* defined (__STDC__) */
+#endif	/* ! __cplusplus */
+
+#ifdef YY_USE_CONST
+#define yyconst const
+#else
+#define yyconst
+#endif
+
+/* Returned upon end-of-file. */
+#define YY_NULL 0
+
+/* Promotes a possibly negative, possibly signed char to an unsigned
+ * integer for use as an array index.  If the signed char is negative,
+ * we want to instead treat it as an 8-bit unsigned char, hence the
+ * double cast.
+ */
+#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
+
+/* Enter a start condition.  This macro really ought to take a parameter,
+ * but we do it the disgusting crufty way forced on us by the ()-less
+ * definition of BEGIN.
+ */
+#define BEGIN (yy_start) = 1 + 2 *
+
+/* Translate the current start state into a value that can be later handed
+ * to BEGIN to return to the state.  The YYSTATE alias is for lex
+ * compatibility.
+ */
+#define YY_START (((yy_start) - 1) / 2)
+#define YYSTATE YY_START
+
+/* Action number for EOF rule of a given start state. */
+#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
+
+/* Special action meaning "start processing a new file". */
+#define YY_NEW_FILE ce_exprrestart(ce_exprin  )
+
+#define YY_END_OF_BUFFER_CHAR 0
+
+/* Size of default input buffer. */
+#ifndef YY_BUF_SIZE
+#define YY_BUF_SIZE 16384
+#endif
+
+/* The state buf must be large enough to hold one state per character in the main buffer.
+ */
+#define YY_STATE_BUF_SIZE   ((YY_BUF_SIZE + 2) * sizeof(yy_state_type))
+
+#ifndef YY_TYPEDEF_YY_BUFFER_STATE
+#define YY_TYPEDEF_YY_BUFFER_STATE
+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 FILE *ce_exprin, *ce_exprout;
+
+#define EOB_ACT_CONTINUE_SCAN 0
+#define EOB_ACT_END_OF_FILE 1
+#define EOB_ACT_LAST_MATCH 2
+
+    #define YY_LESS_LINENO(n)
+    
+/* Return all but the first "n" matched characters back to the input stream. */
+#define yyless(n) \
+	do \
+		{ \
+		/* Undo effects of setting up ce_exprtext. */ \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+		*yy_cp = (yy_hold_char); \
+		YY_RESTORE_YY_MORE_OFFSET \
+		(yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
+		YY_DO_BEFORE_ACTION; /* set up ce_exprtext again */ \
+		} \
+	while ( 0 )
+
+#define unput(c) yyunput( c, (yytext_ptr)  )
+
+#ifndef YY_STRUCT_YY_BUFFER_STATE
+#define YY_STRUCT_YY_BUFFER_STATE
+struct yy_buffer_state
+	{
+	FILE *yy_input_file;
+
+	char *yy_ch_buf;		/* input buffer */
+	char *yy_buf_pos;		/* current position in input buffer */
+
+	/* Size of input buffer in bytes, not including room for EOB
+	 * characters.
+	 */
+	yy_size_t yy_buf_size;
+
+	/* Number of characters read into yy_ch_buf, not including EOB
+	 * characters.
+	 */
+	yy_size_t 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
+	 * delete it.
+	 */
+	int yy_is_our_buffer;
+
+	/* Whether this is an "interactive" input source; if so, and
+	 * if we're using stdio for input, then we want to use getc()
+	 * instead of fread(), to make sure we stop fetching input after
+	 * each newline.
+	 */
+	int yy_is_interactive;
+
+	/* Whether we're considered to be at the beginning of a line.
+	 * If so, '^' rules will be active on the next match, otherwise
+	 * not.
+	 */
+	int yy_at_bol;
+
+    int yy_bs_lineno; /**< The line count. */
+    int yy_bs_column; /**< The column count. */
+    
+	/* Whether to try to fill the input buffer when we reach the
+	 * end of it.
+	 */
+	int yy_fill_buffer;
+
+	int yy_buffer_status;
+
+#define YY_BUFFER_NEW 0
+#define YY_BUFFER_NORMAL 1
+	/* When an EOF's been seen but there's still some text to process
+	 * then we mark the buffer as YY_EOF_PENDING, to indicate that we
+	 * shouldn't try reading from the input source any more.  We might
+	 * still have a bunch of tokens to match, though, because of
+	 * possible backing-up.
+	 *
+	 * When we actually see the EOF, we change the status to "new"
+	 * (via ce_exprrestart()), so that the user can continue scanning by
+	 * just pointing ce_exprin at a new input file.
+	 */
+#define YY_BUFFER_EOF_PENDING 2
+
+	};
+#endif /* !YY_STRUCT_YY_BUFFER_STATE */
+
+/* Stack of input buffers. */
+static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
+static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
+static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
+
+/* We provide macros for accessing buffer states in case in the
+ * future we want to put the buffer states in a more general
+ * "scanner state".
+ *
+ * Returns the top of the stack, or NULL.
+ */
+#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
+                          ? (yy_buffer_stack)[(yy_buffer_stack_top)] \
+                          : NULL)
+
+/* Same as previous macro, but useful when we know that the buffer stack is not
+ * NULL or when we need an lvalue. For internal use only.
+ */
+#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)]
+
+/* 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;
+
+/* Points to current character in buffer. */
+static char *yy_c_buf_p = (char *) 0;
+static int yy_init = 0;		/* whether we need to initialize */
+static int yy_start = 0;	/* start state number */
+
+/* Flag which is used to allow ce_exprwrap()'s to do buffer switches
+ * instead of setting up a fresh ce_exprin.  A bit of a hack ...
+ */
+static int yy_did_buffer_switch_on_eof;
+
+void ce_exprrestart (FILE *input_file  );
+void ce_expr_switch_to_buffer (YY_BUFFER_STATE new_buffer  );
+YY_BUFFER_STATE ce_expr_create_buffer (FILE *file,int size  );
+void ce_expr_delete_buffer (YY_BUFFER_STATE b  );
+void ce_expr_flush_buffer (YY_BUFFER_STATE b  );
+void ce_exprpush_buffer_state (YY_BUFFER_STATE new_buffer  );
+void ce_exprpop_buffer_state (void );
+
+static void ce_exprensure_buffer_stack (void );
+static void ce_expr_load_buffer_state (void );
+static void ce_expr_init_buffer (YY_BUFFER_STATE b,FILE *file  );
+
+#define YY_FLUSH_BUFFER ce_expr_flush_buffer(YY_CURRENT_BUFFER )
+
+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  );
+
+void *ce_expralloc (yy_size_t  );
+void *ce_exprrealloc (void *,yy_size_t  );
+void ce_exprfree (void *  );
+
+#define yy_new_buffer ce_expr_create_buffer
+
+#define yy_set_interactive(is_interactive) \
+	{ \
+	if ( ! YY_CURRENT_BUFFER ){ \
+        ce_exprensure_buffer_stack (); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            ce_expr_create_buffer(ce_exprin,YY_BUF_SIZE ); \
+	} \
+	YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
+	}
+
+#define yy_set_bol(at_bol) \
+	{ \
+	if ( ! YY_CURRENT_BUFFER ){\
+        ce_exprensure_buffer_stack (); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            ce_expr_create_buffer(ce_exprin,YY_BUF_SIZE ); \
+	} \
+	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
+	}
+
+#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
+
+/* Begin user sect3 */
+
+#define ce_exprwrap(n) 1
+#define YY_SKIP_YYWRAP
+
+typedef unsigned char YY_CHAR;
+
+FILE *ce_exprin = (FILE *) 0, *ce_exprout = (FILE *) 0;
+
+typedef int yy_state_type;
+
+extern int ce_exprlineno;
+
+int ce_exprlineno = 1;
+
+extern char *ce_exprtext;
+#define yytext_ptr ce_exprtext
+
+static yy_state_type yy_get_previous_state (void );
+static yy_state_type yy_try_NUL_trans (yy_state_type current_state  );
+static int yy_get_next_buffer (void );
+static void yy_fatal_error (yyconst char msg[]  );
+
+/* Done after the current pattern has been matched and before the
+ * corresponding action - sets up ce_exprtext.
+ */
+#define YY_DO_BEFORE_ACTION \
+	(yytext_ptr) = yy_bp; \
+	(yytext_ptr) -= (yy_more_len); \
+	ce_exprleng = (yy_size_t) (yy_cp - (yytext_ptr)); \
+	(yy_hold_char) = *yy_cp; \
+	*yy_cp = '\0'; \
+	(yy_c_buf_p) = yy_cp;
+
+#define YY_NUM_RULES 32
+#define YY_END_OF_BUFFER 33
+/* This struct is not used in this scanner,
+   but its presence is necessary. */
+struct yy_trans_info
+	{
+	flex_int32_t yy_verify;
+	flex_int32_t yy_nxt;
+	};
+static yyconst flex_int16_t yy_accept[66] =
+    {   0,
+        0,    0,   28,   28,   33,   31,   26,   31,   27,   31,
+       10,    5,    6,    7,   18,    4,    3,   15,   11,   13,
+        1,    2,    8,    9,   32,   28,   30,   32,   26,   12,
+        0,    0,    0,    0,   10,   16,   17,   14,   28,   29,
+        0,    0,    0,    0,    0,    0,    0,    0,   19,    0,
+        0,    0,    0,    0,   20,   22,    0,    0,    0,    0,
+       21,   23,   24,   25,    0
+    } ;
+
+static yyconst flex_int32_t yy_ec[256] =
+    {   0,
+        1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
+        1,    1,    2,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    2,    4,    5,    6,    7,    8,    9,    1,   10,
+       11,   12,    8,   13,    8,    8,    8,    8,   14,   15,
+       16,   17,    8,   18,    8,    8,    8,   19,    1,   20,
+       21,   22,    1,    1,    8,   23,    8,    8,    8,   24,
+        8,    8,   25,    8,    8,    8,    8,    8,    8,    8,
+        8,    8,    8,    8,   26,    8,    8,    8,    8,    8,
+       27,   28,   29,    1,    8,    1,   30,    8,    8,    8,
+
+       31,    8,    8,    8,    8,    8,    8,   32,    8,   33,
+       34,    8,    8,    8,    8,   35,    8,    8,    8,    8,
+       36,    8,   37,    1,   38,   39,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1
+    } ;
+
+static yyconst flex_int32_t yy_meta[40] =
+    {   0,
+        1,    1,    2,    1,    3,    4,    1,    4,    1,    1,
+        1,    1,    1,    4,    4,    4,    4,    4,    1,    1,
+        1,    1,    4,    4,    4,    4,    1,    5,    1,    4,
+        4,    4,    4,    4,    4,    4,    1,    1,    1
+    } ;
+
+static yyconst flex_int16_t yy_base[70] =
+    {   0,
+        0,    0,   35,   36,   94,   95,   40,   72,   95,   21,
+        0,   95,   95,   95,   95,   95,   95,   71,   52,   69,
+       95,   95,   95,   95,   95,    0,   95,    0,   46,   95,
+       53,   56,   54,   61,    0,   95,   95,   95,    0,   95,
+       50,   50,   48,   49,   50,   47,   36,   39,   95,   27,
+       43,   45,   37,   38,   95,   95,   41,   43,   42,   38,
+       95,   95,   95,   95,   95,   64,   66,   71,   75
+    } ;
+
+static yyconst flex_int16_t yy_def[70] =
+    {   0,
+       65,    1,   66,   66,   65,   65,   65,   65,   65,   65,
+       67,   65,   65,   65,   65,   65,   65,   65,   65,   65,
+       65,   65,   65,   65,   65,   68,   65,   69,   65,   65,
+       65,   65,   65,   65,   67,   65,   65,   65,   68,   65,
+       65,   65,   65,   65,   65,   65,   65,   65,   65,   65,
+       65,   65,   65,   65,   65,   65,   65,   65,   65,   65,
+       65,   65,   65,   65,    0,   65,   65,   65,   65
+    } ;
+
+static yyconst flex_int16_t yy_nxt[135] =
+    {   0,
+        6,    7,    7,    8,    9,    6,   10,   11,   12,   13,
+       14,   15,   16,   11,   11,   11,   11,   11,   17,   18,
+       19,   20,   11,   11,   11,   11,   21,   11,   22,   11,
+       11,   11,   11,   11,   11,   11,   23,   24,   25,   27,
+       27,   29,   29,   31,   32,   33,   34,   29,   29,   51,
+       57,   52,   58,   59,   64,   60,   63,   62,   61,   56,
+       55,   54,   28,   28,   26,   26,   26,   26,   26,   35,
+       35,   39,   39,   53,   39,   40,   50,   40,   40,   40,
+       49,   48,   47,   46,   45,   44,   43,   42,   41,   38,
+       37,   36,   30,   65,    5,   65,   65,   65,   65,   65,
+
+       65,   65,   65,   65,   65,   65,   65,   65,   65,   65,
+       65,   65,   65,   65,   65,   65,   65,   65,   65,   65,
+       65,   65,   65,   65,   65,   65,   65,   65,   65,   65,
+       65,   65,   65,   65
+    } ;
+
+static yyconst flex_int16_t yy_chk[135] =
+    {   0,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    3,
+        4,    7,    7,   10,   10,   10,   10,   29,   29,   47,
+       53,   47,   53,   54,   60,   54,   59,   58,   57,   52,
+       51,   50,    3,    4,   66,   66,   66,   66,   66,   67,
+       67,   68,   68,   48,   68,   69,   46,   69,   69,   69,
+       45,   44,   43,   42,   41,   34,   33,   32,   31,   20,
+       19,   18,    8,    5,   65,   65,   65,   65,   65,   65,
+
+       65,   65,   65,   65,   65,   65,   65,   65,   65,   65,
+       65,   65,   65,   65,   65,   65,   65,   65,   65,   65,
+       65,   65,   65,   65,   65,   65,   65,   65,   65,   65,
+       65,   65,   65,   65
+    } ;
+
+static yy_state_type yy_last_accepting_state;
+static char *yy_last_accepting_cpos;
+
+extern int ce_expr_flex_debug;
+int ce_expr_flex_debug = 0;
+
+/* The intent behind this definition is that it'll catch
+ * any uses of REJECT which flex missed.
+ */
+#define REJECT reject_used_but_not_detected
+static int yy_more_flag = 0;
+static int yy_more_len = 0;
+#define yymore() ((yy_more_flag) = 1)
+#define YY_MORE_ADJ (yy_more_len)
+#define YY_RESTORE_YY_MORE_OFFSET
+char *ce_exprtext;
+#line 1 "ce_expr.lex"
+/*
+ -*- mode: c++; c-basic-offset:4 -*-
+
+ This file is part of libdap, A C++ implementation of the OPeNDAP Data
+ Access Protocol.
+
+ Copyright (c) 2002,2003 OPeNDAP, Inc.
+ Author: James Gallagher <jgallagher@opendap.org>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+ 
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+ 
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+ You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+ (c) COPYRIGHT URI/MIT 1994-1999
+*/ 
+/*
+  Scanner for constraint expressions. The scanner returns tokens for each of
+  the relational and selection operators. It requires GNU flex version 2.5.2
+  or newer.
+
+  The scanner is not reentrant, but can share a name space with other
+  scanners. 
+
+   Note:
+   1) The `defines' file expr.tab.h is built using `bison -d'.
+   2) Define YY_DECL such that the scanner is called `exprlex'.
+   3) When bison builds the expr.tab.h file, it uses `expr' instead of `yy'
+   for variable name prefixes (e.g., yylval --> exprlval).
+
+  jhrg 9/5/95
+*/
+#line 48 "ce_expr.lex"
+
+#include "config.h"
+
+#include <cstdio>
+#include <string>
+#include <cstring>
+
+#ifndef YY_PROTO
+#define YY_PROTO(proto) proto
+#endif
+
+#define YY_DECL int ce_exprlex YY_PROTO(( void ))
+#define YY_FATAL_ERROR(msg) {\
+    throw(libdap::Error(malformed_expr, std::string("Error scanning constraint expression text: ") + std::string(msg))); \
+    yy_fatal_error(msg); /* see das.lex */ \
+}
+
+#include "Error.h"
+#include "parser.h"
+#include "expr.h"
+#include "RValue.h"
+#include "ce_expr.tab.hh"
+#include "escaping.h"
+
+using namespace libdap ;
+
+static void store_id();
+static void store_str();
+static void store_op(int op);
+
+#define YY_NO_INPUT 1
+
+/* In the DAS and DDS parsers I removed the INT and FLOAT lexemes. However,
+   not having them here complicates parsing since you must check to see if a
+   word is a number (like 2.3) or a variable called `2.3.' I'm assuming that
+   people will always put some characters in variable names (e.g., they'll
+   use `2300.7%20MHz' and not just `2300.7'). If that turns out to be a bad
+   assumption, the we'll have to put more code in the parser to figure out
+   what exactly each word is; is it a constant or a variable name. Time will
+   tell. 10/31/2001 jhrg */
+/* See das.lex for comments about the characters allowed in a WORD.
+   10/31/2001 jhrg 
+
+   I've added '*' to the set of characters in a WORD for both the DDS and DAS
+   scanners, but not here because it'll conflict with the url dereference
+   operator. 6/10/2002 jhrg
+*/
+#line 616 "lex.ce_expr.cc"
+
+#define INITIAL 0
+#define quote 1
+
+#ifndef YY_NO_UNISTD_H
+/* Special case for "unistd.h", since it is non-ANSI. We include it way
+ * down here because we want the user's section 1 to have been scanned first.
+ * The user has a chance to override it with an option.
+ */
+#include <unistd.h>
+#endif
+
+#ifndef YY_EXTRA_TYPE
+#define YY_EXTRA_TYPE void *
+#endif
+
+static int yy_init_globals (void );
+
+/* Accessor methods to globals.
+   These are made visible to non-reentrant scanners for convenience. */
+
+int ce_exprlex_destroy (void );
+
+int ce_exprget_debug (void );
+
+void ce_exprset_debug (int debug_flag  );
+
+YY_EXTRA_TYPE ce_exprget_extra (void );
+
+void ce_exprset_extra (YY_EXTRA_TYPE user_defined  );
+
+FILE *ce_exprget_in (void );
+
+void ce_exprset_in  (FILE * in_str  );
+
+FILE *ce_exprget_out (void );
+
+void ce_exprset_out  (FILE * out_str  );
+
+yy_size_t ce_exprget_leng (void );
+
+char *ce_exprget_text (void );
+
+int ce_exprget_lineno (void );
+
+void ce_exprset_lineno (int line_number  );
+
+/* Macros after this point can all be overridden by user definitions in
+ * section 1.
+ */
+
+#ifndef YY_SKIP_YYWRAP
+#ifdef __cplusplus
+extern "C" int ce_exprwrap (void );
+#else
+extern int ce_exprwrap (void );
+#endif
+#endif
+
+#ifndef yytext_ptr
+static void yy_flex_strncpy (char *,yyconst char *,int );
+#endif
+
+#ifdef YY_NEED_STRLEN
+static int yy_flex_strlen (yyconst char * );
+#endif
+
+#ifndef YY_NO_INPUT
+
+#ifdef __cplusplus
+static int yyinput (void );
+#else
+static int input (void );
+#endif
+
+#endif
+
+/* Amount of stuff to slurp up with each read. */
+#ifndef YY_READ_BUF_SIZE
+#define YY_READ_BUF_SIZE 8192
+#endif
+
+/* Copy whatever the last rule matched to the standard output. */
+#ifndef ECHO
+/* 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 )
+#endif
+
+/* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
+ * is returned in "result".
+ */
+#ifndef YY_INPUT
+#define YY_INPUT(buf,result,max_size) \
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
+		{ \
+		int c = '*'; \
+		yy_size_t n; \
+		for ( n = 0; n < max_size && \
+			     (c = getc( ce_exprin )) != EOF && c != '\n'; ++n ) \
+			buf[n] = (char) c; \
+		if ( c == '\n' ) \
+			buf[n++] = (char) c; \
+		if ( c == EOF && ferror( ce_exprin ) ) \
+			YY_FATAL_ERROR( "input in flex scanner failed" ); \
+		result = n; \
+		} \
+	else \
+		{ \
+		errno=0; \
+		while ( (result = fread(buf, 1, max_size, ce_exprin))==0 && ferror(ce_exprin)) \
+			{ \
+			if( errno != EINTR) \
+				{ \
+				YY_FATAL_ERROR( "input in flex scanner failed" ); \
+				break; \
+				} \
+			errno=0; \
+			clearerr(ce_exprin); \
+			} \
+		}\
+\
+
+#endif
+
+/* No semi-colon after return; correct usage is to write "yyterminate();" -
+ * we don't want an extra ';' after the "return" because that will cause
+ * some compilers to complain about unreachable statements.
+ */
+#ifndef yyterminate
+#define yyterminate() return YY_NULL
+#endif
+
+/* Number of entries by which start-condition stack grows. */
+#ifndef YY_START_STACK_INCR
+#define YY_START_STACK_INCR 25
+#endif
+
+/* Report a fatal error. */
+#ifndef YY_FATAL_ERROR
+#define YY_FATAL_ERROR(msg) yy_fatal_error( msg )
+#endif
+
+/* end tables serialization structures and prototypes */
+
+/* Default declaration of generated scanner - a define so the user can
+ * easily add parameters.
+ */
+#ifndef YY_DECL
+#define YY_DECL_IS_OURS 1
+
+extern int ce_exprlex (void);
+
+#define YY_DECL int ce_exprlex (void)
+#endif /* !YY_DECL */
+
+/* Code executed at the beginning of each rule, after ce_exprtext and ce_exprleng
+ * have been set up.
+ */
+#ifndef YY_USER_ACTION
+#define YY_USER_ACTION
+#endif
+
+/* Code executed at the end of each rule. */
+#ifndef YY_BREAK
+#define YY_BREAK break;
+#endif
+
+#define YY_RULE_SETUP \
+	YY_USER_ACTION
+
+/** The main scanner function which does all the work.
+ */
+YY_DECL
+{
+	register yy_state_type yy_current_state;
+	register char *yy_cp, *yy_bp;
+	register int yy_act;
+    
+#line 130 "ce_expr.lex"
+
+
+#line 800 "lex.ce_expr.cc"
+
+	if ( !(yy_init) )
+		{
+		(yy_init) = 1;
+
+#ifdef YY_USER_INIT
+		YY_USER_INIT;
+#endif
+
+		if ( ! (yy_start) )
+			(yy_start) = 1;	/* first start state */
+
+		if ( ! ce_exprin )
+			ce_exprin = stdin;
+
+		if ( ! ce_exprout )
+			ce_exprout = stdout;
+
+		if ( ! YY_CURRENT_BUFFER ) {
+			ce_exprensure_buffer_stack ();
+			YY_CURRENT_BUFFER_LVALUE =
+				ce_expr_create_buffer(ce_exprin,YY_BUF_SIZE );
+		}
+
+		ce_expr_load_buffer_state( );
+		}
+
+	while ( 1 )		/* loops until end-of-file is reached */
+		{
+		(yy_more_len) = 0;
+		if ( (yy_more_flag) )
+			{
+			(yy_more_len) = (yy_c_buf_p) - (yytext_ptr);
+			(yy_more_flag) = 0;
+			}
+		yy_cp = (yy_c_buf_p);
+
+		/* Support of ce_exprtext. */
+		*yy_cp = (yy_hold_char);
+
+		/* yy_bp points to the position in yy_ch_buf of the start of
+		 * the current run.
+		 */
+		yy_bp = yy_cp;
+
+		yy_current_state = (yy_start);
+yy_match:
+		do
+			{
+			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
+			if ( yy_accept[yy_current_state] )
+				{
+				(yy_last_accepting_state) = yy_current_state;
+				(yy_last_accepting_cpos) = yy_cp;
+				}
+			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+				{
+				yy_current_state = (int) yy_def[yy_current_state];
+				if ( yy_current_state >= 66 )
+					yy_c = yy_meta[(unsigned int) yy_c];
+				}
+			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+			++yy_cp;
+			}
+		while ( yy_base[yy_current_state] != 95 );
+
+yy_find_action:
+		yy_act = yy_accept[yy_current_state];
+		if ( yy_act == 0 )
+			{ /* have to back up */
+			yy_cp = (yy_last_accepting_cpos);
+			yy_current_state = (yy_last_accepting_state);
+			yy_act = yy_accept[yy_current_state];
+			}
+
+		YY_DO_BEFORE_ACTION;
+
+do_action:	/* This label is used only to access EOF actions. */
+
+		switch ( yy_act )
+	{ /* beginning of action switch */
+			case 0: /* must back up */
+			/* undo the effects of YY_DO_BEFORE_ACTION */
+			*yy_cp = (yy_hold_char);
+			yy_cp = (yy_last_accepting_cpos);
+			yy_current_state = (yy_last_accepting_state);
+			goto yy_find_action;
+
+case 1:
+YY_RULE_SETUP
+#line 132 "ce_expr.lex"
+return (int)*ce_exprtext;
+	YY_BREAK
+case 2:
+YY_RULE_SETUP
+#line 133 "ce_expr.lex"
+return (int)*ce_exprtext;
+	YY_BREAK
+case 3:
+YY_RULE_SETUP
+#line 134 "ce_expr.lex"
+return (int)*ce_exprtext;
+	YY_BREAK
+case 4:
+YY_RULE_SETUP
+#line 135 "ce_expr.lex"
+return (int)*ce_exprtext;
+	YY_BREAK
+case 5:
+YY_RULE_SETUP
+#line 136 "ce_expr.lex"
+return (int)*ce_exprtext;
+	YY_BREAK
+case 6:
+YY_RULE_SETUP
+#line 137 "ce_expr.lex"
+return (int)*ce_exprtext;
+	YY_BREAK
+case 7:
+YY_RULE_SETUP
+#line 138 "ce_expr.lex"
+return (int)*ce_exprtext;
+	YY_BREAK
+case 8:
+YY_RULE_SETUP
+#line 139 "ce_expr.lex"
+return (int)*ce_exprtext;
+	YY_BREAK
+case 9:
+YY_RULE_SETUP
+#line 140 "ce_expr.lex"
+return (int)*ce_exprtext;
+	YY_BREAK
+case 10:
+YY_RULE_SETUP
+#line 142 "ce_expr.lex"
+store_id(); return SCAN_WORD;
+	YY_BREAK
+case 11:
+YY_RULE_SETUP
+#line 144 "ce_expr.lex"
+store_op(SCAN_EQUAL); return SCAN_EQUAL;
+	YY_BREAK
+case 12:
+YY_RULE_SETUP
+#line 145 "ce_expr.lex"
+store_op(SCAN_NOT_EQUAL); return SCAN_NOT_EQUAL;
+	YY_BREAK
+case 13:
+YY_RULE_SETUP
+#line 146 "ce_expr.lex"
+store_op(SCAN_GREATER); return SCAN_GREATER;
+	YY_BREAK
+case 14:
+YY_RULE_SETUP
+#line 147 "ce_expr.lex"
+store_op(SCAN_GREATER_EQL); return SCAN_GREATER_EQL;
+	YY_BREAK
+case 15:
+YY_RULE_SETUP
+#line 148 "ce_expr.lex"
+store_op(SCAN_LESS); return SCAN_LESS;
+	YY_BREAK
+case 16:
+YY_RULE_SETUP
+#line 149 "ce_expr.lex"
+store_op(SCAN_LESS_EQL); return SCAN_LESS_EQL;
+	YY_BREAK
+case 17:
+YY_RULE_SETUP
+#line 150 "ce_expr.lex"
+store_op(SCAN_REGEXP); return SCAN_REGEXP;
+	YY_BREAK
+case 18:
+YY_RULE_SETUP
+#line 152 "ce_expr.lex"
+store_op(SCAN_STAR); return SCAN_STAR;
+	YY_BREAK
+case 19:
+YY_RULE_SETUP
+#line 154 "ce_expr.lex"
+return SCAN_HASH_BYTE;
+	YY_BREAK
+case 20:
+YY_RULE_SETUP
+#line 155 "ce_expr.lex"
+return SCAN_HASH_INT16;
+	YY_BREAK
+case 21:
+YY_RULE_SETUP
+#line 156 "ce_expr.lex"
+return SCAN_HASH_UINT16;
+	YY_BREAK
+case 22:
+YY_RULE_SETUP
+#line 157 "ce_expr.lex"
+return SCAN_HASH_INT32;
+	YY_BREAK
+case 23:
+YY_RULE_SETUP
+#line 158 "ce_expr.lex"
+return SCAN_HASH_UINT32;
+	YY_BREAK
+case 24:
+YY_RULE_SETUP
+#line 159 "ce_expr.lex"
+return SCAN_HASH_FLOAT32;
+	YY_BREAK
+case 25:
+YY_RULE_SETUP
+#line 160 "ce_expr.lex"
+return SCAN_HASH_FLOAT64;
+	YY_BREAK
+case 26:
+/* rule 26 can match eol */
+YY_RULE_SETUP
+#line 162 "ce_expr.lex"
+
+	YY_BREAK
+case YY_STATE_EOF(INITIAL):
+#line 163 "ce_expr.lex"
+yy_init = 1; yyterminate();
+	YY_BREAK
+case 27:
+YY_RULE_SETUP
+#line 165 "ce_expr.lex"
+BEGIN(quote); yymore();
+	YY_BREAK
+case 28:
+/* rule 28 can match eol */
+YY_RULE_SETUP
+#line 167 "ce_expr.lex"
+yymore(); /*"*/
+	YY_BREAK
+case 29:
+YY_RULE_SETUP
+#line 169 "ce_expr.lex"
+yymore();
+	YY_BREAK
+case 30:
+YY_RULE_SETUP
+#line 171 "ce_expr.lex"
+{ 
+    		  BEGIN(INITIAL); 
+              store_str();
+              return SCAN_STR;
+            }
+	YY_BREAK
+case YY_STATE_EOF(quote):
+#line 177 "ce_expr.lex"
+{
+                  BEGIN(INITIAL);   /* resetting the state is needed for reentrant parsers */
+                  char msg[256];
+                  sprintf(msg, "Unterminated quote\n");
+                  YY_FATAL_ERROR(msg);
+                }
+	YY_BREAK
+case 31:
+/* rule 31 can match eol */
+YY_RULE_SETUP
+#line 184 "ce_expr.lex"
+{
+                  if (ce_exprtext) {	/* suppress msgs about `' chars */
+                    fprintf(stderr, "Character `%c' is not", *ce_exprtext);
+                    fprintf(stderr, " allowed and has been ignored\n");
+                  }
+		        }
+	YY_BREAK
+case 32:
+YY_RULE_SETUP
+#line 190 "ce_expr.lex"
+ECHO;
+	YY_BREAK
+#line 1074 "lex.ce_expr.cc"
+
+	case YY_END_OF_BUFFER:
+		{
+		/* Amount of text matched not including the EOB char. */
+		int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1;
+
+		/* Undo the effects of YY_DO_BEFORE_ACTION. */
+		*yy_cp = (yy_hold_char);
+		YY_RESTORE_YY_MORE_OFFSET
+
+		if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
+			{
+			/* We're scanning a new file or input source.  It's
+			 * possible that this happened because the user
+			 * just pointed ce_exprin at a new source and called
+			 * ce_exprlex().  If so, then we have to assure
+			 * consistency between YY_CURRENT_BUFFER and our
+			 * globals.  Here is the right place to do so, because
+			 * this is the first action (other than possibly a
+			 * back-up) that will match for the new input source.
+			 */
+			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+			YY_CURRENT_BUFFER_LVALUE->yy_input_file = ce_exprin;
+			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
+			}
+
+		/* Note that here we test for yy_c_buf_p "<=" to the position
+		 * of the first EOB in the buffer, since yy_c_buf_p will
+		 * already have been incremented past the NUL character
+		 * (since all states make transitions on EOB to the
+		 * end-of-buffer state).  Contrast this with the test
+		 * in input().
+		 */
+		if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
+			{ /* This was really a NUL. */
+			yy_state_type yy_next_state;
+
+			(yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text;
+
+			yy_current_state = yy_get_previous_state(  );
+
+			/* Okay, we're now positioned to make the NUL
+			 * transition.  We couldn't have
+			 * yy_get_previous_state() go ahead and do it
+			 * for us because it doesn't know how to deal
+			 * with the possibility of jamming (and we don't
+			 * want to build jamming into it because then it
+			 * will run more slowly).
+			 */
+
+			yy_next_state = yy_try_NUL_trans( yy_current_state );
+
+			yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+
+			if ( yy_next_state )
+				{
+				/* Consume the NUL. */
+				yy_cp = ++(yy_c_buf_p);
+				yy_current_state = yy_next_state;
+				goto yy_match;
+				}
+
+			else
+				{
+				yy_cp = (yy_c_buf_p);
+				goto yy_find_action;
+				}
+			}
+
+		else switch ( yy_get_next_buffer(  ) )
+			{
+			case EOB_ACT_END_OF_FILE:
+				{
+				(yy_did_buffer_switch_on_eof) = 0;
+
+				if ( ce_exprwrap( ) )
+					{
+					/* Note: because we've taken care in
+					 * yy_get_next_buffer() to have set up
+					 * ce_exprtext, we can now set up
+					 * yy_c_buf_p so that if some total
+					 * hoser (like flex itself) wants to
+					 * call the scanner after we return the
+					 * YY_NULL, it'll still work - another
+					 * YY_NULL will get returned.
+					 */
+					(yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ;
+
+					yy_act = YY_STATE_EOF(YY_START);
+					goto do_action;
+					}
+
+				else
+					{
+					if ( ! (yy_did_buffer_switch_on_eof) )
+						YY_NEW_FILE;
+					}
+				break;
+				}
+
+			case EOB_ACT_CONTINUE_SCAN:
+				(yy_c_buf_p) =
+					(yytext_ptr) + yy_amount_of_matched_text;
+
+				yy_current_state = yy_get_previous_state(  );
+
+				yy_cp = (yy_c_buf_p);
+				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+				goto yy_match;
+
+			case EOB_ACT_LAST_MATCH:
+				(yy_c_buf_p) =
+				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)];
+
+				yy_current_state = yy_get_previous_state(  );
+
+				yy_cp = (yy_c_buf_p);
+				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+				goto yy_find_action;
+			}
+		break;
+		}
+
+	default:
+		YY_FATAL_ERROR(
+			"fatal flex scanner internal error--no action found" );
+	} /* end of action switch */
+		} /* end of scanning one token */
+} /* end of ce_exprlex */
+
+/* yy_get_next_buffer - try to read in a new buffer
+ *
+ * Returns a code representing an action:
+ *	EOB_ACT_LAST_MATCH -
+ *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position
+ *	EOB_ACT_END_OF_FILE - end of file
+ */
+static int yy_get_next_buffer (void)
+{
+    	register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
+	register char *source = (yytext_ptr);
+	register int number_to_move, i;
+	int ret_val;
+
+	if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
+		YY_FATAL_ERROR(
+		"fatal flex scanner internal error--end of buffer missed" );
+
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
+		{ /* Don't try to fill the buffer, so this is an EOF. */
+		if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 )
+			{
+			/* We matched a single character, the EOB, so
+			 * treat this as a final EOF.
+			 */
+			return EOB_ACT_END_OF_FILE;
+			}
+
+		else
+			{
+			/* We matched some text prior to the EOB, first
+			 * process it.
+			 */
+			return EOB_ACT_LAST_MATCH;
+			}
+		}
+
+	/* Try to read more data. */
+
+	/* First move last chars to start of buffer. */
+	number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
+
+	for ( i = 0; i < number_to_move; ++i )
+		*(dest++) = *(source++);
+
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
+		/* don't do the read, it's not guaranteed to return an EOF,
+		 * just force an EOF
+		 */
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0;
+
+	else
+		{
+			yy_size_t num_to_read =
+			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
+
+		while ( num_to_read <= 0 )
+			{ /* Not enough room in the buffer - grow it. */
+
+			/* just a shorter name for the current buffer */
+			YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
+
+			int yy_c_buf_p_offset =
+				(int) ((yy_c_buf_p) - b->yy_ch_buf);
+
+			if ( b->yy_is_our_buffer )
+				{
+				yy_size_t new_size = b->yy_buf_size * 2;
+
+				if ( new_size <= 0 )
+					b->yy_buf_size += b->yy_buf_size / 8;
+				else
+					b->yy_buf_size *= 2;
+
+				b->yy_ch_buf = (char *)
+					/* Include room in for 2 EOB chars. */
+					ce_exprrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2  );
+				}
+			else
+				/* Can't grow it, we don't own it. */
+				b->yy_ch_buf = 0;
+
+			if ( ! b->yy_ch_buf )
+				YY_FATAL_ERROR(
+				"fatal error - scanner input buffer overflow" );
+
+			(yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset];
+
+			num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
+						number_to_move - 1;
+
+			}
+
+		if ( num_to_read > YY_READ_BUF_SIZE )
+			num_to_read = YY_READ_BUF_SIZE;
+
+		/* Read in more data. */
+		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
+			(yy_n_chars), num_to_read );
+
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		}
+
+	if ( (yy_n_chars) == 0 )
+		{
+		if ( number_to_move == YY_MORE_ADJ )
+			{
+			ret_val = EOB_ACT_END_OF_FILE;
+			ce_exprrestart(ce_exprin  );
+			}
+
+		else
+			{
+			ret_val = EOB_ACT_LAST_MATCH;
+			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
+				YY_BUFFER_EOF_PENDING;
+			}
+		}
+
+	else
+		ret_val = EOB_ACT_CONTINUE_SCAN;
+
+	if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
+		/* Extend the array by 50%, plus the number we really need. */
+		yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
+		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) ce_exprrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size  );
+		if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
+			YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
+	}
+
+	(yy_n_chars) += number_to_move;
+	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;
+	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
+
+	(yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
+
+	return ret_val;
+}
+
+/* yy_get_previous_state - get the state just before the EOB char was reached */
+
+    static yy_state_type yy_get_previous_state (void)
+{
+	register yy_state_type yy_current_state;
+	register char *yy_cp;
+    
+	yy_current_state = (yy_start);
+
+	for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
+		{
+		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+		if ( yy_accept[yy_current_state] )
+			{
+			(yy_last_accepting_state) = yy_current_state;
+			(yy_last_accepting_cpos) = yy_cp;
+			}
+		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+			{
+			yy_current_state = (int) yy_def[yy_current_state];
+			if ( yy_current_state >= 66 )
+				yy_c = yy_meta[(unsigned int) yy_c];
+			}
+		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+		}
+
+	return yy_current_state;
+}
+
+/* yy_try_NUL_trans - try to make a transition on the NUL character
+ *
+ * synopsis
+ *	next_state = yy_try_NUL_trans( current_state );
+ */
+    static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
+{
+	register int yy_is_jam;
+    	register char *yy_cp = (yy_c_buf_p);
+
+	register YY_CHAR yy_c = 1;
+	if ( yy_accept[yy_current_state] )
+		{
+		(yy_last_accepting_state) = yy_current_state;
+		(yy_last_accepting_cpos) = yy_cp;
+		}
+	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+		{
+		yy_current_state = (int) yy_def[yy_current_state];
+		if ( yy_current_state >= 66 )
+			yy_c = yy_meta[(unsigned int) yy_c];
+		}
+	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+	yy_is_jam = (yy_current_state == 65);
+
+	return yy_is_jam ? 0 : yy_current_state;
+}
+
+#ifndef YY_NO_INPUT
+#ifdef __cplusplus
+    static int yyinput (void)
+#else
+    static int input  (void)
+#endif
+
+{
+	int c;
+    
+	*(yy_c_buf_p) = (yy_hold_char);
+
+	if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
+		{
+		/* yy_c_buf_p now points to the character we want to return.
+		 * If this occurs *before* the EOB characters, then it's a
+		 * valid NUL; if not, then we've hit the end of the buffer.
+		 */
+		if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
+			/* This was really a NUL. */
+			*(yy_c_buf_p) = '\0';
+
+		else
+			{ /* need more input */
+			yy_size_t offset = (yy_c_buf_p) - (yytext_ptr);
+			++(yy_c_buf_p);
+
+			switch ( yy_get_next_buffer(  ) )
+				{
+				case EOB_ACT_LAST_MATCH:
+					/* This happens because yy_g_n_b()
+					 * sees that we've accumulated a
+					 * token and flags that we need to
+					 * try matching the token before
+					 * proceeding.  But for input(),
+					 * there's no matching to consider.
+					 * So convert the EOB_ACT_LAST_MATCH
+					 * to EOB_ACT_END_OF_FILE.
+					 */
+
+					/* Reset buffer status. */
+					ce_exprrestart(ce_exprin );
+
+					/*FALLTHROUGH*/
+
+				case EOB_ACT_END_OF_FILE:
+					{
+					if ( ce_exprwrap( ) )
+						return 0;
+
+					if ( ! (yy_did_buffer_switch_on_eof) )
+						YY_NEW_FILE;
+#ifdef __cplusplus
+					return yyinput();
+#else
+					return input();
+#endif
+					}
+
+				case EOB_ACT_CONTINUE_SCAN:
+					(yy_c_buf_p) = (yytext_ptr) + offset;
+					break;
+				}
+			}
+		}
+
+	c = *(unsigned char *) (yy_c_buf_p);	/* cast for 8-bit char's */
+	*(yy_c_buf_p) = '\0';	/* preserve ce_exprtext */
+	(yy_hold_char) = *++(yy_c_buf_p);
+
+	return c;
+}
+#endif	/* ifndef YY_NO_INPUT */
+
+/** Immediately switch to a different input stream.
+ * @param input_file A readable stream.
+ * 
+ * @note This function does not reset the start condition to @c INITIAL .
+ */
+    void ce_exprrestart  (FILE * input_file )
+{
+    
+	if ( ! YY_CURRENT_BUFFER ){
+        ce_exprensure_buffer_stack ();
+		YY_CURRENT_BUFFER_LVALUE =
+            ce_expr_create_buffer(ce_exprin,YY_BUF_SIZE );
+	}
+
+	ce_expr_init_buffer(YY_CURRENT_BUFFER,input_file );
+	ce_expr_load_buffer_state( );
+}
+
+/** Switch to a different input buffer.
+ * @param new_buffer The new input buffer.
+ * 
+ */
+    void ce_expr_switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
+{
+    
+	/* TODO. We should be able to replace this entire function body
+	 * with
+	 *		ce_exprpop_buffer_state();
+	 *		ce_exprpush_buffer_state(new_buffer);
+     */
+	ce_exprensure_buffer_stack ();
+	if ( YY_CURRENT_BUFFER == new_buffer )
+		return;
+
+	if ( YY_CURRENT_BUFFER )
+		{
+		/* Flush out information for old buffer. */
+		*(yy_c_buf_p) = (yy_hold_char);
+		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		}
+
+	YY_CURRENT_BUFFER_LVALUE = new_buffer;
+	ce_expr_load_buffer_state( );
+
+	/* We don't actually know whether we did this switch during
+	 * EOF (ce_exprwrap()) processing, but the only time this flag
+	 * is looked at is after ce_exprwrap() is called, so it's safe
+	 * to go ahead and always set it.
+	 */
+	(yy_did_buffer_switch_on_eof) = 1;
+}
+
+static void ce_expr_load_buffer_state  (void)
+{
+    	(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+	(yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
+	ce_exprin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
+	(yy_hold_char) = *(yy_c_buf_p);
+}
+
+/** Allocate and initialize an input buffer state.
+ * @param file A readable stream.
+ * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
+ * 
+ * @return the allocated buffer state.
+ */
+    YY_BUFFER_STATE ce_expr_create_buffer  (FILE * file, int  size )
+{
+	YY_BUFFER_STATE b;
+    
+	b = (YY_BUFFER_STATE) ce_expralloc(sizeof( struct yy_buffer_state )  );
+	if ( ! b )
+		YY_FATAL_ERROR( "out of dynamic memory in ce_expr_create_buffer()" );
+
+	b->yy_buf_size = size;
+
+	/* yy_ch_buf has to be 2 characters longer than the size given because
+	 * we need to put in 2 end-of-buffer characters.
+	 */
+	b->yy_ch_buf = (char *) ce_expralloc(b->yy_buf_size + 2  );
+	if ( ! b->yy_ch_buf )
+		YY_FATAL_ERROR( "out of dynamic memory in ce_expr_create_buffer()" );
+
+	b->yy_is_our_buffer = 1;
+
+	ce_expr_init_buffer(b,file );
+
+	return b;
+}
+
+/** Destroy the buffer.
+ * @param b a buffer created with ce_expr_create_buffer()
+ * 
+ */
+    void ce_expr_delete_buffer (YY_BUFFER_STATE  b )
+{
+    
+	if ( ! b )
+		return;
+
+	if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
+		YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
+
+	if ( b->yy_is_our_buffer )
+		ce_exprfree((void *) b->yy_ch_buf  );
+
+	ce_exprfree((void *) b  );
+}
+
+#ifndef __cplusplus
+extern int isatty (int );
+#endif /* __cplusplus */
+    
+/* Initializes or reinitializes a buffer.
+ * This function is sometimes called more than once on the same buffer,
+ * such as during a ce_exprrestart() or at EOF.
+ */
+    static void ce_expr_init_buffer  (YY_BUFFER_STATE  b, FILE * file )
+
+{
+	int oerrno = errno;
+    
+	ce_expr_flush_buffer(b );
+
+	b->yy_input_file = file;
+	b->yy_fill_buffer = 1;
+
+    /* If b is the current buffer, then ce_expr_init_buffer was _probably_
+     * called from ce_exprrestart() or through yy_get_next_buffer.
+     * In that case, we don't want to reset the lineno or column.
+     */
+    if (b != YY_CURRENT_BUFFER){
+        b->yy_bs_lineno = 1;
+        b->yy_bs_column = 0;
+    }
+
+        b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
+    
+	errno = oerrno;
+}
+
+/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
+ * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
+ * 
+ */
+    void ce_expr_flush_buffer (YY_BUFFER_STATE  b )
+{
+    	if ( ! b )
+		return;
+
+	b->yy_n_chars = 0;
+
+	/* We always need two end-of-buffer characters.  The first causes
+	 * a transition to the end-of-buffer state.  The second causes
+	 * a jam in that state.
+	 */
+	b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;
+	b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
+
+	b->yy_buf_pos = &b->yy_ch_buf[0];
+
+	b->yy_at_bol = 1;
+	b->yy_buffer_status = YY_BUFFER_NEW;
+
+	if ( b == YY_CURRENT_BUFFER )
+		ce_expr_load_buffer_state( );
+}
+
+/** Pushes the new state onto the stack. The new state becomes
+ *  the current state. This function will allocate the stack
+ *  if necessary.
+ *  @param new_buffer The new state.
+ *  
+ */
+void ce_exprpush_buffer_state (YY_BUFFER_STATE new_buffer )
+{
+    	if (new_buffer == NULL)
+		return;
+
+	ce_exprensure_buffer_stack();
+
+	/* This block is copied from ce_expr_switch_to_buffer. */
+	if ( YY_CURRENT_BUFFER )
+		{
+		/* Flush out information for old buffer. */
+		*(yy_c_buf_p) = (yy_hold_char);
+		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		}
+
+	/* Only push if top exists. Otherwise, replace top. */
+	if (YY_CURRENT_BUFFER)
+		(yy_buffer_stack_top)++;
+	YY_CURRENT_BUFFER_LVALUE = new_buffer;
+
+	/* copied from ce_expr_switch_to_buffer. */
+	ce_expr_load_buffer_state( );
+	(yy_did_buffer_switch_on_eof) = 1;
+}
+
+/** Removes and deletes the top of the stack, if present.
+ *  The next element becomes the new top.
+ *  
+ */
+void ce_exprpop_buffer_state (void)
+{
+    	if (!YY_CURRENT_BUFFER)
+		return;
+
+	ce_expr_delete_buffer(YY_CURRENT_BUFFER );
+	YY_CURRENT_BUFFER_LVALUE = NULL;
+	if ((yy_buffer_stack_top) > 0)
+		--(yy_buffer_stack_top);
+
+	if (YY_CURRENT_BUFFER) {
+		ce_expr_load_buffer_state( );
+		(yy_did_buffer_switch_on_eof) = 1;
+	}
+}
+
+/* Allocates the stack if it does not exist.
+ *  Guarantees space for at least one push.
+ */
+static void ce_exprensure_buffer_stack (void)
+{
+	yy_size_t num_to_alloc;
+    
+	if (!(yy_buffer_stack)) {
+
+		/* First allocation is just for 2 elements, since we don't know if this
+		 * scanner will even need a stack. We use 2 instead of 1 to avoid an
+		 * immediate realloc on the next call.
+         */
+		num_to_alloc = 1;
+		(yy_buffer_stack) = (struct yy_buffer_state**)ce_expralloc
+								(num_to_alloc * sizeof(struct yy_buffer_state*)
+								);
+		if ( ! (yy_buffer_stack) )
+			YY_FATAL_ERROR( "out of dynamic memory in ce_exprensure_buffer_stack()" );
+								  
+		memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
+				
+		(yy_buffer_stack_max) = num_to_alloc;
+		(yy_buffer_stack_top) = 0;
+		return;
+	}
+
+	if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
+
+		/* Increase the buffer to prepare for a possible push. */
+		int grow_size = 8 /* arbitrary grow size */;
+
+		num_to_alloc = (yy_buffer_stack_max) + grow_size;
+		(yy_buffer_stack) = (struct yy_buffer_state**)ce_exprrealloc
+								((yy_buffer_stack),
+								num_to_alloc * sizeof(struct yy_buffer_state*)
+								);
+		if ( ! (yy_buffer_stack) )
+			YY_FATAL_ERROR( "out of dynamic memory in ce_exprensure_buffer_stack()" );
+
+		/* zero only the new slots.*/
+		memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
+		(yy_buffer_stack_max) = num_to_alloc;
+	}
+}
+
+/** Setup the input buffer state to scan directly from a user-specified character buffer.
+ * @param base the character buffer
+ * @param size the size in bytes of the character buffer
+ * 
+ * @return the newly allocated buffer state object. 
+ */
+YY_BUFFER_STATE ce_expr_scan_buffer  (char * base, yy_size_t  size )
+{
+	YY_BUFFER_STATE b;
+    
+	if ( size < 2 ||
+	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
+	     base[size-1] != YY_END_OF_BUFFER_CHAR )
+		/* They forgot to leave room for the EOB's. */
+		return 0;
+
+	b = (YY_BUFFER_STATE) ce_expralloc(sizeof( struct yy_buffer_state )  );
+	if ( ! b )
+		YY_FATAL_ERROR( "out of dynamic memory in ce_expr_scan_buffer()" );
+
+	b->yy_buf_size = size - 2;	/* "- 2" to take care of EOB's */
+	b->yy_buf_pos = b->yy_ch_buf = base;
+	b->yy_is_our_buffer = 0;
+	b->yy_input_file = 0;
+	b->yy_n_chars = b->yy_buf_size;
+	b->yy_is_interactive = 0;
+	b->yy_at_bol = 1;
+	b->yy_fill_buffer = 0;
+	b->yy_buffer_status = YY_BUFFER_NEW;
+
+	ce_expr_switch_to_buffer(b  );
+
+	return b;
+}
+
+/** Setup the input buffer state to scan a string. The next call to ce_exprlex() will
+ * scan from a @e copy of @a str.
+ * @param yystr a NUL-terminated string to scan
+ * 
+ * @return the newly allocated buffer state object.
+ * @note If you want to scan bytes that may contain NUL values, then use
+ *       ce_expr_scan_bytes() instead.
+ */
+YY_BUFFER_STATE ce_expr_scan_string (yyconst char * yystr )
+{
+    
+	return ce_expr_scan_bytes(yystr,strlen(yystr) );
+}
+
+/** Setup the input buffer state to scan the given bytes. The next call to ce_exprlex() will
+ * scan from a @e copy of @a bytes.
+ * @param bytes the byte buffer to scan
+ * @param len the number of bytes in the buffer pointed to by @a bytes.
+ * 
+ * @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 b;
+	char *buf;
+	yy_size_t n, i;
+    
+	/* Get memory for full buffer, including space for trailing EOB's. */
+	n = _yybytes_len + 2;
+	buf = (char *) ce_expralloc(n  );
+	if ( ! buf )
+		YY_FATAL_ERROR( "out of dynamic memory in ce_expr_scan_bytes()" );
+
+	for ( i = 0; i < _yybytes_len; ++i )
+		buf[i] = yybytes[i];
+
+	buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
+
+	b = ce_expr_scan_buffer(buf,n );
+	if ( ! b )
+		YY_FATAL_ERROR( "bad buffer in ce_expr_scan_bytes()" );
+
+	/* It's okay to grow etc. this buffer, and we should throw it
+	 * away when we're done.
+	 */
+	b->yy_is_our_buffer = 1;
+
+	return b;
+}
+
+#ifndef YY_EXIT_FAILURE
+#define YY_EXIT_FAILURE 2
+#endif
+
+static void yy_fatal_error (yyconst char* msg )
+{
+    	(void) fprintf( stderr, "%s\n", msg );
+	exit( YY_EXIT_FAILURE );
+}
+
+/* Redefine yyless() so it works in section 3 code. */
+
+#undef yyless
+#define yyless(n) \
+	do \
+		{ \
+		/* Undo effects of setting up ce_exprtext. */ \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+		ce_exprtext[ce_exprleng] = (yy_hold_char); \
+		(yy_c_buf_p) = ce_exprtext + yyless_macro_arg; \
+		(yy_hold_char) = *(yy_c_buf_p); \
+		*(yy_c_buf_p) = '\0'; \
+		ce_exprleng = yyless_macro_arg; \
+		} \
+	while ( 0 )
+
+/* Accessor  methods (get/set functions) to struct members. */
+
+/** Get the current line number.
+ * 
+ */
+int ce_exprget_lineno  (void)
+{
+        
+    return ce_exprlineno;
+}
+
+/** Get the input stream.
+ * 
+ */
+FILE *ce_exprget_in  (void)
+{
+        return ce_exprin;
+}
+
+/** Get the output stream.
+ * 
+ */
+FILE *ce_exprget_out  (void)
+{
+        return ce_exprout;
+}
+
+/** Get the length of the current token.
+ * 
+ */
+yy_size_t ce_exprget_leng  (void)
+{
+        return ce_exprleng;
+}
+
+/** Get the current token.
+ * 
+ */
+
+char *ce_exprget_text  (void)
+{
+        return ce_exprtext;
+}
+
+/** Set the current line number.
+ * @param line_number
+ * 
+ */
+void ce_exprset_lineno (int  line_number )
+{
+    
+    ce_exprlineno = line_number;
+}
+
+/** Set the input stream. This does not discard the current
+ * input buffer.
+ * @param in_str A readable stream.
+ * 
+ * @see ce_expr_switch_to_buffer
+ */
+void ce_exprset_in (FILE *  in_str )
+{
+        ce_exprin = in_str ;
+}
+
+void ce_exprset_out (FILE *  out_str )
+{
+        ce_exprout = out_str ;
+}
+
+int ce_exprget_debug  (void)
+{
+        return ce_expr_flex_debug;
+}
+
+void ce_exprset_debug (int  bdebug )
+{
+        ce_expr_flex_debug = bdebug ;
+}
+
+static int yy_init_globals (void)
+{
+        /* Initialization is the same as for the non-reentrant scanner.
+     * This function is called from ce_exprlex_destroy(), so don't allocate here.
+     */
+
+    (yy_buffer_stack) = 0;
+    (yy_buffer_stack_top) = 0;
+    (yy_buffer_stack_max) = 0;
+    (yy_c_buf_p) = (char *) 0;
+    (yy_init) = 0;
+    (yy_start) = 0;
+
+/* Defined in main.c */
+#ifdef YY_STDINIT
+    ce_exprin = stdin;
+    ce_exprout = stdout;
+#else
+    ce_exprin = (FILE *) 0;
+    ce_exprout = (FILE *) 0;
+#endif
+
+    /* For future reference: Set errno on error, since we are called by
+     * ce_exprlex_init()
+     */
+    return 0;
+}
+
+/* ce_exprlex_destroy is for both reentrant and non-reentrant scanners. */
+int ce_exprlex_destroy  (void)
+{
+    
+    /* Pop the buffer stack, destroying each element. */
+	while(YY_CURRENT_BUFFER){
+		ce_expr_delete_buffer(YY_CURRENT_BUFFER  );
+		YY_CURRENT_BUFFER_LVALUE = NULL;
+		ce_exprpop_buffer_state();
+	}
+
+	/* Destroy the stack itself. */
+	ce_exprfree((yy_buffer_stack) );
+	(yy_buffer_stack) = NULL;
+
+    /* Reset the globals. This is important in a non-reentrant scanner so the next time
+     * ce_exprlex() is called, initialization will occur. */
+    yy_init_globals( );
+
+    return 0;
+}
+
+/*
+ * Internal utility routines.
+ */
+
+#ifndef yytext_ptr
+static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
+{
+	register int i;
+	for ( i = 0; i < n; ++i )
+		s1[i] = s2[i];
+}
+#endif
+
+#ifdef YY_NEED_STRLEN
+static int yy_flex_strlen (yyconst char * s )
+{
+	register int n;
+	for ( n = 0; s[n]; ++n )
+		;
+
+	return n;
+}
+#endif
+
+void *ce_expralloc (yy_size_t  size )
+{
+	return (void *) malloc( size );
+}
+
+void *ce_exprrealloc  (void * ptr, yy_size_t  size )
+{
+	/* The cast to (char *) in the following accommodates both
+	 * implementations that use char* generic pointers, and those
+	 * that use void* generic pointers.  It works with the latter
+	 * because both ANSI C and C++ allow castless assignment from
+	 * any pointer type to void*, and deal with argument conversions
+	 * as though doing an assignment.
+	 */
+	return (void *) realloc( (char *) ptr, size );
+}
+
+void ce_exprfree (void * ptr )
+{
+	free( (char *) ptr );	/* see ce_exprrealloc() for (char *) cast */
+}
+
+#define YYTABLES_NAME "yytables"
+
+#line 190 "ce_expr.lex"
+
+
+
+// Three glue routines for string scanning. These are not declared in the
+// header expr.tab.h nor is YY_BUFFER_STATE. Including these here allows them
+// to see the type definitions in lex.expr.c (where YY_BUFFER_STATE is
+// defined) and allows callers to declare them (since callers outside of this
+// file cannot declare the YY_BUFFER_STATE variable). Note that I changed the
+// name of the expr_scan_string function to expr_string because C++ cannot
+// distinguish by return type. 1/12/99 jhrg
+
+void *
+ce_expr_string(const char *str)
+{
+    return (void *)ce_expr_scan_string(str);
+}
+
+void
+ce_expr_switch_to_buffer(void *buf)
+{
+    ce_expr_switch_to_buffer((YY_BUFFER_STATE)buf);
+}
+
+void
+ce_expr_delete_buffer(void *buf)
+{
+    ce_expr_delete_buffer((YY_BUFFER_STATE)buf);
+}
+
+static void
+store_id()
+{
+    strncpy(ce_exprlval.id, ce_exprtext, ID_MAX-1);
+    ce_exprlval.id[ID_MAX-1] = '\0';
+}
+
+static void
+store_str()
+{
+    // transform %20 to a space. 7/11/2001 jhrg
+    string *s = new string(ce_exprtext); // move all calls of www2id into the parser. jhrg 7/5/13 www2id(string(ce_exprtext)));
+
+    if (*s->begin() == '\"' && *(s->end()-1) == '\"') {
+	s->erase(s->begin());
+	s->erase(s->end()-1);
+    }
+
+    ce_exprlval.val.type = dods_str_c;
+    ce_exprlval.val.v.s = s;
+}
+
+static void
+store_op(int op)
+{
+    ce_exprlval.op = op;
+}
+
+
diff --git a/lex.das.cc b/lex.das.cc
new file mode 100644
index 0000000..155ae81
--- /dev/null
+++ b/lex.das.cc
@@ -0,0 +1,2171 @@
+#line 2 "lex.das.cc"
+
+#line 4 "lex.das.cc"
+
+#define  YY_INT_ALIGNED short int
+
+/* A lexical scanner generated by flex */
+
+#define yy_create_buffer das_create_buffer
+#define yy_delete_buffer das_delete_buffer
+#define yy_flex_debug das_flex_debug
+#define yy_init_buffer das_init_buffer
+#define yy_flush_buffer das_flush_buffer
+#define yy_load_buffer_state das_load_buffer_state
+#define yy_switch_to_buffer das_switch_to_buffer
+#define yyin dasin
+#define yyleng dasleng
+#define yylex daslex
+#define yylineno daslineno
+#define yyout dasout
+#define yyrestart dasrestart
+#define yytext dastext
+#define yywrap daswrap
+#define yyalloc dasalloc
+#define yyrealloc dasrealloc
+#define yyfree dasfree
+
+#define FLEX_SCANNER
+#define YY_FLEX_MAJOR_VERSION 2
+#define YY_FLEX_MINOR_VERSION 5
+#define YY_FLEX_SUBMINOR_VERSION 35
+#if YY_FLEX_SUBMINOR_VERSION > 0
+#define FLEX_BETA
+#endif
+
+/* First, we deal with  platform-specific or compiler-specific issues. */
+
+/* begin standard C headers. */
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <stdlib.h>
+
+/* end standard C headers. */
+
+/* flex integer type definitions */
+
+#ifndef FLEXINT_H
+#define FLEXINT_H
+
+/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
+
+#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+
+/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
+ * if you want the limit (max/min) macros for int types. 
+ */
+#ifndef __STDC_LIMIT_MACROS
+#define __STDC_LIMIT_MACROS 1
+#endif
+
+#include <inttypes.h>
+typedef int8_t flex_int8_t;
+typedef uint8_t flex_uint8_t;
+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;
+typedef int flex_int32_t;
+typedef unsigned char flex_uint8_t; 
+typedef unsigned short int flex_uint16_t;
+typedef unsigned int flex_uint32_t;
+#endif /* ! C99 */
+
+/* Limits of integral types. */
+#ifndef INT8_MIN
+#define INT8_MIN               (-128)
+#endif
+#ifndef INT16_MIN
+#define INT16_MIN              (-32767-1)
+#endif
+#ifndef INT32_MIN
+#define INT32_MIN              (-2147483647-1)
+#endif
+#ifndef INT8_MAX
+#define INT8_MAX               (127)
+#endif
+#ifndef INT16_MAX
+#define INT16_MAX              (32767)
+#endif
+#ifndef INT32_MAX
+#define INT32_MAX              (2147483647)
+#endif
+#ifndef UINT8_MAX
+#define UINT8_MAX              (255U)
+#endif
+#ifndef UINT16_MAX
+#define UINT16_MAX             (65535U)
+#endif
+#ifndef UINT32_MAX
+#define UINT32_MAX             (4294967295U)
+#endif
+
+#endif /* ! FLEXINT_H */
+
+#ifdef __cplusplus
+
+/* The "const" storage-class-modifier is valid. */
+#define YY_USE_CONST
+
+#else	/* ! __cplusplus */
+
+/* C99 requires __STDC__ to be defined as 1. */
+#if defined (__STDC__)
+
+#define YY_USE_CONST
+
+#endif	/* defined (__STDC__) */
+#endif	/* ! __cplusplus */
+
+#ifdef YY_USE_CONST
+#define yyconst const
+#else
+#define yyconst
+#endif
+
+/* Returned upon end-of-file. */
+#define YY_NULL 0
+
+/* Promotes a possibly negative, possibly signed char to an unsigned
+ * integer for use as an array index.  If the signed char is negative,
+ * we want to instead treat it as an 8-bit unsigned char, hence the
+ * double cast.
+ */
+#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
+
+/* Enter a start condition.  This macro really ought to take a parameter,
+ * but we do it the disgusting crufty way forced on us by the ()-less
+ * definition of BEGIN.
+ */
+#define BEGIN (yy_start) = 1 + 2 *
+
+/* Translate the current start state into a value that can be later handed
+ * to BEGIN to return to the state.  The YYSTATE alias is for lex
+ * compatibility.
+ */
+#define YY_START (((yy_start) - 1) / 2)
+#define YYSTATE YY_START
+
+/* Action number for EOF rule of a given start state. */
+#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
+
+/* Special action meaning "start processing a new file". */
+#define YY_NEW_FILE dasrestart(dasin  )
+
+#define YY_END_OF_BUFFER_CHAR 0
+
+/* Size of default input buffer. */
+#ifndef YY_BUF_SIZE
+#define YY_BUF_SIZE 16384
+#endif
+
+/* The state buf must be large enough to hold one state per character in the main buffer.
+ */
+#define YY_STATE_BUF_SIZE   ((YY_BUF_SIZE + 2) * sizeof(yy_state_type))
+
+#ifndef YY_TYPEDEF_YY_BUFFER_STATE
+#define YY_TYPEDEF_YY_BUFFER_STATE
+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 FILE *dasin, *dasout;
+
+#define EOB_ACT_CONTINUE_SCAN 0
+#define EOB_ACT_END_OF_FILE 1
+#define EOB_ACT_LAST_MATCH 2
+
+    #define YY_LESS_LINENO(n)
+    
+/* Return all but the first "n" matched characters back to the input stream. */
+#define yyless(n) \
+	do \
+		{ \
+		/* Undo effects of setting up dastext. */ \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+		*yy_cp = (yy_hold_char); \
+		YY_RESTORE_YY_MORE_OFFSET \
+		(yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
+		YY_DO_BEFORE_ACTION; /* set up dastext again */ \
+		} \
+	while ( 0 )
+
+#define unput(c) yyunput( c, (yytext_ptr)  )
+
+#ifndef YY_STRUCT_YY_BUFFER_STATE
+#define YY_STRUCT_YY_BUFFER_STATE
+struct yy_buffer_state
+	{
+	FILE *yy_input_file;
+
+	char *yy_ch_buf;		/* input buffer */
+	char *yy_buf_pos;		/* current position in input buffer */
+
+	/* Size of input buffer in bytes, not including room for EOB
+	 * characters.
+	 */
+	yy_size_t yy_buf_size;
+
+	/* Number of characters read into yy_ch_buf, not including EOB
+	 * characters.
+	 */
+	yy_size_t 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
+	 * delete it.
+	 */
+	int yy_is_our_buffer;
+
+	/* Whether this is an "interactive" input source; if so, and
+	 * if we're using stdio for input, then we want to use getc()
+	 * instead of fread(), to make sure we stop fetching input after
+	 * each newline.
+	 */
+	int yy_is_interactive;
+
+	/* Whether we're considered to be at the beginning of a line.
+	 * If so, '^' rules will be active on the next match, otherwise
+	 * not.
+	 */
+	int yy_at_bol;
+
+    int yy_bs_lineno; /**< The line count. */
+    int yy_bs_column; /**< The column count. */
+    
+	/* Whether to try to fill the input buffer when we reach the
+	 * end of it.
+	 */
+	int yy_fill_buffer;
+
+	int yy_buffer_status;
+
+#define YY_BUFFER_NEW 0
+#define YY_BUFFER_NORMAL 1
+	/* When an EOF's been seen but there's still some text to process
+	 * then we mark the buffer as YY_EOF_PENDING, to indicate that we
+	 * shouldn't try reading from the input source any more.  We might
+	 * still have a bunch of tokens to match, though, because of
+	 * possible backing-up.
+	 *
+	 * When we actually see the EOF, we change the status to "new"
+	 * (via dasrestart()), so that the user can continue scanning by
+	 * just pointing dasin at a new input file.
+	 */
+#define YY_BUFFER_EOF_PENDING 2
+
+	};
+#endif /* !YY_STRUCT_YY_BUFFER_STATE */
+
+/* Stack of input buffers. */
+static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
+static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
+static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
+
+/* We provide macros for accessing buffer states in case in the
+ * future we want to put the buffer states in a more general
+ * "scanner state".
+ *
+ * Returns the top of the stack, or NULL.
+ */
+#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
+                          ? (yy_buffer_stack)[(yy_buffer_stack_top)] \
+                          : NULL)
+
+/* Same as previous macro, but useful when we know that the buffer stack is not
+ * NULL or when we need an lvalue. For internal use only.
+ */
+#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)]
+
+/* 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;
+
+/* Points to current character in buffer. */
+static char *yy_c_buf_p = (char *) 0;
+static int yy_init = 0;		/* whether we need to initialize */
+static int yy_start = 0;	/* start state number */
+
+/* Flag which is used to allow daswrap()'s to do buffer switches
+ * instead of setting up a fresh dasin.  A bit of a hack ...
+ */
+static int yy_did_buffer_switch_on_eof;
+
+void dasrestart (FILE *input_file  );
+void das_switch_to_buffer (YY_BUFFER_STATE new_buffer  );
+YY_BUFFER_STATE das_create_buffer (FILE *file,int size  );
+void das_delete_buffer (YY_BUFFER_STATE b  );
+void das_flush_buffer (YY_BUFFER_STATE b  );
+void daspush_buffer_state (YY_BUFFER_STATE new_buffer  );
+void daspop_buffer_state (void );
+
+static void dasensure_buffer_stack (void );
+static void das_load_buffer_state (void );
+static void das_init_buffer (YY_BUFFER_STATE b,FILE *file  );
+
+#define YY_FLUSH_BUFFER das_flush_buffer(YY_CURRENT_BUFFER )
+
+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  );
+
+void *dasalloc (yy_size_t  );
+void *dasrealloc (void *,yy_size_t  );
+void dasfree (void *  );
+
+#define yy_new_buffer das_create_buffer
+
+#define yy_set_interactive(is_interactive) \
+	{ \
+	if ( ! YY_CURRENT_BUFFER ){ \
+        dasensure_buffer_stack (); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            das_create_buffer(dasin,YY_BUF_SIZE ); \
+	} \
+	YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
+	}
+
+#define yy_set_bol(at_bol) \
+	{ \
+	if ( ! YY_CURRENT_BUFFER ){\
+        dasensure_buffer_stack (); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            das_create_buffer(dasin,YY_BUF_SIZE ); \
+	} \
+	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
+	}
+
+#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
+
+/* Begin user sect3 */
+
+#define daswrap(n) 1
+#define YY_SKIP_YYWRAP
+
+typedef unsigned char YY_CHAR;
+
+FILE *dasin = (FILE *) 0, *dasout = (FILE *) 0;
+
+typedef int yy_state_type;
+
+extern int daslineno;
+
+int daslineno = 1;
+
+extern char *dastext;
+#define yytext_ptr dastext
+
+static yy_state_type yy_get_previous_state (void );
+static yy_state_type yy_try_NUL_trans (yy_state_type current_state  );
+static int yy_get_next_buffer (void );
+static void yy_fatal_error (yyconst char msg[]  );
+
+/* Done after the current pattern has been matched and before the
+ * corresponding action - sets up dastext.
+ */
+#define YY_DO_BEFORE_ACTION \
+	(yytext_ptr) = yy_bp; \
+	(yytext_ptr) -= (yy_more_len); \
+	dasleng = (yy_size_t) (yy_cp - (yytext_ptr)); \
+	(yy_hold_char) = *yy_cp; \
+	*yy_cp = '\0'; \
+	(yy_c_buf_p) = yy_cp;
+
+#define YY_NUM_RULES 31
+#define YY_END_OF_BUFFER 32
+/* This struct is not used in this scanner,
+   but its presence is necessary. */
+struct yy_trans_info
+	{
+	flex_int32_t yy_verify;
+	flex_int32_t yy_nxt;
+	};
+static yyconst flex_int16_t yy_accept[188] =
+    {   0,
+        0,    0,   25,   25,   21,   21,    0,    0,   32,   30,
+       18,   19,   24,   20,   13,   13,   17,   16,   13,   13,
+       13,   13,   13,   13,   13,   31,   13,   13,   13,   13,
+       13,   13,   13,   14,   15,   25,   26,   31,   29,   31,
+       21,   22,   31,   18,   13,   13,   13,   13,   13,   13,
+       13,   13,   13,   13,   13,   13,   13,   13,   13,   13,
+       13,   13,   13,   13,   13,   13,   13,   13,   13,   13,
+       13,   13,   25,   26,    0,   27,   28,   21,   23,   13,
+       13,   13,   13,   13,   13,   13,   13,   13,   13,   13,
+       13,   13,   13,   13,   13,   11,   13,   13,   13,   13,
+
+       13,   13,   13,   13,   13,   13,   13,   13,   13,    3,
+       13,   13,   13,   13,   13,   13,   13,   13,   13,   13,
+       13,   13,   13,   13,   13,   13,   13,   13,   13,   13,
+       13,    2,   13,   13,   13,   13,    4,    6,   13,   13,
+       13,   13,   13,   13,   13,   13,   13,   13,   13,   13,
+       13,   13,   13,   13,   13,   13,   13,   13,   13,   13,
+       13,   13,   10,    5,    7,   13,   13,   13,   13,   13,
+       13,    8,    9,   13,   13,   13,   13,   13,   13,   13,
+       12,   13,   13,   13,   13,    1,    0
+    } ;
+
+static yyconst flex_int32_t yy_ec[256] =
+    {   0,
+        1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
+        1,    1,    4,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    2,    1,    5,    6,    1,    7,    1,    1,    7,
+        7,    8,    7,    9,    7,    7,    7,    7,   10,   11,
+       12,   13,    7,   14,    7,    7,    7,    7,   15,    1,
+        1,    1,    1,    1,   16,   17,    7,    7,   18,   19,
+       20,   21,   22,    7,    7,   23,   24,   25,   26,    7,
+        7,   27,   28,   29,   30,    7,    7,   31,   32,    7,
+       33,   34,   33,    1,    7,    1,   35,   36,    7,    7,
+
+       37,   38,   39,   40,   41,    7,    7,   42,   43,   44,
+       45,    7,    7,   46,   47,   48,   49,    7,    7,   50,
+       51,    7,   52,    1,   53,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1
+    } ;
+
+static yyconst flex_int32_t yy_meta[54] =
+    {   0,
+        1,    1,    2,    3,    4,    5,    5,    5,    1,    5,
+        5,    5,    5,    5,    1,    5,    5,    5,    5,    5,
+        5,    5,    5,    5,    5,    5,    5,    5,    5,    5,
+        5,    5,    1,    6,    5,    5,    5,    5,    5,    5,
+        5,    5,    5,    5,    5,    5,    5,    5,    5,    5,
+        5,    1,    1
+    } ;
+
+static yyconst flex_int16_t yy_base[195] =
+    {   0,
+        0,    0,   51,   54,   57,   59,    0,    0,  271,  272,
+       62,  272,  272,  272,    0,    0,  272,  272,   42,   35,
+       45,   45,   43,   44,   52,  272,   27,  219,  227,  224,
+      219,  218,   35,  272,  272,   74,  272,  262,  272,    0,
+        0,  272,  261,   78,    0,  241,  233,  220,  212,  230,
+      210,  231,  211,  226,  206,  232,  212,  224,  204,   58,
+      226,  204,  205,  205,  197,  196,  198,  194,  201,  194,
+      195,  196,   91,  272,  234,  272,  272,    0,  272,  220,
+      208,  199,  187,  214,  194,  214,  194,   87,   91,  210,
+      190,  204,  184,  195,  175,    0,  174,  186,  174,  182,
+
+      183,   94,  180,  175,  167,  186,  191,  165,  170,    0,
+      181,  161,  194,  196,  192,  194,  177,  157,  177,  157,
+       95,   98,   99,  153,  158,  150,  183,  185,  149,  150,
+      102,    0,  176,  156,  101,  104,    0,    0,  160,  159,
+      169,  149,  173,  175,  171,  173,  169,  171,  145,  105,
+      130,  140,  164,  166,  143,  123,  155,  150,  127,  124,
+      112,   96,    0,    0,    0,   86,  123,  120,   89,  102,
+       82,    0,    0,  106,  105,   85,   78,   83,  106,   86,
+        0,   85,   93,   53,   49,    0,  272,  139,  145,  151,
+      153,  159,  164,  170
+
+    } ;
+
+static yyconst flex_int16_t yy_def[195] =
+    {   0,
+      187,    1,  188,  188,  189,  189,  190,  190,  187,  187,
+      187,  187,  187,  187,  191,  191,  187,  187,  191,  191,
+      191,  191,  191,  191,  191,  187,  191,  191,  191,  191,
+      191,  191,  191,  187,  187,  192,  187,  187,  187,  193,
+      194,  187,  187,  187,  191,  191,  191,  191,  191,  191,
+      191,  191,  191,  191,  191,  191,  191,  191,  191,  191,
+      191,  191,  191,  191,  191,  191,  191,  191,  191,  191,
+      191,  191,  192,  187,  187,  187,  187,  194,  187,  191,
+      191,  191,  191,  191,  191,  191,  191,  191,  191,  191,
+      191,  191,  191,  191,  191,  191,  191,  191,  191,  191,
+
+      191,  191,  191,  191,  191,  191,  191,  191,  191,  191,
+      191,  191,  191,  191,  191,  191,  191,  191,  191,  191,
+      191,  191,  191,  191,  191,  191,  191,  191,  191,  191,
+      191,  191,  191,  191,  191,  191,  191,  191,  191,  191,
+      191,  191,  191,  191,  191,  191,  191,  191,  191,  191,
+      191,  191,  191,  191,  191,  191,  191,  191,  191,  191,
+      191,  191,  191,  191,  191,  191,  191,  191,  191,  191,
+      191,  191,  191,  191,  191,  191,  191,  191,  191,  191,
+      191,  191,  191,  191,  191,  191,    0,  187,  187,  187,
+      187,  187,  187,  187
+
+    } ;
+
+static yyconst flex_int16_t yy_nxt[326] =
+    {   0,
+       10,   11,   12,   11,   13,   14,   15,   16,   17,   15,
+       15,   15,   15,   15,   18,   19,   20,   15,   21,   15,
+       15,   22,   15,   15,   15,   23,   15,   24,   15,   25,
+       15,   15,   26,   15,   27,   28,   15,   29,   15,   15,
+       30,   15,   15,   15,   31,   15,   32,   15,   33,   15,
+       15,   34,   35,   37,   38,   39,   37,   38,   39,   42,
+       43,   42,   43,   44,   46,   44,   50,   52,   64,   54,
+       47,   56,   58,   60,   65,   71,   74,   75,   61,   44,
+       72,   44,   94,   48,   40,   51,   53,   40,   55,   49,
+       57,   59,   62,   74,   75,  186,  113,   63,  114,  186,
+
+      115,   95,  116,  127,  143,  128,  144,  145,  147,  146,
+      148,  153,  157,  154,  158,  159,  167,  160,  168,  175,
+      186,  185,  184,  183,  181,  182,  181,  181,  181,  180,
+      179,  178,  173,  172,  177,  174,  173,  172,  176,   36,
+       36,   36,   36,   36,   36,   41,   41,   41,   41,   41,
+       41,   26,   26,   26,   26,   26,   26,   45,   45,   73,
+       73,   73,  173,   73,   77,  172,   77,   77,   77,   77,
+       78,  171,  170,   78,   78,   78,  165,  164,  163,  169,
+      166,  165,  164,  165,  164,  165,  164,  163,  163,  162,
+      161,  156,  155,  152,  151,  138,  137,  150,  149,  132,
+
+      142,  141,  140,  139,  138,  137,  138,  137,  136,  135,
+      134,  132,  133,  132,  131,  130,  129,  126,  110,  125,
+      124,  123,  122,  121,  120,  119,  118,  117,  112,  111,
+      110,  110,  109,  108,  107,  106,   76,   96,  105,  104,
+      103,  102,  101,  100,   99,   98,   96,   97,   96,   93,
+       92,   91,   90,   89,   88,   87,   86,   85,   84,   83,
+       82,   81,   80,   79,   76,   70,   69,   68,   67,   66,
+      187,    9,  187,  187,  187,  187,  187,  187,  187,  187,
+      187,  187,  187,  187,  187,  187,  187,  187,  187,  187,
+      187,  187,  187,  187,  187,  187,  187,  187,  187,  187,
+
+      187,  187,  187,  187,  187,  187,  187,  187,  187,  187,
+      187,  187,  187,  187,  187,  187,  187,  187,  187,  187,
+      187,  187,  187,  187,  187
+    } ;
+
+static yyconst flex_int16_t yy_chk[326] =
+    {   0,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    3,    3,    3,    4,    4,    4,    5,
+        5,    6,    6,   11,   19,   11,   20,   21,   27,   22,
+       19,   23,   24,   25,   27,   33,   36,   36,   25,   44,
+       33,   44,   60,   19,    3,   20,   21,    4,   22,   19,
+       23,   24,   25,   73,   73,  185,   88,   25,   88,  184,
+
+       89,   60,   89,  102,  121,  102,  121,  122,  123,  122,
+      123,  131,  135,  131,  135,  136,  150,  136,  150,  162,
+      183,  182,  180,  179,  178,  177,  176,  175,  174,  171,
+      170,  169,  168,  167,  166,  161,  160,  159,  162,  188,
+      188,  188,  188,  188,  188,  189,  189,  189,  189,  189,
+      189,  190,  190,  190,  190,  190,  190,  191,  191,  192,
+      192,  192,  158,  192,  193,  157,  193,  193,  193,  193,
+      194,  156,  155,  194,  194,  194,  154,  153,  152,  151,
+      149,  148,  147,  146,  145,  144,  143,  142,  141,  140,
+      139,  134,  133,  130,  129,  128,  127,  126,  125,  124,
+
+      120,  119,  118,  117,  116,  115,  114,  113,  112,  111,
+      109,  108,  107,  106,  105,  104,  103,  101,  100,   99,
+       98,   97,   95,   94,   93,   92,   91,   90,   87,   86,
+       85,   84,   83,   82,   81,   80,   75,   72,   71,   70,
+       69,   68,   67,   66,   65,   64,   63,   62,   61,   59,
+       58,   57,   56,   55,   54,   53,   52,   51,   50,   49,
+       48,   47,   46,   43,   38,   32,   31,   30,   29,   28,
+        9,  187,  187,  187,  187,  187,  187,  187,  187,  187,
+      187,  187,  187,  187,  187,  187,  187,  187,  187,  187,
+      187,  187,  187,  187,  187,  187,  187,  187,  187,  187,
+
+      187,  187,  187,  187,  187,  187,  187,  187,  187,  187,
+      187,  187,  187,  187,  187,  187,  187,  187,  187,  187,
+      187,  187,  187,  187,  187
+    } ;
+
+static yy_state_type yy_last_accepting_state;
+static char *yy_last_accepting_cpos;
+
+extern int das_flex_debug;
+int das_flex_debug = 0;
+
+/* The intent behind this definition is that it'll catch
+ * any uses of REJECT which flex missed.
+ */
+#define REJECT reject_used_but_not_detected
+static int yy_more_flag = 0;
+static int yy_more_len = 0;
+#define yymore() ((yy_more_flag) = 1)
+#define YY_MORE_ADJ (yy_more_len)
+#define YY_RESTORE_YY_MORE_OFFSET
+char *dastext;
+#line 1 "das.lex"
+/*
+ -*- mode: c++; c-basic-offset:4 -*-
+
+ This file is part of libdap, A C++ implementation of the OPeNDAP Data
+ Access Protocol.
+
+ Copyright (c) 2002,2003 OPeNDAP, Inc.
+ Author: James Gallagher <jgallagher@opendap.org>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+ 
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+ 
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+ You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+ (c) COPYRIGHT URI/MIT 1994-2000
+*/ 
+/*
+   Scanner for the DAS. This file works with gnu's flex scanner generator. It
+   returns either ATTR, ID, VAL, TYPE or one of the single character tokens
+   `{', `}', `;', `,' or `\n' as integers. In the case of an ID or VAL, the
+   scanner stores a pointer to the lexeme in yylval (whose type is char *).
+
+   The scanner discards all comment text.
+
+   The scanner returns quoted strings as VALs. Any characters may appear in a
+   quoted string except backslash (\) and quote("). To include these escape
+   them with a backslash.
+   
+   The scanner is not reentrant, but can share name spaces with other
+   scanners.
+   
+   Note:
+   1) The `defines' file das.tab.h is built using `bison -d'.
+   2) Define YY_DECL such that the scanner is called `daslex'.
+   3) When bison builds the das.tab.h file, it uses `das' instead of `yy' for
+   variable name prefixes (e.g., yylval --> daslval).
+   4) The quote stuff is very complicated because we want backslash (\)
+   escapes to work and because we want line counts to work too. In order to
+   properly scan a quoted string two C functions are used: one to remove the
+   escape characters from escape sequences and one to remove the trailing
+   quote on the end of the string. 
+
+   jhrg 7/12/94 
+
+   NB: We don't remove the \'s or ending quotes any more -- that way the
+   printed das can be re-parsed. 9/28/94. 
+*/
+#line 63 "das.lex"
+#include "config_dap.h"
+
+#include <cstdio>
+
+static char rcsid[] not_used ={"$Id$"};
+
+#ifndef _MSC_VER
+#include <string.h>
+#else
+#include <string>
+#endif
+
+using namespace std;
+
+#include "debug.h"
+#include "parser.h"
+
+using namespace libdap ;
+
+#ifndef YY_PROTO
+#define YY_PROTO(proto) proto
+#endif
+
+/* These defines must precede the das.tab.h include. */
+#define YYSTYPE char *
+#define YY_DECL int daslex YY_PROTO(( void ))
+#define YY_FATAL_ERROR(msg) {\
+    throw(Error(string("Error scanning DAS object text: ") + string(msg))); \
+    yy_fatal_error(msg); /* This will never be run but putting it here removes a warning that the function is never used. */ \
+}
+
+#include "das.tab.hh"
+
+int das_line_num = 1;
+static int start_line;		/* used in quote and comment error handlers */
+
+#define YY_NO_INPUT 1
+
+
+
+/* Comment chars (#) are treated specially. Lets hope nobody wants to start
+   A variable name with one... Note that the DAS allows Identifiers to have 
+   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"
+
+#define INITIAL 0
+#define quote 1
+#define comment 2
+#define xml 3
+
+#ifndef YY_NO_UNISTD_H
+/* Special case for "unistd.h", since it is non-ANSI. We include it way
+ * down here because we want the user's section 1 to have been scanned first.
+ * The user has a chance to override it with an option.
+ */
+#include <unistd.h>
+#endif
+
+#ifndef YY_EXTRA_TYPE
+#define YY_EXTRA_TYPE void *
+#endif
+
+static int yy_init_globals (void );
+
+/* Accessor methods to globals.
+   These are made visible to non-reentrant scanners for convenience. */
+
+int daslex_destroy (void );
+
+int dasget_debug (void );
+
+void dasset_debug (int debug_flag  );
+
+YY_EXTRA_TYPE dasget_extra (void );
+
+void dasset_extra (YY_EXTRA_TYPE user_defined  );
+
+FILE *dasget_in (void );
+
+void dasset_in  (FILE * in_str  );
+
+FILE *dasget_out (void );
+
+void dasset_out  (FILE * out_str  );
+
+yy_size_t dasget_leng (void );
+
+char *dasget_text (void );
+
+int dasget_lineno (void );
+
+void dasset_lineno (int line_number  );
+
+/* Macros after this point can all be overridden by user definitions in
+ * section 1.
+ */
+
+#ifndef YY_SKIP_YYWRAP
+#ifdef __cplusplus
+extern "C" int daswrap (void );
+#else
+extern int daswrap (void );
+#endif
+#endif
+
+#ifndef yytext_ptr
+static void yy_flex_strncpy (char *,yyconst char *,int );
+#endif
+
+#ifdef YY_NEED_STRLEN
+static int yy_flex_strlen (yyconst char * );
+#endif
+
+#ifndef YY_NO_INPUT
+
+#ifdef __cplusplus
+static int yyinput (void );
+#else
+static int input (void );
+#endif
+
+#endif
+
+/* Amount of stuff to slurp up with each read. */
+#ifndef YY_READ_BUF_SIZE
+#define YY_READ_BUF_SIZE 8192
+#endif
+
+/* Copy whatever the last rule matched to the standard output. */
+#ifndef ECHO
+/* 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 )
+#endif
+
+/* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
+ * is returned in "result".
+ */
+#ifndef YY_INPUT
+#define YY_INPUT(buf,result,max_size) \
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
+		{ \
+		int c = '*'; \
+		yy_size_t n; \
+		for ( n = 0; n < max_size && \
+			     (c = getc( dasin )) != EOF && c != '\n'; ++n ) \
+			buf[n] = (char) c; \
+		if ( c == '\n' ) \
+			buf[n++] = (char) c; \
+		if ( c == EOF && ferror( dasin ) ) \
+			YY_FATAL_ERROR( "input in flex scanner failed" ); \
+		result = n; \
+		} \
+	else \
+		{ \
+		errno=0; \
+		while ( (result = fread(buf, 1, max_size, dasin))==0 && ferror(dasin)) \
+			{ \
+			if( errno != EINTR) \
+				{ \
+				YY_FATAL_ERROR( "input in flex scanner failed" ); \
+				break; \
+				} \
+			errno=0; \
+			clearerr(dasin); \
+			} \
+		}\
+\
+
+#endif
+
+/* No semi-colon after return; correct usage is to write "yyterminate();" -
+ * we don't want an extra ';' after the "return" because that will cause
+ * some compilers to complain about unreachable statements.
+ */
+#ifndef yyterminate
+#define yyterminate() return YY_NULL
+#endif
+
+/* Number of entries by which start-condition stack grows. */
+#ifndef YY_START_STACK_INCR
+#define YY_START_STACK_INCR 25
+#endif
+
+/* Report a fatal error. */
+#ifndef YY_FATAL_ERROR
+#define YY_FATAL_ERROR(msg) yy_fatal_error( msg )
+#endif
+
+/* end tables serialization structures and prototypes */
+
+/* Default declaration of generated scanner - a define so the user can
+ * easily add parameters.
+ */
+#ifndef YY_DECL
+#define YY_DECL_IS_OURS 1
+
+extern int daslex (void);
+
+#define YY_DECL int daslex (void)
+#endif /* !YY_DECL */
+
+/* Code executed at the beginning of each rule, after dastext and dasleng
+ * have been set up.
+ */
+#ifndef YY_USER_ACTION
+#define YY_USER_ACTION
+#endif
+
+/* Code executed at the end of each rule. */
+#ifndef YY_BREAK
+#define YY_BREAK break;
+#endif
+
+#define YY_RULE_SETUP \
+	YY_USER_ACTION
+
+/** The main scanner function which does all the work.
+ */
+YY_DECL
+{
+	register yy_state_type yy_current_state;
+	register char *yy_cp, *yy_bp;
+	register int yy_act;
+    
+#line 136 "das.lex"
+
+
+#line 902 "lex.das.cc"
+
+	if ( !(yy_init) )
+		{
+		(yy_init) = 1;
+
+#ifdef YY_USER_INIT
+		YY_USER_INIT;
+#endif
+
+		if ( ! (yy_start) )
+			(yy_start) = 1;	/* first start state */
+
+		if ( ! dasin )
+			dasin = stdin;
+
+		if ( ! dasout )
+			dasout = stdout;
+
+		if ( ! YY_CURRENT_BUFFER ) {
+			dasensure_buffer_stack ();
+			YY_CURRENT_BUFFER_LVALUE =
+				das_create_buffer(dasin,YY_BUF_SIZE );
+		}
+
+		das_load_buffer_state( );
+		}
+
+	while ( 1 )		/* loops until end-of-file is reached */
+		{
+		(yy_more_len) = 0;
+		if ( (yy_more_flag) )
+			{
+			(yy_more_len) = (yy_c_buf_p) - (yytext_ptr);
+			(yy_more_flag) = 0;
+			}
+		yy_cp = (yy_c_buf_p);
+
+		/* Support of dastext. */
+		*yy_cp = (yy_hold_char);
+
+		/* yy_bp points to the position in yy_ch_buf of the start of
+		 * the current run.
+		 */
+		yy_bp = yy_cp;
+
+		yy_current_state = (yy_start);
+yy_match:
+		do
+			{
+			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
+			if ( yy_accept[yy_current_state] )
+				{
+				(yy_last_accepting_state) = yy_current_state;
+				(yy_last_accepting_cpos) = yy_cp;
+				}
+			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+				{
+				yy_current_state = (int) yy_def[yy_current_state];
+				if ( yy_current_state >= 188 )
+					yy_c = yy_meta[(unsigned int) yy_c];
+				}
+			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+			++yy_cp;
+			}
+		while ( yy_base[yy_current_state] != 272 );
+
+yy_find_action:
+		yy_act = yy_accept[yy_current_state];
+		if ( yy_act == 0 )
+			{ /* have to back up */
+			yy_cp = (yy_last_accepting_cpos);
+			yy_current_state = (yy_last_accepting_state);
+			yy_act = yy_accept[yy_current_state];
+			}
+
+		YY_DO_BEFORE_ACTION;
+
+do_action:	/* This label is used only to access EOF actions. */
+
+		switch ( yy_act )
+	{ /* beginning of action switch */
+			case 0: /* must back up */
+			/* undo the effects of YY_DO_BEFORE_ACTION */
+			*yy_cp = (yy_hold_char);
+			yy_cp = (yy_last_accepting_cpos);
+			yy_current_state = (yy_last_accepting_state);
+			goto yy_find_action;
+
+case 1:
+YY_RULE_SETUP
+#line 138 "das.lex"
+daslval = dastext; return SCAN_ATTR;
+	YY_BREAK
+case 2:
+YY_RULE_SETUP
+#line 140 "das.lex"
+daslval = dastext; return SCAN_ALIAS;
+	YY_BREAK
+case 3:
+YY_RULE_SETUP
+#line 141 "das.lex"
+daslval = dastext; return SCAN_BYTE;
+	YY_BREAK
+case 4:
+YY_RULE_SETUP
+#line 142 "das.lex"
+daslval = dastext; return SCAN_INT16;
+	YY_BREAK
+case 5:
+YY_RULE_SETUP
+#line 143 "das.lex"
+daslval = dastext; return SCAN_UINT16;
+	YY_BREAK
+case 6:
+YY_RULE_SETUP
+#line 144 "das.lex"
+daslval = dastext; return SCAN_INT32;
+	YY_BREAK
+case 7:
+YY_RULE_SETUP
+#line 145 "das.lex"
+daslval = dastext; return SCAN_UINT32;
+	YY_BREAK
+case 8:
+YY_RULE_SETUP
+#line 146 "das.lex"
+daslval = dastext; return SCAN_FLOAT32;
+	YY_BREAK
+case 9:
+YY_RULE_SETUP
+#line 147 "das.lex"
+daslval = dastext; return SCAN_FLOAT64;
+	YY_BREAK
+case 10:
+YY_RULE_SETUP
+#line 148 "das.lex"
+daslval = dastext; return SCAN_STRING;
+	YY_BREAK
+case 11:
+YY_RULE_SETUP
+#line 149 "das.lex"
+daslval = dastext; return SCAN_URL;
+	YY_BREAK
+case 12:
+YY_RULE_SETUP
+#line 150 "das.lex"
+daslval = dastext; return SCAN_XML;
+	YY_BREAK
+case 13:
+YY_RULE_SETUP
+#line 152 "das.lex"
+{
+			    daslval = dastext; 
+			    DBG(cerr << "WORD: " << dastext << endl); 
+			    return SCAN_WORD;
+			}
+	YY_BREAK
+case 14:
+YY_RULE_SETUP
+#line 158 "das.lex"
+return (int)*dastext;
+	YY_BREAK
+case 15:
+YY_RULE_SETUP
+#line 159 "das.lex"
+return (int)*dastext;
+	YY_BREAK
+case 16:
+YY_RULE_SETUP
+#line 160 "das.lex"
+return (int)*dastext;
+	YY_BREAK
+case 17:
+YY_RULE_SETUP
+#line 161 "das.lex"
+return (int)*dastext;
+	YY_BREAK
+case 18:
+YY_RULE_SETUP
+#line 163 "das.lex"
+
+	YY_BREAK
+case 19:
+/* rule 19 can match eol */
+YY_RULE_SETUP
+#line 164 "das.lex"
+++das_line_num;
+	YY_BREAK
+case YY_STATE_EOF(INITIAL):
+#line 165 "das.lex"
+yy_init = 1; das_line_num = 1; yyterminate();
+	YY_BREAK
+case 20:
+YY_RULE_SETUP
+#line 167 "das.lex"
+BEGIN(comment);
+	YY_BREAK
+case 21:
+YY_RULE_SETUP
+#line 168 "das.lex"
+
+	YY_BREAK
+case 22:
+/* rule 22 can match eol */
+YY_RULE_SETUP
+#line 169 "das.lex"
+++das_line_num; BEGIN(INITIAL);
+	YY_BREAK
+case 23:
+/* rule 23 can match eol */
+YY_RULE_SETUP
+#line 170 "das.lex"
+++das_line_num; BEGIN(INITIAL);
+	YY_BREAK
+case YY_STATE_EOF(comment):
+#line 171 "das.lex"
+yy_init = 1; das_line_num = 1; yyterminate();
+	YY_BREAK
+case 24:
+YY_RULE_SETUP
+#line 173 "das.lex"
+BEGIN(quote); start_line = das_line_num; yymore();
+	YY_BREAK
+case 25:
+YY_RULE_SETUP
+#line 174 "das.lex"
+yymore();
+	YY_BREAK
+case 26:
+/* rule 26 can match eol */
+YY_RULE_SETUP
+#line 175 "das.lex"
+yymore(); ++das_line_num;
+	YY_BREAK
+case 27:
+/* rule 27 can match eol */
+YY_RULE_SETUP
+#line 176 "das.lex"
+yymore(); ++das_line_num;
+	YY_BREAK
+case 28:
+YY_RULE_SETUP
+#line 177 "das.lex"
+yymore();
+	YY_BREAK
+case 29:
+YY_RULE_SETUP
+#line 178 "das.lex"
+{ 
+                          BEGIN(INITIAL); 
+
+                          daslval = dastext;
+
+                          return SCAN_WORD;
+                        }
+	YY_BREAK
+case YY_STATE_EOF(quote):
+#line 185 "das.lex"
+{
+                          char msg[256];
+                          sprintf(msg,
+                                  "Unterminated quote (starts on line %d)\n",
+                                  start_line);
+                          YY_FATAL_ERROR(msg);
+                        }
+	YY_BREAK
+case 30:
+/* rule 30 can match eol */
+YY_RULE_SETUP
+#line 193 "das.lex"
+{
+                          if (dastext) {
+                            fprintf(stderr, "Character '%c' (%d) is not",
+                            	    *dastext, *dastext);
+                            fprintf(stderr, " allowed.");
+			  }
+			}
+	YY_BREAK
+case 31:
+YY_RULE_SETUP
+#line 200 "das.lex"
+ECHO;
+	YY_BREAK
+#line 1186 "lex.das.cc"
+case YY_STATE_EOF(xml):
+	yyterminate();
+
+	case YY_END_OF_BUFFER:
+		{
+		/* Amount of text matched not including the EOB char. */
+		int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1;
+
+		/* Undo the effects of YY_DO_BEFORE_ACTION. */
+		*yy_cp = (yy_hold_char);
+		YY_RESTORE_YY_MORE_OFFSET
+
+		if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
+			{
+			/* We're scanning a new file or input source.  It's
+			 * possible that this happened because the user
+			 * just pointed dasin at a new source and called
+			 * daslex().  If so, then we have to assure
+			 * consistency between YY_CURRENT_BUFFER and our
+			 * globals.  Here is the right place to do so, because
+			 * this is the first action (other than possibly a
+			 * back-up) that will match for the new input source.
+			 */
+			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+			YY_CURRENT_BUFFER_LVALUE->yy_input_file = dasin;
+			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
+			}
+
+		/* Note that here we test for yy_c_buf_p "<=" to the position
+		 * of the first EOB in the buffer, since yy_c_buf_p will
+		 * already have been incremented past the NUL character
+		 * (since all states make transitions on EOB to the
+		 * end-of-buffer state).  Contrast this with the test
+		 * in input().
+		 */
+		if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
+			{ /* This was really a NUL. */
+			yy_state_type yy_next_state;
+
+			(yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text;
+
+			yy_current_state = yy_get_previous_state(  );
+
+			/* Okay, we're now positioned to make the NUL
+			 * transition.  We couldn't have
+			 * yy_get_previous_state() go ahead and do it
+			 * for us because it doesn't know how to deal
+			 * with the possibility of jamming (and we don't
+			 * want to build jamming into it because then it
+			 * will run more slowly).
+			 */
+
+			yy_next_state = yy_try_NUL_trans( yy_current_state );
+
+			yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+
+			if ( yy_next_state )
+				{
+				/* Consume the NUL. */
+				yy_cp = ++(yy_c_buf_p);
+				yy_current_state = yy_next_state;
+				goto yy_match;
+				}
+
+			else
+				{
+				yy_cp = (yy_c_buf_p);
+				goto yy_find_action;
+				}
+			}
+
+		else switch ( yy_get_next_buffer(  ) )
+			{
+			case EOB_ACT_END_OF_FILE:
+				{
+				(yy_did_buffer_switch_on_eof) = 0;
+
+				if ( daswrap( ) )
+					{
+					/* Note: because we've taken care in
+					 * yy_get_next_buffer() to have set up
+					 * dastext, we can now set up
+					 * yy_c_buf_p so that if some total
+					 * hoser (like flex itself) wants to
+					 * call the scanner after we return the
+					 * YY_NULL, it'll still work - another
+					 * YY_NULL will get returned.
+					 */
+					(yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ;
+
+					yy_act = YY_STATE_EOF(YY_START);
+					goto do_action;
+					}
+
+				else
+					{
+					if ( ! (yy_did_buffer_switch_on_eof) )
+						YY_NEW_FILE;
+					}
+				break;
+				}
+
+			case EOB_ACT_CONTINUE_SCAN:
+				(yy_c_buf_p) =
+					(yytext_ptr) + yy_amount_of_matched_text;
+
+				yy_current_state = yy_get_previous_state(  );
+
+				yy_cp = (yy_c_buf_p);
+				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+				goto yy_match;
+
+			case EOB_ACT_LAST_MATCH:
+				(yy_c_buf_p) =
+				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)];
+
+				yy_current_state = yy_get_previous_state(  );
+
+				yy_cp = (yy_c_buf_p);
+				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+				goto yy_find_action;
+			}
+		break;
+		}
+
+	default:
+		YY_FATAL_ERROR(
+			"fatal flex scanner internal error--no action found" );
+	} /* end of action switch */
+		} /* end of scanning one token */
+} /* end of daslex */
+
+/* yy_get_next_buffer - try to read in a new buffer
+ *
+ * Returns a code representing an action:
+ *	EOB_ACT_LAST_MATCH -
+ *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position
+ *	EOB_ACT_END_OF_FILE - end of file
+ */
+static int yy_get_next_buffer (void)
+{
+    	register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
+	register char *source = (yytext_ptr);
+	register int number_to_move, i;
+	int ret_val;
+
+	if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
+		YY_FATAL_ERROR(
+		"fatal flex scanner internal error--end of buffer missed" );
+
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
+		{ /* Don't try to fill the buffer, so this is an EOF. */
+		if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 )
+			{
+			/* We matched a single character, the EOB, so
+			 * treat this as a final EOF.
+			 */
+			return EOB_ACT_END_OF_FILE;
+			}
+
+		else
+			{
+			/* We matched some text prior to the EOB, first
+			 * process it.
+			 */
+			return EOB_ACT_LAST_MATCH;
+			}
+		}
+
+	/* Try to read more data. */
+
+	/* First move last chars to start of buffer. */
+	number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
+
+	for ( i = 0; i < number_to_move; ++i )
+		*(dest++) = *(source++);
+
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
+		/* don't do the read, it's not guaranteed to return an EOF,
+		 * just force an EOF
+		 */
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0;
+
+	else
+		{
+			yy_size_t num_to_read =
+			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
+
+		while ( num_to_read <= 0 )
+			{ /* Not enough room in the buffer - grow it. */
+
+			/* just a shorter name for the current buffer */
+			YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
+
+			int yy_c_buf_p_offset =
+				(int) ((yy_c_buf_p) - b->yy_ch_buf);
+
+			if ( b->yy_is_our_buffer )
+				{
+				yy_size_t new_size = b->yy_buf_size * 2;
+
+				if ( new_size <= 0 )
+					b->yy_buf_size += b->yy_buf_size / 8;
+				else
+					b->yy_buf_size *= 2;
+
+				b->yy_ch_buf = (char *)
+					/* Include room in for 2 EOB chars. */
+					dasrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2  );
+				}
+			else
+				/* Can't grow it, we don't own it. */
+				b->yy_ch_buf = 0;
+
+			if ( ! b->yy_ch_buf )
+				YY_FATAL_ERROR(
+				"fatal error - scanner input buffer overflow" );
+
+			(yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset];
+
+			num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
+						number_to_move - 1;
+
+			}
+
+		if ( num_to_read > YY_READ_BUF_SIZE )
+			num_to_read = YY_READ_BUF_SIZE;
+
+		/* Read in more data. */
+		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
+			(yy_n_chars), num_to_read );
+
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		}
+
+	if ( (yy_n_chars) == 0 )
+		{
+		if ( number_to_move == YY_MORE_ADJ )
+			{
+			ret_val = EOB_ACT_END_OF_FILE;
+			dasrestart(dasin  );
+			}
+
+		else
+			{
+			ret_val = EOB_ACT_LAST_MATCH;
+			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
+				YY_BUFFER_EOF_PENDING;
+			}
+		}
+
+	else
+		ret_val = EOB_ACT_CONTINUE_SCAN;
+
+	if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
+		/* Extend the array by 50%, plus the number we really need. */
+		yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
+		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) dasrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size  );
+		if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
+			YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
+	}
+
+	(yy_n_chars) += number_to_move;
+	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;
+	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
+
+	(yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
+
+	return ret_val;
+}
+
+/* yy_get_previous_state - get the state just before the EOB char was reached */
+
+    static yy_state_type yy_get_previous_state (void)
+{
+	register yy_state_type yy_current_state;
+	register char *yy_cp;
+    
+	yy_current_state = (yy_start);
+
+	for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
+		{
+		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+		if ( yy_accept[yy_current_state] )
+			{
+			(yy_last_accepting_state) = yy_current_state;
+			(yy_last_accepting_cpos) = yy_cp;
+			}
+		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+			{
+			yy_current_state = (int) yy_def[yy_current_state];
+			if ( yy_current_state >= 188 )
+				yy_c = yy_meta[(unsigned int) yy_c];
+			}
+		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+		}
+
+	return yy_current_state;
+}
+
+/* yy_try_NUL_trans - try to make a transition on the NUL character
+ *
+ * synopsis
+ *	next_state = yy_try_NUL_trans( current_state );
+ */
+    static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
+{
+	register int yy_is_jam;
+    	register char *yy_cp = (yy_c_buf_p);
+
+	register YY_CHAR yy_c = 1;
+	if ( yy_accept[yy_current_state] )
+		{
+		(yy_last_accepting_state) = yy_current_state;
+		(yy_last_accepting_cpos) = yy_cp;
+		}
+	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+		{
+		yy_current_state = (int) yy_def[yy_current_state];
+		if ( yy_current_state >= 188 )
+			yy_c = yy_meta[(unsigned int) yy_c];
+		}
+	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+	yy_is_jam = (yy_current_state == 187);
+
+	return yy_is_jam ? 0 : yy_current_state;
+}
+
+#ifndef YY_NO_INPUT
+#ifdef __cplusplus
+    static int yyinput (void)
+#else
+    static int input  (void)
+#endif
+
+{
+	int c;
+    
+	*(yy_c_buf_p) = (yy_hold_char);
+
+	if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
+		{
+		/* yy_c_buf_p now points to the character we want to return.
+		 * If this occurs *before* the EOB characters, then it's a
+		 * valid NUL; if not, then we've hit the end of the buffer.
+		 */
+		if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
+			/* This was really a NUL. */
+			*(yy_c_buf_p) = '\0';
+
+		else
+			{ /* need more input */
+			yy_size_t offset = (yy_c_buf_p) - (yytext_ptr);
+			++(yy_c_buf_p);
+
+			switch ( yy_get_next_buffer(  ) )
+				{
+				case EOB_ACT_LAST_MATCH:
+					/* This happens because yy_g_n_b()
+					 * sees that we've accumulated a
+					 * token and flags that we need to
+					 * try matching the token before
+					 * proceeding.  But for input(),
+					 * there's no matching to consider.
+					 * So convert the EOB_ACT_LAST_MATCH
+					 * to EOB_ACT_END_OF_FILE.
+					 */
+
+					/* Reset buffer status. */
+					dasrestart(dasin );
+
+					/*FALLTHROUGH*/
+
+				case EOB_ACT_END_OF_FILE:
+					{
+					if ( daswrap( ) )
+						return 0;
+
+					if ( ! (yy_did_buffer_switch_on_eof) )
+						YY_NEW_FILE;
+#ifdef __cplusplus
+					return yyinput();
+#else
+					return input();
+#endif
+					}
+
+				case EOB_ACT_CONTINUE_SCAN:
+					(yy_c_buf_p) = (yytext_ptr) + offset;
+					break;
+				}
+			}
+		}
+
+	c = *(unsigned char *) (yy_c_buf_p);	/* cast for 8-bit char's */
+	*(yy_c_buf_p) = '\0';	/* preserve dastext */
+	(yy_hold_char) = *++(yy_c_buf_p);
+
+	return c;
+}
+#endif	/* ifndef YY_NO_INPUT */
+
+/** Immediately switch to a different input stream.
+ * @param input_file A readable stream.
+ * 
+ * @note This function does not reset the start condition to @c INITIAL .
+ */
+    void dasrestart  (FILE * input_file )
+{
+    
+	if ( ! YY_CURRENT_BUFFER ){
+        dasensure_buffer_stack ();
+		YY_CURRENT_BUFFER_LVALUE =
+            das_create_buffer(dasin,YY_BUF_SIZE );
+	}
+
+	das_init_buffer(YY_CURRENT_BUFFER,input_file );
+	das_load_buffer_state( );
+}
+
+/** Switch to a different input buffer.
+ * @param new_buffer The new input buffer.
+ * 
+ */
+    void das_switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
+{
+    
+	/* TODO. We should be able to replace this entire function body
+	 * with
+	 *		daspop_buffer_state();
+	 *		daspush_buffer_state(new_buffer);
+     */
+	dasensure_buffer_stack ();
+	if ( YY_CURRENT_BUFFER == new_buffer )
+		return;
+
+	if ( YY_CURRENT_BUFFER )
+		{
+		/* Flush out information for old buffer. */
+		*(yy_c_buf_p) = (yy_hold_char);
+		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		}
+
+	YY_CURRENT_BUFFER_LVALUE = new_buffer;
+	das_load_buffer_state( );
+
+	/* We don't actually know whether we did this switch during
+	 * EOF (daswrap()) processing, but the only time this flag
+	 * is looked at is after daswrap() is called, so it's safe
+	 * to go ahead and always set it.
+	 */
+	(yy_did_buffer_switch_on_eof) = 1;
+}
+
+static void das_load_buffer_state  (void)
+{
+    	(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+	(yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
+	dasin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
+	(yy_hold_char) = *(yy_c_buf_p);
+}
+
+/** Allocate and initialize an input buffer state.
+ * @param file A readable stream.
+ * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
+ * 
+ * @return the allocated buffer state.
+ */
+    YY_BUFFER_STATE das_create_buffer  (FILE * file, int  size )
+{
+	YY_BUFFER_STATE b;
+    
+	b = (YY_BUFFER_STATE) dasalloc(sizeof( struct yy_buffer_state )  );
+	if ( ! b )
+		YY_FATAL_ERROR( "out of dynamic memory in das_create_buffer()" );
+
+	b->yy_buf_size = size;
+
+	/* yy_ch_buf has to be 2 characters longer than the size given because
+	 * we need to put in 2 end-of-buffer characters.
+	 */
+	b->yy_ch_buf = (char *) dasalloc(b->yy_buf_size + 2  );
+	if ( ! b->yy_ch_buf )
+		YY_FATAL_ERROR( "out of dynamic memory in das_create_buffer()" );
+
+	b->yy_is_our_buffer = 1;
+
+	das_init_buffer(b,file );
+
+	return b;
+}
+
+/** Destroy the buffer.
+ * @param b a buffer created with das_create_buffer()
+ * 
+ */
+    void das_delete_buffer (YY_BUFFER_STATE  b )
+{
+    
+	if ( ! b )
+		return;
+
+	if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
+		YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
+
+	if ( b->yy_is_our_buffer )
+		dasfree((void *) b->yy_ch_buf  );
+
+	dasfree((void *) b  );
+}
+
+#ifndef __cplusplus
+extern int isatty (int );
+#endif /* __cplusplus */
+    
+/* Initializes or reinitializes a buffer.
+ * This function is sometimes called more than once on the same buffer,
+ * such as during a dasrestart() or at EOF.
+ */
+    static void das_init_buffer  (YY_BUFFER_STATE  b, FILE * file )
+
+{
+	int oerrno = errno;
+    
+	das_flush_buffer(b );
+
+	b->yy_input_file = file;
+	b->yy_fill_buffer = 1;
+
+    /* If b is the current buffer, then das_init_buffer was _probably_
+     * called from dasrestart() or through yy_get_next_buffer.
+     * In that case, we don't want to reset the lineno or column.
+     */
+    if (b != YY_CURRENT_BUFFER){
+        b->yy_bs_lineno = 1;
+        b->yy_bs_column = 0;
+    }
+
+        b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
+    
+	errno = oerrno;
+}
+
+/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
+ * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
+ * 
+ */
+    void das_flush_buffer (YY_BUFFER_STATE  b )
+{
+    	if ( ! b )
+		return;
+
+	b->yy_n_chars = 0;
+
+	/* We always need two end-of-buffer characters.  The first causes
+	 * a transition to the end-of-buffer state.  The second causes
+	 * a jam in that state.
+	 */
+	b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;
+	b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
+
+	b->yy_buf_pos = &b->yy_ch_buf[0];
+
+	b->yy_at_bol = 1;
+	b->yy_buffer_status = YY_BUFFER_NEW;
+
+	if ( b == YY_CURRENT_BUFFER )
+		das_load_buffer_state( );
+}
+
+/** Pushes the new state onto the stack. The new state becomes
+ *  the current state. This function will allocate the stack
+ *  if necessary.
+ *  @param new_buffer The new state.
+ *  
+ */
+void daspush_buffer_state (YY_BUFFER_STATE new_buffer )
+{
+    	if (new_buffer == NULL)
+		return;
+
+	dasensure_buffer_stack();
+
+	/* This block is copied from das_switch_to_buffer. */
+	if ( YY_CURRENT_BUFFER )
+		{
+		/* Flush out information for old buffer. */
+		*(yy_c_buf_p) = (yy_hold_char);
+		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		}
+
+	/* Only push if top exists. Otherwise, replace top. */
+	if (YY_CURRENT_BUFFER)
+		(yy_buffer_stack_top)++;
+	YY_CURRENT_BUFFER_LVALUE = new_buffer;
+
+	/* copied from das_switch_to_buffer. */
+	das_load_buffer_state( );
+	(yy_did_buffer_switch_on_eof) = 1;
+}
+
+/** Removes and deletes the top of the stack, if present.
+ *  The next element becomes the new top.
+ *  
+ */
+void daspop_buffer_state (void)
+{
+    	if (!YY_CURRENT_BUFFER)
+		return;
+
+	das_delete_buffer(YY_CURRENT_BUFFER );
+	YY_CURRENT_BUFFER_LVALUE = NULL;
+	if ((yy_buffer_stack_top) > 0)
+		--(yy_buffer_stack_top);
+
+	if (YY_CURRENT_BUFFER) {
+		das_load_buffer_state( );
+		(yy_did_buffer_switch_on_eof) = 1;
+	}
+}
+
+/* Allocates the stack if it does not exist.
+ *  Guarantees space for at least one push.
+ */
+static void dasensure_buffer_stack (void)
+{
+	yy_size_t num_to_alloc;
+    
+	if (!(yy_buffer_stack)) {
+
+		/* First allocation is just for 2 elements, since we don't know if this
+		 * scanner will even need a stack. We use 2 instead of 1 to avoid an
+		 * immediate realloc on the next call.
+         */
+		num_to_alloc = 1;
+		(yy_buffer_stack) = (struct yy_buffer_state**)dasalloc
+								(num_to_alloc * sizeof(struct yy_buffer_state*)
+								);
+		if ( ! (yy_buffer_stack) )
+			YY_FATAL_ERROR( "out of dynamic memory in dasensure_buffer_stack()" );
+								  
+		memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
+				
+		(yy_buffer_stack_max) = num_to_alloc;
+		(yy_buffer_stack_top) = 0;
+		return;
+	}
+
+	if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
+
+		/* Increase the buffer to prepare for a possible push. */
+		int grow_size = 8 /* arbitrary grow size */;
+
+		num_to_alloc = (yy_buffer_stack_max) + grow_size;
+		(yy_buffer_stack) = (struct yy_buffer_state**)dasrealloc
+								((yy_buffer_stack),
+								num_to_alloc * sizeof(struct yy_buffer_state*)
+								);
+		if ( ! (yy_buffer_stack) )
+			YY_FATAL_ERROR( "out of dynamic memory in dasensure_buffer_stack()" );
+
+		/* zero only the new slots.*/
+		memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
+		(yy_buffer_stack_max) = num_to_alloc;
+	}
+}
+
+/** Setup the input buffer state to scan directly from a user-specified character buffer.
+ * @param base the character buffer
+ * @param size the size in bytes of the character buffer
+ * 
+ * @return the newly allocated buffer state object. 
+ */
+YY_BUFFER_STATE das_scan_buffer  (char * base, yy_size_t  size )
+{
+	YY_BUFFER_STATE b;
+    
+	if ( size < 2 ||
+	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
+	     base[size-1] != YY_END_OF_BUFFER_CHAR )
+		/* They forgot to leave room for the EOB's. */
+		return 0;
+
+	b = (YY_BUFFER_STATE) dasalloc(sizeof( struct yy_buffer_state )  );
+	if ( ! b )
+		YY_FATAL_ERROR( "out of dynamic memory in das_scan_buffer()" );
+
+	b->yy_buf_size = size - 2;	/* "- 2" to take care of EOB's */
+	b->yy_buf_pos = b->yy_ch_buf = base;
+	b->yy_is_our_buffer = 0;
+	b->yy_input_file = 0;
+	b->yy_n_chars = b->yy_buf_size;
+	b->yy_is_interactive = 0;
+	b->yy_at_bol = 1;
+	b->yy_fill_buffer = 0;
+	b->yy_buffer_status = YY_BUFFER_NEW;
+
+	das_switch_to_buffer(b  );
+
+	return b;
+}
+
+/** Setup the input buffer state to scan a string. The next call to daslex() will
+ * scan from a @e copy of @a str.
+ * @param yystr a NUL-terminated string to scan
+ * 
+ * @return the newly allocated buffer state object.
+ * @note If you want to scan bytes that may contain NUL values, then use
+ *       das_scan_bytes() instead.
+ */
+YY_BUFFER_STATE das_scan_string (yyconst char * yystr )
+{
+    
+	return das_scan_bytes(yystr,strlen(yystr) );
+}
+
+/** Setup the input buffer state to scan the given bytes. The next call to daslex() will
+ * scan from a @e copy of @a bytes.
+ * @param bytes the byte buffer to scan
+ * @param len the number of bytes in the buffer pointed to by @a bytes.
+ * 
+ * @return the newly allocated buffer state object.
+ */
+YY_BUFFER_STATE das_scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes_len )
+{
+	YY_BUFFER_STATE b;
+	char *buf;
+	yy_size_t n, i;
+    
+	/* Get memory for full buffer, including space for trailing EOB's. */
+	n = _yybytes_len + 2;
+	buf = (char *) dasalloc(n  );
+	if ( ! buf )
+		YY_FATAL_ERROR( "out of dynamic memory in das_scan_bytes()" );
+
+	for ( i = 0; i < _yybytes_len; ++i )
+		buf[i] = yybytes[i];
+
+	buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
+
+	b = das_scan_buffer(buf,n );
+	if ( ! b )
+		YY_FATAL_ERROR( "bad buffer in das_scan_bytes()" );
+
+	/* It's okay to grow etc. this buffer, and we should throw it
+	 * away when we're done.
+	 */
+	b->yy_is_our_buffer = 1;
+
+	return b;
+}
+
+#ifndef YY_EXIT_FAILURE
+#define YY_EXIT_FAILURE 2
+#endif
+
+static void yy_fatal_error (yyconst char* msg )
+{
+    	(void) fprintf( stderr, "%s\n", msg );
+	exit( YY_EXIT_FAILURE );
+}
+
+/* Redefine yyless() so it works in section 3 code. */
+
+#undef yyless
+#define yyless(n) \
+	do \
+		{ \
+		/* Undo effects of setting up dastext. */ \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+		dastext[dasleng] = (yy_hold_char); \
+		(yy_c_buf_p) = dastext + yyless_macro_arg; \
+		(yy_hold_char) = *(yy_c_buf_p); \
+		*(yy_c_buf_p) = '\0'; \
+		dasleng = yyless_macro_arg; \
+		} \
+	while ( 0 )
+
+/* Accessor  methods (get/set functions) to struct members. */
+
+/** Get the current line number.
+ * 
+ */
+int dasget_lineno  (void)
+{
+        
+    return daslineno;
+}
+
+/** Get the input stream.
+ * 
+ */
+FILE *dasget_in  (void)
+{
+        return dasin;
+}
+
+/** Get the output stream.
+ * 
+ */
+FILE *dasget_out  (void)
+{
+        return dasout;
+}
+
+/** Get the length of the current token.
+ * 
+ */
+yy_size_t dasget_leng  (void)
+{
+        return dasleng;
+}
+
+/** Get the current token.
+ * 
+ */
+
+char *dasget_text  (void)
+{
+        return dastext;
+}
+
+/** Set the current line number.
+ * @param line_number
+ * 
+ */
+void dasset_lineno (int  line_number )
+{
+    
+    daslineno = line_number;
+}
+
+/** Set the input stream. This does not discard the current
+ * input buffer.
+ * @param in_str A readable stream.
+ * 
+ * @see das_switch_to_buffer
+ */
+void dasset_in (FILE *  in_str )
+{
+        dasin = in_str ;
+}
+
+void dasset_out (FILE *  out_str )
+{
+        dasout = out_str ;
+}
+
+int dasget_debug  (void)
+{
+        return das_flex_debug;
+}
+
+void dasset_debug (int  bdebug )
+{
+        das_flex_debug = bdebug ;
+}
+
+static int yy_init_globals (void)
+{
+        /* Initialization is the same as for the non-reentrant scanner.
+     * This function is called from daslex_destroy(), so don't allocate here.
+     */
+
+    (yy_buffer_stack) = 0;
+    (yy_buffer_stack_top) = 0;
+    (yy_buffer_stack_max) = 0;
+    (yy_c_buf_p) = (char *) 0;
+    (yy_init) = 0;
+    (yy_start) = 0;
+
+/* Defined in main.c */
+#ifdef YY_STDINIT
+    dasin = stdin;
+    dasout = stdout;
+#else
+    dasin = (FILE *) 0;
+    dasout = (FILE *) 0;
+#endif
+
+    /* For future reference: Set errno on error, since we are called by
+     * daslex_init()
+     */
+    return 0;
+}
+
+/* daslex_destroy is for both reentrant and non-reentrant scanners. */
+int daslex_destroy  (void)
+{
+    
+    /* Pop the buffer stack, destroying each element. */
+	while(YY_CURRENT_BUFFER){
+		das_delete_buffer(YY_CURRENT_BUFFER  );
+		YY_CURRENT_BUFFER_LVALUE = NULL;
+		daspop_buffer_state();
+	}
+
+	/* Destroy the stack itself. */
+	dasfree((yy_buffer_stack) );
+	(yy_buffer_stack) = NULL;
+
+    /* Reset the globals. This is important in a non-reentrant scanner so the next time
+     * daslex() is called, initialization will occur. */
+    yy_init_globals( );
+
+    return 0;
+}
+
+/*
+ * Internal utility routines.
+ */
+
+#ifndef yytext_ptr
+static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
+{
+	register int i;
+	for ( i = 0; i < n; ++i )
+		s1[i] = s2[i];
+}
+#endif
+
+#ifdef YY_NEED_STRLEN
+static int yy_flex_strlen (yyconst char * s )
+{
+	register int n;
+	for ( n = 0; s[n]; ++n )
+		;
+
+	return n;
+}
+#endif
+
+void *dasalloc (yy_size_t  size )
+{
+	return (void *) malloc( size );
+}
+
+void *dasrealloc  (void * ptr, yy_size_t  size )
+{
+	/* The cast to (char *) in the following accommodates both
+	 * implementations that use char* generic pointers, and those
+	 * that use void* generic pointers.  It works with the latter
+	 * because both ANSI C and C++ allow castless assignment from
+	 * any pointer type to void*, and deal with argument conversions
+	 * as though doing an assignment.
+	 */
+	return (void *) realloc( (char *) ptr, size );
+}
+
+void dasfree (void * ptr )
+{
+	free( (char *) ptr );	/* see dasrealloc() for (char *) cast */
+}
+
+#define YYTABLES_NAME "yytables"
+
+#line 200 "das.lex"
+
+
+
+// These three glue routines enable DDS to reclaim the memory used to parse a
+// DDS off the wire. They are here because this file can see the YY_*
+// symbols; the file DDS.cc cannot.
+
+void *
+das_buffer(FILE *fp)
+{
+    return (void *)das_create_buffer(fp, YY_BUF_SIZE);
+}
+
+void
+das_switch_to_buffer(void *buf)
+{
+    das_switch_to_buffer((YY_BUFFER_STATE)buf);
+}
+
+void
+das_delete_buffer(void *buf)
+{
+    das_delete_buffer((YY_BUFFER_STATE)buf);
+}
+
+
diff --git a/lex.dds.cc b/lex.dds.cc
new file mode 100644
index 0000000..f02a51b
--- /dev/null
+++ b/lex.dds.cc
@@ -0,0 +1,2119 @@
+#line 2 "lex.dds.cc"
+
+#line 4 "lex.dds.cc"
+
+#define  YY_INT_ALIGNED short int
+
+/* A lexical scanner generated by flex */
+
+#define yy_create_buffer dds_create_buffer
+#define yy_delete_buffer dds_delete_buffer
+#define yy_flex_debug dds_flex_debug
+#define yy_init_buffer dds_init_buffer
+#define yy_flush_buffer dds_flush_buffer
+#define yy_load_buffer_state dds_load_buffer_state
+#define yy_switch_to_buffer dds_switch_to_buffer
+#define yyin ddsin
+#define yyleng ddsleng
+#define yylex ddslex
+#define yylineno ddslineno
+#define yyout ddsout
+#define yyrestart ddsrestart
+#define yytext ddstext
+#define yywrap ddswrap
+#define yyalloc ddsalloc
+#define yyrealloc ddsrealloc
+#define yyfree ddsfree
+
+#define FLEX_SCANNER
+#define YY_FLEX_MAJOR_VERSION 2
+#define YY_FLEX_MINOR_VERSION 5
+#define YY_FLEX_SUBMINOR_VERSION 35
+#if YY_FLEX_SUBMINOR_VERSION > 0
+#define FLEX_BETA
+#endif
+
+/* First, we deal with  platform-specific or compiler-specific issues. */
+
+/* begin standard C headers. */
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <stdlib.h>
+
+/* end standard C headers. */
+
+/* flex integer type definitions */
+
+#ifndef FLEXINT_H
+#define FLEXINT_H
+
+/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
+
+#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+
+/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
+ * if you want the limit (max/min) macros for int types. 
+ */
+#ifndef __STDC_LIMIT_MACROS
+#define __STDC_LIMIT_MACROS 1
+#endif
+
+#include <inttypes.h>
+typedef int8_t flex_int8_t;
+typedef uint8_t flex_uint8_t;
+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;
+typedef int flex_int32_t;
+typedef unsigned char flex_uint8_t; 
+typedef unsigned short int flex_uint16_t;
+typedef unsigned int flex_uint32_t;
+#endif /* ! C99 */
+
+/* Limits of integral types. */
+#ifndef INT8_MIN
+#define INT8_MIN               (-128)
+#endif
+#ifndef INT16_MIN
+#define INT16_MIN              (-32767-1)
+#endif
+#ifndef INT32_MIN
+#define INT32_MIN              (-2147483647-1)
+#endif
+#ifndef INT8_MAX
+#define INT8_MAX               (127)
+#endif
+#ifndef INT16_MAX
+#define INT16_MAX              (32767)
+#endif
+#ifndef INT32_MAX
+#define INT32_MAX              (2147483647)
+#endif
+#ifndef UINT8_MAX
+#define UINT8_MAX              (255U)
+#endif
+#ifndef UINT16_MAX
+#define UINT16_MAX             (65535U)
+#endif
+#ifndef UINT32_MAX
+#define UINT32_MAX             (4294967295U)
+#endif
+
+#endif /* ! FLEXINT_H */
+
+#ifdef __cplusplus
+
+/* The "const" storage-class-modifier is valid. */
+#define YY_USE_CONST
+
+#else	/* ! __cplusplus */
+
+/* C99 requires __STDC__ to be defined as 1. */
+#if defined (__STDC__)
+
+#define YY_USE_CONST
+
+#endif	/* defined (__STDC__) */
+#endif	/* ! __cplusplus */
+
+#ifdef YY_USE_CONST
+#define yyconst const
+#else
+#define yyconst
+#endif
+
+/* Returned upon end-of-file. */
+#define YY_NULL 0
+
+/* Promotes a possibly negative, possibly signed char to an unsigned
+ * integer for use as an array index.  If the signed char is negative,
+ * we want to instead treat it as an 8-bit unsigned char, hence the
+ * double cast.
+ */
+#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
+
+/* Enter a start condition.  This macro really ought to take a parameter,
+ * but we do it the disgusting crufty way forced on us by the ()-less
+ * definition of BEGIN.
+ */
+#define BEGIN (yy_start) = 1 + 2 *
+
+/* Translate the current start state into a value that can be later handed
+ * to BEGIN to return to the state.  The YYSTATE alias is for lex
+ * compatibility.
+ */
+#define YY_START (((yy_start) - 1) / 2)
+#define YYSTATE YY_START
+
+/* Action number for EOF rule of a given start state. */
+#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
+
+/* Special action meaning "start processing a new file". */
+#define YY_NEW_FILE ddsrestart(ddsin  )
+
+#define YY_END_OF_BUFFER_CHAR 0
+
+/* Size of default input buffer. */
+#ifndef YY_BUF_SIZE
+#define YY_BUF_SIZE 16384
+#endif
+
+/* The state buf must be large enough to hold one state per character in the main buffer.
+ */
+#define YY_STATE_BUF_SIZE   ((YY_BUF_SIZE + 2) * sizeof(yy_state_type))
+
+#ifndef YY_TYPEDEF_YY_BUFFER_STATE
+#define YY_TYPEDEF_YY_BUFFER_STATE
+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 FILE *ddsin, *ddsout;
+
+#define EOB_ACT_CONTINUE_SCAN 0
+#define EOB_ACT_END_OF_FILE 1
+#define EOB_ACT_LAST_MATCH 2
+
+    #define YY_LESS_LINENO(n)
+    
+/* Return all but the first "n" matched characters back to the input stream. */
+#define yyless(n) \
+	do \
+		{ \
+		/* Undo effects of setting up ddstext. */ \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+		*yy_cp = (yy_hold_char); \
+		YY_RESTORE_YY_MORE_OFFSET \
+		(yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
+		YY_DO_BEFORE_ACTION; /* set up ddstext again */ \
+		} \
+	while ( 0 )
+
+#define unput(c) yyunput( c, (yytext_ptr)  )
+
+#ifndef YY_STRUCT_YY_BUFFER_STATE
+#define YY_STRUCT_YY_BUFFER_STATE
+struct yy_buffer_state
+	{
+	FILE *yy_input_file;
+
+	char *yy_ch_buf;		/* input buffer */
+	char *yy_buf_pos;		/* current position in input buffer */
+
+	/* Size of input buffer in bytes, not including room for EOB
+	 * characters.
+	 */
+	yy_size_t yy_buf_size;
+
+	/* Number of characters read into yy_ch_buf, not including EOB
+	 * characters.
+	 */
+	yy_size_t 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
+	 * delete it.
+	 */
+	int yy_is_our_buffer;
+
+	/* Whether this is an "interactive" input source; if so, and
+	 * if we're using stdio for input, then we want to use getc()
+	 * instead of fread(), to make sure we stop fetching input after
+	 * each newline.
+	 */
+	int yy_is_interactive;
+
+	/* Whether we're considered to be at the beginning of a line.
+	 * If so, '^' rules will be active on the next match, otherwise
+	 * not.
+	 */
+	int yy_at_bol;
+
+    int yy_bs_lineno; /**< The line count. */
+    int yy_bs_column; /**< The column count. */
+    
+	/* Whether to try to fill the input buffer when we reach the
+	 * end of it.
+	 */
+	int yy_fill_buffer;
+
+	int yy_buffer_status;
+
+#define YY_BUFFER_NEW 0
+#define YY_BUFFER_NORMAL 1
+	/* When an EOF's been seen but there's still some text to process
+	 * then we mark the buffer as YY_EOF_PENDING, to indicate that we
+	 * shouldn't try reading from the input source any more.  We might
+	 * still have a bunch of tokens to match, though, because of
+	 * possible backing-up.
+	 *
+	 * When we actually see the EOF, we change the status to "new"
+	 * (via ddsrestart()), so that the user can continue scanning by
+	 * just pointing ddsin at a new input file.
+	 */
+#define YY_BUFFER_EOF_PENDING 2
+
+	};
+#endif /* !YY_STRUCT_YY_BUFFER_STATE */
+
+/* Stack of input buffers. */
+static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
+static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
+static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
+
+/* We provide macros for accessing buffer states in case in the
+ * future we want to put the buffer states in a more general
+ * "scanner state".
+ *
+ * Returns the top of the stack, or NULL.
+ */
+#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
+                          ? (yy_buffer_stack)[(yy_buffer_stack_top)] \
+                          : NULL)
+
+/* Same as previous macro, but useful when we know that the buffer stack is not
+ * NULL or when we need an lvalue. For internal use only.
+ */
+#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)]
+
+/* 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;
+
+/* Points to current character in buffer. */
+static char *yy_c_buf_p = (char *) 0;
+static int yy_init = 0;		/* whether we need to initialize */
+static int yy_start = 0;	/* start state number */
+
+/* Flag which is used to allow ddswrap()'s to do buffer switches
+ * instead of setting up a fresh ddsin.  A bit of a hack ...
+ */
+static int yy_did_buffer_switch_on_eof;
+
+void ddsrestart (FILE *input_file  );
+void dds_switch_to_buffer (YY_BUFFER_STATE new_buffer  );
+YY_BUFFER_STATE dds_create_buffer (FILE *file,int size  );
+void dds_delete_buffer (YY_BUFFER_STATE b  );
+void dds_flush_buffer (YY_BUFFER_STATE b  );
+void ddspush_buffer_state (YY_BUFFER_STATE new_buffer  );
+void ddspop_buffer_state (void );
+
+static void ddsensure_buffer_stack (void );
+static void dds_load_buffer_state (void );
+static void dds_init_buffer (YY_BUFFER_STATE b,FILE *file  );
+
+#define YY_FLUSH_BUFFER dds_flush_buffer(YY_CURRENT_BUFFER )
+
+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  );
+
+void *ddsalloc (yy_size_t  );
+void *ddsrealloc (void *,yy_size_t  );
+void ddsfree (void *  );
+
+#define yy_new_buffer dds_create_buffer
+
+#define yy_set_interactive(is_interactive) \
+	{ \
+	if ( ! YY_CURRENT_BUFFER ){ \
+        ddsensure_buffer_stack (); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            dds_create_buffer(ddsin,YY_BUF_SIZE ); \
+	} \
+	YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
+	}
+
+#define yy_set_bol(at_bol) \
+	{ \
+	if ( ! YY_CURRENT_BUFFER ){\
+        ddsensure_buffer_stack (); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            dds_create_buffer(ddsin,YY_BUF_SIZE ); \
+	} \
+	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
+	}
+
+#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
+
+/* Begin user sect3 */
+
+#define ddswrap(n) 1
+#define YY_SKIP_YYWRAP
+
+typedef unsigned char YY_CHAR;
+
+FILE *ddsin = (FILE *) 0, *ddsout = (FILE *) 0;
+
+typedef int yy_state_type;
+
+extern int ddslineno;
+
+int ddslineno = 1;
+
+extern char *ddstext;
+#define yytext_ptr ddstext
+
+static yy_state_type yy_get_previous_state (void );
+static yy_state_type yy_try_NUL_trans (yy_state_type current_state  );
+static int yy_get_next_buffer (void );
+static void yy_fatal_error (yyconst char msg[]  );
+
+/* Done after the current pattern has been matched and before the
+ * corresponding action - sets up ddstext.
+ */
+#define YY_DO_BEFORE_ACTION \
+	(yytext_ptr) = yy_bp; \
+	ddsleng = (yy_size_t) (yy_cp - yy_bp); \
+	(yy_hold_char) = *yy_cp; \
+	*yy_cp = '\0'; \
+	(yy_c_buf_p) = yy_cp;
+
+#define YY_NUM_RULES 31
+#define YY_END_OF_BUFFER 32
+/* This struct is not used in this scanner,
+   but its presence is necessary. */
+struct yy_trans_info
+	{
+	flex_int32_t yy_verify;
+	flex_int32_t yy_nxt;
+	};
+static yyconst flex_int16_t yy_accept[185] =
+    {   0,
+        0,    0,   26,   26,   32,   30,   23,   24,   25,   22,
+       31,   22,    5,    6,    7,   22,   22,   22,   22,   22,
+       22,   22,   22,    3,    4,   22,   22,   22,   22,   22,
+       22,   22,   22,    1,    2,   26,   27,   23,   22,   22,
+       22,   22,   22,   22,   22,   22,   22,   22,   22,   22,
+       22,   22,   22,   22,   22,   22,   22,   22,   22,   22,
+       22,   22,   22,   22,   22,   22,   22,   22,   26,   22,
+       22,   22,   22,   22,   22,   22,   22,   22,   22,   22,
+       22,   22,   22,   22,   22,   22,   22,   21,   22,   22,
+       22,   22,   22,   22,   22,   22,   22,   13,   22,   22,
+
+       22,   22,   12,   22,   22,   22,   22,    9,   22,   22,
+       22,   22,   22,   22,   22,   22,   22,   22,   22,   22,
+       22,   22,   22,   22,   22,    0,   22,   22,   22,   14,
+       16,   22,   22,   22,   22,   22,   22,   22,   22,   22,
+       22,   22,   22,   22,   22,   22,   22,   22,   22,   28,
+        0,   22,   22,   22,   22,   22,   22,   20,   22,   22,
+       22,   15,   17,   22,   22,   22,   22,   22,    8,   29,
+       18,   19,   22,   22,   22,   22,   22,   22,   10,   22,
+       22,   22,   11,    0
+    } ;
+
+static yyconst flex_int32_t yy_ec[256] =
+    {   0,
+        1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
+        1,    1,    4,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    2,    1,    1,    5,    1,    6,    1,    1,    7,
+        7,    8,    6,    7,    6,    6,    6,    6,    9,   10,
+       11,   12,    6,   13,    6,    6,    6,   14,   15,    1,
+       16,    1,    1,    1,   17,   18,   19,   20,   21,   22,
+       23,    6,   24,    6,    6,   25,    6,   26,   27,    6,
+       28,   29,   30,   31,   32,    6,    6,    6,   33,    6,
+       34,    6,   35,    1,    6,    1,   36,   37,   38,   39,
+
+       40,   41,   42,    6,   43,    6,    6,   44,    6,   45,
+       46,    6,   47,   48,   49,   50,   51,    6,    6,    6,
+       52,    6,   53,    1,   54,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1
+    } ;
+
+static yyconst flex_int32_t yy_meta[55] =
+    {   0,
+        1,    1,    2,    1,    3,    3,    1,    3,    3,    3,
+        3,    3,    3,    1,    1,    1,    3,    3,    3,    3,
+        3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
+        3,    3,    3,    1,    1,    3,    3,    3,    3,    3,
+        3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
+        3,    3,    1,    1
+    } ;
+
+static yyconst flex_int16_t yy_base[188] =
+    {   0,
+        0,    0,  235,  234,  236,  239,   53,  239,  239,    0,
+      239,    0,  239,  239,  239,   23,   41,   34,   31,   35,
+       38,   42,   40,  239,  239,  183,  198,  189,  184,  186,
+      187,   26,   22,  239,  239,    0,  239,   70,    0,  198,
+      178,  196,  176,  198,  178,  199,  179,  190,  170,  189,
+      169,  189,  187,  168,  166,   41,  188,  168,  161,  160,
+      163,  165,  157,  157,  158,  156,  158,  158,    0,  180,
+      160,  182,  162,  180,  160,  175,  155,   74,   78,  162,
+      142,  159,   66,  139,   48,  158,  138,    0,  147,  150,
+      149,  145,   84,  133,  131,   51,  131,    0,  150,   54,
+
+      148,  128,    0,  164,  166,  162,  164,    0,  152,  146,
+      152,  130,  124,  130,   95,   96,  118,  116,  152,  154,
+      123,  117,  123,   99,  139,   93,  119,   98,  101,    0,
+        0,  132,  134,  125,  110,  112,  103,  139,  141,  137,
+      139,  108,  102,  102,  104,   95,  131,  133,  111,  239,
+      138,   90,  129,  126,  127,  124,  116,    0,  102,   95,
+       81,    0,    0,   81,  120,  117,   90,   76,    0,  239,
+        0,    0,  105,   96,   84,   75,   82,   72,    0,   80,
+       60,   44,    0,  239,  115,   68,  118
+    } ;
+
+static yyconst flex_int16_t yy_def[188] =
+    {   0,
+      184,    1,  185,  185,  184,  184,  184,  184,  184,  186,
+      184,  186,  184,  184,  184,  186,  186,  186,  186,  186,
+      186,  186,  186,  184,  184,  186,  186,  186,  186,  186,
+      186,  186,  186,  184,  184,  187,  184,  184,  186,  186,
+      186,  186,  186,  186,  186,  186,  186,  186,  186,  186,
+      186,  186,  186,  186,  186,  186,  186,  186,  186,  186,
+      186,  186,  186,  186,  186,  186,  186,  186,  187,  186,
+      186,  186,  186,  186,  186,  186,  186,  186,  186,  186,
+      186,  186,  186,  186,  186,  186,  186,  186,  186,  186,
+      186,  186,  186,  186,  186,  186,  186,  186,  186,  186,
+
+      186,  186,  186,  186,  186,  186,  186,  186,  186,  186,
+      186,  186,  186,  186,  186,  186,  186,  186,  186,  186,
+      186,  186,  186,  186,  186,  184,  186,  186,  186,  186,
+      186,  186,  186,  186,  186,  186,  186,  186,  186,  186,
+      186,  186,  186,  186,  186,  186,  186,  186,  186,  184,
+      184,  186,  186,  186,  186,  186,  186,  186,  186,  186,
+      186,  186,  186,  186,  186,  186,  186,  186,  186,  184,
+      186,  186,  186,  186,  186,  186,  186,  186,  186,  186,
+      186,  186,  186,    0,  184,  184,  184
+    } ;
+
+static yyconst flex_int16_t yy_nxt[294] =
+    {   0,
+        6,    7,    8,    7,    9,   10,   11,   12,   10,   10,
+       10,   10,   10,   13,   14,   15,   10,   16,   10,   17,
+       10,   18,   19,   20,   21,   10,   10,   10,   10,   22,
+       10,   23,   10,   24,   25,   10,   26,   10,   27,   10,
+       28,   29,   30,   31,   10,   10,   10,   10,   32,   10,
+       33,   10,   34,   35,   38,   40,   38,   42,   44,   46,
+       48,   50,   52,   56,   67,   65,   86,  126,   57,   68,
+       39,   38,   53,   38,   41,   66,   43,   45,   47,   49,
+       51,   54,  104,  183,  105,   87,  106,   58,  107,  110,
+      113,   55,  119,  122,  120,  150,  151,  111,  114,  183,
+
+      183,  123,  127,  138,  140,  139,  141,  147,  153,  148,
+      154,  155,  165,  156,  166,   36,   36,   36,   69,  182,
+       69,  179,  181,  179,  180,  179,  178,  177,  172,  171,
+      169,  176,  175,  174,  173,  172,  171,  172,  171,  169,
+      170,  169,  163,  162,  168,  158,  167,  164,  163,  162,
+      163,  162,  161,  158,  160,  159,  158,  157,  152,  149,
+      146,  145,  144,  131,  130,  143,  142,  137,  136,  135,
+      134,  133,  132,  131,  130,  131,  130,  129,  128,  125,
+      124,  121,  108,  103,  118,  117,   98,  116,  115,  112,
+      109,  108,  108,  103,  103,  102,  101,  100,   99,   98,
+
+       98,   88,   97,   96,   95,   94,   93,   92,   91,   90,
+       89,   88,   88,   85,   84,   83,   82,   81,   80,   79,
+       78,   77,   76,   75,   74,   73,   72,   71,   70,   64,
+       63,   62,   61,   60,   59,  184,   37,   37,    5,  184,
+      184,  184,  184,  184,  184,  184,  184,  184,  184,  184,
+      184,  184,  184,  184,  184,  184,  184,  184,  184,  184,
+      184,  184,  184,  184,  184,  184,  184,  184,  184,  184,
+      184,  184,  184,  184,  184,  184,  184,  184,  184,  184,
+      184,  184,  184,  184,  184,  184,  184,  184,  184,  184,
+      184,  184,  184
+
+    } ;
+
+static yyconst flex_int16_t yy_chk[294] =
+    {   0,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    7,   16,    7,   17,   18,   19,
+       20,   21,   22,   23,   33,   32,   56,  100,   23,   33,
+      186,   38,   22,   38,   16,   32,   17,   18,   19,   20,
+       21,   22,   78,  182,   78,   56,   79,   23,   79,   83,
+       85,   22,   93,   96,   93,  126,  126,   83,   85,  181,
+
+      180,   96,  100,  115,  116,  115,  116,  124,  128,  124,
+      128,  129,  143,  129,  143,  185,  185,  185,  187,  178,
+      187,  177,  176,  175,  174,  173,  168,  167,  166,  165,
+      164,  161,  160,  159,  157,  156,  155,  154,  153,  152,
+      151,  149,  148,  147,  146,  145,  144,  142,  141,  140,
+      139,  138,  137,  136,  135,  134,  133,  132,  127,  125,
+      123,  122,  121,  120,  119,  118,  117,  114,  113,  112,
+      111,  110,  109,  107,  106,  105,  104,  102,  101,   99,
+       97,   95,   94,   92,   91,   90,   89,   87,   86,   84,
+       82,   81,   80,   77,   76,   75,   74,   73,   72,   71,
+
+       70,   68,   67,   66,   65,   64,   63,   62,   61,   60,
+       59,   58,   57,   55,   54,   53,   52,   51,   50,   49,
+       48,   47,   46,   45,   44,   43,   42,   41,   40,   31,
+       30,   29,   28,   27,   26,    5,    4,    3,  184,  184,
+      184,  184,  184,  184,  184,  184,  184,  184,  184,  184,
+      184,  184,  184,  184,  184,  184,  184,  184,  184,  184,
+      184,  184,  184,  184,  184,  184,  184,  184,  184,  184,
+      184,  184,  184,  184,  184,  184,  184,  184,  184,  184,
+      184,  184,  184,  184,  184,  184,  184,  184,  184,  184,
+      184,  184,  184
+
+    } ;
+
+static yy_state_type yy_last_accepting_state;
+static char *yy_last_accepting_cpos;
+
+extern int dds_flex_debug;
+int dds_flex_debug = 0;
+
+/* The intent behind this definition is that it'll catch
+ * any uses of REJECT which flex missed.
+ */
+#define REJECT reject_used_but_not_detected
+#define yymore() yymore_used_but_not_detected
+#define YY_MORE_ADJ 0
+#define YY_RESTORE_YY_MORE_OFFSET
+char *ddstext;
+#line 1 "dds.lex"
+/*
+ -*- mode: c++; c-basic-offset:4 -*-
+
+ This file is part of libdap, A C++ implementation of the OPeNDAP Data
+ Access Protocol.
+
+ Copyright (c) 2002,2003 OPeNDAP, Inc.
+ Author: James Gallagher <jgallagher@opendap.org>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+ You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+ (c) COPYRIGHT URI/MIT 1994-1999
+
+*/
+/*
+   Scanner for the DDS. This file works with gnu's flex scanner generator. It
+   returns either DATASET, INDEPENDENT, DEPENDENT, ARRAY, MAPS, LIST,
+   SEQUENCE, STRUCTURE, FUNCTION, GRID, BYTE, INT32, FLOAT64, STRING, URL, ID
+   or one of the single character tokens `{', `}', `;', `=' or `\n' as
+   integers. In the case of an ID, the scanner stores a pointer to the lexeme
+   in yylval (whose type is char *).
+
+   The scanner discards all comment text.
+
+   The scanner is not reentrant, but can share name spaces with other
+   scanners.
+
+   Note:
+   1) The `defines' file dds.tab.h is built using `bison -d'.
+   2) Define YY_DECL such that the scanner is called `ddslex'.
+   3) When bison builds the dds.tab.h file, it uses `dds' instead of `yy' for
+   variable name prefixes (e.g., yylval --> ddslval).
+
+   jhrg 8/29/94
+*/
+#line 53 "dds.lex"
+
+#include "config_dap.h"
+
+#include <cstdio>
+#include <cstring>
+
+#include "parser.h"
+#include "dds.tab.hh"
+#include "escaping.h"
+
+using namespace libdap ;
+
+#ifndef YY_PROTO
+#define YY_PROTO(proto) proto
+#endif
+
+#define YY_DECL int ddslex YY_PROTO(( void ))
+
+#define YY_INPUT(buf,result,max_size) { \
+    if (fgets((buf), (max_size), (ddsin)) == NULL) { \
+      *buf = '\0'; \
+    } \
+    result = (feof(ddsin) || *buf == '\0' || strncmp(buf, "Data:\n", 6) == 0) \
+             ? YY_NULL : strlen(buf); \
+}
+
+#define YY_FATAL_ERROR(msg) {\
+    throw(Error(string("Error scanning DDS object text: ") + string(msg))); \
+    yy_fatal_error(msg); /* see das.lex */ \
+}
+
+int dds_line_num = 1;
+
+static void store_word();
+
+#define YY_NO_INPUT 1
+
+/* See das.lex for comments about the characters allowed in a WORD.
+   10/31/2001 jhrg */
+#line 688 "lex.dds.cc"
+
+#define INITIAL 0
+#define comment 1
+
+#ifndef YY_NO_UNISTD_H
+/* Special case for "unistd.h", since it is non-ANSI. We include it way
+ * down here because we want the user's section 1 to have been scanned first.
+ * The user has a chance to override it with an option.
+ */
+#include <unistd.h>
+#endif
+
+#ifndef YY_EXTRA_TYPE
+#define YY_EXTRA_TYPE void *
+#endif
+
+static int yy_init_globals (void );
+
+/* Accessor methods to globals.
+   These are made visible to non-reentrant scanners for convenience. */
+
+int ddslex_destroy (void );
+
+int ddsget_debug (void );
+
+void ddsset_debug (int debug_flag  );
+
+YY_EXTRA_TYPE ddsget_extra (void );
+
+void ddsset_extra (YY_EXTRA_TYPE user_defined  );
+
+FILE *ddsget_in (void );
+
+void ddsset_in  (FILE * in_str  );
+
+FILE *ddsget_out (void );
+
+void ddsset_out  (FILE * out_str  );
+
+yy_size_t ddsget_leng (void );
+
+char *ddsget_text (void );
+
+int ddsget_lineno (void );
+
+void ddsset_lineno (int line_number  );
+
+/* Macros after this point can all be overridden by user definitions in
+ * section 1.
+ */
+
+#ifndef YY_SKIP_YYWRAP
+#ifdef __cplusplus
+extern "C" int ddswrap (void );
+#else
+extern int ddswrap (void );
+#endif
+#endif
+
+#ifndef yytext_ptr
+static void yy_flex_strncpy (char *,yyconst char *,int );
+#endif
+
+#ifdef YY_NEED_STRLEN
+static int yy_flex_strlen (yyconst char * );
+#endif
+
+#ifndef YY_NO_INPUT
+
+#ifdef __cplusplus
+static int yyinput (void );
+#else
+static int input (void );
+#endif
+
+#endif
+
+/* Amount of stuff to slurp up with each read. */
+#ifndef YY_READ_BUF_SIZE
+#define YY_READ_BUF_SIZE 8192
+#endif
+
+/* Copy whatever the last rule matched to the standard output. */
+#ifndef ECHO
+/* 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 )
+#endif
+
+/* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
+ * is returned in "result".
+ */
+#ifndef YY_INPUT
+#define YY_INPUT(buf,result,max_size) \
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
+		{ \
+		int c = '*'; \
+		yy_size_t n; \
+		for ( n = 0; n < max_size && \
+			     (c = getc( ddsin )) != EOF && c != '\n'; ++n ) \
+			buf[n] = (char) c; \
+		if ( c == '\n' ) \
+			buf[n++] = (char) c; \
+		if ( c == EOF && ferror( ddsin ) ) \
+			YY_FATAL_ERROR( "input in flex scanner failed" ); \
+		result = n; \
+		} \
+	else \
+		{ \
+		errno=0; \
+		while ( (result = fread(buf, 1, max_size, ddsin))==0 && ferror(ddsin)) \
+			{ \
+			if( errno != EINTR) \
+				{ \
+				YY_FATAL_ERROR( "input in flex scanner failed" ); \
+				break; \
+				} \
+			errno=0; \
+			clearerr(ddsin); \
+			} \
+		}\
+\
+
+#endif
+
+/* No semi-colon after return; correct usage is to write "yyterminate();" -
+ * we don't want an extra ';' after the "return" because that will cause
+ * some compilers to complain about unreachable statements.
+ */
+#ifndef yyterminate
+#define yyterminate() return YY_NULL
+#endif
+
+/* Number of entries by which start-condition stack grows. */
+#ifndef YY_START_STACK_INCR
+#define YY_START_STACK_INCR 25
+#endif
+
+/* Report a fatal error. */
+#ifndef YY_FATAL_ERROR
+#define YY_FATAL_ERROR(msg) yy_fatal_error( msg )
+#endif
+
+/* end tables serialization structures and prototypes */
+
+/* Default declaration of generated scanner - a define so the user can
+ * easily add parameters.
+ */
+#ifndef YY_DECL
+#define YY_DECL_IS_OURS 1
+
+extern int ddslex (void);
+
+#define YY_DECL int ddslex (void)
+#endif /* !YY_DECL */
+
+/* Code executed at the beginning of each rule, after ddstext and ddsleng
+ * have been set up.
+ */
+#ifndef YY_USER_ACTION
+#define YY_USER_ACTION
+#endif
+
+/* Code executed at the end of each rule. */
+#ifndef YY_BREAK
+#define YY_BREAK break;
+#endif
+
+#define YY_RULE_SETUP \
+	YY_USER_ACTION
+
+/** The main scanner function which does all the work.
+ */
+YY_DECL
+{
+	register yy_state_type yy_current_state;
+	register char *yy_cp, *yy_bp;
+	register int yy_act;
+    
+#line 120 "dds.lex"
+
+
+#line 872 "lex.dds.cc"
+
+	if ( !(yy_init) )
+		{
+		(yy_init) = 1;
+
+#ifdef YY_USER_INIT
+		YY_USER_INIT;
+#endif
+
+		if ( ! (yy_start) )
+			(yy_start) = 1;	/* first start state */
+
+		if ( ! ddsin )
+			ddsin = stdin;
+
+		if ( ! ddsout )
+			ddsout = stdout;
+
+		if ( ! YY_CURRENT_BUFFER ) {
+			ddsensure_buffer_stack ();
+			YY_CURRENT_BUFFER_LVALUE =
+				dds_create_buffer(ddsin,YY_BUF_SIZE );
+		}
+
+		dds_load_buffer_state( );
+		}
+
+	while ( 1 )		/* loops until end-of-file is reached */
+		{
+		yy_cp = (yy_c_buf_p);
+
+		/* Support of ddstext. */
+		*yy_cp = (yy_hold_char);
+
+		/* yy_bp points to the position in yy_ch_buf of the start of
+		 * the current run.
+		 */
+		yy_bp = yy_cp;
+
+		yy_current_state = (yy_start);
+yy_match:
+		do
+			{
+			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
+			if ( yy_accept[yy_current_state] )
+				{
+				(yy_last_accepting_state) = yy_current_state;
+				(yy_last_accepting_cpos) = yy_cp;
+				}
+			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+				{
+				yy_current_state = (int) yy_def[yy_current_state];
+				if ( yy_current_state >= 185 )
+					yy_c = yy_meta[(unsigned int) yy_c];
+				}
+			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+			++yy_cp;
+			}
+		while ( yy_base[yy_current_state] != 239 );
+
+yy_find_action:
+		yy_act = yy_accept[yy_current_state];
+		if ( yy_act == 0 )
+			{ /* have to back up */
+			yy_cp = (yy_last_accepting_cpos);
+			yy_current_state = (yy_last_accepting_state);
+			yy_act = yy_accept[yy_current_state];
+			}
+
+		YY_DO_BEFORE_ACTION;
+
+do_action:	/* This label is used only to access EOF actions. */
+
+		switch ( yy_act )
+	{ /* beginning of action switch */
+			case 0: /* must back up */
+			/* undo the effects of YY_DO_BEFORE_ACTION */
+			*yy_cp = (yy_hold_char);
+			yy_cp = (yy_last_accepting_cpos);
+			yy_current_state = (yy_last_accepting_state);
+			goto yy_find_action;
+
+case 1:
+YY_RULE_SETUP
+#line 122 "dds.lex"
+return (int)*ddstext;
+	YY_BREAK
+case 2:
+YY_RULE_SETUP
+#line 123 "dds.lex"
+return (int)*ddstext;
+	YY_BREAK
+case 3:
+YY_RULE_SETUP
+#line 124 "dds.lex"
+return (int)*ddstext;
+	YY_BREAK
+case 4:
+YY_RULE_SETUP
+#line 125 "dds.lex"
+return (int)*ddstext;
+	YY_BREAK
+case 5:
+YY_RULE_SETUP
+#line 126 "dds.lex"
+return (int)*ddstext;
+	YY_BREAK
+case 6:
+YY_RULE_SETUP
+#line 127 "dds.lex"
+return (int)*ddstext;
+	YY_BREAK
+case 7:
+YY_RULE_SETUP
+#line 128 "dds.lex"
+return (int)*ddstext;
+	YY_BREAK
+case 8:
+YY_RULE_SETUP
+#line 130 "dds.lex"
+store_word(); return SCAN_DATASET;
+	YY_BREAK
+case 9:
+YY_RULE_SETUP
+#line 131 "dds.lex"
+store_word(); return SCAN_LIST;
+	YY_BREAK
+case 10:
+YY_RULE_SETUP
+#line 132 "dds.lex"
+store_word(); return SCAN_SEQUENCE;
+	YY_BREAK
+case 11:
+YY_RULE_SETUP
+#line 133 "dds.lex"
+store_word(); return SCAN_STRUCTURE;
+	YY_BREAK
+case 12:
+YY_RULE_SETUP
+#line 134 "dds.lex"
+store_word(); return SCAN_GRID;
+	YY_BREAK
+case 13:
+YY_RULE_SETUP
+#line 135 "dds.lex"
+store_word(); return SCAN_BYTE;
+	YY_BREAK
+case 14:
+YY_RULE_SETUP
+#line 136 "dds.lex"
+store_word(); return SCAN_INT16;
+	YY_BREAK
+case 15:
+YY_RULE_SETUP
+#line 137 "dds.lex"
+store_word(); return SCAN_UINT16;
+	YY_BREAK
+case 16:
+YY_RULE_SETUP
+#line 138 "dds.lex"
+store_word(); return SCAN_INT32;
+	YY_BREAK
+case 17:
+YY_RULE_SETUP
+#line 139 "dds.lex"
+store_word(); return SCAN_UINT32;
+	YY_BREAK
+case 18:
+YY_RULE_SETUP
+#line 140 "dds.lex"
+store_word(); return SCAN_FLOAT32;
+	YY_BREAK
+case 19:
+YY_RULE_SETUP
+#line 141 "dds.lex"
+store_word(); return SCAN_FLOAT64;
+	YY_BREAK
+case 20:
+YY_RULE_SETUP
+#line 142 "dds.lex"
+store_word(); return SCAN_STRING;
+	YY_BREAK
+case 21:
+YY_RULE_SETUP
+#line 143 "dds.lex"
+store_word(); return SCAN_URL;
+	YY_BREAK
+case 22:
+YY_RULE_SETUP
+#line 145 "dds.lex"
+store_word(); return SCAN_WORD;
+	YY_BREAK
+case 23:
+YY_RULE_SETUP
+#line 147 "dds.lex"
+
+	YY_BREAK
+case 24:
+/* rule 24 can match eol */
+YY_RULE_SETUP
+#line 148 "dds.lex"
+++dds_line_num;
+	YY_BREAK
+case YY_STATE_EOF(INITIAL):
+#line 149 "dds.lex"
+yy_init = 1; dds_line_num = 1; yyterminate();
+	YY_BREAK
+case 25:
+YY_RULE_SETUP
+#line 151 "dds.lex"
+BEGIN(comment);
+	YY_BREAK
+case 26:
+YY_RULE_SETUP
+#line 152 "dds.lex"
+
+	YY_BREAK
+case 27:
+/* rule 27 can match eol */
+YY_RULE_SETUP
+#line 153 "dds.lex"
+++dds_line_num; BEGIN(INITIAL);
+	YY_BREAK
+case YY_STATE_EOF(comment):
+#line 154 "dds.lex"
+yy_init = 1; dds_line_num = 1; yyterminate();
+	YY_BREAK
+case 28:
+/* rule 28 can match eol */
+YY_RULE_SETUP
+#line 156 "dds.lex"
+yyterminate();
+	YY_BREAK
+case 29:
+/* rule 29 can match eol */
+YY_RULE_SETUP
+#line 157 "dds.lex"
+yyterminate();
+	YY_BREAK
+case 30:
+/* rule 30 can match eol */
+YY_RULE_SETUP
+#line 159 "dds.lex"
+{
+            if (ddstext) {	/* suppress msgs about `' chars */
+                fprintf(stderr, "Character `%c' is not", *ddstext);
+                fprintf(stderr, " allowed and has been ignored\n");
+	    }
+	}
+	YY_BREAK
+case 31:
+YY_RULE_SETUP
+#line 165 "dds.lex"
+ECHO;
+	YY_BREAK
+#line 1128 "lex.dds.cc"
+
+	case YY_END_OF_BUFFER:
+		{
+		/* Amount of text matched not including the EOB char. */
+		int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1;
+
+		/* Undo the effects of YY_DO_BEFORE_ACTION. */
+		*yy_cp = (yy_hold_char);
+		YY_RESTORE_YY_MORE_OFFSET
+
+		if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
+			{
+			/* We're scanning a new file or input source.  It's
+			 * possible that this happened because the user
+			 * just pointed ddsin at a new source and called
+			 * ddslex().  If so, then we have to assure
+			 * consistency between YY_CURRENT_BUFFER and our
+			 * globals.  Here is the right place to do so, because
+			 * this is the first action (other than possibly a
+			 * back-up) that will match for the new input source.
+			 */
+			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+			YY_CURRENT_BUFFER_LVALUE->yy_input_file = ddsin;
+			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
+			}
+
+		/* Note that here we test for yy_c_buf_p "<=" to the position
+		 * of the first EOB in the buffer, since yy_c_buf_p will
+		 * already have been incremented past the NUL character
+		 * (since all states make transitions on EOB to the
+		 * end-of-buffer state).  Contrast this with the test
+		 * in input().
+		 */
+		if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
+			{ /* This was really a NUL. */
+			yy_state_type yy_next_state;
+
+			(yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text;
+
+			yy_current_state = yy_get_previous_state(  );
+
+			/* Okay, we're now positioned to make the NUL
+			 * transition.  We couldn't have
+			 * yy_get_previous_state() go ahead and do it
+			 * for us because it doesn't know how to deal
+			 * with the possibility of jamming (and we don't
+			 * want to build jamming into it because then it
+			 * will run more slowly).
+			 */
+
+			yy_next_state = yy_try_NUL_trans( yy_current_state );
+
+			yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+
+			if ( yy_next_state )
+				{
+				/* Consume the NUL. */
+				yy_cp = ++(yy_c_buf_p);
+				yy_current_state = yy_next_state;
+				goto yy_match;
+				}
+
+			else
+				{
+				yy_cp = (yy_c_buf_p);
+				goto yy_find_action;
+				}
+			}
+
+		else switch ( yy_get_next_buffer(  ) )
+			{
+			case EOB_ACT_END_OF_FILE:
+				{
+				(yy_did_buffer_switch_on_eof) = 0;
+
+				if ( ddswrap( ) )
+					{
+					/* Note: because we've taken care in
+					 * yy_get_next_buffer() to have set up
+					 * ddstext, we can now set up
+					 * yy_c_buf_p so that if some total
+					 * hoser (like flex itself) wants to
+					 * call the scanner after we return the
+					 * YY_NULL, it'll still work - another
+					 * YY_NULL will get returned.
+					 */
+					(yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ;
+
+					yy_act = YY_STATE_EOF(YY_START);
+					goto do_action;
+					}
+
+				else
+					{
+					if ( ! (yy_did_buffer_switch_on_eof) )
+						YY_NEW_FILE;
+					}
+				break;
+				}
+
+			case EOB_ACT_CONTINUE_SCAN:
+				(yy_c_buf_p) =
+					(yytext_ptr) + yy_amount_of_matched_text;
+
+				yy_current_state = yy_get_previous_state(  );
+
+				yy_cp = (yy_c_buf_p);
+				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+				goto yy_match;
+
+			case EOB_ACT_LAST_MATCH:
+				(yy_c_buf_p) =
+				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)];
+
+				yy_current_state = yy_get_previous_state(  );
+
+				yy_cp = (yy_c_buf_p);
+				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+				goto yy_find_action;
+			}
+		break;
+		}
+
+	default:
+		YY_FATAL_ERROR(
+			"fatal flex scanner internal error--no action found" );
+	} /* end of action switch */
+		} /* end of scanning one token */
+} /* end of ddslex */
+
+/* yy_get_next_buffer - try to read in a new buffer
+ *
+ * Returns a code representing an action:
+ *	EOB_ACT_LAST_MATCH -
+ *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position
+ *	EOB_ACT_END_OF_FILE - end of file
+ */
+static int yy_get_next_buffer (void)
+{
+    	register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
+	register char *source = (yytext_ptr);
+	register int number_to_move, i;
+	int ret_val;
+
+	if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
+		YY_FATAL_ERROR(
+		"fatal flex scanner internal error--end of buffer missed" );
+
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
+		{ /* Don't try to fill the buffer, so this is an EOF. */
+		if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 )
+			{
+			/* We matched a single character, the EOB, so
+			 * treat this as a final EOF.
+			 */
+			return EOB_ACT_END_OF_FILE;
+			}
+
+		else
+			{
+			/* We matched some text prior to the EOB, first
+			 * process it.
+			 */
+			return EOB_ACT_LAST_MATCH;
+			}
+		}
+
+	/* Try to read more data. */
+
+	/* First move last chars to start of buffer. */
+	number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
+
+	for ( i = 0; i < number_to_move; ++i )
+		*(dest++) = *(source++);
+
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
+		/* don't do the read, it's not guaranteed to return an EOF,
+		 * just force an EOF
+		 */
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0;
+
+	else
+		{
+			yy_size_t num_to_read =
+			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
+
+		while ( num_to_read <= 0 )
+			{ /* Not enough room in the buffer - grow it. */
+
+			/* just a shorter name for the current buffer */
+			YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
+
+			int yy_c_buf_p_offset =
+				(int) ((yy_c_buf_p) - b->yy_ch_buf);
+
+			if ( b->yy_is_our_buffer )
+				{
+				yy_size_t new_size = b->yy_buf_size * 2;
+
+				if ( new_size <= 0 )
+					b->yy_buf_size += b->yy_buf_size / 8;
+				else
+					b->yy_buf_size *= 2;
+
+				b->yy_ch_buf = (char *)
+					/* Include room in for 2 EOB chars. */
+					ddsrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2  );
+				}
+			else
+				/* Can't grow it, we don't own it. */
+				b->yy_ch_buf = 0;
+
+			if ( ! b->yy_ch_buf )
+				YY_FATAL_ERROR(
+				"fatal error - scanner input buffer overflow" );
+
+			(yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset];
+
+			num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
+						number_to_move - 1;
+
+			}
+
+		if ( num_to_read > YY_READ_BUF_SIZE )
+			num_to_read = YY_READ_BUF_SIZE;
+
+		/* Read in more data. */
+		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
+			(yy_n_chars), num_to_read );
+
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		}
+
+	if ( (yy_n_chars) == 0 )
+		{
+		if ( number_to_move == YY_MORE_ADJ )
+			{
+			ret_val = EOB_ACT_END_OF_FILE;
+			ddsrestart(ddsin  );
+			}
+
+		else
+			{
+			ret_val = EOB_ACT_LAST_MATCH;
+			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
+				YY_BUFFER_EOF_PENDING;
+			}
+		}
+
+	else
+		ret_val = EOB_ACT_CONTINUE_SCAN;
+
+	if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
+		/* Extend the array by 50%, plus the number we really need. */
+		yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
+		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) ddsrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size  );
+		if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
+			YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
+	}
+
+	(yy_n_chars) += number_to_move;
+	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;
+	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
+
+	(yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
+
+	return ret_val;
+}
+
+/* yy_get_previous_state - get the state just before the EOB char was reached */
+
+    static yy_state_type yy_get_previous_state (void)
+{
+	register yy_state_type yy_current_state;
+	register char *yy_cp;
+    
+	yy_current_state = (yy_start);
+
+	for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
+		{
+		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+		if ( yy_accept[yy_current_state] )
+			{
+			(yy_last_accepting_state) = yy_current_state;
+			(yy_last_accepting_cpos) = yy_cp;
+			}
+		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+			{
+			yy_current_state = (int) yy_def[yy_current_state];
+			if ( yy_current_state >= 185 )
+				yy_c = yy_meta[(unsigned int) yy_c];
+			}
+		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+		}
+
+	return yy_current_state;
+}
+
+/* yy_try_NUL_trans - try to make a transition on the NUL character
+ *
+ * synopsis
+ *	next_state = yy_try_NUL_trans( current_state );
+ */
+    static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
+{
+	register int yy_is_jam;
+    	register char *yy_cp = (yy_c_buf_p);
+
+	register YY_CHAR yy_c = 1;
+	if ( yy_accept[yy_current_state] )
+		{
+		(yy_last_accepting_state) = yy_current_state;
+		(yy_last_accepting_cpos) = yy_cp;
+		}
+	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+		{
+		yy_current_state = (int) yy_def[yy_current_state];
+		if ( yy_current_state >= 185 )
+			yy_c = yy_meta[(unsigned int) yy_c];
+		}
+	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+	yy_is_jam = (yy_current_state == 184);
+
+	return yy_is_jam ? 0 : yy_current_state;
+}
+
+#ifndef YY_NO_INPUT
+#ifdef __cplusplus
+    static int yyinput (void)
+#else
+    static int input  (void)
+#endif
+
+{
+	int c;
+    
+	*(yy_c_buf_p) = (yy_hold_char);
+
+	if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
+		{
+		/* yy_c_buf_p now points to the character we want to return.
+		 * If this occurs *before* the EOB characters, then it's a
+		 * valid NUL; if not, then we've hit the end of the buffer.
+		 */
+		if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
+			/* This was really a NUL. */
+			*(yy_c_buf_p) = '\0';
+
+		else
+			{ /* need more input */
+			yy_size_t offset = (yy_c_buf_p) - (yytext_ptr);
+			++(yy_c_buf_p);
+
+			switch ( yy_get_next_buffer(  ) )
+				{
+				case EOB_ACT_LAST_MATCH:
+					/* This happens because yy_g_n_b()
+					 * sees that we've accumulated a
+					 * token and flags that we need to
+					 * try matching the token before
+					 * proceeding.  But for input(),
+					 * there's no matching to consider.
+					 * So convert the EOB_ACT_LAST_MATCH
+					 * to EOB_ACT_END_OF_FILE.
+					 */
+
+					/* Reset buffer status. */
+					ddsrestart(ddsin );
+
+					/*FALLTHROUGH*/
+
+				case EOB_ACT_END_OF_FILE:
+					{
+					if ( ddswrap( ) )
+						return 0;
+
+					if ( ! (yy_did_buffer_switch_on_eof) )
+						YY_NEW_FILE;
+#ifdef __cplusplus
+					return yyinput();
+#else
+					return input();
+#endif
+					}
+
+				case EOB_ACT_CONTINUE_SCAN:
+					(yy_c_buf_p) = (yytext_ptr) + offset;
+					break;
+				}
+			}
+		}
+
+	c = *(unsigned char *) (yy_c_buf_p);	/* cast for 8-bit char's */
+	*(yy_c_buf_p) = '\0';	/* preserve ddstext */
+	(yy_hold_char) = *++(yy_c_buf_p);
+
+	return c;
+}
+#endif	/* ifndef YY_NO_INPUT */
+
+/** Immediately switch to a different input stream.
+ * @param input_file A readable stream.
+ * 
+ * @note This function does not reset the start condition to @c INITIAL .
+ */
+    void ddsrestart  (FILE * input_file )
+{
+    
+	if ( ! YY_CURRENT_BUFFER ){
+        ddsensure_buffer_stack ();
+		YY_CURRENT_BUFFER_LVALUE =
+            dds_create_buffer(ddsin,YY_BUF_SIZE );
+	}
+
+	dds_init_buffer(YY_CURRENT_BUFFER,input_file );
+	dds_load_buffer_state( );
+}
+
+/** Switch to a different input buffer.
+ * @param new_buffer The new input buffer.
+ * 
+ */
+    void dds_switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
+{
+    
+	/* TODO. We should be able to replace this entire function body
+	 * with
+	 *		ddspop_buffer_state();
+	 *		ddspush_buffer_state(new_buffer);
+     */
+	ddsensure_buffer_stack ();
+	if ( YY_CURRENT_BUFFER == new_buffer )
+		return;
+
+	if ( YY_CURRENT_BUFFER )
+		{
+		/* Flush out information for old buffer. */
+		*(yy_c_buf_p) = (yy_hold_char);
+		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		}
+
+	YY_CURRENT_BUFFER_LVALUE = new_buffer;
+	dds_load_buffer_state( );
+
+	/* We don't actually know whether we did this switch during
+	 * EOF (ddswrap()) processing, but the only time this flag
+	 * is looked at is after ddswrap() is called, so it's safe
+	 * to go ahead and always set it.
+	 */
+	(yy_did_buffer_switch_on_eof) = 1;
+}
+
+static void dds_load_buffer_state  (void)
+{
+    	(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+	(yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
+	ddsin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
+	(yy_hold_char) = *(yy_c_buf_p);
+}
+
+/** Allocate and initialize an input buffer state.
+ * @param file A readable stream.
+ * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
+ * 
+ * @return the allocated buffer state.
+ */
+    YY_BUFFER_STATE dds_create_buffer  (FILE * file, int  size )
+{
+	YY_BUFFER_STATE b;
+    
+	b = (YY_BUFFER_STATE) ddsalloc(sizeof( struct yy_buffer_state )  );
+	if ( ! b )
+		YY_FATAL_ERROR( "out of dynamic memory in dds_create_buffer()" );
+
+	b->yy_buf_size = size;
+
+	/* yy_ch_buf has to be 2 characters longer than the size given because
+	 * we need to put in 2 end-of-buffer characters.
+	 */
+	b->yy_ch_buf = (char *) ddsalloc(b->yy_buf_size + 2  );
+	if ( ! b->yy_ch_buf )
+		YY_FATAL_ERROR( "out of dynamic memory in dds_create_buffer()" );
+
+	b->yy_is_our_buffer = 1;
+
+	dds_init_buffer(b,file );
+
+	return b;
+}
+
+/** Destroy the buffer.
+ * @param b a buffer created with dds_create_buffer()
+ * 
+ */
+    void dds_delete_buffer (YY_BUFFER_STATE  b )
+{
+    
+	if ( ! b )
+		return;
+
+	if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
+		YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
+
+	if ( b->yy_is_our_buffer )
+		ddsfree((void *) b->yy_ch_buf  );
+
+	ddsfree((void *) b  );
+}
+
+#ifndef __cplusplus
+extern int isatty (int );
+#endif /* __cplusplus */
+    
+/* Initializes or reinitializes a buffer.
+ * This function is sometimes called more than once on the same buffer,
+ * such as during a ddsrestart() or at EOF.
+ */
+    static void dds_init_buffer  (YY_BUFFER_STATE  b, FILE * file )
+
+{
+	int oerrno = errno;
+    
+	dds_flush_buffer(b );
+
+	b->yy_input_file = file;
+	b->yy_fill_buffer = 1;
+
+    /* If b is the current buffer, then dds_init_buffer was _probably_
+     * called from ddsrestart() or through yy_get_next_buffer.
+     * In that case, we don't want to reset the lineno or column.
+     */
+    if (b != YY_CURRENT_BUFFER){
+        b->yy_bs_lineno = 1;
+        b->yy_bs_column = 0;
+    }
+
+        b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
+    
+	errno = oerrno;
+}
+
+/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
+ * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
+ * 
+ */
+    void dds_flush_buffer (YY_BUFFER_STATE  b )
+{
+    	if ( ! b )
+		return;
+
+	b->yy_n_chars = 0;
+
+	/* We always need two end-of-buffer characters.  The first causes
+	 * a transition to the end-of-buffer state.  The second causes
+	 * a jam in that state.
+	 */
+	b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;
+	b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
+
+	b->yy_buf_pos = &b->yy_ch_buf[0];
+
+	b->yy_at_bol = 1;
+	b->yy_buffer_status = YY_BUFFER_NEW;
+
+	if ( b == YY_CURRENT_BUFFER )
+		dds_load_buffer_state( );
+}
+
+/** Pushes the new state onto the stack. The new state becomes
+ *  the current state. This function will allocate the stack
+ *  if necessary.
+ *  @param new_buffer The new state.
+ *  
+ */
+void ddspush_buffer_state (YY_BUFFER_STATE new_buffer )
+{
+    	if (new_buffer == NULL)
+		return;
+
+	ddsensure_buffer_stack();
+
+	/* This block is copied from dds_switch_to_buffer. */
+	if ( YY_CURRENT_BUFFER )
+		{
+		/* Flush out information for old buffer. */
+		*(yy_c_buf_p) = (yy_hold_char);
+		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		}
+
+	/* Only push if top exists. Otherwise, replace top. */
+	if (YY_CURRENT_BUFFER)
+		(yy_buffer_stack_top)++;
+	YY_CURRENT_BUFFER_LVALUE = new_buffer;
+
+	/* copied from dds_switch_to_buffer. */
+	dds_load_buffer_state( );
+	(yy_did_buffer_switch_on_eof) = 1;
+}
+
+/** Removes and deletes the top of the stack, if present.
+ *  The next element becomes the new top.
+ *  
+ */
+void ddspop_buffer_state (void)
+{
+    	if (!YY_CURRENT_BUFFER)
+		return;
+
+	dds_delete_buffer(YY_CURRENT_BUFFER );
+	YY_CURRENT_BUFFER_LVALUE = NULL;
+	if ((yy_buffer_stack_top) > 0)
+		--(yy_buffer_stack_top);
+
+	if (YY_CURRENT_BUFFER) {
+		dds_load_buffer_state( );
+		(yy_did_buffer_switch_on_eof) = 1;
+	}
+}
+
+/* Allocates the stack if it does not exist.
+ *  Guarantees space for at least one push.
+ */
+static void ddsensure_buffer_stack (void)
+{
+	yy_size_t num_to_alloc;
+    
+	if (!(yy_buffer_stack)) {
+
+		/* First allocation is just for 2 elements, since we don't know if this
+		 * scanner will even need a stack. We use 2 instead of 1 to avoid an
+		 * immediate realloc on the next call.
+         */
+		num_to_alloc = 1;
+		(yy_buffer_stack) = (struct yy_buffer_state**)ddsalloc
+								(num_to_alloc * sizeof(struct yy_buffer_state*)
+								);
+		if ( ! (yy_buffer_stack) )
+			YY_FATAL_ERROR( "out of dynamic memory in ddsensure_buffer_stack()" );
+								  
+		memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
+				
+		(yy_buffer_stack_max) = num_to_alloc;
+		(yy_buffer_stack_top) = 0;
+		return;
+	}
+
+	if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
+
+		/* Increase the buffer to prepare for a possible push. */
+		int grow_size = 8 /* arbitrary grow size */;
+
+		num_to_alloc = (yy_buffer_stack_max) + grow_size;
+		(yy_buffer_stack) = (struct yy_buffer_state**)ddsrealloc
+								((yy_buffer_stack),
+								num_to_alloc * sizeof(struct yy_buffer_state*)
+								);
+		if ( ! (yy_buffer_stack) )
+			YY_FATAL_ERROR( "out of dynamic memory in ddsensure_buffer_stack()" );
+
+		/* zero only the new slots.*/
+		memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
+		(yy_buffer_stack_max) = num_to_alloc;
+	}
+}
+
+/** Setup the input buffer state to scan directly from a user-specified character buffer.
+ * @param base the character buffer
+ * @param size the size in bytes of the character buffer
+ * 
+ * @return the newly allocated buffer state object. 
+ */
+YY_BUFFER_STATE dds_scan_buffer  (char * base, yy_size_t  size )
+{
+	YY_BUFFER_STATE b;
+    
+	if ( size < 2 ||
+	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
+	     base[size-1] != YY_END_OF_BUFFER_CHAR )
+		/* They forgot to leave room for the EOB's. */
+		return 0;
+
+	b = (YY_BUFFER_STATE) ddsalloc(sizeof( struct yy_buffer_state )  );
+	if ( ! b )
+		YY_FATAL_ERROR( "out of dynamic memory in dds_scan_buffer()" );
+
+	b->yy_buf_size = size - 2;	/* "- 2" to take care of EOB's */
+	b->yy_buf_pos = b->yy_ch_buf = base;
+	b->yy_is_our_buffer = 0;
+	b->yy_input_file = 0;
+	b->yy_n_chars = b->yy_buf_size;
+	b->yy_is_interactive = 0;
+	b->yy_at_bol = 1;
+	b->yy_fill_buffer = 0;
+	b->yy_buffer_status = YY_BUFFER_NEW;
+
+	dds_switch_to_buffer(b  );
+
+	return b;
+}
+
+/** Setup the input buffer state to scan a string. The next call to ddslex() will
+ * scan from a @e copy of @a str.
+ * @param yystr a NUL-terminated string to scan
+ * 
+ * @return the newly allocated buffer state object.
+ * @note If you want to scan bytes that may contain NUL values, then use
+ *       dds_scan_bytes() instead.
+ */
+YY_BUFFER_STATE dds_scan_string (yyconst char * yystr )
+{
+    
+	return dds_scan_bytes(yystr,strlen(yystr) );
+}
+
+/** Setup the input buffer state to scan the given bytes. The next call to ddslex() will
+ * scan from a @e copy of @a bytes.
+ * @param bytes the byte buffer to scan
+ * @param len the number of bytes in the buffer pointed to by @a bytes.
+ * 
+ * @return the newly allocated buffer state object.
+ */
+YY_BUFFER_STATE dds_scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes_len )
+{
+	YY_BUFFER_STATE b;
+	char *buf;
+	yy_size_t n, i;
+    
+	/* Get memory for full buffer, including space for trailing EOB's. */
+	n = _yybytes_len + 2;
+	buf = (char *) ddsalloc(n  );
+	if ( ! buf )
+		YY_FATAL_ERROR( "out of dynamic memory in dds_scan_bytes()" );
+
+	for ( i = 0; i < _yybytes_len; ++i )
+		buf[i] = yybytes[i];
+
+	buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
+
+	b = dds_scan_buffer(buf,n );
+	if ( ! b )
+		YY_FATAL_ERROR( "bad buffer in dds_scan_bytes()" );
+
+	/* It's okay to grow etc. this buffer, and we should throw it
+	 * away when we're done.
+	 */
+	b->yy_is_our_buffer = 1;
+
+	return b;
+}
+
+#ifndef YY_EXIT_FAILURE
+#define YY_EXIT_FAILURE 2
+#endif
+
+static void yy_fatal_error (yyconst char* msg )
+{
+    	(void) fprintf( stderr, "%s\n", msg );
+	exit( YY_EXIT_FAILURE );
+}
+
+/* Redefine yyless() so it works in section 3 code. */
+
+#undef yyless
+#define yyless(n) \
+	do \
+		{ \
+		/* Undo effects of setting up ddstext. */ \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+		ddstext[ddsleng] = (yy_hold_char); \
+		(yy_c_buf_p) = ddstext + yyless_macro_arg; \
+		(yy_hold_char) = *(yy_c_buf_p); \
+		*(yy_c_buf_p) = '\0'; \
+		ddsleng = yyless_macro_arg; \
+		} \
+	while ( 0 )
+
+/* Accessor  methods (get/set functions) to struct members. */
+
+/** Get the current line number.
+ * 
+ */
+int ddsget_lineno  (void)
+{
+        
+    return ddslineno;
+}
+
+/** Get the input stream.
+ * 
+ */
+FILE *ddsget_in  (void)
+{
+        return ddsin;
+}
+
+/** Get the output stream.
+ * 
+ */
+FILE *ddsget_out  (void)
+{
+        return ddsout;
+}
+
+/** Get the length of the current token.
+ * 
+ */
+yy_size_t ddsget_leng  (void)
+{
+        return ddsleng;
+}
+
+/** Get the current token.
+ * 
+ */
+
+char *ddsget_text  (void)
+{
+        return ddstext;
+}
+
+/** Set the current line number.
+ * @param line_number
+ * 
+ */
+void ddsset_lineno (int  line_number )
+{
+    
+    ddslineno = line_number;
+}
+
+/** Set the input stream. This does not discard the current
+ * input buffer.
+ * @param in_str A readable stream.
+ * 
+ * @see dds_switch_to_buffer
+ */
+void ddsset_in (FILE *  in_str )
+{
+        ddsin = in_str ;
+}
+
+void ddsset_out (FILE *  out_str )
+{
+        ddsout = out_str ;
+}
+
+int ddsget_debug  (void)
+{
+        return dds_flex_debug;
+}
+
+void ddsset_debug (int  bdebug )
+{
+        dds_flex_debug = bdebug ;
+}
+
+static int yy_init_globals (void)
+{
+        /* Initialization is the same as for the non-reentrant scanner.
+     * This function is called from ddslex_destroy(), so don't allocate here.
+     */
+
+    (yy_buffer_stack) = 0;
+    (yy_buffer_stack_top) = 0;
+    (yy_buffer_stack_max) = 0;
+    (yy_c_buf_p) = (char *) 0;
+    (yy_init) = 0;
+    (yy_start) = 0;
+
+/* Defined in main.c */
+#ifdef YY_STDINIT
+    ddsin = stdin;
+    ddsout = stdout;
+#else
+    ddsin = (FILE *) 0;
+    ddsout = (FILE *) 0;
+#endif
+
+    /* For future reference: Set errno on error, since we are called by
+     * ddslex_init()
+     */
+    return 0;
+}
+
+/* ddslex_destroy is for both reentrant and non-reentrant scanners. */
+int ddslex_destroy  (void)
+{
+    
+    /* Pop the buffer stack, destroying each element. */
+	while(YY_CURRENT_BUFFER){
+		dds_delete_buffer(YY_CURRENT_BUFFER  );
+		YY_CURRENT_BUFFER_LVALUE = NULL;
+		ddspop_buffer_state();
+	}
+
+	/* Destroy the stack itself. */
+	ddsfree((yy_buffer_stack) );
+	(yy_buffer_stack) = NULL;
+
+    /* Reset the globals. This is important in a non-reentrant scanner so the next time
+     * ddslex() is called, initialization will occur. */
+    yy_init_globals( );
+
+    return 0;
+}
+
+/*
+ * Internal utility routines.
+ */
+
+#ifndef yytext_ptr
+static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
+{
+	register int i;
+	for ( i = 0; i < n; ++i )
+		s1[i] = s2[i];
+}
+#endif
+
+#ifdef YY_NEED_STRLEN
+static int yy_flex_strlen (yyconst char * s )
+{
+	register int n;
+	for ( n = 0; s[n]; ++n )
+		;
+
+	return n;
+}
+#endif
+
+void *ddsalloc (yy_size_t  size )
+{
+	return (void *) malloc( size );
+}
+
+void *ddsrealloc  (void * ptr, yy_size_t  size )
+{
+	/* The cast to (char *) in the following accommodates both
+	 * implementations that use char* generic pointers, and those
+	 * that use void* generic pointers.  It works with the latter
+	 * because both ANSI C and C++ allow castless assignment from
+	 * any pointer type to void*, and deal with argument conversions
+	 * as though doing an assignment.
+	 */
+	return (void *) realloc( (char *) ptr, size );
+}
+
+void ddsfree (void * ptr )
+{
+	free( (char *) ptr );	/* see ddsrealloc() for (char *) cast */
+}
+
+#define YYTABLES_NAME "yytables"
+
+#line 165 "dds.lex"
+
+
+
+// These three glue routines enable DDS to reclaim the memory used to parse a
+// DDS off the wire. They are here because this file can see the YY_*
+// symbols; the file DDS.cc cannot.
+
+void *
+dds_buffer(FILE *fp)
+{
+    return (void *)dds_create_buffer(fp, YY_BUF_SIZE);
+}
+
+void
+dds_switch_to_buffer(void *buf)
+{
+    dds_switch_to_buffer((YY_BUFFER_STATE)buf);
+}
+
+void
+dds_delete_buffer(void *buf)
+{
+    dds_delete_buffer((YY_BUFFER_STATE)buf);
+}
+
+static void
+store_word()
+{
+    // dods2id(string(ddstext)).c_str()
+    strncpy(ddslval.word, ddstext, ID_MAX-1);
+    ddslval.word[ID_MAX-1] = '\0'; // for the paranoid...
+}
+
+
diff --git a/libdap.pc.in b/libdap.pc.in
new file mode 100644
index 0000000..7d7b655
--- /dev/null
+++ b/libdap.pc.in
@@ -0,0 +1,15 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+ccompiler=@CC@
+cppcompiler=@CXX@
+
+Name: @PACKAGE@
+Description: Common items for the OPeNDAP C++ implementation of the Data Access Protocol
+Version: @VERSION@
+Libs: -L${libdir} -ldap
+Libs.private:  @xmlprivatelibs@ @PTHREAD_LIBS@
+Requires.private: @xmlprivatereq@
+Cflags: -I${includedir}/libdap
+
diff --git a/libdap.spec b/libdap.spec
new file mode 100644
index 0000000..c6d528b
--- /dev/null
+++ b/libdap.spec
@@ -0,0 +1,172 @@
+Name: libdap
+Summary: The C++ DAP2/DAP4 library from OPeNDAP
+Version: 3.19.1
+Release: 1%{?dist}
+
+License: LGPLv2+
+Group: Development/Libraries
+URL: http://www.opendap.org/
+Source0: http://www.opendap.org/pub/source/libdap-%{version}.tar.gz
+Requires: curl >= 7.19.0 libxml2 >= 2.7.0
+
+BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires: curl-devel >= 7.19.0 libxml2-devel >= 2.7.0
+# BuildRequires: doxygen graphviz
+BuildRequires: pkgconfig
+
+# This package could be relocatable. In that case uncomment the following
+# line
+Prefix: %{_prefix}
+
+%description 
+The libdap library contains an implementation of DAP2 and DAP4. This
+package contains the library, dap-config, getdap and getdap4. The
+script dap-config simplifies using the library in other projects. The
+getdap and getdap4 utilities are a simple command-line tool to read
+from DAP2 and DAP4 servers and are built using the library to
+demonstrates simple uses of it. Note that libdap used to include a
+copy of 'deflate' which was used to compress responses.
+
+%package devel
+Summary: Development and header files for libdap
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: curl-devel >= 7.19.0 libxml2-devel >= 2.7.0
+Requires: pkgconfig
+# for the /usr/share/aclocal directory ownership
+Requires: automake
+
+%description devel
+This package contains all the files needed to develop applications that
+use libdap.
+
+# %package doc
+# Summary: Documentation of the libdap library
+# Group: Documentation
+
+# %description doc
+# Documentation of the libdap library.
+
+%prep
+%setup -q
+
+%build
+%configure --disable-static --disable-dependency-tracking
+make %{?_smp_mflags}
+
+# make docs
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p"
+rm $RPM_BUILD_ROOT%{_libdir}/*.la
+mv $RPM_BUILD_ROOT%{_bindir}/dap-config-pkgconfig $RPM_BUILD_ROOT%{_bindir}/dap-config
+
+# rm -rf __dist_docs
+# cp -pr docs __dist_docs
+# # those .map and .md5 are of dubious use, remove them
+# rm -f __dist_docs/html/*.map __dist_docs/html/*.md5
+# # use the ChangeLog timestamp to have the same timestamps for the doc files 
+# # for all arches
+# touch -r ChangeLog __dist_docs/html/*
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%files
+%defattr(-,root,root,-)
+%{_bindir}/getdap
+%{_bindir}/getdap4
+%{_libdir}/libdap.so.*
+%{_libdir}/libtest-types.a
+%{_libdir}/libdapclient.so.*
+%{_libdir}/libdapserver.so.*
+%doc README NEWS COPYING COPYRIGHT_URI README.dodsrc
+%{_mandir}/man1/*
+
+%files devel
+%defattr(-,root,root,-)
+%{_libdir}/libdap.so
+%{_libdir}/libtest-types.a
+%{_libdir}/libdapclient.so
+%{_libdir}/libdapserver.so
+%{_libdir}/pkgconfig/libdap*.pc
+%{_bindir}/dap-config
+%{_includedir}/libdap/
+%{_datadir}/aclocal/*
+
+# %files doc
+# %defattr(-,root,root,-)
+# %doc __dist_docs/html/
+
+%changelog
+* Tue May  4 2010 James Gallagher <jgallagher@opendap.org> - 3.10.2
+
+* Mon Sep 13 2010 James Gallagehr <jgallagher@opendap.org> - 3.11.0
+- 3.11.0 rc 1
+ 
+* Mon Feb  1 2010 James Gallagher <jgallagher@opendap.org> - 3.10.0
+- Removed deflate; general update for 3.10.0 release
+
+* Tue Jun 10 2008 James Gallagher <jgallagher@opendap.org> - 3.8.1-1
+- Update for 3.8.1 This is code actually checked in on 4/25/08
+
+* Fri Feb 29 2008 Patrick West <pwest@ucar.edu> - 3.8.0-1
+- Update for 3.8.0
+
+* Wed Nov 28 2007 James Gallagher <jgallagher@opendap.org> - 3.7.10-1
+- Update for 3.7.10
+
+* Tue Jun 26 2007 James Gallagher <jgallagher@opendap.org> - 3.7.8-1
+- Update for 3.7.8
+
+* Thu Feb  8 2007 James Gallagher <jgallagher@opendap.org> - 3.7.7-1
+- Update for 3.7.7
+
+* Thu Feb  8 2007 James Gallagher <jgallagher@opendap.org> - 3.7.5-1
+- Update for 3.7.5
+
+* Tue Jan 02 2007 Patrick West <pwest@ucar.edu> - 3.7.4-1
+- Update for 3.7.4
+
+* Fri Nov 24 2006 James Gallagher <jgallagher@opendap.org> - 3.7.3-1
+- Update for 3.7.3-1
+
+* Mon Sep 15 2006 James Gallagher <jgallagher@opendap.org> - 3.7.2-1
+- Update to 3.7.2
+
+* Mon Aug 21 2006 James Gallagher <jgallagher@opendap.org> - 3.7.1
+- Update to 3.7.1
+
+* Mon Feb 27 2006 James Gallagher <jgallagher@opendap.org> - 3.6.0-1
+- Update to 3.6.0
+
+* Mon Nov 21 2005 Patrice Dumas <pertusus@free.fr> - 3.5.3-2
+- fix Source0
+
+* Tue Aug 30 2005 Patrice Dumas <pertusus@free.fr> - 3.5.2-3
+- Add missing Requires
+
+* Sat Jul  2 2005 Patrice Dumas <pertusus@free.fr> - 3.5.1-2
+- Support for shared libraries
+- Add COPYING
+- Update with fedora template
+
+* Thu May 12 2005 James Gallagher <jimg@comet.opendap.org> - 3.5.0-1
+- Changed: Requires xml2 to libxml2
+
+* Wed May 11 2005 James Gallagher <jimg@zoey.opendap.org> 3.5.0-1
+- Removed version numbers from .a and includes directory.
+
+* Tue May 10 2005 James Gallagher <jimg@zoey.opendap.org> 
+- Mostly works. Problems: Not sure if the %%post script stuff works.
+- Must also address the RHEL3 package deps issue (curl 7.12.0 isn't available;
+  not sure about xml2 2.5.7). At least the deps fail when they are not present!
+
+* Fri May  6 2005 James Gallagher <jimg@zoey.opendap.org> 
+- Initial build.
diff --git a/libdapclient.pc.in b/libdapclient.pc.in
new file mode 100644
index 0000000..8bea689
--- /dev/null
+++ b/libdapclient.pc.in
@@ -0,0 +1,16 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+ccompiler=@CC@
+cppcompiler=@CXX@
+
+Name: libdapclient
+Description: Client side of the OPeNDAP C++ implementation of the Data Access Protocol
+Version: @VERSION@
+Requires: libdap
+Libs: -L${libdir} -ldapclient
+Libs.private: @curlprivatelibs@
+Requires.private: @curlprivatereq@
+Cflags: -I${includedir}/libdap
+
diff --git a/libdapserver.pc.in b/libdapserver.pc.in
new file mode 100644
index 0000000..3430038
--- /dev/null
+++ b/libdapserver.pc.in
@@ -0,0 +1,14 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+ccompiler=@CC@
+cppcompiler=@CXX@
+
+Name: libdapserver
+Description: Server side of the OPeNDAP C++ implementation of the Data Access Protocol
+Version: @VERSION@
+Requires: libdap
+Libs: -L${libdir} -ldapserver
+Cflags: -I${includedir}/libdap
+
diff --git a/main_page.doxygen.in b/main_page.doxygen.in
new file mode 100644
index 0000000..39cda8f
--- /dev/null
+++ b/main_page.doxygen.in
@@ -0,0 +1,79 @@
+// -*- C++ -*-
+
+// $Id: main_page.doxygen 21281 2009-08-18 06:38:17Z tomss $
+
+// Documentation for the main page of the doxygen-generated reference manual
+
+/** \mainpage
+
+\section intro Introduction
+
+This reference documentation corresponds to version @PACKAGE_VERSION@ of libdap, a C++
+implementation of DAP2, with some extensions. The libdap library
+includes classes and functions which implement DAP 2.0 as well as utilities
+which simpify building clients and servers for DAP 2.0 and DAP4.0. 
+
+\section conventions Doxygen Conventions
+
+This section lists some conventions used by the Doxygen comments
+which are used to generate this Reference Guide. Follow these conventions
+when adding to or modifying the reference documentation.
+
+\subsection general General
+
+<ul>
+<li>When using the name of a parameter, use italics (the \c e
+command or \c em tag).</li> 
+<li>Use the \c c command or \c code tag when talking about literal text.</li>
+<li>When talking about functions or methods, using <code>func()</code>
+or <code>func(arg0, ..., agrN)</code> will get Doxygen to insert a link to
+its documentation.</li>
+<li>Typos: If you're using emacs, the command \c ispell-comments-and-strings
+may help in removing typos in the comments (and strings ...)</li>
+</ul>
+
+\subsection classes Classes
+
+Classes should be documented in the header (\c .h) file where they are
+defined. 
+
+Commands that should be used for the documentation of classes:
+
+<dl> 
+<dt>author</dt><dd>Use this to attribute authorship. Include this for
+all the classes except internal ones which are not visible to users of the
+library.</dd>
+</dl>
+
+\subsection methods Methods and Functions
+
+Methods should be documented in the implementation (\c .cc) files where
+they are defined. You can put the \c brief documentation in the header file,
+but that may be more confusing than keeping all the method documentation in
+one place.
+
+Functions should be documented in their implementation files.
+
+Commands that should be used for the documentation of public methods and
+non-static functions:
+
+<dl>
+<dt>param</dt> <dd>Include for all parameters. Doxygen complains if an
+overloaded method changes a parameter name, so scan the warnings and try to
+keep the names in sync..</dd>
+
+<dt>return</dt> <dd>Include for all methods that return something unless the
+method is so simple its full description starts off with "Returns..."</dd>
+
+<dt>brief</dt> <dd>Include for all methods. In doxy.conf I have turned off
+the option that generates the \c brief entry from the first sentence of the
+detailed doc and the option that includes the \c brief documentation in the
+detailed documentation. So, the \c brief doc will appear only with the
+summary information and not with the detailed documentation for the
+method.</dd>
+
+<dt>exception</dt> <dd>Document the exceptions using the \c exception
+command.</dd>
+
+</dl>
+*/
diff --git a/media_types.h b/media_types.h
new file mode 100644
index 0000000..c652754
--- /dev/null
+++ b/media_types.h
@@ -0,0 +1,56 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2013 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+
+#ifndef MEDIA_TYPES_H_
+#define MEDIA_TYPES_H_
+
+#include <string>
+
+static std::string DAS1 = "dods_das";
+static std::string DAS2 = "dods-das";
+
+static std::string DDS1 = "dods_dds";
+static std::string DDS2 = "dods-dds";
+
+static std::string DAP2_DATA1 = "dods_data";
+static std::string DAP2_DATA2 = "dods-data";
+
+static std::string DDX1 = "dods_ddx";
+static std::string DDX2 = "dods-ddx";
+
+static std::string DAP2_ERR1 = "dods_error";
+static std::string DAP2_ERR2 = "dods-error";
+
+static std::string WEB_ERR1 = "web_error";
+static std::string WEB_ERR2 = "web-error";
+
+static std::string DAP4_DMR = "dap4-dmr";
+static std::string DAP4_DATA = "dap4-data";
+static std::string DAP4_ERR ="dap4-error";
+
+static const std::string DMR_Content_Type = "application/vnd.opendap.dap4.dataset-metadata";
+static const std::string DAP4_DATA_Content_Type = "application/vnd.opendap.dap4.data";
+// application/vnd.opendap.dap4.data
+#endif /* MEDIA_TYPES_H_ */
diff --git a/mime_util.cc b/mime_util.cc
new file mode 100644
index 0000000..bfe9d05
--- /dev/null
+++ b/mime_util.cc
@@ -0,0 +1,1241 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//         Reza Nekovei <rnekovei@intcomm.net>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1994-2001
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+//      reza            Reza Nekovei <rnekovei@intcomm.net>
+
+// A few useful routines which are used in CGI programs.
+//
+// ReZa 9/30/94
+
+#include "config.h"
+
+#include <cstring>
+#include <cstdio>
+#include <ctype.h>
+
+#ifndef TM_IN_SYS_TIME
+#include <time.h>
+#else
+#include <sys/time.h>
+#endif
+
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#ifndef WIN32
+#include <unistd.h>    // for access
+#include <sys/wait.h>
+#else
+#include <io.h>
+#include <fcntl.h>
+#include <process.h>
+// Win32 does not define this. 08/21/02 jhrg
+#define F_OK 0
+#endif
+
+#include <iostream>
+#include <sstream>
+#include <fstream>
+#include <string>
+
+#include "mime_util.h"
+#include "media_types.h"
+
+#include "Ancillary.h"
+#include "util.h"  // This supplies flush_stream for WIN32.
+#include "debug.h"
+
+#ifdef WIN32
+#define FILE_DELIMITER '\\'
+#else  //  default to unix
+#define FILE_DELIMITER '/'
+#endif
+
+// ...not using a const string here to avoid global objects. jhrg 12/23/05
+#define CRLF "\r\n"             // Change here, expr-test.cc, in DODSFilter and ResponseBuilder
+
+using namespace std;
+
+namespace libdap {
+
+/** Get the last modified time. Assume <tt>name</tt> is a file and
+    find its last modified time. If <tt>name</tt> is not a file, then
+    return now as the last modified time.
+    @param name The name of a file.
+    @return The last modified time or the current time. */
+time_t
+last_modified_time(const string &name)
+{
+    struct stat m;
+
+    if (stat(name.c_str(), &m) == 0 && (S_IFREG & m.st_mode))
+        return m.st_mtime;
+    else
+        return time(0);
+}
+// Return a MIME rfc-822 date. The grammar for this is:
+//       date-time   =  [ day "," ] date time        ; dd mm yy
+//                                                   ;  hh:mm:ss zzz
+//
+//       day         =  "Mon"  / "Tue" /  "Wed"  / "Thu"
+//                   /  "Fri"  / "Sat" /  "Sun"
+//
+//       date        =  1*2DIGIT month 2DIGIT        ; day month year
+//                                                   ;  e.g. 20 Jun 82
+//                   NB: year is 4 digit; see RFC 1123. 11/30/99 jhrg
+//
+//       month       =  "Jan"  /  "Feb" /  "Mar"  /  "Apr"
+//                   /  "May"  /  "Jun" /  "Jul"  /  "Aug"
+//                   /  "Sep"  /  "Oct" /  "Nov"  /  "Dec"
+//
+//       time        =  hour zone                    ; ANSI and Military
+//
+//       hour        =  2DIGIT ":" 2DIGIT [":" 2DIGIT]
+//                                                   ; 00:00:00 - 23:59:59
+//
+//       zone        =  "UT"  / "GMT"                ; Universal Time
+//                                                   ; North American : UT
+//                   /  "EST" / "EDT"                ;  Eastern:  - 5/ - 4
+//                   /  "CST" / "CDT"                ;  Central:  - 6/ - 5
+//                   /  "MST" / "MDT"                ;  Mountain: - 7/ - 6
+//                   /  "PST" / "PDT"                ;  Pacific:  - 8/ - 7
+//                   /  1ALPHA                       ; Military: Z = UT;
+//                                                   ;  A:-1; (J not used)
+//                                                   ;  M:-12; N:+1; Y:+12
+//                   / ( ("+" / "-") 4DIGIT )        ; Local differential
+//                                                   ;  hours+min. (HHMM)
+
+static const char *days[] =
+    {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
+    };
+static const char *months[] =
+    {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul",
+     "Aug", "Sep", "Oct", "Nov", "Dec"
+    };
+
+#ifdef _MSC_VER
+#define snprintf sprintf_s
+#endif
+/** Given a constant pointer to a <tt>time_t</tt>, return a RFC
+    822/1123 style date.
+
+    This function returns the RFC 822 date with the exception that the RFC
+    1123 modification for four-digit years is implemented.
+
+    @return The RFC 822/1123 style date in a C++ string.
+    @param t A const <tt>time_t</tt> pointer. */
+string
+rfc822_date(const time_t t)
+{
+    struct tm *stm = gmtime(&t);
+    if (!stm)
+    	return "";
+
+    char d[256];
+
+    snprintf(d, 255, "%s, %02d %s %4d %02d:%02d:%02d GMT", days[stm->tm_wday],
+            stm->tm_mday, months[stm->tm_mon],
+            1900 + stm->tm_year,
+            stm->tm_hour, stm->tm_min, stm->tm_sec);
+    d[255] = '\0';
+    return string(d);
+}
+
+static const int TimLen = 26; // length of string from asctime()
+//static const int CLUMP_SIZE = 1024; // size of clumps to new in fmakeword()
+
+/** This sends a formatted block of text to the client, containing
+    version information about various aspects of the server.  The
+    arguments allow you to enclose version information about the
+    filter program and the dataset in the message.  Either argument
+    (or both) may be omitted, in which case no script or dataset
+    version information will be printed.
+
+    @brief Send a version number.
+    @param script_ver The version of the filter script executing this
+    function.
+    @param dataset_ver The version of the dataset.
+    @return TRUE for success. Always returns true.
+*/
+bool
+do_version(const string &script_ver, const string &dataset_ver)
+{
+    fprintf(stdout, "HTTP/1.0 200 OK%s", CRLF) ;
+    fprintf(stdout, "XDODS-Server: %s%s", DVR, CRLF) ;
+    fprintf(stdout, "XOPeNDAP-Server: %s%s", DVR, CRLF) ;
+    fprintf(stdout, "XDAP: %s%s", DAP_PROTOCOL_VERSION, CRLF) ;
+    fprintf(stdout, "Content-Type: text/plain%s", CRLF) ;
+    fprintf(stdout, CRLF) ;
+
+    fprintf(stdout, "Core software version: %s%s", DVR, CRLF) ;
+
+    if (script_ver != "")
+        fprintf(stdout, "Server Script Revision: %s%s", script_ver.c_str(), CRLF) ;
+
+    if (dataset_ver != "")
+        fprintf(stdout,  "Dataset version: %s%s", dataset_ver.c_str(), CRLF) ;
+
+    fflush(stdout) ;            // Not sure this is needed. jhrg 12/23/05
+
+    return true;
+}
+
+/** Prints an error message in the <tt>httpd</tt> system log file, along with
+    a time stamp and the client host name (or address).
+
+    Use this instead of the functions in liberrmsg.a in the programs run by
+    the CGIs to report errors so those errors show up in HTTPD's log files.
+
+    @deprecated
+    @brief Logs an error message.
+    @return void
+*/
+void
+ErrMsgT(const string &Msgt)
+{
+    time_t TimBin;
+    char TimStr[TimLen];
+
+    if (time(&TimBin) == (time_t) - 1)
+        strncpy(TimStr, "time() error           ", TimLen-1);
+    else {
+    	char *ctime_value = ctime(&TimBin);
+    	if (!ctime_value)
+    		strncpy(TimStr, "Unknown", TimLen-1);
+    	else {
+    		strncpy(TimStr, ctime_value, TimLen-1);
+    		TimStr[TimLen - 2] = '\0'; // overwrite the \n
+    	}
+#if 0
+    	strncpy(TimStr, ctime(&TimBin), TimLen-1);
+    	TimStr[TimLen - 2] = '\0'; // overwrite the \n
+#endif
+    }
+
+    cerr << "[" << TimStr << "] DAP server error: " << Msgt << endl;
+}
+
+// Given a pathname, return just the filename component with any extension
+// removed. The new string resides in newly allocated memory; the caller must
+// delete it when done using the filename.
+// Originally from the netcdf distribution (ver 2.3.2).
+//
+// *** Change to string class argument and return type. jhrg
+// *** Changed so it also removes the#path#of#the#file# from decompressed
+//     files.  rph.
+// Returns: A filename, with path and extension information removed. If
+// memory for the new name cannot be allocated, does not return!
+
+/** Given a pathname, this function returns just the file name
+    component of the path.  That is, given <tt>/a/b/c/ralph.nc.das</tt>, it
+    returns <tt>ralph.nc</tt>.
+
+    @brief Returns the filename portion of a pathname.
+    @param path A C-style simple string containing a pathname to be
+    parsed.
+    @return A C-style simple string containing the filename component
+    of the given pathname.
+*/
+string
+name_path(const string &path)
+{
+    if (path == "")
+        return string("");
+
+    string::size_type delim = path.find_last_of(FILE_DELIMITER);
+    string::size_type pound = path.find_last_of("#");
+    string new_path;
+
+    if (pound != string::npos)
+        new_path = path.substr(pound + 1);
+    else
+        new_path = path.substr(delim + 1);
+
+    return new_path;
+}
+
+// Send string to set the transfer (mime) type and server version
+// Note that the content description filed is used to indicate whether valid
+// information of an error message is contained in the document and the
+// content-encoding field is used to indicate whether the data is compressed.
+// If the data stream is to be compressed, arrange for a compression output
+// filter so that all information sent after the header will be compressed.
+//
+// Returns: false if the compression output filter was to be used but could
+// not be started, true otherwise.
+#if 0
+static const char *descrip[] =
+    {"unknown", "dods_das", "dods_dds", "dods_data", "dods_ddx",
+     "dods_error", "web_error", "dap4-dmr", "dap4-data", "dap4-error"
+    };
+#endif
+
+static const char *descrip[] = {
+"unknown_type",
+"dods_das",
+"dods_dds",
+"dods_data",
+"dods_ddx",       // This is the old XML DDS/DAS used prior to dap4
+"dods_data_ddx",  // This is used for caching data responses
+"dods_error",
+"web_error",
+
+"dap4_dmr",       // DAP4 metadata
+"dap4_data",      // The DMR with a data blob
+"dap4_error"      // The error response for DAP4
+};
+
+static const char *encoding[] =
+    {"unknown", "deflate", "x-plain", "gzip", "binary"
+    };
+
+/** This function returns the ObjectType value that matches the given string.
+    Modified to include tests for the descriptions that use hyphens in addition
+    to underscores. 8/1/08 jhrg
+
+    @deprecated  */
+ObjectType
+get_type(const string &value)
+{
+	return get_description_type(value);
+}
+
+// TODO Recode to use the constants in media_types.h. jhrg 11/12/13
+
+/** This function returns the ObjectType value that matches the given string.
+    Modified to include tests for the descriptions that use hyphens in addition
+    to underscores. 8/1/08 jhrg
+
+    @param value Value from the HTTP response header */
+ObjectType
+get_description_type(const string &value)
+{
+    if ((value == DAS1) || (value == "dods-das"))
+        return dods_das;
+    else if ((value == "dods_dds") || (value == "dods-dds"))
+        return dods_dds;
+    else if ((value == "dods_data") || (value == "dods-data"))
+        return dods_data;
+    else if ((value == "dods_ddx") || (value == "dods-ddx"))
+        return dods_ddx;
+    else if ((value == "dods_data_ddx" || (value == "dods-data-ddx")))
+        return dods_data_ddx;
+    else if ((value == "dods_error") || (value == "dods-error"))
+        return dods_error;
+    else if ((value == "web_error") || (value == "web-error"))
+        return web_error;
+
+    else if ((value == "dap4_dmr") || (value == "dap4-dmr") || (value == DMR_Content_Type))
+        return dap4_dmr;
+    else if ((value == "dap4_data") || (value == "dap4-data") || (value == DAP4_DATA_Content_Type))
+        return dap4_data;
+    else if ((value == "dap4_error") || (value == "dap4-error"))
+        return dap4_error;
+
+    else
+        return unknown_type;
+}
+
+/** Generate an HTTP 1.0 response header for a text document. This is used
+    when returning a serialized DAS or DDS object.
+
+    @deprecated
+    @param out Write the MIME header to this FILE pointer.
+    @param type The type of this this response. Defaults to
+    application/octet-stream.
+    @param ver The version string; denotes the libdap implementation
+    version.
+    @param enc How is this response encoded? Can be plain or deflate or the
+    x_... versions of those. Default is x_plain.
+    @param last_modified The time to use for the Last-Modified header value.
+    Default is zero which means use the current time. */
+void
+set_mime_text(FILE *out, ObjectType type, const string &ver,
+              EncodingType enc, const time_t last_modified)
+{
+    ostringstream oss;
+    set_mime_text(oss, type, ver, enc, last_modified);
+    fwrite(oss.str().data(), 1, oss.str().length(), out);
+}
+
+/** Generate an HTTP 1.0 response header for a text document. This is used
+    when returning a serialized DAS or DDS object.
+
+    @deprecated
+    @param strm Write the MIME header to this stream.
+    @param type The type of this this response. Defaults to
+    application/octet-stream.
+    @param ver The version string; denotes the libdap implementation
+    version.
+    @param enc How is this response encoded? Can be plain or deflate or the
+    x_... versions of those. Default is x_plain.
+    @param last_modified The time to use for the Last-Modified header value.
+    Default is zero which means use the current time. */
+void
+set_mime_text(ostream &strm, ObjectType type, const string &ver,
+              EncodingType enc, const time_t last_modified)
+{
+    strm << "HTTP/1.0 200 OK" << CRLF ;
+    if (ver == "") {
+        strm << "XDODS-Server: " << DVR << CRLF ;
+        strm << "XOPeNDAP-Server: " << DVR << CRLF ;
+    }
+    else {
+        strm << "XDODS-Server: " << ver.c_str() << CRLF ;
+        strm << "XOPeNDAP-Server: " << ver.c_str() << CRLF ;
+    }
+    strm << "XDAP: " << DAP_PROTOCOL_VERSION << CRLF ;
+
+    const time_t t = time(0);
+    strm << "Date: " << rfc822_date(t).c_str() << CRLF ;
+
+    strm << "Last-Modified: " ;
+    if (last_modified > 0)
+        strm << rfc822_date(last_modified).c_str() << CRLF ;
+    else
+        strm << rfc822_date(t).c_str() << CRLF ;
+
+    if (type == dap4_dmr)
+        strm << "Content-Type: application/vnd.org.opendap.dap4.dataset-metadata+xml" << CRLF ;
+    else
+        strm << "Content-Type: text/plain" << CRLF ;
+
+    // Note that Content-Description is from RFC 2045 (MIME, pt 1), not 2616.
+    // jhrg 12/23/05
+    strm << "Content-Description: " << descrip[type] << CRLF ;
+    if (type == dods_error) // don't cache our error responses.
+        strm << "Cache-Control: no-cache" << CRLF ;
+    // Don't write a Content-Encoding header for x-plain since that breaks
+    // Netscape on NT. jhrg 3/23/97
+    if (enc != x_plain)
+        strm << "Content-Encoding: " << encoding[enc] << CRLF ;
+    strm << CRLF ;
+}
+
+/** Generate an HTTP 1.0 response header for a text document. This is used
+ when returning a serialized DAS or DDS object.
+
+ @note In Hyrax these headers are not used. Instead the front end of the
+ server will build the response headers
+
+ @param strm Write the MIME header to this stream.
+ @param type The type of this this response. Defaults to
+ application/octet-stream.
+ @param ver The version string; denotes the libdap implementation
+ version.
+ @param enc How is this response encoded? Can be plain or deflate or the
+ x_... versions of those. Default is x_plain.
+ @param last_modified The time to use for the Last-Modified header value.
+ Default is zero which means use the current time. */
+void set_mime_text(ostream &strm, ObjectType type, EncodingType enc, const time_t last_modified,
+        const string &protocol)
+{
+    strm << "HTTP/1.0 200 OK" << CRLF;
+
+    strm << "XDODS-Server: " << DVR << CRLF;
+    strm << "XOPeNDAP-Server: " << DVR << CRLF;
+
+    if (protocol == "")
+        strm << "XDAP: " << DAP_PROTOCOL_VERSION << CRLF;
+    else
+        strm << "XDAP: " << protocol << CRLF;
+
+    const time_t t = time(0);
+    strm << "Date: " << rfc822_date(t).c_str() << CRLF;
+
+    strm << "Last-Modified: ";
+    if (last_modified > 0)
+        strm << rfc822_date(last_modified).c_str() << CRLF;
+    else
+        strm << rfc822_date(t).c_str() << CRLF;
+
+    if (type == dap4_dmr)
+        strm << "Content-Type: application/vnd.org.opendap.dap4.dataset-metadata+xml" << CRLF;
+    else
+        strm << "Content-Type: text/plain" << CRLF;
+
+    // Note that Content-Description is from RFC 2045 (MIME, pt 1), not 2616.
+    // jhrg 12/23/05
+    strm << "Content-Description: " << descrip[type] << CRLF;
+    if (type == dods_error) // don't cache our error responses.
+        strm << "Cache-Control: no-cache" << CRLF;
+    // Don't write a Content-Encoding header for x-plain since that breaks
+    // Netscape on NT. jhrg 3/23/97
+    if (enc != x_plain)
+        strm << "Content-Encoding: " << encoding[enc] << CRLF;
+    strm << CRLF;
+}
+
+/** Generate an HTTP 1.0 response header for a html document.
+
+    @deprecated
+    @param out Write the MIME header to this FILE pointer.
+    @param type The type of this this response.
+    @param ver The version string; denotes the libdap implementation
+    version.
+    @param enc How is this response encoded? Can be plain or deflate or the
+    x_... versions of those. Default is x_plain.
+    @param last_modified The time to use for the Last-Modified header value.
+    Default is zero which means use the current time. */
+void
+set_mime_html(FILE *out, ObjectType type, const string &ver,
+              EncodingType enc, const time_t last_modified)
+{
+    ostringstream oss;
+    set_mime_html(oss, type, ver, enc, last_modified);
+    fwrite(oss.str().data(), 1, oss.str().length(), out);
+}
+
+/** Generate an HTTP 1.0 response header for a html document.
+
+    @deprecated
+    @param strm Write the MIME header to this stream.
+    @param type The type of this this response.
+    @param ver The version string; denotes the libdap implementation
+    version.
+    @param enc How is this response encoded? Can be plain or deflate or the
+    x_... versions of those. Default is x_plain.
+    @param last_modified The time to use for the Last-Modified header value.
+    Default is zero which means use the current time. */
+void
+set_mime_html(ostream &strm, ObjectType type, const string &ver,
+              EncodingType enc, const time_t last_modified)
+{
+    strm << "HTTP/1.0 200 OK" << CRLF ;
+    if (ver == "") {
+        strm << "XDODS-Server: " << DVR << CRLF ;
+        strm << "XOPeNDAP-Server: " << DVR << CRLF ;
+    }
+    else {
+        strm << "XDODS-Server: " << ver.c_str() << CRLF ;
+        strm << "XOPeNDAP-Server: " << ver.c_str() << CRLF ;
+    }
+    strm << "XDAP: " << DAP_PROTOCOL_VERSION << CRLF ;
+
+    const time_t t = time(0);
+    strm << "Date: " << rfc822_date(t).c_str() << CRLF ;
+
+    strm << "Last-Modified: " ;
+    if (last_modified > 0)
+        strm << rfc822_date(last_modified).c_str() << CRLF ;
+    else
+        strm << rfc822_date(t).c_str() << CRLF ;
+
+    strm << "Content-type: text/html" << CRLF ;
+    // See note above about Content-Description header. jhrg 12/23/05
+    strm << "Content-Description: " << descrip[type] << CRLF ;
+    if (type == dods_error) // don't cache our error responses.
+        strm << "Cache-Control: no-cache" << CRLF ;
+    // Don't write a Content-Encoding header for x-plain since that breaks
+    // Netscape on NT. jhrg 3/23/97
+    if (enc != x_plain)
+        strm << "Content-Encoding: " << encoding[enc] << CRLF ;
+    strm << CRLF ;
+}
+
+/** Generate an HTTP 1.0 response header for a html document.
+
+ @param strm Write the MIME header to this stream.
+ @param type The type of this this response.
+ @param ver The version string; denotes the libdap implementation
+ version.
+ @param enc How is this response encoded? Can be plain or deflate or the
+ x_... versions of those. Default is x_plain.
+ @param last_modified The time to use for the Last-Modified header value.
+ Default is zero which means use the current time. */
+void set_mime_html(ostream &strm, ObjectType type, EncodingType enc, const time_t last_modified,
+        const string &protocol)
+{
+    strm << "HTTP/1.0 200 OK" << CRLF;
+
+    strm << "XDODS-Server: " << DVR<< CRLF;
+    strm << "XOPeNDAP-Server: " << DVR<< CRLF;
+
+    if (protocol == "")
+        strm << "XDAP: " << DAP_PROTOCOL_VERSION << CRLF;
+    else
+        strm << "XDAP: " << protocol << CRLF;
+
+    const time_t t = time(0);
+    strm << "Date: " << rfc822_date(t).c_str() << CRLF;
+
+    strm << "Last-Modified: ";
+    if (last_modified > 0)
+        strm << rfc822_date(last_modified).c_str() << CRLF;
+    else
+        strm << rfc822_date(t).c_str() << CRLF;
+
+    strm << "Content-type: text/html" << CRLF;
+    // See note above about Content-Description header. jhrg 12/23/05
+    strm << "Content-Description: " << descrip[type] << CRLF;
+    if (type == dods_error) // don't cache our error responses.
+        strm << "Cache-Control: no-cache" << CRLF;
+    // Don't write a Content-Encoding header for x-plain since that breaks
+    // Netscape on NT. jhrg 3/23/97
+    if (enc != x_plain)
+        strm << "Content-Encoding: " << encoding[enc] << CRLF;
+    strm << CRLF;
+}
+
+/** Write an HTTP 1.0 response header for our binary response document (i.e.,
+    the DataDDS object).
+
+    @deprecated
+    @param out Write the MIME header to this FILE pointer.
+    @param type The type of this this response. Defaults to
+    application/octet-stream.
+    @param ver The version string; denotes the libdap implementation
+    version.
+    @param enc How is this response encoded? Can be plain or deflate or the
+    x_... versions of those. Default is x_plain.
+    @param last_modified The time to use for the Last-Modified header value.
+    Default is zero which means use the current time.
+ */
+void
+set_mime_binary(FILE *out, ObjectType type, const string &ver,
+                EncodingType enc, const time_t last_modified)
+{
+    ostringstream oss;
+    set_mime_binary(oss, type, ver, enc, last_modified);
+    fwrite(oss.str().data(), 1, oss.str().length(), out);
+}
+
+/** Write an HTTP 1.0 response header for our binary response document (i.e.,
+    the DataDDS object).
+
+    @deprecated
+    @param strm Write the MIME header to this stream.
+    @param type The type of this this response. Defaults to
+    application/octet-stream.
+    @param ver The version string; denotes the libdap implementation
+    version.
+    @param enc How is this response encoded? Can be plain or deflate or the
+    x_... versions of those. Default is x_plain.
+    @param last_modified The time to use for the Last-Modified header value.
+    Default is zero which means use the current time.
+ */
+void
+set_mime_binary(ostream &strm, ObjectType type, const string &ver,
+                EncodingType enc, const time_t last_modified)
+{
+    strm << "HTTP/1.0 200 OK" << CRLF ;
+    if (ver == "") {
+        strm << "XDODS-Server: " << DVR << CRLF ;
+        strm << "XOPeNDAP-Server: " << DVR << CRLF ;
+    }
+    else {
+        strm << "XDODS-Server: " << ver.c_str() << CRLF ;
+        strm << "XOPeNDAP-Server: " << ver.c_str() << CRLF ;
+    }
+    strm << "XDAP: " << DAP_PROTOCOL_VERSION << CRLF ;
+
+    const time_t t = time(0);
+    strm << "Date: " << rfc822_date(t).c_str() << CRLF ;
+
+    strm << "Last-Modified: " ;
+    if (last_modified > 0)
+        strm << rfc822_date(last_modified).c_str() << CRLF ;
+    else
+        strm << rfc822_date(t).c_str() << CRLF ;
+
+    strm << "Content-Type: application/octet-stream" << CRLF ;
+    strm << "Content-Description: " << descrip[type] << CRLF ;
+    if (enc != x_plain)
+        strm << "Content-Encoding: " << encoding[enc] << CRLF ;
+
+    strm << CRLF ;
+}
+
+/** Write an HTTP 1.0 response header for our binary response document (i.e.,
+ the DataDDS object).
+
+ @param strm Write the MIME header to this stream.
+ @param type The type of this this response. Defaults to
+ application/octet-stream.
+ @param ver The version string; denotes the libdap implementation
+ version.
+ @param enc How is this response encoded? Can be plain or deflate or the
+ x_... versions of those. Default is x_plain.
+ @param last_modified The time to use for the Last-Modified header value.
+ Default is zero which means use the current time.
+ */
+void set_mime_binary(ostream &strm, ObjectType type, EncodingType enc, const time_t last_modified,
+        const string &protocol)
+{
+    strm << "HTTP/1.0 200 OK" << CRLF;
+
+    strm << "XDODS-Server: " << DVR << CRLF;
+    strm << "XOPeNDAP-Server: " << DVR << CRLF;
+
+    if (protocol.empty())
+        strm << "XDAP: " << DAP_PROTOCOL_VERSION << CRLF;
+    else
+        strm << "XDAP: " << protocol << CRLF;
+
+    const time_t t = time(0);
+    strm << "Date: " << rfc822_date(t).c_str() << CRLF;
+
+    strm << "Last-Modified: ";
+    if (last_modified > 0)
+        strm << rfc822_date(last_modified).c_str() << CRLF;
+    else
+        strm << rfc822_date(t).c_str() << CRLF;
+
+    strm << "Content-Type: application/octet-stream" << CRLF;
+    strm << "Content-Description: " << descrip[type] << CRLF;
+    if (enc != x_plain)
+        strm << "Content-Encoding: " << encoding[enc] << CRLF;
+
+    strm << CRLF;
+}
+
+void set_mime_multipart(ostream &strm, const string &boundary,
+	const string &start, ObjectType type,
+        const string &version, EncodingType enc,
+        const time_t last_modified)
+{
+    strm << "HTTP/1.0 200 OK" << CRLF ;
+    if (version == "") {
+        strm << "XDODS-Server: " << DVR << CRLF ;
+        strm << "XOPeNDAP-Server: " << DVR << CRLF ;
+    }
+    else {
+        strm << "XDODS-Server: " << version.c_str() << CRLF ;
+        strm << "XOPeNDAP-Server: " << version.c_str() << CRLF ;
+    }
+    strm << "XDAP: " << DAP_PROTOCOL_VERSION << CRLF ;
+
+    const time_t t = time(0);
+    strm << "Date: " << rfc822_date(t).c_str() << CRLF ;
+
+    strm << "Last-Modified: " ;
+    if (last_modified > 0)
+        strm << rfc822_date(last_modified).c_str() << CRLF ;
+    else
+        strm << rfc822_date(t).c_str() << CRLF ;
+
+    strm << "Content-Type: Multipart/Related; boundary=" << boundary
+	<< "; start=\"<" << start << ">\"; type=\"Text/xml\"" << CRLF ;
+    strm << "Content-Description: " << descrip[type] << CRLF ;
+    if (enc != x_plain)
+        strm << "Content-Encoding: " << encoding[enc] << CRLF ;
+
+    strm << CRLF ;
+}
+
+/** Build the initial headers for the DAP4 data response */
+
+void set_mime_multipart(ostream &strm, const string &boundary, const string &start, ObjectType type, EncodingType enc,
+        const time_t last_modified, const string &protocol, const string &url)
+{
+    strm << "HTTP/1.1 200 OK" << CRLF;
+
+    const time_t t = time(0);
+    strm << "Date: " << rfc822_date(t).c_str() << CRLF;
+
+    strm << "Last-Modified: ";
+    if (last_modified > 0)
+        strm << rfc822_date(last_modified).c_str() << CRLF;
+    else
+        strm << rfc822_date(t).c_str() << CRLF;
+
+    strm << "Content-Type: multipart/related; boundary=" << boundary << "; start=\"<" << start
+            << ">\"; type=\"text/xml\"" << CRLF;
+
+    // data-ddx;"; removed as a result of the merge of the hyrax 1.8 release
+    // branch.
+    strm << "Content-Description: " << descrip[type] << ";";
+    if (!url.empty())
+        strm << " url=\"" << url << "\"" << CRLF;
+    else
+        strm << CRLF;
+
+    if (enc != x_plain)
+        strm << "Content-Encoding: " << encoding[enc] << CRLF;
+
+    if (protocol == "")
+        strm << "X-DAP: " << DAP_PROTOCOL_VERSION << CRLF;
+    else
+        strm << "X-DAP: " << protocol << CRLF;
+
+    strm << "X-OPeNDAP-Server: " << DVR<< CRLF;
+
+    strm << CRLF;
+}
+
+void set_mime_ddx_boundary(ostream &strm, const string &boundary,
+	const string &cid, ObjectType type, EncodingType enc)
+{
+    strm << "--" << boundary << CRLF;
+    // TODO - Bite the bullet and make the encoding UTF-8 as required by dap4. This will break a lot of tests but the baselines could be amended using  a bash script and sed.
+    strm << "Content-Type: Text/xml; charset=iso-8859-1" << CRLF;
+    strm << "Content-Id: <" << cid << ">" << CRLF;
+    strm << "Content-Description: " << descrip[type] << CRLF ;
+    if (enc != x_plain)
+         strm << "Content-Encoding: " << encoding[enc] << CRLF ;
+
+    strm << CRLF;
+}
+
+void set_mime_data_boundary(ostream &strm, const string &boundary,
+	const string &cid, ObjectType type, EncodingType enc)
+{
+    strm << "--" << boundary << CRLF;
+    strm << "Content-Type: application/octet-stream" << CRLF;
+    strm << "Content-Id: <" << cid << ">" << CRLF;
+    strm << "Content-Description: " << descrip[type] << CRLF ;
+    if (enc != x_plain)
+         strm << "Content-Encoding: " << encoding[enc] << CRLF ;
+
+    strm << CRLF;
+}
+
+const size_t line_length = 1024;
+
+/** Read the next MIME header from the input stream and return it in a string
+    object. This function consumes any leading whitespace before the next
+    header. It returns an empty string when the blank line that separates
+    the headers from the body is found. This function works for header and
+    separator lines that use either a CRLF pair (the correct line ending) or
+    just a newline (a common error).
+
+    @deprecated
+    @note FIXME: This function returns tainted data.
+    @param in Read from this stream (FILE *)
+    @return A string that contains the next header line or is empty indicating
+    the separator has been read.
+    @exception Error is thrown if no header or separator is found.
+    @see parse_mime_header()
+ */
+string get_next_mime_header(FILE *in)
+{
+    // Get the header line and strip \r\n. Some headers end with just \n.
+    // If a blank line is found, return an empty string.
+    char line[line_length];
+    while (!feof(in)) {
+        if (fgets(line, line_length, in)
+        	&& (strncmp(line, CRLF, 2) == 0 || line[0] == '\n'))
+            return "";
+        else {
+            size_t slen = min(strlen(line), line_length); // Never > line_length
+            line[slen - 1] = '\0'; // remove the newline
+            if (line[slen - 2] == '\r') // ...and the preceding carriage return
+                line[slen - 2] = '\0';
+            return string(line);
+        }
+    }
+
+    throw Error("I expected to find a MIME header, but got EOF instead.");
+}
+
+/**
+ * This function and its companion read the next MIME header from an
+ * input stream (or FILE*) and return it as a string. The stream
+ * pointer is updated to the next line of input. It returns an empty
+ * string when the blank line ending the MIME headers is found.
+ *
+ * @note FIXME: This function returns tainted data.
+ *
+ * @param in Read the next header from the input stream
+ * @return Return the next header in a string; an empty string indicates
+ * all headers have been returned.
+ */
+string get_next_mime_header(istream &in)
+{
+#if 0
+    // Get the header line and strip \r\n. Some headers end with just \n.
+    // If a blank line is found, return an empty string.
+	char line[line_length];
+	while (!in.eof()) {
+		in.getline(line, line_length);
+		if (strncmp(line, CRLF, 2) == 0 || line[0] == '\n') {
+			return "";
+		}
+		else {
+			size_t slen = min(strlen(line), line_length); // Never > line_length
+			line[slen - 1] = '\0'; // remove the newline
+			if (line[slen - 2] == '\r') // ...and the preceding carriage return
+				line[slen - 2] = '\0';
+			return string(line);
+		}
+	}
+#endif
+    // Get the header line and strip \r\n. Some headers end with just \n.
+    // If a blank line is found, return an empty string.
+	char raw_line[line_length];
+	while (!in.eof()) {
+		in.getline(raw_line, line_length); // strips the trailing newline; terminates with null
+		string line = raw_line;
+		if (line.find('\r') != string::npos)
+			line = line.substr(0, line.size()-1);
+		return line;
+	}
+
+	throw Error("I expected to find a MIME header, but got EOF instead.");
+}
+
+/** Given a string that contains a MIME header line, parse it into the
+    the header (name) and its value. Both are downcased.
+
+    @param header The input line, striped of the ending crlf pair
+    @param name A value-result parameter that holds the header name
+    @param value A value-result parameter that holds the header's value.
+ */
+void parse_mime_header(const string &header, string &name, string &value)
+{
+    istringstream iss(header);
+
+    size_t length = header.length() + 1;
+    vector<char> s(length);
+    //char s[line_length];
+    iss.getline(&s[0], length, ':');
+    name = &s[0];
+
+    iss.ignore(length, ' ');
+    iss.getline(&s[0], length);
+    value = &s[0];
+
+    downcase(name);
+    downcase(value);
+}
+
+/** Is this string the same as the MPM boundary value?
+
+    @note Since fgets() is used to read into line, it is guaranteed to be
+    null terminated.
+
+    @param line The input to test
+    @param boundary The complete boundary line to test for, excluding
+    terminating characters.
+    @return true is line is a MPM boundary
+ */
+
+bool is_boundary(const char *line, const string &boundary)
+{
+    if (strlen(line) < 2 || !(line[0] == '-' && line[1] == '-'))
+		return false;
+    else
+		return strncmp(line, boundary.c_str(), boundary.length()) == 0;
+}
+
+/** Read the next line of input and test to see if it is a multipart MIME
+    boundary line. If the value of boundary is the default (an empty string)
+    then just test that the line starts with "--". In either case, return the
+    value of boundary just read.
+
+    @param boundary Value of the boundary to look for - optional
+    @param in Read from this FILE*
+    @return The value of teh boundary header read
+    @exception Error if no boundary was found.
+ */
+string read_multipart_boundary(FILE *in, const string &boundary)
+{
+    string boundary_line = get_next_mime_header(in);
+    // If the caller passed in a value for the boundary, test for that value,
+    // else just see that this line starts with '--'.
+    // The value of 'boundary_line' is returned by this function.
+    if ((!boundary.empty() && is_boundary(boundary_line.c_str(), boundary))
+	    || boundary_line.find("--") != 0)
+	throw Error(internal_error, "The DAP4 data response document is broken - missing or malformed boundary.");
+
+    return boundary_line;
+}
+
+string read_multipart_boundary(istream &in, const string &boundary)
+{
+    string boundary_line = get_next_mime_header(in);
+    // If the caller passed in a value for the boundary, test for that value,
+    // else just see that this line starts with '--'.
+    // The value of 'boundary_line' is returned by this function.
+    if ((!boundary.empty() && is_boundary(boundary_line.c_str(), boundary))
+	    || boundary_line.find("--") != 0)
+	throw Error(internal_error, "The DAP4 data response document is broken - missing or malformed boundary.");
+
+    return boundary_line;
+}
+
+/** Consume the Multipart MIME headers that prefix the DDX in a DataDDX
+    response. The stream pointer is advanced to the start of the DDX. It might
+    seem odd that this function both takes the value of the MPM boundary as
+    a parameter _and_ returns that value as a result, but this code can be
+    used in two different situations. In one case, it is called on a partial
+    document read from stdin and needs to return the value of boundary to the
+    downstream DDX parser so that code can sense the end of the DDX. In the
+    other case, this function is told the value of boundary and tests for it
+    to ensure document correctness.
+
+    @param in Read from this stream
+    @param content_type The expected value of the Content-Type header
+    @param object_type The expected value of the Content-Description header
+    @param cid The expected value of the Content-Id header - optional.
+
+    @return The value of the MIME boundary
+    @exception Error if the boundary is not found or if any of the expected
+    header values don't match. The optional values are tested only if they
+    are given (the default values are not tested).
+ */
+void read_multipart_headers(FILE *in, const string &content_type, const ObjectType object_type, const string &cid)
+{
+	bool ct = false, cd = false, ci = false;
+
+	// The function get_next_mime_header() returns tainted data. Fix this
+	// if we are going to use this code. jhrg 4/18/17
+	string header = get_next_mime_header(in);
+	while (!header.empty()) {
+		string name, value;
+		parse_mime_header(header, name, value);
+
+		if (name == "content-type") {
+			ct = true;
+			if (value.find(content_type) == string::npos)
+				throw Error(internal_error, "Content-Type for this part of a DAP2 data ddx response must be " + content_type + ".");
+		}
+		else if (name == "content-description") {
+			cd = true;
+			if (get_description_type(value) != object_type)
+				throw Error(internal_error, "Content-Description for this part of a DAP2 data ddx response must be dods-ddx or dods-data-ddx");
+		}
+		else if (name == "content-id") {
+			ci = true;
+			if (!cid.empty() && value != cid)
+				throw Error("Content-Id mismatch. Expected: " + cid + ", but got: " + value);
+		}
+
+		header = get_next_mime_header(in);
+	}
+
+	if (!(ct && cd && ci)) throw Error(internal_error, "The DAP4 data response document is broken - missing header.");
+}
+
+void read_multipart_headers(istream &in, const string &content_type, const ObjectType object_type, const string &cid)
+{
+	bool ct = false, cd = false, ci = false;
+
+	string header = get_next_mime_header(in);
+	while (!header.empty()) {
+		string name, value;
+		parse_mime_header(header, name, value);
+
+		if (name == "content-type") {
+			ct = true;
+			if (value.find(content_type) == string::npos)
+				throw Error(internal_error, "Content-Type for this part of a DAP4 data response must be " + content_type + ".");
+		}
+		else if (name == "content-description") {
+			cd = true;
+			if (get_description_type(value) != object_type)
+				throw Error("Content-Description '" + value + "' not the expected value (expected: " + descrip[object_type] + ").");
+		}
+		else if (name == "content-id") {
+			ci = true;
+			if (!cid.empty() && value != cid)
+				throw Error("Content-Id mismatch. Expected: " + cid + ", but got: " + value);
+		}
+
+		header = get_next_mime_header(in);
+	}
+
+	if (!(ct && cd && ci)) throw Error(internal_error, "The DAP4 data response document is broken - missing header.");
+}
+
+/** Given a Content-Id read from the DDX, return the value to look for in a
+    MPM Content-Id header. This function downcases the CID to match the value
+    returned by parse_mime_header.
+
+    @param cid The Content-Id read from the DDX
+    @return The header value to look for.
+    @exception Error if the CID does not start with the string "cid:"
+ */
+string cid_to_header_value(const string &cid)
+{
+    string::size_type offset = cid.find("cid:");
+    if (offset != 0)
+        throw Error(internal_error, "expected CID to start with 'cid:'");
+
+    string value = "<";
+    value.append(cid.substr(offset + 4));
+    value.append(">");
+    downcase(value);
+
+    return value;
+}
+
+/** Generate an HTTP 1.0 response header for an Error object.
+
+    @deprecated
+    @param out Write the MIME header to this FILE pointer.
+    @param code HTTP 1.0 response code. Should be 400, ... 500, ...
+    @param reason Reason string of the HTTP 1.0 response header.
+    @param version The version string; denotes the DAP spec and implementation
+    version. */
+void
+set_mime_error(FILE *out, int code, const string &reason,
+               const string &version)
+{
+    ostringstream oss;
+    set_mime_error(oss, code, reason, version);
+    fwrite(oss.str().data(), 1, oss.str().length(), out);
+}
+
+/** Generate an HTTP 1.0 response header for an Error object.
+
+    @deprecated
+    @param strm Write the MIME header to this stream.
+    @param code HTTP 1.0 response code. Should be 400, ... 500, ...
+    @param reason Reason string of the HTTP 1.0 response header.
+    @param version The version string; denotes the DAP spec and implementation
+    version. */
+void
+set_mime_error(ostream &strm, int code, const string &reason,
+               const string &version)
+{
+    strm << "HTTP/1.0 " << code << " " << reason.c_str() << CRLF ;
+    if (version == "") {
+        strm << "XDODS-Server: " << DVR << CRLF ;
+        strm << "XOPeNDAP-Server: " << DVR << CRLF ;
+    }
+    else {
+        strm << "XDODS-Server: " << version.c_str() << CRLF ;
+        strm << "XOPeNDAP-Server: " << version.c_str() << CRLF ;
+    }
+    strm << "XDAP: " << DAP_PROTOCOL_VERSION << CRLF ;
+
+    const time_t t = time(0);
+    strm << "Date: " << rfc822_date(t).c_str() << CRLF ;
+    strm << "Cache-Control: no-cache" << CRLF ;
+    strm << CRLF ;
+}
+
+/** Use this function to create a response signaling that the target of a
+    conditional get has not been modified relative to the condition given in
+    the request. This will have to be a date until the servers support ETags.
+
+    @deprecated
+    @brief Send a `Not Modified' response.
+    @param out Write the response to this FILE pointer. */
+void
+set_mime_not_modified(FILE *out)
+{
+    ostringstream oss;
+    set_mime_not_modified(oss);
+    fwrite(oss.str().data(), 1, oss.str().length(), out);
+}
+
+/** Use this function to create a response signaling that the target of a
+    conditional get has not been modified relative to the condition given in
+    the request. This will have to be a date until the servers support ETags.
+
+    @deprecated
+    @brief Send a `Not Modified' response.
+    @param strm Write the response to this stream. */
+void
+set_mime_not_modified(ostream &strm)
+{
+    strm << "HTTP/1.0 304 NOT MODIFIED" << CRLF ;
+    const time_t t = time(0);
+    strm << "Date: " << rfc822_date(t).c_str() << CRLF ;
+    strm << CRLF ;
+}
+
+#if 0
+
+// This was removed because it's not being used by our server.
+
+/** Look for the override file by taking the dataset name and
+    appending `.ovr' to it. If such a file exists, then read it in and
+    store the contents in <tt>doc</tt>. Note that the file contents
+    are not checked to see if they are valid HTML (which they must
+    be).
+
+    @deprecated
+    @return True if the `override file' is present, false otherwise. in the
+    later case <tt>doc</tt>'s contents are undefined.  */
+bool
+found_override(string name, string &doc)
+{
+    ifstream ifs((name + ".ovr").c_str());
+    if (!ifs)
+        return false;
+
+    char tmp[256];
+    doc = "";
+    while (!ifs.eof()) {
+        ifs.getline(tmp, 255);
+        tmp[255] = '\0';
+        strncat(tmp, "\n", sizeof(tmp) - strlen(tmp) - 1);
+        doc += tmp;
+    }
+
+	ifs.close();
+    return true;
+}
+#endif
+
+/** Read the input stream <tt>in</tt> and discard the MIME header. The MIME
+    header is separated from the body of the document by a single blank line.
+    If no MIME header is found, then the input stream is `emptied' and will
+    contain nothing.
+
+    @deprecated
+    @brief Read and discard the MIME header of the stream <tt>in</tt>.
+    @return True if a MIME header is found, false otherwise.
+*/
+bool
+remove_mime_header(FILE *in)
+{
+    char tmp[256];
+    while (!feof(in)) {
+        char *s = fgets(tmp, 255, in);
+        if (s && strncmp(s, CRLF, 2) == 0)
+            return true;
+    }
+
+    return false;
+}
+
+/**
+ * Used for test code; strip the leading MIME headers from a response.
+ * @param in
+ */
+void
+remove_mime_header(istream &in)
+{
+	while(!get_next_mime_header(in).empty()) ;
+#if 0
+	string header;
+	do {
+		header = get_next_mime_header(in);
+	} while (!header.empty());
+#endif
+}
+
+} // namespace libdap
+
diff --git a/mime_util.h b/mime_util.h
new file mode 100644
index 0000000..a4a48c9
--- /dev/null
+++ b/mime_util.h
@@ -0,0 +1,182 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1995-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+//      reza            Reza Nekovei <reza@intcomm.net>
+
+// External definitions for utility functions used by servers.
+//
+// 2/22/95 jhrg
+
+#ifndef _mime_util_h
+#define _mime_util_h
+
+#include "media_types.h"	// Remove when the deprecated stuff comes out of the library. 11/12/13 jhrg
+
+#ifndef _object_type_h
+#include "ObjectType.h"
+#endif
+
+#ifndef _encoding_type_h
+#include "EncodingType.h"
+#endif
+
+#include <string>
+
+namespace libdap
+{
+
+/** The CGI utilities include a variety of functions useful to
+    programmers developing OPeNDAP CGI filter programs. However, before jumping
+    in and using these, look at the class ResponseBuilder. Always choose to use
+    that class over these functions if you can. Many of these functions were used
+    by the CGI programs that made up the first DAP server; all of those are
+    deprecated and the ResponseBuilder class should be used instead. Some of
+    the other functions are used by ResponseBuilder and the client-side parsing
+    code that needs to identify MIME headers, boundaries, etc.
+
+    @name MIME Utilities
+    @brief A collection of useful functions for writing MIME headers for
+    OPeNDAP servers.
+    @see ResponseBuilder, Connect, DDXParserSAX2
+    */
+
+//@{
+std::string rfc822_date(const time_t t);
+time_t last_modified_time(const std::string &name);
+ObjectType get_description_type(const std::string &value);
+bool is_boundary(const char *line, const std::string &boundary);
+std::string cid_to_header_value(const std::string &cid);
+
+std::string read_multipart_boundary(std::istream &in, const std::string &boundary = "");
+
+void parse_mime_header(const std::string &header, std::string &name, std::string &value);
+std::string name_path(const std::string &path);
+std::string get_next_mime_header(std::istream &in);
+
+void read_multipart_headers(std::istream &in, const std::string &content_type,
+	const ObjectType object_type, const std::string &cid = "");
+
+// For testing only
+void remove_mime_header(std::istream &in);
+
+// All of these are deprecated
+std::string read_multipart_boundary(FILE *in, const std::string &boundary = "");
+void read_multipart_headers(FILE *in, const std::string &content_type,
+	const ObjectType object_type, const std::string &cid = "");
+bool do_version(const std::string &script_ver, const std::string &dataset_ver);
+void ErrMsgT(const std::string &Msgt);
+ObjectType get_type(const std::string &value);
+std::string get_next_mime_header(FILE *in);
+bool remove_mime_header(FILE *in);
+
+#if 0
+bool found_override(std::string name, std::string &doc);
+#endif
+//@}
+
+/** These functions are used to create the MIME headers for a message
+    from a server to a client. They are public but should not be called
+    directly unless absolutely necessary. Use DODSFilter instead.
+
+    NB: These functions actually write both the response status line
+    <i>and</i> the header.
+
+    @deprecated Use ResponseBuilder instead.
+    @name MIME utility functions
+    @see DODSFilter
+*/
+//@{
+void set_mime_text(FILE *out, ObjectType type = unknown_type,
+                   const std::string &version = "", EncodingType enc = x_plain,
+                   const time_t last_modified = 0);
+void set_mime_text(std::ostream &out, ObjectType type = unknown_type,
+                   const std::string &version = "", EncodingType enc = x_plain,
+                   const time_t last_modified = 0);
+void set_mime_text(std::ostream &out, ObjectType type = unknown_type,
+                   EncodingType enc = x_plain,
+                   const time_t last_modified = 0,
+                   const std::string &protocol = "");
+
+void set_mime_html(FILE *out, ObjectType type = unknown_type,
+                   const std::string &version = "", EncodingType enc = x_plain,
+                   const time_t last_modified = 0);
+void set_mime_html(std::ostream &out, ObjectType type = unknown_type,
+                   const std::string &version = "", EncodingType enc = x_plain,
+                   const time_t last_modified = 0);
+void set_mime_html(std::ostream &out, ObjectType type = unknown_type,
+                   EncodingType enc = x_plain,
+                   const time_t last_modified = 0,
+                   const std::string &protocol = "");
+
+void set_mime_binary(FILE *out, ObjectType type = unknown_type,
+                     const std::string &version = "", EncodingType enc = x_plain,
+                     const time_t last_modified = 0);
+void set_mime_binary(std::ostream &out, ObjectType type = unknown_type,
+                     const std::string &version = "", EncodingType enc = x_plain,
+                     const time_t last_modified = 0);
+void set_mime_binary(std::ostream &out, ObjectType type = unknown_type,
+                     EncodingType enc = x_plain,
+                     const time_t last_modified = 0,
+                     const std::string &protocol = "");
+
+void set_mime_multipart(std::ostream &out, const std::string &boundary,
+	const std::string &start, ObjectType type = unknown_type,
+        const std::string &version = "", EncodingType enc = x_plain,
+        const time_t last_modified = 0);
+
+void set_mime_multipart(std::ostream &out, const std::string &boundary,
+	const std::string &start, ObjectType type = unknown_type, EncodingType enc = x_plain,
+	const time_t last_modified = 0, const std::string &protocol = "",
+	const std::string &url = "");
+
+void set_mime_ddx_boundary(std::ostream &out, const std::string &boundary,
+	const std::string &start, ObjectType type = unknown_type,
+        EncodingType enc = x_plain);
+
+void set_mime_data_boundary(std::ostream &out, const std::string &boundary,
+	const std::string &cid, ObjectType type = unknown_type,
+        EncodingType enc = x_plain);
+
+void set_mime_error(FILE *out, int code = 404,
+                    const std::string &reason = "Dataset not found",
+                    const std::string &version = "");
+void set_mime_error(std::ostream &out, int code = 404,
+                    const std::string &reason = "Dataset not found",
+                    const std::string &version = "");
+
+void set_mime_not_modified(FILE *out);
+void set_mime_not_modified(std::ostream &out);
+
+
+//@}
+
+} // namespace libdap
+
+#endif // _mime_util_h
diff --git a/parser-util.cc b/parser-util.cc
new file mode 100644
index 0000000..9297229
--- /dev/null
+++ b/parser-util.cc
@@ -0,0 +1,543 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1995-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// These functions are utility functions used by the various DAP parsers (the
+// DAS, DDS and constraint expression parsers).
+// jhrg 9/7/95
+
+#include "config.h"
+
+#include <cerrno>
+#include <cassert>
+#include <cstring>
+#include <cmath>
+#include <cstdlib>
+
+#include <iostream>
+#include <sstream>
+
+//  We wrap VC++ 6.x strtod() to account for a short comming
+//  in that function in regards to "NaN".
+#ifdef WIN32
+#include <limits>
+double w32strtod(const char *, char **);
+#endif
+
+#include "Error.h"
+#include "debug.h"
+#include "parser.h"             // defines constants such as ID_MAX
+#include "dods-limits.h"
+#include "util.h"               // Jose Garcia: for append_long_to_string.
+
+using std::cerr;
+using std::endl;
+
+#ifdef WIN32
+//  VC++ 6.x strtod() doesn't recognize "NaN".  Account for it
+//  by wrapping it around a check for the Nan string.  Use of
+//  the product is obsolete as of 1/2007, but it is unknown if
+//  the issue is still there in later releases of that product.
+//  ROM - 01/2007
+double w32strtod(const char *val, char **ptr)
+{
+    //  Convert the two char arrays to compare to strings.
+    string *sval = new string(val);
+    string *snan = new string("NaN");
+
+    //  If val doesn't contain "NaN|Nan|nan|etc", use strtod as
+    //  provided.
+    if (stricmp(sval->c_str(), snan->c_str()) != 0)
+        return (strtod(val, ptr));
+
+    //  But if it does, return the bit pattern for Nan and point
+    //  the parsing ptr arg at the trailing '\0'.
+    *ptr = (char *) val + strlen(val);
+    return (std::numeric_limits < double >::quiet_NaN());
+}
+#endif
+
+namespace libdap {
+
+// Deprecated, but still used by the HDF4 EOS server code.
+void
+parse_error(parser_arg * arg, const char *msg, const int line_num,
+            const char *context)
+{
+    // Jose Garcia
+    // This assert(s) is (are) only for developing purposes
+    // For production servers remove it by compiling with NDEBUG
+    assert(arg);
+    assert(msg);
+
+    arg->set_status(FALSE);
+
+    string oss = "";
+
+    if (line_num != 0) {
+        oss += "Error parsing the text on line ";
+        append_long_to_string(line_num, 10, oss);
+    }
+    else {
+        oss += "Parse error.";
+    }
+
+    if (context)
+        oss += (string) " at or near: " + context + (string) "\n" + msg
+               + (string) "\n";
+    else
+        oss += (string) "\n" + msg + (string) "\n";
+
+    arg->set_error(new Error(unknown_error, oss));
+}
+
+void
+parse_error(const char *msg, const int line_num, const char *context)
+{
+    // Jose Garcia
+    // This assert(s) is (are) only for developing purposes
+    // For production servers remove it by compiling with NDEBUG
+    assert(msg);
+
+    string oss = "";
+
+    if (line_num != 0) {
+        oss += "Error parsing the text on line ";
+        append_long_to_string(line_num, 10, oss);
+    }
+    else {
+        oss += "Parse error.";
+    }
+
+    if (context)
+        oss += (string) " at or near: " + context + (string) "\n" + msg
+               + (string) "\n";
+    else
+        oss += (string) "\n" + msg + (string) "\n";
+
+    throw Error(malformed_expr, oss);
+}
+
+// context comes from the parser and will always be a char * unless the
+// parsers change dramatically.
+void
+parse_error(const string & msg, const int line_num, const char *context)
+{
+    parse_error(msg.c_str(), line_num, context);
+}
+
+void save_str(char *dst, const char *src, const int line_num)
+{
+    if (strlen(src) >= ID_MAX)
+        parse_error(string("The word `") + string(src)
+                    + string("' is too long (it should be no longer than ")
+                    + long_to_string(ID_MAX) + string(")."), line_num);
+
+    strncpy(dst, src, ID_MAX);
+    dst[ID_MAX - 1] = '\0';     /* in case ... */
+}
+
+void save_str(string & dst, const char *src, const int)
+{
+    dst = src;
+}
+
+bool is_keyword(string id, const string & keyword)
+{
+    downcase(id);
+    id = prune_spaces(id);
+    DBG(cerr << "is_keyword: " << keyword << " = " << id << endl);
+    return id == keyword;
+}
+
+/** Check to see if <tt>val</tt> is a valid byte value. If not,
+    generate an error message using <tt>parser_error()</tt>. There are
+    two versions of <tt>check_byte()</tt>, one which calls
+    <tt>parser_error()</tt> and prints an error message to stderr an
+    one which calls <tt>parser_error()</tt> and generates and Error
+    object.
+
+    @return Returns: TRUE (1) if <i>val</i> is a byte value, FALSE (0) otherwise.
+    @brief Is the value a valid byte?
+    */
+int check_byte(const char *val)
+{
+    char *ptr;
+    long v = strtol(val, &ptr, 0);
+
+    if ((v == 0 && val == ptr) || *ptr != '\0') {
+        return FALSE;
+    }
+
+    DBG(cerr << "v: " << v << endl);
+
+    // We're very liberal here with values. Anything that can fit into 8 bits
+    // is allowed through. Clients will have to deal with the fact that the
+    // ASCII representation for the value might need to be tweaked. This is
+    // especially the case for Java clients where Byte datatypes are
+    // signed. 3/20/2000 jhrg
+    if ((v < 0 && v < DODS_SCHAR_MIN)
+        || (v > 0 && static_cast < unsigned long >(v) > DODS_UCHAR_MAX))
+        return FALSE;
+
+    return TRUE;
+}
+
+// This version of check_int will pass base 8, 10 and 16 numbers when they
+// use the ANSI standard for string representation of those number bases.
+
+int check_int16(const char *val)
+{
+    char *ptr;
+    long v = strtol(val, &ptr, 0);      // `0' --> use val to determine base
+
+    if ((v == 0 && val == ptr) || *ptr != '\0') {
+        return FALSE;
+    }
+    // Don't use the constant from limits.h, use the ones in dods-limits.h
+    if (v > DODS_SHRT_MAX || v < DODS_SHRT_MIN) {
+        return FALSE;
+    }
+
+    return TRUE;
+}
+
+int check_uint16(const char *val)
+{
+    char *ptr;
+    unsigned long v = strtol(val, &ptr, 0);
+
+    if ((v == 0 && val == ptr) || *ptr != '\0') {
+        return FALSE;
+    }
+
+    if (v > DODS_USHRT_MAX) {
+        return FALSE;
+    }
+
+    return TRUE;
+}
+
+int check_int32(const char *val)
+{
+    char *ptr;
+    errno = 0;
+    long v = strtol(val, &ptr, 0);      // `0' --> use val to determine base
+
+    if ((v == 0 && val == ptr) || *ptr != '\0') {
+        return FALSE;
+    }
+
+    // We need to check errno since strtol return clamps on overflow so the
+    // check against the DODS values below will always pass, even for out of
+    // bounds values in the string. mjohnson 7/20/09
+    if (errno == ERANGE) {
+        return FALSE;
+    }
+    // This could be combined with the above, or course, but I'm making it
+    // separate to highlight the test. On 64-bit linux boxes 'long' may be
+    // 64-bits and so 'v' can hold more than a DODS_INT32. jhrg 3/23/10
+    else if (v > DODS_INT_MAX || v < DODS_INT_MIN) {
+        return FALSE;
+    }
+    else {
+        return TRUE;
+    }
+}
+
+int check_uint32(const char *val)
+{
+  // Eat whitespace and check for an initial '-' sign...
+  // strtoul allows an initial minus. mjohnson
+    const char* c = val;
+    while (c && isspace(*c)) {
+         c++;
+    }
+    if (c && (*c == '-')) {
+         return FALSE;
+    }
+
+    char *ptr;
+    errno = 0;
+    unsigned long v = strtoul(val, &ptr, 0);
+
+    if ((v == 0 && val == ptr) || *ptr != '\0') {
+        return FALSE;
+    }
+
+	// check overflow first, or the below check is invalid due to
+	// clamping to the maximum value by strtoul
+	// maybe consider using long long for these checks? mjohnson
+	if (errno == ERANGE) {
+		return FALSE;
+	}
+	// See above.
+	else if (v > DODS_UINT_MAX) {
+		return FALSE;
+	}
+	else {
+		return TRUE;
+	}
+}
+
+int check_int64(const char *val)
+{
+    char *ptr;
+    errno = 0;
+    long long v = strtoll(val, &ptr, 0);      // `0' --> use val to determine base
+
+    if ((v == 0 && val == ptr) || *ptr != '\0') {
+        return FALSE;
+    }
+
+    // We need to check errno since strtol return clamps on overflow so the
+    // check against the DODS values below will always pass, even for out of
+    // bounds values in the string. mjohnson 7/20/09
+    if (errno == ERANGE) {
+        return FALSE;
+    }
+#if 0
+    // This could be combined with the above, or course, but I'm making it
+    // separate to highlight the test. On 64-bit linux boxes 'long' may be
+    // 64-bits and so 'v' can hold more than a DODS_INT32. jhrg 3/23/10
+    //
+    // Removed - Coverity says it can never be false. Makes sense. jhrg 5/10/16
+    else if (v <= DODS_LLONG_MAX && v >= DODS_LLONG_MIN) {
+        return FALSE;
+    }
+#endif
+    else {
+        return TRUE;
+    }
+}
+
+int check_uint64(const char *val)
+{
+  // Eat whitespace and check for an initial '-' sign...
+  // strtoul allows an initial minus. mjohnson
+    const char* c = val;
+    while (c && isspace(*c)) {
+         c++;
+    }
+    if (c && (*c == '-')) {
+        return FALSE;
+    }
+
+    char *ptr;
+    errno = 0;
+    unsigned long long v = strtoull(val, &ptr, 0);
+
+    if ((v == 0 && val == ptr) || *ptr != '\0') {
+        return FALSE;
+    }
+
+    if (errno == ERANGE) {
+        return FALSE;
+    }
+    else if (v > DODS_ULLONG_MAX) { // 2^61
+        return FALSE;
+    }
+    else {
+        return v;
+    }
+}
+
+// Check first for system errors (like numbers so small they convert
+// (erroneously) to zero. Then make sure that the value is within
+// limits.
+
+int check_float32(const char *val)
+{
+    char *ptr;
+    errno = 0;                  // Clear previous value. Fix for the 64bit
+				// IRIX from Rob Morris. 5/21/2001 jhrg
+
+#ifdef WIN32
+    double v = w32strtod(val, &ptr);
+#else
+    double v = strtod(val, &ptr);
+#endif
+
+    DBG(cerr << "v: " << v << ", ptr: " << ptr
+        << ", errno: " << errno << ", val==ptr: " << (val == ptr) << endl);
+
+    if (errno == ERANGE || (v == 0.0 && val == ptr) || *ptr != '\0')
+        return FALSE;
+
+#if 0
+    if ((v == 0.0 && (val == ptr || errno == HUGE_VAL || errno == ERANGE))
+        || *ptr != '\0') {
+        return FALSE;
+    }
+#endif
+
+    DBG(cerr << "fabs(" << val << ") = " << fabs(v) << endl);
+    double abs_val = fabs(v);
+    if (abs_val > DODS_FLT_MAX
+        || (abs_val != 0.0 && abs_val < DODS_FLT_MIN))
+        return FALSE;
+
+    return TRUE;
+}
+
+int check_float64(const char *val)
+{
+    DBG(cerr << "val: " << val << endl);
+    char *ptr;
+    errno = 0;                  // Clear previous value. 5/21/2001 jhrg
+
+#ifdef WIN32
+    double v = w32strtod(val, &ptr);
+#else
+    double v = strtod(val, &ptr);
+#endif
+
+    DBG(cerr << "v: " << v << ", ptr: " << ptr
+        << ", errno: " << errno << ", val==ptr: " << (val == ptr) << endl);
+
+
+    if (errno == ERANGE || (v == 0.0 && val == ptr) || *ptr != '\0')
+	return FALSE;
+#if 0
+    if ((v == 0.0 && (val == ptr || errno == HUGE_VAL || errno == ERANGE))
+        || *ptr != '\0') {
+        return FALSE;
+    }
+#endif
+    DBG(cerr << "fabs(" << val << ") = " << fabs(v) << endl);
+    double abs_val = fabs(v);
+    if (abs_val > DODS_DBL_MAX
+        || (abs_val != 0.0 && abs_val < DODS_DBL_MIN))
+        return FALSE;
+
+    return TRUE;
+}
+
+long long get_int64(const char *val)
+{
+    char *ptr;
+    errno = 0;
+    long long v = strtoll(val, &ptr, 0);      // `0' --> use val to determine base
+
+    if ((v == 0 && val == ptr) || *ptr != '\0') {
+        throw Error("The value '" + string(val) + "' contains extra characters.");
+    }
+
+    // We need to check errno since strtol return clamps on overflow so the
+    // check against the DODS values below will always pass, even for out of
+    // bounds values in the string. mjohnson 7/20/09
+    if (errno == ERANGE) {
+        throw Error("The value '" + string(val) + "' is out of range.");
+    }
+
+#if 0
+    // This could be combined with the above, or course, but I'm making it
+    // separate to highlight the test. On 64-bit linux boxes 'long' may be
+    // 64-bits and so 'v' can hold more than a DODS_INT32. jhrg 3/23/10
+    //
+    // Removed because coverity flags it as useless, which it is until we
+    // have 128-bit ints... jhrg 5/9/16
+    else if (v > DODS_LLONG_MAX || v < DODS_LLONG_MIN) {
+        throw Error("The value '" + string(val) + "' is out of range.");
+    }
+#endif
+
+    else {
+        return v;
+    }
+}
+
+unsigned long long get_uint64(const char *val)
+{
+    // Eat whitespace and check for an initial '-' sign...
+    // strtoul allows an initial minus. mjohnson
+    const char* c = val;
+    while (c && isspace(*c)) {
+         c++;
+    }
+    if (c && (*c == '-')) {
+        throw Error("The value '" + string(val) + "' is not a valid array index.");
+    }
+
+    char *ptr;
+    errno = 0;
+    unsigned long long v = strtoull(val, &ptr, 0);
+
+    if ((v == 0 && val == ptr) || *ptr != '\0') {
+        throw Error("The value '" + string(val) + "' contains extra characters.");
+    }
+
+    if (errno == ERANGE) {
+        throw Error("The value '" + string(val) + "' is out of range.");
+    }
+#if 0
+    // Coverity; see above. jhrg 5/9/16
+    else if (v > DODS_MAX_ARRAY_INDEX) { // 2^61
+        throw Error("The value '" + string(val) + "' is out of range.");
+    }
+#endif
+    else {
+        return v;
+    }
+}
+
+double get_float64(const char *val)
+{
+    DBG(cerr << "val: " << val << endl);
+    char *ptr;
+    errno = 0;                  // Clear previous value. 5/21/2001 jhrg
+
+#ifdef WIN32
+    double v = w32strtod(val, &ptr);
+#else
+    double v = strtod(val, &ptr);
+#endif
+
+    if (errno == ERANGE || (v == 0.0 && val == ptr) || *ptr != '\0')
+        throw Error("The value '" + string(val) + "' is out of range.");;
+
+    DBG(cerr << "fabs(" << val << ") = " << fabs(v) << endl);
+    double abs_val = fabs(v);
+    if (abs_val > DODS_DBL_MAX || (abs_val != 0.0 && abs_val < DODS_DBL_MIN))
+        throw Error("The value '" + string(val) + "' is out of range.");;
+
+    return v;
+}
+
+/*
+  Maybe someday we will really check the Urls to see if they are valid...
+*/
+
+int check_url(const char *)
+{
+    return TRUE;
+}
+
+} // namespace libdap
diff --git a/parser-util.h b/parser-util.h
new file mode 100644
index 0000000..277cbcc
--- /dev/null
+++ b/parser-util.h
@@ -0,0 +1,85 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2014 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+
+#ifndef PARSER_UTIL_H_
+#define PARSER_UTIL_H_
+
+namespace libdap {
+
+/** Given a string (<tt>const char *src</tt>), save it to the
+    temporary variable pointed to by <tt>dst</tt>. If the string is
+    longer than <tt>ID_MAX</tt>, generate and error indicating that
+    <tt>src</tt> was truncated to <tt>ID_MAX</tt> characters during
+    the copy operation. There are two versions of this function; one
+    calls the version of <tt>parser_error()</tt> which writes to
+    stderr. The version which accepts the <tt>parser_arg *arg</tt>
+    argument calls the version of <tt>parser_error()</tt> which
+    generates and Error object.
+
+    @return void
+    @brief Save a string to a temporary variable during the parse.
+    */
+
+void save_str(char *dst, const char *src, const int line_num);
+void save_str(string &dst, const char *src, const int);
+
+bool is_keyword(string id, const string &keyword);
+
+/**
+ * @defgroup check_type
+ * @{
+ * @brief Can the given string be converted into a byte, ...?
+ */
+int check_byte(const char *val);
+int check_int16(const char *val);
+int check_uint16(const char *val);
+int check_int32(const char *val);
+int check_uint32(const char *val);
+int check_int64(const char *val);
+int check_uint64(const char *val);
+
+int check_float32(const char *val);
+int check_float64(const char *val);
+
+/** Currently this function always returns true.
+    @brief Is the value a valid URL? */
+int check_url(const char *val);
+
+/** @} */
+
+/**
+ * @defgroup get_type
+ * @{
+ * @brief Convert the string to a value; throw if the conversion fails.
+ */
+long long get_int64(const char *val);
+unsigned long long get_uint64(const char *val);
+double get_float64(const char *val);
+
+/** @} */
+
+} // namespace libdap
+
+#endif /* PARSER_UTIL_H_ */
diff --git a/parser.h b/parser.h
new file mode 100644
index 0000000..5da3638
--- /dev/null
+++ b/parser.h
@@ -0,0 +1,141 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1994-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// Constants, types and function prototypes for use with the DAP parsers.
+//
+// jhrg 2/3/96
+
+#ifndef _parser_h
+#define _parser_h
+
+#ifndef _error_h
+#include "Error.h"
+#endif
+
+#define YYDEBUG 1
+#undef YYERROR_VERBOSE
+#define YY_NO_UNPUT 1
+
+#define ID_MAX 256
+
+#ifndef TRUE
+#define TRUE 1
+#define FALSE 0
+#endif
+
+namespace libdap
+{
+
+/** <tt>parser_arg</tt> is used to pass parameters to the bison parsers and get
+    error codes and objects in return. If <tt>status()</tt> is true, then the
+    <tt>object()</tt> returns a pointer to the object built during the parse
+    process. If <tt>status()</tt> is false, then the <tt>error()</tt>
+    returns a pointer to an Error object.
+
+    Note that the <tt>object()</tt> mfunc returns a void pointer.
+    @brief Pass parameters by reference to a parser.
+    @brief Pass parameters by reference to a parser.
+    */
+
+struct parser_arg
+{
+    void *_object;  // nominally a pointer to an object
+    Error *_error;  // a pointer to an Error object
+    int _status;  // parser status
+
+    parser_arg() : _object(0), _error(0), _status(1)
+    {}
+    parser_arg(void *obj) : _object(obj), _error(0), _status(1)
+    {}
+    virtual ~parser_arg()
+    {
+        if (_error) {
+            delete _error; _error = 0;
+        }
+    }
+
+    void *object()
+    {
+        return _object;
+    }
+    void set_object(void *obj)
+    {
+        _object = obj;
+    }
+    Error *error()
+    {
+        return _error;
+    }
+    void set_error(Error *obj)
+    {
+        _error = obj;
+    }
+    int status()
+    {
+        return _status;
+    }
+    void set_status(int val = 0)
+    {
+        _status = val;
+    }
+};
+
+/** <tt>parser_error()</tt> generates error messages for the various
+    parsers used by libdap. There are two versions of the
+    function, one which takes a <tt>const char *message</tt> and a
+    <tt>const int line_num</tt> and writes the message and line number
+    too stderr and a second which takes an additional <tt>parser_arg
+    *arg</tt> parameter and writes the error message into an Error
+    object which is returned to the caller via the <tt>arg</tt>
+    parameter.
+
+    \note{The second version of this function also accepts a third parameter
+    (<tt>const char *context</tt>) which can be used to provide an
+    additional line of information beyond what is in the string
+    <tt>message</tt>.}
+
+    @name parse_error
+    @return void
+    @brief Generate error messages for the various parsers.
+    */
+//@{
+void parse_error(parser_arg *arg, const char *s, const int line_num = 0,
+                 const char *context = 0);
+void parse_error(const string &msg, const int line_num,
+                 const char *context = 0);
+//@}
+
+} // namespace libdap
+
+#include "parser-util.h"
+
+#endif // _parser_h
+
diff --git a/tests/D4ResponseBuilder.cc b/tests/D4ResponseBuilder.cc
new file mode 100644
index 0000000..2f58ed6
--- /dev/null
+++ b/tests/D4ResponseBuilder.cc
@@ -0,0 +1,167 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2011 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#include "config.h"
+
+#include <signal.h>
+#include <unistd.h>
+
+#include "DMR.h"
+#include "D4Group.h"
+#include "XMLWriter.h"
+#include "D4StreamMarshaller.h"
+#include "chunked_ostream.h"
+
+#include "D4ConstraintEvaluator.h"
+//#include "D4FunctionEvaluator.h"
+
+#include "mime_util.h"	// for last_modified_time() and rfc_822_date()
+#include "escaping.h"
+
+#ifndef WIN32
+#include "SignalHandler.h"
+#include "EventHandler.h"
+#include "AlarmHandler.h"
+#endif
+
+#include "D4ResponseBuilder.h"
+
+const std::string CRLF = "\r\n";             // Change here, expr-test.cc/dmr-test.cc
+
+using namespace std;
+using namespace libdap;
+
+void D4ResponseBuilder::initialize()
+{
+	// Set default values. Don't use the C++ constructor initialization so
+	// that a subclass can have more control over this process.
+	d_dataset = "";
+	d_timeout = 0;
+
+	d_default_protocol = "4.0"; // DAP_PROTOCOL_VERSION;
+}
+
+D4ResponseBuilder::~D4ResponseBuilder()
+{
+	// If an alarm was registered, delete it. The register code in SignalHandler
+	// always deletes the old alarm handler object, so only the one returned by
+	// remove_handler needs to be deleted at this point.
+	delete dynamic_cast<AlarmHandler*>(SignalHandler::instance()->remove_handler(SIGALRM));
+}
+
+/** Set the dataset name, which is a string used to access the dataset
+ * on the machine running the server. That is, this is typically a pathname
+ * to a data file, although it doesn't have to be. This is not
+ * echoed in error messages (because that would reveal server
+ * storage patterns that data providers might want to hide). All WWW-style
+ * escapes are replaced except for spaces.
+ *
+ * @brief Set the dataset pathname.
+ * @param ds The pathname (or equivalent) to the dataset.
+ */
+void D4ResponseBuilder::set_dataset_name(const string ds)
+{
+	d_dataset = www2id(ds, "%", "%20");
+}
+
+//// DAP4 methods follow
+
+/** Use values of this instance to establish a timeout alarm for the server.
+ If the timeout value is zero, do nothing.
+*/
+void D4ResponseBuilder::establish_timeout(ostream &stream) const
+{
+    if (d_timeout > 0) {
+        SignalHandler *sh = SignalHandler::instance();
+        EventHandler *old_eh = sh->register_handler(SIGALRM, new AlarmHandler(stream));
+        delete old_eh;
+        alarm(d_timeout);
+    }
+}
+
+void D4ResponseBuilder::remove_timeout() const
+{
+	alarm(0);
+}
+
+/**
+ * Write the on-the-wire DMR response.
+ *
+ * @note There is no timeout set on this reponse.
+ *
+ * @param out Write to this stream object
+ * @param dmr This is the DMR to write
+ * @param eval Use this ConstraintEvaluator
+ * @param with_mime_headers If true, include the MIME headers in the response
+ */
+void D4ResponseBuilder::send_dmr(ostream &out, DMR &dmr, bool with_mime_headers, bool constrained)
+{
+	if (with_mime_headers) set_mime_text(out, dap4_dmr, x_plain, last_modified_time(d_dataset), dmr.dap_version());
+
+	XMLWriter xml;
+	dmr.print_dap4(xml, constrained /* true == constrained */);
+	out << xml.get_doc() << flush;
+}
+
+void D4ResponseBuilder::send_dap(ostream &out, DMR &dmr, bool with_mime_headers, bool constrained)
+{
+	try {
+		// Set up the alarm.
+		establish_timeout(out);
+
+		if (dmr.response_limit() != 0 && dmr.request_size(true) > dmr.response_limit()) {
+			string msg = "The Request for " + long_to_string(dmr.request_size(true) / 1024)
+					+ "MB is too large; requests for this user are limited to "
+					+ long_to_string(dmr.response_limit() / 1024) + "MB.";
+			throw Error(msg);
+		}
+
+		if (with_mime_headers)
+			set_mime_binary(out, dap4_data, x_plain, last_modified_time(d_dataset), dmr.dap_version());
+
+	    // Write the DMR
+	    XMLWriter xml;
+	    dmr.print_dap4(xml, constrained);
+
+	    // now make the chunked output stream; set the size to be at least chunk_size
+	    // but make sure that the whole of the xml plus the CRLF can fit in the first
+	    // chunk. (+2 for the CRLF bytes).
+	    chunked_ostream cos(out, max((unsigned int)CHUNK_SIZE, xml.get_doc_size()+2));
+
+	    // using flush means that the DMR and CRLF are in the first chunk.
+	    cos << xml.get_doc() << CRLF << flush;
+
+	    // Write the data, chunked with checksums
+	    D4StreamMarshaller m(cos);
+	    dmr.root()->serialize(m, dmr, constrained);
+
+		out << flush;
+
+		remove_timeout();
+	}
+	catch (...) {
+		remove_timeout();
+		throw;
+	}
+}
diff --git a/tests/D4ResponseBuilder.h b/tests/D4ResponseBuilder.h
new file mode 100644
index 0000000..69fb583
--- /dev/null
+++ b/tests/D4ResponseBuilder.h
@@ -0,0 +1,84 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2011 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#ifndef _d4_response_builder_h
+#define _d4_response_builder_h
+
+#include <string>
+
+namespace libdap {
+
+// class ConstraintEvaluator;
+class DDS;
+class DMR;
+
+/**
+ * Used for testing only. This duplicates code in the bes/dap module.
+ * jhrg 6/11/13
+ *
+ * This has now been extended with DAP4 DMR and Data response code.
+ * jhrg 9/5/13
+ */
+
+class D4ResponseBuilder
+{
+
+protected:
+    std::string d_dataset;  		/// Name of the dataset/database
+    int d_timeout;  		/// Response timeout after N seconds
+    std::string d_default_protocol;	/// Version std::string for the library's default protocol version
+
+    void initialize();
+
+public:
+    /** Make an empty instance. Use the set_*() methods to load with needed
+        values. You must call at least set_dataset_name() or be requesting
+        version information. */
+    D4ResponseBuilder() { initialize();  }
+
+    virtual ~D4ResponseBuilder();
+
+    /** The dataset name is the filename or other string that the
+     filter program will use to access the data. In some cases this
+     will indicate a disk file containing the data.  In others, it
+     may represent a database query or some other exotic data
+     access method.
+
+     @brief Get the dataset name.
+     @return A string object that contains the name of the dataset. */
+    virtual std::string get_dataset_name() const { return d_dataset; }
+    virtual void set_dataset_name(const std::string _dataset);
+
+    // These are used for DAP4 testing by dmr-test.
+    virtual void establish_timeout(ostream &stream) const;
+    virtual void remove_timeout() const;
+
+    virtual void send_dmr(std::ostream &out, DMR &dmr, bool with_mime_headers, bool constrained);
+    virtual void send_dap(std::ostream &out, DMR &dmr, bool with_mime_headers, bool constrained);
+};
+
+} // namespace libdap
+
+#endif // _response_builder_h
diff --git a/tests/D4TestFunction.cc b/tests/D4TestFunction.cc
new file mode 100644
index 0000000..440da77
--- /dev/null
+++ b/tests/D4TestFunction.cc
@@ -0,0 +1,187 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2013 OPeNDAP, Inc.
+// Authors: Nathan Potter <npotter@opendap.org>
+//         James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#include "config.h"
+
+#include <BaseType.h>
+#include <TestFloat64.h>
+#include <TestStr.h>
+#include <TestArray.h>
+
+#include <Error.h>
+#include <DDS.h>
+
+#include "DMR.h"
+#include "D4RValue.h"
+
+#include <debug.h>
+#include <util.h>
+
+#include "D4TestFunction.h"
+
+namespace libdap {
+
+/**
+ * @brief scale a scalar or array variable
+ * This does not work for DAP2 Grids; only Array and scalar variables.
+ */
+void
+function_scale_dap2(int argc, BaseType * argv[], DDS &, BaseType **btpp)
+{
+    string info =
+    string("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n") +
+    "<function name=\"scale\" version=\"1.1\" href=\"http://docs.opendap.org/index.php/Server_Side_Processing_Functions\">\n" +
+    "</function>";
+
+    if (argc == 0) {
+        Str *response = new TestStr("info");
+        response->set_value(info);
+        *btpp = response;
+        return;
+    }
+
+    // Check for 2 arguments
+    DBG(cerr << "argc = " << argc << endl);
+    if (argc != 2)
+        throw Error(malformed_expr,"Wrong number of arguments to scale().");
+
+    double m = extract_double_value(argv[1]);
+
+    DBG(cerr << "m: " << m << << endl);
+
+    // Read the data, scale and return the result.
+    BaseType *dest = 0;
+    double *data;
+    if (argv[0]->is_vector_type()) {
+        TestArray &source = static_cast<TestArray&>(*argv[0]);
+        source.read();
+
+        data = extract_double_array(&source);
+        int length = source.length();
+        for (int i = 0; i < length; ++i)
+            data[i] = data[i] * m;
+
+        Array *result = new TestArray(source);
+
+        result->add_var_nocopy(new TestFloat64(source.name()));
+        result->set_value(data, length);
+
+        delete[] data; // set_value copies.
+
+        dest = result;
+    }
+    else if (argv[0]->is_simple_type() && !(argv[0]->type() == dods_str_c || argv[0]->type() == dods_url_c)) {
+    	argv[0]->read();
+        double data = extract_double_value(argv[0]);
+
+        data *= m;
+
+        Float64 *fdest = new TestFloat64(argv[0]->name());
+
+        fdest->set_value(data);
+        dest = fdest;
+    }
+    else {
+        throw Error(malformed_expr,"The scale() function works only for Arrays and scalars.");
+    }
+
+    *btpp = dest;
+    return;
+}
+
+/**
+ * @brief DAP4 scale a scalar or array variable
+ * This does not work for DAP2 Grids; only Array and scalar variables.
+ */
+BaseType *
+function_scale_dap4(D4RValueList *args, DMR &dmr)
+{
+    string info =
+    string("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n") +
+    "<function name=\"scale\" version=\"1.1\" href=\"http://docs.opendap.org/index.php/Server_Side_Processing_Functions\">\n" +
+    "</function>";
+
+    // DAP4 function porting information: in place of 'argc' use 'args.size()'
+    if (args->size() == 0) {
+        Str *response = new TestStr("info");
+        response->set_value(info);
+        // DAP4 function porting: return a BaseType* instead of using the value-result parameter
+        return response;
+    }
+
+    // Check for 2 arguments
+    DBG(cerr << "args.size() = " << args.size() << endl);
+    if (args->size() != 2)
+        throw Error(malformed_expr,"Wrong number of arguments to scale().");
+
+    // DAP4 function porting information: in place of 'argv[n]' use args->get_rvalue(n)->value(dmr)
+    // where 'n' is between 0 and args.size()-1. The line below is the DAP4 equivalent of 'argv[1].'
+    double m = extract_double_value(args->get_rvalue(1)->value(dmr));
+
+    DBG(cerr << "m: " << m << << endl);
+
+    // Read the data, scale and return the result.
+    //BaseType *dest = 0;
+    double *data;
+    BaseType *arg0 = args->get_rvalue(0)->value(dmr); // DAP4 function porting: ... 'argv[0]'
+    if (arg0->is_vector_type()) {
+        TestArray &source = static_cast<TestArray&>(*arg0);
+        source.read();
+
+        data = extract_double_array(&source);
+        int length = source.length();
+        for (int i = 0; i < length; ++i)
+            data[i] = data[i] * m;
+
+        Array *result = new TestArray(source);
+
+        result->add_var_nocopy(new TestFloat64(source.name()));
+        result->set_value(data, length);
+
+        delete[] data; // set_value copies.
+
+        // DAP4 function porting: return a BaseType* instead of using the value-result parameter
+        return result;
+    }
+    else if (arg0->is_simple_type() && !(arg0->type() == dods_str_c || arg0->type() == dods_url_c)) {
+    	arg0->read();
+        double data = extract_double_value(arg0);
+
+        data *= m;
+
+        Float64 *fdest = new TestFloat64(arg0->name());
+
+        fdest->set_value(data);
+        return fdest;
+    }
+    else {
+        throw Error(malformed_expr,"The scale() function works only for numerical arrays and scalars.");
+    }
+
+    return 0;
+}
+
+} // namesspace libdap
diff --git a/tests/D4TestFunction.h b/tests/D4TestFunction.h
new file mode 100644
index 0000000..b764193
--- /dev/null
+++ b/tests/D4TestFunction.h
@@ -0,0 +1,65 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2013 OPeNDAP, Inc.
+// Authors: Nathan Potter <npotter@opendap.org>
+//		James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#include <ServerFunction.h>
+
+namespace libdap {
+
+class BaseType;
+class DDS;
+class DMR;
+class D4RValueList;
+
+/**
+ * The scale() function scales data.
+ */
+void function_scale_dap2(int argc, BaseType *argv[], DDS &dds, BaseType **btpp);
+BaseType *function_scale_dap4(D4RValueList *args, DMR &dmr);
+
+/**
+ * The LinearScaleFunction class encapsulates the linear_scale function 'function_linear_scale'
+ * along with additional meta-data regarding its use and applicability.
+ */
+class D4TestFunction: public ServerFunction {
+public:
+	D4TestFunction()
+    {
+		setName("scale");
+		setDescriptionString("The scale() function is for testing.");
+		setUsageString("scale(var, num): scale var by num. var can be a scalar or an array");
+		setRole("http://services.opendap.org/dap4/server-side-function/scale");
+		setDocUrl("http://docs.opendap.org/index.php/Server_Side_Processing_Functions");
+		setFunction(function_scale_dap2);
+		setVersion("1.0");
+
+		setFunction(function_scale_dap4);
+    }
+    virtual ~D4TestFunction()
+    {
+    }
+};
+
+} // libdap namespace
diff --git a/tests/D4TestTypeFactory.cc b/tests/D4TestTypeFactory.cc
new file mode 100644
index 0000000..18b66d0
--- /dev/null
+++ b/tests/D4TestTypeFactory.cc
@@ -0,0 +1,252 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2013 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#include <string>
+
+#include "TestByte.h"
+
+#include "TestInt8.h"
+
+#include "TestInt16.h"
+#include "TestUInt16.h"
+#include "TestInt32.h"
+#include "TestUInt32.h"
+
+#include "TestInt64.h"
+#include "TestUInt64.h"
+
+#include "TestFloat32.h"
+#include "TestFloat64.h"
+
+#include "TestStr.h"
+#include "TestUrl.h"
+
+#include "TestD4Enum.h"
+
+#include "TestD4Opaque.h"
+
+#include "TestArray.h"
+#include "TestStructure.h"
+
+#include "TestD4Sequence.h"
+#include "TestD4Group.h"
+
+#include "D4TestTypeFactory.h"
+
+#include "debug.h"
+
+BaseType *D4TestTypeFactory::NewVariable(Type t, const string &name) const
+{
+	switch (t) {
+	case dods_byte_c:
+		return NewByte(name);
+	case dods_char_c:
+		return NewChar(name);
+
+	case dods_uint8_c:
+		return NewUInt8(name);
+	case dods_int8_c:
+		return NewInt8(name);
+
+	case dods_int16_c:
+		return NewInt16(name);
+	case dods_uint16_c:
+		return NewUInt16(name);
+	case dods_int32_c:
+		return NewInt32(name);
+	case dods_uint32_c:
+		return NewUInt32(name);
+
+	case dods_int64_c:
+		return NewInt64(name);
+	case dods_uint64_c:
+		return NewUInt64(name);
+
+	case dods_float32_c:
+		return NewFloat32(name);
+	case dods_float64_c:
+		return NewFloat64(name);
+
+	case dods_str_c:
+		return NewStr(name);
+	case dods_url_c:
+		return NewURL(name);
+
+	case dods_enum_c:
+		return NewEnum(name);
+
+	case dods_opaque_c:
+		return NewOpaque(name);
+
+	case dods_array_c:
+		return NewArray(name);
+
+	case dods_structure_c:
+		return NewStructure(name);
+
+	case dods_sequence_c:
+		return NewD4Sequence(name);
+
+	case dods_group_c:
+		return NewGroup(name);
+
+	default:
+		throw InternalErr(__FILE__, __LINE__, "Unimplemented type in DAP4.");
+	}
+}
+
+Byte *
+D4TestTypeFactory::NewByte(const string &n) const
+{
+	return new TestByte(n);
+}
+
+Byte *
+D4TestTypeFactory::NewChar(const string &n) const
+{
+	Byte *b = new TestByte(n);
+	b->set_type(dods_char_c);
+	return b;
+}
+
+Byte *
+D4TestTypeFactory::NewUInt8(const string &n) const
+{
+	Byte *b = new TestByte(n);
+	b->set_type(dods_uint8_c);
+	return b;
+}
+
+Int8 *
+D4TestTypeFactory::NewInt8(const string &n) const
+{
+	return new TestInt8(n);
+}
+
+Int16 *
+D4TestTypeFactory::NewInt16(const string &n) const
+{
+	return new TestInt16(n);
+}
+
+UInt16 *
+D4TestTypeFactory::NewUInt16(const string &n) const
+{
+	return new TestUInt16(n);
+}
+
+Int32 *
+D4TestTypeFactory::NewInt32(const string &n) const
+{
+	DBG(cerr << "Inside DAP4BaseTypeFactory::NewInt32" << endl);
+	return new TestInt32(n);
+}
+
+UInt32 *
+D4TestTypeFactory::NewUInt32(const string &n) const
+{
+	return new TestUInt32(n);
+}
+
+Int64 *
+D4TestTypeFactory::NewInt64(const string &n) const
+{
+	DBG(cerr << "Inside DAP4BaseTypeFactory::NewInt64" << endl);
+	return new TestInt64(n);
+}
+
+UInt64 *
+D4TestTypeFactory::NewUInt64(const string &n) const
+{
+	return new TestUInt64(n);
+}
+
+Float32 *
+D4TestTypeFactory::NewFloat32(const string &n) const
+{
+	return new TestFloat32(n);
+}
+
+Float64 *
+D4TestTypeFactory::NewFloat64(const string &n) const
+{
+	return new TestFloat64(n);
+}
+
+Str *
+D4TestTypeFactory::NewStr(const string &n) const
+{
+	return new TestStr(n);
+}
+
+Url *
+D4TestTypeFactory::NewUrl(const string &n) const
+{
+	return new TestUrl(n);
+}
+
+/** Note that this method is called NewURL - URL in caps.
+ */
+Url *
+D4TestTypeFactory::NewURL(const string &n) const
+{
+	return NewUrl(n);
+}
+
+D4Opaque *
+D4TestTypeFactory::NewOpaque(const string &n) const
+{
+	return new TestD4Opaque(n);
+}
+
+D4Enum *
+D4TestTypeFactory::NewEnum(const string &name, Type type) const
+{
+	return new TestD4Enum(name, type);
+}
+
+Array *
+D4TestTypeFactory::NewArray(const string &n, BaseType *v) const
+{
+	return new TestArray(n, v, true /* is_dap4 */);
+}
+
+Structure *
+D4TestTypeFactory::NewStructure(const string &n) const
+{
+	return new TestStructure(n);
+}
+
+D4Sequence *
+D4TestTypeFactory::NewD4Sequence(const string &n) const
+{
+	return new TestD4Sequence(n);
+}
+
+D4Group *
+D4TestTypeFactory::NewGroup(const string &n) const
+{
+	return new TestD4Group(n);
+}
+
diff --git a/tests/D4TestTypeFactory.h b/tests/D4TestTypeFactory.h
new file mode 100644
index 0000000..4205671
--- /dev/null
+++ b/tests/D4TestTypeFactory.h
@@ -0,0 +1,81 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2013 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#ifndef d4_test_type_factory_h
+#define d4_test_type_factory_h
+
+#include <string>
+
+#include "D4BaseTypeFactory.h"
+
+using namespace libdap ;
+
+/** A factory for the DAP4 TestByte, ...,  types.
+    @author James Gallagher */
+class D4TestTypeFactory : public D4BaseTypeFactory {
+public:
+    D4TestTypeFactory() {}
+    virtual ~D4TestTypeFactory() {}
+
+    virtual BaseTypeFactory *ptr_duplicate() const { return new D4TestTypeFactory; }
+
+    virtual BaseType *NewVariable(Type t, const string &name) const;
+
+    virtual Byte *NewByte(const string &n = "") const;
+
+    // New for DAP4
+    virtual Int8 *NewInt8(const string &n = "") const;
+    virtual Byte *NewUInt8(const string &n = "") const;
+    virtual Byte *NewChar(const string &n = "") const;
+
+    virtual Int16 *NewInt16(const string &n = "") const;
+    virtual UInt16 *NewUInt16(const string &n = "") const;
+    virtual Int32 *NewInt32(const string &n = "") const;
+    virtual UInt32 *NewUInt32(const string &n = "") const;
+
+    // New for DAP4
+    virtual Int64 *NewInt64(const string &n = "") const;
+    virtual UInt64 *NewUInt64(const string &n = "") const;
+
+    virtual Float32 *NewFloat32(const string &n = "") const;
+    virtual Float64 *NewFloat64(const string &n = "") const;
+
+    virtual D4Enum *NewEnum(const string &n = "", Type type = dods_null_c) const;
+
+    virtual Str *NewStr(const string &n = "") const;
+    virtual Url *NewUrl(const string &n = "") const;
+    virtual Url *NewURL(const string &n = "") const;
+
+    virtual D4Opaque *NewOpaque(const string &n = "") const;
+
+    virtual Array *NewArray(const string &n = "", BaseType *v = 0) const;
+
+    virtual Structure *NewStructure(const string &n = "") const;
+    virtual D4Sequence *NewD4Sequence(const string &n = "") const;
+
+    virtual D4Group *NewGroup(const string &n = "") const;
+};
+
+#endif // d4_test_type_factory_h
diff --git a/tests/DASTest b/tests/DASTest
new file mode 100755
index 0000000..706759f
--- /dev/null
+++ b/tests/DASTest
@@ -0,0 +1,3783 @@
+#! /bin/sh
+# Generated from DASTest.at by GNU Autoconf 2.69.
+#
+# Copyright (C) 2009-2012 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. ##
+## -------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+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_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+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
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  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
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
+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
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  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 || :
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && 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
+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@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
+
+# 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
+
+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
+
+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_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+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
+
+
+  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 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
+}
+
+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
+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 -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'
+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"'
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+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'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+
+
+
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+# How were we run?
+at_cli_args="$@"
+
+
+# Not all shells have the 'times' builtin; the subshell is needed to make
+# sure we discard the 'times: not found' message from the shell.
+at_times_p=false
+(times) >/dev/null 2>&1 && at_times_p=:
+
+# CLI Arguments to pass to the debugging scripts.
+at_debug_args=
+# -e sets to true
+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.
+at_debug_p=false
+# Display help message?
+at_help_p=false
+# Display the version message?
+at_version_p=false
+# List test groups?
+at_list_p=false
+# --clean
+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
+
+# The directory we run the suite in.  Default to . if no -C option.
+at_dir=`pwd`
+# An absolute reference to this testsuite script.
+case $as_myself in
+  [\\/]* | ?:[\\/]* ) at_myself=$as_myself ;;
+  * ) at_myself=$at_dir/$as_myself ;;
+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=''
+# 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.
+at_format='??'
+# Description of all the test groups.
+at_help_all="1;DASTest.at:31;DAS \$abs_srcdir/das-testsuite/bad_value_test.1.das;das;
+2;DASTest.at:32;DAS \$abs_srcdir/das-testsuite/das.das;das;
+3;DASTest.at:33;DAS \$abs_srcdir/das-testsuite/special.test.das;das;
+4;DASTest.at:34;DAS \$abs_srcdir/das-testsuite/special.test.hdf.das;das;
+5;DASTest.at:35;DAS \$abs_srcdir/das-testsuite/test.1.das;das;
+6;DASTest.at:36;DAS \$abs_srcdir/das-testsuite/test.11.das;das;
+7;DASTest.at:37;DAS \$abs_srcdir/das-testsuite/test.12.das;das;
+8;DASTest.at:38;DAS \$abs_srcdir/das-testsuite/test.13.das;das;
+9;DASTest.at:39;DAS \$abs_srcdir/das-testsuite/test.14.das;das;
+10;DASTest.at:40;DAS \$abs_srcdir/das-testsuite/test.15.das;das;
+11;DASTest.at:41;DAS \$abs_srcdir/das-testsuite/test.16.das;das;
+12;DASTest.at:42;DAS \$abs_srcdir/das-testsuite/test.17.das;das;
+13;DASTest.at:43;DAS \$abs_srcdir/das-testsuite/test.18.das;das;
+14;DASTest.at:44;DAS \$abs_srcdir/das-testsuite/test.19.das;das;
+15;DASTest.at:45;DAS \$abs_srcdir/das-testsuite/test.1a.das;das;
+16;DASTest.at:46;DAS \$abs_srcdir/das-testsuite/test.2.das;das;
+17;DASTest.at:47;DAS \$abs_srcdir/das-testsuite/test.20.das;das;
+18;DASTest.at:48;DAS \$abs_srcdir/das-testsuite/test.21.das;das;
+19;DASTest.at:49;DAS \$abs_srcdir/das-testsuite/test.22.das;das;
+20;DASTest.at:50;DAS \$abs_srcdir/das-testsuite/test.23.das;das;
+21;DASTest.at:51;DAS \$abs_srcdir/das-testsuite/test.24.das;das;
+22;DASTest.at:52;DAS \$abs_srcdir/das-testsuite/test.25.das;das;
+23;DASTest.at:53;DAS \$abs_srcdir/das-testsuite/test.26.das;das;
+24;DASTest.at:54;DAS \$abs_srcdir/das-testsuite/test.27.das;das;
+25;DASTest.at:55;DAS \$abs_srcdir/das-testsuite/test.28.das;das;
+26;DASTest.at:56;DAS \$abs_srcdir/das-testsuite/test.29.das;das;
+27;DASTest.at:57;DAS \$abs_srcdir/das-testsuite/test.3.das;das;
+28;DASTest.at:58;DAS \$abs_srcdir/das-testsuite/test.3.Z.das;das;
+29;DASTest.at:59;DAS \$abs_srcdir/das-testsuite/test.30.das;das;
+30;DASTest.at:60;DAS \$abs_srcdir/das-testsuite/test.31.das;das;
+31;DASTest.at:61;DAS \$abs_srcdir/das-testsuite/test.32.das;das;
+32;DASTest.at:62;DAS \$abs_srcdir/das-testsuite/test.33.das;das;
+33;DASTest.at:63;DAS \$abs_srcdir/das-testsuite/test.34.das;das;
+34;DASTest.at:64;DAS \$abs_srcdir/das-testsuite/test.35.das;das;
+35;DASTest.at:65;DAS \$abs_srcdir/das-testsuite/test.4.das;das;
+36;DASTest.at:66;DAS \$abs_srcdir/das-testsuite/test.5.das;das;
+37;DASTest.at:67;DAS \$abs_srcdir/das-testsuite/test.6.das;das;
+38;DASTest.at:68;DAS \$abs_srcdir/das-testsuite/test.7.das;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 ()
+{
+  for at_grp
+  do
+    eval at_value=\$$at_grp
+    if test $at_value -lt 1 || test $at_value -gt 40; 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 $(( )).
+	  # 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.
+	  eval $at_grp='`expr $at_value + 0`' ;;
+    esac
+  done
+}
+
+at_prev=
+for at_option
+do
+  # If the previous option needs an argument, assign it.
+  if test -n "$at_prev"; then
+    at_option=$at_prev=$at_option
+    at_prev=
+  fi
+
+  case $at_option in
+  *=?*) at_optarg=`expr "X$at_option" : '[^=]*=\(.*\)'` ;;
+  *)    at_optarg= ;;
+  esac
+
+  # Accept the important Cygnus configure options, so we can diagnose typos.
+
+  case $at_option in
+    --help | -h )
+	at_help_p=:
+	;;
+
+    --list | -l )
+	at_list_p=:
+	;;
+
+    --version | -V )
+	at_version_p=:
+	;;
+
+    --clean | -c )
+	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=:
+	;;
+
+    --errexit | -e )
+	at_debug_p=:
+	at_errexit_p=:
+	;;
+
+    --verbose | -v )
+	at_verbose=; at_quiet=:
+	;;
+
+    --trace | -x )
+	at_traceon='set -x'
+	at_trace_echo=echo
+	at_check_filter_trace=at_fn_filter_trace
+	;;
+
+    [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"
+	;;
+
+    # 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"
+	;;
+
+    -[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"
+	;;
+
+    [0-9]-[0-9] | [0-9]-[0-9][0-9] | [0-9]-[0-9][0-9][0-9] | \
+    [0-9]-[0-9][0-9][0-9][0-9] | [0-9][0-9]-[0-9][0-9] | \
+    [0-9][0-9]-[0-9][0-9][0-9] | [0-9][0-9]-[0-9][0-9][0-9][0-9] | \
+    [0-9][0-9][0-9]-[0-9][0-9][0-9] | \
+    [0-9][0-9][0-9]-[0-9][0-9][0-9][0-9] | \
+    [0-9][0-9][0-9][0-9]-[0-9][0-9][0-9][0-9] )
+	at_range_start=`expr $at_option : '\(.*\)-'`
+	at_range_end=`expr $at_option : '.*-\(.*\)'`
+	if test $at_range_start -gt $at_range_end; then
+	  at_tmp=$at_range_end
+	  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"
+	;;
+
+    # Directory selection.
+    --directory | -C )
+	at_prev=--directory
+	;;
+    --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.
+    --keywords | -k )
+	at_prev=--keywords
+	;;
+    --keywords=* )
+	at_groups_selected=$at_help_all
+	at_save_IFS=$IFS
+	IFS=,
+	set X $at_optarg
+	shift
+	IFS=$at_save_IFS
+	for at_keyword
+	do
+	  at_invert=
+	  case $at_keyword in
+	  '!'*)
+	    at_invert="-v"
+	    at_keyword=`expr "X$at_keyword" : 'X!\(.*\)'`
+	    ;;
+	  esac
+	  # It is on purpose that we match the test group titles too.
+	  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=:
+	;;
+
+    *=*)
+	at_envvar=`expr "x$at_option" : 'x\([^=]*\)='`
+	# 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'" ;;
+	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'"
+	;;
+
+     *) $as_echo "$as_me: invalid option: $at_option" >&2
+	$as_echo "Try \`$0 --help' for more information." >&2
+	exit 1
+	;;
+  esac
+done
+
+# Verify our last option didn't require an argument
+if test -n "$at_prev"; then :
+  as_fn_error $? "\`$at_prev' requires an argument"
+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
+  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=
+fi
+
+# Help message.
+if $at_help_p; then
+  cat <<_ATEOF || at_write_fail=1
+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
+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:
+
+  $ $0 AUTOTEST_PATH=bin
+
+is equivalent to the following, assuming the source directory is /src/foo-1.0:
+
+  PATH=/tmp/foo-1.0/bin:/src/foo-1.0/bin:\$PATH $0
+_ATEOF
+cat <<_ATEOF || at_write_fail=1
+
+Operation modes:
+  -h, --help     print the help message, then exit
+  -V, --version  print version number, then exit
+  -c, --clean    remove all the files this test suite might create and exit
+  -l, --list     describes all the tests, or the selected TESTS
+_ATEOF
+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
+  -d, --debug    inhibit clean up and top-level logging
+                 default for debugging scripts
+  -x, --trace    enable tests shell tracing
+_ATEOF
+cat <<_ATEOF || at_write_fail=1
+
+Report bugs to <opendap-tech@opendap.org>.
+_ATEOF
+  exit $at_write_fail
+fi
+
+# List of tests.
+if $at_list_p; then
+  cat <<_ATEOF || at_write_fail=1
+libdap 3.19.1 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
+	   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
+	     }
+	   }
+	 }' || at_write_fail=1
+  exit $at_write_fail
+fi
+if $at_version_p; then
+  $as_echo "$as_me (libdap 3.19.1)" &&
+  cat <<\_ATEOF || at_write_fail=1
+
+Copyright (C) 2012 Free Software Foundation, Inc.
+This test suite is free software; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+_ATEOF
+  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=: ;; #(
+  * ) at_print_banners=false ;;
+esac
+# Text for banner N, set to a single space once printed.
+
+# Take any -C into account.
+if $at_change_dir ; then
+  test x != "x$at_dir" && cd "$at_dir" \
+    || as_fn_error $? "unable to change directory"
+  at_dir=`pwd`
+fi
+
+# Load the config files for any default variable assignments.
+for at_file in atconfig atlocal
+do
+  test -r $at_file || continue
+  . ./$at_file || as_fn_error $? "invalid content: $at_file"
+done
+
+# Autoconf <=2.59b set at_top_builddir instead of at_top_build_prefix:
+: "${at_top_build_prefix=$at_top_builddir}"
+
+# Perform any assignments requested during argument parsing.
+eval "$at_debug_args"
+
+# atconfig delivers names relative to the directory the test suite is
+# in, but the groups themselves are run in testsuite-dir/group-dir.
+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
+    case $at_val in
+      [\\/$]* | ?:[\\/]* ) at_prefix= ;;
+      *) at_prefix=../../ ;;
+    esac
+    eval "$at_dir_var=\$at_prefix\$at_val"
+  done
+fi
+
+## -------------------- ##
+## Directory structure. ##
+## -------------------- ##
+
+# This is the set of directories and files used by this script
+# (non-literals are capitalized):
+#
+# TESTSUITE         - the testsuite
+# TESTSUITE.log     - summarizes the complete testsuite run
+# TESTSUITE.dir/    - created during a run, remains after -d or failed test
+# + at-groups/      - during a run: status of all groups in run
+# | + NNN/          - during a run: meta-data about test group NNN
+# | | + check-line  - location (source file and line) of current AT_CHECK
+# | | + status      - exit status of current AT_CHECK
+# | | + stdout      - stdout of current AT_CHECK
+# | | + stder1      - stderr, including trace
+# | | + stderr      - stderr, with trace filtered out
+# | | + test-source - portion of testsuite that defines group
+# | | + times       - timestamps for computing duration
+# | | + pass        - created if group passed
+# | | + xpass       - created if group xpassed
+# | | + fail        - created if group failed
+# | | + xfail       - created if group xfailed
+# | | + skip        - created if group skipped
+# + at-stop         - during a run: end the run if this file exists
+# + at-source-lines - during a run: cache of TESTSUITE line numbers for extraction
+# + 0..NNN/         - created for each group NNN, remains after -d or failed test
+# | + TESTSUITE.log - summarizes the group results
+# | + ...           - files created during the group
+
+# 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).
+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" &&
+    find "$at_suite_dir" -type d ! -perm -700 -exec chmod u+rwx \{\} \;
+  rm -f -r "$at_suite_dir" "$at_suite_log"
+  exit $?
+fi
+
+# Don't take risks: use only absolute directories in PATH.
+#
+# For stand-alone test suites (ie. atconfig was not found),
+# AUTOTEST_PATH is relative to `.'.
+#
+# For embedded test suites, AUTOTEST_PATH is relative to the top level
+# of the package.  Then expand it into build/src parts, since users
+# may create executables in both places.
+AUTOTEST_PATH=`$as_echo "$AUTOTEST_PATH" | sed "s|:|$PATH_SEPARATOR|g"`
+at_path=
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+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
+case $as_dir in
+  [\\/]* | ?:[\\/]* )
+    as_fn_append at_path "$as_dir"
+    ;;
+  * )
+    if test -z "$at_top_build_prefix"; then
+      # Stand-alone test suite.
+      as_fn_append 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"
+    fi
+    ;;
+esac
+  done
+IFS=$as_save_IFS
+
+
+# Now build and simplify PATH.
+#
+# There might be directories that don't exist, but don't redirect
+# builtins' (eg., cd) stderr directly: Ultrix's sh hates that.
+at_new_path=
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $at_path
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    test -d "$as_dir" || continue
+case $as_dir in
+  [\\/]* | ?:[\\/]* ) ;;
+  * ) as_dir=`(cd "$as_dir" && pwd) 2>/dev/null` ;;
+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" ;;
+esac
+  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
+else
+  : >"$at_suite_log"
+fi
+exec 5>>"$at_suite_log"
+
+# Banners and logs.
+$as_echo "## ----------------------------------- ##
+## libdap 3.19.1 test suite: das-test. ##
+## ----------------------------------- ##"
+{
+  $as_echo "## ----------------------------------- ##
+## libdap 3.19.1 test suite: das-test. ##
+## ----------------------------------- ##"
+  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"
+    echo
+  fi
+
+  {
+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`
+
+/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
+
+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
+
+}
+  echo
+
+  # Contents of the config files.
+  for at_file in atconfig atlocal
+  do
+    test -r $at_file || continue
+    $as_echo "$as_me: $at_file:"
+    sed 's/^/| /' $at_file
+    echo
+  done
+} >&5
+
+
+## ------------------------- ##
+## Autotest 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_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"
+}
+
+# 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 ()
+{
+  case $1 in
+    *$as_nl*)
+      at_fn_check_prepare_notrace 'an embedded newline' "$2" ;;
+    *)
+      at_fn_check_prepare_trace "$2" ;;
+  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 ()
+{
+  mv "$at_stderr" "$at_stder1"
+  grep '^ *+' "$at_stder1" >&2
+  grep -v '^ *+' "$at_stder1" >"$at_stderr"
+}
+
+# at_fn_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 ()
+{
+  for file
+    do $as_echo "$file:"; sed 's/^/> /' "$file"; done
+  echo 1 > "$at_status_file"
+  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 ()
+{
+  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 ()
+{
+  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 ()
+{
+  test -s "$1" || return 0
+  $at_diff "$at_devnull" "$1"
+}
+
+# at_fn_test NUMBER
+# -----------------
+# Parse out test NUMBER from the tail of this file.
+at_fn_test ()
+{
+  eval at_sed=\$at_sed$1
+  sed "$at_sed" "$at_myself" > "$at_test_source"
+}
+
+# at_fn_create_debugging_script
+# -----------------------------
+# Create the debugging script $at_group_dir/run which will reproduce the
+# current test group.
+at_fn_create_debugging_script ()
+{
+  {
+    echo "#! /bin/sh" &&
+    echo 'test "${ZSH_VERSION+set}" = set && alias -g '\''${1+"$@"}'\''='\''"$@"'\''' &&
+    $as_echo "cd '$at_dir'" &&
+    $as_echo "exec \${CONFIG_SHELL-$SHELL} \"$at_myself\" -v -d $at_debug_args $at_group \${1+\"\$@\"}" &&
+    echo 'exit 1'
+  } >"$at_group_dir/run" &&
+  chmod +x "$at_group_dir/run"
+}
+
+## -------------------------------- ##
+## End of autotest shell functions. ##
+## -------------------------------- ##
+{
+  $as_echo "## ---------------- ##
+## Tested programs. ##
+## ---------------- ##"
+  echo
+} >&5
+
+# Report what programs are being tested.
+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
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    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
+    {
+      $as_echo "$at_srcdir/DASTest.at:7: $at_program_ --version"
+      "$at_program_" --version </dev/null
+      echo
+    } >&5 2>&1
+  else
+    as_fn_error $? "cannot find $at_program" "$LINENO" 5
+  fi
+done
+
+{
+  $as_echo "## ------------------ ##
+## Running the tests. ##
+## ------------------ ##"
+} >&5
+
+at_start_date=`date`
+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
+
+# Can we diff with `/dev/null'?  DU 5.0 refuses.
+if diff /dev/null /dev/null >/dev/null 2>&1; then
+  at_devnull=/dev/null
+else
+  at_devnull=$at_suite_dir/devnull
+  >"$at_devnull"
+fi
+
+# Use `diff -u' when possible.
+if at_diff=`diff -u "$at_devnull" "$at_devnull" 2>&1` && test -z "$at_diff"
+then
+  at_diff='diff -u'
+else
+  at_diff=diff
+fi
+
+# Get the last needed group.
+for at_group in : $at_groups; do :; done
+
+# Extract the start and end lines of each test group at the tail
+# of this file
+awk '
+BEGIN { FS="" }
+/^#AT_START_/ {
+  start = NR
+}
+/^#AT_STOP_/ {
+  test = substr ($ 0, 10)
+  print "at_sed" test "=\"1," start "d;" (NR-1) "q\""
+  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
+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
+
+# 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 ()
+{
+  # The directory for additional per-group helper files.
+  at_job_dir=$at_helper_dir/$at_group
+  # The file containing the location of the last AT_CHECK.
+  at_check_line_file=$at_job_dir/check-line
+  # The file containing the exit status of the last command.
+  at_status_file=$at_job_dir/status
+  # The files containing the output of the tested commands.
+  at_stdout=$at_job_dir/stdout
+  at_stder1=$at_job_dir/stder1
+  at_stderr=$at_job_dir/stderr
+  # The file containing the code for a test group.
+  at_test_source=$at_job_dir/test-source
+  # The file containing dates.
+  at_times_file=$at_job_dir/times
+
+  # Be sure to come back to the top test directory.
+  cd "$at_suite_dir"
+
+  # Clearly separate the test groups when verbose.
+  $at_first || $at_verbose echo
+
+  at_group_normalized=$at_group
+
+  eval 'while :; do
+    case $at_group_normalized in #(
+    '"$at_format"'*) break;;
+    esac
+    at_group_normalized=0$at_group_normalized
+  done'
+
+
+  # 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;}
+  # Be tolerant if the above `rm' was not able to remove the directory.
+  as_dir="$at_group_dir"; as_fn_mkdir_p
+
+  echo 0 > "$at_status_file"
+
+  # In verbose mode, append to the log file *and* show on
+  # the standard output; in quiet mode only write to the log.
+  if test -z "$at_verbose"; then
+    at_tee_pipe='tee -a "$at_group_log"'
+  else
+    at_tee_pipe='cat >> "$at_group_log"'
+  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 ()
+{
+  # Be sure to come back to the suite directory, in particular
+  # since below we might `rm' the group directory we are in currently.
+  cd "$at_suite_dir"
+
+  if test ! -f "$at_check_line_file"; then
+    sed "s/^ */$as_me: WARNING: /" <<_ATEOF
+      A failure happened in a test group before any test could be
+      run. This means that test suite is improperly designed.  Please
+      report this failure to <opendap-tech@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"
+  case $at_xfail:$at_status in
+    yes:0)
+	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
+	;;
+  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
+  at_log_msg="$at_group. $at_desc ($at_setup_line): $at_msg"
+  case $at_status in
+    0|77)
+      # $at_times_file is only available if the group succeeded.
+      # We're not including the group log, so the success message
+      # is written in the global log separately.  But we also
+      # write to the group log in case they're using -d.
+      if test -f "$at_times_file"; then
+	at_log_msg="$at_log_msg     ("`sed 1d "$at_times_file"`')'
+	rm -f "$at_times_file"
+      fi
+      $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
+      else
+	if test -d "$at_group_dir"; then
+	  find "$at_group_dir" -type d ! -perm -700 -exec chmod u+rwx \{\} \;
+	  rm -fr "$at_group_dir"
+	fi
+	rm -f "$at_test_source"
+      fi
+      ;;
+    *)
+      # Upon failure, include the log into the testsuite's global
+      # log.  The failure message is written in the group log.  It
+      # is later included in the global log.
+      $as_echo "$at_log_msg" >> "$at_group_log"
+
+      # 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
+      if $at_errexit; then
+	echo stop > "$at_stop_file"
+      fi
+      ;;
+  esac
+}
+
+
+## ------------ ##
+## 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
+$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
+  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
+
+# Wrap up the test suite with summary statistics.
+cd "$at_helper_dir"
+
+# Use ?..???? when the list must remain sorted, the faster * otherwise.
+at_pass_list=`for f in */pass; do echo $f; done | sed '/\*/d; s,/pass,,'`
+at_skip_list=`for f in */skip; do echo $f; done | sed '/\*/d; s,/skip,,'`
+at_xfail_list=`for f in */xfail; do echo $f; done | sed '/\*/d; s,/xfail,,'`
+at_xpass_list=`for f in ?/xpass ??/xpass ???/xpass ????/xpass; do
+		 echo $f; done | sed '/?/d; s,/xpass,,'`
+at_fail_list=`for f in ?/fail ??/fail ???/fail ????/fail; do
+		echo $f; done | sed '/?/d; s,/fail,,'`
+
+set X $at_pass_list $at_xpass_list $at_xfail_list $at_fail_list $at_skip_list
+shift; at_group_count=$#
+set X $at_xpass_list; shift; at_xpass_count=$#; at_xpass_list=$*
+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
+
+# Back to the top directory.
+cd "$at_dir"
+rm -rf "$at_helper_dir"
+
+# Compute the duration of the suite.
+at_stop_date=`date`
+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_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 "## ------------- ##
+## Test results. ##
+## ------------- ##"
+echo
+{
+  echo
+  $as_echo "## ------------- ##
+## Test results. ##
+## ------------- ##"
+  echo
+} >&5
+
+if test $at_run_count = 1; then
+  at_result="1 test"
+  at_were=was
+else
+  at_result="$at_run_count tests"
+  at_were=were
+fi
+if $at_errexit_p && test $at_unexpected_count != 0; then
+  if test $at_xpass_count = 1; then
+    at_result="$at_result $at_were run, one passed"
+  else
+    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 ;;
+
+    # Some unexpected failures
+    0:*:0) at_result="$at_result $at_were run,
+$at_fail_count failed unexpectedly." ;;
+
+    # Some failures, both expected and unexpected
+    0:*:1) at_result="$at_result $at_were run,
+$at_total_fail_count failed ($at_xfail_count expected failure)." ;;
+    0:*:*) at_result="$at_result $at_were run,
+$at_total_fail_count failed ($at_xfail_count expected failures)." ;;
+
+    # No unexpected failures, but some xpasses
+    *:0:*) at_result="$at_result $at_were run,
+$at_xpass_count passed unexpectedly." ;;
+
+    # No expected failures, but failures and xpasses
+    *:1:0) at_result="$at_result $at_were run,
+$at_unexpected_count did not behave as expected ($at_fail_count unexpected failure)." ;;
+    *:*:0) at_result="$at_result $at_were run,
+$at_unexpected_count did not behave as expected ($at_fail_count unexpected failures)." ;;
+
+    # All of them.
+    *:*:1) at_result="$at_result $at_were run,
+$at_xpass_count passed unexpectedly,
+$at_total_fail_count failed ($at_xfail_count expected failure)." ;;
+    *:*:*) at_result="$at_result $at_were run,
+$at_xpass_count passed unexpectedly,
+$at_total_fail_count failed ($at_xfail_count expected failures)." ;;
+  esac
+
+  if test $at_skip_count = 0 && test $at_run_count -gt 1; then
+    at_result="All $at_result"
+  fi
+fi
+
+# Now put skips in the mix.
+case $at_skip_count in
+  0) ;;
+  1) at_result="$at_result
+1 test was skipped." ;;
+  *) at_result="$at_result
+$at_skip_count tests were skipped." ;;
+esac
+
+if test $at_unexpected_count = 0; then
+  echo "$at_color$at_result$at_std"
+  echo "$at_result" >&5
+else
+  echo "${at_color}ERROR: $at_result$at_std" >&2
+  echo "ERROR: $at_result" >&5
+  {
+    echo
+    $as_echo "## ------------------------ ##
+## Summary of the failures. ##
+## ------------------------ ##"
+
+    # Summary of failed and skipped tests.
+    if test $at_fail_count != 0; then
+      echo "Failed tests:"
+      $SHELL "$at_myself" $at_fail_list --list
+      echo
+    fi
+    if test $at_skip_count != 0; then
+      echo "Skipped tests:"
+      $SHELL "$at_myself" $at_skip_list --list
+      echo
+    fi
+    if test $at_xpass_count != 0; then
+      echo "Unexpected passes:"
+      $SHELL "$at_myself" $at_xpass_list --list
+      echo
+    fi
+    if test $at_fail_count != 0; then
+      $as_echo "## ---------------------- ##
+## Detailed failed tests. ##
+## ---------------------- ##"
+      echo
+      for at_group in $at_fail_list
+      do
+	at_group_normalized=$at_group
+
+  eval 'while :; do
+    case $at_group_normalized in #(
+    '"$at_format"'*) break;;
+    esac
+    at_group_normalized=0$at_group_normalized
+  done'
+
+	cat "$at_suite_dir/$at_group_normalized/$as_me.log"
+	echo
+      done
+      echo
+    fi
+    if test -n "$at_top_srcdir"; then
+      sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## ${at_top_build_prefix}config.log ##
+_ASBOX
+      sed 's/^/| /' ${at_top_build_prefix}config.log
+      echo
+    fi
+  } >&5
+
+  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## $as_me.log was created. ##
+_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:
+
+   To: <opendap-tech@opendap.org>
+   Subject: [libdap 3.19.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'.
+"
+  exit 1
+fi
+
+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" ""
+at_xfail=no
+(
+  $as_echo "1. $at_setup_line: testing $at_desc ..."
+  $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
+$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 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_traceon; }
+
+#Need to compare either stdout or stderr because of the directory the above
+#AT_CHECK prints output to
+{ set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:31"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+  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_1
+#AT_START_2
+at_fn_group_banner 2 'DASTest.at:32' \
+  "DAS \$abs_srcdir/das-testsuite/das.das" "          "
+at_xfail=no
+(
+  $as_echo "2. $at_setup_line: testing $at_desc ..."
+  $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
+$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 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_traceon; }
+
+#Need to compare either stdout or stderr because of the directory the above
+#AT_CHECK prints output to
+{ set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:32"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+  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_2
+#AT_START_3
+at_fn_group_banner 3 'DASTest.at:33' \
+  "DAS \$abs_srcdir/das-testsuite/special.test.das" " "
+at_xfail=no
+(
+  $as_echo "3. $at_setup_line: testing $at_desc ..."
+  $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
+$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 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_traceon; }
+
+#Need to compare either stdout or stderr because of the directory the above
+#AT_CHECK prints output to
+{ set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:33"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+  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_3
+#AT_START_4
+at_fn_group_banner 4 'DASTest.at:34' \
+  "DAS \$abs_srcdir/das-testsuite/special.test.hdf.das" ""
+at_xfail=no
+(
+  $as_echo "4. $at_setup_line: testing $at_desc ..."
+  $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
+$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 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_traceon; }
+
+#Need to compare either stdout or stderr because of the directory the above
+#AT_CHECK prints output to
+{ set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:34"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+  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_4
+#AT_START_5
+at_fn_group_banner 5 'DASTest.at:35' \
+  "DAS \$abs_srcdir/das-testsuite/test.1.das" "       "
+at_xfail=no
+(
+  $as_echo "5. $at_setup_line: testing $at_desc ..."
+  $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
+$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 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_traceon; }
+
+#Need to compare either stdout or stderr because of the directory the above
+#AT_CHECK prints output to
+{ set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:35"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+  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_5
+#AT_START_6
+at_fn_group_banner 6 'DASTest.at:36' \
+  "DAS \$abs_srcdir/das-testsuite/test.11.das" "      "
+at_xfail=no
+(
+  $as_echo "6. $at_setup_line: testing $at_desc ..."
+  $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
+$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 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_traceon; }
+
+#Need to compare either stdout or stderr because of the directory the above
+#AT_CHECK prints output to
+{ set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:36"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+  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_6
+#AT_START_7
+at_fn_group_banner 7 'DASTest.at:37' \
+  "DAS \$abs_srcdir/das-testsuite/test.12.das" "      "
+at_xfail=no
+(
+  $as_echo "7. $at_setup_line: testing $at_desc ..."
+  $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
+$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 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_traceon; }
+
+#Need to compare either stdout or stderr because of the directory the above
+#AT_CHECK prints output to
+{ set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:37"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+  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_7
+#AT_START_8
+at_fn_group_banner 8 'DASTest.at:38' \
+  "DAS \$abs_srcdir/das-testsuite/test.13.das" "      "
+at_xfail=no
+(
+  $as_echo "8. $at_setup_line: testing $at_desc ..."
+  $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
+$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 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_traceon; }
+
+#Need to compare either stdout or stderr because of the directory the above
+#AT_CHECK prints output to
+{ set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:38"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+  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_8
+#AT_START_9
+at_fn_group_banner 9 'DASTest.at:39' \
+  "DAS \$abs_srcdir/das-testsuite/test.14.das" "      "
+at_xfail=no
+(
+  $as_echo "9. $at_setup_line: testing $at_desc ..."
+  $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
+$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 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_traceon; }
+
+#Need to compare either stdout or stderr because of the directory the above
+#AT_CHECK prints output to
+{ set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:39"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+  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_9
+#AT_START_10
+at_fn_group_banner 10 'DASTest.at:40' \
+  "DAS \$abs_srcdir/das-testsuite/test.15.das" "      "
+at_xfail=no
+(
+  $as_echo "10. $at_setup_line: testing $at_desc ..."
+  $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
+$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 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_traceon; }
+
+#Need to compare either stdout or stderr because of the directory the above
+#AT_CHECK prints output to
+{ set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:40"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+  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_10
+#AT_START_11
+at_fn_group_banner 11 'DASTest.at:41' \
+  "DAS \$abs_srcdir/das-testsuite/test.16.das" "      "
+at_xfail=no
+(
+  $as_echo "11. $at_setup_line: testing $at_desc ..."
+  $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
+$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 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_traceon; }
+
+#Need to compare either stdout or stderr because of the directory the above
+#AT_CHECK prints output to
+{ set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:41"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+  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_11
+#AT_START_12
+at_fn_group_banner 12 'DASTest.at:42' \
+  "DAS \$abs_srcdir/das-testsuite/test.17.das" "      "
+at_xfail=no
+(
+  $as_echo "12. $at_setup_line: testing $at_desc ..."
+  $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
+$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 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_traceon; }
+
+#Need to compare either stdout or stderr because of the directory the above
+#AT_CHECK prints output to
+{ set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:42"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+  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_12
+#AT_START_13
+at_fn_group_banner 13 'DASTest.at:43' \
+  "DAS \$abs_srcdir/das-testsuite/test.18.das" "      "
+at_xfail=no
+(
+  $as_echo "13. $at_setup_line: testing $at_desc ..."
+  $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
+$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 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_traceon; }
+
+#Need to compare either stdout or stderr because of the directory the above
+#AT_CHECK prints output to
+{ set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:43"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+  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_13
+#AT_START_14
+at_fn_group_banner 14 'DASTest.at:44' \
+  "DAS \$abs_srcdir/das-testsuite/test.19.das" "      "
+at_xfail=no
+(
+  $as_echo "14. $at_setup_line: testing $at_desc ..."
+  $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
+$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 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_traceon; }
+
+#Need to compare either stdout or stderr because of the directory the above
+#AT_CHECK prints output to
+{ set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:44"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+  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 'DASTest.at:45' \
+  "DAS \$abs_srcdir/das-testsuite/test.1a.das" "      "
+at_xfail=no
+(
+  $as_echo "15. $at_setup_line: testing $at_desc ..."
+  $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
+$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 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_traceon; }
+
+#Need to compare either stdout or stderr because of the directory the above
+#AT_CHECK prints output to
+{ set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:45"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+  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_15
+#AT_START_16
+at_fn_group_banner 16 'DASTest.at:46' \
+  "DAS \$abs_srcdir/das-testsuite/test.2.das" "       "
+at_xfail=no
+(
+  $as_echo "16. $at_setup_line: testing $at_desc ..."
+  $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
+$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 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_traceon; }
+
+#Need to compare either stdout or stderr because of the directory the above
+#AT_CHECK prints output to
+{ set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:46"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+  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_16
+#AT_START_17
+at_fn_group_banner 17 'DASTest.at:47' \
+  "DAS \$abs_srcdir/das-testsuite/test.20.das" "      "
+at_xfail=no
+(
+  $as_echo "17. $at_setup_line: testing $at_desc ..."
+  $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
+$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 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_traceon; }
+
+#Need to compare either stdout or stderr because of the directory the above
+#AT_CHECK prints output to
+{ set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:47"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+  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_17
+#AT_START_18
+at_fn_group_banner 18 'DASTest.at:48' \
+  "DAS \$abs_srcdir/das-testsuite/test.21.das" "      "
+at_xfail=no
+(
+  $as_echo "18. $at_setup_line: testing $at_desc ..."
+  $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
+$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 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_traceon; }
+
+#Need to compare either stdout or stderr because of the directory the above
+#AT_CHECK prints output to
+{ set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:48"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+  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_18
+#AT_START_19
+at_fn_group_banner 19 'DASTest.at:49' \
+  "DAS \$abs_srcdir/das-testsuite/test.22.das" "      "
+at_xfail=no
+(
+  $as_echo "19. $at_setup_line: testing $at_desc ..."
+  $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
+$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 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_traceon; }
+
+#Need to compare either stdout or stderr because of the directory the above
+#AT_CHECK prints output to
+{ set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:49"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+  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_19
+#AT_START_20
+at_fn_group_banner 20 'DASTest.at:50' \
+  "DAS \$abs_srcdir/das-testsuite/test.23.das" "      "
+at_xfail=no
+(
+  $as_echo "20. $at_setup_line: testing $at_desc ..."
+  $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
+$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 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_traceon; }
+
+#Need to compare either stdout or stderr because of the directory the above
+#AT_CHECK prints output to
+{ set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:50"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+  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_20
+#AT_START_21
+at_fn_group_banner 21 'DASTest.at:51' \
+  "DAS \$abs_srcdir/das-testsuite/test.24.das" "      "
+at_xfail=no
+(
+  $as_echo "21. $at_setup_line: testing $at_desc ..."
+  $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
+$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 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_traceon; }
+
+#Need to compare either stdout or stderr because of the directory the above
+#AT_CHECK prints output to
+{ set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:51"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+  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_21
+#AT_START_22
+at_fn_group_banner 22 'DASTest.at:52' \
+  "DAS \$abs_srcdir/das-testsuite/test.25.das" "      "
+at_xfail=no
+(
+  $as_echo "22. $at_setup_line: testing $at_desc ..."
+  $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
+$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 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_traceon; }
+
+#Need to compare either stdout or stderr because of the directory the above
+#AT_CHECK prints output to
+{ set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:52"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+  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_22
+#AT_START_23
+at_fn_group_banner 23 'DASTest.at:53' \
+  "DAS \$abs_srcdir/das-testsuite/test.26.das" "      "
+at_xfail=no
+(
+  $as_echo "23. $at_setup_line: testing $at_desc ..."
+  $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
+$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 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_traceon; }
+
+#Need to compare either stdout or stderr because of the directory the above
+#AT_CHECK prints output to
+{ set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:53"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+  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_23
+#AT_START_24
+at_fn_group_banner 24 'DASTest.at:54' \
+  "DAS \$abs_srcdir/das-testsuite/test.27.das" "      "
+at_xfail=no
+(
+  $as_echo "24. $at_setup_line: testing $at_desc ..."
+  $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
+$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 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_traceon; }
+
+#Need to compare either stdout or stderr because of the directory the above
+#AT_CHECK prints output to
+{ set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:54"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+  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_24
+#AT_START_25
+at_fn_group_banner 25 'DASTest.at:55' \
+  "DAS \$abs_srcdir/das-testsuite/test.28.das" "      "
+at_xfail=no
+(
+  $as_echo "25. $at_setup_line: testing $at_desc ..."
+  $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
+$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 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_traceon; }
+
+#Need to compare either stdout or stderr because of the directory the above
+#AT_CHECK prints output to
+{ set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:55"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+  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_25
+#AT_START_26
+at_fn_group_banner 26 'DASTest.at:56' \
+  "DAS \$abs_srcdir/das-testsuite/test.29.das" "      "
+at_xfail=no
+(
+  $as_echo "26. $at_setup_line: testing $at_desc ..."
+  $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
+$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 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_traceon; }
+
+#Need to compare either stdout or stderr because of the directory the above
+#AT_CHECK prints output to
+{ set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:56"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+  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_26
+#AT_START_27
+at_fn_group_banner 27 'DASTest.at:57' \
+  "DAS \$abs_srcdir/das-testsuite/test.3.das" "       "
+at_xfail=no
+(
+  $as_echo "27. $at_setup_line: testing $at_desc ..."
+  $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
+$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 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_traceon; }
+
+#Need to compare either stdout or stderr because of the directory the above
+#AT_CHECK prints output to
+{ set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:57"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+  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_27
+#AT_START_28
+at_fn_group_banner 28 'DASTest.at:58' \
+  "DAS \$abs_srcdir/das-testsuite/test.3.Z.das" "     "
+at_xfail=no
+(
+  $as_echo "28. $at_setup_line: testing $at_desc ..."
+  $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
+$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 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_traceon; }
+
+#Need to compare either stdout or stderr because of the directory the above
+#AT_CHECK prints output to
+{ set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:58"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+  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_28
+#AT_START_29
+at_fn_group_banner 29 'DASTest.at:59' \
+  "DAS \$abs_srcdir/das-testsuite/test.30.das" "      "
+at_xfail=no
+(
+  $as_echo "29. $at_setup_line: testing $at_desc ..."
+  $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
+$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 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_traceon; }
+
+#Need to compare either stdout or stderr because of the directory the above
+#AT_CHECK prints output to
+{ set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:59"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+  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_29
+#AT_START_30
+at_fn_group_banner 30 'DASTest.at:60' \
+  "DAS \$abs_srcdir/das-testsuite/test.31.das" "      "
+at_xfail=no
+(
+  $as_echo "30. $at_setup_line: testing $at_desc ..."
+  $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
+$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 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_traceon; }
+
+#Need to compare either stdout or stderr because of the directory the above
+#AT_CHECK prints output to
+{ set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:60"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+  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_30
+#AT_START_31
+at_fn_group_banner 31 'DASTest.at:61' \
+  "DAS \$abs_srcdir/das-testsuite/test.32.das" "      "
+at_xfail=no
+(
+  $as_echo "31. $at_setup_line: testing $at_desc ..."
+  $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
+$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 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_traceon; }
+
+#Need to compare either stdout or stderr because of the directory the above
+#AT_CHECK prints output to
+{ set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:61"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+  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_31
+#AT_START_32
+at_fn_group_banner 32 'DASTest.at:62' \
+  "DAS \$abs_srcdir/das-testsuite/test.33.das" "      "
+at_xfail=no
+(
+  $as_echo "32. $at_setup_line: testing $at_desc ..."
+  $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
+$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 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_traceon; }
+
+#Need to compare either stdout or stderr because of the directory the above
+#AT_CHECK prints output to
+{ set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:62"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+  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_32
+#AT_START_33
+at_fn_group_banner 33 'DASTest.at:63' \
+  "DAS \$abs_srcdir/das-testsuite/test.34.das" "      "
+at_xfail=no
+(
+  $as_echo "33. $at_setup_line: testing $at_desc ..."
+  $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
+$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 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_traceon; }
+
+#Need to compare either stdout or stderr because of the directory the above
+#AT_CHECK prints output to
+{ set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:63"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+  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_33
+#AT_START_34
+at_fn_group_banner 34 'DASTest.at:64' \
+  "DAS \$abs_srcdir/das-testsuite/test.35.das" "      "
+at_xfail=no
+(
+  $as_echo "34. $at_setup_line: testing $at_desc ..."
+  $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
+$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 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_traceon; }
+
+#Need to compare either stdout or stderr because of the directory the above
+#AT_CHECK prints output to
+{ set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:64"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+  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_34
+#AT_START_35
+at_fn_group_banner 35 'DASTest.at:65' \
+  "DAS \$abs_srcdir/das-testsuite/test.4.das" "       "
+at_xfail=no
+(
+  $as_echo "35. $at_setup_line: testing $at_desc ..."
+  $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
+$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 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_traceon; }
+
+#Need to compare either stdout or stderr because of the directory the above
+#AT_CHECK prints output to
+{ set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:65"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+  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_35
+#AT_START_36
+at_fn_group_banner 36 'DASTest.at:66' \
+  "DAS \$abs_srcdir/das-testsuite/test.5.das" "       "
+at_xfail=no
+(
+  $as_echo "36. $at_setup_line: testing $at_desc ..."
+  $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
+$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 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_traceon; }
+
+#Need to compare either stdout or stderr because of the directory the above
+#AT_CHECK prints output to
+{ set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:66"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+  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_36
+#AT_START_37
+at_fn_group_banner 37 'DASTest.at:67' \
+  "DAS \$abs_srcdir/das-testsuite/test.6.das" "       "
+at_xfail=no
+(
+  $as_echo "37. $at_setup_line: testing $at_desc ..."
+  $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
+$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 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_traceon; }
+
+#Need to compare either stdout or stderr because of the directory the above
+#AT_CHECK prints output to
+{ set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:67"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+  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_37
+#AT_START_38
+at_fn_group_banner 38 'DASTest.at:68' \
+  "DAS \$abs_srcdir/das-testsuite/test.7.das" "       "
+at_xfail=no
+(
+  $as_echo "38. $at_setup_line: testing $at_desc ..."
+  $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
+$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 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_traceon; }
+
+#Need to compare either stdout or stderr because of the directory the above
+#AT_CHECK prints output to
+{ set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:68"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+  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_38
+#AT_START_39
+at_fn_group_banner 39 'DASTest.at:69' \
+  "DAS \$abs_srcdir/das-testsuite/test.8.das" "       "
+at_xfail=no
+(
+  $as_echo "39. $at_setup_line: testing $at_desc ..."
+  $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
+$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 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_traceon; }
+
+#Need to compare either stdout or stderr because of the directory the above
+#AT_CHECK prints output to
+{ set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:69"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+  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_39
+#AT_START_40
+at_fn_group_banner 40 'DASTest.at:70' \
+  "DAS \$abs_srcdir/das-testsuite/test.9.das" "       "
+at_xfail=no
+(
+  $as_echo "40. $at_setup_line: testing $at_desc ..."
+  $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
+$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 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_traceon; }
+
+#Need to compare either stdout or stderr because of the directory the above
+#AT_CHECK prints output to
+{ set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:70"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+  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_40
diff --git a/tests/DASTest.at b/tests/DASTest.at
new file mode 100644
index 0000000..7900ace
--- /dev/null
+++ b/tests/DASTest.at
@@ -0,0 +1,70 @@
+# Process with autom4te to create an -*- Autotest -*- test suite.
+
+
+# ------------------------------
+#
+
+AT_INIT([das-test])
+# AT_COPYRIGHT([])
+
+# AT_TESTED([das-test])
+
+# Usage: _AT_TEST_*(<das source>, <baseline file>)
+
+m4_define([_AT_DAS_TEST],   
+[# AT_BANNER([Test $1 $2])
+AT_SETUP([DAS $1])
+AT_KEYWORDS([das])
+#Added || true because the $abs_srcdir/das-test -p < $1 needs to be true whether the
+#output is printed to stdout or stderr
+AT_CHECK([$abs_builddir/das-test -p < $1 || true], [], [stdout], [stderr])
+#Need to compare either stdout or stderr because of the directory the above
+#AT_CHECK prints output to
+AT_CHECK([diff -b -B $2 stdout || diff -b -B $2 stderr], [], [ignore],[],[])
+AT_CLEANUP])
+
+m4_define([AT_DAS_RESPONSE_TEST],
+[#AT_BANNER([DAS response for $1.])
+_AT_DAS_TEST([$abs_srcdir/das-testsuite/$1], [$abs_srcdir/das-testsuite/$1.base])
+])
+
+AT_DAS_RESPONSE_TEST([bad_value_test.1.das])
+AT_DAS_RESPONSE_TEST([das.das])
+AT_DAS_RESPONSE_TEST([special.test.das])
+AT_DAS_RESPONSE_TEST([special.test.hdf.das])
+AT_DAS_RESPONSE_TEST([test.1.das])
+AT_DAS_RESPONSE_TEST([test.11.das])
+AT_DAS_RESPONSE_TEST([test.12.das])
+AT_DAS_RESPONSE_TEST([test.13.das])
+AT_DAS_RESPONSE_TEST([test.14.das])
+AT_DAS_RESPONSE_TEST([test.15.das])
+AT_DAS_RESPONSE_TEST([test.16.das])
+AT_DAS_RESPONSE_TEST([test.17.das])
+AT_DAS_RESPONSE_TEST([test.18.das])
+AT_DAS_RESPONSE_TEST([test.19.das])
+AT_DAS_RESPONSE_TEST([test.1a.das])
+AT_DAS_RESPONSE_TEST([test.2.das])
+AT_DAS_RESPONSE_TEST([test.20.das])
+AT_DAS_RESPONSE_TEST([test.21.das])
+AT_DAS_RESPONSE_TEST([test.22.das])
+AT_DAS_RESPONSE_TEST([test.23.das])
+AT_DAS_RESPONSE_TEST([test.24.das])
+AT_DAS_RESPONSE_TEST([test.25.das])
+AT_DAS_RESPONSE_TEST([test.26.das])
+AT_DAS_RESPONSE_TEST([test.27.das])
+AT_DAS_RESPONSE_TEST([test.28.das])
+AT_DAS_RESPONSE_TEST([test.29.das])
+AT_DAS_RESPONSE_TEST([test.3.das])
+AT_DAS_RESPONSE_TEST([test.3.Z.das])
+AT_DAS_RESPONSE_TEST([test.30.das])
+AT_DAS_RESPONSE_TEST([test.31.das])
+AT_DAS_RESPONSE_TEST([test.32.das])
+AT_DAS_RESPONSE_TEST([test.33.das])
+AT_DAS_RESPONSE_TEST([test.34.das])
+AT_DAS_RESPONSE_TEST([test.35.das])
+AT_DAS_RESPONSE_TEST([test.4.das])
+AT_DAS_RESPONSE_TEST([test.5.das])
+AT_DAS_RESPONSE_TEST([test.6.das])
+AT_DAS_RESPONSE_TEST([test.7.das])
+AT_DAS_RESPONSE_TEST([test.8.das])
+AT_DAS_RESPONSE_TEST([test.9.das])
diff --git a/tests/DDSTest b/tests/DDSTest
new file mode 100755
index 0000000..90935a7
--- /dev/null
+++ b/tests/DDSTest
@@ -0,0 +1,4958 @@
+#! /bin/sh
+# Generated from DDSTest.at by GNU Autoconf 2.69.
+#
+# Copyright (C) 2009-2012 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. ##
+## -------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+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_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+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
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  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
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
+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
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  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 || :
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && 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
+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@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
+
+# 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
+
+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
+
+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_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+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
+
+
+  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 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
+}
+
+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
+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 -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'
+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"'
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+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'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+
+
+
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+# How were we run?
+at_cli_args="$@"
+
+
+# Not all shells have the 'times' builtin; the subshell is needed to make
+# sure we discard the 'times: not found' message from the shell.
+at_times_p=false
+(times) >/dev/null 2>&1 && at_times_p=:
+
+# CLI Arguments to pass to the debugging scripts.
+at_debug_args=
+# -e sets to true
+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.
+at_debug_p=false
+# Display help message?
+at_help_p=false
+# Display the version message?
+at_version_p=false
+# List test groups?
+at_list_p=false
+# --clean
+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
+
+# The directory we run the suite in.  Default to . if no -C option.
+at_dir=`pwd`
+# An absolute reference to this testsuite script.
+case $as_myself in
+  [\\/]* | ?:[\\/]* ) at_myself=$as_myself ;;
+  * ) at_myself=$at_dir/$as_myself ;;
+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=''
+# 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.
+at_format='??'
+# Description of all the test groups.
+at_help_all="1;DDSTest.at:48;DDS \$abs_srcdir/dds-testsuite/3B42.980909.5.hacked.HDF.das.dds;dds;
+2;DDSTest.at:49;DDS \$abs_srcdir/dds-testsuite/3B42.980909.5.HDF.das.dds;dds;
+3;DDSTest.at:50;DDS \$abs_srcdir/dds-testsuite/3B42.980909.5.HDF.dds;dds;
+4;DDSTest.at:51;DDS \$abs_srcdir/dds-testsuite/AsciiOutputTest1.dds;dds;
+5;DDSTest.at:52;DDS \$abs_srcdir/dds-testsuite/fnoc1.nc.das.dds;dds;
+6;DDSTest.at:53;DDS \$abs_srcdir/dds-testsuite/fnoc1.nc.dds;dds;
+7;DDSTest.at:54;DDS \$abs_srcdir/dds-testsuite/S2000415.HDF.das.dds;dds;
+8;DDSTest.at:55;DDS \$abs_srcdir/dds-testsuite/S2000415.HDF.dds;dds;
+9;DDSTest.at:56;DDS \$abs_srcdir/dds-testsuite/test.1.dds;dds;
+10;DDSTest.at:57;DDS \$abs_srcdir/dds-testsuite/test.10.dds;dds;
+11;DDSTest.at:58;DDS \$abs_srcdir/dds-testsuite/test.11.dds;dds;
+12;DDSTest.at:59;DDS \$abs_srcdir/dds-testsuite/test.12.dds;dds;
+13;DDSTest.at:60;DDS \$abs_srcdir/dds-testsuite/test.13.dds;dds;
+14;DDSTest.at:61;DDS \$abs_srcdir/dds-testsuite/test.14.dds;dds;
+15;DDSTest.at:62;DDS \$abs_srcdir/dds-testsuite/test.15.dds;dds;
+16;DDSTest.at:63;DDS \$abs_srcdir/dds-testsuite/test.16.dds;dds;
+17;DDSTest.at:64;DDS \$abs_srcdir/dds-testsuite/test.17.dds;dds;
+18;DDSTest.at:65;DDS \$abs_srcdir/dds-testsuite/test.18.dds;dds;
+19;DDSTest.at:66;DDS \$abs_srcdir/dds-testsuite/test.19.dds;dds;
+20;DDSTest.at:67;DDS \$abs_srcdir/dds-testsuite/test.19b.das.dds;dds;
+21;DDSTest.at:68;DDS \$abs_srcdir/dds-testsuite/test.19b.dds;dds;
+22;DDSTest.at:69;DDS \$abs_srcdir/dds-testsuite/test.2.dds;dds;
+23;DDSTest.at:70;DDS \$abs_srcdir/dds-testsuite/test.20.dds;dds;
+24;DDSTest.at:71;DDS \$abs_srcdir/dds-testsuite/test.3.dds;dds;
+25;DDSTest.at:72;DDS \$abs_srcdir/dds-testsuite/test.4.dds;dds;
+26;DDSTest.at:73;DDS \$abs_srcdir/dds-testsuite/test.6.dds;dds;
+27;DDSTest.at:74;DDS \$abs_srcdir/dds-testsuite/test.7.dds;dds;
+28;DDSTest.at:75;DDS \$abs_srcdir/dds-testsuite/test.8.dds;dds;
+29;DDSTest.at:76;DDS \$abs_srcdir/dds-testsuite/test.9.dds;dds;
+30;DDSTest.at:80;DDS \$abs_srcdir/dds-testsuite/test.21.dds;dds;
+31;DDSTest.at:81;DDS \$abs_srcdir/dds-testsuite/test.22.dds;dds;
+32;DDSTest.at:82;DDS \$abs_srcdir/dds-testsuite/test.23.dds;dds;
+33;DDSTest.at:83;DDS \$abs_srcdir/dds-testsuite/test.24.dds;dds;
+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 ()
+{
+  for at_grp
+  do
+    eval at_value=\$$at_grp
+    if test $at_value -lt 1 || test $at_value -gt 35; 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 $(( )).
+	  # 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.
+	  eval $at_grp='`expr $at_value + 0`' ;;
+    esac
+  done
+}
+
+##
+## Set up package specific options.
+##
+
+at_arg_given_baselines=false
+
+
+at_prev=
+for at_option
+do
+  # If the previous option needs an argument, assign it.
+  if test -n "$at_prev"; then
+    at_option=$at_prev=$at_option
+    at_prev=
+  fi
+
+  case $at_option in
+  *=?*) at_optarg=`expr "X$at_option" : '[^=]*=\(.*\)'` ;;
+  *)    at_optarg= ;;
+  esac
+
+  # Accept the important Cygnus configure options, so we can diagnose typos.
+
+  case $at_option in
+    --help | -h )
+	at_help_p=:
+	;;
+
+    --list | -l )
+	at_list_p=:
+	;;
+
+    --version | -V )
+	at_version_p=:
+	;;
+
+    --clean | -c )
+	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=:
+	;;
+
+    --errexit | -e )
+	at_debug_p=:
+	at_errexit_p=:
+	;;
+
+    --verbose | -v )
+	at_verbose=; at_quiet=:
+	;;
+
+    --trace | -x )
+	at_traceon='set -x'
+	at_trace_echo=echo
+	at_check_filter_trace=at_fn_filter_trace
+	;;
+
+    [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"
+	;;
+
+    # 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"
+	;;
+
+    -[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"
+	;;
+
+    [0-9]-[0-9] | [0-9]-[0-9][0-9] | [0-9]-[0-9][0-9][0-9] | \
+    [0-9]-[0-9][0-9][0-9][0-9] | [0-9][0-9]-[0-9][0-9] | \
+    [0-9][0-9]-[0-9][0-9][0-9] | [0-9][0-9]-[0-9][0-9][0-9][0-9] | \
+    [0-9][0-9][0-9]-[0-9][0-9][0-9] | \
+    [0-9][0-9][0-9]-[0-9][0-9][0-9][0-9] | \
+    [0-9][0-9][0-9][0-9]-[0-9][0-9][0-9][0-9] )
+	at_range_start=`expr $at_option : '\(.*\)-'`
+	at_range_end=`expr $at_option : '.*-\(.*\)'`
+	if test $at_range_start -gt $at_range_end; then
+	  at_tmp=$at_range_end
+	  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"
+	;;
+
+    # Directory selection.
+    --directory | -C )
+	at_prev=--directory
+	;;
+    --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.
+    --keywords | -k )
+	at_prev=--keywords
+	;;
+    --keywords=* )
+	at_groups_selected=$at_help_all
+	at_save_IFS=$IFS
+	IFS=,
+	set X $at_optarg
+	shift
+	IFS=$at_save_IFS
+	for at_keyword
+	do
+	  at_invert=
+	  case $at_keyword in
+	  '!'*)
+	    at_invert="-v"
+	    at_keyword=`expr "X$at_keyword" : 'X!\(.*\)'`
+	    ;;
+	  esac
+	  # It is on purpose that we match the test group titles too.
+	  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=:
+	;;
+    --baselines )
+	at_prev=--baselines
+	;;
+    --baselines=* )
+	at_arg_baselines=$at_optarg
+	at_arg_given_baselines=:
+	echo "baselines set to $at_arg_baselines";
+     baselines=$at_arg_baselines
+	;;
+
+
+    *=*)
+	at_envvar=`expr "x$at_option" : 'x\([^=]*\)='`
+	# 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'" ;;
+	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'"
+	;;
+
+     *) $as_echo "$as_me: invalid option: $at_option" >&2
+	$as_echo "Try \`$0 --help' for more information." >&2
+	exit 1
+	;;
+  esac
+done
+
+# Verify our last option didn't require an argument
+if test -n "$at_prev"; then :
+  as_fn_error $? "\`$at_prev' requires an argument"
+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
+  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=
+fi
+
+##
+## Process package specific options when _not_ supplied.
+##
+
+if $at_arg_given_baselines; then :
+
+else
+  baselines=
+fi
+
+# Help message.
+if $at_help_p; then
+  cat <<_ATEOF || at_write_fail=1
+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
+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:
+
+  $ $0 AUTOTEST_PATH=bin
+
+is equivalent to the following, assuming the source directory is /src/foo-1.0:
+
+  PATH=/tmp/foo-1.0/bin:/src/foo-1.0/bin:\$PATH $0
+_ATEOF
+cat <<_ATEOF || at_write_fail=1
+
+Operation modes:
+  -h, --help     print the help message, then exit
+  -V, --version  print version number, then exit
+  -c, --clean    remove all the files this test suite might create and exit
+  -l, --list     describes all the tests, or the selected TESTS
+_ATEOF
+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
+  -d, --debug    inhibit clean up and top-level logging
+                 default for debugging scripts
+  -x, --trace    enable tests shell tracing
+_ATEOF
+cat <<_ATEOF || at_write_fail=1
+
+Other options:
+_ATEOF
+
+cat <<_ATEOF || at_write_fail=1
+--baselines=yes|no   Build the baseline file for parser test 'arg'
+_ATEOF
+cat <<_ATEOF || at_write_fail=1
+
+Report bugs to <opendap-tech@opendap.org>.
+_ATEOF
+  exit $at_write_fail
+fi
+
+# List of tests.
+if $at_list_p; then
+  cat <<_ATEOF || at_write_fail=1
+libdap 3.19.1 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
+	   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
+	     }
+	   }
+	 }' || at_write_fail=1
+  exit $at_write_fail
+fi
+if $at_version_p; then
+  $as_echo "$as_me (libdap 3.19.1)" &&
+  cat <<\_ATEOF || at_write_fail=1
+
+Copyright (C) 2012 Free Software Foundation, Inc.
+This test suite is free software; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+_ATEOF
+  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=: ;; #(
+  * ) at_print_banners=false ;;
+esac
+# Text for banner N, set to a single space once printed.
+
+# Take any -C into account.
+if $at_change_dir ; then
+  test x != "x$at_dir" && cd "$at_dir" \
+    || as_fn_error $? "unable to change directory"
+  at_dir=`pwd`
+fi
+
+# Load the config files for any default variable assignments.
+for at_file in atconfig atlocal
+do
+  test -r $at_file || continue
+  . ./$at_file || as_fn_error $? "invalid content: $at_file"
+done
+
+# Autoconf <=2.59b set at_top_builddir instead of at_top_build_prefix:
+: "${at_top_build_prefix=$at_top_builddir}"
+
+# Perform any assignments requested during argument parsing.
+eval "$at_debug_args"
+
+# atconfig delivers names relative to the directory the test suite is
+# in, but the groups themselves are run in testsuite-dir/group-dir.
+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
+    case $at_val in
+      [\\/$]* | ?:[\\/]* ) at_prefix= ;;
+      *) at_prefix=../../ ;;
+    esac
+    eval "$at_dir_var=\$at_prefix\$at_val"
+  done
+fi
+
+## -------------------- ##
+## Directory structure. ##
+## -------------------- ##
+
+# This is the set of directories and files used by this script
+# (non-literals are capitalized):
+#
+# TESTSUITE         - the testsuite
+# TESTSUITE.log     - summarizes the complete testsuite run
+# TESTSUITE.dir/    - created during a run, remains after -d or failed test
+# + at-groups/      - during a run: status of all groups in run
+# | + NNN/          - during a run: meta-data about test group NNN
+# | | + check-line  - location (source file and line) of current AT_CHECK
+# | | + status      - exit status of current AT_CHECK
+# | | + stdout      - stdout of current AT_CHECK
+# | | + stder1      - stderr, including trace
+# | | + stderr      - stderr, with trace filtered out
+# | | + test-source - portion of testsuite that defines group
+# | | + times       - timestamps for computing duration
+# | | + pass        - created if group passed
+# | | + xpass       - created if group xpassed
+# | | + fail        - created if group failed
+# | | + xfail       - created if group xfailed
+# | | + skip        - created if group skipped
+# + at-stop         - during a run: end the run if this file exists
+# + at-source-lines - during a run: cache of TESTSUITE line numbers for extraction
+# + 0..NNN/         - created for each group NNN, remains after -d or failed test
+# | + TESTSUITE.log - summarizes the group results
+# | + ...           - files created during the group
+
+# 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).
+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" &&
+    find "$at_suite_dir" -type d ! -perm -700 -exec chmod u+rwx \{\} \;
+  rm -f -r "$at_suite_dir" "$at_suite_log"
+  exit $?
+fi
+
+# Don't take risks: use only absolute directories in PATH.
+#
+# For stand-alone test suites (ie. atconfig was not found),
+# AUTOTEST_PATH is relative to `.'.
+#
+# For embedded test suites, AUTOTEST_PATH is relative to the top level
+# of the package.  Then expand it into build/src parts, since users
+# may create executables in both places.
+AUTOTEST_PATH=`$as_echo "$AUTOTEST_PATH" | sed "s|:|$PATH_SEPARATOR|g"`
+at_path=
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+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
+case $as_dir in
+  [\\/]* | ?:[\\/]* )
+    as_fn_append at_path "$as_dir"
+    ;;
+  * )
+    if test -z "$at_top_build_prefix"; then
+      # Stand-alone test suite.
+      as_fn_append 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"
+    fi
+    ;;
+esac
+  done
+IFS=$as_save_IFS
+
+
+# Now build and simplify PATH.
+#
+# There might be directories that don't exist, but don't redirect
+# builtins' (eg., cd) stderr directly: Ultrix's sh hates that.
+at_new_path=
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $at_path
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    test -d "$as_dir" || continue
+case $as_dir in
+  [\\/]* | ?:[\\/]* ) ;;
+  * ) as_dir=`(cd "$as_dir" && pwd) 2>/dev/null` ;;
+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" ;;
+esac
+  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
+else
+  : >"$at_suite_log"
+fi
+exec 5>>"$at_suite_log"
+
+# Banners and logs.
+$as_echo "## ----------------------------------- ##
+## libdap 3.19.1 test suite: dds-test. ##
+## ----------------------------------- ##"
+{
+  $as_echo "## ----------------------------------- ##
+## libdap 3.19.1 test suite: dds-test. ##
+## ----------------------------------- ##"
+  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"
+    echo
+  fi
+
+  {
+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`
+
+/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
+
+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
+
+}
+  echo
+
+  # Contents of the config files.
+  for at_file in atconfig atlocal
+  do
+    test -r $at_file || continue
+    $as_echo "$as_me: $at_file:"
+    sed 's/^/| /' $at_file
+    echo
+  done
+} >&5
+
+
+## ------------------------- ##
+## Autotest 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_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"
+}
+
+# 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 ()
+{
+  case $1 in
+    *$as_nl*)
+      at_fn_check_prepare_notrace 'an embedded newline' "$2" ;;
+    *)
+      at_fn_check_prepare_trace "$2" ;;
+  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 ()
+{
+  mv "$at_stderr" "$at_stder1"
+  grep '^ *+' "$at_stder1" >&2
+  grep -v '^ *+' "$at_stder1" >"$at_stderr"
+}
+
+# at_fn_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 ()
+{
+  for file
+    do $as_echo "$file:"; sed 's/^/> /' "$file"; done
+  echo 1 > "$at_status_file"
+  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 ()
+{
+  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 ()
+{
+  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 ()
+{
+  test -s "$1" || return 0
+  $at_diff "$at_devnull" "$1"
+}
+
+# at_fn_test NUMBER
+# -----------------
+# Parse out test NUMBER from the tail of this file.
+at_fn_test ()
+{
+  eval at_sed=\$at_sed$1
+  sed "$at_sed" "$at_myself" > "$at_test_source"
+}
+
+# at_fn_create_debugging_script
+# -----------------------------
+# Create the debugging script $at_group_dir/run which will reproduce the
+# current test group.
+at_fn_create_debugging_script ()
+{
+  {
+    echo "#! /bin/sh" &&
+    echo 'test "${ZSH_VERSION+set}" = set && alias -g '\''${1+"$@"}'\''='\''"$@"'\''' &&
+    $as_echo "cd '$at_dir'" &&
+    $as_echo "exec \${CONFIG_SHELL-$SHELL} \"$at_myself\" -v -d $at_debug_args $at_group \${1+\"\$@\"}" &&
+    echo 'exit 1'
+  } >"$at_group_dir/run" &&
+  chmod +x "$at_group_dir/run"
+}
+
+## -------------------------------- ##
+## End of autotest shell functions. ##
+## -------------------------------- ##
+{
+  $as_echo "## ---------------- ##
+## Tested programs. ##
+## ---------------- ##"
+  echo
+} >&5
+
+# Report what programs are being tested.
+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
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    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
+    {
+      $as_echo "$at_srcdir/DDSTest.at:3: $at_program_ --version"
+      "$at_program_" --version </dev/null
+      echo
+    } >&5 2>&1
+  else
+    as_fn_error $? "cannot find $at_program" "$LINENO" 5
+  fi
+done
+
+{
+  $as_echo "## ------------------ ##
+## Running the tests. ##
+## ------------------ ##"
+} >&5
+
+at_start_date=`date`
+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
+
+# Can we diff with `/dev/null'?  DU 5.0 refuses.
+if diff /dev/null /dev/null >/dev/null 2>&1; then
+  at_devnull=/dev/null
+else
+  at_devnull=$at_suite_dir/devnull
+  >"$at_devnull"
+fi
+
+# Use `diff -u' when possible.
+if at_diff=`diff -u "$at_devnull" "$at_devnull" 2>&1` && test -z "$at_diff"
+then
+  at_diff='diff -u'
+else
+  at_diff=diff
+fi
+
+# Get the last needed group.
+for at_group in : $at_groups; do :; done
+
+# Extract the start and end lines of each test group at the tail
+# of this file
+awk '
+BEGIN { FS="" }
+/^#AT_START_/ {
+  start = NR
+}
+/^#AT_STOP_/ {
+  test = substr ($ 0, 10)
+  print "at_sed" test "=\"1," start "d;" (NR-1) "q\""
+  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
+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
+
+# 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 ()
+{
+  # The directory for additional per-group helper files.
+  at_job_dir=$at_helper_dir/$at_group
+  # The file containing the location of the last AT_CHECK.
+  at_check_line_file=$at_job_dir/check-line
+  # The file containing the exit status of the last command.
+  at_status_file=$at_job_dir/status
+  # The files containing the output of the tested commands.
+  at_stdout=$at_job_dir/stdout
+  at_stder1=$at_job_dir/stder1
+  at_stderr=$at_job_dir/stderr
+  # The file containing the code for a test group.
+  at_test_source=$at_job_dir/test-source
+  # The file containing dates.
+  at_times_file=$at_job_dir/times
+
+  # Be sure to come back to the top test directory.
+  cd "$at_suite_dir"
+
+  # Clearly separate the test groups when verbose.
+  $at_first || $at_verbose echo
+
+  at_group_normalized=$at_group
+
+  eval 'while :; do
+    case $at_group_normalized in #(
+    '"$at_format"'*) break;;
+    esac
+    at_group_normalized=0$at_group_normalized
+  done'
+
+
+  # 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;}
+  # Be tolerant if the above `rm' was not able to remove the directory.
+  as_dir="$at_group_dir"; as_fn_mkdir_p
+
+  echo 0 > "$at_status_file"
+
+  # In verbose mode, append to the log file *and* show on
+  # the standard output; in quiet mode only write to the log.
+  if test -z "$at_verbose"; then
+    at_tee_pipe='tee -a "$at_group_log"'
+  else
+    at_tee_pipe='cat >> "$at_group_log"'
+  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 ()
+{
+  # Be sure to come back to the suite directory, in particular
+  # since below we might `rm' the group directory we are in currently.
+  cd "$at_suite_dir"
+
+  if test ! -f "$at_check_line_file"; then
+    sed "s/^ */$as_me: WARNING: /" <<_ATEOF
+      A failure happened in a test group before any test could be
+      run. This means that test suite is improperly designed.  Please
+      report this failure to <opendap-tech@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"
+  case $at_xfail:$at_status in
+    yes:0)
+	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
+	;;
+  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
+  at_log_msg="$at_group. $at_desc ($at_setup_line): $at_msg"
+  case $at_status in
+    0|77)
+      # $at_times_file is only available if the group succeeded.
+      # We're not including the group log, so the success message
+      # is written in the global log separately.  But we also
+      # write to the group log in case they're using -d.
+      if test -f "$at_times_file"; then
+	at_log_msg="$at_log_msg     ("`sed 1d "$at_times_file"`')'
+	rm -f "$at_times_file"
+      fi
+      $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
+      else
+	if test -d "$at_group_dir"; then
+	  find "$at_group_dir" -type d ! -perm -700 -exec chmod u+rwx \{\} \;
+	  rm -fr "$at_group_dir"
+	fi
+	rm -f "$at_test_source"
+      fi
+      ;;
+    *)
+      # Upon failure, include the log into the testsuite's global
+      # log.  The failure message is written in the group log.  It
+      # is later included in the global log.
+      $as_echo "$at_log_msg" >> "$at_group_log"
+
+      # 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
+      if $at_errexit; then
+	echo stop > "$at_stop_file"
+      fi
+      ;;
+  esac
+}
+
+
+## ------------ ##
+## 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
+$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
+  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
+
+# Wrap up the test suite with summary statistics.
+cd "$at_helper_dir"
+
+# Use ?..???? when the list must remain sorted, the faster * otherwise.
+at_pass_list=`for f in */pass; do echo $f; done | sed '/\*/d; s,/pass,,'`
+at_skip_list=`for f in */skip; do echo $f; done | sed '/\*/d; s,/skip,,'`
+at_xfail_list=`for f in */xfail; do echo $f; done | sed '/\*/d; s,/xfail,,'`
+at_xpass_list=`for f in ?/xpass ??/xpass ???/xpass ????/xpass; do
+		 echo $f; done | sed '/?/d; s,/xpass,,'`
+at_fail_list=`for f in ?/fail ??/fail ???/fail ????/fail; do
+		echo $f; done | sed '/?/d; s,/fail,,'`
+
+set X $at_pass_list $at_xpass_list $at_xfail_list $at_fail_list $at_skip_list
+shift; at_group_count=$#
+set X $at_xpass_list; shift; at_xpass_count=$#; at_xpass_list=$*
+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
+
+# Back to the top directory.
+cd "$at_dir"
+rm -rf "$at_helper_dir"
+
+# Compute the duration of the suite.
+at_stop_date=`date`
+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_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 "## ------------- ##
+## Test results. ##
+## ------------- ##"
+echo
+{
+  echo
+  $as_echo "## ------------- ##
+## Test results. ##
+## ------------- ##"
+  echo
+} >&5
+
+if test $at_run_count = 1; then
+  at_result="1 test"
+  at_were=was
+else
+  at_result="$at_run_count tests"
+  at_were=were
+fi
+if $at_errexit_p && test $at_unexpected_count != 0; then
+  if test $at_xpass_count = 1; then
+    at_result="$at_result $at_were run, one passed"
+  else
+    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 ;;
+
+    # Some unexpected failures
+    0:*:0) at_result="$at_result $at_were run,
+$at_fail_count failed unexpectedly." ;;
+
+    # Some failures, both expected and unexpected
+    0:*:1) at_result="$at_result $at_were run,
+$at_total_fail_count failed ($at_xfail_count expected failure)." ;;
+    0:*:*) at_result="$at_result $at_were run,
+$at_total_fail_count failed ($at_xfail_count expected failures)." ;;
+
+    # No unexpected failures, but some xpasses
+    *:0:*) at_result="$at_result $at_were run,
+$at_xpass_count passed unexpectedly." ;;
+
+    # No expected failures, but failures and xpasses
+    *:1:0) at_result="$at_result $at_were run,
+$at_unexpected_count did not behave as expected ($at_fail_count unexpected failure)." ;;
+    *:*:0) at_result="$at_result $at_were run,
+$at_unexpected_count did not behave as expected ($at_fail_count unexpected failures)." ;;
+
+    # All of them.
+    *:*:1) at_result="$at_result $at_were run,
+$at_xpass_count passed unexpectedly,
+$at_total_fail_count failed ($at_xfail_count expected failure)." ;;
+    *:*:*) at_result="$at_result $at_were run,
+$at_xpass_count passed unexpectedly,
+$at_total_fail_count failed ($at_xfail_count expected failures)." ;;
+  esac
+
+  if test $at_skip_count = 0 && test $at_run_count -gt 1; then
+    at_result="All $at_result"
+  fi
+fi
+
+# Now put skips in the mix.
+case $at_skip_count in
+  0) ;;
+  1) at_result="$at_result
+1 test was skipped." ;;
+  *) at_result="$at_result
+$at_skip_count tests were skipped." ;;
+esac
+
+if test $at_unexpected_count = 0; then
+  echo "$at_color$at_result$at_std"
+  echo "$at_result" >&5
+else
+  echo "${at_color}ERROR: $at_result$at_std" >&2
+  echo "ERROR: $at_result" >&5
+  {
+    echo
+    $as_echo "## ------------------------ ##
+## Summary of the failures. ##
+## ------------------------ ##"
+
+    # Summary of failed and skipped tests.
+    if test $at_fail_count != 0; then
+      echo "Failed tests:"
+      $SHELL "$at_myself" $at_fail_list --list
+      echo
+    fi
+    if test $at_skip_count != 0; then
+      echo "Skipped tests:"
+      $SHELL "$at_myself" $at_skip_list --list
+      echo
+    fi
+    if test $at_xpass_count != 0; then
+      echo "Unexpected passes:"
+      $SHELL "$at_myself" $at_xpass_list --list
+      echo
+    fi
+    if test $at_fail_count != 0; then
+      $as_echo "## ---------------------- ##
+## Detailed failed tests. ##
+## ---------------------- ##"
+      echo
+      for at_group in $at_fail_list
+      do
+	at_group_normalized=$at_group
+
+  eval 'while :; do
+    case $at_group_normalized in #(
+    '"$at_format"'*) break;;
+    esac
+    at_group_normalized=0$at_group_normalized
+  done'
+
+	cat "$at_suite_dir/$at_group_normalized/$as_me.log"
+	echo
+      done
+      echo
+    fi
+    if test -n "$at_top_srcdir"; then
+      sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## ${at_top_build_prefix}config.log ##
+_ASBOX
+      sed 's/^/| /' ${at_top_build_prefix}config.log
+      echo
+    fi
+  } >&5
+
+  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## $as_me.log was created. ##
+_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:
+
+   To: <opendap-tech@opendap.org>
+   Subject: [libdap 3.19.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'.
+"
+  exit 1
+fi
+
+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" ""
+at_xfail=no
+      test "" = "xfail" && at_xfail=yes
+(
+  $as_echo "1. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    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 :
+
+        # The --baselines=yes option works only for tests that write to stdout
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        # Added '|| true' to ensure the command returns '0'
+        { set +x
+$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 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_traceon; }
+
+        # Need to compare either stdout or stderr
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:48"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_1
+#AT_START_2
+at_fn_group_banner 2 'DDSTest.at:49' \
+  "DDS \$abs_srcdir/dds-testsuite/3B42.980909.5.HDF.das.dds" ""
+at_xfail=no
+      test "" = "xfail" && at_xfail=yes
+(
+  $as_echo "2. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    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 :
+
+        # The --baselines=yes option works only for tests that write to stdout
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        # Added '|| true' to ensure the command returns '0'
+        { set +x
+$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 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_traceon; }
+
+        # Need to compare either stdout or stderr
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:49"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_2
+#AT_START_3
+at_fn_group_banner 3 'DDSTest.at:50' \
+  "DDS \$abs_srcdir/dds-testsuite/3B42.980909.5.HDF.dds" ""
+at_xfail=no
+      test "" = "xfail" && at_xfail=yes
+(
+  $as_echo "3. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    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 :
+
+        # The --baselines=yes option works only for tests that write to stdout
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        # Added '|| true' to ensure the command returns '0'
+        { set +x
+$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 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_traceon; }
+
+        # Need to compare either stdout or stderr
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:50"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_3
+#AT_START_4
+at_fn_group_banner 4 'DDSTest.at:51' \
+  "DDS \$abs_srcdir/dds-testsuite/AsciiOutputTest1.dds" ""
+at_xfail=no
+      test "" = "xfail" && at_xfail=yes
+(
+  $as_echo "4. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    input=$abs_srcdir/dds-testsuite/AsciiOutputTest1.dds
+    baseline=$abs_srcdir/dds-testsuite/AsciiOutputTest1.dds.base
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        # The --baselines=yes option works only for tests that write to stdout
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        # Added '|| true' to ensure the command returns '0'
+        { set +x
+$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 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_traceon; }
+
+        # Need to compare either stdout or stderr
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:51"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_4
+#AT_START_5
+at_fn_group_banner 5 'DDSTest.at:52' \
+  "DDS \$abs_srcdir/dds-testsuite/fnoc1.nc.das.dds" " "
+at_xfail=no
+      test "" = "xfail" && at_xfail=yes
+(
+  $as_echo "5. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    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 :
+
+        # The --baselines=yes option works only for tests that write to stdout
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        # Added '|| true' to ensure the command returns '0'
+        { set +x
+$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 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_traceon; }
+
+        # Need to compare either stdout or stderr
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:52"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_5
+#AT_START_6
+at_fn_group_banner 6 'DDSTest.at:53' \
+  "DDS \$abs_srcdir/dds-testsuite/fnoc1.nc.dds" "     "
+at_xfail=no
+      test "" = "xfail" && at_xfail=yes
+(
+  $as_echo "6. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    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 :
+
+        # The --baselines=yes option works only for tests that write to stdout
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        # Added '|| true' to ensure the command returns '0'
+        { set +x
+$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 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_traceon; }
+
+        # Need to compare either stdout or stderr
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:53"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_6
+#AT_START_7
+at_fn_group_banner 7 'DDSTest.at:54' \
+  "DDS \$abs_srcdir/dds-testsuite/S2000415.HDF.das.dds" ""
+at_xfail=no
+      test "" = "xfail" && at_xfail=yes
+(
+  $as_echo "7. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    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 :
+
+        # The --baselines=yes option works only for tests that write to stdout
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        # Added '|| true' to ensure the command returns '0'
+        { set +x
+$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 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_traceon; }
+
+        # Need to compare either stdout or stderr
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:54"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_7
+#AT_START_8
+at_fn_group_banner 8 'DDSTest.at:55' \
+  "DDS \$abs_srcdir/dds-testsuite/S2000415.HDF.dds" " "
+at_xfail=no
+      test "" = "xfail" && at_xfail=yes
+(
+  $as_echo "8. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    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 :
+
+        # The --baselines=yes option works only for tests that write to stdout
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        # Added '|| true' to ensure the command returns '0'
+        { set +x
+$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 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_traceon; }
+
+        # Need to compare either stdout or stderr
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:55"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_8
+#AT_START_9
+at_fn_group_banner 9 'DDSTest.at:56' \
+  "DDS \$abs_srcdir/dds-testsuite/test.1.dds" "       "
+at_xfail=no
+      test "" = "xfail" && at_xfail=yes
+(
+  $as_echo "9. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    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 :
+
+        # The --baselines=yes option works only for tests that write to stdout
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        # Added '|| true' to ensure the command returns '0'
+        { set +x
+$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 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_traceon; }
+
+        # Need to compare either stdout or stderr
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:56"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_9
+#AT_START_10
+at_fn_group_banner 10 'DDSTest.at:57' \
+  "DDS \$abs_srcdir/dds-testsuite/test.10.dds" "      "
+at_xfail=no
+      test "" = "xfail" && at_xfail=yes
+(
+  $as_echo "10. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    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 :
+
+        # The --baselines=yes option works only for tests that write to stdout
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        # Added '|| true' to ensure the command returns '0'
+        { set +x
+$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 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_traceon; }
+
+        # Need to compare either stdout or stderr
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:57"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_10
+#AT_START_11
+at_fn_group_banner 11 'DDSTest.at:58' \
+  "DDS \$abs_srcdir/dds-testsuite/test.11.dds" "      "
+at_xfail=no
+      test "" = "xfail" && at_xfail=yes
+(
+  $as_echo "11. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    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 :
+
+        # The --baselines=yes option works only for tests that write to stdout
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        # Added '|| true' to ensure the command returns '0'
+        { set +x
+$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 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_traceon; }
+
+        # Need to compare either stdout or stderr
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:58"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_11
+#AT_START_12
+at_fn_group_banner 12 'DDSTest.at:59' \
+  "DDS \$abs_srcdir/dds-testsuite/test.12.dds" "      "
+at_xfail=no
+      test "" = "xfail" && at_xfail=yes
+(
+  $as_echo "12. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    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 :
+
+        # The --baselines=yes option works only for tests that write to stdout
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        # Added '|| true' to ensure the command returns '0'
+        { set +x
+$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 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_traceon; }
+
+        # Need to compare either stdout or stderr
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:59"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_12
+#AT_START_13
+at_fn_group_banner 13 'DDSTest.at:60' \
+  "DDS \$abs_srcdir/dds-testsuite/test.13.dds" "      "
+at_xfail=no
+      test "" = "xfail" && at_xfail=yes
+(
+  $as_echo "13. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    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 :
+
+        # The --baselines=yes option works only for tests that write to stdout
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        # Added '|| true' to ensure the command returns '0'
+        { set +x
+$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 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_traceon; }
+
+        # Need to compare either stdout or stderr
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:60"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_13
+#AT_START_14
+at_fn_group_banner 14 'DDSTest.at:61' \
+  "DDS \$abs_srcdir/dds-testsuite/test.14.dds" "      "
+at_xfail=no
+      test "" = "xfail" && at_xfail=yes
+(
+  $as_echo "14. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    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 :
+
+        # The --baselines=yes option works only for tests that write to stdout
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        # Added '|| true' to ensure the command returns '0'
+        { set +x
+$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 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_traceon; }
+
+        # Need to compare either stdout or stderr
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:61"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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 'DDSTest.at:62' \
+  "DDS \$abs_srcdir/dds-testsuite/test.15.dds" "      "
+at_xfail=no
+      test "" = "xfail" && at_xfail=yes
+(
+  $as_echo "15. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    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 :
+
+        # The --baselines=yes option works only for tests that write to stdout
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        # Added '|| true' to ensure the command returns '0'
+        { set +x
+$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 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_traceon; }
+
+        # Need to compare either stdout or stderr
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:62"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_15
+#AT_START_16
+at_fn_group_banner 16 'DDSTest.at:63' \
+  "DDS \$abs_srcdir/dds-testsuite/test.16.dds" "      "
+at_xfail=no
+      test "" = "xfail" && at_xfail=yes
+(
+  $as_echo "16. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    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 :
+
+        # The --baselines=yes option works only for tests that write to stdout
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        # Added '|| true' to ensure the command returns '0'
+        { set +x
+$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 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_traceon; }
+
+        # Need to compare either stdout or stderr
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:63"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_16
+#AT_START_17
+at_fn_group_banner 17 'DDSTest.at:64' \
+  "DDS \$abs_srcdir/dds-testsuite/test.17.dds" "      "
+at_xfail=no
+      test "" = "xfail" && at_xfail=yes
+(
+  $as_echo "17. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    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 :
+
+        # The --baselines=yes option works only for tests that write to stdout
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        # Added '|| true' to ensure the command returns '0'
+        { set +x
+$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 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_traceon; }
+
+        # Need to compare either stdout or stderr
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:64"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_17
+#AT_START_18
+at_fn_group_banner 18 'DDSTest.at:65' \
+  "DDS \$abs_srcdir/dds-testsuite/test.18.dds" "      "
+at_xfail=no
+      test "" = "xfail" && at_xfail=yes
+(
+  $as_echo "18. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    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 :
+
+        # The --baselines=yes option works only for tests that write to stdout
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        # Added '|| true' to ensure the command returns '0'
+        { set +x
+$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 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_traceon; }
+
+        # Need to compare either stdout or stderr
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:65"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_18
+#AT_START_19
+at_fn_group_banner 19 'DDSTest.at:66' \
+  "DDS \$abs_srcdir/dds-testsuite/test.19.dds" "      "
+at_xfail=no
+      test "" = "xfail" && at_xfail=yes
+(
+  $as_echo "19. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    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 :
+
+        # The --baselines=yes option works only for tests that write to stdout
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        # Added '|| true' to ensure the command returns '0'
+        { set +x
+$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 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_traceon; }
+
+        # Need to compare either stdout or stderr
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:66"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_19
+#AT_START_20
+at_fn_group_banner 20 'DDSTest.at:67' \
+  "DDS \$abs_srcdir/dds-testsuite/test.19b.das.dds" " "
+at_xfail=no
+      test "" = "xfail" && at_xfail=yes
+(
+  $as_echo "20. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    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 :
+
+        # The --baselines=yes option works only for tests that write to stdout
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        # Added '|| true' to ensure the command returns '0'
+        { set +x
+$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 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_traceon; }
+
+        # Need to compare either stdout or stderr
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:67"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_20
+#AT_START_21
+at_fn_group_banner 21 'DDSTest.at:68' \
+  "DDS \$abs_srcdir/dds-testsuite/test.19b.dds" "     "
+at_xfail=no
+      test "" = "xfail" && at_xfail=yes
+(
+  $as_echo "21. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    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 :
+
+        # The --baselines=yes option works only for tests that write to stdout
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        # Added '|| true' to ensure the command returns '0'
+        { set +x
+$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 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_traceon; }
+
+        # Need to compare either stdout or stderr
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:68"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_21
+#AT_START_22
+at_fn_group_banner 22 'DDSTest.at:69' \
+  "DDS \$abs_srcdir/dds-testsuite/test.2.dds" "       "
+at_xfail=no
+      test "" = "xfail" && at_xfail=yes
+(
+  $as_echo "22. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    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 :
+
+        # The --baselines=yes option works only for tests that write to stdout
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        # Added '|| true' to ensure the command returns '0'
+        { set +x
+$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 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_traceon; }
+
+        # Need to compare either stdout or stderr
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:69"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_22
+#AT_START_23
+at_fn_group_banner 23 'DDSTest.at:70' \
+  "DDS \$abs_srcdir/dds-testsuite/test.20.dds" "      "
+at_xfail=no
+      test "" = "xfail" && at_xfail=yes
+(
+  $as_echo "23. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    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 :
+
+        # The --baselines=yes option works only for tests that write to stdout
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        # Added '|| true' to ensure the command returns '0'
+        { set +x
+$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 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_traceon; }
+
+        # Need to compare either stdout or stderr
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:70"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_23
+#AT_START_24
+at_fn_group_banner 24 'DDSTest.at:71' \
+  "DDS \$abs_srcdir/dds-testsuite/test.3.dds" "       "
+at_xfail=no
+      test "" = "xfail" && at_xfail=yes
+(
+  $as_echo "24. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    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 :
+
+        # The --baselines=yes option works only for tests that write to stdout
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        # Added '|| true' to ensure the command returns '0'
+        { set +x
+$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 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_traceon; }
+
+        # Need to compare either stdout or stderr
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:71"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_24
+#AT_START_25
+at_fn_group_banner 25 'DDSTest.at:72' \
+  "DDS \$abs_srcdir/dds-testsuite/test.4.dds" "       "
+at_xfail=no
+      test "" = "xfail" && at_xfail=yes
+(
+  $as_echo "25. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    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 :
+
+        # The --baselines=yes option works only for tests that write to stdout
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        # Added '|| true' to ensure the command returns '0'
+        { set +x
+$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 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_traceon; }
+
+        # Need to compare either stdout or stderr
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:72"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_25
+#AT_START_26
+at_fn_group_banner 26 'DDSTest.at:73' \
+  "DDS \$abs_srcdir/dds-testsuite/test.6.dds" "       "
+at_xfail=no
+      test "" = "xfail" && at_xfail=yes
+(
+  $as_echo "26. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    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 :
+
+        # The --baselines=yes option works only for tests that write to stdout
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        # Added '|| true' to ensure the command returns '0'
+        { set +x
+$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 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_traceon; }
+
+        # Need to compare either stdout or stderr
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:73"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_26
+#AT_START_27
+at_fn_group_banner 27 'DDSTest.at:74' \
+  "DDS \$abs_srcdir/dds-testsuite/test.7.dds" "       "
+at_xfail=no
+      test "" = "xfail" && at_xfail=yes
+(
+  $as_echo "27. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    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 :
+
+        # The --baselines=yes option works only for tests that write to stdout
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        # Added '|| true' to ensure the command returns '0'
+        { set +x
+$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 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_traceon; }
+
+        # Need to compare either stdout or stderr
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:74"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_27
+#AT_START_28
+at_fn_group_banner 28 'DDSTest.at:75' \
+  "DDS \$abs_srcdir/dds-testsuite/test.8.dds" "       "
+at_xfail=no
+      test "" = "xfail" && at_xfail=yes
+(
+  $as_echo "28. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    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 :
+
+        # The --baselines=yes option works only for tests that write to stdout
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        # Added '|| true' to ensure the command returns '0'
+        { set +x
+$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 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_traceon; }
+
+        # Need to compare either stdout or stderr
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:75"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_28
+#AT_START_29
+at_fn_group_banner 29 'DDSTest.at:76' \
+  "DDS \$abs_srcdir/dds-testsuite/test.9.dds" "       "
+at_xfail=no
+      test "" = "xfail" && at_xfail=yes
+(
+  $as_echo "29. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    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 :
+
+        # The --baselines=yes option works only for tests that write to stdout
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        # Added '|| true' to ensure the command returns '0'
+        { set +x
+$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 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_traceon; }
+
+        # Need to compare either stdout or stderr
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:76"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_29
+#AT_START_30
+at_fn_group_banner 30 'DDSTest.at:80' \
+  "DDS \$abs_srcdir/dds-testsuite/test.21.dds" "      "
+at_xfail=no
+      test "" = "xfail" && at_xfail=yes
+(
+  $as_echo "30. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    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 :
+
+        # The --baselines=yes option works only for tests that write to stdout
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        # Added '|| true' to ensure the command returns '0'
+        { set +x
+$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 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_traceon; }
+
+        # Need to compare either stdout or stderr
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:80"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_30
+#AT_START_31
+at_fn_group_banner 31 'DDSTest.at:81' \
+  "DDS \$abs_srcdir/dds-testsuite/test.22.dds" "      "
+at_xfail=no
+      test "" = "xfail" && at_xfail=yes
+(
+  $as_echo "31. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    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 :
+
+        # The --baselines=yes option works only for tests that write to stdout
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        # Added '|| true' to ensure the command returns '0'
+        { set +x
+$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 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_traceon; }
+
+        # Need to compare either stdout or stderr
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:81"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_31
+#AT_START_32
+at_fn_group_banner 32 'DDSTest.at:82' \
+  "DDS \$abs_srcdir/dds-testsuite/test.23.dds" "      "
+at_xfail=no
+      test "" = "xfail" && at_xfail=yes
+(
+  $as_echo "32. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    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 :
+
+        # The --baselines=yes option works only for tests that write to stdout
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        # Added '|| true' to ensure the command returns '0'
+        { set +x
+$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 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_traceon; }
+
+        # Need to compare either stdout or stderr
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:82"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_32
+#AT_START_33
+at_fn_group_banner 33 'DDSTest.at:83' \
+  "DDS \$abs_srcdir/dds-testsuite/test.24.dds" "      "
+at_xfail=no
+      test "xpass" = "xfail" && at_xfail=yes
+(
+  $as_echo "33. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    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 :
+
+        # The --baselines=yes option works only for tests that write to stdout
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        # Added '|| true' to ensure the command returns '0'
+        { set +x
+$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 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_traceon; }
+
+        # Need to compare either stdout or stderr
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:83"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_33
+#AT_START_34
+at_fn_group_banner 34 'DDSTest.at:86' \
+  "DDS \$abs_srcdir/dds-testsuite/test.25.dds" "      "
+at_xfail=no
+      test "xpass" = "xfail" && at_xfail=yes
+(
+  $as_echo "34. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    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 :
+
+        # The --baselines=yes option works only for tests that write to stdout
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        # Added '|| true' to ensure the command returns '0'
+        { set +x
+$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 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_traceon; }
+
+        # Need to compare either stdout or stderr
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:86"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_34
+#AT_START_35
+at_fn_group_banner 35 'DDSTest.at:87' \
+  "DDS \$abs_srcdir/dds-testsuite/test.26.dds" "      "
+at_xfail=no
+      test "xpass" = "xfail" && at_xfail=yes
+(
+  $as_echo "35. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    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 :
+
+        # The --baselines=yes option works only for tests that write to stdout
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        # Added '|| true' to ensure the command returns '0'
+        { set +x
+$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 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_traceon; }
+
+        # Need to compare either stdout or stderr
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:87"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_35
diff --git a/tests/DDSTest.at b/tests/DDSTest.at
new file mode 100644
index 0000000..aa8b84c
--- /dev/null
+++ b/tests/DDSTest.at
@@ -0,0 +1,88 @@
+# Process with autom4te to create an -*- Autotest -*- test suite.
+
+AT_INIT([dds-test])
+# AT_COPYRIGHT([])
+
+#AT_TESTED([dds-test])
+
+AT_ARG_OPTION_ARG([baselines],
+    [--baselines=yes|no   Build the baseline file for parser test 'arg'],
+    [echo "baselines set to $at_arg_baselines";
+     baselines=$at_arg_baselines],[baselines=])
+
+# Usage: _AT_TEST_*(<dds source>, <baseline file>, [xfail|xpass])
+
+m4_define([_AT_DDS_TEST],   
+[
+    # AT_BANNER([Test $1 $2])
+    AT_SETUP([DDS $1])
+    AT_KEYWORDS([dds])
+    
+    input=$1
+    baseline=$2
+    
+    AS_IF([test -n "$baselines" -a x$baselines = xyes],
+        [
+        # The --baselines=yes option works only for tests that write to stdout
+        AT_CHECK([$abs_builddir/dds-test -p < $input || true], [0], [stdout], [ignore])
+        AT_CHECK([mv stdout $baseline.tmp])
+        ],
+        [        
+        # Added '|| true' to ensure the command returns '0'
+        AT_CHECK([$abs_builddir/dds-test -p < $input || true], [0], [stdout], [stderr])
+        # Need to compare either stdout or stderr
+        AT_CHECK([diff -b -B $baseline stdout || diff -b -B $baseline stderr], [0], [ignore])
+        AT_XFAIL_IF([test "$3" = "xfail"])
+        ])
+        
+    AT_CLEANUP
+])
+
+m4_define([AT_DDS_RESPONSE_TEST],
+[
+    # AT_BANNER([DDS response for $1.])
+    _AT_DDS_TEST([$abs_srcdir/dds-testsuite/$1], [$abs_srcdir/dds-testsuite/$1.base], $2)
+])
+
+
+AT_DDS_RESPONSE_TEST([3B42.980909.5.hacked.HDF.das.dds])
+AT_DDS_RESPONSE_TEST([3B42.980909.5.HDF.das.dds])
+AT_DDS_RESPONSE_TEST([3B42.980909.5.HDF.dds])
+AT_DDS_RESPONSE_TEST([AsciiOutputTest1.dds])
+AT_DDS_RESPONSE_TEST([fnoc1.nc.das.dds])
+AT_DDS_RESPONSE_TEST([fnoc1.nc.dds])
+AT_DDS_RESPONSE_TEST([S2000415.HDF.das.dds])
+AT_DDS_RESPONSE_TEST([S2000415.HDF.dds])
+AT_DDS_RESPONSE_TEST([test.1.dds])
+AT_DDS_RESPONSE_TEST([test.10.dds])
+AT_DDS_RESPONSE_TEST([test.11.dds])
+AT_DDS_RESPONSE_TEST([test.12.dds])
+AT_DDS_RESPONSE_TEST([test.13.dds])
+AT_DDS_RESPONSE_TEST([test.14.dds])
+AT_DDS_RESPONSE_TEST([test.15.dds])
+AT_DDS_RESPONSE_TEST([test.16.dds])
+AT_DDS_RESPONSE_TEST([test.17.dds])
+AT_DDS_RESPONSE_TEST([test.18.dds])
+AT_DDS_RESPONSE_TEST([test.19.dds])
+AT_DDS_RESPONSE_TEST([test.19b.das.dds])
+AT_DDS_RESPONSE_TEST([test.19b.dds])
+AT_DDS_RESPONSE_TEST([test.2.dds])
+AT_DDS_RESPONSE_TEST([test.20.dds])
+AT_DDS_RESPONSE_TEST([test.3.dds])
+AT_DDS_RESPONSE_TEST([test.4.dds])
+AT_DDS_RESPONSE_TEST([test.6.dds])
+AT_DDS_RESPONSE_TEST([test.7.dds])
+AT_DDS_RESPONSE_TEST([test.8.dds])
+AT_DDS_RESPONSE_TEST([test.9.dds])
+
+# Added these to test zero-length arrays
+
+AT_DDS_RESPONSE_TEST([test.21.dds])
+AT_DDS_RESPONSE_TEST([test.22.dds])
+AT_DDS_RESPONSE_TEST([test.23.dds])
+AT_DDS_RESPONSE_TEST([test.24.dds], [xpass])
+
+# Empty Structures
+AT_DDS_RESPONSE_TEST([test.25.dds], [xpass])
+AT_DDS_RESPONSE_TEST([test.26.dds], [xpass])
+
diff --git a/tests/DMRTest b/tests/DMRTest
new file mode 100755
index 0000000..ac4081c
--- /dev/null
+++ b/tests/DMRTest
@@ -0,0 +1,21564 @@
+#! /bin/sh
+# Generated from DMRTest.at by GNU Autoconf 2.69.
+#
+# Copyright (C) 2009-2012 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. ##
+## -------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+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_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+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
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  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
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
+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
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  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 || :
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && 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
+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@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
+
+# 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
+
+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
+
+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_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+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
+
+
+  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 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
+}
+
+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
+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 -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'
+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"'
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+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'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+
+
+
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+# How were we run?
+at_cli_args="$@"
+
+
+# Not all shells have the 'times' builtin; the subshell is needed to make
+# sure we discard the 'times: not found' message from the shell.
+at_times_p=false
+(times) >/dev/null 2>&1 && at_times_p=:
+
+# CLI Arguments to pass to the debugging scripts.
+at_debug_args=
+# -e sets to true
+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.
+at_debug_p=false
+# Display help message?
+at_help_p=false
+# Display the version message?
+at_version_p=false
+# List test groups?
+at_list_p=false
+# --clean
+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
+
+# The directory we run the suite in.  Default to . if no -C option.
+at_dir=`pwd`
+# An absolute reference to this testsuite script.
+case $as_myself in
+  [\\/]* | ?:[\\/]* ) at_myself=$as_myself ;;
+  * ) at_myself=$at_dir/$as_myself ;;
+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=''
+# 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.
+at_format='???'
+# Description of all the test groups.
+at_help_all="1;DMRTest.at:211;parse dmr-testsuite/test_simple_1.xml;parse;
+2;DMRTest.at:212;parse dmr-testsuite/test_simple_2.xml;parse;
+3;DMRTest.at:213;parse dmr-testsuite/test_simple_3.xml;parse;
+4;DMRTest.at:215;parse dmr-testsuite/test_simple_3_error_1.xml;parse;
+5;DMRTest.at:216;parse dmr-testsuite/test_simple_3_error_2.xml;parse;
+6;DMRTest.at:217;parse dmr-testsuite/test_simple_3_error_3.xml;parse;
+7;DMRTest.at:219;parse dmr-testsuite/test_simple_4.xml;parse;
+8;DMRTest.at:220;parse dmr-testsuite/test_simple_5.xml;parse;
+9;DMRTest.at:221;parse dmr-testsuite/test_simple_6.xml;parse;
+10;DMRTest.at:222;parse dmr-testsuite/test_simple_7.xml;parse;
+11;DMRTest.at:223;parse dmr-testsuite/test_simple_8.xml;parse;
+12;DMRTest.at:224;parse dmr-testsuite/test_simple_9.xml;parse;
+13;DMRTest.at:225;parse dmr-testsuite/test_simple_9.1.xml;parse;
+14;DMRTest.at:226;parse dmr-testsuite/test_simple_10.xml;parse;
+15;DMRTest.at:228;parse dmr-testsuite/test_array_1.xml;parse;
+16;DMRTest.at:229;parse dmr-testsuite/test_array_2.xml;parse;
+17;DMRTest.at:230;parse dmr-testsuite/test_array_3.xml;parse;
+18;DMRTest.at:231;parse dmr-testsuite/test_array_4.xml;parse;
+19;DMRTest.at:232;parse dmr-testsuite/test_array_5.xml;parse;
+20;DMRTest.at:233;parse dmr-testsuite/test_array_6.xml;parse;
+21;DMRTest.at:234;parse dmr-testsuite/test_array_7.xml;parse;
+22;DMRTest.at:235;parse dmr-testsuite/test_array_8.xml;parse;
+23;DMRTest.at:236;parse dmr-testsuite/test_array_10.xml;parse;
+24;DMRTest.at:237;parse dmr-testsuite/test_array_11.xml;parse;
+25;DMRTest.at:239;parse dmr-testsuite/ignore_foreign_xml_1.xml;parse;
+26;DMRTest.at:240;parse dmr-testsuite/ignore_foreign_xml_2.xml;parse;
+27;DMRTest.at:241;parse dmr-testsuite/ignore_foreign_xml_3.xml;parse;
+28;DMRTest.at:251;trans test_simple_1.xml;trans;
+29;DMRTest.at:252;trans test_simple_2.xml;trans;
+30;DMRTest.at:253;trans test_simple_3.xml;trans;
+31;DMRTest.at:254;trans test_simple_4.xml;trans;
+32;DMRTest.at:255;trans test_simple_5.xml;trans;
+33;DMRTest.at:256;trans test_simple_6.xml;trans;
+34;DMRTest.at:257;trans test_simple_7.xml;trans;
+35;DMRTest.at:258;trans test_simple_8.xml;trans;
+36;DMRTest.at:259;trans test_simple_9.xml;trans;
+37;DMRTest.at:260;trans test_simple_9.1.xml;trans;
+38;DMRTest.at:261;trans test_simple_10.xml;trans;
+39;DMRTest.at:263;trans test_array_1.xml;trans;
+40;DMRTest.at:264;trans test_array_2.xml;trans;
+41;DMRTest.at:265;trans test_array_3.xml;trans;
+42;DMRTest.at:266;trans test_array_4.xml;trans;
+43;DMRTest.at:267;trans test_array_5.xml;trans;
+44;DMRTest.at:268;trans test_array_6.xml;trans;
+45;DMRTest.at:269;trans test_array_7.xml;trans;
+46;DMRTest.at:270;trans test_array_8.xml;trans;
+47;DMRTest.at:271;trans test_array_10.xml;trans;
+48;DMRTest.at:272;trans test_array_11.xml;trans;
+49;DMRTest.at:274;intern test_simple_1.xml;intern;
+50;DMRTest.at:275;intern test_simple_2.xml;intern;
+51;DMRTest.at:276;intern test_simple_3.xml;intern;
+52;DMRTest.at:277;intern test_simple_4.xml;intern;
+53;DMRTest.at:278;intern test_simple_5.xml;intern;
+54;DMRTest.at:279;intern test_simple_6.xml;intern;
+55;DMRTest.at:280;intern test_simple_7.xml;intern;
+56;DMRTest.at:281;intern test_simple_8.xml;intern;
+57;DMRTest.at:282;intern test_simple_9.xml;intern;
+58;DMRTest.at:283;intern test_simple_9.1.xml;intern;
+59;DMRTest.at:284;intern test_simple_10.xml;intern;
+60;DMRTest.at:286;intern test_array_1.xml;intern;
+61;DMRTest.at:287;intern test_array_2.xml;intern;
+62;DMRTest.at:288;intern test_array_3.xml;intern;
+63;DMRTest.at:289;intern test_array_4.xml;intern;
+64;DMRTest.at:290;intern test_array_5.xml;intern;
+65;DMRTest.at:291;intern test_array_6.xml;intern;
+66;DMRTest.at:292;intern test_array_7.xml;intern;
+67;DMRTest.at:293;intern test_array_8.xml;intern;
+68;DMRTest.at:294;intern test_array_10.xml;intern;
+69;DMRTest.at:295;intern test_array_11.xml;intern;
+70;DMRTest.at:298;parse dmr-testsuite/test_array_9.xml;parse;
+71;DMRTest.at:299;parse dmr-testsuite/test_array_12.xml;parse;
+72;DMRTest.at:300;parse dmr-testsuite/test_array_13.xml;parse;
+73;DMRTest.at:301;parse dmr-testsuite/test_array_14.xml;parse;
+74;DMRTest.at:304;parse dmr-testsuite/test_simple_6.2.xml;parse;
+75;DMRTest.at:305;parse dmr-testsuite/test_simple_6.3.xml;parse;
+76;DMRTest.at:307;trans test_array_9.xml;trans;
+77;DMRTest.at:308;trans test_array_12.xml;trans;
+78;DMRTest.at:309;trans test_array_13.xml;trans;
+79;DMRTest.at:310;trans test_array_14.xml;trans;
+80;DMRTest.at:312;trans test_simple_6.2.xml;trans;
+81;DMRTest.at:313;trans test_simple_6.3.xml;trans;
+82;DMRTest.at:316;trans test_array_9.xml;trans;
+83;DMRTest.at:317;trans test_array_12.xml;trans;
+84;DMRTest.at:318;trans test_array_13.xml;trans;
+85;DMRTest.at:319;trans test_array_14.xml;trans;
+86;DMRTest.at:321;trans test_simple_6.2.xml;trans;
+87;DMRTest.at:322;trans test_simple_6.3.xml;trans;
+88;DMRTest.at:324;intern test_array_9.xml;intern;
+89;DMRTest.at:325;intern test_array_12.xml;intern;
+90;DMRTest.at:326;intern test_array_13.xml;intern;
+91;DMRTest.at:327;intern test_array_14.xml;intern;
+92;DMRTest.at:329;intern test_simple_6.2.xml;intern;
+93;DMRTest.at:330;intern test_simple_6.3.xml;intern;
+94;DMRTest.at:346;trans ce test_array_3.1.dmr row;x test_array_3.1.dmr.1.trans_base;trans_ce;
+95;DMRTest.at:346;trans ce test_array_3.1.dmr row=[2:3];x test_array_3.1.dmr.2.trans_base;trans_ce;
+96;DMRTest.at:346;trans ce test_array_3.1.dmr row=[2:3];x[0:1] test_array_3.1.dmr.3.trans_base;trans_ce;
+97;DMRTest.at:346;trans ce test_array_3.1.dmr x[0:1] test_array_3.1.dmr.4.trans_base;trans_ce;
+98;DMRTest.at:346;trans ce test_array_3.1.dmr x test_array_3.1.dmr.5.trans_base;trans_ce;
+99;DMRTest.at:350;trans ce test_array_4.xml a test_array_4.xml.1.trans_base;trans_ce;
+100;DMRTest.at:351;trans ce test_array_4.xml a[][]  test_array_4.xml.1.trans_base;trans_ce;
+101;DMRTest.at:353;trans ce test_array_4.xml /row=[0:1];/col=[3];a test_array_4.xml.3.trans_base;trans_ce;
+102;DMRTest.at:355;trans ce test_array_4.xml /row=[0:1];/col=[3];a[][]  test_array_4.xml.4.trans_base;trans_ce;
+103;DMRTest.at:357;trans ce test_array_4.xml /row=[0:1];/col=[3];a[][];b[0][];c[0:][0:]  test_array_4.xml.5.trans_base;trans_ce;
+104;DMRTest.at:359;trans ce test_array_4.xml x[][]  /test_array_4.xml.6.trans_base;trans_ce;
+105;DMRTest.at:360;trans ce test_array_4.xml /row=[0:1];x[][]  test_array_4.xml.7.trans_base;trans_ce;
+106;DMRTest.at:362;trans ce test_array_4.xml c[2:][2:]  test_array_4.xml.8.trans_base;trans_ce;
+107;DMRTest.at:364;trans ce test_simple_6.xml s test_simple_6.xml.1.trans_base;trans_ce;
+108;DMRTest.at:365;trans ce test_simple_6.xml s.i1 test_simple_6.xml.2.trans_base;trans_ce;
+109;DMRTest.at:366;trans ce test_simple_6.xml s.s test_simple_6.xml.3.trans_base;trans_ce;
+110;DMRTest.at:367;trans ce test_simple_6.1.xml s.inner.i2 test_simple_6.1.xml.1.trans_base;trans_ce;
+111;DMRTest.at:369;trans ce test_simple_6.xml s{i1} test_simple_6.xml.2.trans_base;trans_ce;
+112;DMRTest.at:370;trans ce test_simple_6.xml s{s} test_simple_6.xml.3.trans_base;trans_ce;
+113;DMRTest.at:371;trans ce test_simple_6.1.xml s{inner.i2} test_simple_6.1.xml.1.trans_base;trans_ce;
+114;DMRTest.at:372;trans ce test_simple_6.1.xml s{inner{i2}} test_simple_6.1.xml.1.trans_base;trans_ce;
+115;DMRTest.at:375;trans ce test_array_6.xml a test_array_6.xml.1.trans_base;trans_ce;
+116;DMRTest.at:376;trans ce test_array_6.xml a[][]  test_array_6.xml.1.trans_base;trans_ce;
+117;DMRTest.at:377;trans ce test_array_6.xml /row=[0:1];a[][]  test_array_6.xml.2.trans_base;trans_ce;
+118;DMRTest.at:378;trans ce test_array_6.xml /row=[0:1];a[][1:2]  test_array_6.xml.3.trans_base;trans_ce;
+119;DMRTest.at:381;trans ce test_array_6.2.xml a test_array_6.2.xml.1.trans_base;trans_ce;
+120;DMRTest.at:382;trans ce test_array_6.2.xml a{i;j} test_array_6.2.xml.1.trans_base;trans_ce;
+121;DMRTest.at:383;trans ce test_array_6.2.xml a.i test_array_6.2.xml.2.trans_base;trans_ce;
+122;DMRTest.at:384;trans ce test_array_6.2.xml a{i} test_array_6.2.xml.2.trans_base;trans_ce;
+123;DMRTest.at:385;trans ce test_array_6.2.xml a.i[0][1:2]  test_array_6.2.xml.3.trans_base;trans_ce;
+124;DMRTest.at:386;trans ce test_array_6.2.xml a{i[0][1:2]}  test_array_6.2.xml.3.trans_base;trans_ce;
+125;DMRTest.at:387;trans ce test_array_6.2.xml /row=[0:1];a.i[][1:2]  test_array_6.2.xml.4.trans_base;trans_ce;
+126;DMRTest.at:388;trans ce test_array_6.2.xml /row=[0:1];a{i[][1:2]}  test_array_6.2.xml.4.trans_base;trans_ce;
+127;DMRTest.at:390;trans ce test_array_6.2.xml a.j test_array_6.2.xml.5.trans_base;trans_ce;
+128;DMRTest.at:393;trans ce test_array_6.1.xml a test_array_6.1.xml.1.trans_base;trans_ce;
+129;DMRTest.at:396;trans ce test_array_6.1.xml /row=[1:2];a[][0]  test_array_6.1.xml.2.trans_base;trans_ce;
+130;DMRTest.at:397;trans ce test_array_6.1.xml /row=[1:2];a[][0]{i;j}  test_array_6.1.xml.2.trans_base;trans_ce;
+131;DMRTest.at:399;trans ce test_array_6.1.xml row=[1:2];a[][0]{i;j}  test_array_6.1.xml.2.trans_base;trans_ce;
+132;DMRTest.at:402;trans ce test_array_6.1.xml a{i[1:2][1:3];j}  test_array_6.1.xml.3.trans_base;trans_ce;
+133;DMRTest.at:403;trans ce test_array_6.1.xml a[][]{i[1:2][1:3];j}  test_array_6.1.xml.3.trans_base;trans_ce;
+134;DMRTest.at:407;trans ce test_array_6.1.xml /row=[1];a[][0]{i[][0:1]}  test_array_6.1.xml.4.trans_base;trans_ce;
+135;DMRTest.at:410;trans ce test_simple_7.xml s test_simple_7.xml.1.trans_base;trans_ce;
+136;DMRTest.at:411;trans ce test_simple_7.xml s{i1;s} test_simple_7.xml.1.trans_base;trans_ce;
+137;DMRTest.at:413;trans ce test_simple_7.xml s.i1 test_simple_7.xml.2.trans_base;trans_ce;
+138;DMRTest.at:414;trans ce test_simple_7.xml s{i1} test_simple_7.xml.2.trans_base;trans_ce;
+139;DMRTest.at:416;trans ce test_simple_8.xml outer test_simple_8.xml.1.trans_base;trans_ce;
+140;DMRTest.at:417;trans ce test_simple_8.xml outer.s.s test_simple_8.xml.2.trans_base;trans_ce;
+141;DMRTest.at:418;trans ce test_simple_8.xml outer{s{s}} test_simple_8.xml.2.trans_base;trans_ce;
+142;DMRTest.at:420;trans ce test_array_7.xml s test_array_7.xml.1.trans_base;trans_ce;
+143;DMRTest.at:421;trans ce test_array_7.xml s{i1;s} test_array_7.xml.1.trans_base;trans_ce;
+144;DMRTest.at:423;trans ce test_array_7.xml s.i1 test_array_7.xml.2.trans_base;trans_ce;
+145;DMRTest.at:424;trans ce test_array_7.xml s{i1} test_array_7.xml.2.trans_base;trans_ce;
+146;DMRTest.at:426;trans ce test_array_7.xml s[1]  test_array_7.xml.3.trans_base;trans_ce;
+147;DMRTest.at:427;trans ce test_array_7.xml s[1]{i1;s} test_array_7.xml.3.trans_base;trans_ce;
+148;DMRTest.at:429;trans ce test_array_7.xml s[1]{i1} test_array_7.xml.4.trans_base;trans_ce;
+149;DMRTest.at:432;trans ce test_array_8.xml /col=[1:2];s[1][]{i1} test_array_8.xml.1.trans_base;trans_ce;
+150;DMRTest.at:433;trans ce test_array_8.xml col=[1:2];s[1][]{i1} test_array_8.xml.1.trans_base;trans_ce;
+151;DMRTest.at:436;trans ce test_array_7.1.xml  test_array_7.1.xml.1.trans_base;trans_ce;
+152;DMRTest.at:437;trans ce test_array_7.1.xml s test_array_7.1.xml.1.trans_base;trans_ce;
+153;DMRTest.at:439;trans ce test_array_7.1.xml s.i1 test_array_7.1.xml.2.trans_base;trans_ce;
+154;DMRTest.at:440;trans ce test_array_7.1.xml s.i1[][]  test_array_7.1.xml.2.trans_base;trans_ce;
+155;DMRTest.at:441;trans ce test_array_7.1.xml s{i1} test_array_7.1.xml.2.trans_base;trans_ce;
+156;DMRTest.at:442;trans ce test_array_7.1.xml s{i1[][]}  test_array_7.1.xml.2.trans_base;trans_ce;
+157;DMRTest.at:444;trans ce test_array_7.1.xml s.i1[0][0]  test_array_7.1.xml.3.trans_base;trans_ce;
+158;DMRTest.at:445;trans ce test_array_7.1.xml s{i1[0][0]}  test_array_7.1.xml.3.trans_base;trans_ce;
+159;DMRTest.at:447;trans ce test_array_7.1.xml s.i1[0:2][1:2]  test_array_7.1.xml.4.trans_base;trans_ce;
+160;DMRTest.at:451;trans ce test_array_7.1.xml /row=[2:3];/col=[2:3];s  test_array_7.1.xml.5.trans_base;trans_ce;
+161;DMRTest.at:453;trans ce test_array_7.1.xml /row=[2:3];/col=[2:3];s.i1  test_array_7.1.xml.6.trans_base;trans_ce;
+162;DMRTest.at:454;trans ce test_array_7.1.xml /row=[2:3];/col=[2:3];s.i1[][]  test_array_7.1.xml.6.trans_base;trans_ce;
+163;DMRTest.at:455;trans ce test_array_7.1.xml /row=[2:3];/col=[2:3];s{i1}  test_array_7.1.xml.6.trans_base;trans_ce;
+164;DMRTest.at:456;trans ce test_array_7.1.xml /row=[2:3];/col=[2:3];s{i1[][]}  test_array_7.1.xml.6.trans_base;trans_ce;
+165;DMRTest.at:459;trans ce test_array_7.2.xml /col=[1:2];s[]{i1} test_array_7.2.xml.1.trans_base;trans_ce;
+166;DMRTest.at:460;trans ce test_array_7.2.xml /col=[1:2];s[]{i1[][]} test_array_7.2.xml.1.trans_base;trans_ce;
+167;DMRTest.at:461;trans ce test_array_7.2.xml /col=[1:2];s{i1[][]} test_array_7.2.xml.1.trans_base;trans_ce;
+168;DMRTest.at:463;trans ce test_array_7.2.xml /col=[1:2];s[]{i1[0][]} test_array_7.2.xml.2.trans_base;trans_ce;
+169;DMRTest.at:464;trans ce test_array_7.2.xml /col=[1:2];s{i1[0][]} test_array_7.2.xml.2.trans_base;trans_ce;
+170;DMRTest.at:466;trans ce test_array_7.2.xml /col=[1:2];s[0]{i1} test_array_7.2.xml.3.trans_base;trans_ce;
+171;DMRTest.at:467;trans ce test_array_7.2.xml /col=[1:2];s[0]{i1[][]} test_array_7.2.xml.3.trans_base;trans_ce;
+172;DMRTest.at:469;trans ce test_array_7.2.xml /col=[1:2];s[0]{i1[0][]} test_array_7.2.xml.4.trans_base;trans_ce;
+173;DMRTest.at:473;trans test_array_1.xml scale(x,1)  test_array_1.xml.1.func_base;trans_func_ce;
+174;DMRTest.at:474;trans test_array_1.xml scale(x,10)  test_array_1.xml.2.func_base;trans_func_ce;
+175;DMRTest.at:475;trans test_array_1.xml scale(x,-10)  test_array_1.xml.3.func_base;trans_func_ce;
+176;DMRTest.at:476;trans test_array_1.xml scale(x,0.001)  test_array_1.xml.4.func_base;trans_func_ce;
+177;DMRTest.at:477;trans test_array_1.xml scale(x,-0.001)  test_array_1.xml.5.func_base;trans_func_ce;
+178;DMRTest.at:481;trans test_array_1.xml scale(x,0x7fffffffffffffff)  test_array_1.xml.6.func_base;trans_func_ce;
+179;DMRTest.at:483;trans test_array_1.xml scale(x,0x8fffffffffffffff)  test_array_1.xml.7.func_base;trans_func_ce;
+180;DMRTest.at:487;trans test_array_5.xml scale(a,0.001)  test_array_5.xml.1.func_base;trans_func_ce;
+181;DMRTest.at:488;trans test_array_5.xml scale(b,0.001)  test_array_5.xml.2.func_base;trans_func_ce;
+182;DMRTest.at:490;trans test_array_5.xml scale(c,0.001)  test_array_5.xml.3.func_base;trans_func_ce;
+183;DMRTest.at:491;trans test_array_5.xml scale(d,0.001)  test_array_5.xml.4.func_base;trans_func_ce;
+184;DMRTest.at:496;trans vol_1_ce_1.xml scale(u,10)  vol_1_ce_1.xml.1.func_base;trans_func_ce;
+185;DMRTest.at:497;trans vol_1_ce_1.xml scale(u,v)  vol_1_ce_1.xml.2.func_base;trans_func_ce;
+186;DMRTest.at:498;trans vol_1_ce_1.xml scale(scale(u,10),0.01)  vol_1_ce_1.xml.3.func_base;trans_func_ce;
+187;DMRTest.at:501;trans vol_1_ce_1.xml scale(Point.x,10)  vol_1_ce_1.xml.4.func_base;trans_func_ce;
+188;DMRTest.at:502;trans vol_1_ce_1.xml scale(Point.x,Point.y)  vol_1_ce_1.xml.5.func_base;trans_func_ce;
+189;DMRTest.at:503;trans vol_1_ce_1.xml scale(scale(Point.x,10),0.01)  vol_1_ce_1.xml.6.func_base;trans_func_ce;
+190;DMRTest.at:506;trans vol_1_ce_1.xml scale(\\\$Byte(20:1,2,3,4),10)  vol_1_ce_1.xml.7.func_base;trans_func_ce;
+191;DMRTest.at:507;trans vol_1_ce_1.xml scale(\\\$Int8(20:10,11,12,-9),10)  vol_1_ce_1.xml.8.func_base;trans_func_ce;
+192;DMRTest.at:508;trans vol_1_ce_1.xml scale(\\\$UInt16(20:1,2,3,4),10)  vol_1_ce_1.xml.9.func_base;trans_func_ce;
+193;DMRTest.at:509;trans vol_1_ce_1.xml scale(\\\$Int16(20:1,2,3,-4),10)  vol_1_ce_1.xml.10.func_base;trans_func_ce;
+194;DMRTest.at:510;trans vol_1_ce_1.xml scale(\\\$UInt32(20:1,2,3,4),10)  vol_1_ce_1.xml.11.func_base;trans_func_ce;
+195;DMRTest.at:511;trans vol_1_ce_1.xml scale(\\\$Int32(20:1,2,3,-4),10)  vol_1_ce_1.xml.12.func_base;trans_func_ce;
+196;DMRTest.at:512;trans vol_1_ce_1.xml scale(\\\$UInt64(20:1,2,3,0xffffffffffffffff),1)  vol_1_ce_1.xml.13.func_base;trans_func_ce;
+197;DMRTest.at:513;trans vol_1_ce_1.xml scale(\\\$Int64(20:1,2,3,0x7fffffffffffffff),1)  vol_1_ce_1.xml.14.func_base;trans_func_ce;
+198;DMRTest.at:514;trans vol_1_ce_1.xml scale(\\\$Float32(20:1,2,3,4.55),10)  vol_1_ce_1.xml.15.func_base;trans_func_ce;
+199;DMRTest.at:515;trans vol_1_ce_1.xml scale(\\\$Float64(20:1,2,3,4.55),10)  vol_1_ce_1.xml.16.func_base;trans_func_ce;
+200;DMRTest.at:519;trans vol_1_ce_10.xml scale(lat,10)  vol_1_ce_10.xml.1.func_base;trans_func_ce;
+201;DMRTest.at:520;trans vol_1_ce_10.xml scale(lat,10);scale(lon,10)  vol_1_ce_10.xml.2.func_base;trans_func_ce;
+202;DMRTest.at:521;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;trans_func_ce;
+203;DMRTest.at:528;filter test_simple_7.xml s test_simple_7.xml.f.trans_base;filter;
+204;DMRTest.at:530;filter test_simple_7.xml s|i1==1024 test_simple_7.xml.f1.trans_base;filter;
+205;DMRTest.at:531;filter test_simple_7.xml s|i1!=1024 test_simple_7.xml.f2.trans_base;filter;
+206;DMRTest.at:532;filter test_simple_7.xml s|i1<=1024 test_simple_7.xml.f3.trans_base;filter;
+207;DMRTest.at:533;filter test_simple_7.xml s|i1<1024 test_simple_7.xml.f4.trans_base;filter;
+208;DMRTest.at:534;filter test_simple_7.xml s|i1<=1024 test_simple_7.xml.f5.trans_base;filter;
+209;DMRTest.at:535;filter test_simple_7.xml s|i1>1024 test_simple_7.xml.f6.trans_base;filter;
+210;DMRTest.at:536;filter test_simple_7.xml s|i1>=1024 test_simple_7.xml.f7.trans_base;filter;
+211;DMRTest.at:538;filter test_simple_7.xml s|1024<i1 test_simple_7.xml.f8.trans_base;filter;
+212;DMRTest.at:539;filter test_simple_7.xml s|1024<=i1<=32768 test_simple_7.xml.f9.trans_base;filter;
+213;DMRTest.at:540;filter test_simple_7.xml s|i1>=1024.0 test_simple_7.xml.fa.trans_base;filter;
+214;DMRTest.at:542;filter test_simple_7.xml s|s==\\\"Silly test string: 2\\\" test_simple_7.xml.fs1.trans_base;filter;
+215;DMRTest.at:543;filter test_simple_7.xml s|s!=\\\"Silly test string: 2\\\" test_simple_7.xml.fs2.trans_base;filter;
+216;DMRTest.at:544;filter test_simple_7.xml s|s<\\\"Silly test string: 2\\\" test_simple_7.xml.fs3.trans_base;filter;
+217;DMRTest.at:545;filter test_simple_7.xml s|s<=\\\"Silly test string: 2\\\" test_simple_7.xml.fs4.trans_base;filter;
+218;DMRTest.at:546;filter test_simple_7.xml s|s>\\\"Silly test string: 2\\\" test_simple_7.xml.fs5.trans_base;filter;
+219;DMRTest.at:547;filter test_simple_7.xml s|s>=\\\"Silly test string: 2\\\" test_simple_7.xml.fs6.trans_base;filter;
+220;DMRTest.at:548;filter test_simple_7.xml s|s~=\\\".*2\\\" test_simple_7.xml.fs7.trans_base;filter;
+221;DMRTest.at:552;filter test_simple_7.xml s{i1}|i1<32768 test_simple_7.xml.g1.trans_base;filter;
+222;DMRTest.at:553;filter test_simple_7.xml s{i1}|s<=\\\"Silly test string: 2\\\" test_simple_7.xml.g1.trans_base;filter;
+223;DMRTest.at:556;filter test_simple_8.1.xml outer test_simple_8.1.xml.f1.trans_base;filter;
+224;DMRTest.at:557;filter test_simple_8.1.xml outer{x;y} test_simple_8.1.xml.f2.trans_base;filter;
+225;DMRTest.at:558;filter test_simple_8.1.xml outer{x;y;inner} test_simple_8.1.xml.f3.trans_base;filter;
+226;DMRTest.at:559;filter test_simple_8.1.xml outer{x;y;inner|i1<1000} test_simple_8.1.xml.f4.trans_base;filter;
+227;DMRTest.at:560;filter test_simple_8.1.xml outer{x;y;inner|i1<1000}|x<0.0 test_simple_8.1.xml.f5.trans_base;filter;
+228;DMRTest.at:567;filter names_with_spaces.dmr /u names_with_spaces.dmr.1.trans_base;filter;
+229;DMRTest.at:568;filter names_with_spaces.dmr /inst2/u names_with_spaces.dmr.2.trans_base;filter;
+230;DMRTest.at:569;filter names_with_spaces.dmr /inst2/Point.x names_with_spaces.dmr.3.trans_base;filter;
+231;DMRTest.at:571;filter names_with_spaces2.dmr /inst2/\\\"Point Break\\\".x names_with_spaces2.dmr.1.trans_base;filter;
+232;DMRTest.at:572;filter names_with_spaces2.dmr /inst2/Point%20Break.x names_with_spaces2.dmr.1.trans_base;filter;
+233;DMRTest.at:573;filter names_with_spaces2.dmr /inst2/\\\"Point%20Break\\\".x names_with_spaces2.dmr.1.trans_base;filter;
+234;DMRTest.at:575;filter names_with_spaces3.dmr /inst2/\\\"New Group\\\"/x names_with_spaces3.dmr.1.trans_base;filter;
+235;DMRTest.at:576;filter names_with_spaces3.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 ()
+{
+  for at_grp
+  do
+    eval at_value=\$$at_grp
+    if test $at_value -lt 1 || test $at_value -gt 235; 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 $(( )).
+	  # 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.
+	  eval $at_grp='`expr $at_value + 0`' ;;
+    esac
+  done
+}
+
+##
+## Set up package specific options.
+##
+
+at_arg_given_baselines=false
+
+
+at_prev=
+for at_option
+do
+  # If the previous option needs an argument, assign it.
+  if test -n "$at_prev"; then
+    at_option=$at_prev=$at_option
+    at_prev=
+  fi
+
+  case $at_option in
+  *=?*) at_optarg=`expr "X$at_option" : '[^=]*=\(.*\)'` ;;
+  *)    at_optarg= ;;
+  esac
+
+  # Accept the important Cygnus configure options, so we can diagnose typos.
+
+  case $at_option in
+    --help | -h )
+	at_help_p=:
+	;;
+
+    --list | -l )
+	at_list_p=:
+	;;
+
+    --version | -V )
+	at_version_p=:
+	;;
+
+    --clean | -c )
+	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=:
+	;;
+
+    --errexit | -e )
+	at_debug_p=:
+	at_errexit_p=:
+	;;
+
+    --verbose | -v )
+	at_verbose=; at_quiet=:
+	;;
+
+    --trace | -x )
+	at_traceon='set -x'
+	at_trace_echo=echo
+	at_check_filter_trace=at_fn_filter_trace
+	;;
+
+    [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"
+	;;
+
+    # 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"
+	;;
+
+    -[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"
+	;;
+
+    [0-9]-[0-9] | [0-9]-[0-9][0-9] | [0-9]-[0-9][0-9][0-9] | \
+    [0-9]-[0-9][0-9][0-9][0-9] | [0-9][0-9]-[0-9][0-9] | \
+    [0-9][0-9]-[0-9][0-9][0-9] | [0-9][0-9]-[0-9][0-9][0-9][0-9] | \
+    [0-9][0-9][0-9]-[0-9][0-9][0-9] | \
+    [0-9][0-9][0-9]-[0-9][0-9][0-9][0-9] | \
+    [0-9][0-9][0-9][0-9]-[0-9][0-9][0-9][0-9] )
+	at_range_start=`expr $at_option : '\(.*\)-'`
+	at_range_end=`expr $at_option : '.*-\(.*\)'`
+	if test $at_range_start -gt $at_range_end; then
+	  at_tmp=$at_range_end
+	  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"
+	;;
+
+    # Directory selection.
+    --directory | -C )
+	at_prev=--directory
+	;;
+    --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.
+    --keywords | -k )
+	at_prev=--keywords
+	;;
+    --keywords=* )
+	at_groups_selected=$at_help_all
+	at_save_IFS=$IFS
+	IFS=,
+	set X $at_optarg
+	shift
+	IFS=$at_save_IFS
+	for at_keyword
+	do
+	  at_invert=
+	  case $at_keyword in
+	  '!'*)
+	    at_invert="-v"
+	    at_keyword=`expr "X$at_keyword" : 'X!\(.*\)'`
+	    ;;
+	  esac
+	  # It is on purpose that we match the test group titles too.
+	  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=:
+	;;
+    --baselines )
+	at_prev=--baselines
+	;;
+    --baselines=* )
+	at_arg_baselines=$at_optarg
+	at_arg_given_baselines=:
+	echo "baselines set to $at_arg_baselines";
+     baselines=$at_arg_baselines
+	;;
+
+
+    *=*)
+	at_envvar=`expr "x$at_option" : 'x\([^=]*\)='`
+	# 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'" ;;
+	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'"
+	;;
+
+     *) $as_echo "$as_me: invalid option: $at_option" >&2
+	$as_echo "Try \`$0 --help' for more information." >&2
+	exit 1
+	;;
+  esac
+done
+
+# Verify our last option didn't require an argument
+if test -n "$at_prev"; then :
+  as_fn_error $? "\`$at_prev' requires an argument"
+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
+  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=
+fi
+
+##
+## Process package specific options when _not_ supplied.
+##
+
+if $at_arg_given_baselines; then :
+
+else
+  baselines=
+fi
+
+# Help message.
+if $at_help_p; then
+  cat <<_ATEOF || at_write_fail=1
+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
+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:
+
+  $ $0 AUTOTEST_PATH=bin
+
+is equivalent to the following, assuming the source directory is /src/foo-1.0:
+
+  PATH=/tmp/foo-1.0/bin:/src/foo-1.0/bin:\$PATH $0
+_ATEOF
+cat <<_ATEOF || at_write_fail=1
+
+Operation modes:
+  -h, --help     print the help message, then exit
+  -V, --version  print version number, then exit
+  -c, --clean    remove all the files this test suite might create and exit
+  -l, --list     describes all the tests, or the selected TESTS
+_ATEOF
+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
+  -d, --debug    inhibit clean up and top-level logging
+                 default for debugging scripts
+  -x, --trace    enable tests shell tracing
+_ATEOF
+cat <<_ATEOF || at_write_fail=1
+
+Other options:
+_ATEOF
+
+cat <<_ATEOF || at_write_fail=1
+--baselines=yes|no   Build the baseline file for parser test 'arg'
+_ATEOF
+cat <<_ATEOF || at_write_fail=1
+
+Report bugs to <opendap-tech@opendap.org>.
+_ATEOF
+  exit $at_write_fail
+fi
+
+# List of tests.
+if $at_list_p; then
+  cat <<_ATEOF || at_write_fail=1
+libdap 3.19.1 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
+	   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
+	     }
+	   }
+	 }' || at_write_fail=1
+  exit $at_write_fail
+fi
+if $at_version_p; then
+  $as_echo "$as_me (libdap 3.19.1)" &&
+  cat <<\_ATEOF || at_write_fail=1
+
+Copyright (C) 2012 Free Software Foundation, Inc.
+This test suite is free software; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+_ATEOF
+  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=: ;; #(
+  * ) at_print_banners=false ;;
+esac
+# Text for banner N, set to a single space once printed.
+
+# Take any -C into account.
+if $at_change_dir ; then
+  test x != "x$at_dir" && cd "$at_dir" \
+    || as_fn_error $? "unable to change directory"
+  at_dir=`pwd`
+fi
+
+# Load the config files for any default variable assignments.
+for at_file in atconfig atlocal
+do
+  test -r $at_file || continue
+  . ./$at_file || as_fn_error $? "invalid content: $at_file"
+done
+
+# Autoconf <=2.59b set at_top_builddir instead of at_top_build_prefix:
+: "${at_top_build_prefix=$at_top_builddir}"
+
+# Perform any assignments requested during argument parsing.
+eval "$at_debug_args"
+
+# atconfig delivers names relative to the directory the test suite is
+# in, but the groups themselves are run in testsuite-dir/group-dir.
+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
+    case $at_val in
+      [\\/$]* | ?:[\\/]* ) at_prefix= ;;
+      *) at_prefix=../../ ;;
+    esac
+    eval "$at_dir_var=\$at_prefix\$at_val"
+  done
+fi
+
+## -------------------- ##
+## Directory structure. ##
+## -------------------- ##
+
+# This is the set of directories and files used by this script
+# (non-literals are capitalized):
+#
+# TESTSUITE         - the testsuite
+# TESTSUITE.log     - summarizes the complete testsuite run
+# TESTSUITE.dir/    - created during a run, remains after -d or failed test
+# + at-groups/      - during a run: status of all groups in run
+# | + NNN/          - during a run: meta-data about test group NNN
+# | | + check-line  - location (source file and line) of current AT_CHECK
+# | | + status      - exit status of current AT_CHECK
+# | | + stdout      - stdout of current AT_CHECK
+# | | + stder1      - stderr, including trace
+# | | + stderr      - stderr, with trace filtered out
+# | | + test-source - portion of testsuite that defines group
+# | | + times       - timestamps for computing duration
+# | | + pass        - created if group passed
+# | | + xpass       - created if group xpassed
+# | | + fail        - created if group failed
+# | | + xfail       - created if group xfailed
+# | | + skip        - created if group skipped
+# + at-stop         - during a run: end the run if this file exists
+# + at-source-lines - during a run: cache of TESTSUITE line numbers for extraction
+# + 0..NNN/         - created for each group NNN, remains after -d or failed test
+# | + TESTSUITE.log - summarizes the group results
+# | + ...           - files created during the group
+
+# 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).
+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" &&
+    find "$at_suite_dir" -type d ! -perm -700 -exec chmod u+rwx \{\} \;
+  rm -f -r "$at_suite_dir" "$at_suite_log"
+  exit $?
+fi
+
+# Don't take risks: use only absolute directories in PATH.
+#
+# For stand-alone test suites (ie. atconfig was not found),
+# AUTOTEST_PATH is relative to `.'.
+#
+# For embedded test suites, AUTOTEST_PATH is relative to the top level
+# of the package.  Then expand it into build/src parts, since users
+# may create executables in both places.
+AUTOTEST_PATH=`$as_echo "$AUTOTEST_PATH" | sed "s|:|$PATH_SEPARATOR|g"`
+at_path=
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+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
+case $as_dir in
+  [\\/]* | ?:[\\/]* )
+    as_fn_append at_path "$as_dir"
+    ;;
+  * )
+    if test -z "$at_top_build_prefix"; then
+      # Stand-alone test suite.
+      as_fn_append 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"
+    fi
+    ;;
+esac
+  done
+IFS=$as_save_IFS
+
+
+# Now build and simplify PATH.
+#
+# There might be directories that don't exist, but don't redirect
+# builtins' (eg., cd) stderr directly: Ultrix's sh hates that.
+at_new_path=
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $at_path
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    test -d "$as_dir" || continue
+case $as_dir in
+  [\\/]* | ?:[\\/]* ) ;;
+  * ) as_dir=`(cd "$as_dir" && pwd) 2>/dev/null` ;;
+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" ;;
+esac
+  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
+else
+  : >"$at_suite_log"
+fi
+exec 5>>"$at_suite_log"
+
+# Banners and logs.
+$as_echo "## ----------------------------------- ##
+## libdap 3.19.1 test suite: dmr-test. ##
+## ----------------------------------- ##"
+{
+  $as_echo "## ----------------------------------- ##
+## libdap 3.19.1 test suite: dmr-test. ##
+## ----------------------------------- ##"
+  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"
+    echo
+  fi
+
+  {
+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`
+
+/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
+
+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
+
+}
+  echo
+
+  # Contents of the config files.
+  for at_file in atconfig atlocal
+  do
+    test -r $at_file || continue
+    $as_echo "$as_me: $at_file:"
+    sed 's/^/| /' $at_file
+    echo
+  done
+} >&5
+
+
+## ------------------------- ##
+## Autotest 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_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"
+}
+
+# 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 ()
+{
+  case $1 in
+    *$as_nl*)
+      at_fn_check_prepare_notrace 'an embedded newline' "$2" ;;
+    *)
+      at_fn_check_prepare_trace "$2" ;;
+  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 ()
+{
+  mv "$at_stderr" "$at_stder1"
+  grep '^ *+' "$at_stder1" >&2
+  grep -v '^ *+' "$at_stder1" >"$at_stderr"
+}
+
+# at_fn_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 ()
+{
+  for file
+    do $as_echo "$file:"; sed 's/^/> /' "$file"; done
+  echo 1 > "$at_status_file"
+  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 ()
+{
+  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 ()
+{
+  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 ()
+{
+  test -s "$1" || return 0
+  $at_diff "$at_devnull" "$1"
+}
+
+# at_fn_test NUMBER
+# -----------------
+# Parse out test NUMBER from the tail of this file.
+at_fn_test ()
+{
+  eval at_sed=\$at_sed$1
+  sed "$at_sed" "$at_myself" > "$at_test_source"
+}
+
+# at_fn_create_debugging_script
+# -----------------------------
+# Create the debugging script $at_group_dir/run which will reproduce the
+# current test group.
+at_fn_create_debugging_script ()
+{
+  {
+    echo "#! /bin/sh" &&
+    echo 'test "${ZSH_VERSION+set}" = set && alias -g '\''${1+"$@"}'\''='\''"$@"'\''' &&
+    $as_echo "cd '$at_dir'" &&
+    $as_echo "exec \${CONFIG_SHELL-$SHELL} \"$at_myself\" -v -d $at_debug_args $at_group \${1+\"\$@\"}" &&
+    echo 'exit 1'
+  } >"$at_group_dir/run" &&
+  chmod +x "$at_group_dir/run"
+}
+
+## -------------------------------- ##
+## End of autotest shell functions. ##
+## -------------------------------- ##
+{
+  $as_echo "## ---------------- ##
+## Tested programs. ##
+## ---------------- ##"
+  echo
+} >&5
+
+# Report what programs are being tested.
+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
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    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
+    {
+      $as_echo "$at_srcdir/DMRTest.at:3: $at_program_ --version"
+      "$at_program_" --version </dev/null
+      echo
+    } >&5 2>&1
+  else
+    as_fn_error $? "cannot find $at_program" "$LINENO" 5
+  fi
+done
+
+{
+  $as_echo "## ------------------ ##
+## Running the tests. ##
+## ------------------ ##"
+} >&5
+
+at_start_date=`date`
+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
+
+# Can we diff with `/dev/null'?  DU 5.0 refuses.
+if diff /dev/null /dev/null >/dev/null 2>&1; then
+  at_devnull=/dev/null
+else
+  at_devnull=$at_suite_dir/devnull
+  >"$at_devnull"
+fi
+
+# Use `diff -u' when possible.
+if at_diff=`diff -u "$at_devnull" "$at_devnull" 2>&1` && test -z "$at_diff"
+then
+  at_diff='diff -u'
+else
+  at_diff=diff
+fi
+
+# Get the last needed group.
+for at_group in : $at_groups; do :; done
+
+# Extract the start and end lines of each test group at the tail
+# of this file
+awk '
+BEGIN { FS="" }
+/^#AT_START_/ {
+  start = NR
+}
+/^#AT_STOP_/ {
+  test = substr ($ 0, 10)
+  print "at_sed" test "=\"1," start "d;" (NR-1) "q\""
+  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
+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
+
+# 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 ()
+{
+  # The directory for additional per-group helper files.
+  at_job_dir=$at_helper_dir/$at_group
+  # The file containing the location of the last AT_CHECK.
+  at_check_line_file=$at_job_dir/check-line
+  # The file containing the exit status of the last command.
+  at_status_file=$at_job_dir/status
+  # The files containing the output of the tested commands.
+  at_stdout=$at_job_dir/stdout
+  at_stder1=$at_job_dir/stder1
+  at_stderr=$at_job_dir/stderr
+  # The file containing the code for a test group.
+  at_test_source=$at_job_dir/test-source
+  # The file containing dates.
+  at_times_file=$at_job_dir/times
+
+  # Be sure to come back to the top test directory.
+  cd "$at_suite_dir"
+
+  # Clearly separate the test groups when verbose.
+  $at_first || $at_verbose echo
+
+  at_group_normalized=$at_group
+
+  eval 'while :; do
+    case $at_group_normalized in #(
+    '"$at_format"'*) break;;
+    esac
+    at_group_normalized=0$at_group_normalized
+  done'
+
+
+  # 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;}
+  # Be tolerant if the above `rm' was not able to remove the directory.
+  as_dir="$at_group_dir"; as_fn_mkdir_p
+
+  echo 0 > "$at_status_file"
+
+  # In verbose mode, append to the log file *and* show on
+  # the standard output; in quiet mode only write to the log.
+  if test -z "$at_verbose"; then
+    at_tee_pipe='tee -a "$at_group_log"'
+  else
+    at_tee_pipe='cat >> "$at_group_log"'
+  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 ()
+{
+  # Be sure to come back to the suite directory, in particular
+  # since below we might `rm' the group directory we are in currently.
+  cd "$at_suite_dir"
+
+  if test ! -f "$at_check_line_file"; then
+    sed "s/^ */$as_me: WARNING: /" <<_ATEOF
+      A failure happened in a test group before any test could be
+      run. This means that test suite is improperly designed.  Please
+      report this failure to <opendap-tech@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"
+  case $at_xfail:$at_status in
+    yes:0)
+	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
+	;;
+  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
+  at_log_msg="$at_group. $at_desc ($at_setup_line): $at_msg"
+  case $at_status in
+    0|77)
+      # $at_times_file is only available if the group succeeded.
+      # We're not including the group log, so the success message
+      # is written in the global log separately.  But we also
+      # write to the group log in case they're using -d.
+      if test -f "$at_times_file"; then
+	at_log_msg="$at_log_msg     ("`sed 1d "$at_times_file"`')'
+	rm -f "$at_times_file"
+      fi
+      $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
+      else
+	if test -d "$at_group_dir"; then
+	  find "$at_group_dir" -type d ! -perm -700 -exec chmod u+rwx \{\} \;
+	  rm -fr "$at_group_dir"
+	fi
+	rm -f "$at_test_source"
+      fi
+      ;;
+    *)
+      # Upon failure, include the log into the testsuite's global
+      # log.  The failure message is written in the group log.  It
+      # is later included in the global log.
+      $as_echo "$at_log_msg" >> "$at_group_log"
+
+      # 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
+      if $at_errexit; then
+	echo stop > "$at_stop_file"
+      fi
+      ;;
+  esac
+}
+
+
+## ------------ ##
+## 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
+$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
+  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
+
+# Wrap up the test suite with summary statistics.
+cd "$at_helper_dir"
+
+# Use ?..???? when the list must remain sorted, the faster * otherwise.
+at_pass_list=`for f in */pass; do echo $f; done | sed '/\*/d; s,/pass,,'`
+at_skip_list=`for f in */skip; do echo $f; done | sed '/\*/d; s,/skip,,'`
+at_xfail_list=`for f in */xfail; do echo $f; done | sed '/\*/d; s,/xfail,,'`
+at_xpass_list=`for f in ?/xpass ??/xpass ???/xpass ????/xpass; do
+		 echo $f; done | sed '/?/d; s,/xpass,,'`
+at_fail_list=`for f in ?/fail ??/fail ???/fail ????/fail; do
+		echo $f; done | sed '/?/d; s,/fail,,'`
+
+set X $at_pass_list $at_xpass_list $at_xfail_list $at_fail_list $at_skip_list
+shift; at_group_count=$#
+set X $at_xpass_list; shift; at_xpass_count=$#; at_xpass_list=$*
+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
+
+# Back to the top directory.
+cd "$at_dir"
+rm -rf "$at_helper_dir"
+
+# Compute the duration of the suite.
+at_stop_date=`date`
+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_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 "## ------------- ##
+## Test results. ##
+## ------------- ##"
+echo
+{
+  echo
+  $as_echo "## ------------- ##
+## Test results. ##
+## ------------- ##"
+  echo
+} >&5
+
+if test $at_run_count = 1; then
+  at_result="1 test"
+  at_were=was
+else
+  at_result="$at_run_count tests"
+  at_were=were
+fi
+if $at_errexit_p && test $at_unexpected_count != 0; then
+  if test $at_xpass_count = 1; then
+    at_result="$at_result $at_were run, one passed"
+  else
+    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 ;;
+
+    # Some unexpected failures
+    0:*:0) at_result="$at_result $at_were run,
+$at_fail_count failed unexpectedly." ;;
+
+    # Some failures, both expected and unexpected
+    0:*:1) at_result="$at_result $at_were run,
+$at_total_fail_count failed ($at_xfail_count expected failure)." ;;
+    0:*:*) at_result="$at_result $at_were run,
+$at_total_fail_count failed ($at_xfail_count expected failures)." ;;
+
+    # No unexpected failures, but some xpasses
+    *:0:*) at_result="$at_result $at_were run,
+$at_xpass_count passed unexpectedly." ;;
+
+    # No expected failures, but failures and xpasses
+    *:1:0) at_result="$at_result $at_were run,
+$at_unexpected_count did not behave as expected ($at_fail_count unexpected failure)." ;;
+    *:*:0) at_result="$at_result $at_were run,
+$at_unexpected_count did not behave as expected ($at_fail_count unexpected failures)." ;;
+
+    # All of them.
+    *:*:1) at_result="$at_result $at_were run,
+$at_xpass_count passed unexpectedly,
+$at_total_fail_count failed ($at_xfail_count expected failure)." ;;
+    *:*:*) at_result="$at_result $at_were run,
+$at_xpass_count passed unexpectedly,
+$at_total_fail_count failed ($at_xfail_count expected failures)." ;;
+  esac
+
+  if test $at_skip_count = 0 && test $at_run_count -gt 1; then
+    at_result="All $at_result"
+  fi
+fi
+
+# Now put skips in the mix.
+case $at_skip_count in
+  0) ;;
+  1) at_result="$at_result
+1 test was skipped." ;;
+  *) at_result="$at_result
+$at_skip_count tests were skipped." ;;
+esac
+
+if test $at_unexpected_count = 0; then
+  echo "$at_color$at_result$at_std"
+  echo "$at_result" >&5
+else
+  echo "${at_color}ERROR: $at_result$at_std" >&2
+  echo "ERROR: $at_result" >&5
+  {
+    echo
+    $as_echo "## ------------------------ ##
+## Summary of the failures. ##
+## ------------------------ ##"
+
+    # Summary of failed and skipped tests.
+    if test $at_fail_count != 0; then
+      echo "Failed tests:"
+      $SHELL "$at_myself" $at_fail_list --list
+      echo
+    fi
+    if test $at_skip_count != 0; then
+      echo "Skipped tests:"
+      $SHELL "$at_myself" $at_skip_list --list
+      echo
+    fi
+    if test $at_xpass_count != 0; then
+      echo "Unexpected passes:"
+      $SHELL "$at_myself" $at_xpass_list --list
+      echo
+    fi
+    if test $at_fail_count != 0; then
+      $as_echo "## ---------------------- ##
+## Detailed failed tests. ##
+## ---------------------- ##"
+      echo
+      for at_group in $at_fail_list
+      do
+	at_group_normalized=$at_group
+
+  eval 'while :; do
+    case $at_group_normalized in #(
+    '"$at_format"'*) break;;
+    esac
+    at_group_normalized=0$at_group_normalized
+  done'
+
+	cat "$at_suite_dir/$at_group_normalized/$as_me.log"
+	echo
+      done
+      echo
+    fi
+    if test -n "$at_top_srcdir"; then
+      sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## ${at_top_build_prefix}config.log ##
+_ASBOX
+      sed 's/^/| /' ${at_top_build_prefix}config.log
+      echo
+    fi
+  } >&5
+
+  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## $as_me.log was created. ##
+_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:
+
+   To: <opendap-tech@opendap.org>
+   Subject: [libdap 3.19.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'.
+"
+  exit 1
+fi
+
+exit 0
+
+## ------------- ##
+## Actual tests. ##
+## ------------- ##
+#AT_START_1
+at_fn_group_banner 1 'DMRTest.at:211' \
+  "parse dmr-testsuite/test_simple_1.xml" "          "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "1. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    input=$abs_srcdir/dmr-testsuite/test_simple_1.xml
+    baseline=$input.baseline
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:211"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:211"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_1
+#AT_START_2
+at_fn_group_banner 2 'DMRTest.at:212' \
+  "parse dmr-testsuite/test_simple_2.xml" "          "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "2. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    input=$abs_srcdir/dmr-testsuite/test_simple_2.xml
+    baseline=$input.baseline
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:212"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:212"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_2
+#AT_START_3
+at_fn_group_banner 3 'DMRTest.at:213' \
+  "parse dmr-testsuite/test_simple_3.xml" "          "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "3. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    input=$abs_srcdir/dmr-testsuite/test_simple_3.xml
+    baseline=$input.baseline
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:213"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:213"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_3
+#AT_START_4
+at_fn_group_banner 4 'DMRTest.at:215' \
+  "parse dmr-testsuite/test_simple_3_error_1.xml" "  "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "4. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    input=$abs_srcdir/dmr-testsuite/test_simple_3_error_1.xml
+    baseline=$input.baseline
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:215"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+
+fi
+
+      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_4
+#AT_START_5
+at_fn_group_banner 5 'DMRTest.at:216' \
+  "parse dmr-testsuite/test_simple_3_error_2.xml" "  "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "5. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    input=$abs_srcdir/dmr-testsuite/test_simple_3_error_2.xml
+    baseline=$input.baseline
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { 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_fn_diff_devnull "$at_stderr" || at_failed=:
+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_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
+$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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:216"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_5
+#AT_START_6
+at_fn_group_banner 6 'DMRTest.at:217' \
+  "parse dmr-testsuite/test_simple_3_error_3.xml" "  "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "6. $at_setup_line: testing $at_desc ..."
+  $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 :
+
+        { 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=:
+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_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_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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:217"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_6
+#AT_START_7
+at_fn_group_banner 7 'DMRTest.at:219' \
+  "parse dmr-testsuite/test_simple_4.xml" "          "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "7. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    input=$abs_srcdir/dmr-testsuite/test_simple_4.xml
+    baseline=$input.baseline
+
+    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=:
+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_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_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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:219"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_7
+#AT_START_8
+at_fn_group_banner 8 'DMRTest.at:220' \
+  "parse dmr-testsuite/test_simple_5.xml" "          "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "8. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    input=$abs_srcdir/dmr-testsuite/test_simple_5.xml
+    baseline=$input.baseline
+
+    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=:
+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_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_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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:220"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_8
+#AT_START_9
+at_fn_group_banner 9 'DMRTest.at:221' \
+  "parse dmr-testsuite/test_simple_6.xml" "          "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "9. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    input=$abs_srcdir/dmr-testsuite/test_simple_6.xml
+    baseline=$input.baseline
+
+    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=:
+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_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_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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:221"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_9
+#AT_START_10
+at_fn_group_banner 10 'DMRTest.at:222' \
+  "parse dmr-testsuite/test_simple_7.xml" "          "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "10. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    input=$abs_srcdir/dmr-testsuite/test_simple_7.xml
+    baseline=$input.baseline
+
+    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=:
+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_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_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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:222"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_10
+#AT_START_11
+at_fn_group_banner 11 'DMRTest.at:223' \
+  "parse dmr-testsuite/test_simple_8.xml" "          "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "11. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    input=$abs_srcdir/dmr-testsuite/test_simple_8.xml
+    baseline=$input.baseline
+
+    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=:
+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_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_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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:223"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_11
+#AT_START_12
+at_fn_group_banner 12 'DMRTest.at:224' \
+  "parse dmr-testsuite/test_simple_9.xml" "          "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "12. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    input=$abs_srcdir/dmr-testsuite/test_simple_9.xml
+    baseline=$input.baseline
+
+    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=:
+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_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_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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:224"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_12
+#AT_START_13
+at_fn_group_banner 13 'DMRTest.at:225' \
+  "parse dmr-testsuite/test_simple_9.1.xml" "        "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "13. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    input=$abs_srcdir/dmr-testsuite/test_simple_9.1.xml
+    baseline=$input.baseline
+
+    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=:
+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_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_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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:225"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_13
+#AT_START_14
+at_fn_group_banner 14 'DMRTest.at:226' \
+  "parse dmr-testsuite/test_simple_10.xml" "         "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "14. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    input=$abs_srcdir/dmr-testsuite/test_simple_10.xml
+    baseline=$input.baseline
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { 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; }
+
+        { 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; }
+
+
+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"
+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; }
+
+        { 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_traceon; }
+
+
+
+fi
+
+      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
+
+
+
+    input=$abs_srcdir/dmr-testsuite/test_array_1.xml
+    baseline=$input.baseline
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { 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=:
+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; }
+
+        { 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_traceon; }
+
+
+else
+
+        { 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_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_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" "           "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "16. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    input=$abs_srcdir/dmr-testsuite/test_array_2.xml
+    baseline=$input.baseline
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { 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=:
+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_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_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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:229"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_16
+#AT_START_17
+at_fn_group_banner 17 'DMRTest.at:230' \
+  "parse dmr-testsuite/test_array_3.xml" "           "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "17. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    input=$abs_srcdir/dmr-testsuite/test_array_3.xml
+    baseline=$input.baseline
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { 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=:
+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_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_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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:230"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_17
+#AT_START_18
+at_fn_group_banner 18 'DMRTest.at:231' \
+  "parse dmr-testsuite/test_array_4.xml" "           "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "18. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    input=$abs_srcdir/dmr-testsuite/test_array_4.xml
+    baseline=$input.baseline
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { 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=:
+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_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_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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:231"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_18
+#AT_START_19
+at_fn_group_banner 19 'DMRTest.at:232' \
+  "parse dmr-testsuite/test_array_5.xml" "           "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "19. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    input=$abs_srcdir/dmr-testsuite/test_array_5.xml
+    baseline=$input.baseline
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { 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=:
+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_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_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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:232"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_19
+#AT_START_20
+at_fn_group_banner 20 'DMRTest.at:233' \
+  "parse dmr-testsuite/test_array_6.xml" "           "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "20. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    input=$abs_srcdir/dmr-testsuite/test_array_6.xml
+    baseline=$input.baseline
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { 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=:
+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_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_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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:233"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_20
+#AT_START_21
+at_fn_group_banner 21 'DMRTest.at:234' \
+  "parse dmr-testsuite/test_array_7.xml" "           "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "21. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    input=$abs_srcdir/dmr-testsuite/test_array_7.xml
+    baseline=$input.baseline
+
+    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=:
+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_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_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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:234"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_21
+#AT_START_22
+at_fn_group_banner 22 'DMRTest.at:235' \
+  "parse dmr-testsuite/test_array_8.xml" "           "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "22. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    input=$abs_srcdir/dmr-testsuite/test_array_8.xml
+    baseline=$input.baseline
+
+    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=:
+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_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_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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:235"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_22
+#AT_START_23
+at_fn_group_banner 23 'DMRTest.at:236' \
+  "parse dmr-testsuite/test_array_10.xml" "          "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "23. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    input=$abs_srcdir/dmr-testsuite/test_array_10.xml
+    baseline=$input.baseline
+
+    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=:
+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_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_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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:236"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_23
+#AT_START_24
+at_fn_group_banner 24 'DMRTest.at:237' \
+  "parse dmr-testsuite/test_array_11.xml" "          "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "24. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    input=$abs_srcdir/dmr-testsuite/test_array_11.xml
+    baseline=$input.baseline
+
+    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=:
+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_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_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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:237"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_24
+#AT_START_25
+at_fn_group_banner 25 'DMRTest.at:239' \
+  "parse dmr-testsuite/ignore_foreign_xml_1.xml" "   "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "25. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    input=$abs_srcdir/dmr-testsuite/ignore_foreign_xml_1.xml
+    baseline=$input.baseline
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:239: \$abs_builddir/dmr-test -x -p \$input || true"
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:239"
+( $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:239"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:239: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:239"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:239"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:239: \$abs_builddir/dmr-test -x -p \$input || true"
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:239"
+( $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:239"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:239: 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:239"
+( $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:239"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_25
+#AT_START_26
+at_fn_group_banner 26 'DMRTest.at:240' \
+  "parse dmr-testsuite/ignore_foreign_xml_2.xml" "   "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "26. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    input=$abs_srcdir/dmr-testsuite/ignore_foreign_xml_2.xml
+    baseline=$input.baseline
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:240: \$abs_builddir/dmr-test -x -p \$input || true"
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:240"
+( $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:240"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:240: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:240"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:240"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:240: \$abs_builddir/dmr-test -x -p \$input || true"
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:240"
+( $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:240"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:240: 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:240"
+( $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:240"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_26
+#AT_START_27
+at_fn_group_banner 27 'DMRTest.at:241' \
+  "parse dmr-testsuite/ignore_foreign_xml_3.xml" "   "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "27. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    input=$abs_srcdir/dmr-testsuite/ignore_foreign_xml_3.xml
+    baseline=$input.baseline
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:241: \$abs_builddir/dmr-test -x -p \$input || true"
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:241"
+( $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:241"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:241: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:241"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:241"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:241: \$abs_builddir/dmr-test -x -p \$input || true"
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:241"
+( $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:241"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:241: 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:241"
+( $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:241"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_27
+#AT_START_28
+at_fn_group_banner 28 'DMRTest.at:251' \
+  "trans test_simple_1.xml" "                        "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "28. $at_setup_line: testing $at_desc ..."
+  $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_1.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_1.xml.trans_base
+
+    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
+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_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_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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:251"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+
+fi
+
+      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_28
+#AT_START_29
+at_fn_group_banner 29 'DMRTest.at:252' \
+  "trans test_simple_2.xml" "                        "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "29. $at_setup_line: testing $at_desc ..."
+  $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_2.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_2.xml.trans_base
+
+    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
+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_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_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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:252"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+
+fi
+
+      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_29
+#AT_START_30
+at_fn_group_banner 30 'DMRTest.at:253' \
+  "trans test_simple_3.xml" "                        "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "30. $at_setup_line: testing $at_desc ..."
+  $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_3.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_3.xml.trans_base
+
+    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
+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_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_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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:253"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+
+fi
+
+      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_30
+#AT_START_31
+at_fn_group_banner 31 'DMRTest.at:254' \
+  "trans test_simple_4.xml" "                        "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "31. $at_setup_line: testing $at_desc ..."
+  $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_4.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_4.xml.trans_base
+
+    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
+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_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_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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:254"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+
+fi
+
+      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_31
+#AT_START_32
+at_fn_group_banner 32 'DMRTest.at:255' \
+  "trans test_simple_5.xml" "                        "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "32. $at_setup_line: testing $at_desc ..."
+  $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_5.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_5.xml.trans_base
+
+    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
+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_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_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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:255"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+
+fi
+
+      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_32
+#AT_START_33
+at_fn_group_banner 33 'DMRTest.at:256' \
+  "trans test_simple_6.xml" "                        "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "33. $at_setup_line: testing $at_desc ..."
+  $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.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_6.xml.trans_base
+
+    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
+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_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_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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:256"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+
+fi
+
+      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_33
+#AT_START_34
+at_fn_group_banner 34 'DMRTest.at:257' \
+  "trans test_simple_7.xml" "                        "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "34. $at_setup_line: testing $at_desc ..."
+  $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_7.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_7.xml.trans_base
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { 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"
+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_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_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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:257"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+
+fi
+
+      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_34
+#AT_START_35
+at_fn_group_banner 35 'DMRTest.at:258' \
+  "trans test_simple_8.xml" "                        "
+at_xfail=no
+      test "xfail" = "xfail" && at_xfail=yes
+(
+  $as_echo "35. $at_setup_line: testing $at_desc ..."
+  $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_8.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_8.xml.trans_base
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:258: \$abs_builddir/dmr-test -x -t \$input"
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:258"
+( $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"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:258"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:258: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:258"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:258"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:258: \$abs_builddir/dmr-test -x -t \$input || true"
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:258"
+( $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"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:258"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:258: 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:258"
+( $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:258"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+
+fi
+
+      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_35
+#AT_START_36
+at_fn_group_banner 36 'DMRTest.at:259' \
+  "trans test_simple_9.xml" "                        "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "36. $at_setup_line: testing $at_desc ..."
+  $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_9.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_9.xml.trans_base
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { 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"
+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_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_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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:259"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+
+fi
+
+      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_36
+#AT_START_37
+at_fn_group_banner 37 'DMRTest.at:260' \
+  "trans test_simple_9.1.xml" "                      "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "37. $at_setup_line: testing $at_desc ..."
+  $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_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 :
+
+        { 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"
+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_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_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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:260"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+
+fi
+
+      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_37
+#AT_START_38
+at_fn_group_banner 38 'DMRTest.at:261' \
+  "trans test_simple_10.xml" "                       "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "38. $at_setup_line: testing $at_desc ..."
+  $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.trans_base
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { 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"
+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_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_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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:261"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+
+fi
+
+      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_38
+#AT_START_39
+at_fn_group_banner 39 'DMRTest.at:263' \
+  "trans test_array_1.xml" "                         "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "39. $at_setup_line: testing $at_desc ..."
+  $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.trans_base
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { 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"
+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_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_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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:263"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+
+fi
+
+      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_39
+#AT_START_40
+at_fn_group_banner 40 'DMRTest.at:264' \
+  "trans test_array_2.xml" "                         "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "40. $at_setup_line: testing $at_desc ..."
+  $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.trans_base
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { 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"
+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_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_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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:264"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+
+fi
+
+      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_40
+#AT_START_41
+at_fn_group_banner 41 'DMRTest.at:265' \
+  "trans test_array_3.xml" "                         "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "41. $at_setup_line: testing $at_desc ..."
+  $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.trans_base
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { 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"
+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_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_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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:265"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+
+fi
+
+      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_41
+#AT_START_42
+at_fn_group_banner 42 'DMRTest.at:266' \
+  "trans test_array_4.xml" "                         "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "42. $at_setup_line: testing $at_desc ..."
+  $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.trans_base
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { 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"
+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_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_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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:266"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+
+fi
+
+      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_42
+#AT_START_43
+at_fn_group_banner 43 'DMRTest.at:267' \
+  "trans test_array_5.xml" "                         "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "43. $at_setup_line: testing $at_desc ..."
+  $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.trans_base
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { 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"
+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_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_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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:267"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+
+fi
+
+      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_43
+#AT_START_44
+at_fn_group_banner 44 'DMRTest.at:268' \
+  "trans test_array_6.xml" "                         "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "44. $at_setup_line: testing $at_desc ..."
+  $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_6.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_6.xml.trans_base
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { 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"
+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_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_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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:268"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+
+fi
+
+      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_44
+#AT_START_45
+at_fn_group_banner 45 'DMRTest.at:269' \
+  "trans test_array_7.xml" "                         "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "45. $at_setup_line: testing $at_desc ..."
+  $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_7.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.xml.trans_base
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:269: \$abs_builddir/dmr-test -x -t \$input"
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:269"
+( $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"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:269"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:269: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:269"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:269"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:269: \$abs_builddir/dmr-test -x -t \$input || true"
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:269"
+( $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"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:269"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:269: 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:269"
+( $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:269"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+
+fi
+
+      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_45
+#AT_START_46
+at_fn_group_banner 46 'DMRTest.at:270' \
+  "trans test_array_8.xml" "                         "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "46. $at_setup_line: testing $at_desc ..."
+  $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_8.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_8.xml.trans_base
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:270: \$abs_builddir/dmr-test -x -t \$input"
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:270"
+( $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"
+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_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_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:270: \$abs_builddir/dmr-test -x -t \$input || true"
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:270"
+( $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"
+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_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:270: 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:270"
+( $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:270"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+
+fi
+
+      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_46
+#AT_START_47
+at_fn_group_banner 47 'DMRTest.at:271' \
+  "trans test_array_10.xml" "                        "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "47. $at_setup_line: testing $at_desc ..."
+  $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_10.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_10.xml.trans_base
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:271: \$abs_builddir/dmr-test -x -t \$input"
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:271"
+( $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"
+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_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_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:271: \$abs_builddir/dmr-test -x -t \$input || true"
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:271"
+( $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"
+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_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:271: 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:271"
+( $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:271"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+
+fi
+
+      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_47
+#AT_START_48
+at_fn_group_banner 48 'DMRTest.at:272' \
+  "trans test_array_11.xml" "                        "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "48. $at_setup_line: testing $at_desc ..."
+  $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_11.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_11.xml.trans_base
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:272: \$abs_builddir/dmr-test -x -t \$input"
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:272"
+( $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"
+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_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_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:272: \$abs_builddir/dmr-test -x -t \$input || true"
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:272"
+( $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"
+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_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:272: 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:272"
+( $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:272"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+
+fi
+
+      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_48
+#AT_START_49
+at_fn_group_banner 49 'DMRTest.at:274' \
+  "intern test_simple_1.xml" "                       "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "49. $at_setup_line: testing $at_desc ..."
+  $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_1.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_1.xml.intern_base
+
+    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=:
+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_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_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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:274"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+
+fi
+
+      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_49
+#AT_START_50
+at_fn_group_banner 50 'DMRTest.at:275' \
+  "intern test_simple_2.xml" "                       "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "50. $at_setup_line: testing $at_desc ..."
+  $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_2.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_2.xml.intern_base
+
+    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=:
+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_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_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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:275"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+
+fi
+
+      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_50
+#AT_START_51
+at_fn_group_banner 51 'DMRTest.at:276' \
+  "intern test_simple_3.xml" "                       "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "51. $at_setup_line: testing $at_desc ..."
+  $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_3.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_3.xml.intern_base
+
+    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=:
+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_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_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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:276"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+
+fi
+
+      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_51
+#AT_START_52
+at_fn_group_banner 52 'DMRTest.at:277' \
+  "intern test_simple_4.xml" "                       "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "52. $at_setup_line: testing $at_desc ..."
+  $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_4.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_4.xml.intern_base
+
+    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=:
+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_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_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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:277"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+
+fi
+
+      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_52
+#AT_START_53
+at_fn_group_banner 53 'DMRTest.at:278' \
+  "intern test_simple_5.xml" "                       "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "53. $at_setup_line: testing $at_desc ..."
+  $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_5.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_5.xml.intern_base
+
+    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=:
+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_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_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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:278"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+
+fi
+
+      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_53
+#AT_START_54
+at_fn_group_banner 54 'DMRTest.at:279' \
+  "intern test_simple_6.xml" "                       "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "54. $at_setup_line: testing $at_desc ..."
+  $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.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_6.xml.intern_base
+
+    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=:
+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_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_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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:279"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+
+fi
+
+      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_54
+#AT_START_55
+at_fn_group_banner 55 'DMRTest.at:280' \
+  "intern test_simple_7.xml" "                       "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "55. $at_setup_line: testing $at_desc ..."
+  $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_7.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_7.xml.intern_base
+
+    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=:
+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_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_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
+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_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=:
+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; }
+
+
+
+
+fi
+
+      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_55
+#AT_START_56
+at_fn_group_banner 56 'DMRTest.at:281' \
+  "intern test_simple_8.xml" "                       "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "56. $at_setup_line: testing $at_desc ..."
+  $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_8.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_8.xml.intern_base
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:281: \$abs_builddir/dmr-test -x -i \$input"
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:281"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:281"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:281: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:281"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:281"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:281: \$abs_builddir/dmr-test -x -i \$input || true"
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:281"
+( $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
+echo stderr:; tee stderr <"$at_stderr"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:281"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:281: diff -b -B \$baseline stdout"
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:281"
+( $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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:281"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+
+fi
+
+      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_56
+#AT_START_57
+at_fn_group_banner 57 'DMRTest.at:282' \
+  "intern test_simple_9.xml" "                       "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "57. $at_setup_line: testing $at_desc ..."
+  $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_9.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_9.xml.intern_base
+
+    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=:
+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_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_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
+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_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=:
+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; }
+
+
+
+
+fi
+
+      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_57
+#AT_START_58
+at_fn_group_banner 58 'DMRTest.at:283' \
+  "intern test_simple_9.1.xml" "                     "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "58. $at_setup_line: testing $at_desc ..."
+  $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_9.1.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_9.1.xml.intern_base
+
+    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=:
+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_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_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
+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_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=:
+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; }
+
+
+
+
+fi
+
+      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_58
+#AT_START_59
+at_fn_group_banner 59 'DMRTest.at:284' \
+  "intern test_simple_10.xml" "                      "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "59. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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=:
+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_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_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
+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_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=:
+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; }
+
+
+
+
+fi
+
+      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_59
+#AT_START_60
+at_fn_group_banner 60 'DMRTest.at:286' \
+  "intern test_array_1.xml" "                        "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "60. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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=:
+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_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_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
+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_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=:
+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; }
+
+
+
+
+fi
+
+      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_60
+#AT_START_61
+at_fn_group_banner 61 'DMRTest.at:287' \
+  "intern test_array_2.xml" "                        "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "61. $at_setup_line: testing $at_desc ..."
+  $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
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { 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=:
+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_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_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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:287"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+
+fi
+
+      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_61
+#AT_START_62
+at_fn_group_banner 62 'DMRTest.at:288' \
+  "intern test_array_3.xml" "                        "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "62. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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=:
+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_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_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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:288"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+
+fi
+
+      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_62
+#AT_START_63
+at_fn_group_banner 63 'DMRTest.at:289' \
+  "intern test_array_4.xml" "                        "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "63. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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=:
+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_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_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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:289"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+
+fi
+
+      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_63
+#AT_START_64
+at_fn_group_banner 64 'DMRTest.at:290' \
+  "intern test_array_5.xml" "                        "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "64. $at_setup_line: testing $at_desc ..."
+  $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
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { 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=:
+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_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_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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:290"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+
+fi
+
+      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_64
+#AT_START_65
+at_fn_group_banner 65 'DMRTest.at:291' \
+  "intern test_array_6.xml" "                        "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "65. $at_setup_line: testing $at_desc ..."
+  $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_6.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_6.xml.intern_base
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { 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=:
+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_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_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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:291"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+
+fi
+
+      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_65
+#AT_START_66
+at_fn_group_banner 66 'DMRTest.at:292' \
+  "intern test_array_7.xml" "                        "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "66. $at_setup_line: testing $at_desc ..."
+  $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_7.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.xml.intern_base
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:292: \$abs_builddir/dmr-test -x -i \$input"
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:292"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:292"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:292: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:292"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:292"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:292: \$abs_builddir/dmr-test -x -i \$input || true"
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:292"
+( $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
+echo stderr:; tee stderr <"$at_stderr"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:292"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:292: diff -b -B \$baseline stdout"
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:292"
+( $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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:292"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+
+fi
+
+      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_66
+#AT_START_67
+at_fn_group_banner 67 'DMRTest.at:293' \
+  "intern test_array_8.xml" "                        "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "67. $at_setup_line: testing $at_desc ..."
+  $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_8.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_8.xml.intern_base
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:293: \$abs_builddir/dmr-test -x -i \$input"
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:293"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:293"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:293: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:293"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:293"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:293: \$abs_builddir/dmr-test -x -i \$input || true"
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:293"
+( $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
+echo stderr:; tee stderr <"$at_stderr"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:293"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:293: diff -b -B \$baseline stdout"
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:293"
+( $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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:293"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+
+fi
+
+      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:294' \
+  "intern test_array_10.xml" "                       "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "68. $at_setup_line: testing $at_desc ..."
+  $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_10.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_10.xml.intern_base
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:294: \$abs_builddir/dmr-test -x -i \$input"
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:294"
+( $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=:
+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; }
+
+        { 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; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:294: \$abs_builddir/dmr-test -x -i \$input || true"
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:294"
+( $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
+echo stderr:; tee stderr <"$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; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:294: diff -b -B \$baseline stdout"
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:294"
+( $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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:294"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+
+fi
+
+      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_68
+#AT_START_69
+at_fn_group_banner 69 'DMRTest.at:295' \
+  "intern test_array_11.xml" "                       "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "69. $at_setup_line: testing $at_desc ..."
+  $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_11.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_11.xml.intern_base
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:295: \$abs_builddir/dmr-test -x -i \$input"
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:295"
+( $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=:
+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; }
+
+        { 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_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:295: \$abs_builddir/dmr-test -x -i \$input || true"
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:295"
+( $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
+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; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:295: diff -b -B \$baseline stdout"
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:295"
+( $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=:
+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_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:298' \
+  "parse dmr-testsuite/test_array_9.xml" "           "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "70. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    input=$abs_srcdir/dmr-testsuite/test_array_9.xml
+    baseline=$input.baseline
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:298: \$abs_builddir/dmr-test -x -p \$input || true"
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:298"
+( $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:298"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:298: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:298"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:298"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:298: \$abs_builddir/dmr-test -x -p \$input || true"
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:298"
+( $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:298"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:298: 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:298"
+( $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:298"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_70
+#AT_START_71
+at_fn_group_banner 71 'DMRTest.at:299' \
+  "parse dmr-testsuite/test_array_12.xml" "          "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "71. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    input=$abs_srcdir/dmr-testsuite/test_array_12.xml
+    baseline=$input.baseline
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:299: \$abs_builddir/dmr-test -x -p \$input || true"
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:299"
+( $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:299"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:299: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:299"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:299"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:299: \$abs_builddir/dmr-test -x -p \$input || true"
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:299"
+( $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:299"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:299: 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:299"
+( $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:299"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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:300' \
+  "parse dmr-testsuite/test_array_13.xml" "          "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "72. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    input=$abs_srcdir/dmr-testsuite/test_array_13.xml
+    baseline=$input.baseline
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { 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; }
+
+        { 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; }
+
+
+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"
+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; }
+
+        { 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_traceon; }
+
+
+
+fi
+
+      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_72
+#AT_START_73
+at_fn_group_banner 73 'DMRTest.at:301' \
+  "parse dmr-testsuite/test_array_14.xml" "          "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "73. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    input=$abs_srcdir/dmr-testsuite/test_array_14.xml
+    baseline=$input.baseline
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { 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=:
+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; }
+
+        { 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_traceon; }
+
+
+else
+
+        { 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_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_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' \
+  "parse dmr-testsuite/test_simple_6.2.xml" "        "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "74. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    input=$abs_srcdir/dmr-testsuite/test_simple_6.2.xml
+    baseline=$input.baseline
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:304: \$abs_builddir/dmr-test -x -p \$input || true"
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:304"
+( $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:304"
+$at_failed && at_fn_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_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:304: \$abs_builddir/dmr-test -x -p \$input || true"
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:304"
+( $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:304"
+$at_failed && at_fn_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:304"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_74
+#AT_START_75
+at_fn_group_banner 75 'DMRTest.at:305' \
+  "parse dmr-testsuite/test_simple_6.3.xml" "        "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "75. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    input=$abs_srcdir/dmr-testsuite/test_simple_6.3.xml
+    baseline=$input.baseline
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:305: \$abs_builddir/dmr-test -x -p \$input || true"
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:305"
+( $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:305"
+$at_failed && at_fn_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_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:305: \$abs_builddir/dmr-test -x -p \$input || true"
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:305"
+( $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:305"
+$at_failed && at_fn_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:305"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_75
+#AT_START_76
+at_fn_group_banner 76 'DMRTest.at:307' \
+  "trans test_array_9.xml" "                         "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "76. $at_setup_line: testing $at_desc ..."
+  $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.trans_base
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:307: \$abs_builddir/dmr-test -x -t \$input"
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:307"
+( $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"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:307"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:307: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:307"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:307"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:307: \$abs_builddir/dmr-test -x -t \$input || true"
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:307"
+( $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"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:307"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:307: 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:307"
+( $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:307"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+
+fi
+
+      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_76
+#AT_START_77
+at_fn_group_banner 77 'DMRTest.at:308' \
+  "trans test_array_12.xml" "                        "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "77. $at_setup_line: testing $at_desc ..."
+  $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.trans_base
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { 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"
+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_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_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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:308"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+
+fi
+
+      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_77
+#AT_START_78
+at_fn_group_banner 78 'DMRTest.at:309' \
+  "trans test_array_13.xml" "                        "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "78. $at_setup_line: testing $at_desc ..."
+  $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.trans_base
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { 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"
+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_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_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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:309"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+
+fi
+
+      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_78
+#AT_START_79
+at_fn_group_banner 79 'DMRTest.at:310' \
+  "trans test_array_14.xml" "                        "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "79. $at_setup_line: testing $at_desc ..."
+  $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.trans_base
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:310: \$abs_builddir/dmr-test -x -t \$input"
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:310"
+( $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"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:310"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:310: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:310"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:310"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:310: \$abs_builddir/dmr-test -x -t \$input || true"
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:310"
+( $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"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:310"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:310: 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:310"
+( $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:310"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+
+fi
+
+      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_79
+#AT_START_80
+at_fn_group_banner 80 'DMRTest.at:312' \
+  "trans test_simple_6.2.xml" "                      "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "80. $at_setup_line: testing $at_desc ..."
+  $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.trans_base
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:312: \$abs_builddir/dmr-test -x -t \$input"
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:312"
+( $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"
+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_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_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:312: \$abs_builddir/dmr-test -x -t \$input || true"
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:312"
+( $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"
+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_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:312: 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:312"
+( $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:312"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+
+fi
+
+      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_80
+#AT_START_81
+at_fn_group_banner 81 'DMRTest.at:313' \
+  "trans test_simple_6.3.xml" "                      "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "81. $at_setup_line: testing $at_desc ..."
+  $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.trans_base
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:313: \$abs_builddir/dmr-test -x -t \$input"
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:313"
+( $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"
+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_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_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:313: \$abs_builddir/dmr-test -x -t \$input || true"
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:313"
+( $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"
+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_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:313: 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:313"
+( $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:313"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+
+fi
+
+      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_81
+#AT_START_82
+at_fn_group_banner 82 'DMRTest.at:316' \
+  "trans test_array_9.xml" "                         "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "82. $at_setup_line: testing $at_desc ..."
+  $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/universal/test_array_9.xml.trans_base
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        echo "The command <>$abs_builddir/dmr-test -x -t $input $checksum_filt<>"
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:316: \$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:316"
+( $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"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:316"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:316: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:316"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:316"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:316: \$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:316"
+( $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"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:316"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:316: diff -b -B \$baseline stdout"
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:316"
+( $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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:316"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+
+fi
+
+      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_82
+#AT_START_83
+at_fn_group_banner 83 'DMRTest.at:317' \
+  "trans test_array_12.xml" "                        "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "83. $at_setup_line: testing $at_desc ..."
+  $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/universal/test_array_12.xml.trans_base
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        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"
+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_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_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"
+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_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=:
+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; }
+
+
+
+
+fi
+
+      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_83
+#AT_START_84
+at_fn_group_banner 84 'DMRTest.at:318' \
+  "trans test_array_13.xml" "                        "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "84. $at_setup_line: testing $at_desc ..."
+  $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/universal/test_array_13.xml.trans_base
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        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"
+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_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_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"
+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_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=:
+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; }
+
+
+
+
+fi
+
+      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_84
+#AT_START_85
+at_fn_group_banner 85 'DMRTest.at:319' \
+  "trans test_array_14.xml" "                        "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "85. $at_setup_line: testing $at_desc ..."
+  $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/universal/test_array_14.xml.trans_base
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        echo "The command <>$abs_builddir/dmr-test -x -t $input $checksum_filt<>"
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:319: \$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:319"
+( $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"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:319"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:319: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:319"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:319"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:319: \$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:319"
+( $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"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:319"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:319: diff -b -B \$baseline stdout"
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:319"
+( $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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:319"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+
+fi
+
+      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_85
+#AT_START_86
+at_fn_group_banner 86 'DMRTest.at:321' \
+  "trans test_simple_6.2.xml" "                      "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "86. $at_setup_line: testing $at_desc ..."
+  $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/universal/test_simple_6.2.xml.trans_base
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        echo "The command <>$abs_builddir/dmr-test -x -t $input $checksum_filt<>"
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:321: \$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:321"
+( $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"
+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_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_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:321: \$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:321"
+( $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"
+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_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=:
+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; }
+
+
+
+
+fi
+
+      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_86
+#AT_START_87
+at_fn_group_banner 87 'DMRTest.at:322' \
+  "trans test_simple_6.3.xml" "                      "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "87. $at_setup_line: testing $at_desc ..."
+  $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/universal/test_simple_6.3.xml.trans_base
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        echo "The command <>$abs_builddir/dmr-test -x -t $input $checksum_filt<>"
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:322: \$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:322"
+( $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"
+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_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_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:322: \$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:322"
+( $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"
+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_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=:
+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; }
+
+
+
+
+fi
+
+      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_87
+#AT_START_88
+at_fn_group_banner 88 'DMRTest.at:324' \
+  "intern test_array_9.xml" "                        "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "88. $at_setup_line: testing $at_desc ..."
+  $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
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:324: \$abs_builddir/dmr-test -x -i \$input"
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:324"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:324"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:324: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:324"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:324"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:324: \$abs_builddir/dmr-test -x -i \$input || true"
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:324"
+( $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
+echo stderr:; tee stderr <"$at_stderr"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:324"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:324: diff -b -B \$baseline stdout"
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:324"
+( $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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:324"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+
+fi
+
+      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_88
+#AT_START_89
+at_fn_group_banner 89 'DMRTest.at:325' \
+  "intern test_array_12.xml" "                       "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "89. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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=:
+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_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_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
+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_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=:
+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; }
+
+
+
+
+fi
+
+      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_89
+#AT_START_90
+at_fn_group_banner 90 'DMRTest.at:326' \
+  "intern test_array_13.xml" "                       "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "90. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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=:
+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_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_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
+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_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=:
+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; }
+
+
+
+
+fi
+
+      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_90
+#AT_START_91
+at_fn_group_banner 91 'DMRTest.at:327' \
+  "intern test_array_14.xml" "                       "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "91. $at_setup_line: testing $at_desc ..."
+  $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
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:327: \$abs_builddir/dmr-test -x -i \$input"
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:327"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:327"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:327: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:327"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:327"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:327: \$abs_builddir/dmr-test -x -i \$input || true"
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:327"
+( $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
+echo stderr:; tee stderr <"$at_stderr"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:327"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:327: diff -b -B \$baseline stdout"
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:327"
+( $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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:327"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+
+fi
+
+      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_91
+#AT_START_92
+at_fn_group_banner 92 'DMRTest.at:329' \
+  "intern test_simple_6.2.xml" "                     "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "92. $at_setup_line: testing $at_desc ..."
+  $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
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:329: \$abs_builddir/dmr-test -x -i \$input"
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:329"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:329"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:329: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:329"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:329"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:329: \$abs_builddir/dmr-test -x -i \$input || true"
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:329"
+( $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
+echo stderr:; tee stderr <"$at_stderr"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:329"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:329: diff -b -B \$baseline stdout"
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:329"
+( $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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:329"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+
+fi
+
+      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_92
+#AT_START_93
+at_fn_group_banner 93 'DMRTest.at:330' \
+  "intern test_simple_6.3.xml" "                     "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "93. $at_setup_line: testing $at_desc ..."
+  $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
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:330: \$abs_builddir/dmr-test -x -i \$input"
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:330"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:330"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:330: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:330"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:330"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:330: \$abs_builddir/dmr-test -x -i \$input || true"
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:330"
+( $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
+echo stderr:; tee stderr <"$at_stderr"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:330"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:330: diff -b -B \$baseline stdout"
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:330"
+( $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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:330"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+
+fi
+
+      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_93
+#AT_START_94
+at_fn_group_banner 94 'DMRTest.at:346' \
+  "trans ce test_array_3.1.dmr row;x test_array_3.1.dmr.1.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "94. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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 \"row;x\""
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"row;x\"" "DMRTest.at:346"
+( $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=:
+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_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_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:346: \$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:346"
+( $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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:346"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_94
+#AT_START_95
+at_fn_group_banner 95 'DMRTest.at:346' \
+  "trans ce test_array_3.1.dmr row=[2:3];x test_array_3.1.dmr.2.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "95. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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 \"row=[2:3];x\""
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"row=[2:3];x\"" "DMRTest.at:346"
+( $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=:
+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_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_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:346: \$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:346"
+( $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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:346"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_95
+#AT_START_96
+at_fn_group_banner 96 'DMRTest.at:346' \
+  "trans ce test_array_3.1.dmr row=[2:3];x[0:1] test_array_3.1.dmr.3.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "96. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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 \"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:346"
+( $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=:
+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_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_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:346: \$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:346"
+( $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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:346"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_96
+#AT_START_97
+at_fn_group_banner 97 'DMRTest.at:346' \
+  "trans ce test_array_3.1.dmr x[0:1] test_array_3.1.dmr.4.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "97. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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 \"x[0:1]\""
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"x[0:1]\"" "DMRTest.at:346"
+( $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=:
+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_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_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:346: \$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:346"
+( $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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:346"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_97
+#AT_START_98
+at_fn_group_banner 98 'DMRTest.at:346' \
+  "trans ce test_array_3.1.dmr x test_array_3.1.dmr.5.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "98. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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 \"x\""
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"x\"" "DMRTest.at:346"
+( $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=:
+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_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_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:346: \$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:346"
+( $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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:346"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_98
+#AT_START_99
+at_fn_group_banner 99 'DMRTest.at:350' \
+  "trans ce test_array_4.xml a test_array_4.xml.1.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "99. $at_setup_line: testing $at_desc ..."
+  $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
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:350: \$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:350"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:350"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:350: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:350"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:350"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:350: \$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:350"
+( $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
+echo stderr:; tee stderr <"$at_stderr"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:350"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:350: 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:350"
+( $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:350"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_99
+#AT_START_100
+at_fn_group_banner 100 'DMRTest.at:351' \
+  "trans ce test_array_4.xml a[][]  test_array_4.xml.1.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "100. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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 \"a[][] \""
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a[][] \"" "DMRTest.at:351"
+( $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=:
+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_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_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:351: \$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:351"
+( $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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:351"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_100
+#AT_START_101
+at_fn_group_banner 101 'DMRTest.at:353' \
+  "trans ce test_array_4.xml /row=[0:1];/col=[3];a test_array_4.xml.3.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "101. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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\""
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];/col=[3];a\"" "DMRTest.at:353"
+( $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=:
+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_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_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\" || true"
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];/col=[3];a\" || true" "DMRTest.at:353"
+( $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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:353"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_101
+#AT_START_102
+at_fn_group_banner 102 'DMRTest.at:355' \
+  "trans ce test_array_4.xml /row=[0:1];/col=[3];a[][]  test_array_4.xml.4.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "102. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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 \"/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:355"
+( $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=:
+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_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_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:355: \$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:355"
+( $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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:355"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_102
+#AT_START_103
+at_fn_group_banner 103 'DMRTest.at:357' \
+  "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_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "103. $at_setup_line: testing $at_desc ..."
+  $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
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:357: \$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:357"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:357"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:357: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:357"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:357"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:357: \$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:357"
+( $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
+echo stderr:; tee stderr <"$at_stderr"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:357"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:357: 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:357"
+( $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:357"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_103
+#AT_START_104
+at_fn_group_banner 104 'DMRTest.at:359' \
+  "trans ce test_array_4.xml x[][]  /test_array_4.xml.6.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "104. $at_setup_line: testing $at_desc ..."
+  $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
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:359: \$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:359"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:359"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:359: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:359"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:359"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:359: \$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:359"
+( $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
+echo stderr:; tee stderr <"$at_stderr"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:359"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:359: 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:359"
+( $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:359"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_104
+#AT_START_105
+at_fn_group_banner 105 'DMRTest.at:360' \
+  "trans ce test_array_4.xml /row=[0:1];x[][]  test_array_4.xml.7.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "105. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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 \"/row=[0:1];x[][] \""
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];x[][] \"" "DMRTest.at:360"
+( $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=:
+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_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_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:360: \$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:360"
+( $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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:360"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_105
+#AT_START_106
+at_fn_group_banner 106 'DMRTest.at:362' \
+  "trans ce test_array_4.xml c[2:][2:]  test_array_4.xml.8.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "106. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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 \"c[2:][2:] \""
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"c[2:][2:] \"" "DMRTest.at:362"
+( $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=:
+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_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_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:362: \$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:362"
+( $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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:362"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_106
+#AT_START_107
+at_fn_group_banner 107 'DMRTest.at:364' \
+  "trans ce test_simple_6.xml s test_simple_6.xml.1.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "107. $at_setup_line: testing $at_desc ..."
+  $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
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:364: \$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:364"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:364"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:364: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:364"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:364"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:364: \$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:364"
+( $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
+echo stderr:; tee stderr <"$at_stderr"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:364"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:364: 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:364"
+( $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:364"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "108. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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=:
+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_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_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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:365"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "109. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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=:
+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_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_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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:366"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "110. $at_setup_line: testing $at_desc ..."
+  $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
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { 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=:
+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_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_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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:367"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_110
+#AT_START_111
+at_fn_group_banner 111 'DMRTest.at:369' \
+  "trans ce test_simple_6.xml s{i1} test_simple_6.xml.2.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "111. $at_setup_line: testing $at_desc ..."
+  $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
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:369: \$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:369"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:369"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:369: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:369"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:369"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:369: \$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:369"
+( $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
+echo stderr:; tee stderr <"$at_stderr"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:369"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:369: 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:369"
+( $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:369"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_111
+#AT_START_112
+at_fn_group_banner 112 'DMRTest.at:370' \
+  "trans ce test_simple_6.xml s{s} test_simple_6.xml.3.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "112. $at_setup_line: testing $at_desc ..."
+  $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
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:370: \$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:370"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:370"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:370: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:370"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:370"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:370: \$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:370"
+( $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
+echo stderr:; tee stderr <"$at_stderr"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:370"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:370: 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:370"
+( $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:370"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_112
+#AT_START_113
+at_fn_group_banner 113 'DMRTest.at:371' \
+  "trans ce test_simple_6.1.xml s{inner.i2} test_simple_6.1.xml.1.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "113. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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 \"s{inner.i2}\""
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{inner.i2}\"" "DMRTest.at:371"
+( $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=:
+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_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_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:371: \$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:371"
+( $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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:371"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_113
+#AT_START_114
+at_fn_group_banner 114 'DMRTest.at:372' \
+  "trans ce test_simple_6.1.xml s{inner{i2}} test_simple_6.1.xml.1.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "114. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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 \"s{inner{i2}}\""
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{inner{i2}}\"" "DMRTest.at:372"
+( $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=:
+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_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_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:372: \$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:372"
+( $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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:372"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_114
+#AT_START_115
+at_fn_group_banner 115 'DMRTest.at:375' \
+  "trans ce test_array_6.xml a test_array_6.xml.1.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "115. $at_setup_line: testing $at_desc ..."
+  $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
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:375: \$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:375"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:375"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:375: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:375"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:375"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:375: \$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:375"
+( $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
+echo stderr:; tee stderr <"$at_stderr"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:375"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:375: 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:375"
+( $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:375"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_115
+#AT_START_116
+at_fn_group_banner 116 'DMRTest.at:376' \
+  "trans ce test_array_6.xml a[][]  test_array_6.xml.1.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "116. $at_setup_line: testing $at_desc ..."
+  $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
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:376: \$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:376"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:376"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:376: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:376"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:376"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:376: \$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:376"
+( $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
+echo stderr:; tee stderr <"$at_stderr"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:376"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:376: 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:376"
+( $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:376"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_116
+#AT_START_117
+at_fn_group_banner 117 'DMRTest.at:377' \
+  "trans ce test_array_6.xml /row=[0:1];a[][]  test_array_6.xml.2.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "117. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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 \"/row=[0:1];a[][] \""
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];a[][] \"" "DMRTest.at:377"
+( $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=:
+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_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_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:377: \$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:377"
+( $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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:377"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_117
+#AT_START_118
+at_fn_group_banner 118 'DMRTest.at:378' \
+  "trans ce test_array_6.xml /row=[0:1];a[][1:2]  test_array_6.xml.3.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "118. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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 \"/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:378"
+( $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=:
+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_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_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:378: \$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:378"
+( $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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:378"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_118
+#AT_START_119
+at_fn_group_banner 119 'DMRTest.at:381' \
+  "trans ce test_array_6.2.xml a test_array_6.2.xml.1.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "119. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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\""
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a\"" "DMRTest.at:381"
+( $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=:
+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_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_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:381: \$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:381"
+( $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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:381"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_119
+#AT_START_120
+at_fn_group_banner 120 'DMRTest.at:382' \
+  "trans ce test_array_6.2.xml a{i;j} test_array_6.2.xml.1.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "120. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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;j}\""
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a{i;j}\"" "DMRTest.at:382"
+( $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=:
+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_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_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:382: \$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:382"
+( $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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:382"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_120
+#AT_START_121
+at_fn_group_banner 121 'DMRTest.at:383' \
+  "trans ce test_array_6.2.xml a.i test_array_6.2.xml.2.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "121. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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 \"a.i\""
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a.i\"" "DMRTest.at:383"
+( $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=:
+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_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_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:383: \$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:383"
+( $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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:383"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_121
+#AT_START_122
+at_fn_group_banner 122 'DMRTest.at:384' \
+  "trans ce test_array_6.2.xml a{i} test_array_6.2.xml.2.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "122. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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 \"a{i}\""
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a{i}\"" "DMRTest.at:384"
+( $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=:
+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_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_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:384: \$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:384"
+( $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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:384"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_122
+#AT_START_123
+at_fn_group_banner 123 'DMRTest.at:385' \
+  "trans ce test_array_6.2.xml a.i[0][1:2]  test_array_6.2.xml.3.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "123. $at_setup_line: testing $at_desc ..."
+  $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
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:385: \$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:385"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:385"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:385: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:385"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:385"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:385: \$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:385"
+( $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
+echo stderr:; tee stderr <"$at_stderr"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:385"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:385: 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:385"
+( $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:385"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_123
+#AT_START_124
+at_fn_group_banner 124 'DMRTest.at:386' \
+  "trans ce test_array_6.2.xml a{i[0][1:2]}  test_array_6.2.xml.3.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "124. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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{i[0][1:2]} \""
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a{i[0][1:2]} \"" "DMRTest.at:386"
+( $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=:
+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_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_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:386: \$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:386"
+( $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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:386"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_124
+#AT_START_125
+at_fn_group_banner 125 'DMRTest.at:387' \
+  "trans ce test_array_6.2.xml /row=[0:1];a.i[][1:2]  test_array_6.2.xml.4.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "125. $at_setup_line: testing $at_desc ..."
+  $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
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:387: \$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:387"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:387"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:387: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:387"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:387"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:387: \$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:387"
+( $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
+echo stderr:; tee stderr <"$at_stderr"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:387"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:387: 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:387"
+( $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:387"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_125
+#AT_START_126
+at_fn_group_banner 126 'DMRTest.at:388' \
+  "trans ce test_array_6.2.xml /row=[0:1];a{i[][1:2]}  test_array_6.2.xml.4.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "126. $at_setup_line: testing $at_desc ..."
+  $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
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:388: \$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:388"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:388"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:388: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:388"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:388"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:388: \$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:388"
+( $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
+echo stderr:; tee stderr <"$at_stderr"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:388"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:388: 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:388"
+( $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:388"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_126
+#AT_START_127
+at_fn_group_banner 127 'DMRTest.at:390' \
+  "trans ce test_array_6.2.xml a.j test_array_6.2.xml.5.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "127. $at_setup_line: testing $at_desc ..."
+  $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
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:390: \$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:390"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:390"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:390: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:390"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:390"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:390: \$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:390"
+( $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
+echo stderr:; tee stderr <"$at_stderr"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:390"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:390: 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:390"
+( $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:390"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_127
+#AT_START_128
+at_fn_group_banner 128 'DMRTest.at:393' \
+  "trans ce test_array_6.1.xml a test_array_6.1.xml.1.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "128. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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 \"a\""
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a\"" "DMRTest.at:393"
+( $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=:
+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_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_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:393: \$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:393"
+( $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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:393"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_128
+#AT_START_129
+at_fn_group_banner 129 'DMRTest.at:396' \
+  "trans ce test_array_6.1.xml /row=[1:2];a[][0]  test_array_6.1.xml.2.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "129. $at_setup_line: testing $at_desc ..."
+  $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
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:396: \$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:396"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:396"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:396: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:396"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:396"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:396: \$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:396"
+( $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
+echo stderr:; tee stderr <"$at_stderr"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:396"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:396: 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:396"
+( $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:396"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_129
+#AT_START_130
+at_fn_group_banner 130 'DMRTest.at:397' \
+  "trans ce test_array_6.1.xml /row=[1:2];a[][0]{i;j}  test_array_6.1.xml.2.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "130. $at_setup_line: testing $at_desc ..."
+  $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
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:397: \$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:397"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:397"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:397: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:397"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:397"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:397: \$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:397"
+( $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
+echo stderr:; tee stderr <"$at_stderr"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:397"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:397: 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:397"
+( $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:397"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_130
+#AT_START_131
+at_fn_group_banner 131 'DMRTest.at:399' \
+  "trans ce test_array_6.1.xml row=[1:2];a[][0]{i;j}  test_array_6.1.xml.2.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "131. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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 \"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:399"
+( $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=:
+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_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_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:399: \$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:399"
+( $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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:399"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_131
+#AT_START_132
+at_fn_group_banner 132 'DMRTest.at:402' \
+  "trans ce test_array_6.1.xml a{i[1:2][1:3];j}  test_array_6.1.xml.3.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "132. $at_setup_line: testing $at_desc ..."
+  $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
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:402: \$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:402"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:402"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:402: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:402"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:402"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:402: \$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:402"
+( $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
+echo stderr:; tee stderr <"$at_stderr"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:402"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:402: 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:402"
+( $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:402"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_132
+#AT_START_133
+at_fn_group_banner 133 'DMRTest.at:403' \
+  "trans ce test_array_6.1.xml a[][]{i[1:2][1:3];j}  test_array_6.1.xml.3.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "133. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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 \"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:403"
+( $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=:
+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_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_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:403: \$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:403"
+( $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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:403"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_133
+#AT_START_134
+at_fn_group_banner 134 'DMRTest.at:407' \
+  "trans ce test_array_6.1.xml /row=[1];a[][0]{i[][0:1]}  test_array_6.1.xml.4.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "134. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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 \"/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:407"
+( $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=:
+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_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_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:407: \$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:407"
+( $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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:407"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_134
+#AT_START_135
+at_fn_group_banner 135 'DMRTest.at:410' \
+  "trans ce test_simple_7.xml s test_simple_7.xml.1.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "135. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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\""
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s\"" "DMRTest.at:410"
+( $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=:
+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_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_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:410: \$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:410"
+( $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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:410"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_135
+#AT_START_136
+at_fn_group_banner 136 'DMRTest.at:411' \
+  "trans ce test_simple_7.xml s{i1;s} test_simple_7.xml.1.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "136. $at_setup_line: testing $at_desc ..."
+  $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
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:411: \$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:411"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:411"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:411: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:411"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:411"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:411: \$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:411"
+( $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
+echo stderr:; tee stderr <"$at_stderr"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:411"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:411: 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:411"
+( $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:411"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_136
+#AT_START_137
+at_fn_group_banner 137 'DMRTest.at:413' \
+  "trans ce test_simple_7.xml s.i1 test_simple_7.xml.2.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "137. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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 \"s.i1\""
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.i1\"" "DMRTest.at:413"
+( $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=:
+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_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_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:413: \$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:413"
+( $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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:413"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_137
+#AT_START_138
+at_fn_group_banner 138 'DMRTest.at:414' \
+  "trans ce test_simple_7.xml s{i1} test_simple_7.xml.2.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "138. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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 \"s{i1}\""
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{i1}\"" "DMRTest.at:414"
+( $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=:
+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_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_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:414: \$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:414"
+( $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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:414"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_138
+#AT_START_139
+at_fn_group_banner 139 'DMRTest.at:416' \
+  "trans ce test_simple_8.xml outer test_simple_8.xml.1.trans_base" ""
+at_xfail=no
+      test "Xxfail" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "139. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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 \"outer\""
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"outer\"" "DMRTest.at:416"
+( $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=:
+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_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_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:416: \$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:416"
+( $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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:416"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_139
+#AT_START_140
+at_fn_group_banner 140 'DMRTest.at:417' \
+  "trans ce test_simple_8.xml outer.s.s test_simple_8.xml.2.trans_base" ""
+at_xfail=no
+      test "Xxfail" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "140. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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 \"outer.s.s\""
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"outer.s.s\"" "DMRTest.at:417"
+( $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=:
+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_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_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:417: \$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:417"
+( $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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:417"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_140
+#AT_START_141
+at_fn_group_banner 141 'DMRTest.at:418' \
+  "trans ce test_simple_8.xml outer{s{s}} test_simple_8.xml.2.trans_base" ""
+at_xfail=no
+      test "Xxfail" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "141. $at_setup_line: testing $at_desc ..."
+  $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
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:418: \$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:418"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:418"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:418: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:418"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:418"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:418: \$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:418"
+( $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
+echo stderr:; tee stderr <"$at_stderr"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:418"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:418: 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:418"
+( $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:418"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_141
+#AT_START_142
+at_fn_group_banner 142 'DMRTest.at:420' \
+  "trans ce test_array_7.xml s test_array_7.xml.1.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "142. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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\""
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s\"" "DMRTest.at:420"
+( $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=:
+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_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_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:420: \$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:420"
+( $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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:420"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_142
+#AT_START_143
+at_fn_group_banner 143 'DMRTest.at:421' \
+  "trans ce test_array_7.xml s{i1;s} test_array_7.xml.1.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "143. $at_setup_line: testing $at_desc ..."
+  $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
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:421: \$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:421"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:421"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:421: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:421"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:421"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:421: \$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:421"
+( $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
+echo stderr:; tee stderr <"$at_stderr"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:421"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:421: 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:421"
+( $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:421"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_143
+#AT_START_144
+at_fn_group_banner 144 'DMRTest.at:423' \
+  "trans ce test_array_7.xml s.i1 test_array_7.xml.2.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "144. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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.i1\""
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.i1\"" "DMRTest.at:423"
+( $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=:
+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_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_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:423: \$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:423"
+( $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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:423"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_144
+#AT_START_145
+at_fn_group_banner 145 'DMRTest.at:424' \
+  "trans ce test_array_7.xml s{i1} test_array_7.xml.2.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "145. $at_setup_line: testing $at_desc ..."
+  $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
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:424: \$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:424"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:424"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:424: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:424"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:424"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:424: \$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:424"
+( $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
+echo stderr:; tee stderr <"$at_stderr"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:424"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:424: 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:424"
+( $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:424"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_145
+#AT_START_146
+at_fn_group_banner 146 'DMRTest.at:426' \
+  "trans ce test_array_7.xml s[1]  test_array_7.xml.3.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "146. $at_setup_line: testing $at_desc ..."
+  $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
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:426: \$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:426"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:426"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:426: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:426"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:426"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:426: \$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:426"
+( $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
+echo stderr:; tee stderr <"$at_stderr"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:426"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:426: 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:426"
+( $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:426"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_146
+#AT_START_147
+at_fn_group_banner 147 'DMRTest.at:427' \
+  "trans ce test_array_7.xml s[1]{i1;s} test_array_7.xml.3.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "147. $at_setup_line: testing $at_desc ..."
+  $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
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:427: \$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:427"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:427"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:427: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:427"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:427"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:427: \$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:427"
+( $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
+echo stderr:; tee stderr <"$at_stderr"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:427"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:427: 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:427"
+( $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:427"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_147
+#AT_START_148
+at_fn_group_banner 148 'DMRTest.at:429' \
+  "trans ce test_array_7.xml s[1]{i1} test_array_7.xml.4.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "148. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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 \"s[1]{i1}\""
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s[1]{i1}\"" "DMRTest.at:429"
+( $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=:
+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_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_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:429: \$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:429"
+( $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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:429"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_148
+#AT_START_149
+at_fn_group_banner 149 'DMRTest.at:432' \
+  "trans ce test_array_8.xml /col=[1:2];s[1][]{i1} test_array_8.xml.1.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "149. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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 \"/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:432"
+( $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=:
+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_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_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:432: \$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:432"
+( $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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:432"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_149
+#AT_START_150
+at_fn_group_banner 150 'DMRTest.at:433' \
+  "trans ce test_array_8.xml col=[1:2];s[1][]{i1} test_array_8.xml.1.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "150. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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 \"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:433"
+( $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=:
+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_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_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:433: \$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:433"
+( $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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:433"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_150
+#AT_START_151
+at_fn_group_banner 151 'DMRTest.at:436' \
+  "trans ce test_array_7.1.xml  test_array_7.1.xml.1.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "151. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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 \"\""
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"\"" "DMRTest.at:436"
+( $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=:
+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_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_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:436: \$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:436"
+( $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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:436"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_151
+#AT_START_152
+at_fn_group_banner 152 'DMRTest.at:437' \
+  "trans ce test_array_7.1.xml s test_array_7.1.xml.1.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "152. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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\""
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s\"" "DMRTest.at:437"
+( $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=:
+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_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_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:437: \$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:437"
+( $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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:437"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_152
+#AT_START_153
+at_fn_group_banner 153 'DMRTest.at:439' \
+  "trans ce test_array_7.1.xml s.i1 test_array_7.1.xml.2.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "153. $at_setup_line: testing $at_desc ..."
+  $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
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:439: \$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:439"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:439"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:439: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:439"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:439"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:439: \$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:439"
+( $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
+echo stderr:; tee stderr <"$at_stderr"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:439"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:439: 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:439"
+( $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:439"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_153
+#AT_START_154
+at_fn_group_banner 154 'DMRTest.at:440' \
+  "trans ce test_array_7.1.xml s.i1[][]  test_array_7.1.xml.2.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "154. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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[][] \""
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.i1[][] \"" "DMRTest.at:440"
+( $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=:
+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_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_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:440: \$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:440"
+( $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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:440"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_154
+#AT_START_155
+at_fn_group_banner 155 'DMRTest.at:441' \
+  "trans ce test_array_7.1.xml s{i1} test_array_7.1.xml.2.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "155. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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}\""
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{i1}\"" "DMRTest.at:441"
+( $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=:
+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_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_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:441: \$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:441"
+( $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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:441"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_155
+#AT_START_156
+at_fn_group_banner 156 'DMRTest.at:442' \
+  "trans ce test_array_7.1.xml s{i1[][]}  test_array_7.1.xml.2.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "156. $at_setup_line: testing $at_desc ..."
+  $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
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:442: \$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:442"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:442"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:442: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:442"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:442"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:442: \$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:442"
+( $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
+echo stderr:; tee stderr <"$at_stderr"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:442"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:442: 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:442"
+( $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:442"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_156
+#AT_START_157
+at_fn_group_banner 157 'DMRTest.at:444' \
+  "trans ce test_array_7.1.xml s.i1[0][0]  test_array_7.1.xml.3.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "157. $at_setup_line: testing $at_desc ..."
+  $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
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:444: \$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:444"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:444"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:444: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:444"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:444"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:444: \$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:444"
+( $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
+echo stderr:; tee stderr <"$at_stderr"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:444"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:444: 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:444"
+( $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:444"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_157
+#AT_START_158
+at_fn_group_banner 158 'DMRTest.at:445' \
+  "trans ce test_array_7.1.xml s{i1[0][0]}  test_array_7.1.xml.3.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "158. $at_setup_line: testing $at_desc ..."
+  $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
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:445: \$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:445"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:445"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:445: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:445"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:445"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:445: \$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:445"
+( $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
+echo stderr:; tee stderr <"$at_stderr"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:445"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:445: 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:445"
+( $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:445"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_158
+#AT_START_159
+at_fn_group_banner 159 'DMRTest.at:447' \
+  "trans ce test_array_7.1.xml s.i1[0:2][1:2]  test_array_7.1.xml.4.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "159. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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 \"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:447"
+( $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=:
+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_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_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:447: \$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:447"
+( $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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:447"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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  test_array_7.1.xml.5.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "160. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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 \""
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[2:3];/col=[2:3];s \"" "DMRTest.at:451"
+( $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=:
+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_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_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 \" || true"
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[2:3];/col=[2:3];s \" || true" "DMRTest.at:451"
+( $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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:451"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_160
+#AT_START_161
+at_fn_group_banner 161 'DMRTest.at:453' \
+  "trans ce test_array_7.1.xml /row=[2:3];/col=[2:3];s.i1  test_array_7.1.xml.6.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "161. $at_setup_line: testing $at_desc ..."
+  $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
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:453: \$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:453"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:453"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:453: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:453"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:453"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:453: \$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:453"
+( $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
+echo stderr:; tee stderr <"$at_stderr"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:453"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:453: 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:453"
+( $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:453"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_161
+#AT_START_162
+at_fn_group_banner 162 'DMRTest.at:454' \
+  "trans ce test_array_7.1.xml /row=[2:3];/col=[2:3];s.i1[][]  test_array_7.1.xml.6.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "162. $at_setup_line: testing $at_desc ..."
+  $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
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:454: \$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:454"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:454"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:454: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:454"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:454"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:454: \$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:454"
+( $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
+echo stderr:; tee stderr <"$at_stderr"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:454"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:454: 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:454"
+( $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:454"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_162
+#AT_START_163
+at_fn_group_banner 163 'DMRTest.at:455' \
+  "trans ce test_array_7.1.xml /row=[2:3];/col=[2:3];s{i1}  test_array_7.1.xml.6.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "163. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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 \"/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:455"
+( $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=:
+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_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_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:455: \$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:455"
+( $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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:455"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_163
+#AT_START_164
+at_fn_group_banner 164 'DMRTest.at:456' \
+  "trans ce test_array_7.1.xml /row=[2:3];/col=[2:3];s{i1[][]}  test_array_7.1.xml.6.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "164. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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 \"/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:456"
+( $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=:
+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_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_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:456: \$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:456"
+( $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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:456"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_164
+#AT_START_165
+at_fn_group_banner 165 'DMRTest.at:459' \
+  "trans ce test_array_7.2.xml /col=[1:2];s[]{i1} test_array_7.2.xml.1.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "165. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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}\""
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[]{i1}\"" "DMRTest.at:459"
+( $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=:
+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_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_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:459: \$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:459"
+( $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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:459"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_165
+#AT_START_166
+at_fn_group_banner 166 'DMRTest.at:460' \
+  "trans ce test_array_7.2.xml /col=[1:2];s[]{i1[][]} test_array_7.2.xml.1.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "166. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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[][]}\""
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[]{i1[][]}\"" "DMRTest.at:460"
+( $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=:
+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_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_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:460: \$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:460"
+( $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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:460"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_166
+#AT_START_167
+at_fn_group_banner 167 'DMRTest.at:461' \
+  "trans ce test_array_7.2.xml /col=[1:2];s{i1[][]} test_array_7.2.xml.1.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "167. $at_setup_line: testing $at_desc ..."
+  $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
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:461: \$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:461"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:461"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:461: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:461"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:461"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:461: \$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:461"
+( $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
+echo stderr:; tee stderr <"$at_stderr"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:461"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:461: 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:461"
+( $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:461"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_167
+#AT_START_168
+at_fn_group_banner 168 'DMRTest.at:463' \
+  "trans ce test_array_7.2.xml /col=[1:2];s[]{i1[0][]} test_array_7.2.xml.2.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "168. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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[]{i1[0][]}\""
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[]{i1[0][]}\"" "DMRTest.at:463"
+( $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=:
+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_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_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:463: \$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:463"
+( $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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:463"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_168
+#AT_START_169
+at_fn_group_banner 169 'DMRTest.at:464' \
+  "trans ce test_array_7.2.xml /col=[1:2];s{i1[0][]} test_array_7.2.xml.2.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "169. $at_setup_line: testing $at_desc ..."
+  $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
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:464: \$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:464"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:464"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:464: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:464"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:464"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:464: \$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:464"
+( $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
+echo stderr:; tee stderr <"$at_stderr"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:464"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:464: 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:464"
+( $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:464"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_169
+#AT_START_170
+at_fn_group_banner 170 'DMRTest.at:466' \
+  "trans ce test_array_7.2.xml /col=[1:2];s[0]{i1} test_array_7.2.xml.3.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "170. $at_setup_line: testing $at_desc ..."
+  $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
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:466: \$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:466"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:466"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:466: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:466"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:466"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:466: \$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:466"
+( $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
+echo stderr:; tee stderr <"$at_stderr"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:466"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:466: 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:466"
+( $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:466"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_170
+#AT_START_171
+at_fn_group_banner 171 'DMRTest.at:467' \
+  "trans ce test_array_7.2.xml /col=[1:2];s[0]{i1[][]} test_array_7.2.xml.3.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "171. $at_setup_line: testing $at_desc ..."
+  $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
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:467: \$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:467"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:467"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:467: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:467"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:467"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:467: \$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:467"
+( $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
+echo stderr:; tee stderr <"$at_stderr"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:467"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:467: 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:467"
+( $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:467"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_171
+#AT_START_172
+at_fn_group_banner 172 'DMRTest.at:469' \
+  "trans ce test_array_7.2.xml /col=[1:2];s[0]{i1[0][]} test_array_7.2.xml.4.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "172. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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 -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:469"
+( $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=:
+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_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_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:469: \$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:469"
+( $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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:469"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_172
+#AT_START_173
+at_fn_group_banner 173 'DMRTest.at:473' \
+  "trans test_array_1.xml scale(x,1)  test_array_1.xml.1.func_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "173. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    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 :
+
+        { 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=:
+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_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_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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:473"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_173
+#AT_START_174
+at_fn_group_banner 174 'DMRTest.at:474' \
+  "trans test_array_1.xml scale(x,10)  test_array_1.xml.2.func_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "174. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    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 :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:474: \$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:474"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:474"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:474: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:474"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:474"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:474: \$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:474"
+( $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"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:474"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:474: 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:474"
+( $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:474"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_174
+#AT_START_175
+at_fn_group_banner 175 'DMRTest.at:475' \
+  "trans test_array_1.xml scale(x,-10)  test_array_1.xml.3.func_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "175. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    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 :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:475: \$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:475"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:475"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:475: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:475"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:475"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:475: \$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:475"
+( $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"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:475"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:475: 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:475"
+( $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:475"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_175
+#AT_START_176
+at_fn_group_banner 176 'DMRTest.at:476' \
+  "trans test_array_1.xml scale(x,0.001)  test_array_1.xml.4.func_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "176. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    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 :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:476: \$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:476"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:476"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:476: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:476"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:476"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:476: \$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:476"
+( $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"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:476"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:476: 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:476"
+( $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:476"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_176
+#AT_START_177
+at_fn_group_banner 177 'DMRTest.at:477' \
+  "trans test_array_1.xml scale(x,-0.001)  test_array_1.xml.5.func_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "177. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    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 :
+
+        { 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=:
+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_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_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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:477"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_177
+#AT_START_178
+at_fn_group_banner 178 'DMRTest.at:481' \
+  "trans test_array_1.xml scale(x,0x7fffffffffffffff)  test_array_1.xml.6.func_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "178. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    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 :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:481: \$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:481"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:481"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:481: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:481"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:481"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:481: \$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:481"
+( $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"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:481"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:481: 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:481"
+( $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:481"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_178
+#AT_START_179
+at_fn_group_banner 179 'DMRTest.at:483' \
+  "trans test_array_1.xml scale(x,0x8fffffffffffffff)  test_array_1.xml.7.func_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "179. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    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 :
+
+        { 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=:
+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_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_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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:483"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_179
+#AT_START_180
+at_fn_group_banner 180 'DMRTest.at:487' \
+  "trans test_array_5.xml scale(a,0.001)  test_array_5.xml.1.func_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "180. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    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 :
+
+        { 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=:
+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_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_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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:487"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_180
+#AT_START_181
+at_fn_group_banner 181 'DMRTest.at:488' \
+  "trans test_array_5.xml scale(b,0.001)  test_array_5.xml.2.func_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "181. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    input=$abs_srcdir/dmr-testsuite/test_array_5.xml
+    fe="scale(b,0.001)"
+    ce=""
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_5.xml.2.func_base
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:488: \$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:488"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:488"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:488: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:488"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:488"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:488: \$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:488"
+( $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"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:488"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:488: 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:488"
+( $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:488"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_181
+#AT_START_182
+at_fn_group_banner 182 'DMRTest.at:490' \
+  "trans test_array_5.xml scale(c,0.001)  test_array_5.xml.3.func_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "182. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    input=$abs_srcdir/dmr-testsuite/test_array_5.xml
+    fe="scale(c,0.001)"
+    ce=""
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_5.xml.3.func_base
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:490: \$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:490"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:490"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:490: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:490"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:490"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:490: \$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:490"
+( $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"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:490"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:490: 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:490"
+( $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:490"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_182
+#AT_START_183
+at_fn_group_banner 183 'DMRTest.at:491' \
+  "trans test_array_5.xml scale(d,0.001)  test_array_5.xml.4.func_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "183. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    input=$abs_srcdir/dmr-testsuite/test_array_5.xml
+    fe="scale(d,0.001)"
+    ce=""
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_5.xml.4.func_base
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:491: \$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:491"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:491"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:491: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:491"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:491"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:491: \$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:491"
+( $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"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:491"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:491: 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:491"
+( $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:491"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_183
+#AT_START_184
+at_fn_group_banner 184 'DMRTest.at:496' \
+  "trans vol_1_ce_1.xml scale(u,10)  vol_1_ce_1.xml.1.func_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "184. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    input=$abs_srcdir/dmr-testsuite/vol_1_ce_1.xml
+    fe="scale(u,10)"
+    ce=""
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/vol_1_ce_1.xml.1.func_base
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:496: \$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:496"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:496"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:496: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:496"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:496"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:496: \$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:496"
+( $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"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:496"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:496: 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:496"
+( $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:496"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_184
+#AT_START_185
+at_fn_group_banner 185 'DMRTest.at:497' \
+  "trans vol_1_ce_1.xml scale(u,v)  vol_1_ce_1.xml.2.func_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "185. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    input=$abs_srcdir/dmr-testsuite/vol_1_ce_1.xml
+    fe="scale(u,v)"
+    ce=""
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/vol_1_ce_1.xml.2.func_base
+
+    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=:
+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_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_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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:497"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_185
+#AT_START_186
+at_fn_group_banner 186 'DMRTest.at:498' \
+  "trans vol_1_ce_1.xml scale(scale(u,10),0.01)  vol_1_ce_1.xml.3.func_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "186. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    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/vol_1_ce_1.xml.3.func_base
+
+    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=:
+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_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_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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:498"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_186
+#AT_START_187
+at_fn_group_banner 187 'DMRTest.at:501' \
+  "trans vol_1_ce_1.xml scale(Point.x,10)  vol_1_ce_1.xml.4.func_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "187. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    input=$abs_srcdir/dmr-testsuite/vol_1_ce_1.xml
+    fe="scale(Point.x,10)"
+    ce=""
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/vol_1_ce_1.xml.4.func_base
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:501: \$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:501"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:501"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:501: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:501"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:501"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:501: \$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:501"
+( $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"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:501"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:501: 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:501"
+( $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:501"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_187
+#AT_START_188
+at_fn_group_banner 188 'DMRTest.at:502' \
+  "trans vol_1_ce_1.xml scale(Point.x,Point.y)  vol_1_ce_1.xml.5.func_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "188. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    input=$abs_srcdir/dmr-testsuite/vol_1_ce_1.xml
+    fe="scale(Point.x,Point.y)"
+    ce=""
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/vol_1_ce_1.xml.5.func_base
+
+    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=:
+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_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_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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:502"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_188
+#AT_START_189
+at_fn_group_banner 189 'DMRTest.at:503' \
+  "trans vol_1_ce_1.xml scale(scale(Point.x,10),0.01)  vol_1_ce_1.xml.6.func_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "189. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    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/vol_1_ce_1.xml.6.func_base
+
+    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=:
+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_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_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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:503"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_189
+#AT_START_190
+at_fn_group_banner 190 'DMRTest.at:506' \
+  "trans vol_1_ce_1.xml scale(\\\$Byte(20:1,2,3,4),10)  vol_1_ce_1.xml.7.func_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "190. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    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/vol_1_ce_1.xml.7.func_base
+
+    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=:
+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_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_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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:506"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_190
+#AT_START_191
+at_fn_group_banner 191 'DMRTest.at:507' \
+  "trans vol_1_ce_1.xml scale(\\\$Int8(20:10,11,12,-9),10)  vol_1_ce_1.xml.8.func_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "191. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    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/vol_1_ce_1.xml.8.func_base
+
+    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=:
+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_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_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"
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:507"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_191
+#AT_START_192
+at_fn_group_banner 192 'DMRTest.at:508' \
+  "trans vol_1_ce_1.xml scale(\\\$UInt16(20:1,2,3,4),10)  vol_1_ce_1.xml.9.func_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "192. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    input=$abs_srcdir/dmr-testsuite/vol_1_ce_1.xml
+    fe="scale(\$UInt16(20:1,2,3,4),10)"
+    ce=""
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/vol_1_ce_1.xml.9.func_base
+
+    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=:
+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_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_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"
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:508"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_192
+#AT_START_193
+at_fn_group_banner 193 'DMRTest.at:509' \
+  "trans vol_1_ce_1.xml scale(\\\$Int16(20:1,2,3,-4),10)  vol_1_ce_1.xml.10.func_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "193. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    input=$abs_srcdir/dmr-testsuite/vol_1_ce_1.xml
+    fe="scale(\$Int16(20:1,2,3,-4),10)"
+    ce=""
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/vol_1_ce_1.xml.10.func_base
+
+    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=:
+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_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_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"
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:509"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_193
+#AT_START_194
+at_fn_group_banner 194 'DMRTest.at:510' \
+  "trans vol_1_ce_1.xml scale(\\\$UInt32(20:1,2,3,4),10)  vol_1_ce_1.xml.11.func_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "194. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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=:
+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_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_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"
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:510"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_194
+#AT_START_195
+at_fn_group_banner 195 'DMRTest.at:511' \
+  "trans vol_1_ce_1.xml scale(\\\$Int32(20:1,2,3,-4),10)  vol_1_ce_1.xml.12.func_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "195. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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=:
+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_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_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"
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:511"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_195
+#AT_START_196
+at_fn_group_banner 196 'DMRTest.at:512' \
+  "trans vol_1_ce_1.xml scale(\\\$UInt64(20:1,2,3,0xffffffffffffffff),1)  vol_1_ce_1.xml.13.func_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "196. $at_setup_line: testing $at_desc ..."
+  $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
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:512: \$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:512"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:512"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:512: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:512"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:512"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:512: \$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:512"
+( $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"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:512"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:512: 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:512"
+( $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:512"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_196
+#AT_START_197
+at_fn_group_banner 197 'DMRTest.at:513' \
+  "trans vol_1_ce_1.xml scale(\\\$Int64(20:1,2,3,0x7fffffffffffffff),1)  vol_1_ce_1.xml.14.func_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "197. $at_setup_line: testing $at_desc ..."
+  $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
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:513: \$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:513"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:513"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:513: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:513"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:513"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:513: \$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:513"
+( $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"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:513"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:513: 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:513"
+( $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:513"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_197
+#AT_START_198
+at_fn_group_banner 198 'DMRTest.at:514' \
+  "trans vol_1_ce_1.xml scale(\\\$Float32(20:1,2,3,4.55),10)  vol_1_ce_1.xml.15.func_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "198. $at_setup_line: testing $at_desc ..."
+  $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
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:514: \$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:514"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:514"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:514: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:514"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:514"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:514: \$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:514"
+( $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"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:514"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:514: 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:514"
+( $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:514"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_198
+#AT_START_199
+at_fn_group_banner 199 'DMRTest.at:515' \
+  "trans vol_1_ce_1.xml scale(\\\$Float64(20:1,2,3,4.55),10)  vol_1_ce_1.xml.16.func_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "199. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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=:
+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_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_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"
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:515"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_199
+#AT_START_200
+at_fn_group_banner 200 'DMRTest.at:519' \
+  "trans vol_1_ce_10.xml scale(lat,10)  vol_1_ce_10.xml.1.func_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "200. $at_setup_line: testing $at_desc ..."
+  $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
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:519: \$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:519"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:519"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:519: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:519"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:519"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:519: \$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:519"
+( $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"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:519"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:519: 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:519"
+( $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:519"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_200
+#AT_START_201
+at_fn_group_banner 201 'DMRTest.at:520' \
+  "trans vol_1_ce_10.xml scale(lat,10);scale(lon,10)  vol_1_ce_10.xml.2.func_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "201. $at_setup_line: testing $at_desc ..."
+  $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
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:520: \$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:520"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:520"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:520: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:520"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:520"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:520: \$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:520"
+( $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"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:520"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:520: 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:520"
+( $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:520"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_201
+#AT_START_202
+at_fn_group_banner 202 'DMRTest.at:521' \
+  "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_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "202. $at_setup_line: testing $at_desc ..."
+  $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
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:521: \$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:521"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:521"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:521: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:521"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:521"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:521: \$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:521"
+( $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"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:521"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:521: 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:521"
+( $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:521"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_202
+#AT_START_203
+at_fn_group_banner 203 'DMRTest.at:528' \
+  "filter test_simple_7.xml s test_simple_7.xml.f.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "203. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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=:
+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_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_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=:
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:528"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_203
+#AT_START_204
+at_fn_group_banner 204 'DMRTest.at:530' \
+  "filter test_simple_7.xml s|i1==1024 test_simple_7.xml.f1.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "204. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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=:
+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_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_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=:
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:530"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_204
+#AT_START_205
+at_fn_group_banner 205 'DMRTest.at:531' \
+  "filter test_simple_7.xml s|i1!=1024 test_simple_7.xml.f2.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "205. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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=:
+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_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_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=:
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:531"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_205
+#AT_START_206
+at_fn_group_banner 206 'DMRTest.at:532' \
+  "filter test_simple_7.xml s|i1<=1024 test_simple_7.xml.f3.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "206. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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=:
+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_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_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=:
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:532"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_206
+#AT_START_207
+at_fn_group_banner 207 'DMRTest.at:533' \
+  "filter test_simple_7.xml s|i1<1024 test_simple_7.xml.f4.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "207. $at_setup_line: testing $at_desc ..."
+  $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
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:533: \$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:533"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:533"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:533: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:533"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:533"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:533: \$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:533"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:533"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:533: diff -b -B \$baseline stdout"
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:533"
+( $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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:533"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_207
+#AT_START_208
+at_fn_group_banner 208 'DMRTest.at:534' \
+  "filter test_simple_7.xml s|i1<=1024 test_simple_7.xml.f5.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "208. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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=:
+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_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_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=:
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:534"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_208
+#AT_START_209
+at_fn_group_banner 209 'DMRTest.at:535' \
+  "filter test_simple_7.xml s|i1>1024 test_simple_7.xml.f6.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "209. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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=:
+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_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_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=:
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:535"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_209
+#AT_START_210
+at_fn_group_banner 210 'DMRTest.at:536' \
+  "filter test_simple_7.xml s|i1>=1024 test_simple_7.xml.f7.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "210. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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=:
+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_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_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=:
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:536"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_210
+#AT_START_211
+at_fn_group_banner 211 'DMRTest.at:538' \
+  "filter test_simple_7.xml s|1024<i1 test_simple_7.xml.f8.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "211. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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=:
+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_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_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=:
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:538"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_211
+#AT_START_212
+at_fn_group_banner 212 'DMRTest.at:539' \
+  "filter test_simple_7.xml s|1024<=i1<=32768 test_simple_7.xml.f9.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "212. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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=:
+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_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_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=:
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:539"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_212
+#AT_START_213
+at_fn_group_banner 213 'DMRTest.at:540' \
+  "filter test_simple_7.xml s|i1>=1024.0 test_simple_7.xml.fa.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "213. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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=:
+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_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_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=:
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:540"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_213
+#AT_START_214
+at_fn_group_banner 214 'DMRTest.at:542' \
+  "filter test_simple_7.xml s|s==\\\"Silly test string: 2\\\" test_simple_7.xml.fs1.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "214. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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=:
+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_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_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=:
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:542"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_214
+#AT_START_215
+at_fn_group_banner 215 'DMRTest.at:543' \
+  "filter test_simple_7.xml s|s!=\\\"Silly test string: 2\\\" test_simple_7.xml.fs2.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "215. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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=:
+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_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_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=:
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:543"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_215
+#AT_START_216
+at_fn_group_banner 216 'DMRTest.at:544' \
+  "filter test_simple_7.xml s|s<\\\"Silly test string: 2\\\" test_simple_7.xml.fs3.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "216. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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=:
+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_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_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=:
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:544"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_216
+#AT_START_217
+at_fn_group_banner 217 'DMRTest.at:545' \
+  "filter test_simple_7.xml s|s<=\\\"Silly test string: 2\\\" test_simple_7.xml.fs4.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "217. $at_setup_line: testing $at_desc ..."
+  $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
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:545: \$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:545"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:545"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:545: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:545"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:545"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:545: \$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:545"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:545"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:545: diff -b -B \$baseline stdout"
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:545"
+( $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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:545"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_217
+#AT_START_218
+at_fn_group_banner 218 'DMRTest.at:546' \
+  "filter test_simple_7.xml s|s>\\\"Silly test string: 2\\\" test_simple_7.xml.fs5.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "218. $at_setup_line: testing $at_desc ..."
+  $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
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:546: \$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:546"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:546"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:546: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:546"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:546"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:546: \$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:546"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:546"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:546: diff -b -B \$baseline stdout"
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:546"
+( $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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:546"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_218
+#AT_START_219
+at_fn_group_banner 219 'DMRTest.at:547' \
+  "filter test_simple_7.xml s|s>=\\\"Silly test string: 2\\\" test_simple_7.xml.fs6.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "219. $at_setup_line: testing $at_desc ..."
+  $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
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:547: \$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:547"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:547"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:547: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:547"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:547"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:547: \$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:547"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:547"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:547: diff -b -B \$baseline stdout"
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:547"
+( $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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:547"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_219
+#AT_START_220
+at_fn_group_banner 220 'DMRTest.at:548' \
+  "filter test_simple_7.xml s|s~=\\\".*2\\\" test_simple_7.xml.fs7.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "220. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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=:
+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_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_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=:
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:548"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_220
+#AT_START_221
+at_fn_group_banner 221 'DMRTest.at:552' \
+  "filter test_simple_7.xml s{i1}|i1<32768 test_simple_7.xml.g1.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "221. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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=:
+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_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_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=:
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:552"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_221
+#AT_START_222
+at_fn_group_banner 222 'DMRTest.at:553' \
+  "filter test_simple_7.xml s{i1}|s<=\\\"Silly test string: 2\\\" test_simple_7.xml.g1.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "222. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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=:
+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_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_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=:
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:553"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_222
+#AT_START_223
+at_fn_group_banner 223 'DMRTest.at:556' \
+  "filter test_simple_8.1.xml outer test_simple_8.1.xml.f1.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "223. $at_setup_line: testing $at_desc ..."
+  $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
+
+    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=:
+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_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_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=:
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:556"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_223
+#AT_START_224
+at_fn_group_banner 224 'DMRTest.at:557' \
+  "filter test_simple_8.1.xml outer{x;y} test_simple_8.1.xml.f2.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "224. $at_setup_line: testing $at_desc ..."
+  $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
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:557: \$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:557"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:557"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:557: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:557"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:557"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:557: \$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:557"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:557"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:557: diff -b -B \$baseline stdout"
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:557"
+( $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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:557"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_224
+#AT_START_225
+at_fn_group_banner 225 'DMRTest.at:558' \
+  "filter test_simple_8.1.xml outer{x;y;inner} test_simple_8.1.xml.f3.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "225. $at_setup_line: testing $at_desc ..."
+  $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
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:558: \$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:558"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:558"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:558: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:558"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:558"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:558: \$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:558"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:558"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:558: diff -b -B \$baseline stdout"
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:558"
+( $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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:558"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_225
+#AT_START_226
+at_fn_group_banner 226 'DMRTest.at:559' \
+  "filter test_simple_8.1.xml outer{x;y;inner|i1<1000} test_simple_8.1.xml.f4.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "226. $at_setup_line: testing $at_desc ..."
+  $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
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:559: \$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:559"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:559"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:559: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:559"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:559"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:559: \$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:559"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:559"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:559: diff -b -B \$baseline stdout"
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:559"
+( $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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:559"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_226
+#AT_START_227
+at_fn_group_banner 227 'DMRTest.at:560' \
+  "filter test_simple_8.1.xml outer{x;y;inner|i1<1000}|x<0.0 test_simple_8.1.xml.f5.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "227. $at_setup_line: testing $at_desc ..."
+  $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
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:560: \$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:560"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:560"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:560: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:560"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:560"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:560: \$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:560"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:560"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:560: diff -b -B \$baseline stdout"
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:560"
+( $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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:560"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_227
+#AT_START_228
+at_fn_group_banner 228 'DMRTest.at:567' \
+  "filter names_with_spaces.dmr /u names_with_spaces.dmr.1.trans_base" ""
+at_xfail=no
+      test "Xpass" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "228. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    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 :
+
+        { set +x
+$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>@@' "
+at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:567"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:567"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:567: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:567"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:567"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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>@@' "
+at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:567"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:567"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:567: diff -b -B \$baseline stdout"
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:567"
+( $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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:567"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_228
+#AT_START_229
+at_fn_group_banner 229 'DMRTest.at:568' \
+  "filter names_with_spaces.dmr /inst2/u names_with_spaces.dmr.2.trans_base" ""
+at_xfail=no
+      test "Xxfail" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "229. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    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 :
+
+        { set +x
+$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>@@' "
+at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:568"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:568"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:568: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:568"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:568"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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>@@' "
+at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:568"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:568"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:568: diff -b -B \$baseline stdout"
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:568"
+( $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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:568"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_229
+#AT_START_230
+at_fn_group_banner 230 'DMRTest.at:569' \
+  "filter names_with_spaces.dmr /inst2/Point.x names_with_spaces.dmr.3.trans_base" ""
+at_xfail=no
+      test "Xxfail" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "230. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    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 :
+
+        { set +x
+$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>@@' "
+at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:569"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:569"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:569: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:569"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:569"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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>@@' "
+at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:569"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:569"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:569: diff -b -B \$baseline stdout"
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:569"
+( $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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:569"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_230
+#AT_START_231
+at_fn_group_banner 231 'DMRTest.at:571' \
+  "filter names_with_spaces2.dmr /inst2/\\\"Point Break\\\".x names_with_spaces2.dmr.1.trans_base" ""
+at_xfail=no
+      test "Xxfail" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "231. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    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 :
+
+        { set +x
+$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>@@' "
+at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:571"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:571"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:571: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:571"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:571"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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>@@' "
+at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:571"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:571"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:571: diff -b -B \$baseline stdout"
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:571"
+( $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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:571"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_231
+#AT_START_232
+at_fn_group_banner 232 'DMRTest.at:572' \
+  "filter names_with_spaces2.dmr /inst2/Point%20Break.x names_with_spaces2.dmr.1.trans_base" ""
+at_xfail=no
+      test "Xxfail" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "232. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    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 :
+
+        { set +x
+$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>@@' "
+at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:572"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:572"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:572: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:572"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:572"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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>@@' "
+at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:572"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:572"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:572: diff -b -B \$baseline stdout"
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:572"
+( $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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:572"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_232
+#AT_START_233
+at_fn_group_banner 233 'DMRTest.at:573' \
+  "filter names_with_spaces2.dmr /inst2/\\\"Point%20Break\\\".x names_with_spaces2.dmr.1.trans_base" ""
+at_xfail=no
+      test "Xxfail" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "233. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    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 :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:573: \$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:573"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:573"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:573: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:573"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:573"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:573: \$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:573"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:573"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:573: diff -b -B \$baseline stdout"
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:573"
+( $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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:573"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_233
+#AT_START_234
+at_fn_group_banner 234 'DMRTest.at:575' \
+  "filter names_with_spaces3.dmr /inst2/\\\"New Group\\\"/x names_with_spaces3.dmr.1.trans_base" ""
+at_xfail=no
+      test "Xxfail" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "234. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    input=$abs_srcdir/dmr-testsuite/names_with_spaces3.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 :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:575: \$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:575"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:575"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:575: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:575"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:575"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:575: \$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:575"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:575"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:575: diff -b -B \$baseline stdout"
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:575"
+( $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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:575"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_234
+#AT_START_235
+at_fn_group_banner 235 'DMRTest.at:576' \
+  "filter names_with_spaces3.dmr /inst2/New%20Group/x names_with_spaces3.dmr.1.trans_base" ""
+at_xfail=no
+      test "Xxfail" = "Xxfail" && at_xfail=yes
+(
+  $as_echo "235. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    input=$abs_srcdir/dmr-testsuite/names_with_spaces3.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 :
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:576: \$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:576"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:576"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:576: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:576"
+( $at_check_trace; mv stdout $baseline.tmp
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_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:576"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+else
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:576: \$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:576"
+( $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=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:576"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+        { set +x
+$as_echo "$at_srcdir/DMRTest.at:576: diff -b -B \$baseline stdout"
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:576"
+( $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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:576"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_235
diff --git a/tests/DMRTest.at b/tests/DMRTest.at
new file mode 100644
index 0000000..eb33398
--- /dev/null
+++ b/tests/DMRTest.at
@@ -0,0 +1,576 @@
+# Process with autom4te to create an -*- Autotest -*- test suite.
+
+AT_INIT([dmr-test])
+
+AT_ARG_OPTION_ARG([baselines],
+    [--baselines=yes|no   Build the baseline file for parser test 'arg'],
+    [echo "baselines set to $at_arg_baselines";
+     baselines=$at_arg_baselines],[baselines=])
+
+# There is no easy way to write a --generate... option for the function expression
+# tests. Better to do it by hand... Use ... .num.func_base as the extension for the
+# baselines.
+ 
+# Usage DMR_PARSE $1 <test_input> $2 <pass/xfail>
+# The baseline is assumed to be $1.baseline
+m4_define([DMR_PARSE], [
+
+    AT_SETUP([parse $1])
+    AT_KEYWORDS([parse])
+    
+    input=$abs_srcdir/$1
+    baseline=$input.baseline
+    
+    AS_IF([test -n "$baselines" -a x$baselines = xyes],
+        [
+        AT_CHECK([$abs_builddir/dmr-test -x -p $input || true], [], [stdout], [])
+        AT_CHECK([mv stdout $baseline.tmp])
+        ],
+        [
+        AT_CHECK([$abs_builddir/dmr-test -x -p $input || true], [], [stdout], [stderr])
+        AT_CHECK([diff -b -B $baseline stdout || diff -b -B $baseline stderr], [], [ignore],[],[])
+        AT_XFAIL_IF([test "$2" = "xfail"])
+        ])
+    
+    AT_CLEANUP
+])
+
+# Usage DMR_TRANS $1 <test_input> $2 <pass/xfail>
+# This code tests the values printed when the received document is decoded.
+m4_define([DMR_TRANS], [
+    # Test transmitting data (i.e., writing the Data DMR to a file and then decoding it)
+    AT_SETUP([trans $1])
+    AT_KEYWORDS([trans])
+    
+    # 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/$1
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/$1.trans_base
+    
+    AS_IF([test -n "$baselines" -a x$baselines = xyes],
+        [
+        AT_CHECK([$abs_builddir/dmr-test -x -t $input], [0], [stdout], [ignore])
+        AT_CHECK([mv stdout $baseline.tmp])
+        ],
+        [
+        AT_CHECK([$abs_builddir/dmr-test -x -t $input || true], [], [stdout], [stderr])
+        AT_CHECK([diff -b -B $baseline stdout || diff -b -B $baseline stderr], [], [ignore],[],[])
+    
+        AT_XFAIL_IF([test "$2" = "xfail"])
+        ])
+        
+    AT_CLEANUP
+])
+
+# Usage DMR_TRANS_UNIVERSAL $1 <test_input> $2 <pass/xfail>
+# This code tests the values printed when the received document is decoded.
+m4_define([DMR_TRANS_UNIVERSAL], [
+    # Test transmitting data (i.e., writing the Data DMR to a file and then decoding it)
+    AT_SETUP([trans $1])
+    AT_KEYWORDS([trans])
+    
+    # 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/$1
+    baseline=$abs_srcdir/dmr-testsuite/universal/$1.trans_base
+    
+    AS_IF([test -n "$baselines" -a x$baselines = xyes],
+        [
+        echo "The command <>$abs_builddir/dmr-test -x -t $input $checksum_filt<>"
+        AT_CHECK([$abs_builddir/dmr-test -x -t $input | sed 's@<Value>[[0-9a-f]][[0-9a-f]]*</Value>@@' ], [0], [stdout], [ignore])
+        AT_CHECK([mv stdout $baseline.tmp])
+        ],
+        [
+        AT_CHECK([$abs_builddir/dmr-test -x -t $input | sed 's@<Value>[[0-9a-f]][[0-9a-f]]*</Value>@@' ], [], [stdout], [ignore])
+        AT_CHECK([diff -b -B $baseline stdout], [], [ignore],[],[])
+    
+        AT_XFAIL_IF([test "$2" = "xfail"])
+        ])
+        
+    AT_CLEANUP
+])
+
+# Usage DMR_TRANS_CE <test_input> <ce> <baseline> <pass/xfail>
+# This code tests the values printed when the received document is decoded.
+m4_define([DMR_TRANS_CE], [
+    # Test transmitting data (i.e., writing the Data DMR to a file and then decoding it)
+    # after applying a constraint expression to the source DMR.
+    AT_SETUP([trans ce $1 $2 $3])
+    AT_KEYWORDS([trans_ce])
+    
+    # See above regarding $WORD_ORDER
+    input=$abs_srcdir/dmr-testsuite/$1
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/$3
+
+    AS_IF([test -n "$baselines" -a x$baselines = xyes],
+        [
+        AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "$2"], [], [stdout], [])
+        AT_CHECK([mv stdout $baseline.tmp])
+        ],
+        [
+        AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "$2" || true], [], [stdout], [stderr])
+        AT_CHECK([diff -b -B $baseline stdout || diff -b -B $baseline stderr], [], [ignore],[],[])
+        AT_XFAIL_IF([test "X$4" = "Xxfail"])
+        ])
+    
+    AT_CLEANUP
+])
+
+# Usage DMR_TRANS_FUNC_CE <test_input> <func expr> <ce> <baseline> <pass/xfail>
+# This code tests the values printed when the received document is decoded.
+m4_define([DMR_TRANS_FUNC_CE], [
+    # Test transmitting data (i.e., writing the Data DMR to a file and then decoding it)
+    # after applying a function and constraint expression to the source DMR. If either
+    # the function or constraint are empty strings, they will be ignored.
+    AT_SETUP([trans $1 $2 $3 $4])
+    AT_KEYWORDS([trans_func_ce])
+    
+    input=$abs_srcdir/dmr-testsuite/$1
+    fe="$2"
+    ce="$3"
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/$4
+    
+    AS_IF([test -n "$baselines" -a x$baselines = xyes],
+        [
+        AT_CHECK([$abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce"], [], [stdout], [])
+        AT_CHECK([mv stdout $baseline.tmp])
+        ],
+        [
+        AT_CHECK([$abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true], [], [stdout], [stderr])
+        AT_CHECK([diff -b -B $baseline stdout || diff -b -B $baseline stderr], [], [ignore],[],[])
+        AT_XFAIL_IF([test "X$5" = "Xxfail"])
+        ])
+
+    AT_CLEANUP
+])
+
+# Usage DMR_TRANS_SERIES_CE <test_input> <ce> <baseline> <pass/xfail>
+# This macro tests CEs using the series values from the Test classes.
+# It's intended to be used to test the filter expressions.
+# 
+# This is a 'universal' test - the baselines do not differ for word order
+# because the checksums are removed. jhrg 5/5/16
+m4_define([DMR_TRANS_SERIES_CE], [
+    AT_SETUP([filter $1 $2 $3])
+    AT_KEYWORDS([filter])
+    
+    input=$abs_srcdir/dmr-testsuite/$1
+    ce="$2"
+    baseline=$abs_srcdir/dmr-testsuite/universal/$3
+    
+    AS_IF([test -n "$baselines" -a x$baselines = xyes],
+        [
+        AT_CHECK([$abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[[0-9a-f]][[0-9a-f]]*</Value>@@' ], [], [stdout], [])
+        AT_CHECK([mv stdout $baseline.tmp])
+        ],
+        [
+        AT_CHECK([$abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[[0-9a-f]][[0-9a-f]]*</Value>@@' ], [], [stdout], [])
+        AT_CHECK([diff -b -B $baseline stdout], [], [ignore],[],[])
+        AT_XFAIL_IF([test "X$4" = "Xxfail"])
+        ])
+
+    AT_CLEANUP
+])
+
+# Usage DMR_INTERN $1 <test_input> $2 <pass/xfail>
+# This code tests the values printed when the received document is decoded.
+m4_define([DMR_INTERN], [
+    # Test reading/interning data (i.e., using the read() methods to load up objects with
+    # values without running them through serialize/deserialize)
+    AT_SETUP([intern $1])
+    AT_KEYWORDS([intern])
+    
+    # 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/$1
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/$1.intern_base
+
+    AS_IF([test -n "$baselines" -a x$baselines = xyes],
+        [
+        AT_CHECK([$abs_builddir/dmr-test -x -i $input], [], [stdout], [])
+        AT_CHECK([mv stdout $baseline.tmp])
+        ],
+        [
+        AT_CHECK([$abs_builddir/dmr-test -x -i $input || true], [], [stdout], [stderr])
+        AT_CHECK([diff -b -B $baseline stdout], [], [ignore], [], [])
+    
+        AT_XFAIL_IF([test "$2" = "xfail"])
+        ])
+        
+    AT_CLEANUP
+])
+
+DMR_PARSE([dmr-testsuite/test_simple_1.xml], [pass])
+DMR_PARSE([dmr-testsuite/test_simple_2.xml], [pass])
+DMR_PARSE([dmr-testsuite/test_simple_3.xml], [pass])
+
+DMR_PARSE([dmr-testsuite/test_simple_3_error_1.xml], [pass])
+DMR_PARSE([dmr-testsuite/test_simple_3_error_2.xml], [pass])
+DMR_PARSE([dmr-testsuite/test_simple_3_error_3.xml], [pass])
+
+DMR_PARSE([dmr-testsuite/test_simple_4.xml], [pass])
+DMR_PARSE([dmr-testsuite/test_simple_5.xml], [pass])
+DMR_PARSE([dmr-testsuite/test_simple_6.xml], [pass])
+DMR_PARSE([dmr-testsuite/test_simple_7.xml], [pass])
+DMR_PARSE([dmr-testsuite/test_simple_8.xml], [pass])
+DMR_PARSE([dmr-testsuite/test_simple_9.xml], [pass])
+DMR_PARSE([dmr-testsuite/test_simple_9.1.xml], [pass])
+DMR_PARSE([dmr-testsuite/test_simple_10.xml], [pass])
+
+DMR_PARSE([dmr-testsuite/test_array_1.xml], [pass])
+DMR_PARSE([dmr-testsuite/test_array_2.xml], [pass])
+DMR_PARSE([dmr-testsuite/test_array_3.xml], [pass])
+DMR_PARSE([dmr-testsuite/test_array_4.xml], [pass])
+DMR_PARSE([dmr-testsuite/test_array_5.xml], [pass])
+DMR_PARSE([dmr-testsuite/test_array_6.xml], [pass])
+DMR_PARSE([dmr-testsuite/test_array_7.xml], [pass])
+DMR_PARSE([dmr-testsuite/test_array_8.xml], [pass])
+DMR_PARSE([dmr-testsuite/test_array_10.xml], [pass])
+DMR_PARSE([dmr-testsuite/test_array_11.xml], [pass])
+
+DMR_PARSE([dmr-testsuite/ignore_foreign_xml_1.xml], [pass])
+DMR_PARSE([dmr-testsuite/ignore_foreign_xml_2.xml], [pass])
+DMR_PARSE([dmr-testsuite/ignore_foreign_xml_3.xml], [pass])
+
+# Transmit: Test building and then decoding the response
+# These calls don't include the 'dmr-testsuite' directory because the tests
+# need to choose baselines based on the word order. We could probably re-
+# organize these so that the dir names where here - which I prefer, but
+# the new 'baselines' option makes it far easier to build the baselines, and
+# that was the primary reason for keeping the directory names here and explicit;
+# it made it much easier to sort out what input to use when building a baseline.
+
+DMR_TRANS([test_simple_1.xml], [pass])
+DMR_TRANS([test_simple_2.xml], [pass])
+DMR_TRANS([test_simple_3.xml], [pass])
+DMR_TRANS([test_simple_4.xml], [pass])
+DMR_TRANS([test_simple_5.xml], [pass])
+DMR_TRANS([test_simple_6.xml], [pass])
+DMR_TRANS([test_simple_7.xml], [pass])
+DMR_TRANS([test_simple_8.xml], [xfail])
+DMR_TRANS([test_simple_9.xml], [pass])
+DMR_TRANS([test_simple_9.1.xml], [pass])
+DMR_TRANS([test_simple_10.xml], [pass])
+
+DMR_TRANS([test_array_1.xml], [pass])
+DMR_TRANS([test_array_2.xml], [pass])
+DMR_TRANS([test_array_3.xml], [pass])
+DMR_TRANS([test_array_4.xml], [pass])
+DMR_TRANS([test_array_5.xml], [pass])
+DMR_TRANS([test_array_6.xml], [pass])
+DMR_TRANS([test_array_7.xml], [pass])
+DMR_TRANS([test_array_8.xml], [pass])
+DMR_TRANS([test_array_10.xml], [pass])
+DMR_TRANS([test_array_11.xml], [pass])
+
+DMR_INTERN([test_simple_1.xml], [pass])
+DMR_INTERN([test_simple_2.xml], [pass])
+DMR_INTERN([test_simple_3.xml], [pass])
+DMR_INTERN([test_simple_4.xml], [pass])
+DMR_INTERN([test_simple_5.xml], [pass])
+DMR_INTERN([test_simple_6.xml], [pass])
+DMR_INTERN([test_simple_7.xml], [pass])
+DMR_INTERN([test_simple_8.xml], [pass])
+DMR_INTERN([test_simple_9.xml], [pass])
+DMR_INTERN([test_simple_9.1.xml], [pass])
+DMR_INTERN([test_simple_10.xml], [pass])
+
+DMR_INTERN([test_array_1.xml], [pass])
+DMR_INTERN([test_array_2.xml], [pass])
+DMR_INTERN([test_array_3.xml], [pass])
+DMR_INTERN([test_array_4.xml], [pass])
+DMR_INTERN([test_array_5.xml], [pass])
+DMR_INTERN([test_array_6.xml], [pass])
+DMR_INTERN([test_array_7.xml], [pass])
+DMR_INTERN([test_array_8.xml], [pass])
+DMR_INTERN([test_array_10.xml], [pass])
+DMR_INTERN([test_array_11.xml], [pass])
+
+# Test zero-length arrays. jhrg 1/28/16
+DMR_PARSE([dmr-testsuite/test_array_9.xml], [pass])
+DMR_PARSE([dmr-testsuite/test_array_12.xml], [pass])
+DMR_PARSE([dmr-testsuite/test_array_13.xml], [pass])
+DMR_PARSE([dmr-testsuite/test_array_14.xml], [pass])
+
+# Test empty Structures. jhrg 1/29/16
+DMR_PARSE([dmr-testsuite/test_simple_6.2.xml], [pass])
+DMR_PARSE([dmr-testsuite/test_simple_6.3.xml], [pass])
+
+DMR_TRANS([test_array_9.xml], [pass])
+DMR_TRANS([test_array_12.xml], [pass])
+DMR_TRANS([test_array_13.xml], [pass])
+DMR_TRANS([test_array_14.xml], [pass])
+
+DMR_TRANS([test_simple_6.2.xml], [pass])
+DMR_TRANS([test_simple_6.3.xml], [pass])
+
+# Test out the 'universal' tests
+DMR_TRANS_UNIVERSAL([test_array_9.xml], [pass])
+DMR_TRANS_UNIVERSAL([test_array_12.xml], [pass])
+DMR_TRANS_UNIVERSAL([test_array_13.xml], [pass])
+DMR_TRANS_UNIVERSAL([test_array_14.xml], [pass])
+
+DMR_TRANS_UNIVERSAL([test_simple_6.2.xml], [pass])
+DMR_TRANS_UNIVERSAL([test_simple_6.3.xml], [pass])
+
+DMR_INTERN([test_array_9.xml], [pass])
+DMR_INTERN([test_array_12.xml], [pass])
+DMR_INTERN([test_array_13.xml], [pass])
+DMR_INTERN([test_array_14.xml], [pass])
+
+DMR_INTERN([test_simple_6.2.xml], [pass])
+DMR_INTERN([test_simple_6.3.xml], [pass])
+
+# These tests only work for little-endian machines at this time. If baselines for
+# big-endian machines are built, this AS_IF can be removed.
+
+# Added these tests as part of https://opendap.atlassian.net/browse/HYRAX-98.
+# jhrg 4/13/16
+ 
+AS_IF([test "$WORD_ORDER" = "little-endian"],
+[
+DMR_TRANS_CE([test_array_3.1.dmr], [row;x], [test_array_3.1.dmr.1.trans_base], [pass])
+DMR_TRANS_CE([test_array_3.1.dmr], [row=[[2:3]];x], [test_array_3.1.dmr.2.trans_base], [pass])
+DMR_TRANS_CE([test_array_3.1.dmr], [row=[[2:3]];x[[0:1]]], [test_array_3.1.dmr.3.trans_base], [pass])
+DMR_TRANS_CE([test_array_3.1.dmr], [x[[0:1]]], [test_array_3.1.dmr.4.trans_base], [pass])
+DMR_TRANS_CE([test_array_3.1.dmr], [x], [test_array_3.1.dmr.5.trans_base], [pass])
+],
+[])
+
+# Test various facets of the CE parser and evaluation engine
+
+DMR_TRANS_CE([test_array_4.xml], [a], [test_array_4.xml.1.trans_base], [pass])
+DMR_TRANS_CE([test_array_4.xml], [a[[]][[]] ], [test_array_4.xml.1.trans_base], [pass])
+
+DMR_TRANS_CE([test_array_4.xml], [/row=[[0:1]];/col=[[3]];a],  [test_array_4.xml.3.trans_base], [pass])
+    
+DMR_TRANS_CE([test_array_4.xml], [/row=[[0:1]];/col=[[3]];a[[]][[]] ],  [test_array_4.xml.4.trans_base], [pass])
+    
+DMR_TRANS_CE([test_array_4.xml], [/row=[[0:1]];/col=[[3]];a[[]][[]];b[[0]][[]];c[[0:]][[0:]] ],  [test_array_4.xml.5.trans_base], [pass])
+    
+DMR_TRANS_CE([test_array_4.xml], [x[[]][[]] ], [/test_array_4.xml.6.trans_base], [pass])
+DMR_TRANS_CE([test_array_4.xml], [/row=[[0:1]];x[[]][[]] ], [test_array_4.xml.7.trans_base], [pass])
+
+DMR_TRANS_CE([test_array_4.xml], [c[[2:]][[2:]] ], [test_array_4.xml.8.trans_base], [pass])
+    
+DMR_TRANS_CE([test_simple_6.xml], [s], [test_simple_6.xml.1.trans_base], [pass])
+DMR_TRANS_CE([test_simple_6.xml], [s.i1], [test_simple_6.xml.2.trans_base], [pass])
+DMR_TRANS_CE([test_simple_6.xml], [s.s], [test_simple_6.xml.3.trans_base], [pass])
+DMR_TRANS_CE([test_simple_6.1.xml], [s.inner.i2], [test_simple_6.1.xml.1.trans_base], [pass])
+
+DMR_TRANS_CE([test_simple_6.xml], [s{i1}], [test_simple_6.xml.2.trans_base], [pass])
+DMR_TRANS_CE([test_simple_6.xml], [s{s}], [test_simple_6.xml.3.trans_base], [pass])
+DMR_TRANS_CE([test_simple_6.1.xml], [s{inner.i2}], [test_simple_6.1.xml.1.trans_base], [pass])
+DMR_TRANS_CE([test_simple_6.1.xml], [s{inner{i2}}], [test_simple_6.1.xml.1.trans_base], [pass])
+
+# test_array_6 holds a 2D array of Structure
+DMR_TRANS_CE([test_array_6.xml], [a], [test_array_6.xml.1.trans_base], [pass])
+DMR_TRANS_CE([test_array_6.xml], [a[[]][[]] ], [test_array_6.xml.1.trans_base], [pass])
+DMR_TRANS_CE([test_array_6.xml], [/row=[[0:1]];a[[]][[]] ], [test_array_6.xml.2.trans_base], [pass])
+DMR_TRANS_CE([test_array_6.xml], [/row=[[0:1]];a[[]][[1:2]] ], [test_array_6.xml.3.trans_base], [pass])
+
+# test_array holds a Structure that has a 2D array for a field
+DMR_TRANS_CE([test_array_6.2.xml], [a], [test_array_6.2.xml.1.trans_base], [pass])
+DMR_TRANS_CE([test_array_6.2.xml], [a{i;j}], [test_array_6.2.xml.1.trans_base], [pass])
+DMR_TRANS_CE([test_array_6.2.xml], [a.i], [test_array_6.2.xml.2.trans_base], [pass])
+DMR_TRANS_CE([test_array_6.2.xml], [a{i}], [test_array_6.2.xml.2.trans_base], [pass])
+DMR_TRANS_CE([test_array_6.2.xml], [a.i[[0]][[1:2]] ], [test_array_6.2.xml.3.trans_base], [pass])
+DMR_TRANS_CE([test_array_6.2.xml], [a{i[[0]][[1:2]]} ], [test_array_6.2.xml.3.trans_base], [pass])
+DMR_TRANS_CE([test_array_6.2.xml], [/row=[[0:1]];a.i[[]][[1:2]] ], [test_array_6.2.xml.4.trans_base], [pass])
+DMR_TRANS_CE([test_array_6.2.xml], [/row=[[0:1]];a{i[[]][[1:2]]} ], [test_array_6.2.xml.4.trans_base], [pass])
+
+DMR_TRANS_CE([test_array_6.2.xml], [a.j], [test_array_6.2.xml.5.trans_base], [pass])
+
+# test_array_6.1 is an array of Structure that holds an array and a scalar
+DMR_TRANS_CE([test_array_6.1.xml], [a], [test_array_6.1.xml.1.trans_base], [pass])
+
+# slice the structure but not the field
+DMR_TRANS_CE([test_array_6.1.xml], [/row=[[1:2]];a[[]][[0]] ], [test_array_6.1.xml.2.trans_base], [pass])
+DMR_TRANS_CE([test_array_6.1.xml], [/row=[[1:2]];a[[]][[0]]{i;j} ], [test_array_6.1.xml.2.trans_base], [pass])
+# Do we really need the FQN?
+DMR_TRANS_CE([test_array_6.1.xml], [row=[[1:2]];a[[]][[0]]{i;j} ], [test_array_6.1.xml.2.trans_base], [pass])
+
+# slice the field but not the structure
+DMR_TRANS_CE([test_array_6.1.xml], [a{i[[1:2]][[1:3]];j} ], [test_array_6.1.xml.3.trans_base], [pass])
+DMR_TRANS_CE([test_array_6.1.xml], [a[[]][[]]{i[[1:2]][[1:3]];j} ], [test_array_6.1.xml.3.trans_base], [pass])
+
+# slice both the structure and the array it contains using both the shared dim and 
+# a local slice for each
+DMR_TRANS_CE([test_array_6.1.xml], [/row=[[1]];a[[]][[0]]{i[[]][[0:1]]} ], [test_array_6.1.xml.4.trans_base], [pass])
+
+# Test sequences and arrays of sequences
+DMR_TRANS_CE([test_simple_7.xml], [s], [test_simple_7.xml.1.trans_base], [pass])
+DMR_TRANS_CE([test_simple_7.xml], [s{i1;s}], [test_simple_7.xml.1.trans_base], [pass])
+
+DMR_TRANS_CE([test_simple_7.xml], [s.i1], [test_simple_7.xml.2.trans_base], [pass])
+DMR_TRANS_CE([test_simple_7.xml], [s{i1}], [test_simple_7.xml.2.trans_base], [pass])
+
+DMR_TRANS_CE([test_simple_8.xml], [outer], [test_simple_8.xml.1.trans_base], [xfail])
+DMR_TRANS_CE([test_simple_8.xml], [outer.s.s], [test_simple_8.xml.2.trans_base], [xfail])
+DMR_TRANS_CE([test_simple_8.xml], [outer{s{s}}], [test_simple_8.xml.2.trans_base], [xfail])
+
+DMR_TRANS_CE([test_array_7.xml], [s], [test_array_7.xml.1.trans_base], [pass])
+DMR_TRANS_CE([test_array_7.xml], [s{i1;s}], [test_array_7.xml.1.trans_base], [pass])
+
+DMR_TRANS_CE([test_array_7.xml], [s.i1], [test_array_7.xml.2.trans_base], [pass])
+DMR_TRANS_CE([test_array_7.xml], [s{i1}], [test_array_7.xml.2.trans_base], [pass])
+
+DMR_TRANS_CE([test_array_7.xml], [s[[1]] ], [test_array_7.xml.3.trans_base], [pass])
+DMR_TRANS_CE([test_array_7.xml], [s[[1]]{i1;s}], [test_array_7.xml.3.trans_base], [pass])
+
+DMR_TRANS_CE([test_array_7.xml], [s[[1]]{i1}], [test_array_7.xml.4.trans_base], [pass])
+
+# test_array_8 has a 2D Sequence that uses a shared dim
+DMR_TRANS_CE([test_array_8.xml], [/col=[[1:2]];s[[1]][[]]{i1}], [test_array_8.xml.1.trans_base], [pass])
+DMR_TRANS_CE([test_array_8.xml], [col=[[1:2]];s[[1]][[]]{i1}], [test_array_8.xml.1.trans_base], [pass])
+
+# test_array_7.1 holds a sequence that has an array for one of its fields
+DMR_TRANS_CE([test_array_7.1.xml], [], [test_array_7.1.xml.1.trans_base], [pass])
+DMR_TRANS_CE([test_array_7.1.xml], [s], [test_array_7.1.xml.1.trans_base], [pass])
+
+DMR_TRANS_CE([test_array_7.1.xml], [s.i1], [test_array_7.1.xml.2.trans_base], [pass])
+DMR_TRANS_CE([test_array_7.1.xml], [s.i1[[]][[]] ], [test_array_7.1.xml.2.trans_base], [pass])
+DMR_TRANS_CE([test_array_7.1.xml], [s{i1}], [test_array_7.1.xml.2.trans_base], [pass])
+DMR_TRANS_CE([test_array_7.1.xml], [s{i1[[]][[]]} ], [test_array_7.1.xml.2.trans_base], [pass])
+
+DMR_TRANS_CE([test_array_7.1.xml], [s.i1[[0]][[0]] ], [test_array_7.1.xml.3.trans_base], [pass])
+DMR_TRANS_CE([test_array_7.1.xml], [s{i1[[0]][[0]]} ], [test_array_7.1.xml.3.trans_base], [pass])
+
+DMR_TRANS_CE([test_array_7.1.xml], [s.i1[[0:2]][[1:2]] ], [test_array_7.1.xml.4.trans_base], [pass])
+
+# Should this CE be supported? jhrg 12/23/13
+# DMR_TRANS_CE([test_array_7.1.xml], [/row=[[2:3]];/col=[[2:3]] ], [test_array_7.1.xml.5.trans_base], [pass])
+DMR_TRANS_CE([test_array_7.1.xml], [/row=[[2:3]];/col=[[2:3]];s ], [test_array_7.1.xml.5.trans_base], [pass])
+
+DMR_TRANS_CE([test_array_7.1.xml], [/row=[[2:3]];/col=[[2:3]];s.i1 ], [test_array_7.1.xml.6.trans_base], [pass])
+DMR_TRANS_CE([test_array_7.1.xml], [/row=[[2:3]];/col=[[2:3]];s.i1[[]][[]] ], [test_array_7.1.xml.6.trans_base], [pass])
+DMR_TRANS_CE([test_array_7.1.xml], [/row=[[2:3]];/col=[[2:3]];s{i1} ], [test_array_7.1.xml.6.trans_base], [pass])
+DMR_TRANS_CE([test_array_7.1.xml], [/row=[[2:3]];/col=[[2:3]];s{i1[[]][[]]} ], [test_array_7.1.xml.6.trans_base], [pass])
+
+# test_array_7.2 is a sequence array that holds an array as one of its fields
+DMR_TRANS_CE([test_array_7.2.xml], [/col=[[1:2]];s[[]]{i1}], [test_array_7.2.xml.1.trans_base], [pass])
+DMR_TRANS_CE([test_array_7.2.xml], [/col=[[1:2]];s[[]]{i1[[]][[]]}], [test_array_7.2.xml.1.trans_base], [pass])
+DMR_TRANS_CE([test_array_7.2.xml], [/col=[[1:2]];s{i1[[]][[]]}], [test_array_7.2.xml.1.trans_base], [pass])
+
+DMR_TRANS_CE([test_array_7.2.xml], [/col=[[1:2]];s[[]]{i1[[0]][[]]}], [test_array_7.2.xml.2.trans_base], [pass])
+DMR_TRANS_CE([test_array_7.2.xml], [/col=[[1:2]];s{i1[[0]][[]]}], [test_array_7.2.xml.2.trans_base], [pass])
+
+DMR_TRANS_CE([test_array_7.2.xml], [/col=[[1:2]];s[[0]]{i1}], [test_array_7.2.xml.3.trans_base], [pass])
+DMR_TRANS_CE([test_array_7.2.xml], [/col=[[1:2]];s[[0]]{i1[[]][[]]}], [test_array_7.2.xml.3.trans_base], [pass])
+
+DMR_TRANS_CE([test_array_7.2.xml], [/col=[[1:2]];s[[0]]{i1[[0]][[]]}], [test_array_7.2.xml.4.trans_base], [pass])
+
+# Test the function parser and evaluator. The function 'scale' is defined 
+# for both DAP2 and DAP4 in D4TestFunction.cc/h
+DMR_TRANS_FUNC_CE([test_array_1.xml], [scale(x,1)], [], [test_array_1.xml.1.func_base], [pass])
+DMR_TRANS_FUNC_CE([test_array_1.xml], [scale(x,10)], [], [test_array_1.xml.2.func_base], [pass])
+DMR_TRANS_FUNC_CE([test_array_1.xml], [scale(x,-10)], [], [test_array_1.xml.3.func_base], [pass])
+DMR_TRANS_FUNC_CE([test_array_1.xml], [scale(x,0.001)], [], [test_array_1.xml.4.func_base], [pass])
+DMR_TRANS_FUNC_CE([test_array_1.xml], [scale(x,-0.001)], [], [test_array_1.xml.5.func_base], [pass])
+
+# Test the largest signed int64 value (it will be stored in a D4RValue that 
+# holds a Int64 variable).
+DMR_TRANS_FUNC_CE([test_array_1.xml], [scale(x,0x7fffffffffffffff)], [], [test_array_1.xml.6.func_base], [pass])
+# This only fits in a unsigned long long (DAP4's UInt64)
+DMR_TRANS_FUNC_CE([test_array_1.xml], [scale(x,0x8fffffffffffffff)], [], [test_array_1.xml.7.func_base], [pass])
+
+# test_array_5 has 64 bit ints in c and d; a and b are Int8 and UInt8 types
+# all of these test arrays that use named dimensions
+DMR_TRANS_FUNC_CE([test_array_5.xml], [scale(a,0.001)], [], [test_array_5.xml.1.func_base], [pass])
+DMR_TRANS_FUNC_CE([test_array_5.xml], [scale(b,0.001)], [], [test_array_5.xml.2.func_base], [pass])
+
+DMR_TRANS_FUNC_CE([test_array_5.xml], [scale(c,0.001)], [], [test_array_5.xml.3.func_base], [pass])
+DMR_TRANS_FUNC_CE([test_array_5.xml], [scale(d,0.001)], [], [test_array_5.xml.4.func_base], [pass])
+
+# Use the vol_1_ce_* datasets for tests
+
+# Test using variables for source values and functional composition
+DMR_TRANS_FUNC_CE([vol_1_ce_1.xml], [scale(u,10)], [], [vol_1_ce_1.xml.1.func_base], [pass])
+DMR_TRANS_FUNC_CE([vol_1_ce_1.xml], [scale(u,v)], [], [vol_1_ce_1.xml.2.func_base], [pass])
+DMR_TRANS_FUNC_CE([vol_1_ce_1.xml], [scale(scale(u,10),0.01)], [], [vol_1_ce_1.xml.3.func_base], [pass])
+
+# Test name parsing for Structure members
+DMR_TRANS_FUNC_CE([vol_1_ce_1.xml], [scale(Point.x,10)], [], [vol_1_ce_1.xml.4.func_base], [pass])
+DMR_TRANS_FUNC_CE([vol_1_ce_1.xml], [scale(Point.x,Point.y)], [], [vol_1_ce_1.xml.5.func_base], [pass])
+DMR_TRANS_FUNC_CE([vol_1_ce_1.xml], [scale(scale(Point.x,10),0.01)], [], [vol_1_ce_1.xml.6.func_base], [pass])
+
+# Test the 'array constant' special form (we need a dataset only because the parser needs a DMR to run)
+DMR_TRANS_FUNC_CE([vol_1_ce_1.xml], [scale(\$Byte(20:1,2,3,4),10)], [], [vol_1_ce_1.xml.7.func_base], [pass])
+DMR_TRANS_FUNC_CE([vol_1_ce_1.xml], [scale(\$Int8(20:10,11,12,-9),10)], [], [vol_1_ce_1.xml.8.func_base], [pass])
+DMR_TRANS_FUNC_CE([vol_1_ce_1.xml], [scale(\$UInt16(20:1,2,3,4),10)], [], [vol_1_ce_1.xml.9.func_base], [pass])
+DMR_TRANS_FUNC_CE([vol_1_ce_1.xml], [scale(\$Int16(20:1,2,3,-4),10)], [], [vol_1_ce_1.xml.10.func_base], [pass])
+DMR_TRANS_FUNC_CE([vol_1_ce_1.xml], [scale(\$UInt32(20:1,2,3,4),10)], [], [vol_1_ce_1.xml.11.func_base], [pass])
+DMR_TRANS_FUNC_CE([vol_1_ce_1.xml], [scale(\$Int32(20:1,2,3,-4),10)], [], [vol_1_ce_1.xml.12.func_base], [pass])
+DMR_TRANS_FUNC_CE([vol_1_ce_1.xml], [scale(\$UInt64(20:1,2,3,0xffffffffffffffff),1)], [], [vol_1_ce_1.xml.13.func_base], [pass])
+DMR_TRANS_FUNC_CE([vol_1_ce_1.xml], [scale(\$Int64(20:1,2,3,0x7fffffffffffffff),1)], [], [vol_1_ce_1.xml.14.func_base], [pass])
+DMR_TRANS_FUNC_CE([vol_1_ce_1.xml], [scale(\$Float32(20:1,2,3,4.55),10)], [], [vol_1_ce_1.xml.15.func_base], [pass])
+DMR_TRANS_FUNC_CE([vol_1_ce_1.xml], [scale(\$Float64(20:1,2,3,4.55),10)], [], [vol_1_ce_1.xml.16.func_base], [pass])
+
+# Test a sequence of function calls and the application of a Constraint to 
+# a function result
+DMR_TRANS_FUNC_CE([vol_1_ce_10.xml], [scale(lat,10)], [], [vol_1_ce_10.xml.1.func_base], [pass])
+DMR_TRANS_FUNC_CE([vol_1_ce_10.xml], [scale(lat,10);scale(lon,10)], [], [vol_1_ce_10.xml.2.func_base], [pass])
+DMR_TRANS_FUNC_CE([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], [pass])
+
+# Tests added for the D4Sequence filter support. jhrg 4/28/16
+# These will be 'universal' tests (the idea was introduced on the 
+# master branch and tested out up above. See the calls to 
+# DMR_TRANS_UNIVERSAL jhrg 5/5/16
+
+DMR_TRANS_SERIES_CE([test_simple_7.xml], [s], [test_simple_7.xml.f.trans_base], [pass])
+
+DMR_TRANS_SERIES_CE([test_simple_7.xml], [s|i1==1024], [test_simple_7.xml.f1.trans_base], [pass])
+DMR_TRANS_SERIES_CE([test_simple_7.xml], [s|i1!=1024], [test_simple_7.xml.f2.trans_base], [pass])
+DMR_TRANS_SERIES_CE([test_simple_7.xml], [s|i1<=1024], [test_simple_7.xml.f3.trans_base], [pass])
+DMR_TRANS_SERIES_CE([test_simple_7.xml], [s|i1<1024], [test_simple_7.xml.f4.trans_base], [pass])
+DMR_TRANS_SERIES_CE([test_simple_7.xml], [s|i1<=1024], [test_simple_7.xml.f5.trans_base], [pass])
+DMR_TRANS_SERIES_CE([test_simple_7.xml], [s|i1>1024], [test_simple_7.xml.f6.trans_base], [pass])
+DMR_TRANS_SERIES_CE([test_simple_7.xml], [s|i1>=1024], [test_simple_7.xml.f7.trans_base], [pass])
+
+DMR_TRANS_SERIES_CE([test_simple_7.xml], [s|1024<i1], [test_simple_7.xml.f8.trans_base], [pass])
+DMR_TRANS_SERIES_CE([test_simple_7.xml], [s|1024<=i1<=32768], [test_simple_7.xml.f9.trans_base], [pass])
+DMR_TRANS_SERIES_CE([test_simple_7.xml], [s|i1>=1024.0], [test_simple_7.xml.fa.trans_base], [pass])
+
+DMR_TRANS_SERIES_CE([test_simple_7.xml], [s|s==\"Silly test string: 2\"], [test_simple_7.xml.fs1.trans_base], [pass])
+DMR_TRANS_SERIES_CE([test_simple_7.xml], [s|s!=\"Silly test string: 2\"], [test_simple_7.xml.fs2.trans_base], [pass])
+DMR_TRANS_SERIES_CE([test_simple_7.xml], [s|s<\"Silly test string: 2\"], [test_simple_7.xml.fs3.trans_base], [pass])
+DMR_TRANS_SERIES_CE([test_simple_7.xml], [s|s<=\"Silly test string: 2\"], [test_simple_7.xml.fs4.trans_base], [pass])
+DMR_TRANS_SERIES_CE([test_simple_7.xml], [s|s>\"Silly test string: 2\"], [test_simple_7.xml.fs5.trans_base], [pass])
+DMR_TRANS_SERIES_CE([test_simple_7.xml], [s|s>=\"Silly test string: 2\"], [test_simple_7.xml.fs6.trans_base], [pass])
+DMR_TRANS_SERIES_CE([test_simple_7.xml], [s|s~=\".*2\"], [test_simple_7.xml.fs7.trans_base], [pass])
+
+# Test filtering a sequence that has only one field projected, including filtering on the values
+# of a filed not projected.
+DMR_TRANS_SERIES_CE([test_simple_7.xml], [s{i1}|i1<32768], [test_simple_7.xml.g1.trans_base], [pass])
+DMR_TRANS_SERIES_CE([test_simple_7.xml], [s{i1}|s<=\"Silly test string: 2\"], [test_simple_7.xml.g1.trans_base], [pass])
+
+# A nested sequence with flots in the outer sequence and the int, string combination in the inner
+DMR_TRANS_SERIES_CE([test_simple_8.1.xml], [outer], [test_simple_8.1.xml.f1.trans_base], [pass])
+DMR_TRANS_SERIES_CE([test_simple_8.1.xml], [outer{x;y}], [test_simple_8.1.xml.f2.trans_base], [pass])
+DMR_TRANS_SERIES_CE([test_simple_8.1.xml], [outer{x;y;inner}], [test_simple_8.1.xml.f3.trans_base], [pass])
+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_spaces3.dmr], [/inst2/\"New Group\"/x], [names_with_spaces3.dmr.1.trans_base], [xfail])
+DMR_TRANS_SERIES_CE([names_with_spaces3.dmr], [/inst2/New%20Group/x], [names_with_spaces3.dmr.1.trans_base], [xfail])
diff --git a/tests/EXPRTest b/tests/EXPRTest
new file mode 100755
index 0000000..c260ba7
--- /dev/null
+++ b/tests/EXPRTest
@@ -0,0 +1,13068 @@
+#! /bin/sh
+# Generated from EXPRTest.at by GNU Autoconf 2.69.
+#
+# Copyright (C) 2009-2012 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. ##
+## -------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+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_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+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
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  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
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
+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
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  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 || :
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && 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
+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@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
+
+# 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
+
+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
+
+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_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+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
+
+
+  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 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
+}
+
+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
+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 -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'
+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"'
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+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'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+
+
+
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+# How were we run?
+at_cli_args="$@"
+
+
+# Not all shells have the 'times' builtin; the subshell is needed to make
+# sure we discard the 'times: not found' message from the shell.
+at_times_p=false
+(times) >/dev/null 2>&1 && at_times_p=:
+
+# CLI Arguments to pass to the debugging scripts.
+at_debug_args=
+# -e sets to true
+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.
+at_debug_p=false
+# Display help message?
+at_help_p=false
+# Display the version message?
+at_version_p=false
+# List test groups?
+at_list_p=false
+# --clean
+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
+
+# The directory we run the suite in.  Default to . if no -C option.
+at_dir=`pwd`
+# An absolute reference to this testsuite script.
+case $as_myself in
+  [\\/]* | ?:[\\/]* ) at_myself=$as_myself ;;
+  * ) at_myself=$at_dir/$as_myself ;;
+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=''
+# 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.
+at_format='???'
+# Description of all the test groups.
+at_help_all="1;EXPRTest.at:57;expr-test -w \$abs_srcdir/expr-testsuite/test.1 -k i (pass);expr;
+2;EXPRTest.at:57;expr-test -W \$abs_srcdir/expr-testsuite/test.1 -k i (pass);expr;
+3;EXPRTest.at:58;expr-test -w \$abs_srcdir/expr-testsuite/test.1 -k i,j (pass);expr;
+4;EXPRTest.at:58;expr-test -W \$abs_srcdir/expr-testsuite/test.1 -k i,j (pass);expr;
+5;EXPRTest.at:59;expr-test -w \$abs_srcdir/expr-testsuite/test.1 -k 'i,j&i=j' (pass);expr;
+6;EXPRTest.at:59;expr-test -W \$abs_srcdir/expr-testsuite/test.1 -k 'i,j&i=j' (pass);expr;
+7;EXPRTest.at:60;expr-test -w \$abs_srcdir/expr-testsuite/test.1 -k 'i&i=j' (pass);expr;
+8;EXPRTest.at:60;expr-test -W \$abs_srcdir/expr-testsuite/test.1 -k 'i&i=j' (pass);expr;
+9;EXPRTest.at:61;expr-test -w \$abs_srcdir/expr-testsuite/test.2 -k s1 (pass);expr;
+10;EXPRTest.at:61;expr-test -W \$abs_srcdir/expr-testsuite/test.2 -k s1 (pass);expr;
+11;EXPRTest.at:62;expr-test -w \$abs_srcdir/expr-testsuite/test.2 -k s2 (pass);expr;
+12;EXPRTest.at:62;expr-test -W \$abs_srcdir/expr-testsuite/test.2 -k s2 (pass);expr;
+13;EXPRTest.at:63;expr-test -w \$abs_srcdir/expr-testsuite/test.2 -k s2,s3 (pass);expr;
+14;EXPRTest.at:63;expr-test -W \$abs_srcdir/expr-testsuite/test.2 -k s2,s3 (pass);expr;
+15;EXPRTest.at:64;expr-test -w \$abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4],s3.o (pass);expr;
+16;EXPRTest.at:64;expr-test -W \$abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4],s3.o (pass);expr;
+17;EXPRTest.at:66;expr-test -w \$abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m (pass);expr;
+18;EXPRTest.at:66;expr-test -W \$abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m (pass);expr;
+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);expr;
+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);expr;
+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);expr;
+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);expr;
+23;EXPRTest.at:70;expr-test -w \$abs_srcdir/expr-testsuite/test.3 -k i[1:10] (pass);expr;
+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;
+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;
+32;EXPRTest.at:91;expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0][0] (pass);expr;
+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);expr;
+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);expr;
+35;EXPRTest.at:93;expr-test -w \$abs_srcdir/expr-testsuite/test.6 -k i (pass);expr;
+36;EXPRTest.at:93;expr-test -W \$abs_srcdir/expr-testsuite/test.6 -k i (pass);expr;
+37;EXPRTest.at:94;expr-test -w \$abs_srcdir/expr-testsuite/test.6 -k i[1:2][2:4] (pass);expr;
+38;EXPRTest.at:94;expr-test -W \$abs_srcdir/expr-testsuite/test.6 -k i[1:2][2:4] (pass);expr;
+39;EXPRTest.at:95;expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k g.val[0:1][0:1][0:1] (pass);expr;
+40;EXPRTest.at:95;expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k g.val[0:1][0:1][0:1] (pass);expr;
+41;EXPRTest.at:96;expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k g.length (pass);expr;
+42;EXPRTest.at:96;expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k g.length (pass);expr;
+43;EXPRTest.at:97;expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k g.length,g.width (pass);expr;
+44;EXPRTest.at:97;expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k g.length,g.width (pass);expr;
+45;EXPRTest.at:98;expr-test -w \$abs_srcdir/expr-testsuite/test.2 -k j,o (pass);expr;
+46;EXPRTest.at:98;expr-test -W \$abs_srcdir/expr-testsuite/test.2 -k j,o (pass);expr;
+47;EXPRTest.at:99;expr-test -w \$abs_srcdir/expr-testsuite/test.8 -k \"data%23i[0:2:9][0:2]\" (pass);expr;
+48;EXPRTest.at:99;expr-test -W \$abs_srcdir/expr-testsuite/test.8 -k \"data%23i[0:2:9][0:2]\" (pass);expr;
+49;EXPRTest.at:100;expr-test -w \$abs_srcdir/expr-testsuite/test.7 -k x,y,f (pass);expr;
+50;EXPRTest.at:100;expr-test -W \$abs_srcdir/expr-testsuite/test.7 -k x,y,f (pass);expr;
+51;EXPRTest.at:101;expr-test -w \$abs_srcdir/expr-testsuite/test.8 -k \"x%23y,y\" (pass);expr;
+52;EXPRTest.at:101;expr-test -W \$abs_srcdir/expr-testsuite/test.8 -k \"x%23y,y\" (pass);expr;
+53;EXPRTest.at:102;expr-test -w \$abs_srcdir/expr-testsuite/test.8 -k \"data%20name,y\" (pass);expr;
+54;EXPRTest.at:102;expr-test -W \$abs_srcdir/expr-testsuite/test.8 -k \"data%20name,y\" (pass);expr;
+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);expr;
+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);expr;
+57;EXPRTest.at:104;expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k g[1:4:9] (pass);expr;
+58;EXPRTest.at:104;expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k g[1:4:9] (pass);expr;
+59;EXPRTest.at:105;expr-test -w \$abs_srcdir/expr-testsuite/test.6 -k i[1:4:9] (pass);expr;
+60;EXPRTest.at:105;expr-test -W \$abs_srcdir/expr-testsuite/test.6 -k i[1:4:9] (pass);expr;
+61;EXPRTest.at:109;expr-test -w \$abs_srcdir/expr-testsuite/test.6 -k scale\\(i,2\\) (pass);expr;
+62;EXPRTest.at:109;expr-test -W \$abs_srcdir/expr-testsuite/test.6 -k scale\\(i,2\\) (pass);expr;
+63;EXPRTest.at:110;expr-test -w \$abs_srcdir/expr-testsuite/test.6 -k scale\\(i[2:4][3:6],2\\) (pass);expr;
+64;EXPRTest.at:110;expr-test -W \$abs_srcdir/expr-testsuite/test.6 -k scale\\(i[2:4][3:6],2\\) (pass);expr;
+65;EXPRTest.at:112;expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k scale\\(i[3],2\\) (pass);expr;
+66;EXPRTest.at:112;expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k scale\\(i[3],2\\) (pass);expr;
+67;EXPRTest.at:114;expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k scale\\(j,2\\) (pass);expr;
+68;EXPRTest.at:114;expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k scale\\(j,2\\) (pass);expr;
+69;EXPRTest.at:116;expr-test -w \$abs_srcdir/expr-testsuite/test.a -k \"\" -b (pass);expr;
+70;EXPRTest.at:116;expr-test -W \$abs_srcdir/expr-testsuite/test.a -k \"\" -b (pass);expr;
+71;EXPRTest.at:117;expr-test -w \$abs_srcdir/expr-testsuite/test.a -k \"&i<2000\" -b (pass);expr;
+72;EXPRTest.at:117;expr-test -W \$abs_srcdir/expr-testsuite/test.a -k \"&i<2000\" -b (pass);expr;
+73;EXPRTest.at:118;expr-test -w \$abs_srcdir/expr-testsuite/test.a -k \"j&i>2000\" -b (pass);expr;
+74;EXPRTest.at:118;expr-test -W \$abs_srcdir/expr-testsuite/test.a -k \"j&i>2000\" -b (pass);expr;
+75;EXPRTest.at:119;expr-test -w \$abs_srcdir/expr-testsuite/test.a -k \"i,j&i<0\" -b (pass);expr;
+76;EXPRTest.at:119;expr-test -W \$abs_srcdir/expr-testsuite/test.a -k \"i,j&i<0\" -b (pass);expr;
+77;EXPRTest.at:120;expr-test -w \$abs_srcdir/expr-testsuite/test.b -k \"\" -b (pass);expr;
+78;EXPRTest.at:120;expr-test -W \$abs_srcdir/expr-testsuite/test.b -k \"\" -b (pass);expr;
+79;EXPRTest.at:121;expr-test -w \$abs_srcdir/expr-testsuite/test.b -k \"i,f\" -b (pass);expr;
+80;EXPRTest.at:121;expr-test -W \$abs_srcdir/expr-testsuite/test.b -k \"i,f\" -b (pass);expr;
+81;EXPRTest.at:122;expr-test -w \$abs_srcdir/expr-testsuite/test.b -k \"i,f&i<2000\" -b (pass);expr;
+82;EXPRTest.at:122;expr-test -W \$abs_srcdir/expr-testsuite/test.b -k \"i,f&i<2000\" -b (pass);expr;
+83;EXPRTest.at:123;expr-test -w \$abs_srcdir/expr-testsuite/test.b -k \"i,f&f<0\" -b (pass);expr;
+84;EXPRTest.at:123;expr-test -W \$abs_srcdir/expr-testsuite/test.b -k \"i,f&f<0\" -b (pass);expr;
+85;EXPRTest.at:124;expr-test -w \$abs_srcdir/expr-testsuite/test.b -k \"i,j&i<2000\" -b (pass);expr;
+86;EXPRTest.at:124;expr-test -W \$abs_srcdir/expr-testsuite/test.b -k \"i,j&i<2000\" -b (pass);expr;
+87;EXPRTest.at:125;expr-test -w \$abs_srcdir/expr-testsuite/test.b -k \"&i<0\" -b (pass);expr;
+88;EXPRTest.at:125;expr-test -W \$abs_srcdir/expr-testsuite/test.b -k \"&i<0\" -b (pass);expr;
+89;EXPRTest.at:126;expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"\" -b (pass);expr;
+90;EXPRTest.at:126;expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"\" -b (pass);expr;
+91;EXPRTest.at:127;expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a\" -b (pass);expr;
+92;EXPRTest.at:127;expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a\" -b (pass);expr;
+93;EXPRTest.at:128;expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&i<2000\" -b (pass);expr;
+94;EXPRTest.at:128;expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&i<2000\" -b (pass);expr;
+95;EXPRTest.at:129;expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&f<0\" -b (pass);expr;
+96;EXPRTest.at:129;expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&f<0\" -b (pass);expr;
+97;EXPRTest.at:130;expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&a<10\" -b (pass);expr;
+98;EXPRTest.at:130;expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&a<10\" -b (pass);expr;
+99;EXPRTest.at:131;expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"i,f&i<2000\" -b (pass);expr;
+100;EXPRTest.at:131;expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"i,f&i<2000\" -b (pass);expr;
+101;EXPRTest.at:132;expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"i&i<2000\" -b (pass);expr;
+102;EXPRTest.at:132;expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"i&i<2000\" -b (pass);expr;
+103;EXPRTest.at:133;expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&i<0\" -b (pass);expr;
+104;EXPRTest.at:133;expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&i<0\" -b (pass);expr;
+105;EXPRTest.at:135;expr-test -b -w \$abs_srcdir/expr-testsuite/test.61 -k i (pass);expr;
+106;EXPRTest.at:135;expr-test -b -W \$abs_srcdir/expr-testsuite/test.61 -k i (pass);expr;
+107;EXPRTest.at:136;expr-test -b -w \$abs_srcdir/expr-testsuite/test.61 -k  i[0:2][0:2]  (pass);expr;
+108;EXPRTest.at:136;expr-test -b -W \$abs_srcdir/expr-testsuite/test.61 -k  i[0:2][0:2]  (pass);expr;
+109;EXPRTest.at:137;expr-test -b -w \$abs_srcdir/expr-testsuite/test.61 -k  i[1:2][0:2]  (pass);expr;
+110;EXPRTest.at:137;expr-test -b -W \$abs_srcdir/expr-testsuite/test.61 -k  i[1:2][0:2]  (pass);expr;
+111;EXPRTest.at:138;expr-test -b -w \$abs_srcdir/expr-testsuite/test.61 -k  i[1:2][1:2]  (pass);expr;
+112;EXPRTest.at:138;expr-test -b -W \$abs_srcdir/expr-testsuite/test.61 -k  i[1:2][1:2]  (pass);expr;
+113;EXPRTest.at:139;expr-test -b -w \$abs_srcdir/expr-testsuite/test.c0 -k SST (pass);expr;
+114;EXPRTest.at:139;expr-test -b -W \$abs_srcdir/expr-testsuite/test.c0 -k SST (pass);expr;
+115;EXPRTest.at:141;expr-test -b -w \$abs_srcdir/expr-testsuite/test.f -k \"\" (pass);expr;
+116;EXPRTest.at:141;expr-test -b -W \$abs_srcdir/expr-testsuite/test.f -k \"\" (pass);expr;
+117;EXPRTest.at:142;expr-test -b -w \$abs_srcdir/expr-testsuite/test.f -k \"&i<3000\" (pass);expr;
+118;EXPRTest.at:142;expr-test -b -W \$abs_srcdir/expr-testsuite/test.f -k \"&i<3000\" (pass);expr;
+119;EXPRTest.at:146;expr-test -b -w \$abs_srcdir/expr-testsuite/test.21.dds -k \"\" (pass);expr;
+120;EXPRTest.at:146;expr-test -b -W \$abs_srcdir/expr-testsuite/test.21.dds -k \"\" (pass);expr;
+121;EXPRTest.at:147;expr-test -b -w \$abs_srcdir/expr-testsuite/test.22.dds -k \"\" (pass);expr;
+122;EXPRTest.at:147;expr-test -b -W \$abs_srcdir/expr-testsuite/test.22.dds -k \"\" (pass);expr;
+123;EXPRTest.at:148;expr-test -b -w \$abs_srcdir/expr-testsuite/test.23.dds -k \"\" (pass);expr;
+124;EXPRTest.at:148;expr-test -b -W \$abs_srcdir/expr-testsuite/test.23.dds -k \"\" (pass);expr;
+125;EXPRTest.at:149;expr-test -b -w \$abs_srcdir/expr-testsuite/test.24.dds -k \"\" (pass);expr;
+126;EXPRTest.at:149;expr-test -b -W \$abs_srcdir/expr-testsuite/test.24.dds -k \"\" (pass);expr;
+127;EXPRTest.at:153;expr-test -b -w \$abs_srcdir/expr-testsuite/test.25.dds -k \"\" (pass);expr;
+128;EXPRTest.at:153;expr-test -b -W \$abs_srcdir/expr-testsuite/test.25.dds -k \"\" (pass);expr;
+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 ()
+{
+  for at_grp
+  do
+    eval at_value=\$$at_grp
+    if test $at_value -lt 1 || test $at_value -gt 130; 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 $(( )).
+	  # 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.
+	  eval $at_grp='`expr $at_value + 0`' ;;
+    esac
+  done
+}
+
+##
+## Set up package specific options.
+##
+
+at_arg_given_baselines=false
+
+
+at_prev=
+for at_option
+do
+  # If the previous option needs an argument, assign it.
+  if test -n "$at_prev"; then
+    at_option=$at_prev=$at_option
+    at_prev=
+  fi
+
+  case $at_option in
+  *=?*) at_optarg=`expr "X$at_option" : '[^=]*=\(.*\)'` ;;
+  *)    at_optarg= ;;
+  esac
+
+  # Accept the important Cygnus configure options, so we can diagnose typos.
+
+  case $at_option in
+    --help | -h )
+	at_help_p=:
+	;;
+
+    --list | -l )
+	at_list_p=:
+	;;
+
+    --version | -V )
+	at_version_p=:
+	;;
+
+    --clean | -c )
+	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=:
+	;;
+
+    --errexit | -e )
+	at_debug_p=:
+	at_errexit_p=:
+	;;
+
+    --verbose | -v )
+	at_verbose=; at_quiet=:
+	;;
+
+    --trace | -x )
+	at_traceon='set -x'
+	at_trace_echo=echo
+	at_check_filter_trace=at_fn_filter_trace
+	;;
+
+    [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"
+	;;
+
+    # 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"
+	;;
+
+    -[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"
+	;;
+
+    [0-9]-[0-9] | [0-9]-[0-9][0-9] | [0-9]-[0-9][0-9][0-9] | \
+    [0-9]-[0-9][0-9][0-9][0-9] | [0-9][0-9]-[0-9][0-9] | \
+    [0-9][0-9]-[0-9][0-9][0-9] | [0-9][0-9]-[0-9][0-9][0-9][0-9] | \
+    [0-9][0-9][0-9]-[0-9][0-9][0-9] | \
+    [0-9][0-9][0-9]-[0-9][0-9][0-9][0-9] | \
+    [0-9][0-9][0-9][0-9]-[0-9][0-9][0-9][0-9] )
+	at_range_start=`expr $at_option : '\(.*\)-'`
+	at_range_end=`expr $at_option : '.*-\(.*\)'`
+	if test $at_range_start -gt $at_range_end; then
+	  at_tmp=$at_range_end
+	  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"
+	;;
+
+    # Directory selection.
+    --directory | -C )
+	at_prev=--directory
+	;;
+    --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.
+    --keywords | -k )
+	at_prev=--keywords
+	;;
+    --keywords=* )
+	at_groups_selected=$at_help_all
+	at_save_IFS=$IFS
+	IFS=,
+	set X $at_optarg
+	shift
+	IFS=$at_save_IFS
+	for at_keyword
+	do
+	  at_invert=
+	  case $at_keyword in
+	  '!'*)
+	    at_invert="-v"
+	    at_keyword=`expr "X$at_keyword" : 'X!\(.*\)'`
+	    ;;
+	  esac
+	  # It is on purpose that we match the test group titles too.
+	  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=:
+	;;
+    --baselines )
+	at_prev=--baselines
+	;;
+    --baselines=* )
+	at_arg_baselines=$at_optarg
+	at_arg_given_baselines=:
+	echo "baselines set to $at_arg_baselines";
+     baselines=$at_arg_baselines
+	;;
+
+
+    *=*)
+	at_envvar=`expr "x$at_option" : 'x\([^=]*\)='`
+	# 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'" ;;
+	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'"
+	;;
+
+     *) $as_echo "$as_me: invalid option: $at_option" >&2
+	$as_echo "Try \`$0 --help' for more information." >&2
+	exit 1
+	;;
+  esac
+done
+
+# Verify our last option didn't require an argument
+if test -n "$at_prev"; then :
+  as_fn_error $? "\`$at_prev' requires an argument"
+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
+  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=
+fi
+
+##
+## Process package specific options when _not_ supplied.
+##
+
+if $at_arg_given_baselines; then :
+
+else
+  baselines=
+fi
+
+# Help message.
+if $at_help_p; then
+  cat <<_ATEOF || at_write_fail=1
+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
+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:
+
+  $ $0 AUTOTEST_PATH=bin
+
+is equivalent to the following, assuming the source directory is /src/foo-1.0:
+
+  PATH=/tmp/foo-1.0/bin:/src/foo-1.0/bin:\$PATH $0
+_ATEOF
+cat <<_ATEOF || at_write_fail=1
+
+Operation modes:
+  -h, --help     print the help message, then exit
+  -V, --version  print version number, then exit
+  -c, --clean    remove all the files this test suite might create and exit
+  -l, --list     describes all the tests, or the selected TESTS
+_ATEOF
+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
+  -d, --debug    inhibit clean up and top-level logging
+                 default for debugging scripts
+  -x, --trace    enable tests shell tracing
+_ATEOF
+cat <<_ATEOF || at_write_fail=1
+
+Other options:
+_ATEOF
+
+cat <<_ATEOF || at_write_fail=1
+--baselines=yes|no   Build the baseline file for parser test 'arg'
+_ATEOF
+cat <<_ATEOF || at_write_fail=1
+
+Report bugs to <opendap-tech@opendap.org>.
+_ATEOF
+  exit $at_write_fail
+fi
+
+# List of tests.
+if $at_list_p; then
+  cat <<_ATEOF || at_write_fail=1
+libdap 3.19.1 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
+	   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
+	     }
+	   }
+	 }' || at_write_fail=1
+  exit $at_write_fail
+fi
+if $at_version_p; then
+  $as_echo "$as_me (libdap 3.19.1)" &&
+  cat <<\_ATEOF || at_write_fail=1
+
+Copyright (C) 2012 Free Software Foundation, Inc.
+This test suite is free software; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+_ATEOF
+  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=: ;; #(
+  * ) at_print_banners=false ;;
+esac
+# Text for banner N, set to a single space once printed.
+
+# Take any -C into account.
+if $at_change_dir ; then
+  test x != "x$at_dir" && cd "$at_dir" \
+    || as_fn_error $? "unable to change directory"
+  at_dir=`pwd`
+fi
+
+# Load the config files for any default variable assignments.
+for at_file in atconfig atlocal
+do
+  test -r $at_file || continue
+  . ./$at_file || as_fn_error $? "invalid content: $at_file"
+done
+
+# Autoconf <=2.59b set at_top_builddir instead of at_top_build_prefix:
+: "${at_top_build_prefix=$at_top_builddir}"
+
+# Perform any assignments requested during argument parsing.
+eval "$at_debug_args"
+
+# atconfig delivers names relative to the directory the test suite is
+# in, but the groups themselves are run in testsuite-dir/group-dir.
+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
+    case $at_val in
+      [\\/$]* | ?:[\\/]* ) at_prefix= ;;
+      *) at_prefix=../../ ;;
+    esac
+    eval "$at_dir_var=\$at_prefix\$at_val"
+  done
+fi
+
+## -------------------- ##
+## Directory structure. ##
+## -------------------- ##
+
+# This is the set of directories and files used by this script
+# (non-literals are capitalized):
+#
+# TESTSUITE         - the testsuite
+# TESTSUITE.log     - summarizes the complete testsuite run
+# TESTSUITE.dir/    - created during a run, remains after -d or failed test
+# + at-groups/      - during a run: status of all groups in run
+# | + NNN/          - during a run: meta-data about test group NNN
+# | | + check-line  - location (source file and line) of current AT_CHECK
+# | | + status      - exit status of current AT_CHECK
+# | | + stdout      - stdout of current AT_CHECK
+# | | + stder1      - stderr, including trace
+# | | + stderr      - stderr, with trace filtered out
+# | | + test-source - portion of testsuite that defines group
+# | | + times       - timestamps for computing duration
+# | | + pass        - created if group passed
+# | | + xpass       - created if group xpassed
+# | | + fail        - created if group failed
+# | | + xfail       - created if group xfailed
+# | | + skip        - created if group skipped
+# + at-stop         - during a run: end the run if this file exists
+# + at-source-lines - during a run: cache of TESTSUITE line numbers for extraction
+# + 0..NNN/         - created for each group NNN, remains after -d or failed test
+# | + TESTSUITE.log - summarizes the group results
+# | + ...           - files created during the group
+
+# 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).
+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" &&
+    find "$at_suite_dir" -type d ! -perm -700 -exec chmod u+rwx \{\} \;
+  rm -f -r "$at_suite_dir" "$at_suite_log"
+  exit $?
+fi
+
+# Don't take risks: use only absolute directories in PATH.
+#
+# For stand-alone test suites (ie. atconfig was not found),
+# AUTOTEST_PATH is relative to `.'.
+#
+# For embedded test suites, AUTOTEST_PATH is relative to the top level
+# of the package.  Then expand it into build/src parts, since users
+# may create executables in both places.
+AUTOTEST_PATH=`$as_echo "$AUTOTEST_PATH" | sed "s|:|$PATH_SEPARATOR|g"`
+at_path=
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+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
+case $as_dir in
+  [\\/]* | ?:[\\/]* )
+    as_fn_append at_path "$as_dir"
+    ;;
+  * )
+    if test -z "$at_top_build_prefix"; then
+      # Stand-alone test suite.
+      as_fn_append 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"
+    fi
+    ;;
+esac
+  done
+IFS=$as_save_IFS
+
+
+# Now build and simplify PATH.
+#
+# There might be directories that don't exist, but don't redirect
+# builtins' (eg., cd) stderr directly: Ultrix's sh hates that.
+at_new_path=
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $at_path
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    test -d "$as_dir" || continue
+case $as_dir in
+  [\\/]* | ?:[\\/]* ) ;;
+  * ) as_dir=`(cd "$as_dir" && pwd) 2>/dev/null` ;;
+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" ;;
+esac
+  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
+else
+  : >"$at_suite_log"
+fi
+exec 5>>"$at_suite_log"
+
+# Banners and logs.
+$as_echo "## ------------------------------------ ##
+## libdap 3.19.1 test suite: expr-test. ##
+## ------------------------------------ ##"
+{
+  $as_echo "## ------------------------------------ ##
+## libdap 3.19.1 test suite: expr-test. ##
+## ------------------------------------ ##"
+  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"
+    echo
+  fi
+
+  {
+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`
+
+/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
+
+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
+
+}
+  echo
+
+  # Contents of the config files.
+  for at_file in atconfig atlocal
+  do
+    test -r $at_file || continue
+    $as_echo "$as_me: $at_file:"
+    sed 's/^/| /' $at_file
+    echo
+  done
+} >&5
+
+
+## ------------------------- ##
+## Autotest 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_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"
+}
+
+# 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 ()
+{
+  case $1 in
+    *$as_nl*)
+      at_fn_check_prepare_notrace 'an embedded newline' "$2" ;;
+    *)
+      at_fn_check_prepare_trace "$2" ;;
+  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 ()
+{
+  mv "$at_stderr" "$at_stder1"
+  grep '^ *+' "$at_stder1" >&2
+  grep -v '^ *+' "$at_stder1" >"$at_stderr"
+}
+
+# at_fn_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 ()
+{
+  for file
+    do $as_echo "$file:"; sed 's/^/> /' "$file"; done
+  echo 1 > "$at_status_file"
+  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 ()
+{
+  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 ()
+{
+  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 ()
+{
+  test -s "$1" || return 0
+  $at_diff "$at_devnull" "$1"
+}
+
+# at_fn_test NUMBER
+# -----------------
+# Parse out test NUMBER from the tail of this file.
+at_fn_test ()
+{
+  eval at_sed=\$at_sed$1
+  sed "$at_sed" "$at_myself" > "$at_test_source"
+}
+
+# at_fn_create_debugging_script
+# -----------------------------
+# Create the debugging script $at_group_dir/run which will reproduce the
+# current test group.
+at_fn_create_debugging_script ()
+{
+  {
+    echo "#! /bin/sh" &&
+    echo 'test "${ZSH_VERSION+set}" = set && alias -g '\''${1+"$@"}'\''='\''"$@"'\''' &&
+    $as_echo "cd '$at_dir'" &&
+    $as_echo "exec \${CONFIG_SHELL-$SHELL} \"$at_myself\" -v -d $at_debug_args $at_group \${1+\"\$@\"}" &&
+    echo 'exit 1'
+  } >"$at_group_dir/run" &&
+  chmod +x "$at_group_dir/run"
+}
+
+## -------------------------------- ##
+## End of autotest shell functions. ##
+## -------------------------------- ##
+{
+  $as_echo "## ---------------- ##
+## Tested programs. ##
+## ---------------- ##"
+  echo
+} >&5
+
+# Report what programs are being tested.
+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
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    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
+    {
+      $as_echo "$at_srcdir/EXPRTest.at:3: $at_program_ --version"
+      "$at_program_" --version </dev/null
+      echo
+    } >&5 2>&1
+  else
+    as_fn_error $? "cannot find $at_program" "$LINENO" 5
+  fi
+done
+
+{
+  $as_echo "## ------------------ ##
+## Running the tests. ##
+## ------------------ ##"
+} >&5
+
+at_start_date=`date`
+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
+
+# Can we diff with `/dev/null'?  DU 5.0 refuses.
+if diff /dev/null /dev/null >/dev/null 2>&1; then
+  at_devnull=/dev/null
+else
+  at_devnull=$at_suite_dir/devnull
+  >"$at_devnull"
+fi
+
+# Use `diff -u' when possible.
+if at_diff=`diff -u "$at_devnull" "$at_devnull" 2>&1` && test -z "$at_diff"
+then
+  at_diff='diff -u'
+else
+  at_diff=diff
+fi
+
+# Get the last needed group.
+for at_group in : $at_groups; do :; done
+
+# Extract the start and end lines of each test group at the tail
+# of this file
+awk '
+BEGIN { FS="" }
+/^#AT_START_/ {
+  start = NR
+}
+/^#AT_STOP_/ {
+  test = substr ($ 0, 10)
+  print "at_sed" test "=\"1," start "d;" (NR-1) "q\""
+  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
+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
+
+# 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 ()
+{
+  # The directory for additional per-group helper files.
+  at_job_dir=$at_helper_dir/$at_group
+  # The file containing the location of the last AT_CHECK.
+  at_check_line_file=$at_job_dir/check-line
+  # The file containing the exit status of the last command.
+  at_status_file=$at_job_dir/status
+  # The files containing the output of the tested commands.
+  at_stdout=$at_job_dir/stdout
+  at_stder1=$at_job_dir/stder1
+  at_stderr=$at_job_dir/stderr
+  # The file containing the code for a test group.
+  at_test_source=$at_job_dir/test-source
+  # The file containing dates.
+  at_times_file=$at_job_dir/times
+
+  # Be sure to come back to the top test directory.
+  cd "$at_suite_dir"
+
+  # Clearly separate the test groups when verbose.
+  $at_first || $at_verbose echo
+
+  at_group_normalized=$at_group
+
+  eval 'while :; do
+    case $at_group_normalized in #(
+    '"$at_format"'*) break;;
+    esac
+    at_group_normalized=0$at_group_normalized
+  done'
+
+
+  # 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;}
+  # Be tolerant if the above `rm' was not able to remove the directory.
+  as_dir="$at_group_dir"; as_fn_mkdir_p
+
+  echo 0 > "$at_status_file"
+
+  # In verbose mode, append to the log file *and* show on
+  # the standard output; in quiet mode only write to the log.
+  if test -z "$at_verbose"; then
+    at_tee_pipe='tee -a "$at_group_log"'
+  else
+    at_tee_pipe='cat >> "$at_group_log"'
+  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 ()
+{
+  # Be sure to come back to the suite directory, in particular
+  # since below we might `rm' the group directory we are in currently.
+  cd "$at_suite_dir"
+
+  if test ! -f "$at_check_line_file"; then
+    sed "s/^ */$as_me: WARNING: /" <<_ATEOF
+      A failure happened in a test group before any test could be
+      run. This means that test suite is improperly designed.  Please
+      report this failure to <opendap-tech@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"
+  case $at_xfail:$at_status in
+    yes:0)
+	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
+	;;
+  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
+  at_log_msg="$at_group. $at_desc ($at_setup_line): $at_msg"
+  case $at_status in
+    0|77)
+      # $at_times_file is only available if the group succeeded.
+      # We're not including the group log, so the success message
+      # is written in the global log separately.  But we also
+      # write to the group log in case they're using -d.
+      if test -f "$at_times_file"; then
+	at_log_msg="$at_log_msg     ("`sed 1d "$at_times_file"`')'
+	rm -f "$at_times_file"
+      fi
+      $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
+      else
+	if test -d "$at_group_dir"; then
+	  find "$at_group_dir" -type d ! -perm -700 -exec chmod u+rwx \{\} \;
+	  rm -fr "$at_group_dir"
+	fi
+	rm -f "$at_test_source"
+      fi
+      ;;
+    *)
+      # Upon failure, include the log into the testsuite's global
+      # log.  The failure message is written in the group log.  It
+      # is later included in the global log.
+      $as_echo "$at_log_msg" >> "$at_group_log"
+
+      # 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
+      if $at_errexit; then
+	echo stop > "$at_stop_file"
+      fi
+      ;;
+  esac
+}
+
+
+## ------------ ##
+## 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
+$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
+  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
+
+# Wrap up the test suite with summary statistics.
+cd "$at_helper_dir"
+
+# Use ?..???? when the list must remain sorted, the faster * otherwise.
+at_pass_list=`for f in */pass; do echo $f; done | sed '/\*/d; s,/pass,,'`
+at_skip_list=`for f in */skip; do echo $f; done | sed '/\*/d; s,/skip,,'`
+at_xfail_list=`for f in */xfail; do echo $f; done | sed '/\*/d; s,/xfail,,'`
+at_xpass_list=`for f in ?/xpass ??/xpass ???/xpass ????/xpass; do
+		 echo $f; done | sed '/?/d; s,/xpass,,'`
+at_fail_list=`for f in ?/fail ??/fail ???/fail ????/fail; do
+		echo $f; done | sed '/?/d; s,/fail,,'`
+
+set X $at_pass_list $at_xpass_list $at_xfail_list $at_fail_list $at_skip_list
+shift; at_group_count=$#
+set X $at_xpass_list; shift; at_xpass_count=$#; at_xpass_list=$*
+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
+
+# Back to the top directory.
+cd "$at_dir"
+rm -rf "$at_helper_dir"
+
+# Compute the duration of the suite.
+at_stop_date=`date`
+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_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 "## ------------- ##
+## Test results. ##
+## ------------- ##"
+echo
+{
+  echo
+  $as_echo "## ------------- ##
+## Test results. ##
+## ------------- ##"
+  echo
+} >&5
+
+if test $at_run_count = 1; then
+  at_result="1 test"
+  at_were=was
+else
+  at_result="$at_run_count tests"
+  at_were=were
+fi
+if $at_errexit_p && test $at_unexpected_count != 0; then
+  if test $at_xpass_count = 1; then
+    at_result="$at_result $at_were run, one passed"
+  else
+    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 ;;
+
+    # Some unexpected failures
+    0:*:0) at_result="$at_result $at_were run,
+$at_fail_count failed unexpectedly." ;;
+
+    # Some failures, both expected and unexpected
+    0:*:1) at_result="$at_result $at_were run,
+$at_total_fail_count failed ($at_xfail_count expected failure)." ;;
+    0:*:*) at_result="$at_result $at_were run,
+$at_total_fail_count failed ($at_xfail_count expected failures)." ;;
+
+    # No unexpected failures, but some xpasses
+    *:0:*) at_result="$at_result $at_were run,
+$at_xpass_count passed unexpectedly." ;;
+
+    # No expected failures, but failures and xpasses
+    *:1:0) at_result="$at_result $at_were run,
+$at_unexpected_count did not behave as expected ($at_fail_count unexpected failure)." ;;
+    *:*:0) at_result="$at_result $at_were run,
+$at_unexpected_count did not behave as expected ($at_fail_count unexpected failures)." ;;
+
+    # All of them.
+    *:*:1) at_result="$at_result $at_were run,
+$at_xpass_count passed unexpectedly,
+$at_total_fail_count failed ($at_xfail_count expected failure)." ;;
+    *:*:*) at_result="$at_result $at_were run,
+$at_xpass_count passed unexpectedly,
+$at_total_fail_count failed ($at_xfail_count expected failures)." ;;
+  esac
+
+  if test $at_skip_count = 0 && test $at_run_count -gt 1; then
+    at_result="All $at_result"
+  fi
+fi
+
+# Now put skips in the mix.
+case $at_skip_count in
+  0) ;;
+  1) at_result="$at_result
+1 test was skipped." ;;
+  *) at_result="$at_result
+$at_skip_count tests were skipped." ;;
+esac
+
+if test $at_unexpected_count = 0; then
+  echo "$at_color$at_result$at_std"
+  echo "$at_result" >&5
+else
+  echo "${at_color}ERROR: $at_result$at_std" >&2
+  echo "ERROR: $at_result" >&5
+  {
+    echo
+    $as_echo "## ------------------------ ##
+## Summary of the failures. ##
+## ------------------------ ##"
+
+    # Summary of failed and skipped tests.
+    if test $at_fail_count != 0; then
+      echo "Failed tests:"
+      $SHELL "$at_myself" $at_fail_list --list
+      echo
+    fi
+    if test $at_skip_count != 0; then
+      echo "Skipped tests:"
+      $SHELL "$at_myself" $at_skip_list --list
+      echo
+    fi
+    if test $at_xpass_count != 0; then
+      echo "Unexpected passes:"
+      $SHELL "$at_myself" $at_xpass_list --list
+      echo
+    fi
+    if test $at_fail_count != 0; then
+      $as_echo "## ---------------------- ##
+## Detailed failed tests. ##
+## ---------------------- ##"
+      echo
+      for at_group in $at_fail_list
+      do
+	at_group_normalized=$at_group
+
+  eval 'while :; do
+    case $at_group_normalized in #(
+    '"$at_format"'*) break;;
+    esac
+    at_group_normalized=0$at_group_normalized
+  done'
+
+	cat "$at_suite_dir/$at_group_normalized/$as_me.log"
+	echo
+      done
+      echo
+    fi
+    if test -n "$at_top_srcdir"; then
+      sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## ${at_top_build_prefix}config.log ##
+_ASBOX
+      sed 's/^/| /' ${at_top_build_prefix}config.log
+      echo
+    fi
+  } >&5
+
+  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## $as_me.log was created. ##
+_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:
+
+   To: <opendap-tech@opendap.org>
+   Subject: [libdap 3.19.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'.
+"
+  exit 1
+fi
+
+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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "1. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:57"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_1
+#AT_START_2
+at_fn_group_banner 2 'EXPRTest.at:57' \
+  "expr-test -W \$abs_srcdir/expr-testsuite/test.1 -k i (pass)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "2. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:57"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "3. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:58"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "4. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:58"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "5. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:59"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "6. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:59"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "7. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:60"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "8. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:60"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_8
+#AT_START_9
+at_fn_group_banner 9 'EXPRTest.at:61' \
+  "expr-test -w \$abs_srcdir/expr-testsuite/test.2 -k s1 (pass)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "9. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:61"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_9
+#AT_START_10
+at_fn_group_banner 10 'EXPRTest.at:61' \
+  "expr-test -W \$abs_srcdir/expr-testsuite/test.2 -k s1 (pass)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "10. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:61"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_10
+#AT_START_11
+at_fn_group_banner 11 'EXPRTest.at:62' \
+  "expr-test -w \$abs_srcdir/expr-testsuite/test.2 -k s2 (pass)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "11. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:62"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_11
+#AT_START_12
+at_fn_group_banner 12 'EXPRTest.at:62' \
+  "expr-test -W \$abs_srcdir/expr-testsuite/test.2 -k s2 (pass)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "12. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:62"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "13. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:63"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "14. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:63"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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 'EXPRTest.at:64' \
+  "expr-test -w \$abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4],s3.o (pass)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "15. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:64"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "16. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:64"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "17. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:66"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "18. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:66"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "19. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:67"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "20. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:67"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "21. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:69"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "22. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:69"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "23. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:70"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "24. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:70"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "25. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:71"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "26. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:71"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "27. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    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
+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_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_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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:81"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "28. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { 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
+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_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_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
+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_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=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:84"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "29. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:89"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "30. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:89"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "31. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:91"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "32. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:91"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "33. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:92"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "34. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:92"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_34
+#AT_START_35
+at_fn_group_banner 35 'EXPRTest.at:93' \
+  "expr-test -w \$abs_srcdir/expr-testsuite/test.6 -k i (pass)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "35. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:93"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_35
+#AT_START_36
+at_fn_group_banner 36 'EXPRTest.at:93' \
+  "expr-test -W \$abs_srcdir/expr-testsuite/test.6 -k i (pass)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "36. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:93"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "37. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:94"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "38. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:94"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "39. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:95"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "40. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:95"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "41. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:96"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "42. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:96"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "43. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:97"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "44. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:97"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "45. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:98"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "46. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:98"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "47. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:99"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "48. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:99"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "49. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:100"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "50. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:100"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "51. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:101"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "52. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:101"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "53. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:102"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "54. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:102"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "55. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:103"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "56. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:103"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "57. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:104"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "58. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:104"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "59. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:105"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "60. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:105"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "61. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:109"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "62. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:109"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "63. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:110"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "64. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:110"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "65. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:112"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "66. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:112"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "67. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:114"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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 'EXPRTest.at:114' \
+  "expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k scale\\(j,2\\) (pass)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "68. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:114"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_68
+#AT_START_69
+at_fn_group_banner 69 'EXPRTest.at:116' \
+  "expr-test -w \$abs_srcdir/expr-testsuite/test.a -k \"\" -b (pass)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "69. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:116"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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 'EXPRTest.at:116' \
+  "expr-test -W \$abs_srcdir/expr-testsuite/test.a -k \"\" -b (pass)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "70. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:116"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "71. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:117"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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 'EXPRTest.at:117' \
+  "expr-test -W \$abs_srcdir/expr-testsuite/test.a -k \"&i<2000\" -b (pass)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "72. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:117"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "73. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:118"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "74. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:118"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "75. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:119"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "76. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:119"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_76
+#AT_START_77
+at_fn_group_banner 77 'EXPRTest.at:120' \
+  "expr-test -w \$abs_srcdir/expr-testsuite/test.b -k \"\" -b (pass)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "77. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:120"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_77
+#AT_START_78
+at_fn_group_banner 78 'EXPRTest.at:120' \
+  "expr-test -W \$abs_srcdir/expr-testsuite/test.b -k \"\" -b (pass)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "78. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:120"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "79. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:121"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "80. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:121"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "81. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:122"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "82. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:122"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "83. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:123"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "84. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:123"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "85. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:124"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "86. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:124"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "87. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:125"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "88. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:125"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_88
+#AT_START_89
+at_fn_group_banner 89 'EXPRTest.at:126' \
+  "expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"\" -b (pass)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "89. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:126"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_89
+#AT_START_90
+at_fn_group_banner 90 'EXPRTest.at:126' \
+  "expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"\" -b (pass)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "90. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:126"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "91. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:127"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "92. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:127"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "93. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:128"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "94. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:128"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "95. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:129"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "96. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:129"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "97. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:130"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "98. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:130"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "99. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:131"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "100. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:131"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "101. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:132"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "102. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:132"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "103. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:133"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "104. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:133"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "105. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:135"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "106. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:135"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "107. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:136"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "108. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:136"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "109. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:137"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "110. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:137"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "111. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:138"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "112. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:138"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "113. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:139"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "114. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:139"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_114
+#AT_START_115
+at_fn_group_banner 115 'EXPRTest.at:141' \
+  "expr-test -b -w \$abs_srcdir/expr-testsuite/test.f -k \"\" (pass)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "115. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:141"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_115
+#AT_START_116
+at_fn_group_banner 116 'EXPRTest.at:141' \
+  "expr-test -b -W \$abs_srcdir/expr-testsuite/test.f -k \"\" (pass)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "116. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:141"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "117. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:142"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "118. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:142"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "119. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:146"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "120. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:146"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "121. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:147"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "122. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:147"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "123. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:148"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "124. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:148"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "125. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:149"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "126. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:149"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "127. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:153"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "128. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:153"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "129. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:154"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "130. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    if test -n "$baselines" -a x$baselines = xyes; then :
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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
+$at_traceon; }
+
+
+else
+
+        { set +x
+$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 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_traceon; }
+
+        { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:154"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+fi
+
+      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_130
diff --git a/tests/EXPRTest.at b/tests/EXPRTest.at
new file mode 100644
index 0000000..a94e143
--- /dev/null
+++ b/tests/EXPRTest.at
@@ -0,0 +1,155 @@
+# Process with autom4te to create an -*- Autotest -*- test suite.
+
+AT_INIT([expr-test])
+# AT_COPYRIGHT([])
+
+# AT_TESTED([expr-test])
+
+AT_ARG_OPTION_ARG([baselines],
+    [--baselines=yes|no   Build the baseline file for parser test 'arg'],
+    [echo "baselines set to $at_arg_baselines";
+     baselines=$at_arg_baselines],[baselines=])
+
+# Usage: _EXPR_TEST(<flags>, <dds>, <constraint>, <baseline file>, <xfail?>)
+
+m4_define([_EXPR_TEST], [
+    # AT_BANNER([Test $1 $2 $3])
+    AT_SETUP([expr-test $1 $2 -k $3 ($5)])
+    AT_KEYWORDS([expr])
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    AS_IF([test -n "$baselines" -a x$baselines = xyes],
+        [
+        AT_CHECK([$abs_builddir/expr-test $1 $2 -k $3 -f "dummy" || true], [0], [stdout], [stderr])
+        AT_CHECK([mv stdout $4.tmp])
+        ],
+        [
+        AT_CHECK([$abs_builddir/expr-test $1 $2 -k $3 -f "dummy" || true], [0], [stdout], [stderr])
+        AT_CHECK([diff -b -B $4 stdout || diff -b -B $4 stderr], [0], [ignore])
+        AT_XFAIL_IF([test "$5" = "xfail"])
+        ])
+    
+    AT_CLEANUP
+])
+
+m4_define([EXPR_RESPONSE_P], [
+    # AT_BANNER([EXPR response for $1, $2, $4.])
+    # Test the serialize/deserialize methods
+    _EXPR_TEST([-w], [$abs_srcdir/expr-testsuite/$1], [$2], [$abs_srcdir/expr-testsuite/$3.base], $4)
+    # Test the intern_data method (which combines serialize and deserialze)
+    _EXPR_TEST([-W], [$abs_srcdir/expr-testsuite/$1], [$2], [$abs_srcdir/expr-testsuite/$3.base], $4)
+])
+
+# The -b option to expr-test uses the 'series values' feature of the Test
+# classes.
+m4_define([EXPR_RESPONSE_B], [
+    # AT_BANNER([EXPR response for $1, $2, $4.])
+    _EXPR_TEST([-b -w], [$abs_srcdir/expr-testsuite/$1], [$2], [$abs_srcdir/expr-testsuite/$3.base], $4)
+    _EXPR_TEST([-b -W], [$abs_srcdir/expr-testsuite/$1], [$2], [$abs_srcdir/expr-testsuite/$3.base], $4)
+])
+
+EXPR_RESPONSE_P([test.1], [i], [test.1], [pass])
+EXPR_RESPONSE_P([test.1], [i,j], [test.1a], [pass])
+EXPR_RESPONSE_P([test.1], ['i,j&i=j'], [test.1b], [pass])
+EXPR_RESPONSE_P([test.1], ['i&i=j'], [test.1d], [pass])
+EXPR_RESPONSE_P([test.2], [s1], [test.2], [pass])
+EXPR_RESPONSE_P([test.2], [s2], [test.2a], [pass])
+EXPR_RESPONSE_P([test.2], [s2,s3], [test.2b], [pass])
+EXPR_RESPONSE_P([test.2], [s2[[2:2:4]],s3.o], [test.2c], [pass])
+
+EXPR_RESPONSE_P([test.2], [s2[[2:2:4]].m], [test.2d], [pass])
+EXPR_RESPONSE_P([test.2], [s2[[2:2:4]].m,s2[[2:2:4]].l], [test.2e], [pass])
+
+EXPR_RESPONSE_P([test.2a], [s2[[2:4]].m[[0:4]],s2[[2:4]].l[[0:5]]], [test.2f], [pass])
+EXPR_RESPONSE_P([test.3], [i[[1:10]]], [test.3], [pass])
+EXPR_RESPONSE_P([test.4], ['s&s=~"^Silly.*"'], [test.4], [pass])
+
+dnl In changing the TestStr class so that it writes a constant value (Silly ...: 1)
+dnl I had to hack this test to use the -b option to expr-test. EXPR_RESPONSE_P uses
+dnl only the -w/-W options, so I dropped using that macro kluge and went right for the
+dnl actual test macro. 12/2/13/ jhrg
+dnl
+dnl EXPR_RESPONSE_P([test.e], ['names.s&names.s=~".*: 3"'], [test.ea], [pass])
+    
+_EXPR_TEST([-b -w], [$abs_srcdir/expr-testsuite/test.e], ['names.s&names.s=~".*: 3"'], 
+    [$abs_srcdir/expr-testsuite/test.ea.base], [pass])
+    
+_EXPR_TEST([-b -W], [$abs_srcdir/expr-testsuite/test.e], ['names.s&names.s=~".*: 3"'], 
+    [$abs_srcdir/expr-testsuite/test.ea.base], [pass])
+
+dnl since 'Silly ...:5' will never be produced, this tests what happens when the sequence
+dnl does not contain the value. Note that this test does not have to be rewritten because
+dnl of the change to the TestStr code. 12/2/13 jhrg
+EXPR_RESPONSE_P([test.e], ['names.s&names.s=~".*: 5"'], [test.eb], [pass])
+
+EXPR_RESPONSE_P([test.5], [g[[0:2:4]][[0]][[0]]], [test.5], [pass])
+EXPR_RESPONSE_P([test.5], [g[[0:2:4]][[0:2:4]][[0:2:4]]], [test.5a], [pass])
+EXPR_RESPONSE_P([test.6], [i], [test.6], [pass])
+EXPR_RESPONSE_P([test.6], [i[[1:2]][[2:4]]], [test.6a], [pass])
+EXPR_RESPONSE_P([test.5], [g.val[[0:1]][[0:1]][[0:1]]], [test.5b], [pass])
+EXPR_RESPONSE_P([test.5], [g.length], [test.5c], [pass])
+EXPR_RESPONSE_P([test.5], [g.length,g.width], [test.5d], [pass])
+EXPR_RESPONSE_P([test.2], [j,o], [test.2g], [pass])
+EXPR_RESPONSE_P([test.8], ["data%23i[[0:2:9]][[0:2]]"], [test.8], [pass])
+EXPR_RESPONSE_P([test.7], [x,y,f], [test.7], [pass])
+EXPR_RESPONSE_P([test.8], ["x%23y,y"], [test.8a], [pass])
+EXPR_RESPONSE_P([test.8], ["data%20name,y"], [test.8b], [pass])
+EXPR_RESPONSE_P([test.9], ["Data-Set-2.fakeDim0[[0:3]],Data-Set-2.fakeDim1[[0:3]]"], [test.9], [pass])
+EXPR_RESPONSE_P([test.5], [g[[1:4:9]]], [test.5e], [pass])
+EXPR_RESPONSE_P([test.6], [i[[1:4:9]]], [test.6b], [pass])
+
+# New tests for server functions that take arrays and include array projections
+# Added 10/23/13 jhrg
+EXPR_RESPONSE_P([test.6], [scale\(i,2\)], [test.6.func1], [pass])
+EXPR_RESPONSE_P([test.6], [scale\(i[[2:4]][[3:6]],2\)], [test.6.func2], [pass])
+
+EXPR_RESPONSE_P([test.5], [scale\(i[[3]],2\)], [test.5.func3], [pass])
+# This doesn't work yet 10/23/13 jhrg 
+EXPR_RESPONSE_P([test.5], [scale\(j,2\)], [test.5.func4], [pass])
+
+EXPR_RESPONSE_P([test.a], ["" -b], [test.a], [pass])
+EXPR_RESPONSE_P([test.a], ["&i<2000" -b], [test.aa], [pass])
+EXPR_RESPONSE_P([test.a], ["j&i>2000" -b], [test.ab], [pass])
+EXPR_RESPONSE_P([test.a], ["i,j&i<0" -b], [test.ac], [pass])
+EXPR_RESPONSE_P([test.b], ["" -b], [test.b], [pass])
+EXPR_RESPONSE_P([test.b], ["i,f" -b], [test.ba], [pass])
+EXPR_RESPONSE_P([test.b], ["i,f&i<2000" -b], [test.bb], [pass])
+EXPR_RESPONSE_P([test.b], ["i,f&f<0" -b], [test.bc], [pass])
+EXPR_RESPONSE_P([test.b], ["i,j&i<2000" -b], [test.bd], [pass])
+EXPR_RESPONSE_P([test.b], ["&i<0" -b], [test.be], [pass])
+EXPR_RESPONSE_P([test.d], ["" -b], [test.d], [pass])
+EXPR_RESPONSE_P([test.d], ["i,f,a" -b], [test.da], [pass])
+EXPR_RESPONSE_P([test.d], ["i,f,a&i<2000" -b], [test.db], [pass])
+EXPR_RESPONSE_P([test.d], ["i,f,a&f<0" -b], [test.dc], [pass])
+EXPR_RESPONSE_P([test.d], ["i,f,a&a<10" -b], [test.dd], [pass])
+EXPR_RESPONSE_P([test.d], ["i,f&i<2000" -b], [test.de], [pass])
+EXPR_RESPONSE_P([test.d], ["i&i<2000" -b], [test.df], [pass])
+EXPR_RESPONSE_P([test.d], ["i,f,a&i<0" -b], [test.dg], [pass])
+
+EXPR_RESPONSE_B([test.61], [i], [data.61a], [pass])
+EXPR_RESPONSE_B([test.61], [ i[[0:2]][[0:2]] ], [data.61b], [pass])
+EXPR_RESPONSE_B([test.61], [ i[[1:2]][[0:2]] ], [data.61c], [pass])
+EXPR_RESPONSE_B([test.61], [ i[[1:2]][[1:2]] ], [data.61d], [pass])
+EXPR_RESPONSE_B([test.c0], [SST], [data.z1], [pass])
+
+EXPR_RESPONSE_B([test.f], [""], [test.fa], [pass])
+EXPR_RESPONSE_B([test.f], ["&i<3000"], [test.fb], [pass])
+
+# tests for zero-length arrays. jhrg 1/28/16
+
+EXPR_RESPONSE_B([test.21.dds], [""], [data.21], [pass])
+EXPR_RESPONSE_B([test.22.dds], [""], [data.22], [pass])
+EXPR_RESPONSE_B([test.23.dds], [""], [data.23], [pass])
+EXPR_RESPONSE_B([test.24.dds], [""], [data.24], [pass])
+
+# Empty Structures. jhrg 1/29/16
+
+EXPR_RESPONSE_B([test.25.dds], [""], [data.25], [pass])
+EXPR_RESPONSE_B([test.26.dds], [""], [data.26], [pass])
+
diff --git a/tests/Makefile.am b/tests/Makefile.am
new file mode 100644
index 0000000..a66cb67
--- /dev/null
+++ b/tests/Makefile.am
@@ -0,0 +1,163 @@
+# Tests
+
+AUTOMAKE_OPTIONS = foreign
+
+# Arrange to build with the backward compatibility mode enabled.
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/GNU -I$(top_srcdir)/d4_ce \
+-I$(top_srcdir)/d4_function $(XML2_CFLAGS) $(CURL_CFLAGS)
+AM_CXXFLAGS =  
+
+if COMPILER_IS_GCC
+AM_CXXFLAGS += -Wall -W -Wcast-align
+endif
+
+CXXFLAGS_DEBUG = -g3 -O0  -Wall -W -Wcast-align
+TEST_COV_FLAGS = -ftest-coverage -fprofile-arcs
+
+if BUILD_DEVELOPER
+AM_CXXFLAGS += $(CXXFLAGS_DEBUG)
+endif
+
+check_PROGRAMS = das-test dds-test expr-test 
+
+if DAP4_DEFINED
+check_PROGRAMS += dmr-test
+endif
+
+# This will use automake's test envokation code. It's better to use
+# our own so we can pass in flags for autotest, esp --jobs=N to get
+# the autotest tests to run in parallel. See check-local: below.
+
+# TESTS = DASTest DDSTest EXPRTest DMRTest getdapTest
+
+check_SCRIPTS = $(DASTESTSUITE) $(DDSTESTSUITE) $(EXPRTESTSUITE) \
+	$(DMRTESTSUITE) $(GETDAPTESTSUITE)
+
+# Build the test drivers. The drivers all use the
+# subclassed types in Test*.cc and the TestTypesFactory.
+
+lib_LIBRARIES = libtest-types.a
+
+libtest_types_a_SOURCES = $(TESTSRCS) $(TEST_HDR)
+libtest_types_a_CXXFLAGS = -fPIC
+
+testheadersdir = $(pkgincludedir)/test
+testheaders_HEADERS = $(TEST_HDR)
+
+das_test_SOURCES = das-test.cc
+das_test_LDADD =  libtest-types.a ../libdapserver.la ../libdap.la 
+
+dds_test_SOURCES = dds-test.cc
+dds_test_LDADD = libtest-types.a ../libdapserver.la ../libdap.la 
+
+expr_test_SOURCES = expr-test.cc ResponseBuilder.cc ResponseBuilder.h
+expr_test_LDADD = libtest-types.a ../libdapserver.la ../libdapclient.la ../libdap.la
+
+if DAP4_DEFINED
+dmr_test_SOURCES = dmr-test.cc D4ResponseBuilder.cc D4ResponseBuilder.h
+dmr_test_LDADD = libtest-types.a ../libdapserver.la ../libdap.la
+endif
+
+TESTSRCS = TestByte.cc TestInt32.cc TestFloat64.cc TestStr.cc TestUrl.cc \
+	   TestArray.cc TestStructure.cc TestSequence.cc		 \
+	   TestGrid.cc TestUInt32.cc TestInt16.cc TestUInt16.cc		 \
+	   TestFloat32.cc TestTypeFactory.cc D4TestTypeFactory.cc \
+	   TestD4Group.cc TestInt8.cc TestInt64.cc TestUInt64.cc TestD4Sequence.cc \
+	   TestD4Enum.cc TestD4Opaque.cc TestFunction.cc D4TestFunction.cc
+
+# TestCommon.cc Removed jhrg 3/12/15
+
+TEST_HDR = TestArray.h TestByte.h TestCommon.h TestFloat32.h TestFloat64.h    \
+	TestGrid.h TestInt16.h TestInt32.h TestSequence.h TestStr.h	      \
+	TestStructure.h TestTypeFactory.h TestUInt16.h TestUInt32.h TestUrl.h \
+	D4TestTypeFactory.h TestD4Group.h TestInt8.h TestInt64.h TestUInt64.h \
+	TestD4Sequence.h TestD4Enum.h TestD4Opaque.h TestFunction.h D4TestFunction.h
+
+DIRS_EXTRA = das-testsuite dds-testsuite expr-testsuite dmr-testsuite \
+	getdap-testsuite
+
+EXTRA_DIST = DASTest.at $(DASTESTSUITE) DDSTest.at $(DDSTESTSUITE) \
+	EXPRTest.at $(EXPRTESTSUITE) DMRTest.at $(DMRTESTSUITE) \
+	getdapTest.at $(GETDAPTESTSUITE) getdap-testsuite atlocal.in \
+	$(srcdir)/package.m4 $(DIRS_EXTRA)
+
+CLEANFILES = dmr-testsuite.tar.gz
+
+DISTCLEANFILES = *.log
+
+# DASTest.dir/* DDSTest.dir/* EXPRTest.dir/* DMRTest.dir/* getdapTest.dir/*
+
+dmr-testsuite.tar.gz: dmr-testsuite/*.xml
+	tar -czf $@ $^
+
+############## Autotest follows #####################
+
+AUTOM4TE = autom4te
+
+TESTSUITEFLAGS =
+
+DASTESTSUITE = $(srcdir)/DASTest
+
+DDSTESTSUITE = $(srcdir)/DDSTest
+
+EXPRTESTSUITE = $(srcdir)/EXPRTest
+
+DMRTESTSUITE = $(srcdir)/DMRTest
+
+GETDAPTESTSUITE = $(srcdir)/getdapTest
+
+check-local: atconfig atlocal $(DASTESTSUITE) $(DDSTESTSUITE) \
+$(EXPRTESTSUITE) $(DMRTESTSUITE) $(GETDAPTESTSUITE) 
+	$(SHELL) '$(DASTESTSUITE)' $(TESTSUITEFLAGS)
+	$(SHELL) '$(DDSTESTSUITE)' $(TESTSUITEFLAGS)
+	$(SHELL) '$(EXPRTESTSUITE)' $(TESTSUITEFLAGS)
+	$(SHELL) '$(DMRTESTSUITE)' $(TESTSUITEFLAGS)
+	$(SHELL) '$(GETDAPTESTSUITE)' $(TESTSUITEFLAGS)
+
+# Make sure there are no spaces after the DASTESTSUITE names. jhrg 3/16/15
+# Delete the scripts here and not using CLEANFILES because this target is
+# run after the 'regular' clean: and we need the test scripts to run their
+# --clean option. Once that's done, then remove them. 
+clean-local:
+	test ! -f '$(DASTESTSUITE)' || $(SHELL) $(DASTESTSUITE) --clean
+	test ! -f '$(DDSTESTSUITE)' || $(SHELL) $(DDSTESTSUITE) --clean
+	test ! -f '$(EXPRTESTSUITE)' || $(SHELL) $(EXPRTESTSUITE) --clean
+	test ! -f '$(DMRTESTSUITE)' || $(SHELL) $(DMRTESTSUITE) --clean
+	test ! -f '$(GETDAPTESTSUITE)' || $(SHELL) $(GETDAPTESTSUITE) --clean
+
+distclean-local:
+	-rm atconfig
+
+AUTOTEST = $(AUTOM4TE) --language=autotest
+
+$(DASTESTSUITE): $(srcdir)/DASTest.at $(srcdir)/package.m4
+	$(AUTOTEST) -I '$(srcdir)' -o $@.tmp $@.at
+	mv $@.tmp $@
+
+$(DDSTESTSUITE): $(srcdir)/DDSTest.at $(srcdir)/package.m4
+	$(AUTOTEST) -I '$(srcdir)' -o $@.tmp $@.at
+	mv $@.tmp $@
+
+$(EXPRTESTSUITE): $(srcdir)/EXPRTest.at $(srcdir)/package.m4
+	$(AUTOTEST) -I '$(srcdir)' -o $@.tmp $@.at
+	mv $@.tmp $@
+
+$(DMRTESTSUITE): $(srcdir)/DMRTest.at $(srcdir)/package.m4
+	$(AUTOTEST) -I '$(srcdir)' -o $@.tmp $@.at
+	mv $@.tmp $@
+
+$(GETDAPTESTSUITE): $(srcdir)/getdapTest.at $(srcdir)/package.m4
+	$(AUTOTEST) -I '$(srcdir)' -o $@.tmp $@.at
+	mv $@.tmp $@
+
+# The `:;' works around a Bash 3.2 bug when the output is not writable.
+$(srcdir)/package.m4: $(top_srcdir)/configure.ac
+	:;{ \
+	echo '# Signature of the current package.' && \
+	echo 'm4_define([AT_PACKAGE_NAME],      [@PACKAGE_NAME@])' && \
+	echo 'm4_define([AT_PACKAGE_TARNAME],   [@PACKAGE_TARNAME@])' && \
+	echo 'm4_define([AT_PACKAGE_VERSION],   [@PACKAGE_VERSION@])' && \
+	echo 'm4_define([AT_PACKAGE_STRING],    [@PACKAGE_STRING@])' && \
+	echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \
+	} >'$(srcdir)/package.m4'
+
diff --git a/tests/Makefile.in b/tests/Makefile.in
new file mode 100644
index 0000000..6748cba
--- /dev/null
+++ b/tests/Makefile.in
@@ -0,0 +1,1861 @@
+# Makefile.in generated by automake 1.14 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# Tests
+
+
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+@COMPILER_IS_GCC_TRUE@am__append_1 = -Wall -W -Wcast-align
+@BUILD_DEVELOPER_TRUE@am__append_2 = $(CXXFLAGS_DEBUG)
+check_PROGRAMS = das-test$(EXEEXT) dds-test$(EXEEXT) \
+	expr-test$(EXEEXT) $(am__EXEEXT_1)
+@DAP4_DEFINED_TRUE@am__append_3 = dmr-test
+subdir = tests
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(srcdir)/atlocal.in $(top_srcdir)/conf/depcomp \
+	$(testheaders_HEADERS) README
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/gl/m4/00gnulib.m4 \
+	$(top_srcdir)/gl/m4/absolute-header.m4 \
+	$(top_srcdir)/gl/m4/alloca.m4 $(top_srcdir)/gl/m4/btowc.m4 \
+	$(top_srcdir)/gl/m4/builtin-expect.m4 \
+	$(top_srcdir)/gl/m4/byteswap.m4 $(top_srcdir)/gl/m4/codeset.m4 \
+	$(top_srcdir)/gl/m4/configmake.m4 \
+	$(top_srcdir)/gl/m4/eealloc.m4 \
+	$(top_srcdir)/gl/m4/extensions.m4 \
+	$(top_srcdir)/gl/m4/extern-inline.m4 \
+	$(top_srcdir)/gl/m4/fcntl-o.m4 $(top_srcdir)/gl/m4/fcntl_h.m4 \
+	$(top_srcdir)/gl/m4/gettimeofday.m4 \
+	$(top_srcdir)/gl/m4/glibc21.m4 \
+	$(top_srcdir)/gl/m4/gnulib-common.m4 \
+	$(top_srcdir)/gl/m4/gnulib-comp.m4 \
+	$(top_srcdir)/gl/m4/gnulib-tool.m4 \
+	$(top_srcdir)/gl/m4/hard-locale.m4 \
+	$(top_srcdir)/gl/m4/include_next.m4 \
+	$(top_srcdir)/gl/m4/langinfo_h.m4 \
+	$(top_srcdir)/gl/m4/largefile.m4 $(top_srcdir)/gl/m4/lib-ld.m4 \
+	$(top_srcdir)/gl/m4/lib-link.m4 \
+	$(top_srcdir)/gl/m4/lib-prefix.m4 \
+	$(top_srcdir)/gl/m4/limits-h.m4 \
+	$(top_srcdir)/gl/m4/localcharset.m4 \
+	$(top_srcdir)/gl/m4/locale-fr.m4 \
+	$(top_srcdir)/gl/m4/locale-ja.m4 \
+	$(top_srcdir)/gl/m4/locale-zh.m4 \
+	$(top_srcdir)/gl/m4/locale_h.m4 \
+	$(top_srcdir)/gl/m4/localeconv.m4 \
+	$(top_srcdir)/gl/m4/localtime-buffer.m4 \
+	$(top_srcdir)/gl/m4/lock.m4 $(top_srcdir)/gl/m4/longlong.m4 \
+	$(top_srcdir)/gl/m4/lstat.m4 $(top_srcdir)/gl/m4/malloca.m4 \
+	$(top_srcdir)/gl/m4/mbrtowc.m4 $(top_srcdir)/gl/m4/mbsinit.m4 \
+	$(top_srcdir)/gl/m4/mbstate_t.m4 $(top_srcdir)/gl/m4/mbtowc.m4 \
+	$(top_srcdir)/gl/m4/mkstemps.m4 \
+	$(top_srcdir)/gl/m4/multiarch.m4 \
+	$(top_srcdir)/gl/m4/nl_langinfo.m4 \
+	$(top_srcdir)/gl/m4/off_t.m4 $(top_srcdir)/gl/m4/pathmax.m4 \
+	$(top_srcdir)/gl/m4/pthread_rwlock_rdlock.m4 \
+	$(top_srcdir)/gl/m4/regex.m4 $(top_srcdir)/gl/m4/ssize_t.m4 \
+	$(top_srcdir)/gl/m4/stat.m4 $(top_srcdir)/gl/m4/stdbool.m4 \
+	$(top_srcdir)/gl/m4/stddef_h.m4 $(top_srcdir)/gl/m4/stdint.m4 \
+	$(top_srcdir)/gl/m4/stdlib_h.m4 \
+	$(top_srcdir)/gl/m4/sys_socket_h.m4 \
+	$(top_srcdir)/gl/m4/sys_stat_h.m4 \
+	$(top_srcdir)/gl/m4/sys_time_h.m4 \
+	$(top_srcdir)/gl/m4/sys_types_h.m4 \
+	$(top_srcdir)/gl/m4/tempname.m4 \
+	$(top_srcdir)/gl/m4/threadlib.m4 $(top_srcdir)/gl/m4/time_h.m4 \
+	$(top_srcdir)/gl/m4/unistd_h.m4 \
+	$(top_srcdir)/gl/m4/warn-on-use.m4 \
+	$(top_srcdir)/gl/m4/wchar_h.m4 $(top_srcdir)/gl/m4/wchar_t.m4 \
+	$(top_srcdir)/gl/m4/wcrtomb.m4 $(top_srcdir)/gl/m4/wctype_h.m4 \
+	$(top_srcdir)/gl/m4/wint_t.m4 $(top_srcdir)/conf/acinclude.m4 \
+	$(top_srcdir)/conf/cppunit.m4 \
+	$(top_srcdir)/conf/gcov_valgrind.m4 \
+	$(top_srcdir)/conf/libtool.m4 $(top_srcdir)/conf/ltoptions.m4 \
+	$(top_srcdir)/conf/ltsugar.m4 $(top_srcdir)/conf/ltversion.m4 \
+	$(top_srcdir)/conf/lt~obsolete.m4 $(top_srcdir)/conf/pkg.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h \
+	$(top_builddir)/dods-datatypes-config.h \
+	$(top_builddir)/xdr-datatypes-config.h
+CONFIG_CLEAN_FILES = atlocal
+CONFIG_CLEAN_VPATH_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(testheadersdir)"
+LIBRARIES = $(lib_LIBRARIES)
+AM_V_AR = $(am__v_AR_@AM_V@)
+am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
+am__v_AR_0 = @echo "  AR      " $@;
+am__v_AR_1 = 
+libtest_types_a_AR = $(AR) $(ARFLAGS)
+libtest_types_a_LIBADD =
+am__objects_1 = libtest_types_a-TestByte.$(OBJEXT) \
+	libtest_types_a-TestInt32.$(OBJEXT) \
+	libtest_types_a-TestFloat64.$(OBJEXT) \
+	libtest_types_a-TestStr.$(OBJEXT) \
+	libtest_types_a-TestUrl.$(OBJEXT) \
+	libtest_types_a-TestArray.$(OBJEXT) \
+	libtest_types_a-TestStructure.$(OBJEXT) \
+	libtest_types_a-TestSequence.$(OBJEXT) \
+	libtest_types_a-TestGrid.$(OBJEXT) \
+	libtest_types_a-TestUInt32.$(OBJEXT) \
+	libtest_types_a-TestInt16.$(OBJEXT) \
+	libtest_types_a-TestUInt16.$(OBJEXT) \
+	libtest_types_a-TestFloat32.$(OBJEXT) \
+	libtest_types_a-TestTypeFactory.$(OBJEXT) \
+	libtest_types_a-D4TestTypeFactory.$(OBJEXT) \
+	libtest_types_a-TestD4Group.$(OBJEXT) \
+	libtest_types_a-TestInt8.$(OBJEXT) \
+	libtest_types_a-TestInt64.$(OBJEXT) \
+	libtest_types_a-TestUInt64.$(OBJEXT) \
+	libtest_types_a-TestD4Sequence.$(OBJEXT) \
+	libtest_types_a-TestD4Enum.$(OBJEXT) \
+	libtest_types_a-TestD4Opaque.$(OBJEXT) \
+	libtest_types_a-TestFunction.$(OBJEXT) \
+	libtest_types_a-D4TestFunction.$(OBJEXT)
+am__objects_2 =
+am_libtest_types_a_OBJECTS = $(am__objects_1) $(am__objects_2)
+libtest_types_a_OBJECTS = $(am_libtest_types_a_OBJECTS)
+@DAP4_DEFINED_TRUE@am__EXEEXT_1 = dmr-test$(EXEEXT)
+am_das_test_OBJECTS = das-test.$(OBJEXT)
+das_test_OBJECTS = $(am_das_test_OBJECTS)
+das_test_DEPENDENCIES = libtest-types.a ../libdapserver.la \
+	../libdap.la
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+am_dds_test_OBJECTS = dds-test.$(OBJEXT)
+dds_test_OBJECTS = $(am_dds_test_OBJECTS)
+dds_test_DEPENDENCIES = libtest-types.a ../libdapserver.la \
+	../libdap.la
+am__dmr_test_SOURCES_DIST = dmr-test.cc D4ResponseBuilder.cc \
+	D4ResponseBuilder.h
+@DAP4_DEFINED_TRUE@am_dmr_test_OBJECTS = dmr-test.$(OBJEXT) \
+@DAP4_DEFINED_TRUE@	D4ResponseBuilder.$(OBJEXT)
+dmr_test_OBJECTS = $(am_dmr_test_OBJECTS)
+@DAP4_DEFINED_TRUE@dmr_test_DEPENDENCIES = libtest-types.a \
+@DAP4_DEFINED_TRUE@	../libdapserver.la ../libdap.la
+am_expr_test_OBJECTS = expr-test.$(OBJEXT) ResponseBuilder.$(OBJEXT)
+expr_test_OBJECTS = $(am_expr_test_OBJECTS)
+expr_test_DEPENDENCIES = libtest-types.a ../libdapserver.la \
+	../libdapclient.la ../libdap.la
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/conf/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_@AM_V@)
+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
+am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_1 = 
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_1 = 
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libtest_types_a_SOURCES) $(das_test_SOURCES) \
+	$(dds_test_SOURCES) $(dmr_test_SOURCES) $(expr_test_SOURCES)
+DIST_SOURCES = $(libtest_types_a_SOURCES) $(das_test_SOURCES) \
+	$(dds_test_SOURCES) $(am__dmr_test_SOURCES_DIST) \
+	$(expr_test_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+HEADERS = $(testheaders_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+pkglibexecdir = @pkglibexecdir@
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALLOCA_H = @ALLOCA_H@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
+AR = @AR@
+ARFLAGS = @ARFLAGS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BITSIZEOF_PTRDIFF_T = @BITSIZEOF_PTRDIFF_T@
+BITSIZEOF_SIG_ATOMIC_T = @BITSIZEOF_SIG_ATOMIC_T@
+BITSIZEOF_SIZE_T = @BITSIZEOF_SIZE_T@
+BITSIZEOF_WCHAR_T = @BITSIZEOF_WCHAR_T@
+BITSIZEOF_WINT_T = @BITSIZEOF_WINT_T@
+BYTESWAP_H = @BYTESWAP_H@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CLIENTLIB_AGE = @CLIENTLIB_AGE@
+CLIENTLIB_CURRENT = @CLIENTLIB_CURRENT@
+CLIENTLIB_REVISION = @CLIENTLIB_REVISION@
+CLIENTLIB_VERSION = @CLIENTLIB_VERSION@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@
+CPPUNIT_CONFIG = @CPPUNIT_CONFIG@
+CPPUNIT_LIBS = @CPPUNIT_LIBS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_LIBS = @CURL_LIBS@
+CURL_STATIC_LIBS = @CURL_STATIC_LIBS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DAPLIB_AGE = @DAPLIB_AGE@
+DAPLIB_CURRENT = @DAPLIB_CURRENT@
+DAPLIB_REVISION = @DAPLIB_REVISION@
+DAP_PROTOCOL_VERSION = @DAP_PROTOCOL_VERSION@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+DVR = @DVR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GLIBC21 = @GLIBC21@
+GNULIB_ATOLL = @GNULIB_ATOLL@
+GNULIB_BTOWC = @GNULIB_BTOWC@
+GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@
+GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
+GNULIB_CHDIR = @GNULIB_CHDIR@
+GNULIB_CHOWN = @GNULIB_CHOWN@
+GNULIB_CLOSE = @GNULIB_CLOSE@
+GNULIB_CTIME = @GNULIB_CTIME@
+GNULIB_DUP = @GNULIB_DUP@
+GNULIB_DUP2 = @GNULIB_DUP2@
+GNULIB_DUP3 = @GNULIB_DUP3@
+GNULIB_DUPLOCALE = @GNULIB_DUPLOCALE@
+GNULIB_ENVIRON = @GNULIB_ENVIRON@
+GNULIB_EUIDACCESS = @GNULIB_EUIDACCESS@
+GNULIB_FACCESSAT = @GNULIB_FACCESSAT@
+GNULIB_FCHDIR = @GNULIB_FCHDIR@
+GNULIB_FCHMODAT = @GNULIB_FCHMODAT@
+GNULIB_FCHOWNAT = @GNULIB_FCHOWNAT@
+GNULIB_FCNTL = @GNULIB_FCNTL@
+GNULIB_FDATASYNC = @GNULIB_FDATASYNC@
+GNULIB_FSTAT = @GNULIB_FSTAT@
+GNULIB_FSTATAT = @GNULIB_FSTATAT@
+GNULIB_FSYNC = @GNULIB_FSYNC@
+GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@
+GNULIB_FUTIMENS = @GNULIB_FUTIMENS@
+GNULIB_GETCWD = @GNULIB_GETCWD@
+GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@
+GNULIB_GETDTABLESIZE = @GNULIB_GETDTABLESIZE@
+GNULIB_GETGROUPS = @GNULIB_GETGROUPS@
+GNULIB_GETHOSTNAME = @GNULIB_GETHOSTNAME@
+GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@
+GNULIB_GETLOGIN = @GNULIB_GETLOGIN@
+GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@
+GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@
+GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@
+GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@
+GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@
+GNULIB_GRANTPT = @GNULIB_GRANTPT@
+GNULIB_GROUP_MEMBER = @GNULIB_GROUP_MEMBER@
+GNULIB_ISATTY = @GNULIB_ISATTY@
+GNULIB_ISWBLANK = @GNULIB_ISWBLANK@
+GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@
+GNULIB_LCHMOD = @GNULIB_LCHMOD@
+GNULIB_LCHOWN = @GNULIB_LCHOWN@
+GNULIB_LINK = @GNULIB_LINK@
+GNULIB_LINKAT = @GNULIB_LINKAT@
+GNULIB_LOCALECONV = @GNULIB_LOCALECONV@
+GNULIB_LOCALTIME = @GNULIB_LOCALTIME@
+GNULIB_LSEEK = @GNULIB_LSEEK@
+GNULIB_LSTAT = @GNULIB_LSTAT@
+GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@
+GNULIB_MBRLEN = @GNULIB_MBRLEN@
+GNULIB_MBRTOWC = @GNULIB_MBRTOWC@
+GNULIB_MBSINIT = @GNULIB_MBSINIT@
+GNULIB_MBSNRTOWCS = @GNULIB_MBSNRTOWCS@
+GNULIB_MBSRTOWCS = @GNULIB_MBSRTOWCS@
+GNULIB_MBTOWC = @GNULIB_MBTOWC@
+GNULIB_MKDIRAT = @GNULIB_MKDIRAT@
+GNULIB_MKDTEMP = @GNULIB_MKDTEMP@
+GNULIB_MKFIFO = @GNULIB_MKFIFO@
+GNULIB_MKFIFOAT = @GNULIB_MKFIFOAT@
+GNULIB_MKNOD = @GNULIB_MKNOD@
+GNULIB_MKNODAT = @GNULIB_MKNODAT@
+GNULIB_MKOSTEMP = @GNULIB_MKOSTEMP@
+GNULIB_MKOSTEMPS = @GNULIB_MKOSTEMPS@
+GNULIB_MKSTEMP = @GNULIB_MKSTEMP@
+GNULIB_MKSTEMPS = @GNULIB_MKSTEMPS@
+GNULIB_MKTIME = @GNULIB_MKTIME@
+GNULIB_NANOSLEEP = @GNULIB_NANOSLEEP@
+GNULIB_NL_LANGINFO = @GNULIB_NL_LANGINFO@
+GNULIB_NONBLOCKING = @GNULIB_NONBLOCKING@
+GNULIB_OPEN = @GNULIB_OPEN@
+GNULIB_OPENAT = @GNULIB_OPENAT@
+GNULIB_OVERRIDES_STRUCT_STAT = @GNULIB_OVERRIDES_STRUCT_STAT@
+GNULIB_OVERRIDES_WINT_T = @GNULIB_OVERRIDES_WINT_T@
+GNULIB_PIPE = @GNULIB_PIPE@
+GNULIB_PIPE2 = @GNULIB_PIPE2@
+GNULIB_POSIX_OPENPT = @GNULIB_POSIX_OPENPT@
+GNULIB_PREAD = @GNULIB_PREAD@
+GNULIB_PTSNAME = @GNULIB_PTSNAME@
+GNULIB_PTSNAME_R = @GNULIB_PTSNAME_R@
+GNULIB_PUTENV = @GNULIB_PUTENV@
+GNULIB_PWRITE = @GNULIB_PWRITE@
+GNULIB_QSORT_R = @GNULIB_QSORT_R@
+GNULIB_RANDOM = @GNULIB_RANDOM@
+GNULIB_RANDOM_R = @GNULIB_RANDOM_R@
+GNULIB_READ = @GNULIB_READ@
+GNULIB_READLINK = @GNULIB_READLINK@
+GNULIB_READLINKAT = @GNULIB_READLINKAT@
+GNULIB_REALLOCARRAY = @GNULIB_REALLOCARRAY@
+GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@
+GNULIB_REALPATH = @GNULIB_REALPATH@
+GNULIB_RMDIR = @GNULIB_RMDIR@
+GNULIB_RPMATCH = @GNULIB_RPMATCH@
+GNULIB_SECURE_GETENV = @GNULIB_SECURE_GETENV@
+GNULIB_SETENV = @GNULIB_SETENV@
+GNULIB_SETHOSTNAME = @GNULIB_SETHOSTNAME@
+GNULIB_SETLOCALE = @GNULIB_SETLOCALE@
+GNULIB_SLEEP = @GNULIB_SLEEP@
+GNULIB_STAT = @GNULIB_STAT@
+GNULIB_STRFTIME = @GNULIB_STRFTIME@
+GNULIB_STRPTIME = @GNULIB_STRPTIME@
+GNULIB_STRTOD = @GNULIB_STRTOD@
+GNULIB_STRTOLL = @GNULIB_STRTOLL@
+GNULIB_STRTOULL = @GNULIB_STRTOULL@
+GNULIB_SYMLINK = @GNULIB_SYMLINK@
+GNULIB_SYMLINKAT = @GNULIB_SYMLINKAT@
+GNULIB_SYSTEM_POSIX = @GNULIB_SYSTEM_POSIX@
+GNULIB_TIMEGM = @GNULIB_TIMEGM@
+GNULIB_TIME_R = @GNULIB_TIME_R@
+GNULIB_TIME_RZ = @GNULIB_TIME_RZ@
+GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@
+GNULIB_TRUNCATE = @GNULIB_TRUNCATE@
+GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@
+GNULIB_TZSET = @GNULIB_TZSET@
+GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@
+GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@
+GNULIB_UNLINK = @GNULIB_UNLINK@
+GNULIB_UNLINKAT = @GNULIB_UNLINKAT@
+GNULIB_UNLOCKPT = @GNULIB_UNLOCKPT@
+GNULIB_UNSETENV = @GNULIB_UNSETENV@
+GNULIB_USLEEP = @GNULIB_USLEEP@
+GNULIB_UTIMENSAT = @GNULIB_UTIMENSAT@
+GNULIB_WCPCPY = @GNULIB_WCPCPY@
+GNULIB_WCPNCPY = @GNULIB_WCPNCPY@
+GNULIB_WCRTOMB = @GNULIB_WCRTOMB@
+GNULIB_WCSCASECMP = @GNULIB_WCSCASECMP@
+GNULIB_WCSCAT = @GNULIB_WCSCAT@
+GNULIB_WCSCHR = @GNULIB_WCSCHR@
+GNULIB_WCSCMP = @GNULIB_WCSCMP@
+GNULIB_WCSCOLL = @GNULIB_WCSCOLL@
+GNULIB_WCSCPY = @GNULIB_WCSCPY@
+GNULIB_WCSCSPN = @GNULIB_WCSCSPN@
+GNULIB_WCSDUP = @GNULIB_WCSDUP@
+GNULIB_WCSFTIME = @GNULIB_WCSFTIME@
+GNULIB_WCSLEN = @GNULIB_WCSLEN@
+GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@
+GNULIB_WCSNCAT = @GNULIB_WCSNCAT@
+GNULIB_WCSNCMP = @GNULIB_WCSNCMP@
+GNULIB_WCSNCPY = @GNULIB_WCSNCPY@
+GNULIB_WCSNLEN = @GNULIB_WCSNLEN@
+GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@
+GNULIB_WCSPBRK = @GNULIB_WCSPBRK@
+GNULIB_WCSRCHR = @GNULIB_WCSRCHR@
+GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@
+GNULIB_WCSSPN = @GNULIB_WCSSPN@
+GNULIB_WCSSTR = @GNULIB_WCSSTR@
+GNULIB_WCSTOK = @GNULIB_WCSTOK@
+GNULIB_WCSWIDTH = @GNULIB_WCSWIDTH@
+GNULIB_WCSXFRM = @GNULIB_WCSXFRM@
+GNULIB_WCTOB = @GNULIB_WCTOB@
+GNULIB_WCTOMB = @GNULIB_WCTOMB@
+GNULIB_WCTRANS = @GNULIB_WCTRANS@
+GNULIB_WCTYPE = @GNULIB_WCTYPE@
+GNULIB_WCWIDTH = @GNULIB_WCWIDTH@
+GNULIB_WMEMCHR = @GNULIB_WMEMCHR@
+GNULIB_WMEMCMP = @GNULIB_WMEMCMP@
+GNULIB_WMEMCPY = @GNULIB_WMEMCPY@
+GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@
+GNULIB_WMEMSET = @GNULIB_WMEMSET@
+GNULIB_WRITE = @GNULIB_WRITE@
+GNULIB__EXIT = @GNULIB__EXIT@
+GREP = @GREP@
+HAVE_ATOLL = @HAVE_ATOLL@
+HAVE_BTOWC = @HAVE_BTOWC@
+HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@
+HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
+HAVE_CHOWN = @HAVE_CHOWN@
+HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@
+HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
+HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@
+HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@
+HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@
+HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@
+HAVE_DECL_GETLOGIN = @HAVE_DECL_GETLOGIN@
+HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@
+HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@
+HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@
+HAVE_DECL_INITSTATE = @HAVE_DECL_INITSTATE@
+HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@
+HAVE_DECL_SETENV = @HAVE_DECL_SETENV@
+HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@
+HAVE_DECL_SETSTATE = @HAVE_DECL_SETSTATE@
+HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@
+HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@
+HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@
+HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@
+HAVE_DUP2 = @HAVE_DUP2@
+HAVE_DUP3 = @HAVE_DUP3@
+HAVE_DUPLOCALE = @HAVE_DUPLOCALE@
+HAVE_EUIDACCESS = @HAVE_EUIDACCESS@
+HAVE_FACCESSAT = @HAVE_FACCESSAT@
+HAVE_FCHDIR = @HAVE_FCHDIR@
+HAVE_FCHMODAT = @HAVE_FCHMODAT@
+HAVE_FCHOWNAT = @HAVE_FCHOWNAT@
+HAVE_FCNTL = @HAVE_FCNTL@
+HAVE_FDATASYNC = @HAVE_FDATASYNC@
+HAVE_FEATURES_H = @HAVE_FEATURES_H@
+HAVE_FSTATAT = @HAVE_FSTATAT@
+HAVE_FSYNC = @HAVE_FSYNC@
+HAVE_FTRUNCATE = @HAVE_FTRUNCATE@
+HAVE_FUTIMENS = @HAVE_FUTIMENS@
+HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@
+HAVE_GETGROUPS = @HAVE_GETGROUPS@
+HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@
+HAVE_GETLOGIN = @HAVE_GETLOGIN@
+HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@
+HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
+HAVE_GETTIMEOFDAY = @HAVE_GETTIMEOFDAY@
+HAVE_GRANTPT = @HAVE_GRANTPT@
+HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
+HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
+HAVE_ISWBLANK = @HAVE_ISWBLANK@
+HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
+HAVE_LANGINFO_CODESET = @HAVE_LANGINFO_CODESET@
+HAVE_LANGINFO_ERA = @HAVE_LANGINFO_ERA@
+HAVE_LANGINFO_H = @HAVE_LANGINFO_H@
+HAVE_LANGINFO_T_FMT_AMPM = @HAVE_LANGINFO_T_FMT_AMPM@
+HAVE_LANGINFO_YESEXPR = @HAVE_LANGINFO_YESEXPR@
+HAVE_LCHMOD = @HAVE_LCHMOD@
+HAVE_LCHOWN = @HAVE_LCHOWN@
+HAVE_LINK = @HAVE_LINK@
+HAVE_LINKAT = @HAVE_LINKAT@
+HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@
+HAVE_LSTAT = @HAVE_LSTAT@
+HAVE_MAX_ALIGN_T = @HAVE_MAX_ALIGN_T@
+HAVE_MBRLEN = @HAVE_MBRLEN@
+HAVE_MBRTOWC = @HAVE_MBRTOWC@
+HAVE_MBSINIT = @HAVE_MBSINIT@
+HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@
+HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@
+HAVE_MKDIRAT = @HAVE_MKDIRAT@
+HAVE_MKDTEMP = @HAVE_MKDTEMP@
+HAVE_MKFIFO = @HAVE_MKFIFO@
+HAVE_MKFIFOAT = @HAVE_MKFIFOAT@
+HAVE_MKNOD = @HAVE_MKNOD@
+HAVE_MKNODAT = @HAVE_MKNODAT@
+HAVE_MKOSTEMP = @HAVE_MKOSTEMP@
+HAVE_MKOSTEMPS = @HAVE_MKOSTEMPS@
+HAVE_MKSTEMP = @HAVE_MKSTEMP@
+HAVE_MKSTEMPS = @HAVE_MKSTEMPS@
+HAVE_NANOSLEEP = @HAVE_NANOSLEEP@
+HAVE_NL_LANGINFO = @HAVE_NL_LANGINFO@
+HAVE_OPENAT = @HAVE_OPENAT@
+HAVE_OS_H = @HAVE_OS_H@
+HAVE_PIPE = @HAVE_PIPE@
+HAVE_PIPE2 = @HAVE_PIPE2@
+HAVE_POSIX_OPENPT = @HAVE_POSIX_OPENPT@
+HAVE_PREAD = @HAVE_PREAD@
+HAVE_PTSNAME = @HAVE_PTSNAME@
+HAVE_PTSNAME_R = @HAVE_PTSNAME_R@
+HAVE_PWRITE = @HAVE_PWRITE@
+HAVE_QSORT_R = @HAVE_QSORT_R@
+HAVE_RANDOM = @HAVE_RANDOM@
+HAVE_RANDOM_H = @HAVE_RANDOM_H@
+HAVE_RANDOM_R = @HAVE_RANDOM_R@
+HAVE_READLINK = @HAVE_READLINK@
+HAVE_READLINKAT = @HAVE_READLINKAT@
+HAVE_REALLOCARRAY = @HAVE_REALLOCARRAY@
+HAVE_REALPATH = @HAVE_REALPATH@
+HAVE_RPMATCH = @HAVE_RPMATCH@
+HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@
+HAVE_SETENV = @HAVE_SETENV@
+HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@
+HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
+HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
+HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@
+HAVE_SLEEP = @HAVE_SLEEP@
+HAVE_STDINT_H = @HAVE_STDINT_H@
+HAVE_STRPTIME = @HAVE_STRPTIME@
+HAVE_STRTOD = @HAVE_STRTOD@
+HAVE_STRTOLL = @HAVE_STRTOLL@
+HAVE_STRTOULL = @HAVE_STRTOULL@
+HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@
+HAVE_STRUCT_TIMEVAL = @HAVE_STRUCT_TIMEVAL@
+HAVE_SYMLINK = @HAVE_SYMLINK@
+HAVE_SYMLINKAT = @HAVE_SYMLINKAT@
+HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@
+HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@
+HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@
+HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@
+HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@
+HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
+HAVE_TIMEGM = @HAVE_TIMEGM@
+HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@
+HAVE_TRUNCATE = @HAVE_TRUNCATE@
+HAVE_TZSET = @HAVE_TZSET@
+HAVE_UNISTD_H = @HAVE_UNISTD_H@
+HAVE_UNLINKAT = @HAVE_UNLINKAT@
+HAVE_UNLOCKPT = @HAVE_UNLOCKPT@
+HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@
+HAVE_USLEEP = @HAVE_USLEEP@
+HAVE_UTIMENSAT = @HAVE_UTIMENSAT@
+HAVE_VALGRIND = @HAVE_VALGRIND@
+HAVE_WCHAR_H = @HAVE_WCHAR_H@
+HAVE_WCHAR_T = @HAVE_WCHAR_T@
+HAVE_WCPCPY = @HAVE_WCPCPY@
+HAVE_WCPNCPY = @HAVE_WCPNCPY@
+HAVE_WCRTOMB = @HAVE_WCRTOMB@
+HAVE_WCSCASECMP = @HAVE_WCSCASECMP@
+HAVE_WCSCAT = @HAVE_WCSCAT@
+HAVE_WCSCHR = @HAVE_WCSCHR@
+HAVE_WCSCMP = @HAVE_WCSCMP@
+HAVE_WCSCOLL = @HAVE_WCSCOLL@
+HAVE_WCSCPY = @HAVE_WCSCPY@
+HAVE_WCSCSPN = @HAVE_WCSCSPN@
+HAVE_WCSDUP = @HAVE_WCSDUP@
+HAVE_WCSFTIME = @HAVE_WCSFTIME@
+HAVE_WCSLEN = @HAVE_WCSLEN@
+HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@
+HAVE_WCSNCAT = @HAVE_WCSNCAT@
+HAVE_WCSNCMP = @HAVE_WCSNCMP@
+HAVE_WCSNCPY = @HAVE_WCSNCPY@
+HAVE_WCSNLEN = @HAVE_WCSNLEN@
+HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@
+HAVE_WCSPBRK = @HAVE_WCSPBRK@
+HAVE_WCSRCHR = @HAVE_WCSRCHR@
+HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@
+HAVE_WCSSPN = @HAVE_WCSSPN@
+HAVE_WCSSTR = @HAVE_WCSSTR@
+HAVE_WCSTOK = @HAVE_WCSTOK@
+HAVE_WCSWIDTH = @HAVE_WCSWIDTH@
+HAVE_WCSXFRM = @HAVE_WCSXFRM@
+HAVE_WCTRANS_T = @HAVE_WCTRANS_T@
+HAVE_WCTYPE_H = @HAVE_WCTYPE_H@
+HAVE_WCTYPE_T = @HAVE_WCTYPE_T@
+HAVE_WINSOCK2_H = @HAVE_WINSOCK2_H@
+HAVE_WINT_T = @HAVE_WINT_T@
+HAVE_WMEMCHR = @HAVE_WMEMCHR@
+HAVE_WMEMCMP = @HAVE_WMEMCMP@
+HAVE_WMEMCPY = @HAVE_WMEMCPY@
+HAVE_WMEMMOVE = @HAVE_WMEMMOVE@
+HAVE_WMEMSET = @HAVE_WMEMSET@
+HAVE_XLOCALE_H = @HAVE_XLOCALE_H@
+HAVE__BOOL = @HAVE__BOOL@
+HAVE__EXIT = @HAVE__EXIT@
+INCLUDE_NEXT = @INCLUDE_NEXT@
+INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBDAP_VERSION = @LIBDAP_VERSION@
+LIBINTL = @LIBINTL@
+LIBMULTITHREAD = @LIBMULTITHREAD@
+LIBOBJS = @LIBOBJS@
+LIBPTH = @LIBPTH@
+LIBPTH_PREFIX = @LIBPTH_PREFIX@
+LIBS = @LIBS@
+LIBTHREAD = @LIBTHREAD@
+LIBTOOL = @LIBTOOL@
+LIMITS_H = @LIMITS_H@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@
+LOCALE_FR = @LOCALE_FR@
+LOCALE_FR_UTF8 = @LOCALE_FR_UTF8@
+LOCALE_JA = @LOCALE_JA@
+LOCALE_ZH_CN = @LOCALE_ZH_CN@
+LTLIBINTL = @LTLIBINTL@
+LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
+LTLIBOBJS = @LTLIBOBJS@
+LTLIBPTH = @LTLIBPTH@
+LTLIBTHREAD = @LTLIBTHREAD@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@
+NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H = @NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H@
+NEXT_AS_FIRST_DIRECTIVE_LIMITS_H = @NEXT_AS_FIRST_DIRECTIVE_LIMITS_H@
+NEXT_AS_FIRST_DIRECTIVE_LOCALE_H = @NEXT_AS_FIRST_DIRECTIVE_LOCALE_H@
+NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@
+NEXT_AS_FIRST_DIRECTIVE_STDINT_H = @NEXT_AS_FIRST_DIRECTIVE_STDINT_H@
+NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@
+NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@
+NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@
+NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@
+NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@
+NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@
+NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@
+NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@
+NEXT_FCNTL_H = @NEXT_FCNTL_H@
+NEXT_LANGINFO_H = @NEXT_LANGINFO_H@
+NEXT_LIMITS_H = @NEXT_LIMITS_H@
+NEXT_LOCALE_H = @NEXT_LOCALE_H@
+NEXT_STDDEF_H = @NEXT_STDDEF_H@
+NEXT_STDINT_H = @NEXT_STDINT_H@
+NEXT_STDLIB_H = @NEXT_STDLIB_H@
+NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@
+NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@
+NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@
+NEXT_TIME_H = @NEXT_TIME_H@
+NEXT_UNISTD_H = @NEXT_UNISTD_H@
+NEXT_WCHAR_H = @NEXT_WCHAR_H@
+NEXT_WCTYPE_H = @NEXT_WCTYPE_H@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_MAJOR_VERSION = @PACKAGE_MAJOR_VERSION@
+PACKAGE_MINOR_VERSION = @PACKAGE_MINOR_VERSION@
+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@
+PRAGMA_COLUMNS = @PRAGMA_COLUMNS@
+PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
+PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@
+PTHREAD_LIBS = @PTHREAD_LIBS@
+PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
+RANLIB = @RANLIB@
+REPLACE_BTOWC = @REPLACE_BTOWC@
+REPLACE_CALLOC = @REPLACE_CALLOC@
+REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@
+REPLACE_CHOWN = @REPLACE_CHOWN@
+REPLACE_CLOSE = @REPLACE_CLOSE@
+REPLACE_CTIME = @REPLACE_CTIME@
+REPLACE_DUP = @REPLACE_DUP@
+REPLACE_DUP2 = @REPLACE_DUP2@
+REPLACE_DUPLOCALE = @REPLACE_DUPLOCALE@
+REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@
+REPLACE_FCNTL = @REPLACE_FCNTL@
+REPLACE_FSTAT = @REPLACE_FSTAT@
+REPLACE_FSTATAT = @REPLACE_FSTATAT@
+REPLACE_FTRUNCATE = @REPLACE_FTRUNCATE@
+REPLACE_FUTIMENS = @REPLACE_FUTIMENS@
+REPLACE_GETCWD = @REPLACE_GETCWD@
+REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@
+REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@
+REPLACE_GETGROUPS = @REPLACE_GETGROUPS@
+REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
+REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
+REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@
+REPLACE_GMTIME = @REPLACE_GMTIME@
+REPLACE_ISATTY = @REPLACE_ISATTY@
+REPLACE_ISWBLANK = @REPLACE_ISWBLANK@
+REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@
+REPLACE_LCHOWN = @REPLACE_LCHOWN@
+REPLACE_LINK = @REPLACE_LINK@
+REPLACE_LINKAT = @REPLACE_LINKAT@
+REPLACE_LOCALECONV = @REPLACE_LOCALECONV@
+REPLACE_LOCALTIME = @REPLACE_LOCALTIME@
+REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@
+REPLACE_LSEEK = @REPLACE_LSEEK@
+REPLACE_LSTAT = @REPLACE_LSTAT@
+REPLACE_MALLOC = @REPLACE_MALLOC@
+REPLACE_MBRLEN = @REPLACE_MBRLEN@
+REPLACE_MBRTOWC = @REPLACE_MBRTOWC@
+REPLACE_MBSINIT = @REPLACE_MBSINIT@
+REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@
+REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@
+REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@
+REPLACE_MBTOWC = @REPLACE_MBTOWC@
+REPLACE_MKDIR = @REPLACE_MKDIR@
+REPLACE_MKFIFO = @REPLACE_MKFIFO@
+REPLACE_MKNOD = @REPLACE_MKNOD@
+REPLACE_MKSTEMP = @REPLACE_MKSTEMP@
+REPLACE_MKTIME = @REPLACE_MKTIME@
+REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@
+REPLACE_NL_LANGINFO = @REPLACE_NL_LANGINFO@
+REPLACE_NULL = @REPLACE_NULL@
+REPLACE_OPEN = @REPLACE_OPEN@
+REPLACE_OPENAT = @REPLACE_OPENAT@
+REPLACE_PREAD = @REPLACE_PREAD@
+REPLACE_PTSNAME = @REPLACE_PTSNAME@
+REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@
+REPLACE_PUTENV = @REPLACE_PUTENV@
+REPLACE_PWRITE = @REPLACE_PWRITE@
+REPLACE_QSORT_R = @REPLACE_QSORT_R@
+REPLACE_RANDOM_R = @REPLACE_RANDOM_R@
+REPLACE_READ = @REPLACE_READ@
+REPLACE_READLINK = @REPLACE_READLINK@
+REPLACE_READLINKAT = @REPLACE_READLINKAT@
+REPLACE_REALLOC = @REPLACE_REALLOC@
+REPLACE_REALPATH = @REPLACE_REALPATH@
+REPLACE_RMDIR = @REPLACE_RMDIR@
+REPLACE_SETENV = @REPLACE_SETENV@
+REPLACE_SETLOCALE = @REPLACE_SETLOCALE@
+REPLACE_SLEEP = @REPLACE_SLEEP@
+REPLACE_STAT = @REPLACE_STAT@
+REPLACE_STRFTIME = @REPLACE_STRFTIME@
+REPLACE_STRTOD = @REPLACE_STRTOD@
+REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@
+REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@
+REPLACE_SYMLINK = @REPLACE_SYMLINK@
+REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@
+REPLACE_TIMEGM = @REPLACE_TIMEGM@
+REPLACE_TOWLOWER = @REPLACE_TOWLOWER@
+REPLACE_TRUNCATE = @REPLACE_TRUNCATE@
+REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@
+REPLACE_TZSET = @REPLACE_TZSET@
+REPLACE_UNLINK = @REPLACE_UNLINK@
+REPLACE_UNLINKAT = @REPLACE_UNLINKAT@
+REPLACE_UNSETENV = @REPLACE_UNSETENV@
+REPLACE_USLEEP = @REPLACE_USLEEP@
+REPLACE_UTIMENSAT = @REPLACE_UTIMENSAT@
+REPLACE_WCRTOMB = @REPLACE_WCRTOMB@
+REPLACE_WCSFTIME = @REPLACE_WCSFTIME@
+REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@
+REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@
+REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@
+REPLACE_WCTOB = @REPLACE_WCTOB@
+REPLACE_WCTOMB = @REPLACE_WCTOMB@
+REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
+REPLACE_WRITE = @REPLACE_WRITE@
+SED = @SED@
+SERVERLIB_AGE = @SERVERLIB_AGE@
+SERVERLIB_CURRENT = @SERVERLIB_CURRENT@
+SERVERLIB_REVISION = @SERVERLIB_REVISION@
+SERVERLIB_VERSION = @SERVERLIB_VERSION@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@
+SIZE_T_SUFFIX = @SIZE_T_SUFFIX@
+STDBOOL_H = @STDBOOL_H@
+STDDEF_H = @STDDEF_H@
+STDINT_H = @STDINT_H@
+STRIP = @STRIP@
+SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@
+TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@
+UNISTD_H_DEFINES_STRUCT_TIMESPEC = @UNISTD_H_DEFINES_STRUCT_TIMESPEC@
+UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@
+UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@
+UUID_LIBS = @UUID_LIBS@
+VERSION = @VERSION@
+WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
+WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@
+WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@
+WINDOWS_STAT_INODES = @WINDOWS_STAT_INODES@
+WINDOWS_STAT_TIMESPEC = @WINDOWS_STAT_TIMESPEC@
+WINT_T_SUFFIX = @WINT_T_SUFFIX@
+XML2_CFLAGS = @XML2_CFLAGS@
+XML2_LIBS = @XML2_LIBS@
+YACC = @YACC@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_word_order = @ac_word_order@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+curlprivatelibs = @curlprivatelibs@
+curlprivatereq = @curlprivatereq@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gl_LIBOBJS = @gl_LIBOBJS@
+gl_LTLIBOBJS = @gl_LTLIBOBJS@
+gltests_LIBOBJS = @gltests_LIBOBJS@
+gltests_LTLIBOBJS = @gltests_LTLIBOBJS@
+gltests_WITNESS = @gltests_WITNESS@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+lispdir = @lispdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+runstatedir = @runstatedir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+xmlprivatelibs = @xmlprivatelibs@
+xmlprivatereq = @xmlprivatereq@
+AUTOMAKE_OPTIONS = foreign
+
+# Arrange to build with the backward compatibility mode enabled.
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/GNU -I$(top_srcdir)/d4_ce \
+-I$(top_srcdir)/d4_function $(XML2_CFLAGS) $(CURL_CFLAGS)
+
+AM_CXXFLAGS = $(am__append_1) $(am__append_2)
+CXXFLAGS_DEBUG = -g3 -O0  -Wall -W -Wcast-align
+TEST_COV_FLAGS = -ftest-coverage -fprofile-arcs
+
+# This will use automake's test envokation code. It's better to use
+# our own so we can pass in flags for autotest, esp --jobs=N to get
+# the autotest tests to run in parallel. See check-local: below.
+
+# TESTS = DASTest DDSTest EXPRTest DMRTest getdapTest
+check_SCRIPTS = $(DASTESTSUITE) $(DDSTESTSUITE) $(EXPRTESTSUITE) \
+	$(DMRTESTSUITE) $(GETDAPTESTSUITE)
+
+
+# Build the test drivers. The drivers all use the
+# subclassed types in Test*.cc and the TestTypesFactory.
+lib_LIBRARIES = libtest-types.a
+libtest_types_a_SOURCES = $(TESTSRCS) $(TEST_HDR)
+libtest_types_a_CXXFLAGS = -fPIC
+testheadersdir = $(pkgincludedir)/test
+testheaders_HEADERS = $(TEST_HDR)
+das_test_SOURCES = das-test.cc
+das_test_LDADD = libtest-types.a ../libdapserver.la ../libdap.la 
+dds_test_SOURCES = dds-test.cc
+dds_test_LDADD = libtest-types.a ../libdapserver.la ../libdap.la 
+expr_test_SOURCES = expr-test.cc ResponseBuilder.cc ResponseBuilder.h
+expr_test_LDADD = libtest-types.a ../libdapserver.la ../libdapclient.la ../libdap.la
+@DAP4_DEFINED_TRUE@dmr_test_SOURCES = dmr-test.cc D4ResponseBuilder.cc D4ResponseBuilder.h
+@DAP4_DEFINED_TRUE@dmr_test_LDADD = libtest-types.a ../libdapserver.la ../libdap.la
+TESTSRCS = TestByte.cc TestInt32.cc TestFloat64.cc TestStr.cc TestUrl.cc \
+	   TestArray.cc TestStructure.cc TestSequence.cc		 \
+	   TestGrid.cc TestUInt32.cc TestInt16.cc TestUInt16.cc		 \
+	   TestFloat32.cc TestTypeFactory.cc D4TestTypeFactory.cc \
+	   TestD4Group.cc TestInt8.cc TestInt64.cc TestUInt64.cc TestD4Sequence.cc \
+	   TestD4Enum.cc TestD4Opaque.cc TestFunction.cc D4TestFunction.cc
+
+
+# TestCommon.cc Removed jhrg 3/12/15
+TEST_HDR = TestArray.h TestByte.h TestCommon.h TestFloat32.h TestFloat64.h    \
+	TestGrid.h TestInt16.h TestInt32.h TestSequence.h TestStr.h	      \
+	TestStructure.h TestTypeFactory.h TestUInt16.h TestUInt32.h TestUrl.h \
+	D4TestTypeFactory.h TestD4Group.h TestInt8.h TestInt64.h TestUInt64.h \
+	TestD4Sequence.h TestD4Enum.h TestD4Opaque.h TestFunction.h D4TestFunction.h
+
+DIRS_EXTRA = das-testsuite dds-testsuite expr-testsuite dmr-testsuite \
+	getdap-testsuite
+
+EXTRA_DIST = DASTest.at $(DASTESTSUITE) DDSTest.at $(DDSTESTSUITE) \
+	EXPRTest.at $(EXPRTESTSUITE) DMRTest.at $(DMRTESTSUITE) \
+	getdapTest.at $(GETDAPTESTSUITE) getdap-testsuite atlocal.in \
+	$(srcdir)/package.m4 $(DIRS_EXTRA)
+
+CLEANFILES = dmr-testsuite.tar.gz
+DISTCLEANFILES = *.log
+
+############## Autotest follows #####################
+AUTOM4TE = autom4te
+TESTSUITEFLAGS = 
+DASTESTSUITE = $(srcdir)/DASTest
+DDSTESTSUITE = $(srcdir)/DDSTest
+EXPRTESTSUITE = $(srcdir)/EXPRTest
+DMRTESTSUITE = $(srcdir)/DMRTest
+GETDAPTESTSUITE = $(srcdir)/getdapTest
+AUTOTEST = $(AUTOM4TE) --language=autotest
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .cc .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign tests/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+atlocal: $(top_builddir)/config.status $(srcdir)/atlocal.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+install-libLIBRARIES: $(lib_LIBRARIES)
+	@$(NORMAL_INSTALL)
+	@list='$(lib_LIBRARIES)'; test -n "$(libdir)" || list=; \
+	list2=; for p in $$list; do \
+	  if test -f $$p; then \
+	    list2="$$list2 $$p"; \
+	  else :; fi; \
+	done; \
+	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
+	  echo " $(INSTALL_DATA) $$list2 '$(DESTDIR)$(libdir)'"; \
+	  $(INSTALL_DATA) $$list2 "$(DESTDIR)$(libdir)" || exit $$?; }
+	@$(POST_INSTALL)
+	@list='$(lib_LIBRARIES)'; test -n "$(libdir)" || list=; \
+	for p in $$list; do \
+	  if test -f $$p; then \
+	    $(am__strip_dir) \
+	    echo " ( cd '$(DESTDIR)$(libdir)' && $(RANLIB) $$f )"; \
+	    ( cd "$(DESTDIR)$(libdir)" && $(RANLIB) $$f ) || exit $$?; \
+	  else :; fi; \
+	done
+
+uninstall-libLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(lib_LIBRARIES)'; test -n "$(libdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(libdir)'; $(am__uninstall_files_from_dir)
+
+clean-libLIBRARIES:
+	-test -z "$(lib_LIBRARIES)" || rm -f $(lib_LIBRARIES)
+
+libtest-types.a: $(libtest_types_a_OBJECTS) $(libtest_types_a_DEPENDENCIES) $(EXTRA_libtest_types_a_DEPENDENCIES) 
+	$(AM_V_at)-rm -f libtest-types.a
+	$(AM_V_AR)$(libtest_types_a_AR) libtest-types.a $(libtest_types_a_OBJECTS) $(libtest_types_a_LIBADD)
+	$(AM_V_at)$(RANLIB) libtest-types.a
+
+clean-checkPROGRAMS:
+	@list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
+
+das-test$(EXEEXT): $(das_test_OBJECTS) $(das_test_DEPENDENCIES) $(EXTRA_das_test_DEPENDENCIES) 
+	@rm -f das-test$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(das_test_OBJECTS) $(das_test_LDADD) $(LIBS)
+
+dds-test$(EXEEXT): $(dds_test_OBJECTS) $(dds_test_DEPENDENCIES) $(EXTRA_dds_test_DEPENDENCIES) 
+	@rm -f dds-test$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(dds_test_OBJECTS) $(dds_test_LDADD) $(LIBS)
+
+dmr-test$(EXEEXT): $(dmr_test_OBJECTS) $(dmr_test_DEPENDENCIES) $(EXTRA_dmr_test_DEPENDENCIES) 
+	@rm -f dmr-test$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(dmr_test_OBJECTS) $(dmr_test_LDADD) $(LIBS)
+
+expr-test$(EXEEXT): $(expr_test_OBJECTS) $(expr_test_DEPENDENCIES) $(EXTRA_expr_test_DEPENDENCIES) 
+	@rm -f expr-test$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(expr_test_OBJECTS) $(expr_test_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/D4ResponseBuilder.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ResponseBuilder.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/das-test.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dds-test.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dmr-test.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/expr-test.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtest_types_a-D4TestFunction.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtest_types_a-D4TestTypeFactory.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtest_types_a-TestArray.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtest_types_a-TestByte.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtest_types_a-TestD4Enum.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtest_types_a-TestD4Group.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtest_types_a-TestD4Opaque.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtest_types_a-TestD4Sequence.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtest_types_a-TestFloat32.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtest_types_a-TestFloat64.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtest_types_a-TestFunction.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtest_types_a-TestGrid.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtest_types_a-TestInt16.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtest_types_a-TestInt32.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtest_types_a-TestInt64.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtest_types_a-TestInt8.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtest_types_a-TestSequence.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtest_types_a-TestStr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtest_types_a-TestStructure.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtest_types_a-TestTypeFactory.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtest_types_a-TestUInt16.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtest_types_a-TestUInt32.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtest_types_a-TestUInt64.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtest_types_a-TestUrl.Po@am__quote@
+
+.cc.o:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
+
+.cc.obj:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cc.lo:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
+
+libtest_types_a-TestByte.o: TestByte.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestByte.o -MD -MP -MF $(DEPDIR)/libtest_types_a-TestByte.Tpo -c -o libtest_types_a-TestByte.o `test -f 'TestByte.cc' || echo '$(srcdir)/'`TestByte.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestByte.Tpo $(DEPDIR)/libtest_types_a-TestByte.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='TestByte.cc' object='libtest_types_a-TestByte.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestByte.o `test -f 'TestByte.cc' || echo '$(srcdir)/'`TestByte.cc
+
+libtest_types_a-TestByte.obj: TestByte.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestByte.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-TestByte.Tpo -c -o libtest_types_a-TestByte.obj `if test -f 'TestByte.cc'; then $(CYGPATH_W) 'TestByte.cc'; else $(CYGPATH_W) '$(srcdir)/TestByte.cc'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestByte.Tpo $(DEPDIR)/libtest_types_a-TestByte.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='TestByte.cc' object='libtest_types_a-TestByte.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestByte.obj `if test -f 'TestByte.cc'; then $(CYGPATH_W) 'TestByte.cc'; else $(CYGPATH_W) '$(srcdir)/TestByte.cc'; fi`
+
+libtest_types_a-TestInt32.o: TestInt32.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestInt32.o -MD -MP -MF $(DEPDIR)/libtest_types_a-TestInt32.Tpo -c -o libtest_types_a-TestInt32.o `test -f 'TestInt32.cc' || echo '$(srcdir)/'`TestInt32.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestInt32.Tpo $(DEPDIR)/libtest_types_a-TestInt32.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='TestInt32.cc' object='libtest_types_a-TestInt32.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestInt32.o `test -f 'TestInt32.cc' || echo '$(srcdir)/'`TestInt32.cc
+
+libtest_types_a-TestInt32.obj: TestInt32.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestInt32.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-TestInt32.Tpo -c -o libtest_types_a-TestInt32.obj `if test -f 'TestInt32.cc'; then $(CYGPATH_W) 'TestInt32.cc'; else $(CYGPATH_W) '$(srcdir)/TestInt32.cc'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestInt32.Tpo $(DEPDIR)/libtest_types_a-TestInt32.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='TestInt32.cc' object='libtest_types_a-TestInt32.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestInt32.obj `if test -f 'TestInt32.cc'; then $(CYGPATH_W) 'TestInt32.cc'; else $(CYGPATH_W) '$(srcdir)/TestInt32.cc'; fi`
+
+libtest_types_a-TestFloat64.o: TestFloat64.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestFloat64.o -MD -MP -MF $(DEPDIR)/libtest_types_a-TestFloat64.Tpo -c -o libtest_types_a-TestFloat64.o `test -f 'TestFloat64.cc' || echo '$(srcdir)/'`TestFloat64.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestFloat64.Tpo $(DEPDIR)/libtest_types_a-TestFloat64.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='TestFloat64.cc' object='libtest_types_a-TestFloat64.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestFloat64.o `test -f 'TestFloat64.cc' || echo '$(srcdir)/'`TestFloat64.cc
+
+libtest_types_a-TestFloat64.obj: TestFloat64.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestFloat64.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-TestFloat64.Tpo -c -o libtest_types_a-TestFloat64.obj `if test -f 'TestFloat64.cc'; then $(CYGPATH_W) 'TestFloat64.cc'; else $(CYGPATH_W) '$(srcdir)/TestFloat64.cc'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestFloat64.Tpo $(DEPDIR)/libtest_types_a-TestFloat64.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='TestFloat64.cc' object='libtest_types_a-TestFloat64.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestFloat64.obj `if test -f 'TestFloat64.cc'; then $(CYGPATH_W) 'TestFloat64.cc'; else $(CYGPATH_W) '$(srcdir)/TestFloat64.cc'; fi`
+
+libtest_types_a-TestStr.o: TestStr.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestStr.o -MD -MP -MF $(DEPDIR)/libtest_types_a-TestStr.Tpo -c -o libtest_types_a-TestStr.o `test -f 'TestStr.cc' || echo '$(srcdir)/'`TestStr.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestStr.Tpo $(DEPDIR)/libtest_types_a-TestStr.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='TestStr.cc' object='libtest_types_a-TestStr.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestStr.o `test -f 'TestStr.cc' || echo '$(srcdir)/'`TestStr.cc
+
+libtest_types_a-TestStr.obj: TestStr.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestStr.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-TestStr.Tpo -c -o libtest_types_a-TestStr.obj `if test -f 'TestStr.cc'; then $(CYGPATH_W) 'TestStr.cc'; else $(CYGPATH_W) '$(srcdir)/TestStr.cc'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestStr.Tpo $(DEPDIR)/libtest_types_a-TestStr.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='TestStr.cc' object='libtest_types_a-TestStr.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestStr.obj `if test -f 'TestStr.cc'; then $(CYGPATH_W) 'TestStr.cc'; else $(CYGPATH_W) '$(srcdir)/TestStr.cc'; fi`
+
+libtest_types_a-TestUrl.o: TestUrl.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestUrl.o -MD -MP -MF $(DEPDIR)/libtest_types_a-TestUrl.Tpo -c -o libtest_types_a-TestUrl.o `test -f 'TestUrl.cc' || echo '$(srcdir)/'`TestUrl.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestUrl.Tpo $(DEPDIR)/libtest_types_a-TestUrl.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='TestUrl.cc' object='libtest_types_a-TestUrl.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestUrl.o `test -f 'TestUrl.cc' || echo '$(srcdir)/'`TestUrl.cc
+
+libtest_types_a-TestUrl.obj: TestUrl.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestUrl.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-TestUrl.Tpo -c -o libtest_types_a-TestUrl.obj `if test -f 'TestUrl.cc'; then $(CYGPATH_W) 'TestUrl.cc'; else $(CYGPATH_W) '$(srcdir)/TestUrl.cc'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestUrl.Tpo $(DEPDIR)/libtest_types_a-TestUrl.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='TestUrl.cc' object='libtest_types_a-TestUrl.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestUrl.obj `if test -f 'TestUrl.cc'; then $(CYGPATH_W) 'TestUrl.cc'; else $(CYGPATH_W) '$(srcdir)/TestUrl.cc'; fi`
+
+libtest_types_a-TestArray.o: TestArray.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestArray.o -MD -MP -MF $(DEPDIR)/libtest_types_a-TestArray.Tpo -c -o libtest_types_a-TestArray.o `test -f 'TestArray.cc' || echo '$(srcdir)/'`TestArray.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestArray.Tpo $(DEPDIR)/libtest_types_a-TestArray.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='TestArray.cc' object='libtest_types_a-TestArray.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestArray.o `test -f 'TestArray.cc' || echo '$(srcdir)/'`TestArray.cc
+
+libtest_types_a-TestArray.obj: TestArray.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestArray.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-TestArray.Tpo -c -o libtest_types_a-TestArray.obj `if test -f 'TestArray.cc'; then $(CYGPATH_W) 'TestArray.cc'; else $(CYGPATH_W) '$(srcdir)/TestArray.cc'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestArray.Tpo $(DEPDIR)/libtest_types_a-TestArray.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='TestArray.cc' object='libtest_types_a-TestArray.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestArray.obj `if test -f 'TestArray.cc'; then $(CYGPATH_W) 'TestArray.cc'; else $(CYGPATH_W) '$(srcdir)/TestArray.cc'; fi`
+
+libtest_types_a-TestStructure.o: TestStructure.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestStructure.o -MD -MP -MF $(DEPDIR)/libtest_types_a-TestStructure.Tpo -c -o libtest_types_a-TestStructure.o `test -f 'TestStructure.cc' || echo '$(srcdir)/'`TestStructure.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestStructure.Tpo $(DEPDIR)/libtest_types_a-TestStructure.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='TestStructure.cc' object='libtest_types_a-TestStructure.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestStructure.o `test -f 'TestStructure.cc' || echo '$(srcdir)/'`TestStructure.cc
+
+libtest_types_a-TestStructure.obj: TestStructure.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestStructure.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-TestStructure.Tpo -c -o libtest_types_a-TestStructure.obj `if test -f 'TestStructure.cc'; then $(CYGPATH_W) 'TestStructure.cc'; else $(CYGPATH_W) '$(srcdir)/TestStructure.cc'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestStructure.Tpo $(DEPDIR)/libtest_types_a-TestStructure.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='TestStructure.cc' object='libtest_types_a-TestStructure.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestStructure.obj `if test -f 'TestStructure.cc'; then $(CYGPATH_W) 'TestStructure.cc'; else $(CYGPATH_W) '$(srcdir)/TestStructure.cc'; fi`
+
+libtest_types_a-TestSequence.o: TestSequence.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestSequence.o -MD -MP -MF $(DEPDIR)/libtest_types_a-TestSequence.Tpo -c -o libtest_types_a-TestSequence.o `test -f 'TestSequence.cc' || echo '$(srcdir)/'`TestSequence.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestSequence.Tpo $(DEPDIR)/libtest_types_a-TestSequence.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='TestSequence.cc' object='libtest_types_a-TestSequence.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestSequence.o `test -f 'TestSequence.cc' || echo '$(srcdir)/'`TestSequence.cc
+
+libtest_types_a-TestSequence.obj: TestSequence.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestSequence.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-TestSequence.Tpo -c -o libtest_types_a-TestSequence.obj `if test -f 'TestSequence.cc'; then $(CYGPATH_W) 'TestSequence.cc'; else $(CYGPATH_W) '$(srcdir)/TestSequence.cc'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestSequence.Tpo $(DEPDIR)/libtest_types_a-TestSequence.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='TestSequence.cc' object='libtest_types_a-TestSequence.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestSequence.obj `if test -f 'TestSequence.cc'; then $(CYGPATH_W) 'TestSequence.cc'; else $(CYGPATH_W) '$(srcdir)/TestSequence.cc'; fi`
+
+libtest_types_a-TestGrid.o: TestGrid.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestGrid.o -MD -MP -MF $(DEPDIR)/libtest_types_a-TestGrid.Tpo -c -o libtest_types_a-TestGrid.o `test -f 'TestGrid.cc' || echo '$(srcdir)/'`TestGrid.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestGrid.Tpo $(DEPDIR)/libtest_types_a-TestGrid.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='TestGrid.cc' object='libtest_types_a-TestGrid.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestGrid.o `test -f 'TestGrid.cc' || echo '$(srcdir)/'`TestGrid.cc
+
+libtest_types_a-TestGrid.obj: TestGrid.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestGrid.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-TestGrid.Tpo -c -o libtest_types_a-TestGrid.obj `if test -f 'TestGrid.cc'; then $(CYGPATH_W) 'TestGrid.cc'; else $(CYGPATH_W) '$(srcdir)/TestGrid.cc'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestGrid.Tpo $(DEPDIR)/libtest_types_a-TestGrid.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='TestGrid.cc' object='libtest_types_a-TestGrid.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestGrid.obj `if test -f 'TestGrid.cc'; then $(CYGPATH_W) 'TestGrid.cc'; else $(CYGPATH_W) '$(srcdir)/TestGrid.cc'; fi`
+
+libtest_types_a-TestUInt32.o: TestUInt32.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestUInt32.o -MD -MP -MF $(DEPDIR)/libtest_types_a-TestUInt32.Tpo -c -o libtest_types_a-TestUInt32.o `test -f 'TestUInt32.cc' || echo '$(srcdir)/'`TestUInt32.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestUInt32.Tpo $(DEPDIR)/libtest_types_a-TestUInt32.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='TestUInt32.cc' object='libtest_types_a-TestUInt32.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestUInt32.o `test -f 'TestUInt32.cc' || echo '$(srcdir)/'`TestUInt32.cc
+
+libtest_types_a-TestUInt32.obj: TestUInt32.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestUInt32.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-TestUInt32.Tpo -c -o libtest_types_a-TestUInt32.obj `if test -f 'TestUInt32.cc'; then $(CYGPATH_W) 'TestUInt32.cc'; else $(CYGPATH_W) '$(srcdir)/TestUInt32.cc'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestUInt32.Tpo $(DEPDIR)/libtest_types_a-TestUInt32.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='TestUInt32.cc' object='libtest_types_a-TestUInt32.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestUInt32.obj `if test -f 'TestUInt32.cc'; then $(CYGPATH_W) 'TestUInt32.cc'; else $(CYGPATH_W) '$(srcdir)/TestUInt32.cc'; fi`
+
+libtest_types_a-TestInt16.o: TestInt16.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestInt16.o -MD -MP -MF $(DEPDIR)/libtest_types_a-TestInt16.Tpo -c -o libtest_types_a-TestInt16.o `test -f 'TestInt16.cc' || echo '$(srcdir)/'`TestInt16.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestInt16.Tpo $(DEPDIR)/libtest_types_a-TestInt16.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='TestInt16.cc' object='libtest_types_a-TestInt16.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestInt16.o `test -f 'TestInt16.cc' || echo '$(srcdir)/'`TestInt16.cc
+
+libtest_types_a-TestInt16.obj: TestInt16.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestInt16.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-TestInt16.Tpo -c -o libtest_types_a-TestInt16.obj `if test -f 'TestInt16.cc'; then $(CYGPATH_W) 'TestInt16.cc'; else $(CYGPATH_W) '$(srcdir)/TestInt16.cc'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestInt16.Tpo $(DEPDIR)/libtest_types_a-TestInt16.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='TestInt16.cc' object='libtest_types_a-TestInt16.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestInt16.obj `if test -f 'TestInt16.cc'; then $(CYGPATH_W) 'TestInt16.cc'; else $(CYGPATH_W) '$(srcdir)/TestInt16.cc'; fi`
+
+libtest_types_a-TestUInt16.o: TestUInt16.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestUInt16.o -MD -MP -MF $(DEPDIR)/libtest_types_a-TestUInt16.Tpo -c -o libtest_types_a-TestUInt16.o `test -f 'TestUInt16.cc' || echo '$(srcdir)/'`TestUInt16.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestUInt16.Tpo $(DEPDIR)/libtest_types_a-TestUInt16.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='TestUInt16.cc' object='libtest_types_a-TestUInt16.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestUInt16.o `test -f 'TestUInt16.cc' || echo '$(srcdir)/'`TestUInt16.cc
+
+libtest_types_a-TestUInt16.obj: TestUInt16.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestUInt16.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-TestUInt16.Tpo -c -o libtest_types_a-TestUInt16.obj `if test -f 'TestUInt16.cc'; then $(CYGPATH_W) 'TestUInt16.cc'; else $(CYGPATH_W) '$(srcdir)/TestUInt16.cc'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestUInt16.Tpo $(DEPDIR)/libtest_types_a-TestUInt16.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='TestUInt16.cc' object='libtest_types_a-TestUInt16.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestUInt16.obj `if test -f 'TestUInt16.cc'; then $(CYGPATH_W) 'TestUInt16.cc'; else $(CYGPATH_W) '$(srcdir)/TestUInt16.cc'; fi`
+
+libtest_types_a-TestFloat32.o: TestFloat32.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestFloat32.o -MD -MP -MF $(DEPDIR)/libtest_types_a-TestFloat32.Tpo -c -o libtest_types_a-TestFloat32.o `test -f 'TestFloat32.cc' || echo '$(srcdir)/'`TestFloat32.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestFloat32.Tpo $(DEPDIR)/libtest_types_a-TestFloat32.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='TestFloat32.cc' object='libtest_types_a-TestFloat32.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestFloat32.o `test -f 'TestFloat32.cc' || echo '$(srcdir)/'`TestFloat32.cc
+
+libtest_types_a-TestFloat32.obj: TestFloat32.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestFloat32.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-TestFloat32.Tpo -c -o libtest_types_a-TestFloat32.obj `if test -f 'TestFloat32.cc'; then $(CYGPATH_W) 'TestFloat32.cc'; else $(CYGPATH_W) '$(srcdir)/TestFloat32.cc'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestFloat32.Tpo $(DEPDIR)/libtest_types_a-TestFloat32.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='TestFloat32.cc' object='libtest_types_a-TestFloat32.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestFloat32.obj `if test -f 'TestFloat32.cc'; then $(CYGPATH_W) 'TestFloat32.cc'; else $(CYGPATH_W) '$(srcdir)/TestFloat32.cc'; fi`
+
+libtest_types_a-TestTypeFactory.o: TestTypeFactory.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestTypeFactory.o -MD -MP -MF $(DEPDIR)/libtest_types_a-TestTypeFactory.Tpo -c -o libtest_types_a-TestTypeFactory.o `test -f 'TestTypeFactory.cc' || echo '$(srcdir)/'`TestTypeFactory.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestTypeFactory.Tpo $(DEPDIR)/libtest_types_a-TestTypeFactory.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='TestTypeFactory.cc' object='libtest_types_a-TestTypeFactory.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestTypeFactory.o `test -f 'TestTypeFactory.cc' || echo '$(srcdir)/'`TestTypeFactory.cc
+
+libtest_types_a-TestTypeFactory.obj: TestTypeFactory.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestTypeFactory.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-TestTypeFactory.Tpo -c -o libtest_types_a-TestTypeFactory.obj `if test -f 'TestTypeFactory.cc'; then $(CYGPATH_W) 'TestTypeFactory.cc'; else $(CYGPATH_W) '$(srcdir)/TestTypeFactory.cc'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestTypeFactory.Tpo $(DEPDIR)/libtest_types_a-TestTypeFactory.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='TestTypeFactory.cc' object='libtest_types_a-TestTypeFactory.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestTypeFactory.obj `if test -f 'TestTypeFactory.cc'; then $(CYGPATH_W) 'TestTypeFactory.cc'; else $(CYGPATH_W) '$(srcdir)/TestTypeFactory.cc'; fi`
+
+libtest_types_a-D4TestTypeFactory.o: D4TestTypeFactory.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-D4TestTypeFactory.o -MD -MP -MF $(DEPDIR)/libtest_types_a-D4TestTypeFactory.Tpo -c -o libtest_types_a-D4TestTypeFactory.o `test -f 'D4TestTypeFactory.cc' || echo '$(srcdir)/'`D4TestTypeFactory.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-D4TestTypeFactory.Tpo $(DEPDIR)/libtest_types_a-D4TestTypeFactory.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='D4TestTypeFactory.cc' object='libtest_types_a-D4TestTypeFactory.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-D4TestTypeFactory.o `test -f 'D4TestTypeFactory.cc' || echo '$(srcdir)/'`D4TestTypeFactory.cc
+
+libtest_types_a-D4TestTypeFactory.obj: D4TestTypeFactory.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-D4TestTypeFactory.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-D4TestTypeFactory.Tpo -c -o libtest_types_a-D4TestTypeFactory.obj `if test -f 'D4TestTypeFactory.cc'; then $(CYGPATH_W) 'D4TestTypeFactory.cc'; else $(CYGPATH_W) '$(srcdir)/D4TestTypeFactory.cc'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-D4TestTypeFactory.Tpo $(DEPDIR)/libtest_types_a-D4TestTypeFactory.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='D4TestTypeFactory.cc' object='libtest_types_a-D4TestTypeFactory.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-D4TestTypeFactory.obj `if test -f 'D4TestTypeFactory.cc'; then $(CYGPATH_W) 'D4TestTypeFactory.cc'; else $(CYGPATH_W) '$(srcdir)/D4TestTypeFactory.cc'; fi`
+
+libtest_types_a-TestD4Group.o: TestD4Group.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestD4Group.o -MD -MP -MF $(DEPDIR)/libtest_types_a-TestD4Group.Tpo -c -o libtest_types_a-TestD4Group.o `test -f 'TestD4Group.cc' || echo '$(srcdir)/'`TestD4Group.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestD4Group.Tpo $(DEPDIR)/libtest_types_a-TestD4Group.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='TestD4Group.cc' object='libtest_types_a-TestD4Group.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestD4Group.o `test -f 'TestD4Group.cc' || echo '$(srcdir)/'`TestD4Group.cc
+
+libtest_types_a-TestD4Group.obj: TestD4Group.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestD4Group.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-TestD4Group.Tpo -c -o libtest_types_a-TestD4Group.obj `if test -f 'TestD4Group.cc'; then $(CYGPATH_W) 'TestD4Group.cc'; else $(CYGPATH_W) '$(srcdir)/TestD4Group.cc'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestD4Group.Tpo $(DEPDIR)/libtest_types_a-TestD4Group.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='TestD4Group.cc' object='libtest_types_a-TestD4Group.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestD4Group.obj `if test -f 'TestD4Group.cc'; then $(CYGPATH_W) 'TestD4Group.cc'; else $(CYGPATH_W) '$(srcdir)/TestD4Group.cc'; fi`
+
+libtest_types_a-TestInt8.o: TestInt8.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestInt8.o -MD -MP -MF $(DEPDIR)/libtest_types_a-TestInt8.Tpo -c -o libtest_types_a-TestInt8.o `test -f 'TestInt8.cc' || echo '$(srcdir)/'`TestInt8.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestInt8.Tpo $(DEPDIR)/libtest_types_a-TestInt8.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='TestInt8.cc' object='libtest_types_a-TestInt8.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestInt8.o `test -f 'TestInt8.cc' || echo '$(srcdir)/'`TestInt8.cc
+
+libtest_types_a-TestInt8.obj: TestInt8.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestInt8.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-TestInt8.Tpo -c -o libtest_types_a-TestInt8.obj `if test -f 'TestInt8.cc'; then $(CYGPATH_W) 'TestInt8.cc'; else $(CYGPATH_W) '$(srcdir)/TestInt8.cc'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestInt8.Tpo $(DEPDIR)/libtest_types_a-TestInt8.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='TestInt8.cc' object='libtest_types_a-TestInt8.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestInt8.obj `if test -f 'TestInt8.cc'; then $(CYGPATH_W) 'TestInt8.cc'; else $(CYGPATH_W) '$(srcdir)/TestInt8.cc'; fi`
+
+libtest_types_a-TestInt64.o: TestInt64.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestInt64.o -MD -MP -MF $(DEPDIR)/libtest_types_a-TestInt64.Tpo -c -o libtest_types_a-TestInt64.o `test -f 'TestInt64.cc' || echo '$(srcdir)/'`TestInt64.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestInt64.Tpo $(DEPDIR)/libtest_types_a-TestInt64.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='TestInt64.cc' object='libtest_types_a-TestInt64.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestInt64.o `test -f 'TestInt64.cc' || echo '$(srcdir)/'`TestInt64.cc
+
+libtest_types_a-TestInt64.obj: TestInt64.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestInt64.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-TestInt64.Tpo -c -o libtest_types_a-TestInt64.obj `if test -f 'TestInt64.cc'; then $(CYGPATH_W) 'TestInt64.cc'; else $(CYGPATH_W) '$(srcdir)/TestInt64.cc'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestInt64.Tpo $(DEPDIR)/libtest_types_a-TestInt64.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='TestInt64.cc' object='libtest_types_a-TestInt64.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestInt64.obj `if test -f 'TestInt64.cc'; then $(CYGPATH_W) 'TestInt64.cc'; else $(CYGPATH_W) '$(srcdir)/TestInt64.cc'; fi`
+
+libtest_types_a-TestUInt64.o: TestUInt64.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestUInt64.o -MD -MP -MF $(DEPDIR)/libtest_types_a-TestUInt64.Tpo -c -o libtest_types_a-TestUInt64.o `test -f 'TestUInt64.cc' || echo '$(srcdir)/'`TestUInt64.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestUInt64.Tpo $(DEPDIR)/libtest_types_a-TestUInt64.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='TestUInt64.cc' object='libtest_types_a-TestUInt64.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestUInt64.o `test -f 'TestUInt64.cc' || echo '$(srcdir)/'`TestUInt64.cc
+
+libtest_types_a-TestUInt64.obj: TestUInt64.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestUInt64.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-TestUInt64.Tpo -c -o libtest_types_a-TestUInt64.obj `if test -f 'TestUInt64.cc'; then $(CYGPATH_W) 'TestUInt64.cc'; else $(CYGPATH_W) '$(srcdir)/TestUInt64.cc'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestUInt64.Tpo $(DEPDIR)/libtest_types_a-TestUInt64.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='TestUInt64.cc' object='libtest_types_a-TestUInt64.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestUInt64.obj `if test -f 'TestUInt64.cc'; then $(CYGPATH_W) 'TestUInt64.cc'; else $(CYGPATH_W) '$(srcdir)/TestUInt64.cc'; fi`
+
+libtest_types_a-TestD4Sequence.o: TestD4Sequence.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestD4Sequence.o -MD -MP -MF $(DEPDIR)/libtest_types_a-TestD4Sequence.Tpo -c -o libtest_types_a-TestD4Sequence.o `test -f 'TestD4Sequence.cc' || echo '$(srcdir)/'`TestD4Sequence.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestD4Sequence.Tpo $(DEPDIR)/libtest_types_a-TestD4Sequence.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='TestD4Sequence.cc' object='libtest_types_a-TestD4Sequence.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestD4Sequence.o `test -f 'TestD4Sequence.cc' || echo '$(srcdir)/'`TestD4Sequence.cc
+
+libtest_types_a-TestD4Sequence.obj: TestD4Sequence.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestD4Sequence.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-TestD4Sequence.Tpo -c -o libtest_types_a-TestD4Sequence.obj `if test -f 'TestD4Sequence.cc'; then $(CYGPATH_W) 'TestD4Sequence.cc'; else $(CYGPATH_W) '$(srcdir)/TestD4Sequence.cc'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestD4Sequence.Tpo $(DEPDIR)/libtest_types_a-TestD4Sequence.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='TestD4Sequence.cc' object='libtest_types_a-TestD4Sequence.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestD4Sequence.obj `if test -f 'TestD4Sequence.cc'; then $(CYGPATH_W) 'TestD4Sequence.cc'; else $(CYGPATH_W) '$(srcdir)/TestD4Sequence.cc'; fi`
+
+libtest_types_a-TestD4Enum.o: TestD4Enum.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestD4Enum.o -MD -MP -MF $(DEPDIR)/libtest_types_a-TestD4Enum.Tpo -c -o libtest_types_a-TestD4Enum.o `test -f 'TestD4Enum.cc' || echo '$(srcdir)/'`TestD4Enum.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestD4Enum.Tpo $(DEPDIR)/libtest_types_a-TestD4Enum.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='TestD4Enum.cc' object='libtest_types_a-TestD4Enum.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestD4Enum.o `test -f 'TestD4Enum.cc' || echo '$(srcdir)/'`TestD4Enum.cc
+
+libtest_types_a-TestD4Enum.obj: TestD4Enum.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestD4Enum.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-TestD4Enum.Tpo -c -o libtest_types_a-TestD4Enum.obj `if test -f 'TestD4Enum.cc'; then $(CYGPATH_W) 'TestD4Enum.cc'; else $(CYGPATH_W) '$(srcdir)/TestD4Enum.cc'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestD4Enum.Tpo $(DEPDIR)/libtest_types_a-TestD4Enum.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='TestD4Enum.cc' object='libtest_types_a-TestD4Enum.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestD4Enum.obj `if test -f 'TestD4Enum.cc'; then $(CYGPATH_W) 'TestD4Enum.cc'; else $(CYGPATH_W) '$(srcdir)/TestD4Enum.cc'; fi`
+
+libtest_types_a-TestD4Opaque.o: TestD4Opaque.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestD4Opaque.o -MD -MP -MF $(DEPDIR)/libtest_types_a-TestD4Opaque.Tpo -c -o libtest_types_a-TestD4Opaque.o `test -f 'TestD4Opaque.cc' || echo '$(srcdir)/'`TestD4Opaque.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestD4Opaque.Tpo $(DEPDIR)/libtest_types_a-TestD4Opaque.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='TestD4Opaque.cc' object='libtest_types_a-TestD4Opaque.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestD4Opaque.o `test -f 'TestD4Opaque.cc' || echo '$(srcdir)/'`TestD4Opaque.cc
+
+libtest_types_a-TestD4Opaque.obj: TestD4Opaque.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestD4Opaque.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-TestD4Opaque.Tpo -c -o libtest_types_a-TestD4Opaque.obj `if test -f 'TestD4Opaque.cc'; then $(CYGPATH_W) 'TestD4Opaque.cc'; else $(CYGPATH_W) '$(srcdir)/TestD4Opaque.cc'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestD4Opaque.Tpo $(DEPDIR)/libtest_types_a-TestD4Opaque.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='TestD4Opaque.cc' object='libtest_types_a-TestD4Opaque.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestD4Opaque.obj `if test -f 'TestD4Opaque.cc'; then $(CYGPATH_W) 'TestD4Opaque.cc'; else $(CYGPATH_W) '$(srcdir)/TestD4Opaque.cc'; fi`
+
+libtest_types_a-TestFunction.o: TestFunction.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestFunction.o -MD -MP -MF $(DEPDIR)/libtest_types_a-TestFunction.Tpo -c -o libtest_types_a-TestFunction.o `test -f 'TestFunction.cc' || echo '$(srcdir)/'`TestFunction.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestFunction.Tpo $(DEPDIR)/libtest_types_a-TestFunction.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='TestFunction.cc' object='libtest_types_a-TestFunction.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestFunction.o `test -f 'TestFunction.cc' || echo '$(srcdir)/'`TestFunction.cc
+
+libtest_types_a-TestFunction.obj: TestFunction.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestFunction.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-TestFunction.Tpo -c -o libtest_types_a-TestFunction.obj `if test -f 'TestFunction.cc'; then $(CYGPATH_W) 'TestFunction.cc'; else $(CYGPATH_W) '$(srcdir)/TestFunction.cc'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestFunction.Tpo $(DEPDIR)/libtest_types_a-TestFunction.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='TestFunction.cc' object='libtest_types_a-TestFunction.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestFunction.obj `if test -f 'TestFunction.cc'; then $(CYGPATH_W) 'TestFunction.cc'; else $(CYGPATH_W) '$(srcdir)/TestFunction.cc'; fi`
+
+libtest_types_a-D4TestFunction.o: D4TestFunction.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-D4TestFunction.o -MD -MP -MF $(DEPDIR)/libtest_types_a-D4TestFunction.Tpo -c -o libtest_types_a-D4TestFunction.o `test -f 'D4TestFunction.cc' || echo '$(srcdir)/'`D4TestFunction.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-D4TestFunction.Tpo $(DEPDIR)/libtest_types_a-D4TestFunction.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='D4TestFunction.cc' object='libtest_types_a-D4TestFunction.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-D4TestFunction.o `test -f 'D4TestFunction.cc' || echo '$(srcdir)/'`D4TestFunction.cc
+
+libtest_types_a-D4TestFunction.obj: D4TestFunction.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-D4TestFunction.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-D4TestFunction.Tpo -c -o libtest_types_a-D4TestFunction.obj `if test -f 'D4TestFunction.cc'; then $(CYGPATH_W) 'D4TestFunction.cc'; else $(CYGPATH_W) '$(srcdir)/D4TestFunction.cc'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-D4TestFunction.Tpo $(DEPDIR)/libtest_types_a-D4TestFunction.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='D4TestFunction.cc' object='libtest_types_a-D4TestFunction.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-D4TestFunction.obj `if test -f 'D4TestFunction.cc'; then $(CYGPATH_W) 'D4TestFunction.cc'; else $(CYGPATH_W) '$(srcdir)/D4TestFunction.cc'; fi`
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-testheadersHEADERS: $(testheaders_HEADERS)
+	@$(NORMAL_INSTALL)
+	@list='$(testheaders_HEADERS)'; test -n "$(testheadersdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(testheadersdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(testheadersdir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(testheadersdir)'"; \
+	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(testheadersdir)" || exit $$?; \
+	done
+
+uninstall-testheadersHEADERS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(testheaders_HEADERS)'; test -n "$(testheadersdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(testheadersdir)'; $(am__uninstall_files_from_dir)
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) $(check_SCRIPTS)
+	$(MAKE) $(AM_MAKEFLAGS) check-local
+check: check-am
+all-am: Makefile $(LIBRARIES) $(HEADERS)
+installdirs:
+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(testheadersdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-checkPROGRAMS clean-generic clean-libLIBRARIES \
+	clean-libtool clean-local mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-local distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-testheadersHEADERS
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am: install-libLIBRARIES
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-libLIBRARIES uninstall-testheadersHEADERS
+
+.MAKE: check-am install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am check-local clean \
+	clean-checkPROGRAMS clean-generic clean-libLIBRARIES \
+	clean-libtool clean-local cscopelist-am ctags ctags-am \
+	distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-local distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-libLIBRARIES install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip install-testheadersHEADERS installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am uninstall-libLIBRARIES \
+	uninstall-testheadersHEADERS
+
+
+# DASTest.dir/* DDSTest.dir/* EXPRTest.dir/* DMRTest.dir/* getdapTest.dir/*
+
+dmr-testsuite.tar.gz: dmr-testsuite/*.xml
+	tar -czf $@ $^
+
+check-local: atconfig atlocal $(DASTESTSUITE) $(DDSTESTSUITE) \
+$(EXPRTESTSUITE) $(DMRTESTSUITE) $(GETDAPTESTSUITE) 
+	$(SHELL) '$(DASTESTSUITE)' $(TESTSUITEFLAGS)
+	$(SHELL) '$(DDSTESTSUITE)' $(TESTSUITEFLAGS)
+	$(SHELL) '$(EXPRTESTSUITE)' $(TESTSUITEFLAGS)
+	$(SHELL) '$(DMRTESTSUITE)' $(TESTSUITEFLAGS)
+	$(SHELL) '$(GETDAPTESTSUITE)' $(TESTSUITEFLAGS)
+
+# Make sure there are no spaces after the DASTESTSUITE names. jhrg 3/16/15
+# Delete the scripts here and not using CLEANFILES because this target is
+# run after the 'regular' clean: and we need the test scripts to run their
+# --clean option. Once that's done, then remove them. 
+clean-local:
+	test ! -f '$(DASTESTSUITE)' || $(SHELL) $(DASTESTSUITE) --clean
+	test ! -f '$(DDSTESTSUITE)' || $(SHELL) $(DDSTESTSUITE) --clean
+	test ! -f '$(EXPRTESTSUITE)' || $(SHELL) $(EXPRTESTSUITE) --clean
+	test ! -f '$(DMRTESTSUITE)' || $(SHELL) $(DMRTESTSUITE) --clean
+	test ! -f '$(GETDAPTESTSUITE)' || $(SHELL) $(GETDAPTESTSUITE) --clean
+
+distclean-local:
+	-rm atconfig
+
+$(DASTESTSUITE): $(srcdir)/DASTest.at $(srcdir)/package.m4
+	$(AUTOTEST) -I '$(srcdir)' -o $@.tmp $@.at
+	mv $@.tmp $@
+
+$(DDSTESTSUITE): $(srcdir)/DDSTest.at $(srcdir)/package.m4
+	$(AUTOTEST) -I '$(srcdir)' -o $@.tmp $@.at
+	mv $@.tmp $@
+
+$(EXPRTESTSUITE): $(srcdir)/EXPRTest.at $(srcdir)/package.m4
+	$(AUTOTEST) -I '$(srcdir)' -o $@.tmp $@.at
+	mv $@.tmp $@
+
+$(DMRTESTSUITE): $(srcdir)/DMRTest.at $(srcdir)/package.m4
+	$(AUTOTEST) -I '$(srcdir)' -o $@.tmp $@.at
+	mv $@.tmp $@
+
+$(GETDAPTESTSUITE): $(srcdir)/getdapTest.at $(srcdir)/package.m4
+	$(AUTOTEST) -I '$(srcdir)' -o $@.tmp $@.at
+	mv $@.tmp $@
+
+# The `:;' works around a Bash 3.2 bug when the output is not writable.
+$(srcdir)/package.m4: $(top_srcdir)/configure.ac
+	:;{ \
+	echo '# Signature of the current package.' && \
+	echo 'm4_define([AT_PACKAGE_NAME],      [@PACKAGE_NAME@])' && \
+	echo 'm4_define([AT_PACKAGE_TARNAME],   [@PACKAGE_TARNAME@])' && \
+	echo 'm4_define([AT_PACKAGE_VERSION],   [@PACKAGE_VERSION@])' && \
+	echo 'm4_define([AT_PACKAGE_STRING],    [@PACKAGE_STRING@])' && \
+	echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \
+	} >'$(srcdir)/package.m4'
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/tests/README b/tests/README
new file mode 100644
index 0000000..2baeb1a
--- /dev/null
+++ b/tests/README
@@ -0,0 +1,19 @@
+
+On some systems 'make check' will report that the script config.guess' could
+not be found. If that happens, create a symbolic link from ../conf/config.guess
+to either this directory or the libdap-* directory (one level up). The check 
+target should now work.
+
+Tests that are known/expected to fail
+
+There are four tests that are know to fail: expr-test.0/test.1.exp,
+test.6.exp and the expr-test.1 versions. These tests check to see if a CE
+with a selection works when applied to a non-relational data type. It does
+not work and that behavior was never defined by DAP 2.0.
+
+Tests expr-test.1/test.xc.exp and test.yc.exp also fail because of the
+situation described in ticket #995 - a nested sequence is not correctly
+processed by the intern_data() methods. This problem will show up in the JGOFS
+handler when ASCII responses are requested, but will not affect other
+Sequence data sets such as the file servers' data.
+
diff --git a/tests/ResponseBuilder.cc b/tests/ResponseBuilder.cc
new file mode 100644
index 0000000..dd3a784
--- /dev/null
+++ b/tests/ResponseBuilder.cc
@@ -0,0 +1,544 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2011 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#include "config.h"
+
+#include <signal.h>
+#include <unistd.h>
+#include <sys/stat.h>
+
+#ifdef HAVE_UUID_UUID_H
+#include <uuid/uuid.h>  // used to build CID header value for data ddx
+#elif defined(HAVE_UUID_H)
+#include <uuid.h>
+#else
+#error "Could not find UUID library header"
+#endif
+
+#ifndef WIN32
+#include <sys/wait.h>
+#else
+#include <io.h>
+#include <fcntl.h>
+#include <process.h>
+#endif
+
+#include <iostream>
+#include <string>
+#include <sstream>
+#include <fstream>
+
+#include <cstring>
+#include <ctime>
+
+//#define DODS_DEBUG
+
+#include "DAS.h"
+#include "DDS.h"
+#include "ConstraintEvaluator.h"
+#include "DDXParserSAX2.h"
+#include "Ancillary.h"
+#include "ResponseBuilder.h"
+#include "XDRStreamMarshaller.h"
+#include "XDRFileUnMarshaller.h"
+
+//#include "DAPCache3.h"
+//#include "ResponseCache.h"
+
+#include "debug.h"
+#include "mime_util.h"	// for last_modified_time() and rfc_822_date()
+#include "escaping.h"
+#include "util.h"
+
+#ifndef WIN32
+#include "SignalHandler.h"
+#include "EventHandler.h"
+#include "AlarmHandler.h"
+#endif
+
+#define CRLF "\r\n"             // Change here, expr-test.cc
+
+using namespace std;
+using namespace libdap;
+
+/** Called when initializing a ResponseBuilder that's not going to be passed
+ command line arguments. */
+void ResponseBuilder::initialize()
+{
+    // Set default values. Don't use the C++ constructor initialization so
+    // that a subclass can have more control over this process.
+    d_dataset = "";
+    d_dap2ce = "";
+    d_dap2_btp_func_ce = "";
+    d_timeout = 0;
+
+    d_default_protocol = DAP_PROTOCOL_VERSION;
+}
+
+ResponseBuilder::~ResponseBuilder()
+{
+	// If an alarm was registered, delete it. The register code in SignalHandler
+	// always deletes the old alarm handler object, so only the one returned by
+	// remove_handler needs to be deleted at this point.
+	delete dynamic_cast<AlarmHandler*>(SignalHandler::instance()->remove_handler(SIGALRM));
+}
+
+/** Return the entire constraint expression in a string.  This
+ includes both the projection and selection clauses, but not the
+ question mark.
+
+ @brief Get the constraint expression.
+ @return A string object that contains the constraint expression. */
+string ResponseBuilder::get_ce() const
+{
+    return d_dap2ce;
+}
+
+/** Set the constraint expression. This will filter the CE text removing
+ * any 'WWW' escape characters except space. Spaces are left in the CE
+ * because the CE parser uses whitespace to delimit tokens while some
+ * datasets have identifiers that contain spaces. It's possible to use
+ * double quotes around identifiers too, but most client software doesn't
+ * know about that.
+ *
+ * @@brief Set the CE
+ * @param _ce The constraint expression
+ */
+void ResponseBuilder::set_ce(string _ce)
+{
+    d_dap2ce = www2id(_ce, "%", "%20");
+}
+
+/** The ``dataset name'' is the filename or other string that the
+ filter program will use to access the data. In some cases this
+ will indicate a disk file containing the data.  In others, it
+ may represent a database query or some other exotic data
+ access method.
+
+ @brief Get the dataset name.
+ @return A string object that contains the name of the dataset. */
+string ResponseBuilder::get_dataset_name() const
+{
+    return d_dataset;
+}
+
+/** Set the dataset name, which is a string used to access the dataset
+ * on the machine running the server. That is, this is typically a pathname
+ * to a data file, although it doesn't have to be. This is not
+ * echoed in error messages (because that would reveal server
+ * storage patterns that data providers might want to hide). All WWW-style
+ * escapes are replaced except for spaces.
+ *
+ * @brief Set the dataset pathname.
+ * @param ds The pathname (or equivalent) to the dataset.
+ */
+void ResponseBuilder::set_dataset_name(const string ds)
+{
+    d_dataset = www2id(ds, "%", "%20");
+}
+#if 0
+/** Set the server's timeout value. A value of zero (the default) means no
+ timeout.
+
+ @see To establish a timeout, call establish_timeout(ostream &)
+ @param t Server timeout in seconds. Default is zero (no timeout). */
+void ResponseBuilder::set_timeout(int t)
+{
+    d_timeout = t;
+}
+
+/** Get the server's timeout value. */
+int ResponseBuilder::get_timeout() const
+{
+    return d_timeout;
+}
+
+/** Use values of this instance to establish a timeout alarm for the server.
+ If the timeout value is zero, do nothing.
+*/
+void ResponseBuilder::establish_timeout(ostream &stream) const
+{
+#ifndef WIN32
+    if (d_timeout > 0) {
+        SignalHandler *sh = SignalHandler::instance();
+        EventHandler *old_eh = sh->register_handler(SIGALRM, new AlarmHandler(stream));
+        delete old_eh;
+        alarm(d_timeout);
+    }
+#endif
+}
+#endif
+
+/**
+ *  Split the CE so that the server functions that compute new values are
+ *  separated into their own string and can be evaluated separately from
+ *  the rest of the CE (which can contain simple and slicing projection
+ *  as well as other types of function calls).
+ */
+void
+ResponseBuilder::split_ce(ConstraintEvaluator &eval, const string &expr)
+{
+    string ce;
+    if (!expr.empty())
+        ce = expr;
+    else
+        ce = d_dap2ce;
+
+    string btp_function_ce = "";
+    string::size_type pos = 0;
+    DBG(cerr << "ce: " << ce << endl);
+
+    string::size_type first_paren = ce.find("(", pos);
+    string::size_type closing_paren = ce.find(")", pos);
+    while (first_paren != string::npos && closing_paren != string::npos) {
+        // Maybe a BTP function; get the name of the potential function
+        string name = ce.substr(pos, first_paren-pos);
+        DBG(cerr << "name: " << name << endl);
+        // is this a BTP function
+        btp_func f;
+        if (eval.find_function(name, &f)) {
+            // Found a BTP function
+            if (!btp_function_ce.empty())
+                btp_function_ce += ",";
+            btp_function_ce += ce.substr(pos, closing_paren+1-pos);
+            ce.erase(pos, closing_paren+1-pos);
+            if (ce[pos] == ',')
+                ce.erase(pos, 1);
+        }
+        else {
+            pos = closing_paren + 1;
+            // exception?
+            if (pos < ce.length() && ce.at(pos) == ',')
+                ++pos;
+        }
+
+        first_paren = ce.find("(", pos);
+        closing_paren = ce.find(")", pos);
+    }
+
+    DBG(cerr << "Modified constraint: " << ce << endl);
+    DBG(cerr << "BTP Function part: " << btp_function_ce << endl);
+
+    d_dap2ce = ce;
+    d_dap2_btp_func_ce = btp_function_ce;
+}
+
+#if 0
+/** This function formats and prints an ASCII representation of a
+ DAS on stdout.  This has the effect of sending the DAS object
+ back to the client program.
+
+ @note This is the DAP2 attribute response.
+
+ @brief Send a DAS.
+
+ @param out The output stream to which the DAS is to be sent.
+ @param das The DAS object to be sent.
+ @param with_mime_headers If true (the default) send MIME headers.
+ @return void
+ @see DAS
+ @deprecated */
+void ResponseBuilder::send_das(ostream &out, DAS &das, bool with_mime_headers) const
+{
+    if (with_mime_headers)
+        set_mime_text(out, dods_das, x_plain, last_modified_time(d_dataset), "2.0");
+
+    das.print(out);
+
+    out << flush;
+}
+
+/** Send the DAP2 DAS response to the given stream. This version of
+ * send_das() uses the DDS object, assuming that it contains attribute
+ * information. If there is a constraint expression associated with this
+ * instance of ResponseBuilder, then it will be applied. This means
+ * that CEs that contain server functions will populate the response cache
+ * even if the server's initial request is for a DAS. This is different
+ * from the older behavior of libdap where CEs were never evaluated for
+ * the DAS response. This does not actually change the resulting DAS,
+ * just the behavior 'under the covers'.
+ *
+ * @param out Send the response to this ostream
+ * @param dds Use this DDS object
+ * @param eval A Constraint Evaluator to use for any CE bound to this
+ * ResponseBuilder instance
+ * @param constrained Should the result be constrained
+ * @param with_mime_headers Should MIME headers be sent to out?
+ */
+void ResponseBuilder::send_das(ostream &out, DDS &dds, ConstraintEvaluator &eval, bool constrained, bool with_mime_headers)
+{
+    // Set up the alarm.
+    establish_timeout(out);
+    dds.set_timeout(d_timeout);
+
+    if (!constrained) {
+        if (with_mime_headers)
+            set_mime_text(out, dods_das, x_plain, last_modified_time(d_dataset), "2.0");
+
+        dds.print_das(out);
+        out << flush;
+
+        return;
+    }
+
+    split_ce(eval);
+
+    // If there are functions, parse them and eval.
+    // Use that DDS and parse the non-function ce
+    // Serialize using the second ce and the second dds
+    if (!d_btp_func_ce.empty()) {
+        DDS *fdds = 0;
+        string cache_token = "";
+
+        if (responseCache()) {
+            DBG(cerr << "Using the cache for the server function CE" << endl);
+            fdds = responseCache()->read_cached_dataset(dds, d_btp_func_ce, this, &eval, cache_token);
+        }
+        else {
+            DBG(cerr << "Cache not found; (re)calculating" << endl);
+            eval.parse_constraint(d_btp_func_ce, dds);
+            fdds = eval.eval_function_clauses(dds);
+        }
+
+        if (with_mime_headers)
+            set_mime_text(out, dods_das, x_plain, last_modified_time(d_dataset), dds.get_dap_version());
+
+        fdds->print_das(out);
+
+        if (responseCache())
+        	responseCache()->unlock_and_close(cache_token);
+
+        delete fdds;
+    }
+    else {
+        DBG(cerr << "Simple constraint" << endl);
+
+        eval.parse_constraint(d_dap2ce, dds); // Throws Error if the ce doesn't parse.
+
+        if (with_mime_headers)
+            set_mime_text(out, dods_das, x_plain, last_modified_time(d_dataset), dds.get_dap_version());
+
+        dds.print_das(out);
+    }
+
+    out << flush;
+}
+
+/** This function formats and prints an ASCII representation of a
+ DDS on stdout. Either an entire DDS or a constrained DDS may be sent.
+ This function looks in the local cache and uses a DDS object there
+ if it's valid. Otherwise, if the request CE contains server functions
+ that build data for the response, the resulting DDS will be cached.
+
+ @brief Transmit a DDS.
+ @param out The output stream to which the DAS is to be sent.
+ @param dds The DDS to send back to a client.
+ @param eval A reference to the ConstraintEvaluator to use.
+ @param constrained If this argument is true, evaluate the
+ current constraint expression and send the `constrained DDS'
+ back to the client.
+ @param constrained If true, apply the constraint bound to this instance
+ of ResponseBuilder
+ @param with_mime_headers If true (default) send MIME headers.
+ @return void
+ @see DDS */
+void ResponseBuilder::send_dds(ostream &out, DDS &dds, ConstraintEvaluator &eval, bool constrained,
+        bool with_mime_headers)
+{
+    if (!constrained) {
+        if (with_mime_headers)
+            set_mime_text(out, dods_dds, x_plain, last_modified_time(d_dataset), dds.get_dap_version());
+
+        dds.print(out);
+        out << flush;
+        return;
+    }
+
+    // Set up the alarm.
+    establish_timeout(out);
+    dds.set_timeout(d_timeout);
+
+    // Split constraint into two halves
+    split_ce(eval);
+
+    // If there are functions, parse them and eval.
+    // Use that DDS and parse the non-function ce
+    // Serialize using the second ce and the second dds
+    if (!d_btp_func_ce.empty()) {
+        string cache_token = "";
+        DDS *fdds = 0;
+
+        if (responseCache()) {
+            DBG(cerr << "Using the cache for the server function CE" << endl);
+            fdds = responseCache()->read_cached_dataset(dds, d_btp_func_ce, this, &eval, cache_token);
+        }
+        else {
+            DBG(cerr << "Cache not found; (re)calculating" << endl);
+            eval.parse_constraint(d_btp_func_ce, dds);
+            fdds = eval.eval_function_clauses(dds);
+        }
+
+        // Server functions might mark variables to use their read()
+        // methods. Clear that so the CE in d_dap2ce will control what is
+        // sent. If that is empty (there was only a function call) all
+        // of the variables in the intermediate DDS (i.e., the function
+        // result) will be sent.
+        fdds->mark_all(false);
+
+        eval.parse_constraint(d_dap2ce, *fdds);
+
+        if (with_mime_headers)
+            set_mime_text(out, dods_dds, x_plain, last_modified_time(d_dataset), dds.get_dap_version());
+
+        fdds->print_constrained(out);
+
+        if (responseCache())
+        	responseCache()->unlock_and_close(cache_token);
+
+        delete fdds;
+    }
+    else {
+        DBG(cerr << "Simple constraint" << endl);
+
+        eval.parse_constraint(d_dap2ce, dds); // Throws Error if the ce doesn't parse.
+
+        if (with_mime_headers)
+            set_mime_text(out, dods_dds, x_plain, last_modified_time(d_dataset), dds.get_dap_version());
+
+        dds.print_constrained(out);
+    }
+
+    out << flush;
+}
+#endif
+
+/**
+ * Build/return the BLOB part of the DAP2 data response.
+ */
+void ResponseBuilder::dataset_constraint(ostream &out, DDS & dds, ConstraintEvaluator & eval, bool ce_eval)
+{
+    DBG(cerr << "Inside dataset_constraint" << endl);
+
+    dds.print_constrained(out);
+    out << "Data:\n";
+    out << flush;
+
+    XDRStreamMarshaller m(out);
+
+    try {
+        // Send all variables in the current projection (send_p())
+        for (DDS::Vars_iter i = dds.var_begin(); i != dds.var_end(); i++)
+            if ((*i)->send_p()) {
+                (*i)->serialize(eval, dds, m, ce_eval);
+            }
+    }
+    catch (Error & e) {
+        throw;
+    }
+}
+
+/** Send the data in the DDS object back to the client program. The data is
+ encoded using a Marshaller, and enclosed in a MIME document which is all sent
+ to \c data_stream.
+
+ @note This is the DAP2 data response.
+
+ @brief Transmit data.
+ @param dds A DDS object containing the data to be sent.
+ @param eval A reference to the ConstraintEvaluator to use.
+ @param data_stream Write the response to this stream.
+ @param anc_location A directory to search for ancillary files (in
+ addition to the CWD).  This is used in a call to
+ get_data_last_modified_time().
+ @param with_mime_headers If true, include the MIME headers in the response.
+ Defaults to true.
+ @return void */
+void ResponseBuilder::send_data(ostream &data_stream, DDS &dds, ConstraintEvaluator &eval, bool with_mime_headers)
+{
+    // Split constraint into two halves
+    split_ce(eval);
+
+    // If there are functions, parse them and eval.
+    // Use that DDS and parse the non-function ce
+    // Serialize using the second ce and the second dds
+    if (!d_dap2_btp_func_ce.empty()) {
+        DBG(cerr << "Found function(s) in CE: " << d_btp_func_ce << endl);
+        string cache_token = "";
+        DDS *fdds = 0;
+
+        // The BES code caches the function result
+            eval.parse_constraint(d_dap2_btp_func_ce, dds);
+            fdds = eval.eval_function_clauses(dds);
+
+        DBG(fdds->print_constrained(cerr));
+
+        // Server functions might mark variables to use their read()
+        // methods. Clear that so the CE in d_dap2ce will control what is
+        // sent. If that is empty (there was only a function call) all
+        // of the variables in the intermediate DDS (i.e., the function
+        // result) will be sent.
+        fdds->mark_all(false);
+
+        eval.parse_constraint(d_dap2ce, *fdds);
+
+        fdds->tag_nested_sequences(); // Tag Sequences as Parent or Leaf node.
+
+        if (fdds->get_response_limit() != 0 && fdds->get_request_size(true) > fdds->get_response_limit()) {
+            string msg = "The Request for " + long_to_string(dds.get_request_size(true) / 1024)
+                    + "KB is too large; requests for this user are limited to "
+                    + long_to_string(dds.get_response_limit() / 1024) + "KB.";
+            throw Error(msg);
+        }
+
+        if (with_mime_headers)
+            set_mime_binary(data_stream, dods_data, x_plain, last_modified_time(d_dataset), dds.get_dap_version());
+
+        DBG(cerr << "About to call dataset_constraint" << endl);
+        dataset_constraint(data_stream, *fdds, eval, false);
+
+        delete fdds;
+    }
+    else {
+
+	DBG(cerr << "Simple constraint" << endl);
+
+	eval.parse_constraint(d_dap2ce, dds); // Throws Error if the ce doesn't parse.
+
+	dds.tag_nested_sequences(); // Tag Sequences as Parent or Leaf node.
+
+	if (dds.get_response_limit() != 0 && dds.get_request_size(true) > dds.get_response_limit()) {
+		string msg = "The Request for " + long_to_string(dds.get_request_size(true) / 1024)
+				+ "KB is too large; requests for this user are limited to "
+				+ long_to_string(dds.get_response_limit() / 1024) + "KB.";
+		throw Error(msg);
+	}
+
+	if (with_mime_headers)
+		set_mime_binary(data_stream, dods_data, x_plain, last_modified_time(d_dataset), dds.get_dap_version());
+
+	dataset_constraint(data_stream, dds, eval);
+    }
+
+	data_stream << flush;
+}
diff --git a/tests/ResponseBuilder.h b/tests/ResponseBuilder.h
new file mode 100644
index 0000000..741e084
--- /dev/null
+++ b/tests/ResponseBuilder.h
@@ -0,0 +1,79 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2011 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#ifndef _response_builder_h
+#define _response_builder_h
+
+#include <string>
+
+namespace libdap {
+
+class ConstraintEvaluator;
+class DDS;
+
+/**
+ * Used for testing only. This duplicates code in the bes/dap module.
+ * jhrg 6/11/13
+ */
+
+class ResponseBuilder
+{
+public:
+    friend class ResponseBuilderTest;
+
+protected:
+    std::string d_dataset;  		/// Name of the dataset/database
+    std::string d_dap2ce;  		    /// Constraint expression
+    std::string d_dap2_btp_func_ce;   /// The BTP functions, extracted from the CE
+    int d_timeout;  		/// Response timeout after N seconds
+    std::string d_default_protocol;	/// Version std::string for the library's default protocol version
+
+    void initialize();
+
+public:
+
+    /** Make an empty instance. Use the set_*() methods to load with needed
+        values. You must call at least set_dataset_name() or be requesting
+        version information. */
+    ResponseBuilder() {
+        initialize();
+    }
+
+    virtual ~ResponseBuilder();
+
+    virtual std::string get_ce() const;
+    virtual void set_ce(std::string _ce);
+
+    void split_ce(ConstraintEvaluator &eval, const string &expr = "");
+
+    virtual std::string get_dataset_name() const;
+    virtual void set_dataset_name(const std::string _dataset);
+
+    virtual void dataset_constraint(std::ostream &out, libdap::DDS &dds, libdap::ConstraintEvaluator &eval, bool ce_eval = true);
+    virtual void send_data(std::ostream &data_stream, libdap::DDS &dds, libdap::ConstraintEvaluator &eval, bool with_mime_headers = true);
+};
+
+}
+#endif // _response_builder_h
diff --git a/tests/TestArray.cc b/tests/TestArray.cc
new file mode 100644
index 0000000..a5a7ac0
--- /dev/null
+++ b/tests/TestArray.cc
@@ -0,0 +1,580 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1995-1996,1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// Implementation for TestArray. See TestByte.cc
+//
+// jhrg 1/12/95
+
+#include "config.h"
+
+#include <cstring>
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#ifndef WIN32
+#else
+#include <io.h>
+#include <fcntl.h>
+#include <process.h>
+#endif
+
+//#define DODS_DEBUG
+
+#include "util.h"
+#include "debug.h"
+
+#include "TestInt8.h"
+
+#include "TestByte.h"
+#include "TestInt16.h"
+#include "TestUInt16.h"
+#include "TestInt32.h"
+#include "TestUInt32.h"
+
+#include "TestInt64.h"
+#include "TestUInt64.h"
+
+#include "TestD4Enum.h"
+
+#include "TestFloat32.h"
+#include "TestFloat64.h"
+
+#include "TestStr.h"
+
+#include "TestArray.h"
+#include "TestCommon.h"
+
+using std::cerr;
+using std::endl;
+
+extern int test_variable_sleep_interval;
+
+void TestArray::_duplicate(const TestArray &ts)
+{
+    d_series_values = ts.d_series_values;
+}
+
+BaseType *
+TestArray::ptr_duplicate()
+{
+    return new TestArray(*this);
+}
+
+TestArray::TestArray(const string &n, BaseType *v, bool is_dap4) :
+        Array(n, v, is_dap4), d_series_values(false)
+{
+}
+
+TestArray::TestArray(const string &n, const string &d, BaseType *v, bool is_dap4) :
+        Array(n, d, v, is_dap4), d_series_values(false)
+{
+}
+
+TestArray::TestArray(const TestArray &rhs) :
+        Array(rhs), TestCommon(rhs)
+{
+    _duplicate(rhs);
+}
+
+TestArray::~TestArray()
+{
+}
+
+TestArray &
+TestArray::operator=(const TestArray &rhs)
+{
+    if (this == &rhs) return *this;
+
+    dynamic_cast<Array &>(*this) = rhs;
+
+    _duplicate(rhs);
+
+    return *this;
+}
+
+// This code calls 'output_values()' because print_val() does not test
+// the value of send_p(). We need to wrap a method around the calls to
+// print_val() to ensure that only values for variables with send_p() set
+// are called. In the serialize/deserialize case, the 'client' DDS only
+// has variables sent by the 'server' but in the intern_data() case, the
+// whole DDS is still present but only variables selected in the CE have
+// values.
+
+unsigned int TestArray::m_print_array(ostream &out, unsigned int index, unsigned int dims, unsigned int shape[])
+{
+    if (dims == 1) {
+        out << "{";
+
+        // Added this test for zero-length arrays. jhrg 1/28/16
+        if (shape[0] >= 1) {
+            for (unsigned i = 0; i < shape[0] - 1; ++i) {
+                dynamic_cast<TestCommon&>(*var(index++)).output_values(out);
+                out << ", ";
+            }
+
+            dynamic_cast<TestCommon&>(*var(index++)).output_values(out);
+        }
+
+        out << "}";
+
+        return index;
+    }
+    else {
+        out << "{";
+        // Fixed an off-by-one error in the following loop. Since the array
+        // length is shape[dims-1]-1 *and* since we want one less dimension
+        // than that, the correct limit on this loop is shape[dims-2]-1. From
+        // Todd Karakasian.
+        //
+        // The saga continues; the loop test should be `i < shape[0]-1'. jhrg
+        // 9/12/96.
+        //
+        // Added this (primitive) guard against errors when a zero-length array
+        // is declared with a shape like [0][4]. jhrg 1/28/16
+        if (shape[0] > 0) {
+            for (unsigned i = 0; i < shape[0] - 1; ++i) {
+                index = m_print_array(out, index, dims - 1, shape + 1);
+                out << ",";
+            }
+
+            index = m_print_array(out, index, dims - 1, shape + 1);
+        }
+
+        out << "}";
+
+        return index;
+    }
+}
+
+void TestArray::output_values(std::ostream &out)
+{
+    //unsigned int *shape = new unsigned int[dimensions(true)];
+
+    vector<unsigned int> shape(dimensions(true));
+    unsigned int index = 0;
+    for (Dim_iter i = dim_begin(); i != dim_end() && index < dimensions(true); ++i)
+        shape[index++] = dimension_size(i, true);
+
+    m_print_array(out, 0, dimensions(true), &shape[0]);
+
+    //delete[] shape;
+    //shape = 0;
+}
+
+/** Special names are ones that start with 'lat' or 'lon'. These indicate
+ that the vector (this is only for vectors) is a vector of latitude or
+ longitude values. */
+bool TestArray::m_name_is_special()
+{
+    return (name().find("lat") != string::npos || name().find("lon") != string::npos);
+}
+
+void TestArray::m_build_special_values()
+{
+    if (name().find("lat_reversed") != string::npos) {
+        int array_len = length();
+        //double *lat_data = new double[array_len];
+        vector<double> lat_data(array_len);
+        for (int i = 0; i < array_len; ++i) {
+            lat_data[i] = -89 + (180 / array_len) * (i + 1);
+        }
+        libdap::set_array_using_double(this, &lat_data[0], array_len);
+    }
+    else if (name().find("lat") != string::npos) {
+        int array_len = length();
+        // double *lat_data = new double[array_len];
+        vector<double> lat_data(array_len);
+        for (int i = 0; i < array_len; ++i) {
+            lat_data[i] = 90 - (180 / array_len) * (i + 1);
+        }
+        libdap::set_array_using_double(this, &lat_data[0], array_len);
+    }
+    else if (name().find("lon") != string::npos) {
+        int array_len = length();
+        //double *lon_data = new double[array_len];
+        vector<double> lon_data(array_len);
+        for (int i = 0; i < array_len; ++i) {
+            lon_data[i] = (360 / array_len) * (i + 1);
+        }
+        libdap::set_array_using_double(this, &lon_data[0], array_len);
+    }
+    else {
+        throw InternalErr(__FILE__, __LINE__, "Unrecognized name");
+    }
+}
+
+int TestArray::m_offset(int y, Dim_iter X, int x)
+{
+    return y * dimension_size(X, false) + x;
+}
+
+/**
+ * @brief Load an 2D array with values.
+ * Use the read() function for the prototype element of the array to
+ * get values and load them into an array, then constrain the array.
+ * Thus if 'series values' are used and the array is constrained, the
+ * result will 'make sense'
+ *
+ * @param constrained_array
+ */
+template<typename T, class C>
+void TestArray::m_constrained_matrix(vector<T>&constrained_array)
+{
+    int unconstrained_size = 1;
+    Dim_iter d = dim_begin();
+    while (d != dim_end())
+        unconstrained_size *= dimension_size(d++, false);
+
+    vector<T> whole_array(unconstrained_size);
+    for (int i = 0; i < unconstrained_size; ++i) {
+        T v;
+        var()->read();
+#if 0
+        if (var()->type() == dods_enum_c)
+        static_cast<C*>(var())->value(&v);
+        else
+#endif
+        v = static_cast<C*>(var())->value();
+
+        whole_array[i] = v;
+        var()->set_read_p(false); // pick up the next value
+    }
+
+    DBG(cerr << "whole_array: "; copy(whole_array.begin(), whole_array.end(), ostream_iterator<T>(cerr, ", ")); cerr << endl);
+
+    Dim_iter Y = dim_begin();
+    Dim_iter X = Y + 1;
+
+    DBG(cerr << "dimension_start(Y): " << dimension_start(Y) << endl); DBG(cerr << "dimension_stop(Y): " << dimension_stop(Y) << endl); DBG(cerr << "dimension_start(X): " << dimension_start(X) << endl); DBG(cerr << "dimension_stop(X): " << dimension_stop(X) << endl);
+
+    int constrained_size = 0;
+    int y = dimension_start(Y);
+    while (y < dimension_stop(Y) + 1) {
+        int x = dimension_start(X);
+
+        while (x < dimension_stop(X) + 1) {
+            constrained_array[constrained_size++] = whole_array[m_offset(y, X, x)];
+            x += dimension_stride(X);
+        }
+
+        y += dimension_stride(Y);
+    }
+}
+
+template<typename T>
+void TestArray::m_enum_constrained_matrix(vector<T>&constrained_array)
+{
+    int unconstrained_size = 1;
+    Dim_iter d = dim_begin();
+    while (d != dim_end())
+        unconstrained_size *= dimension_size(d++, false);
+
+    vector<T> whole_array(unconstrained_size);
+    for (int i = 0; i < unconstrained_size; ++i) {
+        T v;
+        var()->read();
+        static_cast<D4Enum*>(var())->value(&v);
+        whole_array[i] = v;
+        var()->set_read_p(false); // pick up the next value
+    }
+
+    DBG(cerr << "whole_array: "; copy(whole_array.begin(), whole_array.end(), ostream_iterator<T>(cerr, ", ")); cerr << endl);
+
+    Dim_iter Y = dim_begin();
+    Dim_iter X = Y + 1;
+
+    DBG(cerr << "dimension_start(Y): " << dimension_start(Y) << endl); DBG(cerr << "dimension_stop(Y): " << dimension_stop(Y) << endl); DBG(cerr << "dimension_start(X): " << dimension_start(X) << endl); DBG(cerr << "dimension_stop(X): " << dimension_stop(X) << endl);
+
+    int constrained_size = 0;
+    int y = dimension_start(Y);
+    while (y < dimension_stop(Y) + 1) {
+        int x = dimension_start(X);
+
+        while (x < dimension_stop(X) + 1) {
+            constrained_array[constrained_size++] = whole_array[m_offset(y, X, x)];
+            x += dimension_stride(X);
+        }
+
+        y += dimension_stride(Y);
+    }
+}
+
+/**
+ * Load the variable's internal data buffer with values, simulating a read()
+ * call to some data store. A private method.
+ */
+template<typename T, class C>
+void TestArray::m_cardinal_type_read_helper()
+{
+    if (get_series_values()) {
+        // Special case code for vectors that have specific names.
+        // This is used to test code that works with lat/lon data.
+        if (dimensions() == 1 && m_name_is_special()) {
+            m_build_special_values();
+        }
+        else if (dimensions() == 2) {
+            vector<T> tmp(length());
+            m_constrained_matrix<T, C>(tmp);
+            set_value(tmp, length());
+        }
+        else {
+            vector<T> tmp(length());
+            for (int64_t i = 0, end = length(); i < end; ++i) {
+                var()->read();
+                tmp[i] = static_cast<C*>(var())->value();
+                var()->set_read_p(false); // pick up the next value
+            }
+            set_value(tmp, length());
+        }
+    }
+    else {
+        // read a value into the Array's prototype element
+        var()->read();
+        T value = static_cast<C*>(var())->value();
+        vector<T> tmp(length());
+        for (int64_t i = 0, end = length(); i < end; ++i) {
+            tmp[i] = value;
+        }
+
+        set_value(tmp, length());
+    }
+}
+
+/**
+ * Load the variable's internal data buffer with values, simulating a read()
+ * call to some data store. A private method.
+ */
+template<typename T>
+void TestArray::m_enum_type_read_helper()
+{
+    if (get_series_values()) {
+        if (dimensions() == 2) {
+            vector<T> tmp(length());
+            m_enum_constrained_matrix<T>(tmp);
+            set_value(tmp, length());
+        }
+        else {
+            vector<T> tmp(length());
+            for (int64_t i = 0, end = length(); i < end; ++i) {
+                var()->read();
+                T v;
+                static_cast<D4Enum*>(var())->value(&v);
+
+                tmp[i] = v;
+                var()->set_read_p(false); // pick up the next value
+            }
+            set_value(tmp, length());
+        }
+    }
+    else {
+        // read a value into the Array's prototype element
+        var()->read();
+        T value;
+        static_cast<D4Enum*>(var())->value(&value);
+
+        vector<T> tmp(length());
+        for (int64_t i = 0, end = length(); i < end; ++i) {
+            tmp[i] = value;
+        }
+
+        set_value(tmp, length());
+    }
+}
+
+bool TestArray::read()
+{
+    if (read_p()) return true;
+
+    if (test_variable_sleep_interval > 0) sleep(test_variable_sleep_interval);
+
+    int64_t array_len = length(); // elements in the array
+
+    switch (var()->type()) {
+    // These are the DAP2 types and the classes that implement them all define
+    // the old buf2val() and val2buf() methods. For the new DAP4 types see below.
+    //case dods_byte_c:
+    //case dods_uint8_c:
+    case dods_int16_c:
+        m_cardinal_type_read_helper<dods_int16, Int16>();
+        set_read_p(true);
+        break;
+
+    case dods_uint16_c:
+        m_cardinal_type_read_helper<dods_uint16, UInt16>();
+        set_read_p(true);
+        break;
+
+    case dods_int32_c:
+        m_cardinal_type_read_helper<dods_int32, Int32>();
+        set_read_p(true);
+        break;
+
+    case dods_uint32_c:
+        m_cardinal_type_read_helper<dods_uint32, UInt32>();
+        set_read_p(true);
+        break;
+
+    case dods_float32_c:
+        m_cardinal_type_read_helper<dods_float32, Float32>();
+        set_read_p(true);
+        break;
+
+    case dods_float64_c:
+        m_cardinal_type_read_helper<dods_float64, Float64>();
+        set_read_p(true);
+        break;
+
+    case dods_int8_c:
+        m_cardinal_type_read_helper<dods_int8, Int8>();
+        set_read_p(true);
+        break;
+
+    case dods_byte_c:
+    case dods_char_c:
+    case dods_uint8_c:
+        m_cardinal_type_read_helper<dods_byte, Byte>();
+        set_read_p(true);
+        break;
+
+    case dods_int64_c:
+        m_cardinal_type_read_helper<dods_int64, Int64>();
+        set_read_p(true);
+        break;
+
+    case dods_uint64_c:
+        m_cardinal_type_read_helper<dods_uint64, UInt64>();
+        set_read_p(true);
+        break;
+
+    case dods_enum_c:
+        switch (static_cast<D4Enum*>(var())->element_type()) {
+        case dods_byte_c:
+        case dods_char_c:
+        case dods_uint8_c:
+            m_enum_type_read_helper<dods_byte>();
+            break;
+        case dods_int8_c:
+            m_enum_type_read_helper<dods_int8>();
+            break;
+        case dods_int16_c:
+            m_enum_type_read_helper<dods_int16>();
+            break;
+        case dods_uint16_c:
+            m_enum_type_read_helper<dods_uint16>();
+            break;
+        case dods_int32_c:
+            m_enum_type_read_helper<dods_int32>();
+            break;
+        case dods_uint32_c:
+            m_enum_type_read_helper<dods_uint32>();
+            break;
+        case dods_int64_c:
+            m_enum_type_read_helper<dods_int64>();
+            break;
+        case dods_uint64_c:
+            m_enum_type_read_helper<dods_uint64>();
+            break;
+        default:
+            throw InternalErr(__FILE__, __LINE__, "Enum with undefined type.");
+        }
+        set_read_p(true);
+        break;
+
+    case dods_str_c:
+    case dods_url_c: {
+        vector<string> tmp(array_len);
+
+        if (get_series_values()) {
+            for (int64_t i = 0; i < array_len; ++i) {
+                var()->read();
+                // URL isa Str
+                tmp[i] = static_cast<Str*>(var())->value();
+                var()->set_read_p(false); // pick up the next value
+            }
+        }
+        else {
+            var()->read();
+            string value = static_cast<Str*>(var())->value();
+
+            for (unsigned i = 0; i < array_len; ++i)
+                tmp[i] = value;
+        }
+
+        set_value(tmp, array_len);
+        set_read_p(true);
+        break;
+    }
+
+    case dods_opaque_c:
+    case dods_structure_c:
+        vec_resize(array_len);
+        for (unsigned i = 0; i < array_len; ++i) {
+            // Copy the prototype and read a value into it
+            BaseType *elem = var()->ptr_duplicate();
+            elem->read();
+            // Load the new value into this object's array
+            set_vec_nocopy(i, elem);   // Use set_vec_nocopy() TODO (and below)
+        }
+        set_read_p(true);
+        break;
+
+    case dods_sequence_c:
+        // No sequence arrays in DAP2
+        if (!is_dap4()) throw InternalErr(__FILE__, __LINE__, "Bad data type");
+
+        vec_resize(array_len);
+        for (unsigned i = 0; i < array_len; ++i) {
+            // Load the new BaseType (a D4Sequence) into the array element
+            set_vec_nocopy(i, var()->ptr_duplicate());
+        }
+
+        break;
+
+        // No Grids in DAP4; No arrays of arrays and no null-typed vars in DAP2 or 4
+    case dods_grid_c:
+    case dods_array_c:
+    case dods_null_c:
+    default:
+        throw InternalErr(__FILE__, __LINE__, "Bad data type");
+        break;
+    }
+
+    // set_read_p(true);
+
+    return true;
+}
+
+void TestArray::set_series_values(bool sv)
+{
+    dynamic_cast<TestCommon&>(*var()).set_series_values(sv);
+    d_series_values = sv;
+}
diff --git a/tests/TestArray.h b/tests/TestArray.h
new file mode 100644
index 0000000..487d1de
--- /dev/null
+++ b/tests/TestArray.h
@@ -0,0 +1,80 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1995-1997,1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// Interface definition for TestArray. See TestByte.h for more information
+//
+// jhrg 1/12/95
+
+#ifndef _testarray_h
+#define _testarray_h 1
+
+#include "Array.h"
+#include "TestCommon.h"
+
+using namespace libdap ;
+
+class TestArray: public Array, public TestCommon {
+    bool d_series_values;
+    void _duplicate(const TestArray &ts);
+    unsigned int m_print_array(ostream &out, unsigned int index, unsigned int dims, unsigned int shape[]);
+
+    bool m_name_is_special();
+    void m_build_special_values();
+
+    int m_offset(int y, Dim_iter Y, int x);
+
+    template <typename T, class C> void m_constrained_matrix(vector<T> &constrained_array);
+    template <typename T> void m_enum_constrained_matrix(vector<T> &constrained_array);
+
+    template <typename T, class C> void m_cardinal_type_read_helper();
+    template <typename T> void m_enum_type_read_helper();
+
+public:
+    TestArray(const string &n, BaseType *v, bool is_dap4 = false);
+    TestArray(const string &n, const string &d, BaseType *v, bool is_dap4 = false);
+    TestArray(const TestArray &rhs);
+
+    virtual ~TestArray();
+
+    TestArray &operator=(const TestArray &rhs);
+
+    virtual BaseType *ptr_duplicate();
+
+    virtual bool read();
+
+    virtual void output_values(std::ostream &out);
+
+    void set_series_values(bool);
+    bool get_series_values() { return d_series_values; }
+};
+
+#endif // _testarray_h
+
diff --git a/tests/TestByte.cc b/tests/TestByte.cc
new file mode 100644
index 0000000..61ed631
--- /dev/null
+++ b/tests/TestByte.cc
@@ -0,0 +1,159 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1995-1996,1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// Implementation for TestByte. See the comments in TestByte.h
+// For each of the `variable classes' (e.g., Byte, ... Array, ... Grid) you
+// *must* define a ctor, dtor, ptr_duplicate and read mfunc. In addition, you
+// must edit the definition of New<class name> so that it creates the correct
+// type of object. for example, edit NewByte() so that it creates and returns
+// a TestByte pointer (see util.cc).
+//
+// jhrg 1/12/95
+//
+// NB: It is no longer true that you must subclass the Byte, ..., Grid
+// classes in order to use the DAP. Those classes are no longer abstract. For
+// many client-side uses, the classes will work just fine as they are. To
+// build a server, it is still necessary to subclass and define a read()
+// method for each of the data type classes. 01/22/03 jhrg
+
+#include "config.h"
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#ifdef WIN32
+#include <io.h>
+#include <fcntl.h>
+#include <process.h>
+#endif
+
+#include "TestByte.h"
+#include "debug.h"
+
+// The NewByte `helper function' creates a pointer to the a TestByte and
+// returns that pointer. It takes the same arguments as the class's ctor. If
+// any of the variable classes are subclassed (e.g., to make a new Byte like
+// HDFByte) then the corresponding function here, and in the other class
+// definition files, needs to be changed so that it creates an instance of
+// the new (sub)class. Continuing the earlier example, that would mean that
+// NewByte() would return a HDFByte, not a Byte.
+//
+// It is important that these function's names and return types do not change
+// - they are called by the parser code (for the dds, at least) so if their
+// names changes, that will break.
+//
+// The declarations for these functions (in util.h) should *not* need
+// changing.
+
+extern int test_variable_sleep_interval;
+
+void
+TestByte::_duplicate(const TestByte &ts)
+{
+    d_series_values = ts.d_series_values;
+}
+
+TestByte::TestByte(const string &n) : Byte(n), d_series_values(false)
+{
+	// For some reason, d_buf was set to '23' in the version checked in on
+	// 9/12/13, but that seems to break the EXPR regression tests and '255'
+	// seems to be the correct value. Since '23' is an odd choice, I'm leaving
+	// this comment as a reminder should this information be useful in the future.
+	// jhrg 10/1/13
+    // d_buf = 23;
+	d_buf = 255;
+}
+
+TestByte::TestByte(const string &n, const string &d)
+    : Byte(n, d), d_series_values(false)
+{
+    // d_buf = 23;
+	d_buf = 255;
+}
+
+BaseType *
+TestByte::ptr_duplicate()
+{
+    return new TestByte(*this);
+}
+
+TestByte::TestByte(const TestByte &rhs) : Byte(rhs), TestCommon(rhs)
+{
+    _duplicate(rhs);
+}
+
+TestByte &
+TestByte::operator=(const TestByte &rhs)
+{
+    if (this == &rhs)
+	return *this;
+
+    dynamic_cast<Byte &>(*this) = rhs; // run Constructor=
+
+    _duplicate(rhs);
+
+    return *this;
+}
+#if 1
+void
+TestByte::output_values(std::ostream &out)
+{
+    // value is a method where each return value is a different type so we have
+    // to make calls to it from objects/methods where the type is statically
+    // known.
+    print_val(out, "", false);
+}
+#endif
+
+bool
+TestByte::read()
+{
+    DBG(cerr << "Entering TestByte::read for " << name() << endl);
+    if (read_p())
+	return true;
+
+    if (test_variable_sleep_interval > 0)
+	sleep(test_variable_sleep_interval);
+
+    if (get_series_values()) {
+         d_buf++;
+    }
+    else {
+        d_buf = 255;
+    }
+
+    set_read_p(true);
+
+    DBG(cerr << "In TestByte::read, _buf = " << (int)d_buf << endl);
+
+    return true;
+}
diff --git a/tests/TestByte.h b/tests/TestByte.h
new file mode 100644
index 0000000..187ac0a
--- /dev/null
+++ b/tests/TestByte.h
@@ -0,0 +1,79 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1995-1997,1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// TestByte is a demonstration of subclassing a class in the hierarchy of
+// DODS data types. It does not do much of anything - a real subclass would
+// add specifics for an API or format (e.g., a read mfunc for netcdf, HDF,
+// ...).  The class is used by some of the test code (hence the name) as well
+// as serving as a template for others who need to subclass the hierarchy.
+//
+// Since the class Byte is an abstract class (as are all the other
+// `variable type' classes), the hierarchy *must* be subclassed in order to
+// be used.
+//
+// jhrg 1/12/95
+//
+// NB: It is no longer true that Byte, ..., Grid are abstract classes. They
+// are now concrete ad do not necessarily need to be subclassed. 01/22/03 jhrg
+
+#ifndef _testbyte_h
+#define _testbyte_h 1
+
+#include "Byte.h"
+#include "TestCommon.h"
+
+using namespace libdap ;
+
+class TestByte: public Byte, public TestCommon {
+    bool d_series_values;
+    void _duplicate(const TestByte &ts);
+
+public:
+    TestByte(const string &n);
+    TestByte(const string &n, const string &d);
+    TestByte(const TestByte &rhs);
+
+    virtual ~TestByte() {}
+
+    TestByte &operator=(const TestByte &rhs);
+
+    virtual BaseType *ptr_duplicate();
+
+    virtual bool read();
+
+    virtual void output_values(std::ostream &out);
+
+    virtual void set_series_values(bool sv) { d_series_values = sv; }
+    virtual bool get_series_values() { return d_series_values; }
+};
+
+#endif // _testbyte_h
+
diff --git a/tests/TestCommon.h b/tests/TestCommon.h
new file mode 100644
index 0000000..1567387
--- /dev/null
+++ b/tests/TestCommon.h
@@ -0,0 +1,65 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2005 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// An interface to new common methods for the Test*.cc/h classes.
+
+#ifndef _test_common_h
+#define _test_common_h 1
+
+// #include <stdio.h>
+#include <iostream>
+
+class TestCommon {
+public:
+    TestCommon() { }
+    virtual ~TestCommon() { }
+
+    /** Write out values. Does not test the read_p property first.
+
+        @note This method is used to test the result of calling
+        intern_data().
+
+        @param out Where to write the values */
+    virtual void output_values(std::ostream &out) = 0;
+
+    /**
+     * Set the series_value property.
+     * @see get_series_values
+     * @param state True if the values returned by read() should mimic the DTS,
+     * false if they should be static.
+     */
+    virtual void set_series_values(bool state) = 0;
+
+    /** Get the value of the series_value property. If true, the TestByte, ...,
+        classes should produce values that vary in a fashion similar to the DTS.
+        If false, they should exhibit the old behavior where the values are static.
+        For arrays, grids and structures the 'series_value' doesn't mean much, but
+        for sequences it's a big deal since those are constrained by value in
+        addition to by position. */
+    virtual bool get_series_values() = 0;
+};
+
+#endif // _test_common_h
+
diff --git a/tests/TestD4Enum.cc b/tests/TestD4Enum.cc
new file mode 100644
index 0000000..8612525
--- /dev/null
+++ b/tests/TestD4Enum.cc
@@ -0,0 +1,113 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#include "config.h"
+
+#ifndef WIN64
+#include <unistd.h>
+#else
+#include <io.h>
+#include <fcntl.h>
+#include <process.h>
+#endif
+
+//#define DODS_DEBUG
+
+#include "TestD4Enum.h"
+#include "debug.h"
+
+extern int test_variable_sleep_interval;
+
+void
+TestD4Enum::_duplicate(const TestD4Enum &ts)
+{
+    d_series_values = ts.d_series_values;
+}
+
+TestD4Enum::TestD4Enum(const string &n, Type t) : D4Enum(n, t), TestCommon(), d_series_values(false)
+{
+    set_value(0);
+}
+
+TestD4Enum::TestD4Enum(const string &n, const string &d, Type t)
+    : D4Enum(n, d, t), TestCommon(), d_series_values(false)
+{
+    set_value(0);
+}
+
+TestD4Enum::TestD4Enum(const TestD4Enum &rhs) : D4Enum(rhs), TestCommon(rhs)
+{
+    _duplicate(rhs);
+}
+
+TestD4Enum &
+TestD4Enum::operator=(const TestD4Enum &rhs)
+{
+    if (this == &rhs)
+	return *this;
+
+    dynamic_cast<D4Enum &>(*this) = rhs; // run Constructor=
+
+    _duplicate(rhs);
+
+    return *this;
+}
+
+BaseType *
+TestD4Enum::ptr_duplicate()
+{
+    return new TestD4Enum(*this);
+}
+
+void
+TestD4Enum::output_values(std::ostream &out)
+{
+    print_val(out, "", false);
+}
+
+bool TestD4Enum::read() {
+    DBG(cerr << "Entering TestD4Enum::read for " << name() << endl);
+    if (read_p()) return true;
+
+    if (test_variable_sleep_interval > 0) sleep(test_variable_sleep_interval);
+
+    if (get_series_values()) {
+        int64_t v;
+        value(&v);
+        if (v == 3)
+            set_value(1);
+        else
+            set_value(v + 1);
+    }
+    else {
+        set_value(1);
+    }
+
+    set_read_p(true);
+
+    DBG(cerr << "In TestD4Enum::read, _buf = " << d_buf << endl);
+
+    return true;
+}
diff --git a/tests/TestD4Enum.h b/tests/TestD4Enum.h
new file mode 100644
index 0000000..c04992b
--- /dev/null
+++ b/tests/TestD4Enum.h
@@ -0,0 +1,59 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#ifndef _testd4enum_h
+#define _testd4enum_h 1
+
+
+#include "D4Enum.h"
+#include "TestCommon.h"
+
+using namespace libdap ;
+
+class TestD4Enum: public D4Enum, public TestCommon {
+    bool d_series_values;
+    void _duplicate(const TestD4Enum &ts);
+
+public:
+    TestD4Enum(const string &n, Type t);
+    TestD4Enum(const string &n, const string &d, Type t);
+    TestD4Enum(const TestD4Enum &rhs);
+
+    virtual ~TestD4Enum() {}
+
+    TestD4Enum &operator=(const TestD4Enum &rhs);
+
+    virtual BaseType *ptr_duplicate();
+
+    virtual bool read();
+
+    virtual void output_values(std::ostream &out);
+
+    virtual void set_series_values(bool sv) { d_series_values = sv; }
+    virtual bool get_series_values() { return d_series_values; }
+};
+
+#endif //_testd4enum_h
+
diff --git a/tests/TestD4Group.cc b/tests/TestD4Group.cc
new file mode 100644
index 0000000..7fec260
--- /dev/null
+++ b/tests/TestD4Group.cc
@@ -0,0 +1,136 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2013 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+//#define DODS_DEBUG
+
+#include "config.h"
+
+#include "TestD4Group.h"
+
+#include "debug.h"
+
+void
+TestD4Group::m_duplicate(const TestD4Group &ts)
+{
+    d_series_values = ts.d_series_values;
+}
+
+TestD4Group *
+TestD4Group::ptr_duplicate()
+{
+    return new TestD4Group(*this);
+}
+
+TestD4Group::TestD4Group(const TestD4Group &rhs) : D4Group(rhs), TestCommon(rhs)
+{
+    m_duplicate(rhs);
+}
+
+TestD4Group &
+TestD4Group::operator=(const TestD4Group &rhs)
+{
+    if (this == &rhs)
+	return *this;
+
+    dynamic_cast<D4Group &>(*this) = rhs; // run Constructor=
+
+    m_duplicate(rhs);
+
+    return *this;
+}
+
+TestD4Group::TestD4Group(const string &n) : D4Group(n), d_series_values(false)
+{
+}
+
+TestD4Group::TestD4Group(const string &n, const string &d)
+    : D4Group(n, d), d_series_values(false)
+{
+}
+
+TestD4Group::~TestD4Group()
+{
+}
+
+void
+TestD4Group::output_values(std::ostream &out)
+{
+    out << "{ " ;
+
+    bool value_written = false;
+    Vars_citer i = var_begin();
+
+    // Write the first (and maybe only) value.
+    while(i != var_end() && ! value_written) {
+        if ((*i)->send_p()) {
+            (*i++)->print_val(out, "", false);
+            value_written = true;
+        }
+        else {
+            ++i;
+        }
+    }
+    // Each subsequent value will be preceded by a comma
+    while(i != var_end()) {
+        if ((*i)->send_p()) {
+            out << ", ";
+            (*i++)->print_val(out, "", false);
+        }
+        else {
+            ++i;
+        }
+    }
+
+    out << " }" ;
+}
+
+bool TestD4Group::read()
+{
+	if (read_p()) return true;
+
+	for (Vars_iter i = var_begin(); i != var_end(); i++) {
+		if (!(*i)->read()) {
+			return false;
+		}
+	}
+
+	set_read_p(true);
+
+	return true;
+}
+
+void TestD4Group::set_series_values(bool sv)
+{
+	Vars_iter i = var_begin();
+	while (i != var_end()) {
+		TestCommon *tc = dynamic_cast<TestCommon*>(*i);
+		if (!tc)
+		    throw InternalErr (__FILE__, __LINE__, "Variable '" + (*i)->name() + "' is not a TestCommon.");
+		tc->set_series_values(sv);
+		++i;
+	}
+
+	d_series_values = sv;
+}
diff --git a/tests/TestD4Group.h b/tests/TestD4Group.h
new file mode 100644
index 0000000..86746d5
--- /dev/null
+++ b/tests/TestD4Group.h
@@ -0,0 +1,57 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2013 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#ifndef _test_d4_group_h
+#define _test_d4_group_h 1
+
+#include "D4Group.h"
+#include "TestCommon.h"
+
+using namespace libdap ;
+
+class TestD4Group: public D4Group, public TestCommon {
+    bool d_series_values;
+    void m_duplicate(const TestD4Group &ts);
+
+public:
+    TestD4Group(const string &n);
+    TestD4Group(const string &n, const string &d);
+    TestD4Group(const TestD4Group &rhs);
+
+    virtual ~TestD4Group();
+
+    TestD4Group &operator=(const TestD4Group &rhs);
+
+    virtual TestD4Group *ptr_duplicate();
+
+    virtual bool read();
+
+    virtual void output_values(std::ostream &out);
+
+    void set_series_values(bool);
+    bool get_series_values() { return d_series_values; }
+};
+
+#endif // _test_d4_group_h
diff --git a/tests/TestD4Opaque.cc b/tests/TestD4Opaque.cc
new file mode 100644
index 0000000..8905c50
--- /dev/null
+++ b/tests/TestD4Opaque.cc
@@ -0,0 +1,122 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#include "config.h"
+
+#ifndef WIN64
+#include <unistd.h>
+#else
+#include <io.h>
+#include <fcntl.h>
+#include <process.h>
+#endif
+
+//#define DODS_DEBUG
+
+#include "TestD4Opaque.h"
+#include "debug.h"
+
+extern int test_variable_sleep_interval;
+
+void
+TestD4Opaque::m_duplicate(const TestD4Opaque &ts)
+{
+    d_series_values = ts.d_series_values;
+}
+
+void
+TestD4Opaque::m_set_values(int start)
+{
+    dods_opaque values;
+    values.push_back(start);
+    values.push_back(2 * start);
+    values.push_back(3 * start);
+    values.push_back(4 * start);
+    values.push_back(5 * start);
+
+    set_value(values);
+}
+
+TestD4Opaque::TestD4Opaque(const string &n) : D4Opaque(n), d_series_values(false)
+{
+}
+
+TestD4Opaque::TestD4Opaque(const string &n, const string &d) : D4Opaque(n, d), d_series_values(false)
+{
+}
+
+TestD4Opaque::TestD4Opaque(const TestD4Opaque &rhs) : D4Opaque(rhs), TestCommon(rhs)
+{
+    m_duplicate(rhs);
+}
+
+TestD4Opaque &
+TestD4Opaque::operator=(const TestD4Opaque &rhs)
+{
+    if (this == &rhs)
+	return *this;
+
+    dynamic_cast<D4Opaque &>(*this) = rhs; // run Constructor=
+
+    m_duplicate(rhs);
+
+    return *this;
+}
+
+BaseType *
+TestD4Opaque::ptr_duplicate()
+{
+    return new TestD4Opaque(*this);
+}
+
+void
+TestD4Opaque::output_values(std::ostream &out)
+{
+    print_val(out, "", false);
+}
+
+bool TestD4Opaque::read() {
+    DBG(cerr << "Entering TestD4Opaque::read for " << name() << endl);
+    if (read_p()) return true;
+
+    if (test_variable_sleep_interval > 0) sleep(test_variable_sleep_interval);
+
+    if (get_series_values()) {
+        dods_opaque vals = value();
+        m_set_values(vals[0] * 2);
+    }
+    else {
+        m_set_values(1);
+    }
+
+    set_read_p(true);
+
+    DBG(cerr << "In TestD4Opaque::read, d_buf = ");
+    DBGN(ostream_iterator<uint8_t> out_it (cerr," "));
+    DBGN(std::copy ( d_buf.begin(), d_buf.end(), out_it ));
+    DBGN(cerr << endl);
+
+    return true;
+}
diff --git a/tests/TestD4Opaque.h b/tests/TestD4Opaque.h
new file mode 100644
index 0000000..80d8e86
--- /dev/null
+++ b/tests/TestD4Opaque.h
@@ -0,0 +1,60 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#ifndef _testd4opaque_h
+#define _testd4opaque_h 1
+
+#include "D4Opaque.h"
+#include "TestCommon.h"
+
+using namespace libdap ;
+
+class TestD4Opaque: public D4Opaque, public TestCommon {
+    bool d_series_values;
+
+    void m_duplicate(const TestD4Opaque &ts);
+    void m_set_values(int start);
+
+public:
+    TestD4Opaque(const string &n);
+    TestD4Opaque(const string &n, const string &d);
+    TestD4Opaque(const TestD4Opaque &rhs);
+
+    virtual ~TestD4Opaque() {}
+
+    TestD4Opaque &operator=(const TestD4Opaque &rhs);
+
+    virtual BaseType *ptr_duplicate();
+
+    virtual bool read();
+
+    virtual void output_values(std::ostream &out);
+
+    virtual void set_series_values(bool sv) { d_series_values = sv; }
+    virtual bool get_series_values() { return d_series_values; }
+};
+
+#endif //_testd4opaque_h
+
diff --git a/tests/TestD4Sequence.cc b/tests/TestD4Sequence.cc
new file mode 100644
index 0000000..61eaa8c
--- /dev/null
+++ b/tests/TestD4Sequence.cc
@@ -0,0 +1,123 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2013 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#include "config.h"
+
+//#define DODS_DEBUG
+
+#include "TestD4Sequence.h"
+#include "TestCommon.h"
+
+#include "debug.h"
+
+void
+TestD4Sequence::m_duplicate(const TestD4Sequence &ts)
+{
+    d_current = ts.d_current;
+    d_len = ts.d_len;
+    d_series_values = ts.d_series_values;
+}
+
+BaseType *
+TestD4Sequence::ptr_duplicate()
+{
+    return new TestD4Sequence(*this);
+}
+
+TestD4Sequence::TestD4Sequence(const string &n) : D4Sequence(n), d_len(4),
+	d_current(0), d_series_values(false)
+{
+}
+
+TestD4Sequence::TestD4Sequence(const string &n, const string &d)
+    : D4Sequence(n, d), d_len(4), d_current(0), d_series_values(false)
+{
+}
+
+TestD4Sequence::TestD4Sequence(const TestD4Sequence &rhs) : D4Sequence(rhs), TestCommon(rhs)
+{
+    m_duplicate(rhs);
+}
+
+TestD4Sequence::~TestD4Sequence()
+{
+}
+
+TestD4Sequence &
+TestD4Sequence::operator=(const TestD4Sequence &rhs)
+{
+    if (this == &rhs)
+        return *this;
+
+    dynamic_cast<D4Sequence &>(*this) = rhs;
+
+    m_duplicate(rhs);
+
+    return *this;
+}
+
+void
+TestD4Sequence::output_values(std::ostream &out)
+{
+    print_val(out, "", false);
+}
+
+/**
+ * In DAP2, TestSequence::read() also reads the child sequence data. However,
+ * in DAP4 it's up to each sequence to read its own data.
+ */
+bool
+TestD4Sequence::read()
+{
+    if (read_p())
+        return true;
+
+    if (d_current < d_len) {
+    	for (Vars_iter i = var_begin(), e = var_end(); i != e; ++i) {
+            if ((*i)->type() != dods_sequence_c && ((*i)->send_p() || (*i)->is_in_selection())) {
+                DBGN(cerr << __PRETTY_FUNCTION__ << "Calling " << (*i)->name() << "->read()" << endl);
+                (*i)->read();
+            }
+    	}
+
+    	++d_current;
+    	return false;
+    }
+    else {
+        return true;                // No more values
+    }
+}
+
+void
+TestD4Sequence::set_series_values(bool sv)
+{
+    Vars_iter i = var_begin();
+    while (i != var_end()) {
+        dynamic_cast<TestCommon&>(*(*i)).set_series_values(sv);
+        ++i;
+    }
+
+    d_series_values = sv;
+}
diff --git a/tests/TestD4Sequence.h b/tests/TestD4Sequence.h
new file mode 100644
index 0000000..dd34ac1
--- /dev/null
+++ b/tests/TestD4Sequence.h
@@ -0,0 +1,63 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2013 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+// 
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+// 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+ 
+#ifndef _testd4sequence_h
+#define _testd4sequence_h 1
+
+#include "D4Sequence.h"
+#include "TestCommon.h"
+
+using namespace libdap ;
+
+class TestD4Sequence: public D4Sequence, public TestCommon {
+private:
+    int d_len; // The number of elements/instances in this sequence
+    int d_current; // Which instance are we currently reading
+    bool d_series_values;
+    
+    void m_duplicate(const TestD4Sequence &ts);
+
+public:
+    TestD4Sequence(const string &n);
+    TestD4Sequence(const string &n, const string &d);
+    TestD4Sequence(const TestD4Sequence &rhs);
+
+    virtual ~TestD4Sequence();
+ 
+    TestD4Sequence &operator=(const TestD4Sequence &rhs);
+    virtual BaseType *ptr_duplicate();
+
+    virtual bool read();
+    
+    virtual void output_values(std::ostream &out);
+
+    void set_series_values(bool);
+    bool get_series_values() { return d_series_values; }
+
+    void set_length(int len) { d_len = len; }
+    virtual int length() const { return d_len; }
+};
+
+#endif // _testsequence_h
diff --git a/tests/TestFloat32.cc b/tests/TestFloat32.cc
new file mode 100644
index 0000000..57a2a33
--- /dev/null
+++ b/tests/TestFloat32.cc
@@ -0,0 +1,131 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+// 
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+// 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+ 
+// (c) COPYRIGHT URI/MIT 1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// Implementation for TestFloat32. See TestByte.cc
+//
+// 3/22/99 jhrg
+
+
+#include "config.h"
+
+#include <math.h>
+
+#ifndef WIN32
+#include <unistd.h>
+#else
+#include <io.h>
+#include <fcntl.h>
+#include <process.h>
+#endif
+
+#include "TestFloat32.h"
+#include "debug.h"
+
+extern int test_variable_sleep_interval;
+
+#if ( defined(__sun__) && ( HOST_SOLARIS < 10 ))
+double trunc(double x)
+{
+       return x < 0 ? -floor(-x) : floor(x);
+}
+#endif
+
+void
+TestFloat32::_duplicate(const TestFloat32 &ts)
+{
+    d_series_values = ts.d_series_values;
+}
+
+TestFloat32::TestFloat32(const string &n) : Float32(n), d_series_values(false)
+{
+    d_buf = 0.0;
+}
+
+TestFloat32::TestFloat32(const string &n, const string &d)
+    : Float32(n, d), d_series_values(false)
+{
+    d_buf = 0.0;
+}
+
+TestFloat32::TestFloat32(const TestFloat32 &rhs) : Float32(rhs), TestCommon(rhs)
+{
+    _duplicate(rhs);
+}
+
+TestFloat32 &
+TestFloat32::operator=(const TestFloat32 &rhs)
+{
+    if (this == &rhs)
+	return *this;
+
+    dynamic_cast<Float32 &>(*this) = rhs; // run Constructor=
+
+    _duplicate(rhs);
+
+    return *this;
+}
+
+BaseType *
+TestFloat32::ptr_duplicate()
+{
+    return new TestFloat32(*this); // Copy ctor calls duplicate to do the work
+}
+ 
+void 
+TestFloat32::output_values(std::ostream &out)
+{
+    print_val(out, "", false);
+}
+
+bool
+TestFloat32::read()
+{
+    DBG(cerr << "Entering TestFloat32::read for " << name() << endl);
+    if (read_p())
+	return true;
+
+    if (test_variable_sleep_interval > 0)
+	sleep(test_variable_sleep_interval);
+
+    if (get_series_values()) {
+        d_buf += 10.0;
+        d_buf = (float)(trunc(10000 * sin(trunc(d_buf))) / 100);
+    }
+    else {
+        d_buf = (float)99.999;
+    }
+    
+    set_read_p(true);
+
+    DBG(cerr << "In TestFloat32::read, _buf = " << d_buf << endl);
+    
+    return true;
+}
diff --git a/tests/TestFloat32.h b/tests/TestFloat32.h
new file mode 100644
index 0000000..450f753
--- /dev/null
+++ b/tests/TestFloat32.h
@@ -0,0 +1,70 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+// 
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+// 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+ 
+// (c) COPYRIGHT URI/MIT 1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// Interface for TestFloat32 type. See TestByte.h
+//
+// 3/22/99 jhrg
+
+#ifndef _testfloat32_h
+#define _testfloat32_h 1
+
+
+#include "Float32.h"
+#include "TestCommon.h"
+
+using namespace libdap ;
+
+class TestFloat32: public Float32, public TestCommon {
+    bool d_series_values;
+    
+    void _duplicate(const TestFloat32 &ts);
+
+public:
+    TestFloat32(const string &n);
+    TestFloat32(const string &n, const string &d);
+    TestFloat32(const TestFloat32 &rhs);
+
+    virtual ~TestFloat32() {}
+
+    TestFloat32 &operator=(const TestFloat32 &rhs);
+
+    virtual BaseType *ptr_duplicate();
+    
+    virtual bool read();
+    
+    virtual void output_values(std::ostream &out);
+
+    void set_series_values(bool sv) { d_series_values = sv; }
+    bool get_series_values() { return d_series_values; }
+};
+
+#endif //_testfloat32_h
+
diff --git a/tests/TestFloat64.cc b/tests/TestFloat64.cc
new file mode 100644
index 0000000..405aa3f
--- /dev/null
+++ b/tests/TestFloat64.cc
@@ -0,0 +1,128 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+// 
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+// 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+ 
+// (c) COPYRIGHT URI/MIT 1995-1996,1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// Implementation for TestFloat64. See TestByte.cc
+//
+// jhrg 1/12/95
+
+
+#include "config.h"
+
+#include <math.h>
+
+#ifndef WIN32
+#include <unistd.h>
+#else
+#include <io.h>
+#include <fcntl.h>
+#include <process.h>
+#endif
+
+#include "TestFloat64.h"
+
+extern int test_variable_sleep_interval;
+
+#if ( defined(__sun__) && ( HOST_SOLARIS < 10 ))
+double trunc(double x)
+{
+       return x < 0 ? -floor(-x) : floor(x);
+}
+#endif
+
+void
+TestFloat64::_duplicate(const TestFloat64 &ts)
+{
+    d_series_values = ts.d_series_values;
+}
+
+TestFloat64::TestFloat64(const string &n) : Float64(n), d_series_values(false)
+{
+    d_buf = 0.0;
+}
+
+TestFloat64::TestFloat64(const string &n, const string &d)
+    : Float64(n, d), d_series_values(false)
+{
+    d_buf = 0.0;
+}
+
+TestFloat64::TestFloat64(const TestFloat64 &rhs) : Float64(rhs) , TestCommon(rhs)
+{
+    _duplicate(rhs);
+}
+
+TestFloat64 &
+TestFloat64::operator=(const TestFloat64 &rhs)
+{
+    if (this == &rhs)
+	return *this;
+
+    dynamic_cast<Float64 &>(*this) = rhs; // run Constructor=
+
+    _duplicate(rhs);
+
+    return *this;
+}
+
+BaseType *
+TestFloat64::ptr_duplicate()
+{
+    return new TestFloat64(*this); // Copy ctor calls duplicate to do the work
+}
+
+void 
+TestFloat64::output_values(std::ostream &out)
+{
+    print_val(out, "", false);
+}
+
+bool
+TestFloat64::read()
+{
+    if (read_p())
+	return true;
+
+    if (test_variable_sleep_interval > 0)
+	sleep(test_variable_sleep_interval);
+
+    if (get_series_values()) {
+        d_buf += 10.0;
+        d_buf = (float)(trunc(10000 * cos(trunc(d_buf))) / 100);
+    }
+    else {
+        d_buf = 99.999;
+    }
+    
+    set_read_p(true);
+
+    return true;
+}
+
diff --git a/tests/TestFloat64.h b/tests/TestFloat64.h
new file mode 100644
index 0000000..919c906
--- /dev/null
+++ b/tests/TestFloat64.h
@@ -0,0 +1,69 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+// 
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+// 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+ 
+// (c) COPYRIGHT URI/MIT 1995-1997,1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// Interface for TestFloat64 type. See TestByte.h
+//
+// jhrg 1/12/95
+
+#ifndef _testfloat64_h
+#define _testfloat64_h 1
+
+
+#include "Float64.h"
+#include "TestCommon.h"
+
+using namespace libdap ;
+
+class TestFloat64: public Float64, public TestCommon {
+    bool d_series_values;
+    void _duplicate(const TestFloat64 &ts);
+
+public:
+    TestFloat64(const string &n);
+    TestFloat64(const string &n, const string &d);
+    TestFloat64(const TestFloat64 &rhs);
+
+    virtual ~TestFloat64() {}
+
+    TestFloat64 &operator=(const TestFloat64 &rhs);
+
+    virtual BaseType *ptr_duplicate();
+    
+    virtual bool read();
+    
+    virtual void output_values(std::ostream &out);
+
+    void set_series_values(bool sv) { d_series_values = sv; }
+    bool get_series_values() { return d_series_values; }
+};
+
+#endif // _testfloat64_h
+
diff --git a/tests/TestFunction.cc b/tests/TestFunction.cc
new file mode 100644
index 0000000..410d9fb
--- /dev/null
+++ b/tests/TestFunction.cc
@@ -0,0 +1,112 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2013 OPeNDAP, Inc.
+// Authors: Nathan Potter <npotter@opendap.org>
+//         James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#include "config.h"
+
+#include <BaseType.h>
+#include <TestFloat64.h>
+#include <TestStr.h>
+#include <TestArray.h>
+
+#include <Error.h>
+#include <DDS.h>
+
+#include <debug.h>
+#include <util.h>
+
+#include "TestFunction.h"
+
+namespace libdap {
+
+/**
+ * @brief scale a scalar or array variable
+ * This does not work for DAP2 Grids; only Array and scalar variables.
+ */
+void
+function_scale(int argc, BaseType * argv[], DDS &, BaseType **btpp)
+{
+    string info =
+    string("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n") +
+    "<function name=\"scale\" version=\"1.0\" href=\"http://docs.opendap.org/index.php/Server_Side_Processing_Functions\">\n" +
+    "</function>";
+
+    if (argc == 0) {
+        Str *response = new TestStr("info");
+        response->set_value(info);
+        *btpp = response;
+        return;
+    }
+
+    // Check for 2 arguments
+    DBG(cerr << "argc = " << argc << endl);
+    if (argc != 2)
+        throw Error(malformed_expr,"Wrong number of arguments to scale().");
+
+    double m = extract_double_value(argv[1]);
+
+    DBG(cerr << "m: " << m << << endl);
+
+    // Read the data, scale and return the result.
+    BaseType *dest = 0;
+    double *data;
+    if (argv[0]->is_vector_type()) {
+        TestArray &source = static_cast<TestArray&>(*argv[0]);
+        source.read();
+
+        data = extract_double_array(&source);
+        int length = source.length();
+        for (int i = 0; i < length; ++i)
+            data[i] = data[i] * m;
+
+        Array *result = new TestArray(source);
+
+        result->add_var_nocopy(new TestFloat64(source.name()));
+        result->set_value(data, length);
+
+        delete[] data; // set_value copies.
+
+        dest = result;
+    }
+    else if (argv[0]->is_simple_type() && !(argv[0]->type() == dods_str_c || argv[0]->type() == dods_url_c)) {
+    	argv[0]->read();
+        double data = extract_double_value(argv[0]);
+
+        data *= m;
+
+        Float64 *fdest = new TestFloat64(argv[0]->name());
+
+        fdest->set_value(data);
+        dest = fdest;
+    }
+    else {
+        throw Error(malformed_expr,"The scale() function works only for Arrays and scalars.");
+    }
+
+    *btpp = dest;
+    return;
+}
+
+} // namespace libdap
diff --git a/tests/TestFunction.h b/tests/TestFunction.h
new file mode 100644
index 0000000..d4fba58
--- /dev/null
+++ b/tests/TestFunction.h
@@ -0,0 +1,60 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2013 OPeNDAP, Inc.
+// Authors: Nathan Potter <npotter@opendap.org>
+//		James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#include <ServerFunction.h>
+
+namespace libdap {
+
+class BaseType;
+class DDS;
+
+/**
+ * The scale() function scales data.
+ */
+void function_scale(int argc, BaseType *argv[], DDS &dds, BaseType **btpp) ;
+
+/**
+ * The LinearScaleFunction class encapsulates the linear_scale function 'function_linear_scale'
+ * along with additional meta-data regarding its use and applicability.
+ */
+class TestFunction: public libdap::ServerFunction {
+public:
+	TestFunction()
+    {
+		setName("scale");
+		setDescriptionString("The scale() function is for testing.");
+		setUsageString("scale(var, num): scale var by num. var can be a scalar or an array");
+		setRole("http://services.opendap.org/dap4/server-side-function/scale");
+		setDocUrl("http://docs.opendap.org/index.php/Server_Side_Processing_Functions");
+		setFunction(libdap::function_scale);
+		setVersion("1.0");
+    }
+    virtual ~TestFunction()
+    {
+    }
+};
+
+} // libdap namespace
diff --git a/tests/TestGrid.cc b/tests/TestGrid.cc
new file mode 100644
index 0000000..d506941
--- /dev/null
+++ b/tests/TestGrid.cc
@@ -0,0 +1,163 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+// 
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+// 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+ 
+// (c) COPYRIGHT URI/MIT 1995-1996,1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// implementation for TestGrid. See TestByte.
+//
+// jhrg 1/13/95
+
+#include "TestGrid.h"
+#include "TestCommon.h"
+
+extern int test_variable_sleep_interval;
+
+void
+TestGrid::_duplicate(const TestGrid &ts)
+{
+    d_series_values = ts.d_series_values;
+}
+
+BaseType *
+TestGrid::ptr_duplicate()
+{
+    return new TestGrid(*this);
+}
+
+TestGrid::TestGrid(const TestGrid &rhs) : Grid(rhs), TestCommon(rhs)
+{
+    _duplicate(rhs);
+}
+
+void 
+TestGrid::output_values(std::ostream &out)
+{
+    // value_written controls comma printing
+    bool value_written = false;
+    bool pyg = projection_yields_grid();
+    if (pyg)
+        out << "{  Array: " ;
+    else //if (components(true) > 1)
+        out << "{ " ;
+
+    if (array_var()->send_p()) {
+        array_var()->print_val(out, "", false);
+        value_written = true;
+    }
+        
+    if (pyg) {
+        out << "  Maps: " ;
+        // No comma needed if the 'Maps:' separator is written out
+        value_written = false;
+    }
+
+    Map_citer i = map_begin();
+    // Write the first (and maybe only) value.
+    while(i != map_end() && !value_written) {
+        if ((*i)->send_p()) {
+            (*i++)->print_val(out, "", false);
+            value_written = true;
+        }
+        else {
+            ++i;
+        }
+    }
+    // Each subsequent value will be preceded by a comma
+    while(i != map_end()) {
+        if ((*i)->send_p()) {
+            out << ", ";
+            (*i++)->print_val(out, "", false);
+        }
+        else {
+            ++i;
+        }
+    }
+
+    //if (pyg || components(true) > 1)
+        out << " }" ;
+}
+
+TestGrid &
+TestGrid::operator=(const TestGrid &rhs)
+{
+    if (this == &rhs)
+	return *this;
+
+    dynamic_cast<Grid &>(*this) = rhs; // run Constructor=
+
+    _duplicate(rhs);
+
+    return *this;
+}
+
+
+TestGrid::TestGrid(const string &n) : Grid(n), d_series_values(false)
+{
+}
+
+TestGrid::TestGrid(const string &n, const string &d)
+    : Grid(n, d), d_series_values(false)
+{
+}
+
+TestGrid::~TestGrid()
+{
+}
+
+bool TestGrid::read()
+{
+    if (read_p())
+        return true;
+
+    get_array()->read();
+
+    for (Map_iter i = map_begin(); i != map_end(); i++) {
+        if (!(*i)->read()) {
+            return false;
+        }
+    }
+
+    set_read_p(true);
+
+    return true;
+}
+
+void
+TestGrid::set_series_values(bool sv)
+{
+    Map_iter i = map_begin();
+    while (i != map_end()) {
+        dynamic_cast<TestCommon&>(*(*i)).set_series_values(sv);
+        ++i;
+    }
+    
+    dynamic_cast<TestCommon&>(*array_var()).set_series_values(sv);
+    
+    d_series_values = sv;
+}
diff --git a/tests/TestGrid.h b/tests/TestGrid.h
new file mode 100644
index 0000000..5063409
--- /dev/null
+++ b/tests/TestGrid.h
@@ -0,0 +1,69 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+// 
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+// 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+ 
+// (c) COPYRIGHT URI/MIT 1995-1997,1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// Interface to the TestGrid ctor class. See TestByte.h
+//
+// jhrg 1/13/95
+
+#ifndef _testgrid_h
+#define _testgrid_h 1
+
+
+#include "Grid.h"
+#include "TestCommon.h"
+
+using namespace libdap ;
+
+class TestGrid: public Grid, public TestCommon {
+    bool d_series_values;
+    void _duplicate(const TestGrid &ts);
+
+public:
+    TestGrid(const string &n);
+    TestGrid(const string &n, const string &d);
+    TestGrid(const TestGrid &rhs);
+
+    virtual ~TestGrid();
+    
+    TestGrid &operator=(const TestGrid &rhs);
+
+    virtual BaseType *ptr_duplicate();
+
+    virtual bool read();
+    
+    virtual void output_values(std::ostream &out);
+
+    void set_series_values(bool);
+    bool get_series_values() { return d_series_values; }
+};
+
+#endif // _testgrid_h
+
diff --git a/tests/TestInt16.cc b/tests/TestInt16.cc
new file mode 100644
index 0000000..970a013
--- /dev/null
+++ b/tests/TestInt16.cc
@@ -0,0 +1,124 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// Implementation for TestInt16. See TestByte.cc
+//
+// 3/22/99 jhrg
+
+
+#include "config.h"
+
+#ifndef WIN32
+#include <unistd.h>
+#else
+#include <io.h>
+#include <fcntl.h>
+#include <process.h>
+#endif
+
+#include "TestInt16.h"
+
+extern int test_variable_sleep_interval;
+
+void
+TestInt16::_duplicate(const TestInt16 &ts)
+{
+    d_series_values = ts.d_series_values;
+}
+
+TestInt16::TestInt16(const string &n) : Int16(n), d_series_values(false)
+{
+    d_buf = 1;
+}
+
+TestInt16::TestInt16(const string &n, const string &d)
+    : Int16(n, d), d_series_values(false)
+{
+    d_buf = 1;
+}
+
+TestInt16::TestInt16(const TestInt16 &rhs) : Int16(rhs), TestCommon(rhs)
+{
+    _duplicate(rhs);
+}
+
+TestInt16 &
+TestInt16::operator=(const TestInt16 &rhs)
+{
+    if (this == &rhs)
+	return *this;
+
+    dynamic_cast<Int16 &>(*this) = rhs; // run Constructor=
+
+    _duplicate(rhs);
+
+    return *this;
+}
+
+
+BaseType *
+TestInt16::ptr_duplicate()
+{
+    return new TestInt16(*this);
+}
+
+void
+TestInt16::output_values(std::ostream &out)
+{
+    print_val(out, "", false);
+}
+
+bool
+TestInt16::read()
+{
+    if (read_p())
+	return true;
+
+    if (test_variable_sleep_interval > 0)
+	sleep(test_variable_sleep_interval);
+
+    if (get_series_values()) {
+        // Change for OSX 10.9 based on change needed for TestInt32.
+        // jhrg 3/26/14
+        d_buf <<= 4;
+		if (!d_buf)
+			d_buf = 16;
+
+       //d_buf = (short)(16 * d_buf);
+    }
+    else {
+        d_buf = 32000;
+    }
+
+    set_read_p(true);
+
+    return true;
+}
diff --git a/tests/TestInt16.h b/tests/TestInt16.h
new file mode 100644
index 0000000..f1a0cbf
--- /dev/null
+++ b/tests/TestInt16.h
@@ -0,0 +1,69 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+// 
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+// 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+ 
+// (c) COPYRIGHT URI/MIT 1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// TestInt16 interface. See TestByte.h for more info.
+//
+// 3/22/99 jhrg
+
+#ifndef _testint16_h
+#define _testint16_h 1
+
+
+#include "Int16.h"
+#include "TestCommon.h"
+
+using namespace libdap ;
+
+class TestInt16: public Int16, public TestCommon {
+    bool d_series_values;
+    void _duplicate(const TestInt16 &ts);
+
+public:
+    TestInt16(const string &n);
+    TestInt16(const string &n, const string &d);
+    TestInt16(const TestInt16 &rhs);
+
+    virtual ~TestInt16() {}
+
+    TestInt16 &operator=(const TestInt16 &rhs);
+
+    virtual BaseType *ptr_duplicate();
+    
+    virtual bool read();
+    
+    virtual void output_values(std::ostream &out);
+
+    void set_series_values(bool sv) { d_series_values = sv; }
+    bool get_series_values() { return d_series_values; }
+};
+
+#endif // _testint16_h
+
diff --git a/tests/TestInt32.cc b/tests/TestInt32.cc
new file mode 100644
index 0000000..94f49e5
--- /dev/null
+++ b/tests/TestInt32.cc
@@ -0,0 +1,125 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1995-1996,1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// Implementation for TestInt32. See TestByte.cc
+//
+// jhrg 1/12/95
+
+
+#include "config.h"
+
+//#define DODS_DEBUG
+
+#ifndef WIN32
+#include <unistd.h>
+#else
+#include <io.h>
+#include <fcntl.h>
+#include <process.h>
+#endif
+
+#include "TestInt32.h"
+#include "debug.h"
+
+extern int test_variable_sleep_interval;
+
+void
+TestInt32::_duplicate(const TestInt32 &ts)
+{
+    d_series_values = ts.d_series_values;
+}
+
+TestInt32::TestInt32(const string &n) : Int32(n), d_series_values(false)
+{
+    d_buf = 1;
+}
+
+TestInt32::TestInt32(const string &n, const string &)
+    : Int32(n), d_series_values(false)
+{
+    d_buf = 1;
+}
+
+TestInt32::TestInt32(const TestInt32 &rhs) : Int32(rhs), TestCommon(rhs)
+{
+    _duplicate(rhs);
+}
+
+TestInt32 &
+TestInt32::operator=(const TestInt32 &rhs)
+{
+    if (this == &rhs)
+	return *this;
+
+    dynamic_cast<Int32 &>(*this) = rhs; // run Constructor=
+
+    _duplicate(rhs);
+
+    return *this;
+}
+
+BaseType *
+TestInt32::ptr_duplicate()
+{
+    return new TestInt32(*this);
+}
+
+void
+TestInt32::output_values(std::ostream &out)
+{
+    print_val(out, "", false);
+}
+
+bool TestInt32::read()
+{
+	if (read_p()) return true;
+
+	if (test_variable_sleep_interval > 0) sleep(test_variable_sleep_interval);
+
+	if (get_series_values()) {
+		// This line stopped working when I upgraded the compiler on osx 10.9.
+		// to version Apple LLVM version 5.1 (clang-503.0.38) (based on LLVM 3.4svn)
+		// jhrg 3/12/14
+		// d_buf = d_buf * 32;
+		d_buf <<= 5;
+		if (!d_buf)
+			d_buf = 32;
+
+	    DBGN(cerr << __PRETTY_FUNCTION__ << "d_buf: " << d_buf << endl);
+	}
+	else {
+		d_buf = 123456789;
+	}
+
+	set_read_p(true);
+
+	return true;
+}
diff --git a/tests/TestInt32.h b/tests/TestInt32.h
new file mode 100644
index 0000000..5bbc41a
--- /dev/null
+++ b/tests/TestInt32.h
@@ -0,0 +1,69 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+// 
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+// 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+ 
+// (c) COPYRIGHT URI/MIT 1995-1997,1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// TestInt32 interface. See TestByte.h for more info.
+//
+// jhrg 1/12/95
+
+#ifndef _testint32_h
+#define _testint32_h 1
+
+
+#include "Int32.h"
+#include "TestCommon.h"
+
+using namespace libdap ;
+
+class TestInt32: public Int32, public TestCommon {
+    bool d_series_values;
+    void _duplicate(const TestInt32 &ts);
+
+public:
+    TestInt32(const string &n);
+    TestInt32(const string &n, const string &d);
+    TestInt32(const TestInt32 &rhs);
+
+    virtual ~TestInt32() {}
+
+    TestInt32 &operator=(const TestInt32 &rhs);
+
+    virtual BaseType *ptr_duplicate();
+    
+    virtual bool read();
+    
+    virtual void output_values(std::ostream &out);
+
+    virtual void set_series_values(bool sv) { d_series_values = sv; }
+    virtual bool get_series_values() { return d_series_values; }
+};
+
+#endif //_testint32_h
+
diff --git a/tests/TestInt64.cc b/tests/TestInt64.cc
new file mode 100644
index 0000000..69426d3
--- /dev/null
+++ b/tests/TestInt64.cc
@@ -0,0 +1,116 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#include "config.h"
+
+#ifndef WIN64
+#include <unistd.h>
+#else
+#include <io.h>
+#include <fcntl.h>
+#include <process.h>
+#endif
+
+//#define DODS_DEBUG
+
+#include "TestInt64.h"
+#include "debug.h"
+
+extern int test_variable_sleep_interval;
+
+void
+TestInt64::_duplicate(const TestInt64 &ts)
+{
+    d_series_values = ts.d_series_values;
+}
+
+TestInt64::TestInt64(const string &n) : Int64(n), d_series_values(false)
+{
+    d_buf = 1;
+}
+
+TestInt64::TestInt64(const string &n, const string &)
+    : Int64(n), d_series_values(false)
+{
+    d_buf = 1;
+}
+
+TestInt64::TestInt64(const TestInt64 &rhs) : Int64(rhs), TestCommon(rhs)
+{
+    _duplicate(rhs);
+}
+
+TestInt64 &
+TestInt64::operator=(const TestInt64 &rhs)
+{
+    if (this == &rhs)
+	return *this;
+
+    dynamic_cast<Int64 &>(*this) = rhs; // run Constructor=
+
+    _duplicate(rhs);
+
+    return *this;
+}
+
+BaseType *
+TestInt64::ptr_duplicate()
+{
+    return new TestInt64(*this);
+}
+
+void
+TestInt64::output_values(std::ostream &out)
+{
+    print_val(out, "", false);
+}
+
+bool
+TestInt64::read()
+{
+    DBG(cerr << "Entering TestInt64::read for " << name() << endl);
+    if (read_p())
+	return true;
+
+    if (test_variable_sleep_interval > 0)
+	sleep(test_variable_sleep_interval);
+
+    if (get_series_values()) {
+    	// was d_buf = 64 * d_buf; but a change in the compiler broke eqiv code in Int32.cc
+    	// jhrg 3/12/14
+    	d_buf <<= 6;
+        if (!d_buf)
+            d_buf = 64;
+    }
+    else {
+        d_buf = 0x00ffffffffffffff;
+    }
+
+    set_read_p(true);
+
+    DBG(cerr << "In TestInt64::read, _buf = " << d_buf << endl);
+
+    return true;
+}
diff --git a/tests/TestInt64.h b/tests/TestInt64.h
new file mode 100644
index 0000000..d664937
--- /dev/null
+++ b/tests/TestInt64.h
@@ -0,0 +1,59 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+// 
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+// 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+ 
+#ifndef _testint64_h
+#define _testint64_h 1
+
+
+#include "Int64.h"
+#include "TestCommon.h"
+
+using namespace libdap ;
+
+class TestInt64: public Int64, public TestCommon {
+    bool d_series_values;
+    void _duplicate(const TestInt64 &ts);
+
+public:
+    TestInt64(const string &n);
+    TestInt64(const string &n, const string &d);
+    TestInt64(const TestInt64 &rhs);
+
+    virtual ~TestInt64() {}
+
+    TestInt64 &operator=(const TestInt64 &rhs);
+
+    virtual BaseType *ptr_duplicate();
+    
+    virtual bool read();
+    
+    virtual void output_values(std::ostream &out);
+
+    virtual void set_series_values(bool sv) { d_series_values = sv; }
+    virtual bool get_series_values() { return d_series_values; }
+};
+
+#endif //_testint64_h
+
diff --git a/tests/TestInt8.cc b/tests/TestInt8.cc
new file mode 100644
index 0000000..7cb8eba
--- /dev/null
+++ b/tests/TestInt8.cc
@@ -0,0 +1,101 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2013 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+// 
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+// 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#include "config.h"
+
+#ifndef WIN32
+#include <unistd.h>
+#else
+#include <io.h>
+#include <fcntl.h>
+#include <process.h>
+#endif
+
+#include "TestInt8.h"
+
+extern int test_variable_sleep_interval;
+
+void TestInt8::m_duplicate(const TestInt8 &ts)
+{
+	d_series_values = ts.d_series_values;
+}
+
+TestInt8::TestInt8(const string &n) :
+		Int8(n), d_series_values(false)
+{
+	d_buf = 1;
+}
+
+TestInt8::TestInt8(const string &n, const string &d) :
+		Int8(n, d), d_series_values(false)
+{
+	d_buf = 1;
+}
+
+TestInt8::TestInt8(const TestInt8 &rhs) :
+		Int8(rhs), TestCommon(rhs)
+{
+	m_duplicate(rhs);
+}
+
+TestInt8 &
+TestInt8::operator=(const TestInt8 &rhs)
+{
+	if (this == &rhs) return *this;
+
+	dynamic_cast<Int8 &>(*this) = rhs; // run Constructor=
+
+	m_duplicate(rhs);
+
+	return *this;
+}
+
+BaseType *
+TestInt8::ptr_duplicate()
+{
+	return new TestInt8(*this);
+}
+
+void TestInt8::output_values(std::ostream &out)
+{
+	print_val(out, "", false);
+}
+
+bool TestInt8::read()
+{
+	if (read_p()) return true;
+
+	if (test_variable_sleep_interval > 0) sleep (test_variable_sleep_interval);
+
+	if (get_series_values()) {
+		d_buf = (dods_int8) (2 * d_buf);
+	}
+	else {
+		d_buf = 127;
+	}
+
+	set_read_p(true);
+
+	return true;
+}
diff --git a/tests/TestInt8.h b/tests/TestInt8.h
new file mode 100644
index 0000000..e8d08ee
--- /dev/null
+++ b/tests/TestInt8.h
@@ -0,0 +1,60 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2013 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+// 
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+// 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+ 
+
+#ifndef _testint8_h
+#define _testint8_h 1
+
+
+#include "Int8.h"
+#include "TestCommon.h"
+
+using namespace libdap ;
+
+class TestInt8: public Int8, public TestCommon {
+    bool d_series_values;
+    void m_duplicate(const TestInt8 &ts);
+
+public:
+    TestInt8(const string &n);
+    TestInt8(const string &n, const string &d);
+    TestInt8(const TestInt8 &rhs);
+
+    virtual ~TestInt8() {}
+
+    TestInt8 &operator=(const TestInt8 &rhs);
+
+    virtual BaseType *ptr_duplicate();
+    
+    virtual bool read();
+    
+    virtual void output_values(std::ostream &out);
+
+    void set_series_values(bool sv) { d_series_values = sv; }
+    bool get_series_values() { return d_series_values; }
+};
+
+#endif // _testint8_h
+
diff --git a/tests/TestSequence.cc b/tests/TestSequence.cc
new file mode 100644
index 0000000..87693c6
--- /dev/null
+++ b/tests/TestSequence.cc
@@ -0,0 +1,163 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1995-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// Implementation for the class TestStructure. See TestByte.cc
+//
+// jhrg 1/12/95
+//
+// Note that the test code here to read values from a data file works only
+// for single level sequences - that is, it does *not* work for sequences
+// that contain other sequences. jhrg 2/2/98
+
+//#define DODS_DEBUG
+
+#include "config.h"
+#include "D4Group.h"
+#include "Constructor.h"
+#include "D4Sequence.h"
+#include "debug.h"
+
+#include "TestSequence.h"
+#include "TestD4Sequence.h"
+#include "TestCommon.h"
+
+using namespace libdap;
+
+void TestSequence::_duplicate(const TestSequence &ts)
+{
+    d_current = ts.d_current;
+    d_len = ts.d_len;
+    d_series_values = ts.d_series_values;
+}
+
+BaseType *
+TestSequence::ptr_duplicate()
+{
+    return new TestSequence(*this);
+}
+
+TestSequence::TestSequence(const string &n) :
+        Sequence(n), d_len(4), d_current(0), d_series_values(false)
+{
+}
+
+TestSequence::TestSequence(const string &n, const string &d) :
+        Sequence(n, d), d_len(4), d_current(0), d_series_values(false)
+{
+}
+
+TestSequence::TestSequence(const TestSequence &rhs) :
+        Sequence(rhs), TestCommon(rhs)
+{
+    _duplicate(rhs);
+}
+
+TestSequence::~TestSequence()
+{
+}
+
+TestSequence &
+TestSequence::operator=(const TestSequence &rhs)
+{
+    if (this == &rhs) return *this;
+
+    dynamic_cast<Sequence &>(*this) = rhs; // run Constructor=
+
+    _duplicate(rhs);
+
+    return *this;
+}
+
+void
+TestSequence::transform_to_dap4(D4Group *root, Constructor *container)
+{
+    TestD4Sequence *dest = new TestD4Sequence(name());
+    Constructor::transform_to_dap4(root, dest);
+    container->add_var_nocopy(dest);
+}
+
+void TestSequence::output_values(std::ostream &out)
+{
+    print_val(out, "", false);
+}
+
+// Read values from text files. Sequence instances are stored on separate
+// lines. Line can be no more than 255 characters long.
+
+bool TestSequence::read()
+{
+    DBG(cerr << "Entering TestSequence::read for " << name() << endl);
+
+    if (read_p()) return true;
+
+    DBG(cerr << "current: " << d_current << ", length: " << d_len << endl);
+    // When we get to the end of a Sequence, reset the row number counter so
+    // that, in case this is an inner sequence, the next instance will be read
+    // and the "Trying to back up in a Sequence" error won't be generated.
+    if (++d_current > d_len) {
+        DBG(cerr << "Leaving TestSequence::read for " << name()
+                << " because d_current(" << d_current
+                << ") > d_len(" << d_len << ")" << endl);
+        d_current = 0;                  // reset
+        set_unsent_data(false);
+        reset_row_number();
+        // jhrg original version from 10/9/13: return false; // No more values
+        return true;
+    }
+
+    Vars_iter i = var_begin();
+    while (i != var_end()) {
+        if ((*i)->send_p() || (*i)->is_in_selection()) {
+            DBG(cerr << "Calling " << (*i)->name() << "->read()" << endl);
+            (*i)->read();
+        }
+        ++i;
+    }
+
+    set_unsent_data(true);
+    DBG(cerr << "Leaving TestSequence::read for " << name() << endl);
+    return false;
+}
+
+void TestSequence::set_series_values(bool sv)
+{
+    Vars_iter i = var_begin();
+    while (i != var_end()) {
+        dynamic_cast<TestCommon&>(*(*i)).set_series_values(sv);
+        ++i;
+    }
+
+    d_series_values = sv;
+}
+
+int TestSequence::length() const
+{
+    return 5;
+}
diff --git a/tests/TestSequence.h b/tests/TestSequence.h
new file mode 100644
index 0000000..f9b465b
--- /dev/null
+++ b/tests/TestSequence.h
@@ -0,0 +1,78 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1995-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// Interface for the class TestSequence. See TestByte.h
+//
+// jhrg 1/12/95
+
+#ifndef _testsequence_h
+#define _testsequence_h 1
+
+#include "Sequence.h"
+#include "TestCommon.h"
+
+using namespace libdap ;
+
+namespace libdap {
+	class D4Group;
+	class Constructor;
+}
+
+class TestSequence: public Sequence, public TestCommon {
+private:
+    int d_len;
+    int d_current;
+    bool d_series_values;
+
+    void _duplicate(const TestSequence &ts);
+
+public:
+    TestSequence(const string &n);
+    TestSequence(const string &n, const string &d);
+    TestSequence(const TestSequence &rhs);
+
+    virtual ~TestSequence();
+
+    TestSequence &operator=(const TestSequence &rhs);
+    virtual BaseType *ptr_duplicate();
+    virtual void transform_to_dap4(libdap::D4Group *root, libdap::Constructor *container);
+
+    virtual bool read();
+
+    virtual void output_values(std::ostream &out);
+
+    void set_series_values(bool);
+    bool get_series_values() { return d_series_values; }
+
+    virtual int length() const;
+};
+
+#endif // _testsequence_h
diff --git a/tests/TestStr.cc b/tests/TestStr.cc
new file mode 100644
index 0000000..4c11043
--- /dev/null
+++ b/tests/TestStr.cc
@@ -0,0 +1,118 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1995-1996,1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// Implementation for TestStr. See TestByte.cc
+//
+// jhrg 1/12/95
+
+
+#include "config.h"
+
+#include <string>
+
+#ifndef WIN32
+#include <unistd.h>
+#else
+#include <io.h>
+#include <fcntl.h>
+#include <process.h>
+#endif
+
+#include "TestStr.h"
+#include "util.h"
+
+extern int test_variable_sleep_interval;
+
+void
+TestStr::_duplicate(const TestStr &ts)
+{
+    d_series_values = ts.d_series_values;
+    d_count = ts.d_count;
+}
+
+
+TestStr::TestStr(const string &n) : Str(n), d_series_values(false), d_count(0)
+{
+}
+
+TestStr::TestStr(const string &n, const string &d)
+    : Str(n, d), d_series_values(false), d_count(0)
+{
+}
+
+TestStr::TestStr(const TestStr &rhs) : Str(rhs), TestCommon(rhs)
+{
+    _duplicate(rhs);
+}
+
+TestStr &
+TestStr::operator=(const TestStr &rhs)
+{
+    if (this == &rhs)
+	return *this;
+
+    dynamic_cast<Str &>(*this) = rhs; // run Constructor=
+
+    _duplicate(rhs);
+
+    return *this;
+}
+
+BaseType *
+TestStr::ptr_duplicate()
+{
+    return new TestStr(*this);
+}
+
+void
+TestStr::output_values(std::ostream &out)
+{
+    print_val(out, "", false);
+}
+
+bool TestStr::read()
+{
+	if (read_p()) return true;
+
+	if (test_variable_sleep_interval > 0) sleep(test_variable_sleep_interval);
+
+	string dods_str_test;
+	if (get_series_values())
+	    dods_str_test = "Silly test string: " + long_to_string(++d_count);
+	else
+	    dods_str_test = "Silly test string: 1";
+
+	(void) val2buf(&dods_str_test);
+
+	set_read_p(true);
+
+	return true;
+}
diff --git a/tests/TestStr.h b/tests/TestStr.h
new file mode 100644
index 0000000..3c7883c
--- /dev/null
+++ b/tests/TestStr.h
@@ -0,0 +1,73 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+// 
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+// 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+ 
+// (c) COPYRIGHT URI/MIT 1995-1997,1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// Interface for TestStr type. See TestByte.h
+//
+// jhrg 1/12/95
+
+#ifndef _teststr_h
+#define _teststr_h 1
+
+
+#include <string>
+
+#include "dods-limits.h"
+#include "Str.h"
+#include "TestCommon.h"
+
+using namespace libdap ;
+
+class TestStr: public Str, public TestCommon {
+    bool d_series_values;
+    void _duplicate(const TestStr &ts);
+    int d_count;
+
+public:
+    TestStr(const string &n);
+    TestStr(const string &n, const string &d);
+    TestStr(const TestStr &rhs);
+
+    virtual ~TestStr() {}
+
+    TestStr &operator=(const TestStr &rhs);
+
+    virtual BaseType *ptr_duplicate();
+    
+    virtual bool read();
+    
+    virtual void output_values(std::ostream &out);
+
+    void set_series_values(bool sv) { d_series_values = sv; }
+    bool get_series_values() { return d_series_values; }
+};
+
+#endif //_teststr_h
+
diff --git a/tests/TestStructure.cc b/tests/TestStructure.cc
new file mode 100644
index 0000000..d891ac5
--- /dev/null
+++ b/tests/TestStructure.cc
@@ -0,0 +1,155 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1995-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// Implementation for the class TestStructure. See TestByte.cc
+//
+// jhrg 1/12/95
+
+//#define DODS_DEBUG
+
+#include "config.h"
+#include "D4Group.h"
+#include "Constructor.h"
+#include "debug.h"
+
+#include "TestStructure.h"
+
+using namespace libdap;
+
+void TestStructure::m_duplicate(const TestStructure &ts)
+{
+	d_series_values = ts.d_series_values;
+}
+
+BaseType *
+TestStructure::ptr_duplicate()
+{
+	return new TestStructure(*this);
+}
+
+TestStructure::TestStructure(const TestStructure &rhs) :
+		Structure(rhs), TestCommon(rhs)
+{
+	m_duplicate(rhs);
+}
+
+TestStructure &
+TestStructure::operator=(const TestStructure &rhs)
+{
+	if (this == &rhs) return *this;
+
+	dynamic_cast<Structure &>(*this) = rhs; // run Constructor=
+
+	m_duplicate(rhs);
+
+	return *this;
+}
+
+TestStructure::TestStructure(const string &n) :
+		Structure(n), d_series_values(false)
+{
+}
+
+TestStructure::TestStructure(const string &n, const string &d) :
+		Structure(n, d), d_series_values(false)
+{
+}
+
+TestStructure::~TestStructure()
+{
+}
+
+void TestStructure::output_values(std::ostream &out)
+{
+	out << "{ ";
+
+	bool value_written = false;
+	Vars_citer i = var_begin();
+
+	// Write the first (and maybe only) value.
+	while (i != var_end() && !value_written) {
+		if ((*i)->send_p()) {
+			(*i++)->print_val(out, "", false);
+			value_written = true;
+		}
+		else {
+			++i;
+		}
+	}
+	// Each subsequent value will be preceded by a comma
+	while (i != var_end()) {
+		if ((*i)->send_p()) {
+			out << ", ";
+			(*i++)->print_val(out, "", false);
+		}
+		else {
+			++i;
+		}
+	}
+
+	out << " }";
+}
+
+void
+TestStructure::transform_to_dap4(D4Group *root, Constructor *container)
+{
+    TestStructure *dest = new TestStructure(name(), dataset());
+	Constructor::transform_to_dap4(root, dest);
+	container->add_var_nocopy(dest);
+}
+
+// For this `Test' class, run the read mfunc for each of variables which
+// comprise the structure.
+
+bool TestStructure::read()
+{
+	if (read_p()) return true;
+
+	for (Vars_iter i = var_begin(); i != var_end(); i++) {
+		if (!(*i)->read()) {
+			return false;
+		}
+	}
+
+	set_read_p(true);
+
+	return true;
+}
+
+void TestStructure::set_series_values(bool sv)
+{
+	Vars_iter i = var_begin();
+	while (i != var_end()) {
+		dynamic_cast<TestCommon&>(*(*i)).set_series_values(sv);
+		++i;
+	}
+
+	d_series_values = sv;
+}
diff --git a/tests/TestStructure.h b/tests/TestStructure.h
new file mode 100644
index 0000000..a03996b
--- /dev/null
+++ b/tests/TestStructure.h
@@ -0,0 +1,73 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1995-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// Interface for the class TestStructure. See TestByte.h
+//
+// jhrg 1/12/95
+
+#ifndef _teststructure_h
+#define _teststructure_h 1
+
+#include "Structure.h"
+#include "TestCommon.h"
+
+using namespace libdap ;
+
+namespace libdap {
+	class D4Group;
+	class Constructor;
+}
+
+class TestStructure: public Structure, public TestCommon {
+    bool d_series_values;
+    void m_duplicate(const TestStructure &ts);
+
+public:
+    TestStructure(const string &n);
+    TestStructure(const string &n, const string &d);
+    TestStructure(const TestStructure &rhs);
+
+    virtual ~TestStructure();
+
+    TestStructure &operator=(const TestStructure &rhs);
+
+    virtual BaseType *ptr_duplicate();
+    virtual void transform_to_dap4(libdap::D4Group *root, libdap::Constructor *container);
+
+    virtual bool read();
+
+    virtual void output_values(std::ostream &out);
+
+    void set_series_values(bool);
+    bool get_series_values() { return d_series_values; }
+};
+
+#endif // _teststructure_h
diff --git a/tests/TestTypeFactory.cc b/tests/TestTypeFactory.cc
new file mode 100644
index 0000000..5d2c998
--- /dev/null
+++ b/tests/TestTypeFactory.cc
@@ -0,0 +1,126 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2005 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+// 
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+// 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+
+#include <string>
+
+#include "TestByte.h"
+#include "TestInt16.h"
+#include "TestUInt16.h"
+#include "TestInt32.h"
+#include "TestUInt32.h"
+#include "TestFloat32.h"
+#include "TestFloat64.h"
+#include "TestStr.h"
+#include "TestUrl.h"
+#include "TestArray.h"
+#include "TestStructure.h"
+#include "TestSequence.h"
+#include "TestGrid.h"
+
+#include "BaseTypeFactory.h"
+#include "TestTypeFactory.h"
+
+#include "debug.h"
+
+Byte *
+TestTypeFactory::NewByte(const string &n ) const 
+{ 
+    return new TestByte(n);
+}
+
+Int16 *
+TestTypeFactory::NewInt16(const string &n ) const 
+{ 
+    return new TestInt16(n); 
+}
+
+UInt16 *
+TestTypeFactory::NewUInt16(const string &n ) const 
+{ 
+    return new TestUInt16(n);
+}
+
+Int32 *
+TestTypeFactory::NewInt32(const string &n ) const 
+{ 
+    DBG(cerr << "Inside TestTypeFactory::NewInt32" << endl);
+    return new TestInt32(n);
+}
+
+UInt32 *
+TestTypeFactory::NewUInt32(const string &n ) const 
+{ 
+    return new TestUInt32(n);
+}
+
+Float32 *
+TestTypeFactory::NewFloat32(const string &n ) const 
+{ 
+    return new TestFloat32(n);
+}
+
+Float64 *
+TestTypeFactory::NewFloat64(const string &n ) const 
+{ 
+    return new TestFloat64(n);
+}
+
+Str *
+TestTypeFactory::NewStr(const string &n ) const 
+{ 
+    return new TestStr(n);
+}
+
+Url *
+TestTypeFactory::NewUrl(const string &n ) const 
+{ 
+    return new TestUrl(n);
+}
+
+Array *
+TestTypeFactory::NewArray(const string &n , BaseType *v) const 
+{ 
+    return new TestArray(n, v);
+}
+
+Structure *
+TestTypeFactory::NewStructure(const string &n ) const 
+{ 
+    return new TestStructure(n);
+}
+
+Sequence *
+TestTypeFactory::NewSequence(const string &n ) const 
+{
+    DBG(cerr << "Inside TestTypeFactory::NewSequence" << endl);
+    return new TestSequence(n);
+}
+
+Grid *
+TestTypeFactory::NewGrid(const string &n ) const 
+{ 
+    return new TestGrid(n);
+}
diff --git a/tests/TestTypeFactory.h b/tests/TestTypeFactory.h
new file mode 100644
index 0000000..ee5dbcf
--- /dev/null
+++ b/tests/TestTypeFactory.h
@@ -0,0 +1,73 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2005 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+// 
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+// 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#ifndef test_type_factory_h
+#define test_type_factory_h
+
+#include <string>
+
+#include "BaseTypeFactory.h"
+
+class TestByte;
+class TestInt16;
+class TestUInt16;
+class TestInt32;
+class TestUInt32;
+class TestFloat32;
+class TestFloat64;
+class TestStr;
+class TestUrl;
+class TestArray;
+class TestStructure;
+class TestSequence;
+class TestGrid;
+
+using namespace libdap ;
+
+/** A factory for the TestByte, ..., TestGrid types.
+    @author James Gallagher */
+class TestTypeFactory : public BaseTypeFactory {
+public:
+    TestTypeFactory() {} 
+    virtual ~TestTypeFactory() {}
+
+    virtual Byte *NewByte(const string &n = "") const;
+    virtual Int16 *NewInt16(const string &n = "") const;
+    virtual UInt16 *NewUInt16(const string &n = "") const;
+    virtual Int32 *NewInt32(const string &n = "") const;
+    virtual UInt32 *NewUInt32(const string &n = "") const;
+    virtual Float32 *NewFloat32(const string &n = "") const;
+    virtual Float64 *NewFloat64(const string &n = "") const;
+
+    virtual Str *NewStr(const string &n = "") const;
+    virtual Url *NewUrl(const string &n = "") const;
+
+    virtual Array *NewArray(const string &n = "", BaseType *v = 0) const;
+    virtual Structure *NewStructure(const string &n = "") const;
+    virtual Sequence *NewSequence(const string &n = "") const;
+    virtual Grid *NewGrid(const string &n = "") const;
+};
+
+#endif // test_type_factory_h
diff --git a/tests/TestUInt16.cc b/tests/TestUInt16.cc
new file mode 100644
index 0000000..63b68e0
--- /dev/null
+++ b/tests/TestUInt16.cc
@@ -0,0 +1,125 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// Implementation for TestUInt16. See TestByte.cc
+//
+// 3/22/99 jhrg
+
+
+#include "config.h"
+
+#ifndef WIN32
+#include <unistd.h>
+#else
+#include <io.h>
+#include <fcntl.h>
+#include <process.h>
+#endif
+
+#include "TestUInt16.h"
+
+extern int test_variable_sleep_interval;
+
+void
+TestUInt16::_duplicate(const TestUInt16 &ts)
+{
+    d_series_values = ts.d_series_values;
+}
+
+
+TestUInt16::TestUInt16(const string &n) : UInt16(n), d_series_values(false)
+{
+    d_buf = 1;
+}
+
+TestUInt16::TestUInt16(const string &n, const string &d)
+    : UInt16(n, d), d_series_values(false)
+{
+    d_buf = 1;
+}
+
+TestUInt16::TestUInt16(const TestUInt16 &rhs) : UInt16(rhs), TestCommon(rhs)
+{
+    _duplicate(rhs);
+}
+
+TestUInt16 &
+TestUInt16::operator=(const TestUInt16 &rhs)
+{
+    if (this == &rhs)
+	return *this;
+
+    dynamic_cast<UInt16 &>(*this) = rhs; // run Constructor=
+
+    _duplicate(rhs);
+
+    return *this;
+}
+
+
+BaseType *
+TestUInt16::ptr_duplicate()
+{
+    return new TestUInt16(*this);
+}
+
+void
+TestUInt16::output_values(std::ostream &out)
+{
+    print_val(out, "", false);
+}
+
+bool
+TestUInt16::read()
+{
+    if (read_p())
+	return true;
+
+    if (test_variable_sleep_interval > 0)
+	sleep(test_variable_sleep_interval);
+
+    if (get_series_values()) {
+        // Change for OSX 10.9 based on change needed for TestInt32.
+        // jhrg 3/26/14
+        d_buf <<= 4;
+		if (!d_buf)
+			d_buf = 16;
+
+        // d_buf = (short)(16 * d_buf);
+    }
+    else {
+        d_buf = 64000;
+    }
+
+    set_read_p(true);
+
+    return true;
+}
diff --git a/tests/TestUInt16.h b/tests/TestUInt16.h
new file mode 100644
index 0000000..278c3f8
--- /dev/null
+++ b/tests/TestUInt16.h
@@ -0,0 +1,69 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+// 
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+// 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+ 
+// (c) COPYRIGHT URI/MIT 1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// TestUInt16 interface. See TestByte.h for more info.
+//
+// 3/22/99 jhrg
+
+#ifndef _testuint16_h
+#define _testuint16_h 1
+
+
+#include "UInt16.h"
+#include "TestCommon.h"
+
+using namespace libdap ;
+
+class TestUInt16: public UInt16, public TestCommon {
+    bool d_series_values;
+    void _duplicate(const TestUInt16 &ts);
+
+public:
+    TestUInt16(const string &n);
+    TestUInt16(const string &n, const string &d);
+    TestUInt16(const TestUInt16 &rhs);
+
+    virtual ~TestUInt16() {}
+
+    TestUInt16 &operator=(const TestUInt16 &rhs);
+
+    virtual BaseType *ptr_duplicate();
+    
+    virtual bool read();
+    
+    virtual void output_values(std::ostream &out);
+
+    void set_series_values(bool sv) { d_series_values = sv; }
+    bool get_series_values() { return d_series_values; }
+};
+
+#endif // _testuint16_h
+
diff --git a/tests/TestUInt32.cc b/tests/TestUInt32.cc
new file mode 100644
index 0000000..8b7af18
--- /dev/null
+++ b/tests/TestUInt32.cc
@@ -0,0 +1,125 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1996,1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// Implementation for TestUInt32. See TestByte.cc
+//
+// jhrg 10/27/96
+
+
+#include "config.h"
+
+#ifndef WIN32
+#include <unistd.h>
+#else
+#include <io.h>
+#include <fcntl.h>
+#include <process.h>
+#endif
+
+#include "TestUInt32.h"
+
+extern int test_variable_sleep_interval;
+
+void
+TestUInt32::_duplicate(const TestUInt32 &ts)
+{
+    d_series_values = ts.d_series_values;
+}
+
+
+TestUInt32::TestUInt32(const string &n) : UInt32(n), d_series_values(false)
+{
+    d_buf = 1;
+}
+
+TestUInt32::TestUInt32(const string &n, const string &d)
+    : UInt32(n, d), d_series_values(false)
+{
+    d_buf = 1;
+}
+
+TestUInt32::TestUInt32(const TestUInt32 &rhs) : UInt32(rhs), TestCommon(rhs)
+{
+    _duplicate(rhs);
+}
+
+TestUInt32 &
+TestUInt32::operator=(const TestUInt32 &rhs)
+{
+    if (this == &rhs)
+	return *this;
+
+    dynamic_cast<UInt32 &>(*this) = rhs; // run Constructor=
+
+    _duplicate(rhs);
+
+    return *this;
+}
+
+
+BaseType *
+TestUInt32::ptr_duplicate()
+{
+    return new TestUInt32(*this);
+}
+
+void
+TestUInt32::output_values(std::ostream &out)
+{
+    print_val(out, "", false);
+}
+
+bool
+TestUInt32::read()
+{
+    if (read_p())
+	return true;
+
+    if (test_variable_sleep_interval > 0)
+	sleep(test_variable_sleep_interval);
+
+    if (get_series_values()) {
+   		// This line stopped working when I upgraded the compiler on osx 10.9.
+		// to version Apple LLVM version 5.1 (clang-503.0.38) (based on LLVM 3.4svn)
+		// jhrg 3/12/14
+		// d_buf = d_buf * 32;
+		d_buf <<= 5;
+		if (!d_buf)
+			d_buf = 32;
+    }
+    else {
+        d_buf = 0xf0000000;		// about 4 billion
+    }
+
+    set_read_p(true);
+
+    return true;
+}
diff --git a/tests/TestUInt32.h b/tests/TestUInt32.h
new file mode 100644
index 0000000..ffd63e3
--- /dev/null
+++ b/tests/TestUInt32.h
@@ -0,0 +1,69 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+// 
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+// 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+ 
+// (c) COPYRIGHT URI/MIT 1996,1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// TestUInt32 interface. See TestByte.h for more info.
+//
+// jhrg 10/27/96
+
+#ifndef _testuint32_h
+#define _testuint32_h 1
+
+
+#include "UInt32.h"
+#include "TestCommon.h"
+
+using namespace libdap ;
+
+class TestUInt32: public UInt32, public TestCommon {
+    bool d_series_values;
+    void _duplicate(const TestUInt32 &ts);
+
+public:
+    TestUInt32(const string &n);
+    TestUInt32(const string &n, const string &d);
+    TestUInt32(const TestUInt32 &rhs);
+
+    virtual ~TestUInt32() {}
+
+    TestUInt32 &operator=(const TestUInt32 &rhs);
+
+    virtual BaseType *ptr_duplicate();
+    
+    virtual bool read();
+    
+    virtual void output_values(std::ostream &out);
+
+    void set_series_values(bool sv) { d_series_values = sv; }
+    bool get_series_values() { return d_series_values; }
+};
+
+#endif // _testuint32_h
+
diff --git a/tests/TestUInt64.cc b/tests/TestUInt64.cc
new file mode 100644
index 0000000..429fff3
--- /dev/null
+++ b/tests/TestUInt64.cc
@@ -0,0 +1,108 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+// 
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+// 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+ 
+#include "config.h"
+
+#ifndef WIN64
+#include <unistd.h>
+#else
+#include <io.h>
+#include <fcntl.h>
+#include <process.h>
+#endif
+
+#include "TestUInt64.h"
+
+extern int test_variable_sleep_interval;
+
+void
+TestUInt64::_duplicate(const TestUInt64 &ts)
+{
+    d_series_values = ts.d_series_values;
+}
+
+
+TestUInt64::TestUInt64(const string &n) : UInt64(n), d_series_values(false)
+{
+    d_buf = 1;
+}
+
+TestUInt64::TestUInt64(const string &n, const string &d)
+    : UInt64(n, d), d_series_values(false)
+{
+    d_buf = 1;
+}
+
+TestUInt64::TestUInt64(const TestUInt64 &rhs) : UInt64(rhs), TestCommon(rhs)
+{
+    _duplicate(rhs);
+}
+
+TestUInt64 &
+TestUInt64::operator=(const TestUInt64 &rhs)
+{
+    if (this == &rhs)
+	return *this;
+
+    dynamic_cast<UInt64 &>(*this) = rhs; // run Constructor=
+
+    _duplicate(rhs);
+
+    return *this;
+}
+
+
+BaseType *
+TestUInt64::ptr_duplicate()
+{
+    return new TestUInt64(*this);
+}
+
+void 
+TestUInt64::output_values(std::ostream &out)
+{
+    print_val(out, "", false);
+}
+
+bool
+TestUInt64::read()
+{
+    if (read_p())
+	return true;
+
+    if (test_variable_sleep_interval > 0)
+	sleep(test_variable_sleep_interval);
+
+    if (get_series_values()) {
+        d_buf = 64 * d_buf;
+    }
+    else {
+        d_buf = 0xffffffffffffffff;		// really big
+    }
+
+    set_read_p(true);
+    
+    return true;
+}
diff --git a/tests/TestUInt64.h b/tests/TestUInt64.h
new file mode 100644
index 0000000..fee5fee
--- /dev/null
+++ b/tests/TestUInt64.h
@@ -0,0 +1,59 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+// 
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+// 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#ifndef _testuint64_h
+#define _testuint64_h 1
+
+
+#include "UInt64.h"
+#include "TestCommon.h"
+
+using namespace libdap ;
+
+class TestUInt64: public UInt64, public TestCommon {
+    bool d_series_values;
+    void _duplicate(const TestUInt64 &ts);
+
+public:
+    TestUInt64(const string &n);
+    TestUInt64(const string &n, const string &d);
+    TestUInt64(const TestUInt64 &rhs);
+
+    virtual ~TestUInt64() {}
+
+    TestUInt64 &operator=(const TestUInt64 &rhs);
+
+    virtual BaseType *ptr_duplicate();
+    
+    virtual bool read();
+    
+    virtual void output_values(std::ostream &out);
+
+    void set_series_values(bool sv) { d_series_values = sv; }
+    bool get_series_values() { return d_series_values; }
+};
+
+#endif // _testuint64_h
+
diff --git a/tests/TestUrl.cc b/tests/TestUrl.cc
new file mode 100644
index 0000000..d76de94
--- /dev/null
+++ b/tests/TestUrl.cc
@@ -0,0 +1,114 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+// 
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+// 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+ 
+// (c) COPYRIGHT URI/MIT 1995-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// Implementation for TestUrl. See TestByte.cc
+//
+// jhrg 1/12/95
+
+
+#include "config.h"
+
+#include <string>
+
+#ifndef WIN32
+#include <unistd.h>
+#else
+#include <io.h>
+#include <fcntl.h>
+#include <process.h>
+#endif
+
+#include "TestUrl.h"
+
+extern int test_variable_sleep_interval;
+
+void
+TestUrl::_duplicate(const TestUrl &ts)
+{
+    d_series_values = ts.d_series_values;
+}
+
+TestUrl::TestUrl(const string &n) : Url(n), d_series_values(false)
+{
+}
+
+TestUrl::TestUrl(const string &n, const string &)
+    : Url(n), d_series_values(false)
+{
+}
+
+TestUrl::TestUrl(const TestUrl &rhs) : Url(rhs), TestCommon(rhs)
+{
+    _duplicate(rhs);
+}
+
+TestUrl &
+TestUrl::operator=(const TestUrl &rhs)
+{
+    if (this == &rhs)
+	return *this;
+
+    dynamic_cast<Url &>(*this) = rhs; // run Constructor=
+
+    _duplicate(rhs);
+
+    return *this;
+}
+
+BaseType *
+TestUrl::ptr_duplicate()
+{
+    return new TestUrl(*this);
+}
+
+void 
+TestUrl::output_values(std::ostream &out)
+{
+    print_val(out, "", false);
+}
+
+bool
+TestUrl::read()
+{
+    if (read_p())
+	return true;
+
+    if (test_variable_sleep_interval > 0)
+	sleep(test_variable_sleep_interval);
+
+    string url_test="http://dcz.gso.uri.edu/avhrr-archive/archive.html";
+
+    val2buf(&url_test);
+
+    set_read_p(true);
+
+    return true;
+}
diff --git a/tests/TestUrl.h b/tests/TestUrl.h
new file mode 100644
index 0000000..192fb09
--- /dev/null
+++ b/tests/TestUrl.h
@@ -0,0 +1,69 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+// 
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+// 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+ 
+// (c) COPYRIGHT URI/MIT 1995-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// Interface for TestUrl type. See TestByte.h
+//
+// jhrg 1/12/95
+
+#ifndef _testurl_h
+#define _testurl_h 1
+
+
+#include "Url.h"
+#include "TestCommon.h"
+
+using namespace libdap ;
+
+class TestUrl: public Url, public TestCommon {
+    bool d_series_values;
+    void _duplicate(const TestUrl &ts);
+
+public:
+    TestUrl(const string &n);
+    TestUrl(const string &n, const string &d);
+    TestUrl(const TestUrl &rhs);
+
+    virtual ~TestUrl() {}
+
+    TestUrl &operator=(const TestUrl &rhs);
+
+    virtual BaseType *ptr_duplicate();
+    
+    virtual bool read();
+    
+    virtual void output_values(std::ostream &out);
+
+    void set_series_values(bool sv) { d_series_values = sv; }
+    bool get_series_values() { return d_series_values; }
+};
+
+#endif // _testurl_h
+
diff --git a/tests/atlocal.in b/tests/atlocal.in
new file mode 100644
index 0000000..e68e78d
--- /dev/null
+++ b/tests/atlocal.in
@@ -0,0 +1,6 @@
+# 
+# Empty file. Use this to customize shell variables, et c., passed to the 
+# autotest-generated script.
+# 
+# : ${path_to_exec=`pwd`}
+WORD_ORDER=@ac_word_order@
diff --git a/tests/das-test.cc b/tests/das-test.cc
new file mode 100644
index 0000000..4fd9339
--- /dev/null
+++ b/tests/das-test.cc
@@ -0,0 +1,376 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1994-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// Test the DAS class.
+// Read attributes from one or more files, printing the resulting table to
+// stdout. If a file is named `-' read from stdin for that file. The option
+// `-d' causes new/delete run-time debugging to be turned on.
+//
+// jhrg 7/25/94
+
+#include "config.h"
+
+#include <cstdlib>
+#include <string>
+#include <GetOpt.h>
+
+#define YYSTYPE char *
+
+#include "DAS.h"
+#include "das.tab.hh"
+#include "Error.h"
+
+using namespace libdap ;
+
+void plain_driver(DAS &das, bool deref_alias);
+void load_attr_table(AttrTable at);
+void load_attr_table_ptr(AttrTable *atp);
+void parser_driver(DAS &das, bool deref_alias, bool as_xml);
+void test_scanner();
+
+int daslex();
+
+extern int dasdebug;
+const char *prompt = "das-test: ";
+const char *version = "version 1.19";
+
+using namespace std;
+
+void
+usage(string name)
+{
+    fprintf( stderr, "usage: %s %s\n %s\n %s\n %s\n %s\n %s\n %s\n %s\n",
+		     name.c_str(),
+		     "[-v] [-s] [-d] [-c] [-p] [rx] {< in-file > out-file}",
+		     "s: Test the DAS scanner.",
+		     "p: Scan and parse from <in-file>; print to <out-file>.",
+		     "c: Test building the DAS from C++ code.",
+		     "v: Print the version of das-test and exit.",
+		     "d: Print parser debugging information.",
+		     "r: Print the DAS with aliases deReferenced.",
+		     "x: Print as xml.") ;
+}
+
+int main(int argc, char *argv[])
+{
+
+    GetOpt getopt (argc, argv, "scpvdrx");
+    int option_char;
+    bool parser_test = false;
+    bool scanner_test = false;
+    bool code_test = false;
+    bool deref_alias = false;
+    bool as_xml = false;
+    while ((option_char = getopt ()) != -1)
+	switch (option_char)
+	  {
+	    case 'p':
+	      parser_test = true;
+	      break;
+	    case 's':
+	      scanner_test = true;
+	      break;
+	    case 'c':
+	      code_test = true;
+	      break;
+	    case 'v':
+	      fprintf( stderr, "%s: %s\n", argv[0], version ) ;
+	      return 0;
+	    case 'd':
+	      dasdebug = 1;
+	      break;
+	    case 'r':
+	      deref_alias = true;
+	      break;
+	    case 'x':
+	        as_xml = true;
+	        break;
+	    case '?':
+	    default:
+	      usage(argv[0]);
+              return 1;
+	  }
+
+    DAS das;
+
+    if (!parser_test && !scanner_test && !code_test) {
+	usage(argv[0]);
+	return 1;
+    }
+
+    try {
+      if (parser_test)
+	parser_driver(das, deref_alias, as_xml);
+
+      if (scanner_test)
+	test_scanner();
+
+      if (code_test)
+	plain_driver(das, deref_alias);
+    }
+    catch (Error &e) {
+	cerr << "Caught Error object:" << endl;
+	cerr << e.get_error_message() << endl;
+	return 1;
+    }
+
+    return 0;
+}
+
+void
+test_scanner()
+{
+    int tok;
+
+    fprintf( stdout, "%s", prompt ) ; // first prompt
+    fflush( stdout ) ;
+    while ((tok = daslex())) {
+	switch (tok) {
+	  case SCAN_ATTR:
+	    fprintf( stdout, "ATTR\n" ) ;
+	    break;
+	  case SCAN_ALIAS:
+	    fprintf( stdout, "ALIAS\n" ) ;
+	    break;
+	  case SCAN_WORD:
+	    fprintf( stdout, "WORD=%s\n", daslval ) ;
+	    break;
+
+	  case SCAN_BYTE:
+	    fprintf( stdout, "BYTE\n" ) ;
+	    break;
+	  case SCAN_INT16:
+	    fprintf( stdout, "INT16\n" ) ;
+	    break;
+	  case SCAN_UINT16:
+	    fprintf( stdout, "UINT16\n" ) ;
+	    break;
+	  case SCAN_INT32:
+	    fprintf( stdout, "INT32\n" ) ;
+	    break;
+	  case SCAN_UINT32:
+	    fprintf( stdout, "UINT32\n" ) ;
+	    break;
+	  case SCAN_FLOAT32:
+	    fprintf( stdout, "FLOAT32\n" ) ;
+	    break;
+	  case SCAN_FLOAT64:
+	    fprintf( stdout, "FLOAT64\n" ) ;
+	    break;
+	  case SCAN_STRING:
+	    fprintf( stdout, "STRING\n" ) ;
+	    break;
+          case SCAN_URL:
+            fprintf( stdout, "URL\n" ) ;
+            break;
+
+          case SCAN_XML:
+            fprintf( stdout, "OtherXML\n" ) ;
+            break;
+
+	  case '{':
+	    fprintf( stdout, "Left Brace\n" ) ;
+	    break;
+	  case '}':
+	    fprintf( stdout, "Right Brace\n" ) ;
+	    break;
+	  case ';':
+	    fprintf( stdout, "Semicolon\n" ) ;
+	    break;
+	  case ',':
+	    fprintf( stdout, "Comma\n" ) ;
+	    break;
+
+	  default:
+	    fprintf( stdout, "Error: Unrecognized input\n" ) ;
+	    break;
+	}
+	fprintf( stdout, "%s", prompt ) ; // print prompt after output
+	fflush( stdout ) ;
+    }
+}
+
+
+void
+parser_driver(DAS &das, bool deref_alias, bool as_xml)
+{
+    das.parse();
+
+    if (as_xml) {
+        das.get_top_level_attributes()->print_xml(stdout, "    ");
+    }
+    else
+        das.print(stdout, deref_alias);
+}
+
+// Given a DAS, add some stuff to it.
+
+void
+plain_driver(DAS &das, bool deref_alias)
+{
+    string name = "test";
+    AttrTable *atp = new AttrTable;
+    load_attr_table_ptr(atp);
+#if 0
+    AttrTable *dummy = das.get_table(name);
+#endif
+    das.add_table(name, atp);
+
+    name = "test2";
+    atp = new AttrTable;
+    load_attr_table_ptr(atp);
+    das.add_table(name, atp);
+
+    das.print(stdout, deref_alias);
+}
+
+// stuff an AttrTable full of values. Also, print it out.
+
+void
+load_attr_table(AttrTable at)
+{
+    at.append_attr("month", "String", "Feb");
+    at.append_attr("month", "String", "Feb");
+
+    at.append_attr("month_a", "String", "Jan");
+    at.append_attr("month_a", "String", "Feb");
+    at.append_attr("month_a", "String", "Mar");
+
+    at.append_attr("Date", "Int32", "12345");
+    at.append_attr("day", "Int32", "01");
+    at.append_attr("Time", "Float64", "3.1415");
+
+    fprintf( stdout, "Using the iterator:\n" ) ;
+    for (AttrTable::Attr_iter p2 = at.attr_begin(); p2 != at.attr_end(); p2++)
+    {
+		fprintf( stdout, "%s %s ", at.get_name(p2).c_str(),
+			at.get_type(p2).c_str() ) ;
+		for (unsigned i = 0; i < at.get_attr_num(p2); ++i)
+			fprintf( stdout, "%s ", at.get_attr(p2, i).c_str() ) ;
+		fprintf( stdout, "\n" ) ;
+    }
+
+    string name = "month";
+    fprintf( stdout, "Using String: %s %s %s\n",
+		     at.get_type(name).c_str(),
+		     at.get_attr(name, 0).c_str(),
+		     at.get_attr(name, 1).c_str()) ;
+    fprintf( stdout, "Using char *: %s %s %s\n",
+		     at.get_type("month").c_str(),
+		     at.get_attr("month", 0).c_str(),
+		     at.get_attr("month", 1).c_str() ) ;
+
+    at.del_attr("month");
+
+    fprintf( stdout, "After deletion:\n" ) ;
+    for (AttrTable::Attr_iter p3 = at.attr_begin(); p3 != at.attr_end(); p3++)
+    {
+		fprintf( stdout, "%s %s ", at.get_name(p3).c_str(),
+			at.get_type(p3).c_str() ) ;
+		for (unsigned i = 0; i < at.get_attr_num(p3); ++i)
+			fprintf( stdout, "%s ", at.get_attr(p3, i).c_str() ) ;
+		fprintf( stdout, "\n" ) ;
+    }
+
+    at.print(stdout);
+
+    fprintf( stdout, "After print:\n" ) ;
+    for (AttrTable::Attr_iter p4 = at.attr_begin(); p4 != at.attr_end(); p4++)
+    {
+	fprintf( stdout, "%s %s ", at.get_name(p4).c_str(),
+		at.get_type(p4).c_str() ) ;
+	for (unsigned i = 0; i < at.get_attr_num(p4); ++i)
+	     fprintf( stdout, "%s ", at.get_attr(p4, i).c_str() ) ;
+	fprintf( stdout, "\n" ) ;
+    }
+}
+
+// OK, now try it with a dymanic AttrTable
+
+void
+load_attr_table_ptr(AttrTable *at)
+{
+    at->append_attr("month", "String", "Feb");
+    at->append_attr("month", "String", "Feb");
+
+    at->append_attr("month_a", "String", "Jan");
+    at->append_attr("month_a", "String", "Feb");
+    at->append_attr("month_a", "String", "Mar");
+
+    at->append_attr("Date", "Int32", "12345");
+    at->append_attr("day", "Int32", "01");
+    at->append_attr("Time", "Float64", "3.1415");
+
+    fprintf( stdout, "Using the iterator:\n" ) ;
+    for (AttrTable::Attr_iter p2 = at->attr_begin(); p2 != at->attr_end(); p2++)
+    {
+		fprintf( stdout, "%s %s ", at->get_name(p2).c_str(),
+			at->get_type(p2).c_str() ) ;
+		for (unsigned i = 0; i < at->get_attr_num(p2); ++i)
+			fprintf( stdout, "%s ", at->get_attr(p2, i).c_str() ) ;
+		fprintf( stdout, "\n" ) ;
+    }
+
+    string name = "month";
+    fprintf( stdout, "Using String: %s %s %s\n",
+		     at->get_type(name).c_str(),
+		     at->get_attr(name, 0).c_str(),
+		     at->get_attr(name, 1).c_str() ) ;
+    fprintf( stdout, "Using char *: %s %s %s\n",
+		     at->get_type("month").c_str(),
+		     at->get_attr("month", 0).c_str(),
+		     at->get_attr("month", 1).c_str() ) ;
+
+    at->del_attr("month");
+
+    fprintf( stdout, "After deletion:\n" ) ;
+    for (AttrTable::Attr_iter p3 = at->attr_begin(); p3 != at->attr_end(); p3++)
+    {
+		fprintf( stdout, "%s %s ", at->get_name(p3).c_str(),
+			at->get_type(p3).c_str() ) ;
+		for (unsigned i = 0; i < at->get_attr_num(p3); ++i)
+			fprintf( stdout, "%s ", at->get_attr(p3, i).c_str() ) ;
+		fprintf( stdout, "\n" ) ;
+    }
+
+    at->print(stdout);
+
+    fprintf( stdout, "After print:\n" ) ;
+    for (AttrTable::Attr_iter p4 = at->attr_begin(); p4 !=at->attr_end(); p4++)
+    {
+		fprintf( stdout, "%s %s ", at->get_name(p4).c_str(),
+			at->get_type(p4).c_str() ) ;
+		for (unsigned i = 0; i < at->get_attr_num(p4); ++i)
+			fprintf( stdout, "%s ", at->get_attr(p4, i).c_str() ) ;
+		fprintf( stdout, "\n" ) ;
+    }
+}
+
diff --git a/tests/das-testsuite/bad_value_test.1.das b/tests/das-testsuite/bad_value_test.1.das
new file mode 100644
index 0000000..a2de533
--- /dev/null
+++ b/tests/das-testsuite/bad_value_test.1.das
@@ -0,0 +1,12 @@
+Attributes {
+    bad_values {
+	Byte x 257;
+	Int16 y 60000;
+	UInt16 z 70000;
+	Int32 a 2147483648;
+	UInt32 b 4294967296;
+
+	Float32 c 3.5E+38;
+	Float64 d 1.8E+308;
+    }
+}
diff --git a/tests/das-testsuite/bad_value_test.1.das.base b/tests/das-testsuite/bad_value_test.1.das.base
new file mode 100644
index 0000000..bc27c9a
--- /dev/null
+++ b/tests/das-testsuite/bad_value_test.1.das.base
@@ -0,0 +1,20 @@
+Attributes {
+    bad_values {
+        bad_values_dods_errors {
+            Byte x 257;
+            String x_explanation "`257' is not a Byte value.";
+            Int16 y 60000;
+            String y_explanation "`60000' is not an Int16 value.";
+            UInt16 z 70000;
+            String z_explanation "`70000' is not an UInt16 value.";
+            Int32 a 2147483648;
+            String a_explanation "`2147483648' is not an Int32 value.";
+            UInt32 b 4294967296;
+            String b_explanation "`4294967296' is not an UInt32 value.";
+            Float32 c 3.5E+38;
+            String c_explanation "`3.5E+38' is not a Float32 value.";
+            Float64 d 1.8E+308;
+            String d_explanation "`1.8E+308' is not a Float64 value.";
+        }
+    }
+}
diff --git a/tests/das-testsuite/das.das b/tests/das-testsuite/das.das
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tests/das-testsuite/das.das
diff --git a/tests/das-testsuite/das.das.base b/tests/das-testsuite/das.das.base
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tests/das-testsuite/das.das.base
diff --git a/tests/das-testsuite/special.test.das b/tests/das-testsuite/special.test.das
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tests/das-testsuite/special.test.das
diff --git a/tests/das-testsuite/special.test.das.base b/tests/das-testsuite/special.test.das.base
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tests/das-testsuite/special.test.das.base
diff --git a/tests/das-testsuite/special.test.hdf.das b/tests/das-testsuite/special.test.hdf.das
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tests/das-testsuite/special.test.hdf.das
diff --git a/tests/das-testsuite/special.test.hdf.das.base b/tests/das-testsuite/special.test.hdf.das.base
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tests/das-testsuite/special.test.hdf.das.base
diff --git a/tests/das-testsuite/test.1.das b/tests/das-testsuite/test.1.das
new file mode 100644
index 0000000..32c9c4d
--- /dev/null
+++ b/tests/das-testsuite/test.1.das
@@ -0,0 +1,6 @@
+Attributes{
+    DODS_GLOBAL {
+	String About "This is used to test find_ancillary_das()";
+    }
+}
+
diff --git a/tests/das-testsuite/test.1.das.base b/tests/das-testsuite/test.1.das.base
new file mode 100644
index 0000000..a2e14c3
--- /dev/null
+++ b/tests/das-testsuite/test.1.das.base
@@ -0,0 +1,5 @@
+Attributes {
+    DODS_GLOBAL {
+        String About "This is used to test find_ancillary_das()";
+    }
+}
diff --git a/tests/das-testsuite/test.1.gz b/tests/das-testsuite/test.1.gz
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tests/das-testsuite/test.1.gz
diff --git a/tests/das-testsuite/test.11.das b/tests/das-testsuite/test.11.das
new file mode 100644
index 0000000..94bb19e
--- /dev/null
+++ b/tests/das-testsuite/test.11.das
@@ -0,0 +1,15 @@
+
+# -*- Perl -*-
+# test all sorts of numbers (do they all parse correctly?)
+
+Attributes {
+    test {
+	String names this, is, a, vector, of, strings;
+	Byte b 1, 0, 127, 255;
+	Int32 int_vec 1, 2, 2147483647; # nearly the bigest int32 allowed
+	Float64 float_vec 1.0, -1.0, +1.0, 0.2, -0.2, +0.2, .3, -.3, +.3,
+	                  -3.1415, -3.1415e-99, -3.1415e+99, +3.1415e-99,
+	                  -3., +2., 4.; # big float vector
+        Url where http://bozo.place.com/home.html;
+    }
+}
diff --git a/tests/das-testsuite/test.11.das.base b/tests/das-testsuite/test.11.das.base
new file mode 100644
index 0000000..c370f61
--- /dev/null
+++ b/tests/das-testsuite/test.11.das.base
@@ -0,0 +1,9 @@
+Attributes {
+    test {
+        String names "this", "is", "a", "vector", "of", "strings";
+        Byte b 1, 0, 127, 255;
+        Int32 int_vec 1, 2, 2147483647;
+        Float64 float_vec 1.0, -1.0, +1.0, 0.2, -0.2, +0.2, .3, -.3, +.3, -3.1415, -3.1415e-99, -3.1415e+99, +3.1415e-99, -3., +2., 4.;
+        Url where http://bozo.place.com/home.html;
+    }
+}
diff --git a/tests/das-testsuite/test.12.das b/tests/das-testsuite/test.12.das
new file mode 100644
index 0000000..830c23b
--- /dev/null
+++ b/tests/das-testsuite/test.12.das
@@ -0,0 +1,8 @@
+
+# test for bad floating point values
+
+Attributes {
+    var1 {
+        Float64 f1 3.0.0;
+    }
+}
diff --git a/tests/das-testsuite/test.12.das.base b/tests/das-testsuite/test.12.das.base
new file mode 100644
index 0000000..6408611
--- /dev/null
+++ b/tests/das-testsuite/test.12.das.base
@@ -0,0 +1,8 @@
+Attributes {
+    var1 {
+        var1_dods_errors {
+            Float64 f1 3.0.0;
+            String f1_explanation "`3.0.0' is not a Float64 value.";
+        }
+    }
+}
diff --git a/tests/das-testsuite/test.13.das b/tests/das-testsuite/test.13.das
new file mode 100644
index 0000000..4f6d891
--- /dev/null
+++ b/tests/das-testsuite/test.13.das
@@ -0,0 +1,8 @@
+
+# more float testing
+
+Attributes {
+    var1 {
+        Float64 f1 -3..0;
+    }
+}
diff --git a/tests/das-testsuite/test.13.das.base b/tests/das-testsuite/test.13.das.base
new file mode 100644
index 0000000..7100705
--- /dev/null
+++ b/tests/das-testsuite/test.13.das.base
@@ -0,0 +1,8 @@
+Attributes {
+    var1 {
+        var1_dods_errors {
+            Float64 f1 -3..0;
+            String f1_explanation "`-3..0' is not a Float64 value.";
+        }
+    }
+}
diff --git a/tests/das-testsuite/test.14.das b/tests/das-testsuite/test.14.das
new file mode 100644
index 0000000..0dd134d
--- /dev/null
+++ b/tests/das-testsuite/test.14.das
@@ -0,0 +1,8 @@
+
+# still more ... This should work
+
+Attributes {
+    var1 {
+        Float64 f1 3;
+    }
+}
\ No newline at end of file
diff --git a/tests/das-testsuite/test.14.das.base b/tests/das-testsuite/test.14.das.base
new file mode 100644
index 0000000..679394c
--- /dev/null
+++ b/tests/das-testsuite/test.14.das.base
@@ -0,0 +1,5 @@
+Attributes {
+    var1 {
+        Float64 f1 3;
+    }
+}
diff --git a/tests/das-testsuite/test.15.das b/tests/das-testsuite/test.15.das
new file mode 100644
index 0000000..336ec02
--- /dev/null
+++ b/tests/das-testsuite/test.15.das
@@ -0,0 +1,8 @@
+
+# floats as ints; should not work
+
+Attributes {
+    var1 {
+        Int32 i1 3.0;
+    }
+}
diff --git a/tests/das-testsuite/test.15.das.base b/tests/das-testsuite/test.15.das.base
new file mode 100644
index 0000000..bbf1002
--- /dev/null
+++ b/tests/das-testsuite/test.15.das.base
@@ -0,0 +1,8 @@
+Attributes {
+    var1 {
+        var1_dods_errors {
+            Int32 i1 3.0;
+            String i1_explanation "`3.0' is not an Int32 value.";
+        }
+    }
+}
diff --git a/tests/das-testsuite/test.16.das b/tests/das-testsuite/test.16.das
new file mode 100644
index 0000000..14bf10c
--- /dev/null
+++ b/tests/das-testsuite/test.16.das
@@ -0,0 +1,13 @@
+
+# Test variable redefinition error
+
+Attributes {
+    var1 {
+        Int32 i 1;
+	Float64 i 10.8; # this is an error since `i' is already an Int32
+	Float64 j 100.98;
+    }
+    var2 {
+	 Float64 i 1.8; # not an error; different variable
+    }
+}
diff --git a/tests/das-testsuite/test.16.das.base b/tests/das-testsuite/test.16.das.base
new file mode 100644
index 0000000..7eb080f
--- /dev/null
+++ b/tests/das-testsuite/test.16.das.base
@@ -0,0 +1,3 @@
+Caught Error object:
+Error parsing the text on line 7
+An attribute called `i' already exists but is of a different type
diff --git a/tests/das-testsuite/test.17.das b/tests/das-testsuite/test.17.das
new file mode 100644
index 0000000..4fcc8dc
--- /dev/null
+++ b/tests/das-testsuite/test.17.das
@@ -0,0 +1,13 @@
+
+# -*- Perl -*-
+# byte values that should not parse, in various ways...
+
+Attributes {
+    test {
+	Byte b "this is not a byte";
+	byte c -256;
+	byte d 255;		# This on is OK; 4/5/96 NO, see dods-limits.h
+	byte e 2550;
+	byte f 2.55;
+    }
+}
diff --git a/tests/das-testsuite/test.17.das.base b/tests/das-testsuite/test.17.das.base
new file mode 100644
index 0000000..44314c5
--- /dev/null
+++ b/tests/das-testsuite/test.17.das.base
@@ -0,0 +1,15 @@
+Attributes {
+    test {
+        test_dods_errors {
+            Byte b "this is not a byte";
+            String b_explanation "`"this is not a byte"' is not a Byte value.";
+            Byte c -256;
+            String c_explanation "`-256' is not a Byte value.";
+            Byte e 2550;
+            String e_explanation "`2550' is not a Byte value.";
+            Byte f 2.55;
+            String f_explanation "`2.55' is not a Byte value.";
+        }
+        Byte d 255;
+    }
+}
diff --git a/tests/das-testsuite/test.18.das b/tests/das-testsuite/test.18.das
new file mode 100644
index 0000000..99cf481
--- /dev/null
+++ b/tests/das-testsuite/test.18.das
@@ -0,0 +1,10 @@
+
+# -*- Perl -*-
+# byte values that should not parse, in various ways...
+
+Attributes {
+    test {
+	Float32 f 2.55;
+	Int16 x 6535;
+    }
+}
diff --git a/tests/das-testsuite/test.18.das.base b/tests/das-testsuite/test.18.das.base
new file mode 100644
index 0000000..e4109dd
--- /dev/null
+++ b/tests/das-testsuite/test.18.das.base
@@ -0,0 +1,6 @@
+Attributes {
+    test {
+        Float32 f 2.55;
+        Int16 x 6535;
+    }
+}
diff --git a/tests/das-testsuite/test.19.das b/tests/das-testsuite/test.19.das
new file mode 100644
index 0000000..b732fce
--- /dev/null
+++ b/tests/das-testsuite/test.19.das
@@ -0,0 +1,10 @@
+
+# -*- Perl -*-
+# byte values that should not parse, in various ways...
+
+Attributes {
+    test {
+	Float64 f 2.55E-300;
+	Float32 g 2.55E-300;
+    }
+}
diff --git a/tests/das-testsuite/test.19.das.base b/tests/das-testsuite/test.19.das.base
new file mode 100644
index 0000000..1595f3e
--- /dev/null
+++ b/tests/das-testsuite/test.19.das.base
@@ -0,0 +1,9 @@
+Attributes {
+    test {
+        Float64 f 2.55E-300;
+        test_dods_errors {
+            Float32 g 2.55E-300;
+            String g_explanation "`2.55E-300' is not a Float32 value.";
+        }
+    }
+}
diff --git a/tests/das-testsuite/test.1a.das b/tests/das-testsuite/test.1a.das
new file mode 100644
index 0000000..01f7a42
--- /dev/null
+++ b/tests/das-testsuite/test.1a.das
@@ -0,0 +1,54 @@
+
+
+#  -*- C++ -*-
+#
+#    This is a test of the das scanner and parser software. This file tests
+#    comments, attribute lists with missing parts, and multiple attribute
+#    lists (they should all coalesce into one attribute table.
+
+attributes {# weird
+    var1 {#test
+    	string name bob;	# bob is the only name allowed
+	string type human;	# for people ... 
+	int32 age 19;
+    }
+    var2 {
+	string name joe;
+	string type dog;   
+	int32 age 8;
+    }
+}   
+
+# This is a C++ type comment.
+# The scanner and parser should handle a text file with several
+# attribute-definintion sections.
+
+Attributes {
+    var3 {
+    	int32 size 8;
+	string color red;
+	string type art;
+    }
+    var4 {
+    }
+}
+
+ATTRIBUTES {
+    var5 {
+    	string height 5.0in.;
+	string units inches;
+	float64 max 5.0;
+    }
+}
+
+attributes {
+}
+
+attributes {
+    var5 {
+	string weight 100lbs;
+	string color red;
+    }
+}
+#
+# EOF must be at the end of this line (not on the line after)
\ No newline at end of file
diff --git a/tests/das-testsuite/test.1a.das.base b/tests/das-testsuite/test.1a.das.base
new file mode 100644
index 0000000..b066085
--- /dev/null
+++ b/tests/das-testsuite/test.1a.das.base
@@ -0,0 +1,26 @@
+Attributes {
+    var1 {
+        String name "bob";
+        String type "human";
+        Int32 age 19;
+    }
+    var2 {
+        String name "joe";
+        String type "dog";
+        Int32 age 8;
+    }
+    var3 {
+        Int32 size 8;
+        String color "red";
+        String type "art";
+    }
+    var4 {
+    }
+    var5 {
+        String height "5.0in.";
+        String units "inches";
+        Float64 max 5.0;
+        String weight "100lbs";
+        String color "red";
+    }
+}
diff --git a/tests/das-testsuite/test.2.das b/tests/das-testsuite/test.2.das
new file mode 100644
index 0000000..6f3158b
--- /dev/null
+++ b/tests/das-testsuite/test.2.das
@@ -0,0 +1,8 @@
+attributes {
+    a {
+	string b c;
+	string d 4;
+    }
+}
+
+# single letter ID's and EOF w/o a preceding return
diff --git a/tests/das-testsuite/test.2.das.base b/tests/das-testsuite/test.2.das.base
new file mode 100644
index 0000000..32d8dcf
--- /dev/null
+++ b/tests/das-testsuite/test.2.das.base
@@ -0,0 +1,6 @@
+Attributes {
+    a {
+        String b "c";
+        String d "4";
+    }
+}
\ No newline at end of file
diff --git a/tests/das-testsuite/test.20.das b/tests/das-testsuite/test.20.das
new file mode 100644
index 0000000..5e41993
--- /dev/null
+++ b/tests/das-testsuite/test.20.das
@@ -0,0 +1,10 @@
+
+# -*- Perl -*-
+# byte values that should not parse, in various ways...
+
+Attributes {
+    test {
+	Int32 x 70000;
+	Int16 y 80000;
+    }
+}
diff --git a/tests/das-testsuite/test.20.das.base b/tests/das-testsuite/test.20.das.base
new file mode 100644
index 0000000..1b7a81a
--- /dev/null
+++ b/tests/das-testsuite/test.20.das.base
@@ -0,0 +1,9 @@
+Attributes {
+    test {
+        Int32 x 70000;
+        test_dods_errors {
+            Int16 y 80000;
+            String y_explanation "`80000' is not an Int16 value.";
+        }
+    }
+}
diff --git a/tests/das-testsuite/test.21.das b/tests/das-testsuite/test.21.das
new file mode 100644
index 0000000..da6c8d2
--- /dev/null
+++ b/tests/das-testsuite/test.21.das
@@ -0,0 +1,10 @@
+
+# -*- Perl -*-
+# byte values that should not parse, in various ways...
+
+Attributes {
+    test {
+	Float64 f 2.55E300;
+	Float32 g 2.55E300;
+    }
+}
diff --git a/tests/das-testsuite/test.21.das.base b/tests/das-testsuite/test.21.das.base
new file mode 100644
index 0000000..417c70b
--- /dev/null
+++ b/tests/das-testsuite/test.21.das.base
@@ -0,0 +1,9 @@
+Attributes {
+    test {
+        Float64 f 2.55E300;
+        test_dods_errors {
+            Float32 g 2.55E300;
+            String g_explanation "`2.55E300' is not a Float32 value.";
+        }
+    }
+}
diff --git a/tests/das-testsuite/test.22.das b/tests/das-testsuite/test.22.das
new file mode 100644
index 0000000..7ba6c8d
--- /dev/null
+++ b/tests/das-testsuite/test.22.das
@@ -0,0 +1,9 @@
+
+# -*- Perl -*-
+# byte values that should not parse, in various ways...
+
+Attributes {
+    test {
+	Float64 f 2.55E400;
+    }
+}
diff --git a/tests/das-testsuite/test.22.das.base b/tests/das-testsuite/test.22.das.base
new file mode 100644
index 0000000..22da1d3
--- /dev/null
+++ b/tests/das-testsuite/test.22.das.base
@@ -0,0 +1,8 @@
+Attributes {
+    test {
+        test_dods_errors {
+            Float64 f 2.55E400;
+            String f_explanation "`2.55E400' is not a Float64 value.";
+        }
+    }
+}
diff --git a/tests/das-testsuite/test.23.das b/tests/das-testsuite/test.23.das
new file mode 100644
index 0000000..4146e5f
--- /dev/null
+++ b/tests/das-testsuite/test.23.das
@@ -0,0 +1,13 @@
+# -*- perl -*-
+#
+# Test aliases
+
+Attributes {
+    var1 {
+        Int32 x 14;
+	Int32 y 15, 16, 17;
+    }
+    
+    # Alias `var2' to the existing `var1'.
+    Alias var2 var1;
+}
\ No newline at end of file
diff --git a/tests/das-testsuite/test.23.das.base b/tests/das-testsuite/test.23.das.base
new file mode 100644
index 0000000..b52482f
--- /dev/null
+++ b/tests/das-testsuite/test.23.das.base
@@ -0,0 +1,7 @@
+Attributes {
+    var1 {
+        Int32 x 14;
+        Int32 y 15, 16, 17;
+    }
+    Alias var2 var1;
+}
diff --git a/tests/das-testsuite/test.24.das b/tests/das-testsuite/test.24.das
new file mode 100644
index 0000000..a535fa8
--- /dev/null
+++ b/tests/das-testsuite/test.24.das
@@ -0,0 +1,17 @@
+# -*- perl -*-
+#
+# Test aliases
+
+Attributes {
+    var1 {
+        Int32 x 14;
+	Int32 y 15, 16, 17;
+	component1 {
+	    Float64 g 6.02e23;
+	    String name "A part of the whole";
+	}
+    }
+    
+    # Alias `var2' to the existing `var1.component'.
+    Alias component2 var1.component1;
+}
diff --git a/tests/das-testsuite/test.24.das.base b/tests/das-testsuite/test.24.das.base
new file mode 100644
index 0000000..b86511d
--- /dev/null
+++ b/tests/das-testsuite/test.24.das.base
@@ -0,0 +1,11 @@
+Attributes {
+    var1 {
+        Int32 x 14;
+        Int32 y 15, 16, 17;
+        component1 {
+            Float64 g 6.02e23;
+            String name "A part of the whole";
+        }
+    }
+    Alias component2 component1;
+}
diff --git a/tests/das-testsuite/test.25.das b/tests/das-testsuite/test.25.das
new file mode 100644
index 0000000..5b4cc45
--- /dev/null
+++ b/tests/das-testsuite/test.25.das
@@ -0,0 +1,17 @@
+# -*- perl -*-
+#
+# Test aliases
+
+Attributes {
+    var1 {
+        Int32 x 14;
+	Int32 y 15, 16, 17;
+	component1 {
+	    Float64 g 6.02e23;
+	    String name "A part of the whole";
+	}
+    }
+    
+    # Alias `name' to the existing `var1.component1.name'.
+    Alias name var1.component1.name;
+}
\ No newline at end of file
diff --git a/tests/das-testsuite/test.25.das.base b/tests/das-testsuite/test.25.das.base
new file mode 100644
index 0000000..2269c28
--- /dev/null
+++ b/tests/das-testsuite/test.25.das.base
@@ -0,0 +1,4 @@
+Caught Error object:
+Error parsing the text on line 16
+A value cannot be aliased to the top level of the DAS;
+Only containers may be present at that level of the DAS.
\ No newline at end of file
diff --git a/tests/das-testsuite/test.26.das b/tests/das-testsuite/test.26.das
new file mode 100644
index 0000000..63da382
--- /dev/null
+++ b/tests/das-testsuite/test.26.das
@@ -0,0 +1,15 @@
+# -*- perl -*-
+#
+# Test aliases
+
+Attributes {
+    var1 {
+        Int32 x 14;
+	Int32 y 15, 16, 17;
+	alias z x;
+	component1 {
+	    Float64 g 6.02e23;
+	    String name "A part of the whole";
+	}
+    }
+}
\ No newline at end of file
diff --git a/tests/das-testsuite/test.26.das.base b/tests/das-testsuite/test.26.das.base
new file mode 100644
index 0000000..2c48323
--- /dev/null
+++ b/tests/das-testsuite/test.26.das.base
@@ -0,0 +1,11 @@
+Attributes {
+    var1 {
+        Int32 x 14;
+        Int32 y 15, 16, 17;
+        Alias z x;
+        component1 {
+            Float64 g 6.02e23;
+            String name "A part of the whole";
+        }
+    }
+}
diff --git a/tests/das-testsuite/test.27.das b/tests/das-testsuite/test.27.das
new file mode 100644
index 0000000..81be287
--- /dev/null
+++ b/tests/das-testsuite/test.27.das
@@ -0,0 +1,15 @@
+# -*- perl -*-
+#
+# Test aliases
+
+Attributes {
+    var1 {
+        Int32 x 14;
+	Int32 y 15, 16, 17;
+	component1 {
+	    Float64 g 6.02e23;
+	    String name "A part of the whole";
+	}
+	Alias new_name component1;
+    }
+}
\ No newline at end of file
diff --git a/tests/das-testsuite/test.27.das.base b/tests/das-testsuite/test.27.das.base
new file mode 100644
index 0000000..081f540
--- /dev/null
+++ b/tests/das-testsuite/test.27.das.base
@@ -0,0 +1,11 @@
+Attributes {
+    var1 {
+        Int32 x 14;
+        Int32 y 15, 16, 17;
+        component1 {
+            Float64 g 6.02e23;
+            String name "A part of the whole";
+        }
+        Alias new_name component1;
+    }
+}
diff --git a/tests/das-testsuite/test.28.das b/tests/das-testsuite/test.28.das
new file mode 100644
index 0000000..3c227c9
--- /dev/null
+++ b/tests/das-testsuite/test.28.das
@@ -0,0 +1,16 @@
+# -*- perl -*-
+#
+# Test aliases
+
+Attributes {
+    var1 {
+        Int32 x 14;
+	Int32 y 15, 16, 17;
+	component1 {
+	    Float64 g 6.02e23;
+	    String name "A part of the whole";
+	}
+	
+	Alias z component1.g;
+    }
+}
\ No newline at end of file
diff --git a/tests/das-testsuite/test.28.das.base b/tests/das-testsuite/test.28.das.base
new file mode 100644
index 0000000..b9a4194
--- /dev/null
+++ b/tests/das-testsuite/test.28.das.base
@@ -0,0 +1,11 @@
+Attributes {
+    var1 {
+        Int32 x 14;
+        Int32 y 15, 16, 17;
+        component1 {
+            Float64 g 6.02e23;
+            String name "A part of the whole";
+        }
+        Alias z component1.g;
+    }
+}
diff --git a/tests/das-testsuite/test.29.das b/tests/das-testsuite/test.29.das
new file mode 100644
index 0000000..d0e4071
--- /dev/null
+++ b/tests/das-testsuite/test.29.das
@@ -0,0 +1,16 @@
+# -*- perl -*-
+#
+# Test aliases
+
+Attributes {
+    var1 {
+        Int32 x 14;
+	Int32 y 15, 16, 17;
+	component1 {
+	    Float64 g 6.02e23;
+	    String name "A part of the whole";
+	}
+    }
+    # This should fail since var1.comp does not exist.
+    alias var2 var1.comp;
+}
\ No newline at end of file
diff --git a/tests/das-testsuite/test.29.das.base b/tests/das-testsuite/test.29.das.base
new file mode 100644
index 0000000..a7e400b
--- /dev/null
+++ b/tests/das-testsuite/test.29.das.base
@@ -0,0 +1,3 @@
+Caught Error object:
+Error parsing the text on line 15
+Could not find the attribute `var1.comp' in the attribute object.
diff --git a/tests/das-testsuite/test.3.Z b/tests/das-testsuite/test.3.Z
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tests/das-testsuite/test.3.Z
diff --git a/tests/das-testsuite/test.3.Z.das b/tests/das-testsuite/test.3.Z.das
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tests/das-testsuite/test.3.Z.das
diff --git a/tests/das-testsuite/test.3.Z.das.base b/tests/das-testsuite/test.3.Z.das.base
new file mode 100644
index 0000000..bbcf63d
--- /dev/null
+++ b/tests/das-testsuite/test.3.Z.das.base
@@ -0,0 +1,4 @@
+Caught Error object:
+Error parsing the text on line 1
+The attribute object returned from the dataset was null
+Check that the URL is correct.
diff --git a/tests/das-testsuite/test.3.das b/tests/das-testsuite/test.3.das
new file mode 100644
index 0000000..294a21b
--- /dev/null
+++ b/tests/das-testsuite/test.3.das
@@ -0,0 +1,12 @@
+
+#  Test Quotes.
+
+Attributes {
+    var1 {
+	string comment "One thing about these long comments is that they
+might cause problems with memory - overwrites, ...";
+	string comment2 "This quote tests a \"quote within a quote\", he said";
+	string quote1 "\"";		# tricky
+	string quote2 "\7 seven";
+    }
+}
diff --git a/tests/das-testsuite/test.3.das.base b/tests/das-testsuite/test.3.das.base
new file mode 100644
index 0000000..d7ec9e6
--- /dev/null
+++ b/tests/das-testsuite/test.3.das.base
@@ -0,0 +1,9 @@
+Attributes {
+    var1 {
+        String comment "One thing about these long comments is that they
+might cause problems with memory - overwrites, ...";
+        String comment2 "This quote tests a \"quote within a quote\", he said";
+        String quote1 "\"";
+        String quote2 "\7 seven";
+    }
+}
diff --git a/tests/das-testsuite/test.30.das b/tests/das-testsuite/test.30.das
new file mode 100644
index 0000000..5b4bdfa
--- /dev/null
+++ b/tests/das-testsuite/test.30.das
@@ -0,0 +1,17 @@
+# -*- perl -*-
+#
+# Test aliases
+
+Attributes {
+    var1 {
+        Int32 x 14;
+	Int32 y 15, 16, 17;
+	component1 {
+	    Float64 g 6.02e23;
+	    String name "A part of the whole";
+	}
+	
+	# This should fail.
+	Alias z comp.g;
+    }
+}
\ No newline at end of file
diff --git a/tests/das-testsuite/test.30.das.base b/tests/das-testsuite/test.30.das.base
new file mode 100644
index 0000000..bba2b45
--- /dev/null
+++ b/tests/das-testsuite/test.30.das.base
@@ -0,0 +1,3 @@
+Caught Error object:
+Error parsing the text on line 15
+Could not find the attribute `comp.g' in the attribute object.
diff --git a/tests/das-testsuite/test.31.das b/tests/das-testsuite/test.31.das
new file mode 100644
index 0000000..9ff5bb5
--- /dev/null
+++ b/tests/das-testsuite/test.31.das
@@ -0,0 +1,20 @@
+# -*- perl -*-
+#
+# Test aliases
+
+Attributes {
+    var1 {
+        Int32 x 14;
+	Int32 y 15, 16, 17;
+	component1 {
+	    Float64 g 6.02e23;
+	    String name "A part of the whole";
+	    inner_component {
+		String tag "xyz123";
+		URL my_url "http://dcz.dods.org/";
+	    }
+	}
+	
+	Alias url_info var1.component1.inner_component;
+    }
+}
diff --git a/tests/das-testsuite/test.31.das.base b/tests/das-testsuite/test.31.das.base
new file mode 100644
index 0000000..2ca02d2
--- /dev/null
+++ b/tests/das-testsuite/test.31.das.base
@@ -0,0 +1,15 @@
+Attributes {
+    var1 {
+        Int32 x 14;
+        Int32 y 15, 16, 17;
+        component1 {
+            Float64 g 6.02e23;
+            String name "A part of the whole";
+            inner_component {
+                String tag "xyz123";
+                Url my_url "http://dcz.dods.org/";
+            }
+        }
+        Alias url_info inner_component;
+    }
+}
diff --git a/tests/das-testsuite/test.32.das b/tests/das-testsuite/test.32.das
new file mode 100644
index 0000000..710a48c
--- /dev/null
+++ b/tests/das-testsuite/test.32.das
@@ -0,0 +1,10 @@
+# -*- perl -*-
+#
+
+Attributes {
+    var1 {
+	 Float64 g 6.02e23;
+	 Float64 h NaN;
+	 Float32 i NaN;
+    }
+}
diff --git a/tests/das-testsuite/test.32.das.base b/tests/das-testsuite/test.32.das.base
new file mode 100644
index 0000000..8a4aea9
--- /dev/null
+++ b/tests/das-testsuite/test.32.das.base
@@ -0,0 +1,7 @@
+Attributes {
+    var1 {
+        Float64 g 6.02e23;
+        Float64 h NaN;
+        Float32 i NaN;
+    }
+}
diff --git a/tests/das-testsuite/test.33.das b/tests/das-testsuite/test.33.das
new file mode 100644
index 0000000..7a6b6f7
--- /dev/null
+++ b/tests/das-testsuite/test.33.das
@@ -0,0 +1,10 @@
+# -*- perl -*-
+#
+
+Attributes {
+    var1 {
+	 Float64 Float64 6.02e23;
+	 String Url "http://www.google.com/";
+	 Url String "http://huh.com/";
+    }
+}
diff --git a/tests/das-testsuite/test.33.das.base b/tests/das-testsuite/test.33.das.base
new file mode 100644
index 0000000..94477d2
--- /dev/null
+++ b/tests/das-testsuite/test.33.das.base
@@ -0,0 +1,7 @@
+Attributes {
+    var1 {
+        Float64 Float64 6.02e23;
+        String Url "http://www.google.com/";
+        Url String "http://huh.com/";
+    }
+}
diff --git a/tests/das-testsuite/test.34.das b/tests/das-testsuite/test.34.das
new file mode 100644
index 0000000..fdeb15d
--- /dev/null
+++ b/tests/das-testsuite/test.34.das
@@ -0,0 +1,10 @@
+Attributes {
+    var1 {
+        Int32 y#z 15;
+        component1 {
+	    inner%20component {
+	        String tag "xyz123";
+	    }
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/das-testsuite/test.34.das.base b/tests/das-testsuite/test.34.das.base
new file mode 100644
index 0000000..c380864
--- /dev/null
+++ b/tests/das-testsuite/test.34.das.base
@@ -0,0 +1,10 @@
+Attributes {
+    var1 {
+        Int32 y#z 15;
+        component1 {
+            inner%20component {
+                String tag "xyz123";
+            }
+        }
+    }
+}
diff --git a/tests/das-testsuite/test.35.das b/tests/das-testsuite/test.35.das
new file mode 100644
index 0000000..51c7aae
--- /dev/null
+++ b/tests/das-testsuite/test.35.das
@@ -0,0 +1,9 @@
+Attributes {
+    var1 {
+        %25component1 {
+	    inner%20%25component {
+	        String %25tag "xyz123";
+	    }
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/das-testsuite/test.35.das.base b/tests/das-testsuite/test.35.das.base
new file mode 100644
index 0000000..ed6b6b4
--- /dev/null
+++ b/tests/das-testsuite/test.35.das.base
@@ -0,0 +1,9 @@
+Attributes {
+    var1 {
+        %25component1 {
+            inner%20%25component {
+                String %25tag "xyz123";
+            }
+        }
+    }
+}
diff --git a/tests/das-testsuite/test.4.das b/tests/das-testsuite/test.4.das
new file mode 100644
index 0000000..e3b3e92
--- /dev/null
+++ b/tests/das-testsuite/test.4.das
@@ -0,0 +1,8 @@
+# This should work (now, it used to generate an error because `attributes'
+# is a reserved word.
+attributes {
+    a {
+	string b c;
+	int32 attributes 4;
+    }
+}
diff --git a/tests/das-testsuite/test.4.das.base b/tests/das-testsuite/test.4.das.base
new file mode 100644
index 0000000..398c0a4
--- /dev/null
+++ b/tests/das-testsuite/test.4.das.base
@@ -0,0 +1,6 @@
+Attributes {
+    a {
+        String b "c";
+        Int32 attributes 4;
+    }
+}
diff --git a/tests/das-testsuite/test.5.das b/tests/das-testsuite/test.5.das
new file mode 100644
index 0000000..04648c4
--- /dev/null
+++ b/tests/das-testsuite/test.5.das
@@ -0,0 +1,9 @@
+# Test unterminated quote
+
+attributes {
+    var10 {
+	string attr woof;
+	string quote "this quote has no end;
+    }
+}
+
diff --git a/tests/das-testsuite/test.5.das.base b/tests/das-testsuite/test.5.das.base
new file mode 100644
index 0000000..6956b8d
--- /dev/null
+++ b/tests/das-testsuite/test.5.das.base
@@ -0,0 +1,2 @@
+Caught Error object:
+Error scanning DAS object text: Unterminated quote (starts on line 6)
diff --git a/tests/das-testsuite/test.6.das b/tests/das-testsuite/test.6.das
new file mode 100644
index 0000000..2004581
--- /dev/null
+++ b/tests/das-testsuite/test.6.das
@@ -0,0 +1,10 @@
+
+#  Test unterminated comments. Old test, should fail miserably
+
+attributes {
+    var_11 {
+	string slota val1;
+	string slotb val2; /* a bad comment
+    }
+}
+
diff --git a/tests/das-testsuite/test.6.das.base b/tests/das-testsuite/test.6.das.base
new file mode 100644
index 0000000..9574dfa
--- /dev/null
+++ b/tests/das-testsuite/test.6.das.base
@@ -0,0 +1,4 @@
+Caught Error object:
+Error parsing the text on line 7 at or near: a
+Expected an attribute type (Byte, Int16, UInt16, Int32, UInt32, Float32,
+Float64, String or Url) followed by a name and value.
diff --git a/tests/das-testsuite/test.7.das b/tests/das-testsuite/test.7.das
new file mode 100644
index 0000000..8fab860
--- /dev/null
+++ b/tests/das-testsuite/test.7.das
@@ -0,0 +1,12 @@
+# -*- C++ -*-
+
+#  Test missing type specifier.
+
+Attributes {
+    aa {
+	int32 i 10;
+	float64 f 12.9;
+	string test test;
+	test2 my_test;
+    }
+}
diff --git a/tests/das-testsuite/test.7.das.base b/tests/das-testsuite/test.7.das.base
new file mode 100644
index 0000000..d2442b2
--- /dev/null
+++ b/tests/das-testsuite/test.7.das.base
@@ -0,0 +1,4 @@
+Caught Error object:
+Error parsing the text on line 10 at or near: my_test
+Expected an attribute type (Byte, Int16, UInt16, Int32, UInt32, Float32,
+Float64, String or Url) followed by a name and value.
diff --git a/tests/das-testsuite/test.8.das b/tests/das-testsuite/test.8.das
new file mode 100644
index 0000000..813eacf
--- /dev/null
+++ b/tests/das-testsuite/test.8.das
@@ -0,0 +1,9 @@
+#  -*- C++ -*-
+
+# Test attribute vectors.
+
+Attributes {
+    var0 {
+	String month Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Nov, Dec;
+    }
+}
diff --git a/tests/das-testsuite/test.8.das.base b/tests/das-testsuite/test.8.das.base
new file mode 100644
index 0000000..2c47367
--- /dev/null
+++ b/tests/das-testsuite/test.8.das.base
@@ -0,0 +1,5 @@
+Attributes {
+    var0 {
+        String month "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Nov", "Dec";
+    }
+}
diff --git a/tests/das-testsuite/test.9.das b/tests/das-testsuite/test.9.das
new file mode 100644
index 0000000..66b87ee
--- /dev/null
+++ b/tests/das-testsuite/test.9.das
@@ -0,0 +1,18 @@
+
+#  -*- C++ -*-
+#
+# Test attribute vectors.
+
+Attributes {
+    var1 {
+	String month Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Nov, Dec;
+    }
+    var2 {
+	String day Monday, Tuesday, Wed;
+	String month Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Nov, Dec;
+	String name bob;
+	Int32 num 10;
+	String irrational 3.1415, 2.718, 1.414;
+	Float64 irrational_numbers 3.1415, 2.718, 1.414;
+    }
+}
diff --git a/tests/das-testsuite/test.9.das.base b/tests/das-testsuite/test.9.das.base
new file mode 100644
index 0000000..668d3c8
--- /dev/null
+++ b/tests/das-testsuite/test.9.das.base
@@ -0,0 +1,13 @@
+Attributes {
+    var1 {
+        String month "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Nov", "Dec";
+    }
+    var2 {
+        String day "Monday", "Tuesday", "Wed";
+        String month "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Nov", "Dec";
+        String name "bob";
+        Int32 num 10;
+        String irrational "3.1415", "2.718", "1.414";
+        Float64 irrational_numbers 3.1415, 2.718, 1.414;
+    }
+}
diff --git a/tests/dds-test.cc b/tests/dds-test.cc
new file mode 100644
index 0000000..52302c3
--- /dev/null
+++ b/tests/dds-test.cc
@@ -0,0 +1,367 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1994-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// Test the DDS scanner, parser and DDS class.
+//
+// jhrg 8/29/94
+
+#include "config.h"
+
+#include <fstream>
+
+#include <GetOpt.h>
+
+#include "parser.h"
+#include "dds.tab.hh"
+#include "BaseType.h"
+#include "Int32.h"
+#include "DDS.h"
+#include "util.h"
+#include "Error.h"
+
+#if 0
+#ifdef DAP4
+#include "D4ParserSax2.h"
+#include "D4BaseTypeFactory.h"
+#endif
+#endif
+
+using namespace libdap;
+
+void test_scanner();
+void test_parser(const string &name);
+void test_class();
+#if 0
+void test_dap4_parser(const string &name);
+#endif
+
+int ddslex();
+// int ddsparse(DDS &);
+
+extern YYSTYPE ddslval;
+extern int ddsdebug;
+static bool print_ddx = false;
+
+const char *prompt = "dds-test: ";
+
+void usage(string name) {
+    cerr << "Usage: " << name << "[s] [pd] [c]" << endl
+            << "s: Test the scanner." << endl
+            << "p: Test the parser; reads from stdin and prints the" << endl
+            << "   internal structure to stdout." << endl
+            << "d: Turn on parser debugging. (only for the hard core.)" << endl
+            << "c: Test the C++ code for manipulating DDS objects." << endl
+            << "   Reads from stdin, parses and writes the modified DDS" << endl
+            << "   to stdout." << endl;
+#if 0
+    fprintf(stderr, "usage: %s %s\n %s\n %s\n %s\n %s\n %s\n %s\n %s\n", name.c_str(), "[s] [pd] [c]",
+            "s: Test the scanner.", "p: Test the parser; reads from stdin and prints the",
+            "   internal structure to stdout.", "d: Turn on parser debugging. (only for the hard core.)",
+            "c: Test the C++ code for manipulating DDS objects.",
+            "   Reads from stdin, parses and writes the modified DDS", "   to stdout.");
+#endif
+}
+
+int main(int argc, char *argv[]) {
+    GetOpt getopt(argc, argv, "spP:dcx"); // remove fF:
+    int option_char;
+    int scanner_test = 0, parser_test = 0, class_test = 0;
+#if 0
+    int dap4_parser_test = 0;
+#endif
+    string name = "";
+    // process options
+
+    while ((option_char = getopt()) != -1)
+        switch (option_char) {
+        case 'd':
+            ddsdebug = 1;
+            break;
+        case 's':
+            scanner_test = 1;
+            break;
+        case 'p':
+            parser_test = 1;
+            break;
+        case 'P':
+            parser_test = 1;
+            name = getopt.optarg;
+            break;
+#if 0
+        case 'f':
+            dap4_parser_test = 1;
+            break;
+
+        case 'F':
+            dap4_parser_test = 1;
+            name = getopt.optarg;
+            break;
+#endif
+        case 'x':
+            print_ddx = true;
+            break;
+        case 'c':
+            class_test = 1;
+            break;
+        case '?':
+        default:
+            usage(argv[0]);
+            return 1;
+        }
+
+    if (!scanner_test && !parser_test && !class_test/* && !dap4_parser_test*/) {
+        usage(argv[0]);
+        return 1;
+    }
+
+    try {
+        if (scanner_test)
+            test_scanner();
+
+        if (parser_test)
+            test_parser(name);
+#if 0
+        if (dap4_parser_test)
+            test_dap4_parser(name);
+#endif
+        if (class_test)
+            test_class();
+    }
+    catch (Error &e) {
+        cerr << e.get_error_message() << endl;
+    }
+}
+
+void test_scanner(void) {
+    int tok;
+
+    cout << prompt << flush; // first prompt
+
+    while ((tok = ddslex())) {
+        switch (tok) {
+        case SCAN_DATASET:
+            cout << "DATASET" << endl;
+            break;
+        case SCAN_LIST:
+            cout << "LIST" << endl;
+            break;
+        case SCAN_SEQUENCE:
+            cout << "SEQUENCE" << endl;
+            break;
+        case SCAN_STRUCTURE:
+            cout << "STRUCTURE" << endl;
+            break;
+        case SCAN_FUNCTION:
+            cout << "FUNCTION" << endl;
+            break;
+        case SCAN_GRID:
+            cout << "GRID" << endl;
+            break;
+        case SCAN_BYTE:
+            cout << "BYTE" << endl;
+            break;
+        case SCAN_INT16:
+            cout << "INT16" << endl;
+            break;
+        case SCAN_UINT16:
+            cout << "UINT16" << endl;
+            break;
+        case SCAN_INT32:
+            cout << "INT32" << endl;
+            break;
+        case SCAN_UINT32:
+            cout << "UINT32" << endl;
+            break;
+        case SCAN_FLOAT32:
+            cout << "FLOAT32" << endl;
+            break;
+        case SCAN_FLOAT64:
+            cout << "FLOAT64" << endl;
+            break;
+        case SCAN_STRING:
+            cout << "STRING" << endl;
+            break;
+        case SCAN_URL:
+            cout << "Url" << endl;
+            break;
+        case SCAN_WORD:
+            cout << "WORD: " << ddslval.word << endl;
+            break;
+        case '{':
+            cout << "Left Brace" << endl;
+            break;
+        case '}':
+            cout << "Right Brace" << endl;
+            break;
+        case '[':
+            cout << "Left Bracket" << endl;
+            break;
+        case ']':
+            cout << "Right Bracket" << endl;
+            break;
+        case ';':
+            cout << "Semicolon" << endl;
+            break;
+        case ':':
+            cout << "Colon" << endl;
+            break;
+        case '=':
+            cout << "Assignment" << endl;
+            break;
+        default:
+            cout << "Error: Unrecognized input" << endl;
+            break;
+        }
+        cout << prompt << flush; // print prompt after output
+    }
+}
+
+void test_parser(const string &name) {
+    BaseTypeFactory *factory = new BaseTypeFactory;
+    DDS table(factory);
+    if (name.empty())
+        table.parse();
+    else
+        table.parse(name);
+
+    if (table.check_semantics())
+        cout << "DDS past semantic check" << endl;
+    else
+        cout << "DDS failed semantic check" << endl;
+
+    if (table.check_semantics(true))
+        cout << "DDS past full semantic check" << endl;
+    else
+        cout << "DDS failed full semantic check" << endl;
+
+    if (print_ddx)
+        table.print_xml_writer(cout, false, "");
+    else
+        table.print(cout);
+
+    delete factory;
+    factory = 0;
+}
+
+#if 0
+void test_dap4_parser(const string &name) {
+#ifdef DAP4
+    D4BaseTypeFactory factory;
+
+    DDS table(&factory);
+    D4ParserSax2 parser;
+    if (name.empty()) {
+        parser.intern(cin, &table);
+    }
+    else {
+        fstream in(name.c_str(), ios_base::in);
+        parser.intern(in, &table);
+    }
+
+    if (table.check_semantics())
+        cout << "DAP4 DDS past semantic check" << endl;
+    else
+        cout << "DAP4 DDS failed semantic check" << endl;
+
+    if (table.check_semantics(true))
+        cout << "DAP4 DDS past full semantic check" << endl;
+    else
+        cout << "DAP4 DDS failed full semantic check" << endl;
+
+    if (print_ddx)
+        table.print_xml_writer(cout, false, "");
+    else
+        table.print(cout);
+#else
+    cerr << "DAP4 parsing not supported by this version of libdap" << endl;
+#endif
+}
+#endif
+
+void test_class(void) {
+    BaseTypeFactory *factory = new BaseTypeFactory;
+    DDS table(factory);
+    table.parse();
+
+    if (table.check_semantics())
+        cout << "DDS past semantic check" << endl;
+    else
+        cout << "DDS filed semantic check" << endl;
+
+    if (table.check_semantics(true))
+        cout << "DDS past full semantic check" << endl;
+    else
+        cout << "DDS filed full semantic check" << endl;
+
+    table.print(cout);
+
+    DDS table2 = table; // test copy ctor;
+    table2.print(cout);
+
+    BaseTypeFactory *factory2 = new BaseTypeFactory;
+    DDS table3(factory2);
+    table3 = table; // test operator=
+
+    cout << "Dataset name: " << table.get_dataset_name() << endl;
+
+    string name = "goofy";
+    table.add_var(table.get_factory()->NewInt32(name)); // table dtor should delete this object
+
+    table.print(cout);
+
+    BaseType *btp = table.var(name);
+
+    btp->print_decl(cout, "", true); // print out goofy w/semicolon
+
+    table.del_var(name);
+
+    table.print(cout);
+
+    table.add_var(table.get_factory()->NewInt32("goofy"));
+
+    table.print(cout);
+
+    btp = table.var("goofy");
+
+    btp->print_decl(cout, "", true); // print out goofy w/semicolon
+
+    table.del_var("goofy");
+
+    table.print(cout);
+
+    for (DDS::Vars_iter p = table.var_begin(); p != table.var_end(); p++)
+        (*p)->print_decl(cout, "", true); // print them all w/semicolons
+
+    delete factory;
+    factory = 0;
+    delete factory2;
+    factory2 = 0;
+}
+
diff --git a/tests/dds-testsuite/3B42.980909.5.HDF.das.dds b/tests/dds-testsuite/3B42.980909.5.HDF.das.dds
new file mode 100644
index 0000000..36ecd48
--- /dev/null
+++ b/tests/dds-testsuite/3B42.980909.5.HDF.das.dds
@@ -0,0 +1,626 @@
+Attributes {
+    HDF_GLOBAL {
+    }
+    CoreMetadata {
+        OrbitNumber {
+            Int32 Value -9999;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        RangeBeginningDate {
+            String Value 1998/09/09;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        RangeBeginningTime {
+            String Value 00:00:00;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        RangeEndingDate {
+            String Value 1998/09/10;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        RangeEndingTime {
+            String Value 00:00:00;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        GranulePointer {
+            String Value "3B42.980909.5.HDF";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        ShortName {
+            String Value "Surface Rain from Geostationary Satellites C";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        SizeMBECSDataGranule {
+            Float64 Value 0.220007;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        LongitudeOfMaximumLatitude {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        SpatialCoverageType {
+            String Value "Horizontal";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        EllipsoidName {
+            String Value "NULL";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        EquatorialRadius {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        DenominatorFlatteningRatio {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        OrbitalModelName {
+            String Value "NULL";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        SemiMajorAxis {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        MeanAnomaly {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        RightAscensionNode {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        ArgumentOfPerigee {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        Eccentricity {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        Inclination {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        EpochTime {
+            String Value 99:99:99;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        EpochDate {
+            String Value 9999/99/99;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        EpochMillisec {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        WestBoundingCoordinate {
+            Int32 Value -180;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        EastBoundingCoordinate {
+            Int32 Value 180;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        NorthBoundingCoordinate {
+            Int32 Value 40;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        SouthBoundingCoordinate {
+            Int32 Value -40;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        CenterLatitude {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        CenterLongitude {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        RadiusValue {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        LatitudeResolution {
+            String Value "1deg";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        LongitudeResolution {
+            String Value "1deg";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        GeographicCoordinateUnits {
+            String Value "Decimal Degrees";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        TemporalRangeType {
+            String Value "Continuous Range";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        QualityAssuranceParameterName {
+            String Value "ScienceQualityFlag";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        QualityAssuranceParameterValue {
+            String Value "NOT BEING INVESTIGATED";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        ReprocessingActual {
+            String Value "NULL";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        BrowsePointer {
+            String Value "3B42_BR.980909.5.BRO";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        ScienceContact {
+            String Value "George Huffman";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        MeanMotion {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        OrbitAdjustFlag {
+            Int32 Value -9999;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        AttitudeModeFlag {
+            Int32 Value -9999;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        SolarBetaAngleAtBeginningOfGranule {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        SolarBetaAngleAtEndOfGranule {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        SensorAlignment {
+            String Value "NULL";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        SensorAlignmentChannelOffsets {
+            String Value "NULL";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        ScanPathModel {
+            String Value "NULL";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        ScanPathModelParam {
+            String Value "NULL";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        EphemerisFileID {
+            String Value "NULL";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+    }
+    ArchiveMetadata {
+        DataGaps {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        NumberOfDataGaps {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        AlgorithmVersion {
+            String Value "4.51";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        ProductVersion {
+            Int32 Value 5;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        ToolkitVersion {
+            String Value "5.6";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        CalibrationCoefficientVersion {
+            Int32 Value -9999;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        MissingData {
+            Int32 Value -9999;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        PercentOfBadOrMissingPixels {
+            String Value "NULL";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        MaximumValidValueofChannel {
+            String Value "NULL";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        MinimumValidValueofChannel {
+            String Value "NULL";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        MinMaxUnits {
+            String Value "NULL";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        OrbitSize {
+            Int32 Value -9999;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        RadarWavelength {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        MinimumReflectivityThreshold {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        AlgorithmID {
+            String Value "3B42m2";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        DataAccuracy {
+            String Value "NULL";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        InputFiles {
+            String Value "NULL";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        DateOfGenerationOfInputFiles {
+            String Value "NULL";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        DataCenterSourceOfInputFiles {
+            String Value "NULL";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        GenerationDate {
+            String Value 2000-02-09T11:00:04.000Z;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        DayNight {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        SolarChannelGains {
+            String Value "(-9999.9,-9999.9,-9999.9,-9999.9)";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        TMIRolloverCoef {
+            String Value "(-9999.9,-9999.9,-9999.9,-9999.9,-9999.9,-9999.9,-9999.9,-9999.9,-9999.9,-9999.9,-9999.9,-9999.9,-9999.9,-9999.9,-9999.9,-9999.9,-9999.9,-9999.9)";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        OrbitFirstScanUTCDate {
+            String Value 9999/99/99;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        OrbitFirstScanUTCTime {
+            String Value 99:99:99;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        OrbitFirstScanUTCMilliseconds {
+            Int32 Value -9999;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        OrbitFirstSCSecs {
+            Int32 Value -9999;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        OrbitFirstSCSubsecs {
+            Int32 Value -9999;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        OrbitLastScanUTCDate {
+            String Value 9999/99/99;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        OrbitLastScanUTCTime {
+            String Value 99:99:99;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        OrbitLastScanUTCmilliseconds {
+            Int32 Value -9999;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        OrbitLastSCSecs {
+            Int32 Value -9999;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        OrbitLastSCSubsecs {
+            Int32 Value -9999;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        UTCFSeconds {
+            Int32 Value -9999;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        UTCFSubseconds {
+            Int32 Value -9999;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        UTCFflag {
+            Int32 Value -9999;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        LeapSecondsFlag {
+            String Value Data_Location, "Error processing EOS attributes", "Error processing EOS attributes";
+            String PGE "Error processing EOS attributes";
+            String Mandatory FALSE;
+        }
+        RadarSiteName {
+            String Value "NULL";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        RadarCity {
+            String Value "NULL";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        RadarState {
+            String Value "NULL";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        RadarCountry {
+            String Value "NULL";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        NumberOfVOS {
+            Int32 Value -9999;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        RadarGridOriginLatitude {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        RadarGridOriginLongitude {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        RadarGridOriginAltitude {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        RadarGridSpacingX {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        RadarGridSpacingY {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        RadarGridSpacingZ {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        RadarGridSizeX {
+            Int32 Value -9999;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        RadarGridSizeY {
+            Int32 Value -9999;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        RadarGridSizeZ {
+            Int32 Value -9999;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        DZCal {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        GVL1C_Scale {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        Alpha {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        RuntimeOptions {
+            String Value "NULL";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        AnomalyFlag {
+            String Value "NOT EMPTY";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        SoftwareVersion {
+            Int32 Value -9999;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        DatabaseVersion {
+            Int32 Value -9999;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        TotalQualityCode {
+            String Value "NULL";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        LongitudeOnEquator {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        UTCDateOnEquator {
+            String Value 9999/99/99;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        UTCTimeOnEquator {
+            String Value 99:99:99;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        UTCMillisecsOnEquator {
+            Int32 Value -9999;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        CenterScanUTCDate {
+            String Value 9999/99/99;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        CenterScanUTCTime {
+            String Value 99:99:99;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        CenterScanUTCMillisec {
+            Int32 Value -9999;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        FirstScanLat {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        FirstScanLon {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        LastScanLat {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        LastScanLon {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        NumberOfRainScans {
+            Int32 Value -9999;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+    }
+    percipitate_dim_0 {
+        String name "scan";
+    }
+    percipitate_dim_1 {
+        String name "longitude";
+    }
+    percipitate_dim_2 {
+        String name "latitude";
+    }
+    relError_dim_0 {
+        String name "scan";
+    }
+    relError_dim_1 {
+        String name "longitude";
+    }
+    relError_dim_2 {
+        String name "latitude";
+    }
+}
diff --git a/tests/dds-testsuite/3B42.980909.5.HDF.das.dds.base b/tests/dds-testsuite/3B42.980909.5.HDF.das.dds.base
new file mode 100644
index 0000000..b769c81
--- /dev/null
+++ b/tests/dds-testsuite/3B42.980909.5.HDF.das.dds.base
@@ -0,0 +1,3 @@
+Error parsing the text on line 1 at or near: Attributes
+The descriptor object returned from the dataset was null.
+Check that the URL is correct.
diff --git a/tests/dds-testsuite/3B42.980909.5.HDF.dds b/tests/dds-testsuite/3B42.980909.5.HDF.dds
new file mode 100644
index 0000000..259a06a
--- /dev/null
+++ b/tests/dds-testsuite/3B42.980909.5.HDF.dds
@@ -0,0 +1,8 @@
+Dataset {
+    Structure {
+        Structure {
+            Float32 percipitate[scan = 1][longitude = 360][latitude = 80];
+            Float32 relError[scan = 1][longitude = 360][latitude = 80];
+        } PlanetaryGrid;
+    } DATA_GRANULE;
+} 3B42.980909.5.HDF;
diff --git a/tests/dds-testsuite/3B42.980909.5.HDF.dds.base b/tests/dds-testsuite/3B42.980909.5.HDF.dds.base
new file mode 100644
index 0000000..e989526
--- /dev/null
+++ b/tests/dds-testsuite/3B42.980909.5.HDF.dds.base
@@ -0,0 +1,10 @@
+DDS past semantic check
+DDS past full semantic check
+Dataset {
+    Structure {
+        Structure {
+            Float32 percipitate[scan = 1][longitude = 360][latitude = 80];
+            Float32 relError[scan = 1][longitude = 360][latitude = 80];
+        } PlanetaryGrid;
+    } DATA_GRANULE;
+} 3B42.980909.5.HDF;
diff --git a/tests/dds-testsuite/3B42.980909.5.hacked.HDF.das.dds b/tests/dds-testsuite/3B42.980909.5.hacked.HDF.das.dds
new file mode 100644
index 0000000..5e05236
--- /dev/null
+++ b/tests/dds-testsuite/3B42.980909.5.hacked.HDF.das.dds
@@ -0,0 +1,39 @@
+Attributes {
+    HDF_GLOBAL {
+    }
+    CoreMetadata {
+        OrbitNumber {
+            Int32 Value -9999;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        RangeBeginningDate {
+            String Value 1998/09/09;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+#        TMIRolloverCoef {
+#            String Value "(-9999.9,-9999.9,-9999.9,-9999.9,-9999.9,-9999.9,-9999.9,-9999.9,-9999.9,-9999.9,-9999.9,-9999.9,-9999.9,-9999.9,-9999.9,-9999.9,-9999.9,-9999.9)";
+#            String Data_Location PGE;
+#            String Mandatory FALSE;
+#        }
+    }
+    percipitate_dim_0 {
+        String name "scan";
+    }
+    percipitate_dim_1 {
+        String name "longitude";
+    }
+    percipitate_dim_2 {
+        String name "latitude";
+    }
+    relError_dim_0 {
+        String name "scan";
+    }
+    relError_dim_1 {
+        String name "longitude";
+    }
+    relError_dim_2 {
+        String name "latitude";
+    }
+}
diff --git a/tests/dds-testsuite/3B42.980909.5.hacked.HDF.das.dds.base b/tests/dds-testsuite/3B42.980909.5.hacked.HDF.das.dds.base
new file mode 100644
index 0000000..682f3ea
--- /dev/null
+++ b/tests/dds-testsuite/3B42.980909.5.hacked.HDF.das.dds.base
@@ -0,0 +1,3 @@
+Error parsing the text on line 1 at or near: Attributes
+The descriptor object returned from the dataset was null.
+Check that the URL is correct.
\ No newline at end of file
diff --git a/tests/dds-testsuite/AsciiOutputTest1.dds b/tests/dds-testsuite/AsciiOutputTest1.dds
new file mode 100644
index 0000000..fa8652b
--- /dev/null
+++ b/tests/dds-testsuite/AsciiOutputTest1.dds
@@ -0,0 +1,33 @@
+# Used for the AsciiOutput unit tests.
+
+dataset {
+    Int32 a;
+
+    Structure {
+        Int32 b;
+        Float64 c;
+        String d;
+    } e;
+ 
+    Structure {
+        Int32 b;
+        Float64 c;
+        String d;
+    } f;
+
+    Grid {
+      array:
+        Byte xy[x=12][y=12];
+      maps:
+        Float64 x[12];
+	Float64 y[12];
+    } g;
+
+    Sequence {
+        Int16 j;
+	Sequence {
+	    Int16 i;
+        } h;
+    } k;
+
+} ascii_output_test;
diff --git a/tests/dds-testsuite/AsciiOutputTest1.dds.base b/tests/dds-testsuite/AsciiOutputTest1.dds.base
new file mode 100644
index 0000000..4a3a1de
--- /dev/null
+++ b/tests/dds-testsuite/AsciiOutputTest1.dds.base
@@ -0,0 +1,28 @@
+DDS past semantic check
+DDS past full semantic check
+Dataset {
+    Int32 a;
+    Structure {
+        Int32 b;
+        Float64 c;
+        String d;
+    } e;
+    Structure {
+        Int32 b;
+        Float64 c;
+        String d;
+    } f;
+    Grid {
+      Array:
+        Byte xy[x = 12][y = 12];
+      Maps:
+        Float64 x[12];
+        Float64 y[12];
+    } g;
+    Sequence {
+        Int16 j;
+        Sequence {
+            Int16 i;
+        } h;
+    } k;
+} ascii_output_test;
diff --git a/tests/dds-testsuite/S2000415.HDF.das.dds b/tests/dds-testsuite/S2000415.HDF.das.dds
new file mode 100644
index 0000000..f51918e
--- /dev/null
+++ b/tests/dds-testsuite/S2000415.HDF.das.dds
@@ -0,0 +1,316 @@
+Attributes {
+    HDF_GLOBAL {
+        String Producer_Agency "NASA\\000";
+        String Producer_Institution "JPL\\000";
+        String Sensor_Name "NSCAT\\000";
+        String Project_ID "NSCAT\\000";
+        String SIS_ID "597-512-24/1996-07-01\\000";
+        String Build_ID "3.2.1/1996-11-05\\000";
+        String ADEOS_Data_Package_ID "S2\\000";
+        String ADEOS_Data_Package_Type "S\\000";
+        String Product_Creation_Time "1996-318T01:35:16.000\\000";
+        String Data_Type "L2\\000";
+        String Data_Status "COMPLETE\\000";
+        Int32 First_Rev_Number 415;
+        String First_Rev_Eq_Crossing_Time "1996-259T04:01:28.226\\000";
+        Float32 First_Rev_Eq_Crossing_Lon 279.983;
+        String First_Data_Time "1996-259T03:43:48.945\\000";
+        String Last_Data_Time "1996-259T05:09:48.997\\000";
+        Int32 Num_Expected_Output_Records 458;
+        Int32 Num_Actual_Output_Records 458;
+        String Ambig_Removal_Method "Baseline used\\000";
+        String HDF_Build_ID "JPL D-xxxxx 12/15/94\\000";
+        String HDF_SIS_ID "JPL D-12060 12/15/94\\000";
+        String HDF_Conversion_Organization "JPL PO.DAAC\\000";
+        String HDF_Conversion_Time "1996-320T17:32:34       ";
+        String Data_Format_Type "HDF\\000";
+    }
+    WVC_Lat {
+        String long_name "latitude";
+        String units "deg";
+        Float64 scale_factor 0.01;
+        Float64 scale_factor_err 0;
+        Float64 add_offset 0;
+        Float64 add_offset_err 0;
+        Int32 calibrated_nt 22;
+        Int16 valid_range -9000, 7771;
+    }
+    WVC_Lat_dim_0 {
+        String name "row";
+        String long_name "WVC row";
+    }
+    WVC_Lat_dim_1 {
+        String name "WVC";
+        String long_name "WVC index";
+    }
+    WVC_Lon {
+        String long_name "longitude";
+        String units "deg";
+        Float64 scale_factor 0.01;
+        Float64 scale_factor_err 0;
+        Float64 add_offset 0;
+        Float64 add_offset_err 0;
+        Int32 calibrated_nt 22;
+        Uint16 valid_range 0, 31242;
+    }
+    WVC_Lon_dim_0 {
+        String name "row";
+        String long_name "WVC row";
+    }
+    WVC_Lon_dim_1 {
+        String name "WVC";
+        String long_name "WVC index";
+    }
+    Num_Sigma0 {
+        String long_name "The total number of sigma-0 measurements";
+        String units "counts";
+        Float64 scale_factor 1;
+        Float64 scale_factor_err 0;
+        Float64 add_offset 0;
+        Float64 add_offset_err 0;
+        Int32 calibrated_nt 21;
+        Byte valid_range 0, 19;
+    }
+    Num_Sigma0_dim_0 {
+        String name "row";
+        String long_name "WVC row";
+    }
+    Num_Sigma0_dim_1 {
+        String name "WVC";
+        String long_name "WVC index";
+    }
+    Num_Beam_12 {
+        String long_name "The total number of sigma-0s received from beam 1 or 2";
+        String units "counts";
+        Float64 scale_factor 1;
+        Float64 scale_factor_err 0;
+        Float64 add_offset 0;
+        Float64 add_offset_err 0;
+        Int32 calibrated_nt 21;
+        Byte valid_range 0, 6;
+    }
+    Num_Beam_12_dim_0 {
+        String name "row";
+        String long_name "WVC row";
+    }
+    Num_Beam_12_dim_1 {
+        String name "WVC";
+        String long_name "WVC index";
+    }
+    Num_Beam_34 {
+        String long_name "The total number of sigma-0s received from beam 3 or 4";
+        String units "counts";
+        Float64 scale_factor 1;
+        Float64 scale_factor_err 0;
+        Float64 add_offset 0;
+        Float64 add_offset_err 0;
+        Int32 calibrated_nt 21;
+        Byte valid_range 0, 6;
+    }
+    Num_Beam_34_dim_0 {
+        String name "row";
+        String long_name "WVC row";
+    }
+    Num_Beam_34_dim_1 {
+        String name "WVC";
+        String long_name "WVC index";
+    }
+    Num_Beam_56 {
+        String long_name "The total number of sigma-0s received from beam 5 or 6";
+        String units "counts";
+        Float64 scale_factor 1;
+        Float64 scale_factor_err 0;
+        Float64 add_offset 0;
+        Float64 add_offset_err 0;
+        Int32 calibrated_nt 21;
+        Byte valid_range 0, 6;
+    }
+    Num_Beam_56_dim_0 {
+        String name "row";
+        String long_name "WVC row";
+    }
+    Num_Beam_56_dim_1 {
+        String name "WVC";
+        String long_name "WVC index";
+    }
+    Num_Beam_78 {
+        String long_name "The total number of sigma-0s received from beam 7 or 8";
+        String units "counts";
+        Float64 scale_factor 1;
+        Float64 scale_factor_err 0;
+        Float64 add_offset 0;
+        Float64 add_offset_err 0;
+        Int32 calibrated_nt 21;
+        Byte valid_range 0, 6;
+    }
+    Num_Beam_78_dim_0 {
+        String name "row";
+        String long_name "WVC row";
+    }
+    Num_Beam_78_dim_1 {
+        String name "WVC";
+        String long_name "WVC index";
+    }
+    WVC_Quality_Flag {
+        String long_name "WVC Quality Flag";
+        Float64 scale_factor 1;
+        Float64 scale_factor_err 0;
+        Float64 add_offset 0;
+        Float64 add_offset_err 0;
+        Int32 calibrated_nt 21;
+        Byte valid_range 0, 3;
+    }
+    WVC_Quality_Flag_dim_0 {
+        String name "row";
+        String long_name "WVC row";
+    }
+    WVC_Quality_Flag_dim_1 {
+        String name "WVC";
+        String long_name "WVC index";
+    }
+    Mean_Wind {
+        String long_name "Mean Wind Speed";
+        String units "m/s";
+        Float64 scale_factor 0.01;
+        Float64 scale_factor_err 0;
+        Float64 add_offset 0;
+        Float64 add_offset_err 0;
+        Int32 calibrated_nt 23;
+        Uint16 valid_range 0, 2374;
+    }
+    Mean_Wind_dim_0 {
+        String name "row";
+        String long_name "WVC row";
+    }
+    Mean_Wind_dim_1 {
+        String name "WVC";
+        String long_name "WVC index";
+    }
+    Wind_Speed {
+        String long_name "Wind speed associated with a WVC";
+        String units "m/s";
+        Float64 scale_factor 0.01;
+        Float64 scale_factor_err 0;
+        Float64 add_offset 0;
+        Float64 add_offset_err 0;
+        Int32 calibrated_nt 23;
+        Uint16 valid_range 0, 2571;
+    }
+    Wind_Speed_dim_0 {
+        String name "row";
+        String long_name "WVC row";
+    }
+    Wind_Speed_dim_1 {
+        String name "WVC";
+        String long_name "WVC index";
+    }
+    Wind_Speed_dim_2 {
+        String name "position";
+        String long_name "position of the ambiguities";
+    }
+    Wind_Dir {
+        String long_name "Wind direction solution associated with a WVC";
+        String units "deg";
+        Float64 scale_factor 0.01;
+        Float64 scale_factor_err 0;
+        Float64 add_offset 0;
+        Float64 add_offset_err 0;
+        Int32 calibrated_nt 23;
+        Uint16 valid_range 0, 35997;
+    }
+    Wind_Dir_dim_0 {
+        String name "row";
+        String long_name "WVC row";
+    }
+    Wind_Dir_dim_1 {
+        String name "WVC";
+        String long_name "WVC index";
+    }
+    Wind_Dir_dim_2 {
+        String name "position";
+        String long_name "position of the ambiguities";
+    }
+    Error_Speed {
+        String long_name "Uncertainty estimated for the wind speed value";
+        String units "m/s";
+        Float64 scale_factor 0.01;
+        Float64 scale_factor_err 0;
+        Float64 add_offset 0;
+        Float64 add_offset_err 0;
+        Int32 calibrated_nt 23;
+        Uint16 valid_range 0, 2410;
+    }
+    Error_Speed_dim_0 {
+        String name "row";
+        String long_name "WVC row";
+    }
+    Error_Speed_dim_1 {
+        String name "WVC";
+        String long_name "WVC index";
+    }
+    Error_Speed_dim_2 {
+        String name "position";
+        String long_name "position of the ambiguities";
+    }
+    Error_Dir {
+        String long_name "Uncertainty estimated for the wind direction value";
+        String units "deg";
+        Float64 scale_factor 0.01;
+        Float64 scale_factor_err 0;
+        Float64 add_offset 0;
+        Float64 add_offset_err 0;
+        Int32 calibrated_nt 23;
+        Uint16 valid_range 0, 2435;
+    }
+    Error_Dir_dim_0 {
+        String name "row";
+        String long_name "WVC row";
+    }
+    Error_Dir_dim_1 {
+        String name "WVC";
+        String long_name "WVC index";
+    }
+    Error_Dir_dim_2 {
+        String name "position";
+        String long_name "position of the ambiguities";
+    }
+    MLE_Likelihood {
+        String long_name "Relative likelihood that a given win vector solution is correct";
+        Float64 scale_factor 0.1;
+        Float64 scale_factor_err 0;
+        Float64 add_offset 0;
+        Float64 add_offset_err 0;
+        Int32 calibrated_nt 22;
+        Int16 valid_range -32768, 2825;
+    }
+    MLE_Likelihood_dim_0 {
+        String name "row";
+        String long_name "WVC row";
+    }
+    MLE_Likelihood_dim_1 {
+        String name "WVC";
+        String long_name "WVC index";
+    }
+    MLE_Likelihood_dim_2 {
+        String name "position";
+        String long_name "position of the ambiguities";
+    }
+    Num_Ambigs {
+        String long_name "Number of ambiguous wind vectors reported for a given cell";
+        String units "counts";
+        Float64 scale_factor 1;
+        Float64 scale_factor_err 0;
+        Float64 add_offset 0;
+        Float64 add_offset_err 0;
+        Int32 calibrated_nt 21;
+        Byte valid_range 0, 4;
+    }
+    Num_Ambigs_dim_0 {
+        String name "row";
+        String long_name "WVC row";
+    }
+    Num_Ambigs_dim_1 {
+        String name "WVC";
+        String long_name "WVC index";
+    }
+}
diff --git a/tests/dds-testsuite/S2000415.HDF.das.dds.base b/tests/dds-testsuite/S2000415.HDF.das.dds.base
new file mode 100644
index 0000000..b769c81
--- /dev/null
+++ b/tests/dds-testsuite/S2000415.HDF.das.dds.base
@@ -0,0 +1,3 @@
+Error parsing the text on line 1 at or near: Attributes
+The descriptor object returned from the dataset was null.
+Check that the URL is correct.
diff --git a/tests/dds-testsuite/S2000415.HDF.dds b/tests/dds-testsuite/S2000415.HDF.dds
new file mode 100644
index 0000000..6eeadc8
--- /dev/null
+++ b/tests/dds-testsuite/S2000415.HDF.dds
@@ -0,0 +1,35 @@
+Dataset {
+    Structure {
+        Int16 WVC_Lat[row = 458][WVC = 24];
+        UInt16 WVC_Lon[row = 458][WVC = 24];
+        Byte Num_Sigma0[row = 458][WVC = 24];
+        Byte Num_Beam_12[row = 458][WVC = 24];
+        Byte Num_Beam_34[row = 458][WVC = 24];
+        Byte Num_Beam_56[row = 458][WVC = 24];
+        Byte Num_Beam_78[row = 458][WVC = 24];
+        Byte WVC_Quality_Flag[row = 458][WVC = 24];
+        UInt16 Mean_Wind[row = 458][WVC = 24];
+        UInt16 Wind_Speed[row = 458][WVC = 24][position = 4];
+        UInt16 Wind_Dir[row = 458][WVC = 24][position = 4];
+        UInt16 Error_Speed[row = 458][WVC = 24][position = 4];
+        UInt16 Error_Dir[row = 458][WVC = 24][position = 4];
+        Int16 MLE_Likelihood[row = 458][WVC = 24][position = 4];
+        Byte Num_Ambigs[row = 458][WVC = 24];
+        Sequence {
+            Structure {
+                Int16 begin__0;
+            } begin;
+        } SwathIndex;
+        Sequence {
+            Structure {
+                String Mean_Time__0;
+            } Mean_Time;
+            Structure {
+                UInt32 Low_Wind_Speed_Flag__0;
+            } Low_Wind_Speed_Flag;
+            Structure {
+                UInt32 High_Wind_Speed_Flag__0;
+            } High_Wind_Speed_Flag;
+        } NSCAT%20L2;
+    } NSCAT%20Rev%2020;
+} S2000415.HDF;
diff --git a/tests/dds-testsuite/S2000415.HDF.dds.base b/tests/dds-testsuite/S2000415.HDF.dds.base
new file mode 100644
index 0000000..30ade82
--- /dev/null
+++ b/tests/dds-testsuite/S2000415.HDF.dds.base
@@ -0,0 +1,37 @@
+DDS past semantic check
+DDS past full semantic check
+Dataset {
+    Structure {
+        Int16 WVC_Lat[row = 458][WVC = 24];
+        UInt16 WVC_Lon[row = 458][WVC = 24];
+        Byte Num_Sigma0[row = 458][WVC = 24];
+        Byte Num_Beam_12[row = 458][WVC = 24];
+        Byte Num_Beam_34[row = 458][WVC = 24];
+        Byte Num_Beam_56[row = 458][WVC = 24];
+        Byte Num_Beam_78[row = 458][WVC = 24];
+        Byte WVC_Quality_Flag[row = 458][WVC = 24];
+        UInt16 Mean_Wind[row = 458][WVC = 24];
+        UInt16 Wind_Speed[row = 458][WVC = 24][position = 4];
+        UInt16 Wind_Dir[row = 458][WVC = 24][position = 4];
+        UInt16 Error_Speed[row = 458][WVC = 24][position = 4];
+        UInt16 Error_Dir[row = 458][WVC = 24][position = 4];
+        Int16 MLE_Likelihood[row = 458][WVC = 24][position = 4];
+        Byte Num_Ambigs[row = 458][WVC = 24];
+        Sequence {
+            Structure {
+                Int16 begin__0;
+            } begin;
+        } SwathIndex;
+        Sequence {
+            Structure {
+                String Mean_Time__0;
+            } Mean_Time;
+            Structure {
+                UInt32 Low_Wind_Speed_Flag__0;
+            } Low_Wind_Speed_Flag;
+            Structure {
+                UInt32 High_Wind_Speed_Flag__0;
+            } High_Wind_Speed_Flag;
+        } NSCAT%20L2;
+    } NSCAT%20Rev%2020;
+} S2000415.HDF;
diff --git a/tests/dds-testsuite/fnoc1.nc.das.dds b/tests/dds-testsuite/fnoc1.nc.das.dds
new file mode 100644
index 0000000..0407143
--- /dev/null
+++ b/tests/dds-testsuite/fnoc1.nc.das.dds
@@ -0,0 +1,32 @@
+Attributes {
+    u {
+        String units "meter per second";
+        String long_name "Vector wind eastward component";
+        String missing_value "-32767";
+        String scale_factor "0.005";
+        String DODS_Name "UWind";
+    }
+    v {
+        String units "meter per second";
+        String long_name "Vector wind northward component";
+        String missing_value "-32767";
+        String scale_factor "0.005";
+        String DODS_Name "VWind";
+    }
+    lat {
+        String units "degree North";
+    }
+    lon {
+        String units "degree East";
+    }
+    time {
+        String units "hours from base_time";
+    }
+    NC_GLOBAL {
+        String base_time "88- 10-00:00:00";
+        String title " FNOC UV wind components from 1988- 10 to 1988- 13.";
+    }
+    DODS_EXTRA {
+        String Unlimited_Dimension "time_a";
+    }
+}
diff --git a/tests/dds-testsuite/fnoc1.nc.das.dds.base b/tests/dds-testsuite/fnoc1.nc.das.dds.base
new file mode 100644
index 0000000..b769c81
--- /dev/null
+++ b/tests/dds-testsuite/fnoc1.nc.das.dds.base
@@ -0,0 +1,3 @@
+Error parsing the text on line 1 at or near: Attributes
+The descriptor object returned from the dataset was null.
+Check that the URL is correct.
diff --git a/tests/dds-testsuite/fnoc1.nc.dds b/tests/dds-testsuite/fnoc1.nc.dds
new file mode 100644
index 0000000..8c41e1b
--- /dev/null
+++ b/tests/dds-testsuite/fnoc1.nc.dds
@@ -0,0 +1,7 @@
+Dataset {
+    Int16 u[time_a = 16][lat = 17][lon = 21];
+    Int16 v[time_a = 16][lat = 17][lon = 21];
+    Float32 lat[lat = 17];
+    Float32 lon[lon = 21];
+    Float32 time[time = 16];
+} fnoc1.nc;
diff --git a/tests/dds-testsuite/fnoc1.nc.dds.base b/tests/dds-testsuite/fnoc1.nc.dds.base
new file mode 100644
index 0000000..62f5524
--- /dev/null
+++ b/tests/dds-testsuite/fnoc1.nc.dds.base
@@ -0,0 +1,9 @@
+DDS past semantic check
+DDS past full semantic check
+Dataset {
+    Int16 u[time_a = 16][lat = 17][lon = 21];
+    Int16 v[time_a = 16][lat = 17][lon = 21];
+    Float32 lat[lat = 17];
+    Float32 lon[lon = 21];
+    Float32 time[time = 16];
+} fnoc1.nc;
diff --git a/tests/dds-testsuite/test.1.dds b/tests/dds-testsuite/test.1.dds
new file mode 100644
index 0000000..465ac61
--- /dev/null
+++ b/tests/dds-testsuite/test.1.dds
@@ -0,0 +1,7 @@
+dataset {
+    Byte b;
+    int32 i;
+    int32 j;
+} data1;
+
+
diff --git a/tests/dds-testsuite/test.1.dds.base b/tests/dds-testsuite/test.1.dds.base
new file mode 100644
index 0000000..d927fad
--- /dev/null
+++ b/tests/dds-testsuite/test.1.dds.base
@@ -0,0 +1,7 @@
+DDS past semantic check
+DDS past full semantic check
+Dataset {
+    Byte b;
+    Int32 i;
+    Int32 j;
+} data1;
diff --git a/tests/dds-testsuite/test.10.dds b/tests/dds-testsuite/test.10.dds
new file mode 100644
index 0000000..db4c7eb
--- /dev/null
+++ b/tests/dds-testsuite/test.10.dds
@@ -0,0 +1,45 @@
+# -*- C++ -*-
+
+dataset {
+    structure {
+	Int32 i;
+	int32 j;
+    } test;
+
+    sequence {
+	int32 i;
+	int32 j[10];
+    } test2;
+
+    grid {
+      array:
+	float64 f[10][10];
+      maps:
+	int32 g[10];
+	int32 h[10];
+    } test4;
+
+    Sequence {
+	String name;
+	Int32 age;
+    } person;
+
+    Structure {
+	Int32 j;
+	Int32 i;
+	Structure {
+	    int32 i;
+	    float64 f[10];
+	} data;
+    } exp;
+
+    Grid {
+      Array:
+	float64 g[10][10][10];
+      Maps:
+	float64 lat[10];
+	float64 lon[10];
+	float64 weirdness[10];
+    } strange;
+
+} data6;
diff --git a/tests/dds-testsuite/test.10.dds.base b/tests/dds-testsuite/test.10.dds.base
new file mode 100644
index 0000000..f7f4a74
--- /dev/null
+++ b/tests/dds-testsuite/test.10.dds.base
@@ -0,0 +1,39 @@
+DDS past semantic check
+DDS past full semantic check
+Dataset {
+    Structure {
+        Int32 i;
+        Int32 j;
+    } test;
+    Sequence {
+        Int32 i;
+        Int32 j[10];
+    } test2;
+    Grid {
+      Array:
+        Float64 f[10][10];
+      Maps:
+        Int32 g[10];
+        Int32 h[10];
+    } test4;
+    Sequence {
+        String name;
+        Int32 age;
+    } person;
+    Structure {
+        Int32 j;
+        Int32 i;
+        Structure {
+            Int32 i;
+            Float64 f[10];
+        } data;
+    } exp;
+    Grid {
+      Array:
+        Float64 g[10][10][10];
+      Maps:
+        Float64 lat[10];
+        Float64 lon[10];
+        Float64 weirdness[10];
+    } strange;
+} data6;
diff --git a/tests/dds-testsuite/test.11.dds b/tests/dds-testsuite/test.11.dds
new file mode 100644
index 0000000..9b863cf
--- /dev/null
+++ b/tests/dds-testsuite/test.11.dds
@@ -0,0 +1,37 @@
+# -*- C++ -*-
+
+# Test identifier length
+
+dataset {
+    structure {
+	int32 long_one;
+	int32 long_two;
+	int32 long_three;
+	int32 long_four;
+	int32 long_five;
+	int32 long_six;
+	float64 long_one_float;
+	float64 long_two_float;
+	float64 long_three_float;
+    } long_names_one;
+    
+    structure {
+	int32 long_one_float1;
+	int32 long_two_float1;
+	int32 long_three_float3;
+	int32 long_four;
+	int32 long_five;
+	int32 long_six;
+	float64 long_one_float;
+	float64 long_two_float;
+	float64 long_three_float;
+    } long_names_one_and_a_half;
+ 
+    structure {
+	int32 a_very_long_name_given_what_it_accomplishes;
+	int32 another_name_nearly_as_pointless;
+    } long_names_two;
+
+    
+} long_identifier_test_data_set;
+
diff --git a/tests/dds-testsuite/test.11.dds.base b/tests/dds-testsuite/test.11.dds.base
new file mode 100644
index 0000000..39231c5
--- /dev/null
+++ b/tests/dds-testsuite/test.11.dds.base
@@ -0,0 +1,30 @@
+DDS past semantic check
+DDS past full semantic check
+Dataset {
+    Structure {
+        Int32 long_one;
+        Int32 long_two;
+        Int32 long_three;
+        Int32 long_four;
+        Int32 long_five;
+        Int32 long_six;
+        Float64 long_one_float;
+        Float64 long_two_float;
+        Float64 long_three_float;
+    } long_names_one;
+    Structure {
+        Int32 long_one_float1;
+        Int32 long_two_float1;
+        Int32 long_three_float3;
+        Int32 long_four;
+        Int32 long_five;
+        Int32 long_six;
+        Float64 long_one_float;
+        Float64 long_two_float;
+        Float64 long_three_float;
+    } long_names_one_and_a_half;
+    Structure {
+        Int32 a_very_long_name_given_what_it_accomplishes;
+        Int32 another_name_nearly_as_pointless;
+    } long_names_two;
+} long_identifier_test_data_set;
diff --git a/tests/dds-testsuite/test.12.dds b/tests/dds-testsuite/test.12.dds
new file mode 100644
index 0000000..131dfb6
--- /dev/null
+++ b/tests/dds-testsuite/test.12.dds
@@ -0,0 +1,6 @@
+# test arrays with named dimensions.
+
+dataset {
+    int32 i;
+    float64 f[latitude=20][ longitude = 10 ];
+} data5;
diff --git a/tests/dds-testsuite/test.12.dds.base b/tests/dds-testsuite/test.12.dds.base
new file mode 100644
index 0000000..2d69135
--- /dev/null
+++ b/tests/dds-testsuite/test.12.dds.base
@@ -0,0 +1,6 @@
+DDS past semantic check
+DDS past full semantic check
+Dataset {
+    Int32 i;
+    Float64 f[latitude = 20][longitude = 10];
+} data5;
diff --git a/tests/dds-testsuite/test.13.dds b/tests/dds-testsuite/test.13.dds
new file mode 100644
index 0000000..bd400aa
--- /dev/null
+++ b/tests/dds-testsuite/test.13.dds
@@ -0,0 +1,6 @@
+# test problems with named dimensions.
+
+dataset {
+    int32 i;
+    float64 f[ longitude 10 ];
+} data5;
diff --git a/tests/dds-testsuite/test.13.dds.base b/tests/dds-testsuite/test.13.dds.base
new file mode 100644
index 0000000..65ad326
--- /dev/null
+++ b/tests/dds-testsuite/test.13.dds.base
@@ -0,0 +1,3 @@
+Error parsing the text on line 5 at or near: 10
+In the dataset descriptor object:
+Expected an array subscript.
diff --git a/tests/dds-testsuite/test.14.dds b/tests/dds-testsuite/test.14.dds
new file mode 100644
index 0000000..4ceac1d
--- /dev/null
+++ b/tests/dds-testsuite/test.14.dds
@@ -0,0 +1,4 @@
+# test null dataset
+
+dataset {
+} data5;
diff --git a/tests/dds-testsuite/test.14.dds.base b/tests/dds-testsuite/test.14.dds.base
new file mode 100644
index 0000000..49377fc
--- /dev/null
+++ b/tests/dds-testsuite/test.14.dds.base
@@ -0,0 +1,4 @@
+DDS past semantic check
+DDS past full semantic check
+Dataset {
+} data5;
diff --git a/tests/dds-testsuite/test.15.dds b/tests/dds-testsuite/test.15.dds
new file mode 100644
index 0000000..31fa2f5
--- /dev/null
+++ b/tests/dds-testsuite/test.15.dds
@@ -0,0 +1,8 @@
+#
+# Test new datatypes (int16, uint16, float32)
+
+Dataset {
+    int16 x;
+    uint16 y;
+    float32 f;
+} data5;
diff --git a/tests/dds-testsuite/test.15.dds.base b/tests/dds-testsuite/test.15.dds.base
new file mode 100644
index 0000000..dbb1f69
--- /dev/null
+++ b/tests/dds-testsuite/test.15.dds.base
@@ -0,0 +1,7 @@
+DDS past semantic check
+DDS past full semantic check
+Dataset {
+    Int16 x;
+    UInt16 y;
+    Float32 f;
+} data5;
diff --git a/tests/dds-testsuite/test.16.dds b/tests/dds-testsuite/test.16.dds
new file mode 100644
index 0000000..61a360f
--- /dev/null
+++ b/tests/dds-testsuite/test.16.dds
@@ -0,0 +1,21 @@
+#
+# Test dots (.) in variable names.
+
+Dataset {
+    Int32 i.x[10];
+    Int32 j.x[20];
+    Byte b.x;
+    String name.x;
+    Structure {
+        Float64 f;
+	Float64 g;
+	Float64 h.x;
+    } x;
+    Grid {
+      Array:
+        Byte temp[100][7];
+      Maps:
+        Float64 steps[100];
+	String colors[7];
+    } oddTemp.y;
+} data2;
diff --git a/tests/dds-testsuite/test.16.dds.base b/tests/dds-testsuite/test.16.dds.base
new file mode 100644
index 0000000..104fee5
--- /dev/null
+++ b/tests/dds-testsuite/test.16.dds.base
@@ -0,0 +1,20 @@
+DDS past semantic check
+DDS past full semantic check
+Dataset {
+    Int32 i.x[10];
+    Int32 j.x[20];
+    Byte b.x;
+    String name.x;
+    Structure {
+        Float64 f;
+        Float64 g;
+        Float64 h.x;
+    } x;
+    Grid {
+      Array:
+        Byte temp[100][7];
+      Maps:
+        Float64 steps[100];
+        String colors[7];
+    } oddTemp.y;
+} data2;
diff --git a/tests/dds-testsuite/test.17.dds b/tests/dds-testsuite/test.17.dds
new file mode 100644
index 0000000..ef53e89
--- /dev/null
+++ b/tests/dds-testsuite/test.17.dds
@@ -0,0 +1,12 @@
+#
+# Test error messages; When `Maps' is misspelled.
+
+Dataset {
+    Grid {
+      Array:
+        Byte temp[100][7];
+      Map:
+        Float64 steps[100];
+	String colors[7];
+    } oddTemp;
+} data2;
diff --git a/tests/dds-testsuite/test.17.dds.base b/tests/dds-testsuite/test.17.dds.base
new file mode 100644
index 0000000..2c6fd3c
--- /dev/null
+++ b/tests/dds-testsuite/test.17.dds.base
@@ -0,0 +1,5 @@
+Error parsing the text on line 8 at or near: Map
+In the dataset descriptor object: Expected a variable declaration
+(e.g., Int32 i;). Make sure that the variable name is not the name
+of a datatype and that the Array: and Maps: sections of a Grid are
+labeled properly.
diff --git a/tests/dds-testsuite/test.18.dds b/tests/dds-testsuite/test.18.dds
new file mode 100644
index 0000000..ca4e7a4
--- /dev/null
+++ b/tests/dds-testsuite/test.18.dds
@@ -0,0 +1,12 @@
+#
+# Test dataset filenames that are numbers.
+
+Dataset {
+    Grid {
+      Array:
+        Byte temp[100][7];
+      Maps:
+        Float64 steps[100];
+	String colors[7];
+    } oddTemp;
+} 123;
diff --git a/tests/dds-testsuite/test.18.dds.base b/tests/dds-testsuite/test.18.dds.base
new file mode 100644
index 0000000..e3139e1
--- /dev/null
+++ b/tests/dds-testsuite/test.18.dds.base
@@ -0,0 +1,11 @@
+DDS past semantic check
+DDS past full semantic check
+Dataset {
+    Grid {
+      Array:
+        Byte temp[100][7];
+      Maps:
+        Float64 steps[100];
+        String colors[7];
+    } oddTemp;
+} 123;
diff --git a/tests/dds-testsuite/test.19.dds b/tests/dds-testsuite/test.19.dds
new file mode 100644
index 0000000..b87cca0
--- /dev/null
+++ b/tests/dds-testsuite/test.19.dds
@@ -0,0 +1,14 @@
+#
+# Test identifiers with `#' in them. 6/22/2001 jhrg
+
+Dataset {
+   Int32 a;
+   Int32 b#c[10];
+   Float64 c#d;
+   Grid {
+     Array:
+       Byte Image#data[512];
+     Maps:
+       String colors[512];
+   } huh;
+} test.19;
diff --git a/tests/dds-testsuite/test.19.dds.base b/tests/dds-testsuite/test.19.dds.base
new file mode 100644
index 0000000..c63b020
--- /dev/null
+++ b/tests/dds-testsuite/test.19.dds.base
@@ -0,0 +1,13 @@
+DDS past semantic check
+DDS past full semantic check
+Dataset {
+    Int32 a;
+    Int32 b%23c[10];
+    Float64 c%23d;
+    Grid {
+      Array:
+        Byte Image%23data[512];
+      Maps:
+        String colors[512];
+    } huh;
+} test.19;
diff --git a/tests/dds-testsuite/test.19b.das.dds b/tests/dds-testsuite/test.19b.das.dds
new file mode 100644
index 0000000..ac61f06
--- /dev/null
+++ b/tests/dds-testsuite/test.19b.das.dds
@@ -0,0 +1,33 @@
+# This DAS is used to test merging attributes into an existing DDS. It's
+# designed to work with the DDS in test.19b.
+
+Attributes {
+    NC_GLOBAL {
+        String long_name "Attribute merge test";
+        Int32 primes 2, 3, 5, 7, 11;
+    }
+
+    a {
+    }
+
+    b#c {
+        String long_name "b pound c";
+    }
+
+    c%20d {
+        String long_name "c d with a WWW escape sequence";
+	sub {
+	    String about "Attributes inside attributes";
+	    Float64 pi 3.1415;
+        }
+    }
+
+    huh {
+        String long_name "The Grid huh";
+	colors {
+	    String long_name "The color map vector";
+        }
+	Image#data {
+	}
+    }
+}
diff --git a/tests/dds-testsuite/test.19b.das.dds.base b/tests/dds-testsuite/test.19b.das.dds.base
new file mode 100644
index 0000000..371c190
--- /dev/null
+++ b/tests/dds-testsuite/test.19b.das.dds.base
@@ -0,0 +1,3 @@
+Error parsing the text on line 4 at or near: Attributes
+The descriptor object returned from the dataset was null.
+Check that the URL is correct.
diff --git a/tests/dds-testsuite/test.19b.dds b/tests/dds-testsuite/test.19b.dds
new file mode 100644
index 0000000..6d05cf7
--- /dev/null
+++ b/tests/dds-testsuite/test.19b.dds
@@ -0,0 +1,14 @@
+#
+# Test identifiers with `#' in them. 6/22/2001 jhrg
+
+Dataset {
+   Int32 a;
+   Int32 b#c[10];
+   Float64 c%20d;
+   Grid {
+     Array:
+       Byte Image#data[512];
+     Maps:
+       String colors[512];
+   } huh;
+} test.19;
diff --git a/tests/dds-testsuite/test.19b.dds.base b/tests/dds-testsuite/test.19b.dds.base
new file mode 100644
index 0000000..5bb7ad7
--- /dev/null
+++ b/tests/dds-testsuite/test.19b.dds.base
@@ -0,0 +1,13 @@
+DDS past semantic check
+DDS past full semantic check
+Dataset {
+    Int32 a;
+    Int32 b%23c[10];
+    Float64 c%20d;
+    Grid {
+      Array:
+        Byte Image%23data[512];
+      Maps:
+        String colors[512];
+    } huh;
+} test.19;
diff --git a/tests/dds-testsuite/test.2.dds b/tests/dds-testsuite/test.2.dds
new file mode 100644
index 0000000..f262371
--- /dev/null
+++ b/tests/dds-testsuite/test.2.dds
@@ -0,0 +1,4 @@
+Dataset {
+    Int32 i[10];
+    Int32 j[20];
+} data2;
diff --git a/tests/dds-testsuite/test.2.dds.base b/tests/dds-testsuite/test.2.dds.base
new file mode 100644
index 0000000..afe081c
--- /dev/null
+++ b/tests/dds-testsuite/test.2.dds.base
@@ -0,0 +1,6 @@
+DDS past semantic check
+DDS past full semantic check
+Dataset {
+    Int32 i[10];
+    Int32 j[20];
+} data2;
\ No newline at end of file
diff --git a/tests/dds-testsuite/test.20.dds b/tests/dds-testsuite/test.20.dds
new file mode 100644
index 0000000..c02f7bb
--- /dev/null
+++ b/tests/dds-testsuite/test.20.dds
@@ -0,0 +1,12 @@
+#
+# Test identifiers with '*' in them. 6/22/2001 jhrg
+
+Dataset {
+   Int32 a;
+   Grid {
+     Array:
+       Byte Image#data[size*10=512];
+     Maps:
+       String colors[size*10=512];
+   } huh;
+} test.20;
diff --git a/tests/dds-testsuite/test.20.dds.base b/tests/dds-testsuite/test.20.dds.base
new file mode 100644
index 0000000..0122f3d
--- /dev/null
+++ b/tests/dds-testsuite/test.20.dds.base
@@ -0,0 +1,11 @@
+DDS past semantic check
+DDS past full semantic check
+Dataset {
+    Int32 a;
+    Grid {
+      Array:
+        Byte Image%23data[size*10 = 512];
+      Maps:
+        String colors[size*10 = 512];
+    } huh;
+} test.20;
diff --git a/tests/dds-testsuite/test.21.dds b/tests/dds-testsuite/test.21.dds
new file mode 100644
index 0000000..10fb509
--- /dev/null
+++ b/tests/dds-testsuite/test.21.dds
@@ -0,0 +1,6 @@
+
+# Zero-length array. jhrg 1/28/16
+
+Dataset {
+   Int32 a[0];
+} test.21;
diff --git a/tests/dds-testsuite/test.21.dds.base b/tests/dds-testsuite/test.21.dds.base
new file mode 100644
index 0000000..a87cb7c
--- /dev/null
+++ b/tests/dds-testsuite/test.21.dds.base
@@ -0,0 +1,5 @@
+DDS past semantic check
+DDS past full semantic check
+Dataset {
+    Int32 a[0];
+} test.21;
diff --git a/tests/dds-testsuite/test.22.dds b/tests/dds-testsuite/test.22.dds
new file mode 100644
index 0000000..021dff3
--- /dev/null
+++ b/tests/dds-testsuite/test.22.dds
@@ -0,0 +1,8 @@
+
+# Data containing a zero-length array. jhrg 1/28/16
+
+Dataset {
+   Int32 a;
+   Int32 b[10];
+   Int32 c[0];
+} test.22;
diff --git a/tests/dds-testsuite/test.22.dds.base b/tests/dds-testsuite/test.22.dds.base
new file mode 100644
index 0000000..83f5d62
--- /dev/null
+++ b/tests/dds-testsuite/test.22.dds.base
@@ -0,0 +1,7 @@
+DDS past semantic check
+DDS past full semantic check
+Dataset {
+    Int32 a;
+    Int32 b[10];
+    Int32 c[0];
+} test.22;
diff --git a/tests/dds-testsuite/test.23.dds b/tests/dds-testsuite/test.23.dds
new file mode 100644
index 0000000..db51893
--- /dev/null
+++ b/tests/dds-testsuite/test.23.dds
@@ -0,0 +1,8 @@
+
+# Data containing two zero-length arrays. jhrg 1/28/16
+
+Dataset {
+   Int32 a;
+   Int32 b[10];
+   Int32 c[4][0];
+} test.22;
diff --git a/tests/dds-testsuite/test.23.dds.base b/tests/dds-testsuite/test.23.dds.base
new file mode 100644
index 0000000..0a29043
--- /dev/null
+++ b/tests/dds-testsuite/test.23.dds.base
@@ -0,0 +1,7 @@
+DDS past semantic check
+DDS past full semantic check
+Dataset {
+    Int32 a;
+    Int32 b[10];
+    Int32 c[4][0];
+} test.22;
diff --git a/tests/dds-testsuite/test.24.dds b/tests/dds-testsuite/test.24.dds
new file mode 100644
index 0000000..364faee
--- /dev/null
+++ b/tests/dds-testsuite/test.24.dds
@@ -0,0 +1,8 @@
+
+# Data containing a zero-length array. jhrg 1/28/16
+
+Dataset {
+   Int32 a;
+   Int32 b[10];
+   Int32 c[0][4];
+} test.22;
diff --git a/tests/dds-testsuite/test.24.dds.base b/tests/dds-testsuite/test.24.dds.base
new file mode 100644
index 0000000..5cc7582
--- /dev/null
+++ b/tests/dds-testsuite/test.24.dds.base
@@ -0,0 +1,7 @@
+DDS past semantic check
+DDS past full semantic check
+Dataset {
+    Int32 a;
+    Int32 b[10];
+    Int32 c[0][4];
+} test.22;
diff --git a/tests/dds-testsuite/test.25.dds b/tests/dds-testsuite/test.25.dds
new file mode 100644
index 0000000..7a286d3
--- /dev/null
+++ b/tests/dds-testsuite/test.25.dds
@@ -0,0 +1,4 @@
+dataset {
+    Structure {
+    } exp;
+} data6;
diff --git a/tests/dds-testsuite/test.25.dds.base b/tests/dds-testsuite/test.25.dds.base
new file mode 100644
index 0000000..8ccbb62
--- /dev/null
+++ b/tests/dds-testsuite/test.25.dds.base
@@ -0,0 +1,6 @@
+DDS past semantic check
+DDS past full semantic check
+Dataset {
+    Structure {
+    } exp;
+} data6;
diff --git a/tests/dds-testsuite/test.26.dds b/tests/dds-testsuite/test.26.dds
new file mode 100644
index 0000000..c1d4b32
--- /dev/null
+++ b/tests/dds-testsuite/test.26.dds
@@ -0,0 +1,8 @@
+dataset {
+    Structure {
+	Int32 j;
+	Int32 i;
+	Structure {
+	} data;
+    } exp;
+} data6;
diff --git a/tests/dds-testsuite/test.26.dds.base b/tests/dds-testsuite/test.26.dds.base
new file mode 100644
index 0000000..2c5c244
--- /dev/null
+++ b/tests/dds-testsuite/test.26.dds.base
@@ -0,0 +1,10 @@
+DDS past semantic check
+DDS past full semantic check
+Dataset {
+    Structure {
+        Int32 j;
+        Int32 i;
+        Structure {
+        } data;
+    } exp;
+} data6;
diff --git a/tests/dds-testsuite/test.3.dds b/tests/dds-testsuite/test.3.dds
new file mode 100644
index 0000000..11491a7
--- /dev/null
+++ b/tests/dds-testsuite/test.3.dds
@@ -0,0 +1,4 @@
+Dataset {
+    Int32 i[10];
+    Float64 f[20];
+} data3;
diff --git a/tests/dds-testsuite/test.3.dds.base b/tests/dds-testsuite/test.3.dds.base
new file mode 100644
index 0000000..095fe2f
--- /dev/null
+++ b/tests/dds-testsuite/test.3.dds.base
@@ -0,0 +1,6 @@
+DDS past semantic check
+DDS past full semantic check
+Dataset {
+    Int32 i[10];
+    Float64 f[20];
+} data3;
diff --git a/tests/dds-testsuite/test.4.dds b/tests/dds-testsuite/test.4.dds
new file mode 100644
index 0000000..0f69969
--- /dev/null
+++ b/tests/dds-testsuite/test.4.dds
@@ -0,0 +1,6 @@
+dataset {
+    int32 i;
+    byte b;
+    String s;
+    url u;
+} data4;
diff --git a/tests/dds-testsuite/test.4.dds.base b/tests/dds-testsuite/test.4.dds.base
new file mode 100644
index 0000000..1f687c6
--- /dev/null
+++ b/tests/dds-testsuite/test.4.dds.base
@@ -0,0 +1,8 @@
+DDS past semantic check
+DDS past full semantic check
+Dataset {
+    Int32 i;
+    Byte b;
+    String s;
+    Url u;
+} data4;
diff --git a/tests/dds-testsuite/test.6.dds b/tests/dds-testsuite/test.6.dds
new file mode 100644
index 0000000..1b9285d
--- /dev/null
+++ b/tests/dds-testsuite/test.6.dds
@@ -0,0 +1,6 @@
+dataset {
+    Structure {
+	Int32 j;
+	Int32 i;
+    } exp;
+} data6;
diff --git a/tests/dds-testsuite/test.6.dds.base b/tests/dds-testsuite/test.6.dds.base
new file mode 100644
index 0000000..3ceea75
--- /dev/null
+++ b/tests/dds-testsuite/test.6.dds.base
@@ -0,0 +1,8 @@
+DDS past semantic check
+DDS past full semantic check
+Dataset {
+    Structure {
+        Int32 j;
+        Int32 i;
+    } exp;
+} data6;
diff --git a/tests/dds-testsuite/test.7.dds b/tests/dds-testsuite/test.7.dds
new file mode 100644
index 0000000..325934a
--- /dev/null
+++ b/tests/dds-testsuite/test.7.dds
@@ -0,0 +1,10 @@
+dataset {
+    Structure {
+	Int32 j;
+	Int32 i;
+	Structure {
+	    int32 i;
+	    float64 f[10];
+	} data;
+    } exp;
+} data6;
diff --git a/tests/dds-testsuite/test.7.dds.base b/tests/dds-testsuite/test.7.dds.base
new file mode 100644
index 0000000..41505c8
--- /dev/null
+++ b/tests/dds-testsuite/test.7.dds.base
@@ -0,0 +1,12 @@
+DDS past semantic check
+DDS past full semantic check
+Dataset {
+    Structure {
+        Int32 j;
+        Int32 i;
+        Structure {
+            Int32 i;
+            Float64 f[10];
+        } data;
+    } exp;
+} data6;
diff --git a/tests/dds-testsuite/test.8.dds b/tests/dds-testsuite/test.8.dds
new file mode 100644
index 0000000..a19c747
--- /dev/null
+++ b/tests/dds-testsuite/test.8.dds
@@ -0,0 +1,14 @@
+dataset {
+    Sequence {
+	String name;
+	Int32 age;
+    } person;
+    Structure {
+	Int32 j;
+	Int32 i;
+	Structure {
+	    int32 i;
+	    float64 f[10];
+	} data;
+    } exp;
+} data6;
diff --git a/tests/dds-testsuite/test.8.dds.base b/tests/dds-testsuite/test.8.dds.base
new file mode 100644
index 0000000..74d407e
--- /dev/null
+++ b/tests/dds-testsuite/test.8.dds.base
@@ -0,0 +1,16 @@
+DDS past semantic check
+DDS past full semantic check
+Dataset {
+    Sequence {
+        String name;
+        Int32 age;
+    } person;
+    Structure {
+        Int32 j;
+        Int32 i;
+        Structure {
+            Int32 i;
+            Float64 f[10];
+        } data;
+    } exp;
+} data6;
diff --git a/tests/dds-testsuite/test.9.dds b/tests/dds-testsuite/test.9.dds
new file mode 100644
index 0000000..335d15f
--- /dev/null
+++ b/tests/dds-testsuite/test.9.dds
@@ -0,0 +1,22 @@
+dataset {
+    Sequence {
+	String name;
+	Int32 age;
+    } person;
+    Structure {
+	Int32 j;
+	Int32 i;
+	Structure {
+	    int32 i;
+	    float64 f[10];
+	} data;
+    } exp;
+    Grid {
+      Array:
+	float64 g[10][10][10];
+      Maps:
+	float64 lat[10];
+	float64 lon[10];
+	float64 weirdness[10];
+    } strange;
+} data6;
diff --git a/tests/dds-testsuite/test.9.dds.base b/tests/dds-testsuite/test.9.dds.base
new file mode 100644
index 0000000..dae2057
--- /dev/null
+++ b/tests/dds-testsuite/test.9.dds.base
@@ -0,0 +1,24 @@
+DDS past semantic check
+DDS past full semantic check
+Dataset {
+    Sequence {
+        String name;
+        Int32 age;
+    } person;
+    Structure {
+        Int32 j;
+        Int32 i;
+        Structure {
+            Int32 i;
+            Float64 f[10];
+        } data;
+    } exp;
+    Grid {
+      Array:
+        Float64 g[10][10][10];
+      Maps:
+        Float64 lat[10];
+        Float64 lon[10];
+        Float64 weirdness[10];
+    } strange;
+} data6;
\ No newline at end of file
diff --git a/tests/dmr-test.cc b/tests/dmr-test.cc
new file mode 100644
index 0000000..eb75619
--- /dev/null
+++ b/tests/dmr-test.cc
@@ -0,0 +1,485 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003,2013 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// Test the DMR parser
+
+#include "config.h"
+
+#include <stdint.h>
+#include <cstring>
+
+#include <fstream>
+#include <memory>
+
+#include "crc.h"
+
+#include <GetOpt.h>
+
+#include "BaseType.h"
+#include "Array.h"
+#include "D4Enum.h"
+
+#include "DMR.h"
+#include "D4Group.h"
+#include "D4StreamUnMarshaller.h"
+#include "chunked_ostream.h"
+#include "chunked_istream.h"
+
+#include "util.h"
+#include "InternalErr.h"
+#include "Error.h"
+
+#include "D4ResponseBuilder.h"
+#include "ConstraintEvaluator.h"
+
+#include "D4ParserSax2.h"
+#include "D4TestTypeFactory.h"
+#include "TestCommon.h"
+
+#include "D4ConstraintEvaluator.h"
+#include "D4FunctionEvaluator.h"
+#include "ServerFunctionsList.h"
+#include "D4TestFunction.h"
+#include "D4RValue.h"
+
+#include "util.h"
+#include "mime_util.h"
+#include "debug.h"
+
+int test_variable_sleep_interval = 0;   // Used in Test* classes for testing timeouts.
+
+using namespace libdap;
+
+/**
+ * Open the named XML file and parse it, assuming that it contains a DMR.
+ * @param name The name of the DMR XML file (or '-' for stdin)
+ * @param debug True if the debug mode of the parse should be used
+ * @param print Once parsed, should the DMR object be printed?
+ * @return true if the parse worked, false otherwise
+ */
+DMR *
+test_dap4_parser(const string &name, bool debug, bool print)
+{
+    D4TestTypeFactory *factory = new D4TestTypeFactory;
+    DMR *dataset = new DMR(factory, path_to_filename(name));
+
+    try {
+        D4ParserSax2 parser;
+        if (name == "-") {
+            parser.intern(cin, dataset, debug);
+        }
+        else {
+            fstream in(name.c_str(), ios_base::in);
+            parser.intern(in, dataset, debug);
+        }
+    }
+    catch(...) {
+        delete factory;
+        delete dataset;
+        throw;
+    }
+
+    cout << "Parse successful" << endl;
+
+    if (print) {
+        XMLWriter xml("    ");
+        dataset->print_dap4(xml, false);
+        cout << xml.get_doc() << endl;
+    }
+
+    delete factory;
+    dataset->set_factory(0);
+    return dataset;
+}
+
+/**
+ * Should the changing values - meant to mimic the DTS - be used?
+ * @param dmr Set for this DMR
+ * @param state True to use the DTS-like values, false otherwise
+ */
+void
+set_series_values(DMR *dmr, bool state)
+{
+	if (state == true)
+		dmr->root()->set_read_p(false);
+
+	TestCommon *tc = dynamic_cast<TestCommon*>(dmr->root());
+	if (tc)
+		tc->set_series_values(state);
+	else
+		cerr << "Could not cast root group to TestCommon (" << dmr->root()->type_name() << ", " << dmr->root()->name() << ")" << endl;
+}
+
+/**
+ * Call the parser and then serialize the resulting DMR after applying the
+ * constraint. The persistent representation is written to a file. The file
+ * is name '<name>_data.bin'.
+ *
+ * @param dataset
+ * @param constraint
+ * @param series_values
+ * @return The name of the file that hods the response.
+ */
+string
+send_data(DMR *dataset, const string &constraint, const string &function, bool series_values, bool ce_parser_debug)
+{
+    set_series_values(dataset, series_values);
+
+    // This will be used by the DMR that holds the results of running the functions.
+    // It's declared at this scope because we (may) need it for the code beyond the
+    // function parse/eval code that immediately follows. jhrg 3/12/14
+    D4TestTypeFactory d4_factory;
+    auto_ptr<DMR> function_result(new DMR(&d4_factory, "function_results"));
+
+	// The Function Parser
+	if (!function.empty()) {
+		ServerFunctionsList *sf_list = ServerFunctionsList::TheList();
+		ServerFunction *scale = new D4TestFunction;
+		sf_list->add_function(scale);
+
+		D4FunctionEvaluator parser(dataset, sf_list);
+		if (ce_parser_debug) parser.set_trace_parsing(true);
+		bool parse_ok = parser.parse(function);
+		if (!parse_ok)
+			Error("Function Expression failed to parse.");
+		else {
+			if (ce_parser_debug) cerr << "Function Parse OK" << endl;
+
+			parser.eval(function_result.get());
+
+			// Now use the results of running the functions for the remainder of the
+			// send_data operation.
+			dataset = function_result.release();
+		}
+	}
+
+    D4ResponseBuilder rb;
+    rb.set_dataset_name(dataset->name());
+
+    string file_name = dataset->name() + "_data.bin";
+    ofstream out(file_name.c_str(), ios::out|ios::trunc|ios::binary);
+
+	if (!constraint.empty()) {
+		D4ConstraintEvaluator parser(dataset);
+		if (ce_parser_debug)
+		    parser.set_trace_parsing(true);
+		bool parse_ok = parser.parse(constraint);
+		if (!parse_ok)
+			throw Error("Constraint Expression failed to parse.");
+		else if (ce_parser_debug)
+		    cerr << "CE Parse OK" << endl;
+	}
+    else {
+    	dataset->root()->set_send_p(true);
+    }
+
+    rb.send_dap(out, *dataset, /*with mime headers*/ true, !constraint.empty());
+    out.close();
+
+    return file_name;
+}
+
+void
+intern_data(DMR *dataset, /*const string &constraint,*/ bool series_values)
+{
+    set_series_values(dataset, series_values);
+
+    // Mark all variables to be sent in their entirety. No CEs are used
+    // when 'interning' variables' data.
+    dataset->root()->set_send_p(true);
+#if 0
+    Crc32 checksum;
+#endif
+    dataset->root()->intern_data(/*checksum, *dataset, eval*/);
+}
+
+DMR *
+read_data_plain(const string &file_name, bool debug)
+{
+    D4BaseTypeFactory *factory = new D4BaseTypeFactory;
+    DMR *dmr = new DMR(factory, "Test_data");
+
+    fstream in(file_name.c_str(), ios::in|ios::binary);
+
+    // Gobble up the response's initial set of MIME headers. Normally
+    // a client would extract information from these headers.
+    remove_mime_header(in);
+
+    chunked_istream cis(in, CHUNK_SIZE);
+
+    // parse the DMR, stopping when the boundary is found.
+    try {
+        // force chunk read
+        // get chunk size
+        int chunk_size = cis.read_next_chunk();
+        // get chunk
+        char chunk[chunk_size];
+        cis.read(chunk, chunk_size);
+        // parse char * with given size
+    	D4ParserSax2 parser;
+
+    	// Mirror the behavior in D4Connect where we are permissive with DAP4
+    	// data responses' parsing, as per Hyrax-98 in Jira. jhrg 4/13/16
+    	parser.set_strict(false);
+
+    	// '-2' to discard the CRLF pair
+        parser.intern(chunk, chunk_size-2, dmr, debug);
+    }
+    catch(Error &e) {
+    	delete factory;
+    	delete dmr;
+    	cerr << "Exception: " << e.get_error_message() << endl;
+    	return 0;
+    }
+    catch(std::exception &e) {
+    	delete factory;
+    	delete dmr;
+    	cerr << "Exception: " << e.what() << endl;
+    	return 0;
+    }
+    catch(...) {
+    	delete factory;
+    	delete dmr;
+    	cerr << "Exception: unknown error" << endl;
+    	return 0;
+    }
+
+    D4StreamUnMarshaller um(cis, cis.twiddle_bytes());
+
+    dmr->root()->deserialize(um, *dmr);
+
+    delete factory;
+    dmr->set_factory(0);
+    return dmr;
+}
+
+static void usage()
+{
+    cerr << "Usage: dmr-test -p|s|t|i <file> [-c <expr>] [-f <function expression>] [-d -x -e]" << endl
+            << "p: Parse a file (use \"-\" for stdin; if a ce or a function is passed those are parsed too)" << endl
+            << "s: Send: parse and then 'send' a response to a file" << endl
+            << "t: Transmit: parse, send and then read the response file" << endl
+            << "i: Intern values (ce and function will be ignored by this)" << endl
+            << "c: Constraint expression " << endl
+            << "f: Function expression" << endl
+            << "d: turn on detailed xml parser debugging" << endl
+            << "D: turn on detailed ce parser debugging" << endl
+            << "x: print the binary object(s) built by the parse, send, trans or intern operations." << endl
+            << "e: use sEries values." << endl;
+}
+
+int
+main(int argc, char *argv[])
+{
+    GetOpt getopt(argc, argv, "p:s:t:i:c:f:xdDeh?");
+    int option_char;
+    bool parse = false;
+    bool debug = false;
+    bool print = false;
+    bool send = false;
+    bool trans = false;
+    bool intern = false;
+    bool series_values = false;
+    bool constrained = false;
+    bool functional = false;
+    bool ce_parser_debug = false;
+    string name = "";
+    string ce = "";
+    string function = "";
+
+    // process options
+
+    while ((option_char = getopt()) != -1)
+        switch (option_char) {
+        case 'p':
+            parse = true;
+            name = getopt.optarg;
+            break;
+
+        case 's':
+        	send = true;
+        	name = getopt.optarg;
+        	break;
+
+        case 't':
+        	trans = true;
+        	name = getopt.optarg;
+        	break;
+
+        case 'i':
+        	intern = true;
+        	name = getopt.optarg;
+        	break;
+
+        case 'c':
+        	constrained = true;
+        	ce = getopt.optarg;
+        	break;
+
+        case 'f':
+        	functional = true;
+        	function = getopt.optarg;
+        	break;
+
+        case 'd':
+            debug = true;
+            break;
+
+        case 'D':
+            ce_parser_debug = true;
+            break;
+
+        case 'x':
+            print = true;
+            break;
+
+        case 'e':
+        	series_values = true;
+        	break;
+
+        case '?':
+        case 'h':
+            usage();
+            return 0;
+
+        default:
+            cerr << "Error: ";
+            usage();
+            return 1;
+        }
+
+    if (! (parse || send || trans || intern)) {
+        cerr << "Error: ";
+        usage();
+        return 1;
+    }
+
+    try {
+		if (parse) {
+			DMR *dmr = test_dap4_parser(name, debug, print);
+
+			// The CE Parser
+			if (!ce.empty()) {
+				try {
+					D4ConstraintEvaluator parser(dmr);
+					if (ce_parser_debug) parser.set_trace_parsing(true);
+					bool parse_ok = parser.parse(ce);
+					if (!parse_ok)
+						cout << "CE Parse Failed" << endl;
+					else
+						cout << "CE Parse OK" << endl;
+				}
+				catch (Error &e) {
+					cerr << "CE Parse error: " << e.get_error_message() << endl;
+				}
+				catch (...) {
+					cerr << "Ce Parse error: Unknown exception thrown by parser" << endl;
+				}
+			}
+
+			// The Function Parser
+			if (!function.empty()) {
+				try {
+					ServerFunctionsList *sf_list = ServerFunctionsList::TheList();
+				    ServerFunction *scale = new D4TestFunction;
+				    sf_list->add_function(scale);
+
+					D4FunctionEvaluator parser(dmr, sf_list);
+					if (ce_parser_debug) parser.set_trace_parsing(true);
+					bool parse_ok = parser.parse(function);
+					if (!parse_ok)
+						cout << "Function Parse Failed" << endl;
+					else
+						cout << "Function Parse OK" << endl;
+				}
+				catch (Error &e) {
+					cerr << "Function Parse error: " << e.get_error_message() << endl;
+				}
+				catch (...) {
+					cerr << "Function Parse error: Unknown exception thrown by parser" << endl;
+				}
+			}
+
+			delete dmr;
+		}
+
+		if (send) {
+        	DMR *dmr = test_dap4_parser(name, debug, print);
+
+        	string file_name = send_data(dmr, ce, function, series_values, ce_parser_debug);
+        	if (print)
+        		cout << "Response file: " << file_name << endl;
+        	delete dmr;
+        }
+
+        if (trans) {
+        	DMR *dmr = test_dap4_parser(name, debug, print);
+        	string file_name = send_data(dmr, ce, function, series_values, ce_parser_debug);
+         	delete dmr;
+
+        	DMR *client = read_data_plain(file_name, debug);
+
+        	if (print) {
+        		XMLWriter xml;
+        		// received data never have send_p set; don't set 'constrained'
+        		client->print_dap4(xml, false /* constrained */);
+        		cout << xml.get_doc() << endl;
+
+				cout << "The data:" << endl;
+        	}
+
+        	// if trans is used, the data are printed regardless of print's value
+    		client->root()->print_val(cout, "", false);
+    		cout << endl;
+
+        	delete client;
+        }
+
+        if (intern) {
+        	DMR *dmr = test_dap4_parser(name, debug, print);
+        	intern_data(dmr, /*ce,*/ series_values);
+
+        	if (print) {
+        		XMLWriter xml;
+        		dmr->print_dap4(xml, false /*constrained*/);
+        		cout << xml.get_doc() << endl;
+
+				cout << "The data:" << endl;
+        	}
+
+        	// if trans is used, the data are printed regardless of print's value
+    		dmr->root()->print_val(cout, /*space*/"", false);
+    		cout << endl;
+
+        	delete dmr;
+        }
+    }
+    catch (Error &e) {
+        cerr << "Error: " << e.get_error_message() << endl;
+        return 1;
+    }
+
+    return 0;
+}
+
diff --git a/tests/dmr-testsuite/big-endian/test_array_1.xml.1.func_base b/tests/dmr-testsuite/big-endian/test_array_1.xml.1.func_base
new file mode 100644
index 0000000..13c09d5
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_1.xml.1.func_base
@@ -0,0 +1,20 @@
+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_1.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_1">
+    <Int32 name="x">
+        <Dim size="5"/>
+    </Int32>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="function_results">
+    <Float64 name="x">
+        <Dim size="5"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>76f4d278</Value>
+        </Attribute>
+    </Float64>
+</Dataset>
+
+The data:
+{ {123456789, 123456789, 123456789, 123456789, 123456789} }
diff --git a/tests/dmr-testsuite/big-endian/test_array_1.xml.2.func_base b/tests/dmr-testsuite/big-endian/test_array_1.xml.2.func_base
new file mode 100644
index 0000000..d1eb0f5
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_1.xml.2.func_base
@@ -0,0 +1,20 @@
+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_1.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_1">
+    <Int32 name="x">
+        <Dim size="5"/>
+    </Int32>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="function_results">
+    <Float64 name="x">
+        <Dim size="5"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>22a873db</Value>
+        </Attribute>
+    </Float64>
+</Dataset>
+
+The data:
+{ {1234567890, 1234567890, 1234567890, 1234567890, 1234567890} }
diff --git a/tests/dmr-testsuite/big-endian/test_array_1.xml.3.func_base b/tests/dmr-testsuite/big-endian/test_array_1.xml.3.func_base
new file mode 100644
index 0000000..aadd23c
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_1.xml.3.func_base
@@ -0,0 +1,20 @@
+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_1.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_1">
+    <Int32 name="x">
+        <Dim size="5"/>
+    </Int32>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="function_results">
+    <Float64 name="x">
+        <Dim size="5"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>40e09f23</Value>
+        </Attribute>
+    </Float64>
+</Dataset>
+
+The data:
+{ {-1234567890, -1234567890, -1234567890, -1234567890, -1234567890} }
diff --git a/tests/dmr-testsuite/big-endian/test_array_1.xml.4.func_base b/tests/dmr-testsuite/big-endian/test_array_1.xml.4.func_base
new file mode 100644
index 0000000..862a9e3
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_1.xml.4.func_base
@@ -0,0 +1,20 @@
+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_1.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_1">
+    <Int32 name="x">
+        <Dim size="5"/>
+    </Int32>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="function_results">
+    <Float64 name="x">
+        <Dim size="5"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>089f333d</Value>
+        </Attribute>
+    </Float64>
+</Dataset>
+
+The data:
+{ {123456.789, 123456.789, 123456.789, 123456.789, 123456.789} }
diff --git a/tests/dmr-testsuite/big-endian/test_array_1.xml.5.func_base b/tests/dmr-testsuite/big-endian/test_array_1.xml.5.func_base
new file mode 100644
index 0000000..4a34f5b
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_1.xml.5.func_base
@@ -0,0 +1,20 @@
+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_1.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_1">
+    <Int32 name="x">
+        <Dim size="5"/>
+    </Int32>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="function_results">
+    <Float64 name="x">
+        <Dim size="5"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>6ad7dfc5</Value>
+        </Attribute>
+    </Float64>
+</Dataset>
+
+The data:
+{ {-123456.789, -123456.789, -123456.789, -123456.789, -123456.789} }
diff --git a/tests/dmr-testsuite/big-endian/test_array_1.xml.6.func_base b/tests/dmr-testsuite/big-endian/test_array_1.xml.6.func_base
new file mode 100644
index 0000000..9cfeaae
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_1.xml.6.func_base
@@ -0,0 +1,20 @@
+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_1.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_1">
+    <Int32 name="x">
+        <Dim size="5"/>
+    </Int32>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="function_results">
+    <Float64 name="x">
+        <Dim size="5"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>1184f064</Value>
+        </Attribute>
+    </Float64>
+</Dataset>
+
+The data:
+{ {1.13868789542248e+27, 1.13868789542248e+27, 1.13868789542248e+27, 1.13868789542248e+27, 1.13868789542248e+27} }
diff --git a/tests/dmr-testsuite/big-endian/test_array_1.xml.7.func_base b/tests/dmr-testsuite/big-endian/test_array_1.xml.7.func_base
new file mode 100644
index 0000000..aabd44a
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_1.xml.7.func_base
@@ -0,0 +1,20 @@
+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_1.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_1">
+    <Int32 name="x">
+        <Dim size="5"/>
+    </Int32>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="function_results">
+    <Float64 name="x">
+        <Dim size="5"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>3be04b16</Value>
+        </Attribute>
+    </Float64>
+</Dataset>
+
+The data:
+{ {1.28102388235029e+27, 1.28102388235029e+27, 1.28102388235029e+27, 1.28102388235029e+27, 1.28102388235029e+27} }
diff --git a/tests/dmr-testsuite/big-endian/test_array_1.xml.intern_base b/tests/dmr-testsuite/big-endian/test_array_1.xml.intern_base
new file mode 100644
index 0000000..03726e5
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_1.xml.intern_base
@@ -0,0 +1,17 @@
+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_1.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_1">
+    <Int32 name="x">
+        <Dim size="5"/>
+    </Int32>
+</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_1.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_1">
+    <Int32 name="x">
+        <Dim size="5"/>
+    </Int32>
+</Dataset>
+
+The data:
+{ {123456789, 123456789, 123456789, 123456789, 123456789} }
diff --git a/tests/dmr-testsuite/big-endian/test_array_1.xml.trans_base b/tests/dmr-testsuite/big-endian/test_array_1.xml.trans_base
new file mode 100644
index 0000000..91317fa
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_1.xml.trans_base
@@ -0,0 +1,20 @@
+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_1.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_1">
+    <Int32 name="x">
+        <Dim size="5"/>
+    </Int32>
+</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_1.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_1">
+    <Int32 name="x">
+        <Dim size="5"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>ebd5bedf</Value>
+        </Attribute>
+    </Int32>
+</Dataset>
+
+The data:
+{ {123456789, 123456789, 123456789, 123456789, 123456789} }
diff --git a/tests/dmr-testsuite/big-endian/test_array_10.xml.intern_base b/tests/dmr-testsuite/big-endian/test_array_10.xml.intern_base
new file mode 100644
index 0000000..cb3703f
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_10.xml.intern_base
@@ -0,0 +1,29 @@
+Parse successful
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:test_simple_11.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_11">
+    <Dimension name="d1" size="5"/>
+    <Dimension name="d2" size="3"/>
+    <Opaque name="o">
+        <Dim name="/d1"/>
+    </Opaque>
+    <Opaque name="p">
+        <Dim name="/d1"/>
+        <Dim name="/d2"/>
+    </Opaque>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:test_simple_11.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_11">
+    <Dimension name="d1" size="5"/>
+    <Dimension name="d2" size="3"/>
+    <Opaque name="o">
+        <Dim name="/d1"/>
+    </Opaque>
+    <Opaque name="p">
+        <Dim name="/d1"/>
+        <Dim name="/d2"/>
+    </Opaque>
+</Dataset>
+
+The data:
+{ {1,2,3,4,5, 1,2,3,4,5, 1,2,3,4,5, 1,2,3,4,5, 1,2,3,4,5}, {{1,2,3,4,5, 1,2,3,4,5, 1,2,3,4,5},{1,2,3,4,5, 1,2,3,4,5, 1,2,3,4,5},{1,2,3,4,5, 1,2,3,4,5, 1,2,3,4,5},{1,2,3,4,5, 1,2,3,4,5, 1,2,3,4,5},{1,2,3,4,5, 1,2,3,4,5, 1,2,3,4,5}} }
diff --git a/tests/dmr-testsuite/big-endian/test_array_10.xml.trans_base b/tests/dmr-testsuite/big-endian/test_array_10.xml.trans_base
new file mode 100644
index 0000000..cbd7697
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_10.xml.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:test_simple_11.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_11">
+    <Dimension name="d1" size="5"/>
+    <Dimension name="d2" size="3"/>
+    <Opaque name="o">
+        <Dim name="/d1"/>
+    </Opaque>
+    <Opaque name="p">
+        <Dim name="/d1"/>
+        <Dim name="/d2"/>
+    </Opaque>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:test_simple_11.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_11">
+    <Dimension name="d1" size="5"/>
+    <Dimension name="d2" size="3"/>
+    <Opaque name="o">
+        <Dim name="/d1"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>3d021e3e</Value>
+        </Attribute>
+    </Opaque>
+    <Opaque name="p">
+        <Dim name="/d1"/>
+        <Dim name="/d2"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>c9ba1dbe</Value>
+        </Attribute>
+    </Opaque>
+</Dataset>
+
+The data:
+{ {1,2,3,4,5, 1,2,3,4,5, 1,2,3,4,5, 1,2,3,4,5, 1,2,3,4,5}, {{1,2,3,4,5, 1,2,3,4,5, 1,2,3,4,5},{1,2,3,4,5, 1,2,3,4,5, 1,2,3,4,5},{1,2,3,4,5, 1,2,3,4,5, 1,2,3,4,5},{1,2,3,4,5, 1,2,3,4,5, 1,2,3,4,5},{1,2,3,4,5, 1,2,3,4,5, 1,2,3,4,5}} }
diff --git a/tests/dmr-testsuite/big-endian/test_array_11.xml.intern_base b/tests/dmr-testsuite/big-endian/test_array_11.xml.intern_base
new file mode 100644
index 0000000..19701dd
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_11.xml.intern_base
@@ -0,0 +1,39 @@
+Parse successful
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:test_simple_11.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_11">
+    <Dimension name="d1" size="5"/>
+    <Dimension name="d2" size="3"/>
+    <Enumeration name="colors" basetype="Byte">
+        <EnumConst name="red" value="1"/>
+        <EnumConst name="green" value="2"/>
+        <EnumConst name="blue" value="3"/>
+    </Enumeration>
+    <Enum name="e1" enum="/colors">
+        <Dim name="/d1"/>
+    </Enum>
+    <Enum name="e2" enum="/colors">
+        <Dim name="/d1"/>
+        <Dim name="/d2"/>
+    </Enum>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:test_simple_11.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_11">
+    <Dimension name="d1" size="5"/>
+    <Dimension name="d2" size="3"/>
+    <Enumeration name="colors" basetype="Byte">
+        <EnumConst name="red" value="1"/>
+        <EnumConst name="green" value="2"/>
+        <EnumConst name="blue" value="3"/>
+    </Enumeration>
+    <Enum name="e1" enum="/colors">
+        <Dim name="/d1"/>
+    </Enum>
+    <Enum name="e2" enum="/colors">
+        <Dim name="/d1"/>
+        <Dim name="/d2"/>
+    </Enum>
+</Dataset>
+
+The data:
+{ {1, 1, 1, 1, 1}, {{1, 1, 1},{1, 1, 1},{1, 1, 1},{1, 1, 1},{1, 1, 1}} }
diff --git a/tests/dmr-testsuite/big-endian/test_array_11.xml.trans_base b/tests/dmr-testsuite/big-endian/test_array_11.xml.trans_base
new file mode 100644
index 0000000..0e3f36e
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_11.xml.trans_base
@@ -0,0 +1,45 @@
+Parse successful
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:test_simple_11.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_11">
+    <Dimension name="d1" size="5"/>
+    <Dimension name="d2" size="3"/>
+    <Enumeration name="colors" basetype="Byte">
+        <EnumConst name="red" value="1"/>
+        <EnumConst name="green" value="2"/>
+        <EnumConst name="blue" value="3"/>
+    </Enumeration>
+    <Enum name="e1" enum="/colors">
+        <Dim name="/d1"/>
+    </Enum>
+    <Enum name="e2" enum="/colors">
+        <Dim name="/d1"/>
+        <Dim name="/d2"/>
+    </Enum>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:test_simple_11.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_11">
+    <Dimension name="d1" size="5"/>
+    <Dimension name="d2" size="3"/>
+    <Enumeration name="colors" basetype="Byte">
+        <EnumConst name="red" value="1"/>
+        <EnumConst name="green" value="2"/>
+        <EnumConst name="blue" value="3"/>
+    </Enumeration>
+    <Enum name="e1" enum="/colors">
+        <Dim name="/d1"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>2c20d228</Value>
+        </Attribute>
+    </Enum>
+    <Enum name="e2" enum="/colors">
+        <Dim name="/d1"/>
+        <Dim name="/d2"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>c7a0f194</Value>
+        </Attribute>
+    </Enum>
+</Dataset>
+
+The data:
+{ {1, 1, 1, 1, 1}, {{1, 1, 1},{1, 1, 1},{1, 1, 1},{1, 1, 1},{1, 1, 1}} }
diff --git a/tests/dmr-testsuite/big-endian/test_array_12.xml.intern_base b/tests/dmr-testsuite/big-endian/test_array_12.xml.intern_base
new file mode 100644
index 0000000..c83cac0
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_12.xml.intern_base
@@ -0,0 +1,23 @@
+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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
+    <Int32 name="i">
+        <Dim size="5"/>
+    </Int32>
+    <Int32 name="x">
+        <Dim size="0"/>
+    </Int32>
+</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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
+    <Int32 name="i">
+        <Dim size="5"/>
+    </Int32>
+    <Int32 name="x">
+        <Dim size="0"/>
+    </Int32>
+</Dataset>
+
+The data:
+{ {123456789, 123456789, 123456789, 123456789, 123456789}, {} }
diff --git a/tests/dmr-testsuite/big-endian/test_array_12.xml.trans_base b/tests/dmr-testsuite/big-endian/test_array_12.xml.trans_base
new file mode 100644
index 0000000..306fe92
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_12.xml.trans_base
@@ -0,0 +1,29 @@
+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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
+    <Int32 name="i">
+        <Dim size="5"/>
+    </Int32>
+    <Int32 name="x">
+        <Dim size="0"/>
+    </Int32>
+</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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
+    <Int32 name="i">
+        <Dim size="5"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>ebd5bedf</Value>
+        </Attribute>
+    </Int32>
+    <Int32 name="x">
+        <Dim size="0"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>00000000</Value>
+        </Attribute>
+    </Int32>
+</Dataset>
+
+The data:
+{ {123456789, 123456789, 123456789, 123456789, 123456789}, {} }
diff --git a/tests/dmr-testsuite/big-endian/test_array_13.xml.intern_base b/tests/dmr-testsuite/big-endian/test_array_13.xml.intern_base
new file mode 100644
index 0000000..4dde012
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_13.xml.intern_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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
+    <Int32 name="i">
+        <Dim size="5"/>
+    </Int32>
+    <Int32 name="x">
+        <Dim size="4"/>
+        <Dim size="0"/>
+    </Int32>
+</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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
+    <Int32 name="i">
+        <Dim size="5"/>
+    </Int32>
+    <Int32 name="x">
+        <Dim size="4"/>
+        <Dim size="0"/>
+    </Int32>
+</Dataset>
+
+The data:
+{ {123456789, 123456789, 123456789, 123456789, 123456789}, {{},{},{},{}} }
diff --git a/tests/dmr-testsuite/big-endian/test_array_13.xml.trans_base b/tests/dmr-testsuite/big-endian/test_array_13.xml.trans_base
new file mode 100644
index 0000000..21e4274
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_13.xml.trans_base
@@ -0,0 +1,31 @@
+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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
+    <Int32 name="i">
+        <Dim size="5"/>
+    </Int32>
+    <Int32 name="x">
+        <Dim size="4"/>
+        <Dim size="0"/>
+    </Int32>
+</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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
+    <Int32 name="i">
+        <Dim size="5"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>ebd5bedf</Value>
+        </Attribute>
+    </Int32>
+    <Int32 name="x">
+        <Dim size="4"/>
+        <Dim size="0"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>00000000</Value>
+        </Attribute>
+    </Int32>
+</Dataset>
+
+The data:
+{ {123456789, 123456789, 123456789, 123456789, 123456789}, {{},{},{},{}} }
diff --git a/tests/dmr-testsuite/big-endian/test_array_14.xml.intern_base b/tests/dmr-testsuite/big-endian/test_array_14.xml.intern_base
new file mode 100644
index 0000000..99eeb81
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_14.xml.intern_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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
+    <Int32 name="i">
+        <Dim size="5"/>
+    </Int32>
+    <Int32 name="x">
+        <Dim size="0"/>
+        <Dim size="4"/>
+    </Int32>
+</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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
+    <Int32 name="i">
+        <Dim size="5"/>
+    </Int32>
+    <Int32 name="x">
+        <Dim size="0"/>
+        <Dim size="4"/>
+    </Int32>
+</Dataset>
+
+The data:
+{ {123456789, 123456789, 123456789, 123456789, 123456789}, {} }
diff --git a/tests/dmr-testsuite/big-endian/test_array_14.xml.trans_base b/tests/dmr-testsuite/big-endian/test_array_14.xml.trans_base
new file mode 100644
index 0000000..84f92ae
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_14.xml.trans_base
@@ -0,0 +1,31 @@
+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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
+    <Int32 name="i">
+        <Dim size="5"/>
+    </Int32>
+    <Int32 name="x">
+        <Dim size="0"/>
+        <Dim size="4"/>
+    </Int32>
+</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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
+    <Int32 name="i">
+        <Dim size="5"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>ebd5bedf</Value>
+        </Attribute>
+    </Int32>
+    <Int32 name="x">
+        <Dim size="0"/>
+        <Dim size="4"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>00000000</Value>
+        </Attribute>
+    </Int32>
+</Dataset>
+
+The data:
+{ {123456789, 123456789, 123456789, 123456789, 123456789}, {} }
diff --git a/tests/dmr-testsuite/big-endian/test_array_2.xml.intern_base b/tests/dmr-testsuite/big-endian/test_array_2.xml.intern_base
new file mode 100644
index 0000000..363c92b
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_2.xml.intern_base
@@ -0,0 +1,19 @@
+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_2.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_2">
+    <Int32 name="x">
+        <Dim size="5"/>
+        <Dim size="4"/>
+    </Int32>
+</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_2.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_2">
+    <Int32 name="x">
+        <Dim size="5"/>
+        <Dim size="4"/>
+    </Int32>
+</Dataset>
+
+The data:
+{ {{123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789}} }
diff --git a/tests/dmr-testsuite/big-endian/test_array_2.xml.trans_base b/tests/dmr-testsuite/big-endian/test_array_2.xml.trans_base
new file mode 100644
index 0000000..033eb02
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_2.xml.trans_base
@@ -0,0 +1,22 @@
+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_2.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_2">
+    <Int32 name="x">
+        <Dim size="5"/>
+        <Dim size="4"/>
+    </Int32>
+</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_2.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_2">
+    <Int32 name="x">
+        <Dim size="5"/>
+        <Dim size="4"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>813ab7f7</Value>
+        </Attribute>
+    </Int32>
+</Dataset>
+
+The data:
+{ {{123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789}} }
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/big-endian/test_array_3.xml.intern_base b/tests/dmr-testsuite/big-endian/test_array_3.xml.intern_base
new file mode 100644
index 0000000..aa16004
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_3.xml.intern_base
@@ -0,0 +1,21 @@
+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"/>
+    <String name="x">
+        <Dim name="/row"/>
+        <Dim size="3"/>
+    </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"/>
+        <Dim size="3"/>
+    </String>
+</Dataset>
+
+The data:
+{ {{"Silly test string: 1", "Silly test string: 1", "Silly test string: 1"},{"Silly test string: 1", "Silly test string: 1", "Silly test string: 1"},{"Silly test string: 1", "Silly test string: 1", "Silly test string: 1"},{"Silly test string: 1", "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.xml.trans_base b/tests/dmr-testsuite/big-endian/test_array_3.xml.trans_base
new file mode 100644
index 0000000..99e0353
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_3.xml.trans_base
@@ -0,0 +1,24 @@
+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"/>
+    <String name="x">
+        <Dim name="/row"/>
+        <Dim size="3"/>
+    </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"/>
+        <Dim size="3"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>22983e08</Value>
+        </Attribute>
+    </String>
+</Dataset>
+
+The data:
+{ {{"Silly test string: 1", "Silly test string: 1", "Silly test string: 1"},{"Silly test string: 1", "Silly test string: 1", "Silly test string: 1"},{"Silly test string: 1", "Silly test string: 1", "Silly test string: 1"},{"Silly test string: 1", "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_4.xml.1.trans_base b/tests/dmr-testsuite/big-endian/test_array_4.xml.1.trans_base
new file mode 100644
index 0000000..990f794
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_4.xml.1.trans_base
@@ -0,0 +1,66 @@
+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_4.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_4">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Byte name="a">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Byte>
+    <Int16 name="b">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int16>
+    <Int32 name="c">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int32>
+    <UInt16 name="d">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt16>
+    <UInt32 name="e">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt32>
+    <Float32 name="f">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Float32>
+    <Float64 name="g">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Float64>
+    <String name="h">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </String>
+    <URL name="i">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </URL>
+    <Int32 name="x">
+        <Dim name="/row"/>
+        <Dim size="5"/>
+    </Int32>
+    <Int32 name="y">
+        <Dim size="5"/>
+        <Dim name="/col"/>
+    </Int32>
+</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_4.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_4">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Byte name="a">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>bb99ff8a</Value>
+        </Attribute>
+    </Byte>
+</Dataset>
+
+The data:
+{ {{255, 255, 255, 255},{255, 255, 255, 255},{255, 255, 255, 255}} }
diff --git a/tests/dmr-testsuite/big-endian/test_array_4.xml.3.trans_base b/tests/dmr-testsuite/big-endian/test_array_4.xml.3.trans_base
new file mode 100644
index 0000000..f0815f0
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_4.xml.3.trans_base
@@ -0,0 +1,66 @@
+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_4.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_4">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Byte name="a">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Byte>
+    <Int16 name="b">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int16>
+    <Int32 name="c">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int32>
+    <UInt16 name="d">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt16>
+    <UInt32 name="e">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt32>
+    <Float32 name="f">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Float32>
+    <Float64 name="g">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Float64>
+    <String name="h">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </String>
+    <URL name="i">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </URL>
+    <Int32 name="x">
+        <Dim name="/row"/>
+        <Dim size="5"/>
+    </Int32>
+    <Int32 name="y">
+        <Dim size="5"/>
+        <Dim name="/col"/>
+    </Int32>
+</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_4.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_4">
+    <Dimension name="row" size="2"/>
+    <Dimension name="col" size="1"/>
+    <Byte name="a">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>ffff0000</Value>
+        </Attribute>
+    </Byte>
+</Dataset>
+
+The data:
+{ {{255},{255}} }
diff --git a/tests/dmr-testsuite/big-endian/test_array_4.xml.4.trans_base b/tests/dmr-testsuite/big-endian/test_array_4.xml.4.trans_base
new file mode 100644
index 0000000..f0815f0
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_4.xml.4.trans_base
@@ -0,0 +1,66 @@
+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_4.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_4">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Byte name="a">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Byte>
+    <Int16 name="b">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int16>
+    <Int32 name="c">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int32>
+    <UInt16 name="d">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt16>
+    <UInt32 name="e">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt32>
+    <Float32 name="f">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Float32>
+    <Float64 name="g">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Float64>
+    <String name="h">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </String>
+    <URL name="i">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </URL>
+    <Int32 name="x">
+        <Dim name="/row"/>
+        <Dim size="5"/>
+    </Int32>
+    <Int32 name="y">
+        <Dim size="5"/>
+        <Dim name="/col"/>
+    </Int32>
+</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_4.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_4">
+    <Dimension name="row" size="2"/>
+    <Dimension name="col" size="1"/>
+    <Byte name="a">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>ffff0000</Value>
+        </Attribute>
+    </Byte>
+</Dataset>
+
+The data:
+{ {{255},{255}} }
diff --git a/tests/dmr-testsuite/big-endian/test_array_4.xml.5.trans_base b/tests/dmr-testsuite/big-endian/test_array_4.xml.5.trans_base
new file mode 100644
index 0000000..c8bbafe
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_4.xml.5.trans_base
@@ -0,0 +1,80 @@
+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_4.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_4">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Byte name="a">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Byte>
+    <Int16 name="b">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int16>
+    <Int32 name="c">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int32>
+    <UInt16 name="d">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt16>
+    <UInt32 name="e">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt32>
+    <Float32 name="f">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Float32>
+    <Float64 name="g">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Float64>
+    <String name="h">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </String>
+    <URL name="i">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </URL>
+    <Int32 name="x">
+        <Dim name="/row"/>
+        <Dim size="5"/>
+    </Int32>
+    <Int32 name="y">
+        <Dim size="5"/>
+        <Dim name="/col"/>
+    </Int32>
+</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_4.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_4">
+    <Dimension name="row" size="2"/>
+    <Dimension name="col" size="1"/>
+    <Byte name="a">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>ffff0000</Value>
+        </Attribute>
+    </Byte>
+    <Int16 name="b">
+        <Dim size="1"/>
+        <Dim name="/col"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>db481544</Value>
+        </Attribute>
+    </Int16>
+    <Int32 name="c">
+        <Dim size="3"/>
+        <Dim size="4"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>fe77c1af</Value>
+        </Attribute>
+    </Int32>
+</Dataset>
+
+The data:
+{ {{255},{255}}, {{32000}}, {{123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789}} }
diff --git a/tests/dmr-testsuite/big-endian/test_array_4.xml.6.trans_base b/tests/dmr-testsuite/big-endian/test_array_4.xml.6.trans_base
new file mode 100644
index 0000000..e2094dd
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_4.xml.6.trans_base
@@ -0,0 +1,65 @@
+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_4.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_4">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Byte name="a">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Byte>
+    <Int16 name="b">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int16>
+    <Int32 name="c">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int32>
+    <UInt16 name="d">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt16>
+    <UInt32 name="e">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt32>
+    <Float32 name="f">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Float32>
+    <Float64 name="g">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Float64>
+    <String name="h">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </String>
+    <URL name="i">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </URL>
+    <Int32 name="x">
+        <Dim name="/row"/>
+        <Dim size="5"/>
+    </Int32>
+    <Int32 name="y">
+        <Dim size="5"/>
+        <Dim name="/col"/>
+    </Int32>
+</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_4.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_4">
+    <Dimension name="row" size="3"/>
+    <Int32 name="x">
+        <Dim name="/row"/>
+        <Dim size="5"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>dff6bc53</Value>
+        </Attribute>
+    </Int32>
+</Dataset>
+
+The data:
+{ {{123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789}} }
diff --git a/tests/dmr-testsuite/big-endian/test_array_4.xml.7.trans_base b/tests/dmr-testsuite/big-endian/test_array_4.xml.7.trans_base
new file mode 100644
index 0000000..1701da8
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_4.xml.7.trans_base
@@ -0,0 +1,65 @@
+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_4.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_4">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Byte name="a">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Byte>
+    <Int16 name="b">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int16>
+    <Int32 name="c">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int32>
+    <UInt16 name="d">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt16>
+    <UInt32 name="e">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt32>
+    <Float32 name="f">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Float32>
+    <Float64 name="g">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Float64>
+    <String name="h">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </String>
+    <URL name="i">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </URL>
+    <Int32 name="x">
+        <Dim name="/row"/>
+        <Dim size="5"/>
+    </Int32>
+    <Int32 name="y">
+        <Dim size="5"/>
+        <Dim name="/col"/>
+    </Int32>
+</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_4.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_4">
+    <Dimension name="row" size="2"/>
+    <Int32 name="x">
+        <Dim name="/row"/>
+        <Dim size="5"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>b07325db</Value>
+        </Attribute>
+    </Int32>
+</Dataset>
+
+The data:
+{ {{123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789}} }
diff --git a/tests/dmr-testsuite/big-endian/test_array_4.xml.8.trans_base b/tests/dmr-testsuite/big-endian/test_array_4.xml.8.trans_base
new file mode 100644
index 0000000..0574df3
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_4.xml.8.trans_base
@@ -0,0 +1,64 @@
+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_4.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_4">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Byte name="a">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Byte>
+    <Int16 name="b">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int16>
+    <Int32 name="c">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int32>
+    <UInt16 name="d">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt16>
+    <UInt32 name="e">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt32>
+    <Float32 name="f">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Float32>
+    <Float64 name="g">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Float64>
+    <String name="h">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </String>
+    <URL name="i">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </URL>
+    <Int32 name="x">
+        <Dim name="/row"/>
+        <Dim size="5"/>
+    </Int32>
+    <Int32 name="y">
+        <Dim size="5"/>
+        <Dim name="/col"/>
+    </Int32>
+</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_4.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_4">
+    <Int32 name="c">
+        <Dim size="1"/>
+        <Dim size="2"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>a5f4caa5</Value>
+        </Attribute>
+    </Int32>
+</Dataset>
+
+The data:
+{ {{123456789, 123456789}} }
diff --git a/tests/dmr-testsuite/big-endian/test_array_4.xml.intern_base b/tests/dmr-testsuite/big-endian/test_array_4.xml.intern_base
new file mode 100644
index 0000000..74583b3
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_4.xml.intern_base
@@ -0,0 +1,103 @@
+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_4.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_4">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Byte name="a">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Byte>
+    <Int16 name="b">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int16>
+    <Int32 name="c">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int32>
+    <UInt16 name="d">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt16>
+    <UInt32 name="e">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt32>
+    <Float32 name="f">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Float32>
+    <Float64 name="g">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Float64>
+    <String name="h">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </String>
+    <URL name="i">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </URL>
+    <Int32 name="x">
+        <Dim name="/row"/>
+        <Dim size="5"/>
+    </Int32>
+    <Int32 name="y">
+        <Dim size="5"/>
+        <Dim name="/col"/>
+    </Int32>
+</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_4.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_4">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Byte name="a">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Byte>
+    <Int16 name="b">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int16>
+    <Int32 name="c">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int32>
+    <UInt16 name="d">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt16>
+    <UInt32 name="e">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt32>
+    <Float32 name="f">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Float32>
+    <Float64 name="g">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Float64>
+    <String name="h">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </String>
+    <URL name="i">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </URL>
+    <Int32 name="x">
+        <Dim name="/row"/>
+        <Dim size="5"/>
+    </Int32>
+    <Int32 name="y">
+        <Dim size="5"/>
+        <Dim name="/col"/>
+    </Int32>
+</Dataset>
+
+The data:
+{ {{255, 255, 255, 255},{255, 255, 255, 255},{255, 255, 255, 255}}, {{32000, 32000, 32000, 32000},{32000, 32000, 32000, 32000},{32000, 32000, 32000, 32000}}, {{123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789}}, {{64000, 64000, 64000, 64000},{64000, 64000, 64000, 64000},{64000, 64000, 64000, 64000}}, {{4026531840, 4026531840, 4026531840, 4026531840},{4026531840, 4026531840, 4026531840, 4026531840},{4026531840, 4026531840, 4026531840, 4026531840}}, {{99.999, 99.999, 99.999, 99.999},{99.999, 99.999, 99.999, 99.999},{99.999, 99.999, 99.999, 99.999}}, {{99.999, 99.999, 99.999, 99.999},{99.999, 99.999, 99.999, 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", "Silly test string: 1", "Silly test string: 1", "Silly test string: 1"},{"Silly test string: 1", "Silly test string: 1", "Silly test string: 1", "Silly test string: 1"}}, {{"http://dcz.gso.uri.edu/avhrr-archive/archive.html", "http://dcz.gso.uri.edu/avhrr-archive/archive.html", "http://dcz.gso.uri.edu/avhrr-archive/archive.html", "http://dcz.gso.uri.edu/avhrr-archive/archive.html"},{"http://dcz.gso.uri.edu/avhrr-archive/archive.html", "http://dcz.gso.uri.edu/avhrr-archive/archive.html", "http://dcz.gso.uri.edu/avhrr-archive/archive.html", "http://dcz.gso.uri.edu/avhrr-archive/archive.html"},{"http://dcz.gso.uri.edu/avhrr-archive/archive.html", "http://dcz.gso.uri.edu/avhrr-archive/archive.html", "http://dcz.gso.uri.edu/avhrr-archive/archive.html", "http://dcz.gso.uri.edu/avhrr-archive/archive.html"}}, {{123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789}}, {{123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789}} }
diff --git a/tests/dmr-testsuite/big-endian/test_array_4.xml.trans_base b/tests/dmr-testsuite/big-endian/test_array_4.xml.trans_base
new file mode 100644
index 0000000..ab2cb71
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_4.xml.trans_base
@@ -0,0 +1,136 @@
+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_4.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_4">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Byte name="a">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Byte>
+    <Int16 name="b">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int16>
+    <Int32 name="c">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int32>
+    <UInt16 name="d">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt16>
+    <UInt32 name="e">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt32>
+    <Float32 name="f">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Float32>
+    <Float64 name="g">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Float64>
+    <String name="h">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </String>
+    <URL name="i">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </URL>
+    <Int32 name="x">
+        <Dim name="/row"/>
+        <Dim size="5"/>
+    </Int32>
+    <Int32 name="y">
+        <Dim size="5"/>
+        <Dim name="/col"/>
+    </Int32>
+</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_4.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_4">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Byte name="a">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>bb99ff8a</Value>
+        </Attribute>
+    </Byte>
+    <Int16 name="b">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>d5f4036f</Value>
+        </Attribute>
+    </Int16>
+    <Int32 name="c">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>fe77c1af</Value>
+        </Attribute>
+    </Int32>
+    <UInt16 name="d">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>4faa58be</Value>
+        </Attribute>
+    </UInt16>
+    <UInt32 name="e">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>284eeb3e</Value>
+        </Attribute>
+    </UInt32>
+    <Float32 name="f">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>bb730f08</Value>
+        </Attribute>
+    </Float32>
+    <Float64 name="g">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>9de7e4c6</Value>
+        </Attribute>
+    </Float64>
+    <String name="h">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>2004aea7</Value>
+        </Attribute>
+    </String>
+    <URL name="i">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>546a7c3d</Value>
+        </Attribute>
+    </URL>
+    <Int32 name="x">
+        <Dim name="/row"/>
+        <Dim size="5"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>dff6bc53</Value>
+        </Attribute>
+    </Int32>
+    <Int32 name="y">
+        <Dim size="5"/>
+        <Dim name="/col"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>813ab7f7</Value>
+        </Attribute>
+    </Int32>
+</Dataset>
+
+The data:
+{ {{255, 255, 255, 255},{255, 255, 255, 255},{255, 255, 255, 255}}, {{32000, 32000, 32000, 32000},{32000, 32000, 32000, 32000},{32000, 32000, 32000, 32000}}, {{123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789}}, {{64000, 64000, 64000, 64000},{64000, 64000, 64000, 64000},{64000, 64000, 64000, 64000}}, {{4026531840, 4026531840, 4026531840, 4026531840},{4026531840, 4026531840, 4026531840, 4026531840},{4026531840, 4026531840, 4026531840, 4026531840}}, {{99.999, 99.999, 99.999, 99.999},{99.999, 99.999, 99.999, 99.999},{99.999, 99.999, 99.999, 99.999}}, {{99.999, 99.999, 99.999, 99.999},{99.999, 99.999, 99.999, 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", "Silly test string: 1", "Silly test string: 1", "Silly test string: 1"},{"Silly test string: 1", "Silly test string: 1", "Silly test string: 1", "Silly test string: 1"}}, {{"http://dcz.gso.uri.edu/avhrr-archive/archive.html", "http://dcz.gso.uri.edu/avhrr-archive/archive.html", "http://dcz.gso.uri.edu/avhrr-archive/archive.html", "http://dcz.gso.uri.edu/avhrr-archive/archive.html"},{"http://dcz.gso.uri.edu/avhrr-archive/archive.html", "http://dcz.gso.uri.edu/avhrr-archive/archive.html", "http://dcz.gso.uri.edu/avhrr-archive/archive.html", "http://dcz.gso.uri.edu/avhrr-archive/archive.html"},{"http://dcz.gso.uri.edu/avhrr-archive/archive.html", "http://dcz.gso.uri.edu/avhrr-archive/archive.html", "http://dcz.gso.uri.edu/avhrr-archive/archive.html", "http://dcz.gso.uri.edu/avhrr-archive/archive.html"}}, {{123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789}}, {{123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789}} }
diff --git a/tests/dmr-testsuite/big-endian/test_array_5.xml.1.func_base b/tests/dmr-testsuite/big-endian/test_array_5.xml.1.func_base
new file mode 100644
index 0000000..babffd3
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_5.xml.1.func_base
@@ -0,0 +1,38 @@
+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_5.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_5">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Int8 name="a">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int8>
+    <UInt8 name="b">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt8>
+    <Int64 name="c">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int64>
+    <UInt64 name="d">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt64>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="function_results">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Float64 name="a">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>97b45167</Value>
+        </Attribute>
+    </Float64>
+</Dataset>
+
+The data:
+{ {{0.127, 0.127, 0.127, 0.127},{0.127, 0.127, 0.127, 0.127},{0.127, 0.127, 0.127, 0.127}} }
diff --git a/tests/dmr-testsuite/big-endian/test_array_5.xml.2.func_base b/tests/dmr-testsuite/big-endian/test_array_5.xml.2.func_base
new file mode 100644
index 0000000..fce95ca
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_5.xml.2.func_base
@@ -0,0 +1,38 @@
+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_5.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_5">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Int8 name="a">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int8>
+    <UInt8 name="b">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt8>
+    <Int64 name="c">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int64>
+    <UInt64 name="d">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt64>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="function_results">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Float64 name="b">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>fb56d271</Value>
+        </Attribute>
+    </Float64>
+</Dataset>
+
+The data:
+{ {{0.255, 0.255, 0.255, 0.255},{0.255, 0.255, 0.255, 0.255},{0.255, 0.255, 0.255, 0.255}} }
diff --git a/tests/dmr-testsuite/big-endian/test_array_5.xml.3.func_base b/tests/dmr-testsuite/big-endian/test_array_5.xml.3.func_base
new file mode 100644
index 0000000..13b7bc9
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_5.xml.3.func_base
@@ -0,0 +1,38 @@
+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_5.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_5">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Int8 name="a">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int8>
+    <UInt8 name="b">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt8>
+    <Int64 name="c">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int64>
+    <UInt64 name="d">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt64>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="function_results">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Float64 name="c">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>ad7353da</Value>
+        </Attribute>
+    </Float64>
+</Dataset>
+
+The data:
+{ {{72057594037927.9, 72057594037927.9, 72057594037927.9, 72057594037927.9},{72057594037927.9, 72057594037927.9, 72057594037927.9, 72057594037927.9},{72057594037927.9, 72057594037927.9, 72057594037927.9, 72057594037927.9}} }
diff --git a/tests/dmr-testsuite/big-endian/test_array_5.xml.4.func_base b/tests/dmr-testsuite/big-endian/test_array_5.xml.4.func_base
new file mode 100644
index 0000000..7650bda
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_5.xml.4.func_base
@@ -0,0 +1,38 @@
+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_5.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_5">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Int8 name="a">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int8>
+    <UInt8 name="b">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt8>
+    <Int64 name="c">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int64>
+    <UInt64 name="d">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt64>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="function_results">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Float64 name="d">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>b4a31cf2</Value>
+        </Attribute>
+    </Float64>
+</Dataset>
+
+The data:
+{ {{1.84467440737096e+16, 1.84467440737096e+16, 1.84467440737096e+16, 1.84467440737096e+16},{1.84467440737096e+16, 1.84467440737096e+16, 1.84467440737096e+16, 1.84467440737096e+16},{1.84467440737096e+16, 1.84467440737096e+16, 1.84467440737096e+16, 1.84467440737096e+16}} }
diff --git a/tests/dmr-testsuite/big-endian/test_array_5.xml.intern_base b/tests/dmr-testsuite/big-endian/test_array_5.xml.intern_base
new file mode 100644
index 0000000..ed63c69
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_5.xml.intern_base
@@ -0,0 +1,47 @@
+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_5.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_5">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Int8 name="a">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int8>
+    <UInt8 name="b">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt8>
+    <Int64 name="c">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int64>
+    <UInt64 name="d">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt64>
+</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_5.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_5">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Int8 name="a">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int8>
+    <UInt8 name="b">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt8>
+    <Int64 name="c">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int64>
+    <UInt64 name="d">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt64>
+</Dataset>
+
+The data:
+{ {{127, 127, 127, 127},{127, 127, 127, 127},{127, 127, 127, 127}}, {{255, 255, 255, 255},{255, 255, 255, 255},{255, 255, 255, 255}}, {{72057594037927935, 72057594037927935, 72057594037927935, 72057594037927935},{72057594037927935, 72057594037927935, 72057594037927935, 72057594037927935},{72057594037927935, 72057594037927935, 72057594037927935, 72057594037927935}}, {{18446744073709551615, 18446744073709551615, 18446744073709551615, 18446744073709551615},{18446744073709551615, 18446744073709551615, 18446744073709551615, 18446744073709551615},{18446744073709551615, 18446744073709551615, 18446744073709551615, 18446744073709551615}} }
diff --git a/tests/dmr-testsuite/big-endian/test_array_5.xml.trans_base b/tests/dmr-testsuite/big-endian/test_array_5.xml.trans_base
new file mode 100644
index 0000000..9a6b4d7
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_5.xml.trans_base
@@ -0,0 +1,59 @@
+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_5.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_5">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Int8 name="a">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int8>
+    <UInt8 name="b">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt8>
+    <Int64 name="c">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int64>
+    <UInt64 name="d">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt64>
+</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_5.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_5">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Int8 name="a">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>82c3d109</Value>
+        </Attribute>
+    </Int8>
+    <UInt8 name="b">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>bb99ff8a</Value>
+        </Attribute>
+    </UInt8>
+    <Int64 name="c">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>9489fef8</Value>
+        </Attribute>
+    </Int64>
+    <UInt64 name="d">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>46d91cd0</Value>
+        </Attribute>
+    </UInt64>
+</Dataset>
+
+The data:
+{ {{127, 127, 127, 127},{127, 127, 127, 127},{127, 127, 127, 127}}, {{255, 255, 255, 255},{255, 255, 255, 255},{255, 255, 255, 255}}, {{72057594037927935, 72057594037927935, 72057594037927935, 72057594037927935},{72057594037927935, 72057594037927935, 72057594037927935, 72057594037927935},{72057594037927935, 72057594037927935, 72057594037927935, 72057594037927935}}, {{18446744073709551615, 18446744073709551615, 18446744073709551615, 18446744073709551615},{18446744073709551615, 18446744073709551615, 18446744073709551615, 18446744073709551615},{18446744073709551615, 18446744073709551615, 18446744073709551615, 18446744073709551615}} }
diff --git a/tests/dmr-testsuite/big-endian/test_array_6.1.xml.1.trans_base b/tests/dmr-testsuite/big-endian/test_array_6.1.xml.1.trans_base
new file mode 100644
index 0000000..2663ef0
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_6.1.xml.1.trans_base
@@ -0,0 +1,36 @@
+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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_6">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Structure name="a">
+        <Int32 name="i">
+            <Dim name="/row"/>
+            <Dim size="6"/>
+        </Int32>
+        <Int32 name="j"/>
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Structure>
+</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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_6">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Structure name="a">
+        <Int32 name="i">
+            <Dim name="/row"/>
+            <Dim size="6"/>
+        </Int32>
+        <Int32 name="j"/>
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>1729299a</Value>
+        </Attribute>
+    </Structure>
+</Dataset>
+
+The data:
+{ {{{ {{123456789, 123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789, 123456789}}, 123456789 }, { {{123456789, 123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789, 123456789}}, 123456789 }, { {{123456789, 123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789, 123456789}}, 123456789 }, { {{123456789, 123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789, 123456789}}, 123456789 }},{{ {{123456789, 123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789, 123456789}}, 123456789 }, { {{123456789, 123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789, 123456789}}, 123456789 }, { {{123456789, 123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789, 123456789}}, 123456789 }, { {{123456789, 123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789, 123456789}}, 123456789 }},{{ {{123456789, 123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789, 123456789}}, 123456789 }, { {{123456789, 123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789, 123456789}}, 123456789 }, { {{123456789, 123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789, 123456789}}, 123456789 }, { {{123456789, 123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789, 123456789}}, 123456789 }}} }
diff --git a/tests/dmr-testsuite/big-endian/test_array_6.1.xml.2.trans_base b/tests/dmr-testsuite/big-endian/test_array_6.1.xml.2.trans_base
new file mode 100644
index 0000000..df7f12d
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_6.1.xml.2.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/test_array_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_6">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Structure name="a">
+        <Int32 name="i">
+            <Dim name="/row"/>
+            <Dim size="6"/>
+        </Int32>
+        <Int32 name="j"/>
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Structure>
+</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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_6">
+    <Dimension name="row" size="2"/>
+    <Structure name="a">
+        <Int32 name="i">
+            <Dim name="/row"/>
+            <Dim size="6"/>
+        </Int32>
+        <Int32 name="j"/>
+        <Dim name="/row"/>
+        <Dim size="1"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>0bfbaba9</Value>
+        </Attribute>
+    </Structure>
+</Dataset>
+
+The data:
+{ {{{ {{123456789, 123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789, 123456789}}, 123456789 }},{{ {{123456789, 123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789, 123456789}}, 123456789 }}} }
diff --git a/tests/dmr-testsuite/big-endian/test_array_6.1.xml.3.trans_base b/tests/dmr-testsuite/big-endian/test_array_6.1.xml.3.trans_base
new file mode 100644
index 0000000..38a9a2b
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_6.1.xml.3.trans_base
@@ -0,0 +1,36 @@
+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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_6">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Structure name="a">
+        <Int32 name="i">
+            <Dim name="/row"/>
+            <Dim size="6"/>
+        </Int32>
+        <Int32 name="j"/>
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Structure>
+</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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_6">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Structure name="a">
+        <Int32 name="i">
+            <Dim size="2"/>
+            <Dim size="3"/>
+        </Int32>
+        <Int32 name="j"/>
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>e5bb6ca1</Value>
+        </Attribute>
+    </Structure>
+</Dataset>
+
+The data:
+{ {{{ {{123456789, 123456789, 123456789},{123456789, 123456789, 123456789}}, 123456789 }, { {{123456789, 123456789, 123456789},{123456789, 123456789, 123456789}}, 123456789 }, { {{123456789, 123456789, 123456789},{123456789, 123456789, 123456789}}, 123456789 }, { {{123456789, 123456789, 123456789},{123456789, 123456789, 123456789}}, 123456789 }},{{ {{123456789, 123456789, 123456789},{123456789, 123456789, 123456789}}, 123456789 }, { {{123456789, 123456789, 123456789},{123456789, 123456789, 123456789}}, 123456789 }, { {{123456789, 123456789, 123456789},{123456789, 123456789, 123456789}}, 123456789 }, { {{123456789, 123456789, 123456789},{123456789, 123456789, 123456789}}, 123456789 }},{{ {{123456789, 123456789, 123456789},{123456789, 123456789, 123456789}}, 123456789 }, { {{123456789, 123456789, 123456789},{123456789, 123456789, 123456789}}, 123456789 }, { {{123456789, 123456789, 123456789},{123456789, 123456789, 123456789}}, 123456789 }, { {{123456789, 123456789, 123456789},{123456789, 123456789, 123456789}}, 123456789 }}} }
diff --git a/tests/dmr-testsuite/big-endian/test_array_6.1.xml.4.trans_base b/tests/dmr-testsuite/big-endian/test_array_6.1.xml.4.trans_base
new file mode 100644
index 0000000..b87b52e
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_6.1.xml.4.trans_base
@@ -0,0 +1,34 @@
+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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_6">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Structure name="a">
+        <Int32 name="i">
+            <Dim name="/row"/>
+            <Dim size="6"/>
+        </Int32>
+        <Int32 name="j"/>
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Structure>
+</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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_6">
+    <Dimension name="row" size="1"/>
+    <Structure name="a">
+        <Int32 name="i">
+            <Dim name="/row"/>
+            <Dim size="2"/>
+        </Int32>
+        <Dim name="/row"/>
+        <Dim size="1"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>a5f4caa5</Value>
+        </Attribute>
+    </Structure>
+</Dataset>
+
+The data:
+{ {{{ {{123456789, 123456789}} }}} }
diff --git a/tests/dmr-testsuite/big-endian/test_array_6.2.xml.1.trans_base b/tests/dmr-testsuite/big-endian/test_array_6.2.xml.1.trans_base
new file mode 100644
index 0000000..4bdca20
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_6.2.xml.1.trans_base
@@ -0,0 +1,32 @@
+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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_6">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Structure name="a">
+        <Int32 name="i">
+            <Dim name="/row"/>
+            <Dim name="/col"/>
+        </Int32>
+        <Int32 name="j"/>
+    </Structure>
+</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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_6">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Structure name="a">
+        <Int32 name="i">
+            <Dim name="/row"/>
+            <Dim name="/col"/>
+        </Int32>
+        <Int32 name="j"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>70edae12</Value>
+        </Attribute>
+    </Structure>
+</Dataset>
+
+The data:
+{ { {{123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789}}, 123456789 } }
diff --git a/tests/dmr-testsuite/big-endian/test_array_6.2.xml.2.trans_base b/tests/dmr-testsuite/big-endian/test_array_6.2.xml.2.trans_base
new file mode 100644
index 0000000..199eac0
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_6.2.xml.2.trans_base
@@ -0,0 +1,31 @@
+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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_6">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Structure name="a">
+        <Int32 name="i">
+            <Dim name="/row"/>
+            <Dim name="/col"/>
+        </Int32>
+        <Int32 name="j"/>
+    </Structure>
+</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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_6">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Structure name="a">
+        <Int32 name="i">
+            <Dim name="/row"/>
+            <Dim name="/col"/>
+        </Int32>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>fe77c1af</Value>
+        </Attribute>
+    </Structure>
+</Dataset>
+
+The data:
+{ { {{123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789}} } }
diff --git a/tests/dmr-testsuite/big-endian/test_array_6.2.xml.3.trans_base b/tests/dmr-testsuite/big-endian/test_array_6.2.xml.3.trans_base
new file mode 100644
index 0000000..17ba69b
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_6.2.xml.3.trans_base
@@ -0,0 +1,29 @@
+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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_6">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Structure name="a">
+        <Int32 name="i">
+            <Dim name="/row"/>
+            <Dim name="/col"/>
+        </Int32>
+        <Int32 name="j"/>
+    </Structure>
+</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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_6">
+    <Structure name="a">
+        <Int32 name="i">
+            <Dim size="1"/>
+            <Dim size="2"/>
+        </Int32>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>a5f4caa5</Value>
+        </Attribute>
+    </Structure>
+</Dataset>
+
+The data:
+{ { {{123456789, 123456789}} } }
diff --git a/tests/dmr-testsuite/big-endian/test_array_6.2.xml.4.trans_base b/tests/dmr-testsuite/big-endian/test_array_6.2.xml.4.trans_base
new file mode 100644
index 0000000..539878a
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_6.2.xml.4.trans_base
@@ -0,0 +1,30 @@
+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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_6">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Structure name="a">
+        <Int32 name="i">
+            <Dim name="/row"/>
+            <Dim name="/col"/>
+        </Int32>
+        <Int32 name="j"/>
+    </Structure>
+</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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_6">
+    <Dimension name="row" size="2"/>
+    <Structure name="a">
+        <Int32 name="i">
+            <Dim name="/row"/>
+            <Dim size="2"/>
+        </Int32>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>19f0a861</Value>
+        </Attribute>
+    </Structure>
+</Dataset>
+
+The data:
+{ { {{123456789, 123456789},{123456789, 123456789}} } }
diff --git a/tests/dmr-testsuite/big-endian/test_array_6.2.xml.5.trans_base b/tests/dmr-testsuite/big-endian/test_array_6.2.xml.5.trans_base
new file mode 100644
index 0000000..16cc5b5
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_6.2.xml.5.trans_base
@@ -0,0 +1,26 @@
+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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_6">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Structure name="a">
+        <Int32 name="i">
+            <Dim name="/row"/>
+            <Dim name="/col"/>
+        </Int32>
+        <Int32 name="j"/>
+    </Structure>
+</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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_6">
+    <Structure name="a">
+        <Int32 name="j"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>cff36b1c</Value>
+        </Attribute>
+    </Structure>
+</Dataset>
+
+The data:
+{ { 123456789 } }
diff --git a/tests/dmr-testsuite/big-endian/test_array_6.xml.1.trans_base b/tests/dmr-testsuite/big-endian/test_array_6.xml.1.trans_base
new file mode 100644
index 0000000..0f7d643
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_6.xml.1.trans_base
@@ -0,0 +1,30 @@
+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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_6">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Structure name="a">
+        <Int32 name="i"/>
+        <Int32 name="j"/>
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Structure>
+</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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_6">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Structure name="a">
+        <Int32 name="i"/>
+        <Int32 name="j"/>
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>7aae3234</Value>
+        </Attribute>
+    </Structure>
+</Dataset>
+
+The data:
+{ {{{ 123456789, 123456789 }, { 123456789, 123456789 }, { 123456789, 123456789 }, { 123456789, 123456789 }},{{ 123456789, 123456789 }, { 123456789, 123456789 }, { 123456789, 123456789 }, { 123456789, 123456789 }},{{ 123456789, 123456789 }, { 123456789, 123456789 }, { 123456789, 123456789 }, { 123456789, 123456789 }}} }
diff --git a/tests/dmr-testsuite/big-endian/test_array_6.xml.2.trans_base b/tests/dmr-testsuite/big-endian/test_array_6.xml.2.trans_base
new file mode 100644
index 0000000..086d0c9
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_6.xml.2.trans_base
@@ -0,0 +1,30 @@
+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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_6">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Structure name="a">
+        <Int32 name="i"/>
+        <Int32 name="j"/>
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Structure>
+</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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_6">
+    <Dimension name="row" size="2"/>
+    <Dimension name="col" size="4"/>
+    <Structure name="a">
+        <Int32 name="i"/>
+        <Int32 name="j"/>
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>8e85455a</Value>
+        </Attribute>
+    </Structure>
+</Dataset>
+
+The data:
+{ {{{ 123456789, 123456789 }, { 123456789, 123456789 }, { 123456789, 123456789 }, { 123456789, 123456789 }},{{ 123456789, 123456789 }, { 123456789, 123456789 }, { 123456789, 123456789 }, { 123456789, 123456789 }}} }
diff --git a/tests/dmr-testsuite/big-endian/test_array_6.xml.3.trans_base b/tests/dmr-testsuite/big-endian/test_array_6.xml.3.trans_base
new file mode 100644
index 0000000..f1f4044
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_6.xml.3.trans_base
@@ -0,0 +1,29 @@
+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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_6">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Structure name="a">
+        <Int32 name="i"/>
+        <Int32 name="j"/>
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Structure>
+</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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_6">
+    <Dimension name="row" size="2"/>
+    <Structure name="a">
+        <Int32 name="i"/>
+        <Int32 name="j"/>
+        <Dim name="/row"/>
+        <Dim size="2"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>dd9c4640</Value>
+        </Attribute>
+    </Structure>
+</Dataset>
+
+The data:
+{ {{{ 123456789, 123456789 }, { 123456789, 123456789 }},{{ 123456789, 123456789 }, { 123456789, 123456789 }}} }
diff --git a/tests/dmr-testsuite/big-endian/test_array_6.xml.intern_base b/tests/dmr-testsuite/big-endian/test_array_6.xml.intern_base
new file mode 100644
index 0000000..6bfb604
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_6.xml.intern_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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_6">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Structure name="a">
+        <Int32 name="i"/>
+        <Int32 name="j"/>
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Structure>
+</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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_6">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Structure name="a">
+        <Int32 name="i"/>
+        <Int32 name="j"/>
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Structure>
+</Dataset>
+
+The data:
+{ {{{ 123456789, 123456789 }, { 123456789, 123456789 }, { 123456789, 123456789 }, { 123456789, 123456789 }},{{ 123456789, 123456789 }, { 123456789, 123456789 }, { 123456789, 123456789 }, { 123456789, 123456789 }},{{ 123456789, 123456789 }, { 123456789, 123456789 }, { 123456789, 123456789 }, { 123456789, 123456789 }}} }
diff --git a/tests/dmr-testsuite/big-endian/test_array_6.xml.trans_base b/tests/dmr-testsuite/big-endian/test_array_6.xml.trans_base
new file mode 100644
index 0000000..0f7d643
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_6.xml.trans_base
@@ -0,0 +1,30 @@
+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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_6">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Structure name="a">
+        <Int32 name="i"/>
+        <Int32 name="j"/>
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Structure>
+</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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_6">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Structure name="a">
+        <Int32 name="i"/>
+        <Int32 name="j"/>
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>7aae3234</Value>
+        </Attribute>
+    </Structure>
+</Dataset>
+
+The data:
+{ {{{ 123456789, 123456789 }, { 123456789, 123456789 }, { 123456789, 123456789 }, { 123456789, 123456789 }},{{ 123456789, 123456789 }, { 123456789, 123456789 }, { 123456789, 123456789 }, { 123456789, 123456789 }},{{ 123456789, 123456789 }, { 123456789, 123456789 }, { 123456789, 123456789 }, { 123456789, 123456789 }}} }
diff --git a/tests/dmr-testsuite/big-endian/test_array_7.1.xml.1.trans_base b/tests/dmr-testsuite/big-endian/test_array_7.1.xml.1.trans_base
new file mode 100644
index 0000000..2f438bf
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_7.1.xml.1.trans_base
@@ -0,0 +1,32 @@
+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_7.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_7">
+    <Dimension name="row" size="4"/>
+    <Dimension name="col" size="5"/>
+    <Sequence name="s">
+        <Int32 name="i1">
+            <Dim name="/row"/>
+            <Dim name="/col"/>
+        </Int32>
+        <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_array_7.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_7">
+    <Dimension name="row" size="4"/>
+    <Dimension name="col" size="5"/>
+    <Sequence name="s">
+        <Int32 name="i1">
+            <Dim name="/row"/>
+            <Dim name="/col"/>
+        </Int32>
+        <String name="s"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>d15702b1</Value>
+        </Attribute>
+    </Sequence>
+</Dataset>
+
+The data:
+{ { { {{123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789}}, "Silly test string: 1" }, { {{123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789}}, "Silly test string: 1" }, { {{123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789}}, "Silly test string: 1" }, { {{123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789}}, "Silly test string: 1" } } }
diff --git a/tests/dmr-testsuite/big-endian/test_array_7.1.xml.2.trans_base b/tests/dmr-testsuite/big-endian/test_array_7.1.xml.2.trans_base
new file mode 100644
index 0000000..4ed6e71
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_7.1.xml.2.trans_base
@@ -0,0 +1,31 @@
+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_7.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_7">
+    <Dimension name="row" size="4"/>
+    <Dimension name="col" size="5"/>
+    <Sequence name="s">
+        <Int32 name="i1">
+            <Dim name="/row"/>
+            <Dim name="/col"/>
+        </Int32>
+        <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_array_7.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_7">
+    <Dimension name="row" size="4"/>
+    <Dimension name="col" size="5"/>
+    <Sequence name="s">
+        <Int32 name="i1">
+            <Dim name="/row"/>
+            <Dim name="/col"/>
+        </Int32>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>74c36937</Value>
+        </Attribute>
+    </Sequence>
+</Dataset>
+
+The data:
+{ { { {{123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789}} }, { {{123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789}} }, { {{123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789}} }, { {{123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789}} } } }
diff --git a/tests/dmr-testsuite/big-endian/test_array_7.1.xml.3.trans_base b/tests/dmr-testsuite/big-endian/test_array_7.1.xml.3.trans_base
new file mode 100644
index 0000000..8438568
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_7.1.xml.3.trans_base
@@ -0,0 +1,29 @@
+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_7.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_7">
+    <Dimension name="row" size="4"/>
+    <Dimension name="col" size="5"/>
+    <Sequence name="s">
+        <Int32 name="i1">
+            <Dim name="/row"/>
+            <Dim name="/col"/>
+        </Int32>
+        <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_array_7.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_7">
+    <Sequence name="s">
+        <Int32 name="i1">
+            <Dim size="1"/>
+            <Dim size="1"/>
+        </Int32>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>19f0a861</Value>
+        </Attribute>
+    </Sequence>
+</Dataset>
+
+The data:
+{ { { {{123456789}} }, { {{123456789}} }, { {{123456789}} }, { {{123456789}} } } }
diff --git a/tests/dmr-testsuite/big-endian/test_array_7.1.xml.4.trans_base b/tests/dmr-testsuite/big-endian/test_array_7.1.xml.4.trans_base
new file mode 100644
index 0000000..7fdbfc5
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_7.1.xml.4.trans_base
@@ -0,0 +1,29 @@
+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_7.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_7">
+    <Dimension name="row" size="4"/>
+    <Dimension name="col" size="5"/>
+    <Sequence name="s">
+        <Int32 name="i1">
+            <Dim name="/row"/>
+            <Dim name="/col"/>
+        </Int32>
+        <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_array_7.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_7">
+    <Sequence name="s">
+        <Int32 name="i1">
+            <Dim size="3"/>
+            <Dim size="2"/>
+        </Int32>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>7aae3234</Value>
+        </Attribute>
+    </Sequence>
+</Dataset>
+
+The data:
+{ { { {{123456789, 123456789},{123456789, 123456789},{123456789, 123456789}} }, { {{123456789, 123456789},{123456789, 123456789},{123456789, 123456789}} }, { {{123456789, 123456789},{123456789, 123456789},{123456789, 123456789}} }, { {{123456789, 123456789},{123456789, 123456789},{123456789, 123456789}} } } }
diff --git a/tests/dmr-testsuite/big-endian/test_array_7.1.xml.5.trans_base b/tests/dmr-testsuite/big-endian/test_array_7.1.xml.5.trans_base
new file mode 100644
index 0000000..1828194
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_7.1.xml.5.trans_base
@@ -0,0 +1,32 @@
+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_7.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_7">
+    <Dimension name="row" size="4"/>
+    <Dimension name="col" size="5"/>
+    <Sequence name="s">
+        <Int32 name="i1">
+            <Dim name="/row"/>
+            <Dim name="/col"/>
+        </Int32>
+        <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_array_7.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_7">
+    <Dimension name="row" size="2"/>
+    <Dimension name="col" size="2"/>
+    <Sequence name="s">
+        <Int32 name="i1">
+            <Dim name="/row"/>
+            <Dim name="/col"/>
+        </Int32>
+        <String name="s"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>fca08a32</Value>
+        </Attribute>
+    </Sequence>
+</Dataset>
+
+The data:
+{ { { {{123456789, 123456789},{123456789, 123456789}}, "Silly test string: 1" }, { {{123456789, 123456789},{123456789, 123456789}}, "Silly test string: 1" }, { {{123456789, 123456789},{123456789, 123456789}}, "Silly test string: 1" }, { {{123456789, 123456789},{123456789, 123456789}}, "Silly test string: 1" } } }
diff --git a/tests/dmr-testsuite/big-endian/test_array_7.1.xml.6.trans_base b/tests/dmr-testsuite/big-endian/test_array_7.1.xml.6.trans_base
new file mode 100644
index 0000000..564b4ba
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_7.1.xml.6.trans_base
@@ -0,0 +1,31 @@
+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_7.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_7">
+    <Dimension name="row" size="4"/>
+    <Dimension name="col" size="5"/>
+    <Sequence name="s">
+        <Int32 name="i1">
+            <Dim name="/row"/>
+            <Dim name="/col"/>
+        </Int32>
+        <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_array_7.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_7">
+    <Dimension name="row" size="2"/>
+    <Dimension name="col" size="2"/>
+    <Sequence name="s">
+        <Int32 name="i1">
+            <Dim name="/row"/>
+            <Dim name="/col"/>
+        </Int32>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>8e85455a</Value>
+        </Attribute>
+    </Sequence>
+</Dataset>
+
+The data:
+{ { { {{123456789, 123456789},{123456789, 123456789}} }, { {{123456789, 123456789},{123456789, 123456789}} }, { {{123456789, 123456789},{123456789, 123456789}} }, { {{123456789, 123456789},{123456789, 123456789}} } } }
diff --git a/tests/dmr-testsuite/big-endian/test_array_7.2.xml.1.trans_base b/tests/dmr-testsuite/big-endian/test_array_7.2.xml.1.trans_base
new file mode 100644
index 0000000..8a0f2b5
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_7.2.xml.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_7.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_7">
+    <Dimension name="row" size="4"/>
+    <Dimension name="col" size="5"/>
+    <Sequence name="s">
+        <Int32 name="i1">
+            <Dim name="/row"/>
+            <Dim name="/col"/>
+        </Int32>
+        <String name="s"/>
+        <Dim size="4"/>
+    </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_array_7.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_7">
+    <Dimension name="row" size="4"/>
+    <Dimension name="col" size="2"/>
+    <Sequence name="s">
+        <Int32 name="i1">
+            <Dim name="/row"/>
+            <Dim name="/col"/>
+        </Int32>
+        <Dim size="4"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>7d4476d6</Value>
+        </Attribute>
+    </Sequence>
+</Dataset>
+
+The data:
+{ {{ { {{123456789, 123456789},{123456789, 123456789},{123456789, 123456789},{123456789, 123456789}} }, { {{123456789, 123456789},{123456789, 123456789},{123456789, 123456789},{123456789, 123456789}} }, { {{123456789, 123456789},{123456789, 123456789},{123456789, 123456789},{123456789, 123456789}} }, { {{123456789, 123456789},{123456789, 123456789},{123456789, 123456789},{123456789, 123456789}} } }, { { {{123456789, 123456789},{123456789, 123456789},{123456789, 123456789},{123456789, 123456789}} }, { {{123456789, 123456789},{123456789, 123456789},{123456789, 123456789},{123456789, 123456789}} }, { {{123456789, 123456789},{123456789, 123456789},{123456789, 123456789},{123456789, 123456789}} }, { {{123456789, 123456789},{123456789, 123456789},{123456789, 123456789},{123456789, 123456789}} } }, { { {{123456789, 123456789},{123456789, 123456789},{123456789, 123456789},{123456789, 123456789}} }, { {{123456789, 123456789},{123456789, 123456789},{123456789, 123456789},{123456789, 123456789}} }, { {{123456789, 123456789},{123456789, 123456789},{123456789, 123456789},{123456789, 123456789}} }, { {{123456789, 123456789},{123456789, 123456789},{123456789, 123456789},{123456789, 123456789}} } }, { { {{123456789, 123456789},{123456789, 123456789},{123456789, 123456789},{123456789, 123456789}} }, { {{123456789, 123456789},{123456789, 123456789},{123456789, 123456789},{123456789, 123456789}} }, { {{123456789, 123456789},{123456789, 123456789},{123456789, 123456789},{123456789, 123456789}} }, { {{123456789, 123456789},{123456789, 123456789},{123456789, 123456789},{123456789, 123456789}} } }} }
diff --git a/tests/dmr-testsuite/big-endian/test_array_7.2.xml.2.trans_base b/tests/dmr-testsuite/big-endian/test_array_7.2.xml.2.trans_base
new file mode 100644
index 0000000..8a1c6ea
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_7.2.xml.2.trans_base
@@ -0,0 +1,32 @@
+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_7.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_7">
+    <Dimension name="row" size="4"/>
+    <Dimension name="col" size="5"/>
+    <Sequence name="s">
+        <Int32 name="i1">
+            <Dim name="/row"/>
+            <Dim name="/col"/>
+        </Int32>
+        <String name="s"/>
+        <Dim size="4"/>
+    </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_array_7.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_7">
+    <Dimension name="col" size="2"/>
+    <Sequence name="s">
+        <Int32 name="i1">
+            <Dim size="1"/>
+            <Dim name="/col"/>
+        </Int32>
+        <Dim size="4"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>50e5b756</Value>
+        </Attribute>
+    </Sequence>
+</Dataset>
+
+The data:
+{ {{ { {{123456789, 123456789}} }, { {{123456789, 123456789}} }, { {{123456789, 123456789}} }, { {{123456789, 123456789}} } }, { { {{123456789, 123456789}} }, { {{123456789, 123456789}} }, { {{123456789, 123456789}} }, { {{123456789, 123456789}} } }, { { {{123456789, 123456789}} }, { {{123456789, 123456789}} }, { {{123456789, 123456789}} }, { {{123456789, 123456789}} } }, { { {{123456789, 123456789}} }, { {{123456789, 123456789}} }, { {{123456789, 123456789}} }, { {{123456789, 123456789}} } }} }
diff --git a/tests/dmr-testsuite/big-endian/test_array_7.2.xml.3.trans_base b/tests/dmr-testsuite/big-endian/test_array_7.2.xml.3.trans_base
new file mode 100644
index 0000000..a505196
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_7.2.xml.3.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_7.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_7">
+    <Dimension name="row" size="4"/>
+    <Dimension name="col" size="5"/>
+    <Sequence name="s">
+        <Int32 name="i1">
+            <Dim name="/row"/>
+            <Dim name="/col"/>
+        </Int32>
+        <String name="s"/>
+        <Dim size="4"/>
+    </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_array_7.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_7">
+    <Dimension name="row" size="4"/>
+    <Dimension name="col" size="2"/>
+    <Sequence name="s">
+        <Int32 name="i1">
+            <Dim name="/row"/>
+            <Dim name="/col"/>
+        </Int32>
+        <Dim size="1"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>50e5b756</Value>
+        </Attribute>
+    </Sequence>
+</Dataset>
+
+The data:
+{ {{ { {{123456789, 123456789},{123456789, 123456789},{123456789, 123456789},{123456789, 123456789}} }, { {{123456789, 123456789},{123456789, 123456789},{123456789, 123456789},{123456789, 123456789}} }, { {{123456789, 123456789},{123456789, 123456789},{123456789, 123456789},{123456789, 123456789}} }, { {{123456789, 123456789},{123456789, 123456789},{123456789, 123456789},{123456789, 123456789}} } }} }
diff --git a/tests/dmr-testsuite/big-endian/test_array_7.2.xml.4.trans_base b/tests/dmr-testsuite/big-endian/test_array_7.2.xml.4.trans_base
new file mode 100644
index 0000000..f3cce6e
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_7.2.xml.4.trans_base
@@ -0,0 +1,32 @@
+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_7.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_7">
+    <Dimension name="row" size="4"/>
+    <Dimension name="col" size="5"/>
+    <Sequence name="s">
+        <Int32 name="i1">
+            <Dim name="/row"/>
+            <Dim name="/col"/>
+        </Int32>
+        <String name="s"/>
+        <Dim size="4"/>
+    </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_array_7.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_7">
+    <Dimension name="col" size="2"/>
+    <Sequence name="s">
+        <Int32 name="i1">
+            <Dim size="1"/>
+            <Dim name="/col"/>
+        </Int32>
+        <Dim size="1"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>dd9c4640</Value>
+        </Attribute>
+    </Sequence>
+</Dataset>
+
+The data:
+{ {{ { {{123456789, 123456789}} }, { {{123456789, 123456789}} }, { {{123456789, 123456789}} }, { {{123456789, 123456789}} } }} }
diff --git a/tests/dmr-testsuite/big-endian/test_array_7.xml.1.trans_base b/tests/dmr-testsuite/big-endian/test_array_7.xml.1.trans_base
new file mode 100644
index 0000000..8307f1d
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_7.xml.1.trans_base
@@ -0,0 +1,24 @@
+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_7.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_7">
+    <Sequence name="s">
+        <Int32 name="i1"/>
+        <String name="s"/>
+        <Dim size="2"/>
+    </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_array_7.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_7">
+    <Sequence name="s">
+        <Int32 name="i1"/>
+        <String name="s"/>
+        <Dim size="2"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>97f99b2f</Value>
+        </Attribute>
+    </Sequence>
+</Dataset>
+
+The data:
+{ {{ { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" } }, { { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" } }} }
diff --git a/tests/dmr-testsuite/big-endian/test_array_7.xml.2.trans_base b/tests/dmr-testsuite/big-endian/test_array_7.xml.2.trans_base
new file mode 100644
index 0000000..c4a467e
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_7.xml.2.trans_base
@@ -0,0 +1,23 @@
+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_7.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_7">
+    <Sequence name="s">
+        <Int32 name="i1"/>
+        <String name="s"/>
+        <Dim size="2"/>
+    </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_array_7.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_7">
+    <Sequence name="s">
+        <Int32 name="i1"/>
+        <Dim size="2"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>dd9c4640</Value>
+        </Attribute>
+    </Sequence>
+</Dataset>
+
+The data:
+{ {{ { 123456789 }, { 123456789 }, { 123456789 }, { 123456789 } }, { { 123456789 }, { 123456789 }, { 123456789 }, { 123456789 } }} }
diff --git a/tests/dmr-testsuite/big-endian/test_array_7.xml.3.trans_base b/tests/dmr-testsuite/big-endian/test_array_7.xml.3.trans_base
new file mode 100644
index 0000000..eca8164
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_7.xml.3.trans_base
@@ -0,0 +1,24 @@
+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_7.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_7">
+    <Sequence name="s">
+        <Int32 name="i1"/>
+        <String name="s"/>
+        <Dim size="2"/>
+    </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_array_7.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_7">
+    <Sequence name="s">
+        <Int32 name="i1"/>
+        <String name="s"/>
+        <Dim size="1"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>c6f12441</Value>
+        </Attribute>
+    </Sequence>
+</Dataset>
+
+The data:
+{ {{ { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" } }} }
diff --git a/tests/dmr-testsuite/big-endian/test_array_7.xml.4.trans_base b/tests/dmr-testsuite/big-endian/test_array_7.xml.4.trans_base
new file mode 100644
index 0000000..9ebb32a
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_7.xml.4.trans_base
@@ -0,0 +1,23 @@
+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_7.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_7">
+    <Sequence name="s">
+        <Int32 name="i1"/>
+        <String name="s"/>
+        <Dim size="2"/>
+    </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_array_7.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_7">
+    <Sequence name="s">
+        <Int32 name="i1"/>
+        <Dim size="1"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>19f0a861</Value>
+        </Attribute>
+    </Sequence>
+</Dataset>
+
+The data:
+{ {{ { 123456789 }, { 123456789 }, { 123456789 }, { 123456789 } }} }
diff --git a/tests/dmr-testsuite/big-endian/test_array_7.xml.intern_base b/tests/dmr-testsuite/big-endian/test_array_7.xml.intern_base
new file mode 100644
index 0000000..da7e14b
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_7.xml.intern_base
@@ -0,0 +1,21 @@
+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_7.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_7">
+    <Sequence name="s">
+        <Int32 name="i1"/>
+        <String name="s"/>
+        <Dim size="2"/>
+    </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_array_7.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_7">
+    <Sequence name="s">
+        <Int32 name="i1"/>
+        <String name="s"/>
+        <Dim size="2"/>
+    </Sequence>
+</Dataset>
+
+The data:
+{ {{ { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" } }, { { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" } }} }
diff --git a/tests/dmr-testsuite/big-endian/test_array_7.xml.trans_base b/tests/dmr-testsuite/big-endian/test_array_7.xml.trans_base
new file mode 100644
index 0000000..8307f1d
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_7.xml.trans_base
@@ -0,0 +1,24 @@
+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_7.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_7">
+    <Sequence name="s">
+        <Int32 name="i1"/>
+        <String name="s"/>
+        <Dim size="2"/>
+    </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_array_7.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_7">
+    <Sequence name="s">
+        <Int32 name="i1"/>
+        <String name="s"/>
+        <Dim size="2"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>97f99b2f</Value>
+        </Attribute>
+    </Sequence>
+</Dataset>
+
+The data:
+{ {{ { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" } }, { { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" } }} }
diff --git a/tests/dmr-testsuite/big-endian/test_array_8.xml.1.trans_base b/tests/dmr-testsuite/big-endian/test_array_8.xml.1.trans_base
new file mode 100644
index 0000000..6dd1ac9
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_8.xml.1.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_8.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_8">
+    <Dimension name="col" size="3"/>
+    <Sequence name="s">
+        <Int32 name="i1"/>
+        <String name="s"/>
+        <Dim size="2"/>
+        <Dim name="/col"/>
+    </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_array_8.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_8">
+    <Dimension name="col" size="2"/>
+    <Sequence name="s">
+        <Int32 name="i1"/>
+        <Dim size="1"/>
+        <Dim name="/col"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>dd9c4640</Value>
+        </Attribute>
+    </Sequence>
+</Dataset>
+
+The data:
+{ {{{ { 123456789 }, { 123456789 }, { 123456789 }, { 123456789 } }, { { 123456789 }, { 123456789 }, { 123456789 }, { 123456789 } }}} }
diff --git a/tests/dmr-testsuite/big-endian/test_array_8.xml.intern_base b/tests/dmr-testsuite/big-endian/test_array_8.xml.intern_base
new file mode 100644
index 0000000..90ed9c2
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_8.xml.intern_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_8.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_8">
+    <Dimension name="col" size="3"/>
+    <Sequence name="s">
+        <Int32 name="i1"/>
+        <String name="s"/>
+        <Dim size="2"/>
+        <Dim name="/col"/>
+    </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_array_8.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_8">
+    <Dimension name="col" size="3"/>
+    <Sequence name="s">
+        <Int32 name="i1"/>
+        <String name="s"/>
+        <Dim size="2"/>
+        <Dim name="/col"/>
+    </Sequence>
+</Dataset>
+
+The data:
+{ {{{ { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" } }, { { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" } }, { { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" } }},{{ { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" } }, { { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" } }, { { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" } }}} }
diff --git a/tests/dmr-testsuite/big-endian/test_array_8.xml.trans_base b/tests/dmr-testsuite/big-endian/test_array_8.xml.trans_base
new file mode 100644
index 0000000..f9168fb
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_8.xml.trans_base
@@ -0,0 +1,28 @@
+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_8.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_8">
+    <Dimension name="col" size="3"/>
+    <Sequence name="s">
+        <Int32 name="i1"/>
+        <String name="s"/>
+        <Dim size="2"/>
+        <Dim name="/col"/>
+    </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_array_8.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_8">
+    <Dimension name="col" size="3"/>
+    <Sequence name="s">
+        <Int32 name="i1"/>
+        <String name="s"/>
+        <Dim size="2"/>
+        <Dim name="/col"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>32c07f3f</Value>
+        </Attribute>
+    </Sequence>
+</Dataset>
+
+The data:
+{ {{{ { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" } }, { { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" } }, { { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" } }},{{ { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" } }, { { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" } }, { { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" } }}} }
diff --git a/tests/dmr-testsuite/big-endian/test_array_9.xml.intern_base b/tests/dmr-testsuite/big-endian/test_array_9.xml.intern_base
new file mode 100644
index 0000000..2f53699
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_9.xml.intern_base
@@ -0,0 +1,17 @@
+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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
+    <Int32 name="x">
+        <Dim size="0"/>
+    </Int32>
+</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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
+    <Int32 name="x">
+        <Dim size="0"/>
+    </Int32>
+</Dataset>
+
+The data:
+{ {} }
diff --git a/tests/dmr-testsuite/big-endian/test_array_9.xml.trans_base b/tests/dmr-testsuite/big-endian/test_array_9.xml.trans_base
new file mode 100644
index 0000000..e24d475
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_9.xml.trans_base
@@ -0,0 +1,20 @@
+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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
+    <Int32 name="x">
+        <Dim size="0"/>
+    </Int32>
+</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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
+    <Int32 name="x">
+        <Dim size="0"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>00000000</Value>
+        </Attribute>
+    </Int32>
+</Dataset>
+
+The data:
+{ {} }
diff --git a/tests/dmr-testsuite/big-endian/test_simple_1.xml.intern_base b/tests/dmr-testsuite/big-endian/test_simple_1.xml.intern_base
new file mode 100644
index 0000000..4b6ab97
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_simple_1.xml.intern_base
@@ -0,0 +1,13 @@
+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_1.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_1">
+    <Int32 name="x"/>
+</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_1.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_1">
+    <Int32 name="x"/>
+</Dataset>
+
+The data:
+{ 123456789 }
diff --git a/tests/dmr-testsuite/big-endian/test_simple_1.xml.trans_base b/tests/dmr-testsuite/big-endian/test_simple_1.xml.trans_base
new file mode 100644
index 0000000..c6f1d8f
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_simple_1.xml.trans_base
@@ -0,0 +1,17 @@
+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_1.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_1">
+    <Int32 name="x"/>
+</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_1.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_1">
+    <Int32 name="x">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>cff36b1c</Value>
+        </Attribute>
+    </Int32>
+</Dataset>
+
+The data:
+{ 123456789 }
diff --git a/tests/dmr-testsuite/big-endian/test_simple_10.xml.intern_base b/tests/dmr-testsuite/big-endian/test_simple_10.xml.intern_base
new file mode 100644
index 0000000..a265226
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_simple_10.xml.intern_base
@@ -0,0 +1,13 @@
+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_10.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_10">
+    <Opaque name="o"/>
+</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_10.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_10">
+    <Opaque name="o"/>
+</Dataset>
+
+The data:
+{ 1,2,3,4,5 }
diff --git a/tests/dmr-testsuite/big-endian/test_simple_10.xml.trans_base b/tests/dmr-testsuite/big-endian/test_simple_10.xml.trans_base
new file mode 100644
index 0000000..b9b6c49
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_simple_10.xml.trans_base
@@ -0,0 +1,17 @@
+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_10.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_10">
+    <Opaque name="o"/>
+</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_10.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_10">
+    <Opaque name="o">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>470b99f4</Value>
+        </Attribute>
+    </Opaque>
+</Dataset>
+
+The data:
+{ 1,2,3,4,5 }
diff --git a/tests/dmr-testsuite/big-endian/test_simple_2.xml.intern_base b/tests/dmr-testsuite/big-endian/test_simple_2.xml.intern_base
new file mode 100644
index 0000000..09b8340
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_simple_2.xml.intern_base
@@ -0,0 +1,37 @@
+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_2.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_2">
+    <Byte name="b"/>
+    <Int8 name="i8"/>
+    <UInt8 name="ui8"/>
+    <Int16 name="i16"/>
+    <UInt16 name="ui16"/>
+    <Int32 name="i32"/>
+    <UInt32 name="ui32"/>
+    <Int64 name="i64"/>
+    <UInt64 name="ui64"/>
+    <Float32 name="f32"/>
+    <Float64 name="f64"/>
+    <String name="s"/>
+    <URL name="u"/>
+</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_2.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_2">
+    <Byte name="b"/>
+    <Int8 name="i8"/>
+    <UInt8 name="ui8"/>
+    <Int16 name="i16"/>
+    <UInt16 name="ui16"/>
+    <Int32 name="i32"/>
+    <UInt32 name="ui32"/>
+    <Int64 name="i64"/>
+    <UInt64 name="ui64"/>
+    <Float32 name="f32"/>
+    <Float64 name="f64"/>
+    <String name="s"/>
+    <URL name="u"/>
+</Dataset>
+
+The data:
+{ 255, 127, 255, 32000, 64000, 123456789, 4026531840, 72057594037927935, 18446744073709551615, 99.999, 99.999, "Silly test string: 1", "http://dcz.gso.uri.edu/avhrr-archive/archive.html" }
diff --git a/tests/dmr-testsuite/big-endian/test_simple_2.xml.trans_base b/tests/dmr-testsuite/big-endian/test_simple_2.xml.trans_base
new file mode 100644
index 0000000..a715c7d
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_simple_2.xml.trans_base
@@ -0,0 +1,89 @@
+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_2.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_2">
+    <Byte name="b"/>
+    <Int8 name="i8"/>
+    <UInt8 name="ui8"/>
+    <Int16 name="i16"/>
+    <UInt16 name="ui16"/>
+    <Int32 name="i32"/>
+    <UInt32 name="ui32"/>
+    <Int64 name="i64"/>
+    <UInt64 name="ui64"/>
+    <Float32 name="f32"/>
+    <Float64 name="f64"/>
+    <String name="s"/>
+    <URL name="u"/>
+</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_2.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_2">
+    <Byte name="b">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>ff000000</Value>
+        </Attribute>
+    </Byte>
+    <Int8 name="i8">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>12b88320</Value>
+        </Attribute>
+    </Int8>
+    <UInt8 name="ui8">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>ff000000</Value>
+        </Attribute>
+    </UInt8>
+    <Int16 name="i16">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>db481544</Value>
+        </Attribute>
+    </Int16>
+    <UInt16 name="ui16">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>af8a1bc8</Value>
+        </Attribute>
+    </UInt16>
+    <Int32 name="i32">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>cff36b1c</Value>
+        </Attribute>
+    </Int32>
+    <UInt32 name="ui32">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>a722c9bb</Value>
+        </Attribute>
+    </UInt32>
+    <Int64 name="i64">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>070fd9fa</Value>
+        </Attribute>
+    </Int64>
+    <UInt64 name="ui64">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>2144df1c</Value>
+        </Attribute>
+    </UInt64>
+    <Float32 name="f32">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>39293f9c</Value>
+        </Attribute>
+    </Float32>
+    <Float64 name="f64">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>5ca72579</Value>
+        </Attribute>
+    </Float64>
+    <String name="s">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>3d9a4edd</Value>
+        </Attribute>
+    </String>
+    <URL name="u">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>08f792c4</Value>
+        </Attribute>
+    </URL>
+</Dataset>
+
+The data:
+{ 255, 127, 255, 32000, 64000, 123456789, 4026531840, 72057594037927935, 18446744073709551615, 99.999, 99.999, "Silly test string: 1", "http://dcz.gso.uri.edu/avhrr-archive/archive.html" }
diff --git a/tests/dmr-testsuite/big-endian/test_simple_3.xml.intern_base b/tests/dmr-testsuite/big-endian/test_simple_3.xml.intern_base
new file mode 100644
index 0000000..ee45c20
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_simple_3.xml.intern_base
@@ -0,0 +1,21 @@
+Parse successful
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="test_simple_3">
+    <Enumeration name="e1" basetype="UInt8">
+        <EnumConst name="econst1" value="1"/>
+        <EnumConst name="econst2" value="2"/>
+    </Enumeration>
+    <Int32 name="x"/>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="test_simple_3">
+    <Enumeration name="e1" basetype="UInt8">
+        <EnumConst name="econst1" value="1"/>
+        <EnumConst name="econst2" value="2"/>
+    </Enumeration>
+    <Int32 name="x"/>
+</Dataset>
+
+The data:
+{ 123456789 }
diff --git a/tests/dmr-testsuite/big-endian/test_simple_3.xml.trans_base b/tests/dmr-testsuite/big-endian/test_simple_3.xml.trans_base
new file mode 100644
index 0000000..4e6e734
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_simple_3.xml.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#" dapVersion="4.0" dmrVersion="1.0" name="test_simple_3">
+    <Enumeration name="e1" basetype="UInt8">
+        <EnumConst name="econst1" value="1"/>
+        <EnumConst name="econst2" value="2"/>
+    </Enumeration>
+    <Int32 name="x"/>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="test_simple_3">
+    <Enumeration name="e1" basetype="UInt8">
+        <EnumConst name="econst1" value="1"/>
+        <EnumConst name="econst2" value="2"/>
+    </Enumeration>
+    <Int32 name="x">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>cff36b1c</Value>
+        </Attribute>
+    </Int32>
+</Dataset>
+
+The data:
+{ 123456789 }
diff --git a/tests/dmr-testsuite/big-endian/test_simple_4.xml.intern_base b/tests/dmr-testsuite/big-endian/test_simple_4.xml.intern_base
new file mode 100644
index 0000000..14f262e
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_simple_4.xml.intern_base
@@ -0,0 +1,21 @@
+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_4.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_4">
+    <Int32 name="x">
+        <Attribute name="long_name" type="String">
+            <Value>x_axis_value</Value>
+        </Attribute>
+    </Int32>
+</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_4.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_4">
+    <Int32 name="x">
+        <Attribute name="long_name" type="String">
+            <Value>x_axis_value</Value>
+        </Attribute>
+    </Int32>
+</Dataset>
+
+The data:
+{ 123456789 }
diff --git a/tests/dmr-testsuite/big-endian/test_simple_4.xml.trans_base b/tests/dmr-testsuite/big-endian/test_simple_4.xml.trans_base
new file mode 100644
index 0000000..05df574
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_simple_4.xml.trans_base
@@ -0,0 +1,24 @@
+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_4.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_4">
+    <Int32 name="x">
+        <Attribute name="long_name" type="String">
+            <Value>x_axis_value</Value>
+        </Attribute>
+    </Int32>
+</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_4.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_4">
+    <Int32 name="x">
+        <Attribute name="long_name" type="String">
+            <Value>x_axis_value</Value>
+        </Attribute>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>cff36b1c</Value>
+        </Attribute>
+    </Int32>
+</Dataset>
+
+The data:
+{ 123456789 }
diff --git a/tests/dmr-testsuite/big-endian/test_simple_5.xml.intern_base b/tests/dmr-testsuite/big-endian/test_simple_5.xml.intern_base
new file mode 100644
index 0000000..74bd6ba
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_simple_5.xml.intern_base
@@ -0,0 +1,29 @@
+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_5.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_5">
+    <Int8 name="i"/>
+    <Int16 name="j"/>
+    <Int32 name="k"/>
+    <Int64 name="z"/>
+    <Byte name="ui"/>
+    <UInt8 name="uii"/>
+    <UInt16 name="uj"/>
+    <UInt32 name="uk"/>
+    <UInt64 name="uz"/>
+</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_5.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_5">
+    <Int8 name="i"/>
+    <Int16 name="j"/>
+    <Int32 name="k"/>
+    <Int64 name="z"/>
+    <Byte name="ui"/>
+    <UInt8 name="uii"/>
+    <UInt16 name="uj"/>
+    <UInt32 name="uk"/>
+    <UInt64 name="uz"/>
+</Dataset>
+
+The data:
+{ 127, 32000, 123456789, 72057594037927935, 255, 255, 64000, 4026531840, 18446744073709551615 }
diff --git a/tests/dmr-testsuite/big-endian/test_simple_5.xml.trans_base b/tests/dmr-testsuite/big-endian/test_simple_5.xml.trans_base
new file mode 100644
index 0000000..4794643
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_simple_5.xml.trans_base
@@ -0,0 +1,65 @@
+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_5.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_5">
+    <Int8 name="i"/>
+    <Int16 name="j"/>
+    <Int32 name="k"/>
+    <Int64 name="z"/>
+    <Byte name="ui"/>
+    <UInt8 name="uii"/>
+    <UInt16 name="uj"/>
+    <UInt32 name="uk"/>
+    <UInt64 name="uz"/>
+</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_5.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_5">
+    <Int8 name="i">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>12b88320</Value>
+        </Attribute>
+    </Int8>
+    <Int16 name="j">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>db481544</Value>
+        </Attribute>
+    </Int16>
+    <Int32 name="k">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>cff36b1c</Value>
+        </Attribute>
+    </Int32>
+    <Int64 name="z">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>070fd9fa</Value>
+        </Attribute>
+    </Int64>
+    <Byte name="ui">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>ff000000</Value>
+        </Attribute>
+    </Byte>
+    <UInt8 name="uii">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>ff000000</Value>
+        </Attribute>
+    </UInt8>
+    <UInt16 name="uj">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>af8a1bc8</Value>
+        </Attribute>
+    </UInt16>
+    <UInt32 name="uk">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>a722c9bb</Value>
+        </Attribute>
+    </UInt32>
+    <UInt64 name="uz">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>2144df1c</Value>
+        </Attribute>
+    </UInt64>
+</Dataset>
+
+The data:
+{ 127, 32000, 123456789, 72057594037927935, 255, 255, 64000, 4026531840, 18446744073709551615 }
diff --git a/tests/dmr-testsuite/big-endian/test_simple_6.1.xml.1.trans_base b/tests/dmr-testsuite/big-endian/test_simple_6.1.xml.1.trans_base
new file mode 100644
index 0000000..c7eaef9
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_simple_6.1.xml.1.trans_base
@@ -0,0 +1,26 @@
+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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_6">
+    <Structure name="s">
+        <Int32 name="i1"/>
+        <String name="s"/>
+        <Structure name="inner">
+            <Int32 name="i2"/>
+        </Structure>
+    </Structure>
+</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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_6">
+    <Structure name="s">
+        <Structure name="inner">
+            <Int32 name="i2"/>
+        </Structure>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>cff36b1c</Value>
+        </Attribute>
+    </Structure>
+</Dataset>
+
+The data:
+{ { { 123456789 } } }
diff --git a/tests/dmr-testsuite/big-endian/test_simple_6.2.xml.intern_base b/tests/dmr-testsuite/big-endian/test_simple_6.2.xml.intern_base
new file mode 100644
index 0000000..014c72e
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_simple_6.2.xml.intern_base
@@ -0,0 +1,13 @@
+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_6.2.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_6.2">
+    <Structure name="s"/>
+</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_6.2.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_6.2">
+    <Structure name="s"/>
+</Dataset>
+
+The data:
+{ {  } }
diff --git a/tests/dmr-testsuite/big-endian/test_simple_6.2.xml.trans_base b/tests/dmr-testsuite/big-endian/test_simple_6.2.xml.trans_base
new file mode 100644
index 0000000..b393e3f
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_simple_6.2.xml.trans_base
@@ -0,0 +1,17 @@
+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_6.2.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_6.2">
+    <Structure name="s"/>
+</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_6.2.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_6.2">
+    <Structure name="s">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>00000000</Value>
+        </Attribute>
+    </Structure>
+</Dataset>
+
+The data:
+{ {  } }
diff --git a/tests/dmr-testsuite/big-endian/test_simple_6.3.xml.intern_base b/tests/dmr-testsuite/big-endian/test_simple_6.3.xml.intern_base
new file mode 100644
index 0000000..c0ea6cc
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_simple_6.3.xml.intern_base
@@ -0,0 +1,21 @@
+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_6.3.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_6.3">
+    <Structure name="s">
+        <Int32 name="i1"/>
+        <String name="s"/>
+        <Structure name="inner"/>
+    </Structure>
+</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_6.3.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_6.3">
+    <Structure name="s">
+        <Int32 name="i1"/>
+        <String name="s"/>
+        <Structure name="inner"/>
+    </Structure>
+</Dataset>
+
+The data:
+{ { 123456789, "Silly test string: 1", {  } } }
diff --git a/tests/dmr-testsuite/big-endian/test_simple_6.3.xml.trans_base b/tests/dmr-testsuite/big-endian/test_simple_6.3.xml.trans_base
new file mode 100644
index 0000000..d260d64
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_simple_6.3.xml.trans_base
@@ -0,0 +1,24 @@
+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_6.3.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_6.3">
+    <Structure name="s">
+        <Int32 name="i1"/>
+        <String name="s"/>
+        <Structure name="inner"/>
+    </Structure>
+</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_6.3.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_6.3">
+    <Structure name="s">
+        <Int32 name="i1"/>
+        <String name="s"/>
+        <Structure name="inner"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>63dceb61</Value>
+        </Attribute>
+    </Structure>
+</Dataset>
+
+The data:
+{ { 123456789, "Silly test string: 1", {  } } }
diff --git a/tests/dmr-testsuite/big-endian/test_simple_6.xml.1.trans_base b/tests/dmr-testsuite/big-endian/test_simple_6.xml.1.trans_base
new file mode 100644
index 0000000..e94b594
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_simple_6.xml.1.trans_base
@@ -0,0 +1,22 @@
+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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_6">
+    <Structure name="s">
+        <Int32 name="i1"/>
+        <String name="s"/>
+    </Structure>
+</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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_6">
+    <Structure name="s">
+        <Int32 name="i1"/>
+        <String name="s"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>63dceb61</Value>
+        </Attribute>
+    </Structure>
+</Dataset>
+
+The data:
+{ { 123456789, "Silly test string: 1" } }
diff --git a/tests/dmr-testsuite/big-endian/test_simple_6.xml.2.trans_base b/tests/dmr-testsuite/big-endian/test_simple_6.xml.2.trans_base
new file mode 100644
index 0000000..78f1a67
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_simple_6.xml.2.trans_base
@@ -0,0 +1,21 @@
+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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_6">
+    <Structure name="s">
+        <Int32 name="i1"/>
+        <String name="s"/>
+    </Structure>
+</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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_6">
+    <Structure name="s">
+        <Int32 name="i1"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>cff36b1c</Value>
+        </Attribute>
+    </Structure>
+</Dataset>
+
+The data:
+{ { 123456789 } }
diff --git a/tests/dmr-testsuite/big-endian/test_simple_6.xml.3.trans_base b/tests/dmr-testsuite/big-endian/test_simple_6.xml.3.trans_base
new file mode 100644
index 0000000..583ebd8
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_simple_6.xml.3.trans_base
@@ -0,0 +1,21 @@
+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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_6">
+    <Structure name="s">
+        <Int32 name="i1"/>
+        <String name="s"/>
+    </Structure>
+</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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_6">
+    <Structure name="s">
+        <String name="s"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>3d9a4edd</Value>
+        </Attribute>
+    </Structure>
+</Dataset>
+
+The data:
+{ { "Silly test string: 1" } }
diff --git a/tests/dmr-testsuite/big-endian/test_simple_6.xml.intern_base b/tests/dmr-testsuite/big-endian/test_simple_6.xml.intern_base
new file mode 100644
index 0000000..492e4be
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_simple_6.xml.intern_base
@@ -0,0 +1,19 @@
+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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_6">
+    <Structure name="s">
+        <Int32 name="i1"/>
+        <String name="s"/>
+    </Structure>
+</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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_6">
+    <Structure name="s">
+        <Int32 name="i1"/>
+        <String name="s"/>
+    </Structure>
+</Dataset>
+
+The data:
+{ { 123456789, "Silly test string: 1" } }
diff --git a/tests/dmr-testsuite/big-endian/test_simple_6.xml.trans_base b/tests/dmr-testsuite/big-endian/test_simple_6.xml.trans_base
new file mode 100644
index 0000000..e94b594
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_simple_6.xml.trans_base
@@ -0,0 +1,22 @@
+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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_6">
+    <Structure name="s">
+        <Int32 name="i1"/>
+        <String name="s"/>
+    </Structure>
+</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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_6">
+    <Structure name="s">
+        <Int32 name="i1"/>
+        <String name="s"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>63dceb61</Value>
+        </Attribute>
+    </Structure>
+</Dataset>
+
+The data:
+{ { 123456789, "Silly test string: 1" } }
diff --git a/tests/dmr-testsuite/big-endian/test_simple_7.xml.1.trans_base b/tests/dmr-testsuite/big-endian/test_simple_7.xml.1.trans_base
new file mode 100644
index 0000000..4ce57c0
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_simple_7.xml.1.trans_base
@@ -0,0 +1,22 @@
+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>c6f12441</Value>
+        </Attribute>
+    </Sequence>
+</Dataset>
+
+The data:
+{ { { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" } } }
diff --git a/tests/dmr-testsuite/big-endian/test_simple_7.xml.2.trans_base b/tests/dmr-testsuite/big-endian/test_simple_7.xml.2.trans_base
new file mode 100644
index 0000000..37c4b11
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_simple_7.xml.2.trans_base
@@ -0,0 +1,21 @@
+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"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>19f0a861</Value>
+        </Attribute>
+    </Sequence>
+</Dataset>
+
+The data:
+{ { { 123456789 }, { 123456789 }, { 123456789 }, { 123456789 } } }
diff --git a/tests/dmr-testsuite/big-endian/test_simple_7.xml.intern_base b/tests/dmr-testsuite/big-endian/test_simple_7.xml.intern_base
new file mode 100644
index 0000000..1ab9b0e
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_simple_7.xml.intern_base
@@ -0,0 +1,19 @@
+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"/>
+    </Sequence>
+</Dataset>
+
+The data:
+{ { { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" } } }
diff --git a/tests/dmr-testsuite/big-endian/test_simple_7.xml.trans_base b/tests/dmr-testsuite/big-endian/test_simple_7.xml.trans_base
new file mode 100644
index 0000000..4ce57c0
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_simple_7.xml.trans_base
@@ -0,0 +1,22 @@
+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>c6f12441</Value>
+        </Attribute>
+    </Sequence>
+</Dataset>
+
+The data:
+{ { { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" } } }
diff --git a/tests/dmr-testsuite/big-endian/test_simple_8.xml.1.trans_base b/tests/dmr-testsuite/big-endian/test_simple_8.xml.1.trans_base
new file mode 100644
index 0000000..4aa16f2
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_simple_8.xml.1.trans_base
@@ -0,0 +1,26 @@
+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_8.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_8">
+    <Structure name="outer">
+        <Sequence name="s">
+            <Int32 name="i1"/>
+            <String name="s"/>
+        </Sequence>
+    </Structure>
+</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_8.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_8">
+    <Structure name="outer">
+        <Sequence name="s">
+            <Int32 name="i1"/>
+            <String name="s"/>
+        </Sequence>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>66950c7d</Value>
+        </Attribute>
+    </Structure>
+</Dataset>
+
+The data:
+{ { { { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" } } } }
diff --git a/tests/dmr-testsuite/big-endian/test_simple_8.xml.2.trans_base b/tests/dmr-testsuite/big-endian/test_simple_8.xml.2.trans_base
new file mode 100644
index 0000000..61c3911
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_simple_8.xml.2.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_simple_8.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_8">
+    <Structure name="outer">
+        <Sequence name="s">
+            <Int32 name="i1"/>
+            <String name="s"/>
+        </Sequence>
+    </Structure>
+</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_8.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_8">
+    <Structure name="outer">
+        <Sequence name="s">
+            <String name="s"/>
+        </Sequence>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>5bd779e9</Value>
+        </Attribute>
+    </Structure>
+</Dataset>
+
+The data:
+{ { { { "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_simple_8.xml.intern_base b/tests/dmr-testsuite/big-endian/test_simple_8.xml.intern_base
new file mode 100644
index 0000000..db42cfa
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_simple_8.xml.intern_base
@@ -0,0 +1,23 @@
+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_8.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_8">
+    <Structure name="outer">
+        <Sequence name="s">
+            <Int32 name="i1"/>
+            <String name="s"/>
+        </Sequence>
+    </Structure>
+</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_8.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_8">
+    <Structure name="outer">
+        <Sequence name="s">
+            <Int32 name="i1"/>
+            <String name="s"/>
+        </Sequence>
+    </Structure>
+</Dataset>
+
+The data:
+{ { { { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" } } } }
diff --git a/tests/dmr-testsuite/big-endian/test_simple_8.xml.trans_base b/tests/dmr-testsuite/big-endian/test_simple_8.xml.trans_base
new file mode 100644
index 0000000..6336eaf
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_simple_8.xml.trans_base
@@ -0,0 +1,26 @@
+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_8.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_8">
+    <Structure name="outer">
+        <Sequence name="s">
+            <Int32 name="i1"/>
+            <String name="s"/>
+        </Sequence>
+    </Structure>
+</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_8.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_8">
+    <Structure name="outer">
+        <Sequence name="s">
+            <Int32 name="i1"/>
+            <String name="s"/>
+        </Sequence>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>c6f12441</Value>
+        </Attribute>
+    </Structure>
+</Dataset>
+
+The data:
+{ { { { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" } } } }
diff --git a/tests/dmr-testsuite/big-endian/test_simple_9.1.xml.intern_base b/tests/dmr-testsuite/big-endian/test_simple_9.1.xml.intern_base
new file mode 100644
index 0000000..42fff02
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_simple_9.1.xml.intern_base
@@ -0,0 +1,37 @@
+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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_9">
+    <Enumeration name="color" basetype="Int32">
+        <EnumConst name="red" value="1"/>
+        <EnumConst name="blue" value="2"/>
+        <EnumConst name="gray" value="3"/>
+    </Enumeration>
+    <Enumeration name="shade" basetype="UInt64">
+        <EnumConst name="light" value="1"/>
+        <EnumConst name="med" value="2"/>
+        <EnumConst name="dark" value="3"/>
+        <EnumConst name="pitch" value="256"/>
+    </Enumeration>
+    <Enum name="e" enum="/color"/>
+    <Enum name="f" enum="/shade"/>
+</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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_9">
+    <Enumeration name="color" basetype="Int32">
+        <EnumConst name="red" value="1"/>
+        <EnumConst name="blue" value="2"/>
+        <EnumConst name="gray" value="3"/>
+    </Enumeration>
+    <Enumeration name="shade" basetype="UInt64">
+        <EnumConst name="light" value="1"/>
+        <EnumConst name="med" value="2"/>
+        <EnumConst name="dark" value="3"/>
+        <EnumConst name="pitch" value="256"/>
+    </Enumeration>
+    <Enum name="e" enum="/color"/>
+    <Enum name="f" enum="/shade"/>
+</Dataset>
+
+The data:
+{ 1, 1 }
diff --git a/tests/dmr-testsuite/big-endian/test_simple_9.1.xml.trans_base b/tests/dmr-testsuite/big-endian/test_simple_9.1.xml.trans_base
new file mode 100644
index 0000000..f5d2d7f
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_simple_9.1.xml.trans_base
@@ -0,0 +1,45 @@
+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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_9">
+    <Enumeration name="color" basetype="Int32">
+        <EnumConst name="red" value="1"/>
+        <EnumConst name="blue" value="2"/>
+        <EnumConst name="gray" value="3"/>
+    </Enumeration>
+    <Enumeration name="shade" basetype="UInt64">
+        <EnumConst name="light" value="1"/>
+        <EnumConst name="med" value="2"/>
+        <EnumConst name="dark" value="3"/>
+        <EnumConst name="pitch" value="256"/>
+    </Enumeration>
+    <Enum name="e" enum="/color"/>
+    <Enum name="f" enum="/shade"/>
+</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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_9">
+    <Enumeration name="color" basetype="Int32">
+        <EnumConst name="red" value="1"/>
+        <EnumConst name="blue" value="2"/>
+        <EnumConst name="gray" value="3"/>
+    </Enumeration>
+    <Enumeration name="shade" basetype="UInt64">
+        <EnumConst name="light" value="1"/>
+        <EnumConst name="med" value="2"/>
+        <EnumConst name="dark" value="3"/>
+        <EnumConst name="pitch" value="256"/>
+    </Enumeration>
+    <Enum name="e" enum="/color">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>5643ef8a</Value>
+        </Attribute>
+    </Enum>
+    <Enum name="f" enum="/shade">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>1225efff</Value>
+        </Attribute>
+    </Enum>
+</Dataset>
+
+The data:
+{ 1, 1 }
diff --git a/tests/dmr-testsuite/big-endian/test_simple_9.xml.intern_base b/tests/dmr-testsuite/big-endian/test_simple_9.xml.intern_base
new file mode 100644
index 0000000..f2ba8fa
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_simple_9.xml.intern_base
@@ -0,0 +1,23 @@
+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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_9">
+    <Enumeration name="color" basetype="Byte">
+        <EnumConst name="red" value="1"/>
+        <EnumConst name="blue" value="2"/>
+        <EnumConst name="gray" value="3"/>
+    </Enumeration>
+    <Enum name="e" enum="/color"/>
+</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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_9">
+    <Enumeration name="color" basetype="Byte">
+        <EnumConst name="red" value="1"/>
+        <EnumConst name="blue" value="2"/>
+        <EnumConst name="gray" value="3"/>
+    </Enumeration>
+    <Enum name="e" enum="/color"/>
+</Dataset>
+
+The data:
+{ 1 }
diff --git a/tests/dmr-testsuite/big-endian/test_simple_9.xml.trans_base b/tests/dmr-testsuite/big-endian/test_simple_9.xml.trans_base
new file mode 100644
index 0000000..ee8aa87
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_simple_9.xml.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_simple_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_9">
+    <Enumeration name="color" basetype="Byte">
+        <EnumConst name="red" value="1"/>
+        <EnumConst name="blue" value="2"/>
+        <EnumConst name="gray" value="3"/>
+    </Enumeration>
+    <Enum name="e" enum="/color"/>
+</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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_9">
+    <Enumeration name="color" basetype="Byte">
+        <EnumConst name="red" value="1"/>
+        <EnumConst name="blue" value="2"/>
+        <EnumConst name="gray" value="3"/>
+    </Enumeration>
+    <Enum name="e" enum="/color">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>a505df1b</Value>
+        </Attribute>
+    </Enum>
+</Dataset>
+
+The data:
+{ 1 }
diff --git a/tests/dmr-testsuite/big-endian/vol_1_ce_1.xml.1.func_base b/tests/dmr-testsuite/big-endian/vol_1_ce_1.xml.1.func_base
new file mode 100644
index 0000000..0c66f93
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/vol_1_ce_1.xml.1.func_base
@@ -0,0 +1,22 @@
+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_1.xml" dapVersion="4.0" dmrVersion="1.0" name="vol_1_ce_1">
+    <Int32 name="u"/>
+    <Int32 name="v"/>
+    <Structure name="Point">
+        <Int32 name="x"/>
+        <Int32 name="y"/>
+    </Structure>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="function_results">
+    <Float64 name="u">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>26b3e340</Value>
+        </Attribute>
+    </Float64>
+</Dataset>
+
+The data:
+{ 1234567890 }
diff --git a/tests/dmr-testsuite/big-endian/vol_1_ce_1.xml.10.func_base b/tests/dmr-testsuite/big-endian/vol_1_ce_1.xml.10.func_base
new file mode 100644
index 0000000..018c397
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/vol_1_ce_1.xml.10.func_base
@@ -0,0 +1,23 @@
+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_1.xml" dapVersion="4.0" dmrVersion="1.0" name="vol_1_ce_1">
+    <Int32 name="u"/>
+    <Int32 name="v"/>
+    <Structure name="Point">
+        <Int32 name="x"/>
+        <Int32 name="y"/>
+    </Structure>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="function_results">
+    <Float64 name="g1">
+        <Dim size="4"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>b023d9dd</Value>
+        </Attribute>
+    </Float64>
+</Dataset>
+
+The data:
+{ {10, 20, 30, -40} }
diff --git a/tests/dmr-testsuite/big-endian/vol_1_ce_1.xml.11.func_base b/tests/dmr-testsuite/big-endian/vol_1_ce_1.xml.11.func_base
new file mode 100644
index 0000000..0c0d8b6
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/vol_1_ce_1.xml.11.func_base
@@ -0,0 +1,23 @@
+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_1.xml" dapVersion="4.0" dmrVersion="1.0" name="vol_1_ce_1">
+    <Int32 name="u"/>
+    <Int32 name="v"/>
+    <Structure name="Point">
+        <Int32 name="x"/>
+        <Int32 name="y"/>
+    </Structure>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="function_results">
+    <Float64 name="g1">
+        <Dim size="4"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>e3185c07</Value>
+        </Attribute>
+    </Float64>
+</Dataset>
+
+The data:
+{ {10, 20, 30, 40} }
diff --git a/tests/dmr-testsuite/big-endian/vol_1_ce_1.xml.12.func_base b/tests/dmr-testsuite/big-endian/vol_1_ce_1.xml.12.func_base
new file mode 100644
index 0000000..018c397
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/vol_1_ce_1.xml.12.func_base
@@ -0,0 +1,23 @@
+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_1.xml" dapVersion="4.0" dmrVersion="1.0" name="vol_1_ce_1">
+    <Int32 name="u"/>
+    <Int32 name="v"/>
+    <Structure name="Point">
+        <Int32 name="x"/>
+        <Int32 name="y"/>
+    </Structure>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="function_results">
+    <Float64 name="g1">
+        <Dim size="4"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>b023d9dd</Value>
+        </Attribute>
+    </Float64>
+</Dataset>
+
+The data:
+{ {10, 20, 30, -40} }
diff --git a/tests/dmr-testsuite/big-endian/vol_1_ce_1.xml.13.func_base b/tests/dmr-testsuite/big-endian/vol_1_ce_1.xml.13.func_base
new file mode 100644
index 0000000..a91f98d
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/vol_1_ce_1.xml.13.func_base
@@ -0,0 +1,23 @@
+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_1.xml" dapVersion="4.0" dmrVersion="1.0" name="vol_1_ce_1">
+    <Int32 name="u"/>
+    <Int32 name="v"/>
+    <Structure name="Point">
+        <Int32 name="x"/>
+        <Int32 name="y"/>
+    </Structure>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="function_results">
+    <Float64 name="g1">
+        <Dim size="4"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>99fd277f</Value>
+        </Attribute>
+    </Float64>
+</Dataset>
+
+The data:
+{ {1, 2, 3, 1.84467440737096e+19} }
diff --git a/tests/dmr-testsuite/big-endian/vol_1_ce_1.xml.14.func_base b/tests/dmr-testsuite/big-endian/vol_1_ce_1.xml.14.func_base
new file mode 100644
index 0000000..8c74c3f
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/vol_1_ce_1.xml.14.func_base
@@ -0,0 +1,23 @@
+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_1.xml" dapVersion="4.0" dmrVersion="1.0" name="vol_1_ce_1">
+    <Int32 name="u"/>
+    <Int32 name="v"/>
+    <Structure name="Point">
+        <Int32 name="x"/>
+        <Int32 name="y"/>
+    </Structure>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="function_results">
+    <Float64 name="g1">
+        <Dim size="4"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>fe23bbb1</Value>
+        </Attribute>
+    </Float64>
+</Dataset>
+
+The data:
+{ {1, 2, 3, 9.22337203685478e+18} }
diff --git a/tests/dmr-testsuite/big-endian/vol_1_ce_1.xml.15.func_base b/tests/dmr-testsuite/big-endian/vol_1_ce_1.xml.15.func_base
new file mode 100644
index 0000000..8b566ad
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/vol_1_ce_1.xml.15.func_base
@@ -0,0 +1,23 @@
+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_1.xml" dapVersion="4.0" dmrVersion="1.0" name="vol_1_ce_1">
+    <Int32 name="u"/>
+    <Int32 name="v"/>
+    <Structure name="Point">
+        <Int32 name="x"/>
+        <Int32 name="y"/>
+    </Structure>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="function_results">
+    <Float64 name="g1">
+        <Dim size="4"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>35760405</Value>
+        </Attribute>
+    </Float64>
+</Dataset>
+
+The data:
+{ {10, 20, 30, 45.5000019073486} }
diff --git a/tests/dmr-testsuite/big-endian/vol_1_ce_1.xml.16.func_base b/tests/dmr-testsuite/big-endian/vol_1_ce_1.xml.16.func_base
new file mode 100644
index 0000000..b3bb7df
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/vol_1_ce_1.xml.16.func_base
@@ -0,0 +1,23 @@
+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_1.xml" dapVersion="4.0" dmrVersion="1.0" name="vol_1_ce_1">
+    <Int32 name="u"/>
+    <Int32 name="v"/>
+    <Structure name="Point">
+        <Int32 name="x"/>
+        <Int32 name="y"/>
+    </Structure>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="function_results">
+    <Float64 name="g1">
+        <Dim size="4"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>656f539a</Value>
+        </Attribute>
+    </Float64>
+</Dataset>
+
+The data:
+{ {10, 20, 30, 45.5} }
diff --git a/tests/dmr-testsuite/big-endian/vol_1_ce_1.xml.2.func_base b/tests/dmr-testsuite/big-endian/vol_1_ce_1.xml.2.func_base
new file mode 100644
index 0000000..96373c9
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/vol_1_ce_1.xml.2.func_base
@@ -0,0 +1,22 @@
+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_1.xml" dapVersion="4.0" dmrVersion="1.0" name="vol_1_ce_1">
+    <Int32 name="u"/>
+    <Int32 name="v"/>
+    <Structure name="Point">
+        <Int32 name="x"/>
+        <Int32 name="y"/>
+    </Structure>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="function_results">
+    <Float64 name="u">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>c82799a1</Value>
+        </Attribute>
+    </Float64>
+</Dataset>
+
+The data:
+{ 1.52415787501905e+16 }
diff --git a/tests/dmr-testsuite/big-endian/vol_1_ce_1.xml.3.func_base b/tests/dmr-testsuite/big-endian/vol_1_ce_1.xml.3.func_base
new file mode 100644
index 0000000..9d6600b
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/vol_1_ce_1.xml.3.func_base
@@ -0,0 +1,22 @@
+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_1.xml" dapVersion="4.0" dmrVersion="1.0" name="vol_1_ce_1">
+    <Int32 name="u"/>
+    <Int32 name="v"/>
+    <Structure name="Point">
+        <Int32 name="x"/>
+        <Int32 name="y"/>
+    </Structure>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="function_results">
+    <Float64 name="u">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>1d0ab9ed</Value>
+        </Attribute>
+    </Float64>
+</Dataset>
+
+The data:
+{ 12345678.9 }
diff --git a/tests/dmr-testsuite/big-endian/vol_1_ce_1.xml.4.func_base b/tests/dmr-testsuite/big-endian/vol_1_ce_1.xml.4.func_base
new file mode 100644
index 0000000..3bb2b32
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/vol_1_ce_1.xml.4.func_base
@@ -0,0 +1,22 @@
+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_1.xml" dapVersion="4.0" dmrVersion="1.0" name="vol_1_ce_1">
+    <Int32 name="u"/>
+    <Int32 name="v"/>
+    <Structure name="Point">
+        <Int32 name="x"/>
+        <Int32 name="y"/>
+    </Structure>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="function_results">
+    <Float64 name="x">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>26b3e340</Value>
+        </Attribute>
+    </Float64>
+</Dataset>
+
+The data:
+{ 1234567890 }
diff --git a/tests/dmr-testsuite/big-endian/vol_1_ce_1.xml.5.func_base b/tests/dmr-testsuite/big-endian/vol_1_ce_1.xml.5.func_base
new file mode 100644
index 0000000..8a44bdb
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/vol_1_ce_1.xml.5.func_base
@@ -0,0 +1,22 @@
+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_1.xml" dapVersion="4.0" dmrVersion="1.0" name="vol_1_ce_1">
+    <Int32 name="u"/>
+    <Int32 name="v"/>
+    <Structure name="Point">
+        <Int32 name="x"/>
+        <Int32 name="y"/>
+    </Structure>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="function_results">
+    <Float64 name="x">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>c82799a1</Value>
+        </Attribute>
+    </Float64>
+</Dataset>
+
+The data:
+{ 1.52415787501905e+16 }
diff --git a/tests/dmr-testsuite/big-endian/vol_1_ce_1.xml.6.func_base b/tests/dmr-testsuite/big-endian/vol_1_ce_1.xml.6.func_base
new file mode 100644
index 0000000..2601d82
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/vol_1_ce_1.xml.6.func_base
@@ -0,0 +1,22 @@
+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_1.xml" dapVersion="4.0" dmrVersion="1.0" name="vol_1_ce_1">
+    <Int32 name="u"/>
+    <Int32 name="v"/>
+    <Structure name="Point">
+        <Int32 name="x"/>
+        <Int32 name="y"/>
+    </Structure>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="function_results">
+    <Float64 name="x">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>1d0ab9ed</Value>
+        </Attribute>
+    </Float64>
+</Dataset>
+
+The data:
+{ 12345678.9 }
diff --git a/tests/dmr-testsuite/big-endian/vol_1_ce_1.xml.7.func_base b/tests/dmr-testsuite/big-endian/vol_1_ce_1.xml.7.func_base
new file mode 100644
index 0000000..0c0d8b6
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/vol_1_ce_1.xml.7.func_base
@@ -0,0 +1,23 @@
+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_1.xml" dapVersion="4.0" dmrVersion="1.0" name="vol_1_ce_1">
+    <Int32 name="u"/>
+    <Int32 name="v"/>
+    <Structure name="Point">
+        <Int32 name="x"/>
+        <Int32 name="y"/>
+    </Structure>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="function_results">
+    <Float64 name="g1">
+        <Dim size="4"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>e3185c07</Value>
+        </Attribute>
+    </Float64>
+</Dataset>
+
+The data:
+{ {10, 20, 30, 40} }
diff --git a/tests/dmr-testsuite/big-endian/vol_1_ce_1.xml.8.func_base b/tests/dmr-testsuite/big-endian/vol_1_ce_1.xml.8.func_base
new file mode 100644
index 0000000..32b62c5
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/vol_1_ce_1.xml.8.func_base
@@ -0,0 +1,23 @@
+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_1.xml" dapVersion="4.0" dmrVersion="1.0" name="vol_1_ce_1">
+    <Int32 name="u"/>
+    <Int32 name="v"/>
+    <Structure name="Point">
+        <Int32 name="x"/>
+        <Int32 name="y"/>
+    </Structure>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="function_results">
+    <Float64 name="g1">
+        <Dim size="4"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>86832e40</Value>
+        </Attribute>
+    </Float64>
+</Dataset>
+
+The data:
+{ {100, 110, 120, -90} }
diff --git a/tests/dmr-testsuite/big-endian/vol_1_ce_1.xml.9.func_base b/tests/dmr-testsuite/big-endian/vol_1_ce_1.xml.9.func_base
new file mode 100644
index 0000000..0c0d8b6
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/vol_1_ce_1.xml.9.func_base
@@ -0,0 +1,23 @@
+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_1.xml" dapVersion="4.0" dmrVersion="1.0" name="vol_1_ce_1">
+    <Int32 name="u"/>
+    <Int32 name="v"/>
+    <Structure name="Point">
+        <Int32 name="x"/>
+        <Int32 name="y"/>
+    </Structure>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="function_results">
+    <Float64 name="g1">
+        <Dim size="4"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>e3185c07</Value>
+        </Attribute>
+    </Float64>
+</Dataset>
+
+The data:
+{ {10, 20, 30, 40} }
diff --git a/tests/dmr-testsuite/big-endian/vol_1_ce_10.xml.1.func_base b/tests/dmr-testsuite/big-endian/vol_1_ce_10.xml.1.func_base
new file mode 100644
index 0000000..8edf2f3
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/vol_1_ce_10.xml.1.func_base
@@ -0,0 +1,30 @@
+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_10.xml" dapVersion="4.0" dmrVersion="1.0" name="vol_1_ce_10">
+    <Float32 name="lat">
+        <Dim size="100"/>
+        <Dim size="50"/>
+    </Float32>
+    <Float32 name="lon">
+        <Dim size="100"/>
+        <Dim size="50"/>
+    </Float32>
+    <Float32 name="temp">
+        <Dim size="100"/>
+        <Dim size="50"/>
+    </Float32>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="function_results">
+    <Float64 name="lat">
+        <Dim size="100"/>
+        <Dim size="50"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>f4af813f</Value>
+        </Attribute>
+    </Float64>
+</Dataset>
+
+The data:
+{ {{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164}} }
diff --git a/tests/dmr-testsuite/big-endian/vol_1_ce_10.xml.2.func_base b/tests/dmr-testsuite/big-endian/vol_1_ce_10.xml.2.func_base
new file mode 100644
index 0000000..9e28c04
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/vol_1_ce_10.xml.2.func_base
@@ -0,0 +1,37 @@
+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_10.xml" dapVersion="4.0" dmrVersion="1.0" name="vol_1_ce_10">
+    <Float32 name="lat">
+        <Dim size="100"/>
+        <Dim size="50"/>
+    </Float32>
+    <Float32 name="lon">
+        <Dim size="100"/>
+        <Dim size="50"/>
+    </Float32>
+    <Float32 name="temp">
+        <Dim size="100"/>
+        <Dim size="50"/>
+    </Float32>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="function_results">
+    <Float64 name="lat">
+        <Dim size="100"/>
+        <Dim size="50"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>f4af813f</Value>
+        </Attribute>
+    </Float64>
+    <Float64 name="lon">
+        <Dim size="100"/>
+        <Dim size="50"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>f4af813f</Value>
+        </Attribute>
+    </Float64>
+</Dataset>
+
+The data:
+{ {{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164}}, {{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164}} }
diff --git a/tests/dmr-testsuite/big-endian/vol_1_ce_10.xml.3.func_base b/tests/dmr-testsuite/big-endian/vol_1_ce_10.xml.3.func_base
new file mode 100644
index 0000000..02307e7
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/vol_1_ce_10.xml.3.func_base
@@ -0,0 +1,37 @@
+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_10.xml" dapVersion="4.0" dmrVersion="1.0" name="vol_1_ce_10">
+    <Float32 name="lat">
+        <Dim size="100"/>
+        <Dim size="50"/>
+    </Float32>
+    <Float32 name="lon">
+        <Dim size="100"/>
+        <Dim size="50"/>
+    </Float32>
+    <Float32 name="temp">
+        <Dim size="100"/>
+        <Dim size="50"/>
+    </Float32>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="function_results">
+    <Float64 name="lat">
+        <Dim size="2"/>
+        <Dim size="2"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>cc49f579</Value>
+        </Attribute>
+    </Float64>
+    <Float64 name="lon">
+        <Dim size="2"/>
+        <Dim size="2"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>cc49f579</Value>
+        </Attribute>
+    </Float64>
+</Dataset>
+
+The data:
+{ {{999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164}}, {{999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164}} }
diff --git a/tests/dmr-testsuite/ignore_foreign_xml_1.xml b/tests/dmr-testsuite/ignore_foreign_xml_1.xml
new file mode 100644
index 0000000..075fb73
--- /dev/null
+++ b/tests/dmr-testsuite/ignore_foreign_xml_1.xml
@@ -0,0 +1,20623 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xmlns:h4="http://www.hdfgroup.org/HDF4/XML/schema/HDF4map/1.0.1" dapVersion="4.0" dmrVersion="1.0" name="AIRS.2015.09.21.L3.RetStd_IR001.v6.0.31.0.G15281122640.nc.h5">
+  <Dimension name="Latitude" size="180"/>
+  <Dimension name="Longitude" size="360"/>
+  <Dimension name="StdPressureLev" size="24"/>
+  <Dimension name="H2OPressureLev" size="12"/>
+  <Dimension name="CoarseCloudLayer" size="3"/>
+  <Dimension name="EmisFreqMW" size="3"/>
+  <Dimension name="FineCloudLayer" size="12"/>
+  <Dimension name="H2OPressureLay" size="12"/>
+  <Dimension name="EmisFreqIR" size="4"/>
+  <Float32 name="ClrOLR_A">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="131207158" uuid="ac3cc547-441e-4aa9-a6d9-f9cba6937b5a" chunkPositionInArray="[0,0]" nBytes="74557" md5="be3b25378857fa227173f11178634a4a"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="GPHeight_MW_A_sdev">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="68598937" uuid="a2c6b919-5480-46ef-b24b-7d2f59cfef0e" chunkPositionInArray="[0,0,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="68602358" uuid="195646a7-1e5c-48a9-928a-767e37a1c5ee" chunkPositionInArray="[0,0,180]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="68605779" uuid="17d651ca-abcf-4a50-a165-27a7f78d58e1" chunkPositionInArray="[0,90,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="320875971" uuid="0d0b377e-e0c6-4c1a-8ecc-928107a2bb3c" chunkPositionInArray="[0,90,180]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="320879392" uuid="f21d3321-34ed-48f6-8105-204cdfe073b6" chunkPositionInArray="[12,0,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="320882813" uuid="ca78f945-d41f-4f69-a53f-d9f7410b9fcc" chunkPositionInArray="[12,0,180]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="320886234" uuid="41f394ac-8199-4b91-8aaa-387ca142ba61" chunkPositionInArray="[12,90,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="320889655" uuid="0d009eba-1e1f-4e39-a131-23564c9a23b3" chunkPositionInArray="[12,90,180]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="CO_VMR_TqJ_D_ct">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>24 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="309156475" uuid="da7a045f-601b-4a3e-aa91-67b1d1e2f156" chunkPositionInArray="[0,0,0]" nBytes="854041" md5="b1080df902ba83ad66aca379343bb239"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="RelHum_liquid_A_max">
+    <Dim name="/H2OPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>5</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="96360070" uuid="163551bf-75b6-4422-9f9e-976e040c6335" chunkPositionInArray="[0,0,0]" nBytes="778838" md5="ac7f71f0972847192607b9633c9b2751"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="Temperature_A_err">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="3333992" uuid="9e16fe62-5343-46af-be46-689bd97f8749" chunkPositionInArray="[0,0,0]" nBytes="213236" md5="c589c7d93ba716e00f2b6a2650d4f79a"/>
+      <h4:byteStream offset="3547228" uuid="77b19479-1b27-4376-a56c-a8538ffd7db9" chunkPositionInArray="[0,0,180]" nBytes="212133" md5="c9df644f3d8029fd9e8d2fdb8b4457ef"/>
+      <h4:byteStream offset="3759361" uuid="bf359bee-8402-4a46-9007-66238b6f5ab3" chunkPositionInArray="[0,90,0]" nBytes="205170" md5="0bae5bbf1a2abcc0835d8087f6989065"/>
+      <h4:byteStream offset="75449215" uuid="001932e6-5a1b-4388-8244-45c76094fa03" chunkPositionInArray="[0,90,180]" nBytes="200017" md5="7f5c88427a90e05055f35eaa2573165f"/>
+      <h4:byteStream offset="75649232" uuid="375225ab-2b7f-4e98-94c8-b6b009cf8b96" chunkPositionInArray="[12,0,0]" nBytes="214408" md5="49e9ae0820eef0da9d66007eae80fc84"/>
+      <h4:byteStream offset="75863640" uuid="45543562-8165-4032-8357-b7b9da7f8351" chunkPositionInArray="[12,0,180]" nBytes="215535" md5="b17801ce76d8a16f3a43e691d4f3a150"/>
+      <h4:byteStream offset="76079175" uuid="ec036653-59c2-43b2-abe5-fed3c26eca60" chunkPositionInArray="[12,90,0]" nBytes="214436" md5="c1caff9882bedf957c769d7ec069921a"/>
+      <h4:byteStream offset="76293611" uuid="91959796-3d20-49c1-852c-ba5866e9ab52" chunkPositionInArray="[12,90,180]" nBytes="215834" md5="6fa903277982ffbf79412233d68afb2a"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotH2OVap_TqJ_A">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="202868523" uuid="c2e04e2a-f5d8-4633-93ad-878e43e071f9" chunkPositionInArray="[0,0]" nBytes="100373" md5="af42d9fdd90257b29b251d157caf0732"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotCldLiqH2O_MW_A_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="320930197" uuid="86ab7ff5-4ea3-4365-9729-c493d39855b1" chunkPositionInArray="[0,0]" nBytes="1161" md5="a43f0ca2084e297f3aa9763a828dcb0f"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="RelHum_A_min">
+    <Dim name="/H2OPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>5</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="91532760" uuid="2e2599d0-0482-4d25-8a47-fb0c75dd4104" chunkPositionInArray="[0,0,0]" nBytes="798976" md5="4037689a8eba34979038dff903762108"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="TropHeight_TqJ_D_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="286483206" uuid="3b5f2244-ae66-4d3c-b638-91eccfabd1ff" chunkPositionInArray="[0,0]" nBytes="38388" md5="98b43c6ca989ef8c06b25b3d02d8db36"/>
+    </h4:chunks>
+  </Int16>
+  <Int16 name="TropHeight_D_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="160001780" uuid="d67616fd-6b6e-443a-a3c4-f4fd35c2b956" chunkPositionInArray="[0,0]" nBytes="38388" md5="98b43c6ca989ef8c06b25b3d02d8db36"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="O3_VMR_TqJ_D">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="58846377" uuid="2b282c71-946d-45d9-95ca-72ccaf9edbf9" chunkPositionInArray="[0,0,0]" nBytes="243817" md5="7f371bddf52c8a4962786b1673927180"/>
+      <h4:byteStream offset="59090194" uuid="6fdc7e44-d135-470f-b683-90f7468d5d82" chunkPositionInArray="[0,0,180]" nBytes="246807" md5="628fa3083a401b911a25b0292c780194"/>
+      <h4:byteStream offset="59337001" uuid="4923f15a-6d4a-4665-926f-fdc8c38c8448" chunkPositionInArray="[0,90,0]" nBytes="236276" md5="069802e8a17f5626ac2dd8c5bffdd1b2"/>
+      <h4:byteStream offset="301135073" uuid="f808d61a-96dc-4ca7-bdda-cfe696019074" chunkPositionInArray="[0,90,180]" nBytes="225837" md5="3a4c3de0dcb9d569b2be7b6438a5a7e0"/>
+      <h4:byteStream offset="301360910" uuid="bc09a948-1857-444d-ab7a-3c2309afd968" chunkPositionInArray="[12,0,0]" nBytes="254362" md5="caaca317a413d2596739972f1a867c06"/>
+      <h4:byteStream offset="301615272" uuid="a1a5fd6d-1659-4f79-bcad-5f6dd31af930" chunkPositionInArray="[12,0,180]" nBytes="257812" md5="00acc4e6220127e4c2fee921f430f122"/>
+      <h4:byteStream offset="301873084" uuid="ab54ba65-766e-4d93-a60d-133a507409c5" chunkPositionInArray="[12,90,0]" nBytes="260812" md5="2d9469a3c56d710f45186482b9114b20"/>
+      <h4:byteStream offset="302133896" uuid="ad749397-33f6-48c9-b9ee-ca3f71310d9c" chunkPositionInArray="[12,90,180]" nBytes="252407" md5="661175d17f3b6c42fe8112fdc2ec3a79"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="SurfPres_Forecast_D_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="131651422" uuid="f3d34885-a8d4-4c27-a61c-5fe16c3a69d1" chunkPositionInArray="[0,0]" nBytes="33687" md5="ea01f2d2ab6f1e6d2ce43cda27b4e16c"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="CloudFrc_A_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="105098789" uuid="9c73474e-36ca-479d-99ac-47de804338bf" chunkPositionInArray="[0,0]" nBytes="78246" md5="1914e3760d609749eef2006f18f7a058"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="RelHum_TqJ_D_max">
+    <Dim name="/H2OPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>5</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="281226032" uuid="7db1a187-f4a6-4f6d-a639-64ff5e15e2c9" chunkPositionInArray="[0,0,0]" nBytes="792720" md5="14944c0e7504e1976eb75349f55c30c9"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CoarseCloudPres_TqJ_D_sdev">
+    <Dim name="/CoarseCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>0</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="299090564" uuid="68148c0c-378c-4df0-a35e-25f741b202ee" chunkPositionInArray="[0,0,0]" nBytes="216590" md5="8245de3ac1d02e57c7b2ec2e67b36ef3"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CloudFrc_TqJ_D_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="294186480" uuid="51460604-150e-4aea-b7fa-73d0395e8d86" chunkPositionInArray="[0,0]" nBytes="54492" md5="2ee4366be05373ac3561c221d0e7698b"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="RelHumSurf_TqJ_D_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="282078480" uuid="4747d8ad-2237-4822-bfa7-cb9dc3948761" chunkPositionInArray="[0,0]" nBytes="35249" md5="45329ccd6405cc9ce2bc324e871b36b2"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="O3_VMR_TqJ_A_max">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="44046756" uuid="9842399d-21b0-444e-9cab-4345d2708509" chunkPositionInArray="[0,0,0]" nBytes="237763" md5="3d6039401c966c16d2253ed810ce2d5b"/>
+      <h4:byteStream offset="44284519" uuid="a59aa34d-71de-4127-99ea-d60b306b9292" chunkPositionInArray="[0,0,180]" nBytes="238699" md5="62f052dfadd15a7fb307f63fde079c7e"/>
+      <h4:byteStream offset="44523218" uuid="e498f3ae-bd85-416f-87c5-cb876a692e9d" chunkPositionInArray="[0,90,0]" nBytes="233556" md5="e4e94c632978abef581e8a2da9e4baac"/>
+      <h4:byteStream offset="242376946" uuid="fc5461b8-3c3b-4fe9-8f26-df5a01e3a91e" chunkPositionInArray="[0,90,180]" nBytes="220363" md5="4c974179a35dba2d1c95c66faf0c62f3"/>
+      <h4:byteStream offset="242597309" uuid="93804027-0025-4bd5-ba86-ed3a1a9eea34" chunkPositionInArray="[12,0,0]" nBytes="243958" md5="46bdae3ed72e18d525213f788bd5e398"/>
+      <h4:byteStream offset="242841267" uuid="6300e2b6-e347-4122-99f0-8e0ce44fea5f" chunkPositionInArray="[12,0,180]" nBytes="246384" md5="443aebd20cb359f37994b055e932a4aa"/>
+      <h4:byteStream offset="243087651" uuid="546c78c2-d00d-4608-89e5-566907cd2849" chunkPositionInArray="[12,90,0]" nBytes="250998" md5="e52e098b517cfa80febe7994861feae4"/>
+      <h4:byteStream offset="243338649" uuid="4df1a5fe-cfc0-4b0d-98d2-8574c463528d" chunkPositionInArray="[12,90,180]" nBytes="248015" md5="babff812f80f5962575751bc4dfc81c3"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CloudTopPres_TqJ_D_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="294522748" uuid="a026ef45-405c-42e2-ba50-25455c8222a7" chunkPositionInArray="[0,0]" nBytes="80794" md5="6a93acc21a7f67ce16c82529f26cf0a5"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="Emis_MW_D">
+    <Dim name="/EmisFreqMW"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>2</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="320967387" uuid="ac888cf3-7d5a-467c-8795-c3acd9027521" chunkPositionInArray="[0,0,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CloudTopPres_A">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="105370482" uuid="5ab9ad09-a417-495b-8470-75d6c7f3abad" chunkPositionInArray="[0,0]" nBytes="74391" md5="4a5560fb3b8f5d2256188c7220de50cc"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="SurfSkinTemp_TqJ_D">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="257787138" uuid="dcb4b073-73b3-4bf5-ac9e-678d5b6cfe03" chunkPositionInArray="[0,0]" nBytes="68194" md5="7bab27fbc57d20e7e2904659ff5933a4"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CloudFrc_TqJ_A_err">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="230876381" uuid="9352025d-2d50-43af-8fa7-fc6bf9677b56" chunkPositionInArray="[0,0]" nBytes="81585" md5="13238372a00e3ff4315e3eeb97839bcc"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="H2O_MMR_TqJ_D">
+    <Dim name="/H2OPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>5</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="272328220" uuid="aa4df24e-88f0-48b7-9be5-19c1f5359a52" chunkPositionInArray="[0,0,0]" nBytes="1111964" md5="57ef549cdd9f137ddb48eb5751016ab4"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="TotCO_TqJ_A_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="244564883" uuid="061fa0be-dc85-4586-94df-806ccd97f5a3" chunkPositionInArray="[0,0]" nBytes="35746" md5="04b88bb4a55aaee70dac15501a1e9e2d"/>
+    </h4:chunks>
+  </Int16>
+  <Int16 name="TropPres_D_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="139569838" uuid="06f14738-c720-4293-9355-6fd931673166" chunkPositionInArray="[0,0]" nBytes="35110" md5="476dd7a48ee95cb13d5296d75dd251fe"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="FineCloudFrc_TqJ_A_sdev">
+    <Dim name="/FineCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>3</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="233011603" uuid="9825e80d-9f94-46a3-8185-5061e42a2105" chunkPositionInArray="[0,0,0]" nBytes="688560" md5="b44c5863717a2cd724a7f7dd6eb65b49"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotCO_TqJ_D_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="308032828" uuid="00be051f-9f8b-4c81-af12-f9b64188bf64" chunkPositionInArray="[0,0]" nBytes="77791" md5="bf5417b381a42779054d14b8de7fda00"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="ClrOLR_TqJ_A">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="257100975" uuid="7607e9cb-7178-4544-8225-9d24b4b8e4aa" chunkPositionInArray="[0,0]" nBytes="74559" md5="46a9a089b41990dce25aec613e947bdb"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotCldLiqH2O_MW_A_err">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="320932519" uuid="0abaec95-13b5-4a0a-a76d-9a6f89ddd067" chunkPositionInArray="[0,0]" nBytes="1161" md5="a43f0ca2084e297f3aa9763a828dcb0f"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="H2O_MMR_Surf_TqJ_D_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="277985843" uuid="abfc8ff5-fd1f-40f8-a1fd-d642931aa4c1" chunkPositionInArray="[0,0]" nBytes="85688" md5="37bdd95820728fe6b91aab710c5ebc25"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="Temperature_TqJ_D_ct">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>24 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="260202338" uuid="a7112051-9da3-4a31-9e1d-6aa4d1e26752" chunkPositionInArray="[0,0,0]" nBytes="896581" md5="5a376fbc4e65054db1ace6dcfd90c8ee"/>
+    </h4:chunks>
+  </Int16>
+  <Int16 name="TotCH4_A_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="125049862" uuid="d003c1a5-65ff-453f-8dab-16ed7c003911" chunkPositionInArray="[0,0]" nBytes="36810" md5="8f8a298db8d8204f33bd4cacf22afaaa"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="H2O_MMR_Lyr_A_min">
+    <Dim name="/H2OPressureLay"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>4</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="80523919" uuid="3b6b8346-fa5e-4ecb-a7a7-6ab3db9f3038" chunkPositionInArray="[0,0,0]" nBytes="1079171" md5="528bd14ed7894d621b04009b004dc4c6"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CO_VMR_TqJ_D_sdev">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="62986150" uuid="b4f422df-655d-4f2d-98ed-111555ecafbc" chunkPositionInArray="[0,0,0]" nBytes="241983" md5="7031065afb69cb83bb3768d2f4e81b83"/>
+      <h4:byteStream offset="63228133" uuid="ab7af32b-2215-408a-aad9-719e0fc2ef14" chunkPositionInArray="[0,0,180]" nBytes="237580" md5="0f5411565ce8e50ea80e7dca749be90a"/>
+      <h4:byteStream offset="63465713" uuid="bf5bc6ac-2b69-4ae7-bbee-122940eb090d" chunkPositionInArray="[0,90,0]" nBytes="223802" md5="7c84ee7cc2696d014af3ab2873611283"/>
+      <h4:byteStream offset="310010516" uuid="6e387843-a300-49cd-b9ca-6ff5ded8fb82" chunkPositionInArray="[0,90,180]" nBytes="200470" md5="0586ae0d8ff01733293289dbddfd81c0"/>
+      <h4:byteStream offset="310210986" uuid="c7a06766-2f80-4293-8406-9eb366cf7bee" chunkPositionInArray="[12,0,0]" nBytes="245867" md5="d5b0b82868ccdbbe7f0b4f70fdefd868"/>
+      <h4:byteStream offset="310456853" uuid="548b7121-de56-46f2-b377-5e0c12c56963" chunkPositionInArray="[12,0,180]" nBytes="245191" md5="1df487f2edc43bc9729d23b61af65306"/>
+      <h4:byteStream offset="310702044" uuid="53bfab85-9b57-410d-8cad-86d7a6dd557a" chunkPositionInArray="[12,90,0]" nBytes="230609" md5="fbea6b602f3594cff17273d25283a3e8"/>
+      <h4:byteStream offset="310932653" uuid="eb01cb83-4bd9-4ea2-bc75-a7f7236de961" chunkPositionInArray="[12,90,180]" nBytes="209939" md5="717b6d09799c6ef1eb0bea7e618cf1cf"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="H2O_MMR_Surf_TqJ_D_err">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="278156090" uuid="d4ec6667-5ba6-4528-8d62-b25a07934fe5" chunkPositionInArray="[0,0]" nBytes="71595" md5="d21bca66141c4ed43e7ea2cfb22e9ab6"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="Temperature_TqJ_D">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="51646740" uuid="ac4f579f-c643-4dd5-89e9-73d0a1c191f5" chunkPositionInArray="[0,0,0]" nBytes="195934" md5="3a18d262d45fd127b6ce3bef0841efc1"/>
+      <h4:byteStream offset="51842674" uuid="c55fc830-15cc-4caa-afa5-78210f76afac" chunkPositionInArray="[0,0,180]" nBytes="195850" md5="725d3cf9784eb380025b6262e69f31f0"/>
+      <h4:byteStream offset="52038524" uuid="9232f438-0464-42ca-843d-04a2f416c517" chunkPositionInArray="[0,90,0]" nBytes="194598" md5="13aeeb0ddc271ebc4bfe72c0ba56ab62"/>
+      <h4:byteStream offset="259236032" uuid="815b68b2-531e-4fc1-afd1-26e8588e55d6" chunkPositionInArray="[0,90,180]" nBytes="187492" md5="c465d1950b26619390712956fd9bb1f5"/>
+      <h4:byteStream offset="259423524" uuid="6f866544-4b2d-4963-83b1-a6d9f674a548" chunkPositionInArray="[12,0,0]" nBytes="186053" md5="42bf577eb9bd183155c438a72a1a09d5"/>
+      <h4:byteStream offset="259609577" uuid="30844983-09d3-4099-be64-60e6690bf935" chunkPositionInArray="[12,0,180]" nBytes="188831" md5="bd4a514c9ac0cf173d45a689efaabe28"/>
+      <h4:byteStream offset="259798408" uuid="0487d502-4c7a-44b9-bd9f-d29998d70df5" chunkPositionInArray="[12,90,0]" nBytes="203464" md5="84b040845b0e42e0dfd64ded64d9033d"/>
+      <h4:byteStream offset="260001872" uuid="36d52b2a-c674-4fa6-b510-7dbf478899b3" chunkPositionInArray="[12,90,180]" nBytes="200466" md5="5f8d68f95883bb7bb207ebf6cbd338cd"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CloudFrc_TqJ_D_err">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="294240972" uuid="1ebde67f-e826-4f42-bc11-ae52b97e7d3f" chunkPositionInArray="[0,0]" nBytes="81150" md5="39debc0efffbfecb94662327b5940c38"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="RelHum_A_ct">
+    <Dim name="/H2OPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>5</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="90202697" uuid="1eb5861e-d558-450a-b1d2-b3f2eddb5a50" chunkPositionInArray="[0,0,0]" nBytes="416282" md5="c257af536e1b6cb823609eeb52b470ed"/>
+    </h4:chunks>
+  </Int16>
+  <Int16 name="RelHumSurf_liquid_TqJ_A_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="222762963" uuid="a34d1934-2fe3-44c0-9313-d837e7890085" chunkPositionInArray="[0,0]" nBytes="36074" md5="99eb3fdfc1da7941658a25a3e084c4f2"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="H2O_MMR_Lyr_D_sdev">
+    <Dim name="/H2OPressureLay"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>4</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="142174751" uuid="d49b0efc-b5eb-4026-be00-ba5eec2a65d0" chunkPositionInArray="[0,0,0]" nBytes="915655" md5="98bdbf9dbdb68982a74cc227ef34999f"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="EmisIR_A_sdev">
+    <Dim name="/EmisFreqIR"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>1</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>4 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="69911670" uuid="317afe78-b080-4824-bb5e-49a65715d38c" chunkPositionInArray="[0,0,0]" nBytes="314170" md5="5b781fd03528fa8d0958046879296421"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TropTemp_A_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="77369264" uuid="d1855435-cf89-4408-9dab-63410985853f" chunkPositionInArray="[0,0]" nBytes="80552" md5="c9031262e6d016ec95853121e327d51e"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TropPres_D_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="139604948" uuid="2da48f40-bacd-49b0-81ea-eb19ba18b18b" chunkPositionInArray="[0,0]" nBytes="82055" md5="e8c7b025e3450e50d621a5c660fb3a9d"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="OLR_D_err">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="193510615" uuid="5ba5109b-63ab-4d5d-956d-3e8d36a51b82" chunkPositionInArray="[0,0]" nBytes="5989" md5="4d232298e09457d89a6d583819f4a1c2"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="O3_VMR_D">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="24984452" uuid="f515202e-2a90-4f31-8595-26034d3281ed" chunkPositionInArray="[0,0,0]" nBytes="243817" md5="7f371bddf52c8a4962786b1673927180"/>
+      <h4:byteStream offset="25228269" uuid="b8b1c28e-0c24-43a6-92a5-353e173ef5f8" chunkPositionInArray="[0,0,180]" nBytes="246807" md5="628fa3083a401b911a25b0292c780194"/>
+      <h4:byteStream offset="25475076" uuid="4f4cf44a-573c-4f38-ae4e-c8838def44ee" chunkPositionInArray="[0,90,0]" nBytes="236276" md5="069802e8a17f5626ac2dd8c5bffdd1b2"/>
+      <h4:byteStream offset="174318234" uuid="6a01099f-ee48-4dfb-9e5e-1fde68d2cc66" chunkPositionInArray="[0,90,180]" nBytes="225837" md5="3a4c3de0dcb9d569b2be7b6438a5a7e0"/>
+      <h4:byteStream offset="174544071" uuid="63e03c4b-a778-4d3c-9ef2-858b805e3d69" chunkPositionInArray="[12,0,0]" nBytes="254362" md5="caaca317a413d2596739972f1a867c06"/>
+      <h4:byteStream offset="174798433" uuid="c9777326-33f4-4717-8e2d-938b23edffa7" chunkPositionInArray="[12,0,180]" nBytes="257812" md5="00acc4e6220127e4c2fee921f430f122"/>
+      <h4:byteStream offset="175056245" uuid="29591429-0197-4885-a05b-208501e78911" chunkPositionInArray="[12,90,0]" nBytes="260812" md5="2d9469a3c56d710f45186482b9114b20"/>
+      <h4:byteStream offset="175317057" uuid="f84f71cb-7bec-43e6-9ee3-032c532b11bb" chunkPositionInArray="[12,90,180]" nBytes="252407" md5="661175d17f3b6c42fe8112fdc2ec3a79"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="H2O_MMR_D_ct">
+    <Dim name="/H2OPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>5</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="147189004" uuid="c0b5af14-5663-4f61-ae66-141bca1d8733" chunkPositionInArray="[0,0,0]" nBytes="414055" md5="3d5b5000158635d0c7d4c10796118926"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="GPHeight_TqJ_D">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="54933484" uuid="3901a0a1-d574-4ae5-8290-717c0f164f5f" chunkPositionInArray="[0,0,0]" nBytes="190780" md5="224792b501acc29400e1343b615c64f7"/>
+      <h4:byteStream offset="55124264" uuid="35ea3f9b-7438-4f58-9cc3-a4e99e8ee2f5" chunkPositionInArray="[0,0,180]" nBytes="191715" md5="4cefb067c7880d7b8d0c6203ab2fb146"/>
+      <h4:byteStream offset="55315979" uuid="6d2c4026-e8a3-40a6-ab7c-85c90d9d1799" chunkPositionInArray="[0,90,0]" nBytes="193874" md5="ac7fb37eef372116ce00308c5acfcb0e"/>
+      <h4:byteStream offset="286917627" uuid="ac43b317-b6ac-44ac-923c-73b8aeed38d5" chunkPositionInArray="[0,90,180]" nBytes="188091" md5="a839e0025ebfdf6cfea16a9318e937c0"/>
+      <h4:byteStream offset="287105718" uuid="ba3cb385-f4b6-493f-b219-1f9b35cea89b" chunkPositionInArray="[12,0,0]" nBytes="205938" md5="7bf592999faf4e2482521f9628af32e4"/>
+      <h4:byteStream offset="287311656" uuid="0329ca2e-71b4-4acb-b0e9-ca4e92d93d41" chunkPositionInArray="[12,0,180]" nBytes="208887" md5="2c79c3667c984882919da39fedafd66e"/>
+      <h4:byteStream offset="287520543" uuid="d14e9816-f409-431a-8d8d-7349d8cf90c8" chunkPositionInArray="[12,90,0]" nBytes="220198" md5="70ace1940da2c8572532306c9554a916"/>
+      <h4:byteStream offset="287740741" uuid="8ea6ddbc-42c3-4b74-94bb-a9bf4c76f713" chunkPositionInArray="[12,90,180]" nBytes="216818" md5="452c6b6d0e669db2db69e3b5b62f4fe0"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="SurfSkinTemp_TqJ_A_err">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="194535851" uuid="1acdeaf2-dc2c-45a6-8c7e-e366af9c19ef" chunkPositionInArray="[0,0]" nBytes="70782" md5="fe9ffd4506607c090f9faa297f46ed30"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="TropTemp_D_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="139907579" uuid="93396ccf-438f-4b56-a7cd-652e7680afc7" chunkPositionInArray="[0,0]" nBytes="35110" md5="476dd7a48ee95cb13d5296d75dd251fe"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="Temperature_TqJ_A_min">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="35993469" uuid="4e977a14-3088-4897-a442-af628e414d77" chunkPositionInArray="[0,0,0]" nBytes="190535" md5="c323c6d9a8091d0ca326b3c1d6a3faa3"/>
+      <h4:byteStream offset="36184004" uuid="a6cb297e-3244-431c-be41-e1eb4eb7b462" chunkPositionInArray="[0,0,180]" nBytes="191858" md5="0a4d0a4222cd841d7dec34daf2204f4a"/>
+      <h4:byteStream offset="36375862" uuid="ddbb464e-8afa-4664-a614-f8b9ac8483d0" chunkPositionInArray="[0,90,0]" nBytes="191364" md5="3d3531c38cfd358fa3493ab07af7dc0e"/>
+      <h4:byteStream offset="198802937" uuid="84fbf619-78b6-4d1b-8f10-538d191c6232" chunkPositionInArray="[0,90,180]" nBytes="185863" md5="a75e2c45f4f307c7ff09909bed7978c1"/>
+      <h4:byteStream offset="198988800" uuid="02599878-7960-47d9-98d5-0af23eaaea9b" chunkPositionInArray="[12,0,0]" nBytes="180611" md5="b81a87770b56b5cc4081835e16c39b40"/>
+      <h4:byteStream offset="199169411" uuid="d1e65d1e-0b05-474d-818b-4d6ec52864a3" chunkPositionInArray="[12,0,180]" nBytes="184865" md5="e53c1998dad96a63acdc41a26e97227a"/>
+      <h4:byteStream offset="199354276" uuid="e276724c-b16b-44d2-8629-42898f4fc60f" chunkPositionInArray="[12,90,0]" nBytes="199064" md5="efb522bbc4e9c2a00aa35e6217ec7f77"/>
+      <h4:byteStream offset="199553340" uuid="14e538b0-5784-4fc3-8cf7-892a74612627" chunkPositionInArray="[12,90,180]" nBytes="194540" md5="272914572f6217d6081951f90157e0ac"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotH2OVap_A_err">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="78000315" uuid="e6d1618f-0532-4452-8054-a74ac88bd8e8" chunkPositionInArray="[0,0]" nBytes="76915" md5="38c08c0e018c30dc02a3f9f01eab4a18"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="Temperature_TqJ_D_err">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="54110419" uuid="25f4846b-03c5-45b9-aa3c-23c06ffe7db1" chunkPositionInArray="[0,0,0]" nBytes="218045" md5="be5ec2feebf95325eb8d307d67d19794"/>
+      <h4:byteStream offset="54328464" uuid="2020e0ad-ab43-4892-8927-dbbd4930e143" chunkPositionInArray="[0,0,180]" nBytes="214135" md5="475d8a531212e97ddccaca1667b163b7"/>
+      <h4:byteStream offset="54542599" uuid="26afd40d-0fdb-499b-966c-65f13c43f752" chunkPositionInArray="[0,90,0]" nBytes="206269" md5="bd6954794cd4e0b9267b8e0aa619b565"/>
+      <h4:byteStream offset="264181489" uuid="7c4e95e5-1556-477a-adc9-2edeeb7f707d" chunkPositionInArray="[0,90,180]" nBytes="199955" md5="4e86fe9187f8d6d82564d34ec9009559"/>
+      <h4:byteStream offset="264381444" uuid="6517a278-84ee-489e-ab09-80a22154ae46" chunkPositionInArray="[12,0,0]" nBytes="217937" md5="63d630f840dd9b6aa3a6c5bd1204a756"/>
+      <h4:byteStream offset="264599381" uuid="1fcc6753-e4e1-488d-befa-94710f3b1fac" chunkPositionInArray="[12,0,180]" nBytes="218353" md5="5727c798a0506bb975d27b8a6255fd95"/>
+      <h4:byteStream offset="264817734" uuid="934023bf-38a5-4395-a6a0-3120019e0668" chunkPositionInArray="[12,90,0]" nBytes="215616" md5="590b815be3066a487dc101b41caa8412"/>
+      <h4:byteStream offset="265033350" uuid="c878f1a0-d340-4076-b3b1-f4ab23e3a1d7" chunkPositionInArray="[12,90,180]" nBytes="216129" md5="db39b08c321cf52ab47f9f1e6981f0ed"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="OLR_TqJ_D_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="320179518" uuid="b4cdbded-8112-4a54-a229-0a8b3aa834ef" chunkPositionInArray="[0,0]" nBytes="81065" md5="2f1ee96b4ab1fb7ed07f28ff2b071920"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="SurfSkinTemp_TqJ_D_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="258030339" uuid="c4780c84-e505-4016-abef-47e5b773993f" chunkPositionInArray="[0,0]" nBytes="65572" md5="a9f1e4637d6fe594166221139a23d3cc"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="SurfSkinTemp_TqJ_A">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="194200956" uuid="1bd56aab-5f22-4123-ba7c-5a9dc1886ee7" chunkPositionInArray="[0,0]" nBytes="73235" md5="b3df2d09603905cc87cc914968569d51"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CloudTopPres_D_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="167924138" uuid="ca779da9-d407-496a-8be6-c8bc1507df64" chunkPositionInArray="[0,0]" nBytes="82081" md5="2acea024b0ddcd60e7f2eddd376ee7f5"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="SurfPres_Forecast_A">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="68909132" uuid="3b3321cb-79ca-4e5f-bfb8-394a0531f1ae" chunkPositionInArray="[0,0]" nBytes="53582" md5="b9aff2de3288d8f79da7d41b064bdef8"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="H2O_MMR_Lyr_TqJ_D_err">
+    <Dim name="/H2OPressureLay"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>4</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="271463455" uuid="0ed213ae-af9b-400e-ad5a-3a05ebd93efc" chunkPositionInArray="[0,0,0]" nBytes="864765" md5="e9bd4452a4cdc41082a8edd99096665c"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CoarseCloudTemp_TqJ_A">
+    <Dim name="/CoarseCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>0</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="236348727" uuid="305af83e-b6f0-4e8c-b409-49b8a2d3a332" chunkPositionInArray="[0,0,0]" nBytes="240358" md5="e5fd9cbe253aea3cd1c755614e69fbf1"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CH4_VMR_TqJ_D_min">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="66926634" uuid="b66ae9f0-21e3-4d30-9bf0-09a3ec5e5f4f" chunkPositionInArray="[0,0,0]" nBytes="190109" md5="8c2f218d8845f30679ca37ff01521fb5"/>
+      <h4:byteStream offset="67116743" uuid="246259f9-ea87-45a9-bb99-83cf3d1cb6e8" chunkPositionInArray="[0,0,180]" nBytes="185300" md5="f806a43a0dc1ff9d41e07651eb9cdd9a"/>
+      <h4:byteStream offset="67302043" uuid="1d9eff1c-5cb3-4031-a276-da66533088dd" chunkPositionInArray="[0,90,0]" nBytes="184476" md5="aab452dabd10a1a11b75a819ae95e620"/>
+      <h4:byteStream offset="317344657" uuid="c9e1093f-fa15-4168-b4df-b6310a6114b5" chunkPositionInArray="[0,90,180]" nBytes="175240" md5="be4d803aa0c6568bb680cbe9136887bb"/>
+      <h4:byteStream offset="317519897" uuid="8f037b87-daed-44e7-ae32-d9d19ea532a9" chunkPositionInArray="[12,0,0]" nBytes="186353" md5="74aebf526ee1ca31ace7310f34defae5"/>
+      <h4:byteStream offset="317706250" uuid="7131458c-8b12-49a4-9bf7-4f95a7fffdba" chunkPositionInArray="[12,0,180]" nBytes="184117" md5="dca2fa32e7b55ae5836051d23bbf3750"/>
+      <h4:byteStream offset="317890367" uuid="dd89d24c-7034-4637-acc7-2eefaf6aaab6" chunkPositionInArray="[12,90,0]" nBytes="192858" md5="2b43a6025577f4856c3563e5ed5ff9f8"/>
+      <h4:byteStream offset="318083225" uuid="d0cc4713-2546-4ebc-95fe-148c0816fd61" chunkPositionInArray="[12,90,180]" nBytes="187823" md5="3505c0173c07a01cf364c0352e6a4cd2"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="RelHum_liquid_TqJ_A_ct">
+    <Dim name="/H2OPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>5</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="219724368" uuid="486e328c-6fbd-4013-9fec-8183d6c9a394" chunkPositionInArray="[0,0,0]" nBytes="434058" md5="5fa36a186eae401088cafc7140cb701b"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="TropHeight_TqJ_A_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="223215404" uuid="31f21341-d0f2-4074-ad20-10f798a3ad93" chunkPositionInArray="[0,0]" nBytes="156137" md5="7e76506946602c6351dea7b3b519e88f"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="H2O_MMR_Lyr_TqJ_A_ct">
+    <Dim name="/H2OPressureLay"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>4</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="204478158" uuid="b83b0833-063a-4105-9ddb-53d037147d7c" chunkPositionInArray="[0,0,0]" nBytes="435053" md5="175fc4a69d3e92c2f324bff03925ecbb"/>
+    </h4:chunks>
+  </Int16>
+  <Int16 name="TotalCounts_TqJ_A">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="193872248" uuid="d012e9c8-eb37-4b8c-bd39-36cf6aa2c61e" chunkPositionInArray="[0,0]" nBytes="33967" md5="c2292717a80e641f17a25184907e3403"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="OLR_A_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="131121601" uuid="aaf16ede-d877-4aa7-add4-a908dea64237" chunkPositionInArray="[0,0]" nBytes="77080" md5="e4addabf7fcb6695939df9967fb8f0fc"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TropPres_TqJ_A_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="202457103" uuid="0e0d1a75-eb64-4df9-a34d-b82f1252f980" chunkPositionInArray="[0,0]" nBytes="77661" md5="4399d9d412cccd73c7cc1b5c5afd0fe2"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotO3_D">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="173905133" uuid="565e5c6e-fc35-48c0-aaa6-7f48210f4e0d" chunkPositionInArray="[0,0]" nBytes="79014" md5="b746e02a26447ee376bb90d65abf5b1b"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="CoarseCloudTemp_D_ct">
+    <Dim name="/CoarseCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>0</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="173085127" uuid="eccdc64a-5ac0-439b-8f8b-9f4a530ca04f" chunkPositionInArray="[0,0,0]" nBytes="106725" md5="d4ad498c418368eac52a9460701e20c3"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="TropHeight_D_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="160125379" uuid="0f8b3c98-60eb-4920-9e33-7b86dbfebeac" chunkPositionInArray="[0,0]" nBytes="155808" md5="6fcee0688ef2a30b6cfbbf6c5c60ceb1"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="TotH2OVap_D_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="140258836" uuid="f2b60bbd-5121-4b7f-9366-7faa0d21baa5" chunkPositionInArray="[0,0]" nBytes="38366" md5="33203c2f507d0b5cd88a223131cdb593"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="FineCloudFrc_D_max">
+    <Dim name="/FineCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>3</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="170482664" uuid="58e74a64-d862-49c7-b1af-be3d91b2bab4" chunkPositionInArray="[0,0,0]" nBytes="622903" md5="7c993f36297bfee92981e9b57a7bfa14"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="O3_VMR_A_ct">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>24 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="113200216" uuid="629241c7-53ed-4951-a347-d1d3385e1131" chunkPositionInArray="[0,0,0]" nBytes="886505" md5="84f6cf628d4808205379e3c59c421aaf"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="GPHeight_MW_A_max">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="68625735" uuid="3c323042-74a9-4130-96ff-249f8e87db8f" chunkPositionInArray="[0,0,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="68629156" uuid="e6503bba-9b51-41f5-9996-8dfbab4051fe" chunkPositionInArray="[0,0,180]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="68632577" uuid="818be41c-a503-473f-b5b2-6051663a28c4" chunkPositionInArray="[0,90,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="320910181" uuid="8bd0567f-32c4-4a53-a111-7b736f42a06f" chunkPositionInArray="[0,90,180]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="320913602" uuid="d4f2ee4e-ca7a-4dfa-96aa-17eb9115503d" chunkPositionInArray="[12,0,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="320917023" uuid="22635c50-211a-45d8-8aaa-4a202de0cd22" chunkPositionInArray="[12,0,180]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="320920444" uuid="566c3654-28d6-4bf3-84a6-47394dd46f2d" chunkPositionInArray="[12,90,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="320923865" uuid="461bfc61-74c4-48e5-b55d-1f375ec498d6" chunkPositionInArray="[12,90,180]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CO_VMR_TqJ_A_max">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="47431956" uuid="70db2479-a2f7-4b07-a317-314cd0a21e7c" chunkPositionInArray="[0,0,0]" nBytes="233291" md5="463f1c41c5f2d5eea054ea8039b25a84"/>
+      <h4:byteStream offset="47665247" uuid="030757a9-931b-485f-80e5-bc4d5914facf" chunkPositionInArray="[0,0,180]" nBytes="239364" md5="bb9bd304860744ec26022f65ce9604de"/>
+      <h4:byteStream offset="47904611" uuid="f8c6b10c-c87d-4f9d-bb21-75fd488e99d2" chunkPositionInArray="[0,90,0]" nBytes="221210" md5="164433c2cb9e7e4e13f3bcf311493379"/>
+      <h4:byteStream offset="248881606" uuid="533acde5-2433-4276-aaca-99b3f750ca2f" chunkPositionInArray="[0,90,180]" nBytes="209371" md5="85ef9513d3bfe03ef8bca2324a4ca6c4"/>
+      <h4:byteStream offset="249090977" uuid="c5cac54f-d5c4-4983-8612-833e42e877ee" chunkPositionInArray="[12,0,0]" nBytes="202184" md5="6972b03895d4684e1efa5b53b5a52bef"/>
+      <h4:byteStream offset="249293161" uuid="8bb5d66b-587f-4e54-a93e-ecbc8d78dc76" chunkPositionInArray="[12,0,180]" nBytes="209610" md5="dc13b8a101a666dab021ef0ebb5d262f"/>
+      <h4:byteStream offset="249502771" uuid="486d9316-d171-4a73-87d1-b59c10ceffc4" chunkPositionInArray="[12,90,0]" nBytes="203776" md5="1cea737ea8e779ed5d29c08cd533ba3c"/>
+      <h4:byteStream offset="249706547" uuid="be352c82-f659-4241-867e-2b42e360fb7c" chunkPositionInArray="[12,90,180]" nBytes="195935" md5="1752ef0577dbc08ad2ee0a10645154ed"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="CloudTopPres_TqJ_A_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="231034733" uuid="462c721d-5179-49c8-9d69-2e4da8b84ddb" chunkPositionInArray="[0,0]" nBytes="40151" md5="377c7d6c17a97782aa8226f0872c29cd"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="H2O_MMR_TqJ_A">
+    <Dim name="/H2OPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>5</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="208861367" uuid="06b47820-ecbd-4035-8ef2-fea45b040151" chunkPositionInArray="[0,0,0]" nBytes="1117519" md5="5d26870ffa1e88dbb76e59988cb5d83b"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="EmisIR_TqJ_A_sdev">
+    <Dim name="/EmisFreqIR"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>1</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>4 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="194927386" uuid="a8bb2027-2b5b-48fb-b55f-f8d3d6e1face" chunkPositionInArray="[0,0,0]" nBytes="314170" md5="5b781fd03528fa8d0958046879296421"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotH2OVap_TqJ_D_err">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="266763896" uuid="4c498428-2adb-4c7d-a479-4f5c614c5ab0" chunkPositionInArray="[0,0]" nBytes="77078" md5="2f7ffab61124625ddf0f6024702760e3"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="TotalCounts_A">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="68875165" uuid="eacab4ad-ed55-467b-917a-da848ccfca13" chunkPositionInArray="[0,0]" nBytes="33967" md5="c2292717a80e641f17a25184907e3403"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="O3_VMR_A_sdev">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="8795264" uuid="f9bc9d16-c0bd-421a-99fb-074b36aeabbc" chunkPositionInArray="[0,0,0]" nBytes="240838" md5="c70ef112484272f92e7b1688966207e6"/>
+      <h4:byteStream offset="9036102" uuid="7e8775e8-da15-4297-b1a7-4edc128fd8f0" chunkPositionInArray="[0,0,180]" nBytes="240135" md5="1f9c89323971292a67c1489add2524b8"/>
+      <h4:byteStream offset="9276237" uuid="effaf09a-5ed5-49c9-92e9-2f28ea97eb5c" chunkPositionInArray="[0,90,0]" nBytes="233518" md5="63627db159dcbb44ee5239105fbbf748"/>
+      <h4:byteStream offset="114086721" uuid="45fae840-7e9c-49f1-aa82-dcd3a3f70a93" chunkPositionInArray="[0,90,180]" nBytes="226003" md5="f4be2b2f9174db8e04991a1291f33104"/>
+      <h4:byteStream offset="114312724" uuid="298c2397-d0d9-440b-9d9a-bbd179a570cf" chunkPositionInArray="[12,0,0]" nBytes="241976" md5="9cd31fd762cef5bbef8b1dc8bb19bf32"/>
+      <h4:byteStream offset="114554700" uuid="f305fc37-18a6-42f3-b7ed-21ce8debc6ef" chunkPositionInArray="[12,0,180]" nBytes="243810" md5="74a054dc8d2ad669fc173405e180013e"/>
+      <h4:byteStream offset="114798510" uuid="7dcad521-ed14-4519-8835-615a13879c41" chunkPositionInArray="[12,90,0]" nBytes="243199" md5="b83af219bfecf78cc124c000aee4af5e"/>
+      <h4:byteStream offset="115041709" uuid="341e6cdb-f4aa-47e7-8c9b-a2ebd596c2ea" chunkPositionInArray="[12,90,180]" nBytes="240363" md5="4a2abc4d3669ab4ecdbc46705180e189"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="GPHeight_TqJ_D_max">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="57476550" uuid="5af215c5-092b-4ed2-9783-b875865d80d6" chunkPositionInArray="[0,0,0]" nBytes="416745" md5="c6bcde1e4f19267e6a6ac5c82f8f3533"/>
+      <h4:byteStream offset="57893295" uuid="51783e3a-dcb2-48ea-bbf2-2aecfe467f94" chunkPositionInArray="[0,0,180]" nBytes="410778" md5="d7a68ca827b7d24f047ce56651449774"/>
+      <h4:byteStream offset="58304073" uuid="d221f868-2aa1-4c45-9eb6-0047fff34053" chunkPositionInArray="[0,90,0]" nBytes="413664" md5="394647db5f5e621d90e6d56ebe81d3db"/>
+      <h4:byteStream offset="291981525" uuid="5b02d20d-c8e5-4e43-8511-3e112f8185e6" chunkPositionInArray="[0,90,180]" nBytes="388500" md5="038650795dfda934edb343504ef5430b"/>
+      <h4:byteStream offset="292370025" uuid="22addef6-02e3-49f2-9321-aff1e4abce18" chunkPositionInArray="[12,0,0]" nBytes="379267" md5="6dd53dd7bbd14d79fa1bba007cff6346"/>
+      <h4:byteStream offset="292749292" uuid="ff8e5828-26f8-4aed-9b1a-f71bdd314b16" chunkPositionInArray="[12,0,180]" nBytes="379684" md5="845664865b3dc0ee79d5d21c768e3ccb"/>
+      <h4:byteStream offset="293128976" uuid="80c4c803-b4ee-4f89-a027-6b1155f8890b" chunkPositionInArray="[12,90,0]" nBytes="397910" md5="a4434f8084520bef6766c26afbff617a"/>
+      <h4:byteStream offset="293526886" uuid="99efcdb3-1229-4a43-85e4-57585e7c2dc5" chunkPositionInArray="[12,90,180]" nBytes="391576" md5="a47f0d08a9cff578633ea3bed24b2931"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="O3_VMR_D_sdev">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="25717624" uuid="41f0c23d-a9a9-4f66-aa96-82ef6431d7d3" chunkPositionInArray="[0,0,0]" nBytes="242081" md5="f5f5116552a8561a34960efcd9cb7b1f"/>
+      <h4:byteStream offset="25959705" uuid="2c4dd4fa-7b3e-47d8-947d-2c2a14dbc4ef" chunkPositionInArray="[0,0,180]" nBytes="238793" md5="c7f85c923353f52a884af1ea246af303"/>
+      <h4:byteStream offset="26198498" uuid="5feea276-a607-4776-8237-d6f76a1cc0ce" chunkPositionInArray="[0,90,0]" nBytes="233976" md5="df76e5fc66bf492266dedf8512d90154"/>
+      <h4:byteStream offset="176465258" uuid="bb5a82c1-54cd-4030-a1b1-e73efd529e90" chunkPositionInArray="[0,90,180]" nBytes="224208" md5="f969199b54d56ac1890bf202d4904dd2"/>
+      <h4:byteStream offset="176689466" uuid="7eb0ff29-a5ca-4d82-971c-9a4b3c356812" chunkPositionInArray="[12,0,0]" nBytes="242836" md5="57d7f6b423edfefb41f5ebe4b4a3989f"/>
+      <h4:byteStream offset="176932302" uuid="d41d3e97-d352-43d9-a60e-7243220d9835" chunkPositionInArray="[12,0,180]" nBytes="242066" md5="69a99478440d45fd7efcef131bd9d7b4"/>
+      <h4:byteStream offset="177174368" uuid="f297ea99-722f-482f-8876-1fd861e5d1c6" chunkPositionInArray="[12,90,0]" nBytes="243167" md5="c8ec193044b30cbe9d82eb58f2cd9d40"/>
+      <h4:byteStream offset="177417535" uuid="77be7c59-be34-41fb-bf43-97d9055b4b44" chunkPositionInArray="[12,90,180]" nBytes="238198" md5="d7f75f673d0a23e285d4d7cf57ea44b1"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CH4_VMR_TqJ_D_max">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="67489655" uuid="2d80907c-c967-4130-bb34-eb78f0787bc3" chunkPositionInArray="[0,0,0]" nBytes="187036" md5="652024045db748da58b69a2b1ffe24b1"/>
+      <h4:byteStream offset="67676691" uuid="8be9ff4e-e995-41b1-801d-6cd7271794b7" chunkPositionInArray="[0,0,180]" nBytes="182555" md5="a8d26d66d34c08385cdf05ec39d38cc4"/>
+      <h4:byteStream offset="67859246" uuid="898307a7-3827-4b53-b59d-d15bd281d96d" chunkPositionInArray="[0,90,0]" nBytes="184193" md5="950ad81c7c670f7b01fe5914ebb705e7"/>
+      <h4:byteStream offset="318271048" uuid="b8e86b26-5af9-4244-b499-2dfded9373e9" chunkPositionInArray="[0,90,180]" nBytes="175544" md5="60c307ebfdba156cb3c468918f5af660"/>
+      <h4:byteStream offset="318446592" uuid="3194b347-0cd5-42a3-b10d-9707d5b93e63" chunkPositionInArray="[12,0,0]" nBytes="192014" md5="44b4951448c01877916387bd405073ef"/>
+      <h4:byteStream offset="318638606" uuid="ff9d5ea9-4e26-4622-a65c-f61de922f4c8" chunkPositionInArray="[12,0,180]" nBytes="188888" md5="00bbe7b7fd62c7681ead56afda156fa0"/>
+      <h4:byteStream offset="318827494" uuid="ac78a37a-0541-40d0-936d-f81285d0ffd9" chunkPositionInArray="[12,90,0]" nBytes="197138" md5="ebb266d09aeae6962284e23e21a1a651"/>
+      <h4:byteStream offset="319024632" uuid="11809762-ca1b-4b96-b261-0805c68f73e8" chunkPositionInArray="[12,90,180]" nBytes="191463" md5="8cdf036f71d8c5b739f90a46c9b43070"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CloudTopTemp_TqJ_A_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="231517513" uuid="fb6ddb55-bc3a-4834-b432-d47d8032e7d4" chunkPositionInArray="[0,0]" nBytes="85386" md5="7b151d7b7f3c12282571dd3ea39e4baf"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="TotH2OVap_TqJ_A_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="202968896" uuid="e70a1f21-f5ef-411d-9abc-cd209b2da5ce" chunkPositionInArray="[0,0]" nBytes="38072" md5="4de9f004b38ef209f603f71525564b0b"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="CloudTopTemp_TqJ_D_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="294964634" uuid="bb533510-7ce5-4b9a-90e9-4be281a5ccea" chunkPositionInArray="[0,0]" nBytes="93251" md5="134dd2abc5f2217cf8597905e9308da7"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotCH4_D_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="187496677" uuid="8a7c5022-18d8-4853-9e5d-6fabfa608d2f" chunkPositionInArray="[0,0]" nBytes="69426" md5="bc164e273c1edbb19a96223cb6260eb3"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="CoarseCloudPres_TqJ_D_ct">
+    <Dim name="/CoarseCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>0</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="298989088" uuid="931f77ec-05d3-4c82-bc25-c8220b589898" chunkPositionInArray="[0,0,0]" nBytes="101476" md5="877d333af697172997a93888d6bb0e6f"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="TotH2OVap_MW_A_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="320841797" uuid="4902d3b4-b0e3-4358-a1af-b9d0760987cb" chunkPositionInArray="[0,0]" nBytes="1161" md5="a43f0ca2084e297f3aa9763a828dcb0f"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CoarseCloudFrc_TqJ_D">
+    <Dim name="/CoarseCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>0</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="297906520" uuid="a781945d-685d-4b20-93ea-894a8ff6faed" chunkPositionInArray="[0,0,0]" nBytes="239377" md5="be669b4b7498c566bcaefc47a4e00471"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CloudFrc_TqJ_D_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="294120068" uuid="68b7a52b-8c48-451f-8cc6-50a42f24ebe9" chunkPositionInArray="[0,0]" nBytes="66412" md5="66b20a4b20ec720bc653b4d29c43ac44"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="RelHumSurf_TqJ_A_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="218655045" uuid="3492ed03-197f-496f-adca-3898eec58dca" chunkPositionInArray="[0,0]" nBytes="36074" md5="99eb3fdfc1da7941658a25a3e084c4f2"/>
+    </h4:chunks>
+  </Int16>
+  <Int16 name="CloudFrc_TqJ_D_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="294000980" uuid="f4270820-7205-45c4-a193-39de83825c95" chunkPositionInArray="[0,0]" nBytes="38388" md5="98b43c6ca989ef8c06b25b3d02d8db36"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="CoarseCloudTemp_D">
+    <Dim name="/CoarseCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>0</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="172840041" uuid="334cae4a-19f7-487b-bc03-8ecfea229622" chunkPositionInArray="[0,0,0]" nBytes="245086" md5="7d30a1e154392b2d912e69beafe4a0f1"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TropPres_A_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="77112581" uuid="fd36441b-afb1-465d-93a8-2295b518b222" chunkPositionInArray="[0,0]" nBytes="76758" md5="89b530e760ca495ce17a6e1bbe034518"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="RelHum_liquid_TqJ_D_max">
+    <Dim name="/H2OPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>5</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="285309360" uuid="8dd17548-5fbb-413a-af76-8f1badf33fdf" chunkPositionInArray="[0,0,0]" nBytes="795900" md5="dc773b7bb930c010b0deaa3c56c9d59f"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="FineCloudFrc_A_min">
+    <Dim name="/FineCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>3</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="107980666" uuid="4b170ba9-4341-49c7-88d7-bf4b61d7e32f" chunkPositionInArray="[0,0,0]" nBytes="82340" md5="9c88dffae9ccb19480bcfb8d9a178fa9"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="ClrOLR_D">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="193516604" uuid="854e8023-1280-4aed-bee0-3f8c0b54a3f0" chunkPositionInArray="[0,0]" nBytes="73370" md5="b9ea3f7fa874726a7f70ed7a17fac1f0"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="H2O_MMR_Surf_TqJ_A">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="214338389" uuid="0736bda7-f500-4f5a-8537-0b6416af8872" chunkPositionInArray="[0,0]" nBytes="92585" md5="fdf9aa36997e4d600e9539ea4d3a118e"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="O3_VMR_A_min">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="9512891" uuid="7a056b4d-b600-4186-92b2-aa668d8db2d5" chunkPositionInArray="[0,0,0]" nBytes="237513" md5="d410f48718e4f267beaf0b7927744a5a"/>
+      <h4:byteStream offset="9750404" uuid="b4aada8d-e08f-4a5a-b523-0e282001bcab" chunkPositionInArray="[0,0,180]" nBytes="238774" md5="2722fb200e85682e059ff9f441b569c4"/>
+      <h4:byteStream offset="9989178" uuid="d397eba4-43d0-4913-a437-69e9c530332f" chunkPositionInArray="[0,90,0]" nBytes="234841" md5="08c2c795c621c61ed93d6797c871db2b"/>
+      <h4:byteStream offset="115282072" uuid="0699abdd-710a-454a-ba12-f219da8c7aa5" chunkPositionInArray="[0,90,180]" nBytes="221791" md5="d01b4b8c8864d293eadb79f5b5397651"/>
+      <h4:byteStream offset="115503863" uuid="b846ab57-4613-4fd0-bc2b-c2e64abcd6c2" chunkPositionInArray="[12,0,0]" nBytes="245889" md5="5572cdb607885e478d7ea09f040067ec"/>
+      <h4:byteStream offset="115749752" uuid="3f7310a4-98f0-4f4e-bff7-ce129469651d" chunkPositionInArray="[12,0,180]" nBytes="249499" md5="b2a5911df8428f73519b1303063fa7a9"/>
+      <h4:byteStream offset="115999251" uuid="88f8d5ba-f91b-4e5b-a46d-de3a441a7566" chunkPositionInArray="[12,90,0]" nBytes="252432" md5="4a052d7780ec42d252479ebe63d36c1c"/>
+      <h4:byteStream offset="116251683" uuid="ebd4f611-76da-4074-bef7-673002935f6b" chunkPositionInArray="[12,90,180]" nBytes="247943" md5="f506684609c305fdba75c0cf0ae3013e"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="CloudTopTemp_D_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="168312004" uuid="6d38f3f0-88e9-45fd-abb0-312a02e09a0e" chunkPositionInArray="[0,0]" nBytes="39189" md5="10d9000377f0623e6d1057b0788039f0"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="FineCloudFrc_A_max">
+    <Dim name="/FineCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>3</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="108063006" uuid="5c33bdf6-f37b-447b-869a-a9a11c4476b5" chunkPositionInArray="[0,0,0]" nBytes="630343" md5="7ca539ee3edc4ffec5ef3278ba4513fb"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="FineCloudFrc_A_sdev">
+    <Dim name="/FineCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>3</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="107328244" uuid="af3a9f96-caff-4d58-ad00-ed4cd483dbe1" chunkPositionInArray="[0,0,0]" nBytes="652422" md5="4dea5b80419edcb5fcdf2d332aa3c4ab"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CloudTopTemp_A_err">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="106177379" uuid="c09262b8-9dc1-4194-aedc-8efdb0e5d4ef" chunkPositionInArray="[0,0]" nBytes="74016" md5="2b4219be84b232d22dbc0f29fbf2d0b8"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="RelHumSurf_A_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="93209540" uuid="ac624fa3-4d11-441f-b4f5-720fe72a9348" chunkPositionInArray="[0,0]" nBytes="78313" md5="61d62aa2d2f738c171dfdc31e1a2fe3b"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CloudFrc_TqJ_A">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="230544590" uuid="b292ae84-6584-4a16-b11c-6f2605468b66" chunkPositionInArray="[0,0]" nBytes="83815" md5="782cafa5b181c2ed2b0f5d884a416c3b"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CO_VMR_A_min">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="12923092" uuid="1bfb4af6-6a1b-4ca4-ab05-b529c21b0957" chunkPositionInArray="[0,0,0]" nBytes="229260" md5="9fc4fb7fdcec9dfed11318a978ebdd98"/>
+      <h4:byteStream offset="13152352" uuid="16b8b7fe-e971-4cd1-a946-386d75bda1ea" chunkPositionInArray="[0,0,180]" nBytes="236462" md5="ceae75cb2c87ec0d06bfd980cabd90f3"/>
+      <h4:byteStream offset="13388814" uuid="11a8dc8b-8849-4046-af24-584d4e196a2a" chunkPositionInArray="[0,90,0]" nBytes="220405" md5="99a0effa66596c356163fd28b1867aab"/>
+      <h4:byteStream offset="121980028" uuid="efdf99dd-5a09-4586-a642-67f68639173b" chunkPositionInArray="[0,90,180]" nBytes="207791" md5="7ad305ef2b7b4eb9cfc878e68d696363"/>
+      <h4:byteStream offset="122187819" uuid="1501d2e5-9f21-41b3-8737-e6c5d6684f0d" chunkPositionInArray="[12,0,0]" nBytes="205961" md5="8623bcf8b9bb3a817c2ec1a8034f2324"/>
+      <h4:byteStream offset="122393780" uuid="236917fa-ae71-4e7f-a4d0-17d6cec155d8" chunkPositionInArray="[12,0,180]" nBytes="214602" md5="bd0f003c2edf5252bf07fa13636a8ace"/>
+      <h4:byteStream offset="122608382" uuid="d4cf3e25-6688-4b2a-9d20-29e58f2b855b" chunkPositionInArray="[12,90,0]" nBytes="202896" md5="b6188c9aa4e0ce83c08ecdf07b9cb777"/>
+      <h4:byteStream offset="122811278" uuid="c35ee2e5-6488-4104-b8c6-a66b3c703159" chunkPositionInArray="[12,90,180]" nBytes="193050" md5="7c078f3e81dbe09b02a0b87cdf2f22c3"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="SurfAirTemp_TqJ_D_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="265358144" uuid="d1948872-99ae-49b9-b3e4-743012f60a3e" chunkPositionInArray="[0,0]" nBytes="83727" md5="c0066cf63c2741ffcf07e59f2599865b"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="FineCloudFrc_D_ct">
+    <Dim name="/FineCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>3</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="169350820" uuid="d0b9168c-ccc1-452b-a261-e5083d90cc83" chunkPositionInArray="[0,0,0]" nBytes="401263" md5="bcd3c392aa2005c92fa41bf1c0fac7f5"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="TotCH4_TqJ_D_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="314313516" uuid="32ae8eed-9d73-478f-9264-0f82104e701f" chunkPositionInArray="[0,0]" nBytes="69426" md5="bc164e273c1edbb19a96223cb6260eb3"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TropTemp_TqJ_A_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="202798103" uuid="34c2dddb-e02b-403b-8dfc-0b5df0b4a49e" chunkPositionInArray="[0,0]" nBytes="70420" md5="a124b9acfe26b7e39e722a90069a9ae7"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="RelHumSurf_A_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="93351623" uuid="f0f0fa0b-4722-40c2-b1a7-d317ae60ab4c" chunkPositionInArray="[0,0]" nBytes="59140" md5="332515c0e13e4cf9082133d8926077d3"/>
+    </h4:chunks>
+  </Float32>
+  <Float64 name="Longitude">
+    <Dim name="/Longitude"/>
+    <Attribute name="CLASS" type="String">
+      <Value>DIMENSION_SCALE</Value>
+    </Attribute>
+    <Attribute name="NAME" type="String">
+      <Value>Longitude</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>7</Value>
+    </Attribute>
+    <Attribute name="long_name" type="String">
+      <Value>Longitude</Value>
+    </Attribute>
+    <Attribute name="units" type="String">
+      <Value>degrees_east</Value>
+    </Attribute>
+    <Attribute name="format" type="String">
+      <Value>F6.1</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="131563643" uuid="cb68b724-87ee-4ac0-a80b-cea89784167f" chunkPositionInArray="[0]" nBytes="315" md5="e03cc92919bb584379ea825173440b1c"/>
+    </h4:chunks>
+  </Float64>
+  <Float32 name="Temperature_TqJ_D_sdev">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="52239394" uuid="3c78c776-fcd1-4495-9d57-be90570beec3" chunkPositionInArray="[0,0,0]" nBytes="242344" md5="21b2ca6780c8717dcfc76b2fab3f141e"/>
+      <h4:byteStream offset="52481738" uuid="2ef330c7-f285-4d61-9cab-b6fefa260611" chunkPositionInArray="[0,0,180]" nBytes="237950" md5="8557c07fbc1fab8644c474ab295590f2"/>
+      <h4:byteStream offset="52719688" uuid="797c8b9f-631b-4695-825d-fdb8509b3233" chunkPositionInArray="[0,90,0]" nBytes="234928" md5="c1643191e3bba8f3911b7beab5bcbc78"/>
+      <h4:byteStream offset="261098919" uuid="6ec73825-ed52-47dc-98db-c4e7e5e4aa62" chunkPositionInArray="[0,90,180]" nBytes="224032" md5="47dac014b8fc35c972af82f7f52dc0eb"/>
+      <h4:byteStream offset="261322951" uuid="36cc4348-5fc1-4f38-a828-974adadf01c4" chunkPositionInArray="[12,0,0]" nBytes="241741" md5="ca3a20b0b45f92128d810fe0a88488ff"/>
+      <h4:byteStream offset="261564692" uuid="0ef6ca54-ca89-47f8-81ac-7484c648cd13" chunkPositionInArray="[12,0,180]" nBytes="240489" md5="8a4ad24cbe6e68ba2724ba0b72ac3d9c"/>
+      <h4:byteStream offset="261805181" uuid="e51d09b5-dd67-4c95-9ee1-ce3d2fce3f5e" chunkPositionInArray="[12,90,0]" nBytes="244728" md5="62a31582fb307fe9c10ed7e8bbbcfdf3"/>
+      <h4:byteStream offset="262049909" uuid="2d4fd7c5-1e49-4ecd-8a27-ebac992e71ef" chunkPositionInArray="[12,90,180]" nBytes="239809" md5="514b584395b4828459f9daf8e45b9d1c"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="TotCH4_TqJ_D_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="314199876" uuid="7ca45509-5f56-4460-b032-422ad4bebb8a" chunkPositionInArray="[0,0]" nBytes="36855" md5="f95d273757f53f78c462d46cd17202fe"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="H2O_MMR_Surf_D_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="151680720" uuid="0fa00939-8f57-4e91-ba48-00392a62a7e7" chunkPositionInArray="[0,0]" nBytes="85688" md5="37bdd95820728fe6b91aab710c5ebc25"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="EmisIR_TqJ_D_err">
+    <Dim name="/EmisFreqIR"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>1</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>4 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="259075066" uuid="42aee887-300a-4714-ad3d-c58097edde45" chunkPositionInArray="[0,0,0]" nBytes="160966" md5="111c92cb00eae1deb9d87b4abeade9b9"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="H2O_MMR_A">
+    <Dim name="/H2OPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>5</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="83520748" uuid="a0da16db-e5e2-46b3-a631-543c43e5be9e" chunkPositionInArray="[0,0,0]" nBytes="1112765" md5="870a8d307e5cfcbf235d146a0dfd393c"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="O3_VMR_D_min">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="26435610" uuid="6ad6ec21-d690-46d2-84a0-0a60ba25b38d" chunkPositionInArray="[0,0,0]" nBytes="236055" md5="2653aceb735930bbafb9d9c28b1b8fca"/>
+      <h4:byteStream offset="26671665" uuid="9877e2fd-dd86-4b6f-b9b5-e486f28e09bc" chunkPositionInArray="[0,0,180]" nBytes="237216" md5="f73bb0297be9d7f18ea92f7fff07992e"/>
+      <h4:byteStream offset="26908881" uuid="7422a5b8-ec2f-469f-887a-4e7613171329" chunkPositionInArray="[0,90,0]" nBytes="232016" md5="435f39df1ba9b5baab83f90fedd7e019"/>
+      <h4:byteStream offset="177655733" uuid="23be0352-a3d1-4e90-b6db-30d0f8291b33" chunkPositionInArray="[0,90,180]" nBytes="221694" md5="7225f5736438f9f197424a76b87d73f4"/>
+      <h4:byteStream offset="177877427" uuid="32b74c7e-3251-4b8f-af58-7662de418069" chunkPositionInArray="[12,0,0]" nBytes="244316" md5="d5fcbb3e232aa6cd705635dbd9ead2b0"/>
+      <h4:byteStream offset="178121743" uuid="2c645389-36c7-47c9-b61b-8e58d73027aa" chunkPositionInArray="[12,0,180]" nBytes="245877" md5="4005016ea218a59d2a04bd1c47fce1ba"/>
+      <h4:byteStream offset="178367620" uuid="360fe169-1c61-426c-9038-e6bcc15dc000" chunkPositionInArray="[12,90,0]" nBytes="248446" md5="4da48cf74a793c899fb22c8a3691e574"/>
+      <h4:byteStream offset="178616066" uuid="5a9e4d28-8a3f-4901-b77b-9ade2309dc11" chunkPositionInArray="[12,90,180]" nBytes="242645" md5="9ba72639ab952019459fd9a85033308b"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="Temperature_TqJ_A_ct">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>24 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="196719447" uuid="b1d3734d-f399-439c-8d8e-9de457457314" chunkPositionInArray="[0,0,0]" nBytes="887098" md5="901309e5c3d064816f12f91b72a8bc83"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="CO_VMR_D_max">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="30514677" uuid="0eb83229-6b86-43dc-99fc-b1c3ab398d59" chunkPositionInArray="[0,0,0]" nBytes="230413" md5="8c59826098a0c7ee06b008e89feb46e3"/>
+      <h4:byteStream offset="30745090" uuid="bcb0b322-2c29-42f9-b3c3-444e11f2005c" chunkPositionInArray="[0,0,180]" nBytes="233602" md5="e1aa9fa936ca9edb7226c980c6adf92a"/>
+      <h4:byteStream offset="30978692" uuid="aeaf15d3-6d5e-4b42-bee9-4c802735de6a" chunkPositionInArray="[0,90,0]" nBytes="223446" md5="d04556bb5dff28bc07a47894ae780e36"/>
+      <h4:byteStream offset="185344948" uuid="14aef735-f71a-4709-a632-637f1e090048" chunkPositionInArray="[0,90,180]" nBytes="209640" md5="c0b05203d1a2bf82df0e3df1f62fd2f8"/>
+      <h4:byteStream offset="185554588" uuid="790edd4a-6b08-4f1f-bee1-188cee490bf9" chunkPositionInArray="[12,0,0]" nBytes="199406" md5="70c16747f86f2f03055f3da42919e802"/>
+      <h4:byteStream offset="185753994" uuid="2629b4ff-ba33-49d5-ab3f-0bfcc213875e" chunkPositionInArray="[12,0,180]" nBytes="204086" md5="9b65a9bdd8741b5c2b44bbf4f38566e8"/>
+      <h4:byteStream offset="185958080" uuid="b050465c-c9f5-4127-9697-0b1cef82503d" chunkPositionInArray="[12,90,0]" nBytes="204697" md5="586465cd604aab4320137ea2989f5c70"/>
+      <h4:byteStream offset="186162777" uuid="c337274d-5498-4134-85f7-09e33aa7c2a3" chunkPositionInArray="[12,90,180]" nBytes="194965" md5="308aaa806208bfe6ac7acaceda27aaa5"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TropTemp_TqJ_D_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="266282530" uuid="7def96a5-fc4e-4f36-8876-d8ef7f5ab275" chunkPositionInArray="[0,0]" nBytes="70655" md5="e0ec2d28cedae52f8c38f1864b852661"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CloudTopPres_D">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="167811875" uuid="063a5542-cb4a-4ab8-bf3f-2997527391fc" chunkPositionInArray="[0,0]" nBytes="73074" md5="4f2aceffb341f19c03572397bc9cb697"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="TropPres_TqJ_D_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="265739377" uuid="4e568401-fb0c-477e-9d60-a7b1332bff90" chunkPositionInArray="[0,0]" nBytes="38388" md5="98b43c6ca989ef8c06b25b3d02d8db36"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="CloudTopPres_A_err">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="105712889" uuid="3f039877-a091-4dcd-ae16-e0c690fcd984" chunkPositionInArray="[0,0]" nBytes="73702" md5="332a83cb0e8580d3ae849a12918a0060"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CloudTopPres_TqJ_A_err">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="231310990" uuid="20c991e9-201a-405c-8916-3074d444a253" chunkPositionInArray="[0,0]" nBytes="76151" md5="d95069a75981b6b9b5d4f0b990d8078c"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CloudTopPres_TqJ_A_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="231159389" uuid="7913d02a-6116-442c-a1e2-aaab787ad7b7" chunkPositionInArray="[0,0]" nBytes="81084" md5="84c18e00cb9c57a2374432bff83bbea6"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CloudTopPres_D_err">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="168150131" uuid="3106ac1c-2a7a-4fcf-a3e3-4da82807486c" chunkPositionInArray="[0,0]" nBytes="73280" md5="53670dbde3ad95fcd3bc1e643127d2c1"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CloudTopPres_D_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="168006219" uuid="9ff74b03-0b5b-49f0-8a3c-2a27fd531626" chunkPositionInArray="[0,0]" nBytes="77835" md5="a16fe228c211b1ac630a461a88b70107"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="TotH2OVap_MW_A_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="320841208" uuid="ae5ee7f3-8161-47e1-b123-775aae3582df" chunkPositionInArray="[0,0]" nBytes="589" md5="13194f25768e29a4921fa9f6ba022342"/>
+    </h4:chunks>
+  </Int16>
+  <Int16 name="O3_VMR_TqJ_A_ct">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>24 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="239077475" uuid="68a4308c-1911-4794-8cc6-1bb709f3ecdf" chunkPositionInArray="[0,0,0]" nBytes="886557" md5="28619d507fe1cea37188a64ab2e52b8f"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="TotO3_TqJ_D_err">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="301076183" uuid="a94db5bc-f17a-47e0-8658-081aa3096c99" chunkPositionInArray="[0,0]" nBytes="58890" md5="f4c471fe855e11d1dd9d2c00b8620448"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="H2O_MMR_Surf_D">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="151480864" uuid="38870718-f2c4-405c-a695-deda54c088a2" chunkPositionInArray="[0,0]" nBytes="88329" md5="fc7d59f2e4f71811f7fd499603e8bab7"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TropTemp_D_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="140023504" uuid="97aedc92-8a39-4360-b873-bf73fe2304b9" chunkPositionInArray="[0,0]" nBytes="67500" md5="64f51a48f0b9410421dcd1fce86c596e"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CH4_VMR_TqJ_D">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="65691769" uuid="96830313-81ff-4b80-ae3d-a1feea1376ba" chunkPositionInArray="[0,0,0]" nBytes="190755" md5="4c2fa3df81bb3a63321696c9ffd35fbe"/>
+      <h4:byteStream offset="65882524" uuid="28224647-1e6e-464b-ba1d-3b0979bf0637" chunkPositionInArray="[0,0,180]" nBytes="186710" md5="abd29583282cecb058eea1b52d822afd"/>
+      <h4:byteStream offset="66069234" uuid="38d7344b-8134-4f26-acfa-1b337d41c259" chunkPositionInArray="[0,90,0]" nBytes="188124" md5="5de94e7fc92beab4ee978f053d24acbd"/>
+      <h4:byteStream offset="314449286" uuid="a3e13655-f1ce-4a50-a4a0-cf983f62855f" chunkPositionInArray="[0,90,180]" nBytes="179404" md5="4ed6a84994164fffc394ad194e259ccd"/>
+      <h4:byteStream offset="314628690" uuid="552812ed-2702-4d29-a580-56f149426a93" chunkPositionInArray="[12,0,0]" nBytes="185728" md5="73d92af28dd41c1ed9b3bf4ec9fde0ef"/>
+      <h4:byteStream offset="314814418" uuid="e208b2b1-9005-4f96-a27a-11b933213417" chunkPositionInArray="[12,0,180]" nBytes="184025" md5="8f90e11ec3d81acaeeee166038cc64aa"/>
+      <h4:byteStream offset="314998443" uuid="c7973224-6ce9-4ac7-ae6e-48358c901844" chunkPositionInArray="[12,90,0]" nBytes="194665" md5="abea5dd767ece112a2dda0a8c6550dd7"/>
+      <h4:byteStream offset="315193108" uuid="38c77dc0-bb81-47ec-bc9b-37482554c0ed" chunkPositionInArray="[12,90,180]" nBytes="187786" md5="486d9168ea94b5857471f46ad4404aba"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="H2OPressureLay">
+    <Dim name="/H2OPressureLay"/>
+    <Attribute name="CLASS" type="String">
+      <Value>DIMENSION_SCALE</Value>
+    </Attribute>
+    <Attribute name="NAME" type="String">
+      <Value>H2OPressureLay</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>4</Value>
+    </Attribute>
+    <Attribute name="long_name" type="String">
+      <Value>Mid-layer Pressure</Value>
+    </Attribute>
+    <Attribute name="units" type="String">
+      <Value>hPa</Value>
+    </Attribute>
+    <Attribute name="format" type="String">
+      <Value>F7.2</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12</h4:chunkDimensionSizes>
+      <h4:byteStream offset="131564324" uuid="ef06d304-ef5d-41e1-8eb2-f675cc1d8dc2" chunkPositionInArray="[0]" nBytes="49" md5="cd581cc833cabac662ad43499330bed6"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="RelHumSurf_liquid_TqJ_D_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="286336018" uuid="30ab3b83-46af-434e-b73f-2085bd976b25" chunkPositionInArray="[0,0]" nBytes="55668" md5="d25800d8930b69d3e2523f81b14c2d04"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="Emis_MW_A_ct">
+    <Dim name="/EmisFreqMW"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>2</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="320746061" uuid="6e0fd928-c772-4372-896c-f6fba4dacdf0" chunkPositionInArray="[0,0,0]" nBytes="1717" md5="7b744463b12501af7f1b66dece5e41b4"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="EmisIR_TqJ_A_min">
+    <Dim name="/EmisFreqIR"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>1</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>4 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="195241556" uuid="f6fd979c-66d4-410c-a8ab-8fb1fd8088ff" chunkPositionInArray="[0,0,0]" nBytes="173281" md5="52c7e08bcbb247dcb06a9ea857af8cfb"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="CH4_VMR_TqJ_D_ct">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>24 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="315380894" uuid="2412de44-02f4-4650-a9c8-5d9d297e29df" chunkPositionInArray="[0,0,0]" nBytes="862296" md5="f4cc53196066e070a64f14a3c5775f8b"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="TotO3_TqJ_D">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="300721972" uuid="780f0ffc-b4af-42d8-ba6b-ddad3cf946a4" chunkPositionInArray="[0,0]" nBytes="79014" md5="b746e02a26447ee376bb90d65abf5b1b"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="RelHum_liquid_TqJ_D">
+    <Dim name="/H2OPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>5</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="282303828" uuid="a9b63660-0aad-4d08-a20e-a690aff58d9d" chunkPositionInArray="[0,0,0]" nBytes="829681" md5="823c1908ee4105ccc9c5399f3a815508"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotCH4_TqJ_A_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="251109593" uuid="d37722fd-3ca2-4884-ad5c-a7c665242691" chunkPositionInArray="[0,0]" nBytes="66933" md5="875aaecd32e892aab3444d0d5c9f7fa3"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="GPHeight_A_max">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="6685852" uuid="a5a6f56b-aa0a-4ddf-8209-3bc7038bfdf3" chunkPositionInArray="[0,0,0]" nBytes="417172" md5="e18a97097e297dd0537273f77d802aae"/>
+      <h4:byteStream offset="7103024" uuid="12fe6328-ab9a-479d-9bc3-19b295d3efba" chunkPositionInArray="[0,0,180]" nBytes="412777" md5="bb3787a9257712b682b95603e2b97ec7"/>
+      <h4:byteStream offset="7515801" uuid="40f5f432-2243-4744-ac0d-49465cc85881" chunkPositionInArray="[0,90,0]" nBytes="411891" md5="559310111fe2be7820865842338f9484"/>
+      <h4:byteStream offset="103037864" uuid="3e29e75a-bdbe-4bc1-9b7e-38915a86775b" chunkPositionInArray="[0,90,180]" nBytes="394434" md5="0de060cca5d02d657cc79c63e0b922ce"/>
+      <h4:byteStream offset="103432298" uuid="528624eb-3db6-42d5-b40d-7e8edce439ac" chunkPositionInArray="[12,0,0]" nBytes="378121" md5="703a2719bfe7ea8b5c5123d2c52ad2c5"/>
+      <h4:byteStream offset="103810419" uuid="6c319098-55e9-4fad-804e-e425a2c05b84" chunkPositionInArray="[12,0,180]" nBytes="380692" md5="0649ae95e3298b0453612d1f3cf30507"/>
+      <h4:byteStream offset="104191111" uuid="81ed8b4f-b806-4683-ac75-1bfedd6511d8" chunkPositionInArray="[12,90,0]" nBytes="397033" md5="6f9062e9849e956795e624dd2f6e75f7"/>
+      <h4:byteStream offset="104588144" uuid="442dc9e6-45f6-43bc-988d-ef3f4d435926" chunkPositionInArray="[12,90,180]" nBytes="395873" md5="ce99f74e07728d261d6c4334d9f7c5ff"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="O3_VMR_D_max">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="27144033" uuid="75516a87-8d8a-4ee4-8c0a-f207b10b59d1" chunkPositionInArray="[0,0,0]" nBytes="237496" md5="96fa663faa6d8ed7ac0b5d59ce20eb9a"/>
+      <h4:byteStream offset="27381529" uuid="8d0d5d60-bdb2-4c55-b8c1-8086efbbbb7f" chunkPositionInArray="[0,0,180]" nBytes="238755" md5="1684ec414f06d448bb980f5515ea8aca"/>
+      <h4:byteStream offset="27620284" uuid="76a0245a-dcff-41ba-9be9-7307b3c1ca5d" chunkPositionInArray="[0,90,0]" nBytes="230747" md5="bcfc08cbbabdc75af8d114cdc54ae6b9"/>
+      <h4:byteStream offset="178858711" uuid="578a5069-3f5a-40f7-bdc3-a57232a00726" chunkPositionInArray="[0,90,180]" nBytes="221010" md5="b0050fdd6ff84e147ccde2c2d97c80b5"/>
+      <h4:byteStream offset="179079721" uuid="301f148f-2b84-4525-9599-568efd72b9c2" chunkPositionInArray="[12,0,0]" nBytes="240715" md5="8f59e7bd444d2ecfadb487323975ee19"/>
+      <h4:byteStream offset="179320436" uuid="f781a546-4c40-45e2-ac68-58797a2b4bdf" chunkPositionInArray="[12,0,180]" nBytes="243603" md5="350ff527507b3881b98dc0d2c0d1fe31"/>
+      <h4:byteStream offset="179564039" uuid="8dc72c2d-0139-4087-aeae-b6161bdfbf01" chunkPositionInArray="[12,90,0]" nBytes="248670" md5="bab1f5e4afdd11b190a2b73e83f41088"/>
+      <h4:byteStream offset="179812709" uuid="0d5d73ad-7d39-489e-81a1-ea50ca147c1a" chunkPositionInArray="[12,90,180]" nBytes="241114" md5="588315776502b3b24a39a98049c741fe"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="SurfAirTemp_A_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="76770387" uuid="e6680a28-e948-4c51-bb1c-cfd1edfa3239" chunkPositionInArray="[0,0]" nBytes="68478" md5="6743a017fa42bee68b3a847742f5adbc"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="Temperature_A_ct">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>24 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="71660212" uuid="2b28f8e5-ec28-46ce-bfd4-06d06266c73b" chunkPositionInArray="[0,0,0]" nBytes="828725" md5="dc45c78cae9a5ba8f46a2106a29fbfa1"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="H2O_MMR_TqJ_A_min">
+    <Dim name="/H2OPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>5</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="211344795" uuid="fc3a01c4-e5f0-4043-ab9a-2e9aa0240d10" chunkPositionInArray="[0,0,0]" nBytes="1081667" md5="17ff50476061e175d9ff40fee2194113"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="SurfSkinTemp_D_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="131941284" uuid="cfbee7e8-eded-4c6f-8c71-200f905707b0" chunkPositionInArray="[0,0]" nBytes="34405" md5="c847968d301029cd34071e12889f1b78"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="O3_VMR_TqJ_A_err">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="44759910" uuid="3c158ec2-4289-4771-bb3a-aec524a2d753" chunkPositionInArray="[0,0,0]" nBytes="178572" md5="b48eb9033c9e6e0a530a09a60f40cc8c"/>
+      <h4:byteStream offset="44938482" uuid="816fd9c3-3b48-4f66-a424-7fad3945ab65" chunkPositionInArray="[0,0,180]" nBytes="183888" md5="6b6e5c5b863b58a57e779015d5473584"/>
+      <h4:byteStream offset="45122370" uuid="a71f02c5-ddf9-47f1-8cdc-efc39d2184cf" chunkPositionInArray="[0,90,0]" nBytes="178159" md5="5b695553195e446ef4aeb2d33194d3fb"/>
+      <h4:byteStream offset="243586664" uuid="e334e519-9a21-4704-b5e0-7a9e7ff58921" chunkPositionInArray="[0,90,180]" nBytes="168312" md5="3c2661a3e980ad3794d121252469535c"/>
+      <h4:byteStream offset="243754976" uuid="293292b3-3be6-4c66-ac69-b99cc1064a90" chunkPositionInArray="[12,0,0]" nBytes="174384" md5="e71b8879ae68f82c081ccc445043a521"/>
+      <h4:byteStream offset="243929360" uuid="a3fa7755-4138-4d4c-b8c3-322a2eeeb16a" chunkPositionInArray="[12,0,180]" nBytes="179970" md5="9f76205aac2d9e8cd07348e0fd52fb6f"/>
+      <h4:byteStream offset="244109330" uuid="4eacc1b4-5ab6-4b5b-820a-3d07f1ff9710" chunkPositionInArray="[12,90,0]" nBytes="190661" md5="c0f14b562348154048a1af21e9bb6f8a"/>
+      <h4:byteStream offset="244299991" uuid="f51eb6e2-2dd4-41a5-a277-38c553e00820" chunkPositionInArray="[12,90,180]" nBytes="184799" md5="a54befb0bf43bdb69c33d22b32877128"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="EmisIR_D_err">
+    <Dim name="/EmisFreqIR"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>1</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>4 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="133161018" uuid="b14fc3bb-5563-4a7d-8830-d63c38a28b32" chunkPositionInArray="[0,0,0]" nBytes="160966" md5="111c92cb00eae1deb9d87b4abeade9b9"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="Temperature_A_max">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="2770092" uuid="ee3c104f-3e25-4e8d-bbe0-fd66c2a3e234" chunkPositionInArray="[0,0,0]" nBytes="186807" md5="578033f8a63ba3e9ee9939a58640767c"/>
+      <h4:byteStream offset="2956899" uuid="3648442c-c31d-48ab-9935-39d1aa07b30f" chunkPositionInArray="[0,0,180]" nBytes="187194" md5="baf9eaf5f45ca0b73993895185a943d8"/>
+      <h4:byteStream offset="3144093" uuid="05574ef9-5ee7-4053-bab1-92c9ba27f5ed" chunkPositionInArray="[0,90,0]" nBytes="186763" md5="c70d7c88377e2be729b8cccd4a17e27b"/>
+      <h4:byteStream offset="74542968" uuid="d6c359ff-6e65-4d14-b999-508e56ab5cf6" chunkPositionInArray="[0,90,180]" nBytes="182946" md5="f08c5881d004cff4b09dcb5c15a4c887"/>
+      <h4:byteStream offset="74725914" uuid="49fb40f9-6f6e-42f2-9c7c-4de17d6a46b6" chunkPositionInArray="[12,0,0]" nBytes="172660" md5="44c9a3bd48e31455c0c398470c613061"/>
+      <h4:byteStream offset="74898574" uuid="9c0a0354-de32-4ca9-ac79-d27649f45b7d" chunkPositionInArray="[12,0,180]" nBytes="174353" md5="0216ef33674bf1fa9d5552f454ac975a"/>
+      <h4:byteStream offset="75072927" uuid="42dfb8b8-baac-4b13-af5d-a6fc2adeb4dd" chunkPositionInArray="[12,90,0]" nBytes="189585" md5="5e5f67b73b939911869b05a29496a535"/>
+      <h4:byteStream offset="75262512" uuid="a9149d7c-6173-4710-8c88-e42184ac72dd" chunkPositionInArray="[12,90,180]" nBytes="186703" md5="706b9eebc0fd35bf5076226c0f06c38f"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="RelHumSurf_liquid_TqJ_D_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="286276552" uuid="18ccfea8-7e69-47b9-91af-997d95c951bf" chunkPositionInArray="[0,0]" nBytes="59466" md5="675180fcf0b2c7e126786655753c3270"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="ClrOLR_TqJ_D_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="320464809" uuid="f8319c5f-553c-4a6b-bac7-de85760735cc" chunkPositionInArray="[0,0]" nBytes="84091" md5="dcd0f82eac6185f3f24ef889df828393"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="EmisIR_A_ct">
+    <Dim name="/EmisFreqIR"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>1</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>4 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="69761441" uuid="21ac9ca1-7adc-401f-98fe-019a6ab023b5" chunkPositionInArray="[0,0,0]" nBytes="150229" md5="c69fc0b40f05e5eea97c1ca5722bd617"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="OLR_TqJ_D">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="319973686" uuid="53fd6535-3b5a-4a3e-bd6c-169dd5bdb45a" chunkPositionInArray="[0,0]" nBytes="82579" md5="c4fd9484503ac42eaaa1002063c398f7"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="Temperature_MW_A">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="68512590" uuid="c0019f1d-d798-452b-a014-214bb52e40e2" chunkPositionInArray="[0,0,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="68516011" uuid="1b4dbf35-d2ba-4cbb-a198-a8472e3a7d28" chunkPositionInArray="[0,0,180]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="68519432" uuid="d9d01e3c-eafd-4b26-aca4-c451d7d0b815" chunkPositionInArray="[0,90,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="320758041" uuid="425a5f16-79de-464e-bd9c-42d5f31f9fe5" chunkPositionInArray="[0,90,180]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="320761462" uuid="8aacd920-91e6-4fd0-be18-be72f33cf619" chunkPositionInArray="[12,0,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="320764883" uuid="8ecd8671-4779-401a-9cc2-7efc2db53941" chunkPositionInArray="[12,0,180]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="320768304" uuid="832646ef-afeb-41fb-8e04-2c679c9a51b7" chunkPositionInArray="[12,90,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="320771725" uuid="3f7add39-2859-406c-b4fc-2a2af813188d" chunkPositionInArray="[12,90,180]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="SurfAirTemp_TqJ_A_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="201874919" uuid="da80dede-12e7-434f-8e68-df13af16f6a7" chunkPositionInArray="[0,0]" nBytes="83679" md5="fe286b47bd9f9465ae89f35759e5233b"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CloudTopPres_TqJ_D_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="294438362" uuid="315275f6-b729-4ef4-9c61-bcad0944c799" chunkPositionInArray="[0,0]" nBytes="84386" md5="e28c620ca623b8d0ea19e0aecf0f74e4"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CloudTopTemp_TqJ_A_err">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="231784738" uuid="d94d5fc5-a32c-4f8c-beb3-fc4b861940fd" chunkPositionInArray="[0,0]" nBytes="76397" md5="e8544ce285818bd6a6ed941463ac2642"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotCH4_A_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="125086672" uuid="d4794ba5-81c2-4766-8ee0-83fde1d2d6e3" chunkPositionInArray="[0,0]" nBytes="76105" md5="44ff69300a70de1974155e6e1fe7d7ac"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="EmisIR_TqJ_D_sdev">
+    <Dim name="/EmisFreqIR"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>1</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>4 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="258464151" uuid="8a3369ce-d3f2-4c5c-af30-dd092ee60614" chunkPositionInArray="[0,0,0]" nBytes="285629" md5="b7570bff857685dd1a85991762a6fa0a"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="RelHumSurf_D_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="155855599" uuid="6c6a755f-4cd2-4a92-9a76-edf6b6ac844a" chunkPositionInArray="[0,0]" nBytes="55050" md5="76aeb791285c1cbaccf89618787b6e39"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="SurfAirTemp_D_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="139274605" uuid="4c5ee9f0-ba20-4727-8670-bca78ba3ba66" chunkPositionInArray="[0,0]" nBytes="69779" md5="e586816275602bd122a18b7daeeac7e2"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="FineCloudFrc_A">
+    <Dim name="/FineCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>3</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="106251395" uuid="089cdfa6-2889-4769-a609-de37dfe60260" chunkPositionInArray="[0,0,0]" nBytes="671088" md5="adc2f5c3a6c18a6ebbb8ba8f5cfe6e09"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="SurfAirTemp_TqJ_D_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="265511650" uuid="c0dc5ae6-9cf5-49a3-b88d-f7cb3785f4aa" chunkPositionInArray="[0,0]" nBytes="68738" md5="e42dd130c0d84ab36b39c07c478de10b"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TropHeight_TqJ_D_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="286606805" uuid="307900a0-68da-4d5d-ba0f-f627f86281da" chunkPositionInArray="[0,0]" nBytes="155808" md5="6fcee0688ef2a30b6cfbbf6c5c60ceb1"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="H2O_MMR_Lyr_TqJ_A_max">
+    <Dim name="/H2OPressureLay"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>4</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="206928938" uuid="4d75c670-214c-4209-9920-3fd9757d38b3" chunkPositionInArray="[0,0,0]" nBytes="1068748" md5="d3986b50a5b6e87b07da80d76cfe0701"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="SurfSkinTemp_TqJ_D_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="257855332" uuid="3bebbf32-dbf3-447a-80e6-ef8f44c1bccd" chunkPositionInArray="[0,0]" nBytes="34405" md5="c847968d301029cd34071e12889f1b78"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="SurfAirTemp_TqJ_A_err">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="202096541" uuid="7ee56c70-31f9-4f05-9d89-c85eb97c0253" chunkPositionInArray="[0,0]" nBytes="76368" md5="c56c299c6e81ac894239b0d3b4d4384d"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="ClrOLR_A_err">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="131549713" uuid="60275d71-a622-480d-aa2d-c1757142dcda" chunkPositionInArray="[0,0]" nBytes="13930" md5="bc18c6d4afa935d49458ea2adb16613c"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TropTemp_D_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="139942689" uuid="144ed44e-5b01-4479-9e9c-1fd684305a26" chunkPositionInArray="[0,0]" nBytes="80815" md5="55e584c1daeb19651f7ee8c88445f78b"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CloudTopTemp_D_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="168434322" uuid="c61ad1da-2430-4c36-bf92-9ab8dddd61c6" chunkPositionInArray="[0,0]" nBytes="91992" md5="8379860f45ccdcd9b777ffbd536106b3"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CoarseCloudPres_D">
+    <Dim name="/CoarseCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>0</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="171930243" uuid="03adb1bf-c666-44c2-8395-0c93ab0c42bc" chunkPositionInArray="[0,0,0]" nBytes="198244" md5="85af40d95238a922db3cfff9eda33ed7"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TropPres_D_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="139687003" uuid="ebf9f160-089c-4143-87b4-92c3b40f3dff" chunkPositionInArray="[0,0]" nBytes="76499" md5="98779698284d403a0e3c03fcc4197ad8"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotCO_TqJ_A_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="244600629" uuid="3ae2b865-71a2-4328-a1d2-9f202e89ef8f" chunkPositionInArray="[0,0]" nBytes="78835" md5="746303d3a8fb7f8873efa335312af31f"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="H2O_MMR_Surf_A_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="89066330" uuid="074bd979-817a-4052-bda2-422fc1835447" chunkPositionInArray="[0,0]" nBytes="78067" md5="9e2f621d970fb39d48ac1112b52859f3"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotH2OVap_A_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="77723836" uuid="a1ed1144-241d-4553-978e-1fbbf5743fa4" chunkPositionInArray="[0,0]" nBytes="84361" md5="fcdc2faa7c147df826de9de4ca4ad712"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotCldLiqH2O_MW_D_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="321156105" uuid="f602dd14-1f3a-449b-a331-7d72e283504c" chunkPositionInArray="[0,0]" nBytes="1161" md5="a43f0ca2084e297f3aa9763a828dcb0f"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CH4_VMR_A_max">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="16752831" uuid="76bd2b01-52f3-4f80-9a3a-c98949f3362b" chunkPositionInArray="[0,0,0]" nBytes="190191" md5="7c98bb2872a1cd6957e0b2a31b274a8d"/>
+      <h4:byteStream offset="16943022" uuid="48394f41-b18d-4b26-bdfe-f4f114bb88dc" chunkPositionInArray="[0,0,180]" nBytes="187765" md5="2e47a49a083e458a5068a7ac17134144"/>
+      <h4:byteStream offset="17130787" uuid="5e522f62-55c0-4a70-87ad-27233dd8ee08" chunkPositionInArray="[0,90,0]" nBytes="187620" md5="e326abf0383427a285a92036a4fab8c1"/>
+      <h4:byteStream offset="129129614" uuid="9b049121-71f3-4f61-95b4-a71929b3e38a" chunkPositionInArray="[0,90,180]" nBytes="175878" md5="3acf46d7524da8b143de5c79425629b3"/>
+      <h4:byteStream offset="129305492" uuid="6801b01b-921c-4433-b490-d842eb684622" chunkPositionInArray="[12,0,0]" nBytes="192631" md5="0bf9b48ac0aefde2569d8bfdcc51356a"/>
+      <h4:byteStream offset="129498123" uuid="250d5015-783c-4fe8-b6c4-f6d3ab51216f" chunkPositionInArray="[12,0,180]" nBytes="191644" md5="e8560d2ea7c3640e57f5278aa9322606"/>
+      <h4:byteStream offset="129689767" uuid="dc4490d9-42d7-4ec4-9a2c-7d71d9941862" chunkPositionInArray="[12,90,0]" nBytes="200054" md5="ac4732886b034e1ad2cf34695d260538"/>
+      <h4:byteStream offset="129889821" uuid="5f1be75d-2447-499c-9f0f-10b95b6753ab" chunkPositionInArray="[12,90,180]" nBytes="191363" md5="5b16f4c03133cedce68e3090a6c64daf"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CH4_VMR_A">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="14936189" uuid="8c28e24c-ff0b-497f-a689-50fbffe9bd22" chunkPositionInArray="[0,0,0]" nBytes="193484" md5="1bed815a1d62a0ed3114cf146f811684"/>
+      <h4:byteStream offset="15129673" uuid="a28e7d09-e81e-4a2b-b6c6-ff5572d00448" chunkPositionInArray="[0,0,180]" nBytes="192218" md5="b9866c5bdae5422f21e3e52755b48b2a"/>
+      <h4:byteStream offset="15321891" uuid="30150f2b-f3b6-46da-8400-439df4ed0b73" chunkPositionInArray="[0,90,0]" nBytes="190868" md5="eb4d579c1ca45cf1d658d56ca633c568"/>
+      <h4:byteStream offset="125299248" uuid="b33cd99d-b27c-4ebe-91de-29890a8667ee" chunkPositionInArray="[0,90,180]" nBytes="179407" md5="9773c246d3ad454046ed38b6197c994a"/>
+      <h4:byteStream offset="125478655" uuid="e2f99bec-0032-422c-9c89-193e48301f62" chunkPositionInArray="[12,0,0]" nBytes="187364" md5="992424de7dfbd084458b7ed60b81f73a"/>
+      <h4:byteStream offset="125666019" uuid="d5ba1ea2-544c-41f0-8cf4-a9590e292b28" chunkPositionInArray="[12,0,180]" nBytes="188189" md5="77612222452163aead802c857dca04ff"/>
+      <h4:byteStream offset="125854208" uuid="76212748-9906-4094-a321-f1f5c918e666" chunkPositionInArray="[12,90,0]" nBytes="197679" md5="68a0763660bbeb161ba2b3d7df37a150"/>
+      <h4:byteStream offset="126051887" uuid="fa013c25-1e95-468a-96c8-f62a241918c3" chunkPositionInArray="[12,90,180]" nBytes="188652" md5="53c5dc77ec688aef9553b60df561dbfd"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="H2O_MMR_Surf_D_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="151766408" uuid="dba04759-1506-4e5f-b69a-7119f5bd6d4f" chunkPositionInArray="[0,0]" nBytes="84559" md5="172841b4cd104f8e5eec99fd8ddf180d"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="SurfSkinTemp_TqJ_D_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="257889737" uuid="1689fede-013a-4864-92a8-b7eacaf42d66" chunkPositionInArray="[0,0]" nBytes="74183" md5="31da78d579c55dda769e7a16385e4ab7"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="OLR_A_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="130958325" uuid="9506732b-d367-43e1-af9e-ac28c5868c5f" chunkPositionInArray="[0,0]" nBytes="80911" md5="3f4398ce20bb6614f62ac601c293de60"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotCO_D">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="180943683" uuid="9d7ad50c-a951-40a4-af09-3948a734f283" chunkPositionInArray="[0,0]" nBytes="80240" md5="ebfd2f199184616afc8b7202166cbfb9"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="CoarseCloudFrc_TqJ_D_ct">
+    <Dim name="/CoarseCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>0</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="298145897" uuid="4e862e27-ff87-4e86-8c7b-19b20f0a2cbf" chunkPositionInArray="[0,0,0]" nBytes="114686" md5="0e5b16237b5b79f49e59a50231493c4b"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="TotCH4_D_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="187566103" uuid="1ab7c0cd-9221-4c5b-be96-d8a85cb228ef" chunkPositionInArray="[0,0]" nBytes="66344" md5="c9ee01684237137d78899a58778f2d1e"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="H2O_MMR_A_ct">
+    <Dim name="/H2OPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>5</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="84633513" uuid="aaa8b453-6047-4785-8492-6f11146ac58c" chunkPositionInArray="[0,0,0]" nBytes="416282" md5="c257af536e1b6cb823609eeb52b470ed"/>
+    </h4:chunks>
+  </Int16>
+  <Int16 name="H2O_MMR_TqJ_A_ct">
+    <Dim name="/H2OPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>5</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="209978886" uuid="576d457e-2fe9-4bbb-a12f-572098544bb0" chunkPositionInArray="[0,0,0]" nBytes="434058" md5="5fa36a186eae401088cafc7140cb701b"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="SurfSkinTemp_A_err">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="69520135" uuid="088e8b87-8acf-4a10-9438-7a332c664913" chunkPositionInArray="[0,0]" nBytes="70782" md5="fe9ffd4506607c090f9faa297f46ed30"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="SurfPres_Forecast_TqJ_D_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="257587368" uuid="51525fe7-db87-4581-9640-eb19815c1723" chunkPositionInArray="[0,0]" nBytes="84929" md5="8bb8f6298bf69073571455e32cac8434"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CO_VMR_A_err">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="14309356" uuid="df2eabf1-37cc-47fa-9983-ed282da344ef" chunkPositionInArray="[0,0,0]" nBytes="208392" md5="963fd98215b7ee2aa6302a074b913c52"/>
+      <h4:byteStream offset="14517748" uuid="42fd5bde-2f8d-416a-a717-c4cb36a53181" chunkPositionInArray="[0,0,180]" nBytes="209036" md5="71943c2e8a27364c1b213017d158a77b"/>
+      <h4:byteStream offset="14726784" uuid="778f9ad8-0fd6-41cc-9f44-cd00dd01fc04" chunkPositionInArray="[0,90,0]" nBytes="193189" md5="64f6a283268a5389333f6720312cebc6"/>
+      <h4:byteStream offset="124025204" uuid="38470969-8e06-4fa4-928d-767e20d06650" chunkPositionInArray="[0,90,180]" nBytes="178526" md5="0e577e2a659812e385443d9708669b1f"/>
+      <h4:byteStream offset="124203730" uuid="950d7052-60af-44d6-9f4f-ec1726d46849" chunkPositionInArray="[12,0,0]" nBytes="204277" md5="ffcb89860d4a83f4185eee0fdf721d08"/>
+      <h4:byteStream offset="124408007" uuid="bbce8ac7-d4a9-4ffe-b3c7-94ca6cf76af2" chunkPositionInArray="[12,0,180]" nBytes="209783" md5="dd4ae14dcfcf065e0dd90ef9e51ae0e2"/>
+      <h4:byteStream offset="124617790" uuid="a4c3706e-4ad2-49b2-8e74-c66c0a97bb10" chunkPositionInArray="[12,90,0]" nBytes="186615" md5="d4f1c95a3f3cec8d37c4ab7f2dd2afa6"/>
+      <h4:byteStream offset="124804405" uuid="ab0ab12e-dc66-4594-80b9-bc6ef55e52c2" chunkPositionInArray="[12,90,180]" nBytes="175600" md5="4591f7b722eabd11d479bc1d9795ba67"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotH2OVap_D_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="140381199" uuid="478bedd0-bf01-4477-bb2b-c71a457cdb32" chunkPositionInArray="[0,0]" nBytes="94716" md5="27e0bf54343292016e8a3d5f4d51f971"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="Temperature_TqJ_A">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="34684673" uuid="e1d7662b-ab4d-489d-9c58-f78cfbad82a6" chunkPositionInArray="[0,0,0]" nBytes="194448" md5="807bd605d47b2c62516a9a582a8aa754"/>
+      <h4:byteStream offset="34879121" uuid="d71e91b4-a593-4ccc-b3b5-138886836232" chunkPositionInArray="[0,0,180]" nBytes="195361" md5="072f3442f6af5b9d7b7865948eff7294"/>
+      <h4:byteStream offset="35074482" uuid="c1ee16e4-28b0-4924-97b5-30314593574b" chunkPositionInArray="[0,90,0]" nBytes="194684" md5="66347e2a3002b14a831676c1e3b47093"/>
+      <h4:byteStream offset="195754983" uuid="b46dff5a-fb9e-4884-9207-b8385aad3536" chunkPositionInArray="[0,90,180]" nBytes="186994" md5="43d648c093d17a9ffa33774a9d23e861"/>
+      <h4:byteStream offset="195941977" uuid="f3604acb-cc63-43d3-bfbf-291d858cfe12" chunkPositionInArray="[12,0,0]" nBytes="184998" md5="f0bef82ee471c2b6bd657083bf9f2adf"/>
+      <h4:byteStream offset="196126975" uuid="b2cac507-0f97-4182-a8e9-310965c08e5b" chunkPositionInArray="[12,0,180]" nBytes="188694" md5="efb202d92f5a662dfd97713639e931e4"/>
+      <h4:byteStream offset="196315669" uuid="40ba617a-be8b-41a9-9d93-094fe819853e" chunkPositionInArray="[12,90,0]" nBytes="204336" md5="df727f4b1fcfdefa304fc3130cc23a23"/>
+      <h4:byteStream offset="196520005" uuid="6ec059ea-d713-4064-a196-6c025f740bb0" chunkPositionInArray="[12,90,180]" nBytes="199442" md5="d6f9a8e0378ddbdc95cd17461c17772b"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotO3_TqJ_D_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="300999657" uuid="e8f98533-10a3-4589-9ee2-5ba4b2af65bc" chunkPositionInArray="[0,0]" nBytes="76526" md5="9bf4e9bbab247c95c0ae2e67942f9727"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="SurfAirTemp_TqJ_D_err">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="265580388" uuid="192f8bc0-8e13-4fd1-86bc-946b6eda6e5a" chunkPositionInArray="[0,0]" nBytes="76524" md5="bdc40775df4f1f8622d2b47a57dcfeeb"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="GPHeight_MW_D_min">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="68774968" uuid="2f65d97c-076d-4661-ab44-42b25df8011f" chunkPositionInArray="[0,0,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="68778389" uuid="1f90c866-ea90-4177-bf1a-6524f113af18" chunkPositionInArray="[0,0,180]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="68781810" uuid="46de7324-7331-49b0-b98c-3f58f199ddc9" chunkPositionInArray="[0,90,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="321117823" uuid="f1298903-ce29-4ade-90bb-e02ed5b3f868" chunkPositionInArray="[0,90,180]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="321121244" uuid="1d9c378b-1ddd-4b53-9ce1-9facaa1e55c1" chunkPositionInArray="[12,0,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="321124665" uuid="1fefe1e5-d439-4e31-beb5-1af08c61e7d7" chunkPositionInArray="[12,0,180]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="321128086" uuid="de0f02f5-38ee-46da-b9e3-86a5806bbb69" chunkPositionInArray="[12,90,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="321131507" uuid="4837fc11-ccf9-41cf-accb-44cfdb2bf6c7" chunkPositionInArray="[12,90,180]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CO_VMR_D_sdev">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="29124225" uuid="abdcdb2d-f4ae-4784-beec-18e93cb51990" chunkPositionInArray="[0,0,0]" nBytes="241983" md5="7031065afb69cb83bb3768d2f4e81b83"/>
+      <h4:byteStream offset="29366208" uuid="3732ccc3-c00c-4a3d-936a-dcecebda43ac" chunkPositionInArray="[0,0,180]" nBytes="237580" md5="0f5411565ce8e50ea80e7dca749be90a"/>
+      <h4:byteStream offset="29603788" uuid="74f98e55-93b7-4757-8878-8a393074624e" chunkPositionInArray="[0,90,0]" nBytes="223802" md5="7c84ee7cc2696d014af3ab2873611283"/>
+      <h4:byteStream offset="183193677" uuid="6824f2be-51df-4302-9a4a-29800d2b1fa8" chunkPositionInArray="[0,90,180]" nBytes="200470" md5="0586ae0d8ff01733293289dbddfd81c0"/>
+      <h4:byteStream offset="183394147" uuid="6679a75d-a9fd-4aa4-8ed0-31f8b7136d05" chunkPositionInArray="[12,0,0]" nBytes="245867" md5="d5b0b82868ccdbbe7f0b4f70fdefd868"/>
+      <h4:byteStream offset="183640014" uuid="df0aebca-d8a5-4d6c-9b5c-caa0f3b3e8a8" chunkPositionInArray="[12,0,180]" nBytes="245191" md5="1df487f2edc43bc9729d23b61af65306"/>
+      <h4:byteStream offset="183885205" uuid="f36c6828-21d6-456d-af83-ab3ad7dd4483" chunkPositionInArray="[12,90,0]" nBytes="230609" md5="fbea6b602f3594cff17273d25283a3e8"/>
+      <h4:byteStream offset="184115814" uuid="a44baf3d-339e-498f-8d23-57ffbecf190b" chunkPositionInArray="[12,90,180]" nBytes="209939" md5="717b6d09799c6ef1eb0bea7e618cf1cf"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="RelHum_TqJ_A_max">
+    <Dim name="/H2OPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>5</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="217798996" uuid="0511f575-649b-498d-b045-4f38146948cf" chunkPositionInArray="[0,0,0]" nBytes="792756" md5="821143751699551fe4519030b032fcef"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="RelHumSurf_liquid_TqJ_D_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="286165609" uuid="abb75fc3-010e-4670-a8f2-4f0131f1b188" chunkPositionInArray="[0,0]" nBytes="35249" md5="45329ccd6405cc9ce2bc324e871b36b2"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="H2O_MMR_TqJ_A_sdev">
+    <Dim name="/H2OPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>5</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="210412944" uuid="19350663-3582-4cea-86a3-d6ab96a43e95" chunkPositionInArray="[0,0,0]" nBytes="931851" md5="3b1d1358ac33e49ac5bab32a80eb091d"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CH4_VMR_TqJ_D_sdev">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="66263630" uuid="2726de07-7f17-4f3c-aa6f-e3dd16a23e68" chunkPositionInArray="[0,0,0]" nBytes="223944" md5="0a8541ad94f875e23094c72fc4769a4a"/>
+      <h4:byteStream offset="66487574" uuid="e5e8ef26-0b42-405c-aa27-11511f5f376a" chunkPositionInArray="[0,0,180]" nBytes="216462" md5="77ac59d3225fad24097a3108d26e8de1"/>
+      <h4:byteStream offset="66704036" uuid="4aca831f-01e0-4959-9334-0628470f51fb" chunkPositionInArray="[0,90,0]" nBytes="219462" md5="359a017e73bc1c188bf0c2fe787f2a2b"/>
+      <h4:byteStream offset="316243190" uuid="ef0398bb-bcc5-4ee4-b603-476ba6b3b6de" chunkPositionInArray="[0,90,180]" nBytes="203428" md5="7fe81ed4e48e710e5ca647688c99a35c"/>
+      <h4:byteStream offset="316446618" uuid="42b042ff-7527-41dd-97ad-94d3e97a3e15" chunkPositionInArray="[12,0,0]" nBytes="227897" md5="06471b1b1609e378869650973ef01485"/>
+      <h4:byteStream offset="316674515" uuid="3bbaaf50-0514-4a06-9f16-267b22282b2d" chunkPositionInArray="[12,0,180]" nBytes="220197" md5="be93f6a8106cac861c5ef20f0194513b"/>
+      <h4:byteStream offset="316894712" uuid="cc990fcf-7edd-4cc1-928f-6e454d2ad627" chunkPositionInArray="[12,90,0]" nBytes="228427" md5="813990ecb9348d4d2c1531b4bc08706b"/>
+      <h4:byteStream offset="317123139" uuid="ac27d713-e384-40c1-8d26-8ad02669d99d" chunkPositionInArray="[12,90,180]" nBytes="221518" md5="cd222c1d2d300f80b5deeabfeb1b50e4"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="O3_VMR_D_err">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="27854167" uuid="0a33bee8-9ff2-4115-85b4-3450ab5393ef" chunkPositionInArray="[0,0,0]" nBytes="178744" md5="4320bc1cdc5c4106844c6606dbae31ba"/>
+      <h4:byteStream offset="28032911" uuid="9827a7b3-99d4-447c-91f8-cd7afc48b8a7" chunkPositionInArray="[0,0,180]" nBytes="184072" md5="0a7be6a7c5eac030ecf402a69c5e493c"/>
+      <h4:byteStream offset="28216983" uuid="122dbed3-73e0-44ce-9f2f-d97f66483755" chunkPositionInArray="[0,90,0]" nBytes="176022" md5="1fb19e79738ea2f8950fbd771fd77d8a"/>
+      <h4:byteStream offset="180053823" uuid="9c40d282-b367-4020-aa8c-07cc0493892d" chunkPositionInArray="[0,90,180]" nBytes="170397" md5="59ea96c04836846976ae44d7df0819dc"/>
+      <h4:byteStream offset="180224220" uuid="78baab64-7b95-432b-83c1-5d686bb5f41d" chunkPositionInArray="[12,0,0]" nBytes="173680" md5="21bc6a8b4e89a7a1c8b841a6daf61ad3"/>
+      <h4:byteStream offset="180397900" uuid="b88f76f0-7274-4eb0-bd59-c4d8eac35396" chunkPositionInArray="[12,0,180]" nBytes="178817" md5="5527bb2b7aae163839fe80bc49498e79"/>
+      <h4:byteStream offset="180576717" uuid="3455014e-d2e3-4ef7-be6f-ef937933aedc" chunkPositionInArray="[12,90,0]" nBytes="185595" md5="260bf0ca302c36c30878283abe4d49ea"/>
+      <h4:byteStream offset="180762312" uuid="095f9d9b-f076-4f66-b0af-c92200c357de" chunkPositionInArray="[12,90,180]" nBytes="181371" md5="4e550fa6fa0ae6072efc02155009cd08"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotO3_A_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="111634230" uuid="88c8d2b4-fea4-45dd-9cc0-2265787dc967" chunkPositionInArray="[0,0]" nBytes="83868" md5="3e98d3402314d2c3c31d4b6b7e93f5c1"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="OLR_TqJ_A_err">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="257087045" uuid="1830508a-319c-4d1f-a95a-c71c06a79d4c" chunkPositionInArray="[0,0]" nBytes="13930" md5="eab84b1f331ca069b472f195da4dfe5e"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="EmisFreqMW">
+    <Dim name="/EmisFreqMW"/>
+    <Attribute name="CLASS" type="String">
+      <Value>DIMENSION_SCALE</Value>
+    </Attribute>
+    <Attribute name="NAME" type="String">
+      <Value>EmisFreqMW</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>2</Value>
+    </Attribute>
+    <Attribute name="long_name" type="String">
+      <Value>Frequency</Value>
+    </Attribute>
+    <Attribute name="units" type="String">
+      <Value>GHz</Value>
+    </Attribute>
+    <Attribute name="format" type="String">
+      <Value>F5.1</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3</h4:chunkDimensionSizes>
+      <h4:byteStream offset="320933680" uuid="ffbf67fa-cf7a-4fa3-b802-943428d9337c" chunkPositionInArray="[0]" nBytes="20" md5="6c9db2946c92fcf6e0d9f8c3bb49d1ff"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CloudFrc_TqJ_D">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="293918462" uuid="9dc1f898-ad76-46d8-84f6-9e62521dd183" chunkPositionInArray="[0,0]" nBytes="82518" md5="0e8e8d08b1f92e3e18b895061ebbef6f"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="SurfAirTemp_A_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="76579146" uuid="aa3e6e60-93f1-4f18-a372-a29627212f38" chunkPositionInArray="[0,0]" nBytes="38097" md5="7ecb5454a268cdff2fbe0fe8ea8b6d10"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="CoarseCloudFrc_TqJ_A_sdev">
+    <Dim name="/CoarseCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>0</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="234901686" uuid="4cbcf482-c03f-4626-ae57-4f269c8b31c1" chunkPositionInArray="[0,0,0]" nBytes="232972" md5="fbc8a3b0905d1993c95ae5b3e0180e95"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="RelHumSurf_TqJ_D">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="282018752" uuid="b79345e4-e44e-4fc0-93fb-32a1072639e6" chunkPositionInArray="[0,0]" nBytes="59728" md5="3c74d0b3a3c41135b1e045ee15ac2a62"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotCH4_TqJ_A_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="250963950" uuid="3e818952-2c1f-4f39-9bda-5cb9d950dc4f" chunkPositionInArray="[0,0]" nBytes="76105" md5="44ff69300a70de1974155e6e1fe7d7ac"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CO_VMR_TqJ_A_sdev">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="46039279" uuid="54578812-b76a-4c53-b576-7ecca7571b65" chunkPositionInArray="[0,0,0]" nBytes="241697" md5="0acf0b99e7848a735d67e25e4c6696e9"/>
+      <h4:byteStream offset="46280976" uuid="38968900-d29c-47e9-bd82-cbc37cd65b6a" chunkPositionInArray="[0,0,180]" nBytes="238944" md5="730721875115aff11e4a6b456b74e66a"/>
+      <h4:byteStream offset="46519920" uuid="0689ea9b-9e0c-49f8-a265-1c2cab87ce2b" chunkPositionInArray="[0,90,0]" nBytes="219637" md5="0124834b21f728bd289db1a375157ec7"/>
+      <h4:byteStream offset="246728988" uuid="34dd3d88-f709-41eb-b047-c72047ec30a6" chunkPositionInArray="[0,90,180]" nBytes="200323" md5="1486393ed7208e295f19a184e60bbfdd"/>
+      <h4:byteStream offset="246929311" uuid="8689098c-f9a7-459a-8f4b-4331833a5e03" chunkPositionInArray="[12,0,0]" nBytes="245417" md5="ad2e72c35b240667bbb4ebd2fcf8d1c2"/>
+      <h4:byteStream offset="247174728" uuid="5dd83e29-cd4c-41e7-a18f-6518ba831405" chunkPositionInArray="[12,0,180]" nBytes="246910" md5="eb0dd430759a8b6b5895b08d61d1fc7f"/>
+      <h4:byteStream offset="247421638" uuid="5f1982f7-e72e-46ad-ae67-9416943f4ef9" chunkPositionInArray="[12,90,0]" nBytes="226819" md5="8a790dd23c4b868d5fac21b15902a54f"/>
+      <h4:byteStream offset="247648457" uuid="0358938c-6c4d-4282-ae38-8b50aa3a71cd" chunkPositionInArray="[12,90,180]" nBytes="208849" md5="e2fe51b6196c53067d39e32d123af7c5"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="H2O_MMR_Surf_A_err">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="89320962" uuid="929b00e1-3633-4989-85c1-f1446fe634cf" chunkPositionInArray="[0,0]" nBytes="71505" md5="d3100e0cd7fe409b07a0584dda6ebab2"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="RelHumSurf_TqJ_A_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="218833202" uuid="0adffaec-e00f-4ae1-a7f9-97c55bf4625e" chunkPositionInArray="[0,0]" nBytes="59140" md5="332515c0e13e4cf9082133d8926077d3"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotCH4_D_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="187419892" uuid="bd7e7308-c665-4bae-9fb5-b5e6c03f22a4" chunkPositionInArray="[0,0]" nBytes="76785" md5="d5448200e409eb740d4ff5cc2f5855de"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotH2OVap_TqJ_A_err">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="203283446" uuid="0500e4f3-cf4b-4885-88a5-37b67d2f9849" chunkPositionInArray="[0,0]" nBytes="76914" md5="2b6f0d135e3c94ac42d5fc854416206a"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="GPHeight_TqJ_D_min">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="56234425" uuid="db20cb61-36c1-4cfa-853e-931da33da8df" chunkPositionInArray="[0,0,0]" nBytes="416034" md5="957cc1e817b1ae7eb53b9819e3b61578"/>
+      <h4:byteStream offset="56650459" uuid="f4739723-42ad-4dc4-a651-8fd6c021f8ac" chunkPositionInArray="[0,0,180]" nBytes="410199" md5="fc8e72f4a5d5b402b5e25ea18f7394a1"/>
+      <h4:byteStream offset="57060658" uuid="c3fad912-3e90-48b4-9695-69e24d0f724e" chunkPositionInArray="[0,90,0]" nBytes="412756" md5="7b9fe3b7e882cbcb6919fb02067f42bf"/>
+      <h4:byteStream offset="290054078" uuid="e6d860bc-8018-47a1-b9ae-008e4889faf9" chunkPositionInArray="[0,90,180]" nBytes="386844" md5="2a04749a8d2faf3e80a98e42fec890fb"/>
+      <h4:byteStream offset="290440922" uuid="3a1138c3-d621-476b-bc2a-4c621bc1d4ba" chunkPositionInArray="[12,0,0]" nBytes="378415" md5="8e112ccdd4e34fad773d3137d37ab108"/>
+      <h4:byteStream offset="290819337" uuid="d2ac5cfe-9872-4344-920a-966d1d4c1d32" chunkPositionInArray="[12,0,180]" nBytes="378230" md5="c95de937679c4120a54fd193c1fe2e74"/>
+      <h4:byteStream offset="291197567" uuid="b9bef9ca-8ba2-42b4-bded-f702d7bf361b" chunkPositionInArray="[12,90,0]" nBytes="395409" md5="90b921372126d72bfe15b2129eb76459"/>
+      <h4:byteStream offset="291592976" uuid="ac7f3d36-9f37-4f16-a743-307e4adacf67" chunkPositionInArray="[12,90,180]" nBytes="388549" md5="a4a6490af8e6ab8b896cf214aa248998"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="SurfSkinTemp_A_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="69296139" uuid="51ea10ac-cd68-49c8-ba45-63b8efffd758" chunkPositionInArray="[0,0]" nBytes="80665" md5="d5ba17a5b8c4b46596a54618547f036b"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CO_VMR_D">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="28409221" uuid="117c0e83-43aa-4393-ad19-a2943a1e27e7" chunkPositionInArray="[0,0,0]" nBytes="237766" md5="371bfe1aa895c1e7594faa20a6d53316"/>
+      <h4:byteStream offset="28646987" uuid="a0d418aa-76bc-4207-8f6b-f406d553c4ba" chunkPositionInArray="[0,0,180]" nBytes="241278" md5="864c229e575791d0781f413bb9d64b08"/>
+      <h4:byteStream offset="28888265" uuid="deec2075-ec83-478d-a893-a9bdf77fab39" chunkPositionInArray="[0,90,0]" nBytes="229688" md5="df19cc9cf44804b2228facec8cca1a7d"/>
+      <h4:byteStream offset="181293780" uuid="043e39e3-d1aa-45aa-aff3-fbe311386493" chunkPositionInArray="[0,90,180]" nBytes="215787" md5="631c096f3b7ec69c8a625c4a7edefd5f"/>
+      <h4:byteStream offset="181509567" uuid="115c591d-7aa6-434e-b0e3-b8b216838219" chunkPositionInArray="[12,0,0]" nBytes="206510" md5="72701845ff78eb9f314d11f72346c583"/>
+      <h4:byteStream offset="181716077" uuid="da668ff6-4c11-47df-93ca-d14ec5eb506b" chunkPositionInArray="[12,0,180]" nBytes="213002" md5="7954cb292a6ceb595fd966d9adff4b8a"/>
+      <h4:byteStream offset="181929079" uuid="06e317ea-a03b-4e23-9793-1f5377b25610" chunkPositionInArray="[12,90,0]" nBytes="209875" md5="ef02a05669ab10ba820b5932bc86bc00"/>
+      <h4:byteStream offset="182138954" uuid="a03006fa-8dc6-43f8-91a2-474571b76c36" chunkPositionInArray="[12,90,180]" nBytes="200682" md5="6f43100f654b683ab24a8d15666008a9"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CloudTopTemp_TqJ_D">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="294748979" uuid="cc4f0879-01d5-47d9-ba04-ac0b24ef76e3" chunkPositionInArray="[0,0]" nBytes="90058" md5="679c329ad9bdd2a76277dcc9bb9e8942"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotO3_TqJ_A_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="237511521" uuid="582d0a52-2f19-4dc4-b6f4-45d93e17724b" chunkPositionInArray="[0,0]" nBytes="83867" md5="b381d84f3c92c3bc505a7357a68d32ea"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CoarseCloudFrc_TqJ_D_min">
+    <Dim name="/CoarseCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>0</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="298490899" uuid="56f93ab5-2fd6-489a-865e-0bd8a8c1b1f9" chunkPositionInArray="[0,0,0]" nBytes="88932" md5="3dcad3781b2b6d3707949cc04228b404"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TropPres_TqJ_D">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="265656912" uuid="ad5b7e33-805e-40f5-93f8-68feaf2a497c" chunkPositionInArray="[0,0]" nBytes="82465" md5="fb0cd451646f120c7e703fad20c12cd5"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="RelHum_TqJ_A_ct">
+    <Dim name="/H2OPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>5</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="215620861" uuid="585c4156-6e56-43de-96c4-4dcf3452f909" chunkPositionInArray="[0,0,0]" nBytes="434058" md5="5fa36a186eae401088cafc7140cb701b"/>
+    </h4:chunks>
+  </Int16>
+  <Int16 name="Temperature_MW_D_ct">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>24 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="320999893" uuid="0168eb43-fd86-4dc2-b6c6-74327ebb4e8f" chunkPositionInArray="[0,0,0]" nBytes="13586" md5="7c90147b4fcb72404dd36c4b0d82051d"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="Temperature_D_err">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="20254528" uuid="69f492b6-58f4-4715-867b-05cc0a0a2c2a" chunkPositionInArray="[0,0,0]" nBytes="216196" md5="55241e1e84d223f9f2f3b6d437ce7548"/>
+      <h4:byteStream offset="20470724" uuid="36f9a4e8-5f96-4df8-a1c6-e5d281e56a3c" chunkPositionInArray="[0,0,180]" nBytes="213003" md5="2ed779fcc92e86588df721221b1946a7"/>
+      <h4:byteStream offset="20683727" uuid="fa0f4813-febf-467c-bba7-e4a5a6c5ca74" chunkPositionInArray="[0,90,0]" nBytes="203216" md5="d14f23546e2b610188b512497ba93e3d"/>
+      <h4:byteStream offset="138025856" uuid="de4fb130-0e3d-4f2b-a7ff-6bcbaad75fc3" chunkPositionInArray="[0,90,180]" nBytes="200515" md5="5a581b12ecbcf2dfb63c880099f09cdf"/>
+      <h4:byteStream offset="138226371" uuid="b399019b-686d-4e1e-bb8a-742886e03c42" chunkPositionInArray="[12,0,0]" nBytes="215179" md5="73468ba013a088f9272eb04b97d704f6"/>
+      <h4:byteStream offset="138441550" uuid="84dab698-0f4a-4e9d-a439-15980db015ce" chunkPositionInArray="[12,0,180]" nBytes="215524" md5="c88188ba333f66b4a9f6b5f794a817b5"/>
+      <h4:byteStream offset="138657074" uuid="a1c5fab4-5c59-4f79-91ec-58c709ebccb7" chunkPositionInArray="[12,90,0]" nBytes="211025" md5="f96464610c191ffdde49e3a30c61b62e"/>
+      <h4:byteStream offset="138868099" uuid="c4aa02c4-22c4-4a8c-ba5e-c318d64ed67f" chunkPositionInArray="[12,90,180]" nBytes="214114" md5="942c1338f85f7f9a70e31e5d48e96323"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotH2OVap_D">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="140159234" uuid="78079ced-e42d-4676-b19e-98a3ecfb4828" chunkPositionInArray="[0,0]" nBytes="99602" md5="d3fb0731d81edab08ec573d34c842238"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="H2O_MMR_D_sdev">
+    <Dim name="/H2OPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>5</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="147603059" uuid="0435c28c-1db5-4e3c-8a3f-4ac92183d634" chunkPositionInArray="[0,0,0]" nBytes="911160" md5="3f0c7dead7c56df7dc1866f624292f70"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CoarseCloudPres_TqJ_A_sdev">
+    <Dim name="/CoarseCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>0</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="235740642" uuid="78bcbc76-2ded-45ee-b010-8810d3aa86ef" chunkPositionInArray="[0,0,0]" nBytes="220452" md5="b1fad963f270e9c259e21c9986640875"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CoarseCloudPres_A_min">
+    <Dim name="/CoarseCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>0</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="110059753" uuid="af0aa643-2e1a-43cd-87cb-f5f70d755c9f" chunkPositionInArray="[0,0,0]" nBytes="196260" md5="f1a6561dbffed6799a485725f3f58ffe"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="EmisIR_D_max">
+    <Dim name="/EmisFreqIR"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>1</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>4 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="133001372" uuid="b184588c-d700-44a9-82cf-f8f1f398e94f" chunkPositionInArray="[0,0,0]" nBytes="159646" md5="334c2e312aaa459f360f8c0af97c4958"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TropPres_A_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="77189339" uuid="eff8d31f-94d1-460c-9bac-e6cfc1c7f63c" chunkPositionInArray="[0,0]" nBytes="75796" md5="c730bf6c5560ee224d64e4d130338bb3"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="Temperature_MW_D_min">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="68705156" uuid="5a8782c8-91f2-447e-ab0d-76565eb607e0" chunkPositionInArray="[0,0,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="68708577" uuid="a0a4611a-c12b-4fc0-89a1-eb78ffa83607" chunkPositionInArray="[0,0,180]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="68711998" uuid="dde00685-1bc3-45d1-9d05-215baec03468" chunkPositionInArray="[0,90,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="321030584" uuid="f562f58e-91a9-42a7-8449-3ed3eea221a4" chunkPositionInArray="[0,90,180]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="321034005" uuid="85933a92-d5ef-4b6a-b6b0-c9a0ba2d28ea" chunkPositionInArray="[12,0,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="321037426" uuid="8acd9663-95b1-41be-87f5-106410e4a97e" chunkPositionInArray="[12,0,180]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="321040847" uuid="befd2d25-a244-4e23-99b2-d6990d55bda8" chunkPositionInArray="[12,90,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="321044268" uuid="33505dcc-c435-49d5-89a5-4e7aea8f92cc" chunkPositionInArray="[12,90,180]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="RelHum_D_max">
+    <Dim name="/H2OPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>5</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="154846603" uuid="159c9032-2a99-4903-9402-b80901c63eaa" chunkPositionInArray="[0,0,0]" nBytes="778970" md5="91dbc2722e8d61a0e9e69dc29c8cd101"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="TotalCounts_MW_D">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="320933700" uuid="93f272b2-5c00-4289-a9ac-e1cd563e9ba2" chunkPositionInArray="[0,0]" nBytes="33687" md5="ea01f2d2ab6f1e6d2ce43cda27b4e16c"/>
+    </h4:chunks>
+  </Int16>
+  <Int16 name="CH4_VMR_TqJ_A_ct">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>24 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="252117817" uuid="4c4b9a6a-c072-475b-b7fb-0bea23e4a296" chunkPositionInArray="[0,0,0]" nBytes="860389" md5="63845ae9ebe30d402dad2702ccda46fe"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="OLR_D_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="193353033" uuid="fe246c4c-116d-41ab-9d5d-9e2e92f9ac84" chunkPositionInArray="[0,0]" nBytes="81456" md5="eb369deeaed87c53315ad0e63d8a079d"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CoarseCloudPres_D_sdev">
+    <Dim name="/CoarseCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>0</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="172235212" uuid="09f58574-1910-43b7-a84d-def6365eeff7" chunkPositionInArray="[0,0,0]" nBytes="223511" md5="97cd249826f7c7a9ff3c4fa342565893"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="RelHum_liquid_D_max">
+    <Dim name="/H2OPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>5</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="158845176" uuid="b9a67d70-868f-403b-a559-c3ad6436dfad" chunkPositionInArray="[0,0,0]" nBytes="778658" md5="30a2a0cefab6417128399bcd905785a6"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CH4_VMR_TqJ_A">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="48755790" uuid="b84d024b-ea89-40a4-9527-409ca220cfc4" chunkPositionInArray="[0,0,0]" nBytes="193484" md5="1bed815a1d62a0ed3114cf146f811684"/>
+      <h4:byteStream offset="48949274" uuid="91b28b3d-5ee3-492e-a41c-7ad1258a059c" chunkPositionInArray="[0,0,180]" nBytes="192218" md5="b9866c5bdae5422f21e3e52755b48b2a"/>
+      <h4:byteStream offset="49141492" uuid="ad378764-0ef2-4a9f-94d1-bd1c29390673" chunkPositionInArray="[0,90,0]" nBytes="190868" md5="eb4d579c1ca45cf1d658d56ca633c568"/>
+      <h4:byteStream offset="251176526" uuid="9947a79a-7b8c-42bb-a219-a5a9bea8e39f" chunkPositionInArray="[0,90,180]" nBytes="179407" md5="9773c246d3ad454046ed38b6197c994a"/>
+      <h4:byteStream offset="251355933" uuid="b8f28f63-95eb-4b30-8557-1a99385672f6" chunkPositionInArray="[12,0,0]" nBytes="187364" md5="992424de7dfbd084458b7ed60b81f73a"/>
+      <h4:byteStream offset="251543297" uuid="28a8355f-d08c-46e7-94ce-f9802adb0fae" chunkPositionInArray="[12,0,180]" nBytes="188189" md5="77612222452163aead802c857dca04ff"/>
+      <h4:byteStream offset="251731486" uuid="90dc6361-59f7-4dc0-b84b-f6bb96a64da4" chunkPositionInArray="[12,90,0]" nBytes="197679" md5="68a0763660bbeb161ba2b3d7df37a150"/>
+      <h4:byteStream offset="251929165" uuid="4c0d0b7b-657d-4967-8da1-81b2b7915537" chunkPositionInArray="[12,90,180]" nBytes="188652" md5="53c5dc77ec688aef9553b60df561dbfd"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="SurfAirTemp_A_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="76617243" uuid="8b203b1b-573f-48e2-bd7c-e1d2b5d1b094" chunkPositionInArray="[0,0]" nBytes="83679" md5="fe286b47bd9f9465ae89f35759e5233b"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="RelHumSurf_D_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="155685301" uuid="7e655a18-f052-429d-b9ce-16590781ef49" chunkPositionInArray="[0,0]" nBytes="35249" md5="45329ccd6405cc9ce2bc324e871b36b2"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="CO_VMR_D_min">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="29830726" uuid="73c585e3-deb9-4585-b645-25ca3bd1b6fa" chunkPositionInArray="[0,0,0]" nBytes="228349" md5="73977c058db45bd465d4b241ca52f74e"/>
+      <h4:byteStream offset="30059075" uuid="b9df507f-ffa4-48e5-aa32-3f1e3c205aaf" chunkPositionInArray="[0,0,180]" nBytes="230586" md5="1daba58b9ebb0d6ef1000f0866574de0"/>
+      <h4:byteStream offset="30289661" uuid="2b93393c-15d5-4d64-a0e0-e99db3575eef" chunkPositionInArray="[0,90,0]" nBytes="221880" md5="f18ac48dbda70ad30c726fe6fb4d1d8c"/>
+      <h4:byteStream offset="184325753" uuid="1e103393-68bf-474e-be10-d5dd753932d1" chunkPositionInArray="[0,90,180]" nBytes="208291" md5="59e5b6c78ddd9bcc5a32cfd1e4f9e199"/>
+      <h4:byteStream offset="184534044" uuid="643a14dc-1cfc-4ae9-ac72-d5250e0434df" chunkPositionInArray="[12,0,0]" nBytes="203621" md5="a88db504f6b2abb2e75f6cc667d6d0f0"/>
+      <h4:byteStream offset="184737665" uuid="61a6f06a-e6e0-46d6-a406-1860f5108087" chunkPositionInArray="[12,0,180]" nBytes="208257" md5="1212b6c0b23dfcf54903913dbe3c32b9"/>
+      <h4:byteStream offset="184945922" uuid="2c7d8cf3-9433-42a9-93ed-101e460b5990" chunkPositionInArray="[12,90,0]" nBytes="204115" md5="0361f9560aae7a4c4cf28f06147e297c"/>
+      <h4:byteStream offset="185150037" uuid="7a8c7c62-ecea-498c-abb9-cd94b5354be5" chunkPositionInArray="[12,90,180]" nBytes="194911" md5="ed076f82078a65291b8844277ce02203"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotO3_TqJ_A_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="237595388" uuid="11e66ccd-7ba8-4b11-893b-988575ee336c" chunkPositionInArray="[0,0]" nBytes="77485" md5="80655bef6db87cb3a653580dabf63779"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="RelHumSurf_liquid_D_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="159719432" uuid="e9b2971e-c8b7-4cdd-a446-3b6ac726ac78" chunkPositionInArray="[0,0]" nBytes="75694" md5="7862aa30d644fa48e4c12b055b3584ad"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="SurfAirTemp_A_err">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="76838865" uuid="98ef4e89-cf3d-4c6b-9ad2-0d35fcabdd92" chunkPositionInArray="[0,0]" nBytes="76368" md5="c56c299c6e81ac894239b0d3b4d4384d"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CloudFrc_TqJ_A_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="230816460" uuid="8a80ea35-d593-4ee0-a6c9-d49b847ea809" chunkPositionInArray="[0,0]" nBytes="59921" md5="eb258382e773a2ade73acd488b0a5e9a"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="OLR_TqJ_D_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="320094653" uuid="435a07bd-97a7-40d2-a552-d523d5380104" chunkPositionInArray="[0,0]" nBytes="84865" md5="5259fdb79924ee40c23f3a1e1e8255bb"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="OLR_D_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="193271859" uuid="ef62e74d-0386-4ae9-866e-9a1e12adc27b" chunkPositionInArray="[0,0]" nBytes="81174" md5="ea3882245423f9270953cd1fec024d57"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="SurfPres_Forecast_TqJ_A_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="194001809" uuid="5476be58-071b-48e5-994c-07579b94d2e8" chunkPositionInArray="[0,0]" nBytes="84951" md5="7f0bd487e67b397c5a3afdb12e2394f6"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotH2OVap_A_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="77808197" uuid="aed06592-845d-46c9-9af7-aff11cd37ebb" chunkPositionInArray="[0,0]" nBytes="96615" md5="31d2d2dac37117c236311a2a1e137790"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotH2OVap_MW_D_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="321067705" uuid="95f40eac-497a-4e49-9614-faa3b8ccc676" chunkPositionInArray="[0,0]" nBytes="1161" md5="a43f0ca2084e297f3aa9763a828dcb0f"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="SurfAirTemp_D">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="139082213" uuid="0d569bb0-5a37-4374-a72d-7937a877473a" chunkPositionInArray="[0,0]" nBytes="70277" md5="6eb07e2abfda784c3ca723f65a3f47a9"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CoarseCloudFrc_A">
+    <Dim name="/CoarseCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>0</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="108693349" uuid="e9da9d78-5e66-4eee-808d-d79d83092b67" chunkPositionInArray="[0,0,0]" nBytes="236485" md5="c5ca67bca72c5c8ad80cd893e1a90791"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CoarseCloudPres_A_max">
+    <Dim name="/CoarseCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>0</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="110256013" uuid="63340c45-3b50-4b3a-b38d-858d114da492" chunkPositionInArray="[0,0,0]" nBytes="187549" md5="3e0062d6d1297454ecbb2f1b41b67c04"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="CloudTopPres_TqJ_D_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="294398037" uuid="83505437-fc26-4730-83f5-2b24d924b710" chunkPositionInArray="[0,0]" nBytes="40325" md5="e6d40dbd03652cd0e3708d7df9a9e851"/>
+    </h4:chunks>
+  </Int16>
+  <Int16 name="RelHum_liquid_D_ct">
+    <Dim name="/H2OPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>5</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="156724529" uuid="a4c171b7-2094-489f-b54d-e5ca87cef77e" chunkPositionInArray="[0,0,0]" nBytes="414055" md5="3d5b5000158635d0c7d4c10796118926"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="OLR_TqJ_D_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="320260583" uuid="3146200f-8c73-44d3-8b07-642a605f6285" chunkPositionInArray="[0,0]" nBytes="77601" md5="415112cf6e5adfbde4ab5f3d191cc7ef"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="H2O_MMR_Surf_TqJ_A_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="214467048" uuid="3e9518d2-d19d-4e8e-a4b5-f830617468b7" chunkPositionInArray="[0,0]" nBytes="78067" md5="9e2f621d970fb39d48ac1112b52859f3"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotCldLiqH2O_MW_A">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="320927286" uuid="0b82d1b9-06c1-4ec2-9229-d9244e67f70a" chunkPositionInArray="[0,0]" nBytes="1161" md5="a43f0ca2084e297f3aa9763a828dcb0f"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotH2OVap_D_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="140297202" uuid="6b860b42-2292-49c9-8bc8-e4a7ffa87c6e" chunkPositionInArray="[0,0]" nBytes="83997" md5="7bdcbbf6945c2213a62c769a873c39c5"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="CloudTopTemp_A_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="105875807" uuid="223e30ef-9044-47b3-990f-b3894c254371" chunkPositionInArray="[0,0]" nBytes="39089" md5="2d8e4b22c3e783c0f7356aa3e7242c70"/>
+    </h4:chunks>
+  </Int16>
+  <Int16 name="CO_VMR_A_ct">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>24 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="120008308" uuid="2b8da8a2-1313-4a6a-89c3-990d6fc3d5a5" chunkPositionInArray="[0,0,0]" nBytes="843402" md5="3686721316c1486d3cb9170ec0ca90eb"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="FineCloudFrc_TqJ_A_min">
+    <Dim name="/FineCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>3</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="233700163" uuid="52949353-a6fc-4e12-9dfc-5766f9cd3725" chunkPositionInArray="[0,0,0]" nBytes="184336" md5="6288981ccd872d451acd35db5729d103"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="Temperature_TqJ_A_err">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="37146246" uuid="1b4e834b-284e-413b-a4cf-cb27dba42574" chunkPositionInArray="[0,0,0]" nBytes="214597" md5="787c60cd586b853be49fa2caa2c7621c"/>
+      <h4:byteStream offset="37360843" uuid="a16661cc-81c4-4d37-bf61-7e64cb989ad0" chunkPositionInArray="[0,0,180]" nBytes="213427" md5="3ad1a4ecb815f8b91f9efb1e64b1aee5"/>
+      <h4:byteStream offset="37574270" uuid="dc41f1a0-a221-440e-b10b-4cde2b4ab826" chunkPositionInArray="[0,90,0]" nBytes="207246" md5="5cd1d27bad669623d12b8fc67357e19b"/>
+      <h4:byteStream offset="200692666" uuid="f390fe7d-d26f-4907-8575-4589682f9836" chunkPositionInArray="[0,90,180]" nBytes="201333" md5="95f518a773997215dcc9104b6acb11cb"/>
+      <h4:byteStream offset="200893999" uuid="66224f99-8a17-4c0e-9ac9-ea7457f4cb95" chunkPositionInArray="[12,0,0]" nBytes="216342" md5="efab4c73cf8134fbd543335072e79da4"/>
+      <h4:byteStream offset="201110341" uuid="e7f6b7a8-6aea-4123-b30d-0f57106fc71d" chunkPositionInArray="[12,0,180]" nBytes="218330" md5="10ec88b9632b3e6ca1b988b07691840c"/>
+      <h4:byteStream offset="201328671" uuid="de2e255e-a257-4d09-a383-8de0c2ce0ec4" chunkPositionInArray="[12,90,0]" nBytes="218872" md5="139520bfe5a730c914d8e310608a6210"/>
+      <h4:byteStream offset="201547543" uuid="cf9f1d6e-f25e-4d13-950c-666439bdcc25" chunkPositionInArray="[12,90,180]" nBytes="219578" md5="42e9815943d54c301fc105b802967090"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="OLR_TqJ_A_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="256925900" uuid="eb1f21f8-680c-4405-939a-6071718a1d1d" chunkPositionInArray="[0,0]" nBytes="82471" md5="7b7d078c1eb0f96be0da78fce778ff5d"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="CH4_VMR_D_ct">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>24 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="188564055" uuid="226d5670-ca39-4dfa-82cb-e4e4f2587ba7" chunkPositionInArray="[0,0,0]" nBytes="862296" md5="f4cc53196066e070a64f14a3c5775f8b"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="RelHum_liquid_A">
+    <Dim name="/H2OPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>5</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="93410763" uuid="c6585ff7-0222-461d-a578-9459c07d82fb" chunkPositionInArray="[0,0,0]" nBytes="815739" md5="e00d98a75fc7ed887b7c4022501b89b8"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="O3_VMR_A_err">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="10940309" uuid="17272235-e801-4d91-825d-56fb343c238b" chunkPositionInArray="[0,0,0]" nBytes="178572" md5="b48eb9033c9e6e0a530a09a60f40cc8c"/>
+      <h4:byteStream offset="11118881" uuid="a46fa18b-1b11-4f5e-ab33-6fb8fbd95c83" chunkPositionInArray="[0,0,180]" nBytes="183888" md5="6b6e5c5b863b58a57e779015d5473584"/>
+      <h4:byteStream offset="11302769" uuid="b1dd0e61-3c97-47ff-b532-90e23d8bf09e" chunkPositionInArray="[0,90,0]" nBytes="178159" md5="5b695553195e446ef4aeb2d33194d3fb"/>
+      <h4:byteStream offset="117709342" uuid="74c0672e-3997-4276-bc8a-e5371ba75a8e" chunkPositionInArray="[0,90,180]" nBytes="168305" md5="a380b10fd1c3a3fa92455e5a46007120"/>
+      <h4:byteStream offset="117877647" uuid="8910dcf4-7cfc-480b-9562-cc4baf61ad7f" chunkPositionInArray="[12,0,0]" nBytes="174384" md5="e71b8879ae68f82c081ccc445043a521"/>
+      <h4:byteStream offset="118052031" uuid="643f8b72-4eb3-4fce-98b2-9887ac7b2bb2" chunkPositionInArray="[12,0,180]" nBytes="179970" md5="9f76205aac2d9e8cd07348e0fd52fb6f"/>
+      <h4:byteStream offset="118232001" uuid="11639905-0e14-4ef0-a734-f82204d90a01" chunkPositionInArray="[12,90,0]" nBytes="190661" md5="c0f14b562348154048a1af21e9bb6f8a"/>
+      <h4:byteStream offset="118422662" uuid="bd3d8e04-00e8-4bef-b394-2134ad88d1d1" chunkPositionInArray="[12,90,180]" nBytes="184850" md5="6cb3af54c595152652f3a006ee08200b"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TropTemp_TqJ_A_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="202644145" uuid="ed8b7020-74e7-4330-9832-eff27f3d4b8f" chunkPositionInArray="[0,0]" nBytes="83970" md5="3acfbe63960e87a2eb48d02a649966f5"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="ClrOLR_TqJ_A_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="257297800" uuid="1d8a6698-87eb-4df5-b17c-17aa8db35244" chunkPositionInArray="[0,0]" nBytes="73061" md5="d9145ee3aac1e8b453e05ac72c6c9854"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CloudFrc_D_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="167627261" uuid="34c5b9e6-a545-4d47-bc19-04e56fef877f" chunkPositionInArray="[0,0]" nBytes="61215" md5="9b24f97d73ab157c9ed44895986a2566"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotH2OVap_TqJ_D_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="266575150" uuid="cfd2a61f-2139-49d5-a665-0b3050738814" chunkPositionInArray="[0,0]" nBytes="94716" md5="27e0bf54343292016e8a3d5f4d51f971"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CloudFrc_TqJ_D_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="294039368" uuid="df003df8-f8b3-41ef-84b7-f462eb0ce0e6" chunkPositionInArray="[0,0]" nBytes="80700" md5="0c4912da075f4cdd866731116fc1b739"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CoarseCloudFrc_TqJ_A_min">
+    <Dim name="/CoarseCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>0</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="235134658" uuid="14efa9f2-36a7-401e-b97c-87f0032af8bb" chunkPositionInArray="[0,0,0]" nBytes="86448" md5="6190576a5152671a8a3629ad2bf06f31"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="FineCloudFrc_TqJ_A_ct">
+    <Dim name="/FineCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>3</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="232557705" uuid="13d64863-85ee-4501-a86e-0bd69ede8701" chunkPositionInArray="[0,0,0]" nBytes="453898" md5="458abea6e9de865a3d4ceb750dfe09ee"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="TotO3_A">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="111516694" uuid="a4262958-c1e5-470a-a73e-f9d3cca2dfa6" chunkPositionInArray="[0,0]" nBytes="79465" md5="7f726fa1cd365d81de7a5955673fe9cb"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="RelHum_liquid_D_min">
+    <Dim name="/H2OPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>5</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="158051549" uuid="34d75641-ba93-46c2-b0ac-91312d55b376" chunkPositionInArray="[0,0,0]" nBytes="793627" md5="eff9a0c8470d60891974c389e0061cab"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TropPres_A_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="77030688" uuid="03de469c-afac-4312-8329-dc7c85b471c0" chunkPositionInArray="[0,0]" nBytes="81893" md5="db349e3f0975619305d60756f8e9d87e"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CoarseCloudPres_TqJ_D_min">
+    <Dim name="/CoarseCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>0</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="299307154" uuid="8fd70828-b2d4-4e72-839a-e265e12aa59d" chunkPositionInArray="[0,0,0]" nBytes="195390" md5="b5bf6e928e9b815f4adb94a971de6b7f"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="TotH2OVap_A_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="77685765" uuid="13106ed8-dee4-462d-86fd-b4b3314dace0" chunkPositionInArray="[0,0]" nBytes="38071" md5="ee55354129862e3a033c42afa75d4d8c"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="TropTemp_TqJ_A">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="202534764" uuid="62f4eacc-e9b1-4e35-b62d-80c1f3840d61" chunkPositionInArray="[0,0]" nBytes="71284" md5="1a26a8ead191afa706759f1b79f0a028"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="RelHum_TqJ_A">
+    <Dim name="/H2OPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>5</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="214793185" uuid="94ca0afd-1c53-41f8-82fd-000fd19505a3" chunkPositionInArray="[0,0,0]" nBytes="827676" md5="f843df76821f4acecb1a2012c4e2ac54"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="RelHum_liquid_A_sdev">
+    <Dim name="/H2OPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>5</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="94642784" uuid="89c94d43-af7a-4876-b812-420e30c48d4f" chunkPositionInArray="[0,0,0]" nBytes="914298" md5="f4fdab74f0a49e2ad41ad7c6b45310da"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="GPHeight_A_ct">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>24 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="99006687" uuid="2ca6dc23-3a17-4c45-b4a4-79657e62f214" chunkPositionInArray="[0,0,0]" nBytes="887098" md5="901309e5c3d064816f12f91b72a8bc83"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="SurfPres_Forecast_TqJ_D">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="257491154" uuid="d5386b49-8b38-4c7e-a987-ac8ddf833887" chunkPositionInArray="[0,0]" nBytes="57826" md5="7a7fa722df9dc42aa6914d98cfebac94"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="RelHum_liquid_A_min">
+    <Dim name="/H2OPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>5</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="95557082" uuid="78460fc9-bd4d-44f3-ab46-4cfe093822a5" chunkPositionInArray="[0,0,0]" nBytes="802988" md5="c128fde6ed95c1751ce584cdbaed8850"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TropTemp_TqJ_D_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="266128289" uuid="d6867608-f10a-459e-88bb-1c54bfd9202a" chunkPositionInArray="[0,0]" nBytes="84122" md5="2908837205ecf2f0ab82f6bc1ff40113"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotO3_TqJ_D_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="300839352" uuid="275d9bfc-6947-4ff8-9ccc-76bb4bd41903" chunkPositionInArray="[0,0]" nBytes="83484" md5="5c47b3f78ba682f2da64d9591dfd2b6b"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="GPHeight_MW_A_ct">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>24 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="320862385" uuid="77ec074c-c346-4577-a304-6b874b20b1f9" chunkPositionInArray="[0,0,0]" nBytes="13586" md5="7c90147b4fcb72404dd36c4b0d82051d"/>
+    </h4:chunks>
+  </Int16>
+  <Int16 name="TropPres_A_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="76995213" uuid="6506967e-5ccd-4163-a042-1dbaa0ff0616" chunkPositionInArray="[0,0]" nBytes="35475" md5="67670b8bac31293479764bf459274e16"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="EmisIR_D_min">
+    <Dim name="/EmisFreqIR"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>1</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>4 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="132835732" uuid="cbffb5c8-92ab-4066-bc43-2de04cdaea01" chunkPositionInArray="[0,0,0]" nBytes="165640" md5="ed3a0b35a0efe7f336e27e033b35b7ac"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="TotCH4_D_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="187383037" uuid="a5954935-fb9d-4bc7-a199-b5fbf591d14d" chunkPositionInArray="[0,0]" nBytes="36855" md5="f95d273757f53f78c462d46cd17202fe"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="SurfAirTemp_D_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="139344384" uuid="38440e29-761f-4d82-babd-fb017f83b75b" chunkPositionInArray="[0,0]" nBytes="68738" md5="e42dd130c0d84ab36b39c07c478de10b"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CH4_VMR_A_err">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="17321543" uuid="edad5af3-f788-4446-855f-8ba5da62c96b" chunkPositionInArray="[0,0,0]" nBytes="137486" md5="6a693801c5d2e5119b0aa065a4342bb2"/>
+      <h4:byteStream offset="17459029" uuid="cf201053-1e54-431b-a164-da88458066f3" chunkPositionInArray="[0,0,180]" nBytes="140343" md5="81b662f52b3cae280dde6b9c46ece6d6"/>
+      <h4:byteStream offset="17599372" uuid="ff00f726-b3cf-4dd2-b336-794478bda06f" chunkPositionInArray="[0,90,0]" nBytes="143031" md5="52b4e1a9e7d4b7648ffdc4ea9d2a6adb"/>
+      <h4:byteStream offset="130081184" uuid="b206c881-8556-4e99-8118-19c68d4ca397" chunkPositionInArray="[0,90,180]" nBytes="135944" md5="64981d10c444bc7bb055d5d174840dc1"/>
+      <h4:byteStream offset="130217128" uuid="d89d3bef-a8d2-4294-b217-9e4b27addb41" chunkPositionInArray="[12,0,0]" nBytes="153552" md5="d75f2f59ee69de5344e5134a710ffec5"/>
+      <h4:byteStream offset="130370680" uuid="6251bed0-605e-4ce3-aeec-a6c4ecfa1101" chunkPositionInArray="[12,0,180]" nBytes="153594" md5="1b70f80f4019c9a70cfe89572cd8db01"/>
+      <h4:byteStream offset="130524274" uuid="6fc266ac-c946-4d9f-b02e-f33eace94d2f" chunkPositionInArray="[12,90,0]" nBytes="162151" md5="2fa5ae4c9e5ad3c71c8dfef715311782"/>
+      <h4:byteStream offset="130686425" uuid="638f60ab-8368-4354-bffc-32caf8bf6a00" chunkPositionInArray="[12,90,180]" nBytes="155377" md5="175ce01ac5ec44861a886ebb81fc4148"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="TropHeight_A_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="97531480" uuid="dfad836b-1220-4eb4-865c-46e560362422" chunkPositionInArray="[0,0]" nBytes="38097" md5="7ecb5454a268cdff2fbe0fe8ea8b6d10"/>
+    </h4:chunks>
+  </Int16>
+  <Int16 name="SurfSkinTemp_A_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="69258475" uuid="adba9b6c-2167-44b4-a25c-6f37b5e2bb11" chunkPositionInArray="[0,0]" nBytes="37664" md5="bdb2e87306e9bee69aa06b00449a63b5"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="CoarseCloudFrc_A_sdev">
+    <Dim name="/CoarseCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>0</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="109031741" uuid="48c3eb1c-3208-4100-89c0-cddcf7cffd38" chunkPositionInArray="[0,0,0]" nBytes="225268" md5="8c4428490954b8ea849e54392dc076bc"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CloudTopTemp_A_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="106091084" uuid="83ad4b8d-7f3c-427a-8de0-4d23b3e3400d" chunkPositionInArray="[0,0]" nBytes="86295" md5="c6a1ab1f9807cd652ea7b66da55a42d7"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="FineCloudFrc_TqJ_D">
+    <Dim name="/FineCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>3</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="295219554" uuid="01a466d3-0560-4817-9c6b-ce2916636c5f" chunkPositionInArray="[0,0,0]" nBytes="694662" md5="98826750b45452e9bbe4afbcd90fdec2"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="H2O_MMR_A_max">
+    <Dim name="/H2OPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>5</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="87042447" uuid="f57d7b2b-7cfc-43e2-9efa-2eb7927c201d" chunkPositionInArray="[0,0,0]" nBytes="1063128" md5="d383475303722dc81fb8b00a3d82dd35"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="ClrOLR_TqJ_D_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="320548900" uuid="665e339c-5612-40d0-8d7e-4c4aaf78857c" chunkPositionInArray="[0,0]" nBytes="72917" md5="503a143bfd6461d00c9f245635bfdf92"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotO3_TqJ_A">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="237393985" uuid="175849cc-a6d7-49a6-a510-a62c1bde9c19" chunkPositionInArray="[0,0]" nBytes="79464" md5="3390865c47d03ba3252560dc29e47e3e"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="H2O_MMR_Lyr_A_ct">
+    <Dim name="/H2OPressureLay"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>4</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="79191405" uuid="dbc983b6-ef46-4f0c-9476-5fbc05d2a8d9" chunkPositionInArray="[0,0,0]" nBytes="417324" md5="1cc7a06e034c8a4c5690b25cad434412"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="CloudTopTemp_TqJ_A">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="231387141" uuid="e2d8d638-7993-44b6-b78a-fd0fffee63cd" chunkPositionInArray="[0,0]" nBytes="90221" md5="cb643070e4da8f5c5bebbd05e7932c9a"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="Emis_MW_D_sdev">
+    <Dim name="/EmisFreqMW"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>2</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="320972525" uuid="6299138a-e175-4eec-a361-92d203c2c611" chunkPositionInArray="[0,0,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="RelHumSurf_liquid_TqJ_A_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="222799037" uuid="03a96cc2-9948-4019-ae77-876d79d0ab56" chunkPositionInArray="[0,0]" nBytes="78391" md5="e7acee7db58dda269131af4bb814c43f"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="CloudFrc_TqJ_A_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="230628405" uuid="70c114ab-8bc1-4806-91b3-334fcbc9dff1" chunkPositionInArray="[0,0]" nBytes="38097" md5="7ecb5454a268cdff2fbe0fe8ea8b6d10"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="OLR_D_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="193434489" uuid="15c1fc31-aee4-4b7a-9dc4-1fd3c2da0dfa" chunkPositionInArray="[0,0]" nBytes="76126" md5="38aece327cda852ea0e8113f374123c4"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="OLR_TqJ_D_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="320056265" uuid="a6a8c9ed-f671-49a3-984d-fd369fdc5b88" chunkPositionInArray="[0,0]" nBytes="38388" md5="98b43c6ca989ef8c06b25b3d02d8db36"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="RelHum_TqJ_A_sdev">
+    <Dim name="/H2OPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>5</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="216054919" uuid="e8eb5cc5-2451-4f42-8c64-29e4ec8dd468" chunkPositionInArray="[0,0,0]" nBytes="933251" md5="ff8062afe859e860a24fad8cb7dfe29f"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CO_VMR_TqJ_D_min">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="63692651" uuid="0c3a0450-a663-4241-b855-197d047562f9" chunkPositionInArray="[0,0,0]" nBytes="228349" md5="73977c058db45bd465d4b241ca52f74e"/>
+      <h4:byteStream offset="63921000" uuid="1a1c86f6-6413-43ab-b3f3-90d29ae49577" chunkPositionInArray="[0,0,180]" nBytes="230586" md5="1daba58b9ebb0d6ef1000f0866574de0"/>
+      <h4:byteStream offset="64151586" uuid="4ee4dc50-7316-42cf-af2d-85340004a479" chunkPositionInArray="[0,90,0]" nBytes="221880" md5="f18ac48dbda70ad30c726fe6fb4d1d8c"/>
+      <h4:byteStream offset="311142592" uuid="4b2b36f7-62a9-4fad-be7a-1a87a511043d" chunkPositionInArray="[0,90,180]" nBytes="208291" md5="59e5b6c78ddd9bcc5a32cfd1e4f9e199"/>
+      <h4:byteStream offset="311350883" uuid="d819c22f-2e37-4dcc-a55d-ca7d35bce6f3" chunkPositionInArray="[12,0,0]" nBytes="203621" md5="a88db504f6b2abb2e75f6cc667d6d0f0"/>
+      <h4:byteStream offset="311554504" uuid="ad93495b-a033-4e1e-9e14-3413911b7d43" chunkPositionInArray="[12,0,180]" nBytes="208257" md5="1212b6c0b23dfcf54903913dbe3c32b9"/>
+      <h4:byteStream offset="311762761" uuid="45ebfa1d-6478-4b4b-8420-3105f6a7591a" chunkPositionInArray="[12,90,0]" nBytes="204115" md5="0361f9560aae7a4c4cf28f06147e297c"/>
+      <h4:byteStream offset="311966876" uuid="3c1da69e-5b39-4890-96e5-9f7a2754b748" chunkPositionInArray="[12,90,180]" nBytes="194911" md5="ed076f82078a65291b8844277ce02203"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CloudTopPres_A_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="105566281" uuid="ad008d08-0ee2-4ab4-bc9e-51c2e20ecc71" chunkPositionInArray="[0,0]" nBytes="78609" md5="b9118ad36b8fd94cb3dac847ad9f9cd7"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="ClrOLR_TqJ_A_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="257175534" uuid="bb85fe61-927e-40cf-aec5-207371e53bde" chunkPositionInArray="[0,0]" nBytes="38097" md5="7ecb5454a268cdff2fbe0fe8ea8b6d10"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="TropPres_A">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="76915233" uuid="208cefa1-7b78-414a-8d78-1e1cb030190b" chunkPositionInArray="[0,0]" nBytes="79980" md5="d549db5b7f34d11888edb7b2c08f5334"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="TotalCounts_D">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="131564373" uuid="b93b6508-7c00-40f6-b011-4be4d59aa889" chunkPositionInArray="[0,0]" nBytes="33687" md5="ea01f2d2ab6f1e6d2ce43cda27b4e16c"/>
+    </h4:chunks>
+  </Int16>
+  <Int16 name="RelHumSurf_liquid_A_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="97202390" uuid="2762f727-87b8-43c6-af0b-a0f01683487e" chunkPositionInArray="[0,0]" nBytes="36074" md5="99eb3fdfc1da7941658a25a3e084c4f2"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="H2O_MMR_TqJ_A_max">
+    <Dim name="/H2OPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>5</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="212426462" uuid="0cb5bd19-cea6-418f-9078-bffec9ba9a05" chunkPositionInArray="[0,0,0]" nBytes="1066904" md5="151bb606e40fae7dab8a290b17fe3d3b"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotCO_A_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="118723351" uuid="917e76fc-47b8-4fc6-b8c6-6a03187b0c91" chunkPositionInArray="[0,0]" nBytes="78835" md5="746303d3a8fb7f8873efa335312af31f"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="ClrOLR_D_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="193628362" uuid="43fc6ed5-675a-4bcb-84c1-b6efd30f5f9c" chunkPositionInArray="[0,0]" nBytes="84091" md5="dcd0f82eac6185f3f24ef889df828393"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="Temperature_TqJ_A_sdev">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="35275438" uuid="0ed3a141-c20a-44cb-ad4d-90f512b197ef" chunkPositionInArray="[0,0,0]" nBytes="241312" md5="63b387e35052e5ddb74cf545be9e9d1a"/>
+      <h4:byteStream offset="35516750" uuid="e4928d9b-534a-491e-af45-632a0d9ce24d" chunkPositionInArray="[0,0,180]" nBytes="239543" md5="de42e764b6aab3c76f9c7bdd1678b7c7"/>
+      <h4:byteStream offset="35756293" uuid="43abdf1f-46f7-4c41-9b03-95c77404236c" chunkPositionInArray="[0,90,0]" nBytes="234040" md5="986fa9e64960f70ae3980700dac2ff2e"/>
+      <h4:byteStream offset="197606545" uuid="75e8faf9-ba3f-4ae7-a276-70b4077c34dc" chunkPositionInArray="[0,90,180]" nBytes="226076" md5="4fa9e6384a415869a4594061d2dfed8a"/>
+      <h4:byteStream offset="197832621" uuid="6d7419d3-daba-4735-8388-1ba6c3d0ae32" chunkPositionInArray="[12,0,0]" nBytes="240485" md5="a17953ec87574835396330574c9003f0"/>
+      <h4:byteStream offset="198073106" uuid="e9aa6213-b06c-4b6f-919f-fd83d347b428" chunkPositionInArray="[12,0,180]" nBytes="242505" md5="1cd6600ccad0d8135496bda0e351a375"/>
+      <h4:byteStream offset="198315611" uuid="131f6297-708d-4a9e-b4f3-d4cb3cb57ba6" chunkPositionInArray="[12,90,0]" nBytes="244716" md5="4e8ba59d0909e9ba5dbb5537401ab3b6"/>
+      <h4:byteStream offset="198560327" uuid="c4fbd7f6-1b26-4622-983a-0eb42a1e6c5d" chunkPositionInArray="[12,90,180]" nBytes="242610" md5="82a67a537d80084abd0712b0755175a9"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="H2O_MMR_D_max">
+    <Dim name="/H2OPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>5</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="149584479" uuid="6b7f1612-0a95-4322-9552-c1ba51a6e565" chunkPositionInArray="[0,0,0]" nBytes="1061437" md5="4e6332c49895f0bae397daa17c3201dd"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotCO_TqJ_D_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="307877016" uuid="0b94338e-b734-422d-a966-b7bec2fedb2d" chunkPositionInArray="[0,0]" nBytes="79373" md5="3efe96fb8f42ffec975770e4a4d04059"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="SurfSkinTemp_A">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="69185240" uuid="79ee92fc-4435-42ff-b715-c5e7063a89cf" chunkPositionInArray="[0,0]" nBytes="73235" md5="b3df2d09603905cc87cc914968569d51"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="SurfSkinTemp_D_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="131975689" uuid="abae9923-259a-4d88-8525-136d1cdda2d8" chunkPositionInArray="[0,0]" nBytes="74183" md5="31da78d579c55dda769e7a16385e4ab7"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="H2O_MMR_Surf_A_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="89030256" uuid="2dbf32f5-a055-4a67-8a5d-7a2d161b5058" chunkPositionInArray="[0,0]" nBytes="36074" md5="99eb3fdfc1da7941658a25a3e084c4f2"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="TropHeight_D_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="160281187" uuid="1fde9b72-fcaa-465f-8636-1bed27c5e377" chunkPositionInArray="[0,0]" nBytes="155014" md5="a85e686e27fba03bf5d6f9244fb51c46"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CoarseCloudTemp_TqJ_A_min">
+    <Dim name="/CoarseCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>0</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="236913976" uuid="e5f6185e-d29a-4f89-b9bd-2876f97d6be7" chunkPositionInArray="[0,0,0]" nBytes="239328" md5="1cd343af06e3cf927a065e34f76b27d8"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TropTemp_A">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="77265135" uuid="458fd5a7-7c89-4506-a514-2fd9de9e7d57" chunkPositionInArray="[0,0]" nBytes="68654" md5="bbd3f0f5df6b1c6c6e0d1dc3d5b0208d"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TropHeight_A_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="97569577" uuid="9f8cd8bf-32eb-4d0d-982f-435add80103a" chunkPositionInArray="[0,0]" nBytes="85254" md5="36165146bb9916f44fb268c79267aa10"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotCldLiqH2O_MW_A_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="320931358" uuid="dc5ca9c8-be2e-4be7-b18e-0f79f08b67fd" chunkPositionInArray="[0,0]" nBytes="1161" md5="a43f0ca2084e297f3aa9763a828dcb0f"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotCH4_TqJ_D">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="314130415" uuid="40236586-7211-4b87-8a8b-0c27f97e9939" chunkPositionInArray="[0,0]" nBytes="69461" md5="430694b97f711e9184f34c7d6a195505"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CloudFrc_A_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="105177035" uuid="dae86fdc-278a-428f-8003-de72b9c31c88" chunkPositionInArray="[0,0]" nBytes="63047" md5="0d90771d512acf85e6c5f972315bb584"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="RelHum_A">
+    <Dim name="/H2OPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>5</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="89392467" uuid="9d23b93a-b142-4ed9-bd6c-2b435ba81d58" chunkPositionInArray="[0,0,0]" nBytes="810230" md5="e2276e15040f555dc56562a9dc7bb09d"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CloudTopTemp_D">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="168223411" uuid="9f6868d0-6a29-43dc-9149-0fd0db5d3004" chunkPositionInArray="[0,0]" nBytes="88593" md5="3b75ba08c0c1f644741f2834291d1e76"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="Temperature_D_max">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="19691389" uuid="87e72645-3674-4fa4-9a46-306307430cee" chunkPositionInArray="[0,0,0]" nBytes="186666" md5="3a207ab712847ad20f0031d9fe16a327"/>
+      <h4:byteStream offset="19878055" uuid="eb5e7925-afcb-4e00-9817-5c4bf2913000" chunkPositionInArray="[0,0,180]" nBytes="187475" md5="25f7f0ea7e0c32ed4045201aac1ef6cb"/>
+      <h4:byteStream offset="20065530" uuid="574970dc-95eb-4948-ae83-920f9ab71176" chunkPositionInArray="[0,90,0]" nBytes="185862" md5="cf67c3ecfcbee54eed77a84f96b885de"/>
+      <h4:byteStream offset="137119087" uuid="eac8c5b2-33f5-46ce-8c91-ac6ff1d15748" chunkPositionInArray="[0,90,180]" nBytes="182322" md5="dbccbf1efc4867976d268e9e7a91d2aa"/>
+      <h4:byteStream offset="137301409" uuid="fb6cf303-9396-4494-8690-5a24e6e09c1e" chunkPositionInArray="[12,0,0]" nBytes="173465" md5="3ce54a6cda76a7464a24549cfa16a0d2"/>
+      <h4:byteStream offset="137474874" uuid="98b33faf-93e4-413a-a8ce-f517d98266d3" chunkPositionInArray="[12,0,180]" nBytes="174651" md5="46c850b03fc30809d3b6da53cdcba891"/>
+      <h4:byteStream offset="137649525" uuid="5093c9d5-f7c8-429e-984f-04ceff0783bd" chunkPositionInArray="[12,90,0]" nBytes="189517" md5="6967cf28e0c228cd0925d3796bc1962e"/>
+      <h4:byteStream offset="137839042" uuid="7a8f2e9f-d9ab-44ad-b8f8-c2cc1fa80e82" chunkPositionInArray="[12,90,180]" nBytes="186814" md5="352242ba4d9d9b3f709f1da70308aa51"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CloudTopPres_A_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="105644890" uuid="8dcf678e-caf1-447d-9db0-ac56296506e4" chunkPositionInArray="[0,0]" nBytes="67999" md5="47537c04a6e6b24768cbd291057aa204"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CoarseCloudTemp_A_min">
+    <Dim name="/CoarseCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>0</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="111024745" uuid="ad8829bb-69df-4752-8144-d2e565f43c04" chunkPositionInArray="[0,0,0]" nBytes="245266" md5="de06e53b33ff1779c41432723714469e"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="TropTemp_TqJ_D_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="266089901" uuid="fbfca5ab-6b4f-4011-97b5-4099d1b37764" chunkPositionInArray="[0,0]" nBytes="38388" md5="98b43c6ca989ef8c06b25b3d02d8db36"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="Temperature_TqJ_D_max">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="53534962" uuid="b7874eee-2036-443c-a715-604a5b47f5ba" chunkPositionInArray="[0,0,0]" nBytes="190627" md5="da08cc9119e0786b0645955f1a08c869"/>
+      <h4:byteStream offset="53725589" uuid="8dd8c81b-d11b-4624-9d56-547c6b8dd485" chunkPositionInArray="[0,0,180]" nBytes="191602" md5="4f41c2924fd9435ab88f04afd1e90336"/>
+      <h4:byteStream offset="53917191" uuid="cd234451-101c-48d7-be3d-9dae97d1dd56" chunkPositionInArray="[0,90,0]" nBytes="190092" md5="4aa4d907c25cdcc32421f68344c18e27"/>
+      <h4:byteStream offset="263235661" uuid="a35fb22a-d585-4316-9d67-88591a9e10c1" chunkPositionInArray="[0,90,180]" nBytes="185693" md5="565d72c4d5f2d8cce133b5eb875d6558"/>
+      <h4:byteStream offset="263421354" uuid="c20585e8-36f4-449d-b51a-0f2f66575b33" chunkPositionInArray="[12,0,0]" nBytes="181973" md5="408838d4935da67b38ac7ab16701630b"/>
+      <h4:byteStream offset="263603327" uuid="4b582937-c3f7-4c09-b8b5-b8f93bb7cc37" chunkPositionInArray="[12,0,180]" nBytes="184955" md5="5a874965ade577432cf7e77cf3337480"/>
+      <h4:byteStream offset="263788282" uuid="712afd3b-63e0-4c12-996b-cfe88ad1ac52" chunkPositionInArray="[12,90,0]" nBytes="197630" md5="a6ee98c1ecf2916ea6ccac1141b5d99a"/>
+      <h4:byteStream offset="263985912" uuid="5f06fb83-f6f0-4f86-bbf4-ce05fda27fe4" chunkPositionInArray="[12,90,180]" nBytes="195577" md5="d8e33acb5cc414d7455abe9a670cc9d1"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="RelHumSurf_D_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="155720550" uuid="c08e9c5c-bbc8-40b5-a43a-ad1cfcbc8bb6" chunkPositionInArray="[0,0]" nBytes="75691" md5="4687c1a0a670a1d8eb0b544e27e4c85b"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CloudFrc_TqJ_A_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="230748198" uuid="df81e621-4133-4197-9fc0-a73aa7bb61e9" chunkPositionInArray="[0,0]" nBytes="68262" md5="ef69568d75b5ff252df8751f47b7dfa0"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="TotCldLiqH2O_MW_D_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="321153194" uuid="36a0ddc5-ae0e-4907-a058-8af717b46946" chunkPositionInArray="[0,0]" nBytes="589" md5="13194f25768e29a4921fa9f6ba022342"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="H2O_MMR_Surf_A">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="88937671" uuid="9282913f-eb93-4877-b3e8-ca5b1c7a5e0b" chunkPositionInArray="[0,0]" nBytes="92585" md5="fdf9aa36997e4d600e9539ea4d3a118e"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TropPres_D">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="139489646" uuid="aa9781fe-abff-45fc-bf20-fe7434198cfa" chunkPositionInArray="[0,0]" nBytes="80192" md5="dd680e2d0e09a70c18dedcb6453b2f8c"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="FineCloudLayer">
+    <Dim name="/FineCloudLayer"/>
+    <Attribute name="CLASS" type="String">
+      <Value>DIMENSION_SCALE</Value>
+    </Attribute>
+    <Attribute name="NAME" type="String">
+      <Value>FineCloudLayer</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>3</Value>
+    </Attribute>
+    <Attribute name="long_name" type="String">
+      <Value>Mid-layer pressure</Value>
+    </Attribute>
+    <Attribute name="units" type="String">
+      <Value>hPa</Value>
+    </Attribute>
+    <Attribute name="format" type="String">
+      <Value>F7.2</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12</h4:chunkDimensionSizes>
+      <h4:byteStream offset="131564251" uuid="11115a79-104f-4e8f-a809-17738a935a10" chunkPositionInArray="[0]" nBytes="39" md5="0b2396e0349f169f6f5e16650f4063c5"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CoarseCloudFrc_D">
+    <Dim name="/CoarseCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>0</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="171105567" uuid="40cebf6b-4fce-4036-8458-127d28ca117a" chunkPositionInArray="[0,0,0]" nBytes="234208" md5="107bb1141ff020aede765b63b03b1f3f"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="CoarseCloudFrc_TqJ_A_ct">
+    <Dim name="/CoarseCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>0</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="234787971" uuid="c8692df5-47ec-42f0-8ef0-d8fc4d378807" chunkPositionInArray="[0,0,0]" nBytes="113715" md5="1868827fcba7561f2b8a2fe88448dd60"/>
+    </h4:chunks>
+  </Int16>
+  <Float64 name="Latitude">
+    <Dim name="/Latitude"/>
+    <Attribute name="CLASS" type="String">
+      <Value>DIMENSION_SCALE</Value>
+    </Attribute>
+    <Attribute name="NAME" type="String">
+      <Value>Latitude</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <Attribute name="long_name" type="String">
+      <Value>Latitude</Value>
+    </Attribute>
+    <Attribute name="units" type="String">
+      <Value>degrees_north</Value>
+    </Attribute>
+    <Attribute name="format" type="String">
+      <Value>F5.1</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="131563958" uuid="311ce187-958e-4e84-b044-ebe2f2fdf575" chunkPositionInArray="[0]" nBytes="217" md5="f6da25808f22177cef49588cc08740ca"/>
+    </h4:chunks>
+  </Float64>
+  <Float32 name="CloudFrc_D_err">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="167733464" uuid="c0d79f76-fa61-40d0-b59b-dfb2bc36d061" chunkPositionInArray="[0,0]" nBytes="78411" md5="8bf9efb10efb556d8152cd46b77240c1"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="O3_VMR_TqJ_D_err">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="61716092" uuid="130fed39-4c78-44b5-a71e-384f61756d5c" chunkPositionInArray="[0,0,0]" nBytes="178744" md5="4320bc1cdc5c4106844c6606dbae31ba"/>
+      <h4:byteStream offset="61894836" uuid="202e858e-03b0-40b0-95a2-73f03218f0db" chunkPositionInArray="[0,0,180]" nBytes="184072" md5="0a7be6a7c5eac030ecf402a69c5e493c"/>
+      <h4:byteStream offset="62078908" uuid="c3426ac4-5843-4f10-9f9f-9b4dc2780008" chunkPositionInArray="[0,90,0]" nBytes="176022" md5="1fb19e79738ea2f8950fbd771fd77d8a"/>
+      <h4:byteStream offset="306870662" uuid="9344aec1-2a49-4e30-9016-790656bb108d" chunkPositionInArray="[0,90,180]" nBytes="170397" md5="59ea96c04836846976ae44d7df0819dc"/>
+      <h4:byteStream offset="307041059" uuid="c8eda404-20d4-4e0e-8b01-80dc8a1bfc52" chunkPositionInArray="[12,0,0]" nBytes="173680" md5="21bc6a8b4e89a7a1c8b841a6daf61ad3"/>
+      <h4:byteStream offset="307214739" uuid="9f11e981-7258-499a-adcb-d67db9d172cf" chunkPositionInArray="[12,0,180]" nBytes="178817" md5="5527bb2b7aae163839fe80bc49498e79"/>
+      <h4:byteStream offset="307393556" uuid="47071113-0de3-4c5b-88cf-48fd5335866d" chunkPositionInArray="[12,90,0]" nBytes="185595" md5="260bf0ca302c36c30878283abe4d49ea"/>
+      <h4:byteStream offset="307579151" uuid="6deba203-ca07-4464-8e69-8f80497407df" chunkPositionInArray="[12,90,180]" nBytes="181371" md5="4e550fa6fa0ae6072efc02155009cd08"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="SurfSkinTemp_D_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="132049872" uuid="f27a119a-4eac-41ed-ab3a-05d5295d98b4" chunkPositionInArray="[0,0]" nBytes="66419" md5="00f4e77c007e6bc02c8b7188d38898b1"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotCO_TqJ_A_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="244679464" uuid="9ecc80ce-2717-42ba-a0e2-18d8ba9a4dd5" chunkPositionInArray="[0,0]" nBytes="76590" md5="fe880095aacc41c84a09e853b744d64b"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="H2O_MMR_Surf_TqJ_A_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="214545115" uuid="1f8eaeab-e7a8-4f64-b4df-8afa88374a51" chunkPositionInArray="[0,0]" nBytes="88880" md5="c5546001dca95ac1d04141f47cd3b6a2"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotCldLiqH2O_MW_D_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="321154944" uuid="9588dbf7-a308-4201-8491-801c2d3f2dd1" chunkPositionInArray="[0,0]" nBytes="1161" md5="a43f0ca2084e297f3aa9763a828dcb0f"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="H2O_MMR_Lyr_D_min">
+    <Dim name="/H2OPressureLay"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>4</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="143090406" uuid="8f6cc704-f568-40f9-ab61-e8752e1b40e8" chunkPositionInArray="[0,0,0]" nBytes="1073818" md5="dd30b23091b4f1ff371354599f5bafd9"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CoarseCloudFrc_D_sdev">
+    <Dim name="/CoarseCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>0</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="171440704" uuid="b1a4a2e4-ca04-4ba5-a26d-da7ca9a3e83a" chunkPositionInArray="[0,0,0]" nBytes="222986" md5="67e71af2f11f1ec115011ccbeca9ff56"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="RelHum_TqJ_A_min">
+    <Dim name="/H2OPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>5</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="216988170" uuid="03f4640f-3857-4e64-8018-308586629e2f" chunkPositionInArray="[0,0,0]" nBytes="810826" md5="ce1d0ec2c98bfdc4ea6aef54dd137299"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotCO_A_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="118802186" uuid="755abace-c8d3-4f4e-820e-082923fec309" chunkPositionInArray="[0,0]" nBytes="76590" md5="fe880095aacc41c84a09e853b744d64b"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="TotCO_D_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="181023923" uuid="969091c7-0995-428d-8ab7-1985477b22df" chunkPositionInArray="[0,0]" nBytes="36254" md5="184974b563bb2bed9b29944bafef9f6d"/>
+    </h4:chunks>
+  </Int16>
+  <Int16 name="TropTemp_TqJ_A_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="202606048" uuid="b1cac1ad-c803-403e-b7a4-b8779b36d3d9" chunkPositionInArray="[0,0]" nBytes="38097" md5="7ecb5454a268cdff2fbe0fe8ea8b6d10"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="CH4_VMR_D">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="31829844" uuid="eda63917-021c-4375-94cb-4ac4d7c5d3a6" chunkPositionInArray="[0,0,0]" nBytes="190755" md5="4c2fa3df81bb3a63321696c9ffd35fbe"/>
+      <h4:byteStream offset="32020599" uuid="fa5ad355-5455-44af-996e-ade29ea6f2e0" chunkPositionInArray="[0,0,180]" nBytes="186710" md5="abd29583282cecb058eea1b52d822afd"/>
+      <h4:byteStream offset="32207309" uuid="1e15a70a-407f-477a-aa76-ff47774f9265" chunkPositionInArray="[0,90,0]" nBytes="188124" md5="5de94e7fc92beab4ee978f053d24acbd"/>
+      <h4:byteStream offset="187632447" uuid="43cd5ce8-0e44-43e5-a597-0359e5f5d0f6" chunkPositionInArray="[0,90,180]" nBytes="179404" md5="4ed6a84994164fffc394ad194e259ccd"/>
+      <h4:byteStream offset="187811851" uuid="46f1321e-8230-45df-9238-67cada9eef98" chunkPositionInArray="[12,0,0]" nBytes="185728" md5="73d92af28dd41c1ed9b3bf4ec9fde0ef"/>
+      <h4:byteStream offset="187997579" uuid="ac38090e-9121-4b4c-941b-0215bac78edd" chunkPositionInArray="[12,0,180]" nBytes="184025" md5="8f90e11ec3d81acaeeee166038cc64aa"/>
+      <h4:byteStream offset="188181604" uuid="9172b14c-4dee-4507-89a6-87132a34e545" chunkPositionInArray="[12,90,0]" nBytes="194665" md5="abea5dd767ece112a2dda0a8c6550dd7"/>
+      <h4:byteStream offset="188376269" uuid="256d132c-a805-4701-9b73-47b9eee8e3f1" chunkPositionInArray="[12,90,180]" nBytes="187786" md5="486d9168ea94b5857471f46ad4404aba"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="RelHum_liquid_TqJ_D_sdev">
+    <Dim name="/H2OPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>5</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="283570677" uuid="35adb683-ce54-4ada-87a1-23fcd9711a7c" chunkPositionInArray="[0,0,0]" nBytes="930882" md5="8c5233e8a89a10d2d5bcff180072a0d9"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="ClrOLR_TqJ_D_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="320426421" uuid="2aef4617-e5d9-4cde-8960-98cbce92f3f9" chunkPositionInArray="[0,0]" nBytes="38388" md5="98b43c6ca989ef8c06b25b3d02d8db36"/>
+    </h4:chunks>
+  </Int16>
+  <Int16 name="CoarseCloudTemp_TqJ_A_ct">
+    <Dim name="/CoarseCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>0</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="236589085" uuid="924adfb7-68ac-41b0-8c96-7c75110b19c1" chunkPositionInArray="[0,0,0]" nBytes="102871" md5="d07bb0c83a74c57ad46f53e4e600771b"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="EmisIR_TqJ_A">
+    <Dim name="/EmisFreqIR"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>1</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>4 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="194606633" uuid="56978437-abb6-459a-8fd9-39fa19818f92" chunkPositionInArray="[0,0,0]" nBytes="170524" md5="6615e36f39abb1f503e59e279e49e27c"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="Emis_MW_A_sdev">
+    <Dim name="/EmisFreqMW"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>2</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="320747778" uuid="07755fde-5267-4280-bab6-e25bc6bf5b64" chunkPositionInArray="[0,0,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="SurfSkinTemp_TqJ_A_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="194392520" uuid="11be455b-ef92-41ac-8d10-7f832073a8d1" chunkPositionInArray="[0,0]" nBytes="71978" md5="cfb7db478a5d323cbde3e8c734e6c112"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="H2O_MMR_Surf_TqJ_D_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="277909565" uuid="850a3e24-b3d0-490e-adb1-3e7226aa44c1" chunkPositionInArray="[0,0]" nBytes="76278" md5="0703028d4f1cac58791850a166dfc143"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="H2O_MMR_Lyr_TqJ_D_ct">
+    <Dim name="/H2OPressureLay"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>4</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="267953347" uuid="71c7025a-e4ca-4e7f-9a5a-0431a8040c23" chunkPositionInArray="[0,0,0]" nBytes="439384" md5="6df46ac982b4f756b24c660a7baf577a"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="TotCH4_TqJ_D_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="314236731" uuid="4cff7701-3078-4eaf-a9aa-b9b6479972a3" chunkPositionInArray="[0,0]" nBytes="76785" md5="d5448200e409eb740d4ff5cc2f5855de"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CloudFrc_A">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="104984017" uuid="cfdddf24-64f7-4f19-8ccf-40017faba363" chunkPositionInArray="[0,0]" nBytes="80805" md5="df4e6e002ce5b0b8abc1ed2154d49b3e"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="SurfPres_Forecast_TqJ_A_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="194086760" uuid="5438d5e4-2c64-468a-9854-bd1bec6493d5" chunkPositionInArray="[0,0]" nBytes="58701" md5="d7ae98ed472497af0f09c0c0b7a4784c"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="RelHumSurf_D">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="155625573" uuid="2f2581b4-78a0-4b24-b313-b4e7d5e7a456" chunkPositionInArray="[0,0]" nBytes="59728" md5="3c74d0b3a3c41135b1e045ee15ac2a62"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotCO_D_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="181215989" uuid="a92e67aa-a096-400d-9ee3-f3b3fedb00d5" chunkPositionInArray="[0,0]" nBytes="77791" md5="bf5417b381a42779054d14b8de7fda00"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="EmisIR_TqJ_A_max">
+    <Dim name="/EmisFreqIR"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>1</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>4 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="195414837" uuid="06573799-9538-4f6e-b2cc-3d1dd1835375" chunkPositionInArray="[0,0,0]" nBytes="166038" md5="0ae4334f15d37f4bbed1fecadcccdf8e"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="EmisIR_D_ct">
+    <Dim name="/EmisFreqIR"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>1</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>4 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="132412725" uuid="558d647b-577b-434e-bcf3-19de18a11454" chunkPositionInArray="[0,0,0]" nBytes="137378" md5="9e3129149e1daa686ab380cf03362f52"/>
+    </h4:chunks>
+  </Int16>
+  <Int16 name="RelHum_liquid_A_ct">
+    <Dim name="/H2OPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>5</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="94226502" uuid="2a14fbaf-4036-4db8-810b-eade09a1c2a1" chunkPositionInArray="[0,0,0]" nBytes="416282" md5="c257af536e1b6cb823609eeb52b470ed"/>
+    </h4:chunks>
+  </Int16>
+  <Int16 name="GPHeight_TqJ_D_ct">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>24 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="287957559" uuid="68ab3817-09d5-4d24-87c0-61844c765b7d" chunkPositionInArray="[0,0,0]" nBytes="896581" md5="5a376fbc4e65054db1ace6dcfd90c8ee"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="TropHeight_A_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="97654831" uuid="5fdc4f2d-0b77-4e33-85de-9c5d2327addc" chunkPositionInArray="[0,0]" nBytes="156137" md5="7e76506946602c6351dea7b3b519e88f"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotH2OVap_MW_D">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="321064794" uuid="0d4270af-802b-40c1-ad63-a9bda4c9b342" chunkPositionInArray="[0,0]" nBytes="1161" md5="a43f0ca2084e297f3aa9763a828dcb0f"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="RelHumSurf_liquid_D_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="159684183" uuid="215c7646-207b-49ca-bba3-af5f106a44e5" chunkPositionInArray="[0,0]" nBytes="35249" md5="45329ccd6405cc9ce2bc324e871b36b2"/>
+    </h4:chunks>
+  </Int16>
+  <Int16 name="CO_VMR_TqJ_A_ct">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>24 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="245885586" uuid="b320e407-0e46-48bd-b75b-b1a6c8bd1dbd" chunkPositionInArray="[0,0,0]" nBytes="843402" md5="3686721316c1486d3cb9170ec0ca90eb"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="CoarseCloudFrc_TqJ_A_max">
+    <Dim name="/CoarseCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>0</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="235221106" uuid="0402e5eb-a0d1-459f-b5fb-a560c942417e" chunkPositionInArray="[0,0,0]" nBytes="218540" md5="a72d162a9a118d4210d709d696bed3bd"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotCH4_A_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="125162777" uuid="199d0392-4d6f-4dd3-ba48-9f900122e363" chunkPositionInArray="[0,0]" nBytes="69538" md5="426fc01449ab3dad9d90b5f9eb7d40e9"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TropTemp_D_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="140091004" uuid="d1f8423b-46d5-4b00-8964-5601819b15fc" chunkPositionInArray="[0,0]" nBytes="68230" md5="14613beb750748f96f727e326096ffba"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="TotalCounts_TqJ_D">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="257457467" uuid="acfe4667-4baf-4a70-ba86-6e223404cfc2" chunkPositionInArray="[0,0]" nBytes="33687" md5="ea01f2d2ab6f1e6d2ce43cda27b4e16c"/>
+    </h4:chunks>
+  </Int16>
+  <Int16 name="OLR_A_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="130924103" uuid="85303f79-b389-46cf-80a8-6835f85a9ebe" chunkPositionInArray="[0,0]" nBytes="34222" md5="4377164f7766f53af11303da9062c88f"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="CloudTopPres_TqJ_A_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="231074884" uuid="62f36c3a-1466-4053-83a6-5d39ebe11c89" chunkPositionInArray="[0,0]" nBytes="84505" md5="3529639cafb76022961d1625916c80d9"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TropPres_TqJ_D_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="265862788" uuid="5ea7a11e-725b-49d0-9236-b750042a8f44" chunkPositionInArray="[0,0]" nBytes="78131" md5="fcff9c0e7f646dbea68c597f7fbd76c7"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="H2O_MMR_Lyr_TqJ_D">
+    <Dim name="/H2OPressureLay"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>4</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="266840974" uuid="458fda97-abec-4e20-ae5a-95f0a04b5ce7" chunkPositionInArray="[0,0,0]" nBytes="1112373" md5="efe77933dcbd6e8f07830736c1f6d975"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CoarseCloudLayer">
+    <Dim name="/CoarseCloudLayer"/>
+    <Attribute name="CLASS" type="String">
+      <Value>DIMENSION_SCALE</Value>
+    </Attribute>
+    <Attribute name="NAME" type="String">
+      <Value>CoarseCloudLayer</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="long_name" type="String">
+      <Value>Mid-layer pressure</Value>
+    </Attribute>
+    <Attribute name="units" type="String">
+      <Value>hPa</Value>
+    </Attribute>
+    <Attribute name="format" type="String">
+      <Value>F7.2</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3</h4:chunkDimensionSizes>
+      <h4:byteStream offset="131564231" uuid="be0b9cde-228a-42a3-862e-2d6cc164ad8e" chunkPositionInArray="[0]" nBytes="20" md5="5bbb0bd53711bae49dc9e3c6b37bebd6"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CoarseCloudTemp_A_max">
+    <Dim name="/CoarseCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>0</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="111270011" uuid="858be314-bbfa-44bb-a9da-ebf868014881" chunkPositionInArray="[0,0,0]" nBytes="246683" md5="f15f874be8761c5d5dc0712d5fef0f66"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="CoarseCloudPres_A_ct">
+    <Dim name="/CoarseCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>0</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="109727500" uuid="2709d385-921e-41c2-b0d3-bf67bf85d6f4" chunkPositionInArray="[0,0,0]" nBytes="107534" md5="dc148d802d2f25c250d063b9357a7bcc"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="RelHum_TqJ_D_min">
+    <Dim name="/H2OPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>5</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="280421931" uuid="1c3e3612-8190-4862-bb1b-cb2ac86f1549" chunkPositionInArray="[0,0,0]" nBytes="804101" md5="56c860e5061a35a5d95970339b4c230d"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="Temperature_TqJ_D_min">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="52957752" uuid="c3f058ff-645e-4693-b04d-55861d5ebab1" chunkPositionInArray="[0,0,0]" nBytes="191013" md5="18d90728a72884b341e2022d5c59590b"/>
+      <h4:byteStream offset="53148765" uuid="c13b116f-7d6e-4b5f-aa03-7ea12aa84b12" chunkPositionInArray="[0,0,180]" nBytes="192180" md5="c99c26c283b87a659293795dc1dbda53"/>
+      <h4:byteStream offset="53340945" uuid="97c0f1f5-f69b-4ebe-bb1c-965c906409bf" chunkPositionInArray="[0,90,0]" nBytes="190881" md5="c73aed49e2154e141c1455e30909389f"/>
+      <h4:byteStream offset="262289718" uuid="cd5b0178-738b-4fb0-8a67-6f17e1c3b61a" chunkPositionInArray="[0,90,180]" nBytes="186028" md5="404bc7c187681f06f447cb54179824e6"/>
+      <h4:byteStream offset="262475746" uuid="4668cbc2-23d8-46e4-b0d0-c668b7f6133c" chunkPositionInArray="[12,0,0]" nBytes="181791" md5="08b1e23fd0a416e0e516d3523357e5d2"/>
+      <h4:byteStream offset="262657537" uuid="f8306187-31be-43b9-aa5f-9f95756afe53" chunkPositionInArray="[12,0,180]" nBytes="184699" md5="d1b29883b2d74fa47eb331d05f34b0a7"/>
+      <h4:byteStream offset="262842236" uuid="84f0c280-867f-478c-876f-50f5228cbbbd" chunkPositionInArray="[12,90,0]" nBytes="197701" md5="10ad79518643770b82b81ba13d882991"/>
+      <h4:byteStream offset="263039937" uuid="7d130f75-cf0e-46d3-848b-8b64414c592f" chunkPositionInArray="[12,90,180]" nBytes="195724" md5="580518ef9163fc24056876ce43cacb11"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="CoarseCloudTemp_A_ct">
+    <Dim name="/CoarseCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>0</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="110690610" uuid="51f96295-a354-4c5e-b527-9f340ecb1b78" chunkPositionInArray="[0,0,0]" nBytes="107534" md5="dc148d802d2f25c250d063b9357a7bcc"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="ClrOLR_A_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="131319810" uuid="74b36e21-a866-4fa4-8921-0eae352c83c6" chunkPositionInArray="[0,0]" nBytes="84162" md5="49543cbea951fd5fde3bb8b589432062"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TropTemp_TqJ_A_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="202728115" uuid="a1e9d1c6-e66e-4c92-86ce-fb6a715eb1ae" chunkPositionInArray="[0,0]" nBytes="69988" md5="ab526d38961b9f27af243d218cd7cab3"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TropHeight_TqJ_A">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="223000832" uuid="d1eb8283-3b1a-4ce8-9beb-6dea0f5af6ee" chunkPositionInArray="[0,0]" nBytes="91221" md5="456a9c96ae4b93b7b4fae86ffbc70ebb"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="SurfSkinTemp_TqJ_D_err">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="258095911" uuid="f87938b6-6f86-4aa7-9b8d-e74dcf61637f" chunkPositionInArray="[0,0]" nBytes="66901" md5="f836b7373c0dbe9d38324448c6c65dce"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="O3_VMR_TqJ_D_max">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="61005958" uuid="f782105f-a0f4-4cce-9754-7eabe8a8d360" chunkPositionInArray="[0,0,0]" nBytes="237496" md5="96fa663faa6d8ed7ac0b5d59ce20eb9a"/>
+      <h4:byteStream offset="61243454" uuid="aef1ac68-f53b-4e0d-8ef1-ef2419f93e4e" chunkPositionInArray="[0,0,180]" nBytes="238755" md5="1684ec414f06d448bb980f5515ea8aca"/>
+      <h4:byteStream offset="61482209" uuid="0d3f4494-1594-4744-9c87-eed5406d08da" chunkPositionInArray="[0,90,0]" nBytes="230747" md5="bcfc08cbbabdc75af8d114cdc54ae6b9"/>
+      <h4:byteStream offset="305675550" uuid="143a0ed0-aeba-42fa-bd3d-650938377a48" chunkPositionInArray="[0,90,180]" nBytes="221010" md5="b0050fdd6ff84e147ccde2c2d97c80b5"/>
+      <h4:byteStream offset="305896560" uuid="fd5edeec-527c-405f-b58c-14981a9c1c44" chunkPositionInArray="[12,0,0]" nBytes="240715" md5="8f59e7bd444d2ecfadb487323975ee19"/>
+      <h4:byteStream offset="306137275" uuid="17f0136f-fda5-4b6a-8576-b78f86d55c2d" chunkPositionInArray="[12,0,180]" nBytes="243603" md5="350ff527507b3881b98dc0d2c0d1fe31"/>
+      <h4:byteStream offset="306380878" uuid="b3140e59-a50c-485f-88ba-b0ae92f9b206" chunkPositionInArray="[12,90,0]" nBytes="248670" md5="bab1f5e4afdd11b190a2b73e83f41088"/>
+      <h4:byteStream offset="306629548" uuid="3e3e629a-4dc5-4596-a40b-8f4d132c7fb8" chunkPositionInArray="[12,90,180]" nBytes="241114" md5="588315776502b3b24a39a98049c741fe"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="ClrOLR_TqJ_A_err">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="257443537" uuid="d11366b9-7bd4-45f5-881f-958cc422c898" chunkPositionInArray="[0,0]" nBytes="13930" md5="bc18c6d4afa935d49458ea2adb16613c"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CoarseCloudFrc_TqJ_A">
+    <Dim name="/CoarseCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>0</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="234547115" uuid="0d98ab7c-2725-45a9-8ab6-bbb933b5e5a4" chunkPositionInArray="[0,0,0]" nBytes="240856" md5="a94d41e10425a2f0c547c4eaea93f2ed"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="SurfPres_Forecast_TqJ_A_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="193963712" uuid="524273ac-e14a-489d-839e-8bef4e3fd945" chunkPositionInArray="[0,0]" nBytes="38097" md5="7ecb5454a268cdff2fbe0fe8ea8b6d10"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="SurfSkinTemp_D_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="132116291" uuid="47655229-406d-4582-96dd-304afb8a4f06" chunkPositionInArray="[0,0]" nBytes="65572" md5="a9f1e4637d6fe594166221139a23d3cc"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="FineCloudFrc_D_min">
+    <Dim name="/FineCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>3</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="170399650" uuid="b16b6e82-4fc5-405b-a09c-ff519193152e" chunkPositionInArray="[0,0,0]" nBytes="83014" md5="21069409ce02889277db4f1c51032fa9"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="OLR_TqJ_A_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="256803025" uuid="266f271e-dde5-48d5-97b2-302b267583a4" chunkPositionInArray="[0,0]" nBytes="38097" md5="7ecb5454a268cdff2fbe0fe8ea8b6d10"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="RelHum_liquid_TqJ_A_max">
+    <Dim name="/H2OPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>5</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="221906384" uuid="522b4786-8089-4dcf-b5c4-80ad51a25212" chunkPositionInArray="[0,0,0]" nBytes="793097" md5="59902b056e52dd7a531763af23a0e3cb"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="RelHum_D_min">
+    <Dim name="/H2OPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>5</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="154057251" uuid="41719263-7d56-47b9-8f3d-938cd7ebc892" chunkPositionInArray="[0,0,0]" nBytes="789352" md5="b5565e12de4d5ce722a74768b5446dff"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CoarseCloudPres_TqJ_A">
+    <Dim name="/CoarseCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>0</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="235439646" uuid="c16aeb10-faaa-4a22-bf5b-e22f6d0d1606" chunkPositionInArray="[0,0,0]" nBytes="198125" md5="8462aea5a37170190bd37c1bb8d55ade"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="RelHum_D_ct">
+    <Dim name="/H2OPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>5</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="152730669" uuid="8192abe9-9c80-4bb2-a7cf-0da5f579c257" chunkPositionInArray="[0,0,0]" nBytes="414055" md5="3d5b5000158635d0c7d4c10796118926"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="H2O_MMR_Lyr_D">
+    <Dim name="/H2OPressureLay"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>4</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="140647023" uuid="50dc68dd-b093-40dc-b78b-8a8cbf10adc8" chunkPositionInArray="[0,0,0]" nBytes="1111566" md5="9d2dd241f8a8f59a7aad83e567944c64"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="SurfAirTemp_D_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="139152490" uuid="43e9e3bd-f8a9-4b26-97a2-7a1630becd26" chunkPositionInArray="[0,0]" nBytes="38388" md5="98b43c6ca989ef8c06b25b3d02d8db36"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="EmisIR_TqJ_D_max">
+    <Dim name="/EmisFreqIR"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>1</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>4 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="258915420" uuid="09a4365f-7867-4b78-9f4d-be37c34d0ecb" chunkPositionInArray="[0,0,0]" nBytes="159646" md5="334c2e312aaa459f360f8c0af97c4958"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="SurfAirTemp_A">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="76509445" uuid="bc2175d0-61c2-484d-aa4f-a615589476b4" chunkPositionInArray="[0,0]" nBytes="69701" md5="586472a08a9ae4bac1f5baf390cb5e8f"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotCldLiqH2O_MW_A_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="320929036" uuid="e811235b-ea6b-4ed8-bb2a-443340dd8b44" chunkPositionInArray="[0,0]" nBytes="1161" md5="a43f0ca2084e297f3aa9763a828dcb0f"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotCO_A">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="118607512" uuid="ccd048d5-2b78-4987-8637-74c1b129219c" chunkPositionInArray="[0,0]" nBytes="80093" md5="705049977eb787e77842e6e49fe8c1c8"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="FineCloudFrc_TqJ_D_max">
+    <Dim name="/FineCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>3</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="297251368" uuid="6cd1e470-7f91-464e-9999-f572baa01d26" chunkPositionInArray="[0,0,0]" nBytes="655152" md5="88fb8ac0e54fc88da328633c251837c8"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CloudFrc_TqJ_A_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="230666502" uuid="fe5f9637-5a33-4f15-8fbd-458dbb5c1526" chunkPositionInArray="[0,0]" nBytes="81696" md5="242a53afd18d3bab6f5429fb1c8f7bd5"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotO3_D_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="174022513" uuid="d23e8e1e-d3f3-480a-b710-3bbeee0728a5" chunkPositionInArray="[0,0]" nBytes="83484" md5="5c47b3f78ba682f2da64d9591dfd2b6b"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="RelHum_A_max">
+    <Dim name="/H2OPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>5</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="92331736" uuid="ec5ebf51-9f33-4f4e-8988-2760b850d873" chunkPositionInArray="[0,0,0]" nBytes="778437" md5="c51138d4afe000dda598965fa6706f96"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="H2O_MMR_Surf_TqJ_A_err">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="214721680" uuid="1ada8bfc-5206-4aa2-bc55-e8de44bd9cb2" chunkPositionInArray="[0,0]" nBytes="71505" md5="d3100e0cd7fe409b07a0584dda6ebab2"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CloudTopPres_A_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="105483962" uuid="2029a276-6683-4e7c-8f3b-a09bd33acb7a" chunkPositionInArray="[0,0]" nBytes="82319" md5="c744b1a3f763b2a92ed9b16ea074d52a"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="FineCloudFrc_TqJ_A">
+    <Dim name="/FineCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>3</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="231861135" uuid="e511accc-513d-4e3a-aee8-4852f456ec24" chunkPositionInArray="[0,0,0]" nBytes="696570" md5="ceb1e66d11d0991c3efcdac59453ded9"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotCO_A_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="118878776" uuid="783da9a0-f9b4-40c5-9421-7bea9fcd6f81" chunkPositionInArray="[0,0]" nBytes="77932" md5="518f6381e484221bea48d3edc4e9c1e2"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="RelHum_liquid_TqJ_D_min">
+    <Dim name="/H2OPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>5</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="284501559" uuid="57cefe3f-e4d0-4deb-a88d-dbce26dd6811" chunkPositionInArray="[0,0,0]" nBytes="807801" md5="c20d20180d9b4f6e09e382be68d96fd7"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CloudTopTemp_D_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="168351193" uuid="67552556-02c3-48a9-97dd-26ea73f9500b" chunkPositionInArray="[0,0]" nBytes="83129" md5="cc31c1abbcdd109dc9acfe81b72a9c94"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="RelHumSurf_liquid_TqJ_A">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="222699481" uuid="12ff1219-9684-4f43-8cb6-1f3c57eda0bc" chunkPositionInArray="[0,0]" nBytes="63482" md5="0b59ebbd8395451d3f4ecc0b7fa23d95"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="H2O_MMR_A_err">
+    <Dim name="/H2OPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>5</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="88105575" uuid="eb232c0d-8a77-4e60-a326-711b18eef64f" chunkPositionInArray="[0,0,0]" nBytes="832096" md5="48f643d35785413ff4408aed7e97bed4"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CoarseCloudTemp_TqJ_A_sdev">
+    <Dim name="/CoarseCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>0</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="236691956" uuid="5d8ffd65-f63d-4f7e-802a-ab2fcd035414" chunkPositionInArray="[0,0,0]" nBytes="222020" md5="28f6de66a7df4c8634144d976b953f14"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="H2O_MMR_D">
+    <Dim name="/H2OPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>5</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="146081595" uuid="2e9e5ed7-d04c-49dc-89ea-77cf67ec724c" chunkPositionInArray="[0,0,0]" nBytes="1107409" md5="052def65bd7d3118cf42d26814cbb4dd"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CloudFrc_A_err">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="105291137" uuid="a062bbf3-8b81-4010-99ba-55d4027e1b96" chunkPositionInArray="[0,0]" nBytes="79345" md5="3b6edbb718058efe8dd663fce6065027"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotH2OVap_TqJ_A_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="203006968" uuid="10c07c7e-d6cb-4ac2-873b-14e58c361b83" chunkPositionInArray="[0,0]" nBytes="84364" md5="bd0517987079699bf8c2b54a7862535a"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="GPHeight_MW_D_sdev">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="68761569" uuid="dfe6049a-af74-4b42-a9d4-e179be195724" chunkPositionInArray="[0,0,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="68764990" uuid="bb354711-66d0-41e5-a034-812ba199dfd0" chunkPositionInArray="[0,0,180]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="68768411" uuid="0a1f9fb4-73ef-45c9-96b3-c3fbe3bfe00d" chunkPositionInArray="[0,90,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="321100718" uuid="d2db84a7-ec9b-4b86-9201-694559b9dadb" chunkPositionInArray="[0,90,180]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="321104139" uuid="703ec54d-9c19-4a80-8491-0e146899f8f3" chunkPositionInArray="[12,0,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="321107560" uuid="66fe9569-3432-4a75-aca5-6801ef282101" chunkPositionInArray="[12,0,180]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="321110981" uuid="46b0e08e-ddbb-4364-9af1-062c2cba7f3d" chunkPositionInArray="[12,90,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="321114402" uuid="12ac9c8e-15dc-48c4-9ec5-249c874413e5" chunkPositionInArray="[12,90,180]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="CoarseCloudFrc_A_ct">
+    <Dim name="/CoarseCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>0</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="108929834" uuid="cb965434-18ec-4144-9464-ec8ea90d2387" chunkPositionInArray="[0,0,0]" nBytes="101907" md5="95eb78e4e95420636dab7d4bfe1007f5"/>
+    </h4:chunks>
+  </Int16>
+  <Int16 name="CO_VMR_D_ct">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>24 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="182339636" uuid="21d267fe-df13-4ef3-9a68-2c06b10a3c38" chunkPositionInArray="[0,0,0]" nBytes="854041" md5="b1080df902ba83ad66aca379343bb239"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="H2O_MMR_Surf_TqJ_D">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="277785987" uuid="c24ea639-8f97-4cdc-bc3e-68fde7bdeb3f" chunkPositionInArray="[0,0]" nBytes="88329" md5="fc7d59f2e4f71811f7fd499603e8bab7"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="OLR_A_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="131039236" uuid="5041d4ae-0922-4726-806f-aeb5a280652d" chunkPositionInArray="[0,0]" nBytes="82365" md5="b6dae77bf46742d278cbe3299370c785"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CloudFrc_D">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="167437036" uuid="428bf7fc-697b-45b6-8051-b532a2aa9397" chunkPositionInArray="[0,0]" nBytes="79187" md5="e98836f2f0adc1a6c2a119cb5595cae3"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="FineCloudFrc_TqJ_D_sdev">
+    <Dim name="/FineCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>3</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="296371599" uuid="95d5aaa6-811c-470e-bda9-af18f3cf85b0" chunkPositionInArray="[0,0,0]" nBytes="683766" md5="51655b71e6dd83448ffac89e0c0d3cc5"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="TotCO_TqJ_D_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="307840762" uuid="716d69ad-a886-4bdb-a278-486fcbd9c45e" chunkPositionInArray="[0,0]" nBytes="36254" md5="184974b563bb2bed9b29944bafef9f6d"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="TotH2OVap_TqJ_A_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="203187944" uuid="7c0d8f2c-23c8-41bf-ba6e-c64887054ef5" chunkPositionInArray="[0,0]" nBytes="95502" md5="edbf129eae5b12b7e31884bf61bb3531"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CoarseCloudPres_TqJ_A_max">
+    <Dim name="/CoarseCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>0</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="236158687" uuid="d886fa36-2e51-451c-827f-50a04e5fae16" chunkPositionInArray="[0,0,0]" nBytes="190040" md5="b17cbde638e4bbf30948a02350842f65"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotH2OVap_MW_A_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="320842958" uuid="7a4400b4-78df-4280-909f-2deb30538f14" chunkPositionInArray="[0,0]" nBytes="1161" md5="a43f0ca2084e297f3aa9763a828dcb0f"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="H2O_MMR_D_min">
+    <Dim name="/H2OPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>5</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="148514219" uuid="4b7d4ede-a6e3-4533-9a55-6d1946f0daec" chunkPositionInArray="[0,0,0]" nBytes="1070260" md5="3fecf498cbfc7967575caf1e74d99a36"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="EmisIR_A_err">
+    <Dim name="/EmisFreqIR"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>1</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>4 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="70565159" uuid="9fcdc317-9ee9-4d9e-8baa-7b7b1289a07b" chunkPositionInArray="[0,0,0]" nBytes="174108" md5="f2c447c8be6439fcaf06bf55e3200964"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="GPHeight_TqJ_A_max">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="40505453" uuid="47bca0b7-1a67-4aaa-9a38-f2d8f40e8304" chunkPositionInArray="[0,0,0]" nBytes="417172" md5="e18a97097e297dd0537273f77d802aae"/>
+      <h4:byteStream offset="40922625" uuid="a55b4c10-328f-48c2-ab60-49e57e5853f2" chunkPositionInArray="[0,0,180]" nBytes="412777" md5="bb3787a9257712b682b95603e2b97ec7"/>
+      <h4:byteStream offset="41335402" uuid="7d0ed61e-50c6-4e99-8d39-86ea0cd78acb" chunkPositionInArray="[0,90,0]" nBytes="411891" md5="559310111fe2be7820865842338f9484"/>
+      <h4:byteStream offset="228598437" uuid="e9ec0bf5-4c54-4eeb-8129-caba8319525a" chunkPositionInArray="[0,90,180]" nBytes="394434" md5="0de060cca5d02d657cc79c63e0b922ce"/>
+      <h4:byteStream offset="228992871" uuid="794355a8-9652-4bee-9f59-5e2cca8c6174" chunkPositionInArray="[12,0,0]" nBytes="378121" md5="703a2719bfe7ea8b5c5123d2c52ad2c5"/>
+      <h4:byteStream offset="229370992" uuid="6ac8b152-09cc-4c9b-916e-52dd904542ea" chunkPositionInArray="[12,0,180]" nBytes="380692" md5="0649ae95e3298b0453612d1f3cf30507"/>
+      <h4:byteStream offset="229751684" uuid="7ab9b69a-f76d-4a8e-9562-063b4d3ec177" chunkPositionInArray="[12,90,0]" nBytes="397033" md5="6f9062e9849e956795e624dd2f6e75f7"/>
+      <h4:byteStream offset="230148717" uuid="0c304890-c44d-4f35-ad62-bea79661e062" chunkPositionInArray="[12,90,180]" nBytes="395873" md5="ce99f74e07728d261d6c4334d9f7c5ff"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="RelHum_liquid_D_sdev">
+    <Dim name="/H2OPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>5</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="157138584" uuid="931b01c0-3a71-42d5-b3fe-8fc1c724134f" chunkPositionInArray="[0,0,0]" nBytes="912965" md5="ecf98fcd4e9007cf28088813ba147341"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="O3_VMR_A">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="8056332" uuid="79a05b9f-0a11-450a-a599-9be1eb0b5c57" chunkPositionInArray="[0,0,0]" nBytes="245487" md5="b8d38ce3398ca9dc0372038554ef4f87"/>
+      <h4:byteStream offset="8301819" uuid="8a9f075b-dbae-46c3-889a-632fc54160e3" chunkPositionInArray="[0,0,180]" nBytes="247564" md5="ce45910aabfa00ec3b443af350a271f3"/>
+      <h4:byteStream offset="8549383" uuid="4c07a308-7e9b-40aa-afe8-3b2d840340e6" chunkPositionInArray="[0,90,0]" nBytes="239609" md5="cb25257238a3e2c9daf15a980c5d3a54"/>
+      <h4:byteStream offset="111932581" uuid="c0185669-9e68-489e-8f33-03e4f341c136" chunkPositionInArray="[0,90,180]" nBytes="227535" md5="67b543ac7374066087a6e7109f550991"/>
+      <h4:byteStream offset="112160116" uuid="ecda2bb9-7236-449e-8ccc-2ad9c02cea8e" chunkPositionInArray="[12,0,0]" nBytes="257376" md5="79de211634097c8a8dd64798eb43a78b"/>
+      <h4:byteStream offset="112417492" uuid="bf8cffae-9310-47dd-b24b-56915d364f8e" chunkPositionInArray="[12,0,180]" nBytes="260531" md5="70173d6cf2415c3b740be3cbe94dd44e"/>
+      <h4:byteStream offset="112678023" uuid="d620fdcb-8e78-4cb5-ae6f-ee493eb5cd9c" chunkPositionInArray="[12,90,0]" nBytes="263261" md5="888261673585db12dba939d88bbe4dc7"/>
+      <h4:byteStream offset="112941284" uuid="610b0cb2-25d6-459e-8382-3fb875e22d07" chunkPositionInArray="[12,90,180]" nBytes="258932" md5="9dfe153fc373377df3db1d1b1cdc65af"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotH2OVap_TqJ_D">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="266353185" uuid="174923f9-3b6b-4e89-8cc3-580cab95b6f9" chunkPositionInArray="[0,0]" nBytes="99602" md5="d3fb0731d81edab08ec573d34c842238"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CloudTopTemp_TqJ_A_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="231697007" uuid="d479df98-2882-4b20-81a7-06a72e37b47c" chunkPositionInArray="[0,0]" nBytes="87731" md5="ecf90f446650adeedb8bd77dca804044"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="RelHumSurf_A">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="93110173" uuid="4fe43920-b328-44c6-a64e-a8d174bcdfed" chunkPositionInArray="[0,0]" nBytes="63293" md5="863b22b7619b4619c5d8bf393800b466"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="OLR_TqJ_A">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="256719080" uuid="13bf3774-1138-4d80-b3df-34991aa7d348" chunkPositionInArray="[0,0]" nBytes="83945" md5="8c031197d303da93d6ecf5f2cd828274"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="GPHeight_A_min">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="5445900" uuid="bf7e9e0a-fbc1-492b-b7e4-bcafba113c83" chunkPositionInArray="[0,0,0]" nBytes="415706" md5="dd2a8d191a3225787a6550405e237236"/>
+      <h4:byteStream offset="5861606" uuid="01021793-cacd-4326-b10e-6c2cc5215bdb" chunkPositionInArray="[0,0,180]" nBytes="409410" md5="745080ab932ea7d3d0ba69bf43386491"/>
+      <h4:byteStream offset="6271016" uuid="38b1ffee-cc6d-45cb-a7f0-96f655070e3f" chunkPositionInArray="[0,90,0]" nBytes="411700" md5="c35ad13b60abc3f5f961e2d1e355cad0"/>
+      <h4:byteStream offset="101098366" uuid="095ebcd2-472d-4eb6-a02d-35899c2eb312" chunkPositionInArray="[0,90,180]" nBytes="393836" md5="22c008089358b508c7f54dfee2feb9ba"/>
+      <h4:byteStream offset="101492202" uuid="ec0a7773-d2ff-48aa-813c-1dc5a25a7857" chunkPositionInArray="[12,0,0]" nBytes="378787" md5="8d2e1039ade5bc99a33e533ae82f49fe"/>
+      <h4:byteStream offset="101870989" uuid="b9fb3666-87e1-401c-ab38-795cb227e33f" chunkPositionInArray="[12,0,180]" nBytes="377961" md5="10e6ea35683e694e89218b4a00a67824"/>
+      <h4:byteStream offset="102248950" uuid="2a72f6bb-acde-4c95-b1a5-432fc594a940" chunkPositionInArray="[12,90,0]" nBytes="395700" md5="5477b9ac317d0fc1c76a69970aea5b32"/>
+      <h4:byteStream offset="102644650" uuid="167c2301-bcff-4c02-b5ea-622dcbf3c55f" chunkPositionInArray="[12,90,180]" nBytes="393214" md5="f560519a0edde0ee977d1fb403858f65"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="SurfSkinTemp_TqJ_A_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="194274191" uuid="2ef28a56-6a89-41ba-96e2-d8ccac0036e5" chunkPositionInArray="[0,0]" nBytes="37664" md5="bdb2e87306e9bee69aa06b00449a63b5"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="H2O_MMR_Lyr_TqJ_D_max">
+    <Dim name="/H2OPressureLay"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>4</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="270397948" uuid="2c236abe-4cdf-4402-82d0-85881edc717d" chunkPositionInArray="[0,0,0]" nBytes="1065507" md5="f67c317c8438ebd711893e6fa7cbfdc1"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="SurfAirTemp_A_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="76700922" uuid="09d1ea26-ed12-435f-8575-3b3d215e27f6" chunkPositionInArray="[0,0]" nBytes="69465" md5="3b5e6f45647793af81274d0b06aeb309"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CoarseCloudFrc_D_min">
+    <Dim name="/CoarseCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>0</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="171663690" uuid="34940227-7304-4868-b542-27368c955dbf" chunkPositionInArray="[0,0,0]" nBytes="62600" md5="3fdaec1a79e609e04b780454fb4a4437"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="TotCH4_TqJ_A_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="250927140" uuid="5e64da87-1377-4683-a798-8cc8f0a50bb6" chunkPositionInArray="[0,0]" nBytes="36810" md5="8f8a298db8d8204f33bd4cacf22afaaa"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="CoarseCloudTemp_A_sdev">
+    <Dim name="/CoarseCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>0</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="110798144" uuid="7b36b92f-a0f2-425e-aaf6-62315b8d7e7f" chunkPositionInArray="[0,0,0]" nBytes="226601" md5="cf1ccf77c93966f90dfd4bbc3cf287a2"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CloudTopPres_TqJ_A_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="231240473" uuid="46b17418-86e0-4fba-8ff0-ddb91ebe39e9" chunkPositionInArray="[0,0]" nBytes="70517" md5="6b4c3388b57a976485d1841414f2ebf0"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="TotH2OVap_MW_D_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="321065955" uuid="d9e40de3-98b3-4520-9f04-4350ecbf3c5b" chunkPositionInArray="[0,0]" nBytes="589" md5="13194f25768e29a4921fa9f6ba022342"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="CO_VMR_A_max">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="13612355" uuid="78592d52-021b-43f6-aba2-8750155d17b2" chunkPositionInArray="[0,0,0]" nBytes="233291" md5="463f1c41c5f2d5eea054ea8039b25a84"/>
+      <h4:byteStream offset="13845646" uuid="8a450d27-7163-4286-a446-c69d032464d0" chunkPositionInArray="[0,0,180]" nBytes="239364" md5="bb9bd304860744ec26022f65ce9604de"/>
+      <h4:byteStream offset="14085010" uuid="0e1ea886-1801-4808-883f-f8de59f98fcb" chunkPositionInArray="[0,90,0]" nBytes="221210" md5="164433c2cb9e7e4e13f3bcf311493379"/>
+      <h4:byteStream offset="123004328" uuid="4cd1ef93-c880-4cb9-af6a-aa2d60640a78" chunkPositionInArray="[0,90,180]" nBytes="209371" md5="85ef9513d3bfe03ef8bca2324a4ca6c4"/>
+      <h4:byteStream offset="123213699" uuid="9606e29e-cca7-4819-a1f5-bf9b1de5077e" chunkPositionInArray="[12,0,0]" nBytes="202184" md5="6972b03895d4684e1efa5b53b5a52bef"/>
+      <h4:byteStream offset="123415883" uuid="40f43082-d0e2-490c-87e8-56db9bef6976" chunkPositionInArray="[12,0,180]" nBytes="209610" md5="dc13b8a101a666dab021ef0ebb5d262f"/>
+      <h4:byteStream offset="123625493" uuid="21eed19f-b66d-463a-9dac-832a8c343734" chunkPositionInArray="[12,90,0]" nBytes="203776" md5="1cea737ea8e779ed5d29c08cd533ba3c"/>
+      <h4:byteStream offset="123829269" uuid="d10eb761-260b-4b7a-b139-dfedabad0a70" chunkPositionInArray="[12,90,180]" nBytes="195935" md5="1752ef0577dbc08ad2ee0a10645154ed"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TropHeight_TqJ_A_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="223371541" uuid="31018c04-2a66-4411-9c89-c7cc2064a639" chunkPositionInArray="[0,0]" nBytes="156194" md5="0c9281ead28267fe275fbc30f3836f9a"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="GPHeight_MW_D">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="68745034" uuid="04f69038-a091-49a5-b98c-f9097382baa4" chunkPositionInArray="[0,0,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="68748455" uuid="9ab8093c-d14e-46a1-9885-377559e10403" chunkPositionInArray="[0,0,180]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="68751876" uuid="d1d3e610-6f36-4a13-8c5c-73d2f1acfbe7" chunkPositionInArray="[0,90,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="321070027" uuid="d0be5f91-8cd5-44ae-9282-44374295e70c" chunkPositionInArray="[0,90,180]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="321073448" uuid="664dda11-95d7-4109-925c-0bf072ae6942" chunkPositionInArray="[12,0,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="321076869" uuid="c950d91b-78c8-450c-83bd-b4cd3e4f1726" chunkPositionInArray="[12,0,180]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="321080290" uuid="6a85210e-b7a2-4b98-b619-c2fdf4a59571" chunkPositionInArray="[12,90,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="321083711" uuid="f15994c0-b9ce-4aef-9ea5-2b08f15a3a77" chunkPositionInArray="[12,90,180]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="GPHeight_D">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="21071559" uuid="491dafba-1895-463b-bb26-fd69880d1f2b" chunkPositionInArray="[0,0,0]" nBytes="190780" md5="224792b501acc29400e1343b615c64f7"/>
+      <h4:byteStream offset="21262339" uuid="af6b732d-73bb-4363-b55b-df1b8ef4d8a5" chunkPositionInArray="[0,0,180]" nBytes="191715" md5="4cefb067c7880d7b8d0c6203ab2fb146"/>
+      <h4:byteStream offset="21454054" uuid="21d6f411-15d9-49b1-9133-df1f315a24be" chunkPositionInArray="[0,90,0]" nBytes="193874" md5="ac7fb37eef372116ce00308c5acfcb0e"/>
+      <h4:byteStream offset="160436201" uuid="7f80a4b6-97ab-44e3-abff-066605fb9c1f" chunkPositionInArray="[0,90,180]" nBytes="188091" md5="a839e0025ebfdf6cfea16a9318e937c0"/>
+      <h4:byteStream offset="160624292" uuid="12e21da5-3c6e-4fc9-b3c2-5397837c7c38" chunkPositionInArray="[12,0,0]" nBytes="205938" md5="7bf592999faf4e2482521f9628af32e4"/>
+      <h4:byteStream offset="160830230" uuid="1e2db685-08f2-4e15-99a7-7e6c707ca3b4" chunkPositionInArray="[12,0,180]" nBytes="208887" md5="2c79c3667c984882919da39fedafd66e"/>
+      <h4:byteStream offset="161039117" uuid="7eacfe26-03ad-4054-a26d-01f9704ba156" chunkPositionInArray="[12,90,0]" nBytes="220198" md5="70ace1940da2c8572532306c9554a916"/>
+      <h4:byteStream offset="161259315" uuid="3559975a-ff15-427b-99e9-3c88b29e9843" chunkPositionInArray="[12,90,180]" nBytes="216818" md5="452c6b6d0e669db2db69e3b5b62f4fe0"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="Temperature_MW_D_max">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="68718555" uuid="3ec946f2-3d28-45dc-a658-0690f1cf552e" chunkPositionInArray="[0,0,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="68721976" uuid="1e0ea28a-3217-4641-b11f-b2ac78ae9dcb" chunkPositionInArray="[0,0,180]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="68725397" uuid="e46b6429-d766-4cc2-a61b-b748489c74bb" chunkPositionInArray="[0,90,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="321047689" uuid="7dce3250-f332-4716-98e8-ac3806056c17" chunkPositionInArray="[0,90,180]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="321051110" uuid="78d19d4d-0451-483b-aabe-dc54c380f909" chunkPositionInArray="[12,0,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="321054531" uuid="336eb7ad-df58-4028-90d1-3d11ac8a8fee" chunkPositionInArray="[12,0,180]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="321057952" uuid="29c51d57-9d67-4bbd-8151-68eb85b82237" chunkPositionInArray="[12,90,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="321061373" uuid="36c1cf2f-d463-4b04-a7b7-76b255a48084" chunkPositionInArray="[12,90,180]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="Temperature_D">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="17841811" uuid="c06d4d36-ab3d-4774-8070-f064805ca447" chunkPositionInArray="[0,0,0]" nBytes="191721" md5="ea2da4da273a3ed2f81385bcc2566918"/>
+      <h4:byteStream offset="18033532" uuid="a6118f66-a6f0-42f5-86c0-ef86680cb6a0" chunkPositionInArray="[0,0,180]" nBytes="191249" md5="1d8cda0c770f49edad880587eee8a6ae"/>
+      <h4:byteStream offset="18224781" uuid="1f73ac9c-f37d-457f-94df-e585fccbb2ab" chunkPositionInArray="[0,90,0]" nBytes="189848" md5="c92e808942bd22fdc032c79872a642d1"/>
+      <h4:byteStream offset="133321984" uuid="76d10a84-07a2-4269-8f32-4d6ab63ade0a" chunkPositionInArray="[0,90,180]" nBytes="183340" md5="70c1ad6e1a4a45285624bcb33747b71a"/>
+      <h4:byteStream offset="133505324" uuid="2175e0ae-2709-4faa-9ae1-5b6dd01fda0e" chunkPositionInArray="[12,0,0]" nBytes="176926" md5="dec192e0fd66d8e6b9a4d7d1cf7663fc"/>
+      <h4:byteStream offset="133682250" uuid="ea7a0ec0-7259-4e2e-be79-11bf7ce4e0bb" chunkPositionInArray="[12,0,180]" nBytes="178160" md5="735bf13fc4af42b49375ce70604d4e76"/>
+      <h4:byteStream offset="133860410" uuid="b52e2ffb-a32c-4ca0-93c5-74e8eb4954da" chunkPositionInArray="[12,90,0]" nBytes="193804" md5="c62f0e1f55546d455e606e6c083e8648"/>
+      <h4:byteStream offset="134054214" uuid="31adc66a-3640-40b1-b7ae-ed64e308bbe5" chunkPositionInArray="[12,90,180]" nBytes="191341" md5="1ef0b925eeae65a5bb8ff4584a1f4c8a"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="H2O_MMR_Surf_A_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="89144397" uuid="f3df6ce8-a69d-4b87-bb28-c5295355fc1c" chunkPositionInArray="[0,0]" nBytes="88880" md5="c5546001dca95ac1d04141f47cd3b6a2"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TropHeight_TqJ_A_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="223130150" uuid="74abcad0-df14-4340-8fdd-0b3466d194b0" chunkPositionInArray="[0,0]" nBytes="85254" md5="36165146bb9916f44fb268c79267aa10"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CloudTopTemp_TqJ_A_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="231602899" uuid="417780df-c8d6-48fc-897d-48cff2555998" chunkPositionInArray="[0,0]" nBytes="94108" md5="7be39e02131155342d95e279a763bfe5"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="GPHeight_D_min">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="22372500" uuid="24aa8dbf-cadb-459d-9563-826450d06a75" chunkPositionInArray="[0,0,0]" nBytes="416034" md5="957cc1e817b1ae7eb53b9819e3b61578"/>
+      <h4:byteStream offset="22788534" uuid="26895420-d075-4b15-bc5e-36127dc7888b" chunkPositionInArray="[0,0,180]" nBytes="410199" md5="fc8e72f4a5d5b402b5e25ea18f7394a1"/>
+      <h4:byteStream offset="23198733" uuid="5afee06d-5bdb-4826-89bf-1e2cc0d80c05" chunkPositionInArray="[0,90,0]" nBytes="412756" md5="7b9fe3b7e882cbcb6919fb02067f42bf"/>
+      <h4:byteStream offset="163572652" uuid="c13dbae4-d10f-4f55-9103-18de4ea13c17" chunkPositionInArray="[0,90,180]" nBytes="386844" md5="2a04749a8d2faf3e80a98e42fec890fb"/>
+      <h4:byteStream offset="163959496" uuid="e1bc7686-abda-4d1f-bf38-d3f66479b01e" chunkPositionInArray="[12,0,0]" nBytes="378415" md5="8e112ccdd4e34fad773d3137d37ab108"/>
+      <h4:byteStream offset="164337911" uuid="85227269-12ac-437a-8d56-8434f09086fa" chunkPositionInArray="[12,0,180]" nBytes="378230" md5="c95de937679c4120a54fd193c1fe2e74"/>
+      <h4:byteStream offset="164716141" uuid="51e0a14a-ac2a-41b3-b6bf-c57219067e51" chunkPositionInArray="[12,90,0]" nBytes="395409" md5="90b921372126d72bfe15b2129eb76459"/>
+      <h4:byteStream offset="165111550" uuid="dceb6d5c-1cd9-45c1-b80c-3b96c5d85792" chunkPositionInArray="[12,90,180]" nBytes="388549" md5="a4a6490af8e6ab8b896cf214aa248998"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="CloudTopTemp_TqJ_A_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="231477362" uuid="93349bf0-aea7-420a-85b0-15e1d9708776" chunkPositionInArray="[0,0]" nBytes="40151" md5="377c7d6c17a97782aa8226f0872c29cd"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="GPHeight_TqJ_D_sdev">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="55516125" uuid="5ba99d50-c8d8-4110-94a6-f9271071a83b" chunkPositionInArray="[0,0,0]" nBytes="242481" md5="9902a012f4a4a605fbefe2a1c8344030"/>
+      <h4:byteStream offset="55758606" uuid="f5878022-5371-425c-b6d7-5f7e1e20d767" chunkPositionInArray="[0,0,180]" nBytes="238100" md5="f6e6a7b6507631486fc86aec606ed28a"/>
+      <h4:byteStream offset="55996706" uuid="ac79a2f6-8273-4081-92a1-d9f8f6b7e73b" chunkPositionInArray="[0,90,0]" nBytes="234583" md5="b028208b22d78b9113ad0db28a4f40b5"/>
+      <h4:byteStream offset="288854140" uuid="a27974b4-03fc-4242-93f8-5bff1524a982" chunkPositionInArray="[0,90,180]" nBytes="223427" md5="894b88075702a428eea4511e77f005cf"/>
+      <h4:byteStream offset="289077567" uuid="b2e0c045-8a2b-4610-8947-166f0174089e" chunkPositionInArray="[12,0,0]" nBytes="245417" md5="a73f5906bc90b915f130a91edfde2099"/>
+      <h4:byteStream offset="289322984" uuid="ce39ee53-5b43-4869-b19e-b138f905614d" chunkPositionInArray="[12,0,180]" nBytes="244034" md5="ebc244e5f8d48ebc553cc2ad836d9614"/>
+      <h4:byteStream offset="289567018" uuid="af6b840b-efe9-4aa7-9279-35d97cbc69bb" chunkPositionInArray="[12,90,0]" nBytes="245838" md5="930fb0eddbc63451e6c72c312509fc6e"/>
+      <h4:byteStream offset="289812856" uuid="e841d477-129c-499d-8875-f9fd4cc3d85c" chunkPositionInArray="[12,90,180]" nBytes="241222" md5="ff8938c25588b40a2301a99a3b35837d"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TropHeight_TqJ_D_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="286762613" uuid="622c8030-ccfd-4235-95ce-013545b49dc6" chunkPositionInArray="[0,0]" nBytes="155014" md5="a85e686e27fba03bf5d6f9244fb51c46"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="ClrOLR_D_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="193712453" uuid="cf2b8498-1e7f-4c03-8272-bd684cfdff10" chunkPositionInArray="[0,0]" nBytes="72917" md5="503a143bfd6461d00c9f245635bfdf92"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CoarseCloudTemp_A">
+    <Dim name="/CoarseCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>0</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="110443562" uuid="4f38443a-e43c-49d5-a246-d7a84ac2cb34" chunkPositionInArray="[0,0,0]" nBytes="247048" md5="82a5826453d47938821f5b035bff7d7d"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="H2O_MMR_D_err">
+    <Dim name="/H2OPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>5</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="150645916" uuid="a6714eca-6383-4ad9-b10a-f5f7412184fd" chunkPositionInArray="[0,0,0]" nBytes="834948" md5="d0c4ac703c4c2feed68c348da3dbfee6"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="CoarseCloudPres_TqJ_A_ct">
+    <Dim name="/CoarseCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>0</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="235637771" uuid="3aa41bc0-e010-4a6d-ad91-035143472f04" chunkPositionInArray="[0,0,0]" nBytes="102871" md5="d07bb0c83a74c57ad46f53e4e600771b"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="H2O_MMR_Lyr_A_sdev">
+    <Dim name="/H2OPressureLay"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>4</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="79608729" uuid="50f33a24-da47-470d-b69b-d154b7c6ed22" chunkPositionInArray="[0,0,0]" nBytes="915190" md5="55eaf9d82f71c2e5d97afa96c7ec60fb"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CH4_VMR_TqJ_A_max">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="50572432" uuid="83b3530d-5ce1-4051-91d0-753f9019052b" chunkPositionInArray="[0,0,0]" nBytes="190191" md5="7c98bb2872a1cd6957e0b2a31b274a8d"/>
+      <h4:byteStream offset="50762623" uuid="2b506207-0ac5-4f79-9099-b8d5623816f7" chunkPositionInArray="[0,0,180]" nBytes="187765" md5="2e47a49a083e458a5068a7ac17134144"/>
+      <h4:byteStream offset="50950388" uuid="bd7514f4-7a6d-4e10-b63a-c647c1909cb6" chunkPositionInArray="[0,90,0]" nBytes="187620" md5="e326abf0383427a285a92036a4fab8c1"/>
+      <h4:byteStream offset="255006892" uuid="8d1df75b-f721-43ad-a36a-a36ad98e2b53" chunkPositionInArray="[0,90,180]" nBytes="175878" md5="3acf46d7524da8b143de5c79425629b3"/>
+      <h4:byteStream offset="255182770" uuid="37f37dee-f3d5-4b34-a02e-fccf6c8dca7d" chunkPositionInArray="[12,0,0]" nBytes="192631" md5="0bf9b48ac0aefde2569d8bfdcc51356a"/>
+      <h4:byteStream offset="255375401" uuid="bb37c8b5-ed6b-4cf7-97c9-b56a66e8a0a7" chunkPositionInArray="[12,0,180]" nBytes="191644" md5="e8560d2ea7c3640e57f5278aa9322606"/>
+      <h4:byteStream offset="255567045" uuid="ea7465bf-2bb5-470a-be6c-eca754b39038" chunkPositionInArray="[12,90,0]" nBytes="200054" md5="ac4732886b034e1ad2cf34695d260538"/>
+      <h4:byteStream offset="255767099" uuid="097c9a41-47be-409a-8683-9bb67a8c0018" chunkPositionInArray="[12,90,180]" nBytes="191363" md5="5b16f4c03133cedce68e3090a6c64daf"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="TropTemp_A_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="77333789" uuid="7c64d7a8-d824-4adc-8c70-f8c6611df278" chunkPositionInArray="[0,0]" nBytes="35475" md5="67670b8bac31293479764bf459274e16"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="H2O_MMR_Lyr_TqJ_D_min">
+    <Dim name="/H2OPressureLay"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>4</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="269327125" uuid="f4b0f71e-44e7-4543-91a4-d42d73318f97" chunkPositionInArray="[0,0,0]" nBytes="1070823" md5="ad5d6bed918d29217a505237b6feb813"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TropTemp_TqJ_D">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="266018587" uuid="30b10ee7-a676-4e0c-ba97-f510c86ddb00" chunkPositionInArray="[0,0]" nBytes="71314" md5="3b44dcbf1cc8bcf3f33124f0725f4998"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="SurfPres_Forecast_A_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="68962714" uuid="be9ecf1e-4d1c-4ad6-9b2b-0ccad31b253a" chunkPositionInArray="[0,0]" nBytes="33976" md5="6f91c5a1b972f9871dc4c5758bfdae7f"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="TropHeight_TqJ_D">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="286391686" uuid="18d46aff-5574-4bb4-a0be-526edbc6df63" chunkPositionInArray="[0,0]" nBytes="91520" md5="80985af5ae06fa06a50cb6e324dcea3a"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="LandSeaMask">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="321158427" uuid="c390af75-34bb-4087-936a-60ba9f75586e" chunkPositionInArray="[0,0]" nBytes="3777" md5="cce9f79f6073bdaf715f1a5a07bf72ec"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="CloudFrc_A_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="105240082" uuid="b5da8e8f-42b2-4dae-8ee2-bb0d41bde101" chunkPositionInArray="[0,0]" nBytes="51055" md5="785efce414ec260167dff8b5dc394eb4"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TropTemp_TqJ_D_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="266212411" uuid="cf2b0523-2738-4f58-878f-fd4cfbf1287d" chunkPositionInArray="[0,0]" nBytes="70119" md5="81b6286c32368145d6c53f9d0a0f018a"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="H2O_MMR_Surf_D_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="151604442" uuid="fb19e9a0-e651-425d-9c9d-99fc51c6c13e" chunkPositionInArray="[0,0]" nBytes="76278" md5="0703028d4f1cac58791850a166dfc143"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="CloudTopPres_D_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="167884949" uuid="ca7e3c7e-c192-4dc2-a3c2-354f7d010979" chunkPositionInArray="[0,0]" nBytes="39189" md5="10d9000377f0623e6d1057b0788039f0"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="RelHumSurf_TqJ_A_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="218691119" uuid="eb54146f-d664-41a7-b1ad-0d8679f233f9" chunkPositionInArray="[0,0]" nBytes="78313" md5="61d62aa2d2f738c171dfdc31e1a2fe3b"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CoarseCloudFrc_A_min">
+    <Dim name="/CoarseCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>0</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="109257009" uuid="c32e3848-15bb-4fdb-a852-670218d29ec8" chunkPositionInArray="[0,0,0]" nBytes="61813" md5="de6a529db52263e9d3972fcf17ba7f19"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="GPHeight_TqJ_A_ct">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>24 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="224567260" uuid="dc5ac1ec-e32b-4aaf-9b01-8aea25b273ae" chunkPositionInArray="[0,0,0]" nBytes="887098" md5="901309e5c3d064816f12f91b72a8bc83"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="EmisFreqIR">
+    <Dim name="/EmisFreqIR"/>
+    <Attribute name="CLASS" type="String">
+      <Value>DIMENSION_SCALE</Value>
+    </Attribute>
+    <Attribute name="NAME" type="String">
+      <Value>EmisFreqIR</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>1</Value>
+    </Attribute>
+    <Attribute name="long_name" type="String">
+      <Value>Wavenumber</Value>
+    </Attribute>
+    <Attribute name="units" type="String">
+      <Value>cm^-1</Value>
+    </Attribute>
+    <Attribute name="format" type="String">
+      <Value>F5.1</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>4</h4:chunkDimensionSizes>
+      <h4:byteStream offset="193872226" uuid="8406bf7b-a8b3-40dc-a8a4-5a11b5110b68" chunkPositionInArray="[0]" nBytes="22" md5="19c03d94e619f2f3d8ad1428c6c1389c"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="GPHeight_MW_D_ct">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>24 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="321087132" uuid="dadcffbd-1183-4bfc-afae-a7dcfe6efb79" chunkPositionInArray="[0,0,0]" nBytes="13586" md5="7c90147b4fcb72404dd36c4b0d82051d"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="TropTemp_A_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="77449816" uuid="1509734a-81d1-4dd5-9317-2e0ff0e72848" chunkPositionInArray="[0,0]" nBytes="67513" md5="48908e22277b7af07659fca85aa37b4f"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CloudTopTemp_D_err">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="168610984" uuid="4b1ad8d3-3ffe-45bf-a611-c76f8572799f" chunkPositionInArray="[0,0]" nBytes="71215" md5="dfed0db22d479b0ec7c22a7ae362c33f"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="CoarseCloudTemp_TqJ_D_ct">
+    <Dim name="/CoarseCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>0</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="299928117" uuid="2eec7d51-a954-43e8-8305-987cd501a7fd" chunkPositionInArray="[0,0,0]" nBytes="101476" md5="877d333af697172997a93888d6bb0e6f"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="Temperature_MW_D">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="68675222" uuid="1819a38b-43c2-42c3-8544-b36e42864ce2" chunkPositionInArray="[0,0,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="68678643" uuid="54381259-8409-4c3b-866b-10ca62550277" chunkPositionInArray="[0,0,180]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="68682064" uuid="4c217d9c-ed14-4a61-b65f-e6fd32f5958f" chunkPositionInArray="[0,90,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="320982788" uuid="f30f779c-1735-4502-a2e1-3514fb6b5cd9" chunkPositionInArray="[0,90,180]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="320986209" uuid="05193d23-ce21-4356-afd5-7a45bbc466fe" chunkPositionInArray="[12,0,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="320989630" uuid="41435222-d14b-4252-9387-a9578295eb23" chunkPositionInArray="[12,0,180]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="320993051" uuid="9d97f9f6-68b7-45c2-81d5-3a5416fafe5b" chunkPositionInArray="[12,90,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="320996472" uuid="247e0812-9afa-4d1b-98d0-908df5b48125" chunkPositionInArray="[12,90,180]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="FineCloudFrc_D_sdev">
+    <Dim name="/FineCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>3</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="169752083" uuid="2f7f3f4d-a36c-4f7d-895e-d81e392e1374" chunkPositionInArray="[0,0,0]" nBytes="647567" md5="23eff3ff705f2a50b090960fc1c7c13a"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotCO_D_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="181139550" uuid="6d675e7e-50ad-4fde-a236-0c4a03415ab6" chunkPositionInArray="[0,0]" nBytes="76439" md5="175b6a79294b9e833673d8a7c7a29ca0"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="ClrOLR_TqJ_A_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="257370861" uuid="d35f255c-30d1-435e-bcc2-0b792ff8ced2" chunkPositionInArray="[0,0]" nBytes="72676" md5="820d8fe5fe00d730dc0dc31f79fef437"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CoarseCloudPres_TqJ_D">
+    <Dim name="/CoarseCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>0</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="298793280" uuid="ebcbb171-678f-4653-a33e-2b87580c7435" chunkPositionInArray="[0,0,0]" nBytes="195808" md5="b3a2bd8b07ffb8f57d7e7b4289de2e51"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="RelHumSurf_A_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="93173466" uuid="822abceb-8981-4008-ad43-d23ad7fee397" chunkPositionInArray="[0,0]" nBytes="36074" md5="99eb3fdfc1da7941658a25a3e084c4f2"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="CoarseCloudPres_A_sdev">
+    <Dim name="/CoarseCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>0</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="109835034" uuid="9f943104-74e2-4eca-8fb3-e68f2c0886dc" chunkPositionInArray="[0,0,0]" nBytes="224719" md5="c670c0ef353aff646875a4cd4430fb36"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="CoarseCloudPres_D_ct">
+    <Dim name="/CoarseCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>0</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="172128487" uuid="1a972904-deff-4571-b2b6-6a72dff863fb" chunkPositionInArray="[0,0,0]" nBytes="106725" md5="d4ad498c418368eac52a9460701e20c3"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="H2O_MMR_Surf_TqJ_D_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="278071531" uuid="ae7c03f6-fad3-40bf-8d72-7d227f00fcb4" chunkPositionInArray="[0,0]" nBytes="84559" md5="172841b4cd104f8e5eec99fd8ddf180d"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TropPres_TqJ_A">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="202172909" uuid="c63af61b-b9cd-4919-b2b3-4381e463f0be" chunkPositionInArray="[0,0]" nBytes="82391" md5="2919ec56bc54ed7cafb9ce32239c82b0"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotH2OVap_TqJ_D_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="266491153" uuid="5599ebb5-0a2f-4aae-b391-ab9eefe41215" chunkPositionInArray="[0,0]" nBytes="83997" md5="7bdcbbf6945c2213a62c769a873c39c5"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="RelHumSurf_TqJ_D_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="282189420" uuid="d0d7ac72-fc74-4f6b-9888-b3eb9c09f375" chunkPositionInArray="[0,0]" nBytes="59358" md5="c602bd785be7b559a46528152c7285e3"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="ClrOLR_D_err">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="193857360" uuid="fcf3814c-d239-4ec3-a3e7-6d2589062655" chunkPositionInArray="[0,0]" nBytes="14866" md5="97cdff74311a6e2c24d3200817d05835"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="GPHeight_D_ct">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>24 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="161476133" uuid="89d345f5-fd45-4dcc-94ce-8f7734965510" chunkPositionInArray="[0,0,0]" nBytes="896581" md5="5a376fbc4e65054db1ace6dcfd90c8ee"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="CoarseCloudPres_A">
+    <Dim name="/CoarseCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>0</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="109528469" uuid="2e2f3fe0-4d22-455c-8512-845fa9a105c0" chunkPositionInArray="[0,0,0]" nBytes="199031" md5="b690d24d0e6828062fd0513a73a42205"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="H2O_MMR_TqJ_A_err">
+    <Dim name="/H2OPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>5</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="213493366" uuid="93ced8df-5a01-4bb3-a629-07660391efb3" chunkPositionInArray="[0,0,0]" nBytes="845023" md5="0e6527c89f09061860f0b17b018ec3e8"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="EmisIR_TqJ_D_ct">
+    <Dim name="/EmisFreqIR"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>1</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>4 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="258326773" uuid="e70a1e23-9fdd-4577-91fd-80d9221ff652" chunkPositionInArray="[0,0,0]" nBytes="137378" md5="9e3129149e1daa686ab380cf03362f52"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="TotCH4_A_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="125232315" uuid="0f04477f-251a-4bf6-a984-62b3ca34cfd0" chunkPositionInArray="[0,0]" nBytes="66933" md5="875aaecd32e892aab3444d0d5c9f7fa3"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="Emis_MW_D_ct">
+    <Dim name="/EmisFreqMW"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>2</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="320970808" uuid="99542eb3-ff87-4f90-b3cf-812fba9f656a" chunkPositionInArray="[0,0,0]" nBytes="1717" md5="7b744463b12501af7f1b66dece5e41b4"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="H2O_MMR_Lyr_D_max">
+    <Dim name="/H2OPressureLay"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>4</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="144164224" uuid="e5b7cbd5-afba-40f7-9e1c-56a2a89eaa54" chunkPositionInArray="[0,0,0]" nBytes="1064851" md5="edd623f535798a5d8a52ea048959e727"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CH4_VMR_TqJ_A_min">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="50001720" uuid="66cf097a-1657-4484-89e1-86fba8dbae27" chunkPositionInArray="[0,0,0]" nBytes="192100" md5="06eb342a5cd2cfb5d376649f311336e0"/>
+      <h4:byteStream offset="50193820" uuid="78a75b92-5ab8-4a35-a424-dcf7a4c2bdf7" chunkPositionInArray="[0,0,180]" nBytes="189519" md5="c766f666a66cc84227a46d3d4b6151dc"/>
+      <h4:byteStream offset="50383339" uuid="fa106db4-7413-4fa8-b7ed-14a88b9433fe" chunkPositionInArray="[0,90,0]" nBytes="185957" md5="b7594e7574061e6e0ff3e1571289a0e1"/>
+      <h4:byteStream offset="254075963" uuid="1bf49bd5-288a-4624-aaa6-b70f0bd3ae34" chunkPositionInArray="[0,90,180]" nBytes="174463" md5="3c88221e6654256d1003959bd0499f66"/>
+      <h4:byteStream offset="254250426" uuid="55aa541d-f9f2-42b0-b3f0-f5e4c55876bf" chunkPositionInArray="[12,0,0]" nBytes="187739" md5="399b623d1831fa9e77da7b88c4032dac"/>
+      <h4:byteStream offset="254438165" uuid="284d3aa9-34b2-42a8-afc7-2b87cfbc88a0" chunkPositionInArray="[12,0,180]" nBytes="185602" md5="2d3b4b6101072da6f9b19c9c8bc9b4d6"/>
+      <h4:byteStream offset="254623767" uuid="a6adbd06-35db-474b-88f3-5646f350f690" chunkPositionInArray="[12,90,0]" nBytes="195087" md5="ebc1ce33b4face27d2a952773bda789a"/>
+      <h4:byteStream offset="254818854" uuid="5076634c-7b44-44b6-95bd-8e7d0a91fc9c" chunkPositionInArray="[12,90,180]" nBytes="188038" md5="13d3f4b0dd51b22b37575a4e26dca932"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TropHeight_D">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="159910260" uuid="e1652c4e-1afe-4750-9b92-0bd22f1f807f" chunkPositionInArray="[0,0]" nBytes="91520" md5="80985af5ae06fa06a50cb6e324dcea3a"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TropPres_D_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="139763502" uuid="ba732f56-c640-486b-907f-ade418d25b25" chunkPositionInArray="[0,0]" nBytes="75709" md5="6b24918bee37ac5290970ba63774aef3"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="Temperature_MW_A_sdev">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="68529125" uuid="9e2722fe-0d46-4300-ba2e-70b0b28cee02" chunkPositionInArray="[0,0,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="68532546" uuid="bdd7e32d-0feb-4f74-a6f2-3da67a76d423" chunkPositionInArray="[0,0,180]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="68535967" uuid="70326ac3-0d29-41be-a25b-89191e694195" chunkPositionInArray="[0,90,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="320788732" uuid="abcffc76-323e-4292-befd-fd6802e9f43c" chunkPositionInArray="[0,90,180]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="320792153" uuid="cb0ef9ab-b97b-4f50-8c35-d6b0f58c64fb" chunkPositionInArray="[12,0,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="320795574" uuid="712bd469-2733-4c48-ba05-bedb9d824937" chunkPositionInArray="[12,0,180]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="320798995" uuid="3eccc5d8-3ecd-47db-b3ea-64861d25c362" chunkPositionInArray="[12,90,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="320802416" uuid="f868a114-488c-4c11-a2d9-dbc084a844e2" chunkPositionInArray="[12,90,180]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="RelHum_D">
+    <Dim name="/H2OPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>5</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="151922562" uuid="8a03db79-e135-4ff0-b478-0660c0734a4a" chunkPositionInArray="[0,0,0]" nBytes="808107" md5="f8fa911c3bdb56235e0caaa5d970632b"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="EmisIR_TqJ_D">
+    <Dim name="/EmisFreqIR"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>1</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>4 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="258162812" uuid="0b3fa84d-2a54-4a12-8774-340e9e326a10" chunkPositionInArray="[0,0,0]" nBytes="163961" md5="a7eef3c204d80b8c34967bbf08ddf220"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="EmisIR_A">
+    <Dim name="/EmisFreqIR"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>1</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>4 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="69590917" uuid="24c1231f-7730-4a42-ac74-8ef3a49f56ee" chunkPositionInArray="[0,0,0]" nBytes="170524" md5="6615e36f39abb1f503e59e279e49e27c"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="O3_VMR_TqJ_A_min">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="43332492" uuid="450e0239-ea1a-40f8-babb-ae397b377df2" chunkPositionInArray="[0,0,0]" nBytes="237513" md5="d410f48718e4f267beaf0b7927744a5a"/>
+      <h4:byteStream offset="43570005" uuid="d7d76649-ed61-46e4-92a0-57fed18cf913" chunkPositionInArray="[0,0,180]" nBytes="238774" md5="2722fb200e85682e059ff9f441b569c4"/>
+      <h4:byteStream offset="43808779" uuid="1ba87786-90c2-4a65-a1f7-b056fcd1c2c1" chunkPositionInArray="[0,90,0]" nBytes="234841" md5="08c2c795c621c61ed93d6797c871db2b"/>
+      <h4:byteStream offset="241159394" uuid="8e01a912-3ed8-4a0a-9668-712d41415721" chunkPositionInArray="[0,90,180]" nBytes="221791" md5="92ff865c7e5f52f5545b7785368084d0"/>
+      <h4:byteStream offset="241381185" uuid="32245b84-0bd7-41e8-82b1-3ac58d603078" chunkPositionInArray="[12,0,0]" nBytes="245889" md5="5572cdb607885e478d7ea09f040067ec"/>
+      <h4:byteStream offset="241627074" uuid="a06c5fdf-2b92-4611-bfbe-7b25f6f6d428" chunkPositionInArray="[12,0,180]" nBytes="249499" md5="b2a5911df8428f73519b1303063fa7a9"/>
+      <h4:byteStream offset="241876573" uuid="c5305255-03ea-4336-9c5e-462ffda663ca" chunkPositionInArray="[12,90,0]" nBytes="252432" md5="4a052d7780ec42d252479ebe63d36c1c"/>
+      <h4:byteStream offset="242129005" uuid="26ae54b9-5581-4403-9be7-d90eb52231f1" chunkPositionInArray="[12,90,180]" nBytes="247941" md5="c190c47e4f70398de58a1e2d7ad8cb64"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotO3_A_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="111795582" uuid="1ab2fe5b-9904-46cf-8192-fb570612e793" chunkPositionInArray="[0,0]" nBytes="77088" md5="e75e757e1d07e78a697f73156f81e014"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="ClrOLR_D_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="193785370" uuid="ddce81b6-1f52-4ea0-8e17-a09fcf319c6f" chunkPositionInArray="[0,0]" nBytes="71990" md5="93d492f6947e7750d0e071d672bd24f7"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CO_VMR_A_sdev">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="12219678" uuid="f42296b8-037f-4357-937c-5fece44c15a0" chunkPositionInArray="[0,0,0]" nBytes="241697" md5="0acf0b99e7848a735d67e25e4c6696e9"/>
+      <h4:byteStream offset="12461375" uuid="af2985b3-869d-4ed8-b822-f6ae703fdeac" chunkPositionInArray="[0,0,180]" nBytes="238944" md5="730721875115aff11e4a6b456b74e66a"/>
+      <h4:byteStream offset="12700319" uuid="4401d7a4-33b5-4837-94b0-bacbedacd0d0" chunkPositionInArray="[0,90,0]" nBytes="219637" md5="0124834b21f728bd289db1a375157ec7"/>
+      <h4:byteStream offset="120851710" uuid="5f056554-097c-49b4-a1dd-52f9378d74f1" chunkPositionInArray="[0,90,180]" nBytes="200323" md5="1486393ed7208e295f19a184e60bbfdd"/>
+      <h4:byteStream offset="121052033" uuid="1a8c96d1-98a6-4e0a-b40e-0d5d5f0a319c" chunkPositionInArray="[12,0,0]" nBytes="245417" md5="ad2e72c35b240667bbb4ebd2fcf8d1c2"/>
+      <h4:byteStream offset="121297450" uuid="eae042cd-4ba4-41ee-abdd-3c1f29911b3b" chunkPositionInArray="[12,0,180]" nBytes="246910" md5="eb0dd430759a8b6b5895b08d61d1fc7f"/>
+      <h4:byteStream offset="121544360" uuid="8365b014-92f8-4796-a442-9c62ec078ecf" chunkPositionInArray="[12,90,0]" nBytes="226819" md5="8a790dd23c4b868d5fac21b15902a54f"/>
+      <h4:byteStream offset="121771179" uuid="e1c2c757-21c8-4d8a-a041-9107442e7515" chunkPositionInArray="[12,90,180]" nBytes="208849" md5="e2fe51b6196c53067d39e32d123af7c5"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CoarseCloudFrc_A_max">
+    <Dim name="/CoarseCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>0</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="109318822" uuid="5496a35f-10b6-468d-b446-1c43ce6ac920" chunkPositionInArray="[0,0,0]" nBytes="209647" md5="db004c9f95176b6ee21d608b0a8a6399"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="Emis_MW_A">
+    <Dim name="/EmisFreqMW"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>2</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="320742640" uuid="ba1c34a1-3df7-4f51-b6ae-1e9845916fa9" chunkPositionInArray="[0,0,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="RelHumSurf_liquid_D_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="159854592" uuid="5bdeac90-794a-4aa9-8807-4cf37163a77c" chunkPositionInArray="[0,0]" nBytes="55668" md5="d25800d8930b69d3e2523f81b14c2d04"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="GPHeight_TqJ_A">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="37966132" uuid="2e448c91-e48b-4469-a64c-ddadb3009656" chunkPositionInArray="[0,0,0]" nBytes="189881" md5="86f7d147467f6bd6cd9ed419e13dffb1"/>
+      <h4:byteStream offset="38156013" uuid="e43a147a-a257-406e-8c0c-ec4d703b2ead" chunkPositionInArray="[0,0,180]" nBytes="191584" md5="be41dd067f65ff05facf454c6f90b438"/>
+      <h4:byteStream offset="38347597" uuid="61ebdbd7-0d49-4ef7-a8f7-e6f0f91b3c0c" chunkPositionInArray="[0,90,0]" nBytes="193917" md5="66b2b249fb53d484bdf65ecbc6abb72e"/>
+      <h4:byteStream offset="223527735" uuid="5d341a69-76bd-48eb-ae4f-f0e1a3828f68" chunkPositionInArray="[0,90,180]" nBytes="187189" md5="91c383e306b4cb0a3f90d4d02c507337"/>
+      <h4:byteStream offset="223714924" uuid="3ba2f09b-a7d7-4d0b-96a9-06d8a05ca04a" chunkPositionInArray="[12,0,0]" nBytes="204488" md5="0b6ab0132ea5a66d51a5e487edb259a8"/>
+      <h4:byteStream offset="223919412" uuid="1dcb1b31-b2aa-445b-b1db-b16820a3abaa" chunkPositionInArray="[12,0,180]" nBytes="208688" md5="c75cc243cf99d29b3eb4973662d23629"/>
+      <h4:byteStream offset="224128100" uuid="fd25e6a4-b7a9-492a-9b61-d2d7fbdf1aa9" chunkPositionInArray="[12,90,0]" nBytes="220986" md5="b04305e6115e3b6b2df9d0911ff9a769"/>
+      <h4:byteStream offset="224349086" uuid="39e67e22-bc92-48a1-a5cc-df43bb19b317" chunkPositionInArray="[12,90,180]" nBytes="218174" md5="690d6ddbeb3888e19327aac7394071ef"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="OLR_A">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="130841802" uuid="d8518bf9-ad64-4a12-ac96-fedc78c3d9a4" chunkPositionInArray="[0,0]" nBytes="82301" md5="6c397ddf5cb508f952e9a97336a6410b"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TropPres_TqJ_A_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="202293397" uuid="02550401-ffd9-4219-8014-e70f9f9c77a3" chunkPositionInArray="[0,0]" nBytes="85124" md5="671e41fa1839a26eb4df8899cf69ecd2"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="TotalCounts_MW_A">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="320708673" uuid="77c9210b-190c-4a91-b991-4a9edc833a46" chunkPositionInArray="[0,0]" nBytes="33967" md5="c2292717a80e641f17a25184907e3403"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="CloudTopPres_TqJ_D">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="294322122" uuid="e271ecc3-8462-43f3-a353-fa22f19342ef" chunkPositionInArray="[0,0]" nBytes="75915" md5="9486a5a7ed79aec38c1d9ef3391e21ed"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="RelHumSurf_liquid_TqJ_D">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="286105260" uuid="810550f3-39ad-48cb-a522-1a57d4639f06" chunkPositionInArray="[0,0]" nBytes="60349" md5="1b35b60e94271b7d86a79315408fa9a0"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="H2OPressureLev">
+    <Dim name="/H2OPressureLev"/>
+    <Attribute name="CLASS" type="String">
+      <Value>DIMENSION_SCALE</Value>
+    </Attribute>
+    <Attribute name="NAME" type="String">
+      <Value>H2OPressureLev</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>5</Value>
+    </Attribute>
+    <Attribute name="long_name" type="String">
+      <Value>Pressure</Value>
+    </Attribute>
+    <Attribute name="units" type="String">
+      <Value>hPa</Value>
+    </Attribute>
+    <Attribute name="format" type="String">
+      <Value>F7.2</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12</h4:chunkDimensionSizes>
+      <h4:byteStream offset="131564290" uuid="9513e14f-363e-4980-8f55-27a991c34c44" chunkPositionInArray="[0]" nBytes="34" md5="08676799dc49855f9d71198e0c49d1ec"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotCO_TqJ_D">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="307760522" uuid="7756c8ec-11d1-437a-b445-de0531689258" chunkPositionInArray="[0,0]" nBytes="80240" md5="ebfd2f199184616afc8b7202166cbfb9"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotCO_D_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="181060177" uuid="e6a6f9f0-1cdf-4ea8-a2e2-b71883809ffd" chunkPositionInArray="[0,0]" nBytes="79373" md5="3efe96fb8f42ffec975770e4a4d04059"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="EmisIR_D_sdev">
+    <Dim name="/EmisFreqIR"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>1</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>4 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="132550103" uuid="c09581d7-7338-4ff0-b5f8-c2e2abd6c5eb" chunkPositionInArray="[0,0,0]" nBytes="285629" md5="b7570bff857685dd1a85991762a6fa0a"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="H2O_MMR_Surf_TqJ_A_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="214633995" uuid="bbf6f18f-bef1-44be-a439-d9227e6d327b" chunkPositionInArray="[0,0]" nBytes="87685" md5="bcdfac739db26a669d04cb48c5a31d7a"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CO_VMR_D_err">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="31205274" uuid="3c033008-3cfe-4082-801b-7cbb45a11789" chunkPositionInArray="[0,0,0]" nBytes="208521" md5="d5a847607b01d5c134fada9b3d8dcf8c"/>
+      <h4:byteStream offset="31413795" uuid="09dcdca3-c43f-45ed-b06a-ee0e73c8411e" chunkPositionInArray="[0,0,180]" nBytes="205661" md5="6796214dbc6f7fe9c364b742a138e97e"/>
+      <h4:byteStream offset="31619456" uuid="e1d080ce-4382-40b8-a24b-7d46d897907b" chunkPositionInArray="[0,90,0]" nBytes="194172" md5="b98c612a0aefb0096bb77cfa3a24da27"/>
+      <h4:byteStream offset="186357742" uuid="68ee3d37-f4ee-4172-b425-d77f6f3d9067" chunkPositionInArray="[0,90,180]" nBytes="179450" md5="b8b29affae63a885382e2704ec24b7ea"/>
+      <h4:byteStream offset="186537192" uuid="abbc7db5-705c-4a80-9eea-182c218040e4" chunkPositionInArray="[12,0,0]" nBytes="205179" md5="5a519a653d3164a3482de6598b7afb93"/>
+      <h4:byteStream offset="186742371" uuid="e84fcd76-c302-4e33-9425-ea71a7fd03dd" chunkPositionInArray="[12,0,180]" nBytes="205016" md5="544e0b68cf73b3ee54762390196e708b"/>
+      <h4:byteStream offset="186947387" uuid="62b2356e-709c-4a25-85c5-204971c9513d" chunkPositionInArray="[12,90,0]" nBytes="188036" md5="3be1856a31810c51d14a8f0cd1da2db5"/>
+      <h4:byteStream offset="187135423" uuid="79f673be-de5e-47da-9e9a-704c6c1ae849" chunkPositionInArray="[12,90,180]" nBytes="178153" md5="223ac73f141b09b4f1cf76b37ad69e10"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="H2O_MMR_TqJ_D_err">
+    <Dim name="/H2OPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>5</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="276937714" uuid="9aeccc71-ef42-4a59-92d5-2048d38a7bc6" chunkPositionInArray="[0,0,0]" nBytes="848273" md5="8ca2df6540be0a7c4a6dd5c42b556874"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="SurfAirTemp_TqJ_A">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="201767121" uuid="9b459d54-a278-4b89-92b8-ff47436c6304" chunkPositionInArray="[0,0]" nBytes="69701" md5="586472a08a9ae4bac1f5baf390cb5e8f"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="ClrOLR_A_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="131477035" uuid="27b83b76-16fc-4a56-9b20-f20bb1bb9787" chunkPositionInArray="[0,0]" nBytes="72678" md5="6d389df64a4149ae6ed9da46b8a99a08"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="RelHumSurf_liquid_TqJ_A_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="222941260" uuid="a9fef5d8-0bd1-4789-8aa2-d73d95ea721d" chunkPositionInArray="[0,0]" nBytes="59572" md5="6d62516c9797e7df500b69d0a246b42a"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CoarseCloudTemp_D_sdev">
+    <Dim name="/CoarseCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>0</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="173191852" uuid="51961c0d-722c-49fa-a4fc-74c571d0f5b5" chunkPositionInArray="[0,0,0]" nBytes="225775" md5="6f2b5f60e6d40c569c22e81bf2fbe0ef"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="GPHeight_TqJ_A_sdev">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="38547786" uuid="98b311fa-67b7-4727-a4a0-797e7fb22076" chunkPositionInArray="[0,0,0]" nBytes="241607" md5="01f80a6304e4c362dbe36d88f9adb8fe"/>
+      <h4:byteStream offset="38789393" uuid="76d0f636-7013-4abe-bba1-23d0cd7c55d4" chunkPositionInArray="[0,0,180]" nBytes="239333" md5="2f763802996e5af6d17cdbab8481321b"/>
+      <h4:byteStream offset="39028726" uuid="4c4d1c67-007d-42b9-a5cb-ffdcf666f73d" chunkPositionInArray="[0,90,0]" nBytes="233639" md5="3219fa635114cfb04eb8fa873af45256"/>
+      <h4:byteStream offset="225454358" uuid="6ee82bb7-4498-40ea-8265-dac426472238" chunkPositionInArray="[0,90,180]" nBytes="225236" md5="1f16566fda1393e6ddf28387991ef45e"/>
+      <h4:byteStream offset="225679594" uuid="d3fd749e-b487-445b-9df5-764bce52bb04" chunkPositionInArray="[12,0,0]" nBytes="244440" md5="1c5db78790150a34c82aecdeb4c60759"/>
+      <h4:byteStream offset="225924034" uuid="62d9db0c-411e-45c8-8e58-9e48ed0b4965" chunkPositionInArray="[12,0,180]" nBytes="245414" md5="90258d6f9f449c84f2b7d62f9fa54acd"/>
+      <h4:byteStream offset="226169448" uuid="d6617807-b040-4ec2-96ed-09bd5f187311" chunkPositionInArray="[12,90,0]" nBytes="245749" md5="73a39f12ae293af21adc621d20b4d2fb"/>
+      <h4:byteStream offset="226415197" uuid="2847927b-c9a0-477e-898e-64e12187924e" chunkPositionInArray="[12,90,180]" nBytes="243742" md5="e417f8e450f167cefd78f9f8a6d56adf"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="H2O_MMR_Lyr_TqJ_D_sdev">
+    <Dim name="/H2OPressureLay"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>4</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="268392731" uuid="c31aee9b-d7b3-4da9-98bb-bae9cc63c3ba" chunkPositionInArray="[0,0,0]" nBytes="934394" md5="933e42cc172b4cb59fc82083650f71f2"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="H2O_MMR_Surf_TqJ_D_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="277874316" uuid="55d35164-8c8b-4843-8b87-789921196f03" chunkPositionInArray="[0,0]" nBytes="35249" md5="45329ccd6405cc9ce2bc324e871b36b2"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="RelHumSurf_liquid_D">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="159623834" uuid="21267c4a-25f7-463c-a4d0-2214af5ca979" chunkPositionInArray="[0,0]" nBytes="60349" md5="1b35b60e94271b7d86a79315408fa9a0"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="SurfAirTemp_D_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="139190878" uuid="3a7f9d4a-1375-493c-8aa0-2fb01fdc4bbd" chunkPositionInArray="[0,0]" nBytes="83727" md5="c0066cf63c2741ffcf07e59f2599865b"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CloudTopPres_TqJ_A">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="230957966" uuid="2de200c4-c882-4e68-85a5-51c65a080c61" chunkPositionInArray="[0,0]" nBytes="76767" md5="30cb863cf5603b9c073479f877040cd5"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="RelHumSurf_liquid_TqJ_A_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="222877428" uuid="bbae8b23-bd6f-4ee6-9b24-82cec30261b8" chunkPositionInArray="[0,0]" nBytes="63832" md5="4e3e8f61a54f58b614f445f9d9999b32"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotH2OVap_TqJ_A_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="203091332" uuid="1736e71d-b66c-4251-89b9-33c951531035" chunkPositionInArray="[0,0]" nBytes="96612" md5="3778d4be8ce65c9310069881d9487979"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotH2OVap_MW_A">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="320840047" uuid="57201078-6513-44e8-9567-1fb4c8abbeca" chunkPositionInArray="[0,0]" nBytes="1161" md5="a43f0ca2084e297f3aa9763a828dcb0f"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="SurfAirTemp_TqJ_D">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="265249479" uuid="63db75c5-726d-48b8-ab3a-f98ff6c349e0" chunkPositionInArray="[0,0]" nBytes="70277" md5="6eb07e2abfda784c3ca723f65a3f47a9"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="RelHum_TqJ_D_ct">
+    <Dim name="/H2OPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>5</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="279053539" uuid="5db1402c-9d52-42f8-9aea-2fc10794f35f" chunkPositionInArray="[0,0,0]" nBytes="437168" md5="70fa64d90105a06cfaa4f3cb2689caf2"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="TotCO_TqJ_A">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="244484790" uuid="73cfc869-3891-434a-beab-c3bb514fb41f" chunkPositionInArray="[0,0]" nBytes="80093" md5="705049977eb787e77842e6e49fe8c1c8"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="SurfSkinTemp_D">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="131873090" uuid="9e4fe273-388d-4948-b93d-bd007aa04ab5" chunkPositionInArray="[0,0]" nBytes="68194" md5="7bab27fbc57d20e7e2904659ff5933a4"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CoarseCloudPres_D_max">
+    <Dim name="/CoarseCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>0</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="172653853" uuid="b1e48f3f-45e4-4653-baf6-2a5901dd127d" chunkPositionInArray="[0,0,0]" nBytes="186188" md5="199e131d6c80279460272f822e3ee596"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="H2O_MMR_A_min">
+    <Dim name="/H2OPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>5</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="85962072" uuid="6c075f84-58fd-4e53-9400-8c8950c71bde" chunkPositionInArray="[0,0,0]" nBytes="1080375" md5="085e27b3a9c8abd0e432891d348deaea"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="ClrOLR_TqJ_D">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="320353051" uuid="cef44324-ba62-4535-a859-5de9c4b46248" chunkPositionInArray="[0,0]" nBytes="73370" md5="b9ea3f7fa874726a7f70ed7a17fac1f0"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="CoarseCloudFrc_D_ct">
+    <Dim name="/CoarseCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>0</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="171339775" uuid="df3f1191-2eae-4105-aa4c-e45a52befc13" chunkPositionInArray="[0,0,0]" nBytes="100929" md5="913dfea7442f3f20318d12ae1122c533"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="RelHum_liquid_TqJ_A">
+    <Dim name="/H2OPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>5</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="218892342" uuid="6f9667d2-d771-469b-9f56-7997f71266b3" chunkPositionInArray="[0,0,0]" nBytes="832026" md5="809fd4fbde17b5a4923e24d25b8133c6"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CH4_VMR_TqJ_A_err">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="51141144" uuid="dbab37cd-00c5-4df5-9a76-6691aa54787e" chunkPositionInArray="[0,0,0]" nBytes="137486" md5="6a693801c5d2e5119b0aa065a4342bb2"/>
+      <h4:byteStream offset="51278630" uuid="7cb79180-5714-42a8-961b-b3c8c1af4836" chunkPositionInArray="[0,0,180]" nBytes="140343" md5="81b662f52b3cae280dde6b9c46ece6d6"/>
+      <h4:byteStream offset="51418973" uuid="2ddc647f-f940-4a47-af51-d2eda36bc44b" chunkPositionInArray="[0,90,0]" nBytes="143031" md5="52b4e1a9e7d4b7648ffdc4ea9d2a6adb"/>
+      <h4:byteStream offset="255958462" uuid="02abd71f-cb7b-4cc4-aaf7-e491fc0d90b0" chunkPositionInArray="[0,90,180]" nBytes="135944" md5="64981d10c444bc7bb055d5d174840dc1"/>
+      <h4:byteStream offset="256094406" uuid="9517c9db-3bb6-42cf-a1d4-2f853713f100" chunkPositionInArray="[12,0,0]" nBytes="153552" md5="d75f2f59ee69de5344e5134a710ffec5"/>
+      <h4:byteStream offset="256247958" uuid="629f3e0b-1ae4-4ec4-baa0-0668f5d6688e" chunkPositionInArray="[12,0,180]" nBytes="153594" md5="1b70f80f4019c9a70cfe89572cd8db01"/>
+      <h4:byteStream offset="256401552" uuid="77d5eded-8ff0-494d-85be-82f044acb379" chunkPositionInArray="[12,90,0]" nBytes="162151" md5="2fa5ae4c9e5ad3c71c8dfef715311782"/>
+      <h4:byteStream offset="256563703" uuid="ea0e8907-1c9c-4f59-afd5-6f58664f2621" chunkPositionInArray="[12,90,180]" nBytes="155377" md5="175ce01ac5ec44861a886ebb81fc4148"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CoarseCloudTemp_D_max">
+    <Dim name="/CoarseCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>0</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="173661219" uuid="fdfccd42-50d9-453e-bee3-d59d7e4967c2" chunkPositionInArray="[0,0,0]" nBytes="243914" md5="73205b84eb3410a6736e3aa432990424"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="StdPressureLev">
+    <Dim name="/StdPressureLev"/>
+    <Attribute name="CLASS" type="String">
+      <Value>DIMENSION_SCALE</Value>
+    </Attribute>
+    <Attribute name="NAME" type="String">
+      <Value>StdPressureLev</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <Attribute name="long_name" type="String">
+      <Value>Pressure</Value>
+    </Attribute>
+    <Attribute name="units" type="String">
+      <Value>hPa</Value>
+    </Attribute>
+    <Attribute name="format" type="String">
+      <Value>F7.2</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>24</h4:chunkDimensionSizes>
+      <h4:byteStream offset="131564175" uuid="65b8b9d3-b7db-4739-b37e-27e93473045f" chunkPositionInArray="[0]" nBytes="56" md5="a71f8216cff7fca9d2c00e768589efdd"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="RelHumSurf_liquid_A_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="97316855" uuid="ec15c446-aa87-49c2-aeb9-926ae336a840" chunkPositionInArray="[0,0]" nBytes="63832" md5="4e3e8f61a54f58b614f445f9d9999b32"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="RelHumSurf_TqJ_A_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="218769432" uuid="ee535a06-5d23-4385-ae7b-b407546e7e2a" chunkPositionInArray="[0,0]" nBytes="63770" md5="a9bf2287f4747714d25e14f836509b6c"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotCO_TqJ_A_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="244756054" uuid="c5c7c126-00e8-494c-9d85-61193795c8ea" chunkPositionInArray="[0,0]" nBytes="77932" md5="518f6381e484221bea48d3edc4e9c1e2"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="Temperature_MW_A_min">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="68542524" uuid="2ae59265-3d59-46ab-844f-6d93f42d4f6f" chunkPositionInArray="[0,0,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="68545945" uuid="dfd03831-9493-4210-b461-ff6f5477c3d4" chunkPositionInArray="[0,0,180]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="68549366" uuid="4eb4bbdb-85da-4843-8897-ffd8ed398dc2" chunkPositionInArray="[0,90,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="320805837" uuid="58ae0cfc-f736-4e71-a68b-a754ec1ae4fd" chunkPositionInArray="[0,90,180]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="320809258" uuid="51d5d076-2524-4dcf-bde1-f65afb473926" chunkPositionInArray="[12,0,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="320812679" uuid="d8790a9b-d31e-4fa9-a918-5374c9819146" chunkPositionInArray="[12,0,180]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="320816100" uuid="0170916b-d2bb-4854-bd47-7937037ca6bd" chunkPositionInArray="[12,90,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="320819521" uuid="cbd3909c-fc2d-42cd-ae22-c6d69f833038" chunkPositionInArray="[12,90,180]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="RelHumSurf_liquid_D_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="159795126" uuid="2ba11d39-f64d-416f-b965-46a6dd658a0f" chunkPositionInArray="[0,0]" nBytes="59466" md5="675180fcf0b2c7e126786655753c3270"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="Temperature_MW_D_sdev">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="68691757" uuid="731e6d19-c02a-45e1-bda7-2f520b7ac9e0" chunkPositionInArray="[0,0,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="68695178" uuid="6e0ab828-2ada-41c9-9250-612d8e89d776" chunkPositionInArray="[0,0,180]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="68698599" uuid="c434c54a-7ada-4560-a49f-f0afd3627cae" chunkPositionInArray="[0,90,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="321013479" uuid="693cfab5-67ca-416a-9784-73a034d3df28" chunkPositionInArray="[0,90,180]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="321016900" uuid="aeed52fb-2547-4b72-b59b-096d8ea28c40" chunkPositionInArray="[12,0,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="321020321" uuid="f12998e1-9da2-47a0-972e-f4d799d718cb" chunkPositionInArray="[12,0,180]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="321023742" uuid="65515eb4-aed1-4357-a7df-5de05c6c4a2a" chunkPositionInArray="[12,90,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="321027163" uuid="4a5f29ad-0fb1-4208-bf80-eb19e0e64148" chunkPositionInArray="[12,90,180]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotCH4_D">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="187313576" uuid="d11d749a-7b31-45af-b571-bcc318915060" chunkPositionInArray="[0,0]" nBytes="69461" md5="430694b97f711e9184f34c7d6a195505"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="EmisIR_TqJ_D_min">
+    <Dim name="/EmisFreqIR"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>1</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>4 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="258749780" uuid="1251e197-5f8e-40b5-885a-95f45a456618" chunkPositionInArray="[0,0,0]" nBytes="165640" md5="ed3a0b35a0efe7f336e27e033b35b7ac"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotCH4_A">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="124980005" uuid="9e66cb6a-752b-474b-9025-2d7452771fc6" chunkPositionInArray="[0,0]" nBytes="69857" md5="97f2ce3777a8d9ac3439da2929c7f37b"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="RelHum_TqJ_D">
+    <Dim name="/H2OPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>5</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="278227685" uuid="98e0cb13-7d99-456c-9922-65095caf35b3" chunkPositionInArray="[0,0,0]" nBytes="825854" md5="d525184735ec4b8e74ad07d57474c7b8"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="H2O_MMR_Lyr_TqJ_A_err">
+    <Dim name="/H2OPressureLay"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>4</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="207997686" uuid="1c6f4fa1-79c0-433f-8357-270056d6b36a" chunkPositionInArray="[0,0,0]" nBytes="863681" md5="13fa0733f6ca34af16e688b88216e2ea"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="SurfAirTemp_TqJ_A_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="201958598" uuid="bd6f951c-1232-4098-bc21-9bd011fd416c" chunkPositionInArray="[0,0]" nBytes="69465" md5="3b5e6f45647793af81274d0b06aeb309"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CH4_VMR_A_min">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="16182119" uuid="76e0e05e-7f34-42ba-bea7-89f8549ecd87" chunkPositionInArray="[0,0,0]" nBytes="192100" md5="06eb342a5cd2cfb5d376649f311336e0"/>
+      <h4:byteStream offset="16374219" uuid="664e9144-305c-4bd5-b66f-d0ca1ad85226" chunkPositionInArray="[0,0,180]" nBytes="189519" md5="c766f666a66cc84227a46d3d4b6151dc"/>
+      <h4:byteStream offset="16563738" uuid="59ea6cab-85f0-4811-8d33-adf99b08bc65" chunkPositionInArray="[0,90,0]" nBytes="185957" md5="b7594e7574061e6e0ff3e1571289a0e1"/>
+      <h4:byteStream offset="128198685" uuid="44b69652-d5c7-4cde-bc53-a3880324da67" chunkPositionInArray="[0,90,180]" nBytes="174463" md5="3c88221e6654256d1003959bd0499f66"/>
+      <h4:byteStream offset="128373148" uuid="10037698-9d13-49ff-9141-1f4875469c8a" chunkPositionInArray="[12,0,0]" nBytes="187739" md5="399b623d1831fa9e77da7b88c4032dac"/>
+      <h4:byteStream offset="128560887" uuid="dbdb3304-dfbc-491f-9512-75d26ab05693" chunkPositionInArray="[12,0,180]" nBytes="185602" md5="2d3b4b6101072da6f9b19c9c8bc9b4d6"/>
+      <h4:byteStream offset="128746489" uuid="7d13b2a3-b40a-4052-825d-b2a66dbbfcb5" chunkPositionInArray="[12,90,0]" nBytes="195087" md5="ebc1ce33b4face27d2a952773bda789a"/>
+      <h4:byteStream offset="128941576" uuid="b9c80cdb-57d4-4fdc-9a4d-3bd0aaccb8c2" chunkPositionInArray="[12,90,180]" nBytes="188038" md5="13d3f4b0dd51b22b37575a4e26dca932"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TropTemp_D">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="139839211" uuid="3b059f6a-3ee8-41f7-941e-4faf92711419" chunkPositionInArray="[0,0]" nBytes="68368" md5="591bb51bf1da5f3896e7b6d5c74f40c9"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="CloudFrc_D_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="167516223" uuid="d5edf5f4-81a8-45cc-a191-6df798ee0801" chunkPositionInArray="[0,0]" nBytes="33687" md5="ea01f2d2ab6f1e6d2ce43cda27b4e16c"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="GPHeight_MW_A_min">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="68612336" uuid="6ff37430-6a6d-4392-82ad-26bc806ea123" chunkPositionInArray="[0,0,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="68615757" uuid="40d8afc9-630f-4f40-9e10-8ac74b8969dd" chunkPositionInArray="[0,0,180]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="68619178" uuid="305336fe-df76-4b4e-9f80-2c0e6f200bb8" chunkPositionInArray="[0,90,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="320893076" uuid="bd73fd34-9702-4f42-b0a2-a2d9f09c93c0" chunkPositionInArray="[0,90,180]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="320896497" uuid="ee773c8a-2285-4dcf-8247-74d2ba1631cb" chunkPositionInArray="[12,0,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="320899918" uuid="81442da8-e3c9-4c1b-9adb-e5574c05bcf6" chunkPositionInArray="[12,0,180]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="320903339" uuid="abe04ebd-4975-42eb-bfa8-623ffac7d64d" chunkPositionInArray="[12,90,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="320906760" uuid="d83b5d00-36df-40ed-9510-7ceeaa4dc598" chunkPositionInArray="[12,90,180]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CO_VMR_TqJ_A">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="45316745" uuid="7f3f2646-e92a-4d4c-a787-09591b059f9c" chunkPositionInArray="[0,0,0]" nBytes="240984" md5="697b7dc98d98933824aad1dfa967a236"/>
+      <h4:byteStream offset="45557729" uuid="d85cd398-30e3-4627-8ea7-61aa8b52cd71" chunkPositionInArray="[0,0,180]" nBytes="246791" md5="0a4d476484e78527aa976f9af1e81dd7"/>
+      <h4:byteStream offset="45804520" uuid="9b580a70-99f2-4bbe-976e-b6e2c0303d56" chunkPositionInArray="[0,90,0]" nBytes="228487" md5="c140670dd0f0603a6675474546c4d951"/>
+      <h4:byteStream offset="244833986" uuid="7cf9c70e-3b0b-491c-8630-59c48c3190bf" chunkPositionInArray="[0,90,180]" nBytes="215231" md5="5e3da6e096504aa5986789e2089438f7"/>
+      <h4:byteStream offset="245049217" uuid="99ed11e7-f45f-455c-b002-593c12dfeca4" chunkPositionInArray="[12,0,0]" nBytes="210187" md5="e26f73c21f48dcb0693235b9fa074b4e"/>
+      <h4:byteStream offset="245259404" uuid="42c6032b-d9d1-4ad4-b1bf-e5bdaec14709" chunkPositionInArray="[12,0,180]" nBytes="217658" md5="f9b4de48022a2d6afddd0e951c6cc350"/>
+      <h4:byteStream offset="245477062" uuid="b48df0c6-3b30-4463-a560-2d3ef7f53db6" chunkPositionInArray="[12,90,0]" nBytes="208696" md5="f73f60ee972d701bb54030c09928fa23"/>
+      <h4:byteStream offset="245685758" uuid="747ab318-9158-4778-a4ec-f4c63b60aa74" chunkPositionInArray="[12,90,180]" nBytes="199828" md5="fd36fdd416901a965cb14fe3b8da03cc"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="TotO3_D_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="173984147" uuid="107ff714-38ae-47eb-9c39-369211556693" chunkPositionInArray="[0,0]" nBytes="38366" md5="33203c2f507d0b5cd88a223131cdb593"/>
+    </h4:chunks>
+  </Int16>
+  <Int16 name="TotO3_TqJ_A_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="237473449" uuid="3bcbaf6f-90f7-4a92-8c87-ad7201e0bfbe" chunkPositionInArray="[0,0]" nBytes="38072" md5="4de9f004b38ef209f603f71525564b0b"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="Temperature_A">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="922848" uuid="38201582-3bf8-4871-8c5a-c60141c8b90d" chunkPositionInArray="[0,0,0]" nBytes="190770" md5="d2729d2dc2857363ba09cfb6cb846acf"/>
+      <h4:byteStream offset="1113618" uuid="fb100b91-1635-4edd-b3f8-146deb387617" chunkPositionInArray="[0,0,180]" nBytes="190744" md5="4473c4836b9112b3e9d001810263c9c6"/>
+      <h4:byteStream offset="1304362" uuid="9b86cd06-c99a-42d1-9145-645f0460b81e" chunkPositionInArray="[0,90,0]" nBytes="189666" md5="5305e0cc670c86f26fecd04f547a2b9e"/>
+      <h4:byteStream offset="70739267" uuid="c7d2e45f-0e10-46b2-a422-e9366a8d547f" chunkPositionInArray="[0,90,180]" nBytes="183254" md5="b5f9927257b1c17cbc977f84c6426b28"/>
+      <h4:byteStream offset="70922521" uuid="7664c001-142b-436e-a7ec-05404c317eaf" chunkPositionInArray="[12,0,0]" nBytes="176467" md5="41341e0986b535fbe07c978c4099eb6e"/>
+      <h4:byteStream offset="71098988" uuid="044a39da-8045-4b35-a441-c80dce688181" chunkPositionInArray="[12,0,180]" nBytes="177347" md5="858ba77f5a6db1f9df461eaa0c4ec9f2"/>
+      <h4:byteStream offset="71276335" uuid="177eacc8-a0fd-4041-ab39-c330217cab14" chunkPositionInArray="[12,90,0]" nBytes="193274" md5="a2772b9cd576a826ddb1feaffdea0eba"/>
+      <h4:byteStream offset="71469609" uuid="abdcde0d-e19d-4071-8d21-f22724bc8bca" chunkPositionInArray="[12,90,180]" nBytes="190603" md5="13e287880185fb98f7e4095436064279"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="GPHeight_MW_D_max">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="68788367" uuid="ee88543f-d5d1-408d-98d2-5f3fe3deb341" chunkPositionInArray="[0,0,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="68791788" uuid="74c13825-962f-4d97-ae92-22022021e37a" chunkPositionInArray="[0,0,180]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="68795209" uuid="4e56f49a-2247-46d9-aeec-87a868a04128" chunkPositionInArray="[0,90,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="321134928" uuid="99a3b70b-07cf-4c20-a05e-ea5c2cecb0c4" chunkPositionInArray="[0,90,180]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="321138349" uuid="704c3fe8-3df0-4c91-aa5a-c00c1de1fcbe" chunkPositionInArray="[12,0,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="321141770" uuid="4f36bad7-6fef-49c2-8ad5-b988e738ac14" chunkPositionInArray="[12,0,180]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="321145191" uuid="e25b4013-6a75-4083-8ceb-2302156a1fae" chunkPositionInArray="[12,90,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="321148612" uuid="95836f81-d6e0-4c27-b314-18ef5bcb37cd" chunkPositionInArray="[12,90,180]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="ClrOLR_TqJ_D_err">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="320693807" uuid="99146496-4aa4-427f-85f9-a40c0c6c79be" chunkPositionInArray="[0,0]" nBytes="14866" md5="97cdff74311a6e2c24d3200817d05835"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CloudTopTemp_TqJ_D_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="294879362" uuid="aa913831-ef81-4f5a-b64f-90824df74a89" chunkPositionInArray="[0,0]" nBytes="85272" md5="804a63b26df8f12e667054b66cfea452"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="Temperature_D_sdev">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="18420901" uuid="975f915f-59f1-49a0-863b-287f9a095293" chunkPositionInArray="[0,0,0]" nBytes="237591" md5="0954ed3b3a0a8dfaf2ab3e835827a80a"/>
+      <h4:byteStream offset="18658492" uuid="d950fb20-345e-498b-8fd4-c49656d123f4" chunkPositionInArray="[0,0,180]" nBytes="234886" md5="2d1f967ed91f448053a3b4f28611dffe"/>
+      <h4:byteStream offset="18893378" uuid="ab039661-08f0-453b-ba4c-30d66b7db57b" chunkPositionInArray="[0,90,0]" nBytes="229483" md5="29e05807e6b0464fa65cb28352fba06a"/>
+      <h4:byteStream offset="135066257" uuid="591ab18a-9224-4ba8-88d9-1edf3fb80ef3" chunkPositionInArray="[0,90,180]" nBytes="222213" md5="7c61043dd7201f3424819cb66508f166"/>
+      <h4:byteStream offset="135288470" uuid="f6eeaf0e-5c53-4612-b7d7-f94bb3a1016d" chunkPositionInArray="[12,0,0]" nBytes="230169" md5="1dc2a95271ac63aea51fdddf5e843d95"/>
+      <h4:byteStream offset="135518639" uuid="748c1c51-4d25-455e-8ff9-f3ef1da8307d" chunkPositionInArray="[12,0,180]" nBytes="229063" md5="cb98264a62fe9046aaa0253b1de25f9e"/>
+      <h4:byteStream offset="135747702" uuid="f2e58ac2-5b03-4d83-9f49-adae3ad6fe46" chunkPositionInArray="[12,90,0]" nBytes="232028" md5="1deb79b1ce96bcda68416cd56190498c"/>
+      <h4:byteStream offset="135979730" uuid="f10f65db-860f-43b6-8ce9-e9d3583f1dd8" chunkPositionInArray="[12,90,180]" nBytes="232382" md5="107ae8849940715191055d4340827c3a"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="OLR_D_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="193238090" uuid="af68cead-4324-4718-8ceb-e64bccd4172d" chunkPositionInArray="[0,0]" nBytes="33769" md5="15b49fe131bcb2f41d9f91766fefbc76"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="Temperature_A_sdev">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="1500300" uuid="a801068d-ef30-469e-9b90-9c84ff5b0f79" chunkPositionInArray="[0,0,0]" nBytes="237244" md5="ca41f3194c66b668ebfa5b85f2b655d7"/>
+      <h4:byteStream offset="1737544" uuid="43af94b0-1c88-4d69-b9d0-573f43be6602" chunkPositionInArray="[0,0,180]" nBytes="234444" md5="db98c17b4c99dfd7c812e10979f2d83b"/>
+      <h4:byteStream offset="1971988" uuid="b9324c87-65da-4193-95ff-20ebca89df4d" chunkPositionInArray="[0,90,0]" nBytes="230159" md5="c36124db445b4a598d31eb4b060f8773"/>
+      <h4:byteStream offset="72488937" uuid="b5ec9a39-77e9-43c9-b114-eacdc27949d4" chunkPositionInArray="[0,90,180]" nBytes="222011" md5="c471b1ea422b635f01e11bd003bc103e"/>
+      <h4:byteStream offset="72710948" uuid="471ce1bf-f666-4446-92cb-a0095df9dcf9" chunkPositionInArray="[12,0,0]" nBytes="230223" md5="4cd3321357bd952b55f1c2a7c3a05328"/>
+      <h4:byteStream offset="72941171" uuid="c9b06b82-61c0-4685-9c6b-531a33c436d3" chunkPositionInArray="[12,0,180]" nBytes="229679" md5="1388121859756237c0d37979ea83cc8c"/>
+      <h4:byteStream offset="73170850" uuid="222fc632-6a5f-4f8c-a997-5681f61557ea" chunkPositionInArray="[12,90,0]" nBytes="232638" md5="1b21908707729feb9c366496391747e9"/>
+      <h4:byteStream offset="73403488" uuid="cce51504-5234-4fcb-9322-71769047e1fe" chunkPositionInArray="[12,90,180]" nBytes="232786" md5="b253b90fd63b1ebe766a7210e75dcc99"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="SurfSkinTemp_TqJ_A_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="194464498" uuid="9ffd175e-8eb0-4a8a-92eb-e0e5c93131ee" chunkPositionInArray="[0,0]" nBytes="71353" md5="a0add62fbe6e79def79693672877ccdc"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotH2OVap_TqJ_D_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="266669866" uuid="2c460d7f-9fa3-4c8a-84bf-1d201c4c5978" chunkPositionInArray="[0,0]" nBytes="94030" md5="7e42a7eff82b4d89233329dd38a072d8"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="ClrOLR_TqJ_D_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="320621817" uuid="8adec3ef-8fad-46a7-814e-9c5076fe0c3a" chunkPositionInArray="[0,0]" nBytes="71990" md5="93d492f6947e7750d0e071d672bd24f7"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="RelHum_liquid_TqJ_D_ct">
+    <Dim name="/H2OPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>5</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="283133509" uuid="b3d68eb1-7fc3-49aa-b7da-fb906b08beff" chunkPositionInArray="[0,0,0]" nBytes="437168" md5="70fa64d90105a06cfaa4f3cb2689caf2"/>
+    </h4:chunks>
+  </Int16>
+  <Int16 name="O3_VMR_D_ct">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>24 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="175569464" uuid="8a7cb51c-2afb-4a26-a0e4-448ca716c6a9" chunkPositionInArray="[0,0,0]" nBytes="895794" md5="480f4e9c038acd88db84a862b676f571"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="Temperature_A_min">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="2205283" uuid="e76ba5c4-0f55-4323-bbf2-05c8452d66f9" chunkPositionInArray="[0,0,0]" nBytes="187194" md5="55fb81b8459b490abae10f5a76c7a1ec"/>
+      <h4:byteStream offset="2392477" uuid="17ea6bfb-5052-4e0f-bbef-a8e23fe4ace6" chunkPositionInArray="[0,0,180]" nBytes="187785" md5="200e48449403a2a9e1b848212f4f9dea"/>
+      <h4:byteStream offset="2580262" uuid="e9b681de-94d0-424e-840f-9ee0e13ea45a" chunkPositionInArray="[0,90,0]" nBytes="186694" md5="8ae02074c738019e4f031a86a0d0a8b5"/>
+      <h4:byteStream offset="73636274" uuid="94cabc43-27e6-4794-8415-0eda4c65d221" chunkPositionInArray="[0,90,180]" nBytes="182590" md5="fa3f1add3da33d27e6efb60f19203539"/>
+      <h4:byteStream offset="73818864" uuid="26442e43-c84f-48d1-b8cc-09c93f40684a" chunkPositionInArray="[12,0,0]" nBytes="172495" md5="2f9789b677e1109801a8e547843ef067"/>
+      <h4:byteStream offset="73991359" uuid="8b0a3dfb-b8f6-40ca-8ecc-1b7a5fef94aa" chunkPositionInArray="[12,0,180]" nBytes="174333" md5="932f84813a181be6f383bb1e910663dd"/>
+      <h4:byteStream offset="74165692" uuid="bed60a7a-1923-48b5-af22-02784804c2f6" chunkPositionInArray="[12,90,0]" nBytes="189974" md5="f8217994e89d9892789615452b45fec6"/>
+      <h4:byteStream offset="74355666" uuid="8fd71657-9f3d-44b9-9f74-8439cb86d880" chunkPositionInArray="[12,90,180]" nBytes="187302" md5="a8547069d4566d7c02d59c2aac491677"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TropHeight_TqJ_D_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="286521594" uuid="edcd3a92-30b0-470e-9025-472df9bdf937" chunkPositionInArray="[0,0]" nBytes="85211" md5="15873c88c6d305d014dee5ae0860e4d9"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotCO_TqJ_D_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="307956389" uuid="befdaa42-0ea3-4247-a26e-f63e04c7473e" chunkPositionInArray="[0,0]" nBytes="76439" md5="175b6a79294b9e833673d8a7c7a29ca0"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="Emis_MW_D_max">
+    <Dim name="/EmisFreqMW"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>2</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="320979367" uuid="d7faacc0-f8b5-4912-8fd4-92f6aa1e6dea" chunkPositionInArray="[0,0,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="EmisIR_D">
+    <Dim name="/EmisFreqIR"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>1</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>4 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="132248764" uuid="432aec1c-94d3-4f12-86ce-74370d1ea012" chunkPositionInArray="[0,0,0]" nBytes="163961" md5="a7eef3c204d80b8c34967bbf08ddf220"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CoarseCloudPres_TqJ_D_max">
+    <Dim name="/CoarseCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>0</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="299502544" uuid="cb392559-8c3b-4b02-8d9d-3f5661640f8d" chunkPositionInArray="[0,0,0]" nBytes="187572" md5="30bd69d57e585b92099c1a320e98ec5d"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="FineCloudFrc_A_ct">
+    <Dim name="/FineCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>3</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="106922483" uuid="764f52f4-833d-4f42-9632-2f457fc0e75b" chunkPositionInArray="[0,0,0]" nBytes="405761" md5="053e8026226155a54a28b3d37ba1bed9"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="RelHum_TqJ_D_sdev">
+    <Dim name="/H2OPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>5</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="279490707" uuid="8702163f-2c35-4943-801a-fb3c2346ce77" chunkPositionInArray="[0,0,0]" nBytes="931224" md5="7a01cd04d029c2d2c017be3cf0b7cf02"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="SurfPres_Forecast_A_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="69133370" uuid="995a6d86-3504-4dbd-ae59-46f0b161f335" chunkPositionInArray="[0,0]" nBytes="51870" md5="b9dded79039a40fdde396b9c87525f23"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="GPHeight_D_max">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="23614625" uuid="4fb384c4-27bb-4df7-9d0e-d1e37cd0e6f6" chunkPositionInArray="[0,0,0]" nBytes="416745" md5="c6bcde1e4f19267e6a6ac5c82f8f3533"/>
+      <h4:byteStream offset="24031370" uuid="8d2ef33a-c682-4aed-8e4a-9ea424d48957" chunkPositionInArray="[0,0,180]" nBytes="410778" md5="d7a68ca827b7d24f047ce56651449774"/>
+      <h4:byteStream offset="24442148" uuid="67d50dc5-0915-4542-928e-234bcfb4966a" chunkPositionInArray="[0,90,0]" nBytes="413664" md5="394647db5f5e621d90e6d56ebe81d3db"/>
+      <h4:byteStream offset="165500099" uuid="2f40b608-a969-477a-b93d-a7f8222faa68" chunkPositionInArray="[0,90,180]" nBytes="388500" md5="038650795dfda934edb343504ef5430b"/>
+      <h4:byteStream offset="165888599" uuid="2c528e38-9a45-4438-a32b-c726e6cb20f3" chunkPositionInArray="[12,0,0]" nBytes="379267" md5="6dd53dd7bbd14d79fa1bba007cff6346"/>
+      <h4:byteStream offset="166267866" uuid="e19aae67-6444-4ab0-997f-463c35dd3d03" chunkPositionInArray="[12,0,180]" nBytes="379684" md5="845664865b3dc0ee79d5d21c768e3ccb"/>
+      <h4:byteStream offset="166647550" uuid="0fb79ec2-d223-4c31-ab72-dcb4ea47e1d7" chunkPositionInArray="[12,90,0]" nBytes="397910" md5="a4434f8084520bef6766c26afbff617a"/>
+      <h4:byteStream offset="167045460" uuid="df2217a7-9533-4a4f-882e-3ff2d2f4ca8d" chunkPositionInArray="[12,90,180]" nBytes="391576" md5="a47f0d08a9cff578633ea3bed24b2931"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotH2OVap_A">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="77585388" uuid="1c8d67ff-7f7d-46ef-81a8-e84d894721ff" chunkPositionInArray="[0,0]" nBytes="100377" md5="c7bc18f43c4f1b1f671995e33c28f70a"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="EmisIR_A_min">
+    <Dim name="/EmisFreqIR"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>1</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>4 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="70225840" uuid="5ea25bb8-cdf1-4c1a-9777-e052f868c5e4" chunkPositionInArray="[0,0,0]" nBytes="173281" md5="52c7e08bcbb247dcb06a9ea857af8cfb"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotO3_TqJ_D_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="300922836" uuid="898b29b1-743f-48b7-8c8e-5bcaffaacc60" chunkPositionInArray="[0,0]" nBytes="76821" md5="f5d3f54dffec2d6b11cd45871f437102"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="SurfSkinTemp_TqJ_A_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="194311855" uuid="8106da58-b77f-4998-8942-d2b4d62845a2" chunkPositionInArray="[0,0]" nBytes="80665" md5="d5ba17a5b8c4b46596a54618547f036b"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="TropHeight_TqJ_A_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="223092053" uuid="85f99725-07a8-4562-aadc-cd75d8ba2dd7" chunkPositionInArray="[0,0]" nBytes="38097" md5="7ecb5454a268cdff2fbe0fe8ea8b6d10"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="SurfSkinTemp_A_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="69448782" uuid="28aecdc1-da10-48e0-b69e-8b48ad6a251a" chunkPositionInArray="[0,0]" nBytes="71353" md5="a0add62fbe6e79def79693672877ccdc"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CloudTopPres_TqJ_D_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="294603542" uuid="8fd39c6b-3b89-4ece-ad7a-c4f76e03a6f2" chunkPositionInArray="[0,0]" nBytes="69244" md5="a5ee80f9475afdd98ee55227e0bb0da3"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CoarseCloudTemp_D_min">
+    <Dim name="/CoarseCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>0</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="173417627" uuid="df9db43d-7a24-4686-8c80-5ebca184b0b1" chunkPositionInArray="[0,0,0]" nBytes="243592" md5="2da7389f7c64d3ae86073f59a5f9e186"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CO_VMR_TqJ_D_err">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="65067199" uuid="61732180-e602-42db-b346-69968e87a60b" chunkPositionInArray="[0,0,0]" nBytes="208521" md5="d5a847607b01d5c134fada9b3d8dcf8c"/>
+      <h4:byteStream offset="65275720" uuid="66f5a2f8-4d57-4c9c-a4ce-2ee1e8cd98ef" chunkPositionInArray="[0,0,180]" nBytes="205661" md5="6796214dbc6f7fe9c364b742a138e97e"/>
+      <h4:byteStream offset="65481381" uuid="f794e904-2508-4d45-b959-65825b5ba91b" chunkPositionInArray="[0,90,0]" nBytes="194172" md5="b98c612a0aefb0096bb77cfa3a24da27"/>
+      <h4:byteStream offset="313174581" uuid="eafd3196-1adc-4617-8f34-82ff2f7046ae" chunkPositionInArray="[0,90,180]" nBytes="179450" md5="b8b29affae63a885382e2704ec24b7ea"/>
+      <h4:byteStream offset="313354031" uuid="f09d7344-e883-42b0-8fb2-04b86bdcce44" chunkPositionInArray="[12,0,0]" nBytes="205179" md5="5a519a653d3164a3482de6598b7afb93"/>
+      <h4:byteStream offset="313559210" uuid="287c63f1-e0b7-4e49-9ed6-d1e7d7c3e332" chunkPositionInArray="[12,0,180]" nBytes="205016" md5="544e0b68cf73b3ee54762390196e708b"/>
+      <h4:byteStream offset="313764226" uuid="1c776f36-b27d-4daa-a5e2-aacd3209b4e9" chunkPositionInArray="[12,90,0]" nBytes="188036" md5="3be1856a31810c51d14a8f0cd1da2db5"/>
+      <h4:byteStream offset="313952262" uuid="42812ec0-33bd-4f70-8f73-5852ce6b2d74" chunkPositionInArray="[12,90,180]" nBytes="178153" md5="223ac73f141b09b4f1cf76b37ad69e10"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotO3_A_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="111718098" uuid="461ca0b3-24d0-4d79-8ad7-3411f4bf8682" chunkPositionInArray="[0,0]" nBytes="77484" md5="978c878e036ce672a89f0f5f40e75e32"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CH4_VMR_D_min">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="33064709" uuid="7ecaa320-9155-4b22-9cb5-d03d5ea5f4b3" chunkPositionInArray="[0,0,0]" nBytes="190109" md5="8c2f218d8845f30679ca37ff01521fb5"/>
+      <h4:byteStream offset="33254818" uuid="6b1f0e74-4ee6-44c9-aea8-6c6b312cc344" chunkPositionInArray="[0,0,180]" nBytes="185300" md5="f806a43a0dc1ff9d41e07651eb9cdd9a"/>
+      <h4:byteStream offset="33440118" uuid="df508a71-e1a8-440d-a4e0-77ed20e16b64" chunkPositionInArray="[0,90,0]" nBytes="184476" md5="aab452dabd10a1a11b75a819ae95e620"/>
+      <h4:byteStream offset="190527818" uuid="61af1312-f308-48f9-b7ff-9d063e7d4523" chunkPositionInArray="[0,90,180]" nBytes="175240" md5="be4d803aa0c6568bb680cbe9136887bb"/>
+      <h4:byteStream offset="190703058" uuid="7f4a5044-4f97-4d1a-b40a-01d6c9a872dd" chunkPositionInArray="[12,0,0]" nBytes="186353" md5="74aebf526ee1ca31ace7310f34defae5"/>
+      <h4:byteStream offset="190889411" uuid="4bef584c-0331-40b7-8f28-6832e512ab31" chunkPositionInArray="[12,0,180]" nBytes="184117" md5="dca2fa32e7b55ae5836051d23bbf3750"/>
+      <h4:byteStream offset="191073528" uuid="d2795484-a50f-4c5b-ad93-b34d0c56d5bd" chunkPositionInArray="[12,90,0]" nBytes="192858" md5="2b43a6025577f4856c3563e5ed5ff9f8"/>
+      <h4:byteStream offset="191266386" uuid="68958c1d-b663-4b72-acab-f934ae45a274" chunkPositionInArray="[12,90,180]" nBytes="187823" md5="3505c0173c07a01cf364c0352e6a4cd2"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="Temperature_D_min">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="19125997" uuid="7a894fa2-0bf4-4d96-8f4e-7750a18f7b01" chunkPositionInArray="[0,0,0]" nBytes="187377" md5="a52a0c7c9c379b8d2415e387109d98d0"/>
+      <h4:byteStream offset="19313374" uuid="ea395a46-c6f6-4452-8fa7-488b3ee526b6" chunkPositionInArray="[0,0,180]" nBytes="188197" md5="f994693087f5c340f2fabcea5ec61a32"/>
+      <h4:byteStream offset="19501571" uuid="e85e9269-0393-4066-a45a-5251a0e95203" chunkPositionInArray="[0,90,0]" nBytes="186682" md5="6e7dd01f81d3c73de206e02418aab4f2"/>
+      <h4:byteStream offset="136212112" uuid="8cb3c062-6518-403e-a56e-627d6d26c2ed" chunkPositionInArray="[0,90,180]" nBytes="182605" md5="2dab23f80651c7adbd2081d55c0ef202"/>
+      <h4:byteStream offset="136394717" uuid="96095e19-0bda-427f-8499-9c2d3a581bea" chunkPositionInArray="[12,0,0]" nBytes="173249" md5="ed6078197f19be8a180bf002f08aaf56"/>
+      <h4:byteStream offset="136567966" uuid="69c00d5c-b00b-49ec-9b74-617fcd3f0609" chunkPositionInArray="[12,0,180]" nBytes="174435" md5="544bd37399c9c7f7089c9a2f1e167a87"/>
+      <h4:byteStream offset="136742401" uuid="88c4c061-8772-46ec-94f1-d897ccc75e8e" chunkPositionInArray="[12,90,0]" nBytes="189718" md5="52459314c1a1e2b8d2198af4a475b4ea"/>
+      <h4:byteStream offset="136932119" uuid="87619919-585b-4bf9-b349-d3451509fbef" chunkPositionInArray="[12,90,180]" nBytes="186968" md5="1c1749d200366038d3f94882bd6e8f21"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TropHeight_A">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="97440259" uuid="3c9cf195-8396-4b22-9dd9-c89113e00c48" chunkPositionInArray="[0,0]" nBytes="91221" md5="456a9c96ae4b93b7b4fae86ffbc70ebb"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="SurfPres_Forecast_TqJ_D_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="257548980" uuid="f702d8b9-69e2-4669-95e3-0f37d600b975" chunkPositionInArray="[0,0]" nBytes="38388" md5="98b43c6ca989ef8c06b25b3d02d8db36"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="CH4_VMR_D_max">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="33627730" uuid="27429e59-8a7e-4e63-bed1-cefca246f73d" chunkPositionInArray="[0,0,0]" nBytes="187036" md5="652024045db748da58b69a2b1ffe24b1"/>
+      <h4:byteStream offset="33814766" uuid="7944b372-7682-41ce-b721-4fdab6528082" chunkPositionInArray="[0,0,180]" nBytes="182555" md5="a8d26d66d34c08385cdf05ec39d38cc4"/>
+      <h4:byteStream offset="33997321" uuid="86ab70a8-34c0-4280-950d-1e906950a74f" chunkPositionInArray="[0,90,0]" nBytes="184193" md5="950ad81c7c670f7b01fe5914ebb705e7"/>
+      <h4:byteStream offset="191454209" uuid="c9c89b7a-3a0c-4148-bde9-5ad6b41dda26" chunkPositionInArray="[0,90,180]" nBytes="175544" md5="60c307ebfdba156cb3c468918f5af660"/>
+      <h4:byteStream offset="191629753" uuid="74ac4824-0feb-4589-809e-5cf23ad1f068" chunkPositionInArray="[12,0,0]" nBytes="192014" md5="44b4951448c01877916387bd405073ef"/>
+      <h4:byteStream offset="191821767" uuid="ff5aae87-42e6-4e62-89c1-02a6f3c052a8" chunkPositionInArray="[12,0,180]" nBytes="188888" md5="00bbe7b7fd62c7681ead56afda156fa0"/>
+      <h4:byteStream offset="192010655" uuid="65a46e32-69a4-4d5c-94de-f356e94116e9" chunkPositionInArray="[12,90,0]" nBytes="197138" md5="ebb266d09aeae6962284e23e21a1a651"/>
+      <h4:byteStream offset="192207793" uuid="c29f4efc-34cf-44bc-9a8d-f59492328f77" chunkPositionInArray="[12,90,180]" nBytes="191463" md5="8cdf036f71d8c5b739f90a46c9b43070"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotO3_D_err">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="174259344" uuid="483c8723-d489-42ee-906c-84dd8bd39755" chunkPositionInArray="[0,0]" nBytes="58890" md5="f4c471fe855e11d1dd9d2c00b8620448"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CH4_VMR_A_sdev">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="15519031" uuid="ed378d76-65da-4c0a-8400-6c5a542d12ad" chunkPositionInArray="[0,0,0]" nBytes="223796" md5="e6ec754dbaeedc94608eb8d30468e291"/>
+      <h4:byteStream offset="15742827" uuid="97a045e8-9fdb-4dd3-94b5-ec4927acfd6e" chunkPositionInArray="[0,0,180]" nBytes="217632" md5="7f871bad75f90ebe451d601482a46f2f"/>
+      <h4:byteStream offset="15960459" uuid="38529154-89bb-4531-a00c-3504856245bb" chunkPositionInArray="[0,90,0]" nBytes="218524" md5="5845b3e74f5d2c5ae10b7828ed2fc126"/>
+      <h4:byteStream offset="127100928" uuid="3c45296a-f91a-48d9-a555-458d16b7d807" chunkPositionInArray="[0,90,180]" nBytes="201473" md5="d65a375f5eb302bacf844c40556eb753"/>
+      <h4:byteStream offset="127302401" uuid="85172753-70d8-4440-82f8-b53d60e20e90" chunkPositionInArray="[12,0,0]" nBytes="227562" md5="5a280765f9814321d6695ca80e72d84a"/>
+      <h4:byteStream offset="127529963" uuid="1c276267-a60c-4690-bd14-c5c4dcaf5ea2" chunkPositionInArray="[12,0,180]" nBytes="221518" md5="95003077e49a71aaf259ca5eba15a65c"/>
+      <h4:byteStream offset="127751481" uuid="a6269e43-1117-4174-a999-3051eeb261eb" chunkPositionInArray="[12,90,0]" nBytes="228626" md5="2ad6b1fcff4fc8b8e3c01362d823a358"/>
+      <h4:byteStream offset="127980107" uuid="9c63ff61-72df-4e33-86b4-a615797a3c22" chunkPositionInArray="[12,90,180]" nBytes="218578" md5="670358842276e595a54bb2511ed1b313"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="Temperature_TqJ_A_max">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="36570362" uuid="3def0062-0441-4c7c-81d0-d30942869b0a" chunkPositionInArray="[0,0,0]" nBytes="190190" md5="ab32de133973b4240ced64434d9750cc"/>
+      <h4:byteStream offset="36760552" uuid="916d347d-7ab6-4166-9892-12f1d724a492" chunkPositionInArray="[0,0,180]" nBytes="191346" md5="b5ab2219ca05228d1672768bba1b8610"/>
+      <h4:byteStream offset="36951898" uuid="fb45889b-1be3-450c-ae34-6a8a9e1a7b74" chunkPositionInArray="[0,90,0]" nBytes="191212" md5="0c4c0f5b962a7f6e3dd883a2fcbcac90"/>
+      <h4:byteStream offset="199747880" uuid="8ae02b3b-3019-4e76-b513-9662154b084c" chunkPositionInArray="[0,90,180]" nBytes="186282" md5="46e8c39be888151f16059c944f367fd6"/>
+      <h4:byteStream offset="199934162" uuid="55eba988-c2f4-4453-b333-1bb5281219af" chunkPositionInArray="[12,0,0]" nBytes="180629" md5="576168cd85816d293d4662c846139b0d"/>
+      <h4:byteStream offset="200114791" uuid="9679e799-f1ab-41db-8adf-6ecf7aa361a2" chunkPositionInArray="[12,0,180]" nBytes="184927" md5="7fd4a62e8e5ffcb120854010ed36a400"/>
+      <h4:byteStream offset="200299718" uuid="a8424926-6859-4029-b515-66c99ef70771" chunkPositionInArray="[12,90,0]" nBytes="198767" md5="1092ccfde2e24259a56af3b9f40afc17"/>
+      <h4:byteStream offset="200498485" uuid="9e943cb7-f036-4bc3-a095-1440d052e818" chunkPositionInArray="[12,90,180]" nBytes="194181" md5="d92c207987cb74d4a541c34b751aec77"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotH2OVap_D_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="140475915" uuid="5b50bc7b-1676-4478-bc86-9574fa034661" chunkPositionInArray="[0,0]" nBytes="94030" md5="7e42a7eff82b4d89233329dd38a072d8"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CO_VMR_A">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="11497144" uuid="9fc1dc94-fcbc-43f7-ba54-06a95ec596eb" chunkPositionInArray="[0,0,0]" nBytes="240984" md5="697b7dc98d98933824aad1dfa967a236"/>
+      <h4:byteStream offset="11738128" uuid="2c33d844-ea94-4c54-8176-dcabf0f8805e" chunkPositionInArray="[0,0,180]" nBytes="246791" md5="0a4d476484e78527aa976f9af1e81dd7"/>
+      <h4:byteStream offset="11984919" uuid="5b46dffe-1502-4508-8130-e910ed66bdc1" chunkPositionInArray="[0,90,0]" nBytes="228487" md5="c140670dd0f0603a6675474546c4d951"/>
+      <h4:byteStream offset="118956708" uuid="e5f6c2c3-c6c9-47f5-b5b6-ca91573415c3" chunkPositionInArray="[0,90,180]" nBytes="215231" md5="5e3da6e096504aa5986789e2089438f7"/>
+      <h4:byteStream offset="119171939" uuid="852529c3-4ef4-45ae-b711-cd1e43e310fc" chunkPositionInArray="[12,0,0]" nBytes="210187" md5="e26f73c21f48dcb0693235b9fa074b4e"/>
+      <h4:byteStream offset="119382126" uuid="a2602fa3-70e6-46fd-b043-4db006e9a970" chunkPositionInArray="[12,0,180]" nBytes="217658" md5="f9b4de48022a2d6afddd0e951c6cc350"/>
+      <h4:byteStream offset="119599784" uuid="7dbdbe54-8b26-488e-b89f-e24762b1bf68" chunkPositionInArray="[12,90,0]" nBytes="208696" md5="f73f60ee972d701bb54030c09928fa23"/>
+      <h4:byteStream offset="119808480" uuid="6ac6ac50-8768-4def-8e68-bf4469ebed78" chunkPositionInArray="[12,90,180]" nBytes="199828" md5="fd36fdd416901a965cb14fe3b8da03cc"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="H2O_MMR_TqJ_D_ct">
+    <Dim name="/H2OPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>5</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="273440184" uuid="6c38851e-7d7a-490b-9756-f75acb0ab38d" chunkPositionInArray="[0,0,0]" nBytes="437168" md5="70fa64d90105a06cfaa4f3cb2689caf2"/>
+    </h4:chunks>
+  </Int16>
+  <Int16 name="ClrOLR_A_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="131281715" uuid="cb11ee52-b11f-4bd6-a039-97c4cccbdf68" chunkPositionInArray="[0,0]" nBytes="38095" md5="3d0be0f722febe04c26d04f854aba553"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="TotCldLiqH2O_MW_D_err">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="321157266" uuid="e4d61f84-5b2d-4e87-bf65-3a16d3a0ab25" chunkPositionInArray="[0,0]" nBytes="1161" md5="a43f0ca2084e297f3aa9763a828dcb0f"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="EmisIR_A_max">
+    <Dim name="/EmisFreqIR"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>1</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>4 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="70399121" uuid="64e346f4-6eaf-439d-852a-2b42075e03fe" chunkPositionInArray="[0,0,0]" nBytes="166038" md5="0ae4334f15d37f4bbed1fecadcccdf8e"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="H2O_MMR_TqJ_D_max">
+    <Dim name="/H2OPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>5</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="275876651" uuid="ab97a411-e376-44e3-b135-3388f8f6517e" chunkPositionInArray="[0,0,0]" nBytes="1061063" md5="acd66cef260201f10fe4f83ba026b80c"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="RelHumSurf_TqJ_A">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="218591752" uuid="51e01820-285d-49cd-84e1-6179b99b32db" chunkPositionInArray="[0,0]" nBytes="63293" md5="863b22b7619b4619c5d8bf393800b466"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="OLR_TqJ_A_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="257008371" uuid="552d188a-913f-4710-9022-8ee33e13471d" chunkPositionInArray="[0,0]" nBytes="78674" md5="f7914c083101c112d195e474f0df4967"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="Temperature_MW_A_ct">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>24 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="320775146" uuid="b1d8a080-9aa3-47d0-83c3-0029073a7d9b" chunkPositionInArray="[0,0,0]" nBytes="13586" md5="7c90147b4fcb72404dd36c4b0d82051d"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="CloudTopTemp_A">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="105786591" uuid="40797bba-0554-4d85-b565-6b632c1882a7" chunkPositionInArray="[0,0]" nBytes="89216" md5="7106179a46cb2e59f00d620ff1b8d177"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CH4_VMR_D_sdev">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="32401705" uuid="21ff73f1-3c3a-4542-8f27-457d9d224d9b" chunkPositionInArray="[0,0,0]" nBytes="223944" md5="0a8541ad94f875e23094c72fc4769a4a"/>
+      <h4:byteStream offset="32625649" uuid="ac44d7d9-b213-4f6c-b68c-0441648ba7bc" chunkPositionInArray="[0,0,180]" nBytes="216462" md5="77ac59d3225fad24097a3108d26e8de1"/>
+      <h4:byteStream offset="32842111" uuid="f6525597-6935-4e34-a70b-c5af459ba6c0" chunkPositionInArray="[0,90,0]" nBytes="219462" md5="359a017e73bc1c188bf0c2fe787f2a2b"/>
+      <h4:byteStream offset="189426351" uuid="97b2fa95-7ad1-4a13-b0b0-e7db034a6788" chunkPositionInArray="[0,90,180]" nBytes="203428" md5="7fe81ed4e48e710e5ca647688c99a35c"/>
+      <h4:byteStream offset="189629779" uuid="29c9229c-c114-4332-a029-620115851e0c" chunkPositionInArray="[12,0,0]" nBytes="227897" md5="06471b1b1609e378869650973ef01485"/>
+      <h4:byteStream offset="189857676" uuid="8f133bc9-fd8b-41d5-9055-65b5a3198b8d" chunkPositionInArray="[12,0,180]" nBytes="220197" md5="be93f6a8106cac861c5ef20f0194513b"/>
+      <h4:byteStream offset="190077873" uuid="2021b36a-ea93-49b3-8d30-7f260e783eda" chunkPositionInArray="[12,90,0]" nBytes="228427" md5="813990ecb9348d4d2c1531b4bc08706b"/>
+      <h4:byteStream offset="190306300" uuid="43d67e45-a3ce-4878-bf88-20b6e9de00bf" chunkPositionInArray="[12,90,180]" nBytes="221518" md5="cd222c1d2d300f80b5deeabfeb1b50e4"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotCldLiqH2O_MW_D">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="321152033" uuid="66958f61-5db1-4063-9cba-4bf8705f3b34" chunkPositionInArray="[0,0]" nBytes="1161" md5="a43f0ca2084e297f3aa9763a828dcb0f"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CO_VMR_TqJ_A_err">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="48128957" uuid="3291ac40-c7ea-4e64-9bf0-3e7928707215" chunkPositionInArray="[0,0,0]" nBytes="208392" md5="963fd98215b7ee2aa6302a074b913c52"/>
+      <h4:byteStream offset="48337349" uuid="1f751488-8846-4882-badf-1baa7418e8a9" chunkPositionInArray="[0,0,180]" nBytes="209036" md5="71943c2e8a27364c1b213017d158a77b"/>
+      <h4:byteStream offset="48546385" uuid="b4283a4c-a276-47cc-9e13-55916deb24b9" chunkPositionInArray="[0,90,0]" nBytes="193189" md5="64f6a283268a5389333f6720312cebc6"/>
+      <h4:byteStream offset="249902482" uuid="23bde00d-dab6-46d3-bc4a-4da65a085f21" chunkPositionInArray="[0,90,180]" nBytes="178526" md5="0e577e2a659812e385443d9708669b1f"/>
+      <h4:byteStream offset="250081008" uuid="bd6f2bc8-fa08-4679-86a0-49f4e79a7b36" chunkPositionInArray="[12,0,0]" nBytes="204277" md5="ffcb89860d4a83f4185eee0fdf721d08"/>
+      <h4:byteStream offset="250285285" uuid="c08c0ef5-397f-4e95-9754-20b8a553d1c2" chunkPositionInArray="[12,0,180]" nBytes="209783" md5="dd4ae14dcfcf065e0dd90ef9e51ae0e2"/>
+      <h4:byteStream offset="250495068" uuid="36694b45-38e1-4366-b924-ebb99a8a2253" chunkPositionInArray="[12,90,0]" nBytes="186615" md5="d4f1c95a3f3cec8d37c4ab7f2dd2afa6"/>
+      <h4:byteStream offset="250681683" uuid="8a8c2dd5-6251-44f0-91c1-eaa57c74f427" chunkPositionInArray="[12,90,180]" nBytes="175600" md5="4591f7b722eabd11d479bc1d9795ba67"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="CloudTopPres_A_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="105444873" uuid="6b771b7a-5557-4a5b-af7d-0cb33e6dcb9f" chunkPositionInArray="[0,0]" nBytes="39089" md5="2d8e4b22c3e783c0f7356aa3e7242c70"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="RelHum_liquid_TqJ_A_min">
+    <Dim name="/H2OPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>5</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="221091692" uuid="2d112579-d27c-44b1-8dea-fb295a858abc" chunkPositionInArray="[0,0,0]" nBytes="814692" md5="28581f1676588c49a1ba59a0d2adc531"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="H2O_MMR_Lyr_TqJ_A">
+    <Dim name="/H2OPressureLay"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>4</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="203360360" uuid="f51855df-9e21-433e-8c52-9104b80027e7" chunkPositionInArray="[0,0,0]" nBytes="1117798" md5="35746b298822ffc10ee8e73f84609308"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="H2O_MMR_Lyr_D_ct">
+    <Dim name="/H2OPressureLay"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>4</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="141758589" uuid="d6a4cae9-217b-419f-a500-41d8653e24d6" chunkPositionInArray="[0,0,0]" nBytes="416162" md5="e09dfb703e22d9f31c7a5978ed7c057d"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="CloudFrc_D_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="167688476" uuid="339c239f-1a79-4305-8efe-954c3fb24ca3" chunkPositionInArray="[0,0]" nBytes="44988" md5="95f196e2fc4fedeef761fe8e60c21cf8"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CH4_VMR_TqJ_D_err">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="68046575" uuid="d4ba122c-b697-4a56-a356-4ba706bf5756" chunkPositionInArray="[0,0,0]" nBytes="136674" md5="3c735627f855958518baed7f662ab4b4"/>
+      <h4:byteStream offset="68183249" uuid="d451da43-a7b7-4534-aa81-dacc38a38bf8" chunkPositionInArray="[0,0,180]" nBytes="138155" md5="d586ecdce180b7b003d9080ef2a86f7d"/>
+      <h4:byteStream offset="68321404" uuid="831d306a-c540-4980-a04e-8916b7821226" chunkPositionInArray="[0,90,0]" nBytes="138362" md5="e4c2c486c6c5138740de4a358f41604f"/>
+      <h4:byteStream offset="319216095" uuid="90ae378c-148c-4113-af4c-2b7fff774b48" chunkPositionInArray="[0,90,180]" nBytes="137798" md5="2729ed2720f3338a1ea3cf069cfc96af"/>
+      <h4:byteStream offset="319353893" uuid="fb50e7a4-993e-4be0-878a-4ac9397b5c0b" chunkPositionInArray="[12,0,0]" nBytes="152223" md5="4053d8e600202315549f2492ecf475f5"/>
+      <h4:byteStream offset="319506116" uuid="0834a285-732a-4c7e-b99f-24e5f3ea12db" chunkPositionInArray="[12,0,180]" nBytes="153057" md5="98777615eeb87aa87314b26931000e39"/>
+      <h4:byteStream offset="319659173" uuid="27c7d8ba-95a2-4df0-a6e6-7c3d4e83929c" chunkPositionInArray="[12,90,0]" nBytes="158742" md5="5f7ceff5e1e36ef0640a3e6584fb28ae"/>
+      <h4:byteStream offset="319817915" uuid="d31c1cde-47e7-4ec2-a65f-b61feb82c310" chunkPositionInArray="[12,90,180]" nBytes="155771" md5="9fd78a54f3f7bc9f8945372825d50342"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="TotO3_TqJ_D_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="300800986" uuid="b1ee32b3-c7f1-4890-a08d-0ee207da9fd3" chunkPositionInArray="[0,0]" nBytes="38366" md5="33203c2f507d0b5cd88a223131cdb593"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="H2O_MMR_A_sdev">
+    <Dim name="/H2OPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>5</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="85049795" uuid="b6cd799c-15c4-41d3-9825-80796fe866b4" chunkPositionInArray="[0,0,0]" nBytes="912277" md5="f2d8412db6ed2e8c58f7abb682ca539c"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="RelHum_liquid_TqJ_A_sdev">
+    <Dim name="/H2OPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>5</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="220158426" uuid="64907650-b859-4f05-877a-8f1b1ebab8b9" chunkPositionInArray="[0,0,0]" nBytes="933266" md5="6b3dedbf1c11b9951a632a224dc4b953"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="SurfSkinTemp_TqJ_D_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="257963920" uuid="a8d804d2-9fca-4571-bf3f-6ad4e107337f" chunkPositionInArray="[0,0]" nBytes="66419" md5="00f4e77c007e6bc02c8b7188d38898b1"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="SurfAirTemp_TqJ_A_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="202028063" uuid="95769721-283a-40e4-87fd-e72a59b50cdf" chunkPositionInArray="[0,0]" nBytes="68478" md5="6743a017fa42bee68b3a847742f5adbc"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="SurfPres_Forecast_D_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="131821492" uuid="aa3bc336-3d48-4d8e-b2b1-9206f0b90d38" chunkPositionInArray="[0,0]" nBytes="51598" md5="6f5a1a4a74b2dcc91e881efecdcec444"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="GPHeight_A">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="4146531" uuid="38ac3f60-e33a-460b-997b-b12cac99d845" chunkPositionInArray="[0,0,0]" nBytes="189881" md5="86f7d147467f6bd6cd9ed419e13dffb1"/>
+      <h4:byteStream offset="4336412" uuid="03cf5a88-a0d0-43c8-9b3b-56c077a48acd" chunkPositionInArray="[0,0,180]" nBytes="191584" md5="be41dd067f65ff05facf454c6f90b438"/>
+      <h4:byteStream offset="4527996" uuid="049a6a36-34ea-4f71-ac53-9186604a0278" chunkPositionInArray="[0,90,0]" nBytes="193917" md5="66b2b249fb53d484bdf65ecbc6abb72e"/>
+      <h4:byteStream offset="97967162" uuid="0e47b1f2-c509-41e7-b65d-2612a4f9e237" chunkPositionInArray="[0,90,180]" nBytes="187189" md5="91c383e306b4cb0a3f90d4d02c507337"/>
+      <h4:byteStream offset="98154351" uuid="c1a9c633-fa35-4134-bc2f-3dce24147855" chunkPositionInArray="[12,0,0]" nBytes="204488" md5="0b6ab0132ea5a66d51a5e487edb259a8"/>
+      <h4:byteStream offset="98358839" uuid="1bd4d4c8-59a6-45f4-b118-115330891ba8" chunkPositionInArray="[12,0,180]" nBytes="208688" md5="c75cc243cf99d29b3eb4973662d23629"/>
+      <h4:byteStream offset="98567527" uuid="6a5493dc-375e-4a3c-ba88-d4c5de994664" chunkPositionInArray="[12,90,0]" nBytes="220986" md5="b04305e6115e3b6b2df9d0911ff9a769"/>
+      <h4:byteStream offset="98788513" uuid="ee8b6664-0044-4057-823a-2a336abeb386" chunkPositionInArray="[12,90,180]" nBytes="218174" md5="690d6ddbeb3888e19327aac7394071ef"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="EmisIR_TqJ_A_ct">
+    <Dim name="/EmisFreqIR"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>1</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>4 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="194777157" uuid="3ec1769f-90ac-4b5d-8a59-e1d74e6052f9" chunkPositionInArray="[0,0,0]" nBytes="150229" md5="c69fc0b40f05e5eea97c1ca5722bd617"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="O3_VMR_A_max">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="10227155" uuid="b769e212-628e-4b3c-a47a-0aee7141b0f7" chunkPositionInArray="[0,0,0]" nBytes="237763" md5="3d6039401c966c16d2253ed810ce2d5b"/>
+      <h4:byteStream offset="10464918" uuid="d73bb4f6-694e-4038-a6b2-8511c691c9e0" chunkPositionInArray="[0,0,180]" nBytes="238699" md5="62f052dfadd15a7fb307f63fde079c7e"/>
+      <h4:byteStream offset="10703617" uuid="faf9dbc3-581e-4361-afd3-d8bbba8b9ce9" chunkPositionInArray="[0,90,0]" nBytes="233556" md5="e4e94c632978abef581e8a2da9e4baac"/>
+      <h4:byteStream offset="116499626" uuid="eea53c50-ced2-436b-bc1f-a845122d4601" chunkPositionInArray="[0,90,180]" nBytes="220370" md5="64c4671a04a5a58a475de45912b10e7c"/>
+      <h4:byteStream offset="116719996" uuid="75c86956-7b9e-4042-a397-d005658ba2ca" chunkPositionInArray="[12,0,0]" nBytes="243958" md5="46bdae3ed72e18d525213f788bd5e398"/>
+      <h4:byteStream offset="116963954" uuid="1251d477-ec9b-4fe7-a3ad-dad890ed3537" chunkPositionInArray="[12,0,180]" nBytes="246384" md5="443aebd20cb359f37994b055e932a4aa"/>
+      <h4:byteStream offset="117210338" uuid="87a764ce-ac47-47d0-a90e-26d347e8cd7c" chunkPositionInArray="[12,90,0]" nBytes="250998" md5="e52e098b517cfa80febe7994861feae4"/>
+      <h4:byteStream offset="117461336" uuid="b8504138-053b-4c57-a88d-8199411d26e7" chunkPositionInArray="[12,90,180]" nBytes="248006" md5="bfb375b7dfb09141cc1dc7264ed0cd7a"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="RelHumSurf_D_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="155796241" uuid="8e4a04d6-0ae1-4368-8e03-8d068d72ae1a" chunkPositionInArray="[0,0]" nBytes="59358" md5="c602bd785be7b559a46528152c7285e3"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="OLR_A_err">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="131198681" uuid="6c50c873-d1f6-454e-bc38-90fa6a99bc13" chunkPositionInArray="[0,0]" nBytes="8477" md5="402066679b6ecffc2b7d1cf240c1f73c"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="SurfPres_Forecast_D_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="131766009" uuid="a1e6884c-8252-4685-a146-8e41f5383417" chunkPositionInArray="[0,0]" nBytes="55483" md5="43c522476e2e84fdafcbbc686fcad22e"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="RelHumSurf_TqJ_D_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="282113729" uuid="72cb08f9-dc0f-44e4-947f-384a689d97d2" chunkPositionInArray="[0,0]" nBytes="75691" md5="4687c1a0a670a1d8eb0b544e27e4c85b"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="H2O_MMR_Lyr_A_max">
+    <Dim name="/H2OPressureLay"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>4</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="81603090" uuid="41da4d92-610d-4677-bac7-823a4a912259" chunkPositionInArray="[0,0,0]" nBytes="1064910" md5="40b2dcdb471788be0bae11fdb0a9ccbc"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CoarseCloudFrc_TqJ_D_sdev">
+    <Dim name="/CoarseCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>0</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="298260583" uuid="9bd936ce-b9fe-4873-be8c-def11f98464c" chunkPositionInArray="[0,0,0]" nBytes="230316" md5="febb9f721cd68a4c763182304f5da0f3"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CoarseCloudFrc_D_max">
+    <Dim name="/CoarseCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>0</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="171726290" uuid="6598c211-9514-4bb5-8f3c-25a30e45549f" chunkPositionInArray="[0,0,0]" nBytes="203953" md5="48909588da50a0b3ee55dbbc075807d1"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotH2OVap_MW_D_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="321066544" uuid="6e8a90e0-3eaf-4783-b90a-ca165f8005bf" chunkPositionInArray="[0,0]" nBytes="1161" md5="a43f0ca2084e297f3aa9763a828dcb0f"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotO3_TqJ_A_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="237672873" uuid="3fea17e4-fad0-472f-a6d2-10f610178d1d" chunkPositionInArray="[0,0]" nBytes="77087" md5="b0a91c7ab4656512dea19e965097fefd"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CH4_VMR_TqJ_A_sdev">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="49338632" uuid="b777735c-38f6-4411-8b75-8a9a52d9d4a4" chunkPositionInArray="[0,0,0]" nBytes="223796" md5="e6ec754dbaeedc94608eb8d30468e291"/>
+      <h4:byteStream offset="49562428" uuid="8a0f57cc-6c10-4d84-bc38-744ff6f9eeda" chunkPositionInArray="[0,0,180]" nBytes="217632" md5="7f871bad75f90ebe451d601482a46f2f"/>
+      <h4:byteStream offset="49780060" uuid="b64977e9-b5e5-4a2c-93d3-73cad08c17e1" chunkPositionInArray="[0,90,0]" nBytes="218524" md5="5845b3e74f5d2c5ae10b7828ed2fc126"/>
+      <h4:byteStream offset="252978206" uuid="76e407bc-cf88-42e2-99b7-54f09ea2934d" chunkPositionInArray="[0,90,180]" nBytes="201473" md5="d65a375f5eb302bacf844c40556eb753"/>
+      <h4:byteStream offset="253179679" uuid="f64b52b1-d08e-4163-a7ed-fe8b75c128e6" chunkPositionInArray="[12,0,0]" nBytes="227562" md5="5a280765f9814321d6695ca80e72d84a"/>
+      <h4:byteStream offset="253407241" uuid="755eaabd-5d6a-47c6-901a-5430e1516c6a" chunkPositionInArray="[12,0,180]" nBytes="221518" md5="95003077e49a71aaf259ca5eba15a65c"/>
+      <h4:byteStream offset="253628759" uuid="6ad54d62-a378-4ce7-a318-fdcc83393494" chunkPositionInArray="[12,90,0]" nBytes="228626" md5="2ad6b1fcff4fc8b8e3c01362d823a358"/>
+      <h4:byteStream offset="253857385" uuid="b6962453-3a34-46c2-8135-46b5ede4965a" chunkPositionInArray="[12,90,180]" nBytes="218578" md5="670358842276e595a54bb2511ed1b313"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TropTemp_A_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="77517329" uuid="d51dc31a-2102-4348-85f0-a92786753a0d" chunkPositionInArray="[0,0]" nBytes="68059" md5="2be2f4af9ac61bc2aa3e3214004c22a8"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CloudTopTemp_D_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="168526314" uuid="79acdb32-b173-4ed3-90c1-1aa4df7be727" chunkPositionInArray="[0,0]" nBytes="84670" md5="7d08a824bbaa9063ccc6de3ee9f6bc89"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TropPres_TqJ_A_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="202378521" uuid="7032adff-46f1-4ae7-9c26-4d0cf43daabf" chunkPositionInArray="[0,0]" nBytes="78582" md5="6fe2b824c7e9620b6f7f001492885a15"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TropPres_TqJ_D_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="265940919" uuid="9f0d5a92-2bff-4c2c-a114-81adf178f5f3" chunkPositionInArray="[0,0]" nBytes="77668" md5="ad697e5de8ab4ceab65819f2a60e9be5"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="EmisIR_TqJ_A_err">
+    <Dim name="/EmisFreqIR"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>1</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>4 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="195580875" uuid="9d477fb3-a63a-4faa-b1b9-99a4067408cf" chunkPositionInArray="[0,0,0]" nBytes="174108" md5="f2c447c8be6439fcaf06bf55e3200964"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TropHeight_D_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="160040168" uuid="9233386e-f563-4860-ab41-aa8361c3848b" chunkPositionInArray="[0,0]" nBytes="85211" md5="15873c88c6d305d014dee5ae0860e4d9"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="RelHumSurf_liquid_A_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="97238464" uuid="661298cc-7329-43c5-86f2-57cefe65aae2" chunkPositionInArray="[0,0]" nBytes="78391" md5="e7acee7db58dda269131af4bb814c43f"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="RelHumSurf_liquid_A">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="97138908" uuid="34740737-b9bc-4c61-84ea-4eca7da97602" chunkPositionInArray="[0,0]" nBytes="63482" md5="0b59ebbd8395451d3f4ecc0b7fa23d95"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotO3_A_err">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="111872670" uuid="371e7392-11e1-4121-8173-587d81317b7d" chunkPositionInArray="[0,0]" nBytes="59911" md5="d3947a5470b82ffe9201842ad6b4daea"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CO_VMR_TqJ_D_max">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="64376602" uuid="a6b79767-cc11-490a-ad50-da51e88ec171" chunkPositionInArray="[0,0,0]" nBytes="230413" md5="8c59826098a0c7ee06b008e89feb46e3"/>
+      <h4:byteStream offset="64607015" uuid="edee7417-b36f-4d56-bcab-af4fa7f8cc42" chunkPositionInArray="[0,0,180]" nBytes="233602" md5="e1aa9fa936ca9edb7226c980c6adf92a"/>
+      <h4:byteStream offset="64840617" uuid="442da326-0681-4ab6-add7-7062dd06eeaf" chunkPositionInArray="[0,90,0]" nBytes="223446" md5="d04556bb5dff28bc07a47894ae780e36"/>
+      <h4:byteStream offset="312161787" uuid="11bd70fd-8660-497e-a766-a495790900f8" chunkPositionInArray="[0,90,180]" nBytes="209640" md5="c0b05203d1a2bf82df0e3df1f62fd2f8"/>
+      <h4:byteStream offset="312371427" uuid="ec792bfa-458a-4762-b74b-551592bc5db1" chunkPositionInArray="[12,0,0]" nBytes="199406" md5="70c16747f86f2f03055f3da42919e802"/>
+      <h4:byteStream offset="312570833" uuid="9742d539-2b84-4693-8b13-8941edcd647e" chunkPositionInArray="[12,0,180]" nBytes="204086" md5="9b65a9bdd8741b5c2b44bbf4f38566e8"/>
+      <h4:byteStream offset="312774919" uuid="9e74a48c-e4b2-4456-82e1-24c491aa2b94" chunkPositionInArray="[12,90,0]" nBytes="204697" md5="586465cd604aab4320137ea2989f5c70"/>
+      <h4:byteStream offset="312979616" uuid="ddddfa41-3100-4421-a345-922b6ed0726e" chunkPositionInArray="[12,90,180]" nBytes="194965" md5="308aaa806208bfe6ac7acaceda27aaa5"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="FineCloudFrc_TqJ_D_min">
+    <Dim name="/FineCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>3</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="297055365" uuid="b510fcc1-1028-4e7e-a2b4-d03b6f50568f" chunkPositionInArray="[0,0,0]" nBytes="196003" md5="9e2ba01ba4756a2c0f26f3fbb73df1f5"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CloudTopPres_TqJ_D_err">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="294672786" uuid="9b47145a-bbc1-4ae6-8052-9327951799f4" chunkPositionInArray="[0,0]" nBytes="76193" md5="50776a6fabba3242969727584c07b058"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotO3_TqJ_A_err">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="237749960" uuid="f75c15e0-3e60-408c-8ec2-cc7bfd43996b" chunkPositionInArray="[0,0]" nBytes="59901" md5="9a2a9fc697d16cc749e9a93f78f86b9d"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="ClrOLR_D_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="193589974" uuid="665d2240-7381-493d-963c-138a3c847d07" chunkPositionInArray="[0,0]" nBytes="38388" md5="98b43c6ca989ef8c06b25b3d02d8db36"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="SurfPres_Forecast_TqJ_A">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="193906215" uuid="f0449172-a07a-4c14-be1c-9851f13df03f" chunkPositionInArray="[0,0]" nBytes="57497" md5="5af2b9d457f1f3c230d595cf9614284a"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CoarseCloudPres_TqJ_A_min">
+    <Dim name="/CoarseCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>0</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="235961094" uuid="50c85e3e-9219-48ba-8c16-9fec5a4c7657" chunkPositionInArray="[0,0,0]" nBytes="197593" md5="8b8e29383479af5ca72046d23381c401"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="GPHeight_TqJ_A_min">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="39265501" uuid="1e5ef871-362e-47b3-a6ae-c753037ddf16" chunkPositionInArray="[0,0,0]" nBytes="415706" md5="dd2a8d191a3225787a6550405e237236"/>
+      <h4:byteStream offset="39681207" uuid="3a909a2d-afd5-47e4-ad76-1048553a7998" chunkPositionInArray="[0,0,180]" nBytes="409410" md5="745080ab932ea7d3d0ba69bf43386491"/>
+      <h4:byteStream offset="40090617" uuid="4c72c650-a491-4751-8d3a-8b535406dc32" chunkPositionInArray="[0,90,0]" nBytes="411700" md5="c35ad13b60abc3f5f961e2d1e355cad0"/>
+      <h4:byteStream offset="226658939" uuid="f0483346-618a-449d-a990-6b5d13da8ac5" chunkPositionInArray="[0,90,180]" nBytes="393836" md5="22c008089358b508c7f54dfee2feb9ba"/>
+      <h4:byteStream offset="227052775" uuid="3c3cede9-a4e7-47b4-a157-3680910a8eea" chunkPositionInArray="[12,0,0]" nBytes="378787" md5="8d2e1039ade5bc99a33e533ae82f49fe"/>
+      <h4:byteStream offset="227431562" uuid="06ff222d-fa83-4fc4-9639-15a8c97152ca" chunkPositionInArray="[12,0,180]" nBytes="377961" md5="10e6ea35683e694e89218b4a00a67824"/>
+      <h4:byteStream offset="227809523" uuid="967b971a-2839-4910-b3d2-26adcfe1a3b9" chunkPositionInArray="[12,90,0]" nBytes="395700" md5="5477b9ac317d0fc1c76a69970aea5b32"/>
+      <h4:byteStream offset="228205223" uuid="25f2f57d-1d2c-4a39-a022-eef4a8c324b1" chunkPositionInArray="[12,90,180]" nBytes="393214" md5="f560519a0edde0ee977d1fb403858f65"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CoarseCloudTemp_TqJ_D">
+    <Dim name="/CoarseCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>0</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="299690116" uuid="a3fb4fc8-757f-470c-9474-8f131e98fa4e" chunkPositionInArray="[0,0,0]" nBytes="238001" md5="0d2ae2fbbb2caa3ad5c92e45993cc70b"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="RelHum_liquid_D">
+    <Dim name="/H2OPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>5</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="155910649" uuid="b187b1ae-5cef-43a8-8413-f58c8362b68e" chunkPositionInArray="[0,0,0]" nBytes="813880" md5="2c36ccaabe158451caa9c33648444e7d"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="SurfAirTemp_TqJ_A_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="201836822" uuid="60c4f28c-87e4-4a0f-8820-bfc6a4a57eaa" chunkPositionInArray="[0,0]" nBytes="38097" md5="7ecb5454a268cdff2fbe0fe8ea8b6d10"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="H2O_MMR_Surf_A_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="89233277" uuid="6544d774-0224-4b77-94ec-c50cc409fbe8" chunkPositionInArray="[0,0]" nBytes="87685" md5="bcdfac739db26a669d04cb48c5a31d7a"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="H2O_MMR_Lyr_TqJ_A_sdev">
+    <Dim name="/H2OPressureLay"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>4</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="204913211" uuid="23a46c34-26d7-4b71-91dd-f8ba97bbbfd6" chunkPositionInArray="[0,0,0]" nBytes="934506" md5="cba623e43017bec5aa578c27e9fa42d3"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="TotO3_A_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="111596159" uuid="0863ad1c-f3bd-43d9-810a-c3f94b365ec9" chunkPositionInArray="[0,0]" nBytes="38071" md5="ee55354129862e3a033c42afa75d4d8c"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="Temperature_MW_A_max">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="68555923" uuid="713d4ab0-36d5-4473-9e5f-fc3b60a93780" chunkPositionInArray="[0,0,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="68559344" uuid="b3f933aa-7852-40e3-b99f-f93e9a8428da" chunkPositionInArray="[0,0,180]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="68562765" uuid="6519116a-8886-436e-ae68-97191ed8d90e" chunkPositionInArray="[0,90,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="320822942" uuid="8500a30a-8b06-42ed-8682-aa678dd14ea7" chunkPositionInArray="[0,90,180]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="320826363" uuid="16209fdd-7008-4cfd-b5f0-b4c787fa9acc" chunkPositionInArray="[12,0,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="320829784" uuid="17be0c1f-e4a1-44c3-a309-816164c3c413" chunkPositionInArray="[12,0,180]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="320833205" uuid="3bc29bd5-1aa3-44d5-ac79-d29c03302d81" chunkPositionInArray="[12,90,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="320836626" uuid="bb871c65-efe9-4371-8500-8f8f72af4235" chunkPositionInArray="[12,90,180]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotH2OVap_MW_D_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="321068866" uuid="2bf75cbe-6e26-45bb-9232-ead1cea9ac77" chunkPositionInArray="[0,0]" nBytes="1161" md5="a43f0ca2084e297f3aa9763a828dcb0f"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="GPHeight_A_sdev">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="4728185" uuid="4e92a040-488f-4cc4-8269-2bb4d1aa072f" chunkPositionInArray="[0,0,0]" nBytes="241607" md5="01f80a6304e4c362dbe36d88f9adb8fe"/>
+      <h4:byteStream offset="4969792" uuid="19ec82b9-1201-46ec-a150-346e397c5d83" chunkPositionInArray="[0,0,180]" nBytes="239333" md5="2f763802996e5af6d17cdbab8481321b"/>
+      <h4:byteStream offset="5209125" uuid="740edf22-e2ac-472c-8a91-ed4921817ee5" chunkPositionInArray="[0,90,0]" nBytes="233639" md5="3219fa635114cfb04eb8fa873af45256"/>
+      <h4:byteStream offset="99893785" uuid="2af982b0-38b4-48f1-b1a2-de0c838fbcbe" chunkPositionInArray="[0,90,180]" nBytes="225236" md5="1f16566fda1393e6ddf28387991ef45e"/>
+      <h4:byteStream offset="100119021" uuid="19b79bbb-4efd-4d98-9668-725588c32864" chunkPositionInArray="[12,0,0]" nBytes="244440" md5="1c5db78790150a34c82aecdeb4c60759"/>
+      <h4:byteStream offset="100363461" uuid="8015a789-a6b3-49a5-962b-6ea04e420203" chunkPositionInArray="[12,0,180]" nBytes="245414" md5="90258d6f9f449c84f2b7d62f9fa54acd"/>
+      <h4:byteStream offset="100608875" uuid="9cb111ff-1104-43cf-bab8-6fe59f183191" chunkPositionInArray="[12,90,0]" nBytes="245749" md5="73a39f12ae293af21adc621d20b4d2fb"/>
+      <h4:byteStream offset="100854624" uuid="628613de-4fb9-4047-b301-af93aefa17b3" chunkPositionInArray="[12,90,180]" nBytes="243742" md5="e417f8e450f167cefd78f9f8a6d56adf"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="SurfAirTemp_TqJ_D_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="265441871" uuid="d35a8a2c-4bd9-4ba9-80a0-2311eca9f783" chunkPositionInArray="[0,0]" nBytes="69779" md5="e586816275602bd122a18b7daeeac7e2"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="SurfSkinTemp_D_err">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="132181863" uuid="076f8058-4e26-451a-b9c2-2c67f7cad31f" chunkPositionInArray="[0,0]" nBytes="66901" md5="f836b7373c0dbe9d38324448c6c65dce"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="Emis_MW_A_max">
+    <Dim name="/EmisFreqMW"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>2</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="320754620" uuid="b79ea759-d61b-4974-84a3-00556a4a23d6" chunkPositionInArray="[0,0,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="H2O_MMR_Lyr_D_err">
+    <Dim name="/H2OPressureLay"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>4</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="145229075" uuid="2aafdd8e-591d-4066-a55e-dc86ae4c5c9b" chunkPositionInArray="[0,0,0]" nBytes="852520" md5="47f6481e8716a79d8208ed150c762c33"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="TropPres_TqJ_A_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="202255300" uuid="19033ec4-eb39-444d-9954-0bee93c12d3a" chunkPositionInArray="[0,0]" nBytes="38097" md5="7ecb5454a268cdff2fbe0fe8ea8b6d10"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="OLR_TqJ_D_err">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="320338184" uuid="0c58a916-a843-42b0-9b49-8e95254418e4" chunkPositionInArray="[0,0]" nBytes="14867" md5="98aa0be9d15cb082be7be651d22ce8fc"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="Emis_MW_A_min">
+    <Dim name="/EmisFreqMW"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>2</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="320751199" uuid="74c78369-41db-4f5f-b288-7245b532bcf8" chunkPositionInArray="[0,0,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TropHeight_A_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="97810968" uuid="a342762c-1fa8-4587-88fa-7209dcbc759f" chunkPositionInArray="[0,0]" nBytes="156194" md5="0c9281ead28267fe275fbc30f3836f9a"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="FineCloudFrc_TqJ_D_ct">
+    <Dim name="/FineCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>3</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="295914216" uuid="2475da51-4b9d-4edd-9bf7-e5c8bf518934" chunkPositionInArray="[0,0,0]" nBytes="457383" md5="d12b6660a487ed6cce26cdb8ee028536"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="H2O_MMR_Lyr_TqJ_A_min">
+    <Dim name="/H2OPressureLay"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>4</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="205847717" uuid="abcd5b9a-9539-4794-aebb-758679c0c062" chunkPositionInArray="[0,0,0]" nBytes="1081221" md5="474552ea79ba59c876c98b2ca885f0d6"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CoarseCloudFrc_TqJ_D_max">
+    <Dim name="/CoarseCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>0</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="298579831" uuid="f9cf72e5-5408-4a5a-8f83-f8253ea1b15b" chunkPositionInArray="[0,0,0]" nBytes="213449" md5="acd7e6f57fb5bf7cfed7827225ea2fd8"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="RelHumSurf_liquid_TqJ_D_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="286200858" uuid="c7a6c32b-e8c0-4d77-a050-550ae60b4407" chunkPositionInArray="[0,0]" nBytes="75694" md5="7862aa30d644fa48e4c12b055b3584ad"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CoarseCloudTemp_TqJ_D_min">
+    <Dim name="/CoarseCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>0</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="300247971" uuid="166ccd8f-d38c-4216-8f09-f5effbf3cbe2" chunkPositionInArray="[0,0,0]" nBytes="237209" md5="d9c2f4ca96b6342c353d76e111014c82"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="H2O_MMR_TqJ_D_min">
+    <Dim name="/H2OPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>5</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="274806902" uuid="75b3ea34-3b03-4aca-8304-3e46156eec2b" chunkPositionInArray="[0,0,0]" nBytes="1069749" md5="d04403a3346e69f77a773b18ab604e3e"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotH2OVap_D_err">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="140569945" uuid="b0640675-db54-4aab-b259-f1fe57c3dde1" chunkPositionInArray="[0,0]" nBytes="77078" md5="2f7ffab61124625ddf0f6024702760e3"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="H2O_MMR_Lyr_A">
+    <Dim name="/H2OPressureLay"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>4</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="78077230" uuid="dcd8528f-011d-4d82-85bb-a11908f9ad65" chunkPositionInArray="[0,0,0]" nBytes="1114175" md5="53008e5946f9e8138df9e6dd87a90708"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="H2O_MMR_Surf_TqJ_A_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="214430974" uuid="cff22990-9edf-4da8-841a-20045cbfa091" chunkPositionInArray="[0,0]" nBytes="36074" md5="99eb3fdfc1da7941658a25a3e084c4f2"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="H2O_MMR_Surf_D_err">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="151850967" uuid="bdb01b3a-07cc-46ff-835d-e65d8498b447" chunkPositionInArray="[0,0]" nBytes="71595" md5="d21bca66141c4ed43e7ea2cfb22e9ab6"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="GPHeight_MW_A">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="68582402" uuid="3bb7cbcd-f539-4efe-93cc-a729422e50fc" chunkPositionInArray="[0,0,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="68585823" uuid="c7f95e88-266b-4f1b-ae17-5221ec5bbd4a" chunkPositionInArray="[0,0,180]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="68589244" uuid="cb3e7c06-4be7-4953-8f31-eddbbb5b17e4" chunkPositionInArray="[0,90,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="320845280" uuid="60556a6e-1731-4dae-9e35-b341ecefbb34" chunkPositionInArray="[0,90,180]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="320848701" uuid="2c27dc5b-470e-41db-9190-61419d47619d" chunkPositionInArray="[12,0,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="320852122" uuid="d8c01771-da42-46ec-b9b9-a67a390c0e0a" chunkPositionInArray="[12,0,180]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="320855543" uuid="bb72614a-d86d-42a2-8968-319c93552b9b" chunkPositionInArray="[12,90,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+      <h4:byteStream offset="320858964" uuid="bb006a07-e988-4d9e-a523-3cb3e7891247" chunkPositionInArray="[12,90,180]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="SurfPres_Forecast_D">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="131598060" uuid="65720949-59c0-4537-b377-28cd04a9e34e" chunkPositionInArray="[0,0]" nBytes="53362" md5="27d7a5195ce6a55fdc5197bfd4b56632"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="SurfPres_Forecast_TqJ_D_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="257731264" uuid="68c56f67-e79b-42c9-bfd6-540920eded43" chunkPositionInArray="[0,0]" nBytes="55874" md5="ba4e53e34fcd8af3833b97d1d42379ea"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CloudFrc_D_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="167549910" uuid="e2dbe7fd-9c06-43fb-b80e-6e79794b7b89" chunkPositionInArray="[0,0]" nBytes="77351" md5="feaa190572135bc12b53698e97bcbf15"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="ClrOLR_TqJ_A_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="257213631" uuid="cad9d557-c49a-45b5-8777-36d5813601c2" chunkPositionInArray="[0,0]" nBytes="84169" md5="e566a7eaa2009d35acf45e762ee82cd9"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="O3_VMR_TqJ_D_min">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="60297535" uuid="d2f3506c-bb18-49cc-8a47-7d8947b30892" chunkPositionInArray="[0,0,0]" nBytes="236055" md5="2653aceb735930bbafb9d9c28b1b8fca"/>
+      <h4:byteStream offset="60533590" uuid="11eb652a-adf6-4435-b426-9c920e864a3f" chunkPositionInArray="[0,0,180]" nBytes="237216" md5="f73bb0297be9d7f18ea92f7fff07992e"/>
+      <h4:byteStream offset="60770806" uuid="bffb15d5-b2f2-4df5-89fb-980f2b48fdaf" chunkPositionInArray="[0,90,0]" nBytes="232016" md5="435f39df1ba9b5baab83f90fedd7e019"/>
+      <h4:byteStream offset="304472572" uuid="afb9e5fb-4e79-4ac6-a7dd-d6e19236b553" chunkPositionInArray="[0,90,180]" nBytes="221694" md5="7225f5736438f9f197424a76b87d73f4"/>
+      <h4:byteStream offset="304694266" uuid="4191ddcf-7ea4-4caa-9654-06871be1e291" chunkPositionInArray="[12,0,0]" nBytes="244316" md5="d5fcbb3e232aa6cd705635dbd9ead2b0"/>
+      <h4:byteStream offset="304938582" uuid="de9afbe1-c9a2-40ac-b8ff-f16076056b1e" chunkPositionInArray="[12,0,180]" nBytes="245877" md5="4005016ea218a59d2a04bd1c47fce1ba"/>
+      <h4:byteStream offset="305184459" uuid="5a4db027-d559-465d-8c1f-ca34248ed107" chunkPositionInArray="[12,90,0]" nBytes="248446" md5="4da48cf74a793c899fb22c8a3691e574"/>
+      <h4:byteStream offset="305432905" uuid="fbc57ddc-f3a6-466c-b40e-b64f368bcaf5" chunkPositionInArray="[12,90,180]" nBytes="242645" md5="9ba72639ab952019459fd9a85033308b"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotO3_D_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="174182818" uuid="b3a00657-e191-4a5b-82f8-67de3e097202" chunkPositionInArray="[0,0]" nBytes="76526" md5="9bf4e9bbab247c95c0ae2e67942f9727"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotO3_D_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="174105997" uuid="4c836f8b-b84b-4ad4-9535-7fbe42a08214" chunkPositionInArray="[0,0]" nBytes="76821" md5="f5d3f54dffec2d6b11cd45871f437102"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="RelHumSurf_TqJ_D_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="282248778" uuid="60710d0f-b498-4bb5-86a3-a292c8aff0f5" chunkPositionInArray="[0,0]" nBytes="55050" md5="76aeb791285c1cbaccf89618787b6e39"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotCH4_TqJ_D_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="314382942" uuid="71421216-b47f-4a2f-a72b-390bb740c089" chunkPositionInArray="[0,0]" nBytes="66344" md5="c9ee01684237137d78899a58778f2d1e"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="RelHumSurf_liquid_A_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="97380687" uuid="fa98c38f-ad13-4589-a895-a5ce391b50aa" chunkPositionInArray="[0,0]" nBytes="59572" md5="6d62516c9797e7df500b69d0a246b42a"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="SurfPres_Forecast_A_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="69077618" uuid="3064f083-5932-474c-9b21-e542ef53ee63" chunkPositionInArray="[0,0]" nBytes="55752" md5="c514fb3760275b09afa1fec59036f512"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CoarseCloudTemp_TqJ_D_max">
+    <Dim name="/CoarseCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>0</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="300485180" uuid="2fff8f2b-f916-4721-8d02-399156acf7da" chunkPositionInArray="[0,0,0]" nBytes="236792" md5="8718d5c175fc71510b7589fed67ae70f"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotCH4_TqJ_A">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="250857283" uuid="1a190f57-919e-4eff-b134-9155095f22a2" chunkPositionInArray="[0,0]" nBytes="69857" md5="97f2ce3777a8d9ac3439da2929c7f37b"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CH4_VMR_D_err">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="34184650" uuid="9def6cc6-b98b-4938-80b8-3006150a2a02" chunkPositionInArray="[0,0,0]" nBytes="136674" md5="3c735627f855958518baed7f662ab4b4"/>
+      <h4:byteStream offset="34321324" uuid="d02b7297-7c62-483f-8ad5-e1439220b47a" chunkPositionInArray="[0,0,180]" nBytes="138155" md5="d586ecdce180b7b003d9080ef2a86f7d"/>
+      <h4:byteStream offset="34459479" uuid="6825e6ee-2bd7-4c46-a38b-2d7a6188a2f3" chunkPositionInArray="[0,90,0]" nBytes="138362" md5="e4c2c486c6c5138740de4a358f41604f"/>
+      <h4:byteStream offset="192399256" uuid="d52dff41-1741-46a5-a7e8-025091969cfb" chunkPositionInArray="[0,90,180]" nBytes="137798" md5="2729ed2720f3338a1ea3cf069cfc96af"/>
+      <h4:byteStream offset="192537054" uuid="9978be78-44b9-43e4-bf87-26e145f09417" chunkPositionInArray="[12,0,0]" nBytes="152223" md5="4053d8e600202315549f2492ecf475f5"/>
+      <h4:byteStream offset="192689277" uuid="5240e621-f6cc-4259-93d7-be85c90878a3" chunkPositionInArray="[12,0,180]" nBytes="153057" md5="98777615eeb87aa87314b26931000e39"/>
+      <h4:byteStream offset="192842334" uuid="dd88f1e5-6f6d-492b-979f-4775c3516f3f" chunkPositionInArray="[12,90,0]" nBytes="158742" md5="5f7ceff5e1e36ef0640a3e6584fb28ae"/>
+      <h4:byteStream offset="193001076" uuid="b650ff3f-55c7-482c-9d1e-8a517b1d6536" chunkPositionInArray="[12,90,180]" nBytes="155771" md5="9fd78a54f3f7bc9f8945372825d50342"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="RelHumSurf_A_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="93287853" uuid="b8b9bda9-d9dd-43ce-a4a2-3f13ae0cdba5" chunkPositionInArray="[0,0]" nBytes="63770" md5="a9bf2287f4747714d25e14f836509b6c"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CO_VMR_TqJ_D">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="62271146" uuid="2870e81d-eb25-4906-9304-5fb76aac71b1" chunkPositionInArray="[0,0,0]" nBytes="237766" md5="371bfe1aa895c1e7594faa20a6d53316"/>
+      <h4:byteStream offset="62508912" uuid="4e243585-544a-45c8-a303-5c6208bd31a8" chunkPositionInArray="[0,0,180]" nBytes="241278" md5="864c229e575791d0781f413bb9d64b08"/>
+      <h4:byteStream offset="62750190" uuid="d42cbde8-32b2-4b93-8e58-90ea687ddae5" chunkPositionInArray="[0,90,0]" nBytes="229688" md5="df19cc9cf44804b2228facec8cca1a7d"/>
+      <h4:byteStream offset="308110619" uuid="eac428b9-0c83-4c42-b6d9-32c921a47c74" chunkPositionInArray="[0,90,180]" nBytes="215787" md5="631c096f3b7ec69c8a625c4a7edefd5f"/>
+      <h4:byteStream offset="308326406" uuid="165d0f18-dc24-422d-b6d9-cb740c781274" chunkPositionInArray="[12,0,0]" nBytes="206510" md5="72701845ff78eb9f314d11f72346c583"/>
+      <h4:byteStream offset="308532916" uuid="60903711-5e0a-4299-9230-c26d64952aa8" chunkPositionInArray="[12,0,180]" nBytes="213002" md5="7954cb292a6ceb595fd966d9adff4b8a"/>
+      <h4:byteStream offset="308745918" uuid="a4e0cc09-dff5-4c56-89ef-4e74dab86ed3" chunkPositionInArray="[12,90,0]" nBytes="209875" md5="ef02a05669ab10ba820b5932bc86bc00"/>
+      <h4:byteStream offset="308955793" uuid="638b7e6a-88d4-40ae-a424-5c3b6a22c82b" chunkPositionInArray="[12,90,180]" nBytes="200682" md5="6f43100f654b683ab24a8d15666008a9"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="SurfPres_Forecast_TqJ_A_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="194145461" uuid="1b4e163c-7524-4e58-b532-69f4a3b222e2" chunkPositionInArray="[0,0]" nBytes="55495" md5="49decba86cf6b349d8b09d2a9ba8d2a7"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="GPHeight_D_sdev">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="21654200" uuid="d0d7bd8e-c64d-40d9-ade9-cfc30423a9c4" chunkPositionInArray="[0,0,0]" nBytes="242481" md5="9902a012f4a4a605fbefe2a1c8344030"/>
+      <h4:byteStream offset="21896681" uuid="30bf791e-bd7a-4ed7-8fb0-1543a664340c" chunkPositionInArray="[0,0,180]" nBytes="238100" md5="f6e6a7b6507631486fc86aec606ed28a"/>
+      <h4:byteStream offset="22134781" uuid="5bf8d915-e492-4109-84d5-c1d51c067c98" chunkPositionInArray="[0,90,0]" nBytes="234583" md5="b028208b22d78b9113ad0db28a4f40b5"/>
+      <h4:byteStream offset="162372714" uuid="119612d5-5be9-4a09-b7e1-5999a0a2a9f1" chunkPositionInArray="[0,90,180]" nBytes="223427" md5="894b88075702a428eea4511e77f005cf"/>
+      <h4:byteStream offset="162596141" uuid="68ba035a-b09d-41e6-8296-4b37af08dd62" chunkPositionInArray="[12,0,0]" nBytes="245417" md5="a73f5906bc90b915f130a91edfde2099"/>
+      <h4:byteStream offset="162841558" uuid="7123e784-a141-4391-a131-f558b00a606a" chunkPositionInArray="[12,0,180]" nBytes="244034" md5="ebc244e5f8d48ebc553cc2ad836d9614"/>
+      <h4:byteStream offset="163085592" uuid="40b87e1b-2ba7-4f5c-9574-a92423a15a98" chunkPositionInArray="[12,90,0]" nBytes="245838" md5="930fb0eddbc63451e6c72c312509fc6e"/>
+      <h4:byteStream offset="163331430" uuid="5f81604f-34a8-4d1c-a943-9ed6eb1a9aa4" chunkPositionInArray="[12,90,180]" nBytes="241222" md5="ff8938c25588b40a2301a99a3b35837d"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CloudTopTemp_TqJ_D_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="295057885" uuid="2365759a-f439-4c48-b78f-3bad832c47ea" chunkPositionInArray="[0,0]" nBytes="86398" md5="1378710730cc7301edcf73d250ce6c13"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CoarseCloudPres_D_min">
+    <Dim name="/CoarseCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>0</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="172458723" uuid="09c6d170-c424-4663-8fd1-952ee61a52cb" chunkPositionInArray="[0,0,0]" nBytes="195130" md5="28b76729b096c763d8c1b3d717596aab"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="SurfSkinTemp_A_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="69376804" uuid="dea0638f-25a3-4c77-bf1d-8c1826d519a9" chunkPositionInArray="[0,0]" nBytes="71978" md5="cfb7db478a5d323cbde3e8c734e6c112"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="FineCloudFrc_D">
+    <Dim name="/FineCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>3</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="168682199" uuid="f0df8826-add8-4af0-9bcf-bafc5149f837" chunkPositionInArray="[0,0,0]" nBytes="668621" md5="b7119bf658d0a0b54ed2fa1e176329e4"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="RelHum_D_sdev">
+    <Dim name="/H2OPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>5</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="153144724" uuid="d699420c-ea7b-4d62-b86e-055d46fa294b" chunkPositionInArray="[0,0,0]" nBytes="912527" md5="2f4279f5e6888a69c0d92a704aeb25db"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="TotH2OVap_TqJ_D_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="266452787" uuid="ae48ccc8-6e8b-45c7-b0bb-d4d9f6cad9e6" chunkPositionInArray="[0,0]" nBytes="38366" md5="33203c2f507d0b5cd88a223131cdb593"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="O3_VMR_TqJ_D_sdev">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="59579549" uuid="d32ef150-9d3a-4574-9209-f917a63980b3" chunkPositionInArray="[0,0,0]" nBytes="242081" md5="f5f5116552a8561a34960efcd9cb7b1f"/>
+      <h4:byteStream offset="59821630" uuid="9fcbadea-0549-4e27-bdf0-bf36466715ea" chunkPositionInArray="[0,0,180]" nBytes="238793" md5="c7f85c923353f52a884af1ea246af303"/>
+      <h4:byteStream offset="60060423" uuid="3503baff-be39-419e-ad05-31c881fa19a3" chunkPositionInArray="[0,90,0]" nBytes="233976" md5="df76e5fc66bf492266dedf8512d90154"/>
+      <h4:byteStream offset="303282097" uuid="e15392a1-3533-42fc-b46a-629c9d382464" chunkPositionInArray="[0,90,180]" nBytes="224208" md5="f969199b54d56ac1890bf202d4904dd2"/>
+      <h4:byteStream offset="303506305" uuid="e7f2d840-7d17-4787-b993-077afb613162" chunkPositionInArray="[12,0,0]" nBytes="242836" md5="57d7f6b423edfefb41f5ebe4b4a3989f"/>
+      <h4:byteStream offset="303749141" uuid="497718ab-93c0-430b-a62e-65df2991819a" chunkPositionInArray="[12,0,180]" nBytes="242066" md5="69a99478440d45fd7efcef131bd9d7b4"/>
+      <h4:byteStream offset="303991207" uuid="34d1223e-f356-421b-a980-8e264439ec79" chunkPositionInArray="[12,90,0]" nBytes="243167" md5="c8ec193044b30cbe9d82eb58f2cd9d40"/>
+      <h4:byteStream offset="304234374" uuid="9967d561-4ec0-4265-adee-3eccf2ba82d6" chunkPositionInArray="[12,90,180]" nBytes="238198" md5="d7f75f673d0a23e285d4d7cf57ea44b1"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CloudTopTemp_A_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="105914896" uuid="0dc58638-420c-4f46-8b1a-6c6159cb55c5" chunkPositionInArray="[0,0]" nBytes="83336" md5="27f391c82c88df02f3f3fb8d99114ff9"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="H2O_MMR_Surf_D_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="151569193" uuid="3ddd3406-8108-46d1-8620-4c8919723914" chunkPositionInArray="[0,0]" nBytes="35249" md5="45329ccd6405cc9ce2bc324e871b36b2"/>
+    </h4:chunks>
+  </Int16>
+  <Int16 name="SurfAirTemp_TqJ_D_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="265319756" uuid="69fda561-8fe2-426c-8a9a-6790949d2346" chunkPositionInArray="[0,0]" nBytes="38388" md5="98b43c6ca989ef8c06b25b3d02d8db36"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="SurfPres_Forecast_D_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="131685109" uuid="f06d1012-b65b-4b8f-8478-c60732bff820" chunkPositionInArray="[0,0]" nBytes="80900" md5="80fc367c60d9c10435c2a8e451367651"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="Emis_MW_D_min">
+    <Dim name="/EmisFreqMW"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>2</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="320975946" uuid="7a0ee18b-c7a9-4a97-abf2-90259eed5a84" chunkPositionInArray="[0,0,0]" nBytes="3421" md5="c55324594a0787856d9b908fc7a7a201"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CoarseCloudTemp_TqJ_D_sdev">
+    <Dim name="/CoarseCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>0</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="300029593" uuid="5c1bab33-f7e1-4ba4-9747-c4f0f0e5512a" chunkPositionInArray="[0,0,0]" nBytes="218378" md5="8caf927d2f76948aa5d92ca40e3665c8"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="OLR_TqJ_A_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="256841122" uuid="b7a6fe68-cc7a-46d5-8b9f-821dca53a7b5" chunkPositionInArray="[0,0]" nBytes="84778" md5="5826143dd590163cac20500822666cb9"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="ClrOLR_A_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="131403972" uuid="8c407127-14b9-41a1-bbbc-950a34310385" chunkPositionInArray="[0,0]" nBytes="73063" md5="dda86efc1eecc14dd0f6fdfed5263e3e"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="SurfPres_Forecast_TqJ_D_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="257672297" uuid="72cca83a-76c7-4e40-8420-e3000797796e" chunkPositionInArray="[0,0]" nBytes="58967" md5="9a3a858dd86c5e0b12b5707b4f5825e4"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotH2OVap_A_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="77904812" uuid="6f81faca-23af-497a-8910-43cf75a47523" chunkPositionInArray="[0,0]" nBytes="95503" md5="84026c31b07e15c1aa8612caf3110ff0"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotCH4_TqJ_A_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="251040055" uuid="0e5ba890-a21a-4a9f-aaae-74fb2b8581ae" chunkPositionInArray="[0,0]" nBytes="69538" md5="426fc01449ab3dad9d90b5f9eb7d40e9"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CloudTopTemp_A_min">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="105998232" uuid="8bfe2980-f646-46ac-a472-9d33fa29c12a" chunkPositionInArray="[0,0]" nBytes="92852" md5="db2e0f054c76628480c00a3aee41ac48"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="TotCldLiqH2O_MW_A_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="320928447" uuid="0d45f5bb-4e4d-453e-a4b6-438aa8f96214" chunkPositionInArray="[0,0]" nBytes="589" md5="13194f25768e29a4921fa9f6ba022342"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="FineCloudFrc_TqJ_A_max">
+    <Dim name="/FineCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>3</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="233884499" uuid="d7d56d37-560b-4354-be0d-577ebf5fef0c" chunkPositionInArray="[0,0,0]" nBytes="662616" md5="fd7279a55515921355fe31a4e7a80ea7"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="OLR_D">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="193156847" uuid="255af35b-16bd-42be-a81c-3aa75174900e" chunkPositionInArray="[0,0]" nBytes="81243" md5="a2b20ae1419449b1c3a2455fd755b349"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CO_VMR_TqJ_A_min">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="46742693" uuid="cfc6ddaf-a2e0-4f4d-924b-0a182cfeb345" chunkPositionInArray="[0,0,0]" nBytes="229260" md5="9fc4fb7fdcec9dfed11318a978ebdd98"/>
+      <h4:byteStream offset="46971953" uuid="218803a7-b7f3-4265-a6c3-774e530ba24a" chunkPositionInArray="[0,0,180]" nBytes="236462" md5="ceae75cb2c87ec0d06bfd980cabd90f3"/>
+      <h4:byteStream offset="47208415" uuid="290974be-0af0-4bb2-a012-aafe4b841ff6" chunkPositionInArray="[0,90,0]" nBytes="220405" md5="99a0effa66596c356163fd28b1867aab"/>
+      <h4:byteStream offset="247857306" uuid="0109d6f9-0fca-4e0f-beeb-bc1fbe9d668f" chunkPositionInArray="[0,90,180]" nBytes="207791" md5="7ad305ef2b7b4eb9cfc878e68d696363"/>
+      <h4:byteStream offset="248065097" uuid="95a49611-ade4-4d8c-adcd-81012e16140d" chunkPositionInArray="[12,0,0]" nBytes="205961" md5="8623bcf8b9bb3a817c2ec1a8034f2324"/>
+      <h4:byteStream offset="248271058" uuid="cd49c6c3-db59-46fd-8154-9f02a656fb04" chunkPositionInArray="[12,0,180]" nBytes="214602" md5="bd0f003c2edf5252bf07fa13636a8ace"/>
+      <h4:byteStream offset="248485660" uuid="f93bc20a-4cc8-4e55-b47d-f1e5717fec9a" chunkPositionInArray="[12,90,0]" nBytes="202896" md5="b6188c9aa4e0ce83c08ecdf07b9cb777"/>
+      <h4:byteStream offset="248688556" uuid="e9a45340-8d2e-4743-9754-5f64d66c1072" chunkPositionInArray="[12,90,180]" nBytes="193050" md5="7c078f3e81dbe09b02a0b87cdf2f22c3"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="TotCldLiqH2O_MW_D_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="321153783" uuid="7957a8c6-df49-48a9-9821-faf32029e7b8" chunkPositionInArray="[0,0]" nBytes="1161" md5="a43f0ca2084e297f3aa9763a828dcb0f"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="H2O_MMR_TqJ_D_sdev">
+    <Dim name="/H2OPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>5</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="273877352" uuid="2ed8b180-fb29-43b2-814f-5e5bd13391ee" chunkPositionInArray="[0,0,0]" nBytes="929550" md5="872999ef74eed1803005142a212e608e"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="Temperature_D_ct">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>24 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="134245555" uuid="f151225e-63b5-4168-8ad1-e78b41a44298" chunkPositionInArray="[0,0,0]" nBytes="820702" md5="e6e70bf482052942d4db416e0d5319cc"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="TropPres_TqJ_D_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="265777765" uuid="977b7e0c-f4ab-4a6d-8697-239468322afc" chunkPositionInArray="[0,0]" nBytes="85023" md5="3017161697fd3926468d2e66cf5f5795"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="CloudFrc_A_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="105064822" uuid="bc58c587-72e6-4ba3-a094-586cc979b459" chunkPositionInArray="[0,0]" nBytes="33967" md5="c2292717a80e641f17a25184907e3403"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="CloudTopTemp_TqJ_D_err">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="295144283" uuid="7808961b-eaaf-4bf1-a1fb-d5903ea4b772" chunkPositionInArray="[0,0]" nBytes="75271" md5="bfeea6a053ab4edf56615fc993ee7057"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="Topography">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="321162204" uuid="0568b471-70f8-4bb4-b2b7-dcd557c90b30" chunkPositionInArray="[0,0]" nBytes="97323" md5="61f33d4ee48f21fef8b6ce240dbf12c2"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="CH4_VMR_A_ct">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>24 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="126240539" uuid="ea940c36-4a2a-4fbb-a3cc-783c5869235e" chunkPositionInArray="[0,0,0]" nBytes="860389" md5="63845ae9ebe30d402dad2702ccda46fe"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="CloudTopPres_D_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="168084054" uuid="6c71a99d-3cf2-4556-84fc-f41bad101ad0" chunkPositionInArray="[0,0]" nBytes="66077" md5="1caf7a7657969959d95b7d092625a01b"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="RelHum_A_sdev">
+    <Dim name="/H2OPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>5</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="90618979" uuid="f03ebc7e-bfd8-440a-9e65-88ea2c0e717c" chunkPositionInArray="[0,0,0]" nBytes="913781" md5="a12e198e8ea546c6a931a377c8172b46"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="O3_VMR_TqJ_D_ct">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>24 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="302386303" uuid="9a988b9a-709c-4968-a4dd-bc3e4f6a68a1" chunkPositionInArray="[0,0,0]" nBytes="895794" md5="480f4e9c038acd88db84a862b676f571"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="TotH2OVap_MW_A_max">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="320844119" uuid="7afe0587-16cc-411c-97ce-ca8e7b78affc" chunkPositionInArray="[0,0]" nBytes="1161" md5="a43f0ca2084e297f3aa9763a828dcb0f"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="O3_VMR_TqJ_A">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="41875933" uuid="274ef559-e6a7-4cd9-b816-3a39ad0f0742" chunkPositionInArray="[0,0,0]" nBytes="245487" md5="b8d38ce3398ca9dc0372038554ef4f87"/>
+      <h4:byteStream offset="42121420" uuid="ac4aa644-de8d-480c-b933-827e56e57367" chunkPositionInArray="[0,0,180]" nBytes="247564" md5="ce45910aabfa00ec3b443af350a271f3"/>
+      <h4:byteStream offset="42368984" uuid="868c433f-2a28-4123-8dbc-cd1ae8797708" chunkPositionInArray="[0,90,0]" nBytes="239609" md5="cb25257238a3e2c9daf15a980c5d3a54"/>
+      <h4:byteStream offset="237809861" uuid="d783fb07-44ff-40a2-812d-6b501d4e1dab" chunkPositionInArray="[0,90,180]" nBytes="227531" md5="673b40fdbbc6e199e8b82abf9e827f8b"/>
+      <h4:byteStream offset="238037392" uuid="2bd7f3fd-d177-4606-936f-a3397939c915" chunkPositionInArray="[12,0,0]" nBytes="257376" md5="79de211634097c8a8dd64798eb43a78b"/>
+      <h4:byteStream offset="238294768" uuid="b457f1ce-3995-4bad-851d-fa7e44da8f36" chunkPositionInArray="[12,0,180]" nBytes="260531" md5="70173d6cf2415c3b740be3cbe94dd44e"/>
+      <h4:byteStream offset="238555299" uuid="9f9fc263-b5da-4970-bf51-a6d5ab16da25" chunkPositionInArray="[12,90,0]" nBytes="263261" md5="888261673585db12dba939d88bbe4dc7"/>
+      <h4:byteStream offset="238818560" uuid="3891561c-717d-444c-a768-4f7573277fdd" chunkPositionInArray="[12,90,180]" nBytes="258915" md5="848eab8ef51ca5e411879fc234dccb79"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="O3_VMR_TqJ_A_sdev">
+    <Dim name="/StdPressureLev"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>8</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 90 180</h4:chunkDimensionSizes>
+      <h4:byteStream offset="42614865" uuid="85daa266-7f59-4a77-a964-5725b0766a6f" chunkPositionInArray="[0,0,0]" nBytes="240838" md5="c70ef112484272f92e7b1688966207e6"/>
+      <h4:byteStream offset="42855703" uuid="c3350341-f39c-4645-a968-dc5ab0991e90" chunkPositionInArray="[0,0,180]" nBytes="240135" md5="1f9c89323971292a67c1489add2524b8"/>
+      <h4:byteStream offset="43095838" uuid="e622c6af-c245-426e-9dda-ce883b6b3166" chunkPositionInArray="[0,90,0]" nBytes="233518" md5="63627db159dcbb44ee5239105fbbf748"/>
+      <h4:byteStream offset="239964032" uuid="a151388c-cf38-4792-8c90-d781df0bb419" chunkPositionInArray="[0,90,180]" nBytes="225990" md5="26962b2ef1f0dcb59bc2304e5efeb9c1"/>
+      <h4:byteStream offset="240190022" uuid="5fed2a8a-390b-4df6-8435-11b51123a3b2" chunkPositionInArray="[12,0,0]" nBytes="241976" md5="9cd31fd762cef5bbef8b1dc8bb19bf32"/>
+      <h4:byteStream offset="240431998" uuid="64f35de8-d087-4a7f-8b01-d043a7adaedc" chunkPositionInArray="[12,0,180]" nBytes="243810" md5="74a054dc8d2ad669fc173405e180013e"/>
+      <h4:byteStream offset="240675808" uuid="bae96556-4595-4036-9f8f-b1cbbc5443e5" chunkPositionInArray="[12,90,0]" nBytes="243199" md5="b83af219bfecf78cc124c000aee4af5e"/>
+      <h4:byteStream offset="240919007" uuid="7f1601e3-b371-4c50-8c97-6863167f73a5" chunkPositionInArray="[12,90,180]" nBytes="240387" md5="ee229a34d03788878ee370c2f0ca4c4c"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="TotCO_A_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="118687605" uuid="f1504e4d-2e06-42e6-adc9-012d1e8dbe9d" chunkPositionInArray="[0,0]" nBytes="35746" md5="04b88bb4a55aaee70dac15501a1e9e2d"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="SurfAirTemp_D_err">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="139413122" uuid="56915854-8fb4-43ed-b76d-f0c608014948" chunkPositionInArray="[0,0]" nBytes="76524" md5="bdc40775df4f1f8622d2b47a57dcfeeb"/>
+    </h4:chunks>
+  </Float32>
+  <Int16 name="CloudTopTemp_TqJ_D_ct">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Int16">
+      <Value>0</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="294839037" uuid="77836ed9-f11f-420e-936b-66ad730111ad" chunkPositionInArray="[0,0]" nBytes="40325" md5="e6d40dbd03652cd0e3708d7df9a9e851"/>
+    </h4:chunks>
+  </Int16>
+  <Float32 name="SurfPres_Forecast_A_sdev">
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>6</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="68996690" uuid="3872ea8d-d2b6-44a2-9108-2ef7d37e32ac" chunkPositionInArray="[0,0]" nBytes="80928" md5="87caf907ec88ee496c0484edcc5d64dc"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="H2O_MMR_Lyr_A_err">
+    <Dim name="/H2OPressureLay"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>4</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>12 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="82668000" uuid="7ddedfd3-0e44-48f6-b6b3-40bd5fe9f334" chunkPositionInArray="[0,0,0]" nBytes="852748" md5="14ec1931599262076a4e3f76e11e55f8"/>
+    </h4:chunks>
+  </Float32>
+  <Float32 name="CoarseCloudTemp_TqJ_A_max">
+    <Dim name="/CoarseCloudLayer"/>
+    <Dim name="/Latitude"/>
+    <Dim name="/Longitude"/>
+    <Attribute name="_FillValue" type="Float32">
+      <Value>-9999.</Value>
+    </Attribute>
+    <Attribute name="_Netcdf4Dimid" type="Int32">
+      <Value>0</Value>
+    </Attribute>
+    <h4:chunks deflate_level="2" compressionType="shuffle deflate">
+      <h4:chunkDimensionSizes>3 180 360</h4:chunkDimensionSizes>
+      <h4:byteStream offset="237153304" uuid="8d85ba1f-b09c-4dcb-8cbe-4365f5c39c7b" chunkPositionInArray="[0,0,0]" nBytes="240681" md5="1a434806c13206b5cfa148577b149255"/>
+    </h4:chunks>
+  </Float32>
+  <Attribute name="HDFEOSVersion" type="String">
+    <Value>HDFEOS_V2.18</Value>
+  </Attribute>
+  <Attribute name="StructMetadata_0" type="String">
+    <Value>GROUP=SwathStructure
+END_GROUP=SwathStructure
+GROUP=GridStructure
+	GROUP=GRID_1
+		GridName="ascending"
+		XDim=360
+		YDim=180
+		UpperLeftPointMtrs=(-179030000.000000,89030000.000000)
+		LowerRightMtrs=(180030000.000000,-90030000.000000)
+		Projection=GCTP_GEO
+		GROUP=Dimension
+			OBJECT=Dimension_1
+				DimensionName="StdPressureLev"
+				Size=24
+			END_OBJECT=Dimension_1
+			OBJECT=Dimension_2
+				DimensionName="H2OPressureLev"
+				Size=12
+			END_OBJECT=Dimension_2
+			OBJECT=Dimension_3
+				DimensionName="H2OPressureLay"
+				Size=12
+			END_OBJECT=Dimension_3
+			OBJECT=Dimension_4
+				DimensionName="CoarseCloudLayer"
+				Size=3
+			END_OBJECT=Dimension_4
+			OBJECT=Dimension_5
+				DimensionName="FineCloudLayer"
+				Size=12
+			END_OBJECT=Dimension_5
+			OBJECT=Dimension_6
+				DimensionName="EmisFreqIR"
+				Size=4
+			END_OBJECT=Dimension_6
+		END_GROUP=Dimension
+		GROUP=DataField
+			OBJECT=DataField_1
+				DataFieldName="TotalCounts_A"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_1
+			OBJECT=DataField_2
+				DataFieldName="SurfPres_Forecast_A"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_2
+			OBJECT=DataField_3
+				DataFieldName="SurfPres_Forecast_A_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_3
+			OBJECT=DataField_4
+				DataFieldName="SurfPres_Forecast_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_4
+			OBJECT=DataField_5
+				DataFieldName="SurfPres_Forecast_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_5
+			OBJECT=DataField_6
+				DataFieldName="SurfPres_Forecast_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_6
+			OBJECT=DataField_7
+				DataFieldName="SurfSkinTemp_A"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_7
+			OBJECT=DataField_8
+				DataFieldName="SurfSkinTemp_A_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_8
+			OBJECT=DataField_9
+				DataFieldName="SurfSkinTemp_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_9
+			OBJECT=DataField_10
+				DataFieldName="SurfSkinTemp_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_10
+			OBJECT=DataField_11
+				DataFieldName="SurfSkinTemp_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_11
+			OBJECT=DataField_12
+				DataFieldName="SurfSkinTemp_A_err"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_12
+			OBJECT=DataField_13
+				DataFieldName="EmisIR_A"
+				DataType=DFNT_FLOAT32
+				DimList=("EmisFreqIR","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_13
+			OBJECT=DataField_14
+				DataFieldName="EmisIR_A_ct"
+				DataType=DFNT_INT16
+				DimList=("EmisFreqIR","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_14
+			OBJECT=DataField_15
+				DataFieldName="EmisIR_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("EmisFreqIR","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_15
+			OBJECT=DataField_16
+				DataFieldName="EmisIR_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("EmisFreqIR","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_16
+			OBJECT=DataField_17
+				DataFieldName="EmisIR_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("EmisFreqIR","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_17
+			OBJECT=DataField_18
+				DataFieldName="EmisIR_A_err"
+				DataType=DFNT_FLOAT32
+				DimList=("EmisFreqIR","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_18
+			OBJECT=DataField_19
+				DataFieldName="Temperature_A"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_19
+			OBJECT=DataField_20
+				DataFieldName="Temperature_A_ct"
+				DataType=DFNT_INT16
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_20
+			OBJECT=DataField_21
+				DataFieldName="Temperature_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_21
+			OBJECT=DataField_22
+				DataFieldName="Temperature_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_22
+			OBJECT=DataField_23
+				DataFieldName="Temperature_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_23
+			OBJECT=DataField_24
+				DataFieldName="Temperature_A_err"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_24
+			OBJECT=DataField_25
+				DataFieldName="SurfAirTemp_A"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_25
+			OBJECT=DataField_26
+				DataFieldName="SurfAirTemp_A_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_26
+			OBJECT=DataField_27
+				DataFieldName="SurfAirTemp_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_27
+			OBJECT=DataField_28
+				DataFieldName="SurfAirTemp_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_28
+			OBJECT=DataField_29
+				DataFieldName="SurfAirTemp_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_29
+			OBJECT=DataField_30
+				DataFieldName="SurfAirTemp_A_err"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_30
+			OBJECT=DataField_31
+				DataFieldName="TropPres_A"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_31
+			OBJECT=DataField_32
+				DataFieldName="TropPres_A_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_32
+			OBJECT=DataField_33
+				DataFieldName="TropPres_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_33
+			OBJECT=DataField_34
+				DataFieldName="TropPres_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_34
+			OBJECT=DataField_35
+				DataFieldName="TropPres_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_35
+			OBJECT=DataField_36
+				DataFieldName="TropTemp_A"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_36
+			OBJECT=DataField_37
+				DataFieldName="TropTemp_A_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_37
+			OBJECT=DataField_38
+				DataFieldName="TropTemp_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_38
+			OBJECT=DataField_39
+				DataFieldName="TropTemp_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_39
+			OBJECT=DataField_40
+				DataFieldName="TropTemp_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_40
+			OBJECT=DataField_41
+				DataFieldName="TotH2OVap_A"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_41
+			OBJECT=DataField_42
+				DataFieldName="TotH2OVap_A_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_42
+			OBJECT=DataField_43
+				DataFieldName="TotH2OVap_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_43
+			OBJECT=DataField_44
+				DataFieldName="TotH2OVap_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_44
+			OBJECT=DataField_45
+				DataFieldName="TotH2OVap_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_45
+			OBJECT=DataField_46
+				DataFieldName="TotH2OVap_A_err"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_46
+			OBJECT=DataField_47
+				DataFieldName="H2O_MMR_Lyr_A"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLay","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_47
+			OBJECT=DataField_48
+				DataFieldName="H2O_MMR_Lyr_A_ct"
+				DataType=DFNT_INT16
+				DimList=("H2OPressureLay","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_48
+			OBJECT=DataField_49
+				DataFieldName="H2O_MMR_Lyr_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLay","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_49
+			OBJECT=DataField_50
+				DataFieldName="H2O_MMR_Lyr_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLay","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_50
+			OBJECT=DataField_51
+				DataFieldName="H2O_MMR_Lyr_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLay","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_51
+			OBJECT=DataField_52
+				DataFieldName="H2O_MMR_Lyr_A_err"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLay","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_52
+			OBJECT=DataField_53
+				DataFieldName="H2O_MMR_A"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_53
+			OBJECT=DataField_54
+				DataFieldName="H2O_MMR_A_ct"
+				DataType=DFNT_INT16
+				DimList=("H2OPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_54
+			OBJECT=DataField_55
+				DataFieldName="H2O_MMR_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_55
+			OBJECT=DataField_56
+				DataFieldName="H2O_MMR_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_56
+			OBJECT=DataField_57
+				DataFieldName="H2O_MMR_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_57
+			OBJECT=DataField_58
+				DataFieldName="H2O_MMR_A_err"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_58
+			OBJECT=DataField_59
+				DataFieldName="H2O_MMR_Surf_A"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_59
+			OBJECT=DataField_60
+				DataFieldName="H2O_MMR_Surf_A_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_60
+			OBJECT=DataField_61
+				DataFieldName="H2O_MMR_Surf_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_61
+			OBJECT=DataField_62
+				DataFieldName="H2O_MMR_Surf_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_62
+			OBJECT=DataField_63
+				DataFieldName="H2O_MMR_Surf_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_63
+			OBJECT=DataField_64
+				DataFieldName="H2O_MMR_Surf_A_err"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_64
+			OBJECT=DataField_65
+				DataFieldName="RelHum_A"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_65
+			OBJECT=DataField_66
+				DataFieldName="RelHum_A_ct"
+				DataType=DFNT_INT16
+				DimList=("H2OPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_66
+			OBJECT=DataField_67
+				DataFieldName="RelHum_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_67
+			OBJECT=DataField_68
+				DataFieldName="RelHum_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_68
+			OBJECT=DataField_69
+				DataFieldName="RelHum_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_69
+			OBJECT=DataField_70
+				DataFieldName="RelHumSurf_A"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_70
+			OBJECT=DataField_71
+				DataFieldName="RelHumSurf_A_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_71
+			OBJECT=DataField_72
+				DataFieldName="RelHumSurf_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_72
+			OBJECT=DataField_73
+				DataFieldName="RelHumSurf_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_73
+			OBJECT=DataField_74
+				DataFieldName="RelHumSurf_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_74
+			OBJECT=DataField_75
+				DataFieldName="RelHum_liquid_A"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_75
+			OBJECT=DataField_76
+				DataFieldName="RelHum_liquid_A_ct"
+				DataType=DFNT_INT16
+				DimList=("H2OPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_76
+			OBJECT=DataField_77
+				DataFieldName="RelHum_liquid_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_77
+			OBJECT=DataField_78
+				DataFieldName="RelHum_liquid_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_78
+			OBJECT=DataField_79
+				DataFieldName="RelHum_liquid_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_79
+			OBJECT=DataField_80
+				DataFieldName="RelHumSurf_liquid_A"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_80
+			OBJECT=DataField_81
+				DataFieldName="RelHumSurf_liquid_A_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_81
+			OBJECT=DataField_82
+				DataFieldName="RelHumSurf_liquid_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_82
+			OBJECT=DataField_83
+				DataFieldName="RelHumSurf_liquid_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_83
+			OBJECT=DataField_84
+				DataFieldName="RelHumSurf_liquid_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_84
+			OBJECT=DataField_85
+				DataFieldName="TropHeight_A"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_85
+			OBJECT=DataField_86
+				DataFieldName="TropHeight_A_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_86
+			OBJECT=DataField_87
+				DataFieldName="TropHeight_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_87
+			OBJECT=DataField_88
+				DataFieldName="TropHeight_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_88
+			OBJECT=DataField_89
+				DataFieldName="TropHeight_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_89
+			OBJECT=DataField_90
+				DataFieldName="GPHeight_A"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_90
+			OBJECT=DataField_91
+				DataFieldName="GPHeight_A_ct"
+				DataType=DFNT_INT16
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_91
+			OBJECT=DataField_92
+				DataFieldName="GPHeight_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_92
+			OBJECT=DataField_93
+				DataFieldName="GPHeight_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_93
+			OBJECT=DataField_94
+				DataFieldName="GPHeight_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_94
+			OBJECT=DataField_95
+				DataFieldName="CloudFrc_A"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_95
+			OBJECT=DataField_96
+				DataFieldName="CloudFrc_A_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_96
+			OBJECT=DataField_97
+				DataFieldName="CloudFrc_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_97
+			OBJECT=DataField_98
+				DataFieldName="CloudFrc_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_98
+			OBJECT=DataField_99
+				DataFieldName="CloudFrc_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_99
+			OBJECT=DataField_100
+				DataFieldName="CloudFrc_A_err"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_100
+			OBJECT=DataField_101
+				DataFieldName="CloudTopPres_A"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_101
+			OBJECT=DataField_102
+				DataFieldName="CloudTopPres_A_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_102
+			OBJECT=DataField_103
+				DataFieldName="CloudTopPres_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_103
+			OBJECT=DataField_104
+				DataFieldName="CloudTopPres_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_104
+			OBJECT=DataField_105
+				DataFieldName="CloudTopPres_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_105
+			OBJECT=DataField_106
+				DataFieldName="CloudTopPres_A_err"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_106
+			OBJECT=DataField_107
+				DataFieldName="CloudTopTemp_A"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_107
+			OBJECT=DataField_108
+				DataFieldName="CloudTopTemp_A_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_108
+			OBJECT=DataField_109
+				DataFieldName="CloudTopTemp_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_109
+			OBJECT=DataField_110
+				DataFieldName="CloudTopTemp_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_110
+			OBJECT=DataField_111
+				DataFieldName="CloudTopTemp_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_111
+			OBJECT=DataField_112
+				DataFieldName="CloudTopTemp_A_err"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_112
+			OBJECT=DataField_113
+				DataFieldName="FineCloudFrc_A"
+				DataType=DFNT_FLOAT32
+				DimList=("FineCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_113
+			OBJECT=DataField_114
+				DataFieldName="FineCloudFrc_A_ct"
+				DataType=DFNT_INT16
+				DimList=("FineCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_114
+			OBJECT=DataField_115
+				DataFieldName="FineCloudFrc_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("FineCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_115
+			OBJECT=DataField_116
+				DataFieldName="FineCloudFrc_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("FineCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_116
+			OBJECT=DataField_117
+				DataFieldName="FineCloudFrc_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("FineCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_117
+			OBJECT=DataField_118
+				DataFieldName="CoarseCloudFrc_A"
+				DataType=DFNT_FLOAT32
+				DimList=("CoarseCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_118
+			OBJECT=DataField_119
+				DataFieldName="CoarseCloudFrc_A_ct"
+				DataType=DFNT_INT16
+				DimList=("CoarseCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_119
+			OBJECT=DataField_120
+				DataFieldName="CoarseCloudFrc_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("CoarseCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_120
+			OBJECT=DataField_121
+				DataFieldName="CoarseCloudFrc_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("CoarseCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_121
+			OBJECT=DataField_122
+				DataFieldName="CoarseCloudFrc_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("CoarseCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_122
+			OBJECT=DataField_123
+				DataFieldName="CoarseCloudPres_A"
+				DataType=DFNT_FLOAT32
+				DimList=("CoarseCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_123
+			OBJECT=DataField_124
+				DataFieldName="CoarseCloudPres_A_ct"
+				DataType=DFNT_INT16
+				DimList=("CoarseCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_124
+			OBJECT=DataField_125
+				DataFieldName="CoarseCloudPres_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("CoarseCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_125
+			OBJECT=DataField_126
+				DataFieldName="CoarseCloudPres_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("CoarseCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_126
+			OBJECT=DataField_127
+				DataFieldName="CoarseCloudPres_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("CoarseCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_127
+			OBJECT=DataField_128
+				DataFieldName="CoarseCloudTemp_A"
+				DataType=DFNT_FLOAT32
+				DimList=("CoarseCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_128
+			OBJECT=DataField_129
+				DataFieldName="CoarseCloudTemp_A_ct"
+				DataType=DFNT_INT16
+				DimList=("CoarseCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_129
+			OBJECT=DataField_130
+				DataFieldName="CoarseCloudTemp_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("CoarseCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_130
+			OBJECT=DataField_131
+				DataFieldName="CoarseCloudTemp_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("CoarseCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_131
+			OBJECT=DataField_132
+				DataFieldName="CoarseCloudTemp_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("CoarseCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_132
+			OBJECT=DataField_133
+				DataFieldName="TotO3_A"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_133
+			OBJECT=DataField_134
+				DataFieldName="TotO3_A_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_134
+			OBJECT=DataField_135
+				DataFieldName="TotO3_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_135
+			OBJECT=DataField_136
+				DataFieldName="TotO3_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_136
+			OBJECT=DataField_137
+				DataFieldName="TotO3_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_137
+			OBJECT=DataField_138
+				DataFieldName="TotO3_A_err"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_138
+			OBJECT=DataField_139
+				DataFieldName="O3_VMR_A"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_139
+			OBJECT=DataField_140
+				DataFieldName="O3_VMR_A_ct"
+				DataType=DFNT_INT16
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_140
+			OBJECT=DataField_141
+				DataFieldName="O3_VMR_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_141
+			OBJECT=DataField_142
+				DataFieldName="O3_VMR_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_142
+			OBJECT=DataField_143
+				DataFieldName="O3_VMR_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_143
+			OBJECT=DataField_144
+				DataFieldName="O3_VMR_A_err"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_144
+			OBJECT=DataField_145
+				DataFieldName="TotCO_A"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_145
+			OBJECT=DataField_146
+				DataFieldName="TotCO_A_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_146
+			OBJECT=DataField_147
+				DataFieldName="TotCO_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_147
+			OBJECT=DataField_148
+				DataFieldName="TotCO_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_148
+			OBJECT=DataField_149
+				DataFieldName="TotCO_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_149
+			OBJECT=DataField_150
+				DataFieldName="CO_VMR_A"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_150
+			OBJECT=DataField_151
+				DataFieldName="CO_VMR_A_ct"
+				DataType=DFNT_INT16
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_151
+			OBJECT=DataField_152
+				DataFieldName="CO_VMR_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+	</Value>
+  </Attribute>
+  <Attribute name="StructMetadata_1" type="String">
+    <Value>			CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_152
+			OBJECT=DataField_153
+				DataFieldName="CO_VMR_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_153
+			OBJECT=DataField_154
+				DataFieldName="CO_VMR_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_154
+			OBJECT=DataField_155
+				DataFieldName="CO_VMR_A_err"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_155
+			OBJECT=DataField_156
+				DataFieldName="TotCH4_A"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_156
+			OBJECT=DataField_157
+				DataFieldName="TotCH4_A_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_157
+			OBJECT=DataField_158
+				DataFieldName="TotCH4_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_158
+			OBJECT=DataField_159
+				DataFieldName="TotCH4_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_159
+			OBJECT=DataField_160
+				DataFieldName="TotCH4_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_160
+			OBJECT=DataField_161
+				DataFieldName="CH4_VMR_A"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_161
+			OBJECT=DataField_162
+				DataFieldName="CH4_VMR_A_ct"
+				DataType=DFNT_INT16
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_162
+			OBJECT=DataField_163
+				DataFieldName="CH4_VMR_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_163
+			OBJECT=DataField_164
+				DataFieldName="CH4_VMR_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_164
+			OBJECT=DataField_165
+				DataFieldName="CH4_VMR_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_165
+			OBJECT=DataField_166
+				DataFieldName="CH4_VMR_A_err"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_166
+			OBJECT=DataField_167
+				DataFieldName="OLR_A"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_167
+			OBJECT=DataField_168
+				DataFieldName="OLR_A_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_168
+			OBJECT=DataField_169
+				DataFieldName="OLR_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_169
+			OBJECT=DataField_170
+				DataFieldName="OLR_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_170
+			OBJECT=DataField_171
+				DataFieldName="OLR_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_171
+			OBJECT=DataField_172
+				DataFieldName="OLR_A_err"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_172
+			OBJECT=DataField_173
+				DataFieldName="ClrOLR_A"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_173
+			OBJECT=DataField_174
+				DataFieldName="ClrOLR_A_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_174
+			OBJECT=DataField_175
+				DataFieldName="ClrOLR_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_175
+			OBJECT=DataField_176
+				DataFieldName="ClrOLR_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_176
+			OBJECT=DataField_177
+				DataFieldName="ClrOLR_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_177
+			OBJECT=DataField_178
+				DataFieldName="ClrOLR_A_err"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_178
+		END_GROUP=DataField
+		GROUP=MergedFields
+		END_GROUP=MergedFields
+	END_GROUP=GRID_1
+	GROUP=GRID_2
+		GridName="descending"
+		XDim=360
+		YDim=180
+		UpperLeftPointMtrs=(-179030000.000000,89030000.000000)
+		LowerRightMtrs=(180030000.000000,-90030000.000000)
+		Projection=GCTP_GEO
+		GROUP=Dimension
+			OBJECT=Dimension_1
+				DimensionName="StdPressureLev"
+				Size=24
+			END_OBJECT=Dimension_1
+			OBJECT=Dimension_2
+				DimensionName="H2OPressureLev"
+				Size=12
+			END_OBJECT=Dimension_2
+			OBJECT=Dimension_3
+				DimensionName="H2OPressureLay"
+				Size=12
+			END_OBJECT=Dimension_3
+			OBJECT=Dimension_4
+				DimensionName="CoarseCloudLayer"
+				Size=3
+			END_OBJECT=Dimension_4
+			OBJECT=Dimension_5
+				DimensionName="FineCloudLayer"
+				Size=12
+			END_OBJECT=Dimension_5
+			OBJECT=Dimension_6
+				DimensionName="EmisFreqIR"
+				Size=4
+			END_OBJECT=Dimension_6
+		END_GROUP=Dimension
+		GROUP=DataField
+			OBJECT=DataField_1
+				DataFieldName="TotalCounts_D"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_1
+			OBJECT=DataField_2
+				DataFieldName="SurfPres_Forecast_D"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_2
+			OBJECT=DataField_3
+				DataFieldName="SurfPres_Forecast_D_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_3
+			OBJECT=DataField_4
+				DataFieldName="SurfPres_Forecast_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_4
+			OBJECT=DataField_5
+				DataFieldName="SurfPres_Forecast_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_5
+			OBJECT=DataField_6
+				DataFieldName="SurfPres_Forecast_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_6
+			OBJECT=DataField_7
+				DataFieldName="SurfSkinTemp_D"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_7
+			OBJECT=DataField_8
+				DataFieldName="SurfSkinTemp_D_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_8
+			OBJECT=DataField_9
+				DataFieldName="SurfSkinTemp_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_9
+			OBJECT=DataField_10
+				DataFieldName="SurfSkinTemp_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_10
+			OBJECT=DataField_11
+				DataFieldName="SurfSkinTemp_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_11
+			OBJECT=DataField_12
+				DataFieldName="SurfSkinTemp_D_err"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_12
+			OBJECT=DataField_13
+				DataFieldName="EmisIR_D"
+				DataType=DFNT_FLOAT32
+				DimList=("EmisFreqIR","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_13
+			OBJECT=DataField_14
+				DataFieldName="EmisIR_D_ct"
+				DataType=DFNT_INT16
+				DimList=("EmisFreqIR","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_14
+			OBJECT=DataField_15
+				DataFieldName="EmisIR_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("EmisFreqIR","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_15
+			OBJECT=DataField_16
+				DataFieldName="EmisIR_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("EmisFreqIR","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_16
+			OBJECT=DataField_17
+				DataFieldName="EmisIR_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("EmisFreqIR","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_17
+			OBJECT=DataField_18
+				DataFieldName="EmisIR_D_err"
+				DataType=DFNT_FLOAT32
+				DimList=("EmisFreqIR","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_18
+			OBJECT=DataField_19
+				DataFieldName="Temperature_D"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_19
+			OBJECT=DataField_20
+				DataFieldName="Temperature_D_ct"
+				DataType=DFNT_INT16
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_20
+			OBJECT=DataField_21
+				DataFieldName="Temperature_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_21
+			OBJECT=DataField_22
+				DataFieldName="Temperature_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_22
+			OBJECT=DataField_23
+				DataFieldName="Temperature_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_23
+			OBJECT=DataField_24
+				DataFieldName="Temperature_D_err"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_24
+			OBJECT=DataField_25
+				DataFieldName="SurfAirTemp_D"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_25
+			OBJECT=DataField_26
+				DataFieldName="SurfAirTemp_D_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_26
+			OBJECT=DataField_27
+				DataFieldName="SurfAirTemp_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_27
+			OBJECT=DataField_28
+				DataFieldName="SurfAirTemp_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_28
+			OBJECT=DataField_29
+				DataFieldName="SurfAirTemp_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_29
+			OBJECT=DataField_30
+				DataFieldName="SurfAirTemp_D_err"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_30
+			OBJECT=DataField_31
+				DataFieldName="TropPres_D"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_31
+			OBJECT=DataField_32
+				DataFieldName="TropPres_D_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_32
+			OBJECT=DataField_33
+				DataFieldName="TropPres_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_33
+			OBJECT=DataField_34
+				DataFieldName="TropPres_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_34
+			OBJECT=DataField_35
+				DataFieldName="TropPres_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_35
+			OBJECT=DataField_36
+				DataFieldName="TropTemp_D"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_36
+			OBJECT=DataField_37
+				DataFieldName="TropTemp_D_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_37
+			OBJECT=DataField_38
+				DataFieldName="TropTemp_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_38
+			OBJECT=DataField_39
+				DataFieldName="TropTemp_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_39
+			OBJECT=DataField_40
+				DataFieldName="TropTemp_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_40
+			OBJECT=DataField_41
+				DataFieldName="TotH2OVap_D"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_41
+			OBJECT=DataField_42
+				DataFieldName="TotH2OVap_D_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_42
+			OBJECT=DataField_43
+				DataFieldName="TotH2OVap_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_43
+			OBJECT=DataField_44
+				DataFieldName="TotH2OVap_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_44
+			OBJECT=DataField_45
+				DataFieldName="TotH2OVap_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_45
+			OBJECT=DataField_46
+				DataFieldName="TotH2OVap_D_err"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_46
+			OBJECT=DataField_47
+				DataFieldName="H2O_MMR_Lyr_D"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLay","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_47
+			OBJECT=DataField_48
+				DataFieldName="H2O_MMR_Lyr_D_ct"
+				DataType=DFNT_INT16
+				DimList=("H2OPressureLay","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_48
+			OBJECT=DataField_49
+				DataFieldName="H2O_MMR_Lyr_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLay","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_49
+			OBJECT=DataField_50
+				DataFieldName="H2O_MMR_Lyr_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLay","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_50
+			OBJECT=DataField_51
+				DataFieldName="H2O_MMR_Lyr_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLay","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_51
+			OBJECT=DataField_52
+				DataFieldName="H2O_MMR_Lyr_D_err"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLay","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_52
+			OBJECT=DataField_53
+				DataFieldName="H2O_MMR_D"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_53
+			OBJECT=DataField_54
+				DataFieldName="H2O_MMR_D_ct"
+				DataType=DFNT_INT16
+				DimList=("H2OPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_54
+			OBJECT=DataField_55
+				DataFieldName="H2O_MMR_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_55
+			OBJECT=DataField_56
+				DataFieldName="H2O_MMR_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_56
+			OBJECT=DataField_57
+				DataFieldName="H2O_MMR_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_57
+			OBJECT=DataField_58
+				DataFieldName="H2O_MMR_D_err"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_58
+			OBJECT=DataField_59
+				DataFieldName="H2O_MMR_Surf_D"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_59
+			OBJECT=DataField_60
+				DataFieldName="H2O_MMR_Surf_D_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_60
+			OBJECT=DataField_61
+				DataFieldName="H2O_MMR_Surf_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_61
+			OBJECT=DataField_62
+				DataFieldName="H2O_MMR_Surf_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_62
+			OBJECT=DataField_63
+				DataFieldName="H2O_MMR_Surf_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_63
+			OBJECT=DataField_64
+				DataFieldName="H2O_MMR_Surf_D_err"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_64
+			OBJECT=DataField_65
+				DataFieldName="RelHum_D"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_65
+			OBJECT=DataField_66
+				DataFieldName="RelHum_D_ct"
+				DataType=DFNT_INT16
+				DimList=("H2OPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_66
+			OBJECT=DataField_67
+				DataFieldName="RelHum_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_67
+			OBJECT=DataField_68
+				DataFieldName="RelHum_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_68
+			OBJECT=DataField_69
+				DataFieldName="RelHum_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_69
+			OBJECT=DataField_70
+				DataFieldName="RelHumSurf_D"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_70
+			OBJECT=DataField_71
+				DataFieldName="RelHumSurf_D_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_71
+			OBJECT=DataField_72
+				DataFieldName="RelHumSurf_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_72
+			OBJECT=DataField_73
+				DataFieldName="RelHumSurf_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_73
+			OBJECT=DataField_74
+				DataFieldName="RelHumSurf_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_74
+			OBJECT=DataField_75
+				DataFieldName="RelHum_liquid_D"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_75
+			OBJECT=DataField_76
+				DataFieldName="RelHum_liquid_D_ct"
+				DataType=DFNT_INT16
+				DimList=("H2OPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_76
+			OBJECT=DataField_77
+				DataFieldName="RelHum_liquid_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_77
+			OBJECT=DataField_78
+				DataFieldName="RelHum_liquid_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_78
+			OBJECT=DataField_79
+				DataFieldName="RelHum_liquid_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_79
+			OBJECT=DataField_80
+				DataFieldName="RelHumSurf_liquid_D"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_80
+			OBJECT=DataField_81
+				DataFieldName="RelHumSurf_liquid_D_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_81
+			OBJECT=DataField_82
+				DataFieldName="RelHumSurf_liquid_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_82
+			OBJECT=DataField_83
+				DataFieldName="RelHumSurf_liquid_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_83
+			OBJECT=DataField_84
+				DataFieldName="RelHumSurf_liquid_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_84
+			OBJECT=DataField_85
+				DataFieldName="TropHeight_D"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_85
+			OBJECT=DataField_86
+				DataFieldName="TropHeight_D_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_86
+			OBJECT=DataField_87
+				DataFieldName="TropHeight_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_87
+			OBJECT=DataField_88
+				DataFieldName="TropHeight_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_88
+			OBJECT=DataField_89
+				DataFieldName="TropHeight_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_89
+			OBJECT=DataField_90
+				DataFieldName="GPHeight_D"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_90
+			OBJECT=DataField_91
+				DataFieldName="GPHeight_D_ct"
+				DataType=DFNT_INT16
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_91
+			OBJECT=DataField_92
+				DataFieldName="GPHeight_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_92
+			OBJECT=DataField_93
+				DataFieldName="GPHeight_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_93
+			OBJECT=DataField_94
+				DataFieldName="GPHeight_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_94
+			OBJECT=DataField_95
+				DataFieldName="CloudFrc_D"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_95
+			OBJECT=DataField_96
+				DataFieldName="CloudFrc_D_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_96
+			OBJECT=DataField_97
+				DataFieldName="CloudFrc_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_97
+			OBJECT=DataField_98
+				DataFieldName="CloudFrc_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_98
+			OBJECT=DataField_99
+				DataFieldName="CloudFrc_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_99
+			OBJECT=DataField_100
+				DataFieldName="CloudFrc_D_err"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_100
+			OBJECT=DataField_101
+				DataFieldName="CloudTopPres_D"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_101
+			OBJECT=DataField_102
+				DataFieldName="CloudTopPres_D_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_102
+			OBJECT=DataField_103
+				DataFieldName="CloudTopPres_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_103
+			OBJECT=DataField_104
+				DataFieldName="CloudTopPres_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_104
+			OBJECT=DataField_105
+				DataFieldName="CloudTopPres_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_105
+			OBJECT=DataField_106
+				DataFieldName="CloudTopPres_D_err"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_106
+			OBJECT=DataField_107
+				DataFieldName="CloudTopTemp_D"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_107
+			OBJECT=DataField_108
+				DataFieldName="CloudTopTemp_D_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_108
+			OBJECT=DataField_109
+				DataFieldName="CloudTopTemp_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_109
+			OBJECT=DataField_110
+				DataFieldName="CloudTopTemp_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_110
+			OBJECT=DataField_111
+				DataFieldName="CloudTopTemp_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_111
+			OBJECT=DataField_112
+				DataFieldName="CloudTopTemp_D_err"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_112
+			OBJECT=DataField_113
+				DataFieldName="FineCloudFrc_D"
+				DataType=DFNT_FLOAT32
+				DimList=("FineCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_113
+			OBJECT=DataField_114
+				DataFieldName="FineCloudFrc_D_ct"
+				DataType=DFNT_INT16
+				DimList=("FineCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_114
+			OBJECT=DataField_115
+				DataFieldName="FineCloudFrc_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("FineCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_115
+			OBJECT=DataField_116
+				DataFieldName="FineCloudFrc_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("FineCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_116
+			OBJECT=DataField_117
+				DataFieldName="FineCloudFrc_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("FineCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_117
+			OBJECT=DataField_118
+				DataFieldName="CoarseCloudFrc_D"
+				DataType=DFNT_FLOAT32
+				DimList=("CoarseCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_118
+			OBJECT=DataField_119
+				DataFieldName="CoarseCloudFrc_D_ct"
+				DataType=DFNT_INT16
+				DimList=("CoarseCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_119
+			OBJECT=DataField_120
+				DataFieldName="CoarseCloudFrc_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("CoarseCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_120
+			OBJECT=DataField_121
+				DataFieldName="CoarseCloudFrc_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("CoarseCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_121
+			OBJECT=DataField_122
+				DataFieldName="CoarseCloudFrc_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("CoarseCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_122
+			OBJECT=DataField_123
+				DataFieldName="CoarseCloudPres_D"
+				DataType=DFNT_FLOAT32
+				DimList=("CoarseCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_123
+			OBJECT=DataField_124
+				DataFieldName="CoarseCloudPres_D_ct"
+				DataType=DFNT_INT16
+				DimList=("CoarseCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_124
+			OBJECT=DataField_125
+				DataFieldName="CoarseCloudPres_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("CoarseCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_125
+			OBJECT=DataField_126
+				DataFieldName="CoarseCloudPres_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("CoarseCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+		</Value>
+  </Attribute>
+  <Attribute name="StructMetadata_2" type="String">
+    <Value>	END_OBJECT=DataField_126
+			OBJECT=DataField_127
+				DataFieldName="CoarseCloudPres_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("CoarseCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_127
+			OBJECT=DataField_128
+				DataFieldName="CoarseCloudTemp_D"
+				DataType=DFNT_FLOAT32
+				DimList=("CoarseCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_128
+			OBJECT=DataField_129
+				DataFieldName="CoarseCloudTemp_D_ct"
+				DataType=DFNT_INT16
+				DimList=("CoarseCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_129
+			OBJECT=DataField_130
+				DataFieldName="CoarseCloudTemp_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("CoarseCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_130
+			OBJECT=DataField_131
+				DataFieldName="CoarseCloudTemp_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("CoarseCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_131
+			OBJECT=DataField_132
+				DataFieldName="CoarseCloudTemp_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("CoarseCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_132
+			OBJECT=DataField_133
+				DataFieldName="TotO3_D"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_133
+			OBJECT=DataField_134
+				DataFieldName="TotO3_D_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_134
+			OBJECT=DataField_135
+				DataFieldName="TotO3_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_135
+			OBJECT=DataField_136
+				DataFieldName="TotO3_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_136
+			OBJECT=DataField_137
+				DataFieldName="TotO3_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_137
+			OBJECT=DataField_138
+				DataFieldName="TotO3_D_err"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_138
+			OBJECT=DataField_139
+				DataFieldName="O3_VMR_D"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_139
+			OBJECT=DataField_140
+				DataFieldName="O3_VMR_D_ct"
+				DataType=DFNT_INT16
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_140
+			OBJECT=DataField_141
+				DataFieldName="O3_VMR_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_141
+			OBJECT=DataField_142
+				DataFieldName="O3_VMR_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_142
+			OBJECT=DataField_143
+				DataFieldName="O3_VMR_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_143
+			OBJECT=DataField_144
+				DataFieldName="O3_VMR_D_err"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_144
+			OBJECT=DataField_145
+				DataFieldName="TotCO_D"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_145
+			OBJECT=DataField_146
+				DataFieldName="TotCO_D_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_146
+			OBJECT=DataField_147
+				DataFieldName="TotCO_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_147
+			OBJECT=DataField_148
+				DataFieldName="TotCO_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_148
+			OBJECT=DataField_149
+				DataFieldName="TotCO_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_149
+			OBJECT=DataField_150
+				DataFieldName="CO_VMR_D"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_150
+			OBJECT=DataField_151
+				DataFieldName="CO_VMR_D_ct"
+				DataType=DFNT_INT16
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_151
+			OBJECT=DataField_152
+				DataFieldName="CO_VMR_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_152
+			OBJECT=DataField_153
+				DataFieldName="CO_VMR_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_153
+			OBJECT=DataField_154
+				DataFieldName="CO_VMR_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_154
+			OBJECT=DataField_155
+				DataFieldName="CO_VMR_D_err"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_155
+			OBJECT=DataField_156
+				DataFieldName="TotCH4_D"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_156
+			OBJECT=DataField_157
+				DataFieldName="TotCH4_D_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_157
+			OBJECT=DataField_158
+				DataFieldName="TotCH4_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_158
+			OBJECT=DataField_159
+				DataFieldName="TotCH4_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_159
+			OBJECT=DataField_160
+				DataFieldName="TotCH4_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_160
+			OBJECT=DataField_161
+				DataFieldName="CH4_VMR_D"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_161
+			OBJECT=DataField_162
+				DataFieldName="CH4_VMR_D_ct"
+				DataType=DFNT_INT16
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_162
+			OBJECT=DataField_163
+				DataFieldName="CH4_VMR_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_163
+			OBJECT=DataField_164
+				DataFieldName="CH4_VMR_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_164
+			OBJECT=DataField_165
+				DataFieldName="CH4_VMR_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_165
+			OBJECT=DataField_166
+				DataFieldName="CH4_VMR_D_err"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_166
+			OBJECT=DataField_167
+				DataFieldName="OLR_D"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_167
+			OBJECT=DataField_168
+				DataFieldName="OLR_D_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_168
+			OBJECT=DataField_169
+				DataFieldName="OLR_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_169
+			OBJECT=DataField_170
+				DataFieldName="OLR_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_170
+			OBJECT=DataField_171
+				DataFieldName="OLR_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_171
+			OBJECT=DataField_172
+				DataFieldName="OLR_D_err"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_172
+			OBJECT=DataField_173
+				DataFieldName="ClrOLR_D"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_173
+			OBJECT=DataField_174
+				DataFieldName="ClrOLR_D_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_174
+			OBJECT=DataField_175
+				DataFieldName="ClrOLR_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_175
+			OBJECT=DataField_176
+				DataFieldName="ClrOLR_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_176
+			OBJECT=DataField_177
+				DataFieldName="ClrOLR_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_177
+			OBJECT=DataField_178
+				DataFieldName="ClrOLR_D_err"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_178
+		END_GROUP=DataField
+		GROUP=MergedFields
+		END_GROUP=MergedFields
+	END_GROUP=GRID_2
+	GROUP=GRID_3
+		GridName="ascending_TqJoint"
+		XDim=360
+		YDim=180
+		UpperLeftPointMtrs=(-179030000.000000,89030000.000000)
+		LowerRightMtrs=(180030000.000000,-90030000.000000)
+		Projection=GCTP_GEO
+		GROUP=Dimension
+			OBJECT=Dimension_1
+				DimensionName="StdPressureLev"
+				Size=24
+			END_OBJECT=Dimension_1
+			OBJECT=Dimension_2
+				DimensionName="H2OPressureLev"
+				Size=12
+			END_OBJECT=Dimension_2
+			OBJECT=Dimension_3
+				DimensionName="H2OPressureLay"
+				Size=12
+			END_OBJECT=Dimension_3
+			OBJECT=Dimension_4
+				DimensionName="CoarseCloudLayer"
+				Size=3
+			END_OBJECT=Dimension_4
+			OBJECT=Dimension_5
+				DimensionName="FineCloudLayer"
+				Size=12
+			END_OBJECT=Dimension_5
+			OBJECT=Dimension_6
+				DimensionName="EmisFreqIR"
+				Size=4
+			END_OBJECT=Dimension_6
+		END_GROUP=Dimension
+		GROUP=DataField
+			OBJECT=DataField_1
+				DataFieldName="TotalCounts_TqJ_A"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_1
+			OBJECT=DataField_2
+				DataFieldName="SurfPres_Forecast_TqJ_A"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_2
+			OBJECT=DataField_3
+				DataFieldName="SurfPres_Forecast_TqJ_A_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_3
+			OBJECT=DataField_4
+				DataFieldName="SurfPres_Forecast_TqJ_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_4
+			OBJECT=DataField_5
+				DataFieldName="SurfPres_Forecast_TqJ_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_5
+			OBJECT=DataField_6
+				DataFieldName="SurfPres_Forecast_TqJ_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_6
+			OBJECT=DataField_7
+				DataFieldName="SurfSkinTemp_TqJ_A"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_7
+			OBJECT=DataField_8
+				DataFieldName="SurfSkinTemp_TqJ_A_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_8
+			OBJECT=DataField_9
+				DataFieldName="SurfSkinTemp_TqJ_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_9
+			OBJECT=DataField_10
+				DataFieldName="SurfSkinTemp_TqJ_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_10
+			OBJECT=DataField_11
+				DataFieldName="SurfSkinTemp_TqJ_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_11
+			OBJECT=DataField_12
+				DataFieldName="SurfSkinTemp_TqJ_A_err"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_12
+			OBJECT=DataField_13
+				DataFieldName="EmisIR_TqJ_A"
+				DataType=DFNT_FLOAT32
+				DimList=("EmisFreqIR","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_13
+			OBJECT=DataField_14
+				DataFieldName="EmisIR_TqJ_A_ct"
+				DataType=DFNT_INT16
+				DimList=("EmisFreqIR","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_14
+			OBJECT=DataField_15
+				DataFieldName="EmisIR_TqJ_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("EmisFreqIR","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_15
+			OBJECT=DataField_16
+				DataFieldName="EmisIR_TqJ_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("EmisFreqIR","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_16
+			OBJECT=DataField_17
+				DataFieldName="EmisIR_TqJ_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("EmisFreqIR","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_17
+			OBJECT=DataField_18
+				DataFieldName="EmisIR_TqJ_A_err"
+				DataType=DFNT_FLOAT32
+				DimList=("EmisFreqIR","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_18
+			OBJECT=DataField_19
+				DataFieldName="Temperature_TqJ_A"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_19
+			OBJECT=DataField_20
+				DataFieldName="Temperature_TqJ_A_ct"
+				DataType=DFNT_INT16
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_20
+			OBJECT=DataField_21
+				DataFieldName="Temperature_TqJ_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_21
+			OBJECT=DataField_22
+				DataFieldName="Temperature_TqJ_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_22
+			OBJECT=DataField_23
+				DataFieldName="Temperature_TqJ_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_23
+			OBJECT=DataField_24
+				DataFieldName="Temperature_TqJ_A_err"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_24
+			OBJECT=DataField_25
+				DataFieldName="SurfAirTemp_TqJ_A"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_25
+			OBJECT=DataField_26
+				DataFieldName="SurfAirTemp_TqJ_A_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_26
+			OBJECT=DataField_27
+				DataFieldName="SurfAirTemp_TqJ_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_27
+			OBJECT=DataField_28
+				DataFieldName="SurfAirTemp_TqJ_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_28
+			OBJECT=DataField_29
+				DataFieldName="SurfAirTemp_TqJ_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_29
+			OBJECT=DataField_30
+				DataFieldName="SurfAirTemp_TqJ_A_err"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_30
+			OBJECT=DataField_31
+				DataFieldName="TropPres_TqJ_A"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_31
+			OBJECT=DataField_32
+				DataFieldName="TropPres_TqJ_A_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_32
+			OBJECT=DataField_33
+				DataFieldName="TropPres_TqJ_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_33
+			OBJECT=DataField_34
+				DataFieldName="TropPres_TqJ_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_34
+			OBJECT=DataField_35
+				DataFieldName="TropPres_TqJ_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_35
+			OBJECT=DataField_36
+				DataFieldName="TropTemp_TqJ_A"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_36
+			OBJECT=DataField_37
+				DataFieldName="TropTemp_TqJ_A_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_37
+			OBJECT=DataField_38
+				DataFieldName="TropTemp_TqJ_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_38
+			OBJECT=DataField_39
+				DataFieldName="TropTemp_TqJ_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_39
+			OBJECT=DataField_40
+				DataFieldName="TropTemp_TqJ_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_40
+			OBJECT=DataField_41
+				DataFieldName="TotH2OVap_TqJ_A"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_41
+			OBJECT=DataField_42
+				DataFieldName="TotH2OVap_TqJ_A_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_42
+			OBJECT=DataField_43
+				DataFieldName="TotH2OVap_TqJ_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_43
+			OBJECT=DataField_44
+				DataFieldName="TotH2OVap_TqJ_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_44
+			OBJECT=DataField_45
+				DataFieldName="TotH2OVap_TqJ_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_45
+			OBJECT=DataField_46
+				DataFieldName="TotH2OVap_TqJ_A_err"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_46
+			OBJECT=DataField_47
+				DataFieldName="H2O_MMR_Lyr_TqJ_A"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLay","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_47
+			OBJECT=DataField_48
+				DataFieldName="H2O_MMR_Lyr_TqJ_A_ct"
+				DataType=DFNT_INT16
+				DimList=("H2OPressureLay","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_48
+			OBJECT=DataField_49
+				DataFieldName="H2O_MMR_Lyr_TqJ_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLay","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_49
+			OBJECT=DataField_50
+				DataFieldName="H2O_MMR_Lyr_TqJ_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLay","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_50
+			OBJECT=DataField_51
+				DataFieldName="H2O_MMR_Lyr_TqJ_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLay","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_51
+			OBJECT=DataField_52
+				DataFieldName="H2O_MMR_Lyr_TqJ_A_err"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLay","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_52
+			OBJECT=DataField_53
+				DataFieldName="H2O_MMR_TqJ_A"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_53
+			OBJECT=DataField_54
+				DataFieldName="H2O_MMR_TqJ_A_ct"
+				DataType=DFNT_INT16
+				DimList=("H2OPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_54
+			OBJECT=DataField_55
+				DataFieldName="H2O_MMR_TqJ_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_55
+			OBJECT=DataField_56
+				DataFieldName="H2O_MMR_TqJ_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_56
+			OBJECT=DataField_57
+				DataFieldName="H2O_MMR_TqJ_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_57
+			OBJECT=DataField_58
+				DataFieldName="H2O_MMR_TqJ_A_err"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_58
+			OBJECT=DataField_59
+				DataFieldName="H2O_MMR_Surf_TqJ_A"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_59
+			OBJECT=DataField_60
+				DataFieldName="H2O_MMR_Surf_TqJ_A_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_60
+			OBJECT=DataField_61
+				DataFieldName="H2O_MMR_Surf_TqJ_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_61
+			OBJECT=DataField_62
+				DataFieldName="H2O_MMR_Surf_TqJ_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_62
+			OBJECT=DataField_63
+				DataFieldName="H2O_MMR_Surf_TqJ_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_63
+			OBJECT=DataField_64
+				DataFieldName="H2O_MMR_Surf_TqJ_A_err"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_64
+			OBJECT=DataField_65
+				DataFieldName="RelHum_TqJ_A"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_65
+			OBJECT=DataField_66
+				DataFieldName="RelHum_TqJ_A_ct"
+				DataType=DFNT_INT16
+				DimList=("H2OPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_66
+			OBJECT=DataField_67
+				DataFieldName="RelHum_TqJ_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_67
+			OBJECT=DataField_68
+				DataFieldName="RelHum_TqJ_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_68
+			OBJECT=DataField_69
+				DataFieldName="RelHum_TqJ_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_69
+			OBJECT=DataField_70
+				DataFieldName="RelHumSurf_TqJ_A"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_70
+			OBJECT=DataField_71
+				DataFieldName="RelHumSurf_TqJ_A_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_71
+			OBJECT=DataField_72
+				DataFieldName="RelHumSurf_TqJ_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_72
+			OBJECT=DataField_73
+				DataFieldName="RelHumSurf_TqJ_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_73
+			OBJECT=DataField_74
+				DataFieldName="RelHumSurf_TqJ_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_74
+			OBJECT=DataField_75
+				DataFieldName="RelHum_liquid_TqJ_A"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_75
+			OBJECT=DataField_76
+				DataFieldName="RelHum_liquid_TqJ_A_ct"
+				DataType=DFNT_INT16
+				DimList=("H2OPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_76
+			OBJECT=DataField_77
+				DataFieldName="RelHum_liquid_TqJ_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_77
+			OBJECT=DataField_78
+				DataFieldName="RelHum_liquid_TqJ_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_78
+			OBJECT=DataField_79
+				DataFieldName="RelHum_liquid_TqJ_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_79
+			OBJECT=DataField_80
+				DataFieldName="RelHumSurf_liquid_TqJ_A"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_80
+			OBJECT=DataField_81
+				DataFieldName="RelHumSurf_liquid_TqJ_A_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_81
+			OBJECT=DataField_82
+				DataFieldName="RelHumSurf_liquid_TqJ_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_82
+			OBJECT=DataField_83
+				DataFieldName="RelHumSurf_liquid_TqJ_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_83
+			OBJECT=DataField_84
+				DataFieldName="RelHumSurf_liquid_TqJ_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_84
+			OBJECT=DataField_85
+				DataFieldName="TropHeight_TqJ_A"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_85
+			OBJECT=DataField_86
+				DataFieldName="TropHeight_TqJ_A_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_86
+			OBJECT=DataField_87
+				DataFieldName="TropHeight_TqJ_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_87
+			OBJECT=DataField_88
+				DataFieldName="TropHeight_TqJ_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_88
+			OBJECT=DataField_89
+				DataFieldName="TropHeight_TqJ_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_89
+			OBJECT=DataField_90
+				DataFieldName="GPHeight_TqJ_A"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_90
+			OBJECT=DataField_91
+				DataFieldName="GPHeight_TqJ_A_ct"
+				DataType=DFNT_INT16
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_91
+			OBJECT=DataField_92
+				DataFieldName="GPHeight_TqJ_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_92
+			OBJECT=DataField_93
+				DataFieldName="GPHeight_TqJ_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_93
+			OBJECT=DataField_94
+				DataFieldName="GPHeight_TqJ_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_94
+			OBJECT=DataField_95
+				DataFieldName="CloudFrc_TqJ_A"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_95
+			OBJECT=DataField_96
+				DataFieldName="CloudFrc_TqJ_A_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_96
+			OBJECT=DataField_97
+				DataFieldName="CloudFrc_TqJ_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_97
+			OBJECT=DataField_98
+				DataFieldName="CloudFrc_TqJ_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_98
+			OBJECT=DataField_99
+				DataFieldName="CloudFrc_TqJ_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLA</Value>
+  </Attribute>
+  <Attribute name="StructMetadata_3" type="String">
+    <Value>TE
+				DeflateLevel=5
+			END_OBJECT=DataField_99
+			OBJECT=DataField_100
+				DataFieldName="CloudFrc_TqJ_A_err"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_100
+			OBJECT=DataField_101
+				DataFieldName="CloudTopPres_TqJ_A"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_101
+			OBJECT=DataField_102
+				DataFieldName="CloudTopPres_TqJ_A_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_102
+			OBJECT=DataField_103
+				DataFieldName="CloudTopPres_TqJ_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_103
+			OBJECT=DataField_104
+				DataFieldName="CloudTopPres_TqJ_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_104
+			OBJECT=DataField_105
+				DataFieldName="CloudTopPres_TqJ_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_105
+			OBJECT=DataField_106
+				DataFieldName="CloudTopPres_TqJ_A_err"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_106
+			OBJECT=DataField_107
+				DataFieldName="CloudTopTemp_TqJ_A"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_107
+			OBJECT=DataField_108
+				DataFieldName="CloudTopTemp_TqJ_A_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_108
+			OBJECT=DataField_109
+				DataFieldName="CloudTopTemp_TqJ_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_109
+			OBJECT=DataField_110
+				DataFieldName="CloudTopTemp_TqJ_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_110
+			OBJECT=DataField_111
+				DataFieldName="CloudTopTemp_TqJ_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_111
+			OBJECT=DataField_112
+				DataFieldName="CloudTopTemp_TqJ_A_err"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_112
+			OBJECT=DataField_113
+				DataFieldName="FineCloudFrc_TqJ_A"
+				DataType=DFNT_FLOAT32
+				DimList=("FineCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_113
+			OBJECT=DataField_114
+				DataFieldName="FineCloudFrc_TqJ_A_ct"
+				DataType=DFNT_INT16
+				DimList=("FineCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_114
+			OBJECT=DataField_115
+				DataFieldName="FineCloudFrc_TqJ_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("FineCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_115
+			OBJECT=DataField_116
+				DataFieldName="FineCloudFrc_TqJ_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("FineCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_116
+			OBJECT=DataField_117
+				DataFieldName="FineCloudFrc_TqJ_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("FineCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_117
+			OBJECT=DataField_118
+				DataFieldName="CoarseCloudFrc_TqJ_A"
+				DataType=DFNT_FLOAT32
+				DimList=("CoarseCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_118
+			OBJECT=DataField_119
+				DataFieldName="CoarseCloudFrc_TqJ_A_ct"
+				DataType=DFNT_INT16
+				DimList=("CoarseCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_119
+			OBJECT=DataField_120
+				DataFieldName="CoarseCloudFrc_TqJ_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("CoarseCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_120
+			OBJECT=DataField_121
+				DataFieldName="CoarseCloudFrc_TqJ_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("CoarseCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_121
+			OBJECT=DataField_122
+				DataFieldName="CoarseCloudFrc_TqJ_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("CoarseCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_122
+			OBJECT=DataField_123
+				DataFieldName="CoarseCloudPres_TqJ_A"
+				DataType=DFNT_FLOAT32
+				DimList=("CoarseCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_123
+			OBJECT=DataField_124
+				DataFieldName="CoarseCloudPres_TqJ_A_ct"
+				DataType=DFNT_INT16
+				DimList=("CoarseCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_124
+			OBJECT=DataField_125
+				DataFieldName="CoarseCloudPres_TqJ_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("CoarseCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_125
+			OBJECT=DataField_126
+				DataFieldName="CoarseCloudPres_TqJ_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("CoarseCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_126
+			OBJECT=DataField_127
+				DataFieldName="CoarseCloudPres_TqJ_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("CoarseCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_127
+			OBJECT=DataField_128
+				DataFieldName="CoarseCloudTemp_TqJ_A"
+				DataType=DFNT_FLOAT32
+				DimList=("CoarseCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_128
+			OBJECT=DataField_129
+				DataFieldName="CoarseCloudTemp_TqJ_A_ct"
+				DataType=DFNT_INT16
+				DimList=("CoarseCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_129
+			OBJECT=DataField_130
+				DataFieldName="CoarseCloudTemp_TqJ_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("CoarseCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_130
+			OBJECT=DataField_131
+				DataFieldName="CoarseCloudTemp_TqJ_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("CoarseCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_131
+			OBJECT=DataField_132
+				DataFieldName="CoarseCloudTemp_TqJ_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("CoarseCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_132
+			OBJECT=DataField_133
+				DataFieldName="TotO3_TqJ_A"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_133
+			OBJECT=DataField_134
+				DataFieldName="TotO3_TqJ_A_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_134
+			OBJECT=DataField_135
+				DataFieldName="TotO3_TqJ_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_135
+			OBJECT=DataField_136
+				DataFieldName="TotO3_TqJ_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_136
+			OBJECT=DataField_137
+				DataFieldName="TotO3_TqJ_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_137
+			OBJECT=DataField_138
+				DataFieldName="TotO3_TqJ_A_err"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_138
+			OBJECT=DataField_139
+				DataFieldName="O3_VMR_TqJ_A"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_139
+			OBJECT=DataField_140
+				DataFieldName="O3_VMR_TqJ_A_ct"
+				DataType=DFNT_INT16
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_140
+			OBJECT=DataField_141
+				DataFieldName="O3_VMR_TqJ_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_141
+			OBJECT=DataField_142
+				DataFieldName="O3_VMR_TqJ_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_142
+			OBJECT=DataField_143
+				DataFieldName="O3_VMR_TqJ_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_143
+			OBJECT=DataField_144
+				DataFieldName="O3_VMR_TqJ_A_err"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_144
+			OBJECT=DataField_145
+				DataFieldName="TotCO_TqJ_A"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_145
+			OBJECT=DataField_146
+				DataFieldName="TotCO_TqJ_A_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_146
+			OBJECT=DataField_147
+				DataFieldName="TotCO_TqJ_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_147
+			OBJECT=DataField_148
+				DataFieldName="TotCO_TqJ_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_148
+			OBJECT=DataField_149
+				DataFieldName="TotCO_TqJ_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_149
+			OBJECT=DataField_150
+				DataFieldName="CO_VMR_TqJ_A"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_150
+			OBJECT=DataField_151
+				DataFieldName="CO_VMR_TqJ_A_ct"
+				DataType=DFNT_INT16
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_151
+			OBJECT=DataField_152
+				DataFieldName="CO_VMR_TqJ_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_152
+			OBJECT=DataField_153
+				DataFieldName="CO_VMR_TqJ_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_153
+			OBJECT=DataField_154
+				DataFieldName="CO_VMR_TqJ_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_154
+			OBJECT=DataField_155
+				DataFieldName="CO_VMR_TqJ_A_err"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_155
+			OBJECT=DataField_156
+				DataFieldName="TotCH4_TqJ_A"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_156
+			OBJECT=DataField_157
+				DataFieldName="TotCH4_TqJ_A_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_157
+			OBJECT=DataField_158
+				DataFieldName="TotCH4_TqJ_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_158
+			OBJECT=DataField_159
+				DataFieldName="TotCH4_TqJ_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_159
+			OBJECT=DataField_160
+				DataFieldName="TotCH4_TqJ_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_160
+			OBJECT=DataField_161
+				DataFieldName="CH4_VMR_TqJ_A"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_161
+			OBJECT=DataField_162
+				DataFieldName="CH4_VMR_TqJ_A_ct"
+				DataType=DFNT_INT16
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_162
+			OBJECT=DataField_163
+				DataFieldName="CH4_VMR_TqJ_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_163
+			OBJECT=DataField_164
+				DataFieldName="CH4_VMR_TqJ_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_164
+			OBJECT=DataField_165
+				DataFieldName="CH4_VMR_TqJ_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_165
+			OBJECT=DataField_166
+				DataFieldName="CH4_VMR_TqJ_A_err"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_166
+			OBJECT=DataField_167
+				DataFieldName="OLR_TqJ_A"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_167
+			OBJECT=DataField_168
+				DataFieldName="OLR_TqJ_A_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_168
+			OBJECT=DataField_169
+				DataFieldName="OLR_TqJ_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_169
+			OBJECT=DataField_170
+				DataFieldName="OLR_TqJ_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_170
+			OBJECT=DataField_171
+				DataFieldName="OLR_TqJ_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_171
+			OBJECT=DataField_172
+				DataFieldName="OLR_TqJ_A_err"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_172
+			OBJECT=DataField_173
+				DataFieldName="ClrOLR_TqJ_A"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_173
+			OBJECT=DataField_174
+				DataFieldName="ClrOLR_TqJ_A_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_174
+			OBJECT=DataField_175
+				DataFieldName="ClrOLR_TqJ_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_175
+			OBJECT=DataField_176
+				DataFieldName="ClrOLR_TqJ_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_176
+			OBJECT=DataField_177
+				DataFieldName="ClrOLR_TqJ_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_177
+			OBJECT=DataField_178
+				DataFieldName="ClrOLR_TqJ_A_err"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_178
+		END_GROUP=DataField
+		GROUP=MergedFields
+		END_GROUP=MergedFields
+	END_GROUP=GRID_3
+	GROUP=GRID_4
+		GridName="descending_TqJoint"
+		XDim=360
+		YDim=180
+		UpperLeftPointMtrs=(-179030000.000000,89030000.000000)
+		LowerRightMtrs=(180030000.000000,-90030000.000000)
+		Projection=GCTP_GEO
+		GROUP=Dimension
+			OBJECT=Dimension_1
+				DimensionName="StdPressureLev"
+				Size=24
+			END_OBJECT=Dimension_1
+			OBJECT=Dimension_2
+				DimensionName="H2OPressureLev"
+				Size=12
+			END_OBJECT=Dimension_2
+			OBJECT=Dimension_3
+				DimensionName="H2OPressureLay"
+				Size=12
+			END_OBJECT=Dimension_3
+			OBJECT=Dimension_4
+				DimensionName="CoarseCloudLayer"
+				Size=3
+			END_OBJECT=Dimension_4
+			OBJECT=Dimension_5
+				DimensionName="FineCloudLayer"
+				Size=12
+			END_OBJECT=Dimension_5
+			OBJECT=Dimension_6
+				DimensionName="EmisFreqIR"
+				Size=4
+			END_OBJECT=Dimension_6
+		END_GROUP=Dimension
+		GROUP=DataField
+			OBJECT=DataField_1
+				DataFieldName="TotalCounts_TqJ_D"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_1
+			OBJECT=DataField_2
+				DataFieldName="SurfPres_Forecast_TqJ_D"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_2
+			OBJECT=DataField_3
+				DataFieldName="SurfPres_Forecast_TqJ_D_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_3
+			OBJECT=DataField_4
+				DataFieldName="SurfPres_Forecast_TqJ_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_4
+			OBJECT=DataField_5
+				DataFieldName="SurfPres_Forecast_TqJ_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_5
+			OBJECT=DataField_6
+				DataFieldName="SurfPres_Forecast_TqJ_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_6
+			OBJECT=DataField_7
+				DataFieldName="SurfSkinTemp_TqJ_D"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_7
+			OBJECT=DataField_8
+				DataFieldName="SurfSkinTemp_TqJ_D_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_8
+			OBJECT=DataField_9
+				DataFieldName="SurfSkinTemp_TqJ_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_9
+			OBJECT=DataField_10
+				DataFieldName="SurfSkinTemp_TqJ_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_10
+			OBJECT=DataField_11
+				DataFieldName="SurfSkinTemp_TqJ_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_11
+			OBJECT=DataField_12
+				DataFieldName="SurfSkinTemp_TqJ_D_err"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_12
+			OBJECT=DataField_13
+				DataFieldName="EmisIR_TqJ_D"
+				DataType=DFNT_FLOAT32
+				DimList=("EmisFreqIR","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_13
+			OBJECT=DataField_14
+				DataFieldName="EmisIR_TqJ_D_ct"
+				DataType=DFNT_INT16
+				DimList=("EmisFreqIR","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_14
+			OBJECT=DataField_15
+				DataFieldName="EmisIR_TqJ_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("EmisFreqIR","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_15
+			OBJECT=DataField_16
+				DataFieldName="EmisIR_TqJ_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("EmisFreqIR","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_16
+			OBJECT=DataField_17
+				DataFieldName="EmisIR_TqJ_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("EmisFreqIR","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_17
+			OBJECT=DataField_18
+				DataFieldName="EmisIR_TqJ_D_err"
+				DataType=DFNT_FLOAT32
+				DimList=("EmisFreqIR","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_18
+			OBJECT=DataField_19
+				DataFieldName="Temperature_TqJ_D"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_19
+			OBJECT=DataField_20
+				DataFieldName="Temperature_TqJ_D_ct"
+				DataType=DFNT_INT16
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_20
+			OBJECT=DataField_21
+				DataFieldName="Temperature_TqJ_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_21
+			OBJECT=DataField_22
+				DataFieldName="Temperature_TqJ_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_22
+			OBJECT=DataField_23
+				DataFieldName="Temperature_TqJ_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_23
+			OBJECT=DataField_24
+				DataFieldName="Temperature_TqJ_D_err"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_24
+			OBJECT=DataField_25
+				DataFieldName="SurfAirTemp_TqJ_D"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_25
+			OBJECT=DataField_26
+				DataFieldName="SurfAirTemp_TqJ_D_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_26
+			OBJECT=DataField_27
+				DataFieldName="SurfAirTemp_TqJ_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_27
+			OBJECT=DataField_28
+				DataFieldName="SurfAirTemp_TqJ_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_28
+			OBJECT=DataField_29
+				DataFieldName="SurfAirTemp_TqJ_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_29
+			OBJECT=DataField_30
+				DataFieldName="SurfAirTemp_TqJ_D_err"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_30
+			OBJECT=DataField_31
+				DataFieldName="TropPres_TqJ_D"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_31
+			OBJECT=DataField_32
+				DataFieldName="TropPres_TqJ_D_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_32
+			OBJECT=DataField_33
+				DataFieldName="TropPres_TqJ_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_33
+			OBJECT=DataField_34
+				DataFieldName="TropPres_TqJ_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_34
+			OBJECT=DataField_35
+				DataFieldName="TropPres_TqJ_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_35
+			OBJECT=DataField_36
+				DataFieldName="TropTemp_TqJ_D"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_36
+			OBJECT=DataField_37
+				DataFieldName="TropTemp_TqJ_D_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_37
+			OBJECT=DataField_38
+				DataFieldName="TropTemp_TqJ_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_38
+			OBJECT=DataField_39
+				DataFieldName="TropTemp_TqJ_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_39
+			OBJECT=DataField_40
+				DataFieldName="TropTemp_TqJ_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_40
+			OBJECT=DataField_41
+				DataFieldName="TotH2OVap_TqJ_D"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_41
+			OBJECT=DataField_42
+				DataFieldName="TotH2OVap_TqJ_D_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_42
+			OBJECT=DataField_43
+				DataFieldName="TotH2OVap_TqJ_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_43
+			OBJECT=DataField_44
+				DataFieldName="TotH2OVap_TqJ_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_44
+			OBJECT=DataField_45
+				DataFieldName="TotH2OVap_TqJ_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_45
+			OBJECT=DataField_46
+				DataFieldName="TotH2OVap_TqJ_D_err"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_46
+			OBJECT=DataField_47
+				DataFieldName="H2O_MMR_Lyr_TqJ_D"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLay","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_47
+			OBJECT=DataField_48
+				DataFieldName="H2O_MMR_Lyr_TqJ_D_ct"
+				DataType=DFNT_INT16
+				DimList=("H2OPressureLay","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_48
+			OBJECT=DataField_49
+				DataFieldName="H2O_MMR_Lyr_TqJ_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLay","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_49
+			OBJECT=DataField_50
+				DataFieldName="H2O_MMR_Lyr_TqJ_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLay","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_50
+			OBJECT=DataField_51
+				DataFieldName="H2O_MMR_Lyr_TqJ_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLay","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_51
+			OBJECT=DataField_52
+				DataFieldName="H2O_MMR_Lyr_TqJ_D_err"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLay","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_52
+			OBJECT=DataField_53
+				DataFieldName="H2O_MMR_TqJ_D"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_53
+			OBJECT=DataField_54
+				DataFieldName="H2O_MMR_TqJ_D_ct"
+				DataType=DFNT_INT16
+				DimList=("H2OPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_54
+			OBJECT=DataField_55
+				DataFieldName="H2O_MMR_TqJ_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_55
+			OBJECT=DataField_56
+				DataFieldName="H2O_MMR_TqJ_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_56
+			OBJECT=DataField_57
+				DataFieldName="H2O_MMR_TqJ_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_57
+			OBJECT=DataField_58
+				DataFieldName="H2O_MMR_TqJ_D_err"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_58
+			OBJECT=DataField_59
+				DataFieldName="H2O_MMR_Surf_TqJ_D"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_59
+			OBJECT=DataField_60
+				DataFieldName="H2O_MMR_Surf_TqJ_D_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_60
+			OBJECT=DataField_61
+				DataFieldName="H2O_MMR_Surf_TqJ_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_61
+			OBJECT=DataField_62
+				DataFieldName="H2O_MMR_Surf_TqJ_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_62
+			OBJECT=DataField_63
+				DataFieldName="H2O_MMR_Surf_TqJ_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_63
+			OBJECT=DataField_64
+				DataFieldName="H2O_MMR_Surf_TqJ_D_err"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_64
+			OBJECT=DataField_65
+				DataFieldName="RelHum_TqJ_D"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_65
+			OBJECT=DataField_66
+				DataFieldName="RelHum_TqJ_D_ct"
+				DataType=DFNT_INT16
+				DimList=("H2OPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_66
+			OBJECT=DataField_67
+				DataFieldName="RelHum_TqJ_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_67
+			OBJECT=DataField_68
+				DataFieldName="RelHum_TqJ_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_68
+			OBJECT=DataField_69
+				DataFieldName="RelHum_TqJ_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_69
+			OBJECT=DataField_70
+				DataFieldName="RelHumSurf_TqJ_D"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDF</Value>
+  </Attribute>
+  <Attribute name="StructMetadata_4" type="String">
+    <Value>E_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_70
+			OBJECT=DataField_71
+				DataFieldName="RelHumSurf_TqJ_D_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_71
+			OBJECT=DataField_72
+				DataFieldName="RelHumSurf_TqJ_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_72
+			OBJECT=DataField_73
+				DataFieldName="RelHumSurf_TqJ_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_73
+			OBJECT=DataField_74
+				DataFieldName="RelHumSurf_TqJ_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_74
+			OBJECT=DataField_75
+				DataFieldName="RelHum_liquid_TqJ_D"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_75
+			OBJECT=DataField_76
+				DataFieldName="RelHum_liquid_TqJ_D_ct"
+				DataType=DFNT_INT16
+				DimList=("H2OPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_76
+			OBJECT=DataField_77
+				DataFieldName="RelHum_liquid_TqJ_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_77
+			OBJECT=DataField_78
+				DataFieldName="RelHum_liquid_TqJ_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_78
+			OBJECT=DataField_79
+				DataFieldName="RelHum_liquid_TqJ_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("H2OPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_79
+			OBJECT=DataField_80
+				DataFieldName="RelHumSurf_liquid_TqJ_D"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_80
+			OBJECT=DataField_81
+				DataFieldName="RelHumSurf_liquid_TqJ_D_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_81
+			OBJECT=DataField_82
+				DataFieldName="RelHumSurf_liquid_TqJ_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_82
+			OBJECT=DataField_83
+				DataFieldName="RelHumSurf_liquid_TqJ_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_83
+			OBJECT=DataField_84
+				DataFieldName="RelHumSurf_liquid_TqJ_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_84
+			OBJECT=DataField_85
+				DataFieldName="TropHeight_TqJ_D"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_85
+			OBJECT=DataField_86
+				DataFieldName="TropHeight_TqJ_D_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_86
+			OBJECT=DataField_87
+				DataFieldName="TropHeight_TqJ_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_87
+			OBJECT=DataField_88
+				DataFieldName="TropHeight_TqJ_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_88
+			OBJECT=DataField_89
+				DataFieldName="TropHeight_TqJ_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_89
+			OBJECT=DataField_90
+				DataFieldName="GPHeight_TqJ_D"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_90
+			OBJECT=DataField_91
+				DataFieldName="GPHeight_TqJ_D_ct"
+				DataType=DFNT_INT16
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_91
+			OBJECT=DataField_92
+				DataFieldName="GPHeight_TqJ_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_92
+			OBJECT=DataField_93
+				DataFieldName="GPHeight_TqJ_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_93
+			OBJECT=DataField_94
+				DataFieldName="GPHeight_TqJ_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_94
+			OBJECT=DataField_95
+				DataFieldName="CloudFrc_TqJ_D"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_95
+			OBJECT=DataField_96
+				DataFieldName="CloudFrc_TqJ_D_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_96
+			OBJECT=DataField_97
+				DataFieldName="CloudFrc_TqJ_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_97
+			OBJECT=DataField_98
+				DataFieldName="CloudFrc_TqJ_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_98
+			OBJECT=DataField_99
+				DataFieldName="CloudFrc_TqJ_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_99
+			OBJECT=DataField_100
+				DataFieldName="CloudFrc_TqJ_D_err"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_100
+			OBJECT=DataField_101
+				DataFieldName="CloudTopPres_TqJ_D"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_101
+			OBJECT=DataField_102
+				DataFieldName="CloudTopPres_TqJ_D_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_102
+			OBJECT=DataField_103
+				DataFieldName="CloudTopPres_TqJ_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_103
+			OBJECT=DataField_104
+				DataFieldName="CloudTopPres_TqJ_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_104
+			OBJECT=DataField_105
+				DataFieldName="CloudTopPres_TqJ_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_105
+			OBJECT=DataField_106
+				DataFieldName="CloudTopPres_TqJ_D_err"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_106
+			OBJECT=DataField_107
+				DataFieldName="CloudTopTemp_TqJ_D"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_107
+			OBJECT=DataField_108
+				DataFieldName="CloudTopTemp_TqJ_D_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_108
+			OBJECT=DataField_109
+				DataFieldName="CloudTopTemp_TqJ_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_109
+			OBJECT=DataField_110
+				DataFieldName="CloudTopTemp_TqJ_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_110
+			OBJECT=DataField_111
+				DataFieldName="CloudTopTemp_TqJ_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_111
+			OBJECT=DataField_112
+				DataFieldName="CloudTopTemp_TqJ_D_err"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_112
+			OBJECT=DataField_113
+				DataFieldName="FineCloudFrc_TqJ_D"
+				DataType=DFNT_FLOAT32
+				DimList=("FineCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_113
+			OBJECT=DataField_114
+				DataFieldName="FineCloudFrc_TqJ_D_ct"
+				DataType=DFNT_INT16
+				DimList=("FineCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_114
+			OBJECT=DataField_115
+				DataFieldName="FineCloudFrc_TqJ_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("FineCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_115
+			OBJECT=DataField_116
+				DataFieldName="FineCloudFrc_TqJ_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("FineCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_116
+			OBJECT=DataField_117
+				DataFieldName="FineCloudFrc_TqJ_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("FineCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_117
+			OBJECT=DataField_118
+				DataFieldName="CoarseCloudFrc_TqJ_D"
+				DataType=DFNT_FLOAT32
+				DimList=("CoarseCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_118
+			OBJECT=DataField_119
+				DataFieldName="CoarseCloudFrc_TqJ_D_ct"
+				DataType=DFNT_INT16
+				DimList=("CoarseCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_119
+			OBJECT=DataField_120
+				DataFieldName="CoarseCloudFrc_TqJ_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("CoarseCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_120
+			OBJECT=DataField_121
+				DataFieldName="CoarseCloudFrc_TqJ_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("CoarseCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_121
+			OBJECT=DataField_122
+				DataFieldName="CoarseCloudFrc_TqJ_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("CoarseCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_122
+			OBJECT=DataField_123
+				DataFieldName="CoarseCloudPres_TqJ_D"
+				DataType=DFNT_FLOAT32
+				DimList=("CoarseCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_123
+			OBJECT=DataField_124
+				DataFieldName="CoarseCloudPres_TqJ_D_ct"
+				DataType=DFNT_INT16
+				DimList=("CoarseCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_124
+			OBJECT=DataField_125
+				DataFieldName="CoarseCloudPres_TqJ_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("CoarseCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_125
+			OBJECT=DataField_126
+				DataFieldName="CoarseCloudPres_TqJ_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("CoarseCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_126
+			OBJECT=DataField_127
+				DataFieldName="CoarseCloudPres_TqJ_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("CoarseCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_127
+			OBJECT=DataField_128
+				DataFieldName="CoarseCloudTemp_TqJ_D"
+				DataType=DFNT_FLOAT32
+				DimList=("CoarseCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_128
+			OBJECT=DataField_129
+				DataFieldName="CoarseCloudTemp_TqJ_D_ct"
+				DataType=DFNT_INT16
+				DimList=("CoarseCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_129
+			OBJECT=DataField_130
+				DataFieldName="CoarseCloudTemp_TqJ_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("CoarseCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_130
+			OBJECT=DataField_131
+				DataFieldName="CoarseCloudTemp_TqJ_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("CoarseCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_131
+			OBJECT=DataField_132
+				DataFieldName="CoarseCloudTemp_TqJ_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("CoarseCloudLayer","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_132
+			OBJECT=DataField_133
+				DataFieldName="TotO3_TqJ_D"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_133
+			OBJECT=DataField_134
+				DataFieldName="TotO3_TqJ_D_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_134
+			OBJECT=DataField_135
+				DataFieldName="TotO3_TqJ_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_135
+			OBJECT=DataField_136
+				DataFieldName="TotO3_TqJ_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_136
+			OBJECT=DataField_137
+				DataFieldName="TotO3_TqJ_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_137
+			OBJECT=DataField_138
+				DataFieldName="TotO3_TqJ_D_err"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_138
+			OBJECT=DataField_139
+				DataFieldName="O3_VMR_TqJ_D"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_139
+			OBJECT=DataField_140
+				DataFieldName="O3_VMR_TqJ_D_ct"
+				DataType=DFNT_INT16
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_140
+			OBJECT=DataField_141
+				DataFieldName="O3_VMR_TqJ_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_141
+			OBJECT=DataField_142
+				DataFieldName="O3_VMR_TqJ_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_142
+			OBJECT=DataField_143
+				DataFieldName="O3_VMR_TqJ_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_143
+			OBJECT=DataField_144
+				DataFieldName="O3_VMR_TqJ_D_err"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_144
+			OBJECT=DataField_145
+				DataFieldName="TotCO_TqJ_D"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_145
+			OBJECT=DataField_146
+				DataFieldName="TotCO_TqJ_D_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_146
+			OBJECT=DataField_147
+				DataFieldName="TotCO_TqJ_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_147
+			OBJECT=DataField_148
+				DataFieldName="TotCO_TqJ_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_148
+			OBJECT=DataField_149
+				DataFieldName="TotCO_TqJ_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_149
+			OBJECT=DataField_150
+				DataFieldName="CO_VMR_TqJ_D"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_150
+			OBJECT=DataField_151
+				DataFieldName="CO_VMR_TqJ_D_ct"
+				DataType=DFNT_INT16
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_151
+			OBJECT=DataField_152
+				DataFieldName="CO_VMR_TqJ_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_152
+			OBJECT=DataField_153
+				DataFieldName="CO_VMR_TqJ_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_153
+			OBJECT=DataField_154
+				DataFieldName="CO_VMR_TqJ_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_154
+			OBJECT=DataField_155
+				DataFieldName="CO_VMR_TqJ_D_err"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_155
+			OBJECT=DataField_156
+				DataFieldName="TotCH4_TqJ_D"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_156
+			OBJECT=DataField_157
+				DataFieldName="TotCH4_TqJ_D_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_157
+			OBJECT=DataField_158
+				DataFieldName="TotCH4_TqJ_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_158
+			OBJECT=DataField_159
+				DataFieldName="TotCH4_TqJ_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_159
+			OBJECT=DataField_160
+				DataFieldName="TotCH4_TqJ_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_160
+			OBJECT=DataField_161
+				DataFieldName="CH4_VMR_TqJ_D"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_161
+			OBJECT=DataField_162
+				DataFieldName="CH4_VMR_TqJ_D_ct"
+				DataType=DFNT_INT16
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_162
+			OBJECT=DataField_163
+				DataFieldName="CH4_VMR_TqJ_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_163
+			OBJECT=DataField_164
+				DataFieldName="CH4_VMR_TqJ_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_164
+			OBJECT=DataField_165
+				DataFieldName="CH4_VMR_TqJ_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_165
+			OBJECT=DataField_166
+				DataFieldName="CH4_VMR_TqJ_D_err"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_166
+			OBJECT=DataField_167
+				DataFieldName="OLR_TqJ_D"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_167
+			OBJECT=DataField_168
+				DataFieldName="OLR_TqJ_D_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_168
+			OBJECT=DataField_169
+				DataFieldName="OLR_TqJ_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_169
+			OBJECT=DataField_170
+				DataFieldName="OLR_TqJ_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_170
+			OBJECT=DataField_171
+				DataFieldName="OLR_TqJ_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_171
+			OBJECT=DataField_172
+				DataFieldName="OLR_TqJ_D_err"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_172
+			OBJECT=DataField_173
+				DataFieldName="ClrOLR_TqJ_D"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_173
+			OBJECT=DataField_174
+				DataFieldName="ClrOLR_TqJ_D_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_174
+			OBJECT=DataField_175
+				DataFieldName="ClrOLR_TqJ_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_175
+			OBJECT=DataField_176
+				DataFieldName="ClrOLR_TqJ_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_176
+			OBJECT=DataField_177
+				DataFieldName="ClrOLR_TqJ_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_177
+			OBJECT=DataField_178
+				DataFieldName="ClrOLR_TqJ_D_err"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_178
+		END_GROUP=DataField
+		GROUP=MergedFields
+		END_GROUP=MergedFields
+	END_GROUP=GRID_4
+	GROUP=GRID_5
+		GridName="ascending_MW_only"
+		XDim=360
+		YDim=180
+		UpperLeftPointMtrs=(-179030000.000000,89030000.000000)
+		LowerRightMtrs=(180030000.000000,-90030000.000000)
+		Projection=GCTP_GEO
+		GROUP=Dimension
+			OBJECT=Dimension_1
+				DimensionName="StdPressureLev"
+				Size=24
+			END_OBJECT=Dimension_1
+			OBJECT=Dimension_2
+				DimensionName="H2OPressureLev"
+				Size=12
+			END_OBJECT=Dimension_2
+			OBJECT=Dimension_3
+				DimensionName="H2OPressureLay"
+				Size=12
+			END_OBJECT=Dimension_3
+			OBJECT=Dimension_4
+				DimensionName="CoarseCloudLayer"
+				Size=3
+			END_OBJECT=Dimension_4
+			OBJECT=Dimension_5
+				DimensionName="FineCloudLayer"
+				Size=12
+			END_OBJECT=Dimension_5
+			OBJECT=Dimension_6
+				DimensionName="EmisFreqMW"
+				Size=3
+			END_OBJECT=Dimension_6
+		END_GROUP=Dimension
+		GROUP=DataField
+			OBJECT=DataField_1
+				DataFieldName="TotalCounts_MW_A"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_1
+			OBJECT=DataField_2
+				DataFieldName="Emis_MW_A"
+				DataType=DFNT_FLOAT32
+				DimList=("EmisFreqMW","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_2
+			OBJECT=DataField_3
+				DataFieldName="Emis_MW_A_ct"
+				DataType=DFNT_INT16
+				DimList=("EmisFreqMW","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_3
+			OBJECT=DataField_4
+				DataFieldName="Emis_MW_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("EmisFreqMW","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_4
+			OBJECT=DataField_5
+				DataFieldName="Emis_MW_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("EmisFreqMW","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_5
+			OBJECT=DataField_6
+				DataFieldName="Emis_MW_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("EmisFreqMW","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_6
+			OBJECT=DataField_7
+				DataFieldName="Temperature_MW_A"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_7
+			OBJECT=DataField_8
+				DataFieldName="Temperature_MW_A_ct"
+				DataType=DFNT_INT16
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_8
+			OBJECT=DataField_9
+				DataFieldName="Temperature_MW_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_9
+			OBJECT=DataField_10
+				DataFieldName="Temperature_MW_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_10
+			OBJECT=DataField_11
+				DataFieldName="Temperature_MW_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_11
+			OBJECT=DataField_12
+				DataFieldName="TotH2OVap_MW_A"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_12
+			OBJECT=DataField_13
+				DataFieldName="TotH2OVap_MW_A_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_13
+			OBJECT=DataField_14
+				DataFieldName="TotH2OVap_MW_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_14
+			OBJECT=DataField_15
+				DataFieldName="TotH2OVap_MW_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_15
+			OBJECT=DataField_16
+				DataFieldName="TotH2OVap_MW_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_16
+			OBJECT=DataField_17
+				DataFieldName="GPHeight_MW_A"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_17
+			OBJECT=DataField_18
+				DataFieldName="GPHeight_MW_A_ct"
+				DataType=DFNT_INT16
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_18
+			OBJECT=DataField_19
+				DataFieldName="GPHeight_MW_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_19
+			OBJECT=DataField_20
+				DataFieldName="GPHeight_MW_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_20
+			OBJECT=DataField_21
+				DataFieldName="GPHeight_MW_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_21
+			OBJECT=DataField_22
+				DataFieldName="TotCldLiqH2O_MW_A"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_22
+			OBJECT=DataField_23
+				DataFieldName="TotCldLiqH2O_MW_A_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_23
+			OBJECT=DataField_24
+				DataFieldName="TotCldLiqH2O_MW_A_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_24
+			OBJECT=DataField_25
+				DataFieldName="TotCldLiqH2O_MW_A_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_25
+			OBJECT=DataField_26
+				DataFieldName="TotCldLiqH2O_MW_A_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_26
+			OBJECT=DataField_27
+				DataFieldName="TotCldLiqH2O_MW_A_err"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_27
+		END_GROUP=DataField
+		GROUP=MergedFields
+		END_GROUP=MergedFields
+	END_GROUP=GRID_5
+	GROUP=GRID_6
+		GridName="descending_MW_only"
+		XDim=360
+		YDim=180
+		UpperLeftPointMtrs=(-179030000.000000,89030000.000000)
+		LowerRightMtrs=(180030000.000000,-90030000.000000)
+		Projection=GCTP_GEO
+		GROUP=Dimension
+			OBJECT=Dimension_1
+				DimensionName="StdPressureLev"
+				Size=24
+			END_OBJECT=Dimension_1
+			OBJECT=Dimension_2
+				DimensionName="H2OPressureLev"
+				Size=12
+			END_OBJECT=Dimension_2
+			OBJECT=Dimension_3
+				DimensionName="H2OPressureLay"
+				Size=12
+			END_OBJECT=Dimension_3
+			OBJECT=Dimension_4
+				DimensionName="CoarseCloudLayer"
+				Size=3
+			END_OBJECT=Dimension_4
+			OBJECT=Dimension_5
+				DimensionName="FineCloudLayer"
+				Size=12
+			END_OBJECT=Dimension_5
+			OBJECT=Dimension_6
+				DimensionName="EmisFreqMW"
+				Size=3
+			END_OBJECT=Dimension_6
+		END_GROUP=Dimension
+		GROUP=DataField
+			OBJECT=DataField_1
+				DataFieldName="TotalCounts_MW_D"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_1
+			OBJECT=DataField_2
+				DataFieldName="Emis_MW_D"
+				DataType=DFNT_FLOAT32
+				DimList=("EmisFreqMW","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_2
+			OBJECT=DataField_3
+				DataFieldName="Emis_MW_D_ct"
+				DataType=DFNT_INT16
+				DimList=("EmisFreqMW","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_3
+			OBJECT=DataField_4
+				DataFieldName="Emis_MW_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("EmisFreqMW","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_4
+			OBJECT=DataField_5
+				DataFieldName="Emis_MW_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("EmisFreqMW","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_5
+			OBJECT=DataField_6
+				DataFieldName="Emis_MW_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("EmisFreqMW","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_6
+			OBJECT=DataField_7
+				DataFieldName="Temperature_MW_D"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_7
+			OBJECT=DataField_8
+				DataFieldName="Temperature_MW_D_ct"
+				DataType=DFNT_INT16
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_8
+			OBJECT=DataField_9
+				DataFieldName="Temperature_MW_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_9
+			OBJECT=DataField_10
+				DataFieldName="Tempe</Value>
+  </Attribute>
+  <Attribute name="StructMetadata_5" type="String">
+    <Value>rature_MW_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_10
+			OBJECT=DataField_11
+				DataFieldName="Temperature_MW_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_11
+			OBJECT=DataField_12
+				DataFieldName="TotH2OVap_MW_D"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_12
+			OBJECT=DataField_13
+				DataFieldName="TotH2OVap_MW_D_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_13
+			OBJECT=DataField_14
+				DataFieldName="TotH2OVap_MW_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_14
+			OBJECT=DataField_15
+				DataFieldName="TotH2OVap_MW_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_15
+			OBJECT=DataField_16
+				DataFieldName="TotH2OVap_MW_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_16
+			OBJECT=DataField_17
+				DataFieldName="GPHeight_MW_D"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_17
+			OBJECT=DataField_18
+				DataFieldName="GPHeight_MW_D_ct"
+				DataType=DFNT_INT16
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_18
+			OBJECT=DataField_19
+				DataFieldName="GPHeight_MW_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_19
+			OBJECT=DataField_20
+				DataFieldName="GPHeight_MW_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_20
+			OBJECT=DataField_21
+				DataFieldName="GPHeight_MW_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("StdPressureLev","YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_21
+			OBJECT=DataField_22
+				DataFieldName="TotCldLiqH2O_MW_D"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_22
+			OBJECT=DataField_23
+				DataFieldName="TotCldLiqH2O_MW_D_ct"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_23
+			OBJECT=DataField_24
+				DataFieldName="TotCldLiqH2O_MW_D_sdev"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_24
+			OBJECT=DataField_25
+				DataFieldName="TotCldLiqH2O_MW_D_min"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_25
+			OBJECT=DataField_26
+				DataFieldName="TotCldLiqH2O_MW_D_max"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_26
+			OBJECT=DataField_27
+				DataFieldName="TotCldLiqH2O_MW_D_err"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_27
+		END_GROUP=DataField
+		GROUP=MergedFields
+		END_GROUP=MergedFields
+	END_GROUP=GRID_6
+	GROUP=GRID_7
+		GridName="location"
+		XDim=360
+		YDim=180
+		UpperLeftPointMtrs=(-179030000.000000,89030000.000000)
+		LowerRightMtrs=(180030000.000000,-90030000.000000)
+		Projection=GCTP_GEO
+		GROUP=Dimension
+		END_GROUP=Dimension
+		GROUP=DataField
+			OBJECT=DataField_1
+				DataFieldName="Latitude"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_1
+			OBJECT=DataField_2
+				DataFieldName="Longitude"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_2
+			OBJECT=DataField_3
+				DataFieldName="LandSeaMask"
+				DataType=DFNT_INT16
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_3
+			OBJECT=DataField_4
+				DataFieldName="Topography"
+				DataType=DFNT_FLOAT32
+				DimList=("YDim","XDim")
+				CompressionType=HDFE_COMP_DEFLATE
+				DeflateLevel=5
+			END_OBJECT=DataField_4
+		END_GROUP=DataField
+		GROUP=MergedFields
+		END_GROUP=MergedFields
+	END_GROUP=GRID_7
+END_GROUP=GridStructure
+GROUP=PointStructure
+END_GROUP=PointStructure
+END
+</Value>
+  </Attribute>
+  <Attribute name="identifier_product_doi" type="String">
+    <Value>10.5067/AQUA/AIRS/DATA303</Value>
+  </Attribute>
+  <Attribute name="identifier_product_doi_authority" type="String">
+    <Value>http://dx.doi.org/</Value>
+  </Attribute>
+  <Attribute name="coremetadata" type="String">
+    <Value>
+GROUP                  = INVENTORYMETADATA
+  GROUPTYPE            = MASTERGROUP
+
+  GROUP                  = ECSDATAGRANULE
+
+    OBJECT                 = LOCALGRANULEID
+      NUM_VAL              = 1
+      VALUE                = "AIRS.2015.09.21.L3.RetStd_IR001.v6.0.31.0.G15281122640.hdf"
+    END_OBJECT             = LOCALGRANULEID
+
+    OBJECT                 = PRODUCTIONDATETIME
+      NUM_VAL              = 1
+      VALUE                = "2015-10-08T16:26:44.000Z"
+    END_OBJECT             = PRODUCTIONDATETIME
+
+    OBJECT                 = LOCALVERSIONID
+      NUM_VAL              = 1
+      VALUE                = "Unspecified"
+    END_OBJECT             = LOCALVERSIONID
+
+  END_GROUP              = ECSDATAGRANULE
+
+  GROUP                  = MEASUREDPARAMETER
+
+    OBJECT                 = MEASUREDPARAMETERCONTAINER
+      CLASS                = "1"
+
+      GROUP                  = QAFLAGS
+        CLASS                = "1"
+
+        OBJECT                 = AUTOMATICQUALITYFLAGEXPLANATION
+          NUM_VAL              = 1
+          CLASS                = "1"
+          VALUE                = "Based on percentage of product that is good. Suspect used where true quality is not known."
+        END_OBJECT             = AUTOMATICQUALITYFLAGEXPLANATION
+
+        OBJECT                 = AUTOMATICQUALITYFLAG
+          NUM_VAL              = 1
+          CLASS                = "1"
+          VALUE                = "Passed"
+        END_OBJECT             = AUTOMATICQUALITYFLAG
+
+      END_GROUP              = QAFLAGS
+
+      GROUP                  = QASTATS
+        CLASS                = "1"
+
+        OBJECT                 = QAPERCENTMISSINGDATA
+          NUM_VAL              = 1
+          CLASS                = "1"
+          VALUE                = 0
+        END_OBJECT             = QAPERCENTMISSINGDATA
+
+      END_GROUP              = QASTATS
+
+      OBJECT                 = PARAMETERNAME
+        CLASS                = "1"
+        NUM_VAL              = 1
+        VALUE                = "Surface Skin Temperature"
+      END_OBJECT             = PARAMETERNAME
+
+    END_OBJECT             = MEASUREDPARAMETERCONTAINER
+
+    OBJECT                 = MEASUREDPARAMETERCONTAINER
+      CLASS                = "2"
+
+      GROUP                  = QAFLAGS
+        CLASS                = "2"
+
+        OBJECT                 = AUTOMATICQUALITYFLAGEXPLANATION
+          NUM_VAL              = 1
+          CLASS                = "2"
+          VALUE                = "Based on percentage of product that is good. Suspect used where true quality is not known."
+        END_OBJECT             = AUTOMATICQUALITYFLAGEXPLANATION
+
+        OBJECT                 = AUTOMATICQUALITYFLAG
+          NUM_VAL              = 1
+          CLASS                = "2"
+          VALUE                = "Passed"
+        END_OBJECT             = AUTOMATICQUALITYFLAG
+
+      END_GROUP              = QAFLAGS
+
+      GROUP                  = QASTATS
+        CLASS                = "2"
+
+        OBJECT                 = QAPERCENTMISSINGDATA
+          NUM_VAL              = 1
+          CLASS                = "2"
+          VALUE                = 0
+        END_OBJECT             = QAPERCENTMISSINGDATA
+
+      END_GROUP              = QASTATS
+
+      OBJECT                 = PARAMETERNAME
+        CLASS                = "2"
+        NUM_VAL              = 1
+        VALUE                = "Surface Air Temperature"
+      END_OBJECT             = PARAMETERNAME
+
+    END_OBJECT             = MEASUREDPARAMETERCONTAINER
+
+    OBJECT                 = MEASUREDPARAMETERCONTAINER
+      CLASS                = "3"
+
+      GROUP                  = QAFLAGS
+        CLASS                = "3"
+
+        OBJECT                 = AUTOMATICQUALITYFLAGEXPLANATION
+          NUM_VAL              = 1
+          CLASS                = "3"
+          VALUE                = "Based on percentage of product that is good. Suspect used where true quality is not known."
+        END_OBJECT             = AUTOMATICQUALITYFLAGEXPLANATION
+
+        OBJECT                 = AUTOMATICQUALITYFLAG
+          NUM_VAL              = 1
+          CLASS                = "3"
+          VALUE                = "Passed"
+        END_OBJECT             = AUTOMATICQUALITYFLAG
+
+      END_GROUP              = QAFLAGS
+
+      GROUP                  = QASTATS
+        CLASS                = "3"
+
+        OBJECT                 = QAPERCENTMISSINGDATA
+          NUM_VAL              = 1
+          CLASS                = "3"
+          VALUE                = 0
+        END_OBJECT             = QAPERCENTMISSINGDATA
+
+      END_GROUP              = QASTATS
+
+      OBJECT                 = PARAMETERNAME
+        CLASS                = "3"
+        NUM_VAL              = 1
+        VALUE                = "Atmospheric Temperature"
+      END_OBJECT             = PARAMETERNAME
+
+    END_OBJECT             = MEASUREDPARAMETERCONTAINER
+
+    OBJECT                 = MEASUREDPARAMETERCONTAINER
+      CLASS                = "4"
+
+      GROUP                  = QAFLAGS
+        CLASS                = "4"
+
+        OBJECT                 = AUTOMATICQUALITYFLAGEXPLANATION
+          NUM_VAL              = 1
+          CLASS                = "4"
+          VALUE                = "Based on percentage of product that is good. Suspect used where true quality is not known."
+        END_OBJECT             = AUTOMATICQUALITYFLAGEXPLANATION
+
+        OBJECT                 = AUTOMATICQUALITYFLAG
+          NUM_VAL              = 1
+          CLASS                = "4"
+          VALUE                = "Passed"
+        END_OBJECT             = AUTOMATICQUALITYFLAG
+
+      END_GROUP              = QAFLAGS
+
+      GROUP                  = QASTATS
+        CLASS                = "4"
+
+        OBJECT                 = QAPERCENTMISSINGDATA
+          NUM_VAL              = 1
+          CLASS                = "4"
+          VALUE                = 0
+        END_OBJECT             = QAPERCENTMISSINGDATA
+
+      END_GROUP              = QASTATS
+
+      OBJECT                 = PARAMETERNAME
+        CLASS                = "4"
+        NUM_VAL              = 1
+        VALUE                = "Water Vapor Mass Mixing Ratio"
+      END_OBJECT             = PARAMETERNAME
+
+    END_OBJECT             = MEASUREDPARAMETERCONTAINER
+
+    OBJECT                 = MEASUREDPARAMETERCONTAINER
+      CLASS                = "5"
+
+      GROUP                  = QAFLAGS
+        CLASS                = "5"
+
+        OBJECT                 = AUTOMATICQUALITYFLAGEXPLANATION
+          NUM_VAL              = 1
+          CLASS                = "5"
+          VALUE                = "Based on percentage of product that is good. Suspect used where true quality is not known."
+        END_OBJECT             = AUTOMATICQUALITYFLAGEXPLANATION
+
+        OBJECT                 = AUTOMATICQUALITYFLAG
+          NUM_VAL              = 1
+          CLASS                = "5"
+          VALUE                = "Passed"
+        END_OBJECT             = AUTOMATICQUALITYFLAG
+
+      END_GROUP              = QAFLAGS
+
+      GROUP                  = QASTATS
+        CLASS                = "5"
+
+        OBJECT                 = QAPERCENTMISSINGDATA
+          NUM_VAL              = 1
+          CLASS                = "5"
+          VALUE                = 0
+        END_OBJECT             = QAPERCENTMISSINGDATA
+
+      END_GROUP              = QASTATS
+
+      OBJECT                 = PARAMETERNAME
+        CLASS                = "5"
+        NUM_VAL              = 1
+        VALUE                = "Total Precipitable Water Vapor"
+      END_OBJECT             = PARAMETERNAME
+
+    END_OBJECT             = MEASUREDPARAMETERCONTAINER
+
+    OBJECT                 = MEASUREDPARAMETERCONTAINER
+      CLASS                = "6"
+
+      GROUP                  = QAFLAGS
+        CLASS                = "6"
+
+        OBJECT                 = AUTOMATICQUALITYFLAGEXPLANATION
+          NUM_VAL              = 1
+          CLASS                = "6"
+          VALUE                = "Based on percentage of product that is good. Suspect used where true quality is not known."
+        END_OBJECT             = AUTOMATICQUALITYFLAGEXPLANATION
+
+        OBJECT                 = AUTOMATICQUALITYFLAG
+          NUM_VAL              = 1
+          CLASS                = "6"
+          VALUE                = "Passed"
+        END_OBJECT             = AUTOMATICQUALITYFLAG
+
+      END_GROUP              = QAFLAGS
+
+      GROUP                  = QASTATS
+        CLASS                = "6"
+
+        OBJECT                 = QAPERCENTMISSINGDATA
+          NUM_VAL              = 1
+          CLASS                = "6"
+          VALUE                = 0
+        END_OBJECT             = QAPERCENTMISSINGDATA
+
+      END_GROUP              = QASTATS
+
+      OBJECT                 = PARAMETERNAME
+        CLASS                = "6"
+        NUM_VAL              = 1
+        VALUE                = "Ozone Volume Mixing Ratio"
+      END_OBJECT             = PARAMETERNAME
+
+    END_OBJECT             = MEASUREDPARAMETERCONTAINER
+
+    OBJECT                 = MEASUREDPARAMETERCONTAINER
+      CLASS                = "7"
+
+      GROUP                  = QAFLAGS
+        CLASS                = "7"
+
+        OBJECT                 = AUTOMATICQUALITYFLAGEXPLANATION
+          NUM_VAL              = 1
+          CLASS                = "7"
+          VALUE                = "Based on percentage of product that is good. Suspect used where true quality is not known."
+        END_OBJECT             = AUTOMATICQUALITYFLAGEXPLANATION
+
+        OBJECT                 = AUTOMATICQUALITYFLAG
+          NUM_VAL              = 1
+          CLASS                = "7"
+          VALUE                = "Passed"
+        END_OBJECT             = AUTOMATICQUALITYFLAG
+
+      END_GROUP              = QAFLAGS
+
+      GROUP                  = QASTATS
+        CLASS                = "7"
+
+        OBJECT                 = QAPERCENTMISSINGDATA
+          NUM_VAL              = 1
+          CLASS                = "7"
+          VALUE                = 0
+        END_OBJECT             = QAPERCENTMISSINGDATA
+
+      END_GROUP              = QASTATS
+
+      OBJECT                 = PARAMETERNAME
+        CLASS                = "7"
+        NUM_VAL              = 1
+        VALUE                = "Total Ozone Burden"
+      END_OBJECT             = PARAMETERNAME
+
+    END_OBJECT             = MEASUREDPARAMETERCONTAINER
+
+    OBJECT                 = MEASUREDPARAMETERCONTAINER
+      CLASS                = "8"
+
+      GROUP                  = QAFLAGS
+        CLASS                = "8"
+
+        OBJECT                 = AUTOMATICQUALITYFLAGEXPLANATION
+          NUM_VAL              = 1
+          CLASS                = "8"
+          VALUE                = "Based on percentage of product that is good. Suspect used where true quality is not known."
+        END_OBJECT             = AUTOMATICQUALITYFLAGEXPLANATION
+
+        OBJECT                 = AUTOMATICQUALITYFLAG
+          NUM_VAL              = 1
+          CLASS                = "8"
+          VALUE                = "Passed"
+        END_OBJECT             = AUTOMATICQUALITYFLAG
+
+      END_GROUP              = QAFLAGS
+
+      GROUP                  = QASTATS
+        CLASS                = "8"
+
+        OBJECT                 = QAPERCENTMISSINGDATA
+          NUM_VAL              = 1
+          CLASS                = "8"
+          VALUE                = 0
+        END_OBJECT             = QAPERCENTMISSINGDATA
+
+      END_GROUP              = QASTATS
+
+      OBJECT                 = PARAMETERNAME
+        CLASS                = "8"
+        NUM_VAL              = 1
+        VALUE                = "Spectral IR Surface Emissivities"
+      END_OBJECT             = PARAMETERNAME
+
+    END_OBJECT             = MEASUREDPARAMETERCONTAINER
+
+    OBJECT                 = MEASUREDPARAMETERCONTAINER
+      CLASS                = "9"
+
+      GROUP                  = QAFLAGS
+        CLASS                = "9"
+
+        OBJECT                 = AUTOMATICQUALITYFLAGEXPLANATION
+          NUM_VAL              = 1
+          CLASS                = "9"
+          VALUE                = "Based on percentage of product that is good. Suspect used where true quality is not known."
+        END_OBJECT             = AUTOMATICQUALITYFLAGEXPLANATION
+
+        OBJECT                 = AUTOMATICQUALITYFLAG
+          NUM_VAL              = 1
+          CLASS                = "9"
+          VALUE                = "Passed"
+        END_OBJECT             = AUTOMATICQUALITYFLAG
+
+      END_GROUP              = QAFLAGS
+
+      GROUP                  = QASTATS
+        CLASS                = "9"
+
+        OBJECT                 = QAPERCENTMISSINGDATA
+          NUM_VAL              = 1
+          CLASS                = "9"
+          VALUE                = 0
+        END_OBJECT             = QAPERCENTMISSINGDATA
+
+      END_GROUP              = QASTATS
+
+      OBJECT                 = PARAMETERNAME
+        CLASS                = "9"
+        NUM_VAL              = 1
+        VALUE                = "Spectral IR Surf Bidirect Reflectivity"
+      END_OBJECT             = PARAMETERNAME
+
+    END_OBJECT             = MEASUREDPARAMETERCONTAINER
+
+    OBJECT                 = MEASUREDPARAMETERCONTAINER
+      CLASS                = "10"
+
+      GROUP                  = QAFLAGS
+        CLASS                = "10"
+
+        OBJECT                 = AUTOMATICQUALITYFLAGEXPLANATION
+          NUM_VAL              = 1
+          CLASS                = "10"
+          VALUE                = "Based on percentage of product that is good. Suspect used where true quality is not known."
+        END_OBJECT             = AUTOMATICQUALITYFLAGEXPLANATION
+
+        OBJECT                 = AUTOMATICQUALITYFLAG
+          NUM_VAL              = 1
+          CLASS                = "10"
+          VALUE                = "Passed"
+        END_OBJECT             = AUTOMATICQUALITYFLAG
+
+      END_GROUP              = QAFLAGS
+
+      GROUP                  = QASTATS
+        CLASS                = "10"
+
+        OBJECT                 = QAPERCENTMISSINGDATA
+          NUM_VAL              = 1
+          CLASS                = "10"
+          VALUE                = 0
+        END_OBJECT             = QAPERCENTMISSINGDATA
+
+      END_GROUP              = QASTATS
+
+      OBJECT                 = PARAMETERNAME
+        CLASS                = "10"
+        NUM_VAL              = 1
+        VALUE                = "MW Surface Brightness"
+      END_OBJECT             = PARAMETERNAME
+
+    END_OBJECT             = MEASUREDPARAMETERCONTAINER
+
+    OBJECT                 = MEASUREDPARAMETERCONTAINER
+      CLASS                = "11"
+
+      GROUP                  = QAFLAGS
+        CLASS                = "11"
+
+        OBJECT                 = AUTOMATICQUALITYFLAGEXPLANATION
+          NUM_VAL              = 1
+          CLASS                = "11"
+          VALUE                = "Based on percentage of product that is good. Suspect used where true quality is not known."
+        END_OBJECT             = AUTOMATICQUALITYFLAGEXPLANATION
+
+        OBJECT                 = AUTOMATICQUALITYFLAG
+          NUM_VAL              = 1
+          CLASS                = "11"
+          VALUE                = "Passed"
+        END_OBJECT             = AUTOMATICQUALITYFLAG
+
+      END_GROUP              = QAFLAGS
+
+      GROUP                  = QASTATS
+        CLASS                = "11"
+
+        OBJECT                 = QAPERCENTMISSINGDATA
+          NUM_VAL              = 1
+          CLASS                = "11"
+          VALUE                = 0
+        END_OBJECT             = QAPERCENTMISSINGDATA
+
+      END_GROUP              = QASTATS
+
+      OBJECT                 = PARAMETERNAME
+        CLASS                = "11"
+        NUM_VAL              = 1
+        VALUE                = "MW Emissivity"
+      END_OBJECT             = PARAMETERNAME
+
+    END_OBJECT             = MEASUREDPARAMETERCONTAINER
+
+    OBJECT                 = MEASUREDPARAMETERCONTAINER
+      CLASS                = "12"
+
+      GROUP                  = QAFLAGS
+        CLASS                = "12"
+
+        OBJECT                 = AUTOMATICQUALITYFLAGEXPLANATION
+          NUM_VAL              = 1
+          CLASS                = "12"
+          VALUE                = "Based on percentage of product that is good. Suspect used where true quality is not known."
+        END_OBJECT             = AUTOMATICQUALITYFLAGEXPLANATION
+
+        OBJECT                 = AUTOMATICQUALITYFLAG
+          NUM_VAL              = 1
+          CLASS                = "12"
+          VALUE                = "Passed"
+        END_OBJECT             = AUTOMATICQUALITYFLAG
+
+      END_GROUP              = QAFLAGS
+
+      GROUP                  = QASTATS
+        CLASS                = "12"
+
+        OBJECT                 = QAPERCENTMISSINGDATA
+          NUM_VAL              = 1
+          CLASS                = "12"
+          VALUE                = 0
+        END_OBJECT             = QAPERCENTMISSINGDATA
+
+      END_GROUP              = QASTATS
+
+      OBJECT                 = PARAMETERNAME
+        CLASS                = "12"
+        NUM_VAL              = 1
+        VALUE                = "Total Cloud Water"
+      END_OBJECT             = PARAMETERNAME
+
+    END_OBJECT             = MEASUREDPARAMETERCONTAINER
+
+    OBJECT                 = MEASUREDPARAMETERCONTAINER
+      CLASS                = "13"
+
+      GROUP                  = QAFLAGS
+        CLASS                = "13"
+
+        OBJECT                 = AUTOMATICQUALITYFLAGEXPLANATION
+          NUM_VAL              = 1
+          CLASS                = "13"
+          VALUE                = "Based on percentage of product that is good. Suspect used where true quality is not known."
+        END_OBJECT             = AUTOMATICQUALITYFLAGEXPLANATION
+
+        OBJECT                 = AUTOMATICQUALITYFLAG
+          NUM_VAL              = 1
+          CLASS                = "13"
+          VALUE                = "Passed"
+        END_OBJECT             = AUTOMATICQUALITYFLAG
+
+      END_GROUP              = QAFLAGS
+
+      GROUP                  = QASTATS
+        CLASS                = "13"
+
+        OBJECT                 = QAPERCENTMISSINGDATA
+          NUM_VAL              = 1
+          CLASS                = "13"
+          VALUE                = 0
+        END_OBJECT             = QAPERCENTMISSINGDATA
+
+      END_GROUP              = QASTATS
+
+      OBJECT                 = PARAMETERNAME
+        CLASS                = "13"
+        NUM_VAL              = 1
+        VALUE                = "Cloud Top Temperature"
+      END_OBJECT             = PARAMETERNAME
+
+    END_OBJECT             = MEASUREDPARAMETERCONTAINER
+
+    OBJECT                 = MEASUREDPARAMETERCONTAINER
+      CLASS                = "14"
+
+      GROUP                  = QAFLAGS
+        CLASS                = "14"
+
+        OBJECT                 = AUTOMATICQUALITYFLAGEXPLANATION
+          NUM_VAL              = 1
+          CLASS                = "14"
+          VALUE                = "Based on percentage of product that is good. Suspect used where true quality is not known."
+        END_OBJECT             = AUTOMATICQUALITYFLAGEXPLANATION
+
+        OBJECT                 = AUTOMATICQUALITYFLAG
+          NUM_VAL              = 1
+          CLASS                = "14"
+          VALUE                = "Passed"
+        END_OBJECT             = AUTOMATICQUALITYFLAG
+
+      END_GROUP              = QAFLAGS
+
+      GROUP                  = QASTATS
+        CLASS                = "14"
+
+        OBJECT                 = QAPERCENTMISSINGDATA
+          NUM_VAL              = 1
+          CLASS                = "14"
+          VALUE                = 0
+        END_OBJECT             = QAPERCENTMISSINGDATA
+
+      END_GROUP              = QASTATS
+
+      OBJECT                 = PARAMETERNAME
+        CLASS                = "14"
+        NUM_VAL              = 1
+        VALUE                = "Cloud Top Pressure"
+      END_OBJECT             = PARAMETERNAME
+
+    END_OBJECT             = MEASUREDPARAMETERCONTAINER
+
+    OBJECT                 = MEASUREDPARAMETERCONTAINER
+      CLASS                = "15"
+
+      GROUP                  = QAFLAGS
+        CLASS                = "15"
+
+        OBJECT                 = AUTOMATICQUALITYFLAGEXPLANATION
+          NUM_VAL              = 1
+          CLASS                = "15"
+          VALUE                = "Based on percentage of product that is good. Suspect used where true quality is not known."
+        END_OBJECT             = AUTOMATICQUALITYFLAGEXPLANATION
+
+        OBJECT                 = AUTOMATICQUALITYFLAG
+          NUM_VAL              = 1
+          CLASS                = "15"
+          VALUE                = "Passed"
+        END_OBJECT             = AUTOMATICQUALITYFLAG
+
+      END_GROUP              = QAFLAGS
+
+      GROUP                  = QASTATS
+        CLASS                = "15"
+
+        OBJECT                 = QAPERCENTMISSINGDATA
+          NUM_VAL              = 1
+          CLASS                = "15"
+          VALUE                = 0
+        END_OBJECT             = QAPERCENTMISSINGDATA
+
+      END_GROUP              = QASTATS
+
+      OBJECT                 = PARAMETERNAME
+        CLASS                = "15"
+        NUM_VAL              = 1
+        VALUE                = "Effective Cloud Fraction"
+      END_OBJECT             = PARAMETERNAME
+
+    END_OBJECT             = MEASUREDPARAMETERCONTAINER
+
+    OBJECT                 = MEASUREDPARAMETERCONTAINER
+      CLASS                = "16"
+
+      GROUP                  = QAFLAGS
+        CLASS                = "16"
+
+        OBJECT                 = AUTOMATICQUALITYFLAGEXPLANATION
+          NUM_VAL              = 1
+          CLASS                = "16"
+          VALUE                = "Based on percentage of product that is good. Suspect used where true quality is not known."
+        END_OBJECT             = AUTOMATICQUALITYFLAGEXPLANATION
+
+        OBJECT                 = AUTOMATICQUALITYFLAG
+          NUM_VAL              = 1
+          CLASS                = "16"
+          VALUE                = "Passed"
+        END_OBJECT             = AUTOMATICQUALITYFLAG
+
+      END_GROUP              = QAFLAGS
+
+      GROUP                  = QASTATS
+        CLASS                = "16"
+
+        OBJECT                 = QAPERCENTMISSINGDATA
+          NUM_VAL              = 1
+          CLASS                = "16"
+          VALUE                = 0
+        END_OBJECT             = QAPERCENTMISSINGDATA
+
+      END_GROUP              = QASTATS
+
+      OBJECT                 = PARAMETERNAME
+        CLASS                = "16"
+        NUM_VAL              = 1
+        VALUE                = "Geopotential Heights"
+      END_OBJECT             = PARAMETERNAME
+
+    END_OBJECT             = MEASUREDPARAMETERCONTAINER
+
+    OBJECT                 = MEASUREDPARAMETERCONTAINER
+      CLASS                = "17"
+
+      GROUP                  = QAFLAGS
+        CLASS                = "17"
+
+        OBJECT                 = AUTOMATICQUALITYFLAGEXPLANATION
+          NUM_VAL              = 1
+          CLASS                = "17"
+          VALUE                = "Based on percentage of product that is good. Suspect used where true quality is not known."
+        END_OBJECT             = AUTOMATICQUALITYFLAGEXPLANATION
+
+        OBJECT                 = AUTOMATICQUALITYFLAG
+          NUM_VAL              = 1
+          CLASS                = "17"
+          VALUE                = "Passed"
+        END_OBJECT             = AUTOMATICQUALITYFLAG
+
+      END_GROUP              = QAFLAGS
+
+      GROUP                  = QASTATS
+        CLASS                = "17"
+
+        OBJECT                 = QAPERCENTMISSINGDATA
+          NUM_VAL              = 1
+          CLASS                = "17"
+          VALUE                = 0
+        END_OBJECT             = QAPERCENTMISSINGDATA
+
+      END_GROUP              = QASTATS
+
+      OBJECT                 = PARAMETERNAME
+        CLASS                = "17"
+        NUM_VAL              = 1
+        VALUE                = "Geopotential Height of Surface"
+      END_OBJECT             = PARAMETERNAME
+
+    END_OBJECT             = MEASUREDPARAMETERCONTAINER
+
+  END_GROUP              = MEASUREDPARAMETER
+
+  GROUP                  = COLLECTIONDESCRIPTIONCLASS
+
+    OBJECT                 = VERSIONID
+      NUM_VAL              = 1
+      VALUE                = 6
+    END_OBJECT             = VERSIONID
+
+    OBJECT                 = SHORTNAME
+      NUM_VAL              = 1
+      VALUE                = "AIRS3STD"
+    END_OBJECT             = SHORTNAME
+
+  END_GROUP              = COLLECTIONDESCRIPTIONCLASS
+
+  GROUP                  = INPUTGRANULE
+
+    OBJECT                 = INPUTPOINTER
+      NUM_VAL              = 650
+      VALUE                = ("L3h.land_sea_mask_1x1.v2.0.0.anc", "ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.055.L2.RetStd_IR.v6.0.31.0.G15263162608.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.056.L2.RetStd_IR.v6.0.31.0.G15263161857.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.057.L2.RetStd_IR.v6.0.31.0.G15263162616.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.058.L2.RetStd_IR.v6.0.31.0.G15263162458.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.059.L2.RetStd_IR.v6.0.31.0.G15263161800.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.060.L2.RetStd_IR.v6.0.31.0.G15263162729.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.061.L2.RetStd_IR.v6.0.31.0.G15263163911.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.062.L2.RetStd_IR.v6.0.31.0.G15263163132.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.063.L2.RetStd_IR.v6.0.31.0.G15263164255.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.064.L2.RetStd_IR.v6.0.31.0.G15263164338.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.065.L2.RetStd_IR.v6.0.31.0.G15263163544.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.066.L2.RetStd_IR.v6.0.31.0.G15263164213.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.067.L2.RetStd_IR.v6.0.31.0.G15263163338.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.068.L2.RetStd_IR.v6.0.31.0.G15263163404.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.069.L2.RetStd_IR.v6.0.31.0.G15263164059.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.070.L2.RetStd_IR.v6.0.31.0.G15263163928.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.071.L2.RetStd_IR.v6.0.31.0.G15263165529.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.072.L2.RetStd_IR.v6.0.31.0.G15263165446.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.073.L2.RetStd_IR.v6.0.31.0.G15263165537.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.074.L2.RetStd_IR.v6.0.31.0.G15263165636.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.075.L2.RetStd_IR.v6.0.31.0.G15263165715.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.076.L2.RetStd_IR.v6.0.31.0.G15263165738.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.077.L2.RetStd_IR.v6.0.31.0.G15263165605.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.078.L2.RetStd_IR.v6.0.31.0.G15263164634.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.079.L2.RetStd_IR.v6.0.31.0.G15263164723.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.080.L2.RetStd_IR.v6.0.31.0.G15263165851.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.081.L2.RetStd_IR.v6.0.31.0.G15263170554.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.082.L2.RetStd_IR.v6.0.31.0.G15263171248.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.083.L2.RetStd_IR.v6.0.31.0.G15263171159.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.084.L2.RetStd_IR.v6.0.31.0.G15263170952.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.085.L2.RetStd_IR.v6.0.31.0.G15263170426.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.086.L2.RetStd_IR.v6.0.31.0.G15263171108.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.087.L2.RetStd_IR.v6.0.31.0.G15263170807.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.088.L2.RetStd_IR.v6.0.31.0.G15263170314.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.089.L2.RetStd_IR.v6.0.31.0.G15263170928.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.090.L2.RetStd_IR.v6.0.31.0.G15263170449.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.091.L2.RetStd_IR.v6.0.31.0.G15263171947.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.092.L2.RetStd_IR.v6.0.31.0.G15263172612.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.093.L2.RetStd_IR.v6.0.31.0.G15263172002.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.094.L2.RetStd_IR.v6.0.31.0.G15263172302.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.095.L2.RetStd_IR.v6.0.31.0.G15263171935.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.096.L2.RetStd_IR.v6.0.31.0.G15263172633.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.097.L2.RetStd_IR.v6.0.31.0.G15263172038.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.098.L2.RetStd_IR.v6.0.31.0.G15263172555.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.099.L2.RetStd_IR.v6.0.31.0.G15264140454.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.100.L2.RetStd_IR.v6.0.31.0.G15264140947.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.101.L2.RetStd_IR.v6.0.31.0.G15264140931.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.102.L2.RetStd_IR.v6.0.31.0.G15264141022.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.103.L2.RetStd_IR.v6.0.31.0.G15264140649.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.104.L2.RetStd_IR.v6.0.31.0.G15264150851.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.105.L2.RetStd_IR.v6.0.31.0.G15264152314.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.106.L2.RetStd_IR.v6.0.31.0.G15264121656.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.107.L2.RetStd_IR.v6.0.31.0.G15264121515.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.108.L2.RetStd_IR.v6.0.31.0.G15264121538.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.109.L2.RetStd_IR.v6.0.31.0.G15264121635.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.110.L2.RetStd_IR.v6.0.31.0.G15264121444.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.111.L2.RetStd_IR.v6.0.31.0.G15264110959.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.112.L2.RetStd_IR.v6.0.31.0.G15264111443.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.113.L2.RetStd_IR.v6.0.31.0.G15264111813.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.114.L2.RetStd_IR.v6.0.31.0.G15264111830.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.115.L2.RetStd_IR.v6.0.31.0.G15264111625.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.116.L2.RetStd_IR.v6.0.31.0.G15264111845.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.117.L2.RetStd_IR.v6.0.31.0.G15264111705.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.118.L2.RetStd_IR.v6.0.31.0.G15264111823.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.119.L2.RetStd_IR.v6.0.31.0.G15264140806.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.120.L2.RetStd_IR.v6.0.31.0.G15264140243.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.121.L2.RetStd_IR.v6.0.31.0.G15264152348.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.122.L2.RetStd_IR.v6.0.31.0.G15264151230.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.123.L2.RetStd_IR.v6.0.31.0.G15264151136.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.124.L2.RetStd_IR.v6.0.31.0.G15264151240.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.125.L2.RetStd_IR.v6.0.31.0.G15264152439.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.126.L2.RetStd_IR.v6.0.31.0.G15264121621.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.127.L2.RetStd_IR.v6.0.31.0.G15264121202.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.128.L2.RetStd_IR.v6.0.31.0.G15264111319.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.129.L2.RetStd_IR.v6.0.31.0.G15264111643.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.130.L2.RetStd_IR.v6.0.31.0.G15264113517.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.131.L2.RetStd_IR.v6.0.31.0.G15264113614.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.132.L2.RetStd_IR.v6.0.31.0.G15264113506.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.133.L2.RetStd_IR.v6.0.31.0.G15264113518.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.134.L2.RetStd_IR.v6.0.31.0.G15264113449.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.135.L2.RetStd_IR.v6.0.31.0.G15264113326.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.136.L2.RetStd_IR.v6.0.31.0.G15264113242.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.137.L2.RetStd_IR.v6.0.31.0.G15264151152.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.138.L2.RetStd_IR.v6.0.31.0.G15264151306.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.139.L2.RetStd_IR.v6.0.31.0.G15264151253.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.140.L2.RetStd_IR.v6.0.31.0.G15264153726.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.141.L2.RetStd_IR.v6.0.31.0.G15264153417.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.142.L2.RetStd_IR.v6.0.31.0.G15264152741.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.143.L2.RetStd_IR.v6.0.31.0.G15264153225.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.144.L2.RetStd_IR.v6.0.31.0.G15264140145.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.145.L2.RetStd_IR.v6.0.31.0.G15264140717.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.146.L2.RetStd_IR.v6.0.31.0.G15264141114.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.147.L2.RetStd_IR.v6.0.31.0.G15264142809.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.148.L2.RetStd_IR.v6.0.31.0.G15264142745.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.149.L2.RetStd_IR.v6.0.31.0.G15264142733.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.150.L2.RetStd_IR.v6.0.31.0.G15264142738.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.151.L2.RetStd_IR.v6.0.31.0.G15264142636.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.152.L2.RetStd_IR.v6.0.31.0.G15264142403.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.153.L2.RetStd_IR.v6.0.31.0.G15264142345.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.154.L2.RetStd_IR.v6.0.31.0.G15264153842.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.155.L2.RetStd_IR.v6.0.31.0.G15264153527.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.156.L2.RetStd_IR.v6.0.31.0.G15264153511.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.157.L2.RetStd_IR.v6.0.31.0.G15264153503.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.158.L2.RetStd_IR.v6.0.31.0.G15264153446.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.159.L2.RetStd_IR.v6.0.31.0.G15264153805.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.160.L2.RetStd_IR.v6.0.31.0.G15264153235.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.161.L2.RetStd_IR.v6.0.31.0.G15264142120.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.162.L2.RetStd_IR.v6.0.31.0.G15264142645.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.163.L2.RetStd_IR.v6.0.31.0.G15264142737.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.164.L2.RetStd_IR.v6.0.31.0.G15264144519.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.165.L2.RetStd_IR.v6.0.31.0.G15264144449.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.166.L2.RetStd_IR.v6.0.31.0.G15264144412.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.167.L2.RetStd_IR.v6.0.31.0.G15264144427.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.168.L2.RetStd_IR.v6.0.31.0.G15264144337.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.169.L2.RetStd_IR.v6.0.31.0.G15264143438.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.170.L2.RetStd_IR.v6.0.31.0.G15264154512.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.171.L2.RetStd_IR.v6.0.31.0.G15264154539.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.172.L2.RetStd_IR.v6.0.31.0.G15264154617.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.173.L2.RetStd_IR.v6.0.31.0.G15264154558.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.174.L2.RetStd_IR.v6.0.31.0.G15264155529.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.175.L2.RetStd_IR.v6.0.31.0.G15264155900.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.176.L2.RetStd_IR.v6.0.31.0.G15264160235.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.177.L2.RetStd_IR.v6.0.31.0.G15264153353.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.178.L2.RetStd_IR.v6.0.31.0.G15264153735.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.179.L2.RetStd_IR.v6.0.31.0.G15264150440.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.180.L2.RetStd_IR.v6.0.31.0.G15264145441.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.181.L2.RetStd_IR.v6.0.31.0.G15264145506.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.182.L2.RetStd_IR.v6.0.31.0.G15264150515.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.183.L2.RetStd_IR.v6.0.31.0.G15264154526.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.184.L2.RetStd_IR.v6.0.31.0.G15264154655.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.185.L2.RetStd_IR.v6.0.31.0.G15264154558.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.186.L2.RetStd_IR.v6.0.31.0.G15264155623.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.187.L2.RetStd_IR.v6.0.31.0.G15264160155.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.188.L2.RetStd_IR.v6.0.31.0.G15264161851.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.189.L2.RetStd_IR.v6.0.31.0.G15264161745.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.190.L2.RetStd_IR.v6.0.31.0.G15264161930.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.191.L2.RetStd_IR.v6.0.31.0.G15264161941.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.192.L2.RetStd_IR.v6.0.31.0.G15264162017.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.193.L2.RetStd_IR.v6.0.31.0.G15264161351.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.194.L2.RetStd_IR.v6.0.31.0.G15264160251.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.195.L2.RetStd_IR.v6.0.31.0.G15264155217.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.196.L2.RetStd_IR.v6.0.31.0.G15264160132.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.197.L2.RetStd_IR.v6.0.31.0.G15264160432.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.198.L2.RetStd_IR.v6.0.31.0.G15264155251.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.199.L2.RetStd_IR.v6.0.31.0.G15264161936.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.200.L2.RetStd_IR.v6.0.31.0.G15264161251.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.201.L2.RetStd_IR.v6.0.31.0.G15264161339.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.202.L2.RetStd_IR.v6.0.31.0.G15264161446.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.203.L2.RetStd_IR.v6.0.31.0.G15264162350.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.204.L2.RetStd_IR.v6.0.31.0.G15264162906.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.205.L2.RetStd_IR.v6.0.31.0.G15264163137.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.206.L2.RetStd_IR.v6.0.31.0.G15264163257.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.207.L2.RetStd_IR.v6.0.31.0.G15264163356.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.208.L2.RetStd_IR.v6.0.31.0.G15264163446.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.209.L2.RetStd_IR.v6.0.31.0.G15264162413.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.210.L2.RetStd_IR.v6.0.31.0.G15264162836.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.211.L2.RetStd_IR.v6.0.31.0.G15264163410.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.212.L2.RetStd_IR.v6.0.31.0.G15264162845.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.213.L2.RetStd_IR.v6.0.31.0.G15264163822.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.214.L2.RetStd_IR.v6.0.31.0.G15264164321.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.215.L2.RetStd_IR.v6.0.31.0.G15264164607.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.216.L2.RetStd_IR.v6.0.31.0.G15264164458.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.217.L2.RetStd_IR.v6.0.31.0.G15264164500.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.218.L2.RetStd_IR.v6.0.31.0.G15264164419.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.219.L2.RetStd_IR.v6.0.31.0.G15264164231.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.220.L2.RetStd_IR.v6.0.31.0.G15264164218.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.221.L2.RetStd_IR.v6.0.31.0.G15264163812.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.222.L2.RetStd_IR.v6.0.31.0.G15264164523.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.223.L2.RetStd_IR.v6.0.31.0.G15264165920.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.224.L2.RetStd_IR.v6.0.31.0.G15264170051.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.225.L2.RetStd_IR.v6.0.31.0.G15264165821.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.226.L2.RetStd_IR.v6.0.31.0.G15264165335.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.227.L2.RetStd_IR.v6.0.31.0.G15264165011.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.228.L2.RetStd_IR.v6.0.31.0.G15264165302.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.229.L2.RetStd_IR.v6.0.31.0.G15264170032.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.230.L2.RetStd_IR.v6.0.31.0.G15264170025.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.231.L2.RetStd_IR.v6.0.31.0.G15264165213.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.232.L2.RetStd_IR.v6.0.31.0.G15264170029.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.233.L2.RetStd_IR.v6.0.31.0.G15264170847.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.234.L2.RetStd_IR.v6.0.31.0.G15264171427.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.235.L2.RetStd_IR.v6.0.31.0.G15264171427.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.236.L2.RetStd_IR.v6.0.31.0.G15264170946.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.237.L2.RetStd_IR.v6.0.31.0.G15264171033.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.238.L2.RetStd_IR.v6.0.31.0.G15264171804.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.239.L2.RetStd_IR.v6.0.31.0.G15264171759.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.240.L2.RetStd_IR.v6.0.31.0.G15264171839.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.001.L2.RetStd_IR.v6.0.31.0.G15264172109.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.002.L2.RetStd_IR.v6.0.31.0.G15264171717.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.003.L2.RetStd_IR.v6.0.31.0.G15264171858.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.004.L2.RetStd_IR.v6.0.31.0.G15264172827.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.005.L2.RetStd_IR.v6.0.31.0.G15264174641.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.006.L2.RetStd_IR.v6.0.31.0.G15264173735.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.007.L2.RetStd_IR.v6.0.31.0.G15264174512.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.008.L2.RetStd_IR.v6.0.31.0.G15264174542.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.009.L2.RetStd_IR.v6.0.31.0.G15264174543.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.010.L2.RetStd_IR.v6.0.31.0.G15264174433.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.011.L2.RetStd_IR.v6.0.31.0.G15264174333.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.012.L2.RetStd_IR.v6.0.31.0.G15264184344.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.013.L2.RetStd_IR.v6.0.31.0.G15264184222.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.014.L2.RetStd_IR.v6.0.31.0.G15264183647.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.015.L2.RetStd_IR.v6.0.31.0.G15264184359.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.016.L2.RetStd_IR.v6.0.31.0.G15264184512.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.017.L2.RetStd_IR.v6.0.31.0.G15264184505.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.018.L2.RetStd_IR.v6.0.31.0.G15264183746.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.019.L2.RetStd_IR.v6.0.31.0.G15264184011.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.020.L2.RetStd_IR.v6.0.31.0.G15264173541.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.021.L2.RetStd_IR.v6.0.31.0.G15264174602.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.022.L2.RetStd_IR.v6.0.31.0.G15264173819.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.023.L2.RetStd_IR.v6.0.31.0.G15264175348.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.024.L2.RetStd_IR.v6.0.31.0.G15264180052.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.025.L2.RetStd_IR.v6.0.31.0.G15264175944.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.026.L2.RetStd_IR.v6.0.31.0.G15264144430.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.027.L2.RetStd_IR.v6.0.31.0.G15264143514.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.028.L2.RetStd_IR.v6.0.31.0.G15264150149.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.029.L2.RetStd_IR.v6.0.31.0.G15264183823.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.030.L2.RetStd_IR.v6.0.31.0.G15264184412.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.031.L2.RetStd_IR.v6.0.31.0.G15264190055.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.032.L2.RetStd_IR.v6.0.31.0.G15264185951.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.033.L2.RetStd_IR.v6.0.31.0.G15264190028.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.034.L2.RetStd_IR.v6.0.31.0.G15264190102.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.035.L2.RetStd_IR.v6.0.31.0.G15264185653.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.036.L2.RetStd_IR.v6.0.31.0.G15264175609.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.037.L2.RetStd_IR.v6.0.31.0.G15264175919.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.038.L2.RetStd_IR.v6.0.31.0.G15264180110.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.039.L2.RetStd_IR.v6.0.31.0.G15264175301.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.040.L2.RetStd_IR.v6.0.31.0.G15264180030.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.041.L2.RetStd_IR.v6.0.31.0.G15264180035.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS</Value>
+  </Attribute>
+  <Attribute name="coremetadata_1" type="String">
+    <Value>/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.042.L2.RetStd_IR.v6.0.31.0.G15264175235.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.043.L2.RetStd_IR.v6.0.31.0.G15264181322.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.044.L2.RetStd_IR.v6.0.31.0.G15264180728.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.045.L2.RetStd_IR.v6.0.31.0.G15264185855.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.046.L2.RetStd_IR.v6.0.31.0.G15264185345.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.047.L2.RetStd_IR.v6.0.31.0.G15264185829.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.048.L2.RetStd_IR.v6.0.31.0.G15264185248.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.049.L2.RetStd_IR.v6.0.31.0.G15264185848.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.050.L2.RetStd_IR.v6.0.31.0.G15264190828.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.051.L2.RetStd_IR.v6.0.31.0.G15264191537.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.052.L2.RetStd_IR.v6.0.31.0.G15264191130.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.053.L2.RetStd_IR.v6.0.31.0.G15264181047.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.054.L2.RetStd_IR.v6.0.31.0.G15264181645.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.055.L2.RetStd_IR.v6.0.31.0.G15264180748.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.056.L2.RetStd_IR.v6.0.31.0.G15264181450.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.057.L2.RetStd_IR.v6.0.31.0.G15264181549.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.058.L2.RetStd_IR.v6.0.31.0.G15264180715.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.059.L2.RetStd_IR.v6.0.31.0.G15264181317.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.060.L2.RetStd_IR.v6.0.31.0.G15264181307.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.061.L2.RetStd_IR.v6.0.31.0.G15264182700.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.062.L2.RetStd_IR.v6.0.31.0.G15264191458.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.063.L2.RetStd_IR.v6.0.31.0.G15264191414.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.064.L2.RetStd_IR.v6.0.31.0.G15264190842.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.065.L2.RetStd_IR.v6.0.31.0.G15264190756.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.066.L2.RetStd_IR.v6.0.31.0.G15264191602.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.067.L2.RetStd_IR.v6.0.31.0.G15264191701.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.068.L2.RetStd_IR.v6.0.31.0.G15264191330.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.069.L2.RetStd_IR.v6.0.31.0.G15264192114.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.070.L2.RetStd_IR.v6.0.31.0.G15264192919.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.071.L2.RetStd_IR.v6.0.31.0.G15264193215.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.072.L2.RetStd_IR.v6.0.31.0.G15264193315.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.073.L2.RetStd_IR.v6.0.31.0.G15264192519.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.074.L2.RetStd_IR.v6.0.31.0.G15264192953.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.075.L2.RetStd_IR.v6.0.31.0.G15264192810.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.076.L2.RetStd_IR.v6.0.31.0.G15264192356.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.077.L2.RetStd_IR.v6.0.31.0.G15264193012.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.078.L2.RetStd_IR.v6.0.31.0.G15264194401.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.079.L2.RetStd_IR.v6.0.31.0.G15264194147.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.080.L2.RetStd_IR.v6.0.31.0.G15264194330.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.081.L2.RetStd_IR.v6.0.31.0.G15264194424.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.082.L2.RetStd_IR.v6.0.31.0.G15264194602.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.083.L2.RetStd_IR.v6.0.31.0.G15264194658.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.084.L2.RetStd_IR.v6.0.31.0.G15264194507.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.085.L2.RetStd_IR.v6.0.31.0.G15264194215.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.086.L2.RetStd_IR.v6.0.31.0.G15264192610.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.087.L2.RetStd_IR.v6.0.31.0.G15264194745.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.088.L2.RetStd_IR.v6.0.31.0.G15264194600.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.089.L2.RetStd_IR.v6.0.31.0.G15264195937.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.090.L2.RetStd_IR.v6.0.31.0.G15264195943.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.091.L2.RetStd_IR.v6.0.31.0.G15264195952.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.092.L2.RetStd_IR.v6.0.31.0.G15264195847.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.093.L2.RetStd_IR.v6.0.31.0.G15264195935.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.094.L2.RetStd_IR.v6.0.31.0.G15264195655.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.095.L2.RetStd_IR.v6.0.31.0.G15264195724.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.096.L2.RetStd_IR.v6.0.31.0.G15264195705.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.097.L2.RetStd_IR.v6.0.31.0.G15264195406.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.098.L2.RetStd_IR.v6.0.31.0.G15264195907.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.099.L2.RetStd_IR.v6.0.31.0.G15265122103.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.100.L2.RetStd_IR.v6.0.31.0.G15265122157.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.101.L2.RetStd_IR.v6.0.31.0.G15265121924.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.102.L2.RetStd_IR.v6.0.31.0.G15265111839.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.103.L2.RetStd_IR.v6.0.31.0.G15265112337.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.104.L2.RetStd_IR.v6.0.31.0.G15265112625.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.105.L2.RetStd_IR.v6.0.31.0.G15265112548.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.106.L2.RetStd_IR.v6.0.31.0.G15265112402.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.107.L2.RetStd_IR.v6.0.31.0.G15265112548.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.108.L2.RetStd_IR.v6.0.31.0.G15265112358.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.109.L2.RetStd_IR.v6.0.31.0.G15265112406.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.110.L2.RetStd_IR.v6.0.31.0.G15265112229.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.111.L2.RetStd_IR.v6.0.31.0.G15265121923.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.112.L2.RetStd_IR.v6.0.31.0.G15265122023.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.113.L2.RetStd_IR.v6.0.31.0.G15265122058.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.114.L2.RetStd_IR.v6.0.31.0.G15265122621.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.115.L2.RetStd_IR.v6.0.31.0.G15265122628.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.116.L2.RetStd_IR.v6.0.31.0.G15265122914.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.117.L2.RetStd_IR.v6.0.31.0.G15265122833.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.118.L2.RetStd_IR.v6.0.31.0.G15265112002.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.119.L2.RetStd_IR.v6.0.31.0.G15265112715.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.120.L2.RetStd_IR.v6.0.31.0.G15265114012.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.121.L2.RetStd_IR.v6.0.31.0.G15265114005.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.122.L2.RetStd_IR.v6.0.31.0.G15265113045.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.123.L2.RetStd_IR.v6.0.31.0.G15265113708.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.124.L2.RetStd_IR.v6.0.31.0.G15265113053.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.125.L2.RetStd_IR.v6.0.31.0.G15265113904.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.126.L2.RetStd_IR.v6.0.31.0.G15265113818.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.127.L2.RetStd_IR.v6.0.31.0.G15265113431.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.128.L2.RetStd_IR.v6.0.31.0.G15265124513.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.129.L2.RetStd_IR.v6.0.31.0.G15265124615.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.130.L2.RetStd_IR.v6.0.31.0.G15265124627.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.131.L2.RetStd_IR.v6.0.31.0.G15265124751.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.132.L2.RetStd_IR.v6.0.31.0.G15265124821.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.133.L2.RetStd_IR.v6.0.31.0.G15265123621.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.134.L2.RetStd_IR.v6.0.31.0.G15265124410.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.135.L2.RetStd_IR.v6.0.31.0.G15265112603.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.136.L2.RetStd_IR.v6.0.31.0.G15265114729.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.137.L2.RetStd_IR.v6.0.31.0.G15265115655.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.138.L2.RetStd_IR.v6.0.31.0.G15265115918.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.139.L2.RetStd_IR.v6.0.31.0.G15265115634.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.140.L2.RetStd_IR.v6.0.31.0.G15265114821.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.141.L2.RetStd_IR.v6.0.31.0.G15265115655.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.142.L2.RetStd_IR.v6.0.31.0.G15265115605.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.143.L2.RetStd_IR.v6.0.31.0.G15265114630.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.144.L2.RetStd_IR.v6.0.31.0.G15265124552.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.145.L2.RetStd_IR.v6.0.31.0.G15268100548.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.146.L2.RetStd_IR.v6.0.31.0.G15265123518.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.147.L2.RetStd_IR.v6.0.31.0.G15265124730.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.148.L2.RetStd_IR.v6.0.31.0.G15265125233.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.149.L2.RetStd_IR.v6.0.31.0.G15265132839.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.150.L2.RetStd_IR.v6.0.31.0.G15265132951.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.151.L2.RetStd_IR.v6.0.31.0.G15265125702.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.152.L2.RetStd_IR.v6.0.31.0.G15265130109.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.153.L2.RetStd_IR.v6.0.31.0.G15265130637.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.154.L2.RetStd_IR.v6.0.31.0.G15265130557.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.155.L2.RetStd_IR.v6.0.31.0.G15265130548.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.156.L2.RetStd_IR.v6.0.31.0.G15265130453.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.157.L2.RetStd_IR.v6.0.31.0.G15265130503.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.158.L2.RetStd_IR.v6.0.31.0.G15265130632.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.159.L2.RetStd_IR.v6.0.31.0.G15265130215.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.160.L2.RetStd_IR.v6.0.31.0.G15265131227.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.161.L2.RetStd_IR.v6.0.31.0.G15265134106.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.162.L2.RetStd_IR.v6.0.31.0.G15265133634.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.163.L2.RetStd_IR.v6.0.31.0.G15265133048.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.164.L2.RetStd_IR.v6.0.31.0.G15265133311.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.165.L2.RetStd_IR.v6.0.31.0.G15265133222.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.166.L2.RetStd_IR.v6.0.31.0.G15265134256.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.167.L2.RetStd_IR.v6.0.31.0.G15265133620.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.168.L2.RetStd_IR.v6.0.31.0.G15265130901.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.169.L2.RetStd_IR.v6.0.31.0.G15265131423.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.170.L2.RetStd_IR.v6.0.31.0.G15265131652.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.171.L2.RetStd_IR.v6.0.31.0.G15265131710.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.172.L2.RetStd_IR.v6.0.31.0.G15265131558.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.173.L2.RetStd_IR.v6.0.31.0.G15265130627.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.174.L2.RetStd_IR.v6.0.31.0.G15265131514.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.175.L2.RetStd_IR.v6.0.31.0.G15265131408.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.176.L2.RetStd_IR.v6.0.31.0.G15265131341.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.177.L2.RetStd_IR.v6.0.31.0.G15265133930.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.178.L2.RetStd_IR.v6.0.31.0.G15265134042.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.179.L2.RetStd_IR.v6.0.31.0.G15265135001.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.180.L2.RetStd_IR.v6.0.31.0.G15265134100.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.181.L2.RetStd_IR.v6.0.31.0.G15265135242.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.182.L2.RetStd_IR.v6.0.31.0.G15265135003.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.183.L2.RetStd_IR.v6.0.31.0.G15265134137.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.184.L2.RetStd_IR.v6.0.31.0.G15265135639.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.185.L2.RetStd_IR.v6.0.31.0.G15265140214.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.186.L2.RetStd_IR.v6.0.31.0.G15265134324.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.187.L2.RetStd_IR.v6.0.31.0.G15265134903.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.188.L2.RetStd_IR.v6.0.31.0.G15265140220.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.189.L2.RetStd_IR.v6.0.31.0.G15265135446.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.190.L2.RetStd_IR.v6.0.31.0.G15265140154.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.191.L2.RetStd_IR.v6.0.31.0.G15265140137.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.192.L2.RetStd_IR.v6.0.31.0.G15265135729.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.193.L2.RetStd_IR.v6.0.31.0.G15265140009.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.194.L2.RetStd_IR.v6.0.31.0.G15265140006.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.195.L2.RetStd_IR.v6.0.31.0.G15265135730.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.196.L2.RetStd_IR.v6.0.31.0.G15265140158.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.197.L2.RetStd_IR.v6.0.31.0.G15265140249.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.198.L2.RetStd_IR.v6.0.31.0.G15265141634.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.199.L2.RetStd_IR.v6.0.31.0.G15265141412.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.200.L2.RetStd_IR.v6.0.31.0.G15265140639.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.201.L2.RetStd_IR.v6.0.31.0.G15265140727.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.202.L2.RetStd_IR.v6.0.31.0.G15265141847.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.203.L2.RetStd_IR.v6.0.31.0.G15265141310.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.204.L2.RetStd_IR.v6.0.31.0.G15265141838.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.205.L2.RetStd_IR.v6.0.31.0.G15265141140.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.206.L2.RetStd_IR.v6.0.31.0.G15265141928.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.207.L2.RetStd_IR.v6.0.31.0.G15265141733.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.208.L2.RetStd_IR.v6.0.31.0.G15265143533.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.209.L2.RetStd_IR.v6.0.31.0.G15265142927.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.210.L2.RetStd_IR.v6.0.31.0.G15265143641.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.211.L2.RetStd_IR.v6.0.31.0.G15265143242.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.212.L2.RetStd_IR.v6.0.31.0.G15265143817.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.213.L2.RetStd_IR.v6.0.31.0.G15265143711.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.214.L2.RetStd_IR.v6.0.31.0.G15265143913.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.215.L2.RetStd_IR.v6.0.31.0.G15265144027.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.216.L2.RetStd_IR.v6.0.31.0.G15265142904.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.217.L2.RetStd_IR.v6.0.31.0.G15265142441.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.218.L2.RetStd_IR.v6.0.31.0.G15265144138.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.219.L2.RetStd_IR.v6.0.31.0.G15265144437.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.220.L2.RetStd_IR.v6.0.31.0.G15265143509.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.221.L2.RetStd_IR.v6.0.31.0.G15265143501.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.222.L2.RetStd_IR.v6.0.31.0.G15265144343.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.223.L2.RetStd_IR.v6.0.31.0.G15265143623.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.224.L2.RetStd_IR.v6.0.31.0.G15265144224.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.225.L2.RetStd_IR.v6.0.31.0.G15265144157.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.226.L2.RetStd_IR.v6.0.31.0.G15265144046.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.227.L2.RetStd_IR.v6.0.31.0.G15265143534.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.228.L2.RetStd_IR.v6.0.31.0.G15265145624.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.229.L2.RetStd_IR.v6.0.31.0.G15265145704.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.230.L2.RetStd_IR.v6.0.31.0.G15265145733.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.231.L2.RetStd_IR.v6.0.31.0.G15265145918.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.232.L2.RetStd_IR.v6.0.31.0.G15265145714.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.233.L2.RetStd_IR.v6.0.31.0.G15265144646.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.234.L2.RetStd_IR.v6.0.31.0.G15265145355.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.235.L2.RetStd_IR.v6.0.31.0.G15265145015.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.236.L2.RetStd_IR.v6.0.31.0.G15265150105.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.237.L2.RetStd_IR.v6.0.31.0.G15265145756.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.238.L2.RetStd_IR.v6.0.31.0.G15265151340.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.239.L2.RetStd_IR.v6.0.31.0.G15265151312.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.240.L2.RetStd_IR.v6.0.31.0.G15265150613.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.001.L2.RetStd_IR.v6.0.31.0.G15265151233.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.002.L2.RetStd_IR.v6.0.31.0.G15265150509.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.003.L2.RetStd_IR.v6.0.31.0.G15265150439.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.004.L2.RetStd_IR.v6.0.31.0.G15265151021.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.005.L2.RetStd_IR.v6.0.31.0.G15265151015.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.006.L2.RetStd_IR.v6.0.31.0.G15265151149.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.007.L2.RetStd_IR.v6.0.31.0.G15265151438.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.008.L2.RetStd_IR.v6.0.31.0.G15265152813.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.009.L2.RetStd_IR.v6.0.31.0.G15265152549.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.010.L2.RetStd_IR.v6.0.31.0.G15265152300.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.011.L2.RetStd_IR.v6.0.31.0.G15265152716.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.012.L2.RetStd_IR.v6.0.31.0.G15265152942.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.013.L2.RetStd_IR.v6.0.31.0.G15265152150.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.014.L2.RetStd_IR.v6.0.31.0.G15265153015.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.015.L2.RetStd_IR.v6.0.31.0.G15265152821.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.016.L2.RetStd_IR.v6.0.31.0.G15265152208.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.017.L2.RetStd_IR.v6.0.31.0.G15265152836.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.018.L2.RetStd_IR.v6.0.31.0.G15265154047.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.019.L2.RetStd_IR.v6.0.31.0.G15265154058.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.020.L2.RetStd_IR.v6.0.31.0.G15265154011.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.021.L2.RetStd_IR.v6.0.31.0.G15265153229.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.022.L2.RetStd_IR.v6.0.31.0.G15265153309.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.023.L2.RetStd_IR.v6.0.31.0.G15265154230.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.024.L2.RetStd_IR.v6.0.31.0.G15265154200.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.025.L2.RetStd_IR.v6.0.31.0.G15265154123.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.026.L2.RetStd_IR.v6.0.31.0.G15265153110.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.027.L2.RetStd_IR.v6.0.31.0.G15265153848.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.028.L2.RetStd_IR.v6.0.31.0.G15265155847.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.029.L2.RetStd_IR.v6.0.31.0.G15265155942.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.030.L2.RetStd_IR.v6.0.31.0.G15265155931.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.031.L2.RetStd_IR.v6.0.31.0.G15265155841.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.032.L2.RetStd_IR.v6.0.31.0.G15265155854.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.033.L2.RetStd_IR.v6.0.31.0.G15265154952.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.034.L2.RetStd_IR.v6.0.31.0.G15265155653.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.035.L2.RetStd_IR.v6.0.31.0.G15265155712.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.036.L2.RetStd_IR.v6.0.31.0.G15265155811.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.037.L2.RetStd_IR.v6.0.31.0.G15265154936.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.038.L2.RetStd_IR.v6.0.31.0.G15265155941.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.039.L2.RetStd_IR.v6.0.31.0.G15265155051.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.040.L2.RetStd_IR.v6.0.31.0.G15265160033.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.041.L2.RetStd_IR.v6.0.31.0.G15265160111.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.042.L2.RetStd_IR.v6.0.31.0.G15265155756.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.043.L2.RetStd_IR.v6.0.31.0.G15265154837.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.044.L2.RetStd_IR.v6.0.31.0.G15265155914.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.045.L2.RetStd_IR.v6.0.31.0.G15265155351.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.046.L2.RetStd_IR.v6.0.31.0.G15265160104.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.047.L2.RetStd_IR.v6.0.31.0.G15265155444.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.048.L2.RetStd_IR.v6.0.31.0.G15265161620.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.049.L2.RetStd_IR.v6.0.31.0.G15265160915.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.050.L2.RetStd_IR.v6.0.31.0.G15265161409.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.051.L2.RetStd_IR.v6.0.31.0.G15265160954.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.052.L2.RetStd_IR.v6.0.31.0.G15265161513.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.053.L2.RetStd_IR.v6.0.31.0.G15265161811.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.054.L2.RetStd_IR.v6.0.31.0.G15265162006.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.055.L2.RetStd_IR.v6.0.31.0.G15265162047.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.056.L2.RetStd_IR.v6.0.31.0.G15265161311.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.057.L2.RetStd_IR.v6.0.31.0.G15265161405.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.058.L2.RetStd_IR.v6.0.31.0.G15265163005.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.059.L2.RetStd_IR.v6.0.31.0.G15265162638.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.060.L2.RetStd_IR.v6.0.31.0.G15265162622.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.061.L2.RetStd_IR.v6.0.31.0.G15265162421.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.062.L2.RetStd_IR.v6.0.31.0.G15265162542.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.063.L2.RetStd_IR.v6.0.31.0.G15265163257.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.064.L2.RetStd_IR.v6.0.31.0.G15265163309.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.065.L2.RetStd_IR.v6.0.31.0.G15265162517.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.066.L2.RetStd_IR.v6.0.31.0.G15265163219.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.067.L2.RetStd_IR.v6.0.31.0.G15265163400.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.068.L2.RetStd_IR.v6.0.31.0.G15265164234.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.069.L2.RetStd_IR.v6.0.31.0.G15265164345.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.070.L2.RetStd_IR.v6.0.31.0.G15265164221.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.071.L2.RetStd_IR.v6.0.31.0.G15265164428.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.072.L2.RetStd_IR.v6.0.31.0.G15265164450.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.073.L2.RetStd_IR.v6.0.31.0.G15265164606.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.074.L2.RetStd_IR.v6.0.31.0.G15265164555.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.075.L2.RetStd_IR.v6.0.31.0.G15265164249.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.076.L2.RetStd_IR.v6.0.31.0.G15265164047.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.077.L2.RetStd_IR.v6.0.31.0.G15265163547.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.078.L2.RetStd_IR.v6.0.31.0.G15265165338.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.079.L2.RetStd_IR.v6.0.31.0.G15265165344.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.080.L2.RetStd_IR.v6.0.31.0.G15265165244.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.081.L2.RetStd_IR.v6.0.31.0.G15265165221.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.082.L2.RetStd_IR.v6.0.31.0.G15265165057.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.083.L2.RetStd_IR.v6.0.31.0.G15265165901.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.084.L2.RetStd_IR.v6.0.31.0.G15265170015.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.085.L2.RetStd_IR.v6.0.31.0.G15265165631.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.086.L2.RetStd_IR.v6.0.31.0.G15265165844.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.087.L2.RetStd_IR.v6.0.31.0.G15265165850.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.088.L2.RetStd_IR.v6.0.31.0.G15265171431.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.089.L2.RetStd_IR.v6.0.31.0.G15265171348.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.090.L2.RetStd_IR.v6.0.31.0.G15265171421.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.091.L2.RetStd_IR.v6.0.31.0.G15265171454.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.092.L2.RetStd_IR.v6.0.31.0.G15265170534.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.093.L2.RetStd_IR.v6.0.31.0.G15265170808.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.094.L2.RetStd_IR.v6.0.31.0.G15265171451.hdf", "
+          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.095.L2.RetStd_IR.v6.0.31.0.G15265171544.hdf")
+    END_OBJECT             = INPUTPOINTER
+
+  END_GROUP              = INPUTGRANULE
+
+  GROUP                  = SPATIALDOMAINCONTAINER
+
+    GROUP                  = HORIZONTALSPATIALDOMAINCONTAINER
+
+      GROUP                  = BOUNDINGRECTANGLE
+
+        OBJECT                 = EASTBOUNDINGCOORDINATE
+          NUM_VAL              = 1
+          VALUE                = 180.0
+        END_OBJECT             = EASTBOUNDINGCOORDINATE
+
+        OBJECT                 = WESTBOUNDINGCOORDINATE
+          NUM_VAL              = 1
+          VALUE                = -180.0
+        END_OBJECT             = WESTBOUNDINGCOORDINATE
+
+        OBJECT                 = SOUTHBOUNDINGCOORDINATE
+          NUM_VAL              = 1
+          VALUE                = -90.0
+        END_OBJECT             = SOUTHBOUNDINGCOORDINATE
+
+        OBJECT                 = NORTHBOUNDINGCOORDINATE
+          NUM_VAL              = 1
+          VALUE                = 90.0
+        END_OBJECT             = NORTHBOUNDINGCOORDINATE
+
+      END_GROUP              = BOUNDINGRECTANGLE
+
+    END_GROUP              = HORIZONTALSPATIALDOMAINCONTAINER
+
+    GROUP                  = GRANULELOCALITY
+
+      OBJECT                 = LOCALITYVALUE
+        NUM_VAL              = 1
+        VALUE                = "Global"
+      END_OBJECT             = LOCALITYVALUE
+
+    END_GROUP              = GRANULELOCALITY
+
+  END_GROUP              = SPATIALDOMAINCONTAINER
+
+  GROUP                  = RANGEDATETIME
+
+    OBJECT                 = RANGEENDINGDATE
+      NUM_VAL              = 1
+      VALUE                = "2015-09-22"
+    END_OBJECT             = RANGEENDINGDATE
+
+    OBJECT                 = RANGEENDINGTIME
+      NUM_VAL              = 1
+      VALUE                = "00:00:00.000000Z"
+    END_OBJECT             = RANGEENDINGTIME
+
+    OBJECT                 = RANGEBEGINNINGDATE
+      NUM_VAL              = 1
+      VALUE                = "2015-09-21"
+    END_OBJECT             = RANGEBEGINNINGDATE
+
+    OBJECT                 = RANGEBEGINNINGTIME
+      NUM_VAL              = 1
+      VALUE                = "00:00:00.000000Z"
+    END_OBJECT             = RANGEBEGINNINGTIME
+
+  END_GROUP              = RANGEDATETIME
+
+  GROUP                  = PGEVERSIONCLASS
+
+    OBJECT                 = PGEVERSION
+      NUM_VAL              = 1
+      VALUE                = "6.0.31.0"
+    END_OBJECT             = PGEVERSION
+
+  END_GROUP              = PGEVERSIONCLASS
+
+  GROUP                  = ASSOCIATEDPLATFORMINSTRUMENTSENSOR
+
+    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+      CLASS                = "1"
+
+      OBJECT                 = ASSOCIATEDSENSORSHORTNAME
+        CLASS                = "1"
+        NUM_VAL              = 1
+        VALUE                = "HSB Channel 1"
+      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME
+
+      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME
+        CLASS                = "1"
+        NUM_VAL              = 1
+        VALUE                = "Aqua"
+      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME
+
+      OBJECT                 = OPERATIONMODE
+        CLASS                = "1"
+        NUM_VAL              = 1
+        VALUE                = "Normal"
+      END_OBJECT             = OPERATIONMODE
+
+      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME
+        CLASS                = "1"
+        NUM_VAL              = 1
+        VALUE                = "HSB"
+      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME
+
+    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+
+    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+      CLASS                = "2"
+
+      OBJECT                 = ASSOCIATEDSENSORSHORTNAME
+        CLASS                = "2"
+        NUM_VAL              = 1
+        VALUE                = "HSB Channel 2"
+      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME
+
+      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME
+        CLASS                = "2"
+        NUM_VAL              = 1
+        VALUE                = "Aqua"
+      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME
+
+      OBJECT                 = OPERATIONMODE
+        CLASS                = "2"
+        NUM_VAL              = 1
+        VALUE                = "Normal"
+      END_OBJECT             = OPERATIONMODE
+
+      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME
+        CLASS                = "2"
+        NUM_VAL              = 1
+        VALUE                = "HSB"
+      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME
+
+    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+
+    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+      CLASS                = "3"
+
+      OBJECT                 = ASSOCIATEDSENSORSHORTNAME
+        CLASS                = "3"
+        NUM_VAL              = 1
+        VALUE                = "HSB Channel 3"
+      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME
+
+      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME
+        CLASS                = "3"
+        NUM_VAL              = 1
+        VALUE                = "Aqua"
+      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME
+
+      OBJECT                 = OPERATIONMODE
+        CLASS                = "3"
+        NUM_VAL              = 1
+        VALUE                = "Normal"
+      END_OBJECT             = OPERATIONMODE
+
+      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME
+        CLASS                = "3"
+        NUM_VAL              = 1
+        VALUE                = "HSB"
+      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME
+
+    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+
+    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+      CLASS                = "4"
+
+      OBJECT                 = ASSOCIATEDSENSORSHORTNAME
+        CLASS                = "4"
+        NUM_VAL              = 1
+        VALUE                = "HSB Channel 4"
+      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME
+
+      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME
+        CLASS                = "4"
+        NUM_VAL              = 1
+        VALUE                = "Aqua"
+      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME
+
+      OBJECT                 = OPERATIONMODE
+        CLASS                = "4"
+        NUM_VAL              = 1
+        VALUE                = "Normal"
+      END_OBJECT             = OPERATIONMODE
+
+      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME
+        CLASS                = "4"
+        NUM_VAL              = 1
+        VALUE                = "HSB"
+      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME
+
+    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+
+    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+      CLASS                = "5"
+
+      OBJECT                 = ASSOCIATEDSENSORSHORTNAME
+        CLASS                = "5"
+        NUM_VAL              = 1
+        VALUE                = "HSB Channel 5"
+      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME
+
+      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME
+        CLASS                = "5"
+        NUM_VAL              = 1
+        VALUE                = "Aqua"
+      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME
+
+      OBJECT                 = OPERATIONMODE
+        CLASS                = "5"
+        NUM_VAL              = 1
+        VALUE                = "Normal"
+      END_OBJECT             = OPERATIONMODE
+
+      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME
+        CLASS                = "5"
+        NUM_VAL              = 1
+        VALUE                = "HSB"
+      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME
+
+    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+
+    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+      CLASS                = "6"
+
+      OBJECT                 = ASSOCIATEDSENSORSHORTNAME
+        CLASS                = "6"
+        NUM_VAL              = 1
+        VALUE                = "AMSU-A Channel 3"
+      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME
+
+      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME
+        CLASS                = "6"
+        NUM_VAL              = 1
+        VALUE                = "Aqua"
+      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME
+
+      OBJECT                 = OPERATIONMODE
+        CLASS                = "6"
+        NUM_VAL              = 1
+        VALUE                = "Normal"
+      END_OBJECT             = OPERATIONMODE
+
+      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME
+        CLASS                = "6"
+        NUM_VAL              = 1
+        VALUE                = "AMSU-A"
+      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME
+
+    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+
+    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+      CLASS                = "7"
+
+      OBJECT                 = ASSOCIATEDSENSORSHORTNAME
+        CLASS                = "7"
+        NUM_VAL              = 1
+        VALUE                = "AMSU-A Channel 4"
+      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME
+
+      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME
+        CLASS                = "7"
+        NUM_VAL              = 1
+        VALUE                = "Aqua"
+      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME
+
+      OBJECT                 = OPERATIONMODE
+        CLASS                = "7"
+        NUM_VAL              = 1
+        VALUE                = "Normal"
+      END_OBJECT             = OPERATIONMODE
+
+      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME
+        CLASS                = "7"
+        NUM_VAL              = 1
+        VALUE                = "AMSU-A"
+      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME
+
+    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+
+    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+      CLASS                = "8"
+
+      OBJECT                 = ASSOCIATEDSENSORSHORTNAME
+        CLASS                = "8"
+        NUM_VAL              = 1
+        VALUE                = "AMSU-A Channel 5"
+      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME
+
+      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME
+        CLASS                = "8"
+        NUM_VAL              = 1
+        VALUE                = "Aqua"
+      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME
+
+      OBJECT                 = OPERATIONMODE
+        CLASS                = "8"
+        NUM_VAL              = 1
+        VALUE                = "Normal"
+      END_OBJECT             = OPERATIONMODE
+
+      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME
+        CLASS                = "8"
+        NUM_VAL              = 1
+        VALUE                = "AMSU-A"
+      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME
+
+    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+
+    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+      CLASS                = "9"
+
+      OBJECT                 = ASSOCIATEDSENSORSHORTNAME
+        CLASS                = "9"
+        NUM_VAL              = 1
+        VALUE                = "AMSU-A Channel 6"
+      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME
+
+      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME
+        CLASS                = "9"
+        NUM_VAL              = 1
+        VALUE                = "Aqua"
+      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME
+
+      OBJECT                 = OPERATIONMODE
+        CLASS                = "9"
+        NUM_VAL              = 1
+        VALUE                = "Normal"
+      END_OBJECT             = OPERATIONMODE
+
+      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME
+        CLASS                = "9"
+        NUM_VAL              = 1
+        VALUE                = "AMSU-A"
+      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME
+
+    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+
+    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+      CLASS                = "10"
+
+      OBJECT                 = ASSOCIATEDSENSORSHORTNAME
+        CLASS                = "10"
+        NUM_VAL              = 1
+        VALUE                = "AMSU-A Channel 7"
+      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME
+
+      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME
+        CLASS                = "10"
+        NUM_VAL              = 1
+        VALUE                = "Aqua"
+      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME
+
+      OBJECT                 = OPERATIONMODE
+  </Value>
+  </Attribute>
+  <Attribute name="coremetadata_2" type="String">
+    <Value>      CLASS                = "10"
+        NUM_VAL              = 1
+        VALUE                = "Normal"
+      END_OBJECT             = OPERATIONMODE
+
+      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME
+        CLASS                = "10"
+        NUM_VAL              = 1
+        VALUE                = "AMSU-A"
+      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME
+
+    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+
+    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+      CLASS                = "11"
+
+      OBJECT                 = ASSOCIATEDSENSORSHORTNAME
+        CLASS                = "11"
+        NUM_VAL              = 1
+        VALUE                = "AMSU-A Channel 8"
+      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME
+
+      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME
+        CLASS                = "11"
+        NUM_VAL              = 1
+        VALUE                = "Aqua"
+      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME
+
+      OBJECT                 = OPERATIONMODE
+        CLASS                = "11"
+        NUM_VAL              = 1
+        VALUE                = "Normal"
+      END_OBJECT             = OPERATIONMODE
+
+      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME
+        CLASS                = "11"
+        NUM_VAL              = 1
+        VALUE                = "AMSU-A"
+      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME
+
+    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+
+    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+      CLASS                = "12"
+
+      OBJECT                 = ASSOCIATEDSENSORSHORTNAME
+        CLASS                = "12"
+        NUM_VAL              = 1
+        VALUE                = "AMSU-A Channel 9"
+      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME
+
+      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME
+        CLASS                = "12"
+        NUM_VAL              = 1
+        VALUE                = "Aqua"
+      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME
+
+      OBJECT                 = OPERATIONMODE
+        CLASS                = "12"
+        NUM_VAL              = 1
+        VALUE                = "Normal"
+      END_OBJECT             = OPERATIONMODE
+
+      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME
+        CLASS                = "12"
+        NUM_VAL              = 1
+        VALUE                = "AMSU-A"
+      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME
+
+    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+
+    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+      CLASS                = "13"
+
+      OBJECT                 = ASSOCIATEDSENSORSHORTNAME
+        CLASS                = "13"
+        NUM_VAL              = 1
+        VALUE                = "AMSU-A Channel 10"
+      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME
+
+      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME
+        CLASS                = "13"
+        NUM_VAL              = 1
+        VALUE                = "Aqua"
+      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME
+
+      OBJECT                 = OPERATIONMODE
+        CLASS                = "13"
+        NUM_VAL              = 1
+        VALUE                = "Normal"
+      END_OBJECT             = OPERATIONMODE
+
+      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME
+        CLASS                = "13"
+        NUM_VAL              = 1
+        VALUE                = "AMSU-A"
+      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME
+
+    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+
+    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+      CLASS                = "14"
+
+      OBJECT                 = ASSOCIATEDSENSORSHORTNAME
+        CLASS                = "14"
+        NUM_VAL              = 1
+        VALUE                = "AMSU-A Channel 11"
+      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME
+
+      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME
+        CLASS                = "14"
+        NUM_VAL              = 1
+        VALUE                = "Aqua"
+      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME
+
+      OBJECT                 = OPERATIONMODE
+        CLASS                = "14"
+        NUM_VAL              = 1
+        VALUE                = "Normal"
+      END_OBJECT             = OPERATIONMODE
+
+      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME
+        CLASS                = "14"
+        NUM_VAL              = 1
+        VALUE                = "AMSU-A"
+      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME
+
+    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+
+    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+      CLASS                = "15"
+
+      OBJECT                 = ASSOCIATEDSENSORSHORTNAME
+        CLASS                = "15"
+        NUM_VAL              = 1
+        VALUE                = "AMSU-A Channel 12"
+      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME
+
+      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME
+        CLASS                = "15"
+        NUM_VAL              = 1
+        VALUE                = "Aqua"
+      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME
+
+      OBJECT                 = OPERATIONMODE
+        CLASS                = "15"
+        NUM_VAL              = 1
+        VALUE                = "Normal"
+      END_OBJECT             = OPERATIONMODE
+
+      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME
+        CLASS                = "15"
+        NUM_VAL              = 1
+        VALUE                = "AMSU-A"
+      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME
+
+    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+
+    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+      CLASS                = "16"
+
+      OBJECT                 = ASSOCIATEDSENSORSHORTNAME
+        CLASS                = "16"
+        NUM_VAL              = 1
+        VALUE                = "AMSU-A Channel 13"
+      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME
+
+      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME
+        CLASS                = "16"
+        NUM_VAL              = 1
+        VALUE                = "Aqua"
+      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME
+
+      OBJECT                 = OPERATIONMODE
+        CLASS                = "16"
+        NUM_VAL              = 1
+        VALUE                = "Normal"
+      END_OBJECT             = OPERATIONMODE
+
+      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME
+        CLASS                = "16"
+        NUM_VAL              = 1
+        VALUE                = "AMSU-A"
+      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME
+
+    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+
+    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+      CLASS                = "17"
+
+      OBJECT                 = ASSOCIATEDSENSORSHORTNAME
+        CLASS                = "17"
+        NUM_VAL              = 1
+        VALUE                = "AMSU-A Channel 14"
+      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME
+
+      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME
+        CLASS                = "17"
+        NUM_VAL              = 1
+        VALUE                = "Aqua"
+      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME
+
+      OBJECT                 = OPERATIONMODE
+        CLASS                = "17"
+        NUM_VAL              = 1
+        VALUE                = "Normal"
+      END_OBJECT             = OPERATIONMODE
+
+      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME
+        CLASS                = "17"
+        NUM_VAL              = 1
+        VALUE                = "AMSU-A"
+      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME
+
+    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+
+    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+      CLASS                = "18"
+
+      OBJECT                 = ASSOCIATEDSENSORSHORTNAME
+        CLASS                = "18"
+        NUM_VAL              = 1
+        VALUE                = "AMSU-A Channel 15"
+      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME
+
+      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME
+        CLASS                = "18"
+        NUM_VAL              = 1
+        VALUE                = "Aqua"
+      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME
+
+      OBJECT                 = OPERATIONMODE
+        CLASS                = "18"
+        NUM_VAL              = 1
+        VALUE                = "Normal"
+      END_OBJECT             = OPERATIONMODE
+
+      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME
+        CLASS                = "18"
+        NUM_VAL              = 1
+        VALUE                = "AMSU-A"
+      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME
+
+    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+
+    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+      CLASS                = "19"
+
+      OBJECT                 = ASSOCIATEDSENSORSHORTNAME
+        CLASS                = "19"
+        NUM_VAL              = 1
+        VALUE                = "AMSU-A Channel 1"
+      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME
+
+      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME
+        CLASS                = "19"
+        NUM_VAL              = 1
+        VALUE                = "Aqua"
+      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME
+
+      OBJECT                 = OPERATIONMODE
+        CLASS                = "19"
+        NUM_VAL              = 1
+        VALUE                = "Normal"
+      END_OBJECT             = OPERATIONMODE
+
+      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME
+        CLASS                = "19"
+        NUM_VAL              = 1
+        VALUE                = "AMSU-A"
+      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME
+
+    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+
+    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+      CLASS                = "20"
+
+      OBJECT                 = ASSOCIATEDSENSORSHORTNAME
+        CLASS                = "20"
+        NUM_VAL              = 1
+        VALUE                = "AMSU-A Channel 2"
+      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME
+
+      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME
+        CLASS                = "20"
+        NUM_VAL              = 1
+        VALUE                = "Aqua"
+      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME
+
+      OBJECT                 = OPERATIONMODE
+        CLASS                = "20"
+        NUM_VAL              = 1
+        VALUE                = "Normal"
+      END_OBJECT             = OPERATIONMODE
+
+      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME
+        CLASS                = "20"
+        NUM_VAL              = 1
+        VALUE                = "AMSU-A"
+      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME
+
+    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+
+    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+      CLASS                = "21"
+
+      OBJECT                 = ASSOCIATEDSENSORSHORTNAME
+        CLASS                = "21"
+        NUM_VAL              = 1
+        VALUE                = "M1a Detector Array"
+      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME
+
+      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME
+        CLASS                = "21"
+        NUM_VAL              = 1
+        VALUE                = "Aqua"
+      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME
+
+      OBJECT                 = OPERATIONMODE
+        CLASS                = "21"
+        NUM_VAL              = 1
+        VALUE                = "Normal"
+      END_OBJECT             = OPERATIONMODE
+
+      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME
+        CLASS                = "21"
+        NUM_VAL              = 1
+        VALUE                = "AIRS"
+      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME
+
+    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+
+    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+      CLASS                = "22"
+
+      OBJECT                 = ASSOCIATEDSENSORSHORTNAME
+        CLASS                = "22"
+        NUM_VAL              = 1
+        VALUE                = "M1b Detector Array"
+      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME
+
+      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME
+        CLASS                = "22"
+        NUM_VAL              = 1
+        VALUE                = "Aqua"
+      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME
+
+      OBJECT                 = OPERATIONMODE
+        CLASS                = "22"
+        NUM_VAL              = 1
+        VALUE                = "Normal"
+      END_OBJECT             = OPERATIONMODE
+
+      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME
+        CLASS                = "22"
+        NUM_VAL              = 1
+        VALUE                = "AIRS"
+      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME
+
+    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+
+    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+      CLASS                = "23"
+
+      OBJECT                 = ASSOCIATEDSENSORSHORTNAME
+        CLASS                = "23"
+        NUM_VAL              = 1
+        VALUE                = "M2a Detector Array"
+      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME
+
+      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME
+        CLASS                = "23"
+        NUM_VAL              = 1
+        VALUE                = "Aqua"
+      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME
+
+      OBJECT                 = OPERATIONMODE
+        CLASS                = "23"
+        NUM_VAL              = 1
+        VALUE                = "Normal"
+      END_OBJECT             = OPERATIONMODE
+
+      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME
+        CLASS                = "23"
+        NUM_VAL              = 1
+        VALUE                = "AIRS"
+      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME
+
+    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+
+    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+      CLASS                = "24"
+
+      OBJECT                 = ASSOCIATEDSENSORSHORTNAME
+        CLASS                = "24"
+        NUM_VAL              = 1
+        VALUE                = "M2b Detector Array"
+      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME
+
+      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME
+        CLASS                = "24"
+        NUM_VAL              = 1
+        VALUE                = "Aqua"
+      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME
+
+      OBJECT                 = OPERATIONMODE
+        CLASS                = "24"
+        NUM_VAL              = 1
+        VALUE                = "Normal"
+      END_OBJECT             = OPERATIONMODE
+
+      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME
+        CLASS                = "24"
+        NUM_VAL              = 1
+        VALUE                = "AIRS"
+      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME
+
+    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+
+    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+      CLASS                = "25"
+
+      OBJECT                 = ASSOCIATEDSENSORSHORTNAME
+        CLASS                = "25"
+        NUM_VAL              = 1
+        VALUE                = "M3 Detector Array"
+      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME
+
+      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME
+        CLASS                = "25"
+        NUM_VAL              = 1
+        VALUE                = "Aqua"
+      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME
+
+      OBJECT                 = OPERATIONMODE
+        CLASS                = "25"
+        NUM_VAL              = 1
+        VALUE                = "Normal"
+      END_OBJECT             = OPERATIONMODE
+
+      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME
+        CLASS                = "25"
+        NUM_VAL              = 1
+        VALUE                = "AIRS"
+      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME
+
+    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+
+    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+      CLASS                = "26"
+
+      OBJECT                 = ASSOCIATEDSENSORSHORTNAME
+        CLASS                = "26"
+        NUM_VAL              = 1
+        VALUE                = "M4a Detector Array"
+      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME
+
+      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME
+        CLASS                = "26"
+        NUM_VAL              = 1
+        VALUE                = "Aqua"
+      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME
+
+      OBJECT                 = OPERATIONMODE
+        CLASS                = "26"
+        NUM_VAL              = 1
+        VALUE                = "Normal"
+      END_OBJECT             = OPERATIONMODE
+
+      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME
+        CLASS                = "26"
+        NUM_VAL              = 1
+        VALUE                = "AIRS"
+      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME
+
+    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+
+    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+      CLASS                = "27"
+
+      OBJECT                 = ASSOCIATEDSENSORSHORTNAME
+        CLASS                = "27"
+        NUM_VAL              = 1
+        VALUE                = "M4b Detector Array"
+      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME
+
+      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME
+        CLASS                = "27"
+        NUM_VAL              = 1
+        VALUE                = "Aqua"
+      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME
+
+      OBJECT                 = OPERATIONMODE
+        CLASS                = "27"
+        NUM_VAL              = 1
+        VALUE                = "Normal"
+      END_OBJECT             = OPERATIONMODE
+
+      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME
+        CLASS                = "27"
+        NUM_VAL              = 1
+        VALUE                = "AIRS"
+      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME
+
+    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+
+    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+      CLASS                = "28"
+
+      OBJECT                 = ASSOCIATEDSENSORSHORTNAME
+        CLASS                = "28"
+        NUM_VAL              = 1
+        VALUE                = "M4c Detector Array"
+      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME
+
+      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME
+        CLASS                = "28"
+        NUM_VAL              = 1
+        VALUE                = "Aqua"
+      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME
+
+      OBJECT                 = OPERATIONMODE
+        CLASS                = "28"
+        NUM_VAL              = 1
+        VALUE                = "Normal"
+      END_OBJECT             = OPERATIONMODE
+
+      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME
+        CLASS                = "28"
+        NUM_VAL              = 1
+        VALUE                = "AIRS"
+      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME
+
+    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+
+    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+      CLASS                = "29"
+
+      OBJECT                 = ASSOCIATEDSENSORSHORTNAME
+        CLASS                = "29"
+        NUM_VAL              = 1
+        VALUE                = "M4d Detector Array"
+      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME
+
+      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME
+        CLASS                = "29"
+        NUM_VAL              = 1
+        VALUE                = "Aqua"
+      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME
+
+      OBJECT                 = OPERATIONMODE
+        CLASS                = "29"
+        NUM_VAL              = 1
+        VALUE                = "Normal"
+      END_OBJECT             = OPERATIONMODE
+
+      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME
+        CLASS                = "29"
+        NUM_VAL              = 1
+        VALUE                = "AIRS"
+      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME
+
+    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+
+    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+      CLASS                = "30"
+
+      OBJECT                 = ASSOCIATEDSENSORSHORTNAME
+        CLASS                = "30"
+        NUM_VAL              = 1
+        VALUE                = "M5 Detector Array"
+      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME
+
+      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME
+        CLASS                = "30"
+        NUM_VAL              = 1
+        VALUE                = "Aqua"
+      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME
+
+      OBJECT                 = OPERATIONMODE
+        CLASS                = "30"
+        NUM_VAL              = 1
+        VALUE                = "Normal"
+      END_OBJECT             = OPERATIONMODE
+
+      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME
+        CLASS                = "30"
+        NUM_VAL              = 1
+        VALUE                = "AIRS"
+      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME
+
+    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+
+    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+      CLASS                = "31"
+
+      OBJECT                 = ASSOCIATEDSENSORSHORTNAME
+        CLASS                = "31"
+        NUM_VAL              = 1
+        VALUE                = "M6 Detector Array"
+      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME
+
+      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME
+        CLASS                = "31"
+        NUM_VAL              = 1
+        VALUE                = "Aqua"
+      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME
+
+      OBJECT                 = OPERATIONMODE
+        CLASS                = "31"
+        NUM_VAL              = 1
+        VALUE                = "Normal"
+      END_OBJECT             = OPERATIONMODE
+
+      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME
+        CLASS                = "31"
+        NUM_VAL              = 1
+        VALUE                = "AIRS"
+      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME
+
+    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+
+    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+      CLASS                = "32"
+
+      OBJECT                 = ASSOCIATEDSENSORSHORTNAME
+        CLASS                = "32"
+        NUM_VAL              = 1
+        VALUE                = "M7 Detector Array"
+      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME
+
+      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME
+        CLASS                = "32"
+        NUM_VAL              = 1
+        VALUE                = "Aqua"
+      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME
+
+      OBJECT                 = OPERATIONMODE
+        CLASS                = "32"
+        NUM_VAL              = 1
+        VALUE                = "Normal"
+      END_OBJECT             = OPERATIONMODE
+
+      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME
+        CLASS                = "32"
+        NUM_VAL              = 1
+        VALUE                = "AIRS"
+      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME
+
+    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+
+    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+      CLASS                = "33"
+
+      OBJECT                 = ASSOCIATEDSENSORSHORTNAME
+        CLASS                = "33"
+        NUM_VAL              = 1
+        VALUE                = "M8 Detector Array"
+      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME
+
+      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME
+        CLASS                = "33"
+        NUM_VAL              = 1
+        VALUE                = "Aqua"
+      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME
+
+      OBJECT                 = OPERATIONMODE
+        CLASS                = "33"
+        NUM_VAL              = 1
+        VALUE                = "Normal"
+      END_OBJECT             = OPERATIONMODE
+
+      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME
+        CLASS                = "33"
+        NUM_VAL              = 1
+        VALUE                = "AIRS"
+      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME
+
+    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+
+    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+      CLASS                = "34"
+
+      OBJECT                 = ASSOCIATEDSENSORSHORTNAME
+        CLASS                = "34"
+        NUM_VAL              = 1
+        VALUE                = "M9 Detector Array"
+      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME
+
+      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME
+        CLASS                = "34"
+        NUM_VAL              = 1
+        VALUE                = "Aqua"
+      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME
+
+      OBJECT                 = OPERATIONMODE
+        CLASS                = "34"
+        NUM_VAL              = 1
+        VALUE                = "Normal"
+      END_OBJECT             = OPERATIONMODE
+
+      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME
+        CLASS                = "34"
+        NUM_VAL              = 1
+        VALUE                = "AIRS"
+      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME
+
+    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+
+    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+      CLASS                = "35"
+
+      OBJECT                 = ASSOCIATEDSENSORSHORTNAME
+        CLASS                = "35"
+        NUM_VAL              = 1
+        VALUE                = "M10 Detector Array"
+      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME
+
+      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME
+        CLASS                = "35"
+        NUM_VAL              = 1
+        VALUE                = "Aqua"
+      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME
+
+      OBJECT                 = OPERATIONMODE
+        CLASS                = "35"
+        NUM_VAL              = 1
+        VALUE                = "Normal"
+      END_OBJECT             = OPERATIONMODE
+
+      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME
+        CLASS                = "35"
+        NUM_VAL              = 1
+        VALUE                = "AIRS"
+      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME
+
+    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+
+    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+      CLASS                = "36"
+
+      OBJECT                 = ASSOCIATEDSENSORSHORTNAME
+        CLASS                = "36"
+        NUM_VAL              = 1
+        VALUE                = "M11 Detector Array"
+      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME
+
+      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME
+        CLASS                = "36"
+        NUM_VAL              = 1
+        VALUE                = "Aqua"
+      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME
+
+      OBJECT                 = OPERATIONMODE
+        CLASS                = "36"
+        NUM_VAL              = 1
+        VALUE                = "Normal"
+      END_OBJECT             = OPERATIONMODE
+
+      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME
+        CLASS                = "36"
+        NUM_VAL              = 1
+        VALUE                = "AIRS"
+      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME
+
+    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+
+    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+      CLASS                = "37"
+
+      OBJECT                 = ASSOCIATEDSENSORSHORTNAME
+        CLASS                = "37"
+        NUM_VAL              = 1
+        VALUE                = "M12 Detector Array"
+      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME
+
+      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME
+        CLASS                = "37"
+        NUM_VAL              = 1
+        VALUE                = "Aqua"
+      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME
+
+      OBJECT                 = OPERATIONMODE
+        CLASS                = "37"
+        NUM_VAL              = 1
+        VALUE                = "Normal"
+      END_OBJECT             = OPERATIONMODE
+
+      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME
+        CLASS                = "37"
+        NUM_VAL              = 1
+        VALUE                = "AIRS"
+      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME
+
+    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+
+    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+      CLASS                = "38"
+
+      OBJECT                 = ASSOCIATEDSENSORSHORTNAME
+        CLASS                = "38"
+        NUM_VAL              = 1
+        VALUE                = "VNIR Channel 1"
+      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME
+
+      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME
+        CLASS                = "38"
+        NUM_VAL              = 1
+        VALUE                = "Aqua"
+      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME
+
+      OBJECT                 = OPERATIONMODE
+        CLASS                = "38"
+        NUM_VAL              = 1
+        VALUE                = "Normal"
+      END_OBJECT             = OPERATIONMODE
+
+      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME
+        CLASS                = "38"
+        NUM_VAL              = 1
+        VALUE                = "AIRS"
+      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME
+
+    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+
+    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+      CLASS                = "39"
+
+      OBJECT                 = ASSOCIATEDSENSORSHORTNAME
+        CLASS                = "39"
+        NUM_VAL              = 1
+        VALUE                = "VNIR Channel 2"
+      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME
+
+      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME
+        CLASS                = "39"
+        NUM_VAL              = 1
+        VALUE                = "Aqua"
+      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME
+
+      OBJECT                 = OPERATIONMODE
+        CLASS                = "39"
+        NUM_VAL              = 1
+        VALUE                = "Normal"
+      END_OBJECT             = OPERATIONMODE
+
+      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME
+        CLASS                = "39"
+        NUM_VAL              = 1
+        VALUE                = "AIRS"
+      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME
+
+    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+
+    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+      CLASS                = "40"
+
+      OBJECT                 = ASSOCIATEDSENSORSHORTNAME
+        CLASS                = "40"
+        NUM_VAL              = 1
+        VALUE                = "VNIR Channel 3"
+      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME
+
+      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME
+        CLASS                = "40"
+        NUM_VAL              = 1
+        VALUE                = "Aqua"
+      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME
+
+      OBJECT                 = OPERATIONMODE
+        CLASS                = "40"
+        NUM_VAL              = 1
+        VALUE                = "Normal"
+      END_OBJECT             = OPERATIONMODE
+
+      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME
+        CLASS                = "40"
+        NUM_VAL              = 1
+        VALUE                = "AIRS"
+      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME
+
+    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+
+    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+      CLASS                = "41"
+
+      OBJECT                 = ASSOCIATEDSENSORSHORTNAME
+        CLASS                = "41"
+        NUM_VAL              = 1
+        VALUE                = "VNIR Channel 4"
+      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME
+
+      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME
+        CLASS                = "41"
+        NUM_VAL              = 1
+        VALUE                = "Aqua"
+      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME
+
+      OBJECT                 = OPERATIONMODE
+        CLASS                = "41"
+        NUM_VAL              = 1
+        VALUE                = "Normal"
+      END_OBJECT             = OPERATIONMODE
+
+      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME
+        CLASS                = "41"
+        NUM_VAL              = 1
+        VALUE                = "AIRS"
+      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME
+
+    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER
+
+  END_GROUP              = ASSOCIATEDPLATFORMINSTRUMENTSENSOR
+
+  GROUP                  = ADDITIONALATTRIBUTES
+
+    OBJECT                 = ADDITIONALATTRIBUTESCONTAINER
+      CLASS                = "1"
+
+      OBJECT                 = ADDITIONALATTRIBUTENAME
+        CLASS                = "1"
+        NUM_VAL              = 1
+        VALUE                = "NumBadData"
+      END_OBJECT             = ADDITIONALATTRIBUTENAME
+
+      GROUP                  = INFORMATIONCONTENT
+        CLASS                = "1"
+
+        OBJECT                 = PARAMETERVALUE
+          NUM_VAL              = 1
+          CLASS                = "1"
+          VALUE                = "32"
+        END_OBJECT             = PARAMETERVALUE
+
+      END_GROUP              = INFORMATIONCONTENT
+
+    END_OBJECT             = ADDITIONALATTRIBUTESCONTAINER
+
+    OBJECT                 = ADDITIONALATTRIBUTESCONTAINER
+      CLASS                = "2"
+
+      OBJECT                 = ADDITIONALATTRIBUTENAME
+        CLASS                = "2"
+        NUM_VAL              = 1
+        VALUE                = "NumSpecialData"
+      END_OBJECT             = ADDITIONALATTRIBUTENAME
+
+      GROUP                  = INFORMATIONCONTENT
+        CLASS                = "2"
+
+        OBJECT                 = PARAMETERVALUE
+          NUM_VAL              = 1
+          CLASS                = "2"
+          VALUE                = "0"
+        END_OBJECT             = PARAMETERVALUE
+
+      END_GROUP              = INFORMATIONCONTENT
+
+    END_OBJECT             = ADDITIONALATTRIBUTESCONTAINER
+
+    OBJECT                 = ADDITIONALATTRIBUTESCONTAINER
+      CLASS                = "3"
+
+      OBJECT                 = ADDITIONALATTRIBUTENAME
+        CLASS                = "3"
+        NUM_VAL              = 1
+        VALUE                = "NumProcessData"
+      END_OBJECT             = ADDITIONALATTRIBUTENAME
+
+      GROUP                  = INFORMATIONCONTENT
+        CLASS                = "3"
+
+        OBJECT                 = PARAMETERVALUE
+          NUM_VAL              = 1
+          CLASS                = "3"
+          VALUE                = "1406666"
+        END_OBJECT             = PARAMETERVALUE
+
+      END_GROUP              = INFORMATIONCONTENT
+
+    END_OBJECT             = ADDITIONALATTRIBUTESCONTAINER
+
+    OBJECT                 = ADDITIONALATTRIBUTESCONTAINER
+      CLASS                = "4"
+
+      OBJECT                 = ADDITIONALATTRIBUTENAME
+        CLASS                = "4"
+        NUM_VAL              = 1
+        VALUE                = "NumMissingData"
+      END_OBJECT             = ADDITIONALATTRIBUTENAME
+
+      GROUP                  = INFORMATIONCONTENT
+        CLASS                = "4"
+
+        OBJECT                 = PARAMETERVALUE
+          NUM_VAL              = 1
+          CLASS                = "4"
+          VALUE                = "2"
+        END_OBJECT             = PARAMETERVALUE
+
+      END_GROUP              = INFORMATIONCONTENT
+
+    END_OBJECT             = ADDITIONALATTRIBUTESCONTAINER
+
+    OBJECT                 = ADDITIONALATTRIBUTESCONTAINER
+      CLASS                = "5"
+
+      OBJECT                 = ADDITIONALATTRIBUTENAME
+        CLASS                = "5"
+        NUM_VAL              = 1
+        VALUE                = "NumTotalData"
+      END_OBJECT             = ADDITIONALATTRIBUTENAME
+
+      GROUP                  = INFORMATIONCONTENT
+        CLASS                = "5"
+
+        OBJECT                 = PARAMETERVALUE
+          NUM_VAL              = 1
+          CLASS                = "5"
+          VALUE                = "1406700"
+        END_OBJECT             = PARAMETERVALUE
+
+      END_GROUP              = INFORMATIONCONTENT
+
+    END_OBJECT             = ADDITIONALATTRIBUTESCONTAINER
+
+    OBJECT                 = ADDITIONALATTRIBUTESCONTAINER
+      CLASS                = "6"
+
+      OBJECT                 = ADDITIONALATTRIBUTENAME
+        CLASS                = "6"
+        NUM_VAL              = 1
+        VALUE                = "NumFpe"
+      END_OBJECT             = ADDITIONALATTRIBUTENAME
+
+      GROUP                  = INFORMATIONCONTENT
+        CLASS                = "6"
+
+        OBJECT                 = PARAMETERVALUE
+          NUM_VAL              = 1
+          CLASS                = "6"
+          VALUE                = "0"
+        END_OBJECT             = PARAMETERVALUE
+
+      END_GROUP              = INFORMATIONCONTENT
+
+    END_OBJECT             = ADDITIONALATTRIBUTESCONTAINER
+
+    OBJECT                 = ADDITIONALATTRIBUTESCONTAINER
+      CLASS                = "7"
+
+      OBJECT                 = ADDITIONALATTRIBUTENAME
+        CLASS                = "7"
+        NUM_VAL              = 1
+        VALUE                = "ProductGenerationFacility"
+      END_OBJECT             = ADDITIONALATTRIBUTENAME
+
+      GROUP                  = INFORMATIONCONTENT
+        CLASS                = "7"
+
+        OBJECT                 = PARAMETERVALUE
+          NUM_VAL              = 1
+          CLASS                = "7"
+          VALUE                = "G"
+        END_OBJECT             = PARAMETERVALUE
+
+      END_GROUP              = INFORMATIONCONTENT
+
+    END_OBJECT             = ADDITIONALATTRIBUTESCONTAINER
+
+    OBJECT                 = ADDITIONALATTRIBUTESCONTAINER
+      CLASS                = "8"
+
+      OBJECT                 = ADDITIONALATTRIBUTENAME
+        CLASS                = "8"
+        NUM_VAL              = 1
+        VALUE                = "InputGranuleCount"
+      END_OBJECT             = ADDITIONALATTRIBUTENAME
+
+      GROUP                  = INFORMATIONCONTENT
+        CLASS                = "8"
+
+        OBJECT                 = PARAMETERVALUE
+          NUM_VAL              = 1
+          CLASS                = "8"
+          VALUE                = "521"
+        END_OBJECT             = PARAMETERVALUE
+
+      END_GROUP              = INFORMATIONCONTENT
+
+    END_OBJECT             = ADDITIONALATTRIBUTESCONTAINER
+
+    OBJECT                 = ADDITIONALATTRIBUTESCONTAINER
+      CLASS                = "9"
+
+      OBJECT                 = ADDITIONALATTRIBUTENAME
+        CLASS                = "9"
+        NUM_VAL              = 1
+        VALUE                = "NumDaysPlanned"
+      END_OBJECT             = ADDITIONALATTRIBUTENAME
+
+      GROUP                  = INFORMATIONCONTENT
+        CLASS                = "9"
+
+        OBJECT                 = PARAMETERVALUE
+          NUM_VAL              = 1
+          CLASS                = "9"
+          VALUE                = "1"
+        END_OBJECT             = PARAMETERVALUE
+
+      END_GROUP              = INFORMATIONCONTENT
+
+    END_OBJECT             = ADDITIONALATTRIBUTESCONTAINER
+
+    OBJECT                 = ADDITIONALATTRIBUTESCONTAINER
+      CLASS                = "10"
+
+      OBJECT                 = ADDITIONALATTRIBUTENAME
+        CLASS                = "10"
+        NUM_VAL              = 1
+        VALUE                = "NumDaysInCycle"
+      END_OBJECT             = ADDITIONALATTRIBUTENAME
+
+      GROUP                  = INFORMATIONCONTENT
+        CLASS                = "10"
+
+        OBJECT                 = PARAMETERVALUE
+          NUM_VAL              = 1
+          CLASS                = "10"
+          VALUE                = "1"
+        END_OBJECT             = PARAMETERVALUE
+
+      END_GROUP              = INFORMATIONCONTENT
+
+    END_OBJECT             = ADDITIONALATTRIBUTESCONTAINER
+
+    OBJECT                 = ADDITIONALATTRIBUTESCONTAINER
+      CLASS                = "11"
+
+      OBJECT                 = ADDITIONALATTRIBUTENAME
+        CLASS                = "11"
+        NUM_VAL              = 1
+        VALUE                = "StartDayInAquaRepeat"
+      END_OBJECT             = ADDITIONALATTRIBUTENAME
+
+      GROUP                  = INFORMATIONCONTENT
+        CLASS                = "11"
+
+        OBJECT                 = PARAMETERVALUE
+          NUM_VAL              = 1
+          CLASS                = "11"
+          VALUE                = "8"
+        END_OBJECT             = PARAMETERVALUE
+
+      END_GROUP              = INFORMATIONCONTENT
+
+    END_OBJECT             = ADDITIONALATTRIBUTESCONTAINER
+
+    OBJECT                 = ADDITIONALATTRIBUTESCONTAINER
+      CLASS                = "12"
+
+      OBJECT                 = ADDITIONALATTRIBUTENAME
+        CLASS                = "12"
+        NUM_VAL              = 1
+        VALUE                = "AIRSRunTag"
+      END_OBJECT             = ADDITIONALATTRIBUTENAME
+
+      GROUP                  = INFORMATIONCONTENT
+        CLASS                = "12"
+
+        OBJECT                 = PARAMETERVALUE
+          NUM_VAL              = 1
+          CLASS                = "12"
+          VALUE                = "15281122640"
+        END_OBJECT             = PARAMETERVALUE
+
+      END_GROUP              = INFORMATIONCONTENT
+
+    END_OBJECT             = ADDITIONALATTRIBUTESCONTAINER
+
+    OBJECT                 = ADDITIONALATTRIBUTESCONTAINER
+      CLASS                = "13"
+
+      OBJECT                 = ADDITIONALATTRIBUTENAME
+        CLASS                = "13"
+        NUM_VAL              = 1
+        VALUE                = "ProductGenerationHostInformation"
+      END_OBJECT             = ADDITIONALATTRIBUTENAME
+
+      GROUP                  = INFORMATIONCONTENT
+        CLASS                = "13"
+
+        OBJECT                 = PARAMETERVALUE
+          NUM_VAL              = 1
+          CLASS                = "13"
+          VALUE                = "ac14.gesdisc.eosdis.nasa.gov Linux 2.6.32-573.1.1.el6.x86_64 #1_SMP_Sat_Jul_25_17:05:50_UTC_2015 x86_64"
+        END_OBJECT             = PARAMETERVALUE
+
+      END_GROUP              = INFORMATIONCONTENT
+
+    END_OBJECT             = ADDITIONALATTRIBUTESCONTAINER
+
+    OBJECT                 = ADDITIONALATTRIBUTESCONTAINER
+      CLASS                = "14"
+
+      OBJECT                 = ADDITIONALATTRIBUTENAME
+        CLASS                = "14"
+        NUM_VAL              = 1
+        VALUE                = "identifier_product_doi"
+      END_OBJECT             = ADDITIONALATTRIBUTENAME
+
+      GROUP                  = INFORMATIONCONTENT
+        CLASS                = "14"
+
+        OBJECT                 = PARAMETERVALUE
+          NUM_VAL              = 1
+          CLASS                = "14"
+          VALUE                = "10.5067/AQUA/AIRS/DATA303"
+        END_OBJECT             = PARAMETERVALUE
+
+      END_GROUP              = INFORMATIONCONTENT
+
+    END_OBJECT             = ADDITIONALATTRIBUTESCONTAINER
+
+    OBJECT                 = ADDITIONALATTRIBUTESCONTAINER
+      CLASS                = "15"
+
+      OBJECT                 = ADDITIONALATTRIBUTENAME
+        CLASS                = "15"
+        NUM_VAL              = 1
+        VALUE                = "identifier_product_doi_authority"
+      END_OBJECT             = ADDITIONALATTRIBUTENAME
+
+      GROUP                  = INFORMATIONCONTENT
+        CLASS                = "15"
+
+        OBJECT                 = PARAMETERVALUE
+          NUM_VAL              = 1
+          CLASS                = "15"
+          VALUE                = "http://dx.doi.org/"
+        END_OBJECT             = PARAMETERVALUE
+
+      END_GROUP              = INFORMATIONCONTENT
+
+    END_OBJECT             = ADDITIONALATTRIBUTESCONTAINER
+
+  END_GROUP              = ADDITIONALATTRIBUTES
+
+END_GROUP              = INVENTORYMETADATA
+
+END
+</Value>
+  </Attribute>
+</Dataset>
diff --git a/tests/dmr-testsuite/ignore_foreign_xml_1.xml.baseline b/tests/dmr-testsuite/ignore_foreign_xml_1.xml.baseline
new file mode 100644
index 0000000..be740dc
--- /dev/null
+++ b/tests/dmr-testsuite/ignore_foreign_xml_1.xml.baseline
@@ -0,0 +1,8257 @@
+Parse successful
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="AIRS.2015.09.21.L3.RetStd_IR001.v6.0.31.0.G15281122640.nc.h5">
+    <Dimension name="Latitude" size="180"/>
+    <Dimension name="Longitude" size="360"/>
+    <Dimension name="StdPressureLev" size="24"/>
+    <Dimension name="H2OPressureLev" size="12"/>
+    <Dimension name="CoarseCloudLayer" size="3"/>
+    <Dimension name="EmisFreqMW" size="3"/>
+    <Dimension name="FineCloudLayer" size="12"/>
+    <Dimension name="H2OPressureLay" size="12"/>
+    <Dimension name="EmisFreqIR" size="4"/>
+    <Float32 name="ClrOLR_A">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="GPHeight_MW_A_sdev">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="CO_VMR_TqJ_D_ct">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="RelHum_liquid_A_max">
+        <Dim name="/H2OPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>5</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="Temperature_A_err">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotH2OVap_TqJ_A">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotCldLiqH2O_MW_A_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="RelHum_A_min">
+        <Dim name="/H2OPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>5</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="TropHeight_TqJ_D_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Int16 name="TropHeight_D_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="O3_VMR_TqJ_D">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="SurfPres_Forecast_D_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="CloudFrc_A_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="RelHum_TqJ_D_max">
+        <Dim name="/H2OPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>5</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CoarseCloudPres_TqJ_D_sdev">
+        <Dim name="/CoarseCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>0</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CloudFrc_TqJ_D_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="RelHumSurf_TqJ_D_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="O3_VMR_TqJ_A_max">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CloudTopPres_TqJ_D_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="Emis_MW_D">
+        <Dim name="/EmisFreqMW"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>2</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CloudTopPres_A">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="SurfSkinTemp_TqJ_D">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CloudFrc_TqJ_A_err">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="H2O_MMR_TqJ_D">
+        <Dim name="/H2OPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>5</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="TotCO_TqJ_A_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Int16 name="TropPres_D_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="FineCloudFrc_TqJ_A_sdev">
+        <Dim name="/FineCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>3</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotCO_TqJ_D_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="ClrOLR_TqJ_A">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotCldLiqH2O_MW_A_err">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="H2O_MMR_Surf_TqJ_D_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="Temperature_TqJ_D_ct">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Int16>
+    <Int16 name="TotCH4_A_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="H2O_MMR_Lyr_A_min">
+        <Dim name="/H2OPressureLay"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>4</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CO_VMR_TqJ_D_sdev">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="H2O_MMR_Surf_TqJ_D_err">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="Temperature_TqJ_D">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CloudFrc_TqJ_D_err">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="RelHum_A_ct">
+        <Dim name="/H2OPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>5</Value>
+        </Attribute>
+    </Int16>
+    <Int16 name="RelHumSurf_liquid_TqJ_A_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="H2O_MMR_Lyr_D_sdev">
+        <Dim name="/H2OPressureLay"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>4</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="EmisIR_A_sdev">
+        <Dim name="/EmisFreqIR"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>1</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TropTemp_A_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TropPres_D_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="OLR_D_err">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="O3_VMR_D">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="H2O_MMR_D_ct">
+        <Dim name="/H2OPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>5</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="GPHeight_TqJ_D">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="SurfSkinTemp_TqJ_A_err">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="TropTemp_D_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="Temperature_TqJ_A_min">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotH2OVap_A_err">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="Temperature_TqJ_D_err">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="OLR_TqJ_D_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="SurfSkinTemp_TqJ_D_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="SurfSkinTemp_TqJ_A">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CloudTopPres_D_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="SurfPres_Forecast_A">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="H2O_MMR_Lyr_TqJ_D_err">
+        <Dim name="/H2OPressureLay"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>4</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CoarseCloudTemp_TqJ_A">
+        <Dim name="/CoarseCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>0</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CH4_VMR_TqJ_D_min">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="RelHum_liquid_TqJ_A_ct">
+        <Dim name="/H2OPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>5</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="TropHeight_TqJ_A_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="H2O_MMR_Lyr_TqJ_A_ct">
+        <Dim name="/H2OPressureLay"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>4</Value>
+        </Attribute>
+    </Int16>
+    <Int16 name="TotalCounts_TqJ_A">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="OLR_A_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TropPres_TqJ_A_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotO3_D">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="CoarseCloudTemp_D_ct">
+        <Dim name="/CoarseCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>0</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="TropHeight_D_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="TotH2OVap_D_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="FineCloudFrc_D_max">
+        <Dim name="/FineCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>3</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="O3_VMR_A_ct">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="GPHeight_MW_A_max">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CO_VMR_TqJ_A_max">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="CloudTopPres_TqJ_A_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="H2O_MMR_TqJ_A">
+        <Dim name="/H2OPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>5</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="EmisIR_TqJ_A_sdev">
+        <Dim name="/EmisFreqIR"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>1</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotH2OVap_TqJ_D_err">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="TotalCounts_A">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="O3_VMR_A_sdev">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="GPHeight_TqJ_D_max">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="O3_VMR_D_sdev">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CH4_VMR_TqJ_D_max">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CloudTopTemp_TqJ_A_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="TotH2OVap_TqJ_A_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="CloudTopTemp_TqJ_D_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotCH4_D_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="CoarseCloudPres_TqJ_D_ct">
+        <Dim name="/CoarseCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>0</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="TotH2OVap_MW_A_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CoarseCloudFrc_TqJ_D">
+        <Dim name="/CoarseCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>0</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CloudFrc_TqJ_D_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="RelHumSurf_TqJ_A_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Int16 name="CloudFrc_TqJ_D_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="CoarseCloudTemp_D">
+        <Dim name="/CoarseCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>0</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TropPres_A_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="RelHum_liquid_TqJ_D_max">
+        <Dim name="/H2OPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>5</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="FineCloudFrc_A_min">
+        <Dim name="/FineCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>3</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="ClrOLR_D">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="H2O_MMR_Surf_TqJ_A">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="O3_VMR_A_min">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="CloudTopTemp_D_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="FineCloudFrc_A_max">
+        <Dim name="/FineCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>3</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="FineCloudFrc_A_sdev">
+        <Dim name="/FineCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>3</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CloudTopTemp_A_err">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="RelHumSurf_A_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CloudFrc_TqJ_A">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CO_VMR_A_min">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="SurfAirTemp_TqJ_D_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="FineCloudFrc_D_ct">
+        <Dim name="/FineCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>3</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="TotCH4_TqJ_D_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TropTemp_TqJ_A_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="RelHumSurf_A_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float64 name="Longitude">
+        <Dim name="/Longitude"/>
+        <Attribute name="CLASS" type="String">
+            <Value>DIMENSION_SCALE</Value>
+        </Attribute>
+        <Attribute name="NAME" type="String">
+            <Value>Longitude</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>7</Value>
+        </Attribute>
+        <Attribute name="long_name" type="String">
+            <Value>Longitude</Value>
+        </Attribute>
+        <Attribute name="units" type="String">
+            <Value>degrees_east</Value>
+        </Attribute>
+        <Attribute name="format" type="String">
+            <Value>F6.1</Value>
+        </Attribute>
+    </Float64>
+    <Float32 name="Temperature_TqJ_D_sdev">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="TotCH4_TqJ_D_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="H2O_MMR_Surf_D_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="EmisIR_TqJ_D_err">
+        <Dim name="/EmisFreqIR"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>1</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="H2O_MMR_A">
+        <Dim name="/H2OPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>5</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="O3_VMR_D_min">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="Temperature_TqJ_A_ct">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="CO_VMR_D_max">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TropTemp_TqJ_D_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CloudTopPres_D">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="TropPres_TqJ_D_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="CloudTopPres_A_err">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CloudTopPres_TqJ_A_err">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CloudTopPres_TqJ_A_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CloudTopPres_D_err">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CloudTopPres_D_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="TotH2OVap_MW_A_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Int16 name="O3_VMR_TqJ_A_ct">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="TotO3_TqJ_D_err">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="H2O_MMR_Surf_D">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TropTemp_D_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CH4_VMR_TqJ_D">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="H2OPressureLay">
+        <Dim name="/H2OPressureLay"/>
+        <Attribute name="CLASS" type="String">
+            <Value>DIMENSION_SCALE</Value>
+        </Attribute>
+        <Attribute name="NAME" type="String">
+            <Value>H2OPressureLay</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>4</Value>
+        </Attribute>
+        <Attribute name="long_name" type="String">
+            <Value>Mid-layer Pressure</Value>
+        </Attribute>
+        <Attribute name="units" type="String">
+            <Value>hPa</Value>
+        </Attribute>
+        <Attribute name="format" type="String">
+            <Value>F7.2</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="RelHumSurf_liquid_TqJ_D_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="Emis_MW_A_ct">
+        <Dim name="/EmisFreqMW"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>2</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="EmisIR_TqJ_A_min">
+        <Dim name="/EmisFreqIR"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>1</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="CH4_VMR_TqJ_D_ct">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="TotO3_TqJ_D">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="RelHum_liquid_TqJ_D">
+        <Dim name="/H2OPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>5</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotCH4_TqJ_A_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="GPHeight_A_max">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="O3_VMR_D_max">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="SurfAirTemp_A_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="Temperature_A_ct">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="H2O_MMR_TqJ_A_min">
+        <Dim name="/H2OPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>5</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="SurfSkinTemp_D_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="O3_VMR_TqJ_A_err">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="EmisIR_D_err">
+        <Dim name="/EmisFreqIR"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>1</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="Temperature_A_max">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="RelHumSurf_liquid_TqJ_D_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="ClrOLR_TqJ_D_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="EmisIR_A_ct">
+        <Dim name="/EmisFreqIR"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>1</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="OLR_TqJ_D">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="Temperature_MW_A">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="SurfAirTemp_TqJ_A_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CloudTopPres_TqJ_D_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CloudTopTemp_TqJ_A_err">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotCH4_A_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="EmisIR_TqJ_D_sdev">
+        <Dim name="/EmisFreqIR"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>1</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="RelHumSurf_D_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="SurfAirTemp_D_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="FineCloudFrc_A">
+        <Dim name="/FineCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>3</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="SurfAirTemp_TqJ_D_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TropHeight_TqJ_D_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="H2O_MMR_Lyr_TqJ_A_max">
+        <Dim name="/H2OPressureLay"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>4</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="SurfSkinTemp_TqJ_D_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="SurfAirTemp_TqJ_A_err">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="ClrOLR_A_err">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TropTemp_D_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CloudTopTemp_D_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CoarseCloudPres_D">
+        <Dim name="/CoarseCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>0</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TropPres_D_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotCO_TqJ_A_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="H2O_MMR_Surf_A_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotH2OVap_A_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotCldLiqH2O_MW_D_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CH4_VMR_A_max">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CH4_VMR_A">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="H2O_MMR_Surf_D_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="SurfSkinTemp_TqJ_D_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="OLR_A_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotCO_D">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="CoarseCloudFrc_TqJ_D_ct">
+        <Dim name="/CoarseCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>0</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="TotCH4_D_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="H2O_MMR_A_ct">
+        <Dim name="/H2OPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>5</Value>
+        </Attribute>
+    </Int16>
+    <Int16 name="H2O_MMR_TqJ_A_ct">
+        <Dim name="/H2OPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>5</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="SurfSkinTemp_A_err">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="SurfPres_Forecast_TqJ_D_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CO_VMR_A_err">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotH2OVap_D_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="Temperature_TqJ_A">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotO3_TqJ_D_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="SurfAirTemp_TqJ_D_err">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="GPHeight_MW_D_min">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CO_VMR_D_sdev">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="RelHum_TqJ_A_max">
+        <Dim name="/H2OPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>5</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="RelHumSurf_liquid_TqJ_D_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="H2O_MMR_TqJ_A_sdev">
+        <Dim name="/H2OPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>5</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CH4_VMR_TqJ_D_sdev">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="O3_VMR_D_err">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotO3_A_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="OLR_TqJ_A_err">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="EmisFreqMW">
+        <Dim name="/EmisFreqMW"/>
+        <Attribute name="CLASS" type="String">
+            <Value>DIMENSION_SCALE</Value>
+        </Attribute>
+        <Attribute name="NAME" type="String">
+            <Value>EmisFreqMW</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>2</Value>
+        </Attribute>
+        <Attribute name="long_name" type="String">
+            <Value>Frequency</Value>
+        </Attribute>
+        <Attribute name="units" type="String">
+            <Value>GHz</Value>
+        </Attribute>
+        <Attribute name="format" type="String">
+            <Value>F5.1</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CloudFrc_TqJ_D">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="SurfAirTemp_A_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="CoarseCloudFrc_TqJ_A_sdev">
+        <Dim name="/CoarseCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>0</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="RelHumSurf_TqJ_D">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotCH4_TqJ_A_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CO_VMR_TqJ_A_sdev">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="H2O_MMR_Surf_A_err">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="RelHumSurf_TqJ_A_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotCH4_D_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotH2OVap_TqJ_A_err">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="GPHeight_TqJ_D_min">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="SurfSkinTemp_A_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CO_VMR_D">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CloudTopTemp_TqJ_D">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotO3_TqJ_A_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CoarseCloudFrc_TqJ_D_min">
+        <Dim name="/CoarseCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>0</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TropPres_TqJ_D">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="RelHum_TqJ_A_ct">
+        <Dim name="/H2OPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>5</Value>
+        </Attribute>
+    </Int16>
+    <Int16 name="Temperature_MW_D_ct">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="Temperature_D_err">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotH2OVap_D">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="H2O_MMR_D_sdev">
+        <Dim name="/H2OPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>5</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CoarseCloudPres_TqJ_A_sdev">
+        <Dim name="/CoarseCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>0</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CoarseCloudPres_A_min">
+        <Dim name="/CoarseCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>0</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="EmisIR_D_max">
+        <Dim name="/EmisFreqIR"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>1</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TropPres_A_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="Temperature_MW_D_min">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="RelHum_D_max">
+        <Dim name="/H2OPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>5</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="TotalCounts_MW_D">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Int16 name="CH4_VMR_TqJ_A_ct">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="OLR_D_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CoarseCloudPres_D_sdev">
+        <Dim name="/CoarseCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>0</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="RelHum_liquid_D_max">
+        <Dim name="/H2OPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>5</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CH4_VMR_TqJ_A">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="SurfAirTemp_A_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="RelHumSurf_D_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="CO_VMR_D_min">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotO3_TqJ_A_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="RelHumSurf_liquid_D_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="SurfAirTemp_A_err">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CloudFrc_TqJ_A_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="OLR_TqJ_D_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="OLR_D_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="SurfPres_Forecast_TqJ_A_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotH2OVap_A_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotH2OVap_MW_D_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="SurfAirTemp_D">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CoarseCloudFrc_A">
+        <Dim name="/CoarseCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>0</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CoarseCloudPres_A_max">
+        <Dim name="/CoarseCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>0</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="CloudTopPres_TqJ_D_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Int16 name="RelHum_liquid_D_ct">
+        <Dim name="/H2OPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>5</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="OLR_TqJ_D_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="H2O_MMR_Surf_TqJ_A_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotCldLiqH2O_MW_A">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotH2OVap_D_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="CloudTopTemp_A_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Int16 name="CO_VMR_A_ct">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="FineCloudFrc_TqJ_A_min">
+        <Dim name="/FineCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>3</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="Temperature_TqJ_A_err">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="OLR_TqJ_A_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="CH4_VMR_D_ct">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="RelHum_liquid_A">
+        <Dim name="/H2OPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>5</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="O3_VMR_A_err">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TropTemp_TqJ_A_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="ClrOLR_TqJ_A_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CloudFrc_D_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotH2OVap_TqJ_D_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CloudFrc_TqJ_D_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CoarseCloudFrc_TqJ_A_min">
+        <Dim name="/CoarseCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>0</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="FineCloudFrc_TqJ_A_ct">
+        <Dim name="/FineCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>3</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="TotO3_A">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="RelHum_liquid_D_min">
+        <Dim name="/H2OPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>5</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TropPres_A_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CoarseCloudPres_TqJ_D_min">
+        <Dim name="/CoarseCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>0</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="TotH2OVap_A_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="TropTemp_TqJ_A">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="RelHum_TqJ_A">
+        <Dim name="/H2OPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>5</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="RelHum_liquid_A_sdev">
+        <Dim name="/H2OPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>5</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="GPHeight_A_ct">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="SurfPres_Forecast_TqJ_D">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="RelHum_liquid_A_min">
+        <Dim name="/H2OPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>5</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TropTemp_TqJ_D_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotO3_TqJ_D_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="GPHeight_MW_A_ct">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Int16>
+    <Int16 name="TropPres_A_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="EmisIR_D_min">
+        <Dim name="/EmisFreqIR"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>1</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="TotCH4_D_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="SurfAirTemp_D_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CH4_VMR_A_err">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="TropHeight_A_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Int16 name="SurfSkinTemp_A_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="CoarseCloudFrc_A_sdev">
+        <Dim name="/CoarseCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>0</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CloudTopTemp_A_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="FineCloudFrc_TqJ_D">
+        <Dim name="/FineCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>3</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="H2O_MMR_A_max">
+        <Dim name="/H2OPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>5</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="ClrOLR_TqJ_D_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotO3_TqJ_A">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="H2O_MMR_Lyr_A_ct">
+        <Dim name="/H2OPressureLay"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>4</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="CloudTopTemp_TqJ_A">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="Emis_MW_D_sdev">
+        <Dim name="/EmisFreqMW"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>2</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="RelHumSurf_liquid_TqJ_A_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="CloudFrc_TqJ_A_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="OLR_D_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="OLR_TqJ_D_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="RelHum_TqJ_A_sdev">
+        <Dim name="/H2OPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>5</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CO_VMR_TqJ_D_min">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CloudTopPres_A_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="ClrOLR_TqJ_A_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="TropPres_A">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="TotalCounts_D">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Int16 name="RelHumSurf_liquid_A_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="H2O_MMR_TqJ_A_max">
+        <Dim name="/H2OPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>5</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotCO_A_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="ClrOLR_D_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="Temperature_TqJ_A_sdev">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="H2O_MMR_D_max">
+        <Dim name="/H2OPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>5</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotCO_TqJ_D_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="SurfSkinTemp_A">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="SurfSkinTemp_D_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="H2O_MMR_Surf_A_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="TropHeight_D_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CoarseCloudTemp_TqJ_A_min">
+        <Dim name="/CoarseCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>0</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TropTemp_A">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TropHeight_A_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotCldLiqH2O_MW_A_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotCH4_TqJ_D">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CloudFrc_A_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="RelHum_A">
+        <Dim name="/H2OPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>5</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CloudTopTemp_D">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="Temperature_D_max">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CloudTopPres_A_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CoarseCloudTemp_A_min">
+        <Dim name="/CoarseCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>0</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="TropTemp_TqJ_D_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="Temperature_TqJ_D_max">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="RelHumSurf_D_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CloudFrc_TqJ_A_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="TotCldLiqH2O_MW_D_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="H2O_MMR_Surf_A">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TropPres_D">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="FineCloudLayer">
+        <Dim name="/FineCloudLayer"/>
+        <Attribute name="CLASS" type="String">
+            <Value>DIMENSION_SCALE</Value>
+        </Attribute>
+        <Attribute name="NAME" type="String">
+            <Value>FineCloudLayer</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>3</Value>
+        </Attribute>
+        <Attribute name="long_name" type="String">
+            <Value>Mid-layer pressure</Value>
+        </Attribute>
+        <Attribute name="units" type="String">
+            <Value>hPa</Value>
+        </Attribute>
+        <Attribute name="format" type="String">
+            <Value>F7.2</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CoarseCloudFrc_D">
+        <Dim name="/CoarseCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>0</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="CoarseCloudFrc_TqJ_A_ct">
+        <Dim name="/CoarseCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>0</Value>
+        </Attribute>
+    </Int16>
+    <Float64 name="Latitude">
+        <Dim name="/Latitude"/>
+        <Attribute name="CLASS" type="String">
+            <Value>DIMENSION_SCALE</Value>
+        </Attribute>
+        <Attribute name="NAME" type="String">
+            <Value>Latitude</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+        <Attribute name="long_name" type="String">
+            <Value>Latitude</Value>
+        </Attribute>
+        <Attribute name="units" type="String">
+            <Value>degrees_north</Value>
+        </Attribute>
+        <Attribute name="format" type="String">
+            <Value>F5.1</Value>
+        </Attribute>
+    </Float64>
+    <Float32 name="CloudFrc_D_err">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="O3_VMR_TqJ_D_err">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="SurfSkinTemp_D_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotCO_TqJ_A_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="H2O_MMR_Surf_TqJ_A_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotCldLiqH2O_MW_D_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="H2O_MMR_Lyr_D_min">
+        <Dim name="/H2OPressureLay"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>4</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CoarseCloudFrc_D_sdev">
+        <Dim name="/CoarseCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>0</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="RelHum_TqJ_A_min">
+        <Dim name="/H2OPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>5</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotCO_A_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="TotCO_D_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Int16 name="TropTemp_TqJ_A_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="CH4_VMR_D">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="RelHum_liquid_TqJ_D_sdev">
+        <Dim name="/H2OPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>5</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="ClrOLR_TqJ_D_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Int16 name="CoarseCloudTemp_TqJ_A_ct">
+        <Dim name="/CoarseCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>0</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="EmisIR_TqJ_A">
+        <Dim name="/EmisFreqIR"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>1</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="Emis_MW_A_sdev">
+        <Dim name="/EmisFreqMW"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>2</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="SurfSkinTemp_TqJ_A_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="H2O_MMR_Surf_TqJ_D_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="H2O_MMR_Lyr_TqJ_D_ct">
+        <Dim name="/H2OPressureLay"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>4</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="TotCH4_TqJ_D_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CloudFrc_A">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="SurfPres_Forecast_TqJ_A_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="RelHumSurf_D">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotCO_D_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="EmisIR_TqJ_A_max">
+        <Dim name="/EmisFreqIR"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>1</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="EmisIR_D_ct">
+        <Dim name="/EmisFreqIR"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>1</Value>
+        </Attribute>
+    </Int16>
+    <Int16 name="RelHum_liquid_A_ct">
+        <Dim name="/H2OPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>5</Value>
+        </Attribute>
+    </Int16>
+    <Int16 name="GPHeight_TqJ_D_ct">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="TropHeight_A_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotH2OVap_MW_D">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="RelHumSurf_liquid_D_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Int16 name="CO_VMR_TqJ_A_ct">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="CoarseCloudFrc_TqJ_A_max">
+        <Dim name="/CoarseCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>0</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotCH4_A_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TropTemp_D_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="TotalCounts_TqJ_D">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Int16 name="OLR_A_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="CloudTopPres_TqJ_A_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TropPres_TqJ_D_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="H2O_MMR_Lyr_TqJ_D">
+        <Dim name="/H2OPressureLay"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>4</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CoarseCloudLayer">
+        <Dim name="/CoarseCloudLayer"/>
+        <Attribute name="CLASS" type="String">
+            <Value>DIMENSION_SCALE</Value>
+        </Attribute>
+        <Attribute name="NAME" type="String">
+            <Value>CoarseCloudLayer</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="long_name" type="String">
+            <Value>Mid-layer pressure</Value>
+        </Attribute>
+        <Attribute name="units" type="String">
+            <Value>hPa</Value>
+        </Attribute>
+        <Attribute name="format" type="String">
+            <Value>F7.2</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CoarseCloudTemp_A_max">
+        <Dim name="/CoarseCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>0</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="CoarseCloudPres_A_ct">
+        <Dim name="/CoarseCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>0</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="RelHum_TqJ_D_min">
+        <Dim name="/H2OPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>5</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="Temperature_TqJ_D_min">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="CoarseCloudTemp_A_ct">
+        <Dim name="/CoarseCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>0</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="ClrOLR_A_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TropTemp_TqJ_A_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TropHeight_TqJ_A">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="SurfSkinTemp_TqJ_D_err">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="O3_VMR_TqJ_D_max">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="ClrOLR_TqJ_A_err">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CoarseCloudFrc_TqJ_A">
+        <Dim name="/CoarseCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>0</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="SurfPres_Forecast_TqJ_A_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="SurfSkinTemp_D_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="FineCloudFrc_D_min">
+        <Dim name="/FineCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>3</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="OLR_TqJ_A_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="RelHum_liquid_TqJ_A_max">
+        <Dim name="/H2OPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>5</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="RelHum_D_min">
+        <Dim name="/H2OPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>5</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CoarseCloudPres_TqJ_A">
+        <Dim name="/CoarseCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>0</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="RelHum_D_ct">
+        <Dim name="/H2OPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>5</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="H2O_MMR_Lyr_D">
+        <Dim name="/H2OPressureLay"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>4</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="SurfAirTemp_D_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="EmisIR_TqJ_D_max">
+        <Dim name="/EmisFreqIR"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>1</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="SurfAirTemp_A">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotCldLiqH2O_MW_A_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotCO_A">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="FineCloudFrc_TqJ_D_max">
+        <Dim name="/FineCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>3</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CloudFrc_TqJ_A_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotO3_D_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="RelHum_A_max">
+        <Dim name="/H2OPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>5</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="H2O_MMR_Surf_TqJ_A_err">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CloudTopPres_A_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="FineCloudFrc_TqJ_A">
+        <Dim name="/FineCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>3</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotCO_A_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="RelHum_liquid_TqJ_D_min">
+        <Dim name="/H2OPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>5</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CloudTopTemp_D_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="RelHumSurf_liquid_TqJ_A">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="H2O_MMR_A_err">
+        <Dim name="/H2OPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>5</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CoarseCloudTemp_TqJ_A_sdev">
+        <Dim name="/CoarseCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>0</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="H2O_MMR_D">
+        <Dim name="/H2OPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>5</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CloudFrc_A_err">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotH2OVap_TqJ_A_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="GPHeight_MW_D_sdev">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="CoarseCloudFrc_A_ct">
+        <Dim name="/CoarseCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>0</Value>
+        </Attribute>
+    </Int16>
+    <Int16 name="CO_VMR_D_ct">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="H2O_MMR_Surf_TqJ_D">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="OLR_A_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CloudFrc_D">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="FineCloudFrc_TqJ_D_sdev">
+        <Dim name="/FineCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>3</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="TotCO_TqJ_D_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="TotH2OVap_TqJ_A_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CoarseCloudPres_TqJ_A_max">
+        <Dim name="/CoarseCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>0</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotH2OVap_MW_A_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="H2O_MMR_D_min">
+        <Dim name="/H2OPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>5</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="EmisIR_A_err">
+        <Dim name="/EmisFreqIR"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>1</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="GPHeight_TqJ_A_max">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="RelHum_liquid_D_sdev">
+        <Dim name="/H2OPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>5</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="O3_VMR_A">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotH2OVap_TqJ_D">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CloudTopTemp_TqJ_A_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="RelHumSurf_A">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="OLR_TqJ_A">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="GPHeight_A_min">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="SurfSkinTemp_TqJ_A_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="H2O_MMR_Lyr_TqJ_D_max">
+        <Dim name="/H2OPressureLay"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>4</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="SurfAirTemp_A_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CoarseCloudFrc_D_min">
+        <Dim name="/CoarseCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>0</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="TotCH4_TqJ_A_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="CoarseCloudTemp_A_sdev">
+        <Dim name="/CoarseCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>0</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CloudTopPres_TqJ_A_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="TotH2OVap_MW_D_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="CO_VMR_A_max">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TropHeight_TqJ_A_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="GPHeight_MW_D">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="GPHeight_D">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="Temperature_MW_D_max">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="Temperature_D">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="H2O_MMR_Surf_A_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TropHeight_TqJ_A_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CloudTopTemp_TqJ_A_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="GPHeight_D_min">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="CloudTopTemp_TqJ_A_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="GPHeight_TqJ_D_sdev">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TropHeight_TqJ_D_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="ClrOLR_D_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CoarseCloudTemp_A">
+        <Dim name="/CoarseCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>0</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="H2O_MMR_D_err">
+        <Dim name="/H2OPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>5</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="CoarseCloudPres_TqJ_A_ct">
+        <Dim name="/CoarseCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>0</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="H2O_MMR_Lyr_A_sdev">
+        <Dim name="/H2OPressureLay"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>4</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CH4_VMR_TqJ_A_max">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="TropTemp_A_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="H2O_MMR_Lyr_TqJ_D_min">
+        <Dim name="/H2OPressureLay"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>4</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TropTemp_TqJ_D">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="SurfPres_Forecast_A_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="TropHeight_TqJ_D">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="LandSeaMask">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="CloudFrc_A_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TropTemp_TqJ_D_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="H2O_MMR_Surf_D_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="CloudTopPres_D_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="RelHumSurf_TqJ_A_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CoarseCloudFrc_A_min">
+        <Dim name="/CoarseCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>0</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="GPHeight_TqJ_A_ct">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="EmisFreqIR">
+        <Dim name="/EmisFreqIR"/>
+        <Attribute name="CLASS" type="String">
+            <Value>DIMENSION_SCALE</Value>
+        </Attribute>
+        <Attribute name="NAME" type="String">
+            <Value>EmisFreqIR</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>1</Value>
+        </Attribute>
+        <Attribute name="long_name" type="String">
+            <Value>Wavenumber</Value>
+        </Attribute>
+        <Attribute name="units" type="String">
+            <Value>cm^-1</Value>
+        </Attribute>
+        <Attribute name="format" type="String">
+            <Value>F5.1</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="GPHeight_MW_D_ct">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="TropTemp_A_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CloudTopTemp_D_err">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="CoarseCloudTemp_TqJ_D_ct">
+        <Dim name="/CoarseCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>0</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="Temperature_MW_D">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="FineCloudFrc_D_sdev">
+        <Dim name="/FineCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>3</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotCO_D_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="ClrOLR_TqJ_A_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CoarseCloudPres_TqJ_D">
+        <Dim name="/CoarseCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>0</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="RelHumSurf_A_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="CoarseCloudPres_A_sdev">
+        <Dim name="/CoarseCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>0</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="CoarseCloudPres_D_ct">
+        <Dim name="/CoarseCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>0</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="H2O_MMR_Surf_TqJ_D_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TropPres_TqJ_A">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotH2OVap_TqJ_D_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="RelHumSurf_TqJ_D_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="ClrOLR_D_err">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="GPHeight_D_ct">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="CoarseCloudPres_A">
+        <Dim name="/CoarseCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>0</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="H2O_MMR_TqJ_A_err">
+        <Dim name="/H2OPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>5</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="EmisIR_TqJ_D_ct">
+        <Dim name="/EmisFreqIR"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>1</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="TotCH4_A_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="Emis_MW_D_ct">
+        <Dim name="/EmisFreqMW"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>2</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="H2O_MMR_Lyr_D_max">
+        <Dim name="/H2OPressureLay"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>4</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CH4_VMR_TqJ_A_min">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TropHeight_D">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TropPres_D_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="Temperature_MW_A_sdev">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="RelHum_D">
+        <Dim name="/H2OPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>5</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="EmisIR_TqJ_D">
+        <Dim name="/EmisFreqIR"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>1</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="EmisIR_A">
+        <Dim name="/EmisFreqIR"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>1</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="O3_VMR_TqJ_A_min">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotO3_A_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="ClrOLR_D_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CO_VMR_A_sdev">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CoarseCloudFrc_A_max">
+        <Dim name="/CoarseCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>0</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="Emis_MW_A">
+        <Dim name="/EmisFreqMW"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>2</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="RelHumSurf_liquid_D_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="GPHeight_TqJ_A">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="OLR_A">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TropPres_TqJ_A_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="TotalCounts_MW_A">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="CloudTopPres_TqJ_D">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="RelHumSurf_liquid_TqJ_D">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="H2OPressureLev">
+        <Dim name="/H2OPressureLev"/>
+        <Attribute name="CLASS" type="String">
+            <Value>DIMENSION_SCALE</Value>
+        </Attribute>
+        <Attribute name="NAME" type="String">
+            <Value>H2OPressureLev</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>5</Value>
+        </Attribute>
+        <Attribute name="long_name" type="String">
+            <Value>Pressure</Value>
+        </Attribute>
+        <Attribute name="units" type="String">
+            <Value>hPa</Value>
+        </Attribute>
+        <Attribute name="format" type="String">
+            <Value>F7.2</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotCO_TqJ_D">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotCO_D_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="EmisIR_D_sdev">
+        <Dim name="/EmisFreqIR"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>1</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="H2O_MMR_Surf_TqJ_A_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CO_VMR_D_err">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="H2O_MMR_TqJ_D_err">
+        <Dim name="/H2OPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>5</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="SurfAirTemp_TqJ_A">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="ClrOLR_A_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="RelHumSurf_liquid_TqJ_A_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CoarseCloudTemp_D_sdev">
+        <Dim name="/CoarseCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>0</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="GPHeight_TqJ_A_sdev">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="H2O_MMR_Lyr_TqJ_D_sdev">
+        <Dim name="/H2OPressureLay"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>4</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="H2O_MMR_Surf_TqJ_D_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="RelHumSurf_liquid_D">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="SurfAirTemp_D_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CloudTopPres_TqJ_A">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="RelHumSurf_liquid_TqJ_A_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotH2OVap_TqJ_A_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotH2OVap_MW_A">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="SurfAirTemp_TqJ_D">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="RelHum_TqJ_D_ct">
+        <Dim name="/H2OPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>5</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="TotCO_TqJ_A">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="SurfSkinTemp_D">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CoarseCloudPres_D_max">
+        <Dim name="/CoarseCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>0</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="H2O_MMR_A_min">
+        <Dim name="/H2OPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>5</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="ClrOLR_TqJ_D">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="CoarseCloudFrc_D_ct">
+        <Dim name="/CoarseCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>0</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="RelHum_liquid_TqJ_A">
+        <Dim name="/H2OPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>5</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CH4_VMR_TqJ_A_err">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CoarseCloudTemp_D_max">
+        <Dim name="/CoarseCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>0</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="StdPressureLev">
+        <Dim name="/StdPressureLev"/>
+        <Attribute name="CLASS" type="String">
+            <Value>DIMENSION_SCALE</Value>
+        </Attribute>
+        <Attribute name="NAME" type="String">
+            <Value>StdPressureLev</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+        <Attribute name="long_name" type="String">
+            <Value>Pressure</Value>
+        </Attribute>
+        <Attribute name="units" type="String">
+            <Value>hPa</Value>
+        </Attribute>
+        <Attribute name="format" type="String">
+            <Value>F7.2</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="RelHumSurf_liquid_A_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="RelHumSurf_TqJ_A_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotCO_TqJ_A_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="Temperature_MW_A_min">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="RelHumSurf_liquid_D_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="Temperature_MW_D_sdev">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotCH4_D">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="EmisIR_TqJ_D_min">
+        <Dim name="/EmisFreqIR"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>1</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotCH4_A">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="RelHum_TqJ_D">
+        <Dim name="/H2OPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>5</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="H2O_MMR_Lyr_TqJ_A_err">
+        <Dim name="/H2OPressureLay"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>4</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="SurfAirTemp_TqJ_A_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CH4_VMR_A_min">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TropTemp_D">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="CloudFrc_D_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="GPHeight_MW_A_min">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CO_VMR_TqJ_A">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="TotO3_D_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Int16 name="TotO3_TqJ_A_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="Temperature_A">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="GPHeight_MW_D_max">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="ClrOLR_TqJ_D_err">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CloudTopTemp_TqJ_D_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="Temperature_D_sdev">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="OLR_D_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="Temperature_A_sdev">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="SurfSkinTemp_TqJ_A_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotH2OVap_TqJ_D_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="ClrOLR_TqJ_D_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="RelHum_liquid_TqJ_D_ct">
+        <Dim name="/H2OPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>5</Value>
+        </Attribute>
+    </Int16>
+    <Int16 name="O3_VMR_D_ct">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="Temperature_A_min">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TropHeight_TqJ_D_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotCO_TqJ_D_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="Emis_MW_D_max">
+        <Dim name="/EmisFreqMW"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>2</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="EmisIR_D">
+        <Dim name="/EmisFreqIR"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>1</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CoarseCloudPres_TqJ_D_max">
+        <Dim name="/CoarseCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>0</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="FineCloudFrc_A_ct">
+        <Dim name="/FineCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>3</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="RelHum_TqJ_D_sdev">
+        <Dim name="/H2OPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>5</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="SurfPres_Forecast_A_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="GPHeight_D_max">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotH2OVap_A">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="EmisIR_A_min">
+        <Dim name="/EmisFreqIR"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>1</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotO3_TqJ_D_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="SurfSkinTemp_TqJ_A_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="TropHeight_TqJ_A_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="SurfSkinTemp_A_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CloudTopPres_TqJ_D_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CoarseCloudTemp_D_min">
+        <Dim name="/CoarseCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>0</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CO_VMR_TqJ_D_err">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotO3_A_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CH4_VMR_D_min">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="Temperature_D_min">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TropHeight_A">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="SurfPres_Forecast_TqJ_D_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="CH4_VMR_D_max">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotO3_D_err">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CH4_VMR_A_sdev">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="Temperature_TqJ_A_max">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotH2OVap_D_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CO_VMR_A">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="H2O_MMR_TqJ_D_ct">
+        <Dim name="/H2OPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>5</Value>
+        </Attribute>
+    </Int16>
+    <Int16 name="ClrOLR_A_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="TotCldLiqH2O_MW_D_err">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="EmisIR_A_max">
+        <Dim name="/EmisFreqIR"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>1</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="H2O_MMR_TqJ_D_max">
+        <Dim name="/H2OPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>5</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="RelHumSurf_TqJ_A">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="OLR_TqJ_A_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="Temperature_MW_A_ct">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="CloudTopTemp_A">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CH4_VMR_D_sdev">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotCldLiqH2O_MW_D">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CO_VMR_TqJ_A_err">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="CloudTopPres_A_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="RelHum_liquid_TqJ_A_min">
+        <Dim name="/H2OPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>5</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="H2O_MMR_Lyr_TqJ_A">
+        <Dim name="/H2OPressureLay"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>4</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="H2O_MMR_Lyr_D_ct">
+        <Dim name="/H2OPressureLay"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>4</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="CloudFrc_D_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CH4_VMR_TqJ_D_err">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="TotO3_TqJ_D_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="H2O_MMR_A_sdev">
+        <Dim name="/H2OPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>5</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="RelHum_liquid_TqJ_A_sdev">
+        <Dim name="/H2OPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>5</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="SurfSkinTemp_TqJ_D_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="SurfAirTemp_TqJ_A_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="SurfPres_Forecast_D_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="GPHeight_A">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="EmisIR_TqJ_A_ct">
+        <Dim name="/EmisFreqIR"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>1</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="O3_VMR_A_max">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="RelHumSurf_D_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="OLR_A_err">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="SurfPres_Forecast_D_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="RelHumSurf_TqJ_D_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="H2O_MMR_Lyr_A_max">
+        <Dim name="/H2OPressureLay"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>4</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CoarseCloudFrc_TqJ_D_sdev">
+        <Dim name="/CoarseCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>0</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CoarseCloudFrc_D_max">
+        <Dim name="/CoarseCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>0</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotH2OVap_MW_D_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotO3_TqJ_A_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CH4_VMR_TqJ_A_sdev">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TropTemp_A_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CloudTopTemp_D_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TropPres_TqJ_A_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TropPres_TqJ_D_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="EmisIR_TqJ_A_err">
+        <Dim name="/EmisFreqIR"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>1</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TropHeight_D_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="RelHumSurf_liquid_A_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="RelHumSurf_liquid_A">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotO3_A_err">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CO_VMR_TqJ_D_max">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="FineCloudFrc_TqJ_D_min">
+        <Dim name="/FineCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>3</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CloudTopPres_TqJ_D_err">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotO3_TqJ_A_err">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="ClrOLR_D_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="SurfPres_Forecast_TqJ_A">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CoarseCloudPres_TqJ_A_min">
+        <Dim name="/CoarseCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>0</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="GPHeight_TqJ_A_min">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CoarseCloudTemp_TqJ_D">
+        <Dim name="/CoarseCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>0</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="RelHum_liquid_D">
+        <Dim name="/H2OPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>5</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="SurfAirTemp_TqJ_A_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="H2O_MMR_Surf_A_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="H2O_MMR_Lyr_TqJ_A_sdev">
+        <Dim name="/H2OPressureLay"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>4</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="TotO3_A_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="Temperature_MW_A_max">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotH2OVap_MW_D_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="GPHeight_A_sdev">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="SurfAirTemp_TqJ_D_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="SurfSkinTemp_D_err">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="Emis_MW_A_max">
+        <Dim name="/EmisFreqMW"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>2</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="H2O_MMR_Lyr_D_err">
+        <Dim name="/H2OPressureLay"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>4</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="TropPres_TqJ_A_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="OLR_TqJ_D_err">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="Emis_MW_A_min">
+        <Dim name="/EmisFreqMW"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>2</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TropHeight_A_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="FineCloudFrc_TqJ_D_ct">
+        <Dim name="/FineCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>3</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="H2O_MMR_Lyr_TqJ_A_min">
+        <Dim name="/H2OPressureLay"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>4</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CoarseCloudFrc_TqJ_D_max">
+        <Dim name="/CoarseCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>0</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="RelHumSurf_liquid_TqJ_D_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CoarseCloudTemp_TqJ_D_min">
+        <Dim name="/CoarseCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>0</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="H2O_MMR_TqJ_D_min">
+        <Dim name="/H2OPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>5</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotH2OVap_D_err">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="H2O_MMR_Lyr_A">
+        <Dim name="/H2OPressureLay"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>4</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="H2O_MMR_Surf_TqJ_A_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="H2O_MMR_Surf_D_err">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="GPHeight_MW_A">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="SurfPres_Forecast_D">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="SurfPres_Forecast_TqJ_D_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CloudFrc_D_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="ClrOLR_TqJ_A_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="O3_VMR_TqJ_D_min">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotO3_D_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotO3_D_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="RelHumSurf_TqJ_D_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotCH4_TqJ_D_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="RelHumSurf_liquid_A_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="SurfPres_Forecast_A_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CoarseCloudTemp_TqJ_D_max">
+        <Dim name="/CoarseCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>0</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotCH4_TqJ_A">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CH4_VMR_D_err">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="RelHumSurf_A_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CO_VMR_TqJ_D">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="SurfPres_Forecast_TqJ_A_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="GPHeight_D_sdev">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CloudTopTemp_TqJ_D_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CoarseCloudPres_D_min">
+        <Dim name="/CoarseCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>0</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="SurfSkinTemp_A_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="FineCloudFrc_D">
+        <Dim name="/FineCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>3</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="RelHum_D_sdev">
+        <Dim name="/H2OPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>5</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="TotH2OVap_TqJ_D_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="O3_VMR_TqJ_D_sdev">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CloudTopTemp_A_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="H2O_MMR_Surf_D_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Int16 name="SurfAirTemp_TqJ_D_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="SurfPres_Forecast_D_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="Emis_MW_D_min">
+        <Dim name="/EmisFreqMW"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>2</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CoarseCloudTemp_TqJ_D_sdev">
+        <Dim name="/CoarseCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>0</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="OLR_TqJ_A_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="ClrOLR_A_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="SurfPres_Forecast_TqJ_D_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotH2OVap_A_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotCH4_TqJ_A_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CloudTopTemp_A_min">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="TotCldLiqH2O_MW_A_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="FineCloudFrc_TqJ_A_max">
+        <Dim name="/FineCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>3</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="OLR_D">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CO_VMR_TqJ_A_min">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="TotCldLiqH2O_MW_D_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="H2O_MMR_TqJ_D_sdev">
+        <Dim name="/H2OPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>5</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="Temperature_D_ct">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="TropPres_TqJ_D_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="CloudFrc_A_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="CloudTopTemp_TqJ_D_err">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="Topography">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="CH4_VMR_A_ct">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="CloudTopPres_D_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="RelHum_A_sdev">
+        <Dim name="/H2OPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>5</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="O3_VMR_TqJ_D_ct">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="TotH2OVap_MW_A_max">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="O3_VMR_TqJ_A">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="O3_VMR_TqJ_A_sdev">
+        <Dim name="/StdPressureLev"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>8</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="TotCO_A_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="SurfAirTemp_D_err">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Int16 name="CloudTopTemp_TqJ_D_ct">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Int16">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Int16>
+    <Float32 name="SurfPres_Forecast_A_sdev">
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>6</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="H2O_MMR_Lyr_A_err">
+        <Dim name="/H2OPressureLay"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>4</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="CoarseCloudTemp_TqJ_A_max">
+        <Dim name="/CoarseCloudLayer"/>
+        <Dim name="/Latitude"/>
+        <Dim name="/Longitude"/>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9999.</Value>
+        </Attribute>
+        <Attribute name="_Netcdf4Dimid" type="Int32">
+            <Value>0</Value>
+        </Attribute>
+    </Float32>
+    <Attribute name="HDFEOSVersion" type="String">
+        <Value>HDFEOS_V2.18</Value>
+    </Attribute>
+    <Attribute name="StructMetadata_0" type="String">
+        <Value>GROUP=SwathStructureEND_GROUP=SwathStructureGROUP=GridStructure	GROUP=GRID_1		GridName=&quot;ascending&quot;		XDim=360		YDim=180		UpperLeftPointMtrs=(-179030000.000000,89030000.000000)		LowerRightMtrs=(180030000.000000,-90030000.000000)		Projection=GCTP_GEO		GROUP=Dimension			OBJECT=Dimension_1				DimensionName=&quot;StdPressureLev&quot;				Size=24			END_OBJECT=Dimension_1			OBJECT=Dimension_2				DimensionName=&quot;H2OPressureLev&quot;				Size=12			END_OBJECT=Dimension_2			OBJECT=Dimension_3				DimensionName=&quot;H2OPressureLay&quot;				Size=12			END_OBJECT=Dimension_3			OBJECT=Dimension_4				DimensionName=&quot;CoarseCloudLayer&quot;				Size=3			END_OBJECT=Dimension_4			OBJECT=Dimension_5				DimensionName=&quot;FineCloudLayer&quot;				Size=12			END_OBJECT=Dimension_5			OBJECT=Dimension_6				DimensionName=&quot;EmisFreqIR&quot;				Size=4			END_OBJECT=Dimension_6		END_GROUP=Dimension		GROUP=DataField			OBJECT=DataField_1				DataFieldName=&quot;TotalCounts_A&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_1			OBJECT=DataField_2				DataFieldName=&quot;SurfPres_Forecast_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_2			OBJECT=DataField_3				DataFieldName=&quot;SurfPres_Forecast_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_3			OBJECT=DataField_4				DataFieldName=&quot;SurfPres_Forecast_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_4			OBJECT=DataField_5				DataFieldName=&quot;SurfPres_Forecast_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_5			OBJECT=DataField_6				DataFieldName=&quot;SurfPres_Forecast_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_6			OBJECT=DataField_7				DataFieldName=&quot;SurfSkinTemp_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_7			OBJECT=DataField_8				DataFieldName=&quot;SurfSkinTemp_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_8			OBJECT=DataField_9				DataFieldName=&quot;SurfSkinTemp_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_9			OBJECT=DataField_10				DataFieldName=&quot;SurfSkinTemp_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_10			OBJECT=DataField_11				DataFieldName=&quot;SurfSkinTemp_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_11			OBJECT=DataField_12				DataFieldName=&quot;SurfSkinTemp_A_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_12			OBJECT=DataField_13				DataFieldName=&quot;EmisIR_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;EmisFreqIR&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_13			OBJECT=DataField_14				DataFieldName=&quot;EmisIR_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;EmisFreqIR&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_14			OBJECT=DataField_15				DataFieldName=&quot;EmisIR_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;EmisFreqIR&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_15			OBJECT=DataField_16				DataFieldName=&quot;EmisIR_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;EmisFreqIR&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_16			OBJECT=DataField_17				DataFieldName=&quot;EmisIR_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;EmisFreqIR&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_17			OBJECT=DataField_18				DataFieldName=&quot;EmisIR_A_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;EmisFreqIR&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_18			OBJECT=DataField_19				DataFieldName=&quot;Temperature_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_19			OBJECT=DataField_20				DataFieldName=&quot;Temperature_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_20			OBJECT=DataField_21				DataFieldName=&quot;Temperature_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_21			OBJECT=DataField_22				DataFieldName=&quot;Temperature_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_22			OBJECT=DataField_23				DataFieldName=&quot;Temperature_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_23			OBJECT=DataField_24				DataFieldName=&quot;Temperature_A_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_24			OBJECT=DataField_25				DataFieldName=&quot;SurfAirTemp_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_25			OBJECT=DataField_26				DataFieldName=&quot;SurfAirTemp_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_26			OBJECT=DataField_27				DataFieldName=&quot;SurfAirTemp_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_27			OBJECT=DataField_28				DataFieldName=&quot;SurfAirTemp_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_28			OBJECT=DataField_29				DataFieldName=&quot;SurfAirTemp_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_29			OBJECT=DataField_30				DataFieldName=&quot;SurfAirTemp_A_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_30			OBJECT=DataField_31				DataFieldName=&quot;TropPres_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_31			OBJECT=DataField_32				DataFieldName=&quot;TropPres_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_32			OBJECT=DataField_33				DataFieldName=&quot;TropPres_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_33			OBJECT=DataField_34				DataFieldName=&quot;TropPres_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_34			OBJECT=DataField_35				DataFieldName=&quot;TropPres_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_35			OBJECT=DataField_36				DataFieldName=&quot;TropTemp_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_36			OBJECT=DataField_37				DataFieldName=&quot;TropTemp_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_37			OBJECT=DataField_38				DataFieldName=&quot;TropTemp_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_38			OBJECT=DataField_39				DataFieldName=&quot;TropTemp_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_39			OBJECT=DataField_40				DataFieldName=&quot;TropTemp_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_40			OBJECT=DataField_41				DataFieldName=&quot;TotH2OVap_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_41			OBJECT=DataField_42				DataFieldName=&quot;TotH2OVap_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_42			OBJECT=DataField_43				DataFieldName=&quot;TotH2OVap_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_43			OBJECT=DataField_44				DataFieldName=&quot;TotH2OVap_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_44			OBJECT=DataField_45				DataFieldName=&quot;TotH2OVap_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_45			OBJECT=DataField_46				DataFieldName=&quot;TotH2OVap_A_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_46			OBJECT=DataField_47				DataFieldName=&quot;H2O_MMR_Lyr_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLay&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_47			OBJECT=DataField_48				DataFieldName=&quot;H2O_MMR_Lyr_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;H2OPressureLay&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_48			OBJECT=DataField_49				DataFieldName=&quot;H2O_MMR_Lyr_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLay&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_49			OBJECT=DataField_50				DataFieldName=&quot;H2O_MMR_Lyr_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLay&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_50			OBJECT=DataField_51				DataFieldName=&quot;H2O_MMR_Lyr_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLay&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_51			OBJECT=DataField_52				DataFieldName=&quot;H2O_MMR_Lyr_A_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLay&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_52			OBJECT=DataField_53				DataFieldName=&quot;H2O_MMR_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_53			OBJECT=DataField_54				DataFieldName=&quot;H2O_MMR_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;H2OPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_54			OBJECT=DataField_55				DataFieldName=&quot;H2O_MMR_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_55			OBJECT=DataField_56				DataFieldName=&quot;H2O_MMR_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_56			OBJECT=DataField_57				DataFieldName=&quot;H2O_MMR_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_57			OBJECT=DataField_58				DataFieldName=&quot;H2O_MMR_A_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_58			OBJECT=DataField_59				DataFieldName=&quot;H2O_MMR_Surf_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_59			OBJECT=DataField_60				DataFieldName=&quot;H2O_MMR_Surf_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_60			OBJECT=DataField_61				DataFieldName=&quot;H2O_MMR_Surf_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_61			OBJECT=DataField_62				DataFieldName=&quot;H2O_MMR_Surf_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_62			OBJECT=DataField_63				DataFieldName=&quot;H2O_MMR_Surf_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_63			OBJECT=DataField_64				DataFieldName=&quot;H2O_MMR_Surf_A_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_64			OBJECT=DataField_65				DataFieldName=&quot;RelHum_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_65			OBJECT=DataField_66				DataFieldName=&quot;RelHum_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;H2OPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_66			OBJECT=DataField_67				DataFieldName=&quot;RelHum_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_67			OBJECT=DataField_68				DataFieldName=&quot;RelHum_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_68			OBJECT=DataField_69				DataFieldName=&quot;RelHum_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_69			OBJECT=DataField_70				DataFieldName=&quot;RelHumSurf_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_70			OBJECT=DataField_71				DataFieldName=&quot;RelHumSurf_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_71			OBJECT=DataField_72				DataFieldName=&quot;RelHumSurf_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_72			OBJECT=DataField_73				DataFieldName=&quot;RelHumSurf_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_73			OBJECT=DataField_74				DataFieldName=&quot;RelHumSurf_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_74			OBJECT=DataField_75				DataFieldName=&quot;RelHum_liquid_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_75			OBJECT=DataField_76				DataFieldName=&quot;RelHum_liquid_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;H2OPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_76			OBJECT=DataField_77				DataFieldName=&quot;RelHum_liquid_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_77			OBJECT=DataField_78				DataFieldName=&quot;RelHum_liquid_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_78			OBJECT=DataField_79				DataFieldName=&quot;RelHum_liquid_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_79			OBJECT=DataField_80				DataFieldName=&quot;RelHumSurf_liquid_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_80			OBJECT=DataField_81				DataFieldName=&quot;RelHumSurf_liquid_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_81			OBJECT=DataField_82				DataFieldName=&quot;RelHumSurf_liquid_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_82			OBJECT=DataField_83				DataFieldName=&quot;RelHumSurf_liquid_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_83			OBJECT=DataField_84				DataFieldName=&quot;RelHumSurf_liquid_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_84			OBJECT=DataField_85				DataFieldName=&quot;TropHeight_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_85			OBJECT=DataField_86				DataFieldName=&quot;TropHeight_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_86			OBJECT=DataField_87				DataFieldName=&quot;TropHeight_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_87			OBJECT=DataField_88				DataFieldName=&quot;TropHeight_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_88			OBJECT=DataField_89				DataFieldName=&quot;TropHeight_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_89			OBJECT=DataField_90				DataFieldName=&quot;GPHeight_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_90			OBJECT=DataField_91				DataFieldName=&quot;GPHeight_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_91			OBJECT=DataField_92				DataFieldName=&quot;GPHeight_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_92			OBJECT=DataField_93				DataFieldName=&quot;GPHeight_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_93			OBJECT=DataField_94				DataFieldName=&quot;GPHeight_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_94			OBJECT=DataField_95				DataFieldName=&quot;CloudFrc_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_95			OBJECT=DataField_96				DataFieldName=&quot;CloudFrc_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_96			OBJECT=DataField_97				DataFieldName=&quot;CloudFrc_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_97			OBJECT=DataField_98				DataFieldName=&quot;CloudFrc_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_98			OBJECT=DataField_99				DataFieldName=&quot;CloudFrc_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_99			OBJECT=DataField_100				DataFieldName=&quot;CloudFrc_A_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_100			OBJECT=DataField_101				DataFieldName=&quot;CloudTopPres_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_101			OBJECT=DataField_102				DataFieldName=&quot;CloudTopPres_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_102			OBJECT=DataField_103				DataFieldName=&quot;CloudTopPres_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_103			OBJECT=DataField_104				DataFieldName=&quot;CloudTopPres_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_104			OBJECT=DataField_105				DataFieldName=&quot;CloudTopPres_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_105			OBJECT=DataField_106				DataFieldName=&quot;CloudTopPres_A_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_106			OBJECT=DataField_107				DataFieldName=&quot;CloudTopTemp_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_107			OBJECT=DataField_108				DataFieldName=&quot;CloudTopTemp_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_108			OBJECT=DataField_109				DataFieldName=&quot;CloudTopTemp_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_109			OBJECT=DataField_110				DataFieldName=&quot;CloudTopTemp_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_110			OBJECT=DataField_111				DataFieldName=&quot;CloudTopTemp_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_111			OBJECT=DataField_112				DataFieldName=&quot;CloudTopTemp_A_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_112			OBJECT=DataField_113				DataFieldName=&quot;FineCloudFrc_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;FineCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_113			OBJECT=DataField_114				DataFieldName=&quot;FineCloudFrc_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;FineCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_114			OBJECT=DataField_115				DataFieldName=&quot;FineCloudFrc_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;FineCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_115			OBJECT=DataField_116				DataFieldName=&quot;FineCloudFrc_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;FineCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_116			OBJECT=DataField_117				DataFieldName=&quot;FineCloudFrc_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;FineCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_117			OBJECT=DataField_118				DataFieldName=&quot;CoarseCloudFrc_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;CoarseCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_118			OBJECT=DataField_119				DataFieldName=&quot;CoarseCloudFrc_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;CoarseCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_119			OBJECT=DataField_120				DataFieldName=&quot;CoarseCloudFrc_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;CoarseCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_120			OBJECT=DataField_121				DataFieldName=&quot;CoarseCloudFrc_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;CoarseCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_121			OBJECT=DataField_122				DataFieldName=&quot;CoarseCloudFrc_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;CoarseCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_122			OBJECT=DataField_123				DataFieldName=&quot;CoarseCloudPres_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;CoarseCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_123			OBJECT=DataField_124				DataFieldName=&quot;CoarseCloudPres_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;CoarseCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_124			OBJECT=DataField_125				DataFieldName=&quot;CoarseCloudPres_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;CoarseCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_125			OBJECT=DataField_126				DataFieldName=&quot;CoarseCloudPres_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;CoarseCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_126			OBJECT=DataField_127				DataFieldName=&quot;CoarseCloudPres_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;CoarseCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_127			OBJECT=DataField_128				DataFieldName=&quot;CoarseCloudTemp_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;CoarseCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_128			OBJECT=DataField_129				DataFieldName=&quot;CoarseCloudTemp_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;CoarseCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_129			OBJECT=DataField_130				DataFieldName=&quot;CoarseCloudTemp_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;CoarseCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_130			OBJECT=DataField_131				DataFieldName=&quot;CoarseCloudTemp_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;CoarseCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_131			OBJECT=DataField_132				DataFieldName=&quot;CoarseCloudTemp_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;CoarseCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_132			OBJECT=DataField_133				DataFieldName=&quot;TotO3_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_133			OBJECT=DataField_134				DataFieldName=&quot;TotO3_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_134			OBJECT=DataField_135				DataFieldName=&quot;TotO3_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_135			OBJECT=DataField_136				DataFieldName=&quot;TotO3_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_136			OBJECT=DataField_137				DataFieldName=&quot;TotO3_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_137			OBJECT=DataField_138				DataFieldName=&quot;TotO3_A_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_138			OBJECT=DataField_139				DataFieldName=&quot;O3_VMR_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_139			OBJECT=DataField_140				DataFieldName=&quot;O3_VMR_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_140			OBJECT=DataField_141				DataFieldName=&quot;O3_VMR_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_141			OBJECT=DataField_142				DataFieldName=&quot;O3_VMR_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_142			OBJECT=DataField_143				DataFieldName=&quot;O3_VMR_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_143			OBJECT=DataField_144				DataFieldName=&quot;O3_VMR_A_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_144			OBJECT=DataField_145				DataFieldName=&quot;TotCO_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_145			OBJECT=DataField_146				DataFieldName=&quot;TotCO_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_146			OBJECT=DataField_147				DataFieldName=&quot;TotCO_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_147			OBJECT=DataField_148				DataFieldName=&quot;TotCO_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_148			OBJECT=DataField_149				DataFieldName=&quot;TotCO_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_149			OBJECT=DataField_150				DataFieldName=&quot;CO_VMR_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_150			OBJECT=DataField_151				DataFieldName=&quot;CO_VMR_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_151			OBJECT=DataField_152				DataFieldName=&quot;CO_VMR_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)	</Value>
+    </Attribute>
+    <Attribute name="StructMetadata_1" type="String">
+        <Value>			CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_152			OBJECT=DataField_153				DataFieldName=&quot;CO_VMR_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_153			OBJECT=DataField_154				DataFieldName=&quot;CO_VMR_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_154			OBJECT=DataField_155				DataFieldName=&quot;CO_VMR_A_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_155			OBJECT=DataField_156				DataFieldName=&quot;TotCH4_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_156			OBJECT=DataField_157				DataFieldName=&quot;TotCH4_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_157			OBJECT=DataField_158				DataFieldName=&quot;TotCH4_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_158			OBJECT=DataField_159				DataFieldName=&quot;TotCH4_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_159			OBJECT=DataField_160				DataFieldName=&quot;TotCH4_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_160			OBJECT=DataField_161				DataFieldName=&quot;CH4_VMR_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_161			OBJECT=DataField_162				DataFieldName=&quot;CH4_VMR_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_162			OBJECT=DataField_163				DataFieldName=&quot;CH4_VMR_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_163			OBJECT=DataField_164				DataFieldName=&quot;CH4_VMR_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_164			OBJECT=DataField_165				DataFieldName=&quot;CH4_VMR_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_165			OBJECT=DataField_166				DataFieldName=&quot;CH4_VMR_A_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_166			OBJECT=DataField_167				DataFieldName=&quot;OLR_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_167			OBJECT=DataField_168				DataFieldName=&quot;OLR_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_168			OBJECT=DataField_169				DataFieldName=&quot;OLR_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_169			OBJECT=DataField_170				DataFieldName=&quot;OLR_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_170			OBJECT=DataField_171				DataFieldName=&quot;OLR_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_171			OBJECT=DataField_172				DataFieldName=&quot;OLR_A_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_172			OBJECT=DataField_173				DataFieldName=&quot;ClrOLR_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_173			OBJECT=DataField_174				DataFieldName=&quot;ClrOLR_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_174			OBJECT=DataField_175				DataFieldName=&quot;ClrOLR_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_175			OBJECT=DataField_176				DataFieldName=&quot;ClrOLR_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_176			OBJECT=DataField_177				DataFieldName=&quot;ClrOLR_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_177			OBJECT=DataField_178				DataFieldName=&quot;ClrOLR_A_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_178		END_GROUP=DataField		GROUP=MergedFields		END_GROUP=MergedFields	END_GROUP=GRID_1	GROUP=GRID_2		GridName=&quot;descending&quot;		XDim=360		YDim=180		UpperLeftPointMtrs=(-179030000.000000,89030000.000000)		LowerRightMtrs=(180030000.000000,-90030000.000000)		Projection=GCTP_GEO		GROUP=Dimension			OBJECT=Dimension_1				DimensionName=&quot;StdPressureLev&quot;				Size=24			END_OBJECT=Dimension_1			OBJECT=Dimension_2				DimensionName=&quot;H2OPressureLev&quot;				Size=12			END_OBJECT=Dimension_2			OBJECT=Dimension_3				DimensionName=&quot;H2OPressureLay&quot;				Size=12			END_OBJECT=Dimension_3			OBJECT=Dimension_4				DimensionName=&quot;CoarseCloudLayer&quot;				Size=3			END_OBJECT=Dimension_4			OBJECT=Dimension_5				DimensionName=&quot;FineCloudLayer&quot;				Size=12			END_OBJECT=Dimension_5			OBJECT=Dimension_6				DimensionName=&quot;EmisFreqIR&quot;				Size=4			END_OBJECT=Dimension_6		END_GROUP=Dimension		GROUP=DataField			OBJECT=DataField_1				DataFieldName=&quot;TotalCounts_D&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_1			OBJECT=DataField_2				DataFieldName=&quot;SurfPres_Forecast_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_2			OBJECT=DataField_3				DataFieldName=&quot;SurfPres_Forecast_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_3			OBJECT=DataField_4				DataFieldName=&quot;SurfPres_Forecast_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_4			OBJECT=DataField_5				DataFieldName=&quot;SurfPres_Forecast_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_5			OBJECT=DataField_6				DataFieldName=&quot;SurfPres_Forecast_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_6			OBJECT=DataField_7				DataFieldName=&quot;SurfSkinTemp_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_7			OBJECT=DataField_8				DataFieldName=&quot;SurfSkinTemp_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_8			OBJECT=DataField_9				DataFieldName=&quot;SurfSkinTemp_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_9			OBJECT=DataField_10				DataFieldName=&quot;SurfSkinTemp_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_10			OBJECT=DataField_11				DataFieldName=&quot;SurfSkinTemp_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_11			OBJECT=DataField_12				DataFieldName=&quot;SurfSkinTemp_D_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_12			OBJECT=DataField_13				DataFieldName=&quot;EmisIR_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;EmisFreqIR&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_13			OBJECT=DataField_14				DataFieldName=&quot;EmisIR_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;EmisFreqIR&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_14			OBJECT=DataField_15				DataFieldName=&quot;EmisIR_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;EmisFreqIR&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_15			OBJECT=DataField_16				DataFieldName=&quot;EmisIR_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;EmisFreqIR&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_16			OBJECT=DataField_17				DataFieldName=&quot;EmisIR_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;EmisFreqIR&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_17			OBJECT=DataField_18				DataFieldName=&quot;EmisIR_D_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;EmisFreqIR&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_18			OBJECT=DataField_19				DataFieldName=&quot;Temperature_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_19			OBJECT=DataField_20				DataFieldName=&quot;Temperature_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_20			OBJECT=DataField_21				DataFieldName=&quot;Temperature_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_21			OBJECT=DataField_22				DataFieldName=&quot;Temperature_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_22			OBJECT=DataField_23				DataFieldName=&quot;Temperature_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_23			OBJECT=DataField_24				DataFieldName=&quot;Temperature_D_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_24			OBJECT=DataField_25				DataFieldName=&quot;SurfAirTemp_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_25			OBJECT=DataField_26				DataFieldName=&quot;SurfAirTemp_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_26			OBJECT=DataField_27				DataFieldName=&quot;SurfAirTemp_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_27			OBJECT=DataField_28				DataFieldName=&quot;SurfAirTemp_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_28			OBJECT=DataField_29				DataFieldName=&quot;SurfAirTemp_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_29			OBJECT=DataField_30				DataFieldName=&quot;SurfAirTemp_D_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_30			OBJECT=DataField_31				DataFieldName=&quot;TropPres_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_31			OBJECT=DataField_32				DataFieldName=&quot;TropPres_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_32			OBJECT=DataField_33				DataFieldName=&quot;TropPres_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_33			OBJECT=DataField_34				DataFieldName=&quot;TropPres_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_34			OBJECT=DataField_35				DataFieldName=&quot;TropPres_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_35			OBJECT=DataField_36				DataFieldName=&quot;TropTemp_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_36			OBJECT=DataField_37				DataFieldName=&quot;TropTemp_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_37			OBJECT=DataField_38				DataFieldName=&quot;TropTemp_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_38			OBJECT=DataField_39				DataFieldName=&quot;TropTemp_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_39			OBJECT=DataField_40				DataFieldName=&quot;TropTemp_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_40			OBJECT=DataField_41				DataFieldName=&quot;TotH2OVap_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_41			OBJECT=DataField_42				DataFieldName=&quot;TotH2OVap_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_42			OBJECT=DataField_43				DataFieldName=&quot;TotH2OVap_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_43			OBJECT=DataField_44				DataFieldName=&quot;TotH2OVap_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_44			OBJECT=DataField_45				DataFieldName=&quot;TotH2OVap_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_45			OBJECT=DataField_46				DataFieldName=&quot;TotH2OVap_D_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_46			OBJECT=DataField_47				DataFieldName=&quot;H2O_MMR_Lyr_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLay&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_47			OBJECT=DataField_48				DataFieldName=&quot;H2O_MMR_Lyr_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;H2OPressureLay&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_48			OBJECT=DataField_49				DataFieldName=&quot;H2O_MMR_Lyr_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLay&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_49			OBJECT=DataField_50				DataFieldName=&quot;H2O_MMR_Lyr_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLay&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_50			OBJECT=DataField_51				DataFieldName=&quot;H2O_MMR_Lyr_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLay&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_51			OBJECT=DataField_52				DataFieldName=&quot;H2O_MMR_Lyr_D_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLay&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_52			OBJECT=DataField_53				DataFieldName=&quot;H2O_MMR_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_53			OBJECT=DataField_54				DataFieldName=&quot;H2O_MMR_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;H2OPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_54			OBJECT=DataField_55				DataFieldName=&quot;H2O_MMR_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_55			OBJECT=DataField_56				DataFieldName=&quot;H2O_MMR_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_56			OBJECT=DataField_57				DataFieldName=&quot;H2O_MMR_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_57			OBJECT=DataField_58				DataFieldName=&quot;H2O_MMR_D_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_58			OBJECT=DataField_59				DataFieldName=&quot;H2O_MMR_Surf_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_59			OBJECT=DataField_60				DataFieldName=&quot;H2O_MMR_Surf_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_60			OBJECT=DataField_61				DataFieldName=&quot;H2O_MMR_Surf_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_61			OBJECT=DataField_62				DataFieldName=&quot;H2O_MMR_Surf_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_62			OBJECT=DataField_63				DataFieldName=&quot;H2O_MMR_Surf_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_63			OBJECT=DataField_64				DataFieldName=&quot;H2O_MMR_Surf_D_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_64			OBJECT=DataField_65				DataFieldName=&quot;RelHum_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_65			OBJECT=DataField_66				DataFieldName=&quot;RelHum_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;H2OPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_66			OBJECT=DataField_67				DataFieldName=&quot;RelHum_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_67			OBJECT=DataField_68				DataFieldName=&quot;RelHum_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_68			OBJECT=DataField_69				DataFieldName=&quot;RelHum_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_69			OBJECT=DataField_70				DataFieldName=&quot;RelHumSurf_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_70			OBJECT=DataField_71				DataFieldName=&quot;RelHumSurf_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_71			OBJECT=DataField_72				DataFieldName=&quot;RelHumSurf_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_72			OBJECT=DataField_73				DataFieldName=&quot;RelHumSurf_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_73			OBJECT=DataField_74				DataFieldName=&quot;RelHumSurf_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_74			OBJECT=DataField_75				DataFieldName=&quot;RelHum_liquid_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_75			OBJECT=DataField_76				DataFieldName=&quot;RelHum_liquid_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;H2OPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_76			OBJECT=DataField_77				DataFieldName=&quot;RelHum_liquid_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_77			OBJECT=DataField_78				DataFieldName=&quot;RelHum_liquid_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_78			OBJECT=DataField_79				DataFieldName=&quot;RelHum_liquid_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_79			OBJECT=DataField_80				DataFieldName=&quot;RelHumSurf_liquid_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_80			OBJECT=DataField_81				DataFieldName=&quot;RelHumSurf_liquid_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_81			OBJECT=DataField_82				DataFieldName=&quot;RelHumSurf_liquid_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_82			OBJECT=DataField_83				DataFieldName=&quot;RelHumSurf_liquid_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_83			OBJECT=DataField_84				DataFieldName=&quot;RelHumSurf_liquid_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_84			OBJECT=DataField_85				DataFieldName=&quot;TropHeight_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_85			OBJECT=DataField_86				DataFieldName=&quot;TropHeight_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_86			OBJECT=DataField_87				DataFieldName=&quot;TropHeight_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_87			OBJECT=DataField_88				DataFieldName=&quot;TropHeight_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_88			OBJECT=DataField_89				DataFieldName=&quot;TropHeight_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_89			OBJECT=DataField_90				DataFieldName=&quot;GPHeight_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_90			OBJECT=DataField_91				DataFieldName=&quot;GPHeight_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_91			OBJECT=DataField_92				DataFieldName=&quot;GPHeight_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_92			OBJECT=DataField_93				DataFieldName=&quot;GPHeight_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_93			OBJECT=DataField_94				DataFieldName=&quot;GPHeight_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_94			OBJECT=DataField_95				DataFieldName=&quot;CloudFrc_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_95			OBJECT=DataField_96				DataFieldName=&quot;CloudFrc_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_96			OBJECT=DataField_97				DataFieldName=&quot;CloudFrc_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_97			OBJECT=DataField_98				DataFieldName=&quot;CloudFrc_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_98			OBJECT=DataField_99				DataFieldName=&quot;CloudFrc_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_99			OBJECT=DataField_100				DataFieldName=&quot;CloudFrc_D_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_100			OBJECT=DataField_101				DataFieldName=&quot;CloudTopPres_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_101			OBJECT=DataField_102				DataFieldName=&quot;CloudTopPres_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_102			OBJECT=DataField_103				DataFieldName=&quot;CloudTopPres_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_103			OBJECT=DataField_104				DataFieldName=&quot;CloudTopPres_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_104			OBJECT=DataField_105				DataFieldName=&quot;CloudTopPres_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_105			OBJECT=DataField_106				DataFieldName=&quot;CloudTopPres_D_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_106			OBJECT=DataField_107				DataFieldName=&quot;CloudTopTemp_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_107			OBJECT=DataField_108				DataFieldName=&quot;CloudTopTemp_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_108			OBJECT=DataField_109				DataFieldName=&quot;CloudTopTemp_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_109			OBJECT=DataField_110				DataFieldName=&quot;CloudTopTemp_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_110			OBJECT=DataField_111				DataFieldName=&quot;CloudTopTemp_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_111			OBJECT=DataField_112				DataFieldName=&quot;CloudTopTemp_D_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_112			OBJECT=DataField_113				DataFieldName=&quot;FineCloudFrc_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;FineCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_113			OBJECT=DataField_114				DataFieldName=&quot;FineCloudFrc_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;FineCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_114			OBJECT=DataField_115				DataFieldName=&quot;FineCloudFrc_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;FineCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_115			OBJECT=DataField_116				DataFieldName=&quot;FineCloudFrc_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;FineCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_116			OBJECT=DataField_117				DataFieldName=&quot;FineCloudFrc_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;FineCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_117			OBJECT=DataField_118				DataFieldName=&quot;CoarseCloudFrc_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;CoarseCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_118			OBJECT=DataField_119				DataFieldName=&quot;CoarseCloudFrc_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;CoarseCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_119			OBJECT=DataField_120				DataFieldName=&quot;CoarseCloudFrc_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;CoarseCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_120			OBJECT=DataField_121				DataFieldName=&quot;CoarseCloudFrc_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;CoarseCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_121			OBJECT=DataField_122				DataFieldName=&quot;CoarseCloudFrc_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;CoarseCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_122			OBJECT=DataField_123				DataFieldName=&quot;CoarseCloudPres_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;CoarseCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_123			OBJECT=DataField_124				DataFieldName=&quot;CoarseCloudPres_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;CoarseCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_124			OBJECT=DataField_125				DataFieldName=&quot;CoarseCloudPres_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;CoarseCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_125			OBJECT=DataField_126				DataFieldName=&quot;CoarseCloudPres_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;CoarseCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5		</Value>
+    </Attribute>
+    <Attribute name="StructMetadata_2" type="String">
+        <Value>	END_OBJECT=DataField_126			OBJECT=DataField_127				DataFieldName=&quot;CoarseCloudPres_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;CoarseCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_127			OBJECT=DataField_128				DataFieldName=&quot;CoarseCloudTemp_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;CoarseCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_128			OBJECT=DataField_129				DataFieldName=&quot;CoarseCloudTemp_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;CoarseCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_129			OBJECT=DataField_130				DataFieldName=&quot;CoarseCloudTemp_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;CoarseCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_130			OBJECT=DataField_131				DataFieldName=&quot;CoarseCloudTemp_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;CoarseCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_131			OBJECT=DataField_132				DataFieldName=&quot;CoarseCloudTemp_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;CoarseCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_132			OBJECT=DataField_133				DataFieldName=&quot;TotO3_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_133			OBJECT=DataField_134				DataFieldName=&quot;TotO3_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_134			OBJECT=DataField_135				DataFieldName=&quot;TotO3_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_135			OBJECT=DataField_136				DataFieldName=&quot;TotO3_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_136			OBJECT=DataField_137				DataFieldName=&quot;TotO3_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_137			OBJECT=DataField_138				DataFieldName=&quot;TotO3_D_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_138			OBJECT=DataField_139				DataFieldName=&quot;O3_VMR_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_139			OBJECT=DataField_140				DataFieldName=&quot;O3_VMR_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_140			OBJECT=DataField_141				DataFieldName=&quot;O3_VMR_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_141			OBJECT=DataField_142				DataFieldName=&quot;O3_VMR_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_142			OBJECT=DataField_143				DataFieldName=&quot;O3_VMR_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_143			OBJECT=DataField_144				DataFieldName=&quot;O3_VMR_D_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_144			OBJECT=DataField_145				DataFieldName=&quot;TotCO_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_145			OBJECT=DataField_146				DataFieldName=&quot;TotCO_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_146			OBJECT=DataField_147				DataFieldName=&quot;TotCO_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_147			OBJECT=DataField_148				DataFieldName=&quot;TotCO_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_148			OBJECT=DataField_149				DataFieldName=&quot;TotCO_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_149			OBJECT=DataField_150				DataFieldName=&quot;CO_VMR_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_150			OBJECT=DataField_151				DataFieldName=&quot;CO_VMR_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_151			OBJECT=DataField_152				DataFieldName=&quot;CO_VMR_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_152			OBJECT=DataField_153				DataFieldName=&quot;CO_VMR_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_153			OBJECT=DataField_154				DataFieldName=&quot;CO_VMR_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_154			OBJECT=DataField_155				DataFieldName=&quot;CO_VMR_D_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_155			OBJECT=DataField_156				DataFieldName=&quot;TotCH4_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_156			OBJECT=DataField_157				DataFieldName=&quot;TotCH4_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_157			OBJECT=DataField_158				DataFieldName=&quot;TotCH4_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_158			OBJECT=DataField_159				DataFieldName=&quot;TotCH4_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_159			OBJECT=DataField_160				DataFieldName=&quot;TotCH4_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_160			OBJECT=DataField_161				DataFieldName=&quot;CH4_VMR_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_161			OBJECT=DataField_162				DataFieldName=&quot;CH4_VMR_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_162			OBJECT=DataField_163				DataFieldName=&quot;CH4_VMR_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_163			OBJECT=DataField_164				DataFieldName=&quot;CH4_VMR_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_164			OBJECT=DataField_165				DataFieldName=&quot;CH4_VMR_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_165			OBJECT=DataField_166				DataFieldName=&quot;CH4_VMR_D_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_166			OBJECT=DataField_167				DataFieldName=&quot;OLR_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_167			OBJECT=DataField_168				DataFieldName=&quot;OLR_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_168			OBJECT=DataField_169				DataFieldName=&quot;OLR_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_169			OBJECT=DataField_170				DataFieldName=&quot;OLR_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_170			OBJECT=DataField_171				DataFieldName=&quot;OLR_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_171			OBJECT=DataField_172				DataFieldName=&quot;OLR_D_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_172			OBJECT=DataField_173				DataFieldName=&quot;ClrOLR_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_173			OBJECT=DataField_174				DataFieldName=&quot;ClrOLR_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_174			OBJECT=DataField_175				DataFieldName=&quot;ClrOLR_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_175			OBJECT=DataField_176				DataFieldName=&quot;ClrOLR_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_176			OBJECT=DataField_177				DataFieldName=&quot;ClrOLR_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_177			OBJECT=DataField_178				DataFieldName=&quot;ClrOLR_D_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_178		END_GROUP=DataField		GROUP=MergedFields		END_GROUP=MergedFields	END_GROUP=GRID_2	GROUP=GRID_3		GridName=&quot;ascending_TqJoint&quot;		XDim=360		YDim=180		UpperLeftPointMtrs=(-179030000.000000,89030000.000000)		LowerRightMtrs=(180030000.000000,-90030000.000000)		Projection=GCTP_GEO		GROUP=Dimension			OBJECT=Dimension_1				DimensionName=&quot;StdPressureLev&quot;				Size=24			END_OBJECT=Dimension_1			OBJECT=Dimension_2				DimensionName=&quot;H2OPressureLev&quot;				Size=12			END_OBJECT=Dimension_2			OBJECT=Dimension_3				DimensionName=&quot;H2OPressureLay&quot;				Size=12			END_OBJECT=Dimension_3			OBJECT=Dimension_4				DimensionName=&quot;CoarseCloudLayer&quot;				Size=3			END_OBJECT=Dimension_4			OBJECT=Dimension_5				DimensionName=&quot;FineCloudLayer&quot;				Size=12			END_OBJECT=Dimension_5			OBJECT=Dimension_6				DimensionName=&quot;EmisFreqIR&quot;				Size=4			END_OBJECT=Dimension_6		END_GROUP=Dimension		GROUP=DataField			OBJECT=DataField_1				DataFieldName=&quot;TotalCounts_TqJ_A&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_1			OBJECT=DataField_2				DataFieldName=&quot;SurfPres_Forecast_TqJ_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_2			OBJECT=DataField_3				DataFieldName=&quot;SurfPres_Forecast_TqJ_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_3			OBJECT=DataField_4				DataFieldName=&quot;SurfPres_Forecast_TqJ_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_4			OBJECT=DataField_5				DataFieldName=&quot;SurfPres_Forecast_TqJ_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_5			OBJECT=DataField_6				DataFieldName=&quot;SurfPres_Forecast_TqJ_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_6			OBJECT=DataField_7				DataFieldName=&quot;SurfSkinTemp_TqJ_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_7			OBJECT=DataField_8				DataFieldName=&quot;SurfSkinTemp_TqJ_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_8			OBJECT=DataField_9				DataFieldName=&quot;SurfSkinTemp_TqJ_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_9			OBJECT=DataField_10				DataFieldName=&quot;SurfSkinTemp_TqJ_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_10			OBJECT=DataField_11				DataFieldName=&quot;SurfSkinTemp_TqJ_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_11			OBJECT=DataField_12				DataFieldName=&quot;SurfSkinTemp_TqJ_A_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_12			OBJECT=DataField_13				DataFieldName=&quot;EmisIR_TqJ_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;EmisFreqIR&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_13			OBJECT=DataField_14				DataFieldName=&quot;EmisIR_TqJ_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;EmisFreqIR&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_14			OBJECT=DataField_15				DataFieldName=&quot;EmisIR_TqJ_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;EmisFreqIR&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_15			OBJECT=DataField_16				DataFieldName=&quot;EmisIR_TqJ_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;EmisFreqIR&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_16			OBJECT=DataField_17				DataFieldName=&quot;EmisIR_TqJ_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;EmisFreqIR&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_17			OBJECT=DataField_18				DataFieldName=&quot;EmisIR_TqJ_A_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;EmisFreqIR&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_18			OBJECT=DataField_19				DataFieldName=&quot;Temperature_TqJ_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_19			OBJECT=DataField_20				DataFieldName=&quot;Temperature_TqJ_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_20			OBJECT=DataField_21				DataFieldName=&quot;Temperature_TqJ_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_21			OBJECT=DataField_22				DataFieldName=&quot;Temperature_TqJ_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_22			OBJECT=DataField_23				DataFieldName=&quot;Temperature_TqJ_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_23			OBJECT=DataField_24				DataFieldName=&quot;Temperature_TqJ_A_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_24			OBJECT=DataField_25				DataFieldName=&quot;SurfAirTemp_TqJ_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_25			OBJECT=DataField_26				DataFieldName=&quot;SurfAirTemp_TqJ_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_26			OBJECT=DataField_27				DataFieldName=&quot;SurfAirTemp_TqJ_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_27			OBJECT=DataField_28				DataFieldName=&quot;SurfAirTemp_TqJ_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_28			OBJECT=DataField_29				DataFieldName=&quot;SurfAirTemp_TqJ_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_29			OBJECT=DataField_30				DataFieldName=&quot;SurfAirTemp_TqJ_A_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_30			OBJECT=DataField_31				DataFieldName=&quot;TropPres_TqJ_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_31			OBJECT=DataField_32				DataFieldName=&quot;TropPres_TqJ_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_32			OBJECT=DataField_33				DataFieldName=&quot;TropPres_TqJ_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_33			OBJECT=DataField_34				DataFieldName=&quot;TropPres_TqJ_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_34			OBJECT=DataField_35				DataFieldName=&quot;TropPres_TqJ_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_35			OBJECT=DataField_36				DataFieldName=&quot;TropTemp_TqJ_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_36			OBJECT=DataField_37				DataFieldName=&quot;TropTemp_TqJ_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_37			OBJECT=DataField_38				DataFieldName=&quot;TropTemp_TqJ_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_38			OBJECT=DataField_39				DataFieldName=&quot;TropTemp_TqJ_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_39			OBJECT=DataField_40				DataFieldName=&quot;TropTemp_TqJ_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_40			OBJECT=DataField_41				DataFieldName=&quot;TotH2OVap_TqJ_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_41			OBJECT=DataField_42				DataFieldName=&quot;TotH2OVap_TqJ_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_42			OBJECT=DataField_43				DataFieldName=&quot;TotH2OVap_TqJ_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_43			OBJECT=DataField_44				DataFieldName=&quot;TotH2OVap_TqJ_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_44			OBJECT=DataField_45				DataFieldName=&quot;TotH2OVap_TqJ_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_45			OBJECT=DataField_46				DataFieldName=&quot;TotH2OVap_TqJ_A_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_46			OBJECT=DataField_47				DataFieldName=&quot;H2O_MMR_Lyr_TqJ_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLay&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_47			OBJECT=DataField_48				DataFieldName=&quot;H2O_MMR_Lyr_TqJ_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;H2OPressureLay&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_48			OBJECT=DataField_49				DataFieldName=&quot;H2O_MMR_Lyr_TqJ_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLay&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_49			OBJECT=DataField_50				DataFieldName=&quot;H2O_MMR_Lyr_TqJ_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLay&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_50			OBJECT=DataField_51				DataFieldName=&quot;H2O_MMR_Lyr_TqJ_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLay&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_51			OBJECT=DataField_52				DataFieldName=&quot;H2O_MMR_Lyr_TqJ_A_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLay&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_52			OBJECT=DataField_53				DataFieldName=&quot;H2O_MMR_TqJ_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_53			OBJECT=DataField_54				DataFieldName=&quot;H2O_MMR_TqJ_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;H2OPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_54			OBJECT=DataField_55				DataFieldName=&quot;H2O_MMR_TqJ_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_55			OBJECT=DataField_56				DataFieldName=&quot;H2O_MMR_TqJ_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_56			OBJECT=DataField_57				DataFieldName=&quot;H2O_MMR_TqJ_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_57			OBJECT=DataField_58				DataFieldName=&quot;H2O_MMR_TqJ_A_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_58			OBJECT=DataField_59				DataFieldName=&quot;H2O_MMR_Surf_TqJ_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_59			OBJECT=DataField_60				DataFieldName=&quot;H2O_MMR_Surf_TqJ_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_60			OBJECT=DataField_61				DataFieldName=&quot;H2O_MMR_Surf_TqJ_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_61			OBJECT=DataField_62				DataFieldName=&quot;H2O_MMR_Surf_TqJ_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_62			OBJECT=DataField_63				DataFieldName=&quot;H2O_MMR_Surf_TqJ_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_63			OBJECT=DataField_64				DataFieldName=&quot;H2O_MMR_Surf_TqJ_A_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_64			OBJECT=DataField_65				DataFieldName=&quot;RelHum_TqJ_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_65			OBJECT=DataField_66				DataFieldName=&quot;RelHum_TqJ_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;H2OPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_66			OBJECT=DataField_67				DataFieldName=&quot;RelHum_TqJ_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_67			OBJECT=DataField_68				DataFieldName=&quot;RelHum_TqJ_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_68			OBJECT=DataField_69				DataFieldName=&quot;RelHum_TqJ_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_69			OBJECT=DataField_70				DataFieldName=&quot;RelHumSurf_TqJ_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_70			OBJECT=DataField_71				DataFieldName=&quot;RelHumSurf_TqJ_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_71			OBJECT=DataField_72				DataFieldName=&quot;RelHumSurf_TqJ_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_72			OBJECT=DataField_73				DataFieldName=&quot;RelHumSurf_TqJ_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_73			OBJECT=DataField_74				DataFieldName=&quot;RelHumSurf_TqJ_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_74			OBJECT=DataField_75				DataFieldName=&quot;RelHum_liquid_TqJ_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_75			OBJECT=DataField_76				DataFieldName=&quot;RelHum_liquid_TqJ_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;H2OPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_76			OBJECT=DataField_77				DataFieldName=&quot;RelHum_liquid_TqJ_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_77			OBJECT=DataField_78				DataFieldName=&quot;RelHum_liquid_TqJ_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_78			OBJECT=DataField_79				DataFieldName=&quot;RelHum_liquid_TqJ_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_79			OBJECT=DataField_80				DataFieldName=&quot;RelHumSurf_liquid_TqJ_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_80			OBJECT=DataField_81				DataFieldName=&quot;RelHumSurf_liquid_TqJ_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_81			OBJECT=DataField_82				DataFieldName=&quot;RelHumSurf_liquid_TqJ_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_82			OBJECT=DataField_83				DataFieldName=&quot;RelHumSurf_liquid_TqJ_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_83			OBJECT=DataField_84				DataFieldName=&quot;RelHumSurf_liquid_TqJ_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_84			OBJECT=DataField_85				DataFieldName=&quot;TropHeight_TqJ_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_85			OBJECT=DataField_86				DataFieldName=&quot;TropHeight_TqJ_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_86			OBJECT=DataField_87				DataFieldName=&quot;TropHeight_TqJ_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_87			OBJECT=DataField_88				DataFieldName=&quot;TropHeight_TqJ_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_88			OBJECT=DataField_89				DataFieldName=&quot;TropHeight_TqJ_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_89			OBJECT=DataField_90				DataFieldName=&quot;GPHeight_TqJ_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_90			OBJECT=DataField_91				DataFieldName=&quot;GPHeight_TqJ_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_91			OBJECT=DataField_92				DataFieldName=&quot;GPHeight_TqJ_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_92			OBJECT=DataField_93				DataFieldName=&quot;GPHeight_TqJ_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_93			OBJECT=DataField_94				DataFieldName=&quot;GPHeight_TqJ_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_94			OBJECT=DataField_95				DataFieldName=&quot;CloudFrc_TqJ_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_95			OBJECT=DataField_96				DataFieldName=&quot;CloudFrc_TqJ_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_96			OBJECT=DataField_97				DataFieldName=&quot;CloudFrc_TqJ_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_97			OBJECT=DataField_98				DataFieldName=&quot;CloudFrc_TqJ_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_98			OBJECT=DataField_99				DataFieldName=&quot;CloudFrc_TqJ_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLA</Value>
+    </Attribute>
+    <Attribute name="StructMetadata_3" type="String">
+        <Value>TE				DeflateLevel=5			END_OBJECT=DataField_99			OBJECT=DataField_100				DataFieldName=&quot;CloudFrc_TqJ_A_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_100			OBJECT=DataField_101				DataFieldName=&quot;CloudTopPres_TqJ_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_101			OBJECT=DataField_102				DataFieldName=&quot;CloudTopPres_TqJ_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_102			OBJECT=DataField_103				DataFieldName=&quot;CloudTopPres_TqJ_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_103			OBJECT=DataField_104				DataFieldName=&quot;CloudTopPres_TqJ_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_104			OBJECT=DataField_105				DataFieldName=&quot;CloudTopPres_TqJ_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_105			OBJECT=DataField_106				DataFieldName=&quot;CloudTopPres_TqJ_A_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_106			OBJECT=DataField_107				DataFieldName=&quot;CloudTopTemp_TqJ_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_107			OBJECT=DataField_108				DataFieldName=&quot;CloudTopTemp_TqJ_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_108			OBJECT=DataField_109				DataFieldName=&quot;CloudTopTemp_TqJ_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_109			OBJECT=DataField_110				DataFieldName=&quot;CloudTopTemp_TqJ_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_110			OBJECT=DataField_111				DataFieldName=&quot;CloudTopTemp_TqJ_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_111			OBJECT=DataField_112				DataFieldName=&quot;CloudTopTemp_TqJ_A_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_112			OBJECT=DataField_113				DataFieldName=&quot;FineCloudFrc_TqJ_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;FineCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_113			OBJECT=DataField_114				DataFieldName=&quot;FineCloudFrc_TqJ_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;FineCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_114			OBJECT=DataField_115				DataFieldName=&quot;FineCloudFrc_TqJ_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;FineCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_115			OBJECT=DataField_116				DataFieldName=&quot;FineCloudFrc_TqJ_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;FineCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_116			OBJECT=DataField_117				DataFieldName=&quot;FineCloudFrc_TqJ_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;FineCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_117			OBJECT=DataField_118				DataFieldName=&quot;CoarseCloudFrc_TqJ_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;CoarseCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_118			OBJECT=DataField_119				DataFieldName=&quot;CoarseCloudFrc_TqJ_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;CoarseCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_119			OBJECT=DataField_120				DataFieldName=&quot;CoarseCloudFrc_TqJ_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;CoarseCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_120			OBJECT=DataField_121				DataFieldName=&quot;CoarseCloudFrc_TqJ_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;CoarseCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_121			OBJECT=DataField_122				DataFieldName=&quot;CoarseCloudFrc_TqJ_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;CoarseCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_122			OBJECT=DataField_123				DataFieldName=&quot;CoarseCloudPres_TqJ_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;CoarseCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_123			OBJECT=DataField_124				DataFieldName=&quot;CoarseCloudPres_TqJ_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;CoarseCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_124			OBJECT=DataField_125				DataFieldName=&quot;CoarseCloudPres_TqJ_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;CoarseCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_125			OBJECT=DataField_126				DataFieldName=&quot;CoarseCloudPres_TqJ_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;CoarseCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_126			OBJECT=DataField_127				DataFieldName=&quot;CoarseCloudPres_TqJ_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;CoarseCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_127			OBJECT=DataField_128				DataFieldName=&quot;CoarseCloudTemp_TqJ_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;CoarseCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_128			OBJECT=DataField_129				DataFieldName=&quot;CoarseCloudTemp_TqJ_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;CoarseCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_129			OBJECT=DataField_130				DataFieldName=&quot;CoarseCloudTemp_TqJ_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;CoarseCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_130			OBJECT=DataField_131				DataFieldName=&quot;CoarseCloudTemp_TqJ_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;CoarseCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_131			OBJECT=DataField_132				DataFieldName=&quot;CoarseCloudTemp_TqJ_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;CoarseCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_132			OBJECT=DataField_133				DataFieldName=&quot;TotO3_TqJ_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_133			OBJECT=DataField_134				DataFieldName=&quot;TotO3_TqJ_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_134			OBJECT=DataField_135				DataFieldName=&quot;TotO3_TqJ_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_135			OBJECT=DataField_136				DataFieldName=&quot;TotO3_TqJ_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_136			OBJECT=DataField_137				DataFieldName=&quot;TotO3_TqJ_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_137			OBJECT=DataField_138				DataFieldName=&quot;TotO3_TqJ_A_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_138			OBJECT=DataField_139				DataFieldName=&quot;O3_VMR_TqJ_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_139			OBJECT=DataField_140				DataFieldName=&quot;O3_VMR_TqJ_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_140			OBJECT=DataField_141				DataFieldName=&quot;O3_VMR_TqJ_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_141			OBJECT=DataField_142				DataFieldName=&quot;O3_VMR_TqJ_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_142			OBJECT=DataField_143				DataFieldName=&quot;O3_VMR_TqJ_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_143			OBJECT=DataField_144				DataFieldName=&quot;O3_VMR_TqJ_A_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_144			OBJECT=DataField_145				DataFieldName=&quot;TotCO_TqJ_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_145			OBJECT=DataField_146				DataFieldName=&quot;TotCO_TqJ_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_146			OBJECT=DataField_147				DataFieldName=&quot;TotCO_TqJ_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_147			OBJECT=DataField_148				DataFieldName=&quot;TotCO_TqJ_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_148			OBJECT=DataField_149				DataFieldName=&quot;TotCO_TqJ_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_149			OBJECT=DataField_150				DataFieldName=&quot;CO_VMR_TqJ_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_150			OBJECT=DataField_151				DataFieldName=&quot;CO_VMR_TqJ_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_151			OBJECT=DataField_152				DataFieldName=&quot;CO_VMR_TqJ_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_152			OBJECT=DataField_153				DataFieldName=&quot;CO_VMR_TqJ_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_153			OBJECT=DataField_154				DataFieldName=&quot;CO_VMR_TqJ_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_154			OBJECT=DataField_155				DataFieldName=&quot;CO_VMR_TqJ_A_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_155			OBJECT=DataField_156				DataFieldName=&quot;TotCH4_TqJ_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_156			OBJECT=DataField_157				DataFieldName=&quot;TotCH4_TqJ_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_157			OBJECT=DataField_158				DataFieldName=&quot;TotCH4_TqJ_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_158			OBJECT=DataField_159				DataFieldName=&quot;TotCH4_TqJ_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_159			OBJECT=DataField_160				DataFieldName=&quot;TotCH4_TqJ_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_160			OBJECT=DataField_161				DataFieldName=&quot;CH4_VMR_TqJ_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_161			OBJECT=DataField_162				DataFieldName=&quot;CH4_VMR_TqJ_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_162			OBJECT=DataField_163				DataFieldName=&quot;CH4_VMR_TqJ_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_163			OBJECT=DataField_164				DataFieldName=&quot;CH4_VMR_TqJ_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_164			OBJECT=DataField_165				DataFieldName=&quot;CH4_VMR_TqJ_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_165			OBJECT=DataField_166				DataFieldName=&quot;CH4_VMR_TqJ_A_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_166			OBJECT=DataField_167				DataFieldName=&quot;OLR_TqJ_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_167			OBJECT=DataField_168				DataFieldName=&quot;OLR_TqJ_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_168			OBJECT=DataField_169				DataFieldName=&quot;OLR_TqJ_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_169			OBJECT=DataField_170				DataFieldName=&quot;OLR_TqJ_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_170			OBJECT=DataField_171				DataFieldName=&quot;OLR_TqJ_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_171			OBJECT=DataField_172				DataFieldName=&quot;OLR_TqJ_A_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_172			OBJECT=DataField_173				DataFieldName=&quot;ClrOLR_TqJ_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_173			OBJECT=DataField_174				DataFieldName=&quot;ClrOLR_TqJ_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_174			OBJECT=DataField_175				DataFieldName=&quot;ClrOLR_TqJ_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_175			OBJECT=DataField_176				DataFieldName=&quot;ClrOLR_TqJ_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_176			OBJECT=DataField_177				DataFieldName=&quot;ClrOLR_TqJ_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_177			OBJECT=DataField_178				DataFieldName=&quot;ClrOLR_TqJ_A_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_178		END_GROUP=DataField		GROUP=MergedFields		END_GROUP=MergedFields	END_GROUP=GRID_3	GROUP=GRID_4		GridName=&quot;descending_TqJoint&quot;		XDim=360		YDim=180		UpperLeftPointMtrs=(-179030000.000000,89030000.000000)		LowerRightMtrs=(180030000.000000,-90030000.000000)		Projection=GCTP_GEO		GROUP=Dimension			OBJECT=Dimension_1				DimensionName=&quot;StdPressureLev&quot;				Size=24			END_OBJECT=Dimension_1			OBJECT=Dimension_2				DimensionName=&quot;H2OPressureLev&quot;				Size=12			END_OBJECT=Dimension_2			OBJECT=Dimension_3				DimensionName=&quot;H2OPressureLay&quot;				Size=12			END_OBJECT=Dimension_3			OBJECT=Dimension_4				DimensionName=&quot;CoarseCloudLayer&quot;				Size=3			END_OBJECT=Dimension_4			OBJECT=Dimension_5				DimensionName=&quot;FineCloudLayer&quot;				Size=12			END_OBJECT=Dimension_5			OBJECT=Dimension_6				DimensionName=&quot;EmisFreqIR&quot;				Size=4			END_OBJECT=Dimension_6		END_GROUP=Dimension		GROUP=DataField			OBJECT=DataField_1				DataFieldName=&quot;TotalCounts_TqJ_D&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_1			OBJECT=DataField_2				DataFieldName=&quot;SurfPres_Forecast_TqJ_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_2			OBJECT=DataField_3				DataFieldName=&quot;SurfPres_Forecast_TqJ_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_3			OBJECT=DataField_4				DataFieldName=&quot;SurfPres_Forecast_TqJ_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_4			OBJECT=DataField_5				DataFieldName=&quot;SurfPres_Forecast_TqJ_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_5			OBJECT=DataField_6				DataFieldName=&quot;SurfPres_Forecast_TqJ_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_6			OBJECT=DataField_7				DataFieldName=&quot;SurfSkinTemp_TqJ_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_7			OBJECT=DataField_8				DataFieldName=&quot;SurfSkinTemp_TqJ_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_8			OBJECT=DataField_9				DataFieldName=&quot;SurfSkinTemp_TqJ_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_9			OBJECT=DataField_10				DataFieldName=&quot;SurfSkinTemp_TqJ_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_10			OBJECT=DataField_11				DataFieldName=&quot;SurfSkinTemp_TqJ_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_11			OBJECT=DataField_12				DataFieldName=&quot;SurfSkinTemp_TqJ_D_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_12			OBJECT=DataField_13				DataFieldName=&quot;EmisIR_TqJ_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;EmisFreqIR&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_13			OBJECT=DataField_14				DataFieldName=&quot;EmisIR_TqJ_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;EmisFreqIR&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_14			OBJECT=DataField_15				DataFieldName=&quot;EmisIR_TqJ_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;EmisFreqIR&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_15			OBJECT=DataField_16				DataFieldName=&quot;EmisIR_TqJ_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;EmisFreqIR&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_16			OBJECT=DataField_17				DataFieldName=&quot;EmisIR_TqJ_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;EmisFreqIR&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_17			OBJECT=DataField_18				DataFieldName=&quot;EmisIR_TqJ_D_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;EmisFreqIR&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_18			OBJECT=DataField_19				DataFieldName=&quot;Temperature_TqJ_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_19			OBJECT=DataField_20				DataFieldName=&quot;Temperature_TqJ_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_20			OBJECT=DataField_21				DataFieldName=&quot;Temperature_TqJ_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_21			OBJECT=DataField_22				DataFieldName=&quot;Temperature_TqJ_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_22			OBJECT=DataField_23				DataFieldName=&quot;Temperature_TqJ_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_23			OBJECT=DataField_24				DataFieldName=&quot;Temperature_TqJ_D_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_24			OBJECT=DataField_25				DataFieldName=&quot;SurfAirTemp_TqJ_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_25			OBJECT=DataField_26				DataFieldName=&quot;SurfAirTemp_TqJ_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_26			OBJECT=DataField_27				DataFieldName=&quot;SurfAirTemp_TqJ_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_27			OBJECT=DataField_28				DataFieldName=&quot;SurfAirTemp_TqJ_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_28			OBJECT=DataField_29				DataFieldName=&quot;SurfAirTemp_TqJ_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_29			OBJECT=DataField_30				DataFieldName=&quot;SurfAirTemp_TqJ_D_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_30			OBJECT=DataField_31				DataFieldName=&quot;TropPres_TqJ_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_31			OBJECT=DataField_32				DataFieldName=&quot;TropPres_TqJ_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_32			OBJECT=DataField_33				DataFieldName=&quot;TropPres_TqJ_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_33			OBJECT=DataField_34				DataFieldName=&quot;TropPres_TqJ_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_34			OBJECT=DataField_35				DataFieldName=&quot;TropPres_TqJ_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_35			OBJECT=DataField_36				DataFieldName=&quot;TropTemp_TqJ_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_36			OBJECT=DataField_37				DataFieldName=&quot;TropTemp_TqJ_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_37			OBJECT=DataField_38				DataFieldName=&quot;TropTemp_TqJ_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_38			OBJECT=DataField_39				DataFieldName=&quot;TropTemp_TqJ_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_39			OBJECT=DataField_40				DataFieldName=&quot;TropTemp_TqJ_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_40			OBJECT=DataField_41				DataFieldName=&quot;TotH2OVap_TqJ_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_41			OBJECT=DataField_42				DataFieldName=&quot;TotH2OVap_TqJ_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_42			OBJECT=DataField_43				DataFieldName=&quot;TotH2OVap_TqJ_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_43			OBJECT=DataField_44				DataFieldName=&quot;TotH2OVap_TqJ_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_44			OBJECT=DataField_45				DataFieldName=&quot;TotH2OVap_TqJ_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_45			OBJECT=DataField_46				DataFieldName=&quot;TotH2OVap_TqJ_D_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_46			OBJECT=DataField_47				DataFieldName=&quot;H2O_MMR_Lyr_TqJ_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLay&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_47			OBJECT=DataField_48				DataFieldName=&quot;H2O_MMR_Lyr_TqJ_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;H2OPressureLay&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_48			OBJECT=DataField_49				DataFieldName=&quot;H2O_MMR_Lyr_TqJ_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLay&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_49			OBJECT=DataField_50				DataFieldName=&quot;H2O_MMR_Lyr_TqJ_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLay&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_50			OBJECT=DataField_51				DataFieldName=&quot;H2O_MMR_Lyr_TqJ_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLay&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_51			OBJECT=DataField_52				DataFieldName=&quot;H2O_MMR_Lyr_TqJ_D_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLay&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_52			OBJECT=DataField_53				DataFieldName=&quot;H2O_MMR_TqJ_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_53			OBJECT=DataField_54				DataFieldName=&quot;H2O_MMR_TqJ_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;H2OPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_54			OBJECT=DataField_55				DataFieldName=&quot;H2O_MMR_TqJ_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_55			OBJECT=DataField_56				DataFieldName=&quot;H2O_MMR_TqJ_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_56			OBJECT=DataField_57				DataFieldName=&quot;H2O_MMR_TqJ_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_57			OBJECT=DataField_58				DataFieldName=&quot;H2O_MMR_TqJ_D_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_58			OBJECT=DataField_59				DataFieldName=&quot;H2O_MMR_Surf_TqJ_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_59			OBJECT=DataField_60				DataFieldName=&quot;H2O_MMR_Surf_TqJ_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_60			OBJECT=DataField_61				DataFieldName=&quot;H2O_MMR_Surf_TqJ_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_61			OBJECT=DataField_62				DataFieldName=&quot;H2O_MMR_Surf_TqJ_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_62			OBJECT=DataField_63				DataFieldName=&quot;H2O_MMR_Surf_TqJ_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_63			OBJECT=DataField_64				DataFieldName=&quot;H2O_MMR_Surf_TqJ_D_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_64			OBJECT=DataField_65				DataFieldName=&quot;RelHum_TqJ_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_65			OBJECT=DataField_66				DataFieldName=&quot;RelHum_TqJ_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;H2OPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_66			OBJECT=DataField_67				DataFieldName=&quot;RelHum_TqJ_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_67			OBJECT=DataField_68				DataFieldName=&quot;RelHum_TqJ_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_68			OBJECT=DataField_69				DataFieldName=&quot;RelHum_TqJ_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_69			OBJECT=DataField_70				DataFieldName=&quot;RelHumSurf_TqJ_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDF</Value>
+    </Attribute>
+    <Attribute name="StructMetadata_4" type="String">
+        <Value>E_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_70			OBJECT=DataField_71				DataFieldName=&quot;RelHumSurf_TqJ_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_71			OBJECT=DataField_72				DataFieldName=&quot;RelHumSurf_TqJ_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_72			OBJECT=DataField_73				DataFieldName=&quot;RelHumSurf_TqJ_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_73			OBJECT=DataField_74				DataFieldName=&quot;RelHumSurf_TqJ_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_74			OBJECT=DataField_75				DataFieldName=&quot;RelHum_liquid_TqJ_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_75			OBJECT=DataField_76				DataFieldName=&quot;RelHum_liquid_TqJ_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;H2OPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_76			OBJECT=DataField_77				DataFieldName=&quot;RelHum_liquid_TqJ_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_77			OBJECT=DataField_78				DataFieldName=&quot;RelHum_liquid_TqJ_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_78			OBJECT=DataField_79				DataFieldName=&quot;RelHum_liquid_TqJ_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;H2OPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_79			OBJECT=DataField_80				DataFieldName=&quot;RelHumSurf_liquid_TqJ_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_80			OBJECT=DataField_81				DataFieldName=&quot;RelHumSurf_liquid_TqJ_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_81			OBJECT=DataField_82				DataFieldName=&quot;RelHumSurf_liquid_TqJ_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_82			OBJECT=DataField_83				DataFieldName=&quot;RelHumSurf_liquid_TqJ_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_83			OBJECT=DataField_84				DataFieldName=&quot;RelHumSurf_liquid_TqJ_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_84			OBJECT=DataField_85				DataFieldName=&quot;TropHeight_TqJ_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_85			OBJECT=DataField_86				DataFieldName=&quot;TropHeight_TqJ_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_86			OBJECT=DataField_87				DataFieldName=&quot;TropHeight_TqJ_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_87			OBJECT=DataField_88				DataFieldName=&quot;TropHeight_TqJ_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_88			OBJECT=DataField_89				DataFieldName=&quot;TropHeight_TqJ_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_89			OBJECT=DataField_90				DataFieldName=&quot;GPHeight_TqJ_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_90			OBJECT=DataField_91				DataFieldName=&quot;GPHeight_TqJ_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_91			OBJECT=DataField_92				DataFieldName=&quot;GPHeight_TqJ_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_92			OBJECT=DataField_93				DataFieldName=&quot;GPHeight_TqJ_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_93			OBJECT=DataField_94				DataFieldName=&quot;GPHeight_TqJ_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_94			OBJECT=DataField_95				DataFieldName=&quot;CloudFrc_TqJ_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_95			OBJECT=DataField_96				DataFieldName=&quot;CloudFrc_TqJ_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_96			OBJECT=DataField_97				DataFieldName=&quot;CloudFrc_TqJ_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_97			OBJECT=DataField_98				DataFieldName=&quot;CloudFrc_TqJ_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_98			OBJECT=DataField_99				DataFieldName=&quot;CloudFrc_TqJ_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_99			OBJECT=DataField_100				DataFieldName=&quot;CloudFrc_TqJ_D_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_100			OBJECT=DataField_101				DataFieldName=&quot;CloudTopPres_TqJ_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_101			OBJECT=DataField_102				DataFieldName=&quot;CloudTopPres_TqJ_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_102			OBJECT=DataField_103				DataFieldName=&quot;CloudTopPres_TqJ_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_103			OBJECT=DataField_104				DataFieldName=&quot;CloudTopPres_TqJ_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_104			OBJECT=DataField_105				DataFieldName=&quot;CloudTopPres_TqJ_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_105			OBJECT=DataField_106				DataFieldName=&quot;CloudTopPres_TqJ_D_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_106			OBJECT=DataField_107				DataFieldName=&quot;CloudTopTemp_TqJ_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_107			OBJECT=DataField_108				DataFieldName=&quot;CloudTopTemp_TqJ_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_108			OBJECT=DataField_109				DataFieldName=&quot;CloudTopTemp_TqJ_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_109			OBJECT=DataField_110				DataFieldName=&quot;CloudTopTemp_TqJ_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_110			OBJECT=DataField_111				DataFieldName=&quot;CloudTopTemp_TqJ_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_111			OBJECT=DataField_112				DataFieldName=&quot;CloudTopTemp_TqJ_D_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_112			OBJECT=DataField_113				DataFieldName=&quot;FineCloudFrc_TqJ_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;FineCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_113			OBJECT=DataField_114				DataFieldName=&quot;FineCloudFrc_TqJ_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;FineCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_114			OBJECT=DataField_115				DataFieldName=&quot;FineCloudFrc_TqJ_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;FineCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_115			OBJECT=DataField_116				DataFieldName=&quot;FineCloudFrc_TqJ_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;FineCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_116			OBJECT=DataField_117				DataFieldName=&quot;FineCloudFrc_TqJ_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;FineCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_117			OBJECT=DataField_118				DataFieldName=&quot;CoarseCloudFrc_TqJ_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;CoarseCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_118			OBJECT=DataField_119				DataFieldName=&quot;CoarseCloudFrc_TqJ_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;CoarseCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_119			OBJECT=DataField_120				DataFieldName=&quot;CoarseCloudFrc_TqJ_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;CoarseCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_120			OBJECT=DataField_121				DataFieldName=&quot;CoarseCloudFrc_TqJ_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;CoarseCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_121			OBJECT=DataField_122				DataFieldName=&quot;CoarseCloudFrc_TqJ_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;CoarseCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_122			OBJECT=DataField_123				DataFieldName=&quot;CoarseCloudPres_TqJ_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;CoarseCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_123			OBJECT=DataField_124				DataFieldName=&quot;CoarseCloudPres_TqJ_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;CoarseCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_124			OBJECT=DataField_125				DataFieldName=&quot;CoarseCloudPres_TqJ_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;CoarseCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_125			OBJECT=DataField_126				DataFieldName=&quot;CoarseCloudPres_TqJ_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;CoarseCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_126			OBJECT=DataField_127				DataFieldName=&quot;CoarseCloudPres_TqJ_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;CoarseCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_127			OBJECT=DataField_128				DataFieldName=&quot;CoarseCloudTemp_TqJ_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;CoarseCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_128			OBJECT=DataField_129				DataFieldName=&quot;CoarseCloudTemp_TqJ_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;CoarseCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_129			OBJECT=DataField_130				DataFieldName=&quot;CoarseCloudTemp_TqJ_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;CoarseCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_130			OBJECT=DataField_131				DataFieldName=&quot;CoarseCloudTemp_TqJ_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;CoarseCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_131			OBJECT=DataField_132				DataFieldName=&quot;CoarseCloudTemp_TqJ_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;CoarseCloudLayer&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_132			OBJECT=DataField_133				DataFieldName=&quot;TotO3_TqJ_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_133			OBJECT=DataField_134				DataFieldName=&quot;TotO3_TqJ_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_134			OBJECT=DataField_135				DataFieldName=&quot;TotO3_TqJ_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_135			OBJECT=DataField_136				DataFieldName=&quot;TotO3_TqJ_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_136			OBJECT=DataField_137				DataFieldName=&quot;TotO3_TqJ_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_137			OBJECT=DataField_138				DataFieldName=&quot;TotO3_TqJ_D_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_138			OBJECT=DataField_139				DataFieldName=&quot;O3_VMR_TqJ_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_139			OBJECT=DataField_140				DataFieldName=&quot;O3_VMR_TqJ_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_140			OBJECT=DataField_141				DataFieldName=&quot;O3_VMR_TqJ_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_141			OBJECT=DataField_142				DataFieldName=&quot;O3_VMR_TqJ_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_142			OBJECT=DataField_143				DataFieldName=&quot;O3_VMR_TqJ_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_143			OBJECT=DataField_144				DataFieldName=&quot;O3_VMR_TqJ_D_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_144			OBJECT=DataField_145				DataFieldName=&quot;TotCO_TqJ_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_145			OBJECT=DataField_146				DataFieldName=&quot;TotCO_TqJ_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_146			OBJECT=DataField_147				DataFieldName=&quot;TotCO_TqJ_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_147			OBJECT=DataField_148				DataFieldName=&quot;TotCO_TqJ_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_148			OBJECT=DataField_149				DataFieldName=&quot;TotCO_TqJ_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_149			OBJECT=DataField_150				DataFieldName=&quot;CO_VMR_TqJ_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_150			OBJECT=DataField_151				DataFieldName=&quot;CO_VMR_TqJ_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_151			OBJECT=DataField_152				DataFieldName=&quot;CO_VMR_TqJ_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_152			OBJECT=DataField_153				DataFieldName=&quot;CO_VMR_TqJ_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_153			OBJECT=DataField_154				DataFieldName=&quot;CO_VMR_TqJ_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_154			OBJECT=DataField_155				DataFieldName=&quot;CO_VMR_TqJ_D_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_155			OBJECT=DataField_156				DataFieldName=&quot;TotCH4_TqJ_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_156			OBJECT=DataField_157				DataFieldName=&quot;TotCH4_TqJ_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_157			OBJECT=DataField_158				DataFieldName=&quot;TotCH4_TqJ_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_158			OBJECT=DataField_159				DataFieldName=&quot;TotCH4_TqJ_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_159			OBJECT=DataField_160				DataFieldName=&quot;TotCH4_TqJ_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_160			OBJECT=DataField_161				DataFieldName=&quot;CH4_VMR_TqJ_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_161			OBJECT=DataField_162				DataFieldName=&quot;CH4_VMR_TqJ_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_162			OBJECT=DataField_163				DataFieldName=&quot;CH4_VMR_TqJ_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_163			OBJECT=DataField_164				DataFieldName=&quot;CH4_VMR_TqJ_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_164			OBJECT=DataField_165				DataFieldName=&quot;CH4_VMR_TqJ_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_165			OBJECT=DataField_166				DataFieldName=&quot;CH4_VMR_TqJ_D_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_166			OBJECT=DataField_167				DataFieldName=&quot;OLR_TqJ_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_167			OBJECT=DataField_168				DataFieldName=&quot;OLR_TqJ_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_168			OBJECT=DataField_169				DataFieldName=&quot;OLR_TqJ_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_169			OBJECT=DataField_170				DataFieldName=&quot;OLR_TqJ_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_170			OBJECT=DataField_171				DataFieldName=&quot;OLR_TqJ_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_171			OBJECT=DataField_172				DataFieldName=&quot;OLR_TqJ_D_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_172			OBJECT=DataField_173				DataFieldName=&quot;ClrOLR_TqJ_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_173			OBJECT=DataField_174				DataFieldName=&quot;ClrOLR_TqJ_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_174			OBJECT=DataField_175				DataFieldName=&quot;ClrOLR_TqJ_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_175			OBJECT=DataField_176				DataFieldName=&quot;ClrOLR_TqJ_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_176			OBJECT=DataField_177				DataFieldName=&quot;ClrOLR_TqJ_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_177			OBJECT=DataField_178				DataFieldName=&quot;ClrOLR_TqJ_D_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_178		END_GROUP=DataField		GROUP=MergedFields		END_GROUP=MergedFields	END_GROUP=GRID_4	GROUP=GRID_5		GridName=&quot;ascending_MW_only&quot;		XDim=360		YDim=180		UpperLeftPointMtrs=(-179030000.000000,89030000.000000)		LowerRightMtrs=(180030000.000000,-90030000.000000)		Projection=GCTP_GEO		GROUP=Dimension			OBJECT=Dimension_1				DimensionName=&quot;StdPressureLev&quot;				Size=24			END_OBJECT=Dimension_1			OBJECT=Dimension_2				DimensionName=&quot;H2OPressureLev&quot;				Size=12			END_OBJECT=Dimension_2			OBJECT=Dimension_3				DimensionName=&quot;H2OPressureLay&quot;				Size=12			END_OBJECT=Dimension_3			OBJECT=Dimension_4				DimensionName=&quot;CoarseCloudLayer&quot;				Size=3			END_OBJECT=Dimension_4			OBJECT=Dimension_5				DimensionName=&quot;FineCloudLayer&quot;				Size=12			END_OBJECT=Dimension_5			OBJECT=Dimension_6				DimensionName=&quot;EmisFreqMW&quot;				Size=3			END_OBJECT=Dimension_6		END_GROUP=Dimension		GROUP=DataField			OBJECT=DataField_1				DataFieldName=&quot;TotalCounts_MW_A&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_1			OBJECT=DataField_2				DataFieldName=&quot;Emis_MW_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;EmisFreqMW&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_2			OBJECT=DataField_3				DataFieldName=&quot;Emis_MW_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;EmisFreqMW&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_3			OBJECT=DataField_4				DataFieldName=&quot;Emis_MW_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;EmisFreqMW&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_4			OBJECT=DataField_5				DataFieldName=&quot;Emis_MW_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;EmisFreqMW&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_5			OBJECT=DataField_6				DataFieldName=&quot;Emis_MW_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;EmisFreqMW&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_6			OBJECT=DataField_7				DataFieldName=&quot;Temperature_MW_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_7			OBJECT=DataField_8				DataFieldName=&quot;Temperature_MW_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_8			OBJECT=DataField_9				DataFieldName=&quot;Temperature_MW_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_9			OBJECT=DataField_10				DataFieldName=&quot;Temperature_MW_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_10			OBJECT=DataField_11				DataFieldName=&quot;Temperature_MW_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_11			OBJECT=DataField_12				DataFieldName=&quot;TotH2OVap_MW_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_12			OBJECT=DataField_13				DataFieldName=&quot;TotH2OVap_MW_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_13			OBJECT=DataField_14				DataFieldName=&quot;TotH2OVap_MW_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_14			OBJECT=DataField_15				DataFieldName=&quot;TotH2OVap_MW_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_15			OBJECT=DataField_16				DataFieldName=&quot;TotH2OVap_MW_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_16			OBJECT=DataField_17				DataFieldName=&quot;GPHeight_MW_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_17			OBJECT=DataField_18				DataFieldName=&quot;GPHeight_MW_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_18			OBJECT=DataField_19				DataFieldName=&quot;GPHeight_MW_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_19			OBJECT=DataField_20				DataFieldName=&quot;GPHeight_MW_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_20			OBJECT=DataField_21				DataFieldName=&quot;GPHeight_MW_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_21			OBJECT=DataField_22				DataFieldName=&quot;TotCldLiqH2O_MW_A&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_22			OBJECT=DataField_23				DataFieldName=&quot;TotCldLiqH2O_MW_A_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_23			OBJECT=DataField_24				DataFieldName=&quot;TotCldLiqH2O_MW_A_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_24			OBJECT=DataField_25				DataFieldName=&quot;TotCldLiqH2O_MW_A_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_25			OBJECT=DataField_26				DataFieldName=&quot;TotCldLiqH2O_MW_A_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_26			OBJECT=DataField_27				DataFieldName=&quot;TotCldLiqH2O_MW_A_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_27		END_GROUP=DataField		GROUP=MergedFields		END_GROUP=MergedFields	END_GROUP=GRID_5	GROUP=GRID_6		GridName=&quot;descending_MW_only&quot;		XDim=360		YDim=180		UpperLeftPointMtrs=(-179030000.000000,89030000.000000)		LowerRightMtrs=(180030000.000000,-90030000.000000)		Projection=GCTP_GEO		GROUP=Dimension			OBJECT=Dimension_1				DimensionName=&quot;StdPressureLev&quot;				Size=24			END_OBJECT=Dimension_1			OBJECT=Dimension_2				DimensionName=&quot;H2OPressureLev&quot;				Size=12			END_OBJECT=Dimension_2			OBJECT=Dimension_3				DimensionName=&quot;H2OPressureLay&quot;				Size=12			END_OBJECT=Dimension_3			OBJECT=Dimension_4				DimensionName=&quot;CoarseCloudLayer&quot;				Size=3			END_OBJECT=Dimension_4			OBJECT=Dimension_5				DimensionName=&quot;FineCloudLayer&quot;				Size=12			END_OBJECT=Dimension_5			OBJECT=Dimension_6				DimensionName=&quot;EmisFreqMW&quot;				Size=3			END_OBJECT=Dimension_6		END_GROUP=Dimension		GROUP=DataField			OBJECT=DataField_1				DataFieldName=&quot;TotalCounts_MW_D&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_1			OBJECT=DataField_2				DataFieldName=&quot;Emis_MW_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;EmisFreqMW&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_2			OBJECT=DataField_3				DataFieldName=&quot;Emis_MW_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;EmisFreqMW&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_3			OBJECT=DataField_4				DataFieldName=&quot;Emis_MW_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;EmisFreqMW&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_4			OBJECT=DataField_5				DataFieldName=&quot;Emis_MW_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;EmisFreqMW&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_5			OBJECT=DataField_6				DataFieldName=&quot;Emis_MW_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;EmisFreqMW&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_6			OBJECT=DataField_7				DataFieldName=&quot;Temperature_MW_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_7			OBJECT=DataField_8				DataFieldName=&quot;Temperature_MW_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_8			OBJECT=DataField_9				DataFieldName=&quot;Temperature_MW_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_9			OBJECT=DataField_10				DataFieldName=&quot;Tempe</Value>
+    </Attribute>
+    <Attribute name="StructMetadata_5" type="String">
+        <Value>rature_MW_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_10			OBJECT=DataField_11				DataFieldName=&quot;Temperature_MW_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_11			OBJECT=DataField_12				DataFieldName=&quot;TotH2OVap_MW_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_12			OBJECT=DataField_13				DataFieldName=&quot;TotH2OVap_MW_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_13			OBJECT=DataField_14				DataFieldName=&quot;TotH2OVap_MW_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_14			OBJECT=DataField_15				DataFieldName=&quot;TotH2OVap_MW_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_15			OBJECT=DataField_16				DataFieldName=&quot;TotH2OVap_MW_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_16			OBJECT=DataField_17				DataFieldName=&quot;GPHeight_MW_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_17			OBJECT=DataField_18				DataFieldName=&quot;GPHeight_MW_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_18			OBJECT=DataField_19				DataFieldName=&quot;GPHeight_MW_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_19			OBJECT=DataField_20				DataFieldName=&quot;GPHeight_MW_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_20			OBJECT=DataField_21				DataFieldName=&quot;GPHeight_MW_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;StdPressureLev&quot;,&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_21			OBJECT=DataField_22				DataFieldName=&quot;TotCldLiqH2O_MW_D&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_22			OBJECT=DataField_23				DataFieldName=&quot;TotCldLiqH2O_MW_D_ct&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_23			OBJECT=DataField_24				DataFieldName=&quot;TotCldLiqH2O_MW_D_sdev&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_24			OBJECT=DataField_25				DataFieldName=&quot;TotCldLiqH2O_MW_D_min&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_25			OBJECT=DataField_26				DataFieldName=&quot;TotCldLiqH2O_MW_D_max&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_26			OBJECT=DataField_27				DataFieldName=&quot;TotCldLiqH2O_MW_D_err&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_27		END_GROUP=DataField		GROUP=MergedFields		END_GROUP=MergedFields	END_GROUP=GRID_6	GROUP=GRID_7		GridName=&quot;location&quot;		XDim=360		YDim=180		UpperLeftPointMtrs=(-179030000.000000,89030000.000000)		LowerRightMtrs=(180030000.000000,-90030000.000000)		Projection=GCTP_GEO		GROUP=Dimension		END_GROUP=Dimension		GROUP=DataField			OBJECT=DataField_1				DataFieldName=&quot;Latitude&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_1			OBJECT=DataField_2				DataFieldName=&quot;Longitude&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_2			OBJECT=DataField_3				DataFieldName=&quot;LandSeaMask&quot;				DataType=DFNT_INT16				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_3			OBJECT=DataField_4				DataFieldName=&quot;Topography&quot;				DataType=DFNT_FLOAT32				DimList=(&quot;YDim&quot;,&quot;XDim&quot;)				CompressionType=HDFE_COMP_DEFLATE				DeflateLevel=5			END_OBJECT=DataField_4		END_GROUP=DataField		GROUP=MergedFields		END_GROUP=MergedFields	END_GROUP=GRID_7END_GROUP=GridStructureGROUP=PointStructureEND_GROUP=PointStructureEND</Value>
+    </Attribute>
+    <Attribute name="identifier_product_doi" type="String">
+        <Value>10.5067/AQUA/AIRS/DATA303</Value>
+    </Attribute>
+    <Attribute name="identifier_product_doi_authority" type="String">
+        <Value>http://dx.doi.org/</Value>
+    </Attribute>
+    <Attribute name="coremetadata" type="String">
+        <Value>GROUP                  = INVENTORYMETADATA  GROUPTYPE            = MASTERGROUP  GROUP                  = ECSDATAGRANULE    OBJECT                 = LOCALGRANULEID      NUM_VAL              = 1      VALUE                = &quot;AIRS.2015.09.21.L3.RetStd_IR001.v6.0.31.0.G15281122640.hdf&quot;    END_OBJECT             = LOCALGRANULEID    OBJECT                 = PRODUCTIONDATETIME      NUM_VAL              = 1      VALUE                = &quot;2015-10-08T16:26:44.000Z&quot;    END_OBJECT             = PRODUCTIONDATETIME    OBJECT                 = LOCALVERSIONID      NUM_VAL              = 1      VALUE                = &quot;Unspecified&quot;    END_OBJECT             = LOCALVERSIONID  END_GROUP              = ECSDATAGRANULE  GROUP                  = MEASUREDPARAMETER    OBJECT                 = MEASUREDPARAMETERCONTAINER      CLASS                = &quot;1&quot;      GROUP                  = QAFLAGS        CLASS                = &quot;1&quot;        OBJECT                 = AUTOMATICQUALITYFLAGEXPLANATION          NUM_VAL              = 1          CLASS                = &quot;1&quot;          VALUE                = &quot;Based on percentage of product that is good. Suspect used where true quality is not known.&quot;        END_OBJECT             = AUTOMATICQUALITYFLAGEXPLANATION        OBJECT                 = AUTOMATICQUALITYFLAG          NUM_VAL              = 1          CLASS                = &quot;1&quot;          VALUE                = &quot;Passed&quot;        END_OBJECT             = AUTOMATICQUALITYFLAG      END_GROUP              = QAFLAGS      GROUP                  = QASTATS        CLASS                = &quot;1&quot;        OBJECT                 = QAPERCENTMISSINGDATA          NUM_VAL              = 1          CLASS                = &quot;1&quot;          VALUE                = 0        END_OBJECT             = QAPERCENTMISSINGDATA      END_GROUP              = QASTATS      OBJECT                 = PARAMETERNAME        CLASS                = &quot;1&quot;        NUM_VAL              = 1        VALUE                = &quot;Surface Skin Temperature&quot;      END_OBJECT             = PARAMETERNAME    END_OBJECT             = MEASUREDPARAMETERCONTAINER    OBJECT                 = MEASUREDPARAMETERCONTAINER      CLASS                = &quot;2&quot;      GROUP                  = QAFLAGS        CLASS                = &quot;2&quot;        OBJECT                 = AUTOMATICQUALITYFLAGEXPLANATION          NUM_VAL              = 1          CLASS                = &quot;2&quot;          VALUE                = &quot;Based on percentage of product that is good. Suspect used where true quality is not known.&quot;        END_OBJECT             = AUTOMATICQUALITYFLAGEXPLANATION        OBJECT                 = AUTOMATICQUALITYFLAG          NUM_VAL              = 1          CLASS                = &quot;2&quot;          VALUE                = &quot;Passed&quot;        END_OBJECT             = AUTOMATICQUALITYFLAG      END_GROUP              = QAFLAGS      GROUP                  = QASTATS        CLASS                = &quot;2&quot;        OBJECT                 = QAPERCENTMISSINGDATA          NUM_VAL              = 1          CLASS                = &quot;2&quot;          VALUE                = 0        END_OBJECT             = QAPERCENTMISSINGDATA      END_GROUP              = QASTATS      OBJECT                 = PARAMETERNAME        CLASS                = &quot;2&quot;        NUM_VAL              = 1        VALUE                = &quot;Surface Air Temperature&quot;      END_OBJECT             = PARAMETERNAME    END_OBJECT             = MEASUREDPARAMETERCONTAINER    OBJECT                 = MEASUREDPARAMETERCONTAINER      CLASS                = &quot;3&quot;      GROUP                  = QAFLAGS        CLASS                = &quot;3&quot;        OBJECT                 = AUTOMATICQUALITYFLAGEXPLANATION          NUM_VAL              = 1          CLASS                = &quot;3&quot;          VALUE                = &quot;Based on percentage of product that is good. Suspect used where true quality is not known.&quot;        END_OBJECT             = AUTOMATICQUALITYFLAGEXPLANATION        OBJECT                 = AUTOMATICQUALITYFLAG          NUM_VAL              = 1          CLASS                = &quot;3&quot;          VALUE                = &quot;Passed&quot;        END_OBJECT             = AUTOMATICQUALITYFLAG      END_GROUP              = QAFLAGS      GROUP                  = QASTATS        CLASS                = &quot;3&quot;        OBJECT                 = QAPERCENTMISSINGDATA          NUM_VAL              = 1          CLASS                = &quot;3&quot;          VALUE                = 0        END_OBJECT             = QAPERCENTMISSINGDATA      END_GROUP              = QASTATS      OBJECT                 = PARAMETERNAME        CLASS                = &quot;3&quot;        NUM_VAL              = 1        VALUE                = &quot;Atmospheric Temperature&quot;      END_OBJECT             = PARAMETERNAME    END_OBJECT             = MEASUREDPARAMETERCONTAINER    OBJECT                 = MEASUREDPARAMETERCONTAINER      CLASS                = &quot;4&quot;      GROUP                  = QAFLAGS        CLASS                = &quot;4&quot;        OBJECT                 = AUTOMATICQUALITYFLAGEXPLANATION          NUM_VAL              = 1          CLASS                = &quot;4&quot;          VALUE                = &quot;Based on percentage of product that is good. Suspect used where true quality is not known.&quot;        END_OBJECT             = AUTOMATICQUALITYFLAGEXPLANATION        OBJECT                 = AUTOMATICQUALITYFLAG          NUM_VAL              = 1          CLASS                = &quot;4&quot;          VALUE                = &quot;Passed&quot;        END_OBJECT             = AUTOMATICQUALITYFLAG      END_GROUP              = QAFLAGS      GROUP                  = QASTATS        CLASS                = &quot;4&quot;        OBJECT                 = QAPERCENTMISSINGDATA          NUM_VAL              = 1          CLASS                = &quot;4&quot;          VALUE                = 0        END_OBJECT             = QAPERCENTMISSINGDATA      END_GROUP              = QASTATS      OBJECT                 = PARAMETERNAME        CLASS                = &quot;4&quot;        NUM_VAL              = 1        VALUE                = &quot;Water Vapor Mass Mixing Ratio&quot;      END_OBJECT             = PARAMETERNAME    END_OBJECT             = MEASUREDPARAMETERCONTAINER    OBJECT                 = MEASUREDPARAMETERCONTAINER      CLASS                = &quot;5&quot;      GROUP                  = QAFLAGS        CLASS                = &quot;5&quot;        OBJECT                 = AUTOMATICQUALITYFLAGEXPLANATION          NUM_VAL              = 1          CLASS                = &quot;5&quot;          VALUE                = &quot;Based on percentage of product that is good. Suspect used where true quality is not known.&quot;        END_OBJECT             = AUTOMATICQUALITYFLAGEXPLANATION        OBJECT                 = AUTOMATICQUALITYFLAG          NUM_VAL              = 1          CLASS                = &quot;5&quot;          VALUE                = &quot;Passed&quot;        END_OBJECT             = AUTOMATICQUALITYFLAG      END_GROUP              = QAFLAGS      GROUP                  = QASTATS        CLASS                = &quot;5&quot;        OBJECT                 = QAPERCENTMISSINGDATA          NUM_VAL              = 1          CLASS                = &quot;5&quot;          VALUE                = 0        END_OBJECT             = QAPERCENTMISSINGDATA      END_GROUP              = QASTATS      OBJECT                 = PARAMETERNAME        CLASS                = &quot;5&quot;        NUM_VAL              = 1        VALUE                = &quot;Total Precipitable Water Vapor&quot;      END_OBJECT             = PARAMETERNAME    END_OBJECT             = MEASUREDPARAMETERCONTAINER    OBJECT                 = MEASUREDPARAMETERCONTAINER      CLASS                = &quot;6&quot;      GROUP                  = QAFLAGS        CLASS                = &quot;6&quot;        OBJECT                 = AUTOMATICQUALITYFLAGEXPLANATION          NUM_VAL              = 1          CLASS                = &quot;6&quot;          VALUE                = &quot;Based on percentage of product that is good. Suspect used where true quality is not known.&quot;        END_OBJECT             = AUTOMATICQUALITYFLAGEXPLANATION        OBJECT                 = AUTOMATICQUALITYFLAG          NUM_VAL              = 1          CLASS                = &quot;6&quot;          VALUE                = &quot;Passed&quot;        END_OBJECT             = AUTOMATICQUALITYFLAG      END_GROUP              = QAFLAGS      GROUP                  = QASTATS        CLASS                = &quot;6&quot;        OBJECT                 = QAPERCENTMISSINGDATA          NUM_VAL              = 1          CLASS                = &quot;6&quot;          VALUE                = 0        END_OBJECT             = QAPERCENTMISSINGDATA      END_GROUP              = QASTATS      OBJECT                 = PARAMETERNAME        CLASS                = &quot;6&quot;        NUM_VAL              = 1        VALUE                = &quot;Ozone Volume Mixing Ratio&quot;      END_OBJECT             = PARAMETERNAME    END_OBJECT             = MEASUREDPARAMETERCONTAINER    OBJECT                 = MEASUREDPARAMETERCONTAINER      CLASS                = &quot;7&quot;      GROUP                  = QAFLAGS        CLASS                = &quot;7&quot;        OBJECT                 = AUTOMATICQUALITYFLAGEXPLANATION          NUM_VAL              = 1          CLASS                = &quot;7&quot;          VALUE                = &quot;Based on percentage of product that is good. Suspect used where true quality is not known.&quot;        END_OBJECT             = AUTOMATICQUALITYFLAGEXPLANATION        OBJECT                 = AUTOMATICQUALITYFLAG          NUM_VAL              = 1          CLASS                = &quot;7&quot;          VALUE                = &quot;Passed&quot;        END_OBJECT             = AUTOMATICQUALITYFLAG      END_GROUP              = QAFLAGS      GROUP                  = QASTATS        CLASS                = &quot;7&quot;        OBJECT                 = QAPERCENTMISSINGDATA          NUM_VAL              = 1          CLASS                = &quot;7&quot;          VALUE                = 0        END_OBJECT             = QAPERCENTMISSINGDATA      END_GROUP              = QASTATS      OBJECT                 = PARAMETERNAME        CLASS                = &quot;7&quot;        NUM_VAL              = 1        VALUE                = &quot;Total Ozone Burden&quot;      END_OBJECT             = PARAMETERNAME    END_OBJECT             = MEASUREDPARAMETERCONTAINER    OBJECT                 = MEASUREDPARAMETERCONTAINER      CLASS                = &quot;8&quot;      GROUP                  = QAFLAGS        CLASS                = &quot;8&quot;        OBJECT                 = AUTOMATICQUALITYFLAGEXPLANATION          NUM_VAL              = 1          CLASS                = &quot;8&quot;          VALUE                = &quot;Based on percentage of product that is good. Suspect used where true quality is not known.&quot;        END_OBJECT             = AUTOMATICQUALITYFLAGEXPLANATION        OBJECT                 = AUTOMATICQUALITYFLAG          NUM_VAL              = 1          CLASS                = &quot;8&quot;          VALUE                = &quot;Passed&quot;        END_OBJECT             = AUTOMATICQUALITYFLAG      END_GROUP              = QAFLAGS      GROUP                  = QASTATS        CLASS                = &quot;8&quot;        OBJECT                 = QAPERCENTMISSINGDATA          NUM_VAL              = 1          CLASS                = &quot;8&quot;          VALUE                = 0        END_OBJECT             = QAPERCENTMISSINGDATA      END_GROUP              = QASTATS      OBJECT                 = PARAMETERNAME        CLASS                = &quot;8&quot;        NUM_VAL              = 1        VALUE                = &quot;Spectral IR Surface Emissivities&quot;      END_OBJECT             = PARAMETERNAME    END_OBJECT             = MEASUREDPARAMETERCONTAINER    OBJECT                 = MEASUREDPARAMETERCONTAINER      CLASS                = &quot;9&quot;      GROUP                  = QAFLAGS        CLASS                = &quot;9&quot;        OBJECT                 = AUTOMATICQUALITYFLAGEXPLANATION          NUM_VAL              = 1          CLASS                = &quot;9&quot;          VALUE                = &quot;Based on percentage of product that is good. Suspect used where true quality is not known.&quot;        END_OBJECT             = AUTOMATICQUALITYFLAGEXPLANATION        OBJECT                 = AUTOMATICQUALITYFLAG          NUM_VAL              = 1          CLASS                = &quot;9&quot;          VALUE                = &quot;Passed&quot;        END_OBJECT             = AUTOMATICQUALITYFLAG      END_GROUP              = QAFLAGS      GROUP                  = QASTATS        CLASS                = &quot;9&quot;        OBJECT                 = QAPERCENTMISSINGDATA          NUM_VAL              = 1          CLASS                = &quot;9&quot;          VALUE                = 0        END_OBJECT             = QAPERCENTMISSINGDATA      END_GROUP              = QASTATS      OBJECT                 = PARAMETERNAME        CLASS                = &quot;9&quot;        NUM_VAL              = 1        VALUE                = &quot;Spectral IR Surf Bidirect Reflectivity&quot;      END_OBJECT             = PARAMETERNAME    END_OBJECT             = MEASUREDPARAMETERCONTAINER    OBJECT                 = MEASUREDPARAMETERCONTAINER      CLASS                = &quot;10&quot;      GROUP                  = QAFLAGS        CLASS                = &quot;10&quot;        OBJECT                 = AUTOMATICQUALITYFLAGEXPLANATION          NUM_VAL              = 1          CLASS                = &quot;10&quot;          VALUE                = &quot;Based on percentage of product that is good. Suspect used where true quality is not known.&quot;        END_OBJECT             = AUTOMATICQUALITYFLAGEXPLANATION        OBJECT                 = AUTOMATICQUALITYFLAG          NUM_VAL              = 1          CLASS                = &quot;10&quot;          VALUE                = &quot;Passed&quot;        END_OBJECT             = AUTOMATICQUALITYFLAG      END_GROUP              = QAFLAGS      GROUP                  = QASTATS        CLASS                = &quot;10&quot;        OBJECT                 = QAPERCENTMISSINGDATA          NUM_VAL              = 1          CLASS                = &quot;10&quot;          VALUE                = 0        END_OBJECT             = QAPERCENTMISSINGDATA      END_GROUP              = QASTATS      OBJECT                 = PARAMETERNAME        CLASS                = &quot;10&quot;        NUM_VAL              = 1        VALUE                = &quot;MW Surface Brightness&quot;      END_OBJECT             = PARAMETERNAME    END_OBJECT             = MEASUREDPARAMETERCONTAINER    OBJECT                 = MEASUREDPARAMETERCONTAINER      CLASS                = &quot;11&quot;      GROUP                  = QAFLAGS        CLASS                = &quot;11&quot;        OBJECT                 = AUTOMATICQUALITYFLAGEXPLANATION          NUM_VAL              = 1          CLASS                = &quot;11&quot;          VALUE                = &quot;Based on percentage of product that is good. Suspect used where true quality is not known.&quot;        END_OBJECT             = AUTOMATICQUALITYFLAGEXPLANATION        OBJECT                 = AUTOMATICQUALITYFLAG          NUM_VAL              = 1          CLASS                = &quot;11&quot;          VALUE                = &quot;Passed&quot;        END_OBJECT             = AUTOMATICQUALITYFLAG      END_GROUP              = QAFLAGS      GROUP                  = QASTATS        CLASS                = &quot;11&quot;        OBJECT                 = QAPERCENTMISSINGDATA          NUM_VAL              = 1          CLASS                = &quot;11&quot;          VALUE                = 0        END_OBJECT             = QAPERCENTMISSINGDATA      END_GROUP              = QASTATS      OBJECT                 = PARAMETERNAME        CLASS                = &quot;11&quot;        NUM_VAL              = 1        VALUE                = &quot;MW Emissivity&quot;      END_OBJECT             = PARAMETERNAME    END_OBJECT             = MEASUREDPARAMETERCONTAINER    OBJECT                 = MEASUREDPARAMETERCONTAINER      CLASS                = &quot;12&quot;      GROUP                  = QAFLAGS        CLASS                = &quot;12&quot;        OBJECT                 = AUTOMATICQUALITYFLAGEXPLANATION          NUM_VAL              = 1          CLASS                = &quot;12&quot;          VALUE                = &quot;Based on percentage of product that is good. Suspect used where true quality is not known.&quot;        END_OBJECT             = AUTOMATICQUALITYFLAGEXPLANATION        OBJECT                 = AUTOMATICQUALITYFLAG          NUM_VAL              = 1          CLASS                = &quot;12&quot;          VALUE                = &quot;Passed&quot;        END_OBJECT             = AUTOMATICQUALITYFLAG      END_GROUP              = QAFLAGS      GROUP                  = QASTATS        CLASS                = &quot;12&quot;        OBJECT                 = QAPERCENTMISSINGDATA          NUM_VAL              = 1          CLASS                = &quot;12&quot;          VALUE                = 0        END_OBJECT             = QAPERCENTMISSINGDATA      END_GROUP              = QASTATS      OBJECT                 = PARAMETERNAME        CLASS                = &quot;12&quot;        NUM_VAL              = 1        VALUE                = &quot;Total Cloud Water&quot;      END_OBJECT             = PARAMETERNAME    END_OBJECT             = MEASUREDPARAMETERCONTAINER    OBJECT                 = MEASUREDPARAMETERCONTAINER      CLASS                = &quot;13&quot;      GROUP                  = QAFLAGS        CLASS                = &quot;13&quot;        OBJECT                 = AUTOMATICQUALITYFLAGEXPLANATION          NUM_VAL              = 1          CLASS                = &quot;13&quot;          VALUE                = &quot;Based on percentage of product that is good. Suspect used where true quality is not known.&quot;        END_OBJECT             = AUTOMATICQUALITYFLAGEXPLANATION        OBJECT                 = AUTOMATICQUALITYFLAG          NUM_VAL              = 1          CLASS                = &quot;13&quot;          VALUE                = &quot;Passed&quot;        END_OBJECT             = AUTOMATICQUALITYFLAG      END_GROUP              = QAFLAGS      GROUP                  = QASTATS        CLASS                = &quot;13&quot;        OBJECT                 = QAPERCENTMISSINGDATA          NUM_VAL              = 1          CLASS                = &quot;13&quot;          VALUE                = 0        END_OBJECT             = QAPERCENTMISSINGDATA      END_GROUP              = QASTATS      OBJECT                 = PARAMETERNAME        CLASS                = &quot;13&quot;        NUM_VAL              = 1        VALUE                = &quot;Cloud Top Temperature&quot;      END_OBJECT             = PARAMETERNAME    END_OBJECT             = MEASUREDPARAMETERCONTAINER    OBJECT                 = MEASUREDPARAMETERCONTAINER      CLASS                = &quot;14&quot;      GROUP                  = QAFLAGS        CLASS                = &quot;14&quot;        OBJECT                 = AUTOMATICQUALITYFLAGEXPLANATION          NUM_VAL              = 1          CLASS                = &quot;14&quot;          VALUE                = &quot;Based on percentage of product that is good. Suspect used where true quality is not known.&quot;        END_OBJECT             = AUTOMATICQUALITYFLAGEXPLANATION        OBJECT                 = AUTOMATICQUALITYFLAG          NUM_VAL              = 1          CLASS                = &quot;14&quot;          VALUE                = &quot;Passed&quot;        END_OBJECT             = AUTOMATICQUALITYFLAG      END_GROUP              = QAFLAGS      GROUP                  = QASTATS        CLASS                = &quot;14&quot;        OBJECT                 = QAPERCENTMISSINGDATA          NUM_VAL              = 1          CLASS                = &quot;14&quot;          VALUE                = 0        END_OBJECT             = QAPERCENTMISSINGDATA      END_GROUP              = QASTATS      OBJECT                 = PARAMETERNAME        CLASS                = &quot;14&quot;        NUM_VAL              = 1        VALUE                = &quot;Cloud Top Pressure&quot;      END_OBJECT             = PARAMETERNAME    END_OBJECT             = MEASUREDPARAMETERCONTAINER    OBJECT                 = MEASUREDPARAMETERCONTAINER      CLASS                = &quot;15&quot;      GROUP                  = QAFLAGS        CLASS                = &quot;15&quot;        OBJECT                 = AUTOMATICQUALITYFLAGEXPLANATION          NUM_VAL              = 1          CLASS                = &quot;15&quot;          VALUE                = &quot;Based on percentage of product that is good. Suspect used where true quality is not known.&quot;        END_OBJECT             = AUTOMATICQUALITYFLAGEXPLANATION        OBJECT                 = AUTOMATICQUALITYFLAG          NUM_VAL              = 1          CLASS                = &quot;15&quot;          VALUE                = &quot;Passed&quot;        END_OBJECT             = AUTOMATICQUALITYFLAG      END_GROUP              = QAFLAGS      GROUP                  = QASTATS        CLASS                = &quot;15&quot;        OBJECT                 = QAPERCENTMISSINGDATA          NUM_VAL              = 1          CLASS                = &quot;15&quot;          VALUE                = 0        END_OBJECT             = QAPERCENTMISSINGDATA      END_GROUP              = QASTATS      OBJECT                 = PARAMETERNAME        CLASS                = &quot;15&quot;        NUM_VAL              = 1        VALUE                = &quot;Effective Cloud Fraction&quot;      END_OBJECT             = PARAMETERNAME    END_OBJECT             = MEASUREDPARAMETERCONTAINER    OBJECT                 = MEASUREDPARAMETERCONTAINER      CLASS                = &quot;16&quot;      GROUP                  = QAFLAGS        CLASS                = &quot;16&quot;        OBJECT                 = AUTOMATICQUALITYFLAGEXPLANATION          NUM_VAL              = 1          CLASS                = &quot;16&quot;          VALUE                = &quot;Based on percentage of product that is good. Suspect used where true quality is not known.&quot;        END_OBJECT             = AUTOMATICQUALITYFLAGEXPLANATION        OBJECT                 = AUTOMATICQUALITYFLAG          NUM_VAL              = 1          CLASS                = &quot;16&quot;          VALUE                = &quot;Passed&quot;        END_OBJECT             = AUTOMATICQUALITYFLAG      END_GROUP              = QAFLAGS      GROUP                  = QASTATS        CLASS                = &quot;16&quot;        OBJECT                 = QAPERCENTMISSINGDATA          NUM_VAL              = 1          CLASS                = &quot;16&quot;          VALUE                = 0        END_OBJECT             = QAPERCENTMISSINGDATA      END_GROUP              = QASTATS      OBJECT                 = PARAMETERNAME        CLASS                = &quot;16&quot;        NUM_VAL              = 1        VALUE                = &quot;Geopotential Heights&quot;      END_OBJECT             = PARAMETERNAME    END_OBJECT             = MEASUREDPARAMETERCONTAINER    OBJECT                 = MEASUREDPARAMETERCONTAINER      CLASS                = &quot;17&quot;      GROUP                  = QAFLAGS        CLASS                = &quot;17&quot;        OBJECT                 = AUTOMATICQUALITYFLAGEXPLANATION          NUM_VAL              = 1          CLASS                = &quot;17&quot;          VALUE                = &quot;Based on percentage of product that is good. Suspect used where true quality is not known.&quot;        END_OBJECT             = AUTOMATICQUALITYFLAGEXPLANATION        OBJECT                 = AUTOMATICQUALITYFLAG          NUM_VAL              = 1          CLASS                = &quot;17&quot;          VALUE                = &quot;Passed&quot;        END_OBJECT             = AUTOMATICQUALITYFLAG      END_GROUP              = QAFLAGS      GROUP                  = QASTATS        CLASS                = &quot;17&quot;        OBJECT                 = QAPERCENTMISSINGDATA          NUM_VAL              = 1          CLASS                = &quot;17&quot;          VALUE                = 0        END_OBJECT             = QAPERCENTMISSINGDATA      END_GROUP              = QASTATS      OBJECT                 = PARAMETERNAME        CLASS                = &quot;17&quot;        NUM_VAL              = 1        VALUE                = &quot;Geopotential Height of Surface&quot;      END_OBJECT             = PARAMETERNAME    END_OBJECT             = MEASUREDPARAMETERCONTAINER  END_GROUP              = MEASUREDPARAMETER  GROUP                  = COLLECTIONDESCRIPTIONCLASS    OBJECT                 = VERSIONID      NUM_VAL              = 1      VALUE                = 6    END_OBJECT             = VERSIONID    OBJECT                 = SHORTNAME      NUM_VAL              = 1      VALUE                = &quot;AIRS3STD&quot;    END_OBJECT             = SHORTNAME  END_GROUP              = COLLECTIONDESCRIPTIONCLASS  GROUP                  = INPUTGRANULE    OBJECT                 = INPUTPOINTER      NUM_VAL              = 650      VALUE                = (&quot;L3h.land_sea_mask_1x1.v2.0.0.anc&quot;, &quot;ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.055.L2.RetStd_IR.v6.0.31.0.G15263162608.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.056.L2.RetStd_IR.v6.0.31.0.G15263161857.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.057.L2.RetStd_IR.v6.0.31.0.G15263162616.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.058.L2.RetStd_IR.v6.0.31.0.G15263162458.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.059.L2.RetStd_IR.v6.0.31.0.G15263161800.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.060.L2.RetStd_IR.v6.0.31.0.G15263162729.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.061.L2.RetStd_IR.v6.0.31.0.G15263163911.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.062.L2.RetStd_IR.v6.0.31.0.G15263163132.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.063.L2.RetStd_IR.v6.0.31.0.G15263164255.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.064.L2.RetStd_IR.v6.0.31.0.G15263164338.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.065.L2.RetStd_IR.v6.0.31.0.G15263163544.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.066.L2.RetStd_IR.v6.0.31.0.G15263164213.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.067.L2.RetStd_IR.v6.0.31.0.G15263163338.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.068.L2.RetStd_IR.v6.0.31.0.G15263163404.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.069.L2.RetStd_IR.v6.0.31.0.G15263164059.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.070.L2.RetStd_IR.v6.0.31.0.G15263163928.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.071.L2.RetStd_IR.v6.0.31.0.G15263165529.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.072.L2.RetStd_IR.v6.0.31.0.G15263165446.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.073.L2.RetStd_IR.v6.0.31.0.G15263165537.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.074.L2.RetStd_IR.v6.0.31.0.G15263165636.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.075.L2.RetStd_IR.v6.0.31.0.G15263165715.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.076.L2.RetStd_IR.v6.0.31.0.G15263165738.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.077.L2.RetStd_IR.v6.0.31.0.G15263165605.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.078.L2.RetStd_IR.v6.0.31.0.G15263164634.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.079.L2.RetStd_IR.v6.0.31.0.G15263164723.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.080.L2.RetStd_IR.v6.0.31.0.G15263165851.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.081.L2.RetStd_IR.v6.0.31.0.G15263170554.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.082.L2.RetStd_IR.v6.0.31.0.G15263171248.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.083.L2.RetStd_IR.v6.0.31.0.G15263171159.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.084.L2.RetStd_IR.v6.0.31.0.G15263170952.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.085.L2.RetStd_IR.v6.0.31.0.G15263170426.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.086.L2.RetStd_IR.v6.0.31.0.G15263171108.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.087.L2.RetStd_IR.v6.0.31.0.G15263170807.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.088.L2.RetStd_IR.v6.0.31.0.G15263170314.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.089.L2.RetStd_IR.v6.0.31.0.G15263170928.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.090.L2.RetStd_IR.v6.0.31.0.G15263170449.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.091.L2.RetStd_IR.v6.0.31.0.G15263171947.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.092.L2.RetStd_IR.v6.0.31.0.G15263172612.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.093.L2.RetStd_IR.v6.0.31.0.G15263172002.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.094.L2.RetStd_IR.v6.0.31.0.G15263172302.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.095.L2.RetStd_IR.v6.0.31.0.G15263171935.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.096.L2.RetStd_IR.v6.0.31.0.G15263172633.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.097.L2.RetStd_IR.v6.0.31.0.G15263172038.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.098.L2.RetStd_IR.v6.0.31.0.G15263172555.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.099.L2.RetStd_IR.v6.0.31.0.G15264140454.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.100.L2.RetStd_IR.v6.0.31.0.G15264140947.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.101.L2.RetStd_IR.v6.0.31.0.G15264140931.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.102.L2.RetStd_IR.v6.0.31.0.G15264141022.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.103.L2.RetStd_IR.v6.0.31.0.G15264140649.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.104.L2.RetStd_IR.v6.0.31.0.G15264150851.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.105.L2.RetStd_IR.v6.0.31.0.G15264152314.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.106.L2.RetStd_IR.v6.0.31.0.G15264121656.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.107.L2.RetStd_IR.v6.0.31.0.G15264121515.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.108.L2.RetStd_IR.v6.0.31.0.G15264121538.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.109.L2.RetStd_IR.v6.0.31.0.G15264121635.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.110.L2.RetStd_IR.v6.0.31.0.G15264121444.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.111.L2.RetStd_IR.v6.0.31.0.G15264110959.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.112.L2.RetStd_IR.v6.0.31.0.G15264111443.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.113.L2.RetStd_IR.v6.0.31.0.G15264111813.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.114.L2.RetStd_IR.v6.0.31.0.G15264111830.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.115.L2.RetStd_IR.v6.0.31.0.G15264111625.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.116.L2.RetStd_IR.v6.0.31.0.G15264111845.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.117.L2.RetStd_IR.v6.0.31.0.G15264111705.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.118.L2.RetStd_IR.v6.0.31.0.G15264111823.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.119.L2.RetStd_IR.v6.0.31.0.G15264140806.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.120.L2.RetStd_IR.v6.0.31.0.G15264140243.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.121.L2.RetStd_IR.v6.0.31.0.G15264152348.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.122.L2.RetStd_IR.v6.0.31.0.G15264151230.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.123.L2.RetStd_IR.v6.0.31.0.G15264151136.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.124.L2.RetStd_IR.v6.0.31.0.G15264151240.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.125.L2.RetStd_IR.v6.0.31.0.G15264152439.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.126.L2.RetStd_IR.v6.0.31.0.G15264121621.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.127.L2.RetStd_IR.v6.0.31.0.G15264121202.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.128.L2.RetStd_IR.v6.0.31.0.G15264111319.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.129.L2.RetStd_IR.v6.0.31.0.G15264111643.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.130.L2.RetStd_IR.v6.0.31.0.G15264113517.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.131.L2.RetStd_IR.v6.0.31.0.G15264113614.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.132.L2.RetStd_IR.v6.0.31.0.G15264113506.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.133.L2.RetStd_IR.v6.0.31.0.G15264113518.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.134.L2.RetStd_IR.v6.0.31.0.G15264113449.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.135.L2.RetStd_IR.v6.0.31.0.G15264113326.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.136.L2.RetStd_IR.v6.0.31.0.G15264113242.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.137.L2.RetStd_IR.v6.0.31.0.G15264151152.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.138.L2.RetStd_IR.v6.0.31.0.G15264151306.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.139.L2.RetStd_IR.v6.0.31.0.G15264151253.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.140.L2.RetStd_IR.v6.0.31.0.G15264153726.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.141.L2.RetStd_IR.v6.0.31.0.G15264153417.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.142.L2.RetStd_IR.v6.0.31.0.G15264152741.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.143.L2.RetStd_IR.v6.0.31.0.G15264153225.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.144.L2.RetStd_IR.v6.0.31.0.G15264140145.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.145.L2.RetStd_IR.v6.0.31.0.G15264140717.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.146.L2.RetStd_IR.v6.0.31.0.G15264141114.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.147.L2.RetStd_IR.v6.0.31.0.G15264142809.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.148.L2.RetStd_IR.v6.0.31.0.G15264142745.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.149.L2.RetStd_IR.v6.0.31.0.G15264142733.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.150.L2.RetStd_IR.v6.0.31.0.G15264142738.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.151.L2.RetStd_IR.v6.0.31.0.G15264142636.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.152.L2.RetStd_IR.v6.0.31.0.G15264142403.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.153.L2.RetStd_IR.v6.0.31.0.G15264142345.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.154.L2.RetStd_IR.v6.0.31.0.G15264153842.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.155.L2.RetStd_IR.v6.0.31.0.G15264153527.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.156.L2.RetStd_IR.v6.0.31.0.G15264153511.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.157.L2.RetStd_IR.v6.0.31.0.G15264153503.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.158.L2.RetStd_IR.v6.0.31.0.G15264153446.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.159.L2.RetStd_IR.v6.0.31.0.G15264153805.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.160.L2.RetStd_IR.v6.0.31.0.G15264153235.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.161.L2.RetStd_IR.v6.0.31.0.G15264142120.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.162.L2.RetStd_IR.v6.0.31.0.G15264142645.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.163.L2.RetStd_IR.v6.0.31.0.G15264142737.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.164.L2.RetStd_IR.v6.0.31.0.G15264144519.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.165.L2.RetStd_IR.v6.0.31.0.G15264144449.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.166.L2.RetStd_IR.v6.0.31.0.G15264144412.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.167.L2.RetStd_IR.v6.0.31.0.G15264144427.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.168.L2.RetStd_IR.v6.0.31.0.G15264144337.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.169.L2.RetStd_IR.v6.0.31.0.G15264143438.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.170.L2.RetStd_IR.v6.0.31.0.G15264154512.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.171.L2.RetStd_IR.v6.0.31.0.G15264154539.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.172.L2.RetStd_IR.v6.0.31.0.G15264154617.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.173.L2.RetStd_IR.v6.0.31.0.G15264154558.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.174.L2.RetStd_IR.v6.0.31.0.G15264155529.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.175.L2.RetStd_IR.v6.0.31.0.G15264155900.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.176.L2.RetStd_IR.v6.0.31.0.G15264160235.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.177.L2.RetStd_IR.v6.0.31.0.G15264153353.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.178.L2.RetStd_IR.v6.0.31.0.G15264153735.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.179.L2.RetStd_IR.v6.0.31.0.G15264150440.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.180.L2.RetStd_IR.v6.0.31.0.G15264145441.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.181.L2.RetStd_IR.v6.0.31.0.G15264145506.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.182.L2.RetStd_IR.v6.0.31.0.G15264150515.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.183.L2.RetStd_IR.v6.0.31.0.G15264154526.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.184.L2.RetStd_IR.v6.0.31.0.G15264154655.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.185.L2.RetStd_IR.v6.0.31.0.G15264154558.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.186.L2.RetStd_IR.v6.0.31.0.G15264155623.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.187.L2.RetStd_IR.v6.0.31.0.G15264160155.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.188.L2.RetStd_IR.v6.0.31.0.G15264161851.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.189.L2.RetStd_IR.v6.0.31.0.G15264161745.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.190.L2.RetStd_IR.v6.0.31.0.G15264161930.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.191.L2.RetStd_IR.v6.0.31.0.G15264161941.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.192.L2.RetStd_IR.v6.0.31.0.G15264162017.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.193.L2.RetStd_IR.v6.0.31.0.G15264161351.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.194.L2.RetStd_IR.v6.0.31.0.G15264160251.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.195.L2.RetStd_IR.v6.0.31.0.G15264155217.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.196.L2.RetStd_IR.v6.0.31.0.G15264160132.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.197.L2.RetStd_IR.v6.0.31.0.G15264160432.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.198.L2.RetStd_IR.v6.0.31.0.G15264155251.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.199.L2.RetStd_IR.v6.0.31.0.G15264161936.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.200.L2.RetStd_IR.v6.0.31.0.G15264161251.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.201.L2.RetStd_IR.v6.0.31.0.G15264161339.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.202.L2.RetStd_IR.v6.0.31.0.G15264161446.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.203.L2.RetStd_IR.v6.0.31.0.G15264162350.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.204.L2.RetStd_IR.v6.0.31.0.G15264162906.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.205.L2.RetStd_IR.v6.0.31.0.G15264163137.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.206.L2.RetStd_IR.v6.0.31.0.G15264163257.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.207.L2.RetStd_IR.v6.0.31.0.G15264163356.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.208.L2.RetStd_IR.v6.0.31.0.G15264163446.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.209.L2.RetStd_IR.v6.0.31.0.G15264162413.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.210.L2.RetStd_IR.v6.0.31.0.G15264162836.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.211.L2.RetStd_IR.v6.0.31.0.G15264163410.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.212.L2.RetStd_IR.v6.0.31.0.G15264162845.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.213.L2.RetStd_IR.v6.0.31.0.G15264163822.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.214.L2.RetStd_IR.v6.0.31.0.G15264164321.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.215.L2.RetStd_IR.v6.0.31.0.G15264164607.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.216.L2.RetStd_IR.v6.0.31.0.G15264164458.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.217.L2.RetStd_IR.v6.0.31.0.G15264164500.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.218.L2.RetStd_IR.v6.0.31.0.G15264164419.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.219.L2.RetStd_IR.v6.0.31.0.G15264164231.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.220.L2.RetStd_IR.v6.0.31.0.G15264164218.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.221.L2.RetStd_IR.v6.0.31.0.G15264163812.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.222.L2.RetStd_IR.v6.0.31.0.G15264164523.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.223.L2.RetStd_IR.v6.0.31.0.G15264165920.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.224.L2.RetStd_IR.v6.0.31.0.G15264170051.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.225.L2.RetStd_IR.v6.0.31.0.G15264165821.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.226.L2.RetStd_IR.v6.0.31.0.G15264165335.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.227.L2.RetStd_IR.v6.0.31.0.G15264165011.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.228.L2.RetStd_IR.v6.0.31.0.G15264165302.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.229.L2.RetStd_IR.v6.0.31.0.G15264170032.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.230.L2.RetStd_IR.v6.0.31.0.G15264170025.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.231.L2.RetStd_IR.v6.0.31.0.G15264165213.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.232.L2.RetStd_IR.v6.0.31.0.G15264170029.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.233.L2.RetStd_IR.v6.0.31.0.G15264170847.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.234.L2.RetStd_IR.v6.0.31.0.G15264171427.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.235.L2.RetStd_IR.v6.0.31.0.G15264171427.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.236.L2.RetStd_IR.v6.0.31.0.G15264170946.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.237.L2.RetStd_IR.v6.0.31.0.G15264171033.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.238.L2.RetStd_IR.v6.0.31.0.G15264171804.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.239.L2.RetStd_IR.v6.0.31.0.G15264171759.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/263/AIRS.2015.09.20.240.L2.RetStd_IR.v6.0.31.0.G15264171839.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.001.L2.RetStd_IR.v6.0.31.0.G15264172109.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.002.L2.RetStd_IR.v6.0.31.0.G15264171717.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.003.L2.RetStd_IR.v6.0.31.0.G15264171858.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.004.L2.RetStd_IR.v6.0.31.0.G15264172827.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.005.L2.RetStd_IR.v6.0.31.0.G15264174641.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.006.L2.RetStd_IR.v6.0.31.0.G15264173735.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.007.L2.RetStd_IR.v6.0.31.0.G15264174512.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.008.L2.RetStd_IR.v6.0.31.0.G15264174542.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.009.L2.RetStd_IR.v6.0.31.0.G15264174543.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.010.L2.RetStd_IR.v6.0.31.0.G15264174433.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.011.L2.RetStd_IR.v6.0.31.0.G15264174333.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.012.L2.RetStd_IR.v6.0.31.0.G15264184344.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.013.L2.RetStd_IR.v6.0.31.0.G15264184222.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.014.L2.RetStd_IR.v6.0.31.0.G15264183647.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.015.L2.RetStd_IR.v6.0.31.0.G15264184359.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.016.L2.RetStd_IR.v6.0.31.0.G15264184512.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.017.L2.RetStd_IR.v6.0.31.0.G15264184505.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.018.L2.RetStd_IR.v6.0.31.0.G15264183746.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.019.L2.RetStd_IR.v6.0.31.0.G15264184011.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.020.L2.RetStd_IR.v6.0.31.0.G15264173541.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.021.L2.RetStd_IR.v6.0.31.0.G15264174602.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.022.L2.RetStd_IR.v6.0.31.0.G15264173819.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.023.L2.RetStd_IR.v6.0.31.0.G15264175348.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.024.L2.RetStd_IR.v6.0.31.0.G15264180052.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.025.L2.RetStd_IR.v6.0.31.0.G15264175944.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.026.L2.RetStd_IR.v6.0.31.0.G15264144430.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.027.L2.RetStd_IR.v6.0.31.0.G15264143514.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.028.L2.RetStd_IR.v6.0.31.0.G15264150149.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.029.L2.RetStd_IR.v6.0.31.0.G15264183823.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.030.L2.RetStd_IR.v6.0.31.0.G15264184412.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.031.L2.RetStd_IR.v6.0.31.0.G15264190055.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.032.L2.RetStd_IR.v6.0.31.0.G15264185951.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.033.L2.RetStd_IR.v6.0.31.0.G15264190028.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.034.L2.RetStd_IR.v6.0.31.0.G15264190102.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.035.L2.RetStd_IR.v6.0.31.0.G15264185653.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.036.L2.RetStd_IR.v6.0.31.0.G15264175609.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.037.L2.RetStd_IR.v6.0.31.0.G15264175919.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.038.L2.RetStd_IR.v6.0.31.0.G15264180110.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.039.L2.RetStd_IR.v6.0.31.0.G15264175301.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.040.L2.RetStd_IR.v6.0.31.0.G15264180030.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.041.L2.RetStd_IR.v6.0.31.0.G15264180035.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS</Value>
+    </Attribute>
+    <Attribute name="coremetadata_1" type="String">
+        <Value>/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.042.L2.RetStd_IR.v6.0.31.0.G15264175235.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.043.L2.RetStd_IR.v6.0.31.0.G15264181322.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.044.L2.RetStd_IR.v6.0.31.0.G15264180728.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.045.L2.RetStd_IR.v6.0.31.0.G15264185855.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.046.L2.RetStd_IR.v6.0.31.0.G15264185345.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.047.L2.RetStd_IR.v6.0.31.0.G15264185829.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.048.L2.RetStd_IR.v6.0.31.0.G15264185248.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.049.L2.RetStd_IR.v6.0.31.0.G15264185848.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.050.L2.RetStd_IR.v6.0.31.0.G15264190828.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.051.L2.RetStd_IR.v6.0.31.0.G15264191537.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.052.L2.RetStd_IR.v6.0.31.0.G15264191130.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.053.L2.RetStd_IR.v6.0.31.0.G15264181047.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.054.L2.RetStd_IR.v6.0.31.0.G15264181645.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.055.L2.RetStd_IR.v6.0.31.0.G15264180748.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.056.L2.RetStd_IR.v6.0.31.0.G15264181450.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.057.L2.RetStd_IR.v6.0.31.0.G15264181549.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.058.L2.RetStd_IR.v6.0.31.0.G15264180715.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.059.L2.RetStd_IR.v6.0.31.0.G15264181317.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.060.L2.RetStd_IR.v6.0.31.0.G15264181307.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.061.L2.RetStd_IR.v6.0.31.0.G15264182700.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.062.L2.RetStd_IR.v6.0.31.0.G15264191458.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.063.L2.RetStd_IR.v6.0.31.0.G15264191414.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.064.L2.RetStd_IR.v6.0.31.0.G15264190842.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.065.L2.RetStd_IR.v6.0.31.0.G15264190756.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.066.L2.RetStd_IR.v6.0.31.0.G15264191602.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.067.L2.RetStd_IR.v6.0.31.0.G15264191701.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.068.L2.RetStd_IR.v6.0.31.0.G15264191330.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.069.L2.RetStd_IR.v6.0.31.0.G15264192114.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.070.L2.RetStd_IR.v6.0.31.0.G15264192919.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.071.L2.RetStd_IR.v6.0.31.0.G15264193215.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.072.L2.RetStd_IR.v6.0.31.0.G15264193315.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.073.L2.RetStd_IR.v6.0.31.0.G15264192519.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.074.L2.RetStd_IR.v6.0.31.0.G15264192953.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.075.L2.RetStd_IR.v6.0.31.0.G15264192810.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.076.L2.RetStd_IR.v6.0.31.0.G15264192356.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.077.L2.RetStd_IR.v6.0.31.0.G15264193012.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.078.L2.RetStd_IR.v6.0.31.0.G15264194401.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.079.L2.RetStd_IR.v6.0.31.0.G15264194147.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.080.L2.RetStd_IR.v6.0.31.0.G15264194330.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.081.L2.RetStd_IR.v6.0.31.0.G15264194424.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.082.L2.RetStd_IR.v6.0.31.0.G15264194602.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.083.L2.RetStd_IR.v6.0.31.0.G15264194658.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.084.L2.RetStd_IR.v6.0.31.0.G15264194507.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.085.L2.RetStd_IR.v6.0.31.0.G15264194215.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.086.L2.RetStd_IR.v6.0.31.0.G15264192610.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.087.L2.RetStd_IR.v6.0.31.0.G15264194745.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.088.L2.RetStd_IR.v6.0.31.0.G15264194600.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.089.L2.RetStd_IR.v6.0.31.0.G15264195937.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.090.L2.RetStd_IR.v6.0.31.0.G15264195943.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.091.L2.RetStd_IR.v6.0.31.0.G15264195952.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.092.L2.RetStd_IR.v6.0.31.0.G15264195847.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.093.L2.RetStd_IR.v6.0.31.0.G15264195935.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.094.L2.RetStd_IR.v6.0.31.0.G15264195655.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.095.L2.RetStd_IR.v6.0.31.0.G15264195724.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.096.L2.RetStd_IR.v6.0.31.0.G15264195705.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.097.L2.RetStd_IR.v6.0.31.0.G15264195406.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.098.L2.RetStd_IR.v6.0.31.0.G15264195907.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.099.L2.RetStd_IR.v6.0.31.0.G15265122103.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.100.L2.RetStd_IR.v6.0.31.0.G15265122157.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.101.L2.RetStd_IR.v6.0.31.0.G15265121924.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.102.L2.RetStd_IR.v6.0.31.0.G15265111839.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.103.L2.RetStd_IR.v6.0.31.0.G15265112337.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.104.L2.RetStd_IR.v6.0.31.0.G15265112625.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.105.L2.RetStd_IR.v6.0.31.0.G15265112548.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.106.L2.RetStd_IR.v6.0.31.0.G15265112402.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.107.L2.RetStd_IR.v6.0.31.0.G15265112548.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.108.L2.RetStd_IR.v6.0.31.0.G15265112358.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.109.L2.RetStd_IR.v6.0.31.0.G15265112406.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.110.L2.RetStd_IR.v6.0.31.0.G15265112229.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.111.L2.RetStd_IR.v6.0.31.0.G15265121923.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.112.L2.RetStd_IR.v6.0.31.0.G15265122023.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.113.L2.RetStd_IR.v6.0.31.0.G15265122058.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.114.L2.RetStd_IR.v6.0.31.0.G15265122621.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.115.L2.RetStd_IR.v6.0.31.0.G15265122628.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.116.L2.RetStd_IR.v6.0.31.0.G15265122914.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.117.L2.RetStd_IR.v6.0.31.0.G15265122833.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.118.L2.RetStd_IR.v6.0.31.0.G15265112002.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.119.L2.RetStd_IR.v6.0.31.0.G15265112715.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.120.L2.RetStd_IR.v6.0.31.0.G15265114012.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.121.L2.RetStd_IR.v6.0.31.0.G15265114005.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.122.L2.RetStd_IR.v6.0.31.0.G15265113045.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.123.L2.RetStd_IR.v6.0.31.0.G15265113708.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.124.L2.RetStd_IR.v6.0.31.0.G15265113053.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.125.L2.RetStd_IR.v6.0.31.0.G15265113904.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.126.L2.RetStd_IR.v6.0.31.0.G15265113818.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.127.L2.RetStd_IR.v6.0.31.0.G15265113431.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.128.L2.RetStd_IR.v6.0.31.0.G15265124513.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.129.L2.RetStd_IR.v6.0.31.0.G15265124615.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.130.L2.RetStd_IR.v6.0.31.0.G15265124627.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.131.L2.RetStd_IR.v6.0.31.0.G15265124751.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.132.L2.RetStd_IR.v6.0.31.0.G15265124821.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.133.L2.RetStd_IR.v6.0.31.0.G15265123621.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.134.L2.RetStd_IR.v6.0.31.0.G15265124410.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.135.L2.RetStd_IR.v6.0.31.0.G15265112603.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.136.L2.RetStd_IR.v6.0.31.0.G15265114729.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.137.L2.RetStd_IR.v6.0.31.0.G15265115655.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.138.L2.RetStd_IR.v6.0.31.0.G15265115918.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.139.L2.RetStd_IR.v6.0.31.0.G15265115634.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.140.L2.RetStd_IR.v6.0.31.0.G15265114821.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.141.L2.RetStd_IR.v6.0.31.0.G15265115655.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.142.L2.RetStd_IR.v6.0.31.0.G15265115605.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.143.L2.RetStd_IR.v6.0.31.0.G15265114630.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.144.L2.RetStd_IR.v6.0.31.0.G15265124552.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.145.L2.RetStd_IR.v6.0.31.0.G15268100548.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.146.L2.RetStd_IR.v6.0.31.0.G15265123518.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.147.L2.RetStd_IR.v6.0.31.0.G15265124730.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.148.L2.RetStd_IR.v6.0.31.0.G15265125233.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.149.L2.RetStd_IR.v6.0.31.0.G15265132839.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.150.L2.RetStd_IR.v6.0.31.0.G15265132951.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.151.L2.RetStd_IR.v6.0.31.0.G15265125702.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.152.L2.RetStd_IR.v6.0.31.0.G15265130109.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.153.L2.RetStd_IR.v6.0.31.0.G15265130637.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.154.L2.RetStd_IR.v6.0.31.0.G15265130557.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.155.L2.RetStd_IR.v6.0.31.0.G15265130548.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.156.L2.RetStd_IR.v6.0.31.0.G15265130453.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.157.L2.RetStd_IR.v6.0.31.0.G15265130503.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.158.L2.RetStd_IR.v6.0.31.0.G15265130632.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.159.L2.RetStd_IR.v6.0.31.0.G15265130215.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.160.L2.RetStd_IR.v6.0.31.0.G15265131227.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.161.L2.RetStd_IR.v6.0.31.0.G15265134106.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.162.L2.RetStd_IR.v6.0.31.0.G15265133634.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.163.L2.RetStd_IR.v6.0.31.0.G15265133048.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.164.L2.RetStd_IR.v6.0.31.0.G15265133311.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.165.L2.RetStd_IR.v6.0.31.0.G15265133222.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.166.L2.RetStd_IR.v6.0.31.0.G15265134256.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.167.L2.RetStd_IR.v6.0.31.0.G15265133620.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.168.L2.RetStd_IR.v6.0.31.0.G15265130901.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.169.L2.RetStd_IR.v6.0.31.0.G15265131423.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.170.L2.RetStd_IR.v6.0.31.0.G15265131652.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.171.L2.RetStd_IR.v6.0.31.0.G15265131710.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.172.L2.RetStd_IR.v6.0.31.0.G15265131558.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.173.L2.RetStd_IR.v6.0.31.0.G15265130627.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.174.L2.RetStd_IR.v6.0.31.0.G15265131514.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.175.L2.RetStd_IR.v6.0.31.0.G15265131408.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.176.L2.RetStd_IR.v6.0.31.0.G15265131341.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.177.L2.RetStd_IR.v6.0.31.0.G15265133930.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.178.L2.RetStd_IR.v6.0.31.0.G15265134042.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.179.L2.RetStd_IR.v6.0.31.0.G15265135001.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.180.L2.RetStd_IR.v6.0.31.0.G15265134100.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.181.L2.RetStd_IR.v6.0.31.0.G15265135242.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.182.L2.RetStd_IR.v6.0.31.0.G15265135003.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.183.L2.RetStd_IR.v6.0.31.0.G15265134137.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.184.L2.RetStd_IR.v6.0.31.0.G15265135639.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.185.L2.RetStd_IR.v6.0.31.0.G15265140214.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.186.L2.RetStd_IR.v6.0.31.0.G15265134324.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.187.L2.RetStd_IR.v6.0.31.0.G15265134903.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.188.L2.RetStd_IR.v6.0.31.0.G15265140220.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.189.L2.RetStd_IR.v6.0.31.0.G15265135446.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.190.L2.RetStd_IR.v6.0.31.0.G15265140154.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.191.L2.RetStd_IR.v6.0.31.0.G15265140137.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.192.L2.RetStd_IR.v6.0.31.0.G15265135729.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.193.L2.RetStd_IR.v6.0.31.0.G15265140009.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.194.L2.RetStd_IR.v6.0.31.0.G15265140006.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.195.L2.RetStd_IR.v6.0.31.0.G15265135730.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.196.L2.RetStd_IR.v6.0.31.0.G15265140158.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.197.L2.RetStd_IR.v6.0.31.0.G15265140249.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.198.L2.RetStd_IR.v6.0.31.0.G15265141634.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.199.L2.RetStd_IR.v6.0.31.0.G15265141412.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.200.L2.RetStd_IR.v6.0.31.0.G15265140639.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.201.L2.RetStd_IR.v6.0.31.0.G15265140727.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.202.L2.RetStd_IR.v6.0.31.0.G15265141847.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.203.L2.RetStd_IR.v6.0.31.0.G15265141310.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.204.L2.RetStd_IR.v6.0.31.0.G15265141838.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.205.L2.RetStd_IR.v6.0.31.0.G15265141140.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.206.L2.RetStd_IR.v6.0.31.0.G15265141928.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.207.L2.RetStd_IR.v6.0.31.0.G15265141733.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.208.L2.RetStd_IR.v6.0.31.0.G15265143533.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.209.L2.RetStd_IR.v6.0.31.0.G15265142927.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.210.L2.RetStd_IR.v6.0.31.0.G15265143641.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.211.L2.RetStd_IR.v6.0.31.0.G15265143242.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.212.L2.RetStd_IR.v6.0.31.0.G15265143817.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.213.L2.RetStd_IR.v6.0.31.0.G15265143711.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.214.L2.RetStd_IR.v6.0.31.0.G15265143913.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.215.L2.RetStd_IR.v6.0.31.0.G15265144027.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.216.L2.RetStd_IR.v6.0.31.0.G15265142904.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.217.L2.RetStd_IR.v6.0.31.0.G15265142441.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.218.L2.RetStd_IR.v6.0.31.0.G15265144138.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.219.L2.RetStd_IR.v6.0.31.0.G15265144437.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.220.L2.RetStd_IR.v6.0.31.0.G15265143509.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.221.L2.RetStd_IR.v6.0.31.0.G15265143501.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.222.L2.RetStd_IR.v6.0.31.0.G15265144343.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.223.L2.RetStd_IR.v6.0.31.0.G15265143623.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.224.L2.RetStd_IR.v6.0.31.0.G15265144224.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.225.L2.RetStd_IR.v6.0.31.0.G15265144157.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.226.L2.RetStd_IR.v6.0.31.0.G15265144046.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.227.L2.RetStd_IR.v6.0.31.0.G15265143534.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.228.L2.RetStd_IR.v6.0.31.0.G15265145624.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.229.L2.RetStd_IR.v6.0.31.0.G15265145704.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.230.L2.RetStd_IR.v6.0.31.0.G15265145733.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.231.L2.RetStd_IR.v6.0.31.0.G15265145918.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.232.L2.RetStd_IR.v6.0.31.0.G15265145714.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.233.L2.RetStd_IR.v6.0.31.0.G15265144646.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.234.L2.RetStd_IR.v6.0.31.0.G15265145355.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.235.L2.RetStd_IR.v6.0.31.0.G15265145015.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.236.L2.RetStd_IR.v6.0.31.0.G15265150105.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.237.L2.RetStd_IR.v6.0.31.0.G15265145756.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.238.L2.RetStd_IR.v6.0.31.0.G15265151340.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.239.L2.RetStd_IR.v6.0.31.0.G15265151312.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/264/AIRS.2015.09.21.240.L2.RetStd_IR.v6.0.31.0.G15265150613.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.001.L2.RetStd_IR.v6.0.31.0.G15265151233.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.002.L2.RetStd_IR.v6.0.31.0.G15265150509.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.003.L2.RetStd_IR.v6.0.31.0.G15265150439.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.004.L2.RetStd_IR.v6.0.31.0.G15265151021.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.005.L2.RetStd_IR.v6.0.31.0.G15265151015.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.006.L2.RetStd_IR.v6.0.31.0.G15265151149.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.007.L2.RetStd_IR.v6.0.31.0.G15265151438.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.008.L2.RetStd_IR.v6.0.31.0.G15265152813.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.009.L2.RetStd_IR.v6.0.31.0.G15265152549.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.010.L2.RetStd_IR.v6.0.31.0.G15265152300.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.011.L2.RetStd_IR.v6.0.31.0.G15265152716.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.012.L2.RetStd_IR.v6.0.31.0.G15265152942.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.013.L2.RetStd_IR.v6.0.31.0.G15265152150.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.014.L2.RetStd_IR.v6.0.31.0.G15265153015.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.015.L2.RetStd_IR.v6.0.31.0.G15265152821.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.016.L2.RetStd_IR.v6.0.31.0.G15265152208.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.017.L2.RetStd_IR.v6.0.31.0.G15265152836.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.018.L2.RetStd_IR.v6.0.31.0.G15265154047.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.019.L2.RetStd_IR.v6.0.31.0.G15265154058.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.020.L2.RetStd_IR.v6.0.31.0.G15265154011.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.021.L2.RetStd_IR.v6.0.31.0.G15265153229.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.022.L2.RetStd_IR.v6.0.31.0.G15265153309.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.023.L2.RetStd_IR.v6.0.31.0.G15265154230.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.024.L2.RetStd_IR.v6.0.31.0.G15265154200.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.025.L2.RetStd_IR.v6.0.31.0.G15265154123.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.026.L2.RetStd_IR.v6.0.31.0.G15265153110.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.027.L2.RetStd_IR.v6.0.31.0.G15265153848.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.028.L2.RetStd_IR.v6.0.31.0.G15265155847.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.029.L2.RetStd_IR.v6.0.31.0.G15265155942.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.030.L2.RetStd_IR.v6.0.31.0.G15265155931.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.031.L2.RetStd_IR.v6.0.31.0.G15265155841.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.032.L2.RetStd_IR.v6.0.31.0.G15265155854.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.033.L2.RetStd_IR.v6.0.31.0.G15265154952.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.034.L2.RetStd_IR.v6.0.31.0.G15265155653.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.035.L2.RetStd_IR.v6.0.31.0.G15265155712.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.036.L2.RetStd_IR.v6.0.31.0.G15265155811.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.037.L2.RetStd_IR.v6.0.31.0.G15265154936.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.038.L2.RetStd_IR.v6.0.31.0.G15265155941.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.039.L2.RetStd_IR.v6.0.31.0.G15265155051.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.040.L2.RetStd_IR.v6.0.31.0.G15265160033.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.041.L2.RetStd_IR.v6.0.31.0.G15265160111.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.042.L2.RetStd_IR.v6.0.31.0.G15265155756.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.043.L2.RetStd_IR.v6.0.31.0.G15265154837.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.044.L2.RetStd_IR.v6.0.31.0.G15265155914.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.045.L2.RetStd_IR.v6.0.31.0.G15265155351.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.046.L2.RetStd_IR.v6.0.31.0.G15265160104.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.047.L2.RetStd_IR.v6.0.31.0.G15265155444.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.048.L2.RetStd_IR.v6.0.31.0.G15265161620.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.049.L2.RetStd_IR.v6.0.31.0.G15265160915.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.050.L2.RetStd_IR.v6.0.31.0.G15265161409.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.051.L2.RetStd_IR.v6.0.31.0.G15265160954.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.052.L2.RetStd_IR.v6.0.31.0.G15265161513.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.053.L2.RetStd_IR.v6.0.31.0.G15265161811.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.054.L2.RetStd_IR.v6.0.31.0.G15265162006.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.055.L2.RetStd_IR.v6.0.31.0.G15265162047.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.056.L2.RetStd_IR.v6.0.31.0.G15265161311.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.057.L2.RetStd_IR.v6.0.31.0.G15265161405.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.058.L2.RetStd_IR.v6.0.31.0.G15265163005.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.059.L2.RetStd_IR.v6.0.31.0.G15265162638.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.060.L2.RetStd_IR.v6.0.31.0.G15265162622.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.061.L2.RetStd_IR.v6.0.31.0.G15265162421.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.062.L2.RetStd_IR.v6.0.31.0.G15265162542.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.063.L2.RetStd_IR.v6.0.31.0.G15265163257.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.064.L2.RetStd_IR.v6.0.31.0.G15265163309.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.065.L2.RetStd_IR.v6.0.31.0.G15265162517.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.066.L2.RetStd_IR.v6.0.31.0.G15265163219.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.067.L2.RetStd_IR.v6.0.31.0.G15265163400.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.068.L2.RetStd_IR.v6.0.31.0.G15265164234.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.069.L2.RetStd_IR.v6.0.31.0.G15265164345.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.070.L2.RetStd_IR.v6.0.31.0.G15265164221.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.071.L2.RetStd_IR.v6.0.31.0.G15265164428.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.072.L2.RetStd_IR.v6.0.31.0.G15265164450.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.073.L2.RetStd_IR.v6.0.31.0.G15265164606.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.074.L2.RetStd_IR.v6.0.31.0.G15265164555.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.075.L2.RetStd_IR.v6.0.31.0.G15265164249.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.076.L2.RetStd_IR.v6.0.31.0.G15265164047.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.077.L2.RetStd_IR.v6.0.31.0.G15265163547.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.078.L2.RetStd_IR.v6.0.31.0.G15265165338.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.079.L2.RetStd_IR.v6.0.31.0.G15265165344.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.080.L2.RetStd_IR.v6.0.31.0.G15265165244.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.081.L2.RetStd_IR.v6.0.31.0.G15265165221.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.082.L2.RetStd_IR.v6.0.31.0.G15265165057.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.083.L2.RetStd_IR.v6.0.31.0.G15265165901.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.084.L2.RetStd_IR.v6.0.31.0.G15265170015.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.085.L2.RetStd_IR.v6.0.31.0.G15265165631.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.086.L2.RetStd_IR.v6.0.31.0.G15265165844.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.087.L2.RetStd_IR.v6.0.31.0.G15265165850.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.088.L2.RetStd_IR.v6.0.31.0.G15265171431.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.089.L2.RetStd_IR.v6.0.31.0.G15265171348.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.090.L2.RetStd_IR.v6.0.31.0.G15265171421.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.091.L2.RetStd_IR.v6.0.31.0.G15265171454.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.092.L2.RetStd_IR.v6.0.31.0.G15265170534.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.093.L2.RetStd_IR.v6.0.31.0.G15265170808.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.094.L2.RetStd_IR.v6.0.31.0.G15265171451.hdf&quot;, &quot;          ftp://ac15.gesdisc.eosdis.nasa.gov/ftp/data/s4pa/.X9mnTjTGY0BkHTnS/Aqua_AIRS_Level2/AIRS2RET.006/2015/265/AIRS.2015.09.22.095.L2.RetStd_IR.v6.0.31.0.G15265171544.hdf&quot;)    END_OBJECT             = INPUTPOINTER  END_GROUP              = INPUTGRANULE  GROUP                  = SPATIALDOMAINCONTAINER    GROUP                  = HORIZONTALSPATIALDOMAINCONTAINER      GROUP                  = BOUNDINGRECTANGLE        OBJECT                 = EASTBOUNDINGCOORDINATE          NUM_VAL              = 1          VALUE                = 180.0        END_OBJECT             = EASTBOUNDINGCOORDINATE        OBJECT                 = WESTBOUNDINGCOORDINATE          NUM_VAL              = 1          VALUE                = -180.0        END_OBJECT             = WESTBOUNDINGCOORDINATE        OBJECT                 = SOUTHBOUNDINGCOORDINATE          NUM_VAL              = 1          VALUE                = -90.0        END_OBJECT             = SOUTHBOUNDINGCOORDINATE        OBJECT                 = NORTHBOUNDINGCOORDINATE          NUM_VAL              = 1          VALUE                = 90.0        END_OBJECT             = NORTHBOUNDINGCOORDINATE      END_GROUP              = BOUNDINGRECTANGLE    END_GROUP              = HORIZONTALSPATIALDOMAINCONTAINER    GROUP                  = GRANULELOCALITY      OBJECT                 = LOCALITYVALUE        NUM_VAL              = 1        VALUE                = &quot;Global&quot;      END_OBJECT             = LOCALITYVALUE    END_GROUP              = GRANULELOCALITY  END_GROUP              = SPATIALDOMAINCONTAINER  GROUP                  = RANGEDATETIME    OBJECT                 = RANGEENDINGDATE      NUM_VAL              = 1      VALUE                = &quot;2015-09-22&quot;    END_OBJECT             = RANGEENDINGDATE    OBJECT                 = RANGEENDINGTIME      NUM_VAL              = 1      VALUE                = &quot;00:00:00.000000Z&quot;    END_OBJECT             = RANGEENDINGTIME    OBJECT                 = RANGEBEGINNINGDATE      NUM_VAL              = 1      VALUE                = &quot;2015-09-21&quot;    END_OBJECT             = RANGEBEGINNINGDATE    OBJECT                 = RANGEBEGINNINGTIME      NUM_VAL              = 1      VALUE                = &quot;00:00:00.000000Z&quot;    END_OBJECT             = RANGEBEGINNINGTIME  END_GROUP              = RANGEDATETIME  GROUP                  = PGEVERSIONCLASS    OBJECT                 = PGEVERSION      NUM_VAL              = 1      VALUE                = &quot;6.0.31.0&quot;    END_OBJECT             = PGEVERSION  END_GROUP              = PGEVERSIONCLASS  GROUP                  = ASSOCIATEDPLATFORMINSTRUMENTSENSOR    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER      CLASS                = &quot;1&quot;      OBJECT                 = ASSOCIATEDSENSORSHORTNAME        CLASS                = &quot;1&quot;        NUM_VAL              = 1        VALUE                = &quot;HSB Channel 1&quot;      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME        CLASS                = &quot;1&quot;        NUM_VAL              = 1        VALUE                = &quot;Aqua&quot;      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME      OBJECT                 = OPERATIONMODE        CLASS                = &quot;1&quot;        NUM_VAL              = 1        VALUE                = &quot;Normal&quot;      END_OBJECT             = OPERATIONMODE      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME        CLASS                = &quot;1&quot;        NUM_VAL              = 1        VALUE                = &quot;HSB&quot;      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER      CLASS                = &quot;2&quot;      OBJECT                 = ASSOCIATEDSENSORSHORTNAME        CLASS                = &quot;2&quot;        NUM_VAL              = 1        VALUE                = &quot;HSB Channel 2&quot;      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME        CLASS                = &quot;2&quot;        NUM_VAL              = 1        VALUE                = &quot;Aqua&quot;      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME      OBJECT                 = OPERATIONMODE        CLASS                = &quot;2&quot;        NUM_VAL              = 1        VALUE                = &quot;Normal&quot;      END_OBJECT             = OPERATIONMODE      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME        CLASS                = &quot;2&quot;        NUM_VAL              = 1        VALUE                = &quot;HSB&quot;      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER      CLASS                = &quot;3&quot;      OBJECT                 = ASSOCIATEDSENSORSHORTNAME        CLASS                = &quot;3&quot;        NUM_VAL              = 1        VALUE                = &quot;HSB Channel 3&quot;      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME        CLASS                = &quot;3&quot;        NUM_VAL              = 1        VALUE                = &quot;Aqua&quot;      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME      OBJECT                 = OPERATIONMODE        CLASS                = &quot;3&quot;        NUM_VAL              = 1        VALUE                = &quot;Normal&quot;      END_OBJECT             = OPERATIONMODE      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME        CLASS                = &quot;3&quot;        NUM_VAL              = 1        VALUE                = &quot;HSB&quot;      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER      CLASS                = &quot;4&quot;      OBJECT                 = ASSOCIATEDSENSORSHORTNAME        CLASS                = &quot;4&quot;        NUM_VAL              = 1        VALUE                = &quot;HSB Channel 4&quot;      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME        CLASS                = &quot;4&quot;        NUM_VAL              = 1        VALUE                = &quot;Aqua&quot;      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME      OBJECT                 = OPERATIONMODE        CLASS                = &quot;4&quot;        NUM_VAL              = 1        VALUE                = &quot;Normal&quot;      END_OBJECT             = OPERATIONMODE      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME        CLASS                = &quot;4&quot;        NUM_VAL              = 1        VALUE                = &quot;HSB&quot;      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER      CLASS                = &quot;5&quot;      OBJECT                 = ASSOCIATEDSENSORSHORTNAME        CLASS                = &quot;5&quot;        NUM_VAL              = 1        VALUE                = &quot;HSB Channel 5&quot;      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME        CLASS                = &quot;5&quot;        NUM_VAL              = 1        VALUE                = &quot;Aqua&quot;      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME      OBJECT                 = OPERATIONMODE        CLASS                = &quot;5&quot;        NUM_VAL              = 1        VALUE                = &quot;Normal&quot;      END_OBJECT             = OPERATIONMODE      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME        CLASS                = &quot;5&quot;        NUM_VAL              = 1        VALUE                = &quot;HSB&quot;      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER      CLASS                = &quot;6&quot;      OBJECT                 = ASSOCIATEDSENSORSHORTNAME        CLASS                = &quot;6&quot;        NUM_VAL              = 1        VALUE                = &quot;AMSU-A Channel 3&quot;      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME        CLASS                = &quot;6&quot;        NUM_VAL              = 1        VALUE                = &quot;Aqua&quot;      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME      OBJECT                 = OPERATIONMODE        CLASS                = &quot;6&quot;        NUM_VAL              = 1        VALUE                = &quot;Normal&quot;      END_OBJECT             = OPERATIONMODE      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME        CLASS                = &quot;6&quot;        NUM_VAL              = 1        VALUE                = &quot;AMSU-A&quot;      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER      CLASS                = &quot;7&quot;      OBJECT                 = ASSOCIATEDSENSORSHORTNAME        CLASS                = &quot;7&quot;        NUM_VAL              = 1        VALUE                = &quot;AMSU-A Channel 4&quot;      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME        CLASS                = &quot;7&quot;        NUM_VAL              = 1        VALUE                = &quot;Aqua&quot;      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME      OBJECT                 = OPERATIONMODE        CLASS                = &quot;7&quot;        NUM_VAL              = 1        VALUE                = &quot;Normal&quot;      END_OBJECT             = OPERATIONMODE      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME        CLASS                = &quot;7&quot;        NUM_VAL              = 1        VALUE                = &quot;AMSU-A&quot;      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER      CLASS                = &quot;8&quot;      OBJECT                 = ASSOCIATEDSENSORSHORTNAME        CLASS                = &quot;8&quot;        NUM_VAL              = 1        VALUE                = &quot;AMSU-A Channel 5&quot;      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME        CLASS                = &quot;8&quot;        NUM_VAL              = 1        VALUE                = &quot;Aqua&quot;      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME      OBJECT                 = OPERATIONMODE        CLASS                = &quot;8&quot;        NUM_VAL              = 1        VALUE                = &quot;Normal&quot;      END_OBJECT             = OPERATIONMODE      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME        CLASS                = &quot;8&quot;        NUM_VAL              = 1        VALUE                = &quot;AMSU-A&quot;      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER      CLASS                = &quot;9&quot;      OBJECT                 = ASSOCIATEDSENSORSHORTNAME        CLASS                = &quot;9&quot;        NUM_VAL              = 1        VALUE                = &quot;AMSU-A Channel 6&quot;      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME        CLASS                = &quot;9&quot;        NUM_VAL              = 1        VALUE                = &quot;Aqua&quot;      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME      OBJECT                 = OPERATIONMODE        CLASS                = &quot;9&quot;        NUM_VAL              = 1        VALUE                = &quot;Normal&quot;      END_OBJECT             = OPERATIONMODE      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME        CLASS                = &quot;9&quot;        NUM_VAL              = 1        VALUE                = &quot;AMSU-A&quot;      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER      CLASS                = &quot;10&quot;      OBJECT                 = ASSOCIATEDSENSORSHORTNAME        CLASS                = &quot;10&quot;        NUM_VAL              = 1        VALUE                = &quot;AMSU-A Channel 7&quot;      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME        CLASS                = &quot;10&quot;        NUM_VAL              = 1        VALUE                = &quot;Aqua&quot;      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME      OBJECT                 = OPERATIONMODE  </Value>
+    </Attribute>
+    <Attribute name="coremetadata_2" type="String">
+        <Value>      CLASS                = &quot;10&quot;        NUM_VAL              = 1        VALUE                = &quot;Normal&quot;      END_OBJECT             = OPERATIONMODE      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME        CLASS                = &quot;10&quot;        NUM_VAL              = 1        VALUE                = &quot;AMSU-A&quot;      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER      CLASS                = &quot;11&quot;      OBJECT                 = ASSOCIATEDSENSORSHORTNAME        CLASS                = &quot;11&quot;        NUM_VAL              = 1        VALUE                = &quot;AMSU-A Channel 8&quot;      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME        CLASS                = &quot;11&quot;        NUM_VAL              = 1        VALUE                = &quot;Aqua&quot;      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME      OBJECT                 = OPERATIONMODE        CLASS                = &quot;11&quot;        NUM_VAL              = 1        VALUE                = &quot;Normal&quot;      END_OBJECT             = OPERATIONMODE      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME        CLASS                = &quot;11&quot;        NUM_VAL              = 1        VALUE                = &quot;AMSU-A&quot;      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER      CLASS                = &quot;12&quot;      OBJECT                 = ASSOCIATEDSENSORSHORTNAME        CLASS                = &quot;12&quot;        NUM_VAL              = 1        VALUE                = &quot;AMSU-A Channel 9&quot;      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME        CLASS                = &quot;12&quot;        NUM_VAL              = 1        VALUE                = &quot;Aqua&quot;      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME      OBJECT                 = OPERATIONMODE        CLASS                = &quot;12&quot;        NUM_VAL              = 1        VALUE                = &quot;Normal&quot;      END_OBJECT             = OPERATIONMODE      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME        CLASS                = &quot;12&quot;        NUM_VAL              = 1        VALUE                = &quot;AMSU-A&quot;      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER      CLASS                = &quot;13&quot;      OBJECT                 = ASSOCIATEDSENSORSHORTNAME        CLASS                = &quot;13&quot;        NUM_VAL              = 1        VALUE                = &quot;AMSU-A Channel 10&quot;      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME        CLASS                = &quot;13&quot;        NUM_VAL              = 1        VALUE                = &quot;Aqua&quot;      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME      OBJECT                 = OPERATIONMODE        CLASS                = &quot;13&quot;        NUM_VAL              = 1        VALUE                = &quot;Normal&quot;      END_OBJECT             = OPERATIONMODE      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME        CLASS                = &quot;13&quot;        NUM_VAL              = 1        VALUE                = &quot;AMSU-A&quot;      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER      CLASS                = &quot;14&quot;      OBJECT                 = ASSOCIATEDSENSORSHORTNAME        CLASS                = &quot;14&quot;        NUM_VAL              = 1        VALUE                = &quot;AMSU-A Channel 11&quot;      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME        CLASS                = &quot;14&quot;        NUM_VAL              = 1        VALUE                = &quot;Aqua&quot;      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME      OBJECT                 = OPERATIONMODE        CLASS                = &quot;14&quot;        NUM_VAL              = 1        VALUE                = &quot;Normal&quot;      END_OBJECT             = OPERATIONMODE      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME        CLASS                = &quot;14&quot;        NUM_VAL              = 1        VALUE                = &quot;AMSU-A&quot;      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER      CLASS                = &quot;15&quot;      OBJECT                 = ASSOCIATEDSENSORSHORTNAME        CLASS                = &quot;15&quot;        NUM_VAL              = 1        VALUE                = &quot;AMSU-A Channel 12&quot;      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME        CLASS                = &quot;15&quot;        NUM_VAL              = 1        VALUE                = &quot;Aqua&quot;      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME      OBJECT                 = OPERATIONMODE        CLASS                = &quot;15&quot;        NUM_VAL              = 1        VALUE                = &quot;Normal&quot;      END_OBJECT             = OPERATIONMODE      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME        CLASS                = &quot;15&quot;        NUM_VAL              = 1        VALUE                = &quot;AMSU-A&quot;      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER      CLASS                = &quot;16&quot;      OBJECT                 = ASSOCIATEDSENSORSHORTNAME        CLASS                = &quot;16&quot;        NUM_VAL              = 1        VALUE                = &quot;AMSU-A Channel 13&quot;      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME        CLASS                = &quot;16&quot;        NUM_VAL              = 1        VALUE                = &quot;Aqua&quot;      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME      OBJECT                 = OPERATIONMODE        CLASS                = &quot;16&quot;        NUM_VAL              = 1        VALUE                = &quot;Normal&quot;      END_OBJECT             = OPERATIONMODE      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME        CLASS                = &quot;16&quot;        NUM_VAL              = 1        VALUE                = &quot;AMSU-A&quot;      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER      CLASS                = &quot;17&quot;      OBJECT                 = ASSOCIATEDSENSORSHORTNAME        CLASS                = &quot;17&quot;        NUM_VAL              = 1        VALUE                = &quot;AMSU-A Channel 14&quot;      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME        CLASS                = &quot;17&quot;        NUM_VAL              = 1        VALUE                = &quot;Aqua&quot;      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME      OBJECT                 = OPERATIONMODE        CLASS                = &quot;17&quot;        NUM_VAL              = 1        VALUE                = &quot;Normal&quot;      END_OBJECT             = OPERATIONMODE      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME        CLASS                = &quot;17&quot;        NUM_VAL              = 1        VALUE                = &quot;AMSU-A&quot;      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER      CLASS                = &quot;18&quot;      OBJECT                 = ASSOCIATEDSENSORSHORTNAME        CLASS                = &quot;18&quot;        NUM_VAL              = 1        VALUE                = &quot;AMSU-A Channel 15&quot;      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME        CLASS                = &quot;18&quot;        NUM_VAL              = 1        VALUE                = &quot;Aqua&quot;      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME      OBJECT                 = OPERATIONMODE        CLASS                = &quot;18&quot;        NUM_VAL              = 1        VALUE                = &quot;Normal&quot;      END_OBJECT             = OPERATIONMODE      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME        CLASS                = &quot;18&quot;        NUM_VAL              = 1        VALUE                = &quot;AMSU-A&quot;      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER      CLASS                = &quot;19&quot;      OBJECT                 = ASSOCIATEDSENSORSHORTNAME        CLASS                = &quot;19&quot;        NUM_VAL              = 1        VALUE                = &quot;AMSU-A Channel 1&quot;      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME        CLASS                = &quot;19&quot;        NUM_VAL              = 1        VALUE                = &quot;Aqua&quot;      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME      OBJECT                 = OPERATIONMODE        CLASS                = &quot;19&quot;        NUM_VAL              = 1        VALUE                = &quot;Normal&quot;      END_OBJECT             = OPERATIONMODE      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME        CLASS                = &quot;19&quot;        NUM_VAL              = 1        VALUE                = &quot;AMSU-A&quot;      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER      CLASS                = &quot;20&quot;      OBJECT                 = ASSOCIATEDSENSORSHORTNAME        CLASS                = &quot;20&quot;        NUM_VAL              = 1        VALUE                = &quot;AMSU-A Channel 2&quot;      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME        CLASS                = &quot;20&quot;        NUM_VAL              = 1        VALUE                = &quot;Aqua&quot;      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME      OBJECT                 = OPERATIONMODE        CLASS                = &quot;20&quot;        NUM_VAL              = 1        VALUE                = &quot;Normal&quot;      END_OBJECT             = OPERATIONMODE      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME        CLASS                = &quot;20&quot;        NUM_VAL              = 1        VALUE                = &quot;AMSU-A&quot;      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER      CLASS                = &quot;21&quot;      OBJECT                 = ASSOCIATEDSENSORSHORTNAME        CLASS                = &quot;21&quot;        NUM_VAL              = 1        VALUE                = &quot;M1a Detector Array&quot;      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME        CLASS                = &quot;21&quot;        NUM_VAL              = 1        VALUE                = &quot;Aqua&quot;      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME      OBJECT                 = OPERATIONMODE        CLASS                = &quot;21&quot;        NUM_VAL              = 1        VALUE                = &quot;Normal&quot;      END_OBJECT             = OPERATIONMODE      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME        CLASS                = &quot;21&quot;        NUM_VAL              = 1        VALUE                = &quot;AIRS&quot;      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER      CLASS                = &quot;22&quot;      OBJECT                 = ASSOCIATEDSENSORSHORTNAME        CLASS                = &quot;22&quot;        NUM_VAL              = 1        VALUE                = &quot;M1b Detector Array&quot;      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME        CLASS                = &quot;22&quot;        NUM_VAL              = 1        VALUE                = &quot;Aqua&quot;      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME      OBJECT                 = OPERATIONMODE        CLASS                = &quot;22&quot;        NUM_VAL              = 1        VALUE                = &quot;Normal&quot;      END_OBJECT             = OPERATIONMODE      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME        CLASS                = &quot;22&quot;        NUM_VAL              = 1        VALUE                = &quot;AIRS&quot;      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER      CLASS                = &quot;23&quot;      OBJECT                 = ASSOCIATEDSENSORSHORTNAME        CLASS                = &quot;23&quot;        NUM_VAL              = 1        VALUE                = &quot;M2a Detector Array&quot;      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME        CLASS                = &quot;23&quot;        NUM_VAL              = 1        VALUE                = &quot;Aqua&quot;      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME      OBJECT                 = OPERATIONMODE        CLASS                = &quot;23&quot;        NUM_VAL              = 1        VALUE                = &quot;Normal&quot;      END_OBJECT             = OPERATIONMODE      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME        CLASS                = &quot;23&quot;        NUM_VAL              = 1        VALUE                = &quot;AIRS&quot;      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER      CLASS                = &quot;24&quot;      OBJECT                 = ASSOCIATEDSENSORSHORTNAME        CLASS                = &quot;24&quot;        NUM_VAL              = 1        VALUE                = &quot;M2b Detector Array&quot;      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME        CLASS                = &quot;24&quot;        NUM_VAL              = 1        VALUE                = &quot;Aqua&quot;      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME      OBJECT                 = OPERATIONMODE        CLASS                = &quot;24&quot;        NUM_VAL              = 1        VALUE                = &quot;Normal&quot;      END_OBJECT             = OPERATIONMODE      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME        CLASS                = &quot;24&quot;        NUM_VAL              = 1        VALUE                = &quot;AIRS&quot;      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER      CLASS                = &quot;25&quot;      OBJECT                 = ASSOCIATEDSENSORSHORTNAME        CLASS                = &quot;25&quot;        NUM_VAL              = 1        VALUE                = &quot;M3 Detector Array&quot;      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME        CLASS                = &quot;25&quot;        NUM_VAL              = 1        VALUE                = &quot;Aqua&quot;      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME      OBJECT                 = OPERATIONMODE        CLASS                = &quot;25&quot;        NUM_VAL              = 1        VALUE                = &quot;Normal&quot;      END_OBJECT             = OPERATIONMODE      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME        CLASS                = &quot;25&quot;        NUM_VAL              = 1        VALUE                = &quot;AIRS&quot;      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER      CLASS                = &quot;26&quot;      OBJECT                 = ASSOCIATEDSENSORSHORTNAME        CLASS                = &quot;26&quot;        NUM_VAL              = 1        VALUE                = &quot;M4a Detector Array&quot;      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME        CLASS                = &quot;26&quot;        NUM_VAL              = 1        VALUE                = &quot;Aqua&quot;      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME      OBJECT                 = OPERATIONMODE        CLASS                = &quot;26&quot;        NUM_VAL              = 1        VALUE                = &quot;Normal&quot;      END_OBJECT             = OPERATIONMODE      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME        CLASS                = &quot;26&quot;        NUM_VAL              = 1        VALUE                = &quot;AIRS&quot;      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER      CLASS                = &quot;27&quot;      OBJECT                 = ASSOCIATEDSENSORSHORTNAME        CLASS                = &quot;27&quot;        NUM_VAL              = 1        VALUE                = &quot;M4b Detector Array&quot;      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME        CLASS                = &quot;27&quot;        NUM_VAL              = 1        VALUE                = &quot;Aqua&quot;      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME      OBJECT                 = OPERATIONMODE        CLASS                = &quot;27&quot;        NUM_VAL              = 1        VALUE                = &quot;Normal&quot;      END_OBJECT             = OPERATIONMODE      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME        CLASS                = &quot;27&quot;        NUM_VAL              = 1        VALUE                = &quot;AIRS&quot;      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER      CLASS                = &quot;28&quot;      OBJECT                 = ASSOCIATEDSENSORSHORTNAME        CLASS                = &quot;28&quot;        NUM_VAL              = 1        VALUE                = &quot;M4c Detector Array&quot;      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME        CLASS                = &quot;28&quot;        NUM_VAL              = 1        VALUE                = &quot;Aqua&quot;      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME      OBJECT                 = OPERATIONMODE        CLASS                = &quot;28&quot;        NUM_VAL              = 1        VALUE                = &quot;Normal&quot;      END_OBJECT             = OPERATIONMODE      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME        CLASS                = &quot;28&quot;        NUM_VAL              = 1        VALUE                = &quot;AIRS&quot;      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER      CLASS                = &quot;29&quot;      OBJECT                 = ASSOCIATEDSENSORSHORTNAME        CLASS                = &quot;29&quot;        NUM_VAL              = 1        VALUE                = &quot;M4d Detector Array&quot;      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME        CLASS                = &quot;29&quot;        NUM_VAL              = 1        VALUE                = &quot;Aqua&quot;      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME      OBJECT                 = OPERATIONMODE        CLASS                = &quot;29&quot;        NUM_VAL              = 1        VALUE                = &quot;Normal&quot;      END_OBJECT             = OPERATIONMODE      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME        CLASS                = &quot;29&quot;        NUM_VAL              = 1        VALUE                = &quot;AIRS&quot;      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER      CLASS                = &quot;30&quot;      OBJECT                 = ASSOCIATEDSENSORSHORTNAME        CLASS                = &quot;30&quot;        NUM_VAL              = 1        VALUE                = &quot;M5 Detector Array&quot;      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME        CLASS                = &quot;30&quot;        NUM_VAL              = 1        VALUE                = &quot;Aqua&quot;      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME      OBJECT                 = OPERATIONMODE        CLASS                = &quot;30&quot;        NUM_VAL              = 1        VALUE                = &quot;Normal&quot;      END_OBJECT             = OPERATIONMODE      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME        CLASS                = &quot;30&quot;        NUM_VAL              = 1        VALUE                = &quot;AIRS&quot;      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER      CLASS                = &quot;31&quot;      OBJECT                 = ASSOCIATEDSENSORSHORTNAME        CLASS                = &quot;31&quot;        NUM_VAL              = 1        VALUE                = &quot;M6 Detector Array&quot;      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME        CLASS                = &quot;31&quot;        NUM_VAL              = 1        VALUE                = &quot;Aqua&quot;      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME      OBJECT                 = OPERATIONMODE        CLASS                = &quot;31&quot;        NUM_VAL              = 1        VALUE                = &quot;Normal&quot;      END_OBJECT             = OPERATIONMODE      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME        CLASS                = &quot;31&quot;        NUM_VAL              = 1        VALUE                = &quot;AIRS&quot;      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER      CLASS                = &quot;32&quot;      OBJECT                 = ASSOCIATEDSENSORSHORTNAME        CLASS                = &quot;32&quot;        NUM_VAL              = 1        VALUE                = &quot;M7 Detector Array&quot;      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME        CLASS                = &quot;32&quot;        NUM_VAL              = 1        VALUE                = &quot;Aqua&quot;      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME      OBJECT                 = OPERATIONMODE        CLASS                = &quot;32&quot;        NUM_VAL              = 1        VALUE                = &quot;Normal&quot;      END_OBJECT             = OPERATIONMODE      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME        CLASS                = &quot;32&quot;        NUM_VAL              = 1        VALUE                = &quot;AIRS&quot;      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER      CLASS                = &quot;33&quot;      OBJECT                 = ASSOCIATEDSENSORSHORTNAME        CLASS                = &quot;33&quot;        NUM_VAL              = 1        VALUE                = &quot;M8 Detector Array&quot;      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME        CLASS                = &quot;33&quot;        NUM_VAL              = 1        VALUE                = &quot;Aqua&quot;      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME      OBJECT                 = OPERATIONMODE        CLASS                = &quot;33&quot;        NUM_VAL              = 1        VALUE                = &quot;Normal&quot;      END_OBJECT             = OPERATIONMODE      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME        CLASS                = &quot;33&quot;        NUM_VAL              = 1        VALUE                = &quot;AIRS&quot;      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER      CLASS                = &quot;34&quot;      OBJECT                 = ASSOCIATEDSENSORSHORTNAME        CLASS                = &quot;34&quot;        NUM_VAL              = 1        VALUE                = &quot;M9 Detector Array&quot;      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME        CLASS                = &quot;34&quot;        NUM_VAL              = 1        VALUE                = &quot;Aqua&quot;      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME      OBJECT                 = OPERATIONMODE        CLASS                = &quot;34&quot;        NUM_VAL              = 1        VALUE                = &quot;Normal&quot;      END_OBJECT             = OPERATIONMODE      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME        CLASS                = &quot;34&quot;        NUM_VAL              = 1        VALUE                = &quot;AIRS&quot;      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER      CLASS                = &quot;35&quot;      OBJECT                 = ASSOCIATEDSENSORSHORTNAME        CLASS                = &quot;35&quot;        NUM_VAL              = 1        VALUE                = &quot;M10 Detector Array&quot;      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME        CLASS                = &quot;35&quot;        NUM_VAL              = 1        VALUE                = &quot;Aqua&quot;      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME      OBJECT                 = OPERATIONMODE        CLASS                = &quot;35&quot;        NUM_VAL              = 1        VALUE                = &quot;Normal&quot;      END_OBJECT             = OPERATIONMODE      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME        CLASS                = &quot;35&quot;        NUM_VAL              = 1        VALUE                = &quot;AIRS&quot;      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER      CLASS                = &quot;36&quot;      OBJECT                 = ASSOCIATEDSENSORSHORTNAME        CLASS                = &quot;36&quot;        NUM_VAL              = 1        VALUE                = &quot;M11 Detector Array&quot;      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME        CLASS                = &quot;36&quot;        NUM_VAL              = 1        VALUE                = &quot;Aqua&quot;      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME      OBJECT                 = OPERATIONMODE        CLASS                = &quot;36&quot;        NUM_VAL              = 1        VALUE                = &quot;Normal&quot;      END_OBJECT             = OPERATIONMODE      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME        CLASS                = &quot;36&quot;        NUM_VAL              = 1        VALUE                = &quot;AIRS&quot;      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER      CLASS                = &quot;37&quot;      OBJECT                 = ASSOCIATEDSENSORSHORTNAME        CLASS                = &quot;37&quot;        NUM_VAL              = 1        VALUE                = &quot;M12 Detector Array&quot;      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME        CLASS                = &quot;37&quot;        NUM_VAL              = 1        VALUE                = &quot;Aqua&quot;      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME      OBJECT                 = OPERATIONMODE        CLASS                = &quot;37&quot;        NUM_VAL              = 1        VALUE                = &quot;Normal&quot;      END_OBJECT             = OPERATIONMODE      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME        CLASS                = &quot;37&quot;        NUM_VAL              = 1        VALUE                = &quot;AIRS&quot;      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER      CLASS                = &quot;38&quot;      OBJECT                 = ASSOCIATEDSENSORSHORTNAME        CLASS                = &quot;38&quot;        NUM_VAL              = 1        VALUE                = &quot;VNIR Channel 1&quot;      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME        CLASS                = &quot;38&quot;        NUM_VAL              = 1        VALUE                = &quot;Aqua&quot;      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME      OBJECT                 = OPERATIONMODE        CLASS                = &quot;38&quot;        NUM_VAL              = 1        VALUE                = &quot;Normal&quot;      END_OBJECT             = OPERATIONMODE      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME        CLASS                = &quot;38&quot;        NUM_VAL              = 1        VALUE                = &quot;AIRS&quot;      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER      CLASS                = &quot;39&quot;      OBJECT                 = ASSOCIATEDSENSORSHORTNAME        CLASS                = &quot;39&quot;        NUM_VAL              = 1        VALUE                = &quot;VNIR Channel 2&quot;      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME        CLASS                = &quot;39&quot;        NUM_VAL              = 1        VALUE                = &quot;Aqua&quot;      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME      OBJECT                 = OPERATIONMODE        CLASS                = &quot;39&quot;        NUM_VAL              = 1        VALUE                = &quot;Normal&quot;      END_OBJECT             = OPERATIONMODE      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME        CLASS                = &quot;39&quot;        NUM_VAL              = 1        VALUE                = &quot;AIRS&quot;      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER      CLASS                = &quot;40&quot;      OBJECT                 = ASSOCIATEDSENSORSHORTNAME        CLASS                = &quot;40&quot;        NUM_VAL              = 1        VALUE                = &quot;VNIR Channel 3&quot;      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME        CLASS                = &quot;40&quot;        NUM_VAL              = 1        VALUE                = &quot;Aqua&quot;      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME      OBJECT                 = OPERATIONMODE        CLASS                = &quot;40&quot;        NUM_VAL              = 1        VALUE                = &quot;Normal&quot;      END_OBJECT             = OPERATIONMODE      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME        CLASS                = &quot;40&quot;        NUM_VAL              = 1        VALUE                = &quot;AIRS&quot;      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER    OBJECT                 = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER      CLASS                = &quot;41&quot;      OBJECT                 = ASSOCIATEDSENSORSHORTNAME        CLASS                = &quot;41&quot;        NUM_VAL              = 1        VALUE                = &quot;VNIR Channel 4&quot;      END_OBJECT             = ASSOCIATEDSENSORSHORTNAME      OBJECT                 = ASSOCIATEDPLATFORMSHORTNAME        CLASS                = &quot;41&quot;        NUM_VAL              = 1        VALUE                = &quot;Aqua&quot;      END_OBJECT             = ASSOCIATEDPLATFORMSHORTNAME      OBJECT                 = OPERATIONMODE        CLASS                = &quot;41&quot;        NUM_VAL              = 1        VALUE                = &quot;Normal&quot;      END_OBJECT             = OPERATIONMODE      OBJECT                 = ASSOCIATEDINSTRUMENTSHORTNAME        CLASS                = &quot;41&quot;        NUM_VAL              = 1        VALUE                = &quot;AIRS&quot;      END_OBJECT             = ASSOCIATEDINSTRUMENTSHORTNAME    END_OBJECT             = ASSOCIATEDPLATFORMINSTRUMENTSENSORCONTAINER  END_GROUP              = ASSOCIATEDPLATFORMINSTRUMENTSENSOR  GROUP                  = ADDITIONALATTRIBUTES    OBJECT                 = ADDITIONALATTRIBUTESCONTAINER      CLASS                = &quot;1&quot;      OBJECT                 = ADDITIONALATTRIBUTENAME        CLASS                = &quot;1&quot;        NUM_VAL              = 1        VALUE                = &quot;NumBadData&quot;      END_OBJECT             = ADDITIONALATTRIBUTENAME      GROUP                  = INFORMATIONCONTENT        CLASS                = &quot;1&quot;        OBJECT                 = PARAMETERVALUE          NUM_VAL              = 1          CLASS                = &quot;1&quot;          VALUE                = &quot;32&quot;        END_OBJECT             = PARAMETERVALUE      END_GROUP              = INFORMATIONCONTENT    END_OBJECT             = ADDITIONALATTRIBUTESCONTAINER    OBJECT                 = ADDITIONALATTRIBUTESCONTAINER      CLASS                = &quot;2&quot;      OBJECT                 = ADDITIONALATTRIBUTENAME        CLASS                = &quot;2&quot;        NUM_VAL              = 1        VALUE                = &quot;NumSpecialData&quot;      END_OBJECT             = ADDITIONALATTRIBUTENAME      GROUP                  = INFORMATIONCONTENT        CLASS                = &quot;2&quot;        OBJECT                 = PARAMETERVALUE          NUM_VAL              = 1          CLASS                = &quot;2&quot;          VALUE                = &quot;0&quot;        END_OBJECT             = PARAMETERVALUE      END_GROUP              = INFORMATIONCONTENT    END_OBJECT             = ADDITIONALATTRIBUTESCONTAINER    OBJECT                 = ADDITIONALATTRIBUTESCONTAINER      CLASS                = &quot;3&quot;      OBJECT                 = ADDITIONALATTRIBUTENAME        CLASS                = &quot;3&quot;        NUM_VAL              = 1        VALUE                = &quot;NumProcessData&quot;      END_OBJECT             = ADDITIONALATTRIBUTENAME      GROUP                  = INFORMATIONCONTENT        CLASS                = &quot;3&quot;        OBJECT                 = PARAMETERVALUE          NUM_VAL              = 1          CLASS                = &quot;3&quot;          VALUE                = &quot;1406666&quot;        END_OBJECT             = PARAMETERVALUE      END_GROUP              = INFORMATIONCONTENT    END_OBJECT             = ADDITIONALATTRIBUTESCONTAINER    OBJECT                 = ADDITIONALATTRIBUTESCONTAINER      CLASS                = &quot;4&quot;      OBJECT                 = ADDITIONALATTRIBUTENAME        CLASS                = &quot;4&quot;        NUM_VAL              = 1        VALUE                = &quot;NumMissingData&quot;      END_OBJECT             = ADDITIONALATTRIBUTENAME      GROUP                  = INFORMATIONCONTENT        CLASS                = &quot;4&quot;        OBJECT                 = PARAMETERVALUE          NUM_VAL              = 1          CLASS                = &quot;4&quot;          VALUE                = &quot;2&quot;        END_OBJECT             = PARAMETERVALUE      END_GROUP              = INFORMATIONCONTENT    END_OBJECT             = ADDITIONALATTRIBUTESCONTAINER    OBJECT                 = ADDITIONALATTRIBUTESCONTAINER      CLASS                = &quot;5&quot;      OBJECT                 = ADDITIONALATTRIBUTENAME        CLASS                = &quot;5&quot;        NUM_VAL              = 1        VALUE                = &quot;NumTotalData&quot;      END_OBJECT             = ADDITIONALATTRIBUTENAME      GROUP                  = INFORMATIONCONTENT        CLASS                = &quot;5&quot;        OBJECT                 = PARAMETERVALUE          NUM_VAL              = 1          CLASS                = &quot;5&quot;          VALUE                = &quot;1406700&quot;        END_OBJECT             = PARAMETERVALUE      END_GROUP              = INFORMATIONCONTENT    END_OBJECT             = ADDITIONALATTRIBUTESCONTAINER    OBJECT                 = ADDITIONALATTRIBUTESCONTAINER      CLASS                = &quot;6&quot;      OBJECT                 = ADDITIONALATTRIBUTENAME        CLASS                = &quot;6&quot;        NUM_VAL              = 1        VALUE                = &quot;NumFpe&quot;      END_OBJECT             = ADDITIONALATTRIBUTENAME      GROUP                  = INFORMATIONCONTENT        CLASS                = &quot;6&quot;        OBJECT                 = PARAMETERVALUE          NUM_VAL              = 1          CLASS                = &quot;6&quot;          VALUE                = &quot;0&quot;        END_OBJECT             = PARAMETERVALUE      END_GROUP              = INFORMATIONCONTENT    END_OBJECT             = ADDITIONALATTRIBUTESCONTAINER    OBJECT                 = ADDITIONALATTRIBUTESCONTAINER      CLASS                = &quot;7&quot;      OBJECT                 = ADDITIONALATTRIBUTENAME        CLASS                = &quot;7&quot;        NUM_VAL              = 1        VALUE                = &quot;ProductGenerationFacility&quot;      END_OBJECT             = ADDITIONALATTRIBUTENAME      GROUP                  = INFORMATIONCONTENT        CLASS                = &quot;7&quot;        OBJECT                 = PARAMETERVALUE          NUM_VAL              = 1          CLASS                = &quot;7&quot;          VALUE                = &quot;G&quot;        END_OBJECT             = PARAMETERVALUE      END_GROUP              = INFORMATIONCONTENT    END_OBJECT             = ADDITIONALATTRIBUTESCONTAINER    OBJECT                 = ADDITIONALATTRIBUTESCONTAINER      CLASS                = &quot;8&quot;      OBJECT                 = ADDITIONALATTRIBUTENAME        CLASS                = &quot;8&quot;        NUM_VAL              = 1        VALUE                = &quot;InputGranuleCount&quot;      END_OBJECT             = ADDITIONALATTRIBUTENAME      GROUP                  = INFORMATIONCONTENT        CLASS                = &quot;8&quot;        OBJECT                 = PARAMETERVALUE          NUM_VAL              = 1          CLASS                = &quot;8&quot;          VALUE                = &quot;521&quot;        END_OBJECT             = PARAMETERVALUE      END_GROUP              = INFORMATIONCONTENT    END_OBJECT             = ADDITIONALATTRIBUTESCONTAINER    OBJECT                 = ADDITIONALATTRIBUTESCONTAINER      CLASS                = &quot;9&quot;      OBJECT                 = ADDITIONALATTRIBUTENAME        CLASS                = &quot;9&quot;        NUM_VAL              = 1        VALUE                = &quot;NumDaysPlanned&quot;      END_OBJECT             = ADDITIONALATTRIBUTENAME      GROUP                  = INFORMATIONCONTENT        CLASS                = &quot;9&quot;        OBJECT                 = PARAMETERVALUE          NUM_VAL              = 1          CLASS                = &quot;9&quot;          VALUE                = &quot;1&quot;        END_OBJECT             = PARAMETERVALUE      END_GROUP              = INFORMATIONCONTENT    END_OBJECT             = ADDITIONALATTRIBUTESCONTAINER    OBJECT                 = ADDITIONALATTRIBUTESCONTAINER      CLASS                = &quot;10&quot;      OBJECT                 = ADDITIONALATTRIBUTENAME        CLASS                = &quot;10&quot;        NUM_VAL              = 1        VALUE                = &quot;NumDaysInCycle&quot;      END_OBJECT             = ADDITIONALATTRIBUTENAME      GROUP                  = INFORMATIONCONTENT        CLASS                = &quot;10&quot;        OBJECT                 = PARAMETERVALUE          NUM_VAL              = 1          CLASS                = &quot;10&quot;          VALUE                = &quot;1&quot;        END_OBJECT             = PARAMETERVALUE      END_GROUP              = INFORMATIONCONTENT    END_OBJECT             = ADDITIONALATTRIBUTESCONTAINER    OBJECT                 = ADDITIONALATTRIBUTESCONTAINER      CLASS                = &quot;11&quot;      OBJECT                 = ADDITIONALATTRIBUTENAME        CLASS                = &quot;11&quot;        NUM_VAL              = 1        VALUE                = &quot;StartDayInAquaRepeat&quot;      END_OBJECT             = ADDITIONALATTRIBUTENAME      GROUP                  = INFORMATIONCONTENT        CLASS                = &quot;11&quot;        OBJECT                 = PARAMETERVALUE          NUM_VAL              = 1          CLASS                = &quot;11&quot;          VALUE                = &quot;8&quot;        END_OBJECT             = PARAMETERVALUE      END_GROUP              = INFORMATIONCONTENT    END_OBJECT             = ADDITIONALATTRIBUTESCONTAINER    OBJECT                 = ADDITIONALATTRIBUTESCONTAINER      CLASS                = &quot;12&quot;      OBJECT                 = ADDITIONALATTRIBUTENAME        CLASS                = &quot;12&quot;        NUM_VAL              = 1        VALUE                = &quot;AIRSRunTag&quot;      END_OBJECT             = ADDITIONALATTRIBUTENAME      GROUP                  = INFORMATIONCONTENT        CLASS                = &quot;12&quot;        OBJECT                 = PARAMETERVALUE          NUM_VAL              = 1          CLASS                = &quot;12&quot;          VALUE                = &quot;15281122640&quot;        END_OBJECT             = PARAMETERVALUE      END_GROUP              = INFORMATIONCONTENT    END_OBJECT             = ADDITIONALATTRIBUTESCONTAINER    OBJECT                 = ADDITIONALATTRIBUTESCONTAINER      CLASS                = &quot;13&quot;      OBJECT                 = ADDITIONALATTRIBUTENAME        CLASS                = &quot;13&quot;        NUM_VAL              = 1        VALUE                = &quot;ProductGenerationHostInformation&quot;      END_OBJECT             = ADDITIONALATTRIBUTENAME      GROUP                  = INFORMATIONCONTENT        CLASS                = &quot;13&quot;        OBJECT                 = PARAMETERVALUE          NUM_VAL              = 1          CLASS                = &quot;13&quot;          VALUE                = &quot;ac14.gesdisc.eosdis.nasa.gov Linux 2.6.32-573.1.1.el6.x86_64 #1_SMP_Sat_Jul_25_17:05:50_UTC_2015 x86_64&quot;        END_OBJECT             = PARAMETERVALUE      END_GROUP              = INFORMATIONCONTENT    END_OBJECT             = ADDITIONALATTRIBUTESCONTAINER    OBJECT                 = ADDITIONALATTRIBUTESCONTAINER      CLASS                = &quot;14&quot;      OBJECT                 = ADDITIONALATTRIBUTENAME        CLASS                = &quot;14&quot;        NUM_VAL              = 1        VALUE                = &quot;identifier_product_doi&quot;      END_OBJECT             = ADDITIONALATTRIBUTENAME      GROUP                  = INFORMATIONCONTENT        CLASS                = &quot;14&quot;        OBJECT                 = PARAMETERVALUE          NUM_VAL              = 1          CLASS                = &quot;14&quot;          VALUE                = &quot;10.5067/AQUA/AIRS/DATA303&quot;        END_OBJECT             = PARAMETERVALUE      END_GROUP              = INFORMATIONCONTENT    END_OBJECT             = ADDITIONALATTRIBUTESCONTAINER    OBJECT                 = ADDITIONALATTRIBUTESCONTAINER      CLASS                = &quot;15&quot;      OBJECT                 = ADDITIONALATTRIBUTENAME        CLASS                = &quot;15&quot;        NUM_VAL              = 1        VALUE                = &quot;identifier_product_doi_authority&quot;      END_OBJECT             = ADDITIONALATTRIBUTENAME      GROUP                  = INFORMATIONCONTENT        CLASS                = &quot;15&quot;        OBJECT                 = PARAMETERVALUE          NUM_VAL              = 1          CLASS                = &quot;15&quot;          VALUE                = &quot;http://dx.doi.org/&quot;        END_OBJECT             = PARAMETERVALUE      END_GROUP              = INFORMATIONCONTENT    END_OBJECT             = ADDITIONALATTRIBUTESCONTAINER  END_GROUP              = ADDITIONALATTRIBUTESEND_GROUP              = INVENTORYMETADATAEND</Value>
+    </Attribute>
+</Dataset>
+
diff --git a/tests/dmr-testsuite/ignore_foreign_xml_2.xml b/tests/dmr-testsuite/ignore_foreign_xml_2.xml
new file mode 100644
index 0000000..c771d0f
--- /dev/null
+++ b/tests/dmr-testsuite/ignore_foreign_xml_2.xml
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset 
+    xmlns="http://xml.opendap.org/ns/DAP/4.0#" 
+    xml:base="http://comet.opendap.org:8080/opendap/w10n/data/nc/bears_Z.nc.Z/order/j/"
+    dapVersion="4.0" 
+    dmrVersion="1.0" 
+    name="coads_climatology.nc">
+    <Dimension name="COADSX" size="180"/>
+    <Dimension name="COADSY" size="90"/>
+    <Dimension name="TIME" size="12"/>
+    <gml:boundedBy xmlns:gml="http://www.opengis.net/gml/3.2">
+        <gml:Envelope axisLabels="latitude longitude" srsDimension="2" srsName="http://www.opengis.net/def/crs/EPSG/0/4326"
+                      uomLabels="deg deg">
+            <gml:lowerCorner>37.3333332966667  -122.666666698</gml:lowerCorner>
+            <gml:upperCorner>38.66666663 -121.333333364667</gml:upperCorner>
+        </gml:Envelope>
+    </gml:boundedBy>
+
+    <Float64 name="COADSX">
+        <Dim name="/COADSX"/>
+        <Attribute name="units" type="String">
+            <Value>degrees_east</Value>
+        </Attribute>
+        <Attribute name="modulo" type="String">
+            <Value> </Value>
+        </Attribute>
+        <Attribute name="point_spacing" type="String">
+            <Value>even</Value>
+        </Attribute>
+    </Float64>
+    <Float64 name="COADSY">
+        <Dim name="/COADSY"/>
+        <Attribute name="units" type="String">
+            <Value>degrees_north</Value>
+        </Attribute>
+        <Attribute name="point_spacing" type="String">
+            <Value>even</Value>
+        </Attribute>
+    </Float64>
+    <Float64 name="TIME">
+        <Dim name="/TIME"/>
+        <Attribute name="units" type="String">
+            <Value>hour since 0000-01-01 00:00:00</Value>
+        </Attribute>
+        <Attribute name="time_origin" type="String">
+            <Value>1-JAN-0000 00:00:00</Value>
+        </Attribute>
+        <Attribute name="modulo" type="String">
+            <Value> </Value>
+        </Attribute>
+    </Float64>
+    <Float32 name="SST">
+        <Dim name="/TIME"/>
+        <Dim name="/COADSY"/>
+        <Dim name="/COADSX"/>
+        <Attribute name="missing_value" type="Float32">
+            <Value>-9.99999979e+33</Value>
+        </Attribute>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9.99999979e+33</Value>
+        </Attribute>
+        <Attribute name="long_name" type="String">
+            <Value>SEA SURFACE TEMPERATURE</Value>
+        </Attribute>
+        <Attribute name="history" type="String">
+            <Value>From coads_climatology</Value>
+        </Attribute>
+        <Attribute name="units" type="String">
+            <Value>Deg C</Value>
+        </Attribute>
+        <Map name="TIME"/>
+        <Map name="COADSY"/>
+        <Map name="COADSX"/>
+    </Float32>
+    <Float32 name="AIRT">
+        <Dim name="/TIME"/>
+        <Dim name="/COADSY"/>
+        <Dim name="/COADSX"/>
+        <Attribute name="missing_value" type="Float32">
+            <Value>-9.99999979e+33</Value>
+        </Attribute>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9.99999979e+33</Value>
+        </Attribute>
+        <Attribute name="long_name" type="String">
+            <Value>AIR TEMPERATURE</Value>
+        </Attribute>
+        <Attribute name="history" type="String">
+            <Value>From coads_climatology</Value>
+        </Attribute>
+        <Attribute name="units" type="String">
+            <Value>DEG C</Value>
+        </Attribute>
+        <Map name="TIME"/>
+        <Map name="COADSY"/>
+        <Map name="COADSX"/>
+    </Float32>
+    <Float32 name="UWND">
+        <Dim name="/TIME"/>
+        <Dim name="/COADSY"/>
+        <Dim name="/COADSX"/>
+        <Attribute name="missing_value" type="Float32">
+            <Value>-9.99999979e+33</Value>
+        </Attribute>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9.99999979e+33</Value>
+        </Attribute>
+        <Attribute name="long_name" type="String">
+            <Value>ZONAL WIND</Value>
+        </Attribute>
+        <Attribute name="history" type="String">
+            <Value>From coads_climatology</Value>
+        </Attribute>
+        <Attribute name="units" type="String">
+            <Value>M/S</Value>
+        </Attribute>
+        <Map name="TIME"/>
+        <Map name="COADSY"/>
+        <Map name="COADSX"/>
+    </Float32>
+    <Float32 name="VWND">
+        <Dim name="/TIME"/>
+        <Dim name="/COADSY"/>
+        <Dim name="/COADSX"/>
+        <Attribute name="missing_value" type="Float32">
+            <Value>-9.99999979e+33</Value>
+        </Attribute>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9.99999979e+33</Value>
+        </Attribute>
+        <Attribute name="long_name" type="String">
+            <Value>MERIDIONAL WIND</Value>
+        </Attribute>
+        <Attribute name="history" type="String">
+            <Value>From coads_climatology</Value>
+        </Attribute>
+        <Attribute name="units" type="String">
+            <Value>M/S</Value>
+        </Attribute>
+        <Map name="TIME"/>
+        <Map name="COADSY"/>
+        <Map name="COADSX"/>
+    </Float32>
+    <Attribute name="NC_GLOBAL" type="Container">
+        <Attribute name="history" type="String">
+            <Value>FERRET V4.30 (debug/no GUI) 15-Aug-96</Value>
+        </Attribute>
+    </Attribute>
+    <Attribute name="DODS_EXTRA" type="Container">
+        <Attribute name="Unlimited_Dimension" type="String">
+            <Value>TIME</Value>
+        </Attribute>
+    </Attribute>
+</Dataset>
diff --git a/tests/dmr-testsuite/ignore_foreign_xml_2.xml.baseline b/tests/dmr-testsuite/ignore_foreign_xml_2.xml.baseline
new file mode 100644
index 0000000..a614e9d
--- /dev/null
+++ b/tests/dmr-testsuite/ignore_foreign_xml_2.xml.baseline
@@ -0,0 +1,143 @@
+Parse successful
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="http://comet.opendap.org:8080/opendap/w10n/data/nc/bears_Z.nc.Z/order/j/" dapVersion="4.0" dmrVersion="1.0" name="coads_climatology.nc">
+    <Dimension name="COADSX" size="180"/>
+    <Dimension name="COADSY" size="90"/>
+    <Dimension name="TIME" size="12"/>
+    <Float64 name="COADSX">
+        <Dim name="/COADSX"/>
+        <Attribute name="units" type="String">
+            <Value>degrees_east</Value>
+        </Attribute>
+        <Attribute name="modulo" type="String">
+            <Value> </Value>
+        </Attribute>
+        <Attribute name="point_spacing" type="String">
+            <Value>even</Value>
+        </Attribute>
+    </Float64>
+    <Float64 name="COADSY">
+        <Dim name="/COADSY"/>
+        <Attribute name="units" type="String">
+            <Value>degrees_north</Value>
+        </Attribute>
+        <Attribute name="point_spacing" type="String">
+            <Value>even</Value>
+        </Attribute>
+    </Float64>
+    <Float64 name="TIME">
+        <Dim name="/TIME"/>
+        <Attribute name="units" type="String">
+            <Value>hour since 0000-01-01 00:00:00</Value>
+        </Attribute>
+        <Attribute name="time_origin" type="String">
+            <Value>1-JAN-0000 00:00:00</Value>
+        </Attribute>
+        <Attribute name="modulo" type="String">
+            <Value> </Value>
+        </Attribute>
+    </Float64>
+    <Float32 name="SST">
+        <Dim name="/TIME"/>
+        <Dim name="/COADSY"/>
+        <Dim name="/COADSX"/>
+        <Attribute name="missing_value" type="Float32">
+            <Value>-9.99999979e+33</Value>
+        </Attribute>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9.99999979e+33</Value>
+        </Attribute>
+        <Attribute name="long_name" type="String">
+            <Value>SEA SURFACE TEMPERATURE</Value>
+        </Attribute>
+        <Attribute name="history" type="String">
+            <Value>From coads_climatology</Value>
+        </Attribute>
+        <Attribute name="units" type="String">
+            <Value>Deg C</Value>
+        </Attribute>
+        <Map name="/TIME"/>
+        <Map name="/COADSY"/>
+        <Map name="/COADSX"/>
+    </Float32>
+    <Float32 name="AIRT">
+        <Dim name="/TIME"/>
+        <Dim name="/COADSY"/>
+        <Dim name="/COADSX"/>
+        <Attribute name="missing_value" type="Float32">
+            <Value>-9.99999979e+33</Value>
+        </Attribute>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9.99999979e+33</Value>
+        </Attribute>
+        <Attribute name="long_name" type="String">
+            <Value>AIR TEMPERATURE</Value>
+        </Attribute>
+        <Attribute name="history" type="String">
+            <Value>From coads_climatology</Value>
+        </Attribute>
+        <Attribute name="units" type="String">
+            <Value>DEG C</Value>
+        </Attribute>
+        <Map name="/TIME"/>
+        <Map name="/COADSY"/>
+        <Map name="/COADSX"/>
+    </Float32>
+    <Float32 name="UWND">
+        <Dim name="/TIME"/>
+        <Dim name="/COADSY"/>
+        <Dim name="/COADSX"/>
+        <Attribute name="missing_value" type="Float32">
+            <Value>-9.99999979e+33</Value>
+        </Attribute>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9.99999979e+33</Value>
+        </Attribute>
+        <Attribute name="long_name" type="String">
+            <Value>ZONAL WIND</Value>
+        </Attribute>
+        <Attribute name="history" type="String">
+            <Value>From coads_climatology</Value>
+        </Attribute>
+        <Attribute name="units" type="String">
+            <Value>M/S</Value>
+        </Attribute>
+        <Map name="/TIME"/>
+        <Map name="/COADSY"/>
+        <Map name="/COADSX"/>
+    </Float32>
+    <Float32 name="VWND">
+        <Dim name="/TIME"/>
+        <Dim name="/COADSY"/>
+        <Dim name="/COADSX"/>
+        <Attribute name="missing_value" type="Float32">
+            <Value>-9.99999979e+33</Value>
+        </Attribute>
+        <Attribute name="_FillValue" type="Float32">
+            <Value>-9.99999979e+33</Value>
+        </Attribute>
+        <Attribute name="long_name" type="String">
+            <Value>MERIDIONAL WIND</Value>
+        </Attribute>
+        <Attribute name="history" type="String">
+            <Value>From coads_climatology</Value>
+        </Attribute>
+        <Attribute name="units" type="String">
+            <Value>M/S</Value>
+        </Attribute>
+        <Map name="/TIME"/>
+        <Map name="/COADSY"/>
+        <Map name="/COADSX"/>
+    </Float32>
+    <Attribute name="NC_GLOBAL" type="Container">
+        <Attribute name="history" type="String">
+            <Value>FERRET V4.30 (debug/no GUI) 15-Aug-96</Value>
+        </Attribute>
+    </Attribute>
+    <Attribute name="DODS_EXTRA" type="Container">
+        <Attribute name="Unlimited_Dimension" type="String">
+            <Value>TIME</Value>
+        </Attribute>
+    </Attribute>
+</Dataset>
+
diff --git a/tests/dmr-testsuite/ignore_foreign_xml_3.xml b/tests/dmr-testsuite/ignore_foreign_xml_3.xml
new file mode 100644
index 0000000..4d8e5af
--- /dev/null
+++ b/tests/dmr-testsuite/ignore_foreign_xml_3.xml
@@ -0,0 +1,332 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:swe="http://www.opengis.net/swe/2.0" dapVersion="4.0" dmrVersion="1.0" name="Global_0p25deg_best_hs002.nc" >
+    <Dimension name="time" size="112"/>
+    <Dimension name="isobaric" size="31"/>
+    <Dimension name="lat" size="361"/>
+    <Dimension name="lon" size="720"/>
+    <gml:domainSet>
+        <gml:RectifiedGrid dimension="4" gml:id="eo_ncep_model_example_grid">
+            <gml:limits>
+                <gml:GridEnvelope>
+                    <gml:low>0 0 0 0</gml:low>
+                    <gml:high>111 30 360 719</gml:high>
+                </gml:GridEnvelope>
+            </gml:limits>
+            <gml:axisLabels>time isobaric latitude longitude</gml:axisLabels>
+            <gml:origin>
+                <gml:Point gml:id="grid_origin_eo_ncep_model_example" srsName="http://www.opengis.net/def/crs/EPSG/0/4326">
+                    <gml:pos>0.0 100.0 90.0 0.0</gml:pos>
+                </gml:Point>
+            </gml:origin>
+            <!-- Time Units: Hour since 2016-06-17T00:00:00Z -->
+            <gml:offsetVector srsName="http://www.opengis.net/def/crs/TIME">3.0 0.0 0.0 0.0</gml:offsetVector>
+            <gml:offsetVector srsName="http://www.opengis.net/def/crs/IRREGULAR">0.0 100 0.0 0.0</gml:offsetVector>
+            <gml:offsetVector srsName="http://www.opengis.net/def/crs/EPSG/0/4326">0.0 0.0 0.0 0.5</gml:offsetVector>
+            <gml:offsetVector srsName="http://www.opengis.net/def/crs/EPSG/0/4326">0.0 0.0 -0.5 0.0</gml:offsetVector>
+        </gml:RectifiedGrid>
+    </gml:domainSet>
+    <Float64 name="time">
+        <Dim name="/time"/>
+        <Attribute name="units" type="String">
+            <Value>Hour since 2016-06-17T00:00:00Z</Value>
+        </Attribute>
+        <Attribute name="standard_name" type="String">
+            <Value>time</Value>
+        </Attribute>
+        <Attribute name="long_name" type="String">
+            <Value>GRIB forecast or observation time</Value>
+        </Attribute>
+        <Attribute name="calendar" type="String">
+            <Value>proleptic_gregorian</Value>
+        </Attribute>
+        <Attribute name="_CoordinateAxisType" type="String">
+            <Value>Time</Value>
+        </Attribute>
+    </Float64>
+    <Float32 name="isobaric">
+        <Dim name="/isobaric"/>
+        <Attribute name="units" type="String">
+            <Value>Pa</Value>
+        </Attribute>
+        <Attribute name="long_name" type="String">
+            <Value>Isobaric surface</Value>
+        </Attribute>
+        <Attribute name="positive" type="String">
+            <Value>down</Value>
+        </Attribute>
+        <Attribute name="Grib_level_type" type="Int32">
+            <Value>100</Value>
+        </Attribute>
+        <Attribute name="_CoordinateAxisType" type="String">
+            <Value>Pressure</Value>
+        </Attribute>
+        <Attribute name="_CoordinateZisPositive" type="String">
+            <Value>down</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="lat">
+        <Dim name="/lat"/>
+        <Attribute name="units" type="String">
+            <Value>degrees_north</Value>
+        </Attribute>
+        <Attribute name="_CoordinateAxisType" type="String">
+            <Value>Lat</Value>
+        </Attribute>
+        <Attribute name="standard_name" type="String">
+            <Value>latitude</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="lon">
+        <Dim name="/lon"/>
+        <Attribute name="units" type="String">
+            <Value>degrees_east</Value>
+        </Attribute>
+        <Attribute name="_CoordinateAxisType" type="String">
+            <Value>Lon</Value>
+        </Attribute>
+        <Attribute name="standard_name" type="String">
+            <Value>longitude</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="u-component_of_wind_isobaric">
+        <Dim name="/time"/>
+        <Dim name="/isobaric"/>
+        <Dim name="/lat"/>
+        <Dim name="/lon"/>
+        <Attribute name="long_name" type="String">
+            <Value>u-component of wind @ Isobaric surface</Value>
+        </Attribute>
+        <Attribute name="units" type="String">
+            <Value>m/s</Value>
+        </Attribute>
+        <Attribute name="abbreviation" type="String">
+            <Value>UGRD</Value>
+        </Attribute>
+        <Attribute name="missing_value" type="Float32">
+            <Value>NaN</Value>
+        </Attribute>
+        <Attribute name="grid_mapping" type="String">
+            <Value>LatLon_Projection</Value>
+        </Attribute>
+        <Attribute name="coordinates" type="String">
+            <Value>reftime time isobaric lat lon lat lon</Value>
+        </Attribute>
+        <Attribute name="Grib_Variable_Id" type="String">
+            <Value>VAR_0-2-2_L100</Value>
+        </Attribute>
+        <Attribute name="Grib2_Parameter" type="Int32">
+            <Value>0</Value>
+            <Value>2</Value>
+            <Value>2</Value>
+        </Attribute>
+        <Attribute name="Grib2_Parameter_Category" type="String">
+            <Value>Momentum</Value>
+        </Attribute>
+        <Attribute name="Grib2_Parameter_Name" type="String">
+            <Value>u-component of wind</Value>
+        </Attribute>
+        <Attribute name="Grib2_Level_Type" type="String">
+            <Value>Isobaric surface</Value>
+        </Attribute>
+        <Attribute name="Grib2_Generating_Process_Type" type="String">
+            <Value>Forecast</Value>
+        </Attribute>
+        <swe:field name="u_component_of_wind_isobaric">
+            <swe:Quantity definition="urn:ncep:def:independantVariable:u_component_of_wind_isobaric">
+                <swe:description>u-component of wind @ Isobaric surface</swe:description>
+                <swe:uom code="m/s"/>
+                <swe:constraint>
+                    <swe:AllowedValues>
+                        <swe:interval>-60.0 161.0</swe:interval>
+                    </swe:AllowedValues>
+                </swe:constraint>
+            </swe:Quantity>
+        </swe:field>
+        <Map name="time"/>
+        <Map name="isobaric"/>
+        <Map name="lat"/>
+        <Map name="lon"/>
+    </Float32>
+    <Float64 name="reftime">
+        <Dim name="/time"/>
+        <Attribute name="standard_name" type="String">
+            <Value>forecast_reference_time</Value>
+        </Attribute>
+        <Attribute name="long_name" type="String">
+            <Value>GRIB reference time</Value>
+        </Attribute>
+        <Attribute name="calendar" type="String">
+            <Value>proleptic_gregorian</Value>
+        </Attribute>
+        <Attribute name="units" type="String">
+            <Value>Hour since 2016-06-17T00:00:00Z</Value>
+        </Attribute>
+        <Attribute name="_CoordinateAxisType" type="String">
+            <Value>RunTime</Value>
+        </Attribute>
+        <Map name="time"/>
+    </Float64>
+    <Float64 name="time">
+        <Dim name="/time"/>
+        <Attribute name="units" type="String">
+            <Value>Hour since 2016-06-17T00:00:00Z</Value>
+        </Attribute>
+        <Attribute name="standard_name" type="String">
+            <Value>time</Value>
+        </Attribute>
+        <Attribute name="long_name" type="String">
+            <Value>GRIB forecast or observation time</Value>
+        </Attribute>
+        <Attribute name="calendar" type="String">
+            <Value>proleptic_gregorian</Value>
+        </Attribute>
+        <Attribute name="_CoordinateAxisType" type="String">
+            <Value>Time</Value>
+        </Attribute>
+    </Float64>
+    <Float32 name="isobaric">
+        <Dim name="/isobaric"/>
+        <Attribute name="units" type="String">
+            <Value>Pa</Value>
+        </Attribute>
+        <Attribute name="long_name" type="String">
+            <Value>Isobaric surface</Value>
+        </Attribute>
+        <Attribute name="positive" type="String">
+            <Value>down</Value>
+        </Attribute>
+        <Attribute name="Grib_level_type" type="Int32">
+            <Value>100</Value>
+        </Attribute>
+        <Attribute name="_CoordinateAxisType" type="String">
+            <Value>Pressure</Value>
+        </Attribute>
+        <Attribute name="_CoordinateZisPositive" type="String">
+            <Value>down</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="lat">
+        <Dim name="/lat"/>
+        <Attribute name="units" type="String">
+            <Value>degrees_north</Value>
+        </Attribute>
+        <Attribute name="_CoordinateAxisType" type="String">
+            <Value>Lat</Value>
+        </Attribute>
+        <Attribute name="standard_name" type="String">
+            <Value>latitude</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="lon">
+        <Dim name="/lon"/>
+        <Attribute name="units" type="String">
+            <Value>degrees_east</Value>
+        </Attribute>
+        <Attribute name="_CoordinateAxisType" type="String">
+            <Value>Lon</Value>
+        </Attribute>
+        <Attribute name="standard_name" type="String">
+            <Value>longitude</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="v-component_of_wind_isobaric">
+        <Dim name="/time"/>
+        <Dim name="/isobaric"/>
+        <Dim name="/lat"/>
+        <Dim name="/lon"/>
+        <Attribute name="long_name" type="String">
+            <Value>v-component of wind @ Isobaric surface</Value>
+        </Attribute>
+        <Attribute name="units" type="String">
+            <Value>m/s</Value>
+        </Attribute>
+        <Attribute name="abbreviation" type="String">
+            <Value>VGRD</Value>
+        </Attribute>
+        <Attribute name="missing_value" type="Float32">
+            <Value>NaN</Value>
+        </Attribute>
+        <Attribute name="grid_mapping" type="String">
+            <Value>LatLon_Projection</Value>
+        </Attribute>
+        <Attribute name="coordinates" type="String">
+            <Value>reftime time isobaric lat lon lat lon</Value>
+        </Attribute>
+        <Attribute name="Grib_Variable_Id" type="String">
+            <Value>VAR_0-2-3_L100</Value>
+        </Attribute>
+        <Attribute name="Grib2_Parameter" type="Int32">
+            <Value>0</Value>
+            <Value>2</Value>
+            <Value>3</Value>
+        </Attribute>
+        <Attribute name="Grib2_Parameter_Category" type="String">
+            <Value>Momentum</Value>
+        </Attribute>
+        <Attribute name="Grib2_Parameter_Name" type="String">
+            <Value>v-component of wind</Value>
+        </Attribute>
+        <Attribute name="Grib2_Level_Type" type="String">
+            <Value>Isobaric surface</Value>
+        </Attribute>
+        <Attribute name="Grib2_Generating_Process_Type" type="String">
+            <Value>Forecast</Value>
+        </Attribute>
+        <swe:field name="v_component_of_wind_isobaric">
+            <swe:Quantity definition="urn:ncep:def:independantVariable:vu_component_of_wind_isobaric">
+                <swe:description>v-component of wind @ Isobaric surface</swe:description>
+                <swe:uom code="m/s"/>
+                <swe:constraint>
+                    <swe:AllowedValues>
+                        <swe:interval>-71.0 79.0</swe:interval>
+                    </swe:AllowedValues>
+                </swe:constraint>
+            </swe:Quantity>
+        </swe:field>
+        <Map name="time"/>
+        <Map name="isobaric"/>
+        <Map name="lat"/>
+        <Map name="lon"/>
+    </Float32>
+    <Attribute name="NC_GLOBAL" type="Container">
+        <Attribute name="Originating_or_generating_Center" type="String">
+            <Value>US National Weather Service, National Centres for Environmental Prediction (NCEP)</Value>
+        </Attribute>
+        <Attribute name="Originating_or_generating_Subcenter" type="String">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="GRIB_table_version" type="String">
+            <Value>2,1</Value>
+        </Attribute>
+        <Attribute name="Type_of_generating_process" type="String">
+            <Value>Forecast</Value>
+        </Attribute>
+        <Attribute name="Analysis_or_forecast_generating_process_identifier_defined_by_originating_centre" type="String">
+            <Value>Analysis from GFS (Global Forecast System)</Value>
+        </Attribute>
+        <Attribute name="Conventions" type="String">
+            <Value>CF-1.6</Value>
+        </Attribute>
+        <Attribute name="history" type="String">
+            <Value>Read using CDM IOSP GribCollection v3</Value>
+        </Attribute>
+        <Attribute name="featureType" type="String">
+            <Value>GRID</Value>
+        </Attribute>
+        <Attribute name="History" type="String">
+            <Value>Translated to CF-1.0 Conventions by Netcdf-Java CDM (CFGridWriter2)\012Original Dataset = /data/ldm/pub/native/grid/NCEP/GFS/Global_0p25deg/GFS-Global_0p25deg.ncx3; Translation Date = 2016-06-20T21:22:16.485Z</Value>
+        </Attribute>
+        <Attribute name="geospatial_lat_min" type="Float64">
+            <Value>-90.00000000000000</Value>
+        </Attribute>
+        <Attribute name="geospatial_lat_max" type="Float64">
+            <Value>90.00000000000000</Value>
+        </Attribute>
+        <Attribute name="geospatial_lon_min" type="Float64">
+            <Value>0.000000000000000</Value>
+        </Attribute>
+        <Attribute name="geospatial_lon_max" type="Float64">
+            <Value>359.5000000000000</Value>
+        </Attribute>
+    </Attribute>
+</Dataset>
diff --git a/tests/dmr-testsuite/ignore_foreign_xml_3.xml.baseline b/tests/dmr-testsuite/ignore_foreign_xml_3.xml.baseline
new file mode 100644
index 0000000..eddceca
--- /dev/null
+++ b/tests/dmr-testsuite/ignore_foreign_xml_3.xml.baseline
@@ -0,0 +1,291 @@
+Parse successful
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="Global_0p25deg_best_hs002.nc">
+    <Dimension name="time" size="112"/>
+    <Dimension name="isobaric" size="31"/>
+    <Dimension name="lat" size="361"/>
+    <Dimension name="lon" size="720"/>
+    <Float64 name="time">
+        <Dim name="/time"/>
+        <Attribute name="units" type="String">
+            <Value>Hour since 2016-06-17T00:00:00Z</Value>
+        </Attribute>
+        <Attribute name="standard_name" type="String">
+            <Value>time</Value>
+        </Attribute>
+        <Attribute name="long_name" type="String">
+            <Value>GRIB forecast or observation time</Value>
+        </Attribute>
+        <Attribute name="calendar" type="String">
+            <Value>proleptic_gregorian</Value>
+        </Attribute>
+        <Attribute name="_CoordinateAxisType" type="String">
+            <Value>Time</Value>
+        </Attribute>
+    </Float64>
+    <Float32 name="isobaric">
+        <Dim name="/isobaric"/>
+        <Attribute name="units" type="String">
+            <Value>Pa</Value>
+        </Attribute>
+        <Attribute name="long_name" type="String">
+            <Value>Isobaric surface</Value>
+        </Attribute>
+        <Attribute name="positive" type="String">
+            <Value>down</Value>
+        </Attribute>
+        <Attribute name="Grib_level_type" type="Int32">
+            <Value>100</Value>
+        </Attribute>
+        <Attribute name="_CoordinateAxisType" type="String">
+            <Value>Pressure</Value>
+        </Attribute>
+        <Attribute name="_CoordinateZisPositive" type="String">
+            <Value>down</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="lat">
+        <Dim name="/lat"/>
+        <Attribute name="units" type="String">
+            <Value>degrees_north</Value>
+        </Attribute>
+        <Attribute name="_CoordinateAxisType" type="String">
+            <Value>Lat</Value>
+        </Attribute>
+        <Attribute name="standard_name" type="String">
+            <Value>latitude</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="lon">
+        <Dim name="/lon"/>
+        <Attribute name="units" type="String">
+            <Value>degrees_east</Value>
+        </Attribute>
+        <Attribute name="_CoordinateAxisType" type="String">
+            <Value>Lon</Value>
+        </Attribute>
+        <Attribute name="standard_name" type="String">
+            <Value>longitude</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="u-component_of_wind_isobaric">
+        <Dim name="/time"/>
+        <Dim name="/isobaric"/>
+        <Dim name="/lat"/>
+        <Dim name="/lon"/>
+        <Attribute name="long_name" type="String">
+            <Value>u-component of wind @ Isobaric surface</Value>
+        </Attribute>
+        <Attribute name="units" type="String">
+            <Value>m/s</Value>
+        </Attribute>
+        <Attribute name="abbreviation" type="String">
+            <Value>UGRD</Value>
+        </Attribute>
+        <Attribute name="missing_value" type="Float32">
+            <Value>NaN</Value>
+        </Attribute>
+        <Attribute name="grid_mapping" type="String">
+            <Value>LatLon_Projection</Value>
+        </Attribute>
+        <Attribute name="coordinates" type="String">
+            <Value>reftime time isobaric lat lon lat lon</Value>
+        </Attribute>
+        <Attribute name="Grib_Variable_Id" type="String">
+            <Value>VAR_0-2-2_L100</Value>
+        </Attribute>
+        <Attribute name="Grib2_Parameter" type="Int32">
+            <Value>0</Value>
+            <Value>2</Value>
+            <Value>2</Value>
+        </Attribute>
+        <Attribute name="Grib2_Parameter_Category" type="String">
+            <Value>Momentum</Value>
+        </Attribute>
+        <Attribute name="Grib2_Parameter_Name" type="String">
+            <Value>u-component of wind</Value>
+        </Attribute>
+        <Attribute name="Grib2_Level_Type" type="String">
+            <Value>Isobaric surface</Value>
+        </Attribute>
+        <Attribute name="Grib2_Generating_Process_Type" type="String">
+            <Value>Forecast</Value>
+        </Attribute>
+        <Map name="/time"/>
+        <Map name="/isobaric"/>
+        <Map name="/lat"/>
+        <Map name="/lon"/>
+    </Float32>
+    <Float64 name="reftime">
+        <Dim name="/time"/>
+        <Attribute name="standard_name" type="String">
+            <Value>forecast_reference_time</Value>
+        </Attribute>
+        <Attribute name="long_name" type="String">
+            <Value>GRIB reference time</Value>
+        </Attribute>
+        <Attribute name="calendar" type="String">
+            <Value>proleptic_gregorian</Value>
+        </Attribute>
+        <Attribute name="units" type="String">
+            <Value>Hour since 2016-06-17T00:00:00Z</Value>
+        </Attribute>
+        <Attribute name="_CoordinateAxisType" type="String">
+            <Value>RunTime</Value>
+        </Attribute>
+        <Map name="/time"/>
+    </Float64>
+    <Float64 name="time">
+        <Dim name="/time"/>
+        <Attribute name="units" type="String">
+            <Value>Hour since 2016-06-17T00:00:00Z</Value>
+        </Attribute>
+        <Attribute name="standard_name" type="String">
+            <Value>time</Value>
+        </Attribute>
+        <Attribute name="long_name" type="String">
+            <Value>GRIB forecast or observation time</Value>
+        </Attribute>
+        <Attribute name="calendar" type="String">
+            <Value>proleptic_gregorian</Value>
+        </Attribute>
+        <Attribute name="_CoordinateAxisType" type="String">
+            <Value>Time</Value>
+        </Attribute>
+    </Float64>
+    <Float32 name="isobaric">
+        <Dim name="/isobaric"/>
+        <Attribute name="units" type="String">
+            <Value>Pa</Value>
+        </Attribute>
+        <Attribute name="long_name" type="String">
+            <Value>Isobaric surface</Value>
+        </Attribute>
+        <Attribute name="positive" type="String">
+            <Value>down</Value>
+        </Attribute>
+        <Attribute name="Grib_level_type" type="Int32">
+            <Value>100</Value>
+        </Attribute>
+        <Attribute name="_CoordinateAxisType" type="String">
+            <Value>Pressure</Value>
+        </Attribute>
+        <Attribute name="_CoordinateZisPositive" type="String">
+            <Value>down</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="lat">
+        <Dim name="/lat"/>
+        <Attribute name="units" type="String">
+            <Value>degrees_north</Value>
+        </Attribute>
+        <Attribute name="_CoordinateAxisType" type="String">
+            <Value>Lat</Value>
+        </Attribute>
+        <Attribute name="standard_name" type="String">
+            <Value>latitude</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="lon">
+        <Dim name="/lon"/>
+        <Attribute name="units" type="String">
+            <Value>degrees_east</Value>
+        </Attribute>
+        <Attribute name="_CoordinateAxisType" type="String">
+            <Value>Lon</Value>
+        </Attribute>
+        <Attribute name="standard_name" type="String">
+            <Value>longitude</Value>
+        </Attribute>
+    </Float32>
+    <Float32 name="v-component_of_wind_isobaric">
+        <Dim name="/time"/>
+        <Dim name="/isobaric"/>
+        <Dim name="/lat"/>
+        <Dim name="/lon"/>
+        <Attribute name="long_name" type="String">
+            <Value>v-component of wind @ Isobaric surface</Value>
+        </Attribute>
+        <Attribute name="units" type="String">
+            <Value>m/s</Value>
+        </Attribute>
+        <Attribute name="abbreviation" type="String">
+            <Value>VGRD</Value>
+        </Attribute>
+        <Attribute name="missing_value" type="Float32">
+            <Value>NaN</Value>
+        </Attribute>
+        <Attribute name="grid_mapping" type="String">
+            <Value>LatLon_Projection</Value>
+        </Attribute>
+        <Attribute name="coordinates" type="String">
+            <Value>reftime time isobaric lat lon lat lon</Value>
+        </Attribute>
+        <Attribute name="Grib_Variable_Id" type="String">
+            <Value>VAR_0-2-3_L100</Value>
+        </Attribute>
+        <Attribute name="Grib2_Parameter" type="Int32">
+            <Value>0</Value>
+            <Value>2</Value>
+            <Value>3</Value>
+        </Attribute>
+        <Attribute name="Grib2_Parameter_Category" type="String">
+            <Value>Momentum</Value>
+        </Attribute>
+        <Attribute name="Grib2_Parameter_Name" type="String">
+            <Value>v-component of wind</Value>
+        </Attribute>
+        <Attribute name="Grib2_Level_Type" type="String">
+            <Value>Isobaric surface</Value>
+        </Attribute>
+        <Attribute name="Grib2_Generating_Process_Type" type="String">
+            <Value>Forecast</Value>
+        </Attribute>
+        <Map name="/time"/>
+        <Map name="/isobaric"/>
+        <Map name="/lat"/>
+        <Map name="/lon"/>
+    </Float32>
+    <Attribute name="NC_GLOBAL" type="Container">
+        <Attribute name="Originating_or_generating_Center" type="String">
+            <Value>US National Weather Service, National Centres for Environmental Prediction (NCEP)</Value>
+        </Attribute>
+        <Attribute name="Originating_or_generating_Subcenter" type="String">
+            <Value>0</Value>
+        </Attribute>
+        <Attribute name="GRIB_table_version" type="String">
+            <Value>2,1</Value>
+        </Attribute>
+        <Attribute name="Type_of_generating_process" type="String">
+            <Value>Forecast</Value>
+        </Attribute>
+        <Attribute name="Analysis_or_forecast_generating_process_identifier_defined_by_originating_centre" type="String">
+            <Value>Analysis from GFS (Global Forecast System)</Value>
+        </Attribute>
+        <Attribute name="Conventions" type="String">
+            <Value>CF-1.6</Value>
+        </Attribute>
+        <Attribute name="history" type="String">
+            <Value>Read using CDM IOSP GribCollection v3</Value>
+        </Attribute>
+        <Attribute name="featureType" type="String">
+            <Value>GRID</Value>
+        </Attribute>
+        <Attribute name="History" type="String">
+            <Value>Translated to CF-1.0 Conventions by Netcdf-Java CDM (CFGridWriter2)\012Original Dataset = /data/ldm/pub/native/grid/NCEP/GFS/Global_0p25deg/GFS-Global_0p25deg.ncx3; Translation Date = 2016-06-20T21:22:16.485Z</Value>
+        </Attribute>
+        <Attribute name="geospatial_lat_min" type="Float64">
+            <Value>-90.00000000000000</Value>
+        </Attribute>
+        <Attribute name="geospatial_lat_max" type="Float64">
+            <Value>90.00000000000000</Value>
+        </Attribute>
+        <Attribute name="geospatial_lon_min" type="Float64">
+            <Value>0.000000000000000</Value>
+        </Attribute>
+        <Attribute name="geospatial_lon_max" type="Float64">
+            <Value>359.5000000000000</Value>
+        </Attribute>
+    </Attribute>
+</Dataset>
+
diff --git a/tests/dmr-testsuite/little-endian/test_array_1.xml.1.func_base b/tests/dmr-testsuite/little-endian/test_array_1.xml.1.func_base
new file mode 100644
index 0000000..7d4706a
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_1.xml.1.func_base
@@ -0,0 +1,20 @@
+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_1.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_1">
+    <Int32 name="x">
+        <Dim size="5"/>
+    </Int32>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="function_results">
+    <Float64 name="x">
+        <Dim size="5"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>09dc38cc</Value>
+        </Attribute>
+    </Float64>
+</Dataset>
+
+The data:
+{ {123456789, 123456789, 123456789, 123456789, 123456789} }
diff --git a/tests/dmr-testsuite/little-endian/test_array_1.xml.2.func_base b/tests/dmr-testsuite/little-endian/test_array_1.xml.2.func_base
new file mode 100644
index 0000000..f287f4c
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_1.xml.2.func_base
@@ -0,0 +1,20 @@
+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_1.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_1">
+    <Int32 name="x">
+        <Dim size="5"/>
+    </Int32>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="function_results">
+    <Float64 name="x">
+        <Dim size="5"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>098e5a83</Value>
+        </Attribute>
+    </Float64>
+</Dataset>
+
+The data:
+{ {1234567890, 1234567890, 1234567890, 1234567890, 1234567890} }
diff --git a/tests/dmr-testsuite/little-endian/test_array_1.xml.3.func_base b/tests/dmr-testsuite/little-endian/test_array_1.xml.3.func_base
new file mode 100644
index 0000000..107ddcf
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_1.xml.3.func_base
@@ -0,0 +1,20 @@
+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_1.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_1">
+    <Int32 name="x">
+        <Dim size="5"/>
+    </Int32>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="function_results">
+    <Float64 name="x">
+        <Dim size="5"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>ed282162</Value>
+        </Attribute>
+    </Float64>
+</Dataset>
+
+The data:
+{ {-1234567890, -1234567890, -1234567890, -1234567890, -1234567890} }
diff --git a/tests/dmr-testsuite/little-endian/test_array_1.xml.4.func_base b/tests/dmr-testsuite/little-endian/test_array_1.xml.4.func_base
new file mode 100644
index 0000000..c342554
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_1.xml.4.func_base
@@ -0,0 +1,20 @@
+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_1.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_1">
+    <Int32 name="x">
+        <Dim size="5"/>
+    </Int32>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="function_results">
+    <Float64 name="x">
+        <Dim size="5"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>73c874c1</Value>
+        </Attribute>
+    </Float64>
+</Dataset>
+
+The data:
+{ {123456.789, 123456.789, 123456.789, 123456.789, 123456.789} }
diff --git a/tests/dmr-testsuite/little-endian/test_array_1.xml.5.func_base b/tests/dmr-testsuite/little-endian/test_array_1.xml.5.func_base
new file mode 100644
index 0000000..2eeef51
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_1.xml.5.func_base
@@ -0,0 +1,20 @@
+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_1.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_1">
+    <Int32 name="x">
+        <Dim size="5"/>
+    </Int32>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="function_results">
+    <Float64 name="x">
+        <Dim size="5"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>976e0f20</Value>
+        </Attribute>
+    </Float64>
+</Dataset>
+
+The data:
+{ {-123456.789, -123456.789, -123456.789, -123456.789, -123456.789} }
diff --git a/tests/dmr-testsuite/little-endian/test_array_1.xml.6.func_base b/tests/dmr-testsuite/little-endian/test_array_1.xml.6.func_base
new file mode 100644
index 0000000..c1e4d4c
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_1.xml.6.func_base
@@ -0,0 +1,20 @@
+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_1.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_1">
+    <Int32 name="x">
+        <Dim size="5"/>
+    </Int32>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="function_results">
+    <Float64 name="x">
+        <Dim size="5"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>cc090e5b</Value>
+        </Attribute>
+    </Float64>
+</Dataset>
+
+The data:
+{ {1.13868789542248e+27, 1.13868789542248e+27, 1.13868789542248e+27, 1.13868789542248e+27, 1.13868789542248e+27} }
diff --git a/tests/dmr-testsuite/little-endian/test_array_1.xml.7.func_base b/tests/dmr-testsuite/little-endian/test_array_1.xml.7.func_base
new file mode 100644
index 0000000..ef377ad
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_1.xml.7.func_base
@@ -0,0 +1,20 @@
+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_1.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_1">
+    <Int32 name="x">
+        <Dim size="5"/>
+    </Int32>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="function_results">
+    <Float64 name="x">
+        <Dim size="5"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>cb1dffcf</Value>
+        </Attribute>
+    </Float64>
+</Dataset>
+
+The data:
+{ {1.28102388235029e+27, 1.28102388235029e+27, 1.28102388235029e+27, 1.28102388235029e+27, 1.28102388235029e+27} }
diff --git a/tests/dmr-testsuite/little-endian/test_array_1.xml.intern_base b/tests/dmr-testsuite/little-endian/test_array_1.xml.intern_base
new file mode 100644
index 0000000..03726e5
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_1.xml.intern_base
@@ -0,0 +1,17 @@
+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_1.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_1">
+    <Int32 name="x">
+        <Dim size="5"/>
+    </Int32>
+</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_1.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_1">
+    <Int32 name="x">
+        <Dim size="5"/>
+    </Int32>
+</Dataset>
+
+The data:
+{ {123456789, 123456789, 123456789, 123456789, 123456789} }
diff --git a/tests/dmr-testsuite/little-endian/test_array_1.xml.trans_base b/tests/dmr-testsuite/little-endian/test_array_1.xml.trans_base
new file mode 100644
index 0000000..3e3534c
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_1.xml.trans_base
@@ -0,0 +1,20 @@
+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_1.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_1">
+    <Int32 name="x">
+        <Dim size="5"/>
+    </Int32>
+</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_1.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_1">
+    <Int32 name="x">
+        <Dim size="5"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>33fc3688</Value>
+        </Attribute>
+    </Int32>
+</Dataset>
+
+The data:
+{ {123456789, 123456789, 123456789, 123456789, 123456789} }
diff --git a/tests/dmr-testsuite/little-endian/test_array_10.xml.intern_base b/tests/dmr-testsuite/little-endian/test_array_10.xml.intern_base
new file mode 100644
index 0000000..cb3703f
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_10.xml.intern_base
@@ -0,0 +1,29 @@
+Parse successful
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:test_simple_11.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_11">
+    <Dimension name="d1" size="5"/>
+    <Dimension name="d2" size="3"/>
+    <Opaque name="o">
+        <Dim name="/d1"/>
+    </Opaque>
+    <Opaque name="p">
+        <Dim name="/d1"/>
+        <Dim name="/d2"/>
+    </Opaque>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:test_simple_11.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_11">
+    <Dimension name="d1" size="5"/>
+    <Dimension name="d2" size="3"/>
+    <Opaque name="o">
+        <Dim name="/d1"/>
+    </Opaque>
+    <Opaque name="p">
+        <Dim name="/d1"/>
+        <Dim name="/d2"/>
+    </Opaque>
+</Dataset>
+
+The data:
+{ {1,2,3,4,5, 1,2,3,4,5, 1,2,3,4,5, 1,2,3,4,5, 1,2,3,4,5}, {{1,2,3,4,5, 1,2,3,4,5, 1,2,3,4,5},{1,2,3,4,5, 1,2,3,4,5, 1,2,3,4,5},{1,2,3,4,5, 1,2,3,4,5, 1,2,3,4,5},{1,2,3,4,5, 1,2,3,4,5, 1,2,3,4,5},{1,2,3,4,5, 1,2,3,4,5, 1,2,3,4,5}} }
diff --git a/tests/dmr-testsuite/little-endian/test_array_10.xml.trans_base b/tests/dmr-testsuite/little-endian/test_array_10.xml.trans_base
new file mode 100644
index 0000000..cbd7697
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_10.xml.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:test_simple_11.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_11">
+    <Dimension name="d1" size="5"/>
+    <Dimension name="d2" size="3"/>
+    <Opaque name="o">
+        <Dim name="/d1"/>
+    </Opaque>
+    <Opaque name="p">
+        <Dim name="/d1"/>
+        <Dim name="/d2"/>
+    </Opaque>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:test_simple_11.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_11">
+    <Dimension name="d1" size="5"/>
+    <Dimension name="d2" size="3"/>
+    <Opaque name="o">
+        <Dim name="/d1"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>3d021e3e</Value>
+        </Attribute>
+    </Opaque>
+    <Opaque name="p">
+        <Dim name="/d1"/>
+        <Dim name="/d2"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>c9ba1dbe</Value>
+        </Attribute>
+    </Opaque>
+</Dataset>
+
+The data:
+{ {1,2,3,4,5, 1,2,3,4,5, 1,2,3,4,5, 1,2,3,4,5, 1,2,3,4,5}, {{1,2,3,4,5, 1,2,3,4,5, 1,2,3,4,5},{1,2,3,4,5, 1,2,3,4,5, 1,2,3,4,5},{1,2,3,4,5, 1,2,3,4,5, 1,2,3,4,5},{1,2,3,4,5, 1,2,3,4,5, 1,2,3,4,5},{1,2,3,4,5, 1,2,3,4,5, 1,2,3,4,5}} }
diff --git a/tests/dmr-testsuite/little-endian/test_array_11.xml.intern_base b/tests/dmr-testsuite/little-endian/test_array_11.xml.intern_base
new file mode 100644
index 0000000..19701dd
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_11.xml.intern_base
@@ -0,0 +1,39 @@
+Parse successful
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:test_simple_11.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_11">
+    <Dimension name="d1" size="5"/>
+    <Dimension name="d2" size="3"/>
+    <Enumeration name="colors" basetype="Byte">
+        <EnumConst name="red" value="1"/>
+        <EnumConst name="green" value="2"/>
+        <EnumConst name="blue" value="3"/>
+    </Enumeration>
+    <Enum name="e1" enum="/colors">
+        <Dim name="/d1"/>
+    </Enum>
+    <Enum name="e2" enum="/colors">
+        <Dim name="/d1"/>
+        <Dim name="/d2"/>
+    </Enum>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:test_simple_11.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_11">
+    <Dimension name="d1" size="5"/>
+    <Dimension name="d2" size="3"/>
+    <Enumeration name="colors" basetype="Byte">
+        <EnumConst name="red" value="1"/>
+        <EnumConst name="green" value="2"/>
+        <EnumConst name="blue" value="3"/>
+    </Enumeration>
+    <Enum name="e1" enum="/colors">
+        <Dim name="/d1"/>
+    </Enum>
+    <Enum name="e2" enum="/colors">
+        <Dim name="/d1"/>
+        <Dim name="/d2"/>
+    </Enum>
+</Dataset>
+
+The data:
+{ {1, 1, 1, 1, 1}, {{1, 1, 1},{1, 1, 1},{1, 1, 1},{1, 1, 1},{1, 1, 1}} }
diff --git a/tests/dmr-testsuite/little-endian/test_array_11.xml.trans_base b/tests/dmr-testsuite/little-endian/test_array_11.xml.trans_base
new file mode 100644
index 0000000..0e3f36e
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_11.xml.trans_base
@@ -0,0 +1,45 @@
+Parse successful
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:test_simple_11.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_11">
+    <Dimension name="d1" size="5"/>
+    <Dimension name="d2" size="3"/>
+    <Enumeration name="colors" basetype="Byte">
+        <EnumConst name="red" value="1"/>
+        <EnumConst name="green" value="2"/>
+        <EnumConst name="blue" value="3"/>
+    </Enumeration>
+    <Enum name="e1" enum="/colors">
+        <Dim name="/d1"/>
+    </Enum>
+    <Enum name="e2" enum="/colors">
+        <Dim name="/d1"/>
+        <Dim name="/d2"/>
+    </Enum>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:test_simple_11.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_11">
+    <Dimension name="d1" size="5"/>
+    <Dimension name="d2" size="3"/>
+    <Enumeration name="colors" basetype="Byte">
+        <EnumConst name="red" value="1"/>
+        <EnumConst name="green" value="2"/>
+        <EnumConst name="blue" value="3"/>
+    </Enumeration>
+    <Enum name="e1" enum="/colors">
+        <Dim name="/d1"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>2c20d228</Value>
+        </Attribute>
+    </Enum>
+    <Enum name="e2" enum="/colors">
+        <Dim name="/d1"/>
+        <Dim name="/d2"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>c7a0f194</Value>
+        </Attribute>
+    </Enum>
+</Dataset>
+
+The data:
+{ {1, 1, 1, 1, 1}, {{1, 1, 1},{1, 1, 1},{1, 1, 1},{1, 1, 1},{1, 1, 1}} }
diff --git a/tests/dmr-testsuite/little-endian/test_array_12.xml.intern_base b/tests/dmr-testsuite/little-endian/test_array_12.xml.intern_base
new file mode 100644
index 0000000..c83cac0
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_12.xml.intern_base
@@ -0,0 +1,23 @@
+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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
+    <Int32 name="i">
+        <Dim size="5"/>
+    </Int32>
+    <Int32 name="x">
+        <Dim size="0"/>
+    </Int32>
+</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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
+    <Int32 name="i">
+        <Dim size="5"/>
+    </Int32>
+    <Int32 name="x">
+        <Dim size="0"/>
+    </Int32>
+</Dataset>
+
+The data:
+{ {123456789, 123456789, 123456789, 123456789, 123456789}, {} }
diff --git a/tests/dmr-testsuite/little-endian/test_array_12.xml.trans_base b/tests/dmr-testsuite/little-endian/test_array_12.xml.trans_base
new file mode 100644
index 0000000..6b8832b
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_12.xml.trans_base
@@ -0,0 +1,29 @@
+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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
+    <Int32 name="i">
+        <Dim size="5"/>
+    </Int32>
+    <Int32 name="x">
+        <Dim size="0"/>
+    </Int32>
+</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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
+    <Int32 name="i">
+        <Dim size="5"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>33fc3688</Value>
+        </Attribute>
+    </Int32>
+    <Int32 name="x">
+        <Dim size="0"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>00000000</Value>
+        </Attribute>
+    </Int32>
+</Dataset>
+
+The data:
+{ {123456789, 123456789, 123456789, 123456789, 123456789}, {} }
diff --git a/tests/dmr-testsuite/little-endian/test_array_13.xml.intern_base b/tests/dmr-testsuite/little-endian/test_array_13.xml.intern_base
new file mode 100644
index 0000000..4dde012
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_13.xml.intern_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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
+    <Int32 name="i">
+        <Dim size="5"/>
+    </Int32>
+    <Int32 name="x">
+        <Dim size="4"/>
+        <Dim size="0"/>
+    </Int32>
+</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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
+    <Int32 name="i">
+        <Dim size="5"/>
+    </Int32>
+    <Int32 name="x">
+        <Dim size="4"/>
+        <Dim size="0"/>
+    </Int32>
+</Dataset>
+
+The data:
+{ {123456789, 123456789, 123456789, 123456789, 123456789}, {{},{},{},{}} }
diff --git a/tests/dmr-testsuite/little-endian/test_array_13.xml.trans_base b/tests/dmr-testsuite/little-endian/test_array_13.xml.trans_base
new file mode 100644
index 0000000..2fd171a
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_13.xml.trans_base
@@ -0,0 +1,31 @@
+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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
+    <Int32 name="i">
+        <Dim size="5"/>
+    </Int32>
+    <Int32 name="x">
+        <Dim size="4"/>
+        <Dim size="0"/>
+    </Int32>
+</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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
+    <Int32 name="i">
+        <Dim size="5"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>33fc3688</Value>
+        </Attribute>
+    </Int32>
+    <Int32 name="x">
+        <Dim size="4"/>
+        <Dim size="0"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>00000000</Value>
+        </Attribute>
+    </Int32>
+</Dataset>
+
+The data:
+{ {123456789, 123456789, 123456789, 123456789, 123456789}, {{},{},{},{}} }
diff --git a/tests/dmr-testsuite/little-endian/test_array_14.xml.intern_base b/tests/dmr-testsuite/little-endian/test_array_14.xml.intern_base
new file mode 100644
index 0000000..99eeb81
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_14.xml.intern_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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
+    <Int32 name="i">
+        <Dim size="5"/>
+    </Int32>
+    <Int32 name="x">
+        <Dim size="0"/>
+        <Dim size="4"/>
+    </Int32>
+</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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
+    <Int32 name="i">
+        <Dim size="5"/>
+    </Int32>
+    <Int32 name="x">
+        <Dim size="0"/>
+        <Dim size="4"/>
+    </Int32>
+</Dataset>
+
+The data:
+{ {123456789, 123456789, 123456789, 123456789, 123456789}, {} }
diff --git a/tests/dmr-testsuite/little-endian/test_array_14.xml.trans_base b/tests/dmr-testsuite/little-endian/test_array_14.xml.trans_base
new file mode 100644
index 0000000..12a8352
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_14.xml.trans_base
@@ -0,0 +1,31 @@
+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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
+    <Int32 name="i">
+        <Dim size="5"/>
+    </Int32>
+    <Int32 name="x">
+        <Dim size="0"/>
+        <Dim size="4"/>
+    </Int32>
+</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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
+    <Int32 name="i">
+        <Dim size="5"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>33fc3688</Value>
+        </Attribute>
+    </Int32>
+    <Int32 name="x">
+        <Dim size="0"/>
+        <Dim size="4"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>00000000</Value>
+        </Attribute>
+    </Int32>
+</Dataset>
+
+The data:
+{ {123456789, 123456789, 123456789, 123456789, 123456789}, {} }
diff --git a/tests/dmr-testsuite/little-endian/test_array_2.xml.intern_base b/tests/dmr-testsuite/little-endian/test_array_2.xml.intern_base
new file mode 100644
index 0000000..363c92b
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_2.xml.intern_base
@@ -0,0 +1,19 @@
+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_2.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_2">
+    <Int32 name="x">
+        <Dim size="5"/>
+        <Dim size="4"/>
+    </Int32>
+</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_2.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_2">
+    <Int32 name="x">
+        <Dim size="5"/>
+        <Dim size="4"/>
+    </Int32>
+</Dataset>
+
+The data:
+{ {{123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789}} }
diff --git a/tests/dmr-testsuite/little-endian/test_array_2.xml.trans_base b/tests/dmr-testsuite/little-endian/test_array_2.xml.trans_base
new file mode 100644
index 0000000..7e3c295
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_2.xml.trans_base
@@ -0,0 +1,22 @@
+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_2.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_2">
+    <Int32 name="x">
+        <Dim size="5"/>
+        <Dim size="4"/>
+    </Int32>
+</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_2.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_2">
+    <Int32 name="x">
+        <Dim size="5"/>
+        <Dim size="4"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>972f55fc</Value>
+        </Attribute>
+    </Int32>
+</Dataset>
+
+The data:
+{ {{123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789}} }
diff --git a/tests/dmr-testsuite/little-endian/test_array_3.1.dmr.1.trans_base b/tests/dmr-testsuite/little-endian/test_array_3.1.dmr.1.trans_base
new file mode 100644
index 0000000..5a391f2
--- /dev/null
+++ b/tests/dmr-testsuite/little-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>61dd25db</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/little-endian/test_array_3.1.dmr.2.trans_base b/tests/dmr-testsuite/little-endian/test_array_3.1.dmr.2.trans_base
new file mode 100644
index 0000000..90e228f
--- /dev/null
+++ b/tests/dmr-testsuite/little-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/little-endian/test_array_3.1.dmr.3.trans_base b/tests/dmr-testsuite/little-endian/test_array_3.1.dmr.3.trans_base
new file mode 100644
index 0000000..80ade42
--- /dev/null
+++ b/tests/dmr-testsuite/little-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/little-endian/test_array_3.1.dmr.4.trans_base b/tests/dmr-testsuite/little-endian/test_array_3.1.dmr.4.trans_base
new file mode 100644
index 0000000..80ade42
--- /dev/null
+++ b/tests/dmr-testsuite/little-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/little-endian/test_array_3.1.dmr.5.trans_base b/tests/dmr-testsuite/little-endian/test_array_3.1.dmr.5.trans_base
new file mode 100644
index 0000000..8943261
--- /dev/null
+++ b/tests/dmr-testsuite/little-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/little-endian/test_array_3.xml.intern_base b/tests/dmr-testsuite/little-endian/test_array_3.xml.intern_base
new file mode 100644
index 0000000..aa16004
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_3.xml.intern_base
@@ -0,0 +1,21 @@
+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"/>
+    <String name="x">
+        <Dim name="/row"/>
+        <Dim size="3"/>
+    </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"/>
+        <Dim size="3"/>
+    </String>
+</Dataset>
+
+The data:
+{ {{"Silly test string: 1", "Silly test string: 1", "Silly test string: 1"},{"Silly test string: 1", "Silly test string: 1", "Silly test string: 1"},{"Silly test string: 1", "Silly test string: 1", "Silly test string: 1"},{"Silly test string: 1", "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/little-endian/test_array_3.xml.trans_base b/tests/dmr-testsuite/little-endian/test_array_3.xml.trans_base
new file mode 100644
index 0000000..99e0353
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_3.xml.trans_base
@@ -0,0 +1,24 @@
+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"/>
+    <String name="x">
+        <Dim name="/row"/>
+        <Dim size="3"/>
+    </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"/>
+        <Dim size="3"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>22983e08</Value>
+        </Attribute>
+    </String>
+</Dataset>
+
+The data:
+{ {{"Silly test string: 1", "Silly test string: 1", "Silly test string: 1"},{"Silly test string: 1", "Silly test string: 1", "Silly test string: 1"},{"Silly test string: 1", "Silly test string: 1", "Silly test string: 1"},{"Silly test string: 1", "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/little-endian/test_array_4.xml.1.trans_base b/tests/dmr-testsuite/little-endian/test_array_4.xml.1.trans_base
new file mode 100644
index 0000000..990f794
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_4.xml.1.trans_base
@@ -0,0 +1,66 @@
+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_4.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_4">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Byte name="a">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Byte>
+    <Int16 name="b">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int16>
+    <Int32 name="c">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int32>
+    <UInt16 name="d">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt16>
+    <UInt32 name="e">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt32>
+    <Float32 name="f">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Float32>
+    <Float64 name="g">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Float64>
+    <String name="h">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </String>
+    <URL name="i">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </URL>
+    <Int32 name="x">
+        <Dim name="/row"/>
+        <Dim size="5"/>
+    </Int32>
+    <Int32 name="y">
+        <Dim size="5"/>
+        <Dim name="/col"/>
+    </Int32>
+</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_4.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_4">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Byte name="a">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>bb99ff8a</Value>
+        </Attribute>
+    </Byte>
+</Dataset>
+
+The data:
+{ {{255, 255, 255, 255},{255, 255, 255, 255},{255, 255, 255, 255}} }
diff --git a/tests/dmr-testsuite/little-endian/test_array_4.xml.2.trans_base b/tests/dmr-testsuite/little-endian/test_array_4.xml.2.trans_base
new file mode 100644
index 0000000..990f794
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_4.xml.2.trans_base
@@ -0,0 +1,66 @@
+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_4.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_4">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Byte name="a">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Byte>
+    <Int16 name="b">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int16>
+    <Int32 name="c">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int32>
+    <UInt16 name="d">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt16>
+    <UInt32 name="e">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt32>
+    <Float32 name="f">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Float32>
+    <Float64 name="g">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Float64>
+    <String name="h">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </String>
+    <URL name="i">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </URL>
+    <Int32 name="x">
+        <Dim name="/row"/>
+        <Dim size="5"/>
+    </Int32>
+    <Int32 name="y">
+        <Dim size="5"/>
+        <Dim name="/col"/>
+    </Int32>
+</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_4.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_4">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Byte name="a">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>bb99ff8a</Value>
+        </Attribute>
+    </Byte>
+</Dataset>
+
+The data:
+{ {{255, 255, 255, 255},{255, 255, 255, 255},{255, 255, 255, 255}} }
diff --git a/tests/dmr-testsuite/little-endian/test_array_4.xml.3.trans_base b/tests/dmr-testsuite/little-endian/test_array_4.xml.3.trans_base
new file mode 100644
index 0000000..f0815f0
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_4.xml.3.trans_base
@@ -0,0 +1,66 @@
+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_4.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_4">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Byte name="a">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Byte>
+    <Int16 name="b">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int16>
+    <Int32 name="c">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int32>
+    <UInt16 name="d">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt16>
+    <UInt32 name="e">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt32>
+    <Float32 name="f">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Float32>
+    <Float64 name="g">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Float64>
+    <String name="h">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </String>
+    <URL name="i">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </URL>
+    <Int32 name="x">
+        <Dim name="/row"/>
+        <Dim size="5"/>
+    </Int32>
+    <Int32 name="y">
+        <Dim size="5"/>
+        <Dim name="/col"/>
+    </Int32>
+</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_4.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_4">
+    <Dimension name="row" size="2"/>
+    <Dimension name="col" size="1"/>
+    <Byte name="a">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>ffff0000</Value>
+        </Attribute>
+    </Byte>
+</Dataset>
+
+The data:
+{ {{255},{255}} }
diff --git a/tests/dmr-testsuite/little-endian/test_array_4.xml.4.trans_base b/tests/dmr-testsuite/little-endian/test_array_4.xml.4.trans_base
new file mode 100644
index 0000000..f0815f0
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_4.xml.4.trans_base
@@ -0,0 +1,66 @@
+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_4.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_4">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Byte name="a">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Byte>
+    <Int16 name="b">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int16>
+    <Int32 name="c">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int32>
+    <UInt16 name="d">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt16>
+    <UInt32 name="e">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt32>
+    <Float32 name="f">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Float32>
+    <Float64 name="g">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Float64>
+    <String name="h">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </String>
+    <URL name="i">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </URL>
+    <Int32 name="x">
+        <Dim name="/row"/>
+        <Dim size="5"/>
+    </Int32>
+    <Int32 name="y">
+        <Dim size="5"/>
+        <Dim name="/col"/>
+    </Int32>
+</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_4.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_4">
+    <Dimension name="row" size="2"/>
+    <Dimension name="col" size="1"/>
+    <Byte name="a">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>ffff0000</Value>
+        </Attribute>
+    </Byte>
+</Dataset>
+
+The data:
+{ {{255},{255}} }
diff --git a/tests/dmr-testsuite/little-endian/test_array_4.xml.5.trans_base b/tests/dmr-testsuite/little-endian/test_array_4.xml.5.trans_base
new file mode 100644
index 0000000..21e7193
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_4.xml.5.trans_base
@@ -0,0 +1,80 @@
+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_4.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_4">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Byte name="a">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Byte>
+    <Int16 name="b">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int16>
+    <Int32 name="c">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int32>
+    <UInt16 name="d">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt16>
+    <UInt32 name="e">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt32>
+    <Float32 name="f">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Float32>
+    <Float64 name="g">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Float64>
+    <String name="h">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </String>
+    <URL name="i">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </URL>
+    <Int32 name="x">
+        <Dim name="/row"/>
+        <Dim size="5"/>
+    </Int32>
+    <Int32 name="y">
+        <Dim size="5"/>
+        <Dim name="/col"/>
+    </Int32>
+</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_4.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_4">
+    <Dimension name="row" size="2"/>
+    <Dimension name="col" size="1"/>
+    <Byte name="a">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>ffff0000</Value>
+        </Attribute>
+    </Byte>
+    <Int16 name="b">
+        <Dim size="1"/>
+        <Dim name="/col"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>6f6d1f7e</Value>
+        </Attribute>
+    </Int16>
+    <Int32 name="c">
+        <Dim size="3"/>
+        <Dim size="4"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>46997ac6</Value>
+        </Attribute>
+    </Int32>
+</Dataset>
+
+The data:
+{ {{255},{255}}, {{32000}}, {{123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789}} }
diff --git a/tests/dmr-testsuite/little-endian/test_array_4.xml.6.trans_base b/tests/dmr-testsuite/little-endian/test_array_4.xml.6.trans_base
new file mode 100644
index 0000000..8c45c5c
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_4.xml.6.trans_base
@@ -0,0 +1,65 @@
+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_4.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_4">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Byte name="a">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Byte>
+    <Int16 name="b">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int16>
+    <Int32 name="c">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int32>
+    <UInt16 name="d">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt16>
+    <UInt32 name="e">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt32>
+    <Float32 name="f">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Float32>
+    <Float64 name="g">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Float64>
+    <String name="h">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </String>
+    <URL name="i">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </URL>
+    <Int32 name="x">
+        <Dim name="/row"/>
+        <Dim size="5"/>
+    </Int32>
+    <Int32 name="y">
+        <Dim size="5"/>
+        <Dim name="/col"/>
+    </Int32>
+</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_4.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_4">
+    <Dimension name="row" size="3"/>
+    <Int32 name="x">
+        <Dim name="/row"/>
+        <Dim size="5"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>e787d509</Value>
+        </Attribute>
+    </Int32>
+</Dataset>
+
+The data:
+{ {{123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789}} }
diff --git a/tests/dmr-testsuite/little-endian/test_array_4.xml.7.trans_base b/tests/dmr-testsuite/little-endian/test_array_4.xml.7.trans_base
new file mode 100644
index 0000000..22a14a3
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_4.xml.7.trans_base
@@ -0,0 +1,65 @@
+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_4.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_4">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Byte name="a">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Byte>
+    <Int16 name="b">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int16>
+    <Int32 name="c">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int32>
+    <UInt16 name="d">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt16>
+    <UInt32 name="e">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt32>
+    <Float32 name="f">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Float32>
+    <Float64 name="g">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Float64>
+    <String name="h">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </String>
+    <URL name="i">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </URL>
+    <Int32 name="x">
+        <Dim name="/row"/>
+        <Dim size="5"/>
+    </Int32>
+    <Int32 name="y">
+        <Dim size="5"/>
+        <Dim name="/col"/>
+    </Int32>
+</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_4.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_4">
+    <Dimension name="row" size="2"/>
+    <Int32 name="x">
+        <Dim name="/row"/>
+        <Dim size="5"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>7c5e1ddb</Value>
+        </Attribute>
+    </Int32>
+</Dataset>
+
+The data:
+{ {{123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789}} }
diff --git a/tests/dmr-testsuite/little-endian/test_array_4.xml.8.trans_base b/tests/dmr-testsuite/little-endian/test_array_4.xml.8.trans_base
new file mode 100644
index 0000000..fe7b5fa
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_4.xml.8.trans_base
@@ -0,0 +1,64 @@
+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_4.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_4">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Byte name="a">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Byte>
+    <Int16 name="b">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int16>
+    <Int32 name="c">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int32>
+    <UInt16 name="d">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt16>
+    <UInt32 name="e">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt32>
+    <Float32 name="f">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Float32>
+    <Float64 name="g">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Float64>
+    <String name="h">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </String>
+    <URL name="i">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </URL>
+    <Int32 name="x">
+        <Dim name="/row"/>
+        <Dim size="5"/>
+    </Int32>
+    <Int32 name="y">
+        <Dim size="5"/>
+        <Dim name="/col"/>
+    </Int32>
+</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_4.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_4">
+    <Int32 name="c">
+        <Dim size="1"/>
+        <Dim size="2"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>114189cb</Value>
+        </Attribute>
+    </Int32>
+</Dataset>
+
+The data:
+{ {{123456789, 123456789}} }
diff --git a/tests/dmr-testsuite/little-endian/test_array_4.xml.intern_base b/tests/dmr-testsuite/little-endian/test_array_4.xml.intern_base
new file mode 100644
index 0000000..74583b3
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_4.xml.intern_base
@@ -0,0 +1,103 @@
+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_4.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_4">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Byte name="a">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Byte>
+    <Int16 name="b">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int16>
+    <Int32 name="c">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int32>
+    <UInt16 name="d">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt16>
+    <UInt32 name="e">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt32>
+    <Float32 name="f">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Float32>
+    <Float64 name="g">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Float64>
+    <String name="h">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </String>
+    <URL name="i">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </URL>
+    <Int32 name="x">
+        <Dim name="/row"/>
+        <Dim size="5"/>
+    </Int32>
+    <Int32 name="y">
+        <Dim size="5"/>
+        <Dim name="/col"/>
+    </Int32>
+</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_4.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_4">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Byte name="a">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Byte>
+    <Int16 name="b">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int16>
+    <Int32 name="c">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int32>
+    <UInt16 name="d">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt16>
+    <UInt32 name="e">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt32>
+    <Float32 name="f">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Float32>
+    <Float64 name="g">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Float64>
+    <String name="h">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </String>
+    <URL name="i">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </URL>
+    <Int32 name="x">
+        <Dim name="/row"/>
+        <Dim size="5"/>
+    </Int32>
+    <Int32 name="y">
+        <Dim size="5"/>
+        <Dim name="/col"/>
+    </Int32>
+</Dataset>
+
+The data:
+{ {{255, 255, 255, 255},{255, 255, 255, 255},{255, 255, 255, 255}}, {{32000, 32000, 32000, 32000},{32000, 32000, 32000, 32000},{32000, 32000, 32000, 32000}}, {{123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789}}, {{64000, 64000, 64000, 64000},{64000, 64000, 64000, 64000},{64000, 64000, 64000, 64000}}, {{4026531840, 4026531840, 4026531840, 4026531840},{4026531840, 4026531840, 4026531840, 4026531840},{4026531840, 4026531840, 4026531840, 4026531840}}, {{99.999, 99.999, 99.999, 99.999},{99.999, 99.999, 99.999, 99.999},{99.999, 99.999, 99.999, 99.999}}, {{99.999, 99.999, 99.999, 99.999},{99.999, 99.999, 99.999, 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", "Silly test string: 1", "Silly test string: 1", "Silly test string: 1"},{"Silly test string: 1", "Silly test string: 1", "Silly test string: 1", "Silly test string: 1"}}, {{"http://dcz.gso.uri.edu/avhrr-archive/archive.html", "http://dcz.gso.uri.edu/avhrr-archive/archive.html", "http://dcz.gso.uri.edu/avhrr-archive/archive.html", "http://dcz.gso.uri.edu/avhrr-archive/archive.html"},{"http://dcz.gso.uri.edu/avhrr-archive/archive.html", "http://dcz.gso.uri.edu/avhrr-archive/archive.html", "http://dcz.gso.uri.edu/avhrr-archive/archive.html", "http://dcz.gso.uri.edu/avhrr-archive/archive.html"},{"http://dcz.gso.uri.edu/avhrr-archive/archive.html", "http://dcz.gso.uri.edu/avhrr-archive/archive.html", "http://dcz.gso.uri.edu/avhrr-archive/archive.html", "http://dcz.gso.uri.edu/avhrr-archive/archive.html"}}, {{123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789}}, {{123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789}} }
diff --git a/tests/dmr-testsuite/little-endian/test_array_4.xml.trans_base b/tests/dmr-testsuite/little-endian/test_array_4.xml.trans_base
new file mode 100644
index 0000000..6ac8b35
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_4.xml.trans_base
@@ -0,0 +1,136 @@
+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_4.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_4">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Byte name="a">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Byte>
+    <Int16 name="b">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int16>
+    <Int32 name="c">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int32>
+    <UInt16 name="d">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt16>
+    <UInt32 name="e">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt32>
+    <Float32 name="f">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Float32>
+    <Float64 name="g">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Float64>
+    <String name="h">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </String>
+    <URL name="i">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </URL>
+    <Int32 name="x">
+        <Dim name="/row"/>
+        <Dim size="5"/>
+    </Int32>
+    <Int32 name="y">
+        <Dim size="5"/>
+        <Dim name="/col"/>
+    </Int32>
+</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_4.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_4">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Byte name="a">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>bb99ff8a</Value>
+        </Attribute>
+    </Byte>
+    <Int16 name="b">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>4a491560</Value>
+        </Attribute>
+    </Int16>
+    <Int32 name="c">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>46997ac6</Value>
+        </Attribute>
+    </Int32>
+    <UInt16 name="d">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>aba172e1</Value>
+        </Attribute>
+    </UInt16>
+    <UInt32 name="e">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>6dee122e</Value>
+        </Attribute>
+    </UInt32>
+    <Float32 name="f">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>03d5492a</Value>
+        </Attribute>
+    </Float32>
+    <Float64 name="g">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>d6764865</Value>
+        </Attribute>
+    </Float64>
+    <String name="h">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>2004aea7</Value>
+        </Attribute>
+    </String>
+    <URL name="i">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>546a7c3d</Value>
+        </Attribute>
+    </URL>
+    <Int32 name="x">
+        <Dim name="/row"/>
+        <Dim size="5"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>e787d509</Value>
+        </Attribute>
+    </Int32>
+    <Int32 name="y">
+        <Dim size="5"/>
+        <Dim name="/col"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>972f55fc</Value>
+        </Attribute>
+    </Int32>
+</Dataset>
+
+The data:
+{ {{255, 255, 255, 255},{255, 255, 255, 255},{255, 255, 255, 255}}, {{32000, 32000, 32000, 32000},{32000, 32000, 32000, 32000},{32000, 32000, 32000, 32000}}, {{123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789}}, {{64000, 64000, 64000, 64000},{64000, 64000, 64000, 64000},{64000, 64000, 64000, 64000}}, {{4026531840, 4026531840, 4026531840, 4026531840},{4026531840, 4026531840, 4026531840, 4026531840},{4026531840, 4026531840, 4026531840, 4026531840}}, {{99.999, 99.999, 99.999, 99.999},{99.999, 99.999, 99.999, 99.999},{99.999, 99.999, 99.999, 99.999}}, {{99.999, 99.999, 99.999, 99.999},{99.999, 99.999, 99.999, 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", "Silly test string: 1", "Silly test string: 1", "Silly test string: 1"},{"Silly test string: 1", "Silly test string: 1", "Silly test string: 1", "Silly test string: 1"}}, {{"http://dcz.gso.uri.edu/avhrr-archive/archive.html", "http://dcz.gso.uri.edu/avhrr-archive/archive.html", "http://dcz.gso.uri.edu/avhrr-archive/archive.html", "http://dcz.gso.uri.edu/avhrr-archive/archive.html"},{"http://dcz.gso.uri.edu/avhrr-archive/archive.html", "http://dcz.gso.uri.edu/avhrr-archive/archive.html", "http://dcz.gso.uri.edu/avhrr-archive/archive.html", "http://dcz.gso.uri.edu/avhrr-archive/archive.html"},{"http://dcz.gso.uri.edu/avhrr-archive/archive.html", "http://dcz.gso.uri.edu/avhrr-archive/archive.html", "http://dcz.gso.uri.edu/avhrr-archive/archive.html", "http://dcz.gso.uri.edu/avhrr-archive/archive.html"}}, {{123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789}}, {{123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789}} }
diff --git a/tests/dmr-testsuite/little-endian/test_array_5.xml.1.func_base b/tests/dmr-testsuite/little-endian/test_array_5.xml.1.func_base
new file mode 100644
index 0000000..969a094
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_5.xml.1.func_base
@@ -0,0 +1,38 @@
+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_5.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_5">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Int8 name="a">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int8>
+    <UInt8 name="b">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt8>
+    <Int64 name="c">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int64>
+    <UInt64 name="d">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt64>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="function_results">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Float64 name="a">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>f02c5eb0</Value>
+        </Attribute>
+    </Float64>
+</Dataset>
+
+The data:
+{ {{0.127, 0.127, 0.127, 0.127},{0.127, 0.127, 0.127, 0.127},{0.127, 0.127, 0.127, 0.127}} }
diff --git a/tests/dmr-testsuite/little-endian/test_array_5.xml.2.func_base b/tests/dmr-testsuite/little-endian/test_array_5.xml.2.func_base
new file mode 100644
index 0000000..6e59a3b
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_5.xml.2.func_base
@@ -0,0 +1,38 @@
+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_5.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_5">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Int8 name="a">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int8>
+    <UInt8 name="b">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt8>
+    <Int64 name="c">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int64>
+    <UInt64 name="d">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt64>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="function_results">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Float64 name="b">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>f3c062d7</Value>
+        </Attribute>
+    </Float64>
+</Dataset>
+
+The data:
+{ {{0.255, 0.255, 0.255, 0.255},{0.255, 0.255, 0.255, 0.255},{0.255, 0.255, 0.255, 0.255}} }
diff --git a/tests/dmr-testsuite/little-endian/test_array_5.xml.3.func_base b/tests/dmr-testsuite/little-endian/test_array_5.xml.3.func_base
new file mode 100644
index 0000000..e9bdae6
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_5.xml.3.func_base
@@ -0,0 +1,38 @@
+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_5.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_5">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Int8 name="a">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int8>
+    <UInt8 name="b">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt8>
+    <Int64 name="c">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int64>
+    <UInt64 name="d">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt64>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="function_results">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Float64 name="c">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>38babd01</Value>
+        </Attribute>
+    </Float64>
+</Dataset>
+
+The data:
+{ {{72057594037927.9, 72057594037927.9, 72057594037927.9, 72057594037927.9},{72057594037927.9, 72057594037927.9, 72057594037927.9, 72057594037927.9},{72057594037927.9, 72057594037927.9, 72057594037927.9, 72057594037927.9}} }
diff --git a/tests/dmr-testsuite/little-endian/test_array_5.xml.4.func_base b/tests/dmr-testsuite/little-endian/test_array_5.xml.4.func_base
new file mode 100644
index 0000000..7c5d76a
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_5.xml.4.func_base
@@ -0,0 +1,38 @@
+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_5.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_5">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Int8 name="a">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int8>
+    <UInt8 name="b">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt8>
+    <Int64 name="c">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int64>
+    <UInt64 name="d">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt64>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="function_results">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Float64 name="d">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>77e90ef8</Value>
+        </Attribute>
+    </Float64>
+</Dataset>
+
+The data:
+{ {{1.84467440737096e+16, 1.84467440737096e+16, 1.84467440737096e+16, 1.84467440737096e+16},{1.84467440737096e+16, 1.84467440737096e+16, 1.84467440737096e+16, 1.84467440737096e+16},{1.84467440737096e+16, 1.84467440737096e+16, 1.84467440737096e+16, 1.84467440737096e+16}} }
diff --git a/tests/dmr-testsuite/little-endian/test_array_5.xml.intern_base b/tests/dmr-testsuite/little-endian/test_array_5.xml.intern_base
new file mode 100644
index 0000000..ed63c69
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_5.xml.intern_base
@@ -0,0 +1,47 @@
+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_5.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_5">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Int8 name="a">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int8>
+    <UInt8 name="b">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt8>
+    <Int64 name="c">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int64>
+    <UInt64 name="d">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt64>
+</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_5.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_5">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Int8 name="a">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int8>
+    <UInt8 name="b">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt8>
+    <Int64 name="c">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int64>
+    <UInt64 name="d">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt64>
+</Dataset>
+
+The data:
+{ {{127, 127, 127, 127},{127, 127, 127, 127},{127, 127, 127, 127}}, {{255, 255, 255, 255},{255, 255, 255, 255},{255, 255, 255, 255}}, {{72057594037927935, 72057594037927935, 72057594037927935, 72057594037927935},{72057594037927935, 72057594037927935, 72057594037927935, 72057594037927935},{72057594037927935, 72057594037927935, 72057594037927935, 72057594037927935}}, {{18446744073709551615, 18446744073709551615, 18446744073709551615, 18446744073709551615},{18446744073709551615, 18446744073709551615, 18446744073709551615, 18446744073709551615},{18446744073709551615, 18446744073709551615, 18446744073709551615, 18446744073709551615}} }
diff --git a/tests/dmr-testsuite/little-endian/test_array_5.xml.trans_base b/tests/dmr-testsuite/little-endian/test_array_5.xml.trans_base
new file mode 100644
index 0000000..3615f69
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_5.xml.trans_base
@@ -0,0 +1,59 @@
+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_5.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_5">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Int8 name="a">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int8>
+    <UInt8 name="b">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt8>
+    <Int64 name="c">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int64>
+    <UInt64 name="d">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt64>
+</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_5.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_5">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Int8 name="a">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>82c3d109</Value>
+        </Attribute>
+    </Int8>
+    <UInt8 name="b">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>bb99ff8a</Value>
+        </Attribute>
+    </UInt8>
+    <Int64 name="c">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>38d2ecf4</Value>
+        </Attribute>
+    </Int64>
+    <UInt64 name="d">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>46d91cd0</Value>
+        </Attribute>
+    </UInt64>
+</Dataset>
+
+The data:
+{ {{127, 127, 127, 127},{127, 127, 127, 127},{127, 127, 127, 127}}, {{255, 255, 255, 255},{255, 255, 255, 255},{255, 255, 255, 255}}, {{72057594037927935, 72057594037927935, 72057594037927935, 72057594037927935},{72057594037927935, 72057594037927935, 72057594037927935, 72057594037927935},{72057594037927935, 72057594037927935, 72057594037927935, 72057594037927935}}, {{18446744073709551615, 18446744073709551615, 18446744073709551615, 18446744073709551615},{18446744073709551615, 18446744073709551615, 18446744073709551615, 18446744073709551615},{18446744073709551615, 18446744073709551615, 18446744073709551615, 18446744073709551615}} }
diff --git a/tests/dmr-testsuite/little-endian/test_array_6.1.xml.1.trans_base b/tests/dmr-testsuite/little-endian/test_array_6.1.xml.1.trans_base
new file mode 100644
index 0000000..d724285
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_6.1.xml.1.trans_base
@@ -0,0 +1,36 @@
+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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_6">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Structure name="a">
+        <Int32 name="i">
+            <Dim name="/row"/>
+            <Dim size="6"/>
+        </Int32>
+        <Int32 name="j"/>
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Structure>
+</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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_6">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Structure name="a">
+        <Int32 name="i">
+            <Dim name="/row"/>
+            <Dim size="6"/>
+        </Int32>
+        <Int32 name="j"/>
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>108a44dc</Value>
+        </Attribute>
+    </Structure>
+</Dataset>
+
+The data:
+{ {{{ {{123456789, 123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789, 123456789}}, 123456789 }, { {{123456789, 123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789, 123456789}}, 123456789 }, { {{123456789, 123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789, 123456789}}, 123456789 }, { {{123456789, 123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789, 123456789}}, 123456789 }},{{ {{123456789, 123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789, 123456789}}, 123456789 }, { {{123456789, 123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789, 123456789}}, 123456789 }, { {{123456789, 123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789, 123456789}}, 123456789 }, { {{123456789, 123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789, 123456789}}, 123456789 }},{{ {{123456789, 123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789, 123456789}}, 123456789 }, { {{123456789, 123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789, 123456789}}, 123456789 }, { {{123456789, 123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789, 123456789}}, 123456789 }, { {{123456789, 123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789, 123456789}}, 123456789 }}} }
diff --git a/tests/dmr-testsuite/little-endian/test_array_6.1.xml.2.trans_base b/tests/dmr-testsuite/little-endian/test_array_6.1.xml.2.trans_base
new file mode 100644
index 0000000..2867a7d
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_6.1.xml.2.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/test_array_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_6">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Structure name="a">
+        <Int32 name="i">
+            <Dim name="/row"/>
+            <Dim size="6"/>
+        </Int32>
+        <Int32 name="j"/>
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Structure>
+</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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_6">
+    <Dimension name="row" size="2"/>
+    <Structure name="a">
+        <Int32 name="i">
+            <Dim name="/row"/>
+            <Dim size="6"/>
+        </Int32>
+        <Int32 name="j"/>
+        <Dim name="/row"/>
+        <Dim size="1"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>9dfcdf19</Value>
+        </Attribute>
+    </Structure>
+</Dataset>
+
+The data:
+{ {{{ {{123456789, 123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789, 123456789}}, 123456789 }},{{ {{123456789, 123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789, 123456789}}, 123456789 }}} }
diff --git a/tests/dmr-testsuite/little-endian/test_array_6.1.xml.3.trans_base b/tests/dmr-testsuite/little-endian/test_array_6.1.xml.3.trans_base
new file mode 100644
index 0000000..ae2d8da
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_6.1.xml.3.trans_base
@@ -0,0 +1,36 @@
+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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_6">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Structure name="a">
+        <Int32 name="i">
+            <Dim name="/row"/>
+            <Dim size="6"/>
+        </Int32>
+        <Int32 name="j"/>
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Structure>
+</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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_6">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Structure name="a">
+        <Int32 name="i">
+            <Dim size="2"/>
+            <Dim size="3"/>
+        </Int32>
+        <Int32 name="j"/>
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>dcf2f8b1</Value>
+        </Attribute>
+    </Structure>
+</Dataset>
+
+The data:
+{ {{{ {{123456789, 123456789, 123456789},{123456789, 123456789, 123456789}}, 123456789 }, { {{123456789, 123456789, 123456789},{123456789, 123456789, 123456789}}, 123456789 }, { {{123456789, 123456789, 123456789},{123456789, 123456789, 123456789}}, 123456789 }, { {{123456789, 123456789, 123456789},{123456789, 123456789, 123456789}}, 123456789 }},{{ {{123456789, 123456789, 123456789},{123456789, 123456789, 123456789}}, 123456789 }, { {{123456789, 123456789, 123456789},{123456789, 123456789, 123456789}}, 123456789 }, { {{123456789, 123456789, 123456789},{123456789, 123456789, 123456789}}, 123456789 }, { {{123456789, 123456789, 123456789},{123456789, 123456789, 123456789}}, 123456789 }},{{ {{123456789, 123456789, 123456789},{123456789, 123456789, 123456789}}, 123456789 }, { {{123456789, 123456789, 123456789},{123456789, 123456789, 123456789}}, 123456789 }, { {{123456789, 123456789, 123456789},{123456789, 123456789, 123456789}}, 123456789 }, { {{123456789, 123456789, 123456789},{123456789, 123456789, 123456789}}, 123456789 }}} }
diff --git a/tests/dmr-testsuite/little-endian/test_array_6.1.xml.4.trans_base b/tests/dmr-testsuite/little-endian/test_array_6.1.xml.4.trans_base
new file mode 100644
index 0000000..380c47f
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_6.1.xml.4.trans_base
@@ -0,0 +1,34 @@
+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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_6">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Structure name="a">
+        <Int32 name="i">
+            <Dim name="/row"/>
+            <Dim size="6"/>
+        </Int32>
+        <Int32 name="j"/>
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Structure>
+</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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_6">
+    <Dimension name="row" size="1"/>
+    <Structure name="a">
+        <Int32 name="i">
+            <Dim name="/row"/>
+            <Dim size="2"/>
+        </Int32>
+        <Dim name="/row"/>
+        <Dim size="1"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>114189cb</Value>
+        </Attribute>
+    </Structure>
+</Dataset>
+
+The data:
+{ {{{ {{123456789, 123456789}} }}} }
diff --git a/tests/dmr-testsuite/little-endian/test_array_6.2.xml.1.trans_base b/tests/dmr-testsuite/little-endian/test_array_6.2.xml.1.trans_base
new file mode 100644
index 0000000..3eb7cfc
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_6.2.xml.1.trans_base
@@ -0,0 +1,32 @@
+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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_6">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Structure name="a">
+        <Int32 name="i">
+            <Dim name="/row"/>
+            <Dim name="/col"/>
+        </Int32>
+        <Int32 name="j"/>
+    </Structure>
+</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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_6">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Structure name="a">
+        <Int32 name="i">
+            <Dim name="/row"/>
+            <Dim name="/col"/>
+        </Int32>
+        <Int32 name="j"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>2da3e534</Value>
+        </Attribute>
+    </Structure>
+</Dataset>
+
+The data:
+{ { {{123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789}}, 123456789 } }
diff --git a/tests/dmr-testsuite/little-endian/test_array_6.2.xml.2.trans_base b/tests/dmr-testsuite/little-endian/test_array_6.2.xml.2.trans_base
new file mode 100644
index 0000000..eda3ac9
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_6.2.xml.2.trans_base
@@ -0,0 +1,31 @@
+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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_6">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Structure name="a">
+        <Int32 name="i">
+            <Dim name="/row"/>
+            <Dim name="/col"/>
+        </Int32>
+        <Int32 name="j"/>
+    </Structure>
+</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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_6">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Structure name="a">
+        <Int32 name="i">
+            <Dim name="/row"/>
+            <Dim name="/col"/>
+        </Int32>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>46997ac6</Value>
+        </Attribute>
+    </Structure>
+</Dataset>
+
+The data:
+{ { {{123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789}} } }
diff --git a/tests/dmr-testsuite/little-endian/test_array_6.2.xml.3.trans_base b/tests/dmr-testsuite/little-endian/test_array_6.2.xml.3.trans_base
new file mode 100644
index 0000000..e29c220
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_6.2.xml.3.trans_base
@@ -0,0 +1,29 @@
+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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_6">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Structure name="a">
+        <Int32 name="i">
+            <Dim name="/row"/>
+            <Dim name="/col"/>
+        </Int32>
+        <Int32 name="j"/>
+    </Structure>
+</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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_6">
+    <Structure name="a">
+        <Int32 name="i">
+            <Dim size="1"/>
+            <Dim size="2"/>
+        </Int32>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>114189cb</Value>
+        </Attribute>
+    </Structure>
+</Dataset>
+
+The data:
+{ { {{123456789, 123456789}} } }
diff --git a/tests/dmr-testsuite/little-endian/test_array_6.2.xml.4.trans_base b/tests/dmr-testsuite/little-endian/test_array_6.2.xml.4.trans_base
new file mode 100644
index 0000000..5fede31
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_6.2.xml.4.trans_base
@@ -0,0 +1,30 @@
+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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_6">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Structure name="a">
+        <Int32 name="i">
+            <Dim name="/row"/>
+            <Dim name="/col"/>
+        </Int32>
+        <Int32 name="j"/>
+    </Structure>
+</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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_6">
+    <Dimension name="row" size="2"/>
+    <Structure name="a">
+        <Int32 name="i">
+            <Dim name="/row"/>
+            <Dim size="2"/>
+        </Int32>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>b2871a70</Value>
+        </Attribute>
+    </Structure>
+</Dataset>
+
+The data:
+{ { {{123456789, 123456789},{123456789, 123456789}} } }
diff --git a/tests/dmr-testsuite/little-endian/test_array_6.2.xml.5.trans_base b/tests/dmr-testsuite/little-endian/test_array_6.2.xml.5.trans_base
new file mode 100644
index 0000000..4458da6
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_6.2.xml.5.trans_base
@@ -0,0 +1,26 @@
+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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_6">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Structure name="a">
+        <Int32 name="i">
+            <Dim name="/row"/>
+            <Dim name="/col"/>
+        </Int32>
+        <Int32 name="j"/>
+    </Structure>
+</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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_6">
+    <Structure name="a">
+        <Int32 name="j"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>18df6c9e</Value>
+        </Attribute>
+    </Structure>
+</Dataset>
+
+The data:
+{ { 123456789 } }
diff --git a/tests/dmr-testsuite/little-endian/test_array_6.xml.1.trans_base b/tests/dmr-testsuite/little-endian/test_array_6.xml.1.trans_base
new file mode 100644
index 0000000..91107f7
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_6.xml.1.trans_base
@@ -0,0 +1,30 @@
+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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_6">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Structure name="a">
+        <Int32 name="i"/>
+        <Int32 name="j"/>
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Structure>
+</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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_6">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Structure name="a">
+        <Int32 name="i"/>
+        <Int32 name="j"/>
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>d9ce8457</Value>
+        </Attribute>
+    </Structure>
+</Dataset>
+
+The data:
+{ {{{ 123456789, 123456789 }, { 123456789, 123456789 }, { 123456789, 123456789 }, { 123456789, 123456789 }},{{ 123456789, 123456789 }, { 123456789, 123456789 }, { 123456789, 123456789 }, { 123456789, 123456789 }},{{ 123456789, 123456789 }, { 123456789, 123456789 }, { 123456789, 123456789 }, { 123456789, 123456789 }}} }
diff --git a/tests/dmr-testsuite/little-endian/test_array_6.xml.2.trans_base b/tests/dmr-testsuite/little-endian/test_array_6.xml.2.trans_base
new file mode 100644
index 0000000..aedafc8
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_6.xml.2.trans_base
@@ -0,0 +1,30 @@
+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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_6">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Structure name="a">
+        <Int32 name="i"/>
+        <Int32 name="j"/>
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Structure>
+</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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_6">
+    <Dimension name="row" size="2"/>
+    <Dimension name="col" size="4"/>
+    <Structure name="a">
+        <Int32 name="i"/>
+        <Int32 name="j"/>
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>a439ad98</Value>
+        </Attribute>
+    </Structure>
+</Dataset>
+
+The data:
+{ {{{ 123456789, 123456789 }, { 123456789, 123456789 }, { 123456789, 123456789 }, { 123456789, 123456789 }},{{ 123456789, 123456789 }, { 123456789, 123456789 }, { 123456789, 123456789 }, { 123456789, 123456789 }}} }
diff --git a/tests/dmr-testsuite/little-endian/test_array_6.xml.3.trans_base b/tests/dmr-testsuite/little-endian/test_array_6.xml.3.trans_base
new file mode 100644
index 0000000..4fdcbf4
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_6.xml.3.trans_base
@@ -0,0 +1,29 @@
+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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_6">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Structure name="a">
+        <Int32 name="i"/>
+        <Int32 name="j"/>
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Structure>
+</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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_6">
+    <Dimension name="row" size="2"/>
+    <Structure name="a">
+        <Int32 name="i"/>
+        <Int32 name="j"/>
+        <Dim name="/row"/>
+        <Dim size="2"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>6f7d7361</Value>
+        </Attribute>
+    </Structure>
+</Dataset>
+
+The data:
+{ {{{ 123456789, 123456789 }, { 123456789, 123456789 }},{{ 123456789, 123456789 }, { 123456789, 123456789 }}} }
diff --git a/tests/dmr-testsuite/little-endian/test_array_6.xml.intern_base b/tests/dmr-testsuite/little-endian/test_array_6.xml.intern_base
new file mode 100644
index 0000000..6bfb604
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_6.xml.intern_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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_6">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Structure name="a">
+        <Int32 name="i"/>
+        <Int32 name="j"/>
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Structure>
+</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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_6">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Structure name="a">
+        <Int32 name="i"/>
+        <Int32 name="j"/>
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Structure>
+</Dataset>
+
+The data:
+{ {{{ 123456789, 123456789 }, { 123456789, 123456789 }, { 123456789, 123456789 }, { 123456789, 123456789 }},{{ 123456789, 123456789 }, { 123456789, 123456789 }, { 123456789, 123456789 }, { 123456789, 123456789 }},{{ 123456789, 123456789 }, { 123456789, 123456789 }, { 123456789, 123456789 }, { 123456789, 123456789 }}} }
diff --git a/tests/dmr-testsuite/little-endian/test_array_6.xml.trans_base b/tests/dmr-testsuite/little-endian/test_array_6.xml.trans_base
new file mode 100644
index 0000000..91107f7
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_6.xml.trans_base
@@ -0,0 +1,30 @@
+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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_6">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Structure name="a">
+        <Int32 name="i"/>
+        <Int32 name="j"/>
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Structure>
+</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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_6">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Structure name="a">
+        <Int32 name="i"/>
+        <Int32 name="j"/>
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>d9ce8457</Value>
+        </Attribute>
+    </Structure>
+</Dataset>
+
+The data:
+{ {{{ 123456789, 123456789 }, { 123456789, 123456789 }, { 123456789, 123456789 }, { 123456789, 123456789 }},{{ 123456789, 123456789 }, { 123456789, 123456789 }, { 123456789, 123456789 }, { 123456789, 123456789 }},{{ 123456789, 123456789 }, { 123456789, 123456789 }, { 123456789, 123456789 }, { 123456789, 123456789 }}} }
diff --git a/tests/dmr-testsuite/little-endian/test_array_7.1.xml.1.trans_base b/tests/dmr-testsuite/little-endian/test_array_7.1.xml.1.trans_base
new file mode 100644
index 0000000..e31c178
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_7.1.xml.1.trans_base
@@ -0,0 +1,32 @@
+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_7.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_7">
+    <Dimension name="row" size="4"/>
+    <Dimension name="col" size="5"/>
+    <Sequence name="s">
+        <Int32 name="i1">
+            <Dim name="/row"/>
+            <Dim name="/col"/>
+        </Int32>
+        <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_array_7.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_7">
+    <Dimension name="row" size="4"/>
+    <Dimension name="col" size="5"/>
+    <Sequence name="s">
+        <Int32 name="i1">
+            <Dim name="/row"/>
+            <Dim name="/col"/>
+        </Int32>
+        <String name="s"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>0193e1cb</Value>
+        </Attribute>
+    </Sequence>
+</Dataset>
+
+The data:
+{ { { {{123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789}}, "Silly test string: 1" }, { {{123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789}}, "Silly test string: 1" }, { {{123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789}}, "Silly test string: 1" }, { {{123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789}}, "Silly test string: 1" } } }
diff --git a/tests/dmr-testsuite/little-endian/test_array_7.1.xml.2.trans_base b/tests/dmr-testsuite/little-endian/test_array_7.1.xml.2.trans_base
new file mode 100644
index 0000000..ed6de1b
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_7.1.xml.2.trans_base
@@ -0,0 +1,31 @@
+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_7.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_7">
+    <Dimension name="row" size="4"/>
+    <Dimension name="col" size="5"/>
+    <Sequence name="s">
+        <Int32 name="i1">
+            <Dim name="/row"/>
+            <Dim name="/col"/>
+        </Int32>
+        <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_array_7.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_7">
+    <Dimension name="row" size="4"/>
+    <Dimension name="col" size="5"/>
+    <Sequence name="s">
+        <Int32 name="i1">
+            <Dim name="/row"/>
+            <Dim name="/col"/>
+        </Int32>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>b43945c2</Value>
+        </Attribute>
+    </Sequence>
+</Dataset>
+
+The data:
+{ { { {{123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789}} }, { {{123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789}} }, { {{123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789}} }, { {{123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789},{123456789, 123456789, 123456789, 123456789, 123456789}} } } }
diff --git a/tests/dmr-testsuite/little-endian/test_array_7.1.xml.3.trans_base b/tests/dmr-testsuite/little-endian/test_array_7.1.xml.3.trans_base
new file mode 100644
index 0000000..b3a34ee
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_7.1.xml.3.trans_base
@@ -0,0 +1,29 @@
+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_7.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_7">
+    <Dimension name="row" size="4"/>
+    <Dimension name="col" size="5"/>
+    <Sequence name="s">
+        <Int32 name="i1">
+            <Dim name="/row"/>
+            <Dim name="/col"/>
+        </Int32>
+        <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_array_7.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_7">
+    <Sequence name="s">
+        <Int32 name="i1">
+            <Dim size="1"/>
+            <Dim size="1"/>
+        </Int32>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>b2871a70</Value>
+        </Attribute>
+    </Sequence>
+</Dataset>
+
+The data:
+{ { { {{123456789}} }, { {{123456789}} }, { {{123456789}} }, { {{123456789}} } } }
diff --git a/tests/dmr-testsuite/little-endian/test_array_7.1.xml.4.trans_base b/tests/dmr-testsuite/little-endian/test_array_7.1.xml.4.trans_base
new file mode 100644
index 0000000..9456876
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_7.1.xml.4.trans_base
@@ -0,0 +1,29 @@
+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_7.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_7">
+    <Dimension name="row" size="4"/>
+    <Dimension name="col" size="5"/>
+    <Sequence name="s">
+        <Int32 name="i1">
+            <Dim name="/row"/>
+            <Dim name="/col"/>
+        </Int32>
+        <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_array_7.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_7">
+    <Sequence name="s">
+        <Int32 name="i1">
+            <Dim size="3"/>
+            <Dim size="2"/>
+        </Int32>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>d9ce8457</Value>
+        </Attribute>
+    </Sequence>
+</Dataset>
+
+The data:
+{ { { {{123456789, 123456789},{123456789, 123456789},{123456789, 123456789}} }, { {{123456789, 123456789},{123456789, 123456789},{123456789, 123456789}} }, { {{123456789, 123456789},{123456789, 123456789},{123456789, 123456789}} }, { {{123456789, 123456789},{123456789, 123456789},{123456789, 123456789}} } } }
diff --git a/tests/dmr-testsuite/little-endian/test_array_7.1.xml.5.trans_base b/tests/dmr-testsuite/little-endian/test_array_7.1.xml.5.trans_base
new file mode 100644
index 0000000..203b524
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_7.1.xml.5.trans_base
@@ -0,0 +1,32 @@
+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_7.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_7">
+    <Dimension name="row" size="4"/>
+    <Dimension name="col" size="5"/>
+    <Sequence name="s">
+        <Int32 name="i1">
+            <Dim name="/row"/>
+            <Dim name="/col"/>
+        </Int32>
+        <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_array_7.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_7">
+    <Dimension name="row" size="2"/>
+    <Dimension name="col" size="2"/>
+    <Sequence name="s">
+        <Int32 name="i1">
+            <Dim name="/row"/>
+            <Dim name="/col"/>
+        </Int32>
+        <String name="s"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>0ee272dc</Value>
+        </Attribute>
+    </Sequence>
+</Dataset>
+
+The data:
+{ { { {{123456789, 123456789},{123456789, 123456789}}, "Silly test string: 1" }, { {{123456789, 123456789},{123456789, 123456789}}, "Silly test string: 1" }, { {{123456789, 123456789},{123456789, 123456789}}, "Silly test string: 1" }, { {{123456789, 123456789},{123456789, 123456789}}, "Silly test string: 1" } } }
diff --git a/tests/dmr-testsuite/little-endian/test_array_7.1.xml.6.trans_base b/tests/dmr-testsuite/little-endian/test_array_7.1.xml.6.trans_base
new file mode 100644
index 0000000..8b3fe56
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_7.1.xml.6.trans_base
@@ -0,0 +1,31 @@
+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_7.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_7">
+    <Dimension name="row" size="4"/>
+    <Dimension name="col" size="5"/>
+    <Sequence name="s">
+        <Int32 name="i1">
+            <Dim name="/row"/>
+            <Dim name="/col"/>
+        </Int32>
+        <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_array_7.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_7">
+    <Dimension name="row" size="2"/>
+    <Dimension name="col" size="2"/>
+    <Sequence name="s">
+        <Int32 name="i1">
+            <Dim name="/row"/>
+            <Dim name="/col"/>
+        </Int32>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>a439ad98</Value>
+        </Attribute>
+    </Sequence>
+</Dataset>
+
+The data:
+{ { { {{123456789, 123456789},{123456789, 123456789}} }, { {{123456789, 123456789},{123456789, 123456789}} }, { {{123456789, 123456789},{123456789, 123456789}} }, { {{123456789, 123456789},{123456789, 123456789}} } } }
diff --git a/tests/dmr-testsuite/little-endian/test_array_7.2.xml.1.trans_base b/tests/dmr-testsuite/little-endian/test_array_7.2.xml.1.trans_base
new file mode 100644
index 0000000..2370abe
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_7.2.xml.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_7.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_7">
+    <Dimension name="row" size="4"/>
+    <Dimension name="col" size="5"/>
+    <Sequence name="s">
+        <Int32 name="i1">
+            <Dim name="/row"/>
+            <Dim name="/col"/>
+        </Int32>
+        <String name="s"/>
+        <Dim size="4"/>
+    </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_array_7.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_7">
+    <Dimension name="row" size="4"/>
+    <Dimension name="col" size="2"/>
+    <Sequence name="s">
+        <Int32 name="i1">
+            <Dim name="/row"/>
+            <Dim name="/col"/>
+        </Int32>
+        <Dim size="4"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>82a5d12e</Value>
+        </Attribute>
+    </Sequence>
+</Dataset>
+
+The data:
+{ {{ { {{123456789, 123456789},{123456789, 123456789},{123456789, 123456789},{123456789, 123456789}} }, { {{123456789, 123456789},{123456789, 123456789},{123456789, 123456789},{123456789, 123456789}} }, { {{123456789, 123456789},{123456789, 123456789},{123456789, 123456789},{123456789, 123456789}} }, { {{123456789, 123456789},{123456789, 123456789},{123456789, 123456789},{123456789, 123456789}} } }, { { {{123456789, 123456789},{123456789, 123456789},{123456789, 123456789},{123456789, 123456789}} }, { {{123456789, 123456789},{123456789, 123456789},{123456789, 123456789},{123456789, 123456789}} }, { {{123456789, 123456789},{123456789, 123456789},{123456789, 123456789},{123456789, 123456789}} }, { {{123456789, 123456789},{123456789, 123456789},{123456789, 123456789},{123456789, 123456789}} } }, { { {{123456789, 123456789},{123456789, 123456789},{123456789, 123456789},{123456789, 123456789}} }, { {{123456789, 123456789},{123456789, 123456789},{123456789, 123456789},{123456789, 123456789}} }, { {{123456789, 123456789},{123456789, 123456789},{123456789, 123456789},{123456789, 123456789}} }, { {{123456789, 123456789},{123456789, 123456789},{123456789, 123456789},{123456789, 123456789}} } }, { { {{123456789, 123456789},{123456789, 123456789},{123456789, 123456789},{123456789, 123456789}} }, { {{123456789, 123456789},{123456789, 123456789},{123456789, 123456789},{123456789, 123456789}} }, { {{123456789, 123456789},{123456789, 123456789},{123456789, 123456789},{123456789, 123456789}} }, { {{123456789, 123456789},{123456789, 123456789},{123456789, 123456789},{123456789, 123456789}} } }} }
diff --git a/tests/dmr-testsuite/little-endian/test_array_7.2.xml.2.trans_base b/tests/dmr-testsuite/little-endian/test_array_7.2.xml.2.trans_base
new file mode 100644
index 0000000..ccb2b4c
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_7.2.xml.2.trans_base
@@ -0,0 +1,32 @@
+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_7.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_7">
+    <Dimension name="row" size="4"/>
+    <Dimension name="col" size="5"/>
+    <Sequence name="s">
+        <Int32 name="i1">
+            <Dim name="/row"/>
+            <Dim name="/col"/>
+        </Int32>
+        <String name="s"/>
+        <Dim size="4"/>
+    </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_array_7.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_7">
+    <Dimension name="col" size="2"/>
+    <Sequence name="s">
+        <Int32 name="i1">
+            <Dim size="1"/>
+            <Dim name="/col"/>
+        </Int32>
+        <Dim size="4"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>d2cdfa69</Value>
+        </Attribute>
+    </Sequence>
+</Dataset>
+
+The data:
+{ {{ { {{123456789, 123456789}} }, { {{123456789, 123456789}} }, { {{123456789, 123456789}} }, { {{123456789, 123456789}} } }, { { {{123456789, 123456789}} }, { {{123456789, 123456789}} }, { {{123456789, 123456789}} }, { {{123456789, 123456789}} } }, { { {{123456789, 123456789}} }, { {{123456789, 123456789}} }, { {{123456789, 123456789}} }, { {{123456789, 123456789}} } }, { { {{123456789, 123456789}} }, { {{123456789, 123456789}} }, { {{123456789, 123456789}} }, { {{123456789, 123456789}} } }} }
diff --git a/tests/dmr-testsuite/little-endian/test_array_7.2.xml.3.trans_base b/tests/dmr-testsuite/little-endian/test_array_7.2.xml.3.trans_base
new file mode 100644
index 0000000..5a0664c
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_7.2.xml.3.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_7.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_7">
+    <Dimension name="row" size="4"/>
+    <Dimension name="col" size="5"/>
+    <Sequence name="s">
+        <Int32 name="i1">
+            <Dim name="/row"/>
+            <Dim name="/col"/>
+        </Int32>
+        <String name="s"/>
+        <Dim size="4"/>
+    </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_array_7.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_7">
+    <Dimension name="row" size="4"/>
+    <Dimension name="col" size="2"/>
+    <Sequence name="s">
+        <Int32 name="i1">
+            <Dim name="/row"/>
+            <Dim name="/col"/>
+        </Int32>
+        <Dim size="1"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>d2cdfa69</Value>
+        </Attribute>
+    </Sequence>
+</Dataset>
+
+The data:
+{ {{ { {{123456789, 123456789},{123456789, 123456789},{123456789, 123456789},{123456789, 123456789}} }, { {{123456789, 123456789},{123456789, 123456789},{123456789, 123456789},{123456789, 123456789}} }, { {{123456789, 123456789},{123456789, 123456789},{123456789, 123456789},{123456789, 123456789}} }, { {{123456789, 123456789},{123456789, 123456789},{123456789, 123456789},{123456789, 123456789}} } }} }
diff --git a/tests/dmr-testsuite/little-endian/test_array_7.2.xml.4.trans_base b/tests/dmr-testsuite/little-endian/test_array_7.2.xml.4.trans_base
new file mode 100644
index 0000000..176958c
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_7.2.xml.4.trans_base
@@ -0,0 +1,32 @@
+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_7.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_7">
+    <Dimension name="row" size="4"/>
+    <Dimension name="col" size="5"/>
+    <Sequence name="s">
+        <Int32 name="i1">
+            <Dim name="/row"/>
+            <Dim name="/col"/>
+        </Int32>
+        <String name="s"/>
+        <Dim size="4"/>
+    </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_array_7.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_7">
+    <Dimension name="col" size="2"/>
+    <Sequence name="s">
+        <Int32 name="i1">
+            <Dim size="1"/>
+            <Dim name="/col"/>
+        </Int32>
+        <Dim size="1"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>6f7d7361</Value>
+        </Attribute>
+    </Sequence>
+</Dataset>
+
+The data:
+{ {{ { {{123456789, 123456789}} }, { {{123456789, 123456789}} }, { {{123456789, 123456789}} }, { {{123456789, 123456789}} } }} }
diff --git a/tests/dmr-testsuite/little-endian/test_array_7.xml.1.trans_base b/tests/dmr-testsuite/little-endian/test_array_7.xml.1.trans_base
new file mode 100644
index 0000000..ab441a9
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_7.xml.1.trans_base
@@ -0,0 +1,24 @@
+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_7.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_7">
+    <Sequence name="s">
+        <Int32 name="i1"/>
+        <String name="s"/>
+        <Dim size="2"/>
+    </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_array_7.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_7">
+    <Sequence name="s">
+        <Int32 name="i1"/>
+        <String name="s"/>
+        <Dim size="2"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>766f5e81</Value>
+        </Attribute>
+    </Sequence>
+</Dataset>
+
+The data:
+{ {{ { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" } }, { { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" } }} }
diff --git a/tests/dmr-testsuite/little-endian/test_array_7.xml.2.trans_base b/tests/dmr-testsuite/little-endian/test_array_7.xml.2.trans_base
new file mode 100644
index 0000000..9c915b2
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_7.xml.2.trans_base
@@ -0,0 +1,23 @@
+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_7.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_7">
+    <Sequence name="s">
+        <Int32 name="i1"/>
+        <String name="s"/>
+        <Dim size="2"/>
+    </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_array_7.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_7">
+    <Sequence name="s">
+        <Int32 name="i1"/>
+        <Dim size="2"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>6f7d7361</Value>
+        </Attribute>
+    </Sequence>
+</Dataset>
+
+The data:
+{ {{ { 123456789 }, { 123456789 }, { 123456789 }, { 123456789 } }, { { 123456789 }, { 123456789 }, { 123456789 }, { 123456789 } }} }
diff --git a/tests/dmr-testsuite/little-endian/test_array_7.xml.3.trans_base b/tests/dmr-testsuite/little-endian/test_array_7.xml.3.trans_base
new file mode 100644
index 0000000..276ba96
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_7.xml.3.trans_base
@@ -0,0 +1,24 @@
+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_7.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_7">
+    <Sequence name="s">
+        <Int32 name="i1"/>
+        <String name="s"/>
+        <Dim size="2"/>
+    </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_array_7.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_7">
+    <Sequence name="s">
+        <Int32 name="i1"/>
+        <String name="s"/>
+        <Dim size="1"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>b617a898</Value>
+        </Attribute>
+    </Sequence>
+</Dataset>
+
+The data:
+{ {{ { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" } }} }
diff --git a/tests/dmr-testsuite/little-endian/test_array_7.xml.4.trans_base b/tests/dmr-testsuite/little-endian/test_array_7.xml.4.trans_base
new file mode 100644
index 0000000..911fb46
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_7.xml.4.trans_base
@@ -0,0 +1,23 @@
+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_7.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_7">
+    <Sequence name="s">
+        <Int32 name="i1"/>
+        <String name="s"/>
+        <Dim size="2"/>
+    </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_array_7.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_7">
+    <Sequence name="s">
+        <Int32 name="i1"/>
+        <Dim size="1"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>b2871a70</Value>
+        </Attribute>
+    </Sequence>
+</Dataset>
+
+The data:
+{ {{ { 123456789 }, { 123456789 }, { 123456789 }, { 123456789 } }} }
diff --git a/tests/dmr-testsuite/little-endian/test_array_7.xml.intern_base b/tests/dmr-testsuite/little-endian/test_array_7.xml.intern_base
new file mode 100644
index 0000000..da7e14b
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_7.xml.intern_base
@@ -0,0 +1,21 @@
+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_7.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_7">
+    <Sequence name="s">
+        <Int32 name="i1"/>
+        <String name="s"/>
+        <Dim size="2"/>
+    </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_array_7.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_7">
+    <Sequence name="s">
+        <Int32 name="i1"/>
+        <String name="s"/>
+        <Dim size="2"/>
+    </Sequence>
+</Dataset>
+
+The data:
+{ {{ { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" } }, { { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" } }} }
diff --git a/tests/dmr-testsuite/little-endian/test_array_7.xml.trans_base b/tests/dmr-testsuite/little-endian/test_array_7.xml.trans_base
new file mode 100644
index 0000000..ab441a9
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_7.xml.trans_base
@@ -0,0 +1,24 @@
+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_7.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_7">
+    <Sequence name="s">
+        <Int32 name="i1"/>
+        <String name="s"/>
+        <Dim size="2"/>
+    </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_array_7.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_7">
+    <Sequence name="s">
+        <Int32 name="i1"/>
+        <String name="s"/>
+        <Dim size="2"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>766f5e81</Value>
+        </Attribute>
+    </Sequence>
+</Dataset>
+
+The data:
+{ {{ { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" } }, { { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" } }} }
diff --git a/tests/dmr-testsuite/little-endian/test_array_8.xml.1.trans_base b/tests/dmr-testsuite/little-endian/test_array_8.xml.1.trans_base
new file mode 100644
index 0000000..823d66d
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_8.xml.1.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_8.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_8">
+    <Dimension name="col" size="3"/>
+    <Sequence name="s">
+        <Int32 name="i1"/>
+        <String name="s"/>
+        <Dim size="2"/>
+        <Dim name="/col"/>
+    </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_array_8.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_8">
+    <Dimension name="col" size="2"/>
+    <Sequence name="s">
+        <Int32 name="i1"/>
+        <Dim size="1"/>
+        <Dim name="/col"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>6f7d7361</Value>
+        </Attribute>
+    </Sequence>
+</Dataset>
+
+The data:
+{ {{{ { 123456789 }, { 123456789 }, { 123456789 }, { 123456789 } }, { { 123456789 }, { 123456789 }, { 123456789 }, { 123456789 } }}} }
diff --git a/tests/dmr-testsuite/little-endian/test_array_8.xml.intern_base b/tests/dmr-testsuite/little-endian/test_array_8.xml.intern_base
new file mode 100644
index 0000000..90ed9c2
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_8.xml.intern_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_8.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_8">
+    <Dimension name="col" size="3"/>
+    <Sequence name="s">
+        <Int32 name="i1"/>
+        <String name="s"/>
+        <Dim size="2"/>
+        <Dim name="/col"/>
+    </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_array_8.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_8">
+    <Dimension name="col" size="3"/>
+    <Sequence name="s">
+        <Int32 name="i1"/>
+        <String name="s"/>
+        <Dim size="2"/>
+        <Dim name="/col"/>
+    </Sequence>
+</Dataset>
+
+The data:
+{ {{{ { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" } }, { { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" } }, { { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" } }},{{ { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" } }, { { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" } }, { { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" } }}} }
diff --git a/tests/dmr-testsuite/little-endian/test_array_8.xml.trans_base b/tests/dmr-testsuite/little-endian/test_array_8.xml.trans_base
new file mode 100644
index 0000000..03083b6
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_8.xml.trans_base
@@ -0,0 +1,28 @@
+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_8.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_8">
+    <Dimension name="col" size="3"/>
+    <Sequence name="s">
+        <Int32 name="i1"/>
+        <String name="s"/>
+        <Dim size="2"/>
+        <Dim name="/col"/>
+    </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_array_8.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_8">
+    <Dimension name="col" size="3"/>
+    <Sequence name="s">
+        <Int32 name="i1"/>
+        <String name="s"/>
+        <Dim size="2"/>
+        <Dim name="/col"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>f95dfb1c</Value>
+        </Attribute>
+    </Sequence>
+</Dataset>
+
+The data:
+{ {{{ { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" } }, { { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" } }, { { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" } }},{{ { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" } }, { { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" } }, { { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" } }}} }
diff --git a/tests/dmr-testsuite/little-endian/test_array_9.xml.intern_base b/tests/dmr-testsuite/little-endian/test_array_9.xml.intern_base
new file mode 100644
index 0000000..2f53699
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_9.xml.intern_base
@@ -0,0 +1,17 @@
+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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
+    <Int32 name="x">
+        <Dim size="0"/>
+    </Int32>
+</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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
+    <Int32 name="x">
+        <Dim size="0"/>
+    </Int32>
+</Dataset>
+
+The data:
+{ {} }
diff --git a/tests/dmr-testsuite/little-endian/test_array_9.xml.trans_base b/tests/dmr-testsuite/little-endian/test_array_9.xml.trans_base
new file mode 100644
index 0000000..e24d475
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_array_9.xml.trans_base
@@ -0,0 +1,20 @@
+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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
+    <Int32 name="x">
+        <Dim size="0"/>
+    </Int32>
+</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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
+    <Int32 name="x">
+        <Dim size="0"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>00000000</Value>
+        </Attribute>
+    </Int32>
+</Dataset>
+
+The data:
+{ {} }
diff --git a/tests/dmr-testsuite/little-endian/test_simple_1.xml.intern_base b/tests/dmr-testsuite/little-endian/test_simple_1.xml.intern_base
new file mode 100644
index 0000000..4b6ab97
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_simple_1.xml.intern_base
@@ -0,0 +1,13 @@
+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_1.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_1">
+    <Int32 name="x"/>
+</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_1.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_1">
+    <Int32 name="x"/>
+</Dataset>
+
+The data:
+{ 123456789 }
diff --git a/tests/dmr-testsuite/little-endian/test_simple_1.xml.trans_base b/tests/dmr-testsuite/little-endian/test_simple_1.xml.trans_base
new file mode 100644
index 0000000..ae52ffd
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_simple_1.xml.trans_base
@@ -0,0 +1,17 @@
+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_1.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_1">
+    <Int32 name="x"/>
+</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_1.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_1">
+    <Int32 name="x">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>18df6c9e</Value>
+        </Attribute>
+    </Int32>
+</Dataset>
+
+The data:
+{ 123456789 }
diff --git a/tests/dmr-testsuite/little-endian/test_simple_10.xml.intern_base b/tests/dmr-testsuite/little-endian/test_simple_10.xml.intern_base
new file mode 100644
index 0000000..a265226
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_simple_10.xml.intern_base
@@ -0,0 +1,13 @@
+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_10.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_10">
+    <Opaque name="o"/>
+</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_10.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_10">
+    <Opaque name="o"/>
+</Dataset>
+
+The data:
+{ 1,2,3,4,5 }
diff --git a/tests/dmr-testsuite/little-endian/test_simple_10.xml.trans_base b/tests/dmr-testsuite/little-endian/test_simple_10.xml.trans_base
new file mode 100644
index 0000000..b9b6c49
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_simple_10.xml.trans_base
@@ -0,0 +1,17 @@
+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_10.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_10">
+    <Opaque name="o"/>
+</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_10.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_10">
+    <Opaque name="o">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>470b99f4</Value>
+        </Attribute>
+    </Opaque>
+</Dataset>
+
+The data:
+{ 1,2,3,4,5 }
diff --git a/tests/dmr-testsuite/little-endian/test_simple_2.xml.intern_base b/tests/dmr-testsuite/little-endian/test_simple_2.xml.intern_base
new file mode 100644
index 0000000..09b8340
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_simple_2.xml.intern_base
@@ -0,0 +1,37 @@
+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_2.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_2">
+    <Byte name="b"/>
+    <Int8 name="i8"/>
+    <UInt8 name="ui8"/>
+    <Int16 name="i16"/>
+    <UInt16 name="ui16"/>
+    <Int32 name="i32"/>
+    <UInt32 name="ui32"/>
+    <Int64 name="i64"/>
+    <UInt64 name="ui64"/>
+    <Float32 name="f32"/>
+    <Float64 name="f64"/>
+    <String name="s"/>
+    <URL name="u"/>
+</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_2.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_2">
+    <Byte name="b"/>
+    <Int8 name="i8"/>
+    <UInt8 name="ui8"/>
+    <Int16 name="i16"/>
+    <UInt16 name="ui16"/>
+    <Int32 name="i32"/>
+    <UInt32 name="ui32"/>
+    <Int64 name="i64"/>
+    <UInt64 name="ui64"/>
+    <Float32 name="f32"/>
+    <Float64 name="f64"/>
+    <String name="s"/>
+    <URL name="u"/>
+</Dataset>
+
+The data:
+{ 255, 127, 255, 32000, 64000, 123456789, 4026531840, 72057594037927935, 18446744073709551615, 99.999, 99.999, "Silly test string: 1", "http://dcz.gso.uri.edu/avhrr-archive/archive.html" }
diff --git a/tests/dmr-testsuite/little-endian/test_simple_2.xml.trans_base b/tests/dmr-testsuite/little-endian/test_simple_2.xml.trans_base
new file mode 100644
index 0000000..ccd53c4
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_simple_2.xml.trans_base
@@ -0,0 +1,89 @@
+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_2.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_2">
+    <Byte name="b"/>
+    <Int8 name="i8"/>
+    <UInt8 name="ui8"/>
+    <Int16 name="i16"/>
+    <UInt16 name="ui16"/>
+    <Int32 name="i32"/>
+    <UInt32 name="ui32"/>
+    <Int64 name="i64"/>
+    <UInt64 name="ui64"/>
+    <Float32 name="f32"/>
+    <Float64 name="f64"/>
+    <String name="s"/>
+    <URL name="u"/>
+</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_2.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_2">
+    <Byte name="b">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>ff000000</Value>
+        </Attribute>
+    </Byte>
+    <Int8 name="i8">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>12b88320</Value>
+        </Attribute>
+    </Int8>
+    <UInt8 name="ui8">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>ff000000</Value>
+        </Attribute>
+    </UInt8>
+    <Int16 name="i16">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>6f6d1f7e</Value>
+        </Attribute>
+    </Int16>
+    <UInt16 name="ui16">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>1cb109fd</Value>
+        </Attribute>
+    </UInt16>
+    <Int32 name="i32">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>18df6c9e</Value>
+        </Attribute>
+    </Int32>
+    <UInt32 name="ui32">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>9cf92d00</Value>
+        </Attribute>
+    </UInt32>
+    <Int64 name="i64">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>0c463091</Value>
+        </Attribute>
+    </Int64>
+    <UInt64 name="ui64">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>2144df1c</Value>
+        </Attribute>
+    </UInt64>
+    <Float32 name="f32">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>1ae0f285</Value>
+        </Attribute>
+    </Float32>
+    <Float64 name="f64">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>946c3797</Value>
+        </Attribute>
+    </Float64>
+    <String name="s">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>3d9a4edd</Value>
+        </Attribute>
+    </String>
+    <URL name="u">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>08f792c4</Value>
+        </Attribute>
+    </URL>
+</Dataset>
+
+The data:
+{ 255, 127, 255, 32000, 64000, 123456789, 4026531840, 72057594037927935, 18446744073709551615, 99.999, 99.999, "Silly test string: 1", "http://dcz.gso.uri.edu/avhrr-archive/archive.html" }
diff --git a/tests/dmr-testsuite/little-endian/test_simple_3.xml.intern_base b/tests/dmr-testsuite/little-endian/test_simple_3.xml.intern_base
new file mode 100644
index 0000000..ee45c20
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_simple_3.xml.intern_base
@@ -0,0 +1,21 @@
+Parse successful
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="test_simple_3">
+    <Enumeration name="e1" basetype="UInt8">
+        <EnumConst name="econst1" value="1"/>
+        <EnumConst name="econst2" value="2"/>
+    </Enumeration>
+    <Int32 name="x"/>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="test_simple_3">
+    <Enumeration name="e1" basetype="UInt8">
+        <EnumConst name="econst1" value="1"/>
+        <EnumConst name="econst2" value="2"/>
+    </Enumeration>
+    <Int32 name="x"/>
+</Dataset>
+
+The data:
+{ 123456789 }
diff --git a/tests/dmr-testsuite/little-endian/test_simple_3.xml.trans_base b/tests/dmr-testsuite/little-endian/test_simple_3.xml.trans_base
new file mode 100644
index 0000000..95c0db6
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_simple_3.xml.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#" dapVersion="4.0" dmrVersion="1.0" name="test_simple_3">
+    <Enumeration name="e1" basetype="UInt8">
+        <EnumConst name="econst1" value="1"/>
+        <EnumConst name="econst2" value="2"/>
+    </Enumeration>
+    <Int32 name="x"/>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="test_simple_3">
+    <Enumeration name="e1" basetype="UInt8">
+        <EnumConst name="econst1" value="1"/>
+        <EnumConst name="econst2" value="2"/>
+    </Enumeration>
+    <Int32 name="x">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>18df6c9e</Value>
+        </Attribute>
+    </Int32>
+</Dataset>
+
+The data:
+{ 123456789 }
diff --git a/tests/dmr-testsuite/little-endian/test_simple_4.xml.intern_base b/tests/dmr-testsuite/little-endian/test_simple_4.xml.intern_base
new file mode 100644
index 0000000..14f262e
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_simple_4.xml.intern_base
@@ -0,0 +1,21 @@
+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_4.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_4">
+    <Int32 name="x">
+        <Attribute name="long_name" type="String">
+            <Value>x_axis_value</Value>
+        </Attribute>
+    </Int32>
+</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_4.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_4">
+    <Int32 name="x">
+        <Attribute name="long_name" type="String">
+            <Value>x_axis_value</Value>
+        </Attribute>
+    </Int32>
+</Dataset>
+
+The data:
+{ 123456789 }
diff --git a/tests/dmr-testsuite/little-endian/test_simple_4.xml.trans_base b/tests/dmr-testsuite/little-endian/test_simple_4.xml.trans_base
new file mode 100644
index 0000000..df5b730
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_simple_4.xml.trans_base
@@ -0,0 +1,24 @@
+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_4.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_4">
+    <Int32 name="x">
+        <Attribute name="long_name" type="String">
+            <Value>x_axis_value</Value>
+        </Attribute>
+    </Int32>
+</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_4.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_4">
+    <Int32 name="x">
+        <Attribute name="long_name" type="String">
+            <Value>x_axis_value</Value>
+        </Attribute>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>18df6c9e</Value>
+        </Attribute>
+    </Int32>
+</Dataset>
+
+The data:
+{ 123456789 }
diff --git a/tests/dmr-testsuite/little-endian/test_simple_5.xml.intern_base b/tests/dmr-testsuite/little-endian/test_simple_5.xml.intern_base
new file mode 100644
index 0000000..74bd6ba
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_simple_5.xml.intern_base
@@ -0,0 +1,29 @@
+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_5.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_5">
+    <Int8 name="i"/>
+    <Int16 name="j"/>
+    <Int32 name="k"/>
+    <Int64 name="z"/>
+    <Byte name="ui"/>
+    <UInt8 name="uii"/>
+    <UInt16 name="uj"/>
+    <UInt32 name="uk"/>
+    <UInt64 name="uz"/>
+</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_5.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_5">
+    <Int8 name="i"/>
+    <Int16 name="j"/>
+    <Int32 name="k"/>
+    <Int64 name="z"/>
+    <Byte name="ui"/>
+    <UInt8 name="uii"/>
+    <UInt16 name="uj"/>
+    <UInt32 name="uk"/>
+    <UInt64 name="uz"/>
+</Dataset>
+
+The data:
+{ 127, 32000, 123456789, 72057594037927935, 255, 255, 64000, 4026531840, 18446744073709551615 }
diff --git a/tests/dmr-testsuite/little-endian/test_simple_5.xml.trans_base b/tests/dmr-testsuite/little-endian/test_simple_5.xml.trans_base
new file mode 100644
index 0000000..e3be832
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_simple_5.xml.trans_base
@@ -0,0 +1,65 @@
+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_5.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_5">
+    <Int8 name="i"/>
+    <Int16 name="j"/>
+    <Int32 name="k"/>
+    <Int64 name="z"/>
+    <Byte name="ui"/>
+    <UInt8 name="uii"/>
+    <UInt16 name="uj"/>
+    <UInt32 name="uk"/>
+    <UInt64 name="uz"/>
+</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_5.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_5">
+    <Int8 name="i">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>12b88320</Value>
+        </Attribute>
+    </Int8>
+    <Int16 name="j">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>6f6d1f7e</Value>
+        </Attribute>
+    </Int16>
+    <Int32 name="k">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>18df6c9e</Value>
+        </Attribute>
+    </Int32>
+    <Int64 name="z">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>0c463091</Value>
+        </Attribute>
+    </Int64>
+    <Byte name="ui">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>ff000000</Value>
+        </Attribute>
+    </Byte>
+    <UInt8 name="uii">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>ff000000</Value>
+        </Attribute>
+    </UInt8>
+    <UInt16 name="uj">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>1cb109fd</Value>
+        </Attribute>
+    </UInt16>
+    <UInt32 name="uk">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>9cf92d00</Value>
+        </Attribute>
+    </UInt32>
+    <UInt64 name="uz">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>2144df1c</Value>
+        </Attribute>
+    </UInt64>
+</Dataset>
+
+The data:
+{ 127, 32000, 123456789, 72057594037927935, 255, 255, 64000, 4026531840, 18446744073709551615 }
diff --git a/tests/dmr-testsuite/little-endian/test_simple_6.1.xml.1.trans_base b/tests/dmr-testsuite/little-endian/test_simple_6.1.xml.1.trans_base
new file mode 100644
index 0000000..457c089
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_simple_6.1.xml.1.trans_base
@@ -0,0 +1,26 @@
+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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_6">
+    <Structure name="s">
+        <Int32 name="i1"/>
+        <String name="s"/>
+        <Structure name="inner">
+            <Int32 name="i2"/>
+        </Structure>
+    </Structure>
+</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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_6">
+    <Structure name="s">
+        <Structure name="inner">
+            <Int32 name="i2"/>
+        </Structure>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>18df6c9e</Value>
+        </Attribute>
+    </Structure>
+</Dataset>
+
+The data:
+{ { { 123456789 } } }
diff --git a/tests/dmr-testsuite/little-endian/test_simple_6.2.xml.intern_base b/tests/dmr-testsuite/little-endian/test_simple_6.2.xml.intern_base
new file mode 100644
index 0000000..014c72e
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_simple_6.2.xml.intern_base
@@ -0,0 +1,13 @@
+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_6.2.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_6.2">
+    <Structure name="s"/>
+</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_6.2.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_6.2">
+    <Structure name="s"/>
+</Dataset>
+
+The data:
+{ {  } }
diff --git a/tests/dmr-testsuite/little-endian/test_simple_6.2.xml.trans_base b/tests/dmr-testsuite/little-endian/test_simple_6.2.xml.trans_base
new file mode 100644
index 0000000..b393e3f
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_simple_6.2.xml.trans_base
@@ -0,0 +1,17 @@
+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_6.2.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_6.2">
+    <Structure name="s"/>
+</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_6.2.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_6.2">
+    <Structure name="s">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>00000000</Value>
+        </Attribute>
+    </Structure>
+</Dataset>
+
+The data:
+{ {  } }
diff --git a/tests/dmr-testsuite/little-endian/test_simple_6.3.xml.intern_base b/tests/dmr-testsuite/little-endian/test_simple_6.3.xml.intern_base
new file mode 100644
index 0000000..c0ea6cc
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_simple_6.3.xml.intern_base
@@ -0,0 +1,21 @@
+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_6.3.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_6.3">
+    <Structure name="s">
+        <Int32 name="i1"/>
+        <String name="s"/>
+        <Structure name="inner"/>
+    </Structure>
+</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_6.3.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_6.3">
+    <Structure name="s">
+        <Int32 name="i1"/>
+        <String name="s"/>
+        <Structure name="inner"/>
+    </Structure>
+</Dataset>
+
+The data:
+{ { 123456789, "Silly test string: 1", {  } } }
diff --git a/tests/dmr-testsuite/little-endian/test_simple_6.3.xml.trans_base b/tests/dmr-testsuite/little-endian/test_simple_6.3.xml.trans_base
new file mode 100644
index 0000000..4bb9b48
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_simple_6.3.xml.trans_base
@@ -0,0 +1,24 @@
+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_6.3.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_6.3">
+    <Structure name="s">
+        <Int32 name="i1"/>
+        <String name="s"/>
+        <Structure name="inner"/>
+    </Structure>
+</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_6.3.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_6.3">
+    <Structure name="s">
+        <Int32 name="i1"/>
+        <String name="s"/>
+        <Structure name="inner"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>196bdc9a</Value>
+        </Attribute>
+    </Structure>
+</Dataset>
+
+The data:
+{ { 123456789, "Silly test string: 1", {  } } }
diff --git a/tests/dmr-testsuite/little-endian/test_simple_6.xml.1.trans_base b/tests/dmr-testsuite/little-endian/test_simple_6.xml.1.trans_base
new file mode 100644
index 0000000..b28256d
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_simple_6.xml.1.trans_base
@@ -0,0 +1,22 @@
+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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_6">
+    <Structure name="s">
+        <Int32 name="i1"/>
+        <String name="s"/>
+    </Structure>
+</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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_6">
+    <Structure name="s">
+        <Int32 name="i1"/>
+        <String name="s"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>196bdc9a</Value>
+        </Attribute>
+    </Structure>
+</Dataset>
+
+The data:
+{ { 123456789, "Silly test string: 1" } }
diff --git a/tests/dmr-testsuite/little-endian/test_simple_6.xml.2.trans_base b/tests/dmr-testsuite/little-endian/test_simple_6.xml.2.trans_base
new file mode 100644
index 0000000..77afc2a
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_simple_6.xml.2.trans_base
@@ -0,0 +1,21 @@
+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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_6">
+    <Structure name="s">
+        <Int32 name="i1"/>
+        <String name="s"/>
+    </Structure>
+</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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_6">
+    <Structure name="s">
+        <Int32 name="i1"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>18df6c9e</Value>
+        </Attribute>
+    </Structure>
+</Dataset>
+
+The data:
+{ { 123456789 } }
diff --git a/tests/dmr-testsuite/little-endian/test_simple_6.xml.3.trans_base b/tests/dmr-testsuite/little-endian/test_simple_6.xml.3.trans_base
new file mode 100644
index 0000000..583ebd8
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_simple_6.xml.3.trans_base
@@ -0,0 +1,21 @@
+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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_6">
+    <Structure name="s">
+        <Int32 name="i1"/>
+        <String name="s"/>
+    </Structure>
+</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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_6">
+    <Structure name="s">
+        <String name="s"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>3d9a4edd</Value>
+        </Attribute>
+    </Structure>
+</Dataset>
+
+The data:
+{ { "Silly test string: 1" } }
diff --git a/tests/dmr-testsuite/little-endian/test_simple_6.xml.intern_base b/tests/dmr-testsuite/little-endian/test_simple_6.xml.intern_base
new file mode 100644
index 0000000..492e4be
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_simple_6.xml.intern_base
@@ -0,0 +1,19 @@
+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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_6">
+    <Structure name="s">
+        <Int32 name="i1"/>
+        <String name="s"/>
+    </Structure>
+</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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_6">
+    <Structure name="s">
+        <Int32 name="i1"/>
+        <String name="s"/>
+    </Structure>
+</Dataset>
+
+The data:
+{ { 123456789, "Silly test string: 1" } }
diff --git a/tests/dmr-testsuite/little-endian/test_simple_6.xml.trans_base b/tests/dmr-testsuite/little-endian/test_simple_6.xml.trans_base
new file mode 100644
index 0000000..b28256d
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_simple_6.xml.trans_base
@@ -0,0 +1,22 @@
+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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_6">
+    <Structure name="s">
+        <Int32 name="i1"/>
+        <String name="s"/>
+    </Structure>
+</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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_6">
+    <Structure name="s">
+        <Int32 name="i1"/>
+        <String name="s"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>196bdc9a</Value>
+        </Attribute>
+    </Structure>
+</Dataset>
+
+The data:
+{ { 123456789, "Silly test string: 1" } }
diff --git a/tests/dmr-testsuite/little-endian/test_simple_7.xml.1.trans_base b/tests/dmr-testsuite/little-endian/test_simple_7.xml.1.trans_base
new file mode 100644
index 0000000..af9fe17
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_simple_7.xml.1.trans_base
@@ -0,0 +1,22 @@
+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>b617a898</Value>
+        </Attribute>
+    </Sequence>
+</Dataset>
+
+The data:
+{ { { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" } } }
diff --git a/tests/dmr-testsuite/little-endian/test_simple_7.xml.2.trans_base b/tests/dmr-testsuite/little-endian/test_simple_7.xml.2.trans_base
new file mode 100644
index 0000000..306fd93
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_simple_7.xml.2.trans_base
@@ -0,0 +1,21 @@
+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"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>b2871a70</Value>
+        </Attribute>
+    </Sequence>
+</Dataset>
+
+The data:
+{ { { 123456789 }, { 123456789 }, { 123456789 }, { 123456789 } } }
diff --git a/tests/dmr-testsuite/little-endian/test_simple_7.xml.intern_base b/tests/dmr-testsuite/little-endian/test_simple_7.xml.intern_base
new file mode 100644
index 0000000..1ab9b0e
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_simple_7.xml.intern_base
@@ -0,0 +1,19 @@
+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"/>
+    </Sequence>
+</Dataset>
+
+The data:
+{ { { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" } } }
diff --git a/tests/dmr-testsuite/little-endian/test_simple_7.xml.trans_base b/tests/dmr-testsuite/little-endian/test_simple_7.xml.trans_base
new file mode 100644
index 0000000..af9fe17
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_simple_7.xml.trans_base
@@ -0,0 +1,22 @@
+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>b617a898</Value>
+        </Attribute>
+    </Sequence>
+</Dataset>
+
+The data:
+{ { { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" } } }
diff --git a/tests/dmr-testsuite/little-endian/test_simple_8.xml.1.trans_base b/tests/dmr-testsuite/little-endian/test_simple_8.xml.1.trans_base
new file mode 100644
index 0000000..3ddf2c9
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_simple_8.xml.1.trans_base
@@ -0,0 +1,26 @@
+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_8.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_8">
+    <Structure name="outer">
+        <Sequence name="s">
+            <Int32 name="i1"/>
+            <String name="s"/>
+        </Sequence>
+    </Structure>
+</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_8.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_8">
+    <Structure name="outer">
+        <Sequence name="s">
+            <Int32 name="i1"/>
+            <String name="s"/>
+        </Sequence>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>b617a898</Value>
+        </Attribute>
+    </Structure>
+</Dataset>
+
+The data:
+{ { { { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" } } } }
diff --git a/tests/dmr-testsuite/little-endian/test_simple_8.xml.2.trans_base b/tests/dmr-testsuite/little-endian/test_simple_8.xml.2.trans_base
new file mode 100644
index 0000000..7dec4b0
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_simple_8.xml.2.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_simple_8.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_8">
+    <Structure name="outer">
+        <Sequence name="s">
+            <Int32 name="i1"/>
+            <String name="s"/>
+        </Sequence>
+    </Structure>
+</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_8.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_8">
+    <Structure name="outer">
+        <Sequence name="s">
+            <String name="s"/>
+        </Sequence>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>03a807fd</Value>
+        </Attribute>
+    </Structure>
+</Dataset>
+
+The data:
+{ { { { "Silly test string: 1" }, { "Silly test string: 1" }, { "Silly test string: 1" }, { "Silly test string: 1" } } } }
diff --git a/tests/dmr-testsuite/little-endian/test_simple_8.xml.intern_base b/tests/dmr-testsuite/little-endian/test_simple_8.xml.intern_base
new file mode 100644
index 0000000..db42cfa
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_simple_8.xml.intern_base
@@ -0,0 +1,23 @@
+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_8.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_8">
+    <Structure name="outer">
+        <Sequence name="s">
+            <Int32 name="i1"/>
+            <String name="s"/>
+        </Sequence>
+    </Structure>
+</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_8.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_8">
+    <Structure name="outer">
+        <Sequence name="s">
+            <Int32 name="i1"/>
+            <String name="s"/>
+        </Sequence>
+    </Structure>
+</Dataset>
+
+The data:
+{ { { { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" } } } }
diff --git a/tests/dmr-testsuite/little-endian/test_simple_8.xml.trans_base b/tests/dmr-testsuite/little-endian/test_simple_8.xml.trans_base
new file mode 100644
index 0000000..3ddf2c9
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_simple_8.xml.trans_base
@@ -0,0 +1,26 @@
+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_8.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_8">
+    <Structure name="outer">
+        <Sequence name="s">
+            <Int32 name="i1"/>
+            <String name="s"/>
+        </Sequence>
+    </Structure>
+</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_8.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_8">
+    <Structure name="outer">
+        <Sequence name="s">
+            <Int32 name="i1"/>
+            <String name="s"/>
+        </Sequence>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>b617a898</Value>
+        </Attribute>
+    </Structure>
+</Dataset>
+
+The data:
+{ { { { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" }, { 123456789, "Silly test string: 1" } } } }
diff --git a/tests/dmr-testsuite/little-endian/test_simple_9.1.xml.intern_base b/tests/dmr-testsuite/little-endian/test_simple_9.1.xml.intern_base
new file mode 100644
index 0000000..42fff02
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_simple_9.1.xml.intern_base
@@ -0,0 +1,37 @@
+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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_9">
+    <Enumeration name="color" basetype="Int32">
+        <EnumConst name="red" value="1"/>
+        <EnumConst name="blue" value="2"/>
+        <EnumConst name="gray" value="3"/>
+    </Enumeration>
+    <Enumeration name="shade" basetype="UInt64">
+        <EnumConst name="light" value="1"/>
+        <EnumConst name="med" value="2"/>
+        <EnumConst name="dark" value="3"/>
+        <EnumConst name="pitch" value="256"/>
+    </Enumeration>
+    <Enum name="e" enum="/color"/>
+    <Enum name="f" enum="/shade"/>
+</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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_9">
+    <Enumeration name="color" basetype="Int32">
+        <EnumConst name="red" value="1"/>
+        <EnumConst name="blue" value="2"/>
+        <EnumConst name="gray" value="3"/>
+    </Enumeration>
+    <Enumeration name="shade" basetype="UInt64">
+        <EnumConst name="light" value="1"/>
+        <EnumConst name="med" value="2"/>
+        <EnumConst name="dark" value="3"/>
+        <EnumConst name="pitch" value="256"/>
+    </Enumeration>
+    <Enum name="e" enum="/color"/>
+    <Enum name="f" enum="/shade"/>
+</Dataset>
+
+The data:
+{ 1, 1 }
diff --git a/tests/dmr-testsuite/little-endian/test_simple_9.1.xml.trans_base b/tests/dmr-testsuite/little-endian/test_simple_9.1.xml.trans_base
new file mode 100644
index 0000000..1b83417
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_simple_9.1.xml.trans_base
@@ -0,0 +1,45 @@
+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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_9">
+    <Enumeration name="color" basetype="Int32">
+        <EnumConst name="red" value="1"/>
+        <EnumConst name="blue" value="2"/>
+        <EnumConst name="gray" value="3"/>
+    </Enumeration>
+    <Enumeration name="shade" basetype="UInt64">
+        <EnumConst name="light" value="1"/>
+        <EnumConst name="med" value="2"/>
+        <EnumConst name="dark" value="3"/>
+        <EnumConst name="pitch" value="256"/>
+    </Enumeration>
+    <Enum name="e" enum="/color"/>
+    <Enum name="f" enum="/shade"/>
+</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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_9">
+    <Enumeration name="color" basetype="Int32">
+        <EnumConst name="red" value="1"/>
+        <EnumConst name="blue" value="2"/>
+        <EnumConst name="gray" value="3"/>
+    </Enumeration>
+    <Enumeration name="shade" basetype="UInt64">
+        <EnumConst name="light" value="1"/>
+        <EnumConst name="med" value="2"/>
+        <EnumConst name="dark" value="3"/>
+        <EnumConst name="pitch" value="256"/>
+    </Enumeration>
+    <Enum name="e" enum="/color">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>99f8b879</Value>
+        </Attribute>
+    </Enum>
+    <Enum name="f" enum="/shade">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>a988dff7</Value>
+        </Attribute>
+    </Enum>
+</Dataset>
+
+The data:
+{ 1, 1 }
diff --git a/tests/dmr-testsuite/little-endian/test_simple_9.xml.intern_base b/tests/dmr-testsuite/little-endian/test_simple_9.xml.intern_base
new file mode 100644
index 0000000..f2ba8fa
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_simple_9.xml.intern_base
@@ -0,0 +1,23 @@
+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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_9">
+    <Enumeration name="color" basetype="Byte">
+        <EnumConst name="red" value="1"/>
+        <EnumConst name="blue" value="2"/>
+        <EnumConst name="gray" value="3"/>
+    </Enumeration>
+    <Enum name="e" enum="/color"/>
+</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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_9">
+    <Enumeration name="color" basetype="Byte">
+        <EnumConst name="red" value="1"/>
+        <EnumConst name="blue" value="2"/>
+        <EnumConst name="gray" value="3"/>
+    </Enumeration>
+    <Enum name="e" enum="/color"/>
+</Dataset>
+
+The data:
+{ 1 }
diff --git a/tests/dmr-testsuite/little-endian/test_simple_9.xml.trans_base b/tests/dmr-testsuite/little-endian/test_simple_9.xml.trans_base
new file mode 100644
index 0000000..ee8aa87
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/test_simple_9.xml.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_simple_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_9">
+    <Enumeration name="color" basetype="Byte">
+        <EnumConst name="red" value="1"/>
+        <EnumConst name="blue" value="2"/>
+        <EnumConst name="gray" value="3"/>
+    </Enumeration>
+    <Enum name="e" enum="/color"/>
+</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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_9">
+    <Enumeration name="color" basetype="Byte">
+        <EnumConst name="red" value="1"/>
+        <EnumConst name="blue" value="2"/>
+        <EnumConst name="gray" value="3"/>
+    </Enumeration>
+    <Enum name="e" enum="/color">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>a505df1b</Value>
+        </Attribute>
+    </Enum>
+</Dataset>
+
+The data:
+{ 1 }
diff --git a/tests/dmr-testsuite/little-endian/vol_1_ce_1.xml.1.func_base b/tests/dmr-testsuite/little-endian/vol_1_ce_1.xml.1.func_base
new file mode 100644
index 0000000..f5705e4
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/vol_1_ce_1.xml.1.func_base
@@ -0,0 +1,22 @@
+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_1.xml" dapVersion="4.0" dmrVersion="1.0" name="vol_1_ce_1">
+    <Int32 name="u"/>
+    <Int32 name="v"/>
+    <Structure name="Point">
+        <Int32 name="x"/>
+        <Int32 name="y"/>
+    </Structure>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="function_results">
+    <Float64 name="u">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>8f450c0e</Value>
+        </Attribute>
+    </Float64>
+</Dataset>
+
+The data:
+{ 1234567890 }
diff --git a/tests/dmr-testsuite/little-endian/vol_1_ce_1.xml.10.func_base b/tests/dmr-testsuite/little-endian/vol_1_ce_1.xml.10.func_base
new file mode 100644
index 0000000..36d678c
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/vol_1_ce_1.xml.10.func_base
@@ -0,0 +1,23 @@
+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_1.xml" dapVersion="4.0" dmrVersion="1.0" name="vol_1_ce_1">
+    <Int32 name="u"/>
+    <Int32 name="v"/>
+    <Structure name="Point">
+        <Int32 name="x"/>
+        <Int32 name="y"/>
+    </Structure>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="function_results">
+    <Float64 name="g1">
+        <Dim size="4"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>85b447dc</Value>
+        </Attribute>
+    </Float64>
+</Dataset>
+
+The data:
+{ {10, 20, 30, -40} }
diff --git a/tests/dmr-testsuite/little-endian/vol_1_ce_1.xml.11.func_base b/tests/dmr-testsuite/little-endian/vol_1_ce_1.xml.11.func_base
new file mode 100644
index 0000000..ee37ffc
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/vol_1_ce_1.xml.11.func_base
@@ -0,0 +1,23 @@
+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_1.xml" dapVersion="4.0" dmrVersion="1.0" name="vol_1_ce_1">
+    <Int32 name="u"/>
+    <Int32 name="v"/>
+    <Structure name="Point">
+        <Int32 name="x"/>
+        <Int32 name="y"/>
+    </Structure>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="function_results">
+    <Float64 name="g1">
+        <Dim size="4"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>680cc4fc</Value>
+        </Attribute>
+    </Float64>
+</Dataset>
+
+The data:
+{ {10, 20, 30, 40} }
diff --git a/tests/dmr-testsuite/little-endian/vol_1_ce_1.xml.12.func_base b/tests/dmr-testsuite/little-endian/vol_1_ce_1.xml.12.func_base
new file mode 100644
index 0000000..36d678c
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/vol_1_ce_1.xml.12.func_base
@@ -0,0 +1,23 @@
+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_1.xml" dapVersion="4.0" dmrVersion="1.0" name="vol_1_ce_1">
+    <Int32 name="u"/>
+    <Int32 name="v"/>
+    <Structure name="Point">
+        <Int32 name="x"/>
+        <Int32 name="y"/>
+    </Structure>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="function_results">
+    <Float64 name="g1">
+        <Dim size="4"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>85b447dc</Value>
+        </Attribute>
+    </Float64>
+</Dataset>
+
+The data:
+{ {10, 20, 30, -40} }
diff --git a/tests/dmr-testsuite/little-endian/vol_1_ce_1.xml.13.func_base b/tests/dmr-testsuite/little-endian/vol_1_ce_1.xml.13.func_base
new file mode 100644
index 0000000..7771aba
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/vol_1_ce_1.xml.13.func_base
@@ -0,0 +1,23 @@
+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_1.xml" dapVersion="4.0" dmrVersion="1.0" name="vol_1_ce_1">
+    <Int32 name="u"/>
+    <Int32 name="v"/>
+    <Structure name="Point">
+        <Int32 name="x"/>
+        <Int32 name="y"/>
+    </Structure>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="function_results">
+    <Float64 name="g1">
+        <Dim size="4"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>cb9ac07d</Value>
+        </Attribute>
+    </Float64>
+</Dataset>
+
+The data:
+{ {1, 2, 3, 1.84467440737096e+19} }
diff --git a/tests/dmr-testsuite/little-endian/vol_1_ce_1.xml.14.func_base b/tests/dmr-testsuite/little-endian/vol_1_ce_1.xml.14.func_base
new file mode 100644
index 0000000..2e352a7
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/vol_1_ce_1.xml.14.func_base
@@ -0,0 +1,23 @@
+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_1.xml" dapVersion="4.0" dmrVersion="1.0" name="vol_1_ce_1">
+    <Int32 name="u"/>
+    <Int32 name="v"/>
+    <Structure name="Point">
+        <Int32 name="x"/>
+        <Int32 name="y"/>
+    </Structure>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="function_results">
+    <Float64 name="g1">
+        <Dim size="4"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>8158d22c</Value>
+        </Attribute>
+    </Float64>
+</Dataset>
+
+The data:
+{ {1, 2, 3, 9.22337203685478e+18} }
diff --git a/tests/dmr-testsuite/little-endian/vol_1_ce_1.xml.15.func_base b/tests/dmr-testsuite/little-endian/vol_1_ce_1.xml.15.func_base
new file mode 100644
index 0000000..8781880
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/vol_1_ce_1.xml.15.func_base
@@ -0,0 +1,23 @@
+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_1.xml" dapVersion="4.0" dmrVersion="1.0" name="vol_1_ce_1">
+    <Int32 name="u"/>
+    <Int32 name="v"/>
+    <Structure name="Point">
+        <Int32 name="x"/>
+        <Int32 name="y"/>
+    </Structure>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="function_results">
+    <Float64 name="g1">
+        <Dim size="4"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>ab75a7bc</Value>
+        </Attribute>
+    </Float64>
+</Dataset>
+
+The data:
+{ {10, 20, 30, 45.5000019073486} }
diff --git a/tests/dmr-testsuite/little-endian/vol_1_ce_1.xml.16.func_base b/tests/dmr-testsuite/little-endian/vol_1_ce_1.xml.16.func_base
new file mode 100644
index 0000000..f404ccc
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/vol_1_ce_1.xml.16.func_base
@@ -0,0 +1,23 @@
+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_1.xml" dapVersion="4.0" dmrVersion="1.0" name="vol_1_ce_1">
+    <Int32 name="u"/>
+    <Int32 name="v"/>
+    <Structure name="Point">
+        <Int32 name="x"/>
+        <Int32 name="y"/>
+    </Structure>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="function_results">
+    <Float64 name="g1">
+        <Dim size="4"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>cb95303e</Value>
+        </Attribute>
+    </Float64>
+</Dataset>
+
+The data:
+{ {10, 20, 30, 45.5} }
diff --git a/tests/dmr-testsuite/little-endian/vol_1_ce_1.xml.2.func_base b/tests/dmr-testsuite/little-endian/vol_1_ce_1.xml.2.func_base
new file mode 100644
index 0000000..c6eebd1
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/vol_1_ce_1.xml.2.func_base
@@ -0,0 +1,22 @@
+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_1.xml" dapVersion="4.0" dmrVersion="1.0" name="vol_1_ce_1">
+    <Int32 name="u"/>
+    <Int32 name="v"/>
+    <Structure name="Point">
+        <Int32 name="x"/>
+        <Int32 name="y"/>
+    </Structure>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="function_results">
+    <Float64 name="u">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>fe284a6e</Value>
+        </Attribute>
+    </Float64>
+</Dataset>
+
+The data:
+{ 1.52415787501905e+16 }
diff --git a/tests/dmr-testsuite/little-endian/vol_1_ce_1.xml.3.func_base b/tests/dmr-testsuite/little-endian/vol_1_ce_1.xml.3.func_base
new file mode 100644
index 0000000..30d0674
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/vol_1_ce_1.xml.3.func_base
@@ -0,0 +1,22 @@
+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_1.xml" dapVersion="4.0" dmrVersion="1.0" name="vol_1_ce_1">
+    <Int32 name="u"/>
+    <Int32 name="v"/>
+    <Structure name="Point">
+        <Int32 name="x"/>
+        <Int32 name="y"/>
+    </Structure>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="function_results">
+    <Float64 name="u">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>bb61bad1</Value>
+        </Attribute>
+    </Float64>
+</Dataset>
+
+The data:
+{ 12345678.9 }
diff --git a/tests/dmr-testsuite/little-endian/vol_1_ce_1.xml.4.func_base b/tests/dmr-testsuite/little-endian/vol_1_ce_1.xml.4.func_base
new file mode 100644
index 0000000..29b1854
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/vol_1_ce_1.xml.4.func_base
@@ -0,0 +1,22 @@
+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_1.xml" dapVersion="4.0" dmrVersion="1.0" name="vol_1_ce_1">
+    <Int32 name="u"/>
+    <Int32 name="v"/>
+    <Structure name="Point">
+        <Int32 name="x"/>
+        <Int32 name="y"/>
+    </Structure>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="function_results">
+    <Float64 name="x">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>8f450c0e</Value>
+        </Attribute>
+    </Float64>
+</Dataset>
+
+The data:
+{ 1234567890 }
diff --git a/tests/dmr-testsuite/little-endian/vol_1_ce_1.xml.5.func_base b/tests/dmr-testsuite/little-endian/vol_1_ce_1.xml.5.func_base
new file mode 100644
index 0000000..e59049f
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/vol_1_ce_1.xml.5.func_base
@@ -0,0 +1,22 @@
+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_1.xml" dapVersion="4.0" dmrVersion="1.0" name="vol_1_ce_1">
+    <Int32 name="u"/>
+    <Int32 name="v"/>
+    <Structure name="Point">
+        <Int32 name="x"/>
+        <Int32 name="y"/>
+    </Structure>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="function_results">
+    <Float64 name="x">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>fe284a6e</Value>
+        </Attribute>
+    </Float64>
+</Dataset>
+
+The data:
+{ 1.52415787501905e+16 }
diff --git a/tests/dmr-testsuite/little-endian/vol_1_ce_1.xml.6.func_base b/tests/dmr-testsuite/little-endian/vol_1_ce_1.xml.6.func_base
new file mode 100644
index 0000000..b0880c4
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/vol_1_ce_1.xml.6.func_base
@@ -0,0 +1,22 @@
+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_1.xml" dapVersion="4.0" dmrVersion="1.0" name="vol_1_ce_1">
+    <Int32 name="u"/>
+    <Int32 name="v"/>
+    <Structure name="Point">
+        <Int32 name="x"/>
+        <Int32 name="y"/>
+    </Structure>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="function_results">
+    <Float64 name="x">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>bb61bad1</Value>
+        </Attribute>
+    </Float64>
+</Dataset>
+
+The data:
+{ 12345678.9 }
diff --git a/tests/dmr-testsuite/little-endian/vol_1_ce_1.xml.7.func_base b/tests/dmr-testsuite/little-endian/vol_1_ce_1.xml.7.func_base
new file mode 100644
index 0000000..ee37ffc
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/vol_1_ce_1.xml.7.func_base
@@ -0,0 +1,23 @@
+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_1.xml" dapVersion="4.0" dmrVersion="1.0" name="vol_1_ce_1">
+    <Int32 name="u"/>
+    <Int32 name="v"/>
+    <Structure name="Point">
+        <Int32 name="x"/>
+        <Int32 name="y"/>
+    </Structure>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="function_results">
+    <Float64 name="g1">
+        <Dim size="4"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>680cc4fc</Value>
+        </Attribute>
+    </Float64>
+</Dataset>
+
+The data:
+{ {10, 20, 30, 40} }
diff --git a/tests/dmr-testsuite/little-endian/vol_1_ce_1.xml.8.func_base b/tests/dmr-testsuite/little-endian/vol_1_ce_1.xml.8.func_base
new file mode 100644
index 0000000..204c102
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/vol_1_ce_1.xml.8.func_base
@@ -0,0 +1,23 @@
+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_1.xml" dapVersion="4.0" dmrVersion="1.0" name="vol_1_ce_1">
+    <Int32 name="u"/>
+    <Int32 name="v"/>
+    <Structure name="Point">
+        <Int32 name="x"/>
+        <Int32 name="y"/>
+    </Structure>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="function_results">
+    <Float64 name="g1">
+        <Dim size="4"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>3fca0d88</Value>
+        </Attribute>
+    </Float64>
+</Dataset>
+
+The data:
+{ {100, 110, 120, -90} }
diff --git a/tests/dmr-testsuite/little-endian/vol_1_ce_1.xml.9.func_base b/tests/dmr-testsuite/little-endian/vol_1_ce_1.xml.9.func_base
new file mode 100644
index 0000000..ee37ffc
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/vol_1_ce_1.xml.9.func_base
@@ -0,0 +1,23 @@
+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_1.xml" dapVersion="4.0" dmrVersion="1.0" name="vol_1_ce_1">
+    <Int32 name="u"/>
+    <Int32 name="v"/>
+    <Structure name="Point">
+        <Int32 name="x"/>
+        <Int32 name="y"/>
+    </Structure>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="function_results">
+    <Float64 name="g1">
+        <Dim size="4"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>680cc4fc</Value>
+        </Attribute>
+    </Float64>
+</Dataset>
+
+The data:
+{ {10, 20, 30, 40} }
diff --git a/tests/dmr-testsuite/little-endian/vol_1_ce_10.xml.1.func_base b/tests/dmr-testsuite/little-endian/vol_1_ce_10.xml.1.func_base
new file mode 100644
index 0000000..5e167e8
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/vol_1_ce_10.xml.1.func_base
@@ -0,0 +1,30 @@
+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_10.xml" dapVersion="4.0" dmrVersion="1.0" name="vol_1_ce_10">
+    <Float32 name="lat">
+        <Dim size="100"/>
+        <Dim size="50"/>
+    </Float32>
+    <Float32 name="lon">
+        <Dim size="100"/>
+        <Dim size="50"/>
+    </Float32>
+    <Float32 name="temp">
+        <Dim size="100"/>
+        <Dim size="50"/>
+    </Float32>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="function_results">
+    <Float64 name="lat">
+        <Dim size="100"/>
+        <Dim size="50"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>6ba82768</Value>
+        </Attribute>
+    </Float64>
+</Dataset>
+
+The data:
+{ {{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164}} }
diff --git a/tests/dmr-testsuite/little-endian/vol_1_ce_10.xml.2.func_base b/tests/dmr-testsuite/little-endian/vol_1_ce_10.xml.2.func_base
new file mode 100644
index 0000000..5bd2d3d
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/vol_1_ce_10.xml.2.func_base
@@ -0,0 +1,37 @@
+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_10.xml" dapVersion="4.0" dmrVersion="1.0" name="vol_1_ce_10">
+    <Float32 name="lat">
+        <Dim size="100"/>
+        <Dim size="50"/>
+    </Float32>
+    <Float32 name="lon">
+        <Dim size="100"/>
+        <Dim size="50"/>
+    </Float32>
+    <Float32 name="temp">
+        <Dim size="100"/>
+        <Dim size="50"/>
+    </Float32>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="function_results">
+    <Float64 name="lat">
+        <Dim size="100"/>
+        <Dim size="50"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>6ba82768</Value>
+        </Attribute>
+    </Float64>
+    <Float64 name="lon">
+        <Dim size="100"/>
+        <Dim size="50"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>6ba82768</Value>
+        </Attribute>
+    </Float64>
+</Dataset>
+
+The data:
+{ {{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164}}, {{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164, 999.990005493164}} }
diff --git a/tests/dmr-testsuite/little-endian/vol_1_ce_10.xml.3.func_base b/tests/dmr-testsuite/little-endian/vol_1_ce_10.xml.3.func_base
new file mode 100644
index 0000000..60468dc
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/vol_1_ce_10.xml.3.func_base
@@ -0,0 +1,37 @@
+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_10.xml" dapVersion="4.0" dmrVersion="1.0" name="vol_1_ce_10">
+    <Float32 name="lat">
+        <Dim size="100"/>
+        <Dim size="50"/>
+    </Float32>
+    <Float32 name="lon">
+        <Dim size="100"/>
+        <Dim size="50"/>
+    </Float32>
+    <Float32 name="temp">
+        <Dim size="100"/>
+        <Dim size="50"/>
+    </Float32>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="function_results">
+    <Float64 name="lat">
+        <Dim size="2"/>
+        <Dim size="2"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>8486a6d6</Value>
+        </Attribute>
+    </Float64>
+    <Float64 name="lon">
+        <Dim size="2"/>
+        <Dim size="2"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>8486a6d6</Value>
+        </Attribute>
+    </Float64>
+</Dataset>
+
+The data:
+{ {{999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164}}, {{999.990005493164, 999.990005493164},{999.990005493164, 999.990005493164}} }
diff --git a/tests/dmr-testsuite/little-endian/vol_1_ce_2.xml.1.func_base b/tests/dmr-testsuite/little-endian/vol_1_ce_2.xml.1.func_base
new file mode 100644
index 0000000..5d726d6
--- /dev/null
+++ b/tests/dmr-testsuite/little-endian/vol_1_ce_2.xml.1.func_base
@@ -0,0 +1,15 @@
+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">
+    <Int32 name="u"/>
+    <Int32 name="v"/>
+    <Group name="inst2">
+        <Int32 name="u"/>
+        <Int32 name="v"/>
+        <Structure name="Point">
+            <Int32 name="x"/>
+            <Int32 name="y"/>
+        </Structure>
+    </Group>
+</Dataset>
+
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/test_array_1.xml b/tests/dmr-testsuite/test_array_1.xml
new file mode 100644
index 0000000..73c838d
--- /dev/null
+++ b/tests/dmr-testsuite/test_array_1.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- First in a series of very simple tests. jhrg 7/10/12 -->
+
+<Dataset name="test_array_1" dapVersion="4.0" dmrVersion="1.0" xml:base="file:dap4/test_array_1.xml"
+  xmlns="http://xml.opendap.org/ns/DAP/4.0#"
+  xmlns:dap="http://xml.opendap.org/ns/DAP/4.0#">
+
+  <dap:Int32 name="x">
+    <Dim size="5"/>
+  </dap:Int32>
+
+</Dataset>
diff --git a/tests/dmr-testsuite/test_array_1.xml.baseline b/tests/dmr-testsuite/test_array_1.xml.baseline
new file mode 100644
index 0000000..999caa0
--- /dev/null
+++ b/tests/dmr-testsuite/test_array_1.xml.baseline
@@ -0,0 +1,8 @@
+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_1.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_1">
+    <Int32 name="x">
+        <Dim size="5"/>
+    </Int32>
+</Dataset>
+
diff --git a/tests/dmr-testsuite/test_array_1.xml.send_base b/tests/dmr-testsuite/test_array_1.xml.send_base
new file mode 100644
index 0000000..c48d312
--- /dev/null
+++ b/tests/dmr-testsuite/test_array_1.xml.send_base
@@ -0,0 +1,9 @@
+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_1.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_1">
+    <Int32 name="x">
+        <Dim size="5"/>
+    </Int32>
+</Dataset>
+
+Response file: test_array_1_data.bin
diff --git a/tests/dmr-testsuite/test_array_10.xml b/tests/dmr-testsuite/test_array_10.xml
new file mode 100644
index 0000000..8c8a165
--- /dev/null
+++ b/tests/dmr-testsuite/test_array_10.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" 
+  xml:base="file:test_simple_11.xml"    
+  name="test_simple_11"
+  dapVersion="4.0"
+  dmrVersion="1.0">
+  <Dimension name="d1" size="5"/>
+  <Dimension name="d2" size="3"/>
+  
+  <Opaque name="o">
+    <Dim name="d1"/>
+  </Opaque>
+  
+  <Opaque name="p">
+    <Dim name="d1"/>
+    <Dim name="d2"/>
+  </Opaque>
+  
+</Dataset>   
diff --git a/tests/dmr-testsuite/test_array_10.xml.baseline b/tests/dmr-testsuite/test_array_10.xml.baseline
new file mode 100644
index 0000000..68f10a1
--- /dev/null
+++ b/tests/dmr-testsuite/test_array_10.xml.baseline
@@ -0,0 +1,14 @@
+Parse successful
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:test_simple_11.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_11">
+    <Dimension name="d1" size="5"/>
+    <Dimension name="d2" size="3"/>
+    <Opaque name="o">
+        <Dim name="/d1"/>
+    </Opaque>
+    <Opaque name="p">
+        <Dim name="/d1"/>
+        <Dim name="/d2"/>
+    </Opaque>
+</Dataset>
+
diff --git a/tests/dmr-testsuite/test_array_11.xml b/tests/dmr-testsuite/test_array_11.xml
new file mode 100644
index 0000000..dcd99fc
--- /dev/null
+++ b/tests/dmr-testsuite/test_array_11.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" 
+  xml:base="file:test_simple_11.xml"    
+  name="test_simple_11"
+  dapVersion="4.0"
+  dmrVersion="1.0">
+  <Dimension name="d1" size="5"/>
+  <Dimension name="d2" size="3"/>
+  
+  <Enumeration name="colors" basetype="Byte">
+    <EnumConst name="red" value="1"/>
+    <EnumConst name="green" value="2"/>
+    <EnumConst name="blue" value="3"/>
+  </Enumeration>
+  
+  <Enum name="e1" enum="colors">
+    <Dim name="d1"/>
+  </Enum>
+  
+  <Enum name="e2" enum="colors">
+    <Dim name="d1"/>
+    <Dim name="d2"/>
+  </Enum>
+  
+</Dataset>   
diff --git a/tests/dmr-testsuite/test_array_11.xml.baseline b/tests/dmr-testsuite/test_array_11.xml.baseline
new file mode 100644
index 0000000..bf68587
--- /dev/null
+++ b/tests/dmr-testsuite/test_array_11.xml.baseline
@@ -0,0 +1,19 @@
+Parse successful
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:test_simple_11.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_11">
+    <Dimension name="d1" size="5"/>
+    <Dimension name="d2" size="3"/>
+    <Enumeration name="colors" basetype="Byte">
+        <EnumConst name="red" value="1"/>
+        <EnumConst name="green" value="2"/>
+        <EnumConst name="blue" value="3"/>
+    </Enumeration>
+    <Enum name="e1" enum="/colors">
+        <Dim name="/d1"/>
+    </Enum>
+    <Enum name="e2" enum="/colors">
+        <Dim name="/d1"/>
+        <Dim name="/d2"/>
+    </Enum>
+</Dataset>
+
diff --git a/tests/dmr-testsuite/test_array_12.xml b/tests/dmr-testsuite/test_array_12.xml
new file mode 100644
index 0000000..e256aa2
--- /dev/null
+++ b/tests/dmr-testsuite/test_array_12.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- Test zero length array case. jhrg 1/27/16 -->
+
+<Dataset name="test_array_9" dapVersion="4.0" dmrVersion="1.0" xml:base="file:dap4/test_array_9.xml"
+  xmlns="http://xml.opendap.org/ns/DAP/4.0#"
+  xmlns:dap="http://xml.opendap.org/ns/DAP/4.0#">
+
+  <dap:Int32 name="i">
+    <Dim size="5"/>
+  </dap:Int32>
+
+  <dap:Int32 name="x">
+    <Dim size="0"/>
+  </dap:Int32>
+
+</Dataset>
diff --git a/tests/dmr-testsuite/test_array_12.xml.baseline b/tests/dmr-testsuite/test_array_12.xml.baseline
new file mode 100644
index 0000000..d239887
--- /dev/null
+++ b/tests/dmr-testsuite/test_array_12.xml.baseline
@@ -0,0 +1,11 @@
+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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
+    <Int32 name="i">
+        <Dim size="5"/>
+    </Int32>
+    <Int32 name="x">
+        <Dim size="0"/>
+    </Int32>
+</Dataset>
+
diff --git a/tests/dmr-testsuite/test_array_13.xml b/tests/dmr-testsuite/test_array_13.xml
new file mode 100644
index 0000000..7272ea7
--- /dev/null
+++ b/tests/dmr-testsuite/test_array_13.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- Test zero length array case. jhrg 1/27/16 -->
+
+<Dataset name="test_array_9" dapVersion="4.0" dmrVersion="1.0" xml:base="file:dap4/test_array_9.xml"
+  xmlns="http://xml.opendap.org/ns/DAP/4.0#"
+  xmlns:dap="http://xml.opendap.org/ns/DAP/4.0#">
+
+  <dap:Int32 name="i">
+    <Dim size="5"/>
+  </dap:Int32>
+
+  <dap:Int32 name="x">
+    <Dim size="4"/>
+    <Dim size="0"/>
+  </dap:Int32>
+
+</Dataset>
diff --git a/tests/dmr-testsuite/test_array_13.xml.baseline b/tests/dmr-testsuite/test_array_13.xml.baseline
new file mode 100644
index 0000000..20e0096
--- /dev/null
+++ b/tests/dmr-testsuite/test_array_13.xml.baseline
@@ -0,0 +1,12 @@
+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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
+    <Int32 name="i">
+        <Dim size="5"/>
+    </Int32>
+    <Int32 name="x">
+        <Dim size="4"/>
+        <Dim size="0"/>
+    </Int32>
+</Dataset>
+
diff --git a/tests/dmr-testsuite/test_array_14.xml b/tests/dmr-testsuite/test_array_14.xml
new file mode 100644
index 0000000..207b6d8
--- /dev/null
+++ b/tests/dmr-testsuite/test_array_14.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- Test zero length array case. jhrg 1/27/16 -->
+
+<Dataset name="test_array_9" dapVersion="4.0" dmrVersion="1.0" xml:base="file:dap4/test_array_9.xml"
+  xmlns="http://xml.opendap.org/ns/DAP/4.0#"
+  xmlns:dap="http://xml.opendap.org/ns/DAP/4.0#">
+
+  <dap:Int32 name="i">
+    <Dim size="5"/>
+  </dap:Int32>
+
+  <dap:Int32 name="x">
+    <Dim size="0"/>
+    <Dim size="4"/>
+  </dap:Int32>
+
+</Dataset>
diff --git a/tests/dmr-testsuite/test_array_14.xml.baseline b/tests/dmr-testsuite/test_array_14.xml.baseline
new file mode 100644
index 0000000..428c8f7
--- /dev/null
+++ b/tests/dmr-testsuite/test_array_14.xml.baseline
@@ -0,0 +1,12 @@
+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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
+    <Int32 name="i">
+        <Dim size="5"/>
+    </Int32>
+    <Int32 name="x">
+        <Dim size="0"/>
+        <Dim size="4"/>
+    </Int32>
+</Dataset>
+
diff --git a/tests/dmr-testsuite/test_array_1_data.bin b/tests/dmr-testsuite/test_array_1_data.bin
new file mode 100644
index 0000000..8911582
Binary files /dev/null and b/tests/dmr-testsuite/test_array_1_data.bin differ
diff --git a/tests/dmr-testsuite/test_array_2.xml b/tests/dmr-testsuite/test_array_2.xml
new file mode 100644
index 0000000..f3060e6
--- /dev/null
+++ b/tests/dmr-testsuite/test_array_2.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- First in a series of very simple tests. jhrg 7/10/12 -->
+
+<Dataset name="test_array_2" dapVersion="4.0" dmrVersion="1.0" xml:base="file:dap4/test_array_2.xml"
+  xmlns="http://xml.opendap.org/ns/DAP/4.0#"
+  xmlns:dap="http://xml.opendap.org/ns/DAP/4.0#">
+
+  <dap:Int32 name="x">
+    <Dim size="5"/>
+    <Dim size="4"/>
+  </dap:Int32>
+
+</Dataset>
diff --git a/tests/dmr-testsuite/test_array_2.xml.baseline b/tests/dmr-testsuite/test_array_2.xml.baseline
new file mode 100644
index 0000000..d79fcee
--- /dev/null
+++ b/tests/dmr-testsuite/test_array_2.xml.baseline
@@ -0,0 +1,9 @@
+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_2.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_2">
+    <Int32 name="x">
+        <Dim size="5"/>
+        <Dim size="4"/>
+    </Int32>
+</Dataset>
+
diff --git a/tests/dmr-testsuite/test_array_2.xml.send_base b/tests/dmr-testsuite/test_array_2.xml.send_base
new file mode 100644
index 0000000..fef75f0
--- /dev/null
+++ b/tests/dmr-testsuite/test_array_2.xml.send_base
@@ -0,0 +1,10 @@
+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_2.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_2">
+    <Int32 name="x">
+        <Dim size="5"/>
+        <Dim size="4"/>
+    </Int32>
+</Dataset>
+
+Response file: test_array_2_data.bin
diff --git a/tests/dmr-testsuite/test_array_2_data.bin b/tests/dmr-testsuite/test_array_2_data.bin
new file mode 100644
index 0000000..73205f5
Binary files /dev/null and b/tests/dmr-testsuite/test_array_2_data.bin differ
diff --git a/tests/dmr-testsuite/test_array_3.1.dmr b/tests/dmr-testsuite/test_array_3.1.dmr
new file mode 100644
index 0000000..cfbedf6
--- /dev/null
+++ b/tests/dmr-testsuite/test_array_3.1.dmr
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Dataset name="test_array_3" dapVersion="4.0" dmrVersion="1.0" xml:base="file:dap4/test_array_3.xml"
+  xmlns="http://xml.opendap.org/ns/DAP/4.0#"
+  xmlns:dap="http://xml.opendap.org/ns/DAP/4.0#">
+
+  <Dimension name="row" size="5"/>   
+ 
+   <Float32 name="row">
+    <Dim name="row"/>
+  </Float32>
+  
+  <dap:String name="x">
+    <Dim name="row"/>
+    <Map name="row"/>
+  </dap:String>
+
+</Dataset>
diff --git a/tests/dmr-testsuite/test_array_3.xml b/tests/dmr-testsuite/test_array_3.xml
new file mode 100644
index 0000000..a11f352
--- /dev/null
+++ b/tests/dmr-testsuite/test_array_3.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Dataset name="test_array_3" dapVersion="4.0" dmrVersion="1.0" xml:base="file:dap4/test_array_3.xml"
+  xmlns="http://xml.opendap.org/ns/DAP/4.0#"
+  xmlns:dap="http://xml.opendap.org/ns/DAP/4.0#">
+
+  <Dimension name="row" size="5"/>   
+  
+  <dap:String name="x">
+    <Dim name="row"/>
+    <Dim size="3"/>
+  </dap:String>
+
+</Dataset>
diff --git a/tests/dmr-testsuite/test_array_3.xml.baseline b/tests/dmr-testsuite/test_array_3.xml.baseline
new file mode 100644
index 0000000..8c990ad
--- /dev/null
+++ b/tests/dmr-testsuite/test_array_3.xml.baseline
@@ -0,0 +1,10 @@
+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"/>
+    <String name="x">
+        <Dim name="/row"/>
+        <Dim size="3"/>
+    </String>
+</Dataset>
+
diff --git a/tests/dmr-testsuite/test_array_3.xml.send_base b/tests/dmr-testsuite/test_array_3.xml.send_base
new file mode 100644
index 0000000..a1d71de
--- /dev/null
+++ b/tests/dmr-testsuite/test_array_3.xml.send_base
@@ -0,0 +1,11 @@
+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"/>
+    <String name="x">
+        <Dim name="/row"/>
+        <Dim size="3"/>
+    </String>
+</Dataset>
+
+Response file: test_array_3_data.bin
diff --git a/tests/dmr-testsuite/test_array_3_data.bin b/tests/dmr-testsuite/test_array_3_data.bin
new file mode 100644
index 0000000..dd75f54
Binary files /dev/null and b/tests/dmr-testsuite/test_array_3_data.bin differ
diff --git a/tests/dmr-testsuite/test_array_4.xml b/tests/dmr-testsuite/test_array_4.xml
new file mode 100644
index 0000000..400eeab
--- /dev/null
+++ b/tests/dmr-testsuite/test_array_4.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<Dataset name="test_array_4" dapVersion="4.0" dmrVersion="1.0" xml:base="file:dap4/test_array_4.xml"
+  xmlns="http://xml.opendap.org/ns/DAP/4.0#"
+  xmlns:dap="http://xml.opendap.org/ns/DAP/4.0#">
+
+  <Dimension name="row" size="3"/>
+  <Dimension name="col" size="4"/>
+
+  <dap:Byte name="a">
+    <Dim name="row"/>
+    <Dim name="col"/>
+  </dap:Byte>
+
+  <dap:Int16 name="b">
+    <Dim name="row"/>
+    <Dim name="col"/>
+  </dap:Int16>
+
+  <dap:Int32 name="c">
+    <Dim name="row"/>
+    <Dim name="col"/>
+  </dap:Int32>
+
+  <dap:UInt16 name="d">
+    <Dim name="row"/>
+    <Dim name="col"/>
+  </dap:UInt16>
+
+  <dap:UInt32 name="e">
+    <Dim name="row"/>
+    <Dim name="col"/>
+  </dap:UInt32>
+
+  <dap:Float32 name="f">
+    <Dim name="row"/>
+    <Dim name="col"/>
+  </dap:Float32>
+
+  <dap:Float64 name="g">
+    <Dim name="row"/>
+    <Dim name="col"/>
+  </dap:Float64>
+
+  <dap:String name="h">
+    <Dim name="row"/>
+    <Dim name="col"/>
+  </dap:String>
+
+  <dap:URL name="i">
+    <Dim name="row"/>
+    <Dim name="col"/>
+  </dap:URL>
+
+  <dap:Int32 name="x">
+    <Dim name="row"/>
+    <Dim size="5"/>
+  </dap:Int32>
+  
+  <dap:Int32 name="y">
+    <Dim size="5"/>
+    <Dim name="col"/>
+  </dap:Int32>
+  
+</Dataset>
diff --git a/tests/dmr-testsuite/test_array_4.xml.baseline b/tests/dmr-testsuite/test_array_4.xml.baseline
new file mode 100644
index 0000000..0ab23fc
--- /dev/null
+++ b/tests/dmr-testsuite/test_array_4.xml.baseline
@@ -0,0 +1,51 @@
+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_4.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_4">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Byte name="a">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Byte>
+    <Int16 name="b">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int16>
+    <Int32 name="c">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int32>
+    <UInt16 name="d">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt16>
+    <UInt32 name="e">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt32>
+    <Float32 name="f">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Float32>
+    <Float64 name="g">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Float64>
+    <String name="h">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </String>
+    <URL name="i">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </URL>
+    <Int32 name="x">
+        <Dim name="/row"/>
+        <Dim size="5"/>
+    </Int32>
+    <Int32 name="y">
+        <Dim size="5"/>
+        <Dim name="/col"/>
+    </Int32>
+</Dataset>
+
diff --git a/tests/dmr-testsuite/test_array_4.xml.send_base b/tests/dmr-testsuite/test_array_4.xml.send_base
new file mode 100644
index 0000000..4907381
--- /dev/null
+++ b/tests/dmr-testsuite/test_array_4.xml.send_base
@@ -0,0 +1,52 @@
+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_4.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_4">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Byte name="a">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Byte>
+    <Int16 name="b">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int16>
+    <Int32 name="c">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int32>
+    <UInt16 name="d">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt16>
+    <UInt32 name="e">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt32>
+    <Float32 name="f">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Float32>
+    <Float64 name="g">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Float64>
+    <String name="h">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </String>
+    <URL name="i">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </URL>
+    <Int32 name="x">
+        <Dim name="/row"/>
+        <Dim size="5"/>
+    </Int32>
+    <Int32 name="y">
+        <Dim size="5"/>
+        <Dim name="/col"/>
+    </Int32>
+</Dataset>
+
+Response file: test_array_4_data.bin
diff --git a/tests/dmr-testsuite/test_array_4_data.bin b/tests/dmr-testsuite/test_array_4_data.bin
new file mode 100644
index 0000000..4997818
Binary files /dev/null and b/tests/dmr-testsuite/test_array_4_data.bin differ
diff --git a/tests/dmr-testsuite/test_array_5.xml b/tests/dmr-testsuite/test_array_5.xml
new file mode 100644
index 0000000..000bd80
--- /dev/null
+++ b/tests/dmr-testsuite/test_array_5.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<Dataset name="test_array_5" dapVersion="4.0" dmrVersion="1.0" xml:base="file:dap4/test_array_5.xml"
+  xmlns="http://xml.opendap.org/ns/DAP/4.0#"
+  xmlns:dap="http://xml.opendap.org/ns/DAP/4.0#">
+  
+  <Dimension name="row" size="3"/>
+  <Dimension name="col" size="4"/>
+  
+  <dap:Int8 name="a">
+    <Dim name="row"/>
+    <Dim name="col"/>
+  </dap:Int8>
+  
+  <dap:UInt8 name="b">
+    <Dim name="row"/>
+    <Dim name="col"/>
+  </dap:UInt8>
+  
+  <dap:Int64 name="c">
+    <Dim name="row"/>
+    <Dim name="col"/>
+  </dap:Int64>
+  
+  <dap:UInt64 name="d">
+    <Dim name="row"/>
+    <Dim name="col"/>
+  </dap:UInt64>
+
+
+</Dataset>
diff --git a/tests/dmr-testsuite/test_array_5.xml.baseline b/tests/dmr-testsuite/test_array_5.xml.baseline
new file mode 100644
index 0000000..c572b3d
--- /dev/null
+++ b/tests/dmr-testsuite/test_array_5.xml.baseline
@@ -0,0 +1,23 @@
+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_5.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_5">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Int8 name="a">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int8>
+    <UInt8 name="b">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt8>
+    <Int64 name="c">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int64>
+    <UInt64 name="d">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt64>
+</Dataset>
+
diff --git a/tests/dmr-testsuite/test_array_5.xml.send_base b/tests/dmr-testsuite/test_array_5.xml.send_base
new file mode 100644
index 0000000..5af317a
--- /dev/null
+++ b/tests/dmr-testsuite/test_array_5.xml.send_base
@@ -0,0 +1,24 @@
+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_5.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_5">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Int8 name="a">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int8>
+    <UInt8 name="b">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt8>
+    <Int64 name="c">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Int64>
+    <UInt64 name="d">
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </UInt64>
+</Dataset>
+
+Response file: test_array_5_data.bin
diff --git a/tests/dmr-testsuite/test_array_5_data.bin b/tests/dmr-testsuite/test_array_5_data.bin
new file mode 100644
index 0000000..4be202b
Binary files /dev/null and b/tests/dmr-testsuite/test_array_5_data.bin differ
diff --git a/tests/dmr-testsuite/test_array_6.1.xml b/tests/dmr-testsuite/test_array_6.1.xml
new file mode 100644
index 0000000..7febfd3
--- /dev/null
+++ b/tests/dmr-testsuite/test_array_6.1.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<Dataset name="test_array_6" dapVersion="4.0" dmrVersion="1.0" xml:base="file:dap4/test_array_6.xml"
+  xmlns="http://xml.opendap.org/ns/DAP/4.0#"
+  xmlns:dap="http://xml.opendap.org/ns/DAP/4.0#">
+  
+  <Dimension name="row" size="3"/>
+  <Dimension name="col" size="4"/>
+  
+  <Structure name="a">
+    <Int32 name="i">
+        <Dim name="row"/>
+        <Dim size="6"/>
+    </Int32>
+    <Int32 name="j"/>
+    <Dim name="row"/>
+    <Dim name="col"/>   
+  </Structure>
+</Dataset>
diff --git a/tests/dmr-testsuite/test_array_6.2.xml b/tests/dmr-testsuite/test_array_6.2.xml
new file mode 100644
index 0000000..ffe6be6
--- /dev/null
+++ b/tests/dmr-testsuite/test_array_6.2.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<Dataset name="test_array_6" dapVersion="4.0" dmrVersion="1.0" xml:base="file:dap4/test_array_6.xml"
+  xmlns="http://xml.opendap.org/ns/DAP/4.0#"
+  xmlns:dap="http://xml.opendap.org/ns/DAP/4.0#">
+  
+  <Dimension name="row" size="3"/>
+  <Dimension name="col" size="4"/>
+  
+  <Structure name="a">
+    <Int32 name="i">
+        <Dim name="row"/>
+        <Dim name="col"/>   
+    </Int32>
+    <Int32 name="j"/>
+  </Structure>
+</Dataset>
diff --git a/tests/dmr-testsuite/test_array_6.xml b/tests/dmr-testsuite/test_array_6.xml
new file mode 100644
index 0000000..e1feb9c
--- /dev/null
+++ b/tests/dmr-testsuite/test_array_6.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<Dataset name="test_array_6" dapVersion="4.0" dmrVersion="1.0" xml:base="file:dap4/test_array_6.xml"
+  xmlns="http://xml.opendap.org/ns/DAP/4.0#"
+  xmlns:dap="http://xml.opendap.org/ns/DAP/4.0#">
+  
+  <Dimension name="row" size="3"/>
+  <Dimension name="col" size="4"/>
+  
+  <Structure name="a">
+    <Int32 name="i"/>
+    <Int32 name="j"/>
+    <Dim name="row"/>
+    <Dim name="col"/>   
+  </Structure>
+</Dataset>
diff --git a/tests/dmr-testsuite/test_array_6.xml.baseline b/tests/dmr-testsuite/test_array_6.xml.baseline
new file mode 100644
index 0000000..997d51c
--- /dev/null
+++ b/tests/dmr-testsuite/test_array_6.xml.baseline
@@ -0,0 +1,13 @@
+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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_6">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Structure name="a">
+        <Int32 name="i"/>
+        <Int32 name="j"/>
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Structure>
+</Dataset>
+
diff --git a/tests/dmr-testsuite/test_array_6.xml.send_base b/tests/dmr-testsuite/test_array_6.xml.send_base
new file mode 100644
index 0000000..8b84af1
--- /dev/null
+++ b/tests/dmr-testsuite/test_array_6.xml.send_base
@@ -0,0 +1,14 @@
+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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_6">
+    <Dimension name="row" size="3"/>
+    <Dimension name="col" size="4"/>
+    <Structure name="a">
+        <Int32 name="i"/>
+        <Int32 name="j"/>
+        <Dim name="/row"/>
+        <Dim name="/col"/>
+    </Structure>
+</Dataset>
+
+Response file: test_array_6_data.bin
diff --git a/tests/dmr-testsuite/test_array_6_data.bin b/tests/dmr-testsuite/test_array_6_data.bin
new file mode 100644
index 0000000..a34dfd7
Binary files /dev/null and b/tests/dmr-testsuite/test_array_6_data.bin differ
diff --git a/tests/dmr-testsuite/test_array_7.1.xml b/tests/dmr-testsuite/test_array_7.1.xml
new file mode 100644
index 0000000..ecd863a
--- /dev/null
+++ b/tests/dmr-testsuite/test_array_7.1.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<Dataset name="test_array_7" dapVersion="4.0" dmrVersion="1.0" xml:base="file:dap4/test_array_7.xml"
+  xmlns="http://xml.opendap.org/ns/DAP/4.0#" xmlns:dap="http://xml.opendap.org/ns/DAP/4.0#">
+
+  <Dimension name="row" size="4"/>
+  <Dimension name="col" size="5"/>
+
+  <Sequence name="s">
+    <Int32 name="i1">
+      <Dim name="row"/>
+      <Dim name="col"/>
+    </Int32>
+    <String name="s"/>
+  </Sequence>
+
+</Dataset>
diff --git a/tests/dmr-testsuite/test_array_7.2.xml b/tests/dmr-testsuite/test_array_7.2.xml
new file mode 100644
index 0000000..1991de8
--- /dev/null
+++ b/tests/dmr-testsuite/test_array_7.2.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<Dataset name="test_array_7" dapVersion="4.0" dmrVersion="1.0" xml:base="file:dap4/test_array_7.xml"
+  xmlns="http://xml.opendap.org/ns/DAP/4.0#" xmlns:dap="http://xml.opendap.org/ns/DAP/4.0#">
+
+  <Dimension name="row" size="4"/>
+  <Dimension name="col" size="5"/>
+
+  <Sequence name="s">
+    <Dim size="4"/>
+    <Int32 name="i1">
+      <Dim name="row"/>
+      <Dim name="col"/>
+    </Int32>
+    <String name="s"/>
+  </Sequence>
+
+</Dataset>
diff --git a/tests/dmr-testsuite/test_array_7.xml b/tests/dmr-testsuite/test_array_7.xml
new file mode 100644
index 0000000..ccddbb6
--- /dev/null
+++ b/tests/dmr-testsuite/test_array_7.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<Dataset name="test_array_7" dapVersion="4.0" dmrVersion="1.0" xml:base="file:dap4/test_array_7.xml"
+  xmlns="http://xml.opendap.org/ns/DAP/4.0#"
+  xmlns:dap="http://xml.opendap.org/ns/DAP/4.0#">
+  
+    <Sequence name="s">
+        <Dim size="2"/>
+        <Int32 name="i1"/>
+        <String name="s"/>
+    </Sequence>
+  
+</Dataset>
diff --git a/tests/dmr-testsuite/test_array_7.xml.baseline b/tests/dmr-testsuite/test_array_7.xml.baseline
new file mode 100644
index 0000000..c934bf0
--- /dev/null
+++ b/tests/dmr-testsuite/test_array_7.xml.baseline
@@ -0,0 +1,10 @@
+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_7.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_7">
+    <Sequence name="s">
+        <Int32 name="i1"/>
+        <String name="s"/>
+        <Dim size="2"/>
+    </Sequence>
+</Dataset>
+
diff --git a/tests/dmr-testsuite/test_array_8.xml b/tests/dmr-testsuite/test_array_8.xml
new file mode 100644
index 0000000..91de607
--- /dev/null
+++ b/tests/dmr-testsuite/test_array_8.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<Dataset name="test_array_8" dapVersion="4.0" dmrVersion="1.0" xml:base="file:dap4/test_array_8.xml"
+  xmlns="http://xml.opendap.org/ns/DAP/4.0#" xmlns:dap="http://xml.opendap.org/ns/DAP/4.0#">
+  <Dimension name="col" size="3"/>
+  <Sequence name="s">
+    <Dim size="2"/>
+    <Dim name="col"/>
+    <Int32 name="i1"/>
+    <String name="s"/>
+  </Sequence>
+
+</Dataset>
diff --git a/tests/dmr-testsuite/test_array_8.xml.baseline b/tests/dmr-testsuite/test_array_8.xml.baseline
new file mode 100644
index 0000000..98e2de9
--- /dev/null
+++ b/tests/dmr-testsuite/test_array_8.xml.baseline
@@ -0,0 +1,12 @@
+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_8.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_8">
+    <Dimension name="col" size="3"/>
+    <Sequence name="s">
+        <Int32 name="i1"/>
+        <String name="s"/>
+        <Dim size="2"/>
+        <Dim name="/col"/>
+    </Sequence>
+</Dataset>
+
diff --git a/tests/dmr-testsuite/test_array_9.xml b/tests/dmr-testsuite/test_array_9.xml
new file mode 100644
index 0000000..e2265f9
--- /dev/null
+++ b/tests/dmr-testsuite/test_array_9.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- Test zero length array case. jhrg 1/27/16 -->
+
+<Dataset name="test_array_9" dapVersion="4.0" dmrVersion="1.0" xml:base="file:dap4/test_array_9.xml"
+  xmlns="http://xml.opendap.org/ns/DAP/4.0#"
+  xmlns:dap="http://xml.opendap.org/ns/DAP/4.0#">
+
+  <dap:Int32 name="x">
+    <Dim size="0"/>
+  </dap:Int32>
+
+</Dataset>
diff --git a/tests/dmr-testsuite/test_array_9.xml.baseline b/tests/dmr-testsuite/test_array_9.xml.baseline
new file mode 100644
index 0000000..cac52bb
--- /dev/null
+++ b/tests/dmr-testsuite/test_array_9.xml.baseline
@@ -0,0 +1,8 @@
+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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
+    <Int32 name="x">
+        <Dim size="0"/>
+    </Int32>
+</Dataset>
+
diff --git a/tests/dmr-testsuite/test_escaped_paths.xml b/tests/dmr-testsuite/test_escaped_paths.xml
new file mode 100644
index 0000000..afd82e7
--- /dev/null
+++ b/tests/dmr-testsuite/test_escaped_paths.xml
@@ -0,0 +1,69 @@
+<Dataset name="example"
+       dapVersion="4.0"
+       dmrVersion="1.0"
+       xmlns="http://xml.opendap.org/ns/DAP/4.0#">
+
+<Enumeration name="e1" basetype="UInt8">
+  <EnumConst name="econst1" value="1"/>
+  <EnumConst name="econst2" value="2"/>
+</Enumeration>
+
+<Dimension name="d1" size="10"/>
+<Dimension name="lat" size="20"/>
+<Dimension name="lon" size="20"/>
+
+<Int32 name="x"/>
+<Float32 name="lat">
+  <Dim name="/lat"/>
+</Float32>
+<Float32 name="lon">
+  <Dim name="/lon"/>
+</Float32>
+<Structure name="y">
+  <Opaque name="f1"/>
+  <Attribute name="a1" type="Int32"/>
+  <Attribute name="a2" type="Float64">
+    <Value value="7.5"/>    
+    <Value>10</Value>
+  </Attribute>  
+  <!-- Structure dimensions -->
+  <Dim size="*"/>
+  <Dim name="/d1"/>
+  <Dim size="10"/>
+</Structure>
+
+<Group name="g1">
+  <Dimension name="d1" size="10"/>
+  <Dimension name="d2" size="20"/>
+
+  <Float32 name="tempb">
+    <Dim name="/lat"/>
+    <Dim name="/lon"/>
+    <Map name="/lat"/>
+    <Map name="/lon"/>
+  </Float32>
+  <Enum enum="/e1" name="evar"/>
+
+</Group>
+
+<!-- Test FQN name processing -->
+<Group name="g.@/\$">
+<!-- Provide a dimension with a name that needs escaping "lon/2.\" -->
+<Dimension name="lon/2.\" size="20"/>
+</Group>
+
+<!-- reference the dimension and group with funny names -->
+<Int32 name="funny">
+  <Dim name="/g\.@\/\\$/lon\/2\.\\"/>
+</Int32>
+
+<!-- embedded xml example; dap4.rng needs work
+<OtherXML>
+<anyelement1 name="5">
+<anyelement2>any text</anyelement2>
+</anyelement1>
+</OtherXML>
+-->
+
+
+</Dataset>
diff --git a/tests/dmr-testsuite/test_simple_1.xml b/tests/dmr-testsuite/test_simple_1.xml
new file mode 100644
index 0000000..0ca869a
--- /dev/null
+++ b/tests/dmr-testsuite/test_simple_1.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- First in a series of very simple tests. jhrg 7/10/12 -->
+
+<Dataset name="test_simple_1" dapVersion="4.0" dmrVersion="1.0" xml:base="file:dap4/test_simple_1.xml"
+  xmlns="http://xml.opendap.org/ns/DAP/4.0#"
+  xmlns:dap="http://xml.opendap.org/ns/DAP/4.0#">
+
+  <dap:Int32 name="x"/>
+
+</Dataset>
diff --git a/tests/dmr-testsuite/test_simple_1.xml.baseline b/tests/dmr-testsuite/test_simple_1.xml.baseline
new file mode 100644
index 0000000..b26c94b
--- /dev/null
+++ b/tests/dmr-testsuite/test_simple_1.xml.baseline
@@ -0,0 +1,6 @@
+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_1.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_1">
+    <Int32 name="x"/>
+</Dataset>
+
diff --git a/tests/dmr-testsuite/test_simple_1.xml.send_base b/tests/dmr-testsuite/test_simple_1.xml.send_base
new file mode 100644
index 0000000..0cdceaa
--- /dev/null
+++ b/tests/dmr-testsuite/test_simple_1.xml.send_base
@@ -0,0 +1,7 @@
+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_1.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_1">
+    <Int32 name="x"/>
+</Dataset>
+
+Response file: test_simple_1_data.bin
diff --git a/tests/dmr-testsuite/test_simple_10.xml b/tests/dmr-testsuite/test_simple_10.xml
new file mode 100644
index 0000000..f31f1f9
--- /dev/null
+++ b/tests/dmr-testsuite/test_simple_10.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<Dataset name="test_simple_10" dapVersion="4.0" dmrVersion="1.0" xml:base="file:dap4/test_simple_10.xml"
+  xmlns="http://xml.opendap.org/ns/DAP/4.0#"
+  xmlns:dap="http://xml.opendap.org/ns/DAP/4.0#">
+    
+  <Opaque name="o"/>
+  
+</Dataset>
diff --git a/tests/dmr-testsuite/test_simple_10.xml.baseline b/tests/dmr-testsuite/test_simple_10.xml.baseline
new file mode 100644
index 0000000..1e55ff5
--- /dev/null
+++ b/tests/dmr-testsuite/test_simple_10.xml.baseline
@@ -0,0 +1,6 @@
+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_10.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_10">
+    <Opaque name="o"/>
+</Dataset>
+
diff --git a/tests/dmr-testsuite/test_simple_1_data.bin b/tests/dmr-testsuite/test_simple_1_data.bin
new file mode 100644
index 0000000..939997f
Binary files /dev/null and b/tests/dmr-testsuite/test_simple_1_data.bin differ
diff --git a/tests/dmr-testsuite/test_simple_2.xml b/tests/dmr-testsuite/test_simple_2.xml
new file mode 100644
index 0000000..6156ba6
--- /dev/null
+++ b/tests/dmr-testsuite/test_simple_2.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- First in a series of very simple tests. jhrg 7/10/12 -->
+
+<Dataset name="test_simple_2" dapVersion="4.0" dmrVersion="1.0" xml:base="file:dap4/test_simple_2.xml"
+  xmlns="http://xml.opendap.org/ns/DAP/4.0#">
+
+  <Byte name="b"/>
+  
+  <Int8 name="i8"/>
+  <UInt8 name="ui8"/>
+  
+  <Int16 name="i16"/>
+  <UInt16 name="ui16"/>
+  
+  <Int32 name="i32"/>
+  <UInt32 name="ui32"/>
+  
+  <Int64 name="i64"/>
+  <UInt64 name="ui64"/>
+  
+  <Float32 name="f32"/>
+  <Float64 name="f64"/>
+
+  <String name="s"/>
+  <URL name="u"/>
+  
+</Dataset>
diff --git a/tests/dmr-testsuite/test_simple_2.xml.baseline b/tests/dmr-testsuite/test_simple_2.xml.baseline
new file mode 100644
index 0000000..1650f79
--- /dev/null
+++ b/tests/dmr-testsuite/test_simple_2.xml.baseline
@@ -0,0 +1,18 @@
+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_2.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_2">
+    <Byte name="b"/>
+    <Int8 name="i8"/>
+    <UInt8 name="ui8"/>
+    <Int16 name="i16"/>
+    <UInt16 name="ui16"/>
+    <Int32 name="i32"/>
+    <UInt32 name="ui32"/>
+    <Int64 name="i64"/>
+    <UInt64 name="ui64"/>
+    <Float32 name="f32"/>
+    <Float64 name="f64"/>
+    <String name="s"/>
+    <URL name="u"/>
+</Dataset>
+
diff --git a/tests/dmr-testsuite/test_simple_2.xml.send_base b/tests/dmr-testsuite/test_simple_2.xml.send_base
new file mode 100644
index 0000000..8f151c9
--- /dev/null
+++ b/tests/dmr-testsuite/test_simple_2.xml.send_base
@@ -0,0 +1,19 @@
+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_2.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_2">
+    <Byte name="b"/>
+    <Int8 name="i8"/>
+    <UInt8 name="ui8"/>
+    <Int16 name="i16"/>
+    <UInt16 name="ui16"/>
+    <Int32 name="i32"/>
+    <UInt32 name="ui32"/>
+    <Int64 name="i64"/>
+    <UInt64 name="ui64"/>
+    <Float32 name="f32"/>
+    <Float64 name="f64"/>
+    <String name="s"/>
+    <URL name="u"/>
+</Dataset>
+
+Response file: test_simple_2_data.bin
diff --git a/tests/dmr-testsuite/test_simple_2_data.bin b/tests/dmr-testsuite/test_simple_2_data.bin
new file mode 100644
index 0000000..26be2eb
Binary files /dev/null and b/tests/dmr-testsuite/test_simple_2_data.bin differ
diff --git a/tests/dmr-testsuite/test_simple_3.xml b/tests/dmr-testsuite/test_simple_3.xml
new file mode 100644
index 0000000..5068261
--- /dev/null
+++ b/tests/dmr-testsuite/test_simple_3.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<Dataset name="test_simple_3" dapVersion="4.0" dmrVersion="1.0" xmlns="http://xml.opendap.org/ns/DAP/4.0#">
+
+  <!-- Test enumeration definitions -->
+  <Enumeration name="e1" basetype="UInt8">
+    <EnumConst name="econst1" value="1"/>
+    <EnumConst name="econst2" value="2"/>
+  </Enumeration>
+
+  <Int32 name="x"/>
+
+</Dataset>
diff --git a/tests/dmr-testsuite/test_simple_3.xml.baseline b/tests/dmr-testsuite/test_simple_3.xml.baseline
new file mode 100644
index 0000000..088be2f
--- /dev/null
+++ b/tests/dmr-testsuite/test_simple_3.xml.baseline
@@ -0,0 +1,10 @@
+Parse successful
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="test_simple_3">
+    <Enumeration name="e1" basetype="UInt8">
+        <EnumConst name="econst1" value="1"/>
+        <EnumConst name="econst2" value="2"/>
+    </Enumeration>
+    <Int32 name="x"/>
+</Dataset>
+
diff --git a/tests/dmr-testsuite/test_simple_3.xml.send_base b/tests/dmr-testsuite/test_simple_3.xml.send_base
new file mode 100644
index 0000000..52278e3
--- /dev/null
+++ b/tests/dmr-testsuite/test_simple_3.xml.send_base
@@ -0,0 +1,11 @@
+Parse successful
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="test_simple_3">
+    <Enumeration name="e1" basetype="UInt8">
+        <EnumConst name="econst1" value="1"/>
+        <EnumConst name="econst2" value="2"/>
+    </Enumeration>
+    <Int32 name="x"/>
+</Dataset>
+
+Response file: test_simple_3_data.bin
diff --git a/tests/dmr-testsuite/test_simple_3_data.bin b/tests/dmr-testsuite/test_simple_3_data.bin
new file mode 100644
index 0000000..44108bc
Binary files /dev/null and b/tests/dmr-testsuite/test_simple_3_data.bin differ
diff --git a/tests/dmr-testsuite/test_simple_3_error_1.xml b/tests/dmr-testsuite/test_simple_3_error_1.xml
new file mode 100644
index 0000000..5686798
--- /dev/null
+++ b/tests/dmr-testsuite/test_simple_3_error_1.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<Dataset name="example" dapVersion="4.0" dmrVersion="1.0" xmlns="http://xml.opendap.org/ns/DAP/4.0#">
+
+  <!-- Bad EnumConst; it must be an integer value -->
+  <Enumeration name="e1" basetype="UInt8">
+    <EnumConst name="econst1" value="1"/>
+    <EnumConst name="econst2" value="not_an_integer"/>
+  </Enumeration>
+
+  <Int32 name="x"/>
+
+</Dataset>
diff --git a/tests/dmr-testsuite/test_simple_3_error_1.xml.baseline b/tests/dmr-testsuite/test_simple_3_error_1.xml.baseline
new file mode 100644
index 0000000..2d9f6e0
--- /dev/null
+++ b/tests/dmr-testsuite/test_simple_3_error_1.xml.baseline
@@ -0,0 +1,2 @@
+Error: At line 1: Expected an integer value for an Enumeration constant, got 'not_an_integer' instead.
+At line 1: The document contained unbalanced tags.
diff --git a/tests/dmr-testsuite/test_simple_3_error_2.xml b/tests/dmr-testsuite/test_simple_3_error_2.xml
new file mode 100644
index 0000000..6f28cd4
--- /dev/null
+++ b/tests/dmr-testsuite/test_simple_3_error_2.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<Dataset name="example" dapVersion="4.0" dmrVersion="1.0" xmlns="http://xml.opendap.org/ns/DAP/4.0#">
+
+  <!-- Bad basetype for an Enumeration -->
+  <Enumeration name="e1" basetype="Float64">
+    <EnumConst name="econst1" value="1"/>
+    <EnumConst name="econst2" value="2"/>
+  </Enumeration>
+
+  <Int32 name="x"/>
+
+</Dataset>
diff --git a/tests/dmr-testsuite/test_simple_3_error_2.xml.baseline b/tests/dmr-testsuite/test_simple_3_error_2.xml.baseline
new file mode 100644
index 0000000..b6585a6
--- /dev/null
+++ b/tests/dmr-testsuite/test_simple_3_error_2.xml.baseline
@@ -0,0 +1,3 @@
+Error: At line 1: The Enumeration 'e1' must have an integer type, instead the type 'Float64' was used.
+At line 1: Expected an Attribute, Enumeration, Dimension, Group or variable element; found 'Enumeration' instead.
+At line 1: The document contained unbalanced tags.
diff --git a/tests/dmr-testsuite/test_simple_3_error_3.xml b/tests/dmr-testsuite/test_simple_3_error_3.xml
new file mode 100644
index 0000000..c8d6f24
--- /dev/null
+++ b/tests/dmr-testsuite/test_simple_3_error_3.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<Dataset name="example" dapVersion="4.0" dmrVersion="1.0" xmlns="http://xml.opendap.org/ns/DAP/4.0#">
+
+  <!-- Bad EnumConst; the value is too big -->
+  <Enumeration name="e1" basetype="UInt8">
+    <EnumConst name="econst1" value="1"/>
+    <EnumConst name="econst2" value="257"/>
+  </Enumeration>
+
+  <Int32 name="x"/>
+
+</Dataset>
diff --git a/tests/dmr-testsuite/test_simple_3_error_3.xml.baseline b/tests/dmr-testsuite/test_simple_3_error_3.xml.baseline
new file mode 100644
index 0000000..8d85347
--- /dev/null
+++ b/tests/dmr-testsuite/test_simple_3_error_3.xml.baseline
@@ -0,0 +1,2 @@
+Error: At line 1: In an Enumeration constant, the value '257' cannot fit in a variable of type 'UInt8'.
+At line 1: The document contained unbalanced tags.
diff --git a/tests/dmr-testsuite/test_simple_4.xml b/tests/dmr-testsuite/test_simple_4.xml
new file mode 100644
index 0000000..431954a
--- /dev/null
+++ b/tests/dmr-testsuite/test_simple_4.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- Attributes -->
+
+<Dataset name="test_simple_4" dapVersion="4.0" dmrVersion="1.0" xml:base="file:dap4/test_simple_4.xml"
+  xmlns="http://xml.opendap.org/ns/DAP/4.0#"
+  xmlns:dap="http://xml.opendap.org/ns/DAP/4.0#">
+  
+  <dap:Int32 name="x">
+    <Attribute name="long_name" type="String">
+      <Value>x_axis_value</Value>
+    </Attribute>
+  </dap:Int32>
+  
+</Dataset>
diff --git a/tests/dmr-testsuite/test_simple_4.xml.baseline b/tests/dmr-testsuite/test_simple_4.xml.baseline
new file mode 100644
index 0000000..f14b44e
--- /dev/null
+++ b/tests/dmr-testsuite/test_simple_4.xml.baseline
@@ -0,0 +1,10 @@
+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_4.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_4">
+    <Int32 name="x">
+        <Attribute name="long_name" type="String">
+            <Value>x_axis_value</Value>
+        </Attribute>
+    </Int32>
+</Dataset>
+
diff --git a/tests/dmr-testsuite/test_simple_4.xml.send_base b/tests/dmr-testsuite/test_simple_4.xml.send_base
new file mode 100644
index 0000000..938b2c5
--- /dev/null
+++ b/tests/dmr-testsuite/test_simple_4.xml.send_base
@@ -0,0 +1,11 @@
+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_4.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_4">
+    <Int32 name="x">
+        <Attribute name="long_name" type="String">
+            <Value>x_axis_value</Value>
+        </Attribute>
+    </Int32>
+</Dataset>
+
+Response file: test_simple_4_data.bin
diff --git a/tests/dmr-testsuite/test_simple_4_data.bin b/tests/dmr-testsuite/test_simple_4_data.bin
new file mode 100644
index 0000000..b24f173
Binary files /dev/null and b/tests/dmr-testsuite/test_simple_4_data.bin differ
diff --git a/tests/dmr-testsuite/test_simple_5.xml b/tests/dmr-testsuite/test_simple_5.xml
new file mode 100644
index 0000000..e136d31
--- /dev/null
+++ b/tests/dmr-testsuite/test_simple_5.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- Attributes -->
+
+<Dataset name="test_simple_5" dapVersion="4.0" dmrVersion="1.0" xml:base="file:dap4/test_simple_5.xml"
+  xmlns="http://xml.opendap.org/ns/DAP/4.0#"
+  xmlns:dap="http://xml.opendap.org/ns/DAP/4.0#">
+  
+  <dap:Int8 name="i"/>
+  <dap:Int16 name="j"/>
+  <dap:Int32 name="k"/>
+  <dap:Int64 name="z"/>
+ 
+  <dap:Byte name="ui"/>
+  <dap:UInt8 name="uii"/>
+  <dap:UInt16 name="uj"/>
+  <dap:UInt32 name="uk"/>
+  <dap:UInt64 name="uz"/>
+  
+</Dataset>
diff --git a/tests/dmr-testsuite/test_simple_5.xml.baseline b/tests/dmr-testsuite/test_simple_5.xml.baseline
new file mode 100644
index 0000000..0405998
--- /dev/null
+++ b/tests/dmr-testsuite/test_simple_5.xml.baseline
@@ -0,0 +1,14 @@
+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_5.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_5">
+    <Int8 name="i"/>
+    <Int16 name="j"/>
+    <Int32 name="k"/>
+    <Int64 name="z"/>
+    <Byte name="ui"/>
+    <UInt8 name="uii"/>
+    <UInt16 name="uj"/>
+    <UInt32 name="uk"/>
+    <UInt64 name="uz"/>
+</Dataset>
+
diff --git a/tests/dmr-testsuite/test_simple_5.xml.send_base b/tests/dmr-testsuite/test_simple_5.xml.send_base
new file mode 100644
index 0000000..3ee517b
--- /dev/null
+++ b/tests/dmr-testsuite/test_simple_5.xml.send_base
@@ -0,0 +1,15 @@
+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_5.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_5">
+    <Int8 name="i"/>
+    <Int16 name="j"/>
+    <Int32 name="k"/>
+    <Int64 name="z"/>
+    <Byte name="ui"/>
+    <UInt8 name="uii"/>
+    <UInt16 name="uj"/>
+    <UInt32 name="uk"/>
+    <UInt64 name="uz"/>
+</Dataset>
+
+Response file: test_simple_5_data.bin
diff --git a/tests/dmr-testsuite/test_simple_5_data.bin b/tests/dmr-testsuite/test_simple_5_data.bin
new file mode 100644
index 0000000..b4732d4
Binary files /dev/null and b/tests/dmr-testsuite/test_simple_5_data.bin differ
diff --git a/tests/dmr-testsuite/test_simple_6.1.xml b/tests/dmr-testsuite/test_simple_6.1.xml
new file mode 100644
index 0000000..9f232b1
--- /dev/null
+++ b/tests/dmr-testsuite/test_simple_6.1.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<Dataset name="test_simple_6" dapVersion="4.0" dmrVersion="1.0"
+  xml:base="file:dap4/test_simple_6.xml" xmlns="http://xml.opendap.org/ns/DAP/4.0#"
+  xmlns:dap="http://xml.opendap.org/ns/DAP/4.0#">
+
+  <Structure name="s">
+    <Int32 name="i1"/>
+    <String name="s"/>
+    <Structure name="inner">
+      <Int32 name="i2"/>
+    </Structure>
+  </Structure>
+
+</Dataset>
diff --git a/tests/dmr-testsuite/test_simple_6.2.xml b/tests/dmr-testsuite/test_simple_6.2.xml
new file mode 100644
index 0000000..0977059
--- /dev/null
+++ b/tests/dmr-testsuite/test_simple_6.2.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<Dataset name="test_simple_6.2" dapVersion="4.0" dmrVersion="1.0"
+  xml:base="file:dap4/test_simple_6.2.xml" xmlns="http://xml.opendap.org/ns/DAP/4.0#"
+  xmlns:dap="http://xml.opendap.org/ns/DAP/4.0#">
+
+  <Structure name="s">
+  </Structure>
+
+</Dataset>
diff --git a/tests/dmr-testsuite/test_simple_6.2.xml.baseline b/tests/dmr-testsuite/test_simple_6.2.xml.baseline
new file mode 100644
index 0000000..1f2ce12
--- /dev/null
+++ b/tests/dmr-testsuite/test_simple_6.2.xml.baseline
@@ -0,0 +1,6 @@
+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_6.2.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_6.2">
+    <Structure name="s"/>
+</Dataset>
+
diff --git a/tests/dmr-testsuite/test_simple_6.3.xml b/tests/dmr-testsuite/test_simple_6.3.xml
new file mode 100644
index 0000000..c03b7e3
--- /dev/null
+++ b/tests/dmr-testsuite/test_simple_6.3.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<Dataset name="test_simple_6.3" dapVersion="4.0" dmrVersion="1.0"
+  xml:base="file:dap4/test_simple_6.3.xml" xmlns="http://xml.opendap.org/ns/DAP/4.0#"
+  xmlns:dap="http://xml.opendap.org/ns/DAP/4.0#">
+
+  <Structure name="s">
+    <Int32 name="i1"/>
+    <String name="s"/>
+    <Structure name="inner">
+    </Structure>
+  </Structure>
+
+</Dataset>
diff --git a/tests/dmr-testsuite/test_simple_6.3.xml.baseline b/tests/dmr-testsuite/test_simple_6.3.xml.baseline
new file mode 100644
index 0000000..bf47bb1
--- /dev/null
+++ b/tests/dmr-testsuite/test_simple_6.3.xml.baseline
@@ -0,0 +1,10 @@
+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_6.3.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_6.3">
+    <Structure name="s">
+        <Int32 name="i1"/>
+        <String name="s"/>
+        <Structure name="inner"/>
+    </Structure>
+</Dataset>
+
diff --git a/tests/dmr-testsuite/test_simple_6.xml b/tests/dmr-testsuite/test_simple_6.xml
new file mode 100644
index 0000000..109a06c
--- /dev/null
+++ b/tests/dmr-testsuite/test_simple_6.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<Dataset name="test_simple_6" dapVersion="4.0" dmrVersion="1.0" xml:base="file:dap4/test_simple_6.xml"
+  xmlns="http://xml.opendap.org/ns/DAP/4.0#"
+  xmlns:dap="http://xml.opendap.org/ns/DAP/4.0#">
+  
+    <Structure name="s">
+        <Int32 name="i1"/>
+        <String name="s"/>
+    </Structure>
+      
+</Dataset>
diff --git a/tests/dmr-testsuite/test_simple_6.xml.baseline b/tests/dmr-testsuite/test_simple_6.xml.baseline
new file mode 100644
index 0000000..235fb0d
--- /dev/null
+++ b/tests/dmr-testsuite/test_simple_6.xml.baseline
@@ -0,0 +1,9 @@
+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_6.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_6">
+    <Structure name="s">
+        <Int32 name="i1"/>
+        <String name="s"/>
+    </Structure>
+</Dataset>
+
diff --git a/tests/dmr-testsuite/test_simple_7.xml b/tests/dmr-testsuite/test_simple_7.xml
new file mode 100644
index 0000000..57daf12
--- /dev/null
+++ b/tests/dmr-testsuite/test_simple_7.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<Dataset name="test_simple_7" dapVersion="4.0" dmrVersion="1.0" xml:base="file:dap4/test_simple_7.xml"
+  xmlns="http://xml.opendap.org/ns/DAP/4.0#"
+  xmlns:dap="http://xml.opendap.org/ns/DAP/4.0#">
+  
+    <Sequence name="s">
+        <Int32 name="i1"/>
+        <String name="s"/>
+    </Sequence>
+  
+</Dataset>
diff --git a/tests/dmr-testsuite/test_simple_7.xml.baseline b/tests/dmr-testsuite/test_simple_7.xml.baseline
new file mode 100644
index 0000000..05c945a
--- /dev/null
+++ b/tests/dmr-testsuite/test_simple_7.xml.baseline
@@ -0,0 +1,9 @@
+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>
+
diff --git a/tests/dmr-testsuite/test_simple_8.1.xml b/tests/dmr-testsuite/test_simple_8.1.xml
new file mode 100644
index 0000000..f851830
--- /dev/null
+++ b/tests/dmr-testsuite/test_simple_8.1.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<Dataset name="test_simple_8.1" dapVersion="4.0" dmrVersion="1.0" xml:base="file:dap4/test_simple_8.1.xml"
+  xmlns="http://xml.opendap.org/ns/DAP/4.0#"
+  xmlns:dap="http://xml.opendap.org/ns/DAP/4.0#">
+  
+  <Sequence name="outer">
+    <Float32 name="x"/>
+    <Float32 name="y"/>
+    <Sequence name="inner">
+      <Int32 name="i1"/>
+      <String name="s"/>
+    </Sequence>    
+  </Sequence>
+  
+</Dataset>
diff --git a/tests/dmr-testsuite/test_simple_8.xml b/tests/dmr-testsuite/test_simple_8.xml
new file mode 100644
index 0000000..c66edaf
--- /dev/null
+++ b/tests/dmr-testsuite/test_simple_8.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<Dataset name="test_simple_8" dapVersion="4.0" dmrVersion="1.0" xml:base="file:dap4/test_simple_8.xml"
+  xmlns="http://xml.opendap.org/ns/DAP/4.0#"
+  xmlns:dap="http://xml.opendap.org/ns/DAP/4.0#">
+  
+  <Structure name="outer">
+    <Sequence name="s">
+      <Int32 name="i1"/>
+      <String name="s"/>
+    </Sequence>    
+  </Structure>
+  
+</Dataset>
diff --git a/tests/dmr-testsuite/test_simple_8.xml.baseline b/tests/dmr-testsuite/test_simple_8.xml.baseline
new file mode 100644
index 0000000..c3bd020
--- /dev/null
+++ b/tests/dmr-testsuite/test_simple_8.xml.baseline
@@ -0,0 +1,11 @@
+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_8.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_8">
+    <Structure name="outer">
+        <Sequence name="s">
+            <Int32 name="i1"/>
+            <String name="s"/>
+        </Sequence>
+    </Structure>
+</Dataset>
+
diff --git a/tests/dmr-testsuite/test_simple_9.1.xml b/tests/dmr-testsuite/test_simple_9.1.xml
new file mode 100644
index 0000000..fbc08c1
--- /dev/null
+++ b/tests/dmr-testsuite/test_simple_9.1.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<Dataset name="test_simple_9" dapVersion="4.0" dmrVersion="1.0" xml:base="file:dap4/test_simple_9.xml"
+  xmlns="http://xml.opendap.org/ns/DAP/4.0#"
+  xmlns:dap="http://xml.opendap.org/ns/DAP/4.0#">
+  
+  <Enumeration name="color" basetype="Int32">
+    <EnumConst name="red" value="1"/>
+    <EnumConst name="blue" value="2"/>
+    <EnumConst name="gray" value="3"/>
+  </Enumeration>
+  
+  <Enumeration name="shade" basetype="UInt64">
+    <EnumConst name="light" value="1"/>
+    <EnumConst name="med" value="2"/>
+    <EnumConst name="dark" value="3"/>
+    
+    <EnumConst name="pitch" value="256"/>
+  </Enumeration>
+  
+  <Enum name="e" enum="color"/>
+  <Enum name="f" enum="shade"/>
+  
+</Dataset>
diff --git a/tests/dmr-testsuite/test_simple_9.1.xml.baseline b/tests/dmr-testsuite/test_simple_9.1.xml.baseline
new file mode 100644
index 0000000..8c67b51
--- /dev/null
+++ b/tests/dmr-testsuite/test_simple_9.1.xml.baseline
@@ -0,0 +1,18 @@
+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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_9">
+    <Enumeration name="color" basetype="Int32">
+        <EnumConst name="red" value="1"/>
+        <EnumConst name="blue" value="2"/>
+        <EnumConst name="gray" value="3"/>
+    </Enumeration>
+    <Enumeration name="shade" basetype="UInt64">
+        <EnumConst name="light" value="1"/>
+        <EnumConst name="med" value="2"/>
+        <EnumConst name="dark" value="3"/>
+        <EnumConst name="pitch" value="256"/>
+    </Enumeration>
+    <Enum name="e" enum="/color"/>
+    <Enum name="f" enum="/shade"/>
+</Dataset>
+
diff --git a/tests/dmr-testsuite/test_simple_9.2.xml b/tests/dmr-testsuite/test_simple_9.2.xml
new file mode 100644
index 0000000..440507e
--- /dev/null
+++ b/tests/dmr-testsuite/test_simple_9.2.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<Dataset name="test_simple_9" dapVersion="4.0" dmrVersion="1.0" xml:base="file:dap4/test_simple_9.xml"
+  xmlns="http://xml.opendap.org/ns/DAP/4.0#"
+  xmlns:dap="http://xml.opendap.org/ns/DAP/4.0#">
+  
+  <Enumeration name="color" basetype="Int32">
+    <EnumConst name="red" value="100"/>
+    <EnumConst name="blue" value="200"/>
+    <EnumConst name="gray" value="300"/>
+  </Enumeration>
+  
+  <Enumeration name="shade" basetype="UInt64">
+    <EnumConst name="light" value="1"/>
+    <EnumConst name="med" value="2"/>
+    <EnumConst name="dark" value="3"/>
+    
+    <EnumConst name="pitch" value="256"/>
+  </Enumeration>
+  
+  <Enum name="e" enum="color"/>
+  <Enum name="f" enum="shade"/>
+
+  <Int32 name="a"/>  
+</Dataset>
diff --git a/tests/dmr-testsuite/test_simple_9.xml b/tests/dmr-testsuite/test_simple_9.xml
new file mode 100644
index 0000000..1760558
--- /dev/null
+++ b/tests/dmr-testsuite/test_simple_9.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<Dataset name="test_simple_9" dapVersion="4.0" dmrVersion="1.0" xml:base="file:dap4/test_simple_9.xml"
+  xmlns="http://xml.opendap.org/ns/DAP/4.0#"
+  xmlns:dap="http://xml.opendap.org/ns/DAP/4.0#">
+  
+  <Enumeration name="color" basetype="Byte">
+    <EnumConst name="red" value="1"/>
+    <EnumConst name="blue" value="2"/>
+    <EnumConst name="gray" value="3"/>
+  </Enumeration>
+  
+  <Enum name="e" enum="color"/>
+  
+</Dataset>
diff --git a/tests/dmr-testsuite/test_simple_9.xml.baseline b/tests/dmr-testsuite/test_simple_9.xml.baseline
new file mode 100644
index 0000000..9e02ef8
--- /dev/null
+++ b/tests/dmr-testsuite/test_simple_9.xml.baseline
@@ -0,0 +1,11 @@
+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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_9">
+    <Enumeration name="color" basetype="Byte">
+        <EnumConst name="red" value="1"/>
+        <EnumConst name="blue" value="2"/>
+        <EnumConst name="gray" value="3"/>
+    </Enumeration>
+    <Enum name="e" enum="/color"/>
+</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_array_12.xml.trans_base b/tests/dmr-testsuite/universal/test_array_12.xml.trans_base
new file mode 100644
index 0000000..c30c9b2
--- /dev/null
+++ b/tests/dmr-testsuite/universal/test_array_12.xml.trans_base
@@ -0,0 +1,29 @@
+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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
+    <Int32 name="i">
+        <Dim size="5"/>
+    </Int32>
+    <Int32 name="x">
+        <Dim size="0"/>
+    </Int32>
+</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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
+    <Int32 name="i">
+        <Dim size="5"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            
+        </Attribute>
+    </Int32>
+    <Int32 name="x">
+        <Dim size="0"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            
+        </Attribute>
+    </Int32>
+</Dataset>
+
+The data:
+{ {123456789, 123456789, 123456789, 123456789, 123456789}, {} }
diff --git a/tests/dmr-testsuite/universal/test_array_13.xml.trans_base b/tests/dmr-testsuite/universal/test_array_13.xml.trans_base
new file mode 100644
index 0000000..68fd0dd
--- /dev/null
+++ b/tests/dmr-testsuite/universal/test_array_13.xml.trans_base
@@ -0,0 +1,31 @@
+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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
+    <Int32 name="i">
+        <Dim size="5"/>
+    </Int32>
+    <Int32 name="x">
+        <Dim size="4"/>
+        <Dim size="0"/>
+    </Int32>
+</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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
+    <Int32 name="i">
+        <Dim size="5"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            
+        </Attribute>
+    </Int32>
+    <Int32 name="x">
+        <Dim size="4"/>
+        <Dim size="0"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            
+        </Attribute>
+    </Int32>
+</Dataset>
+
+The data:
+{ {123456789, 123456789, 123456789, 123456789, 123456789}, {{},{},{},{}} }
diff --git a/tests/dmr-testsuite/universal/test_array_14.xml.trans_base b/tests/dmr-testsuite/universal/test_array_14.xml.trans_base
new file mode 100644
index 0000000..fdc6e59
--- /dev/null
+++ b/tests/dmr-testsuite/universal/test_array_14.xml.trans_base
@@ -0,0 +1,31 @@
+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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
+    <Int32 name="i">
+        <Dim size="5"/>
+    </Int32>
+    <Int32 name="x">
+        <Dim size="0"/>
+        <Dim size="4"/>
+    </Int32>
+</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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
+    <Int32 name="i">
+        <Dim size="5"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            
+        </Attribute>
+    </Int32>
+    <Int32 name="x">
+        <Dim size="0"/>
+        <Dim size="4"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            
+        </Attribute>
+    </Int32>
+</Dataset>
+
+The data:
+{ {123456789, 123456789, 123456789, 123456789, 123456789}, {} }
diff --git a/tests/dmr-testsuite/universal/test_array_9.xml.trans_base b/tests/dmr-testsuite/universal/test_array_9.xml.trans_base
new file mode 100644
index 0000000..7f27ecb
--- /dev/null
+++ b/tests/dmr-testsuite/universal/test_array_9.xml.trans_base
@@ -0,0 +1,20 @@
+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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
+    <Int32 name="x">
+        <Dim size="0"/>
+    </Int32>
+</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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
+    <Int32 name="x">
+        <Dim size="0"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            
+        </Attribute>
+    </Int32>
+</Dataset>
+
+The data:
+{ {} }
diff --git a/tests/dmr-testsuite/universal/test_simple_6.2.xml.trans_base b/tests/dmr-testsuite/universal/test_simple_6.2.xml.trans_base
new file mode 100644
index 0000000..e40f9a2
--- /dev/null
+++ b/tests/dmr-testsuite/universal/test_simple_6.2.xml.trans_base
@@ -0,0 +1,17 @@
+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_6.2.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_6.2">
+    <Structure name="s"/>
+</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_6.2.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_6.2">
+    <Structure name="s">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            
+        </Attribute>
+    </Structure>
+</Dataset>
+
+The data:
+{ {  } }
diff --git a/tests/dmr-testsuite/universal/test_simple_6.3.xml.trans_base b/tests/dmr-testsuite/universal/test_simple_6.3.xml.trans_base
new file mode 100644
index 0000000..7129b28
--- /dev/null
+++ b/tests/dmr-testsuite/universal/test_simple_6.3.xml.trans_base
@@ -0,0 +1,24 @@
+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_6.3.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_6.3">
+    <Structure name="s">
+        <Int32 name="i1"/>
+        <String name="s"/>
+        <Structure name="inner"/>
+    </Structure>
+</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_6.3.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_6.3">
+    <Structure name="s">
+        <Int32 name="i1"/>
+        <String name="s"/>
+        <Structure name="inner"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            
+        </Attribute>
+    </Structure>
+</Dataset>
+
+The data:
+{ { 123456789, "Silly test string: 1", {  } } }
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
new file mode 100644
index 0000000..1b1cf5a
--- /dev/null
+++ b/tests/dmr-testsuite/universal/test_simple_7.xml.f.trans_base
@@ -0,0 +1,22 @@
+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">
+
+        </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/dmr-testsuite/universal/test_simple_7.xml.f1.trans_base b/tests/dmr-testsuite/universal/test_simple_7.xml.f1.trans_base
new file mode 100644
index 0000000..2f0a45d
--- /dev/null
+++ b/tests/dmr-testsuite/universal/test_simple_7.xml.f1.trans_base
@@ -0,0 +1,22 @@
+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">
+            
+        </Attribute>
+    </Sequence>
+</Dataset>
+
+The data:
+{ { { 1024, "Silly test string: 2" } } }
diff --git a/tests/dmr-testsuite/universal/test_simple_7.xml.f2.trans_base b/tests/dmr-testsuite/universal/test_simple_7.xml.f2.trans_base
new file mode 100644
index 0000000..4df38ed
--- /dev/null
+++ b/tests/dmr-testsuite/universal/test_simple_7.xml.f2.trans_base
@@ -0,0 +1,22 @@
+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">
+            
+        </Attribute>
+    </Sequence>
+</Dataset>
+
+The data:
+{ { { 32, "Silly test string: 1" }, { 32768, "Silly test string: 3" }, { 1048576, "Silly test string: 4" } } }
diff --git a/tests/dmr-testsuite/universal/test_simple_7.xml.f3.trans_base b/tests/dmr-testsuite/universal/test_simple_7.xml.f3.trans_base
new file mode 100644
index 0000000..70439eb
--- /dev/null
+++ b/tests/dmr-testsuite/universal/test_simple_7.xml.f3.trans_base
@@ -0,0 +1,22 @@
+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">
+            
+        </Attribute>
+    </Sequence>
+</Dataset>
+
+The data:
+{ { { 32, "Silly test string: 1" }, { 1024, "Silly test string: 2" } } }
diff --git a/tests/dmr-testsuite/universal/test_simple_7.xml.f4.trans_base b/tests/dmr-testsuite/universal/test_simple_7.xml.f4.trans_base
new file mode 100644
index 0000000..6359d53
--- /dev/null
+++ b/tests/dmr-testsuite/universal/test_simple_7.xml.f4.trans_base
@@ -0,0 +1,22 @@
+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">
+            
+        </Attribute>
+    </Sequence>
+</Dataset>
+
+The data:
+{ { { 32, "Silly test string: 1" } } }
diff --git a/tests/dmr-testsuite/universal/test_simple_7.xml.f5.trans_base b/tests/dmr-testsuite/universal/test_simple_7.xml.f5.trans_base
new file mode 100644
index 0000000..70439eb
--- /dev/null
+++ b/tests/dmr-testsuite/universal/test_simple_7.xml.f5.trans_base
@@ -0,0 +1,22 @@
+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">
+            
+        </Attribute>
+    </Sequence>
+</Dataset>
+
+The data:
+{ { { 32, "Silly test string: 1" }, { 1024, "Silly test string: 2" } } }
diff --git a/tests/dmr-testsuite/universal/test_simple_7.xml.f6.trans_base b/tests/dmr-testsuite/universal/test_simple_7.xml.f6.trans_base
new file mode 100644
index 0000000..d363fee
--- /dev/null
+++ b/tests/dmr-testsuite/universal/test_simple_7.xml.f6.trans_base
@@ -0,0 +1,22 @@
+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">
+            
+        </Attribute>
+    </Sequence>
+</Dataset>
+
+The data:
+{ { { 32768, "Silly test string: 3" }, { 1048576, "Silly test string: 4" } } }
diff --git a/tests/dmr-testsuite/universal/test_simple_7.xml.f7.trans_base b/tests/dmr-testsuite/universal/test_simple_7.xml.f7.trans_base
new file mode 100644
index 0000000..dbf9948
--- /dev/null
+++ b/tests/dmr-testsuite/universal/test_simple_7.xml.f7.trans_base
@@ -0,0 +1,22 @@
+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">
+            
+        </Attribute>
+    </Sequence>
+</Dataset>
+
+The data:
+{ { { 1024, "Silly test string: 2" }, { 32768, "Silly test string: 3" }, { 1048576, "Silly test string: 4" } } }
diff --git a/tests/dmr-testsuite/universal/test_simple_7.xml.f8.trans_base b/tests/dmr-testsuite/universal/test_simple_7.xml.f8.trans_base
new file mode 100644
index 0000000..d363fee
--- /dev/null
+++ b/tests/dmr-testsuite/universal/test_simple_7.xml.f8.trans_base
@@ -0,0 +1,22 @@
+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">
+            
+        </Attribute>
+    </Sequence>
+</Dataset>
+
+The data:
+{ { { 32768, "Silly test string: 3" }, { 1048576, "Silly test string: 4" } } }
diff --git a/tests/dmr-testsuite/universal/test_simple_7.xml.f9.trans_base b/tests/dmr-testsuite/universal/test_simple_7.xml.f9.trans_base
new file mode 100644
index 0000000..811c1c0
--- /dev/null
+++ b/tests/dmr-testsuite/universal/test_simple_7.xml.f9.trans_base
@@ -0,0 +1,22 @@
+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">
+            
+        </Attribute>
+    </Sequence>
+</Dataset>
+
+The data:
+{ { { 1024, "Silly test string: 2" }, { 32768, "Silly test string: 3" } } }
diff --git a/tests/dmr-testsuite/universal/test_simple_7.xml.fa.trans_base b/tests/dmr-testsuite/universal/test_simple_7.xml.fa.trans_base
new file mode 100644
index 0000000..dbf9948
--- /dev/null
+++ b/tests/dmr-testsuite/universal/test_simple_7.xml.fa.trans_base
@@ -0,0 +1,22 @@
+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">
+            
+        </Attribute>
+    </Sequence>
+</Dataset>
+
+The data:
+{ { { 1024, "Silly test string: 2" }, { 32768, "Silly test string: 3" }, { 1048576, "Silly test string: 4" } } }
diff --git a/tests/dmr-testsuite/universal/test_simple_7.xml.fs1.trans_base b/tests/dmr-testsuite/universal/test_simple_7.xml.fs1.trans_base
new file mode 100644
index 0000000..2f0a45d
--- /dev/null
+++ b/tests/dmr-testsuite/universal/test_simple_7.xml.fs1.trans_base
@@ -0,0 +1,22 @@
+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">
+            
+        </Attribute>
+    </Sequence>
+</Dataset>
+
+The data:
+{ { { 1024, "Silly test string: 2" } } }
diff --git a/tests/dmr-testsuite/universal/test_simple_7.xml.fs2.trans_base b/tests/dmr-testsuite/universal/test_simple_7.xml.fs2.trans_base
new file mode 100644
index 0000000..4df38ed
--- /dev/null
+++ b/tests/dmr-testsuite/universal/test_simple_7.xml.fs2.trans_base
@@ -0,0 +1,22 @@
+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">
+            
+        </Attribute>
+    </Sequence>
+</Dataset>
+
+The data:
+{ { { 32, "Silly test string: 1" }, { 32768, "Silly test string: 3" }, { 1048576, "Silly test string: 4" } } }
diff --git a/tests/dmr-testsuite/universal/test_simple_7.xml.fs3.trans_base b/tests/dmr-testsuite/universal/test_simple_7.xml.fs3.trans_base
new file mode 100644
index 0000000..6359d53
--- /dev/null
+++ b/tests/dmr-testsuite/universal/test_simple_7.xml.fs3.trans_base
@@ -0,0 +1,22 @@
+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">
+            
+        </Attribute>
+    </Sequence>
+</Dataset>
+
+The data:
+{ { { 32, "Silly test string: 1" } } }
diff --git a/tests/dmr-testsuite/universal/test_simple_7.xml.fs4.trans_base b/tests/dmr-testsuite/universal/test_simple_7.xml.fs4.trans_base
new file mode 100644
index 0000000..70439eb
--- /dev/null
+++ b/tests/dmr-testsuite/universal/test_simple_7.xml.fs4.trans_base
@@ -0,0 +1,22 @@
+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">
+            
+        </Attribute>
+    </Sequence>
+</Dataset>
+
+The data:
+{ { { 32, "Silly test string: 1" }, { 1024, "Silly test string: 2" } } }
diff --git a/tests/dmr-testsuite/universal/test_simple_7.xml.fs5.trans_base b/tests/dmr-testsuite/universal/test_simple_7.xml.fs5.trans_base
new file mode 100644
index 0000000..d363fee
--- /dev/null
+++ b/tests/dmr-testsuite/universal/test_simple_7.xml.fs5.trans_base
@@ -0,0 +1,22 @@
+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">
+            
+        </Attribute>
+    </Sequence>
+</Dataset>
+
+The data:
+{ { { 32768, "Silly test string: 3" }, { 1048576, "Silly test string: 4" } } }
diff --git a/tests/dmr-testsuite/universal/test_simple_7.xml.fs6.trans_base b/tests/dmr-testsuite/universal/test_simple_7.xml.fs6.trans_base
new file mode 100644
index 0000000..dbf9948
--- /dev/null
+++ b/tests/dmr-testsuite/universal/test_simple_7.xml.fs6.trans_base
@@ -0,0 +1,22 @@
+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">
+            
+        </Attribute>
+    </Sequence>
+</Dataset>
+
+The data:
+{ { { 1024, "Silly test string: 2" }, { 32768, "Silly test string: 3" }, { 1048576, "Silly test string: 4" } } }
diff --git a/tests/dmr-testsuite/universal/test_simple_7.xml.fs7.trans_base b/tests/dmr-testsuite/universal/test_simple_7.xml.fs7.trans_base
new file mode 100644
index 0000000..2f0a45d
--- /dev/null
+++ b/tests/dmr-testsuite/universal/test_simple_7.xml.fs7.trans_base
@@ -0,0 +1,22 @@
+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">
+            
+        </Attribute>
+    </Sequence>
+</Dataset>
+
+The data:
+{ { { 1024, "Silly test string: 2" } } }
diff --git a/tests/dmr-testsuite/universal/test_simple_7.xml.g1.trans_base b/tests/dmr-testsuite/universal/test_simple_7.xml.g1.trans_base
new file mode 100644
index 0000000..c19849e
--- /dev/null
+++ b/tests/dmr-testsuite/universal/test_simple_7.xml.g1.trans_base
@@ -0,0 +1,21 @@
+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"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            
+        </Attribute>
+    </Sequence>
+</Dataset>
+
+The data:
+{ { { 32 }, { 1024 } } }
diff --git a/tests/dmr-testsuite/universal/test_simple_8.1.xml.f1.trans_base b/tests/dmr-testsuite/universal/test_simple_8.1.xml.f1.trans_base
new file mode 100644
index 0000000..69afb5f
--- /dev/null
+++ b/tests/dmr-testsuite/universal/test_simple_8.1.xml.f1.trans_base
@@ -0,0 +1,30 @@
+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_8.1.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_8.1">
+    <Sequence name="outer">
+        <Float32 name="x"/>
+        <Float32 name="y"/>
+        <Sequence name="inner">
+            <Int32 name="i1"/>
+            <String name="s"/>
+        </Sequence>
+    </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_8.1.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_8.1">
+    <Sequence name="outer">
+        <Float32 name="x"/>
+        <Float32 name="y"/>
+        <Sequence name="inner">
+            <Int32 name="i1"/>
+            <String name="s"/>
+        </Sequence>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            
+        </Attribute>
+    </Sequence>
+</Dataset>
+
+The data:
+{ { { -54.4, -54.4, { { 32, "Silly test string: 1" }, { 1024, "Silly test string: 2" }, { 32768, "Silly test string: 3" }, { 1048576, "Silly test string: 4" } } }, { -1.77, -1.77, { { 32, "Silly test string: 1" }, { 1024, "Silly test string: 2" }, { 32768, "Silly test string: 3" }, { 1048576, "Silly test string: 4" } } }, { 98.93, 98.93, { { 32, "Silly test string: 1" }, { 1024, "Silly test string: 2" }, { 32768, "Silly test string: 3" }, { 1048576, "Silly test string: 4" } } }, { 92.68, 92.68, { { 32, "Silly test string: 1" }, { 1024, "Silly test string: 2" }, { 32768, "Silly test string: 3" }, { 1048576, "Silly test string: 4" } } } } }
diff --git a/tests/dmr-testsuite/universal/test_simple_8.1.xml.f2.trans_base b/tests/dmr-testsuite/universal/test_simple_8.1.xml.f2.trans_base
new file mode 100644
index 0000000..2097297
--- /dev/null
+++ b/tests/dmr-testsuite/universal/test_simple_8.1.xml.f2.trans_base
@@ -0,0 +1,26 @@
+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_8.1.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_8.1">
+    <Sequence name="outer">
+        <Float32 name="x"/>
+        <Float32 name="y"/>
+        <Sequence name="inner">
+            <Int32 name="i1"/>
+            <String name="s"/>
+        </Sequence>
+    </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_8.1.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_8.1">
+    <Sequence name="outer">
+        <Float32 name="x"/>
+        <Float32 name="y"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            
+        </Attribute>
+    </Sequence>
+</Dataset>
+
+The data:
+{ { { -54.4, -54.4 }, { -1.77, -1.77 }, { 98.93, 98.93 }, { 92.68, 92.68 } } }
diff --git a/tests/dmr-testsuite/universal/test_simple_8.1.xml.f3.trans_base b/tests/dmr-testsuite/universal/test_simple_8.1.xml.f3.trans_base
new file mode 100644
index 0000000..69afb5f
--- /dev/null
+++ b/tests/dmr-testsuite/universal/test_simple_8.1.xml.f3.trans_base
@@ -0,0 +1,30 @@
+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_8.1.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_8.1">
+    <Sequence name="outer">
+        <Float32 name="x"/>
+        <Float32 name="y"/>
+        <Sequence name="inner">
+            <Int32 name="i1"/>
+            <String name="s"/>
+        </Sequence>
+    </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_8.1.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_8.1">
+    <Sequence name="outer">
+        <Float32 name="x"/>
+        <Float32 name="y"/>
+        <Sequence name="inner">
+            <Int32 name="i1"/>
+            <String name="s"/>
+        </Sequence>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            
+        </Attribute>
+    </Sequence>
+</Dataset>
+
+The data:
+{ { { -54.4, -54.4, { { 32, "Silly test string: 1" }, { 1024, "Silly test string: 2" }, { 32768, "Silly test string: 3" }, { 1048576, "Silly test string: 4" } } }, { -1.77, -1.77, { { 32, "Silly test string: 1" }, { 1024, "Silly test string: 2" }, { 32768, "Silly test string: 3" }, { 1048576, "Silly test string: 4" } } }, { 98.93, 98.93, { { 32, "Silly test string: 1" }, { 1024, "Silly test string: 2" }, { 32768, "Silly test string: 3" }, { 1048576, "Silly test string: 4" } } }, { 92.68, 92.68, { { 32, "Silly test string: 1" }, { 1024, "Silly test string: 2" }, { 32768, "Silly test string: 3" }, { 1048576, "Silly test string: 4" } } } } }
diff --git a/tests/dmr-testsuite/universal/test_simple_8.1.xml.f4.trans_base b/tests/dmr-testsuite/universal/test_simple_8.1.xml.f4.trans_base
new file mode 100644
index 0000000..28080d3
--- /dev/null
+++ b/tests/dmr-testsuite/universal/test_simple_8.1.xml.f4.trans_base
@@ -0,0 +1,30 @@
+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_8.1.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_8.1">
+    <Sequence name="outer">
+        <Float32 name="x"/>
+        <Float32 name="y"/>
+        <Sequence name="inner">
+            <Int32 name="i1"/>
+            <String name="s"/>
+        </Sequence>
+    </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_8.1.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_8.1">
+    <Sequence name="outer">
+        <Float32 name="x"/>
+        <Float32 name="y"/>
+        <Sequence name="inner">
+            <Int32 name="i1"/>
+            <String name="s"/>
+        </Sequence>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            
+        </Attribute>
+    </Sequence>
+</Dataset>
+
+The data:
+{ { { -54.4, -54.4, { { 32, "Silly test string: 1" } } }, { -1.77, -1.77, { { 32, "Silly test string: 1" } } }, { 98.93, 98.93, { { 32, "Silly test string: 1" } } }, { 92.68, 92.68, { { 32, "Silly test string: 1" } } } } }
diff --git a/tests/dmr-testsuite/universal/test_simple_8.1.xml.f5.trans_base b/tests/dmr-testsuite/universal/test_simple_8.1.xml.f5.trans_base
new file mode 100644
index 0000000..285ebaa
--- /dev/null
+++ b/tests/dmr-testsuite/universal/test_simple_8.1.xml.f5.trans_base
@@ -0,0 +1,30 @@
+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_8.1.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_8.1">
+    <Sequence name="outer">
+        <Float32 name="x"/>
+        <Float32 name="y"/>
+        <Sequence name="inner">
+            <Int32 name="i1"/>
+            <String name="s"/>
+        </Sequence>
+    </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_8.1.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_8.1">
+    <Sequence name="outer">
+        <Float32 name="x"/>
+        <Float32 name="y"/>
+        <Sequence name="inner">
+            <Int32 name="i1"/>
+            <String name="s"/>
+        </Sequence>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            
+        </Attribute>
+    </Sequence>
+</Dataset>
+
+The data:
+{ { { -54.4, -54.4, { { 32, "Silly test string: 1" } } }, { -1.77, -1.77, { { 32, "Silly test string: 1" } } } } }
diff --git a/tests/dmr-testsuite/vol_1_ce_1.xml b/tests/dmr-testsuite/vol_1_ce_1.xml
new file mode 100644
index 0000000..cf5025d
--- /dev/null
+++ b/tests/dmr-testsuite/vol_1_ce_1.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- This is the DMR used for the first example in the CE section of the DAP4 spec. jhrg 12/30/13 -->
+
+<Dataset name="vol_1_ce_1" dapVersion="4.0" dmrVersion="1.0" xml:base="file:dap4/vol_1_ce_1.xml"
+  xmlns="http://xml.opendap.org/ns/DAP/4.0#"
+  xmlns:dap="http://xml.opendap.org/ns/DAP/4.0#">
+
+  <Int32 name="u"/>
+  <Int32 name="v"/>
+  <Structure name="Point">
+    <Int32 name="x"/>
+    <Int32 name="y"/>
+  </Structure>
+
+</Dataset>
diff --git a/tests/dmr-testsuite/vol_1_ce_10.xml b/tests/dmr-testsuite/vol_1_ce_10.xml
new file mode 100644
index 0000000..c9eff94
--- /dev/null
+++ b/tests/dmr-testsuite/vol_1_ce_10.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- Example in the CE section of the DAP4 spec. jhrg 1/2/14 -->
+
+<Dataset name="vol_1_ce_10" dapVersion="4.0" dmrVersion="1.0" xml:base="file:dap4/vol_1_ce_10.xml"
+  xmlns="http://xml.opendap.org/ns/DAP/4.0#" xmlns:dap="http://xml.opendap.org/ns/DAP/4.0#">
+  <Float32 name="lat">
+    <Dim size="100"/>
+    <Dim size="50"/>
+  </Float32>
+  
+  <Float32 name="lon">
+    <Dim size="100"/>
+    <Dim size="50"/>
+  </Float32>
+  
+  <Float32 name="temp">
+    <Dim size="100"/>
+    <Dim size="50"/>
+  </Float32>
+</Dataset>
diff --git a/tests/dmr-testsuite/vol_1_ce_11.xml b/tests/dmr-testsuite/vol_1_ce_11.xml
new file mode 100644
index 0000000..b7cb18a
--- /dev/null
+++ b/tests/dmr-testsuite/vol_1_ce_11.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- Example in the CE section of the DAP4 spec. jhrg 1/2/14 -->
+
+<Dataset name="vol_1_ce_11" dapVersion="4.0" dmrVersion="1.0" xml:base="file:dap4/vol_1_ce_11.xml"
+  xmlns="http://xml.opendap.org/ns/DAP/4.0#" xmlns:dap="http://xml.opendap.org/ns/DAP/4.0#">
+  <Dimension name="nlat" size="100"/>
+  <Dimension name="nlon" size="50"/>
+  
+  <Float32 name="lat">
+    <Dim name="nlat"/>
+  </Float32>
+  <Float32 name="lon">
+    <Dim name="nlon"/>
+  </Float32>
+  
+  <Float32 name="temp">
+    <Dim name="nlon"/>
+    <Dim name="nlat"/>
+    <Map name="lon"/>
+    <Map name="lat"/>
+  </Float32>
+  
+</Dataset>
diff --git a/tests/dmr-testsuite/vol_1_ce_12.xml b/tests/dmr-testsuite/vol_1_ce_12.xml
new file mode 100644
index 0000000..1023709
--- /dev/null
+++ b/tests/dmr-testsuite/vol_1_ce_12.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- Example in the CE section of the DAP4 spec. jhrg 1/2/14 -->
+
+<Dataset name="vol_1_ce_12" dapVersion="4.0" dmrVersion="1.0" xml:base="file:dap4/vol_1_ce_12.xml"
+  xmlns="http://xml.opendap.org/ns/DAP/4.0#" xmlns:dap="http://xml.opendap.org/ns/DAP/4.0#">
+  <Dimension name="x" size="100"/>
+  <Dimension name="y" size="50"/>
+  
+  <Float32 name="lat">
+    <Dim name="x"/>
+    <Dim name="y"/>
+  </Float32>
+  <Float32 name="lon">
+    <Dim name="x"/>
+    <Dim name="y"/>
+  </Float32>
+  
+  <Float32 name="temp">
+    <Dim name="x"/>
+    <Dim name="y"/>
+    <Map name="lon"/>
+    <Map name="lat"/>
+  </Float32>
+  
+</Dataset>
diff --git a/tests/dmr-testsuite/vol_1_ce_2.xml b/tests/dmr-testsuite/vol_1_ce_2.xml
new file mode 100644
index 0000000..c598cc4
--- /dev/null
+++ b/tests/dmr-testsuite/vol_1_ce_2.xml
@@ -0,0 +1,19 @@
+<?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#">
+  
+  <Int32 name="u"/>
+  <Int32 name="v"/>
+  <Group name="inst2">
+    <Int32 name="u"/>
+    <Int32 name="v"/>
+    <Structure name="Point">
+      <Int32 name="x"/>
+      <Int32 name="y"/>
+    </Structure>
+  </Group>
+</Dataset>
+
diff --git a/tests/dmr-testsuite/vol_1_ce_3.xml b/tests/dmr-testsuite/vol_1_ce_3.xml
new file mode 100644
index 0000000..db4e968
--- /dev/null
+++ b/tests/dmr-testsuite/vol_1_ce_3.xml
@@ -0,0 +1,22 @@
+<?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_3" dapVersion="4.0" dmrVersion="1.0" xml:base="file:dap4/vol_1_ce_3.xml"
+  xmlns="http://xml.opendap.org/ns/DAP/4.0#" xmlns:dap="http://xml.opendap.org/ns/DAP/4.0#">
+  
+  <Int32 name="u">
+    <Dim size="256"/>
+    <Dim size="256"/>
+  </Int32>
+  <Int32 name="v">
+    <Dim size="256"/>
+    <Dim size="256"/>
+  </Int32>
+  <Structure name="Point">
+    <Int32 name="x"/>
+    <Int32 name="y"/>
+    <Dim size="256"/>
+  </Structure>
+</Dataset>
+
diff --git a/tests/dmr-testsuite/vol_1_ce_4.xml b/tests/dmr-testsuite/vol_1_ce_4.xml
new file mode 100644
index 0000000..10678a0
--- /dev/null
+++ b/tests/dmr-testsuite/vol_1_ce_4.xml
@@ -0,0 +1,23 @@
+<?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_4" dapVersion="4.0" dmrVersion="1.0" xml:base="file:dap4/vol_1_ce_4.xml"
+  xmlns="http://xml.opendap.org/ns/DAP/4.0#" xmlns:dap="http://xml.opendap.org/ns/DAP/4.0#">
+  <Int32 name="u">
+    <Dim size="256"/>
+    <Dim size="1024"/>
+  </Int32>
+  <Structure name="Point">
+    <Int32 name="x"/>
+    <Int32 name="y">
+      <Dim size="256"/>
+    </Int32>
+    <Int32 name="z">
+      <Dim size="1024"/>
+    </Int32>
+    <Dim size="256"/>
+  </Structure>
+</Dataset>
+
+
diff --git a/tests/dmr-testsuite/vol_1_ce_5.xml b/tests/dmr-testsuite/vol_1_ce_5.xml
new file mode 100644
index 0000000..3e33909
--- /dev/null
+++ b/tests/dmr-testsuite/vol_1_ce_5.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- Example in the CE section of the DAP4 spec. jhrg 12/31/13 -->
+
+<Dataset name="vol_1_ce_5" dapVersion="4.0" dmrVersion="1.0" xml:base="file:dap4/vol_1_ce_5.xml"
+  xmlns="http://xml.opendap.org/ns/DAP/4.0#" xmlns:dap="http://xml.opendap.org/ns/DAP/4.0#">
+  <Int32 name="u">
+    <Dim size="256"/>
+    <Dim size="1024"/>
+  </Int32>
+  <Structure name="Points">
+    <Int32 name="x"/>
+    <Int32 name="y"/>
+    <Structure name="sounding">
+      <Int32 name="height">
+        <Dim size="1024"/>
+      </Int32>
+      <Int32 name="pressure">
+        <Dim size="1024"/>
+      </Int32>
+    </Structure>
+    
+    <Dim size="256"/>
+  </Structure>
+</Dataset>
+
+
diff --git a/tests/dmr-testsuite/vol_1_ce_6.xml b/tests/dmr-testsuite/vol_1_ce_6.xml
new file mode 100644
index 0000000..599bdb6
--- /dev/null
+++ b/tests/dmr-testsuite/vol_1_ce_6.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- Example in the CE section of the DAP4 spec. jhrg 12/31/13 -->
+
+<Dataset name="vol_1_ce_6" dapVersion="4.0" dmrVersion="1.0" xml:base="file:dap4/vol_1_ce_6.xml"
+  xmlns="http://xml.opendap.org/ns/DAP/4.0#" xmlns:dap="http://xml.opendap.org/ns/DAP/4.0#">
+  <Sequence name="s1">
+    <Int32 name="x"/>
+    <Int32 name="y"/>
+  </Sequence>
+  
+  <Sequence name="s2">
+    <Int32 name="x"/>
+    <Int32 name="y"/>
+    <Dim size="100"/>
+  </Sequence>
+  
+  <Sequence name="s3">
+    <Int32 name="z"/>
+    <Int32 name="x">
+      <Dim size="10"/>
+    </Int32>
+  </Sequence>
+  
+  <Sequence name="s4">
+    <Int32 name="z"/>
+    <Int32 name="x">
+      <Dim size="1024"/>
+    </Int32>
+    <Dim size="100"/>
+  </Sequence>
+  
+</Dataset>
diff --git a/tests/dmr-testsuite/vol_1_ce_7.xml b/tests/dmr-testsuite/vol_1_ce_7.xml
new file mode 100644
index 0000000..24acc73
--- /dev/null
+++ b/tests/dmr-testsuite/vol_1_ce_7.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- Example in the CE section of the DAP4 spec. jhrg 12/31/13 -->
+
+<Dataset name="vol_1_ce_7" dapVersion="4.0" dmrVersion="1.0" xml:base="file:dap4/vol_1_ce_7.xml"
+  xmlns="http://xml.opendap.org/ns/DAP/4.0#" xmlns:dap="http://xml.opendap.org/ns/DAP/4.0#">
+  <Dimension name="nlat" size="100"/>
+  <Dimension name="nlon" size="50"/>
+  
+  <Float32 name="lat">
+    <Dim name="nlat"/>
+  </Float32>
+  <Float32 name="lon">
+    <Dim name="nlon"/>
+  </Float32>
+  
+  <Float32 name="temp">
+    <Dim name="nlon"/>
+    <Dim name="nlat"/>
+    <Map name="lat"/>
+    <Map name="lon"/>
+  </Float32>
+
+  <Float32 name="sal">
+    <Dim name="nlon"/>
+    <Dim name="nlat"/>
+    <Map name="lat"/>
+    <Map name="lon"/>
+  </Float32>
+  
+  <Float32 name="O2">
+    <Dim name="nlat"/>
+    <Dim name="nlon"/>
+    <Map name="lon"/>
+    <Map name="lat"/>
+  </Float32>
+  
+  <Float32 name="CO2">
+    <Dim name="nlon"/>
+    <Dim name="nlat"/>
+    <Dim size="10"/>
+    <Map name="lat"/>
+    <Map name="lon"/>
+  </Float32>
+  
+</Dataset>
diff --git a/tests/dmr-testsuite/vol_1_ce_8.xml b/tests/dmr-testsuite/vol_1_ce_8.xml
new file mode 100644
index 0000000..c262e26
--- /dev/null
+++ b/tests/dmr-testsuite/vol_1_ce_8.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- Example in the CE section of the DAP4 spec. jhrg 1/2/13 -->
+
+<Dataset name="vol_1_ce_8" dapVersion="4.0" dmrVersion="1.0" xml:base="file:dap4/vol_1_ce_8.xml"
+  xmlns="http://xml.opendap.org/ns/DAP/4.0#" xmlns:dap="http://xml.opendap.org/ns/DAP/4.0#">
+  
+  <Float32 name="temp">
+    <Dim size="10"/>
+  </Float32>
+  
+  <Float32 name="u">
+    <Dim size="256"/>
+    <Dim size="256"/>
+  </Float32>
+
+  <Float32 name="v">
+    <Dim size="256"/>
+    <Dim size="256"/>
+  </Float32>
+
+  <Sequence name="Points">
+    <Int32 name="x"/>
+    <Int32 name="y"/>
+  </Sequence>
+  
+</Dataset>
diff --git a/tests/dmr-testsuite/vol_1_ce_9.xml b/tests/dmr-testsuite/vol_1_ce_9.xml
new file mode 100644
index 0000000..cc8e0a0
--- /dev/null
+++ b/tests/dmr-testsuite/vol_1_ce_9.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- Example in the CE section of the DAP4 spec. jhrg 1/2/13 -->
+
+<Dataset name="vol_1_ce_9" dapVersion="4.0" dmrVersion="1.0" xml:base="file:dap4/vol_1_ce_9.xml"
+  xmlns="http://xml.opendap.org/ns/DAP/4.0#" xmlns:dap="http://xml.opendap.org/ns/DAP/4.0#">
+  <Sequence name="Points1">
+    <Int32 name="x">
+      <Dim size="100"/>
+    </Int32>
+    <Int32 name="y"/>
+  </Sequence>
+  
+  <Sequence name="Points2">
+    <Int32 name="x"/>
+    <Int32 name="y"/>
+    <Sequence name="sounding">
+      <Int32 name="depth"/>
+      <Int32 name="temp"/>
+      <Dim size="20"/>
+    </Sequence>
+  </Sequence>
+  
+  <Structure name="Points3">
+    <Int32 name="x"/>
+    <Int32 name="y"/>
+    <Sequence name="raw">
+      <Int32 name="depth"/>
+      <Int32 name="temps">
+        <Dim size="4"/>
+      </Int32>
+      <Dim size="300"/>
+    </Sequence>
+  </Structure>
+  
+</Dataset>
diff --git a/tests/expr-test.cc b/tests/expr-test.cc
new file mode 100644
index 0000000..d0f3085
--- /dev/null
+++ b/tests/expr-test.cc
@@ -0,0 +1,632 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1995-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// Test the CE scanner and parser.
+//
+// jhrg 9/12/95
+
+#include "config.h"
+
+//#define DODS_DEBUG
+
+#include <stdio.h>
+#include <stdlib.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <string.h>
+#include <errno.h>
+
+#include <iostream>
+#include <fstream>
+#include <string>
+
+#include "GetOpt.h"
+
+#include "BaseType.h"
+#include "DDS.h"
+#include "DataDDS.h"
+#include "ConstraintEvaluator.h"
+#include "ServerFunctionsList.h"
+// #include "XDRStreamUnMarshaller.h"
+#include "XDRStreamMarshaller.h"
+#include "ResponseBuilder.h"
+#include "Response.h"
+#include "Connect.h"
+#include "Error.h"
+
+#include "TestSequence.h"
+#include "TestCommon.h"
+#include "TestTypeFactory.h"
+
+#include "TestFunction.h"
+
+#include "parser.h"
+#include "expr.h"
+#include "ce_expr.tab.hh"
+#include "util.h"
+
+#include "debug.h"
+
+using namespace std;
+
+int test_variable_sleep_interval = 0;   // Used in Test* classes for testing
+                                      // timeouts.
+
+#define CRLF "\r\n"             // Change this here and in mime_util.cc
+#define DODS_DDS_PRX "dods_dds"
+#define YY_BUFFER_STATE (void *)
+
+void test_scanner(const string & str);
+void test_scanner(bool show_prompt);
+void test_parser(ConstraintEvaluator & eval, DDS & table,
+                 const string & dds_name, string constraint);
+bool read_table(DDS & table, const string & name, bool print);
+void evaluate_dds(DDS & table, bool print_constrained, bool xml_syntax);
+void constrained_trans(const string & dds_name, const bool constraint_expr,
+                       const string & ce, const bool series_values);
+void intern_data_test(const string & dds_name, const bool constraint_expr,
+                 const string & ce, const bool series_values);
+
+int ce_exprlex();               // exprlex() uses the global ce_exprlval
+// int ce_exprparse(void *arg);
+void ce_exprrestart(FILE * in);
+
+// Glue routines declared in expr.lex
+void ce_expr_switch_to_buffer(void *new_buffer);
+void ce_expr_delete_buffer(void *buffer);
+void *ce_expr_string(const char *yy_str);
+
+extern int ce_exprdebug;
+
+#if 0
+static int keep_temps = 0;      // MT-safe; test code.
+#endif
+
+const string version = "version 1.12";
+const string prompt = "expr-test: ";
+const string options = "sS:bdecvp:w:W:f:k:vx?";
+const string usage = "\
+\nexpr-test [-s [-S string] -d -c -v [-p dds-file]\
+\n[-e expr] [-w|-W dds-file] [-f data-file] [-k expr]]\
+\nTest the expression evaluation software.\
+\nOptions:\
+\n  -s: Feed the input stream directly into the expression scanner, does\
+\n      not parse.\
+\n  -S: <string> Scan the string as if it was standard input.\
+\n  -d: Turn on expression parser debugging.\
+\n  -c: Print the constrained DDS (the one that will be returned\
+\n      prepended to a data transmission. Must also supply -p and -e \
+\n  -v: Verbose output\
+\n  -V: Print the version of expr-test\
+\n  -p: DDS-file: Read the DDS from DDS-file and create a DDS object,\
+\n      then prompt for an expression and parse that expression, given\
+\n      the DDS object.\
+\n  -e: Evaluate the constraint expression. Must be used with -p.\
+\n  -w: Do the whole enchilada. You don't need to supply -p, -e, ...\
+\n      This prompts for the constraint expression and the optional\
+\n      data file name. NOTE: The CE parser Error objects do not print\
+\n      with this option.\
+\n  -W: Similar to -w but uses the new (11/2007) intern_data() methods\
+\n      in place of the serialize()/deserialize() combination.\
+\n  -b: Use periodic/cyclic/changing values. For testing Sequence CEs.\
+\n  -f: A file to use for data. Currently only used by -w for sequences.\
+\n  -k: A constraint expression to use with the data. Works with -p,\
+\n      -e, -t and -w\
+\n  -x: Print declarations using the XML syntax. Does not work with the\
+\n      data printouts.\
+\n  -?: Print usage information";
+
+int main(int argc, char *argv[])
+{
+    GetOpt getopt(argc, argv, options.c_str());
+
+    int option_char;
+    bool scanner_test = false, parser_test = false, evaluate_test = false;
+    bool print_constrained = false;
+    bool whole_enchalada = false, constraint_expr = false;
+    bool whole_intern_enchalada = false;
+    bool scan_string = false;
+    bool verbose = false;
+    bool series_values = false;
+    bool xml_syntax = false;
+    string dds_file_name;
+    string dataset = "";
+    string constraint = "";
+    TestTypeFactory ttf;
+    DDS table(&ttf);
+
+    // Load our one server function...
+    ServerFunction *scale = new TestFunction;
+    ServerFunctionsList::TheList()->add_function(scale);
+
+    // process options
+
+    while ((option_char = getopt()) != -1)
+        switch (option_char) {
+        case 'b':
+            series_values = true;
+            break;
+        case 'd':
+            ce_exprdebug = true;
+            break;
+        case 's':
+            scanner_test = true;
+            break;
+        case 'S':
+            scanner_test = true;
+            scan_string = true;
+            constraint = getopt.optarg;
+            break;
+        case 'p':
+            parser_test = true;
+            dds_file_name = getopt.optarg;
+            break;
+        case 'e':
+            evaluate_test = true;
+            break;
+        case 'c':
+            print_constrained = true;
+            break;
+        case 'w':
+            whole_enchalada = true;
+            dds_file_name = getopt.optarg;
+            break;
+        case 'W':
+            whole_intern_enchalada = true;
+            dds_file_name = getopt.optarg;
+            break;
+        case 'k':
+            constraint_expr = true;
+            constraint = getopt.optarg;
+            break;
+        case 'f':
+            dataset = getopt.optarg;
+            break;
+        case 'v':
+            verbose = true;
+            break;
+        case 'V':
+            cerr << argv[0] << ": " <<  version << endl;
+            exit(0);
+        case 'x':
+        	xml_syntax = true;
+        	break;
+        case '?':
+        default:
+            cerr << usage << endl;
+            exit(1);
+            break;
+        }
+
+    try {
+        if (!scanner_test && !parser_test && !evaluate_test
+            && !whole_enchalada && !whole_intern_enchalada) {
+            cerr << usage << endl;
+            exit(1);
+        }
+        // run selected tests
+
+        if (scanner_test) {
+            if (scan_string)
+                test_scanner(constraint);
+            else
+                test_scanner(true);
+
+            exit(0);
+        }
+
+        if (parser_test) {
+            ConstraintEvaluator eval;
+
+            test_parser(eval, table, dds_file_name, constraint);
+        }
+
+        if (evaluate_test) {
+            evaluate_dds(table, print_constrained, xml_syntax);
+        }
+
+        if (whole_enchalada) {
+            constrained_trans(dds_file_name, constraint_expr, constraint, series_values);
+        }
+        if (whole_intern_enchalada) {
+            intern_data_test(dds_file_name, constraint_expr, constraint, series_values);
+        }
+    }
+    catch(Error & e) {
+        cerr <<e.get_error_message() << endl;
+        exit(1);
+    }
+    catch(exception & e) {
+        cerr << "Caught exception: " << e.what() << endl;
+        exit(1);
+    }
+
+    exit(0);
+}
+
+// Instead of reading the tokens from stdin, read them from a string.
+
+void test_scanner(const string & str)
+{
+    ce_exprrestart(0);
+    void *buffer = ce_expr_string(str.c_str());
+    ce_expr_switch_to_buffer(buffer);
+
+    test_scanner(false);
+
+    ce_expr_delete_buffer(buffer);
+}
+
+void test_scanner(bool show_prompt)
+{
+    if (show_prompt)
+        cout << prompt;
+
+    int tok;
+    while ((tok = ce_exprlex())) {
+        switch (tok) {
+        case SCAN_WORD:
+            cout << "WORD: " << ce_exprlval.id << endl;
+            break;
+        case SCAN_STR:
+            cout << "STR: " << *ce_exprlval.val.v.s << endl;
+            break;
+        case SCAN_EQUAL:
+            cout << "EQUAL: " << ce_exprlval.op << endl;
+            break;
+        case SCAN_NOT_EQUAL:
+            cout << "NOT_EQUAL: " << ce_exprlval.op << endl;
+            break;
+        case SCAN_GREATER:
+            cout << "GREATER: " << ce_exprlval.op << endl;
+            break;
+        case SCAN_GREATER_EQL:
+            cout << "GREATER_EQL: " << ce_exprlval.op << endl;
+            break;
+        case SCAN_LESS:
+            cout << "LESS: " << ce_exprlval.op << endl;
+            break;
+        case SCAN_LESS_EQL:
+            cout << "LESS_EQL: " << ce_exprlval.op << endl;
+            break;
+        case SCAN_REGEXP:
+            cout << "REGEXP: " << ce_exprlval.op << endl;
+            break;
+        case SCAN_STAR:
+            cout << "STAR: " << ce_exprlval.op << endl;
+            break;
+        case '.':
+            cout << "Field Selector" << endl;
+            break;
+        case ',':
+            cout << "List Element Separator" << endl;
+            break;
+        case '[':
+            cout << "Left Bracket" << endl;
+            break;
+        case ']':
+            cout << "Right Bracket" << endl;
+            break;
+        case '(':
+            cout << "Left Paren" << endl;
+            break;
+        case ')':
+            cout << "Right Paren" << endl;
+            break;
+        case '{':
+            cout << "Left Brace" << endl;
+            break;
+        case '}':
+            cout << "Right Brace" << endl;
+            break;
+        case ':':
+            cout << "Colon" << endl;
+            break;
+        case '&':
+            cout << "Ampersand" << endl;
+            break;
+        case SCAN_HASH_INT32:
+            cout << "Hash Int32" << endl;
+            break;
+        default:
+            cout << "Error: Unrecognized input" << endl;
+            break;
+        }
+
+        cout << prompt << flush;  // print prompt after output
+    }
+}
+
+// NB: The DDS is read in via a file because reading from stdin must be
+// terminated by EOF. However, the EOF used to terminate the DDS also closes
+// stdin and thus the expr scanner exits immediately.
+
+void
+test_parser(ConstraintEvaluator & eval, DDS & dds, const string & dds_name,
+            string constraint)
+{
+    try {
+        read_table(dds, dds_name, true);
+
+        if (constraint.empty()) {
+            cout << "Constraint:";
+            char c[256];
+            cin.getline(c, 256);
+            if (!cin)
+                throw InternalErr(__FILE__, __LINE__,
+                                  "Could not read the constraint expression\n");
+            constraint = c;
+        }
+
+        eval.parse_constraint(constraint, dds);
+        fprintf(stdout, "Input parsed\n");      // Parser throws on failure.
+    }
+    catch(Error & e) {
+        cerr << e.get_error_message() << endl;
+    }
+}
+
+// Read a DDS from stdin and build the corresponding DDS. IF PRINT is true,
+// print the text representation of that DDS on the stdout. The DDS TABLE is
+// modified as a side effect.
+//
+// Returns: true iff that DDS pasted the semantic_check() mfunc, otherwise
+// false.
+
+bool read_table(DDS & table, const string & name, bool print)
+{
+    table.parse(name);
+
+    if (print)
+        table.print(cout);
+
+    if (table.check_semantics(true))
+        return true;
+    else {
+        fprintf(stdout, "Input did not pass semantic checks\n");
+        return false;
+    }
+}
+
+void evaluate_dds(DDS & table, bool print_constrained, bool xml_syntax)
+{
+    if (print_constrained) {
+    	if (xml_syntax)
+    		table.print_xml(cout, print_constrained, "");
+    	else
+    		table.print_constrained(cout);
+    }
+    else {
+        for (DDS::Vars_iter p = table.var_begin(); p != table.var_end(); p++) {
+        	if (xml_syntax)
+        		(*p)->print_decl(cout, "", print_constrained);
+        	else
+        		(*p)->print_decl(cout, "", true, true);
+        }
+    }
+}
+
+// Gobble up the MIME header. At one time the MIME Headers were output from
+// the server filter programs (not the core software) so we could call
+// DDS::send() from this test code and not have to parse the MIME header. But
+// in order to get errors to work more reliably the header generation was
+// moved `closer to the send'. That is, we put off determining whether to
+// send a DDS or an Error object until later. That trade off is that the
+// header generation is not buried in the core software. This code simply
+// reads until the end of the header is found. 3/25/98 jhrg
+
+void parse_mime(FILE * data_source)
+{
+    char line[256];
+
+    fgets(line, 256, data_source);
+
+    while (strncmp(line, CRLF, 2) != 0)
+        fgets(line, 256, data_source);
+}
+
+void set_series_values(DDS & dds, bool state)
+{
+    for (DDS::Vars_iter q = dds.var_begin(); q != dds.var_end(); q++) {
+        dynamic_cast < TestCommon & >(**q).set_series_values(state);
+    }
+}
+
+// Test the transmission of constrained datasets. Use read_table() to read
+// the DDS from a file. Once done, prompt for the variable name and
+// constraint expression. In a real client-server system the server would
+// read the DDS for the entire dataset and send it to the client. The client
+// would then respond to the server by asking for a variable given a
+// constraint.
+//
+// Once the constraint has been entered, it is evaluated in the context of
+// the DDS using DDS:eval_constraint() (this would happen on the server-side
+// in a real system). Once the evaluation is complete,
+// DDS::print_constrained() is used to create a DDS describing only those
+// parts of the dataset that are to be sent to the client process and written
+// to the output stream. After that, the marker `Data:' is written to the
+// output stream, followed by the binary data.
+
+void
+constrained_trans(const string & dds_name, const bool constraint_expr,
+                  const string & constraint, const bool series_values)
+{
+    // If the CE was not passed in, read it from the command line.
+    string ce;
+    if (!constraint_expr) {
+        cout << "Constraint:";
+        char c[256];
+        cin.getline(c, 256);
+        if (!cin) {
+            throw InternalErr(__FILE__, __LINE__, "Could not read the constraint expression\n");
+        }
+        ce = c;
+    }
+    else {
+        ce = constraint;
+    }
+
+    TestTypeFactory ttf;
+    DDS server(&ttf);
+    ConstraintEvaluator eval;
+
+    cout << "The complete DDS:" << endl;
+    read_table(server, dds_name, true);
+
+    // by default this is false (to get the old-style values that are
+    // constant); set series_values to true for testing Sequence constraints.
+    // 01/14/05 jhrg And Array constraints, although it's of limited
+    // versatility 02/05/07 jhrg
+    set_series_values(server, series_values);
+
+    ResponseBuilder df;
+    df.set_ce(ce);
+    df.set_dataset_name(dds_name);
+
+    ofstream out("expr-test-data.bin", ios::out|ios::trunc|ios::binary);
+    df.send_data(out, server, eval, true);
+    out.close();
+
+    // Now do what Connect::request_data() does:
+    FILE *fp = fopen("expr-test-data.bin", "r");
+
+    Response r(fp, 400);
+    Connect c("http://dummy_argument");
+
+    BaseTypeFactory factory;
+    DataDDS dds(&factory, "Test_data", "DAP/3.2");      // Must use DataDDS on receiving end
+
+    c.read_data(dds, &r);
+
+    cout << "The data:" << endl;
+    for (DDS::Vars_iter q = dds.var_begin(); q != dds.var_end(); q++) {
+        (*q)->print_val(cout);
+    }
+}
+
+/** This function does what constrained_trans() does but does not use the
+    serialize()/deserialize() methods. Instead it uses the new (11/2007)
+    intern_data() methods.
+
+    @param dds_name
+    @param constraint_expr True is one was given, else false
+    @param constraint The constraint expression if \c constraint_expr is
+    true.
+    @param series_values True if TestTypes should generate 'series values'
+    like the DTS. False selects the old-style values. */
+void
+intern_data_test(const string & dds_name, const bool constraint_expr,
+                 const string & constraint, const bool series_values)
+{
+    // If the CE was not passed in, read it from the command line.
+    string ce;
+    if (!constraint_expr) {
+        cout << "Constraint: ";
+        char c[256];
+        cin.getline(c, 256);
+        if (!cin) {
+            throw InternalErr(__FILE__, __LINE__,
+                              "Could not read the constraint expression\n");
+        }
+        ce = c;
+    }
+    else {
+        ce = constraint;
+    }
+
+    TestTypeFactory ttf;
+    DDS server(&ttf);
+    ConstraintEvaluator eval;
+
+    cout << "The complete DDS:\n";
+    read_table(server, dds_name, true);
+
+    // by default this is false (to get the old-style values that are
+    // constant); set series_values to true for testing Sequence constraints.
+    // 01/14/05 jhrg And Array constraints, although it's of limited
+    // versatility 02/05/07 jhrg
+    set_series_values(server, series_values);
+
+    eval.parse_constraint(ce, server);  // Throws Error if the ce doesn't parse.
+
+    server.tag_nested_sequences();      // Tag Sequences as Parent or Leaf node.
+
+    if (eval.function_clauses()) {
+        DDS *fdds = eval.eval_function_clauses(server);
+
+        for (DDS::Vars_iter i = fdds->var_begin(); i != fdds->var_end(); i++)
+            if ((*i)->send_p())
+                (*i)->intern_data(eval, *fdds);
+
+        cout << "The data:\n";
+
+        // This code calls 'output_values()' because print_val() does not test
+        // the value of send_p(). We need to wrap a method around the calls to
+        // print_val() to ensure that only values for variables with send_p() set
+        // are called. In the serialize/deserialize case, the 'client' DDS only
+        // has variables sent by the 'server' but in the intern_data() case, the
+        // whole DDS is still present and only variables selected in the CE have
+        // values.
+        for (DDS::Vars_iter q = fdds->var_begin(); q != fdds->var_end(); q++) {
+            if ((*q)->send_p()) {
+                (*q)->print_decl(cout, "", false, false, true);
+                cout << " = ";
+                dynamic_cast<TestCommon&>(**q).output_values(cout);
+                cout << ";\n";
+            }
+        }
+
+        delete fdds;
+    }
+    else {
+        for (DDS::Vars_iter i = server.var_begin(); i != server.var_end(); i++)
+            if ((*i)->send_p())
+                (*i)->intern_data(eval, server);
+        cout << "The data:\n";
+
+        // This code calls 'output_values()' because print_val() does not test
+        // the value of send_p(). We need to wrap a method around the calls to
+        // print_val() to ensure that only values for variables with send_p() set
+        // are called. In the serialize/deserialize case, the 'client' DDS only
+        // has variables sent by the 'server' but in the intern_data() case, the
+        // whole DDS is still present and only variables selected in the CE have
+        // values.
+        for (DDS::Vars_iter q = server.var_begin(); q != server.var_end(); q++) {
+            if ((*q)->send_p()) {
+                (*q)->print_decl(cout, "", false, false, true);
+                cout << " = ";
+                dynamic_cast<TestCommon&>(**q).output_values(cout);
+                cout << ";\n";
+            }
+        }
+    }
+}
diff --git a/tests/expr-testsuite/data.21.base b/tests/expr-testsuite/data.21.base
new file mode 100644
index 0000000..895561c
--- /dev/null
+++ b/tests/expr-testsuite/data.21.base
@@ -0,0 +1,6 @@
+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.22.base b/tests/expr-testsuite/data.22.base
new file mode 100644
index 0000000..d7373cb
--- /dev/null
+++ b/tests/expr-testsuite/data.22.base
@@ -0,0 +1,10 @@
+The complete DDS:
+Dataset {
+    Int32 a;
+    Int32 b[10];
+    Int32 c[0];
+} test.22;
+The data:
+Int32 a = 32;
+Int32 b[10] = {32, 1024, 32768, 1048576, 33554432, 1073741824, 32, 1024, 32768, 1048576};
+Int32 c[0] = {};
diff --git a/tests/expr-testsuite/data.23.base b/tests/expr-testsuite/data.23.base
new file mode 100644
index 0000000..3326534
--- /dev/null
+++ b/tests/expr-testsuite/data.23.base
@@ -0,0 +1,10 @@
+The complete DDS:
+Dataset {
+    Int32 a;
+    Int32 b[10];
+    Int32 c[4][0];
+} test.22;
+The data:
+Int32 a = 32;
+Int32 b[10] = {32, 1024, 32768, 1048576, 33554432, 1073741824, 32, 1024, 32768, 1048576};
+Int32 c[4][0] = {{},{},{},{}};
diff --git a/tests/expr-testsuite/data.24.base b/tests/expr-testsuite/data.24.base
new file mode 100644
index 0000000..6701ae3
--- /dev/null
+++ b/tests/expr-testsuite/data.24.base
@@ -0,0 +1,10 @@
+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/expr-testsuite/data.25.base b/tests/expr-testsuite/data.25.base
new file mode 100644
index 0000000..090f7b9
--- /dev/null
+++ b/tests/expr-testsuite/data.25.base
@@ -0,0 +1,8 @@
+The complete DDS:
+Dataset {
+    Structure {
+    } exp;
+} data6;
+The data:
+Structure {
+} exp = {  };
diff --git a/tests/expr-testsuite/data.26.base b/tests/expr-testsuite/data.26.base
new file mode 100644
index 0000000..8a2d663
--- /dev/null
+++ b/tests/expr-testsuite/data.26.base
@@ -0,0 +1,16 @@
+The complete DDS:
+Dataset {
+    Structure {
+        Int32 j;
+        Int32 i;
+        Structure {
+        } data;
+    } exp;
+} data6;
+The data:
+Structure {
+    Int32 j;
+    Int32 i;
+    Structure {
+    } data;
+} exp = { 32, 32, {  } };
diff --git a/tests/expr-testsuite/data.61a.base b/tests/expr-testsuite/data.61a.base
new file mode 100644
index 0000000..bde0b8e
--- /dev/null
+++ b/tests/expr-testsuite/data.61a.base
@@ -0,0 +1,6 @@
+The complete DDS:
+Dataset {
+    Int32 i[4][5];
+} test61;
+The data:
+Int32 i[4][5] = {{32, 1024, 32768, 1048576, 33554432},{1073741824, 32, 1024, 32768, 1048576},{33554432, 1073741824, 32, 1024, 32768},{1048576, 33554432, 1073741824, 32, 1024}};
diff --git a/tests/expr-testsuite/data.61b.base b/tests/expr-testsuite/data.61b.base
new file mode 100644
index 0000000..8790f25
--- /dev/null
+++ b/tests/expr-testsuite/data.61b.base
@@ -0,0 +1,6 @@
+The complete DDS:
+Dataset {
+    Int32 i[4][5];
+} test61;
+The data:
+Int32 i[3][3] = {{32, 1024, 32768},{1073741824, 32, 1024},{33554432, 1073741824, 32}};
diff --git a/tests/expr-testsuite/data.61c.base b/tests/expr-testsuite/data.61c.base
new file mode 100644
index 0000000..6eec1d0
--- /dev/null
+++ b/tests/expr-testsuite/data.61c.base
@@ -0,0 +1,6 @@
+The complete DDS:
+Dataset {
+    Int32 i[4][5];
+} test61;
+The data:
+Int32 i[2][3] = {{1073741824, 32, 1024},{33554432, 1073741824, 32}};
diff --git a/tests/expr-testsuite/data.61d.base b/tests/expr-testsuite/data.61d.base
new file mode 100644
index 0000000..d08c939
--- /dev/null
+++ b/tests/expr-testsuite/data.61d.base
@@ -0,0 +1,6 @@
+The complete DDS:
+Dataset {
+    Int32 i[4][5];
+} test61;
+The data:
+Int32 i[2][2] = {{32, 1024},{1073741824, 32}};
diff --git a/tests/expr-testsuite/data.z0.base b/tests/expr-testsuite/data.z0.base
new file mode 100644
index 0000000..74490b7
--- /dev/null
+++ b/tests/expr-testsuite/data.z0.base
@@ -0,0 +1 @@
+Wrong number of arguments to geogrid() (expected at least 5 args). See geogrid() for more information.
diff --git a/tests/expr-testsuite/data.z1.base b/tests/expr-testsuite/data.z1.base
new file mode 100644
index 0000000..37d0567
--- /dev/null
+++ b/tests/expr-testsuite/data.z1.base
@@ -0,0 +1,18 @@
+The complete DDS:
+Dataset {
+    Grid {
+      Array:
+        Byte SST[lat = 13][lon = 11];
+      Maps:
+        Float32 lat[13];
+        Float32 lon[11];
+    } SST;
+} SST_grid;
+The data:
+Grid {
+  Array:
+    Byte SST[lat = 13][lon = 11];
+  Maps:
+    Float32 lat[13];
+    Float32 lon[11];
+} SST = {  Array: {{0, 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}}  Maps: {77, 64, 51, 38, 25, 12, -1, -14, -27, -40, -53, -66, -79}, {32, 64, 96, 128, 160, 192, 224, 256, 288, 320, 352} };
diff --git a/tests/expr-testsuite/data.z2.base b/tests/expr-testsuite/data.z2.base
new file mode 100644
index 0000000..a964053
--- /dev/null
+++ b/tests/expr-testsuite/data.z2.base
@@ -0,0 +1,18 @@
+The complete DDS:
+Dataset {
+    Grid {
+      Array:
+        Byte SST[lat = 13][lon = 11];
+      Maps:
+        Float32 lat[13];
+        Float32 lon[11];
+    } SST;
+} SST_grid;
+The data:
+Grid {
+  Array:
+    Byte SST[lat = 3][lon = 3];
+  Maps:
+    Float32 lat[3];
+    Float32 lon[3];
+} SST = {  Array: {{156, 157, 158},{167, 168, 169},{178, 179, 180}}  Maps: {64, 51, 38}, {96, 128, 160} };
diff --git a/tests/expr-testsuite/data.z3.base b/tests/expr-testsuite/data.z3.base
new file mode 100644
index 0000000..09dee5c
--- /dev/null
+++ b/tests/expr-testsuite/data.z3.base
@@ -0,0 +1,18 @@
+The complete DDS:
+Dataset {
+    Grid {
+      Array:
+        Byte SST[lat_reversed = 13][lon = 11];
+      Maps:
+        Float32 lat_reversed[13];
+        Float32 lon[11];
+    } SST;
+} SST_grid;
+The data:
+Grid {
+  Array:
+    Byte SST[lat_reversed = 4][lon = 3];
+  Maps:
+    Float32 lat_reversed[4];
+    Float32 lon[3];
+} SST = {  Array: {{10, 11, 12},{255, 0, 1},{244, 245, 246},{233, 234, 235}}  Maps: {67, 54, 41, 28}, {96, 128, 160} };
diff --git a/tests/expr-testsuite/data.z4.base b/tests/expr-testsuite/data.z4.base
new file mode 100644
index 0000000..7ced514
--- /dev/null
+++ b/tests/expr-testsuite/data.z4.base
@@ -0,0 +1,20 @@
+The complete DDS:
+Dataset {
+    Grid {
+      Array:
+        Byte SST[time = 3][lon = 11][lat = 13];
+      Maps:
+        Int32 time[3];
+        Float32 lon[11];
+        Float32 lat[13];
+    } SST;
+} SST_grid;
+The data:
+Grid {
+  Array:
+    Byte SST[time = 3][lon = 3][lat = 3];
+  Maps:
+    Int32 time[3];
+    Float32 lon[3];
+    Float32 lat[3];
+} SST = {  Array: {{{173, 174, 175},{176, 177, 178},{179, 180, 181}},{{182, 183, 184},{185, 186, 187},{188, 189, 190}},{{191, 192, 193},{194, 195, 196},{197, 198, 199}}}  Maps: {32, 1024, 32768}, {96, 128, 160}, {64, 51, 38} };
diff --git a/tests/expr-testsuite/data.z5.base b/tests/expr-testsuite/data.z5.base
new file mode 100644
index 0000000..e37ac9a
--- /dev/null
+++ b/tests/expr-testsuite/data.z5.base
@@ -0,0 +1,20 @@
+The complete DDS:
+Dataset {
+    Grid {
+      Array:
+        Byte SST[time = 3][lon = 11][lat = 13];
+      Maps:
+        Int32 time[3];
+        Float32 lon[11];
+        Float32 lat[13];
+    } SST;
+} SST_grid;
+The data:
+Grid {
+  Array:
+    Byte SST[time = 1][lon = 3][lat = 3];
+  Maps:
+    Int32 time[1];
+    Float32 lon[3];
+    Float32 lat[3];
+} SST = {  Array: {{{173, 174, 175},{176, 177, 178},{179, 180, 181}}}  Maps: {1048576}, {96, 128, 160}, {64, 51, 38} };
diff --git a/tests/expr-testsuite/data.z6.base b/tests/expr-testsuite/data.z6.base
new file mode 100644
index 0000000..1cc8706
--- /dev/null
+++ b/tests/expr-testsuite/data.z6.base
@@ -0,0 +1,18 @@
+The complete DDS:
+Dataset {
+    Grid {
+      Array:
+        Byte SST[lon = 11][lat = 13];
+      Maps:
+        Float32 lon[11];
+        Float32 lat[13];
+    } SST;
+} SST_grid;
+The data:
+Grid {
+  Array:
+    Byte SST[lon = 3][lat = 3];
+  Maps:
+    Float32 lon[3];
+    Float32 lat[3];
+} SST = {  Array: {{170, 171, 172},{183, 184, 185},{196, 197, 198}}  Maps: {96, 128, 160}, {64, 51, 38} };
diff --git a/tests/expr-testsuite/data.z7.base b/tests/expr-testsuite/data.z7.base
new file mode 100644
index 0000000..e37ac9a
--- /dev/null
+++ b/tests/expr-testsuite/data.z7.base
@@ -0,0 +1,20 @@
+The complete DDS:
+Dataset {
+    Grid {
+      Array:
+        Byte SST[time = 3][lon = 11][lat = 13];
+      Maps:
+        Int32 time[3];
+        Float32 lon[11];
+        Float32 lat[13];
+    } SST;
+} SST_grid;
+The data:
+Grid {
+  Array:
+    Byte SST[time = 1][lon = 3][lat = 3];
+  Maps:
+    Int32 time[1];
+    Float32 lon[3];
+    Float32 lat[3];
+} SST = {  Array: {{{173, 174, 175},{176, 177, 178},{179, 180, 181}}}  Maps: {1048576}, {96, 128, 160}, {64, 51, 38} };
diff --git a/tests/expr-testsuite/data.z8.base b/tests/expr-testsuite/data.z8.base
new file mode 100644
index 0000000..f434fa1
--- /dev/null
+++ b/tests/expr-testsuite/data.z8.base
@@ -0,0 +1,32 @@
+The complete DDS:
+Dataset {
+    Grid {
+      Array:
+        Byte SST[lat = 13][lon = 11];
+      Maps:
+        Float32 lat[13];
+        Float32 lon[11];
+    } SST;
+    Grid {
+      Array:
+        Byte AIRT[lat = 13][lon = 11];
+      Maps:
+        Float32 lat[13];
+        Float32 lon[11];
+    } AIRT;
+} SST_grid;
+The data:
+Grid {
+  Array:
+    Byte SST[lat = 3][lon = 3];
+  Maps:
+    Float32 lat[3];
+    Float32 lon[3];
+} SST = {  Array: {{156, 157, 158},{167, 168, 169},{178, 179, 180}}  Maps: {64, 51, 38}, {96, 128, 160} };
+Grid {
+  Array:
+    Byte AIRT[lat = 3][lon = 3];
+  Maps:
+    Float32 lat[3];
+    Float32 lon[3];
+} AIRT = {  Array: {{156, 157, 158},{167, 168, 169},{178, 179, 180}}  Maps: {64, 51, 38}, {96, 128, 160} };
diff --git a/tests/expr-testsuite/data.zz0.base b/tests/expr-testsuite/data.zz0.base
new file mode 100644
index 0000000..f492da3
--- /dev/null
+++ b/tests/expr-testsuite/data.zz0.base
@@ -0,0 +1 @@
+Wrong number of arguments to geoarray(). See geoarray() for more information.
diff --git a/tests/expr-testsuite/data.zz1.base b/tests/expr-testsuite/data.zz1.base
new file mode 100644
index 0000000..8dfe2b4
--- /dev/null
+++ b/tests/expr-testsuite/data.zz1.base
@@ -0,0 +1,6 @@
+The complete DDS:
+Dataset {
+    Byte SST[lat = 13][lon = 11];
+} SST_Array;
+The data:
+Byte SST[lat = 13][lon = 11] = {{0, 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}};
diff --git a/tests/expr-testsuite/data.zz2.base b/tests/expr-testsuite/data.zz2.base
new file mode 100644
index 0000000..b108db4
--- /dev/null
+++ b/tests/expr-testsuite/data.zz2.base
@@ -0,0 +1,6 @@
+The complete DDS:
+Dataset {
+    Byte SST[lat = 13][lon = 11];
+} SST_Array;
+The data:
+Byte SST[lat = 7][lon = 5] = {{36, 37, 38, 39, 40},{47, 48, 49, 50, 51},{58, 59, 60, 61, 62},{69, 70, 71, 72, 73},{80, 81, 82, 83, 84},{91, 92, 93, 94, 95},{102, 103, 104, 105, 106}};
diff --git a/tests/expr-testsuite/test.1 b/tests/expr-testsuite/test.1
new file mode 100644
index 0000000..9bf5f7a
--- /dev/null
+++ b/tests/expr-testsuite/test.1
@@ -0,0 +1,11 @@
+#
+# -*- C++ -*-
+#
+
+# Test projections: simple projections and shorthand names.
+
+dataset {
+    Int32 i;
+    Int32 j;
+} test1;
+
diff --git a/tests/expr-testsuite/test.1.base b/tests/expr-testsuite/test.1.base
new file mode 100644
index 0000000..895e938
--- /dev/null
+++ b/tests/expr-testsuite/test.1.base
@@ -0,0 +1,7 @@
+The complete DDS:
+Dataset {
+    Int32 i;
+    Int32 j;
+} test1;
+The data:
+Int32 i = 123456789;
diff --git a/tests/expr-testsuite/test.1a.base b/tests/expr-testsuite/test.1a.base
new file mode 100644
index 0000000..9f57cae
--- /dev/null
+++ b/tests/expr-testsuite/test.1a.base
@@ -0,0 +1,8 @@
+The complete DDS:
+Dataset {
+    Int32 i;
+    Int32 j;
+} test1;
+The data:
+Int32 i = 123456789;
+Int32 j = 123456789;
\ No newline at end of file
diff --git a/tests/expr-testsuite/test.1b.base b/tests/expr-testsuite/test.1b.base
new file mode 100644
index 0000000..9f57cae
--- /dev/null
+++ b/tests/expr-testsuite/test.1b.base
@@ -0,0 +1,8 @@
+The complete DDS:
+Dataset {
+    Int32 i;
+    Int32 j;
+} test1;
+The data:
+Int32 i = 123456789;
+Int32 j = 123456789;
\ No newline at end of file
diff --git a/tests/expr-testsuite/test.1c.base b/tests/expr-testsuite/test.1c.base
new file mode 100644
index 0000000..b6831cd
--- /dev/null
+++ b/tests/expr-testsuite/test.1c.base
@@ -0,0 +1,6 @@
+The complete DDS:
+Dataset {
+    Int32 i;
+    Int32 j;
+} test1;
+The data:
diff --git a/tests/expr-testsuite/test.1d.base b/tests/expr-testsuite/test.1d.base
new file mode 100644
index 0000000..f605bfe
--- /dev/null
+++ b/tests/expr-testsuite/test.1d.base
@@ -0,0 +1,7 @@
+The complete DDS:
+Dataset {
+    Int32 i;
+    Int32 j;
+} test1;
+The data:
+Int32 i = 123456789;
\ No newline at end of file
diff --git a/tests/expr-testsuite/test.2 b/tests/expr-testsuite/test.2
new file mode 100644
index 0000000..aad1846
--- /dev/null
+++ b/tests/expr-testsuite/test.2
@@ -0,0 +1,21 @@
+#
+# -*- C++ -*-
+#
+
+# Test projections: simple projections and shorthand names.
+
+dataset {
+    Structure {
+	   Int32 j;
+	   Int32 k;
+    } s1;
+    Structure {
+	   Int32 l;
+	   Int32 m;
+    } s2[10];
+    Structure {
+	   Int32 n;
+	   Int32 o;
+    } s3;
+} test2;
+
diff --git a/tests/expr-testsuite/test.2.base b/tests/expr-testsuite/test.2.base
new file mode 100644
index 0000000..7cb7a1b
--- /dev/null
+++ b/tests/expr-testsuite/test.2.base
@@ -0,0 +1,20 @@
+The complete DDS:
+Dataset {
+    Structure {
+        Int32 j;
+        Int32 k;
+    } s1;
+    Structure {
+        Int32 l;
+        Int32 m;
+    } s2[10];
+    Structure {
+        Int32 n;
+        Int32 o;
+    } s3;
+} test2;
+The data:
+Structure {
+    Int32 j;
+    Int32 k;
+} s1 = { 123456789, 123456789 };
diff --git a/tests/expr-testsuite/test.21.dds b/tests/expr-testsuite/test.21.dds
new file mode 100644
index 0000000..10fb509
--- /dev/null
+++ b/tests/expr-testsuite/test.21.dds
@@ -0,0 +1,6 @@
+
+# Zero-length array. jhrg 1/28/16
+
+Dataset {
+   Int32 a[0];
+} test.21;
diff --git a/tests/expr-testsuite/test.22.dds b/tests/expr-testsuite/test.22.dds
new file mode 100644
index 0000000..021dff3
--- /dev/null
+++ b/tests/expr-testsuite/test.22.dds
@@ -0,0 +1,8 @@
+
+# Data containing a zero-length array. jhrg 1/28/16
+
+Dataset {
+   Int32 a;
+   Int32 b[10];
+   Int32 c[0];
+} test.22;
diff --git a/tests/expr-testsuite/test.23.dds b/tests/expr-testsuite/test.23.dds
new file mode 100644
index 0000000..db51893
--- /dev/null
+++ b/tests/expr-testsuite/test.23.dds
@@ -0,0 +1,8 @@
+
+# Data containing two zero-length arrays. jhrg 1/28/16
+
+Dataset {
+   Int32 a;
+   Int32 b[10];
+   Int32 c[4][0];
+} test.22;
diff --git a/tests/expr-testsuite/test.24.dds b/tests/expr-testsuite/test.24.dds
new file mode 100644
index 0000000..364faee
--- /dev/null
+++ b/tests/expr-testsuite/test.24.dds
@@ -0,0 +1,8 @@
+
+# Data containing a zero-length array. jhrg 1/28/16
+
+Dataset {
+   Int32 a;
+   Int32 b[10];
+   Int32 c[0][4];
+} test.22;
diff --git a/tests/expr-testsuite/test.25.dds b/tests/expr-testsuite/test.25.dds
new file mode 100644
index 0000000..7a286d3
--- /dev/null
+++ b/tests/expr-testsuite/test.25.dds
@@ -0,0 +1,4 @@
+dataset {
+    Structure {
+    } exp;
+} data6;
diff --git a/tests/expr-testsuite/test.26.dds b/tests/expr-testsuite/test.26.dds
new file mode 100644
index 0000000..c1d4b32
--- /dev/null
+++ b/tests/expr-testsuite/test.26.dds
@@ -0,0 +1,8 @@
+dataset {
+    Structure {
+	Int32 j;
+	Int32 i;
+	Structure {
+	} data;
+    } exp;
+} data6;
diff --git a/tests/expr-testsuite/test.2a b/tests/expr-testsuite/test.2a
new file mode 100644
index 0000000..1f6732b
--- /dev/null
+++ b/tests/expr-testsuite/test.2a
@@ -0,0 +1,22 @@
+#
+# -*- C++ -*-
+#
+
+# Test projections: simple projections and shorthand names.
+
+dataset {
+    Structure {
+	   Int32 j;
+	   Int32 k;
+    } s1;
+    Structure {
+	   Int32 l[100];
+	   Int32 m[100];
+	   Int32 p;
+    } s2[10];
+    Structure {
+	   Int32 n;
+	   Int32 o;
+    } s3;
+} test2;
+
diff --git a/tests/expr-testsuite/test.2a.base b/tests/expr-testsuite/test.2a.base
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tests/expr-testsuite/test.2a.base
diff --git a/tests/expr-testsuite/test.2b.base b/tests/expr-testsuite/test.2b.base
new file mode 100644
index 0000000..f4c8569
--- /dev/null
+++ b/tests/expr-testsuite/test.2b.base
@@ -0,0 +1,24 @@
+The complete DDS:
+Dataset {
+    Structure {
+        Int32 j;
+        Int32 k;
+    } s1;
+    Structure {
+        Int32 l;
+        Int32 m;
+    } s2[10];
+    Structure {
+        Int32 n;
+        Int32 o;
+    } s3;
+} test2;
+The data:
+Structure {
+    Int32 l;
+    Int32 m;
+} s2[10] = {{ 123456789, 123456789 }, { 123456789, 123456789 }, { 123456789, 123456789 }, { 123456789, 123456789 }, { 123456789, 123456789 }, { 123456789, 123456789 }, { 123456789, 123456789 }, { 123456789, 123456789 }, { 123456789, 123456789 }, { 123456789, 123456789 }};
+Structure {
+    Int32 n;
+    Int32 o;
+} s3 = { 123456789, 123456789 };
\ No newline at end of file
diff --git a/tests/expr-testsuite/test.2c.base b/tests/expr-testsuite/test.2c.base
new file mode 100644
index 0000000..db85a4c
--- /dev/null
+++ b/tests/expr-testsuite/test.2c.base
@@ -0,0 +1,23 @@
+The complete DDS:
+Dataset {
+    Structure {
+        Int32 j;
+        Int32 k;
+    } s1;
+    Structure {
+        Int32 l;
+        Int32 m;
+    } s2[10];
+    Structure {
+        Int32 n;
+        Int32 o;
+    } s3;
+} test2;
+The data:
+Structure {
+    Int32 l;
+    Int32 m;
+} s2[2] = {{ 123456789, 123456789 }, { 123456789, 123456789 }};
+Structure {
+    Int32 o;
+} s3 = { 123456789 };
\ No newline at end of file
diff --git a/tests/expr-testsuite/test.2d.base b/tests/expr-testsuite/test.2d.base
new file mode 100644
index 0000000..596b318
--- /dev/null
+++ b/tests/expr-testsuite/test.2d.base
@@ -0,0 +1,19 @@
+The complete DDS:
+Dataset {
+    Structure {
+        Int32 j;
+        Int32 k;
+    } s1;
+    Structure {
+        Int32 l;
+        Int32 m;
+    } s2[10];
+    Structure {
+        Int32 n;
+        Int32 o;
+    } s3;
+} test2;
+The data:
+Structure {
+    Int32 m;
+} s2[2] = {{ 123456789 }, { 123456789 }};
diff --git a/tests/expr-testsuite/test.2e.base b/tests/expr-testsuite/test.2e.base
new file mode 100644
index 0000000..fc352ac
--- /dev/null
+++ b/tests/expr-testsuite/test.2e.base
@@ -0,0 +1,20 @@
+The complete DDS:
+Dataset {
+    Structure {
+        Int32 j;
+        Int32 k;
+    } s1;
+    Structure {
+        Int32 l;
+        Int32 m;
+    } s2[10];
+    Structure {
+        Int32 n;
+        Int32 o;
+    } s3;
+} test2;
+The data:
+Structure {
+    Int32 l;
+    Int32 m;
+} s2[2] = {{ 123456789, 123456789 }, { 123456789, 123456789 }};
\ No newline at end of file
diff --git a/tests/expr-testsuite/test.2f.base b/tests/expr-testsuite/test.2f.base
new file mode 100644
index 0000000..f599450
--- /dev/null
+++ b/tests/expr-testsuite/test.2f.base
@@ -0,0 +1,21 @@
+The complete DDS:
+Dataset {
+    Structure {
+        Int32 j;
+        Int32 k;
+    } s1;
+    Structure {
+        Int32 l[100];
+        Int32 m[100];
+        Int32 p;
+    } s2[10];
+    Structure {
+        Int32 n;
+        Int32 o;
+    } s3;
+} test2;
+The data:
+Structure {
+    Int32 l[6];
+    Int32 m[5];
+} s2[3] = {{ {123456789, 123456789, 123456789, 123456789, 123456789, 123456789}, {123456789, 123456789, 123456789, 123456789, 123456789} }, { {123456789, 123456789, 123456789, 123456789, 123456789, 123456789}, {123456789, 123456789, 123456789, 123456789, 123456789} }, { {123456789, 123456789, 123456789, 123456789, 123456789, 123456789}, {123456789, 123456789, 123456789, 123456789, 123456789} }};
diff --git a/tests/expr-testsuite/test.2g.base b/tests/expr-testsuite/test.2g.base
new file mode 100644
index 0000000..adaa3d1
--- /dev/null
+++ b/tests/expr-testsuite/test.2g.base
@@ -0,0 +1,22 @@
+The complete DDS:
+Dataset {
+    Structure {
+        Int32 j;
+        Int32 k;
+    } s1;
+    Structure {
+        Int32 l;
+        Int32 m;
+    } s2[10];
+    Structure {
+        Int32 n;
+        Int32 o;
+    } s3;
+} test2;
+The data:
+Structure {
+    Int32 j;
+} s1 = { 123456789 };
+Structure {
+    Int32 o;
+} s3 = { 123456789 };
\ No newline at end of file
diff --git a/tests/expr-testsuite/test.3 b/tests/expr-testsuite/test.3
new file mode 100644
index 0000000..5a68167
--- /dev/null
+++ b/tests/expr-testsuite/test.3
@@ -0,0 +1,11 @@
+#
+# -*- C++ -*-
+#
+
+# Test projections: simple projections and shorthand names.
+
+dataset {
+    Int32 i[20];
+    Int32 j;
+} test1;
+
diff --git a/tests/expr-testsuite/test.3.base b/tests/expr-testsuite/test.3.base
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tests/expr-testsuite/test.3.base
diff --git a/tests/expr-testsuite/test.4 b/tests/expr-testsuite/test.4
new file mode 100644
index 0000000..2cf533f
--- /dev/null
+++ b/tests/expr-testsuite/test.4
@@ -0,0 +1,12 @@
+#
+# -*- C++ -*-
+#
+
+# Test projections: simple projections and shorthand names.
+
+dataset {
+    Int32 i[20];
+    String s;
+    Int32 j;
+} test1;
+
diff --git a/tests/expr-testsuite/test.4.base b/tests/expr-testsuite/test.4.base
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tests/expr-testsuite/test.4.base
diff --git a/tests/expr-testsuite/test.4a.base b/tests/expr-testsuite/test.4a.base
new file mode 100644
index 0000000..06f15f5
--- /dev/null
+++ b/tests/expr-testsuite/test.4a.base
@@ -0,0 +1,7 @@
+The complete DDS:
+Dataset {
+    Int32 i[20];
+    String s;
+    Int32 j;
+} test1;
+The data:
diff --git a/tests/expr-testsuite/test.5 b/tests/expr-testsuite/test.5
new file mode 100644
index 0000000..7b062c8
--- /dev/null
+++ b/tests/expr-testsuite/test.5
@@ -0,0 +1,20 @@
+#
+# -*- C++ -*-
+#
+
+# Test projections: Grid projections
+
+dataset {
+    Int32 i[20];
+    Int32 j;
+    String s;
+    Grid {
+      Array:
+	    Float64 val[length = 5][width = 6][height = 7];
+      Maps:
+		Float64 length[5];
+		Float64 width[6];
+		Float64 height[7];
+    } g;
+} test1;
+
diff --git a/tests/expr-testsuite/test.5.base b/tests/expr-testsuite/test.5.base
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tests/expr-testsuite/test.5.base
diff --git a/tests/expr-testsuite/test.5.func3.base b/tests/expr-testsuite/test.5.func3.base
new file mode 100644
index 0000000..9a38843
--- /dev/null
+++ b/tests/expr-testsuite/test.5.func3.base
@@ -0,0 +1,16 @@
+The complete DDS:
+Dataset {
+    Int32 i[20];
+    Int32 j;
+    String s;
+    Grid {
+      Array:
+        Float64 val[length = 5][width = 6][height = 7];
+      Maps:
+        Float64 length[5];
+        Float64 width[6];
+        Float64 height[7];
+    } g;
+} test1;
+The data:
+Float64 i[1] = {246913578};
diff --git a/tests/expr-testsuite/test.5.func4.base b/tests/expr-testsuite/test.5.func4.base
new file mode 100644
index 0000000..9c421ae
--- /dev/null
+++ b/tests/expr-testsuite/test.5.func4.base
@@ -0,0 +1,16 @@
+The complete DDS:
+Dataset {
+    Int32 i[20];
+    Int32 j;
+    String s;
+    Grid {
+      Array:
+        Float64 val[length = 5][width = 6][height = 7];
+      Maps:
+        Float64 length[5];
+        Float64 width[6];
+        Float64 height[7];
+    } g;
+} test1;
+The data:
+Float64 j = 246913578;
diff --git a/tests/expr-testsuite/test.5a.base b/tests/expr-testsuite/test.5a.base
new file mode 100644
index 0000000..d0b0ca0
--- /dev/null
+++ b/tests/expr-testsuite/test.5a.base
@@ -0,0 +1,23 @@
+The complete DDS:
+Dataset {
+    Int32 i[20];
+    Int32 j;
+    String s;
+    Grid {
+      Array:
+        Float64 val[length = 5][width = 6][height = 7];
+      Maps:
+        Float64 length[5];
+        Float64 width[6];
+        Float64 height[7];
+    } g;
+} test1;
+The data:
+Grid {
+  Array:
+    Float64 val[length = 3][width = 3][height = 3];
+  Maps:
+    Float64 length[3];
+    Float64 width[3];
+    Float64 height[3];
+} g = {  Array: {{{99.999, 99.999, 99.999},{99.999, 99.999, 99.999},{99.999, 99.999, 99.999}},{{99.999, 99.999, 99.999},{99.999, 99.999, 99.999},{99.999, 99.999, 99.999}},{{99.999, 99.999, 99.999},{99.999, 99.999, 99.999},{99.999, 99.999, 99.999}}}  Maps: {99.999, 99.999, 99.999}, {99.999, 99.999, 99.999}, {99.999, 99.999, 99.999} };
\ No newline at end of file
diff --git a/tests/expr-testsuite/test.5b.base b/tests/expr-testsuite/test.5b.base
new file mode 100644
index 0000000..83ae5fc
--- /dev/null
+++ b/tests/expr-testsuite/test.5b.base
@@ -0,0 +1,18 @@
+The complete DDS:
+Dataset {
+    Int32 i[20];
+    Int32 j;
+    String s;
+    Grid {
+      Array:
+        Float64 val[length = 5][width = 6][height = 7];
+      Maps:
+        Float64 length[5];
+        Float64 width[6];
+        Float64 height[7];
+    } g;
+} test1;
+The data:
+Structure {
+    Float64 val[length = 2][width = 2][height = 2];
+} g = { {{{99.999, 99.999},{99.999, 99.999}},{{99.999, 99.999},{99.999, 99.999}}} };
diff --git a/tests/expr-testsuite/test.5c.base b/tests/expr-testsuite/test.5c.base
new file mode 100644
index 0000000..2818b30
--- /dev/null
+++ b/tests/expr-testsuite/test.5c.base
@@ -0,0 +1,18 @@
+The complete DDS:
+Dataset {
+    Int32 i[20];
+    Int32 j;
+    String s;
+    Grid {
+      Array:
+        Float64 val[length = 5][width = 6][height = 7];
+      Maps:
+        Float64 length[5];
+        Float64 width[6];
+        Float64 height[7];
+    } g;
+} test1;
+The data:
+Structure {
+    Float64 length[5];
+} g = { {99.999, 99.999, 99.999, 99.999, 99.999} };
diff --git a/tests/expr-testsuite/test.5d.base b/tests/expr-testsuite/test.5d.base
new file mode 100644
index 0000000..876b203
--- /dev/null
+++ b/tests/expr-testsuite/test.5d.base
@@ -0,0 +1,19 @@
+The complete DDS:
+Dataset {
+    Int32 i[20];
+    Int32 j;
+    String s;
+    Grid {
+      Array:
+        Float64 val[length = 5][width = 6][height = 7];
+      Maps:
+        Float64 length[5];
+        Float64 width[6];
+        Float64 height[7];
+    } g;
+} test1;
+The data:
+Structure {
+    Float64 length[5];
+    Float64 width[6];
+} g = { {99.999, 99.999, 99.999, 99.999, 99.999}, {99.999, 99.999, 99.999, 99.999, 99.999, 99.999} };
diff --git a/tests/expr-testsuite/test.5e.base b/tests/expr-testsuite/test.5e.base
new file mode 100644
index 0000000..cc37fe2
--- /dev/null
+++ b/tests/expr-testsuite/test.5e.base
@@ -0,0 +1 @@
+Error: The number of dimensions in the constraint for g must match the number in the grid.
\ No newline at end of file
diff --git a/tests/expr-testsuite/test.6 b/tests/expr-testsuite/test.6
new file mode 100644
index 0000000..6e05712
--- /dev/null
+++ b/tests/expr-testsuite/test.6
@@ -0,0 +1,11 @@
+#
+# -*- C++ -*-
+#
+
+# Test projections: multiple dimension arrays.
+
+dataset {
+    Int32 i[20][10];
+    String s;
+} test1;
+
diff --git a/tests/expr-testsuite/test.6.base b/tests/expr-testsuite/test.6.base
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tests/expr-testsuite/test.6.base
diff --git a/tests/expr-testsuite/test.6.func1.base b/tests/expr-testsuite/test.6.func1.base
new file mode 100644
index 0000000..383dd3e
--- /dev/null
+++ b/tests/expr-testsuite/test.6.func1.base
@@ -0,0 +1,7 @@
+The complete DDS:
+Dataset {
+    Int32 i[20][10];
+    String s;
+} test1;
+The data:
+Float64 i[20][10] = {{246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578},{246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578},{246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578},{246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578},{246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578},{246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578},{246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578},{246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578},{246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578},{246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578},{246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578},{246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578},{246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578},{246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578},{246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578},{246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578},{246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578},{246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578},{246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578},{246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578, 246913578}};
diff --git a/tests/expr-testsuite/test.6.func2.base b/tests/expr-testsuite/test.6.func2.base
new file mode 100644
index 0000000..8fbcb10
--- /dev/null
+++ b/tests/expr-testsuite/test.6.func2.base
@@ -0,0 +1,7 @@
+The complete DDS:
+Dataset {
+    Int32 i[20][10];
+    String s;
+} test1;
+The data:
+Float64 i[3][4] = {{246913578, 246913578, 246913578, 246913578},{246913578, 246913578, 246913578, 246913578},{246913578, 246913578, 246913578, 246913578}};
diff --git a/tests/expr-testsuite/test.6.func3.base b/tests/expr-testsuite/test.6.func3.base
new file mode 100644
index 0000000..8e2ed78
--- /dev/null
+++ b/tests/expr-testsuite/test.6.func3.base
@@ -0,0 +1,14 @@
+The complete DDS:
+Dataset {
+    Int32 i[20];
+    Int32 j;
+    String s;
+    Grid {
+      Array:
+        Float64 val[length = 5][width = 6][height = 7];
+      Maps:
+        Float64 length[5];
+        Float64 width[6];
+        Float64 height[7];
+    } g;
+} test1;
diff --git a/tests/expr-testsuite/test.61 b/tests/expr-testsuite/test.61
new file mode 100644
index 0000000..c0a3bfd
--- /dev/null
+++ b/tests/expr-testsuite/test.61
@@ -0,0 +1,10 @@
+#
+# -*- C++ -*-
+#
+
+# Test projections: multiple dimension arrays.
+
+dataset {
+    Int32 i[4][5];
+} test61;
+
diff --git a/tests/expr-testsuite/test.6a.base b/tests/expr-testsuite/test.6a.base
new file mode 100644
index 0000000..b97413a
--- /dev/null
+++ b/tests/expr-testsuite/test.6a.base
@@ -0,0 +1,7 @@
+The complete DDS:
+Dataset {
+    Int32 i[20][10];
+    String s;
+} test1;
+The data:
+Int32 i[2][3] = {{123456789, 123456789, 123456789},{123456789, 123456789, 123456789}};
\ No newline at end of file
diff --git a/tests/expr-testsuite/test.6b.base b/tests/expr-testsuite/test.6b.base
new file mode 100644
index 0000000..777da2e
--- /dev/null
+++ b/tests/expr-testsuite/test.6b.base
@@ -0,0 +1 @@
+Error: The number of dimensions in the constraint for i must match the number in the array.
\ No newline at end of file
diff --git a/tests/expr-testsuite/test.7 b/tests/expr-testsuite/test.7
new file mode 100644
index 0000000..31fa2f5
--- /dev/null
+++ b/tests/expr-testsuite/test.7
@@ -0,0 +1,8 @@
+#
+# Test new datatypes (int16, uint16, float32)
+
+Dataset {
+    int16 x;
+    uint16 y;
+    float32 f;
+} data5;
diff --git a/tests/expr-testsuite/test.7.base b/tests/expr-testsuite/test.7.base
new file mode 100644
index 0000000..0bb1bab
--- /dev/null
+++ b/tests/expr-testsuite/test.7.base
@@ -0,0 +1,10 @@
+The complete DDS:
+Dataset {
+    Int16 x;
+    UInt16 y;
+    Float32 f;
+} data5;
+The data:
+Int16 x = 32000;
+UInt16 y = 64000;
+Float32 f = 99.999;
\ No newline at end of file
diff --git a/tests/expr-testsuite/test.8 b/tests/expr-testsuite/test.8
new file mode 100644
index 0000000..e98fcd0
--- /dev/null
+++ b/tests/expr-testsuite/test.8
@@ -0,0 +1,11 @@
+#
+# Test variables with odd characters (#) and escapes in their names.
+
+Dataset {
+    int16 x#y;
+    uint16 y;
+    Int32 data#i[20][10];
+    Float64 data%20name[10];
+} data8;
+
+
diff --git a/tests/expr-testsuite/test.8.base b/tests/expr-testsuite/test.8.base
new file mode 100644
index 0000000..5ed7f2d
--- /dev/null
+++ b/tests/expr-testsuite/test.8.base
@@ -0,0 +1,9 @@
+The complete DDS:
+Dataset {
+    Int16 x%23y;
+    UInt16 y;
+    Int32 data%23i[20][10];
+    Float64 data%20name[10];
+} data8;
+The data:
+Int32 data%23i[5][3] = {{123456789, 123456789, 123456789},{123456789, 123456789, 123456789},{123456789, 123456789, 123456789},{123456789, 123456789, 123456789},{123456789, 123456789, 123456789}};
diff --git a/tests/expr-testsuite/test.8a.base b/tests/expr-testsuite/test.8a.base
new file mode 100644
index 0000000..26cc009
--- /dev/null
+++ b/tests/expr-testsuite/test.8a.base
@@ -0,0 +1,10 @@
+The complete DDS:
+Dataset {
+    Int16 x%23y;
+    UInt16 y;
+    Int32 data%23i[20][10];
+    Float64 data%20name[10];
+} data8;
+The data:
+Int16 x%23y = 32000;
+UInt16 y = 64000;
\ No newline at end of file
diff --git a/tests/expr-testsuite/test.8b.base b/tests/expr-testsuite/test.8b.base
new file mode 100644
index 0000000..e04d2b7
--- /dev/null
+++ b/tests/expr-testsuite/test.8b.base
@@ -0,0 +1,10 @@
+The complete DDS:
+Dataset {
+    Int16 x%23y;
+    UInt16 y;
+    Int32 data%23i[20][10];
+    Float64 data%20name[10];
+} data8;
+The data:
+UInt16 y = 64000;
+Float64 data%20name[10] = {99.999, 99.999, 99.999, 99.999, 99.999, 99.999, 99.999, 99.999, 99.999, 99.999};
diff --git a/tests/expr-testsuite/test.9 b/tests/expr-testsuite/test.9
new file mode 100644
index 0000000..5af2431
--- /dev/null
+++ b/tests/expr-testsuite/test.9
@@ -0,0 +1,15 @@
+
+# -*- C++ -*-
+#
+# Test problems reported with an HDF-EOS dataset. Should be able to access
+# Data%2dSet%2d2. 
+
+Dataset {
+   Grid {
+     ARRAY:
+       Float64 Data%2dSet%2d2[fakeDim0 = 72][fakeDim1 = 144];
+     MAPS:
+       Float64 fakeDim0[72];
+       Float64 fakeDim1[144];
+   } Data%2dSet%2d2;
+} ftp#data#lim93#msup#L93rain.90daygrd_msu.hdf;
diff --git a/tests/expr-testsuite/test.9.base b/tests/expr-testsuite/test.9.base
new file mode 100644
index 0000000..3905f75
--- /dev/null
+++ b/tests/expr-testsuite/test.9.base
@@ -0,0 +1,15 @@
+The complete DDS:
+Dataset {
+    Grid {
+      Array:
+        Float64 Data-Set-2[fakeDim0 = 72][fakeDim1 = 144];
+      Maps:
+        Float64 fakeDim0[72];
+        Float64 fakeDim1[144];
+    } Data-Set-2;
+} ftp%23data%23lim93%23msup%23L93rain.90daygrd_msu.hdf;
+The data:
+Structure {
+    Float64 fakeDim0[4];
+    Float64 fakeDim1[4];
+} Data-Set-2 = { {99.999, 99.999, 99.999, 99.999}, {99.999, 99.999, 99.999, 99.999} };
\ No newline at end of file
diff --git a/tests/expr-testsuite/test.a b/tests/expr-testsuite/test.a
new file mode 100644
index 0000000..30d67d4
--- /dev/null
+++ b/tests/expr-testsuite/test.a
@@ -0,0 +1,8 @@
+# Test Sequences
+
+dataset {
+	Sequence {
+		Int32 i;
+		Int32 j;
+	} s;
+} testa;
diff --git a/tests/expr-testsuite/test.a.base b/tests/expr-testsuite/test.a.base
new file mode 100644
index 0000000..60d1db6
--- /dev/null
+++ b/tests/expr-testsuite/test.a.base
@@ -0,0 +1,12 @@
+The complete DDS:
+Dataset {
+    Sequence {
+        Int32 i;
+        Int32 j;
+    } s;
+} testa;
+The data:
+Sequence {
+    Int32 i;
+    Int32 j;
+} s = { { 32, 32 }, { 1024, 1024 }, { 32768, 32768 }, { 1048576, 1048576 } };
\ No newline at end of file
diff --git a/tests/expr-testsuite/test.aa.base b/tests/expr-testsuite/test.aa.base
new file mode 100644
index 0000000..5058c4d
--- /dev/null
+++ b/tests/expr-testsuite/test.aa.base
@@ -0,0 +1,12 @@
+The complete DDS:
+Dataset {
+    Sequence {
+        Int32 i;
+        Int32 j;
+    } s;
+} testa;
+The data:
+Sequence {
+    Int32 i;
+    Int32 j;
+} s = { { 32, 32 }, { 1024, 1024 } };
\ No newline at end of file
diff --git a/tests/expr-testsuite/test.ab.base b/tests/expr-testsuite/test.ab.base
new file mode 100644
index 0000000..f8b7782
--- /dev/null
+++ b/tests/expr-testsuite/test.ab.base
@@ -0,0 +1,11 @@
+The complete DDS:
+Dataset {
+    Sequence {
+        Int32 i;
+        Int32 j;
+    } s;
+} testa;
+The data:
+Sequence {
+    Int32 j;
+} s = { { 32768 }, { 1048576 } };
\ No newline at end of file
diff --git a/tests/expr-testsuite/test.ac.base b/tests/expr-testsuite/test.ac.base
new file mode 100644
index 0000000..43bebad
--- /dev/null
+++ b/tests/expr-testsuite/test.ac.base
@@ -0,0 +1,12 @@
+The complete DDS:
+Dataset {
+    Sequence {
+        Int32 i;
+        Int32 j;
+    } s;
+} testa;
+The data:
+Sequence {
+    Int32 i;
+    Int32 j;
+} s = { {  } };
\ No newline at end of file
diff --git a/tests/expr-testsuite/test.b b/tests/expr-testsuite/test.b
new file mode 100644
index 0000000..a89c2bc
--- /dev/null
+++ b/tests/expr-testsuite/test.b
@@ -0,0 +1,12 @@
+# Test Sequences
+
+dataset {
+	Sequence {
+		Int32 i;
+		Int32 j;
+		Sequence {
+			Float32 f;
+			Float32 g;
+		} child;
+	} parent;
+} testb;
diff --git a/tests/expr-testsuite/test.b.base b/tests/expr-testsuite/test.b.base
new file mode 100644
index 0000000..71c80c9
--- /dev/null
+++ b/tests/expr-testsuite/test.b.base
@@ -0,0 +1,20 @@
+The complete DDS:
+Dataset {
+    Sequence {
+        Int32 i;
+        Int32 j;
+        Sequence {
+            Float32 f;
+            Float32 g;
+        } child;
+    } parent;
+} testb;
+The data:
+Sequence {
+    Int32 i;
+    Int32 j;
+    Sequence {
+        Float32 f;
+        Float32 g;
+    } child;
+} parent = { { 32, 32, { { -54.4, -54.4 }, { -1.77, -1.77 }, { 98.93, 98.93 }, { 92.68, 92.68 } } }, { 1024, 1024, { { 99.48, 99.48 }, { 81.67, 81.67 }, { 10.59, 10.59 }, { 91.29, 91.29 } } }, { 32768, 32768, { { 45.2, 45.2 }, { -99.97, -99.97 }, { -86, -86 }, { -56.61, -56.61 } } }, { 1048576, 1048576, { { -90.17, -90.17 }, { 99.38, 99.38 }, { 81.67, 81.67 }, { 10.59, 10.59 } } } };
diff --git a/tests/expr-testsuite/test.ba.base b/tests/expr-testsuite/test.ba.base
new file mode 100644
index 0000000..d06bec0
--- /dev/null
+++ b/tests/expr-testsuite/test.ba.base
@@ -0,0 +1,18 @@
+The complete DDS:
+Dataset {
+    Sequence {
+        Int32 i;
+        Int32 j;
+        Sequence {
+            Float32 f;
+            Float32 g;
+        } child;
+    } parent;
+} testb;
+The data:
+Sequence {
+    Int32 i;
+    Sequence {
+        Float32 f;
+    } child;
+} parent = { { 32, { { -54.4 }, { -1.77 }, { 98.93 }, { 92.68 } } }, { 1024, { { 99.48 }, { 81.67 }, { 10.59 }, { 91.29 } } }, { 32768, { { 45.2 }, { -99.97 }, { -86 }, { -56.61 } } }, { 1048576, { { -90.17 }, { 99.38 }, { 81.67 }, { 10.59 } } } };
diff --git a/tests/expr-testsuite/test.bb.base b/tests/expr-testsuite/test.bb.base
new file mode 100644
index 0000000..8c67dbe
--- /dev/null
+++ b/tests/expr-testsuite/test.bb.base
@@ -0,0 +1,18 @@
+The complete DDS:
+Dataset {
+    Sequence {
+        Int32 i;
+        Int32 j;
+        Sequence {
+            Float32 f;
+            Float32 g;
+        } child;
+    } parent;
+} testb;
+The data:
+Sequence {
+    Int32 i;
+    Sequence {
+        Float32 f;
+    } child;
+} parent = { { 32, { { -54.4 }, { -1.77 }, { 98.93 }, { 92.68 } } }, { 1024, { { 99.48 }, { 81.67 }, { 10.59 }, { 91.29 } } } };
diff --git a/tests/expr-testsuite/test.bc.base b/tests/expr-testsuite/test.bc.base
new file mode 100644
index 0000000..202e62c
--- /dev/null
+++ b/tests/expr-testsuite/test.bc.base
@@ -0,0 +1,18 @@
+The complete DDS:
+Dataset {
+    Sequence {
+        Int32 i;
+        Int32 j;
+        Sequence {
+            Float32 f;
+            Float32 g;
+        } child;
+    } parent;
+} testb;
+The data:
+Sequence {
+    Int32 i;
+    Sequence {
+        Float32 f;
+    } child;
+} parent = { { 32, { { -54.4 }, { -1.77 } } }, { 32768, { { -99.97 }, { -86 }, { -56.61 } } }, { 1048576, { { -90.17 } } } };
diff --git a/tests/expr-testsuite/test.bd.base b/tests/expr-testsuite/test.bd.base
new file mode 100644
index 0000000..256a073
--- /dev/null
+++ b/tests/expr-testsuite/test.bd.base
@@ -0,0 +1,16 @@
+The complete DDS:
+Dataset {
+    Sequence {
+        Int32 i;
+        Int32 j;
+        Sequence {
+            Float32 f;
+            Float32 g;
+        } child;
+    } parent;
+} testb;
+The data:
+Sequence {
+    Int32 i;
+    Int32 j;
+} parent = { { 32, 32 }, { 1024, 1024 } };
\ No newline at end of file
diff --git a/tests/expr-testsuite/test.be.base b/tests/expr-testsuite/test.be.base
new file mode 100644
index 0000000..c3684bc
--- /dev/null
+++ b/tests/expr-testsuite/test.be.base
@@ -0,0 +1,20 @@
+The complete DDS:
+Dataset {
+    Sequence {
+        Int32 i;
+        Int32 j;
+        Sequence {
+            Float32 f;
+            Float32 g;
+        } child;
+    } parent;
+} testb;
+The data:
+Sequence {
+    Int32 i;
+    Int32 j;
+    Sequence {
+        Float32 f;
+        Float32 g;
+    } child;
+} parent = { {  } };
\ No newline at end of file
diff --git a/tests/expr-testsuite/test.c0 b/tests/expr-testsuite/test.c0
new file mode 100644
index 0000000..4a6a5f8
--- /dev/null
+++ b/tests/expr-testsuite/test.c0
@@ -0,0 +1,12 @@
+# -*- C++ -*-
+#
+
+Dataset {
+   Grid {
+     ARRAY:
+       Byte SST[lat = 13][lon = 11];
+     MAPS:
+       Float32 lat[13];
+       Float32 lon[11];
+   } SST;
+} SST_grid;
diff --git a/tests/expr-testsuite/test.c1 b/tests/expr-testsuite/test.c1
new file mode 100644
index 0000000..f5f1527
--- /dev/null
+++ b/tests/expr-testsuite/test.c1
@@ -0,0 +1,12 @@
+# -*- C++ -*-
+#
+
+Dataset {
+   Grid {
+     ARRAY:
+       Byte SST[lat_reversed = 13][lon = 11];
+     MAPS:
+       Float32 lat_reversed[13];
+       Float32 lon[11];
+   } SST;
+} SST_grid;
diff --git a/tests/expr-testsuite/test.c2 b/tests/expr-testsuite/test.c2
new file mode 100644
index 0000000..b7ae46b
--- /dev/null
+++ b/tests/expr-testsuite/test.c2
@@ -0,0 +1,13 @@
+# -*- C++ -*-
+#
+
+Dataset {
+   Grid {
+     ARRAY:
+       Byte SST[time=3][lon = 11][lat = 13];
+     MAPS:
+       Int32 time[3];
+       Float32 lon[11];
+       Float32 lat[13];
+   } SST;
+} SST_grid;
diff --git a/tests/expr-testsuite/test.c3 b/tests/expr-testsuite/test.c3
new file mode 100644
index 0000000..f6b0950
--- /dev/null
+++ b/tests/expr-testsuite/test.c3
@@ -0,0 +1,9 @@
+Dataset {
+   Grid {
+     ARRAY:
+       Byte SST[lon = 11][lat = 13];
+     MAPS:
+       Float32 lon[11];
+       Float32 lat[13];
+   } SST;
+} SST_grid;
diff --git a/tests/expr-testsuite/test.c4 b/tests/expr-testsuite/test.c4
new file mode 100644
index 0000000..b7ae46b
--- /dev/null
+++ b/tests/expr-testsuite/test.c4
@@ -0,0 +1,13 @@
+# -*- C++ -*-
+#
+
+Dataset {
+   Grid {
+     ARRAY:
+       Byte SST[time=3][lon = 11][lat = 13];
+     MAPS:
+       Int32 time[3];
+       Float32 lon[11];
+       Float32 lat[13];
+   } SST;
+} SST_grid;
diff --git a/tests/expr-testsuite/test.c5 b/tests/expr-testsuite/test.c5
new file mode 100644
index 0000000..d7b7c92
--- /dev/null
+++ b/tests/expr-testsuite/test.c5
@@ -0,0 +1,17 @@
+Dataset {
+   Grid {
+     ARRAY:
+       Byte SST[lat = 13][lon = 11];
+     MAPS:
+       Float32 lat[13];
+       Float32 lon[11];
+   } SST;
+
+   Grid {
+     ARRAY:
+       Byte AIRT[lat = 13][lon = 11];
+     MAPS:
+       Float32 lat[13];
+       Float32 lon[11];
+   } AIRT;
+} SST_grid;
diff --git a/tests/expr-testsuite/test.cc0 b/tests/expr-testsuite/test.cc0
new file mode 100644
index 0000000..42bb166
--- /dev/null
+++ b/tests/expr-testsuite/test.cc0
@@ -0,0 +1,6 @@
+# -*- C++ -*-
+#
+
+Dataset {
+   Byte SST[lat = 13][lon = 11];
+} SST_Array;
diff --git a/tests/expr-testsuite/test.cc1 b/tests/expr-testsuite/test.cc1
new file mode 100644
index 0000000..6be9c88
--- /dev/null
+++ b/tests/expr-testsuite/test.cc1
@@ -0,0 +1,6 @@
+# -*- C++ -*-
+#
+
+Dataset {
+   Byte SST[lon = 11][lat = 13];
+} SST_Array;
diff --git a/tests/expr-testsuite/test.d b/tests/expr-testsuite/test.d
new file mode 100644
index 0000000..e9587f6
--- /dev/null
+++ b/tests/expr-testsuite/test.d
@@ -0,0 +1,16 @@
+# Test Sequences
+
+dataset {
+   Sequence {
+      Int32 i;
+      Int32 j;
+         Sequence {
+             Float32 f;
+             Float32 g;
+             Sequence {
+                Byte a;
+                Byte b;
+             } baby;
+         } child;
+   } parent;
+} testc;
diff --git a/tests/expr-testsuite/test.d.base b/tests/expr-testsuite/test.d.base
new file mode 100644
index 0000000..eddc364
--- /dev/null
+++ b/tests/expr-testsuite/test.d.base
@@ -0,0 +1,28 @@
+The complete DDS:
+Dataset {
+    Sequence {
+        Int32 i;
+        Int32 j;
+        Sequence {
+            Float32 f;
+            Float32 g;
+            Sequence {
+                Byte a;
+                Byte b;
+            } baby;
+        } child;
+    } parent;
+} testc;
+The data:
+Sequence {
+    Int32 i;
+    Int32 j;
+    Sequence {
+        Float32 f;
+        Float32 g;
+        Sequence {
+            Byte a;
+            Byte b;
+        } baby;
+    } child;
+} parent = { { 32, 32, { { -54.4, -54.4, { { 0, 0 }, { 1, 1 }, { 2, 2 }, { 3, 3 } } }, { -1.77, -1.77, { { 4, 4 }, { 5, 5 }, { 6, 6 }, { 7, 7 } } }, { 98.93, 98.93, { { 8, 8 }, { 9, 9 }, { 10, 10 }, { 11, 11 } } }, { 92.68, 92.68, { { 12, 12 }, { 13, 13 }, { 14, 14 }, { 15, 15 } } } } }, { 1024, 1024, { { 99.48, 99.48, { { 16, 16 }, { 17, 17 }, { 18, 18 }, { 19, 19 } } }, { 81.67, 81.67, { { 20, 20 }, { 21, 21 }, { 22, 22 }, { 23, 23 } } }, { 10.59, 10.59, { { 24, 24 }, { 25, 25 }, { 26, 26 }, { 27, 27 } } }, { 91.29, 91.29, { { 28, 28 }, { 29, 29 }, { 30, 30 }, { 31, 31 } } } } }, { 32768, 32768, { { 45.2, 45.2, { { 32, 32 }, { 33, 33 }, { 34, 34 }, { 35, 35 } } }, { -99.97, -99.97, { { 36, 36 }, { 37, 37 }, { 38, 38 }, { 39, 39 } } }, { -86, -86, { { 40, 40 }, { 41, 41 }, { 42, 42 }, { 43, 43 } } }, { -56.61, -56.61, { { 44, 44 }, { 45, 45 }, { 46, 46 }, { 47, 47 } } } } }, { 1048576, 1048576, { { -90.17, -90.17, { { 48, 48 }, { 49, 49 }, { 50, 50 }, { 51, 51 } } }, { 99.38, 99.38, { { 52, 52 }, { 53, 53 }, { 54, 54 }, { 55, 55 } } }, { 81.67, 81.67, { { 56, 56 }, { 57, 57 }, { 58, 58 }, { 59, 59 } } }, { 10.59, 10.59, { { 60, 60 }, { 61, 61 }, { 62, 62 }, { 63, 63 } } } } } };
diff --git a/tests/expr-testsuite/test.da.base b/tests/expr-testsuite/test.da.base
new file mode 100644
index 0000000..26a3a45
--- /dev/null
+++ b/tests/expr-testsuite/test.da.base
@@ -0,0 +1,25 @@
+The complete DDS:
+Dataset {
+    Sequence {
+        Int32 i;
+        Int32 j;
+        Sequence {
+            Float32 f;
+            Float32 g;
+            Sequence {
+                Byte a;
+                Byte b;
+            } baby;
+        } child;
+    } parent;
+} testc;
+The data:
+Sequence {
+    Int32 i;
+    Sequence {
+        Float32 f;
+        Sequence {
+            Byte a;
+        } baby;
+    } child;
+} parent = { { 32, { { -54.4, { { 0 }, { 1 }, { 2 }, { 3 } } }, { -1.77, { { 4 }, { 5 }, { 6 }, { 7 } } }, { 98.93, { { 8 }, { 9 }, { 10 }, { 11 } } }, { 92.68, { { 12 }, { 13 }, { 14 }, { 15 } } } } }, { 1024, { { 99.48, { { 16 }, { 17 }, { 18 }, { 19 } } }, { 81.67, { { 20 }, { 21 }, { 22 }, { 23 } } }, { 10.59, { { 24 }, { 25 }, { 26 }, { 27 } } }, { 91.29, { { 28 }, { 29 }, { 30 }, { 31 } } } } }, { 32768, { { 45.2, { { 32 }, { 33 }, { 34 }, { 35 } } }, { -99.97, { { 36 }, { 37 }, { 38 }, { 39 } } }, { -86, { { 40 }, { 41 }, { 42 }, { 43 } } }, { -56.61, { { 44 }, { 45 }, { 46 }, { 47 } } } } }, { 1048576, { { -90.17, { { 48 }, { 49 }, { 50 }, { 51 } } }, { 99.38, { { 52 }, { 53 }, { 54 }, { 55 } } }, { 81.67, { { 56 }, { 57 }, { 58 }, { 59 } } }, { 10.59, { { 60 }, { 61 }, { 62 }, { 63 } } } } } };
diff --git a/tests/expr-testsuite/test.db.base b/tests/expr-testsuite/test.db.base
new file mode 100644
index 0000000..5fcc850
--- /dev/null
+++ b/tests/expr-testsuite/test.db.base
@@ -0,0 +1,25 @@
+The complete DDS:
+Dataset {
+    Sequence {
+        Int32 i;
+        Int32 j;
+        Sequence {
+            Float32 f;
+            Float32 g;
+            Sequence {
+                Byte a;
+                Byte b;
+            } baby;
+        } child;
+    } parent;
+} testc;
+The data:
+Sequence {
+    Int32 i;
+    Sequence {
+        Float32 f;
+        Sequence {
+            Byte a;
+        } baby;
+    } child;
+} parent = { { 32, { { -54.4, { { 0 }, { 1 }, { 2 }, { 3 } } }, { -1.77, { { 4 }, { 5 }, { 6 }, { 7 } } }, { 98.93, { { 8 }, { 9 }, { 10 }, { 11 } } }, { 92.68, { { 12 }, { 13 }, { 14 }, { 15 } } } } }, { 1024, { { 99.48, { { 16 }, { 17 }, { 18 }, { 19 } } }, { 81.67, { { 20 }, { 21 }, { 22 }, { 23 } } }, { 10.59, { { 24 }, { 25 }, { 26 }, { 27 } } }, { 91.29, { { 28 }, { 29 }, { 30 }, { 31 } } } } } };
diff --git a/tests/expr-testsuite/test.dc.base b/tests/expr-testsuite/test.dc.base
new file mode 100644
index 0000000..5ddb331
--- /dev/null
+++ b/tests/expr-testsuite/test.dc.base
@@ -0,0 +1,25 @@
+The complete DDS:
+Dataset {
+    Sequence {
+        Int32 i;
+        Int32 j;
+        Sequence {
+            Float32 f;
+            Float32 g;
+            Sequence {
+                Byte a;
+                Byte b;
+            } baby;
+        } child;
+    } parent;
+} testc;
+The data:
+Sequence {
+    Int32 i;
+    Sequence {
+        Float32 f;
+        Sequence {
+            Byte a;
+        } baby;
+    } child;
+} parent = { { 32, { { -54.4, { { 0 }, { 1 }, { 2 }, { 3 } } }, { -1.77, { { 4 }, { 5 }, { 6 }, { 7 } } } } }, { 32768, { { -99.97, { { 36 }, { 37 }, { 38 }, { 39 } } }, { -86, { { 40 }, { 41 }, { 42 }, { 43 } } }, { -56.61, { { 44 }, { 45 }, { 46 }, { 47 } } } } }, { 1048576, { { -90.17, { { 48 }, { 49 }, { 50 }, { 51 } } } } } };
diff --git a/tests/expr-testsuite/test.dd.base b/tests/expr-testsuite/test.dd.base
new file mode 100644
index 0000000..6a71e8e
--- /dev/null
+++ b/tests/expr-testsuite/test.dd.base
@@ -0,0 +1,25 @@
+The complete DDS:
+Dataset {
+    Sequence {
+        Int32 i;
+        Int32 j;
+        Sequence {
+            Float32 f;
+            Float32 g;
+            Sequence {
+                Byte a;
+                Byte b;
+            } baby;
+        } child;
+    } parent;
+} testc;
+The data:
+Sequence {
+    Int32 i;
+    Sequence {
+        Float32 f;
+        Sequence {
+            Byte a;
+        } baby;
+    } child;
+} parent = { { 32, { { -54.4, { { 0 }, { 1 }, { 2 }, { 3 } } }, { -1.77, { { 4 }, { 5 }, { 6 }, { 7 } } }, { 98.93, { { 8 }, { 9 } } } } } };
diff --git a/tests/expr-testsuite/test.de.base b/tests/expr-testsuite/test.de.base
new file mode 100644
index 0000000..4a1dca0
--- /dev/null
+++ b/tests/expr-testsuite/test.de.base
@@ -0,0 +1,22 @@
+The complete DDS:
+Dataset {
+    Sequence {
+        Int32 i;
+        Int32 j;
+        Sequence {
+            Float32 f;
+            Float32 g;
+            Sequence {
+                Byte a;
+                Byte b;
+            } baby;
+        } child;
+    } parent;
+} testc;
+The data:
+Sequence {
+    Int32 i;
+    Sequence {
+        Float32 f;
+    } child;
+} parent = { { 32, { { -54.4 }, { -1.77 }, { 98.93 }, { 92.68 } } }, { 1024, { { 99.48 }, { 81.67 }, { 10.59 }, { 91.29 } } } };
diff --git a/tests/expr-testsuite/test.df.base b/tests/expr-testsuite/test.df.base
new file mode 100644
index 0000000..1c0a32a
--- /dev/null
+++ b/tests/expr-testsuite/test.df.base
@@ -0,0 +1,19 @@
+The complete DDS:
+Dataset {
+    Sequence {
+        Int32 i;
+        Int32 j;
+        Sequence {
+            Float32 f;
+            Float32 g;
+            Sequence {
+                Byte a;
+                Byte b;
+            } baby;
+        } child;
+    } parent;
+} testc;
+The data:
+Sequence {
+    Int32 i;
+} parent = { { 32 }, { 1024 } };
\ No newline at end of file
diff --git a/tests/expr-testsuite/test.dg.base b/tests/expr-testsuite/test.dg.base
new file mode 100644
index 0000000..1f83951
--- /dev/null
+++ b/tests/expr-testsuite/test.dg.base
@@ -0,0 +1,25 @@
+The complete DDS:
+Dataset {
+    Sequence {
+        Int32 i;
+        Int32 j;
+        Sequence {
+            Float32 f;
+            Float32 g;
+            Sequence {
+                Byte a;
+                Byte b;
+            } baby;
+        } child;
+    } parent;
+} testc;
+The data:
+Sequence {
+    Int32 i;
+    Sequence {
+        Float32 f;
+        Sequence {
+            Byte a;
+        } baby;
+    } child;
+} parent = { {  } };
\ No newline at end of file
diff --git a/tests/expr-testsuite/test.e b/tests/expr-testsuite/test.e
new file mode 100644
index 0000000..5c139d6
--- /dev/null
+++ b/tests/expr-testsuite/test.e
@@ -0,0 +1,8 @@
+# Test Sequences
+
+dataset {
+   Sequence {
+      Int32 i;
+      String s;
+   } names;
+} test.e;
diff --git a/tests/expr-testsuite/test.ea.base b/tests/expr-testsuite/test.ea.base
new file mode 100644
index 0000000..5410eb6
--- /dev/null
+++ b/tests/expr-testsuite/test.ea.base
@@ -0,0 +1,11 @@
+The complete DDS:
+Dataset {
+    Sequence {
+        Int32 i;
+        String s;
+    } names;
+} test.e;
+The data:
+Sequence {
+    String s;
+} names = { { "Silly test string: 3" } };
diff --git a/tests/expr-testsuite/test.eb.base b/tests/expr-testsuite/test.eb.base
new file mode 100644
index 0000000..4b0bc59
--- /dev/null
+++ b/tests/expr-testsuite/test.eb.base
@@ -0,0 +1,11 @@
+The complete DDS:
+Dataset {
+    Sequence {
+        Int32 i;
+        String s;
+    } names;
+} test.e;
+The data:
+Sequence {
+    String s;
+} names = { {  } };
diff --git a/tests/expr-testsuite/test.f b/tests/expr-testsuite/test.f
new file mode 100644
index 0000000..990596d
--- /dev/null
+++ b/tests/expr-testsuite/test.f
@@ -0,0 +1,9 @@
+# Test Sequences
+
+Dataset {
+   Sequence {
+      Structure {
+          UInt32 i;
+      } inner;
+   } names;
+} test.e;
diff --git a/tests/expr-testsuite/test.fa.base b/tests/expr-testsuite/test.fa.base
new file mode 100644
index 0000000..2037ddc
--- /dev/null
+++ b/tests/expr-testsuite/test.fa.base
@@ -0,0 +1,14 @@
+The complete DDS:
+Dataset {
+    Sequence {
+        Structure {
+            UInt32 i;
+        } inner;
+    } names;
+} test.e;
+The data:
+Sequence {
+    Structure {
+        UInt32 i;
+    } inner;
+} names = { { { 32 } }, { { 1024 } }, { { 32768 } }, { { 1048576 } } };
diff --git a/tests/expr-testsuite/test.fb.base b/tests/expr-testsuite/test.fb.base
new file mode 100644
index 0000000..17e3136
--- /dev/null
+++ b/tests/expr-testsuite/test.fb.base
@@ -0,0 +1,14 @@
+The complete DDS:
+Dataset {
+    Sequence {
+        Structure {
+            UInt32 i;
+        } inner;
+    } names;
+} test.e;
+The data:
+Sequence {
+    Structure {
+        UInt32 i;
+    } inner;
+} names = { { { 32 } }, { { 1024 } } };
diff --git a/tests/getdap-testsuite/fnoc1.nc.dds b/tests/getdap-testsuite/fnoc1.nc.dds
new file mode 100644
index 0000000..8c41e1b
--- /dev/null
+++ b/tests/getdap-testsuite/fnoc1.nc.dds
@@ -0,0 +1,7 @@
+Dataset {
+    Int16 u[time_a = 16][lat = 17][lon = 21];
+    Int16 v[time_a = 16][lat = 17][lon = 21];
+    Float32 lat[lat = 17];
+    Float32 lon[lon = 21];
+    Float32 time[time = 16];
+} fnoc1.nc;
diff --git a/tests/getdapTest b/tests/getdapTest
new file mode 100755
index 0000000..ab0723a
--- /dev/null
+++ b/tests/getdapTest
@@ -0,0 +1,2034 @@
+#! /bin/sh
+# Generated from getdapTest.at by GNU Autoconf 2.69.
+#
+# Copyright (C) 2009-2012 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. ##
+## -------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+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_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+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
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  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
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
+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
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  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 || :
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && 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
+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@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
+
+# 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
+
+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
+
+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_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+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
+
+
+  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 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
+}
+
+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
+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 -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'
+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"'
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+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'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+
+
+
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+# How were we run?
+at_cli_args="$@"
+
+
+# Not all shells have the 'times' builtin; the subshell is needed to make
+# sure we discard the 'times: not found' message from the shell.
+at_times_p=false
+(times) >/dev/null 2>&1 && at_times_p=:
+
+# CLI Arguments to pass to the debugging scripts.
+at_debug_args=
+# -e sets to true
+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.
+at_debug_p=false
+# Display help message?
+at_help_p=false
+# Display the version message?
+at_version_p=false
+# List test groups?
+at_list_p=false
+# --clean
+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
+
+# The directory we run the suite in.  Default to . if no -C option.
+at_dir=`pwd`
+# An absolute reference to this testsuite script.
+case $as_myself in
+  [\\/]* | ?:[\\/]* ) at_myself=$as_myself ;;
+  * ) at_myself=$at_dir/$as_myself ;;
+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=''
+# 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.
+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 ()
+{
+  for at_grp
+  do
+    eval at_value=\$$at_grp
+    if test $at_value -lt 1 || test $at_value -gt 1; 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 $(( )).
+	  # 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.
+	  eval $at_grp='`expr $at_value + 0`' ;;
+    esac
+  done
+}
+
+at_prev=
+for at_option
+do
+  # If the previous option needs an argument, assign it.
+  if test -n "$at_prev"; then
+    at_option=$at_prev=$at_option
+    at_prev=
+  fi
+
+  case $at_option in
+  *=?*) at_optarg=`expr "X$at_option" : '[^=]*=\(.*\)'` ;;
+  *)    at_optarg= ;;
+  esac
+
+  # Accept the important Cygnus configure options, so we can diagnose typos.
+
+  case $at_option in
+    --help | -h )
+	at_help_p=:
+	;;
+
+    --list | -l )
+	at_list_p=:
+	;;
+
+    --version | -V )
+	at_version_p=:
+	;;
+
+    --clean | -c )
+	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=:
+	;;
+
+    --errexit | -e )
+	at_debug_p=:
+	at_errexit_p=:
+	;;
+
+    --verbose | -v )
+	at_verbose=; at_quiet=:
+	;;
+
+    --trace | -x )
+	at_traceon='set -x'
+	at_trace_echo=echo
+	at_check_filter_trace=at_fn_filter_trace
+	;;
+
+    [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"
+	;;
+
+    # 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"
+	;;
+
+    -[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"
+	;;
+
+    [0-9]-[0-9] | [0-9]-[0-9][0-9] | [0-9]-[0-9][0-9][0-9] | \
+    [0-9]-[0-9][0-9][0-9][0-9] | [0-9][0-9]-[0-9][0-9] | \
+    [0-9][0-9]-[0-9][0-9][0-9] | [0-9][0-9]-[0-9][0-9][0-9][0-9] | \
+    [0-9][0-9][0-9]-[0-9][0-9][0-9] | \
+    [0-9][0-9][0-9]-[0-9][0-9][0-9][0-9] | \
+    [0-9][0-9][0-9][0-9]-[0-9][0-9][0-9][0-9] )
+	at_range_start=`expr $at_option : '\(.*\)-'`
+	at_range_end=`expr $at_option : '.*-\(.*\)'`
+	if test $at_range_start -gt $at_range_end; then
+	  at_tmp=$at_range_end
+	  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"
+	;;
+
+    # Directory selection.
+    --directory | -C )
+	at_prev=--directory
+	;;
+    --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.
+    --keywords | -k )
+	at_prev=--keywords
+	;;
+    --keywords=* )
+	at_groups_selected=$at_help_all
+	at_save_IFS=$IFS
+	IFS=,
+	set X $at_optarg
+	shift
+	IFS=$at_save_IFS
+	for at_keyword
+	do
+	  at_invert=
+	  case $at_keyword in
+	  '!'*)
+	    at_invert="-v"
+	    at_keyword=`expr "X$at_keyword" : 'X!\(.*\)'`
+	    ;;
+	  esac
+	  # It is on purpose that we match the test group titles too.
+	  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=:
+	;;
+
+    *=*)
+	at_envvar=`expr "x$at_option" : 'x\([^=]*\)='`
+	# 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'" ;;
+	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'"
+	;;
+
+     *) $as_echo "$as_me: invalid option: $at_option" >&2
+	$as_echo "Try \`$0 --help' for more information." >&2
+	exit 1
+	;;
+  esac
+done
+
+# Verify our last option didn't require an argument
+if test -n "$at_prev"; then :
+  as_fn_error $? "\`$at_prev' requires an argument"
+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
+  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=
+fi
+
+# Help message.
+if $at_help_p; then
+  cat <<_ATEOF || at_write_fail=1
+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
+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:
+
+  $ $0 AUTOTEST_PATH=bin
+
+is equivalent to the following, assuming the source directory is /src/foo-1.0:
+
+  PATH=/tmp/foo-1.0/bin:/src/foo-1.0/bin:\$PATH $0
+_ATEOF
+cat <<_ATEOF || at_write_fail=1
+
+Operation modes:
+  -h, --help     print the help message, then exit
+  -V, --version  print version number, then exit
+  -c, --clean    remove all the files this test suite might create and exit
+  -l, --list     describes all the tests, or the selected TESTS
+_ATEOF
+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
+  -d, --debug    inhibit clean up and top-level logging
+                 default for debugging scripts
+  -x, --trace    enable tests shell tracing
+_ATEOF
+cat <<_ATEOF || at_write_fail=1
+
+Report bugs to <opendap-tech@opendap.org>.
+_ATEOF
+  exit $at_write_fail
+fi
+
+# List of tests.
+if $at_list_p; then
+  cat <<_ATEOF || at_write_fail=1
+libdap 3.19.1 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
+	   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
+	     }
+	   }
+	 }' || at_write_fail=1
+  exit $at_write_fail
+fi
+if $at_version_p; then
+  $as_echo "$as_me (libdap 3.19.1)" &&
+  cat <<\_ATEOF || at_write_fail=1
+
+Copyright (C) 2012 Free Software Foundation, Inc.
+This test suite is free software; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+_ATEOF
+  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=: ;; #(
+  * ) at_print_banners=false ;;
+esac
+# Text for banner N, set to a single space once printed.
+
+# Take any -C into account.
+if $at_change_dir ; then
+  test x != "x$at_dir" && cd "$at_dir" \
+    || as_fn_error $? "unable to change directory"
+  at_dir=`pwd`
+fi
+
+# Load the config files for any default variable assignments.
+for at_file in atconfig atlocal
+do
+  test -r $at_file || continue
+  . ./$at_file || as_fn_error $? "invalid content: $at_file"
+done
+
+# Autoconf <=2.59b set at_top_builddir instead of at_top_build_prefix:
+: "${at_top_build_prefix=$at_top_builddir}"
+
+# Perform any assignments requested during argument parsing.
+eval "$at_debug_args"
+
+# atconfig delivers names relative to the directory the test suite is
+# in, but the groups themselves are run in testsuite-dir/group-dir.
+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
+    case $at_val in
+      [\\/$]* | ?:[\\/]* ) at_prefix= ;;
+      *) at_prefix=../../ ;;
+    esac
+    eval "$at_dir_var=\$at_prefix\$at_val"
+  done
+fi
+
+## -------------------- ##
+## Directory structure. ##
+## -------------------- ##
+
+# This is the set of directories and files used by this script
+# (non-literals are capitalized):
+#
+# TESTSUITE         - the testsuite
+# TESTSUITE.log     - summarizes the complete testsuite run
+# TESTSUITE.dir/    - created during a run, remains after -d or failed test
+# + at-groups/      - during a run: status of all groups in run
+# | + NNN/          - during a run: meta-data about test group NNN
+# | | + check-line  - location (source file and line) of current AT_CHECK
+# | | + status      - exit status of current AT_CHECK
+# | | + stdout      - stdout of current AT_CHECK
+# | | + stder1      - stderr, including trace
+# | | + stderr      - stderr, with trace filtered out
+# | | + test-source - portion of testsuite that defines group
+# | | + times       - timestamps for computing duration
+# | | + pass        - created if group passed
+# | | + xpass       - created if group xpassed
+# | | + fail        - created if group failed
+# | | + xfail       - created if group xfailed
+# | | + skip        - created if group skipped
+# + at-stop         - during a run: end the run if this file exists
+# + at-source-lines - during a run: cache of TESTSUITE line numbers for extraction
+# + 0..NNN/         - created for each group NNN, remains after -d or failed test
+# | + TESTSUITE.log - summarizes the group results
+# | + ...           - files created during the group
+
+# 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).
+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" &&
+    find "$at_suite_dir" -type d ! -perm -700 -exec chmod u+rwx \{\} \;
+  rm -f -r "$at_suite_dir" "$at_suite_log"
+  exit $?
+fi
+
+# Don't take risks: use only absolute directories in PATH.
+#
+# For stand-alone test suites (ie. atconfig was not found),
+# AUTOTEST_PATH is relative to `.'.
+#
+# For embedded test suites, AUTOTEST_PATH is relative to the top level
+# of the package.  Then expand it into build/src parts, since users
+# may create executables in both places.
+AUTOTEST_PATH=`$as_echo "$AUTOTEST_PATH" | sed "s|:|$PATH_SEPARATOR|g"`
+at_path=
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+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
+case $as_dir in
+  [\\/]* | ?:[\\/]* )
+    as_fn_append at_path "$as_dir"
+    ;;
+  * )
+    if test -z "$at_top_build_prefix"; then
+      # Stand-alone test suite.
+      as_fn_append 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"
+    fi
+    ;;
+esac
+  done
+IFS=$as_save_IFS
+
+
+# Now build and simplify PATH.
+#
+# There might be directories that don't exist, but don't redirect
+# builtins' (eg., cd) stderr directly: Ultrix's sh hates that.
+at_new_path=
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $at_path
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    test -d "$as_dir" || continue
+case $as_dir in
+  [\\/]* | ?:[\\/]* ) ;;
+  * ) as_dir=`(cd "$as_dir" && pwd) 2>/dev/null` ;;
+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" ;;
+esac
+  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
+else
+  : >"$at_suite_log"
+fi
+exec 5>>"$at_suite_log"
+
+# Banners and logs.
+$as_echo "## --------------------------------- ##
+## libdap 3.19.1 test suite: getdap. ##
+## --------------------------------- ##"
+{
+  $as_echo "## --------------------------------- ##
+## libdap 3.19.1 test suite: getdap. ##
+## --------------------------------- ##"
+  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"
+    echo
+  fi
+
+  {
+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`
+
+/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
+
+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
+
+}
+  echo
+
+  # Contents of the config files.
+  for at_file in atconfig atlocal
+  do
+    test -r $at_file || continue
+    $as_echo "$as_me: $at_file:"
+    sed 's/^/| /' $at_file
+    echo
+  done
+} >&5
+
+
+## ------------------------- ##
+## Autotest 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_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"
+}
+
+# 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 ()
+{
+  case $1 in
+    *$as_nl*)
+      at_fn_check_prepare_notrace 'an embedded newline' "$2" ;;
+    *)
+      at_fn_check_prepare_trace "$2" ;;
+  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 ()
+{
+  mv "$at_stderr" "$at_stder1"
+  grep '^ *+' "$at_stder1" >&2
+  grep -v '^ *+' "$at_stder1" >"$at_stderr"
+}
+
+# at_fn_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 ()
+{
+  for file
+    do $as_echo "$file:"; sed 's/^/> /' "$file"; done
+  echo 1 > "$at_status_file"
+  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 ()
+{
+  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 ()
+{
+  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 ()
+{
+  test -s "$1" || return 0
+  $at_diff "$at_devnull" "$1"
+}
+
+# at_fn_test NUMBER
+# -----------------
+# Parse out test NUMBER from the tail of this file.
+at_fn_test ()
+{
+  eval at_sed=\$at_sed$1
+  sed "$at_sed" "$at_myself" > "$at_test_source"
+}
+
+# at_fn_create_debugging_script
+# -----------------------------
+# Create the debugging script $at_group_dir/run which will reproduce the
+# current test group.
+at_fn_create_debugging_script ()
+{
+  {
+    echo "#! /bin/sh" &&
+    echo 'test "${ZSH_VERSION+set}" = set && alias -g '\''${1+"$@"}'\''='\''"$@"'\''' &&
+    $as_echo "cd '$at_dir'" &&
+    $as_echo "exec \${CONFIG_SHELL-$SHELL} \"$at_myself\" -v -d $at_debug_args $at_group \${1+\"\$@\"}" &&
+    echo 'exit 1'
+  } >"$at_group_dir/run" &&
+  chmod +x "$at_group_dir/run"
+}
+
+## -------------------------------- ##
+## End of autotest shell functions. ##
+## -------------------------------- ##
+{
+  $as_echo "## ---------------- ##
+## Tested programs. ##
+## ---------------- ##"
+  echo
+} >&5
+
+# Report what programs are being tested.
+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
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    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
+    {
+      $as_echo "$at_srcdir/getdapTest.at:3: $at_program_ --version"
+      "$at_program_" --version </dev/null
+      echo
+    } >&5 2>&1
+  else
+    as_fn_error $? "cannot find $at_program" "$LINENO" 5
+  fi
+done
+
+{
+  $as_echo "## ------------------ ##
+## Running the tests. ##
+## ------------------ ##"
+} >&5
+
+at_start_date=`date`
+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
+
+# Can we diff with `/dev/null'?  DU 5.0 refuses.
+if diff /dev/null /dev/null >/dev/null 2>&1; then
+  at_devnull=/dev/null
+else
+  at_devnull=$at_suite_dir/devnull
+  >"$at_devnull"
+fi
+
+# Use `diff -u' when possible.
+if at_diff=`diff -u "$at_devnull" "$at_devnull" 2>&1` && test -z "$at_diff"
+then
+  at_diff='diff -u'
+else
+  at_diff=diff
+fi
+
+# Get the last needed group.
+for at_group in : $at_groups; do :; done
+
+# Extract the start and end lines of each test group at the tail
+# of this file
+awk '
+BEGIN { FS="" }
+/^#AT_START_/ {
+  start = NR
+}
+/^#AT_STOP_/ {
+  test = substr ($ 0, 10)
+  print "at_sed" test "=\"1," start "d;" (NR-1) "q\""
+  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
+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
+
+# 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 ()
+{
+  # The directory for additional per-group helper files.
+  at_job_dir=$at_helper_dir/$at_group
+  # The file containing the location of the last AT_CHECK.
+  at_check_line_file=$at_job_dir/check-line
+  # The file containing the exit status of the last command.
+  at_status_file=$at_job_dir/status
+  # The files containing the output of the tested commands.
+  at_stdout=$at_job_dir/stdout
+  at_stder1=$at_job_dir/stder1
+  at_stderr=$at_job_dir/stderr
+  # The file containing the code for a test group.
+  at_test_source=$at_job_dir/test-source
+  # The file containing dates.
+  at_times_file=$at_job_dir/times
+
+  # Be sure to come back to the top test directory.
+  cd "$at_suite_dir"
+
+  # Clearly separate the test groups when verbose.
+  $at_first || $at_verbose echo
+
+  at_group_normalized=$at_group
+
+  eval 'while :; do
+    case $at_group_normalized in #(
+    '"$at_format"'*) break;;
+    esac
+    at_group_normalized=0$at_group_normalized
+  done'
+
+
+  # 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;}
+  # Be tolerant if the above `rm' was not able to remove the directory.
+  as_dir="$at_group_dir"; as_fn_mkdir_p
+
+  echo 0 > "$at_status_file"
+
+  # In verbose mode, append to the log file *and* show on
+  # the standard output; in quiet mode only write to the log.
+  if test -z "$at_verbose"; then
+    at_tee_pipe='tee -a "$at_group_log"'
+  else
+    at_tee_pipe='cat >> "$at_group_log"'
+  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 ()
+{
+  # Be sure to come back to the suite directory, in particular
+  # since below we might `rm' the group directory we are in currently.
+  cd "$at_suite_dir"
+
+  if test ! -f "$at_check_line_file"; then
+    sed "s/^ */$as_me: WARNING: /" <<_ATEOF
+      A failure happened in a test group before any test could be
+      run. This means that test suite is improperly designed.  Please
+      report this failure to <opendap-tech@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"
+  case $at_xfail:$at_status in
+    yes:0)
+	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
+	;;
+  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
+  at_log_msg="$at_group. $at_desc ($at_setup_line): $at_msg"
+  case $at_status in
+    0|77)
+      # $at_times_file is only available if the group succeeded.
+      # We're not including the group log, so the success message
+      # is written in the global log separately.  But we also
+      # write to the group log in case they're using -d.
+      if test -f "$at_times_file"; then
+	at_log_msg="$at_log_msg     ("`sed 1d "$at_times_file"`')'
+	rm -f "$at_times_file"
+      fi
+      $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
+      else
+	if test -d "$at_group_dir"; then
+	  find "$at_group_dir" -type d ! -perm -700 -exec chmod u+rwx \{\} \;
+	  rm -fr "$at_group_dir"
+	fi
+	rm -f "$at_test_source"
+      fi
+      ;;
+    *)
+      # Upon failure, include the log into the testsuite's global
+      # log.  The failure message is written in the group log.  It
+      # is later included in the global log.
+      $as_echo "$at_log_msg" >> "$at_group_log"
+
+      # 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
+      if $at_errexit; then
+	echo stop > "$at_stop_file"
+      fi
+      ;;
+  esac
+}
+
+
+## ------------ ##
+## 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
+$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
+  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
+
+# Wrap up the test suite with summary statistics.
+cd "$at_helper_dir"
+
+# Use ?..???? when the list must remain sorted, the faster * otherwise.
+at_pass_list=`for f in */pass; do echo $f; done | sed '/\*/d; s,/pass,,'`
+at_skip_list=`for f in */skip; do echo $f; done | sed '/\*/d; s,/skip,,'`
+at_xfail_list=`for f in */xfail; do echo $f; done | sed '/\*/d; s,/xfail,,'`
+at_xpass_list=`for f in ?/xpass ??/xpass ???/xpass ????/xpass; do
+		 echo $f; done | sed '/?/d; s,/xpass,,'`
+at_fail_list=`for f in ?/fail ??/fail ???/fail ????/fail; do
+		echo $f; done | sed '/?/d; s,/fail,,'`
+
+set X $at_pass_list $at_xpass_list $at_xfail_list $at_fail_list $at_skip_list
+shift; at_group_count=$#
+set X $at_xpass_list; shift; at_xpass_count=$#; at_xpass_list=$*
+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
+
+# Back to the top directory.
+cd "$at_dir"
+rm -rf "$at_helper_dir"
+
+# Compute the duration of the suite.
+at_stop_date=`date`
+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_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 "## ------------- ##
+## Test results. ##
+## ------------- ##"
+echo
+{
+  echo
+  $as_echo "## ------------- ##
+## Test results. ##
+## ------------- ##"
+  echo
+} >&5
+
+if test $at_run_count = 1; then
+  at_result="1 test"
+  at_were=was
+else
+  at_result="$at_run_count tests"
+  at_were=were
+fi
+if $at_errexit_p && test $at_unexpected_count != 0; then
+  if test $at_xpass_count = 1; then
+    at_result="$at_result $at_were run, one passed"
+  else
+    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 ;;
+
+    # Some unexpected failures
+    0:*:0) at_result="$at_result $at_were run,
+$at_fail_count failed unexpectedly." ;;
+
+    # Some failures, both expected and unexpected
+    0:*:1) at_result="$at_result $at_were run,
+$at_total_fail_count failed ($at_xfail_count expected failure)." ;;
+    0:*:*) at_result="$at_result $at_were run,
+$at_total_fail_count failed ($at_xfail_count expected failures)." ;;
+
+    # No unexpected failures, but some xpasses
+    *:0:*) at_result="$at_result $at_were run,
+$at_xpass_count passed unexpectedly." ;;
+
+    # No expected failures, but failures and xpasses
+    *:1:0) at_result="$at_result $at_were run,
+$at_unexpected_count did not behave as expected ($at_fail_count unexpected failure)." ;;
+    *:*:0) at_result="$at_result $at_were run,
+$at_unexpected_count did not behave as expected ($at_fail_count unexpected failures)." ;;
+
+    # All of them.
+    *:*:1) at_result="$at_result $at_were run,
+$at_xpass_count passed unexpectedly,
+$at_total_fail_count failed ($at_xfail_count expected failure)." ;;
+    *:*:*) at_result="$at_result $at_were run,
+$at_xpass_count passed unexpectedly,
+$at_total_fail_count failed ($at_xfail_count expected failures)." ;;
+  esac
+
+  if test $at_skip_count = 0 && test $at_run_count -gt 1; then
+    at_result="All $at_result"
+  fi
+fi
+
+# Now put skips in the mix.
+case $at_skip_count in
+  0) ;;
+  1) at_result="$at_result
+1 test was skipped." ;;
+  *) at_result="$at_result
+$at_skip_count tests were skipped." ;;
+esac
+
+if test $at_unexpected_count = 0; then
+  echo "$at_color$at_result$at_std"
+  echo "$at_result" >&5
+else
+  echo "${at_color}ERROR: $at_result$at_std" >&2
+  echo "ERROR: $at_result" >&5
+  {
+    echo
+    $as_echo "## ------------------------ ##
+## Summary of the failures. ##
+## ------------------------ ##"
+
+    # Summary of failed and skipped tests.
+    if test $at_fail_count != 0; then
+      echo "Failed tests:"
+      $SHELL "$at_myself" $at_fail_list --list
+      echo
+    fi
+    if test $at_skip_count != 0; then
+      echo "Skipped tests:"
+      $SHELL "$at_myself" $at_skip_list --list
+      echo
+    fi
+    if test $at_xpass_count != 0; then
+      echo "Unexpected passes:"
+      $SHELL "$at_myself" $at_xpass_list --list
+      echo
+    fi
+    if test $at_fail_count != 0; then
+      $as_echo "## ---------------------- ##
+## Detailed failed tests. ##
+## ---------------------- ##"
+      echo
+      for at_group in $at_fail_list
+      do
+	at_group_normalized=$at_group
+
+  eval 'while :; do
+    case $at_group_normalized in #(
+    '"$at_format"'*) break;;
+    esac
+    at_group_normalized=0$at_group_normalized
+  done'
+
+	cat "$at_suite_dir/$at_group_normalized/$as_me.log"
+	echo
+      done
+      echo
+    fi
+    if test -n "$at_top_srcdir"; then
+      sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## ${at_top_build_prefix}config.log ##
+_ASBOX
+      sed 's/^/| /' ${at_top_build_prefix}config.log
+      echo
+    fi
+  } >&5
+
+  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## $as_me.log was created. ##
+_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:
+
+   To: <opendap-tech@opendap.org>
+   Subject: [libdap 3.19.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'.
+"
+  exit 1
+fi
+
+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)" ""
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+(
+  $as_echo "1. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    { set +x
+$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 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_traceon; }
+
+    { set +x
+$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 stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/getdapTest.at:34"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+      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_1
diff --git a/tests/getdapTest.at b/tests/getdapTest.at
new file mode 100644
index 0000000..3f27cfe
--- /dev/null
+++ b/tests/getdapTest.at
@@ -0,0 +1,34 @@
+# Process with autom4te to create an -*- Autotest -*- test suite.
+
+AT_INIT([getdap])
+
+# AT_ARG_OPTION_ARG([generate],
+#    [--generate=arg   Build the baseline file for test 'arg'],
+#    dnl Break the arg into the last thing (file | url) and all of the previous things (switches)
+#    [url=
+#    
+#    echo "getdap $at_arg_generate > $at_arg_generate_parse.baseline 2>&1";
+#     ./dmr-test -x -p $at_arg_generate_parse > $at_arg_generate_parse.baseline 2>&1;
+#     echo "Built baseline for $at_arg_generate_parse";
+#     exit],[])
+
+# Usage: GETDAP_TEST(<flags>, <path|url>, <baseline file>, <xfail?>)
+
+m4_define([GETDAP_TEST], [
+    AT_SETUP([getdap $1 $2 $3 ($4)])
+    AT_KEYWORDS([getdap])
+
+    # Added || true because expr-test returns 0 (failure) for some of
+    # these tests which is correct for the test - we expect some of
+    # the input to trigger an error response from the parser, et
+    # cetera. That's also why we capture both stdout and stderr -
+    # successful runs are sent to stdout while the errors are sent to
+    # stderr.
+
+    AT_CHECK([$abs_builddir/../getdap $1 $2 || true], [], [stdout], [stderr])
+    AT_CHECK([diff -b -B $abs_srcdir/$3 stdout || diff -b -B $abs_srcdir/$3 stderr], [], [ignore],[],[])
+    AT_XFAIL_IF([test "$4" = "xfail"])
+    AT_CLEANUP
+])
+
+GETDAP_TEST([-d], [http://test.opendap.org/dap/data/nc/fnoc1.nc], [getdap-testsuite/fnoc1.nc.dds], [pass])
diff --git a/tests/package.m4 b/tests/package.m4
new file mode 100644
index 0000000..6a38e80
--- /dev/null
+++ b/tests/package.m4
@@ -0,0 +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.19.1])
+m4_define([AT_PACKAGE_STRING],    [libdap 3.19.1])
+m4_define([AT_PACKAGE_BUGREPORT], [opendap-tech@opendap.org])
diff --git a/unit-tests/ArrayTest.cc b/unit-tests/ArrayTest.cc
new file mode 100644
index 0000000..4cc43df
--- /dev/null
+++ b/unit-tests/ArrayTest.cc
@@ -0,0 +1,287 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2005 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+// 
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+// 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#include <cppunit/TextTestRunner.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+#include <cppunit/extensions/HelperMacros.h>
+
+#include <cstring>
+#include <string>
+
+#include "GNURegex.h"
+
+#include "Array.h"
+#include "Int16.h"
+#include "Str.h"
+#include "Structure.h"
+
+#include "debug.h"
+#include "GetOpt.h"
+
+using namespace CppUnit;
+using namespace std;
+
+static bool debug = false;
+
+namespace libdap {
+
+class ArrayTest: public TestFixture {
+private:
+    Array *d_cardinal, *d_string, *d_structure;
+    Int16 *d_int16;
+    Str *d_str;
+    Structure *d_struct;
+
+    string svalues[4];
+public:
+    ArrayTest()
+    {
+        svalues[0] = "0 String";
+        svalues[1] = "1 String";
+        svalues[2] = "2 String";
+        svalues[3] = "3 String";
+    }
+
+    ~ArrayTest()
+    {
+    }
+
+    void setUp()
+    {
+        d_int16 = new Int16("Int16");
+        DBG(cerr << "d_int16: " << d_int16 << endl);
+        d_cardinal = new Array("Array_of_Int16", d_int16);
+        d_cardinal->append_dim(4, "dimension");
+        dods_int16 buffer[4] = { 0, 1, 2, 3 };
+        d_cardinal->val2buf(buffer);
+#ifdef DODS_DEBUG
+        for (int i = 0; i < 4; ++i)
+        cerr << "buffer[" << i << "]: " << buffer[i] << endl;
+#endif
+
+        d_str = new Str("Str");
+        d_string = new Array("Array_of_String", d_str);
+        d_string->append_dim(4, "dimension");
+        string sbuffer[4] = { "0 String", "1 String", "2 String", "3 String" };
+        d_string->val2buf(sbuffer);
+#ifdef DODS_DEBUG
+        for (int i = 0; i < 4; ++i)
+        cerr << "sbuffer[" << i << "]: " << sbuffer[i] << endl;
+#endif
+
+        d_struct = new Structure("Structure");
+        d_struct->add_var(d_int16);
+        d_structure = new Array("Array_of_Strctures", d_struct);
+        d_structure->append_dim(4, "dimension");
+        ostringstream oss;
+        for (int i = 0; i < 4; ++i) {
+            oss.str("");
+            oss << "field" << i;
+            Int16 *n = new Int16(oss.str());
+            DBG(cerr << "n " << i << ": " << n << endl);
+            oss.str("");
+            oss << "element" << i;
+            Structure *s = new Structure(oss.str());
+            s->add_var(n);
+            d_structure->set_vec(i, s);
+            delete n;
+            n = 0;
+            delete s;
+            s = 0;
+        }
+
+        delete d_int16;
+        d_int16 = 0;
+        delete d_str;
+        d_str = 0;
+        delete d_struct;
+        d_struct = 0;
+    }
+
+    void tearDown()
+    {
+        delete d_cardinal;
+        delete d_string;
+        delete d_structure;
+    }
+
+    bool re_match(Regex &r, const char *s)
+    {
+        int match_position = r.match(s, strlen(s));
+        DBG(cerr << "match position: " << match_position
+            << " string length: " << (int)strlen(s) << endl);
+        return match_position == (int) strlen(s);
+    }
+
+    CPPUNIT_TEST_SUITE (ArrayTest);
+
+    CPPUNIT_TEST (duplicate_cardinal_test);
+    CPPUNIT_TEST (duplicate_string_test);
+    CPPUNIT_TEST (duplicate_structure_test);
+
+    CPPUNIT_TEST_SUITE_END();
+
+    void duplicate_structure_test()
+    {
+        Array::Dim_iter i = d_structure->dim_begin();
+        CPPUNIT_ASSERT(d_structure->dimension_size(i) == 4);
+#ifdef DODS_DEBUG
+        for (int i = 0; i < 4; ++i) {
+            Structure *s = dynamic_cast<Structure*>(d_structure->var(i));
+            DBG(cerr << "s: " << s << endl);
+            if (s)
+            s->print_decl(cerr);
+        }
+#endif
+
+        Array *a = new Array(*d_structure);
+        // a = *d_structure; I test operator= in duplicate_cardinal_test().
+        i = a->dim_begin();
+        CPPUNIT_ASSERT(a->dimension_size(i) == 4);
+        for (int i = 0; i < 4; ++i) {
+            // The point of this test is to ensure that the const ctor
+            // performs a deep copy; first test to make sure the pointers
+            // to BaseType instnaces are different in the two objects.
+            Structure *src = dynamic_cast<Structure*>(d_structure->var(i));
+            Structure *dest = dynamic_cast<Structure*>(a->var(i));
+            CPPUNIT_ASSERT(src != dest);
+
+            // However, for the deep copy to be correct, the two arrays must
+            // have equivalent elements. We know there's only one field...
+            CPPUNIT_ASSERT(src->type() == dods_structure_c && dest->type() == dods_structure_c);
+            Constructor::Vars_iter s = src->var_begin();
+            Constructor::Vars_iter d = dest->var_begin();
+            CPPUNIT_ASSERT((*s)->type() == dods_int16_c && (*d)->type() == dods_int16_c);
+            CPPUNIT_ASSERT((*s)->name() == (*d)->name());
+        }
+        delete a;
+        a = 0;
+    }
+
+    void duplicate_string_test()
+    {
+        Array::Dim_iter i = d_string->dim_begin();
+        CPPUNIT_ASSERT(d_string->dimension_size(i) == 4);
+        string *s = new string[4];
+        d_string->buf2val((void**) &s);
+        for (int i = 0; i < 4; ++i) {
+            CPPUNIT_ASSERT(s[i] == svalues[i]);
+            DBG(cerr << "s[" << i << "]: " << s[i] << endl);
+        }
+
+        Array a = *d_string;
+        i = a.dim_begin();
+        CPPUNIT_ASSERT(a.dimension_size(i) == 4);
+
+        string *s2 = new string[4];
+        d_string->buf2val((void**) &s2);
+        for (int i = 0; i < 4; ++i) {
+            CPPUNIT_ASSERT(s2[i] == svalues[i]);
+            DBG(cerr << "s2[" << i << "]: " << s2[i] << endl);
+        }
+
+        delete[] s;
+        s = 0;
+        delete[] s2;
+        s2 = 0;
+    }
+
+    void duplicate_cardinal_test()
+    {
+        Array::Dim_iter i = d_cardinal->dim_begin();
+        CPPUNIT_ASSERT(d_cardinal->dimension_size(i) == 4);
+        dods_int16 *b = new dods_int16[4];
+        d_cardinal->buf2val((void**) &b);
+        for (int i = 0; i < 4; ++i) {
+            CPPUNIT_ASSERT(b[i] == i);
+            DBG(cerr << "b[" << i << "]: " << b[i] << endl);
+        }
+        delete[] b;
+        b = 0;
+
+        Array a = *d_cardinal;
+        i = a.dim_begin();
+        CPPUNIT_ASSERT(a.dimension_size(i) == 4);
+
+        dods_int16 *b2 = new dods_int16[4];
+        d_cardinal->buf2val((void**) &b2);
+        for (int i = 0; i < 4; ++i) {
+            CPPUNIT_ASSERT(b2[i] == i);
+            DBG(cerr << "b2[" << i << "]: " << b2[i] << endl);
+        }
+        delete[] b2;
+        b2 = 0;
+    }
+
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION (ArrayTest);
+
+} // namespace libdap
+
+int main(int argc, char *argv[])
+{
+    GetOpt getopt(argc, argv, "dh");
+    int option_char;
+
+    while ((option_char = getopt()) != -1)
+        switch (option_char) {
+        case 'd':
+            debug = 1;  // debug is a static global
+            break;
+
+        case 'h': {     // help - show test names
+            cerr << "Usage: ArrayTest has the following tests:" << endl;
+            const std::vector<Test*> &tests = libdap::ArrayTest::suite()->getTests();
+            unsigned int prefix_len = libdap::ArrayTest::suite()->getName().append("::").length();
+            for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+                cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+            }
+            break;
+        }
+
+        default:
+            break;
+        }
+
+    CppUnit::TextTestRunner runner;
+    runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
+    bool wasSuccessful = true;
+    string test = "";
+    int i = getopt.optind;
+    if (i == argc) {
+        // run them all
+        wasSuccessful = runner.run("");
+    }
+    else {
+        for (; i < argc; ++i) {
+            if (debug) cerr << "Running " << argv[i] << endl;
+            test = libdap::ArrayTest::suite()->getName().append("::").append(argv[i]);
+            wasSuccessful = wasSuccessful && runner.run(test);
+        }
+    }
+
+    return wasSuccessful ? 0 : 1;
+}
diff --git a/unit-tests/AttrTableTest.cc b/unit-tests/AttrTableTest.cc
new file mode 100644
index 0000000..9d9b7ab
--- /dev/null
+++ b/unit-tests/AttrTableTest.cc
@@ -0,0 +1,480 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#include "config.h"
+
+#include <cppunit/TextTestRunner.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+#include <cppunit/extensions/HelperMacros.h>
+
+#include <cstring>
+#include <string>
+#include <sstream>
+
+#if HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include "GNURegex.h"
+#include "AttrTable.h"
+#include "debug.h"
+
+#include "testFile.h"
+#include "GetOpt.h"
+
+static bool debug = false;
+
+#undef DBG
+#define DBG(x) do { if (debug) (x); } while(false);
+
+using namespace CppUnit;
+using namespace std;
+using namespace libdap;
+
+static string build_fqn(AttrTable *at, string fqn)
+{
+    // The strange behavior at the top level is because the top level of an
+    // AttrTable (i.e. the DAS) is anonymous. Another bad design... jhrg 2/8/06
+    if (!at || !at->get_parent() || at->get_name().empty())
+        return fqn;
+    else
+        return build_fqn(at->get_parent(), at->get_name() + string(".") + fqn);
+}
+
+namespace libdap {
+
+class AttrTableTest: public TestFixture {
+private:
+    AttrTable *at1;
+    AttrTable *cont_a, *cont_b, *cont_c, *cont_ba, *cont_ca, *cont_caa;
+
+public:
+    AttrTableTest()
+    {
+    }
+    ~AttrTableTest()
+    {
+    }
+
+    void setUp()
+    {
+        at1 = new AttrTable;
+        cont_a = at1->append_container("a");
+        cont_a->append_attr("size", "Int32", "7");
+        cont_a->append_attr("type", "String", "cars");
+
+        cont_b = at1->append_container("b");
+        cont_b->append_attr("number", "Int32", "1");
+        cont_b->append_attr("type", "String", "houses");
+        cont_ba = cont_b->append_container("ba");
+        cont_ba->append_attr("name", "String", "fred");
+
+        cont_c = at1->append_container("c");
+        cont_ca = cont_c->append_container("ca");
+        cont_caa = cont_ca->append_container("caa");
+        cont_caa->append_attr("color", "String", "red");
+
+        // This AttrTable looks like:
+        //      Attributes {
+        //          a {
+        //              Int32 size 7;
+        //              String type cars;
+        //          }
+        //          b {
+        //              Int32 number 1;
+        //              String type houses;
+        //              ba {
+        //                  String name fred;
+        //              }
+        //          }
+        //          c {
+        //              ca {
+        //                  caa {
+        //                      String color red;
+        //                  }
+        //              }
+        //          }
+        //      }
+    }
+
+    void tearDown()
+    {
+        delete at1;
+        at1 = 0;
+    }
+
+    bool re_match(Regex &r, const char *s)
+    {
+        return r.match(s, strlen(s)) == (int) strlen(s);
+    }
+
+    CPPUNIT_TEST_SUITE (AttrTableTest);
+#if 1
+
+    CPPUNIT_TEST (clone_test);
+    CPPUNIT_TEST (find_container_test);
+    CPPUNIT_TEST (get_parent_test);
+    CPPUNIT_TEST (recurrsive_find_test);
+    CPPUNIT_TEST (find_test);
+    CPPUNIT_TEST (copy_ctor);
+    CPPUNIT_TEST (assignment);
+    CPPUNIT_TEST (erase_test);
+    CPPUNIT_TEST (names_with_spaces_test);
+#endif
+    CPPUNIT_TEST (containers_with_spaces_test);
+#if 1
+    CPPUNIT_TEST (get_attr_iter_test);
+    CPPUNIT_TEST (del_attr_table_test);
+    CPPUNIT_TEST (append_attr_vector_test);
+#endif
+#if 0
+    CPPUNIT_TEST(print_xml_test);
+#endif
+
+    CPPUNIT_TEST_SUITE_END();
+
+    // Tests for methods
+
+    // This is to test for leaks in the clone() method.
+    void clone_test()
+    {
+        AttrTable *att = new AttrTable;
+        att->append_container(new AttrTable(*cont_a), "copy_of_a");
+        delete att;
+    }
+
+    void recurrsive_find_test()
+    {
+        AttrTable::Attr_iter location;
+        AttrTable *a = at1->recurrsive_find("color", &location);
+        CPPUNIT_ASSERT(a && a == cont_caa && a->get_name(location) == "color");
+
+        a = cont_caa->recurrsive_find("color", &location);
+        CPPUNIT_ASSERT(a && a == cont_caa && a->get_name(location) == "color");
+
+        a = at1->recurrsive_find("ba", &location);
+        CPPUNIT_ASSERT(a && a == cont_b && a->get_name(location) == "ba");
+    }
+
+    void get_parent_test()
+    {
+        CPPUNIT_ASSERT(cont_caa->get_parent() == cont_ca);
+        CPPUNIT_ASSERT(cont_ca->get_parent() == cont_c);
+        CPPUNIT_ASSERT(cont_c->get_parent() == at1);
+        CPPUNIT_ASSERT(at1->get_parent() == 0);
+        CPPUNIT_ASSERT(build_fqn(cont_caa, "color") == "c.ca.caa.color");
+    }
+
+    void find_container_test()
+    {
+        AttrTable *tmp = at1->find_container("a");
+        CPPUNIT_ASSERT(tmp != 0);
+        CPPUNIT_ASSERT(tmp == cont_a);
+
+        CPPUNIT_ASSERT(at1->find_container("b.ba") == cont_ba);
+        CPPUNIT_ASSERT(at1->find_container("a.b") == 0);
+        CPPUNIT_ASSERT(at1->find_container("c.ca.caa") == cont_caa);
+        CPPUNIT_ASSERT(at1->find_container("caa") == 0);
+
+        CPPUNIT_ASSERT(at1->find_container("a.size") == 0);
+        CPPUNIT_ASSERT(at1->find_container("b.ba.name") == 0);
+    }
+
+    void find_test()
+    {
+        AttrTable *tmp;
+        AttrTable::Attr_iter iter;
+        at1->find("a", &tmp, &iter);
+        CPPUNIT_ASSERT(tmp && iter != tmp->attr_end() && tmp->is_container(iter) && tmp->get_name(iter) == "a");
+        at1->find("a.size", &tmp, &iter);
+        CPPUNIT_ASSERT(
+            tmp && iter != tmp->attr_end() && !tmp->is_container(iter) && tmp->get_name(iter) == "size"
+                && tmp->get_attr(iter) == "7");
+        at1->find("b.type", &tmp, &iter);
+        CPPUNIT_ASSERT(
+            tmp && iter != tmp->attr_end() && !tmp->is_container(iter) && tmp->get_name(iter) == "type"
+                && tmp->get_attr(iter) == "houses");
+        at1->find("c.ca.caa.color", &tmp, &iter);
+        CPPUNIT_ASSERT(
+            tmp && iter != tmp->attr_end() && !tmp->is_container(iter) && tmp->get_name(iter) == "color"
+                && tmp->get_attr(iter) == "red");
+        at1->find("d.size", &tmp, &iter);
+        CPPUNIT_ASSERT(!tmp);
+        at1->find("c.size", &tmp, &iter);
+        CPPUNIT_ASSERT(tmp == cont_c && iter == tmp->attr_end());
+    }
+
+    void copy_ctor()
+    {
+        AttrTable at2 = *at1;
+        AttrTable::Attr_iter piter = at2.attr_begin();
+        CPPUNIT_ASSERT(at2.get_name(piter) == "a");
+        CPPUNIT_ASSERT(at2.is_container(piter));
+        AttrTable *tmp = at2.get_attr_table(piter);
+        AttrTable::Attr_iter qiter = tmp->attr_begin();
+        CPPUNIT_ASSERT(tmp->get_name(qiter) == "size");
+        piter++;
+        CPPUNIT_ASSERT(at2.get_name(piter) == "b");
+        CPPUNIT_ASSERT(at2.is_container(piter));
+        piter++;
+        CPPUNIT_ASSERT(at2.get_name(piter) == "c");
+        CPPUNIT_ASSERT(at2.is_container(piter));
+    }
+
+    void assignment()
+    {
+        AttrTable at2;
+        at2 = *at1;
+
+        AttrTable::Attr_iter piter = at2.attr_begin();
+        CPPUNIT_ASSERT(at2.get_name(piter) == "a");
+        CPPUNIT_ASSERT(at2.is_container(piter));
+        AttrTable *tmp = at2.get_attr_table(piter);
+        AttrTable::Attr_iter qiter = tmp->attr_begin();
+        CPPUNIT_ASSERT(tmp->get_name(qiter) == "size");
+        piter++;
+        CPPUNIT_ASSERT(at2.get_name(piter) == "b");
+        CPPUNIT_ASSERT(at2.is_container(piter));
+        piter++;
+        CPPUNIT_ASSERT(at2.get_name(piter) == "c");
+        CPPUNIT_ASSERT(at2.is_container(piter));
+    }
+
+    void erase_test()
+    {
+        // Copy at1 to at2 and verify that at2 is full of stuff...
+        AttrTable at2 = *at1;
+        AttrTable::Attr_iter piter = at2.attr_begin();
+        CPPUNIT_ASSERT(at2.get_name(piter) == "a");
+        CPPUNIT_ASSERT(at2.is_container(piter));
+        AttrTable *tmp = at2.get_attr_table(piter);
+        AttrTable::Attr_iter qiter = tmp->attr_begin();
+        CPPUNIT_ASSERT(tmp->get_name(qiter) == "size");
+        piter++;
+        CPPUNIT_ASSERT(at2.get_name(piter) == "b");
+        CPPUNIT_ASSERT(at2.is_container(piter));
+        piter++;
+        CPPUNIT_ASSERT(at2.get_name(piter) == "c");
+        CPPUNIT_ASSERT(at2.is_container(piter));
+
+        at2.erase();
+        CPPUNIT_ASSERT(at2.attr_map.size() == 0);
+        CPPUNIT_ASSERT(at2.d_name == "");
+    }
+
+    void names_with_spaces_test()
+    {
+        // Create an AttrTable where some names have spaces. The spaces
+        // should be replaced by %20 escapes.
+        // Replacing the spaces with %20 was the bad, old, behavior. Now
+        // the spaces can stay. If someone is writing a DAS using the {}
+        // notation, they can use '%20' for the spaces. In the printed
+        // DAS using the {} notation, spaces will be represented by %20.
+        AttrTable *t = new AttrTable;
+        t->append_attr("long name", "String", "first");
+        t->append_attr("longer name", "String", "\"second test\"");
+        //string sof;
+        ostringstream oss;
+        t->print(oss, "");
+        //FILE2string(sof, of, t->print(of, ""));
+        string attrs = "String long%20name \"first\";\n\
+String longer%20name \"second test\";";
+        //CPPUNIT_ASSERT(sof.find(attrs) != string::npos);
+        CPPUNIT_ASSERT(oss.str().find(attrs) != string::npos);
+        delete t;
+        t = 0;
+    }
+
+    void containers_with_spaces_test()
+    {
+        AttrTable *top = new AttrTable;
+        try {
+            AttrTable *cont = top->append_container("Data Field");
+            cont->append_attr("long name", "String", "first");
+            cont->add_value_alias(top, "an alias", "long name");
+        }
+        catch (Error &e) {
+            cerr << e.get_error_message() << endl;
+            CPPUNIT_ASSERT("Caught Error exception!" && false);
+        }
+        try {
+            ostringstream oss;
+            top->print(oss);
+            Regex r(
+                ".*Data%20Field \\{\n\
+.*String long%20name \"first\";\n\
+.*Alias an%20alias long%20name;\n\
+.*\\}\n");
+            DBG(cout << ">" << oss.str() << "<" << endl);
+            CPPUNIT_ASSERT(re_match(r, oss.str().c_str()));
+            delete top;
+            top = 0;
+        }
+        catch (Error &e) {
+            cerr << e.get_error_message() << endl;
+            CPPUNIT_ASSERT("Caught Error exception!" && false);
+        }
+    }
+
+    void get_attr_iter_test()
+    {
+        int n = at1->get_size();
+        CPPUNIT_ASSERT(n == 3);
+
+        AttrTable::Attr_iter i = at1->get_attr_iter(0);
+        CPPUNIT_ASSERT(at1->get_name(i) == "a");
+        i = at1->get_attr_iter(2);
+        CPPUNIT_ASSERT(at1->get_name(i) == "c");
+
+        i = at1->get_attr_iter(1);
+        CPPUNIT_ASSERT(at1->is_container(i));
+        AttrTable *t1 = at1->get_attr_table(i);
+        AttrTable::Attr_iter k = t1->get_attr_iter(1);
+        CPPUNIT_ASSERT(t1->get_name(k) == "type");
+        CPPUNIT_ASSERT(t1->get_attr(k, 0) == "houses");
+    }
+
+    void del_attr_table_test()
+    {
+        AttrTable *b = at1->find_container("b");
+        AttrTable::Attr_iter i = b->attr_begin();
+        CPPUNIT_ASSERT(b->get_name(i) == "number");
+        i += 2;
+        CPPUNIT_ASSERT(b->get_name(i) == "ba");
+
+        b->del_attr_table(i);
+
+        i = b->attr_begin();
+        CPPUNIT_ASSERT(b->get_name(i) == "number");
+        i += 2;
+        CPPUNIT_ASSERT(i == b->attr_end());
+
+        // try a second table. at2 contains a scalar attribute followed by a
+        // container named 'a'.
+        AttrTable *at2;
+        try {
+            at2 = new AttrTable;
+            at2->set_name("at2");
+            at2->append_attr("color", "String", "red");
+            AttrTable *cont_at2 = at2->append_container("cont_at2");
+            cont_at2->append_attr("size", "Int32", "7");
+            cont_at2->append_attr("type", "String", "cars");
+            i = at2->attr_begin();
+            CPPUNIT_ASSERT(at2->get_name(i) == "color");
+            i++;
+            CPPUNIT_ASSERT(at2->get_name(i) == "cont_at2");
+
+            at2->del_attr_table(i);
+
+            i = at2->attr_begin();
+            CPPUNIT_ASSERT(at2->get_name(i) == "color");
+            i++;
+            CPPUNIT_ASSERT(i == at2->attr_end());
+
+            delete at2;
+            at2 = 0;
+        }
+        catch (Error &e) {
+            cerr << "Error: " << e.get_error_message() << endl;
+            delete at2;
+            at2 = 0;
+            throw;
+        }
+        catch (...) {
+            cerr << "caught an exception!" << endl;
+            delete at2;
+            at2 = 0;
+            throw;
+        }
+    }
+
+    void append_attr_vector_test()
+    {
+        // ("size", "Int32", "7")
+        vector<string> vs;
+        vs.push_back("8");
+        vs.push_back("9");
+        cont_a->append_attr("size", "Int32", &vs);
+
+        CPPUNIT_ASSERT(cont_a->get_attr("size", 0) == "7");
+        CPPUNIT_ASSERT(cont_a->get_attr("size", 1) == "8");
+        CPPUNIT_ASSERT(cont_a->get_attr("size", 2) == "9");
+        CPPUNIT_ASSERT(cont_a->get_attr_num("size") == 3);
+    }
+
+    void print_xml_test()
+    {
+        at1->print_xml(stdout);
+    }
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION (AttrTableTest);
+
+} // namespace libdap
+
+int main(int argc, char *argv[])
+{
+    GetOpt getopt(argc, argv, "dh");
+    int option_char;
+
+    while ((option_char = getopt()) != -1)
+        switch (option_char) {
+        case 'd':
+            debug = 1;  // debug is a static global
+            break;
+
+        case 'h': {     // help - show test names
+            cerr << "Usage: AttrTableTest has the following tests:" << endl;
+            const std::vector<Test*> &tests = libdap::AttrTableTest::suite()->getTests();
+            unsigned int prefix_len = libdap::AttrTableTest::suite()->getName().append("::").length();
+            for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+                cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+            }
+            break;
+        }
+
+        default:
+            break;
+        }
+
+    CppUnit::TextTestRunner runner;
+    runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
+    bool wasSuccessful = true;
+    string test = "";
+    int i = getopt.optind;
+    if (i == argc) {
+        // run them all
+        wasSuccessful = runner.run("");
+    }
+    else {
+        for (; i < argc; ++i) {
+            if (debug) cerr << "Running " << argv[i] << endl;
+            test = libdap::AttrTableTest::suite()->getName().append("::").append(argv[i]);
+            wasSuccessful = wasSuccessful && runner.run(test);
+        }
+    }
+
+    return wasSuccessful ? 0 : 1;
+}
diff --git a/unit-tests/ByteTest.cc b/unit-tests/ByteTest.cc
new file mode 100644
index 0000000..ed446b4
--- /dev/null
+++ b/unit-tests/ByteTest.cc
@@ -0,0 +1,172 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#include "config.h"
+
+#include <cppunit/TextTestRunner.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+#include <cppunit/extensions/HelperMacros.h>
+
+// Tests for Byte. Tests features of BaseType, too. 7/19/2001 jhrg
+
+#include <sstream>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include "Byte.h"
+
+#include "GetOpt.h" // Added jhrg
+
+#include "testFile.h"
+
+/// Added jhrg
+static bool debug = false;
+
+#undef DBG
+#define DBG(x) do { if (debug) (x); } while(false);
+/// jhrg
+
+using namespace CppUnit;
+using namespace std;
+using namespace libdap;
+
+class ByteTest: public TestFixture {
+private:
+    Byte * tb1;
+    Byte *tb2;
+    Byte *tb3;
+    Byte *tb4;
+
+public:
+    ByteTest()
+    {
+    }
+    ~ByteTest()
+    {
+    }
+
+    void setUp()
+    {
+        tb1 = new Byte("tb1");
+        tb2 = new Byte("tb2 name with spaces");
+        tb3 = new Byte("tb3 %");
+        tb4 = new Byte("tb4 #");
+    }
+
+    void tearDown()
+    {
+        delete tb1;
+        tb1 = 0;
+        delete tb2;
+        tb2 = 0;
+        delete tb3;
+        tb3 = 0;
+        delete tb4;
+        tb4 = 0;
+    }
+
+    CPPUNIT_TEST_SUITE (ByteTest);
+
+    CPPUNIT_TEST (name_mangling_test);
+    CPPUNIT_TEST (decl_mangling_test);
+
+    CPPUNIT_TEST_SUITE_END();
+
+    void name_mangling_test()
+    {
+        CPPUNIT_ASSERT(tb1->name() == "tb1");
+        CPPUNIT_ASSERT(tb2->name() == "tb2 name with spaces");
+        CPPUNIT_ASSERT(tb3->name() == "tb3 %");
+        CPPUNIT_ASSERT(tb4->name() == "tb4 #");
+    }
+
+    void decl_mangling_test()
+    {
+        ostringstream sof;
+        tb1->print_decl(sof, "", false);
+        CPPUNIT_ASSERT(sof.str().find("Byte tb1") != string::npos);
+
+        tb2->print_decl(sof, "", false);
+        CPPUNIT_ASSERT(sof.str().find("Byte tb2%20name%20with%20spaces") != string::npos);
+
+        tb3->print_decl(sof, "", false);
+        CPPUNIT_ASSERT(sof.str().find("Byte tb3%20%") != string::npos);
+
+        tb4->print_decl(sof, "", false);
+        CPPUNIT_ASSERT(sof.str().find("Byte tb4%20%23") != string::npos);
+    }
+
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION (ByteTest);
+
+int main(int argc, char *argv[])
+{
+    GetOpt getopt(argc, argv, "dh");
+    int option_char;
+
+    while ((option_char = getopt()) != -1)
+        switch (option_char) {
+        case 'd':
+            debug = 1;  // debug is a static global
+            break;
+
+        case 'h': {     // help - show test names
+            cerr << "Usage: ByteTest has the following tests:" << endl;
+            // Since the ByteTest class is not in the namespace 'libdap' using the ns
+            // prefix is a compiler error. Somce of the tests do put the code in a ns
+            // and then you will need to use the match prefix. jhrg
+            const std::vector<Test*> &tests = /*libdap:: jhrg*/ByteTest::suite()->getTests();
+            unsigned int prefix_len = /*libdap:: jhrg*/ByteTest::suite()->getName().append("::").length();
+            for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+                cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+            }
+            break;
+        }
+
+        default:
+            break;
+        }
+
+    CppUnit::TextTestRunner runner;
+    runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
+    bool wasSuccessful = true;
+    string test = "";
+    int i = getopt.optind;
+    if (i == argc) {
+        // run them all
+        wasSuccessful = runner.run("");
+    }
+    else {
+        for (; i < argc; ++i) {
+            if (debug) cerr << "Running " << argv[i] << endl;
+            test = /*libdap:: jhrg*/ByteTest::suite()->getName().append("::").append(argv[i]);
+            wasSuccessful = wasSuccessful && runner.run(test);
+        }
+    }
+
+    return wasSuccessful ? 0 : 1;
+}
diff --git a/unit-tests/D4-marshaller/big-endian/test_cmp.dat b/unit-tests/D4-marshaller/big-endian/test_cmp.dat
new file mode 100644
index 0000000..b66efb8
Binary files /dev/null and b/unit-tests/D4-marshaller/big-endian/test_cmp.dat differ
diff --git a/unit-tests/D4-marshaller/big-endian/test_opaque_1_bin.dat b/unit-tests/D4-marshaller/big-endian/test_opaque_1_bin.dat
new file mode 100644
index 0000000..71b7268
Binary files /dev/null and b/unit-tests/D4-marshaller/big-endian/test_opaque_1_bin.dat differ
diff --git a/unit-tests/D4-marshaller/big-endian/test_scalars_1_bin.dat b/unit-tests/D4-marshaller/big-endian/test_scalars_1_bin.dat
new file mode 100644
index 0000000..0eb0077
Binary files /dev/null and b/unit-tests/D4-marshaller/big-endian/test_scalars_1_bin.dat differ
diff --git a/unit-tests/D4-marshaller/big-endian/test_scalars_2_bin.dat b/unit-tests/D4-marshaller/big-endian/test_scalars_2_bin.dat
new file mode 100644
index 0000000..d8acf84
Binary files /dev/null and b/unit-tests/D4-marshaller/big-endian/test_scalars_2_bin.dat differ
diff --git a/unit-tests/D4-marshaller/big-endian/test_scalars_3_bin.dat b/unit-tests/D4-marshaller/big-endian/test_scalars_3_bin.dat
new file mode 100644
index 0000000..0b8d844
Binary files /dev/null and b/unit-tests/D4-marshaller/big-endian/test_scalars_3_bin.dat differ
diff --git a/unit-tests/D4-marshaller/big-endian/test_vector_1_bin.dat b/unit-tests/D4-marshaller/big-endian/test_vector_1_bin.dat
new file mode 100644
index 0000000..e0e8df4
Binary files /dev/null and b/unit-tests/D4-marshaller/big-endian/test_vector_1_bin.dat differ
diff --git a/unit-tests/D4-marshaller/little-endian/test_cmp.dat b/unit-tests/D4-marshaller/little-endian/test_cmp.dat
new file mode 100644
index 0000000..b66efb8
Binary files /dev/null and b/unit-tests/D4-marshaller/little-endian/test_cmp.dat differ
diff --git a/unit-tests/D4-marshaller/little-endian/test_opaque_1_bin.dat b/unit-tests/D4-marshaller/little-endian/test_opaque_1_bin.dat
new file mode 100644
index 0000000..5e52c65
Binary files /dev/null and b/unit-tests/D4-marshaller/little-endian/test_opaque_1_bin.dat differ
diff --git a/unit-tests/D4-marshaller/little-endian/test_scalars_1.dat b/unit-tests/D4-marshaller/little-endian/test_scalars_1.dat
new file mode 100644
index 0000000..c212499
Binary files /dev/null and b/unit-tests/D4-marshaller/little-endian/test_scalars_1.dat differ
diff --git a/unit-tests/D4-marshaller/little-endian/test_scalars_1_bin.dat b/unit-tests/D4-marshaller/little-endian/test_scalars_1_bin.dat
new file mode 100644
index 0000000..6515746
Binary files /dev/null and b/unit-tests/D4-marshaller/little-endian/test_scalars_1_bin.dat differ
diff --git a/unit-tests/D4-marshaller/little-endian/test_scalars_2.dat b/unit-tests/D4-marshaller/little-endian/test_scalars_2.dat
new file mode 100644
index 0000000..5d7d0ff
Binary files /dev/null and b/unit-tests/D4-marshaller/little-endian/test_scalars_2.dat differ
diff --git a/unit-tests/D4-marshaller/little-endian/test_scalars_2_bin.dat b/unit-tests/D4-marshaller/little-endian/test_scalars_2_bin.dat
new file mode 100644
index 0000000..fdf84e9
Binary files /dev/null and b/unit-tests/D4-marshaller/little-endian/test_scalars_2_bin.dat differ
diff --git a/unit-tests/D4-marshaller/little-endian/test_scalars_3_bin.dat b/unit-tests/D4-marshaller/little-endian/test_scalars_3_bin.dat
new file mode 100644
index 0000000..0098c35
Binary files /dev/null and b/unit-tests/D4-marshaller/little-endian/test_scalars_3_bin.dat differ
diff --git a/unit-tests/D4-marshaller/little-endian/test_vector_1_bin.dat b/unit-tests/D4-marshaller/little-endian/test_vector_1_bin.dat
new file mode 100644
index 0000000..bfcb051
Binary files /dev/null and b/unit-tests/D4-marshaller/little-endian/test_vector_1_bin.dat differ
diff --git a/unit-tests/D4-marshaller/little-endian/test_vector_2_bin.dat b/unit-tests/D4-marshaller/little-endian/test_vector_2_bin.dat
new file mode 100644
index 0000000..59791e3
Binary files /dev/null and b/unit-tests/D4-marshaller/little-endian/test_vector_2_bin.dat differ
diff --git a/unit-tests/D4-marshaller/test_opaque_1_bin.dat.sav b/unit-tests/D4-marshaller/test_opaque_1_bin.dat.sav
new file mode 100644
index 0000000..4cc6ef3
Binary files /dev/null and b/unit-tests/D4-marshaller/test_opaque_1_bin.dat.sav differ
diff --git a/unit-tests/D4-type-testsuite/TestD4Sequence_one_clause.txt b/unit-tests/D4-type-testsuite/TestD4Sequence_one_clause.txt
new file mode 100644
index 0000000..e9abb82
--- /dev/null
+++ b/unit-tests/D4-type-testsuite/TestD4Sequence_one_clause.txt
@@ -0,0 +1 @@
+{ { 1024, "Silly test string: 2", -1.77 } }
\ No newline at end of file
diff --git a/unit-tests/D4-type-testsuite/TestD4Sequence_s.txt b/unit-tests/D4-type-testsuite/TestD4Sequence_s.txt
new file mode 100644
index 0000000..876df5a
--- /dev/null
+++ b/unit-tests/D4-type-testsuite/TestD4Sequence_s.txt
@@ -0,0 +1 @@
+{ { 32, "Silly test string: 1", -54.4 }, { 1024, "Silly test string: 2", -1.77 }, { 32768, "Silly test string: 3", 98.93 }, { 1048576, "Silly test string: 4", 92.68 }, { 33554432, "Silly test string: 5", 99.48 }, { 1073741824, "Silly test string: 6", 81.67 }, { 32, "Silly test string: 7", 10.59 } }
\ No newline at end of file
diff --git a/unit-tests/D4-type-testsuite/TestD4Sequence_two_clause.txt b/unit-tests/D4-type-testsuite/TestD4Sequence_two_clause.txt
new file mode 100644
index 0000000..a926038
--- /dev/null
+++ b/unit-tests/D4-type-testsuite/TestD4Sequence_two_clause.txt
@@ -0,0 +1 @@
+{ { 1024, "Silly test string: 2", -1.77 }, { 32768, "Silly test string: 3", 98.93 }, { 1048576, "Silly test string: 4", 92.68 } }
\ No newline at end of file
diff --git a/unit-tests/D4-xml/D4AsyncAccepted.xml b/unit-tests/D4-xml/D4AsyncAccepted.xml
new file mode 100644
index 0000000..740b83b
--- /dev/null
+++ b/unit-tests/D4-xml/D4AsyncAccepted.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<dap:AsynchronousResponse status="accepted" xmlns:dap="http://xml.opendap.org/ns/DAP/4.0#">
+    <dap:expectedDelay seconds="6003"/>
+    <dap:responseLifetime seconds="600009"/>
+    <dap:link href="http://test.opendap.org:8080/opendap/storedResults/result_87697163.dap"/>
+</dap:AsynchronousResponse>
diff --git a/unit-tests/D4-xml/D4AsyncAccepted_StyleRef.xml b/unit-tests/D4-xml/D4AsyncAccepted_StyleRef.xml
new file mode 100644
index 0000000..08ebfb2
--- /dev/null
+++ b/unit-tests/D4-xml/D4AsyncAccepted_StyleRef.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml-stylesheet type='text/xsl' href='http://someServer:8080/opendap/xsl/asyncResponse.xsl'?>
+<dap:AsynchronousResponse status="accepted" xmlns:dap="http://xml.opendap.org/ns/DAP/4.0#">
+    <dap:expectedDelay seconds="6003"/>
+    <dap:responseLifetime seconds="600009"/>
+    <dap:link href="http://test.opendap.org:8080/opendap/storedResults/result_87697163.dap"/>
+</dap:AsynchronousResponse>
diff --git a/unit-tests/D4-xml/D4AsyncGone.xml b/unit-tests/D4-xml/D4AsyncGone.xml
new file mode 100644
index 0000000..0cbd7b3
--- /dev/null
+++ b/unit-tests/D4-xml/D4AsyncGone.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<dap:AsynchronousResponse status="gone" xmlns:dap="http://xml.opendap.org/ns/DAP/4.0#"/>
diff --git a/unit-tests/D4-xml/D4AsyncGone_StyleRef.xml b/unit-tests/D4-xml/D4AsyncGone_StyleRef.xml
new file mode 100644
index 0000000..8917cea
--- /dev/null
+++ b/unit-tests/D4-xml/D4AsyncGone_StyleRef.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml-stylesheet type='text/xsl' href='http://someServer:8080/opendap/xsl/asyncResponse.xsl'?>
+<dap:AsynchronousResponse status="gone" xmlns:dap="http://xml.opendap.org/ns/DAP/4.0#"/>
diff --git a/unit-tests/D4-xml/D4AsyncPending.xml b/unit-tests/D4-xml/D4AsyncPending.xml
new file mode 100644
index 0000000..7012099
--- /dev/null
+++ b/unit-tests/D4-xml/D4AsyncPending.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<dap:AsynchronousResponse status="pending" xmlns:dap="http://xml.opendap.org/ns/DAP/4.0#"/>
diff --git a/unit-tests/D4-xml/D4AsyncPending_StyleRef.xml b/unit-tests/D4-xml/D4AsyncPending_StyleRef.xml
new file mode 100644
index 0000000..2a8a2de
--- /dev/null
+++ b/unit-tests/D4-xml/D4AsyncPending_StyleRef.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml-stylesheet type='text/xsl' href='http://someServer:8080/opendap/xsl/asyncResponse.xsl'?>
+<dap:AsynchronousResponse status="pending" xmlns:dap="http://xml.opendap.org/ns/DAP/4.0#"/>
diff --git a/unit-tests/D4-xml/D4AsyncRejected.xml b/unit-tests/D4-xml/D4AsyncRejected.xml
new file mode 100644
index 0000000..13b8157
--- /dev/null
+++ b/unit-tests/D4-xml/D4AsyncRejected.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<dap:AsynchronousResponse status="rejected" xmlns:dap="http://xml.opendap.org/ns/DAP/4.0#">
+    <dap:reason code="time"/>
+    <dap:description>The time to process your request is longer than the time you indicated was acceptable.</dap:description>
+</dap:AsynchronousResponse>
diff --git a/unit-tests/D4-xml/D4AsyncRejected_StyleRef.xml b/unit-tests/D4-xml/D4AsyncRejected_StyleRef.xml
new file mode 100644
index 0000000..d5d17b5
--- /dev/null
+++ b/unit-tests/D4-xml/D4AsyncRejected_StyleRef.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml-stylesheet type='text/xsl' href='http://someServer:8080/opendap/xsl/asyncResponse.xsl'?>
+<dap:AsynchronousResponse status="rejected" xmlns:dap="http://xml.opendap.org/ns/DAP/4.0#">
+    <dap:reason code="time"/>
+    <dap:description>The time to process your request is longer than the time you indicated was acceptable.</dap:description>
+</dap:AsynchronousResponse>
diff --git a/unit-tests/D4-xml/D4AsyncRequired.xml b/unit-tests/D4-xml/D4AsyncRequired.xml
new file mode 100644
index 0000000..14cbe90
--- /dev/null
+++ b/unit-tests/D4-xml/D4AsyncRequired.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<dap:AsynchronousResponse status="required" xmlns:dap="http://xml.opendap.org/ns/DAP/4.0#">
+    <dap:expectedDelay seconds="6001"/>
+    <dap:responseLifetime seconds="600007"/>
+</dap:AsynchronousResponse>
diff --git a/unit-tests/D4-xml/D4AsyncRequired_StyleRef.xml b/unit-tests/D4-xml/D4AsyncRequired_StyleRef.xml
new file mode 100644
index 0000000..1037e98
--- /dev/null
+++ b/unit-tests/D4-xml/D4AsyncRequired_StyleRef.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml-stylesheet type='text/xsl' href='http://someServer:8080/opendap/xsl/asyncResponse.xsl'?>
+<dap:AsynchronousResponse status="required" xmlns:dap="http://xml.opendap.org/ns/DAP/4.0#">
+    <dap:expectedDelay seconds="6001"/>
+    <dap:responseLifetime seconds="600007"/>
+</dap:AsynchronousResponse>
diff --git a/unit-tests/D4-xml/D4Attributes_1.xml b/unit-tests/D4-xml/D4Attributes_1.xml
new file mode 100644
index 0000000..02b5da8
--- /dev/null
+++ b/unit-tests/D4-xml/D4Attributes_1.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Attribute name="first" type="Byte">
+    <Value>1</Value>
+    <Value>2</Value>
+</Attribute>
diff --git a/unit-tests/D4-xml/D4Attributes_2.xml b/unit-tests/D4-xml/D4Attributes_2.xml
new file mode 100644
index 0000000..36c6eef
--- /dev/null
+++ b/unit-tests/D4-xml/D4Attributes_2.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Attribute name="first" type="Byte">
+    <Value>1</Value>
+    <Value>2</Value>
+</Attribute>
+<Attribute name="second" type="Int32">
+    <Value>10000</Value>
+</Attribute>
diff --git a/unit-tests/D4-xml/D4Attributes_3.xml b/unit-tests/D4-xml/D4Attributes_3.xml
new file mode 100644
index 0000000..e6d9238
--- /dev/null
+++ b/unit-tests/D4-xml/D4Attributes_3.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Attribute name="first" type="Byte">
+    <Value>1</Value>
+    <Value>2</Value>
+</Attribute>
+<Attribute name="second" type="Int32">
+    <Value>10000</Value>
+</Attribute>
+<Attribute name="container_1" type="Container">
+    <Attribute name="color" type="String">
+        <Value>red</Value>
+        <Value>blue</Value>
+        <Value>green</Value>
+    </Attribute>
+</Attribute>
+<Attribute name="container_2" type="Container">
+    <Attribute name="control" type="Int32">
+        <Value>10000</Value>
+    </Attribute>
+    <Attribute name="container_1" type="Container">
+        <Attribute name="color" type="String">
+            <Value>red</Value>
+            <Value>blue</Value>
+            <Value>green</Value>
+        </Attribute>
+    </Attribute>
+</Attribute>
diff --git a/unit-tests/D4-xml/D4Attributes_assignment.xml b/unit-tests/D4-xml/D4Attributes_assignment.xml
new file mode 100644
index 0000000..36c6eef
--- /dev/null
+++ b/unit-tests/D4-xml/D4Attributes_assignment.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Attribute name="first" type="Byte">
+    <Value>1</Value>
+    <Value>2</Value>
+</Attribute>
+<Attribute name="second" type="Int32">
+    <Value>10000</Value>
+</Attribute>
diff --git a/unit-tests/D4-xml/D4Attributes_assignment_2.xml b/unit-tests/D4-xml/D4Attributes_assignment_2.xml
new file mode 100644
index 0000000..e6d9238
--- /dev/null
+++ b/unit-tests/D4-xml/D4Attributes_assignment_2.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Attribute name="first" type="Byte">
+    <Value>1</Value>
+    <Value>2</Value>
+</Attribute>
+<Attribute name="second" type="Int32">
+    <Value>10000</Value>
+</Attribute>
+<Attribute name="container_1" type="Container">
+    <Attribute name="color" type="String">
+        <Value>red</Value>
+        <Value>blue</Value>
+        <Value>green</Value>
+    </Attribute>
+</Attribute>
+<Attribute name="container_2" type="Container">
+    <Attribute name="control" type="Int32">
+        <Value>10000</Value>
+    </Attribute>
+    <Attribute name="container_1" type="Container">
+        <Attribute name="color" type="String">
+            <Value>red</Value>
+            <Value>blue</Value>
+            <Value>green</Value>
+        </Attribute>
+    </Attribute>
+</Attribute>
diff --git a/unit-tests/D4-xml/D4Attributes_copy_ctor.xml b/unit-tests/D4-xml/D4Attributes_copy_ctor.xml
new file mode 100644
index 0000000..36c6eef
--- /dev/null
+++ b/unit-tests/D4-xml/D4Attributes_copy_ctor.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Attribute name="first" type="Byte">
+    <Value>1</Value>
+    <Value>2</Value>
+</Attribute>
+<Attribute name="second" type="Int32">
+    <Value>10000</Value>
+</Attribute>
diff --git a/unit-tests/D4-xml/D4Attributes_empty.xml b/unit-tests/D4-xml/D4Attributes_empty.xml
new file mode 100644
index 0000000..89a325e
--- /dev/null
+++ b/unit-tests/D4-xml/D4Attributes_empty.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
diff --git a/unit-tests/D4-xml/D4Attributes_values_1.xml b/unit-tests/D4-xml/D4Attributes_values_1.xml
new file mode 100644
index 0000000..02b5da8
--- /dev/null
+++ b/unit-tests/D4-xml/D4Attributes_values_1.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Attribute name="first" type="Byte">
+    <Value>1</Value>
+    <Value>2</Value>
+</Attribute>
diff --git a/unit-tests/D4-xml/D4Dimensions_1.xml b/unit-tests/D4-xml/D4Dimensions_1.xml
new file mode 100644
index 0000000..e8344b5
--- /dev/null
+++ b/unit-tests/D4-xml/D4Dimensions_1.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dimension name="first" size="10"/>
diff --git a/unit-tests/D4-xml/D4Dimensions_2.xml b/unit-tests/D4-xml/D4Dimensions_2.xml
new file mode 100644
index 0000000..ca25c65
--- /dev/null
+++ b/unit-tests/D4-xml/D4Dimensions_2.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dimension name="first" size="10"/>
+<Dimension name="second" size="100"/>
diff --git a/unit-tests/D4-xml/D4Dimensions_3.xml b/unit-tests/D4-xml/D4Dimensions_3.xml
new file mode 100644
index 0000000..bb86d67
--- /dev/null
+++ b/unit-tests/D4-xml/D4Dimensions_3.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dimension name="first" size="10"/>
+<Dimension name="second" size="100"/>
+<Dimension name="third" size="1000"/>
diff --git a/unit-tests/D4-xml/D4Dimensions_4.xml b/unit-tests/D4-xml/D4Dimensions_4.xml
new file mode 100644
index 0000000..0e7042f
--- /dev/null
+++ b/unit-tests/D4-xml/D4Dimensions_4.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dimension name="first" size="10"/>
+<Dimension name="odd" size="20"/>
+<Dimension name="second" size="100"/>
+<Dimension name="third" size="1000"/>
diff --git a/unit-tests/D4-xml/D4Dimensions_empty.xml b/unit-tests/D4-xml/D4Dimensions_empty.xml
new file mode 100644
index 0000000..89a325e
--- /dev/null
+++ b/unit-tests/D4-xml/D4Dimensions_empty.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
diff --git a/unit-tests/D4-xml/D4EnumDefs_1.xml b/unit-tests/D4-xml/D4EnumDefs_1.xml
new file mode 100644
index 0000000..eb80cc3
--- /dev/null
+++ b/unit-tests/D4-xml/D4EnumDefs_1.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Enumeration name="first" basetype="Byte">
+    <EnumConst name="red" value="1"/>
+    <EnumConst name="blue" value="2"/>
+</Enumeration>
diff --git a/unit-tests/D4-xml/D4EnumDefs_2.xml b/unit-tests/D4-xml/D4EnumDefs_2.xml
new file mode 100644
index 0000000..23b75a2
--- /dev/null
+++ b/unit-tests/D4-xml/D4EnumDefs_2.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Enumeration name="first" basetype="Byte">
+    <EnumConst name="red" value="1"/>
+    <EnumConst name="blue" value="2"/>
+</Enumeration>
+<Enumeration name="second" basetype="Int32">
+    <EnumConst name="snow" value="0"/>
+    <EnumConst name="ice" value="10000"/>
+</Enumeration>
diff --git a/unit-tests/D4-xml/D4EnumDefs_3.xml b/unit-tests/D4-xml/D4EnumDefs_3.xml
new file mode 100644
index 0000000..77a0666
--- /dev/null
+++ b/unit-tests/D4-xml/D4EnumDefs_3.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Enumeration name="second" basetype="Int32">
+    <EnumConst name="snow" value="0"/>
+    <EnumConst name="ice" value="10000"/>
+</Enumeration>
+<Enumeration name="first" basetype="Byte">
+    <EnumConst name="red" value="1"/>
+    <EnumConst name="blue" value="2"/>
+</Enumeration>
diff --git a/unit-tests/D4-xml/D4EnumDefs_empty.xml b/unit-tests/D4-xml/D4EnumDefs_empty.xml
new file mode 100644
index 0000000..89a325e
--- /dev/null
+++ b/unit-tests/D4-xml/D4EnumDefs_empty.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
diff --git a/unit-tests/D4-xml/D4EnumDefs_values_1.xml b/unit-tests/D4-xml/D4EnumDefs_values_1.xml
new file mode 100644
index 0000000..e036ffe
--- /dev/null
+++ b/unit-tests/D4-xml/D4EnumDefs_values_1.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<EnumConst name="red" value="1"/>
+<EnumConst name="blue" value="2"/>
diff --git a/unit-tests/D4-xml/D4Enum_1.xml b/unit-tests/D4-xml/D4Enum_1.xml
new file mode 100644
index 0000000..dc5227c
--- /dev/null
+++ b/unit-tests/D4-xml/D4Enum_1.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Enum name="test" enum="Colors"/>
diff --git a/unit-tests/D4-xml/D4Enum_2.txt b/unit-tests/D4-xml/D4Enum_2.txt
new file mode 100644
index 0000000..802bf3c
--- /dev/null
+++ b/unit-tests/D4-xml/D4Enum_2.txt
@@ -0,0 +1 @@
+Enum test = 200;
diff --git a/unit-tests/D4-xml/D4Group_empty.xml b/unit-tests/D4-xml/D4Group_empty.xml
new file mode 100644
index 0000000..89a325e
--- /dev/null
+++ b/unit-tests/D4-xml/D4Group_empty.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
diff --git a/unit-tests/D4-xml/D4Group_everything.xml b/unit-tests/D4-xml/D4Group_everything.xml
new file mode 100644
index 0000000..4db6c07
--- /dev/null
+++ b/unit-tests/D4-xml/D4Group_everything.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dimension name="lat" size="1024"/>
+<Dimension name="lon" size="1024"/>
+<Dimension name="time" size="20"/>
+<Enumeration name="colors" basetype="Byte">
+    <EnumConst name="red" value="1"/>
+    <EnumConst name="green" value="2"/>
+    <EnumConst name="blue" value="3"/>
+</Enumeration>
+<Byte name="b"/>
+<Int64 name="i64"/>
+<Attribute name="test" type="Int16">
+    <Value>1</Value>
+</Attribute>
+<Group name="child">
+    <Dimension name="lat" size="1024"/>
+    <Dimension name="lon" size="1024"/>
+    <Dimension name="time" size="20"/>
+    <Enumeration name="colors" basetype="Byte">
+        <EnumConst name="red" value="1"/>
+        <EnumConst name="green" value="2"/>
+        <EnumConst name="blue" value="3"/>
+    </Enumeration>
+    <Byte name="b"/>
+    <Int64 name="i64"/>
+    <Attribute name="test" type="Int16">
+        <Value>1</Value>
+    </Attribute>
+</Group>
diff --git a/unit-tests/D4-xml/D4Group_named_empty.xml b/unit-tests/D4-xml/D4Group_named_empty.xml
new file mode 100644
index 0000000..4dcf1e3
--- /dev/null
+++ b/unit-tests/D4-xml/D4Group_named_empty.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Group name="test"/>
diff --git a/unit-tests/D4-xml/D4Group_named_with_scalars.xml b/unit-tests/D4-xml/D4Group_named_with_scalars.xml
new file mode 100644
index 0000000..552f372
--- /dev/null
+++ b/unit-tests/D4-xml/D4Group_named_with_scalars.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Group name="test">
+    <Byte name="b"/>
+    <Int64 name="i64"/>
+</Group>
diff --git a/unit-tests/D4-xml/D4Group_named_with_scalars_and_stuff.xml b/unit-tests/D4-xml/D4Group_named_with_scalars_and_stuff.xml
new file mode 100644
index 0000000..3e1ee95
--- /dev/null
+++ b/unit-tests/D4-xml/D4Group_named_with_scalars_and_stuff.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Group name="test">
+    <Dimension name="lat" size="1024"/>
+    <Dimension name="lon" size="1024"/>
+    <Dimension name="time" size="20"/>
+    <Enumeration name="colors" basetype="Byte">
+        <EnumConst name="red" value="1"/>
+        <EnumConst name="green" value="2"/>
+        <EnumConst name="blue" value="3"/>
+    </Enumeration>
+    <Byte name="b"/>
+    <Int64 name="i64"/>
+    <Attribute name="test" type="Int16">
+        <Value>1</Value>
+    </Attribute>
+</Group>
diff --git a/unit-tests/D4-xml/D4Group_with_scalars.xml b/unit-tests/D4-xml/D4Group_with_scalars.xml
new file mode 100644
index 0000000..2c3f5dd
--- /dev/null
+++ b/unit-tests/D4-xml/D4Group_with_scalars.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Byte name="b"/>
+<Int64 name="i64"/>
diff --git a/unit-tests/D4-xml/D4Group_with_scalars_and_stuff.xml b/unit-tests/D4-xml/D4Group_with_scalars_and_stuff.xml
new file mode 100644
index 0000000..edffb37
--- /dev/null
+++ b/unit-tests/D4-xml/D4Group_with_scalars_and_stuff.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dimension name="lat" size="1024"/>
+<Dimension name="lon" size="1024"/>
+<Dimension name="time" size="20"/>
+<Enumeration name="colors" basetype="Byte">
+    <EnumConst name="red" value="1"/>
+    <EnumConst name="green" value="2"/>
+    <EnumConst name="blue" value="3"/>
+</Enumeration>
+<Byte name="b"/>
+<Int64 name="i64"/>
+<Attribute name="test" type="Int16">
+    <Value>1</Value>
+</Attribute>
diff --git a/unit-tests/D4-xml/DMR_0.1.xml b/unit-tests/D4-xml/DMR_0.1.xml
new file mode 100644
index 0000000..505c1b2
--- /dev/null
+++ b/unit-tests/D4-xml/DMR_0.1.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" 
+    xml:base="file:DMR_0.xml"    
+    name="DMR_0"
+    dapVersion="4.0"
+    dmrVersion="1.0">
+    <Attribute name="test" type="Int16">
+        <Value>1</Value>
+        <Value>2</Value>
+        <Value>3</Value>
+    </Attribute>
+    <Attribute name="DAP4_switches" type="Container">
+        <Attribute name="public_key" type="String">
+            <Value>some_large_hex_value</Value>
+        </Attribute>
+        <Attribute name="colors" type="String">
+            <Value>red</Value>
+            <Value>green</Value>
+            <Value>blue</Value>
+        </Attribute>
+        <Attribute name="temp" type="Float32">
+            <Value>98.6</Value>
+        </Attribute>
+        <Attribute type="OtherXML" name="xmltest">
+            <xml>barf</xml>
+        </Attribute>
+    </Attribute>
+</Dataset>   
diff --git a/unit-tests/D4-xml/DMR_0.1_baseline.xml b/unit-tests/D4-xml/DMR_0.1_baseline.xml
new file mode 100644
index 0000000..9dae03f
--- /dev/null
+++ b/unit-tests/D4-xml/DMR_0.1_baseline.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:DMR_0.xml" dapVersion="4.0" dmrVersion="1.0" name="DMR_0">
+    <Attribute name="test" type="Int16">
+        <Value>1</Value>
+        <Value>2</Value>
+        <Value>3</Value>
+    </Attribute>
+    <Attribute name="DAP4_switches" type="Container">
+        <Attribute name="public_key" type="String">
+            <Value>some_large_hex_value</Value>
+        </Attribute>
+        <Attribute name="colors" type="String">
+            <Value>red</Value>
+            <Value>green</Value>
+            <Value>blue</Value>
+        </Attribute>
+        <Attribute name="temp" type="Float32">
+            <Value>98.6</Value>
+        </Attribute>
+        <Attribute name="xmltest" type="OtherXML">            <xml>barf</xml>        </Attribute>
+    </Attribute>
+</Dataset>
diff --git a/unit-tests/D4-xml/DMR_0.xml b/unit-tests/D4-xml/DMR_0.xml
new file mode 100644
index 0000000..23486b2
--- /dev/null
+++ b/unit-tests/D4-xml/DMR_0.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" 
+    xml:base="file:DMR_0.xml"    
+    name="DMR_0"
+    dapVersion="4.0"
+    dmrVersion="1.0">
+    <Attribute name="test" type="Int16">
+        <Value>1</Value>
+        <Value>2</Value>
+        <Value>3</Value>
+    </Attribute>
+</Dataset>   
diff --git a/unit-tests/D4-xml/DMR_0_baseline.xml b/unit-tests/D4-xml/DMR_0_baseline.xml
new file mode 100644
index 0000000..4efe50d
--- /dev/null
+++ b/unit-tests/D4-xml/DMR_0_baseline.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:DMR_0.xml" dapVersion="4.0" dmrVersion="1.0" name="DMR_0">
+    <Attribute name="test" type="Int16">
+        <Value>1</Value>
+        <Value>2</Value>
+        <Value>3</Value>
+    </Attribute>
+</Dataset>
diff --git a/unit-tests/D4-xml/DMR_1.xml b/unit-tests/D4-xml/DMR_1.xml
new file mode 100644
index 0000000..e1cb87d
--- /dev/null
+++ b/unit-tests/D4-xml/DMR_1.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" 
+    xml:base="file:DMR_1.xml"    
+    name="DMR_1"
+    dapVersion="4.0"
+    dmrVersion="1.0">
+    <Dimension name="dim1" size="5"/>
+</Dataset>   
diff --git a/unit-tests/D4-xml/DMR_1_baseline.xml b/unit-tests/D4-xml/DMR_1_baseline.xml
new file mode 100644
index 0000000..6273423
--- /dev/null
+++ b/unit-tests/D4-xml/DMR_1_baseline.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:DMR_1.xml" dapVersion="4.0" dmrVersion="1.0" name="DMR_1">
+    <Dimension name="dim1" size="5"/>
+</Dataset>
diff --git a/unit-tests/D4-xml/DMR_2.1.xml b/unit-tests/D4-xml/DMR_2.1.xml
new file mode 100644
index 0000000..1d69495
--- /dev/null
+++ b/unit-tests/D4-xml/DMR_2.1.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" 
+    xml:base="file:DMR_2.1.xml"    
+    name="DMR_2.1"
+    dapVersion="4.0"
+    dmrVersion="1.0">
+
+    <Enumeration name="colors" basetype="Byte">
+        <EnumConst name="red" value="1"/>
+        <EnumConst name="green" value="2"/>
+        <EnumConst name="blue" value="3"/>
+    </Enumeration>
+    
+    <Enum name="e1" enum="colors"/>
+</Dataset>   
diff --git a/unit-tests/D4-xml/DMR_2.1_baseline.xml b/unit-tests/D4-xml/DMR_2.1_baseline.xml
new file mode 100644
index 0000000..1b6fa84
--- /dev/null
+++ b/unit-tests/D4-xml/DMR_2.1_baseline.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:DMR_2.1.xml" dapVersion="4.0" dmrVersion="1.0" name="DMR_2.1">
+    <Enumeration name="colors" basetype="Byte">
+        <EnumConst name="red" value="1"/>
+        <EnumConst name="green" value="2"/>
+        <EnumConst name="blue" value="3"/>
+    </Enumeration>
+    <Enum name="e1" enum="/colors"/>
+</Dataset>
diff --git a/unit-tests/D4-xml/DMR_2.xml b/unit-tests/D4-xml/DMR_2.xml
new file mode 100644
index 0000000..beb1990
--- /dev/null
+++ b/unit-tests/D4-xml/DMR_2.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" 
+    xml:base="file:DMR_2.xml"    
+    name="DMR_2"
+    dapVersion="4.0"
+    dmrVersion="1.0">
+    <Dimension name="dim1" size="5"/>
+    <Enumeration name="colors" basetype="Byte">
+        <EnumConst name="red" value="1"/>
+        <EnumConst name="green" value="2"/>
+        <EnumConst name="blue" value="3"/>
+    </Enumeration>
+</Dataset>   
diff --git a/unit-tests/D4-xml/DMR_2_baseline.xml b/unit-tests/D4-xml/DMR_2_baseline.xml
new file mode 100644
index 0000000..fea8587
--- /dev/null
+++ b/unit-tests/D4-xml/DMR_2_baseline.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:DMR_2.xml" dapVersion="4.0" dmrVersion="1.0" name="DMR_2">
+    <Dimension name="dim1" size="5"/>
+    <Enumeration name="colors" basetype="Byte">
+        <EnumConst name="red" value="1"/>
+        <EnumConst name="green" value="2"/>
+        <EnumConst name="blue" value="3"/>
+    </Enumeration>
+</Dataset>
diff --git a/unit-tests/D4-xml/DMR_3.1.xml b/unit-tests/D4-xml/DMR_3.1.xml
new file mode 100644
index 0000000..1764a63
--- /dev/null
+++ b/unit-tests/D4-xml/DMR_3.1.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" 
+    xml:base="file:DMR_3.xml"    
+    name="DMR_3"
+    dapVersion="4.0"
+    dmrVersion="1.0">
+    <Dimension name="dim1" size="5"/>
+    <Enumeration name="colors" basetype="Byte">
+        <EnumConst name="red" value="1"/>
+        <EnumConst name="green" value="2"/>
+        <EnumConst name="blue" value="3"/>
+    </Enumeration>
+    <Byte name="b1">
+        <Attribute name="test" type="Int16">
+            <Value>1</Value>
+            <Value>2</Value>
+            <Value>3</Value>
+        </Attribute>
+        <Attribute name="DAP4_switches" type="Container">
+            <Attribute name="public_key" type="String">
+                <Value>some_large_hex_value</Value>
+            </Attribute>
+            <Attribute name="colors" type="String">
+                <Value>red</Value>
+                <Value>green</Value>
+                <Value>blue</Value>
+            </Attribute>
+            <Attribute name="temp" type="Float32">
+                <Value>98.6</Value>
+            </Attribute>
+            <Attribute type="OtherXML" name="xmltest">
+                <xml>barf</xml>
+            </Attribute>
+        </Attribute>
+    </Byte>
+</Dataset>   
diff --git a/unit-tests/D4-xml/DMR_3.1_baseline.xml b/unit-tests/D4-xml/DMR_3.1_baseline.xml
new file mode 100644
index 0000000..fa86eb8
--- /dev/null
+++ b/unit-tests/D4-xml/DMR_3.1_baseline.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:DMR_3.xml" dapVersion="4.0" dmrVersion="1.0" name="DMR_3">
+    <Dimension name="dim1" size="5"/>
+    <Enumeration name="colors" basetype="Byte">
+        <EnumConst name="red" value="1"/>
+        <EnumConst name="green" value="2"/>
+        <EnumConst name="blue" value="3"/>
+    </Enumeration>
+    <Byte name="b1">
+        <Attribute name="test" type="Int16">
+            <Value>1</Value>
+            <Value>2</Value>
+            <Value>3</Value>
+        </Attribute>
+        <Attribute name="DAP4_switches" type="Container">
+            <Attribute name="public_key" type="String">
+                <Value>some_large_hex_value</Value>
+            </Attribute>
+            <Attribute name="colors" type="String">
+                <Value>red</Value>
+                <Value>green</Value>
+                <Value>blue</Value>
+            </Attribute>
+            <Attribute name="temp" type="Float32">
+                <Value>98.6</Value>
+            </Attribute>
+            <Attribute name="xmltest" type="OtherXML">                <xml>barf</xml>            </Attribute>
+        </Attribute>
+    </Byte>
+</Dataset>
diff --git a/unit-tests/D4-xml/DMR_3.2.xml b/unit-tests/D4-xml/DMR_3.2.xml
new file mode 100644
index 0000000..ac7611d
--- /dev/null
+++ b/unit-tests/D4-xml/DMR_3.2.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" 
+    xml:base="file:DMR_3.xml"    
+    name="DMR_3"
+    dapVersion="4.0"
+    dmrVersion="1.0">
+    <Byte name="b1">
+        <Dim size="10"/>
+    </Byte>
+</Dataset>   
diff --git a/unit-tests/D4-xml/DMR_3.2_baseline.xml b/unit-tests/D4-xml/DMR_3.2_baseline.xml
new file mode 100644
index 0000000..8a89598
--- /dev/null
+++ b/unit-tests/D4-xml/DMR_3.2_baseline.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:DMR_3.xml" dapVersion="4.0" dmrVersion="1.0" name="DMR_3">
+    <Byte name="b1">
+        <Dim size="10"/>
+    </Byte>
+</Dataset>
diff --git a/unit-tests/D4-xml/DMR_3.3.xml b/unit-tests/D4-xml/DMR_3.3.xml
new file mode 100644
index 0000000..86a8347
--- /dev/null
+++ b/unit-tests/D4-xml/DMR_3.3.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" 
+    xml:base="file:DMR_3.xml"    
+    name="DMR_3"
+    dapVersion="4.0"
+    dmrVersion="1.0">
+    <Dimension name="dim1" size="5"/>
+    <Enumeration name="colors" basetype="Byte">
+        <EnumConst name="red" value="1"/>
+        <EnumConst name="green" value="2"/>
+        <EnumConst name="blue" value="3"/>
+    </Enumeration>
+    <Byte name="b1">
+        <Dim size="20"/>
+        <Dim size="30"/>
+        <Attribute name="test" type="Int16">
+            <Value>1</Value>
+            <Value>2</Value>
+            <Value>3</Value>
+        </Attribute>
+        <Attribute name="DAP4_switches" type="Container">
+            <Attribute name="public_key" type="String">
+                <Value>some_large_hex_value</Value>
+            </Attribute>
+            <Attribute name="colors" type="String">
+                <Value>red</Value>
+                <Value>green</Value>
+                <Value>blue</Value>
+            </Attribute>
+            <Attribute name="temp" type="Float32">
+                <Value>98.6</Value>
+            </Attribute>
+            <Attribute type="OtherXML" name="xmltest">
+                <xml>barf</xml>
+            </Attribute>
+        </Attribute>
+    </Byte>
+</Dataset>   
diff --git a/unit-tests/D4-xml/DMR_3.3_baseline.xml b/unit-tests/D4-xml/DMR_3.3_baseline.xml
new file mode 100644
index 0000000..3dab03f
--- /dev/null
+++ b/unit-tests/D4-xml/DMR_3.3_baseline.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:DMR_3.xml" dapVersion="4.0" dmrVersion="1.0" name="DMR_3">
+    <Dimension name="dim1" size="5"/>
+    <Enumeration name="colors" basetype="Byte">
+        <EnumConst name="red" value="1"/>
+        <EnumConst name="green" value="2"/>
+        <EnumConst name="blue" value="3"/>
+    </Enumeration>
+    <Byte name="b1">
+        <Dim size="20"/>
+        <Dim size="30"/>
+        <Attribute name="test" type="Int16">
+            <Value>1</Value>
+            <Value>2</Value>
+            <Value>3</Value>
+        </Attribute>
+        <Attribute name="DAP4_switches" type="Container">
+            <Attribute name="public_key" type="String">
+                <Value>some_large_hex_value</Value>
+            </Attribute>
+            <Attribute name="colors" type="String">
+                <Value>red</Value>
+                <Value>green</Value>
+                <Value>blue</Value>
+            </Attribute>
+            <Attribute name="temp" type="Float32">
+                <Value>98.6</Value>
+            </Attribute>
+            <Attribute name="xmltest" type="OtherXML">                <xml>barf</xml>            </Attribute>
+        </Attribute>
+    </Byte>
+</Dataset>
diff --git a/unit-tests/D4-xml/DMR_3.4.xml b/unit-tests/D4-xml/DMR_3.4.xml
new file mode 100644
index 0000000..f3e481d
--- /dev/null
+++ b/unit-tests/D4-xml/DMR_3.4.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" 
+    xml:base="file:DMR_3.xml"    
+    name="DMR_3"
+    dapVersion="4.0"
+    dmrVersion="1.0">
+    <Dimension name="dim1" size="5"/>
+    <Enumeration name="colors" basetype="Byte">
+        <EnumConst name="red" value="1"/>
+        <EnumConst name="green" value="2"/>
+        <EnumConst name="blue" value="3"/>
+    </Enumeration>
+    <Byte name="b1">
+        <Dim name="dim1"/>
+        <Dim size="30"/>
+    </Byte>
+</Dataset>
diff --git a/unit-tests/D4-xml/DMR_3.4_baseline.xml b/unit-tests/D4-xml/DMR_3.4_baseline.xml
new file mode 100644
index 0000000..f3dbff2
--- /dev/null
+++ b/unit-tests/D4-xml/DMR_3.4_baseline.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:DMR_3.xml" dapVersion="4.0" dmrVersion="1.0" name="DMR_3">
+    <Dimension name="dim1" size="5"/>
+    <Enumeration name="colors" basetype="Byte">
+        <EnumConst name="red" value="1"/>
+        <EnumConst name="green" value="2"/>
+        <EnumConst name="blue" value="3"/>
+    </Enumeration>
+    <Byte name="b1">
+        <Dim name="/dim1"/>
+        <Dim size="30"/>
+    </Byte>
+</Dataset>
diff --git a/unit-tests/D4-xml/DMR_3.5.xml b/unit-tests/D4-xml/DMR_3.5.xml
new file mode 100644
index 0000000..22f5070
--- /dev/null
+++ b/unit-tests/D4-xml/DMR_3.5.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" 
+    xml:base="file:DMR_3.xml"    
+    name="DMR_3"
+    dapVersion="4.0"
+    dmrVersion="1.0">
+    <Dimension name="dim1" size="5"/>
+    <Enumeration name="colors" basetype="Byte">
+        <EnumConst name="red" value="1"/>
+        <EnumConst name="green" value="2"/>
+        <EnumConst name="blue" value="3"/>
+    </Enumeration>
+    <Byte name="b1">
+        <Dim name="dim1"/>
+        <Dim size="30"/>
+    </Byte>
+    <Group name="g1">
+        <Dimension name="dim1" size="10"/>
+        <Int32 name="thing1">
+            <Dim name="/dim1"/>
+            <Dim name="dim1"/>
+        </Int32>
+        <Int32 name="thing2">
+            <Dim name="/dim1"/>
+            <Dim name="/g1/dim1"/>
+        </Int32>
+        
+        <Group name="g2">
+            <Dimension name="dim1" size="20"/>
+            <Int32 name="thing1">
+                <Dim name="/dim1"/>
+                <Dim name="/g1/dim1"/>
+                <Dim name="dim1"/>
+            </Int32>
+        </Group> 
+        
+        <Int32 name="thing3">
+            <Dim name="/dim1"/>
+            <Dim name="dim1"/>
+            <Dim name="g2/dim1"/>
+        </Int32>
+        
+    </Group>
+</Dataset>
diff --git a/unit-tests/D4-xml/DMR_3.5_baseline.xml b/unit-tests/D4-xml/DMR_3.5_baseline.xml
new file mode 100644
index 0000000..bad1c4f
--- /dev/null
+++ b/unit-tests/D4-xml/DMR_3.5_baseline.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:DMR_3.xml" dapVersion="4.0" dmrVersion="1.0" name="DMR_3">
+    <Dimension name="dim1" size="5"/>
+    <Enumeration name="colors" basetype="Byte">
+        <EnumConst name="red" value="1"/>
+        <EnumConst name="green" value="2"/>
+        <EnumConst name="blue" value="3"/>
+    </Enumeration>
+    <Byte name="b1">
+        <Dim name="/dim1"/>
+        <Dim size="30"/>
+    </Byte>
+    <Group name="g1">
+        <Dimension name="dim1" size="10"/>
+        <Int32 name="thing1">
+            <Dim name="/dim1"/>
+            <Dim name="/g1/dim1"/>
+        </Int32>
+        <Int32 name="thing2">
+            <Dim name="/dim1"/>
+            <Dim name="/g1/dim1"/>
+        </Int32>
+        <Int32 name="thing3">
+            <Dim name="/dim1"/>
+            <Dim name="/g1/dim1"/>
+            <Dim name="/g1/g2/dim1"/>
+        </Int32>
+        <Group name="g2">
+            <Dimension name="dim1" size="20"/>
+            <Int32 name="thing1">
+                <Dim name="/dim1"/>
+                <Dim name="/g1/dim1"/>
+                <Dim name="/g1/g2/dim1"/>
+            </Int32>
+        </Group>
+    </Group>
+</Dataset>
diff --git a/unit-tests/D4-xml/DMR_3.xml b/unit-tests/D4-xml/DMR_3.xml
new file mode 100644
index 0000000..507e117
--- /dev/null
+++ b/unit-tests/D4-xml/DMR_3.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" 
+    xml:base="file:DMR_3.xml"    
+    name="DMR_3"
+    dapVersion="4.0"
+    dmrVersion="1.0">
+    <Dimension name="dim1" size="5"/>
+    <Enumeration name="colors" basetype="Byte">
+        <EnumConst name="red" value="1"/>
+        <EnumConst name="green" value="2"/>
+        <EnumConst name="blue" value="3"/>
+    </Enumeration>
+    <Byte name="b1"/>
+</Dataset>   
diff --git a/unit-tests/D4-xml/DMR_3_baseline.xml b/unit-tests/D4-xml/DMR_3_baseline.xml
new file mode 100644
index 0000000..5ccb2bc
--- /dev/null
+++ b/unit-tests/D4-xml/DMR_3_baseline.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:DMR_3.xml" dapVersion="4.0" dmrVersion="1.0" name="DMR_3">
+    <Dimension name="dim1" size="5"/>
+    <Enumeration name="colors" basetype="Byte">
+        <EnumConst name="red" value="1"/>
+        <EnumConst name="green" value="2"/>
+        <EnumConst name="blue" value="3"/>
+    </Enumeration>
+    <Byte name="b1"/>
+</Dataset>
diff --git a/unit-tests/D4-xml/DMR_4.1.xml b/unit-tests/D4-xml/DMR_4.1.xml
new file mode 100644
index 0000000..16037ad
--- /dev/null
+++ b/unit-tests/D4-xml/DMR_4.1.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" 
+    xml:base="file:DMR_4.1.xml"    
+    name="DMR_4.1"
+    dapVersion="4.0"
+    dmrVersion="1.0">
+    <Dimension name="d1" size="5"/>
+    <Dimension name="d2" size="3"/>
+
+    <Opaque name="o">
+        <Dim name="d1"/>
+    </Opaque>
+
+    <Opaque name="p">
+        <Dim name="d1"/>
+        <Dim name="d2"/>
+    </Opaque>
+    
+</Dataset>
diff --git a/unit-tests/D4-xml/DMR_4.1_baseline.xml b/unit-tests/D4-xml/DMR_4.1_baseline.xml
new file mode 100644
index 0000000..a9c2fc3
--- /dev/null
+++ b/unit-tests/D4-xml/DMR_4.1_baseline.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:DMR_4.1.xml" dapVersion="4.0" dmrVersion="1.0" name="DMR_4.1">
+    <Dimension name="d1" size="5"/>
+    <Dimension name="d2" size="3"/>
+    <Opaque name="o">
+        <Dim name="/d1"/>
+    </Opaque>
+    <Opaque name="p">
+        <Dim name="/d1"/>
+        <Dim name="/d2"/>
+    </Opaque>
+</Dataset>
diff --git a/unit-tests/D4-xml/DMR_4.xml b/unit-tests/D4-xml/DMR_4.xml
new file mode 100644
index 0000000..a32a194
--- /dev/null
+++ b/unit-tests/D4-xml/DMR_4.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" 
+    xml:base="file:DMR_4.xml"    
+    name="DMR_4"
+    dapVersion="4.0"
+    dmrVersion="1.0">
+    <Dimension name="dim1" size="5"/>
+    <Enumeration name="colors" basetype="Byte">
+        <EnumConst name="red" value="1"/>
+        <EnumConst name="green" value="2"/>
+        <EnumConst name="blue" value="3"/>
+    </Enumeration>
+    <Byte name="b1"/>
+    <Char name  ="c1"/>
+    <Int8 name="i8"/>
+    <UInt8 name="ui8"/>
+    <Int16 name="i16"/>
+    <UInt16 name="ui16"/>
+    <Int32 name="i32"/>
+    <UInt32 name="ui32"/>
+    <Int64 name="i64"/>
+    <UInt64 name="ui64"/>
+    <Float32 name="f32"/>
+    <Float64 name="f64"/>
+    <String name="s"/>
+    <URL name="u"/>
+    <Enum name="e" enum="colors"/>
+    <Opaque name="o"/>
+
+</Dataset>   
diff --git a/unit-tests/D4-xml/DMR_4_baseline.xml b/unit-tests/D4-xml/DMR_4_baseline.xml
new file mode 100644
index 0000000..241db52
--- /dev/null
+++ b/unit-tests/D4-xml/DMR_4_baseline.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:DMR_4.xml" dapVersion="4.0" dmrVersion="1.0" name="DMR_4">
+    <Dimension name="dim1" size="5"/>
+    <Enumeration name="colors" basetype="Byte">
+        <EnumConst name="red" value="1"/>
+        <EnumConst name="green" value="2"/>
+        <EnumConst name="blue" value="3"/>
+    </Enumeration>
+    <Byte name="b1"/>
+    <Char name="c1"/>
+    <Int8 name="i8"/>
+    <UInt8 name="ui8"/>
+    <Int16 name="i16"/>
+    <UInt16 name="ui16"/>
+    <Int32 name="i32"/>
+    <UInt32 name="ui32"/>
+    <Int64 name="i64"/>
+    <UInt64 name="ui64"/>
+    <Float32 name="f32"/>
+    <Float64 name="f64"/>
+    <String name="s"/>
+    <URL name="u"/>
+    <Enum name="e" enum="/colors"/>
+    <Opaque name="o"/>
+</Dataset>
diff --git a/unit-tests/D4-xml/DMR_5.1.xml b/unit-tests/D4-xml/DMR_5.1.xml
new file mode 100644
index 0000000..6c39372
--- /dev/null
+++ b/unit-tests/D4-xml/DMR_5.1.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:DMR_5.xml" name="DMR_5"
+    dapVersion="4.0" dmrVersion="1.0">
+    <Dimension name="dim1" size="5"/>
+    <Enumeration name="colors" basetype="Byte">
+        <EnumConst name="red" value="1"/>
+        <EnumConst name="green" value="2"/>
+        <EnumConst name="blue" value="3"/>
+    </Enumeration>
+    <Byte name="b1"/>
+    <Structure name="s">
+        <Int8 name="i8"/>
+        <UInt8 name="ui8">
+            <Attribute name="test" type="Int16">
+                <Value>1</Value>
+                <Value>2</Value>
+                <Value>3</Value>
+            </Attribute>
+            <Attribute name="DAP4_switches" type="Container">
+                <Attribute name="public_key" type="String">
+                    <Value>some_large_hex_value</Value>
+                </Attribute>
+            </Attribute>
+        </UInt8>
+        <Int16 name="i16"/>
+        <UInt16 name="ui16"/>
+        <Int32 name="i32"/>
+        <UInt32 name="ui32"/>
+        <Int64 name="i64"/>
+        <UInt64 name="ui64"/>
+        <Float32 name="f32"/>
+        <Float64 name="f64"/>
+        <String name="s"/>
+        <URL name="u"/>
+        <Attribute name="test" type="Int16">
+            <Value>1</Value>
+            <Value>2</Value>
+            <Value>3</Value>
+        </Attribute>
+        <Attribute name="DAP4_switches" type="Container">
+            <Attribute name="public_key" type="String">
+                <Value>some_large_hex_value</Value>
+            </Attribute>
+            <Attribute name="colors" type="String">
+                <Value>red</Value>
+                <Value>green</Value>
+                <Value>blue</Value>
+            </Attribute>
+            <Attribute name="temp" type="Float32">
+                <Value>98.6</Value>
+            </Attribute>
+        </Attribute>
+    </Structure>
+</Dataset>
diff --git a/unit-tests/D4-xml/DMR_5.1_baseline.xml b/unit-tests/D4-xml/DMR_5.1_baseline.xml
new file mode 100644
index 0000000..26e65f6
--- /dev/null
+++ b/unit-tests/D4-xml/DMR_5.1_baseline.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:DMR_5.xml" dapVersion="4.0" dmrVersion="1.0" name="DMR_5">
+    <Dimension name="dim1" size="5"/>
+    <Enumeration name="colors" basetype="Byte">
+        <EnumConst name="red" value="1"/>
+        <EnumConst name="green" value="2"/>
+        <EnumConst name="blue" value="3"/>
+    </Enumeration>
+    <Byte name="b1"/>
+    <Structure name="s">
+        <Int8 name="i8"/>
+        <UInt8 name="ui8">
+            <Attribute name="test" type="Int16">
+                <Value>1</Value>
+                <Value>2</Value>
+                <Value>3</Value>
+            </Attribute>
+            <Attribute name="DAP4_switches" type="Container">
+                <Attribute name="public_key" type="String">
+                    <Value>some_large_hex_value</Value>
+                </Attribute>
+            </Attribute>
+        </UInt8>
+        <Int16 name="i16"/>
+        <UInt16 name="ui16"/>
+        <Int32 name="i32"/>
+        <UInt32 name="ui32"/>
+        <Int64 name="i64"/>
+        <UInt64 name="ui64"/>
+        <Float32 name="f32"/>
+        <Float64 name="f64"/>
+        <String name="s"/>
+        <URL name="u"/>
+        <Attribute name="test" type="Int16">
+            <Value>1</Value>
+            <Value>2</Value>
+            <Value>3</Value>
+        </Attribute>
+        <Attribute name="DAP4_switches" type="Container">
+            <Attribute name="public_key" type="String">
+                <Value>some_large_hex_value</Value>
+            </Attribute>
+            <Attribute name="colors" type="String">
+                <Value>red</Value>
+                <Value>green</Value>
+                <Value>blue</Value>
+            </Attribute>
+            <Attribute name="temp" type="Float32">
+                <Value>98.6</Value>
+            </Attribute>
+        </Attribute>
+    </Structure>
+</Dataset>
diff --git a/unit-tests/D4-xml/DMR_5.xml b/unit-tests/D4-xml/DMR_5.xml
new file mode 100644
index 0000000..56123a5
--- /dev/null
+++ b/unit-tests/D4-xml/DMR_5.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" 
+    xml:base="file:DMR_5.xml"    
+    name="DMR_5"
+    dapVersion="4.0"
+    dmrVersion="1.0">
+    <Dimension name="dim1" size="5"/>
+    <Enumeration name="colors" basetype="Byte">
+        <EnumConst name="red" value="1"/>
+        <EnumConst name="green" value="2"/>
+        <EnumConst name="blue" value="3"/>
+    </Enumeration>
+    <Byte name="b1"/>
+    <Structure name="s">
+        <Char name="c1"/>
+        <Int8 name="i8"/>
+        <UInt8 name="ui8"/>
+        <Int16 name="i16"/>
+        <UInt16 name="ui16"/>
+        <Int32 name="i32"/>
+        <UInt32 name="ui32"/>
+        <Int64 name="i64"/>
+        <UInt64 name="ui64"/>
+        <Float32 name="f32"/>
+        <Float64 name="f64"/>
+        <String name="s"/>
+        <URL name="u"/>
+        <Enum name="e" enum="colors"/>
+        <Opaque name="o"/>
+    </Structure>
+</Dataset>   
diff --git a/unit-tests/D4-xml/DMR_5_baseline.xml b/unit-tests/D4-xml/DMR_5_baseline.xml
new file mode 100644
index 0000000..000a42e
--- /dev/null
+++ b/unit-tests/D4-xml/DMR_5_baseline.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:DMR_5.xml" dapVersion="4.0" dmrVersion="1.0" name="DMR_5">
+    <Dimension name="dim1" size="5"/>
+    <Enumeration name="colors" basetype="Byte">
+        <EnumConst name="red" value="1"/>
+        <EnumConst name="green" value="2"/>
+        <EnumConst name="blue" value="3"/>
+    </Enumeration>
+    <Byte name="b1"/>
+    <Structure name="s">
+        <Char name="c1"/>
+        <Int8 name="i8"/>
+        <UInt8 name="ui8"/>
+        <Int16 name="i16"/>
+        <UInt16 name="ui16"/>
+        <Int32 name="i32"/>
+        <UInt32 name="ui32"/>
+        <Int64 name="i64"/>
+        <UInt64 name="ui64"/>
+        <Float32 name="f32"/>
+        <Float64 name="f64"/>
+        <String name="s"/>
+        <URL name="u"/>
+        <Enum name="e" enum="/colors"/>
+        <Opaque name="o"/>
+    </Structure>
+</Dataset>
diff --git a/unit-tests/D4-xml/DMR_6.1.xml b/unit-tests/D4-xml/DMR_6.1.xml
new file mode 100644
index 0000000..be73019
--- /dev/null
+++ b/unit-tests/D4-xml/DMR_6.1.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" 
+    xml:base="file:DMR_6.xml"    
+    name="DMR_6"
+    dapVersion="4.0"
+    dmrVersion="1.0">
+    <Dimension name="dim1" size="5"/>
+    <Enumeration name="colors" basetype="Byte">
+        <EnumConst name="red" value="1"/>
+        <EnumConst name="green" value="2"/>
+        <EnumConst name="blue" value="3"/>
+    </Enumeration>
+    <Byte name="b1"/>
+    <Group name="g1">
+        <Attribute name="test" type="Int16">
+            <Value>1</Value>
+            <Value>2</Value>
+            <Value>3</Value>
+        </Attribute>
+        <Int8 name="i8"/>
+        <Structure name="s">
+            <Int16 name="i16"/>
+            <UInt16 name="ui16"/>
+            <URL name="u"/>
+        </Structure>        
+    </Group>
+    <Group name="g2">
+        <String name="s"/>
+        <Group name="gg2">
+            <Attribute name="test" type="Int16">
+                <Value>1</Value>
+                <Value>2</Value>
+                <Value>3</Value>
+            </Attribute>
+            <Float64 name="f64"/>
+            <Structure name="s">
+                <Int32 name="i16"/>
+                <UInt32 name="ui16"/>
+                <URL name="u"/>
+            </Structure>
+        </Group>
+    </Group>
+</Dataset>   
diff --git a/unit-tests/D4-xml/DMR_6.1_baseline.xml b/unit-tests/D4-xml/DMR_6.1_baseline.xml
new file mode 100644
index 0000000..267b76a
--- /dev/null
+++ b/unit-tests/D4-xml/DMR_6.1_baseline.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:DMR_6.xml" dapVersion="4.0" dmrVersion="1.0" name="DMR_6">
+    <Dimension name="dim1" size="5"/>
+    <Enumeration name="colors" basetype="Byte">
+        <EnumConst name="red" value="1"/>
+        <EnumConst name="green" value="2"/>
+        <EnumConst name="blue" value="3"/>
+    </Enumeration>
+    <Byte name="b1"/>
+    <Group name="g1">
+        <Int8 name="i8"/>
+        <Structure name="s">
+            <Int16 name="i16"/>
+            <UInt16 name="ui16"/>
+            <URL name="u"/>
+        </Structure>
+        <Attribute name="test" type="Int16">
+            <Value>1</Value>
+            <Value>2</Value>
+            <Value>3</Value>
+        </Attribute>
+    </Group>
+    <Group name="g2">
+        <String name="s"/>
+        <Group name="gg2">
+            <Float64 name="f64"/>
+            <Structure name="s">
+                <Int32 name="i16"/>
+                <UInt32 name="ui16"/>
+                <URL name="u"/>
+            </Structure>
+            <Attribute name="test" type="Int16">
+                <Value>1</Value>
+                <Value>2</Value>
+                <Value>3</Value>
+            </Attribute>
+        </Group>
+    </Group>
+</Dataset>
diff --git a/unit-tests/D4-xml/DMR_6.2.xml b/unit-tests/D4-xml/DMR_6.2.xml
new file mode 100644
index 0000000..dbccdd7
--- /dev/null
+++ b/unit-tests/D4-xml/DMR_6.2.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" 
+    xml:base="file:DMR_6.2.xml"    
+    name="DMR_6.2"
+    dapVersion="4.0"
+    dmrVersion="1.0">
+    <Dimension name="dim1" size="5"/>
+    <Enumeration name="colors" basetype="Byte">
+        <EnumConst name="red" value="1"/>
+        <EnumConst name="green" value="2"/>
+        <EnumConst name="blue" value="3"/>
+    </Enumeration>
+    
+    <Enum name="e" enum="colors"/>
+    
+    <Byte name="b1"/>
+    <Group name="g1">
+        <Attribute name="test" type="Int16">
+            <Value>1</Value>
+            <Value>2</Value>
+            <Value>3</Value>
+        </Attribute>
+        
+        <Enum name="e" enum="/colors"/>
+        
+    </Group>
+     <Group name="g2">
+        <Enumeration name="shades" basetype="UInt16">
+            <EnumConst name="white" value="1"/>
+            <EnumConst name="light" value="2"/>
+            <EnumConst name="med" value="3"/>
+            <EnumConst name="dark" value="4"/>
+            <EnumConst name="black" value="5"/>
+        </Enumeration>
+    
+        <Enum name="e" enum="shades"/>
+        
+        <Group name="gg2">
+            <Attribute name="test" type="Int16">
+                <Value>1</Value>
+                <Value>2</Value>
+                <Value>3</Value>
+            </Attribute>
+
+            <Enum name="e" enum="/g2/shades"/>
+
+        </Group>
+    </Group>
+</Dataset>   
diff --git a/unit-tests/D4-xml/DMR_6.2_baseline.xml b/unit-tests/D4-xml/DMR_6.2_baseline.xml
new file mode 100644
index 0000000..4b9d365
--- /dev/null
+++ b/unit-tests/D4-xml/DMR_6.2_baseline.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:DMR_6.2.xml" dapVersion="4.0" dmrVersion="1.0" name="DMR_6.2">
+    <Dimension name="dim1" size="5"/>
+    <Enumeration name="colors" basetype="Byte">
+        <EnumConst name="red" value="1"/>
+        <EnumConst name="green" value="2"/>
+        <EnumConst name="blue" value="3"/>
+    </Enumeration>
+    <Enum name="e" enum="/colors"/>
+    <Byte name="b1"/>
+    <Group name="g1">
+        <Enum name="e" enum="/colors"/>
+        <Attribute name="test" type="Int16">
+            <Value>1</Value>
+            <Value>2</Value>
+            <Value>3</Value>
+        </Attribute>
+    </Group>
+    <Group name="g2">
+        <Enumeration name="shades" basetype="UInt16">
+            <EnumConst name="white" value="1"/>
+            <EnumConst name="light" value="2"/>
+            <EnumConst name="med" value="3"/>
+            <EnumConst name="dark" value="4"/>
+            <EnumConst name="black" value="5"/>
+        </Enumeration>
+        <Enum name="e" enum="/g2/shades"/>
+        <Group name="gg2">
+            <Enum name="e" enum="/g2/shades"/>
+            <Attribute name="test" type="Int16">
+                <Value>1</Value>
+                <Value>2</Value>
+                <Value>3</Value>
+            </Attribute>
+        </Group>
+    </Group>
+</Dataset>
diff --git a/unit-tests/D4-xml/DMR_6.xml b/unit-tests/D4-xml/DMR_6.xml
new file mode 100644
index 0000000..791ac74
--- /dev/null
+++ b/unit-tests/D4-xml/DMR_6.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" 
+    xml:base="file:DMR_6.xml"    
+    name="DMR_6"
+    dapVersion="4.0"
+    dmrVersion="1.0">
+    <Dimension name="dim1" size="5"/>
+    <Enumeration name="colors" basetype="Byte">
+        <EnumConst name="red" value="1"/>
+        <EnumConst name="green" value="2"/>
+        <EnumConst name="blue" value="3"/>
+    </Enumeration>
+    <Byte name="b1"/>
+    <Group name="g1">
+        <Int8 name="i8"/>
+        <Structure name="s">
+            <Int16 name="i16"/>
+            <UInt16 name="ui16"/>
+            <URL name="u"/>
+        </Structure>        
+    </Group>
+    <Group name="g2">
+        <String name="s"/>
+        <Group name="gg2">
+            <Float64 name="f64"/>
+            <Structure name="s">
+                <Int32 name="i16"/>
+                <UInt32 name="ui16"/>
+                <URL name="u"/>
+            </Structure>
+        </Group>
+    </Group>
+</Dataset>   
diff --git a/unit-tests/D4-xml/DMR_6_baseline.xml b/unit-tests/D4-xml/DMR_6_baseline.xml
new file mode 100644
index 0000000..1d972ed
--- /dev/null
+++ b/unit-tests/D4-xml/DMR_6_baseline.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:DMR_6.xml" dapVersion="4.0" dmrVersion="1.0" name="DMR_6">
+    <Dimension name="dim1" size="5"/>
+    <Enumeration name="colors" basetype="Byte">
+        <EnumConst name="red" value="1"/>
+        <EnumConst name="green" value="2"/>
+        <EnumConst name="blue" value="3"/>
+    </Enumeration>
+    <Byte name="b1"/>
+    <Group name="g1">
+        <Int8 name="i8"/>
+        <Structure name="s">
+            <Int16 name="i16"/>
+            <UInt16 name="ui16"/>
+            <URL name="u"/>
+        </Structure>
+    </Group>
+    <Group name="g2">
+        <String name="s"/>
+        <Group name="gg2">
+            <Float64 name="f64"/>
+            <Structure name="s">
+                <Int32 name="i16"/>
+                <UInt32 name="ui16"/>
+                <URL name="u"/>
+            </Structure>
+        </Group>
+    </Group>
+</Dataset>
diff --git a/unit-tests/D4-xml/DMR_7.1.xml b/unit-tests/D4-xml/DMR_7.1.xml
new file mode 100644
index 0000000..3e06b06
--- /dev/null
+++ b/unit-tests/D4-xml/DMR_7.1.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" 
+    xml:base="file:DMR_1.xml"    
+    name="DMR_1"
+    dapVersion="4.0"
+    dmrVersion="1.0">
+    <Dimension name="dim1" size="5"/>
+    <Dimension name="dim2" size="3"/>
+    <Byte name="a">
+        <Dim name="dim1"/>
+    </Byte>
+    <Char name="a1">
+        <Dim name="dim1"/>
+    </Char>
+    <Int8 name="b">
+        <Dim name="dim1"/>
+    </Int8>
+    <UInt8 name="c">
+        <Dim name="dim1"/>
+        <Dim name="dim2"/>
+    </UInt8>
+    <Int16 name="d">
+        <Dim name="dim1"/>
+    </Int16>
+    <UInt16 name="e">
+        <Dim size="10"/>
+    </UInt16>
+    <Int32 name="f">
+        <Dim name="dim1"/>
+    </Int32>
+    <UInt32 name="g">
+        <Dim name="dim1"/>
+    </UInt32>
+    <Int64 name="h">
+        <Dim name="dim1"/>
+    </Int64>
+    <UInt64 name="i">
+        <Dim name="dim1"/>
+    </UInt64>
+    <Float32 name="j">
+        <Dim name="dim1"/>
+    </Float32>
+    <Float64 name="k">
+        <Dim name="dim1"/>
+    </Float64>
+    
+</Dataset>   
diff --git a/unit-tests/D4-xml/DMR_7.1_baseline.xml b/unit-tests/D4-xml/DMR_7.1_baseline.xml
new file mode 100644
index 0000000..33899c2
--- /dev/null
+++ b/unit-tests/D4-xml/DMR_7.1_baseline.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:DMR_1.xml" dapVersion="4.0" dmrVersion="1.0" name="DMR_1">
+    <Dimension name="dim1" size="5"/>
+    <Dimension name="dim2" size="3"/>
+    <Byte name="a">
+        <Dim name="/dim1"/>
+    </Byte>
+    <Char name="a1">
+        <Dim name="/dim1"/>
+    </Char>
+    <Int8 name="b">
+        <Dim name="/dim1"/>
+    </Int8>
+    <UInt8 name="c">
+        <Dim name="/dim1"/>
+        <Dim name="/dim2"/>
+    </UInt8>
+    <Int16 name="d">
+        <Dim name="/dim1"/>
+    </Int16>
+    <UInt16 name="e">
+        <Dim size="10"/>
+    </UInt16>
+    <Int32 name="f">
+        <Dim name="/dim1"/>
+    </Int32>
+    <UInt32 name="g">
+        <Dim name="/dim1"/>
+    </UInt32>
+    <Int64 name="h">
+        <Dim name="/dim1"/>
+    </Int64>
+    <UInt64 name="i">
+        <Dim name="/dim1"/>
+    </UInt64>
+    <Float32 name="j">
+        <Dim name="/dim1"/>
+    </Float32>
+    <Float64 name="k">
+        <Dim name="/dim1"/>
+    </Float64>
+</Dataset>
diff --git a/unit-tests/D4-xml/DMR_7.2.xml b/unit-tests/D4-xml/DMR_7.2.xml
new file mode 100644
index 0000000..a52c3f8
--- /dev/null
+++ b/unit-tests/D4-xml/DMR_7.2.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" 
+    xml:base="file:DMR_1.xml"    
+    name="DMR_1"
+    dapVersion="4.0"
+    dmrVersion="1.0">
+    <Dimension name="dim1" size="5"/>
+    <Dimension name="dim2" size="3"/>
+
+    <Enumeration name="colors" basetype="Byte">
+        <EnumConst name="red" value="1"/>
+        <EnumConst name="green" value="2"/>
+        <EnumConst name="blue" value="3"/>
+    </Enumeration>
+    
+    <String name="a">
+        <Dim name="dim1"/>
+    </String>
+    <URL name="b">
+        <Dim name="dim1"/>
+    </URL>
+</Dataset>   
diff --git a/unit-tests/D4-xml/DMR_7.2_baseline.xml b/unit-tests/D4-xml/DMR_7.2_baseline.xml
new file mode 100644
index 0000000..a79b45c
--- /dev/null
+++ b/unit-tests/D4-xml/DMR_7.2_baseline.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:DMR_1.xml" dapVersion="4.0" dmrVersion="1.0" name="DMR_1">
+    <Dimension name="dim1" size="5"/>
+    <Dimension name="dim2" size="3"/>
+    <Enumeration name="colors" basetype="Byte">
+        <EnumConst name="red" value="1"/>
+        <EnumConst name="green" value="2"/>
+        <EnumConst name="blue" value="3"/>
+    </Enumeration>
+    <String name="a">
+        <Dim name="/dim1"/>
+    </String>
+    <URL name="b">
+        <Dim name="/dim1"/>
+    </URL>
+</Dataset>
diff --git a/unit-tests/D4-xml/DMR_7.3.xml b/unit-tests/D4-xml/DMR_7.3.xml
new file mode 100644
index 0000000..409ebec
--- /dev/null
+++ b/unit-tests/D4-xml/DMR_7.3.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" 
+    xml:base="file:DMR_7.3.xml"    
+    name="DMR_1"
+    dapVersion="4.0"
+    dmrVersion="1.0">
+    <Dimension name="dim1" size="5"/>
+    <Dimension name="dim2" size="3"/>
+
+    <Enumeration name="colors" basetype="Byte">
+        <EnumConst name="red" value="1"/>
+        <EnumConst name="green" value="2"/>
+        <EnumConst name="blue" value="3"/>
+    </Enumeration>
+    
+    <String name="a">
+        <Dim name="dim1"/>
+    </String>
+    <URL name="b">
+        <Dim name="dim1"/>
+    </URL>
+    
+    <Int8 name="c">
+        <Dim name="dim1"/>
+    </Int8>
+    
+    <UInt8 name="d">
+        <Dim name="dim1"/>
+    </UInt8>
+    
+    <Int64 name="e">
+        <Dim name="dim1"/>
+    </Int64>
+    
+    <UInt64 name="f">
+        <Dim name="dim1"/>
+    </UInt64>
+</Dataset>   
diff --git a/unit-tests/D4-xml/DMR_7.3_baseline.xml b/unit-tests/D4-xml/DMR_7.3_baseline.xml
new file mode 100644
index 0000000..e1df792
--- /dev/null
+++ b/unit-tests/D4-xml/DMR_7.3_baseline.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:DMR_7.3.xml" dapVersion="4.0" dmrVersion="1.0" name="DMR_1">
+    <Dimension name="dim1" size="5"/>
+    <Dimension name="dim2" size="3"/>
+    <Enumeration name="colors" basetype="Byte">
+        <EnumConst name="red" value="1"/>
+        <EnumConst name="green" value="2"/>
+        <EnumConst name="blue" value="3"/>
+    </Enumeration>
+    <String name="a">
+        <Dim name="/dim1"/>
+    </String>
+    <URL name="b">
+        <Dim name="/dim1"/>
+    </URL>
+    <Int8 name="c">
+        <Dim name="/dim1"/>
+    </Int8>
+    <UInt8 name="d">
+        <Dim name="/dim1"/>
+    </UInt8>
+    <Int64 name="e">
+        <Dim name="/dim1"/>
+    </Int64>
+    <UInt64 name="f">
+        <Dim name="/dim1"/>
+    </UInt64>
+</Dataset>
diff --git a/unit-tests/D4-xml/DMR_7.4.xml b/unit-tests/D4-xml/DMR_7.4.xml
new file mode 100644
index 0000000..0a6993f
--- /dev/null
+++ b/unit-tests/D4-xml/DMR_7.4.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" 
+    xml:base="file:DMR_7.4.xml"    
+    name="DMR_1"
+    dapVersion="4.0"
+    dmrVersion="1.0">
+    <Dimension name="dim1" size="5"/>
+    <Dimension name="dim2" size="3"/>
+
+    <Structure name="s">
+        <Dim name="dim1"/>
+
+        <Int32 name="i"/>
+        <Int32 name="j"/> 
+    </Structure>
+
+    <Structure name="t">
+        <Int32 name="i"/>
+            
+        <String name="a">
+            <Dim size="3"/>
+        </String>
+        
+        <Dim name="dim1"/>
+    </Structure>
+
+    <Structure name="u">
+        <Int32 name="i"/>
+        
+        <String name="a">
+            <Dim size="3"/>
+        </String>
+        
+        <Dim name="dim1"/>
+        <Dim name="dim2"/>
+    </Structure>
+    
+    <Structure name="v">
+        <Int32 name="i"/>
+        
+        <String name="a">
+            <Dim size="3"/>
+        </String>
+        
+        <Structure name="w">
+            <Int32 name="i"/>
+            
+            <String name="a">
+                <Dim size="3"/>
+            </String>
+            
+            <Dim name="dim1"/>
+            <Dim name="dim2"/>
+        </Structure>
+        
+        
+        <Dim name="dim1"/>
+        <Dim size="2"/>
+    </Structure>
+    
+    
+</Dataset>   
diff --git a/unit-tests/D4-xml/DMR_7.4_baseline.xml b/unit-tests/D4-xml/DMR_7.4_baseline.xml
new file mode 100644
index 0000000..6c5d5de
--- /dev/null
+++ b/unit-tests/D4-xml/DMR_7.4_baseline.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:DMR_7.4.xml" dapVersion="4.0" dmrVersion="1.0" name="DMR_1">
+    <Dimension name="dim1" size="5"/>
+    <Dimension name="dim2" size="3"/>
+    <Structure name="s">
+        <Int32 name="i"/>
+        <Int32 name="j"/>
+        <Dim name="/dim1"/>
+    </Structure>
+    <Structure name="t">
+        <Int32 name="i"/>
+        <String name="a">
+            <Dim size="3"/>
+        </String>
+        <Dim name="/dim1"/>
+    </Structure>
+    <Structure name="u">
+        <Int32 name="i"/>
+        <String name="a">
+            <Dim size="3"/>
+        </String>
+        <Dim name="/dim1"/>
+        <Dim name="/dim2"/>
+    </Structure>
+    <Structure name="v">
+        <Int32 name="i"/>
+        <String name="a">
+            <Dim size="3"/>
+        </String>
+        <Structure name="w">
+            <Int32 name="i"/>
+            <String name="a">
+                <Dim size="3"/>
+            </String>
+            <Dim name="/dim1"/>
+            <Dim name="/dim2"/>
+        </Structure>
+        <Dim name="/dim1"/>
+        <Dim size="2"/>
+    </Structure>
+</Dataset>
diff --git a/unit-tests/D4-xml/DMR_7.5.xml b/unit-tests/D4-xml/DMR_7.5.xml
new file mode 100644
index 0000000..8ea8ed2
--- /dev/null
+++ b/unit-tests/D4-xml/DMR_7.5.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" 
+    xml:base="file:DMR_1.xml"    
+    name="DMR_1"
+    dapVersion="4.0"
+    dmrVersion="1.0">
+    <Dimension name="dim1" size="5"/>
+    <Dimension name="dim2" size="3"/>
+
+    <Enumeration name="colors" basetype="Byte">
+        <EnumConst name="red" value="1"/>
+        <EnumConst name="green" value="2"/>
+        <EnumConst name="blue" value="3"/>
+    </Enumeration>
+    
+    <Enum name="e" enum="colors">
+        <Dim name="dim1"/>
+    </Enum>
+    
+    <Opaque name="o">
+        <Dim name="dim1"/>
+    </Opaque>
+</Dataset>   
diff --git a/unit-tests/D4-xml/DMR_7.5_baseline.xml b/unit-tests/D4-xml/DMR_7.5_baseline.xml
new file mode 100644
index 0000000..ab6537d
--- /dev/null
+++ b/unit-tests/D4-xml/DMR_7.5_baseline.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:DMR_1.xml" dapVersion="4.0" dmrVersion="1.0" name="DMR_1">
+    <Dimension name="dim1" size="5"/>
+    <Dimension name="dim2" size="3"/>
+    <Enumeration name="colors" basetype="Byte">
+        <EnumConst name="red" value="1"/>
+        <EnumConst name="green" value="2"/>
+        <EnumConst name="blue" value="3"/>
+    </Enumeration>
+    <Enum name="e" enum="/colors">
+        <Dim name="/dim1"/>
+    </Enum>
+    <Opaque name="o">
+        <Dim name="/dim1"/>
+    </Opaque>
+</Dataset>
diff --git a/unit-tests/D4-xml/DMR_7.xml b/unit-tests/D4-xml/DMR_7.xml
new file mode 100644
index 0000000..2f354d0
--- /dev/null
+++ b/unit-tests/D4-xml/DMR_7.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" 
+    xml:base="file:DMR_1.xml"    
+    name="DMR_1"
+    dapVersion="4.0"
+    dmrVersion="1.0">
+    <Dimension name="dim1" size="5"/>
+    <Byte name="b1">
+        <Dim name="dim1"/>
+    </Byte>
+</Dataset>   
diff --git a/unit-tests/D4-xml/DMR_7_baseline.xml b/unit-tests/D4-xml/DMR_7_baseline.xml
new file mode 100644
index 0000000..444446b
--- /dev/null
+++ b/unit-tests/D4-xml/DMR_7_baseline.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:DMR_1.xml" dapVersion="4.0" dmrVersion="1.0" name="DMR_1">
+    <Dimension name="dim1" size="5"/>
+    <Byte name="b1">
+        <Dim name="/dim1"/>
+    </Byte>
+</Dataset>
diff --git a/unit-tests/D4-xml/DMR_8.xml b/unit-tests/D4-xml/DMR_8.xml
new file mode 100644
index 0000000..f2e1696
--- /dev/null
+++ b/unit-tests/D4-xml/DMR_8.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" 
+    xml:base="file:DMR_8.xml"    
+    name="DMR_8"
+    dapVersion="4.0"
+    dmrVersion="1.0">
+    <Dimension name="x-axis" size="5"/>
+    <Float32 name="x">
+        <Dim name="x-axis"/>
+    </Float32>
+    
+    <Byte name="b1">
+        <Dim name="x-axis"/>
+        <Map name="x"/>
+    </Byte>
+    
+</Dataset>   
diff --git a/unit-tests/D4-xml/DMR_8_baseline.xml b/unit-tests/D4-xml/DMR_8_baseline.xml
new file mode 100644
index 0000000..840138b
--- /dev/null
+++ b/unit-tests/D4-xml/DMR_8_baseline.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:DMR_8.xml" dapVersion="4.0" dmrVersion="1.0" name="DMR_8">
+    <Dimension name="x-axis" size="5"/>
+    <Float32 name="x">
+        <Dim name="/x-axis"/>
+    </Float32>
+    <Byte name="b1">
+        <Dim name="/x-axis"/>
+        <Map name="/x"/>
+    </Byte>
+</Dataset>
diff --git a/unit-tests/D4-xml/DMR_empty.xml b/unit-tests/D4-xml/DMR_empty.xml
new file mode 100644
index 0000000..de5758f
--- /dev/null
+++ b/unit-tests/D4-xml/DMR_empty.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!-- This is the smallest DMR possible -->
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" 
+    xml:base="file:DMR_empty.xml"
+    name="DMR_empty" dapVersion="4.0" dmrVersion="1.0">
+    
+</Dataset>
diff --git a/unit-tests/D4-xml/DMR_empty_baseline.xml b/unit-tests/D4-xml/DMR_empty_baseline.xml
new file mode 100644
index 0000000..d862eca
--- /dev/null
+++ b/unit-tests/D4-xml/DMR_empty_baseline.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:DMR_empty.xml" dapVersion="4.0" dmrVersion="1.0" name="DMR_empty"/>
diff --git a/unit-tests/D4-xml/Data_DMR_3.xml b/unit-tests/D4-xml/Data_DMR_3.xml
new file mode 100644
index 0000000..d68ebf1
--- /dev/null
+++ b/unit-tests/D4-xml/Data_DMR_3.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" 
+    xml:base="file:DMR_3.xml"    
+    name="DMR_3"
+    dapVersion="4.0"
+    dmrVersion="1.0">
+    <Dimension name="dim1" size="5"/>
+    <Enumeration name="colors" basetype="Byte">
+        <EnumConst name="red" value="1"/>
+        <EnumConst name="green" value="2"/>
+        <EnumConst name="blue" value="3"/>
+    </Enumeration>
+    <Byte name="b1"/>
+</Dataset>
+
+
+some more binary goo...
diff --git a/unit-tests/D4-xml/README b/unit-tests/D4-xml/README
new file mode 100644
index 0000000..c54a66b
--- /dev/null
+++ b/unit-tests/D4-xml/README
@@ -0,0 +1,10 @@
+README
+
+ Created on: Apr 1, 2013
+     Author: jimg
+
+This directory holds xml files that are the baselines for various unit test
+for the new DAP4 types and ancillary classes.
+
+And some other stuff I've added... 10/15/14
+
diff --git a/unit-tests/D4-xml/coads_climatology.nc.xml b/unit-tests/D4-xml/coads_climatology.nc.xml
new file mode 100644
index 0000000..06c4f3e
--- /dev/null
+++ b/unit-tests/D4-xml/coads_climatology.nc.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="coads_climatology.nc">
+    <Dimension name="TIME" size="12"/>
+    <Dimension name="COADSY" size="90"/>
+    <Dimension name="COADSX" size="180"/>
+    <Float64 name="TIME">
+        <Dim name="/TIME"/>
+    </Float64>
+    <Float64 name="COADSY">
+        <Dim name="/COADSY"/>
+    </Float64>
+    <Float64 name="COADSX">
+        <Dim name="/COADSX"/>
+    </Float64>
+    <Float32 name="SST">
+        <Dim name="/TIME"/>
+        <Dim name="/COADSY"/>
+        <Dim name="/COADSX"/>
+        <Attribute name="missing_value" type="Byte">
+            <Value>-9.999999790e+33</Value>
+        </Attribute>
+        <Attribute name="_FillValue" type="Byte">
+            <Value>-9.999999790e+33</Value>
+        </Attribute>
+        <Attribute name="long_name" type="String">
+            <Value>SEA SURFACE TEMPERATURE</Value>
+        </Attribute>
+        <Attribute name="history" type="String">
+            <Value>From coads_climatology</Value>
+        </Attribute>
+        <Attribute name="units" type="String">
+            <Value>Deg C</Value>
+        </Attribute>
+        <Map name="TIME"/>
+        <Map name="COADSY"/>
+        <Map name="COADSX"/>
+    </Float32>
+    <Float32 name="AIRT">
+        <Dim name="/TIME"/>
+        <Dim name="/COADSY"/>
+        <Dim name="/COADSX"/>
+        <Attribute name="missing_value" type="Byte">
+            <Value>-9.999999790e+33</Value>
+        </Attribute>
+        <Attribute name="_FillValue" type="Byte">
+            <Value>-9.999999790e+33</Value>
+        </Attribute>
+        <Attribute name="long_name" type="String">
+            <Value>AIR TEMPERATURE</Value>
+        </Attribute>
+        <Attribute name="history" type="String">
+            <Value>From coads_climatology</Value>
+        </Attribute>
+        <Attribute name="units" type="String">
+            <Value>DEG C</Value>
+        </Attribute>
+        <Map name="TIME"/>
+        <Map name="COADSY"/>
+        <Map name="COADSX"/>
+    </Float32>
+    <Float32 name="UWND">
+        <Dim name="/TIME"/>
+        <Dim name="/COADSY"/>
+        <Dim name="/COADSX"/>
+        <Attribute name="missing_value" type="Byte">
+            <Value>-9.999999790e+33</Value>
+        </Attribute>
+        <Attribute name="_FillValue" type="Byte">
+            <Value>-9.999999790e+33</Value>
+        </Attribute>
+        <Attribute name="long_name" type="String">
+            <Value>ZONAL WIND</Value>
+        </Attribute>
+        <Attribute name="history" type="String">
+            <Value>From coads_climatology</Value>
+        </Attribute>
+        <Attribute name="units" type="String">
+            <Value>M/S</Value>
+        </Attribute>
+        <Map name="TIME"/>
+        <Map name="COADSY"/>
+        <Map name="COADSX"/>
+    </Float32>
+    <Float32 name="VWND">
+        <Dim name="/TIME"/>
+        <Dim name="/COADSY"/>
+        <Dim name="/COADSX"/>
+        <Attribute name="missing_value" type="Byte">
+            <Value>-9.999999790e+33</Value>
+        </Attribute>
+        <Attribute name="_FillValue" type="Byte">
+            <Value>-9.999999790e+33</Value>
+        </Attribute>
+        <Attribute name="long_name" type="String">
+            <Value>MERIDIONAL WIND</Value>
+        </Attribute>
+        <Attribute name="history" type="String">
+            <Value>From coads_climatology</Value>
+        </Attribute>
+        <Attribute name="units" type="String">
+            <Value>M/S</Value>
+        </Attribute>
+        <Map name="TIME"/>
+        <Map name="COADSY"/>
+        <Map name="COADSX"/>
+    </Float32>
+    <Attribute name="NC_GLOBAL" type="Container">
+        <Attribute name="history" type="String">
+            <Value>FERRET V4.30 (debug/no GUI) 15-Aug-96</Value>
+        </Attribute>
+    </Attribute>
+    <Attribute name="DODS_EXTRA" type="Container">
+        <Attribute name="Unlimited_Dimension" type="String">
+            <Value>TIME</Value>
+        </Attribute>
+    </Attribute>
+</Dataset>
+
diff --git a/unit-tests/D4AsyncDocTest.cc b/unit-tests/D4AsyncDocTest.cc
new file mode 100644
index 0000000..dadbcec
--- /dev/null
+++ b/unit-tests/D4AsyncDocTest.cc
@@ -0,0 +1,367 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#include "config.h"
+
+#include <cppunit/TextTestRunner.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+#include <cppunit/extensions/HelperMacros.h>
+
+//#define DODS_DEBUG
+
+#include <GetOpt.h>
+#include <GNURegex.h>
+#include <util.h>
+#include <debug.h>
+
+#include "D4AsyncUtil.h"
+#include "XMLWriter.h"
+#include "debug.h"
+
+#include "testFile.h"
+#include "test_config.h"
+
+using namespace CppUnit;
+using namespace std;
+using namespace libdap;
+
+static bool debug = false;
+
+#undef DBG
+#define DBG(x) do { if (debug) (x); } while(false);
+
+class D4AsyncDocTest: public TestFixture {
+private:
+    XMLWriter *xml;
+
+public:
+    D4AsyncDocTest() :
+        xml(0)
+    {
+    }
+
+    ~D4AsyncDocTest()
+    {
+    }
+
+    void setUp()
+    {
+        xml = new XMLWriter;
+
+    }
+
+    void tearDown()
+    {
+        delete xml;
+    }
+
+    // An empty D4Dimensions object prints nothing; the XMLWriter class adds
+    // a xml doc preface.
+    void test_async_required()
+    {
+        DBG(cerr << endl << " ---- test_async_required - BEGIN" << endl);
+
+        D4AsyncUtil dau;
+        DBG(cerr << endl);
+
+        string *stylesheet_ref = 0;
+
+        dau.writeD4AsyncRequired(*xml, 6001, 600007, stylesheet_ref);
+
+        string doc = xml->get_doc();
+        DBG(cerr << "[test_async_required - candidate doc]" << endl << doc << endl);
+
+        string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4AsyncRequired.xml");
+        DBG(cerr << "[test_async_required - baseline doc]" << endl << baseline << endl);
+        CPPUNIT_ASSERT(doc == baseline);
+
+        DBG(cerr << endl << " ---- test_async_required - END" << endl);
+    }
+
+    // An empty D4Dimensions object prints nothing; the XMLWriter class adds
+    // a xml doc preface.
+    void test_async_required_with_stylesheet_ref()
+    {
+        DBG(cerr << endl << " ---- test_async_required - BEGIN" << endl);
+
+        D4AsyncUtil dau;
+        DBG(cerr << endl);
+
+        string stylesheet_ref = "http://someServer:8080/opendap/xsl/asyncResponse.xsl";
+
+        dau.writeD4AsyncRequired(*xml, 6001, 600007, &stylesheet_ref);
+
+        string doc = xml->get_doc();
+        DBG(cerr << "[test_async_required - candidate doc]" << endl << doc << endl);
+
+        string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4AsyncRequired_StyleRef.xml");
+        DBG(cerr << "[test_async_required - baseline doc]" << endl << baseline << endl);
+        CPPUNIT_ASSERT(doc == baseline);
+
+        DBG(cerr << endl << " ---- test_async_required - END" << endl);
+    }
+
+    // An empty D4Dimensions object prints nothing; the XMLWriter class adds
+    // a xml doc preface.
+    void test_async_accepted()
+    {
+        DBG(cerr << endl << " ---- test_async_accepted - BEGIN" << endl);
+
+        D4AsyncUtil dau;
+        DBG(cerr << endl);
+
+        string stylesheet_ref = "http://someServer:8080/opendap/xsl/asyncResponse.xsl";
+
+        dau.writeD4AsyncAccepted(*xml, 6003, 600009,
+            "http://test.opendap.org:8080/opendap/storedResults/result_87697163.dap");
+
+        string doc = xml->get_doc();
+        DBG(cerr << "[test_async_accepted - candidate doc]" << endl << doc << endl);
+
+        string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4AsyncAccepted.xml");
+        DBG(cerr << "[test_async_accepted - baseline doc]" << endl << baseline << endl);
+        CPPUNIT_ASSERT(doc == baseline);
+        DBG(cerr << endl << " ---- test_async_accepted - END" << endl);
+    }
+
+    // An empty D4Dimensions object prints nothing; the XMLWriter class adds
+    // a xml doc preface.
+    void test_async_accepted_with_stylesheet_ref()
+    {
+        DBG(cerr << endl << " ---- test_async_accepted - BEGIN" << endl);
+
+        D4AsyncUtil dau;
+        DBG(cerr << endl);
+        string stylesheet_ref = "http://someServer:8080/opendap/xsl/asyncResponse.xsl";
+
+        dau.writeD4AsyncAccepted(*xml, 6003, 600009,
+            "http://test.opendap.org:8080/opendap/storedResults/result_87697163.dap", &stylesheet_ref);
+
+        string doc = xml->get_doc();
+        DBG(cerr << "[test_async_accepted - candidate doc]" << endl << doc << endl);
+
+        string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4AsyncAccepted_StyleRef.xml");
+        DBG(cerr << "[test_async_accepted - baseline doc]" << endl << baseline << endl);
+        CPPUNIT_ASSERT(doc == baseline);
+        DBG(cerr << endl << " ---- test_async_accepted - END" << endl);
+    }
+
+    // An empty D4Dimensions object prints nothing; the XMLWriter class adds
+    // a xml doc preface.
+    void test_async_pending()
+    {
+        DBG(cerr << endl << " ---- test_async_pending - BEGIN" << endl);
+
+        D4AsyncUtil dau;
+        DBG(cerr << endl);
+
+        dau.writeD4AsyncPending(*xml);
+
+        string doc = xml->get_doc();
+        DBG(cerr << "[test_async_pending - candidate doc]" << endl << doc << endl);
+
+        string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4AsyncPending.xml");
+        DBG(cerr << "[test_async_pending - baseline doc]" << endl << baseline << endl);
+        CPPUNIT_ASSERT(doc == baseline);
+        DBG(cerr << endl << " ---- test_async_pending - END" << endl);
+    }
+
+    // An empty D4Dimensions object prints nothing; the XMLWriter class adds
+    // a xml doc preface.
+    void test_async_pending_with_stylesheet_ref()
+    {
+        DBG(cerr << endl << " ---- test_async_pending - BEGIN" << endl);
+
+        D4AsyncUtil dau;
+        DBG(cerr << endl);
+        string stylesheet_ref = "http://someServer:8080/opendap/xsl/asyncResponse.xsl";
+
+        dau.writeD4AsyncPending(*xml, &stylesheet_ref);
+
+        string doc = xml->get_doc();
+        DBG(cerr << "[test_async_pending - candidate doc]" << endl << doc << endl);
+
+        string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4AsyncPending_StyleRef.xml");
+        DBG(cerr << "[test_async_pending - baseline doc]" << endl << baseline << endl);
+        CPPUNIT_ASSERT(doc == baseline);
+        DBG(cerr << endl << " ---- test_async_pending - END" << endl);
+    }
+
+    // An empty D4Dimensions object prints nothing; the XMLWriter class adds
+    // a xml doc preface.
+    void test_async_ResponseGone()
+    {
+        DBG(cerr << endl << " ---- test_async_ResponseGone - BEGIN" << endl);
+
+        D4AsyncUtil dau;
+        DBG(cerr << endl);
+
+        dau.writeD4AsyncResponseGone(*xml);
+
+        string doc = xml->get_doc();
+        DBG(cerr << "[test_async_ResponseGone - candidate doc]" << endl << doc << endl);
+
+        string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4AsyncGone.xml");
+        DBG(cerr << "[test_async_ResponseGone - baseline doc]" << endl << baseline << endl);
+        CPPUNIT_ASSERT(doc == baseline);
+        DBG(cerr << endl << " ---- test_async_ResponseGone - END" << endl);
+    }
+
+    // An empty D4Dimensions object prints nothing; the XMLWriter class adds
+    // a xml doc preface.
+    void test_async_ResponseGone_with_stylesheet_ref()
+    {
+        DBG(cerr << endl << " ---- test_async_ResponseGone - BEGIN" << endl);
+
+        D4AsyncUtil dau;
+        DBG(cerr << endl);
+        string stylesheet_ref = "http://someServer:8080/opendap/xsl/asyncResponse.xsl";
+
+        dau.writeD4AsyncResponseGone(*xml, &stylesheet_ref);
+
+        string doc = xml->get_doc();
+        DBG(cerr << "[test_async_ResponseGone - candidate doc]" << endl << doc << endl);
+
+        string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4AsyncGone_StyleRef.xml");
+        DBG(cerr << "[test_async_ResponseGone - baseline doc]" << endl << baseline << endl);
+        CPPUNIT_ASSERT(doc == baseline);
+        DBG(cerr << endl << " ---- test_async_ResponseGone - END" << endl);
+    }
+
+    // An empty D4Dimensions object prints nothing; the XMLWriter class adds
+    // a xml doc preface.
+    void test_async_ResponseRejected()
+    {
+
+        D4AsyncUtil dau;
+        DBG(cerr << endl << " ---- test_async_ResponseRejected - BEGIN" << endl);
+
+        dau.writeD4AsyncResponseRejected(*xml, TIME,
+            "The time to process your request is longer than the time you indicated was acceptable.");
+
+        string doc = xml->get_doc();
+        DBG(cerr << "[test_async_ResponseRejected - candidate doc]" << endl << doc << endl);
+
+        string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4AsyncRejected.xml");
+        DBG(cerr << "[test_async_ResponseRejected - baseline doc]" << endl << baseline << endl);
+        CPPUNIT_ASSERT(doc == baseline);
+
+        DBG(cerr << endl << " ---- test_async_ResponseRejected - END" << endl);
+    }
+
+    // An empty D4Dimensions object prints nothing; the XMLWriter class adds
+    // a xml doc preface.
+    void test_async_ResponseRejected_with_stylesheet_ref()
+    {
+
+        D4AsyncUtil dau;
+        DBG(cerr << endl << " ---- test_async_ResponseRejected - BEGIN" << endl);
+        string stylesheet_ref = "http://someServer:8080/opendap/xsl/asyncResponse.xsl";
+
+        dau.writeD4AsyncResponseRejected(*xml, TIME,
+            "The time to process your request is longer than the time you indicated was acceptable.", &stylesheet_ref);
+
+        string doc = xml->get_doc();
+        DBG(cerr << "[test_async_ResponseRejected - candidate doc]" << endl << doc << endl);
+
+        string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4AsyncRejected_StyleRef.xml");
+        DBG(cerr << "[test_async_ResponseRejected - baseline doc]" << endl << baseline << endl);
+        CPPUNIT_ASSERT(doc == baseline);
+
+        DBG(cerr << endl << " ---- test_async_ResponseRejected - END" << endl);
+    }
+
+    CPPUNIT_TEST_SUITE (D4AsyncDocTest);
+
+    CPPUNIT_TEST (test_async_required);
+    CPPUNIT_TEST (test_async_required_with_stylesheet_ref);
+    CPPUNIT_TEST (test_async_accepted);
+    CPPUNIT_TEST (test_async_accepted_with_stylesheet_ref);
+    CPPUNIT_TEST (test_async_pending);
+    CPPUNIT_TEST (test_async_pending_with_stylesheet_ref);
+    CPPUNIT_TEST (test_async_ResponseGone);
+    CPPUNIT_TEST (test_async_ResponseGone_with_stylesheet_ref);
+    CPPUNIT_TEST (test_async_ResponseRejected);
+    CPPUNIT_TEST (test_async_ResponseRejected_with_stylesheet_ref);
+
+    CPPUNIT_TEST_SUITE_END();
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION (D4AsyncDocTest);
+
+int main(int argc, char*argv[])
+{
+    GetOpt getopt(argc, argv, "dh");
+    int option_char;
+    while ((option_char = getopt()) != -1)
+        switch (option_char) {
+        case 'd':
+            debug = 1;  // debug is a static global
+            break;
+        case 'h': {     // help - show test names
+            cerr << "Usage: D4AsyncDocTest has the following tests:" << endl;
+            const std::vector<Test*> &tests = D4AsyncDocTest::suite()->getTests();
+            unsigned int prefix_len = D4AsyncDocTest::suite()->getName().append("::").length();
+            for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+                cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+            }
+            break;
+        }
+
+        default:
+            break;
+        }
+
+    CppUnit::TextTestRunner runner;
+    runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
+    bool wasSuccessful = true;
+    string test = "";
+    int i = getopt.optind;
+    if (i == argc) {
+        // run them all
+        wasSuccessful = runner.run("");
+    }
+    else {
+        for (; i < argc; ++i) {
+            if (debug) cerr << "Running " << argv[i] << endl;
+            test = D4AsyncDocTest::suite()->getName().append("::").append(argv[i]);
+            wasSuccessful = wasSuccessful && runner.run(test);
+        }
+    }
+
+    return wasSuccessful ? 0 : 1;
+}
+
+#if 0
+
+int main(int, char**) {
+    CppUnit::TextTestRunner runner;
+    runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
+    bool wasSuccessful = runner.run("", false);
+
+    return wasSuccessful ? 0 : 1;
+}
+#endif
diff --git a/unit-tests/D4AttributesTest.cc b/unit-tests/D4AttributesTest.cc
new file mode 100644
index 0000000..ac110f5
--- /dev/null
+++ b/unit-tests/D4AttributesTest.cc
@@ -0,0 +1,361 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#include "config.h"
+
+#include <cppunit/TextTestRunner.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+#include <cppunit/extensions/HelperMacros.h>
+
+//#define DODS_DEBUG
+
+#include "D4Attributes.h"
+#include "XMLWriter.h"
+#include "debug.h"
+
+#include "testFile.h"
+#include "test_config.h"
+#include "GetOpt.h"
+
+using namespace CppUnit;
+using namespace std;
+using namespace libdap;
+
+static bool debug = false;
+
+#undef DBG
+#define DBG(x) do { if (debug) (x); } while(false);
+
+class D4AttributesTest: public TestFixture {
+private:
+    XMLWriter *xml;
+    D4Attributes *attrs;
+
+    D4Attribute a, a2, a3, a4, a5, c, c2;
+
+public:
+    D4AttributesTest()
+    {
+    }
+
+    ~D4AttributesTest()
+    {
+    }
+
+    void setUp()
+    {
+        attrs = new D4Attributes;
+        xml = new XMLWriter;
+
+        a.set_name("first");
+        a.set_type(attr_byte_c);
+        a.add_value("1");
+        a.add_value("2");
+
+        a2.set_name("second");
+        a2.set_type(attr_int32_c);
+        a2.add_value("10000");
+
+        c.set_name("container_1");
+        c.set_type(attr_container_c);
+
+        a3.set_name("color");
+        a3.set_type(attr_str_c);
+        vector<string> colors;
+        colors.push_back("red");
+        colors.push_back("blue");
+        colors.push_back("green");
+        a3.add_value_vector(colors);
+
+        a4 = a2;
+        a4.set_name("control");
+
+        c.attributes()->add_attribute(&a3);
+
+        c2.set_name("container_2");
+        c2.set_type(attr_container_c);
+
+        c2.attributes()->add_attribute(&a4);
+        c2.attributes()->add_attribute(&c);
+    }
+
+    void tearDown()
+    {
+        delete xml;
+        delete attrs;
+    }
+
+    // An empty D4Dimensions object prints nothing; the XMLWriter class adds
+    // a xml doc preface.
+    void test_print_empty()
+    {
+        attrs->print_dap4(*xml);
+        string doc = xml->get_doc();
+        string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4Attributes_empty.xml");
+        DBG(cerr << "D4Attributes: " << doc << endl);
+        CPPUNIT_ASSERT(doc == baseline);
+    }
+
+    void test_print_single_attribute()
+    {
+        a.print_dap4(*xml);
+        string doc = xml->get_doc();
+        string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4Attributes_values_1.xml");
+        DBG(cerr << "D4Attributes: " << doc << endl);
+        CPPUNIT_ASSERT(doc == baseline);
+
+    }
+
+    void test_print_1()
+    {
+        attrs->add_attribute(&a);
+
+        attrs->print_dap4(*xml);
+        string doc = xml->get_doc();
+        string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4Attributes_1.xml");
+        DBG(cerr << "D4Attributes: " << doc << endl);
+        CPPUNIT_ASSERT(doc == baseline);
+    }
+
+    void test_print_2()
+    {
+        attrs->add_attribute(&a);
+        attrs->add_attribute(&a2);
+
+        attrs->print_dap4(*xml);
+        string doc = xml->get_doc();
+        string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4Attributes_2.xml");
+        DBG(cerr << "D4Attributes: " << doc << endl);
+        CPPUNIT_ASSERT(doc == baseline);
+    }
+
+    void test_print_3()
+    {
+        attrs->add_attribute(&a);
+        attrs->add_attribute(&a2);
+        attrs->add_attribute(&c);
+        attrs->add_attribute(&c2);
+
+        attrs->print_dap4(*xml);
+        string doc = xml->get_doc();
+        string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4Attributes_3.xml");
+        DBG(cerr << "D4Attributes: " << doc << endl);
+        CPPUNIT_ASSERT(doc == baseline);
+    }
+
+    void test_print_assignment()
+    {
+        attrs->add_attribute(&a);
+        attrs->add_attribute(&a2);
+
+        D4Attributes lhs = *attrs;
+
+        lhs.print_dap4(*xml);
+        string doc = xml->get_doc();
+        string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4Attributes_assignment.xml");
+        DBG(cerr << "D4Attributes: " << doc << endl);
+        CPPUNIT_ASSERT(doc == baseline);
+    }
+
+    void test_print_assignment_2()
+    {
+        attrs->add_attribute(&a);
+        attrs->add_attribute(&a2);
+        attrs->add_attribute(&c);
+        attrs->add_attribute(&c2);
+
+        D4Attributes lhs = *attrs;
+
+        lhs.print_dap4(*xml);
+        string doc = xml->get_doc();
+        string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4Attributes_assignment_2.xml");
+        DBG(cerr << "D4Attributes: " << doc << endl);
+        CPPUNIT_ASSERT(doc == baseline);
+    }
+
+    void test_print_copy_ctor()
+    {
+        attrs->add_attribute(&a);
+        attrs->add_attribute(&a2);
+
+        D4Attributes lhs(*attrs);
+
+        lhs.print_dap4(*xml);
+        string doc = xml->get_doc();
+        string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4Attributes_copy_ctor.xml");
+        DBG(cerr << "D4Attributes: " << doc << endl);
+        CPPUNIT_ASSERT(doc == baseline);
+    }
+
+    void test_find()
+    {
+        attrs->add_attribute(&a);
+        attrs->add_attribute(&a2);
+        attrs->add_attribute(&c);
+        attrs->add_attribute(&c2);
+
+        D4Attribute *find_result = attrs->find("color");
+
+        // 'color' is in the container 'container' which is the third
+        // attribute
+        D4Attribute *baseline = *(attrs->attribute_begin() + 2);
+        CPPUNIT_ASSERT(baseline);
+        CPPUNIT_ASSERT(baseline->type() == attr_container_c);
+        D4Attributes *local_attrs = baseline->attributes();
+
+        // it is the first attribute in that container
+        baseline = *(local_attrs->attribute_begin());
+        CPPUNIT_ASSERT(baseline);
+        CPPUNIT_ASSERT(baseline->type() == attr_str_c);
+        CPPUNIT_ASSERT(baseline->name() == "color");
+
+        // We get a pointer to actual container, not a copy
+        CPPUNIT_ASSERT(baseline == find_result);
+    }
+
+    void test_get()
+    {
+        attrs->add_attribute(&a);
+        attrs->add_attribute(&a2);
+        attrs->add_attribute(&c);
+        attrs->add_attribute(&c2);
+
+        D4Attribute *get_result = attrs->get("container_1.color");
+
+        // 'color' is in the container 'container_1' which is the third
+        // attribute
+        D4Attribute *baseline = *(attrs->attribute_begin() + 2);
+        CPPUNIT_ASSERT(baseline);
+        CPPUNIT_ASSERT(baseline->type() == attr_container_c);
+        D4Attributes *local_attrs = baseline->attributes();
+
+        // it is the first attribute in that container
+        baseline = *(local_attrs->attribute_begin());
+        CPPUNIT_ASSERT(baseline);
+        CPPUNIT_ASSERT(baseline->type() == attr_str_c);
+        CPPUNIT_ASSERT(baseline->name() == "color");
+
+        // We get a pointer to actual container, not a copy
+        CPPUNIT_ASSERT(baseline == get_result);
+    }
+
+    void test_get2()
+    {
+        attrs->add_attribute(&a);
+        attrs->add_attribute(&a2);
+        attrs->add_attribute(&c);
+        attrs->add_attribute(&c2);
+
+        D4Attribute *get_result = attrs->get("container_2.container_1.color");
+
+        // 'color' is (also) in the container 'container_1' which is in
+        // the container 'container_2' which is the fourth attribute
+        D4Attribute *baseline = *(attrs->attribute_begin() + 3);
+        CPPUNIT_ASSERT(baseline);
+        CPPUNIT_ASSERT(baseline->type() == attr_container_c);
+        CPPUNIT_ASSERT(baseline->name() == "container_2");
+        D4Attributes *local_attrs = baseline->attributes();
+
+        // 'container_1 is the second attribute in 'container_2'
+        baseline = *(local_attrs->attribute_begin() + 1);
+        CPPUNIT_ASSERT(baseline);
+        CPPUNIT_ASSERT(baseline->type() == attr_container_c);
+        CPPUNIT_ASSERT(baseline->name() == "container_1");
+        local_attrs = baseline->attributes();
+
+        // finally, 'color' is the first attribute in 'container_1'
+        baseline = *(local_attrs->attribute_begin());
+        CPPUNIT_ASSERT(baseline->type() == attr_str_c);
+        CPPUNIT_ASSERT(baseline->name() == "color");
+
+        // We get a pointer to actual container, not a copy
+        CPPUNIT_ASSERT(baseline == get_result);
+    }
+
+    CPPUNIT_TEST_SUITE (D4AttributesTest);
+
+    CPPUNIT_TEST (test_print_empty);
+    CPPUNIT_TEST (test_print_single_attribute);
+    CPPUNIT_TEST (test_print_1);
+    CPPUNIT_TEST (test_print_2);
+    CPPUNIT_TEST (test_print_3);
+
+    CPPUNIT_TEST (test_print_assignment);
+    CPPUNIT_TEST (test_print_assignment_2);
+
+    CPPUNIT_TEST (test_print_copy_ctor);
+
+    CPPUNIT_TEST (test_find);
+    CPPUNIT_TEST (test_get);
+    CPPUNIT_TEST (test_get2);
+
+    CPPUNIT_TEST_SUITE_END();
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION (D4AttributesTest);
+
+int main(int argc, char*argv[])
+{
+    GetOpt getopt(argc, argv, "dh");
+    int option_char;
+    while ((option_char = getopt()) != -1)
+        switch (option_char) {
+        case 'd':
+            debug = 1;  // debug is a static global
+            break;
+        case 'h': {     // help - show test names
+            cerr << "Usage: D4AttributesTest has the following tests:" << endl;
+            const std::vector<Test*> &tests = D4AttributesTest::suite()->getTests();
+            unsigned int prefix_len = D4AttributesTest::suite()->getName().append("::").length();
+            for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+                cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+            }
+            break;
+        }
+
+        default:
+            break;
+        }
+
+    CppUnit::TextTestRunner runner;
+    runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
+    bool wasSuccessful = true;
+    string test = "";
+    int i = getopt.optind;
+    if (i == argc) {
+        // run them all
+        wasSuccessful = runner.run("");
+    }
+    else {
+        for (; i < argc; ++i) {
+            if (debug) cerr << "Running " << argv[i] << endl;
+            test = D4AttributesTest::suite()->getName().append("::").append(argv[i]);
+            wasSuccessful = wasSuccessful && runner.run(test);
+        }
+    }
+
+    return wasSuccessful ? 0 : 1;
+}
+
diff --git a/unit-tests/D4DimensionsTest.cc b/unit-tests/D4DimensionsTest.cc
new file mode 100644
index 0000000..ea9adc6
--- /dev/null
+++ b/unit-tests/D4DimensionsTest.cc
@@ -0,0 +1,282 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#include "config.h"
+
+#include <cppunit/TextTestRunner.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+#include <cppunit/extensions/HelperMacros.h>
+
+#include <GetOpt.h> // Part of libdap
+
+//#define DODS_DEBUG
+
+#include "D4Dimensions.h"
+#include "XMLWriter.h"
+
+#include "Error.h"
+#include "debug.h"
+
+#include "testFile.h"
+#include "test_config.h"
+
+using namespace CppUnit;
+using namespace std;
+using namespace libdap;
+
+static bool debug = false;
+
+#undef DBG
+#define DBG(x) do { if (debug) (x); } while(false);
+
+class D4DimensionsTest: public TestFixture {
+private:
+    XMLWriter *xml;
+    D4Dimensions *d;
+
+public:
+    D4DimensionsTest() :
+        xml(0), d(0)
+    {
+    }
+
+    ~D4DimensionsTest()
+    {
+    }
+
+    void setUp()
+    {
+        d = new D4Dimensions;
+        xml = new XMLWriter;
+    }
+
+    void tearDown()
+    {
+        delete xml;
+        delete d;
+    }
+
+    // An empty D4Dimensions object prints nothing; the XMLWriter class adds
+    // a xml doc preface.
+    void test_print_empty()
+    {
+        d->print_dap4(*xml);
+        string doc = xml->get_doc();
+        string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4Dimensions_empty.xml");
+        DBG(cerr << "test_print_empty: doc: " << doc << endl);
+        DBG(cerr << "test_print_empty: baseline: " << baseline << endl);
+        CPPUNIT_ASSERT(doc == baseline);
+    }
+
+    void test_print_1()
+    {
+        d->add_dim_nocopy(new D4Dimension("first", 10));
+
+        d->print_dap4(*xml);
+        string doc = xml->get_doc();
+        string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4Dimensions_1.xml");
+        DBG(cerr << "test_print_1: doc: " << doc << endl);
+        DBG(cerr << "test_print_1: baseline: " << baseline << endl);
+        CPPUNIT_ASSERT(doc == baseline);
+    }
+
+    void test_print_2()
+    {
+        d->add_dim_nocopy(new D4Dimension("first", 10));
+        d->add_dim_nocopy(new D4Dimension("second", 100));
+
+        d->print_dap4(*xml);
+        string doc = xml->get_doc();
+        string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4Dimensions_2.xml");
+        DBG(cerr << "test_print_2: doc: " << doc << endl);
+        DBG(cerr << "test_print_2: baseline: " << baseline << endl);
+        CPPUNIT_ASSERT(doc == baseline);
+    }
+
+    void test_error()
+    {
+        D4Dimension *d3, *d2;
+        try {
+            d2 = new D4Dimension();
+            d2->set_name("error");
+            d2->set_size("10");
+
+            d3 = new D4Dimension();
+            d3->set_name("error");
+            d3->set_size("20.0");
+            delete d3;
+            delete d2;
+            CPPUNIT_FAIL("Should throw an Error");
+        }
+        catch (...) {
+            delete d3;
+            delete d2;
+            throw;
+        }
+    }
+
+    void test_error_2()
+    {
+        D4Dimension *d3;
+        try {
+            d3 = new D4Dimension();
+            d3->set_name("error");
+            d3->set_size("bad");
+            delete d3;
+            CPPUNIT_FAIL("Should throw an Error");
+        }
+        catch (...) {
+            delete d3;
+            throw;
+        }
+    }
+#ifdef VARYING
+    void test_print_varying() {
+        d->add_dim_nocopy(new D4Dimension("first", 10));
+        d->add_dim_nocopy(new D4Dimension("second", 100));
+        d->add_dim_nocopy(new D4Dimension("third"));
+
+        d->print_dap4(*xml);
+        string doc = xml->get_doc();
+        string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4Dimensions_3.xml");
+        DBG(cerr << "test_print_varying: doc: " << doc << endl);
+        DBG(cerr << "test_print_varying: baseline: " << baseline << endl);
+        CPPUNIT_ASSERT(doc == baseline);
+    }
+#endif
+    void test_print_insert_dim()
+    {
+        d->add_dim_nocopy(new D4Dimension("first", 10));
+        d->add_dim_nocopy(new D4Dimension("second", 100));
+        d->add_dim_nocopy(new D4Dimension("third", 1000));
+
+        //vector<D4Dimensions::dimension>::iterator i = d->dim_begin() + 1;
+        D4Dimensions::D4DimensionsIter i = d->dim_begin() + 1;
+        d->insert_dim_nocopy(new D4Dimension("odd", 20), i);
+
+        d->print_dap4(*xml);
+        string doc = xml->get_doc();
+        string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4Dimensions_4.xml");
+        DBG(cerr << "test_print_insert_dim: doc: " << doc << endl);
+        DBG(cerr << "test_print_insert_dim: baseline: " << baseline << endl);
+        CPPUNIT_ASSERT(doc == baseline);
+    }
+
+    void test_print_assignment()
+    {
+        d->add_dim_nocopy(new D4Dimension("first", 10));
+        d->add_dim_nocopy(new D4Dimension("second", 100));
+        d->add_dim_nocopy(new D4Dimension("third", 1000));
+
+        D4Dimensions lhs = *d;
+
+        lhs.print_dap4(*xml);
+        string doc = xml->get_doc();
+        string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4Dimensions_3.xml");
+        DBG(cerr << "test_print_assignment: doc: " << doc << endl);
+        DBG(cerr << "test_print_assignment: baseline: " << baseline << endl);
+        CPPUNIT_ASSERT(doc == baseline);
+    }
+
+    void test_print_copy_ctor()
+    {
+        d->add_dim_nocopy(new D4Dimension("first", 10));
+        d->add_dim_nocopy(new D4Dimension("second", 100));
+        d->add_dim_nocopy(new D4Dimension("third", 1000));
+
+        D4Dimensions lhs(*d);
+
+        lhs.print_dap4(*xml);
+        string doc = xml->get_doc();
+        string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4Dimensions_3.xml");
+        DBG(cerr << "test_print_copy_ctor: doc: " << doc << endl);
+        DBG(cerr << "test_print_copy_ctor: baseline: " << baseline << endl);
+        CPPUNIT_ASSERT(doc == baseline);
+    }
+
+    CPPUNIT_TEST_SUITE (D4DimensionsTest);
+
+    CPPUNIT_TEST (test_print_empty);
+    CPPUNIT_TEST (test_print_1);
+    CPPUNIT_TEST (test_print_2);
+
+    CPPUNIT_TEST_EXCEPTION( test_error, Error );
+    //CPPUNIT_TEST( test_error );
+    CPPUNIT_TEST_EXCEPTION( test_error_2, Error );
+#ifdef VARYING
+    CPPUNIT_TEST(test_print_varying);
+#endif
+    CPPUNIT_TEST (test_print_insert_dim);
+    CPPUNIT_TEST (test_print_assignment);
+    CPPUNIT_TEST (test_print_copy_ctor);
+
+    CPPUNIT_TEST_SUITE_END();
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION (D4DimensionsTest);
+
+int main(int argc, char*argv[])
+{
+    GetOpt getopt(argc, argv, "dh");
+    int option_char;
+
+    while ((option_char = getopt()) != -1)
+        switch (option_char) {
+        case 'd':
+            debug = 1;  // debug is a static global
+            break;
+        case 'h': {     // help - show test names
+            cerr << "Usage: D4DimensionsTest has the following tests:" << endl;
+            const std::vector<Test*> &tests = D4DimensionsTest::suite()->getTests();
+            unsigned int prefix_len = D4DimensionsTest::suite()->getName().append("::").length();
+            for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+                cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+            }
+            break;
+        }
+        default:
+            break;
+        }
+
+    CppUnit::TextTestRunner runner;
+    runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
+    bool wasSuccessful = true;
+    string test = "";
+    int i = getopt.optind;
+    if (i == argc) {
+        // run them all
+        wasSuccessful = runner.run("");
+    }
+    else {
+        for (; i < argc; ++i) {
+            if (debug) cerr << "Running " << argv[i] << endl;
+            test = D4DimensionsTest::suite()->getName().append("::").append(argv[i]);
+            wasSuccessful = wasSuccessful && runner.run(test);
+        }
+    }
+
+    return wasSuccessful ? 0 : 1;
+}
+
diff --git a/unit-tests/D4EnumDefsTest.cc b/unit-tests/D4EnumDefsTest.cc
new file mode 100644
index 0000000..d4777ee
--- /dev/null
+++ b/unit-tests/D4EnumDefsTest.cc
@@ -0,0 +1,236 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#include "config.h"
+
+#include <cppunit/TextTestRunner.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+#include <cppunit/extensions/HelperMacros.h>
+
+//#define DODS_DEBUG
+
+#include "D4EnumDefs.h"
+#include "XMLWriter.h"
+#include "debug.h"
+
+#include "testFile.h"
+#include "test_config.h"
+
+#include "GetOpt.h"
+
+using namespace CppUnit;
+using namespace std;
+using namespace libdap;
+
+static bool debug = false;
+
+class D4EnumDefsTest: public TestFixture {
+private:
+    XMLWriter *xml;
+    D4EnumDefs *d;
+
+    D4EnumDef e, e2;
+
+public:
+    D4EnumDefsTest()
+    {
+    }
+
+    ~D4EnumDefsTest()
+    {
+    }
+
+    void setUp()
+    {
+        d = new D4EnumDefs;
+        xml = new XMLWriter;
+
+        e.set_name("first");
+        e.set_type(dods_byte_c);
+        e.add_value("red", 1);
+        e.add_value("blue", 2);
+
+        e2.set_name("second");
+        e2.set_type(dods_int32_c);
+        e2.add_value("snow", 0);
+        e2.add_value("ice", 10000);
+    }
+
+    void tearDown()
+    {
+        delete xml;
+        delete d;
+    }
+
+    // An empty D4Dimensions object prints nothing; the XMLWriter class adds
+    // a xml doc preface.
+    void test_print_empty()
+    {
+        d->print_dap4(*xml);
+        string doc = xml->get_doc();
+        string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4EnumDefs_empty.xml");
+        DBG(cerr << "test_print_empty: doc: " << doc << endl);DBG(cerr << "test_print_empty: baseline: " << baseline << endl);
+        CPPUNIT_ASSERT(doc == baseline);
+    }
+
+    void test_print_enum_values_only()
+    {
+        D4EnumDef e;
+        e.add_value("red", 1);
+        e.add_value("blue", 2);
+
+        e.print_dap4(*xml);
+        string doc = xml->get_doc();
+        string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4EnumDefs_values_1.xml");
+        DBG(cerr << "test_print_enum_values_only: doc: " << doc << endl);DBG(cerr << "test_print_enum_values_only: baseline: " << baseline << endl);
+        CPPUNIT_ASSERT(doc == baseline);
+
+    }
+
+    void test_print_1()
+    {
+        d->add_enum(&e);
+
+        d->print_dap4(*xml);
+        string doc = xml->get_doc();
+        string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4EnumDefs_1.xml");
+        DBG(cerr << "test_print_1: doc: " << doc << endl);DBG(cerr << "test_print_1: baseline: " << baseline << endl);
+        CPPUNIT_ASSERT(doc == baseline);
+    }
+
+    void test_print_2()
+    {
+        d->add_enum(&e);
+        d->add_enum(&e2);
+
+        d->print_dap4(*xml);
+        string doc = xml->get_doc();
+        string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4EnumDefs_2.xml");
+        DBG(cerr << "test_print_2: doc: " << doc << endl);DBG(cerr << "test_print_2: baseline: " << baseline << endl);
+        CPPUNIT_ASSERT(doc == baseline);
+    }
+
+    void test_print_insert_enum()
+    {
+        d->add_enum(&e);
+
+        // "second' winds up before 'first'
+        D4EnumDefs::D4EnumDefIter i = d->enum_begin();
+        d->insert_enum(&e2, i);
+
+        d->print_dap4(*xml);
+        string doc = xml->get_doc();
+        string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4EnumDefs_3.xml");
+        DBG(cerr << "test_print_insert_enum: doc: " << doc << endl);DBG(cerr << "test_print_insert_enum: baseline: " << baseline << endl);
+        CPPUNIT_ASSERT(doc == baseline);
+    }
+
+    void test_print_assignment()
+    {
+        d->add_enum(&e);
+        d->add_enum(&e2);
+
+        D4EnumDefs lhs = *d;
+
+        lhs.print_dap4(*xml);
+        string doc = xml->get_doc();
+        string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4EnumDefs_2.xml");
+        DBG(cerr << "test_print_assignment: doc: " << doc << endl);DBG(cerr << "test_print_assignment: baseline: " << baseline << endl);
+        CPPUNIT_ASSERT(doc == baseline);
+    }
+
+    void test_print_copy_ctor()
+    {
+        d->add_enum(&e);
+        d->add_enum(&e2);
+
+        D4EnumDefs lhs(*d);
+
+        lhs.print_dap4(*xml);
+        string doc = xml->get_doc();
+        string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4EnumDefs_2.xml");
+        DBG(cerr << "test_print_copy_ctor: doc: " << doc << endl);DBG(cerr << "test_print_copy_ctor: baseline: " << baseline << endl);
+        CPPUNIT_ASSERT(doc == baseline);
+    }
+
+    CPPUNIT_TEST_SUITE (D4EnumDefsTest);
+
+    CPPUNIT_TEST (test_print_empty);
+    CPPUNIT_TEST (test_print_enum_values_only);
+    CPPUNIT_TEST (test_print_1);
+    CPPUNIT_TEST (test_print_2);
+
+    CPPUNIT_TEST (test_print_insert_enum);
+    CPPUNIT_TEST (test_print_assignment);
+    CPPUNIT_TEST (test_print_copy_ctor);
+
+    CPPUNIT_TEST_SUITE_END();
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION (D4EnumDefsTest);
+
+int main(int argc, char*argv[])
+{
+    GetOpt getopt(argc, argv, "dh");
+    int option_char;
+
+    while ((option_char = getopt()) != -1)
+        switch (option_char) {
+        case 'd':
+            debug = 1;  // debug is a static global
+            break;
+        case 'h': {     // help - show test names
+            cerr << "Usage: D4EnumDefsTest has the following tests:" << endl;
+            const std::vector<Test*> &tests = D4EnumDefsTest::suite()->getTests();
+            unsigned int prefix_len = D4EnumDefsTest::suite()->getName().append("::").length();
+            for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+                cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+            }
+            break;
+        }
+        default:
+            break;
+        }
+
+    CppUnit::TextTestRunner runner;
+    runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
+    bool wasSuccessful = true;
+    string test = "";
+    int i = getopt.optind;
+    if (i == argc) {
+        // run them all
+        wasSuccessful = runner.run("");
+    }
+    else {
+        for (; i < argc; ++i) {
+            if (debug) cerr << "Running " << argv[i] << endl;
+            test = D4EnumDefsTest::suite()->getName().append("::").append(argv[i]);
+            wasSuccessful = wasSuccessful && runner.run(test);
+        }
+    }
+
+    return wasSuccessful ? 0 : 1;
+}
+
diff --git a/unit-tests/D4EnumTest.cc b/unit-tests/D4EnumTest.cc
new file mode 100644
index 0000000..2902c6f
--- /dev/null
+++ b/unit-tests/D4EnumTest.cc
@@ -0,0 +1,279 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#include "config.h"
+
+#include <cppunit/TextTestRunner.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+#include <cppunit/extensions/HelperMacros.h>
+
+//#define DODS_DEBUG
+
+#include "D4Enum.h"
+#include "D4EnumDefs.h"
+#include "XMLWriter.h"
+#include "debug.h"
+#include "GetOpt.h"
+
+#include "testFile.h"
+#include "test_config.h"
+
+static bool debug = false;
+
+#undef DBG
+#define DBG(x) do { if (debug) (x); } while(false);
+
+using namespace CppUnit;
+using namespace std;
+using namespace libdap;
+
+namespace libdap {
+class D4EnumTest: public TestFixture {
+private:
+    XMLWriter *xml;
+    D4Enum *d;
+
+public:
+    D4EnumTest() :
+        xml(0), d(0)
+    {
+    }
+
+    ~D4EnumTest()
+    {
+    }
+
+    void setUp()
+    {
+        d = new D4Enum("test", "Byte");
+        xml = new XMLWriter;
+    }
+
+    void tearDown()
+    {
+        delete xml;
+        delete d;
+    }
+
+    void test_first_ctor()
+    {
+        D4Enum e("first", "Byte");
+        CPPUNIT_ASSERT(e.d_element_type == dods_byte_c);
+        CPPUNIT_ASSERT(e.name() == "first");
+    }
+
+    // Tests bogus type name
+    void test_first_ctor2()
+    {
+        D4Enum e("bogus", "String");
+        CPPUNIT_ASSERT(e.d_element_type == dods_uint64_c);
+        CPPUNIT_ASSERT(e.name() == "bogus");
+    }
+
+    void test_second_ctor()
+    {
+        D4Enum e("second", dods_byte_c);
+        CPPUNIT_ASSERT(e.d_element_type == dods_byte_c);
+        CPPUNIT_ASSERT(e.name() == "second");
+    }
+
+    // Tests bogus type name
+    void test_second_ctor2()
+    {
+        D4Enum e("bogus", dods_str_c);
+        CPPUNIT_ASSERT(e.d_element_type == dods_uint64_c);
+        CPPUNIT_ASSERT(e.name() == "bogus");
+    }
+
+    void test_set_value()
+    {
+        D4Enum e("second", dods_byte_c);
+        dods_byte db = 200;
+        e.set_value(db);
+        CPPUNIT_ASSERT(e.d_buf == 200);
+    }
+
+    void test_set_value2()
+    {
+        D4Enum e("second", dods_byte_c);
+        e.set_value(200);
+        CPPUNIT_ASSERT(e.d_buf == 200);
+    }
+
+    void test_set_value3()
+    {
+        D4Enum e("third", dods_int32_c);
+        e.set_value(-65535);
+        CPPUNIT_ASSERT((dods_int32)e.d_buf == -65535);
+    }
+
+    void test_value()
+    {
+        D4Enum e("second", dods_byte_c);
+        e.set_value(200);
+        dods_byte db;
+        e.value(&db);
+        CPPUNIT_ASSERT(db == 200);
+    }
+
+    void test_value2()
+    {
+        D4Enum e("third", dods_int32_c);
+        e.set_value(-65535);
+        int32_t db;
+        e.value(&db);
+        CPPUNIT_ASSERT(db == -65535);
+    }
+
+    void test_copy_ctor()
+    {
+        D4Enum e("second", dods_byte_c);
+        e.set_value(200);
+
+        D4Enum f(e);
+        CPPUNIT_ASSERT(f.d_element_type == dods_byte_c);
+        CPPUNIT_ASSERT(f.name() == "second");
+        CPPUNIT_ASSERT(f.d_buf == 200);
+    }
+
+    void test_assignment()
+    {
+        D4Enum e("second", dods_byte_c);
+        e.set_value(200);
+
+        D4Enum f = e;
+        CPPUNIT_ASSERT(f.d_element_type == dods_byte_c);
+        CPPUNIT_ASSERT(f.name() == "second");
+        CPPUNIT_ASSERT(f.d_buf == 200);
+    }
+
+    void test_print()
+    {
+        D4Enum e("test", dods_byte_c);
+        D4EnumDef enum_def("Colors", dods_byte_c);
+
+        e.set_enumeration(&enum_def);
+        e.set_value((dods_byte) 200);
+
+        XMLWriter xml;
+
+        e.print_dap4(xml);
+        string doc = xml.get_doc();
+        string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4Enum_1.xml");
+        DBG(cerr << "test_print: doc: " << doc << endl);
+        DBG(cerr << "test_print: baseline: " << baseline << endl);
+        CPPUNIT_ASSERT(doc == baseline);
+    }
+
+    void test_print_val()
+    {
+        D4Enum e("test", dods_byte_c);
+        D4EnumDef enum_def("Colors", dods_byte_c);
+
+        e.set_enumeration(&enum_def);
+        e.set_value(200);
+
+        ostringstream oss;
+
+        e.print_val(oss, "", true);
+        string doc = oss.str();
+        string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4Enum_2.txt");
+        DBG(cerr << "test_print: doc: " << doc << endl);
+        DBG(cerr << "test_print: baseline: " << baseline << endl);
+        CPPUNIT_ASSERT(doc == baseline);
+    }
+
+    CPPUNIT_TEST_SUITE (D4EnumTest);
+
+    CPPUNIT_TEST (test_first_ctor);
+#ifdef NDEBUG
+    CPPUNIT_TEST(test_first_ctor2);
+#endif
+    CPPUNIT_TEST (test_second_ctor);
+#ifdef NDEBUG
+    CPPUNIT_TEST(test_second_ctor2);
+#endif
+
+    CPPUNIT_TEST (test_set_value);
+    CPPUNIT_TEST (test_set_value2);
+    CPPUNIT_TEST (test_set_value3);
+
+    CPPUNIT_TEST (test_value);
+    CPPUNIT_TEST (test_value2);
+
+    CPPUNIT_TEST (test_copy_ctor);
+    CPPUNIT_TEST (test_assignment);
+
+    CPPUNIT_TEST (test_print);
+    CPPUNIT_TEST (test_print_val);
+
+    CPPUNIT_TEST_SUITE_END();
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION (D4EnumTest);
+
+}
+
+int main(int argc, char*argv[])
+{
+    GetOpt getopt(argc, argv, "dh");
+    int option_char;
+    while ((option_char = getopt()) != -1)
+        switch (option_char) {
+        case 'd':
+            debug = 1;  // debug is a static global
+            break;
+        case 'h': {     // help - show test names
+            cerr << "Usage: D4EnumTest has the following tests:" << endl;
+            const std::vector<Test*> &tests = libdap::D4EnumTest::suite()->getTests();
+            unsigned int prefix_len = libdap::D4EnumTest::suite()->getName().append("::").length();
+            for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+                cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+            }
+            break;
+        }
+        default:
+            break;
+        }
+
+    CppUnit::TextTestRunner runner;
+    runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
+    bool wasSuccessful = true;
+    string test = "";
+    int i = getopt.optind;
+    if (i == argc) {
+        // run them all
+        wasSuccessful = runner.run("");
+    }
+    else {
+        for (; i < argc; ++i) {
+            if (debug) cerr << "Running " << argv[i] << endl;
+            test = libdap::D4EnumTest::suite()->getName().append("::").append(argv[i]);
+            wasSuccessful = wasSuccessful && runner.run(test);
+        }
+    }
+
+    return wasSuccessful ? 0 : 1;
+}
diff --git a/unit-tests/D4FilterClauseTest.cc b/unit-tests/D4FilterClauseTest.cc
new file mode 100644
index 0000000..b9a3023
--- /dev/null
+++ b/unit-tests/D4FilterClauseTest.cc
@@ -0,0 +1,628 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2014 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#include "config.h"
+
+#include <cppunit/TextTestRunner.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+#include <cppunit/extensions/HelperMacros.h>
+
+#include <sstream>
+
+#include "Byte.h"
+#include "Int8.h"
+#include "Int16.h"
+#include "UInt16.h"
+#include "Int32.h"
+#include "UInt32.h"
+
+#include "Float32.h"
+#include "Float64.h"
+
+#include "Str.h"
+#include "Url.h"
+//#include "Array.h"
+#include "Structure.h"
+
+#include "D4RValue.h"
+#include "D4FilterClause.h"
+#include "DMR.h"    // We need this because D4FilterClause::value needs it (sort of).
+
+#include "GetOpt.h"
+#include "util.h"
+#include "debug.h"
+
+//#include "testFile.h"
+//#include "test_config.h"
+
+static bool debug = false;
+
+#undef DBG
+#define DBG(x) do { if (debug) {x;} } while(false)
+
+using namespace CppUnit;
+using namespace std;
+
+namespace libdap {
+
+class D4FilterClauseTest: public TestFixture {
+    // Build a DMR and build several D4RValue objects that reference its variables.
+    // Then build several D4RValue objects that hold constants
+
+private:
+    Byte *byte;
+    Float32 *f32;
+    Str *str;
+    Url *url;
+
+    DMR dmr;
+
+public:
+    D4FilterClauseTest() :
+        byte(0), f32(0), str(0), url(0)
+    {
+    }
+    ~D4FilterClauseTest()
+    {
+    }
+
+    void setUp()
+    {
+        byte = new Byte("byte");
+        byte->set_value(17);
+
+        f32 = new Float32("f32");
+        f32->set_value(3.1415);
+
+        str = new Str("str");
+        str->set_value("Einstein");
+
+        url = new Url("url");
+        url->set_value("https://github.com/opendap");
+    }
+
+    void tearDown()
+    {
+        delete byte;
+        delete str;
+    }
+
+    // FilterClauseList tests further down...
+
+    void Byte_and_long_long_test()
+    {
+        D4RValue *arg1 = new D4RValue(byte);    // holds 17
+        D4RValue *arg2 = new D4RValue((long long) 21);
+
+        auto_ptr<D4FilterClause> less(new D4FilterClause(D4FilterClause::less, arg1, arg2));
+        CPPUNIT_ASSERT(less->value(dmr));
+
+        D4RValue *arg2_1 = new D4RValue(byte);    // holds 17
+        D4RValue *arg2_2 = new D4RValue((long long) 21);
+
+        auto_ptr<D4FilterClause> greater(new D4FilterClause(D4FilterClause::greater, arg2_1, arg2_2));
+        CPPUNIT_ASSERT(!greater->value(dmr));
+
+        D4RValue *arg3_1 = new D4RValue(byte);    // holds 17
+        D4RValue *arg3_2 = new D4RValue((long long) 21);
+
+        auto_ptr<D4FilterClause> equal(new D4FilterClause(D4FilterClause::equal, arg3_1, arg3_2));
+        CPPUNIT_ASSERT(!equal->value(dmr));
+
+        D4RValue *arg4_1 = new D4RValue(byte);    // holds 17
+        D4RValue *arg4_2 = new D4RValue((long long) 21);
+
+        auto_ptr<D4FilterClause> not_equal(new D4FilterClause(D4FilterClause::not_equal, arg4_1, arg4_2));
+        CPPUNIT_ASSERT(not_equal->value(dmr));
+    }
+
+    // This version uses the D4FilterClause::value() and not value(DMR&) method
+    void Byte_and_long_long_test_2()
+    {
+        D4RValue *arg1 = new D4RValue(byte);    // holds 17
+        D4RValue *arg2 = new D4RValue((long long) 21);
+
+        auto_ptr<D4FilterClause> less(new D4FilterClause(D4FilterClause::less, arg1, arg2));
+        CPPUNIT_ASSERT(less->value());
+
+        D4RValue *arg2_1 = new D4RValue(byte);    // holds 17
+        D4RValue *arg2_2 = new D4RValue((long long) 21);
+
+        auto_ptr<D4FilterClause> greater(new D4FilterClause(D4FilterClause::greater, arg2_1, arg2_2));
+        CPPUNIT_ASSERT(!greater->value());
+
+        D4RValue *arg3_1 = new D4RValue(byte);    // holds 17
+        D4RValue *arg3_2 = new D4RValue((long long) 21);
+
+        auto_ptr<D4FilterClause> equal(new D4FilterClause(D4FilterClause::equal, arg3_1, arg3_2));
+        CPPUNIT_ASSERT(!equal->value());
+
+        D4RValue *arg4_1 = new D4RValue(byte);    // holds 17
+        D4RValue *arg4_2 = new D4RValue((long long) 21);
+
+        auto_ptr<D4FilterClause> not_equal(new D4FilterClause(D4FilterClause::not_equal, arg4_1, arg4_2));
+        CPPUNIT_ASSERT(not_equal->value());
+    }
+
+    void Byte_and_double_test()
+    {
+        D4RValue *arg1 = new D4RValue(byte);    // holds 17
+        D4RValue *arg2 = new D4RValue((double) 21.0);
+
+        auto_ptr<D4FilterClause> less(new D4FilterClause(D4FilterClause::less, arg1, arg2));
+        CPPUNIT_ASSERT(less->value(dmr));
+
+        D4RValue *arg2_1 = new D4RValue(byte);    // holds 17
+        D4RValue *arg2_2 = new D4RValue((double) 21);
+
+        auto_ptr<D4FilterClause> greater(new D4FilterClause(D4FilterClause::greater, arg2_1, arg2_2));
+        CPPUNIT_ASSERT(!greater->value(dmr));
+
+        D4RValue *arg3_1 = new D4RValue(byte);    // holds 17
+        D4RValue *arg3_2 = new D4RValue((double) 21);
+
+        auto_ptr<D4FilterClause> equal(new D4FilterClause(D4FilterClause::equal, arg3_1, arg3_2));
+        CPPUNIT_ASSERT(!equal->value(dmr));
+
+        D4RValue *arg4_1 = new D4RValue(byte);    // holds 17
+        D4RValue *arg4_2 = new D4RValue((double) 21);
+
+        auto_ptr<D4FilterClause> not_equal(new D4FilterClause(D4FilterClause::not_equal, arg4_1, arg4_2));
+        CPPUNIT_ASSERT(not_equal->value(dmr));
+    }
+
+    /** @defgroup type_conv Tests for type promotion
+     * @{
+     */
+    void Byte_and_int_test()
+    {
+        D4RValue *arg1 = new D4RValue(byte);    // holds 17
+        D4RValue *arg2 = new D4RValue((unsigned long long) (21));
+
+        auto_ptr<D4FilterClause> less(new D4FilterClause(D4FilterClause::less, arg1, arg2));
+        CPPUNIT_ASSERT(less->value());
+
+    }
+
+    void Byte_and_float_test()
+    {
+        D4RValue *arg1 = new D4RValue(byte);    // holds 17
+        D4RValue *arg2 = new D4RValue((float) 21.0);
+
+        auto_ptr<D4FilterClause> less(new D4FilterClause(D4FilterClause::less, arg1, arg2));
+        CPPUNIT_ASSERT(less->value());
+
+    }
+    /** @} */
+
+    // this uses a mix of value() and value(dmr), just for cover both cases
+    void Str_and_str_test()
+    {
+        D4RValue *arg1 = new D4RValue(str);
+        D4RValue *arg2 = new D4RValue(string("Tesla"));
+
+        auto_ptr<D4FilterClause> less(new D4FilterClause(D4FilterClause::less, arg1, arg2));
+        CPPUNIT_ASSERT(less->value());
+
+        D4RValue *arg2_1 = new D4RValue(str);
+        D4RValue *arg2_2 = new D4RValue("Tesla");
+
+        auto_ptr<D4FilterClause> greater(new D4FilterClause(D4FilterClause::greater, arg2_1, arg2_2));
+        CPPUNIT_ASSERT(!greater->value());
+
+        D4RValue *arg3_1 = new D4RValue(str);
+        D4RValue *arg3_2 = new D4RValue("Tesla");
+
+        auto_ptr<D4FilterClause> equal(new D4FilterClause(D4FilterClause::equal, arg3_1, arg3_2));
+        CPPUNIT_ASSERT(!equal->value(dmr));
+
+        D4RValue *arg4_1 = new D4RValue(str);
+        D4RValue *arg4_2 = new D4RValue("Tesla");
+
+        auto_ptr<D4FilterClause> not_equal(new D4FilterClause(D4FilterClause::not_equal, arg4_1, arg4_2));
+        CPPUNIT_ASSERT(not_equal->value(dmr));
+    }
+
+    void Str_and_match_test()
+    {
+        D4RValue *arg1 = new D4RValue(str);
+        D4RValue *arg2 = new D4RValue(string("E.*n"));
+
+        auto_ptr<D4FilterClause> match(new D4FilterClause(D4FilterClause::match, arg1, arg2));
+        CPPUNIT_ASSERT(match->value());
+    }
+
+    void Str_and_number_error_test()
+    {
+        D4RValue *arg1 = new D4RValue(str);
+        D4RValue *arg2 = new D4RValue((long long) 21);
+
+        try {
+            auto_ptr<D4FilterClause> less(new D4FilterClause(D4FilterClause::less, arg1, arg2));
+            // The Filter Clause instance is built OK, but the value() method
+            // will balk at this comparison. jhrg 4/21/16
+            DBG(cerr << "built filter clause instance" << endl);
+
+            less->value();
+            CPPUNIT_FAIL("Expected error");
+        }
+        catch (Error &e) {
+            DBG(cerr << "Caught error: " + e.get_error_message() << endl);
+            CPPUNIT_ASSERT("Caught error");
+        }
+    }
+
+    void Byte_and_string_error_test()
+    {
+        D4RValue *arg1 = new D4RValue(byte);
+        D4RValue *arg2 = new D4RValue("Tesla");
+
+        try {
+            auto_ptr<D4FilterClause> less(new D4FilterClause(D4FilterClause::less, arg1, arg2));
+
+            CPPUNIT_ASSERT(less->value());
+            CPPUNIT_FAIL("Expected error");
+        }
+        catch (Error &e) {
+            DBG(cerr << "Caught error: " + e.get_error_message() << endl);
+            CPPUNIT_ASSERT("Caught error");
+        }
+    }
+
+    void Structure_and_string_error_test()
+    {
+        auto_ptr<Structure> s(new Structure("s"));
+        s->add_var(byte); // copy the object
+        D4RValue *arg1 = new D4RValue(s.get()); // BaseType*s are not free'd by D4RValue
+        D4RValue *arg2 = new D4RValue("Tesla");
+
+        try {
+            auto_ptr<D4FilterClause> less(new D4FilterClause(D4FilterClause::less, arg1, arg2));
+
+            CPPUNIT_ASSERT(less->value());
+            CPPUNIT_FAIL("Expected error");
+        }
+        catch (Error &e) {
+            DBG(cerr << "Caught error: " + e.get_error_message() << endl);
+            CPPUNIT_ASSERT("Caught error");
+        }
+    }
+
+    // There's no way this will get past the parser, but ...
+    void Byte_and_Structure_error_test()
+    {
+        auto_ptr<Structure> s(new Structure("s"));
+        s->add_var(str); // copy the object
+        D4RValue *arg1 = new D4RValue(byte);
+        D4RValue *arg2 = new D4RValue(s.get());
+
+        try {
+            auto_ptr<D4FilterClause> less(new D4FilterClause(D4FilterClause::less, arg1, arg2));
+
+            CPPUNIT_ASSERT(less->value());
+            CPPUNIT_FAIL("Expected error");
+        }
+        catch (Error &e) {
+            DBG(cerr << "Caught error: " + e.get_error_message() << endl);
+            CPPUNIT_ASSERT("Caught error");
+        }
+    }
+
+    // There's no way this will get past the parser, but ...
+    void Str_and_Structure_error_test()
+    {
+        auto_ptr<Structure> s(new Structure("s"));
+        s->add_var(str); // copy the object
+        D4RValue *arg1 = new D4RValue(str);
+        D4RValue *arg2 = new D4RValue(s.get());
+
+        try {
+            auto_ptr<D4FilterClause> less(new D4FilterClause(D4FilterClause::less, arg1, arg2));
+
+            CPPUNIT_ASSERT(less->value());
+            CPPUNIT_FAIL("Expected error");
+        }
+        catch (Error &e) {
+            DBG(cerr << "Caught error: " + e.get_error_message() << endl);
+            CPPUNIT_ASSERT("Caught error");
+        }
+    }
+
+    // test Url and Float32
+    void grab_bag_test()
+    {
+        D4RValue *arg2_1 = new D4RValue(f32);
+        D4RValue *arg2_2 = new D4RValue(17.0);
+
+        auto_ptr<D4FilterClause> less(new D4FilterClause(D4FilterClause::less, arg2_1, arg2_2));
+        CPPUNIT_ASSERT(less->value());
+
+        D4RValue *arg3_1 = new D4RValue(url);
+        D4RValue *arg3_2 = new D4RValue("https://github.com/opendap");
+
+        auto_ptr<D4FilterClause> equal(new D4FilterClause(D4FilterClause::equal, arg3_1, arg3_2));
+        CPPUNIT_ASSERT(equal->value(dmr));
+
+        D4RValue *arg4_1 = new D4RValue(url);
+        D4RValue *arg4_2 = new D4RValue("https://.*dap$");
+
+        auto_ptr<D4FilterClause> not_equal(new D4FilterClause(D4FilterClause::not_equal, arg4_1, arg4_2));
+        CPPUNIT_ASSERT(not_equal->value(dmr));
+
+        D4RValue *arg5_1 = new D4RValue(url);
+        D4RValue *arg5_2 = new D4RValue("https://.*dap$");
+
+        auto_ptr<D4FilterClause> match(new D4FilterClause(D4FilterClause::match, arg5_1, arg5_2));
+        CPPUNIT_ASSERT(match->value(dmr));
+    }
+
+    void float_test()
+    {
+        D4RValue *arg2_1 = new D4RValue(f32);
+        D4RValue *arg2_2 = new D4RValue(3.1415);
+
+        auto_ptr<D4FilterClause> clause(new D4FilterClause(D4FilterClause::equal, arg2_1, arg2_2));
+        CPPUNIT_ASSERT(clause->value());
+    }
+
+    void float_test_2()
+    {
+        D4RValue *arg2_1 = new D4RValue(f32);
+        D4RValue *arg2_2 = new D4RValue(3.1415);
+
+        auto_ptr<D4FilterClause> clause(new D4FilterClause(D4FilterClause::greater_equal, arg2_1, arg2_2));
+        CPPUNIT_ASSERT(clause->value());
+    }
+
+    void float_test_3()
+    {
+        D4RValue *arg2_1 = new D4RValue(f32);
+        D4RValue *arg2_2 = new D4RValue(3.1415);
+
+        auto_ptr<D4FilterClause> clause(new D4FilterClause(D4FilterClause::less_equal, arg2_1, arg2_2));
+        CPPUNIT_ASSERT(clause->value());
+    }
+
+    void int_test()
+    {
+        auto_ptr<Int8> i8(new Int8(""));
+        i8->set_value(17);
+        D4RValue *arg2_1 = new D4RValue(i8.get());
+        D4RValue *arg2_2 = new D4RValue((long long) 17);
+
+        auto_ptr<D4FilterClause> clause(new D4FilterClause(D4FilterClause::equal, arg2_1, arg2_2));
+        CPPUNIT_ASSERT(clause->value());
+    }
+
+    void true_clauses_test()
+    {
+        // Testing this as a pointer since that's how it will be stored in D4Sequence
+        auto_ptr<D4FilterClauseList> clauses(new D4FilterClauseList());
+
+        D4RValue *arg1_1 = new D4RValue(byte);    // holds 17
+        D4RValue *arg1_2 = new D4RValue((double) 21.0);
+        clauses->add_clause(new D4FilterClause(D4FilterClause::less, arg1_1, arg1_2));
+
+        D4RValue *arg2_1 = new D4RValue(f32);       // holds pi
+        D4RValue *arg2_2 = new D4RValue(17.0);
+        clauses->add_clause(new D4FilterClause(D4FilterClause::less, arg2_1, arg2_2));
+
+        D4RValue *arg3_1 = new D4RValue(url);
+        D4RValue *arg3_2 = new D4RValue("https://github.com/opendap");
+        clauses->add_clause(new D4FilterClause(D4FilterClause::equal, arg3_1, arg3_2));
+
+        D4RValue *arg4_1 = new D4RValue(url);
+        D4RValue *arg4_2 = new D4RValue("https://.*dap$");
+        clauses->add_clause(new D4FilterClause(D4FilterClause::match, arg4_1, arg4_2));
+
+        CPPUNIT_ASSERT(clauses->size() == 4);
+        CPPUNIT_ASSERT(clauses->value(dmr));
+        CPPUNIT_ASSERT(clauses->value());
+    }
+
+    // This should return true
+    void no_clauses_test()
+    {
+        auto_ptr<D4FilterClauseList> clauses(new D4FilterClauseList());
+
+        CPPUNIT_ASSERT(clauses->size() == 0);
+        CPPUNIT_ASSERT(clauses->value(dmr));
+        CPPUNIT_ASSERT(clauses->value());
+    }
+
+    void false_clauses_test()
+    {
+        auto_ptr<D4FilterClauseList> clauses(new D4FilterClauseList());
+
+        D4RValue *arg1_1 = new D4RValue(byte);    // holds 17
+        D4RValue *arg1_2 = new D4RValue((double) 21.0);
+        clauses->add_clause(new D4FilterClause(D4FilterClause::less, arg1_1, arg1_2));
+
+        // This clause will fail
+        D4RValue *arg2_1 = new D4RValue(f32);       // holds pi
+        D4RValue *arg2_2 = new D4RValue(17.0);
+        clauses->add_clause(new D4FilterClause(D4FilterClause::greater, arg2_1, arg2_2));
+
+        D4RValue *arg3_1 = new D4RValue(url);
+        D4RValue *arg3_2 = new D4RValue("https://github.com/opendap");
+        clauses->add_clause(new D4FilterClause(D4FilterClause::equal, arg3_1, arg3_2));
+
+        D4RValue *arg4_1 = new D4RValue(url);
+        D4RValue *arg4_2 = new D4RValue("https://.*dap$");
+        clauses->add_clause(new D4FilterClause(D4FilterClause::match, arg4_1, arg4_2));
+
+        CPPUNIT_ASSERT(clauses->size() == 4);
+        CPPUNIT_ASSERT(clauses->value(dmr) == false);
+        CPPUNIT_ASSERT(clauses->value() == false);
+    }
+
+    void evaluation_order_test()
+    {
+        auto_ptr<D4FilterClauseList> clauses(new D4FilterClauseList());
+
+        D4RValue *arg1_1 = new D4RValue(byte);    // holds 17
+        D4RValue *arg1_2 = new D4RValue((double) 21.0);
+        clauses->add_clause(new D4FilterClause(D4FilterClause::less, arg1_1, arg1_2));
+
+        // This clause will fail and we should not get to the next clause, which will
+        // throw and exception.
+        D4RValue *arg2_1 = new D4RValue(f32);       // holds pi
+        D4RValue *arg2_2 = new D4RValue(17.0);
+        clauses->add_clause(new D4FilterClause(D4FilterClause::greater, arg2_1, arg2_2));
+
+        D4RValue *arg3_1 = new D4RValue(url);
+        D4RValue *arg3_2 = new D4RValue(17.0); // Error - mismatched types
+        clauses->add_clause(new D4FilterClause(D4FilterClause::equal, arg3_1, arg3_2));
+
+        D4RValue *arg4_1 = new D4RValue(url);
+        D4RValue *arg4_2 = new D4RValue("https://.*dap$");
+        clauses->add_clause(new D4FilterClause(D4FilterClause::match, arg4_1, arg4_2));
+
+        try {
+            CPPUNIT_ASSERT(clauses->size() == 4);
+            CPPUNIT_ASSERT(clauses->value(dmr) == false);
+            CPPUNIT_ASSERT(clauses->value() == false);
+        }
+        catch (Error &e) {
+            DBG(cerr << "Caught error: " + e.get_error_message() << endl);
+            CPPUNIT_FAIL("Exception, but the thrid clause should not have been evaluated");
+
+        }
+    }
+
+    void evaluation_order_test_2()
+    {
+        auto_ptr<D4FilterClauseList> clauses(new D4FilterClauseList());
+
+        D4RValue *arg1_1 = new D4RValue(byte);    // holds 17
+        D4RValue *arg1_2 = new D4RValue((double) 21.0);
+        clauses->add_clause(new D4FilterClause(D4FilterClause::less, arg1_1, arg1_2));
+
+        // This clause will *pass* and we *should* get to the next clause, which will
+        // throw and exception.
+        D4RValue *arg2_1 = new D4RValue(f32);       // holds pi
+        D4RValue *arg2_2 = new D4RValue(17.0);
+        clauses->add_clause(new D4FilterClause(D4FilterClause::less, arg2_1, arg2_2));
+
+        D4RValue *arg3_1 = new D4RValue(url);
+        D4RValue *arg3_2 = new D4RValue(17.0); // Error - mismatched types
+        clauses->add_clause(new D4FilterClause(D4FilterClause::equal, arg3_1, arg3_2));
+
+        D4RValue *arg4_1 = new D4RValue(url);
+        D4RValue *arg4_2 = new D4RValue("https://.*dap$");
+        clauses->add_clause(new D4FilterClause(D4FilterClause::match, arg4_1, arg4_2));
+
+        try {
+            CPPUNIT_ASSERT(clauses->size() == 4);
+            CPPUNIT_ASSERT(clauses->value(dmr));
+
+            CPPUNIT_FAIL("Expected the third clause to throw an exception.");
+        }
+        catch (Error &e) {
+            DBG(cerr << "Caught error: " + e.get_error_message() << endl);
+            CPPUNIT_ASSERT("Expected exception found.");
+        }
+    }
+
+    CPPUNIT_TEST_SUITE (D4FilterClauseTest);
+
+    CPPUNIT_TEST (Byte_and_long_long_test);
+    CPPUNIT_TEST (Byte_and_long_long_test_2);
+    CPPUNIT_TEST (Byte_and_double_test);
+    // These float --> double, etc.
+    CPPUNIT_TEST (Byte_and_int_test);
+    CPPUNIT_TEST (Byte_and_float_test);
+
+    CPPUNIT_TEST (Str_and_str_test);
+    CPPUNIT_TEST (Str_and_match_test);
+    CPPUNIT_TEST (Str_and_number_error_test);
+    CPPUNIT_TEST (Byte_and_string_error_test);
+    CPPUNIT_TEST (Structure_and_string_error_test);
+    CPPUNIT_TEST (Byte_and_Structure_error_test);
+    CPPUNIT_TEST (Str_and_Structure_error_test);
+
+    CPPUNIT_TEST (grab_bag_test);
+    CPPUNIT_TEST (float_test);
+    CPPUNIT_TEST (float_test_2);
+    CPPUNIT_TEST (float_test_3);
+    CPPUNIT_TEST (int_test);
+
+    // FilterClauseList tests
+    CPPUNIT_TEST (true_clauses_test);
+    CPPUNIT_TEST (no_clauses_test);
+    CPPUNIT_TEST (false_clauses_test);
+    CPPUNIT_TEST (evaluation_order_test);
+    CPPUNIT_TEST (evaluation_order_test_2);
+
+    CPPUNIT_TEST_SUITE_END();
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION (D4FilterClauseTest);
+
+} // namepsace libdap
+
+int main(int argc, char*argv[])
+{
+    GetOpt getopt(argc, argv, "dh");
+    int option_char;
+
+    while ((option_char = getopt()) != EOF)
+        switch (option_char) {
+        case 'd':
+            debug = 1;  // debug is a static global
+            break;
+        case 'h': {     // help - show test names
+            cerr << "Usage: D4FilterClauseTest has the following tests:" << endl;
+            const std::vector<Test*> &tests = libdap::D4FilterClauseTest::suite()->getTests();
+            unsigned int prefix_len = libdap::D4FilterClauseTest::suite()->getName().append("::").length();
+            for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+                cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+            }
+            break;
+        }
+        default:
+            break;
+        }
+
+    CppUnit::TextTestRunner runner;
+    runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
+    bool wasSuccessful = true;
+    string test = "";
+    int i = getopt.optind;
+    if (i == argc) {
+        // run them all
+        wasSuccessful = runner.run("");
+    }
+    else {
+        for (; i < argc; ++i) {
+            if (debug) cerr << "Running " << argv[i] << endl;
+            test = libdap::D4FilterClauseTest::suite()->getName().append("::").append(argv[i]);
+            wasSuccessful = wasSuccessful && runner.run(test);
+        }
+    }
+
+    return wasSuccessful ? 0 : 1;
+}
+
diff --git a/unit-tests/D4GroupTest.cc b/unit-tests/D4GroupTest.cc
new file mode 100644
index 0000000..b5f0680
--- /dev/null
+++ b/unit-tests/D4GroupTest.cc
@@ -0,0 +1,409 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#include "config.h"
+
+#include <cppunit/TextTestRunner.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+#include <cppunit/extensions/HelperMacros.h>
+
+#include "D4Group.h"
+#include "D4Attributes.h"
+
+#include "Byte.h"
+#include "Int64.h"
+#include "Structure.h"
+
+#include "XMLWriter.h"
+#include "debug.h"
+
+#include "testFile.h"
+#include "test_config.h"
+#include "GetOpt.h"
+
+static bool debug = false;
+
+#undef DBG
+#define DBG(x) do { if (debug) (x); } while(false);
+
+using namespace CppUnit;
+using namespace std;
+using namespace libdap;
+
+class D4GroupTest: public TestFixture {
+private:
+    XMLWriter *xml;
+    D4Group *root, *named;
+
+public:
+    D4GroupTest() :
+        xml(0), root(0), named(0)
+    {
+    }
+
+    ~D4GroupTest()
+    {
+    }
+
+    void setUp()
+    {
+        root = new D4Group("/");
+        named = new D4Group("test");
+        xml = new XMLWriter;
+    }
+
+    void tearDown()
+    {
+        delete xml;
+        delete root;
+        delete named;
+    }
+
+    void load_group_with_scalars(D4Group *g)
+    {
+        g->add_var_nocopy(new Byte("b"));
+        g->add_var_nocopy(new Int64("i64"));
+    }
+
+    void load_group_with_constructors_and_scalars(D4Group *g)
+    {
+        Structure *s = new Structure("s");
+        s->add_var_nocopy(new Byte("b"));
+        s->add_var_nocopy(new Int64("i64"));
+        g->add_var_nocopy(s);
+    }
+
+    void load_group_with_nested_constructors_and_scalars(D4Group *g)
+    {
+        Structure *c = new Structure("c");
+        c->add_var_nocopy(new Byte("b"));
+        c->add_var_nocopy(new Int64("i64"));
+
+        Structure *p = new Structure("p");
+        p->add_var_nocopy(c);
+
+        g->add_var_nocopy(p);
+    }
+
+    void load_group_with_stuff(D4Group *g)
+    {
+        g->dims()->add_dim_nocopy(new D4Dimension("lat", 1024));
+        g->dims()->add_dim_nocopy(new D4Dimension("lon", 1024));
+        g->dims()->add_dim_nocopy(new D4Dimension("time", 20));
+
+        D4EnumDef *color_values = new D4EnumDef("colors", dods_byte_c);
+        color_values->add_value("red", 1);
+        color_values->add_value("green", 2);
+        color_values->add_value("blue", 3);
+        g->enum_defs()->add_enum_nocopy(color_values);
+
+        D4Attribute *attr = new D4Attribute("test", StringToD4AttributeType("Int16"));
+        attr->add_value("1");
+        g->attributes()->add_attribute_nocopy(attr);
+    }
+
+    // An empty D4Group object prints nothing; the XMLWriter class adds
+    // a xml doc preface.
+    void test_print_empty()
+    {
+        root->print_dap4(*xml);
+        string doc = xml->get_doc();
+        string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4Group_empty.xml");
+        DBG(cerr << "test_print_empty: doc: " << doc << endl);
+        DBG(cerr << "test_print_empty: baseline: " << baseline << endl);
+        CPPUNIT_ASSERT(doc == baseline);
+    }
+
+    void test_print_named_empty()
+    {
+        named->print_dap4(*xml);
+        string doc = xml->get_doc();
+        string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4Group_named_empty.xml");
+        DBG(cerr << "test_print_named_empty: doc: " << doc << endl);
+        DBG(cerr << "test_print_named_empty: baseline: " << baseline << endl);
+        CPPUNIT_ASSERT(doc == baseline);
+    }
+
+    void test_print_with_vars()
+    {
+        load_group_with_scalars(root);
+
+        root->print_dap4(*xml);
+        string doc = xml->get_doc();
+        string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4Group_with_scalars.xml");
+        DBG(cerr << "test_print_with_vars: doc: " << doc << endl);
+        DBG(cerr << "test_print_with_vars: baseline: " << baseline << endl);
+        CPPUNIT_ASSERT(doc == baseline);
+    }
+
+    void test_print_named_with_vars()
+    {
+        load_group_with_scalars(named);
+
+        named->print_dap4(*xml);
+
+        string doc = xml->get_doc();
+        string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4Group_named_with_scalars.xml");
+        DBG(cerr << "test_print_named_with_vars: doc: " << doc << endl);
+        DBG(cerr << "test_print_named_with_vars: baseline: " << baseline << endl);
+        CPPUNIT_ASSERT(doc == baseline);
+    }
+
+    void test_print_with_vars_and_stuff()
+    {
+        load_group_with_scalars(root);
+        load_group_with_stuff(root);
+
+        root->print_dap4(*xml);
+        string doc = xml->get_doc();
+        string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4Group_with_scalars_and_stuff.xml");
+        DBG(cerr << "test_print_with_vars_and_stuff: doc: " << doc << endl);
+        DBG(cerr << "test_print_with_vars_and_stuff: baseline: " << baseline << endl);
+        CPPUNIT_ASSERT(doc == baseline);
+    }
+
+    void test_print_named_with_vars_and_stuff()
+    {
+        load_group_with_scalars(named);
+        load_group_with_stuff(named);
+
+        named->print_dap4(*xml);
+        string doc = xml->get_doc();
+        string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4Group_named_with_scalars_and_stuff.xml");
+        DBG(cerr << "test_print_named_with_vars_and_stuff: doc: " << doc << endl);
+        DBG(cerr << "test_print_named_with_vars_and_stuff: baseline: " << baseline << endl);
+        CPPUNIT_ASSERT(doc == baseline);
+    }
+
+    void test_find_var()
+    {
+        load_group_with_scalars(root);
+        load_group_with_stuff(root);
+
+        D4Group *child = new D4Group("child");
+        load_group_with_scalars(child);
+        load_group_with_stuff(child);
+        root->add_group(child);
+
+        child->dims()->add_dim_nocopy(new D4Dimension("extra", 17));
+
+        // Used add_group() and not add_group_nocopy()
+        delete child;
+
+        BaseType *btp = root->find_var("/b");
+        DBG(cerr << "btp: " << btp << ", name:" << btp->name() << endl);
+        DBG(cerr << "btp->parent: " << btp->get_parent() << ", name:" << btp->get_parent()->name() << endl);
+        CPPUNIT_ASSERT(btp && btp->name() == "b");
+        CPPUNIT_ASSERT(btp->get_parent()->name() == "/");
+
+        btp = root->find_var("/child/b");
+        DBG(cerr << "btp: " << btp << ", name:" << btp->name() << endl);
+        DBG(cerr << "btp->parent: " << btp->get_parent() << ", name:" << btp->get_parent()->name() << endl);
+        CPPUNIT_ASSERT(btp && btp->name() == "b");
+        CPPUNIT_ASSERT(btp->get_parent()->name() == "child" && btp->get_parent()->get_parent()->name() == "/");
+    }
+
+    void test_print_everything()
+    {
+        load_group_with_scalars(root);
+        load_group_with_stuff(root);
+
+        D4Group *child = new D4Group("child");
+        load_group_with_scalars(child);
+        load_group_with_stuff(child);
+        root->add_group(child);
+
+        child->dims()->add_dim_nocopy(new D4Dimension("extra", 17));
+
+        // Used add_group() and not add_group_nocopy()
+        delete child;
+
+        root->print_dap4(*xml);
+        string doc = xml->get_doc();
+        string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4Group_everything.xml");
+        DBG(cerr << "test_print_with_vars_and_stuff: doc: " << doc << endl);
+        DBG(cerr << "test_print_with_vars_and_stuff: baseline: " << baseline << endl);
+        CPPUNIT_ASSERT(doc == baseline);
+    }
+
+    void test_print_copy_ctor()
+    {
+        load_group_with_scalars(root);
+        load_group_with_stuff(root);
+
+        D4Group *child = new D4Group("child");
+        load_group_with_scalars(child);
+        load_group_with_stuff(child);
+        root->add_group_nocopy(child); // add it using ...nocopy() this time
+
+        D4Group lhs(*root);
+
+        lhs.print_dap4(*xml);
+        string doc = xml->get_doc();
+        string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4Group_everything.xml");
+        DBG(cerr << "test_print_copy_ctor: doc: " << doc << endl);
+        DBG(cerr << "test_print_copy_ctor: baseline: " << baseline << endl);
+        CPPUNIT_ASSERT(doc == baseline);
+    }
+
+    void test_print_assignment()
+    {
+        load_group_with_scalars(root);
+        load_group_with_stuff(root);
+
+        D4Group *child = new D4Group("child");
+        load_group_with_scalars(child);
+        load_group_with_stuff(child);
+        root->add_group_nocopy(child);
+
+        D4Group lhs = *root;
+
+        lhs.print_dap4(*xml);
+        string doc = xml->get_doc();
+        string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4Group_everything.xml");
+        DBG(cerr << "test_print_assignment: doc: " << doc << endl);
+        DBG(cerr << "test_print_assignment: baseline: " << baseline << endl);
+        CPPUNIT_ASSERT(doc == baseline);
+    }
+
+    void test_fqn_1()
+    {
+        load_group_with_scalars(root);
+
+        BaseType *btp = root->find_var("b");
+        DBG(cerr << "test_fqn_1: " << btp->FQN() << endl);
+        CPPUNIT_ASSERT(btp->FQN() == "/b");
+    }
+
+    void test_fqn_2()
+    {
+        load_group_with_constructors_and_scalars(root);
+
+        BaseType *btp = root->find_var("s.b");
+        DBG(cerr << "test_fqn_2: " << btp->FQN() << endl);
+        CPPUNIT_ASSERT(btp->FQN() == "/s.b");
+
+        btp = root->find_var("/s.b");
+        DBG(cerr << "test_fqn_2: " << btp->FQN() << endl);
+        CPPUNIT_ASSERT(btp->FQN() == "/s.b");
+    }
+
+    void test_fqn_3()
+    {
+        load_group_with_nested_constructors_and_scalars(root);
+
+        BaseType *btp = root->find_var("p.c.b");
+        DBG(cerr << "test_fqn_3: " << btp->FQN() << endl);
+        CPPUNIT_ASSERT(btp->FQN() == "/p.c.b");
+
+        btp = root->find_var("/p.c.b");
+        DBG(cerr << "test_fqn_3: " << btp->FQN() << endl);
+        CPPUNIT_ASSERT(btp->FQN() == "/p.c.b");
+    }
+
+    void test_fqn_4()
+    {
+        D4Group *local = new D4Group("child");
+        load_group_with_nested_constructors_and_scalars(local);
+        root->add_group_nocopy(local);
+
+        BaseType *btp = root->find_var("child/p.c.b");
+        DBG(cerr << "test_fqn_4: " << btp->FQN() << endl);
+        CPPUNIT_ASSERT(btp && btp->FQN() == "/child/p.c.b");
+
+        btp = root->find_var("/child/p.c.b");
+        DBG(cerr << "test_fqn_4: " << btp->FQN() << endl);
+        CPPUNIT_ASSERT(btp && btp->FQN() == "/child/p.c.b");
+    }
+
+    CPPUNIT_TEST_SUITE (D4GroupTest);
+
+    CPPUNIT_TEST (test_print_empty);
+
+    CPPUNIT_TEST (test_print_named_empty);
+    CPPUNIT_TEST (test_print_with_vars);
+    CPPUNIT_TEST (test_print_named_with_vars);
+
+    CPPUNIT_TEST (test_print_with_vars_and_stuff);
+
+    CPPUNIT_TEST (test_print_named_with_vars_and_stuff);
+    CPPUNIT_TEST (test_print_everything);
+
+    CPPUNIT_TEST (test_find_var);
+
+    CPPUNIT_TEST (test_print_copy_ctor);
+    CPPUNIT_TEST (test_print_assignment);
+
+    CPPUNIT_TEST (test_fqn_1);
+    CPPUNIT_TEST (test_fqn_2);
+    CPPUNIT_TEST (test_fqn_3);
+    CPPUNIT_TEST (test_fqn_4);
+
+    CPPUNIT_TEST_SUITE_END();
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION (D4GroupTest);
+
+int main(int argc, char *argv[])
+{
+    GetOpt getopt(argc, argv, "dh");
+    int option_char;
+    while ((option_char = getopt()) != -1)
+        switch (option_char) {
+        case 'd':
+            debug = 1;  // debug is a static global
+            break;
+        case 'h': {     // help - show test names
+            cerr << "Usage: D4GroupTest has the following tests:" << endl;
+            const std::vector<Test*> &tests = D4GroupTest::suite()->getTests();
+            unsigned int prefix_len = D4GroupTest::suite()->getName().append("::").length();
+            for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+                cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+            }
+            break;
+        }
+        default:
+            break;
+        }
+
+    CppUnit::TextTestRunner runner;
+    runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
+    bool wasSuccessful = true;
+    string test = "";
+    int i = getopt.optind;
+    if (i == argc) {
+        // run them all
+        wasSuccessful = runner.run("");
+    }
+    else {
+        for (; i < argc; ++i) {
+            if (debug) cerr << "Running " << argv[i] << endl;
+            test = D4GroupTest::suite()->getName().append("::").append(argv[i]);
+            wasSuccessful = wasSuccessful && runner.run(test);
+        }
+    }
+
+    return wasSuccessful ? 0 : 1;
+}
diff --git a/unit-tests/D4MarshallerTest.cc b/unit-tests/D4MarshallerTest.cc
new file mode 100644
index 0000000..89b1150
--- /dev/null
+++ b/unit-tests/D4MarshallerTest.cc
@@ -0,0 +1,410 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2013 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#include "config.h"
+
+#include <cppunit/TestFixture.h>
+#include <cppunit/TestAssert.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+#include <cppunit/ui/text/TestRunner.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/CompilerOutputter.h>
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <fcntl.h>
+#include <stdint.h>
+
+#include <iostream>
+#include <fstream>
+#include <sstream>
+#include <iomanip>
+#include <cstring>
+
+#include "D4StreamMarshaller.h"
+
+#include "GetOpt.h"
+#include "debug.h"
+#include "test_config.h"
+
+static bool debug = false;
+static bool write_baselines = false;
+
+#undef DBG
+#define DBG(x) do { if (debug) (x); } while(false);
+
+#if WORDS_BIGENDIAN
+const static string path = (string)TEST_SRC_DIR + "/D4-marshaller/big-endian";
+#else
+const static string path = (string) TEST_SRC_DIR + "/D4-marshaller/little-endian";
+#endif
+
+using namespace std;
+using namespace libdap;
+using namespace CppUnit;
+
+class D4MarshallerTest: public CppUnit::TestFixture {
+
+    CPPUNIT_TEST_SUITE (D4MarshallerTest);
+
+    CPPUNIT_TEST (test_cmp);
+    CPPUNIT_TEST (test_scalars);
+    CPPUNIT_TEST (test_real_scalars);
+    CPPUNIT_TEST (test_str);
+    CPPUNIT_TEST (test_opaque);
+    CPPUNIT_TEST (test_vector);
+
+    CPPUNIT_TEST_SUITE_END( );
+
+    /**
+     * Compare the contents of a file with a memory buffer
+     */
+    bool cmp(const char *buf, unsigned int len, string file)
+    {
+        fstream in;
+        in.open(file.c_str(), fstream::binary | fstream::in);
+        if (!in) throw Error("Could not open file: " + file);
+
+        vector<char> fbuf(len);
+        in.read(&fbuf[0], len);
+        if (!in) {
+            ostringstream oss("Could not read ");
+            oss << len << " bytes from file.";
+            throw Error(oss.str());
+        }
+
+        for (unsigned int i = 0; i < len; ++i)
+            if (buf[i] != fbuf[i]) {
+                DBG(cerr << "Response differs from baseline at byte " << i << endl);
+                DBG(
+                    cerr << "Expected: " << setfill('0') << setw(2) << hex << (unsigned int )fbuf[i] << "; got: "
+                        << (unsigned int )buf[i] << dec << endl);
+                return false;
+            }
+
+        return true;
+    }
+
+    void write_binary_file(const char *buf, int len, string file)
+    {
+        fstream out;
+        out.open(file.c_str(), fstream::binary | fstream::out);
+        if (!out) throw Error("Could not open file: " + file);
+        out.write(buf, len);
+    }
+
+public:
+    D4MarshallerTest()
+    {
+    }
+
+    void setUp()
+    {
+    }
+
+    void tearDown()
+    {
+    }
+
+    void test_cmp()
+    {
+        char buf[16] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 };
+        DBG(cerr << "Path: " << path << endl);
+        CPPUNIT_ASSERT(cmp(buf, 16, path + "/test_cmp.dat"));
+    }
+
+    void test_scalars()
+    {
+        ostringstream oss;
+        // computes checksums and writes data
+        try {
+            D4StreamMarshaller dsm(oss);
+
+            dsm.reset_checksum();
+
+            dsm.put_byte(17);
+            dsm.put_checksum();
+            DBG(cerr << "test_scalars: checksum: " << dsm.get_checksum() << endl);
+            dsm.reset_checksum();
+
+            dsm.put_int16(17);
+            dsm.put_checksum();
+            DBG(cerr << "checksum: " << dsm.get_checksum() << endl);
+            dsm.reset_checksum();
+
+            dsm.put_int32(17);
+            dsm.put_checksum();
+            DBG(cerr << "checksum: " << dsm.get_checksum() << endl);
+            dsm.reset_checksum();
+
+            dsm.put_int64(17);
+            dsm.put_checksum();
+            DBG(cerr << "checksum: " << dsm.get_checksum() << endl);
+            dsm.reset_checksum();
+
+            dsm.put_uint16(17);
+            dsm.put_checksum();
+            DBG(cerr << "checksum: " << dsm.get_checksum() << endl);
+            dsm.reset_checksum();
+
+            dsm.put_uint32(17);
+            dsm.put_checksum();
+            DBG(cerr << "checksum: " << dsm.get_checksum() << endl);
+            dsm.reset_checksum();
+
+            dsm.put_uint64(17);
+            dsm.put_checksum();
+            DBG(cerr << "checksum: " << dsm.get_checksum() << endl);
+            dsm.reset_checksum();
+
+            if (write_baselines)
+                write_binary_file(oss.str().data(), oss.str().length(), path + "/test_scalars_1_bin.dat");
+            CPPUNIT_ASSERT(cmp(oss.str().data(), oss.str().length(), path + "/test_scalars_1_bin.dat"));
+        }
+        catch (Error &e) {
+            cerr << "Error: " << e.get_error_message() << endl;
+            CPPUNIT_FAIL("Caught an exception.");
+        }
+    }
+
+    void test_real_scalars()
+    {
+        ostringstream oss;
+        // computes checksums and writes data
+        try {
+            D4StreamMarshaller dsm(oss);
+
+            dsm.reset_checksum();
+
+            dsm.put_float32(17);
+            dsm.put_checksum();
+            DBG(cerr << "test_real_scalars: checksum: " << dsm.get_checksum() << endl);
+            dsm.reset_checksum();
+
+            dsm.put_float64(17);
+            dsm.put_checksum();
+            DBG(cerr << "checksum: " << dsm.get_checksum() << endl);
+            dsm.reset_checksum();
+
+            if (write_baselines)
+                write_binary_file(oss.str().data(), oss.str().length(), path + "/test_scalars_2_bin.dat");
+            CPPUNIT_ASSERT(cmp(oss.str().data(), oss.str().length(), path + "/test_scalars_2_bin.dat"));
+        }
+        catch (Error &e) {
+            cerr << "Error: " << e.get_error_message() << endl;
+            CPPUNIT_FAIL("Caught an exception.");
+        }
+    }
+
+    void test_str()
+    {
+        ostringstream oss;
+        try {
+            D4StreamMarshaller dsm(oss);
+
+            dsm.reset_checksum();
+
+            dsm.put_str("This is a test string with 40 characters");
+            dsm.put_checksum();
+            DBG(cerr << "test_str: checksum: " << dsm.get_checksum() << endl);
+            dsm.reset_checksum();
+
+            // 37 chars --> 0x25 --> 0x25 as a 128-bit varint
+            dsm.put_url("http://www.opendap.org/lame/unit/test");
+            dsm.put_checksum();
+            DBG(cerr << "checksum: " << dsm.get_checksum() << endl);
+            dsm.reset_checksum();
+
+            // True these are not really scalars...
+            if (write_baselines)
+                write_binary_file(oss.str().data(), oss.str().length(), path + "/test_scalars_3_bin.dat");
+            CPPUNIT_ASSERT(cmp(oss.str().data(), oss.str().length(), path + "/test_scalars_3_bin.dat"));
+        }
+        catch (Error &e) {
+            cerr << "Error: " << e.get_error_message() << endl;
+            CPPUNIT_FAIL("Caught an exception.");
+        }
+    }
+
+    void test_opaque()
+    {
+        ostringstream oss;
+        try {
+            D4StreamMarshaller dsm(oss);
+            vector<unsigned char> buf(32768);
+            for (int i = 0; i < 32768; ++i)
+                buf[i] = i % (1 << 7);
+
+            dsm.reset_checksum();
+
+            dsm.put_opaque_dap4(reinterpret_cast<char*>(&buf[0]), 32768);
+            dsm.put_checksum();
+            DBG(cerr << "test_opaque: checksum: " << dsm.get_checksum() << endl);
+            dsm.reset_checksum();
+
+            if (write_baselines)
+                write_binary_file(oss.str().data(), oss.str().length(), path + "/test_opaque_1_bin.dat");
+            CPPUNIT_ASSERT(cmp(oss.str().data(), oss.str().length(), path + "/test_opaque_1_bin.dat"));
+        }
+        catch (Error &e) {
+            cerr << "Error: " << e.get_error_message() << endl;
+            CPPUNIT_FAIL("Caught an exception.");
+        }
+    }
+
+    void test_vector()
+    {
+        ostringstream oss;
+        try {
+            D4StreamMarshaller dsm(oss);
+            vector<unsigned char> buf1(32768);
+            for (int i = 0; i < 32768; ++i)
+                buf1[i] = i % (1 << 7);
+
+            dsm.reset_checksum();
+
+            dsm.put_vector(reinterpret_cast<char*>(&buf1[0]), 32768);
+            dsm.put_checksum();
+            DBG(cerr << "test_vector: checksum: " << dsm.get_checksum() << endl);
+            dsm.reset_checksum();
+
+            vector<dods_int32> buf2(32768);
+            for (int i = 0; i < 32768; ++i)
+                buf2[i] = i % (1 << 9);
+
+            dsm.put_vector(reinterpret_cast<char*>(&buf2[0]), 32768, sizeof(dods_int32));
+            dsm.put_checksum();
+            DBG(cerr << "checksum: " << dsm.get_checksum() << endl);
+            dsm.reset_checksum();
+
+            vector<dods_float64> buf3(32768);
+            for (int i = 0; i < 32768; ++i)
+                buf3[i] = i % (1 << 9);
+
+            dsm.put_vector_float64(reinterpret_cast<char*>(&buf3[0]), 32768);
+            dsm.put_checksum();
+            DBG(cerr << "checksum: " << dsm.get_checksum() << endl);
+
+            if (write_baselines)
+                write_binary_file(oss.str().data(), oss.str().length(), path + "/test_vector_1_bin.dat");
+            CPPUNIT_ASSERT(cmp(oss.str().data(), oss.str().length(), path + "/test_vector_1_bin.dat"));
+        }
+        catch (Error &e) {
+            cerr << "Error: " << e.get_error_message() << endl;
+            CPPUNIT_FAIL("Caught an exception.");
+        }
+    }
+#if 0
+    void test_varying_vector() {
+        ostringstream oss;
+        try {
+            D4StreamMarshaller dsm(oss);
+            vector<unsigned char> buf1(32768);
+            for (int i = 0; i < 32768; ++i)
+            buf1[i] = i % (1 << 7);
+
+            dsm.reset_checksum();
+
+            dsm.put_varying_vector(reinterpret_cast<char*>(&buf1[0]), 32768);
+            dsm.put_checksum();
+            DBG(cerr << "test_varying_vector: first checksum: " << dsm.get_checksum() << endl);
+            dsm.reset_checksum();
+
+            vector<dods_int32> buf2(32768);
+            for (int i = 0; i < 32768; ++i)
+            buf2[i] = i % (1 << 9);
+
+            dsm.put_varying_vector(reinterpret_cast<char*>(&buf2[0]), 32768, sizeof(dods_int32));
+            dsm.put_checksum();
+            DBG(cerr << "second checksum: " << dsm.get_checksum() << endl);
+            dsm.reset_checksum();
+
+            vector<dods_float64> buf3(32768);
+            for (int i = 0; i < 32768; ++i)
+            buf3[i] = i % (1 << 9);
+
+            dsm.put_varying_vector(reinterpret_cast<char*>(&buf3[0]), 32768, sizeof(dods_float64), dods_float64_c);
+            dsm.put_checksum();
+            DBG(cerr << "third checksum: " << dsm.get_checksum() << endl);
+
+            if (write_baselines) write_binary_file(oss.str().data(), oss.str().length(), path + "/test_vector_2_bin.dat");
+            CPPUNIT_ASSERT(cmp(oss.str().data(), oss.str().length(), path + "/test_vector_2_bin.dat"));
+        }
+        catch (Error &e) {
+            cerr << "Error: " << e.get_error_message() << endl;
+            CPPUNIT_FAIL("Caught an exception.");
+        }
+    }
+#endif
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION (D4MarshallerTest);
+
+int main(int argc, char*argv[])
+{
+    GetOpt getopt(argc, argv, "dwh");
+    int option_char;
+
+    while ((option_char = getopt()) != -1)
+        switch (option_char) {
+        case 'd':
+            debug = true;  // debug is a static global
+            break;
+        case 'w':
+            write_baselines = true;
+            break;
+        case 'h': {     // help - show test names
+            cerr << "Usage: D4MarshallerTest has the following tests:" << endl;
+            const std::vector<Test*> &tests = D4MarshallerTest::suite()->getTests();
+            unsigned int prefix_len = D4MarshallerTest::suite()->getName().append("::").length();
+            for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+                cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+            }
+            break;
+        }
+        default:
+            break;
+        }
+
+    CppUnit::TextTestRunner runner;
+    runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
+    bool wasSuccessful = true;
+    string test = "";
+    int i = getopt.optind;
+    if (i == argc) {
+        // run them all
+        wasSuccessful = runner.run("");
+    }
+    else {
+        for (; i < argc; ++i) {
+            if (debug) cerr << "Running " << argv[i] << endl;
+            test = D4MarshallerTest::suite()->getName().append("::").append(argv[i]);
+            wasSuccessful = wasSuccessful && runner.run(test);
+        }
+    }
+
+    return wasSuccessful ? 0 : 1;
+}
diff --git a/unit-tests/D4ParserSax2Test.cc b/unit-tests/D4ParserSax2Test.cc
new file mode 100644
index 0000000..59c8491
--- /dev/null
+++ b/unit-tests/D4ParserSax2Test.cc
@@ -0,0 +1,394 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2013 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#include "config.h"
+
+#include <cstring>
+
+#include <iostream>
+#include <fstream>
+
+#include <cppunit/TextTestRunner.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+#include <cppunit/extensions/HelperMacros.h>
+
+#include "GetOpt.h"
+
+#include "DMR.h"
+#include "D4Group.h"
+#include "XMLWriter.h"
+#include "Array.h"
+
+#include "D4BaseTypeFactory.h"
+#include "D4ParserSax2.h"
+#include "D4Maps.h"
+
+#include "InternalErr.h"
+#include "debug.h"
+
+#include "test_config.h"
+#include "testFile.h"
+
+using namespace CppUnit;
+using namespace std;
+using namespace libdap;
+
+static bool debug = false;
+static bool parser_debug = false;
+
+#undef DBG
+#define DBG(x) do { if (debug) (x); } while(false);
+
+class D4ParserSax2Test: public TestFixture {
+private:
+    D4ParserSax2 *parser;
+    DMR *dmr;
+    D4BaseTypeFactory *btf;
+    XMLWriter *xml;
+
+public:
+    D4ParserSax2Test() :
+        parser(0), dmr(0), btf(0), xml(0)
+    {
+    }
+    ~D4ParserSax2Test()
+    {
+    }
+
+    void setUp()
+    {
+        parser = new D4ParserSax2();
+        btf = new D4BaseTypeFactory;
+        dmr = new DMR(btf);
+        xml = new XMLWriter("    ");
+    }
+
+    void tearDown()
+    {
+        delete parser;
+        delete dmr;
+        delete btf;
+        delete xml;
+    }
+
+    void compare_dmr_round_trip(const string &src, const string &bl)
+    {
+        try {
+            string name = string(TEST_SRC_DIR) + src;
+            ifstream ifile(name.c_str(), ifstream::in);
+            if (!ifile) throw InternalErr(__FILE__, __LINE__, "Could not open file: " + src);
+
+            parser->intern(ifile, dmr, parser_debug);
+
+            ifile.close();
+
+            dmr->print_dap4(*xml, false);
+            string doc = xml->get_doc();
+            string baseline = readTestBaseline(string(TEST_SRC_DIR) + bl);
+            DBG(cerr << "DMR: " << doc << endl);
+            CPPUNIT_ASSERT(doc == baseline);
+        }
+        catch (Error &e) {
+            CPPUNIT_FAIL(e.get_error_message().c_str());
+        }
+    }
+
+    void compare_dmr_round_trip_string_version(const string &src, const string &bl)
+    {
+        try {
+            string document = readTestBaseline(string(TEST_SRC_DIR) + src);
+            DBG(cerr << "Parsing: " << document << endl);
+
+            parser->intern(document, dmr, parser_debug);
+
+            dmr->print_dap4(*xml, false);
+            string doc = xml->get_doc();
+            string baseline = readTestBaseline(string(TEST_SRC_DIR) + bl);
+            DBG(cerr << "DMR: " << doc << endl);
+            CPPUNIT_ASSERT(doc == baseline);
+        }
+        catch (Error &e) {
+            CPPUNIT_FAIL(e.get_error_message().c_str());
+        }
+    }
+
+    void test_empty_dmr()
+    {
+        compare_dmr_round_trip("/D4-xml/DMR_empty.xml", "/D4-xml/DMR_empty_baseline.xml");
+
+    }
+
+    void test_empty_dmr_string_version()
+    {
+        compare_dmr_round_trip_string_version("/D4-xml/DMR_empty.xml", "/D4-xml/DMR_empty_baseline.xml");
+    }
+
+    void test_attribute_def()
+    {
+        compare_dmr_round_trip("/D4-xml/DMR_0.xml", "/D4-xml/DMR_0_baseline.xml");
+
+    }
+
+    void test_attribute_def_string_version()
+    {
+        compare_dmr_round_trip_string_version("/D4-xml/DMR_0.xml", "/D4-xml/DMR_0_baseline.xml");
+    }
+
+    void test_nested_attribute_def()
+    {
+        compare_dmr_round_trip("/D4-xml/DMR_0.1.xml", "/D4-xml/DMR_0.1_baseline.xml");
+    }
+
+    void test_dimension_def()
+    {
+        compare_dmr_round_trip("/D4-xml/DMR_1.xml", "/D4-xml/DMR_1_baseline.xml");
+    }
+
+    void test_enum_def()
+    {
+        compare_dmr_round_trip("/D4-xml/DMR_2.xml", "/D4-xml/DMR_2_baseline.xml");
+    }
+
+    void test_enum_def2()
+    {
+        compare_dmr_round_trip("/D4-xml/DMR_2.1.xml", "/D4-xml/DMR_2.1_baseline.xml");
+    }
+
+    void test_simple_var_def()
+    {
+        compare_dmr_round_trip("/D4-xml/DMR_3.xml", "/D4-xml/DMR_3_baseline.xml");
+    }
+
+    void test_simple_var_with_attributes_def()
+    {
+        compare_dmr_round_trip("/D4-xml/DMR_3.1.xml", "/D4-xml/DMR_3.1_baseline.xml");
+    }
+
+    void test_array_var_def()
+    {
+        compare_dmr_round_trip("/D4-xml/DMR_3.2.xml", "/D4-xml/DMR_3.2_baseline.xml");
+    }
+
+    void test_array_var_def2()
+    {
+        compare_dmr_round_trip("/D4-xml/DMR_3.3.xml", "/D4-xml/DMR_3.3_baseline.xml");
+    }
+
+    void test_array_var_def3()
+    {
+        compare_dmr_round_trip("/D4-xml/DMR_3.4.xml", "/D4-xml/DMR_3.4_baseline.xml");
+    }
+
+    void test_array_var_def4()
+    {
+        compare_dmr_round_trip("/D4-xml/DMR_3.5.xml", "/D4-xml/DMR_3.5_baseline.xml");
+    }
+
+    void test_array_var_def4_string_version()
+    {
+        compare_dmr_round_trip_string_version("/D4-xml/DMR_3.5.xml", "/D4-xml/DMR_3.5_baseline.xml");
+    }
+
+    void test_all_simple_var_def()
+    {
+        compare_dmr_round_trip("/D4-xml/DMR_4.xml", "/D4-xml/DMR_4_baseline.xml");
+    }
+
+    void test_opaque_var_def()
+    {
+        compare_dmr_round_trip("/D4-xml/DMR_4.1.xml", "/D4-xml/DMR_4.1_baseline.xml");
+    }
+
+    void test_structure_def()
+    {
+        compare_dmr_round_trip("/D4-xml/DMR_5.xml", "/D4-xml/DMR_5_baseline.xml");
+    }
+
+    void test_structure_with_attributes_def()
+    {
+        compare_dmr_round_trip("/D4-xml/DMR_5.1.xml", "/D4-xml/DMR_5.1_baseline.xml");
+    }
+
+    void test_structure_with_attributes_def_string_version()
+    {
+        compare_dmr_round_trip_string_version("/D4-xml/DMR_5.1.xml", "/D4-xml/DMR_5.1_baseline.xml");
+    }
+
+    void test_group_def()
+    {
+        compare_dmr_round_trip("/D4-xml/DMR_6.xml", "/D4-xml/DMR_6_baseline.xml");
+    }
+
+    void test_group_with_attributes_def()
+    {
+        compare_dmr_round_trip("/D4-xml/DMR_6.1.xml", "/D4-xml/DMR_6.1_baseline.xml");
+    }
+
+    void test_group_with_enums_def()
+    {
+        compare_dmr_round_trip("/D4-xml/DMR_6.2.xml", "/D4-xml/DMR_6.2_baseline.xml");
+    }
+
+    void test_group_with_attributes_def_string_version()
+    {
+        compare_dmr_round_trip_string_version("/D4-xml/DMR_6.1.xml", "/D4-xml/DMR_6.1_baseline.xml");
+    }
+
+    void test_array_1()
+    {
+        compare_dmr_round_trip_string_version("/D4-xml/DMR_7.xml", "/D4-xml/DMR_7_baseline.xml");
+    }
+
+    void test_array_2()
+    {
+        compare_dmr_round_trip_string_version("/D4-xml/DMR_7.1.xml", "/D4-xml/DMR_7.1_baseline.xml");
+    }
+
+    void test_array_3()
+    {
+        compare_dmr_round_trip_string_version("/D4-xml/DMR_7.2.xml", "/D4-xml/DMR_7.2_baseline.xml");
+    }
+
+    void test_array_4()
+    {
+        compare_dmr_round_trip_string_version("/D4-xml/DMR_7.3.xml", "/D4-xml/DMR_7.3_baseline.xml");
+    }
+
+    void test_array_5()
+    {
+        compare_dmr_round_trip_string_version("/D4-xml/DMR_7.4.xml", "/D4-xml/DMR_7.4_baseline.xml");
+    }
+
+    void test_array_6()
+    {
+        compare_dmr_round_trip_string_version("/D4-xml/DMR_7.5.xml", "/D4-xml/DMR_7.5_baseline.xml");
+    }
+
+    void test_map_1()
+    {
+        compare_dmr_round_trip_string_version("/D4-xml/DMR_8.xml", "/D4-xml/DMR_8_baseline.xml");
+
+        // NB: dmr is global
+        Array *b1 = dynamic_cast<Array*>(dmr->root()->var("b1"));
+        CPPUNIT_ASSERT(b1 && b1->name() == "b1");
+        Array *x = dynamic_cast<Array*>(dmr->root()->var("x"));	// this is the map
+        CPPUNIT_ASSERT(x && x->name() == "x");
+
+        D4Maps::D4MapsIter m = b1->maps()->map_begin(); // there's only one map...
+        CPPUNIT_ASSERT((*m)->name() == "/x");
+        CPPUNIT_ASSERT((*m)->array() == x);
+        CPPUNIT_ASSERT((*m)->parent() == b1);
+    }
+
+    CPPUNIT_TEST_SUITE (D4ParserSax2Test);
+
+    CPPUNIT_TEST (test_empty_dmr);
+    CPPUNIT_TEST (test_dimension_def);
+    CPPUNIT_TEST (test_attribute_def);
+    CPPUNIT_TEST (test_nested_attribute_def);
+    CPPUNIT_TEST (test_enum_def);
+    CPPUNIT_TEST (test_enum_def2);
+    CPPUNIT_TEST (test_simple_var_def);
+    CPPUNIT_TEST (test_simple_var_with_attributes_def);
+    CPPUNIT_TEST (test_array_var_def);
+    CPPUNIT_TEST (test_array_var_def2);
+    CPPUNIT_TEST (test_array_var_def3);
+    CPPUNIT_TEST (test_array_var_def4);
+    CPPUNIT_TEST (test_all_simple_var_def);
+    CPPUNIT_TEST (test_opaque_var_def);
+
+    CPPUNIT_TEST (test_structure_def);
+    CPPUNIT_TEST (test_structure_with_attributes_def);
+    CPPUNIT_TEST (test_group_def);
+    CPPUNIT_TEST (test_group_with_attributes_def);
+    CPPUNIT_TEST (test_group_with_enums_def);
+
+    CPPUNIT_TEST (test_empty_dmr_string_version);
+    CPPUNIT_TEST (test_attribute_def_string_version);
+    CPPUNIT_TEST (test_group_with_attributes_def_string_version);
+    CPPUNIT_TEST (test_structure_with_attributes_def_string_version);
+    CPPUNIT_TEST (test_array_var_def4_string_version);
+
+    CPPUNIT_TEST (test_array_1);
+    CPPUNIT_TEST (test_array_2);
+    CPPUNIT_TEST (test_array_3);
+    CPPUNIT_TEST (test_array_4);
+    CPPUNIT_TEST (test_array_5);
+    CPPUNIT_TEST (test_array_6);
+
+    CPPUNIT_TEST (test_map_1);
+
+    CPPUNIT_TEST_SUITE_END();
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION (D4ParserSax2Test);
+
+int main(int argc, char*argv[])
+{
+    GetOpt getopt(argc, argv, "dph");
+    int option_char;
+
+    while ((option_char = getopt()) != -1)
+        switch (option_char) {
+        case 'd':
+            debug = 1;  // debug is a static global
+            break;
+        case 'p':
+            parser_debug = true;
+            break;
+        case 'h': {     // help - show test names
+            cerr << "Usage: D4ParserSax2Test has the following tests:" << endl;
+            const std::vector<Test*> &tests = D4ParserSax2Test::suite()->getTests();
+            unsigned int prefix_len = D4ParserSax2Test::suite()->getName().append("::").length();
+            for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+                cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+            }
+            break;
+        }
+        default:
+            break;
+        }
+
+    CppUnit::TextTestRunner runner;
+    runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
+    bool wasSuccessful = true;
+    string test = "";
+    int i = getopt.optind;
+    if (i == argc) {
+        // run them all
+        wasSuccessful = runner.run("");
+    }
+    else {
+        for (; i < argc; ++i) {
+            if (debug) cerr << "Running " << argv[i] << endl;
+            test = D4ParserSax2Test::suite()->getName().append("::").append(argv[i]);
+            wasSuccessful = wasSuccessful && runner.run(test);
+        }
+    }
+
+    xmlMemoryDump();
+
+    return wasSuccessful ? 0 : 1;
+}
diff --git a/unit-tests/D4SequenceTest.cc b/unit-tests/D4SequenceTest.cc
new file mode 100644
index 0000000..9c5aaf2
--- /dev/null
+++ b/unit-tests/D4SequenceTest.cc
@@ -0,0 +1,267 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#include <cppunit/TextTestRunner.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+#include <cppunit/extensions/HelperMacros.h>
+
+#include <string>
+#include <sstream>
+
+//#define DODS_DEBUG
+
+#include "DMR.h"
+#include "D4Group.h"
+#include "D4RValue.h"
+#include "D4FilterClause.h"
+
+#include "../tests/D4TestTypeFactory.h"
+#include "../tests/TestD4Sequence.h"
+#include "../tests/TestInt32.h"
+#include "../tests/TestStr.h"
+#include "../tests/TestFloat32.h"
+
+#include "testFile.h"
+#include "test_config.h"
+
+#include "GNURegex.h"
+#include "GetOpt.h"
+#include "debug.h"
+
+static bool debug = false;
+
+#undef DBG
+#define DBG(x) do { if (debug) (x); } while(false);
+
+using namespace CppUnit;
+using namespace std;
+
+int test_variable_sleep_interval;
+
+const static string prefix = string(TEST_SRC_DIR) + "/D4-type-testsuite/";
+
+const static string s_txt = "TestD4Sequence_s.txt";
+const static string one_clause_txt = "TestD4Sequence_one_clause.txt";
+const static string two_clause_txt = "TestD4Sequence_two_clause.txt";
+
+namespace libdap {
+
+class D4SequenceTest: public TestFixture {
+private:
+    TestD4Sequence *s;
+
+public:
+    D4SequenceTest() :
+        s(0)
+    {
+    }
+    ~D4SequenceTest()
+    {
+    }
+
+    void setUp()
+    {
+        // Set up a simple sequence. Used to test ctor, assigment, et cetera.
+        s = new TestD4Sequence("s");
+        s->add_var_nocopy(new TestInt32("i32"));
+        s->add_var_nocopy(new TestStr("str"));
+        s->add_var_nocopy(new TestFloat32("f32"));
+        s->set_series_values(true);
+        s->set_send_p(true);
+        s->set_length(7);
+    }
+
+    void tearDown()
+    {
+        delete s;
+        s = 0;
+    }
+
+    void ctor_test()
+    {
+        s->intern_data();
+        CPPUNIT_ASSERT(s->length() == 7);
+
+        ostringstream oss;
+        s->output_values(oss);
+
+        DBG(cerr << "s: " << oss.str() << endl);
+        DBG(cerr << "Baseline: " << readTestBaseline(prefix + s_txt) << endl);
+
+        CPPUNIT_ASSERT(oss.str() == readTestBaseline(prefix + s_txt));
+    }
+
+    void assignment_test()
+    {
+        TestD4Sequence ts = *s;
+        ts.intern_data();
+        CPPUNIT_ASSERT(ts.length() == 7);
+
+        ostringstream oss;
+        ts.output_values(oss);
+
+        DBG(cerr << "ts: " << oss.str() << endl);
+        //CPPUNIT_ASSERT(oss.str() == readTestBaseline(prefix + s_txt));
+    }
+
+    void copy_ctor_test()
+    {
+        auto_ptr<TestD4Sequence> ts(new TestD4Sequence(*s));
+        ts->intern_data();
+
+        CPPUNIT_ASSERT(ts->length() == 7);
+
+        ostringstream oss;
+        ts->output_values(oss);
+
+        DBG(cerr << "ts: " << oss.str() << endl);
+        //CPPUNIT_ASSERT(oss.str() == readTestBaseline(prefix + s_txt));
+    }
+
+    void one_clause_test()
+    {
+        D4RValue *arg1 = new D4RValue(s->var("i32"));
+        D4RValue *arg2 = new D4RValue((long long) 1024);
+        s->clauses().add_clause(new D4FilterClause(D4FilterClause::equal, arg1, arg2));
+
+        s->intern_data();
+
+        DBG(cerr << "one_clause_test, s->length(): " << s->length() << endl);
+
+        ostringstream oss;
+        s->output_values(oss);
+
+        DBG(cerr << "one_clause_test, s: " << oss.str() << endl);
+        CPPUNIT_ASSERT(s->length() == 1);
+
+        CPPUNIT_ASSERT(oss.str() == readTestBaseline(prefix + one_clause_txt));
+    }
+
+    void two_clause_test()
+    {
+        D4RValue *arg1 = new D4RValue(s->var("i32"));
+        D4RValue *arg2 = new D4RValue((long long) 1024);
+        s->clauses().add_clause(new D4FilterClause(D4FilterClause::greater_equal, arg1, arg2));
+
+        D4RValue *arg1_2 = new D4RValue(s->var("i32"));
+        D4RValue *arg2_2 = new D4RValue((long long) 1048576);
+        s->clauses().add_clause(new D4FilterClause(D4FilterClause::less_equal, arg1_2, arg2_2));
+
+        s->intern_data();
+
+        DBG(cerr << "two_clause_test, s->length(): " << s->length() << endl);
+
+        ostringstream oss;
+        s->output_values(oss);
+
+        DBG(cerr << "two_clause_test, s: " << oss.str() << endl);
+
+        CPPUNIT_ASSERT(s->length() == 3);
+
+        CPPUNIT_ASSERT(oss.str() == readTestBaseline(prefix + two_clause_txt));
+    }
+
+    void two_variable_test()
+    {
+        D4RValue *arg1 = new D4RValue(s->var("i32"));
+        D4RValue *arg2 = new D4RValue((long long) 1024);
+        s->clauses().add_clause(new D4FilterClause(D4FilterClause::greater_equal, arg1, arg2));
+
+        D4RValue *arg1_2 = new D4RValue(s->var("f32"));
+        D4RValue *arg2_2 = new D4RValue((long long) 0.0);
+        s->clauses().add_clause(new D4FilterClause(D4FilterClause::less, arg1_2, arg2_2));
+
+        s->intern_data();
+
+        DBG(cerr << "two_variable_test, s->length(): " << s->length() << endl);
+
+        ostringstream oss;
+        s->output_values(oss);
+
+        DBG(cerr << "two_variable_test, s: " << oss.str() << endl);
+
+        CPPUNIT_ASSERT(s->length() == 1);
+        // ...just happens to be hte same baseline file at one_clause_test()
+        CPPUNIT_ASSERT(oss.str() == readTestBaseline(prefix + one_clause_txt));
+    }
+
+    CPPUNIT_TEST_SUITE (D4SequenceTest);
+
+    CPPUNIT_TEST (ctor_test);
+    CPPUNIT_TEST (assignment_test);
+    CPPUNIT_TEST (copy_ctor_test);
+
+    CPPUNIT_TEST (one_clause_test);
+    CPPUNIT_TEST (two_clause_test);
+    CPPUNIT_TEST (two_variable_test);
+
+    CPPUNIT_TEST_SUITE_END();
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION (D4SequenceTest);
+
+}
+
+int main(int argc, char*argv[])
+{
+    GetOpt getopt(argc, argv, "dh");
+    int option_char;
+    while ((option_char = getopt()) != -1)
+        switch (option_char) {
+        case 'd':
+            debug = 1;  // debug is a static global
+            break;
+        case 'h': {     // help - show test names
+            cerr << "Usage: D4SequenceTest has the following tests:" << endl;
+            const std::vector<Test*> &tests = libdap::D4SequenceTest::suite()->getTests();
+            unsigned int prefix_len = libdap::D4SequenceTest::suite()->getName().append("::").length();
+            for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+                cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+            }
+            break;
+        }
+        default:
+            break;
+        }
+
+    CppUnit::TextTestRunner runner;
+    runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
+    bool wasSuccessful = true;
+    string test = "";
+    int i = getopt.optind;
+    if (i == argc) {
+        // run them all
+        wasSuccessful = runner.run("");
+    }
+    else {
+        for (; i < argc; ++i) {
+            if (debug) cerr << "Running " << argv[i] << endl;
+            test = libdap::D4SequenceTest::suite()->getName().append("::").append(argv[i]);
+            wasSuccessful = wasSuccessful && runner.run(test);
+        }
+    }
+
+    return wasSuccessful ? 0 : 1;
+}
diff --git a/unit-tests/D4UnMarshallerTest.cc b/unit-tests/D4UnMarshallerTest.cc
new file mode 100644
index 0000000..910a5e1
--- /dev/null
+++ b/unit-tests/D4UnMarshallerTest.cc
@@ -0,0 +1,385 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2013 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#include "config.h"
+
+#include <cppunit/TestFixture.h>
+#include <cppunit/TestAssert.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+#include <cppunit/ui/text/TestRunner.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/CompilerOutputter.h>
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <fcntl.h>
+#include <stdint.h>
+
+#include <iostream>
+#include <fstream>
+#include <iomanip>
+#include <cstring>
+
+#include "D4StreamUnMarshaller.h"
+
+#include "Type.h"
+
+#include "GetOpt.h"
+#include "debug.h"
+#include "test_config.h"
+
+static bool debug = false;
+
+#undef DBG
+#define DBG(x) do { if (debug) (x); } while(false);
+
+#if WORDS_BIGENDIAN
+const static string path = string(TEST_SRC_DIR) + "/D4-marshaller/big-endian";
+#else
+const static string path = string(TEST_SRC_DIR) + "/D4-marshaller/little-endian";
+#endif
+
+using namespace std;
+using namespace libdap;
+using namespace CppUnit;
+
+class D4UnMarshallerTest: public CppUnit::TestFixture {
+
+    CPPUNIT_TEST_SUITE (D4UnMarshallerTest);
+
+    CPPUNIT_TEST (test_scalars);
+    CPPUNIT_TEST (test_real_scalars);
+    CPPUNIT_TEST (test_str);
+    CPPUNIT_TEST (test_opaque);
+    CPPUNIT_TEST (test_vector);
+
+    CPPUNIT_TEST_SUITE_END( );
+
+    static inline bool is_host_big_endian()
+    {
+#ifdef COMPUTE_ENDIAN_AT_RUNTIME
+
+        dods_int16 i = 0x0100;
+        char *c = reinterpret_cast<char*>(&i);
+        return *c;
+
+#else
+
+#ifdef __BIG_ENDIAN__
+        return true;
+#else
+        return false;
+#endif
+
+#endif
+    }
+
+public:
+    D4UnMarshallerTest()
+    {
+    }
+
+    void setUp()
+    {
+    }
+
+    void tearDown()
+    {
+    }
+
+    void test_scalars()
+    {
+        fstream in;
+        in.exceptions(ostream::failbit | ostream::badbit);
+
+        // computes checksums and writes data
+        try {
+            string file = path + "/test_scalars_1_bin.dat";
+            DBG(cerr << "file: " << file << endl);
+            in.open(file.c_str(), fstream::binary | fstream::in);
+
+            // Don't use is_host_big_endian() because these tests should
+            // never 'twiddle bytes' They are always testing little to little
+            // of big to big
+            D4StreamUnMarshaller dsm(in, 0 /*is_host_big_endian()*/);
+
+            dods_byte b;
+            dsm.get_byte(b);
+            CPPUNIT_ASSERT(b == 17);
+            string ck = dsm.get_checksum_str();
+            DBG(cerr << "ck: " << ck << endl);
+            // Same checksum for both big- and little-endian
+            CPPUNIT_ASSERT(ck == "b8b2cf7f");
+
+            dods_int16 i1;
+            dsm.get_int16(i1);
+            CPPUNIT_ASSERT(i1 == 17);
+            ck = dsm.get_checksum_str();
+            DBG(cerr << "ck: " << ck << endl);
+            // little-endian || big-endian checksum values
+            CPPUNIT_ASSERT(ck == "120031ef" || ck == "2b69320d");
+
+            dods_int32 i2;
+            dsm.get_int32(i2);
+            CPPUNIT_ASSERT(i2 == 17);
+            ck = dsm.get_checksum_str();
+            DBG(cerr << "ck: " << ck << endl);
+            CPPUNIT_ASSERT(ck == "c9e1efe6" || ck == "4bf4ffee");
+
+            dods_int64 i3;
+            dsm.get_int64(i3);
+            CPPUNIT_ASSERT(i3 == 17);
+            ck = dsm.get_checksum_str();
+            DBG(cerr << "ck: " << ck << endl);
+            CPPUNIT_ASSERT(ck == "d533eedc" || ck == "0f92ff9b");
+
+            dods_uint16 ui1;
+            dsm.get_uint16(ui1);
+            CPPUNIT_ASSERT(ui1 == 17);
+            ck = dsm.get_checksum_str();
+            DBG(cerr << "ck: " << ck << endl);
+            CPPUNIT_ASSERT(ck == "120031ef" || ck == "2b69320d");
+
+            dods_uint32 ui2;
+            dsm.get_uint32(ui2);
+            CPPUNIT_ASSERT(ui2 == 17);
+            ck = dsm.get_checksum_str();
+            DBG(cerr << "ck: " << ck << endl);
+            CPPUNIT_ASSERT(ck == "c9e1efe6" || ck == "4bf4ffee");
+
+            dods_uint64 ui3;
+            dsm.get_uint64(ui3);
+            CPPUNIT_ASSERT(ui3 == 17);
+            ck = dsm.get_checksum_str();
+            DBG(cerr << "ck: " << ck << endl);
+            CPPUNIT_ASSERT(ck == "d533eedc" || ck == "0f92ff9b");
+        }
+        catch (Error &e) {
+            cerr << "Error: " << e.get_error_message() << endl;
+            CPPUNIT_FAIL("Caught an exception.");
+        }
+        catch (istream::failure &e) {
+            cerr << "File error: " << e.what() << endl;
+            CPPUNIT_FAIL("Caught an exception.");
+        }
+    }
+
+    void test_real_scalars()
+    {
+        fstream in;
+        in.exceptions(ostream::failbit | ostream::badbit);
+
+        // computes checksums and writes data
+        try {
+            string file = path + "/test_scalars_2_bin.dat";
+            in.open(file.c_str(), fstream::binary | fstream::in);
+            D4StreamUnMarshaller dsm(in, 0);
+
+            dods_float32 r1;
+            dsm.get_float32(r1);
+            CPPUNIT_ASSERT(r1 == 17.0);
+            string ck = dsm.get_checksum_str();
+            DBG(cerr << "ck: " << ck << endl);
+            CPPUNIT_ASSERT(ck == "d3c5bc59" || ck == "edcaaa7c");
+
+            dods_float64 r2;
+            dsm.get_float64(r2);
+            CPPUNIT_ASSERT(r2 == 17.0);
+            ck = dsm.get_checksum_str();
+            DBG(cerr << "ck: " << ck << endl);
+            CPPUNIT_ASSERT(ck == "d5a3994b" || ck == "42abb362");
+        }
+        catch (Error &e) {
+            cerr << "Error: " << e.get_error_message() << endl;
+            CPPUNIT_FAIL("Caught an exception.");
+        }
+        catch (istream::failure &e) {
+            cerr << "File error: " << e.what() << endl;
+            CPPUNIT_FAIL("Caught an exception.");
+        }
+    }
+
+    void test_str()
+    {
+        fstream in;
+        in.exceptions(ostream::failbit | ostream::badbit);
+
+        // computes checksums and writes data
+        try {
+            string file = path + "/test_scalars_3_bin.dat";
+            in.open(file.c_str(), fstream::binary | fstream::in);
+            D4StreamUnMarshaller dsm(in, 0);
+
+            string s;
+            dsm.get_str(s);
+            CPPUNIT_ASSERT(s == "This is a test string with 40 characters");
+            string ck = dsm.get_checksum_str();
+            DBG(cerr << "ck: " << ck << endl);
+            CPPUNIT_ASSERT(ck == "af117544");
+
+            string u;
+            dsm.get_url(u);
+            CPPUNIT_ASSERT(u == "http://www.opendap.org/lame/unit/test");
+            ck = dsm.get_checksum_str();
+            DBG(cerr << "ck: " << ck << endl);
+            CPPUNIT_ASSERT(ck == "41e10081");
+        }
+        catch (Error &e) {
+            cerr << "Error: " << e.get_error_message() << endl;
+            CPPUNIT_FAIL("Caught an exception.");
+        }
+        catch (istream::failure &e) {
+            cerr << "File error: " << e.what() << endl;
+            CPPUNIT_FAIL("Caught an exception.");
+        }
+    }
+
+    void test_opaque()
+    {
+        fstream in;
+        in.exceptions(ostream::failbit | ostream::badbit);
+
+        // computes checksums and writes data
+        try {
+            string file = path + "/test_opaque_1_bin.dat";
+            in.open(file.c_str(), fstream::binary | fstream::in);
+            D4StreamUnMarshaller dsm(in, 0);
+
+            char *buf2;
+            int64_t len;
+            dsm.get_opaque_dap4(&buf2, len);
+            CPPUNIT_ASSERT(len == 32768);
+            for (int i = 0; i < 32768; ++i)
+                CPPUNIT_ASSERT(buf2[i] == i % (1 << 7));
+            string ck = dsm.get_checksum_str();
+            DBG(cerr << "ck: " << ck << endl);
+            CPPUNIT_ASSERT(ck == "199ad7f5");
+
+            delete buf2;
+        }
+        catch (Error &e) {
+            cerr << "Error: " << e.get_error_message() << endl;
+            CPPUNIT_FAIL("Caught an exception.");
+        }
+        catch (istream::failure &e) {
+            cerr << "File error: " << e.what() << endl;
+            CPPUNIT_FAIL("Caught an exception.");
+        }
+    }
+
+    void test_vector()
+    {
+        fstream in;
+        in.exceptions(ostream::failbit | ostream::badbit);
+
+        // computes checksums and writes data
+        try {
+            string file = path + "/test_vector_1_bin.dat";
+            in.open(file.c_str(), fstream::binary | fstream::in);
+            D4StreamUnMarshaller dsm(in, 0);
+
+            vector<unsigned char> buf1(32768);
+            dsm.get_vector(reinterpret_cast<char*>(&buf1[0]), 32768);
+            for (int i = 0; i < 32768; ++i)
+                CPPUNIT_ASSERT(buf1[i] == i % (1 << 7));
+            string ck = dsm.get_checksum_str();
+            DBG(cerr << "ck: " << ck << endl);
+            CPPUNIT_ASSERT(ck == "199ad7f5" || ck == "199ad7f5");
+
+            vector<dods_int32> buf2(32768);
+            dsm.get_vector(reinterpret_cast<char*>(&buf2[0]), 32768, sizeof(dods_int32));
+            for (int i = 0; i < 32768; ++i)
+                CPPUNIT_ASSERT(buf2[i] == i % (1 << 9));
+            ck = dsm.get_checksum_str();
+            DBG(cerr << "ck: " << ck << endl);
+            CPPUNIT_ASSERT(ck == "5c1bf29f" || ck == "8efd2d3d");
+
+            vector<dods_float64> buf3(32768);
+            dsm.get_vector_float64(reinterpret_cast<char*>(&buf3[0]), 32768);
+            for (int i = 0; i < 32768; ++i) {
+                if (buf3[i] != i % (1 << 9)) cerr << "buf3[" << i << "]: " << buf3[i] << endl;
+                CPPUNIT_ASSERT(buf3[i] == i % (1 << 9));
+            }
+            ck = dsm.get_checksum_str();
+            DBG(cerr << "ck: " << ck << endl);
+            CPPUNIT_ASSERT(ck == "aafc2a91" || ck == "7bdf9931");
+        }
+        catch (Error &e) {
+            cerr << "Error: " << e.get_error_message() << endl;
+            CPPUNIT_FAIL("Caught an exception.");
+        }
+        catch (istream::failure &e) {
+            cerr << "File error: " << e.what() << endl;
+            CPPUNIT_FAIL("Caught an exception.");
+        }
+    }
+
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION (D4UnMarshallerTest);
+
+int main(int argc, char*argv[])
+{
+    GetOpt getopt(argc, argv, "dh");
+    int option_char;
+
+    while ((option_char = getopt()) != -1)
+        switch (option_char) {
+        case 'd':
+            debug = true;  // debug is a static global
+            break;
+        case 'h': {     // help - show test names
+            cerr << "Usage: D4UnMarshallerTest has the following tests:" << endl;
+            const std::vector<Test*> &tests = D4UnMarshallerTest::suite()->getTests();
+            unsigned int prefix_len = D4UnMarshallerTest::suite()->getName().append("::").length();
+            for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+                cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+            }
+            break;
+        }
+        default:
+            break;
+        }
+
+    CppUnit::TextTestRunner runner;
+    runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
+    bool wasSuccessful = true;
+    string test = "";
+    int i = getopt.optind;
+    if (i == argc) {
+        // run them all
+        wasSuccessful = runner.run("");
+    }
+    else {
+        for (; i < argc; ++i) {
+            if (debug) cerr << "Running " << argv[i] << endl;
+            test = D4UnMarshallerTest::suite()->getName().append("::").append(argv[i]);
+            wasSuccessful = wasSuccessful && runner.run(test);
+        }
+    }
+
+    return wasSuccessful ? 0 : 1;
+}
diff --git a/unit-tests/DASTest.cc b/unit-tests/DASTest.cc
new file mode 100644
index 0000000..b672dcb
--- /dev/null
+++ b/unit-tests/DASTest.cc
@@ -0,0 +1,141 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#include <cppunit/TextTestRunner.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+#include <cppunit/extensions/HelperMacros.h>
+
+#include <string>
+
+#include "DAS.h"
+#include "debug.h"
+#include <test_config.h>
+#include "GetOpt.h"
+
+using namespace CppUnit;
+using namespace libdap;
+
+static bool debug = false;
+
+class DASTest: public TestFixture {
+private:
+    DAS *das, *das2;
+
+public:
+    DASTest()
+    {
+    }
+    ~DASTest()
+    {
+    }
+
+    void setUp()
+    {
+        das = new DAS();
+        das2 = new DAS();
+    }
+
+    void tearDown()
+    {
+        delete das;
+        das = 0;
+        delete das2;
+        das2 = 0;
+    }
+
+    CPPUNIT_TEST_SUITE (DASTest);
+
+    CPPUNIT_TEST (error_values_test);
+    CPPUNIT_TEST (symbol_name_test);
+
+    CPPUNIT_TEST_SUITE_END();
+
+    void error_values_test()
+    {
+        try {
+            das->parse((string) TEST_SRC_DIR + "/das-testsuite/bad_value_test.1");
+            DBG2(das->print(stderr));
+        }
+        catch (Error &e) {
+            cerr << e.get_error_message() << endl;
+            CPPUNIT_ASSERT(!"Caught an unexpected Error object.");
+        }
+    }
+
+    void symbol_name_test()
+    {
+        das->parse((string) TEST_SRC_DIR + "/das-testsuite/test.34");
+        CPPUNIT_ASSERT(das->get_table("var1")->get_attr("y#z", 0) == "15");
+
+        string s = das->get_table("var1.component1.inner component")->get_attr("tag");
+        CPPUNIT_ASSERT(s == "xyz123");
+    }
+
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION (DASTest);
+
+int main(int argc, char*argv[])
+{
+    GetOpt getopt(argc, argv, "dh");
+    int option_char;
+
+    while ((option_char = getopt()) != -1)
+        switch (option_char) {
+        case 'd':
+            debug = true;  // debug is a static global
+            break;
+        case 'h': {     // help - show test names
+            cerr << "Usage: DASTest has the following tests:" << endl;
+            const std::vector<Test*> &tests = DASTest::suite()->getTests();
+            unsigned int prefix_len = DASTest::suite()->getName().append("::").length();
+            for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+                cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+            }
+            break;
+        }
+        default:
+            break;
+        }
+
+    CppUnit::TextTestRunner runner;
+    runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
+    bool wasSuccessful = true;
+    string test = "";
+    int i = getopt.optind;
+    if (i == argc) {
+        // run them all
+        wasSuccessful = runner.run("");
+    }
+    else {
+        for (; i < argc; ++i) {
+            if (debug) cerr << "Running " << argv[i] << endl;
+            test = DASTest::suite()->getName().append("::").append(argv[i]);
+            wasSuccessful = wasSuccessful && runner.run(test);
+        }
+    }
+
+    return wasSuccessful ? 0 : 1;
+}
diff --git a/unit-tests/DDSTest.cc b/unit-tests/DDSTest.cc
new file mode 100644
index 0000000..f8fc811
--- /dev/null
+++ b/unit-tests/DDSTest.cc
@@ -0,0 +1,563 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#include "config.h"
+
+#include <cppunit/TextTestRunner.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+#include <cppunit/extensions/HelperMacros.h>
+
+#include <sstream>
+
+#include "Byte.h"
+#include "Int16.h"
+#include "UInt16.h"
+#include "Int32.h"
+#include "UInt32.h"
+#include "Float32.h"
+#include "Float64.h"
+#include "Str.h"
+#include "Url.h"
+#include "Array.h"
+#include "Structure.h"
+#include "Sequence.h"
+#include "Grid.h"
+
+#include "DDS.h"
+
+#include "GNURegex.h"
+#include "GetOpt.h"
+#include "util.h"
+#include "debug.h"
+
+#include "testFile.h"
+#include "test_config.h"
+
+static bool debug = false;
+
+#undef DBG
+#define DBG(x) do { if (debug) {x;} } while(false)
+
+using namespace CppUnit;
+using namespace std;
+
+namespace libdap {
+
+class DDSTest: public TestFixture {
+private:
+    DDS *dds1, *dds2;
+    BaseTypeFactory factory;
+
+    DDS *dds_dap4;
+
+public:
+    DDSTest() :
+        dds1(0), dds2(0), dds_dap4(0)
+    {
+    }
+    ~DDSTest()
+    {
+    }
+
+    void setUp()
+    {
+        dds1 = new DDS(&factory, "test1");
+        dds2 = new DDS(&factory, "test2");
+
+        dds_dap4 = new DDS(&factory, "test2", "4.0");
+    }
+
+    void tearDown()
+    {
+        delete dds1;
+        dds1 = 0;
+        delete dds2;
+        dds2 = 0;
+
+        delete dds_dap4;
+        dds_dap4 = 0;
+    }
+
+    bool re_match(Regex &r, const string &s)
+    {
+        int match = r.match(s.c_str(), s.length());
+        DBG(cerr << "Match: " << match << " should be: " << s.length() << endl);
+        return match == static_cast<int>(s.length());
+    }
+
+    // The tests commented exercise features no longer supported
+    // by libdap. In particular, a DAS must now be properly structured
+    // to work with transfer_attributes() - if a handler builds a malformed
+    // DAS, it will need to specialize the BaseType::transfer_attributes()
+    // method.
+CPPUNIT_TEST_SUITE (DDSTest);
+    CPPUNIT_TEST(transfer_attributes_test_1);
+    CPPUNIT_TEST(transfer_attributes_test_2);
+
+    CPPUNIT_TEST(symbol_name_test);
+
+    // These test both transfer_attributes() and print_xml()
+    CPPUNIT_TEST(print_xml_test);
+
+    CPPUNIT_TEST(print_xml_test2);
+    CPPUNIT_TEST(print_xml_test3);
+
+    // The X_1 tests look at the proper merging of hdf4's _dim_n attributes.
+    // But that functionality was moved from libdap to the hdf4 handler.
+    // CPPUNIT_TEST(print_xml_test3_1);
+
+    CPPUNIT_TEST(print_xml_test4);
+    CPPUNIT_TEST(print_xml_test5);
+    // CPPUNIT_TEST(print_xml_test5_1);
+    CPPUNIT_TEST(print_xml_test6);
+    // CPPUNIT_TEST(print_xml_test6_1);
+    CPPUNIT_TEST(print_dmr_test);
+
+    CPPUNIT_TEST(get_response_size_test);
+    CPPUNIT_TEST(get_response_size_test_c);
+    CPPUNIT_TEST(get_response_size_test_c2);
+    CPPUNIT_TEST(get_response_size_test_c3);
+
+    // see comment in code below. jhrg 2/4/14 CPPUNIT_TEST(get_response_size_test_seq);
+    CPPUNIT_TEST(get_response_size_test_seq_c);
+
+    CPPUNIT_TEST_SUITE_END()
+    ;
+
+    void transfer_attributes_test_1()
+    {
+        try {
+            dds1->parse((string) TEST_SRC_DIR + "/dds-testsuite/fnoc1.nc.dds");
+            DAS das;
+            das.parse((string) TEST_SRC_DIR + "/dds-testsuite/fnoc1.nc.das");
+            dds1->transfer_attributes(&das);
+
+            DBG2(dds1->print_xml(cerr, false, ""));
+
+            AttrTable &at = dds1->get_attr_table();
+            AttrTable::Attr_iter i = at.attr_begin();
+            CPPUNIT_ASSERT(i != at.attr_end() && at.get_name(i) == "NC_GLOBAL");
+            CPPUNIT_ASSERT(i != at.attr_end() && at.get_name(++i) == "DODS_EXTRA");
+        }
+        catch (Error &e) {
+            cout << "Error: " << e.get_error_message() << endl;
+            CPPUNIT_FAIL("Error thrown!");
+        }
+    }
+
+    void transfer_attributes_test_2()
+    {
+        try {
+            dds2->parse((string) TEST_SRC_DIR + "/dds-testsuite/3B42.980909.5.HDF.dds");
+            DAS das;
+            das.parse((string) TEST_SRC_DIR + "/dds-testsuite/3B42.980909.5.hacked.HDF.das");
+            dds2->transfer_attributes(&das);
+
+            DBG2(dds2->print_xml(cerr, false, ""));
+
+            AttrTable &at = dds2->get_attr_table();
+            AttrTable::Attr_iter i = at.attr_begin();
+            CPPUNIT_ASSERT(i != at.attr_end() && at.get_name(i) == "HDF_GLOBAL");
+            CPPUNIT_ASSERT(i != at.attr_end() && at.get_name(++i) == "CoreMetadata");
+        }
+        catch (Error &e) {
+            cout << "Error: " << e.get_error_message() << endl;
+            CPPUNIT_FAIL("Error thrown!");
+        }
+    }
+
+    void symbol_name_test()
+    {
+        try {
+            // read a DDS.
+            dds1->parse((string) TEST_SRC_DIR + "/dds-testsuite/test.18");
+            CPPUNIT_ASSERT(dds1->var("oddTemp"));
+
+            dds2->parse((string) TEST_SRC_DIR + "/dds-testsuite/test.19b");
+            CPPUNIT_ASSERT(dds2->var("b#c"));
+            CPPUNIT_ASSERT(dds2->var("b%23c"));
+            CPPUNIT_ASSERT(dds2->var("huh.Image#data"));
+            CPPUNIT_ASSERT(dds2->var("c d"));
+            CPPUNIT_ASSERT(dds2->var("c%20d"));
+        }
+        catch (Error &e) {
+            cerr << e.get_error_message() << endl;
+            CPPUNIT_FAIL("Caught unexpected Error object");
+        }
+    }
+
+    void print_xml_test()
+    {
+        try {
+            dds2->parse((string) TEST_SRC_DIR + "/dds-testsuite/test.19b");
+            ostringstream oss;
+            dds2->print_xml_writer(oss, false, "http://localhost/dods/test.xyz");
+            DBG2(cerr << "Printed DDX: " << oss.str() << endl);
+
+            string baseline = readTestBaseline((string) TEST_SRC_DIR + "/dds-testsuite/test.19b.xml");
+            DBG2(cerr << "The baseline: " << baseline << endl);
+
+            CPPUNIT_ASSERT(baseline == oss.str());
+        }
+        catch (Error &e) {
+            cerr << e.get_error_message() << endl;
+            CPPUNIT_FAIL("Caught unexpected Error object");
+        }
+    }
+
+    void print_xml_test2()
+    {
+        dds2->parse((string) TEST_SRC_DIR + "/dds-testsuite/test.19c");
+        DAS das;
+        das.parse((string) TEST_SRC_DIR + "/dds-testsuite/test.19c.das");
+
+        dds2->transfer_attributes(&das);
+
+        ostringstream oss;
+        dds2->print_xml_writer(oss, false, "http://localhost/dods/test.xyz");
+
+        DBG2(cerr << oss.str() << endl);
+
+        string baseline = readTestBaseline((string) TEST_SRC_DIR + "/dds-testsuite/test.19c.xml");
+        DBG2(cerr << baseline << endl);
+        CPPUNIT_ASSERT(baseline == oss.str());
+    }
+
+    void print_xml_test3()
+    {
+        dds2->parse((string) TEST_SRC_DIR + "/dds-testsuite/test.19d");
+        DAS das;
+        das.parse((string) TEST_SRC_DIR + "/dds-testsuite/test.19d.das");
+
+        dds2->transfer_attributes(&das);
+
+        ostringstream oss;
+        dds2->print_xml_writer(oss, false, "http://localhost/dods/test.xyz");
+
+        DBG2(cerr << oss.str() << endl);
+
+        string baseline = readTestBaseline((string) TEST_SRC_DIR + "/dds-testsuite/test.19d.xml");
+        DBG2(cerr << baseline << endl);
+        CPPUNIT_ASSERT(baseline == oss.str());
+    }
+
+    // This tests the HDF4 <var>_dim_n attribute. support for that was
+    // moved to the handler itself.
+    void print_xml_test3_1()
+    {
+        dds2->parse((string) TEST_SRC_DIR + "/dds-testsuite/test.19d");
+        DAS das;
+        das.parse((string) TEST_SRC_DIR + "/dds-testsuite/test.19d1.das");
+
+        dds2->transfer_attributes(&das);
+
+        ostringstream oss;
+        dds2->print_xml_writer(oss, false, "http://localhost/dods/test.xyz");
+
+        DBG2(cerr << oss.str() << endl);
+
+        string baseline = readTestBaseline((string) TEST_SRC_DIR + "/dds-testsuite/test.19d1.xml");
+        DBG2(cerr << baseline << endl);
+        CPPUNIT_ASSERT(baseline == oss.str());
+    }
+
+    void print_xml_test4()
+    {
+        dds2->parse((string) TEST_SRC_DIR + "/dds-testsuite/test.19e");
+        DAS das;
+        das.parse((string) TEST_SRC_DIR + "/dds-testsuite/test.19e.das");
+
+        dds2->transfer_attributes(&das);
+
+        DBG(dds2->var("c%20d")->get_attr_table().print(stderr));
+
+        ostringstream oss;
+        dds2->print_xml_writer(oss, false, "http://localhost/dods/test.xyz");
+
+        DBG(cerr << oss.str() << endl);
+
+        string baseline = readTestBaseline((string) TEST_SRC_DIR + "/dds-testsuite/test.19e.xml");
+        DBG2(cerr << baseline << endl);
+        CPPUNIT_ASSERT(baseline == oss.str());
+    }
+
+    void print_xml_test5()
+    {
+        string dds_file((string) TEST_SRC_DIR + "/dds-testsuite/test.19f");
+        dds2->parse(dds_file);
+        DAS das;
+        string das_file((string) TEST_SRC_DIR + "/dds-testsuite/test.19f.das");
+        das.parse(das_file);
+        string baseline_file((string) TEST_SRC_DIR + "/dds-testsuite/test.19f.xml");
+        string baseline = readTestBaseline(baseline_file);
+
+        try {
+            dds2->transfer_attributes(&das);
+        }
+        catch (Error &e) {
+            cerr << "Error: " << e.get_error_message() << endl;
+            CPPUNIT_FAIL("Error exception");
+        }
+
+        DBG(dds2->var("huh")->get_attr_table().print(stderr));
+
+        ostringstream oss;
+        dds2->print_xml_writer(oss, false, "http://localhost/dods/test.xyz");
+
+        DBG(cerr << "BASELINE DOCUMENT: " << baseline_file << endl);
+        DBG(cerr << baseline << endl);
+
+        DBG(cerr << "RESULT DOCUMENT: " << endl);
+        DBG(cerr << oss.str() << endl);
+
+        CPPUNIT_ASSERT(baseline == oss.str());
+    }
+
+    // Tests flat DAS into a DDS; no longer supported by libdap; specialize
+    // handlers if they make these malformed DAS objects
+    void print_xml_test5_1()
+    {
+        dds2->parse((string) TEST_SRC_DIR + "/dds-testsuite/test.19f");
+        DAS das;
+        das.parse((string) TEST_SRC_DIR + "/dds-testsuite/test.19f1.das");
+
+        try {
+            dds2->transfer_attributes(&das);
+        }
+        catch (Error &e) {
+            cerr << "Error: " << e.get_error_message() << endl;
+            CPPUNIT_FAIL("Error exception");
+        }
+
+        DBG(dds2->var("huh")->get_attr_table().print(stderr));
+
+        ostringstream oss;
+        dds2->print_xml_writer(oss, false, "http://localhost/dods/test.xyz");
+
+        DBG(cerr << oss.str() << endl);
+
+        string baseline = readTestBaseline((string) TEST_SRC_DIR + "/dds-testsuite/test.19f1.xml");
+        DBG2(cerr << baseline << endl);
+        CPPUNIT_ASSERT(baseline == oss.str());
+    }
+
+    void print_xml_test6()
+    {
+        dds2->parse((string) TEST_SRC_DIR + "/dds-testsuite/test.19b");
+        DAS das;
+        das.parse((string) TEST_SRC_DIR + "/dds-testsuite/test.19b.das");
+
+        dds2->transfer_attributes(&das);
+
+        ostringstream oss;
+        dds2->print_xml_writer(oss, false, "http://localhost/dods/test.xyz");
+
+        DBG(cerr << oss.str() << endl);
+
+        string baseline = readTestBaseline((string) TEST_SRC_DIR + "/dds-testsuite/test.19b6.xml");
+        DBG2(cerr << baseline << endl);
+        CPPUNIT_ASSERT(baseline == oss.str());
+    }
+
+    // Tests flat DAS into a DDS; no longer supported by libdap; specialize
+    // handlers if they make these malformed DAS objects
+    void print_xml_test6_1()
+    {
+        dds2->parse((string) TEST_SRC_DIR + "/dds-testsuite/test.19g");
+        DAS das;
+        das.parse((string) TEST_SRC_DIR + "/dds-testsuite/test.19g.das");
+
+        try {
+            dds2->transfer_attributes(&das);
+        }
+        catch (Error &e) {
+            cerr << "Error: " << e.get_error_message() << endl;
+            CPPUNIT_FAIL("Error exception");
+        }
+
+        DBG(dds2->var("huh")->get_attr_table().print(stderr));
+
+        ostringstream oss;
+        dds2->print_xml_writer(oss, false, "http://localhost/dods/test.xyz");
+
+        DBG(cerr << oss.str() << endl);
+
+        string baseline = readTestBaseline((string) TEST_SRC_DIR + "/dds-testsuite/test.19g.xml");
+        DBG2(cerr << baseline << endl);
+        CPPUNIT_ASSERT(baseline == oss.str());
+    }
+
+    void print_dmr_test()
+    {
+        try {
+            dds_dap4->parse((string) TEST_SRC_DIR + "/dds-testsuite/fnoc1.nc.dds");
+            DAS das;
+            das.parse((string) TEST_SRC_DIR + "/dds-testsuite/fnoc1.nc.das");
+            dds_dap4->transfer_attributes(&das);
+#if 0
+            string file = (string) TEST_SRC_DIR + "/dds-testsuite/fnoc1.nc.dmr.xml";
+            ofstream d(file.c_str());
+            dds_dap4->print_dmr(d, false);
+            d.close();
+#endif
+            ostringstream oss;
+            dds_dap4->print_dmr(oss, false);
+
+            string baseline = readTestBaseline((string) TEST_SRC_DIR + "/dds-testsuite/fnoc1.nc.dmr.xml");
+
+            DBG(cerr << "Baseline: -->" << baseline << "<--" << endl);
+            DBG(cerr << "DMR: -->" << oss.str() << "<--" << endl);
+
+            CPPUNIT_ASSERT(baseline == oss.str());
+        }
+        catch (Error &e) {
+            CPPUNIT_FAIL(e.get_error_message());
+        }
+    }
+
+    void get_response_size_test()
+    {
+        dds1->parse((string) TEST_SRC_DIR + "/dds-testsuite/3B42.980909.5.HDF.dds");
+        CPPUNIT_ASSERT(dds1->get_request_size(false) == 230400);
+        DBG(cerr << "3B42.980909.5.HDF response size: " << dds1->get_request_size(false) << endl);
+
+        dds2->parse((string) TEST_SRC_DIR + "/dds-testsuite/coads_climatology.nc.dds");
+        CPPUNIT_ASSERT(dds2->get_request_size(false) == 3119424);
+        DBG(cerr << "coads_climatology.nc response size: " << dds2->get_request_size(false) << endl);
+    }
+
+    void get_response_size_test_c()
+    {
+        ConstraintEvaluator eval;
+
+        dds1->parse((string) TEST_SRC_DIR + "/dds-testsuite/3B42.980909.5.HDF.dds");
+        eval.parse_constraint("percipitate", *dds1);
+        DBG(cerr << "3B42.980909.5.HDF response size: " << dds1->get_request_size(true) << endl);
+        CPPUNIT_ASSERT(dds1->get_request_size(true) == 115200);
+        CPPUNIT_ASSERT(dds1->get_request_size(false) == 230400);
+
+        dds2->parse((string) TEST_SRC_DIR + "/dds-testsuite/coads_climatology.nc.dds");
+        eval.parse_constraint("SST", *dds2);
+        DBG(cerr << "coads_climatology.nc response size: " << dds2->get_request_size(true) << endl);
+        CPPUNIT_ASSERT(dds2->get_request_size(true) == 779856);
+        CPPUNIT_ASSERT(dds2->get_request_size(false) == 3119424);
+    }
+
+    void get_response_size_test_c2()
+    {
+        ConstraintEvaluator eval;
+        dds2->parse((string) TEST_SRC_DIR + "/dds-testsuite/coads_climatology.nc.dds");
+        eval.parse_constraint("SST[0:5][0:44][0:89]", *dds2);
+        //cerr << "coads_climatology.nc response size: " << dds2->get_request_size(true) << endl;
+        CPPUNIT_ASSERT(dds2->get_request_size(true) == 98328);
+    }
+
+    void get_response_size_test_c3()
+    {
+        ConstraintEvaluator eval;
+        dds2->parse((string) TEST_SRC_DIR + "/dds-testsuite/coads_climatology.nc.dds");
+        eval.parse_constraint("SST[0][0:44][0:89]", *dds2);
+        DBG(cerr << "coads_climatology.nc response size: " << dds2->get_request_size(true) << endl);
+        CPPUNIT_ASSERT(dds2->get_request_size(true) == 17288);
+    }
+
+#if 0
+    // This test includes a DAP String and the current implementation of Str::width(bool)
+    // returns sizeof(std::string) which I'm not sure is what it should be doing. Return to
+    // this and decide if it should be returning *string or ...? jhrg 2/4/14
+    // FIXME
+    void get_response_size_test_seq() {
+        ConstraintEvaluator eval;
+        dds2->parse((string) TEST_SRC_DIR + "/dds-testsuite/S2000415.HDF.dds");
+        eval.parse_constraint("NSCAT%20Rev%2020.NSCAT%20L2", *dds2);
+        DBG(cerr << "S2000415.HDF response size: " << dds2->get_request_size(true) << endl);
+        DBG(dds2->print_constrained(cerr));
+        CPPUNIT_ASSERT(dds2->get_request_size(true) == 16 || dds2->get_request_size(true) == 12);
+        // sizeof(string) == 8 or 4 depending on the compiler version (?)
+    }
+#endif
+
+    void get_response_size_test_seq_c()
+    {
+        ConstraintEvaluator eval;
+        dds2->parse((string) TEST_SRC_DIR + "/dds-testsuite/S2000415.HDF.dds");
+        eval.parse_constraint("NSCAT%20Rev%2020.NSCAT%20L2.Low_Wind_Speed_Flag", *dds2);
+        DBG(cerr << "S2000415.HDF response size: " << dds2->get_request_size(true) << endl);
+        DBG(dds2->print_constrained(cerr));
+        CPPUNIT_ASSERT(dds2->get_request_size(true) == 4);
+    }
+
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION(DDSTest);
+
+} // namespace libdap
+
+int main(int argc, char *argv[])
+{
+    GetOpt getopt(argc, argv, "dh");
+    int option_char;
+
+    while ((option_char = getopt()) != -1)
+        switch (option_char) {
+        case 'd':
+            debug = 1;  // debug is a static global
+            break;
+
+        case 'h': {     // help - show test names
+            cerr << "Usage: DDSTest has the following tests:" << endl;
+            const std::vector<Test*> &tests = libdap::DDSTest::suite()->getTests();
+            unsigned int prefix_len = libdap::DDSTest::suite()->getName().append("::").length();
+            for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+                cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+            }
+            return 1;
+            break;
+        }
+
+        default:
+            break;
+        }
+
+    CppUnit::TextTestRunner runner;
+    runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
+    bool wasSuccessful = true;
+    string test = "";
+    int i = getopt.optind;
+    if (i == argc) {
+        // run them all
+        wasSuccessful = runner.run("");
+    }
+    else {
+        for (; i < argc; ++i) {
+            if (debug) cerr << "Running " << argv[i] << endl;
+            test = libdap::DDSTest::suite()->getName().append("::").append(argv[i]);
+            wasSuccessful = wasSuccessful && runner.run(test);
+        }
+    }
+
+    return wasSuccessful ? 0 : 1;
+}
+
diff --git a/unit-tests/DDXParserTest.cc b/unit-tests/DDXParserTest.cc
new file mode 100644
index 0000000..dcdc6d0
--- /dev/null
+++ b/unit-tests/DDXParserTest.cc
@@ -0,0 +1,710 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// Tests for the AISResources class.
+
+#include <cppunit/TextTestRunner.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+#include <cppunit/extensions/HelperMacros.h>
+
+#include "GetOpt.h"
+
+#include "DDXParserSAX2.h"
+#include "BaseTypeFactory.h"
+#include "ObjectType.h"
+#include "mime_util.h"
+#include "debug.h"
+
+#include <test_config.h>
+
+using namespace CppUnit;
+using namespace std;
+using namespace libdap;
+
+static bool debug = false;
+
+#undef DBG
+#define DBG(x) do { if (debug) (x); } while(false);
+
+namespace libdap {
+
+class DDXParserTest: public TestFixture {
+private:
+    BaseTypeFactory *factory;
+    DDXParser *ddx_parser;
+    DDS *dds;
+
+public:
+    DDXParserTest()
+    {
+    }
+    ~DDXParserTest()
+    {
+    }
+
+    void setUp()
+    {
+        factory = new BaseTypeFactory;
+        ddx_parser = new DDXParser(factory);
+        dds = new DDS(factory);
+    }
+
+    void tearDown()
+    {
+        delete ddx_parser;
+        ddx_parser = 0;
+        delete factory;
+        factory = 0;
+        delete dds;
+        dds = 0;
+    }
+
+    CPPUNIT_TEST_SUITE (DDXParserTest);
+
+    CPPUNIT_TEST (other_xml_parse_test1);
+    CPPUNIT_TEST (other_xml_parse_test2);
+    CPPUNIT_TEST (other_xml_parse_test3);
+    CPPUNIT_TEST (dap_version_test);
+    CPPUNIT_TEST (no_blob_version_32_test);
+    CPPUNIT_TEST (blob_in_version_32_test);
+    CPPUNIT_TEST (parsing_ddx_from_dataddx_test);
+    CPPUNIT_TEST (top_level_attribute_test);
+    CPPUNIT_TEST (top_level_attribute_container_test);
+    CPPUNIT_TEST (top_level_simple_types_test);
+    CPPUNIT_TEST (top_level_simple_types_with_attributes_test);
+    CPPUNIT_TEST (simple_arrays_test);
+    CPPUNIT_TEST (simple_arrays_multi_dim_test);
+    CPPUNIT_TEST (simple_arrays_attributes_test);
+    CPPUNIT_TEST (structure_test);
+    CPPUNIT_TEST (sequence_test);
+    CPPUNIT_TEST (grid_test);
+    CPPUNIT_TEST (intern_stream_test);
+    CPPUNIT_TEST (intern_ddx_from_dataddx_test);
+    // FILE I/O tests
+    CPPUNIT_TEST (top_level_simple_types_test_file_stream);
+    CPPUNIT_TEST (structure_test_file_ptr);
+
+#if 0
+    // All of these fail; maybe because on OSX 10.9 something about
+    // libxml2 is odd. Investigate. jhrg 2/4/14
+    // FIXME
+
+    // C++ Stream I/O tests
+    CPPUNIT_TEST(top_level_simple_types_test_cpp_stream);
+    CPPUNIT_TEST(structure_test_cpp_stream);
+    CPPUNIT_TEST(sequence_test_cpp_stream);
+    CPPUNIT_TEST(grid_test_cpp_stream);
+#endif
+    // Error tests
+    CPPUNIT_TEST (unknown_tag_test);
+    CPPUNIT_TEST (bad_nesting_test);
+    CPPUNIT_TEST (unknown_end_tag_test);
+    CPPUNIT_TEST (variable_in_attribtue_container_test);
+    CPPUNIT_TEST (simple_type_missing_attribute_test);
+    CPPUNIT_TEST (array_missing_dimension_test);
+    CPPUNIT_TEST (array_missing_dimension_stream_read_test);
+
+    CPPUNIT_TEST_SUITE_END();
+
+    void other_xml_parse_test1()
+    {
+        try {
+            string cid;
+            ddx_parser->intern((string) TEST_SRC_DIR + "/ddx-testsuite/test.1.other_xml.ddx", dds, cid);
+            DBG(dds->print_xml(cout, false, "    "));
+            CPPUNIT_ASSERT(dds->get_dataset_name() == "200803061600_HFRadar_USEGC_6km_rtv_SIO.nc");
+            CPPUNIT_ASSERT(dds->get_dap_major() == 3);
+            CPPUNIT_ASSERT(dds->get_dap_minor() == 3);
+        }
+        catch (DDXParseFailed &e) {
+            DBG(cerr << endl << "Error: " << e.get_error_message() << endl);
+            CPPUNIT_FAIL("test.00.ddx failed.");
+        }
+    }
+
+    void other_xml_parse_test2()
+    {
+        try {
+            string cid;
+            ddx_parser->intern((string) TEST_SRC_DIR + "/ddx-testsuite/test.2.other_xml.ddx", dds, cid);
+            DBG(dds->print_xml(cout, false, "    "));
+            CPPUNIT_ASSERT(dds->get_dataset_name() == "200803061600_HFRadar_USEGC_6km_rtv_SIO.nc");
+            CPPUNIT_ASSERT(dds->get_dap_major() == 3);
+            CPPUNIT_ASSERT(dds->get_dap_minor() == 3);
+        }
+        catch (DDXParseFailed &e) {
+            DBG(cerr << endl << "Error: " << e.get_error_message() << endl);
+            CPPUNIT_FAIL("test.00.ddx failed.");
+        }
+    }
+
+    void other_xml_parse_test3()
+    {
+        try {
+            string cid;
+            ddx_parser->intern((string) TEST_SRC_DIR + "/ddx-testsuite/test.3.other_xml.ddx", dds, cid);
+            DBG(dds->print_xml(cout, false, "    "));
+            CPPUNIT_ASSERT(dds->get_dataset_name() == "200803061600_HFRadar_USEGC_6km_rtv_SIO.nc");
+            CPPUNIT_ASSERT(dds->get_dap_major() == 3);
+            CPPUNIT_ASSERT(dds->get_dap_minor() == 3);
+        }
+        catch (DDXParseFailed &e) {
+            DBG(cerr << endl << "Error: " << e.get_error_message() << endl);
+            CPPUNIT_FAIL("test.00.ddx failed.");
+        }
+    }
+
+    void dap_version_test()
+    {
+        FILE *in;
+        try {
+            string blob;
+            ddx_parser->intern((string) TEST_SRC_DIR + "/ddx-testsuite/test.00.ddx", dds, blob);
+            CPPUNIT_ASSERT(dds->get_dataset_name() == "SimpleTypes");
+            CPPUNIT_ASSERT(dds->get_dap_major() == 3);
+            CPPUNIT_ASSERT(dds->get_dap_minor() == 2);
+
+            DBG(dds->print_xml(cout, false));
+
+            string name = string(TEST_SRC_DIR) + "/ddx-testsuite/test.00.ddx";
+            in = fopen(name.c_str(), "r");
+
+            ddx_parser->intern_stream(in, dds, blob);
+
+            CPPUNIT_ASSERT(dds->get_dataset_name() == "SimpleTypes");
+            CPPUNIT_ASSERT(dds->get_dap_major() == 3);
+            CPPUNIT_ASSERT(dds->get_dap_minor() == 2);
+
+            DBG(dds->print_xml(cout, false));
+        }
+        catch (DDXParseFailed &e) {
+            DBG(cerr << endl << "Error: " << e.get_error_message() << endl);
+            CPPUNIT_FAIL("test.00.ddx failed.");
+        }
+
+        fclose(in);
+    }
+
+    void no_blob_version_32_test()
+    {
+        try {
+            string blob;
+            ddx_parser->intern((string) TEST_SRC_DIR + "/ddx-testsuite/test.0c.ddx", dds, blob);
+            CPPUNIT_ASSERT(dds->get_dataset_name() == "SimpleTypes");
+            CPPUNIT_ASSERT(dds->get_dap_major() == 3);
+            CPPUNIT_ASSERT(dds->get_dap_minor() == 2);
+
+            DBG(dds->print_xml(cout, false));
+        }
+        catch (DDXParseFailed &e) {
+            DBG(cerr << endl << "Error: " << e.get_error_message() << endl);
+            CPPUNIT_FAIL("test.0c.ddx failed.");
+        }
+    }
+
+    void blob_in_version_32_test()
+    {
+        try {
+            string blob;
+            ddx_parser->intern((string) TEST_SRC_DIR + "/ddx-testsuite/test.0d.ddx", dds, blob);
+            CPPUNIT_FAIL("Parsing test.0d.ddx should fail since it's a DAP 3.2 doc with a dataBLOB tag.");
+
+            DBG(dds->print_xml(cout, false));
+        }
+        catch (DDXParseFailed &e) {
+            DBG(cerr << endl << "Error: " << e.get_error_message() << endl);
+            CPPUNIT_ASSERT("test.0d.ddx failed as expected.");
+        }
+    }
+
+    void parsing_ddx_from_dataddx_test()
+    {
+        try {
+            string blob;
+            ddx_parser->intern((string) TEST_SRC_DIR + "/ddx-testsuite/DDX_from_dataddx.xml", dds, blob);
+            CPPUNIT_ASSERT(true);
+            DBG(dds->print_xml(cout, false));
+        }
+        catch (DDXParseFailed &e) {
+            CPPUNIT_FAIL(e.get_error_message());
+        }
+
+    }
+
+    void top_level_attribute_test()
+    {
+        try {
+            string blob;
+            ddx_parser->intern((string) TEST_SRC_DIR + "/ddx-testsuite/test.01.ddx", dds, blob);
+            CPPUNIT_ASSERT(dds->get_dataset_name() == "SimpleTypes");
+
+            DBG(dds->print_xml(cout, false));
+        }
+        catch (DDXParseFailed &e) {
+            DBG(cerr << endl << "Error: " << e.get_error_message() << endl);
+            CPPUNIT_FAIL("test.01.ddx failed.");
+        }
+    }
+
+    void top_level_attribute_container_test()
+    {
+        try {
+            string blob;
+            ddx_parser->intern((string) TEST_SRC_DIR + "/ddx-testsuite/test.02.ddx", dds, blob);
+            CPPUNIT_ASSERT(dds->get_dataset_name() == "SimpleTypes");
+            DBG(dds->print_xml(cout, false));
+        }
+        catch (DDXParseFailed &e) {
+            DBG(cerr << endl << "Error: " << e.get_error_message() << endl);
+            CPPUNIT_FAIL("test.02.ddx failed.");
+        }
+    }
+
+    // ALiases are broken *** 05/29/03 jhrg
+    void top_level_attribute_alias_test()
+    {
+        try {
+            string blob;
+            ddx_parser->intern((string) TEST_SRC_DIR + "/ddx-testsuite/test.03.ddx", dds, blob);
+            CPPUNIT_ASSERT(dds->get_dataset_name() == "SimpleTypes");
+            DBG(dds->print_xml(cout, false));
+        }
+        catch (DDXParseFailed &e) {
+            DBG(cerr << endl << "Error: " << e.get_error_message() << endl);
+            CPPUNIT_FAIL("test.03.ddx failed.");
+        }
+    }
+
+    void top_level_simple_types_test()
+    {
+        try {
+            string blob;
+            ddx_parser->intern((string) TEST_SRC_DIR + "/ddx-testsuite/test.04.ddx", dds, blob);
+            CPPUNIT_ASSERT(dds->get_dataset_name() == "SimpleTypes");
+            DBG(dds->print_xml(cout, false));
+        }
+        catch (DDXParseFailed &e) {
+            DBG(cerr << endl << "DDXParseFailed: " << e.get_error_message() << endl);
+            CPPUNIT_FAIL("test.04.ddx failed.");
+        }
+        catch (Error &e) {
+            DBG(cerr << endl << "Error: " << e.get_error_message() << endl);
+            CPPUNIT_FAIL("test.04.ddx failed.");
+        }
+    }
+
+#if 0 // working
+    void top_level_simple_types_with_attributes_test()
+    {
+        try {
+            string blob;
+            ddx_parser->intern((string) TEST_SRC_DIR
+                + "/ddx-testsuite/test.05.ddx", dds, blob);
+            CPPUNIT_ASSERT(dds->get_dataset_name() == "SimpleTypes");
+            DBG(dds->print_xml(cout, false))
+            ;
+        }
+        catch (DDXParseFailed &e) {
+            DBG(cerr << endl << "Error: " << e.get_error_message() << endl);
+            CPPUNIT_FAIL("test.05.ddx failed.");
+        }
+    }
+#else
+    void top_level_simple_types_test_file_stream()
+    {
+        FILE *in;
+        try {
+            string blob;
+            in = fopen(((string) TEST_SRC_DIR + "/ddx-testsuite/test.04.ddx").c_str(), "r");
+            ddx_parser->intern_stream(in, dds, blob);
+            fclose(in);
+            CPPUNIT_ASSERT(dds->get_dataset_name() == "SimpleTypes");
+            DBG(dds->print_xml(cout, false));
+        }
+        catch (DDXParseFailed &e) {
+            fclose(in);
+            DBG(cerr << endl << "DDXParseFailed: " << e.get_error_message() << endl);
+            CPPUNIT_FAIL("test.04.ddx failed.");
+        }
+        catch (Error &e) {
+            fclose(in);
+            DBG(cerr << endl << "Error: " << e.get_error_message() << endl);
+            CPPUNIT_FAIL("test.04.ddx failed.");
+        }
+    }
+
+    void top_level_simple_types_test_cpp_stream()
+    {
+        try {
+            string blob;
+            ifstream in(((string) TEST_SRC_DIR + "/ddx-testsuite/test.04.ddx").c_str());
+            ddx_parser->intern_stream(in, dds, blob);
+            DBG(dds->print_xml(cout, false));
+            CPPUNIT_ASSERT(dds->get_dataset_name() == "SimpleTypes");
+        }
+        catch (DDXParseFailed &e) {
+            DBG(cerr << endl << "DDXParseFailed: " << e.get_error_message() << endl);
+            CPPUNIT_FAIL("test.04.ddx failed.");
+        }
+        catch (Error &e) {
+            DBG(cerr << endl << "Error: " << e.get_error_message() << endl);
+            CPPUNIT_FAIL("test.04.ddx failed.");
+        }
+    }
+
+    void top_level_simple_types_with_attributes_test()
+    {
+        try {
+            string blob;
+            ddx_parser->intern((string) TEST_SRC_DIR + "/ddx-testsuite/test.05.ddx", dds, blob);
+            CPPUNIT_ASSERT(dds->get_dataset_name() == "SimpleTypes");
+            DBG(dds->print_xml(cout, false));
+        }
+        catch (DDXParseFailed &e) {
+            DBG(cerr << endl << "Error: " << e.get_error_message() << endl);
+            CPPUNIT_FAIL("test.05.ddx failed.");
+        }
+    }
+#endif
+
+    void simple_arrays_test()
+    {
+        try {
+            string blob;
+            ddx_parser->intern((string) TEST_SRC_DIR + "/ddx-testsuite/test.06.ddx", dds, blob);
+            CPPUNIT_ASSERT(dds->get_dataset_name() == "OneDimensionalSimpleArrays");
+            DBG(dds->print_xml(cout, false));
+        }
+        catch (DDXParseFailed &e) {
+            DBG(cerr << endl << "Error: " << e.get_error_message() << endl);
+            CPPUNIT_FAIL("test.06.ddx failed.");
+        }
+    }
+
+    void simple_arrays_multi_dim_test()
+    {
+        try {
+            string blob;
+            ddx_parser->intern((string) TEST_SRC_DIR + "/ddx-testsuite/test.07.ddx", dds, blob);
+            CPPUNIT_ASSERT(dds->get_dataset_name() == "MultiDimensionalSimpleArrays");
+            DBG(dds->print_xml(cout, false));
+        }
+        catch (DDXParseFailed &e) {
+            DBG(cerr << endl << "Error: " << e.get_error_message() << endl);
+            CPPUNIT_FAIL("test.07.ddx failed.");
+        }
+    }
+
+    void simple_arrays_attributes_test()
+    {
+        try {
+            string blob;
+            ddx_parser->intern((string) TEST_SRC_DIR + "/ddx-testsuite/test.08.ddx", dds, blob);
+            CPPUNIT_ASSERT(dds->get_dataset_name() == "testdata");
+            DBG(dds->print_xml(cout, false));
+        }
+        catch (DDXParseFailed &e) {
+            DBG(cerr << endl << "Error: " << e.get_error_message() << endl);
+            CPPUNIT_FAIL("test.08.ddx failed.");
+        }
+    }
+
+    void structure_test()
+    {
+        try {
+            string blob;
+            ddx_parser->intern((string) TEST_SRC_DIR + "/ddx-testsuite/test.09.ddx", dds, blob);
+            CPPUNIT_ASSERT(dds->get_dataset_name() == "testdata");
+            DBG(dds->print_xml(cout, false));
+        }
+        catch (DDXParseFailed &e) {
+            DBG(cerr << endl << "Error: " << e.get_error_message() << endl);
+            CPPUNIT_FAIL("test.09.ddx failed.");
+        }
+    }
+
+    void sequence_test()
+    {
+        try {
+            string blob;
+            ddx_parser->intern((string) TEST_SRC_DIR + "/ddx-testsuite/test.0a.ddx", dds, blob);
+            CPPUNIT_ASSERT(dds->get_dataset_name() == "testdata");
+            DBG(dds->print_xml(cout, false));
+        }
+        catch (DDXParseFailed &e) {
+            DBG(cerr << endl << "Error: " << e.get_error_message() << endl);
+            CPPUNIT_FAIL("test.0a.ddx failed.");
+        }
+    }
+
+    void structure_test_file_ptr()
+    {
+        FILE *in;
+        try {
+            string blob;
+            in = fopen((string(TEST_SRC_DIR) + "/ddx-testsuite/test.09.ddx").c_str(), "r");
+            ddx_parser->intern_stream(in, dds, blob);
+            fclose(in);
+            CPPUNIT_ASSERT(dds->get_dataset_name() == "testdata");
+            DBG(dds->print_xml(cout, false));
+        }
+        catch (DDXParseFailed &e) {
+            fclose(in);
+            DBG(cerr << endl << "Error: " << e.get_error_message() << endl);
+            CPPUNIT_FAIL("test.09.ddx failed.");
+        }
+    }
+
+    void structure_test_cpp_stream()
+    {
+        try {
+            string blob;
+            ifstream input((string(TEST_SRC_DIR) + "/ddx-testsuite/test.09.ddx").c_str());
+            ddx_parser->intern_stream(input, dds, blob);
+            CPPUNIT_ASSERT(dds->get_dataset_name() == "testdata");
+            DBG(dds->print_xml(cout, false));
+        }
+        catch (DDXParseFailed &e) {
+            DBG(cerr << endl << "Error: " << e.get_error_message() << endl);
+            CPPUNIT_FAIL("test.09.ddx failed.");
+        }
+    }
+
+    void sequence_test_cpp_stream()
+    {
+        try {
+            string blob;
+            ifstream input((string(TEST_SRC_DIR) + "/ddx-testsuite/test.0a.ddx").c_str());
+            ddx_parser->intern_stream(input, dds, blob);
+            CPPUNIT_ASSERT(dds->get_dataset_name() == "testdata");
+            DBG(dds->print_xml(cout, false));
+        }
+        catch (DDXParseFailed &e) {
+            DBG(cerr << endl << "Error: " << e.get_error_message() << endl);
+            CPPUNIT_FAIL("test.0a.ddx failed.");
+        }
+    }
+
+    void grid_test()
+    {
+        try {
+            string blob;
+            ddx_parser->intern((string) TEST_SRC_DIR + "/ddx-testsuite/test.0b.ddx", dds, blob);
+            CPPUNIT_ASSERT(dds->get_dataset_name() == "testdata");
+            DBG(dds->print_xml(cout, false));
+        }
+        catch (DDXParseFailed &e) {
+            DBG(cerr << endl << "Error: " << e.get_error_message() << endl);
+            CPPUNIT_FAIL("test.0b.ddx failed.");
+        }
+    }
+
+    void grid_test_cpp_stream()
+    {
+        try {
+            string blob;
+            ifstream input((string(TEST_SRC_DIR) + "/ddx-testsuite/test.0b.ddx").c_str());
+            ddx_parser->intern_stream(input, dds, blob);
+            CPPUNIT_ASSERT(dds->get_dataset_name() == "testdata");
+            DBG(dds->print_xml(cout, false));
+        }
+        catch (DDXParseFailed &e) {
+            DBG(cerr << endl << "Error: " << e.get_error_message() << endl);
+            CPPUNIT_FAIL("test.0b.ddx failed.");
+        }
+    }
+
+    void intern_stream_test()
+    {
+        try {
+            string file_name = (string) TEST_SRC_DIR + "/ddx-testsuite/test.0b.ddx";
+            FILE *in = fopen(file_name.c_str(), "r");
+            string blob;
+            ddx_parser->intern_stream(in, dds, blob);
+            CPPUNIT_ASSERT(dds->get_dataset_name() == "testdata");
+            DBG(dds->print_xml(cout, false));
+        }
+        catch (DDXParseFailed &e) {
+            DBG(cerr << endl << "Error: " << e.get_error_message() << endl);
+            CPPUNIT_FAIL("test.0b.ddx failed.");
+        }
+    }
+
+    // Error tests start here.
+
+    void unknown_tag_test()
+    {
+        try {
+            string blob;
+            ddx_parser->intern((string) TEST_SRC_DIR + "/ddx-testsuite/error.01.ddx", dds, blob);
+            CPPUNIT_FAIL("error.01.ddx should fail!");
+        }
+        catch (DDXParseFailed &e) {
+            DBG(cerr << "Error: " << e.get_error_message() << endl);
+        }
+    }
+
+    void bad_nesting_test()
+    {
+        try {
+            string blob;
+            ddx_parser->intern((string) TEST_SRC_DIR + "/ddx-testsuite/error.02.ddx", dds, blob);
+            CPPUNIT_FAIL("error.02.ddx should fail!");
+        }
+        catch (DDXParseFailed &e) {
+            DBG(cerr << "Error: " << e.get_error_message() << endl);
+        }
+    }
+
+    void unknown_end_tag_test()
+    {
+        try {
+            string blob;
+            ddx_parser->intern((string) TEST_SRC_DIR + "/ddx-testsuite/error.03.ddx", dds, blob);
+            CPPUNIT_FAIL("error.03.ddx should fail!");
+        }
+        catch (DDXParseFailed &e) {
+            DBG(cerr << "Error: " << e.get_error_message() << endl);
+        }
+    }
+
+    void variable_in_attribtue_container_test()
+    {
+        try {
+            string blob;
+            ddx_parser->intern((string) TEST_SRC_DIR + "/ddx-testsuite/error.04.ddx", dds, blob);
+            CPPUNIT_FAIL("error.04.ddx should fail!");
+        }
+        catch (DDXParseFailed &e) {
+            DBG(cerr << "Error: " << e.get_error_message() << endl);
+        }
+    }
+
+    void array_missing_dimension_test()
+    {
+        try {
+            string blob;
+            ddx_parser->intern((string) TEST_SRC_DIR + "/ddx-testsuite/error.05.ddx", dds, blob);
+            CPPUNIT_FAIL("error.05.ddx should fail!");
+        }
+        catch (DDXParseFailed &e) {
+            DBG(cerr << "Error: " << e.get_error_message() << endl);
+        }
+    }
+
+    void simple_type_missing_attribute_test()
+    {
+        try {
+            string blob;
+            ddx_parser->intern((string) TEST_SRC_DIR + "/ddx-testsuite/error.06.ddx", dds, blob);
+            CPPUNIT_FAIL("error.06.ddx should fail!");
+        }
+        catch (DDXParseFailed &e) {
+            DBG(cerr << "Error: " << e.get_error_message() << endl);
+        }
+    }
+
+    void array_missing_dimension_stream_read_test()
+    {
+        try {
+            string file_name = (string) TEST_SRC_DIR + "/ddx-testsuite/error.05.ddx";
+            FILE *in = fopen(file_name.c_str(), "r");
+            string blob;
+            ddx_parser->intern_stream(in, dds, blob);
+            CPPUNIT_FAIL("error.05.ddx should fail!");
+        }
+        catch (DDXParseFailed &e) {
+            DBG(cerr << "Error: " << e.get_error_message() << endl);
+        }
+    }
+
+    void intern_ddx_from_dataddx_test()
+    {
+        try {
+            string file_name = (string) TEST_SRC_DIR + "/ddx-testsuite/dataddx_without_top_headers.dap";
+            FILE *in = fopen(file_name.c_str(), "r");
+
+            // First read the initial set of 'part' headers for the DDX
+            read_multipart_headers(in, "text/xml", dods_ddx);
+
+            string blob;
+            ddx_parser->intern_stream(in, dds, blob, "--boundary-string-1");
+            CPPUNIT_ASSERT(dds->get_dataset_name() == "fnoc1.nc");
+
+            DBG(dds->print_xml(cout, false));
+        }
+        catch (Error &e) {
+            CPPUNIT_FAIL(e.get_error_message());
+        }
+    }
+};
+
+}
+
+CPPUNIT_TEST_SUITE_REGISTRATION (DDXParserTest);
+
+int main(int argc, char*argv[])
+{
+    GetOpt getopt(argc, argv, "dh");
+    int option_char;
+    while ((option_char = getopt()) != -1)
+        switch (option_char) {
+        case 'd':
+            debug = 1;  // debug is a static global
+            break;
+        case 'h': {     // help - show test names
+            cerr << "Usage: DDXParserTest has the following tests:" << endl;
+            const std::vector<Test*> &tests = libdap::DDXParserTest::suite()->getTests();
+            unsigned int prefix_len = libdap::DDXParserTest::suite()->getName().append("::").length();
+            for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+                cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+            }
+            break;
+        }
+        default:
+            break;
+        }
+
+    CppUnit::TextTestRunner runner;
+    runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
+    bool wasSuccessful = true;
+    string test = "";
+    int i = getopt.optind;
+    if (i == argc) {
+        // run them all
+        wasSuccessful = runner.run("");
+    }
+    else {
+        for (; i < argc; ++i) {
+            if (debug) cerr << "Running " << argv[i] << endl;
+            test = libdap::DDXParserTest::suite()->getName().append("::").append(argv[i]);
+            wasSuccessful = wasSuccessful && runner.run(test);
+        }
+    }
+
+    xmlMemoryDump();
+
+    return wasSuccessful ? 0 : 1;
+}
diff --git a/unit-tests/DMRTest.cc b/unit-tests/DMRTest.cc
new file mode 100644
index 0000000..e11c4b1
--- /dev/null
+++ b/unit-tests/DMRTest.cc
@@ -0,0 +1,430 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2014 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#include "config.h"
+
+#include <cppunit/TextTestRunner.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+#include <cppunit/extensions/HelperMacros.h>
+
+#include <sstream>
+
+#include "Byte.h"
+#include "Int16.h"
+#include "UInt16.h"
+#include "Int32.h"
+#include "UInt32.h"
+#include "Float32.h"
+#include "Float64.h"
+#include "Str.h"
+#include "Url.h"
+#include "Array.h"
+#include "Structure.h"
+#include "Sequence.h"
+#include "Grid.h"
+
+#include "DDS.h"
+#include "DMR.h"
+#include "XMLWriter.h"
+#include "D4BaseTypeFactory.h"
+#include "D4ParserSax2.h"
+
+#include "GNURegex.h"
+#include "GetOpt.h"
+#include "util.h"
+#include "debug.h"
+
+#include "testFile.h"
+#include "test_config.h"
+
+static bool debug = false;
+
+#undef DBG
+#define DBG(x) do { if (debug) {x;} } while(false)
+
+using namespace CppUnit;
+using namespace std;
+using namespace libdap;
+
+class DMRTest: public TestFixture {
+private:
+
+public:
+    DMRTest()
+    {
+    }
+    ~DMRTest()
+    {
+    }
+
+    void setUp()
+    {
+    }
+
+    void tearDown()
+    {
+    }
+
+    bool re_match(Regex &r, const string &s)
+    {
+        int match = r.match(s.c_str(), s.length());
+        DBG(cerr << "Match: " << match << " should be: " << s.length() << endl);
+        return match == static_cast<int>(s.length());
+    }
+
+    /**
+     * Given the name of a DDS and optional DAS file, build a DMR using the
+     * hackery known as transform_to_dap4 and the new DMR ctor.
+     *
+     * @param dds_file
+     * @param attr
+     * @return A pointer to the new DMR; caller must delete
+     */
+    DMR *build_dmr(const string &dds_file, const string &das_file = "")
+    {
+        DBG(cerr << __func__ << "() - BEGIN" << endl);
+        DBG(cerr << __func__ << "() - dds_file: " << dds_file << endl);
+        DBG(cerr << __func__ << "() - das_file: " << das_file << endl);
+
+        try {
+            string prefix = string(TEST_SRC_DIR) + "/dmr-testsuite/";
+
+            BaseTypeFactory factory;
+            DDS dds(&factory, dds_file);
+            dds.parse(prefix + dds_file);
+            DBG(cerr << "SOURCE DDS: " << endl; dds.print(cerr));
+
+            if (!das_file.empty()) {
+                DAS das;
+                das.parse(prefix + das_file);
+                dds.transfer_attributes(&das);
+                DBG(cerr << "SOURCE DAS: " << endl; das.print(cerr));
+
+                DBG(cerr << "dds.print_das(): " << endl; dds.print_das(cerr));
+                // DBG(cerr << "dds.print_xml(): " << endl; dds.print_xml(cerr,false,"blob_foo"));
+            }
+
+            D4BaseTypeFactory d4_factory;
+            DBG(cerr << __func__ << "() - END" << endl);
+            return new DMR(&d4_factory, dds);
+        }
+        catch (Error &e) {
+            CPPUNIT_FAIL(string("Caught Error: ") + e.get_error_message());
+        }
+
+        return 0;
+    }
+
+    void test_template(const string &dds_file, const string &dmr_baseline, const string &attr = "")
+    {
+        DBG(cerr << __func__ << "() - BEGIN" << endl);
+        DMR *dmr = 0;
+        try {
+            dmr = build_dmr(dds_file, attr);
+            XMLWriter xml;
+            dmr->print_dap4(xml);
+            DBG(cerr << "DMR: " << endl << xml.get_doc() << endl);
+
+            string prefix = string(TEST_SRC_DIR) + "/dmr-testsuite/";
+            CPPUNIT_ASSERT(string(xml.get_doc()) == readTestBaseline(prefix + dmr_baseline));
+            delete dmr;
+        }
+        catch (Error &e) {
+            delete dmr;
+            CPPUNIT_FAIL(string("Caught Error: ") + e.get_error_message());
+        }
+        DBG(cerr << __func__ << "() - END" << endl);
+    }
+
+CPPUNIT_TEST_SUITE (DMRTest);
+
+    CPPUNIT_TEST(test_dmr_from_dds_1);
+    CPPUNIT_TEST(test_dmr_from_dds_2);
+    CPPUNIT_TEST(test_dmr_from_dds_3);
+    CPPUNIT_TEST(test_dmr_from_dds_4);
+    CPPUNIT_TEST(test_dmr_from_dds_5);
+    CPPUNIT_TEST(test_dmr_from_dds_6);
+
+    CPPUNIT_TEST(test_dmr_from_dds_with_attr_1);
+    CPPUNIT_TEST(test_dmr_from_dds_with_attr_2);
+
+    CPPUNIT_TEST(test_copy_ctor);
+    CPPUNIT_TEST(test_copy_ctor_2);
+    CPPUNIT_TEST(test_copy_ctor_3);
+    CPPUNIT_TEST(test_copy_ctor_4);
+
+    CPPUNIT_TEST_SUITE_END()
+    ;
+
+    // Test a DDS with simple scalar types and no attributes
+    void test_dmr_from_dds_1()
+    {
+        DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+        test_template("test.1", "test.1.dmr");
+        DBG(cerr << __func__ << "() - END" << endl);
+    }
+
+    // What about arrays? This should build shared dimensions
+    void test_dmr_from_dds_2()
+    {
+        DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+        test_template("fnoc1.nc.dds", "fnoc1.nc.dmr");
+        DBG(cerr << __func__ << "() - END" << endl);
+    }
+
+    void test_dmr_from_dds_3()
+    {
+        DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+        test_template("3B42.980909.5.HDF.dds", "3B42.980909.5.HDF.dmr");
+        DBG(cerr << __func__ << "() - END" << endl);
+    }
+
+    void test_dmr_from_dds_4()
+    {
+        DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+        test_template("S2000415.HDF.dds", "S2000415.HDF.dmr");
+        DBG(cerr << __func__ << "() - END" << endl);
+    }
+
+    void test_dmr_from_dds_5()
+    {
+        DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+        test_template("coads_climatology.nc.dds", "coads_climatology.nc.dmr");
+        DBG(cerr << __func__ << "() - END" << endl);
+    }
+
+    void test_dmr_from_dds_6()
+    {
+        DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+        test_template("structure_1.dds", "structure_1.dds.dmr");
+        DBG(cerr << __func__ << "() - END" << endl);
+    }
+
+    void test_dmr_from_dds_with_attr_1()
+    {
+        DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+        test_template("test.1", "test.1.attr.dmr", "test.1.das");
+        DBG(cerr << __func__ << "() - END" << endl);
+    }
+
+    void test_dmr_from_dds_with_attr_2()
+    {
+        // The 'hacked' file has global attributes
+        DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+        test_template("3B42.980909.5.HDF.dds", "3B42.980909.5.hacked.2.HDF.attr.dmr", "3B42.980909.5.hacked.2.HDF.das");
+        DBG(cerr << __func__ << "() - END" << endl);
+    }
+
+    void test_copy_ctor()
+    {
+        DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+        DMR *dmr = build_dmr("test.1", "test.1.das");
+        DMR *dmr_2 = new DMR(*dmr);
+
+        XMLWriter xml;
+        dmr->print_dap4(xml);
+        string dmr_src = string(xml.get_doc());
+        DBG(cerr << "DMR SRC: " << endl << dmr_src << endl);
+
+        XMLWriter xml2;
+        dmr_2->print_dap4(xml2);
+        string dmr_dest = string(xml2.get_doc());
+        DBG(cerr << "DMR DEST: " << endl << dmr_dest << endl);
+
+        delete dmr;
+        delete dmr_2;
+        CPPUNIT_ASSERT(dmr_src == dmr_dest);
+
+        DBG(cerr << __func__ << "() - END" << endl);
+    }
+
+    // This tests if using the copy still works after the original is deleted
+    void test_copy_ctor_2()
+    {
+        DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+        DMR *dmr = build_dmr("test.1", "test.1.das");
+        DMR *dmr_2 = new DMR(*dmr);
+
+        XMLWriter xml;
+        dmr->print_dap4(xml);
+        string dmr_src = string(xml.get_doc());
+        DBG(cerr << "DMR SRC: " << endl << dmr_src << endl);
+
+        delete dmr;
+
+        XMLWriter xml2;
+        dmr_2->print_dap4(xml2);
+        string dmr_dest = string(xml2.get_doc());
+        DBG(cerr << "DMR DEST: " << endl << dmr_dest << endl);
+
+        delete dmr_2;
+        CPPUNIT_ASSERT(dmr_src == dmr_dest);
+
+        DBG(cerr << __func__ << "() - END" << endl);
+    }
+
+    // Test the grid/coverage and copy ctor code
+    void test_copy_ctor_3()
+    {
+        DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+        DMR *dmr = build_dmr("coads_climatology.nc.dds", "coads_climatology.nc.das");
+        DMR *dmr_2 = new DMR(*dmr);
+
+        XMLWriter xml;
+        dmr->print_dap4(xml);
+        string dmr_src = string(xml.get_doc());
+        DBG(cerr << "DMR SRC: " << endl << dmr_src << endl);
+
+        XMLWriter xml2;
+        dmr_2->print_dap4(xml2);
+        string dmr_dest = string(xml2.get_doc());
+        DBG(cerr << "DMR DEST: " << endl << dmr_dest << endl);
+
+        delete dmr;
+        delete dmr_2;
+        CPPUNIT_ASSERT(dmr_src == dmr_dest);
+
+        DBG(cerr << __func__ << "() - END" << endl);
+    }
+
+    // Make the same test as above, but bypass the DMR ctor that uses a DDS object.
+    void test_copy_ctor_4()
+    {
+        DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+        D4BaseTypeFactory factory;
+        DMR *dmr = new DMR(&factory, "coads");
+
+        string prefix = string(TEST_SRC_DIR) + "/D4-xml/coads_climatology.nc.xml";
+        ifstream ifs(prefix.c_str());
+        D4ParserSax2 parser;
+        parser.intern(ifs, dmr);
+
+        DMR *dmr_2 = new DMR(*dmr);
+
+        XMLWriter xml;
+        dmr->print_dap4(xml);
+        string dmr_src = string(xml.get_doc());
+        DBG(cerr << "DMR SRC: " << endl << dmr_src << endl);
+
+        XMLWriter xml2;
+        dmr_2->print_dap4(xml2);
+        string dmr_dest = string(xml2.get_doc());
+        DBG(cerr << "DMR DEST: " << endl << dmr_dest << endl);
+
+        delete dmr;
+        delete dmr_2;
+        CPPUNIT_ASSERT(dmr_src == dmr_dest);
+
+        DBG(cerr << __func__ << "() - END" << endl);
+    }
+
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION(DMRTest);
+
+int main(int argc, char *argv[])
+{
+    GetOpt getopt(argc, argv, "dh");
+    int option_char;
+
+    while ((option_char = getopt()) != -1)
+        switch (option_char) {
+        case 'd':
+            debug = 1;  // debug is a static global
+            break;
+
+        case 'h': {     // help - show test names
+            cerr << "Usage: DMRTest has the following tests:" << endl;
+            const std::vector<Test*> &tests = DMRTest::suite()->getTests();
+            unsigned int prefix_len = DMRTest::suite()->getName().append("::").length();
+            for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+                cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+            }
+            break;
+        }
+
+        default:
+            break;
+        }
+
+    CppUnit::TextTestRunner runner;
+    runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
+    bool wasSuccessful = true;
+    string test = "";
+    int i = getopt.optind;
+    if (i == argc) {
+        // run them all
+        wasSuccessful = runner.run("");
+    }
+    else {
+        for (; i < argc; ++i) {
+            if (debug) cerr << "Running " << argv[i] << endl;
+            test = DMRTest::suite()->getName().append("::").append(argv[i]);
+            wasSuccessful = wasSuccessful && runner.run(test);
+        }
+    }
+
+    return wasSuccessful ? 0 : 1;
+}
+
+//##################################################################################################
+#if 0 // old way
+int main(int argc, char*argv[]) {
+    CppUnit::TextTestRunner runner;
+    runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
+    GetOpt getopt(argc, argv, "d");
+    int option_char;
+
+    while ((option_char = getopt()) != -1)
+    switch (option_char) {
+        case 'd':
+        debug = 1;  // debug is a static global
+        break;
+        default:
+        break;
+    }
+
+    bool wasSuccessful = true;
+    string test = "";
+    int i = getopt.optind;
+    if (i == argc) {
+        // run them all
+        wasSuccessful = runner.run("");
+    }
+    else {
+        while (i < argc) {
+            test = string("DMRTest::") + argv[i++];
+            DBG(cerr << "test: " << test << endl);
+            wasSuccessful = wasSuccessful && runner.run(test);
+        }
+    }
+
+    xmlMemoryDump();
+
+    return wasSuccessful ? 0 : 1;
+}
+#endif
+
diff --git a/unit-tests/DmrRoundTripTest.cc b/unit-tests/DmrRoundTripTest.cc
new file mode 100644
index 0000000..cc64900
--- /dev/null
+++ b/unit-tests/DmrRoundTripTest.cc
@@ -0,0 +1,340 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2014 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#include "config.h"
+
+#include <cppunit/TextTestRunner.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+#include <cppunit/extensions/HelperMacros.h>
+
+#include <sstream>
+
+#include "Byte.h"
+#include "Int16.h"
+#include "UInt16.h"
+#include "Int32.h"
+#include "UInt32.h"
+#include "Float32.h"
+#include "Float64.h"
+#include "Str.h"
+#include "Url.h"
+#include "Array.h"
+#include "Structure.h"
+#include "Sequence.h"
+#include "Grid.h"
+
+#include "DDS.h"
+#include "DMR.h"
+#include "XMLWriter.h"
+#include "D4BaseTypeFactory.h"
+#include "D4ParserSax2.h"
+
+#include "GNURegex.h"
+#include "GetOpt.h"
+#include "util.h"
+#include "debug.h"
+
+#include "testFile.h"
+#include "test_config.h"
+
+static bool debug = false;
+
+#undef DBG
+#define DBG(x) do { if (debug) {x;} } while(false)
+
+using namespace CppUnit;
+using namespace std;
+using namespace libdap;
+
+static string THE_TESTS_DIR("/dmr-rt-testsuite/");
+
+class DmrRoundTripTest: public TestFixture {
+private:
+
+public:
+    DmrRoundTripTest()
+    {
+    }
+    ~DmrRoundTripTest()
+    {
+    }
+
+    void setUp()
+    {
+    }
+
+    void tearDown()
+    {
+    }
+
+    bool re_match(Regex &r, const string &s)
+    {
+        int match = r.match(s.c_str(), s.length());
+        DBG(cerr << "Match: " << match << " should be: " << s.length() << endl);
+        return match == static_cast<int>(s.length());
+    }
+
+    /**
+     * Given the name of a DDS and optional DAS file, build a DMR using the
+     * hackery known as transform_to_dap4 and the new DMR ctor.
+     *
+     * @param dds_file
+     * @param attr
+     * @return A pointer to the new DMR; caller must delete
+     */
+    DMR *build_dmr(const string &dds_file, const string &das_file = "")
+    {
+        DBG(cerr << __func__ << "() - BEGIN" << endl);
+        DBG(cerr << __func__ << "() - dds_file: " << dds_file << endl);
+        DBG(cerr << __func__ << "() - das_file: " << das_file << endl);
+
+        try {
+            string prefix = string(TEST_SRC_DIR) + THE_TESTS_DIR;
+
+            BaseTypeFactory factory;
+            DDS dds(&factory, dds_file);
+            dds.parse(prefix + dds_file);
+            DBG(cerr << "SOURCE DDS: " << prefix + dds_file << endl; dds.print(cerr));
+
+            if (!das_file.empty()) {
+                DAS das;
+                das.parse(prefix + das_file);
+                dds.transfer_attributes(&das);
+                DBG(cerr << "SOURCE DAS: " << prefix + das_file << endl; das.print(cerr));
+
+                DBG(cerr << "dds.print_das(): " << endl; dds.print_das(cerr));
+                // DBG(cerr << "dds.print_xml(): " << endl; dds.print_xml(cerr,false,"blob_foo"));
+            }
+
+            D4BaseTypeFactory d4_factory;
+            DBG(cerr << __func__ << "() - END" << endl);
+            return new DMR(&d4_factory, dds);
+        }
+        catch (Error &e) {
+            CPPUNIT_FAIL(string("Caught Error: ") + e.get_error_message());
+        }
+
+        return 0;
+    }
+
+    void test_roundtrip_template(const string &dds_file, const string &dmr_baseline, const string &das_file = "")
+       // bool expected_fail = false)
+    {
+        DBG(cerr << __func__ << "() - BEGIN" << endl);
+
+        DMR *dmr = 0;
+        try {
+            dmr = build_dmr(dds_file, das_file);
+            XMLWriter xml;
+            dmr->print_dap4(xml);
+            DBG(cerr << "DMR: " << endl << xml.get_doc() << endl);
+
+            string prefix = string(TEST_SRC_DIR) + THE_TESTS_DIR;
+            string result_dmr(xml.get_doc());
+            string baseline_dmr = readTestBaseline(prefix + dmr_baseline);
+            DBG(
+                cerr << "BASELINE DMR(" << baseline_dmr.size() << " chars): " << prefix + dmr_baseline << endl
+                    << baseline_dmr << endl);
+            DBG(cerr << "RESULT DMR(" << result_dmr.size() << " chars): " << endl << result_dmr << endl);
+
+            CPPUNIT_ASSERT(result_dmr == baseline_dmr);
+
+            DDS *dds = dmr->getDDS();
+            std::ostringstream result_dds;
+            dds->print(result_dds);
+
+            string source_dds = readTestBaseline(prefix + dds_file);
+            DBG(
+                cerr << "SOURCE DDS(" << source_dds.size() << " chars): " << prefix + dds_file << endl << source_dds
+                    << endl);
+
+            DBG(cerr << "RESULT DDS(" << result_dds.str().size() << " chars): " << endl << result_dds.str() << endl);
+            CPPUNIT_ASSERT(result_dds.str() == source_dds);
+
+            if (!das_file.empty()) {
+                std::ostringstream result_das;
+                dds->print_das(result_das);
+
+                string source_das = readTestBaseline(prefix + das_file);
+                DBG(
+                    cerr << "SOURCE DAS(" << source_das.size() << " chars): " << prefix + das_file << endl << source_das
+                        << endl);
+
+                DBG(
+                    cerr << "RESULT DAS(" << result_das.str().size() << " chars): " << endl << result_das.str()
+                        << endl);
+                CPPUNIT_ASSERT(result_das.str() == source_das);
+
+            }
+            delete dmr;
+            delete dds;
+        }
+        catch (Error &e) {
+            delete dmr;
+            CPPUNIT_FAIL(string("Caught Error: ") + e.get_error_message());
+        }
+        DBG(cerr << __func__ << "() - END" << endl);
+    }
+
+#if 0
+    void i_am_broken(string name)
+    {
+        cerr << endl;
+        cerr << "###################################################################" << endl;
+        cerr << "  THE CRUCIAL TEST: '" << name << "' IS BROKEN AND HAS BEEN DISABLED." << endl;
+        cerr << "  Please enable the test '" << name << "', fix it, and check it in." << endl;
+    }
+#endif
+
+    void test_dds_to_dmr_to_dds_1()
+    {
+        DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+        test_roundtrip_template("attr_test_00.dds", "attr_test_00.dmr", "attr_test_00.das");
+        DBG(cerr << __func__ << "() - END" << endl);
+    }
+    void test_dds_to_dmr_to_dds_2()
+    {
+        DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+        test_roundtrip_template("test.1", "test.1.full.dmr", "test.1.das");
+        DBG(cerr << __func__ << "() - END" << endl);
+    }
+    void test_dds_to_dmr_to_dds_3()
+    {
+        DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+        test_roundtrip_template("fnoc1.nc.dds", "fnoc1.nc.dmr.xml", "fnoc1.nc.das");
+        DBG(cerr << __func__ << "() - END" << endl);
+    }
+    void test_dds_to_dmr_to_dds_4()
+    {
+        DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+        test_roundtrip_template("3B42.980909.5.HDF.dds", "3B42.980909.5.HDF.full.dmr", "3B42.980909.5.HDF.das");
+        DBG(cerr << __func__ << "() - END" << endl);
+    }
+    void test_dds_to_dmr_to_dds_5()
+    {
+        DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+        test_roundtrip_template("S2000415.HDF.dds", "S2000415.HDF.full.dmr", "S2000415.HDF.das");
+        DBG(cerr << __func__ << "() - END" << endl);
+    }
+
+    void test_grid_rt_01()
+    {
+        DBG(
+            cerr << endl << __func__ << "() - BEGIN: " << "Testing simple Grid->D4Array->Grid with 'correct' DAS."
+                << endl);
+        //       i_am_broken(__func__);
+        test_roundtrip_template("attr_test_01.dds", "attr_test_01.dmr", "attr_test_01.das");
+        DBG(cerr << __func__ << "() - END" << endl);
+    }
+
+    void test_grid_rt_02()
+    {
+        DBG(cerr << endl << __func__ << "() - BEGIN: " << "Testing Grid->D4Array->Grid with 'correct' DAS." << endl);
+#if 0
+        i_am_broken(__func__);
+#endif
+        test_roundtrip_template("coads_climatology.nc.dds", "coads_climatology.nc.full.dmr", "coads_climatology.nc.correct.das");
+        DBG(cerr << __func__ << "() - END" << endl);
+    }
+
+    void test_grid_rt_03()
+    {
+        DBG(cerr << endl << __func__ << "() - BEGIN: " << "Testing Grid->D4Array->Grid with flat DAS." << endl);
+#if 0
+        i_am_broken(__func__);
+#endif
+        test_roundtrip_template("coads_climatology.nc.dds", "coads_climatology.nc.full.dmr", "coads_climatology.nc.flat.das");
+        DBG(cerr << __func__ << "() - END" << endl);
+    }
+
+CPPUNIT_TEST_SUITE (DmrRoundTripTest);
+
+    CPPUNIT_TEST(test_dds_to_dmr_to_dds_1);
+    CPPUNIT_TEST(test_dds_to_dmr_to_dds_2);
+    CPPUNIT_TEST(test_dds_to_dmr_to_dds_3);
+    CPPUNIT_TEST(test_dds_to_dmr_to_dds_4);
+    CPPUNIT_TEST(test_dds_to_dmr_to_dds_5);
+    CPPUNIT_TEST(test_grid_rt_01);
+#if 0
+    CPPUNIT_TEST(test_grid_rt_02);
+    CPPUNIT_TEST(test_grid_rt_03);
+#else
+    CPPUNIT_TEST_FAIL (test_grid_rt_02);
+    CPPUNIT_TEST_FAIL (test_grid_rt_03);
+#endif
+
+    CPPUNIT_TEST_SUITE_END()
+    ;
+
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION(DmrRoundTripTest);
+
+int main(int argc, char *argv[])
+{
+    GetOpt getopt(argc, argv, "dh");
+    int option_char;
+
+    while ((option_char = getopt()) != -1)
+        switch (option_char) {
+        case 'd':
+            debug = 1;  // debug is a static global
+            break;
+
+        case 'h': {     // help - show test names
+            cerr << "Usage: DmrRoundTripTest has the following tests:" << endl;
+            const std::vector<Test*> &tests = DmrRoundTripTest::suite()->getTests();
+            unsigned int prefix_len = DmrRoundTripTest::suite()->getName().append("::").length();
+            for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+                cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+            }
+            return 1;
+            break;
+        }
+
+        default:
+            break;
+        }
+
+    CppUnit::TextTestRunner runner;
+    runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
+    bool wasSuccessful = true;
+    string test = "";
+    int i = getopt.optind;
+    if (i == argc) {
+        // run them all
+        wasSuccessful = runner.run("");
+    }
+    else {
+        for (; i < argc; ++i) {
+            if (debug) cerr << "Running " << argv[i] << endl;
+            test = DmrRoundTripTest::suite()->getName().append("::").append(argv[i]);
+            wasSuccessful = wasSuccessful && runner.run(test);
+        }
+    }
+
+    return wasSuccessful ? 0 : 1;
+}
+
diff --git a/unit-tests/DmrToDap2Test.cc b/unit-tests/DmrToDap2Test.cc
new file mode 100644
index 0000000..610933a
--- /dev/null
+++ b/unit-tests/DmrToDap2Test.cc
@@ -0,0 +1,493 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2014 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#include "config.h"
+
+#include <cppunit/TextTestRunner.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+#include <cppunit/extensions/HelperMacros.h>
+
+#include <sstream>
+
+#include "Byte.h"
+#include "Int16.h"
+#include "UInt16.h"
+#include "Int32.h"
+#include "UInt32.h"
+#include "Float32.h"
+#include "Float64.h"
+#include "Str.h"
+#include "Url.h"
+#include "Array.h"
+#include "Structure.h"
+#include "Sequence.h"
+#include "Grid.h"
+
+#include "DDS.h"
+#include "DMR.h"
+#include "XMLWriter.h"
+#include "D4BaseTypeFactory.h"
+#include "D4ParserSax2.h"
+
+#include "GNURegex.h"
+#include "GetOpt.h"
+#include "util.h"
+#include "mime_util.h"
+#include "debug.h"
+
+#include "testFile.h"
+#include "test_config.h"
+
+static bool debug = false;
+static bool mo_debug = false;
+
+#undef DBG
+#define DBG(x) do { if (debug) {x;} } while(false)
+
+using namespace CppUnit;
+using namespace std;
+using namespace libdap;
+
+static string THE_TESTS_DIR("/dmr-to-dap2-testsuite/");
+
+class DmrToDap2Test: public TestFixture {
+private:
+
+public:
+    DmrToDap2Test()
+    {
+    }
+    ~DmrToDap2Test()
+    {
+    }
+
+    void setUp()
+    {
+    }
+
+    void tearDown()
+    {
+    }
+
+    bool re_match(Regex &r, const string &s)
+    {
+        int match = r.match(s.c_str(), s.length());
+        DBG(cerr << "Match: " << match << " should be: " << s.length() << endl);
+        return match == static_cast<int>(s.length());
+    }
+
+    /**
+     * Given the name of a DDS and optional DAS file, build a DMR using the
+     * hackery known as transform_to_dap4 and the new DMR ctor.
+     *
+     * @param dds_file
+     * @param attr
+     * @return A pointer to the new DMR; caller must delete
+     */
+    DMR *build_dmr(const string &dmr_file)
+    {
+        DBG(cerr << __func__ << "() - BEGIN" << endl);
+        DBG(cerr << __func__ << "() - dmr_file: " << dmr_file << endl);
+
+        try {
+            DMR *dmr = new DMR();
+            dmr->set_filename(dmr_file);
+            dmr->set_name(name_path(dmr_file));
+            D4BaseTypeFactory BaseFactory;   // Use the factory for this handler's types
+            dmr->set_factory(&BaseFactory);
+            D4ParserSax2 parser;
+            ifstream in(dmr_file.c_str(), ios::in);
+            parser.intern(in, dmr, mo_debug);
+            dmr->set_factory(0);
+            DBG(cerr << __func__ << "() - END" << endl);
+            return dmr;
+        }
+        catch (Error &e) {
+            CPPUNIT_FAIL(string("Caught Error: ") + e.get_error_message());
+        }
+
+        return 0;
+    }
+
+    void test_template(const string &test_base_name)
+    {
+
+        string prefix = string(TEST_SRC_DIR) + THE_TESTS_DIR;
+
+        string dmr_file = prefix + test_base_name + ".dmr";
+        string dds_file = prefix + test_base_name + ".dds";
+        string das_file = prefix + test_base_name + ".das";
+
+        DBG(cerr << __func__ << "() - BEGIN (test_base: " << test_base_name << ")" << endl);
+        DMR *dmr = 0;
+        try {
+
+            dmr = build_dmr(dmr_file);
+            CPPUNIT_ASSERT(dmr != 0);
+            XMLWriter xml;
+            dmr->print_dap4(xml);
+            string result_dmr(xml.get_doc());
+            string baseline_dmr = readTestBaseline(dmr_file);
+
+            DBG(
+                cerr << "BASELINE DMR(" << baseline_dmr.size() << " chars): " << dmr_file << endl << baseline_dmr
+                    << endl);
+            DBG(cerr << "RESULT DMR(" << result_dmr.size() << " chars): " << endl << result_dmr << endl);
+            CPPUNIT_ASSERT(result_dmr == baseline_dmr);
+
+            DDS *dds = dmr->getDDS();
+            std::ostringstream result_dds;
+            dds->print(result_dds);
+            string baseline_dds = readTestBaseline(dds_file);
+            DBG(
+                cerr << "BASELINE DDS(" << baseline_dds.size() << " chars): " << dds_file << endl << baseline_dds
+                    << endl);
+            DBG(cerr << "RESULT DDS(" << result_dds.str().size() << " chars): " << endl << result_dds.str() << endl);
+            CPPUNIT_ASSERT(result_dds.str() == baseline_dds);
+
+            std::ostringstream result_das;
+            dds->print_das(result_das);
+            string source_das = readTestBaseline(das_file);
+            DBG(cerr << "BASELINE DAS(" << source_das.size() << " chars): " << das_file << endl << source_das << endl);
+            DBG(cerr << "RESULT DAS(" << result_das.str().size() << " chars): " << endl << result_das.str() << endl);
+            CPPUNIT_ASSERT(result_das.str() == source_das);
+
+            delete dmr;
+            delete dds;
+        }
+        catch (Error &e) {
+            delete dmr;
+            CPPUNIT_FAIL(string("Caught Error: ") + e.get_error_message());
+        }
+        DBG(cerr << __func__ << "() - END" << endl);
+    }
+
+    // Test a DDS with simple scalar types and no attributes
+    void dmr_to_dap2_01()
+    {
+        DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+        test_template("test.1");
+        DBG(cerr << __func__ << "() - END" << endl);
+    }
+
+    // Test a DDS with simple scalar types and no attributes
+    void basic_dmr_to_dap2_0_0()
+    {
+        DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+        test_template("DMR_0.0");
+        DBG(cerr << __func__ << "() - END" << endl);
+    }
+
+    void basic_dmr_to_dap2_0_1()
+    {
+        DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+        test_template("DMR_0.1");
+        DBG(cerr << __func__ << "() - END" << endl);
+    }
+
+    void basic_dmr_to_dap2_1_0()
+    {
+        DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+        test_template("DMR_1.0");
+        DBG(cerr << __func__ << "() - END" << endl);
+    }
+
+    void basic_dmr_to_dap2_2_0()
+    {
+        DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+        test_template("DMR_2.0");
+        DBG(cerr << __func__ << "() - END" << endl);
+    }
+    void basic_dmr_to_dap2_2_1()
+    {
+        DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+        test_template("DMR_2.1");
+        DBG(cerr << __func__ << "() - END" << endl);
+    }
+    void basic_dmr_to_dap2_2_2()
+    {
+        DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+        test_template("DMR_2.2");
+        DBG(cerr << __func__ << "() - END" << endl);
+    }
+    void basic_dmr_to_dap2_2_3()
+    {
+        DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+        test_template("DMR_2.3");
+        DBG(cerr << __func__ << "() - END" << endl);
+    }
+    void basic_dmr_to_dap2_2_4()
+    {
+        DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+        test_template("DMR_2.4");
+        DBG(cerr << __func__ << "() - END" << endl);
+    }
+    void basic_dmr_to_dap2_2_5()
+    {
+        DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+        test_template("DMR_2.5");
+        DBG(cerr << __func__ << "() - END" << endl);
+    }
+
+    void basic_dmr_to_dap2_3_0()
+    {
+        DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+        test_template("DMR_3.0");
+        DBG(cerr << __func__ << "() - END" << endl);
+    }
+
+    void enum_dmr_to_dap2_0_0()
+    {
+        DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+        test_template("EnumDMR_0.0");
+        DBG(cerr << __func__ << "() - END" << endl);
+    }
+
+    void enum_dmr_to_dap2_0_1()
+    {
+        DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+        test_template("EnumDMR_0.1");
+        DBG(cerr << __func__ << "() - END" << endl);
+    }
+    void enum_dmr_to_dap2_1_0()
+    {
+        DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+        test_template("EnumDMR_1.0");
+        DBG(cerr << __func__ << "() - END" << endl);
+    }
+    void enum_dmr_to_dap2_1_1()
+    {
+        DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+        test_template("EnumDMR_1.1");
+        DBG(cerr << __func__ << "() - END" << endl);
+    }
+    void enum_dmr_to_dap2_1_2()
+    {
+        DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+        test_template("EnumDMR_1.2");
+        DBG(cerr << __func__ << "() - END" << endl);
+    }
+    void enum_dmr_to_dap2_1_3()
+    {
+        DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+        test_template("EnumDMR_1.3");
+        DBG(cerr << __func__ << "() - END" << endl);
+    }
+    void enum_dmr_to_dap2_1_4()
+    {
+        DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+        test_template("EnumDMR_1.4");
+        DBG(cerr << __func__ << "() - END" << endl);
+    }
+    void enum_dmr_to_dap2_1_5()
+    {
+        DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+        test_template("EnumDMR_1.5");
+        DBG(cerr << __func__ << "() - END" << endl);
+    }
+
+    void enum_dmr_to_dap2_2_0()
+    {
+        DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+        test_template("EnumDMR_2.0");
+        DBG(cerr << __func__ << "() - END" << endl);
+    }
+
+    void enum_dmr_to_dap2_2_1()
+    {
+        DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+        test_template("EnumDMR_2.1");
+        DBG(cerr << __func__ << "() - END" << endl);
+    }
+
+    void enum_dmr_to_dap2_3_0()
+    {
+        DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+        test_template("EnumDMR_3.0");
+        DBG(cerr << __func__ << "() - END" << endl);
+    }
+
+    void enum_dmr_to_dap2_3_1()
+    {
+        DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+        test_template("EnumDMR_3.1");
+        DBG(cerr << __func__ << "() - END" << endl);
+    }
+
+    void enum_dmr_to_dap2_4_0()
+    {
+        DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+        test_template("EnumDMR_4.0");
+        DBG(cerr << __func__ << "() - END" << endl);
+    }
+
+    void enum_dmr_to_dap2_4_1()
+    {
+        DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+        test_template("EnumDMR_4.1");
+        DBG(cerr << __func__ << "() - END" << endl);
+    }
+    void enum_dmr_to_dap2_4_2()
+    {
+        DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+        test_template("EnumDMR_4.2");
+        DBG(cerr << __func__ << "() - END" << endl);
+    }
+
+    void dmr_to_grid_01()
+    {
+        DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+        test_template("coads_climatology.nc");
+        DBG(cerr << __func__ << "() - END" << endl);
+    }
+
+    void dmr_to_grid_02()
+    {
+        DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+        test_template("sst.mnmean.nc.gz");
+        DBG(cerr << __func__ << "() - END" << endl);
+    }
+
+    void dmr_to_grid_03()
+    {
+        DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+        test_template("sresa1b_ncar_ccsm3_0_run1_200001.nc");
+        DBG(cerr << __func__ << "() - END" << endl);
+    }
+
+    void dmr_to_grid_04()
+    {
+        DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+        test_template("tos_O1_2001-2002.nc");
+        DBG(cerr << __func__ << "() - END" << endl);
+    }
+
+    void dmr_to_grid_05()
+    {
+        DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+        test_template("cami_0000-09-01_64x128_L26_c030918.nc");
+        DBG(cerr << __func__ << "() - END" << endl);
+    }
+
+CPPUNIT_TEST_SUITE (DmrToDap2Test);
+
+#if 1 // good (as in should be working) tests
+    CPPUNIT_TEST(dmr_to_dap2_01);
+    CPPUNIT_TEST(basic_dmr_to_dap2_0_0);
+    CPPUNIT_TEST(basic_dmr_to_dap2_0_1);
+    CPPUNIT_TEST(basic_dmr_to_dap2_2_0);
+    CPPUNIT_TEST(basic_dmr_to_dap2_2_1);
+    CPPUNIT_TEST(basic_dmr_to_dap2_2_2);
+    CPPUNIT_TEST(basic_dmr_to_dap2_2_4);
+    CPPUNIT_TEST(basic_dmr_to_dap2_2_3);
+    CPPUNIT_TEST(basic_dmr_to_dap2_2_5); // Drops Variables
+
+    CPPUNIT_TEST(enum_dmr_to_dap2_0_0);
+    CPPUNIT_TEST(enum_dmr_to_dap2_0_1);
+    CPPUNIT_TEST(enum_dmr_to_dap2_1_0);
+    CPPUNIT_TEST(enum_dmr_to_dap2_1_1);
+    CPPUNIT_TEST(enum_dmr_to_dap2_1_2);
+    CPPUNIT_TEST(enum_dmr_to_dap2_1_3);
+    CPPUNIT_TEST(enum_dmr_to_dap2_1_4);
+    CPPUNIT_TEST(enum_dmr_to_dap2_2_0); // Drops Variables
+    CPPUNIT_TEST(enum_dmr_to_dap2_2_1); // Drops Variables
+    CPPUNIT_TEST(enum_dmr_to_dap2_3_0); // Drops Variables
+    CPPUNIT_TEST(enum_dmr_to_dap2_3_1); // Drops Variables
+
+    CPPUNIT_TEST(enum_dmr_to_dap2_4_0); // Drops Groups
+    CPPUNIT_TEST(enum_dmr_to_dap2_4_1); // Drops Groups
+    CPPUNIT_TEST(enum_dmr_to_dap2_4_1);
+    CPPUNIT_TEST(enum_dmr_to_dap2_4_2);
+
+    CPPUNIT_TEST(dmr_to_grid_01);
+    CPPUNIT_TEST(dmr_to_grid_02);
+    CPPUNIT_TEST(dmr_to_grid_03);
+    CPPUNIT_TEST(dmr_to_grid_04);
+    CPPUNIT_TEST(dmr_to_grid_05);
+
+#endif
+
+#if 0 // bad tests, here then is the woodshed of Testville.
+
+    CPPUNIT_TEST(enum_dmr_to_dap2_1_5); // Broken: Parser issue with look-ahead
+
+#endif
+
+    CPPUNIT_TEST_SUITE_END()
+    ;
+
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION(DmrToDap2Test);
+
+int main(int argc, char *argv[])
+{
+    GetOpt getopt(argc, argv, "dDh");
+    int option_char;
+
+    while ((option_char = getopt()) != -1)
+        switch (option_char) {
+        case 'd':
+            debug = 1;  // debug is a static global
+            break;
+
+        case 'D':
+            mo_debug = 1;  // debug is a static global
+            break;
+
+        case 'h': {     // help - show test names
+            cerr << "Usage: DmrToDap2Test has the following tests:" << endl;
+            const std::vector<Test*> &tests = DmrToDap2Test::suite()->getTests();
+            unsigned int prefix_len = DmrToDap2Test::suite()->getName().append("::").length();
+            for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+                cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+            }
+            break;
+        }
+
+        default:
+            break;
+        }
+
+    CppUnit::TextTestRunner runner;
+    runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
+    bool wasSuccessful = true;
+    string test = "";
+    int i = getopt.optind;
+    if (i == argc) {
+        // run them all
+        wasSuccessful = runner.run("");
+    }
+    else {
+        for (; i < argc; ++i) {
+            if (debug) cerr << "Running " << argv[i] << endl;
+            test = DmrToDap2Test::suite()->getName().append("::").append(argv[i]);
+            wasSuccessful = wasSuccessful && runner.run(test);
+        }
+    }
+
+    return wasSuccessful ? 0 : 1;
+}
+
diff --git a/unit-tests/HTTPCacheTest.cc b/unit-tests/HTTPCacheTest.cc
new file mode 100644
index 0000000..756cd59
--- /dev/null
+++ b/unit-tests/HTTPCacheTest.cc
@@ -0,0 +1,921 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#include <unistd.h>   // for access stat
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include <cstdio>     // for create_cache_root_test
+#include <string>
+#include <vector>
+#include <algorithm>
+#include <memory>
+#include <iterator>
+
+#include <cppunit/TextTestRunner.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+#include <cppunit/extensions/HelperMacros.h>
+
+#include "HTTPCache.h"
+#include "HTTPConnect.h"	// Used to generate a response to cache.
+#ifndef WIN32			// Signals are exquisitely non-portable.
+#include "SignalHandler.h"	// Needed to clean up this singleton.
+#endif
+#include "RCReader.h"		// ditto
+#include"GetOpt.h"
+
+// #define DODS_DEBUG
+
+#include "debug.h"
+
+#if defined(DODS_DEBUG) || defined(DODS_DEBUG2)
+#include <iterator>
+#endif
+
+using namespace CppUnit;
+using namespace std;
+
+#ifdef WIN32
+#define F_OK 0
+#define W_OK 2
+#endif
+
+static bool debug = false;
+
+#undef DBG
+#define DBG(x) do { if (debug) (x); } while(false);
+
+namespace libdap {
+
+inline static int file_size(string name)
+{
+    struct stat s;
+    stat(name.c_str(), &s);
+    return s.st_size;
+}
+
+#if 0
+inline static void
+print_entry(HTTPCache *, HTTPCacheTable::CacheEntry **e)
+{
+    cerr << "Entry: " << (*e)->get_cachename() << endl;
+}
+#endif
+
+// Note that because this test class uses the fixture 'hc' we must always
+// force access to the single user/process lock for the cache. This is
+// because a fixture is always created (by setUp) *before* the body of the
+// test is run. So by the time we're at the first line of the test, The
+// persistent store's lock has already been grabbed. 10/14/02 jhrg
+
+class HTTPCacheTest: public TestFixture {
+private:
+    HTTPCache *hc;
+    HTTPConnect *http_conn;
+    string index_file_line;
+    string localhost_url;
+    string expired;
+    int hash_value;
+    vector<string> h;
+
+protected:
+
+public:
+    HTTPCacheTest() :
+        hc(0), http_conn(0)
+    {
+        putenv((char*) "DODS_CONF=./cache-testsuite/dodsrc");
+        http_conn = new HTTPConnect(RCReader::instance());
+
+        DBG2(cerr << "Entering HTTPCacheTest ctor... ");
+        hash_value = 656;
+        localhost_url = "http://test.opendap.org/test-304.html";
+        index_file_line =
+            "http://test.opendap.org/test-304.html cache-testsuite/dods_cache/656/dodsKbcD0h \"3f62c-157-139c2680\" 1121283146 -1 343 0 656 1 7351 1121360379 3723 0";
+
+        expired = "http://test.opendap.org/cgi-bin/expires.sh";
+
+        h.push_back("ETag: jhrgjhrgjhrg");
+        h.push_back("Last-Modified: Sat, 05 Nov 1994 08:49:37 GMT");
+        h.push_back("Expires: Mon, 07 Nov 1994 08:49:37 GMT");
+        h.push_back("Date: Sun, 06 Nov 1994 08:49:37 GMT");
+        DBG2(cerr << "exiting." << endl);
+    }
+
+    ~HTTPCacheTest()
+    {
+        delete http_conn;
+        http_conn = 0;
+        DBG2(cerr << "Entering the HTTPCacheTest dtor... ");DBG2(cerr << "exiting." << endl);
+    }
+#if 0
+    static inline bool
+    is_hop_by_hop_header(const string &header) {
+        return header.find("Connection") != string::npos
+        || header.find("Keep-Alive") != string::npos
+        || header.find("Proxy-Authenticate") != string::npos
+        || header.find("Proxy-Authorization") != string::npos
+        || header.find("Transfer-Encoding") != string::npos
+        || header.find("Upgrade") != string::npos;
+    }
+#endif
+    void setUp()
+    {
+        // Called before every test.
+        DBG2(cerr << "Entering HTTPCacheTest::setUp... " << endl);
+        hc = new HTTPCache("cache-testsuite/dods_cache/", true);
+        DBG2(cerr << "exiting setUp" << endl);
+    }
+
+    void tearDown()
+    {
+        // Called after every test.
+        DBG2(cerr << "Entering HTTPCacheTest::tearDown... " << endl);
+        delete hc;
+        hc = 0;
+        DBG2(cerr << "exiting tearDown" << endl);
+    }
+
+    CPPUNIT_TEST_SUITE (HTTPCacheTest);
+
+    CPPUNIT_TEST (constructor_test);
+    CPPUNIT_TEST (cache_index_read_test);
+    CPPUNIT_TEST (cache_index_parse_line_test);
+    CPPUNIT_TEST (get_entry_from_cache_table_test);
+    CPPUNIT_TEST (cache_index_write_test);
+    CPPUNIT_TEST (create_cache_root_test);
+    CPPUNIT_TEST (set_cache_root_test);
+    CPPUNIT_TEST (get_single_user_lock_test);
+
+    CPPUNIT_TEST (release_single_user_lock_test);
+    CPPUNIT_TEST (create_hash_directory_test);
+    CPPUNIT_TEST (create_location_test);
+    CPPUNIT_TEST (parse_headers_test);
+
+    CPPUNIT_TEST (calculate_time_test);
+    CPPUNIT_TEST (write_metadata_test);
+    CPPUNIT_TEST (cache_response_test);
+#if 0
+    // This test does not seem to work in New Zealand - maybe because
+    // of the dateline??? jhrg 1/31/13
+    CPPUNIT_TEST(is_url_valid_test);
+#endif
+    CPPUNIT_TEST (get_cached_response_test);
+
+    CPPUNIT_TEST (perform_garbage_collection_test);
+    CPPUNIT_TEST (purge_cache_and_release_cached_response_test);
+    CPPUNIT_TEST (get_conditional_response_headers_test);
+    CPPUNIT_TEST (update_response_test);
+    CPPUNIT_TEST (cache_gc_test);
+
+    // Make this the last test because when distcheck is run, running
+    // it before other tests will break them.
+    CPPUNIT_TEST (instance_test);
+
+    CPPUNIT_TEST_SUITE_END();
+
+    void constructor_test()
+    {
+        DBG(cerr << "hc->cache_index: " << hc->d_http_cache_table->d_cache_index << endl);
+        CPPUNIT_ASSERT(hc->d_http_cache_table->d_cache_index == "cache-testsuite/dods_cache/.index");
+        CPPUNIT_ASSERT(hc->d_cache_root == "cache-testsuite/dods_cache/");
+        DBG(cerr << "Current size: " << hc->d_http_cache_table->d_current_size << endl);
+        DBG(cerr << "Block size: " << hc->d_http_cache_table->d_block_size << endl);
+        CPPUNIT_ASSERT(hc->d_http_cache_table->d_current_size == hc->d_http_cache_table->d_block_size);
+    }
+
+    void cache_index_read_test()
+    {
+        CPPUNIT_ASSERT(hc->d_http_cache_table->cache_index_read());
+
+        HTTPCacheTable::CacheEntry *e = hc->d_http_cache_table->get_locked_entry_from_cache_table(localhost_url);
+
+        CPPUNIT_ASSERT(e);
+        CPPUNIT_ASSERT(e->url == localhost_url);
+        e->unlock_read_response();
+    }
+
+    void cache_index_parse_line_test()
+    {
+        HTTPCacheTable::CacheEntry *e = hc->d_http_cache_table->cache_index_parse_line(index_file_line.c_str());
+
+        CPPUNIT_ASSERT(e->url == localhost_url);
+        CPPUNIT_ASSERT(e->cachename == "cache-testsuite/dods_cache/656/dodsKbcD0h");
+#ifdef WIN32
+        char *tmpstr = "\"3f62c-157-139c2680\"";
+        CPPUNIT_ASSERT(e->etag == tmpstr);
+#else
+        CPPUNIT_ASSERT(e->etag == "\"3f62c-157-139c2680\"");
+#endif
+        CPPUNIT_ASSERT(e->lm == 1121283146);
+        // Skip ahead ...
+        CPPUNIT_ASSERT(e->must_revalidate == false);
+
+        delete e;
+        e = 0;
+    }
+
+    // This will also test the add_entry_to_cache_table() method.
+    void get_entry_from_cache_table_test()
+    {
+        HTTPCacheTable::CacheEntry *e = hc->d_http_cache_table->cache_index_parse_line(index_file_line.c_str());
+
+        // Test adding an entry and getting it back.
+        hc->d_http_cache_table->add_entry_to_cache_table(e);
+
+        HTTPCacheTable::CacheEntry *e2 = hc->d_http_cache_table->get_locked_entry_from_cache_table(localhost_url);
+        CPPUNIT_ASSERT(e2);
+        CPPUNIT_ASSERT(e2->url == localhost_url);
+        e2->unlock_read_response();
+
+        // Now test what happens when two entries collide.
+        HTTPCacheTable::CacheEntry *e3 = hc->d_http_cache_table->cache_index_parse_line(index_file_line.c_str());
+
+        // Change the url so we can tell the difference (the hash is the same)
+        e3->url = "http://new.url.same.hash/test/collisions.gif";
+
+        hc->d_http_cache_table->add_entry_to_cache_table(e3);
+
+        // Use the version of get_entry... that lets us pass in the hash
+        // value (as opposed to the normal version which calculates the hash
+        // from the url. 10/01/02 jhrg
+        HTTPCacheTable::CacheEntry *g = hc->d_http_cache_table->get_locked_entry_from_cache_table(hash_value, e3->url);
+        CPPUNIT_ASSERT(g);
+        CPPUNIT_ASSERT(g->url == e3->url);
+        g->unlock_read_response();
+
+        g = hc->d_http_cache_table->get_locked_entry_from_cache_table("http://not.in.table/never.x");
+        CPPUNIT_ASSERT(g == 0);
+    }
+
+    void cache_index_write_test()
+    {
+        try {
+            HTTPCache * hc_3 = new HTTPCache("cache-testsuite/dods_cache/", true);
+            hc_3->d_http_cache_table->add_entry_to_cache_table(
+                hc->d_http_cache_table->cache_index_parse_line(index_file_line.c_str()));
+
+            hc_3->d_http_cache_table->d_cache_index = hc->d_cache_root + "test_index";
+            hc_3->d_http_cache_table->cache_index_write();
+
+            HTTPCache *hc_4 = new HTTPCache("cache-testsuite/dods_cache/", true);
+            hc_4->d_http_cache_table->d_cache_index = hc_3->d_cache_root + "test_index";
+            hc_4->d_http_cache_table->cache_index_read();
+
+            HTTPCacheTable::CacheEntry *e = hc_4->d_http_cache_table->get_locked_entry_from_cache_table(localhost_url);
+            DBG(cerr << "Got locked entry" << endl);
+            CPPUNIT_ASSERT(e);
+            CPPUNIT_ASSERT(e->url == localhost_url);
+            e->unlock_read_response();
+
+            delete hc_3;
+            hc_3 = 0;
+            delete hc_4;
+            hc_4 = 0;
+        }
+        catch (Error &e) {
+            //cerr << "Fail: " << e.get_error_message() << endl;
+            CPPUNIT_FAIL(e.get_error_message());
+        }
+    }
+
+    void create_cache_root_test()
+    {
+        hc->create_cache_root("/tmp/silly/");
+        CPPUNIT_ASSERT(access("/tmp/silly/", F_OK) == 0);
+        remove("/tmp/silly");
+#if 0
+        // This test doesn't work on some machines where the build is
+        // run as root or where /root is owned by some other user (as is
+        // the case with OS/X.
+        try {
+            hc->create_cache_root("/root/very_silly/");
+            access("/root/very_silly/", F_OK);
+            remove("/root/very_silly/");
+            CPPUNIT_ASSERT(!"Should not be able to do this...");
+        }
+        catch (Error &e) {
+            CPPUNIT_ASSERT("This is where we want to be");
+            CPPUNIT_ASSERT(access("/root/very_silly/", F_OK) != 0);
+        }
+#endif
+    }
+
+    void set_cache_root_test()
+    {
+#if 0
+        // env var support removed 3/22/11 jhrg
+        putenv("DODS_CACHE=/home/jimg");
+        hc->set_cache_root();
+        CPPUNIT_ASSERT(hc->d_cache_root == "/home/jimg/dods-cache/");
+        remove("/home/jimg/w3c-cache/");
+#endif
+        hc->set_cache_root("/home/jimg/test_cache");
+        CPPUNIT_ASSERT(hc->d_cache_root == "/home/jimg/test_cache/");
+        remove("/home/jimg/test_cache/");
+    }
+
+    void get_single_user_lock_test()
+    {
+        hc->set_cache_root("/tmp/dods_test_cache");
+        hc->release_single_user_lock();
+
+        CPPUNIT_ASSERT(hc->get_single_user_lock());
+        CPPUNIT_ASSERT(access("/tmp/dods_test_cache/.lock", F_OK) == 0);
+
+        // Second time should fail
+        CPPUNIT_ASSERT(!hc->get_single_user_lock());
+    }
+
+    void release_single_user_lock_test()
+    {
+        hc->set_cache_root("/tmp/dods_test_cache");
+        remove("/tmp/dods_test_cache/.lock"); // in case prev. test fails
+        hc->d_locked_open_file = 0;
+
+        CPPUNIT_ASSERT(hc->get_single_user_lock());
+        CPPUNIT_ASSERT(access("/tmp/dods_test_cache/.lock", F_OK) == 0);
+
+        hc->release_single_user_lock();
+        CPPUNIT_ASSERT(hc->get_single_user_lock());
+        CPPUNIT_ASSERT(access("/tmp/dods_test_cache/.lock", F_OK) == 0);
+
+        CPPUNIT_ASSERT(!hc->get_single_user_lock());
+
+        remove("/tmp/dods_test_cache/.lock");
+    }
+
+    void create_hash_directory_test()
+    {
+        hc->set_cache_root("/tmp/dods_test_cache");
+        CPPUNIT_ASSERT(hc->d_http_cache_table->create_hash_directory(391) == "/tmp/dods_test_cache/391");
+        CPPUNIT_ASSERT(access("/tmp/dods_test_cache/391", W_OK) == 0);
+#if 0
+        // This test doesn't work on some machines where the build is
+        // run as root or where /root is owned by some other user (as is
+        // the case with OS/X.
+        hc->set_cache_root("/root/");
+        try {
+            hc->create_hash_directory(391);
+            CPPUNIT_ASSERT(!"Create in bad directory");
+        }
+        catch (Error &e) {
+        }
+#endif
+        remove("/tmp/dods_test_cache/391");
+
+    }
+
+    void create_location_test()
+    {
+        hc->set_cache_root("/tmp/dods_test_cache");
+        HTTPCacheTable::CacheEntry *e = new HTTPCacheTable::CacheEntry;
+        e->url = localhost_url;
+        e->hash = hash_value;
+        try {
+            hc->d_http_cache_table->create_location(e);
+            CPPUNIT_ASSERT(e->cachename != "");
+        }
+        catch (Error &e) {
+            CPPUNIT_ASSERT(true && "could not create entry file");
+        }
+        remove(e->cachename.c_str());
+
+        delete e;
+        e = 0;
+    }
+
+    void parse_headers_test()
+    {
+        HTTPCacheTable::CacheEntry *e = new HTTPCacheTable::CacheEntry;
+
+        hc->d_http_cache_table->parse_headers(e, hc->d_max_entry_size, h);
+        CPPUNIT_ASSERT(e->lm == 784025377);
+
+        delete e;
+        e = 0;
+    }
+
+    void calculate_time_test()
+    {
+        HTTPCacheTable::CacheEntry *e = new HTTPCacheTable::CacheEntry;
+
+        hc->d_http_cache_table->parse_headers(e, hc->d_max_entry_size, h);
+        hc->d_http_cache_table->calculate_time(e, hc->d_default_expiration, time(0));
+        CPPUNIT_ASSERT(e->corrected_initial_age > 249300571);
+        CPPUNIT_ASSERT(e->freshness_lifetime == 86400);
+
+        delete e;
+        e = 0;
+    }
+
+    void write_metadata_test()
+    {
+        hc->set_cache_root("/tmp/dods_test_cache");
+        HTTPCacheTable::CacheEntry *e = new HTTPCacheTable::CacheEntry;
+        try {
+            e->hash = 101;
+            hc->d_http_cache_table->create_location(e);
+            CPPUNIT_ASSERT(e->cachename != "");
+        }
+        catch (Error &e) {
+            CPPUNIT_ASSERT(true && "could not create entry file");
+        }
+
+        hc->write_metadata(e->cachename, h);
+        vector<string> headers;
+        hc->read_metadata(e->cachename, headers);
+
+        vector<string>::iterator i, j;
+        for (i = headers.begin(), j = h.begin(); i != headers.end() && j != h.end(); ++i, ++j) {
+            CPPUNIT_ASSERT(*i == *j);
+        }
+
+        remove(e->cachename.c_str());
+        remove(string(e->cachename + ".meta").c_str());
+        delete e;
+        e = 0;
+    }
+
+    void cache_response_test()
+    {
+        HTTPResponse *rs = http_conn->fetch_url(localhost_url);
+        try {
+            time_t now = time(0);
+            vector<string> *headers = rs->get_headers();
+            hc->cache_response(localhost_url, now, *headers, rs->get_stream());
+
+            CPPUNIT_ASSERT(hc->is_url_in_cache(localhost_url));
+
+            HTTPCacheTable::CacheEntry *e = hc->d_http_cache_table->get_locked_entry_from_cache_table(localhost_url);
+            CPPUNIT_ASSERT(file_size(e->cachename) == 343);
+            e->unlock_read_response();
+            delete rs;
+            rs = 0;
+        }
+        catch (Error &e) {
+            delete rs;
+            rs = 0;
+            cerr << "Error: " << e.get_error_message() << endl;
+            CPPUNIT_ASSERT(!"Caught unexpected Error/InternalErr");
+        }
+    }
+
+    void is_url_valid_test()
+    {
+        cache_response_test(); // This should get a response into the cache.
+        CPPUNIT_ASSERT(hc->is_url_valid(localhost_url));
+    }
+
+    void get_cached_response_test()
+    {
+        cache_response_test(); // Get a response into the cache.
+        vector<string> cached_headers;
+        FILE *cached_body = hc->get_cached_response(localhost_url, cached_headers);
+
+        HTTPResponse *rs = http_conn->fetch_url(localhost_url);
+        vector<string> *headers = rs->get_headers();
+
+        // headers and cached_headers should match, except for the values.
+        vector<string>::iterator i, j;
+        for (i = cached_headers.begin(), j = headers->begin(); i != cached_headers.end() && j != headers->end();
+            ++i, ++j) {
+            string ch = (*i).substr(0, (*i).find(": "));
+            // Skip over headers that won't be cached. jhrg 7/4/05
+            while (is_hop_by_hop_header(*j))
+                ++j;
+            string h = (*j).substr(0, (*j).find(": "));
+            DBG(cerr << "cached: " << ch << ", header: " << h << endl);
+            CPPUNIT_ASSERT(ch == h);
+        }
+
+#ifdef DODS_DEBUG
+        std::ostream_iterator<string> out_it(std::cerr, "\n");
+        cerr << "Cached headers: ";
+        std::copy(cached_headers.begin(), cached_headers.end(), out_it);
+        cerr << "Headers: ";
+        std::copy(headers->begin(), headers->end(), out_it);
+#endif
+
+        CPPUNIT_ASSERT(i == cached_headers.end());
+        // This may not be true if. For example, keep-alive might appear in the list of headers
+        // received, but not in the list of headers cached.
+        // CPPUNIT_ASSERT(j == headers->end());
+
+        // every byte of the cached_body and response body should match.
+        while (!feof(rs->get_stream()) && !feof(cached_body) && !ferror(rs->get_stream()) && !ferror(cached_body)) {
+            char cb, b;
+            int cn = fread(&cb, 1, 1, cached_body);
+            int n = fread(&b, 1, 1, rs->get_stream());
+            CPPUNIT_ASSERT(cn == n);
+            if (cn == 1) CPPUNIT_ASSERT(cb == b);
+        }
+        CPPUNIT_ASSERT(feof(rs->get_stream()) && feof(cached_body));
+
+        hc->release_cached_response(cached_body);
+        delete rs;
+        rs = 0;
+    }
+
+    void perform_garbage_collection_test()
+    {
+        try {
+            delete hc;
+            hc = 0;
+            auto_ptr<HTTPCache> gc(new HTTPCache("cache-testsuite/gc_cache", true));
+            DBG(cerr << "get_cache_root: " << gc->get_cache_root() << endl);
+
+            HTTPResponse *rs = http_conn->fetch_url(localhost_url);
+            gc->cache_response(localhost_url, time(0), *(rs->get_headers()), rs->get_stream());
+            CPPUNIT_ASSERT(gc->is_url_in_cache(localhost_url));
+            delete rs;
+            rs = 0;
+
+            rs = http_conn->fetch_url(expired);
+            gc->cache_response(expired, time(0), *(rs->get_headers()), rs->get_stream());
+            CPPUNIT_ASSERT(gc->is_url_in_cache(expired));
+            delete rs;
+            rs = 0;
+
+            sleep(2);
+
+            gc->perform_garbage_collection();
+            gc->d_http_cache_table->cache_index_write();
+
+            CPPUNIT_ASSERT(
+                !gc->is_url_in_cache(expired) && "This may fail if sleep is not long enough before gc above");
+        }
+        catch (Error &e) {
+            cerr << "Exception: " << e.get_error_message() << endl;
+            CPPUNIT_ASSERT(false);
+        }
+    }
+
+    void purge_cache_and_release_cached_response_test()
+    {
+        try {
+            auto_ptr<HTTPCache> pc(new HTTPCache("cache-testsuite/purge_cache", true));
+            DBG(cerr << "get_cache_root: " << pc->get_cache_root() << endl);
+
+            time_t now = time(0);
+            HTTPResponse *rs = http_conn->fetch_url(localhost_url);
+            pc->cache_response(localhost_url, now, *(rs->get_headers()), rs->get_stream());
+
+            CPPUNIT_ASSERT(pc->is_url_in_cache(localhost_url));
+            delete rs;
+            rs = 0;
+
+            string expired = "http://test.opendap.org/cgi-bin/expires.sh";
+            now = time(0);
+            rs = http_conn->fetch_url(expired);
+            pc->cache_response(expired, now, *(rs->get_headers()), rs->get_stream());
+
+            CPPUNIT_ASSERT(pc->is_url_in_cache(expired));
+            delete rs;
+            rs = 0;
+
+            HTTPCacheTable::CacheEntry *e1 = pc->d_http_cache_table->get_locked_entry_from_cache_table(expired);
+            HTTPCacheTable::CacheEntry *e2 = pc->d_http_cache_table->get_locked_entry_from_cache_table(localhost_url);
+            string e1_file = e1->cachename;
+            string e2_file = e2->cachename;
+            e1->unlock_read_response();
+            e2->unlock_read_response();
+
+            vector<string> headers;
+            FILE *b = pc->get_cached_response(expired, headers);
+
+            try {
+                pc->purge_cache();
+                CPPUNIT_ASSERT(!"This call should throw Error");
+            }
+            catch (Error &e) {
+                CPPUNIT_ASSERT("Caught Error as expected");
+            }
+
+            pc->release_cached_response(b);
+
+            pc->purge_cache();
+
+            CPPUNIT_ASSERT(!pc->is_url_in_cache(localhost_url));
+            CPPUNIT_ASSERT(!pc->is_url_in_cache(expired));
+            CPPUNIT_ASSERT(access(e1_file.c_str(), F_OK) != 0);
+            CPPUNIT_ASSERT(access(e2_file.c_str(), F_OK) != 0);
+            CPPUNIT_ASSERT(pc->d_http_cache_table->d_current_size == 0);
+        }
+        catch (Error &e) {
+            cerr << "Exception: " << e.get_error_message() << endl;
+            CPPUNIT_ASSERT(false);
+        }
+    }
+
+    void instance_test()
+    {
+        try {
+            // FIXME: Explain
+            HTTPCache::delete_instance();
+
+            HTTPCache *c = HTTPCache::instance("cache-testsuite/singleton_cache", true);
+            DBG(cerr << "get_cache_root: " << c->get_cache_root() << endl);
+
+            if (!c->is_url_in_cache(localhost_url)) {
+                HTTPResponse *rs = http_conn->fetch_url(localhost_url);
+                c->cache_response(localhost_url, time(0), *(rs->get_headers()), rs->get_stream());
+                delete rs;
+                rs = 0;
+            }
+            CPPUNIT_ASSERT(c->is_url_in_cache(localhost_url));
+
+            if (!c->is_url_in_cache(expired)) {
+                HTTPResponse *rs = http_conn->fetch_url(expired);
+                c->cache_response(expired, time(0), *(rs->get_headers()), rs->get_stream());
+                delete rs;
+                rs = 0;
+            }
+            CPPUNIT_ASSERT(c->is_url_in_cache(expired));
+
+            HTTPCacheTable::CacheEntry *e1 = c->d_http_cache_table->get_locked_entry_from_cache_table(expired);
+            HTTPCacheTable::CacheEntry *e2 = c->d_http_cache_table->get_locked_entry_from_cache_table(localhost_url);
+            string e1_file = e1->cachename;
+            string e2_file = e2->cachename;
+            e1->unlock_read_response();
+            e2->unlock_read_response();
+
+            c->purge_cache();
+
+            CPPUNIT_ASSERT(!c->is_url_in_cache(localhost_url));
+            CPPUNIT_ASSERT(!c->is_url_in_cache(expired));
+            CPPUNIT_ASSERT(access(e1_file.c_str(), F_OK) != 0);
+            CPPUNIT_ASSERT(access(e2_file.c_str(), F_OK) != 0);
+        }
+        catch (Error &e) {
+            cerr << "Exception: " << e.get_error_message() << endl;
+            CPPUNIT_ASSERT(false);
+        }
+
+        // Call this here to simulate exiting the program. This ensures that
+        // the next test's call to instance() gets a fresh cache. The static
+        // method will still be run at exit, but that's OK since it tests the
+        // value of _instance and simply returns with it's zero.
+        HTTPCache::delete_instance();
+#ifndef WIN32
+        SignalHandler::delete_instance();
+#endif
+    }
+
+    void get_conditional_response_headers_test()
+    {
+        try {
+            auto_ptr<HTTPCache> c(new HTTPCache("cache-testsuite/header_cache", true));
+            DBG(cerr << "get_cache_root: " << c->get_cache_root() << endl);
+
+            CPPUNIT_ASSERT(c->get_cache_root() == "cache-testsuite/header_cache/");
+            if (!c->is_url_in_cache(localhost_url)) {
+                HTTPResponse *rs = http_conn->fetch_url(localhost_url);
+                c->cache_response(localhost_url, time(0), *(rs->get_headers()), rs->get_stream());
+                delete rs;
+            }
+            CPPUNIT_ASSERT(c->is_url_in_cache(localhost_url));
+
+            if (!c->is_url_in_cache(expired)) {
+                HTTPResponse *rs = http_conn->fetch_url(expired);
+                c->cache_response(expired, time(0), *(rs->get_headers()), rs->get_stream());
+                delete rs;
+            }
+            CPPUNIT_ASSERT(c->is_url_in_cache(expired));
+
+            vector<string> h = c->get_conditional_request_headers(localhost_url);
+            DBG(copy(h.begin(), h.end(), ostream_iterator<string>(cout, "\n")));
+            DBG(cerr << "if none match location: " << h[0].find("If-None-Match: ") << endl);
+            // I know what the strings should start with...
+            CPPUNIT_ASSERT(h[0].find("If-None-Match: ") == 0);
+
+            h = c->get_conditional_request_headers(expired);
+            DBG(cerr << "Number of headers: " << h.size() << endl);
+            DBG(copy(h.begin(), h.end(), ostream_iterator<string>(cout, "\n")));
+            CPPUNIT_ASSERT(h[0].find("If-Modified-Since: ") == 0);
+        }
+        catch (Error &e) {
+            CPPUNIT_FAIL(e.get_error_message());
+        }
+    }
+
+    void update_response_test()
+    {
+        try {
+            auto_ptr<HTTPCache> c(new HTTPCache("cache-testsuite/singleton_cache", true));
+            DBG(cerr << "get_cache_root: " << c->get_cache_root() << endl);
+
+            if (!c->is_url_in_cache(localhost_url)) {
+                HTTPResponse *rs = http_conn->fetch_url(localhost_url);
+                c->cache_response(localhost_url, time(0), *(rs->get_headers()), rs->get_stream());
+                delete rs;
+            }
+
+            if (!c->is_url_in_cache(expired)) {
+                HTTPResponse *rs = http_conn->fetch_url(expired);
+                c->cache_response(expired, time(0), *(rs->get_headers()), rs->get_stream());
+                delete rs;
+            }
+
+            // Yes, there's stuff here.
+            CPPUNIT_ASSERT(c->is_url_in_cache(localhost_url));
+            CPPUNIT_ASSERT(c->is_url_in_cache(expired));
+
+            vector<string> orig_h;
+            FILE *cr = c->get_cached_response(localhost_url, orig_h);
+
+            DBG(copy(orig_h.begin(), orig_h.end(), ostream_iterator<string>(cerr, "\n")));
+
+            // Before we merge, et c., check that the headers we're going to
+            // poke in aren't already there.
+            CPPUNIT_ASSERT(find(orig_h.begin(), orig_h.end(), "XHTTPCache: 123456789") == orig_h.end());
+            CPPUNIT_ASSERT(find(orig_h.begin(), orig_h.end(), "Date: <invalid date>") == orig_h.end());
+
+            // Make up some new headers.
+            vector<string> new_h;
+            new_h.push_back("XHTTPCache: 123456789");
+            new_h.push_back("Date: <invalid date>");
+
+            c->release_cached_response(cr);
+
+            c->update_response(localhost_url, time(0), new_h);
+
+            vector<string> updated_h;
+            cr = c->get_cached_response(localhost_url, updated_h);
+            c->release_cached_response(cr);
+
+            DBG(cerr << endl);
+            DBG(copy(updated_h.begin(), updated_h.end(), ostream_iterator<string>(cerr, "\n")));
+
+            // The XHTTPCacheTest header should be new, Date should replace the
+            // existing Date header.
+            // This may not be true when using distcheck and/or when the user
+            // has set USE_CACHE to 1 in their .dodsrc. jhrg 9/29/15
+            // CPPUNIT_ASSERT(orig_h.size() + 1 == updated_h.size());
+            CPPUNIT_ASSERT(find(updated_h.begin(), updated_h.end(), "XHTTPCache: 123456789") != updated_h.end());
+            CPPUNIT_ASSERT(find(updated_h.begin(), updated_h.end(), "Date: <invalid date>") != updated_h.end());
+        }
+        catch (Error &e) {
+            CPPUNIT_FAIL(e.get_error_message());
+        }
+    }
+
+    // Only run this interactively since you need to hit Ctrl-c to generate
+    // SIGINT while the cache is doing its thing. 02/10/04 jhrg
+    void interrupt_test()
+    {
+        try {
+            auto_ptr<HTTPCache> c(new HTTPCache("cache-testsuite/singleton_cache", true));
+            string coads = "http://test.opendap.org/dap/data/nc/coads_climatology.nc";
+            if (!c->is_url_in_cache(coads)) {
+                HTTPResponse *rs = http_conn->fetch_url(coads);
+                cerr << "In interrupt test, hit ctrl-c now... ";
+                c->cache_response(coads, time(0), *(rs->get_headers()), rs->get_stream());
+                cerr << "to late.";
+                delete rs;
+            }
+        }
+        catch (Error &e) {
+            CPPUNIT_FAIL(e.get_error_message());
+        }
+    }
+
+    void cache_gc_test()
+    {
+        string fnoc1 = "http://test.opendap.org/dap/data/nc/fnoc1.nc.dds";
+        string jan = "http://test.opendap.org/dap/data/nc/jan.nc.dds";
+        string feb = "http://test.opendap.org/dap/data/nc/feb.nc.dds";
+        try {
+            auto_ptr<HTTPCache> pc(new HTTPCache("cache-testsuite/purge_cache", true));
+#if 0
+            // This broke Fedora ppc64le system with XFS system
+            CPPUNIT_ASSERT(pc->d_http_cache_table->d_block_size == 4096);
+#endif
+            // Change the size parameters so that we can run some tests
+            pc->d_total_size = 12288; // bytes
+            pc->d_folder_size = pc->d_total_size / 10;
+            pc->d_gc_buffer = pc->d_total_size / 10;
+
+            // The cache should start empty
+            CPPUNIT_ASSERT(pc->d_http_cache_table->d_current_size == 0);
+
+            // Get a url
+            HTTPResponse *rs = http_conn->fetch_url(fnoc1);
+            pc->cache_response(fnoc1, time(0), *(rs->get_headers()), rs->get_stream());
+            CPPUNIT_ASSERT(pc->is_url_in_cache(fnoc1));
+            delete rs;
+            rs = 0;
+            // trigger a hit for fnoc1
+            vector<string> h;
+            FILE *f = pc->get_cached_response(fnoc1, h);
+            pc->release_cached_response(f);
+
+            rs = http_conn->fetch_url(jan);
+            pc->cache_response(jan, time(0), *(rs->get_headers()), rs->get_stream());
+            CPPUNIT_ASSERT(pc->is_url_in_cache(jan));
+            delete rs;
+            rs = 0;
+            // trigger two hits for jan
+            f = pc->get_cached_response(jan, h);
+            pc->release_cached_response(f);
+            f = pc->get_cached_response(jan, h);
+            pc->release_cached_response(f);
+
+            rs = http_conn->fetch_url(feb);
+            pc->cache_response(feb, time(0), *(rs->get_headers()), rs->get_stream());
+            CPPUNIT_ASSERT(pc->is_url_in_cache(feb));
+            delete rs;
+            rs = 0;
+        }
+        catch (Error &e) {
+            CPPUNIT_FAIL(e.get_error_message());
+        }
+
+        // now that pc is out of scope, its dtor has been run and GC
+        // performed. The feb URL should have been deleted.
+
+        try {
+            auto_ptr<HTTPCache> pc(new HTTPCache("cache-testsuite/purge_cache", true));
+            CPPUNIT_ASSERT(!pc->is_url_in_cache(feb));
+        }
+        catch (Error &e) {
+            CPPUNIT_FAIL(e.get_error_message());
+        }
+    }
+
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION (HTTPCacheTest);
+
+} // namespace libdap
+
+int main(int argc, char*argv[])
+{
+    GetOpt getopt(argc, argv, "dh");
+    int option_char;
+
+    while ((option_char = getopt()) != -1)
+        switch (option_char) {
+        case 'd':
+            debug = 1;  // debug is a static global
+            break;
+        case 'h': {     // help - show test names
+            cerr << "Usage: HTTPCacheTest has the following tests:" << endl;
+            const std::vector<Test*> &tests = libdap::HTTPCacheTest::suite()->getTests();
+            unsigned int prefix_len = libdap::HTTPCacheTest::suite()->getName().append("::").length();
+            for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+                cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+            }
+            break;
+        }
+        default:
+            break;
+        }
+
+    // Run cleanup here, so that the first run works (since this code now
+    // sets up the tests).
+    // This gives valgrind fits...
+    system("cd cache-testsuite && ./cleanup.sh");
+
+    CppUnit::TextTestRunner runner;
+    runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
+    bool wasSuccessful = true;
+    string test = "";
+    int i = getopt.optind;
+    if (i == argc) {
+        // run them all
+        wasSuccessful = runner.run("");
+    }
+    else {
+        for (; i < argc; ++i) {
+            if (debug) cerr << "Running " << argv[i] << endl;
+            test = libdap::HTTPCacheTest::suite()->getName().append("::").append(argv[i]);
+            wasSuccessful = wasSuccessful && runner.run(test);
+        }
+    }
+
+    return wasSuccessful ? 0 : 1;
+}
+
diff --git a/unit-tests/HTTPConnectTest.cc b/unit-tests/HTTPConnectTest.cc
new file mode 100644
index 0000000..c732196
--- /dev/null
+++ b/unit-tests/HTTPConnectTest.cc
@@ -0,0 +1,795 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003,2013 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#include <cppunit/TextTestRunner.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+#include <cppunit/extensions/HelperMacros.h>
+
+#include <cstring>
+#include <iterator>
+#include <string>
+#include <algorithm>
+#include <functional>
+
+#include "GNURegex.h"
+#include "HTTPConnect.h"
+#include "RCReader.h"
+
+#include "debug.h"
+
+#include "test_config.h"
+
+using namespace CppUnit;
+using namespace std;
+
+#include"GetOpt.h"
+
+static bool debug = false;
+
+#undef DBG
+#define DBG(x) do { if (debug) (x); } while(false);
+
+namespace libdap {
+
+class HTTPConnectTest: public TestFixture {
+private:
+    HTTPConnect * http;
+    string localhost_url, localhost_pw_url, localhost_digest_pw_url;
+    string etag;
+    string lm;
+    string netcdf_das_url;
+
+    // char env_data[128];
+
+protected:
+    bool re_match(Regex & r, const char *s)
+    {
+        return r.match(s, strlen(s)) == (int) strlen(s);
+    }
+
+    struct REMatch: public unary_function<const string &, bool> {
+        Regex &d_re;
+        REMatch(Regex &re) :
+            d_re(re)
+        {
+        }
+        ~REMatch()
+        {
+        }
+        bool operator()(const string &str)
+        {
+            const char *s = str.c_str();
+            return d_re.match(s, strlen(s)) == (int) strlen(s);
+        }
+    };
+
+    // This is defined in HTTPConnect.cc but has to be defined here as well.
+    // Don't know why... jhrg
+    class HeaderMatch: public unary_function<const string &, bool> {
+        const string &d_header;
+    public:
+        HeaderMatch(const string &header) :
+            d_header(header)
+        {
+        }
+        bool operator()(const string &arg)
+        {
+            return arg.find(d_header) == 0;
+        }
+    };
+
+public:
+    HTTPConnectTest()
+    {
+    }
+    ~HTTPConnectTest()
+    {
+    }
+
+    void setUp()
+    {
+        DBG(cerr << "Setting the DODS_CONF env var" << endl);
+        setenv("DODS_CONF", "cache-testsuite/dodsrc", 1);
+        http = new HTTPConnect(RCReader::instance());
+
+        localhost_url = "http://test.opendap.org/test-304.html";
+
+        // Two request header values that will generate a 304 response to the
+        // above URL. The values below much match the etag and last-modified
+        // time returned by the server. Run this test with DODS_DEBUG defined
+        // to see the values it's returning.
+        // On 10/13/14 we moved to a new httpd and the etag value changed.
+        // jhrg 10/14/14
+        etag = "\"181893-157-3fbcd139c2680\""; //"\"2a008e-157-3fbcd139c2680\""; //\"a10df-157-139c2680\""; // a10df-157-139c2680a
+        lm = "Wed, 13 Jul 2005 19:32:26 GMT";
+
+        localhost_pw_url = "http://jimg:dods_test@test.opendap.org/basic/page.txt";
+        localhost_digest_pw_url = "http://jimg:dods_digest@test.opendap.org/digest/page.txt";
+        netcdf_das_url = "http://test.opendap.org/dap/data/nc/fnoc1.nc.das";
+    }
+
+    void tearDown()
+    {
+        // normal code doesn't do this - it happens at exit() but not doing
+        // this here make valgrind think there are leaks.
+        http->d_http_cache->delete_instance();
+        delete http;
+        http = 0;
+        unsetenv("DODS_CONF");
+    }
+
+    CPPUNIT_TEST_SUITE (HTTPConnectTest);
+
+    CPPUNIT_TEST (read_url_test);
+
+    CPPUNIT_TEST (fetch_url_test_1);
+    CPPUNIT_TEST (fetch_url_test_2);
+    CPPUNIT_TEST (fetch_url_test_3);
+    CPPUNIT_TEST (fetch_url_test_4);
+
+    CPPUNIT_TEST (fetch_url_test_1_cpp);
+    CPPUNIT_TEST (fetch_url_test_2_cpp);
+    CPPUNIT_TEST (fetch_url_test_3_cpp);
+    CPPUNIT_TEST (fetch_url_test_4_cpp);
+
+    CPPUNIT_TEST (get_response_headers_test);
+    CPPUNIT_TEST (server_version_test);
+    CPPUNIT_TEST (type_test);
+
+    CPPUNIT_TEST (cache_test);
+    CPPUNIT_TEST (cache_test_cpp);
+
+    CPPUNIT_TEST (set_accept_deflate_test);
+    CPPUNIT_TEST (set_xdap_protocol_test);
+    CPPUNIT_TEST (read_url_password_test);
+    CPPUNIT_TEST (read_url_password_test2);
+
+    // CPPUNIT_TEST(read_url_password_proxy_test);
+
+    CPPUNIT_TEST_SUITE_END();
+
+    void read_url_test()
+    {
+        vector<string> *resp_h = new vector<string>;
+        ;
+
+        try {
+            DBG(cerr << "Entering read_url_test... " << endl);
+
+            FILE *dump = fopen("/dev/null", "w");
+            long status = http->read_url(localhost_url, dump, resp_h);
+            CPPUNIT_ASSERT(status == 200);
+
+            vector<string> request_h;
+
+            // First test using a time with if-modified-since
+            request_h.push_back(string("If-Modified-Since: ") + lm);
+            status = http->read_url(localhost_url, dump, resp_h, &request_h);
+            DBG(cerr << "If modified since test, status: " << status << endl);
+            DBG(copy(resp_h->begin(), resp_h->end(), ostream_iterator<string>(cerr, "\n")));
+            DBG(cerr << endl);
+            CPPUNIT_ASSERT(status == 304);
+
+            // Now test an etag
+            resp_h->clear();
+            request_h.clear();
+            request_h.push_back(string("If-None-Match: ") + etag);
+            status = http->read_url(localhost_url, dump, resp_h, &request_h);
+            DBG(cerr << "If none match test, status: " << status << endl);
+            DBG(copy(resp_h->begin(), resp_h->end(), ostream_iterator<string>(cerr, "\n")));
+            DBG(cerr << endl);
+            CPPUNIT_ASSERT(status == 304);
+
+            // now test a combined etag and time4
+            resp_h->clear();
+            request_h.clear();
+            request_h.push_back(string("If-None-Match: ") + etag);
+            request_h.push_back(string("If-Modified-Since: ") + lm);
+            status = http->read_url(localhost_url, dump, resp_h, &request_h);
+            DBG(cerr << "Combined test, status: " << status << endl);
+            DBG(copy(resp_h->begin(), resp_h->end(), ostream_iterator<string>(cerr, "\n")));
+            CPPUNIT_ASSERT(status == 304);
+
+            delete resp_h;
+            resp_h = 0;
+
+        }
+        catch (Error & e) {
+            delete resp_h;
+            resp_h = 0;
+            CPPUNIT_FAIL("Error: " + e.get_error_message());
+        }
+    }
+
+    void fetch_url_test_1()
+    {
+        DBG(cerr << "Entering fetch_url_test 1" << endl);
+        HTTPResponse *stuff = 0;
+        char c;
+        try {
+            stuff = http->fetch_url(localhost_url);
+            CPPUNIT_ASSERT(
+                fread(&c, 1, 1, stuff->get_stream()) == 1 && !ferror(stuff->get_stream())
+                    && !feof(stuff->get_stream()));
+            delete stuff;
+            stuff = 0;
+
+        }
+        catch (InternalErr & e) {
+            delete stuff;
+            stuff = 0;
+            CPPUNIT_FAIL("Caught an InternalErr from fetch_url: " + e.get_error_message());
+        }
+        catch (Error & e) {
+            delete stuff;
+            stuff = 0;
+            CPPUNIT_FAIL("Caught an Error from fetch_url: " + e.get_error_message());
+        }
+        // Catch the exception from a failed ASSERT and clean up. Deleting a
+        // Response object also unlocks the HTTPCache in some cases. If delete
+        // is not called, then a failed test can leave the cache with locked
+        // entries
+        catch (...) {
+            cerr << "Caught unknown exception" << endl;
+            delete stuff;
+            stuff = 0;
+            throw;
+        }
+    }
+
+    void fetch_url_test_1_cpp()
+    {
+        DBG(cerr << "Entering fetch_url_test 1" << endl);
+        HTTPResponse *stuff = 0;
+        http->set_use_cpp_streams(true);
+        char c;
+        try {
+            stuff = http->fetch_url(localhost_url);
+            stuff->get_cpp_stream()->read(&c, 1);
+            CPPUNIT_ASSERT(*(stuff->get_cpp_stream()));
+            CPPUNIT_ASSERT(!stuff->get_cpp_stream()->bad());
+            CPPUNIT_ASSERT(!stuff->get_cpp_stream()->eof());
+
+            delete stuff;
+        }
+        catch (InternalErr &e) {
+            delete stuff;
+            CPPUNIT_FAIL("Caught an InternalErr from fetch_url: " + e.get_error_message());
+        }
+        catch (Error &e) {
+            delete stuff;
+            CPPUNIT_FAIL("Caught an Error from fetch_url: " + e.get_error_message());
+        }
+        catch (std::exception &e) {
+            delete stuff;
+            CPPUNIT_FAIL(string("Caught an std::exception from fetch_url: ") + e.what());
+        }
+        // Catch the exception from a failed ASSERT and clean up. Deleting a
+        // Response object also unlocks the HTTPCache in some cases. If delete
+        // is not called, then a failed test can leave the cache with locked
+        // entries
+        catch (...) {
+            cerr << "Caught unknown exception" << endl;
+            delete stuff;
+            throw;
+        }
+    }
+
+    void fetch_url_test_2()
+    {
+        DBG(cerr << "Entering fetch_url_test 2" << endl);
+        HTTPResponse *stuff = 0;
+        char c;
+        try {
+            stuff = http->fetch_url(netcdf_das_url);
+            DBG2(char ln[1024]; while (!feof(stuff->get_stream())) {
+                    fgets(ln, 1024, stuff->get_stream()); cerr << ln;}
+                rewind(stuff->get_stream()));
+
+            CPPUNIT_ASSERT(
+                fread(&c, 1, 1, stuff->get_stream()) == 1 && !ferror(stuff->get_stream())
+                    && !feof(stuff->get_stream()));
+            delete stuff;
+            stuff = 0;
+        }
+        catch (InternalErr & e) {
+            delete stuff;
+            stuff = 0;
+            CPPUNIT_FAIL("Caught an InternalErr from fetch_url: " + e.get_error_message());
+        }
+        catch (Error & e) {
+            delete stuff;
+            stuff = 0;
+            CPPUNIT_FAIL("Caught an Error from fetch_url: " + e.get_error_message());
+        }
+        // Catch the exception from a failed ASSERT and clean up. Deleting a
+        // Response object also unlocks the HTTPCache in some cases. If delete
+        // is not called, then a failed test can leave the cache with locked
+        // entries
+        catch (...) {
+            delete stuff;
+            stuff = 0;
+            throw;
+        }
+    }
+
+    void fetch_url_test_2_cpp()
+    {
+        DBG(cerr << "Entering fetch_url_test 2" << endl);
+        http->set_use_cpp_streams(true);
+
+        HTTPResponse *stuff = 0;
+        char c;
+
+        try {
+            stuff = http->fetch_url(netcdf_das_url);
+
+            stuff->get_cpp_stream()->read(&c, 1);
+            CPPUNIT_ASSERT(
+                *(stuff->get_cpp_stream()) && !stuff->get_cpp_stream()->bad() && !stuff->get_cpp_stream()->eof());
+
+            delete stuff;
+            stuff = 0;
+        }
+        catch (InternalErr & e) {
+            delete stuff;
+            stuff = 0;
+            CPPUNIT_FAIL("Caught an InternalErr from fetch_url: " + e.get_error_message());
+        }
+        catch (Error & e) {
+            delete stuff;
+            stuff = 0;
+            CPPUNIT_FAIL("Caught an Error from fetch_url: " + e.get_error_message());
+        }
+        // Catch the exception from a failed ASSERT and clean up. Deleting a
+        // Response object also unlocks the HTTPCache in some cases. If delete
+        // is not called, then a failed test can leave the cache with locked
+        // entries
+        catch (...) {
+            delete stuff;
+            stuff = 0;
+            throw;
+        }
+    }
+
+    void fetch_url_test_3()
+    {
+        DBG(cerr << "Entering fetch_url_test 3" << endl);
+        HTTPResponse *stuff = 0;
+        char c;
+        try {
+            stuff = http->fetch_url("file:///etc/passwd");
+            CPPUNIT_ASSERT(
+                fread(&c, 1, 1, stuff->get_stream()) == 1 && !ferror(stuff->get_stream())
+                    && !feof(stuff->get_stream()));
+            delete stuff;
+            stuff = 0;
+        }
+        catch (InternalErr & e) {
+            delete stuff;
+            stuff = 0;
+            CPPUNIT_FAIL("Caught an InternalErr from fetch_url" + e.get_error_message());
+        }
+        catch (Error & e) {
+            delete stuff;
+            stuff = 0;
+            CPPUNIT_FAIL("Caught an Error from fetch_url: " + e.get_error_message());
+        }
+        // Catch the exception from a failed ASSERT and clean up. Deleting a
+        // Response object also unlocks the HTTPCache in some cases. If delete
+        // is not called, then a failed test can leave the cache with locked
+        // entries
+        catch (...) {
+            delete stuff;
+            stuff = 0;
+            throw;
+        }
+    }
+
+    void fetch_url_test_3_cpp()
+    {
+        DBG(cerr << "Entering fetch_url_test 3" << endl);
+        http->set_use_cpp_streams(true);
+
+        HTTPResponse *stuff = 0;
+        char c;
+        try {
+            stuff = http->fetch_url("file:///etc/passwd");
+
+            stuff->get_cpp_stream()->read(&c, 1);
+            CPPUNIT_ASSERT(
+                *(stuff->get_cpp_stream()) && !stuff->get_cpp_stream()->bad() && !stuff->get_cpp_stream()->eof());
+
+            delete stuff;
+            stuff = 0;
+        }
+        catch (InternalErr & e) {
+            delete stuff;
+            stuff = 0;
+            CPPUNIT_FAIL("Caught an InternalErr from fetch_url" + e.get_error_message());
+        }
+        catch (Error & e) {
+            delete stuff;
+            stuff = 0;
+            CPPUNIT_FAIL("Caught an Error from fetch_url: " + e.get_error_message());
+        }
+        // Catch the exception from a failed ASSERT and clean up. Deleting a
+        // Response object also unlocks the HTTPCache in some cases. If delete
+        // is not called, then a failed test can leave the cache with locked
+        // entries
+        catch (...) {
+            delete stuff;
+            stuff = 0;
+            throw;
+        }
+    }
+
+    void fetch_url_test_4()
+    {
+        DBG(cerr << "Entering fetch_url_test 4" << endl);
+        HTTPResponse *stuff = 0;
+        char c;
+        try {
+            string url = (string) "file://" + TEST_SRC_DIR + "/test_config.h";
+            stuff = http->fetch_url(url);
+            CPPUNIT_ASSERT(
+                fread(&c, 1, 1, stuff->get_stream()) == 1 && !ferror(stuff->get_stream())
+                    && !feof(stuff->get_stream()));
+            delete stuff;
+            stuff = 0;
+        }
+        catch (InternalErr & e) {
+            delete stuff;
+            stuff = 0;
+            CPPUNIT_FAIL("Caught an InternalErr from fetch_url" + e.get_error_message());
+        }
+        catch (Error & e) {
+            delete stuff;
+            stuff = 0;
+            CPPUNIT_FAIL("Caught an Error from fetch_url: " + e.get_error_message());
+        }
+        // Catch the exception from a failed ASSERT and clean up. Deleting a
+        // Response object also unlocks the HTTPCache in some cases. If delete
+        // is not called, then a failed test can leave the cache with locked
+        // entries
+        catch (...) {
+            delete stuff;
+            stuff = 0;
+            throw;
+        }
+    }
+
+    void fetch_url_test_4_cpp()
+    {
+        DBG(cerr << "Entering fetch_url_test 4" << endl);
+        http->set_use_cpp_streams(true);
+
+        HTTPResponse *stuff = 0;
+        char c;
+        try {
+            string url = (string) "file://" + TEST_SRC_DIR + "/test_config.h";
+            stuff = http->fetch_url(url);
+
+            stuff->get_cpp_stream()->read(&c, 1);
+            CPPUNIT_ASSERT(
+                *(stuff->get_cpp_stream()) && !stuff->get_cpp_stream()->bad() && !stuff->get_cpp_stream()->eof());
+
+            delete stuff;
+            stuff = 0;
+        }
+        catch (InternalErr & e) {
+            delete stuff;
+            stuff = 0;
+            CPPUNIT_FAIL("Caught an InternalErr from fetch_url" + e.get_error_message());
+        }
+        catch (Error & e) {
+            delete stuff;
+            stuff = 0;
+            CPPUNIT_FAIL("Caught an Error from fetch_url: " + e.get_error_message());
+        }
+        // Catch the exception from a failed ASSERT and clean up. Deleting a
+        // Response object also unlocks the HTTPCache in some cases. If delete
+        // is not called, then a failed test can leave the cache with locked
+        // entries
+        catch (...) {
+            delete stuff;
+            stuff = 0;
+            throw;
+        }
+    }
+
+    void get_response_headers_test()
+    {
+        HTTPResponse *r = 0;
+
+        try {
+            r = http->fetch_url(netcdf_das_url);
+            vector<string> *h = r->get_headers();
+
+            DBG(copy(h->begin(), h->end(), ostream_iterator<string>(cerr, "\n")));
+
+            // Should get five or six headers back.
+            Regex header("X.*-Server: .*/.*");
+
+            CPPUNIT_ASSERT(find_if(h->begin(), h->end(), REMatch(header)) != h->end());
+
+            Regex protocol_header("X.*DAP: .*");	// Matches both XDAP and X-DAP
+            CPPUNIT_ASSERT(find_if(h->begin(), h->end(), REMatch(protocol_header)) != h->end());
+
+            delete r;
+            r = 0;
+        }
+        catch (InternalErr & e) {
+            delete r;
+            r = 0;
+            CPPUNIT_FAIL("Caught an InternalErr exception from get_response_headers: " + e.get_error_message());
+        }
+        catch (...) {
+            delete r;
+            r = 0;
+            throw;
+        }
+    }
+
+    void server_version_test()
+    {
+        Response *r = 0;
+        Regex protocol("^[0-9]+\\.[0-9]+$");
+        try {
+            r = http->fetch_url(netcdf_das_url);
+
+            DBG(cerr << "r->get_version().c_str(): " << r->get_protocol().c_str() << endl);
+
+            CPPUNIT_ASSERT(re_match(protocol, r->get_protocol().c_str()));
+            delete r;
+            r = 0;
+        }
+        catch (InternalErr & e) {
+            delete r;
+            r = 0;
+            CPPUNIT_FAIL("Caught an InternalErr exception from server_version: " + e.get_error_message());
+        }
+        catch (...) {
+            delete r;
+            r = 0;
+            throw;
+        }
+
+    }
+
+    void type_test()
+    {
+        Response *r = 0;
+        try {
+            r = http->fetch_url(netcdf_das_url);
+            DBG(cerr << "r->get_type(): " << r->get_type() << endl);
+            CPPUNIT_ASSERT(r->get_type() == dods_das);
+            delete r;
+            r = 0;
+        }
+        catch (InternalErr & e) {
+            delete r;
+            r = 0;
+            CPPUNIT_FAIL("Caught an InternalErr exception from type(): " + e.get_error_message());
+        }
+
+    }
+
+    void set_credentials_test()
+    {
+        http->set_credentials("jimg", "was_quit");
+        Response *stuff = http->fetch_url("http://localhost/secret");
+
+        try {
+            char c;
+            CPPUNIT_ASSERT(
+                fread(&c, 1, 1, stuff->get_stream()) == 1 && !ferror(stuff->get_stream())
+                    && !feof(stuff->get_stream()));
+            delete stuff;
+            stuff = 0;
+        }
+        catch (InternalErr & e) {
+            delete stuff;
+            stuff = 0;
+            CPPUNIT_FAIL("Caught an InternalErrexception from output: " + e.get_error_message());
+        }
+    }
+
+    void cache_test()
+    {
+        DBG(cerr << endl << "Entering Caching tests." << endl);
+        try {
+            // The cache-testsuite/dodsrc file turns this off; all the other
+            // params are set up. It used to be that HTTPConnect had an option to
+            // turn caching on, but that no longer is present. This hack enables
+            // caching for this test. 06/18/04 jhrg
+            http->d_http_cache = HTTPCache::instance(http->d_rcr->get_dods_cache_root(), true);
+            DBG(cerr << "Instantiate the cache" << endl);
+
+            CPPUNIT_ASSERT(http->d_http_cache != 0);
+            http->d_http_cache->set_cache_enabled(true);
+            DBG(cerr << "Enable the cache" << endl);
+
+            fetch_url_test_4();
+            DBG(cerr << "fetch_url_test" << endl);
+            get_response_headers_test();
+            DBG(cerr << "get_response_headers_test" << endl);
+            server_version_test();
+            DBG(cerr << "server_version_test" << endl);
+            type_test();
+            DBG(cerr << "type_test" << endl);
+        }
+        catch (Error &e) {
+            CPPUNIT_FAIL((string) "Error: " + e.get_error_message());
+        }
+    }
+
+    void cache_test_cpp()
+    {
+        DBG(cerr << endl << "Entering Caching tests." << endl);
+        try {
+            // The cache-testsuite/dodsrc file turns this off; all the other
+            // params are set up. It used to be that HTTPConnect had an option to
+            // turn caching on, but that no longer is present. This hack enables
+            // caching for this test. 06/18/04 jhrg
+            http->d_http_cache = HTTPCache::instance(http->d_rcr->get_dods_cache_root(), true);
+            DBG(cerr << "Instantiate the cache" << endl);
+
+            CPPUNIT_ASSERT(http->d_http_cache != 0);
+            http->d_http_cache->set_cache_enabled(true);
+            DBG(cerr << "Enable the cache" << endl);
+
+            fetch_url_test_4_cpp();
+            DBG(cerr << "fetch_url_test_4_cpp" << endl);
+
+            get_response_headers_test();
+            DBG(cerr << "get_response_headers_test" << endl);
+
+            server_version_test();
+            DBG(cerr << "server_version_test" << endl);
+
+            type_test();
+            DBG(cerr << "type_test" << endl);
+        }
+        catch (Error &e) {
+            CPPUNIT_FAIL((string) "Error: " + e.get_error_message());
+        }
+    }
+
+    void set_accept_deflate_test()
+    {
+        http->set_accept_deflate(false);
+        CPPUNIT_ASSERT(
+            count(http->d_request_headers.begin(), http->d_request_headers.end(),
+                "Accept-Encoding: deflate, gzip, compress") == 0);
+
+        http->set_accept_deflate(true);
+        CPPUNIT_ASSERT(
+            count(http->d_request_headers.begin(), http->d_request_headers.end(),
+                "Accept-Encoding: deflate, gzip, compress") == 1);
+
+        http->set_accept_deflate(true);
+        CPPUNIT_ASSERT(
+            count(http->d_request_headers.begin(), http->d_request_headers.end(),
+                "Accept-Encoding: deflate, gzip, compress") == 1);
+
+        http->set_accept_deflate(false);
+        CPPUNIT_ASSERT(
+            count(http->d_request_headers.begin(), http->d_request_headers.end(),
+                "Accept-Encoding: deflate, gzip, compress") == 0);
+    }
+
+    void set_xdap_protocol_test()
+    {
+        // Initially there should be no header and the protocol should be 2.0
+        CPPUNIT_ASSERT(http->d_dap_client_protocol_major == 2 && http->d_dap_client_protocol_minor == 0);
+
+        CPPUNIT_ASSERT(
+            count_if(http->d_request_headers.begin(), http->d_request_headers.end(), HeaderMatch("XDAP-Accept:")) == 0);
+
+        http->set_xdap_protocol(8, 9);
+        CPPUNIT_ASSERT(http->d_dap_client_protocol_major == 8 && http->d_dap_client_protocol_minor == 9);
+        CPPUNIT_ASSERT(count(http->d_request_headers.begin(), http->d_request_headers.end(), "XDAP-Accept: 8.9") == 1);
+
+        http->set_xdap_protocol(3, 2);
+        CPPUNIT_ASSERT(http->d_dap_client_protocol_major == 3 && http->d_dap_client_protocol_minor == 2);
+        CPPUNIT_ASSERT(count(http->d_request_headers.begin(), http->d_request_headers.end(), "XDAP-Accept: 3.2") == 1);
+    }
+
+    void read_url_password_test()
+    {
+        FILE *dump = fopen("/dev/null", "w");
+        vector<string> *resp_h = new vector<string>;
+        long status = http->read_url(localhost_pw_url, dump, resp_h);
+
+        DBG(cerr << endl << http->d_upstring << endl);
+        CPPUNIT_ASSERT(http->d_upstring == "jimg:dods_test");
+        DBG(cerr << "Status: " << status << endl);
+        CPPUNIT_ASSERT(status == 200);
+        delete resp_h;
+        resp_h = 0;
+    }
+
+    void read_url_password_test2()
+    {
+        FILE *dump = fopen("/dev/null", "w");
+        vector<string> *resp_h = new vector<string>;
+        long status = http->read_url(localhost_digest_pw_url, dump, resp_h);
+
+        DBG(cerr << endl << http->d_upstring << endl);
+        CPPUNIT_ASSERT(http->d_upstring == "jimg:dods_digest");
+        DBG(cerr << "Status: " << status << endl);
+        CPPUNIT_ASSERT(status == 200);
+        delete resp_h;
+        resp_h = 0;
+    }
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION (HTTPConnectTest);
+
+}
+
+int main(int argc, char*argv[])
+{
+    GetOpt getopt(argc, argv, "dh");
+    int option_char;
+
+    while ((option_char = getopt()) != -1)
+        switch (option_char) {
+        case 'd':
+            debug = 1;  // debug is a static global
+            break;
+        case 'h': {     // help - show test names
+            cerr << "Usage: HTTPConnectTest has the following tests:" << endl;
+            const std::vector<Test*> &tests = libdap::HTTPConnectTest::suite()->getTests();
+            unsigned int prefix_len = libdap::HTTPConnectTest::suite()->getName().append("::").length();
+            for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+                cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+            }
+            break;
+        }
+        default:
+            break;
+        }
+
+    CppUnit::TextTestRunner runner;
+    runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
+    bool wasSuccessful = true;
+    string test = "";
+    int i = getopt.optind;
+    if (i == argc) {
+        // run them all
+        wasSuccessful = runner.run("");
+    }
+    else {
+        for (; i < argc; ++i) {
+            if (debug) cerr << "Running " << argv[i] << endl;
+            test = libdap::HTTPConnectTest::suite()->getName().append("::").append(argv[i]);
+            wasSuccessful = wasSuccessful && runner.run(test);
+        }
+    }
+
+    return wasSuccessful ? 0 : 1;
+}
diff --git a/unit-tests/MIMEUtilTest.cc b/unit-tests/MIMEUtilTest.cc
new file mode 100644
index 0000000..75f43c6
--- /dev/null
+++ b/unit-tests/MIMEUtilTest.cc
@@ -0,0 +1,265 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#include <cppunit/TextTestRunner.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+#include <cppunit/extensions/HelperMacros.h>
+
+#ifndef TM_IN_SYS_TIME
+#include <time.h>
+#else
+#include <sys/time.h>
+#endif
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>   // for stat
+#include <string>
+#include <sstream>
+
+#include "GetOpt.h"
+
+#include "GNURegex.h"
+
+#include "Error.h"
+#include "mime_util.h"
+#include "debug.h"
+#include "test_config.h"
+
+using namespace CppUnit;
+using namespace std;
+using namespace libdap;
+
+static bool debug = false;
+
+class cgiUtilTest: public TestFixture {
+private:
+
+protected:
+    bool re_match(Regex &r, const string &s)
+    {
+        int match = r.match(s.c_str(), s.length());
+        DBG(cerr << "RE Match: " << match << endl);
+        return match == (int) s.length();
+    }
+
+public:
+    cgiUtilTest()
+    {
+    }
+    ~cgiUtilTest()
+    {
+    }
+
+    void setUp()
+    {
+    }
+
+    void tearDown()
+    {
+    }
+
+    CPPUNIT_TEST_SUITE (cgiUtilTest);
+#if 1
+    CPPUNIT_TEST (name_path_test);
+    CPPUNIT_TEST (set_mime_text_test);
+    CPPUNIT_TEST (rfc822_date_test);
+    CPPUNIT_TEST (last_modified_time_test);
+    CPPUNIT_TEST (read_multipart_headers_test);
+#endif
+    CPPUNIT_TEST (get_next_mime_header_test);
+
+    CPPUNIT_TEST_SUITE_END();
+
+    void name_path_test()
+    {
+        CPPUNIT_ASSERT(name_path(string("stuff")) == "stuff");
+        CPPUNIT_ASSERT(name_path(string("stuff.Z")) == "stuff.Z");
+        CPPUNIT_ASSERT(name_path(string("/usr/local/src/stuff.Z")) == "stuff.Z");
+        CPPUNIT_ASSERT(name_path(string("/usr/local/src/stuff.tar.Z")) == "stuff.tar.Z");
+        CPPUNIT_ASSERT(name_path(string("/usr/local/src/stuff")) == "stuff");
+        CPPUNIT_ASSERT(name_path(string("/usr/local/src/#usr#local#src#stuff")) == "stuff");
+        CPPUNIT_ASSERT(name_path(string("/usr/local/src/#usr#local#src#stuff.hdf")) == "stuff.hdf");
+        CPPUNIT_ASSERT(name_path(string("")) == "");
+    }
+
+    // See note above. jhrg 1/18/06
+    void set_mime_text_test()
+    {
+        Regex r1(
+            "HTTP/1.0 200 OK\r\n\
+XDODS-Server: dods-test/0.00\r\n\
+XOPeNDAP-Server: dods-test/0.00\r\n\
+XDAP: .*\r\n\
+Date: (.*)\r\n\
+Last-Modified: \\1\r\n\
+Content-Type: text/plain\r\n\
+Content-Description: dods_das\r\n\
+\r\n.*");
+        ostringstream oss;
+        set_mime_text(oss, dods_das, "dods-test/0.00");
+        DBG(cerr << "DODS DAS" << endl << oss.str());
+        CPPUNIT_ASSERT(re_match(r1, oss.str()));
+
+        Regex r2(
+            "HTTP/1.0 200 OK\r\n\
+XDODS-Server: dods-test/0.00\r\n\
+XOPeNDAP-Server: dods-test/0.00\r\n\
+XDAP: .*\r\n\
+Date: (.*)\r\n\
+Last-Modified: \\1\r\n\
+Content-Type: text/plain\r\n\
+Content-Description: dods_dds\r\n\
+\r\n.*");
+
+        oss.str("");
+        set_mime_text(oss, dods_dds, "dods-test/0.00");
+        DBG(cerr << "DODS DDS" << endl << oss);
+        CPPUNIT_ASSERT(re_match(r2, oss.str()));
+
+        struct tm tm = { 0, 0, 0, 1, 0, 100, 0, 0, 0, 0, 0 }; // 1 Jan 2000
+        time_t t = mktime(&tm);
+        Regex r3(
+            "HTTP/1.0 200 OK\r\n\
+XDODS-Server: dods-test/0.00\r\n\
+XOPeNDAP-Server: dods-test/0.00\r\n\
+XDAP: .*\r\n\
+Date: .*\r\n\
+Last-Modified: (Sat, 01 Jan 2000 ..:00:00 GMT|Fri, 31 Dec 1999 ..:00:00 GMT)\r\n\
+Content-Type: text/plain\r\n\
+Content-Description: dods_dds\r\n\
+\r\n.*");
+
+        oss.str("");
+        set_mime_text(oss, dods_dds, "dods-test/0.00", x_plain, t);
+        DBG(cerr << "set_mime_text_test: oss: " << oss.str() << endl);
+        CPPUNIT_ASSERT(re_match(r3, oss.str()));
+    }
+
+    void rfc822_date_test()
+    {
+        time_t t = 0;
+        CPPUNIT_ASSERT(rfc822_date(t) == "Thu, 01 Jan 1970 00:00:00 GMT");
+        struct tm tm = { 0, 0, 0, 1, 0, 100, 0, 0, 0, 0, 0 }; // 1 Jan 2000
+        t = mktime(&tm);
+        // This test may fail for some locations since mktime interprets t as
+        // the local time and returns the corresponding GMT time.
+        Regex r1("(Sat, 01 Jan 2000 ..:00:00 GMT|Fri, 31 Dec 1999 ..:00:00 GMT)");
+        CPPUNIT_ASSERT(re_match(r1, rfc822_date(t)));
+    }
+
+    void last_modified_time_test()
+    {
+        time_t t = time(0);
+        CPPUNIT_ASSERT(last_modified_time("no-such-file") == t);
+        struct stat st;
+        stat("test_config.h", &st);
+        CPPUNIT_ASSERT(last_modified_time("test_config.h") == st.st_mtime);
+        stat("/etc/passwd", &st);
+        CPPUNIT_ASSERT(last_modified_time("/etc/passwd") == st.st_mtime);
+    }
+
+    void get_next_mime_header_test()
+    {
+        string test_file = (string) TEST_SRC_DIR + "/cgi-util-tests/multipart_mime_header1.txt";
+        FILE *in = fopen(test_file.c_str(), "r");
+        if (!in) CPPUNIT_FAIL("Could not open the mime header file.");
+
+        try {
+            CPPUNIT_ASSERT(get_next_mime_header(in) == "--my_boundary");
+            CPPUNIT_ASSERT(get_next_mime_header(in) == "Content-Type: Text/xml; charset=iso-8859-1");
+            CPPUNIT_ASSERT(get_next_mime_header(in) == "Content-Description: dods-ddx");
+            CPPUNIT_ASSERT(get_next_mime_header(in) == "Content-Id: <1234@opendap.org>");
+        }
+        catch (Error &e) {
+            CPPUNIT_FAIL(e.get_error_message());
+        }
+
+        fclose(in);
+    }
+
+    void read_multipart_headers_test()
+    {
+        string test_file = (string) TEST_SRC_DIR + "/cgi-util-tests/multipart_mime_header1.txt";
+        FILE *in = fopen(test_file.c_str(), "r");
+        if (!in) CPPUNIT_FAIL("Could not open the mime header file.");
+
+        try {
+            read_multipart_headers(in, "text/xml", dods_ddx);
+            CPPUNIT_ASSERT(true);
+        }
+        catch (Error &e) {
+            CPPUNIT_FAIL(e.get_error_message());
+        }
+
+        fclose(in);
+    }
+
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION (cgiUtilTest);
+
+int main(int argc, char*argv[])
+{
+    GetOpt getopt(argc, argv, "dh");
+    int option_char;
+
+    while ((option_char = getopt()) != -1)
+        switch (option_char) {
+        case 'd':
+            debug = 1;  // debug is a static global
+            break;
+        case 'h': {     // help - show test names
+            cerr << "Usage: cgiUtilTest has the following tests:" << endl;
+            const std::vector<Test*> &tests = cgiUtilTest::suite()->getTests();
+            unsigned int prefix_len = cgiUtilTest::suite()->getName().append("::").length();
+            for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+                cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+            }
+            break;
+        }
+        default:
+            break;
+        }
+
+    CppUnit::TextTestRunner runner;
+    runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
+    bool wasSuccessful = true;
+    string test = "";
+    int i = getopt.optind;
+    if (i == argc) {
+        // run them all
+        wasSuccessful = runner.run("");
+    }
+    else {
+        for (; i < argc; ++i) {
+            if (debug) cerr << "Running " << argv[i] << endl;
+            test = cgiUtilTest::suite()->getName().append("::").append(argv[i]);
+            wasSuccessful = wasSuccessful && runner.run(test);
+        }
+    }
+
+    return wasSuccessful ? 0 : 1;
+}
diff --git a/unit-tests/Makefile.am b/unit-tests/Makefile.am
new file mode 100644
index 0000000..084e060
--- /dev/null
+++ b/unit-tests/Makefile.am
@@ -0,0 +1,234 @@
+
+SUBDIRS = cache-testsuite
+
+# Tests
+
+AUTOMAKE_OPTIONS = foreign
+
+# Headers in 'tests' are used by the arrayT unit tests.
+
+AM_CPPFLAGS = -I$(top_srcdir)/GNU -I$(top_srcdir) -I$(top_srcdir)/tests $(CURL_CFLAGS) $(XML2_CFLAGS)
+AM_LDADD = $(XML2_LIBS)
+AM_CXXFLAGS = 
+# CXXFLAGS =
+
+if COMPILER_IS_GCC
+AM_CXXFLAGS += -Wall -W -Wcast-align
+endif
+
+if CPPUNIT
+AM_CPPFLAGS += $(CPPUNIT_CFLAGS)
+AM_LDADD += $(CPPUNIT_LIBS)
+endif
+
+CXXFLAGS_DEBUG = -g3 -O0 -Wall -Wcast-align
+
+if USE_VALGRIND
+TESTS_ENVIRONMENT=valgrind --quiet --trace-children=yes --error-exitcode=1 \
+--leak-check=yes --dsymutil=yes --suppressions=valgrind_suppressions.txt
+
+# skip using --log-file="valgrind-%p.log" because it always generates files
+# Might also drop --dsymutil=yes because it can take a long time to run.
+endif
+
+if BUILD_DEVELOPER
+AM_CXXFLAGS += $(CXXFLAGS_DEBUG)
+endif
+
+# This determines what gets built by make check
+check_PROGRAMS = $(UNIT_TESTS)
+
+# This determines what gets run by 'make check.'
+TESTS = $(UNIT_TESTS)
+
+noinst_HEADERS = test_config.h
+
+DIRS_EXTRA = das-testsuite dds-testsuite ddx-testsuite \
+rcreader-testsuite server-testsuite cgi-util-tests D4-xml \
+chunked-io D4-marshaller D4-type-testsuite
+
+EXTRA_DIST = $(DIRS_EXTRA) testFile.cc testFile.h test_config.h.in \
+valgrind_suppressions.txt
+
+CLEANFILES = testout .dodsrc  *.gcda *.gcno *.gcov *.trs *.log *.file D4-xml.tar.gz
+
+DISTCLEANFILES = test_config.h *.strm *.file tmp.txt
+
+test_config.h: test_config.h.in Makefile
+	sed -e "s%[@]abs_srcdir[@]%${abs_srcdir}%" $< > test_config.h
+
+D4-xml.tar.gz: D4-xml/DMR_*[0-9].xml
+	tar -czf $@ $^
+
+############################################################################
+# Unit Tests
+#
+
+if CPPUNIT
+UNIT_TESTS = marshT arrayT attrTableT structT sequenceT ddsT dasT \
+	RegexTest ArrayTest AttrTableTest ByteTest MIMEUtilTest ancT DASTest \
+	DDSTest	DDXParserTest  generalUtilTest HTTPConnectTest parserUtilTest \
+	RCReaderTest SequenceTest SignalHandlerTest  MarshallerTest \
+	HTTPCacheTest ServerFunctionsListUnitTest
+
+if DAP4_DEFINED
+UNIT_TESTS += D4MarshallerTest D4UnMarshallerTest D4DimensionsTest \
+	D4EnumDefsTest D4GroupTest D4ParserSax2Test D4AttributesTest D4EnumTest \
+	chunked_iostream_test D4AsyncDocTest DMRTest D4FilterClauseTest \
+	D4SequenceTest DmrRoundTripTest DmrToDap2Test
+endif
+
+else
+UNIT_TESTS =
+
+check-local:
+	@echo ""
+	@echo "**********************************************************"
+	@echo "You must have cppunit 1.12.x or greater installed to run *"
+	@echo "check target in unit-tests directory                     *"
+	@echo "**********************************************************"
+	@echo ""
+endif
+
+TEST_SRC = testFile.cc testFile.h
+
+RegexTest_SOURCES = RegexTest.cc
+RegexTest_LDADD = ../libdap.la $(AM_LDADD)
+
+ArrayTest_SOURCES = ArrayTest.cc
+ArrayTest_LDADD = ../libdap.la $(AM_LDADD)
+
+AttrTableTest_SOURCES = AttrTableTest.cc $(TEST_SRC)
+AttrTableTest_LDADD = ../libdap.la $(AM_LDADD)
+
+ByteTest_SOURCES = ByteTest.cc $(TEST_SRC)
+ByteTest_LDADD = ../libdap.la $(AM_LDADD)
+
+MIMEUtilTest_SOURCES = MIMEUtilTest.cc
+MIMEUtilTest_LDADD = ../libdap.la $(AM_LDADD)
+
+ancT_SOURCES = ancT.cc
+ancT_LDADD = ../libdapserver.la ../libdap.la $(AM_LDADD)
+
+DASTest_SOURCES = DASTest.cc
+DASTest_LDADD = ../libdap.la $(AM_LDADD)
+
+DDSTest_SOURCES = DDSTest.cc $(TEST_SRC)
+DDSTest_LDADD = ../libdap.la $(AM_LDADD)
+
+DDXParserTest_SOURCES = DDXParserTest.cc
+DDXParserTest_CPPFLAGS = $(AM_CPPFLAGS) $(XML2_CFLAGS)
+DDXParserTest_LDADD = ../libdap.la $(AM_LDADD)
+
+# DODSFilterTest_SOURCES = DODSFilterTest.cc $(TEST_SRC)
+# DODSFilterTest_LDADD = ../libdapserver.la ../libdap.la \
+#	../tests/libtest-types.a $(AM_LDADD)
+
+# ResponseBuilderTest_SOURCES = ResponseBuilderTest.cc $(TEST_SRC)
+# ResponseBuilderTest_LDADD = ../libdapserver.la ../libdap.la \
+#	../tests/libtest-types.a $(AM_LDADD)
+
+# Keywords2Test_SOURCES = Keywords2Test.cc
+# Keywords2Test_LDADD = ../libdap.la $(AM_LDADD)
+
+generalUtilTest_SOURCES = generalUtilTest.cc
+generalUtilTest_LDADD = ../libdap.la $(AM_LDADD)
+
+HTTPCacheTest_SOURCES = HTTPCacheTest.cc
+HTTPCacheTest_CPPFLAGS = $(AM_CPPFLAGS) $(CURL_CFLAGS)
+HTTPCacheTest_LDADD = ../libdapclient.la ../libdap.la $(AM_LDADD)
+
+HTTPConnectTest_SOURCES = HTTPConnectTest.cc
+HTTPConnectTest_CPPFLAGS = $(AM_CPPFLAGS) $(CURL_CFLAGS)
+HTTPConnectTest_LDADD = ../libdapclient.la ../libdap.la $(AM_LDADD)
+
+parserUtilTest_SOURCES = parserUtilTest.cc
+parserUtilTest_LDADD = ../libdap.la $(AM_LDADD)
+
+RCReaderTest_SOURCES = RCReaderTest.cc
+RCReaderTest_LDADD = ../libdapclient.la ../libdap.la $(AM_LDADD)
+
+SequenceTest_SOURCES = SequenceTest.cc
+SequenceTest_LDADD = ../tests/libtest-types.a ../libdap.la $(AM_LDADD)
+
+SignalHandlerTest_SOURCES = SignalHandlerTest.cc
+SignalHandlerTest_LDADD = ../libdap.la $(AM_LDADD)
+
+arrayT_SOURCES = arrayT.cc
+arrayT_LDADD = ../tests/libtest-types.a ../libdap.la $(AM_LDADD)
+
+MarshallerTest_SOURCES = MarshallerTest.cc
+MarshallerTest_LDADD = ../tests/libtest-types.a ../libdapclient.la ../libdap.la $(AM_LDADD)
+
+marshT_SOURCES = marshT.cc
+marshT_LDADD = ../tests/libtest-types.a ../libdap.la $(AM_LDADD)
+
+attrTableT_SOURCES = attrTableT.cc
+attrTableT_LDADD = ../tests/libtest-types.a  ../libdap.la $(AM_LDADD)
+
+structT_SOURCES = structT.cc
+structT_LDADD = ../tests/libtest-types.a ../libdap.la $(AM_LDADD)
+
+sequenceT_SOURCES = sequenceT.cc
+sequenceT_LDADD = ../tests/libtest-types.a ../libdap.la $(AM_LDADD)
+
+ddsT_SOURCES = ddsT.cc $(TEST_SRC)
+ddsT_LDADD = ../tests/libtest-types.a ../libdap.la $(AM_LDADD)
+
+dasT_SOURCES = dasT.cc $(TEST_SRC)
+dasT_LDADD = ../tests/libtest-types.a ../libdap.la $(AM_LDADD)
+
+ServerFunctionsListUnitTest_SOURCES = ServerFunctionsListUnitTest.cc
+ServerFunctionsListUnitTest_LDADD = ../libdap.la $(AM_LDADD)
+
+# ResponseCacheTest_SOURCES = ResponseCacheTest.cc
+# ResponseCacheTest_LDADD = ../tests/libtest-types.a ../libdapserver.la ../libdap.la $(AM_LDADD)
+
+if DAP4_DEFINED
+
+D4MarshallerTest_SOURCES = D4MarshallerTest.cc
+D4MarshallerTest_LDADD = ../libdap.la $(AM_LDADD)
+
+D4UnMarshallerTest_SOURCES = D4UnMarshallerTest.cc
+D4UnMarshallerTest_LDADD = ../libdap.la $(AM_LDADD)
+
+D4DimensionsTest_SOURCES = D4DimensionsTest.cc $(TEST_SRC)
+D4DimensionsTest_LDADD = ../libdap.la $(AM_LDADD)
+
+D4EnumDefsTest_SOURCES = D4EnumDefsTest.cc $(TEST_SRC)
+D4EnumDefsTest_LDADD = ../libdap.la $(AM_LDADD)
+
+D4GroupTest_SOURCES = D4GroupTest.cc $(TEST_SRC)
+D4GroupTest_LDADD = ../libdap.la $(AM_LDADD)
+
+D4ParserSax2Test_SOURCES = D4ParserSax2Test.cc $(TEST_SRC)
+D4ParserSax2Test_LDADD = ../libdap.la $(AM_LDADD)
+
+D4AttributesTest_SOURCES = D4AttributesTest.cc $(TEST_SRC)
+D4AttributesTest_LDADD = ../libdap.la $(AM_LDADD)
+
+D4EnumTest_SOURCES = D4EnumTest.cc $(TEST_SRC)
+D4EnumTest_LDADD = ../libdap.la $(AM_LDADD)
+
+chunked_iostream_test_SOURCES = chunked_iostream_test.cc $(TEST_SRC)
+chunked_iostream_test_LDADD = ../libdap.la $(AM_LDADD)
+
+D4AsyncDocTest_SOURCES = D4AsyncDocTest.cc $(TEST_SRC)
+D4AsyncDocTest_LDADD = ../libdap.la $(AM_LDADD)
+
+DMRTest_SOURCES = DMRTest.cc $(TEST_SRC)
+DMRTest_LDADD = ../libdap.la $(AM_LDADD)
+
+DmrRoundTripTest_SOURCES = DmrRoundTripTest.cc $(TEST_SRC)
+DmrRoundTripTest_LDADD = ../libdap.la $(AM_LDADD)
+
+DmrToDap2Test_SOURCES = DmrToDap2Test.cc $(TEST_SRC)
+DmrToDap2Test_LDADD = ../libdap.la $(AM_LDADD)
+
+D4FilterClauseTest_SOURCES = D4FilterClauseTest.cc
+D4FilterClauseTest_LDADD = ../libdap.la $(AM_LDADD)
+
+D4SequenceTest_SOURCES = D4SequenceTest.cc $(TEST_SRC)
+D4SequenceTest_LDADD = ../tests/libtest-types.a ../libdap.la $(AM_LDADD)
+
+endif
diff --git a/unit-tests/Makefile.in b/unit-tests/Makefile.in
new file mode 100644
index 0000000..d161cda
--- /dev/null
+++ b/unit-tests/Makefile.in
@@ -0,0 +1,2630 @@
+# Makefile.in generated by automake 1.14 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+# CXXFLAGS =
+@COMPILER_IS_GCC_TRUE@am__append_1 = -Wall -W -Wcast-align
+@CPPUNIT_TRUE@am__append_2 = $(CPPUNIT_CFLAGS)
+@CPPUNIT_TRUE@am__append_3 = $(CPPUNIT_LIBS)
+
+# skip using --log-file="valgrind-%p.log" because it always generates files
+# Might also drop --dsymutil=yes because it can take a long time to run.
+@BUILD_DEVELOPER_TRUE@am__append_4 = $(CXXFLAGS_DEBUG)
+check_PROGRAMS = $(am__EXEEXT_2)
+TESTS = $(am__EXEEXT_2)
+@CPPUNIT_TRUE@@DAP4_DEFINED_TRUE@am__append_5 = D4MarshallerTest D4UnMarshallerTest D4DimensionsTest \
+@CPPUNIT_TRUE@@DAP4_DEFINED_TRUE@	D4EnumDefsTest D4GroupTest D4ParserSax2Test D4AttributesTest D4EnumTest \
+@CPPUNIT_TRUE@@DAP4_DEFINED_TRUE@	chunked_iostream_test D4AsyncDocTest DMRTest D4FilterClauseTest \
+@CPPUNIT_TRUE@@DAP4_DEFINED_TRUE@	D4SequenceTest DmrRoundTripTest DmrToDap2Test
+
+subdir = unit-tests
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/conf/depcomp $(noinst_HEADERS) \
+	$(top_srcdir)/conf/test-driver
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/gl/m4/00gnulib.m4 \
+	$(top_srcdir)/gl/m4/absolute-header.m4 \
+	$(top_srcdir)/gl/m4/alloca.m4 $(top_srcdir)/gl/m4/btowc.m4 \
+	$(top_srcdir)/gl/m4/builtin-expect.m4 \
+	$(top_srcdir)/gl/m4/byteswap.m4 $(top_srcdir)/gl/m4/codeset.m4 \
+	$(top_srcdir)/gl/m4/configmake.m4 \
+	$(top_srcdir)/gl/m4/eealloc.m4 \
+	$(top_srcdir)/gl/m4/extensions.m4 \
+	$(top_srcdir)/gl/m4/extern-inline.m4 \
+	$(top_srcdir)/gl/m4/fcntl-o.m4 $(top_srcdir)/gl/m4/fcntl_h.m4 \
+	$(top_srcdir)/gl/m4/gettimeofday.m4 \
+	$(top_srcdir)/gl/m4/glibc21.m4 \
+	$(top_srcdir)/gl/m4/gnulib-common.m4 \
+	$(top_srcdir)/gl/m4/gnulib-comp.m4 \
+	$(top_srcdir)/gl/m4/gnulib-tool.m4 \
+	$(top_srcdir)/gl/m4/hard-locale.m4 \
+	$(top_srcdir)/gl/m4/include_next.m4 \
+	$(top_srcdir)/gl/m4/langinfo_h.m4 \
+	$(top_srcdir)/gl/m4/largefile.m4 $(top_srcdir)/gl/m4/lib-ld.m4 \
+	$(top_srcdir)/gl/m4/lib-link.m4 \
+	$(top_srcdir)/gl/m4/lib-prefix.m4 \
+	$(top_srcdir)/gl/m4/limits-h.m4 \
+	$(top_srcdir)/gl/m4/localcharset.m4 \
+	$(top_srcdir)/gl/m4/locale-fr.m4 \
+	$(top_srcdir)/gl/m4/locale-ja.m4 \
+	$(top_srcdir)/gl/m4/locale-zh.m4 \
+	$(top_srcdir)/gl/m4/locale_h.m4 \
+	$(top_srcdir)/gl/m4/localeconv.m4 \
+	$(top_srcdir)/gl/m4/localtime-buffer.m4 \
+	$(top_srcdir)/gl/m4/lock.m4 $(top_srcdir)/gl/m4/longlong.m4 \
+	$(top_srcdir)/gl/m4/lstat.m4 $(top_srcdir)/gl/m4/malloca.m4 \
+	$(top_srcdir)/gl/m4/mbrtowc.m4 $(top_srcdir)/gl/m4/mbsinit.m4 \
+	$(top_srcdir)/gl/m4/mbstate_t.m4 $(top_srcdir)/gl/m4/mbtowc.m4 \
+	$(top_srcdir)/gl/m4/mkstemps.m4 \
+	$(top_srcdir)/gl/m4/multiarch.m4 \
+	$(top_srcdir)/gl/m4/nl_langinfo.m4 \
+	$(top_srcdir)/gl/m4/off_t.m4 $(top_srcdir)/gl/m4/pathmax.m4 \
+	$(top_srcdir)/gl/m4/pthread_rwlock_rdlock.m4 \
+	$(top_srcdir)/gl/m4/regex.m4 $(top_srcdir)/gl/m4/ssize_t.m4 \
+	$(top_srcdir)/gl/m4/stat.m4 $(top_srcdir)/gl/m4/stdbool.m4 \
+	$(top_srcdir)/gl/m4/stddef_h.m4 $(top_srcdir)/gl/m4/stdint.m4 \
+	$(top_srcdir)/gl/m4/stdlib_h.m4 \
+	$(top_srcdir)/gl/m4/sys_socket_h.m4 \
+	$(top_srcdir)/gl/m4/sys_stat_h.m4 \
+	$(top_srcdir)/gl/m4/sys_time_h.m4 \
+	$(top_srcdir)/gl/m4/sys_types_h.m4 \
+	$(top_srcdir)/gl/m4/tempname.m4 \
+	$(top_srcdir)/gl/m4/threadlib.m4 $(top_srcdir)/gl/m4/time_h.m4 \
+	$(top_srcdir)/gl/m4/unistd_h.m4 \
+	$(top_srcdir)/gl/m4/warn-on-use.m4 \
+	$(top_srcdir)/gl/m4/wchar_h.m4 $(top_srcdir)/gl/m4/wchar_t.m4 \
+	$(top_srcdir)/gl/m4/wcrtomb.m4 $(top_srcdir)/gl/m4/wctype_h.m4 \
+	$(top_srcdir)/gl/m4/wint_t.m4 $(top_srcdir)/conf/acinclude.m4 \
+	$(top_srcdir)/conf/cppunit.m4 \
+	$(top_srcdir)/conf/gcov_valgrind.m4 \
+	$(top_srcdir)/conf/libtool.m4 $(top_srcdir)/conf/ltoptions.m4 \
+	$(top_srcdir)/conf/ltsugar.m4 $(top_srcdir)/conf/ltversion.m4 \
+	$(top_srcdir)/conf/lt~obsolete.m4 $(top_srcdir)/conf/pkg.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h \
+	$(top_builddir)/dods-datatypes-config.h \
+	$(top_builddir)/xdr-datatypes-config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+@CPPUNIT_TRUE@@DAP4_DEFINED_TRUE@am__EXEEXT_1 =  \
+@CPPUNIT_TRUE@@DAP4_DEFINED_TRUE@	D4MarshallerTest$(EXEEXT) \
+@CPPUNIT_TRUE@@DAP4_DEFINED_TRUE@	D4UnMarshallerTest$(EXEEXT) \
+@CPPUNIT_TRUE@@DAP4_DEFINED_TRUE@	D4DimensionsTest$(EXEEXT) \
+@CPPUNIT_TRUE@@DAP4_DEFINED_TRUE@	D4EnumDefsTest$(EXEEXT) \
+@CPPUNIT_TRUE@@DAP4_DEFINED_TRUE@	D4GroupTest$(EXEEXT) \
+@CPPUNIT_TRUE@@DAP4_DEFINED_TRUE@	D4ParserSax2Test$(EXEEXT) \
+@CPPUNIT_TRUE@@DAP4_DEFINED_TRUE@	D4AttributesTest$(EXEEXT) \
+@CPPUNIT_TRUE@@DAP4_DEFINED_TRUE@	D4EnumTest$(EXEEXT) \
+@CPPUNIT_TRUE@@DAP4_DEFINED_TRUE@	chunked_iostream_test$(EXEEXT) \
+@CPPUNIT_TRUE@@DAP4_DEFINED_TRUE@	D4AsyncDocTest$(EXEEXT) \
+@CPPUNIT_TRUE@@DAP4_DEFINED_TRUE@	DMRTest$(EXEEXT) \
+@CPPUNIT_TRUE@@DAP4_DEFINED_TRUE@	D4FilterClauseTest$(EXEEXT) \
+@CPPUNIT_TRUE@@DAP4_DEFINED_TRUE@	D4SequenceTest$(EXEEXT) \
+@CPPUNIT_TRUE@@DAP4_DEFINED_TRUE@	DmrRoundTripTest$(EXEEXT) \
+@CPPUNIT_TRUE@@DAP4_DEFINED_TRUE@	DmrToDap2Test$(EXEEXT)
+@CPPUNIT_TRUE@am__EXEEXT_2 = marshT$(EXEEXT) arrayT$(EXEEXT) \
+@CPPUNIT_TRUE@	attrTableT$(EXEEXT) structT$(EXEEXT) \
+@CPPUNIT_TRUE@	sequenceT$(EXEEXT) ddsT$(EXEEXT) dasT$(EXEEXT) \
+@CPPUNIT_TRUE@	RegexTest$(EXEEXT) ArrayTest$(EXEEXT) \
+@CPPUNIT_TRUE@	AttrTableTest$(EXEEXT) ByteTest$(EXEEXT) \
+@CPPUNIT_TRUE@	MIMEUtilTest$(EXEEXT) ancT$(EXEEXT) \
+@CPPUNIT_TRUE@	DASTest$(EXEEXT) DDSTest$(EXEEXT) \
+@CPPUNIT_TRUE@	DDXParserTest$(EXEEXT) generalUtilTest$(EXEEXT) \
+@CPPUNIT_TRUE@	HTTPConnectTest$(EXEEXT) parserUtilTest$(EXEEXT) \
+@CPPUNIT_TRUE@	RCReaderTest$(EXEEXT) SequenceTest$(EXEEXT) \
+@CPPUNIT_TRUE@	SignalHandlerTest$(EXEEXT) \
+@CPPUNIT_TRUE@	MarshallerTest$(EXEEXT) HTTPCacheTest$(EXEEXT) \
+@CPPUNIT_TRUE@	ServerFunctionsListUnitTest$(EXEEXT) \
+@CPPUNIT_TRUE@	$(am__EXEEXT_1)
+am_ArrayTest_OBJECTS = ArrayTest.$(OBJEXT)
+ArrayTest_OBJECTS = $(am_ArrayTest_OBJECTS)
+am__DEPENDENCIES_1 =
+@CPPUNIT_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
+ArrayTest_DEPENDENCIES = ../libdap.la $(am__DEPENDENCIES_3)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+am__objects_1 = testFile.$(OBJEXT)
+am_AttrTableTest_OBJECTS = AttrTableTest.$(OBJEXT) $(am__objects_1)
+AttrTableTest_OBJECTS = $(am_AttrTableTest_OBJECTS)
+AttrTableTest_DEPENDENCIES = ../libdap.la $(am__DEPENDENCIES_3)
+am_ByteTest_OBJECTS = ByteTest.$(OBJEXT) $(am__objects_1)
+ByteTest_OBJECTS = $(am_ByteTest_OBJECTS)
+ByteTest_DEPENDENCIES = ../libdap.la $(am__DEPENDENCIES_3)
+am__D4AsyncDocTest_SOURCES_DIST = D4AsyncDocTest.cc testFile.cc \
+	testFile.h
+@DAP4_DEFINED_TRUE@am_D4AsyncDocTest_OBJECTS =  \
+@DAP4_DEFINED_TRUE@	D4AsyncDocTest.$(OBJEXT) $(am__objects_1)
+D4AsyncDocTest_OBJECTS = $(am_D4AsyncDocTest_OBJECTS)
+@DAP4_DEFINED_TRUE@D4AsyncDocTest_DEPENDENCIES = ../libdap.la \
+@DAP4_DEFINED_TRUE@	$(am__DEPENDENCIES_3)
+am__D4AttributesTest_SOURCES_DIST = D4AttributesTest.cc testFile.cc \
+	testFile.h
+@DAP4_DEFINED_TRUE@am_D4AttributesTest_OBJECTS =  \
+@DAP4_DEFINED_TRUE@	D4AttributesTest.$(OBJEXT) $(am__objects_1)
+D4AttributesTest_OBJECTS = $(am_D4AttributesTest_OBJECTS)
+@DAP4_DEFINED_TRUE@D4AttributesTest_DEPENDENCIES = ../libdap.la \
+@DAP4_DEFINED_TRUE@	$(am__DEPENDENCIES_3)
+am__D4DimensionsTest_SOURCES_DIST = D4DimensionsTest.cc testFile.cc \
+	testFile.h
+@DAP4_DEFINED_TRUE@am_D4DimensionsTest_OBJECTS =  \
+@DAP4_DEFINED_TRUE@	D4DimensionsTest.$(OBJEXT) $(am__objects_1)
+D4DimensionsTest_OBJECTS = $(am_D4DimensionsTest_OBJECTS)
+@DAP4_DEFINED_TRUE@D4DimensionsTest_DEPENDENCIES = ../libdap.la \
+@DAP4_DEFINED_TRUE@	$(am__DEPENDENCIES_3)
+am__D4EnumDefsTest_SOURCES_DIST = D4EnumDefsTest.cc testFile.cc \
+	testFile.h
+@DAP4_DEFINED_TRUE@am_D4EnumDefsTest_OBJECTS =  \
+@DAP4_DEFINED_TRUE@	D4EnumDefsTest.$(OBJEXT) $(am__objects_1)
+D4EnumDefsTest_OBJECTS = $(am_D4EnumDefsTest_OBJECTS)
+@DAP4_DEFINED_TRUE@D4EnumDefsTest_DEPENDENCIES = ../libdap.la \
+@DAP4_DEFINED_TRUE@	$(am__DEPENDENCIES_3)
+am__D4EnumTest_SOURCES_DIST = D4EnumTest.cc testFile.cc testFile.h
+@DAP4_DEFINED_TRUE@am_D4EnumTest_OBJECTS = D4EnumTest.$(OBJEXT) \
+@DAP4_DEFINED_TRUE@	$(am__objects_1)
+D4EnumTest_OBJECTS = $(am_D4EnumTest_OBJECTS)
+@DAP4_DEFINED_TRUE@D4EnumTest_DEPENDENCIES = ../libdap.la \
+@DAP4_DEFINED_TRUE@	$(am__DEPENDENCIES_3)
+am__D4FilterClauseTest_SOURCES_DIST = D4FilterClauseTest.cc
+@DAP4_DEFINED_TRUE@am_D4FilterClauseTest_OBJECTS =  \
+@DAP4_DEFINED_TRUE@	D4FilterClauseTest.$(OBJEXT)
+D4FilterClauseTest_OBJECTS = $(am_D4FilterClauseTest_OBJECTS)
+@DAP4_DEFINED_TRUE@D4FilterClauseTest_DEPENDENCIES = ../libdap.la \
+@DAP4_DEFINED_TRUE@	$(am__DEPENDENCIES_3)
+am__D4GroupTest_SOURCES_DIST = D4GroupTest.cc testFile.cc testFile.h
+@DAP4_DEFINED_TRUE@am_D4GroupTest_OBJECTS = D4GroupTest.$(OBJEXT) \
+@DAP4_DEFINED_TRUE@	$(am__objects_1)
+D4GroupTest_OBJECTS = $(am_D4GroupTest_OBJECTS)
+@DAP4_DEFINED_TRUE@D4GroupTest_DEPENDENCIES = ../libdap.la \
+@DAP4_DEFINED_TRUE@	$(am__DEPENDENCIES_3)
+am__D4MarshallerTest_SOURCES_DIST = D4MarshallerTest.cc
+@DAP4_DEFINED_TRUE@am_D4MarshallerTest_OBJECTS =  \
+@DAP4_DEFINED_TRUE@	D4MarshallerTest.$(OBJEXT)
+D4MarshallerTest_OBJECTS = $(am_D4MarshallerTest_OBJECTS)
+@DAP4_DEFINED_TRUE@D4MarshallerTest_DEPENDENCIES = ../libdap.la \
+@DAP4_DEFINED_TRUE@	$(am__DEPENDENCIES_3)
+am__D4ParserSax2Test_SOURCES_DIST = D4ParserSax2Test.cc testFile.cc \
+	testFile.h
+@DAP4_DEFINED_TRUE@am_D4ParserSax2Test_OBJECTS =  \
+@DAP4_DEFINED_TRUE@	D4ParserSax2Test.$(OBJEXT) $(am__objects_1)
+D4ParserSax2Test_OBJECTS = $(am_D4ParserSax2Test_OBJECTS)
+@DAP4_DEFINED_TRUE@D4ParserSax2Test_DEPENDENCIES = ../libdap.la \
+@DAP4_DEFINED_TRUE@	$(am__DEPENDENCIES_3)
+am__D4SequenceTest_SOURCES_DIST = D4SequenceTest.cc testFile.cc \
+	testFile.h
+@DAP4_DEFINED_TRUE@am_D4SequenceTest_OBJECTS =  \
+@DAP4_DEFINED_TRUE@	D4SequenceTest.$(OBJEXT) $(am__objects_1)
+D4SequenceTest_OBJECTS = $(am_D4SequenceTest_OBJECTS)
+@DAP4_DEFINED_TRUE@D4SequenceTest_DEPENDENCIES =  \
+@DAP4_DEFINED_TRUE@	../tests/libtest-types.a ../libdap.la \
+@DAP4_DEFINED_TRUE@	$(am__DEPENDENCIES_3)
+am__D4UnMarshallerTest_SOURCES_DIST = D4UnMarshallerTest.cc
+@DAP4_DEFINED_TRUE@am_D4UnMarshallerTest_OBJECTS =  \
+@DAP4_DEFINED_TRUE@	D4UnMarshallerTest.$(OBJEXT)
+D4UnMarshallerTest_OBJECTS = $(am_D4UnMarshallerTest_OBJECTS)
+@DAP4_DEFINED_TRUE@D4UnMarshallerTest_DEPENDENCIES = ../libdap.la \
+@DAP4_DEFINED_TRUE@	$(am__DEPENDENCIES_3)
+am_DASTest_OBJECTS = DASTest.$(OBJEXT)
+DASTest_OBJECTS = $(am_DASTest_OBJECTS)
+DASTest_DEPENDENCIES = ../libdap.la $(am__DEPENDENCIES_3)
+am_DDSTest_OBJECTS = DDSTest.$(OBJEXT) $(am__objects_1)
+DDSTest_OBJECTS = $(am_DDSTest_OBJECTS)
+DDSTest_DEPENDENCIES = ../libdap.la $(am__DEPENDENCIES_3)
+am_DDXParserTest_OBJECTS = DDXParserTest-DDXParserTest.$(OBJEXT)
+DDXParserTest_OBJECTS = $(am_DDXParserTest_OBJECTS)
+DDXParserTest_DEPENDENCIES = ../libdap.la $(am__DEPENDENCIES_3)
+am__DMRTest_SOURCES_DIST = DMRTest.cc testFile.cc testFile.h
+@DAP4_DEFINED_TRUE@am_DMRTest_OBJECTS = DMRTest.$(OBJEXT) \
+@DAP4_DEFINED_TRUE@	$(am__objects_1)
+DMRTest_OBJECTS = $(am_DMRTest_OBJECTS)
+@DAP4_DEFINED_TRUE@DMRTest_DEPENDENCIES = ../libdap.la \
+@DAP4_DEFINED_TRUE@	$(am__DEPENDENCIES_3)
+am__DmrRoundTripTest_SOURCES_DIST = DmrRoundTripTest.cc testFile.cc \
+	testFile.h
+@DAP4_DEFINED_TRUE@am_DmrRoundTripTest_OBJECTS =  \
+@DAP4_DEFINED_TRUE@	DmrRoundTripTest.$(OBJEXT) $(am__objects_1)
+DmrRoundTripTest_OBJECTS = $(am_DmrRoundTripTest_OBJECTS)
+@DAP4_DEFINED_TRUE@DmrRoundTripTest_DEPENDENCIES = ../libdap.la \
+@DAP4_DEFINED_TRUE@	$(am__DEPENDENCIES_3)
+am__DmrToDap2Test_SOURCES_DIST = DmrToDap2Test.cc testFile.cc \
+	testFile.h
+@DAP4_DEFINED_TRUE@am_DmrToDap2Test_OBJECTS = DmrToDap2Test.$(OBJEXT) \
+@DAP4_DEFINED_TRUE@	$(am__objects_1)
+DmrToDap2Test_OBJECTS = $(am_DmrToDap2Test_OBJECTS)
+@DAP4_DEFINED_TRUE@DmrToDap2Test_DEPENDENCIES = ../libdap.la \
+@DAP4_DEFINED_TRUE@	$(am__DEPENDENCIES_3)
+am_HTTPCacheTest_OBJECTS = HTTPCacheTest-HTTPCacheTest.$(OBJEXT)
+HTTPCacheTest_OBJECTS = $(am_HTTPCacheTest_OBJECTS)
+HTTPCacheTest_DEPENDENCIES = ../libdapclient.la ../libdap.la \
+	$(am__DEPENDENCIES_3)
+am_HTTPConnectTest_OBJECTS =  \
+	HTTPConnectTest-HTTPConnectTest.$(OBJEXT)
+HTTPConnectTest_OBJECTS = $(am_HTTPConnectTest_OBJECTS)
+HTTPConnectTest_DEPENDENCIES = ../libdapclient.la ../libdap.la \
+	$(am__DEPENDENCIES_3)
+am_MIMEUtilTest_OBJECTS = MIMEUtilTest.$(OBJEXT)
+MIMEUtilTest_OBJECTS = $(am_MIMEUtilTest_OBJECTS)
+MIMEUtilTest_DEPENDENCIES = ../libdap.la $(am__DEPENDENCIES_3)
+am_MarshallerTest_OBJECTS = MarshallerTest.$(OBJEXT)
+MarshallerTest_OBJECTS = $(am_MarshallerTest_OBJECTS)
+MarshallerTest_DEPENDENCIES = ../tests/libtest-types.a \
+	../libdapclient.la ../libdap.la $(am__DEPENDENCIES_3)
+am_RCReaderTest_OBJECTS = RCReaderTest.$(OBJEXT)
+RCReaderTest_OBJECTS = $(am_RCReaderTest_OBJECTS)
+RCReaderTest_DEPENDENCIES = ../libdapclient.la ../libdap.la \
+	$(am__DEPENDENCIES_3)
+am_RegexTest_OBJECTS = RegexTest.$(OBJEXT)
+RegexTest_OBJECTS = $(am_RegexTest_OBJECTS)
+RegexTest_DEPENDENCIES = ../libdap.la $(am__DEPENDENCIES_3)
+am_SequenceTest_OBJECTS = SequenceTest.$(OBJEXT)
+SequenceTest_OBJECTS = $(am_SequenceTest_OBJECTS)
+SequenceTest_DEPENDENCIES = ../tests/libtest-types.a ../libdap.la \
+	$(am__DEPENDENCIES_3)
+am_ServerFunctionsListUnitTest_OBJECTS =  \
+	ServerFunctionsListUnitTest.$(OBJEXT)
+ServerFunctionsListUnitTest_OBJECTS =  \
+	$(am_ServerFunctionsListUnitTest_OBJECTS)
+ServerFunctionsListUnitTest_DEPENDENCIES = ../libdap.la \
+	$(am__DEPENDENCIES_3)
+am_SignalHandlerTest_OBJECTS = SignalHandlerTest.$(OBJEXT)
+SignalHandlerTest_OBJECTS = $(am_SignalHandlerTest_OBJECTS)
+SignalHandlerTest_DEPENDENCIES = ../libdap.la $(am__DEPENDENCIES_3)
+am_ancT_OBJECTS = ancT.$(OBJEXT)
+ancT_OBJECTS = $(am_ancT_OBJECTS)
+ancT_DEPENDENCIES = ../libdapserver.la ../libdap.la \
+	$(am__DEPENDENCIES_3)
+am_arrayT_OBJECTS = arrayT.$(OBJEXT)
+arrayT_OBJECTS = $(am_arrayT_OBJECTS)
+arrayT_DEPENDENCIES = ../tests/libtest-types.a ../libdap.la \
+	$(am__DEPENDENCIES_3)
+am_attrTableT_OBJECTS = attrTableT.$(OBJEXT)
+attrTableT_OBJECTS = $(am_attrTableT_OBJECTS)
+attrTableT_DEPENDENCIES = ../tests/libtest-types.a ../libdap.la \
+	$(am__DEPENDENCIES_3)
+am__chunked_iostream_test_SOURCES_DIST = chunked_iostream_test.cc \
+	testFile.cc testFile.h
+@DAP4_DEFINED_TRUE@am_chunked_iostream_test_OBJECTS =  \
+@DAP4_DEFINED_TRUE@	chunked_iostream_test.$(OBJEXT) \
+@DAP4_DEFINED_TRUE@	$(am__objects_1)
+chunked_iostream_test_OBJECTS = $(am_chunked_iostream_test_OBJECTS)
+@DAP4_DEFINED_TRUE@chunked_iostream_test_DEPENDENCIES = ../libdap.la \
+@DAP4_DEFINED_TRUE@	$(am__DEPENDENCIES_3)
+am_dasT_OBJECTS = dasT.$(OBJEXT) $(am__objects_1)
+dasT_OBJECTS = $(am_dasT_OBJECTS)
+dasT_DEPENDENCIES = ../tests/libtest-types.a ../libdap.la \
+	$(am__DEPENDENCIES_3)
+am_ddsT_OBJECTS = ddsT.$(OBJEXT) $(am__objects_1)
+ddsT_OBJECTS = $(am_ddsT_OBJECTS)
+ddsT_DEPENDENCIES = ../tests/libtest-types.a ../libdap.la \
+	$(am__DEPENDENCIES_3)
+am_generalUtilTest_OBJECTS = generalUtilTest.$(OBJEXT)
+generalUtilTest_OBJECTS = $(am_generalUtilTest_OBJECTS)
+generalUtilTest_DEPENDENCIES = ../libdap.la $(am__DEPENDENCIES_3)
+am_marshT_OBJECTS = marshT.$(OBJEXT)
+marshT_OBJECTS = $(am_marshT_OBJECTS)
+marshT_DEPENDENCIES = ../tests/libtest-types.a ../libdap.la \
+	$(am__DEPENDENCIES_3)
+am_parserUtilTest_OBJECTS = parserUtilTest.$(OBJEXT)
+parserUtilTest_OBJECTS = $(am_parserUtilTest_OBJECTS)
+parserUtilTest_DEPENDENCIES = ../libdap.la $(am__DEPENDENCIES_3)
+am_sequenceT_OBJECTS = sequenceT.$(OBJEXT)
+sequenceT_OBJECTS = $(am_sequenceT_OBJECTS)
+sequenceT_DEPENDENCIES = ../tests/libtest-types.a ../libdap.la \
+	$(am__DEPENDENCIES_3)
+am_structT_OBJECTS = structT.$(OBJEXT)
+structT_OBJECTS = $(am_structT_OBJECTS)
+structT_DEPENDENCIES = ../tests/libtest-types.a ../libdap.la \
+	$(am__DEPENDENCIES_3)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/conf/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_@AM_V@)
+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
+am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_1 = 
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_1 = 
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(ArrayTest_SOURCES) $(AttrTableTest_SOURCES) \
+	$(ByteTest_SOURCES) $(D4AsyncDocTest_SOURCES) \
+	$(D4AttributesTest_SOURCES) $(D4DimensionsTest_SOURCES) \
+	$(D4EnumDefsTest_SOURCES) $(D4EnumTest_SOURCES) \
+	$(D4FilterClauseTest_SOURCES) $(D4GroupTest_SOURCES) \
+	$(D4MarshallerTest_SOURCES) $(D4ParserSax2Test_SOURCES) \
+	$(D4SequenceTest_SOURCES) $(D4UnMarshallerTest_SOURCES) \
+	$(DASTest_SOURCES) $(DDSTest_SOURCES) $(DDXParserTest_SOURCES) \
+	$(DMRTest_SOURCES) $(DmrRoundTripTest_SOURCES) \
+	$(DmrToDap2Test_SOURCES) $(HTTPCacheTest_SOURCES) \
+	$(HTTPConnectTest_SOURCES) $(MIMEUtilTest_SOURCES) \
+	$(MarshallerTest_SOURCES) $(RCReaderTest_SOURCES) \
+	$(RegexTest_SOURCES) $(SequenceTest_SOURCES) \
+	$(ServerFunctionsListUnitTest_SOURCES) \
+	$(SignalHandlerTest_SOURCES) $(ancT_SOURCES) $(arrayT_SOURCES) \
+	$(attrTableT_SOURCES) $(chunked_iostream_test_SOURCES) \
+	$(dasT_SOURCES) $(ddsT_SOURCES) $(generalUtilTest_SOURCES) \
+	$(marshT_SOURCES) $(parserUtilTest_SOURCES) \
+	$(sequenceT_SOURCES) $(structT_SOURCES)
+DIST_SOURCES = $(ArrayTest_SOURCES) $(AttrTableTest_SOURCES) \
+	$(ByteTest_SOURCES) $(am__D4AsyncDocTest_SOURCES_DIST) \
+	$(am__D4AttributesTest_SOURCES_DIST) \
+	$(am__D4DimensionsTest_SOURCES_DIST) \
+	$(am__D4EnumDefsTest_SOURCES_DIST) \
+	$(am__D4EnumTest_SOURCES_DIST) \
+	$(am__D4FilterClauseTest_SOURCES_DIST) \
+	$(am__D4GroupTest_SOURCES_DIST) \
+	$(am__D4MarshallerTest_SOURCES_DIST) \
+	$(am__D4ParserSax2Test_SOURCES_DIST) \
+	$(am__D4SequenceTest_SOURCES_DIST) \
+	$(am__D4UnMarshallerTest_SOURCES_DIST) $(DASTest_SOURCES) \
+	$(DDSTest_SOURCES) $(DDXParserTest_SOURCES) \
+	$(am__DMRTest_SOURCES_DIST) \
+	$(am__DmrRoundTripTest_SOURCES_DIST) \
+	$(am__DmrToDap2Test_SOURCES_DIST) $(HTTPCacheTest_SOURCES) \
+	$(HTTPConnectTest_SOURCES) $(MIMEUtilTest_SOURCES) \
+	$(MarshallerTest_SOURCES) $(RCReaderTest_SOURCES) \
+	$(RegexTest_SOURCES) $(SequenceTest_SOURCES) \
+	$(ServerFunctionsListUnitTest_SOURCES) \
+	$(SignalHandlerTest_SOURCES) $(ancT_SOURCES) $(arrayT_SOURCES) \
+	$(attrTableT_SOURCES) \
+	$(am__chunked_iostream_test_SOURCES_DIST) $(dasT_SOURCES) \
+	$(ddsT_SOURCES) $(generalUtilTest_SOURCES) $(marshT_SOURCES) \
+	$(parserUtilTest_SOURCES) $(sequenceT_SOURCES) \
+	$(structT_SOURCES)
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+HEADERS = $(noinst_HEADERS)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+	check recheck distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__tty_colors_dummy = \
+  mgn= red= grn= lgn= blu= brg= std=; \
+  am__color_tests=no
+am__tty_colors = { \
+  $(am__tty_colors_dummy); \
+  if test "X$(AM_COLOR_TESTS)" = Xno; then \
+    am__color_tests=no; \
+  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
+    am__color_tests=yes; \
+  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
+    am__color_tests=yes; \
+  fi; \
+  if test $$am__color_tests = yes; then \
+    red=''; \
+    grn=''; \
+    lgn=''; \
+    blu=''; \
+    mgn=''; \
+    brg=''; \
+    std=''; \
+  fi; \
+}
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__recheck_rx = ^[ 	]*:recheck:[ 	]*
+am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
+am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
+# A command that, given a newline-separated list of test names on the
+# standard input, print the name of the tests that are to be re-run
+# upon "make recheck".
+am__list_recheck_tests = $(AWK) '{ \
+  recheck = 1; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+        { \
+          if ((getline line2 < ($$0 ".log")) < 0) \
+	    recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
+        { \
+          recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
+        { \
+          break; \
+        } \
+    }; \
+  if (recheck) \
+    print $$0; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# A command that, given a newline-separated list of test names on the
+# standard input, create the global log from their .trs and .log files.
+am__create_global_log = $(AWK) ' \
+function fatal(msg) \
+{ \
+  print "fatal: making $@: " msg | "cat >&2"; \
+  exit 1; \
+} \
+function rst_section(header) \
+{ \
+  print header; \
+  len = length(header); \
+  for (i = 1; i <= len; i = i + 1) \
+    printf "="; \
+  printf "\n\n"; \
+} \
+{ \
+  copy_in_global_log = 1; \
+  global_test_result = "RUN"; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+         fatal("failed to read from " $$0 ".trs"); \
+      if (line ~ /$(am__global_test_result_rx)/) \
+        { \
+          sub("$(am__global_test_result_rx)", "", line); \
+          sub("[ 	]*$$", "", line); \
+          global_test_result = line; \
+        } \
+      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
+        copy_in_global_log = 0; \
+    }; \
+  if (copy_in_global_log) \
+    { \
+      rst_section(global_test_result ": " $$0); \
+      while ((rc = (getline line < ($$0 ".log"))) != 0) \
+      { \
+        if (rc < 0) \
+          fatal("failed to read from " $$0 ".log"); \
+        print line; \
+      }; \
+      printf "\n"; \
+    }; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# Restructured Text title.
+am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
+# Solaris 10 'make', and several other traditional 'make' implementations,
+# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
+# by disabling -e (using the XSI extension "set +e") if it's set.
+am__sh_e_setup = case $$- in *e*) set +e;; esac
+# Default flags passed to test drivers.
+am__common_driver_flags = \
+  --color-tests "$$am__color_tests" \
+  --enable-hard-errors "$$am__enable_hard_errors" \
+  --expect-failure "$$am__expect_failure"
+# To be inserted before the command running the test.  Creates the
+# directory for the log if needed.  Stores in $dir the directory
+# containing $f, in $tst the test, in $log the log.  Executes the
+# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
+# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
+# will run the test scripts (or their associated LOG_COMPILER, if
+# thy have one).
+am__check_pre = \
+$(am__sh_e_setup);					\
+$(am__vpath_adj_setup) $(am__vpath_adj)			\
+$(am__tty_colors);					\
+srcdir=$(srcdir); export srcdir;			\
+case "$@" in						\
+  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
+    *) am__odir=.;; 					\
+esac;							\
+test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
+  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
+if test -f "./$$f"; then dir=./;			\
+elif test -f "$$f"; then dir=;				\
+else dir="$(srcdir)/"; fi;				\
+tst=$$dir$$f; log='$@'; 				\
+if test -n '$(DISABLE_HARD_ERRORS)'; then		\
+  am__enable_hard_errors=no; 				\
+else							\
+  am__enable_hard_errors=yes; 				\
+fi; 							\
+case " $(XFAIL_TESTS) " in				\
+  *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
+    am__expect_failure=yes;;				\
+  *)							\
+    am__expect_failure=no;;				\
+esac; 							\
+$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
+# A shell command to get the names of the tests scripts with any registered
+# extension removed (i.e., equivalently, the names of the test logs, with
+# the '.log' extension removed).  The result is saved in the shell variable
+# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
+# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
+# since that might cause problem with VPATH rewrites for suffix-less tests.
+# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
+am__set_TESTS_bases = \
+  bases='$(TEST_LOGS)'; \
+  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
+  bases=`echo $$bases`
+RECHECK_LOGS = $(TEST_LOGS)
+TEST_SUITE_LOG = test-suite.log
+TEST_EXTENSIONS = @EXEEXT@ .test
+LOG_DRIVER = $(SHELL) $(top_srcdir)/conf/test-driver
+LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
+am__set_b = \
+  case '$@' in \
+    */*) \
+      case '$*' in \
+        */*) b='$*';; \
+          *) b=`echo '$@' | sed 's/\.log$$//'`; \
+       esac;; \
+    *) \
+      b='$*';; \
+  esac
+am__test_logs1 = $(TESTS:=.log)
+am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
+TEST_LOGS = $(am__test_logs2:.test.log=.log)
+TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/conf/test-driver
+TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
+	$(TEST_LOG_FLAGS)
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
+pkglibexecdir = @pkglibexecdir@
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALLOCA_H = @ALLOCA_H@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
+AR = @AR@
+ARFLAGS = @ARFLAGS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BITSIZEOF_PTRDIFF_T = @BITSIZEOF_PTRDIFF_T@
+BITSIZEOF_SIG_ATOMIC_T = @BITSIZEOF_SIG_ATOMIC_T@
+BITSIZEOF_SIZE_T = @BITSIZEOF_SIZE_T@
+BITSIZEOF_WCHAR_T = @BITSIZEOF_WCHAR_T@
+BITSIZEOF_WINT_T = @BITSIZEOF_WINT_T@
+BYTESWAP_H = @BYTESWAP_H@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CLIENTLIB_AGE = @CLIENTLIB_AGE@
+CLIENTLIB_CURRENT = @CLIENTLIB_CURRENT@
+CLIENTLIB_REVISION = @CLIENTLIB_REVISION@
+CLIENTLIB_VERSION = @CLIENTLIB_VERSION@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@
+CPPUNIT_CONFIG = @CPPUNIT_CONFIG@
+CPPUNIT_LIBS = @CPPUNIT_LIBS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_LIBS = @CURL_LIBS@
+CURL_STATIC_LIBS = @CURL_STATIC_LIBS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DAPLIB_AGE = @DAPLIB_AGE@
+DAPLIB_CURRENT = @DAPLIB_CURRENT@
+DAPLIB_REVISION = @DAPLIB_REVISION@
+DAP_PROTOCOL_VERSION = @DAP_PROTOCOL_VERSION@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+DVR = @DVR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GLIBC21 = @GLIBC21@
+GNULIB_ATOLL = @GNULIB_ATOLL@
+GNULIB_BTOWC = @GNULIB_BTOWC@
+GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@
+GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
+GNULIB_CHDIR = @GNULIB_CHDIR@
+GNULIB_CHOWN = @GNULIB_CHOWN@
+GNULIB_CLOSE = @GNULIB_CLOSE@
+GNULIB_CTIME = @GNULIB_CTIME@
+GNULIB_DUP = @GNULIB_DUP@
+GNULIB_DUP2 = @GNULIB_DUP2@
+GNULIB_DUP3 = @GNULIB_DUP3@
+GNULIB_DUPLOCALE = @GNULIB_DUPLOCALE@
+GNULIB_ENVIRON = @GNULIB_ENVIRON@
+GNULIB_EUIDACCESS = @GNULIB_EUIDACCESS@
+GNULIB_FACCESSAT = @GNULIB_FACCESSAT@
+GNULIB_FCHDIR = @GNULIB_FCHDIR@
+GNULIB_FCHMODAT = @GNULIB_FCHMODAT@
+GNULIB_FCHOWNAT = @GNULIB_FCHOWNAT@
+GNULIB_FCNTL = @GNULIB_FCNTL@
+GNULIB_FDATASYNC = @GNULIB_FDATASYNC@
+GNULIB_FSTAT = @GNULIB_FSTAT@
+GNULIB_FSTATAT = @GNULIB_FSTATAT@
+GNULIB_FSYNC = @GNULIB_FSYNC@
+GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@
+GNULIB_FUTIMENS = @GNULIB_FUTIMENS@
+GNULIB_GETCWD = @GNULIB_GETCWD@
+GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@
+GNULIB_GETDTABLESIZE = @GNULIB_GETDTABLESIZE@
+GNULIB_GETGROUPS = @GNULIB_GETGROUPS@
+GNULIB_GETHOSTNAME = @GNULIB_GETHOSTNAME@
+GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@
+GNULIB_GETLOGIN = @GNULIB_GETLOGIN@
+GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@
+GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@
+GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@
+GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@
+GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@
+GNULIB_GRANTPT = @GNULIB_GRANTPT@
+GNULIB_GROUP_MEMBER = @GNULIB_GROUP_MEMBER@
+GNULIB_ISATTY = @GNULIB_ISATTY@
+GNULIB_ISWBLANK = @GNULIB_ISWBLANK@
+GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@
+GNULIB_LCHMOD = @GNULIB_LCHMOD@
+GNULIB_LCHOWN = @GNULIB_LCHOWN@
+GNULIB_LINK = @GNULIB_LINK@
+GNULIB_LINKAT = @GNULIB_LINKAT@
+GNULIB_LOCALECONV = @GNULIB_LOCALECONV@
+GNULIB_LOCALTIME = @GNULIB_LOCALTIME@
+GNULIB_LSEEK = @GNULIB_LSEEK@
+GNULIB_LSTAT = @GNULIB_LSTAT@
+GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@
+GNULIB_MBRLEN = @GNULIB_MBRLEN@
+GNULIB_MBRTOWC = @GNULIB_MBRTOWC@
+GNULIB_MBSINIT = @GNULIB_MBSINIT@
+GNULIB_MBSNRTOWCS = @GNULIB_MBSNRTOWCS@
+GNULIB_MBSRTOWCS = @GNULIB_MBSRTOWCS@
+GNULIB_MBTOWC = @GNULIB_MBTOWC@
+GNULIB_MKDIRAT = @GNULIB_MKDIRAT@
+GNULIB_MKDTEMP = @GNULIB_MKDTEMP@
+GNULIB_MKFIFO = @GNULIB_MKFIFO@
+GNULIB_MKFIFOAT = @GNULIB_MKFIFOAT@
+GNULIB_MKNOD = @GNULIB_MKNOD@
+GNULIB_MKNODAT = @GNULIB_MKNODAT@
+GNULIB_MKOSTEMP = @GNULIB_MKOSTEMP@
+GNULIB_MKOSTEMPS = @GNULIB_MKOSTEMPS@
+GNULIB_MKSTEMP = @GNULIB_MKSTEMP@
+GNULIB_MKSTEMPS = @GNULIB_MKSTEMPS@
+GNULIB_MKTIME = @GNULIB_MKTIME@
+GNULIB_NANOSLEEP = @GNULIB_NANOSLEEP@
+GNULIB_NL_LANGINFO = @GNULIB_NL_LANGINFO@
+GNULIB_NONBLOCKING = @GNULIB_NONBLOCKING@
+GNULIB_OPEN = @GNULIB_OPEN@
+GNULIB_OPENAT = @GNULIB_OPENAT@
+GNULIB_OVERRIDES_STRUCT_STAT = @GNULIB_OVERRIDES_STRUCT_STAT@
+GNULIB_OVERRIDES_WINT_T = @GNULIB_OVERRIDES_WINT_T@
+GNULIB_PIPE = @GNULIB_PIPE@
+GNULIB_PIPE2 = @GNULIB_PIPE2@
+GNULIB_POSIX_OPENPT = @GNULIB_POSIX_OPENPT@
+GNULIB_PREAD = @GNULIB_PREAD@
+GNULIB_PTSNAME = @GNULIB_PTSNAME@
+GNULIB_PTSNAME_R = @GNULIB_PTSNAME_R@
+GNULIB_PUTENV = @GNULIB_PUTENV@
+GNULIB_PWRITE = @GNULIB_PWRITE@
+GNULIB_QSORT_R = @GNULIB_QSORT_R@
+GNULIB_RANDOM = @GNULIB_RANDOM@
+GNULIB_RANDOM_R = @GNULIB_RANDOM_R@
+GNULIB_READ = @GNULIB_READ@
+GNULIB_READLINK = @GNULIB_READLINK@
+GNULIB_READLINKAT = @GNULIB_READLINKAT@
+GNULIB_REALLOCARRAY = @GNULIB_REALLOCARRAY@
+GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@
+GNULIB_REALPATH = @GNULIB_REALPATH@
+GNULIB_RMDIR = @GNULIB_RMDIR@
+GNULIB_RPMATCH = @GNULIB_RPMATCH@
+GNULIB_SECURE_GETENV = @GNULIB_SECURE_GETENV@
+GNULIB_SETENV = @GNULIB_SETENV@
+GNULIB_SETHOSTNAME = @GNULIB_SETHOSTNAME@
+GNULIB_SETLOCALE = @GNULIB_SETLOCALE@
+GNULIB_SLEEP = @GNULIB_SLEEP@
+GNULIB_STAT = @GNULIB_STAT@
+GNULIB_STRFTIME = @GNULIB_STRFTIME@
+GNULIB_STRPTIME = @GNULIB_STRPTIME@
+GNULIB_STRTOD = @GNULIB_STRTOD@
+GNULIB_STRTOLL = @GNULIB_STRTOLL@
+GNULIB_STRTOULL = @GNULIB_STRTOULL@
+GNULIB_SYMLINK = @GNULIB_SYMLINK@
+GNULIB_SYMLINKAT = @GNULIB_SYMLINKAT@
+GNULIB_SYSTEM_POSIX = @GNULIB_SYSTEM_POSIX@
+GNULIB_TIMEGM = @GNULIB_TIMEGM@
+GNULIB_TIME_R = @GNULIB_TIME_R@
+GNULIB_TIME_RZ = @GNULIB_TIME_RZ@
+GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@
+GNULIB_TRUNCATE = @GNULIB_TRUNCATE@
+GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@
+GNULIB_TZSET = @GNULIB_TZSET@
+GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@
+GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@
+GNULIB_UNLINK = @GNULIB_UNLINK@
+GNULIB_UNLINKAT = @GNULIB_UNLINKAT@
+GNULIB_UNLOCKPT = @GNULIB_UNLOCKPT@
+GNULIB_UNSETENV = @GNULIB_UNSETENV@
+GNULIB_USLEEP = @GNULIB_USLEEP@
+GNULIB_UTIMENSAT = @GNULIB_UTIMENSAT@
+GNULIB_WCPCPY = @GNULIB_WCPCPY@
+GNULIB_WCPNCPY = @GNULIB_WCPNCPY@
+GNULIB_WCRTOMB = @GNULIB_WCRTOMB@
+GNULIB_WCSCASECMP = @GNULIB_WCSCASECMP@
+GNULIB_WCSCAT = @GNULIB_WCSCAT@
+GNULIB_WCSCHR = @GNULIB_WCSCHR@
+GNULIB_WCSCMP = @GNULIB_WCSCMP@
+GNULIB_WCSCOLL = @GNULIB_WCSCOLL@
+GNULIB_WCSCPY = @GNULIB_WCSCPY@
+GNULIB_WCSCSPN = @GNULIB_WCSCSPN@
+GNULIB_WCSDUP = @GNULIB_WCSDUP@
+GNULIB_WCSFTIME = @GNULIB_WCSFTIME@
+GNULIB_WCSLEN = @GNULIB_WCSLEN@
+GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@
+GNULIB_WCSNCAT = @GNULIB_WCSNCAT@
+GNULIB_WCSNCMP = @GNULIB_WCSNCMP@
+GNULIB_WCSNCPY = @GNULIB_WCSNCPY@
+GNULIB_WCSNLEN = @GNULIB_WCSNLEN@
+GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@
+GNULIB_WCSPBRK = @GNULIB_WCSPBRK@
+GNULIB_WCSRCHR = @GNULIB_WCSRCHR@
+GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@
+GNULIB_WCSSPN = @GNULIB_WCSSPN@
+GNULIB_WCSSTR = @GNULIB_WCSSTR@
+GNULIB_WCSTOK = @GNULIB_WCSTOK@
+GNULIB_WCSWIDTH = @GNULIB_WCSWIDTH@
+GNULIB_WCSXFRM = @GNULIB_WCSXFRM@
+GNULIB_WCTOB = @GNULIB_WCTOB@
+GNULIB_WCTOMB = @GNULIB_WCTOMB@
+GNULIB_WCTRANS = @GNULIB_WCTRANS@
+GNULIB_WCTYPE = @GNULIB_WCTYPE@
+GNULIB_WCWIDTH = @GNULIB_WCWIDTH@
+GNULIB_WMEMCHR = @GNULIB_WMEMCHR@
+GNULIB_WMEMCMP = @GNULIB_WMEMCMP@
+GNULIB_WMEMCPY = @GNULIB_WMEMCPY@
+GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@
+GNULIB_WMEMSET = @GNULIB_WMEMSET@
+GNULIB_WRITE = @GNULIB_WRITE@
+GNULIB__EXIT = @GNULIB__EXIT@
+GREP = @GREP@
+HAVE_ATOLL = @HAVE_ATOLL@
+HAVE_BTOWC = @HAVE_BTOWC@
+HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@
+HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
+HAVE_CHOWN = @HAVE_CHOWN@
+HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@
+HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
+HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@
+HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@
+HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@
+HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@
+HAVE_DECL_GETLOGIN = @HAVE_DECL_GETLOGIN@
+HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@
+HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@
+HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@
+HAVE_DECL_INITSTATE = @HAVE_DECL_INITSTATE@
+HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@
+HAVE_DECL_SETENV = @HAVE_DECL_SETENV@
+HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@
+HAVE_DECL_SETSTATE = @HAVE_DECL_SETSTATE@
+HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@
+HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@
+HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@
+HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@
+HAVE_DUP2 = @HAVE_DUP2@
+HAVE_DUP3 = @HAVE_DUP3@
+HAVE_DUPLOCALE = @HAVE_DUPLOCALE@
+HAVE_EUIDACCESS = @HAVE_EUIDACCESS@
+HAVE_FACCESSAT = @HAVE_FACCESSAT@
+HAVE_FCHDIR = @HAVE_FCHDIR@
+HAVE_FCHMODAT = @HAVE_FCHMODAT@
+HAVE_FCHOWNAT = @HAVE_FCHOWNAT@
+HAVE_FCNTL = @HAVE_FCNTL@
+HAVE_FDATASYNC = @HAVE_FDATASYNC@
+HAVE_FEATURES_H = @HAVE_FEATURES_H@
+HAVE_FSTATAT = @HAVE_FSTATAT@
+HAVE_FSYNC = @HAVE_FSYNC@
+HAVE_FTRUNCATE = @HAVE_FTRUNCATE@
+HAVE_FUTIMENS = @HAVE_FUTIMENS@
+HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@
+HAVE_GETGROUPS = @HAVE_GETGROUPS@
+HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@
+HAVE_GETLOGIN = @HAVE_GETLOGIN@
+HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@
+HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
+HAVE_GETTIMEOFDAY = @HAVE_GETTIMEOFDAY@
+HAVE_GRANTPT = @HAVE_GRANTPT@
+HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
+HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
+HAVE_ISWBLANK = @HAVE_ISWBLANK@
+HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
+HAVE_LANGINFO_CODESET = @HAVE_LANGINFO_CODESET@
+HAVE_LANGINFO_ERA = @HAVE_LANGINFO_ERA@
+HAVE_LANGINFO_H = @HAVE_LANGINFO_H@
+HAVE_LANGINFO_T_FMT_AMPM = @HAVE_LANGINFO_T_FMT_AMPM@
+HAVE_LANGINFO_YESEXPR = @HAVE_LANGINFO_YESEXPR@
+HAVE_LCHMOD = @HAVE_LCHMOD@
+HAVE_LCHOWN = @HAVE_LCHOWN@
+HAVE_LINK = @HAVE_LINK@
+HAVE_LINKAT = @HAVE_LINKAT@
+HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@
+HAVE_LSTAT = @HAVE_LSTAT@
+HAVE_MAX_ALIGN_T = @HAVE_MAX_ALIGN_T@
+HAVE_MBRLEN = @HAVE_MBRLEN@
+HAVE_MBRTOWC = @HAVE_MBRTOWC@
+HAVE_MBSINIT = @HAVE_MBSINIT@
+HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@
+HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@
+HAVE_MKDIRAT = @HAVE_MKDIRAT@
+HAVE_MKDTEMP = @HAVE_MKDTEMP@
+HAVE_MKFIFO = @HAVE_MKFIFO@
+HAVE_MKFIFOAT = @HAVE_MKFIFOAT@
+HAVE_MKNOD = @HAVE_MKNOD@
+HAVE_MKNODAT = @HAVE_MKNODAT@
+HAVE_MKOSTEMP = @HAVE_MKOSTEMP@
+HAVE_MKOSTEMPS = @HAVE_MKOSTEMPS@
+HAVE_MKSTEMP = @HAVE_MKSTEMP@
+HAVE_MKSTEMPS = @HAVE_MKSTEMPS@
+HAVE_NANOSLEEP = @HAVE_NANOSLEEP@
+HAVE_NL_LANGINFO = @HAVE_NL_LANGINFO@
+HAVE_OPENAT = @HAVE_OPENAT@
+HAVE_OS_H = @HAVE_OS_H@
+HAVE_PIPE = @HAVE_PIPE@
+HAVE_PIPE2 = @HAVE_PIPE2@
+HAVE_POSIX_OPENPT = @HAVE_POSIX_OPENPT@
+HAVE_PREAD = @HAVE_PREAD@
+HAVE_PTSNAME = @HAVE_PTSNAME@
+HAVE_PTSNAME_R = @HAVE_PTSNAME_R@
+HAVE_PWRITE = @HAVE_PWRITE@
+HAVE_QSORT_R = @HAVE_QSORT_R@
+HAVE_RANDOM = @HAVE_RANDOM@
+HAVE_RANDOM_H = @HAVE_RANDOM_H@
+HAVE_RANDOM_R = @HAVE_RANDOM_R@
+HAVE_READLINK = @HAVE_READLINK@
+HAVE_READLINKAT = @HAVE_READLINKAT@
+HAVE_REALLOCARRAY = @HAVE_REALLOCARRAY@
+HAVE_REALPATH = @HAVE_REALPATH@
+HAVE_RPMATCH = @HAVE_RPMATCH@
+HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@
+HAVE_SETENV = @HAVE_SETENV@
+HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@
+HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
+HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
+HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@
+HAVE_SLEEP = @HAVE_SLEEP@
+HAVE_STDINT_H = @HAVE_STDINT_H@
+HAVE_STRPTIME = @HAVE_STRPTIME@
+HAVE_STRTOD = @HAVE_STRTOD@
+HAVE_STRTOLL = @HAVE_STRTOLL@
+HAVE_STRTOULL = @HAVE_STRTOULL@
+HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@
+HAVE_STRUCT_TIMEVAL = @HAVE_STRUCT_TIMEVAL@
+HAVE_SYMLINK = @HAVE_SYMLINK@
+HAVE_SYMLINKAT = @HAVE_SYMLINKAT@
+HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@
+HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@
+HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@
+HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@
+HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@
+HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
+HAVE_TIMEGM = @HAVE_TIMEGM@
+HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@
+HAVE_TRUNCATE = @HAVE_TRUNCATE@
+HAVE_TZSET = @HAVE_TZSET@
+HAVE_UNISTD_H = @HAVE_UNISTD_H@
+HAVE_UNLINKAT = @HAVE_UNLINKAT@
+HAVE_UNLOCKPT = @HAVE_UNLOCKPT@
+HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@
+HAVE_USLEEP = @HAVE_USLEEP@
+HAVE_UTIMENSAT = @HAVE_UTIMENSAT@
+HAVE_VALGRIND = @HAVE_VALGRIND@
+HAVE_WCHAR_H = @HAVE_WCHAR_H@
+HAVE_WCHAR_T = @HAVE_WCHAR_T@
+HAVE_WCPCPY = @HAVE_WCPCPY@
+HAVE_WCPNCPY = @HAVE_WCPNCPY@
+HAVE_WCRTOMB = @HAVE_WCRTOMB@
+HAVE_WCSCASECMP = @HAVE_WCSCASECMP@
+HAVE_WCSCAT = @HAVE_WCSCAT@
+HAVE_WCSCHR = @HAVE_WCSCHR@
+HAVE_WCSCMP = @HAVE_WCSCMP@
+HAVE_WCSCOLL = @HAVE_WCSCOLL@
+HAVE_WCSCPY = @HAVE_WCSCPY@
+HAVE_WCSCSPN = @HAVE_WCSCSPN@
+HAVE_WCSDUP = @HAVE_WCSDUP@
+HAVE_WCSFTIME = @HAVE_WCSFTIME@
+HAVE_WCSLEN = @HAVE_WCSLEN@
+HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@
+HAVE_WCSNCAT = @HAVE_WCSNCAT@
+HAVE_WCSNCMP = @HAVE_WCSNCMP@
+HAVE_WCSNCPY = @HAVE_WCSNCPY@
+HAVE_WCSNLEN = @HAVE_WCSNLEN@
+HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@
+HAVE_WCSPBRK = @HAVE_WCSPBRK@
+HAVE_WCSRCHR = @HAVE_WCSRCHR@
+HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@
+HAVE_WCSSPN = @HAVE_WCSSPN@
+HAVE_WCSSTR = @HAVE_WCSSTR@
+HAVE_WCSTOK = @HAVE_WCSTOK@
+HAVE_WCSWIDTH = @HAVE_WCSWIDTH@
+HAVE_WCSXFRM = @HAVE_WCSXFRM@
+HAVE_WCTRANS_T = @HAVE_WCTRANS_T@
+HAVE_WCTYPE_H = @HAVE_WCTYPE_H@
+HAVE_WCTYPE_T = @HAVE_WCTYPE_T@
+HAVE_WINSOCK2_H = @HAVE_WINSOCK2_H@
+HAVE_WINT_T = @HAVE_WINT_T@
+HAVE_WMEMCHR = @HAVE_WMEMCHR@
+HAVE_WMEMCMP = @HAVE_WMEMCMP@
+HAVE_WMEMCPY = @HAVE_WMEMCPY@
+HAVE_WMEMMOVE = @HAVE_WMEMMOVE@
+HAVE_WMEMSET = @HAVE_WMEMSET@
+HAVE_XLOCALE_H = @HAVE_XLOCALE_H@
+HAVE__BOOL = @HAVE__BOOL@
+HAVE__EXIT = @HAVE__EXIT@
+INCLUDE_NEXT = @INCLUDE_NEXT@
+INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBDAP_VERSION = @LIBDAP_VERSION@
+LIBINTL = @LIBINTL@
+LIBMULTITHREAD = @LIBMULTITHREAD@
+LIBOBJS = @LIBOBJS@
+LIBPTH = @LIBPTH@
+LIBPTH_PREFIX = @LIBPTH_PREFIX@
+LIBS = @LIBS@
+LIBTHREAD = @LIBTHREAD@
+LIBTOOL = @LIBTOOL@
+LIMITS_H = @LIMITS_H@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@
+LOCALE_FR = @LOCALE_FR@
+LOCALE_FR_UTF8 = @LOCALE_FR_UTF8@
+LOCALE_JA = @LOCALE_JA@
+LOCALE_ZH_CN = @LOCALE_ZH_CN@
+LTLIBINTL = @LTLIBINTL@
+LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
+LTLIBOBJS = @LTLIBOBJS@
+LTLIBPTH = @LTLIBPTH@
+LTLIBTHREAD = @LTLIBTHREAD@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@
+NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H = @NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H@
+NEXT_AS_FIRST_DIRECTIVE_LIMITS_H = @NEXT_AS_FIRST_DIRECTIVE_LIMITS_H@
+NEXT_AS_FIRST_DIRECTIVE_LOCALE_H = @NEXT_AS_FIRST_DIRECTIVE_LOCALE_H@
+NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@
+NEXT_AS_FIRST_DIRECTIVE_STDINT_H = @NEXT_AS_FIRST_DIRECTIVE_STDINT_H@
+NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@
+NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@
+NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@
+NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@
+NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@
+NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@
+NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@
+NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@
+NEXT_FCNTL_H = @NEXT_FCNTL_H@
+NEXT_LANGINFO_H = @NEXT_LANGINFO_H@
+NEXT_LIMITS_H = @NEXT_LIMITS_H@
+NEXT_LOCALE_H = @NEXT_LOCALE_H@
+NEXT_STDDEF_H = @NEXT_STDDEF_H@
+NEXT_STDINT_H = @NEXT_STDINT_H@
+NEXT_STDLIB_H = @NEXT_STDLIB_H@
+NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@
+NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@
+NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@
+NEXT_TIME_H = @NEXT_TIME_H@
+NEXT_UNISTD_H = @NEXT_UNISTD_H@
+NEXT_WCHAR_H = @NEXT_WCHAR_H@
+NEXT_WCTYPE_H = @NEXT_WCTYPE_H@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_MAJOR_VERSION = @PACKAGE_MAJOR_VERSION@
+PACKAGE_MINOR_VERSION = @PACKAGE_MINOR_VERSION@
+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@
+PRAGMA_COLUMNS = @PRAGMA_COLUMNS@
+PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
+PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@
+PTHREAD_LIBS = @PTHREAD_LIBS@
+PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
+RANLIB = @RANLIB@
+REPLACE_BTOWC = @REPLACE_BTOWC@
+REPLACE_CALLOC = @REPLACE_CALLOC@
+REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@
+REPLACE_CHOWN = @REPLACE_CHOWN@
+REPLACE_CLOSE = @REPLACE_CLOSE@
+REPLACE_CTIME = @REPLACE_CTIME@
+REPLACE_DUP = @REPLACE_DUP@
+REPLACE_DUP2 = @REPLACE_DUP2@
+REPLACE_DUPLOCALE = @REPLACE_DUPLOCALE@
+REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@
+REPLACE_FCNTL = @REPLACE_FCNTL@
+REPLACE_FSTAT = @REPLACE_FSTAT@
+REPLACE_FSTATAT = @REPLACE_FSTATAT@
+REPLACE_FTRUNCATE = @REPLACE_FTRUNCATE@
+REPLACE_FUTIMENS = @REPLACE_FUTIMENS@
+REPLACE_GETCWD = @REPLACE_GETCWD@
+REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@
+REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@
+REPLACE_GETGROUPS = @REPLACE_GETGROUPS@
+REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
+REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
+REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@
+REPLACE_GMTIME = @REPLACE_GMTIME@
+REPLACE_ISATTY = @REPLACE_ISATTY@
+REPLACE_ISWBLANK = @REPLACE_ISWBLANK@
+REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@
+REPLACE_LCHOWN = @REPLACE_LCHOWN@
+REPLACE_LINK = @REPLACE_LINK@
+REPLACE_LINKAT = @REPLACE_LINKAT@
+REPLACE_LOCALECONV = @REPLACE_LOCALECONV@
+REPLACE_LOCALTIME = @REPLACE_LOCALTIME@
+REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@
+REPLACE_LSEEK = @REPLACE_LSEEK@
+REPLACE_LSTAT = @REPLACE_LSTAT@
+REPLACE_MALLOC = @REPLACE_MALLOC@
+REPLACE_MBRLEN = @REPLACE_MBRLEN@
+REPLACE_MBRTOWC = @REPLACE_MBRTOWC@
+REPLACE_MBSINIT = @REPLACE_MBSINIT@
+REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@
+REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@
+REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@
+REPLACE_MBTOWC = @REPLACE_MBTOWC@
+REPLACE_MKDIR = @REPLACE_MKDIR@
+REPLACE_MKFIFO = @REPLACE_MKFIFO@
+REPLACE_MKNOD = @REPLACE_MKNOD@
+REPLACE_MKSTEMP = @REPLACE_MKSTEMP@
+REPLACE_MKTIME = @REPLACE_MKTIME@
+REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@
+REPLACE_NL_LANGINFO = @REPLACE_NL_LANGINFO@
+REPLACE_NULL = @REPLACE_NULL@
+REPLACE_OPEN = @REPLACE_OPEN@
+REPLACE_OPENAT = @REPLACE_OPENAT@
+REPLACE_PREAD = @REPLACE_PREAD@
+REPLACE_PTSNAME = @REPLACE_PTSNAME@
+REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@
+REPLACE_PUTENV = @REPLACE_PUTENV@
+REPLACE_PWRITE = @REPLACE_PWRITE@
+REPLACE_QSORT_R = @REPLACE_QSORT_R@
+REPLACE_RANDOM_R = @REPLACE_RANDOM_R@
+REPLACE_READ = @REPLACE_READ@
+REPLACE_READLINK = @REPLACE_READLINK@
+REPLACE_READLINKAT = @REPLACE_READLINKAT@
+REPLACE_REALLOC = @REPLACE_REALLOC@
+REPLACE_REALPATH = @REPLACE_REALPATH@
+REPLACE_RMDIR = @REPLACE_RMDIR@
+REPLACE_SETENV = @REPLACE_SETENV@
+REPLACE_SETLOCALE = @REPLACE_SETLOCALE@
+REPLACE_SLEEP = @REPLACE_SLEEP@
+REPLACE_STAT = @REPLACE_STAT@
+REPLACE_STRFTIME = @REPLACE_STRFTIME@
+REPLACE_STRTOD = @REPLACE_STRTOD@
+REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@
+REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@
+REPLACE_SYMLINK = @REPLACE_SYMLINK@
+REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@
+REPLACE_TIMEGM = @REPLACE_TIMEGM@
+REPLACE_TOWLOWER = @REPLACE_TOWLOWER@
+REPLACE_TRUNCATE = @REPLACE_TRUNCATE@
+REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@
+REPLACE_TZSET = @REPLACE_TZSET@
+REPLACE_UNLINK = @REPLACE_UNLINK@
+REPLACE_UNLINKAT = @REPLACE_UNLINKAT@
+REPLACE_UNSETENV = @REPLACE_UNSETENV@
+REPLACE_USLEEP = @REPLACE_USLEEP@
+REPLACE_UTIMENSAT = @REPLACE_UTIMENSAT@
+REPLACE_WCRTOMB = @REPLACE_WCRTOMB@
+REPLACE_WCSFTIME = @REPLACE_WCSFTIME@
+REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@
+REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@
+REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@
+REPLACE_WCTOB = @REPLACE_WCTOB@
+REPLACE_WCTOMB = @REPLACE_WCTOMB@
+REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
+REPLACE_WRITE = @REPLACE_WRITE@
+SED = @SED@
+SERVERLIB_AGE = @SERVERLIB_AGE@
+SERVERLIB_CURRENT = @SERVERLIB_CURRENT@
+SERVERLIB_REVISION = @SERVERLIB_REVISION@
+SERVERLIB_VERSION = @SERVERLIB_VERSION@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@
+SIZE_T_SUFFIX = @SIZE_T_SUFFIX@
+STDBOOL_H = @STDBOOL_H@
+STDDEF_H = @STDDEF_H@
+STDINT_H = @STDINT_H@
+STRIP = @STRIP@
+SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@
+TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@
+UNISTD_H_DEFINES_STRUCT_TIMESPEC = @UNISTD_H_DEFINES_STRUCT_TIMESPEC@
+UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@
+UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@
+UUID_LIBS = @UUID_LIBS@
+VERSION = @VERSION@
+WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
+WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@
+WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@
+WINDOWS_STAT_INODES = @WINDOWS_STAT_INODES@
+WINDOWS_STAT_TIMESPEC = @WINDOWS_STAT_TIMESPEC@
+WINT_T_SUFFIX = @WINT_T_SUFFIX@
+XML2_CFLAGS = @XML2_CFLAGS@
+XML2_LIBS = @XML2_LIBS@
+YACC = @YACC@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_word_order = @ac_word_order@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+curlprivatelibs = @curlprivatelibs@
+curlprivatereq = @curlprivatereq@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gl_LIBOBJS = @gl_LIBOBJS@
+gl_LTLIBOBJS = @gl_LTLIBOBJS@
+gltests_LIBOBJS = @gltests_LIBOBJS@
+gltests_LTLIBOBJS = @gltests_LTLIBOBJS@
+gltests_WITNESS = @gltests_WITNESS@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+lispdir = @lispdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+runstatedir = @runstatedir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+xmlprivatelibs = @xmlprivatelibs@
+xmlprivatereq = @xmlprivatereq@
+SUBDIRS = cache-testsuite
+
+# Tests
+AUTOMAKE_OPTIONS = foreign
+
+# Headers in 'tests' are used by the arrayT unit tests.
+AM_CPPFLAGS = -I$(top_srcdir)/GNU -I$(top_srcdir) \
+	-I$(top_srcdir)/tests $(CURL_CFLAGS) $(XML2_CFLAGS) \
+	$(am__append_2)
+AM_LDADD = $(XML2_LIBS) $(am__append_3)
+AM_CXXFLAGS = $(am__append_1) $(am__append_4)
+CXXFLAGS_DEBUG = -g3 -O0 -Wall -Wcast-align
+@USE_VALGRIND_TRUE@TESTS_ENVIRONMENT = valgrind --quiet --trace-children=yes --error-exitcode=1 \
+@USE_VALGRIND_TRUE@--leak-check=yes --dsymutil=yes --suppressions=valgrind_suppressions.txt
+
+noinst_HEADERS = test_config.h
+DIRS_EXTRA = das-testsuite dds-testsuite ddx-testsuite \
+rcreader-testsuite server-testsuite cgi-util-tests D4-xml \
+chunked-io D4-marshaller D4-type-testsuite
+
+EXTRA_DIST = $(DIRS_EXTRA) testFile.cc testFile.h test_config.h.in \
+valgrind_suppressions.txt
+
+CLEANFILES = testout .dodsrc  *.gcda *.gcno *.gcov *.trs *.log *.file D4-xml.tar.gz
+DISTCLEANFILES = test_config.h *.strm *.file tmp.txt
+@CPPUNIT_FALSE@UNIT_TESTS = 
+
+############################################################################
+# Unit Tests
+#
+@CPPUNIT_TRUE@UNIT_TESTS = marshT arrayT attrTableT structT sequenceT \
+@CPPUNIT_TRUE@	ddsT dasT RegexTest ArrayTest AttrTableTest \
+@CPPUNIT_TRUE@	ByteTest MIMEUtilTest ancT DASTest DDSTest \
+@CPPUNIT_TRUE@	DDXParserTest generalUtilTest HTTPConnectTest \
+@CPPUNIT_TRUE@	parserUtilTest RCReaderTest SequenceTest \
+@CPPUNIT_TRUE@	SignalHandlerTest MarshallerTest HTTPCacheTest \
+@CPPUNIT_TRUE@	ServerFunctionsListUnitTest $(am__append_5)
+TEST_SRC = testFile.cc testFile.h
+RegexTest_SOURCES = RegexTest.cc
+RegexTest_LDADD = ../libdap.la $(AM_LDADD)
+ArrayTest_SOURCES = ArrayTest.cc
+ArrayTest_LDADD = ../libdap.la $(AM_LDADD)
+AttrTableTest_SOURCES = AttrTableTest.cc $(TEST_SRC)
+AttrTableTest_LDADD = ../libdap.la $(AM_LDADD)
+ByteTest_SOURCES = ByteTest.cc $(TEST_SRC)
+ByteTest_LDADD = ../libdap.la $(AM_LDADD)
+MIMEUtilTest_SOURCES = MIMEUtilTest.cc
+MIMEUtilTest_LDADD = ../libdap.la $(AM_LDADD)
+ancT_SOURCES = ancT.cc
+ancT_LDADD = ../libdapserver.la ../libdap.la $(AM_LDADD)
+DASTest_SOURCES = DASTest.cc
+DASTest_LDADD = ../libdap.la $(AM_LDADD)
+DDSTest_SOURCES = DDSTest.cc $(TEST_SRC)
+DDSTest_LDADD = ../libdap.la $(AM_LDADD)
+DDXParserTest_SOURCES = DDXParserTest.cc
+DDXParserTest_CPPFLAGS = $(AM_CPPFLAGS) $(XML2_CFLAGS)
+DDXParserTest_LDADD = ../libdap.la $(AM_LDADD)
+
+# DODSFilterTest_SOURCES = DODSFilterTest.cc $(TEST_SRC)
+# DODSFilterTest_LDADD = ../libdapserver.la ../libdap.la \
+#	../tests/libtest-types.a $(AM_LDADD)
+
+# ResponseBuilderTest_SOURCES = ResponseBuilderTest.cc $(TEST_SRC)
+# ResponseBuilderTest_LDADD = ../libdapserver.la ../libdap.la \
+#	../tests/libtest-types.a $(AM_LDADD)
+
+# Keywords2Test_SOURCES = Keywords2Test.cc
+# Keywords2Test_LDADD = ../libdap.la $(AM_LDADD)
+generalUtilTest_SOURCES = generalUtilTest.cc
+generalUtilTest_LDADD = ../libdap.la $(AM_LDADD)
+HTTPCacheTest_SOURCES = HTTPCacheTest.cc
+HTTPCacheTest_CPPFLAGS = $(AM_CPPFLAGS) $(CURL_CFLAGS)
+HTTPCacheTest_LDADD = ../libdapclient.la ../libdap.la $(AM_LDADD)
+HTTPConnectTest_SOURCES = HTTPConnectTest.cc
+HTTPConnectTest_CPPFLAGS = $(AM_CPPFLAGS) $(CURL_CFLAGS)
+HTTPConnectTest_LDADD = ../libdapclient.la ../libdap.la $(AM_LDADD)
+parserUtilTest_SOURCES = parserUtilTest.cc
+parserUtilTest_LDADD = ../libdap.la $(AM_LDADD)
+RCReaderTest_SOURCES = RCReaderTest.cc
+RCReaderTest_LDADD = ../libdapclient.la ../libdap.la $(AM_LDADD)
+SequenceTest_SOURCES = SequenceTest.cc
+SequenceTest_LDADD = ../tests/libtest-types.a ../libdap.la $(AM_LDADD)
+SignalHandlerTest_SOURCES = SignalHandlerTest.cc
+SignalHandlerTest_LDADD = ../libdap.la $(AM_LDADD)
+arrayT_SOURCES = arrayT.cc
+arrayT_LDADD = ../tests/libtest-types.a ../libdap.la $(AM_LDADD)
+MarshallerTest_SOURCES = MarshallerTest.cc
+MarshallerTest_LDADD = ../tests/libtest-types.a ../libdapclient.la ../libdap.la $(AM_LDADD)
+marshT_SOURCES = marshT.cc
+marshT_LDADD = ../tests/libtest-types.a ../libdap.la $(AM_LDADD)
+attrTableT_SOURCES = attrTableT.cc
+attrTableT_LDADD = ../tests/libtest-types.a  ../libdap.la $(AM_LDADD)
+structT_SOURCES = structT.cc
+structT_LDADD = ../tests/libtest-types.a ../libdap.la $(AM_LDADD)
+sequenceT_SOURCES = sequenceT.cc
+sequenceT_LDADD = ../tests/libtest-types.a ../libdap.la $(AM_LDADD)
+ddsT_SOURCES = ddsT.cc $(TEST_SRC)
+ddsT_LDADD = ../tests/libtest-types.a ../libdap.la $(AM_LDADD)
+dasT_SOURCES = dasT.cc $(TEST_SRC)
+dasT_LDADD = ../tests/libtest-types.a ../libdap.la $(AM_LDADD)
+ServerFunctionsListUnitTest_SOURCES = ServerFunctionsListUnitTest.cc
+ServerFunctionsListUnitTest_LDADD = ../libdap.la $(AM_LDADD)
+
+# ResponseCacheTest_SOURCES = ResponseCacheTest.cc
+# ResponseCacheTest_LDADD = ../tests/libtest-types.a ../libdapserver.la ../libdap.la $(AM_LDADD)
+@DAP4_DEFINED_TRUE@D4MarshallerTest_SOURCES = D4MarshallerTest.cc
+@DAP4_DEFINED_TRUE@D4MarshallerTest_LDADD = ../libdap.la $(AM_LDADD)
+@DAP4_DEFINED_TRUE@D4UnMarshallerTest_SOURCES = D4UnMarshallerTest.cc
+@DAP4_DEFINED_TRUE@D4UnMarshallerTest_LDADD = ../libdap.la $(AM_LDADD)
+@DAP4_DEFINED_TRUE@D4DimensionsTest_SOURCES = D4DimensionsTest.cc $(TEST_SRC)
+@DAP4_DEFINED_TRUE@D4DimensionsTest_LDADD = ../libdap.la $(AM_LDADD)
+@DAP4_DEFINED_TRUE@D4EnumDefsTest_SOURCES = D4EnumDefsTest.cc $(TEST_SRC)
+@DAP4_DEFINED_TRUE@D4EnumDefsTest_LDADD = ../libdap.la $(AM_LDADD)
+@DAP4_DEFINED_TRUE@D4GroupTest_SOURCES = D4GroupTest.cc $(TEST_SRC)
+@DAP4_DEFINED_TRUE@D4GroupTest_LDADD = ../libdap.la $(AM_LDADD)
+@DAP4_DEFINED_TRUE@D4ParserSax2Test_SOURCES = D4ParserSax2Test.cc $(TEST_SRC)
+@DAP4_DEFINED_TRUE@D4ParserSax2Test_LDADD = ../libdap.la $(AM_LDADD)
+@DAP4_DEFINED_TRUE@D4AttributesTest_SOURCES = D4AttributesTest.cc $(TEST_SRC)
+@DAP4_DEFINED_TRUE@D4AttributesTest_LDADD = ../libdap.la $(AM_LDADD)
+@DAP4_DEFINED_TRUE@D4EnumTest_SOURCES = D4EnumTest.cc $(TEST_SRC)
+@DAP4_DEFINED_TRUE@D4EnumTest_LDADD = ../libdap.la $(AM_LDADD)
+@DAP4_DEFINED_TRUE@chunked_iostream_test_SOURCES = chunked_iostream_test.cc $(TEST_SRC)
+@DAP4_DEFINED_TRUE@chunked_iostream_test_LDADD = ../libdap.la $(AM_LDADD)
+@DAP4_DEFINED_TRUE@D4AsyncDocTest_SOURCES = D4AsyncDocTest.cc $(TEST_SRC)
+@DAP4_DEFINED_TRUE@D4AsyncDocTest_LDADD = ../libdap.la $(AM_LDADD)
+@DAP4_DEFINED_TRUE@DMRTest_SOURCES = DMRTest.cc $(TEST_SRC)
+@DAP4_DEFINED_TRUE@DMRTest_LDADD = ../libdap.la $(AM_LDADD)
+@DAP4_DEFINED_TRUE@DmrRoundTripTest_SOURCES = DmrRoundTripTest.cc $(TEST_SRC)
+@DAP4_DEFINED_TRUE@DmrRoundTripTest_LDADD = ../libdap.la $(AM_LDADD)
+@DAP4_DEFINED_TRUE@DmrToDap2Test_SOURCES = DmrToDap2Test.cc $(TEST_SRC)
+@DAP4_DEFINED_TRUE@DmrToDap2Test_LDADD = ../libdap.la $(AM_LDADD)
+@DAP4_DEFINED_TRUE@D4FilterClauseTest_SOURCES = D4FilterClauseTest.cc
+@DAP4_DEFINED_TRUE@D4FilterClauseTest_LDADD = ../libdap.la $(AM_LDADD)
+@DAP4_DEFINED_TRUE@D4SequenceTest_SOURCES = D4SequenceTest.cc $(TEST_SRC)
+@DAP4_DEFINED_TRUE@D4SequenceTest_LDADD = ../tests/libtest-types.a ../libdap.la $(AM_LDADD)
+all: all-recursive
+
+.SUFFIXES:
+.SUFFIXES: .cc .lo .log .o .obj .test .test$(EXEEXT) .trs
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign unit-tests/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign unit-tests/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-checkPROGRAMS:
+	@list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
+
+ArrayTest$(EXEEXT): $(ArrayTest_OBJECTS) $(ArrayTest_DEPENDENCIES) $(EXTRA_ArrayTest_DEPENDENCIES) 
+	@rm -f ArrayTest$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(ArrayTest_OBJECTS) $(ArrayTest_LDADD) $(LIBS)
+
+AttrTableTest$(EXEEXT): $(AttrTableTest_OBJECTS) $(AttrTableTest_DEPENDENCIES) $(EXTRA_AttrTableTest_DEPENDENCIES) 
+	@rm -f AttrTableTest$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(AttrTableTest_OBJECTS) $(AttrTableTest_LDADD) $(LIBS)
+
+ByteTest$(EXEEXT): $(ByteTest_OBJECTS) $(ByteTest_DEPENDENCIES) $(EXTRA_ByteTest_DEPENDENCIES) 
+	@rm -f ByteTest$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(ByteTest_OBJECTS) $(ByteTest_LDADD) $(LIBS)
+
+D4AsyncDocTest$(EXEEXT): $(D4AsyncDocTest_OBJECTS) $(D4AsyncDocTest_DEPENDENCIES) $(EXTRA_D4AsyncDocTest_DEPENDENCIES) 
+	@rm -f D4AsyncDocTest$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(D4AsyncDocTest_OBJECTS) $(D4AsyncDocTest_LDADD) $(LIBS)
+
+D4AttributesTest$(EXEEXT): $(D4AttributesTest_OBJECTS) $(D4AttributesTest_DEPENDENCIES) $(EXTRA_D4AttributesTest_DEPENDENCIES) 
+	@rm -f D4AttributesTest$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(D4AttributesTest_OBJECTS) $(D4AttributesTest_LDADD) $(LIBS)
+
+D4DimensionsTest$(EXEEXT): $(D4DimensionsTest_OBJECTS) $(D4DimensionsTest_DEPENDENCIES) $(EXTRA_D4DimensionsTest_DEPENDENCIES) 
+	@rm -f D4DimensionsTest$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(D4DimensionsTest_OBJECTS) $(D4DimensionsTest_LDADD) $(LIBS)
+
+D4EnumDefsTest$(EXEEXT): $(D4EnumDefsTest_OBJECTS) $(D4EnumDefsTest_DEPENDENCIES) $(EXTRA_D4EnumDefsTest_DEPENDENCIES) 
+	@rm -f D4EnumDefsTest$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(D4EnumDefsTest_OBJECTS) $(D4EnumDefsTest_LDADD) $(LIBS)
+
+D4EnumTest$(EXEEXT): $(D4EnumTest_OBJECTS) $(D4EnumTest_DEPENDENCIES) $(EXTRA_D4EnumTest_DEPENDENCIES) 
+	@rm -f D4EnumTest$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(D4EnumTest_OBJECTS) $(D4EnumTest_LDADD) $(LIBS)
+
+D4FilterClauseTest$(EXEEXT): $(D4FilterClauseTest_OBJECTS) $(D4FilterClauseTest_DEPENDENCIES) $(EXTRA_D4FilterClauseTest_DEPENDENCIES) 
+	@rm -f D4FilterClauseTest$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(D4FilterClauseTest_OBJECTS) $(D4FilterClauseTest_LDADD) $(LIBS)
+
+D4GroupTest$(EXEEXT): $(D4GroupTest_OBJECTS) $(D4GroupTest_DEPENDENCIES) $(EXTRA_D4GroupTest_DEPENDENCIES) 
+	@rm -f D4GroupTest$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(D4GroupTest_OBJECTS) $(D4GroupTest_LDADD) $(LIBS)
+
+D4MarshallerTest$(EXEEXT): $(D4MarshallerTest_OBJECTS) $(D4MarshallerTest_DEPENDENCIES) $(EXTRA_D4MarshallerTest_DEPENDENCIES) 
+	@rm -f D4MarshallerTest$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(D4MarshallerTest_OBJECTS) $(D4MarshallerTest_LDADD) $(LIBS)
+
+D4ParserSax2Test$(EXEEXT): $(D4ParserSax2Test_OBJECTS) $(D4ParserSax2Test_DEPENDENCIES) $(EXTRA_D4ParserSax2Test_DEPENDENCIES) 
+	@rm -f D4ParserSax2Test$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(D4ParserSax2Test_OBJECTS) $(D4ParserSax2Test_LDADD) $(LIBS)
+
+D4SequenceTest$(EXEEXT): $(D4SequenceTest_OBJECTS) $(D4SequenceTest_DEPENDENCIES) $(EXTRA_D4SequenceTest_DEPENDENCIES) 
+	@rm -f D4SequenceTest$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(D4SequenceTest_OBJECTS) $(D4SequenceTest_LDADD) $(LIBS)
+
+D4UnMarshallerTest$(EXEEXT): $(D4UnMarshallerTest_OBJECTS) $(D4UnMarshallerTest_DEPENDENCIES) $(EXTRA_D4UnMarshallerTest_DEPENDENCIES) 
+	@rm -f D4UnMarshallerTest$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(D4UnMarshallerTest_OBJECTS) $(D4UnMarshallerTest_LDADD) $(LIBS)
+
+DASTest$(EXEEXT): $(DASTest_OBJECTS) $(DASTest_DEPENDENCIES) $(EXTRA_DASTest_DEPENDENCIES) 
+	@rm -f DASTest$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(DASTest_OBJECTS) $(DASTest_LDADD) $(LIBS)
+
+DDSTest$(EXEEXT): $(DDSTest_OBJECTS) $(DDSTest_DEPENDENCIES) $(EXTRA_DDSTest_DEPENDENCIES) 
+	@rm -f DDSTest$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(DDSTest_OBJECTS) $(DDSTest_LDADD) $(LIBS)
+
+DDXParserTest$(EXEEXT): $(DDXParserTest_OBJECTS) $(DDXParserTest_DEPENDENCIES) $(EXTRA_DDXParserTest_DEPENDENCIES) 
+	@rm -f DDXParserTest$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(DDXParserTest_OBJECTS) $(DDXParserTest_LDADD) $(LIBS)
+
+DMRTest$(EXEEXT): $(DMRTest_OBJECTS) $(DMRTest_DEPENDENCIES) $(EXTRA_DMRTest_DEPENDENCIES) 
+	@rm -f DMRTest$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(DMRTest_OBJECTS) $(DMRTest_LDADD) $(LIBS)
+
+DmrRoundTripTest$(EXEEXT): $(DmrRoundTripTest_OBJECTS) $(DmrRoundTripTest_DEPENDENCIES) $(EXTRA_DmrRoundTripTest_DEPENDENCIES) 
+	@rm -f DmrRoundTripTest$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(DmrRoundTripTest_OBJECTS) $(DmrRoundTripTest_LDADD) $(LIBS)
+
+DmrToDap2Test$(EXEEXT): $(DmrToDap2Test_OBJECTS) $(DmrToDap2Test_DEPENDENCIES) $(EXTRA_DmrToDap2Test_DEPENDENCIES) 
+	@rm -f DmrToDap2Test$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(DmrToDap2Test_OBJECTS) $(DmrToDap2Test_LDADD) $(LIBS)
+
+HTTPCacheTest$(EXEEXT): $(HTTPCacheTest_OBJECTS) $(HTTPCacheTest_DEPENDENCIES) $(EXTRA_HTTPCacheTest_DEPENDENCIES) 
+	@rm -f HTTPCacheTest$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(HTTPCacheTest_OBJECTS) $(HTTPCacheTest_LDADD) $(LIBS)
+
+HTTPConnectTest$(EXEEXT): $(HTTPConnectTest_OBJECTS) $(HTTPConnectTest_DEPENDENCIES) $(EXTRA_HTTPConnectTest_DEPENDENCIES) 
+	@rm -f HTTPConnectTest$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(HTTPConnectTest_OBJECTS) $(HTTPConnectTest_LDADD) $(LIBS)
+
+MIMEUtilTest$(EXEEXT): $(MIMEUtilTest_OBJECTS) $(MIMEUtilTest_DEPENDENCIES) $(EXTRA_MIMEUtilTest_DEPENDENCIES) 
+	@rm -f MIMEUtilTest$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(MIMEUtilTest_OBJECTS) $(MIMEUtilTest_LDADD) $(LIBS)
+
+MarshallerTest$(EXEEXT): $(MarshallerTest_OBJECTS) $(MarshallerTest_DEPENDENCIES) $(EXTRA_MarshallerTest_DEPENDENCIES) 
+	@rm -f MarshallerTest$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(MarshallerTest_OBJECTS) $(MarshallerTest_LDADD) $(LIBS)
+
+RCReaderTest$(EXEEXT): $(RCReaderTest_OBJECTS) $(RCReaderTest_DEPENDENCIES) $(EXTRA_RCReaderTest_DEPENDENCIES) 
+	@rm -f RCReaderTest$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(RCReaderTest_OBJECTS) $(RCReaderTest_LDADD) $(LIBS)
+
+RegexTest$(EXEEXT): $(RegexTest_OBJECTS) $(RegexTest_DEPENDENCIES) $(EXTRA_RegexTest_DEPENDENCIES) 
+	@rm -f RegexTest$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(RegexTest_OBJECTS) $(RegexTest_LDADD) $(LIBS)
+
+SequenceTest$(EXEEXT): $(SequenceTest_OBJECTS) $(SequenceTest_DEPENDENCIES) $(EXTRA_SequenceTest_DEPENDENCIES) 
+	@rm -f SequenceTest$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(SequenceTest_OBJECTS) $(SequenceTest_LDADD) $(LIBS)
+
+ServerFunctionsListUnitTest$(EXEEXT): $(ServerFunctionsListUnitTest_OBJECTS) $(ServerFunctionsListUnitTest_DEPENDENCIES) $(EXTRA_ServerFunctionsListUnitTest_DEPENDENCIES) 
+	@rm -f ServerFunctionsListUnitTest$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(ServerFunctionsListUnitTest_OBJECTS) $(ServerFunctionsListUnitTest_LDADD) $(LIBS)
+
+SignalHandlerTest$(EXEEXT): $(SignalHandlerTest_OBJECTS) $(SignalHandlerTest_DEPENDENCIES) $(EXTRA_SignalHandlerTest_DEPENDENCIES) 
+	@rm -f SignalHandlerTest$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(SignalHandlerTest_OBJECTS) $(SignalHandlerTest_LDADD) $(LIBS)
+
+ancT$(EXEEXT): $(ancT_OBJECTS) $(ancT_DEPENDENCIES) $(EXTRA_ancT_DEPENDENCIES) 
+	@rm -f ancT$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(ancT_OBJECTS) $(ancT_LDADD) $(LIBS)
+
+arrayT$(EXEEXT): $(arrayT_OBJECTS) $(arrayT_DEPENDENCIES) $(EXTRA_arrayT_DEPENDENCIES) 
+	@rm -f arrayT$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(arrayT_OBJECTS) $(arrayT_LDADD) $(LIBS)
+
+attrTableT$(EXEEXT): $(attrTableT_OBJECTS) $(attrTableT_DEPENDENCIES) $(EXTRA_attrTableT_DEPENDENCIES) 
+	@rm -f attrTableT$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(attrTableT_OBJECTS) $(attrTableT_LDADD) $(LIBS)
+
+chunked_iostream_test$(EXEEXT): $(chunked_iostream_test_OBJECTS) $(chunked_iostream_test_DEPENDENCIES) $(EXTRA_chunked_iostream_test_DEPENDENCIES) 
+	@rm -f chunked_iostream_test$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(chunked_iostream_test_OBJECTS) $(chunked_iostream_test_LDADD) $(LIBS)
+
+dasT$(EXEEXT): $(dasT_OBJECTS) $(dasT_DEPENDENCIES) $(EXTRA_dasT_DEPENDENCIES) 
+	@rm -f dasT$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(dasT_OBJECTS) $(dasT_LDADD) $(LIBS)
+
+ddsT$(EXEEXT): $(ddsT_OBJECTS) $(ddsT_DEPENDENCIES) $(EXTRA_ddsT_DEPENDENCIES) 
+	@rm -f ddsT$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(ddsT_OBJECTS) $(ddsT_LDADD) $(LIBS)
+
+generalUtilTest$(EXEEXT): $(generalUtilTest_OBJECTS) $(generalUtilTest_DEPENDENCIES) $(EXTRA_generalUtilTest_DEPENDENCIES) 
+	@rm -f generalUtilTest$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(generalUtilTest_OBJECTS) $(generalUtilTest_LDADD) $(LIBS)
+
+marshT$(EXEEXT): $(marshT_OBJECTS) $(marshT_DEPENDENCIES) $(EXTRA_marshT_DEPENDENCIES) 
+	@rm -f marshT$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(marshT_OBJECTS) $(marshT_LDADD) $(LIBS)
+
+parserUtilTest$(EXEEXT): $(parserUtilTest_OBJECTS) $(parserUtilTest_DEPENDENCIES) $(EXTRA_parserUtilTest_DEPENDENCIES) 
+	@rm -f parserUtilTest$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(parserUtilTest_OBJECTS) $(parserUtilTest_LDADD) $(LIBS)
+
+sequenceT$(EXEEXT): $(sequenceT_OBJECTS) $(sequenceT_DEPENDENCIES) $(EXTRA_sequenceT_DEPENDENCIES) 
+	@rm -f sequenceT$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(sequenceT_OBJECTS) $(sequenceT_LDADD) $(LIBS)
+
+structT$(EXEEXT): $(structT_OBJECTS) $(structT_DEPENDENCIES) $(EXTRA_structT_DEPENDENCIES) 
+	@rm -f structT$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(structT_OBJECTS) $(structT_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ArrayTest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AttrTableTest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ByteTest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/D4AsyncDocTest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/D4AttributesTest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/D4DimensionsTest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/D4EnumDefsTest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/D4EnumTest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/D4FilterClauseTest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/D4GroupTest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/D4MarshallerTest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/D4ParserSax2Test.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/D4SequenceTest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/D4UnMarshallerTest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DASTest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DDSTest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DDXParserTest-DDXParserTest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DMRTest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DmrRoundTripTest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DmrToDap2Test.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/HTTPCacheTest-HTTPCacheTest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/HTTPConnectTest-HTTPConnectTest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MIMEUtilTest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MarshallerTest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RCReaderTest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RegexTest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SequenceTest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ServerFunctionsListUnitTest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SignalHandlerTest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ancT.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/arrayT.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/attrTableT.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chunked_iostream_test.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dasT.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddsT.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/generalUtilTest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/marshT.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parserUtilTest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sequenceT.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/structT.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testFile.Po@am__quote@
+
+.cc.o:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
+
+.cc.obj:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cc.lo:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
+
+DDXParserTest-DDXParserTest.o: DDXParserTest.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(DDXParserTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT DDXParserTest-DDXParserTest.o -MD -MP -MF $(DEPDIR)/DDXParserTest-DDXParserTest.Tpo -c -o DDXParserTest-DDXParserTest.o `test -f 'DDXParserTest.cc' || echo '$(srcdir)/'`DDXParserTest.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/DDXParserTest-DDXParserTest.Tpo $(DEPDIR)/DDXParserTest-DDXParserTest.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='DDXParserTest.cc' object='DDXParserTest-DDXParserTest.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(DDXParserTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o DDXParserTest-DDXParserTest.o `test -f 'DDXParserTest.cc' || echo '$(srcdir)/'`DDXParserTest.cc
+
+DDXParserTest-DDXParserTest.obj: DDXParserTest.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(DDXParserTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT DDXParserTest-DDXParserTest.obj -MD -MP -MF $(DEPDIR)/DDXParserTest-DDXParserTest.Tpo -c -o DDXParserTest-DDXParserTest.obj `if test -f 'DDXParserTest.cc'; then $(CYGPATH_W) 'DDXParserTest.cc'; else $(CYGPATH_W) '$(srcdir)/DDXParserTest.cc'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/DDXParserTest-DDXParserTest.Tpo $(DEPDIR)/DDXParserTest-DDXParserTest.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='DDXParserTest.cc' object='DDXParserTest-DDXParserTest.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(DDXParserTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o DDXParserTest-DDXParserTest.obj `if test -f 'DDXParserTest.cc'; then $(CYGPATH_W) 'DDXParserTest.cc'; else $(CYGPATH_W) '$(srcdir)/DDXParserTest.cc'; fi`
+
+HTTPCacheTest-HTTPCacheTest.o: HTTPCacheTest.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(HTTPCacheTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT HTTPCacheTest-HTTPCacheTest.o -MD -MP -MF $(DEPDIR)/HTTPCacheTest-HTTPCacheTest.Tpo -c -o HTTPCacheTest-HTTPCacheTest.o `test -f 'HTTPCacheTest.cc' || echo '$(srcdir)/'`HTTPCacheTest.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/HTTPCacheTest-HTTPCacheTest.Tpo $(DEPDIR)/HTTPCacheTest-HTTPCacheTest.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='HTTPCacheTest.cc' object='HTTPCacheTest-HTTPCacheTest.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(HTTPCacheTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o HTTPCacheTest-HTTPCacheTest.o `test -f 'HTTPCacheTest.cc' || echo '$(srcdir)/'`HTTPCacheTest.cc
+
+HTTPCacheTest-HTTPCacheTest.obj: HTTPCacheTest.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(HTTPCacheTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT HTTPCacheTest-HTTPCacheTest.obj -MD -MP -MF $(DEPDIR)/HTTPCacheTest-HTTPCacheTest.Tpo -c -o HTTPCacheTest-HTTPCacheTest.obj `if test -f 'HTTPCacheTest.cc'; then $(CYGPATH_W) 'HTTPCacheTest.cc'; else $(CYGPATH_W) '$(srcdir)/HTTPCacheTest.cc'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/HTTPCacheTest-HTTPCacheTest.Tpo $(DEPDIR)/HTTPCacheTest-HTTPCacheTest.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='HTTPCacheTest.cc' object='HTTPCacheTest-HTTPCacheTest.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(HTTPCacheTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o HTTPCacheTest-HTTPCacheTest.obj `if test -f 'HTTPCacheTest.cc'; then $(CYGPATH_W) 'HTTPCacheTest.cc'; else $(CYGPATH_W) '$(srcdir)/HTTPCacheTest.cc'; fi`
+
+HTTPConnectTest-HTTPConnectTest.o: HTTPConnectTest.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(HTTPConnectTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT HTTPConnectTest-HTTPConnectTest.o -MD -MP -MF $(DEPDIR)/HTTPConnectTest-HTTPConnectTest.Tpo -c -o HTTPConnectTest-HTTPConnectTest.o `test -f 'HTTPConnectTest.cc' || echo '$(srcdir)/'`HTTPConnectTest.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/HTTPConnectTest-HTTPConnectTest.Tpo $(DEPDIR)/HTTPConnectTest-HTTPConnectTest.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='HTTPConnectTest.cc' object='HTTPConnectTest-HTTPConnectTest.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(HTTPConnectTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o HTTPConnectTest-HTTPConnectTest.o `test -f 'HTTPConnectTest.cc' || echo '$(srcdir)/'`HTTPConnectTest.cc
+
+HTTPConnectTest-HTTPConnectTest.obj: HTTPConnectTest.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(HTTPConnectTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT HTTPConnectTest-HTTPConnectTest.obj -MD -MP -MF $(DEPDIR)/HTTPConnectTest-HTTPConnectTest.Tpo -c -o HTTPConnectTest-HTTPConnectTest.obj `if test -f 'HTTPConnectTest.cc'; then $(CYGPATH_W) 'HTTPConnectTest.cc'; else $(CYGPATH_W) '$(srcdir)/HTTPConnectTest.cc'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/HTTPConnectTest-HTTPConnectTest.Tpo $(DEPDIR)/HTTPConnectTest-HTTPConnectTest.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='HTTPConnectTest.cc' object='HTTPConnectTest-HTTPConnectTest.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(HTTPConnectTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o HTTPConnectTest-HTTPConnectTest.obj `if test -f 'HTTPConnectTest.cc'; then $(CYGPATH_W) 'HTTPConnectTest.cc'; else $(CYGPATH_W) '$(srcdir)/HTTPConnectTest.cc'; fi`
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+# Recover from deleted '.trs' file; this should ensure that
+# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
+# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
+# to avoid problems with "make -n".
+.log.trs:
+	rm -f $< $@
+	$(MAKE) $(AM_MAKEFLAGS) $<
+
+# Leading 'am--fnord' is there to ensure the list of targets does not
+# expand to empty, as could happen e.g. with make check TESTS=''.
+am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
+am--force-recheck:
+	@:
+
+$(TEST_SUITE_LOG): $(TEST_LOGS)
+	@$(am__set_TESTS_bases); \
+	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
+	redo_bases=`for i in $$bases; do \
+	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
+	            done`; \
+	if test -n "$$redo_bases"; then \
+	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
+	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
+	  if $(am__make_dryrun); then :; else \
+	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
+	  fi; \
+	fi; \
+	if test -n "$$am__remaking_logs"; then \
+	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
+	       "recursion detected" >&2; \
+	else \
+	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
+	fi; \
+	if $(am__make_dryrun); then :; else \
+	  st=0;  \
+	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
+	  for i in $$redo_bases; do \
+	    test -f $$i.trs && test -r $$i.trs \
+	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
+	    test -f $$i.log && test -r $$i.log \
+	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
+	  done; \
+	  test $$st -eq 0 || exit 1; \
+	fi
+	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
+	ws='[ 	]'; \
+	results=`for b in $$bases; do echo $$b.trs; done`; \
+	test -n "$$results" || results=/dev/null; \
+	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
+	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
+	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
+	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
+	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
+	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
+	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
+	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
+	  success=true; \
+	else \
+	  success=false; \
+	fi; \
+	br='==================='; br=$$br$$br$$br$$br; \
+	result_count () \
+	{ \
+	    if test x"$$1" = x"--maybe-color"; then \
+	      maybe_colorize=yes; \
+	    elif test x"$$1" = x"--no-color"; then \
+	      maybe_colorize=no; \
+	    else \
+	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
+	    fi; \
+	    shift; \
+	    desc=$$1 count=$$2; \
+	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
+	      color_start=$$3 color_end=$$std; \
+	    else \
+	      color_start= color_end=; \
+	    fi; \
+	    echo "$${color_start}# $$desc $$count$${color_end}"; \
+	}; \
+	create_testsuite_report () \
+	{ \
+	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
+	  result_count $$1 "PASS: " $$pass  "$$grn"; \
+	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
+	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
+	  result_count $$1 "FAIL: " $$fail  "$$red"; \
+	  result_count $$1 "XPASS:" $$xpass "$$red"; \
+	  result_count $$1 "ERROR:" $$error "$$mgn"; \
+	}; \
+	{								\
+	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
+	    $(am__rst_title);						\
+	  create_testsuite_report --no-color;				\
+	  echo;								\
+	  echo ".. contents:: :depth: 2";				\
+	  echo;								\
+	  for b in $$bases; do echo $$b; done				\
+	    | $(am__create_global_log);					\
+	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
+	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
+	if $$success; then						\
+	  col="$$grn";							\
+	 else								\
+	  col="$$red";							\
+	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
+	fi;								\
+	echo "$${col}$$br$${std}"; 					\
+	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
+	echo "$${col}$$br$${std}"; 					\
+	create_testsuite_report --maybe-color;				\
+	echo "$$col$$br$$std";						\
+	if $$success; then :; else					\
+	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
+	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
+	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
+	  fi;								\
+	  echo "$$col$$br$$std";					\
+	fi;								\
+	$$success || exit 1
+
+check-TESTS:
+	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
+	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	trs_list=`for i in $$bases; do echo $$i.trs; done`; \
+	log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
+	exit $$?;
+recheck: all $(check_PROGRAMS)
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	bases=`for i in $$bases; do echo $$i; done \
+	         | $(am__list_recheck_tests)` || exit 1; \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	log_list=`echo $$log_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
+	        am__force_recheck=am--force-recheck \
+	        TEST_LOGS="$$log_list"; \
+	exit $$?
+marshT.log: marshT$(EXEEXT)
+	@p='marshT$(EXEEXT)'; \
+	b='marshT'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+arrayT.log: arrayT$(EXEEXT)
+	@p='arrayT$(EXEEXT)'; \
+	b='arrayT'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+attrTableT.log: attrTableT$(EXEEXT)
+	@p='attrTableT$(EXEEXT)'; \
+	b='attrTableT'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+structT.log: structT$(EXEEXT)
+	@p='structT$(EXEEXT)'; \
+	b='structT'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+sequenceT.log: sequenceT$(EXEEXT)
+	@p='sequenceT$(EXEEXT)'; \
+	b='sequenceT'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+ddsT.log: ddsT$(EXEEXT)
+	@p='ddsT$(EXEEXT)'; \
+	b='ddsT'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+dasT.log: dasT$(EXEEXT)
+	@p='dasT$(EXEEXT)'; \
+	b='dasT'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+RegexTest.log: RegexTest$(EXEEXT)
+	@p='RegexTest$(EXEEXT)'; \
+	b='RegexTest'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+ArrayTest.log: ArrayTest$(EXEEXT)
+	@p='ArrayTest$(EXEEXT)'; \
+	b='ArrayTest'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+AttrTableTest.log: AttrTableTest$(EXEEXT)
+	@p='AttrTableTest$(EXEEXT)'; \
+	b='AttrTableTest'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+ByteTest.log: ByteTest$(EXEEXT)
+	@p='ByteTest$(EXEEXT)'; \
+	b='ByteTest'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+MIMEUtilTest.log: MIMEUtilTest$(EXEEXT)
+	@p='MIMEUtilTest$(EXEEXT)'; \
+	b='MIMEUtilTest'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+ancT.log: ancT$(EXEEXT)
+	@p='ancT$(EXEEXT)'; \
+	b='ancT'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+DASTest.log: DASTest$(EXEEXT)
+	@p='DASTest$(EXEEXT)'; \
+	b='DASTest'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+DDSTest.log: DDSTest$(EXEEXT)
+	@p='DDSTest$(EXEEXT)'; \
+	b='DDSTest'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+DDXParserTest.log: DDXParserTest$(EXEEXT)
+	@p='DDXParserTest$(EXEEXT)'; \
+	b='DDXParserTest'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+generalUtilTest.log: generalUtilTest$(EXEEXT)
+	@p='generalUtilTest$(EXEEXT)'; \
+	b='generalUtilTest'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+HTTPConnectTest.log: HTTPConnectTest$(EXEEXT)
+	@p='HTTPConnectTest$(EXEEXT)'; \
+	b='HTTPConnectTest'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+parserUtilTest.log: parserUtilTest$(EXEEXT)
+	@p='parserUtilTest$(EXEEXT)'; \
+	b='parserUtilTest'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+RCReaderTest.log: RCReaderTest$(EXEEXT)
+	@p='RCReaderTest$(EXEEXT)'; \
+	b='RCReaderTest'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+SequenceTest.log: SequenceTest$(EXEEXT)
+	@p='SequenceTest$(EXEEXT)'; \
+	b='SequenceTest'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+SignalHandlerTest.log: SignalHandlerTest$(EXEEXT)
+	@p='SignalHandlerTest$(EXEEXT)'; \
+	b='SignalHandlerTest'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+MarshallerTest.log: MarshallerTest$(EXEEXT)
+	@p='MarshallerTest$(EXEEXT)'; \
+	b='MarshallerTest'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+HTTPCacheTest.log: HTTPCacheTest$(EXEEXT)
+	@p='HTTPCacheTest$(EXEEXT)'; \
+	b='HTTPCacheTest'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+ServerFunctionsListUnitTest.log: ServerFunctionsListUnitTest$(EXEEXT)
+	@p='ServerFunctionsListUnitTest$(EXEEXT)'; \
+	b='ServerFunctionsListUnitTest'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+D4MarshallerTest.log: D4MarshallerTest$(EXEEXT)
+	@p='D4MarshallerTest$(EXEEXT)'; \
+	b='D4MarshallerTest'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+D4UnMarshallerTest.log: D4UnMarshallerTest$(EXEEXT)
+	@p='D4UnMarshallerTest$(EXEEXT)'; \
+	b='D4UnMarshallerTest'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+D4DimensionsTest.log: D4DimensionsTest$(EXEEXT)
+	@p='D4DimensionsTest$(EXEEXT)'; \
+	b='D4DimensionsTest'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+D4EnumDefsTest.log: D4EnumDefsTest$(EXEEXT)
+	@p='D4EnumDefsTest$(EXEEXT)'; \
+	b='D4EnumDefsTest'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+D4GroupTest.log: D4GroupTest$(EXEEXT)
+	@p='D4GroupTest$(EXEEXT)'; \
+	b='D4GroupTest'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+D4ParserSax2Test.log: D4ParserSax2Test$(EXEEXT)
+	@p='D4ParserSax2Test$(EXEEXT)'; \
+	b='D4ParserSax2Test'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+D4AttributesTest.log: D4AttributesTest$(EXEEXT)
+	@p='D4AttributesTest$(EXEEXT)'; \
+	b='D4AttributesTest'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+D4EnumTest.log: D4EnumTest$(EXEEXT)
+	@p='D4EnumTest$(EXEEXT)'; \
+	b='D4EnumTest'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+chunked_iostream_test.log: chunked_iostream_test$(EXEEXT)
+	@p='chunked_iostream_test$(EXEEXT)'; \
+	b='chunked_iostream_test'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+D4AsyncDocTest.log: D4AsyncDocTest$(EXEEXT)
+	@p='D4AsyncDocTest$(EXEEXT)'; \
+	b='D4AsyncDocTest'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+DMRTest.log: DMRTest$(EXEEXT)
+	@p='DMRTest$(EXEEXT)'; \
+	b='DMRTest'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+D4FilterClauseTest.log: D4FilterClauseTest$(EXEEXT)
+	@p='D4FilterClauseTest$(EXEEXT)'; \
+	b='D4FilterClauseTest'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+D4SequenceTest.log: D4SequenceTest$(EXEEXT)
+	@p='D4SequenceTest$(EXEEXT)'; \
+	b='D4SequenceTest'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+DmrRoundTripTest.log: DmrRoundTripTest$(EXEEXT)
+	@p='DmrRoundTripTest$(EXEEXT)'; \
+	b='DmrRoundTripTest'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+DmrToDap2Test.log: DmrToDap2Test$(EXEEXT)
+	@p='DmrToDap2Test$(EXEEXT)'; \
+	b='DmrToDap2Test'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+.test.log:
+	@p='$<'; \
+	$(am__set_b); \
+	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+@am__EXEEXT_TRUE@.test$(EXEEXT).log:
+@am__EXEEXT_TRUE@	@p='$<'; \
+@am__EXEEXT_TRUE@	$(am__set_b); \
+@am__EXEEXT_TRUE@	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
+@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+@CPPUNIT_TRUE@check-local:
+check-am: all-am
+	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
+	$(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local
+check: check-recursive
+all-am: Makefile $(HEADERS)
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
+	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
+	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-checkPROGRAMS clean-generic clean-libtool \
+	mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(am__recursive_targets) check-am install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-TESTS check-am check-local clean clean-checkPROGRAMS \
+	clean-generic clean-libtool cscopelist-am ctags ctags-am \
+	distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	recheck tags tags-am uninstall uninstall-am
+
+
+test_config.h: test_config.h.in Makefile
+	sed -e "s%[@]abs_srcdir[@]%${abs_srcdir}%" $< > test_config.h
+
+D4-xml.tar.gz: D4-xml/DMR_*[0-9].xml
+	tar -czf $@ $^
+
+@CPPUNIT_FALSE@check-local:
+@CPPUNIT_FALSE@	@echo ""
+@CPPUNIT_FALSE@	@echo "**********************************************************"
+@CPPUNIT_FALSE@	@echo "You must have cppunit 1.12.x or greater installed to run *"
+@CPPUNIT_FALSE@	@echo "check target in unit-tests directory                     *"
+@CPPUNIT_FALSE@	@echo "**********************************************************"
+@CPPUNIT_FALSE@	@echo ""
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/unit-tests/MarshallerTest.cc b/unit-tests/MarshallerTest.cc
new file mode 100644
index 0000000..d2f42da
--- /dev/null
+++ b/unit-tests/MarshallerTest.cc
@@ -0,0 +1,1667 @@
+#include <cppunit/TestFixture.h>
+#include <cppunit/TestAssert.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+#include <cppunit/ui/text/TestRunner.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/CompilerOutputter.h>
+
+#include "config.h"
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <fcntl.h>
+#include <pthread.h>
+
+// #define DODS_DEBUG 1
+
+#include <iostream>
+#include <fstream>
+#include <cstring>
+
+#include "TestByte.h"
+#include "TestInt16.h"
+#include "TestInt32.h"
+#include "TestUInt16.h"
+#include "TestUInt32.h"
+#include "TestFloat32.h"
+#include "TestFloat64.h"
+#include "TestStr.h"
+#include "TestUrl.h"
+#include "TestArray.h"
+#include "TestStructure.h"
+#include "TestGrid.h"
+#include "TestSequence.h"
+
+#include "DataDDS.h"
+#include "ConstraintEvaluator.h"
+#include "TestTypeFactory.h"
+#include "XDRFileMarshaller.h"
+#include "XDRStreamMarshaller.h"
+#include "XDRFileUnMarshaller.h"
+#include "XDRStreamUnMarshaller.h"
+#include "GetOpt.h"
+//#include "Locker.h"
+#include "debug.h"
+
+int test_variable_sleep_interval = 0; // Used in Test* classes for testing timeouts.
+
+static bool debug = false;
+
+#undef DBG
+#define DBG(x) do { if (debug) {x;} } while(false)
+
+using namespace CppUnit;
+using namespace std;
+
+namespace libdap {
+
+class MarshallerTest: public CppUnit::TestFixture {
+
+    CPPUNIT_TEST_SUITE (MarshallerTest);
+
+    CPPUNIT_TEST (simple_types_file_serialize_test);
+
+    CPPUNIT_TEST (array_file_serialize_test);
+    CPPUNIT_TEST (structure_file_serialize_test);
+    CPPUNIT_TEST (grid_file_serialize_test);
+    CPPUNIT_TEST (sequence_file_serialize_test);
+
+    CPPUNIT_TEST (simple_types_file_deserialize_test);
+    CPPUNIT_TEST (array_file_deserialize_test);
+    CPPUNIT_TEST (structure_file_deserialize_test);
+    CPPUNIT_TEST (grid_file_deserialize_test);
+    CPPUNIT_TEST (sequence_file_deserialize_test);
+
+    CPPUNIT_TEST (simple_types_stream_serialize_test);
+    CPPUNIT_TEST (array_stream_serialize_test);
+    CPPUNIT_TEST (array_stream_deserialize_test);
+
+    CPPUNIT_TEST (array_stream_serialize_test_2);
+    CPPUNIT_TEST (array_stream_serialize_test_3);
+    CPPUNIT_TEST (array_stream_serialize_test_4);
+
+    CPPUNIT_TEST (array_f32_stream_serialize_test);
+    CPPUNIT_TEST (array_f32_stream_deserialize_test);
+    CPPUNIT_TEST (array_f32_stream_serialize_test_2);
+
+    CPPUNIT_TEST (array_f64_stream_serialize_test);
+    CPPUNIT_TEST (array_f64_stream_deserialize_test);
+    CPPUNIT_TEST (array_f64_stream_serialize_test_2);
+
+    CPPUNIT_TEST (structure_stream_serialize_test);
+    CPPUNIT_TEST (grid_stream_serialize_test);
+    CPPUNIT_TEST (sequence_stream_serialize_test);
+
+    CPPUNIT_TEST (simple_types_stream_deserialize_test);
+    CPPUNIT_TEST (structure_stream_deserialize_test);
+    CPPUNIT_TEST (grid_stream_deserialize_test);
+    CPPUNIT_TEST (sequence_stream_deserialize_test);
+
+    CPPUNIT_TEST (array_stream_put_vector_thread_test);
+    CPPUNIT_TEST (array_stream_put_vector_thread_test_2);
+    CPPUNIT_TEST (array_stream_put_vector_thread_test_3);
+
+    CPPUNIT_TEST (array_stream_put_vector_thread_test_4);
+    CPPUNIT_TEST (array_stream_put_vector_thread_test_5);
+
+#if 1
+    CPPUNIT_TEST (array_stream_serialize_part_thread_test);
+    CPPUNIT_TEST (array_stream_serialize_part_thread_test_2);
+    CPPUNIT_TEST (array_stream_serialize_part_thread_test_3);
+#endif
+
+    CPPUNIT_TEST_SUITE_END( );
+
+    TestByte *b;
+    TestInt16 *i16;
+    TestInt32 *i32;
+    TestUInt16 *ui16;
+    TestUInt32 *ui32;
+    TestFloat32 *f32;
+    TestFloat64 *f64;
+    TestStr *str;
+    TestUrl *url;
+
+    vector<dods_byte> db;
+    TestByte *ab;
+    TestArray *arr;
+
+    vector<dods_float32> d_f32;
+    TestFloat32 *a_f32;
+    TestArray *arr_f32;
+
+    vector<dods_float64> d_f64;
+    TestFloat64 *a_f64;
+    TestArray *arr_f64;
+
+    TestStructure *s;
+
+    ConstraintEvaluator eval;
+    TestTypeFactory ttf;
+    DataDDS dds;
+
+    string str_value, str2_value;
+    string url_value;
+
+public:
+    MarshallerTest() :
+        b(0), i16(0), i32(0), ui16(0), ui32(0), f32(0), f64(0), str(0), url(0), ab(0), arr(0), a_f32(0), arr_f32(0), a_f64(
+            0), arr_f64(0), s(0), dds(&ttf, "dds")
+    {
+        url_value = "http://dcz.gso.uri.edu/avhrr-archive/archive.html";
+    }
+
+    void setUp()
+    {
+        b = new TestByte("byte");
+        b->read();
+
+        i16 = new TestInt16("i16");
+        i16->read();
+
+        i32 = new TestInt32("i32");
+        i32->read();
+
+        ui16 = new TestUInt16("ui16");
+        ui16->read();
+
+        ui32 = new TestUInt32("ui32");
+        ui32->read();
+
+        f32 = new TestFloat32("f32");
+        f32->read();
+
+        f64 = new TestFloat64("f64");
+        f64->read();
+
+        str = new TestStr("str");
+        str->read();
+
+        url = new TestUrl("url");
+        url->read();
+
+        // Array of Byte
+        ab = new TestByte("ab");
+        ab->read();
+        arr = new TestArray("arr", ab);
+        arr->append_dim(5, "dim1");
+        arr->append_dim(3, "dim2");
+        arr->read();
+        arr->set_read_p(true);
+
+        db.resize(arr->length());
+        for (int i = 0; i < arr->length(); ++i)
+            db[i] = 126;
+        arr->value(&db[0]);
+
+        // Array of Float32
+        a_f32 = new TestFloat32("a_f32");
+        a_f32->read();
+        arr_f32 = new TestArray("arr_f32", a_f32);
+        arr_f32->append_dim(5, "dim1");
+        arr_f32->append_dim(3, "dim2");
+        arr_f32->read();
+        arr_f32->set_read_p(true);
+
+        d_f32.resize(arr->length());
+        for (int i = 0; i < arr->length(); ++i)
+            d_f32[i] = 126.126;
+        arr_f32->value(&d_f32[0]);
+
+        // Array of Float64
+        a_f64 = new TestFloat64("a_f64");
+        a_f64->read();
+        arr_f64 = new TestArray("arr_f64", a_f64);
+        arr_f64->append_dim(5, "dim1");
+        arr_f64->append_dim(3, "dim2");
+        arr_f64->read();
+        arr_f64->set_read_p(true);
+
+        d_f64.resize(arr->length());
+        for (int i = 0; i < arr->length(); ++i)
+            d_f64[i] = 1260.0126;
+        arr_f64->value(&d_f64[0]);
+
+        s = new TestStructure("s");
+        s->add_var(i32);
+        s->add_var(str);
+        s->add_var(arr);
+        s->set_send_p(true);
+    }
+
+    void tearDown()
+    {
+        delete b;
+        b = 0;
+        delete i16;
+        i16 = 0;
+        delete i32;
+        i32 = 0;
+        delete ui16;
+        ui16 = 0;
+        delete ui32;
+        ui32 = 0;
+        delete f32;
+        f32 = 0;
+        delete f64;
+        f64 = 0;
+        delete str;
+        str = 0;
+        delete url;
+        url = 0;
+
+        delete ab;
+        ab = 0;
+        delete arr;
+        arr = 0;
+        delete a_f32;
+        ab = 0;
+        delete arr_f32;
+        arr_f32 = 0;
+        delete a_f64;
+        ab = 0;
+        delete arr_f64;
+        arr_f64 = 0;
+
+        delete s;
+        s = 0;
+    }
+
+    void simple_types_file_serialize_test()
+    {
+        try {
+            FILE *f = fopen("st_test.file", "w");
+            XDRFileMarshaller fm(f);
+
+            b->serialize(eval, dds, fm, false);
+            i16->serialize(eval, dds, fm, false);
+            i32->serialize(eval, dds, fm, false);
+            ui16->serialize(eval, dds, fm, false);
+            ui32->serialize(eval, dds, fm, false);
+            f32->serialize(eval, dds, fm, false);
+            f64->serialize(eval, dds, fm, false);
+            str->serialize(eval, dds, fm, false);
+            url->serialize(eval, dds, fm, false);
+        }
+        catch (Error &e) {
+            string err = "failed:" + e.get_error_message();
+            CPPUNIT_FAIL(err.c_str());
+        }
+    }
+
+    void simple_types_file_deserialize_test()
+    {
+        try {
+            FILE *ff = fopen("st_test.file", "r");
+            XDRFileUnMarshaller um(ff);
+
+            Byte fb("fb");
+            fb.deserialize(um, &dds, false);
+            CPPUNIT_ASSERT(fb.value() == b->value());
+
+            Int16 fi16("i16");
+            fi16.deserialize(um, &dds, false);
+            CPPUNIT_ASSERT(fi16.value() == i16->value());
+
+            Int32 fi32("i32");
+            fi32.deserialize(um, &dds, false);
+            CPPUNIT_ASSERT(fi32.value() == i32->value());
+
+            UInt16 fui16("ui16");
+            fui16.deserialize(um, &dds, false);
+            CPPUNIT_ASSERT(fui16.value() == ui16->value());
+
+            UInt32 fui32("ui32");
+            fui32.deserialize(um, &dds, false);
+            CPPUNIT_ASSERT(fui32.value() == ui32->value());
+
+            Float32 ff32("f32");
+            ff32.deserialize(um, &dds, false);
+            CPPUNIT_ASSERT(ff32.value() == f32->value());
+
+            Float64 ff64("f64");
+            ff64.deserialize(um, &dds, false);
+            CPPUNIT_ASSERT(ff64.value() == f64->value());
+
+            Str fstr("str");
+            fstr.deserialize(um, &dds, false);
+            // Test for the string value like this because the digit after
+            // the colon changes each time the read() method is called.
+            CPPUNIT_ASSERT(fstr.value().find("Silly test string:") != string::npos);
+
+            Url furl("url");
+            furl.deserialize(um, &dds, false);
+            CPPUNIT_ASSERT(furl.value() == url_value);
+        }
+        catch (Error &e) {
+            string err = "failed:" + e.get_error_message();
+            CPPUNIT_FAIL(err.c_str());
+        }
+    }
+
+    void array_file_serialize_test()
+    {
+        try {
+            FILE *f = fopen("a_test.file", "w");
+            XDRFileMarshaller fm(f);
+
+            arr->serialize(eval, dds, fm, false);
+        }
+        catch (Error &e) {
+            string err = "failed:" + e.get_error_message();
+            CPPUNIT_FAIL(err.c_str());
+        }
+    }
+
+    void array_file_deserialize_test()
+    {
+        try {
+            FILE *ff = fopen("a_test.file", "r");
+            XDRFileUnMarshaller um(ff);
+
+            TestByte fab("ab");
+            TestArray farr("arr", &fab);
+            farr.append_dim(5, "dim1");
+            farr.append_dim(3, "dim2");
+            farr.deserialize(um, &dds, false);
+
+            CPPUNIT_ASSERT(farr.length() == arr->length());
+
+            dods_byte fdb[farr.length() * sizeof(dods_byte)];
+            farr.value(fdb);
+            CPPUNIT_ASSERT(!memcmp((void *) fdb, (void *) &db[0], farr.length() * sizeof(dods_byte)));
+        }
+        catch (Error &e) {
+            string err = "failed:" + e.get_error_message();
+            CPPUNIT_FAIL(err.c_str());
+        }
+    }
+
+    void structure_file_serialize_test()
+    {
+        try {
+            FILE *f = fopen("struct_test.file", "w");
+            XDRFileMarshaller fm(f);
+
+            s->serialize(eval, dds, fm, false);
+        }
+        catch (Error &e) {
+            string err = "failed:" + e.get_error_message();
+            CPPUNIT_FAIL(err.c_str());
+        }
+    }
+
+    void structure_file_deserialize_test()
+    {
+        try {
+            FILE *ff = fopen("struct_test.file", "r");
+            XDRFileUnMarshaller um(ff);
+
+            TestStructure fs("fs");
+
+            TestInt32 fsi32("fsi32");
+            fs.add_var(&fsi32);
+
+            TestStr fsstr("fsstr");
+            fs.add_var(&fsstr);
+
+            TestByte fsab("fsab");
+            TestArray fsarr("fsarr", &fsab);
+            fsarr.append_dim(5, "dim1");
+            fsarr.append_dim(3, "dim2");
+            fs.add_var(&fsarr);
+
+            fs.deserialize(um, &dds, false);
+
+            Int32 *fsi32_p = dynamic_cast<Int32 *>(fs.var("fsi32"));
+            CPPUNIT_ASSERT(fsi32_p);
+            CPPUNIT_ASSERT(fsi32_p->value() == i32->value());
+
+            Str *fsstr_p = dynamic_cast<Str *>(fs.var("fsstr"));
+            CPPUNIT_ASSERT(fsstr_p);
+            DBG2(cerr << "fsstr_p->value(): " << fsstr_p->value() << endl);
+            CPPUNIT_ASSERT(fsstr_p->value().find("Silly test string:") != string::npos);
+
+            BaseType *bt = fs.var("fsab");
+            CPPUNIT_ASSERT(bt);
+            Array *fsarr_p = dynamic_cast<Array *>(bt);
+            CPPUNIT_ASSERT(fsarr_p);
+            dods_byte fdb[fsarr_p->length() * sizeof(dods_byte)];
+            fsarr_p->value(fdb);
+
+            CPPUNIT_ASSERT(fsarr_p->length() == arr->length());
+            CPPUNIT_ASSERT(!memcmp((void *) fdb, (void *) &db[0], fsarr_p->length() * sizeof(dods_byte)));
+        }
+        catch (Error &e) {
+            string err = "failed:" + e.get_error_message();
+            CPPUNIT_FAIL(err.c_str());
+        }
+    }
+
+    void grid_file_serialize_test()
+    {
+        try {
+            FILE *f = fopen("g_test.file", "w");
+            XDRFileMarshaller fm(f);
+
+            TestGrid tg("grid1");
+            TestArray arr2("arr2", ab);
+            arr2.append_dim(5, "dim1");
+            arr2.append_dim(3, "dim2");
+            tg.add_var(&arr2, array);
+
+            TestArray map1("map1", f32);
+            map1.append_dim(5, "dim1");
+            tg.add_var(&map1, maps);
+
+            TestArray map2("map2", f32);
+            map2.append_dim(3, "dim2");
+            tg.add_var(&map2, maps);
+
+            tg.set_send_p(true);
+            tg.read();
+            tg.set_read_p(true);
+
+            tg.serialize(eval, dds, fm, false);
+        }
+        catch (Error &e) {
+            string err = "failed:" + e.get_error_message();
+            CPPUNIT_FAIL(err.c_str());
+        }
+    }
+
+    void grid_file_deserialize_test()
+    {
+        try {
+            FILE *ff = fopen("g_test.file", "r");
+            XDRFileUnMarshaller um(ff);
+
+            TestGrid tg("grid1");
+            TestArray arr2("arr2", ab);
+            arr2.append_dim(5, "dim1");
+            arr2.append_dim(3, "dim2");
+            tg.add_var(&arr2, array);
+
+            TestArray map1("map1", f32);
+            map1.append_dim(5, "dim1");
+            tg.add_var(&map1, maps);
+
+            TestArray map2("map2", f32);
+            map2.append_dim(3, "dim2");
+            tg.add_var(&map2, maps);
+
+            tg.deserialize(um, &dds, false);
+
+            // Check the values in the array
+            CPPUNIT_ASSERT(tg.get_array()->length() == arr->length());
+
+            dods_byte fdb[tg.get_array()->length() * sizeof(dods_byte)];
+            tg.get_array()->value(fdb);
+            CPPUNIT_ASSERT(!memcmp((void *) fdb, (void *) &db[0], tg.get_array()->length() * sizeof(dods_byte)));
+
+            // Should test the map values here, but skip that for now...
+        }
+        catch (Error &e) {
+            string err = "failed:" + e.get_error_message();
+            CPPUNIT_FAIL(err.c_str());
+        }
+    }
+
+    void sequence_file_serialize_test()
+    {
+        try {
+            FILE *f = fopen("seq_test.file", "w");
+            XDRFileMarshaller fm(f);
+
+            TestSequence seq("seq");
+            seq.add_var(f64);
+            seq.add_var(arr);
+
+            TestSequence seq2("seq2");
+            seq2.add_var(ui16);
+            seq2.add_var(url);
+
+            seq.add_var(&seq2);
+
+            seq.set_send_p(true);
+            seq.set_leaf_sequence();
+
+            seq.serialize(eval, dds, fm, false);
+        }
+        catch (Error &e) {
+            string err = "failed:" + e.get_error_message();
+            CPPUNIT_FAIL(err.c_str());
+        }
+    }
+
+    void sequence_file_deserialize_test()
+    {
+        try {
+            FILE *ff = fopen("seq_test.file", "r");
+            XDRFileUnMarshaller um(ff);
+
+            dods_byte fdb[arr->length() * sizeof(dods_byte)];
+
+            TestSequence seq("seq");
+            seq.add_var(f64);
+            seq.add_var(arr);
+
+            TestSequence seq2("seq2");
+            seq2.add_var(ui16);
+            seq2.add_var(url);
+            seq2.set_send_p(true);
+            seq.add_var(&seq2);
+            seq.set_leaf_sequence();
+
+            seq.deserialize(um, &dds, false);
+            unsigned int num_rows = seq.number_of_rows();
+            CPPUNIT_ASSERT(num_rows == 4);
+            for (unsigned int i = 0; i < num_rows; i++) {
+                BaseTypeRow *row = seq.row_value(i);
+                CPPUNIT_ASSERT(row);
+                CPPUNIT_ASSERT(row->size() == 3);
+                Float64 *f64_p = dynamic_cast<Float64 *>((*row)[0]);
+                CPPUNIT_ASSERT(f64_p);
+                CPPUNIT_ASSERT(f64_p->value() == f64->value());
+
+                Array *arr_p = dynamic_cast<Array *>((*row)[1]);
+                CPPUNIT_ASSERT(arr_p);
+                arr_p->value(fdb);
+                CPPUNIT_ASSERT(arr_p->length() == arr->length());
+                CPPUNIT_ASSERT(!memcmp((void *) fdb, (void *) &db[0], arr_p->length() * sizeof(dods_byte)));
+                Sequence *seq_p = dynamic_cast<Sequence *>((*row)[2]);
+                CPPUNIT_ASSERT(seq_p);
+                unsigned int num_rows_sub = seq_p->number_of_rows();
+                CPPUNIT_ASSERT(num_rows == 4);
+                for (unsigned int j = 0; j < num_rows_sub; j++) {
+                    BaseTypeRow *row_sub = seq_p->row_value(j);
+                    CPPUNIT_ASSERT(row_sub);
+                    CPPUNIT_ASSERT(row_sub->size() == 2);
+                    UInt16 *ui16_p = dynamic_cast<UInt16 *>((*row_sub)[0]);
+                    CPPUNIT_ASSERT(ui16_p);
+                    CPPUNIT_ASSERT(ui16_p->value() == ui16->value());
+                    Url *url_p = dynamic_cast<Url *>((*row_sub)[1]);
+                    CPPUNIT_ASSERT(url_p);
+                    CPPUNIT_ASSERT(url_p->value() == url->value());
+                }
+            }
+        }
+        catch (Error &e) {
+            string err = "failed:" + e.get_error_message();
+            CPPUNIT_FAIL(err.c_str());
+        }
+    }
+
+    // Stream tests from here on
+
+    void simple_types_stream_serialize_test()
+    {
+        try {
+            ofstream strm("st_test.strm", ios::out | ios::trunc);
+            XDRStreamMarshaller sm(strm);
+
+            b->serialize(eval, dds, sm, false);
+
+            i16->serialize(eval, dds, sm, false);
+
+            i32->serialize(eval, dds, sm, false);
+
+            ui16->serialize(eval, dds, sm, false);
+
+            ui32->serialize(eval, dds, sm, false);
+
+            f32->serialize(eval, dds, sm, false);
+
+            f64->serialize(eval, dds, sm, false);
+
+            str->serialize(eval, dds, sm, false);
+
+            url->serialize(eval, dds, sm, false);
+        }
+        catch (Error &e) {
+            string err = "failed:" + e.get_error_message();
+            CPPUNIT_FAIL(err.c_str());
+        }
+    }
+
+    void simple_types_stream_deserialize_test()
+    {
+        try {
+#if 0
+            ifstream strm( "st_test.strm", ios::in );
+            XDRStreamUnMarshaller um( strm );
+#else
+            FILE *sf = fopen("st_test.strm", "r");
+            XDRFileUnMarshaller um(sf);
+#endif
+            Byte fb("fb");
+            fb.deserialize(um, &dds, false);
+            CPPUNIT_ASSERT(fb.value() == b->value());
+
+            Int16 fi16("i16");
+            fi16.deserialize(um, &dds, false);
+            CPPUNIT_ASSERT(fi16.value() == i16->value());
+
+            Int32 fi32("i32");
+            fi32.deserialize(um, &dds, false);
+            CPPUNIT_ASSERT(fi32.value() == i32->value());
+
+            UInt16 fui16("ui16");
+            fui16.deserialize(um, &dds, false);
+            CPPUNIT_ASSERT(fui16.value() == ui16->value());
+
+            UInt32 fui32("ui32");
+            fui32.deserialize(um, &dds, false);
+            CPPUNIT_ASSERT(fui32.value() == ui32->value());
+
+            Float32 ff32("f32");
+            ff32.deserialize(um, &dds, false);
+            CPPUNIT_ASSERT(ff32.value() == f32->value());
+
+            Float64 ff64("f64");
+            ff64.deserialize(um, &dds, false);
+            CPPUNIT_ASSERT(ff64.value() == f64->value());
+
+            Str fstr("str");
+            fstr.deserialize(um, &dds, false);
+            DBG(cerr << "fstr.value(): " << fstr.value() << endl);
+            CPPUNIT_ASSERT(fstr.value().find("Silly test string:") != string::npos);
+
+            Url furl("url");
+            furl.deserialize(um, &dds, false);
+            CPPUNIT_ASSERT(furl.value() == url_value);
+        }
+        catch (Error &e) {
+            string err = "failed:" + e.get_error_message();
+            CPPUNIT_FAIL(err.c_str());
+        }
+    }
+
+    void array_stream_serialize_test()
+    {
+        try {
+            ofstream strm("a_test.strm", ios::out | ios::trunc);
+            XDRStreamMarshaller sm(strm);
+
+            arr->serialize(eval, dds, sm, false);
+        }
+        catch (Error &e) {
+            string err = "failed:" + e.get_error_message();
+            CPPUNIT_FAIL(err.c_str());
+        }
+    }
+
+    void array_stream_deserialize_test()
+    {
+        try {
+#if 0
+            ifstream strm( "a_test.strm", ios::in );
+            XDRStreamUnMarshaller um( strm );
+#else
+            FILE *sf = fopen("a_test.strm", "r");
+            XDRFileUnMarshaller um(sf);
+#endif
+            TestByte fab("ab");
+            TestArray farr("arr", &fab);
+            farr.append_dim(5, "dim1");
+            farr.append_dim(3, "dim2");
+            farr.deserialize(um, &dds, false);
+
+            CPPUNIT_ASSERT(farr.length() == arr->length());
+
+            dods_byte fdb[arr->length() * sizeof(dods_byte)];
+            farr.value(fdb);
+            CPPUNIT_ASSERT(!memcmp((void *) fdb, (void *) &db[0], farr.length() * sizeof(dods_byte)));
+        }
+        catch (Error &e) {
+            string err = "failed:" + e.get_error_message();
+            CPPUNIT_FAIL(err.c_str());
+        }
+    }
+
+    // This version of array_file_serialize_test tests the new code in Vector and
+    // Marshaller that enables an Array's serialization to be split over two or more calls.
+    void array_stream_serialize_test_2()
+    {
+        try {
+            fstream f("a_test_2.file", fstream::out);
+            XDRStreamMarshaller fm(f);
+
+            DBG(cerr << "arr->length(): " << arr->length() << endl);
+            fm.put_vector_start(arr->length());
+
+            DBG(cerr << "arr->var()->width(): " << arr->var()->width() << endl);
+
+            switch (arr->var()->type()) {
+            case dods_byte_c:
+            case dods_int16_c:
+            case dods_uint16_c:
+            case dods_int32_c:
+            case dods_uint32_c:
+            case dods_float32_c:
+            case dods_float64_c:
+                fm.put_vector_part(arr->get_buf(), arr->length(), arr->var()->width(), arr->var()->type());
+                fm.put_vector_end();
+                break;
+
+            default:
+                throw InternalErr(__FILE__, __LINE__, "Implemented for numeric simple types only");
+            }
+        }
+        catch (Error &e) {
+            string err = "failed:" + e.get_error_message();
+            CPPUNIT_FAIL(err.c_str());
+        }
+
+        // now test the file contents to see if the correct stuff was serialized.
+        // Given that this test runs after the first array serialize test, just
+        // use system("cmp ...").
+        //int status = system("cmp a_test.file a_test_2.file >/dev/null 2>&1");
+        CPPUNIT_ASSERT(0 == system("cmp a_test.file a_test_2.file >/dev/null 2>&1"));
+    }
+
+    void array_stream_serialize_test_3()
+    {
+        try {
+            fstream f("a_test_3.file", fstream::out);
+            XDRStreamMarshaller fm(f);
+
+            DBG(cerr << "arr->length(): " << arr->length() << endl);
+            fm.put_vector_start(arr->length());
+
+            DBG(cerr << "arr->var()->width(): " << arr->var()->width() << endl);
+
+            const int size_of_first_part = 4;
+            switch (arr->var()->type()) {
+            case dods_byte_c:
+            case dods_int16_c:
+            case dods_uint16_c:
+            case dods_int32_c:
+            case dods_uint32_c:
+            case dods_float32_c:
+            case dods_float64_c:
+                fm.put_vector_part(arr->get_buf(), size_of_first_part, arr->var()->width(), arr->var()->type());
+                fm.put_vector_part(arr->get_buf() + size_of_first_part, arr->length() - size_of_first_part,
+                    arr->var()->width(), arr->var()->type());
+                fm.put_vector_end();
+                break;
+
+            default:
+                throw InternalErr(__FILE__, __LINE__, "Implemented for numeric simple types only");
+            }
+        }
+        catch (Error &e) {
+            string err = "failed:" + e.get_error_message();
+            CPPUNIT_FAIL(err.c_str());
+        }
+
+        // now test the file contents to see if the correct stuff was serialized.
+        // Given that this test runs after the first array serialize test, just
+        // use system("cmp ...").
+        //int status = system("cmp a_test.file a_test_2.file >/dev/null 2>&1");
+        CPPUNIT_ASSERT(0 == system("cmp a_test.file a_test_3.file >/dev/null 2>&1"));
+    }
+
+    void array_stream_serialize_test_4()
+    {
+        try {
+            fstream f("a_test_4.file", fstream::out);
+            XDRStreamMarshaller fm(f);
+
+            DBG(cerr << "arr->length(): " << arr->length() << endl);
+            fm.put_vector_start(arr->length());
+
+            DBG(cerr << "arr->var()->width(): " << arr->var()->width() << endl);
+
+            const int size_of_first_part = 5;
+            switch (arr->var()->type()) {
+            case dods_byte_c:
+            case dods_int16_c:
+            case dods_uint16_c:
+            case dods_int32_c:
+            case dods_uint32_c:
+            case dods_float32_c:
+            case dods_float64_c:
+                fm.put_vector_part(arr->get_buf(), size_of_first_part, arr->var()->width(), arr->var()->type());
+                fm.put_vector_part(arr->get_buf() + size_of_first_part, arr->length() - size_of_first_part,
+                    arr->var()->width(), arr->var()->type());
+                fm.put_vector_end();
+                break;
+
+            default:
+                throw InternalErr(__FILE__, __LINE__, "Implemented for numeric simple types only");
+            }
+        }
+        catch (Error &e) {
+            string err = "failed:" + e.get_error_message();
+            CPPUNIT_FAIL(err.c_str());
+        }
+
+        // now test the file contents to see if the correct stuff was serialized.
+        // Given that this test runs after the first array serialize test, just
+        // use system("cmp ...").
+        //int status = system("cmp a_test.file a_test_2.file >/dev/null 2>&1");
+        CPPUNIT_ASSERT(0 == system("cmp a_test.file a_test_4.file >/dev/null 2>&1"));
+    }
+
+    void array_f32_stream_serialize_test()
+    {
+        try {
+            ofstream strm("a_f32_test.file", ios::out | ios::trunc);
+            XDRStreamMarshaller sm(strm);
+
+            arr_f32->serialize(eval, dds, sm, false);
+        }
+        catch (Error &e) {
+            string err = "failed:" + e.get_error_message();
+            CPPUNIT_FAIL(err.c_str());
+        }
+    }
+
+    void array_f32_stream_deserialize_test()
+    {
+        try {
+#if 0
+            ifstream strm( "a_test.strm", ios::in );
+            XDRStreamUnMarshaller um( strm );
+#else
+            FILE *sf = fopen("a_f32_test.file", "r");
+            XDRFileUnMarshaller um(sf);
+#endif
+            TestFloat32 fa_f32("a_f32");
+            TestArray farr("arr_f32", &fa_f32);
+            farr.append_dim(5, "dim1");
+            farr.append_dim(3, "dim2");
+            farr.deserialize(um, &dds, false);
+
+            CPPUNIT_ASSERT(farr.length() == arr->length());
+
+            vector<dods_float32> fd_f32(arr->length());
+            farr.value(&fd_f32[0]);
+            CPPUNIT_ASSERT(!memcmp((void *) &fd_f32[0], (void *) &d_f32[0], farr.length() * sizeof(dods_float32)));
+        }
+        catch (Error &e) {
+            string err = "failed:" + e.get_error_message();
+            CPPUNIT_FAIL(err.c_str());
+        }
+    }
+
+    void array_f32_stream_serialize_test_2()
+    {
+        try {
+            fstream f("a_f32_test_2.file", fstream::out);
+            XDRStreamMarshaller fm(f);
+
+            DBG(cerr << "arr_f32->length(): " << arr_f32->length() << endl);
+            fm.put_vector_start(arr_f32->length());
+
+            DBG(cerr << "&arr_f32->get_buf(): " << hex << (void * )arr_f32->get_buf() << dec << endl);
+            DBG(cerr << "arr_f32->var()->width(): " << arr_f32->var()->width() << endl);
+
+            const int size_of_first_part = 5;
+
+            switch (arr_f32->var()->type()) {
+            case dods_byte_c:
+            case dods_int16_c:
+            case dods_uint16_c:
+            case dods_int32_c:
+            case dods_uint32_c:
+            case dods_float32_c:
+            case dods_float64_c:
+                fm.put_vector_part(arr_f32->get_buf(), size_of_first_part, arr_f32->var()->width(),
+                    arr_f32->var()->type());
+
+                // For this call, we have to pass the memory location of the rest of the array,
+                // so we do a little calculation since get_buf() returns a char *. Actual code
+                // would not need to do that.
+                fm.put_vector_part(arr_f32->get_buf() + (size_of_first_part * arr_f32->var()->width()),
+                    arr_f32->length() - size_of_first_part, arr_f32->var()->width(), arr_f32->var()->type());
+                fm.put_vector_end();
+                break;
+
+            default:
+                throw InternalErr(__FILE__, __LINE__, "Implemented for numeric simple types only");
+            }
+        }
+        catch (Error &e) {
+            string err = "failed:" + e.get_error_message();
+            CPPUNIT_FAIL(err.c_str());
+        }
+
+        // now test the file contents to see if the correct stuff was serialized.
+        // Given that this test runs after the first array serialize test, just
+        // use system("cmp ...").
+        CPPUNIT_ASSERT(0 == system("cmp a_f32_test.file a_f32_test_2.file >/dev/null 2>&1"));
+    }
+
+    void array_f64_stream_serialize_test()
+    {
+        try {
+            ofstream strm("a_f64_test.file", ios::out | ios::trunc);
+            XDRStreamMarshaller sm(strm);
+
+            arr_f64->serialize(eval, dds, sm, false);
+        }
+        catch (Error &e) {
+            string err = "failed:" + e.get_error_message();
+            CPPUNIT_FAIL(err.c_str());
+        }
+    }
+
+    void array_f64_stream_deserialize_test()
+    {
+        try {
+#if 0
+            ifstream strm( "a_test.strm", ios::in );
+            XDRStreamUnMarshaller um( strm );
+#else
+            FILE *sf = fopen("a_f64_test.file", "r");
+            XDRFileUnMarshaller um(sf);
+#endif
+            TestFloat64 fa_f64("a_f64");
+            TestArray farr("arr_f64", &fa_f64);
+            farr.append_dim(5, "dim1");
+            farr.append_dim(3, "dim2");
+            farr.deserialize(um, &dds, false);
+
+            CPPUNIT_ASSERT(farr.length() == arr->length());
+
+            vector<dods_float64> fd_f64(arr->length());
+            farr.value(&fd_f64[0]);
+            CPPUNIT_ASSERT(!memcmp((void *) &fd_f64[0], (void *) &d_f64[0], farr.length() * sizeof(dods_float64)));
+        }
+        catch (Error &e) {
+            string err = "failed:" + e.get_error_message();
+            CPPUNIT_FAIL(err.c_str());
+        }
+    }
+
+    void array_f64_stream_serialize_test_2()
+    {
+        try {
+            fstream f("a_f64_test_2.file", fstream::out);
+            XDRStreamMarshaller fm(f);
+
+            DBG(cerr << "arr_f64->length(): " << arr_f64->length() << endl);
+            fm.put_vector_start(arr_f64->length());
+
+            DBG(cerr << "&arr_f64->get_buf(): " << hex << (void * )arr_f64->get_buf() << dec << endl);
+            DBG(cerr << "arr_f64->var()->width(): " << arr_f64->var()->width() << endl);
+
+            const int size_of_first_part = 5;
+
+            switch (arr_f64->var()->type()) {
+            case dods_byte_c:
+            case dods_int16_c:
+            case dods_uint16_c:
+            case dods_int32_c:
+            case dods_uint32_c:
+            case dods_float32_c:
+            case dods_float64_c:
+                fm.put_vector_part(arr_f64->get_buf(), size_of_first_part, arr_f64->var()->width(),
+                    arr_f64->var()->type());
+
+                // For this call, we have to pass the memory location of the rest of the array,
+                // so we do a little calculation since get_buf() returns a char *. Actual code
+                // would not need to do that.
+                fm.put_vector_part(arr_f64->get_buf() + (size_of_first_part * arr_f64->var()->width()),
+                    arr_f64->length() - size_of_first_part, arr_f64->var()->width(), arr_f64->var()->type());
+                fm.put_vector_end();
+                break;
+
+            default:
+                throw InternalErr(__FILE__, __LINE__, "Implemented for numeric simple types only");
+            }
+        }
+        catch (Error &e) {
+            string err = "failed:" + e.get_error_message();
+            CPPUNIT_FAIL(err.c_str());
+        }
+
+        // now test the file contents to see if the correct stuff was serialized.
+        // Given that this test runs after the first array serialize test, just
+        // use system("cmp ...").
+        CPPUNIT_ASSERT(0 == system("cmp a_f64_test.file a_f64_test_2.file >/dev/null 2>&1"));
+    }
+
+    void structure_stream_serialize_test()
+    {
+        try {
+            ofstream strm("struct_test.strm", ios::out | ios::trunc);
+            XDRStreamMarshaller sm(strm);
+            s->serialize(eval, dds, sm, false);
+        }
+        catch (Error &e) {
+            string err = "failed:" + e.get_error_message();
+            CPPUNIT_FAIL(err.c_str());
+        }
+    }
+
+    void structure_stream_deserialize_test()
+    {
+        try {
+#if 0
+            ifstream strm( "struct_test.strm", ios::in );
+            XDRStreamUnMarshaller um( strm );
+#else
+            FILE *sf = fopen("struct_test.strm", "r");
+            XDRFileUnMarshaller um(sf);
+#endif
+            TestStructure fs("fs");
+            TestInt32 fsi32("fsi32");
+            fs.add_var(&fsi32);
+
+            TestStr fsstr("fsstr");
+            fs.add_var(&fsstr);
+
+            TestByte fsab("fsab");
+            TestArray fsarr("fsarr", &fsab);
+            fsarr.append_dim(5, "dim1");
+            fsarr.append_dim(3, "dim2");
+            fs.add_var(&fsarr);
+
+            fs.deserialize(um, &dds, false);
+
+            Int32 *fsi32_p = dynamic_cast<Int32 *>(fs.var("fsi32"));
+            CPPUNIT_ASSERT(fsi32_p);
+            CPPUNIT_ASSERT(fsi32_p->value() == i32->value());
+
+            Str *fsstr_p = dynamic_cast<Str *>(fs.var("fsstr"));
+            CPPUNIT_ASSERT(fsstr_p);
+            DBG(cerr << "fsstr_p->value(): " << fsstr_p->value() << endl);
+            CPPUNIT_ASSERT(fsstr_p->value().find("Silly test string:") != string::npos);
+
+            BaseType *bt = fs.var("fsab");
+            CPPUNIT_ASSERT(bt);
+            Array *fsarr_p = dynamic_cast<Array *>(bt);
+            CPPUNIT_ASSERT(fsarr_p);
+            CPPUNIT_ASSERT(fsarr_p->length() == arr->length());
+            dods_byte fdb[fsarr_p->length() * sizeof(dods_byte)];
+            fsarr_p->value(fdb);
+            CPPUNIT_ASSERT(!memcmp((void *) fdb, (void *) &db[0], fsarr_p->length() * sizeof(dods_byte)));
+        }
+        catch (Error &e) {
+            string err = "failed:" + e.get_error_message();
+            CPPUNIT_FAIL(err.c_str());
+        }
+    }
+
+    void grid_stream_serialize_test()
+    {
+        try {
+            ofstream strm("g_test.strm", ios::out | ios::trunc);
+            XDRStreamMarshaller sm(strm);
+
+            TestGrid tg("grid1");
+            TestArray arr2("arr2", ab);
+            arr2.append_dim(5, "dim1");
+            arr2.append_dim(3, "dim2");
+            tg.add_var(&arr2, array);
+
+            TestArray map1("map1", f32);
+            map1.append_dim(5, "dim1");
+            tg.add_var(&map1, maps);
+
+            TestArray map2("map2", f32);
+            map2.append_dim(3, "dim2");
+            tg.add_var(&map2, maps);
+
+            tg.set_send_p(true);
+            tg.read();
+            tg.set_read_p(true);
+
+            tg.serialize(eval, dds, sm, false);
+        }
+        catch (Error &e) {
+            string err = "failed:" + e.get_error_message();
+            CPPUNIT_FAIL(err.c_str());
+        }
+    }
+
+    void grid_stream_deserialize_test()
+    {
+        try {
+#if 0
+            ifstream strm( "g_test.strm", ios::in );
+            XDRStreamUnMarshaller um( strm );
+#else
+            FILE *sf = fopen("g_test.strm", "r");
+            XDRFileUnMarshaller um(sf);
+#endif
+            TestGrid tg("grid1");
+            TestArray arr2("arr2", ab);
+            arr2.append_dim(5, "dim1");
+            arr2.append_dim(3, "dim2");
+            tg.add_var(&arr2, array);
+
+            TestArray map1("map1", f32);
+            map1.append_dim(5, "dim1");
+            tg.add_var(&map1, maps);
+
+            TestArray map2("map2", f32);
+            map2.append_dim(3, "dim2");
+            tg.add_var(&map2, maps);
+
+            tg.deserialize(um, &dds, false);
+
+            // Check the values in the array
+            CPPUNIT_ASSERT(tg.get_array()->length() == arr->length());
+
+            dods_byte fdb[tg.get_array()->length() * sizeof(dods_byte)];
+            tg.get_array()->value(fdb);
+            CPPUNIT_ASSERT(!memcmp((void *) fdb, (void *) &db[0], tg.get_array()->length() * sizeof(dods_byte)));
+        }
+        catch (Error &e) {
+            string err = "failed:" + e.get_error_message();
+            CPPUNIT_FAIL(err.c_str());
+        }
+    }
+
+    void sequence_stream_serialize_test()
+    {
+        try {
+            ofstream strm("seq_test.strm", ios::out | ios::trunc);
+            XDRStreamMarshaller sm(strm);
+
+            TestSequence seq("seq");
+            seq.add_var(f64);
+            seq.add_var(arr);
+
+            TestSequence seq2("seq2");
+            seq2.add_var(ui16);
+            seq2.add_var(url);
+            seq.add_var(&seq2);
+
+            seq.set_send_p(true);
+            seq.set_leaf_sequence();
+
+            seq.serialize(eval, dds, sm, false);
+        }
+        catch (Error &e) {
+            string err = "failed:" + e.get_error_message();
+            CPPUNIT_FAIL(err.c_str());
+        }
+    }
+
+    void sequence_stream_deserialize_test()
+    {
+        try {
+#if 0
+            ifstream strm( "seq_test.strm", ios::in );
+            XDRStreamUnMarshaller um( strm );
+#else
+            FILE *sf = fopen("seq_test.strm", "r");
+            XDRFileUnMarshaller um(sf);
+#endif
+            dods_byte fdb[arr->length() * sizeof(dods_byte)];
+
+            TestSequence seq("seq");
+            seq.add_var(f64);
+            seq.add_var(arr);
+
+            TestSequence seq2("seq2");
+            seq2.add_var(ui16);
+            seq2.add_var(url);
+
+            seq.add_var(&seq2);
+
+            seq.set_leaf_sequence();
+
+            seq.deserialize(um, &dds, false);
+
+            unsigned int num_rows = seq.number_of_rows();
+            CPPUNIT_ASSERT(num_rows == 4);
+            for (unsigned int i = 0; i < num_rows; i++) {
+                BaseTypeRow *row = seq.row_value(i);
+                CPPUNIT_ASSERT(row);
+                CPPUNIT_ASSERT(row->size() == 3);
+                Float64 *f64_p = dynamic_cast<Float64 *>((*row)[0]);
+                CPPUNIT_ASSERT(f64_p);
+                CPPUNIT_ASSERT(f64_p->value() == f64->value());
+                Array *arr_p = dynamic_cast<Array *>((*row)[1]);
+                CPPUNIT_ASSERT(arr_p);
+                arr_p->value(fdb);
+                CPPUNIT_ASSERT(arr_p->length() == arr->length());
+                CPPUNIT_ASSERT(!memcmp((void *) fdb, (void *) &db[0], arr_p->length() * sizeof(dods_byte)));
+                Sequence *seq_p = dynamic_cast<Sequence *>((*row)[2]);
+                CPPUNIT_ASSERT(seq_p);
+                unsigned int num_rows_sub = seq_p->number_of_rows();
+                CPPUNIT_ASSERT(num_rows == 4);
+                for (unsigned int j = 0; j < num_rows_sub; j++) {
+                    BaseTypeRow *row_sub = seq_p->row_value(j);
+                    CPPUNIT_ASSERT(row_sub);
+                    CPPUNIT_ASSERT(row_sub->size() == 2);
+                    UInt16 *ui16_p = dynamic_cast<UInt16 *>((*row_sub)[0]);
+                    CPPUNIT_ASSERT(ui16_p);
+                    CPPUNIT_ASSERT(ui16_p->value() == ui16->value());
+                    Url *url_p = dynamic_cast<Url *>((*row_sub)[1]);
+                    CPPUNIT_ASSERT(url_p);
+                    CPPUNIT_ASSERT(url_p->value() == url->value());
+                }
+            }
+        }
+        catch (Error &e) {
+            string err = "failed:" + e.get_error_message();
+            CPPUNIT_FAIL(err.c_str());
+        }
+    }
+
+    // Test put_vector and its operation, both with and without using
+    // pthreads
+    void array_stream_put_vector_thread_test()
+    {
+        try {
+            fstream f("a_test_pv.file", fstream::out);
+            XDRStreamMarshaller fm(f);
+
+            switch (arr->var()->type()) {
+            case dods_byte_c: {
+                fm.put_vector/*_thread*/(arr->get_buf(), arr->length(), *arr);
+                break;
+            }
+            case dods_int16_c:
+            case dods_uint16_c:
+            case dods_int32_c:
+            case dods_uint32_c:
+            case dods_float32_c:
+            case dods_float64_c:
+                throw InternalErr(__FILE__, __LINE__, "Unit test fail; array is a byte array.");
+                break;
+
+            default:
+                throw InternalErr(__FILE__, __LINE__, "Implemented for numeric simple types only");
+            }
+        }
+        catch (Error &e) {
+            string err = "failed:" + e.get_error_message();
+            CPPUNIT_FAIL(err.c_str());
+        }
+
+        //int status = system("cmp a_test.file a_test_2.file >/dev/null 2>&1");
+        CPPUNIT_ASSERT(0 == system("cmp a_test.file a_test_pv.file >/dev/null 2>&1"));
+    }
+
+    // This test doesn't actually check its result - fix or replace
+    void array_stream_put_vector_thread_test_2()
+    {
+        try {
+            fstream f("a_test_pv_2.file", fstream::out);
+            XDRStreamMarshaller fm(f);
+
+            switch (arr->var()->type()) {
+            case dods_byte_c: {
+                DBG(cerr << "arr->get_buf(): " << hex << (void* )arr->get_buf() << dec << endl);
+
+                fm.put_vector(arr->get_buf(), arr->length(), *arr);
+                fm.put_vector(arr->get_buf(), arr->length(), *arr);
+                fm.put_vector(arr->get_buf(), arr->length(), *arr);
+                fm.put_vector(arr->get_buf(), arr->length(), *arr);
+                break;
+            }
+            case dods_int16_c:
+            case dods_uint16_c:
+            case dods_int32_c:
+            case dods_uint32_c:
+            case dods_float32_c:
+            case dods_float64_c:
+                throw InternalErr(__FILE__, __LINE__, "Unit test fail; array is a byte array.");
+                break;
+
+            default:
+                throw InternalErr(__FILE__, __LINE__, "Implemented for numeric simple types only");
+            }
+        }
+        catch (Error &e) {
+            string err = "failed:" + e.get_error_message();
+            CPPUNIT_FAIL(err.c_str());
+        }
+
+        try {
+            FILE *sf = fopen("a_test_pv_2.file", "r");
+            XDRFileUnMarshaller um(sf);
+
+            TestByte fab("ab");
+            TestArray farr("farr", &fab);
+            farr.append_dim(5, "dim1");
+            farr.append_dim(3, "dim2");
+            farr.deserialize(um, &dds, false);
+
+            CPPUNIT_ASSERT(farr.length() == arr->length());
+
+            dods_byte fdb[arr->length() * sizeof(dods_byte)];
+            farr.value(fdb);
+            CPPUNIT_ASSERT(!memcmp((void *) fdb, (void *) &db[0], farr.length() * sizeof(dods_byte)));
+
+            // now get three more arrays of the same size
+            farr.deserialize(um, &dds, false);
+            farr.value(fdb);
+            CPPUNIT_ASSERT(!memcmp((void *) fdb, (void *) &db[0], farr.length() * sizeof(dods_byte)));
+
+            farr.deserialize(um, &dds, false);
+            farr.value(fdb);
+            CPPUNIT_ASSERT(!memcmp((void *) fdb, (void *) &db[0], farr.length() * sizeof(dods_byte)));
+
+            farr.deserialize(um, &dds, false);
+            farr.value(fdb);
+            CPPUNIT_ASSERT(!memcmp((void *) fdb, (void *) &db[0], farr.length() * sizeof(dods_byte)));
+        }
+        catch (Error &e) {
+            string err = "failed:" + e.get_error_message();
+            CPPUNIT_FAIL(err.c_str());
+        }
+    }
+
+    void array_stream_put_vector_thread_test_3()
+    {
+        try {
+            fstream f("a_test_pv_3.file", fstream::out);
+            XDRStreamMarshaller fm(f);
+
+            switch (arr->var()->type()) {
+            case dods_byte_c: {
+                DBG(cerr << "arr->get_buf(): " << hex << (void* )arr->get_buf() << dec << endl);
+
+                // test sequencing of threads and non-threaded calls. Note that for the
+                // non-threaded calls, we pass a _reference_ to the object and it's an
+                // ignored parameter (left over cruft...).
+                fm.put_vector(arr->get_buf(), arr->length(), *arr);
+                fm.put_vector(arr->get_buf(), arr->length(), *arr);
+                fm.put_vector(arr->get_buf(), arr->length(), *arr);
+                fm.put_vector(arr->get_buf(), arr->length(), *arr);
+
+                // No need to wait since put_vector() should be doing that
+                break;
+            }
+            case dods_int16_c:
+            case dods_uint16_c:
+            case dods_int32_c:
+            case dods_uint32_c:
+            case dods_float32_c:
+            case dods_float64_c:
+                throw InternalErr(__FILE__, __LINE__, "Unit test fail; array is a byte array.");
+                break;
+
+            default:
+                throw InternalErr(__FILE__, __LINE__, "Implemented for numeric simple types only");
+            }
+        }
+        catch (Error &e) {
+            string err = "failed:" + e.get_error_message();
+            CPPUNIT_FAIL(err.c_str());
+        }
+
+        // this should be identical to the output from pv_2 (the previous test).
+        CPPUNIT_ASSERT(0 == system("cmp a_test_pv_2.file a_test_pv_3.file >/dev/null 2>&1"));
+    }
+
+    void array_stream_put_vector_thread_test_4()
+    {
+        try {
+            fstream f("a_f32_test_pv.file", fstream::out);
+            XDRStreamMarshaller fm(f);
+
+            switch (arr_f32->var()->type()) {
+            case dods_byte_c:
+                throw InternalErr(__FILE__, __LINE__, "Unit test fail; array is not a byte array.");
+                break;
+            case dods_int16_c:
+            case dods_uint16_c:
+            case dods_int32_c:
+            case dods_uint32_c:
+            case dods_float32_c:
+            case dods_float64_c: {
+                DBG(cerr << "arr_f32->get_buf(): " << hex << (void* )arr_f32->get_buf() << dec << endl);
+
+                fm.put_vector(arr_f32->get_buf(), arr_f32->length(), arr_f32->var()->width(), *arr_f32);
+
+                break;
+            }
+
+            default:
+                throw InternalErr(__FILE__, __LINE__, "Implemented for numeric simple types only");
+            }
+        }
+        catch (Error &e) {
+            string err = "failed:" + e.get_error_message();
+            CPPUNIT_FAIL(err.c_str());
+        }
+
+        CPPUNIT_ASSERT(0 == system("cmp a_f32_test.file a_f32_test_pv.file >/dev/null 2>&1"));
+    }
+
+    void array_stream_put_vector_thread_test_5()
+    {
+        try {
+            fstream f("a_f32_test_pv_2.file", fstream::out);
+            XDRStreamMarshaller fm(f);
+
+            switch (arr_f32->var()->type()) {
+            case dods_byte_c:
+                throw InternalErr(__FILE__, __LINE__, "Unit test fail; array is not a byte array.");
+                break;
+            case dods_int16_c:
+            case dods_uint16_c:
+            case dods_int32_c:
+            case dods_uint32_c:
+            case dods_float32_c:
+            case dods_float64_c: {
+                DBG(cerr << "arr_f32->get_buf(): " << hex << (void* )arr_f32->get_buf() << dec << endl);
+
+                fm.put_vector(arr_f32->get_buf(), arr_f32->length(), arr_f32->var()->width(), *arr_f32);
+                fm.put_vector(arr_f32->get_buf(), arr_f32->length(), arr_f32->var()->width(), *arr_f32);
+
+                break;
+            }
+
+            default:
+                throw InternalErr(__FILE__, __LINE__, "Implemented for numeric simple types only");
+            }
+        }
+        catch (Error &e) {
+            string err = "failed:" + e.get_error_message();
+            CPPUNIT_FAIL(err.c_str());
+        }
+
+        try {
+            FILE *sf = fopen("a_f32_test_pv_2.file", "r");
+            XDRFileUnMarshaller um(sf);
+
+            TestFloat32 fa_32("fa_32");
+            TestArray farr("farr", &fa_32);
+            farr.append_dim(5, "dim1");
+            farr.append_dim(3, "dim2");
+            farr.deserialize(um, &dds, false);
+
+            CPPUNIT_ASSERT(farr.length() == arr->length());
+
+            dods_float32 fd_32[arr->length() * sizeof(dods_float32)];
+            farr.value(fd_32);
+            CPPUNIT_ASSERT(!memcmp((void *) fd_32, (void *) &d_f32[0], farr.length() * sizeof(dods_float32)));
+
+            // now get three more arrays of the same size
+            farr.deserialize(um, &dds, false);
+            farr.value(fd_32);
+            CPPUNIT_ASSERT(!memcmp((void *) fd_32, (void *) &d_f32[0], farr.length() * sizeof(dods_byte)));
+        }
+        catch (Error &e) {
+            string err = "failed:" + e.get_error_message();
+            CPPUNIT_FAIL(err.c_str());
+        }
+    }
+
+    void array_stream_serialize_part_thread_test()
+    {
+        try {
+            fstream f("a_test_ptv.file", fstream::out);
+            XDRStreamMarshaller fm(f);
+
+            DBG(cerr << "arr->length(): " << arr->length() << endl);
+            fm.put_vector_start(arr->length());
+
+            DBG(cerr << "arr->var()->width(): " << arr->var()->width() << endl);
+
+            const int size_of_first_part = 5;
+            switch (arr->var()->type()) {
+            case dods_byte_c:
+            case dods_int16_c:
+            case dods_uint16_c:
+            case dods_int32_c:
+            case dods_uint32_c:
+            case dods_float32_c:
+            case dods_float64_c: {
+                fm.put_vector_part(arr->get_buf(), size_of_first_part, arr->var()->width(), arr->var()->type());
+
+                fm.put_vector_part(arr->get_buf() + size_of_first_part, arr->length() - size_of_first_part,
+                    arr->var()->width(), arr->var()->type());
+
+                fm.put_vector_end();    // forces a wait on the thread
+                break;
+            }
+
+            default:
+                throw InternalErr(__FILE__, __LINE__, "Implemented for numeric simple types only");
+            }
+        }
+        catch (Error &e) {
+            string err = "failed:" + e.get_error_message();
+            CPPUNIT_FAIL(err.c_str());
+        }
+
+        CPPUNIT_ASSERT(0 == system("cmp a_test.file a_test_ptv.file >/dev/null 2>&1"));
+    }
+
+    void array_stream_serialize_part_thread_test_2()
+    {
+        try {
+            fstream f("a_f32_test_ptv.file", fstream::out);
+            XDRStreamMarshaller fm(f);
+
+            DBG(cerr << "arr_f32->length(): " << arr_f32->length() << endl);
+            fm.put_vector_start(arr_f32->length());
+
+            DBG(cerr << "arr_f32->var()->width(): " << arr_f32->var()->width() << endl);
+
+            const int size_of_first_part = 5;
+            switch (arr_f32->var()->type()) {
+            case dods_byte_c:
+            case dods_int16_c:
+            case dods_uint16_c:
+            case dods_int32_c:
+            case dods_uint32_c:
+            case dods_float32_c:
+            case dods_float64_c: {
+                fm.put_vector_part(arr_f32->get_buf(), size_of_first_part, arr_f32->var()->width(),
+                    arr_f32->var()->type());
+
+                fm.put_vector_part(arr_f32->get_buf() + (size_of_first_part * arr_f32->var()->width()),
+                    arr_f32->length() - size_of_first_part, arr_f32->var()->width(), arr_f32->var()->type());
+
+                fm.put_vector_end();    // forces a wait on the thread
+                break;
+            }
+
+            default:
+                throw InternalErr(__FILE__, __LINE__, "Implemented for numeric simple types only");
+            }
+
+        }
+        catch (Error &e) {
+            string err = "failed:" + e.get_error_message();
+            CPPUNIT_FAIL(err.c_str());
+        }
+
+        CPPUNIT_ASSERT(0 == system("cmp a_f32_test.file a_f32_test_ptv.file >/dev/null 2>&1"));
+    }
+
+    void array_stream_serialize_part_thread_test_3()
+    {
+        try {
+            fstream f("a_f64_test_ptv.file", fstream::out);
+            XDRStreamMarshaller fm(f);
+
+            DBG(cerr << "arr_f64->length(): " << arr_f64->length() << endl);
+            fm.put_vector_start(arr_f64->length());
+
+            DBG(cerr << "arr_f64->var()->width(): " << arr_f64->var()->width() << endl);
+
+            const int size_of_first_part = 5;
+            switch (arr_f64->var()->type()) {
+            case dods_byte_c:
+            case dods_int16_c:
+            case dods_uint16_c:
+            case dods_int32_c:
+            case dods_uint32_c:
+            case dods_float32_c:
+            case dods_float64_c:
+                fm.put_vector_part(arr_f64->get_buf(), size_of_first_part, arr_f64->var()->width(),
+                    arr_f64->var()->type());
+
+                fm.put_vector_part(arr_f64->get_buf() + (size_of_first_part * arr_f64->var()->width()),
+                    arr_f64->length() - size_of_first_part, arr_f64->var()->width(), arr_f64->var()->type());
+
+                fm.put_vector_end();    // forces a wait on the thread
+                break;
+
+            default:
+                throw InternalErr(__FILE__, __LINE__, "Implemented for numeric simple types only");
+            }
+        }
+        catch (Error &e) {
+            string err = "failed:" + e.get_error_message();
+            CPPUNIT_FAIL(err.c_str());
+        }
+
+        CPPUNIT_ASSERT(0 == system("cmp a_f64_test.file a_f64_test_ptv.file >/dev/null 2>&1"));
+    }
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION (MarshallerTest);
+
+} // namepsace libdap
+
+int main(int argc, char*argv[])
+{
+    GetOpt getopt(argc, argv, "dh");
+    int option_char;
+
+    while ((option_char = getopt()) != -1)
+        switch (option_char) {
+        case 'd':
+            debug = 1;  // debug is a static global
+            break;
+        case 'h': {     // help - show test names
+            cerr << "Usage: MarshallerTest has the following tests:" << endl;
+            const std::vector<Test*> &tests = libdap::MarshallerTest::suite()->getTests();
+            unsigned int prefix_len = libdap::MarshallerTest::suite()->getName().append("::").length();
+            for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+                cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+            }
+            break;
+        }
+        default:
+            break;
+        }
+
+    CppUnit::TextTestRunner runner;
+    runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
+    bool wasSuccessful = true;
+    string test = "";
+    int i = getopt.optind;
+    if (i == argc) {
+        // run them all
+        wasSuccessful = runner.run("");
+    }
+    else {
+        for (; i < argc; ++i) {
+            if (debug) cerr << "Running " << argv[i] << endl;
+            test = libdap::MarshallerTest::suite()->getName().append("::").append(argv[i]);
+            wasSuccessful = wasSuccessful && runner.run(test);
+        }
+    }
+
+    xmlMemoryDump();
+
+    return wasSuccessful ? 0 : 1;
+}
diff --git a/unit-tests/RCReaderTest.cc b/unit-tests/RCReaderTest.cc
new file mode 100644
index 0000000..cbb13e7
--- /dev/null
+++ b/unit-tests/RCReaderTest.cc
@@ -0,0 +1,421 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003,2006 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+// 
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+// 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include "config.h"
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include <cstdlib>
+#include <cstring>
+#include <cstdlib>
+
+#include <string>
+#include <iostream>
+#include <fstream>
+
+#include <cppunit/TextTestRunner.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+#include <cppunit/extensions/HelperMacros.h>
+
+//#define DODS_DEBUG
+#include "RCReader.h"
+#include "debug.h"
+#include <test_config.h>
+
+using namespace CppUnit;
+using namespace std;
+
+#include"GetOpt.h"
+
+static bool debug = false;
+static char dods_conf_ev[1024] = "";
+
+#undef DBG
+#define DBG(x) do { if (debug) (x); } while(false);
+
+namespace libdap {
+
+class RCReaderTest: public TestFixture {
+private:
+    RCReader *rcr;
+
+protected:
+
+public:
+    RCReaderTest() :
+        rcr(RCReader::instance())
+    {
+    }
+
+    void setUp()
+    {
+    }
+
+    void tearDown()
+    {
+    }
+
+    /** Put values in an environment variable. This should be used only
+     * for the env var 'DODS_CONF' and should never pass in values longer
+     * than 1024 characters. The 'value' must include the DODS_CONF= text.
+     *
+     * @note this is used because environment variables use static storage,
+     * so any value passed in from the heap that might be freed or from the
+     * stack that could be popped will cause a memory access error.
+     */
+    void my_putenv(const string &value)
+    {
+        strncpy(dods_conf_ev, value.c_str(), 1024);
+        ;
+        putenv(dods_conf_ev);
+    }
+
+    CPPUNIT_TEST_SUITE (RCReaderTest);
+
+    CPPUNIT_TEST (check_env_var_test1);
+    CPPUNIT_TEST (check_env_var_test2);
+    CPPUNIT_TEST (check_env_var_test3);
+    CPPUNIT_TEST (check_env_var_test4);
+    CPPUNIT_TEST (check_env_var_test5);
+    CPPUNIT_TEST (instance_test1);
+    CPPUNIT_TEST (instance_test2);
+    CPPUNIT_TEST (proxy_test1);
+    CPPUNIT_TEST (proxy_test2);
+    CPPUNIT_TEST (proxy_test3);
+    CPPUNIT_TEST (proxy_test4);
+    CPPUNIT_TEST (proxy_test5);
+    CPPUNIT_TEST (validate_ssl_test);
+
+    CPPUNIT_TEST_SUITE_END();
+
+    void check_env_var_test1()
+    {
+        my_putenv("DODS_CONF=");
+        CPPUNIT_ASSERT(rcr->check_env_var("DODS_CONF") == "");
+    }
+
+    void check_env_var_test2()
+    {
+        my_putenv("DODS_CONF=Nothing_sensible");
+        CPPUNIT_ASSERT(rcr->check_env_var("DODS_CONF") == "");
+    }
+
+    void check_env_var_test3()
+    {
+        my_putenv("DODS_CONF=/etc/passwd");
+        CPPUNIT_ASSERT(rcr->check_env_var("DODS_CONF") == "/etc/passwd");
+    }
+
+    void check_env_var_test4()
+    {
+        // Set DODS_CONF to the CWD plus .dodsrc, create file called .dodsrc
+        // in the CWD and test to see if check_env_var finds it.
+        char cwd[1024];
+        getcwd(cwd, 1024);
+
+        string rc = string(cwd) + string("/.dodsrc");
+        ifstream ifp(rc.c_str()); // This should create .dodsrc in the CWD
+
+        my_putenv(string("DODS_CONF=") + string(cwd));
+
+        // Return existing file
+        CPPUNIT_ASSERT(rcr->check_env_var("DODS_CONF") == rc);
+        remove(rc.c_str());
+    }
+
+    void check_env_var_test5()
+    {
+        // In this test we *don't* create the file, just set DODS_CONF to the
+        // directory and see if check_env_var() makes the RC file.
+        char cwd[1024];
+        getcwd(cwd, 1024);
+
+        my_putenv(string("DODS_CONF=") + string(cwd));
+
+        // Create the file.
+        string rc = string(cwd) + string("/.dodsrc");
+        CPPUNIT_ASSERT(rcr->check_env_var("DODS_CONF") == rc);
+        struct stat stat_info;
+        CPPUNIT_ASSERT(stat(rc.c_str(), &stat_info) == 0 && S_ISREG(stat_info.st_mode));
+        remove(rc.c_str());
+    }
+
+    void instance_test1()
+    {
+        // This test assumes that HOME *is* defined. We should find the
+        // .dodsrc there. If it's not there, we should create one there.
+        my_putenv("DODS_CONF=");
+        string home = getenv("HOME");
+        if (*home.rbegin() != '/') home += "/";
+        RCReader::delete_instance();
+        RCReader::initialize_instance();
+        RCReader *reader = RCReader::instance();
+        CPPUNIT_ASSERT(reader->d_rc_file_path == home + string(".dodsrc"));
+        DBG(cerr << "Cache root: " << reader->get_dods_cache_root() << endl);
+        CPPUNIT_ASSERT(reader->get_dods_cache_root() == home + string(".dods_cache/"));
+    }
+
+    void instance_test2()
+    {
+        // Set DODS_CONF to create a .dodsrc in the CWD, then check to make
+        // sure that .dodsrc has the correct cache root.
+        char cwd[1024];
+        getcwd(cwd, 1024);
+        DBG(cerr << "CWD: " << cwd << endl);
+        string rc = cwd;
+        rc += "/.dodsrc";
+        DBG(cerr << "RC: " << rc << endl);
+        remove(rc.c_str());	// make sure the RC does not exist
+
+        my_putenv(string("DODS_CONF=") + string(cwd));
+
+        RCReader::delete_instance();
+        RCReader::initialize_instance();
+        RCReader *reader = RCReader::instance();
+        DBG(cerr << "RC path: " << reader->d_rc_file_path << endl);
+        CPPUNIT_ASSERT(reader->d_rc_file_path == string(cwd) + string("/.dodsrc"));
+        DBG(cerr << "Cache root: " << reader->get_dods_cache_root() << endl);
+        CPPUNIT_ASSERT(reader->get_dods_cache_root() == string(cwd) + string("/.dods_cache/"));
+
+    }
+
+    // Read the proxy info from rcreader-testsuite/test1.rc
+    void proxy_test1()
+    {
+        string rc = (string) "DODS_CONF=" + TEST_SRC_DIR + "/rcreader-testsuite/test1.rc";
+        DBG(cerr << "rc: " << rc << endl);
+        my_putenv(rc);
+
+        RCReader::delete_instance();
+        RCReader::initialize_instance();
+        RCReader *reader = RCReader::instance();
+        DBG(cerr << "RC path: " << reader->d_rc_file_path << endl);
+        CPPUNIT_ASSERT(reader->d_rc_file_path == (string) TEST_SRC_DIR + "/rcreader-testsuite/test1.rc");
+        CPPUNIT_ASSERT(reader->get_proxy_server_protocol() == "http");
+
+        string proxy = reader->get_proxy_server_host_url();
+        CPPUNIT_ASSERT(proxy == "jimg:mypass@proxy.local.org:8080");
+
+        CPPUNIT_ASSERT(reader->get_proxy_server_host() == "proxy.local.org");
+        CPPUNIT_ASSERT(reader->get_proxy_server_port() == 8080);
+        CPPUNIT_ASSERT(reader->get_proxy_server_userpw() == "jimg:mypass");
+
+        CPPUNIT_ASSERT(reader->is_no_proxy_for_used());
+        CPPUNIT_ASSERT(reader->get_no_proxy_for_protocol() == "http");
+        CPPUNIT_ASSERT(reader->get_no_proxy_for_host() == "local.org");
+    }
+
+    void proxy_test2()
+    {
+        string rc = (string) "DODS_CONF=" + TEST_SRC_DIR + "/rcreader-testsuite/test2.rc";
+        DBG(cerr << "rc: " << rc << endl);
+        my_putenv(rc);
+
+        RCReader::delete_instance();
+        RCReader::initialize_instance();
+        RCReader *reader = RCReader::instance();
+        DBG(cerr << "RC path: " << reader->d_rc_file_path << endl);
+        CPPUNIT_ASSERT(reader->d_rc_file_path == (string) TEST_SRC_DIR + "/rcreader-testsuite/test2.rc");
+        CPPUNIT_ASSERT(reader->get_proxy_server_protocol() == "http");
+
+        string proxy = reader->get_proxy_server_host_url();
+        DBG(cerr << "get_proxy_server_host_url(): " << proxy << endl);
+        CPPUNIT_ASSERT(proxy == "proxy.local.org:80");
+
+        CPPUNIT_ASSERT(reader->get_proxy_server_host() == "proxy.local.org");
+        CPPUNIT_ASSERT(reader->get_proxy_server_port() == 80);
+        CPPUNIT_ASSERT(reader->get_proxy_server_userpw() == "");
+    }
+
+    void proxy_test3()
+    {
+        string rc = (string) "DODS_CONF=" + TEST_SRC_DIR + "/rcreader-testsuite/test3.rc";
+        DBG(cerr << "rc: " << rc << endl);
+        my_putenv(rc);
+
+        try {
+            RCReader::delete_instance();
+            RCReader::initialize_instance();
+            CPPUNIT_ASSERT(!"initialize_instance() should throw Error.");
+        }
+        catch (Error &e) {
+            DBG(cerr << e.get_error_message() << endl);
+            CPPUNIT_ASSERT(e.get_error_message() != "");
+        }
+    }
+
+    void proxy_test4()
+    {
+        string rc = (string) "DODS_CONF=" + TEST_SRC_DIR + "/rcreader-testsuite/test4.rc";
+        DBG(cerr << "rc: " << rc << endl);
+        my_putenv(rc);
+
+        try {
+            RCReader::delete_instance();
+            RCReader::initialize_instance();
+            RCReader *reader = RCReader::instance();
+            DBG(cerr << "RC path: " << reader->d_rc_file_path << endl);
+            CPPUNIT_ASSERT(reader->d_rc_file_path == (string) TEST_SRC_DIR + "/rcreader-testsuite/test4.rc");
+            CPPUNIT_ASSERT(reader->get_proxy_server_protocol() == "http");
+
+            string proxy = reader->get_proxy_server_host_url();
+            DBG(cerr << "get_proxy_server_host_url(): " << proxy << endl);
+            CPPUNIT_ASSERT(proxy == "jimg:test@proxy.local.org:3128");
+
+            CPPUNIT_ASSERT(reader->get_proxy_server_host() == "proxy.local.org");
+            CPPUNIT_ASSERT(reader->get_proxy_server_port() == 3128);
+            CPPUNIT_ASSERT(reader->get_proxy_server_userpw() == "jimg:test");
+        }
+        catch (Error &e) {
+            DBG(cerr << e.get_error_message() << endl);
+            CPPUNIT_ASSERT(e.get_error_message() != "");
+        }
+    }
+
+    void proxy_test5()
+    {
+        string rc = (string) "DODS_CONF=" + TEST_SRC_DIR + "/rcreader-testsuite/test5.rc";
+        DBG(cerr << "rc: " << rc << endl);
+        my_putenv(rc);
+
+        try {
+            RCReader::delete_instance();
+            RCReader::initialize_instance();
+            RCReader *reader = RCReader::instance();
+            DBG(cerr << "RC path: " << reader->d_rc_file_path << endl);
+            CPPUNIT_ASSERT(reader->d_rc_file_path == (string) TEST_SRC_DIR + "/rcreader-testsuite/test5.rc");
+            string proxy = reader->get_proxy_server_host_url();
+            DBG(cerr << "get_proxy_server_host_url(): " << proxy << endl);
+            CPPUNIT_ASSERT(reader->get_proxy_server_protocol() == "http");
+
+            CPPUNIT_ASSERT(proxy == "jimg:test@proxy.local.org:3128");
+
+            CPPUNIT_ASSERT(reader->get_proxy_server_host() == "proxy.local.org");
+            CPPUNIT_ASSERT(reader->get_proxy_server_port() == 3128);
+            CPPUNIT_ASSERT(reader->get_proxy_server_userpw() == "jimg:test");
+        }
+        catch (Error &e) {
+            DBG(cerr << e.get_error_message() << endl);
+            CPPUNIT_ASSERT(e.get_error_message() != "");
+        }
+    }
+
+    // This simple test checks to see that the VALIDATE_SSL parameter is 
+    // read correctly.
+    void validate_ssl_test()
+    {
+        string rc = (string) "DODS_CONF=" + TEST_SRC_DIR + "/rcreader-testsuite/dodssrc_ssl_1";
+        DBG(cerr << "rc: " << rc << endl);
+        my_putenv(rc);
+
+        RCReader::delete_instance();
+        RCReader::initialize_instance();
+        RCReader *reader = RCReader::instance();
+        reader->read_rc_file(string(TEST_SRC_DIR) + "/rcreader-testsuite/dodssrc_ssl_1");
+        // No param set in file
+        DBG(cerr << "reader->get_validate_ssl(): " << reader->get_validate_ssl() << endl);
+        CPPUNIT_ASSERT(reader->get_validate_ssl() == 1);
+
+        // Param set in file
+        // Note that string rc, rc2, and rc3 are used (instead of reusing one
+        // string object) because the code casts away the const-ness of the
+        // char* returned by c_str() and putenv does odd stuff with it. There's
+        // nothing good about using env vars...
+        rc = (string) "DODS_CONF=" + TEST_SRC_DIR + "/rcreader-testsuite/dodssrc_ssl_2";
+        DBG(cerr << "rc: " << rc << endl);
+
+        my_putenv(rc);
+
+        RCReader::delete_instance();
+        RCReader::initialize_instance();
+        reader = RCReader::instance();
+        DBG(cerr << "reader->check_env_var(\"DODS_CONF\"): " << reader->check_env_var("DODS_CONF") << endl);
+        DBG(cerr << "reader->get_validate_ssl(): " << reader->get_validate_ssl() << endl);
+        CPPUNIT_ASSERT(reader->get_validate_ssl() == 1);
+
+        // Param cleared in file 
+        rc = (string) "DODS_CONF=" + TEST_SRC_DIR + "/rcreader-testsuite/dodsrc_ssl_3";
+        DBG(cerr << "rc: " << rc << endl);
+
+        my_putenv(rc);
+
+        RCReader::delete_instance();
+        RCReader::initialize_instance();
+        reader = RCReader::instance();
+        DBG(cerr << "reader->get_validate_ssl(): " << reader->get_validate_ssl() << endl);
+        CPPUNIT_ASSERT(reader->get_validate_ssl() == 0);
+    }
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION (RCReaderTest);
+
+} // namespace libdap
+
+int main(int argc, char*argv[])
+{
+    GetOpt getopt(argc, argv, "dh");
+    int option_char;
+
+    while ((option_char = getopt()) != -1)
+        switch (option_char) {
+        case 'd':
+            debug = 1;  // debug is a static global
+            break;
+        case 'h': {     // help - show test names
+            cerr << "Usage: RCReaderTest has the following tests:" << endl;
+            const std::vector<Test*> &tests = libdap::RCReaderTest::suite()->getTests();
+            unsigned int prefix_len = libdap::RCReaderTest::suite()->getName().append("::").length();
+            for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+                cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+            }
+            break;
+        }
+        default:
+            break;
+        }
+
+    CppUnit::TextTestRunner runner;
+    runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
+    bool wasSuccessful = true;
+    string test = "";
+    int i = getopt.optind;
+    if (i == argc) {
+        // run them all
+        wasSuccessful = runner.run("");
+    }
+    else {
+        for (; i < argc; ++i) {
+            if (debug) cerr << "Running " << argv[i] << endl;
+            test = libdap::RCReaderTest::suite()->getName().append("::").append(argv[i]);
+            wasSuccessful = wasSuccessful && runner.run(test);
+        }
+    }
+
+    return wasSuccessful ? 0 : 1;
+}
diff --git a/unit-tests/RegexTest.cc b/unit-tests/RegexTest.cc
new file mode 100644
index 0000000..6bb36b1
--- /dev/null
+++ b/unit-tests/RegexTest.cc
@@ -0,0 +1,193 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2005 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+// 
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+// 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#include <cppunit/TextTestRunner.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+#include <cppunit/extensions/HelperMacros.h>
+
+#include <string>
+
+#include "GNURegex.h"
+#include "Error.h"
+#include "debug.h"
+#include "GetOpt.h"
+
+using namespace CppUnit;
+using namespace libdap;
+
+static bool debug = false;
+
+class RegexTest: public TestFixture {
+private:
+
+public:
+    RegexTest()
+    {
+    }
+    ~RegexTest()
+    {
+    }
+
+    void setUp()
+    {
+    }
+
+    void tearDown()
+    {
+    }
+
+    CPPUNIT_TEST_SUITE (RegexTest);
+
+    CPPUNIT_TEST (ctor_test);
+    CPPUNIT_TEST (match_test);
+#if 1
+    CPPUNIT_TEST (search_test);
+#endif
+
+    CPPUNIT_TEST_SUITE_END();
+
+    void ctor_test()
+    {
+        try {
+            Regex r("abc");
+            CPPUNIT_ASSERT(1);
+        }
+        catch (Error &e) {
+            cerr << "Error: " << e.get_error_message() << endl;
+            CPPUNIT_ASSERT(!"Error building object");
+        }
+
+        try {
+            Regex r("");
+            CPPUNIT_ASSERT(1);
+        }
+        catch (Error &e) {
+            cerr << "Error: " << e.get_error_message() << endl;
+            CPPUNIT_ASSERT(!"Error building object");
+        }
+
+        try {
+            Regex r(".*");
+            CPPUNIT_ASSERT(1);
+        }
+        catch (Error &e) {
+            cerr << "Error: " << e.get_error_message() << endl;
+            CPPUNIT_ASSERT(!"Error building object");
+        }
+    }
+
+    void match_test()
+    {
+        Regex simple("abc");
+        string s1 = "123abcdef";
+        DBG(cerr << "simple.match(s1.c_str(), s1.length()): "
+            << simple.match(s1.c_str(), s1.length()) << endl);
+
+        CPPUNIT_ASSERT(simple.match(s1.c_str(), s1.length()) == 3);
+        CPPUNIT_ASSERT(simple.match(s1.c_str(), s1.length(), 4) == -1);
+
+        Regex pattern("3.b");
+        DBG(cerr << "pattern.match(s1.c_str(), s1.length()): "
+            << pattern.match(s1.c_str(), s1.length()) << endl);
+
+        CPPUNIT_ASSERT(pattern.match(s1.c_str(), s1.length()) == 3);
+        string s2 = "123acd";
+        CPPUNIT_ASSERT(pattern.match(s2.c_str(), s2.length()) == -1);
+
+        Regex exclusion("[^123]+");
+        DBG(cerr << "exclusion.match(s1.c_str(), s1.length()): "
+            << exclusion.match(s1.c_str(), s1.length()) << endl);
+
+        CPPUNIT_ASSERT(exclusion.match(s1.c_str(), s1.length()) == 6);
+
+        Regex exclusion_range("[^0-9]+");
+        CPPUNIT_ASSERT(exclusion_range.match(s1.c_str(), s1.length()) == 6);
+    }
+
+    void search_test()
+    {
+        int matchlen;
+
+        Regex simple("abc");
+        string s1 = "123abcdef";
+        CPPUNIT_ASSERT(simple.search(s1.c_str(), s1.length(), matchlen, 0) == 3);
+        CPPUNIT_ASSERT(matchlen == 3);
+        CPPUNIT_ASSERT(simple.search(s1.c_str(), s1.length(), matchlen, 4) == -1);
+
+        Regex pattern("[a-z]+");
+        CPPUNIT_ASSERT(pattern.search(s1.c_str(), s1.length(), matchlen) == 3);
+        CPPUNIT_ASSERT(matchlen == 6);
+
+        string s2 = "123abc123abcd";
+        CPPUNIT_ASSERT(pattern.search(s2.c_str(), s2.length(), matchlen) == 3);
+        CPPUNIT_ASSERT(matchlen == 3);
+    }
+
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION (RegexTest);
+
+int main(int argc, char*argv[])
+{
+    GetOpt getopt(argc, argv, "dh");
+    int option_char;
+
+    while ((option_char = getopt()) != -1)
+        switch (option_char) {
+        case 'd':
+            debug = 1;  // debug is a static global
+            break;
+        case 'h': {     // help - show test names
+            cerr << "Usage: RegexTest has the following tests:" << endl;
+            const std::vector<Test*> &tests = RegexTest::suite()->getTests();
+            unsigned int prefix_len = RegexTest::suite()->getName().append("::").length();
+            for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+                cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+            }
+            break;
+        }
+        default:
+            break;
+        }
+
+    CppUnit::TextTestRunner runner;
+    runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
+    bool wasSuccessful = true;
+    string test = "";
+    int i = getopt.optind;
+    if (i == argc) {
+        // run them all
+        wasSuccessful = runner.run("");
+    }
+    else {
+        for (; i < argc; ++i) {
+            if (debug) cerr << "Running " << argv[i] << endl;
+            test = RegexTest::suite()->getName().append("::").append(argv[i]);
+            wasSuccessful = wasSuccessful && runner.run(test);
+        }
+    }
+
+    return wasSuccessful ? 0 : 1;
+}
diff --git a/unit-tests/SequenceTest.cc b/unit-tests/SequenceTest.cc
new file mode 100644
index 0000000..9dfdbd3
--- /dev/null
+++ b/unit-tests/SequenceTest.cc
@@ -0,0 +1,469 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#include <cppunit/TextTestRunner.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+#include <cppunit/extensions/HelperMacros.h>
+
+#include <string>
+#include <cstring>
+
+//#define DODS_DEBUG
+
+#include "DDS.h"
+#include "ConstraintEvaluator.h"
+
+#include "../tests/TestTypeFactory.h"
+#include "../tests/TestSequence.h"
+#include "../tests/TestInt32.h"
+#include "../tests/TestStr.h"
+
+#include "GNURegex.h"
+#include "GetOpt.h"
+#include "debug.h"
+
+static bool debug = false;
+
+#undef DBG
+#define DBG(x) do { if (debug) (x); } while(false);
+
+using namespace CppUnit;
+using namespace std;
+
+int test_variable_sleep_interval;
+
+//  Note: MS VC++ won't tolerate the embedded newlines in strings, hence the \n
+//  is explicit.
+static const char *s_as_string =
+    "BaseType \\(0x.*\\):\n\
+          _name: s\n\
+          _type: Sequence\n\
+          _dataset: \n\
+          _read_p: 0\n\
+          _send_p: 0\n\
+          _synthesized_p: 0\n\
+          d_parent: 0.*\n\
+          d_attr: 0x.*\n\
+BaseType \\(0x.*\\):\n\
+          _name: i1\n\
+          _type: Int32\n\
+          _dataset: \n\
+          _read_p: 0\n\
+          _send_p: 0\n\
+          _synthesized_p: 0\n\
+          d_parent: 0x.*\n\
+          d_attr: 0x.*\n\
+BaseType \\(0x.*\\):\n\
+          _name: str1\n\
+          _type: String\n\
+          _dataset: \n\
+          _read_p: 0\n\
+          _send_p: 0\n\
+          _synthesized_p: 0\n\
+          d_parent: 0x.*\n\
+          d_attr: 0x.*\n\
+BaseType \\(0x.*\\):\n\
+          _name: i2\n\
+          _type: Int32\n\
+          _dataset: \n\
+          _read_p: 0\n\
+          _send_p: 0\n\
+          _synthesized_p: 0\n\
+          d_parent: 0x.*\n\
+          d_attr: 0x.*\n\
+\n";
+
+static Regex s_regex(s_as_string);
+
+namespace libdap {
+
+class SequenceTest: public TestFixture {
+private:
+    DDS *dds;
+    TestSequence *s, *ss, *ps, *sss, *ts, *tts;
+
+public:
+    SequenceTest()
+    {
+    }
+    ~SequenceTest()
+    {
+    }
+
+    void setUp()
+    {
+        // Set up a simple sequence. Used to test ctor, assigment, et cetera.
+        s = new TestSequence("s");
+        s->add_var_nocopy(new TestInt32("i1"));
+        s->add_var_nocopy(new TestStr("str1"));
+        s->add_var_nocopy(new TestInt32("i2"));
+        s->set_series_values(true);
+
+        // Set ss, a two level sequence
+        ss = new TestSequence("ss");
+        ss->add_var_nocopy(new TestInt32("i1"));
+        ss->set_series_values(true);
+
+        ps = new TestSequence("child_of_ss");
+        ps->add_var_nocopy(new TestInt32("i2"));
+        ps->set_series_values(true);
+
+        ss->add_var_nocopy(ps);
+
+        // Set up sss, used to test multi-level sequences
+        sss = new TestSequence("sss");
+        sss->add_var_nocopy(new TestInt32("i1"));
+
+        ts = new TestSequence("child_of_sss");
+        ts->add_var_nocopy(new TestStr("str1"));
+
+        tts = new TestSequence("child_of_child_of_sss");
+        tts->add_var_nocopy(new TestInt32("i2"));
+        ts->add_var_nocopy(tts);
+
+        sss->add_var_nocopy(ts);	// This has to be here because add_var_nocopy adds
+        // copies of its argument.
+        sss->set_series_values(true);
+
+        TestTypeFactory ttf;
+        dds = new DDS(&ttf);
+        dds->add_var_nocopy(s);
+        dds->add_var_nocopy(ss);
+        dds->add_var_nocopy(sss);
+    }
+
+    void tearDown()
+    {
+        delete dds;
+        dds = 0;
+    }
+
+    bool re_match(Regex &r, const char *s)
+    {
+        int match_position = r.match(s, strlen(s));
+        DBG(cerr << "match position: " << match_position << " string length: " << (int )strlen(s) << endl);
+        return match_position == (int) strlen(s);
+    }
+
+    CPPUNIT_TEST_SUITE (SequenceTest);
+
+    CPPUNIT_TEST (ctor_test);
+    CPPUNIT_TEST (assignment);
+    CPPUNIT_TEST (copy_ctor);
+#if 0
+    CPPUNIT_TEST(test_set_leaf_sequence);
+    CPPUNIT_TEST(test_set_leaf_sequence2);
+    CPPUNIT_TEST(test_set_leaf_sequence3);
+    CPPUNIT_TEST(intern_data_for_leaf_test);
+    CPPUNIT_TEST(intern_data_test1);
+    CPPUNIT_TEST(intern_data_test2);
+    CPPUNIT_TEST(intern_data_test3);
+#endif
+
+    CPPUNIT_TEST_SUITE_END();
+
+#if 0
+    // Tests for methods
+    void intern_data_test1() {
+        ConstraintEvaluator ce;
+        s->set_send_p(true);
+        s->set_leaf_sequence();
+        try {
+            s->intern_data(ce, *dds);
+
+            // Test the first value in the first four rows
+            BaseType *btp = s->var_value(0, 0);
+            CPPUNIT_ASSERT(btp && dynamic_cast<Int32&>(*btp).value() == 32);
+            btp = s->var_value(1, 0);
+            CPPUNIT_ASSERT(btp && dynamic_cast<Int32&>(*btp).value() == 1024);
+            btp = s->var_value(2, 0);
+            CPPUNIT_ASSERT(btp && dynamic_cast<Int32&>(*btp).value() == 32768);
+            btp = s->var_value(3, 0);
+            CPPUNIT_ASSERT(btp && dynamic_cast<Int32&>(*btp).value() == 1048576);
+            DBG(s->print_val(stdout));
+        }
+        catch (Error &e) {
+            cerr << e.get_error_message() << endl;
+            CPPUNIT_ASSERT(!"Error in transfer_data_for_leaf_test1()");
+        }
+    }
+
+    void intern_data_test2() {
+        ConstraintEvaluator ce;
+        ss->set_send_p(true);
+        ss->set_leaf_sequence();
+        try {
+            ss->intern_data(ce, *dds);
+            DBG(ss->print_val(stdout));
+
+            // Test the first value in the first four rows
+            BaseType *btp = ss->var_value(0, 0);
+            CPPUNIT_ASSERT(btp && dynamic_cast<Int32&>(*btp).value() == 32);
+            btp = ss->var_value(1, 0);
+            CPPUNIT_ASSERT(btp && dynamic_cast<Int32&>(*btp).value() == 1024);
+            btp = ss->var_value(2, 0);
+            CPPUNIT_ASSERT(btp && dynamic_cast<Int32&>(*btp).value() == 32768);
+            btp = ss->var_value(3, 0);
+            CPPUNIT_ASSERT(btp && dynamic_cast<Int32&>(*btp).value() == 1048576);
+
+            // Look at some values in the inner sequence
+            Sequence *sp = dynamic_cast<Sequence*>(ss->var_value(0, 1));
+            CPPUNIT_ASSERT(sp);
+            btp = sp->var_value(0, 0);
+            CPPUNIT_ASSERT(btp && dynamic_cast<Int32&>(*btp).value() == 32);
+            btp = sp->var_value(1, 0);
+            CPPUNIT_ASSERT(btp && dynamic_cast<Int32&>(*btp).value() == 1024);
+            btp = sp->var_value(2, 0);
+            CPPUNIT_ASSERT(btp && dynamic_cast<Int32&>(*btp).value() == 32768);
+            btp = sp->var_value(3, 0);
+            CPPUNIT_ASSERT(btp && dynamic_cast<Int32&>(*btp).value() == 1048576);
+
+            sp = dynamic_cast<Sequence*>(ss->var_value(3, 1));
+            CPPUNIT_ASSERT(sp);
+            btp = sp->var_value(0, 0);
+            CPPUNIT_ASSERT(btp && dynamic_cast<Int32&>(*btp).value() == 32);
+            btp = sp->var_value(1, 0);
+            CPPUNIT_ASSERT(btp && dynamic_cast<Int32&>(*btp).value() == 1024);
+            btp = sp->var_value(2, 0);
+            CPPUNIT_ASSERT(btp && dynamic_cast<Int32&>(*btp).value() == 32768);
+            btp = sp->var_value(3, 0);
+            CPPUNIT_ASSERT(btp && dynamic_cast<Int32&>(*btp).value() == 1048576);
+        }
+        catch (Error &e) {
+            cerr << e.get_error_message() << endl;
+            CPPUNIT_ASSERT(!"Error in transfer_data_test2()");
+        }
+    }
+
+    void intern_data_test3() {
+        ConstraintEvaluator ce;
+        sss->set_send_p(true);
+        sss->set_leaf_sequence();
+        try {
+            sss->intern_data(ce, *dds);
+            DBG(sss->print_val_by_rows(stdout, "", true, true));
+            // Test the first value in the first four rows
+            BaseType *btp = sss->var_value(0, 0);
+            CPPUNIT_ASSERT(btp && dynamic_cast<Int32&>(*btp).value() == 32);
+            btp = sss->var_value(1, 0);
+            CPPUNIT_ASSERT(btp && dynamic_cast<Int32&>(*btp).value() == 1024);
+            btp = sss->var_value(2, 0);
+            CPPUNIT_ASSERT(btp && dynamic_cast<Int32&>(*btp).value() == 32768);
+            btp = sss->var_value(3, 0);
+            CPPUNIT_ASSERT(btp && dynamic_cast<Int32&>(*btp).value() == 1048576);
+
+            // Look at some values in the inner-most sequence (skip the middle
+            // sequence since I don't have a value() accessor for that yet.
+            Sequence *sp = dynamic_cast<Sequence*>(sss->var_value(0, 1));
+            CPPUNIT_ASSERT(sp);
+            Sequence *ssp = dynamic_cast<Sequence*>(sp->var_value(0, 1));
+            CPPUNIT_ASSERT(ssp);
+
+            btp = ssp->var_value(0, 0);
+            CPPUNIT_ASSERT(btp && dynamic_cast<Int32&>(*btp).value() == 32);
+            btp = ssp->var_value(1, 0);
+            CPPUNIT_ASSERT(btp && dynamic_cast<Int32&>(*btp).value() == 1024);
+            btp = ssp->var_value(2, 0);
+            CPPUNIT_ASSERT(btp && dynamic_cast<Int32&>(*btp).value() == 32768);
+            btp = ssp->var_value(3, 0);
+            CPPUNIT_ASSERT(btp && dynamic_cast<Int32&>(*btp).value() == 1048576);
+
+            sp = dynamic_cast<Sequence*>(sss->var_value(3, 1));
+            CPPUNIT_ASSERT(sp);
+            ssp = dynamic_cast<Sequence*>(sp->var_value(3, 1));
+            CPPUNIT_ASSERT(ssp);
+
+            btp = ssp->var_value(0, 0);
+            CPPUNIT_ASSERT(btp && dynamic_cast<Int32&>(*btp).value() == 32);
+            btp = ssp->var_value(1, 0);
+            CPPUNIT_ASSERT(btp && dynamic_cast<Int32&>(*btp).value() == 1024);
+            btp = ssp->var_value(2, 0);
+            CPPUNIT_ASSERT(btp && dynamic_cast<Int32&>(*btp).value() == 32768);
+            btp = ssp->var_value(3, 0);
+            CPPUNIT_ASSERT(btp && dynamic_cast<Int32&>(*btp).value() == 1048576);
+        }
+        catch (Error &e) {
+            cerr << e.get_error_message() << endl;
+            CPPUNIT_ASSERT(!"Error in transfer_data_test3()");
+        }
+    }
+
+    void intern_data_for_leaf_test() {
+        ConstraintEvaluator ce;
+        s->set_send_p(true);
+        try {
+            Sequence::sequence_values_stack_t sequence_values_stack;
+            sequence_values_stack.push(&s->d_values);
+            s->intern_data_for_leaf(*dds, ce, sequence_values_stack);
+
+            // Test the first value in the first four rows
+            BaseType *btp = s->var_value(0, 0);
+            CPPUNIT_ASSERT(dynamic_cast<Int32&>(*btp).value() == 32);
+            btp = s->var_value(1, 0);
+            CPPUNIT_ASSERT(dynamic_cast<Int32&>(*btp).value() == 1024);
+            btp = s->var_value(2, 0);
+            CPPUNIT_ASSERT(dynamic_cast<Int32&>(*btp).value() == 32768);
+            btp = s->var_value(3, 0);
+            CPPUNIT_ASSERT(dynamic_cast<Int32&>(*btp).value() == 1048576);
+            DBG(s->print_val(stdout));
+        }
+        catch (Error &e) {
+            cerr << e.get_error_message() << endl;
+            CPPUNIT_ASSERT(!"Error in transfer_data_for_leaf_test()");
+        }
+    }
+
+    void test_set_leaf_sequence3() {
+        // Test for the rejection of a Sequence with two sequences in it.
+        sss->add_var_nocopy(ss);
+        sss->set_send_p(true);
+        try {
+            sss->set_leaf_sequence(1);
+            CPPUNIT_ASSERT(!"Should have thrown Error");
+        }
+        catch (Error &e) {
+            cerr << e.get_error_message() << endl;
+            CPPUNIT_ASSERT("Caught Error");
+        }
+    }
+
+    void test_set_leaf_sequence2() {
+        // Three level sequence
+        sss->set_send_p(true);// set send_p for whole seq
+        // Now the lowest sequence is not longer to be sent. The middle sequence
+        // is the lowest with fields to be sent and so should be the leaf.
+        Sequence::Vars_iter i = sss->var_begin();
+        Sequence *inner = dynamic_cast<Sequence*>(*++i);
+        i = inner->var_begin();
+        inner = dynamic_cast<Sequence*>(*++i);
+        inner->set_send_p(false);// now clear send_p for the inner most seq
+        sss->set_leaf_sequence(1);
+
+        CPPUNIT_ASSERT(!sss->is_leaf_sequence());
+
+        i = sss->var_begin();
+        inner = dynamic_cast<Sequence*>(*++i);
+        CPPUNIT_ASSERT(inner && inner->is_leaf_sequence());
+
+        i = inner->var_begin();
+        Sequence *inner2 = dynamic_cast<Sequence*>(*++i);
+        CPPUNIT_ASSERT(inner2 && !inner2->is_leaf_sequence());
+    }
+
+    void test_set_leaf_sequence() {
+        // One level sequence
+        s->set_send_p(true);
+        s->set_leaf_sequence(1);
+        CPPUNIT_ASSERT(s->is_leaf_sequence());
+
+        // Two level sequence
+        ss->set_send_p(true);
+        ss->set_leaf_sequence(1);
+        CPPUNIT_ASSERT(!ss->is_leaf_sequence());
+        // add_var_nocopy() _copies_ the object, so ps should not be used here.
+        Sequence::Vars_iter i = ss->var_begin();
+        Sequence *inner = dynamic_cast<Sequence*>(*++i);
+        CPPUNIT_ASSERT(inner->type() == dods_sequence_c && inner->is_leaf_sequence());
+
+        // Three level sequence
+        sss->set_send_p(true);
+        sss->set_leaf_sequence(1);
+        CPPUNIT_ASSERT(!sss->is_leaf_sequence());
+
+        i = sss->var_begin();
+        inner = dynamic_cast<Sequence*>(*++i);
+        CPPUNIT_ASSERT(inner && !inner->is_leaf_sequence());
+
+        i = inner->var_begin();
+        Sequence *inner2 = dynamic_cast<Sequence*>(*++i);
+        CPPUNIT_ASSERT(inner2 && inner2->is_leaf_sequence());
+    }
+#endif
+
+    void assignment()
+    {
+        Sequence ts2 = *s;
+        DBG(cerr << "ts2: " << ts2.toString() << endl);
+        CPPUNIT_ASSERT(re_match(s_regex, ts2.toString().c_str()));
+    }
+
+    void ctor_test()
+    {
+        DBG(cerr << "s: " << s->toString() << endl);
+        CPPUNIT_ASSERT(re_match(s_regex, s->toString().c_str()));
+    }
+
+    void copy_ctor()
+    {
+        Sequence s2 = *s;
+        CPPUNIT_ASSERT(re_match(s_regex, s2.toString().c_str()));
+    }
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION (SequenceTest);
+
+}
+
+int main(int argc, char*argv[])
+{
+    GetOpt getopt(argc, argv, "dh");
+    int option_char;
+    while ((option_char = getopt()) != -1)
+        switch (option_char) {
+        case 'd':
+            debug = 1;  // debug is a static global
+            break;
+        case 'h': {     // help - show test names
+            cerr << "Usage: SequenceTest has the following tests:" << endl;
+            const std::vector<Test*> &tests = libdap::SequenceTest::suite()->getTests();
+            unsigned int prefix_len = libdap::SequenceTest::suite()->getName().append("::").length();
+            for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+                cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+            }
+            break;
+        }
+        default:
+            break;
+        }
+
+    CppUnit::TextTestRunner runner;
+    runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
+    bool wasSuccessful = true;
+    string test = "";
+    int i = getopt.optind;
+    if (i == argc) {
+        // run them all
+        wasSuccessful = runner.run("");
+    }
+    else {
+        for (; i < argc; ++i) {
+            if (debug) cerr << "Running " << argv[i] << endl;
+            test = libdap::SequenceTest::suite()->getName().append("::").append(argv[i]);
+            wasSuccessful = wasSuccessful && runner.run(test);
+        }
+    }
+
+    return wasSuccessful ? 0 : 1;
+}
diff --git a/unit-tests/ServerFunctionsListUnitTest.cc b/unit-tests/ServerFunctionsListUnitTest.cc
new file mode 100644
index 0000000..02f03fb
--- /dev/null
+++ b/unit-tests/ServerFunctionsListUnitTest.cc
@@ -0,0 +1,228 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2013 OPeNDAP, Inc.
+// Author: Nathan David Potter <ndp@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+//#include <cstdio>
+
+#include <pthread.h>
+
+#include <cppunit/TextTestRunner.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+#include <cppunit/extensions/HelperMacros.h>
+
+#include "debug.h"
+#include "util.h"
+
+#include "GetOpt.h"
+#include "BaseType.h"
+#include "Str.h"
+#include "DDS.h"
+#include "ServerFunction.h"
+#include "ServerFunctionsList.h"
+
+using namespace CppUnit;
+
+static bool debug = false;
+
+#undef DBG
+#define DBG(x) do { if (debug) (x); } while(false);
+
+void sflut(int, libdap::BaseType *[], libdap::DDS &, libdap::BaseType **btpp)
+{
+    string info = string("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n") + "<function name=\"ugr4\" version=\"0.1\">\n"
+        + "ServeFunctionsList Unit Test.\n" + "usage: sflut()" + "\n" + "</function>";
+
+    libdap::Str *response = new libdap::Str("info");
+    response->set_value(info);
+    *btpp = response;
+    return;
+
+}
+
+class SFLUT: public libdap::ServerFunction {
+public:
+    SFLUT()
+    {
+        setName("sflut");
+        setDescriptionString("This is a unit test to test the ServerFunctionList class.");
+        setUsageString("sflut()");
+        setRole("http://services.opendap.org/dap4/unit-tests/ServerFunctionList");
+        setDocUrl("http://docs.opendap.org/index.php/unit-tests");
+        setFunction(sflut);
+        setVersion("1.0");
+
+    }
+};
+
+namespace libdap {
+class ServerFunctionsListUnitTest: public CppUnit::TestFixture {
+
+public:
+
+    // Called once before everything gets tested
+    ServerFunctionsListUnitTest()
+    {
+        //    DBG(cerr << " BindTest - Constructor" << endl);
+
+    }
+
+    // Called at the end of the test
+    ~ServerFunctionsListUnitTest()
+    {
+        //    DBG(cerr << " BindTest - Destructor" << endl);
+    }
+
+    // Called before each test
+    void setup()
+    {
+        //    DBG(cerr << " BindTest - setup()" << endl);
+    }
+
+    // Called after each test
+    void tearDown()
+    {
+        //    DBG(cerr << " tearDown()" << endl);
+    }
+
+    CPPUNIT_TEST_SUITE (libdap::ServerFunctionsListUnitTest);
+
+    CPPUNIT_TEST (sflut_test);
+    //CPPUNIT_TEST(always_pass);
+
+    CPPUNIT_TEST_SUITE_END();
+
+    void printFunctionNames()
+    {
+        vector<string> *names = new vector<string>();
+        printFunctionNames(names);
+        delete names;
+    }
+
+    void printFunctionNames(vector<string> *names)
+    {
+        DBG(
+            cerr << "Server_Function_List_Unit_Test::printFunctionNames() - ServerFunctionList::getFunctionNames(): "
+                << endl);
+        if (names->empty()) {
+            DBG(cerr << "     Function list is empty." << endl);
+            return;
+        }
+
+        for (size_t i = 0; i < names->size(); i++) {
+            DBG(cerr << "   name[" << i << "]: " << (*names)[i] << endl);
+        }
+    }
+    void always_pass()
+    {
+        CPPUNIT_ASSERT(true);
+    }
+
+    void sflut_test()
+    {
+        DBG(cerr << endl);
+
+        SFLUT *ssf = new SFLUT();
+        ssf->setName("Server_Function_List_Unit_Test");
+
+        vector<string> names;
+        libdap::ServerFunctionsList::TheList()->getFunctionNames(&names);
+        printFunctionNames(&names);
+
+        CPPUNIT_ASSERT(names.size() == 0);
+
+        DBG(cerr << "ServerFunctionsListUnitTest::sflut_test() - Adding function(): " << ssf->getName() << endl);
+        libdap::ServerFunctionsList::TheList()->add_function(ssf);
+
+        names.clear();
+        libdap::ServerFunctionsList::TheList()->getFunctionNames(&names);
+        printFunctionNames(&names);
+        CPPUNIT_ASSERT(names.size() == 1);
+
+#if 0
+        DBG(cerr << "ServerFunctionsListUnitTest::sflut_test() - Deleting the List." << endl);
+        libdap::ServerFunctionsList::delete_instance();
+
+        // This is needed because we used pthread_once to ensure that
+        // initialize_instance() is called at most once. We manually call
+        // the delete method, so the object must be remade. This would never
+        // be done by non-test code. jhrg 5/2/13
+        libdap::ServerFunctionsList::initialize_instance();
+
+        names.clear();
+        libdap::ServerFunctionsList::TheList()->getFunctionNames(&names);
+        printFunctionNames(&names);
+        CPPUNIT_ASSERT(names.size()==0);
+#endif
+
+    }
+
+};
+} // libdap namespace
+
+// BindTest
+
+CPPUNIT_TEST_SUITE_REGISTRATION (libdap::ServerFunctionsListUnitTest);
+
+int main(int argc, char*argv[])
+{
+    GetOpt getopt(argc, argv, "dh");
+    int option_char;
+    while ((option_char = getopt()) != -1)
+        switch (option_char) {
+        case 'd':
+            debug = 1;  // debug is a static global
+            break;
+        case 'h': {     // help - show test names
+            cerr << "Usage: ServerFunctionsListUnitTest has the following tests:" << endl;
+            const std::vector<Test*> &tests = libdap::ServerFunctionsListUnitTest::suite()->getTests();
+            unsigned int prefix_len = libdap::ServerFunctionsListUnitTest::suite()->getName().append("::").length();
+            for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+                cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+            }
+            break;
+        }
+        default:
+            break;
+        }
+
+    CppUnit::TextTestRunner runner;
+    runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
+    bool wasSuccessful = true;
+    string test = "";
+    int i = getopt.optind;
+    if (i == argc) {
+        // run them all
+        wasSuccessful = runner.run("");
+    }
+    else {
+        for (; i < argc; ++i) {
+            if (debug) cerr << "Running " << argv[i] << endl;
+            test = libdap::ServerFunctionsListUnitTest::suite()->getName().append("::").append(argv[i]);
+            wasSuccessful = wasSuccessful && runner.run(test);
+        }
+    }
+
+    return wasSuccessful ? 0 : 1;
+}
+
diff --git a/unit-tests/SignalHandlerTest.cc b/unit-tests/SignalHandlerTest.cc
new file mode 100644
index 0000000..8083c6f
--- /dev/null
+++ b/unit-tests/SignalHandlerTest.cc
@@ -0,0 +1,179 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#include <cppunit/TextTestRunner.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+#include <cppunit/extensions/HelperMacros.h>
+
+#ifndef WIN32
+#include <unistd.h>  // for alarm sleep
+#else
+#include <io.h>
+#include <fcntl.h>
+#include <process.h>
+#endif
+
+#include "GetOpt.h"
+#include "SignalHandler.h"
+#include "debug.h"
+
+using namespace CppUnit;
+using namespace std;
+
+static bool debug = false;
+
+#undef DBG
+#define DBG(x) do { if (debug) (x); } while(false);
+
+namespace libdap {
+
+/** Test Handler. This is used with the SignalHandlerTest unit tests. */
+class TestHandler: public EventHandler {
+public:
+    int flag;
+
+    TestHandler() :
+        flag(0)
+    {
+    }
+
+    virtual void handle_signal(int signum)
+    {
+        DBG(cerr << "signal number " << signum << " received" << endl);
+        flag = 1;
+    }
+};
+
+class SignalHandlerTest: public TestFixture {
+private:
+    SignalHandler *sh;
+    TestHandler *th;
+
+public:
+    SignalHandlerTest()
+    {
+    }
+    ~SignalHandlerTest()
+    {
+    }
+
+    void setUp()
+    {
+        sh = SignalHandler::instance();
+        th = new TestHandler;
+    }
+
+    void tearDown()
+    {
+        delete th;
+        th = 0;
+    }
+
+    // Tests for methods
+    void register_handler_test()
+    {
+        sh->register_handler(SIGALRM, th);
+        CPPUNIT_ASSERT(sh->d_signal_handlers[SIGALRM] == th);
+    }
+
+    void remove_handler_test()
+    {
+        sh->register_handler(SIGALRM, th);
+        CPPUNIT_ASSERT(sh->remove_handler(SIGALRM) == th);
+    }
+
+    void alarm_test()
+    {
+        sh->register_handler(SIGALRM, th, true);
+        CPPUNIT_ASSERT(th->flag == 0);
+        alarm(1);
+
+        // sleep(2) also works _except_ when run with valgrind; reason
+        // unknown. jhrg 4/26/13
+        int start, end;
+        start = end = time(0);
+        while (end < start + 2)
+            end = time(0);
+
+        DBG(cerr << "Event handler 'flag' value: " << th->flag << endl);
+        CPPUNIT_ASSERT(th->flag == 1);
+    }
+
+    CPPUNIT_TEST_SUITE (SignalHandlerTest);
+
+    CPPUNIT_TEST (register_handler_test);
+    CPPUNIT_TEST (remove_handler_test);
+    CPPUNIT_TEST (alarm_test);
+
+    CPPUNIT_TEST_SUITE_END();
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION (SignalHandlerTest);
+
+}
+
+int main(int argc, char*argv[])
+{
+    GetOpt getopt(argc, argv, "dh");
+    int option_char;
+
+    while ((option_char = getopt()) != -1)
+        switch (option_char) {
+        case 'd':
+            debug = 1;  // debug is a static global
+            break;
+        case 'h': {     // help - show test names
+            cerr << "Usage: SignalHandlerTest has the following tests:" << endl;
+            const std::vector<Test*> &tests = libdap::SignalHandlerTest::suite()->getTests();
+            unsigned int prefix_len = libdap::SignalHandlerTest::suite()->getName().append("::").length();
+            for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+                cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+            }
+            break;
+        }
+        default:
+            break;
+        }
+
+    CppUnit::TextTestRunner runner;
+    runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
+    bool wasSuccessful = true;
+    string test = "";
+    int i = getopt.optind;
+    if (i == argc) {
+        // run them all
+        wasSuccessful = runner.run("");
+    }
+    else {
+        for ( ; i < argc; ++i) {
+            if (debug) cerr << "Running " << argv[i] << endl;
+            test = libdap::SignalHandlerTest::suite()->getName().append("::").append(argv[i]);
+            wasSuccessful = wasSuccessful && runner.run(test);
+        }
+    }
+
+    return wasSuccessful ? 0 : 1;
+}
+
diff --git a/unit-tests/ancT.cc b/unit-tests/ancT.cc
new file mode 100644
index 0000000..f00a63b
--- /dev/null
+++ b/unit-tests/ancT.cc
@@ -0,0 +1,162 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+// 
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+// 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#include <cppunit/TextTestRunner.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+#include <cppunit/extensions/HelperMacros.h>
+
+#ifndef TM_IN_SYS_TIME
+#include <time.h>
+#else
+#include <sys/time.h>
+#endif
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>   // for stat
+
+#include <string>
+#include <sstream>
+
+#include "GetOpt.h"
+
+#include "Ancillary.h"
+
+#include "debug.h"
+#include <test_config.h>
+
+using namespace CppUnit;
+using namespace std;
+using namespace libdap;
+
+static bool debug = false;
+
+class ancT: public TestFixture {
+private:
+
+protected:
+
+public:
+    ancT()
+    {
+    }
+    ~ancT()
+    {
+    }
+
+    void setUp()
+    {
+    }
+
+    void tearDown()
+    {
+    }
+
+    CPPUNIT_TEST_SUITE (ancT);
+
+    CPPUNIT_TEST (find_ancillary_file_test);
+    CPPUNIT_TEST (find_group_ancillary_file_test);
+
+    CPPUNIT_TEST_SUITE_END();
+
+    void find_ancillary_file_test()
+    {
+        CPPUNIT_ASSERT(
+            Ancillary::find_ancillary_file((string) TEST_SRC_DIR + "/das-testsuite/test.1", "das", "", "")
+                == (string) TEST_SRC_DIR + "/das-testsuite/test.1.das");
+        CPPUNIT_ASSERT(
+            Ancillary::find_ancillary_file((string) TEST_SRC_DIR + "/das-testsuite/special.test.hdf", "das", "", "")
+                == (string) TEST_SRC_DIR + "/das-testsuite/special.test.das");
+        CPPUNIT_ASSERT(
+            Ancillary::find_ancillary_file((string) TEST_SRC_DIR + "/das-testsuite/test.2", "das", "", "")
+                == (string) TEST_SRC_DIR + "/das-testsuite/das");
+        CPPUNIT_ASSERT(
+            Ancillary::find_ancillary_file((string) TEST_SRC_DIR + "/das-testsuite/test.1.gz", "das", "", "")
+                == (string) TEST_SRC_DIR + "/das-testsuite/test.1.das");
+        CPPUNIT_ASSERT(
+            Ancillary::find_ancillary_file((string) TEST_SRC_DIR + "/das-testsuite/test.3.Z", "das", "", "")
+                == (string) TEST_SRC_DIR + "/das-testsuite/test.3.Z.das");
+    }
+
+    void find_group_ancillary_file_test()
+    {
+        CPPUNIT_ASSERT(
+            Ancillary::find_group_ancillary_file((string) TEST_SRC_DIR + "/cgi-util-tests/02group.hdf", ".htm")
+                == (string) TEST_SRC_DIR + "/cgi-util-tests/group.htm");
+        CPPUNIT_ASSERT(
+            Ancillary::find_group_ancillary_file((string) TEST_SRC_DIR + "/cgi-util-tests/group01.hdf", ".htm")
+                == (string) TEST_SRC_DIR + "/cgi-util-tests/group.htm");
+        CPPUNIT_ASSERT(
+            Ancillary::find_group_ancillary_file((string) TEST_SRC_DIR + "/cgi-util-tests/group.hdf", ".htm") == "");
+    }
+
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION (ancT);
+
+int main(int argc, char *argv[])
+{
+    GetOpt getopt(argc, argv, "dh");
+    int option_char;
+
+    while ((option_char = getopt()) != -1)
+        switch (option_char) {
+        case 'd':
+            debug = 1;  // debug is a static global
+            break;
+
+        case 'h': {     // help - show test names
+            cerr << "Usage: ancT has the following tests:" << endl;
+            const std::vector<Test*> &tests = ancT::suite()->getTests();
+            unsigned int prefix_len = ancT::suite()->getName().append("::").length();
+            for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+                cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+            }
+            break;
+        }
+
+        default:
+            break;
+        }
+
+    CppUnit::TextTestRunner runner;
+    runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
+    bool wasSuccessful = true;
+    string test = "";
+    int i = getopt.optind;
+    if (i == argc) {
+        // run them all
+        wasSuccessful = runner.run("");
+    }
+    else {
+        for (; i < argc; ++i) {
+            if (debug) cerr << "Running " << argv[i] << endl;
+            test = ancT::suite()->getName().append("::").append(argv[i]);
+            wasSuccessful = wasSuccessful && runner.run(test);
+        }
+    }
+
+    return wasSuccessful ? 0 : 1;
+}
diff --git a/unit-tests/arrayT.cc b/unit-tests/arrayT.cc
new file mode 100644
index 0000000..b6a8bc1
--- /dev/null
+++ b/unit-tests/arrayT.cc
@@ -0,0 +1,216 @@
+#include <cppunit/TestFixture.h>
+#include <cppunit/TestAssert.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+#include <cppunit/ui/text/TestRunner.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/CompilerOutputter.h>
+
+#include <iostream>
+#include "TestArray.h"
+#include "TestInt16.h"
+#include "TestTypeFactory.h"
+
+#include "util.h"
+#include "debug.h"
+
+#include "GetOpt.h"
+
+using std::cerr;
+using std::endl;
+
+using namespace CppUnit;
+
+int test_variable_sleep_interval = 0; // Used in Test* classes for testing
+// timeouts.
+
+static bool debug = false;
+
+class arrayT: public CppUnit::TestFixture {
+
+CPPUNIT_TEST_SUITE (arrayT);
+    CPPUNIT_TEST(arrayT_test);CPPUNIT_TEST_SUITE_END( )
+    ;
+
+private:
+    /* TEST PRIVATE DATA */
+    TestTypeFactory *factory;
+
+public:
+    void setUp()
+    {
+        factory = new TestTypeFactory;
+    }
+
+    void tearDown()
+    {
+        delete factory;
+        factory = 0;
+    }
+
+    void arrayT_test()
+    {
+        BaseType *bt = factory->NewInt16();
+
+        TestArray ar("My Array", bt);
+
+        int l = ar.length();
+        CPPUNIT_ASSERT(l == -1);
+
+        try {
+            int w = ar.width(true);
+            DBG(cerr << "w = " << w << endl);DBG(cerr << "(int)bt->width() " << (int)bt->width() << endl);DBG(cerr << "L " << l << endl);
+            CPPUNIT_ASSERT(w == (l * (int ) bt->width()));
+        }
+        catch (InternalErr &e) {
+            CPPUNIT_FAIL("Unable to retrieve width");
+        }
+
+        ar.append_dim(4, "dim1");
+
+        l = ar.length();
+        CPPUNIT_ASSERT(l == 4);
+
+        try {
+            int w = ar.width();
+            CPPUNIT_ASSERT(w == (l * (int ) bt->width()));
+        }
+        catch (InternalErr &e) {
+            CPPUNIT_FAIL("Unable to retrieve width");
+        }
+
+        ar.append_dim(3, "dim2");
+
+        l = ar.length();
+        CPPUNIT_ASSERT(l == 12);
+
+        try {
+            int w = ar.width();
+            CPPUNIT_ASSERT(w == (l * (int ) bt->width()));
+        }
+        catch (InternalErr &e) {
+            CPPUNIT_FAIL("Unable to retrieve width");
+        }
+
+        ar.append_dim(2, "dim3");
+
+        l = ar.length();
+        CPPUNIT_ASSERT(l == 24);
+
+        try {
+            int w = ar.width();
+            CPPUNIT_ASSERT(w == (l * (int ) bt->width()));
+        }
+        catch (InternalErr &e) {
+            CPPUNIT_FAIL("Unable to retrieve width");
+        }
+
+        vector<string> dims;
+        typedef vector<string>::const_iterator citer;
+        dims.push_back("dim1");
+        dims.push_back("dim2");
+        dims.push_back("dim3");
+
+        vector<int> dimsize;
+        typedef vector<int>::const_iterator dsiter;
+        dimsize.push_back(4);
+        dimsize.push_back(3);
+        dimsize.push_back(2);
+
+        citer i = dims.begin();
+        dsiter d = dimsize.begin();
+        Array::Dim_iter diter = ar.dim_begin();
+        i = dims.begin();
+        d = dimsize.begin();
+        for (; diter != ar.dim_end() && i != dims.end(); diter++, i++, d++) {
+            CPPUNIT_ASSERT(ar.dimension_name(diter) == (*i));
+            if (ar.dimension_name(diter) == (*i)) {
+                CPPUNIT_ASSERT(ar.dimension_size(diter) == (*d));
+                CPPUNIT_ASSERT(ar.dimension_start(diter) == 0);
+                CPPUNIT_ASSERT(ar.dimension_stop(diter) == (*d) - 1);
+                CPPUNIT_ASSERT(ar.dimension_stride(diter) == 1);
+            }
+        }
+        if (diter != ar.dim_end() && i == dims.end()) {
+            CPPUNIT_FAIL("too many dimensions");
+        }
+        else if (diter == ar.dim_end() && i != dims.end()) {
+            CPPUNIT_FAIL("not enough dimensions");
+        }
+
+        unsigned int numdims = ar.dimensions();
+        CPPUNIT_ASSERT(numdims == 3);
+
+        diter = ar.dim_begin();
+        ar.add_constraint(diter, 0, 2, 3);
+
+        l = ar.length();
+        CPPUNIT_ASSERT(l == 12);
+
+        diter = ar.dim_begin();
+        diter++;
+        ar.add_constraint(diter, 0, 2, 2);
+
+        l = ar.length();
+        CPPUNIT_ASSERT(l == 8);
+
+        ar.reset_constraint();
+
+        l = ar.length();
+        CPPUNIT_ASSERT(l == 24);
+
+        bool is_read = ar.read();
+        CPPUNIT_ASSERT(is_read == true);
+
+        cout << ar << endl;
+
+        delete bt;
+    }
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION(arrayT);
+
+int main(int argc, char *argv[])
+{
+    GetOpt getopt(argc, argv, "dh");
+    int option_char;
+
+    while ((option_char = getopt()) != -1)
+        switch (option_char) {
+        case 'd':
+            debug = 1;  // debug is a static global
+            break;
+
+        case 'h': {     // help - show test names
+            cerr << "Usage: arrayT has the following tests:" << endl;
+            const std::vector<Test*> &tests = arrayT::suite()->getTests();
+            unsigned int prefix_len = arrayT::suite()->getName().append("::").length();
+            for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+                cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+            }
+            break;
+        }
+
+        default:
+            break;
+        }
+
+    CppUnit::TextTestRunner runner;
+    runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
+    bool wasSuccessful = true;
+    string test = "";
+    int i = getopt.optind;
+    if (i == argc) {
+        // run them all
+        wasSuccessful = runner.run("");
+    }
+    else {
+        for (; i < argc; ++i) {
+            if (debug) cerr << "Running " << argv[i] << endl;
+            test = arrayT::suite()->getName().append("::").append(argv[i]);
+            wasSuccessful = wasSuccessful && runner.run(test);
+        }
+    }
+
+    return wasSuccessful ? 0 : 1;
+}
diff --git a/unit-tests/attrTableT.cc b/unit-tests/attrTableT.cc
new file mode 100644
index 0000000..5908564
--- /dev/null
+++ b/unit-tests/attrTableT.cc
@@ -0,0 +1,330 @@
+#include <cppunit/TestFixture.h>
+#include <cppunit/TestAssert.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+#include <cppunit/ui/text/TestRunner.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/CompilerOutputter.h>
+
+#include <iostream>
+#include <vector>
+#include "AttrTable.h"
+#include "GetOpt.h"
+
+using std::cerr;
+using std::endl;
+using std::vector;
+
+using namespace CppUnit;
+using namespace libdap;
+
+int test_variable_sleep_interval = 0; // Used in Test* classes for testing
+// timeouts.
+
+static bool debug = false;
+
+class attrTableT: public CppUnit::TestFixture {
+
+CPPUNIT_TEST_SUITE (attrTableT);
+    CPPUNIT_TEST(attrTableT_test);CPPUNIT_TEST_SUITE_END( )
+    ;
+
+private:
+    /* TEST PRIVATE DATA */
+
+public:
+    void setUp()
+    {
+    }
+
+    void tearDown()
+    {
+    }
+
+    void attrTableT_test()
+    {
+        AttrTable at;
+
+        unsigned int at_size = at.get_size();
+        CPPUNIT_ASSERT(at_size == 0);
+
+        string at_name = at.get_name();
+        CPPUNIT_ASSERT(at_name == "");
+
+        at.set_name("My Attributes");
+        at_name = at.get_name();
+        CPPUNIT_ASSERT(at_name == "My Attributes");
+
+        AttrTable *container = at.find_container("dummy_container");
+        CPPUNIT_ASSERT(!container);
+
+        AttrTable *dummy_at = 0;
+
+        AttrTable::Attr_iter iter;
+        at.find("dummy_attr", &dummy_at, &iter);
+        CPPUNIT_ASSERT(iter == at.attr_end());
+
+        string attr_name = "attr1";
+        string attr_type = "string";
+        string attr_value = "attr1Value1";
+        at.append_attr(attr_name, attr_type, attr_value);
+
+        attr_name = "attr2";
+        attr_type = "string";
+        attr_value = "attr2Value1";
+        at.append_attr(attr_name, attr_type, attr_value);
+
+        attr_name = "attr3";
+        attr_type = "string";
+        attr_value = "attr3Value1";
+        at.append_attr(attr_name, attr_type, attr_value);
+
+        at.append_attr("attr4", "string", "attr4Value1");
+
+        at_size = at.get_size();
+        CPPUNIT_ASSERT(at_size == 4);
+
+        //at.print( stdout ) ;
+        iter = at.attr_end();
+        at.find("attr3", &dummy_at, &iter);
+        CPPUNIT_ASSERT(iter != at.attr_end());
+
+        iter = at.attr_end();
+        at.find("dummy_attr", &dummy_at, &iter);
+        CPPUNIT_ASSERT(iter == at.attr_end());
+
+        attr_type = at.get_type("attr3");
+        CPPUNIT_ASSERT(attr_type == "String");
+
+        AttrType attr_type_enum = at.get_attr_type("attr3");
+        CPPUNIT_ASSERT(attr_type_enum == Attr_string);
+
+        unsigned int num_attrs = at.get_attr_num("attr3");
+        CPPUNIT_ASSERT(num_attrs == 1);
+
+        attr_value = at.get_attr("attr3");
+        CPPUNIT_ASSERT(attr_value == "attr3Value1");
+
+        at.append_attr("attr3", "string", "attr3Value2");
+        at.append_attr("attr3", "string", "attr3Value3");
+        at.append_attr("attr3", "string", "attr3Value4");
+
+        attr_value = at.get_attr("attr3");
+        CPPUNIT_ASSERT(attr_value == "attr3Value1");
+
+        vector<string> sb;
+        sb.push_back("attr3Value1");
+        sb.push_back("attr3Value2");
+        sb.push_back("attr3Value3");
+        sb.push_back("attr3Value4");
+
+        typedef vector<string>::const_iterator str_citer;
+        typedef vector<string>::iterator str_iter;
+
+        vector<string> *values = at.get_attr_vector("attr3");
+        CPPUNIT_ASSERT(values);
+        if (values) {
+            str_citer vi = values->begin();
+            str_citer sbi = sb.begin();
+            for (; vi != values->end() && sbi != sb.end(); vi++, sbi++) {
+                CPPUNIT_ASSERT((*vi) == (*sbi));
+            }
+            CPPUNIT_ASSERT(vi == values->end() && sbi == sb.end());
+            if (vi == values->end() && sbi != sb.end()) {
+                CPPUNIT_FAIL("not enough values");
+            }
+            else if (vi != values->end() && sbi == sb.end()) {
+                CPPUNIT_FAIL("too many values");
+            }
+        }
+
+        vector<string> attrs;
+        attrs.push_back("attr1");
+        attrs.push_back("attr2");
+        attrs.push_back("attr3");
+        attrs.push_back("attr4");
+
+        str_citer ai = attrs.begin();
+        AttrTable::Attr_iter i = at.attr_begin();
+        // ai = attrs.begin() ;
+        for (; i != at.attr_end() && ai != attrs.end(); i++, ai++) {
+            CPPUNIT_ASSERT((*i)->name == (*ai));
+        }
+        CPPUNIT_ASSERT(i == at.attr_end() && ai == attrs.end());
+        if (i != at.attr_end() && ai == attrs.end()) {
+            CPPUNIT_FAIL("too many attributes");
+        }
+        else if (i == at.attr_end() && ai != attrs.end()) {
+            CPPUNIT_FAIL("not enough attributes");
+        }
+
+        iter = at.attr_end();
+        at.find("attr3", &dummy_at, &iter);
+        CPPUNIT_ASSERT(iter != at.attr_end());
+
+        attr_name = at.get_name(iter);
+        CPPUNIT_ASSERT(attr_name == "attr3");
+
+        bool isit = at.is_container(iter);
+        CPPUNIT_ASSERT(isit == false);
+
+        dummy_at = at.get_attr_table(iter);
+        CPPUNIT_ASSERT(!dummy_at);
+
+        attr_type = at.get_type(iter);
+        CPPUNIT_ASSERT(attr_type == "String");
+
+        attr_type_enum = at.get_attr_type(iter);
+        CPPUNIT_ASSERT(attr_type_enum == Attr_string);
+
+        attr_value = at.get_attr(iter);
+        CPPUNIT_ASSERT(attr_value == "attr3Value1");
+
+        attr_value = at.get_attr(iter, 1);
+        CPPUNIT_ASSERT(attr_value == "attr3Value2");
+
+        values = at.get_attr_vector(iter);
+        CPPUNIT_ASSERT(values);
+        if (values) {
+            str_citer vi = values->begin();
+            str_citer sbi = sb.begin();
+            for (; vi != values->end() && sbi != sb.end(); vi++, sbi++) {
+                CPPUNIT_ASSERT((*vi) == (*sbi));
+            }
+            CPPUNIT_ASSERT(vi == values->end() && sbi == sb.end());
+            if (vi == values->end() && sbi != sb.end()) {
+                CPPUNIT_FAIL("not enough values");
+            }
+            else if (vi != values->end() && sbi == sb.end()) {
+                CPPUNIT_FAIL("too many values");
+            }
+        }
+
+        {
+            str_iter sbi = sb.begin();
+            sbi++;
+            sb.erase(sbi);
+        }
+
+        at.del_attr("attr3", 1);
+        values = at.get_attr_vector(iter);
+        CPPUNIT_ASSERT(values);
+        if (values) {
+            str_citer vi = values->begin();
+            str_citer sbi = sb.begin();
+            for (; vi != values->end() && sbi != sb.end(); vi++, sbi++) {
+                CPPUNIT_ASSERT((*vi) == (*sbi));
+            }
+            CPPUNIT_ASSERT(vi == values->end() && sbi == sb.end());
+            if (vi == values->end() && sbi != sb.end()) {
+                CPPUNIT_FAIL("not enough values");
+            }
+            else if (vi != values->end() && sbi == sb.end()) {
+                CPPUNIT_FAIL("too many values");
+            }
+        }
+
+        at.del_attr("attr3");
+        container = 0;
+        try {
+            container = at.append_container("attr2");
+            CPPUNIT_FAIL("added container named attr2 successfully - already exists");
+        }
+        catch (Error &e) {
+        }
+        CPPUNIT_ASSERT(!container);
+
+        try {
+            container = at.append_container("attr5");
+        }
+        catch (Error &e) {
+            CPPUNIT_FAIL("failed to add new container attr5");
+        }
+        CPPUNIT_ASSERT(container);
+        if (container) {
+            CPPUNIT_ASSERT(container->get_name() == "attr5");
+        }
+
+        container = at.find_container("attr5");
+        CPPUNIT_ASSERT(container);
+        if (container) {
+            string container_name = container->get_name();
+            CPPUNIT_ASSERT(container_name == "attr5");
+        }
+
+        iter = at.attr_end();
+        at.find("attr5", &dummy_at, &iter);
+        CPPUNIT_ASSERT(iter != at.attr_end());
+        attr_name = at.get_name(iter);
+        CPPUNIT_ASSERT(attr_name == "attr5");
+        isit = at.is_container(iter);
+        CPPUNIT_ASSERT(isit == true);
+        container = at.get_attr_table(iter);
+        CPPUNIT_ASSERT(container);
+        attr_type = at.get_type(iter);
+        CPPUNIT_ASSERT(attr_type == "Container");
+        attr_type_enum = at.get_attr_type(iter);
+        CPPUNIT_ASSERT(attr_type_enum == Attr_container);
+
+        /* FIX: does append attr return anything? */
+        container->append_attr("attr5-1", "string", "attr5.1Value1");
+        container->append_attr("attr5-2", "string", "attr5.2Value1");
+        container->append_attr("attr5-3", "string", "attr5.3Value1");
+        container->append_attr("attr5-4", "string", "attr5.4Value1");
+        iter = at.attr_end();
+        at.find("attr5.attr5-3", &dummy_at, &iter);
+        CPPUNIT_ASSERT(iter != at.attr_end());
+        CPPUNIT_ASSERT(container == dummy_at);
+
+        //at.print( stdout ) ;
+    }
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION(attrTableT);
+
+/* NOTHING NEEDS TO BE CHANGED BELOW HERE */
+
+int main(int argc, char *argv[])
+{
+    GetOpt getopt(argc, argv, "dh");
+    int option_char;
+
+    while ((option_char = getopt()) != -1)
+        switch (option_char) {
+        case 'd':
+            debug = 1;  // debug is a static global
+            break;
+
+        case 'h': {     // help - show test names
+            cerr << "Usage: attrTableT has the following tests:" << endl;
+            const std::vector<Test*> &tests = attrTableT::suite()->getTests();
+            unsigned int prefix_len = attrTableT::suite()->getName().append("::").length();
+            for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+                cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+            }
+            break;
+        }
+
+        default:
+            break;
+        }
+
+    CppUnit::TextTestRunner runner;
+    runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
+    bool wasSuccessful = true;
+    string test = "";
+    int i = getopt.optind;
+    if (i == argc) {
+        // run them all
+        wasSuccessful = runner.run("");
+    }
+    else {
+        for (; i < argc; ++i) {
+            if (debug) cerr << "Running " << argv[i] << endl;
+            test = attrTableT::suite()->getName().append("::").append(argv[i]);
+            wasSuccessful = wasSuccessful && runner.run(test);
+        }
+    }
+
+    return wasSuccessful ? 0 : 1;
+}
diff --git a/unit-tests/cache-testsuite/Makefile.am b/unit-tests/cache-testsuite/Makefile.am
new file mode 100644
index 0000000..092f875
--- /dev/null
+++ b/unit-tests/cache-testsuite/Makefile.am
@@ -0,0 +1,13 @@
+noinst_SCRIPTS = cleanup.sh
+
+EXTRA_DIST = cleanup.sh.in dodsrc dot.index dods_cache_init
+
+DISTCLEANFILES = cleanup.sh
+
+cleanup.sh: cleanup.sh.in ../../config.status
+	sed -e "s%[@]srcdir[@]%${srcdir}%" $< > cleanup.sh
+	chmod +x cleanup.sh
+
+clean-local: cleanup.sh
+	sh ./cleanup.sh
+	rm -rf dods_cache
diff --git a/unit-tests/cache-testsuite/Makefile.in b/unit-tests/cache-testsuite/Makefile.in
new file mode 100644
index 0000000..c993b31
--- /dev/null
+++ b/unit-tests/cache-testsuite/Makefile.in
@@ -0,0 +1,1047 @@
+# Makefile.in generated by automake 1.14 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = unit-tests/cache-testsuite
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/gl/m4/00gnulib.m4 \
+	$(top_srcdir)/gl/m4/absolute-header.m4 \
+	$(top_srcdir)/gl/m4/alloca.m4 $(top_srcdir)/gl/m4/btowc.m4 \
+	$(top_srcdir)/gl/m4/builtin-expect.m4 \
+	$(top_srcdir)/gl/m4/byteswap.m4 $(top_srcdir)/gl/m4/codeset.m4 \
+	$(top_srcdir)/gl/m4/configmake.m4 \
+	$(top_srcdir)/gl/m4/eealloc.m4 \
+	$(top_srcdir)/gl/m4/extensions.m4 \
+	$(top_srcdir)/gl/m4/extern-inline.m4 \
+	$(top_srcdir)/gl/m4/fcntl-o.m4 $(top_srcdir)/gl/m4/fcntl_h.m4 \
+	$(top_srcdir)/gl/m4/gettimeofday.m4 \
+	$(top_srcdir)/gl/m4/glibc21.m4 \
+	$(top_srcdir)/gl/m4/gnulib-common.m4 \
+	$(top_srcdir)/gl/m4/gnulib-comp.m4 \
+	$(top_srcdir)/gl/m4/gnulib-tool.m4 \
+	$(top_srcdir)/gl/m4/hard-locale.m4 \
+	$(top_srcdir)/gl/m4/include_next.m4 \
+	$(top_srcdir)/gl/m4/langinfo_h.m4 \
+	$(top_srcdir)/gl/m4/largefile.m4 $(top_srcdir)/gl/m4/lib-ld.m4 \
+	$(top_srcdir)/gl/m4/lib-link.m4 \
+	$(top_srcdir)/gl/m4/lib-prefix.m4 \
+	$(top_srcdir)/gl/m4/limits-h.m4 \
+	$(top_srcdir)/gl/m4/localcharset.m4 \
+	$(top_srcdir)/gl/m4/locale-fr.m4 \
+	$(top_srcdir)/gl/m4/locale-ja.m4 \
+	$(top_srcdir)/gl/m4/locale-zh.m4 \
+	$(top_srcdir)/gl/m4/locale_h.m4 \
+	$(top_srcdir)/gl/m4/localeconv.m4 \
+	$(top_srcdir)/gl/m4/localtime-buffer.m4 \
+	$(top_srcdir)/gl/m4/lock.m4 $(top_srcdir)/gl/m4/longlong.m4 \
+	$(top_srcdir)/gl/m4/lstat.m4 $(top_srcdir)/gl/m4/malloca.m4 \
+	$(top_srcdir)/gl/m4/mbrtowc.m4 $(top_srcdir)/gl/m4/mbsinit.m4 \
+	$(top_srcdir)/gl/m4/mbstate_t.m4 $(top_srcdir)/gl/m4/mbtowc.m4 \
+	$(top_srcdir)/gl/m4/mkstemps.m4 \
+	$(top_srcdir)/gl/m4/multiarch.m4 \
+	$(top_srcdir)/gl/m4/nl_langinfo.m4 \
+	$(top_srcdir)/gl/m4/off_t.m4 $(top_srcdir)/gl/m4/pathmax.m4 \
+	$(top_srcdir)/gl/m4/pthread_rwlock_rdlock.m4 \
+	$(top_srcdir)/gl/m4/regex.m4 $(top_srcdir)/gl/m4/ssize_t.m4 \
+	$(top_srcdir)/gl/m4/stat.m4 $(top_srcdir)/gl/m4/stdbool.m4 \
+	$(top_srcdir)/gl/m4/stddef_h.m4 $(top_srcdir)/gl/m4/stdint.m4 \
+	$(top_srcdir)/gl/m4/stdlib_h.m4 \
+	$(top_srcdir)/gl/m4/sys_socket_h.m4 \
+	$(top_srcdir)/gl/m4/sys_stat_h.m4 \
+	$(top_srcdir)/gl/m4/sys_time_h.m4 \
+	$(top_srcdir)/gl/m4/sys_types_h.m4 \
+	$(top_srcdir)/gl/m4/tempname.m4 \
+	$(top_srcdir)/gl/m4/threadlib.m4 $(top_srcdir)/gl/m4/time_h.m4 \
+	$(top_srcdir)/gl/m4/unistd_h.m4 \
+	$(top_srcdir)/gl/m4/warn-on-use.m4 \
+	$(top_srcdir)/gl/m4/wchar_h.m4 $(top_srcdir)/gl/m4/wchar_t.m4 \
+	$(top_srcdir)/gl/m4/wcrtomb.m4 $(top_srcdir)/gl/m4/wctype_h.m4 \
+	$(top_srcdir)/gl/m4/wint_t.m4 $(top_srcdir)/conf/acinclude.m4 \
+	$(top_srcdir)/conf/cppunit.m4 \
+	$(top_srcdir)/conf/gcov_valgrind.m4 \
+	$(top_srcdir)/conf/libtool.m4 $(top_srcdir)/conf/ltoptions.m4 \
+	$(top_srcdir)/conf/ltsugar.m4 $(top_srcdir)/conf/ltversion.m4 \
+	$(top_srcdir)/conf/lt~obsolete.m4 $(top_srcdir)/conf/pkg.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h \
+	$(top_builddir)/dods-datatypes-config.h \
+	$(top_builddir)/xdr-datatypes-config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SCRIPTS = $(noinst_SCRIPTS)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+pkglibexecdir = @pkglibexecdir@
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALLOCA_H = @ALLOCA_H@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
+AR = @AR@
+ARFLAGS = @ARFLAGS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BITSIZEOF_PTRDIFF_T = @BITSIZEOF_PTRDIFF_T@
+BITSIZEOF_SIG_ATOMIC_T = @BITSIZEOF_SIG_ATOMIC_T@
+BITSIZEOF_SIZE_T = @BITSIZEOF_SIZE_T@
+BITSIZEOF_WCHAR_T = @BITSIZEOF_WCHAR_T@
+BITSIZEOF_WINT_T = @BITSIZEOF_WINT_T@
+BYTESWAP_H = @BYTESWAP_H@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CLIENTLIB_AGE = @CLIENTLIB_AGE@
+CLIENTLIB_CURRENT = @CLIENTLIB_CURRENT@
+CLIENTLIB_REVISION = @CLIENTLIB_REVISION@
+CLIENTLIB_VERSION = @CLIENTLIB_VERSION@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@
+CPPUNIT_CONFIG = @CPPUNIT_CONFIG@
+CPPUNIT_LIBS = @CPPUNIT_LIBS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_LIBS = @CURL_LIBS@
+CURL_STATIC_LIBS = @CURL_STATIC_LIBS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DAPLIB_AGE = @DAPLIB_AGE@
+DAPLIB_CURRENT = @DAPLIB_CURRENT@
+DAPLIB_REVISION = @DAPLIB_REVISION@
+DAP_PROTOCOL_VERSION = @DAP_PROTOCOL_VERSION@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+DVR = @DVR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GLIBC21 = @GLIBC21@
+GNULIB_ATOLL = @GNULIB_ATOLL@
+GNULIB_BTOWC = @GNULIB_BTOWC@
+GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@
+GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
+GNULIB_CHDIR = @GNULIB_CHDIR@
+GNULIB_CHOWN = @GNULIB_CHOWN@
+GNULIB_CLOSE = @GNULIB_CLOSE@
+GNULIB_CTIME = @GNULIB_CTIME@
+GNULIB_DUP = @GNULIB_DUP@
+GNULIB_DUP2 = @GNULIB_DUP2@
+GNULIB_DUP3 = @GNULIB_DUP3@
+GNULIB_DUPLOCALE = @GNULIB_DUPLOCALE@
+GNULIB_ENVIRON = @GNULIB_ENVIRON@
+GNULIB_EUIDACCESS = @GNULIB_EUIDACCESS@
+GNULIB_FACCESSAT = @GNULIB_FACCESSAT@
+GNULIB_FCHDIR = @GNULIB_FCHDIR@
+GNULIB_FCHMODAT = @GNULIB_FCHMODAT@
+GNULIB_FCHOWNAT = @GNULIB_FCHOWNAT@
+GNULIB_FCNTL = @GNULIB_FCNTL@
+GNULIB_FDATASYNC = @GNULIB_FDATASYNC@
+GNULIB_FSTAT = @GNULIB_FSTAT@
+GNULIB_FSTATAT = @GNULIB_FSTATAT@
+GNULIB_FSYNC = @GNULIB_FSYNC@
+GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@
+GNULIB_FUTIMENS = @GNULIB_FUTIMENS@
+GNULIB_GETCWD = @GNULIB_GETCWD@
+GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@
+GNULIB_GETDTABLESIZE = @GNULIB_GETDTABLESIZE@
+GNULIB_GETGROUPS = @GNULIB_GETGROUPS@
+GNULIB_GETHOSTNAME = @GNULIB_GETHOSTNAME@
+GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@
+GNULIB_GETLOGIN = @GNULIB_GETLOGIN@
+GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@
+GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@
+GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@
+GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@
+GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@
+GNULIB_GRANTPT = @GNULIB_GRANTPT@
+GNULIB_GROUP_MEMBER = @GNULIB_GROUP_MEMBER@
+GNULIB_ISATTY = @GNULIB_ISATTY@
+GNULIB_ISWBLANK = @GNULIB_ISWBLANK@
+GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@
+GNULIB_LCHMOD = @GNULIB_LCHMOD@
+GNULIB_LCHOWN = @GNULIB_LCHOWN@
+GNULIB_LINK = @GNULIB_LINK@
+GNULIB_LINKAT = @GNULIB_LINKAT@
+GNULIB_LOCALECONV = @GNULIB_LOCALECONV@
+GNULIB_LOCALTIME = @GNULIB_LOCALTIME@
+GNULIB_LSEEK = @GNULIB_LSEEK@
+GNULIB_LSTAT = @GNULIB_LSTAT@
+GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@
+GNULIB_MBRLEN = @GNULIB_MBRLEN@
+GNULIB_MBRTOWC = @GNULIB_MBRTOWC@
+GNULIB_MBSINIT = @GNULIB_MBSINIT@
+GNULIB_MBSNRTOWCS = @GNULIB_MBSNRTOWCS@
+GNULIB_MBSRTOWCS = @GNULIB_MBSRTOWCS@
+GNULIB_MBTOWC = @GNULIB_MBTOWC@
+GNULIB_MKDIRAT = @GNULIB_MKDIRAT@
+GNULIB_MKDTEMP = @GNULIB_MKDTEMP@
+GNULIB_MKFIFO = @GNULIB_MKFIFO@
+GNULIB_MKFIFOAT = @GNULIB_MKFIFOAT@
+GNULIB_MKNOD = @GNULIB_MKNOD@
+GNULIB_MKNODAT = @GNULIB_MKNODAT@
+GNULIB_MKOSTEMP = @GNULIB_MKOSTEMP@
+GNULIB_MKOSTEMPS = @GNULIB_MKOSTEMPS@
+GNULIB_MKSTEMP = @GNULIB_MKSTEMP@
+GNULIB_MKSTEMPS = @GNULIB_MKSTEMPS@
+GNULIB_MKTIME = @GNULIB_MKTIME@
+GNULIB_NANOSLEEP = @GNULIB_NANOSLEEP@
+GNULIB_NL_LANGINFO = @GNULIB_NL_LANGINFO@
+GNULIB_NONBLOCKING = @GNULIB_NONBLOCKING@
+GNULIB_OPEN = @GNULIB_OPEN@
+GNULIB_OPENAT = @GNULIB_OPENAT@
+GNULIB_OVERRIDES_STRUCT_STAT = @GNULIB_OVERRIDES_STRUCT_STAT@
+GNULIB_OVERRIDES_WINT_T = @GNULIB_OVERRIDES_WINT_T@
+GNULIB_PIPE = @GNULIB_PIPE@
+GNULIB_PIPE2 = @GNULIB_PIPE2@
+GNULIB_POSIX_OPENPT = @GNULIB_POSIX_OPENPT@
+GNULIB_PREAD = @GNULIB_PREAD@
+GNULIB_PTSNAME = @GNULIB_PTSNAME@
+GNULIB_PTSNAME_R = @GNULIB_PTSNAME_R@
+GNULIB_PUTENV = @GNULIB_PUTENV@
+GNULIB_PWRITE = @GNULIB_PWRITE@
+GNULIB_QSORT_R = @GNULIB_QSORT_R@
+GNULIB_RANDOM = @GNULIB_RANDOM@
+GNULIB_RANDOM_R = @GNULIB_RANDOM_R@
+GNULIB_READ = @GNULIB_READ@
+GNULIB_READLINK = @GNULIB_READLINK@
+GNULIB_READLINKAT = @GNULIB_READLINKAT@
+GNULIB_REALLOCARRAY = @GNULIB_REALLOCARRAY@
+GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@
+GNULIB_REALPATH = @GNULIB_REALPATH@
+GNULIB_RMDIR = @GNULIB_RMDIR@
+GNULIB_RPMATCH = @GNULIB_RPMATCH@
+GNULIB_SECURE_GETENV = @GNULIB_SECURE_GETENV@
+GNULIB_SETENV = @GNULIB_SETENV@
+GNULIB_SETHOSTNAME = @GNULIB_SETHOSTNAME@
+GNULIB_SETLOCALE = @GNULIB_SETLOCALE@
+GNULIB_SLEEP = @GNULIB_SLEEP@
+GNULIB_STAT = @GNULIB_STAT@
+GNULIB_STRFTIME = @GNULIB_STRFTIME@
+GNULIB_STRPTIME = @GNULIB_STRPTIME@
+GNULIB_STRTOD = @GNULIB_STRTOD@
+GNULIB_STRTOLL = @GNULIB_STRTOLL@
+GNULIB_STRTOULL = @GNULIB_STRTOULL@
+GNULIB_SYMLINK = @GNULIB_SYMLINK@
+GNULIB_SYMLINKAT = @GNULIB_SYMLINKAT@
+GNULIB_SYSTEM_POSIX = @GNULIB_SYSTEM_POSIX@
+GNULIB_TIMEGM = @GNULIB_TIMEGM@
+GNULIB_TIME_R = @GNULIB_TIME_R@
+GNULIB_TIME_RZ = @GNULIB_TIME_RZ@
+GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@
+GNULIB_TRUNCATE = @GNULIB_TRUNCATE@
+GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@
+GNULIB_TZSET = @GNULIB_TZSET@
+GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@
+GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@
+GNULIB_UNLINK = @GNULIB_UNLINK@
+GNULIB_UNLINKAT = @GNULIB_UNLINKAT@
+GNULIB_UNLOCKPT = @GNULIB_UNLOCKPT@
+GNULIB_UNSETENV = @GNULIB_UNSETENV@
+GNULIB_USLEEP = @GNULIB_USLEEP@
+GNULIB_UTIMENSAT = @GNULIB_UTIMENSAT@
+GNULIB_WCPCPY = @GNULIB_WCPCPY@
+GNULIB_WCPNCPY = @GNULIB_WCPNCPY@
+GNULIB_WCRTOMB = @GNULIB_WCRTOMB@
+GNULIB_WCSCASECMP = @GNULIB_WCSCASECMP@
+GNULIB_WCSCAT = @GNULIB_WCSCAT@
+GNULIB_WCSCHR = @GNULIB_WCSCHR@
+GNULIB_WCSCMP = @GNULIB_WCSCMP@
+GNULIB_WCSCOLL = @GNULIB_WCSCOLL@
+GNULIB_WCSCPY = @GNULIB_WCSCPY@
+GNULIB_WCSCSPN = @GNULIB_WCSCSPN@
+GNULIB_WCSDUP = @GNULIB_WCSDUP@
+GNULIB_WCSFTIME = @GNULIB_WCSFTIME@
+GNULIB_WCSLEN = @GNULIB_WCSLEN@
+GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@
+GNULIB_WCSNCAT = @GNULIB_WCSNCAT@
+GNULIB_WCSNCMP = @GNULIB_WCSNCMP@
+GNULIB_WCSNCPY = @GNULIB_WCSNCPY@
+GNULIB_WCSNLEN = @GNULIB_WCSNLEN@
+GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@
+GNULIB_WCSPBRK = @GNULIB_WCSPBRK@
+GNULIB_WCSRCHR = @GNULIB_WCSRCHR@
+GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@
+GNULIB_WCSSPN = @GNULIB_WCSSPN@
+GNULIB_WCSSTR = @GNULIB_WCSSTR@
+GNULIB_WCSTOK = @GNULIB_WCSTOK@
+GNULIB_WCSWIDTH = @GNULIB_WCSWIDTH@
+GNULIB_WCSXFRM = @GNULIB_WCSXFRM@
+GNULIB_WCTOB = @GNULIB_WCTOB@
+GNULIB_WCTOMB = @GNULIB_WCTOMB@
+GNULIB_WCTRANS = @GNULIB_WCTRANS@
+GNULIB_WCTYPE = @GNULIB_WCTYPE@
+GNULIB_WCWIDTH = @GNULIB_WCWIDTH@
+GNULIB_WMEMCHR = @GNULIB_WMEMCHR@
+GNULIB_WMEMCMP = @GNULIB_WMEMCMP@
+GNULIB_WMEMCPY = @GNULIB_WMEMCPY@
+GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@
+GNULIB_WMEMSET = @GNULIB_WMEMSET@
+GNULIB_WRITE = @GNULIB_WRITE@
+GNULIB__EXIT = @GNULIB__EXIT@
+GREP = @GREP@
+HAVE_ATOLL = @HAVE_ATOLL@
+HAVE_BTOWC = @HAVE_BTOWC@
+HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@
+HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
+HAVE_CHOWN = @HAVE_CHOWN@
+HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@
+HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
+HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@
+HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@
+HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@
+HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@
+HAVE_DECL_GETLOGIN = @HAVE_DECL_GETLOGIN@
+HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@
+HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@
+HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@
+HAVE_DECL_INITSTATE = @HAVE_DECL_INITSTATE@
+HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@
+HAVE_DECL_SETENV = @HAVE_DECL_SETENV@
+HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@
+HAVE_DECL_SETSTATE = @HAVE_DECL_SETSTATE@
+HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@
+HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@
+HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@
+HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@
+HAVE_DUP2 = @HAVE_DUP2@
+HAVE_DUP3 = @HAVE_DUP3@
+HAVE_DUPLOCALE = @HAVE_DUPLOCALE@
+HAVE_EUIDACCESS = @HAVE_EUIDACCESS@
+HAVE_FACCESSAT = @HAVE_FACCESSAT@
+HAVE_FCHDIR = @HAVE_FCHDIR@
+HAVE_FCHMODAT = @HAVE_FCHMODAT@
+HAVE_FCHOWNAT = @HAVE_FCHOWNAT@
+HAVE_FCNTL = @HAVE_FCNTL@
+HAVE_FDATASYNC = @HAVE_FDATASYNC@
+HAVE_FEATURES_H = @HAVE_FEATURES_H@
+HAVE_FSTATAT = @HAVE_FSTATAT@
+HAVE_FSYNC = @HAVE_FSYNC@
+HAVE_FTRUNCATE = @HAVE_FTRUNCATE@
+HAVE_FUTIMENS = @HAVE_FUTIMENS@
+HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@
+HAVE_GETGROUPS = @HAVE_GETGROUPS@
+HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@
+HAVE_GETLOGIN = @HAVE_GETLOGIN@
+HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@
+HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
+HAVE_GETTIMEOFDAY = @HAVE_GETTIMEOFDAY@
+HAVE_GRANTPT = @HAVE_GRANTPT@
+HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
+HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
+HAVE_ISWBLANK = @HAVE_ISWBLANK@
+HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
+HAVE_LANGINFO_CODESET = @HAVE_LANGINFO_CODESET@
+HAVE_LANGINFO_ERA = @HAVE_LANGINFO_ERA@
+HAVE_LANGINFO_H = @HAVE_LANGINFO_H@
+HAVE_LANGINFO_T_FMT_AMPM = @HAVE_LANGINFO_T_FMT_AMPM@
+HAVE_LANGINFO_YESEXPR = @HAVE_LANGINFO_YESEXPR@
+HAVE_LCHMOD = @HAVE_LCHMOD@
+HAVE_LCHOWN = @HAVE_LCHOWN@
+HAVE_LINK = @HAVE_LINK@
+HAVE_LINKAT = @HAVE_LINKAT@
+HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@
+HAVE_LSTAT = @HAVE_LSTAT@
+HAVE_MAX_ALIGN_T = @HAVE_MAX_ALIGN_T@
+HAVE_MBRLEN = @HAVE_MBRLEN@
+HAVE_MBRTOWC = @HAVE_MBRTOWC@
+HAVE_MBSINIT = @HAVE_MBSINIT@
+HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@
+HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@
+HAVE_MKDIRAT = @HAVE_MKDIRAT@
+HAVE_MKDTEMP = @HAVE_MKDTEMP@
+HAVE_MKFIFO = @HAVE_MKFIFO@
+HAVE_MKFIFOAT = @HAVE_MKFIFOAT@
+HAVE_MKNOD = @HAVE_MKNOD@
+HAVE_MKNODAT = @HAVE_MKNODAT@
+HAVE_MKOSTEMP = @HAVE_MKOSTEMP@
+HAVE_MKOSTEMPS = @HAVE_MKOSTEMPS@
+HAVE_MKSTEMP = @HAVE_MKSTEMP@
+HAVE_MKSTEMPS = @HAVE_MKSTEMPS@
+HAVE_NANOSLEEP = @HAVE_NANOSLEEP@
+HAVE_NL_LANGINFO = @HAVE_NL_LANGINFO@
+HAVE_OPENAT = @HAVE_OPENAT@
+HAVE_OS_H = @HAVE_OS_H@
+HAVE_PIPE = @HAVE_PIPE@
+HAVE_PIPE2 = @HAVE_PIPE2@
+HAVE_POSIX_OPENPT = @HAVE_POSIX_OPENPT@
+HAVE_PREAD = @HAVE_PREAD@
+HAVE_PTSNAME = @HAVE_PTSNAME@
+HAVE_PTSNAME_R = @HAVE_PTSNAME_R@
+HAVE_PWRITE = @HAVE_PWRITE@
+HAVE_QSORT_R = @HAVE_QSORT_R@
+HAVE_RANDOM = @HAVE_RANDOM@
+HAVE_RANDOM_H = @HAVE_RANDOM_H@
+HAVE_RANDOM_R = @HAVE_RANDOM_R@
+HAVE_READLINK = @HAVE_READLINK@
+HAVE_READLINKAT = @HAVE_READLINKAT@
+HAVE_REALLOCARRAY = @HAVE_REALLOCARRAY@
+HAVE_REALPATH = @HAVE_REALPATH@
+HAVE_RPMATCH = @HAVE_RPMATCH@
+HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@
+HAVE_SETENV = @HAVE_SETENV@
+HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@
+HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
+HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
+HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@
+HAVE_SLEEP = @HAVE_SLEEP@
+HAVE_STDINT_H = @HAVE_STDINT_H@
+HAVE_STRPTIME = @HAVE_STRPTIME@
+HAVE_STRTOD = @HAVE_STRTOD@
+HAVE_STRTOLL = @HAVE_STRTOLL@
+HAVE_STRTOULL = @HAVE_STRTOULL@
+HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@
+HAVE_STRUCT_TIMEVAL = @HAVE_STRUCT_TIMEVAL@
+HAVE_SYMLINK = @HAVE_SYMLINK@
+HAVE_SYMLINKAT = @HAVE_SYMLINKAT@
+HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@
+HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@
+HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@
+HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@
+HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@
+HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
+HAVE_TIMEGM = @HAVE_TIMEGM@
+HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@
+HAVE_TRUNCATE = @HAVE_TRUNCATE@
+HAVE_TZSET = @HAVE_TZSET@
+HAVE_UNISTD_H = @HAVE_UNISTD_H@
+HAVE_UNLINKAT = @HAVE_UNLINKAT@
+HAVE_UNLOCKPT = @HAVE_UNLOCKPT@
+HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@
+HAVE_USLEEP = @HAVE_USLEEP@
+HAVE_UTIMENSAT = @HAVE_UTIMENSAT@
+HAVE_VALGRIND = @HAVE_VALGRIND@
+HAVE_WCHAR_H = @HAVE_WCHAR_H@
+HAVE_WCHAR_T = @HAVE_WCHAR_T@
+HAVE_WCPCPY = @HAVE_WCPCPY@
+HAVE_WCPNCPY = @HAVE_WCPNCPY@
+HAVE_WCRTOMB = @HAVE_WCRTOMB@
+HAVE_WCSCASECMP = @HAVE_WCSCASECMP@
+HAVE_WCSCAT = @HAVE_WCSCAT@
+HAVE_WCSCHR = @HAVE_WCSCHR@
+HAVE_WCSCMP = @HAVE_WCSCMP@
+HAVE_WCSCOLL = @HAVE_WCSCOLL@
+HAVE_WCSCPY = @HAVE_WCSCPY@
+HAVE_WCSCSPN = @HAVE_WCSCSPN@
+HAVE_WCSDUP = @HAVE_WCSDUP@
+HAVE_WCSFTIME = @HAVE_WCSFTIME@
+HAVE_WCSLEN = @HAVE_WCSLEN@
+HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@
+HAVE_WCSNCAT = @HAVE_WCSNCAT@
+HAVE_WCSNCMP = @HAVE_WCSNCMP@
+HAVE_WCSNCPY = @HAVE_WCSNCPY@
+HAVE_WCSNLEN = @HAVE_WCSNLEN@
+HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@
+HAVE_WCSPBRK = @HAVE_WCSPBRK@
+HAVE_WCSRCHR = @HAVE_WCSRCHR@
+HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@
+HAVE_WCSSPN = @HAVE_WCSSPN@
+HAVE_WCSSTR = @HAVE_WCSSTR@
+HAVE_WCSTOK = @HAVE_WCSTOK@
+HAVE_WCSWIDTH = @HAVE_WCSWIDTH@
+HAVE_WCSXFRM = @HAVE_WCSXFRM@
+HAVE_WCTRANS_T = @HAVE_WCTRANS_T@
+HAVE_WCTYPE_H = @HAVE_WCTYPE_H@
+HAVE_WCTYPE_T = @HAVE_WCTYPE_T@
+HAVE_WINSOCK2_H = @HAVE_WINSOCK2_H@
+HAVE_WINT_T = @HAVE_WINT_T@
+HAVE_WMEMCHR = @HAVE_WMEMCHR@
+HAVE_WMEMCMP = @HAVE_WMEMCMP@
+HAVE_WMEMCPY = @HAVE_WMEMCPY@
+HAVE_WMEMMOVE = @HAVE_WMEMMOVE@
+HAVE_WMEMSET = @HAVE_WMEMSET@
+HAVE_XLOCALE_H = @HAVE_XLOCALE_H@
+HAVE__BOOL = @HAVE__BOOL@
+HAVE__EXIT = @HAVE__EXIT@
+INCLUDE_NEXT = @INCLUDE_NEXT@
+INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBDAP_VERSION = @LIBDAP_VERSION@
+LIBINTL = @LIBINTL@
+LIBMULTITHREAD = @LIBMULTITHREAD@
+LIBOBJS = @LIBOBJS@
+LIBPTH = @LIBPTH@
+LIBPTH_PREFIX = @LIBPTH_PREFIX@
+LIBS = @LIBS@
+LIBTHREAD = @LIBTHREAD@
+LIBTOOL = @LIBTOOL@
+LIMITS_H = @LIMITS_H@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@
+LOCALE_FR = @LOCALE_FR@
+LOCALE_FR_UTF8 = @LOCALE_FR_UTF8@
+LOCALE_JA = @LOCALE_JA@
+LOCALE_ZH_CN = @LOCALE_ZH_CN@
+LTLIBINTL = @LTLIBINTL@
+LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
+LTLIBOBJS = @LTLIBOBJS@
+LTLIBPTH = @LTLIBPTH@
+LTLIBTHREAD = @LTLIBTHREAD@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@
+NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H = @NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H@
+NEXT_AS_FIRST_DIRECTIVE_LIMITS_H = @NEXT_AS_FIRST_DIRECTIVE_LIMITS_H@
+NEXT_AS_FIRST_DIRECTIVE_LOCALE_H = @NEXT_AS_FIRST_DIRECTIVE_LOCALE_H@
+NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@
+NEXT_AS_FIRST_DIRECTIVE_STDINT_H = @NEXT_AS_FIRST_DIRECTIVE_STDINT_H@
+NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@
+NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@
+NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@
+NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@
+NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@
+NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@
+NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@
+NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@
+NEXT_FCNTL_H = @NEXT_FCNTL_H@
+NEXT_LANGINFO_H = @NEXT_LANGINFO_H@
+NEXT_LIMITS_H = @NEXT_LIMITS_H@
+NEXT_LOCALE_H = @NEXT_LOCALE_H@
+NEXT_STDDEF_H = @NEXT_STDDEF_H@
+NEXT_STDINT_H = @NEXT_STDINT_H@
+NEXT_STDLIB_H = @NEXT_STDLIB_H@
+NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@
+NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@
+NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@
+NEXT_TIME_H = @NEXT_TIME_H@
+NEXT_UNISTD_H = @NEXT_UNISTD_H@
+NEXT_WCHAR_H = @NEXT_WCHAR_H@
+NEXT_WCTYPE_H = @NEXT_WCTYPE_H@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_MAJOR_VERSION = @PACKAGE_MAJOR_VERSION@
+PACKAGE_MINOR_VERSION = @PACKAGE_MINOR_VERSION@
+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@
+PRAGMA_COLUMNS = @PRAGMA_COLUMNS@
+PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
+PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@
+PTHREAD_LIBS = @PTHREAD_LIBS@
+PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
+RANLIB = @RANLIB@
+REPLACE_BTOWC = @REPLACE_BTOWC@
+REPLACE_CALLOC = @REPLACE_CALLOC@
+REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@
+REPLACE_CHOWN = @REPLACE_CHOWN@
+REPLACE_CLOSE = @REPLACE_CLOSE@
+REPLACE_CTIME = @REPLACE_CTIME@
+REPLACE_DUP = @REPLACE_DUP@
+REPLACE_DUP2 = @REPLACE_DUP2@
+REPLACE_DUPLOCALE = @REPLACE_DUPLOCALE@
+REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@
+REPLACE_FCNTL = @REPLACE_FCNTL@
+REPLACE_FSTAT = @REPLACE_FSTAT@
+REPLACE_FSTATAT = @REPLACE_FSTATAT@
+REPLACE_FTRUNCATE = @REPLACE_FTRUNCATE@
+REPLACE_FUTIMENS = @REPLACE_FUTIMENS@
+REPLACE_GETCWD = @REPLACE_GETCWD@
+REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@
+REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@
+REPLACE_GETGROUPS = @REPLACE_GETGROUPS@
+REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
+REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
+REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@
+REPLACE_GMTIME = @REPLACE_GMTIME@
+REPLACE_ISATTY = @REPLACE_ISATTY@
+REPLACE_ISWBLANK = @REPLACE_ISWBLANK@
+REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@
+REPLACE_LCHOWN = @REPLACE_LCHOWN@
+REPLACE_LINK = @REPLACE_LINK@
+REPLACE_LINKAT = @REPLACE_LINKAT@
+REPLACE_LOCALECONV = @REPLACE_LOCALECONV@
+REPLACE_LOCALTIME = @REPLACE_LOCALTIME@
+REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@
+REPLACE_LSEEK = @REPLACE_LSEEK@
+REPLACE_LSTAT = @REPLACE_LSTAT@
+REPLACE_MALLOC = @REPLACE_MALLOC@
+REPLACE_MBRLEN = @REPLACE_MBRLEN@
+REPLACE_MBRTOWC = @REPLACE_MBRTOWC@
+REPLACE_MBSINIT = @REPLACE_MBSINIT@
+REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@
+REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@
+REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@
+REPLACE_MBTOWC = @REPLACE_MBTOWC@
+REPLACE_MKDIR = @REPLACE_MKDIR@
+REPLACE_MKFIFO = @REPLACE_MKFIFO@
+REPLACE_MKNOD = @REPLACE_MKNOD@
+REPLACE_MKSTEMP = @REPLACE_MKSTEMP@
+REPLACE_MKTIME = @REPLACE_MKTIME@
+REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@
+REPLACE_NL_LANGINFO = @REPLACE_NL_LANGINFO@
+REPLACE_NULL = @REPLACE_NULL@
+REPLACE_OPEN = @REPLACE_OPEN@
+REPLACE_OPENAT = @REPLACE_OPENAT@
+REPLACE_PREAD = @REPLACE_PREAD@
+REPLACE_PTSNAME = @REPLACE_PTSNAME@
+REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@
+REPLACE_PUTENV = @REPLACE_PUTENV@
+REPLACE_PWRITE = @REPLACE_PWRITE@
+REPLACE_QSORT_R = @REPLACE_QSORT_R@
+REPLACE_RANDOM_R = @REPLACE_RANDOM_R@
+REPLACE_READ = @REPLACE_READ@
+REPLACE_READLINK = @REPLACE_READLINK@
+REPLACE_READLINKAT = @REPLACE_READLINKAT@
+REPLACE_REALLOC = @REPLACE_REALLOC@
+REPLACE_REALPATH = @REPLACE_REALPATH@
+REPLACE_RMDIR = @REPLACE_RMDIR@
+REPLACE_SETENV = @REPLACE_SETENV@
+REPLACE_SETLOCALE = @REPLACE_SETLOCALE@
+REPLACE_SLEEP = @REPLACE_SLEEP@
+REPLACE_STAT = @REPLACE_STAT@
+REPLACE_STRFTIME = @REPLACE_STRFTIME@
+REPLACE_STRTOD = @REPLACE_STRTOD@
+REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@
+REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@
+REPLACE_SYMLINK = @REPLACE_SYMLINK@
+REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@
+REPLACE_TIMEGM = @REPLACE_TIMEGM@
+REPLACE_TOWLOWER = @REPLACE_TOWLOWER@
+REPLACE_TRUNCATE = @REPLACE_TRUNCATE@
+REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@
+REPLACE_TZSET = @REPLACE_TZSET@
+REPLACE_UNLINK = @REPLACE_UNLINK@
+REPLACE_UNLINKAT = @REPLACE_UNLINKAT@
+REPLACE_UNSETENV = @REPLACE_UNSETENV@
+REPLACE_USLEEP = @REPLACE_USLEEP@
+REPLACE_UTIMENSAT = @REPLACE_UTIMENSAT@
+REPLACE_WCRTOMB = @REPLACE_WCRTOMB@
+REPLACE_WCSFTIME = @REPLACE_WCSFTIME@
+REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@
+REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@
+REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@
+REPLACE_WCTOB = @REPLACE_WCTOB@
+REPLACE_WCTOMB = @REPLACE_WCTOMB@
+REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
+REPLACE_WRITE = @REPLACE_WRITE@
+SED = @SED@
+SERVERLIB_AGE = @SERVERLIB_AGE@
+SERVERLIB_CURRENT = @SERVERLIB_CURRENT@
+SERVERLIB_REVISION = @SERVERLIB_REVISION@
+SERVERLIB_VERSION = @SERVERLIB_VERSION@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@
+SIZE_T_SUFFIX = @SIZE_T_SUFFIX@
+STDBOOL_H = @STDBOOL_H@
+STDDEF_H = @STDDEF_H@
+STDINT_H = @STDINT_H@
+STRIP = @STRIP@
+SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@
+TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@
+UNISTD_H_DEFINES_STRUCT_TIMESPEC = @UNISTD_H_DEFINES_STRUCT_TIMESPEC@
+UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@
+UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@
+UUID_LIBS = @UUID_LIBS@
+VERSION = @VERSION@
+WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
+WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@
+WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@
+WINDOWS_STAT_INODES = @WINDOWS_STAT_INODES@
+WINDOWS_STAT_TIMESPEC = @WINDOWS_STAT_TIMESPEC@
+WINT_T_SUFFIX = @WINT_T_SUFFIX@
+XML2_CFLAGS = @XML2_CFLAGS@
+XML2_LIBS = @XML2_LIBS@
+YACC = @YACC@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_word_order = @ac_word_order@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+curlprivatelibs = @curlprivatelibs@
+curlprivatereq = @curlprivatereq@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gl_LIBOBJS = @gl_LIBOBJS@
+gl_LTLIBOBJS = @gl_LTLIBOBJS@
+gltests_LIBOBJS = @gltests_LIBOBJS@
+gltests_LTLIBOBJS = @gltests_LTLIBOBJS@
+gltests_WITNESS = @gltests_WITNESS@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+lispdir = @lispdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+runstatedir = @runstatedir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+xmlprivatelibs = @xmlprivatelibs@
+xmlprivatereq = @xmlprivatereq@
+noinst_SCRIPTS = cleanup.sh
+EXTRA_DIST = cleanup.sh.in dodsrc dot.index dods_cache_init
+DISTCLEANFILES = cleanup.sh
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign unit-tests/cache-testsuite/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign unit-tests/cache-testsuite/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+tags TAGS:
+
+ctags CTAGS:
+
+cscope cscopelist:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(SCRIPTS)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-local mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	clean-local cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags-am uninstall uninstall-am
+
+
+cleanup.sh: cleanup.sh.in ../../config.status
+	sed -e "s%[@]srcdir[@]%${srcdir}%" $< > cleanup.sh
+	chmod +x cleanup.sh
+
+clean-local: cleanup.sh
+	sh ./cleanup.sh
+	rm -rf dods_cache
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/unit-tests/cache-testsuite/cleanup.sh.in b/unit-tests/cache-testsuite/cleanup.sh.in
new file mode 100755
index 0000000..836872b
--- /dev/null
+++ b/unit-tests/cache-testsuite/cleanup.sh.in
@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# remove stuff that accumulates between runs of the HTTPCacheTest unit tests.
+
+# sometimes have trouble deleting dods_cache during distcheck
+if [ -d dods_cache ]
+then
+    chmod -R +w dods_cache
+fi
+rm -rf dods_cache
+
+# initialize the dods_cache directory
+cp -r @srcdir@/dods_cache_init dods_cache
+# make sure we can write to the directory and sub directories
+chmod -R +w dods_cache
+# remove the .svn directory from dods_cache
+rm -rf `find dods_cache -name .svn`
+
+# remove generated cache directories
+rm -rf gc_cache
+rm -rf purge_cache
+rm -rf header_cache
+rm -rf interrupt_cache
+rm -rf singleton_cache
diff --git a/unit-tests/cache-testsuite/dods_cache_init/.index b/unit-tests/cache-testsuite/dods_cache_init/.index
new file mode 100644
index 0000000..dde714a
--- /dev/null
+++ b/unit-tests/cache-testsuite/dods_cache_init/.index
@@ -0,0 +1 @@
+http://test.opendap.org/test-304.html cache-testsuite/dods_cache/656/dodsKbcD0h "3f62c-157-139c2680" 1121283146 -1 343 0 656 1 7351 1121360379 3723 0
diff --git a/unit-tests/cache-testsuite/dods_cache_init/656/dodsKbcD0h b/unit-tests/cache-testsuite/dods_cache_init/656/dodsKbcD0h
new file mode 100644
index 0000000..ef98f45
--- /dev/null
+++ b/unit-tests/cache-testsuite/dods_cache_init/656/dodsKbcD0h
@@ -0,0 +1,20 @@
+<html>
+
+<head>
+<title>Test getting a 304 response</title>
+</head>
+
+<body>
+The purpose of this page is to generate a 304 response when accessed using a
+given date and an If-Modified-Since header and/or the correct etag. 
+
+<b>Please don't modify this file!</b>
+
+<address>
+James Gallagher<br/>
+jgallagher@gso.uri.edu
+</address>
+
+</body>
+
+</html>
diff --git a/unit-tests/cache-testsuite/dods_cache_init/656/dodsKbcD0h.meta b/unit-tests/cache-testsuite/dods_cache_init/656/dodsKbcD0h.meta
new file mode 100644
index 0000000..8a7d5ca
--- /dev/null
+++ b/unit-tests/cache-testsuite/dods_cache_init/656/dodsKbcD0h.meta
@@ -0,0 +1,8 @@
+Date: Wed, 10 Aug 2005 18:38:05 GMT
+Server: Apache/2.0.46 (Red Hat)
+Last-Modified: Wed, 13 Jul 2005 19:32:26 GMT
+ETag: "3f62c-157-139c2680"
+Accept-Ranges: bytes
+Content-Length: 343
+Content-Type: text/html; charset=UTF-8
+
diff --git a/unit-tests/cache-testsuite/dodsrc b/unit-tests/cache-testsuite/dodsrc
new file mode 100644
index 0000000..d686dd6
--- /dev/null
+++ b/unit-tests/cache-testsuite/dodsrc
@@ -0,0 +1,16 @@
+# DODS client configuation file. See the DODS
+# users guide for information.
+#
+# This is a special dodsrc file used by HTTPConnectTest. That code turns on
+# caching after first running tests with it off (that's why USE_CACHE is set
+# ot zero here). 10/17/02 jhrg
+USE_CACHE=0
+MAX_CACHE_SIZE=20
+MAX_CACHED_OBJ=5
+IGNORE_EXPIRES=0
+CACHE_ROOT=cache-testsuite/http_connect_cache/
+DEFAULT_EXPIRES=86400
+ALWAYS_VALIDATE=0
+# PROXY_SERVER=<protocol>,<host url>
+# PROXY_FOR=<regex>,<proxy host url>,<flags>
+# NO_PROXY_FOR=<protocol>,<host>
diff --git a/unit-tests/cache-testsuite/dot.index b/unit-tests/cache-testsuite/dot.index
new file mode 100644
index 0000000..3cd09ed
--- /dev/null
+++ b/unit-tests/cache-testsuite/dot.index
@@ -0,0 +1,2 @@
+http://new.url.same.hash/test/collisions.gif cache-testsuite/dods_cache/656/dodsKbcD0h "3f62c-157-139c2680" 1121283146 -1 343 0 656 1 7351 1121360379 3723 0
+
diff --git a/unit-tests/cgi-util-tests/01group.hdf b/unit-tests/cgi-util-tests/01group.hdf
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/unit-tests/cgi-util-tests/01group.hdf
diff --git a/unit-tests/cgi-util-tests/02group.hdf b/unit-tests/cgi-util-tests/02group.hdf
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/unit-tests/cgi-util-tests/02group.hdf
diff --git a/unit-tests/cgi-util-tests/03group.hdf b/unit-tests/cgi-util-tests/03group.hdf
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/unit-tests/cgi-util-tests/03group.hdf
diff --git a/unit-tests/cgi-util-tests/group.htm b/unit-tests/cgi-util-tests/group.htm
new file mode 100644
index 0000000..f2e4113
--- /dev/null
+++ b/unit-tests/cgi-util-tests/group.htm
@@ -0,0 +1 @@
+stuff
diff --git a/unit-tests/cgi-util-tests/group01.hdf b/unit-tests/cgi-util-tests/group01.hdf
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/unit-tests/cgi-util-tests/group01.hdf
diff --git a/unit-tests/cgi-util-tests/multipart_mime_header1.txt b/unit-tests/cgi-util-tests/multipart_mime_header1.txt
new file mode 100644
index 0000000..53d65c1
--- /dev/null
+++ b/unit-tests/cgi-util-tests/multipart_mime_header1.txt
@@ -0,0 +1,6 @@
+--my_boundary
+Content-Type: Text/xml; charset=iso-8859-1
+Content-Description: dods-ddx
+Content-Id: <1234@opendap.org>
+
+<?xml version="1.0">
diff --git a/unit-tests/chunked-io/test_big_binary_file.bin b/unit-tests/chunked-io/test_big_binary_file.bin
new file mode 100644
index 0000000..49c7ebb
Binary files /dev/null and b/unit-tests/chunked-io/test_big_binary_file.bin differ
diff --git a/unit-tests/chunked-io/test_big_binary_file.bin.chunked b/unit-tests/chunked-io/test_big_binary_file.bin.chunked
new file mode 100644
index 0000000..c88ce78
Binary files /dev/null and b/unit-tests/chunked-io/test_big_binary_file.bin.chunked differ
diff --git a/unit-tests/chunked-io/test_big_binary_file.bin.plain b/unit-tests/chunked-io/test_big_binary_file.bin.plain
new file mode 100644
index 0000000..49c7ebb
Binary files /dev/null and b/unit-tests/chunked-io/test_big_binary_file.bin.plain differ
diff --git a/unit-tests/chunked-io/test_big_binary_file_2.bin b/unit-tests/chunked-io/test_big_binary_file_2.bin
new file mode 100644
index 0000000..adc3d8b
Binary files /dev/null and b/unit-tests/chunked-io/test_big_binary_file_2.bin differ
diff --git a/unit-tests/chunked-io/test_big_binary_file_2.bin.chunked b/unit-tests/chunked-io/test_big_binary_file_2.bin.chunked
new file mode 100644
index 0000000..918b688
Binary files /dev/null and b/unit-tests/chunked-io/test_big_binary_file_2.bin.chunked differ
diff --git a/unit-tests/chunked-io/test_big_binary_file_2.bin.plain b/unit-tests/chunked-io/test_big_binary_file_2.bin.plain
new file mode 100644
index 0000000..b69a86d
Binary files /dev/null and b/unit-tests/chunked-io/test_big_binary_file_2.bin.plain differ
diff --git a/unit-tests/chunked-io/test_big_binary_file_3.bin b/unit-tests/chunked-io/test_big_binary_file_3.bin
new file mode 100644
index 0000000..bfcb051
Binary files /dev/null and b/unit-tests/chunked-io/test_big_binary_file_3.bin differ
diff --git a/unit-tests/chunked-io/test_small_text_file.txt b/unit-tests/chunked-io/test_small_text_file.txt
new file mode 100644
index 0000000..07efa5a
--- /dev/null
+++ b/unit-tests/chunked-io/test_small_text_file.txt
@@ -0,0 +1 @@
+This is a small file
diff --git a/unit-tests/chunked-io/test_small_text_file.txt.chunked b/unit-tests/chunked-io/test_small_text_file.txt.chunked
new file mode 100644
index 0000000..98f9637
Binary files /dev/null and b/unit-tests/chunked-io/test_small_text_file.txt.chunked differ
diff --git a/unit-tests/chunked-io/test_small_text_file.txt.plain b/unit-tests/chunked-io/test_small_text_file.txt.plain
new file mode 100644
index 0000000..07efa5a
--- /dev/null
+++ b/unit-tests/chunked-io/test_small_text_file.txt.plain
@@ -0,0 +1 @@
+This is a small file
diff --git a/unit-tests/chunked-io/test_text_file.txt b/unit-tests/chunked-io/test_text_file.txt
new file mode 100644
index 0000000..9a6ac95
--- /dev/null
+++ b/unit-tests/chunked-io/test_text_file.txt
@@ -0,0 +1,370 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// Tests for the AISMerge class.
+
+#include <cppunit/TextTestRunner.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+#include <cppunit/extensions/HelperMacros.h>
+
+//#define DODS_DEBUG
+
+#include "Connect.h"
+#include "AISMerge.h"
+#include "debug.h"
+#include <test_config.h>
+
+#include "testFile.h"
+
+using namespace CppUnit;
+
+namespace libdap
+{
+
+class AISMergeTest:public TestFixture {
+  private:
+    AISMerge * ais_merge;
+
+    static string fnoc1, fnoc2, fnoc3, bears, coads, three_fnoc;
+    static string fnoc1_ais, fnoc2_ais, digit_ais, fnoc3_das;
+
+    static string fnoc1_ais_string, bears_1_ais_string, coads_ais_string;
+    static string fnoc1_merge_ais, fnoc2_merge_ais, fnoc3_merge_ais;
+    static string three_fnoc_merge_ais, starts_with_number_ais_string;
+
+    string dump2string(FILE * res) {
+        string stuff = "";
+        char line[256];
+        while (!feof(res) && !ferror(res)
+               && fgets(&line[0], 256, res) != 0)
+             stuff += line;
+
+         return stuff;
+  } public:
+     AISMergeTest() {
+    }
+    ~AISMergeTest() {
+    }
+
+    void setUp() {
+        ais_merge = new AISMerge("ais_testsuite/ais_database.xml");
+    }
+
+    void tearDown() {
+        delete ais_merge;
+        ais_merge = 0;
+    }
+
+    CPPUNIT_TEST_SUITE(AISMergeTest);
+
+    CPPUNIT_TEST(get_ais_resource_test);
+    CPPUNIT_TEST(merge_test);
+
+    CPPUNIT_TEST_SUITE_END();
+
+    void get_ais_resource_test() {
+        try {
+            ResourceVector rv = ais_merge->d_ais_db.get_resource(fnoc1);
+            Response *res = ais_merge->get_ais_resource(rv[0].get_url());
+            string stuff = dump2string(res->get_stream());
+            DBG(cerr << "AIS Resource: " << stuff << endl);
+            CPPUNIT_ASSERT(stuff.find(fnoc1_ais_string)
+                           != string::npos);
+
+            rv = ais_merge->d_ais_db.get_resource(coads);
+            res = ais_merge->get_ais_resource(rv[0].get_url());
+            CPPUNIT_ASSERT(dump2string(res->get_stream()).
+                           find(coads_ais_string)
+                           != string::npos);
+
+            rv = ais_merge->d_ais_db.get_resource(three_fnoc);
+            res = ais_merge->get_ais_resource(rv[0].get_url());
+            CPPUNIT_ASSERT(dump2string(res->get_stream()).
+                           find(starts_with_number_ais_string)
+                           != string::npos);
+        }
+        catch(Error & e) {
+            cerr << "Error: " << e.get_error_message() << endl;
+            // If the exception is Not Found then this is not an error; there
+            // are many reasons why the resource might not be found...
+            if (e.get_error_message().find("Not Found:") == string::npos)
+                CPPUNIT_ASSERT(!"Error");
+        }
+    }
+
+    void merge_test() {
+        try {
+            Connect *conn;
+            DAS das;
+            string sof;
+
+            conn = new Connect(fnoc1);  // test overwrite (default)
+            conn->request_das(das);
+            ais_merge->merge(fnoc1, das);
+            FILE2string(sof, of, das.print(of));
+            DBG(cerr << "Merged fnoc1 DAS: " << sof << endl);
+            CPPUNIT_ASSERT(sof.find(fnoc1_merge_ais) != string::npos);
+
+            delete conn;
+            conn = 0;
+            das.erase();
+
+            conn = new Connect(fnoc2);  // test replace
+            conn->request_das(das);
+            ais_merge->merge(fnoc2, das);
+            FILE2string(sof, of, das.print(of));
+            CPPUNIT_ASSERT(sof.find(fnoc2_merge_ais) != string::npos);
+
+            delete conn;
+            conn = 0;
+            das.erase();
+
+            conn = new Connect(fnoc3);  // test fallback
+            conn->request_das(das);     // with a non-empty das, nothing happens
+            ais_merge->merge(fnoc3, das);
+            FILE2string(sof, of, das.print(of));
+            CPPUNIT_ASSERT(sof.find(fnoc3_das) != string::npos);
+
+            das.erase();        // empty das, should add attributes
+            ais_merge->merge(fnoc3, das);
+            FILE2string(sof, of, das.print(of));
+            CPPUNIT_ASSERT(sof.find(fnoc3_merge_ais) != string::npos);
+
+            conn = new Connect(three_fnoc);     // test regexp
+            conn->request_das(das);     // with a non-empty das, nothing happens
+            ais_merge->merge(three_fnoc, das);
+            FILE2string(sof, of, das.print(of));
+            CPPUNIT_ASSERT(sof.find(three_fnoc_merge_ais)
+                           != string::npos);
+        }
+        catch(Error & e) {
+            cerr << "Error: " << e.get_error_message() << endl;
+            if (e.get_error_message().find("Not Found:") == string::npos)
+                CPPUNIT_ASSERT(!"Error");
+        }
+    }
+};
+
+string AISMergeTest::fnoc1 =
+    "http://test.opendap.org/opendap/data/nc/fnoc1.nc";
+string AISMergeTest::fnoc2 =
+    "http://test.opendap.org/opendap/data/nc/fnoc2.nc";
+string AISMergeTest::fnoc3 =
+    "http://test.opendap.org/opendap/data/nc/fnoc3.nc";
+string AISMergeTest::bears =
+    "http://test.opendap.org/opendap/data/nc/bears.nc";
+string AISMergeTest::coads =
+    "http://test.opendap.org/opendap/data/nc/coads_climatology.nc";
+string AISMergeTest::three_fnoc =
+    "http://test.opendap.org/opendap/data/nc/3fnoc.nc";
+
+string AISMergeTest::fnoc1_ais =
+    "http://test.opendap.org/ais/fnoc1.nc.das";
+string AISMergeTest::fnoc2_ais =
+    "http://test.opendap.org/ais/fnoc2.nc.das";
+string AISMergeTest::digit_ais = (string)TEST_SRC_DIR + "/ais_testsuite/starts_with_number.das";
+
+string AISMergeTest::fnoc1_ais_string = "Attributes {\n\
+    u {\n\
+	String DODS_Name \"UWind\";\n\
+    }\n\
+    v {\n\
+	String DODS_Name \"VWind\";\n\
+    }\n\
+}";
+
+string AISMergeTest::bears_1_ais_string = "Attributes {\n\
+    bears {\n\
+	String longname \"Test data\";\n\
+    }\n\
+}";
+
+string AISMergeTest::coads_ais_string = "Attributes {\n\
+    COADSX {\n\
+        String long_name \"Longitude\";\n\
+    }\n\
+}";
+
+string AISMergeTest::starts_with_number_ais_string = "Attributes {\n\
+    NC_GLOBAL {\n\
+        String AIS_Test_info \"This dataset's name starts with a digit.\";\n\
+    }\n\
+}";
+
+string AISMergeTest::fnoc3_das = "Attributes {\n\
+    u {\n\
+        String units \"meter per second\";\n\
+        String long_name \"Vector wind eastward component\";\n\
+        String missing_value \"-32767\";\n\
+        String scale_factor \"0.005\";\n\
+    }\n\
+    v {\n\
+        String units \"meter per second\";\n\
+        String long_name \"Vector wind northward component\";\n\
+        String missing_value \"-32767\";\n\
+        String scale_factor \"0.005\";\n\
+    }\n\
+    lat {\n\
+        String units \"degree North\";\n\
+    }\n\
+    lon {\n\
+        String units \"degree East\";\n\
+    }\n\
+    time {\n\
+        String units \"hours from base_time\";\n\
+    }\n\
+    NC_GLOBAL {\n\
+        String base_time \"88-245-00:00:00\";\n\
+        String title \" FNOC UV wind components from 1988-245 to 1988-247.\";\n\
+    }\n\
+    DODS_EXTRA {\n\
+        String Unlimited_Dimension \"time_a\";\n\
+    }\n\
+}";
+
+string AISMergeTest::fnoc1_merge_ais = "Attributes {\n\
+    u {\n\
+        String units \"meter per second\";\n\
+        String long_name \"Vector wind eastward component\";\n\
+        String missing_value \"-32767\";\n\
+        String scale_factor \"0.005\";\n\
+        String DODS_Name \"UWind\", \"UWind\";\n\
+        Byte b 128;\n\
+        Int32 i 32000;\n\
+        Url WOA01 \"http://localhost/junk\";\n\
+    }\n\
+    v {\n\
+        String units \"meter per second\";\n\
+        String long_name \"Vector wind northward component\";\n\
+        String missing_value \"-32767\";\n\
+        String scale_factor \"0.005\";\n\
+        String DODS_Name \"VWind\", \"VWind\";\n\
+    }\n\
+    lat {\n\
+        String units \"degree North\";\n\
+    }\n\
+    lon {\n\
+        String units \"degree East\";\n\
+    }\n\
+    time {\n\
+        String units \"hours from base_time\";\n\
+    }\n\
+    NC_GLOBAL {\n\
+        String base_time \"88- 10-00:00:00\";\n\
+        String title \" FNOC UV wind components from 1988- 10 to 1988- 13.\";\n\
+    }\n\
+    DODS_EXTRA {\n\
+        String Unlimited_Dimension \"time_a\";\n\
+    }\n\
+}";
+
+string AISMergeTest::fnoc2_merge_ais = "Attributes {\n\
+    u {\n\
+        String units \"meter per second\";\n\
+        String long_name \"UWind\";\n\
+    }\n\
+    v {\n\
+        String units \"meter per second\";\n\
+        String long_name \"VWind\";\n\
+    }\n\
+    lat {\n\
+        String units \"degree North\";\n\
+        String long_name \"Latitude\";\n\
+    }\n\
+    lon {\n\
+        String units \"degree East\";\n\
+        String long_name \"Longitude\";\n\
+    }\n\
+    time {\n\
+    }\n\
+    NC_GLOBAL {\n\
+    }\n\
+    DODS_EXTRA {\n\
+    }\n\
+}";
+
+string AISMergeTest::fnoc3_merge_ais = "Attributes {\n\
+    u {\n\
+        String long_name \"UWind\";\n\
+    }\n\
+    v {\n\
+        String long_name \"VWind\";\n\
+    }\n\
+    lat {\n\
+        String long_name \"Latitude\";\n\
+    }\n\
+    lon {\n\
+        String long_name \"Longitude\";\n\
+    }\n\
+}";
+
+string AISMergeTest::three_fnoc_merge_ais = "Attributes {\n\
+    u {\n\
+        String long_name \"UWind\", \"Vector wind eastward component\";\n\
+        String units \"meter per second\";\n\
+        String missing_value \"-32767\";\n\
+        String scale_factor \"0.005\";\n\
+    }\n\
+    v {\n\
+        String long_name \"VWind\", \"Vector wind northward component\";\n\
+        String units \"meter per second\";\n\
+        String missing_value \"-32767\";\n\
+        String scale_factor \"0.005\";\n\
+    }\n\
+    lat {\n\
+        String long_name \"Latitude\";\n\
+        String units \"degree North\";\n\
+    }\n\
+    lon {\n\
+        String long_name \"Longitude\";\n\
+        String units \"degree East\";\n\
+    }\n\
+    time {\n\
+        String units \"hours from base_time\";\n\
+    }\n\
+    NC_GLOBAL {\n\
+        String base_time \"88-245-00:00:00\";\n\
+        String title \" FNOC UV wind components from 1988-245 to 1988-247.\";\n\
+        String AIS_Test_info \"This dataset's name starts with a digit.\";\n\
+    }\n\
+    DODS_EXTRA {\n\
+        String Unlimited_Dimension \"time_a\";\n\
+    }\n\
+}";
+
+CPPUNIT_TEST_SUITE_REGISTRATION(AISMergeTest);
+
+} // namespace libdap
+
+int main(int, char **)
+{
+    CppUnit::TextTestRunner runner;
+    runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
+    bool wasSuccessful = runner.run("", false);
+
+    return wasSuccessful ? 0 : 1;
+}
+
diff --git a/unit-tests/chunked-io/test_text_file.txt.chunked b/unit-tests/chunked-io/test_text_file.txt.chunked
new file mode 100644
index 0000000..8807482
Binary files /dev/null and b/unit-tests/chunked-io/test_text_file.txt.chunked differ
diff --git a/unit-tests/chunked-io/test_text_file.txt.plain b/unit-tests/chunked-io/test_text_file.txt.plain
new file mode 100644
index 0000000..9a6ac95
--- /dev/null
+++ b/unit-tests/chunked-io/test_text_file.txt.plain
@@ -0,0 +1,370 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// Tests for the AISMerge class.
+
+#include <cppunit/TextTestRunner.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+#include <cppunit/extensions/HelperMacros.h>
+
+//#define DODS_DEBUG
+
+#include "Connect.h"
+#include "AISMerge.h"
+#include "debug.h"
+#include <test_config.h>
+
+#include "testFile.h"
+
+using namespace CppUnit;
+
+namespace libdap
+{
+
+class AISMergeTest:public TestFixture {
+  private:
+    AISMerge * ais_merge;
+
+    static string fnoc1, fnoc2, fnoc3, bears, coads, three_fnoc;
+    static string fnoc1_ais, fnoc2_ais, digit_ais, fnoc3_das;
+
+    static string fnoc1_ais_string, bears_1_ais_string, coads_ais_string;
+    static string fnoc1_merge_ais, fnoc2_merge_ais, fnoc3_merge_ais;
+    static string three_fnoc_merge_ais, starts_with_number_ais_string;
+
+    string dump2string(FILE * res) {
+        string stuff = "";
+        char line[256];
+        while (!feof(res) && !ferror(res)
+               && fgets(&line[0], 256, res) != 0)
+             stuff += line;
+
+         return stuff;
+  } public:
+     AISMergeTest() {
+    }
+    ~AISMergeTest() {
+    }
+
+    void setUp() {
+        ais_merge = new AISMerge("ais_testsuite/ais_database.xml");
+    }
+
+    void tearDown() {
+        delete ais_merge;
+        ais_merge = 0;
+    }
+
+    CPPUNIT_TEST_SUITE(AISMergeTest);
+
+    CPPUNIT_TEST(get_ais_resource_test);
+    CPPUNIT_TEST(merge_test);
+
+    CPPUNIT_TEST_SUITE_END();
+
+    void get_ais_resource_test() {
+        try {
+            ResourceVector rv = ais_merge->d_ais_db.get_resource(fnoc1);
+            Response *res = ais_merge->get_ais_resource(rv[0].get_url());
+            string stuff = dump2string(res->get_stream());
+            DBG(cerr << "AIS Resource: " << stuff << endl);
+            CPPUNIT_ASSERT(stuff.find(fnoc1_ais_string)
+                           != string::npos);
+
+            rv = ais_merge->d_ais_db.get_resource(coads);
+            res = ais_merge->get_ais_resource(rv[0].get_url());
+            CPPUNIT_ASSERT(dump2string(res->get_stream()).
+                           find(coads_ais_string)
+                           != string::npos);
+
+            rv = ais_merge->d_ais_db.get_resource(three_fnoc);
+            res = ais_merge->get_ais_resource(rv[0].get_url());
+            CPPUNIT_ASSERT(dump2string(res->get_stream()).
+                           find(starts_with_number_ais_string)
+                           != string::npos);
+        }
+        catch(Error & e) {
+            cerr << "Error: " << e.get_error_message() << endl;
+            // If the exception is Not Found then this is not an error; there
+            // are many reasons why the resource might not be found...
+            if (e.get_error_message().find("Not Found:") == string::npos)
+                CPPUNIT_ASSERT(!"Error");
+        }
+    }
+
+    void merge_test() {
+        try {
+            Connect *conn;
+            DAS das;
+            string sof;
+
+            conn = new Connect(fnoc1);  // test overwrite (default)
+            conn->request_das(das);
+            ais_merge->merge(fnoc1, das);
+            FILE2string(sof, of, das.print(of));
+            DBG(cerr << "Merged fnoc1 DAS: " << sof << endl);
+            CPPUNIT_ASSERT(sof.find(fnoc1_merge_ais) != string::npos);
+
+            delete conn;
+            conn = 0;
+            das.erase();
+
+            conn = new Connect(fnoc2);  // test replace
+            conn->request_das(das);
+            ais_merge->merge(fnoc2, das);
+            FILE2string(sof, of, das.print(of));
+            CPPUNIT_ASSERT(sof.find(fnoc2_merge_ais) != string::npos);
+
+            delete conn;
+            conn = 0;
+            das.erase();
+
+            conn = new Connect(fnoc3);  // test fallback
+            conn->request_das(das);     // with a non-empty das, nothing happens
+            ais_merge->merge(fnoc3, das);
+            FILE2string(sof, of, das.print(of));
+            CPPUNIT_ASSERT(sof.find(fnoc3_das) != string::npos);
+
+            das.erase();        // empty das, should add attributes
+            ais_merge->merge(fnoc3, das);
+            FILE2string(sof, of, das.print(of));
+            CPPUNIT_ASSERT(sof.find(fnoc3_merge_ais) != string::npos);
+
+            conn = new Connect(three_fnoc);     // test regexp
+            conn->request_das(das);     // with a non-empty das, nothing happens
+            ais_merge->merge(three_fnoc, das);
+            FILE2string(sof, of, das.print(of));
+            CPPUNIT_ASSERT(sof.find(three_fnoc_merge_ais)
+                           != string::npos);
+        }
+        catch(Error & e) {
+            cerr << "Error: " << e.get_error_message() << endl;
+            if (e.get_error_message().find("Not Found:") == string::npos)
+                CPPUNIT_ASSERT(!"Error");
+        }
+    }
+};
+
+string AISMergeTest::fnoc1 =
+    "http://test.opendap.org/opendap/data/nc/fnoc1.nc";
+string AISMergeTest::fnoc2 =
+    "http://test.opendap.org/opendap/data/nc/fnoc2.nc";
+string AISMergeTest::fnoc3 =
+    "http://test.opendap.org/opendap/data/nc/fnoc3.nc";
+string AISMergeTest::bears =
+    "http://test.opendap.org/opendap/data/nc/bears.nc";
+string AISMergeTest::coads =
+    "http://test.opendap.org/opendap/data/nc/coads_climatology.nc";
+string AISMergeTest::three_fnoc =
+    "http://test.opendap.org/opendap/data/nc/3fnoc.nc";
+
+string AISMergeTest::fnoc1_ais =
+    "http://test.opendap.org/ais/fnoc1.nc.das";
+string AISMergeTest::fnoc2_ais =
+    "http://test.opendap.org/ais/fnoc2.nc.das";
+string AISMergeTest::digit_ais = (string)TEST_SRC_DIR + "/ais_testsuite/starts_with_number.das";
+
+string AISMergeTest::fnoc1_ais_string = "Attributes {\n\
+    u {\n\
+	String DODS_Name \"UWind\";\n\
+    }\n\
+    v {\n\
+	String DODS_Name \"VWind\";\n\
+    }\n\
+}";
+
+string AISMergeTest::bears_1_ais_string = "Attributes {\n\
+    bears {\n\
+	String longname \"Test data\";\n\
+    }\n\
+}";
+
+string AISMergeTest::coads_ais_string = "Attributes {\n\
+    COADSX {\n\
+        String long_name \"Longitude\";\n\
+    }\n\
+}";
+
+string AISMergeTest::starts_with_number_ais_string = "Attributes {\n\
+    NC_GLOBAL {\n\
+        String AIS_Test_info \"This dataset's name starts with a digit.\";\n\
+    }\n\
+}";
+
+string AISMergeTest::fnoc3_das = "Attributes {\n\
+    u {\n\
+        String units \"meter per second\";\n\
+        String long_name \"Vector wind eastward component\";\n\
+        String missing_value \"-32767\";\n\
+        String scale_factor \"0.005\";\n\
+    }\n\
+    v {\n\
+        String units \"meter per second\";\n\
+        String long_name \"Vector wind northward component\";\n\
+        String missing_value \"-32767\";\n\
+        String scale_factor \"0.005\";\n\
+    }\n\
+    lat {\n\
+        String units \"degree North\";\n\
+    }\n\
+    lon {\n\
+        String units \"degree East\";\n\
+    }\n\
+    time {\n\
+        String units \"hours from base_time\";\n\
+    }\n\
+    NC_GLOBAL {\n\
+        String base_time \"88-245-00:00:00\";\n\
+        String title \" FNOC UV wind components from 1988-245 to 1988-247.\";\n\
+    }\n\
+    DODS_EXTRA {\n\
+        String Unlimited_Dimension \"time_a\";\n\
+    }\n\
+}";
+
+string AISMergeTest::fnoc1_merge_ais = "Attributes {\n\
+    u {\n\
+        String units \"meter per second\";\n\
+        String long_name \"Vector wind eastward component\";\n\
+        String missing_value \"-32767\";\n\
+        String scale_factor \"0.005\";\n\
+        String DODS_Name \"UWind\", \"UWind\";\n\
+        Byte b 128;\n\
+        Int32 i 32000;\n\
+        Url WOA01 \"http://localhost/junk\";\n\
+    }\n\
+    v {\n\
+        String units \"meter per second\";\n\
+        String long_name \"Vector wind northward component\";\n\
+        String missing_value \"-32767\";\n\
+        String scale_factor \"0.005\";\n\
+        String DODS_Name \"VWind\", \"VWind\";\n\
+    }\n\
+    lat {\n\
+        String units \"degree North\";\n\
+    }\n\
+    lon {\n\
+        String units \"degree East\";\n\
+    }\n\
+    time {\n\
+        String units \"hours from base_time\";\n\
+    }\n\
+    NC_GLOBAL {\n\
+        String base_time \"88- 10-00:00:00\";\n\
+        String title \" FNOC UV wind components from 1988- 10 to 1988- 13.\";\n\
+    }\n\
+    DODS_EXTRA {\n\
+        String Unlimited_Dimension \"time_a\";\n\
+    }\n\
+}";
+
+string AISMergeTest::fnoc2_merge_ais = "Attributes {\n\
+    u {\n\
+        String units \"meter per second\";\n\
+        String long_name \"UWind\";\n\
+    }\n\
+    v {\n\
+        String units \"meter per second\";\n\
+        String long_name \"VWind\";\n\
+    }\n\
+    lat {\n\
+        String units \"degree North\";\n\
+        String long_name \"Latitude\";\n\
+    }\n\
+    lon {\n\
+        String units \"degree East\";\n\
+        String long_name \"Longitude\";\n\
+    }\n\
+    time {\n\
+    }\n\
+    NC_GLOBAL {\n\
+    }\n\
+    DODS_EXTRA {\n\
+    }\n\
+}";
+
+string AISMergeTest::fnoc3_merge_ais = "Attributes {\n\
+    u {\n\
+        String long_name \"UWind\";\n\
+    }\n\
+    v {\n\
+        String long_name \"VWind\";\n\
+    }\n\
+    lat {\n\
+        String long_name \"Latitude\";\n\
+    }\n\
+    lon {\n\
+        String long_name \"Longitude\";\n\
+    }\n\
+}";
+
+string AISMergeTest::three_fnoc_merge_ais = "Attributes {\n\
+    u {\n\
+        String long_name \"UWind\", \"Vector wind eastward component\";\n\
+        String units \"meter per second\";\n\
+        String missing_value \"-32767\";\n\
+        String scale_factor \"0.005\";\n\
+    }\n\
+    v {\n\
+        String long_name \"VWind\", \"Vector wind northward component\";\n\
+        String units \"meter per second\";\n\
+        String missing_value \"-32767\";\n\
+        String scale_factor \"0.005\";\n\
+    }\n\
+    lat {\n\
+        String long_name \"Latitude\";\n\
+        String units \"degree North\";\n\
+    }\n\
+    lon {\n\
+        String long_name \"Longitude\";\n\
+        String units \"degree East\";\n\
+    }\n\
+    time {\n\
+        String units \"hours from base_time\";\n\
+    }\n\
+    NC_GLOBAL {\n\
+        String base_time \"88-245-00:00:00\";\n\
+        String title \" FNOC UV wind components from 1988-245 to 1988-247.\";\n\
+        String AIS_Test_info \"This dataset's name starts with a digit.\";\n\
+    }\n\
+    DODS_EXTRA {\n\
+        String Unlimited_Dimension \"time_a\";\n\
+    }\n\
+}";
+
+CPPUNIT_TEST_SUITE_REGISTRATION(AISMergeTest);
+
+} // namespace libdap
+
+int main(int, char **)
+{
+    CppUnit::TextTestRunner runner;
+    runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
+    bool wasSuccessful = runner.run("", false);
+
+    return wasSuccessful ? 0 : 1;
+}
+
diff --git a/unit-tests/chunked_iostream_test.cc b/unit-tests/chunked_iostream_test.cc
new file mode 100644
index 0000000..dfe1144
--- /dev/null
+++ b/unit-tests/chunked_iostream_test.cc
@@ -0,0 +1,578 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2013 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#include <cppunit/TextTestRunner.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+#include <cppunit/extensions/HelperMacros.h>
+
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <iostream>
+#include <fstream>
+#include <string>
+
+#include "GetOpt.h"
+
+#include "chunked_ostream.h"
+#include "chunked_istream.h"
+
+#include "InternalErr.h"
+#include "test_config.h"
+#include "debug.h"
+
+static bool debug = false;
+
+const string path = (string) TEST_SRC_DIR + "/chunked-io";
+
+#undef DBG
+#define DBG(x) do { if (debug) (x); } while(false);
+
+using namespace std;
+using namespace CppUnit;
+using namespace libdap;
+
+/**
+ * The intent is to test writing to and reading from a chunked iostream,
+ * using various combinations of chunk/buffer sizes and character red/write
+ * sizes. There are three write functions and three read functions and
+ * all combinations are tested.
+ */
+class chunked_iostream_test: public TestFixture {
+private:
+    // This should be big enough to do meaningful timing tests
+    string big_file, big_file_2, big_file_3;
+    // This should be smaller than a single buffer
+    string small_file;
+    // A modest sized text file - makes looking at the results easier
+    string text_file;
+public:
+    chunked_iostream_test()
+    {
+    }
+    ~chunked_iostream_test()
+    {
+    }
+
+    void setUp()
+    {
+        big_file = path + "/test_big_binary_file.bin";
+        big_file_2 = path + "/test_big_binary_file_2.bin";
+        big_file_3 = path + "/test_big_binary_file_3.bin"; // not used yet
+
+        small_file = path + "/test_small_text_file.txt";
+        text_file = path + "/test_text_file.txt";
+    }
+
+    void tearDown()
+    {
+    }
+
+    void single_char_write(const string &file, int buf_size)
+    {
+        fstream infile(file.c_str(), ios::in | ios::binary);
+        DBG(cerr << "infile: " << file << endl);
+        if (!infile.good()) CPPUNIT_FAIL("File not open or eof");
+
+        string out = file + ".chunked";
+        fstream outfile(out.c_str(), ios::out | ios::binary);
+
+        chunked_ostream chunked_outfile(outfile, buf_size);
+
+        char c;
+        infile.read(&c, 1);
+        int num = infile.gcount();
+        while (num > 0 && !infile.eof()) {
+            chunked_outfile.write(&c, num);
+            infile.read(&c, 1);
+            num = infile.gcount();
+        }
+
+        if (num > 0 && !infile.bad()) {
+            chunked_outfile.write(&c, num);
+        }
+
+        chunked_outfile.flush();
+    }
+
+    void write_128char_data(const string &file, int buf_size)
+    {
+        fstream infile(file.c_str(), ios::in | ios::binary);
+        if (!infile.good()) CPPUNIT_FAIL("File not open or eof");
+
+        string out = file + ".chunked";
+        fstream outfile(out.c_str(), ios::out | ios::binary);
+
+        chunked_ostream chunked_outfile(outfile, buf_size);
+
+        char str[128];
+        infile.read(str, 128);
+        int num = infile.gcount();
+        while (num > 0 && !infile.eof()) {
+            chunked_outfile.write(str, num);
+            infile.read(str, 128);
+            num = infile.gcount();
+        }
+
+        if (num > 0 && !infile.bad()) {
+            chunked_outfile.write(str, num);
+        }
+
+        chunked_outfile.flush();
+    }
+
+    // This will not work with the small text file. This code assume that
+    // the file to be written has at least 24 bytes for the first chunk,
+    // which is deliberately sent using flush before the buffer is full and
+    // then has at least 48 more bytes (but ideally 49, because this code
+    // tries to send an End chunk with one or more bytes as opposed to
+    // sending the last data chunk with fewer than buf_size and then sending a
+    // zero length END chunk).
+    void write_24char_data_with_error_option(const string &file, int buf_size, bool error = false)
+    {
+        fstream infile(file.c_str(), ios::in | ios::binary);
+        if (!infile.good()) CPPUNIT_FAIL("File not open or eof");
+
+        string out = file + ".chunked";
+        fstream outfile(out.c_str(), ios::out | ios::binary);
+
+        chunked_ostream chunked_outfile(outfile, buf_size);
+
+        try {
+            char str[24];
+            infile.read(str, 24);
+            int num = infile.gcount();
+            if (num > 0 && !infile.eof()) {
+                chunked_outfile.write(str, num);
+                chunked_outfile.flush();
+            }
+
+            infile.read(str, 24);
+            num = infile.gcount();
+            if (num > 0 && !infile.eof()) chunked_outfile.write(str, num);
+
+            // Send an error chunk; the 24 bytes read here are lost...
+            if (error) throw Error("Testing error transmission");
+
+            infile.read(str, 24);
+            num = infile.gcount();
+            while (num == 24 && !infile.eof()) {
+                chunked_outfile.write(str, num);
+                infile.read(str, 24);
+                num = infile.gcount();
+            }
+
+            if (num > 0 && !infile.bad()) {
+                chunked_outfile.write(str, num);
+            }
+
+            // flush() calls sync() which forces a DATA chunk to be sent, regardless of
+            // the amount of data in the buffer. When the stream is destroyed, end_chunk()
+            // is sent with the remain chars, so removing flush() here ensures that we test
+            // a non-empty END chunk.
+            // chunked_outfile.flush();
+        }
+        catch (Error &e) {
+            chunked_outfile.write_err_chunk(e.get_error_message());
+        }
+    }
+
+    void single_char_read(const string &file, int buf_size)
+    {
+        string in = file + ".chunked";
+        fstream infile(in.c_str(), ios::in | ios::binary);
+        if (!infile.good()) CPPUNIT_FAIL("File not open or eof");
+#if BYTE_ORDER_PREFIX
+        chunked_istream chunked_infile(infile, buf_size, 0x00);
+#else
+        chunked_istream chunked_infile(infile, buf_size);
+#endif
+        string out = file + ".plain";
+        fstream outfile(out.c_str(), ios::out | ios::binary);
+
+        char c;
+        int count = 1;
+        chunked_infile.read(&c, 1);
+        int num = chunked_infile.gcount();
+        DBG(cerr << "num: " << num << ", " << count++ << endl);
+        while (num > 0 && !chunked_infile.eof()) {
+            outfile.write(&c, num);
+            chunked_infile.read(&c, 1);
+            num = chunked_infile.gcount();
+            DBG(cerr << "num: " << num << ", " << count++ << ", eof: " << chunked_infile.eof() << endl);
+        }
+
+        DBG(cerr << "eof is :" << chunked_infile.eof() << ", num: " << num << endl);
+
+        if (num > 0 && !chunked_infile.bad()) outfile.write(&c, num);
+
+        outfile.flush();
+    }
+
+    void read_128char_data(const string &file, int buf_size)
+    {
+        string in = file + ".chunked";
+        fstream infile(in.c_str(), ios::in | ios::binary);
+        if (!infile.good()) cerr << "File not open or eof" << endl;
+        chunked_istream chunked_infile(infile, buf_size);
+
+        string out = file + ".plain";
+        fstream outfile(out.c_str(), ios::out | ios::binary);
+
+        char str[128];
+        int count = 1;
+        chunked_infile.read(str, 128);
+        int num = chunked_infile.gcount();
+        DBG(cerr << "num: " << num << ", " << count++ << endl);
+        while (num > 0 && !chunked_infile.eof()) {
+            outfile.write(str, num);
+            chunked_infile.read(str, 128);
+            num = chunked_infile.gcount();
+            DBG(cerr << "num: " << num << ", " << count++ << ", eof: " << chunked_infile.eof() << endl);
+        }
+
+        if (num > 0 && !chunked_infile.bad()) {
+            outfile.write(str, num);
+        }
+
+        outfile.flush();
+    }
+
+    void read_24char_data_with_error_option(const string &file, int buf_size)
+    {
+        string in = file + ".chunked";
+        fstream infile(in.c_str(), ios::in | ios::binary);
+        if (!infile.good()) cerr << "File not open or eof" << endl;
+        chunked_istream chunked_infile(infile, buf_size);
+
+        string out = file + ".plain";
+        fstream outfile(out.c_str(), ios::out | ios::binary);
+
+        try {
+#if 0
+            chunked_infile.read(str, 24);
+            int num = chunked_infile.gcount();
+            if (num > 0 && !chunked_infile.eof()) {
+                outfile.write(str, num);
+                outfile.flush();
+            }
+#endif
+            char str[24];
+            chunked_infile.read(str, 24);
+            int num = chunked_infile.gcount();
+            while (num > 0 && !chunked_infile.eof()) {
+                outfile.write(str, num);
+                chunked_infile.read(str, 24);
+                num = chunked_infile.gcount();
+            }
+
+            // The chunked_istream uses a chunked_inbuf and that signals error
+            // using EOF. The error message is stored in the buffer and can be
+            // detected and accessed using the error() error_message() methods
+            // that both the buffer and istream classes have.
+            if (chunked_infile.error()) throw Error("Found an error in the stream");
+
+            if (num > 0 && !chunked_infile.bad()) {
+                outfile.write(str, num);
+            }
+
+            outfile.flush();
+        }
+        catch (Error &e) {
+            DBG(cerr << "Error chunk found: " << e.get_error_message() << endl);
+            throw;
+        }
+    }
+
+    // these are the tests
+    void test_write_1_read_1_small_file()
+    {
+        single_char_write(small_file, 32);
+        single_char_read(small_file, 32);
+        string cmp = "cmp " + small_file + " " + small_file + ".plain";
+        CPPUNIT_ASSERT(system(cmp.c_str()) == 0);
+    }
+
+    void test_write_1_read_1_text_file()
+    {
+        single_char_write(text_file, 32);
+        single_char_read(text_file, 32);
+        string cmp = "cmp " + text_file + " " + text_file + ".plain";
+        CPPUNIT_ASSERT(system(cmp.c_str()) == 0);
+    }
+
+    void test_write_1_read_1_big_file()
+    {
+        single_char_write(big_file, 28);
+        single_char_read(big_file, 28);
+        string cmp = "cmp " + big_file + " " + big_file + ".plain";
+        CPPUNIT_ASSERT(system(cmp.c_str()) == 0);
+    }
+    void test_write_1_read_1_big_file_2()
+    {
+        single_char_write(big_file_2, 28);
+        single_char_read(big_file_2, 28);
+        string cmp = "cmp " + big_file_2 + " " + big_file_2 + ".plain";
+        CPPUNIT_ASSERT(system(cmp.c_str()) == 0);
+    }
+
+    // these are the tests
+    void test_write_1_read_128_small_file()
+    {
+        single_char_write(small_file, 32);
+        read_128char_data(small_file, 32);
+        string cmp = "cmp " + small_file + " " + small_file + ".plain";
+        CPPUNIT_ASSERT(system(cmp.c_str()) == 0);
+    }
+
+    void test_write_1_read_128_text_file()
+    {
+        single_char_write(text_file, 32);
+        read_128char_data(text_file, 32);
+        string cmp = "cmp " + text_file + " " + text_file + ".plain";
+        CPPUNIT_ASSERT(system(cmp.c_str()) == 0);
+    }
+
+    void test_write_1_read_128_big_file()
+    {
+        single_char_write(big_file, 28);
+        read_128char_data(big_file, 28);
+        string cmp = "cmp " + big_file + " " + big_file + ".plain";
+        CPPUNIT_ASSERT(system(cmp.c_str()) == 0);
+    }
+
+    void test_write_1_read_128_big_file_2()
+    {
+        single_char_write(big_file_2, 28);
+        read_128char_data(big_file_2, 28);
+        string cmp = "cmp " + big_file_2 + " " + big_file_2 + ".plain";
+        CPPUNIT_ASSERT(system(cmp.c_str()) == 0);
+    }
+
+    // 24 char write units
+
+    void test_write_24_read_1_text_file()
+    {
+        write_24char_data_with_error_option(text_file, 32);
+        single_char_read(text_file, 32);
+        string cmp = "cmp " + text_file + " " + text_file + ".plain";
+        CPPUNIT_ASSERT(system(cmp.c_str()) == 0);
+    }
+
+    void test_write_24_read_1_big_file()
+    {
+        write_24char_data_with_error_option(big_file, 1024);
+        DBG(cerr << "Wrote the file" << endl);
+
+        single_char_read(big_file, 1024);
+        string cmp = "cmp " + big_file + " " + big_file + ".plain";
+        CPPUNIT_ASSERT(system(cmp.c_str()) == 0);
+    }
+
+    void test_write_24_read_1_big_file_2()
+    {
+        write_24char_data_with_error_option(big_file_2, 1024);
+        DBG(cerr << "Wrote the file" << endl);
+
+        single_char_read(big_file_2, 1024);
+        string cmp = "cmp " + big_file_2 + " " + big_file_2 + ".plain";
+        CPPUNIT_ASSERT(system(cmp.c_str()) == 0);
+    }
+
+    void test_write_24_read_128_text_file()
+    {
+        write_24char_data_with_error_option(text_file, 32);
+        read_128char_data(text_file, 32);
+        string cmp = "cmp " + text_file + " " + text_file + ".plain";
+        CPPUNIT_ASSERT(system(cmp.c_str()) == 0);
+    }
+
+    void test_write_24_read_128_big_file()
+    {
+        write_24char_data_with_error_option(big_file, 28);
+        DBG(cerr << "Wrote the file" << endl);
+
+        read_128char_data(big_file, 28);
+        string cmp = "cmp " + big_file + " " + big_file + ".plain";
+        CPPUNIT_ASSERT(system(cmp.c_str()) == 0);
+    }
+
+    void test_write_24_read_128_big_file_2()
+    {
+        write_24char_data_with_error_option(big_file_2, 28);
+        read_128char_data(big_file_2, 28);
+        string cmp = "cmp " + big_file_2 + " " + big_file_2 + ".plain";
+        CPPUNIT_ASSERT(system(cmp.c_str()) == 0);
+    }
+
+    // 128 char writes
+    void test_write_128_read_1_text_file()
+    {
+        write_128char_data(text_file, 32);
+        single_char_read(text_file, 32);
+        string cmp = "cmp " + text_file + " " + text_file + ".plain";
+        CPPUNIT_ASSERT(system(cmp.c_str()) == 0);
+    }
+
+    void test_write_128_read_1_big_file()
+    {
+        write_128char_data(big_file, 32);
+        DBG(cerr << "Wrote the file" << endl);
+
+        single_char_read(big_file, 32);
+        string cmp = "cmp " + big_file + " " + big_file + ".plain";
+        CPPUNIT_ASSERT(system(cmp.c_str()) == 0);
+    }
+
+    void test_write_128_read_1_big_file_2()
+    {
+        write_128char_data(big_file_2, 32);
+        DBG(cerr << "Wrote the file" << endl);
+
+        single_char_read(big_file_2, 1024);
+        string cmp = "cmp " + big_file_2 + " " + big_file_2 + ".plain";
+        CPPUNIT_ASSERT(system(cmp.c_str()) == 0);
+    }
+
+    void test_write_128_read_128_text_file()
+    {
+        write_128char_data(text_file, 32);
+        read_128char_data(text_file, 32);
+        string cmp = "cmp " + text_file + " " + text_file + ".plain";
+        CPPUNIT_ASSERT(system(cmp.c_str()) == 0);
+    }
+
+    void test_write_128_read_128_big_file()
+    {
+        write_128char_data(big_file, 28);
+        DBG(cerr << "Wrote the file" << endl);
+
+        read_128char_data(big_file, 28);
+        string cmp = "cmp " + big_file + " " + big_file + ".plain";
+        CPPUNIT_ASSERT(system(cmp.c_str()) == 0);
+    }
+
+    void test_write_128_read_128_big_file_2()
+    {
+        write_128char_data(big_file_2, 28);
+        read_128char_data(big_file_2, 28);
+        string cmp = "cmp " + big_file_2 + " " + big_file_2 + ".plain";
+        CPPUNIT_ASSERT(system(cmp.c_str()) == 0);
+    }
+
+    // Send an error
+
+    void test_write_24_read_24_big_file_2_error()
+    {
+        write_24char_data_with_error_option(big_file_2, 2048, true /*error*/);
+        try {
+            read_24char_data_with_error_option(big_file_2, 2048);
+            CPPUNIT_FAIL("Should have caught an error message");
+        }
+        catch (Error &e) {
+            CPPUNIT_ASSERT(!e.get_error_message().empty());
+        }
+    }
+
+    CPPUNIT_TEST_SUITE (chunked_iostream_test);
+
+    CPPUNIT_TEST (test_write_1_read_1_small_file);
+    CPPUNIT_TEST (test_write_1_read_1_text_file);
+    CPPUNIT_TEST (test_write_1_read_1_big_file);
+    CPPUNIT_TEST (test_write_1_read_1_big_file_2);
+
+    CPPUNIT_TEST (test_write_1_read_128_small_file);
+    CPPUNIT_TEST (test_write_1_read_128_text_file);
+    CPPUNIT_TEST (test_write_1_read_128_big_file);
+    CPPUNIT_TEST (test_write_1_read_128_big_file_2);
+
+    CPPUNIT_TEST (test_write_24_read_1_text_file);
+    CPPUNIT_TEST (test_write_24_read_1_big_file);
+    CPPUNIT_TEST (test_write_24_read_1_big_file_2);
+
+    CPPUNIT_TEST (test_write_24_read_128_text_file);
+    CPPUNIT_TEST (test_write_24_read_128_big_file);
+    CPPUNIT_TEST (test_write_24_read_128_big_file_2);
+
+    CPPUNIT_TEST (test_write_128_read_1_text_file);
+    CPPUNIT_TEST (test_write_128_read_1_big_file);
+    CPPUNIT_TEST (test_write_128_read_1_big_file_2);
+
+    CPPUNIT_TEST (test_write_128_read_128_text_file);
+    CPPUNIT_TEST (test_write_128_read_128_big_file);
+    CPPUNIT_TEST (test_write_128_read_128_big_file_2);
+
+    CPPUNIT_TEST (test_write_24_read_24_big_file_2_error);
+
+    CPPUNIT_TEST_SUITE_END();
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION (chunked_iostream_test);
+
+int main(int argc, char *argv[])
+{
+    GetOpt getopt(argc, argv, "dh");
+    int option_char;
+
+    while ((option_char = getopt()) != -1)
+        switch (option_char) {
+        case 'd':
+            debug = 1;  // debug is a static global
+            break;
+
+        case 'h': {     // help - show test names
+            cerr << "Usage: chunked_iostream_test has the following tests:" << endl;
+            const std::vector<Test*> &tests = chunked_iostream_test::suite()->getTests();
+            unsigned int prefix_len = chunked_iostream_test::suite()->getName().append("::").length();
+            for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+                cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+            }
+            break;
+        }
+
+        default:
+            break;
+        }
+
+    CppUnit::TextTestRunner runner;
+    runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
+    bool wasSuccessful = true;
+    string test = "";
+    int i = getopt.optind;
+    if (i == argc) {
+        // run them all
+        wasSuccessful = runner.run("");
+    }
+    else {
+        for (; i < argc; ++i) {
+            if (debug) cerr << "Running " << argv[i] << endl;
+            test = chunked_iostream_test::suite()->getName().append("::").append(argv[i]);
+            wasSuccessful = wasSuccessful && runner.run(test);
+        }
+    }
+
+    return wasSuccessful ? 0 : 1;
+}
diff --git a/unit-tests/das-testsuite/bad_value_test.1 b/unit-tests/das-testsuite/bad_value_test.1
new file mode 100644
index 0000000..a2de533
--- /dev/null
+++ b/unit-tests/das-testsuite/bad_value_test.1
@@ -0,0 +1,12 @@
+Attributes {
+    bad_values {
+	Byte x 257;
+	Int16 y 60000;
+	UInt16 z 70000;
+	Int32 a 2147483648;
+	UInt32 b 4294967296;
+
+	Float32 c 3.5E+38;
+	Float64 d 1.8E+308;
+    }
+}
diff --git a/unit-tests/das-testsuite/config/unix.exp b/unit-tests/das-testsuite/config/unix.exp
new file mode 100644
index 0000000..5087030
--- /dev/null
+++ b/unit-tests/das-testsuite/config/unix.exp
@@ -0,0 +1,54 @@
+
+# Tcl/Expect code for the DAS test.
+
+# Make sure the global var DASTEST is set correctly.
+
+global DASTEST
+if ![info exists DASTEST] then {
+    set DASTEST [transform ./das-test]
+}
+
+# The four `required' procs are _start, _load, _exit and _version.
+
+proc das-test_start { sw {ifile ""} {ofile ""}} {
+    global verbose
+    global DASTEST
+    global comp_output
+    global spawn_id
+
+    if {$verbose >= 1} {
+	send_user "Testing $ifile $ofile ...\n"
+	exp_internal 1
+    }
+
+    if {$ifile != ""} {
+	set ifile "< $ifile"
+    }
+
+    if {$ofile != ""} {
+	set ofile "> $ofile"
+    }
+
+    switch $sw {
+	p {catch "exec $DASTEST -p $ifile $ofile" comp_output}
+	s {eval "spawn $DASTEST -s"}
+    }
+
+    if {$verbose >= 1} {
+	switch $sw {
+	    p {send_user "Comp output:\n$comp_output\n"}
+	    s {send_user "Program running: spawn_id=$spawn_id\n"}
+	}
+    }
+}
+
+proc das-test_load {} {
+}
+
+proc das-test_exit {} {
+    send -raw ""
+}
+
+proc das-test_version {} {
+    send_user "DAS test suite 1.2\n"
+}
diff --git a/unit-tests/das-testsuite/das b/unit-tests/das-testsuite/das
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/unit-tests/das-testsuite/das
diff --git a/unit-tests/das-testsuite/das-test.0/scanner.1.exp b/unit-tests/das-testsuite/das-test.0/scanner.1.exp
new file mode 100644
index 0000000..f952a50
--- /dev/null
+++ b/unit-tests/das-testsuite/das-test.0/scanner.1.exp
@@ -0,0 +1,47 @@
+
+# expect/tcl code to test the das scanner
+# jhrg
+#
+# $Log: scanner.1.exp,v $
+# Revision 1.1  1996/07/16 16:54:31  jimg
+# Added.
+#
+# Revision 1.3  1996/05/14 15:40:41  jimg
+# These changes have already been checked in once before. However, I
+# corrupted the source repository and restored it from a 5/9/96 backup
+# tape. The previous version's log entry should cover the changes.
+#
+# Revision 1.2  1995/10/23  23:47:02  jimg
+# Modified...
+#
+# Revision 1.1  1995/02/16  15:34:43  jimg
+# Added these tests. See comments in files in parent directory.
+#
+#
+
+global comp_output		# contains output from das-test_start
+global verbose			# this and srcdir are set by runtest.exp
+global srcdir
+
+# The variable `test_name' is the name of the das input file for this test.
+
+set test_name scanner.1
+
+set prompt "das-test:"
+set timeout 2
+
+das-test_start s
+
+expect {
+    -re "^$prompt $" { 
+	pass "$test_name" 
+    }
+    timeout { 
+	send_user "Timeout\n"
+	fail "$test_name" 
+    }
+}
+
+das-test_exit
+
+
diff --git a/unit-tests/das-testsuite/das-test.0/scanner.2.exp b/unit-tests/das-testsuite/das-test.0/scanner.2.exp
new file mode 100644
index 0000000..22b46ac
--- /dev/null
+++ b/unit-tests/das-testsuite/das-test.0/scanner.2.exp
@@ -0,0 +1,163 @@
+
+# expect/tcl code to test the das scanner
+# jhrg
+#
+# $Log: scanner.2.exp,v $
+# Revision 1.3  2002/06/03 22:21:16  jimg
+# Merged with release-3-2-9
+#
+# Revision 1.2.54.1  2001/11/01 00:43:52  jimg
+# Fixes to the scanners and parsers so that dataset variable names may
+# start with digits. I've expanded the set of characters that may appear
+# in a variable name and made it so that all except `#' may appear at
+# the start. Some characters are not allowed in variables that appear in
+# a DDS or CE while they are allowed in the DAS. This makes it possible
+# to define containers with names like `COARDS:long_name.' Putting a colon
+# in a variable name makes the CE parser much more complex. Since the set
+# of characters that people want seems pretty limited (compared to the
+# complete ASCII set) I think this is an OK approach. If we have to open
+# up the expr.lex scanner completely, then we can but not without adding
+# lots of action clauses to teh parser. Note that colon is just an example,
+# there's a host of characters that are used in CEs that are not allowed
+# in IDs.
+#
+# Revision 1.2  1997/05/05 20:29:22  jimg
+# *** empty log message ***
+#
+# Revision 1.1  1996/07/16 16:54:33  jimg
+# Added.
+#
+#
+
+global comp_output		# contains output from das-test_start
+global verbose			# this and srcdir are set by runtest.exp
+global srcdir
+
+set test_name scanner.2
+
+set prompt "das-test:"
+set timeout 2
+set pass 1
+
+das-test_start s
+
+expect {
+    "${prompt} " { 
+    }
+    timeout { 
+	send_user "Timeout\n"
+	set pass 0
+    }
+}
+
+if {$pass} {
+    set thing "a\r\n"
+    send $thing
+
+    expect {
+	-re ".*WORD=${thing}${prompt} $" { 
+	}
+	timeout { 
+	    send_user "Timeout\n"
+	    set pass 0
+	}
+    }
+}
+
+if {$pass} {
+    set thing "averylongidentifierthatishardtoread\r\n"
+    send $thing
+
+    expect {
+	-re ".*WORD=${thing}${prompt} $" { 
+	}
+	timeout { 
+	    send_user "Timeout\n"
+	    set pass 0
+	}
+    }
+}
+
+if {$pass} {
+    set thing "a_very_long_identifier_that_is_not_hard_to_read\r\n"
+    send $thing
+
+    expect {
+	-re ".*WORD=${thing}${prompt} $" { 
+	}
+	timeout { 
+	    send_user "Timeout\n"
+	    set pass 0
+	}
+    }
+}
+
+if {$pass} {
+    set thing "One_That_HASCAPITALS\r\n"
+    send $thing
+
+    expect {
+	-re ".*WORD=${thing}${prompt} $" { 
+	}
+	timeout { 
+	    send_user "Timeout\n"
+	    set pass 0
+	}
+    }
+}
+
+if {$pass} {
+    set thing "One_That_has_1234567890\r\n"
+    send $thing
+
+    expect {
+	-re ".*WORD=${thing}${prompt} $" { 
+	}
+	timeout { 
+	    send_user "Timeout\n"
+	    set pass 0
+	}
+    }
+}
+
+if {$pass} {
+    set thing "z1234567890\r\n"
+    send $thing
+
+    expect {
+	-re ".*WORD=${thing}${prompt} $" { 
+	}
+	timeout { 
+	    send_user "Timeout\n"
+	    set pass 0
+	}
+    }
+}
+
+# Some things that are *not* identifiers! These should scan as strings.
+# But now (5/5/97) people have convinced me to let these through! Arrgh...
+# jhrg.
+
+if {$pass} {
+    set thing "a0.9\r\n"
+    send $thing
+
+    expect {
+	-re ".*WORD=${thing}${prompt} $" { 
+	}
+	timeout { 
+	    send_user "Timeout\n"
+	    set pass 0
+	}
+    }
+}
+
+if {$pass} {
+    pass $test_name
+} else {
+    fail $test_name
+}
+
+das-test_exit
+
+
diff --git a/unit-tests/das-testsuite/das-test.0/scanner.3.exp b/unit-tests/das-testsuite/das-test.0/scanner.3.exp
new file mode 100644
index 0000000..d80064c
--- /dev/null
+++ b/unit-tests/das-testsuite/das-test.0/scanner.3.exp
@@ -0,0 +1,82 @@
+
+# expect/tcl code to test the das scanner
+# jhrg
+#
+# $Log: scanner.3.exp,v $
+# Revision 1.1  1996/07/16 16:54:34  jimg
+# Added.
+#
+#
+
+global comp_output		# contains output from das-test_start
+global verbose			# this and srcdir are set by runtest.exp
+global srcdir
+
+set test_name scanner.3
+
+set prompt "das-test:"
+set timeout 2
+set pass 1
+
+das-test_start s
+
+expect {
+    "${prompt} " { 
+    }
+    timeout { 
+	send_user "Timeout\n"
+	set pass 0
+    }
+}
+
+if {$pass} {
+    set thing "attributes\r\n"
+    send $thing
+
+    expect {
+	-re ".*ATTR\r\n${prompt} $" { 
+	}
+	timeout { 
+	    send_user "Timeout\n"
+	    set pass 0
+	}
+    }
+}
+
+if {$pass} {
+    set thing "Attributes\r\n"
+    send $thing
+
+    expect {
+	-re ".*ATTR\r\n${prompt} $" { 
+	}
+	timeout { 
+	    send_user "Timeout\n"
+	    set pass 0
+	}
+    }
+}
+
+if {$pass} {
+    set thing "ATTRIBUTES\r\n"
+    send $thing
+
+    expect {
+	-re ".*ATTR\r\n${prompt} $" { 
+	}
+	timeout { 
+	    send_user "Timeout\n"
+	    set pass 0
+	}
+    }
+}
+
+if {$pass} {
+    pass $test_name
+} else {
+    fail $test_name
+}
+
+das-test_exit
+
+
diff --git a/unit-tests/das-testsuite/das-test.0/scanner.4.exp b/unit-tests/das-testsuite/das-test.0/scanner.4.exp
new file mode 100644
index 0000000..aa15c64
--- /dev/null
+++ b/unit-tests/das-testsuite/das-test.0/scanner.4.exp
@@ -0,0 +1,119 @@
+
+# expect/tcl code to test the das scanner
+# jhrg
+#
+# $Log: scanner.4.exp,v $
+# Revision 1.3  2002/06/03 22:21:16  jimg
+# Merged with release-3-2-9
+#
+# Revision 1.2.54.1  2001/11/01 00:43:52  jimg
+# Fixes to the scanners and parsers so that dataset variable names may
+# start with digits. I've expanded the set of characters that may appear
+# in a variable name and made it so that all except `#' may appear at
+# the start. Some characters are not allowed in variables that appear in
+# a DDS or CE while they are allowed in the DAS. This makes it possible
+# to define containers with names like `COARDS:long_name.' Putting a colon
+# in a variable name makes the CE parser much more complex. Since the set
+# of characters that people want seems pretty limited (compared to the
+# complete ASCII set) I think this is an OK approach. If we have to open
+# up the expr.lex scanner completely, then we can but not without adding
+# lots of action clauses to teh parser. Note that colon is just an example,
+# there's a host of characters that are used in CEs that are not allowed
+# in IDs.
+#
+# Revision 1.2  1997/05/05 20:29:11  jimg
+# *** empty log message ***
+#
+# Revision 1.1  1996/07/16 16:54:35  jimg
+# Added.
+#
+#
+
+global comp_output		# contains output from das-test_start
+global verbose			# this and srcdir are set by runtest.exp
+global srcdir
+
+set test_name scanner.4
+
+set prompt "das-test:"
+set timeout 2
+set pass 1
+
+das-test_start s
+
+expect {
+    "${prompt} " { 
+    }
+    timeout { 
+	send_user "Timeout\n"
+	set pass 0
+    }
+}
+
+if {$pass} {
+    set thing "\"Attributes\"\r\n"
+    send $thing
+
+    expect {
+	-re ".*WORD=${thing}${prompt} $" { 
+	}
+	timeout { 
+	    send_user "Timeout\n"
+	    set pass 0
+	}
+    }
+}
+
+# Check that all the special characters pass through the scanner. *DON'T*
+# mess with the strings THING and THING2! In THING2 all the special chars are
+# prefixed by `\\' except `[' which is prefixed by `\\\'; the first two `\'s'
+# yeild a single `\', the third `\' escapes the `['. NB: the `[' in THING is
+# also escaped. The left bracket is special in Tcl even in a string
+
+if {$pass} {
+    set thing "\"This is a long nasty string that has some special characters\
+    embedded:!@#$%^&*()_+|~-=`,./;'\[]{}:<>?\"\r\n"
+
+    set thing2 "\"This is a long nasty string that has some special characters\
+    embedded:!@#\\$\\%\\^\\&\\*\\(\\)\\_\\+\\|\\~\\-\\=\\`\\,\\.\\/\\;\\'\\\[\\]\\{\\}\\:\\<\\>\\?\"\r\n"
+
+
+    send $thing
+
+    expect {
+	-re ".*WORD=${thing2}${prompt} $" { 
+	}
+	timeout { 
+	    send_user "Timeout\n"
+	    set pass 0
+	}
+    }
+}
+
+# Strange case where unquoted sequence of characters `falls through' the
+# scanner cases for WORD, Float and int and winds up a string. Maybe we should
+# not allow this to happen? 7/15/96
+
+if {$pass} {
+    set thing "a_0.9\r\n"
+    send $thing
+
+    expect {
+	-re ".*WORD=${thing}${prompt} $" { 
+	}
+	timeout { 
+	    send_user "Timeout\n"
+	    set pass 0
+	}
+    }
+}
+
+if {$pass} {
+    pass $test_name
+} else {
+    fail $test_name
+}
+
+das-test_exit
+
+
diff --git a/unit-tests/das-testsuite/das-test.0/scanner.5.exp b/unit-tests/das-testsuite/das-test.0/scanner.5.exp
new file mode 100644
index 0000000..1f54b93
--- /dev/null
+++ b/unit-tests/das-testsuite/das-test.0/scanner.5.exp
@@ -0,0 +1,80 @@
+
+# expect/tcl code to test the das scanner
+# jhrg
+#
+# $Log: scanner.5.exp,v $
+# Revision 1.1  1996/07/16 16:54:36  jimg
+# Added.
+#
+#
+
+global comp_output		# contains output from das-test_start
+global verbose			# this and srcdir are set by runtest.exp
+global srcdir
+
+set test_name scanner.5
+
+set prompt "das-test:"
+set timeout 2
+set pass 1
+
+das-test_start s
+
+expect {
+    "${prompt} " { 
+    }
+    timeout { 
+	send_user "Timeout\n"
+	set pass 0
+    }
+}
+
+if {$pass} {
+    set thing "byte\r\n"
+    send $thing
+
+    expect {
+	-re ".*BYTE\r\n${prompt} $" { 
+	}
+	timeout { 
+	    send_user "Timeout\n"
+	    set pass 0
+	}
+    }
+}
+
+if {$pass} {
+    set thing "Byte\r\n"
+    send $thing
+
+    expect {
+	-re ".*BYTE\r\n${prompt} $" { 
+	}
+	timeout { 
+	    send_user "Timeout\n"
+	    set pass 0
+	}
+    }
+}
+
+if {$pass} {
+    set thing "BYTE\r\n"
+    send $thing
+
+    expect {
+	-re ".*BYTE\r\n${prompt} $" { 
+	}
+	timeout { 
+	    send_user "Timeout\n"
+	    set pass 0
+	}
+    }
+}
+
+if {$pass} {
+    pass $test_name
+} else {
+    fail $test_name
+}
+
+das-test_exit
diff --git a/unit-tests/das-testsuite/das-test.0/scanner.6.exp b/unit-tests/das-testsuite/das-test.0/scanner.6.exp
new file mode 100644
index 0000000..f19540a
--- /dev/null
+++ b/unit-tests/das-testsuite/das-test.0/scanner.6.exp
@@ -0,0 +1,80 @@
+
+# expect/tcl code to test the das scanner
+# jhrg
+#
+# $Log: scanner.6.exp,v $
+# Revision 1.1  1996/07/16 16:54:37  jimg
+# Added.
+#
+#
+
+global comp_output		# contains output from das-test_start
+global verbose			# this and srcdir are set by runtest.exp
+global srcdir
+
+set test_name scanner.6
+
+set prompt "das-test:"
+set timeout 2
+set pass 1
+
+das-test_start s
+
+expect {
+    "${prompt} " { 
+    }
+    timeout { 
+	send_user "Timeout\n"
+	set pass 0
+    }
+}
+
+if {$pass} {
+    set thing "int32\r\n"
+    send $thing
+
+    expect {
+	-re ".*INT32\r\n${prompt} $" { 
+	}
+	timeout { 
+	    send_user "Timeout\n"
+	    set pass 0
+	}
+    }
+}
+
+if {$pass} {
+    set thing "Int32\r\n"
+    send $thing
+
+    expect {
+	-re ".*INT32\r\n${prompt} $" { 
+	}
+	timeout { 
+	    send_user "Timeout\n"
+	    set pass 0
+	}
+    }
+}
+
+if {$pass} {
+    set thing "INT32\r\n"
+    send $thing
+
+    expect {
+	-re ".*INT32\r\n${prompt} $" { 
+	}
+	timeout { 
+	    send_user "Timeout\n"
+	    set pass 0
+	}
+    }
+}
+
+if {$pass} {
+    pass $test_name
+} else {
+    fail $test_name
+}
+
+das-test_exit
diff --git a/unit-tests/das-testsuite/das-test.0/scanner.7.exp b/unit-tests/das-testsuite/das-test.0/scanner.7.exp
new file mode 100644
index 0000000..e13cea8
--- /dev/null
+++ b/unit-tests/das-testsuite/das-test.0/scanner.7.exp
@@ -0,0 +1,80 @@
+
+# expect/tcl code to test the das scanner
+# jhrg
+#
+# $Log: scanner.7.exp,v $
+# Revision 1.1  1996/07/16 16:54:38  jimg
+# Added.
+#
+#
+
+global comp_output		# contains output from das-test_start
+global verbose			# this and srcdir are set by runtest.exp
+global srcdir
+
+set test_name scanner.7
+
+set prompt "das-test:"
+set timeout 2
+set pass 1
+
+das-test_start s
+
+expect {
+    "${prompt} " { 
+    }
+    timeout { 
+	send_user "Timeout\n"
+	set pass 0
+    }
+}
+
+if {$pass} {
+    set thing "float64\r\n"
+    send $thing
+
+    expect {
+	-re ".*FLOAT64\r\n${prompt} $" { 
+	}
+	timeout { 
+	    send_user "Timeout\n"
+	    set pass 0
+	}
+    }
+}
+
+if {$pass} {
+    set thing "Float64\r\n"
+    send $thing
+
+    expect {
+	-re ".*FLOAT64\r\n${prompt} $" { 
+	}
+	timeout { 
+	    send_user "Timeout\n"
+	    set pass 0
+	}
+    }
+}
+
+if {$pass} {
+    set thing "FLOAT64\r\n"
+    send $thing
+
+    expect {
+	-re ".*FLOAT64\r\n${prompt} $" { 
+	}
+	timeout { 
+	    send_user "Timeout\n"
+	    set pass 0
+	}
+    }
+}
+
+if {$pass} {
+    pass $test_name
+} else {
+    fail $test_name
+}
+
+das-test_exit
diff --git a/unit-tests/das-testsuite/das-test.0/scanner.8.exp b/unit-tests/das-testsuite/das-test.0/scanner.8.exp
new file mode 100644
index 0000000..5643f3b
--- /dev/null
+++ b/unit-tests/das-testsuite/das-test.0/scanner.8.exp
@@ -0,0 +1,80 @@
+
+# expect/tcl code to test the das scanner
+# jhrg
+#
+# $Log: scanner.8.exp,v $
+# Revision 1.1  1996/07/16 16:54:39  jimg
+# Added.
+#
+#
+
+global comp_output		# contains output from das-test_start
+global verbose			# this and srcdir are set by runtest.exp
+global srcdir
+
+set test_name scanner.8
+
+set prompt "das-test:"
+set timeout 2
+set pass 1
+
+das-test_start s
+
+expect {
+    "${prompt} " { 
+    }
+    timeout { 
+	send_user "Timeout\n"
+	set pass 0
+    }
+}
+
+if {$pass} {
+    set thing "string\r\n"
+    send $thing
+
+    expect {
+	-re ".*STRING\r\n${prompt} $" { 
+	}
+	timeout { 
+	    send_user "Timeout\n"
+	    set pass 0
+	}
+    }
+}
+
+if {$pass} {
+    set thing "String\r\n"
+    send $thing
+
+    expect {
+	-re ".*STRING\r\n${prompt} $" { 
+	}
+	timeout { 
+	    send_user "Timeout\n"
+	    set pass 0
+	}
+    }
+}
+
+if {$pass} {
+    set thing "STRING\r\n"
+    send $thing
+
+    expect {
+	-re ".*STRING\r\n${prompt} $" { 
+	}
+	timeout { 
+	    send_user "Timeout\n"
+	    set pass 0
+	}
+    }
+}
+
+if {$pass} {
+    pass $test_name
+} else {
+    fail $test_name
+}
+
+das-test_exit
diff --git a/unit-tests/das-testsuite/das-test.0/scanner.9.exp b/unit-tests/das-testsuite/das-test.0/scanner.9.exp
new file mode 100644
index 0000000..2b6a16f
--- /dev/null
+++ b/unit-tests/das-testsuite/das-test.0/scanner.9.exp
@@ -0,0 +1,80 @@
+
+# expect/tcl code to test the das scanner
+# jhrg
+#
+# $Log: scanner.9.exp,v $
+# Revision 1.1  1996/07/16 16:54:40  jimg
+# Added.
+#
+#
+
+global comp_output		# contains output from das-test_start
+global verbose			# this and srcdir are set by runtest.exp
+global srcdir
+
+set test_name scanner.9
+
+set prompt "das-test:"
+set timeout 2
+set pass 1
+
+das-test_start s
+
+expect {
+    "${prompt} " { 
+    }
+    timeout { 
+	send_user "Timeout\n"
+	set pass 0
+    }
+}
+
+if {$pass} {
+    set thing "url\r\n"
+    send $thing
+
+    expect {
+	-re ".*URL\r\n${prompt} $" { 
+	}
+	timeout { 
+	    send_user "Timeout\n"
+	    set pass 0
+	}
+    }
+}
+
+if {$pass} {
+    set thing "Url\r\n"
+    send $thing
+
+    expect {
+	-re ".*URL\r\n${prompt} $" { 
+	}
+	timeout { 
+	    send_user "Timeout\n"
+	    set pass 0
+	}
+    }
+}
+
+if {$pass} {
+    set thing "URL\r\n"
+    send $thing
+
+    expect {
+	-re ".*URL\r\n${prompt} $" { 
+	}
+	timeout { 
+	    send_user "Timeout\n"
+	    set pass 0
+	}
+    }
+}
+
+if {$pass} {
+    pass $test_name
+} else {
+    fail $test_name
+}
+
+das-test_exit
diff --git a/unit-tests/das-testsuite/das-test.0/scanner.a.exp b/unit-tests/das-testsuite/das-test.0/scanner.a.exp
new file mode 100644
index 0000000..532fa18
--- /dev/null
+++ b/unit-tests/das-testsuite/das-test.0/scanner.a.exp
@@ -0,0 +1,94 @@
+
+# expect/tcl code to test the das scanner
+# jhrg
+#
+# $Log: scanner.a.exp,v $
+# Revision 1.1  1996/07/16 16:54:41  jimg
+# Added.
+#
+#
+
+global comp_output		# contains output from das-test_start
+global verbose			# this and srcdir are set by runtest.exp
+global srcdir
+
+set test_name scanner.a
+
+set prompt "das-test:"
+set timeout 2
+set pass 1
+
+das-test_start s
+
+expect {
+    "${prompt} " { 
+    }
+    timeout { 
+	send_user "Timeout\n"
+	set pass 0
+    }
+}
+
+if {$pass} {
+    set thing "\{\r\n"
+    send $thing
+
+    expect {
+	-re ".*Left Brace\r\n${prompt} $" { 
+	}
+	timeout { 
+	    send_user "Timeout\n"
+	    set pass 0
+	}
+    }
+}
+
+if {$pass} {
+    set thing "\}\r\n"
+    send $thing
+
+    expect {
+	-re ".*Right Brace\r\n${prompt} $" { 
+	}
+	timeout { 
+	    send_user "Timeout\n"
+	    set pass 0
+	}
+    }
+}
+
+if {$pass} {
+    set thing ";\r\n"
+    send $thing
+
+    expect {
+	-re ".*Semicolon\r\n${prompt} $" { 
+	}
+	timeout { 
+	    send_user "Timeout\n"
+	    set pass 0
+	}
+    }
+}
+
+if {$pass} {
+    set thing ",\r\n"
+    send $thing
+
+    expect {
+	-re ".*Comma\r\n${prompt} $" { 
+	}
+	timeout { 
+	    send_user "Timeout\n"
+	    set pass 0
+	}
+    }
+}
+
+if {$pass} {
+    pass $test_name
+} else {
+    fail $test_name
+}
+
+das-test_exit
diff --git a/unit-tests/das-testsuite/das-test.0/scanner.b.exp b/unit-tests/das-testsuite/das-test.0/scanner.b.exp
new file mode 100644
index 0000000..9460a48
--- /dev/null
+++ b/unit-tests/das-testsuite/das-test.0/scanner.b.exp
@@ -0,0 +1,199 @@
+
+# expect/tcl code to test the das scanner
+# jhrg
+#
+# $Log: scanner.b.exp,v $
+# Revision 1.2  2002/06/03 22:21:16  jimg
+# Merged with release-3-2-9
+#
+# Revision 1.1.54.1  2001/11/01 00:43:52  jimg
+# Fixes to the scanners and parsers so that dataset variable names may
+# start with digits. I've expanded the set of characters that may appear
+# in a variable name and made it so that all except `#' may appear at
+# the start. Some characters are not allowed in variables that appear in
+# a DDS or CE while they are allowed in the DAS. This makes it possible
+# to define containers with names like `COARDS:long_name.' Putting a colon
+# in a variable name makes the CE parser much more complex. Since the set
+# of characters that people want seems pretty limited (compared to the
+# complete ASCII set) I think this is an OK approach. If we have to open
+# up the expr.lex scanner completely, then we can but not without adding
+# lots of action clauses to teh parser. Note that colon is just an example,
+# there's a host of characters that are used in CEs that are not allowed
+# in IDs.
+#
+# Revision 1.1  1996/07/16 16:54:42  jimg
+# Added.
+#
+#
+
+global comp_output		# contains output from das-test_start
+global verbose			# this and srcdir are set by runtest.exp
+global srcdir
+
+set test_name scanner.b
+
+set prompt "das-test:"
+set timeout 2
+set pass 1
+
+das-test_start s
+
+expect {
+    "${prompt} " { 
+    }
+    timeout { 
+	send_user "Timeout\n"
+	set pass 0
+    }
+}
+
+if {$pass} {
+    set thing "0\r\n"
+    send $thing
+
+    expect {
+	-re ".*WORD=${thing}${prompt} $" { 
+	}
+	timeout { 
+	    send_user "Timeout\n"
+	    set pass 0
+	}
+    }
+}
+
+if {$pass} {
+    set thing "01\r\n"
+    send $thing
+
+    expect {
+	-re ".*WORD=${thing}${prompt} $" { 
+	}
+	timeout { 
+	    send_user "Timeout\n"
+	    set pass 0
+	}
+    }
+}
+
+if {$pass} {
+    set thing "0123456789\r\n"
+    send $thing
+
+    expect {
+	-re ".*WORD=${thing}${prompt} $" { 
+	}
+	timeout { 
+	    send_user "Timeout\n"
+	    set pass 0
+	}
+    }
+}
+
+if {$pass} {
+    set thing "0123456789123456789123456789\r\n"
+    send $thing
+
+    expect {
+	-re ".*WORD=${thing}${prompt} $" { 
+	}
+	timeout { 
+	    send_user "Timeout\n"
+	    set pass 0
+	}
+    }
+}
+
+if {$pass} {
+    set thing "+999\r\n"
+    set thing2 "\\+999\r\n" 
+    send $thing
+
+    expect {
+	-re ".*WORD=${thing2}${prompt} $" { 
+	}
+	timeout { 
+	    send_user "Timeout\n"
+	    set pass 0
+	}
+    }
+}
+
+if {$pass} {
+    set thing "-999\r\n"
+    send -- $thing
+
+    expect {
+	-re ".*WORD=${thing}${prompt} $" { 
+	}
+	timeout { 
+	    send_user "Timeout\n"
+	    set pass 0
+	}
+    }
+}
+
+if {$pass} {
+    set thing "+256\r\n"
+    set thing2 "\\+256\r\n"
+    send $thing
+
+    expect {
+	-re ".*WORD=${thing2}${prompt} $" { 
+	}
+	timeout { 
+	    send_user "Timeout\n"
+	    set pass 0
+	}
+    }
+}
+
+if {$pass} {
+    set thing "-256\r\n"
+    send -- $thing
+
+    expect {
+	-re ".*WORD=${thing}${prompt} $" { 
+	}
+	timeout { 
+	    send_user "Timeout\n"
+	    set pass 0
+	}
+    }
+}
+
+if {$pass} {
+    set thing "+255\r\n"
+    set thing2 "\\+255\r\n"
+    send $thing
+
+    expect {
+	-re ".*WORD=${thing2}${prompt} $" { 
+	}
+	timeout { 
+	    send_user "Timeout\n"
+	    set pass 0
+	}
+    }
+}
+
+if {$pass} {
+    set thing "-255\r\n"
+    send -- $thing
+
+    expect {
+	-re ".*WORD=${thing}${prompt} $" { 
+	}
+	timeout { 
+	    send_user "Timeout\n"
+	    set pass 0
+	}
+    }
+}
+
+if {$pass} {
+    pass $test_name
+} else {
+    fail $test_name
+}
+
+das-test_exit
diff --git a/unit-tests/das-testsuite/das-test.0/scanner.c.exp b/unit-tests/das-testsuite/das-test.0/scanner.c.exp
new file mode 100644
index 0000000..ed54a8d
--- /dev/null
+++ b/unit-tests/das-testsuite/das-test.0/scanner.c.exp
@@ -0,0 +1,206 @@
+
+# expect/tcl code to test the das scanner
+# jhrg
+#
+# $Log: scanner.c.exp,v $
+# Revision 1.2  2002/06/03 22:21:16  jimg
+# Merged with release-3-2-9
+#
+# Revision 1.1.54.1  2001/11/01 00:43:52  jimg
+# Fixes to the scanners and parsers so that dataset variable names may
+# start with digits. I've expanded the set of characters that may appear
+# in a variable name and made it so that all except `#' may appear at
+# the start. Some characters are not allowed in variables that appear in
+# a DDS or CE while they are allowed in the DAS. This makes it possible
+# to define containers with names like `COARDS:long_name.' Putting a colon
+# in a variable name makes the CE parser much more complex. Since the set
+# of characters that people want seems pretty limited (compared to the
+# complete ASCII set) I think this is an OK approach. If we have to open
+# up the expr.lex scanner completely, then we can but not without adding
+# lots of action clauses to teh parser. Note that colon is just an example,
+# there's a host of characters that are used in CEs that are not allowed
+# in IDs.
+#
+# Revision 1.1  1996/07/16 16:54:43  jimg
+# Added.
+#
+#
+
+# Some of the float values are not legal but the parser will (should) report
+# those errors.
+
+global comp_output		# contains output from das-test_start
+global verbose			# this and srcdir are set by runtest.exp
+global srcdir
+
+set test_name scanner.c
+
+set prompt "das-test:"
+set timeout 2
+set pass 1
+
+das-test_start s
+
+expect {
+    "${prompt} " { 
+    }
+    timeout { 
+	send_user "Timeout\n"
+	set pass 0
+    }
+}
+
+if {$pass} {
+    set thing "0.0\r\n"
+    send $thing
+
+    expect {
+	-re ".*WORD=${thing}${prompt} $" { 
+	}
+	timeout { 
+	    send_user "Timeout\n"
+	    set pass 0
+	}
+    }
+}
+
+if {$pass} {
+    set thing ".1\r\n"
+    send $thing
+
+    expect {
+	-re ".*WORD=${thing}${prompt} $" { 
+	}
+	timeout { 
+	    send_user "Timeout\n"
+	    set pass 0
+	}
+    }
+}
+
+if {$pass} {
+    set thing "+1.0\r\n"
+    set thing2 "\\+1.0\r\n"
+    send $thing
+
+    expect {
+	-re ".*WORD=${thing2}${prompt} $" { 
+	}
+	timeout { 
+	    send_user "Timeout\n"
+	    set pass 0
+	}
+    }
+}
+
+if {$pass} {
+    set thing "+1.0e9\r\n"
+    set thing2 "\\+1.0e9\r\n"
+    send $thing
+
+    expect {
+	-re ".*WORD=${thing2}${prompt} $" { 
+	}
+	timeout { 
+	    send_user "Timeout\n"
+	    set pass 0
+	}
+    }
+}
+
+if {$pass} {
+    set thing "+1.0e+9\r\n"
+    set thing2 "\\+1.0e\\+9\r\n"
+    send $thing
+
+    expect {
+	-re ".*WORD=${thing2}${prompt} $" { 
+	}
+	timeout { 
+	    send_user "Timeout\n"
+	    set pass 0
+	}
+    }
+}
+
+if {$pass} {
+    set thing "-1.0e+9\r\n"
+    set thing2 "-1.0e\\+9\r\n"
+    send -- $thing
+
+    expect {
+	-re ".*WORD=${thing2}${prompt} $" { 
+	}
+	timeout { 
+	    send_user "Timeout\n"
+	    set pass 0
+	}
+    }
+}
+
+if {$pass} {
+    set thing "-1.0e+99\r\n"
+    set thing2 "-1.0e\\+99\r\n"
+    send -- $thing
+
+    expect {
+	-re ".*WORD=${thing2}${prompt} $" { 
+	}
+	timeout { 
+	    send_user "Timeout\n"
+	    set pass 0
+	}
+    }
+}
+
+if {$pass} {
+    set thing "-256.256e-99\r\n"
+    send -- $thing
+
+    expect {
+	-re ".*WORD=${thing}${prompt} $" { 
+	}
+	timeout { 
+	    send_user "Timeout\n"
+	    set pass 0
+	}
+    }
+}
+
+if {$pass} {
+    set thing "+255.999e-9999999\r\n"
+    set thing2 "\\+255.999e-9999999\r\n"
+    send -- $thing
+
+    expect {
+	-re ".*WORD=${thing2}${prompt} $" { 
+	}
+	timeout { 
+	    send_user "Timeout\n"
+	    set pass 0
+	}
+    }
+}
+
+if {$pass} {
+    set thing "-255.999e+9999999\r\n"
+    set thing2 "-255.999e\\+9999999\r\n"
+    send -- $thing
+
+    expect {
+	-re ".*WORD=${thing2}${prompt} $" { 
+	}
+	timeout { 
+	    send_user "Timeout\n"
+	    set pass 0
+	}
+    }
+}
+
+if {$pass} {
+    pass $test_name
+} else {
+    fail $test_name
+}
+
+das-test_exit
diff --git a/unit-tests/das-testsuite/das-test.0/test.1.exp b/unit-tests/das-testsuite/das-test.0/test.1.exp
new file mode 100644
index 0000000..3127baa
--- /dev/null
+++ b/unit-tests/das-testsuite/das-test.0/test.1.exp
@@ -0,0 +1,87 @@
+# expect/tcl code to test the das parser and scanner
+# jhrg
+#
+# $Log: test.1.exp,v $
+# Revision 1.9  2000/06/16 18:15:01  jimg
+# Merged with 3.1.7
+#
+# Revision 1.8.38.1  2000/06/15 02:24:56  jimg
+# Fixed the tests: problems with PATH, etc. broke the tests on my new machine
+#
+# Revision 1.8  1997/05/13 23:29:10  jimg
+# *** empty log message ***
+#
+# Revision 1.7  1996/05/14 15:40:40  jimg
+# These changes have already been checked in once before. However, I
+# corrupted the source repository and restored it from a 5/9/96 backup
+# tape. The previous version's log entry should cover the changes.
+#
+# Revision 1.6  1995/02/10  03:31:11  jimg
+# Modified test cases for type checking.
+#
+# Revision 1.5  1994/12/09  21:45:45  jimg
+# Modified for new unix.exp.
+#
+# Revision 1.4  1994/10/05  16:51:45  jimg
+# Added TYPE to each of the DAS test files.
+# The `expect' files correcly check for that in the output.
+#
+# Revision 1.3  1994/09/27  23:14:13  jimg
+# Changed expected outcomes to match new das.print() mfunc.
+#
+# Revision 1.2  1994/09/09  16:15:20  jimg
+# Fixed namign of the test (was given as $srcdir/$test_name, should have been
+# $srcdir$test_name).
+#
+# Revision 1.1  1994/08/29  19:57:19  jimg
+# Test procedures for the DAS parser, scanner and C++ class.
+#
+
+global comp_output		# contains output from das-test_start
+global verbose			# this and srcdir are set by runtest.exp
+global srcdir
+
+# The variable `test_name' is the name of the das input file for this test.
+
+set test_name test.1
+
+# The variable `test_out' is a string that contains the text that should be
+# stored in comp_output by das-test_start. The two strings should match
+# exactly.
+
+set test_out "Attributes {
+    var1 {
+        String name bob;
+        String type human;
+        Int32 age 19;
+    }
+    var2 {
+        String name joe;
+        String type dog;
+        Int32 age 8;
+    }
+    var3 {
+        Int32 size 8;
+        String color red;
+        String type art;
+    }
+    var4 {
+    }
+    var5 {
+        String height 5.0in.;
+        String units inches;
+        Float64 max 5.0;
+        String weight 100lbs;
+        String color red;
+    }
+}"
+
+das-test_start p $srcdir/$test_name
+
+if ![string compare $test_out $comp_output] { # check comp_output
+    pass "$test_name"
+} else {
+    fail "$test_name"
+}
+
+
diff --git a/unit-tests/das-testsuite/das-test.0/test.11.exp b/unit-tests/das-testsuite/das-test.0/test.11.exp
new file mode 100644
index 0000000..2985717
--- /dev/null
+++ b/unit-tests/das-testsuite/das-test.0/test.11.exp
@@ -0,0 +1,59 @@
+# expect/tcl code to test the das parser and scanner
+# jhrg
+#
+# $Log: test.11.exp,v $
+# Revision 1.7  2000/06/16 18:15:01  jimg
+# Merged with 3.1.7
+#
+# Revision 1.6.22.1  2000/06/15 02:24:56  jimg
+# Fixed the tests: problems with PATH, etc. broke the tests on my new machine
+#
+# Revision 1.6  1998/08/13 22:10:13  jimg
+# Bytes now are unsigned (0..255). Fixed this test to check that.
+#
+# Revision 1.5  1997/08/25 18:39:48  jimg
+# Removed errant double semicolon at the end of the Url attribute - replaced
+# it with a single semicolon.
+#
+# Revision 1.4  1997/05/13 23:29:11  jimg
+# *** empty log message ***
+#
+# Revision 1.3  1996/08/12 22:22:12  jimg
+# Changed for the new error message text from the parser.
+#
+# Revision 1.2  1996/04/05 22:00:12  jimg
+# Misc Changes for release 2.0.1 of the core software - for developers.
+#
+# Revision 1.1  1995/02/16  15:34:45  jimg
+# Added these tests. See comments in files in parent directory.
+#
+
+global comp_output		# contains output from das-test_start
+global verbose			# this and srcdir are set by runtest.exp
+global srcdir
+
+# The variable `test_name' is the name of the das input file for this test.
+
+set test_name test.11
+
+# The variable `test_out' is a string that contains the text that should be
+# stored in comp_output by das-test_start. The two strings should match
+# exactly.
+
+set test_out "Attributes {
+    test {
+        String names this, is, a, vector, of, strings;
+        Byte b 1, 0, 127, 255;
+        Int32 int_vec 1, 2, 2147483647;
+        Float64 float_vec 1.0, -1.0, +1.0, 0.2, -0.2, +0.2, .3, -.3, +.3, -3.1415, -3.1415e-99, -3.1415e+99, +3.1415e-99, -3., +2., 4.;
+        Url where http://bozo.place.com/home.html;
+    }
+}"
+
+das-test_start p $srcdir/$test_name
+
+if ![string compare $test_out $comp_output] { # check comp_output
+    pass "$test_name"
+} else {
+    fail "$test_name"
+}
diff --git a/unit-tests/das-testsuite/das-test.0/test.12.exp b/unit-tests/das-testsuite/das-test.0/test.12.exp
new file mode 100644
index 0000000..b5c78c6
--- /dev/null
+++ b/unit-tests/das-testsuite/das-test.0/test.12.exp
@@ -0,0 +1,85 @@
+# expect/tcl code to test the das parser and scanner
+# jhrg
+#
+# $Log: test.12.exp,v $
+# Revision 1.10  2002/06/03 22:21:16  jimg
+# Merged with release-3-2-9
+#
+# Revision 1.9.4.1  2001/11/01 00:43:52  jimg
+# Fixes to the scanners and parsers so that dataset variable names may
+# start with digits. I've expanded the set of characters that may appear
+# in a variable name and made it so that all except `#' may appear at
+# the start. Some characters are not allowed in variables that appear in
+# a DDS or CE while they are allowed in the DAS. This makes it possible
+# to define containers with names like `COARDS:long_name.' Putting a colon
+# in a variable name makes the CE parser much more complex. Since the set
+# of characters that people want seems pretty limited (compared to the
+# complete ASCII set) I think this is an OK approach. If we have to open
+# up the expr.lex scanner completely, then we can but not without adding
+# lots of action clauses to teh parser. Note that colon is just an example,
+# there's a host of characters that are used in CEs that are not allowed
+# in IDs.
+#
+# Revision 1.9  2000/09/22 02:52:59  jimg
+# Fixes to the tests to recognize some of the new error messages. Also,
+# the test drivers were modified to catch the exceptions now thrown by
+# some of the parsers.
+#
+# Revision 1.8  2000/06/16 18:15:01  jimg
+# Merged with 3.1.7
+#
+# Revision 1.7.10.1  2000/06/15 02:24:56  jimg
+# Fixed the tests: problems with PATH, etc. broke the tests on my new machine
+#
+# Revision 1.7  1999/03/24 23:42:22  jimg
+# Added or updated for the new simple types (Int16, UInt16 and Float32)
+#
+# Revision 1.6  1997/05/13 23:29:12  jimg
+# *** empty log message ***
+#
+# Revision 1.5  1997/03/27 18:19:53  jimg
+# Update for version 2.13
+#
+# Revision 1.4  1996/11/13 19:23:40  jimg
+# *** empty log message ***
+#
+# Revision 1.3  1996/08/12 22:22:14  jimg
+# Changed for the new error message text from the parser.
+#
+# Revision 1.2  1996/05/14 15:40:42  jimg
+# These changes have already been checked in once before. However, I
+# corrupted the source repository and restored it from a 5/9/96 backup
+# tape. The previous version's log entry should cover the changes.
+#
+# Revision 1.1  1995/02/16  15:34:47  jimg
+# Added these tests. See comments in files in parent directory.
+#
+
+global comp_output		# contains output from das-test_start
+global verbose			# this and srcdir are set by runtest.exp
+global srcdir
+
+# The variable `test_name' is the name of the das input file for this test.
+
+set test_name test.12
+
+# The variable `test_out' is a string that contains the text that should be
+# stored in comp_output by das-test_start. The two strings should match
+# exactly.
+
+set test_out "Attributes {
+    var1 {
+        var1_dods_errors {
+            Float64 f1 3.0.0;
+            String f1_explanation \"`3.0.0' is not a Float64 value.\";
+        }
+    }
+}"
+
+das-test_start p $srcdir/$test_name
+
+if ![string compare $test_out $comp_output] { # check comp_output
+    pass "$test_name"
+} else {
+    fail "$test_name"
+}
diff --git a/unit-tests/das-testsuite/das-test.0/test.13.exp b/unit-tests/das-testsuite/das-test.0/test.13.exp
new file mode 100644
index 0000000..25ce364
--- /dev/null
+++ b/unit-tests/das-testsuite/das-test.0/test.13.exp
@@ -0,0 +1,85 @@
+# expect/tcl code to test the das parser and scanner
+# jhrg
+#
+# $Log: test.13.exp,v $
+# Revision 1.10  2002/06/03 22:21:16  jimg
+# Merged with release-3-2-9
+#
+# Revision 1.9.4.1  2001/11/01 00:43:52  jimg
+# Fixes to the scanners and parsers so that dataset variable names may
+# start with digits. I've expanded the set of characters that may appear
+# in a variable name and made it so that all except `#' may appear at
+# the start. Some characters are not allowed in variables that appear in
+# a DDS or CE while they are allowed in the DAS. This makes it possible
+# to define containers with names like `COARDS:long_name.' Putting a colon
+# in a variable name makes the CE parser much more complex. Since the set
+# of characters that people want seems pretty limited (compared to the
+# complete ASCII set) I think this is an OK approach. If we have to open
+# up the expr.lex scanner completely, then we can but not without adding
+# lots of action clauses to teh parser. Note that colon is just an example,
+# there's a host of characters that are used in CEs that are not allowed
+# in IDs.
+#
+# Revision 1.9  2000/09/22 02:52:59  jimg
+# Fixes to the tests to recognize some of the new error messages. Also,
+# the test drivers were modified to catch the exceptions now thrown by
+# some of the parsers.
+#
+# Revision 1.8  2000/06/16 18:15:01  jimg
+# Merged with 3.1.7
+#
+# Revision 1.7.10.1  2000/06/15 02:24:56  jimg
+# Fixed the tests: problems with PATH, etc. broke the tests on my new machine
+#
+# Revision 1.7  1999/03/24 23:42:22  jimg
+# Added or updated for the new simple types (Int16, UInt16 and Float32)
+#
+# Revision 1.6  1997/05/13 23:29:13  jimg
+# *** empty log message ***
+#
+# Revision 1.5  1997/03/27 18:19:54  jimg
+# Update for version 2.13
+#
+# Revision 1.4  1996/11/13 19:23:41  jimg
+# *** empty log message ***
+#
+# Revision 1.3  1996/08/12 22:22:15  jimg
+# Changed for the new error message text from the parser.
+#
+# Revision 1.2  1996/05/14 15:40:44  jimg
+# These changes have already been checked in once before. However, I
+# corrupted the source repository and restored it from a 5/9/96 backup
+# tape. The previous version's log entry should cover the changes.
+#
+# Revision 1.1  1995/02/16  15:34:48  jimg
+# Added these tests. See comments in files in parent directory.
+#
+
+global comp_output		# contains output from das-test_start
+global verbose			# this and srcdir are set by runtest.exp
+global srcdir
+
+# The variable `test_name' is the name of the das input file for this test.
+
+set test_name test.13
+
+# The variable `test_out' is a string that contains the text that should be
+# stored in comp_output by das-test_start. The two strings should match
+# exactly.
+
+set test_out "Attributes {
+    var1 {
+        var1_dods_errors {
+            Float64 f1 -3..0;
+            String f1_explanation \"`-3..0' is not a Float64 value.\";
+        }
+    }
+}"
+
+das-test_start p $srcdir/$test_name
+
+if ![string compare $test_out $comp_output] { # check comp_output
+    pass "$test_name"
+} else {
+    fail "$test_name"
+}
diff --git a/unit-tests/das-testsuite/das-test.0/test.14.exp b/unit-tests/das-testsuite/das-test.0/test.14.exp
new file mode 100644
index 0000000..fb6dd09
--- /dev/null
+++ b/unit-tests/das-testsuite/das-test.0/test.14.exp
@@ -0,0 +1,47 @@
+# expect/tcl code to test the das parser and scanner
+# jhrg
+#
+# $Log: test.14.exp,v $
+# Revision 1.4  2000/06/16 18:15:01  jimg
+# Merged with 3.1.7
+#
+# Revision 1.3.38.1  2000/06/15 02:24:56  jimg
+# Fixed the tests: problems with PATH, etc. broke the tests on my new machine
+#
+# Revision 1.3  1997/05/13 23:29:15  jimg
+# *** empty log message ***
+#
+# Revision 1.2  1996/05/14 15:40:45  jimg
+# These changes have already been checked in once before. However, I
+# corrupted the source repository and restored it from a 5/9/96 backup
+# tape. The previous version's log entry should cover the changes.
+#
+# Revision 1.1  1995/02/16  15:34:49  jimg
+# Added these tests. See comments in files in parent directory.
+#
+
+global comp_output		# contains output from das-test_start
+global verbose			# this and srcdir are set by runtest.exp
+global srcdir
+
+# The variable `test_name' is the name of the das input file for this test.
+
+set test_name test.14
+
+# The variable `test_out' is a string that contains the text that should be
+# stored in comp_output by das-test_start. The two strings should match
+# exactly.
+
+set test_out "Attributes {
+    var1 {
+        Float64 f1 3;
+    }
+}"
+
+das-test_start p $srcdir/$test_name
+
+if ![string compare $test_out $comp_output] { # check comp_output
+    pass "$test_name"
+} else {
+    fail "$test_name"
+}
diff --git a/unit-tests/das-testsuite/das-test.0/test.15.exp b/unit-tests/das-testsuite/das-test.0/test.15.exp
new file mode 100644
index 0000000..c78ced3
--- /dev/null
+++ b/unit-tests/das-testsuite/das-test.0/test.15.exp
@@ -0,0 +1,85 @@
+# expect/tcl code to test the das parser and scanner
+# jhrg
+#
+# $Log: test.15.exp,v $
+# Revision 1.10  2002/06/03 22:21:16  jimg
+# Merged with release-3-2-9
+#
+# Revision 1.9.4.1  2001/11/01 00:43:52  jimg
+# Fixes to the scanners and parsers so that dataset variable names may
+# start with digits. I've expanded the set of characters that may appear
+# in a variable name and made it so that all except `#' may appear at
+# the start. Some characters are not allowed in variables that appear in
+# a DDS or CE while they are allowed in the DAS. This makes it possible
+# to define containers with names like `COARDS:long_name.' Putting a colon
+# in a variable name makes the CE parser much more complex. Since the set
+# of characters that people want seems pretty limited (compared to the
+# complete ASCII set) I think this is an OK approach. If we have to open
+# up the expr.lex scanner completely, then we can but not without adding
+# lots of action clauses to teh parser. Note that colon is just an example,
+# there's a host of characters that are used in CEs that are not allowed
+# in IDs.
+#
+# Revision 1.9  2000/09/22 02:52:59  jimg
+# Fixes to the tests to recognize some of the new error messages. Also,
+# the test drivers were modified to catch the exceptions now thrown by
+# some of the parsers.
+#
+# Revision 1.8  2000/06/16 18:15:01  jimg
+# Merged with 3.1.7
+#
+# Revision 1.7.10.1  2000/06/15 02:24:57  jimg
+# Fixed the tests: problems with PATH, etc. broke the tests on my new machine
+#
+# Revision 1.7  1999/03/24 23:42:22  jimg
+# Added or updated for the new simple types (Int16, UInt16 and Float32)
+#
+# Revision 1.6  1997/05/13 23:29:16  jimg
+# *** empty log message ***
+#
+# Revision 1.5  1997/03/27 18:19:55  jimg
+# Update for version 2.13
+#
+# Revision 1.4  1996/11/13 19:23:42  jimg
+# *** empty log message ***
+#
+# Revision 1.3  1996/08/12 22:22:16  jimg
+# Changed for the new error message text from the parser.
+#
+# Revision 1.2  1996/05/14 15:40:46  jimg
+# These changes have already been checked in once before. However, I
+# corrupted the source repository and restored it from a 5/9/96 backup
+# tape. The previous version's log entry should cover the changes.
+#
+# Revision 1.1  1995/02/16  15:34:50  jimg
+# Added these tests. See comments in files in parent directory.
+#
+
+global comp_output		# contains output from das-test_start
+global verbose			# this and srcdir are set by runtest.exp
+global srcdir
+
+# The variable `test_name' is the name of the das input file for this test.
+
+set test_name test.15
+
+# The variable `test_out' is a string that contains the text that should be
+# stored in comp_output by das-test_start. The two strings should match
+# exactly.
+
+set test_out "Attributes {
+    var1 {
+        var1_dods_errors {
+            Int32 i1 3.0;
+            String i1_explanation \"`3.0' is not an Int32 value.\";
+        }
+    }
+}"
+
+das-test_start p $srcdir/$test_name
+
+if ![string compare $test_out $comp_output] { # check comp_output
+    pass "$test_name"
+} else {
+    fail "$test_name"
+}
diff --git a/unit-tests/das-testsuite/das-test.0/test.16.exp b/unit-tests/das-testsuite/das-test.0/test.16.exp
new file mode 100644
index 0000000..605a1bb
--- /dev/null
+++ b/unit-tests/das-testsuite/das-test.0/test.16.exp
@@ -0,0 +1,71 @@
+# expect/tcl code to test the das parser and scanner
+# jhrg
+#
+# $Log: test.16.exp,v $
+# Revision 1.9  2003/12/11 01:08:38  jimg
+# More fixes after resolving conflicts. This code still fails some tests.
+#
+# Revision 1.8.6.1  2003/10/03 16:26:30  jimg
+# Fixed tests; I changed the text of das-test just a little and so these
+# had to be updated. I wanted to be sure that the error message was from
+# an exception and not just a write to stderr.
+#
+# Revision 1.8  2001/01/26 19:48:10  jimg
+# Merged with release-3-2-3.
+#
+# Revision 1.7.4.1  2000/11/30 05:20:19  jimg
+# Added
+#
+# Revision 1.7  2000/09/22 02:52:59  jimg
+# Fixes to the tests to recognize some of the new error messages. Also,
+# the test drivers were modified to catch the exceptions now thrown by
+# some of the parsers.
+#
+# Revision 1.6  2000/06/16 18:15:01  jimg
+# Merged with 3.1.7
+#
+# Revision 1.5.38.1  2000/06/15 02:24:57  jimg
+# Fixed the tests: problems with PATH, etc. broke the tests on my new machine
+#
+# Revision 1.5  1997/05/13 23:29:17  jimg
+# *** empty log message ***
+#
+# Revision 1.4  1997/03/27 18:19:57  jimg
+# Update for version 2.13
+#
+# Revision 1.3  1996/08/12 22:22:17  jimg
+# Changed for the new error message text from the parser.
+#
+# Revision 1.2  1996/05/14 15:40:47  jimg
+# These changes have already been checked in once before. However, I
+# corrupted the source repository and restored it from a 5/9/96 backup
+# tape. The previous version's log entry should cover the changes.
+#
+# Revision 1.1  1995/02/16  15:34:51  jimg
+# Added these tests. See comments in files in parent directory.
+#
+
+global comp_output		# contains output from das-test_start
+global verbose			# this and srcdir are set by runtest.exp
+global srcdir
+
+# The variable `test_name' is the name of the das input file for this test.
+
+set test_name test.16
+
+# The variable `test_out' is a string that contains the text that should be
+# stored in comp_output by das-test_start. The two strings should match
+# exactly.
+
+set test_out "Caught Error object:
+Error parsing the text on line 7
+An attribute called `i' already exists but is of a different type
+"
+
+das-test_start p $srcdir/$test_name
+
+if {$test_out == $comp_output} { # check comp_output
+    pass "$test_name"
+} else {
+    fail "$test_name"
+}
diff --git a/unit-tests/das-testsuite/das-test.0/test.17.exp b/unit-tests/das-testsuite/das-test.0/test.17.exp
new file mode 100644
index 0000000..da49dc5
--- /dev/null
+++ b/unit-tests/das-testsuite/das-test.0/test.17.exp
@@ -0,0 +1,90 @@
+# expect/tcl code to test the das parser and scanner
+# jhrg
+#
+# $Log: test.17.exp,v $
+# Revision 1.10  2002/06/03 22:21:16  jimg
+# Merged with release-3-2-9
+#
+# Revision 1.9.4.1  2001/11/01 00:43:52  jimg
+# Fixes to the scanners and parsers so that dataset variable names may
+# start with digits. I've expanded the set of characters that may appear
+# in a variable name and made it so that all except `#' may appear at
+# the start. Some characters are not allowed in variables that appear in
+# a DDS or CE while they are allowed in the DAS. This makes it possible
+# to define containers with names like `COARDS:long_name.' Putting a colon
+# in a variable name makes the CE parser much more complex. Since the set
+# of characters that people want seems pretty limited (compared to the
+# complete ASCII set) I think this is an OK approach. If we have to open
+# up the expr.lex scanner completely, then we can but not without adding
+# lots of action clauses to teh parser. Note that colon is just an example,
+# there's a host of characters that are used in CEs that are not allowed
+# in IDs.
+#
+# Revision 1.9  2000/09/22 02:52:59  jimg
+# Fixes to the tests to recognize some of the new error messages. Also,
+# the test drivers were modified to catch the exceptions now thrown by
+# some of the parsers.
+#
+# Revision 1.8  2000/06/16 18:15:01  jimg
+# Merged with 3.1.7
+#
+# Revision 1.7.10.1  2000/06/15 02:24:57  jimg
+# Fixed the tests: problems with PATH, etc. broke the tests on my new machine
+#
+# Revision 1.7  1999/03/24 23:42:22  jimg
+# Added or updated for the new simple types (Int16, UInt16 and Float32)
+#
+# Revision 1.6  1997/05/13 23:29:18  jimg
+# *** empty log message ***
+#
+# Revision 1.5  1997/03/27 18:19:58  jimg
+# Update for version 2.13
+#
+# Revision 1.4  1996/11/13 19:23:44  jimg
+# *** empty log message ***
+#
+# Revision 1.3  1996/08/12 22:22:18  jimg
+# Changed for the new error message text from the parser.
+#
+# Revision 1.2  1996/04/05 22:00:13  jimg
+# Misc Changes for release 2.0.1 of the core software - for developers.
+#
+# Revision 1.1  1995/02/16  15:34:52  jimg
+# Added these tests. See comments in files in parent directory.
+#
+
+global comp_output		# contains output from das-test_start
+global verbose			# this and srcdir are set by runtest.exp
+global srcdir
+
+# The variable `test_name' is the name of the das input file for this test.
+
+set test_name test.17
+
+# The variable `test_out' is a string that contains the text that should be
+# stored in comp_output by das-test_start. The two strings should match
+# exactly.
+
+set test_out "Attributes {
+    test {
+        test_dods_errors {
+            Byte b \"this is not a byte\";
+            String b_explanation \"`\"this is not a byte\"' is not a Byte value.\";
+            Byte c -256;
+            String c_explanation \"`-256' is not a Byte value.\";
+            Byte e 2550;
+            String e_explanation \"`2550' is not a Byte value.\";
+            Byte f 2.55;
+            String f_explanation \"`2.55' is not a Byte value.\";
+        }
+        Byte d 255;
+    }
+}"
+
+das-test_start p $srcdir/$test_name
+
+if ![string compare $test_out $comp_output] { # check comp_output
+    pass "$test_name"
+} else {
+    fail "$test_name"
+}
diff --git a/unit-tests/das-testsuite/das-test.0/test.18.exp b/unit-tests/das-testsuite/das-test.0/test.18.exp
new file mode 100644
index 0000000..d291ce7
--- /dev/null
+++ b/unit-tests/das-testsuite/das-test.0/test.18.exp
@@ -0,0 +1,58 @@
+# expect/tcl code to test the das parser and scanner
+# jhrg
+#
+# $Log: test.18.exp,v $
+# Revision 1.2  2000/06/16 18:15:01  jimg
+# Merged with 3.1.7
+#
+# Revision 1.1.6.1  2000/06/15 02:24:57  jimg
+# Fixed the tests: problems with PATH, etc. broke the tests on my new machine
+#
+# Revision 1.1  1999/04/29 00:05:38  jimg
+# *** empty log message ***
+#
+# Revision 1.6  1997/05/13 23:29:18  jimg
+# *** empty log message ***
+#
+# Revision 1.5  1997/03/27 18:19:58  jimg
+# Update for version 2.13
+#
+# Revision 1.4  1996/11/13 19:23:44  jimg
+# *** empty log message ***
+#
+# Revision 1.3  1996/08/12 22:22:18  jimg
+# Changed for the new error message text from the parser.
+#
+# Revision 1.2  1996/04/05 22:00:13  jimg
+# Misc Changes for release 2.0.1 of the core software - for developers.
+#
+# Revision 1.1  1995/02/16  15:34:52  jimg
+# Added these tests. See comments in files in parent directory.
+#
+
+global comp_output		# contains output from das-test_start
+global verbose			# this and srcdir are set by runtest.exp
+global srcdir
+
+# The variable `test_name' is the name of the das input file for this test.
+
+set test_name test.18
+
+# The variable `test_out' is a string that contains the text that should be
+# stored in comp_output by das-test_start. The two strings should match
+# exactly.
+
+set test_out "Attributes {
+    test {
+        Float32 f 2.55;
+        Int16 x 6535;
+    }
+}"
+
+das-test_start p $srcdir/$test_name
+
+if ![string compare $test_out $comp_output] { # check comp_output
+    pass "$test_name"
+} else {
+    fail "$test_name"
+}
diff --git a/unit-tests/das-testsuite/das-test.0/test.19.exp b/unit-tests/das-testsuite/das-test.0/test.19.exp
new file mode 100644
index 0000000..0b0f082
--- /dev/null
+++ b/unit-tests/das-testsuite/das-test.0/test.19.exp
@@ -0,0 +1,83 @@
+# expect/tcl code to test the das parser and scanner
+# jhrg
+#
+# $Log: test.19.exp,v $
+# Revision 1.5  2001/06/15 23:49:05  jimg
+# Merged with release-3-2-4.
+#
+# Revision 1.3.4.3  2001/06/06 06:40:57  jimg
+# *** empty log message ***
+#
+# Revision 1.3.4.2  2001/06/06 04:12:30  jimg
+# Updated for the new DAS error reporting scheme (Some errors are reported
+# in the DAS itself).
+#
+# Revision 1.4  2001/01/26 19:48:10  jimg
+# Merged with release-3-2-3.
+#
+# Revision 1.3.4.1  2000/11/30 05:20:19  jimg
+# Added
+#
+# Revision 1.3  2000/06/16 18:15:01  jimg
+# Merged with 3.1.7
+#
+# Revision 1.1.6.2  2000/06/15 02:24:57  jimg
+# Fixed the tests: problems with PATH, etc. broke the tests on my new machine
+#
+# Revision 1.2  2000/03/31 21:07:04  jimg
+# Merged with release-3-1-5
+#
+# Revision 1.1.6.1  2000/03/31 20:03:26  jimg
+# Updated tests for new DAS requirements
+#
+# Revision 1.1  1999/04/29 00:05:39  jimg
+# *** empty log message ***
+#
+# Revision 1.6  1997/05/13 23:29:18  jimg
+# *** empty log message ***
+#
+# Revision 1.5  1997/03/27 18:19:58  jimg
+# Update for version 2.13
+#
+# Revision 1.4  1996/11/13 19:23:44  jimg
+# *** empty log message ***
+#
+# Revision 1.3  1996/08/12 22:22:18  jimg
+# Changed for the new error message text from the parser.
+#
+# Revision 1.2  1996/04/05 22:00:13  jimg
+# Misc Changes for release 2.0.1 of the core software - for developers.
+#
+# Revision 1.1  1995/02/16  15:34:52  jimg
+# Added these tests. See comments in files in parent directory.
+#
+
+global comp_output		# contains output from das-test_start
+global verbose			# this and srcdir are set by runtest.exp
+global srcdir
+
+# The variable `test_name' is the name of the das input file for this test.
+
+set test_name test.19
+
+# The variable `test_out' is a string that contains the text that should be
+# stored in comp_output by das-test_start. The two strings should match
+# exactly.
+
+set test_out "Attributes {
+    test {
+        Float64 f 2.55E-300;
+        test_dods_errors {
+            Float32 g 2.55E-300;
+            String g_explanation \"`2.55E-300' is not a Float32 value.\";
+        }
+    }
+}"
+
+das-test_start p $srcdir/$test_name
+
+if ![string compare $test_out $comp_output] { # check comp_output
+    pass "$test_name"
+} else {
+    fail "$test_name"
+}
diff --git a/unit-tests/das-testsuite/das-test.0/test.2.exp b/unit-tests/das-testsuite/das-test.0/test.2.exp
new file mode 100644
index 0000000..c375443
--- /dev/null
+++ b/unit-tests/das-testsuite/das-test.0/test.2.exp
@@ -0,0 +1,64 @@
+# expect/tcl code to test the das parser and scanner
+# jhrg
+#
+# $Log: test.2.exp,v $
+# Revision 1.8  2000/06/16 18:15:01  jimg
+# Merged with 3.1.7
+#
+# Revision 1.7.38.1  2000/06/15 02:24:57  jimg
+# Fixed the tests: problems with PATH, etc. broke the tests on my new machine
+#
+# Revision 1.7  1997/05/13 23:29:20  jimg
+# *** empty log message ***
+#
+# Revision 1.6  1996/05/14 15:40:48  jimg
+# These changes have already been checked in once before. However, I
+# corrupted the source repository and restored it from a 5/9/96 backup
+# tape. The previous version's log entry should cover the changes.
+#
+# Revision 1.5  1994/12/09  21:45:46  jimg
+# Modified for new unix.exp.
+#
+# Revision 1.4  1994/10/05  16:51:47  jimg
+# Added TYPE to each of the DAS test files.
+# The `expect' files correcly check for that in the output.
+#
+# Revision 1.3  1994/09/27  23:14:14  jimg
+# Changed expected outcomes to match new das.print() mfunc.
+#
+# Revision 1.2  1994/09/09  16:15:21  jimg
+# Fixed namign of the test (was given as $srcdir//$test_name, should have been
+# $srcdir$test_name).
+#
+# Revision 1.1  1994/08/29  19:57:20  jimg
+# Test procedures for the DAS parser, scanner and C++ class.
+#
+
+global comp_output		# contains output from das-test_start
+global verbose			# this and srcdir are set by runtest.exp
+global srcdir
+
+# The variable `test_name' is the name of the das input file for this test.
+
+set test_name test.2
+
+# The variable `test_out' is a string that contains the text that should be
+# stored in comp_output by das-test_start. The two strings should match
+# exactly.
+
+set test_out "Attributes {
+    a {
+        String b c;
+        String d 4;
+    }
+}"
+
+das-test_start p $srcdir/$test_name
+
+if ![string compare $test_out $comp_output] { # check comp_output
+    pass "$test_name"
+} else {
+    fail "$test_name"
+}
+
+
diff --git a/unit-tests/das-testsuite/das-test.0/test.20.exp b/unit-tests/das-testsuite/das-test.0/test.20.exp
new file mode 100644
index 0000000..695e160
--- /dev/null
+++ b/unit-tests/das-testsuite/das-test.0/test.20.exp
@@ -0,0 +1,82 @@
+# expect/tcl code to test the das parser and scanner
+# jhrg
+#
+# $Log: test.20.exp,v $
+# Revision 1.8  2001/06/15 23:49:05  jimg
+# Merged with release-3-2-4.
+#
+# Revision 1.7.4.2  2001/06/06 06:40:57  jimg
+# *** empty log message ***
+#
+# Revision 1.7.4.1  2001/06/06 04:12:30  jimg
+# Updated for the new DAS error reporting scheme (Some errors are reported
+# in the DAS itself).
+#
+# Revision 1.7  2000/09/22 02:52:59  jimg
+# Fixes to the tests to recognize some of the new error messages. Also,
+# the test drivers were modified to catch the exceptions now thrown by
+# some of the parsers.
+#
+# Revision 1.6  2000/06/16 18:15:01  jimg
+# Merged with 3.1.7
+#
+# Revision 1.4.6.2  2000/06/15 02:24:57  jimg
+# Fixed the tests: problems with PATH, etc. broke the tests on my new machine
+#
+# Revision 1.5  2000/04/07 00:20:36  jimg
+# Fixed expresion tests.
+#
+# Revision 1.4.6.1  1999/10/19 16:48:40  jimg
+# Version 3.1.2
+#
+# Revision 1.4  1999/04/29 00:05:39  jimg
+# *** empty log message ***
+#
+# Revision 1.6  1997/05/13 23:29:18  jimg
+# *** empty log message ***
+#
+# Revision 1.5  1997/03/27 18:19:58  jimg
+# Update for version 2.13
+#
+# Revision 1.4  1996/11/13 19:23:44  jimg
+# *** empty log message ***
+#
+# Revision 1.3  1996/08/12 22:22:18  jimg
+# Changed for the new error message text from the parser.
+#
+# Revision 1.2  1996/04/05 22:00:13  jimg
+# Misc Changes for release 2.0.1 of the core software - for developers.
+#
+# Revision 1.1  1995/02/16  15:34:52  jimg
+# Added these tests. See comments in files in parent directory.
+#
+
+global comp_output		# contains output from das-test_start
+global verbose			# this and srcdir are set by runtest.exp
+global srcdir
+
+# The variable `test_name' is the name of the das input file for this test.
+
+set test_name test.20
+
+# The variable `test_out' is a string that contains the text that should be
+# stored in comp_output by das-test_start. The two strings should match
+# exactly.
+
+set test_out "Attributes {
+    test {
+        Int32 x 70000;
+        test_dods_errors {
+            Int16 y 80000;
+            String y_explanation \"`80000' is not an Int16 value.\";
+        }
+    }
+}"
+
+das-test_start p $srcdir/$test_name
+
+if ![string compare $test_out $comp_output] { # check comp_output
+    pass "$test_name"
+} else {
+    fail "$test_name"
+}
diff --git a/unit-tests/das-testsuite/das-test.0/test.21.exp b/unit-tests/das-testsuite/das-test.0/test.21.exp
new file mode 100644
index 0000000..2bb252f
--- /dev/null
+++ b/unit-tests/das-testsuite/das-test.0/test.21.exp
@@ -0,0 +1,79 @@
+# expect/tcl code to test the das parser and scanner
+# jhrg
+#
+# $Log: test.21.exp,v $
+# Revision 1.5  2002/06/03 22:21:16  jimg
+# Merged with release-3-2-9
+#
+# Revision 1.3.4.2  2002/02/20 19:11:34  jimg
+# Fixed some tests
+#
+# Revision 1.4  2001/01/26 19:48:10  jimg
+# Merged with release-3-2-3.
+#
+# Revision 1.3.4.1  2000/11/30 05:20:19  jimg
+# Added
+#
+# Revision 1.3  2000/06/16 18:15:01  jimg
+# Merged with 3.1.7
+#
+# Revision 1.1.6.2  2000/06/15 02:24:57  jimg
+# Fixed the tests: problems with PATH, etc. broke the tests on my new machine
+#
+# Revision 1.2  2000/03/31 21:07:04  jimg
+# Merged with release-3-1-5
+#
+# Revision 1.1.6.1  2000/03/31 20:03:26  jimg
+# Updated tests for new DAS requirements
+#
+# Revision 1.1  1999/04/29 00:05:39  jimg
+# *** empty log message ***
+#
+# Revision 1.6  1997/05/13 23:29:18  jimg
+# *** empty log message ***
+#
+# Revision 1.5  1997/03/27 18:19:58  jimg
+# Update for version 2.13
+#
+# Revision 1.4  1996/11/13 19:23:44  jimg
+# *** empty log message ***
+#
+# Revision 1.3  1996/08/12 22:22:18  jimg
+# Changed for the new error message text from the parser.
+#
+# Revision 1.2  1996/04/05 22:00:13  jimg
+# Misc Changes for release 2.0.1 of the core software - for developers.
+#
+# Revision 1.1  1995/02/16  15:34:52  jimg
+# Added these tests. See comments in files in parent directory.
+#
+
+global comp_output		# contains output from das-test_start
+global verbose			# this and srcdir are set by runtest.exp
+global srcdir
+
+# The variable `test_name' is the name of the das input file for this test.
+
+set test_name test.21
+
+# The variable `test_out' is a string that contains the text that should be
+# stored in comp_output by das-test_start. The two strings should match
+# exactly.
+
+set test_out "Attributes {
+    test {
+        Float64 f 2.55E300;
+        test_dods_errors {
+            Float32 g 2.55E300;
+            String g_explanation \"`2.55E300' is not a Float32 value.\";
+        }
+    }
+}"
+
+das-test_start p $srcdir/$test_name
+
+if ![string compare $test_out $comp_output] { # check comp_output
+    pass "$test_name"
+} else {
+    xfail "$test_name"
+}
diff --git a/unit-tests/das-testsuite/das-test.0/test.22.exp b/unit-tests/das-testsuite/das-test.0/test.22.exp
new file mode 100644
index 0000000..25b820e
--- /dev/null
+++ b/unit-tests/das-testsuite/das-test.0/test.22.exp
@@ -0,0 +1,82 @@
+# expect/tcl code to test the das parser and scanner
+# jhrg
+#
+# $Log: test.22.exp,v $
+# Revision 1.5  2001/06/15 23:49:05  jimg
+# Merged with release-3-2-4.
+#
+# Revision 1.3.4.3  2001/06/06 06:40:57  jimg
+# *** empty log message ***
+#
+# Revision 1.3.4.2  2001/06/06 04:12:30  jimg
+# Updated for the new DAS error reporting scheme (Some errors are reported
+# in the DAS itself).
+#
+# Revision 1.4  2001/01/26 19:48:10  jimg
+# Merged with release-3-2-3.
+#
+# Revision 1.3.4.1  2000/11/30 05:20:19  jimg
+# Added
+#
+# Revision 1.3  2000/06/16 18:15:01  jimg
+# Merged with 3.1.7
+#
+# Revision 1.1.6.2  2000/06/15 02:24:57  jimg
+# Fixed the tests: problems with PATH, etc. broke the tests on my new machine
+#
+# Revision 1.2  2000/03/31 21:07:04  jimg
+# Merged with release-3-1-5
+#
+# Revision 1.1.6.1  2000/03/31 20:03:26  jimg
+# Updated tests for new DAS requirements
+#
+# Revision 1.1  1999/04/29 00:05:39  jimg
+# *** empty log message ***
+#
+# Revision 1.6  1997/05/13 23:29:18  jimg
+# *** empty log message ***
+#
+# Revision 1.5  1997/03/27 18:19:58  jimg
+# Update for version 2.13
+#
+# Revision 1.4  1996/11/13 19:23:44  jimg
+# *** empty log message ***
+#
+# Revision 1.3  1996/08/12 22:22:18  jimg
+# Changed for the new error message text from the parser.
+#
+# Revision 1.2  1996/04/05 22:00:13  jimg
+# Misc Changes for release 2.0.1 of the core software - for developers.
+#
+# Revision 1.1  1995/02/16  15:34:52  jimg
+# Added these tests. See comments in files in parent directory.
+#
+
+global comp_output		# contains output from das-test_start
+global verbose			# this and srcdir are set by runtest.exp
+global srcdir
+
+# The variable `test_name' is the name of the das input file for this test.
+
+set test_name test.22
+
+# The variable `test_out' is a string that contains the text that should be
+# stored in comp_output by das-test_start. The two strings should match
+# exactly.
+
+set test_out "Attributes {
+    test {
+        test_dods_errors {
+            Float64 f 2.55E400;
+            String f_explanation \"`2.55E400' is not a Float64 value.\";
+        }
+    }
+}"
+
+das-test_start p $srcdir/$test_name
+
+if ![string compare $test_out $comp_output] { # check comp_output
+    pass "$test_name"
+} else {
+    fail "$test_name"
+}
diff --git a/unit-tests/das-testsuite/das-test.0/test.23.exp b/unit-tests/das-testsuite/das-test.0/test.23.exp
new file mode 100644
index 0000000..be4b13c
--- /dev/null
+++ b/unit-tests/das-testsuite/das-test.0/test.23.exp
@@ -0,0 +1,39 @@
+
+# expect/tcl code to test the das parser and scanner
+# jhrg
+#
+# $Log: test.23.exp,v $
+# Revision 1.2  2001/01/26 19:48:10  jimg
+# Merged with release-3-2-3.
+#
+# Revision 1.1.2.1  2000/11/30 05:20:19  jimg
+# Added
+#
+
+global comp_output		# contains output from das-test_start
+global verbose			# this and srcdir are set by runtest.exp
+global srcdir
+
+# The variable `test_name' is the name of the das input file for this test.
+
+set test_name test.23
+
+# The variable `test_out' is a string that contains the text that should be
+# stored in comp_output by das-test_start. The two strings should match
+# exactly.
+
+set test_out "Attributes {
+    var1 {
+        Int32 x 14;
+        Int32 y 15, 16, 17;
+    }
+    Alias var2 var1;
+}"
+
+das-test_start p $srcdir/$test_name
+
+if ![string compare $test_out $comp_output] { # check comp_output
+    pass "$test_name"
+} else {
+    fail "$test_name"
+}
diff --git a/unit-tests/das-testsuite/das-test.0/test.24.exp b/unit-tests/das-testsuite/das-test.0/test.24.exp
new file mode 100644
index 0000000..094a735
--- /dev/null
+++ b/unit-tests/das-testsuite/das-test.0/test.24.exp
@@ -0,0 +1,44 @@
+
+# expect/tcl code to test the das parser and scanner
+# jhrg
+#
+# $Log: test.24.exp,v $
+# Revision 1.2  2001/01/26 19:48:10  jimg
+# Merged with release-3-2-3.
+#
+# Revision 1.1.2.1  2000/11/30 05:20:19  jimg
+# Added
+#
+
+global comp_output		# contains output from das-test_start
+global verbose			# this and srcdir are set by runtest.exp
+global srcdir
+
+# The variable `test_name' is the name of the das input file for this test.
+
+set test_name test.24
+
+# The variable `test_out' is a string that contains the text that should be
+# stored in comp_output by das-test_start. The two strings should match
+# exactly.
+
+set test_out "Attributes {
+    var1 {
+        Int32 x 14;
+        Int32 y 15, 16, 17;
+        component1 {
+            Float64 g 6.02e23;
+            String name \"A part of the whole\";
+        }
+    }
+    Alias component2 component1;
+}"
+
+
+das-test_start p $srcdir/$test_name
+
+if ![string compare $test_out $comp_output] { # check comp_output
+    pass "$test_name"
+} else {
+    fail "$test_name"
+}
diff --git a/unit-tests/das-testsuite/das-test.0/test.25.exp b/unit-tests/das-testsuite/das-test.0/test.25.exp
new file mode 100644
index 0000000..8456fed
--- /dev/null
+++ b/unit-tests/das-testsuite/das-test.0/test.25.exp
@@ -0,0 +1,45 @@
+
+# expect/tcl code to test the das parser and scanner
+# jhrg
+#
+# $Log: test.25.exp,v $
+# Revision 1.3  2003/12/11 01:08:38  jimg
+# More fixes after resolving conflicts. This code still fails some tests.
+#
+# Revision 1.2.6.1  2003/10/03 16:26:30  jimg
+# Fixed tests; I changed the text of das-test just a little and so these
+# had to be updated. I wanted to be sure that the error message was from
+# an exception and not just a write to stderr.
+#
+# Revision 1.2  2001/01/26 19:48:10  jimg
+# Merged with release-3-2-3.
+#
+# Revision 1.1.2.1  2000/11/30 05:20:20  jimg
+# Added
+#
+
+global comp_output		# contains output from das-test_start
+global verbose			# this and srcdir are set by runtest.exp
+global srcdir
+
+# The variable `test_name' is the name of the das input file for this test.
+
+set test_name test.25
+
+# The variable `test_out' is a string that contains the text that should be
+# stored in comp_output by das-test_start. The two strings should match
+# exactly.
+
+set test_out "Caught Error object:
+Error parsing the text on line 16
+A value cannot be aliased to the top level of the DAS;
+Only containers may be present at that level of the DAS.
+"
+
+das-test_start p $srcdir/$test_name
+
+if ![string compare $test_out $comp_output] { # check comp_output
+    pass "$test_name"
+} else {
+    fail "$test_name"
+}
diff --git a/unit-tests/das-testsuite/das-test.0/test.26.exp b/unit-tests/das-testsuite/das-test.0/test.26.exp
new file mode 100644
index 0000000..4e21876
--- /dev/null
+++ b/unit-tests/das-testsuite/das-test.0/test.26.exp
@@ -0,0 +1,43 @@
+
+# expect/tcl code to test the das parser and scanner
+# jhrg
+#
+# $Log: test.26.exp,v $
+# Revision 1.2  2001/01/26 19:48:10  jimg
+# Merged with release-3-2-3.
+#
+# Revision 1.1.2.1  2000/11/30 05:20:20  jimg
+# Added
+#
+
+global comp_output		# contains output from das-test_start
+global verbose			# this and srcdir are set by runtest.exp
+global srcdir
+
+# The variable `test_name' is the name of the das input file for this test.
+
+set test_name test.26
+
+# The variable `test_out' is a string that contains the text that should be
+# stored in comp_output by das-test_start. The two strings should match
+# exactly.
+
+set test_out "Attributes {
+    var1 {
+        Int32 x 14;
+        Int32 y 15, 16, 17;
+        Alias z x;
+        component1 {
+            Float64 g 6.02e23;
+            String name \"A part of the whole\";
+        }
+    }
+}"
+
+das-test_start p $srcdir/$test_name
+
+if ![string compare $test_out $comp_output] { # check comp_output
+    pass "$test_name"
+} else {
+    fail "$test_name"
+}
diff --git a/unit-tests/das-testsuite/das-test.0/test.27.exp b/unit-tests/das-testsuite/das-test.0/test.27.exp
new file mode 100644
index 0000000..a027691
--- /dev/null
+++ b/unit-tests/das-testsuite/das-test.0/test.27.exp
@@ -0,0 +1,43 @@
+
+# expect/tcl code to test the das parser and scanner
+# jhrg
+#
+# $Log: test.27.exp,v $
+# Revision 1.2  2001/01/26 19:48:10  jimg
+# Merged with release-3-2-3.
+#
+# Revision 1.1.2.1  2000/11/30 05:20:20  jimg
+# Added
+#
+
+global comp_output		# contains output from das-test_start
+global verbose			# this and srcdir are set by runtest.exp
+global srcdir
+
+# The variable `test_name' is the name of the das input file for this test.
+
+set test_name test.27
+
+# The variable `test_out' is a string that contains the text that should be
+# stored in comp_output by das-test_start. The two strings should match
+# exactly.
+
+set test_out "Attributes {
+    var1 {
+        Int32 x 14;
+        Int32 y 15, 16, 17;
+        component1 {
+            Float64 g 6.02e23;
+            String name \"A part of the whole\";
+        }
+        Alias new_name component1;
+    }
+}"
+
+das-test_start p $srcdir/$test_name
+
+if ![string compare $test_out $comp_output] { # check comp_output
+    pass "$test_name"
+} else {
+    fail "$test_name"
+}
diff --git a/unit-tests/das-testsuite/das-test.0/test.28.exp b/unit-tests/das-testsuite/das-test.0/test.28.exp
new file mode 100644
index 0000000..f413c11
--- /dev/null
+++ b/unit-tests/das-testsuite/das-test.0/test.28.exp
@@ -0,0 +1,44 @@
+
+# expect/tcl code to test the das parser and scanner
+# jhrg
+#
+# $Log: test.28.exp,v $
+# Revision 1.2  2001/01/26 19:48:10  jimg
+# Merged with release-3-2-3.
+#
+# Revision 1.1.2.1  2000/11/30 05:20:20  jimg
+# Added
+#
+
+global comp_output		# contains output from das-test_start
+global verbose			# this and srcdir are set by runtest.exp
+global srcdir
+
+# The variable `test_name' is the name of the das input file for this test.
+
+set test_name test.28
+
+# The variable `test_out' is a string that contains the text that should be
+# stored in comp_output by das-test_start. The two strings should match
+# exactly.
+
+set test_out "Attributes {
+    var1 {
+        Int32 x 14;
+        Int32 y 15, 16, 17;
+        component1 {
+            Float64 g 6.02e23;
+            String name \"A part of the whole\";
+        }
+        Alias z component1.g;
+    }
+}"
+
+
+das-test_start p $srcdir/$test_name
+
+if ![string compare $test_out $comp_output] { # check comp_output
+    pass "$test_name"
+} else {
+    fail "$test_name"
+}
diff --git a/unit-tests/das-testsuite/das-test.0/test.29.exp b/unit-tests/das-testsuite/das-test.0/test.29.exp
new file mode 100644
index 0000000..76e084d
--- /dev/null
+++ b/unit-tests/das-testsuite/das-test.0/test.29.exp
@@ -0,0 +1,44 @@
+
+# expect/tcl code to test the das parser and scanner
+# jhrg
+#
+# $Log: test.29.exp,v $
+# Revision 1.3  2003/12/11 01:08:38  jimg
+# More fixes after resolving conflicts. This code still fails some tests.
+#
+# Revision 1.2.6.1  2003/10/03 16:26:30  jimg
+# Fixed tests; I changed the text of das-test just a little and so these
+# had to be updated. I wanted to be sure that the error message was from
+# an exception and not just a write to stderr.
+#
+# Revision 1.2  2001/01/26 19:48:10  jimg
+# Merged with release-3-2-3.
+#
+# Revision 1.1.2.1  2000/11/30 05:20:20  jimg
+# Added
+#
+
+global comp_output		# contains output from das-test_start
+global verbose			# this and srcdir are set by runtest.exp
+global srcdir
+
+# The variable `test_name' is the name of the das input file for this test.
+
+set test_name test.29
+
+# The variable `test_out' is a string that contains the text that should be
+# stored in comp_output by das-test_start. The two strings should match
+# exactly.
+
+set test_out "Caught Error object:
+Error parsing the text on line 15
+Could not find the attribute `var1.comp' in the attribute object.
+"
+
+das-test_start p $srcdir/$test_name
+
+if ![string compare $test_out $comp_output] { # check comp_output
+    pass "$test_name"
+} else {
+    fail "$test_name"
+}
diff --git a/unit-tests/das-testsuite/das-test.0/test.3.exp b/unit-tests/das-testsuite/das-test.0/test.3.exp
new file mode 100644
index 0000000..7ca342a
--- /dev/null
+++ b/unit-tests/das-testsuite/das-test.0/test.3.exp
@@ -0,0 +1,76 @@
+# expect/tcl code to test the das parser and scanner
+# jhrg
+#
+# $Log: test.3.exp,v $
+# Revision 1.9  2000/06/16 18:15:01  jimg
+# Merged with 3.1.7
+#
+# Revision 1.8.38.1  2000/06/15 02:24:57  jimg
+# Fixed the tests: problems with PATH, etc. broke the tests on my new machine
+#
+# Revision 1.8  1997/05/13 23:29:24  jimg
+# *** empty log message ***
+#
+# Revision 1.7  1996/05/14 15:40:50  jimg
+# These changes have already been checked in once before. However, I
+# corrupted the source repository and restored it from a 5/9/96 backup
+# tape. The previous version's log entry should cover the changes.
+#
+# Revision 1.6  1995/02/10  03:31:14  jimg
+# Modified test cases for type checking.
+#
+# Revision 1.5  1994/12/09  21:45:47  jimg
+# Modified for new unix.exp.
+#
+# Revision 1.4  1994/10/05  16:51:49  jimg
+# Added TYPE to each of the DAS test files.
+# The `expect' files correcly check for that in the output.
+#
+# Revision 1.3  1994/09/27  23:14:15  jimg
+# Changed expected outcomes to match new das.print() mfunc.
+#
+# Revision 1.2  1994/09/09  16:15:22  jimg
+# Fixed namign of the test (was given as $srcdir//$test_name, should have been
+# $srcdir$test_name).
+#
+# Revision 1.1  1994/08/29  19:57:21  jimg
+# Test procedures for the DAS parser, scanner and C++ class.
+#
+
+global comp_output		# contains output from das-test_start
+global verbose			# this and srcdir are set by runtest.exp
+global srcdir
+
+# The variable `test_name' is the name of the das input file for this test.
+
+set test_name test.3
+
+# The variable `test_out' is a string that contains the text that should be
+# stored in comp_output by das-test_start. The two strings should match
+# exactly.
+
+set test_out "Attributes {
+    var1 {
+        String comment \"One thing about these long comments is that they
+might cause problems with memory - overwrites, ...\";
+        String comment2 \"This quote tests a \\\"quote within a quote\\\", he said\";
+        String quote1 \"\\\"\";
+        String quote2 \"\\7 seven\";
+    }
+}"
+
+das-test_start p $srcdir/$test_name
+
+# send_user "comp output: $comp_output\n"
+# send_user "test out: $test_out\n"
+
+# send_user "result of compare [string compare $test_out $comp_output]\n"
+# send_user "result of match [string match $test_out $comp_output]\n"
+
+if ![string compare $test_out $comp_output] {
+    pass "$test_name"
+} else {
+    fail "$test_name"
+}
+
+
diff --git a/unit-tests/das-testsuite/das-test.0/test.30.exp b/unit-tests/das-testsuite/das-test.0/test.30.exp
new file mode 100644
index 0000000..2331b6a
--- /dev/null
+++ b/unit-tests/das-testsuite/das-test.0/test.30.exp
@@ -0,0 +1,44 @@
+
+# expect/tcl code to test the das parser and scanner
+# jhrg
+#
+# $Log: test.30.exp,v $
+# Revision 1.3  2003/12/11 01:08:38  jimg
+# More fixes after resolving conflicts. This code still fails some tests.
+#
+# Revision 1.2.6.1  2003/10/03 16:26:30  jimg
+# Fixed tests; I changed the text of das-test just a little and so these
+# had to be updated. I wanted to be sure that the error message was from
+# an exception and not just a write to stderr.
+#
+# Revision 1.2  2001/01/26 19:48:10  jimg
+# Merged with release-3-2-3.
+#
+# Revision 1.1.2.1  2000/11/30 05:20:20  jimg
+# Added
+#
+
+global comp_output		# contains output from das-test_start
+global verbose			# this and srcdir are set by runtest.exp
+global srcdir
+
+# The variable `test_name' is the name of the das input file for this test.
+
+set test_name test.30
+
+# The variable `test_out' is a string that contains the text that should be
+# stored in comp_output by das-test_start. The two strings should match
+# exactly.
+
+set test_out "Caught Error object:
+Error parsing the text on line 15
+Could not find the attribute `comp.g' in the attribute object.
+"
+
+das-test_start p $srcdir/$test_name
+
+if ![string compare $test_out $comp_output] { # check comp_output
+    pass "$test_name"
+} else {
+    fail "$test_name"
+}
diff --git a/unit-tests/das-testsuite/das-test.0/test.31.exp b/unit-tests/das-testsuite/das-test.0/test.31.exp
new file mode 100644
index 0000000..82cf8f3
--- /dev/null
+++ b/unit-tests/das-testsuite/das-test.0/test.31.exp
@@ -0,0 +1,47 @@
+
+# expect/tcl code to test the das parser and scanner
+# jhrg
+#
+# $Log: test.31.exp,v $
+# Revision 1.2  2001/01/26 19:48:10  jimg
+# Merged with release-3-2-3.
+#
+# Revision 1.1.2.1  2000/11/30 05:20:20  jimg
+# Added
+#
+
+global comp_output		# contains output from das-test_start
+global verbose			# this and srcdir are set by runtest.exp
+global srcdir
+
+# The variable `test_name' is the name of the das input file for this test.
+
+set test_name test.31
+
+# The variable `test_out' is a string that contains the text that should be
+# stored in comp_output by das-test_start. The two strings should match
+# exactly.
+
+set test_out "Attributes {
+    var1 {
+        Int32 x 14;
+        Int32 y 15, 16, 17;
+        component1 {
+            Float64 g 6.02e23;
+            String name \"A part of the whole\";
+            inner_component {
+                String tag \"xyz123\";
+                Url my_url \"http://dcz.dods.org/\";
+            }
+        }
+        Alias url_info inner_component;
+    }
+}"
+
+das-test_start p $srcdir/$test_name
+
+if ![string compare $test_out $comp_output] { # check comp_output
+    pass "$test_name"
+} else {
+    fail "$test_name"
+}
diff --git a/unit-tests/das-testsuite/das-test.0/test.32.exp b/unit-tests/das-testsuite/das-test.0/test.32.exp
new file mode 100644
index 0000000..9d4468b
--- /dev/null
+++ b/unit-tests/das-testsuite/das-test.0/test.32.exp
@@ -0,0 +1,42 @@
+
+# expect/tcl code to test the das parser and scanner
+# jhrg
+#
+# $Log: test.32.exp,v $
+# Revision 1.2  2002/06/03 22:21:16  jimg
+# Merged with release-3-2-9
+#
+# Revision 1.1.2.1  2002/03/14 20:01:16  jimg
+# Added
+#
+# Revision 1.1.2.1  2000/11/30 05:20:20  jimg
+# Added
+#
+
+global comp_output		# contains output from das-test_start
+global verbose			# this and srcdir are set by runtest.exp
+global srcdir
+
+# The variable `test_name' is the name of the das input file for this test.
+
+set test_name test.32
+
+# The variable `test_out' is a string that contains the text that should be
+# stored in comp_output by das-test_start. The two strings should match
+# exactly.
+
+set test_out "Attributes {
+    var1 {
+        Float64 g 6.02e23;
+        Float64 h NaN;
+        Float32 i NaN;
+    }
+}"
+
+das-test_start p $srcdir/$test_name
+
+if ![string compare $test_out $comp_output] { # check comp_output
+    pass "$test_name"
+} else {
+    fail "$test_name"
+}
diff --git a/unit-tests/das-testsuite/das-test.0/test.33.exp b/unit-tests/das-testsuite/das-test.0/test.33.exp
new file mode 100644
index 0000000..25e5ae7
--- /dev/null
+++ b/unit-tests/das-testsuite/das-test.0/test.33.exp
@@ -0,0 +1,42 @@
+
+# expect/tcl code to test the das parser and scanner
+# jhrg
+#
+# $Log: test.33.exp,v $
+# Revision 1.2  2002/06/03 22:21:16  jimg
+# Merged with release-3-2-9
+#
+# Revision 1.1.2.1  2002/03/14 20:01:16  jimg
+# Added
+#
+# Revision 1.1.2.1  2000/11/30 05:20:20  jimg
+# Added
+#
+
+global comp_output		# contains output from das-test_start
+global verbose			# this and srcdir are set by runtest.exp
+global srcdir
+
+# The variable `test_name' is the name of the das input file for this test.
+
+set test_name test.33
+
+# The variable `test_out' is a string that contains the text that should be
+# stored in comp_output by das-test_start. The two strings should match
+# exactly.
+
+set test_out "Attributes {
+    var1 {
+        Float64 Float64 6.02e23;
+        String Url \"http://www.google.com/\";
+        Url String \"http://huh.com/\";
+    }
+}"
+
+das-test_start p $srcdir/$test_name
+
+if ![string compare $test_out $comp_output] { # check comp_output
+    pass "$test_name"
+} else {
+    fail "$test_name"
+}
diff --git a/unit-tests/das-testsuite/das-test.0/test.4.exp b/unit-tests/das-testsuite/das-test.0/test.4.exp
new file mode 100644
index 0000000..e81394f
--- /dev/null
+++ b/unit-tests/das-testsuite/das-test.0/test.4.exp
@@ -0,0 +1,94 @@
+# expect/tcl code to test the das parser and scanner
+# jhrg
+#
+
+global comp_output		# contains output from das-test_start
+global verbose			# this and srcdir are set by runtest.exp
+global srcdir
+
+# The variable `test_name' is the name of the das input file for this test.
+
+set test_name test.4
+
+# The variable `test_out' is a string that contains the text that should be
+# stored in comp_output by das-test_start. The two strings should match
+# exactly.
+
+set test_out "Attributes {
+    a {
+        String b c;
+        Int32 attributes 4;
+    }
+}"
+
+das-test_start p $srcdir/$test_name
+
+if ![string compare $test_out $comp_output] { # check comp_output
+    pass "$test_name"
+} else {
+    fail "$test_name"
+}
+
+# $Log: test.4.exp,v $
+# Revision 1.15  2003/01/10 19:46:43  jimg
+# Merged with code tagged release-3-2-10 on the release-3-2 branch. In many
+# cases files were added on that branch (so they appear on the trunk for
+# the first time).
+#
+# Revision 1.14.4.2  2002/05/31 21:38:42  jimg
+# Removed extra space in test_out. Arrgh...
+#
+# Revision 1.14.4.1  2002/05/31 21:32:58  jimg
+# The reserved word `attributes' can be used as the name of an attribute now.
+#
+# Revision 1.14  2000/09/22 02:52:59  jimg
+# Fixes to the tests to recognize some of the new error messages. Also,
+# the test drivers were modified to catch the exceptions now thrown by
+# some of the parsers.
+#
+# Revision 1.13  2000/06/16 18:15:01  jimg
+# Merged with 3.1.7
+#
+# Revision 1.12.10.1  2000/06/15 02:24:57  jimg
+# Fixed the tests: problems with PATH, etc. broke the tests on my new machine
+#
+# Revision 1.12  1999/03/24 23:42:22  jimg
+# Added or updated for the new simple types (Int16, UInt16 and Float32)
+#
+# Revision 1.11  1997/05/13 23:29:26  jimg
+# *** empty log message ***
+#
+# Revision 1.10  1997/03/27 18:19:59  jimg
+# Update for version 2.13
+#
+# Revision 1.9  1996/11/13 19:23:45  jimg
+# *** empty log message ***
+#
+# Revision 1.8  1996/08/12 22:22:19  jimg
+# Changed for the new error message text from the parser.
+#
+# Revision 1.7  1996/05/14 15:40:51  jimg
+# These changes have already been checked in once before. However, I
+# corrupted the source repository and restored it from a 5/9/96 backup
+# tape. The previous version's log entry should cover the changes.
+#
+# Revision 1.6  1994/12/09  21:45:48  jimg
+# Modified for new unix.exp.
+#
+# Revision 1.5  1994/10/13  16:04:12  jimg
+# Now works with the new das-test (but only when das-test is compiled
+# w/o DEBUG and TRACE_NEW).
+#
+# Revision 1.4  1994/10/05  16:51:50  jimg
+# Added TYPE to each of the DAS test files.
+# The `expect' files correcly check for that in the output.
+#
+# Revision 1.3  1994/09/27  23:14:16  jimg
+# Changed expected outcomes to match new das.print() mfunc.
+#
+# Revision 1.2  1994/09/09  16:15:23  jimg
+# Fixed namign of the test (was given as $srcdir//$test_name, should have been
+# $srcdir$test_name).
+#
+# Revision 1.1  1994/08/29  19:57:22  jimg
+# Test procedures for the DAS parser, scanner and C++ class.
diff --git a/unit-tests/das-testsuite/das-test.0/test.5.exp b/unit-tests/das-testsuite/das-test.0/test.5.exp
new file mode 100644
index 0000000..2e3f51f
--- /dev/null
+++ b/unit-tests/das-testsuite/das-test.0/test.5.exp
@@ -0,0 +1,62 @@
+# expect/tcl code to test the das parser and scanner
+# jhrg
+#
+# $Log: test.5.exp,v $
+# Revision 1.7  2003/12/11 01:08:38  jimg
+# More fixes after resolving conflicts. This code still fails some tests.
+#
+# Revision 1.6.10.1  2003/10/03 16:26:30  jimg
+# Fixed tests; I changed the text of das-test just a little and so these
+# had to be updated. I wanted to be sure that the error message was from
+# an exception and not just a write to stderr.
+#
+# Revision 1.6  2000/06/16 18:15:01  jimg
+# Merged with 3.1.7
+#
+# Revision 1.5.38.1  2000/06/15 02:24:57  jimg
+# Fixed the tests: problems with PATH, etc. broke the tests on my new machine
+#
+# Revision 1.5  1997/05/13 23:29:27  jimg
+# *** empty log message ***
+#
+# Revision 1.4  1996/05/14 15:40:52  jimg
+# These changes have already been checked in once before. However, I
+# corrupted the source repository and restored it from a 5/9/96 backup
+# tape. The previous version's log entry should cover the changes.
+#
+# Revision 1.3  1994/12/09  21:45:50  jimg
+# Modified for new unix.exp.
+#
+# Revision 1.2  1994/09/09  16:15:25  jimg
+# Fixed namign of the test (was given as $srcdir//$test_name, should have been
+# $srcdir$test_name).
+#
+# Revision 1.1  1994/08/29  19:57:23  jimg
+# Test procedures for the DAS parser, scanner and C++ class.
+#
+
+global comp_output		# contains output from das-test_start
+global verbose			# this and srcdir are set by runtest.exp
+global srcdir
+
+# The variable `test_name' is the name of the das input file for this test.
+
+set test_name test.5
+
+# The variable `test_out' is a string that contains the text that should be
+# stored in comp_output by das-test_start. The two strings should match
+# exactly.
+
+set test_out "Caught Error object:
+Error scanning DAS object text: Unterminated quote (starts on line 6)
+"
+
+das-test_start p $srcdir/$test_name
+
+if ![string compare $test_out $comp_output] { # check comp_output
+    pass "$test_name"
+} else {
+    fail "$test_name"
+}
+
+
diff --git a/unit-tests/das-testsuite/das-test.0/test.6.exp b/unit-tests/das-testsuite/das-test.0/test.6.exp
new file mode 100644
index 0000000..b0a3719
--- /dev/null
+++ b/unit-tests/das-testsuite/das-test.0/test.6.exp
@@ -0,0 +1,94 @@
+# expect/tcl code to test the das parser and scanner
+# jhrg
+#
+
+global comp_output		# contains output from das-test_start
+global verbose			# this and srcdir are set by runtest.exp
+global srcdir
+
+# The variable `test_name' is the name of the das input file for this test.
+
+set test_name test.6
+
+# The variable `test_out' is a string that contains the text that should be
+# stored in comp_output by das-test_start. The two strings should match
+# exactly.
+
+set test_out "Caught Error object:
+Error *"
+
+das-test_start p $srcdir/$test_name
+
+if [string match $test_out $comp_output] { # check comp_output
+    pass "$test_name"
+} else {
+    fail "$test_name"
+}
+
+# $Log: test.6.exp,v $
+# Revision 1.15  2003/12/11 01:08:38  jimg
+# More fixes after resolving conflicts. This code still fails some tests.
+#
+# Revision 1.14.4.1  2003/10/03 16:26:30  jimg
+# Fixed tests; I changed the text of das-test just a little and so these
+# had to be updated. I wanted to be sure that the error message was from
+# an exception and not just a write to stderr.
+#
+# Revision 1.14  2003/01/10 07:15:53  jimg
+# resolved conflicts from the merge with release-3-2-10.
+#
+# Revision 1.13  2001/08/24 17:46:23  jimg
+# Resolved conflicts from the merge of release 3.2.6
+#
+# Revision 1.12.4.1  2001/06/23 00:52:32  jimg
+# Added tests for `#' in IDs.
+#
+# Revision 1.12.4.2  2002/06/11 00:31:20  jimg
+# Fixed this test. It's better to test just for the Error word at the start of
+# the das-test program's output. That way the same test can keep on working as
+# long as the error message continues to start with that word. I also moved the
+# log file to end of the file.
+#
+# Revision 1.12  2000/09/22 02:52:59  jimg
+# Fixes to the tests to recognize some of the new error messages. Also,
+# the test drivers were modified to catch the exceptions now thrown by
+# some of the parsers.
+#
+# Revision 1.11  2000/06/16 18:15:01  jimg
+# Merged with 3.1.7
+#
+# Revision 1.10.10.1  2000/06/15 02:24:57  jimg
+# Fixed the tests: problems with PATH, etc. broke the tests on my new machine
+#
+# Revision 1.10  1999/03/24 23:42:23  jimg
+# Added or updated for the new simple types (Int16, UInt16 and Float32)
+#
+# Revision 1.9  1997/05/13 23:29:28  jimg
+# *** empty log message ***
+#
+# Revision 1.8  1997/03/27 18:20:00  jimg
+# Update for version 2.13
+#
+# Revision 1.7  1996/11/13 19:23:46  jimg
+# *** empty log message ***
+#
+# Revision 1.6  1996/08/12 22:22:20  jimg
+# Changed for the new error message text from the parser.
+#
+# Revision 1.5  1996/05/14 15:40:53  jimg
+# These changes have already been checked in once before. However, I
+# corrupted the source repository and restored it from a 5/9/96 backup
+# tape. The previous version's log entry should cover the changes.
+#
+# Revision 1.4  1995/02/10  03:31:16  jimg
+# Modified test cases for type checking.
+#
+# Revision 1.3  1994/12/09  21:45:51  jimg
+# Modified for new unix.exp.
+#
+# Revision 1.2  1994/09/09  16:15:26  jimg
+# Fixed namign of the test (was given as $srcdir//$test_name, should have been
+# $srcdir$test_name).
+#
+# Revision 1.1  1994/08/29  19:57:24  jimg
+# Test procedures for the DAS parser, scanner and C++ class.
diff --git a/unit-tests/das-testsuite/das-test.0/test.7.exp b/unit-tests/das-testsuite/das-test.0/test.7.exp
new file mode 100644
index 0000000..779bf60
--- /dev/null
+++ b/unit-tests/das-testsuite/das-test.0/test.7.exp
@@ -0,0 +1,106 @@
+# expect/tcl code to test the das parser and scanner
+# jhrg
+#
+# $Log: test.7.exp,v $
+# Revision 1.10  2003/12/11 01:08:38  jimg
+# More fixes after resolving conflicts. This code still fails some tests.
+#
+# Revision 1.9.10.1  2003/10/03 16:26:30  jimg
+# Fixed tests; I changed the text of das-test just a little and so these
+# had to be updated. I wanted to be sure that the error message was from
+# an exception and not just a write to stderr.
+#
+# Revision 1.9  2000/09/22 02:52:59  jimg
+# Fixes to the tests to recognize some of the new error messages. Also,
+# the test drivers were modified to catch the exceptions now thrown by
+# some of the parsers.
+#
+# Revision 1.8  2000/06/16 18:15:01  jimg
+# Merged with 3.1.7
+#
+# Revision 1.7.10.1  2000/06/15 02:24:57  jimg
+# Fixed the tests: problems with PATH, etc. broke the tests on my new machine
+#
+# Revision 1.7  1999/03/24 23:42:23  jimg
+# Added or updated for the new simple types (Int16, UInt16 and Float32)
+#
+# Revision 1.6  1997/05/13 23:29:30  jimg
+# *** empty log message ***
+#
+# Revision 1.5  1997/03/27 18:20:02  jimg
+# Update for version 2.13
+#
+# Revision 1.4  1996/11/13 19:23:47  jimg
+# *** empty log message ***
+#
+# Revision 1.3  1996/08/12 22:22:21  jimg
+# Changed for the new error message text from the parser.
+#
+# Revision 1.2  1996/05/14 15:40:54  jimg
+# These changes have already been checked in once before. However, I
+# corrupted the source repository and restored it from a 5/9/96 backup
+# tape. The previous version's log entry should cover the changes.
+#
+# Revision 1.1  1995/02/16  15:34:53  jimg
+# Added these tests. See comments in files in parent directory.
+#
+
+global comp_output		# contains output from das-test_start
+global verbose			# this and srcdir are set by runtest.exp
+global srcdir
+
+# The variable `test_name' is the name of the das input file for this test.
+
+set test_name test.7
+
+# The variable `test_out' is a string that contains the text that should be
+# stored in comp_output by das-test_start. The two strings should match
+# exactly.
+
+set test_out "Caught Error object:
+Error parsing the text on line 10 at or near: my_test
+Expected an attribute type (Byte, Int16, UInt16, Int32, UInt32, Float32,
+Float64, String or Url) followed by a name and value."
+
+das-test_start p $srcdir/$test_name
+
+set comp_output [string trim $comp_output]
+
+if ![string compare $test_out $comp_output] { # check comp_output
+    pass "$test_name"
+} else {
+    set tlen [string length $test_out]
+    set clen [string length $comp_output]
+
+    set len $tlen;			# used by for loop below
+
+    if {$clen < $tlen} {
+	set len $clen;			# set if needed
+
+	set size [expr $tlen - $clen]
+	send_user "comp_output is smaller (by $size chars) than expected!\n"
+	send_user "Here's the excess: '"
+	send_user [string range $test_out [expr $clen -1] end]
+ 	send_user "'\n"
+    } elseif {$tlen < $clen} {
+	set size [expr $clen - $tlen]
+	send_user "comp_output is larger (by $size chars) than expected!\n"
+	send_user "Here's the excess: '"
+	send_user [string range $comp_output [expr $tlen -1] end]
+	send_user "'\n"
+    }
+
+    # $len is set to the smallest of $tlen or $clen to avoid running off the
+    # end either of the strings.
+    for {set i 0} {$i < $len} {incr i} {
+	set c [string index $comp_output $i]
+	set t [string index $test_out $i]
+	if {$t != $c} {
+	    send_user "comp_output ($c) and test_out ($t) differ at $i.\n"
+	}
+    }
+    
+    fail "$test_name"
+}
+
+
diff --git a/unit-tests/das-testsuite/das-test.0/test.8.exp b/unit-tests/das-testsuite/das-test.0/test.8.exp
new file mode 100644
index 0000000..71b1841
--- /dev/null
+++ b/unit-tests/das-testsuite/das-test.0/test.8.exp
@@ -0,0 +1,63 @@
+# expect/tcl code to test the das parser and scanner
+# jhrg
+#
+# $Log: test.8.exp,v $
+# Revision 1.4  2000/06/16 18:15:01  jimg
+# Merged with 3.1.7
+#
+# Revision 1.3.38.1  2000/06/15 02:24:57  jimg
+# Fixed the tests: problems with PATH, etc. broke the tests on my new machine
+#
+# Revision 1.3  1997/05/13 23:29:31  jimg
+# *** empty log message ***
+#
+# Revision 1.2  1996/05/14 15:40:56  jimg
+# These changes have already been checked in once before. However, I
+# corrupted the source repository and restored it from a 5/9/96 backup
+# tape. The previous version's log entry should cover the changes.
+#
+# Revision 1.1  1995/02/16  15:34:54  jimg
+# Added these tests. See comments in files in parent directory.
+#
+# Revision 1.4  1994/10/05  16:51:45  jimg
+# Added TYPE to each of the DAS test files.
+# The `expect' files correcly check for that in the output.
+#
+# Revision 1.3  1994/09/27  23:14:13  jimg
+# Changed expected outcomes to match new das.print() mfunc.
+#
+# Revision 1.2  1994/09/09  16:15:20  jimg
+# Fixed namign of the test (was given as $srcdir//$test_name, should have been
+# $srcdir$test_name).
+#
+# Revision 1.1  1994/08/29  19:57:19  jimg
+# Test procedures for the DAS parser, scanner and C++ class.
+#
+
+global comp_output		# contains output from das-test_start
+global verbose			# this and srcdir are set by runtest.exp
+global srcdir
+
+# The variable `test_name' is the name of the das input file for this test.
+
+set test_name test.8
+
+# The variable `test_out' is a string that contains the text that should be
+# stored in comp_output by das-test_start. The two strings should match
+# exactly.
+
+set test_out "Attributes {
+    var0 {
+        String month Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Nov, Dec;
+    }
+}"
+
+das-test_start p $srcdir/$test_name
+
+if ![string compare $test_out $comp_output] { # check comp_output
+    pass "$test_name"
+} else {
+    fail "$test_name"
+}
+
+
diff --git a/unit-tests/das-testsuite/das-test.0/test.9.exp b/unit-tests/das-testsuite/das-test.0/test.9.exp
new file mode 100644
index 0000000..9b6a0c2
--- /dev/null
+++ b/unit-tests/das-testsuite/das-test.0/test.9.exp
@@ -0,0 +1,71 @@
+# expect/tcl code to test the das parser and scanner
+# jhrg
+#
+# $Log: test.9.exp,v $
+# Revision 1.4  2000/06/16 18:15:01  jimg
+# Merged with 3.1.7
+#
+# Revision 1.3.38.1  2000/06/15 02:24:57  jimg
+# Fixed the tests: problems with PATH, etc. broke the tests on my new machine
+#
+# Revision 1.3  1997/05/13 23:29:32  jimg
+# *** empty log message ***
+#
+# Revision 1.2  1996/05/14 15:40:57  jimg
+# These changes have already been checked in once before. However, I
+# corrupted the source repository and restored it from a 5/9/96 backup
+# tape. The previous version's log entry should cover the changes.
+#
+# Revision 1.1  1995/02/16  15:34:55  jimg
+# Added these tests. See comments in files in parent directory.
+#
+# Revision 1.4  1994/10/05  16:51:45  jimg
+# Added TYPE to each of the DAS test files.
+# The `expect' files correcly check for that in the output.
+#
+# Revision 1.3  1994/09/27  23:14:13  jimg
+# Changed expected outcomes to match new das.print() mfunc.
+#
+# Revision 1.2  1994/09/09  16:15:20  jimg
+# Fixed namign of the test (was given as $srcdir/$test_name, should have been
+# $srcdir$test_name).
+#
+# Revision 1.1  1994/08/29  19:57:19  jimg
+# Test procedures for the DAS parser, scanner and C++ class.
+#
+
+global comp_output		# contains output from das-test_start
+global verbose			# this and srcdir are set by runtest.exp
+global srcdir
+
+# The variable `test_name' is the name of the das input file for this test.
+
+set test_name test.9
+
+# The variable `test_out' is a string that contains the text that should be
+# stored in comp_output by das-test_start. The two strings should match
+# exactly.
+
+set test_out "Attributes {
+    var1 {
+        String month Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Nov, Dec;
+    }
+    var2 {
+        String day Monday, Tuesday, Wed;
+        String month Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Nov, Dec;
+        String name bob;
+        Int32 num 10;
+        String irrational 3.1415, 2.718, 1.414;
+        Float64 irrational_numbers 3.1415, 2.718, 1.414;
+    }
+}"
+
+das-test_start p $srcdir/$test_name
+
+if ![string compare $test_out $comp_output] { # check comp_output
+    pass "$test_name"
+} else {
+    fail "$test_name"
+}
+
+
diff --git a/unit-tests/das-testsuite/special.test.das b/unit-tests/das-testsuite/special.test.das
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/unit-tests/das-testsuite/special.test.das
diff --git a/unit-tests/das-testsuite/special.test.hdf b/unit-tests/das-testsuite/special.test.hdf
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/unit-tests/das-testsuite/special.test.hdf
diff --git a/unit-tests/das-testsuite/test.1 b/unit-tests/das-testsuite/test.1
new file mode 100644
index 0000000..01f7a42
--- /dev/null
+++ b/unit-tests/das-testsuite/test.1
@@ -0,0 +1,54 @@
+
+
+#  -*- C++ -*-
+#
+#    This is a test of the das scanner and parser software. This file tests
+#    comments, attribute lists with missing parts, and multiple attribute
+#    lists (they should all coalesce into one attribute table.
+
+attributes {# weird
+    var1 {#test
+    	string name bob;	# bob is the only name allowed
+	string type human;	# for people ... 
+	int32 age 19;
+    }
+    var2 {
+	string name joe;
+	string type dog;   
+	int32 age 8;
+    }
+}   
+
+# This is a C++ type comment.
+# The scanner and parser should handle a text file with several
+# attribute-definintion sections.
+
+Attributes {
+    var3 {
+    	int32 size 8;
+	string color red;
+	string type art;
+    }
+    var4 {
+    }
+}
+
+ATTRIBUTES {
+    var5 {
+    	string height 5.0in.;
+	string units inches;
+	float64 max 5.0;
+    }
+}
+
+attributes {
+}
+
+attributes {
+    var5 {
+	string weight 100lbs;
+	string color red;
+    }
+}
+#
+# EOF must be at the end of this line (not on the line after)
\ No newline at end of file
diff --git a/unit-tests/das-testsuite/test.1.das b/unit-tests/das-testsuite/test.1.das
new file mode 100644
index 0000000..32c9c4d
--- /dev/null
+++ b/unit-tests/das-testsuite/test.1.das
@@ -0,0 +1,6 @@
+Attributes{
+    DODS_GLOBAL {
+	String About "This is used to test find_ancillary_das()";
+    }
+}
+
diff --git a/unit-tests/das-testsuite/test.1.gz b/unit-tests/das-testsuite/test.1.gz
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/unit-tests/das-testsuite/test.1.gz
diff --git a/unit-tests/das-testsuite/test.11 b/unit-tests/das-testsuite/test.11
new file mode 100644
index 0000000..94bb19e
--- /dev/null
+++ b/unit-tests/das-testsuite/test.11
@@ -0,0 +1,15 @@
+
+# -*- Perl -*-
+# test all sorts of numbers (do they all parse correctly?)
+
+Attributes {
+    test {
+	String names this, is, a, vector, of, strings;
+	Byte b 1, 0, 127, 255;
+	Int32 int_vec 1, 2, 2147483647; # nearly the bigest int32 allowed
+	Float64 float_vec 1.0, -1.0, +1.0, 0.2, -0.2, +0.2, .3, -.3, +.3,
+	                  -3.1415, -3.1415e-99, -3.1415e+99, +3.1415e-99,
+	                  -3., +2., 4.; # big float vector
+        Url where http://bozo.place.com/home.html;
+    }
+}
diff --git a/unit-tests/das-testsuite/test.12 b/unit-tests/das-testsuite/test.12
new file mode 100644
index 0000000..830c23b
--- /dev/null
+++ b/unit-tests/das-testsuite/test.12
@@ -0,0 +1,8 @@
+
+# test for bad floating point values
+
+Attributes {
+    var1 {
+        Float64 f1 3.0.0;
+    }
+}
diff --git a/unit-tests/das-testsuite/test.13 b/unit-tests/das-testsuite/test.13
new file mode 100644
index 0000000..4f6d891
--- /dev/null
+++ b/unit-tests/das-testsuite/test.13
@@ -0,0 +1,8 @@
+
+# more float testing
+
+Attributes {
+    var1 {
+        Float64 f1 -3..0;
+    }
+}
diff --git a/unit-tests/das-testsuite/test.14 b/unit-tests/das-testsuite/test.14
new file mode 100644
index 0000000..0dd134d
--- /dev/null
+++ b/unit-tests/das-testsuite/test.14
@@ -0,0 +1,8 @@
+
+# still more ... This should work
+
+Attributes {
+    var1 {
+        Float64 f1 3;
+    }
+}
\ No newline at end of file
diff --git a/unit-tests/das-testsuite/test.15 b/unit-tests/das-testsuite/test.15
new file mode 100644
index 0000000..336ec02
--- /dev/null
+++ b/unit-tests/das-testsuite/test.15
@@ -0,0 +1,8 @@
+
+# floats as ints; should not work
+
+Attributes {
+    var1 {
+        Int32 i1 3.0;
+    }
+}
diff --git a/unit-tests/das-testsuite/test.16 b/unit-tests/das-testsuite/test.16
new file mode 100644
index 0000000..14bf10c
--- /dev/null
+++ b/unit-tests/das-testsuite/test.16
@@ -0,0 +1,13 @@
+
+# Test variable redefinition error
+
+Attributes {
+    var1 {
+        Int32 i 1;
+	Float64 i 10.8; # this is an error since `i' is already an Int32
+	Float64 j 100.98;
+    }
+    var2 {
+	 Float64 i 1.8; # not an error; different variable
+    }
+}
diff --git a/unit-tests/das-testsuite/test.17 b/unit-tests/das-testsuite/test.17
new file mode 100644
index 0000000..4fcc8dc
--- /dev/null
+++ b/unit-tests/das-testsuite/test.17
@@ -0,0 +1,13 @@
+
+# -*- Perl -*-
+# byte values that should not parse, in various ways...
+
+Attributes {
+    test {
+	Byte b "this is not a byte";
+	byte c -256;
+	byte d 255;		# This on is OK; 4/5/96 NO, see dods-limits.h
+	byte e 2550;
+	byte f 2.55;
+    }
+}
diff --git a/unit-tests/das-testsuite/test.18 b/unit-tests/das-testsuite/test.18
new file mode 100644
index 0000000..99cf481
--- /dev/null
+++ b/unit-tests/das-testsuite/test.18
@@ -0,0 +1,10 @@
+
+# -*- Perl -*-
+# byte values that should not parse, in various ways...
+
+Attributes {
+    test {
+	Float32 f 2.55;
+	Int16 x 6535;
+    }
+}
diff --git a/unit-tests/das-testsuite/test.19 b/unit-tests/das-testsuite/test.19
new file mode 100644
index 0000000..b732fce
--- /dev/null
+++ b/unit-tests/das-testsuite/test.19
@@ -0,0 +1,10 @@
+
+# -*- Perl -*-
+# byte values that should not parse, in various ways...
+
+Attributes {
+    test {
+	Float64 f 2.55E-300;
+	Float32 g 2.55E-300;
+    }
+}
diff --git a/unit-tests/das-testsuite/test.2 b/unit-tests/das-testsuite/test.2
new file mode 100644
index 0000000..6f3158b
--- /dev/null
+++ b/unit-tests/das-testsuite/test.2
@@ -0,0 +1,8 @@
+attributes {
+    a {
+	string b c;
+	string d 4;
+    }
+}
+
+# single letter ID's and EOF w/o a preceding return
diff --git a/unit-tests/das-testsuite/test.20 b/unit-tests/das-testsuite/test.20
new file mode 100644
index 0000000..5e41993
--- /dev/null
+++ b/unit-tests/das-testsuite/test.20
@@ -0,0 +1,10 @@
+
+# -*- Perl -*-
+# byte values that should not parse, in various ways...
+
+Attributes {
+    test {
+	Int32 x 70000;
+	Int16 y 80000;
+    }
+}
diff --git a/unit-tests/das-testsuite/test.21 b/unit-tests/das-testsuite/test.21
new file mode 100644
index 0000000..da6c8d2
--- /dev/null
+++ b/unit-tests/das-testsuite/test.21
@@ -0,0 +1,10 @@
+
+# -*- Perl -*-
+# byte values that should not parse, in various ways...
+
+Attributes {
+    test {
+	Float64 f 2.55E300;
+	Float32 g 2.55E300;
+    }
+}
diff --git a/unit-tests/das-testsuite/test.22 b/unit-tests/das-testsuite/test.22
new file mode 100644
index 0000000..7ba6c8d
--- /dev/null
+++ b/unit-tests/das-testsuite/test.22
@@ -0,0 +1,9 @@
+
+# -*- Perl -*-
+# byte values that should not parse, in various ways...
+
+Attributes {
+    test {
+	Float64 f 2.55E400;
+    }
+}
diff --git a/unit-tests/das-testsuite/test.23 b/unit-tests/das-testsuite/test.23
new file mode 100644
index 0000000..4146e5f
--- /dev/null
+++ b/unit-tests/das-testsuite/test.23
@@ -0,0 +1,13 @@
+# -*- perl -*-
+#
+# Test aliases
+
+Attributes {
+    var1 {
+        Int32 x 14;
+	Int32 y 15, 16, 17;
+    }
+    
+    # Alias `var2' to the existing `var1'.
+    Alias var2 var1;
+}
\ No newline at end of file
diff --git a/unit-tests/das-testsuite/test.24 b/unit-tests/das-testsuite/test.24
new file mode 100644
index 0000000..a535fa8
--- /dev/null
+++ b/unit-tests/das-testsuite/test.24
@@ -0,0 +1,17 @@
+# -*- perl -*-
+#
+# Test aliases
+
+Attributes {
+    var1 {
+        Int32 x 14;
+	Int32 y 15, 16, 17;
+	component1 {
+	    Float64 g 6.02e23;
+	    String name "A part of the whole";
+	}
+    }
+    
+    # Alias `var2' to the existing `var1.component'.
+    Alias component2 var1.component1;
+}
diff --git a/unit-tests/das-testsuite/test.25 b/unit-tests/das-testsuite/test.25
new file mode 100644
index 0000000..5b4cc45
--- /dev/null
+++ b/unit-tests/das-testsuite/test.25
@@ -0,0 +1,17 @@
+# -*- perl -*-
+#
+# Test aliases
+
+Attributes {
+    var1 {
+        Int32 x 14;
+	Int32 y 15, 16, 17;
+	component1 {
+	    Float64 g 6.02e23;
+	    String name "A part of the whole";
+	}
+    }
+    
+    # Alias `name' to the existing `var1.component1.name'.
+    Alias name var1.component1.name;
+}
\ No newline at end of file
diff --git a/unit-tests/das-testsuite/test.26 b/unit-tests/das-testsuite/test.26
new file mode 100644
index 0000000..63da382
--- /dev/null
+++ b/unit-tests/das-testsuite/test.26
@@ -0,0 +1,15 @@
+# -*- perl -*-
+#
+# Test aliases
+
+Attributes {
+    var1 {
+        Int32 x 14;
+	Int32 y 15, 16, 17;
+	alias z x;
+	component1 {
+	    Float64 g 6.02e23;
+	    String name "A part of the whole";
+	}
+    }
+}
\ No newline at end of file
diff --git a/unit-tests/das-testsuite/test.27 b/unit-tests/das-testsuite/test.27
new file mode 100644
index 0000000..81be287
--- /dev/null
+++ b/unit-tests/das-testsuite/test.27
@@ -0,0 +1,15 @@
+# -*- perl -*-
+#
+# Test aliases
+
+Attributes {
+    var1 {
+        Int32 x 14;
+	Int32 y 15, 16, 17;
+	component1 {
+	    Float64 g 6.02e23;
+	    String name "A part of the whole";
+	}
+	Alias new_name component1;
+    }
+}
\ No newline at end of file
diff --git a/unit-tests/das-testsuite/test.28 b/unit-tests/das-testsuite/test.28
new file mode 100644
index 0000000..3c227c9
--- /dev/null
+++ b/unit-tests/das-testsuite/test.28
@@ -0,0 +1,16 @@
+# -*- perl -*-
+#
+# Test aliases
+
+Attributes {
+    var1 {
+        Int32 x 14;
+	Int32 y 15, 16, 17;
+	component1 {
+	    Float64 g 6.02e23;
+	    String name "A part of the whole";
+	}
+	
+	Alias z component1.g;
+    }
+}
\ No newline at end of file
diff --git a/unit-tests/das-testsuite/test.29 b/unit-tests/das-testsuite/test.29
new file mode 100644
index 0000000..d0e4071
--- /dev/null
+++ b/unit-tests/das-testsuite/test.29
@@ -0,0 +1,16 @@
+# -*- perl -*-
+#
+# Test aliases
+
+Attributes {
+    var1 {
+        Int32 x 14;
+	Int32 y 15, 16, 17;
+	component1 {
+	    Float64 g 6.02e23;
+	    String name "A part of the whole";
+	}
+    }
+    # This should fail since var1.comp does not exist.
+    alias var2 var1.comp;
+}
\ No newline at end of file
diff --git a/unit-tests/das-testsuite/test.3 b/unit-tests/das-testsuite/test.3
new file mode 100644
index 0000000..294a21b
--- /dev/null
+++ b/unit-tests/das-testsuite/test.3
@@ -0,0 +1,12 @@
+
+#  Test Quotes.
+
+Attributes {
+    var1 {
+	string comment "One thing about these long comments is that they
+might cause problems with memory - overwrites, ...";
+	string comment2 "This quote tests a \"quote within a quote\", he said";
+	string quote1 "\"";		# tricky
+	string quote2 "\7 seven";
+    }
+}
diff --git a/unit-tests/das-testsuite/test.3.Z b/unit-tests/das-testsuite/test.3.Z
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/unit-tests/das-testsuite/test.3.Z
diff --git a/unit-tests/das-testsuite/test.3.Z.das b/unit-tests/das-testsuite/test.3.Z.das
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/unit-tests/das-testsuite/test.3.Z.das
diff --git a/unit-tests/das-testsuite/test.30 b/unit-tests/das-testsuite/test.30
new file mode 100644
index 0000000..5b4bdfa
--- /dev/null
+++ b/unit-tests/das-testsuite/test.30
@@ -0,0 +1,17 @@
+# -*- perl -*-
+#
+# Test aliases
+
+Attributes {
+    var1 {
+        Int32 x 14;
+	Int32 y 15, 16, 17;
+	component1 {
+	    Float64 g 6.02e23;
+	    String name "A part of the whole";
+	}
+	
+	# This should fail.
+	Alias z comp.g;
+    }
+}
\ No newline at end of file
diff --git a/unit-tests/das-testsuite/test.31 b/unit-tests/das-testsuite/test.31
new file mode 100644
index 0000000..9ff5bb5
--- /dev/null
+++ b/unit-tests/das-testsuite/test.31
@@ -0,0 +1,20 @@
+# -*- perl -*-
+#
+# Test aliases
+
+Attributes {
+    var1 {
+        Int32 x 14;
+	Int32 y 15, 16, 17;
+	component1 {
+	    Float64 g 6.02e23;
+	    String name "A part of the whole";
+	    inner_component {
+		String tag "xyz123";
+		URL my_url "http://dcz.dods.org/";
+	    }
+	}
+	
+	Alias url_info var1.component1.inner_component;
+    }
+}
diff --git a/unit-tests/das-testsuite/test.32 b/unit-tests/das-testsuite/test.32
new file mode 100644
index 0000000..710a48c
--- /dev/null
+++ b/unit-tests/das-testsuite/test.32
@@ -0,0 +1,10 @@
+# -*- perl -*-
+#
+
+Attributes {
+    var1 {
+	 Float64 g 6.02e23;
+	 Float64 h NaN;
+	 Float32 i NaN;
+    }
+}
diff --git a/unit-tests/das-testsuite/test.33 b/unit-tests/das-testsuite/test.33
new file mode 100644
index 0000000..7a6b6f7
--- /dev/null
+++ b/unit-tests/das-testsuite/test.33
@@ -0,0 +1,10 @@
+# -*- perl -*-
+#
+
+Attributes {
+    var1 {
+	 Float64 Float64 6.02e23;
+	 String Url "http://www.google.com/";
+	 Url String "http://huh.com/";
+    }
+}
diff --git a/unit-tests/das-testsuite/test.34 b/unit-tests/das-testsuite/test.34
new file mode 100644
index 0000000..fdeb15d
--- /dev/null
+++ b/unit-tests/das-testsuite/test.34
@@ -0,0 +1,10 @@
+Attributes {
+    var1 {
+        Int32 y#z 15;
+        component1 {
+	    inner%20component {
+	        String tag "xyz123";
+	    }
+        }
+    }
+}
\ No newline at end of file
diff --git a/unit-tests/das-testsuite/test.4 b/unit-tests/das-testsuite/test.4
new file mode 100644
index 0000000..e3b3e92
--- /dev/null
+++ b/unit-tests/das-testsuite/test.4
@@ -0,0 +1,8 @@
+# This should work (now, it used to generate an error because `attributes'
+# is a reserved word.
+attributes {
+    a {
+	string b c;
+	int32 attributes 4;
+    }
+}
diff --git a/unit-tests/das-testsuite/test.5 b/unit-tests/das-testsuite/test.5
new file mode 100644
index 0000000..04648c4
--- /dev/null
+++ b/unit-tests/das-testsuite/test.5
@@ -0,0 +1,9 @@
+# Test unterminated quote
+
+attributes {
+    var10 {
+	string attr woof;
+	string quote "this quote has no end;
+    }
+}
+
diff --git a/unit-tests/das-testsuite/test.6 b/unit-tests/das-testsuite/test.6
new file mode 100644
index 0000000..2004581
--- /dev/null
+++ b/unit-tests/das-testsuite/test.6
@@ -0,0 +1,10 @@
+
+#  Test unterminated comments. Old test, should fail miserably
+
+attributes {
+    var_11 {
+	string slota val1;
+	string slotb val2; /* a bad comment
+    }
+}
+
diff --git a/unit-tests/das-testsuite/test.7 b/unit-tests/das-testsuite/test.7
new file mode 100644
index 0000000..8fab860
--- /dev/null
+++ b/unit-tests/das-testsuite/test.7
@@ -0,0 +1,12 @@
+# -*- C++ -*-
+
+#  Test missing type specifier.
+
+Attributes {
+    aa {
+	int32 i 10;
+	float64 f 12.9;
+	string test test;
+	test2 my_test;
+    }
+}
diff --git a/unit-tests/das-testsuite/test.8 b/unit-tests/das-testsuite/test.8
new file mode 100644
index 0000000..813eacf
--- /dev/null
+++ b/unit-tests/das-testsuite/test.8
@@ -0,0 +1,9 @@
+#  -*- C++ -*-
+
+# Test attribute vectors.
+
+Attributes {
+    var0 {
+	String month Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Nov, Dec;
+    }
+}
diff --git a/unit-tests/das-testsuite/test.9 b/unit-tests/das-testsuite/test.9
new file mode 100644
index 0000000..66b87ee
--- /dev/null
+++ b/unit-tests/das-testsuite/test.9
@@ -0,0 +1,18 @@
+
+#  -*- C++ -*-
+#
+# Test attribute vectors.
+
+Attributes {
+    var1 {
+	String month Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Nov, Dec;
+    }
+    var2 {
+	String day Monday, Tuesday, Wed;
+	String month Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Nov, Dec;
+	String name bob;
+	Int32 num 10;
+	String irrational 3.1415, 2.718, 1.414;
+	Float64 irrational_numbers 3.1415, 2.718, 1.414;
+    }
+}
diff --git a/unit-tests/dasT.cc b/unit-tests/dasT.cc
new file mode 100644
index 0000000..a2277fd
--- /dev/null
+++ b/unit-tests/dasT.cc
@@ -0,0 +1,209 @@
+#include <cppunit/TestFixture.h>
+#include <cppunit/TestAssert.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+#include <cppunit/ui/text/TestRunner.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/CompilerOutputter.h>
+
+#include <iostream>
+#include <fstream>
+#include <sstream>
+
+// #define DODS_DEBUG
+
+#include "DAS.h"
+
+#include "testFile.h"
+#include "GetOpt.h"
+
+using namespace std;
+using namespace libdap;
+using namespace CppUnit;
+
+static bool debug = false;
+
+string dprint =
+    "\
+Attributes {\n\
+    c1 {\n\
+        v1 {\n\
+            String v1a1 \"v1a1val\";\n\
+            String v1a2 \"v1a2val\";\n\
+            String v1a3 \"v1a3val\";\n\
+            String v1a4 \"v1a4val\";\n\
+            v1v1 {\n\
+                String v1v1a1 \"v1v1a1val\";\n\
+                String v1v1a2 \"v1v1a2val\";\n\
+            }\n\
+        }\n\
+    }\n\
+    c2 {\n\
+        v2 {\n\
+            String v2a1 \"v2a1val\";\n\
+            String v2a2 \"v2a2val\";\n\
+        }\n\
+        v3 {\n\
+            String v3a1 \"v3a1val\";\n\
+            String v3a2 \"v3a2val\";\n\
+            v3v1 {\n\
+                String v3v1a1 \"v3v1a1val\";\n\
+            }\n\
+        }\n\
+    }\n\
+}\n\
+";
+
+class dasT: public CppUnit::TestFixture {
+
+    CPPUNIT_TEST_SUITE (dasT);
+    CPPUNIT_TEST (dasT_test);CPPUNIT_TEST_SUITE_END( );
+
+private:
+    /* TEST PRIVATE DATA */
+
+public:
+    void setUp()
+    {
+    }
+
+    void tearDown()
+    {
+    }
+
+    void dasT_test()
+    {
+        DAS das;
+        CPPUNIT_ASSERT(das.get_size() == 0);
+        CPPUNIT_ASSERT(das.container_name().empty());
+        CPPUNIT_ASSERT(das.container() == 0);
+
+        // set container to c1 and make sure set correctly
+        das.container_name("c1");
+        CPPUNIT_ASSERT(das.container_name() == "c1");
+        CPPUNIT_ASSERT(das.container());
+        CPPUNIT_ASSERT(das.container()->get_name() == "c1");
+        CPPUNIT_ASSERT(das.get_size() == 0);
+
+        // set back to upermost attribute table and test
+        das.container_name("");
+        CPPUNIT_ASSERT(das.container_name().empty());
+        CPPUNIT_ASSERT(!das.container());
+        CPPUNIT_ASSERT(das.get_size() == 1);
+
+        // change to c2
+        das.container_name("c2");
+        CPPUNIT_ASSERT(das.container_name() == "c2");
+        CPPUNIT_ASSERT(das.container());
+        CPPUNIT_ASSERT(das.container()->get_name() == "c2");
+        CPPUNIT_ASSERT(das.get_size() == 0);
+
+        // set back to upermost attribute table and test
+        das.container_name("");
+        CPPUNIT_ASSERT(das.container_name().empty());
+        CPPUNIT_ASSERT(!das.container());
+        CPPUNIT_ASSERT(das.get_size() == 2);
+
+        // change back to c1, make sure not another c1 added
+        das.container_name("c1");
+        CPPUNIT_ASSERT(das.container_name() == "c1");
+        CPPUNIT_ASSERT(das.container());
+        CPPUNIT_ASSERT(das.container()->get_name() == "c1");
+        CPPUNIT_ASSERT(das.get_size() == 0);
+
+        // set back to upermost attribute table and test
+        das.container_name("");
+        CPPUNIT_ASSERT(das.container_name().empty());
+        CPPUNIT_ASSERT(!das.container());
+        CPPUNIT_ASSERT(das.get_size() == 2);
+
+        // add stuff to das, should go to c1
+        das.container_name("c1");
+        AttrTable *v1 = new AttrTable;
+        das.add_table("v1", v1);
+        v1->append_attr("v1a1", "String", "v1a1val");
+        v1->append_attr("v1a2", "String", "v1a2val");
+        v1->append_attr("v1a3", "String", "v1a3val");
+        v1->append_attr("v1a4", "String", "v1a4val");
+        AttrTable *v1v1 = v1->append_container("v1v1");
+        v1v1->append_attr("v1v1a1", "String", "v1v1a1val");
+        v1v1->append_attr("v1v1a2", "String", "v1v1a2val");
+
+        // check container and das size
+        CPPUNIT_ASSERT(das.get_size() == 1);
+        das.container_name("");
+        CPPUNIT_ASSERT(das.get_size() == 2);
+
+        // add stuff to das, should go to c2
+        das.container_name("c2");
+        AttrTable *v2 = new AttrTable;
+        das.add_table("v2", v2);
+        v2->append_attr("v2a1", "String", "v2a1val");
+        v2->append_attr("v2a2", "String", "v2a2val");
+        AttrTable *v3 = new AttrTable;
+        das.add_table("v3", v3);
+        v3->append_attr("v3a1", "String", "v3a1val");
+        v3->append_attr("v3a2", "String", "v3a2val");
+        AttrTable *v3v1 = v3->append_container("v3v1");
+        v3v1->append_attr("v3v1a1", "String", "v3v1a1val");
+
+        // check container and das size
+        CPPUNIT_ASSERT(das.get_size() == 2);
+        das.container_name("");
+        CPPUNIT_ASSERT(das.get_size() == 2);
+
+        // print to stream and compare results
+        ostringstream strm;
+        das.print(strm);
+        cout << strm.str() << endl;
+        cout << dprint << endl;
+        CPPUNIT_ASSERT(strm.str() == dprint);
+    }
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION (dasT);
+
+/* NOTHING NEEDS TO BE CHANGED BELOW HERE */
+
+int main(int argc, char*argv[])
+{
+    GetOpt getopt(argc, argv, "dh");
+    int option_char;
+
+    while ((option_char = getopt()) != -1)
+        switch (option_char) {
+        case 'd':
+            debug = true;  // debug is a static global
+            break;
+        case 'h': {     // help - show test names
+            cerr << "Usage: dasT has the following tests:" << endl;
+            const std::vector<Test*> &tests = dasT::suite()->getTests();
+            unsigned int prefix_len = dasT::suite()->getName().append("::").length();
+            for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+                cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+            }
+            break;
+        }
+        default:
+            break;
+        }
+
+    CppUnit::TextTestRunner runner;
+    runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
+    bool wasSuccessful = true;
+    string test = "";
+    int i = getopt.optind;
+    if (i == argc) {
+        // run them all
+        wasSuccessful = runner.run("");
+    }
+    else {
+        for (; i < argc; ++i) {
+            if (debug) cerr << "Running " << argv[i] << endl;
+            test = dasT::suite()->getName().append("::").append(argv[i]);
+            wasSuccessful = wasSuccessful && runner.run(test);
+        }
+    }
+
+    return wasSuccessful ? 0 : 1;
+}
diff --git a/unit-tests/dds-testsuite/3B42.980909.5.HDF.das b/unit-tests/dds-testsuite/3B42.980909.5.HDF.das
new file mode 100644
index 0000000..36ecd48
--- /dev/null
+++ b/unit-tests/dds-testsuite/3B42.980909.5.HDF.das
@@ -0,0 +1,626 @@
+Attributes {
+    HDF_GLOBAL {
+    }
+    CoreMetadata {
+        OrbitNumber {
+            Int32 Value -9999;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        RangeBeginningDate {
+            String Value 1998/09/09;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        RangeBeginningTime {
+            String Value 00:00:00;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        RangeEndingDate {
+            String Value 1998/09/10;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        RangeEndingTime {
+            String Value 00:00:00;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        GranulePointer {
+            String Value "3B42.980909.5.HDF";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        ShortName {
+            String Value "Surface Rain from Geostationary Satellites C";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        SizeMBECSDataGranule {
+            Float64 Value 0.220007;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        LongitudeOfMaximumLatitude {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        SpatialCoverageType {
+            String Value "Horizontal";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        EllipsoidName {
+            String Value "NULL";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        EquatorialRadius {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        DenominatorFlatteningRatio {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        OrbitalModelName {
+            String Value "NULL";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        SemiMajorAxis {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        MeanAnomaly {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        RightAscensionNode {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        ArgumentOfPerigee {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        Eccentricity {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        Inclination {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        EpochTime {
+            String Value 99:99:99;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        EpochDate {
+            String Value 9999/99/99;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        EpochMillisec {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        WestBoundingCoordinate {
+            Int32 Value -180;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        EastBoundingCoordinate {
+            Int32 Value 180;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        NorthBoundingCoordinate {
+            Int32 Value 40;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        SouthBoundingCoordinate {
+            Int32 Value -40;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        CenterLatitude {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        CenterLongitude {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        RadiusValue {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        LatitudeResolution {
+            String Value "1deg";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        LongitudeResolution {
+            String Value "1deg";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        GeographicCoordinateUnits {
+            String Value "Decimal Degrees";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        TemporalRangeType {
+            String Value "Continuous Range";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        QualityAssuranceParameterName {
+            String Value "ScienceQualityFlag";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        QualityAssuranceParameterValue {
+            String Value "NOT BEING INVESTIGATED";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        ReprocessingActual {
+            String Value "NULL";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        BrowsePointer {
+            String Value "3B42_BR.980909.5.BRO";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        ScienceContact {
+            String Value "George Huffman";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        MeanMotion {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        OrbitAdjustFlag {
+            Int32 Value -9999;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        AttitudeModeFlag {
+            Int32 Value -9999;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        SolarBetaAngleAtBeginningOfGranule {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        SolarBetaAngleAtEndOfGranule {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        SensorAlignment {
+            String Value "NULL";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        SensorAlignmentChannelOffsets {
+            String Value "NULL";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        ScanPathModel {
+            String Value "NULL";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        ScanPathModelParam {
+            String Value "NULL";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        EphemerisFileID {
+            String Value "NULL";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+    }
+    ArchiveMetadata {
+        DataGaps {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        NumberOfDataGaps {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        AlgorithmVersion {
+            String Value "4.51";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        ProductVersion {
+            Int32 Value 5;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        ToolkitVersion {
+            String Value "5.6";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        CalibrationCoefficientVersion {
+            Int32 Value -9999;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        MissingData {
+            Int32 Value -9999;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        PercentOfBadOrMissingPixels {
+            String Value "NULL";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        MaximumValidValueofChannel {
+            String Value "NULL";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        MinimumValidValueofChannel {
+            String Value "NULL";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        MinMaxUnits {
+            String Value "NULL";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        OrbitSize {
+            Int32 Value -9999;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        RadarWavelength {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        MinimumReflectivityThreshold {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        AlgorithmID {
+            String Value "3B42m2";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        DataAccuracy {
+            String Value "NULL";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        InputFiles {
+            String Value "NULL";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        DateOfGenerationOfInputFiles {
+            String Value "NULL";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        DataCenterSourceOfInputFiles {
+            String Value "NULL";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        GenerationDate {
+            String Value 2000-02-09T11:00:04.000Z;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        DayNight {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        SolarChannelGains {
+            String Value "(-9999.9,-9999.9,-9999.9,-9999.9)";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        TMIRolloverCoef {
+            String Value "(-9999.9,-9999.9,-9999.9,-9999.9,-9999.9,-9999.9,-9999.9,-9999.9,-9999.9,-9999.9,-9999.9,-9999.9,-9999.9,-9999.9,-9999.9,-9999.9,-9999.9,-9999.9)";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        OrbitFirstScanUTCDate {
+            String Value 9999/99/99;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        OrbitFirstScanUTCTime {
+            String Value 99:99:99;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        OrbitFirstScanUTCMilliseconds {
+            Int32 Value -9999;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        OrbitFirstSCSecs {
+            Int32 Value -9999;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        OrbitFirstSCSubsecs {
+            Int32 Value -9999;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        OrbitLastScanUTCDate {
+            String Value 9999/99/99;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        OrbitLastScanUTCTime {
+            String Value 99:99:99;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        OrbitLastScanUTCmilliseconds {
+            Int32 Value -9999;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        OrbitLastSCSecs {
+            Int32 Value -9999;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        OrbitLastSCSubsecs {
+            Int32 Value -9999;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        UTCFSeconds {
+            Int32 Value -9999;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        UTCFSubseconds {
+            Int32 Value -9999;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        UTCFflag {
+            Int32 Value -9999;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        LeapSecondsFlag {
+            String Value Data_Location, "Error processing EOS attributes", "Error processing EOS attributes";
+            String PGE "Error processing EOS attributes";
+            String Mandatory FALSE;
+        }
+        RadarSiteName {
+            String Value "NULL";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        RadarCity {
+            String Value "NULL";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        RadarState {
+            String Value "NULL";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        RadarCountry {
+            String Value "NULL";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        NumberOfVOS {
+            Int32 Value -9999;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        RadarGridOriginLatitude {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        RadarGridOriginLongitude {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        RadarGridOriginAltitude {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        RadarGridSpacingX {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        RadarGridSpacingY {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        RadarGridSpacingZ {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        RadarGridSizeX {
+            Int32 Value -9999;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        RadarGridSizeY {
+            Int32 Value -9999;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        RadarGridSizeZ {
+            Int32 Value -9999;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        DZCal {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        GVL1C_Scale {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        Alpha {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        RuntimeOptions {
+            String Value "NULL";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        AnomalyFlag {
+            String Value "NOT EMPTY";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        SoftwareVersion {
+            Int32 Value -9999;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        DatabaseVersion {
+            Int32 Value -9999;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        TotalQualityCode {
+            String Value "NULL";
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        LongitudeOnEquator {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        UTCDateOnEquator {
+            String Value 9999/99/99;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        UTCTimeOnEquator {
+            String Value 99:99:99;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        UTCMillisecsOnEquator {
+            Int32 Value -9999;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        CenterScanUTCDate {
+            String Value 9999/99/99;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        CenterScanUTCTime {
+            String Value 99:99:99;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        CenterScanUTCMillisec {
+            Int32 Value -9999;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        FirstScanLat {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        FirstScanLon {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        LastScanLat {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        LastScanLon {
+            Float64 Value -9999.9;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        NumberOfRainScans {
+            Int32 Value -9999;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+    }
+    percipitate_dim_0 {
+        String name "scan";
+    }
+    percipitate_dim_1 {
+        String name "longitude";
+    }
+    percipitate_dim_2 {
+        String name "latitude";
+    }
+    relError_dim_0 {
+        String name "scan";
+    }
+    relError_dim_1 {
+        String name "longitude";
+    }
+    relError_dim_2 {
+        String name "latitude";
+    }
+}
diff --git a/unit-tests/dds-testsuite/3B42.980909.5.HDF.dds b/unit-tests/dds-testsuite/3B42.980909.5.HDF.dds
new file mode 100644
index 0000000..259a06a
--- /dev/null
+++ b/unit-tests/dds-testsuite/3B42.980909.5.HDF.dds
@@ -0,0 +1,8 @@
+Dataset {
+    Structure {
+        Structure {
+            Float32 percipitate[scan = 1][longitude = 360][latitude = 80];
+            Float32 relError[scan = 1][longitude = 360][latitude = 80];
+        } PlanetaryGrid;
+    } DATA_GRANULE;
+} 3B42.980909.5.HDF;
diff --git a/unit-tests/dds-testsuite/3B42.980909.5.hacked.2.HDF.das b/unit-tests/dds-testsuite/3B42.980909.5.hacked.2.HDF.das
new file mode 100644
index 0000000..8afd5dc
--- /dev/null
+++ b/unit-tests/dds-testsuite/3B42.980909.5.hacked.2.HDF.das
@@ -0,0 +1,34 @@
+Attributes {
+    HDF_GLOBAL {
+    }
+    CoreMetadata {
+        OrbitNumber {
+            Int32 Value -9999;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        RangeBeginningDate {
+            String Value 1998/09/09;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+    }
+    percipitate {
+        String name "dim_0_scan";
+    }
+    percipitate {
+        String name "dim_1_longitude";
+    }
+    percipitate {
+        String name "dim_2_latitude";
+    }
+    relError {
+        String name "dim_0_scan";
+    }
+    relError {
+        String name "dim_1_longitude";
+    }
+    relError {
+        String name "dim_2_latitude";
+    }
+}
diff --git a/unit-tests/dds-testsuite/3B42.980909.5.hacked.HDF.das b/unit-tests/dds-testsuite/3B42.980909.5.hacked.HDF.das
new file mode 100644
index 0000000..3409a57
--- /dev/null
+++ b/unit-tests/dds-testsuite/3B42.980909.5.hacked.HDF.das
@@ -0,0 +1,34 @@
+Attributes {
+    HDF_GLOBAL {
+    }
+    CoreMetadata {
+        OrbitNumber {
+            Int32 Value -9999;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+        RangeBeginningDate {
+            String Value 1998/09/09;
+            String Data_Location PGE;
+            String Mandatory FALSE;
+        }
+    }
+    percipitate_dim_0 {
+        String name "scan";
+    }
+    percipitate_dim_1 {
+        String name "longitude";
+    }
+    percipitate_dim_2 {
+        String name "latitude";
+    }
+    relError_dim_0 {
+        String name "scan";
+    }
+    relError_dim_1 {
+        String name "longitude";
+    }
+    relError_dim_2 {
+        String name "latitude";
+    }
+}
diff --git a/unit-tests/dds-testsuite/AsciiOutputTest1.dds b/unit-tests/dds-testsuite/AsciiOutputTest1.dds
new file mode 100644
index 0000000..fa8652b
--- /dev/null
+++ b/unit-tests/dds-testsuite/AsciiOutputTest1.dds
@@ -0,0 +1,33 @@
+# Used for the AsciiOutput unit tests.
+
+dataset {
+    Int32 a;
+
+    Structure {
+        Int32 b;
+        Float64 c;
+        String d;
+    } e;
+ 
+    Structure {
+        Int32 b;
+        Float64 c;
+        String d;
+    } f;
+
+    Grid {
+      array:
+        Byte xy[x=12][y=12];
+      maps:
+        Float64 x[12];
+	Float64 y[12];
+    } g;
+
+    Sequence {
+        Int16 j;
+	Sequence {
+	    Int16 i;
+        } h;
+    } k;
+
+} ascii_output_test;
diff --git a/unit-tests/dds-testsuite/S2000415.HDF.das b/unit-tests/dds-testsuite/S2000415.HDF.das
new file mode 100644
index 0000000..f51918e
--- /dev/null
+++ b/unit-tests/dds-testsuite/S2000415.HDF.das
@@ -0,0 +1,316 @@
+Attributes {
+    HDF_GLOBAL {
+        String Producer_Agency "NASA\\000";
+        String Producer_Institution "JPL\\000";
+        String Sensor_Name "NSCAT\\000";
+        String Project_ID "NSCAT\\000";
+        String SIS_ID "597-512-24/1996-07-01\\000";
+        String Build_ID "3.2.1/1996-11-05\\000";
+        String ADEOS_Data_Package_ID "S2\\000";
+        String ADEOS_Data_Package_Type "S\\000";
+        String Product_Creation_Time "1996-318T01:35:16.000\\000";
+        String Data_Type "L2\\000";
+        String Data_Status "COMPLETE\\000";
+        Int32 First_Rev_Number 415;
+        String First_Rev_Eq_Crossing_Time "1996-259T04:01:28.226\\000";
+        Float32 First_Rev_Eq_Crossing_Lon 279.983;
+        String First_Data_Time "1996-259T03:43:48.945\\000";
+        String Last_Data_Time "1996-259T05:09:48.997\\000";
+        Int32 Num_Expected_Output_Records 458;
+        Int32 Num_Actual_Output_Records 458;
+        String Ambig_Removal_Method "Baseline used\\000";
+        String HDF_Build_ID "JPL D-xxxxx 12/15/94\\000";
+        String HDF_SIS_ID "JPL D-12060 12/15/94\\000";
+        String HDF_Conversion_Organization "JPL PO.DAAC\\000";
+        String HDF_Conversion_Time "1996-320T17:32:34       ";
+        String Data_Format_Type "HDF\\000";
+    }
+    WVC_Lat {
+        String long_name "latitude";
+        String units "deg";
+        Float64 scale_factor 0.01;
+        Float64 scale_factor_err 0;
+        Float64 add_offset 0;
+        Float64 add_offset_err 0;
+        Int32 calibrated_nt 22;
+        Int16 valid_range -9000, 7771;
+    }
+    WVC_Lat_dim_0 {
+        String name "row";
+        String long_name "WVC row";
+    }
+    WVC_Lat_dim_1 {
+        String name "WVC";
+        String long_name "WVC index";
+    }
+    WVC_Lon {
+        String long_name "longitude";
+        String units "deg";
+        Float64 scale_factor 0.01;
+        Float64 scale_factor_err 0;
+        Float64 add_offset 0;
+        Float64 add_offset_err 0;
+        Int32 calibrated_nt 22;
+        Uint16 valid_range 0, 31242;
+    }
+    WVC_Lon_dim_0 {
+        String name "row";
+        String long_name "WVC row";
+    }
+    WVC_Lon_dim_1 {
+        String name "WVC";
+        String long_name "WVC index";
+    }
+    Num_Sigma0 {
+        String long_name "The total number of sigma-0 measurements";
+        String units "counts";
+        Float64 scale_factor 1;
+        Float64 scale_factor_err 0;
+        Float64 add_offset 0;
+        Float64 add_offset_err 0;
+        Int32 calibrated_nt 21;
+        Byte valid_range 0, 19;
+    }
+    Num_Sigma0_dim_0 {
+        String name "row";
+        String long_name "WVC row";
+    }
+    Num_Sigma0_dim_1 {
+        String name "WVC";
+        String long_name "WVC index";
+    }
+    Num_Beam_12 {
+        String long_name "The total number of sigma-0s received from beam 1 or 2";
+        String units "counts";
+        Float64 scale_factor 1;
+        Float64 scale_factor_err 0;
+        Float64 add_offset 0;
+        Float64 add_offset_err 0;
+        Int32 calibrated_nt 21;
+        Byte valid_range 0, 6;
+    }
+    Num_Beam_12_dim_0 {
+        String name "row";
+        String long_name "WVC row";
+    }
+    Num_Beam_12_dim_1 {
+        String name "WVC";
+        String long_name "WVC index";
+    }
+    Num_Beam_34 {
+        String long_name "The total number of sigma-0s received from beam 3 or 4";
+        String units "counts";
+        Float64 scale_factor 1;
+        Float64 scale_factor_err 0;
+        Float64 add_offset 0;
+        Float64 add_offset_err 0;
+        Int32 calibrated_nt 21;
+        Byte valid_range 0, 6;
+    }
+    Num_Beam_34_dim_0 {
+        String name "row";
+        String long_name "WVC row";
+    }
+    Num_Beam_34_dim_1 {
+        String name "WVC";
+        String long_name "WVC index";
+    }
+    Num_Beam_56 {
+        String long_name "The total number of sigma-0s received from beam 5 or 6";
+        String units "counts";
+        Float64 scale_factor 1;
+        Float64 scale_factor_err 0;
+        Float64 add_offset 0;
+        Float64 add_offset_err 0;
+        Int32 calibrated_nt 21;
+        Byte valid_range 0, 6;
+    }
+    Num_Beam_56_dim_0 {
+        String name "row";
+        String long_name "WVC row";
+    }
+    Num_Beam_56_dim_1 {
+        String name "WVC";
+        String long_name "WVC index";
+    }
+    Num_Beam_78 {
+        String long_name "The total number of sigma-0s received from beam 7 or 8";
+        String units "counts";
+        Float64 scale_factor 1;
+        Float64 scale_factor_err 0;
+        Float64 add_offset 0;
+        Float64 add_offset_err 0;
+        Int32 calibrated_nt 21;
+        Byte valid_range 0, 6;
+    }
+    Num_Beam_78_dim_0 {
+        String name "row";
+        String long_name "WVC row";
+    }
+    Num_Beam_78_dim_1 {
+        String name "WVC";
+        String long_name "WVC index";
+    }
+    WVC_Quality_Flag {
+        String long_name "WVC Quality Flag";
+        Float64 scale_factor 1;
+        Float64 scale_factor_err 0;
+        Float64 add_offset 0;
+        Float64 add_offset_err 0;
+        Int32 calibrated_nt 21;
+        Byte valid_range 0, 3;
+    }
+    WVC_Quality_Flag_dim_0 {
+        String name "row";
+        String long_name "WVC row";
+    }
+    WVC_Quality_Flag_dim_1 {
+        String name "WVC";
+        String long_name "WVC index";
+    }
+    Mean_Wind {
+        String long_name "Mean Wind Speed";
+        String units "m/s";
+        Float64 scale_factor 0.01;
+        Float64 scale_factor_err 0;
+        Float64 add_offset 0;
+        Float64 add_offset_err 0;
+        Int32 calibrated_nt 23;
+        Uint16 valid_range 0, 2374;
+    }
+    Mean_Wind_dim_0 {
+        String name "row";
+        String long_name "WVC row";
+    }
+    Mean_Wind_dim_1 {
+        String name "WVC";
+        String long_name "WVC index";
+    }
+    Wind_Speed {
+        String long_name "Wind speed associated with a WVC";
+        String units "m/s";
+        Float64 scale_factor 0.01;
+        Float64 scale_factor_err 0;
+        Float64 add_offset 0;
+        Float64 add_offset_err 0;
+        Int32 calibrated_nt 23;
+        Uint16 valid_range 0, 2571;
+    }
+    Wind_Speed_dim_0 {
+        String name "row";
+        String long_name "WVC row";
+    }
+    Wind_Speed_dim_1 {
+        String name "WVC";
+        String long_name "WVC index";
+    }
+    Wind_Speed_dim_2 {
+        String name "position";
+        String long_name "position of the ambiguities";
+    }
+    Wind_Dir {
+        String long_name "Wind direction solution associated with a WVC";
+        String units "deg";
+        Float64 scale_factor 0.01;
+        Float64 scale_factor_err 0;
+        Float64 add_offset 0;
+        Float64 add_offset_err 0;
+        Int32 calibrated_nt 23;
+        Uint16 valid_range 0, 35997;
+    }
+    Wind_Dir_dim_0 {
+        String name "row";
+        String long_name "WVC row";
+    }
+    Wind_Dir_dim_1 {
+        String name "WVC";
+        String long_name "WVC index";
+    }
+    Wind_Dir_dim_2 {
+        String name "position";
+        String long_name "position of the ambiguities";
+    }
+    Error_Speed {
+        String long_name "Uncertainty estimated for the wind speed value";
+        String units "m/s";
+        Float64 scale_factor 0.01;
+        Float64 scale_factor_err 0;
+        Float64 add_offset 0;
+        Float64 add_offset_err 0;
+        Int32 calibrated_nt 23;
+        Uint16 valid_range 0, 2410;
+    }
+    Error_Speed_dim_0 {
+        String name "row";
+        String long_name "WVC row";
+    }
+    Error_Speed_dim_1 {
+        String name "WVC";
+        String long_name "WVC index";
+    }
+    Error_Speed_dim_2 {
+        String name "position";
+        String long_name "position of the ambiguities";
+    }
+    Error_Dir {
+        String long_name "Uncertainty estimated for the wind direction value";
+        String units "deg";
+        Float64 scale_factor 0.01;
+        Float64 scale_factor_err 0;
+        Float64 add_offset 0;
+        Float64 add_offset_err 0;
+        Int32 calibrated_nt 23;
+        Uint16 valid_range 0, 2435;
+    }
+    Error_Dir_dim_0 {
+        String name "row";
+        String long_name "WVC row";
+    }
+    Error_Dir_dim_1 {
+        String name "WVC";
+        String long_name "WVC index";
+    }
+    Error_Dir_dim_2 {
+        String name "position";
+        String long_name "position of the ambiguities";
+    }
+    MLE_Likelihood {
+        String long_name "Relative likelihood that a given win vector solution is correct";
+        Float64 scale_factor 0.1;
+        Float64 scale_factor_err 0;
+        Float64 add_offset 0;
+        Float64 add_offset_err 0;
+        Int32 calibrated_nt 22;
+        Int16 valid_range -32768, 2825;
+    }
+    MLE_Likelihood_dim_0 {
+        String name "row";
+        String long_name "WVC row";
+    }
+    MLE_Likelihood_dim_1 {
+        String name "WVC";
+        String long_name "WVC index";
+    }
+    MLE_Likelihood_dim_2 {
+        String name "position";
+        String long_name "position of the ambiguities";
+    }
+    Num_Ambigs {
+        String long_name "Number of ambiguous wind vectors reported for a given cell";
+        String units "counts";
+        Float64 scale_factor 1;
+        Float64 scale_factor_err 0;
+        Float64 add_offset 0;
+        Float64 add_offset_err 0;
+        Int32 calibrated_nt 21;
+        Byte valid_range 0, 4;
+    }
+    Num_Ambigs_dim_0 {
+        String name "row";
+        String long_name "WVC row";
+    }
+    Num_Ambigs_dim_1 {
+        String name "WVC";
+        String long_name "WVC index";
+    }
+}
diff --git a/unit-tests/dds-testsuite/S2000415.HDF.dds b/unit-tests/dds-testsuite/S2000415.HDF.dds
new file mode 100644
index 0000000..6eeadc8
--- /dev/null
+++ b/unit-tests/dds-testsuite/S2000415.HDF.dds
@@ -0,0 +1,35 @@
+Dataset {
+    Structure {
+        Int16 WVC_Lat[row = 458][WVC = 24];
+        UInt16 WVC_Lon[row = 458][WVC = 24];
+        Byte Num_Sigma0[row = 458][WVC = 24];
+        Byte Num_Beam_12[row = 458][WVC = 24];
+        Byte Num_Beam_34[row = 458][WVC = 24];
+        Byte Num_Beam_56[row = 458][WVC = 24];
+        Byte Num_Beam_78[row = 458][WVC = 24];
+        Byte WVC_Quality_Flag[row = 458][WVC = 24];
+        UInt16 Mean_Wind[row = 458][WVC = 24];
+        UInt16 Wind_Speed[row = 458][WVC = 24][position = 4];
+        UInt16 Wind_Dir[row = 458][WVC = 24][position = 4];
+        UInt16 Error_Speed[row = 458][WVC = 24][position = 4];
+        UInt16 Error_Dir[row = 458][WVC = 24][position = 4];
+        Int16 MLE_Likelihood[row = 458][WVC = 24][position = 4];
+        Byte Num_Ambigs[row = 458][WVC = 24];
+        Sequence {
+            Structure {
+                Int16 begin__0;
+            } begin;
+        } SwathIndex;
+        Sequence {
+            Structure {
+                String Mean_Time__0;
+            } Mean_Time;
+            Structure {
+                UInt32 Low_Wind_Speed_Flag__0;
+            } Low_Wind_Speed_Flag;
+            Structure {
+                UInt32 High_Wind_Speed_Flag__0;
+            } High_Wind_Speed_Flag;
+        } NSCAT%20L2;
+    } NSCAT%20Rev%2020;
+} S2000415.HDF;
diff --git a/unit-tests/dds-testsuite/S2000415.HDF.test1.das b/unit-tests/dds-testsuite/S2000415.HDF.test1.das
new file mode 100644
index 0000000..065d146
--- /dev/null
+++ b/unit-tests/dds-testsuite/S2000415.HDF.test1.das
@@ -0,0 +1,20 @@
+Attributes {
+    WVC_Lat {
+        String long_name "latitude";
+        String units "deg";
+        Float64 scale_factor 0.01;
+        Float64 scale_factor_err 0;
+        Float64 add_offset 0;
+        Float64 add_offset_err 0;
+        Int32 calibrated_nt 22;
+        Int16 valid_range -9000, 7771;
+    }
+    WVC_Lat_dim_0 {
+        String name "row";
+        String long_name "WVC row";
+    }
+    WVC_Lat_dim_1 {
+        String name "WVC";
+        String long_name "WVC index";
+    }
+}
diff --git a/unit-tests/dds-testsuite/coads_climatology.nc.das b/unit-tests/dds-testsuite/coads_climatology.nc.das
new file mode 100644
index 0000000..810bd57
--- /dev/null
+++ b/unit-tests/dds-testsuite/coads_climatology.nc.das
@@ -0,0 +1,50 @@
+Attributes {
+    COADSX {
+        String units "degrees_east";
+        String modulo " ";
+        String point_spacing "even";
+    }
+    COADSY {
+        String units "degrees_north";
+        String point_spacing "even";
+    }
+    TIME {
+        String units "hour since 0000-01-01 00:00:00";
+        String time_origin "1-JAN-0000 00:00:00";
+        String modulo " ";
+    }
+    SST {
+        Float32 missing_value -9.999999790e+33;
+        Float32 _FillValue -9.999999790e+33;
+        String long_name "SEA SURFACE TEMPERATURE";
+        String history "From coads_climatology";
+        String units "Deg C";
+    }
+    AIRT {
+        Float32 missing_value -9.999999790e+33;
+        Float32 _FillValue -9.999999790e+33;
+        String long_name "AIR TEMPERATURE";
+        String history "From coads_climatology";
+        String units "DEG C";
+    }
+    UWND {
+        Float32 missing_value -9.999999790e+33;
+        Float32 _FillValue -9.999999790e+33;
+        String long_name "ZONAL WIND";
+        String history "From coads_climatology";
+        String units "M/S";
+    }
+    VWND {
+        Float32 missing_value -9.999999790e+33;
+        Float32 _FillValue -9.999999790e+33;
+        String long_name "MERIDIONAL WIND";
+        String history "From coads_climatology";
+        String units "M/S";
+    }
+    NC_GLOBAL {
+        String history "FERRET V4.30 (debug/no GUI) 15-Aug-96";
+    }
+    DODS_EXTRA {
+        String Unlimited_Dimension "TIME";
+    }
+}
diff --git a/unit-tests/dds-testsuite/coads_climatology.nc.dds b/unit-tests/dds-testsuite/coads_climatology.nc.dds
new file mode 100644
index 0000000..5524a6b
--- /dev/null
+++ b/unit-tests/dds-testsuite/coads_climatology.nc.dds
@@ -0,0 +1,34 @@
+Dataset {
+    Grid {
+      Array:
+        Float32 SST[TIME = 12][COADSY = 90][COADSX = 180];
+      Maps:
+        Float64 TIME[TIME = 12];
+        Float64 COADSY[COADSY = 90];
+        Float64 COADSX[COADSX = 180];
+    } SST;
+    Grid {
+      Array:
+        Float32 AIRT[TIME = 12][COADSY = 90][COADSX = 180];
+      Maps:
+        Float64 TIME[TIME = 12];
+        Float64 COADSY[COADSY = 90];
+        Float64 COADSX[COADSX = 180];
+    } AIRT;
+    Grid {
+      Array:
+        Float32 UWND[TIME = 12][COADSY = 90][COADSX = 180];
+      Maps:
+        Float64 TIME[TIME = 12];
+        Float64 COADSY[COADSY = 90];
+        Float64 COADSX[COADSX = 180];
+    } UWND;
+    Grid {
+      Array:
+        Float32 VWND[TIME = 12][COADSY = 90][COADSX = 180];
+      Maps:
+        Float64 TIME[TIME = 12];
+        Float64 COADSY[COADSY = 90];
+        Float64 COADSX[COADSX = 180];
+    } VWND;
+} coads_climatology.nc;
diff --git a/unit-tests/dds-testsuite/fnoc1.nc.das b/unit-tests/dds-testsuite/fnoc1.nc.das
new file mode 100644
index 0000000..0407143
--- /dev/null
+++ b/unit-tests/dds-testsuite/fnoc1.nc.das
@@ -0,0 +1,32 @@
+Attributes {
+    u {
+        String units "meter per second";
+        String long_name "Vector wind eastward component";
+        String missing_value "-32767";
+        String scale_factor "0.005";
+        String DODS_Name "UWind";
+    }
+    v {
+        String units "meter per second";
+        String long_name "Vector wind northward component";
+        String missing_value "-32767";
+        String scale_factor "0.005";
+        String DODS_Name "VWind";
+    }
+    lat {
+        String units "degree North";
+    }
+    lon {
+        String units "degree East";
+    }
+    time {
+        String units "hours from base_time";
+    }
+    NC_GLOBAL {
+        String base_time "88- 10-00:00:00";
+        String title " FNOC UV wind components from 1988- 10 to 1988- 13.";
+    }
+    DODS_EXTRA {
+        String Unlimited_Dimension "time_a";
+    }
+}
diff --git a/unit-tests/dds-testsuite/fnoc1.nc.dds b/unit-tests/dds-testsuite/fnoc1.nc.dds
new file mode 100644
index 0000000..8c41e1b
--- /dev/null
+++ b/unit-tests/dds-testsuite/fnoc1.nc.dds
@@ -0,0 +1,7 @@
+Dataset {
+    Int16 u[time_a = 16][lat = 17][lon = 21];
+    Int16 v[time_a = 16][lat = 17][lon = 21];
+    Float32 lat[lat = 17];
+    Float32 lon[lon = 21];
+    Float32 time[time = 16];
+} fnoc1.nc;
diff --git a/unit-tests/dds-testsuite/fnoc1.nc.dmr.xml b/unit-tests/dds-testsuite/fnoc1.nc.dmr.xml
new file mode 100644
index 0000000..a99b7b1
--- /dev/null
+++ b/unit-tests/dds-testsuite/fnoc1.nc.dmr.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Group xmlns:xml="http://www.w3.org/XML/1998/namespace" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xml.opendap.org/ns/DAP/4.0# http://xml.opendap.org/dap/dap4.0.xsd" xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="fnoc1.nc">
+    <Attribute name="NC_GLOBAL" type="Container">
+        <Attribute name="base_time" type="String">
+            <value>88- 10-00:00:00</value>
+        </Attribute>
+        <Attribute name="title" type="String">
+            <value> FNOC UV wind components from 1988- 10 to 1988- 13.</value>
+        </Attribute>
+    </Attribute>
+    <Attribute name="DODS_EXTRA" type="Container">
+        <Attribute name="Unlimited_Dimension" type="String">
+            <value>time_a</value>
+        </Attribute>
+    </Attribute>
+    <Array name="u">
+        <Attribute name="units" type="String">
+            <value>meter per second</value>
+        </Attribute>
+        <Attribute name="long_name" type="String">
+            <value>Vector wind eastward component</value>
+        </Attribute>
+        <Attribute name="missing_value" type="String">
+            <value>-32767</value>
+        </Attribute>
+        <Attribute name="scale_factor" type="String">
+            <value>0.005</value>
+        </Attribute>
+        <Attribute name="DODS_Name" type="String">
+            <value>UWind</value>
+        </Attribute>
+        <Int16/>
+        <dimension name="time_a" size="16"/>
+        <dimension name="lat" size="17"/>
+        <dimension name="lon" size="21"/>
+    </Array>
+    <Array name="v">
+        <Attribute name="units" type="String">
+            <value>meter per second</value>
+        </Attribute>
+        <Attribute name="long_name" type="String">
+            <value>Vector wind northward component</value>
+        </Attribute>
+        <Attribute name="missing_value" type="String">
+            <value>-32767</value>
+        </Attribute>
+        <Attribute name="scale_factor" type="String">
+            <value>0.005</value>
+        </Attribute>
+        <Attribute name="DODS_Name" type="String">
+            <value>VWind</value>
+        </Attribute>
+        <Int16/>
+        <dimension name="time_a" size="16"/>
+        <dimension name="lat" size="17"/>
+        <dimension name="lon" size="21"/>
+    </Array>
+    <Array name="lat">
+        <Attribute name="units" type="String">
+            <value>degree North</value>
+        </Attribute>
+        <Float32/>
+        <dimension name="lat" size="17"/>
+    </Array>
+    <Array name="lon">
+        <Attribute name="units" type="String">
+            <value>degree East</value>
+        </Attribute>
+        <Float32/>
+        <dimension name="lon" size="21"/>
+    </Array>
+    <Array name="time">
+        <Attribute name="units" type="String">
+            <value>hours from base_time</value>
+        </Attribute>
+        <Float32/>
+        <dimension name="time" size="16"/>
+    </Array>
+</Group>
diff --git a/unit-tests/dds-testsuite/hdf_dimension_attribute_grid.das b/unit-tests/dds-testsuite/hdf_dimension_attribute_grid.das
new file mode 100644
index 0000000..6840800
--- /dev/null
+++ b/unit-tests/dds-testsuite/hdf_dimension_attribute_grid.das
@@ -0,0 +1,12 @@
+Attributes {
+    g {
+        String long_name "test_varaible";
+    }
+    
+    g_dim_0 {
+    	String long_name "test_first_dimension";
+    }
+    g_dim_1 {
+    	String long_name "test_second_dimension";
+    }
+}
diff --git a/unit-tests/dds-testsuite/hdf_dimension_attribute_grid.dds b/unit-tests/dds-testsuite/hdf_dimension_attribute_grid.dds
new file mode 100644
index 0000000..2e08696
--- /dev/null
+++ b/unit-tests/dds-testsuite/hdf_dimension_attribute_grid.dds
@@ -0,0 +1,11 @@
+# Used for the find_hdf4_dimension_attribute_home unit tests.
+
+dataset {
+    Grid {
+      array:
+        Byte xy[x=12][y=12];
+      maps:
+        Float64 x[12];
+	Float64 y[12];
+    } g;
+} ascii_output_test;
diff --git a/unit-tests/dds-testsuite/sequence.1.dds b/unit-tests/dds-testsuite/sequence.1.dds
new file mode 100644
index 0000000..0d81651
--- /dev/null
+++ b/unit-tests/dds-testsuite/sequence.1.dds
@@ -0,0 +1,6 @@
+dataset {
+    Sequence {
+	    String name;
+	    Int32 age;
+    } person;
+} data6;
diff --git a/unit-tests/dds-testsuite/test.1 b/unit-tests/dds-testsuite/test.1
new file mode 100644
index 0000000..465ac61
--- /dev/null
+++ b/unit-tests/dds-testsuite/test.1
@@ -0,0 +1,7 @@
+dataset {
+    Byte b;
+    int32 i;
+    int32 j;
+} data1;
+
+
diff --git a/unit-tests/dds-testsuite/test.1.das b/unit-tests/dds-testsuite/test.1.das
new file mode 100644
index 0000000..d170451
--- /dev/null
+++ b/unit-tests/dds-testsuite/test.1.das
@@ -0,0 +1,11 @@
+Attributes {
+    b {
+        String long_name "byte_b";
+    }
+    i {
+	String long_name "int32_i";
+  	Float32 scale_factor 1.2;
+	int32 coefs 2, 3, 4;
+    }
+}
+
diff --git a/unit-tests/dds-testsuite/test.10 b/unit-tests/dds-testsuite/test.10
new file mode 100644
index 0000000..db4c7eb
--- /dev/null
+++ b/unit-tests/dds-testsuite/test.10
@@ -0,0 +1,45 @@
+# -*- C++ -*-
+
+dataset {
+    structure {
+	Int32 i;
+	int32 j;
+    } test;
+
+    sequence {
+	int32 i;
+	int32 j[10];
+    } test2;
+
+    grid {
+      array:
+	float64 f[10][10];
+      maps:
+	int32 g[10];
+	int32 h[10];
+    } test4;
+
+    Sequence {
+	String name;
+	Int32 age;
+    } person;
+
+    Structure {
+	Int32 j;
+	Int32 i;
+	Structure {
+	    int32 i;
+	    float64 f[10];
+	} data;
+    } exp;
+
+    Grid {
+      Array:
+	float64 g[10][10][10];
+      Maps:
+	float64 lat[10];
+	float64 lon[10];
+	float64 weirdness[10];
+    } strange;
+
+} data6;
diff --git a/unit-tests/dds-testsuite/test.11 b/unit-tests/dds-testsuite/test.11
new file mode 100644
index 0000000..9b863cf
--- /dev/null
+++ b/unit-tests/dds-testsuite/test.11
@@ -0,0 +1,37 @@
+# -*- C++ -*-
+
+# Test identifier length
+
+dataset {
+    structure {
+	int32 long_one;
+	int32 long_two;
+	int32 long_three;
+	int32 long_four;
+	int32 long_five;
+	int32 long_six;
+	float64 long_one_float;
+	float64 long_two_float;
+	float64 long_three_float;
+    } long_names_one;
+    
+    structure {
+	int32 long_one_float1;
+	int32 long_two_float1;
+	int32 long_three_float3;
+	int32 long_four;
+	int32 long_five;
+	int32 long_six;
+	float64 long_one_float;
+	float64 long_two_float;
+	float64 long_three_float;
+    } long_names_one_and_a_half;
+ 
+    structure {
+	int32 a_very_long_name_given_what_it_accomplishes;
+	int32 another_name_nearly_as_pointless;
+    } long_names_two;
+
+    
+} long_identifier_test_data_set;
+
diff --git a/unit-tests/dds-testsuite/test.12 b/unit-tests/dds-testsuite/test.12
new file mode 100644
index 0000000..131dfb6
--- /dev/null
+++ b/unit-tests/dds-testsuite/test.12
@@ -0,0 +1,6 @@
+# test arrays with named dimensions.
+
+dataset {
+    int32 i;
+    float64 f[latitude=20][ longitude = 10 ];
+} data5;
diff --git a/unit-tests/dds-testsuite/test.13 b/unit-tests/dds-testsuite/test.13
new file mode 100644
index 0000000..bd400aa
--- /dev/null
+++ b/unit-tests/dds-testsuite/test.13
@@ -0,0 +1,6 @@
+# test problems with named dimensions.
+
+dataset {
+    int32 i;
+    float64 f[ longitude 10 ];
+} data5;
diff --git a/unit-tests/dds-testsuite/test.14 b/unit-tests/dds-testsuite/test.14
new file mode 100644
index 0000000..4ceac1d
--- /dev/null
+++ b/unit-tests/dds-testsuite/test.14
@@ -0,0 +1,4 @@
+# test null dataset
+
+dataset {
+} data5;
diff --git a/unit-tests/dds-testsuite/test.15 b/unit-tests/dds-testsuite/test.15
new file mode 100644
index 0000000..31fa2f5
--- /dev/null
+++ b/unit-tests/dds-testsuite/test.15
@@ -0,0 +1,8 @@
+#
+# Test new datatypes (int16, uint16, float32)
+
+Dataset {
+    int16 x;
+    uint16 y;
+    float32 f;
+} data5;
diff --git a/unit-tests/dds-testsuite/test.16 b/unit-tests/dds-testsuite/test.16
new file mode 100644
index 0000000..61a360f
--- /dev/null
+++ b/unit-tests/dds-testsuite/test.16
@@ -0,0 +1,21 @@
+#
+# Test dots (.) in variable names.
+
+Dataset {
+    Int32 i.x[10];
+    Int32 j.x[20];
+    Byte b.x;
+    String name.x;
+    Structure {
+        Float64 f;
+	Float64 g;
+	Float64 h.x;
+    } x;
+    Grid {
+      Array:
+        Byte temp[100][7];
+      Maps:
+        Float64 steps[100];
+	String colors[7];
+    } oddTemp.y;
+} data2;
diff --git a/unit-tests/dds-testsuite/test.17 b/unit-tests/dds-testsuite/test.17
new file mode 100644
index 0000000..ef53e89
--- /dev/null
+++ b/unit-tests/dds-testsuite/test.17
@@ -0,0 +1,12 @@
+#
+# Test error messages; When `Maps' is misspelled.
+
+Dataset {
+    Grid {
+      Array:
+        Byte temp[100][7];
+      Map:
+        Float64 steps[100];
+	String colors[7];
+    } oddTemp;
+} data2;
diff --git a/unit-tests/dds-testsuite/test.18 b/unit-tests/dds-testsuite/test.18
new file mode 100644
index 0000000..ca4e7a4
--- /dev/null
+++ b/unit-tests/dds-testsuite/test.18
@@ -0,0 +1,12 @@
+#
+# Test dataset filenames that are numbers.
+
+Dataset {
+    Grid {
+      Array:
+        Byte temp[100][7];
+      Maps:
+        Float64 steps[100];
+	String colors[7];
+    } oddTemp;
+} 123;
diff --git a/unit-tests/dds-testsuite/test.19 b/unit-tests/dds-testsuite/test.19
new file mode 100644
index 0000000..b87cca0
--- /dev/null
+++ b/unit-tests/dds-testsuite/test.19
@@ -0,0 +1,14 @@
+#
+# Test identifiers with `#' in them. 6/22/2001 jhrg
+
+Dataset {
+   Int32 a;
+   Int32 b#c[10];
+   Float64 c#d;
+   Grid {
+     Array:
+       Byte Image#data[512];
+     Maps:
+       String colors[512];
+   } huh;
+} test.19;
diff --git a/unit-tests/dds-testsuite/test.19b b/unit-tests/dds-testsuite/test.19b
new file mode 100644
index 0000000..6d05cf7
--- /dev/null
+++ b/unit-tests/dds-testsuite/test.19b
@@ -0,0 +1,14 @@
+#
+# Test identifiers with `#' in them. 6/22/2001 jhrg
+
+Dataset {
+   Int32 a;
+   Int32 b#c[10];
+   Float64 c%20d;
+   Grid {
+     Array:
+       Byte Image#data[512];
+     Maps:
+       String colors[512];
+   } huh;
+} test.19;
diff --git a/unit-tests/dds-testsuite/test.19b.das b/unit-tests/dds-testsuite/test.19b.das
new file mode 100644
index 0000000..d60630d
--- /dev/null
+++ b/unit-tests/dds-testsuite/test.19b.das
@@ -0,0 +1,33 @@
+# This DAS is used to test merging attributes into an existing DDS. It's
+# designed to work with the DDS in test.19b.
+
+Attributes {
+    NC_GLOBAL {
+        String long_name "Attribute merge test";
+        Int32 primes 2, 3, 5, 7, 11;
+    }
+
+    a {
+    }
+
+    b#c {
+        String long_name "b pound c";
+    }
+
+    c%20d {
+        String long_name "c d with a WWW escape sequence";
+	sub {
+	    String about "Attributes inside attributes";
+	    Float64 pi 3.1415;
+        }
+    }
+
+    huh {
+        String long_name "The Grid huh";
+	    colors {
+	        String long_name "The color map vector";
+        }
+	    Image#data {
+	    }
+    }
+}
diff --git a/unit-tests/dds-testsuite/test.19b.xml b/unit-tests/dds-testsuite/test.19b.xml
new file mode 100644
index 0000000..14b297f
--- /dev/null
+++ b/unit-tests/dds-testsuite/test.19b.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset name="test.19" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://xml.opendap.org/ns/DAP2" xsi:schemaLocation="http://xml.opendap.org/ns/DAP2 http://xml.opendap.org/dap/dap2.xsd">
+    <Int32 name="a"/>
+    <Array name="b#c">
+        <Int32/>
+        <dimension size="10"/>
+    </Array>
+    <Float64 name="c d"/>
+    <Grid name="huh">
+        <Array name="Image#data">
+            <Byte/>
+            <dimension size="512"/>
+        </Array>
+        <Map name="colors">
+            <String/>
+            <dimension size="512"/>
+        </Map>
+    </Grid>
+    <dataBLOB href=""/>
+</Dataset>
diff --git a/unit-tests/dds-testsuite/test.19b6.xml b/unit-tests/dds-testsuite/test.19b6.xml
new file mode 100644
index 0000000..3534ed6
--- /dev/null
+++ b/unit-tests/dds-testsuite/test.19b6.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset name="test.19" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://xml.opendap.org/ns/DAP2" xsi:schemaLocation="http://xml.opendap.org/ns/DAP2 http://xml.opendap.org/dap/dap2.xsd">
+    <Attribute name="NC_GLOBAL" type="Container">
+        <Attribute name="long_name" type="String">
+            <value>Attribute merge test</value>
+        </Attribute>
+        <Attribute name="primes" type="Int32">
+            <value>2</value>
+            <value>3</value>
+            <value>5</value>
+            <value>7</value>
+            <value>11</value>
+        </Attribute>
+    </Attribute>
+    <Int32 name="a"/>
+    <Array name="b#c">
+        <Attribute name="long_name" type="String">
+            <value>b pound c</value>
+        </Attribute>
+        <Int32/>
+        <dimension size="10"/>
+    </Array>
+    <Float64 name="c d">
+        <Attribute name="long_name" type="String">
+            <value>c d with a WWW escape sequence</value>
+        </Attribute>
+        <Attribute name="sub" type="Container">
+            <Attribute name="about" type="String">
+                <value>Attributes inside attributes</value>
+            </Attribute>
+            <Attribute name="pi" type="Float64">
+                <value>3.1415</value>
+            </Attribute>
+        </Attribute>
+    </Float64>
+    <Grid name="huh">
+        <Attribute name="long_name" type="String">
+            <value>The Grid huh</value>
+        </Attribute>
+        <Array name="Image#data">
+            <Byte/>
+            <dimension size="512"/>
+        </Array>
+        <Map name="colors">
+            <Attribute name="long_name" type="String">
+                <value>The color map vector</value>
+            </Attribute>
+            <String/>
+            <dimension size="512"/>
+        </Map>
+    </Grid>
+    <dataBLOB href=""/>
+</Dataset>
diff --git a/unit-tests/dds-testsuite/test.19c b/unit-tests/dds-testsuite/test.19c
new file mode 100644
index 0000000..aeadda8
--- /dev/null
+++ b/unit-tests/dds-testsuite/test.19c
@@ -0,0 +1,6 @@
+#
+# Test identifiers with `#' in them. 6/22/2001 jhrg
+
+Dataset {
+   Int32 a;
+} test.19c;
diff --git a/unit-tests/dds-testsuite/test.19c.das b/unit-tests/dds-testsuite/test.19c.das
new file mode 100644
index 0000000..a68eb99
--- /dev/null
+++ b/unit-tests/dds-testsuite/test.19c.das
@@ -0,0 +1,12 @@
+# This DAS is used to test merging attributes into an existing DDS. It's
+# designed to work with the DDS in test.19b.
+
+Attributes {
+    NC_GLOBAL {
+        String long_name "Attribute merge test";
+        Int32 primes 2, 3, 5, 7, 11;
+    }
+
+    a {
+    }
+}
diff --git a/unit-tests/dds-testsuite/test.19c.xml b/unit-tests/dds-testsuite/test.19c.xml
new file mode 100644
index 0000000..773b3bd
--- /dev/null
+++ b/unit-tests/dds-testsuite/test.19c.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset name="test.19c" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://xml.opendap.org/ns/DAP2" xsi:schemaLocation="http://xml.opendap.org/ns/DAP2 http://xml.opendap.org/dap/dap2.xsd">
+    <Attribute name="NC_GLOBAL" type="Container">
+        <Attribute name="long_name" type="String">
+            <value>Attribute merge test</value>
+        </Attribute>
+        <Attribute name="primes" type="Int32">
+            <value>2</value>
+            <value>3</value>
+            <value>5</value>
+            <value>7</value>
+            <value>11</value>
+        </Attribute>
+    </Attribute>
+    <Int32 name="a"/>
+    <dataBLOB href=""/>
+</Dataset>
diff --git a/unit-tests/dds-testsuite/test.19d b/unit-tests/dds-testsuite/test.19d
new file mode 100644
index 0000000..39ab9a2
--- /dev/null
+++ b/unit-tests/dds-testsuite/test.19d
@@ -0,0 +1,6 @@
+#
+# Test identifiers with `#' in them. 6/22/2001 jhrg
+
+Dataset {
+   Int32 b#c[10];
+} test.19d;
diff --git a/unit-tests/dds-testsuite/test.19d.das b/unit-tests/dds-testsuite/test.19d.das
new file mode 100644
index 0000000..544c7f0
--- /dev/null
+++ b/unit-tests/dds-testsuite/test.19d.das
@@ -0,0 +1,8 @@
+# This DAS is used to test merging attributes into an existing DDS. It's
+# designed to work with the DDS in test.19b.
+
+Attributes {
+    b#c {
+        String long_name "b pound c";
+    }
+}
diff --git a/unit-tests/dds-testsuite/test.19d.xml b/unit-tests/dds-testsuite/test.19d.xml
new file mode 100644
index 0000000..5a3c1ed
--- /dev/null
+++ b/unit-tests/dds-testsuite/test.19d.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset name="test.19d" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://xml.opendap.org/ns/DAP2" xsi:schemaLocation="http://xml.opendap.org/ns/DAP2 http://xml.opendap.org/dap/dap2.xsd">
+    <Array name="b#c">
+        <Attribute name="long_name" type="String">
+            <value>b pound c</value>
+        </Attribute>
+        <Int32/>
+        <dimension size="10"/>
+    </Array>
+    <dataBLOB href=""/>
+</Dataset>
diff --git a/unit-tests/dds-testsuite/test.19d1.das b/unit-tests/dds-testsuite/test.19d1.das
new file mode 100644
index 0000000..2708a76
--- /dev/null
+++ b/unit-tests/dds-testsuite/test.19d1.das
@@ -0,0 +1,11 @@
+# This DAS is used to test merging attributes into an existing DDS. It's
+# designed to work with the DDS in test.19b.
+
+Attributes {
+    b#c {
+        String long_name "b pound c";
+    }
+    b#c_dim_0 {
+        Float64 add_offset 0.125;
+    }
+}
diff --git a/unit-tests/dds-testsuite/test.19d1.xml b/unit-tests/dds-testsuite/test.19d1.xml
new file mode 100644
index 0000000..c9ad44f
--- /dev/null
+++ b/unit-tests/dds-testsuite/test.19d1.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset name="test.19d" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://xml.opendap.org/ns/DAP2" xsi:schemaLocation="http://xml.opendap.org/ns/DAP2 http://xml.opendap.org/dap/dap2.xsd">
+    <Array name="b#c">
+        <Attribute name="long_name" type="String">
+            <value>b pound c</value>
+        </Attribute>
+        <Attribute name="b#c_dim_0" type="Container">
+            <Attribute name="add_offset" type="Float64">
+                <value>0.125</value>
+            </Attribute>
+        </Attribute>
+        <Int32/>
+        <dimension size="10"/>
+    </Array>
+    <dataBLOB href=""/>
+</Dataset>
\ No newline at end of file
diff --git a/unit-tests/dds-testsuite/test.19e b/unit-tests/dds-testsuite/test.19e
new file mode 100644
index 0000000..6fe1619
--- /dev/null
+++ b/unit-tests/dds-testsuite/test.19e
@@ -0,0 +1,6 @@
+#
+# Test identifiers with `#' in them. 6/22/2001 jhrg
+
+Dataset {
+   Float64 c%20d;
+} test.19e;
diff --git a/unit-tests/dds-testsuite/test.19e.das b/unit-tests/dds-testsuite/test.19e.das
new file mode 100644
index 0000000..91ef182
--- /dev/null
+++ b/unit-tests/dds-testsuite/test.19e.das
@@ -0,0 +1,12 @@
+# This DAS is used to test merging attributes into an existing DDS. It's
+# designed to work with the DDS in test.19b.
+
+Attributes {
+    c%20d {
+        String long_name "c d with a WWW escape sequence";
+	    sub {
+	        String about "Attributes inside attributes";
+	        Float64 pi 3.1415;
+        }
+    }
+}
diff --git a/unit-tests/dds-testsuite/test.19e.xml b/unit-tests/dds-testsuite/test.19e.xml
new file mode 100644
index 0000000..b7cba51
--- /dev/null
+++ b/unit-tests/dds-testsuite/test.19e.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset name="test.19e" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://xml.opendap.org/ns/DAP2" xsi:schemaLocation="http://xml.opendap.org/ns/DAP2 http://xml.opendap.org/dap/dap2.xsd">
+    <Float64 name="c d">
+        <Attribute name="long_name" type="String">
+            <value>c d with a WWW escape sequence</value>
+        </Attribute>
+        <Attribute name="sub" type="Container">
+            <Attribute name="about" type="String">
+                <value>Attributes inside attributes</value>
+            </Attribute>
+            <Attribute name="pi" type="Float64">
+                <value>3.1415</value>
+            </Attribute>
+        </Attribute>
+    </Float64>
+    <dataBLOB href=""/>
+</Dataset>
diff --git a/unit-tests/dds-testsuite/test.19f b/unit-tests/dds-testsuite/test.19f
new file mode 100644
index 0000000..ecc435a
--- /dev/null
+++ b/unit-tests/dds-testsuite/test.19f
@@ -0,0 +1,11 @@
+#
+# Test identifiers with `#' in them. 6/22/2001 jhrg
+
+Dataset {
+   Grid {
+     Array:
+       Byte Image#data[512];
+     Maps:
+       String colors[512];
+   } huh;
+} test.19f;
diff --git a/unit-tests/dds-testsuite/test.19f.das b/unit-tests/dds-testsuite/test.19f.das
new file mode 100644
index 0000000..2d75fce
--- /dev/null
+++ b/unit-tests/dds-testsuite/test.19f.das
@@ -0,0 +1,13 @@
+# This DAS is used to test merging attributes into an existing DDS. It's
+# designed to work with the DDS in test.19b.
+
+Attributes {
+    huh {
+        String long_name "The Grid huh";
+	colors {
+	    String long_name2 "The color map vector";
+        }
+	Image#data {
+	}
+    }
+}
diff --git a/unit-tests/dds-testsuite/test.19f.xml b/unit-tests/dds-testsuite/test.19f.xml
new file mode 100644
index 0000000..c213fbd
--- /dev/null
+++ b/unit-tests/dds-testsuite/test.19f.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset name="test.19f" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://xml.opendap.org/ns/DAP2" xsi:schemaLocation="http://xml.opendap.org/ns/DAP2 http://xml.opendap.org/dap/dap2.xsd">
+    <Grid name="huh">
+        <Attribute name="long_name" type="String">
+            <value>The Grid huh</value>
+        </Attribute>
+        <Array name="Image#data">
+            <Byte/>
+            <dimension size="512"/>
+        </Array>
+        <Map name="colors">
+            <Attribute name="long_name2" type="String">
+                <value>The color map vector</value>
+            </Attribute>
+            <String/>
+            <dimension size="512"/>
+        </Map>
+    </Grid>
+    <dataBLOB href=""/>
+</Dataset>
diff --git a/unit-tests/dds-testsuite/test.19f1.das b/unit-tests/dds-testsuite/test.19f1.das
new file mode 100644
index 0000000..e8a7038
--- /dev/null
+++ b/unit-tests/dds-testsuite/test.19f1.das
@@ -0,0 +1,16 @@
+# This DAS is used to test merging attributes into an existing DDS. It's
+# designed to work with the DDS in test.19b.
+
+Attributes {
+    huh {
+        String long_name "The Grid huh";
+	colors {
+	    String long_name2 "The color map vector";
+        }
+	Image#data {
+	}
+    }
+    huh_dim_0 {
+        String units "m/s";
+    }
+}
diff --git a/unit-tests/dds-testsuite/test.19g b/unit-tests/dds-testsuite/test.19g
new file mode 100644
index 0000000..c5f6211
--- /dev/null
+++ b/unit-tests/dds-testsuite/test.19g
@@ -0,0 +1,14 @@
+#
+# Test identifiers with `#' in them. 6/22/2001 jhrg
+
+Dataset {
+   	Structure {
+   		Int32 b#c[10];
+   		Grid {
+     		Array:
+       		Byte Image#data[512];
+     		Maps:
+       		String colors[512];
+   		} huh;
+   } s;
+} test.19;
diff --git a/unit-tests/dds-testsuite/test.19g.das b/unit-tests/dds-testsuite/test.19g.das
new file mode 100644
index 0000000..40e1273
--- /dev/null
+++ b/unit-tests/dds-testsuite/test.19g.das
@@ -0,0 +1,23 @@
+# This DAS is used to test merging attributes into an existing DDS. It's
+# designed to work with the DDS in test.19b.
+
+Attributes {
+
+    b#c {
+        String long_name "b pound c";
+    }
+    b#c_dim_0 {
+        Float64 add_offset 0.125;
+    }
+    huh {
+        String long_name "The Grid huh";
+		colors {
+	    	String long_name2 "The color map vector";
+        }
+		Image#data {
+		}
+    }
+    huh_dim_0 {
+        String units "m/s";
+    }
+}
diff --git a/unit-tests/dds-testsuite/test.19g.xml b/unit-tests/dds-testsuite/test.19g.xml
new file mode 100644
index 0000000..cbf5312
--- /dev/null
+++ b/unit-tests/dds-testsuite/test.19g.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset name="test.19" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://xml.opendap.org/ns/DAP2" xsi:schemaLocation="http://xml.opendap.org/ns/DAP2 http://xml.opendap.org/dap/dap2.xsd">
+    <Attribute name="b#c" type="Container">
+        <Attribute name="long_name" type="String">
+            <value>b pound c</value>
+        </Attribute>
+    </Attribute>
+    <Attribute name="b#c_dim_0" type="Container">
+        <Attribute name="add_offset" type="Float64">
+            <value>0.125</value>
+        </Attribute>
+    </Attribute>
+    <Attribute name="huh" type="Container">
+        <Attribute name="long_name" type="String">
+            <value>The Grid huh</value>
+        </Attribute>
+        <Attribute name="colors" type="Container">
+            <Attribute name="long_name2" type="String">
+                <value>The color map vector</value>
+            </Attribute>
+        </Attribute>
+        <Attribute name="Image#data" type="Container"/>
+    </Attribute>
+    <Attribute name="huh_dim_0" type="Container">
+        <Attribute name="units" type="String">
+            <value>m/s</value>
+        </Attribute>
+    </Attribute>
+    <Structure name="s">
+        <Array name="b#c">
+            <Int32/>
+            <dimension size="10"/>
+        </Array>
+        <Grid name="huh">
+            <Array name="Image#data">
+                <Byte/>
+                <dimension size="512"/>
+            </Array>
+            <Map name="colors">
+                <String/>
+                <dimension size="512"/>
+            </Map>
+        </Grid>
+    </Structure>
+    <dataBLOB href=""/>
+</Dataset>
\ No newline at end of file
diff --git a/unit-tests/dds-testsuite/test.2 b/unit-tests/dds-testsuite/test.2
new file mode 100644
index 0000000..f262371
--- /dev/null
+++ b/unit-tests/dds-testsuite/test.2
@@ -0,0 +1,4 @@
+Dataset {
+    Int32 i[10];
+    Int32 j[20];
+} data2;
diff --git a/unit-tests/dds-testsuite/test.20 b/unit-tests/dds-testsuite/test.20
new file mode 100644
index 0000000..c02f7bb
--- /dev/null
+++ b/unit-tests/dds-testsuite/test.20
@@ -0,0 +1,12 @@
+#
+# Test identifiers with '*' in them. 6/22/2001 jhrg
+
+Dataset {
+   Int32 a;
+   Grid {
+     Array:
+       Byte Image#data[size*10=512];
+     Maps:
+       String colors[size*10=512];
+   } huh;
+} test.20;
diff --git a/unit-tests/dds-testsuite/test.3 b/unit-tests/dds-testsuite/test.3
new file mode 100644
index 0000000..11491a7
--- /dev/null
+++ b/unit-tests/dds-testsuite/test.3
@@ -0,0 +1,4 @@
+Dataset {
+    Int32 i[10];
+    Float64 f[20];
+} data3;
diff --git a/unit-tests/dds-testsuite/test.4 b/unit-tests/dds-testsuite/test.4
new file mode 100644
index 0000000..0f69969
--- /dev/null
+++ b/unit-tests/dds-testsuite/test.4
@@ -0,0 +1,6 @@
+dataset {
+    int32 i;
+    byte b;
+    String s;
+    url u;
+} data4;
diff --git a/unit-tests/dds-testsuite/test.6 b/unit-tests/dds-testsuite/test.6
new file mode 100644
index 0000000..1b9285d
--- /dev/null
+++ b/unit-tests/dds-testsuite/test.6
@@ -0,0 +1,6 @@
+dataset {
+    Structure {
+	Int32 j;
+	Int32 i;
+    } exp;
+} data6;
diff --git a/unit-tests/dds-testsuite/test.7 b/unit-tests/dds-testsuite/test.7
new file mode 100644
index 0000000..325934a
--- /dev/null
+++ b/unit-tests/dds-testsuite/test.7
@@ -0,0 +1,10 @@
+dataset {
+    Structure {
+	Int32 j;
+	Int32 i;
+	Structure {
+	    int32 i;
+	    float64 f[10];
+	} data;
+    } exp;
+} data6;
diff --git a/unit-tests/dds-testsuite/test.8 b/unit-tests/dds-testsuite/test.8
new file mode 100644
index 0000000..a19c747
--- /dev/null
+++ b/unit-tests/dds-testsuite/test.8
@@ -0,0 +1,14 @@
+dataset {
+    Sequence {
+	String name;
+	Int32 age;
+    } person;
+    Structure {
+	Int32 j;
+	Int32 i;
+	Structure {
+	    int32 i;
+	    float64 f[10];
+	} data;
+    } exp;
+} data6;
diff --git a/unit-tests/dds-testsuite/test.9 b/unit-tests/dds-testsuite/test.9
new file mode 100644
index 0000000..335d15f
--- /dev/null
+++ b/unit-tests/dds-testsuite/test.9
@@ -0,0 +1,22 @@
+dataset {
+    Sequence {
+	String name;
+	Int32 age;
+    } person;
+    Structure {
+	Int32 j;
+	Int32 i;
+	Structure {
+	    int32 i;
+	    float64 f[10];
+	} data;
+    } exp;
+    Grid {
+      Array:
+	float64 g[10][10][10];
+      Maps:
+	float64 lat[10];
+	float64 lon[10];
+	float64 weirdness[10];
+    } strange;
+} data6;
diff --git a/unit-tests/ddsT.cc b/unit-tests/ddsT.cc
new file mode 100644
index 0000000..05b1db6
--- /dev/null
+++ b/unit-tests/ddsT.cc
@@ -0,0 +1,639 @@
+#include <cppunit/TestFixture.h>
+#include <cppunit/TestAssert.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+#include <cppunit/ui/text/TestRunner.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/CompilerOutputter.h>
+
+#include <iostream>
+#include <fstream>
+#include <sstream>
+
+// #define DODS_DEBUG
+
+#include "DDS.h"
+//#include "Pix.h"
+#include "Byte.h"
+#include "Int16.h"
+#include "UInt16.h"
+#include "Int32.h"
+#include "UInt32.h"
+#include "Float32.h"
+#include "Float64.h"
+#include "Str.h"
+#include "Url.h"
+#include "Array.h"
+#include "Structure.h"
+#include "Sequence.h"
+#include "Grid.h"
+
+#include "TestArray.h"
+#include "TestInt16.h"
+#include "TestStr.h"
+#include "TestTypeFactory.h"
+//#include "ce_functions.h"
+#include "util.h"
+#include "debug.h"
+
+#include "testFile.h"
+#include "GetOpt.h"
+
+using namespace CppUnit;
+using namespace std;
+using namespace libdap;
+
+static bool debug = false;
+
+int test_variable_sleep_interval = 0; // Used in Test* classes for testing
+// timeouts.
+string cprint =
+    "\
+Dataset {\n\
+    Int16 var1;\n\
+    String var6;\n\
+    Int16 var7;\n\
+    Structure {\n\
+        Structure {\n\
+            Int16 var10;\n\
+        } var9;\n\
+    } var8;\n\
+} Test%20Data%20Set;\n\
+";
+
+string pprint = "\
+Dataset {\n\
+    Int16 var1;\n\
+    String var6;\n\
+    Int16 var7;\n\
+} Test%20Data%20Set;\n\
+";
+
+string nprint = "\
+Dataset {\n\
+} Test%20Data%20Set;\n\
+";
+
+string containerprint =
+    "\
+Dataset {\n\
+    Structure {\n\
+        Int16 c1var1;\n\
+        Int16 c1var3;\n\
+    } c1;\n\
+    Structure {\n\
+        String c2var2;\n\
+        Structure {\n\
+            Structure {\n\
+                Int16 c2var3var1var1;\n\
+                Int16 c2var3var1var2;\n\
+            } c2var3var1;\n\
+        } c2var3;\n\
+    } c2;\n\
+    Byte var1;\n\
+    Float64 var2;\n\
+} TestDDS;\n\
+";
+
+class ddsT: public CppUnit::TestFixture {
+
+    CPPUNIT_TEST_SUITE (ddsT);
+    CPPUNIT_TEST (ddsT_test);
+    CPPUNIT_TEST (ddsT_containers);CPPUNIT_TEST_SUITE_END( );
+
+private:
+    /* TEST PRIVATE DATA */
+    TestTypeFactory *factory;
+
+public:
+    void setUp()
+    {
+        factory = new TestTypeFactory;
+    }
+
+    void tearDown()
+    {
+        delete factory;
+        factory = 0;
+    }
+
+    void ddsT_test()
+    {
+        DDS dds(factory, "TestDDS");
+
+        string dsn = dds.get_dataset_name();
+        CPPUNIT_ASSERT(dsn == "TestDDS");
+
+        dds.set_dataset_name("Test Data Set");
+        dsn = dds.get_dataset_name();
+        CPPUNIT_ASSERT(dsn == "Test Data Set");
+
+        string fn = dds.filename();
+        CPPUNIT_ASSERT(fn == "");
+
+        dds.filename("dds_test.data");
+        fn = dds.filename();
+        CPPUNIT_ASSERT(fn == "dds_test.data");
+
+        try {
+            dds.add_var((BaseType *) NULL);
+            CPPUNIT_FAIL("succeeded in adding a null var");
+        }
+        catch (InternalErr &e) {
+        }
+
+        try {
+            BaseType *bt = factory->NewInt16("var1");
+            dds.add_var(bt);
+            delete bt;
+            bt = factory->NewInt16("var2");
+            dds.add_var(bt);
+            delete bt;
+            bt = factory->NewInt16("var3");
+            dds.add_var(bt);
+            delete bt;
+            bt = factory->NewInt16("var4");
+            dds.add_var(bt);
+            delete bt;
+            bt = factory->NewInt16("var5");
+            dds.add_var(bt);
+            delete bt;
+            bt = factory->NewStr("var6");
+            dds.add_var(bt);
+            delete bt;
+            BaseType *tbt = factory->NewInt16("");
+            bt = factory->NewArray("var7", tbt);
+            delete tbt;
+            tbt = 0;
+            dds.add_var(bt);
+            delete bt;
+            bt = factory->NewStructure("var8");
+            Structure *s = (Structure *) bt;
+            BaseType *bts1 = factory->NewStructure("var9");
+            Structure *s1 = (Structure *) bts1;
+            BaseType *bts2 = factory->NewInt16("var10");
+            s1->add_var(bts2);
+            delete bts2;
+            bts2 = 0;
+            s->add_var(bts1);
+            delete bts1;
+            bts1 = 0;
+            dds.add_var(bt);
+            delete bt;
+            bt = 0;
+        }
+        catch (InternalErr &e) {
+            CPPUNIT_FAIL("failed to add a var");
+        }
+
+        int nv = dds.num_var();
+        CPPUNIT_ASSERT(nv == 8);
+
+        vector<string> vs;
+        typedef std::vector<string>::const_iterator vs_citer;
+        typedef std::vector<string>::iterator vs_iter;
+        vs.push_back("var1");
+        vs.push_back("var2");
+        vs.push_back("var3");
+        vs.push_back("var4");
+        vs.push_back("var5");
+        vs.push_back("var6");
+        vs.push_back("var7");
+        vs.push_back("var8");
+
+        DDS::Vars_iter dvsc = dds.var_begin();
+        vs_citer vsc = vs.begin();
+        for (; dvsc != dds.var_end() && vsc != vs.end(); dvsc++, vsc++) {
+            CPPUNIT_ASSERT((*dvsc)->name() == *vsc);
+        }
+        CPPUNIT_ASSERT(dvsc == dds.var_end() && vsc == vs.end());
+        if (dvsc != dds.var_end() && vsc == vs.end()) {
+            CPPUNIT_FAIL("Too many vars");
+        }
+        else if (dvsc == dds.var_end() && vsc != vs.end()) {
+            CPPUNIT_FAIL("Too few vars");
+        }
+
+        for (vsc = vs.begin(); vsc != vs.end(); vsc++) {
+            if (*vsc == "var2") {
+                vs_iter &vsi = (vs_iter &) vsc;
+                vs.erase(vsi);
+                break;
+            }
+        }
+
+        dvsc = dds.var_begin();
+        vsc = vs.begin();
+        for (; dvsc != dds.var_end() && vsc != vs.end(); dvsc++, vsc++) {
+            if ((*dvsc)->name() == "var2") {
+                DDS::Vars_iter &dvsi = (DDS::Vars_iter &) dvsc;
+                dds.del_var(dvsi);
+            }
+            CPPUNIT_ASSERT((*dvsc)->name() == *vsc);
+        }
+
+        nv = dds.num_var();
+        CPPUNIT_ASSERT(nv == 7);
+        if (nv != 7) {
+            for (dvsc = dds.var_begin(); dvsc != dds.var_end(); dvsc++) {
+                DBG2( cerr << "    " << (*dvsc)->name() << endl ) ;
+            }
+        }
+
+        for (vsc = vs.begin(); vsc != vs.end(); vsc++) {
+            if (*vsc == "var3") {
+                vs_iter &vsi = (vs_iter &) vsc;
+                vs.erase(vsi);
+                break;
+            }
+        }
+        dvsc = dds.var_begin();
+        vsc = vs.begin();
+        for (; dvsc != dds.var_end() && vsc != vs.end(); dvsc++, vsc++) {
+            if ((*dvsc)->name() == "var3") {
+                DDS::Vars_iter &dvsi = (DDS::Vars_iter &) dvsc;
+                dds.del_var(dvsi);
+            }
+            CPPUNIT_ASSERT((*dvsc)->name() == *vsc);
+        }
+
+        nv = dds.num_var();
+        CPPUNIT_ASSERT(nv == 6);
+        if (nv != 6) {
+            for (dvsc = dds.var_begin(); dvsc != dds.var_end(); dvsc++) {
+                DBG2( cerr << "    " << (*dvsc)->name() << endl ) ;
+            }
+        }
+
+        for (vsc = vs.begin(); vsc != vs.end(); vsc++) {
+            if (*vsc == "var4") {
+                vs_citer vsc2 = vsc;
+                vsc2++;
+                vsc2++;
+                vs_iter &vsi = (vs_iter &) vsc;
+                vs_iter &vsi2 = (vs_iter &) vsc2;
+                vs.erase(vsi, vsi2);
+                break;
+            }
+        }
+        dvsc = dds.var_begin();
+        vsc = vs.begin();
+        for (; dvsc != dds.var_end() && vsc != vs.end(); dvsc++, vsc++) {
+            if ((*dvsc)->name() == "var4") {
+                DDS::Vars_iter dvsc2 = dvsc;
+                dvsc2++;
+                dvsc2++;
+                DDS::Vars_iter &dvsi = (DDS::Vars_iter &) dvsc;
+                DDS::Vars_iter &dvsi2 = (DDS::Vars_iter &) dvsc2;
+                dds.del_var(dvsi, dvsi2);
+            }
+            CPPUNIT_ASSERT((*dvsc)->name() == *vsc);
+        }
+
+        nv = dds.num_var();
+        CPPUNIT_ASSERT(nv == 4);
+        if (nv != 4) {
+            for (dvsc = dds.var_begin(); dvsc != dds.var_end(); dvsc++) {
+                DBG2( cerr << "    " << (*dvsc)->name() << endl ) ;
+            }
+        }
+
+        BaseType *bt = dds.var("varnot");
+        CPPUNIT_ASSERT(!bt);
+
+        bt = dds.var("var6");
+        CPPUNIT_ASSERT(bt);
+        if (bt) {
+            CPPUNIT_ASSERT(bt->name() == "var6");
+        }
+
+        string find_var = "var6";
+        bt = dds.var(find_var);
+        CPPUNIT_ASSERT(bt);
+        if (bt) {
+            CPPUNIT_ASSERT(bt->name() == "var6");
+        }
+
+        find_var = "var10";
+        bt = dds.var(find_var);
+        CPPUNIT_ASSERT(bt);
+        if (bt) {
+            CPPUNIT_ASSERT(bt->name() == "var10");
+        }
+
+        find_var = "var10";
+        BaseType::btp_stack btps;
+        bt = dds.var(find_var, &btps);
+        CPPUNIT_ASSERT(bt);
+        if (bt) {
+            CPPUNIT_ASSERT(bt->name() == "var10");
+            if (bt->name() == "var10") {
+                CPPUNIT_ASSERT(btps.size() == 2);
+                if (btps.size() == 2) {
+                    CPPUNIT_ASSERT(btps.top()->name() == "var8");
+                    btps.pop();
+                    CPPUNIT_ASSERT(btps.top()->name() == "var9");
+                    btps.pop();
+                }
+            }
+        }
+
+        find_var = "var8.var9.var10";
+        bt = dds.var(find_var, &btps);
+        CPPUNIT_ASSERT(bt);
+        if (bt) {
+            CPPUNIT_ASSERT(bt->name() == "var10");
+            if (bt->name() == "var10") {
+                CPPUNIT_ASSERT(btps.size() == 2);
+                if (btps.size() == 2) {
+                    CPPUNIT_ASSERT(btps.top()->name() == "var9");
+                    btps.pop();
+                    CPPUNIT_ASSERT(btps.top()->name() == "var8");
+                    btps.pop();
+                }
+            }
+        }
+
+        {
+            ostringstream sof;
+            dds.print(sof);
+            CPPUNIT_ASSERT(sof.str().find(cprint) != string::npos);
+        }
+
+        {
+            ostringstream sof;
+            dds.print_constrained(sof);
+            CPPUNIT_ASSERT(sof.str().find(nprint) != string::npos);
+        }
+
+        dds.mark_all(true);
+
+        {
+            ostringstream sof;
+            dds.print_constrained(sof);
+            CPPUNIT_ASSERT(sof.str().find(cprint) != string::npos);
+        }
+
+        bool mark_ret = dds.mark("var8", false);
+        CPPUNIT_ASSERT(mark_ret == true);
+
+        {
+            ostringstream sof;
+            dds.print_constrained(sof);
+            CPPUNIT_ASSERT(sof.str().find(pprint) != string::npos);
+        }
+    }
+
+    void ddsT_containers()
+    {
+        DDS dds(factory, "TestDDS");
+
+        // set the container to c1 and make sure the container is created
+        dds.container_name("c1");
+        CPPUNIT_ASSERT(dds.container_name() == "c1");
+
+        Structure *c1 = dds.container();
+        CPPUNIT_ASSERT(c1);
+        CPPUNIT_ASSERT(c1->name() == "c1");
+
+        CPPUNIT_ASSERT(dds.num_var() == 1);
+
+        // set the container to c2 and make sure the container is created
+        dds.container_name("c2");
+        CPPUNIT_ASSERT(dds.container_name() == "c2");
+
+        Structure *c2 = dds.container();
+        CPPUNIT_ASSERT(c2);
+        CPPUNIT_ASSERT(c2->name() == "c2");
+
+        CPPUNIT_ASSERT(dds.num_var() == 2);
+
+        // set back to c1, make sure new one not created
+        dds.container_name("c1");
+        CPPUNIT_ASSERT(dds.container_name() == "c1");
+
+        c1 = dds.container();
+        CPPUNIT_ASSERT(c1);
+        CPPUNIT_ASSERT(c1->name() == "c1");
+
+        CPPUNIT_ASSERT(dds.num_var() == 2);
+
+        // start adding variables and make sure not added directly to dds.
+        // Make sure can find those variables without referencing the
+        // container.
+        try {
+            BaseType *bt = factory->NewInt16("c1var1");
+            dds.add_var(bt);
+            delete bt;
+            bt = factory->NewStr("c1var2");
+            dds.add_var(bt);
+            delete bt;
+            BaseType *tbt = factory->NewInt16("");
+            bt = factory->NewArray("c1var3", tbt);
+            delete tbt;
+            tbt = 0;
+            dds.add_var(bt);
+            delete bt;
+        }
+        catch (InternalErr &e) {
+            CPPUNIT_FAIL("failed to add a var");
+        }
+        CPPUNIT_ASSERT(dds.num_var() == 2);
+        CPPUNIT_ASSERT(c1->element_count() == 3);
+
+        BaseType *bt = dds.var("c1var1");
+        CPPUNIT_ASSERT(bt);
+        CPPUNIT_ASSERT(bt->name() == "c1var1");
+        Int16 *ibt = dynamic_cast<Int16 *>(bt);
+        CPPUNIT_ASSERT(ibt);
+
+        bt = dds.var("c1var2");
+        CPPUNIT_ASSERT(bt);
+        CPPUNIT_ASSERT(bt->name() == "c1var2");
+        Str *strbt = dynamic_cast<Str *>(bt);
+        CPPUNIT_ASSERT(strbt);
+
+        dds.del_var("c1var2");
+        bt = dds.var("c1var2");
+        CPPUNIT_ASSERT(bt == 0);
+        CPPUNIT_ASSERT(dds.num_var() == 2);
+        CPPUNIT_ASSERT(c1->element_count() == 2);
+
+        // set container to "", add vars, make sure added directly to dds.
+        // Make sure can find those variables
+        dds.container_name("");
+        CPPUNIT_ASSERT(dds.container_name() == "");
+        CPPUNIT_ASSERT(dds.container() == 0);
+        try {
+            BaseType *bt = factory->NewByte("var1");
+            dds.add_var(bt);
+            delete bt;
+            bt = factory->NewFloat64("var2");
+            dds.add_var(bt);
+            delete bt;
+            bt = factory->NewUInt32("var3");
+            dds.add_var(bt);
+            delete bt;
+        }
+        catch (InternalErr &e) {
+            CPPUNIT_FAIL("failed to add a var");
+        }
+        CPPUNIT_ASSERT(dds.num_var() == 5);
+        CPPUNIT_ASSERT(c1->element_count() == 2);
+
+        BaseType::btp_stack btps;
+        bt = dds.var("c1var1", btps);
+        CPPUNIT_ASSERT(bt && bt->name() == "c1var1");
+        CPPUNIT_ASSERT(btps.size() == 1);
+        BaseType *btp = btps.top();
+        CPPUNIT_ASSERT(btp && btp->name() == "c1");
+        btps.pop();
+
+        bt = dds.var("var1");
+        CPPUNIT_ASSERT(bt);
+        CPPUNIT_ASSERT(bt->name() == "var1");
+        Byte *bbt = dynamic_cast<Byte *>(bt);
+        CPPUNIT_ASSERT(bbt);
+
+        bt = c1->var("var1");
+        CPPUNIT_ASSERT(bt == 0);
+
+        dds.del_var("var3");
+        bt = dds.var("var3");
+        CPPUNIT_ASSERT(bt == 0);
+        CPPUNIT_ASSERT(dds.num_var() == 4);
+        CPPUNIT_ASSERT(c1->element_count() == 2);
+
+        // set to c2, add variables and make sure not added directly to dds.
+        // Make sure can find those variables without referencing the
+        // container.
+        dds.container_name("c2");
+        CPPUNIT_ASSERT(dds.container_name() == "c2");
+        c2 = dds.container();
+        CPPUNIT_ASSERT(c2 && c2->name() == "c2");
+
+        try {
+            BaseType *bt = factory->NewInt32("c2var1");
+            dds.add_var(bt);
+            delete bt;
+            bt = factory->NewStr("c2var2");
+            dds.add_var(bt);
+            delete bt;
+            Structure *s = factory->NewStructure("c2var3");
+            Structure *s1 = factory->NewStructure("c2var3var1");
+            bt = factory->NewInt16("c2var3var1var1");
+            s1->add_var(bt);
+            delete bt;
+            bt = 0;
+            bt = factory->NewInt16("c2var3var1var2");
+            s1->add_var(bt);
+            delete bt;
+            bt = 0;
+            s->add_var(s1);
+            delete s1;
+            s1 = 0;
+            dds.add_var(s);
+            delete s;
+            s = 0;
+        }
+        catch (InternalErr &e) {
+            CPPUNIT_FAIL("failed to add a var");
+        }
+        CPPUNIT_ASSERT(dds.num_var() == 4);
+        CPPUNIT_ASSERT(c2->element_count() == 3);
+
+        bt = dds.var("c2var1");
+        CPPUNIT_ASSERT(bt && bt->name() == "c2var1");
+        Int32 *i32bt = dynamic_cast<Int32 *>(bt);
+        CPPUNIT_ASSERT(i32bt);
+
+        bt = dds.var("c2var2");
+        CPPUNIT_ASSERT(bt && bt->name() == "c2var2");
+        strbt = dynamic_cast<Str *>(bt);
+        CPPUNIT_ASSERT(strbt);
+
+        bt = dds.var("c2var3");
+        CPPUNIT_ASSERT(bt && bt->name() == "c2var3");
+        Structure *sbt = dynamic_cast<Structure *>(bt);
+        CPPUNIT_ASSERT(sbt);
+
+        bt = dds.var("var1");
+        CPPUNIT_ASSERT(bt == 0);
+
+        bt = dds.var("var2");
+        CPPUNIT_ASSERT(bt == 0);
+
+        bt = dds.var("c2var3var1var2", btps);
+        CPPUNIT_ASSERT(bt && bt->name() == "c2var3var1var2");
+        CPPUNIT_ASSERT(btps.size() == 3);
+        btp = btps.top();
+        CPPUNIT_ASSERT(btp && btp->name() == "c2");
+        btps.pop();
+        btp = btps.top();
+        CPPUNIT_ASSERT(btp && btp->name() == "c2var3");
+        btps.pop();
+        btp = btps.top();
+        CPPUNIT_ASSERT(btp && btp->name() == "c2var3var1");
+        btps.pop();
+
+        dds.del_var("c2var1");
+        bt = dds.var("c2var1");
+        CPPUNIT_ASSERT(bt == 0);
+        CPPUNIT_ASSERT(dds.num_var() == 4);
+        CPPUNIT_ASSERT(c2->element_count() == 2);
+
+        // print the dds and make sure it looks good.
+        ostringstream sstrm;
+        dds.print(sstrm);
+        cout << sstrm.str() << endl;
+        CPPUNIT_ASSERT(sstrm.str() == containerprint);
+    }
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION (ddsT);
+
+/* NOTHING NEEDS TO BE CHANGED BELOW HERE */
+
+int main(int argc, char*argv[])
+{
+    GetOpt getopt(argc, argv, "dh");
+    int option_char;
+
+    while ((option_char = getopt()) != -1)
+        switch (option_char) {
+        case 'd':
+            debug = 1;  // debug is a static global
+            break;
+        case 'h': {     // help - show test names
+            cerr << "Usage: ddsT has the following tests:" << endl;
+            const std::vector<Test*> &tests = ddsT::suite()->getTests();
+            unsigned int prefix_len = ddsT::suite()->getName().append("::").length();
+            for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+                cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+            }
+            break;
+        }
+        default:
+            break;
+        }
+
+    CppUnit::TextTestRunner runner;
+    runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
+    bool wasSuccessful = true;
+    string test = "";
+    int i = getopt.optind;
+    if (i == argc) {
+        // run them all
+        wasSuccessful = runner.run("");
+    }
+    else {
+        for (; i < argc; ++i) {
+            if (debug) cerr << "Running " << argv[i] << endl;
+            test = ddsT::suite()->getName().append("::").append(argv[i]);
+            wasSuccessful = wasSuccessful && runner.run(test);
+        }
+    }
+
+    return wasSuccessful ? 0 : 1;
+}
+
diff --git a/unit-tests/ddx-testsuite/D1.ddx b/unit-tests/ddx-testsuite/D1.ddx
new file mode 100644
index 0000000..d0df266
--- /dev/null
+++ b/unit-tests/ddx-testsuite/D1.ddx
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Dataset name="EOSDB.DBO"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xmlns="http://www.dods.org/ns/DODS"
+xsi:schemaLocation="http://www.dods.org/ns/DODS  http://dods.coas.oregonstate.edu:8080/dods/dods.xsd" >
+
+	<Attribute name="_location" type="Container">
+		<Attribute name="Description" type="String">
+			<value>&quot;String describing general location (southern ocean,oregon coast, etc.) of drifter deployment.&quot;</value>
+		</Attribute>
+	</Attribute>
+
+	<Sequence name="Drifters">
+		<String name="instrument_id"/>
+		<String name="location"/>
+		<Float64 name="latitude"/>
+		<Float64 name="longitude"/>
+	</Sequence>
+
+	<dataBLOB href="http://dods.coas.oregonstate.edu:8080/dods/dts/D1.blob"/>
+</Dataset>
diff --git a/unit-tests/ddx-testsuite/DDX_from_dataddx.xml b/unit-tests/ddx-testsuite/DDX_from_dataddx.xml
new file mode 100644
index 0000000..9cd28e7
--- /dev/null
+++ b/unit-tests/ddx-testsuite/DDX_from_dataddx.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Dataset name="fnoc1.nc"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://xml.OPeNDAP.org/ns/DAP/3.2#
+http://xml.OPeNDAP.org/dap/dap/3.2.xsd"
+xmlns:grddl="http://www.w3.org/2003/g/data-view#"
+grddl:transformation="http://xml.OPeNDAP.org/transforms/ddxToRdfTriples.xsl"
+xmlns="http://xml.OPeNDAP.org/ns/DAP/3.2#"
+xmlns:dap="http://xml.OPeNDAP.org/ns/DAP/3.2#"
+dap_version="3.2">
+    <Attribute name="NC_GLOBAL" type="Container">
+        <Attribute name="base_time" type="String">
+            <value>88- 10-00:00:00</value>
+        </Attribute>
+        <Attribute name="title" type="String">
+            <value> FNOC UV wind components from 1988- 10 to 1988-
+13.</value>
+        </Attribute>
+    </Attribute>
+    <Attribute name="DODS_EXTRA" type="Container">
+        <Attribute name="Unlimited_Dimension" type="String">
+            <value>time_a</value>
+        </Attribute>
+    </Attribute>
+
+    <Structure name="c">
+        <Array name="lat">
+            <Attribute name="units" type="String">
+                <value>degree North</value>
+            </Attribute>
+            <Float32/>
+            <dimension name="lat" size="17"/>
+        </Array>
+    </Structure>
+
+    <blob href="cid:4E58F56D-A77E-444B-9528-586AA1309FD4@OPeNDAP.org"/>
+</Dataset>
diff --git a/unit-tests/ddx-testsuite/EOSDB.ddx b/unit-tests/ddx-testsuite/EOSDB.ddx
new file mode 100644
index 0000000..f2b68b9
--- /dev/null
+++ b/unit-tests/ddx-testsuite/EOSDB.ddx
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Dataset name="EOSDB"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xmlns="http://www.dods.org/ns/DODS"
+xsi:schemaLocation="http://www.dods.org/ns/DODS  http://dods.coas.oregonstate.edu:8080/dods/dods.xsd" >
+
+	<Attribute name="Facility" type="Container">
+		<Attribute name="PrincipleInvestigator" type="String">
+			<value>&quot;Mark Abbott&quot;</value>
+		</Attribute>
+		<Attribute name="DataCenter" type="String">
+			<value>&quot;COAS Environmental Computer Facility&quot;</value>
+		</Attribute>
+	</Attribute>
+	<Attribute name="LON" type="Container">
+		<Attribute name="units" type="String">
+			<value>&quot;degrees_east&quot;</value>
+		</Attribute>
+		<Attribute name="modulo" type="String">
+			<value>&quot; &quot;</value>
+		</Attribute>
+		<Attribute name="point_spacing" type="String">
+			<value>&quot;even&quot;</value>
+		</Attribute>
+	</Attribute>
+	<Attribute name="LAT" type="Container">
+		<Attribute name="units" type="String">
+			<value>&quot;degrees_north&quot;</value>
+		</Attribute>
+		<Attribute name="point_spacing" type="String">
+			<value>&quot;even&quot;</value>
+		</Attribute>
+	</Attribute>
+	<Attribute name="TIME" type="Container">
+		<Attribute name="units" type="String">
+			<value>&quot;days since 1700-01-01 00:00:00&quot;</value>
+		</Attribute>
+		<Attribute name="time_origin" type="String">
+			<value>&quot;1-JAN-1700&quot;</value>
+		</Attribute>
+		<Attribute name="point_spacing" type="String">
+			<value>&quot;uneven&quot;</value>
+		</Attribute>
+		<Attribute name="edges" type="String">
+			<value>&quot;TIMEedges&quot;</value>
+		</Attribute>
+	</Attribute>
+	<Attribute name="TIMEedges" type="Container">
+		<Attribute name="edges" type="String">
+			<value>&quot; &quot;</value>
+		</Attribute>
+	</Attribute>
+	<Attribute name="SST" type="Container">
+		<Attribute name="missing_value" type="Float64">
+			<value>-9.9999998e+33</value>
+		</Attribute>
+		<Attribute name="_FillValue" type="Float64">
+			<value>-9.9999998e+33</value>
+		</Attribute>
+		<Attribute name="long_name" type="String">
+			<value>&quot;Sea Surface Temperature&quot;</value>
+		</Attribute>
+		<Attribute name="history" type="String">
+			<value>&quot;From all_coads_grid&quot;</value>
+		</Attribute>
+		<Attribute name="units" type="String">
+			<value>&quot;deg C&quot;</value>
+		</Attribute>
+	</Attribute>
+	<Attribute name="NC_GLOBAL" type="Container">
+		<Attribute name="history" type="String">
+			<value>&quot;FERRET V4.11 (debug/no GUI) 19-Nov-95FERRET V4.20 (debug/no GUI) 12-Mar-96&quot;</value>
+		</Attribute>
+		<Attribute name="title" type="String">
+			<value>&quot;COADS Surface Marine Observations (1854-1993)&quot;</value>
+		</Attribute>
+	</Attribute>
+
+	<Sequence name="Abbott_Image_Data">
+		<String name="Image_Name"/>
+		<String name="Date_Sampled"/>
+		<Float64 name="North_Latitude"/>
+		<Float64 name="South_Latitude"/>
+		<Float64 name="West_Longitude"/>
+		<Float64 name="East_Longitude"/>
+		<String name="Version"/>
+		<Int32 name="Julian_Date"/>
+		<String name="PI"/>
+		<String name="Algorithm_Code"/>
+		<String name="Project"/>
+		<String name="Comments"/>
+	</Sequence>
+	<Sequence name="Sat_Images">
+		<String name="Image_Name"/>
+		<String name="Date_Sampled"/>
+		<Float64 name="North_Latitude"/>
+		<Float64 name="South_Latitude"/>
+		<Float64 name="West_Longitude"/>
+		<Float64 name="East_Longintude"/>
+		<String name="Version"/>
+		<String name="Satellite"/>
+		<String name="Instrument"/>
+		<String name="Channel"/>
+		<String name="Resolution"/>
+		<Int32 name="Image_Size"/>
+		<String name="Image_Type"/>
+		<Int32 name="Image_Bits_Per_Pixel"/>
+		<Int32 name="Image_Width"/>
+		<Int32 name="Image_Height"/>
+		<Array name="Image">
+			<Byte/>
+			<dimension size="1000"/>
+		</Array>
+		<Int32 name="Raw_Image_Size"/>
+		<Array name="Raw_Image_Data">
+			<Byte/>
+			<dimension size="1000"/>
+		</Array>
+		<Int32 name="Year"/>
+		<String name="Month"/>
+		<Int32 name="Day"/>
+		<Int32 name="Hour"/>
+	</Sequence>
+	<Sequence name="Drifters">
+		<String name="Instrument_ID"/>
+		<Float64 name="Battery"/>
+		<Float64 name="Checksum"/>
+		<Float64 name="Date_Age"/>
+		<Float64 name="Ed490"/>
+		<Float64 name="Ed490_stdev"/>
+		<Float64 name="Latitude"/>
+		<Float64 name="Longitude"/>
+		<Float64 name="Lu412"/>
+		<Float64 name="Lu412_stdev"/>
+		<Float64 name="Lu443"/>
+		<Float64 name="Lu443_stdev"/>
+		<Float64 name="Lu490"/>
+		<Float64 name="Lu490_stdev"/>
+		<Float64 name="Lu510"/>
+		<Float64 name="Lu510_stdev"/>
+		<Float64 name="Lu555"/>
+		<Float64 name="Lu555_stdev"/>
+		<Float64 name="Lu670"/>
+		<Float64 name="Lu670_stdev"/>
+		<Float64 name="Lu683"/>
+		<Float64 name="Lu683_stdev"/>
+		<Float64 name="Max_Depth"/>
+		<Float64 name="Night_Len"/>
+		<Float64 name="Number_Samples"/>
+		<Float64 name="Num_Aves"/>
+		<Float64 name="Press_Volts"/>
+		<Float64 name="Sea_Surface_Temperature"/>
+		<Float64 name="Sub_Wait"/>
+		<Float64 name="Surf_Volts"/>
+		<Float64 name="Surface_Average"/>
+		<Float64 name="Surface_Percent"/>
+		<Float64 name="Julian_Greenwich"/>
+		<Float64 name="Sun_Angle"/>
+		<Int32 name="Optical_Flag"/>
+		<Int32 name="Sampling_Flag"/>
+		<Int32 name="Tracking_Flag"/>
+		<Int32 name="Hand_Checked_Flag"/>
+		<Float64 name="Julian_Local_Time"/>
+		<String name="Date_Greenwich"/>
+		<String name="Date_Local_Time"/>
+		<String name="DateStamp"/>
+		<String name="algo_code"/>
+		<Int32 name="GPS_hour"/>
+		<Float64 name="GPS_lat"/>
+		<Float64 name="GPS_lon"/>
+		<Float64 name="rel1_lat"/>
+		<Float64 name="rel1_lon"/>
+		<Float64 name="rel2_lat"/>
+		<Float64 name="rel2_lon"/>
+		<Int32 name="time_to_1st_fix"/>
+		<Int32 name="message_ID"/>
+		<Int32 name="max_GPS_volt"/>
+	</Sequence>
+	<Sequence name="Instrument">
+		<String name="Instrument_ID"/>
+		<String name="Instrument_Type"/>
+		<String name="Sensor_Platform_ID"/>
+		<String name="Comment"/>
+	</Sequence>
+
+	<dataBLOB href="http://dods.coas.oregonstate.edu:8080/dods/dts/EOSDB.blob"/>
+</Dataset>
diff --git a/unit-tests/ddx-testsuite/dataddx_without_top_headers.dap b/unit-tests/ddx-testsuite/dataddx_without_top_headers.dap
new file mode 100644
index 0000000..5d3d618
Binary files /dev/null and b/unit-tests/ddx-testsuite/dataddx_without_top_headers.dap differ
diff --git a/unit-tests/ddx-testsuite/error.01.ddx b/unit-tests/ddx-testsuite/error.01.ddx
new file mode 100644
index 0000000..90646fb
--- /dev/null
+++ b/unit-tests/ddx-testsuite/error.01.ddx
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Dataset name="SimpleTypes">
+
+    <BYTE name="b1"/>
+
+    <dataBLOB href="huh.blob"/>
+</Dataset>
diff --git a/unit-tests/ddx-testsuite/error.02.ddx b/unit-tests/ddx-testsuite/error.02.ddx
new file mode 100644
index 0000000..59b27c9
--- /dev/null
+++ b/unit-tests/ddx-testsuite/error.02.ddx
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Dataset name="SimpleTypes">
+
+    <Byte name="b1">
+        <Attribute name="test" type="Byte">
+	    <value>2</value>
+    </Byte>
+
+    <dataBLOB href="huh.blob"/>
+</Dataset>
diff --git a/unit-tests/ddx-testsuite/error.03.ddx b/unit-tests/ddx-testsuite/error.03.ddx
new file mode 100644
index 0000000..fc8f0af
--- /dev/null
+++ b/unit-tests/ddx-testsuite/error.03.ddx
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Dataset name="SimpleTypes">
+
+    <Byte name="b1">
+        <Attribute name="test" type="Byte">
+	    <value>2</value>
+	</Attribute>
+    </NOTByte>
+
+    <dataBLOB href="huh.blob"/>
+</Dataset>
diff --git a/unit-tests/ddx-testsuite/error.04.ddx b/unit-tests/ddx-testsuite/error.04.ddx
new file mode 100644
index 0000000..0534375
--- /dev/null
+++ b/unit-tests/ddx-testsuite/error.04.ddx
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Dataset name="SimpleTypes">
+
+    <Byte name="b1">
+        <Attribute name="test" type="Byte">
+	    <value>2</value>
+	</Attribute>
+	<Attribute name="test2" type="Container">
+	    <Attribute name="test" type="Byte">
+		<value>2</value>
+	    </Attribute>
+	    <Int32 name="bogus"/>
+        </Attribute>	    
+    </Byte>
+
+    <dataBLOB href="huh.blob"/>
+</Dataset>
diff --git a/unit-tests/ddx-testsuite/error.05.ddx b/unit-tests/ddx-testsuite/error.05.ddx
new file mode 100644
index 0000000..cd817c0
--- /dev/null
+++ b/unit-tests/ddx-testsuite/error.05.ddx
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Dataset name="OneDimensionalSimpleArrays"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xmlns="http://www.dods.org/ns/DODS"
+xsi:schemaLocation="http://www.dods.org/ns/DODS  http://dods.coas.oregonstate.edu:8080/dods/dods.xsd" >
+
+	<Array name="b">
+		<Byte/>
+	</Array>
+
+	<dataBLOB href="http://dods.coas.oregonstate.edu:8080/dods/dts/test.02.blob"/>
+</Dataset>
diff --git a/unit-tests/ddx-testsuite/error.06.ddx b/unit-tests/ddx-testsuite/error.06.ddx
new file mode 100644
index 0000000..9599160
--- /dev/null
+++ b/unit-tests/ddx-testsuite/error.06.ddx
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Dataset name="OneDimensionalSimpleArrays"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xmlns="http://www.dods.org/ns/DODS"
+xsi:schemaLocation="http://www.dods.org/ns/DODS  http://dods.coas.oregonstate.edu:8080/dods/dods.xsd" >
+
+        <Byte/>
+        <dataBLOB href="blah"/>
+</Dataset>
diff --git a/unit-tests/ddx-testsuite/response_builder_send_data_ddx_test.xml b/unit-tests/ddx-testsuite/response_builder_send_data_ddx_test.xml
new file mode 100644
index 0000000..6c4e02f
--- /dev/null
+++ b/unit-tests/ddx-testsuite/response_builder_send_data_ddx_test.xml
@@ -0,0 +1,35 @@
+HTTP/1.0 200 OK
+XDODS-Server: .*
+XOPeNDAP-Server: .*
+XDAP: .*
+Date: .*
+Last-Modified: .*
+Content-Type: Multipart/Related; boundary=boundary; start="<start@opendap.org>"; type="Text/xml"
+Content-Description: dap4-data-ddx
+
+--boundary
+Content-Type: Text/xml; charset=iso-8859-1
+Content-Id: <start@opendap.org>
+Content-Description: dap4-ddx
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset name="test" .*
+    <Byte name="a">
+        <Attribute name="size" type="Int32">
+            <value>7</value>
+        </Attribute>
+        <Attribute name="type" type="String">
+            <value>cars</value>
+        </Attribute>
+    </Byte>
+    <blob href="cid:.*@opendap.org"/>
+</Dataset>
+
+--boundary
+Content-Type: application/octet-stream
+Content-Id: <.*@opendap.org>
+Content-Description: dap4-data
+Content-Encoding: binary
+
+.*
+--boundary--
\ No newline at end of file
diff --git a/unit-tests/ddx-testsuite/response_builder_send_data_ddx_test_3.xml b/unit-tests/ddx-testsuite/response_builder_send_data_ddx_test_3.xml
new file mode 100644
index 0000000..8c35001
--- /dev/null
+++ b/unit-tests/ddx-testsuite/response_builder_send_data_ddx_test_3.xml
@@ -0,0 +1,35 @@
+HTTP/1.0 200 OK\r
+XDODS-Server: *
+XOPeNDAP-Server: *
+XDAP: *
+Date: *
+Last-Modified: *
+Content-Type: Multipart/Related; boundary=boundary; start="<start@opendap.org>"; type="Text/xml"\r
+Content-Description: dap4-data-ddx\r
+\r
+--boundary\r
+Content-Type: Text/xml; charset=iso-8859-1\r
+Content-Id: <start@opendap.org>\r
+Content-Description: dap4-ddx\r
+\r
+<.xml version="1.0" encoding="ISO-8859-1".>
+<Dataset name="test" *
+    <Byte name="a">
+        <Attribute name="size" type="Int32">
+            <value>7</value>
+        </Attribute>
+        <Attribute name="type" type="String">
+            <value>cars</value>
+        </Attribute>
+    </Byte>
+    <blob href="cid:*@opendap.org"/>
+</Dataset>
+
+--boundary\r
+Content-Type: application/octet-stream\r
+Content-Id: <*@opendap.org>\r
+Content-Description: dap4-data\r
+Content-Encoding: binary\r
+\r
+*
+--boundary--\r
diff --git a/unit-tests/ddx-testsuite/response_builder_send_ddx_test.xml b/unit-tests/ddx-testsuite/response_builder_send_ddx_test.xml
new file mode 100644
index 0000000..683711c
--- /dev/null
+++ b/unit-tests/ddx-testsuite/response_builder_send_ddx_test.xml
@@ -0,0 +1,20 @@
+HTTP/1.0 200 OK
+XDODS-Server: .*
+XOPeNDAP-Server: .*
+XDAP: 3.2
+Date: .*
+Last-Modified: .*
+Content-Type: text/xml
+Content-Description: dap4-ddx
+
+<.xml version="1.0" encoding="ISO-8859-1".>
+<Dataset name="test" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xml.opendap.org/ns/DAP/3.2# http://xml.opendap.org/dap/dap3.2.xsd" xmlns:grddl="http://www.w3.org/2003/g/data-view#" grddl:transformation="http://xml.opendap.org/transforms/ddxToRdfTriples.xsl" xmlns="http://xml.opendap.org/ns/DAP/3.2#" xmlns:dap="http://xml.opendap.org/ns/DAP/3.2#" dapVersion="3.2">
+    <Byte name="a">
+        <Attribute name="size" type="Int32">
+            <value>7</value>
+        </Attribute>
+        <Attribute name="type" type="String">
+            <value>cars</value>
+        </Attribute>
+    </Byte>
+</Dataset>
\ No newline at end of file
diff --git a/unit-tests/ddx-testsuite/test.00.ddx b/unit-tests/ddx-testsuite/test.00.ddx
new file mode 100644
index 0000000..750fc2e
--- /dev/null
+++ b/unit-tests/ddx-testsuite/test.00.ddx
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Dataset name="SimpleTypes" dapVersion="3.2">
+
+        <Attribute name="PrincipleInvestigator" type="String">
+            <value>&quot;Mark Abbott&quot;</value>
+            <value>&quot;Ph.D&quot;</value>
+        </Attribute>
+
+</Dataset>
diff --git a/unit-tests/ddx-testsuite/test.01.ddx b/unit-tests/ddx-testsuite/test.01.ddx
new file mode 100644
index 0000000..7e284a5
--- /dev/null
+++ b/unit-tests/ddx-testsuite/test.01.ddx
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Dataset name="SimpleTypes">
+
+	<Attribute name="PrincipleInvestigator" type="String">
+	    <value>&quot;Mark Abbott&quot;</value>
+	    <value>&quot;Ph.D&quot;</value>
+	</Attribute>
+	<Attribute name="DataCenter" type="String">
+	    <value>&quot;COAS Environmental Computer Facility&quot;</value>
+	</Attribute>
+	<Attribute name="DrifterType" type="String">
+	    <value>&quot;MetOcean WOCE/OCM&quot;</value>
+	</Attribute>
+
+    <dataBLOB href="test.01.ddx"/>
+</Dataset>
diff --git a/unit-tests/ddx-testsuite/test.01.error.ddx b/unit-tests/ddx-testsuite/test.01.error.ddx
new file mode 100644
index 0000000..8570359
--- /dev/null
+++ b/unit-tests/ddx-testsuite/test.01.error.ddx
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Dataset
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xmlns="http://www.dods.org/ns/DODS"
+xsi:schemaLocation="http://www.dods.org/ns/DODS  http://dods.coas.oregonstate.edu:8080/dods/dods.xsd" >
+
+	<Attribute name="Facility" type="Container">
+		<Attribute name="PrincipleInvestigator" type="String">
+			<value>&quot;Mark Abbott&quot;</value>
+			<value>&quot;Ph.D&quot;</value>
+		</Attribute>
+		<Attribute name="DataCenter" type="String">
+			<value>&quot;COAS Environmental Computer Facility&quot;</value>
+		</Attribute>
+		<Attribute name="DrifterType" type="String">
+			<value>&quot;MetOcean WOCE/OCM&quot;</value>
+		</Attribute>
+	</Attribute>
+
+	<Byte name="b">
+		<Attribute name="Description" type="String">
+			<value>&quot;A test byte&quot;</value>
+		</Attribute>
+		<Attribute name="units" type="String">
+			<value>unknown</value>
+		</Attribute>
+	</Byte>
+	<Int32 name="i32">
+		<Attribute name="Description" type="String">
+			<value>&quot;A 32 bit test server int&quot;</value>
+		</Attribute>
+		<Attribute name="units" type="String">
+			<value>&quot;unknown&quot;</value>
+		</Attribute>
+	</Int32>
+	<UInt32 name="ui32"/>
+	<Int16 name="i16"/>
+	<UInt16 name="ui16"/>
+	<Float32 name="f32"/>
+	<Float64 name="f64"/>
+	<String name="s"/>
+	<Url name="u"/>
+
+	<dataBLOB href="http://dods.coas.oregonstate.edu:8080/dods/dts/test.01.blob"/>
+</Dataset>
diff --git a/unit-tests/ddx-testsuite/test.01.orig.ddx b/unit-tests/ddx-testsuite/test.01.orig.ddx
new file mode 100644
index 0000000..fe75e98
--- /dev/null
+++ b/unit-tests/ddx-testsuite/test.01.orig.ddx
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Dataset name="SimpleTypes"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xmlns="http://www.dods.org/ns/DODS"
+xsi:schemaLocation="http://www.dods.org/ns/DODS  http://dods.coas.oregonstate.edu:8080/dods/dods.xsd" >
+
+	<Attribute name="Facility" type="Container">
+		<Attribute name="PrincipleInvestigator" type="String">
+			<value>&quot;Mark Abbott&quot;</value>
+			<value>&quot;Ph.D&quot;</value>
+		</Attribute>
+		<Attribute name="DataCenter" type="String">
+			<value>&quot;COAS Environmental Computer Facility&quot;</value>
+		</Attribute>
+		<Attribute name="DrifterType" type="String">
+			<value>&quot;MetOcean WOCE/OCM&quot;</value>
+		</Attribute>
+	</Attribute>
+
+	<Byte name="b">
+		<Attribute name="Description" type="String">
+			<value>&quot;A test byte&quot;</value>
+		</Attribute>
+		<Attribute name="units" type="String">
+			<value>unknown</value>
+		</Attribute>
+	</Byte>
+	<Int32 name="i32">
+		<Attribute name="Description" type="String">
+			<value>&quot;A 32 bit test server int&quot;</value>
+		</Attribute>
+		<Attribute name="units" type="String">
+			<value>&quot;unknown&quot;</value>
+		</Attribute>
+	</Int32>
+	<UInt32 name="ui32"/>
+	<Int16 name="i16"/>
+	<UInt16 name="ui16"/>
+	<Float32 name="f32"/>
+	<Float64 name="f64"/>
+	<String name="s"/>
+	<Url name="u"/>
+
+	<dataBLOB href="http://dods.coas.oregonstate.edu:8080/dods/dts/test.01.blob"/>
+</Dataset>
diff --git a/unit-tests/ddx-testsuite/test.02.ddx b/unit-tests/ddx-testsuite/test.02.ddx
new file mode 100644
index 0000000..c6306e2
--- /dev/null
+++ b/unit-tests/ddx-testsuite/test.02.ddx
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Dataset name="SimpleTypes">
+
+    <Attribute name="Facility" type="Container">
+	<Attribute name="PrincipleInvestigator" type="String">
+	    <value>&quot;Mark Abbott&quot;</value>
+	    <value>&quot;Ph.D&quot;</value>
+	</Attribute>
+	<Attribute name="DataCenter" type="String">
+	    <value>&quot;COAS Environmental Computer Facility&quot;</value>
+	</Attribute>
+	<Attribute name="DrifterType" type="String">
+	    <value>&quot;MetOcean WOCE/OCM&quot;</value>
+	</Attribute>
+
+    </Attribute>
+
+    <dataBLOB href="huh.blob"/>
+</Dataset>
diff --git a/unit-tests/ddx-testsuite/test.03.ddx b/unit-tests/ddx-testsuite/test.03.ddx
new file mode 100644
index 0000000..76da1d4
--- /dev/null
+++ b/unit-tests/ddx-testsuite/test.03.ddx
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Dataset name="SimpleTypes">
+
+    <Attribute name="Facility" type="Container">
+	<Attribute name="PrincipleInvestigator" type="String">
+	    <value>&quot;Mark Abbott&quot;</value>
+	    <value>&quot;Ph.D&quot;</value>
+	</Attribute>
+	<Attribute name="DataCenter" type="String">
+	    <value>&quot;COAS Environmental Computer Facility&quot;</value>
+	</Attribute>
+	<Attribute name="DrifterType" type="String">
+	    <value>&quot;MetOcean WOCE/OCM&quot;</value>
+	</Attribute>
+
+	<Alias name="huh" Attribute="DrifterType"/>
+
+    </Attribute>
+
+    <dataBLOB href="huh.blob"/>
+</Dataset>
diff --git a/unit-tests/ddx-testsuite/test.04.ddx b/unit-tests/ddx-testsuite/test.04.ddx
new file mode 100644
index 0000000..d2cc0d0
--- /dev/null
+++ b/unit-tests/ddx-testsuite/test.04.ddx
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Dataset name="SimpleTypes"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xmlns="http://www.dods.org/ns/DODS"
+xsi:schemaLocation="http://www.dods.org/ns/DODS  http://dods.coas.oregonstate.edu:8080/dods/dods.xsd" >
+
+	<Byte name="b"/>
+	<Int32 name="i32"/>
+	<UInt32 name="ui32"/>
+	<Int16 name="i16"/>
+	<UInt16 name="ui16"/>
+	<Float32 name="f32"/>
+	<Float64 name="f64"/>
+	<String name="s"/>
+	<Url name="u"/>
+
+	<dataBLOB href="http://dods.coas.oregonstate.edu:8080/dods/dts/test.01.blob"/>
+</Dataset>
diff --git a/unit-tests/ddx-testsuite/test.05.ddx b/unit-tests/ddx-testsuite/test.05.ddx
new file mode 100644
index 0000000..41c608f
--- /dev/null
+++ b/unit-tests/ddx-testsuite/test.05.ddx
@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Dataset name="SimpleTypes"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xmlns="http://www.dods.org/ns/DODS"
+xsi:schemaLocation="http://www.dods.org/ns/DODS  http://dods.coas.oregonstate.edu:8080/dods/dods.xsd" >
+
+	<Byte name="b">
+	    <Attribute name="Description" type="String">
+		    <value>&quot;A test byte&quot;</value>
+	    </Attribute>
+	    <Attribute name="units" type="String">
+		    <value>unknown</value>
+	    </Attribute>
+	    <Attribute name="Facility" type="Container">
+		    <Attribute name="PrincipleInvestigator" type="String">
+			    <value>&quot;Mark Abbott&quot;</value>
+			    <value>&quot;Ph.D&quot;</value>
+		    </Attribute>
+		    <Attribute name="DataCenter" type="String">
+			    <value>&quot;COAS Environmental Computer Facility&quot;</value>
+		    </Attribute>
+		    <Attribute name="DrifterType" type="String">
+			    <value>&quot;MetOcean WOCE/OCM&quot;</value>
+		    </Attribute>
+	    </Attribute>
+	</Byte>
+
+	<Int32 name="i32">
+	    <Attribute name="Description" type="String">
+		    <value>&quot;A test byte&quot;</value>
+	    </Attribute>
+	    <Attribute name="units" type="String">
+		    <value>unknown</value>
+	    </Attribute>
+	    <Attribute name="Facility" type="Container">
+		    <Attribute name="PrincipleInvestigator" type="String">
+			    <value>&quot;Mark Abbott&quot;</value>
+			    <value>&quot;Ph.D&quot;</value>
+		    </Attribute>
+		    <Attribute name="DataCenter" type="String">
+			    <value>&quot;COAS Environmental Computer Facility&quot;</value>
+		    </Attribute>
+		    <Attribute name="DrifterType" type="String">
+			    <value>&quot;MetOcean WOCE/OCM&quot;</value>
+		    </Attribute>
+	    </Attribute>
+	</Int32>
+
+	<UInt32 name="ui32">
+	    <Attribute name="Description" type="String">
+		    <value>&quot;A test byte&quot;</value>
+	    </Attribute>
+	    <Attribute name="units" type="String">
+		    <value>unknown</value>
+	    </Attribute>
+	    <Attribute name="Facility" type="Container">
+		    <Attribute name="PrincipleInvestigator" type="String">
+			    <value>&quot;Mark Abbott&quot;</value>
+			    <value>&quot;Ph.D&quot;</value>
+		    </Attribute>
+		    <Attribute name="DataCenter" type="String">
+			    <value>&quot;COAS Environmental Computer Facility&quot;</value>
+		    </Attribute>
+		    <Attribute name="DrifterType" type="String">
+			    <value>&quot;MetOcean WOCE/OCM&quot;</value>
+		    </Attribute>
+	    </Attribute>
+	</UInt32>
+
+	<Int16 name="i16">
+	    <Attribute name="Description" type="String">
+		    <value>&quot;A test byte&quot;</value>
+	    </Attribute>
+	    <Attribute name="units" type="String">
+		    <value>unknown</value>
+	    </Attribute>
+	    <Attribute name="Facility" type="Container">
+		    <Attribute name="PrincipleInvestigator" type="String">
+			    <value>&quot;Mark Abbott&quot;</value>
+			    <value>&quot;Ph.D&quot;</value>
+		    </Attribute>
+		    <Attribute name="DataCenter" type="String">
+			    <value>&quot;COAS Environmental Computer Facility&quot;</value>
+		    </Attribute>
+		    <Attribute name="DrifterType" type="String">
+			    <value>&quot;MetOcean WOCE/OCM&quot;</value>
+		    </Attribute>
+	    </Attribute>
+	</Int16>
+
+	<UInt16 name="ui16">
+	    <Attribute name="Description" type="String">
+		    <value>&quot;A test byte&quot;</value>
+	    </Attribute>
+	    <Attribute name="units" type="String">
+		    <value>unknown</value>
+	    </Attribute>
+	    <Attribute name="Facility" type="Container">
+		    <Attribute name="PrincipleInvestigator" type="String">
+			    <value>&quot;Mark Abbott&quot;</value>
+			    <value>&quot;Ph.D&quot;</value>
+		    </Attribute>
+		    <Attribute name="DataCenter" type="String">
+			    <value>&quot;COAS Environmental Computer Facility&quot;</value>
+		    </Attribute>
+		    <Attribute name="DrifterType" type="String">
+			    <value>&quot;MetOcean WOCE/OCM&quot;</value>
+		    </Attribute>
+	    </Attribute>
+	</UInt16>
+
+	<Float32 name="f32">
+	    <Attribute name="Description" type="String">
+		    <value>&quot;A test byte&quot;</value>
+	    </Attribute>
+	    <Attribute name="units" type="String">
+		    <value>unknown</value>
+	    </Attribute>
+	    <Attribute name="Facility" type="Container">
+		    <Attribute name="PrincipleInvestigator" type="String">
+			    <value>&quot;Mark Abbott&quot;</value>
+			    <value>&quot;Ph.D&quot;</value>
+		    </Attribute>
+		    <Attribute name="DataCenter" type="String">
+			    <value>&quot;COAS Environmental Computer Facility&quot;</value>
+		    </Attribute>
+		    <Attribute name="DrifterType" type="String">
+			    <value>&quot;MetOcean WOCE/OCM&quot;</value>
+		    </Attribute>
+	    </Attribute>
+	</Float32>
+
+	<Float64 name="f64">
+	    <Attribute name="Description" type="String">
+		    <value>&quot;A test byte&quot;</value>
+	    </Attribute>
+	    <Attribute name="units" type="String">
+		    <value>unknown</value>
+	    </Attribute>
+	    <Attribute name="Facility" type="Container">
+		    <Attribute name="PrincipleInvestigator" type="String">
+			    <value>&quot;Mark Abbott&quot;</value>
+			    <value>&quot;Ph.D&quot;</value>
+		    </Attribute>
+		    <Attribute name="DataCenter" type="String">
+			    <value>&quot;COAS Environmental Computer Facility&quot;</value>
+		    </Attribute>
+		    <Attribute name="DrifterType" type="String">
+			    <value>&quot;MetOcean WOCE/OCM&quot;</value>
+		    </Attribute>
+	    </Attribute>
+	</Float64>
+
+	<String name="s">
+	    <Attribute name="Description" type="String">
+		    <value>&quot;A test byte&quot;</value>
+	    </Attribute>
+	    <Attribute name="units" type="String">
+		    <value>unknown</value>
+	    </Attribute>
+	    <Attribute name="Facility" type="Container">
+		    <Attribute name="PrincipleInvestigator" type="String">
+			    <value>&quot;Mark Abbott&quot;</value>
+			    <value>&quot;Ph.D&quot;</value>
+		    </Attribute>
+		    <Attribute name="DataCenter" type="String">
+			    <value>&quot;COAS Environmental Computer Facility&quot;</value>
+		    </Attribute>
+		    <Attribute name="DrifterType" type="String">
+			    <value>&quot;MetOcean WOCE/OCM&quot;</value>
+		    </Attribute>
+	    </Attribute>
+	</String>
+
+	<Url name="u">
+	    <Attribute name="Description" type="String">
+		    <value>&quot;A test byte&quot;</value>
+	    </Attribute>
+	    <Attribute name="units" type="String">
+		    <value>unknown</value>
+	    </Attribute>
+	    <Attribute name="Facility" type="Container">
+		    <Attribute name="PrincipleInvestigator" type="String">
+			    <value>&quot;Mark Abbott&quot;</value>
+			    <value>&quot;Ph.D&quot;</value>
+		    </Attribute>
+		    <Attribute name="DataCenter" type="String">
+			    <value>&quot;COAS Environmental Computer Facility&quot;</value>
+		    </Attribute>
+		    <Attribute name="DrifterType" type="String">
+			    <value>&quot;MetOcean WOCE/OCM&quot;</value>
+		    </Attribute>
+	    </Attribute>
+	</Url>
+
+	<dataBLOB href="http://dods.coas.oregonstate.edu:8080/dods/dts/test.01.blob"/>
+</Dataset>
diff --git a/unit-tests/ddx-testsuite/test.06.ddx b/unit-tests/ddx-testsuite/test.06.ddx
new file mode 100644
index 0000000..093cb88
--- /dev/null
+++ b/unit-tests/ddx-testsuite/test.06.ddx
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Dataset name="OneDimensionalSimpleArrays"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xmlns="http://www.dods.org/ns/DODS">
+
+	<Array name="b">
+		<Byte/>
+		<dimension size="25"/>
+	</Array>
+	<Array name="i32">
+		<Int32/>
+		<dimension size="25"/>
+	</Array>
+	<Array name="ui32">
+		<UInt32/>
+		<dimension size="25"/>
+	</Array>
+	<Array name="i16">
+		<Int16/>
+		<dimension size="25"/>
+	</Array>
+	<Array name="ui16">
+		<UInt16/>
+		<dimension size="25"/>
+	</Array>
+	<Array name="f32">
+		<Float32/>
+		<dimension size="25"/>
+	</Array>
+	<Array name="f64">
+		<Float64/>
+		<dimension size="25"/>
+	</Array>
+	<Array name="s">
+		<String/>
+		<dimension size="25"/>
+	</Array>
+	<Array name="u">
+		<Url/>
+		<dimension size="25"/>
+	</Array>
+
+	<dataBLOB href="http://dods.coas.oregonstate.edu:8080/dods/dts/test.02.blob"/>
+</Dataset>
diff --git a/unit-tests/ddx-testsuite/test.07.ddx b/unit-tests/ddx-testsuite/test.07.ddx
new file mode 100644
index 0000000..b179513
--- /dev/null
+++ b/unit-tests/ddx-testsuite/test.07.ddx
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Dataset name="MultiDimensionalSimpleArrays"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xmlns="http://www.dods.org/ns/DODS"
+xsi:schemaLocation="http://www.dods.org/ns/DODS  http://dods.coas.oregonstate.edu:8080/dods/dods.xsd" >
+
+
+	<Array name="b">
+		<Byte/>
+		<dimension size="2"/>
+		<dimension size="3"/>
+		<dimension size="4"/>
+	</Array>
+	<Array name="b2">
+		<Byte/>
+		<dimension size="2"/>
+		<dimension size="3"/>
+	</Array>
+	<Array name="i32">
+		<Int32/>
+		<dimension size="2"/>
+		<dimension size="3"/>
+		<dimension size="4"/>
+	</Array>
+	<Array name="ui32">
+		<UInt32/>
+		<dimension size="2"/>
+		<dimension size="3"/>
+		<dimension size="4"/>
+		<dimension size="3"/>
+		<dimension size="2"/>
+	</Array>
+	<Array name="i16">
+		<Int16/>
+		<dimension size="2"/>
+		<dimension size="2"/>
+		<dimension size="2"/>
+	</Array>
+	<Array name="ui16">
+		<UInt16/>
+		<dimension size="2"/>
+		<dimension size="2"/>
+		<dimension size="2"/>
+	</Array>
+	<Array name="f32">
+		<Float32/>
+		<dimension size="2"/>
+		<dimension size="2"/>
+		<dimension size="2"/>
+	</Array>
+	<Array name="f64">
+		<Float64/>
+		<dimension size="2"/>
+		<dimension size="2"/>
+		<dimension size="2"/>
+	</Array>
+	<Array name="s0">
+		<String/>
+		<dimension size="4"/>
+		<dimension size="5"/>
+		<dimension size="6"/>
+	</Array>
+	<Array name="s1">
+		<String/>
+		<dimension size="10"/>
+		<dimension size="10"/>
+		<dimension size="10"/>
+	</Array>
+	<Array name="u">
+		<Url/>
+		<dimension size="10"/>
+		<dimension size="10"/>
+		<dimension size="10"/>
+	</Array>
+
+	<dataBLOB href="http://dods.coas.oregonstate.edu:8080/dods/dts/test.03.blob"/>
+</Dataset>
diff --git a/unit-tests/ddx-testsuite/test.08.ddx b/unit-tests/ddx-testsuite/test.08.ddx
new file mode 100644
index 0000000..4df69f7
--- /dev/null
+++ b/unit-tests/ddx-testsuite/test.08.ddx
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Dataset name="testdata"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xmlns="http://www.dods.org/ns/DODS"
+xsi:schemaLocation="http://www.dods.org/ns/DODS  http://dods.coas.oregonstate.edu:8080/dods/dods.xsd" >
+
+	<Attribute name="stuff" type="String">
+		<value>&quot;Stuff about this stuff&quot;</value>
+		<value>Silly</value>
+		<value>Repitious</value>
+		<value>&quot;testing of stuff&quot;</value>
+	</Attribute>
+	<Attribute name="stuff2" type="String">
+		<value>&quot;More Stuff about this stuff&quot;</value>
+	</Attribute>
+
+	<Array name="somearray">
+		<Attribute name="PrincipleInvestigator" type="Container">
+			<Attribute name="Title" type="String">
+				<value>Dr.</value>
+			</Attribute>
+			<Attribute name="FirstName" type="String">
+				<value>Mark</value>
+			</Attribute>
+			<Attribute name="LastName" type="String">
+				<value>Abbott</value>
+			</Attribute>
+		</Attribute>
+		<Attribute name="CruiseNumber" type="String">
+			<value>WE030702</value>
+		</Attribute>
+		<Byte/>
+		<dimension name="bytes" size="1024"/>
+		<dimension name="bits" size="8"/>
+		<dimension size="256"/>
+	</Array>
+
+	<dataBLOB href="http://dods.coas.oregonstate.edu:8080/dods/dts/d3.blob"/>
+</Dataset>
diff --git a/unit-tests/ddx-testsuite/test.09.ddx b/unit-tests/ddx-testsuite/test.09.ddx
new file mode 100644
index 0000000..cf00ae9
--- /dev/null
+++ b/unit-tests/ddx-testsuite/test.09.ddx
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Dataset name="testdata"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xmlns="http://www.dods.org/ns/DODS"
+xsi:schemaLocation="http://www.dods.org/ns/DODS  http://dods.coas.oregonstate.edu:8080/dods/dods.xsd" >
+
+	<Array name="structarray">
+		<Structure>
+			<Float64 name="amp"/>
+			<Float32 name="damp"/>
+			<Float64 name="clamp"/>
+		</Structure>
+		<dimension name="twizzle" size="41024"/>
+		<dimension name="dizzle" size="25211"/>
+	</Array>
+	<Structure name="mystruct">
+	    <Attribute name="leaf04a" type="Float64">
+		<value>1451.87567</value>
+	    </Attribute>
+	    <Attribute name="leaf04b" type="Float64">
+		<value>141.87567</value>
+	    </Attribute>
+	    <Array name="amp">
+		<Float32/>
+		<dimension name="x" size="256"/>
+		<dimension name="y" size="256"/>
+	    </Array>
+	    <Float32 name="JulianDay"/>
+	    <Int16 name="InstrumentNumber"/>
+	    <Structure name="foo">
+		<Float64 name="arf"/>
+		<Array name="barf">
+		    <Attribute name="jimmy" type="Int16">
+		        <value>154</value>
+		    </Attribute>
+		    <Float64/>
+		    <dimension size="2222"/>
+		</Array>
+	    </Structure>
+	</Structure>
+	<Structure name="ragtop">
+	    <Attribute name="Thumping" type="Container">
+		<Attribute name="John" type="String">
+		    <value>&quot;Has Too Much Fun&quot;</value>
+		</Attribute>
+		<Attribute name="Sally" type="String">
+		    <value>&quot;Has No Fun&quot;</value>
+		</Attribute>
+	    </Attribute>
+	    <Byte name="diggle"/>
+	    <Byte name="piggle"/>
+	    <Byte name="wiggle"/>
+	    <Byte name="doo"/>
+	</Structure>
+
+	<dataBLOB href="http://dods.coas.oregonstate.edu:8080/dods/dts/d3.blob"/>
+</Dataset>
diff --git a/unit-tests/ddx-testsuite/test.0a.ddx b/unit-tests/ddx-testsuite/test.0a.ddx
new file mode 100644
index 0000000..34cbc7d
--- /dev/null
+++ b/unit-tests/ddx-testsuite/test.0a.ddx
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Dataset name="testdata"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xmlns="http://www.dods.org/ns/DODS"
+xsi:schemaLocation="http://www.dods.org/ns/DODS  http://dods.coas.oregonstate.edu:8080/dods/dods.xsd" >
+
+	<Sequence name="testSeq">
+		<Float64 name="jday">
+		</Float64>
+		<Float32 name="latitude"/>
+		<Float32 name="longitude"/>
+		<Float32 name="SurfaceIrradiance"/>
+		<Structure name="point">
+		    <Int32 name="x"/>
+		    <Int32 name="y"/>
+		</Structure>
+		<Array name="times">
+		    <String/>
+		    <dimension size="1024"/>
+		</Array>
+		<Sequence name="CTDProfile">
+			<Float64 name="depth"/>
+			<Float64 name="temperature"/>
+			<Float64 name="conductivity"/>
+			<Float64 name="fluoresence"/>
+		</Sequence>
+	</Sequence>
+
+	<dataBLOB href="http://dods.coas.oregonstate.edu:8080/dods/dts/d3.blob"/>
+</Dataset>
diff --git a/unit-tests/ddx-testsuite/test.0b.ddx b/unit-tests/ddx-testsuite/test.0b.ddx
new file mode 100644
index 0000000..a9fc77b
--- /dev/null
+++ b/unit-tests/ddx-testsuite/test.0b.ddx
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Dataset name="testdata"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xmlns="http://www.dods.org/ns/DODS"
+xsi:schemaLocation="http://www.dods.org/ns/DODS  http://dods.coas.oregonstate.edu:8080/dods/dods.xsd" >
+
+	<Grid  name="sst">
+		<Array name="sst">
+			<Float64/>
+			<dimension name="latitude" size="1024"/>
+			<dimension name="longitude" size="1024"/>
+		</Array>
+		<Map name="latitude">
+			<Float64/>
+			<dimension size="1024"/>
+		</Map>
+		<Map name="longitude">
+			<Float64/>
+			<dimension size="1024"/>
+		</Map>
+	</Grid>
+	<Grid  name="sst2">
+		<Attribute name="Thumping" type="Container">
+			<Attribute name="John" type="String">
+				<value>&quot;Has Too Much Fun&quot;</value>
+			</Attribute>
+			<Attribute name="Sally" type="String">
+				<value>&quot;Has No Fun&quot;</value>
+			</Attribute>
+		</Attribute>
+		<Array name="sst">
+			<Float64/>
+			<dimension name="latitude" size="1024"/>
+			<dimension name="longitude" size="1024"/>
+		</Array>
+		<Map name="latitude">
+			<Float64/>
+			<dimension size="1024"/>
+		</Map>
+		<Map name="longitude">
+			<Float64/>
+			<dimension size="1024"/>
+		</Map>
+	</Grid>
+
+	<dataBLOB href="http://dods.coas.oregonstate.edu:8080/dods/dts/d3.blob"/>
+</Dataset>
diff --git a/unit-tests/ddx-testsuite/test.0c.ddx b/unit-tests/ddx-testsuite/test.0c.ddx
new file mode 100644
index 0000000..fa4f2fb
--- /dev/null
+++ b/unit-tests/ddx-testsuite/test.0c.ddx
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- DAP 3.2 response without the BLOB element -->
+
+<Dataset name="SimpleTypes" dapVersion="3.2">
+
+        <Attribute name="PrincipleInvestigator" type="String">
+            <value>&quot;Mark Abbott&quot;</value>
+            <value>&quot;Ph.D&quot;</value>
+        </Attribute>
+
+</Dataset>
diff --git a/unit-tests/ddx-testsuite/test.0d.ddx b/unit-tests/ddx-testsuite/test.0d.ddx
new file mode 100644
index 0000000..8de857c
--- /dev/null
+++ b/unit-tests/ddx-testsuite/test.0d.ddx
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Dataset name="SimpleTypes" dapVersion="3.2">
+
+        <Attribute name="PrincipleInvestigator" type="String">
+            <value>&quot;Mark Abbott&quot;</value>
+            <value>&quot;Ph.D&quot;</value>
+        </Attribute>
+
+        <dataBLOB href="bad element...">
+</Dataset>
diff --git a/unit-tests/ddx-testsuite/test.1.other_xml.ddx b/unit-tests/ddx-testsuite/test.1.other_xml.ddx
new file mode 100644
index 0000000..6d9d560
--- /dev/null
+++ b/unit-tests/ddx-testsuite/test.1.other_xml.ddx
@@ -0,0 +1,15 @@
+<Dataset name="200803061600_HFRadar_USEGC_6km_rtv_SIO.nc"
+    xmlns="http://xml.opendap.org/ns/DAP/3.3#"
+    xmlns:dap="http://xml.opendap.org/ns/DAP/3.3#"
+    dapVersion="3.3"
+    xmlns:xml="http://www.w3.org/XML/1998/namespace"
+    xml:base="http://localhost:8080/opendap/coverage/200803061600_HFRadar_USEGC_6km_rtv_SIO.nc.ddx">
+
+
+        <Attribute name="wcsStuff" type="OtherXML" relationship="is-a">
+            <CoverageDescription xmlns="http://www.opengis.net/wcs/1.1" xmlns:ows="http://www.opengis.net/ows/1.1"
+                                 xmlns:owcs="http://www.opengis.net/wcs/1.1/ows"
+                                 xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:xlink="http://www.w3.org/1999/xlink">
+            </CoverageDescription>
+        </Attribute>
+</Dataset>
diff --git a/unit-tests/ddx-testsuite/test.2.other_xml.ddx b/unit-tests/ddx-testsuite/test.2.other_xml.ddx
new file mode 100644
index 0000000..bad93d1
--- /dev/null
+++ b/unit-tests/ddx-testsuite/test.2.other_xml.ddx
@@ -0,0 +1,20 @@
+<Dataset name="200803061600_HFRadar_USEGC_6km_rtv_SIO.nc"
+    xmlns="http://xml.opendap.org/ns/DAP/3.3#"
+    xmlns:dap="http://xml.opendap.org/ns/DAP/3.3#"
+    dapVersion="3.3"
+    xmlns:xml="http://www.w3.org/XML/1998/namespace"
+    xml:base="http://localhost:8080/opendap/coverage/200803061600_HFRadar_USEGC_6km_rtv_SIO.nc.ddx">
+
+
+        <Attribute name="wcsStuff" type="OtherXML" relationship="is-a">
+            <CoverageDescription xmlns="http://www.opengis.net/wcs/1.1" xmlns:ows="http://www.opengis.net/ows/1.1"
+                                 xmlns:owcs="http://www.opengis.net/wcs/1.1/ows"
+                                 xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:xlink="http://www.w3.org/1999/xlink">
+                <owcs:abstract>This is an abstract</owcs:abstract>
+                <stuff gml:name="barf"/>
+                <Attribute name="nasty" type="String">
+                    <value>this should not be parsed as a DAP attribute.</value>
+                </Attribute>
+            </CoverageDescription>
+        </Attribute>
+</Dataset>
diff --git a/unit-tests/ddx-testsuite/test.3.other_xml.ddx b/unit-tests/ddx-testsuite/test.3.other_xml.ddx
new file mode 100644
index 0000000..e594555
--- /dev/null
+++ b/unit-tests/ddx-testsuite/test.3.other_xml.ddx
@@ -0,0 +1,77 @@
+    <Dataset name="200803061600_HFRadar_USEGC_6km_rtv_SIO.nc"
+    xmlns="http://xml.opendap.org/ns/DAP/3.3#"
+    xmlns:dap="http://xml.opendap.org/ns/DAP/3.3#"
+    dapVersion="3.3"
+    xmlns:xml="http://www.w3.org/XML/1998/namespace"
+    xml:base="http://localhost:8080/opendap/coverage/200803061600_HFRadar_USEGC_6km_rtv_SIO.nc.ddx">
+
+
+        <Attribute name="wcsStuff" type="OtherXML" relationship="is-a">
+            <CoverageDescription xmlns="http://www.opengis.net/wcs/1.1" xmlns:ows="http://www.opengis.net/ows/1.1"
+                                 xmlns:owcs="http://www.opengis.net/wcs/1.1/ows"
+                                 xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:xlink="http://www.w3.org/1999/xlink"
+                                 >
+                <ows:Title>Near-Real Time Surface Ocean Velocity</ows:Title>
+                <ows:Abstract>CoverageDescription generated by OPeNDAP WCS UseCase 2.0</ows:Abstract>
+                <Identifier>coverage/200803061600_HFRadar_USEGC_6km_rtv_SIO.nc</Identifier>
+                <Domain>
+                    <SpatialDomain>
+                        <ows:BoundingBox crs="urn:ogc:def:crs:EPSG::4326">
+                            <ows:LowerCorner>-97.8839 21.736</ows:LowerCorner>
+                            <ows:UpperCorner>-57.2312 46.4944</ows:UpperCorner>
+                        </ows:BoundingBox>
+                    </SpatialDomain>
+                    <TemporalDomain>
+                        <gml:timePosition>2008-03-27T16:00:00.000Z</gml:timePosition>
+                    </TemporalDomain>
+                </Domain>
+                <Range>
+                </Range>
+                <SupportedCRS>urn:ogc:def:crs:EPSG::4326</SupportedCRS>
+                <SupportedFormat>netcdf-cf1.0</SupportedFormat>
+                <SupportedFormat>dap2.0</SupportedFormat>
+            </CoverageDescription>
+        </Attribute>
+
+        <Grid name="u">
+            <Attribute name="one" type="OtherXML" relationship="has-a">
+                <units xmlns="http://my.foo.com/ns/units#" />
+            </Attribute>
+            <Attribute name="two" type="OtherXML" relationship="is-a">
+                <Field xmlns="http://www.opengis.net/wcs/1.1" xmlns:ows="http://www.opengis.net/ows/1.1"
+                                 xmlns:owcs="http://www.opengis.net/wcs/1.1/ows"
+                                 xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:xlink="http://www.w3.org/1999/xlink"
+                                 >
+                    <ows:Title>surface_eastward_sea_water_velocity</ows:Title>
+                    <ows:Abstract>Eastward component of a 2D sea surface velocity vector.</ows:Abstract>
+                    <Identifier>u</Identifier>
+                    <Definition>
+                        <ows:AnyValue/>
+                    </Definition>
+                    <NullValue>-32768</NullValue>
+                    <owcs:InterpolationMethods>
+                        <owcs:DefaultMethod>nearest</owcs:DefaultMethod>
+                    </owcs:InterpolationMethods>
+                </Field>
+            </Attribute>
+            <Array name="u">
+                <Int16/>
+                <dimension name="time" size="1"/>
+                <dimension name="lat" size="460"/>
+                <dimension name="lon" size="701"/>
+            </Array>
+            <Map name="time">
+                <Int32/>
+                <dimension name="time" size="1"/>
+            </Map>
+            <Map name="lat">
+                <Float32/>
+                <dimension name="lat" size="460"/>
+            </Map>
+            <Map name="lon">
+                <Float32/>
+                <dimension name="lon" size="701"/>
+            </Map>
+        </Grid>
+
+    </Dataset>
diff --git a/unit-tests/generalUtilTest.cc b/unit-tests/generalUtilTest.cc
new file mode 100644
index 0000000..e9a9658
--- /dev/null
+++ b/unit-tests/generalUtilTest.cc
@@ -0,0 +1,418 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// Tests for the util functions in util.cc and escaping.cc
+
+#include <cppunit/TextTestRunner.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+#include <cppunit/extensions/HelperMacros.h>
+
+// #define DODS_DEBUG
+
+#include "debug.h"
+#include "util.h"
+#include "escaping.h"
+
+#include <cstring>
+#include <string>
+#include "GetOpt.h"
+
+using std::cerr;
+using std::endl;
+using std::string;
+
+using namespace CppUnit;
+using namespace libdap;
+
+static bool debug = false;
+
+class generalUtilTest: public TestFixture {
+private:
+
+public:
+    generalUtilTest()
+    {
+    }
+    ~generalUtilTest()
+    {
+    }
+
+    void setUp()
+    {
+    }
+
+    void tearDown()
+    {
+    }
+
+    CPPUNIT_TEST_SUITE (generalUtilTest);
+
+    CPPUNIT_TEST (octal_to_hex_test);
+    CPPUNIT_TEST (prune_spaces_test);
+    CPPUNIT_TEST (path_to_filename_test);
+    CPPUNIT_TEST (hexstring_test);
+    CPPUNIT_TEST (unhexstring_test);
+    CPPUNIT_TEST (id2www_test);
+    CPPUNIT_TEST (www2id_test);
+    CPPUNIT_TEST (ce_string_parse_test);
+    CPPUNIT_TEST (escattr_test);
+    CPPUNIT_TEST (unescattr_test);
+    CPPUNIT_TEST (munge_error_message_test);
+    CPPUNIT_TEST (id2xml_test);
+    CPPUNIT_TEST (xml2id_test);
+
+    CPPUNIT_TEST (glob_test_1);
+    CPPUNIT_TEST (glob_test_2);
+    CPPUNIT_TEST (glob_test_3);
+
+    CPPUNIT_TEST_SUITE_END()
+    ;
+
+    // Tests for methods
+    void glob_test_1()
+    {
+        string t = "This is a test";
+        int status = glob("This is a test", t.c_str());
+        CPPUNIT_ASSERT(status == 0);
+    }
+    void glob_test_2()
+    {
+        string t = "This is a test";
+        int status = glob("This * test", t.c_str());
+        CPPUNIT_ASSERT(status == 0);
+    }
+    void glob_test_3()
+    {
+        string t = "This is a test";
+        int status = glob("* is * test", t.c_str());
+        CPPUNIT_ASSERT(status == 0);
+    }
+
+    void octal_to_hex_test()
+    {
+        string hex;
+        hex = octal_to_hex("000");
+        CPPUNIT_ASSERT(hex == "00");
+
+        hex = octal_to_hex("012");
+        CPPUNIT_ASSERT(hex == "0a");
+
+        hex = octal_to_hex("077");
+        CPPUNIT_ASSERT(hex == "3f");
+    }
+
+    void prune_spaces_test()
+    {
+        string test_server = "http://test.opendap.org";
+        CPPUNIT_ASSERT(prune_spaces(test_server) == test_server);
+
+        string test_server_spaces = "   http://test.opendap.org";
+        CPPUNIT_ASSERT(prune_spaces(test_server_spaces) == test_server);
+
+        string test_server_ce = "http://test.opendap.org/file.txt?u,v";
+        CPPUNIT_ASSERT(prune_spaces(test_server_ce) == test_server_ce);
+
+        string test_server_ce_spaces = "http://test.opendap.org/file.txt? u,v";
+        DBG(cerr << "Test Server CE Spaces: "
+            << prune_spaces(test_server_ce_spaces) << endl);
+        CPPUNIT_ASSERT(prune_spaces(test_server_ce_spaces) == test_server_ce);
+
+        string hdf_two_var =
+            "http://test.opendap.org/dap/data/hdf/S3096277.HDF.Z?Avg_Wind_Speed[0:5][0],RMS_Wind_Speed[0:5][0]";
+        CPPUNIT_ASSERT(prune_spaces(hdf_two_var) == hdf_two_var);
+    }
+
+    void path_to_filename_test()
+    {
+        CPPUNIT_ASSERT(path_to_filename("/this/is/the/end/my.friend") == "my.friend");
+        CPPUNIT_ASSERT(path_to_filename("this.dat") == "this.dat");
+        CPPUNIT_ASSERT(path_to_filename("/this.dat") == "this.dat");
+        CPPUNIT_ASSERT(path_to_filename("/this.dat/") == "");
+    }
+
+    void hexstring_test()
+    {
+        CPPUNIT_ASSERT(hexstring('[') == "5b");
+        CPPUNIT_ASSERT(hexstring(']') == "5d");
+        CPPUNIT_ASSERT(hexstring(' ') == "20");
+        CPPUNIT_ASSERT(hexstring('%') == "25");
+    }
+
+    void unhexstring_test()
+    {
+        CPPUNIT_ASSERT(unhexstring("5b") == "[");
+        CPPUNIT_ASSERT(unhexstring("5d") == "]");
+        CPPUNIT_ASSERT(unhexstring("20") == " ");
+        CPPUNIT_ASSERT(unhexstring("25") == "%");
+        CPPUNIT_ASSERT(unhexstring("5B") == "[");
+        CPPUNIT_ASSERT(unhexstring("5D") == "]");
+    }
+
+    void id2www_test()
+    {
+        CPPUNIT_ASSERT(id2www("this") == "this");
+        CPPUNIT_ASSERT(id2www("This is a test") == "This%20is%20a%20test");
+        CPPUNIT_ASSERT(id2www("This.is") == "This.is");
+        CPPUNIT_ASSERT(id2www("This-is") == "This-is");
+        CPPUNIT_ASSERT(id2www("This_is") == "This_is");
+        CPPUNIT_ASSERT(id2www("This/is") == "This/is");
+        CPPUNIT_ASSERT(id2www("This%is") == "This%25is");
+        CPPUNIT_ASSERT(id2www("This&is") == "This%26is");
+        CPPUNIT_ASSERT(id2www("%This&is") == "%25This%26is");
+    }
+
+    void www2id_test()
+    {
+        CPPUNIT_ASSERT(www2id("This_is_a_test") == "This_is_a_test");
+        CPPUNIT_ASSERT(www2id("This is a test") == "This is a test");
+        CPPUNIT_ASSERT(www2id("%5b") == "[");
+        CPPUNIT_ASSERT(www2id("%5d") == "]");
+        CPPUNIT_ASSERT(www2id("u%5b0%5d") == "u[0]");
+        CPPUNIT_ASSERT(www2id("WVC%20Lat") == "WVC Lat");
+        CPPUNIT_ASSERT(www2id("Grid.Data%20Fields[20][20]") == "Grid.Data Fields[20][20]");
+
+        CPPUNIT_ASSERT(www2id("Grid.Data%3aFields[20][20]") == "Grid.Data:Fields[20][20]");
+
+        CPPUNIT_ASSERT(www2id("Grid%3aData%20Fields%5b20%5d[20]", "%", "%20") == "Grid:Data%20Fields[20][20]");
+
+        CPPUNIT_ASSERT(www2id("Grid%20Data%26Fields[20][20]", "%", "%20") == "Grid%20Data&Fields[20][20]");
+
+        CPPUNIT_ASSERT(www2id("Grid%20Data%26Fields[20][20]", "%", "%20%26") == "Grid%20Data%26Fields[20][20]");
+        //cerr << "www2id(\"%25This%26is\"): " << www2id("%25This%26is") << endl;
+        CPPUNIT_ASSERT(www2id("%25This%26is") == "%This&is");
+        //cerr << "www2id(\"OPF_MaxSpectralPixelsMissing%d4\"): " << www2id("OPF_MaxSpectralPixelsMissing%d4") << endl;
+        //CPPUNIT_ASSERT(www2id("OPF_MaxSpectralPixelsMissing%d4") == "OPF_MaxSpectralPixelsMissing?");
+    }
+
+    // This is the code in expr.lex that removes enclosing double quotes and
+    // %20 sequences from a string. I copied this here because that actual
+    // function uses globals and would be hard to test. 7/11/2001 jhrg
+    string *store_str(const char *text)
+    {
+        string *s = new string(www2id(string(text)));
+
+        if (*s->begin() == '\"' && *(s->end() - 1) == '\"') {
+            s->erase(s->begin());
+            s->erase(s->end() - 1);
+        }
+
+        return s;
+    }
+
+    // The MS VC++ compiler does not like escapes in string arguments passed
+    // to macros. 04/23/03 jhrg
+    void ce_string_parse_test()
+    {
+        string *str = new string("testing");
+        string *str1 = new string("testing");
+        string *result = store_str(str->c_str());
+        CPPUNIT_ASSERT(*result == *str1);
+        delete result;
+        *str = "\"testing\"";
+        *str1 = "testing";
+        result = store_str(str->c_str());
+        CPPUNIT_ASSERT(*result == *str1);
+        delete result;
+        *str = "\"test%20ing\"";
+        *str1 = "test ing";
+        result = store_str(str->c_str());
+        CPPUNIT_ASSERT(*result == *str1);
+        delete result;
+        delete str;
+        str = 0;
+        delete str1;
+        str1 = 0;
+    }
+
+    void escattr_test()
+    {
+        // The backslash escapes the double quote; in the returned string the
+        // first two backslashes are a single escaped bs, the third bs
+        // escapes the double quote.
+        string str = "this_contains a double quote (\")";
+        string str1 = "this_contains a double quote (\\\")";
+        CPPUNIT_ASSERT(escattr(str) == str1);
+
+        str = "this_contains a backslash (\\)";
+        str1 = "this_contains a backslash (\\\\)";
+        CPPUNIT_ASSERT(escattr(str) == str1);
+    }
+
+    void unescattr_test()
+    {
+        CPPUNIT_ASSERT(unescattr("attr") == "attr");
+
+        CPPUNIT_ASSERT(unescattr("\\\\attr") == "\\attr");
+
+        DBG(cerr << "XXX" << unescattr("\\\"attr") << "XXX" << endl);
+        CPPUNIT_ASSERT(unescattr("\\\"attr") == "\"attr");
+
+        char A_200_177[4] = { (char) 128, 127, 'A', '\0' };
+        DBG(cerr << "XXX" << unescattr("\\200\\177A") << "XXX" << endl);
+        CPPUNIT_ASSERT(unescattr("\\200\\177A") == string(A_200_177));
+
+        DBG(cerr << "XXX" << unescattr("\\\\200\\\\177A") << "XXX" << endl);
+        CPPUNIT_ASSERT(unescattr("\\\\200\\\\177A") == string(A_200_177));
+
+        DBG(cerr << "XXX" << unescattr("\\\\200\\\\177AZ$&") << "XXX" << endl);
+
+        DBG(cerr << "XXX" << unescattr("\\\\200") << "XXX" << endl);
+    }
+
+    void munge_error_message_test()
+    {
+        string str = "An Error";
+        string str1 = "\"An Error\"";
+        DBG(cerr << "Munge: " << munge_error_message(str) << endl);
+        CPPUNIT_ASSERT(munge_error_message(str) == str1);
+
+        str = "\"An Error\"";
+        str1 = "\"An Error\"";
+        DBG(cerr << "Munge: " << munge_error_message(str) << endl);
+        CPPUNIT_ASSERT(munge_error_message(str) == str1);
+
+        str = "An \"E\"rror";
+        str1 = "\"An \\\"E\\\"rror\"";
+        DBG(cerr << "Munge: " << munge_error_message(str) << endl);
+        CPPUNIT_ASSERT(munge_error_message(str) == str1);
+
+        str = "An \\\"E\\\"rror";
+        str1 = "\"An \\\"E\\\"rror\"";
+        DBG(cerr << "Munge: " << munge_error_message(str) << endl);
+        CPPUNIT_ASSERT(munge_error_message(str) == str1);
+    }
+
+#if 0
+    // Moved function to HTTPConect.
+    void get_tempfile_template_test() {
+#ifdef WIN32
+        if (_putenv("TMPDIR=C:\\") == 0) {
+            DBG(cerr << "TMPDIR: " << getenv("TMPDIR") << endl);
+            CPPUNIT_ASSERT(strcmp(get_tempfile_template("DODSXXXXXX"),
+                    "C:\\DODSXXXXXX") == 0);
+        }
+        else
+        cerr << "Did not test setting TMPDIR; no test" << endl;
+#else
+        if (setenv("TMPDIR", "/tmp", 1) == 0) {
+            DBG(cerr << "TMPDIR: " << getenv("TMPDIR") << endl);
+            CPPUNIT_ASSERT(strcmp(get_tempfile_template("DODSXXXXXX"),
+                    "/tmp/DODSXXXXXX") == 0);
+        }
+        else
+        cerr << "Did not test setting TMPDIR; no test" << endl;
+#endif
+
+#if !defined(WIN32) && defined(P_tmpdir)
+        string tmplt = P_tmpdir;
+        tmplt.append("/"); tmplt.append("DODSXXXXXX");
+        putenv("TMPDIR=");
+        CPPUNIT_ASSERT(strcmp(get_tempfile_template("DODSXXXXXX"),
+                tmplt.c_str()) == 0);
+#endif
+    }
+#endif
+
+    void id2xml_test()
+    {
+        CPPUNIT_ASSERT(id2xml("abcdef") == "abcdef");
+        CPPUNIT_ASSERT(id2xml("abc<def") == "abc&lt;def");
+        CPPUNIT_ASSERT(id2xml("abc>def") == "abc&gt;def");
+        CPPUNIT_ASSERT(id2xml("abc&def") == "abc&amp;def");
+        CPPUNIT_ASSERT(id2xml("abc'def") == "abc&apos;def");
+        CPPUNIT_ASSERT(id2xml("abc\"def") == "abc&quot;def");
+        CPPUNIT_ASSERT(id2xml("abc<<def") == "abc&lt;&lt;def");
+        CPPUNIT_ASSERT(id2xml("abc>>def>") == "abc&gt;&gt;def&gt;");
+        CPPUNIT_ASSERT(id2xml("abc&def&") == "abc&amp;def&amp;");
+        CPPUNIT_ASSERT(id2xml("'abc'def") == "&apos;abc&apos;def");
+        CPPUNIT_ASSERT(id2xml("\"abc\"def\"") == "&quot;abc&quot;def&quot;");
+        // To get '\\' in a string both the backslashes must be escaped.
+        DBG(cerr << id2xml("octal escape: \\\\012") << endl);
+        CPPUNIT_ASSERT(id2xml("octal escape: \\\\012") == "octal escape: \\\\012");
+    }
+
+    void xml2id_test()
+    {
+        CPPUNIT_ASSERT(xml2id("abcdef") == "abcdef");
+        CPPUNIT_ASSERT(xml2id("abc&lt;def") == "abc<def");
+        CPPUNIT_ASSERT(xml2id("abc&gt;def") == "abc>def");
+        CPPUNIT_ASSERT(xml2id("abc&amp;def") == "abc&def");
+        CPPUNIT_ASSERT(xml2id("abc&apos;def") == "abc'def");
+        CPPUNIT_ASSERT(xml2id("abc&quot;def") == "abc\"def");
+        CPPUNIT_ASSERT(xml2id("abc&lt;&lt;def") == "abc<<def");
+        CPPUNIT_ASSERT(xml2id("abc&gt;&gt;def&gt;") == "abc>>def>");
+        CPPUNIT_ASSERT(xml2id("abc&amp;def&amp;") == "abc&def&");
+        CPPUNIT_ASSERT(xml2id("&apos;abc&apos;def") == "'abc'def");
+        CPPUNIT_ASSERT(xml2id("&quot;abc&quot;def&quot;") == "\"abc\"def\"");
+    }
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION (generalUtilTest);
+
+int main(int argc, char*argv[])
+{
+    GetOpt getopt(argc, argv, "dh");
+    int option_char;
+
+    while ((option_char = getopt()) != -1)
+        switch (option_char) {
+        case 'd':
+            debug = 1;  // debug is a static global
+            break;
+        case 'h': {     // help - show test names
+            cerr << "Usage: generalUtilTest has the following tests:" << endl;
+            const std::vector<Test*> &tests = generalUtilTest::suite()->getTests();
+            unsigned int prefix_len = generalUtilTest::suite()->getName().append("::").length();
+            for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+                cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+            }
+            break;
+        }
+        default:
+            break;
+        }
+
+    CppUnit::TextTestRunner runner;
+    runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
+    bool wasSuccessful = true;
+    string test = "";
+    int i = getopt.optind;
+    if (i == argc) {
+        // run them all
+        wasSuccessful = runner.run("");
+    }
+    else {
+        for (; i < argc; ++i) {
+            if (debug) cerr << "Running " << argv[i] << endl;
+            test = generalUtilTest::suite()->getName().append("::").append(argv[i]);
+            wasSuccessful = wasSuccessful && runner.run(test);
+        }
+    }
+
+    xmlMemoryDump();
+
+    return wasSuccessful ? 0 : 1;
+}
+
diff --git a/unit-tests/marshT.cc b/unit-tests/marshT.cc
new file mode 100644
index 0000000..f689f9c
--- /dev/null
+++ b/unit-tests/marshT.cc
@@ -0,0 +1,447 @@
+#include <cppunit/TestFixture.h>
+#include <cppunit/TestAssert.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+#include <cppunit/ui/text/TestRunner.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/CompilerOutputter.h>
+
+#include "config.h"
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include <iostream>
+#include <fstream>
+#include <cstring>
+
+#include "TestByte.h"
+#include "TestInt16.h"
+#include "TestInt32.h"
+#include "TestUInt16.h"
+#include "TestUInt32.h"
+#include "TestFloat32.h"
+#include "TestFloat64.h"
+#include "TestStr.h"
+#include "TestUrl.h"
+#include "TestArray.h"
+#include "TestStructure.h"
+#include "TestSequence.h"
+#include "DataDDS.h"
+#include "ConstraintEvaluator.h"
+#include "TestTypeFactory.h"
+#include "XDRFileMarshaller.h"
+#include "XDRStreamMarshaller.h"
+#include "XDRFileUnMarshaller.h"
+
+#include "GetOpt.h"
+#include "debug.h"
+
+using std::cerr;
+using std::cout;
+using std::endl;
+using std::ofstream;
+using namespace CppUnit;
+
+int test_variable_sleep_interval = 0; // Used in Test* classes for testing timeouts.
+
+static bool debug = false;
+
+#undef DBG
+#define DBG(x) do { if (debug) {x;} } while(false)
+
+/**
+ * This test has been rewritten so that it no longer depends on the values
+ * of Array remaining in place (in the Array object) once serialize() is run.
+ * This is part of a change in libdap that will reduce memory consumption
+ * when serializing datasets with large numbers of (large) variables.
+ * jhrg 8/4/15
+ */
+class marshT: public CppUnit::TestFixture {
+private:
+    TestByte *b;
+    TestInt16 *i16;
+    TestInt32 *i32;
+    TestUInt16 *ui16;
+    TestUInt32 *ui32;
+    TestFloat32 *f32;
+    TestFloat64 *f64;
+    TestStr *str;
+    TestUrl *url;
+    TestByte *ab;
+
+    TestArray *arr;
+
+    TestStructure *s;
+
+    TestSequence *seq, *seq2;
+
+public:
+    marshT() :
+        b(0), i16(0), i32(0), ui16(0), ui32(0), f32(0), f64(0), str(0), url(0), ab(0), arr(0), s(0), seq(0), seq2(0)
+    {
+
+    }
+
+    void setUp()
+    {
+        b = new TestByte("b");
+        i16 = new TestInt16("i16");
+        i32 = new TestInt32("i32");
+        ui16 = new TestUInt16("ui16");
+        ui32 = new TestUInt32("ui32");
+        f32 = new TestFloat32("f32");
+        f64 = new TestFloat64("f64");
+        str = new TestStr("str");
+        url = new TestUrl("url");
+
+        ab = new TestByte("ab");
+        arr = new TestArray("arr", ab);
+        arr->append_dim(5, "dim1");
+        arr->append_dim(3, "dim2");
+
+        s = new TestStructure("s");
+        s->add_var(i32);
+        s->add_var(str);
+        s->add_var(arr);
+        s->set_send_p(true);
+
+        seq = new TestSequence("seq");
+        seq->add_var(f64);
+        seq->add_var(arr);
+
+        seq2 = new TestSequence("seq2");
+        seq2->add_var(ui16);
+        seq2->add_var(url);
+        seq2->set_send_p(true);
+
+        seq->add_var(seq2);
+        seq->set_send_p(true);
+        seq->set_leaf_sequence();
+
+        // Need to call read so that the value() method calls in the ..read_test()
+        // will work.
+        b->read();
+        i16->read();
+        i32->read();
+        ui16->read();
+        ui32->read();
+        f32->read();
+        f64->read();
+
+        str->read();
+        url->read();
+        arr->read();
+        s->read();
+    }
+
+    void tearDown()
+    {
+        delete b;
+        b = 0;
+        delete i16;
+        i16 = 0;
+        delete i32;
+        i32 = 0;
+        delete ui16;
+        ui16 = 0;
+        delete ui32;
+        ui32 = 0;
+        delete f32;
+        f32 = 0;
+        delete f64;
+        f64 = 0;
+
+        delete str;
+        str = 0;
+        delete url;
+        url = 0;
+
+        delete ab;
+        ab = 0;
+        delete arr;
+        arr = 0;
+        delete s;
+        s = 0;
+    }
+
+    void marshT_test_write(Marshaller &fm)
+    {
+        ConstraintEvaluator eval;
+        TestTypeFactory ttf;
+        DataDDS dds(&ttf, "dds");
+
+        try {
+            DBG(cerr << "serializing using XDRFileMarshaller" << endl);
+
+            b->serialize(eval, dds, fm, false);
+            i16->serialize(eval, dds, fm, false);
+            i32->serialize(eval, dds, fm, false);
+            ui16->serialize(eval, dds, fm, false);
+            ui32->serialize(eval, dds, fm, false);
+            f32->serialize(eval, dds, fm, false);
+            f64->serialize(eval, dds, fm, false);
+            str->serialize(eval, dds, fm, false);
+            url->serialize(eval, dds, fm, false);
+            s->serialize(eval, dds, fm, false);
+            arr->serialize(eval, dds, fm, false);
+            seq->serialize(eval, dds, fm, false);
+
+            DBG(cerr << "done serializing using XDRFileMarshaller" << endl);
+        }
+        catch (Error &e) {
+            string err = "failed:" + e.get_error_message();
+            CPPUNIT_FAIL(err.c_str());
+        }
+    }
+
+    // This test depends on the file written by the .._write_file() test,
+    // so it must be run after that test.
+    void marshT_test_read(UnMarshaller &um)
+    {
+        TestTypeFactory ttf;
+        DataDDS dds(&ttf, "dds");
+
+        // now read the values in and compare the with each other and the original values
+        try {
+            DBG(cerr << "deserializing XDRFileMarshaller built file" << endl);
+
+            Byte fb("fb");
+            fb.deserialize(um, &dds, false);
+            CPPUNIT_ASSERT(fb.value() == b->value());
+
+            Int16 fi16("i16");
+            fi16.deserialize(um, &dds, false);
+            DBG(cerr << "fi16.value(): " << fi16.value() << ", i16.value(): " << i16->value());
+            CPPUNIT_ASSERT(fi16.value() == 32000);
+
+            DBG(cerr << " file int32" << endl);
+            Int32 fi32("i32");
+            fi32.deserialize(um, &dds, false);
+            DBG(cerr << "fi32.value(): " << fi32.value() << ", i32.value(): " << i32->value());
+            CPPUNIT_ASSERT(fi32.value() == i32->value());
+
+            UInt16 fui16("ui16");
+            fui16.deserialize(um, &dds, false);
+            DBG(cerr << "fui16.value(): " << fui16.value() << ", ui16.value(): " << ui16->value());
+            CPPUNIT_ASSERT(fui16.value() == ui16->value());
+
+            UInt32 fui32("ui32");
+            fui32.deserialize(um, &dds, false);
+            DBG(cerr << "fui32.value(): " << fui32.value() << ", ui32.value(): " << ui32->value());
+            CPPUNIT_ASSERT(fui32.value() == ui32->value());
+
+            Float32 ff32("f32");
+            ff32.deserialize(um, &dds, false);
+            DBG(cerr << "ff32.value(): " << ff32.value() << ", f32.value(): " << f32->value());
+            CPPUNIT_ASSERT(ff32.value() == f32->value());
+
+            Float64 ff64("f64");
+            ff64.deserialize(um, &dds, false);
+            DBG(cerr << "ff64.value(): " << ff64.value() << ", f64.value(): " << f64->value());
+            CPPUNIT_ASSERT(ff64.value() == f64->value());
+
+            Str fstr("str");
+            fstr.deserialize(um, &dds, false);
+            DBG(cerr << "fstr.value(): " << fstr.value() << ", str.value(): " << str->value());
+            CPPUNIT_ASSERT(fstr.value() == str->value());
+
+            Url furl("url");
+            furl.deserialize(um, &dds, false);
+            DBG(cerr << "furl.value(): " << furl.value() << ", url.value(): " << url->value());
+            CPPUNIT_ASSERT(furl.value() == url->value());
+
+            TestStructure fs("fs");
+            TestInt32 fsi32("fsi32");
+            fs.add_var(&fsi32);
+            TestStr fsstr("fsstr");
+            fs.add_var(&fsstr);
+            TestByte fsab("fsab");
+            TestArray fsarr("fsarr", &fsab);
+            fsarr.append_dim(5, "dim1");
+            fsarr.append_dim(3, "dim2");
+            fs.add_var(&fsarr);
+            fs.deserialize(um, &dds, false);
+
+            Int32 *fsi32_p = dynamic_cast<Int32 *>(fs.var("fsi32"));
+            CPPUNIT_ASSERT(fsi32_p);
+            DBG(cerr << "fsi32.value(): " << fsi32_p->value() << ", i32.value(): " << i32->value());
+            CPPUNIT_ASSERT(fsi32_p->value() == i32->value());
+
+            Str *fsstr_p = dynamic_cast<Str *>(fs.var("fsstr"));
+            CPPUNIT_ASSERT(fsstr_p);
+            DBG(
+                cerr << "fstr.value(): " << fsstr_p->value() << ", str.value(): "
+                    << dynamic_cast<Str *>(s->var("str"))->value());
+            CPPUNIT_ASSERT(fsstr_p->value() == dynamic_cast<Str *>(s->var("str"))->value());
+
+            BaseType *bt = fs.var("fsab");
+            CPPUNIT_ASSERT(bt);
+            Array *fsarr_p = dynamic_cast<Array *>(bt);
+            CPPUNIT_ASSERT(fsarr_p);
+            dods_byte fdb[fsarr_p->length() * sizeof(dods_byte)];
+            dods_byte db[arr->length() * sizeof(dods_byte)];
+            fsarr_p->value(fdb);
+            arr->value(db);
+            CPPUNIT_ASSERT(fsarr_p->length() == arr->length());
+            CPPUNIT_ASSERT(!memcmp((void *) fdb, (void *) db, fsarr_p->length() * sizeof(dods_byte)));
+
+            DBG(cerr << " file array" << endl);
+            TestByte fab("ab");
+            TestArray farr("arr", &fab);
+            farr.append_dim(5, "dim1");
+            farr.append_dim(3, "dim2");
+            farr.deserialize(um, &dds, false);
+            farr.value(fdb);
+            CPPUNIT_ASSERT(farr.length() == arr->length());
+            CPPUNIT_ASSERT(!memcmp((void *) fdb, (void *) db, farr.length() * sizeof(dods_byte)));
+
+            TestSequence fseq("fseq");
+            fseq.add_var(f64);
+            fseq.add_var(arr);
+            TestSequence fseq2("fseq2");
+            fseq2.add_var(ui16);
+            fseq2.add_var(url);
+            fseq2.set_send_p(true);
+            fseq.add_var(&fseq2);
+            fseq.set_leaf_sequence();
+
+            fseq.deserialize(um, &dds, false);
+            unsigned int num_rows = fseq.number_of_rows();
+            CPPUNIT_ASSERT(num_rows == 4);
+            for (unsigned int i = 0; i < num_rows; i++) {
+                BaseTypeRow *row = fseq.row_value(i);
+                CPPUNIT_ASSERT(row);
+                CPPUNIT_ASSERT(row->size() == 3);
+                Float64 *f64_p = dynamic_cast<Float64 *>((*row)[0]);
+                CPPUNIT_ASSERT(f64_p);
+                CPPUNIT_ASSERT(f64_p->value() == f64->value());
+                Array *arr_p = dynamic_cast<Array *>((*row)[1]);
+                CPPUNIT_ASSERT(arr_p);
+                arr_p->value(fdb);
+                CPPUNIT_ASSERT(arr_p->length() == arr->length());
+                CPPUNIT_ASSERT(!memcmp((void *) fdb, (void *) db, arr_p->length() * sizeof(dods_byte)));
+                Sequence *seq_p = dynamic_cast<Sequence *>((*row)[2]);
+                CPPUNIT_ASSERT(seq_p);
+                unsigned int num_rows_sub = seq_p->number_of_rows();
+                CPPUNIT_ASSERT(num_rows == 4);
+                for (unsigned int j = 0; j < num_rows_sub; j++) {
+                    BaseTypeRow *row_sub = seq_p->row_value(j);
+                    CPPUNIT_ASSERT(row_sub);
+                    CPPUNIT_ASSERT(row_sub->size() == 2);
+                    UInt16 *ui16_p = dynamic_cast<UInt16 *>((*row_sub)[0]);
+                    CPPUNIT_ASSERT(ui16_p);
+                    CPPUNIT_ASSERT(ui16_p->value() == ui16->value());
+                    Url *url_p = dynamic_cast<Url *>((*row_sub)[1]);
+                    CPPUNIT_ASSERT(url_p);
+                    CPPUNIT_ASSERT(url_p->value() == url->value());
+                }
+            }
+
+            DBG(cerr << "done deserializing XDRFileMarshaller built file" << endl);
+        }
+        catch (Error &e) {
+            string err = "failed:" + e.get_error_message();
+            CPPUNIT_FAIL(err.c_str());
+        }
+    }
+
+    void marshT_test_write_file()
+    {
+        FILE *f = fopen("test.file", "w");
+        XDRFileMarshaller fm(f);
+
+        marshT_test_write(fm);
+
+        fclose(f);
+    }
+
+    void marshT_test_read_file()
+    {
+        FILE *ff = fopen("test.file", "r");
+        XDRFileUnMarshaller um(ff);
+
+        marshT_test_read(um);
+
+        fclose(ff);
+        unlink("test.file");
+    }
+
+    void marshT_test_write_stream()
+    {
+        ofstream strm("test.strm", ios::out | ios::trunc);
+        XDRStreamMarshaller sm(strm);
+
+        marshT_test_write(sm);
+
+        strm.close();
+    }
+
+    // Not that compelling a test really... (It is the same as .._read_file())
+    void marshT_test_read_stream()
+    {
+        FILE *sf = fopen("test.strm", "r");
+        XDRFileUnMarshaller um(sf);
+
+        marshT_test_read(um);
+
+        fclose(sf);
+        unlink("test.strm");
+    }
+
+    CPPUNIT_TEST_SUITE (marshT);
+
+    CPPUNIT_TEST (marshT_test_write_file);
+    CPPUNIT_TEST (marshT_test_read_file);
+    CPPUNIT_TEST (marshT_test_write_stream);
+    CPPUNIT_TEST (marshT_test_read_stream);
+
+    CPPUNIT_TEST_SUITE_END( );
+
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION (marshT);
+
+int main(int argc, char *argv[])
+{
+    GetOpt getopt(argc, argv, "dh");
+    int option_char;
+
+    while ((option_char = getopt()) != -1)
+        switch (option_char) {
+        case 'd':
+            debug = 1;  // debug is a static global
+            break;
+        case 'h': {     // help - show test names
+            cerr << "Usage: marshT has the following tests:" << endl;
+            const std::vector<Test*> &tests = marshT::suite()->getTests();
+            unsigned int prefix_len = marshT::suite()->getName().append("::").length();
+            for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+                cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+            }
+            break;
+        }
+        default:
+            break;
+        }
+
+    CppUnit::TextTestRunner runner;
+    runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
+    bool wasSuccessful = true;
+    string test = "";
+    int i = getopt.optind;
+    if (i == argc) {
+        // run them all
+        wasSuccessful = runner.run("");
+    }
+    else {
+        for (; i < argc; ++i) {
+            if (debug) cerr << "Running " << argv[i] << endl;
+            test = marshT::suite()->getName().append("::").append(argv[i]);
+            wasSuccessful = wasSuccessful && runner.run(test);
+        }
+    }
+
+    return wasSuccessful ? 0 : 1;
+}
+
diff --git a/unit-tests/parserUtilTest.cc b/unit-tests/parserUtilTest.cc
new file mode 100644
index 0000000..8831160
--- /dev/null
+++ b/unit-tests/parserUtilTest.cc
@@ -0,0 +1,190 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+// 
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+// 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#include <cppunit/TextTestRunner.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+#include <cppunit/extensions/HelperMacros.h>
+
+#include "parser.h"
+
+#include "GetOpt.h"
+
+using namespace CppUnit;
+using namespace libdap;
+using namespace std;
+
+static bool debug = false;
+
+class parserUtilTest: public TestFixture {
+private:
+
+public:
+    parserUtilTest()
+    {
+    }
+    ~parserUtilTest()
+    {
+    }
+
+    void setUp()
+    {
+    }
+
+    void tearDown()
+    {
+    }
+
+    CPPUNIT_TEST_SUITE (parserUtilTest);
+
+    CPPUNIT_TEST (check_byte_test);
+    CPPUNIT_TEST (check_float32_test);
+    CPPUNIT_TEST (check_float64_test);
+
+    CPPUNIT_TEST_SUITE_END();
+
+    // Tests for methods
+    void check_byte_test()
+    {
+        CPPUNIT_ASSERT(check_byte("255"));
+        CPPUNIT_ASSERT(!check_byte("256"));
+        CPPUNIT_ASSERT(check_byte("0"));
+        CPPUNIT_ASSERT(check_byte("-127"));
+        CPPUNIT_ASSERT(check_byte("-128"));
+        CPPUNIT_ASSERT(!check_byte("-129"));
+        CPPUNIT_ASSERT(!check_byte("-32767"));
+        CPPUNIT_ASSERT(!check_byte("32767"));
+    }
+
+    void check_float32_test()
+    {
+        CPPUNIT_ASSERT(check_float32("1.0"));
+        CPPUNIT_ASSERT(check_float32("0.0"));
+        CPPUNIT_ASSERT(check_float32("-0.0"));
+        CPPUNIT_ASSERT(check_float32("+0.0"));
+        CPPUNIT_ASSERT(check_float32(".0"));
+
+        CPPUNIT_ASSERT(!check_float64("3.0.0"));
+        CPPUNIT_ASSERT(!check_float64("3..0"));
+
+        CPPUNIT_ASSERT(check_float32("3.402823466E+38"));
+        CPPUNIT_ASSERT(check_float32("-3.402823466E+38"));
+        CPPUNIT_ASSERT(check_float32("1.175494351E-38"));
+        CPPUNIT_ASSERT(check_float32("-1.175494351E-38"));
+
+        CPPUNIT_ASSERT(check_float32("NaN"));
+        CPPUNIT_ASSERT(check_float32("nan"));
+        CPPUNIT_ASSERT(check_float32("Nan"));
+
+        CPPUNIT_ASSERT(!check_float32("3.502823466E+38"));
+        CPPUNIT_ASSERT(!check_float32("-3.502823466E+38"));
+        CPPUNIT_ASSERT(!check_float32("1.0E-38"));
+        CPPUNIT_ASSERT(!check_float32("-1.0E-38"));
+
+        CPPUNIT_ASSERT(!check_float32("1.7976931348623157E+308"));
+        CPPUNIT_ASSERT(!check_float32("-1.7976931348623157E+308"));
+        CPPUNIT_ASSERT(!check_float32("2.2250738585072014E-308"));
+        CPPUNIT_ASSERT(!check_float32("-2.2250738585072014E-308"));
+    }
+
+    void check_float64_test()
+    {
+        CPPUNIT_ASSERT(check_float64("1.0"));
+        CPPUNIT_ASSERT(check_float64("0.0"));
+        CPPUNIT_ASSERT(check_float64("-0.0"));
+        CPPUNIT_ASSERT(check_float64("+0.0"));
+        CPPUNIT_ASSERT(check_float64(".0"));
+
+        CPPUNIT_ASSERT(!check_float64("3.0.0"));
+        CPPUNIT_ASSERT(!check_float64("3..0"));
+
+        CPPUNIT_ASSERT(check_float64("3.402823466E+38"));
+        CPPUNIT_ASSERT(check_float64("-3.402823466E+38"));
+        CPPUNIT_ASSERT(check_float64("1.175494351E-38"));
+        CPPUNIT_ASSERT(check_float64("-1.175494351E-38"));
+
+        CPPUNIT_ASSERT(check_float64("1.7976931348623157E+308"));
+        CPPUNIT_ASSERT(check_float64("-1.7976931348623157E+308"));
+        CPPUNIT_ASSERT(check_float64("2.2250738585072014E-308"));
+        CPPUNIT_ASSERT(check_float64("-2.2250738585072014E-308"));
+
+        CPPUNIT_ASSERT(check_float64("NaN"));
+        CPPUNIT_ASSERT(check_float64("nan"));
+        CPPUNIT_ASSERT(check_float64("Nan"));
+
+        CPPUNIT_ASSERT(!check_float64("255E400"));
+        CPPUNIT_ASSERT(!check_float64("255E-400"));
+
+        CPPUNIT_ASSERT(!check_float64("1.8E+308"));
+        CPPUNIT_ASSERT(!check_float64("-1.8E+308"));
+        CPPUNIT_ASSERT(!check_float64("2.0E-308"));
+        CPPUNIT_ASSERT(!check_float64("-2.0E-308"));
+    }
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION (parserUtilTest);
+
+int main(int argc, char*argv[])
+{
+    GetOpt getopt(argc, argv, "dh");
+    int option_char;
+
+    while ((option_char = getopt()) != -1)
+        switch (option_char) {
+        case 'd':
+            debug = 1;  // debug is a static global
+            break;
+        case 'h': {     // help - show test names
+            cerr << "Usage: parserUtilTest has the following tests:" << endl;
+            const std::vector<Test*> &tests = parserUtilTest::suite()->getTests();
+            unsigned int prefix_len = parserUtilTest::suite()->getName().append("::").length();
+            for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+                cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+            }
+            break;
+        }
+        default:
+            break;
+        }
+
+    CppUnit::TextTestRunner runner;
+    runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
+    bool wasSuccessful = true;
+    string test = "";
+    int i = getopt.optind;
+    if (i == argc) {
+        // run them all
+        wasSuccessful = runner.run("");
+    }
+    else {
+        for (; i < argc; ++i) {
+            if (debug) cerr << "Running " << argv[i] << std::endl;
+            test = parserUtilTest::suite()->getName().append("::").append(argv[i]);
+            wasSuccessful = wasSuccessful && runner.run(test);
+        }
+    }
+
+    return wasSuccessful ? 0 : 1;
+}
+
diff --git a/unit-tests/rcreader-testsuite/dodsrc_ssl_1 b/unit-tests/rcreader-testsuite/dodsrc_ssl_1
new file mode 100644
index 0000000..f9bf167
--- /dev/null
+++ b/unit-tests/rcreader-testsuite/dodsrc_ssl_1
@@ -0,0 +1,17 @@
+# OPeNDAP client configuation file. See the OPeNDAP
+# users guide for information.
+USE_CACHE=0
+# Cache and object size are given in megabytes (20 ==> 20Mb).
+MAX_CACHE_SIZE=20
+MAX_CACHED_OBJ=5
+IGNORE_EXPIRES=0
+CACHE_ROOT=/home/jimg/.dods_cache/
+DEFAULT_EXPIRES=86400
+ALWAYS_VALIDATE=0
+# Request servers compress responses if possible?
+# 1 (yes) or 0 (false).
+DEFLATE=0
+# Proxy configuration:
+# PROXY_SERVER=<protocol>,<[username:password@]host[:port]>
+# NO_PROXY_FOR=<protocol>,<host|domain>
+# AIS_DATABASE=<file or url>
diff --git a/unit-tests/rcreader-testsuite/dodsrc_ssl_2 b/unit-tests/rcreader-testsuite/dodsrc_ssl_2
new file mode 100644
index 0000000..ff97c71
--- /dev/null
+++ b/unit-tests/rcreader-testsuite/dodsrc_ssl_2
@@ -0,0 +1,19 @@
+# OPeNDAP client configuation file. See the OPeNDAP
+# users guide for information.
+USE_CACHE=0
+# Cache and object size are given in megabytes (20 ==> 20Mb).
+MAX_CACHE_SIZE=20
+MAX_CACHED_OBJ=5
+IGNORE_EXPIRES=0
+CACHE_ROOT=/home/jimg/.dods_cache/
+DEFAULT_EXPIRES=86400
+ALWAYS_VALIDATE=0
+# Request servers compress responses if possible?
+# 1 (yes) or 0 (false).
+DEFLATE=0
+# blah
+VALIDATE_SSL=1
+# Proxy configuration:
+# PROXY_SERVER=<protocol>,<[username:password@]host[:port]>
+# NO_PROXY_FOR=<protocol>,<host|domain>
+# AIS_DATABASE=<file or url>
diff --git a/unit-tests/rcreader-testsuite/dodsrc_ssl_3 b/unit-tests/rcreader-testsuite/dodsrc_ssl_3
new file mode 100644
index 0000000..92ff105
--- /dev/null
+++ b/unit-tests/rcreader-testsuite/dodsrc_ssl_3
@@ -0,0 +1,19 @@
+# OPeNDAP client configuation file. See the OPeNDAP
+# users guide for information.
+USE_CACHE=0
+# Cache and object size are given in megabytes (20 ==> 20Mb).
+MAX_CACHE_SIZE=20
+MAX_CACHED_OBJ=5
+IGNORE_EXPIRES=0
+CACHE_ROOT=/home/jimg/.dods_cache/
+DEFAULT_EXPIRES=86400
+ALWAYS_VALIDATE=0
+# Request servers compress responses if possible?
+# 1 (yes) or 0 (false).
+DEFLATE=0
+# blah
+VALIDATE_SSL=0
+# Proxy configuration:
+# PROXY_SERVER=<protocol>,<[username:password@]host[:port]>
+# NO_PROXY_FOR=<protocol>,<host|domain>
+# AIS_DATABASE=<file or url>
diff --git a/unit-tests/rcreader-testsuite/test1.rc b/unit-tests/rcreader-testsuite/test1.rc
new file mode 100644
index 0000000..471f6e8
--- /dev/null
+++ b/unit-tests/rcreader-testsuite/test1.rc
@@ -0,0 +1,19 @@
+# Test DODS client configuation file.
+USE_CACHE=0
+MAX_CACHE_SIZE=20
+MAX_CACHED_OBJ=5
+IGNORE_EXPIRES=0
+CACHE_ROOT=/home/jimg/.dods_cache/
+DEFAULT_EXPIRES=86400
+ALWAYS_VALIDATE=0
+# Request servers compress responses if possible?
+# 1 (yes) or 0 (false).
+DEFLATE=1
+
+# Proxy configuration:
+# PROXY_SERVER=<protocol>,<host[:port]>
+PROXY_SERVER=http,jimg:mypass@proxy.local.org:8080
+
+NO_PROXY_FOR=http,local.org
+
+# AIS_DATABASE=<file or url>
diff --git a/unit-tests/rcreader-testsuite/test2.rc b/unit-tests/rcreader-testsuite/test2.rc
new file mode 100644
index 0000000..3a66329
--- /dev/null
+++ b/unit-tests/rcreader-testsuite/test2.rc
@@ -0,0 +1,16 @@
+# Test DODS client configuation file.
+USE_CACHE=0
+MAX_CACHE_SIZE=20
+MAX_CACHED_OBJ=5
+IGNORE_EXPIRES=0
+CACHE_ROOT=/home/jimg/.dods_cache/
+DEFAULT_EXPIRES=86400
+ALWAYS_VALIDATE=0
+# Request servers compress responses if possible?
+# 1 (yes) or 0 (false).
+DEFLATE=1
+
+# Proxy configuration:
+# PROXY_SERVER=<protocol>,<host[:port]>
+PROXY_SERVER=http,proxy.local.org
+
diff --git a/unit-tests/rcreader-testsuite/test3.rc b/unit-tests/rcreader-testsuite/test3.rc
new file mode 100644
index 0000000..6b1800b
--- /dev/null
+++ b/unit-tests/rcreader-testsuite/test3.rc
@@ -0,0 +1,17 @@
+# Test DODS client configuation file.
+USE_CACHE=0
+MAX_CACHE_SIZE=20
+MAX_CACHED_OBJ=5
+IGNORE_EXPIRES=0
+CACHE_ROOT=/home/jimg/.dods_cache/
+DEFAULT_EXPIRES=86400
+ALWAYS_VALIDATE=0
+# Request servers compress responses if possible?
+# 1 (yes) or 0 (false).
+DEFLATE=1
+
+# Proxy configuration:
+# PROXY_SERVER=<protocol>,<host[:port]>
+PROXY_SERVER=smtp,error:error@proxy.local.org
+
+# AIS_DATABASE=<file or url>
diff --git a/unit-tests/rcreader-testsuite/test4.rc b/unit-tests/rcreader-testsuite/test4.rc
new file mode 100644
index 0000000..11dc84f
--- /dev/null
+++ b/unit-tests/rcreader-testsuite/test4.rc
@@ -0,0 +1,19 @@
+# Test DODS client configuation file.
+USE_CACHE=0
+MAX_CACHE_SIZE=20
+MAX_CACHED_OBJ=5
+IGNORE_EXPIRES=0
+CACHE_ROOT=/home/jimg/.dods_cache/
+DEFAULT_EXPIRES=86400
+ALWAYS_VALIDATE=0
+# Request servers compress responses if possible?
+# 1 (yes) or 0 (false).
+DEFLATE=1
+
+# Proxy configuration:
+# An alternative form of the PROXY_SERVER that's more intuitive is to not
+# have the protocol given using a comma-separated clause but to include it as
+# part of the host name. Here we test for a mixture of the notations. The new
+# syntax to support is [<protocol>,][http://][user:pw@]host[:port].
+PROXY_SERVER=jimg:test@proxy.local.org:3128
+
diff --git a/unit-tests/rcreader-testsuite/test5.rc b/unit-tests/rcreader-testsuite/test5.rc
new file mode 100644
index 0000000..b4d4800
--- /dev/null
+++ b/unit-tests/rcreader-testsuite/test5.rc
@@ -0,0 +1,19 @@
+# Test DODS client configuation file.
+USE_CACHE=0
+MAX_CACHE_SIZE=20
+MAX_CACHED_OBJ=5
+IGNORE_EXPIRES=0
+CACHE_ROOT=/home/jimg/.dods_cache/
+DEFAULT_EXPIRES=86400
+ALWAYS_VALIDATE=0
+# Request servers compress responses if possible?
+# 1 (yes) or 0 (false).
+DEFLATE=1
+
+# Proxy configuration:
+# An alternative form of the PROXY_SERVER that's more intuitive is to not
+# have the protocol given using a comma-separated clause but to include it as
+# part of the host name. Here we test for a mixture of the notations. The new
+# syntax to support is [<protocol>,][http://][user:pw@]host[:port].
+PROXY_SERVER=http://jimg:test@proxy.local.org:3128
+
diff --git a/unit-tests/sequenceT.cc b/unit-tests/sequenceT.cc
new file mode 100644
index 0000000..2e6804d
--- /dev/null
+++ b/unit-tests/sequenceT.cc
@@ -0,0 +1,175 @@
+#include <cppunit/TestFixture.h>
+#include <cppunit/TestAssert.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+#include <cppunit/ui/text/TestRunner.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/CompilerOutputter.h>
+
+#include <iostream>
+#include "TestSequence.h"
+#include "TestInt16.h"
+#include "TestStr.h"
+#include "TestTypeFactory.h"
+#include "util.h"
+#include "GetOpt.h"
+
+using std::cerr;
+using std::endl;
+
+using namespace libdap;
+using namespace CppUnit;
+
+int test_variable_sleep_interval = 0; // Used in Test* classes for testing
+// timeouts.
+
+static bool debug = false;
+
+class sequenceT: public CppUnit::TestFixture {
+
+    CPPUNIT_TEST_SUITE (sequenceT);
+    CPPUNIT_TEST (sequenceT_test);CPPUNIT_TEST_SUITE_END( );
+
+private:
+    /* TEST PRIVATE DATA */
+    TestTypeFactory *factory;
+
+public:
+    void setUp()
+    {
+        factory = new TestTypeFactory;
+    }
+
+    void tearDown()
+    {
+        delete factory;
+        factory = 0;
+    }
+
+    void sequenceT_test()
+    {
+        TestSequence s("Supporters");
+
+        BaseType *nm = factory->NewStr("Name");
+        s.add_var(nm);
+
+        BaseType *age = factory->NewInt16("Age");
+        s.add_var(age);
+
+        TestSequence *friends = (TestSequence *) factory->NewSequence("Friends");
+        friends->add_var(nm);
+        delete nm;
+        nm = 0;
+        friends->add_var(age);
+        delete age;
+        age = 0;
+        s.add_var(friends);
+        delete friends;
+        friends = 0;
+
+        BaseType *bt = s.var("Age");
+        CPPUNIT_ASSERT(bt->name() == "Age");
+
+        bt = s.var("Age", false);
+        CPPUNIT_ASSERT(bt->name() == "Age");
+
+        BaseType::btp_stack btps;
+        bt = s.var("Friends.Age", btps);
+        CPPUNIT_ASSERT(bt->name() == "Age");
+        CPPUNIT_ASSERT(btps.size() == 2);
+
+        vector<string> names;
+        names.push_back("Friends");
+        names.push_back("Supporters");
+        typedef vector<string>::const_iterator names_iter;
+        names_iter n = names.begin();
+        while (!btps.empty() && n != names.end()) {
+            BaseType *curr = btps.top();
+            CPPUNIT_ASSERT(curr->name() == (*n));
+            btps.pop();
+            n++;
+        }
+
+        int num_elems = s.element_count(false);
+        CPPUNIT_ASSERT(num_elems == 3);
+
+        num_elems = s.element_count(true);
+        CPPUNIT_ASSERT(num_elems == 4);
+
+#if 0
+        // This is only true on 32 bit machines, on a 64bit machine is will
+        // probably be 24.
+        unsigned int w = s.width( );
+        CPPUNIT_ASSERT( w == 12 );
+#endif
+
+        vector<string> elems;
+        elems.push_back("Name");
+        elems.push_back("Age");
+        elems.push_back("Friends");
+        typedef vector<string>::const_iterator elems_iter;
+
+        Sequence::Vars_iter v = s.var_begin();
+        elems_iter e = elems.begin();
+        for (; v != s.var_end() && e != elems.end(); v++, e++) {
+            CPPUNIT_ASSERT((*v)->name() == (*e));
+        }
+        CPPUNIT_ASSERT(v == s.var_end() && e == elems.end());
+        if (v != s.var_end() && e == elems.end()) {
+            CPPUNIT_FAIL("Too many elements");
+        }
+        else if (v == s.var_end() && e != elems.end()) {
+            CPPUNIT_FAIL("Too few elements");
+        }
+
+        int num_rows = s.number_of_rows();
+        CPPUNIT_ASSERT(num_rows == 0);
+    }
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION (sequenceT);
+
+/* NOTHING NEEDS TO BE CHANGED BELOW HERE */
+
+int main(int argc, char*argv[])
+{
+    GetOpt getopt(argc, argv, "dh");
+    int option_char;
+
+    while ((option_char = getopt()) != -1)
+        switch (option_char) {
+        case 'd':
+            debug = 1;  // debug is a static global
+            break;
+        case 'h': {     // help - show test names
+            cerr << "Usage: sequenceT has the following tests:" << endl;
+            const std::vector<Test*> &tests = sequenceT::suite()->getTests();
+            unsigned int prefix_len = sequenceT::suite()->getName().append("::").length();
+            for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+                cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+            }
+            break;
+        }
+        default:
+            break;
+        }
+
+    CppUnit::TextTestRunner runner;
+    runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
+    bool wasSuccessful = true;
+    string test = "";
+    int i = getopt.optind;
+    if (i == argc) {
+        // run them all
+        wasSuccessful = runner.run("");
+    }
+    else {
+        for (; i < argc; ++i) {
+            if (debug) cerr << "Running " << argv[i] << endl;
+            test = sequenceT::suite()->getName().append("::").append(argv[i]);
+            wasSuccessful = wasSuccessful && runner.run(test);
+        }
+    }
+    return wasSuccessful ? 0 : 1;
+}
+
diff --git a/unit-tests/server-testsuite/bears.data b/unit-tests/server-testsuite/bears.data
new file mode 100644
index 0000000..838cdff
--- /dev/null
+++ b/unit-tests/server-testsuite/bears.data
@@ -0,0 +1,9 @@
+The data:
+Grid {
+ ARRAY:
+    String bears[i = 2][j = 3][l = 3];
+ MAPS:
+    Int32 i[i = 2];
+    Float32 j[j = 3];
+    Int16 l[l = 3];
+} bears = { ARRAY: {{{"i", "n", "d"},{"i", "s", "t"},{"i", "n", "g"}},{{"u", "i", "s"},{"h", "a", "b"},{"l", "e", ""}}} MAPS: {10, 20}, {2, 4, 6}, {10, 9, 8} };
diff --git a/unit-tests/server-testsuite/coads.data b/unit-tests/server-testsuite/coads.data
new file mode 100644
index 0000000..effe360
--- /dev/null
+++ b/unit-tests/server-testsuite/coads.data
@@ -0,0 +1 @@
+ncddsserver:couldnotopenfile/usr/local/spool/http/data/coads_climatology.nc
\ No newline at end of file
diff --git a/unit-tests/server-testsuite/coads.data.das b/unit-tests/server-testsuite/coads.data.das
new file mode 100644
index 0000000..32c9c4d
--- /dev/null
+++ b/unit-tests/server-testsuite/coads.data.das
@@ -0,0 +1,6 @@
+Attributes{
+    DODS_GLOBAL {
+	String About "This is used to test find_ancillary_das()";
+    }
+}
+
diff --git a/unit-tests/server-testsuite/dsp_1.data b/unit-tests/server-testsuite/dsp_1.data
new file mode 100644
index 0000000..d253666
--- /dev/null
+++ b/unit-tests/server-testsuite/dsp_1.data
@@ -0,0 +1,2 @@
+The data:
+Byte dsp_band_1[line = 11][pixel = 11] = {{162, 156, 152, 162, 159, 152, 147, 165, 159, 156, 150},{155, 160, 155, 150, 154, 156, 151, 150, 151, 144, 160},{159, 164, 154, 159, 156, 161, 149, 149, 149, 150, 156},{144, 161, 165, 149, 157, 151, 145, 146, 149, 146, 152},{151, 159, 158, 156, 149, 151, 145, 145, 149, 147, 151},{150, 152, 159, 163, 158, 148, 150, 145, 145, 145, 148},{154, 154, 148, 145, 153, 153, 149, 146, 144, 148, 148},{157, 133, 147, 147, 157, 150, 150, 148, 148, 148, 148},{143, 147, 148, 149, 154, 159, 153, 150, 156, 143, 146},{130, 135, 128, 156, 153, 159, 146, 146, 144, 143, 128},{13, 14, 13, 10, 12, 13, 14, 14, 15, 15, 15}};
diff --git a/unit-tests/server-testsuite/ff_test1_ce1.data b/unit-tests/server-testsuite/ff_test1_ce1.data
new file mode 100644
index 0000000..fdfc8ab
--- /dev/null
+++ b/unit-tests/server-testsuite/ff_test1_ce1.data
@@ -0,0 +1,5 @@
+The data:
+Sequence {
+    Int32 year;
+} JPL_Pathfinder = { { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 } };
+
diff --git a/unit-tests/server-testsuite/ff_test1_ce2.data b/unit-tests/server-testsuite/ff_test1_ce2.data
new file mode 100644
index 0000000..fdfc8ab
--- /dev/null
+++ b/unit-tests/server-testsuite/ff_test1_ce2.data
@@ -0,0 +1,5 @@
+The data:
+Sequence {
+    Int32 year;
+} JPL_Pathfinder = { { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 } };
+
diff --git a/unit-tests/server-testsuite/ff_test2_ce1.data b/unit-tests/server-testsuite/ff_test2_ce1.data
new file mode 100644
index 0000000..a9ac078
--- /dev/null
+++ b/unit-tests/server-testsuite/ff_test2_ce1.data
@@ -0,0 +1,5 @@
+The data:
+Sequence {
+    Int32 year;
+} JPL%20Pathfinder = { { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 } };
+
diff --git a/unit-tests/server-testsuite/ff_test2_ce2.data b/unit-tests/server-testsuite/ff_test2_ce2.data
new file mode 100644
index 0000000..a9ac078
--- /dev/null
+++ b/unit-tests/server-testsuite/ff_test2_ce2.data
@@ -0,0 +1,5 @@
+The data:
+Sequence {
+    Int32 year;
+} JPL%20Pathfinder = { { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 } };
+
diff --git a/unit-tests/server-testsuite/ff_test2_ce3.data b/unit-tests/server-testsuite/ff_test2_ce3.data
new file mode 100644
index 0000000..a9ac078
--- /dev/null
+++ b/unit-tests/server-testsuite/ff_test2_ce3.data
@@ -0,0 +1,5 @@
+The data:
+Sequence {
+    Int32 year;
+} JPL%20Pathfinder = { { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1985 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1989 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1990 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1991 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1992 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1993 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1994 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 }, { 1995 } };
+
diff --git a/unit-tests/server-testsuite/fnoc1.data b/unit-tests/server-testsuite/fnoc1.data
new file mode 100644
index 0000000..0d5d9ce
--- /dev/null
+++ b/unit-tests/server-testsuite/fnoc1.data
@@ -0,0 +1,2 @@
+The data:
+Int16 u[time_a = 1][lat = 10][lon = 10] = {{{-1728, -2449, -3099, -3585, -3254, -2406, -1252, 662, 2483, 2910},{-1686, -1985, -2508, -3397, -3501, -3268, -2700, -705, 1834, 2728},{-223, -864, -864, -1152, -1427, -1717, -1992, -1211, 791, 2235},{1924, 1664, 1555, 1551, 1190, 430, -459, -453, 914, 2055},{2869, 3660, 3561, 3069, 2378, 1453, 601, 479, 953, 1237},{2012, 2885, 3172, 2734, 2141, 1453, 795, 420, -98, -415},{685, 1311, 1566, 1458, 1174, 762, 327, -113, -779, -1281},{-135, 336, 408, 261, -1, -305, -509, -664, -932, -1326},{-628, -593, -482, -575, -792, -1064, -1290, -1280, -1125, -1202},{-903, -1244, -1158, -1036, -1219, -1432, -1556, -1551, -1223, -1041}}};
diff --git a/unit-tests/server-testsuite/jg_diatoms.data b/unit-tests/server-testsuite/jg_diatoms.data
new file mode 100644
index 0000000..121f994
--- /dev/null
+++ b/unit-tests/server-testsuite/jg_diatoms.data
@@ -0,0 +1,7 @@
+The data:
+    Sequence {
+        String sta;
+        String event;
+        String diatom_Nit_bi;
+    } Level_0;
+ = { { 5, 11031315, 21.0 }, { 8, 11032135, 67.8 }, { 11, 11041345, 43.3 }, { 17, 11071306, 66.8 }, { 22, 11080700, 63.5 }, { 25, 11082125, 68.2 }, { 28, 11091230, 54.2 }, { 30, 11100107, 63.5 }, { 33, 11101455, 61.2 }, { 37, 11110740, 50.7 }, { 42, 11120301, 53.7 }, { 51, 11150953, 64.4 }, { 54, 11160237, 38.8 }};
\ No newline at end of file
diff --git a/unit-tests/server-testsuite/jg_test.data b/unit-tests/server-testsuite/jg_test.data
new file mode 100644
index 0000000..8bcd7eb
--- /dev/null
+++ b/unit-tests/server-testsuite/jg_test.data
@@ -0,0 +1,9 @@
+The data:
+Sequence {
+    String year;
+    String month;
+    String lat;
+    String lon;
+    String sal;
+} Level_0 = { { "81", "6", "37.93", "-72.69", "33.787" }, { "81", "6", "37.93", "-72.69", "35.001" }, { "81", "6", "37.93", "-72.69", "35.298" }, { "81", "6", "37.93", "-72.69", "35.426" }, { "81", "6", "37.93", "-72.69", "35.592" }, { "81", "6", "37.93", "-72.69", "35.416" }, { "81", "6", "37.93", "-72.69", "35.119" }, { "81", "6", "37.93", "-72.69", "35.029" }, { "81", "6", "37.93", "-72.69", "34.973" }, { "81", "6", "37.93", "-72.69", "34.973" }, { "81", "6", "37.93", "-72.69", "34.974" }, { "81", "6", "37.93", "-72.69", "34.986" }, { "81", "6", "37.93", "-72.69", "34.985" }, { "81", "6", "37.78", "-72.43", "33.459" }, { "81", "6", "37.78", "-72.43", "34.449" }, { "81", "6", "37.78", "-72.43", "34.922" }, { "81", "6", "37.78", "-72.43", "35.473" }, { "81", "6", "37.78", "-72.43", "35.558" }, { "81", "6", "37.78", "-72.43", "35.506" }, { "81", "6", "37.78", "-72.43", "35.165" }, { "81", "6", "37.78", "-72.43", "35.060" }, { "81", "6", "37.78", "-72.43", "34.981" }, { "81", "6", "37.78", "-72.43", "34.960" }, { "81", "6", "37.78", "-72.43", "34.979" }, { "81", "6", "37.78", "-72.43", "34.972" }, { "81", "6", "37.78", "-72.43", "34.974" }, { "81", "6", "37.61", "-72.20", "33.222" }, { "81", "6", "37.61", "-72.20", "34.897" }, { "81", "6", "37.61", "-72.20", "35.015" }, { "81", "6", "37.61", "-72.20", "35.613" }, { "81", "6", "37.61", "-72.20", "35.851" }, { "81", "6", "37.61", "-72.20", "35.694" }, { "81", "6", "37.61", "-72.20", "35.332" }, { "81", "6", "37.61", "-72.20", "35.085" }, { "81", "6", "37.61", "-72.20", "34.988" }, { "81", "6", "37.61", "-72.20", "34.970" }, { "81", "6", "37.61", "-72.20", "34.987" }, { "81", "6", "37.61", "-72.20", "34.983" }, { "81", "6", "37.61", "-72.20", "34.980" } };
+
diff --git a/unit-tests/server-testsuite/nscat_hdf.data b/unit-tests/server-testsuite/nscat_hdf.data
new file mode 100644
index 0000000..decb61c
--- /dev/null
+++ b/unit-tests/server-testsuite/nscat_hdf.data
@@ -0,0 +1,5 @@
+The data:
+Structure {
+    Int16 WVC_Lat[row = 2][WVC = 2];
+} NSCAT%20Rev%2020 = { {{2611, 2617},{-9000, 2661}} };
+
diff --git a/unit-tests/server-testsuite/nscat_s2.data b/unit-tests/server-testsuite/nscat_s2.data
new file mode 100644
index 0000000..67bb094
--- /dev/null
+++ b/unit-tests/server-testsuite/nscat_s2.data
@@ -0,0 +1,2 @@
+The data:
+Float64 NSCAT_S2[NSCAT_S2_row = 1][NSCAT_S2_column = 6] = {{46002, 96, 9, 15, 18, 50}};
diff --git a/unit-tests/server-testsuite/response_builder_invoke_server_side_function_test.txt b/unit-tests/server-testsuite/response_builder_invoke_server_side_function_test.txt
new file mode 100644
index 0000000..f58b9b0
--- /dev/null
+++ b/unit-tests/server-testsuite/response_builder_invoke_server_side_function_test.txt
@@ -0,0 +1,19 @@
+HTTP/1.0 200 OK
+XDODS-Server: .*
+XOPeNDAP-Server: .*
+XDAP: .*
+Date: .*
+Last-Modified: .*
+Content-Type: application/octet-stream
+Content-Description: dods_data
+
+Dataset .
+    String version;
+. function_result_test;
+Data:
+.<.xml version="1.0" encoding="UTF-8".>
+<ds:functions xmlns:ds="http://xml.opendap.org/ns/DAP/4.0/dataset-services#">
+    <ds:function  name="rbFuncTest" version="1.0" type="basetype" role="http://services.opendap.org/dap4/unit-tests/ResponseBuilderTest" >
+        <ds:Description href="http://docs.opendap.org/index.php/Hyrax:_Server_Side_Functions">Returns a list of the functions held in the ServerFunctionsList object</ds:Description>
+    </ds:function>
+</functions>
diff --git a/unit-tests/server-testsuite/send_das_baseline.txt b/unit-tests/server-testsuite/send_das_baseline.txt
new file mode 100644
index 0000000..e429beb
--- /dev/null
+++ b/unit-tests/server-testsuite/send_das_baseline.txt
@@ -0,0 +1,15 @@
+HTTP/1.0 200 OK.*
+XDODS-Server:.*
+XOPeNDAP-Server:.*
+XDAP:.*
+Date:.*
+Last-Modified:.*
+Content-Type: text/plain.*
+Content-Description: dods_das.*
+.*
+Attributes \{
+    a \{
+        Int32 size 7;
+        String type "cars";
+    \}
+\}.*
\ No newline at end of file
diff --git a/unit-tests/server-testsuite/send_dds_baseline.txt b/unit-tests/server-testsuite/send_dds_baseline.txt
new file mode 100644
index 0000000..6e8bc62
--- /dev/null
+++ b/unit-tests/server-testsuite/send_dds_baseline.txt
@@ -0,0 +1,12 @@
+HTTP/1.0 200 OK.*
+XDODS-Server:.*
+XOPeNDAP-Server:.*
+XDAP:.*
+Date:.*
+Last-Modified:.*
+Content-Type: text/plain.*
+Content-Description: dods_dds.*
+.*
+Dataset \{
+    Byte a;
+\} test;.*
\ No newline at end of file
diff --git a/unit-tests/server-testsuite/simple_function_baseline.txt b/unit-tests/server-testsuite/simple_function_baseline.txt
new file mode 100644
index 0000000..a1532db
--- /dev/null
+++ b/unit-tests/server-testsuite/simple_function_baseline.txt
@@ -0,0 +1,13 @@
+HTTP/1.0 200 OK.*
+XDODS-Server:.*
+XOPeNDAP-Server:.*
+XDAP:.*
+Date:.*
+Last-Modified:.*
+Content-Type: application/octet-stream.*
+Content-Description: dods_data.*
+.*
+Dataset \{
+    String result;
+\} function_result_test;
+.*
\ No newline at end of file
diff --git a/unit-tests/structT.cc b/unit-tests/structT.cc
new file mode 100644
index 0000000..02046d4
--- /dev/null
+++ b/unit-tests/structT.cc
@@ -0,0 +1,194 @@
+#include <cppunit/TestFixture.h>
+#include <cppunit/TestAssert.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+#include <cppunit/ui/text/TestRunner.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/CompilerOutputter.h>
+
+#include <iostream>
+#include <sstream>
+#include "TestStructure.h"
+#include "TestArray.h"
+#include "TestInt16.h"
+#include "TestStr.h"
+#include "TestTypeFactory.h"
+#include "util.h"
+#include "GetOpt.h"
+
+using std::cerr;
+using std::endl;
+using std::ostringstream;
+
+using namespace CppUnit;
+
+int test_variable_sleep_interval = 0; // Used in Test* classes for testing
+// timeouts.
+
+static bool debug = false;
+
+string ExpectedPrint1(
+    "Structure {\n\
+    Int16 name_int16;\n\
+    String name_str;\n\
+    Int16 array_int[dim1 = 4][dim2 = 3][dim3 = 2];\n\
+} my_structure = { 32000, \"Silly test string: 1\", {{{32000, 32000},{32000, 32000},{32000, 32000}},{{32000, 32000},{32000, 32000},{32000, 32000}},{{32000, 32000},{32000, 32000},{32000, 32000}},{{32000, 32000},{32000, 32000},{32000, 32000}}} };\n");
+
+string ExpectedPrint2(
+    "Structure {\n\
+    Int16 name_int16;\n\
+    Int16 array_int[dim1 = 4][dim2 = 3][dim3 = 2];\n\
+} my_structure = { 32000, {{{32000, 32000},{32000, 32000},{32000, 32000}},{{32000, 32000},{32000, 32000},{32000, 32000}},{{32000, 32000},{32000, 32000},{32000, 32000}},{{32000, 32000},{32000, 32000},{32000, 32000}}} };\n");
+
+class structT: public CppUnit::TestFixture {
+
+    CPPUNIT_TEST_SUITE (structT);
+    CPPUNIT_TEST (structT_test);CPPUNIT_TEST_SUITE_END( )
+    ;
+
+private:
+    /* TEST PRIVATE DATA */
+    TestTypeFactory *factory;
+
+public:
+    void setUp()
+    {
+        factory = new TestTypeFactory;
+    }
+
+    void tearDown()
+    {
+        delete factory;
+        factory = 0;
+    }
+
+    void structT_test()
+    {
+        TestStructure s("my_structure");
+
+        BaseType *bt = factory->NewInt16("name_int16");
+        s.add_var(bt);
+        delete bt;
+        bt = 0;
+
+        bt = factory->NewStr("name_str");
+        s.add_var(bt);
+        delete bt;
+        bt = 0;
+
+        // TODO Check Does this leak the Int16
+        Array *abt = factory->NewArray("name_array", factory->NewInt16("array_int"));
+        abt->append_dim(4, "dim1");
+        abt->append_dim(3, "dim2");
+        abt->append_dim(2, "dim3");
+        s.add_var(abt);
+        delete abt;
+        abt = 0;
+
+        bt = 0;
+        bt = s.var("name_str", true);
+        CPPUNIT_ASSERT(bt && bt->name() == "name_str");
+
+        bt = 0;
+        bt = s.var("name_str", false);
+        CPPUNIT_ASSERT(bt && bt->name() == "name_str");
+
+        vector<string> varnames;
+        varnames.push_back("name_int16");
+        varnames.push_back("name_str");
+        varnames.push_back("array_int");
+        typedef vector<string>::const_iterator niter;
+
+        Structure::Vars_iter viter = s.var_begin();
+        niter n = varnames.begin();
+        for (; viter != s.var_end() && n != varnames.end(); viter++, n++) {
+            CPPUNIT_ASSERT((*viter)->name() == *n);
+        }
+        CPPUNIT_ASSERT(viter == s.var_end() && n == varnames.end());
+        if (viter != s.var_end() && n == varnames.end()) {
+            CPPUNIT_FAIL("Too many variables");
+        }
+        else if (viter == s.var_end() && n != varnames.end()) {
+            CPPUNIT_FAIL("Too few varialbes");
+        }
+
+        int num_elems = s.element_count();
+        CPPUNIT_ASSERT(num_elems == 3);
+
+        unsigned int w = s.width();
+        unsigned int wsb = sizeof(string) + sizeof(dods_int16) + 24 * sizeof(dods_int16);
+        cerr << "s.width(): " << s.width() << endl;
+        CPPUNIT_ASSERT(w == wsb);
+
+        bool is_read = s.read();
+        CPPUNIT_ASSERT(is_read == true);
+
+        ostringstream sstrm1;
+        s.print_val(sstrm1);
+        CPPUNIT_ASSERT(sstrm1.str() == ExpectedPrint1);
+
+        s.del_var("name_str");
+
+        bt = 0;
+        bt = s.var("name_str", false);
+        CPPUNIT_ASSERT(bt == 0);
+
+        w = s.width();
+        wsb = +sizeof(dods_int16) + 24 * sizeof(dods_int16);
+        CPPUNIT_ASSERT(w == wsb);
+
+        ostringstream sstrm2;
+        s.print_val(sstrm2);
+        CPPUNIT_ASSERT(sstrm2.str() == ExpectedPrint2);
+    }
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION (structT);
+
+/* NOTHING NEEDS TO BE CHANGED BELOW HERE */
+
+int main(int argc, char *argv[])
+{
+    GetOpt getopt(argc, argv, "dh");
+    int option_char;
+
+    while ((option_char = getopt()) != -1)
+        switch (option_char) {
+        case 'd':
+            debug = 1;  // debug is a static global
+            break;
+
+        case 'h': {     // help - show test names
+            cerr << "Usage: structT has the following tests:" << endl;
+            const std::vector<Test*> &tests = structT::suite()->getTests();
+            unsigned int prefix_len = structT::suite()->getName().append("::").length();
+            for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+                cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+            }
+            break;
+        }
+
+        default:
+            break;
+        }
+
+    CppUnit::TextTestRunner runner;
+    runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
+    bool wasSuccessful = true;
+    string test = "";
+    int i = getopt.optind;
+    if (i == argc) {
+        // run them all
+        wasSuccessful = runner.run("");
+    }
+    else {
+        for ( ; i < argc; ++i) {
+            if (debug) cerr << "Running " << argv[i] << endl;
+            test = structT::suite()->getName().append("::").append(argv[i]);
+            wasSuccessful = wasSuccessful && runner.run(test);
+        }
+    }
+
+    return wasSuccessful ? 0 : 1;
+}
+
diff --git a/unit-tests/testFile.cc b/unit-tests/testFile.cc
new file mode 100644
index 0000000..a71cd43
--- /dev/null
+++ b/unit-tests/testFile.cc
@@ -0,0 +1,38 @@
+#include "config.h"
+
+#include <fstream>
+#include <string>
+#include <vector>
+
+#include "testFile.h"
+
+using namespace std;
+
+string
+readTestBaseline(const string &fn)
+{
+    int length;
+
+    ifstream is;
+    is.open (fn.c_str(), ios::binary );
+
+    if (!is)
+        return "Could not read baseline file: "+fn;
+
+    // get length of file:
+    is.seekg (0, ios::end);
+    length = is.tellg();
+
+    // back to start
+    is.seekg (0, ios::beg);
+
+    // allocate memory:
+    vector<char> buffer(length+1);
+
+    // read data as a block:
+    is.read (&buffer[0], length);
+    is.close();
+    buffer[length] = '\0';
+
+    return string(&buffer[0]);
+}
diff --git a/unit-tests/testFile.h b/unit-tests/testFile.h
new file mode 100644
index 0000000..a5d8530
--- /dev/null
+++ b/unit-tests/testFile.h
@@ -0,0 +1,21 @@
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include <string>
+
+using namespace std;
+
+#if 0
+// Never use this!
+#define FILE2string(s,f,c) do {\
+        FILE *(f) = fopen("testout", "w");\
+        c;\
+        fclose(f);\
+        s = readTestBaseline("testout");\
+        unlink("testout");\
+} while(0);
+#endif
+
+string readTestBaseline(const string &fn);
diff --git a/unit-tests/test_config.h b/unit-tests/test_config.h
new file mode 100644
index 0000000..196e91c
--- /dev/null
+++ b/unit-tests/test_config.h
@@ -0,0 +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"
+
+#endif
+
diff --git a/unit-tests/test_config.h.in b/unit-tests/test_config.h.in
new file mode 100644
index 0000000..94c6dce
--- /dev/null
+++ b/unit-tests/test_config.h.in
@@ -0,0 +1,7 @@
+#ifndef E_test_config_h
+#define E_test_config_h
+
+#define TEST_SRC_DIR "@abs_srcdir@"
+
+#endif
+
diff --git a/unit-tests/valgrind_suppressions.txt b/unit-tests/valgrind_suppressions.txt
new file mode 100644
index 0000000..57d8d45
--- /dev/null
+++ b/unit-tests/valgrind_suppressions.txt
@@ -0,0 +1,90 @@
+{
+   libcurl_1
+   Memcheck:Leak
+   fun:malloc
+   fun:xmlCreatePushParserCtxt
+   ...
+}
+
+{
+   libxml2_1
+   Memcheck:Leak
+   fun:malloc
+   fun:xmlInitParserCtxt
+   fun:xmlNewParserCtxt
+   ...
+}
+
+{
+   putenv
+   Memcheck:Leak
+   fun:malloc_zone_malloc
+   fun:malloc_set_zone_name
+   fun:_malloc_initialize
+   fun:malloc_create_zone
+   fun:putenv
+   ...
+}
+
+{
+   putenv2
+   Memcheck:Leak
+   fun:malloc_zone_malloc
+   fun:__setenv
+   fun:putenv
+   ...
+}
+
+{
+   putenv3
+   Memcheck:Leak
+   fun:malloc_zone_malloc
+   fun:malloc_set_zone_name
+   fun:_malloc_initialize
+   fun:malloc_create_zone
+   fun:putenv
+   ...
+}
+
+{
+   setenv
+   Memcheck:Leak
+   fun:malloc_zone_malloc
+   fun:__setenv
+   fun:setenv
+   ...
+}
+
+{
+   setenv2
+   Memcheck:Leak
+   fun:malloc_zone_malloc
+   fun:malloc_set_zone_name
+   fun:init__zone0
+   fun:setenv
+   ...
+}
+
+{
+   setenv3
+   Memcheck:Leak
+   fun:malloc_zone_malloc
+   fun:malloc_set_zone_name
+   fun:_malloc_initialize
+   fun:malloc_create_zone
+   fun:init__zone0
+   fun:setenv
+   ...
+}
+
+{
+   find
+   Memcheck:Leak
+   fun:malloc
+   obj:/usr/bin/find
+   obj:/usr/bin/find
+   obj:/usr/bin/find
+   obj:/usr/bin/find
+   obj:*
+   obj:*
+}
diff --git a/util.cc b/util.cc
new file mode 100644
index 0000000..ceb6e46
--- /dev/null
+++ b/util.cc
@@ -0,0 +1,1241 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1994-1999
+// Please read the full copyright statement in the file COPYRIGHT_URI.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher <jgallagher@gso.uri.edu>
+
+// Utility functions used by the api.
+//
+// jhrg 9/21/94
+
+#include "config.h"
+
+#include <fstream>
+
+#include <cassert>
+#include <cstring>
+#include <climits>
+#include <cstdlib>
+
+#include <ctype.h>
+#ifndef TM_IN_SYS_TIME
+#include <time.h>
+#else
+#include <sys/time.h>
+#endif
+
+#ifndef WIN32
+#include <unistd.h>    // for stat
+#else
+#include <io.h>
+#include <fcntl.h>
+#include <process.h>
+#endif
+
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include <string>
+#include <sstream>
+#include <vector>
+#include <algorithm>
+#include <stdexcept>
+
+#include "BaseType.h"
+#include "Byte.h"
+#include "Int16.h"
+#include "Int32.h"
+#include "UInt16.h"
+#include "UInt32.h"
+#include "Float32.h"
+#include "Float64.h"
+#include "Str.h"
+#include "Array.h"
+
+#include "Int64.h"
+#include "UInt64.h"
+#include "Int8.h"
+
+#include "Error.h"
+
+#include "util.h"
+#include "GNURegex.h"
+#include "debug.h"
+
+using namespace std;
+
+namespace libdap {
+
+/** @brief Does this host use big-endian byte order? */
+bool is_host_big_endian()
+{
+#ifdef COMPUTE_ENDIAN_AT_RUNTIME
+
+    dods_int16 i = 0x0100;
+    char *c = reinterpret_cast<char*>(&i);
+    return *c;
+
+#else
+
+#if WORDS_BIGENDIAN
+    return true;
+#else
+    return false;
+#endif
+
+#endif
+}
+
+/** Given a BaseType pointer, extract the string value it contains
+
+ @param arg The BaseType pointer
+ @return A C++ string
+ @exception Error thrown if the referenced BaseType object does not contain
+ a DAP String. */
+string extract_string_argument(BaseType *arg)
+{
+    assert(arg);
+
+    if (arg->type() != dods_str_c) throw Error(malformed_expr, "The function requires a string argument.");
+
+    if (!arg->read_p())
+        throw InternalErr(__FILE__, __LINE__,
+                "The CE Evaluator built an argument list where some constants held no values.");
+
+    return static_cast<Str*>(arg)->value();
+}
+
+template<class T> static void set_array_using_double_helper(Array *a, double *src, int src_len)
+{
+    assert(a);
+    assert(src);
+    assert(src_len > 0);
+
+    vector<T> values(src_len);
+    for (int i = 0; i < src_len; ++i)
+        values[i] = (T) src[i];
+
+    // This copies the values
+    a->set_value(values, src_len);
+}
+
+/** Given an array that holds some sort of numeric data, load it with values
+ using an array of doubles. This function makes several assumptions. First,
+ it assumes the caller really wants to put the doubles into whatever types
+ the array holds! Caveat emptor. Second, it assumes that if the size of
+ source (\e src) array is different than the destination (\e dest) the
+ caller has made a mistake. In that case it will throw an Error object.
+
+ After setting the values, this method sets the \c read_p property for
+ \e dest. Setting \e read_p tells the serialization methods in libdap
+ that this variable already holds data values and, given that, the
+ serialization code will not try to read the values.
+
+ @note Support for DAP4 added.
+ @param dest An Array. The values are written to this array, reusing
+ its storage. Existing values are lost.
+ @param src The source data.
+ @param src_len The number of elements in the \e src array.
+ @exception Error Thrown if \e dest is not a numeric-type array (Byte, ...,
+ Float64) or if the number of elements in \e src does not match the number
+ is \e dest. */
+void set_array_using_double(Array *dest, double *src, int src_len)
+{
+    assert(dest);
+    assert(src);
+    assert(src_len > 0);
+
+    // Simple types are Byte, ..., Float64, String and Url.
+    if ((dest->type() == dods_array_c && !dest->var()->is_simple_type()) || dest->var()->type() == dods_str_c
+            || dest->var()->type() == dods_url_c)
+        throw InternalErr(__FILE__, __LINE__, "The function requires a numeric-type array argument.");
+
+    // Test sizes. Note that Array::length() takes any constraint into account
+    // when it returns the length. Even if this was removed, the 'helper'
+    // function this uses calls Vector::val2buf() which uses Vector::width()
+    // which in turn uses length().
+    if (dest->length() != src_len)
+        throw InternalErr(__FILE__, __LINE__,
+                "The source and destination array sizes don't match (" + long_to_string(src_len) + " versus "
+                        + long_to_string(dest->length()) + ").");
+
+    // The types of arguments that the CE Parser will build for numeric
+    // constants are limited to Uint32, Int32 and Float64. See ce_expr.y.
+    // Expanded to work for any numeric type so it can be used for more than
+    // just arguments.
+    switch (dest->var()->type()) {
+    case dods_byte_c:
+        set_array_using_double_helper<dods_byte>(dest, src, src_len);
+        break;
+    case dods_uint16_c:
+        set_array_using_double_helper<dods_uint16>(dest, src, src_len);
+        break;
+    case dods_int16_c:
+        set_array_using_double_helper<dods_int16>(dest, src, src_len);
+        break;
+    case dods_uint32_c:
+        set_array_using_double_helper<dods_uint32>(dest, src, src_len);
+        break;
+    case dods_int32_c:
+        set_array_using_double_helper<dods_int32>(dest, src, src_len);
+        break;
+    case dods_float32_c:
+        set_array_using_double_helper<dods_float32>(dest, src, src_len);
+        break;
+    case dods_float64_c:
+        set_array_using_double_helper<dods_float64>(dest, src, src_len);
+        break;
+
+        // DAP4 support
+    case dods_uint8_c:
+        set_array_using_double_helper<dods_byte>(dest, src, src_len);
+        break;
+    case dods_int8_c:
+        set_array_using_double_helper<dods_int8>(dest, src, src_len);
+        break;
+    case dods_uint64_c:
+        set_array_using_double_helper<dods_uint64>(dest, src, src_len);
+        break;
+    case dods_int64_c:
+        set_array_using_double_helper<dods_int64>(dest, src, src_len);
+        break;
+    default:
+        throw InternalErr(__FILE__, __LINE__,
+                "The argument list built by the CE parser contained an unsupported numeric type.");
+    }
+
+    // Set the read_p property.
+    dest->set_read_p(true);
+}
+
+template<class T> static double *extract_double_array_helper(Array * a)
+{
+    assert(a);
+
+    int length = a->length();
+
+    vector<T> b(length);
+    a->value(&b[0]);    // Extract the values of 'a' to 'b'
+
+    double *dest = new double[length];
+    for (int i = 0; i < length; ++i)
+        dest[i] = (double) b[i];
+
+    return dest;
+}
+
+/**
+ * Given a pointer to an Array which holds a numeric type, extract the
+ * values and return in an array of doubles. This function allocates the
+ * array using 'new double[n]' so delete[] MUST be used when you are done
+ * the data.
+ *
+ * @note Support added for DAP4.
+ * @param a Extract value from this Array.
+ * @return A C++/C array of doubles.
+ */
+double *extract_double_array(Array * a)
+{
+    assert(a);
+
+    // Simple types are Byte, ..., Float64, String and Url.
+    if ((a->type() == dods_array_c && !a->var()->is_simple_type()) || a->var()->type() == dods_str_c
+            || a->var()->type() == dods_url_c)
+        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.");
+
+    // The types of arguments that the CE Parser will build for numeric
+    // constants are limited to Uint32, Int32 and Float64. See ce_expr.y.
+    // Expanded to work for any numeric type so it can be used for more than
+    // just arguments.
+    switch (a->var()->type()) {
+    case dods_byte_c:
+        return extract_double_array_helper<dods_byte>(a);
+    case dods_uint16_c:
+        return extract_double_array_helper<dods_uint16>(a);
+    case dods_int16_c:
+        return extract_double_array_helper<dods_int16>(a);
+    case dods_uint32_c:
+        return extract_double_array_helper<dods_uint32>(a);
+    case dods_int32_c:
+        return extract_double_array_helper<dods_int32>(a);
+    case dods_float32_c:
+        return extract_double_array_helper<dods_float32>(a);
+    case dods_float64_c:
+        // Should not be copying these values, just read them,
+        // but older code may depend on the return of this function
+        // being something that should be deleted, so leave this
+        // alone. jhrg 2/24/15
+        return extract_double_array_helper<dods_float64>(a);
+
+        // Support for DAP4
+    case dods_uint8_c:
+        return extract_double_array_helper<dods_byte>(a);
+    case dods_int8_c:
+        return extract_double_array_helper<dods_int8>(a);
+    case dods_uint64_c:
+        return extract_double_array_helper<dods_uint64>(a);
+    case dods_int64_c:
+        return extract_double_array_helper<dods_int64>(a);
+    default:
+        throw InternalErr(__FILE__, __LINE__,
+                "The argument list built by the CE parser contained an unsupported numeric type.");
+    }
+}
+
+// This helper function assumes 'dest' is the correct size. This should not
+// be called when the Array 'a' is a Float64, since the values are already
+// in a double array!
+template<class T> static void extract_double_array_helper(Array * a, vector<double> &dest)
+{
+    assert(a);
+    assert(dest.size() == (unsigned long )a->length());
+
+    int length = a->length();
+
+    vector<T> b(length);
+    a->value(&b[0]);    // Extract the values of 'a' to 'b'
+
+    for (int i = 0; i < length; ++i)
+        dest[i] = (double) b[i];
+}
+
+/**
+ * Given a pointer to an Array which holds a numeric type, extract the
+ * values and return in an array of doubles. This function allocates the
+ * 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.
+ * @return A C++/C array of doubles.
+ */
+void extract_double_array(Array *a, vector<double> &dest)
+{
+    assert(a);
+
+    // Simple types are Byte, ..., Float64, String and Url.
+    if ((a->type() == dods_array_c && !a->var()->is_simple_type()) || a->var()->type() == dods_str_c
+            || a->var()->type() == dods_url_c)
+        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.");
+
+    dest.resize(a->length());
+
+    // The types of arguments that the CE Parser will build for numeric
+    // constants are limited to Uint32, Int32 and Float64. See ce_expr.y.
+    // Expanded to work for any numeric type so it can be used for more than
+    // just arguments.
+    switch (a->var()->type()) {
+    case dods_byte_c:
+        return extract_double_array_helper<dods_byte>(a, dest);
+    case dods_uint16_c:
+        return extract_double_array_helper<dods_uint16>(a, dest);
+    case dods_int16_c:
+        return extract_double_array_helper<dods_int16>(a, dest);
+    case dods_uint32_c:
+        return extract_double_array_helper<dods_uint32>(a, dest);
+    case dods_int32_c:
+        return extract_double_array_helper<dods_int32>(a, dest);
+    case dods_float32_c:
+        return extract_double_array_helper<dods_float32>(a, dest);
+    case dods_float64_c:
+        return a->value(&dest[0]);      // no need to copy the values
+        // return extract_double_array_helper<dods_float64>(a, dest);
+
+        // Support for DAP4
+    case dods_uint8_c:
+        return extract_double_array_helper<dods_byte>(a, dest);
+    case dods_int8_c:
+        return extract_double_array_helper<dods_int8>(a, dest);
+    case dods_uint64_c:
+        return extract_double_array_helper<dods_uint64>(a, dest);
+    case dods_int64_c:
+        return extract_double_array_helper<dods_int64>(a, dest);
+    default:
+        throw InternalErr(__FILE__, __LINE__,
+                "The argument list built by the CE parser contained an unsupported numeric type.");
+    }
+}
+
+/** Given a BaseType pointer, extract the numeric value it contains and return
+ it in a C++ double.
+
+ @note Support for DAP4 types added.
+
+ @param arg The BaseType pointer
+ @return A C++ double
+ @exception Error thrown if the referenced BaseType object does not contain
+ a DAP numeric value. */
+double extract_double_value(BaseType *arg)
+{
+    assert(arg);
+
+    // Simple types are Byte, ..., Float64, String and Url.
+    if (!arg->is_simple_type() || arg->type() == dods_str_c || arg->type() == dods_url_c)
+        throw Error(malformed_expr, "The function requires a numeric-type argument.");
+
+    if (!arg->read_p())
+        throw InternalErr(__FILE__, __LINE__,
+                "The Evaluator built an argument list where some constants held no values.");
+
+    // The types of arguments that the CE Parser will build for numeric
+    // constants are limited to Uint32, Int32 and Float64. See ce_expr.y.
+    // Expanded to work for any numeric type so it can be used for more than
+    // just arguments.
+    switch (arg->type()) {
+    case dods_byte_c:
+        return (double) (static_cast<Byte*>(arg)->value());
+    case dods_uint16_c:
+        return (double) (static_cast<UInt16*>(arg)->value());
+    case dods_int16_c:
+        return (double) (static_cast<Int16*>(arg)->value());
+    case dods_uint32_c:
+        return (double) (static_cast<UInt32*>(arg)->value());
+    case dods_int32_c:
+        return (double) (static_cast<Int32*>(arg)->value());
+    case dods_float32_c:
+        return (double) (static_cast<Float32*>(arg)->value());
+    case dods_float64_c:
+        return static_cast<Float64*>(arg)->value();
+
+        // Support for DAP4 types.
+    case dods_uint8_c:
+        return (double) (static_cast<Byte*>(arg)->value());
+    case dods_int8_c:
+        return (double) (static_cast<Int8*>(arg)->value());
+    case dods_uint64_c:
+        return (double) (static_cast<UInt64*>(arg)->value());
+    case dods_int64_c:
+        return (double) (static_cast<Int64*>(arg)->value());
+
+    default:
+        throw InternalErr(__FILE__, __LINE__,
+                "The argument list built by the parser contained an unsupported numeric type.");
+    }
+}
+
+// Remove spaces from the start of a URL and from the start of any constraint
+// expression it contains. 4/7/98 jhrg
+
+/** Removed spaces from the front of a URL and also from the front of the CE.
+ This function assumes that there are no holes in both the URL and the CE.
+ It will remove \e leading space, but not other spaces.
+
+ @param name The URL to process
+ @return Returns a new string object that contains the pruned URL. */
+string prune_spaces(const string &name)
+{
+    // If the URL does not even have white space return.
+    if (name.find_first_of(' ') == name.npos)
+        return name;
+    else {
+        // Strip leading spaces from http://...
+        unsigned int i = name.find_first_not_of(' ');
+        string tmp_name = name.substr(i);
+
+        // Strip leading spaces from constraint part (following `?').
+        unsigned int j = tmp_name.find('?') + 1;
+        i = tmp_name.find_first_not_of(' ', j);
+        tmp_name.erase(j, i - j);
+
+        return tmp_name;
+    }
+}
+
+// Compare elements in a list of (BaseType *)s and return true if there are
+// no duplicate elements, otherwise return false.
+
+bool unique_names(vector<BaseType *> l, const string &var_name, const string &type_name, string &msg)
+{
+    // copy the identifier names to a vector
+    vector<string> names(l.size());
+
+    int nelem = 0;
+    typedef std::vector<BaseType *>::const_iterator citer;
+    for (citer i = l.begin(); i != l.end(); i++) {
+        assert(*i);
+        names[nelem++] = (*i)->name();
+        DBG(cerr << "NAMES[" << nelem - 1 << "]=" << names[nelem-1] << endl);
+    }
+
+    // sort the array of names
+    sort(names.begin(), names.end());
+
+    // sort the array of names
+    sort(names.begin(), names.end());
+
+    // look for any instance of consecutive names that are ==
+    for (int j = 1; j < nelem; ++j) {
+        if (names[j - 1] == names[j]) {
+            ostringstream oss;
+            oss << "The variable `" << names[j] << "' is used more than once in " << type_name << " `" << var_name
+                    << "'";
+            msg = oss.str();
+
+            return false;
+        }
+    }
+
+    return true;
+}
+
+const char *
+libdap_root()
+{
+    return LIBDAP_ROOT;
+}
+
+/** Return the version string for this package.
+ @note This function has C linkage so that it can be found using autoconf
+ tests.
+ @return The version string. */
+extern "C" const char *
+libdap_version()
+{
+    return PACKAGE_VERSION;
+}
+
+extern "C" const char *
+libdap_name()
+{
+    return PACKAGE_NAME;
+}
+
+/**
+ * Use the system time() function to get the current time. Return a string,
+ * removing the trailing newline that time() includes in its response.
+ * @return A C++ string with the current system time as formatted by time()
+ */
+string systime()
+{
+    time_t TimBin;
+
+    if (time(&TimBin) == (time_t) -1)
+        return string("time() error");
+    else {
+        char *ctime_value = ctime(&TimBin);
+        if (ctime_value) {
+            string TimStr = ctime_value;
+            return TimStr.substr(0, TimStr.size() - 2); // remove the \n
+        }
+        else
+            return "Unknown";
+    }
+}
+
+/**
+ * Downcase the source string. This function modifies its argument.
+ * @param The string to modify
+ */
+void downcase(string &s)
+{
+    for (unsigned int i = 0; i < s.length(); i++)
+        s[i] = tolower(s[i]);
+}
+
+/**
+ * Is the string surrounded by double quotes?
+ * @param s The source string
+ * @reurn True if the string is quoted, false otherwise.
+ */
+bool is_quoted(const string &s)
+{
+    return (!s.empty() && s[0] == '\"' && s[s.length() - 1] == '\"');
+}
+
+/**
+ * Return a new string that is not quoted. This will return a new string
+ * regardless of whether the source string is actualy quoted.
+ * @param s The source string
+ * @return A new string without quotes
+ */
+string remove_quotes(const string &s)
+{
+    if (is_quoted(s))
+        return s.substr(1, s.length() - 2);
+    else
+        return s;
+}
+
+/** Get the Type enumeration value which matches the given name. */
+Type get_type(const char *name)
+{
+    if (strcmp(name, "Byte") == 0) return dods_byte_c;
+
+    if (strcmp(name, "Char") == 0) return dods_char_c;
+
+    if (strcmp(name, "Int8") == 0) return dods_int8_c;
+
+    if (strcmp(name, "UInt8") == 0) return dods_uint8_c;
+
+    if (strcmp(name, "Int16") == 0) return dods_int16_c;
+
+    if (strcmp(name, "UInt16") == 0) return dods_uint16_c;
+
+    if (strcmp(name, "Int32") == 0) return dods_int32_c;
+
+    if (strcmp(name, "UInt32") == 0) return dods_uint32_c;
+
+    if (strcmp(name, "Int64") == 0) return dods_int64_c;
+
+    if (strcmp(name, "UInt64") == 0) return dods_uint64_c;
+
+    if (strcmp(name, "Float32") == 0) return dods_float32_c;
+
+    if (strcmp(name, "Float64") == 0) return dods_float64_c;
+
+    if (strcmp(name, "String") == 0) return dods_str_c;
+
+    // accept both spellings; this might be confusing since URL
+    // could be filtered through code and come out Url. Don't know...
+    // jhrg 8/15/13
+    if (strcmp(name, "Url") == 0 || strcmp(name, "URL") == 0) return dods_url_c;
+
+    if (strcmp(name, "Enum") == 0) return dods_enum_c;
+
+    if (strcmp(name, "Opaque") == 0) return dods_opaque_c;
+
+    if (strcmp(name, "Array") == 0) return dods_array_c;
+
+    if (strcmp(name, "Structure") == 0) return dods_structure_c;
+
+    if (strcmp(name, "Sequence") == 0) return dods_sequence_c;
+
+    if (strcmp(name, "Grid") == 0) return dods_grid_c;
+
+    return dods_null_c;
+}
+
+/**
+ * @brief Returns the type of the class instance as a string.
+ * Supports all DAP2 types and not the DAP4-only types. Also
+ * returns Url (DAP2) and not "URL" (DAP4) for the URL type.
+ * @param t The type code
+ * @return The type name in a string
+ */
+string D2type_name(Type t)
+{
+    switch (t) {
+    case dods_null_c:
+        return string("Null");
+    case dods_byte_c:
+        return string("Byte");
+    case dods_int16_c:
+        return string("Int16");
+    case dods_uint16_c:
+        return string("UInt16");
+    case dods_int32_c:
+        return string("Int32");
+    case dods_uint32_c:
+        return string("UInt32");
+    case dods_float32_c:
+        return string("Float32");
+    case dods_float64_c:
+        return string("Float64");
+    case dods_str_c:
+        return string("String");
+    case dods_url_c:
+        return string("Url");
+
+    case dods_array_c:
+        return string("Array");
+    case dods_structure_c:
+        return string("Structure");
+    case dods_sequence_c:
+        return string("Sequence");
+    case dods_grid_c:
+        return string("Grid");
+
+    default:
+        throw InternalErr(__FILE__, __LINE__, "Unknown type.");
+    }
+}
+
+/**
+ * @brief Returns the type of the class instance as a string.
+ * Supports all DAP4 types and not the DAP2-only types. Also
+ * returns URL (DAP4) and not "Url" (DAP2) for the URL type.
+ * @param t The type code
+ * @return The type name in a string
+ */
+string D4type_name(Type t)
+{
+    switch (t) {
+    case dods_null_c:
+        return string("Null");
+    case dods_byte_c:
+        return string("Byte");
+    case dods_char_c:
+        return string("Char");
+    case dods_int8_c:
+        return string("Int8");
+    case dods_uint8_c:
+        return string("UInt8");
+    case dods_int16_c:
+        return string("Int16");
+    case dods_uint16_c:
+        return string("UInt16");
+    case dods_int32_c:
+        return string("Int32");
+    case dods_uint32_c:
+        return string("UInt32");
+    case dods_int64_c:
+        return string("Int64");
+    case dods_uint64_c:
+        return string("UInt64");
+    case dods_enum_c:
+        return string("Enum");
+
+    case dods_float32_c:
+        return string("Float32");
+    case dods_float64_c:
+        return string("Float64");
+
+    case dods_str_c:
+        return string("String");
+    case dods_url_c:
+        return string("URL");
+
+    case dods_opaque_c:
+        return string("Opaque");
+
+    case dods_array_c:
+        return string("Array");
+
+    case dods_structure_c:
+        return string("Structure");
+    case dods_sequence_c:
+        return string("Sequence");
+    case dods_group_c:
+        return string("Group");
+
+    default:
+        throw InternalErr(__FILE__, __LINE__, "Unknown type.");
+    }
+}
+
+/** Return the type name. This function provides backward compatibility
+ * for older code that predates, and has not been ported to, DAP4. It
+ * is prejudiced toward DAP4, but if no D4 type name can be found, it
+ * types D2. If neither would return a type name, and InternalErr object
+ * is thrown.
+ *
+ * @param t The DAP2/DAP4 type
+ * @return A string naming the type, suitable for humans
+ * @exception InternalErr If not such type can be found
+ */
+string type_name(Type t)
+{
+    try {
+        return D4type_name(t);
+    }
+    catch (...) {
+        return D2type_name(t);
+    }
+}
+
+/** @brief Returns true if the instance is a numeric, string or URL
+ type variable.
+ @return True if the instance is a scalar numeric, String or URL variable,
+ False otherwise. Arrays (even of simple types) return False.
+ @see is_vector_type() */
+bool is_simple_type(Type t)
+{
+    switch (t) {
+
+    case dods_byte_c:
+    case dods_char_c:
+
+    case dods_int8_c:
+    case dods_uint8_c:
+
+    case dods_int16_c:
+    case dods_uint16_c:
+    case dods_int32_c:
+    case dods_uint32_c:
+
+    case dods_int64_c:
+    case dods_uint64_c:
+
+    case dods_float32_c:
+    case dods_float64_c:
+    case dods_str_c:
+    case dods_url_c:
+    case dods_enum_c:
+    case dods_opaque_c:
+        return true;
+
+    case dods_null_c:
+    case dods_array_c:
+    case dods_structure_c:
+    case dods_sequence_c:
+    case dods_grid_c:
+    case dods_group_c:
+    default:
+        return false;
+    }
+
+    return false;
+}
+
+/** @brief Returns true if the instance is a vector (i.e., array) type
+ variable.
+ @return True if the instance is an Array, False otherwise. */
+bool is_vector_type(Type t)
+{
+    switch (t) {
+    case dods_null_c:
+    case dods_byte_c:
+    case dods_char_c:
+
+    case dods_int8_c:
+    case dods_uint8_c:
+
+    case dods_int16_c:
+    case dods_uint16_c:
+
+    case dods_int32_c:
+    case dods_uint32_c:
+
+    case dods_int64_c:
+    case dods_uint64_c:
+
+    case dods_float32_c:
+    case dods_float64_c:
+
+    case dods_str_c:
+    case dods_url_c:
+    case dods_enum_c:
+    case dods_opaque_c:
+        return false;
+
+    case dods_array_c:
+        return true;
+
+    case dods_structure_c:
+    case dods_sequence_c:
+    case dods_grid_c:
+    case dods_group_c:
+    default:
+        return false;
+    }
+
+    return false;
+}
+
+/** @brief Returns true if the instance is a constructor (i.e., Structure,
+ Sequence or Grid) type variable.
+ @return True if the instance is a Structure, Sequence or Grid, False
+ otherwise. */
+bool is_constructor_type(Type t)
+{
+    switch (t) {
+    case dods_null_c:
+    case dods_byte_c:
+    case dods_char_c:
+
+    case dods_int8_c:
+    case dods_uint8_c:
+
+    case dods_int16_c:
+    case dods_uint16_c:
+    case dods_int32_c:
+    case dods_uint32_c:
+
+    case dods_int64_c:
+    case dods_uint64_c:
+
+    case dods_float32_c:
+    case dods_float64_c:
+    case dods_str_c:
+    case dods_url_c:
+    case dods_enum_c:
+    case dods_opaque_c:
+
+    case dods_array_c:
+        return false;
+
+    case dods_structure_c:
+    case dods_sequence_c:
+    case dods_grid_c:
+    case dods_group_c:
+    default:
+        return true;
+    }
+
+    return false;
+}
+
+/**
+ * Is this an integer type?
+ * @return True if the type holds an integer value, false otherwise.
+ */
+bool is_integer_type(Type t)
+{
+    switch (t) {
+    case dods_byte_c:
+    case dods_char_c:
+    case dods_int8_c:
+    case dods_uint8_c:
+    case dods_int16_c:
+    case dods_uint16_c:
+    case dods_int32_c:
+    case dods_uint32_c:
+    case dods_int64_c:
+    case dods_uint64_c:
+        return true;
+    default:
+        return false;
+    }
+}
+
+/**
+ * Does the directory exist?
+ *
+ * @param dir The pathname to test.
+ * @return True if the directory exists, false otherwise
+ */
+bool dir_exists(const string &dir)
+{
+    struct stat buf;
+
+    return (stat(dir.c_str(), &buf) == 0) && (buf.st_mode & S_IFDIR);
+}
+
+// Jose Garcia
+void append_long_to_string(long val, int base, string &str_val)
+{
+    // The array digits contains 36 elements which are the
+    // posible valid digits for out bases in the range
+    // [2,36]
+    char digits[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+    // result of val / base
+    ldiv_t r;
+
+    if (base > 36 || base < 2) {
+        // no conversion if wrong base
+        std::invalid_argument ex("The parameter base has an invalid value.");
+        throw ex;
+    }
+    if (val < 0) str_val += '-';
+    r = ldiv(labs(val), base);
+
+    // output digits of val/base first
+    if (r.quot > 0) append_long_to_string(r.quot, base, str_val);
+
+    // output last digit
+
+    str_val += digits[(int) r.rem];
+}
+
+// base defaults to 10
+string long_to_string(long val, int base)
+{
+    string s;
+    append_long_to_string(val, base, s);
+    return s;
+}
+
+// Jose Garcia
+void append_double_to_string(const double &num, string &str)
+{
+    // s having 100 characters should be enough for sprintf to do its job.
+    // I want to banish all instances of sprintf. 10/5/2001 jhrg
+    ostringstream oss;
+    oss.precision(9);
+    oss << num;
+    str += oss.str();
+}
+
+string double_to_string(const double &num)
+{
+    string s;
+    append_double_to_string(num, s);
+    return s;
+}
+
+// Given a pathname, return the file at the end of the path. This is used
+// when reporting errors (maybe other times, too) to keep the server from
+// revealing too much about its organization when sending error responses
+// back to clients. 10/11/2000 jhrg
+// MT-safe. 08/05/02 jhrg
+
+#ifdef WIN32
+static const char path_sep[] =
+{   "\\"
+};
+#else
+static const char path_sep[] = { "/" };
+#endif
+
+/** Get the filename part from a path. This function can be used to return a
+ string that has the directory components stripped from a path. This is
+ useful when building error message strings.
+
+ If WIN32 is defined, use '\' as the path separator, otherwise use '/' as
+ the path separator.
+
+ @return A string containing only the filename given a path. */
+string path_to_filename(string path)
+{
+    string::size_type pos = path.rfind(path_sep);
+
+    return (pos == string::npos) ? path : path.substr(++pos);
+}
+
+#define CHECK_BIT( tab, bit ) ( tab[ (bit)/8 ] & (1<<( (bit)%8 )) )
+#define BITLISTSIZE 16 /* bytes used for [chars] in compiled expr */
+
+/*
+ * globchars() - build a bitlist to check for character group match
+ */
+
+static void globchars(const char *s, const char *e, char *b)
+{
+    int neg = 0;
+
+    memset(b, '\0', BITLISTSIZE);
+
+    if (*s == '^') neg++, s++;
+
+    while (s < e) {
+        int c;
+
+        if (s + 2 < e && s[1] == '-') {
+            for (c = s[0]; c <= s[2]; c++)
+                b[c / 8] |= (1 << (c % 8));
+            s += 3;
+        }
+        else {
+            c = *s++;
+            b[c / 8] |= (1 << (c % 8));
+        }
+    }
+
+    if (neg) {
+        int i;
+        for (i = 0; i < BITLISTSIZE; i++)
+            b[i] ^= 0377;
+    }
+
+    /* Don't include \0 in either $[chars] or $[^chars] */
+
+    b[0] &= 0376;
+}
+
+/**
+ * glob:  match a string against a simple pattern
+ *
+ * Understands the following patterns:
+ *
+ *  *   any number of characters
+ *  ?   any single character
+ *  [a-z]   any single character in the range a-z
+ *  [^a-z]  any single character not in the range a-z
+ *  \x  match x
+ *
+ * @param c The pattern
+ * @param s The string
+ * @return 0 on success, -1 if the pattern is exhausted but there are
+ * characters remaining in the string and 1 if the pattern does not match
+ */
+int glob(const char *c, const char *s)
+{
+    if (!c || !s) return 1;
+
+    char bitlist[BITLISTSIZE];
+    int i = 0;
+    for (;;) {
+        ++i;
+        switch (*c++) {
+        case '\0':
+            return *s ? -1 : 0;
+
+        case '?':
+            if (!*s++) return i/*1*/;
+            break;
+
+        case '[': {
+            /* scan for matching ] */
+
+            const char *here = c;
+            do {
+                if (!*c++) return i/*1*/;
+            } while (here == c || *c != ']');
+            c++;
+
+            /* build character class bitlist */
+
+            globchars(here, c, bitlist);
+
+            if (!CHECK_BIT(bitlist, *(unsigned char * )s)) return i/*1*/;
+            s++;
+            break;
+        }
+
+        case '*': {
+            const char *here = s;
+
+            while (*s)
+                s++;
+
+            /* Try to match the rest of the pattern in a recursive */
+            /* call.  If the match fails we'll back up chars, retrying. */
+
+            while (s != here) {
+                int r;
+
+                /* A fast path for the last token in a pattern */
+
+                r = *c ? glob(c, s) : *s ? -1 : 0;
+
+                if (!r)
+                    return 0;
+                else if (r < 0) return i/*1*/;
+
+                --s;
+            }
+            break;
+        }
+
+        case '\\':
+            /* Force literal match of next char. */
+
+            if (!*c || *s++ != *c++) return i/*1*/;
+            break;
+
+        default:
+            if (*s++ != c[-1]) return i/*1*/;
+            break;
+        }
+    }
+
+    return 1;   // Should never get here; this quiets gcc's warning
+}
+
+/** @name Security functions */
+//@{
+/** @brief sanitize the size of an array.
+ Test for integer overflow when dynamically allocating an array.
+ @param nelem Number of elements.
+ @param sz size of each element.
+ @return True if the \c nelem elements of \c sz size will overflow an array. */
+bool size_ok(unsigned int sz, unsigned int nelem)
+{
+    return (sz > 0 && nelem < UINT_MAX / sz);
+}
+
+/** @brief Does the string name a potentially valid pathname?
+ Test the given pathname to verify that it is a valid name. We define this
+ as: Contains only printable characters; and Is less then 256 characters.
+ If \e strict is true, test that the pathname consists of only letters,
+ digits, and underscore, dash and dot characters instead of the more general
+ case where a pathname can be composed of any printable characters.
+
+ @note Using this function does not guarantee that the path is valid, only
+ that the path \e could be valid. The intent is foil attacks where an
+ exploit is encoded in a string then passed to a library function. This code
+ does not address whether the pathname references a valid resource.
+
+ @param path The pathname to test
+ @param strict Apply more restrictive tests (true by default)
+ @return true if the pathname consists of legal characters and is of legal
+ size, false otherwise. */
+bool pathname_ok(const string &path, bool strict)
+{
+    if (path.length() > 255) return false;
+
+    Regex name("[-0-9A-z_./]+");
+    if (!strict) name = "[:print:]+";
+
+    string::size_type len = path.length();
+    int result = name.match(path.c_str(), len);
+    // Protect against casting too big an uint to int
+    // if LEN is bigger than the max int32, the second test can't work
+    if (len > INT_MAX || result != static_cast<int>(len)) return false;
+
+    return true;
+}
+
+//@}
+
+/**
+ * Get the version of the DAP library.
+ * @deprecated
+ */
+string dap_version()
+{
+    return (string) "OPeNDAP DAP/" + libdap_version() + ": compiled on " + __DATE__ + ":" + __TIME__;
+}
+
+/**
+ * Using the given template, open a temporary file using the given
+ * ofstream object. Uses mkstemp() in a 'safe' way.
+ *
+ * @param f Value-result parameter
+ * @param name_template The template used to name the temporary file.
+ * The template has the form templateXXXXXX where the six Xs will be
+ * overwritten.
+ * @param suffix If present, the template is 'templateXXXXXX.suffix'
+ * @return The new file's name.
+ * @exception Error if there is a problem.
+ */
+string open_temp_fstream(ofstream &f, const string &name_template, const string &suffix /* = "" */)
+{
+    vector<char> name;
+    copy(name_template.begin(), name_template.end(), back_inserter(name));
+    if (!suffix.empty())
+        copy(suffix.begin(), suffix.end(), back_inserter(name));
+    name.push_back('\0');
+
+    // Use mkstemp to make and open the temp file atomically
+    int tmpfile = mkstemps(&name[0], suffix.length());
+    if (tmpfile == -1)
+        throw Error(internal_error, "Could not make a temporary file.");
+    // Open the file using C++ ofstream; get a C++ fstream object
+    f.open(&name[0]);
+    // Close the file descriptor; the file stays open because of the fstream object
+    close(tmpfile);
+    // Now test that the fstream object is valid
+    if (f.fail())
+        throw Error(internal_error, "Could not make a temporary file.");
+
+    return string(&name[0]);
+}
+
+
+} // namespace libdap
+
diff --git a/util.h b/util.h
new file mode 100644
index 0000000..19f148c
--- /dev/null
+++ b/util.h
@@ -0,0 +1,157 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002,2003 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+// (c) COPYRIGHT URI/MIT 1994-1999
+// Please read the full copyright statement in the file COPYRIGHT.
+//
+// Authors:
+//      jhrg,jimg       James Gallagher (jgallagher@gso.uri.edu)
+
+// declarations for utility functions
+//
+// jhrg 9/21/94
+
+#ifndef _util_h
+#define _util_h 1
+
+#include <cstdio>
+#include <cmath>
+#include <vector>
+
+#ifndef _basetype_h
+#include "BaseType.h"
+#endif
+
+using std::iostream;
+
+namespace libdap
+{
+
+class Array;
+
+/** Is \e lhs equal to \e rhs? Use epsilon to determine equality. */
+inline bool double_eq(double lhs, double rhs, double epsilon = 1.0e-5)
+{
+    return fabs(lhs - rhs) < epsilon;
+}
+
+string extract_string_argument(BaseType *arg) ;
+double extract_double_value(BaseType *arg) ;
+double *extract_double_array(Array *a) ;
+void extract_double_array(Array *a, vector<double> &dest) ;
+void set_array_using_double(Array *dest, double *src, int src_len) ;
+
+bool is_host_big_endian();
+
+string prune_spaces(const string &);
+bool unique_names(vector<BaseType *> l, const string &var, const string &type, string &msg);
+string systime();
+const char *libdap_root();
+extern "C" const char *libdap_version();
+extern "C" const char *libdap_name();
+
+#ifdef WIN32
+void flush_stream(iostream ios, FILE *out);
+#endif
+
+void downcase(string &s);
+bool is_quoted(const string &s);
+string remove_quotes(const string &s);
+
+Type get_type(const char *name);
+string D2type_name(Type t);
+string D4type_name(Type t);
+string type_name(Type t);
+bool is_simple_type(Type t);
+bool is_vector_type(Type t);
+bool is_constructor_type(Type t);
+bool is_integer_type(Type t);
+
+bool dir_exists(const string &dir);
+
+// Jose Garcia
+/** @name Integer to string conversion functions
+   Fast, safe conversions from long to a character representation which gets
+   appended to a string. This method will take a long value 'val' and it will
+   recursively divide it by 'base' in order to "extract" one by one the
+   digits which compose it; these digits will be <i>appended</i> to the
+   string <tt>str_val</tt> which will become the textual representation of
+   'val'. Please notice that the digits ``extracted'' from `val' will vary
+   depending on the base chosen for the conversion; for example val=15
+   converted to base 10 will yield the digits (1,5), converted to base 16
+   will yield (F) and converted to base 2 will yield (1,1,1,1).
+
+   @param val The long value we which to convert to string.
+
+   @param base A value in the range [2,36] which is the base to use while
+   transforming the long value 'val' to its textual representation. Typical
+   bases are 2 (binary), 10 (decimal) and 16 (hexadecimal).
+
+   @param str_val This is the string that will hold the textual
+   representation of 'val'. The string <tt>str_val</tt> should be
+   pre-set to an empty
+   string ("") otherwise the output of this function will just append the
+   textual representation of val to whatever data is there; these feature may
+   be useful if you wish to append a long value to a string s1 (just like
+   operator+ does) without having to create a new string object s2 and then
+   use string::operator+ between s1 and s2.
+
+   @return void. This method returns nothing however be aware that it will
+   throw and exception of type <tt>std::invalid_argument</tt> if the parameter
+   base is not in the valid range. */
+//@{
+void append_long_to_string(long val, int base, string &str_val);
+string long_to_string(long val, int base = 10);
+//@}
+
+// Jose Garcia
+/** @name Double to string conversion functions
+    Conversions from double to a character representation which gets appended
+    to a string. This function depends on the standard routine sprintf to
+    convert a double to a textual representation which gets appended to the
+    string 'str'.
+
+    @param num The double you wish to append to str.
+
+    @param str The string where the textual representation of num will be
+    appended.
+
+    @return void. */
+//@{
+void append_double_to_string(const double &num, string &str);
+string double_to_string(const double &num);
+//@}
+
+string path_to_filename(string path);
+int glob( const char *c, const char *s );
+time_t parse_time(const char * str, bool expand);
+bool size_ok(unsigned int sz, unsigned int nelem);
+bool pathname_ok(const string &path, bool strict = true);
+string dap_version();
+string open_temp_fstream(ofstream &f, const string &name_template, const string &suffix = "");
+
+} // namespace libdap
+
+#endif
diff --git a/util_mit.cc b/util_mit.cc
new file mode 100644
index 0000000..fc60f4e
--- /dev/null
+++ b/util_mit.cc
@@ -0,0 +1,369 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112
+
+// This file was derived from the libwww source code of 1998/08/20. The
+// copyright for the source of this derivative work can be found in the file
+// COPYRIGHT_W3C.
+
+
+#include "config.h"
+
+#include <cstdio>
+#include <cstring>
+#include <cstdlib>
+//#include <string>
+#include <ctype.h>
+
+#ifndef TM_IN_SYS_TIME
+#include <time.h>
+#else
+#include <sys/time.h>
+#endif
+
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include <iostream>
+
+#include "util_mit.h"
+
+using std::cerr;
+using std::endl;
+using std::string;
+
+#include "debug.h"
+
+namespace libdap {
+
+static const char * months[12] =
+    {
+        "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
+    };
+
+#ifndef HAVE_STRFTIME
+static const char * wkdays[7] =
+    {
+        "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
+    };
+#endif
+
+/* Upper- and Lowercase macros
+
+   The problem here is that toupper(x) is not defined officially unless
+   isupper(x) is. These macros are CERTAINLY needed on #if defined(pyr) ||
+   define(mips) or BDSI platforms. For safety, we make them mandatory.
+*/
+
+#ifndef TOLOWER
+#define TOLOWER(c) tolower((int) (c))
+#define TOUPPER(c) toupper((int) (c))
+#endif
+
+static int
+strncasecomp(const char *a, const char *b, int n)
+{
+    const char *p = a;
+    const char *q = b;
+
+    for (p = a, q = b;; p++, q++) {
+        int diff;
+        if (p == a + n) return 0; /*   Match up to n characters */
+        if (!(*p && *q)) return *p - *q;
+        diff = TOLOWER(*p) - TOLOWER(*q);
+        if (diff) return diff;
+    }
+    /*NOTREACHED*/
+    return -1; // silence gcc
+}
+
+static int
+make_month(char * s, char ** ends)
+{
+    char * ptr = s;
+    while (!isalpha((int) *ptr)) ptr++;
+    if (*ptr) {
+        int i;
+        *ends = ptr + 3;
+        for (i = 0; i < 12; i++)
+            if (!strncasecomp(months[i], ptr, 3)) return i;
+    }
+    return 0;
+}
+
+/** Parse a string in GMT format to a local time time_t representation
+    Four formats are accepted:
+ Wkd, 00 Mon 0000 00:00:00 GMT  (rfc1123)
+ Weekday, 00-Mon-00 00:00:00 GMT  (rfc850)
+ Wkd Mon 00 00:00:00 0000 GMT  (ctime)
+ 1*DIGIT     (delta-seconds)
+
+    Copied from libwww. 09/19/02 jhrg
+
+    @param str The time string.
+    @param expand If the time is given in delta seconds, adjust it to seconds
+    since midnight 1 Jan 1970 if this is true. If false, simply convert the
+    string to a time_t and return. The default value is true.
+    @return The time in seconds since midnight 1 Jan 1970. */
+time_t
+parse_time(const char * str, bool expand)
+{
+    char * s;
+    struct tm tm;
+    time_t t;
+
+    if (!str) return 0;
+
+    if ((s = (char *)strchr(str, ','))) {  /* Thursday, 10-Jun-93 01:29:59 GMT */
+        s++;    /* or: Thu, 10 Jan 1993 01:29:59 GMT */
+        while (*s && *s == ' ') s++;
+        if (strchr(s, '-')) {         /* First format */
+            DBG(cerr << "Format...... Weekday, 00-Mon-00 00:00:00 GMT"
+                << endl);
+            if ((int)strlen(s) < 18) {
+                DBG(cerr << "ERROR....... Not a valid time format \""
+                    << s << "\"" << endl);
+                return 0;
+            }
+            tm.tm_mday = strtol(s, &s, 10);
+            tm.tm_mon = make_month(s, &s);
+            ++s;
+            tm.tm_year = strtol(s, &s, 10);
+            tm.tm_hour = strtol(s, &s, 10);
+            ++s;
+            tm.tm_min = strtol(s, &s, 10);
+            ++s;
+            tm.tm_sec = strtol(s, &s, 10);
+
+        }
+        else {         /* Second format */
+            DBG(cerr << "Format...... Wkd, 00 Mon 0000 00:00:00 GMT" << endl);
+            if ((int)strlen(s) < 20) {
+                DBG(cerr << "ERROR....... Not a valid time format \""
+                    << s << "\"" << endl);
+                return 0;
+            }
+            tm.tm_mday = strtol(s, &s, 10);
+            tm.tm_mon = make_month(s, &s);
+            tm.tm_year = strtol(s, &s, 10) - 1900;
+            tm.tm_hour = strtol(s, &s, 10);
+            ++s;
+            tm.tm_min = strtol(s, &s, 10);
+            ++s;
+            tm.tm_sec = strtol(s, &s, 10);
+        }
+    }
+    else if (isdigit((int) *str)) {
+
+        if (strchr(str, 'T')) { /* ISO (limited format) date string */
+            DBG(cerr << "Format...... YYYY.MM.DDThh:mmStzWkd" << endl);
+            s = (char *) str;
+            while (*s && *s == ' ') s++;
+            if ((int)strlen(s) < 21) {
+                DBG(cerr << "ERROR....... Not a valid time format \""
+                    << s << "\"" << endl);
+                return 0;
+            }
+            tm.tm_year = strtol(s, &s, 10) - 1900;
+            ++s;
+            tm.tm_mon  = strtol(s, &s, 10);
+            ++s;
+            tm.tm_mday = strtol(s, &s, 10);
+            ++s;
+            tm.tm_hour = strtol(s, &s, 10);
+            ++s;
+            tm.tm_min  = strtol(s, &s, 10);
+            ++s;
+            tm.tm_sec  = strtol(s, &s, 10);
+
+        }
+        else {         /* delta seconds */
+            t = expand ? time(NULL) + atol(str) : atol(str);
+
+            return t;
+        }
+
+    }
+    else {       /* Try the other format:  Wed Jun  9 01:29:59 1993 GMT */
+        DBG(cerr << "Format...... Wkd Mon 00 00:00:00 0000 GMT" << endl);
+        s = (char *) str;
+        while (*s && *s == ' ') s++;
+        DBG(cerr << "Trying...... The Wrong time format: " << s << endl);
+        if ((int)strlen(s) < 24) {
+            DBG(cerr << "ERROR....... Not a valid time format \""
+                << s << "\"" << endl);
+            return 0;
+        }
+        tm.tm_mon = make_month(s, &s);
+        tm.tm_mday = strtol(s, &s, 10);
+        tm.tm_hour = strtol(s, &s, 10);
+        ++s;
+        tm.tm_min = strtol(s, &s, 10);
+        ++s;
+        tm.tm_sec = strtol(s, &s, 10);
+        tm.tm_year = strtol(s, &s, 10) - 1900;
+    }
+    if (tm.tm_sec  < 0  ||  tm.tm_sec  > 59  ||
+        tm.tm_min  < 0  ||  tm.tm_min  > 59  ||
+        tm.tm_hour < 0  ||  tm.tm_hour > 23  ||
+        tm.tm_mday < 1  ||  tm.tm_mday > 31  ||
+        tm.tm_mon  < 0  ||  tm.tm_mon  > 11  ||
+        tm.tm_year < 70  ||  tm.tm_year > 120) {
+        DBG(cerr << "ERROR....... Parsed illegal time" << endl);
+        return 0;
+    }
+
+    /* Let mktime decide whether we have DST or not */
+    tm.tm_isdst = -1;
+
+#ifdef HAVE_TIMEGM
+
+    t = timegm(&tm);
+
+#else
+
+#ifdef HAVE_MKTIME
+
+    // Compute offset between localtime and GMT.
+    time_t offset;
+    time_t now = time(0);
+#ifdef _REENTRANT
+    struct tm gmt, local;
+    offset = mktime(gmtime_r(&now, &gmt)) - mktime(localtime_r(&now, &local));
+#else
+    offset = mktime(gmtime(&now)) - mktime(localtime(&now));
+#endif
+
+    t = mktime(&tm) + offset;
+
+#else
+
+#error "Neither mktime nor timegm defined"
+
+#endif /* HAVE_TIMEGM */
+#endif /* HAVE_MKTIME */
+
+    DBG(cerr << "Time string. " << str << " parsed to " << t
+        << " calendar time or \"" << ctime(&t) << "\" in local time" << endl);
+
+    return t;
+}
+
+/** Given a time in seconds since midnight 1 Jan 1970, return the RFC 1123
+    date string. Example result string: Sun, 06 Nov 1994 08:49:37 GMT
+
+
+    @param calendar Time in seconds
+    @param local If true, return the local time, if false return GMT. The
+    default value is false.
+    @return A RFC 1123 date string. */
+
+string date_time_str(time_t *calendar, bool local)
+{
+    char buf[40];
+
+#ifdef HAVE_STRFTIME
+    if (local) {
+        /*
+        ** Solaris 2.3 has a bug so we _must_ use reentrant version
+        ** Thomas Maslen <tmaslen@verity.com>
+        */
+#if defined(_REENTRANT) || defined(SOLARIS)
+        struct tm loctime;
+        localtime_r(calendar, &loctime);
+        strftime(buf, 40, "%a, %d %b %Y %H:%M:%S", &loctime);
+#else
+        struct tm *loctime = localtime(calendar);
+        strftime(buf, 40, "%a, %d %b %Y %H:%M:%S", loctime);
+#endif /* SOLARIS || _REENTRANT */
+    }
+    else {
+#if defined(_REENTRANT) || defined(SOLARIS)
+        struct tm gmt;
+        gmtime_r(calendar, &gmt);
+        strftime(buf, 40, "%a, %d %b %Y %H:%M:%S GMT", &gmt);
+#else
+        struct tm *gmt = gmtime(calendar);
+        strftime(buf, 40, "%a, %d %b %Y %H:%M:%S GMT", gmt);
+#endif /* SOLARIS || _REENTRANT */
+    }
+
+#else  /* !HAVE_STRFTIME */
+
+    if (local) {
+#if defined(_REENTRANT)
+        struct tm loctime;
+        localtime_r(calendar, &loctime);
+        snprintf(buf, 40, "%s, %02d %s %04d %02d:%02d:%02d",
+                wkdays[loctime.tm_wday],
+                loctime.tm_mday,
+                months[loctime.tm_mon],
+                loctime.tm_year + 1900,
+                loctime.tm_hour,
+                loctime.tm_min,
+                loctime.tm_sec);
+#else
+    struct tm *loctime = localtime(calendar);
+    if (!loctime)
+    	return "";
+    snprintf(buf, 40, "%s, %02d %s %04d %02d:%02d:%02d",
+            wkdays[loctime->tm_wday],
+            loctime->tm_mday,
+            months[loctime->tm_mon],
+            loctime->tm_year + 1900,
+            loctime->tm_hour,
+            loctime->tm_min,
+            loctime->tm_sec);
+#endif /* _REENTRANT */
+    }
+    else {
+#if defined(_REENTRANT) || defined(SOLARIS)
+        struct tm gmt;
+        gmtime_r(calendar, &gmt);
+        snprintf(buf, 40, "%s, %02d %s %04d %02d:%02d:%02d GMT",
+                wkdays[gmt.tm_wday],
+                gmt.tm_mday,
+                months[gmt.tm_mon],
+                gmt.tm_year + 1900,
+                gmt.tm_hour,
+                gmt.tm_min,
+                gmt.tm_sec);
+#else
+    struct tm *gmt = gmtime(calendar);
+    if (!gmt)
+    	return "";
+    snprintf(buf, 40, "%s, %02d %s %04d %02d:%02d:%02d GMT",
+            wkdays[gmt->tm_wday],
+            gmt->tm_mday,
+            months[gmt->tm_mon],
+            gmt->tm_year + 1900,
+            gmt->tm_hour,
+            gmt->tm_min,
+            gmt->tm_sec);
+#endif
+    }
+#endif
+    return string(buf);
+}
+
+} // namespace libdap
diff --git a/util_mit.h b/util_mit.h
new file mode 100644
index 0000000..fd02f27
--- /dev/null
+++ b/util_mit.h
@@ -0,0 +1,36 @@
+
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2002 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher@opendap.org>
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#include <string>
+
+using std::string;
+
+namespace libdap
+{
+
+time_t parse_time(const char * str, bool expand = true);
+string date_time_str(time_t *calendar, bool local = false);
+
+} // namespace libdap
diff --git a/xdr-datatypes-config.h.in b/xdr-datatypes-config.h.in
new file mode 100644
index 0000000..28cac9b
--- /dev/null
+++ b/xdr-datatypes-config.h.in
@@ -0,0 +1,30 @@
+
+/*
+  Determine at compile-time the sizes of various XDR datatypes. This uses
+  symbols defined by configure (See configure.in). pcw 08/13/07
+*/
+
+#ifndef __XDR_DATATYPES__
+#define __XDR_DATATYPES__
+
+#ifdef WIN32
+#include <rpc.h>
+#include <winsock2.h>
+#include <xdr.h>
+#else
+#include <rpc/types.h>
+#include <netinet/in.h>
+#include <rpc/xdr.h>
+#endif
+
+
+#undef XDR_INT32
+#undef XDR_UINT32
+
+#undef XDR_INT16
+#undef XDR_UINT16
+
+#undef XDR_FLOAT64
+#undef XDR_FLOAT32
+
+#endif /* __XDR_DATATYPES__ */
diff --git a/xdr-datatypes-static.h b/xdr-datatypes-static.h
new file mode 100644
index 0000000..e7a20ca
--- /dev/null
+++ b/xdr-datatypes-static.h
@@ -0,0 +1,56 @@
+
+/*
+  Determine at compile-time the sizes of various datatypes. This uses symbols
+  defined by configure (See configure.in).
+  jhrg 10/24/94
+
+  This header is included by all of the DODS DAP library header files which
+  make use of the dods_* typedefs. C or C++ files can either include
+  config_dap.h, use their own configure script which defines SIZEOF_LONG,
+  _INT, _CHAR and _DOUBLE or set these preprocessor symbols themselves in a
+  Makefile, etc.
+
+  This used to be part of the config_dap.h header, but including that in the
+  DAP library headers introduced problems when the DAP was used in conjunction
+  with other libraries. 8/1/2000 jhrg
+*/
+
+#ifndef __XDR_DATATYPES__
+#define __XDR_DATATYPES__
+
+#ifdef WIN32
+#include <rpc.h>
+#include <winsock2.h>
+#include <xdr.h>
+#else
+#include <rpc/types.h>
+#include <netinet/in.h>
+#include <rpc/xdr.h>
+#endif
+
+#ifndef XDR_INT32
+#define XDR_INT32 xdr_int32_t
+#endif
+
+#ifndef XDR_UINT32
+#define XDR_UINT32 xdr_uint32_t
+#endif
+
+#ifndef XDR_INT16
+#define XDR_INT16 xdr_int16_t
+#endif
+
+#ifndef XDR_UINT16
+#define XDR_UINT16 xdr_uint16_t
+#endif
+
+#ifndef XDR_FLOAT64
+#define XDR_FLOAT64 xdr_double
+#endif
+
+#ifndef XDR_FLOAT32
+#define XDR_FLOAT32 xdr_float
+#endif
+
+#endif /* __XDR_DATATYPES__ */
+
diff --git a/xdr-datatypes.h b/xdr-datatypes.h
new file mode 100644
index 0000000..9167595
--- /dev/null
+++ b/xdr-datatypes.h
@@ -0,0 +1,31 @@
+/* xdr-datatypes-config.h.  Generated from xdr-datatypes-config.h.in by configure.  */
+
+/*
+  Determine at compile-time the sizes of various XDR datatypes. This uses
+  symbols defined by configure (See configure.in). pcw 08/13/07
+*/
+
+#ifndef __XDR_DATATYPES__
+#define __XDR_DATATYPES__
+
+#ifdef WIN32
+#include <rpc.h>
+#include <winsock2.h>
+#include <xdr.h>
+#else
+#include <rpc/types.h>
+#include <netinet/in.h>
+#include <rpc/xdr.h>
+#endif
+
+
+#define XDR_INT32 xdr_int32_t
+#define XDR_UINT32 xdr_u_int32_t
+
+#define XDR_INT16 xdr_int16_t
+#define XDR_UINT16 xdr_u_int16_t
+
+#define XDR_FLOAT64 xdr_double
+#define XDR_FLOAT32 xdr_float
+
+#endif /* __XDR_DATATYPES__ */
diff --git a/xdrutil_ppc.c b/xdrutil_ppc.c
new file mode 100644
index 0000000..3f90b74
--- /dev/null
+++ b/xdrutil_ppc.c
@@ -0,0 +1,41 @@
+/*  The the old-style C function prototypes such as those found in the XDR */
+/*  structure in <rpc/xdr.h> under OS X are not usable from C++.  This,    */
+/*  along with xdr_destroy() being a macro that expands into that old      */
+/*  style ("()" used to mean any number of unspecified args) means that    */
+/*  we cannot use delete_xdrstdio from C++ under OS X.  The other two      */
+/*  functions were brought along for uniformity.                           */
+/*  ROM - 6/22/2003                                                        */
+
+#ifdef __POWERPC__
+#include <stdio.h>
+#include <rpc/types.h>
+#include <rpc/xdr.h>
+
+XDR *
+new_xdrstdio(FILE *stream, enum xdr_op xop)
+{
+    XDR *xdr = (XDR *)malloc(sizeof(XDR));
+    
+    xdrstdio_create(xdr, stream, xop);
+    
+    return xdr;
+}
+
+XDR *
+set_xdrstdio(XDR *xdr, FILE *stream, enum xdr_op xop)
+{
+    xdrstdio_create(xdr, stream, xop);
+    
+    return xdr;
+}
+
+// Delete an XDR pointer allocated using the above function. Do not close the
+// associated FILE pointer.
+void
+delete_xdrstdio(XDR *xdr)
+{
+    xdr_destroy(xdr);
+
+    free(xdr);xdr = 0;
+}
+#endif  /*  __POWERPC__  */